From 97ee488392b3a5d13de677f73f55800327ae8653 Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Sat, 9 Apr 2022 18:25:32 +0300
Subject: [PATCH 01/46] Failed to save the output of query in csv file when
 there are commas in file name

Description: added "output_file" to excluded flags in function verifying number of args

Tested OS: Linux
Tested devices: cables connected to a Quantum switch
Tested flows: flint query output to csv

Known gaps (with RM ticket): N/A

Issue: 2972263
Change-Id: I9ab88262a6b3df3902bf95435f338fdba77eadf1

Signed-off-by: Matan Eliyahu <matanel@nvidia.com>
---
 flint/cmd_line_parser.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/flint/cmd_line_parser.cpp b/flint/cmd_line_parser.cpp
index 5f508e8f..2d0881fb 100644
--- a/flint/cmd_line_parser.cpp
+++ b/flint/cmd_line_parser.cpp
@@ -318,6 +318,9 @@ bool verifyNumOfArgs(string name, string value)
     if (name == "vsd") {
         return true;
     }
+    if (name == "output_file") {
+        return true;
+    }
 
     int expected = FlagMetaData().getNumOfArgs(name);
     if (expected < 0) {

From 8f2cf0b4cbf877870c93b0fa94c808c2c3c4f0d2 Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Thu, 14 Apr 2022 17:19:11 +0300
Subject: [PATCH 02/46] Wrong default value for '--activate_delay_sec' in help
 menu

Description: changed the default value in flint help menu

Tested OS: Linux
Tested devices: N/A
Tested flows: flint --help

Known gaps (with RM ticket): N/A

Issue: 2691148
Change-Id: I42df02367997456c99a7173c0bfceb3cad301fd2

Signed-off-by: Matan Eliyahu <matanel@nvidia.com>
---
 flint/cmd_line_parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flint/cmd_line_parser.cpp b/flint/cmd_line_parser.cpp
index 2d0881fb..b765d79c 100644
--- a/flint/cmd_line_parser.cpp
+++ b/flint/cmd_line_parser.cpp
@@ -878,7 +878,7 @@ void Flint::initCmdParser()
     AddOptions("activate_delay_sec",
         ' ',
         "<timeout in seconds>",
-        "Use this flag to activate all cable devices connected to host with delay, acceptable values are between 0 and 255 (default - 0, immediately). Important: 'activate' flag must be set.  This flag is relevant only for cable components.",
+        "Use this flag to activate all cable devices connected to host with delay, acceptable values are between 0 and 255 (default - 1). Important: 'activate' flag must be set.  This flag is relevant only for cable components.",
         false,
         false,
         1);

From 46067a36fe55bcfb5be939626dde511ff32e7b61 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 17 Apr 2022 14:18:40 +0300
Subject: [PATCH 03/46] In case of switch device determine if dev-secure based
 on new 'dev_sc' field in MGIR

Description: Since switches used MGIR's 'dev' field to indicate
dev-branch (instead of dev-secure) a new field added to MGIR called
'dev_sc' to indicate the device is dev-secure. For NICs both fields are
the same

Tested OS: N/A
Tested devices: N/A
Tested flows: N/A

Known gaps (with RM ticket): N/A

Issue: 2858050
Change-Id: I7159d699644389fe056cfaa18220ffd9aa6672be

Signed-off-by: Matan Eliyahu <matanel@nvidia.com>
---
 fw_comps_mgr/Makefile.am      |  3 ++-
 fw_comps_mgr/fw_comps_mgr.cpp | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/fw_comps_mgr/Makefile.am b/fw_comps_mgr/Makefile.am
index ccd1fe58..1e7449ca 100755
--- a/fw_comps_mgr/Makefile.am
+++ b/fw_comps_mgr/Makefile.am
@@ -41,9 +41,10 @@ LAYOUTS_DIR = $(USER_DIR)/tools_layouts
 UTILS_DIR = $(USER_DIR)/mft_utils
 MAD_IFC_DIR = $(USER_DIR)/mad_ifc
 TOOLS_RES_MGMT_DIR = $(USER_DIR)/tools_res_mgmt
+DEV_MGT_DIR = $(USER_DIR)/dev_mgt
 
 INCLUDES = -I. -I$(USER_DIR) -I$(MTCR_INC_DIR) -I$(MTCR_DIR) -I$(REG_ACCESS_DIR) -I$(CMDIF_DIR) \
-           -I$(COMMON_DIR) -I $(LAYOUTS_DIR) -I $(UTILS_DIR) -I$(TOOLS_RES_MGMT_DIR) 
+           -I$(COMMON_DIR) -I $(LAYOUTS_DIR) -I $(UTILS_DIR) -I$(TOOLS_RES_MGMT_DIR) -I$(DEV_MGT_DIR)
 
 FWCOMPS_VERSION = 1
 
diff --git a/fw_comps_mgr/fw_comps_mgr.cpp b/fw_comps_mgr/fw_comps_mgr.cpp
index e77af115..f541f7b2 100644
--- a/fw_comps_mgr/fw_comps_mgr.cpp
+++ b/fw_comps_mgr/fw_comps_mgr.cpp
@@ -44,6 +44,7 @@
 #include <signal.h>
 
 #include "mflash/mflash_access_layer.h"
+#include "dev_mgt/tools_dev_types.h"
 #ifndef UEFI_BUILD
 #include <mft_sig_handler.h>
 #include "mad_ifc/mad_ifc.h"
@@ -1786,6 +1787,19 @@ bool FwCompsMgr::queryFwInfo(fwInfoT *query, bool next_boot_fw_ver)
     query->encryption = mgir.fw_info.encryption;
     query->signed_fw = _compsQueryMap[FwComponent::COMPID_BOOT_IMG].comp_cap.signed_updates_only;
 
+    // Since in switches MGIR 'dev' field is used to indicate dev-branch instead of the original purpose for dev-secure,
+    // we now read from a new field called 'dev_sc' to determine if the switch is dev-secure
+    dm_dev_id_t dm_device_id = DeviceUnknown;
+    if (dm_get_device_id_offline(query->hw_dev_id, query->rev_id, &dm_device_id) == ME_OK) {
+        if (dm_dev_is_switch(dm_device_id)) {
+            query->security_type.dev_fw = mgir.fw_info.dev_sc;
+        }
+    }
+    else {
+        _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
+        return false;
+    }
+
     query->base_mac_orig.uid = ((u_int64_t)mgir.hw_info.manufacturing_base_mac_47_32 << 32 | mgir.hw_info.manufacturing_base_mac_31_0);
     if (!extractMacsGuids(query)) {
         /*

From 6865c41f807c5d64ef02791b7efbd8f483bf8163 Mon Sep 17 00:00:00 2001
From: Roei Yitzhak <roei@nvidia.com>
Date: Tue, 19 Apr 2022 10:30:36 +0300
Subject: [PATCH 04/46] Bug fix: dynamic loading of mtcr in mtcr.py on Windows

Description:
Due to an update of Python version for Pyinstaller
the .dll loading should get full path instead of
relative path

Tested OS:Windows
Tested devices:
Tested flows:mlxfwreset reset

Known gaps (with RM ticket):

Issue: 3044246
Change-Id: I48170c9184a27460c8619f88c13016a5b409a03c

Signed-off-by: Matan Eliyahu <matanel@nvidia.com>
---
 mtcr_py/mtcr.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mtcr_py/mtcr.py b/mtcr_py/mtcr.py
index 423e6a8c..bd8cd646 100644
--- a/mtcr_py/mtcr.py
+++ b/mtcr_py/mtcr.py
@@ -58,7 +58,10 @@ class CmdIfException(Exception):
     from ctypes import *
     ctypes.CDLL._func_restype_ = ctypes.c_ulonglong
     if platform.system() == "Windows" or os.name == "nt":
-        CMTCR = CDLL(".\\libmtcr-1.dll", use_errno=True)
+        try:
+            CMTCR = CDLL("libmtcr-1.dll", use_errno=True)
+        except:
+            CMTCR = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libmtcr-1.dll"), use_errno=True)
     else:
         try:
             CMTCR = CDLL("cmtcr.so", use_errno=True)

From 040eae785ac0ad226f2c41397a90cfe8f1ac371b Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Wed, 29 Jun 2022 12:18:34 +0300
Subject: [PATCH 05/46] [mlxfwreset] bug fix - prevent running only `reset`
 command in secure boot

Description:
The tool will allow running query in case of
secure boot host

Tested OS:Linux
Tested devices:
Tested flows:mlxfwreset

Known gaps (with RM ticket):

Issue:3049307
---
 small_utils/mstfwreset.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index 3849b2fd..ee93b513 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -1649,8 +1649,8 @@ def check_positive_float(val):
     global DevDBDF
     global FWResetStatusChecker
 
-    if args.reset_sync == SyncOwner.TOOL and is_uefi_secureboot():        # The tool is using sysfs to access PCI config and it's
-        raise RuntimeError("The tool is not supported on UEFI Secure Boot") # restricted on UEFI secure boot
+    if args.reset_sync == SyncOwner.TOOL and command == "reset" and is_uefi_secureboot():   # The tool is using sysfs to access PCI config
+        raise RuntimeError("The tool is not supported on UEFI Secure Boot")                 # and it's restricted on UEFI secure boot
 
     # Exit in case of virtual-machine (not implemented for FreeBSD and Windows)
     if command == "reset" and platform.system() == "Linux" and "ppc64" not in platform.machine():

From 581ca47f5917f307ce57de87071ca047a74a57da Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Sun, 8 May 2022 11:13:03 +0300
Subject: [PATCH 06/46] Coverity issues- subcommands_linkx.cpp

Description: resource leak issues and double free

Tested OS: linux
Tested devices: linkx cables
Tested flows: build + query

Known gaps (with RM ticket): N/A

Issue: None
Change-Id: I7888c1b0513581da6b6fd183853f7d67a6d9874d

Signed-off-by: Matan Eliyahu <matanel@nvidia.com>
---
 flint/subcommands_linkx.cpp | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/flint/subcommands_linkx.cpp b/flint/subcommands_linkx.cpp
index c79cd4df..5c9ef8aa 100644
--- a/flint/subcommands_linkx.cpp
+++ b/flint/subcommands_linkx.cpp
@@ -206,11 +206,6 @@ FlintStatus QuerySubCommand::QueryLinkX(string deviceName, string outputFile, st
         reportErr(true, LINKX_QUERY_DEVICE_NOT_SUPPORTED, deviceName.c_str());
         return FLINT_FAILED;
     }
-    mfile * mfile = mopen_adv((const char *)deviceName.c_str(), (MType)(MST_DEFAULT));
-    if (!mfile) {
-        reportErr(true, "-E- Failed to open device.\n");
-        return FLINT_FAILED;
-    }
     FwComponent bootImageComponent;
     std::vector<FwComponent> compsToBurn;
     for (unsigned int i = 0; i < deviceIds.size(); i++) {
@@ -219,6 +214,11 @@ FlintStatus QuerySubCommand::QueryLinkX(string deviceName, string outputFile, st
             return FLINT_FAILED;
         }
     }
+    mfile * mfile = mopen_adv((const char *)deviceName.c_str(), (MType)(MST_DEFAULT));
+    if (!mfile) {
+        reportErr(true, "-E- Failed to open device.\n");
+        return FLINT_FAILED;
+    }
 
     string outPutString;
     bool isCSV = false;
@@ -230,10 +230,10 @@ FlintStatus QuerySubCommand::QueryLinkX(string deviceName, string outputFile, st
         AddTableHeaderForCSVFormat(outPutString);
     }
 
+    FwCompsMgr fwCompsAccess(mfile, FwCompsMgr::DEVICE_HCA_SWITCH, 0);
     for (unsigned int i = 0; i < deviceIds.size(); i++)
     {
         int deviceIndex = deviceIds[i] + 1;
-        FwCompsMgr fwCompsAccess(mfile, FwCompsMgr::DEVICE_HCA_SWITCH, deviceIndex);
         fwCompsAccess.SetIndexAndSize(deviceIndex, 1);
         comp_status_st ComponentStatus;
         if (!fwCompsAccess.RefreshComponentsStatus(&ComponentStatus)) {
@@ -295,16 +295,17 @@ FlintStatus BurnSubCommand::BurnLinkX(string deviceName, int deviceIndex, int de
     }
     if (linkx_auto_update && activationNeeded && activate_delay_sec == 0 && (mfile->flags & MDEVS_IB) != 0) {//IB device
         if (!askUser("The autoupdate activation process may cause a disconnection from the InBand connection, do you want to continue?")) {
+            mclose(mfile);
             return FLINT_FAILED;
         }
     }
     FwComponent bootImageComponent;
     std::vector<FwComponent> compsToBurn;
-    fwCompsAccess = new FwCompsMgr(mfile, FwCompsMgr::DEVICE_HCA_SWITCH, 0);
-    fwCompsAccess->GenerateHandle();
-    fwCompsAccess->SetIndexAndSize(deviceIndex + 1, deviceSize, linkx_auto_update, activationNeeded, downloadTransferNeeded, activate_delay_sec);
-    if (!fwCompsAccess->RefreshComponentsStatus()) {
-        printf("-E- Refresh components failed, error is %s.\n", fwCompsAccess->getLastErrMsg());
+    FwCompsMgr fwCompsAccess(mfile, FwCompsMgr::DEVICE_HCA_SWITCH, 0);
+    fwCompsAccess.GenerateHandle();
+    fwCompsAccess.SetIndexAndSize(deviceIndex + 1, deviceSize, linkx_auto_update, activationNeeded, downloadTransferNeeded, activate_delay_sec);
+    if (!fwCompsAccess.RefreshComponentsStatus()) {
+        printf("-E- Refresh components failed, error is %s.\n", fwCompsAccess.getLastErrMsg());
         return FLINT_FAILED;
     }
     
@@ -312,24 +313,24 @@ FlintStatus BurnSubCommand::BurnLinkX(string deviceName, int deviceIndex, int de
     compsToBurn.push_back(bootImageComponent);
     if (downloadTransferNeeded) {
         printf("-I- Downloading FW ...\n");
-        if (fwCompsAccess->isMCDDSupported()) {
+        if (fwCompsAccess.isMCDDSupported()) {
             // Checking if BME is disabled to print indication to user
-            bool isBmeSet = DMAComponentAccess::isBMESet(fwCompsAccess->getMfileObj());
+            bool isBmeSet = DMAComponentAccess::isBMESet(fwCompsAccess.getMfileObj());
             if (!isBmeSet) {
                 printf("-W- DMA burning is not supported due to BME is unset (Bus Master Enable).\n");
             }
         }
     }
-    if (!fwCompsAccess->burnComponents(compsToBurn, funcAdv)) {
-        char* err_msg = (char*)fwCompsAccess->getLastErrMsg();
+    if (!fwCompsAccess.burnComponents(compsToBurn, funcAdv)) {
+        char* err_msg = (char*)fwCompsAccess.getLastErrMsg();
         bool IbError = (strcmp("Unknown MAD error", err_msg) == 0);
         if (linkx_auto_update && activationNeeded && activate_delay_sec == 0 && ((mfile->flags & MDEVS_IB) != 0) && IbError) {//IB device
             
-            printf("-W- The activation process caused a disconnection from the InBand connection for a few minutes, please wait for reconnection. The error is %s \n", fwCompsAccess->getLastErrMsg());
+            printf("-W- The activation process caused a disconnection from the InBand connection for a few minutes, please wait for reconnection. The error is %s \n", fwCompsAccess.getLastErrMsg());
             return FLINT_SUCCESS;
         }
         else {
-            printf("-E- Cable burn failed, error is %s.\n", fwCompsAccess->getLastErrMsg());
+            printf("-E- Cable burn failed, error is %s.\n", fwCompsAccess.getLastErrMsg());
             return FLINT_FAILED;
         }
     }

From 76137f648040d611401910f30bc640f35b4ac77c Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Wed, 29 Jun 2022 17:25:01 +0300
Subject: [PATCH 07/46] [mlxfwops] Creating SecuredSwitchSignatureManager
 object in case of SPEC4 instead of RavenSwitchSignatureManager object

Description: Since SPEC4 is secured device we need to create the correct
object to presents its capabilities

Tested OS: N/A
Tested devices: N/A
Tested flows: N/A

Known gaps (with RM ticket): N/A

Issue: 3048157
---
 mlxfwops/lib/signature_manager_factory.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mlxfwops/lib/signature_manager_factory.h b/mlxfwops/lib/signature_manager_factory.h
index a7401a32..a7807496 100644
--- a/mlxfwops/lib/signature_manager_factory.h
+++ b/mlxfwops/lib/signature_manager_factory.h
@@ -71,10 +71,10 @@ class SignatureManagerFactory
         else if (deviceId == DeviceConnectX6LX) {
             return new ConnectX6LXFwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceSpectrum || deviceId == DeviceSpectrum2 || deviceId == DeviceSpectrum3 || deviceId == DeviceSpectrum4 || deviceId == DeviceQuantum) {
+        else if (deviceId == DeviceSpectrum || deviceId == DeviceSpectrum2 || deviceId == DeviceSpectrum3 || deviceId == DeviceQuantum) {
             return new RavenSwitchSignatureManager();
         }
-        else if (deviceId == DeviceQuantum2) {
+        else if (deviceId == DeviceQuantum2 || deviceId == DeviceSpectrum4) {
             return new SecuredSwitchSignatureManager();
         }
         else {
@@ -107,10 +107,10 @@ class SignatureManagerFactory
         else if (chip == CT_GEARBOX) {
             return new GearBoxSignatureManager();
         }
-        else if(chip == CT_QUANTUM || chip == CT_SPECTRUM || chip == CT_SPECTRUM2 || chip == CT_SPECTRUM3 || chip == CT_SPECTRUM4) {
+        else if(chip == CT_QUANTUM || chip == CT_SPECTRUM || chip == CT_SPECTRUM2 || chip == CT_SPECTRUM3) {
             return new RavenSwitchSignatureManager();
         }
-        else if (chip == CT_QUANTUM2) {
+        else if (chip == CT_QUANTUM2 || chip == CT_SPECTRUM4) {
             return new SecuredSwitchSignatureManager();
         }
         else {

From da02a119860f0eaac36429ef7a52908c0b4a9b95 Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Thu, 30 Jun 2022 14:18:10 +0300
Subject: [PATCH 08/46] [mstlink] Fixing cable control params issues

Description:
-> Fixing negative arguments check
-> Fixing rx amplitude configuration
-> More validation over arguments

Issue: 3067085
Issue: 3042144
Issue: 3038403
Issue: 3066878

Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/mlxlink_cables_commander.cpp | 38 ++++++++++++--------
 mlxlink/modules/mlxlink_cables_commander.h   |  2 +-
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/mlxlink/modules/mlxlink_cables_commander.cpp b/mlxlink/modules/mlxlink_cables_commander.cpp
index f8ccd8a9..782081d2 100644
--- a/mlxlink/modules/mlxlink_cables_commander.cpp
+++ b/mlxlink/modules/mlxlink_cables_commander.cpp
@@ -1535,7 +1535,7 @@ void MlxlinkCablesCommander::showControlParams()
     cout << controlParamsOutput;
 }
 
-u_int32_t MlxlinkCablesCommander::getPMCRValue(ControlParam paramId, const string& value)
+u_int32_t MlxlinkCablesCommander::pmcrStrToValue(ControlParam paramId, const string& value)
 {
     double valueToSet = 0;
     bool invalidConfiguration = false;
@@ -1556,9 +1556,7 @@ u_int32_t MlxlinkCablesCommander::getPMCRValue(ControlParam paramId, const strin
 
     if (isDecemal && !isCmis && paramId == CABLE_CONTROL_PARAMETERS_SET_RX_EMPH)
     {
-        throw MlxRegException("The requested RX Emphasis configuration value is valid for "
-                              "CMIS modules only (pre-emphasis): %s",
-                              value.c_str());
+        invalidConfiguration = true;
     }
 
     if (isCmis && paramId == CABLE_CONTROL_PARAMETERS_SET_RX_EMPH)
@@ -1571,15 +1569,24 @@ u_int32_t MlxlinkCablesCommander::getPMCRValue(ControlParam paramId, const strin
         }
     }
 
-    if (valueStr == "0" || valueToSet > MAX_SFF_CODE_VALUE ||
-        (isDecemal && paramId != CABLE_CONTROL_PARAMETERS_SET_RX_EMPH))
+    if ((valueToSet < 0) || (valueStr == "0" && paramId != CABLE_CONTROL_PARAMETERS_SET_RX_AMP) ||
+        (valueToSet > MAX_SFF_CODE_VALUE) || (isDecemal && paramId != CABLE_CONTROL_PARAMETERS_SET_RX_EMPH))
     {
         invalidConfiguration = true;
     }
 
     if (invalidConfiguration)
     {
-        throw MlxRegException("Invalid %s configuration: %s", _modulePMCRParams[paramId].first.c_str(), value.c_str());
+        u_int32_t capVal = getFieldValue(_modulePMCRParams[paramId].second + "_value_cap");
+        string capStr = "";
+        if (capVal)
+        {
+            capStr = "\nSupported configuration values are [";
+            capStr += getPMCRCapValueStr(capVal, paramId);
+            capStr += "]";
+        }
+        throw MlxRegException("Invalid %s configuration: %s %s", _modulePMCRParams[paramId].first.c_str(),
+                              value.c_str(), capStr.c_str());
     }
 
     return (u_int32_t)valueToSet;
@@ -1598,7 +1605,11 @@ string MlxlinkCablesCommander::getPMCRCapValueStr(u_int32_t valueCap, ControlPar
         char tmpFmt[64];
         for (u_int32_t val = 0; val <= valueCap; val++)
         {
-            if (_cableIdentifier >= IDENTIFIER_SFP_DD && paramId == CABLE_CONTROL_PARAMETERS_SET_RX_EMPH)
+            if (val == 0)
+            {
+                capStr += "NE,";
+            }
+            else if (_cableIdentifier >= IDENTIFIER_SFP_DD && paramId == CABLE_CONTROL_PARAMETERS_SET_RX_EMPH)
             {
                 sprintf(tmpFmt, "%.1f,", ((float)val / 2.0));
                 capStr += string(tmpFmt);
@@ -1644,9 +1655,8 @@ void MlxlinkCablesCommander::checkPMCRFieldsCap(vector<pair<ControlParam, string
     for (auto it = params.begin(); it != params.end(); it++)
     {
         fieldName = _modulePMCRParams[it->first].second;
-        valueToSet = getPMCRValue(it->first, it->second);
+        valueToSet = pmcrStrToValue(it->first, it->second);
         valueCap = getFieldValue(fieldName + "_value_cap");
-        ; //
         if (it->first == CABLE_CONTROL_PARAMETERS_SET_RX_AMP)
         {
             valueToSet = (u_int32_t)pow(2.0, (double)valueToSet);
@@ -1663,19 +1673,19 @@ void MlxlinkCablesCommander::checkPMCRFieldsCap(vector<pair<ControlParam, string
         {
             if (valueCap)
             {
-                validCapStr = "\nValid configuration values are [";
+                validCapStr = "\nSupported configuration values are [";
                 validCapStr += getPMCRCapValueStr(valueCap, it->first);
                 validCapStr += "]";
             }
-            throw MlxRegException("Invalid %s configuration value: %s %s", _modulePMCRParams[it->first].first.c_str(),
-                                  it->second.c_str(), validCapStr.c_str());
+            throw MlxRegException("Not supported %s configuration value: %s %s",
+                                  _modulePMCRParams[it->first].first.c_str(), it->second.c_str(), validCapStr.c_str());
         }
     }
 }
 
 void MlxlinkCablesCommander::buildPMCRRequest(ControlParam paramId, const string& value)
 {
-    u_int32_t valueToSet = getPMCRValue(paramId, value);
+    u_int32_t valueToSet = pmcrStrToValue(paramId, value);
 
     updateField(_modulePMCRParams[paramId].second + "_cntl", 2);
     updateField(_modulePMCRParams[paramId].second + "_value", (u_int32_t)valueToSet);
diff --git a/mlxlink/modules/mlxlink_cables_commander.h b/mlxlink/modules/mlxlink_cables_commander.h
index 569a6028..36f7e7fa 100644
--- a/mlxlink/modules/mlxlink_cables_commander.h
+++ b/mlxlink/modules/mlxlink_cables_commander.h
@@ -197,7 +197,7 @@ class MlxlinkCablesCommander : public MlxlinkRegParser
     void enablePMPT(ModuleAccess_t moduleAccess);
     void disablePMPT();
 
-    u_int32_t getPMCRValue(ControlParam paramId, const string& value);
+    u_int32_t pmcrStrToValue(ControlParam paramId, const string& value);
     string getPMCRCapValueStr(u_int32_t valueCap, ControlParam paramId);
     void checkPMCRFieldsCap(vector<pair<ControlParam, string>>& params);
     void buildPMCRRequest(ControlParam paramId, const string& value);

From e56bb671ce8d54bacccec9c6d66475e2a8416f6f Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Thu, 30 Jun 2022 14:59:12 +0300
Subject: [PATCH 09/46] [mstlink][Module PRBS] Fixing module prbs issues

Description:
-> Fixing enabling the PRBS with 10.3125G and 14.0625G rates
-> Fixing SNR invalid values
-> Fixing invalid flag options combination

Issue: 3093445
Issue: 3093462
Issue: 3088639

Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/mlxlink_cables_commander.cpp |   4 +-
 mlxlink/modules/mlxlink_enums.h              |   2 +-
 mlxlink/modules/mlxlink_ui.cpp               | 117 +++++++++++--------
 3 files changed, 72 insertions(+), 51 deletions(-)

diff --git a/mlxlink/modules/mlxlink_cables_commander.cpp b/mlxlink/modules/mlxlink_cables_commander.cpp
index f8ccd8a9..ed6a954b 100644
--- a/mlxlink/modules/mlxlink_cables_commander.cpp
+++ b/mlxlink/modules/mlxlink_cables_commander.cpp
@@ -1418,7 +1418,7 @@ void MlxlinkCablesCommander::getPMPDInfo(vector<string>& traffic,
         traficStr = to_string(add32BitTo64(getFieldValue("prbs_bits_high"), getFieldValue("prbs_bits_low")));
         errorsStr = to_string(add32BitTo64(getFieldValue("prbs_errors_high"), getFieldValue("prbs_errors_low")));
         berStr = to_string(getFieldValue("ber_coef")) + "E-" + to_string(getFieldValue("ber_magnitude"));
-        snrStr = to_string(getFieldValue("measured_snr")) + " dB";
+        snrStr = getFieldValue("measured_snr") ? (to_string(getFieldValue("measured_snr")) + " dB") : "N/A";
 
         traffic.push_back(MlxlinkRecord::addSpaceForModulePrbs(traficStr));
 
@@ -1435,7 +1435,7 @@ void MlxlinkCablesCommander::getPMPDInfo(vector<string>& traffic,
         {
             snr.push_back(MlxlinkRecord::addSpaceForModulePrbs(getFieldValue("snr_cap") ? snrStr : "Not Supported"));
         }
-        // Print only one indecation for each cap if it's not supported
+        // Print only one indication for each cap if it's not supported
         if (getFieldValue("errors_cap") == 0)
         {
             skipErrorCap = true;
diff --git a/mlxlink/modules/mlxlink_enums.h b/mlxlink/modules/mlxlink_enums.h
index d2f73ab7..ee2eb76c 100644
--- a/mlxlink/modules/mlxlink_enums.h
+++ b/mlxlink/modules/mlxlink_enums.h
@@ -395,7 +395,7 @@
 
 #define MAX_SBYTE 127
 #define MIN_SBYTE -128
-#define MAX_INPUT_LENGTH 7
+#define MAX_INPUT_LENGTH 10
 #define SECOND_LEVEL_PORT_ACCESS 2
 #define THIRD_LEVEL_PORT_ACCESS 3
 
diff --git a/mlxlink/modules/mlxlink_ui.cpp b/mlxlink/modules/mlxlink_ui.cpp
index 095a5b0d..ca86a43b 100644
--- a/mlxlink/modules/mlxlink_ui.cpp
+++ b/mlxlink/modules/mlxlink_ui.cpp
@@ -99,23 +99,31 @@ void MlxlinkUi::printSynopsisCommands()
                                  "Configure Port State [UP(up)/DN(down)/TG(toggle)]");
     MlxlinkRecord::printFlagLine(
       PTYS_FLAG_SHORT, PTYS_FLAG, "speeds",
-      "Configure Speeds [NDR,HDR,EDR,FDR10,FDR,QDR,DDR,SDR,400G_8X,200G_4X,100G_2X,50G_1X,100G,100G_4X,50G,50G_2X,25G,40X,10G,2.5G,1G]");
+      "Configure Speeds "
+      "[NDR,HDR,EDR,FDR10,FDR,QDR,DDR,SDR,800G_8X,400G_4X,200G_2X,100G_1X,400G_8X,200G_4X,100G_2X,"
+      "50G_1X,100G,100G_4X,50G,50G_2X,25G,40X,10G,2.5G,1G]");
     printf(IDENT);
     MlxlinkRecord::printFlagLine(PTYS_LINK_MODE_FORCE_FLAG_SHORT, PTYS_LINK_MODE_FORCE_FLAG, "",
                                  "Configure Link Mode Force (Disable AN)");
     MlxlinkRecord::printFlagLine(
       PPLR_FLAG_SHORT, PPLR_FLAG, "loopback",
-      "Configure Loopback Mode [NO(no loopback)/RM(phy remote Rx-to-Tx loopback)/PH(internal phy Tx-to-Rx loopback)/EX(external loopback connector needed)/EX(external Tx-to-Rx loopback)]");
+      "Configure Loopback Mode [NO(no loopback)/RM(phy remote Rx-to-Tx loopback)/PH(internal phy Tx-to-Rx "
+      "loopback)/EX(external loopback connector needed)/EX(external Tx-to-Rx loopback)]");
     MlxlinkRecord::printFlagLine(
       PPLM_FLAG_SHORT, PPLM_FLAG, "fec_override",
-      "Configure FEC [AU(Auto)/NF(No-FEC)/FC(FireCode FEC)/RS(RS-FEC)/LL(LL-RS-FEC)/DF-RS(Interleaved_RS-FEC)/DF-LL(Interleaved_LL_RS-FEC)]");
+      "Configure FEC [AU(Auto)/NF(No-FEC)/FC(FireCode "
+      "FEC)/RS(RS-FEC)/LL(LL-RS-FEC)/DF-RS(Interleaved_RS-FEC)/DF-LL(Interleaved_LL_RS-FEC)]");
     printf(IDENT);
-    MlxlinkRecord::printFlagLine(
-      FEC_SPEED_FLAG_SHORT, FEC_SPEED_FLAG, "fec_speed",
-      "Speed to Configure FEC [100G,56G,50G,40G,25G,10G,800G_8X,400G_4x,400G_8X,200G_2X,200G_4X,100G_2X,50G_1X,100G_4X] (Default is Active Speed)");
-    MlxlinkRecord::printFlagLine(
-      SLTP_SET_FLAG_SHORT, SLTP_SET_FLAG, "params",
-      "Configure Transmitter Parameters For 16nm devices: [pre2Tap,preTap,mainTap,postTap,m2lp,amp] For 28nm devices: [Pol,tap0,tap1,tap2,bias,preemp_mode]");
+    MlxlinkRecord::printFlagLine(FEC_SPEED_FLAG_SHORT, FEC_SPEED_FLAG, "fec_speed",
+                                 "Speed to Configure FEC "
+                                 "[100G,56G,50G,40G,25G,10G,800G_8X,400G_4x,400G_8X,200G_2X,200G_4X,100G_2X,50G_1X,"
+                                 "100G_4X] (Default is Active Speed)");
+    MlxlinkRecord::printFlagLine(SLTP_SET_FLAG_SHORT, SLTP_SET_FLAG, "params",
+                                 "Configure Transmitter Parameters. "
+                                 "For 7nm devices (lane rate specifies the valid Parameters): "
+                                 "[fir_pre3,fir_pre2,fir_pre1,fir_main,fir_post1], "
+                                 "For 16nm devices: [pre2Tap,preTap,mainTap,postTap,m2lp,amp], "
+                                 "For 28nm devices: [Pol,tap0,tap1,tap2,bias,preemp_mode]");
     printf(IDENT);
     MlxlinkRecord::printFlagLine(LANE_FLAG_SHORT, LANE_FLAG, "transmitter_lane",
                                  "Transmitter Lane to Set (Optional - Default All Lanes)");
@@ -125,7 +133,8 @@ void MlxlinkUi::printSynopsisCommands()
     printf(IDENT);
     MlxlinkRecord::printFlagLine(
       SLTP_TX_POLICY_FLAG_SHORT, SLTP_TX_POLICY_FLAG, "",
-      "Set the parameters according to Data Base only, otherwise it will be set according to the best possible configuration chosen by the system (e.g. KR-startup) (Optional)");
+      "Set the parameters according to Data Base only, otherwise it will be set according to the best possible "
+      "configuration chosen by the system (e.g. KR-startup) (Optional)");
     MlxlinkRecord::printFlagLine(SET_TX_GROUP_MAP_FLAG_SHORT, SET_TX_GROUP_MAP_FLAG, "group_num",
                                  "Map ports to group <group_num> (for Spectrum-2 and Quantum devices)");
     printf(IDENT);
@@ -134,21 +143,28 @@ void MlxlinkUi::printSynopsisCommands()
     MlxlinkRecord::printFlagLine(PRBS_MODE_FLAG_SHORT, PRBS_MODE_FLAG, "prbs_mode",
                                  "Physical Test Mode Configuration [EN(enable)/DS(disable)/TU(perform tuning)]");
     printf(IDENT);
-    MlxlinkRecord::printFlagLine(
-      PPRT_PRBS_FLAG_SHORT, PPRT_PRBS_FLAG, "rx_prbs_mode",
-      "RX PRBS Mode [PRBS31/PRBS23A/PRBS23B/PRBS23C/PRBS23D/PRBS7/PRBS11/PRBS11A/PRBS11B/PRBS11C/PRBS11D/PRBS9/IDLE/SQUARE_WAVEA/SQUARE_WAVEB/SQUARE_WAVEC/SQUARE_WAVED/PRBS13A/PRBS13B/PRBS13C/PRBS13D/SSPR/SSPRQ/LT_frames/PRBS15/PRBS28] (Optional - Default PRBS31)");
+    MlxlinkRecord::printFlagLine(PPRT_PRBS_FLAG_SHORT, PPRT_PRBS_FLAG, "rx_prbs_mode",
+                                 "RX PRBS Mode "
+                                 "[PRBS31/PRBS23A/PRBS23B/PRBS23C/PRBS23D/PRBS7/PRBS11/PRBS11A/PRBS11B/PRBS11C/PRBS11D/"
+                                 "PRBS9/IDLE/SQUARE_WAVEA/SQUARE_WAVEB/SQUARE_WAVEC/SQUARE_WAVED/PRBS13A/PRBS13B/"
+                                 "PRBS13C/PRBS13D/SSPR/SSPRQ/LT_frames/PRBS15/PRBS28] (Optional - Default PRBS31)");
     printf(IDENT);
     MlxlinkRecord::printFlagLine(
       PPTT_PRBS_FLAG_SHORT, PPTT_PRBS_FLAG, "tx_prbs_mode",
-      "TX PRBS Mode [PRBS31/PRBS23A/PRBS23B/PRBS23C/PRBS23D/PRBS7/PRBS11/PRBS11A/PRBS11B/PRBS11C/PRBS11D/PRBS9/IDLE/SQUARE_WAVEA/SQUARE_WAVEB/SQUARE_WAVEC/SQUARE_WAVED/PRBS13A/PRBS13B/PRBS13C/PRBS13D/SSPR/SSPRQ/LT_frames/PRBS15/PRBS28/SQUARE_WAVE3,SQUARE_WAVE13,SQUARE_WAVE30] (Optional - Default PRBS31] (Optional - Default PRBS31)");
+      "TX PRBS Mode "
+      "[PRBS31/PRBS23A/PRBS23B/PRBS23C/PRBS23D/PRBS7/PRBS11/PRBS11A/PRBS11B/PRBS11C/PRBS11D/PRBS9/IDLE/SQUARE_WAVEA/"
+      "SQUARE_WAVEB/SQUARE_WAVEC/SQUARE_WAVED/PRBS13A/PRBS13B/PRBS13C/PRBS13D/SSPR/SSPRQ/LT_frames/PRBS15/PRBS28/"
+      "SQUARE_WAVE3,SQUARE_WAVE13,SQUARE_WAVE30] (Optional - Default PRBS31] (Optional - Default PRBS31)");
     printf(IDENT);
-    MlxlinkRecord::printFlagLine(
-      PPRT_RATE_FLAG_SHORT, PPRT_RATE_FLAG, "rx_lane_rate",
-      "RX Lane Rate [HDR,EDR,FDR10,FDR,QDR,DDR,SDR,400G_8X,200G_4X,100G_2X,50G_1X,100G,100G_4X,50G,50G_2X,25G,40X,10G,2.5G,1G]  (Optional - Default 25G)");
+    MlxlinkRecord::printFlagLine(PPRT_RATE_FLAG_SHORT, PPRT_RATE_FLAG, "rx_lane_rate",
+                                 "RX Lane Rate "
+                                 "[HDR,EDR,FDR10,FDR,QDR,DDR,SDR,400G_8X,200G_4X,100G_2X,50G_1X,100G,100G_4X,50G,50G_"
+                                 "2X,25G,40X,10G,2.5G,1G]  (Optional - Default 25G)");
     printf(IDENT);
-    MlxlinkRecord::printFlagLine(
-      PPTT_RATE_FLAG_SHORT, PPTT_RATE_FLAG, "tx_lane_rate",
-      "TX Lane Rate [HDR,EDR,FDR10,FDR,QDR,DDR,SDR,400G_8X,200G_4X,100G_2X,50G_1X,100G,100G_4X,50G,50G_2X,25G,40X,10G,2.5G,1G]  (Optional - Default 25G)");
+    MlxlinkRecord::printFlagLine(PPTT_RATE_FLAG_SHORT, PPTT_RATE_FLAG, "tx_lane_rate",
+                                 "TX Lane Rate "
+                                 "[HDR,EDR,FDR10,FDR,QDR,DDR,SDR,400G_8X,200G_4X,100G_2X,50G_1X,100G,100G_4X,50G,50G_"
+                                 "2X,25G,40X,10G,2.5G,1G]  (Optional - Default 25G)");
     printf(IDENT);
     MlxlinkRecord::printFlagLine(PRBS_INVERT_TX_POL_FLAG_SHORT, PRBS_INVERT_TX_POL_FLAG, "",
                                  "PRBS TX polarity inversion (Optional - Default No Inversion)");
@@ -220,9 +236,9 @@ void MlxlinkUi::printSynopsisCommands()
     MlxlinkRecord::printFlagLine(CABLE_PRBS_GEN_INV_SHORT, CABLE_PRBS_GEN_INV, "",
                                  "Enable PRBS generator inversion (Optional)");
     printf(IDENT3);
-    MlxlinkRecord::printFlagLine(
-      CABLE_PRBS_GEN_LANES_SHORT, CABLE_PRBS_GEN_LANES, "lanes",
-      "PRBS generator lanes to set (one or more lane separated by comma)[0,1,2,3,4,5,6,7] (Optional - Default all lanes)");
+    MlxlinkRecord::printFlagLine(CABLE_PRBS_GEN_LANES_SHORT, CABLE_PRBS_GEN_LANES, "lanes",
+                                 "PRBS generator lanes to set (one or more lane separated by comma)[0,1,2,3,4,5,6,7] "
+                                 "(Optional - Default all lanes)");
     printf(IDENT3);
     MlxlinkRecord::printFlagLine(
       CABLE_PRBS_CH_PAT_SHORT, CABLE_PRBS_CH_PAT, "pattern",
@@ -234,13 +250,13 @@ void MlxlinkUi::printSynopsisCommands()
     MlxlinkRecord::printFlagLine(CABLE_PRBS_CH_INV_SHORT, CABLE_PRBS_CH_INV, "",
                                  "Enable PRBS checker inversion (Optional)");
     printf(IDENT3);
-    MlxlinkRecord::printFlagLine(
-      CABLE_PRBS_CH_LANES_SHORT, CABLE_PRBS_CH_LANES, "lanes",
-      "PRBS checker lanes to set (one or more lane separated by comma)[0,1,2,3,4,5,6,7] (Optional - Default all lanes)");
+    MlxlinkRecord::printFlagLine(CABLE_PRBS_CH_LANES_SHORT, CABLE_PRBS_CH_LANES, "lanes",
+                                 "PRBS checker lanes to set (one or more lane separated by comma)[0,1,2,3,4,5,6,7] "
+                                 "(Optional - Default all lanes)");
     printf(IDENT3);
-    MlxlinkRecord::printFlagLine(
-      CABLE_PRBS_LANE_RATE_SHORT, CABLE_PRBS_LANE_RATE, "rate",
-      "Set PRBS checker and generator lane rate [HDR(50G)(default),1.25G,SDR(2.5G),10.3125G,FDR(14G),EDR(25G),NDR(100G)]");
+    MlxlinkRecord::printFlagLine(CABLE_PRBS_LANE_RATE_SHORT, CABLE_PRBS_LANE_RATE, "rate",
+                                 "Set PRBS checker and generator lane rate "
+                                 "[HDR(50G)(default),1.25G,SDR(2.5G),10.3125G,FDR(14G),EDR(25G),NDR(100G)]");
     printf(IDENT2);
     MlxlinkRecord::printFlagLine(CABLE_PRBS_SHOW_DIAG_SHORT, CABLE_PRBS_SHOW_DIAG, "",
                                  "Show PRBS diagnostic counters information");
@@ -252,7 +268,7 @@ void MlxlinkUi::printSynopsisCommands()
     printf(IDENT2);
     MlxlinkRecord::printFlagLine(
       CTRL_PARAM_TX_EQ_FLAG_SHORT, CTRL_PARAM_TX_EQ_FLAG, "value",
-      "Set Module Tx Input Equalization in dB [NE(No Equalization),1,2,3,4,5,6,7,9,10,11,12]");
+      "Set Module Tx Input Equalization in dB [NE(No Equalization),1,2,3,4,5,6,7,8,9,10,11,12]");
     printf(IDENT2);
     MlxlinkRecord::printFlagLine(CTRL_PARAM_RX_EMPH_FLAG_SHORT, CTRL_PARAM_RX_EMPH_FLAG, "value",
                                  "Set Module RX Output Emphasis in dB. for CMIS, pre-emphasis value will be set "
@@ -267,9 +283,9 @@ void MlxlinkUi::printSynopsisCommands()
 
     MlxlinkRecord::printFlagLine(MARGIN_SCAN_FLAG_SHORT, MARGIN_SCAN_FLAG, "", "Read the SerDes eye margins per lane");
     printf(IDENT);
-    MlxlinkRecord::printFlagLine(
-      EYE_MEASURE_TIME_FLAG_SHORT, EYE_MEASURE_TIME_FLAG, "time",
-      "Measure time in seconds for single eye [10/30/60/90/120/240/480/600/900] (Optional - Default 60 for PCIe and 30 for Network ports)");
+    MlxlinkRecord::printFlagLine(EYE_MEASURE_TIME_FLAG_SHORT, EYE_MEASURE_TIME_FLAG, "time",
+                                 "Measure time in seconds for single eye [10/30/60/90/120/240/480/600/900] (Optional - "
+                                 "Default 60 for PCIe and 30 for Network ports)");
     printf(IDENT);
     MlxlinkRecord::printFlagLine(EYE_SEL_FLAG_SHORT, EYE_SEL_FLAG, "eye_sel",
                                  "Eye selection for PAM4 [UP/MID/DOWN/ALL] (Optional - Default ALL)");
@@ -330,10 +346,9 @@ void MlxlinkUi::printHelp()
     printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Port Speeds",
            MLXLINK_EXEC " -d <device> -p <port_number> --speeds 25G,50G,100G");
     printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure FEC", MLXLINK_EXEC " -d <device> -p <port_number> --fec RS");
-    printf(
-      IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Port for Physical Test Mode",
-      MLXLINK_EXEC
-      " -d <device> -p <port_number> --test_mode EN (--rx_prbs PRBS31 --rx_rate 25G --tx_prbs PRBS7 --tx_rate 10G)");
+    printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Port for Physical Test Mode",
+           MLXLINK_EXEC " -d <device> -p <port_number> --test_mode EN (--rx_prbs PRBS31 --rx_rate 25G --tx_prbs PRBS7 "
+                        "--tx_rate 10G)");
     printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Perform PRBS Tuning",
            MLXLINK_EXEC " -d <device> -p <port_number> --test_mode TU");
     printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Cable operations", MLXLINK_EXEC " -d <device> --cable options");
@@ -347,17 +362,17 @@ void MlxlinkUi::printHelp()
            " -d <device> --cable --write <bytes separated by comma> --page <page number> --offset <bytes offset> ");
     if (_mlxlinkCommander->_userInput._advancedMode)
     {
-        printf(
-          IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Transmitter Parameters (on lane, to database)",
-          MLXLINK_EXEC
-          " -d <device> -p <port_number> --serdes_tx <polarity>,<ob_tap0>,<ob_tap1>,<ob_tap2>,<ob_bias>,<ob_preemp_mode>,<ob_reg>,<ob_leva> (--serdes_tx_lane <lane number>) (--database)");
+        printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Transmitter Parameters (on lane, to database)",
+               MLXLINK_EXEC " -d <device> -p <port_number> --serdes_tx "
+                            "<polarity>,<ob_tap0>,<ob_tap1>,<ob_tap2>,<ob_bias>,<ob_preemp_mode>,<ob_reg>,<ob_leva> "
+                            "(--serdes_tx_lane <lane number>) (--database)");
     }
     else
     {
-        printf(
-          IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Transmitter Parameters (on lane, to database)",
-          MLXLINK_EXEC
-          " -d <device> -p <port_number> --serdes_tx <polarity>,<ob_tap0>,<ob_tap1>,<ob_tap2>,<ob_bias>,<ob_preemp_mode> (--serdes_tx_lane <lane number>) (--database)");
+        printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Transmitter Parameters (on lane, to database)",
+               MLXLINK_EXEC " -d <device> -p <port_number> --serdes_tx "
+                            "<polarity>,<ob_tap0>,<ob_tap1>,<ob_tap2>,<ob_bias>,<ob_preemp_mode> (--serdes_tx_lane "
+                            "<lane number>) (--database)");
     }
     printf(IDENT2 "%-40s: \n" IDENT3 "%s\n", "Configure Transmitter Parameters for 16nm devices",
            MLXLINK_EXEC
@@ -421,8 +436,8 @@ void MlxlinkUi::validatePCIeParams()
         {
             if (dpnFlags)
             {
-                throw MlxRegException(
-                  "For PCIE port, either port flag or depth, pcie_index and node flags should be specified");
+                throw MlxRegException("For PCIE port, either port flag or depth, pcie_index and node flags should be "
+                                      "specified");
             }
         }
     }
@@ -504,11 +519,17 @@ void MlxlinkUi::validateModulePRBSParams()
     {
         throw MlxRegException("--" CABLE_PRBS_MODE " flag should be provided!");
     }
+    if (_mlxlinkCommander->_userInput.modulePrbsParams[MODULE_PRBS_MODE] == "DS" &&
+        _mlxlinkCommander->_userInput.modulePrbsParams.size() > 2)
+    {
+        throw MlxRegException("PRBS module parameters flags are valid only with PRBS enable mode (--prbs_mode EN)");
+    }
 
     if (_mlxlinkCommander->_userInput.isPrbsModeProvided &&
         (_mlxlinkCommander->_userInput.isPrbsShowDiagProvided || _mlxlinkCommander->_userInput.isPrbsClearDiagProvided))
     {
-        throw MlxRegException("PRBS Module Diagnostic info flags are not working while configuring the PRBS test mode!");
+        throw MlxRegException("PRBS Module Diagnostic info flags are not working while configuring the PRBS test "
+                              "mode!");
     }
 
     if (_mlxlinkCommander->_userInput.isPrbsShowDiagProvided && _mlxlinkCommander->_userInput.isPrbsClearDiagProvided)

From 907154b6c7e881672099ff93d0332df37f17e8f8 Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Sun, 3 Jul 2022 10:01:56 +0300
Subject: [PATCH 10/46] [mstlink] Loopback code alignment

Description:
Loopback code alignment

Issue: 3088101
Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/mlxlink_amBER_collector.cpp |  2 +-
 mlxlink/modules/mlxlink_commander.cpp       | 50 +++++++++------------
 mlxlink/modules/mlxlink_enums.h             | 10 +++--
 mlxlink/modules/mlxlink_maps.cpp            | 19 ++++----
 mlxlink/modules/mlxlink_maps.h              |  2 +-
 mlxlink/modules/mlxlink_utils.cpp           | 10 +++--
 6 files changed, 45 insertions(+), 48 deletions(-)

diff --git a/mlxlink/modules/mlxlink_amBER_collector.cpp b/mlxlink/modules/mlxlink_amBER_collector.cpp
index 3e448e94..f01d872b 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.cpp
+++ b/mlxlink/modules/mlxlink_amBER_collector.cpp
@@ -559,7 +559,7 @@ vector<AmberField> MlxlinkAmBerCollector::getPhyOperationInfo()
         fields.push_back(AmberField("cable_proto_cap", cableProtoCapStr));
         u_int32_t phyMngrFsmState = getFieldValue("phy_mngr_fsm_state");
         string loopbackMode = (phyMngrFsmState != PHY_MNGR_DISABLED) ?
-                                _mlxlinkMaps->_loopbackModeList[getFieldValue("loopback_mode")] :
+                                _mlxlinkMaps->_loopbackModeList[getFieldValue("loopback_mode")].second :
                                 "-1";
         u_int32_t fecModeRequest = (u_int32_t)log2((float)getFieldValue("fec_mode_request"));
         fields.push_back(AmberField("loopback_mode", loopbackMode));
diff --git a/mlxlink/modules/mlxlink_commander.cpp b/mlxlink/modules/mlxlink_commander.cpp
index 69aea420..dec2699b 100644
--- a/mlxlink/modules/mlxlink_commander.cpp
+++ b/mlxlink/modules/mlxlink_commander.cpp
@@ -1848,7 +1848,7 @@ void MlxlinkCommander::operatingInfoPage()
         setPrintVal(_operatingInfoCmd, "FEC", fec_mode_str == "" ? "N/A" : fec_mode_str,
                     fec_mode_str == "" ? MlxlinkRecord::state2Color(0) : color, !_prbsTestMode, _linkUP);
 
-        setPrintVal(_operatingInfoCmd, "Loopback Mode", _mlxlinkMaps->_loopbackModeList[loopbackMode],
+        setPrintVal(_operatingInfoCmd, "Loopback Mode", _mlxlinkMaps->_loopbackModeList[loopbackMode].second,
                     getLoopbackColor(loopbackMode), true, !_prbsTestMode && loopbackMode != -1);
         setPrintVal(_operatingInfoCmd, "Auto Negotiation", _mlxlinkMaps->_anDisableList[_anDisable] + _speedForce,
                     getAnDisableColor(_anDisable), true, !_prbsTestMode);
@@ -4769,14 +4769,13 @@ void MlxlinkCommander::sendSltp()
 
 string MlxlinkCommander::getLoopbackStr(u_int32_t loopbackCapMask)
 {
-    string loopbackStr = "";
-    for (map<u_int32_t, string>::iterator it = _mlxlinkMaps->_loopbackModeList.begin();
-         it != _mlxlinkMaps->_loopbackModeList.end();
-         it++)
+    string loopbackStr = _mlxlinkMaps->_loopbackModeList[LOOPBACK_MODE_NO].first + "(" +
+                         _mlxlinkMaps->_loopbackModeList[LOOPBACK_MODE_NO].second + ")/";
+    for (const auto& lbConf : _mlxlinkMaps->_loopbackModeList)
     {
-        if ((it->first != PHY_REMOTE_LOOPBACK) && (it->first & loopbackCapMask) && !it->second.empty())
+        if ((lbConf.first & loopbackCapMask) && !lbConf.second.second.empty())
         {
-            loopbackStr += it->second + ",";
+            loopbackStr += lbConf.second.first + "(" + lbConf.second.second + ")/";
         }
     }
     return deleteLastChar(loopbackStr);
@@ -4792,17 +4791,17 @@ void MlxlinkCommander::checkPplrCap()
     genBuffSendRegister(regName, MACCESS_REG_METHOD_GET);
     u_int32_t loopBackCap = getFieldValue("lb_cap");
     u_int32_t loopBackVal = getLoopbackMode(_userInput._pplrLB);
-    if (loopBackVal != PHY_NO_LOOPBACK)
+    if (loopBackVal != LOOPBACK_MODE_NO)
     {
         if (!(loopBackCap & getLoopbackMode(_userInput._pplrLB)))
         {
             string supportedLoopbacks = getLoopbackStr(loopBackCap);
-            throw MlxRegException("selected loopback not supported\n"
-                                  "Supported Loopback modes for the device: [%s]",
-                                  supportedLoopbacks.c_str());
+            throw MlxRegException(
+              "\n%s Loopback configuration is not supported, supported Loopback configurations are [%s]",
+              _userInput._pplrLB.c_str(), supportedLoopbacks.c_str());
         }
     }
-    if (loopBackVal == PHY_REMOTE_LOOPBACK && _productTechnology < PRODUCT_7NM)
+    if (loopBackVal == LOOPBACK_MODE_REMOTE && _productTechnology < PRODUCT_7NM)
     {
         string warMsg = "Remote loopback mode pre-request (all should be satisfied):\n";
         warMsg += "1. Remote loopback is supported only in force mode.\n";
@@ -4820,14 +4819,13 @@ void MlxlinkCommander::sendPplr()
         MlxlinkRecord::printCmdLine("Configuring Port Loopback", _jsonRoot);
 
         checkPplrCap();
-        string regName = "PPLR";
-        resetParser(regName);
+        resetParser(ACCESS_REG_PPLR);
         updatePortType();
 
         updateField("local_port", _localPort);
         updateField("lb_en", getLoopbackMode(_userInput._pplrLB));
 
-        genBuffSendRegister(regName, MACCESS_REG_METHOD_SET);
+        genBuffSendRegister(ACCESS_REG_PPLR, MACCESS_REG_METHOD_SET);
     }
     catch (const std::exception& exc)
     {
@@ -4838,23 +4836,15 @@ void MlxlinkCommander::sendPplr()
 
 u_int32_t MlxlinkCommander::getLoopbackMode(const string& lb)
 {
-    if (lb == "NO")
-    {
-        return PHY_NO_LOOPBACK;
-    }
-    if (lb == "RM")
-    {
-        return PHY_REMOTE_LOOPBACK;
-    }
-    if (lb == "PH")
-    {
-        return PHY_LOCAL_LOOPBACK;
-    }
-    if (lb == "EX")
+    auto it = find_if(_mlxlinkMaps->_loopbackModeList.begin(), _mlxlinkMaps->_loopbackModeList.end(),
+                      [lb](pair<u_int32_t, pair<string, string>> lpConf) { return lb == lpConf.second.first; });
+
+    if (it == _mlxlinkMaps->_loopbackModeList.end())
     {
-        return EXTERNAL_LOCAL_LOOPBACK;
+        throw MlxRegException("Invalid loopback option: %s, see tool usage \"%s --help\"", lb.c_str(), MLXLINK_EXEC);
     }
-    throw MlxRegException("Invalid loopback option: %s, see tool usage \"%s --help\"", lb.c_str(), MLXLINK_EXEC);
+
+    return it->first;
 }
 
 void MlxlinkCommander::sendPepc()
diff --git a/mlxlink/modules/mlxlink_enums.h b/mlxlink/modules/mlxlink_enums.h
index d2f73ab7..33d9ae8b 100644
--- a/mlxlink/modules/mlxlink_enums.h
+++ b/mlxlink/modules/mlxlink_enums.h
@@ -75,6 +75,7 @@
 #define ACCESS_REG_PMPT "PMPT"
 #define ACCESS_REG_PMPD "PMPD"
 #define ACCESS_REG_PMTM "PMTM"
+#define ACCESS_REG_PPLR "PPLR"
 // define all used regs above this line
 
 #define QSFP_CHANNELS 4
@@ -1282,10 +1283,11 @@ enum PORT_STATE
 
 enum LOOPBACK_MODE
 {
-    PHY_NO_LOOPBACK = 0,
-    PHY_REMOTE_LOOPBACK = 1,
-    PHY_LOCAL_LOOPBACK = 2,
-    EXTERNAL_LOCAL_LOOPBACK = 4
+    LOOPBACK_MODE_NO = 0x0,
+    LOOPBACK_MODE_REMOTE = 0x1,
+    LOOPBACK_MODE_LOCAL = 0x2,
+    LOOPBACK_MODE_EXTERNAL = 0x4,
+    LOOPBACK_MODE_LL = 0x40
 };
 
 enum AN_DISABLE
diff --git a/mlxlink/modules/mlxlink_maps.cpp b/mlxlink/modules/mlxlink_maps.cpp
index f94caaac..ba0069a1 100644
--- a/mlxlink/modules/mlxlink_maps.cpp
+++ b/mlxlink/modules/mlxlink_maps.cpp
@@ -48,10 +48,12 @@ MlxlinkMaps* MlxlinkMaps::getInstance()
 void MlxlinkMaps::initPublicStrings()
 {
     _berCollectTitle =
-      "Test Mode (Nominal/Corner/Drift),Protocol,Speed [Gb/s],Active FEC,Iteration Number,Device PN,FW Version,Device ID,Port Number,Media,Cable PN,Length [m],Attenuation [dB],"
-      "Test time [Min],Raw Errors Lane 0,Raw Errors Lane 1,Raw Errors Lane 2,Raw Errors Lane 3,Raw Errors Lane 4,Raw Errors Lane 5,Raw Errors Lane 6,Raw Errors Lane 7,Link Down,Total Raw BER,Raw BER limit,"
-      "Effective Errors,Effective BER,Result,System Voltage,Chip Start Temp,Chip End Temp,Module Start Temp,Module End Temp,Active RTN,Device SN,Cable SN,RX End BW [Gb/s]";
-    _sltpHeader = "";
+      "Test Mode (Nominal/Corner/Drift),Protocol,Speed [Gb/s],Active FEC,Iteration Number,Device PN,FW Version,Device "
+      "ID,Port Number,Media,Cable PN,Length [m],Attenuation [dB],"
+      "Test time [Min],Raw Errors Lane 0,Raw Errors Lane 1,Raw Errors Lane 2,Raw Errors Lane 3,Raw Errors Lane 4,Raw "
+      "Errors Lane 5,Raw Errors Lane 6,Raw Errors Lane 7,Link Down,Total Raw BER,Raw BER limit,"
+      "Effective Errors,Effective BER,Result,System Voltage,Chip Start Temp,Chip End Temp,Module Start Temp,Module End "
+      "Temp,Active RTN,Device SN,Cable SN,RX End BW [Gb/s]";
     _showErrorsTitle = "Errors";
 }
 
@@ -177,10 +179,11 @@ void MlxlinkMaps::initFecAndLoopbackMapping()
     _fecPerSpeed.push_back(make_pair("25G", ""));
     _fecPerSpeed.push_back(make_pair("10G", ""));
 
-    _loopbackModeList[PHY_NO_LOOPBACK] = "No Loopback";
-    _loopbackModeList[PHY_REMOTE_LOOPBACK] = "PHY Remote Loopback";
-    _loopbackModeList[PHY_LOCAL_LOOPBACK] = "PHY Local Loopback";
-    _loopbackModeList[EXTERNAL_LOCAL_LOOPBACK] = "External Local Loopback";
+    _loopbackModeList[LOOPBACK_MODE_NO] = make_pair("NO", "No Loopback");
+    _loopbackModeList[LOOPBACK_MODE_REMOTE] = make_pair("RM", "PHY Remote Loopback");
+    _loopbackModeList[LOOPBACK_MODE_LOCAL] = make_pair("PH", "PHY Local Loopback");
+    _loopbackModeList[LOOPBACK_MODE_EXTERNAL] = make_pair("EX", "External Local Loopback");
+    _loopbackModeList[LOOPBACK_MODE_LL] = make_pair("LL", "Link Layer Local Loopback");
 }
 
 void MlxlinkMaps::ethSpeedMapping()
diff --git a/mlxlink/modules/mlxlink_maps.h b/mlxlink/modules/mlxlink_maps.h
index a38f1eb6..141c2d21 100644
--- a/mlxlink/modules/mlxlink_maps.h
+++ b/mlxlink/modules/mlxlink_maps.h
@@ -204,7 +204,7 @@ class MlxlinkMaps
     std::map<u_int32_t, std::string> _fecModeActive;
     std::map<u_int32_t, pair<string, string>> _fecModeMask;
     std::vector<pair<string, string>> _fecPerSpeed;
-    std::map<u_int32_t, std::string> _loopbackModeList;
+    std::map<u_int32_t, pair<string, string>> _loopbackModeList;
     std::map<u_int32_t, std::string> _anDisableList;
     std::map<u_int32_t, std::string> _tech;
     std::map<u_int32_t, std::string> _cableComplianceSfp;
diff --git a/mlxlink/modules/mlxlink_utils.cpp b/mlxlink/modules/mlxlink_utils.cpp
index 78571a8a..031593b2 100644
--- a/mlxlink/modules/mlxlink_utils.cpp
+++ b/mlxlink/modules/mlxlink_utils.cpp
@@ -134,21 +134,23 @@ string getLoopbackColor(u_int32_t loopbackMode)
 {
     switch (loopbackMode)
     {
-        case PHY_NO_LOOPBACK:
+        case LOOPBACK_MODE_NO:
             return ANSI_COLOR_GREEN;
             break;
 
-        case PHY_REMOTE_LOOPBACK:
+        case LOOPBACK_MODE_REMOTE:
             return ANSI_COLOR_CYAN;
             break;
 
-        case PHY_LOCAL_LOOPBACK:
+        case LOOPBACK_MODE_LOCAL:
             return ANSI_COLOR_BLUE;
             break;
 
-        case EXTERNAL_LOCAL_LOOPBACK:
+        case LOOPBACK_MODE_EXTERNAL:
             return ANSI_COLOR_MAGENTA;
 
+        case LOOPBACK_MODE_LL:
+            return ANSI_COLOR_YELLOW;
         default:
             return ANSI_COLOR_RED;
     }

From 283ae1662de7ce327373b80ef0a03fd331ef56bf Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Sun, 3 Jul 2022 11:46:13 +0300
Subject: [PATCH 11/46] [mstlink] Amber collection code alignment

Description:
Amber collection code alignment

Issue: 3088117
Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/amber_field.cpp             |   2 +-
 mlxlink/modules/amber_field.h               |   2 +-
 mlxlink/modules/mlxlink_amBER_collector.cpp | 152 +++++++++++++++-----
 mlxlink/modules/mlxlink_amBER_collector.h   |   6 +-
 mlxlink/modules/mlxlink_enums.h             |   3 +-
 5 files changed, 122 insertions(+), 43 deletions(-)

diff --git a/mlxlink/modules/amber_field.cpp b/mlxlink/modules/amber_field.cpp
index b9246dc9..28000076 100644
--- a/mlxlink/modules/amber_field.cpp
+++ b/mlxlink/modules/amber_field.cpp
@@ -133,7 +133,7 @@ u_int64_t AmberField::getPrmValue() const
     return _prmValue;
 }
 
-bool AmberField::isVisible()
+bool AmberField::isVisible() const
 {
     return _visible;
 }
diff --git a/mlxlink/modules/amber_field.h b/mlxlink/modules/amber_field.h
index 8d96fe8f..c5388fb3 100644
--- a/mlxlink/modules/amber_field.h
+++ b/mlxlink/modules/amber_field.h
@@ -52,7 +52,7 @@ class AmberField
     string getUiField() const;
     string getUiValue() const;
     u_int64_t getPrmValue() const;
-    bool isVisible();
+    bool isVisible() const;
     u_int32_t getFieldIndex() const;
     static void reset();
     static string getValueFromFields(const vector<AmberField>& fields, const string& uiField, bool matchUiField = true);
diff --git a/mlxlink/modules/mlxlink_amBER_collector.cpp b/mlxlink/modules/mlxlink_amBER_collector.cpp
index f01d872b..39d497f3 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.cpp
+++ b/mlxlink/modules/mlxlink_amBER_collector.cpp
@@ -73,6 +73,26 @@ MlxlinkAmBerCollector::MlxlinkAmBerCollector(Json::Value& jsonRoot) : _jsonRoot(
     _invalidate = false;
 
     _mlxlinkMaps = NULL;
+
+    _baseSheetsList[AMBER_SHEET_GENERAL] = FIELDS_COUNT{4, 4, 4};
+    _baseSheetsList[AMBER_SHEET_INDEXES] = FIELDS_COUNT{2, 2, 4};
+    _baseSheetsList[AMBER_SHEET_LINK_STATUS] = FIELDS_COUNT{48, 139, 6};
+    _baseSheetsList[AMBER_SHEET_MODULE_STATUS] = FIELDS_COUNT{111, 111, 0};
+    _baseSheetsList[AMBER_SHEET_SYSTEM] = FIELDS_COUNT{16, 21, 11};
+    _baseSheetsList[AMBER_SHEET_SERDES_16NM] = FIELDS_COUNT{376, 736, 0};
+    _baseSheetsList[AMBER_SHEET_SERDES_7NM] = FIELDS_COUNT{203, 323, 499};
+    _baseSheetsList[AMBER_SHEET_PORT_COUNTERS] = FIELDS_COUNT{35, 0, 35};
+    _baseSheetsList[AMBER_SHEET_TROUBLESHOOTING] = FIELDS_COUNT{2, 2, 0};
+    _baseSheetsList[AMBER_SHEET_PHY_OPERATION_INFO] = FIELDS_COUNT{18, 18, 15};
+    _baseSheetsList[AMBER_SHEET_LINK_UP_INFO] = FIELDS_COUNT{9, 9, 0};
+    _baseSheetsList[AMBER_SHEET_LINK_DOWN_INFO] = FIELDS_COUNT{5, 5, 0};
+    _baseSheetsList[AMBER_SHEET_TEST_MODE_INFO] = FIELDS_COUNT{68, 136, 0};
+    _baseSheetsList[AMBER_SHEET_TEST_MODE_MODULE_INFO] = FIELDS_COUNT{58, 110, 0};
+    _baseSheetsList[AMBER_SHEET_PHY_DEBUG_INFO] = FIELDS_COUNT{4, 4, 0};
+
+    for_each(_baseSheetsList.begin(), _baseSheetsList.end(), [&](pair<AMBER_SHEET, FIELDS_COUNT> sheet) {
+        _sheetsList.push_back({sheet.first, sheet.second});
+    });
 }
 
 MlxlinkAmBerCollector::~MlxlinkAmBerCollector() {}
@@ -268,27 +288,25 @@ void MlxlinkAmBerCollector::init()
             _maxLanes = MAX_PCIE_LANES;
         }
 
-        _sheetsList[AMBER_SHEET_GENERAL] = FIELDS_COUNT{4, 4, 4};
-        _sheetsList[AMBER_SHEET_INDEXES] = FIELDS_COUNT{2, 2, 4};
-        _sheetsList[AMBER_SHEET_LINK_STATUS] = FIELDS_COUNT{48, 139, 6};
-        _sheetsList[AMBER_SHEET_MODULE_STATUS] = FIELDS_COUNT{111, 111, 0};
-        _sheetsList[AMBER_SHEET_SYSTEM] = FIELDS_COUNT{16, 21, 11};
-        _sheetsList[AMBER_SHEET_SERDES_16NM] = FIELDS_COUNT{376, 736, 0};
-        _sheetsList[AMBER_SHEET_SERDES_7NM] = FIELDS_COUNT{203, 323, 65};
-        _sheetsList[AMBER_SHEET_PORT_COUNTERS] = FIELDS_COUNT{35, 0, 35};
-        _sheetsList[AMBER_SHEET_TROUBLESHOOTING] = FIELDS_COUNT{2, 2, 0};
-        _sheetsList[AMBER_SHEET_PHY_OPERATION_INFO] = FIELDS_COUNT{18, 18, 15};
-        _sheetsList[AMBER_SHEET_LINK_UP_INFO] = FIELDS_COUNT{9, 9, 0};
-        _sheetsList[AMBER_SHEET_LINK_DOWN_INFO] = FIELDS_COUNT{5, 5, 0};
-        _sheetsList[AMBER_SHEET_TEST_MODE_INFO] = FIELDS_COUNT{68, 136, 0};
-        _sheetsList[AMBER_SHEET_TEST_MODE_MODULE_INFO] = FIELDS_COUNT{58, 110, 0};
-        _sheetsList[AMBER_SHEET_PHY_DEBUG_INFO] = FIELDS_COUNT{4, 4, 0};
+        initAmberSheetsToDump();
     }
     catch (...)
     {
     }
 }
 
+void MlxlinkAmBerCollector::initAmberSheetsToDump()
+{
+    // Custom sheet\s dump
+    if (!_sheetsToDump.empty())
+    {
+        _sheetsList.clear();
+        for_each(_sheetsToDump.begin(), _sheetsToDump.end(), [&](AMBER_SHEET& sheet) {
+            _sheetsList.push_back({sheet, _baseSheetsList[sheet]});
+        });
+    }
+}
+
 bool MlxlinkAmBerCollector::isGBValid()
 {
     return _isGBSysValid;
@@ -914,7 +932,7 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesNDR()
         vector<vector<string>> sltpParams(PARAMS_7NM_LAST + 1, vector<string>(_maxLanes, ""));
         u_int32_t lane = 0;
         // Getting 7nm SLRG information for all lanes
-        for (; lane < _maxLanes; lane++)
+        for (; lane < _numOfLanes; lane++)
         {
             resetLocalParser(ACCESS_REG_SLRG);
             updateField("local_port", _localPort);
@@ -943,7 +961,7 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesNDR()
         if (!_isPortPCIE)
         {
             // Getting 7nm SLTP information for all lanes
-            for (lane = 0; lane < _maxLanes; lane++)
+            for (lane = 0; lane < _numOfLanes; lane++)
             {
                 resetLocalParser(ACCESS_REG_SLTP);
                 updateField("local_port", _localPort);
@@ -1763,7 +1781,7 @@ void MlxlinkAmBerCollector::getTestModePrpsInfo(const string& prbsReg, vector<ve
         laneRateStr = "lane_rate_oper";
     }
 
-    for (u_int32_t lane = 0; lane < _maxLanes; lane++)
+    for (u_int32_t lane = 0; lane < _numOfLanes; lane++)
     {
         resetLocalParser(prbsReg);
         updateField("local_port", _localPort);
@@ -1857,7 +1875,7 @@ void MlxlinkAmBerCollector::getTestModeModulePMPT(vector<AmberField>& fields, st
 
 void MlxlinkAmBerCollector::getTestModeModulePMPD(vector<AmberField>& fields, string moduleSide)
 {
-    vector<vector<string>> pmpdParams(PMPD_PARAM_LAST, vector<string>(_numOfLanes, ""));
+    vector<vector<string>> pmpdParams(PMPD_PARAM_LAST, vector<string>(_maxLanes, ""));
 
     for (u_int32_t lane = 0; lane < _maxLanes; lane++)
     {
@@ -1867,7 +1885,6 @@ void MlxlinkAmBerCollector::getTestModeModulePMPD(vector<AmberField>& fields, st
         updateField("host_media", moduleSide == "host");
         updateField("lane", lane);
         sendRegister(ACCESS_REG_PMPD, MACCESS_REG_METHOD_GET);
-        ;
 
         pmpdParams[PMPD_PARAM_STATUS][lane] = getStrByValue(getFieldValue("status"), _mlxlinkMaps->_modulePMPDStatus);
         pmpdParams[PMPD_PARAM_PRBS_BITS][lane] =
@@ -1939,6 +1956,8 @@ void MlxlinkAmBerCollector::groupValidIf(bool condition)
 vector<AmberField> MlxlinkAmBerCollector::collectSheet(AMBER_SHEET sheet)
 {
     vector<AmberField> fields;
+    bool invalidSheet = false;
+    _invalidate = false;
     fields.push_back(AmberField("N/A", "N/A"));
 
     AmberField::reset();
@@ -1973,63 +1992,105 @@ vector<AmberField> MlxlinkAmBerCollector::collectSheet(AMBER_SHEET sheet)
             {
                 fields = getPortCounters();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_TROUBLESHOOTING:
             if (!_inPRBSMode)
             {
                 fields = getTroubleshootingInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_PHY_OPERATION_INFO:
             if (!_inPRBSMode)
             {
                 fields = getPhyOperationInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_LINK_UP_INFO:
             if (!_inPRBSMode)
             {
                 fields = getLinkUpInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_LINK_DOWN_INFO:
             if (!_inPRBSMode)
             {
                 fields = getLinkDownInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_TEST_MODE_INFO:
             if (_inPRBSMode)
             {
                 fields = getTestModeInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_TEST_MODE_MODULE_INFO:
             if (_inPRBSMode)
             {
                 fields = getTestModeModuleInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
         case AMBER_SHEET_PHY_DEBUG_INFO:
             if (!_inPRBSMode)
             {
                 fields = getPhyDebugInfo();
             }
+            else if (isIn(sheet, _sheetsToDump))
+            {
+                invalidSheet = true;
+            }
             break;
+        default:
+            throw MlxRegException("Invalid amBER page index: %d", sheet);
+    }
+
+    if (!_sheetsToDump.empty())
+    {
+        if (invalidSheet)
+        {
+            string mode = _inPRBSMode ? "Operational mode" : "PRBS test mode";
+            throw MlxRegException("Page %d is valid in %s only!", sheet, mode.c_str());
+        }
     }
     return fields;
 }
 
 void MlxlinkAmBerCollector::collect()
 {
-    for (auto it = _sheetsList.begin(); it != _sheetsList.end(); it++)
+    for (const auto& sheet : _sheetsList)
     {
-        auto sheetFields = collectSheet(it->first);
-        if (!sheetFields.empty() && sheetFields.back().getUiField() == "N/A")
+        auto sheetFields = collectSheet(sheet.first);
+        if (sheetFields.empty() || sheetFields.back().getUiField() != "N/A")
         {
-            continue;
+            _amberCollection[sheet.first] = sheetFields;
         }
-        _amberCollection[it->first] = sheetFields;
     }
 }
 
@@ -2056,15 +2117,15 @@ u_int32_t MlxlinkAmBerCollector::fixFieldsData()
     {
         if (_isPortPCIE)
         {
-            lastFieldIndexPerGroup = _sheetsList[(*it).first].numOfPcieFields;
+            lastFieldIndexPerGroup = _sheetsList[getSheetIndex((*it).first)].second.numOfPcieFields;
         }
         else if (_isPortETH)
         {
-            lastFieldIndexPerGroup = _sheetsList[(*it).first].numOfEthFields;
+            lastFieldIndexPerGroup = _sheetsList[getSheetIndex((*it).first)].second.numOfEthFields;
         }
         else if (_isPortIB)
         {
-            lastFieldIndexPerGroup = _sheetsList[(*it).first].numOfIbFields;
+            lastFieldIndexPerGroup = _sheetsList[getSheetIndex((*it).first)].second.numOfIbFields;
         }
         for (u_int32_t fieldIdx = (*it).second.size() + 1; fieldIdx <= lastFieldIndexPerGroup; fieldIdx++)
         {
@@ -2075,6 +2136,19 @@ u_int32_t MlxlinkAmBerCollector::fixFieldsData()
     return totalFields;
 }
 
+u_int32_t MlxlinkAmBerCollector::getSheetIndex(AMBER_SHEET sheet)
+{
+    u_int32_t index = 0;
+    for (; index < _sheetsList.size(); index++)
+    {
+        if (_sheetsList[index].first == sheet)
+        {
+            break;
+        }
+    }
+    return index;
+}
+
 void MlxlinkAmBerCollector::exportToCSV()
 {
     const char* fileName = _csvFileName.c_str();
@@ -2082,19 +2156,18 @@ void MlxlinkAmBerCollector::exportToCSV()
     ofstream berFile(fileName, std::ofstream::app);
 
     u_int32_t totalNumOfFields = fixFieldsData();
-
     // Preparing CSV header line
     if (!ifile.good())
     {
         // Going over all groups inside _amberCollection and getting the field name for each one
-        for (auto it = _amberCollection.begin(); it != _amberCollection.end(); it++)
+        for (const auto& sheet : _sheetsList)
         {
-            for (auto fieldIt = (*it).second.begin(); fieldIt != (*it).second.end(); fieldIt++)
+            for (const auto& field : _amberCollection[sheet.first])
             {
-                if ((*fieldIt).isVisible())
+                if (field.isVisible())
                 {
-                    berFile << (*fieldIt).getUiField();
-                    if ((*fieldIt).getFieldIndex() != (totalNumOfFields - 1))
+                    berFile << field.getUiField();
+                    if (field.getFieldIndex() < totalNumOfFields)
                     {
                         berFile << ",";
                     }
@@ -2105,20 +2178,21 @@ void MlxlinkAmBerCollector::exportToCSV()
     }
     // Preparing CSV values
     // Going over all groups inside _amberCollection and getting the field value for each one
-    for (auto it = _amberCollection.begin(); it != _amberCollection.end(); it++)
+    for (const auto& sheet : _sheetsList)
     {
-        for (auto fieldIt = (*it).second.begin(); fieldIt != (*it).second.end(); fieldIt++)
+        for (const auto& field : _amberCollection[sheet.first])
         {
-            if ((*fieldIt).isVisible())
+            if (field.isVisible())
             {
-                berFile << (*fieldIt).getUiValue();
-                if ((*fieldIt).getFieldIndex() != (totalNumOfFields - 1))
+                berFile << field.getUiValue();
+                if (field.getFieldIndex() < totalNumOfFields)
                 {
                     berFile << ",";
                 }
             }
         }
     }
+
     berFile << endl;
     berFile.close();
 }
diff --git a/mlxlink/modules/mlxlink_amBER_collector.h b/mlxlink/modules/mlxlink_amBER_collector.h
index fb7d8571..72f613d1 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.h
+++ b/mlxlink/modules/mlxlink_amBER_collector.h
@@ -92,6 +92,7 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
     MlxlinkMaps* _mlxlinkMaps;
     vector<PortGroup> _localPorts; // will be valid for switches
     bool _isHca;
+    vector<AMBER_SHEET> _sheetsToDump;
 
 private:
     string getRawFieldValue(const string fieldName);
@@ -123,6 +124,7 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
     void groupValidIf(bool condition);
     void getTestModeModulePMPT(vector<AmberField>& fields, string moduleSide, ModuleAccess_t mode);
     void getTestModeModulePMPD(vector<AmberField>& fields, string moduleSide);
+    u_int32_t getSheetIndex(AMBER_SHEET sheet);
 
     bool _isQsfpCable;
     bool _isSfpCable;
@@ -132,6 +134,7 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
     u_int32_t _splitPort;
     u_int32_t _secondSplit;
     map<AMBER_SHEET, vector<AmberField>> _amberCollection;
+    map<AMBER_SHEET, FIELDS_COUNT> _baseSheetsList;
 
 protected:
     string getBitmaskPerLaneStr(u_int32_t bitmask);
@@ -150,6 +153,7 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
     string getClRawBer();
 
     // Callers
+    void initAmberSheetsToDump();
     vector<AmberField> collectSheet(AMBER_SHEET sheet);
     void collect();
 
@@ -171,7 +175,7 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
 
     Json::Value& _jsonRoot;
     vector<MlxlinkCmdPrint> _amBerCollectorOutput;
-    map<AMBER_SHEET, FIELDS_COUNT> _sheetsList;
+    vector<pair<AMBER_SHEET, FIELDS_COUNT>> _sheetsList;
 
     u_int32_t _activeSpeed;
     u_int32_t _protoActive;
diff --git a/mlxlink/modules/mlxlink_enums.h b/mlxlink/modules/mlxlink_enums.h
index c9c40bc2..f6246c98 100644
--- a/mlxlink/modules/mlxlink_enums.h
+++ b/mlxlink/modules/mlxlink_enums.h
@@ -1446,7 +1446,8 @@ enum AMBER_SHEET
     AMBER_SHEET_LINK_DOWN_INFO = 12,
     AMBER_SHEET_TEST_MODE_INFO = 13,
     AMBER_SHEET_TEST_MODE_MODULE_INFO = 14,
-    AMBER_SHEET_PHY_DEBUG_INFO = 15
+    AMBER_SHEET_PHY_DEBUG_INFO = 15,
+    AMBER_SHEET_ALL // Keep this enum last
 };
 
 enum PCIE_DEVICE_STATUS

From 6b8502a678928eccda9dcfdedb7d412a48cb8cb1 Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Sun, 3 Jul 2022 13:45:31 +0300
Subject: [PATCH 12/46] [mstlink] Serdes Tx and PCIe Grade code alignment

Description:
-> Re-formatting serdes tx code
-> Fixing PCIe eye info flow

Issue: 3088059
Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/mlxlink_amBER_collector.cpp |  95 +++++--
 mlxlink/modules/mlxlink_amBER_collector.h   |   1 +
 mlxlink/modules/mlxlink_commander.cpp       | 270 +++++++++++---------
 mlxlink/modules/mlxlink_commander.h         |  12 +-
 mlxlink/modules/mlxlink_enums.h             |  59 +++--
 mlxlink/modules/mlxlink_maps.cpp            |  23 ++
 mlxlink/modules/mlxlink_maps.h              |  11 +
 7 files changed, 294 insertions(+), 177 deletions(-)

diff --git a/mlxlink/modules/mlxlink_amBER_collector.cpp b/mlxlink/modules/mlxlink_amBER_collector.cpp
index f01d872b..d8ddafda 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.cpp
+++ b/mlxlink/modules/mlxlink_amBER_collector.cpp
@@ -843,7 +843,7 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesHDR()
         if (!_isPortPCIE)
         {
             vector<vector<string>> slrgParams(SLRG_PARAMS_LAST, vector<string>(_maxLanes, ""));
-            vector<vector<string>> sltpParams(PARAMS_16NM_LAST, vector<string>(_maxLanes, ""));
+            vector<vector<string>> sltpParams(SLTP_HDR_LAST, vector<string>(_maxLanes, ""));
             vector<string> sltpStatus;
             u_int32_t lane = 0;
             // Getting 16nm SLRG information for all lanes
@@ -873,24 +873,24 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesHDR()
                 updateField("lane", lane);
                 sendRegister(ACCESS_REG_SLTP, MACCESS_REG_METHOD_GET);
 
-                sltpParams[PRE_2_TAP][lane] = getFieldStr("pre_2_tap");
-                sltpParams[PRE_TAP][lane] = getFieldStr("pre_tap");
-                sltpParams[MAIN_TAP][lane] = getFieldStr("main_tap");
-                sltpParams[POST_TAP][lane] = getFieldStr("post_tap");
-                sltpParams[OB_M2LP][lane] = getFieldStr("ob_m2lp");
-                sltpParams[OB_AMP][lane] = getFieldStr("ob_amp");
-                sltpParams[OB_ALEV_OUT][lane] = getFieldStr("ob_alev_out");
+                sltpParams[SLTP_HDR_PRE_2_TAP][lane] = getFieldStr("pre_2_tap");
+                sltpParams[SLTP_HDR_PRE_TAP][lane] = getFieldStr("pre_tap");
+                sltpParams[SLTP_HDR_MAIN_TAP][lane] = getFieldStr("main_tap");
+                sltpParams[SLTP_HDR_POST_TAP][lane] = getFieldStr("post_tap");
+                sltpParams[SLTP_HDR_OB_M2LP][lane] = getFieldStr("ob_m2lp");
+                sltpParams[SLTP_HDR_OB_AMP][lane] = getFieldStr("ob_amp");
+                sltpParams[SLTP_HDR_OB_ALEV_OUT][lane] = getFieldStr("ob_alev_out");
                 sltpStatus.push_back(getFieldValue("status") ? "Valid" : "Invalid");
             }
 
             fillParamsToFields("tx_status", sltpStatus, fields);
-            fillParamsToFields("pre_2_tap", sltpParams[PRE_2_TAP], fields);
-            fillParamsToFields("pre_tap", sltpParams[PRE_TAP], fields);
-            fillParamsToFields("main_tap", sltpParams[MAIN_TAP], fields);
-            fillParamsToFields("post_tap", sltpParams[POST_TAP], fields);
-            fillParamsToFields("ob_m2lp", sltpParams[OB_M2LP], fields);
-            fillParamsToFields("ob_amp", sltpParams[OB_AMP], fields);
-            fillParamsToFields("ob_alev_out", sltpParams[OB_ALEV_OUT], fields);
+            fillParamsToFields("pre_2_tap", sltpParams[SLTP_HDR_PRE_2_TAP], fields);
+            fillParamsToFields("pre_tap", sltpParams[SLTP_HDR_PRE_TAP], fields);
+            fillParamsToFields("main_tap", sltpParams[SLTP_HDR_MAIN_TAP], fields);
+            fillParamsToFields("post_tap", sltpParams[SLTP_HDR_POST_TAP], fields);
+            fillParamsToFields("ob_m2lp", sltpParams[SLTP_HDR_OB_M2LP], fields);
+            fillParamsToFields("ob_amp", sltpParams[SLTP_HDR_OB_AMP], fields);
+            fillParamsToFields("ob_alev_out", sltpParams[SLTP_HDR_OB_ALEV_OUT], fields);
         }
     }
     catch (const std::exception& exc)
@@ -901,6 +901,46 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesHDR()
     return fields;
 }
 
+u_int32_t MlxlinkAmBerCollector::getFomMeasurement()
+{
+    u_int32_t fomMeasurement = SLRG_EOM_NONE;
+    if (!_isPortPCIE)
+    {
+        fomMeasurement = SLRG_EOM_COMPOSITE;
+        if (!isSpeed25GPerLane(_activeSpeed, _protoActive))
+        {
+            fomMeasurement |= (SLRG_EOM_UPPER | SLRG_EOM_MIDDLE | SLRG_EOM_LOWER);
+        }
+    }
+    else
+    {
+        for (u_int32_t lane = 0; lane < _numOfLanes; lane++)
+        {
+            resetParser(ACCESS_REG_SLRG);
+            updateField("local_port", _localPort);
+            updateField("pnat", PNAT_PCIE);
+            updateField("lane", lane);
+            updateField("fom_measurment", SLRG_EOM_COMPOSITE);
+            genBuffSendRegister(ACCESS_REG_SLRG, MACCESS_REG_METHOD_GET);
+        }
+        u_int32_t it = 0;
+        while (it < SLRG_PCIE_7NM_TIMEOUT)
+        {
+            resetParser(ACCESS_REG_SLRG);
+            updateField("local_port", _localPort);
+            updateField("pnat", PNAT_PCIE);
+            genBuffSendRegister(ACCESS_REG_SLRG, MACCESS_REG_METHOD_GET);
+            if (getFieldValue("status"))
+            {
+                break;
+            }
+            it++;
+            msleep(SLRG_PCIE_7NM_SLEEP);
+        }
+    }
+    return fomMeasurement;
+}
+
 vector<AmberField> MlxlinkAmBerCollector::getSerdesNDR()
 {
     vector<AmberField> fields;
@@ -911,8 +951,10 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesNDR()
         fields.push_back(AmberField("BKV_version", "N/A"));
 
         vector<vector<string>> slrgParams(SLRG_PARAMS_LAST, vector<string>(_maxLanes, ""));
-        vector<vector<string>> sltpParams(PARAMS_7NM_LAST + 1, vector<string>(_maxLanes, ""));
+        vector<vector<string>> sltpParams(SLTP_NDR_LAST + 1, vector<string>(_maxLanes, ""));
+        u_int32_t fomMeasurement = getFomMeasurement();
         u_int32_t lane = 0;
+
         // Getting 7nm SLRG information for all lanes
         for (; lane < _maxLanes; lane++)
         {
@@ -920,6 +962,7 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesNDR()
             updateField("local_port", _localPort);
             updateField("lane", lane);
             updateField("pnat", _pnat);
+            updateField("fom_measurment", fomMeasurement);
             sendRegister(ACCESS_REG_SLRG, MACCESS_REG_METHOD_GET);
 
             slrgParams[SLRG_PARAMS_INITIAL_FOM][lane] = getFieldStr("initial_fom");
@@ -951,17 +994,17 @@ vector<AmberField> MlxlinkAmBerCollector::getSerdesNDR()
                 updateField("pnat", _pnat);
                 sendRegister(ACCESS_REG_SLTP, MACCESS_REG_METHOD_GET);
 
-                sltpParams[FIR_PRE3][lane] = getFieldStr("fir_pre3");
-                sltpParams[FIR_PRE2][lane] = getFieldStr("fir_pre2");
-                sltpParams[FIR_PRE1][lane] = getFieldStr("fir_pre1");
-                sltpParams[FIR_MAIN][lane] = getFieldStr("fir_main");
-                sltpParams[FIR_POST1][lane] = getFieldStr("fir_post1");
+                sltpParams[SLTP_NDR_FIR_PRE3][lane] = getFieldStr("fir_pre3");
+                sltpParams[SLTP_NDR_FIR_PRE2][lane] = getFieldStr("fir_pre2");
+                sltpParams[SLTP_NDR_FIR_PRE1][lane] = getFieldStr("fir_pre1");
+                sltpParams[SLTP_NDR_FIR_MAIN][lane] = getFieldStr("fir_main");
+                sltpParams[SLTP_NDR_FIR_POST1][lane] = getFieldStr("fir_post1");
             }
-            fillParamsToFields("pre_3_tap", sltpParams[FIR_PRE3], fields);
-            fillParamsToFields("pre_2_tap", sltpParams[FIR_PRE2], fields);
-            fillParamsToFields("pre_1_tap", sltpParams[FIR_PRE1], fields);
-            fillParamsToFields("main_tap", sltpParams[FIR_MAIN], fields);
-            fillParamsToFields("post_1_tap", sltpParams[FIR_POST1], fields);
+            fillParamsToFields("pre_3_tap", sltpParams[SLTP_NDR_FIR_PRE3], fields);
+            fillParamsToFields("pre_2_tap", sltpParams[SLTP_NDR_FIR_PRE2], fields);
+            fillParamsToFields("pre_1_tap", sltpParams[SLTP_NDR_FIR_PRE1], fields);
+            fillParamsToFields("main_tap", sltpParams[SLTP_NDR_FIR_MAIN], fields);
+            fillParamsToFields("post_1_tap", sltpParams[SLTP_NDR_FIR_POST1], fields);
         }
     }
     catch (const std::exception& exc)
diff --git a/mlxlink/modules/mlxlink_amBER_collector.h b/mlxlink/modules/mlxlink_amBER_collector.h
index fb7d8571..22de9c3d 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.h
+++ b/mlxlink/modules/mlxlink_amBER_collector.h
@@ -123,6 +123,7 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
     void groupValidIf(bool condition);
     void getTestModeModulePMPT(vector<AmberField>& fields, string moduleSide, ModuleAccess_t mode);
     void getTestModeModulePMPD(vector<AmberField>& fields, string moduleSide);
+    u_int32_t getFomMeasurement();
 
     bool _isQsfpCable;
     bool _isSfpCable;
diff --git a/mlxlink/modules/mlxlink_commander.cpp b/mlxlink/modules/mlxlink_commander.cpp
index dec2699b..6f17bf87 100644
--- a/mlxlink/modules/mlxlink_commander.cpp
+++ b/mlxlink/modules/mlxlink_commander.cpp
@@ -1715,46 +1715,48 @@ string MlxlinkCommander::getComplianceLabel(u_int32_t compliance, u_int32_t extC
     return complianceLabel;
 }
 
-void MlxlinkCommander::prepareSltp28_40nm(std::vector<std::vector<string> >& sltpLanes, u_int32_t laneNumber)
+string MlxlinkCommander::getSltpFieldStr(const PRM_FIELD& field)
 {
-    sltpLanes[laneNumber].push_back(getFieldStr("polarity"));
-    sltpLanes[laneNumber].push_back(getFieldStr("ob_tap0"));
-    sltpLanes[laneNumber].push_back(getFieldStr("ob_tap1"));
-    sltpLanes[laneNumber].push_back(getFieldStr("ob_tap2"));
-    sltpLanes[laneNumber].push_back(getFieldStr("ob_bias"));
-    sltpLanes[laneNumber].push_back(getFieldStr("ob_preemp_mode"));
-    if (_userInput._advancedMode)
+    string fieldStr = getFieldStr(field.prmField);
+    if (field.isSigned)
     {
-        sltpLanes[laneNumber].push_back(getFieldStr("ob_reg"));
-        sltpLanes[laneNumber].push_back(getFieldStr("ob_leva"));
+        fieldStr = to_string(readSigned(getFieldValue(field.prmField), getFieldSize(field.prmField)));
     }
+    return MlxlinkRecord::addSpace(fieldStr, field.uiField.size() + 1, false);
 }
 
-void MlxlinkCommander::prepareSltp16nm(std::vector<std::vector<string> >& sltpLanes, u_int32_t laneNumber)
+void MlxlinkCommander::prepareSltpEdrHdrGen(vector<vector<string>>& sltpLanes, u_int32_t laneNumber)
 {
-    // The first four fields are stored as a signed integers
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("pre_2_tap"))));
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("pre_tap"))));
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("main_tap"))));
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("post_tap"))));
-    sltpLanes[laneNumber].push_back(to_string(readSigned(getFieldValue("ob_m2lp"), getFieldSize("ob_m2lp"))));
-    sltpLanes[laneNumber].push_back(getFieldStr("ob_amp"));
+    map<u_int32_t, PRM_FIELD> sltpParam = _mlxlinkMaps->_SltpEdrParams;
+    if (_productTechnology == PRODUCT_16NM)
+    {
+        sltpParam = _mlxlinkMaps->_SltpHdrParams;
+    }
+
+    for (auto const& param : sltpParam)
+    {
+        if ((param.second.fieldAccess & FIELD_ACCESS_R) ||
+            (_userInput._advancedMode && (param.second.fieldAccess & FIELD_ACCESS_ADVANCED)))
+        {
+            sltpLanes[laneNumber].push_back(getSltpFieldStr(param.second));
+        }
+    }
 }
 
-void MlxlinkCommander::prepareSltp7nm(std::vector<std::vector<string> >& sltpLanes, u_int32_t laneNumber)
+void MlxlinkCommander::prepareSltpNdrGen(std::vector<std::vector<string>>& sltpLanes, u_int32_t laneNumber)
 {
     if (isSpeed100GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
     {
-        sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("fir_pre3"))));
-        sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("fir_pre2"))));
+        sltpLanes[laneNumber].push_back(getSltpFieldStr(_mlxlinkMaps->_SltpNdrParams[SLTP_NDR_FIR_PRE3]));
+        sltpLanes[laneNumber].push_back(getSltpFieldStr(_mlxlinkMaps->_SltpNdrParams[SLTP_NDR_FIR_PRE2]));
     }
     else if (isSpeed50GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
     {
-        sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("fir_pre2"))));
+        sltpLanes[laneNumber].push_back(getSltpFieldStr(_mlxlinkMaps->_SltpNdrParams[SLTP_NDR_FIR_PRE2]));
     }
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("fir_pre1"))));
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("fir_main"))));
-    sltpLanes[laneNumber].push_back(to_string(readSignedByte(getFieldValue("fir_post1"))));
+    sltpLanes[laneNumber].push_back(getSltpFieldStr(_mlxlinkMaps->_SltpNdrParams[SLTP_NDR_FIR_PRE1]));
+    sltpLanes[laneNumber].push_back(getSltpFieldStr(_mlxlinkMaps->_SltpNdrParams[SLTP_NDR_FIR_MAIN]));
+    sltpLanes[laneNumber].push_back(getSltpFieldStr(_mlxlinkMaps->_SltpNdrParams[SLTP_NDR_FIR_POST1]));
 }
 
 template<typename T, typename Q>
@@ -2498,15 +2500,14 @@ void MlxlinkCommander::prepare7nmEyeInfo(u_int32_t numOfLanesToUse)
     string fomMode = _mlxlinkMaps->_slrgFomMode[getFieldValue("fom_mode")];
     setPrintVal(_eyeOpeningInfoCmd, "FOM Mode", fomMode, ANSI_COLOR_RESET, true, true, true);
     setPrintVal(_eyeOpeningInfoCmd, "Lane", getStringFromVector(legand), ANSI_COLOR_RESET, true, true, true);
-    setPrintVal(_eyeOpeningInfoCmd, "Initial FOM", getStringFromVector(initialFom), ANSI_COLOR_RESET,
-                !initialFom.empty(), true, true);
+    setPrintVal(_eyeOpeningInfoCmd, "Initial FOM", getStringFromVector(initialFom), ANSI_COLOR_RESET, true, true, true);
     setPrintVal(_eyeOpeningInfoCmd, "Last FOM", getStringFromVector(lastFom), ANSI_COLOR_RESET, true, true, true);
-    setPrintVal(_eyeOpeningInfoCmd, "Upper Grades", getStringFromVector(upperFom), ANSI_COLOR_RESET, true,
-                (fomMeasurement & SLRG_EOM_UPPER), true);
-    setPrintVal(_eyeOpeningInfoCmd, "Mid Grades", getStringFromVector(midFom), ANSI_COLOR_RESET, true,
-                (fomMeasurement & SLRG_EOM_MIDDLE), true);
-    setPrintVal(_eyeOpeningInfoCmd, "Lower Grades", getStringFromVector(lowerFom), ANSI_COLOR_RESET, true,
-                (fomMeasurement & SLRG_EOM_LOWER), true);
+    setPrintVal(_eyeOpeningInfoCmd, "Upper Grades", getStringFromVector(upperFom), ANSI_COLOR_RESET,
+                (fomMeasurement & SLRG_EOM_UPPER), true, true);
+    setPrintVal(_eyeOpeningInfoCmd, "Mid Grades", getStringFromVector(midFom), ANSI_COLOR_RESET,
+                (fomMeasurement & SLRG_EOM_MIDDLE), true, true);
+    setPrintVal(_eyeOpeningInfoCmd, "Lower Grades", getStringFromVector(lowerFom), ANSI_COLOR_RESET,
+                (fomMeasurement & SLRG_EOM_LOWER), true, true);
 }
 
 void MlxlinkCommander::showEye()
@@ -2670,6 +2671,55 @@ void MlxlinkCommander::showFEC()
     }
 }
 
+string MlxlinkCommander::getSltpHeader()
+{
+    string sep = ",";
+    vector<string> sltpHeader;
+    map<u_int32_t, PRM_FIELD> sltpParam = _mlxlinkMaps->_SltpNdrParams;
+
+    if (_productTechnology == PRODUCT_7NM)
+    {
+        bool is100gPerLane = isSpeed100GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive);
+        bool is50gPerLane = isSpeed50GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive);
+        if (is100gPerLane)
+        {
+            sltpHeader.push_back(MlxlinkRecord::addSpace(sltpParam[SLTP_NDR_FIR_PRE3].uiField,
+                                                         sltpParam[SLTP_NDR_FIR_PRE3].uiField.size() + 1, false));
+        }
+        if (is50gPerLane || is100gPerLane)
+        {
+            sltpHeader.push_back(MlxlinkRecord::addSpace(sltpParam[SLTP_NDR_FIR_PRE2].uiField,
+                                                         sltpParam[SLTP_NDR_FIR_PRE2].uiField.size() + 1, false));
+        }
+        sltpHeader.push_back(MlxlinkRecord::addSpace(sltpParam[SLTP_NDR_FIR_PRE1].uiField,
+                                                     sltpParam[SLTP_NDR_FIR_PRE1].uiField.size() + 1, false));
+        sltpHeader.push_back(MlxlinkRecord::addSpace(sltpParam[SLTP_NDR_FIR_MAIN].uiField,
+                                                     sltpParam[SLTP_NDR_FIR_MAIN].uiField.size() + 1, false));
+        sltpHeader.push_back(MlxlinkRecord::addSpace(sltpParam[SLTP_NDR_FIR_POST1].uiField,
+                                                     sltpParam[SLTP_NDR_FIR_POST1].uiField.size() + 1, false));
+    }
+    else
+    {
+        sltpParam = _mlxlinkMaps->_SltpEdrParams;
+        if (_productTechnology == PRODUCT_16NM)
+        {
+            sltpParam = _mlxlinkMaps->_SltpHdrParams;
+        }
+
+        for (auto const& param : sltpParam)
+        {
+            if ((param.second.fieldAccess & FIELD_ACCESS_R) ||
+                (_userInput._advancedMode && (param.second.fieldAccess & FIELD_ACCESS_ADVANCED)))
+            {
+                sltpHeader.push_back(
+                  MlxlinkRecord::addSpace(param.second.uiField, param.second.uiField.size() + 1, false));
+            }
+        }
+    }
+
+    return getStringFromVector(sltpHeader);
+}
+
 void MlxlinkCommander::showSltp()
 {
     if (_userInput._pcie)
@@ -2678,75 +2728,50 @@ void MlxlinkCommander::showSltp()
     }
     try
     {
-        string regName = "SLTP";
-
         bool valid = true;
         u_int32_t numOfLanesToUse = (_userInput._pcie) ? _numOfLanesPcie : _numOfLanes;
-        std::vector<std::vector<string> > sltpLanes(numOfLanesToUse, std::vector<string>());
+        std::vector<std::vector<string>> sltpLanes(numOfLanesToUse, std::vector<string>());
         string showSltpTitle = "Serdes Tuning Transmitter Info";
+        string sltpHeader = getSltpHeader();
+
         if (_userInput._pcie)
         {
             showSltpTitle += " (PCIe)";
         }
         setPrintTitle(_sltpInfoCmd, showSltpTitle, numOfLanesToUse + 1);
-        if (_productTechnology == PRODUCT_7NM)
-        {
-            _mlxlinkMaps->_sltpHeader = "fir_pre1,fir_main,fir_post1";
-            if (isSpeed100GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
-            {
-                _mlxlinkMaps->_sltpHeader = "fir_pre3,fir_pre2," + _mlxlinkMaps->_sltpHeader;
-            }
-            else if (isSpeed50GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
-            {
-                _mlxlinkMaps->_sltpHeader = "fir_pre2," + _mlxlinkMaps->_sltpHeader;
-            }
-        }
-        else if (_productTechnology == PRODUCT_16NM)
-        {
-            _mlxlinkMaps->_sltpHeader = "pre2Tap,preTap,mainTap,postTap,m2lp,amp";
-        }
-        else
-        {
-            _mlxlinkMaps->_sltpHeader = "Pol,tap0,tap1,tap2,bias,preemp_mode";
-            if (_userInput._advancedMode)
-            {
-                _mlxlinkMaps->_sltpHeader += ",reg,leva";
-            }
-        }
+
         if (!_linkUP && !_userInput._pcie && !_prbsTestMode)
         {
-            setPrintVal(_sltpInfoCmd, "Serdes TX parameters", _mlxlinkMaps->_sltpHeader, ANSI_COLOR_RESET, true, false,
-                        true);
+            setPrintVal(_sltpInfoCmd, "Serdes TX parameters", sltpHeader, ANSI_COLOR_RESET, true, false, true);
             cout << _sltpInfoCmd;
             return;
         }
-        setPrintVal(_sltpInfoCmd, "Serdes TX parameters", _mlxlinkMaps->_sltpHeader, ANSI_COLOR_RESET, true, true,
-                    true);
+        setPrintVal(_sltpInfoCmd, "Serdes TX parameters", sltpHeader, ANSI_COLOR_RESET, true, true, true);
+
         for (u_int32_t i = 0; i < numOfLanesToUse; i++)
         {
-            resetParser(regName);
+            resetParser(ACCESS_REG_SLTP);
             updatePortType();
             updateField("local_port", _localPort);
             updateField("pnat", (_userInput._pcie) ? PNAT_PCIE : PNAT_LOCAL);
             updateField("lane", i);
             updateField("c_db", _userInput._db);
-            genBuffSendRegister(regName, MACCESS_REG_METHOD_GET);
-            if (_productTechnology == PRODUCT_16NM)
-            {
-                prepareSltp16nm(sltpLanes, i);
-            }
-            else if (_productTechnology == PRODUCT_7NM)
+            genBuffSendRegister(ACCESS_REG_SLTP, MACCESS_REG_METHOD_GET);
+
+            if (_productTechnology == PRODUCT_7NM)
             {
-                prepareSltp7nm(sltpLanes, i);
+                prepareSltpNdrGen(sltpLanes, i);
             }
             else
             {
-                prepareSltp28_40nm(sltpLanes, i);
+                prepareSltpEdrHdrGen(sltpLanes, i);
             }
+
             if (!getFieldValue("status"))
             {
                 valid = false;
             }
+
             setPrintVal(_sltpInfoCmd, "Lane " + to_string(i), getStringFromVector(sltpLanes[i]), ANSI_COLOR_RESET, true,
                         valid, true);
         }
@@ -3857,6 +3882,22 @@ void MlxlinkCommander::checkPRBSModeCap(u_int32_t modeSelector, u_int32_t capMas
         modeToCheck += "A";
     }
 
+    switch (modeToCheck[-1])
+    {
+        case '8':
+            findAndReplace(modeToCheck, "8", "A");
+            break;
+        case '4':
+            findAndReplace(modeToCheck, "4", "B");
+            break;
+        case '2':
+            findAndReplace(modeToCheck, "2", "C");
+            break;
+        case '1':
+            findAndReplace(modeToCheck, "1", "D");
+            break;
+    }
+
     // Fetching mode capability from mode list
     u_int32_t modeCap = 0;
 
@@ -4521,7 +4562,7 @@ void MlxlinkCommander::getSltpAlevOut(u_int32_t lane)
 
     genBuffSendRegister(ACCESS_REG_SLTP, MACCESS_REG_METHOD_GET);
 
-    _userInput._sltpParams[OB_ALEV_OUT] = getFieldValue("ob_alev_out");
+    _userInput._sltpParams[SLTP_HDR_OB_ALEV_OUT] = getFieldValue("ob_alev_out");
 }
 
 void MlxlinkCommander::getSltpRegAndLeva(u_int32_t lane)
@@ -4534,8 +4575,8 @@ void MlxlinkCommander::getSltpRegAndLeva(u_int32_t lane)
 
     genBuffSendRegister(ACCESS_REG_SLTP, MACCESS_REG_METHOD_GET);
 
-    _userInput._sltpParams[OB_REG] = getFieldValue("ob_reg");
-    _userInput._sltpParams[OB_LEVA] = getFieldValue("ob_leva");
+    _userInput._sltpParams[SLTP_EDR_OB_REG] = getFieldValue("ob_reg");
+    _userInput._sltpParams[SLTP_EDR_OB_LEVA] = getFieldValue("ob_leva");
 }
 
 u_int32_t MlxlinkCommander::getLaneSpeed(u_int32_t lane)
@@ -4558,17 +4599,17 @@ void MlxlinkCommander::validateNumOfParamsForNDRGen()
     errMsg += "valid parameters for the active speed are: ";
     if (isSpeed100GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
     {
-        params = PARAMS_7NM_LAST;
+        params = SLTP_NDR_LAST;
         errMsg += "fir_pre3,fir_pre2,fir_pre1,fir_main,fir_post1";
     }
     else if (isSpeed50GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
     {
-        params = FIR_POST1;
+        params = SLTP_NDR_FIR_POST1;
         errMsg += "fir_pre2,fir_pre1,fir_main,fir_post1";
     }
     else
     {
-        params = FIR_MAIN;
+        params = SLTP_NDR_FIR_MAIN;
         errMsg += "fir_pre1,fir_main,fir_post1";
     }
     if (_userInput._sltpParams.size() != params)
@@ -4587,10 +4628,10 @@ void MlxlinkCommander::validateNumOfParamsForNDRGen()
 
 void MlxlinkCommander::checkSltpParamsSize()
 {
-    u_int32_t sltpParamsSize = OB_REG;
+    u_int32_t sltpParamsSize = SLTP_EDR_OB_REG;
     if (_productTechnology == PRODUCT_16NM)
     {
-        sltpParamsSize = OB_ALEV_OUT;
+        sltpParamsSize = SLTP_HDR_OB_ALEV_OUT;
         for (map<u_int32_t, u_int32_t>::iterator it = _userInput._sltpParams.begin();
              it != _userInput._sltpParams.end();
              it++)
@@ -4607,7 +4648,7 @@ void MlxlinkCommander::checkSltpParamsSize()
     }
     else if (_userInput._advancedMode)
     {
-        sltpParamsSize = PARAMS_40NM_LAST;
+        sltpParamsSize = SLTP_EDR_LAST;
     }
     if (_userInput._sltpParams.size() != sltpParamsSize && _productTechnology != PRODUCT_7NM)
     {
@@ -4615,49 +4656,43 @@ void MlxlinkCommander::checkSltpParamsSize()
     }
 }
 
-void MlxlinkCommander::updateSltp28_40nmFields()
+void MlxlinkCommander::updateSltpEdrHdrFields()
 {
-    updateField("polarity", _userInput._sltpParams[POLARITY]);
-    updateField("ob_tap0", _userInput._sltpParams[OB_TAP0]);
-    updateField("ob_tap1", _userInput._sltpParams[OB_TAP1]);
-    updateField("ob_tap2", _userInput._sltpParams[OB_TAP2]);
-    updateField("ob_bias", _userInput._sltpParams[OB_BIAS]);
-    updateField("ob_preemp_mode", _userInput._sltpParams[OB_PREEMP_MODE]);
-    updateField("ob_reg", _userInput._sltpParams[OB_REG]);
-    updateField("ob_leva", _userInput._sltpParams[OB_LEVA]);
-}
+    map<u_int32_t, PRM_FIELD> sltpParam = _mlxlinkMaps->_SltpEdrParams;
+    if (_productTechnology == PRODUCT_16NM)
+    {
+        sltpParam = _mlxlinkMaps->_SltpHdrParams;
+    }
 
-void MlxlinkCommander::updateSltp16nmFields()
-{
-    updateField("pre_2_tap", _userInput._sltpParams[PRE_2_TAP]);
-    updateField("pre_tap", _userInput._sltpParams[PRE_TAP]);
-    updateField("main_tap", _userInput._sltpParams[MAIN_TAP]);
-    updateField("post_tap", _userInput._sltpParams[POST_TAP]);
-    updateField("ob_m2lp", _userInput._sltpParams[OB_M2LP]);
-    updateField("ob_amp", _userInput._sltpParams[OB_AMP]);
-    updateField("ob_alev_out", _userInput._sltpParams[OB_ALEV_OUT]);
+    for (auto const& param : sltpParam)
+    {
+        if (param.second.fieldAccess & (FIELD_ACCESS_W | FIELD_ACCESS_ADVANCED))
+        {
+            updateField(param.second.prmField, _userInput._sltpParams[param.first]);
+        }
+    }
 }
 
-void MlxlinkCommander::updateSltp7nmFields()
+void MlxlinkCommander::updateSltpNdrFields()
 {
     u_int32_t indexCorrection = 0;
     if (isSpeed100GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
     {
-        updateField("fir_pre3", _userInput._sltpParams[FIR_PRE3]);
-        updateField("fir_pre2", _userInput._sltpParams[FIR_PRE2]);
+        updateField("fir_pre3", _userInput._sltpParams[SLTP_NDR_FIR_PRE3]);
+        updateField("fir_pre2", _userInput._sltpParams[SLTP_NDR_FIR_PRE2]);
     }
     else if (isSpeed50GPerLane(_protoActive == IB ? _activeSpeed : _activeSpeedEx, _protoActive))
     {
         indexCorrection = 1;
-        updateField("fir_pre2", _userInput._sltpParams[FIR_PRE2 - indexCorrection]);
+        updateField("fir_pre2", _userInput._sltpParams[SLTP_NDR_FIR_PRE2 - indexCorrection]);
     }
     else
     {
         indexCorrection = 2;
     }
-    updateField("fir_pre1", _userInput._sltpParams[FIR_PRE1 - indexCorrection]);
-    updateField("fir_main", _userInput._sltpParams[FIR_MAIN - indexCorrection]);
-    updateField("fir_post1", _userInput._sltpParams[FIR_POST1 - indexCorrection]);
+    updateField("fir_pre1", _userInput._sltpParams[SLTP_NDR_FIR_PRE1 - indexCorrection]);
+    updateField("fir_main", _userInput._sltpParams[SLTP_NDR_FIR_MAIN - indexCorrection]);
+    updateField("fir_post1", _userInput._sltpParams[SLTP_NDR_FIR_POST1 - indexCorrection]);
 }
 
 string MlxlinkCommander::getSltpStatus()
@@ -4741,19 +4776,16 @@ void MlxlinkCommander::sendSltp()
             updateField("lane_speed", laneSpeed);
             updateField("lane", i);
             updateField("tx_policy", _userInput._txPolicy);
-            switch (_productTechnology)
+
+            if (_productTechnology == PRODUCT_7NM)
             {
-                case PRODUCT_40NM:
-                case PRODUCT_28NM:
-                    updateSltp28_40nmFields();
-                    break;
-                case PRODUCT_16NM:
-                    updateSltp16nmFields();
-                    break;
-                case PRODUCT_7NM:
-                    updateSltp7nmFields();
-                    break;
+                updateSltpNdrFields();
             }
+            else
+            {
+                updateSltpEdrHdrFields();
+            }
+
             updateField("c_db", _userInput._db || _userInput._txPolicy);
             genBuffSendRegister(ACCESS_REG_SLTP, MACCESS_REG_METHOD_SET);
         }
diff --git a/mlxlink/modules/mlxlink_commander.h b/mlxlink/modules/mlxlink_commander.h
index 24445550..03bb9d22 100644
--- a/mlxlink/modules/mlxlink_commander.h
+++ b/mlxlink/modules/mlxlink_commander.h
@@ -435,9 +435,10 @@ class MlxlinkCommander : public MlxlinkRegParser
     void strToInt32(char* str, u_int32_t& value);
     template<typename T, typename Q>
     string getValueAndThresholdsStr(T value, Q lowTH, Q highTH);
-    void prepareSltp28_40nm(std::vector<std::vector<string> >& sltpLanes, u_int32_t laneNumber);
-    void prepareSltp16nm(std::vector<std::vector<string> >& sltpLanes, u_int32_t laneNumber);
-    void prepareSltp7nm(std::vector<std::vector<string> >& sltpLanes, u_int32_t laneNumber);
+    string getSltpFieldStr(const PRM_FIELD& field);
+    void prepareSltpEdrHdrGen(vector<vector<string>>& sltpLanes, u_int32_t laneNumber);
+    virtual void prepareSltpNdrGen(vector<vector<string>>& sltpLanes, u_int32_t laneNumber);
+    virtual string getSltpHeader();
     void startSlrgPciScan(u_int32_t numOfLanesToUse);
     void initValidDPNList();
     u_int32_t readBitFromField(const string& fieldName, u_int32_t bitIndex);
@@ -562,9 +563,8 @@ class MlxlinkCommander : public MlxlinkRegParser
     u_int32_t fecToBit(const string& fec, const string& speedStrG);
     u_int32_t getFecCapForCheck(const string& speedStr);
     void checkPplmCap();
-    void updateSltp28_40nmFields();
-    void updateSltp16nmFields();
-    void updateSltp7nmFields();
+    void updateSltpEdrHdrFields();
+    void updateSltpNdrFields();
     string getSltpStatus();
     void getSltpAlevOut(u_int32_t lane);
     void getSltpRegAndLeva(u_int32_t lane);
diff --git a/mlxlink/modules/mlxlink_enums.h b/mlxlink/modules/mlxlink_enums.h
index c9c40bc2..d33ea596 100644
--- a/mlxlink/modules/mlxlink_enums.h
+++ b/mlxlink/modules/mlxlink_enums.h
@@ -400,6 +400,13 @@
 #define SECOND_LEVEL_PORT_ACCESS 2
 #define THIRD_LEVEL_PORT_ACCESS 3
 
+enum FIELD_ACCESS
+{
+    FIELD_ACCESS_R = 0x1,
+    FIELD_ACCESS_W = 0x2,
+    FIELD_ACCESS_RW = FIELD_ACCESS_R | FIELD_ACCESS_W,
+    FIELD_ACCESS_ADVANCED = 0x8,
+};
 // mlxlink commander enums
 enum PPAOS_ADMIN
 {
@@ -660,39 +667,39 @@ enum SLRG_PARAMS
     SLRG_PARAMS_LAST
 };
 
-enum SLTP_40_28NM_PARAMS
+enum SLTP_EDR
 {
-    POLARITY,
-    OB_TAP0,
-    OB_TAP1,
-    OB_TAP2,
-    OB_BIAS,
-    OB_PREEMP_MODE,
-    OB_REG,
-    OB_LEVA,
-    PARAMS_40NM_LAST
+    SLTP_EDR_POLARITY,
+    SLTP_EDR_OB_TAP0,
+    SLTP_EDR_OB_TAP1,
+    SLTP_EDR_OB_TAP2,
+    SLTP_EDR_OB_BIAS,
+    SLTP_EDR_OB_PREEMP_MODE,
+    SLTP_EDR_OB_REG,
+    SLTP_EDR_OB_LEVA,
+    SLTP_EDR_LAST
 };
 
-enum SLTP_16NM_PARAMS
+enum SLTP_HDR
 {
-    PRE_2_TAP,
-    PRE_TAP,
-    MAIN_TAP,
-    POST_TAP,
-    OB_M2LP,
-    OB_AMP,
-    OB_ALEV_OUT,
-    PARAMS_16NM_LAST
+    SLTP_HDR_PRE_2_TAP,
+    SLTP_HDR_PRE_TAP,
+    SLTP_HDR_MAIN_TAP,
+    SLTP_HDR_POST_TAP,
+    SLTP_HDR_OB_M2LP,
+    SLTP_HDR_OB_AMP,
+    SLTP_HDR_OB_ALEV_OUT,
+    SLTP_HDR_LAST
 };
 
-enum SLTP_7NM_PARAMS
+enum SLTP_NDR
 {
-    FIR_PRE3,
-    FIR_PRE2,
-    FIR_PRE1,
-    FIR_MAIN,
-    FIR_POST1,
-    PARAMS_7NM_LAST
+    SLTP_NDR_FIR_PRE3,
+    SLTP_NDR_FIR_PRE2,
+    SLTP_NDR_FIR_PRE1,
+    SLTP_NDR_FIR_MAIN,
+    SLTP_NDR_FIR_POST1,
+    SLTP_NDR_LAST
 };
 
 enum FEC_MODE
diff --git a/mlxlink/modules/mlxlink_maps.cpp b/mlxlink/modules/mlxlink_maps.cpp
index ba0069a1..7fbd9fb1 100644
--- a/mlxlink/modules/mlxlink_maps.cpp
+++ b/mlxlink/modules/mlxlink_maps.cpp
@@ -580,6 +580,29 @@ void MlxlinkMaps::initLinkDownInfoMapping()
 
 void MlxlinkMaps::initSltpStatusMapping()
 {
+    _SltpEdrParams[SLTP_EDR_POLARITY] = PRM_FIELD{"polarity", "Pol", FIELD_ACCESS_RW, false};
+    _SltpEdrParams[SLTP_EDR_OB_TAP0] = PRM_FIELD{"ob_tap0", "tap0", FIELD_ACCESS_RW, false};
+    _SltpEdrParams[SLTP_EDR_OB_TAP1] = PRM_FIELD{"ob_tap1", "tap1", FIELD_ACCESS_RW, false};
+    _SltpEdrParams[SLTP_EDR_OB_TAP2] = PRM_FIELD{"ob_tap2", "tap2", FIELD_ACCESS_RW, false};
+    _SltpEdrParams[SLTP_EDR_OB_BIAS] = PRM_FIELD{"ob_bias", "bias", FIELD_ACCESS_RW, false};
+    _SltpEdrParams[SLTP_EDR_OB_PREEMP_MODE] = PRM_FIELD{"ob_preemp_mode", "preemp_mode", FIELD_ACCESS_RW, false};
+    _SltpEdrParams[SLTP_EDR_OB_REG] = PRM_FIELD{"ob_reg", "reg", FIELD_ACCESS_ADVANCED, false};
+    _SltpEdrParams[SLTP_EDR_OB_LEVA] = PRM_FIELD{"ob_leva", "leva", FIELD_ACCESS_ADVANCED, false};
+
+    _SltpHdrParams[SLTP_HDR_PRE_2_TAP] = PRM_FIELD{"pre_2_tap", "pre2Tap", FIELD_ACCESS_RW, true};
+    _SltpHdrParams[SLTP_HDR_PRE_TAP] = PRM_FIELD{"pre_tap", "preTap", FIELD_ACCESS_RW, true};
+    _SltpHdrParams[SLTP_HDR_MAIN_TAP] = PRM_FIELD{"main_tap", "mainTap", FIELD_ACCESS_RW, true};
+    _SltpHdrParams[SLTP_HDR_POST_TAP] = PRM_FIELD{"post_tap", "postTap", FIELD_ACCESS_RW, true};
+    _SltpHdrParams[SLTP_HDR_OB_M2LP] = PRM_FIELD{"ob_m2lp", "m2lp", FIELD_ACCESS_RW, true};
+    _SltpHdrParams[SLTP_HDR_OB_AMP] = PRM_FIELD{"ob_amp", "amp", FIELD_ACCESS_RW, false};
+    _SltpHdrParams[SLTP_HDR_OB_ALEV_OUT] = PRM_FIELD{"ob_alev_out", "alev_out", FIELD_ACCESS_W, false};
+
+    _SltpNdrParams[SLTP_NDR_FIR_PRE3] = PRM_FIELD{"fir_pre3", "fir_pre3", FIELD_ACCESS_RW, true};
+    _SltpNdrParams[SLTP_NDR_FIR_PRE2] = PRM_FIELD{"fir_pre2", "fir_pre2", FIELD_ACCESS_RW, true};
+    _SltpNdrParams[SLTP_NDR_FIR_PRE1] = PRM_FIELD{"fir_pre1", "fir_pre1", FIELD_ACCESS_RW, true};
+    _SltpNdrParams[SLTP_NDR_FIR_MAIN] = PRM_FIELD{"fir_main", "fir_main", FIELD_ACCESS_RW, true};
+    _SltpNdrParams[SLTP_NDR_FIR_POST1] = PRM_FIELD{"fir_post1", "fir_post1", FIELD_ACCESS_RW, true};
+
     _SLTP7BadSetStatus2Str[BAD_STAT_7NM_INVALID_PRE3] = "pre3 is out of range";
     _SLTP7BadSetStatus2Str[BAD_STAT_7NM_INVALID_PRE2] = "pre2 is out of range";
     _SLTP7BadSetStatus2Str[BAD_STAT_7NM_INVALID_PRE1] = "pre1 is out of range";
diff --git a/mlxlink/modules/mlxlink_maps.h b/mlxlink/modules/mlxlink_maps.h
index 141c2d21..1ea5fa98 100644
--- a/mlxlink/modules/mlxlink_maps.h
+++ b/mlxlink/modules/mlxlink_maps.h
@@ -106,6 +106,14 @@ struct CAP_VALUE
     string name;
 };
 
+struct PRM_FIELD
+{
+    string prmField;
+    string uiField;
+    u_int32_t fieldAccess;
+    bool isSigned;
+};
+
 class MlxlinkMaps
 {
 private:
@@ -200,6 +208,9 @@ class MlxlinkMaps
     std::map<u_int32_t, string> _SLTPBadSetStatus2Str;
     std::map<u_int32_t, string> _SLTP16BadSetStatus2Str;
     std::map<u_int32_t, string> _SLTP7BadSetStatus2Str;
+    std::map<u_int32_t, PRM_FIELD> _SltpEdrParams;
+    std::map<u_int32_t, PRM_FIELD> _SltpHdrParams;
+    std::map<u_int32_t, PRM_FIELD> _SltpNdrParams;
     std::map<u_int32_t, std::string> _ethANFsmState;
     std::map<u_int32_t, std::string> _fecModeActive;
     std::map<u_int32_t, pair<string, string>> _fecModeMask;

From 118451cb438523bc33633e056a7314d55493721c Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Sun, 3 Jul 2022 14:53:45 +0300
Subject: [PATCH 13/46] [mstlink] Fixing code coverity issues

Description:
Fixing code coverity issues and code align with MFT

Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/mlxlink_amBER_collector.h    |  2 +-
 mlxlink/modules/mlxlink_cables_commander.cpp | 16 ++++++++--------
 mlxlink/modules/mlxlink_maps.h               |  1 +
 mlxlink/modules/mlxlink_reg_parser.h         |  1 +
 mlxlink/modules/mlxlink_utils.cpp            |  4 ++++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/mlxlink/modules/mlxlink_amBER_collector.h b/mlxlink/modules/mlxlink_amBER_collector.h
index 9adbaa26..fe3fb024 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.h
+++ b/mlxlink/modules/mlxlink_amBER_collector.h
@@ -124,8 +124,8 @@ class MlxlinkAmBerCollector : public MlxlinkRegParser
     void groupValidIf(bool condition);
     void getTestModeModulePMPT(vector<AmberField>& fields, string moduleSide, ModuleAccess_t mode);
     void getTestModeModulePMPD(vector<AmberField>& fields, string moduleSide);
-    u_int32_t getFomMeasurement();
     u_int32_t getSheetIndex(AMBER_SHEET sheet);
+    u_int32_t getFomMeasurement();
 
     bool _isQsfpCable;
     bool _isSfpCable;
diff --git a/mlxlink/modules/mlxlink_cables_commander.cpp b/mlxlink/modules/mlxlink_cables_commander.cpp
index bd77389a..b5507748 100644
--- a/mlxlink/modules/mlxlink_cables_commander.cpp
+++ b/mlxlink/modules/mlxlink_cables_commander.cpp
@@ -419,7 +419,7 @@ void MlxlinkCablesCommander::prepareSfpddDdmInfo()
 void MlxlinkCablesCommander::prepareQSFPDdmInfo()
 {
     u_int32_t tempVal = 0;
-    u_int8_t* page0L = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+    u_int8_t* page0L = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
     if (page0L != NULL)
     {
         loadEEPRMPage(PAGE_0, LOWER_PAGE_OFFSET, page0L);
@@ -552,7 +552,7 @@ void MlxlinkCablesCommander::prepareThresholdInfo(u_int8_t* thresholdPage)
 // Reading cable DDM information
 void MlxlinkCablesCommander::readCableDDMInfo()
 {
-    u_int8_t* thresholdPage = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+    u_int8_t* thresholdPage = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
 
     switch (_cableIdentifier)
     {
@@ -795,7 +795,7 @@ void MlxlinkCablesCommander::initValidPages()
     }
     if (qsfpCable && !_passiveQsfp)
     {
-        u_int8_t* page0H = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+        u_int8_t* page0H = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
         loadEEPRMPage(PAGE_0, UPPER_PAGE_OFFSET, page0H);
         u_int8_t optionsValue = 0;
         readFromPage(page0H, 195 - 0x80, &optionsValue);
@@ -830,7 +830,7 @@ void MlxlinkCablesCommander::initValidPages()
         // (SFP-DD)
         // if 2:7=0, dump page 0x1
         u_int8_t extendedPages = 0;
-        u_int8_t* page0L = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+        u_int8_t* page0L = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
         loadEEPRMPage(PAGE_0, LOWER_PAGE_OFFSET, page0L);
         ;
         readFromPage(page0L, EXTENDED_PAGES_1_2_10_11_ADDR, &extendedPages);
@@ -852,7 +852,7 @@ void MlxlinkCablesCommander::initValidPages()
                 //                   dump page 0x12 (H)
                 //         B142:5=1, dump page 0x13 (H)
                 //                   dump page 0x14 (H)
-                u_int8_t* page1H = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+                u_int8_t* page1H = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
                 loadEEPRMPage(PAGE_01, UPPER_PAGE_OFFSET, page1H);
                 ;
                 u_int8_t extendedQsfpPages = 0;
@@ -885,7 +885,7 @@ vector<MlxlinkCmdPrint> MlxlinkCablesCommander::getPagesToDump()
     initValidPages();
     for (u_int32_t i = 0; i < _validPages.size(); i++)
     {
-        u_int8_t* pageP = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+        u_int8_t* pageP = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
         if (pageP != NULL)
         {
             loadEEPRMPage(_validPages[i].page, _validPages[i].offset, pageP, _validPages[i].i2cAddress);
@@ -998,11 +998,11 @@ MlxlinkCmdPrint MlxlinkCablesCommander::readFromEEPRM(u_int16_t page, u_int16_t
     {
         i2cAddress = I2C_ADDR_HIGH;
     }
-    pageL = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+    pageL = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
     loadEEPRMPage(page, LOWER_PAGE_OFFSET, pageL, i2cAddress);
     if ((length + offset) > CABLE_PAGE_SIZE)
     {
-        pageH = (u_int8_t*)malloc(sizeof(u_int8_t) * CABLE_PAGE_SIZE);
+        pageH = (u_int8_t*)calloc(CABLE_PAGE_SIZE, sizeof(u_int8_t));
         loadEEPRMPage(page, UPPER_PAGE_OFFSET, pageH);
     }
     char label[32];
diff --git a/mlxlink/modules/mlxlink_maps.h b/mlxlink/modules/mlxlink_maps.h
index 1ea5fa98..20c4b154 100644
--- a/mlxlink/modules/mlxlink_maps.h
+++ b/mlxlink/modules/mlxlink_maps.h
@@ -31,6 +31,7 @@
 
  *
  */
+
 #ifndef MLXLINK_MAPS_H
 #define MLXLINK_MAPS_H
 
diff --git a/mlxlink/modules/mlxlink_reg_parser.h b/mlxlink/modules/mlxlink_reg_parser.h
index 189ba8b3..0c7defe4 100644
--- a/mlxlink/modules/mlxlink_reg_parser.h
+++ b/mlxlink/modules/mlxlink_reg_parser.h
@@ -31,6 +31,7 @@
 
  *
  */
+
 #ifndef MLXLINK_REG_PARSER_H
 #define MLXLINK_REG_PARSER_H
 
diff --git a/mlxlink/modules/mlxlink_utils.cpp b/mlxlink/modules/mlxlink_utils.cpp
index 031593b2..f15a2efa 100644
--- a/mlxlink/modules/mlxlink_utils.cpp
+++ b/mlxlink/modules/mlxlink_utils.cpp
@@ -493,6 +493,10 @@ int ptysSpeedToExtMaskETH(const string& speed)
     {
         return ETH_LINK_SPEED_EXT_400GAUI_8;
     }
+    if (speed == "800G_8X")
+    {
+        return ETH_LINK_SPEED_EXT_800GAUI_8;
+    }
     return 0x0;
 }
 

From 709d32cca69beb99902640151a2cedb7c6e367da Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 15:36:14 +0300
Subject: [PATCH 14/46] [flint|mlxfwops] Fix error message for dc command on
 encrypted image

Description: dc command isn't supported on encrypted images, error
message fixed

Tested OS: Linux
Tested devices: bb
Tested flows: flint -i <encrypted image> dc

Known gaps (with RM ticket): N/A

Issue: 3086580
---
 mlxfwops/lib/fs3_ops.cpp |  3 +--
 mlxfwops/lib/fs4_ops.cpp | 15 +++++++++++++++
 mlxfwops/lib/fs4_ops.h   |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
index 46365ad9..dbef1c46 100644
--- a/mlxfwops/lib/fs3_ops.cpp
+++ b/mlxfwops/lib/fs3_ops.cpp
@@ -1411,9 +1411,8 @@ bool Fs3Operations::FwReadRom(std::vector<u_int8_t>& romSect)
     return true;
 }
 
-bool Fs3Operations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage)
+bool Fs3Operations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool)
 {
-    (void) stripedImage; // unused for FS3
     //FwGetSection only supports retrieving FS3_DBG_FW_INI section atm.
     if (sectType != FS3_DBG_FW_INI) {
         return errmsg("Unsupported section type.");
diff --git a/mlxfwops/lib/fs4_ops.cpp b/mlxfwops/lib/fs4_ops.cpp
index 94400d77..85561343 100644
--- a/mlxfwops/lib/fs4_ops.cpp
+++ b/mlxfwops/lib/fs4_ops.cpp
@@ -958,6 +958,21 @@ bool Fs4Operations::FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedIm
     return Fs3Operations::FwVerify(verifyCallBackFunc, isStripedImage, showItoc, ignoreDToc);
 }
 
+bool Fs4Operations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool)
+{
+    bool image_encrypted = false;
+    if (!isEncrypted(image_encrypted))
+    {
+        return errmsg(getErrorCode(), "%s", err());
+    }
+    if (image_encrypted)
+    {
+        return errmsg("Operation not supported on an encrypted %s", _ioAccess->is_flash() ? "flash" : "image");
+    }
+
+    return Fs3Operations::FwGetSection(sectType, sectInfo);
+}
+
 bool Fs4Operations::GetImageInfo(u_int8_t *buff)
 {
     DPRINTF(("Fs4Operations::GetImageInfo call Fs3Operations::GetImageInfo\n"));
diff --git a/mlxfwops/lib/fs4_ops.h b/mlxfwops/lib/fs4_ops.h
index f8cd61a8..b8baf21f 100644
--- a/mlxfwops/lib/fs4_ops.h
+++ b/mlxfwops/lib/fs4_ops.h
@@ -81,6 +81,7 @@ class Fs4Operations : public Fs3Operations {
     bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
                           struct tools_open_fw_version& fwVer, bool queryRunning = false);
     bool FwResetTimeStamp();
+    virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false);
     bool FwSignWithHmac(const char *key_file);
     bool signForSecureBoot(const char *private_key_file, const char *public_key_file, const char *guid_key_file);
     bool signForSecureBootUsingHSM(const char *public_key_file, const char *uuid, MlxSign::OpensslEngineSigner& engineSigner);

From 576e0228d97917f9c6b80971b1372f702115b7f5 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 16:24:00 +0300
Subject: [PATCH 15/46] [mlxsign] redundant code removal

Description: N/A

Tested OS: N/A
Tested devices: N/A
Tested flows: N/A

Known gaps (with RM ticket): N/A

Issue: None
---
 mlxsign_lib/mlxsign_lib.cpp | 57 -------------------------------------
 mlxsign_lib/mlxsign_lib.h   |  6 ----
 2 files changed, 63 deletions(-)

diff --git a/mlxsign_lib/mlxsign_lib.cpp b/mlxsign_lib/mlxsign_lib.cpp
index b0f0ddb4..1fa3fcc1 100644
--- a/mlxsign_lib/mlxsign_lib.cpp
+++ b/mlxsign_lib/mlxsign_lib.cpp
@@ -237,63 +237,6 @@ int MlxSignRSA::verify(MlxSign::SHAType shaType, const std::vector<u_int8_t>& di
     return MlxSign::MLX_SIGN_SUCCESS;
 }
 
-int MlxSignRSA::encrypt(const std::vector<u_int8_t>& msg, std::vector<u_int8_t>& encryptedMsg)
-{
-    int maxMsgSize;
-
-    if (!_privCtx) {
-        return MlxSign::MLX_SIGN_RSA_NO_PRIV_KEY_ERROR;
-    }
-    // size check
-    maxMsgSize = RSA_size((RSA*)_privCtx);
-    if (static_cast<int>(msg.size()) > maxMsgSize) {
-        return MlxSign::MLX_SIGN_RSA_MESSAGE_TOO_LONG_ERROR;
-    }
-    // do the job
-    encryptedMsg.resize(maxMsgSize, 0);
-    if (RSA_private_encrypt((int)msg.size(), &msg[0], &encryptedMsg[0], (RSA*)_privCtx, RSA_PKCS1_PADDING ) != maxMsgSize) {
-        return MlxSign::MLX_SIGN_RSA_CALCULATION_ERROR;
-    }
-    return MlxSign::MLX_SIGN_SUCCESS;
-}
-
-int MlxSignRSA::decrypt(const std::vector<u_int8_t>& encryptedMsg, std::vector<u_int8_t>& originalMsg)
-{
-    int maxMsgSize;
-    int origMsgSize;
-    if (!_pubCtx) {
-        return MlxSign::MLX_SIGN_RSA_NO_PUB_KEY_ERROR;
-    }
-    // size check
-    maxMsgSize = RSA_size((RSA*)_pubCtx);
-    if (static_cast<int>(encryptedMsg.size()) > maxMsgSize) {
-        return MlxSign::MLX_SIGN_RSA_MESSAGE_TOO_LONG_ERROR;
-    }
-    // do the job
-    originalMsg.resize(maxMsgSize, 0);
-    if ((origMsgSize = RSA_public_decrypt((int)encryptedMsg.size(), &encryptedMsg[0], &originalMsg[0], (RSA*)_pubCtx, RSA_PKCS1_PADDING )) == -1) {
-        return MlxSign::MLX_SIGN_RSA_CALCULATION_ERROR;
-    }
-    originalMsg.resize(origMsgSize);
-    return MlxSign::MLX_SIGN_SUCCESS;
-}
-
-int MlxSignRSA::getEncryptMaxMsgSize()
-{
-    if (_privCtx) {
-        return RSA_size((RSA*)_privCtx);
-    }
-    return 0;
-}
-
-int MlxSignRSA::getDecryptMaxMsgSize()
-{
-    if (_pubCtx) {
-        return RSA_size((RSA*)_pubCtx);
-    }
-    return 0;
-}
-
 std::string MlxSignRSA::str(const std::vector<u_int8_t>& msg)
 {
     char *digestStr = NULL;
diff --git a/mlxsign_lib/mlxsign_lib.h b/mlxsign_lib/mlxsign_lib.h
index 01778304..c18f966d 100644
--- a/mlxsign_lib/mlxsign_lib.h
+++ b/mlxsign_lib/mlxsign_lib.h
@@ -115,12 +115,6 @@ class MlxSignRSA {
     int setPubKeyFromFile(const std::string& pemKeyFilePath);
     int setPubKey(const std::string& pemKey);
 
-    int getEncryptMaxMsgSize();
-    int getDecryptMaxMsgSize();
-
-    int encrypt(const std::vector<u_int8_t>& msg, std::vector<u_int8_t>& encryptedMsg);     // encrypt with private
-    int decrypt(const std::vector<u_int8_t>& encryptedMsg, std::vector<u_int8_t>& originalMsg);    // decrypt with public (used for testing for now)
-
     int sign(MlxSign::SHAType shaType, const std::vector<u_int8_t>& msg, std::vector<u_int8_t>& encryptedMsg);
     int verify(MlxSign::SHAType shaType, const std::vector<u_int8_t>& sha256Dgst, const std::vector<u_int8_t>& sig, bool& result);
 

From ba4266f8a13d93c99b1532f8825a454caf1a259a Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 20:55:47 +0300
Subject: [PATCH 16/46] [flint] Coverity fix

Description: N/A

Tested OS: linux
Tested devices: CX3
Tested flows: flint_oem -d /dev/mst/mt4099_pciconf0 hw query

Known gaps (with RM ticket): N/A

Issue: 3108155
---
 mlxfwops/lib/flint_io.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
index b2dc135a..35cac6d6 100644
--- a/mlxfwops/lib/flint_io.cpp
+++ b/mlxfwops/lib/flint_io.cpp
@@ -821,7 +821,9 @@ bool Flash::get_attr(ext_flash_attr_t& attr)
     attr.rev_id = _attr.rev_id;
     if (_attr.type_str != NULL) {
         // we don't print the flash type in old devices
-        attr.type_str = strcpy(new char[strlen(_attr.type_str) + 1], _attr.type_str);
+        int type_str_len = strlen(_attr.type_str);
+        attr.type_str = strncpy(new char[type_str_len + 1], _attr.type_str, type_str_len);
+        attr.type_str[type_str_len] = '\0';
     }
     attr.size = _attr.size;
     attr.sector_size = _attr.sector_size;

From 13b49fd1710cb670f0b100063baa83b6110304d6 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 21:15:03 +0300
Subject: [PATCH 17/46] [flint][BF3] Certificate Chain Injection into
 DIGITAL_CERT_RW section

Description: For BF3 we'll need the ability to store certificates in
DIGITAL_CERT_RW section. The user will have to provide an index with the
certificate to specify where to store it. In case index==0 old set
certificate flow will be executed storing the certificate in
CERT_CHAIN_0, otherwise it'll be stored in DIGITAL_CERT_RW according to
given index

Tested OS: Linux
Tested devices: N/A
Tested flows: flint_oem -i cx7.bin --cert_chain_index <num>
set_attestation_cert_chain <cert.bin>

Known gaps (with RM ticket): N/A

Issue: 3015150
---
 flint/cmd_line_parser.cpp |  23 ++++
 flint/flint_params.h      |   1 +
 flint/subcommands.cpp     |   2 +-
 mlxfwops/lib/fs4_ops.cpp  | 248 +++++++++++++++++++++++++++++++++-----
 mlxfwops/lib/fs4_ops.h    |  13 +-
 mlxfwops/lib/fw_ops.cpp   |   2 +-
 mlxfwops/lib/fw_ops.h     |   2 +-
 7 files changed, 256 insertions(+), 35 deletions(-)

diff --git a/flint/cmd_line_parser.cpp b/flint/cmd_line_parser.cpp
index b765d79c..7c3932a4 100644
--- a/flint/cmd_line_parser.cpp
+++ b/flint/cmd_line_parser.cpp
@@ -235,6 +235,7 @@ FlagMetaData::FlagMetaData()
 #endif
     _flags.push_back(new Flag("", "output_file", 1));
     _flags.push_back(new Flag("", "user_password", 1));
+    _flags.push_back(new Flag("", "cert_chain_index", 1));
 }
 
 FlagMetaData::~FlagMetaData()
@@ -932,6 +933,14 @@ void Flint::initCmdParser()
 		"<CPU_UTIL>",
 		"Use this flag to reduce CPU utilization while burning, Windows only. Legal values are from 1 (lowest CPU) to 5 (highest CPU)");
 #endif
+    AddOptions(
+      "cert_chain_index",
+      ' ',
+      "<index>",
+      "Use this flag to specify the certificate location, acceptable values are between 0 and 7 (default - 0). "
+      "In case index=0 certificate chain will be stored at CERT_CHAIN_0 section, otherwise at DIGITAL_CERT_RW "
+      "section according to given index.\n"
+      "This flag is relevant only for set_attestation_cert_chain command.");
 
     for (map_sub_cmd_t_to_subcommand::iterator it = _subcommands.begin(); it != _subcommands.end(); it++) {
         if (it->first == SC_ResetCfg) {
@@ -1255,6 +1264,20 @@ ParseStatus Flint::HandleOption(string name, string value)
         _flintParams.cableDeviceSize = cableDeviceSize;
         _flintParams.cable_device_size_specified = true;
     }
+    else if (name == "cert_chain_index")
+    {
+        int cert_chain_index = 0;
+        if (!strToInt(value, cert_chain_index))
+        {
+            return PARSE_ERROR;
+        }
+        if (cert_chain_index < 0 || cert_chain_index > 7)
+        {
+            printf("certificate chain index should be between 0 and 7.\n");
+            return PARSE_ERROR;
+        }
+        _flintParams.cert_chain_index = cert_chain_index;
+    }
     else {
         cout << "Unknown Flag: " << name;
         cout << _cmdParser.GetSynopsis();
diff --git a/flint/flint_params.h b/flint/flint_params.h
index 7717e623..b28f237a 100644
--- a/flint/flint_params.h
+++ b/flint/flint_params.h
@@ -202,6 +202,7 @@ class FlintParams {
     string openssl_engine;
     string openssl_key_id;
     bool openssl_engine_usage_specified;
+    u_int32_t cert_chain_index;
 };
 
 #endif
diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
index 5f0da479..46399f61 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
@@ -4785,7 +4785,7 @@ FlintStatus SetCertChainSubCommand::executeCommand()
         return FLINT_FAILED;
     }
     FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
-    if (!ops->FwSetCertChain((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc)) {
+    if (!ops->FwSetCertChain((char*)_flintParams.cmd_params[0].c_str(), _flintParams.cert_chain_index, &verifyCbFunc)) {
         reportErr(true, FLINT_CERT_CHAIN_ERROR, ops->err());
         return FLINT_FAILED;
     }
diff --git a/mlxfwops/lib/fs4_ops.cpp b/mlxfwops/lib/fs4_ops.cpp
index 85561343..967cbf16 100644
--- a/mlxfwops/lib/fs4_ops.cpp
+++ b/mlxfwops/lib/fs4_ops.cpp
@@ -2788,6 +2788,74 @@ bool Fs4Operations::Fs4UpdateVsdSection(std::vector<u_int8_t>  section_data, cha
     return true;
 }
 
+bool Fs4Operations::Init()
+{
+    fw_info_t fwInfo;
+    if (!FwQuery(&fwInfo, false, false, false))
+    {
+        return false;
+    }
+    return true;
+}
+
+bool Fs4Operations::UpdateDigitalCertRWSection(char* certChainFile,
+                                               u_int32_t certChainIndex,
+                                               std::vector<u_int8_t>& newSectionData)
+{
+    if (!Init())
+    {
+        return false;
+    }
+    struct fs4_toc_info* tocArr = _fs4ImgInfo.dtocArr.tocArr;
+    u_int32_t numOfTocs = _fs4ImgInfo.dtocArr.numOfTocs;
+
+    // Get DIGITAL_CERT_RW entry
+    struct fs4_toc_info* digitalCertRWSectionToc = (fs4_toc_info*)NULL;
+    if (!Fs4GetItocInfo(tocArr, numOfTocs, FS4_DIGITAL_CERT_RW, digitalCertRWSectionToc))
+    {
+        return false;
+    }
+
+    // Get CERT_CHAIN_0 entry
+    struct fs4_toc_info* certChain0SectionToc = (fs4_toc_info*)NULL;
+    if (!Fs4GetItocInfo(tocArr, numOfTocs, FS4_CERT_CHAIN_0, certChain0SectionToc))
+    {
+        return false;
+    }
+    u_int32_t certChain0SectionSize = certChain0SectionToc->toc_entry.size << 2;
+
+    int certChainBuffSize = 0;
+    u_int8_t* certChainBuffData = (u_int8_t*)NULL;
+    if (!ReadBinFile(certChainFile, certChainBuffData, certChainBuffSize))
+    {
+        return false;
+    }
+    DPRINTF(("Fs4Operations::UpdateDigitalCertRWSection new cert file size = 0x%x\n", certChainBuffSize));
+
+    //* Assert given certificate chain doesn't exceed its allocated size (compared to CERT_CHAIN_0 with same size)
+    if ((u_int32_t)certChainBuffSize > certChain0SectionSize)
+    {
+        return errmsg("Certificate chain data exceeds its allocated size of 0x%x bytes", certChain0SectionSize);
+    }
+
+    std::vector<u_int8_t> certChainBuff(certChainBuffData, certChainBuffData + certChainBuffSize);
+    certChainBuff.resize(certChain0SectionSize); // Padding the cert chain if needed to match cert chain size
+
+    newSectionData = digitalCertRWSectionToc->section_data;
+    u_int32_t newCertChainOffsetInSection =
+      certChain0SectionSize * (certChainIndex - 1); // index 0 belongs to CERT_CHAIN_0
+    DPRINTF(
+      ("Fs4Operations::UpdateDigitalCertRWSection copy new cert to DIGITAL_CERT_RW at offset = 0x%x, size = 0x%x\n",
+       newCertChainOffsetInSection, (u_int32_t)certChainBuff.size()));
+    if ((newCertChainOffsetInSection + certChainBuff.size()) > (digitalCertRWSectionToc->toc_entry.size << 2))
+    {
+        return errmsg("Certificate chain data exceeds its allocation");
+    }
+    std::copy(certChainBuff.begin(), certChainBuff.end(), newSectionData.begin() + newCertChainOffsetInSection);
+
+    return true;
+}
+
 bool Fs4Operations::UpdateCertChainSection(struct fs4_toc_info *curr_toc, char *certChainFile,
                                            std::vector<u_int8_t>  &newSectionData)
 {
@@ -3102,6 +3170,7 @@ bool Fs4Operations::isDTocSection(fs3_section_t sect_type, bool& isDtoc)
     case FS3_MFG_INFO:
     case FS3_DEV_INFO:
     case FS3_VPD_R0:
+    case FS4_DIGITAL_CERT_RW:
     case FS4_CERT_CHAIN_0:
         isDtoc = true;
         break;
@@ -3167,14 +3236,30 @@ bool Fs4Operations::VerifyImageAfterModifications() {
     return true;
 }
 
-bool Fs4Operations::FwSetCertChain(char *certFileStr, PrintCallBack callBackFunc) {
+bool Fs4Operations::FwSetCertChain(char *certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc) {
     if (!certFileStr) {
         return errmsg("Please specify a valid certificate chain file.");
     }
     FAIL_NO_OCR("set attestation certificate chain");
 
-    if (!UpdateSection(certFileStr, FS4_CERT_CHAIN_0, false, CMD_UNKNOWN, callBackFunc)) {
-        return false;
+    if (certIndex == 0)
+    {
+        if (!UpdateSection(certFileStr, FS4_CERT_CHAIN_0, false, CMD_UNKNOWN, callBackFunc))
+        {
+            return false;
+        }
+    }
+    else
+    {
+        std::vector<u_int8_t> newSectionData;
+        if (!UpdateDigitalCertRWSection(certFileStr, certIndex, newSectionData))
+        {
+            return false;
+        }
+        if (!UpdateSection(FS4_DIGITAL_CERT_RW, newSectionData, "DIGITAL_CERT_RW", callBackFunc))
+        {
+            return false;
+        }
     }
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
     if (!_ioAccess->is_flash() && !VerifyImageAfterModifications()) {
@@ -3371,56 +3456,157 @@ bool Fs4Operations::UpdateSection(void *new_info, fs3_section_t sect_type, bool,
         return errmsg("Section type %s is not supported\n", GetSectionNameByType(sect_type));
     }
 
-    newSectionAddr = curr_toc->toc_entry.flash_addr << 2;
+    if (!WriteSection(curr_toc, newSection, type_msg, callBackFunc))
+    {
+        return false;
+    }
+
+    if (is_sect_failsafe) {
+        u_int32_t flash_addr = old_toc->toc_entry.flash_addr << 2;
+        // If encrypted image was given we'll write to it
+        if (_encrypted_image_io_access) {
+            DPRINTF(("Fs4Operations::UpdateSection updating encrypted image at addr 0x%x with 0x0\n", flash_addr));
+            if (!_encrypted_image_io_access->write(flash_addr,
+                                                   (u_int8_t *)&zeroes, sizeof(zeroes))) {
+                return errmsg("%s", _encrypted_image_io_access->err());
+            }
+        }
+        else {
+            if (!writeImage((ProgressCallBack)NULL,
+                            flash_addr,
+                            (u_int8_t *)&zeroes, sizeof(zeroes), isDtoc, true)) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
 
-    if (!_encrypted_image_io_access) { // In case of BB secure-boot sign flow we don't update ITOC since it's already encrypted
-        if (!Fs4UpdateItocInfo(curr_toc, curr_toc->toc_entry.size, newSection)) {
+bool Fs4Operations::WriteSection(struct fs4_toc_info* sectionToc,
+                                 std::vector<u_int8_t>& newSectionData,
+                                 const char* msg,
+                                 PrintCallBack callBackFunc)
+{
+    DPRINTF(
+      ("Fs4Operations::WriteSection section type=%s, msg=%s", GetSectionNameByType(sectionToc->toc_entry.type), msg));
+    bool isDtoc;
+    fs3_section_t sectionType = static_cast<fs3_section_t>(sectionToc->toc_entry.type);
+    if (!isDTocSection(sectionType, isDtoc))
+    {
+        return false;
+    }
+    u_int32_t newSectionAddr = sectionToc->toc_entry.flash_addr << 2;
+
+    if (!_encrypted_image_io_access)
+    { // In case of BB secure-boot sign flow we don't update ITOC since it's already encrypted
+        if (!Fs4UpdateItocInfo(sectionToc, sectionToc->toc_entry.size, newSectionData))
+        {
             return false;
         }
     }
 
-    if (!Fs4ReburnSection(newSectionAddr, curr_toc->toc_entry.size * 4, newSection, type_msg, callBackFunc)) {
+    if (!Fs4ReburnSection(newSectionAddr, sectionToc->toc_entry.size * 4, newSectionData, msg, callBackFunc))
+    {
         return false;
     }
 
-    if (!_encrypted_image_io_access) { // In case of BB secure-boot sign flow we don't update ITOC since it's already encrypted
-        if (sect_type != FS3_DEV_INFO) {
-            if (!Fs4ReburnTocSection(isDtoc, callBackFunc)) {
+    if (!_encrypted_image_io_access)
+    { // In case of BB secure-boot sign flow we don't update ITOC since it's already encrypted
+        if (sectionType != FS3_DEV_INFO)
+        {
+            if (!Fs4ReburnTocSection(isDtoc, callBackFunc))
+            {
                 return false;
             }
         }
     }
 
-    if (!isDtoc) {
-        if (!UpdateSectionHashInHashesTable(newSectionAddr, curr_toc->toc_entry.size * 4, sect_type)) {
+    if (!isDtoc)
+    {
+        if (!UpdateSectionHashInHashesTable(newSectionAddr, sectionToc->toc_entry.size * 4, sectionType))
+        {
             return false;
         }
     }
+    return true;
+}
 
-    
+bool Fs4Operations::UpdateSection(fs3_section_t sectionType,
+                                  std::vector<u_int8_t>& newSectionData,
+                                  const char* msg,
+                                  PrintCallBack callBackFunc)
+{
+    if (sectionType == FS3_DEV_INFO)
+    {
+        return errmsg("Fs4Operations::UpdateSection doesn't support updating DEV_INFO section\n");
+    }
 
-    // TODO - in case hashes_table (HTOC) exists recalculate modified section SHA and store it in hashes_table.
-    // TODO - Currently it's not implemented since there is no use-case where we need to update hashes_table,
-    // TODO - so we prefer to ignore it for now instead of inserting a potential bug.
+    // Query
+    bool isDtoc;
+    if (!isDTocSection(sectionType, isDtoc))
+    {
+        return false;
+    }
+    bool image_encrypted = false;
+    if (!isEncrypted(image_encrypted))
+    {
+        return errmsg(getErrorCode(), "%s", err());
+    }
 
-    if (is_sect_failsafe) {
-        u_int32_t flash_addr = old_toc->toc_entry.flash_addr << 2;
-        // If encrypted image was given we'll write to it
-        if (_encrypted_image_io_access) {
-            DPRINTF(("Fs4Operations::UpdateSection updating encrypted image at addr 0x%x with 0x0\n", flash_addr));
-            if (!_encrypted_image_io_access->write(flash_addr,
-                                                   (u_int8_t *)&zeroes, sizeof(zeroes))) {
-                return errmsg("%s", _encrypted_image_io_access->err());
-            }
+    if (image_encrypted)
+    {
+        if (!isDtoc)
+        {
+            return errmsg("Can't update ITOC section in case of encrypted image");
         }
-        else {
-            if (!writeImage((ProgressCallBack)NULL,
-                            flash_addr,
-                            (u_int8_t *)&zeroes, sizeof(zeroes), isDtoc, true)) {
-                return false;
-            }
+        fw_info_t fwInfo;
+        if (!encryptedFwQuery(&fwInfo))
+        {
+            return errmsg("%s", err());
         }
     }
+    else
+    {
+        // init sector to read
+        _readSectList.push_back(sectionType);
+        if (!FsIntQueryAux())
+        {
+            _readSectList.pop_back();
+            return false;
+        }
+        _readSectList.pop_back();
+    }
+
+    // Get relevant TOC
+    struct fs4_toc_info* tocArr;
+    u_int32_t numOfTocs;
+    if (isDtoc)
+    {
+        tocArr = _fs4ImgInfo.dtocArr.tocArr;
+        numOfTocs = _fs4ImgInfo.dtocArr.numOfTocs;
+    }
+    else
+    {
+        tocArr = _fs4ImgInfo.itocArr.tocArr;
+        numOfTocs = _fs4ImgInfo.itocArr.numOfTocs;
+    }
+    // Find TOC entry
+    int tocIndex = 0;
+    struct fs4_toc_info* sectionToc = (fs4_toc_info*)NULL;
+    if (!Fs4GetItocInfo(tocArr, numOfTocs, sectionType, sectionToc, tocIndex))
+    {
+        return false;
+    }
+    if (sectionType == FS3_VPD_R0 && ((u_int32_t)tocIndex) != numOfTocs - 1)
+    {
+        return errmsg("VPD Section is not the last device section");
+    }
+
+    if (!WriteSection(sectionToc, newSectionData, msg, callBackFunc))
+    {
+        return false;
+    }
 
     return true;
 }
diff --git a/mlxfwops/lib/fs4_ops.h b/mlxfwops/lib/fs4_ops.h
index b8baf21f..31c50ef5 100644
--- a/mlxfwops/lib/fs4_ops.h
+++ b/mlxfwops/lib/fs4_ops.h
@@ -177,6 +177,7 @@ class Fs4Operations : public Fs3Operations {
     bool encryptedFwQuery(fw_info_t *fwInfo, bool readRom = true, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
     virtual bool FwQuery(fw_info_t *fwInfo, bool readRom = true, bool isStripedImage = false, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
     bool FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_itoc, struct QueryOptions queryOptions, bool ignoreDToc = false, bool verbose = false);
+    bool Init();
     bool CheckTocSignature(struct image_layout_itoc_header *itoc_header, u_int32_t first_signature);
     bool CheckDevInfoSignature(u_int32_t *buff);
     bool FsBurnAux(FwOperations *imageOps, ExtBurnParams& burnParams);
@@ -189,6 +190,14 @@ class Fs4Operations : public Fs3Operations {
     bool Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
                         fs3_section_t sect_type, vector<struct fs4_toc_info*>& curr_toc);
     bool UpdateSection(void *new_info, fs3_section_t sect_type = FS3_DEV_INFO, bool is_sect_failsafe = true, CommandType cmd_type = CMD_UNKNOWN, PrintCallBack callBackFunc = (PrintCallBack)NULL );
+    bool UpdateSection(fs3_section_t sectionType,
+                       std::vector<u_int8_t>& newSectionData,
+                       const char* msg,
+                       PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    bool WriteSection(struct fs4_toc_info* sectionToc,
+                      std::vector<u_int8_t>& newSectionData,
+                      const char* msg,
+                      PrintCallBack callBackFunc);
     bool Fs4UpdateMfgUidsSection(struct fs4_toc_info *curr_toc,
                                  std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
                                  std::vector<u_int8_t>  &newSectionData);
@@ -201,7 +210,9 @@ class Fs4Operations : public Fs3Operations {
                              std::vector<u_int8_t>  &newSectionData);
     bool UpdateCertChainSection(struct fs4_toc_info *curr_toc, char *certChainFile,
                                 std::vector<u_int8_t>  &newSectionData);
-    bool FwSetCertChain(char *certFileStr, PrintCallBack callBackFunc);
+    bool
+      UpdateDigitalCertRWSection(char* certChainFile, u_int32_t certChainIndex, std::vector<u_int8_t>& newSectionData);
+    bool FwSetCertChain(char *certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc);
     bool Fs4ReburnSection(u_int32_t newSectionAddr, u_int32_t newSectionSize,
                           std::vector<u_int8_t>  newSectionData, const char *msg,
                           PrintCallBack callBackFunc);
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index bf71cfa6..9107fcde 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
@@ -2069,7 +2069,7 @@ const char* FwOperations::expRomType2Str(u_int16_t type)
     return (const char*)NULL;
 }
 
-bool FwOperations::FwSetCertChain(char *, PrintCallBack)
+bool FwOperations::FwSetCertChain(char *, u_int32_t, PrintCallBack)
 {
     return errmsg("Operation not supported.");
 }
diff --git a/mlxfwops/lib/fw_ops.h b/mlxfwops/lib/fw_ops.h
index 45e65061..4ad64325 100644
--- a/mlxfwops/lib/fw_ops.h
+++ b/mlxfwops/lib/fw_ops.h
@@ -192,7 +192,7 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
     // use progressFunc when dealing with FS2 image and printFunc when dealing with FS3 image.
     virtual bool FwSetVSD(char *vsdStr, ProgressCallBack progressFunc = (ProgressCallBack)NULL, PrintCallBack printFunc = (PrintCallBack)NULL) = 0;
     virtual bool FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL) = 0;
-    virtual bool FwSetCertChain(char *certFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetCertChain(char *certFileStr,  u_int32_t certIndex, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
     virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false) = 0;
     virtual bool FwResetNvData() = 0;

From 0a24fd306d092a63f7cdeb666e3237f355c2ce59 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 21:18:06 +0300
Subject: [PATCH 18/46] [flint][mflash] Block mflash open for GB device that's
 not manager

Description: Since we can't access the flash GW directly of GB that's
not a manager we need to block that option so we won't make an illegal
cr-space access

Tested OS: Linux
Tested devices: Buffalo
Tested flows: flint_oem -d
/dev/mst/gbox/switch_mt53104_pciconf0_gbox53108_ln8_0 -i
/.autodirect/fwgwork/hilaj/pelican/pelican/hila.bin b

Known gaps (with RM ticket): N/A

Issue: 3110958
---
 mflash/mflash.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/mflash/mflash.c b/mflash/mflash.c
index 9757a2f9..d1d03ea1 100644
--- a/mflash/mflash.c
+++ b/mflash/mflash.c
@@ -1688,8 +1688,9 @@ int is4_flash_init(mflash *mfl, flash_params_t *flash_params)
     return gen4_flash_init_com(mfl, flash_params, 0);
 }
 
-static void flash_update_gearbox_gw(mflash *mfl)
+static void flash_update_amos_gearbox_gw(mflash *mfl)
 {
+    FLASH_ACCESS_DPRINTF(("flash_update_amos_gearbox_gw()\n"));
     mfl->gw_data = HCR_FLASH_GEARBOX_DATA;
     mfl->gw_cmd = HCR_FLASH_GEARBOX_CMD;
     mfl->gw_addr = HCR_FLASH_GEARBOX_ADDR;
@@ -2004,7 +2005,12 @@ int fifth_gen_flash_init(mflash *mfl, flash_params_t *flash_params)
     int rc = 0;
     u_int8_t needs_cache_replacement = 0;
     if (mfl->mf->gb_info.is_gb_mngr) {
-        flash_update_gearbox_gw(mfl);//need to update GW offsets before calling to the check_cache_replacement_guard
+        // need to update GW offsets before calling to the check_cache_replacement_guard
+        flash_update_amos_gearbox_gw(mfl);
+    }
+    else if (mfl->mf->gb_info.is_gearbox)
+    {
+        return MFE_OCR_NOT_SUPPORTED; // Accessing flash GW of GB that's not manager is not possible
     }
     rc = check_cache_replacement_guard(mfl, &needs_cache_replacement);
     CHECK_RC(rc);

From 507a63ffd7d8cea709fbac788b6e7f3c6a22f9b2 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 21:25:26 +0300
Subject: [PATCH 19/46] [mlxfwops] Coverity HTOC initialization fix

Description: N/A

Tested OS: Linux
Tested devices: CX7
Tested flows: sign/rsa_sign

Known gaps (with RM ticket): N/A

Issue: 3117342
---
 mlxfwops/lib/fs4_ops.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mlxfwops/lib/fs4_ops.cpp b/mlxfwops/lib/fs4_ops.cpp
index 967cbf16..33764f3f 100644
--- a/mlxfwops/lib/fs4_ops.cpp
+++ b/mlxfwops/lib/fs4_ops.cpp
@@ -4709,6 +4709,7 @@ Fs4Operations::TocArray::TocArray()
 }
 
 Fs4Operations::HTOC::HTOC(vector<u_int8_t> img, u_int32_t htoc_start_addr) {
+    memset(entries, 0, MAX_HTOC_ENTRIES_NUM * sizeof(image_layout_htoc_entry));
     this->htoc_start_addr = htoc_start_addr;
     //* Parse header
     vector<u_int8_t> header_data(img.begin() + htoc_start_addr, img.begin() + htoc_start_addr + IMAGE_LAYOUT_HTOC_HEADER_SIZE);

From 7a18e3ae74fad788e5a25d10d5e5f64d072c92c7 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 21:32:49 +0300
Subject: [PATCH 20/46] [mlxfwreset] mlxfwreset fails to find path for mst

Description: mst tool has been moved from "/etc/init.d/" to
"/etc/systemd/system/" by commit
ae33702507860d9211606fda26b0cc0a99f318ce.
Updated mlxfwreset to look for mst in the new path.

Tested OS: Linux
Tested devices: HCA
Tested flows: mlxfwreset -d <device> r

Known gaps (with RM ticket): N/A

Issue: 3118837
---
 small_utils/mstfwreset.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index ee93b513..862724d5 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -752,7 +752,7 @@ def mstRestart(busId):
         raise RuntimeError("The device is not appearing in lspci output!")
 
     ignore_signals()
-    cmd = "/etc/init.d/mst restart %s" % MstFlags
+    cmd = "/etc/systemd/system/mst.service restart %s" % MstFlags
     logger.debug('Execute {0}'.format(cmd))
     (rc, stdout, stderr) = cmdExec(cmd)
     if rc != 0:

From cfb934ebd47e44e6166abd1e7483d6b863aed8a7 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Sun, 3 Jul 2022 21:36:33 +0300
Subject: [PATCH 21/46] [flint] Converting DMA not supported due to BME unset
 warning message to debug print

Description: Since this warning message created noise we decided to
convert it to debug print as it doesn't fail the burn only its
performance

Tested OS: N/A
Tested devices: N/A
Tested flows: N/A

Known gaps (with RM ticket): N/A

Issue: 2701705
---
 flint/subcommands_linkx.cpp | 2 +-
 mlxfwops/lib/fsctrl_ops.cpp | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/flint/subcommands_linkx.cpp b/flint/subcommands_linkx.cpp
index 5c9ef8aa..6c0f3c42 100644
--- a/flint/subcommands_linkx.cpp
+++ b/flint/subcommands_linkx.cpp
@@ -317,7 +317,7 @@ FlintStatus BurnSubCommand::BurnLinkX(string deviceName, int deviceIndex, int de
             // Checking if BME is disabled to print indication to user
             bool isBmeSet = DMAComponentAccess::isBMESet(fwCompsAccess.getMfileObj());
             if (!isBmeSet) {
-                printf("-W- DMA burning is not supported due to BME is unset (Bus Master Enable).\n");
+                DPRINTF(("-W- DMA burning is not supported due to BME is unset (Bus Master Enable).\n"));
             }
         }
     }
diff --git a/mlxfwops/lib/fsctrl_ops.cpp b/mlxfwops/lib/fsctrl_ops.cpp
index 7897aee3..91137955 100644
--- a/mlxfwops/lib/fsctrl_ops.cpp
+++ b/mlxfwops/lib/fsctrl_ops.cpp
@@ -319,6 +319,7 @@ void FsCtrlOperations::ExtractSwitchFWVersion(const fwInfoT& fwQuery)
         (_fwImgInfo.ext_info.fw_ver[1] == _fwImgInfo.ext_info.running_fw_ver[1]) &&
         (_fwImgInfo.ext_info.fw_ver[2] == _fwImgInfo.ext_info.running_fw_ver[2])) {
         strncpy(_fwImgInfo.ext_info.branch_ver, fwQuery.imageVsd, BRANCH_LEN);
+        _fwImgInfo.ext_info.branch_ver[BRANCH_LEN - 1] = '\0';
     }
 }
 
@@ -640,7 +641,7 @@ bool FsCtrlOperations::_Burn(std::vector <u_int8_t> imageOps4MData, ExtBurnParam
         // Checking if BME is disabled to print indication to user
         bool isBmeSet = DMAComponentAccess::isBMESet(_fwCompsAccess->getMfileObj());
         if (!isBmeSet) {
-            printf("-W- DMA burning is not supported due to BME is unset (Bus Master Enable).\n");
+            DPRINTF(("-W- DMA burning is not supported due to BME is unset (Bus primary Enable).\n"));
         }
     }
     if (!_fwCompsAccess->burnComponents(compsToBurn, &burnParams.ProgressFuncAdv)) {
@@ -997,4 +998,4 @@ bool FsCtrlOperations::IsSecurityVersionViolated(u_int32_t image_security_versio
 
     // Check violation of security-version
     return (imageSecurityVersion < deviceEfuseSecurityVersion);
-}
\ No newline at end of file
+}

From 33600b0e826e336adb6de251533038de4b68fd0c Mon Sep 17 00:00:00 2001
From: Tomer Tubi <ttubi@nvidia.com>
Date: Tue, 5 Jul 2022 10:43:22 +0300
Subject: [PATCH 22/46] update mstflint version for 4.21.0 release

---
 configure.ac                | 4 ++--
 debian/changelog            | 6 ++++++
 kernel/mstflint_kernel.spec | 2 +-
 mstflint.spec.in            | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 04ea1b47..477da4c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,12 @@
 
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(mstflint, 4.20.1, eranj@mellanox.co.il)
+AC_INIT(mstflint, 4.21.0, eranj@mellanox.co.il)
 
 AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.])
 AC_SUBST([PROJECT])
 
-AC_DEFINE_UNQUOTED([VERSION], ["4.20.1"], [Define the project version.])
+AC_DEFINE_UNQUOTED([VERSION], ["4.21.0"], [Define the project version.])
 AC_SUBST([VERSION])
 
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/changelog b/debian/changelog
index 4e6e411e..bcb0ec4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mstflint (4.21.0-1) unstable; urgency=low
+
+  * Updated from MFT-4.21.0
+
+ -- Tomer Tubi <ttubi@nvidia.com>  Sun, 31 Jul 2022 00:00:00 +0000
+
 mstflint (4.20.1-1) unstable; urgency=low
 
   * Updated from MFT-4.20.1
diff --git a/kernel/mstflint_kernel.spec b/kernel/mstflint_kernel.spec
index 64b1fb73..c261c39d 100644
--- a/kernel/mstflint_kernel.spec
+++ b/kernel/mstflint_kernel.spec
@@ -22,7 +22,7 @@
 %global _name kernel-mstflint
 %endif
 
-%{!?version: %global version 4.20.1}
+%{!?version: %global version 4.21.0}
 %{!?_release: %global _release 1}
 %global _kmp_rel %{_release}%{?_kmp_build_num}%{?_dist}
 
diff --git a/mstflint.spec.in b/mstflint.spec.in
index e638be29..fc619a55 100644
--- a/mstflint.spec.in
+++ b/mstflint.spec.in
@@ -1,6 +1,6 @@
 %{!?ibmadlib: %define ibmadlib libibmad-devel}
 %{!?name: %define name mstflint}
-%{!?version: %define version 4.20.1}
+%{!?version: %define version 4.21.0}
 %{!?release: %define release 1}
 %{!?buildtype: %define buildtype "native"}
 %{!?noinband: %define noinband 0}
@@ -215,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jul 31 2022 Tomer Tubi <ttubi@nvidia.com>
+   MFT 4.21.0 Updates
+
 * Thu May 31 2022 Tomer Tubi <ttubi@nvidia.com>
    MFT 4.20.1 Updates
 

From d4a0be149e372eb4cf7614cf1e944df2009cac0b Mon Sep 17 00:00:00 2001
From: Mustafa Dalloul <mustafadall@nvidia.com>
Date: Wed, 6 Jul 2022 11:33:21 +0300
Subject: [PATCH 23/46] [mstlink] Updating amber collection to version 2.05

Description:
Updating amber collection to version 2.05

Issue: 3062640
Signed-off-by: Mustafa Dalloul <mustafadall@nvidia.com>
---
 mlxlink/modules/mlxlink_amBER_collector.cpp | 14 ++++++++++++--
 mlxlink/modules/mlxlink_enums.h             |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/mlxlink/modules/mlxlink_amBER_collector.cpp b/mlxlink/modules/mlxlink_amBER_collector.cpp
index c002f039..d4f1c03a 100644
--- a/mlxlink/modules/mlxlink_amBER_collector.cpp
+++ b/mlxlink/modules/mlxlink_amBER_collector.cpp
@@ -76,11 +76,11 @@ MlxlinkAmBerCollector::MlxlinkAmBerCollector(Json::Value& jsonRoot) : _jsonRoot(
 
     _baseSheetsList[AMBER_SHEET_GENERAL] = FIELDS_COUNT{4, 4, 4};
     _baseSheetsList[AMBER_SHEET_INDEXES] = FIELDS_COUNT{2, 2, 4};
-    _baseSheetsList[AMBER_SHEET_LINK_STATUS] = FIELDS_COUNT{48, 139, 6};
+    _baseSheetsList[AMBER_SHEET_LINK_STATUS] = FIELDS_COUNT{48, 141, 6};
     _baseSheetsList[AMBER_SHEET_MODULE_STATUS] = FIELDS_COUNT{111, 111, 0};
     _baseSheetsList[AMBER_SHEET_SYSTEM] = FIELDS_COUNT{16, 21, 11};
     _baseSheetsList[AMBER_SHEET_SERDES_16NM] = FIELDS_COUNT{376, 736, 0};
-    _baseSheetsList[AMBER_SHEET_SERDES_7NM] = FIELDS_COUNT{203, 323, 499};
+    _baseSheetsList[AMBER_SHEET_SERDES_7NM] = FIELDS_COUNT{206, 326, 499};
     _baseSheetsList[AMBER_SHEET_PORT_COUNTERS] = FIELDS_COUNT{35, 0, 35};
     _baseSheetsList[AMBER_SHEET_TROUBLESHOOTING] = FIELDS_COUNT{2, 2, 0};
     _baseSheetsList[AMBER_SHEET_PHY_OPERATION_INFO] = FIELDS_COUNT{18, 18, 15};
@@ -654,6 +654,16 @@ void MlxlinkAmBerCollector::getPpcntBer(u_int32_t portType, vector<AmberField>&
       to_string(getFieldValue("effective_ber_coef")) + "E-" + to_string(getFieldValue("effective_ber_magnitude"));
     fields.push_back(AmberField(preTitle + "Effective_BER", berStr));
 
+    if (_isPortETH)
+    {
+        string effErrorsStr = (portType == NETWORK_PORT_TYPE_NEAR || portType == NETWORK_PORT_TYPE_FAR) ?
+                                to_string(add32BitTo64(getFieldValue("phy_effective_errors_high"),
+                                                       getFieldValue("phy_effective_errors__low"))) :
+                                "N/A";
+
+        fields.push_back(AmberField(preTitle + "Effective_Errors", effErrorsStr));
+    }
+
     if (portType != NETWORK_PORT_TYPE || (portType == NETWORK_PORT_TYPE && _isPortIB))
     {
         berStr =
diff --git a/mlxlink/modules/mlxlink_enums.h b/mlxlink/modules/mlxlink_enums.h
index b80ab568..aed41482 100644
--- a/mlxlink/modules/mlxlink_enums.h
+++ b/mlxlink/modules/mlxlink_enums.h
@@ -34,7 +34,7 @@
 #define MLXLINK_ENUMS_H
 
 // Common definitions
-#define AMBER_VERSION "2.02"
+#define AMBER_VERSION "2.05"
 
 #define ACCESS_REG_PGUID "PGUID"
 #define ACCESS_REG_SPZR "SPZR"

From d1c6687fc30b2121e8c803de2ac8352a1627439e Mon Sep 17 00:00:00 2001
From: Jack German <jgerman@nvidia.com>
Date: Wed, 6 Jul 2022 18:28:12 +0300
Subject: [PATCH 24/46] Enforce code style with clang-format toolt

Format is included in .clang-format
---
 .clang-format                                 |    77 +
 adb_parser/adb_common_functions.h             |     1 -
 adb_parser/adb_config.cpp                     |    28 +-
 adb_parser/adb_config.h                       |     3 +-
 adb_parser/adb_db.cpp                         |   273 +-
 adb_parser/adb_db.h                           |   104 +-
 adb_parser/adb_exceptionHolder.cpp            |    32 +-
 adb_parser/adb_exceptionHolder.h              |    17 +-
 adb_parser/adb_expr.cpp                       |    43 +-
 adb_parser/adb_expr.h                         |     6 +-
 adb_parser/adb_field.cpp                      |    25 +-
 adb_parser/adb_field.h                        |     6 +-
 adb_parser/adb_instance.cpp                   |   439 +-
 adb_parser/adb_instance.h                     |    57 +-
 adb_parser/adb_logfile.cpp                    |    42 +-
 adb_parser/adb_logfile.h                      |     6 +-
 adb_parser/adb_node.cpp                       |    11 +-
 adb_parser/adb_node.h                         |     8 +-
 adb_parser/adb_parser.cpp                     |  1376 +-
 adb_parser/adb_parser.h                       |    72 +-
 adb_parser/adb_xmlCreator.cpp                 |    86 +-
 adb_parser/adb_xmlCreator.h                   |    28 +-
 adb_parser/buf_ops.cpp                        |   137 +-
 adb_parser/buf_ops.h                          |     6 +-
 adb_parser/expr.cpp                           |  1114 +-
 adb_parser/expr.h                             |    68 +-
 cmdif/cmdif.py                                |    87 +-
 cmdif/icmd_cif_common.c                       |   163 +-
 cmdif/icmd_cif_common.h                       |    95 +-
 cmdif/icmd_cif_macros.h                       |    83 +-
 cmdif/icmd_cif_open.c                         |    18 +-
 cmdif/icmd_cif_open.h                         |    39 +-
 cmdif/tools_cif.c                             |    69 +-
 cmdif/tools_cif.h                             |   163 +-
 cmdparser/cmdparser.cpp                       |   434 +-
 cmdparser/cmdparser.h                         |    84 +-
 cmdparser/my_getopt.c                         |   749 +-
 cmdparser/my_getopt.h                         |   161 +-
 common/autocomplete/mft_help_to_completion.py |   282 +-
 common/bit_slice.h                            |    36 +-
 common/compatibility.h                        |   562 +-
 common/mft_logger.py                          |     3 +-
 common/tools_utils.h                          |    35 +-
 common/tools_version.h                        |    34 +-
 dev_mgt/dev_mgt.py                            |    20 +-
 dev_mgt/tools_dev_types.c                     |  1009 +-
 dev_mgt/tools_dev_types.h                     |   340 +-
 ext_libs/iniParser/dictionary.c               |   255 +-
 ext_libs/iniParser/dictionary.h               |   276 +-
 ext_libs/iniParser/iniparser.c                |   573 +-
 ext_libs/iniParser/iniparser.h                |   635 +-
 ext_libs/iniParser/test/iniexample.c          |   145 +-
 ext_libs/iniParser/test/parse.c               |    19 +-
 ext_libs/iniParser/test/sandbox.c             |    11 +-
 ext_libs/iniParser/test/twisted-genhuge.py    |     7 +-
 ext_libs/json/json/autolink.h                 |    26 +-
 ext_libs/json/json/config.h                   |    34 +-
 ext_libs/json/json/features.h                 |    75 +-
 ext_libs/json/json/forwards.h                 |    64 +-
 ext_libs/json/json/json.h                     |    13 +-
 ext_libs/json/json/reader.h                   |   360 +-
 ext_libs/json/json/value.h                    |  1828 +-
 ext_libs/json/json/writer.h                   |   336 +-
 ext_libs/json/json_batchallocator.h           |   190 +-
 ext_libs/json/json_reader.cpp                 |  1500 +-
 ext_libs/json/json_value.cpp                  |  2378 +-
 ext_libs/json/json_writer.cpp                 |  1316 +-
 ext_libs/minixz/xz.h                          |   448 +-
 ext_libs/minixz/xz_config.h                   |    49 +-
 ext_libs/minixz/xz_crc32.c                    |    40 +-
 ext_libs/minixz/xz_dec_bcj.c                  |   910 +-
 ext_libs/minixz/xz_dec_lzma2.c                |  1831 +-
 ext_libs/minixz/xz_dec_stream.c               |  1222 +-
 ext_libs/minixz/xz_lzma2.h                    |    58 +-
 ext_libs/minixz/xz_private.h                  |   128 +-
 ext_libs/minixz/xz_stream.h                   |    18 +-
 ext_libs/muparser/muParser.cpp                |   638 +-
 ext_libs/muparser/muParser.h                  |   119 +-
 ext_libs/muparser/muParserBase.cpp            |  2897 ++-
 ext_libs/muparser/muParserBase.h              |   259 +-
 ext_libs/muparser/muParserBytecode.cpp        |   932 +-
 ext_libs/muparser/muParserBytecode.h          |   110 +-
 ext_libs/muparser/muParserCallback.cpp        |   881 +-
 ext_libs/muparser/muParserCallback.h          |   100 +-
 ext_libs/muparser/muParserDLL.cpp             |   476 +-
 ext_libs/muparser/muParserDLL.h               |   442 +-
 ext_libs/muparser/muParserDef.h               |   554 +-
 ext_libs/muparser/muParserError.cpp           |   480 +-
 ext_libs/muparser/muParserError.h             |   180 +-
 ext_libs/muparser/muParserFixes.h             |    32 +-
 ext_libs/muparser/muParserInt.cpp             |   388 +-
 ext_libs/muparser/muParserInt.h               |   151 +-
 ext_libs/muparser/muParserStack.h             |   158 +-
 ext_libs/muparser/muParserTemplateMagic.h     |   176 +-
 ext_libs/muparser/muParserTest.cpp            |  2602 +-
 ext_libs/muparser/muParserTest.h              |   349 +-
 ext_libs/muparser/muParserToken.h             |   532 +-
 ext_libs/muparser/muParserTokenReader.cpp     |  1312 +-
 ext_libs/muparser/muParserTokenReader.h       |   236 +-
 ext_libs/sqlite/sqlite3.h                     | 20611 ++++++++--------
 flint/cmd_line_parser.cpp                     |  1081 +-
 flint/err_msgs.h                              |   272 +-
 flint/flint.cpp                               |   121 +-
 flint/flint.h                                 |    12 +-
 flint/flint_params.cpp                        |     9 +-
 flint/flint_params.h                          |    12 +-
 flint/subcommands.cpp                         |  4801 ++--
 flint/subcommands.h                           |   199 +-
 flint/subcommands_linkx.cpp                   |   297 +-
 fw_comps_mgr/fw_comps_mgr.cpp                 |  2291 +-
 fw_comps_mgr/fw_comps_mgr.h                   |   395 +-
 fw_comps_mgr/fw_comps_mgr_abstract_access.cpp |    19 +-
 fw_comps_mgr/fw_comps_mgr_abstract_access.h   |    29 +-
 fw_comps_mgr/fw_comps_mgr_direct_access.cpp   |    92 +-
 fw_comps_mgr/fw_comps_mgr_direct_access.h     |    23 +-
 fw_comps_mgr/fw_comps_mgr_dma_access.cpp      |   232 +-
 fw_comps_mgr/fw_comps_mgr_dma_access.h        |    33 +-
 include/mtcr_ul/mtcr.h                        |   216 +-
 include/mtcr_ul/mtcr_com_defs.h               |   203 +-
 include/mtcr_ul/mtcr_mf.h                     |    68 +-
 kernel/mst.h                                  |   204 +-
 kernel/mst_kernel.h                           |   115 +-
 kernel/mst_main.c                             |  2634 +-
 kernel/mst_vpd.c                              |   233 +-
 libmfa/mfa.c                                  |   367 +-
 libmfa/mfa.h                                  |    44 +-
 libmfa/mfa_section.c                          |   214 +-
 libmfa/mfa_section.h                          |    67 +-
 libmfa/mfaerr.h                               |     5 +-
 libmfa/test.c                                 |    20 +-
 libmfa/xz_io_ops.c                            |   161 +-
 libmfa/xz_io_ops.h                            |    13 +-
 libmfa/xz_io_ops_llzma.c                      |   219 +-
 mad_ifc/mad_ifc.c                             |   161 +-
 mad_ifc/mad_ifc.h                             |    45 +-
 mflash/flash_int_defs.h                       |    43 +-
 mflash/mflash.c                               |  2355 +-
 mflash/mflash.h                               |   168 +-
 mflash/mflash_access_layer.c                  |   224 +-
 mflash/mflash_access_layer.h                  |    91 +-
 mflash/mflash_common_structs.h                |   104 +-
 mflash/mflash_dev_capability.c                |   233 +-
 mflash/mflash_dev_capability.h                |    27 +-
 mflash/mflash_gw.c                            |   246 +-
 mflash/mflash_gw.h                            |    27 +-
 mflash/mflash_new_gw.c                        |   234 +-
 mflash/mflash_new_gw.h                        |    27 +-
 mflash/mflash_pack_layer.c                    |   277 +-
 mflash/mflash_pack_layer.h                    |   333 +-
 mflash/mflash_types.h                         |    10 +-
 mft_utils/calc_hw_crc.c                       |    62 +-
 mft_utils/calc_hw_crc.h                       |     5 +-
 mft_utils/errmsg.cpp                          |    71 +-
 mft_utils/errmsg.h                            |    59 +-
 mft_utils/hsmclient/inc/cryptoki_v2.h         |  2006 +-
 mft_utils/hsmclient/inc/hex64.h               |     7 +-
 mft_utils/hsmclient/inc/hsmlunaclient.h       |    59 +-
 mft_utils/hsmclient/inc/rsa/pkcs11.h          |    73 +-
 mft_utils/hsmclient/inc/rsa/pkcs11f.h         |   660 +-
 mft_utils/hsmclient/inc/rsa/pkcs11t.h         |  2058 +-
 .../hsmclient/inc/sfnt_ext_typedef_members.h  |  1156 +-
 mft_utils/hsmclient/inc/sfnt_extensions.h     |  1576 +-
 mft_utils/hsmclient/src/burnprivatekey.cpp    |   208 +-
 mft_utils/hsmclient/src/hex64.cpp             |   195 +-
 mft_utils/hsmclient/src/hsmaesencryption.cpp  |    89 +-
 .../hsmclient/src/hsmcreatersasignature.cpp   |   144 +-
 mft_utils/hsmclient/src/hsmlunaclient.cpp     |   547 +-
 mft_utils/hsmclient/src/hsmlunaclientinit.cpp |    71 +-
 mft_utils/hsmclient/src/hsmlunatest.cpp       |    11 +-
 mft_utils/mft_sig_handler.c                   |    94 +-
 mft_utils/mft_sig_handler.h                   |    91 +-
 mft_utils/mft_utils.cpp                       |    38 +-
 mft_utils/mft_utils.h                         |     8 +-
 mft_utils/mlarge_buffer.cpp                   |    74 +-
 mft_utils/mlarge_buffer.h                     |    28 +-
 mlxarchive/mfa2_buff.cpp                      |    95 +-
 mlxarchive/mfa2_buff.h                        |    22 +-
 mlxarchive/mlxarchive.cpp                     |   192 +-
 mlxarchive/mlxarchive.h                       |    44 +-
 mlxarchive/mlxarchive_mfa2.cpp                |   169 +-
 mlxarchive/mlxarchive_mfa2.h                  |   101 +-
 mlxarchive/mlxarchive_mfa2_builder.cpp        |   114 +-
 mlxarchive/mlxarchive_mfa2_builder.h          |    43 +-
 mlxarchive/mlxarchive_mfa2_common_header.cpp  |    27 +-
 mlxarchive/mlxarchive_mfa2_common_header.h    |    22 +-
 mlxarchive/mlxarchive_mfa2_component.h        |    32 +-
 mlxarchive/mlxarchive_mfa2_descriptor.cpp     |   204 +-
 mlxarchive/mlxarchive_mfa2_descriptor.h       |   125 +-
 mlxarchive/mlxarchive_mfa2_element.cpp        |     7 +-
 mlxarchive/mlxarchive_mfa2_element.h          |    14 +-
 mlxarchive/mlxarchive_mfa2_extension.cpp      |   103 +-
 mlxarchive/mlxarchive_mfa2_extension.h        |   120 +-
 mlxarchive/mlxarchive_mfa2_package_gen.cpp    |    10 +-
 mlxarchive/mlxarchive_mfa2_package_gen.h      |     7 +-
 mlxarchive/mlxarchive_mfa2_utils.cpp          |    51 +-
 mlxarchive/mlxarchive_mfa2_utils.h            |    31 +-
 mlxconfig/mlxcfg_db_manager.h                 |     2 +-
 mlxconfig/mlxcfg_generic_commander.cpp        |     5 +-
 mlxconfig/mlxcfg_parser.cpp                   |    30 +-
 mlxconfig/mlxcfg_ui.cpp                       |     3 +-
 mlxconfig/mlxcfg_utils.cpp                    |     1 -
 mlxfwops/lib/aux_tlv_ops.cpp                  |   255 +-
 mlxfwops/lib/aux_tlv_ops.h                    |    89 +-
 mlxfwops/lib/bluefiled_signature_manager.cpp  |    30 +-
 mlxfwops/lib/connectx6_signature_manager.cpp  |    16 +-
 mlxfwops/lib/flint_base.cpp                   |   166 +-
 mlxfwops/lib/flint_base.h                     |   631 +-
 mlxfwops/lib/flint_io.cpp                     |   682 +-
 mlxfwops/lib/flint_io.h                       |   212 +-
 mlxfwops/lib/fs2_ops.cpp                      |  1559 +-
 mlxfwops/lib/fs2_ops.h                        |   213 +-
 mlxfwops/lib/fs3_ops.cpp                      |  2893 ++-
 mlxfwops/lib/fs3_ops.h                        |   421 +-
 mlxfwops/lib/fs4_ops.cpp                      |  3320 +--
 mlxfwops/lib/fs4_ops.h                        |   306 +-
 mlxfwops/lib/fs_checks.cpp                    |   102 +-
 mlxfwops/lib/fs_checks.h                      |    42 +-
 mlxfwops/lib/fsctrl_ops.cpp                   |   779 +-
 mlxfwops/lib/fsctrl_ops.h                     |   114 +-
 mlxfwops/lib/fuse_gw.cpp                      |   149 +-
 mlxfwops/lib/fuse_gw.h                        |    35 +-
 mlxfwops/lib/fw_ops.cpp                       |  1882 +-
 mlxfwops/lib/fw_ops.h                         |   571 +-
 mlxfwops/lib/fw_version.cpp                   |   151 +-
 mlxfwops/lib/fw_version.h                     |    34 +-
 mlxfwops/lib/mlxfwops.cpp                     |   246 +-
 mlxfwops/lib/mlxfwops.h                       |    87 +-
 mlxfwops/lib/mlxfwops_com.h                   |   259 +-
 mlxfwops/lib/security_version_gw.cpp          |   136 +-
 mlxfwops/lib/security_version_gw.h            |    18 +-
 mlxfwops/lib/signature_manager.h              |    49 +-
 mlxfwops/lib/signature_manager_factory.h      |    76 +-
 mlxfwops/uefi_c/mft_uefi_common.h             |    12 +-
 mlxfwupdate/cmd_line_params.cpp               |    58 +-
 mlxfwupdate/cmd_line_params.h                 |     3 +-
 mlxfwupdate/cmd_line_parser.cpp               |   862 +-
 mlxfwupdate/cmd_line_parser.h                 |     6 +-
 mlxfwupdate/err_msgs.h                        |    59 +-
 mlxfwupdate/fw_version_old_clp.cpp            |    29 +-
 mlxfwupdate/fw_version_old_clp.h              |    10 +-
 mlxfwupdate/fw_version_with_sub_build.cpp     |    30 +-
 mlxfwupdate/fw_version_with_sub_build.h       |    10 +-
 mlxfwupdate/image_access.cpp                  |   432 +-
 mlxfwupdate/image_access.h                    |    43 +-
 mlxfwupdate/img_version.cpp                   |   113 +-
 mlxfwupdate/img_version.h                     |    18 +-
 mlxfwupdate/menu.cpp                          |   341 +-
 mlxfwupdate/menu.h                            |    88 +-
 mlxfwupdate/mlnx_dev.cpp                      |   918 +-
 mlxfwupdate/mlnx_dev.h                        |    72 +-
 mlxfwupdate/mlxfwmanager.cpp                  |  1998 +-
 mlxfwupdate/mlxfwmanager.h                    |   223 +-
 mlxfwupdate/mlxfwmanager_common.cpp           |   174 +-
 mlxfwupdate/mlxfwmanager_common.h             |    52 +-
 mlxfwupdate/output_fmts.cpp                   |   180 +-
 mlxfwupdate/output_fmts.h                     |    17 +-
 mlxfwupdate/psid_lookup_db.cpp                |    44 +-
 mlxfwupdate/psid_lookup_db.h                  |    15 +-
 mlxfwupdate/psid_query_item.cpp               |    11 +-
 mlxfwupdate/psid_query_item.h                 |    10 +-
 mlxfwupdate/server_request.cpp                |   418 +-
 mlxfwupdate/server_request.h                  |    62 +-
 mlxreg/mlxreg_exception.cpp                   |    46 +-
 mlxreg/mlxreg_exception.h                     |    22 +-
 mlxreg/mlxreg_lib.cpp                         |   200 +-
 mlxreg/mlxreg_lib.h                           |    65 +-
 mlxreg/mlxreg_parser.cpp                      |   281 +-
 mlxreg/mlxreg_parser.h                        |    51 +-
 mlxreg/mlxreg_ui.cpp                          |   600 +-
 mlxreg/mlxreg_ui.h                            |    32 +-
 mlxsign_lib/mlxsign_com_def.h                 |     1 -
 mlxsign_lib/mlxsign_lib.cpp                   |   191 +-
 mlxsign_lib/mlxsign_lib.h                     |    37 +-
 mlxsign_lib/mlxsign_openssl_engine.cpp        |    81 +-
 mlxsign_lib/mlxsign_openssl_engine.h          |    19 +-
 mlxsign_lib/mlxsign_signer_interface.cpp      |    51 +-
 mlxsign_lib/mlxsign_signer_interface.h        |    12 +-
 mstdump/crd_lib/crdump.c                      |   580 +-
 mstdump/crd_lib/crdump.h                      |   133 +-
 mstdump/crd_main/mstdump.c                    |    85 +-
 mtcr_freebsd/mtcr_ul.c                        |  2003 +-
 mtcr_py/cmtcr.c                               |   163 +-
 mtcr_py/mtcr.py                               |    53 +-
 mtcr_py/test.py                               |     2 +-
 mtcr_ul/mtcr_ib.h                             |    45 +-
 mtcr_ul/mtcr_ib_ofed.c                        |  1455 +-
 mtcr_ul/mtcr_ib_res_mgt.c                     |    64 +-
 mtcr_ul/mtcr_ib_res_mgt.h                     |    22 +-
 mtcr_ul/mtcr_icmd_cif.h                       |   115 +-
 mtcr_ul/mtcr_int_defs.h                       |    24 +-
 mtcr_ul/mtcr_mem_ops.c                        |    52 +-
 mtcr_ul/mtcr_mem_ops.h                        |    15 +-
 mtcr_ul/mtcr_tools_cif.c                      |   409 +-
 mtcr_ul/mtcr_tools_cif.h                      |    51 +-
 mtcr_ul/mtcr_ul.c                             |   176 +-
 mtcr_ul/mtcr_ul_com.c                         |  2581 +-
 mtcr_ul/mtcr_ul_com.h                         |   227 +-
 mtcr_ul/mtcr_ul_icmd_cif.c                    |  1180 +-
 mtcr_ul/packets_common.c                      |    95 +-
 mtcr_ul/packets_common.h                      |   156 +-
 mtcr_ul/packets_layout.c                      |    40 +-
 mtcr_ul/packets_layout.h                      |    47 +-
 mvpd/mvpd.c                                   |   396 +-
 mvpd/mvpd.h                                   |   109 +-
 pldmlib/pldm_buff.cpp                         |    89 +-
 pldmlib/pldm_buff.h                           |    15 +-
 pldmlib/pldm_component_image.cpp              |    37 +-
 pldmlib/pldm_component_image.h                |    14 +-
 pldmlib/pldm_dev_id_record.cpp                |   108 +-
 pldmlib/pldm_dev_id_record.h                  |    17 +-
 pldmlib/pldm_pkg.cpp                          |    50 +-
 pldmlib/pldm_pkg.h                            |    25 +-
 pldmlib/pldm_pkg_hdr.cpp                      |    37 +-
 pldmlib/pldm_pkg_hdr.h                        |    40 +-
 pldmlib/pldm_record_descriptor.cpp            |    68 +-
 pldmlib/pldm_record_descriptor.h              |    17 +-
 reg_access/reg_access.c                       |   782 +-
 reg_access/reg_access.h                       |   151 +-
 reg_access/regaccess.py                       |   135 +-
 resourcedump/__init__.py                      |    63 +-
 resourcedump/commands/CommandFactory.py       |    65 +-
 resourcedump/commands/DumpCommand.py          |    64 +-
 resourcedump/commands/QueryCommand.py         |    60 +-
 resourcedump/commands/ResDumpCommand.py       |    64 +-
 resourcedump/commands/__init__.py             |    60 +-
 resourcedump/fetchers/CapabilityFetcher.py    |    64 +-
 resourcedump/fetchers/ResourceDumpFetcher.py  |   138 +-
 resourcedump/fetchers/__init__.py             |    63 +-
 resourcedump/filters/SegmentsFilter.py        |    60 +-
 resourcedump/filters/__init__.py              |    62 +-
 resourcedump/mstresourcedump.py               |    68 +-
 resourcedump/resource_data/DataPrinter.py     |    69 +-
 resourcedump/resource_data/DumpData.py        |    65 +-
 resourcedump/resource_data/QueryData.py       |    68 +-
 resourcedump/resource_data/__init__.py        |    63 +-
 resourcedump/segments/CommandSegment.py       |    60 +-
 resourcedump/segments/ErrorSegment.py         |    60 +-
 resourcedump/segments/InfoSegment.py          |    60 +-
 resourcedump/segments/MenuRecord.py           |    64 +-
 resourcedump/segments/MenuSegment.py          |    72 +-
 resourcedump/segments/NoticeSegment.py        |    60 +-
 resourcedump/segments/RefSegment.py           |    64 +-
 resourcedump/segments/ResourceSegment.py      |    60 +-
 resourcedump/segments/Segment.py              |    64 +-
 resourcedump/segments/SegmentCreator.py       |    64 +-
 resourcedump/segments/SegmentFactory.py       |    64 +-
 resourcedump/segments/TerminateSegment.py     |    60 +-
 resourcedump/segments/__init__.py             |    60 +-
 resourcedump/utils/Exceptions.py              |    60 +-
 resourcedump/utils/__init__.py                |    65 +-
 resourcedump/utils/constants.py               |    62 +-
 resourcedump/validation/ArgToMenuVerifier.py  |    64 +-
 .../validation/CapabilityValidator.py         |    64 +-
 resourcedump/validation/__init__.py           |    63 +-
 resourceparse/__init__.py                     |    63 +-
 resourceparse/mstresourceparse.py             |    64 +-
 resourceparse/parsers/AdbParser.py            |   131 +-
 resourceparse/parsers/Parser.py               |    72 +-
 resourceparse/parsers/__init__.py             |    63 +-
 resourceparse/resource_data/AdbData.py        |    66 +-
 resourceparse/resource_data/DataPrinter.py    |    64 +-
 resourceparse/resource_data/RawData.py        |    64 +-
 resourceparse/resource_data/__init__.py       |    63 +-
 resourceparse/segments/CommandSegment.py      |    60 +-
 resourceparse/segments/ErrorSegment.py        |    60 +-
 resourceparse/segments/InfoSegment.py         |    64 +-
 resourceparse/segments/MenuRecord.py          |    64 +-
 resourceparse/segments/MenuSegment.py         |    68 +-
 resourceparse/segments/NoticeSegment.py       |    62 +-
 resourceparse/segments/RefSegment.py          |    64 +-
 resourceparse/segments/ResourceSegment.py     |    61 +-
 resourceparse/segments/Segment.py             |    65 +-
 resourceparse/segments/SegmentCreator.py      |    64 +-
 resourceparse/segments/SegmentFactory.py      |    64 +-
 resourceparse/segments/TerminateSegment.py    |    60 +-
 resourceparse/segments/__init__.py            |    60 +-
 resourceparse/utils/Exceptions.py             |    60 +-
 resourceparse/utils/__init__.py               |    63 +-
 resourceparse/utils/constants.py              |    64 +-
 small_utils/binary_file.py                    |    16 +-
 small_utils/congestion.cpp                    |   221 +-
 small_utils/congestion.h                      |    18 +-
 small_utils/mcra.c                            |   275 +-
 small_utils/mlxfwresetlib/__init__.py         |    63 +-
 small_utils/mlxfwresetlib/cmd_reg_mcam.py     |     8 +-
 small_utils/mlxfwresetlib/cmd_reg_mfrl.py     |    49 +-
 small_utils/mlxfwresetlib/cmd_reg_mpcir.py    |    22 +-
 small_utils/mlxfwresetlib/logger.py           |    11 +-
 small_utils/mlxfwresetlib/mcra.py             |    13 +-
 .../mlnx_peripheral_components.py             |    24 +-
 .../mlxfwresetlib/mlxfwreset_mlnxdriver.py    |   135 +-
 .../mlxfwreset_status_checker.py              |     6 +-
 small_utils/mlxfwresetlib/mlxfwreset_utils.py |    41 +-
 small_utils/mlxfwresetlib/pci_device.py       |    18 +-
 small_utils/mlxpci_lib.py                     |   118 +-
 small_utils/mread.c                           |    23 +-
 small_utils/mstfwreset.py                     |   537 +-
 small_utils/mtserver.c                        |  1118 +-
 small_utils/mwrite.c                          |    27 +-
 small_utils/tcp.c                             |   295 +-
 small_utils/tcp.h                             |    17 +-
 small_utils/vpd.c                             |   263 +-
 tools_crypto/tools_md5.c                      |     2 +-
 tools_crypto/tools_md5.h                      |     5 +-
 tools_layouts/adb_to_c_utils.c                |   181 +-
 tools_layouts/adb_to_c_utils.h                |   434 +-
 tools_layouts/cibfw_layouts.c                 |  2043 +-
 tools_layouts/cibfw_layouts.h                 |  1300 +-
 tools_layouts/cx4fw_layouts.c                 |  1162 +-
 tools_layouts/cx4fw_layouts.h                 |   670 +-
 tools_layouts/cx6fw_layouts.c                 |   394 +-
 tools_layouts/cx6fw_layouts.h                 |   239 +-
 tools_layouts/icmd_layouts.c                  |   719 +-
 tools_layouts/icmd_layouts.h                  |  1098 +-
 tools_layouts/image_info_layouts.c            |   144 +-
 tools_layouts/image_info_layouts.h            |   776 +-
 tools_layouts/image_layout_layouts.c          |  2936 +--
 tools_layouts/image_layout_layouts.h          |  1964 +-
 tools_layouts/prm_adb_db.cpp                  |    59 +-
 tools_layouts/prm_adb_db.h                    |    12 +-
 tools_layouts/reg_access_hca_layouts.c        |  5988 +++--
 tools_layouts/reg_access_hca_layouts.h        |  4001 +--
 tools_layouts/reg_access_switch_layouts.c     |  1874 +-
 tools_layouts/reg_access_switch_layouts.h     |  1185 +-
 tools_layouts/register_access_open_layouts.c  |   398 +-
 tools_layouts/register_access_open_layouts.h  |   283 +-
 tools_layouts/register_access_sib_layouts.c   |   935 +-
 tools_layouts/register_access_sib_layouts.h   |   615 +-
 tools_layouts/tools_open_layouts.c            | 10506 ++++----
 tools_layouts/tools_open_layouts.h            |  7116 +++---
 tools_res_mgmt/tools_res_mgmt.c               |   640 +-
 tools_res_mgmt/tools_res_mgmt.h               |   131 +-
 tools_res_mgmt/tools_time.c                   |    10 +-
 tools_res_mgmt/tools_time.h                   |    18 +-
 tracers/fwtrace/fw_trace_utilities.py         |    62 +-
 tracers/fwtrace/mstfwtrace.py                 |    87 +-
 tracers/fwtrace/secure_fw_trace.py            |    56 +-
 xz_utils/xz_utils.c                           |   218 +-
 xz_utils/xz_utils.h                           |    31 +-
 439 files changed, 94987 insertions(+), 84106 deletions(-)
 create mode 100755 .clang-format
 mode change 100755 => 100644 adb_parser/adb_parser.cpp
 mode change 100755 => 100644 ext_libs/json/json/autolink.h
 mode change 100755 => 100644 ext_libs/json/json/config.h
 mode change 100755 => 100644 ext_libs/json/json/features.h
 mode change 100755 => 100644 ext_libs/json/json/forwards.h
 mode change 100755 => 100644 ext_libs/json/json/json.h
 mode change 100755 => 100644 ext_libs/json/json/reader.h
 mode change 100755 => 100644 ext_libs/json/json/value.h
 mode change 100755 => 100644 ext_libs/json/json/writer.h
 mode change 100755 => 100644 ext_libs/muparser/muParser.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParser.h
 mode change 100755 => 100644 ext_libs/muparser/muParserBase.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserBase.h
 mode change 100755 => 100644 ext_libs/muparser/muParserBytecode.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserBytecode.h
 mode change 100755 => 100644 ext_libs/muparser/muParserCallback.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserCallback.h
 mode change 100755 => 100644 ext_libs/muparser/muParserDLL.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserDLL.h
 mode change 100755 => 100644 ext_libs/muparser/muParserDef.h
 mode change 100755 => 100644 ext_libs/muparser/muParserError.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserError.h
 mode change 100755 => 100644 ext_libs/muparser/muParserFixes.h
 mode change 100755 => 100644 ext_libs/muparser/muParserInt.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserInt.h
 mode change 100755 => 100644 ext_libs/muparser/muParserStack.h
 mode change 100755 => 100644 ext_libs/muparser/muParserTemplateMagic.h
 mode change 100755 => 100644 ext_libs/muparser/muParserTest.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserTest.h
 mode change 100755 => 100644 ext_libs/muparser/muParserToken.h
 mode change 100755 => 100644 ext_libs/muparser/muParserTokenReader.cpp
 mode change 100755 => 100644 ext_libs/muparser/muParserTokenReader.h
 mode change 100755 => 100644 mflash/mflash_types.h
 mode change 100755 => 100644 mlxarchive/mfa2_buff.cpp
 mode change 100755 => 100644 mlxfwops/lib/fs2_ops.h
 mode change 100755 => 100644 mlxfwops/lib/fuse_gw.cpp
 mode change 100755 => 100644 mlxfwops/lib/fuse_gw.h
 mode change 100755 => 100644 mstdump/crd_lib/crdump.h
 mode change 100755 => 100644 tools_layouts/cx6fw_layouts.c
 mode change 100755 => 100644 tools_layouts/cx6fw_layouts.h
 mode change 100755 => 100644 tools_layouts/image_layout_layouts.c
 mode change 100755 => 100644 tools_layouts/image_layout_layouts.h
 mode change 100755 => 100644 tools_layouts/prm_adb_db.cpp
 mode change 100755 => 100644 tools_layouts/prm_adb_db.h
 mode change 100755 => 100644 xz_utils/xz_utils.h

diff --git a/.clang-format b/.clang-format
new file mode 100755
index 00000000..f90db87e
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,77 @@
+---
+# BasedOnStyle:  Google
+AccessModifierOffset: -4
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+ConstructorInitializerIndentWidth: 4
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AlignEscapedNewlinesLeft: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: true
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializers: AfterColon
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: false
+Standard:        Auto
+IndentWidth:     4
+TabWidth:        8
+UseTab:          Never
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: true
+  AfterEnum:      true
+  AfterFunction:  true
+  AfterNamespace: true
+  AfterObjCDeclaration: true
+  AfterStruct:   true
+  AfterUnion:     true
+  AfterExternBlock: true
+  BeforeCatch:      true
+  BeforeElse:       true
+  IndentBraces:     true
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+CommentPragmas:  '^ ignore_styling:'
+ColumnLimit: 120
+DerivePointerBinding: true
+DerivePointerAlignment: false
+ExperimentalAutoDetectBinPacking: true
+IndentCaseLabels: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 60
+PenaltyBreakString: 60
+PenaltyBreakFirstLessLess: 60
+PenaltyExcessCharacter: 60
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerBindsToType: true
+PointerAlignment: Left
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: true
+BreakBeforeBraces: Allman
+IndentFunctionDeclarationAfterType: true
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 2
+ReflowComments: true
+SortIncludes: false
+SortUsingDeclarations: false
+SpaceAfterTemplateKeyword: false
+SpacesInContainerLiterals: false
+AllowShortFunctionsOnASingleLine: Inline
+BreakStringLiterals: false
+...
+
diff --git a/adb_parser/adb_common_functions.h b/adb_parser/adb_common_functions.h
index 47b06809..6c572817 100644
--- a/adb_parser/adb_common_functions.h
+++ b/adb_parser/adb_common_functions.h
@@ -32,5 +32,4 @@
  *  Version: $Id$
  */
 
-
 indentString(int)
diff --git a/adb_parser/adb_config.cpp b/adb_parser/adb_config.cpp
index 90507501..363036a3 100644
--- a/adb_parser/adb_config.cpp
+++ b/adb_parser/adb_config.cpp
@@ -39,38 +39,42 @@
 #include "adb_config.h"
 #include <iostream>
 
-void AdbConfig::print(int indent) {
+void AdbConfig::print(int indent)
+{
     cout << indentString(indent) << "Attributes:" << endl;
     AttrsMap::iterator iter;
     for (iter = attrs.begin(); iter != attrs.end(); iter++)
-        cout << indentString(indent + 1) << iter->first << " - "
-                << iter->second << endl;
+        cout << indentString(indent + 1) << iter->first << " - " << iter->second << endl;
 
     cout << indentString(indent) << "Enums:" << endl;
     for (iter = enums.begin(); iter != enums.end(); iter++)
-        cout << indentString(indent + 1) << iter->first << " - "
-                << iter->second << endl;
+        cout << indentString(indent + 1) << iter->first << " - " << iter->second << endl;
 }
 
 /**
  * Function: AdbConfig::toXml
  **/
-string AdbConfig::toXml() {
+string AdbConfig::toXml()
+{
     string xml = "<config ";
 
-    for (AttrsMap::iterator it = attrs.begin(); it != attrs.end(); it++) {
+    for (AttrsMap::iterator it = attrs.begin(); it != attrs.end(); it++)
+    {
         xml += " " + it->first + "=\"" + encodeXml(it->second) + "\"";
     }
 
-    if (!enums.empty()) {
+    if (!enums.empty())
+    {
         xml += " >\n";
 
-        for (AttrsMap::iterator it = enums.begin(); it != enums.end(); it++) {
-            xml += "\t<enum  name=\"" + encodeXml(it->first) + "\" value=\""
-                    + encodeXml(it->second) + "\" />\n";
+        for (AttrsMap::iterator it = enums.begin(); it != enums.end(); it++)
+        {
+            xml += "\t<enum  name=\"" + encodeXml(it->first) + "\" value=\"" + encodeXml(it->second) + "\" />\n";
         }
         xml += "</config>";
-    } else {
+    }
+    else
+    {
         xml += " />";
     }
 
diff --git a/adb_parser/adb_config.h b/adb_parser/adb_config.h
index c61465e2..8a891db1 100644
--- a/adb_parser/adb_config.h
+++ b/adb_parser/adb_config.h
@@ -46,7 +46,8 @@ using namespace std;
 
 typedef map<string, string> AttrsMap;
 
-class AdbConfig {
+class AdbConfig
+{
 public:
     // FOR DEBUG
     void print(int indent = 0);
diff --git a/adb_parser/adb_db.cpp b/adb_parser/adb_db.cpp
index e56edb46..ccc01086 100644
--- a/adb_parser/adb_db.cpp
+++ b/adb_parser/adb_db.cpp
@@ -41,20 +41,21 @@
 #include <boost/lexical_cast.hpp>
 #include "adb_db.h"
 
-#define CHECK_FIELD(field, node_w) \
-    if (((AdbInstance*)field)->isReserved()) { \
-        continue; \
-    } \
-    offset = db_field_offset(field); \
-    if (offset - node_w->node->offset < from || \
-        offset - node_w->node->offset > to) { \
-        continue; \
+#define CHECK_FIELD(field, node_w)                                                  \
+    if (((AdbInstance*)field)->isReserved())                                        \
+    {                                                                               \
+        continue;                                                                   \
+    }                                                                               \
+    offset = db_field_offset(field);                                                \
+    if (offset - node_w->node->offset < from || offset - node_w->node->offset > to) \
+    {                                                                               \
+        continue;                                                                   \
     }
 
 struct node_wrapper
 {
-    AdbInstance *node;
-    vector<AdbInstance*> *fields;
+    AdbInstance* node;
+    vector<AdbInstance*>* fields;
 };
 
 static char err[1024] = {0};
@@ -65,15 +66,15 @@ static char err[1024] = {0};
 adb_db_t* db_create()
 {
     return new Adb();
-
 }
 
 /**
  * db_load
  */
-int db_load(adb_db_t *db, const char *adb_file_path, int add_reserved)
+int db_load(adb_db_t* db, const char* adb_file_path, int add_reserved)
 {
-    if (!((Adb*)db)->load(adb_file_path, add_reserved, false)) {
+    if (!((Adb*)db)->load(adb_file_path, add_reserved, false))
+    {
         sprintf(err, "Failed to load adabe project: %s", ((Adb*)db)->getLastError().c_str());
         return 1;
     }
@@ -84,9 +85,10 @@ int db_load(adb_db_t *db, const char *adb_file_path, int add_reserved)
 /**
  * db_load_from_str
  */
-int db_load_from_str(adb_db_t *db, const char *adb_data, int add_reserved)
+int db_load_from_str(adb_db_t* db, const char* adb_data, int add_reserved)
 {
-    if (!((Adb*)db)->loadFromString(adb_data, add_reserved, false)) {
+    if (!((Adb*)db)->loadFromString(adb_data, add_reserved, false))
+    {
         sprintf(err, "Failed to load adabe project: %s", ((Adb*)db)->getLastError().c_str());
         return 1;
     }
@@ -97,9 +99,10 @@ int db_load_from_str(adb_db_t *db, const char *adb_data, int add_reserved)
 /**
  * db_destroy
  */
-void db_destroy(adb_db_t *db)
+void db_destroy(adb_db_t* db)
 {
-    if (db) {
+    if (db)
+    {
         delete (Adb*)db;
     }
 }
@@ -112,34 +115,39 @@ const char* db_get_last_err()
     return err;
 }
 
-
-adb_limits_map_t* db_create_limits_map(adb_db_t *db)
+adb_limits_map_t* db_create_limits_map(adb_db_t* db)
 {
-    map<string, string> *limits = new map<string, string>();
+    map<string, string>* limits = new map<string, string>();
 
     // Load defines
-    if (db) {
-        for (size_t i = 0; i < ((Adb*)db)->configs.size(); i++) {
+    if (db)
+    {
+        for (size_t i = 0; i < ((Adb*)db)->configs.size(); i++)
+        {
             AttrsMap::iterator attrs_map = ((Adb*)db)->configs[i]->attrs.find("define");
-            if (attrs_map != ((Adb*)db)->configs[i]->attrs.end()) {
+            if (attrs_map != ((Adb*)db)->configs[i]->attrs.end())
+            {
                 vector<string> defVal;
                 boost::algorithm::split(defVal, attrs_map->second, boost::is_any_of(string("=")));
 
-                if (defVal.size() == 1) {
+                if (defVal.size() == 1)
+                {
                     ((map<string, string>*)limits)->insert(pair<string, string>(defVal[0], "0"));
-                } else {
+                }
+                else
+                {
                     ((map<string, string>*)limits)->insert(pair<string, string>(defVal[0], defVal[1]));
                 }
             }
         }
     }
     return (adb_limits_map_t*)limits;
-
 }
 
-void db_destroy_limits_map(adb_limits_map_t *limits)
+void db_destroy_limits_map(adb_limits_map_t* limits)
 {
-    if (limits) {
+    if (limits)
+    {
         ((map<string, string>*)limits)->clear();
         delete (map<string, string>*)limits;
     }
@@ -148,16 +156,18 @@ void db_destroy_limits_map(adb_limits_map_t *limits)
 /**
  * db_get_node
  */
-adb_node_t* db_get_node(adb_db_t *db, const char *node_name)
+adb_node_t* db_get_node(adb_db_t* db, const char* node_name)
 {
-    Adb *adb = (Adb*)db;
-    AdbInstance *node = adb->createLayout(node_name, false);
-    if (!node) {
+    Adb* adb = (Adb*)db;
+    AdbInstance* node = adb->createLayout(node_name, false);
+    if (!node)
+    {
         sprintf(err, "Failed to create node %s: %s", node_name, adb->getLastError().c_str());
         return NULL;
     }
-    struct node_wrapper *node_w = (struct node_wrapper*)malloc(sizeof(struct node_wrapper));
-    if (!node_w) {
+    struct node_wrapper* node_w = (struct node_wrapper*)malloc(sizeof(struct node_wrapper));
+    if (!node_w)
+    {
         delete node;
         sprintf(err, "Failed to allocate memory for node");
         return NULL;
@@ -172,14 +182,17 @@ adb_node_t* db_get_node(adb_db_t *db, const char *node_name)
 /**
  * db_node_destroy
  */
-void db_node_destroy(adb_node_t *node)
+void db_node_destroy(adb_node_t* node)
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
-    if (node_w) {
-        if (node_w->node) {
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
+    if (node_w)
+    {
+        if (node_w->node)
+        {
             delete node_w->node;
         }
-        if (node_w->fields) {
+        if (node_w->fields)
+        {
             delete node_w->fields;
         }
         free(node_w);
@@ -189,65 +202,73 @@ void db_node_destroy(adb_node_t *node)
 /**
  * db_node_name
  */
-void db_node_name(adb_node_t *node, char name[])
+void db_node_name(adb_node_t* node, char name[])
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     strcpy(name, node_w->node->name.c_str());
 }
 
 /**
  * db_node_size
  */
-int db_node_size(adb_node_t *node)
+int db_node_size(adb_node_t* node)
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     return node_w->node->size;
 }
 
 /**
  * db_node_num_of_fields
  */
-int db_node_num_of_fields(adb_node_t *node)
+int db_node_num_of_fields(adb_node_t* node)
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     return (int)node_w->fields->size();
 }
 
 /**
  * db_node_get_field
  */
-adb_field_t* db_node_get_field(adb_node_t *node, int field_idx)
+adb_field_t* db_node_get_field(adb_node_t* node, int field_idx)
 {
-    if (field_idx >= db_node_num_of_fields(node)) {
+    if (field_idx >= db_node_num_of_fields(node))
+    {
         sprintf(err, "index out of range");
         return NULL;
     }
 
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     return node_w->fields->at(field_idx);
 }
 
 /**
  * db_node_get_field_by_path
  */
-adb_field_t* db_node_get_field_by_path(adb_node_t *node, const char *path, int is_case_sensitive)
+adb_field_t* db_node_get_field_by_path(adb_node_t* node, const char* path, int is_case_sensitive)
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     string fullPath(path);
 
-    if (node_w->node->isConditionalNode()) {
+    if (node_w->node->isConditionalNode())
+    {
         fullPath += ".val";
     }
-    for (size_t i = 0; i < node_w->fields->size(); i++) {
-        if (is_case_sensitive) {
-            if (node_w->fields->at(i)->fullName(1) == fullPath) {
+    for (size_t i = 0; i < node_w->fields->size(); i++)
+    {
+        if (is_case_sensitive)
+        {
+            if (node_w->fields->at(i)->fullName(1) == fullPath)
+            {
                 return node_w->fields->at(i);
             }
-        } else {
+        }
+        else
+        {
             string field_name_lower = boost::algorithm::to_lower_copy(node_w->fields->at(i)->fullName(1));
             string path_lower = boost::algorithm::to_lower_copy(fullPath);
 
-            if (path_lower == field_name_lower) {
+            if (path_lower == field_name_lower)
+            {
                 return node_w->fields->at(i);
             }
         }
@@ -261,9 +282,9 @@ adb_field_t* db_node_get_field_by_path(adb_node_t *node, const char *path, int i
  * db_node_dump
  * Returns: false on error
  */
-bool db_node_dump(adb_node_t *node, u_int8_t buf[], dump_format_t format, FILE *stream)
+bool db_node_dump(adb_node_t* node, u_int8_t buf[], dump_format_t format, FILE* stream)
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     return db_node_range_dump(node, 0, node_w->node->size - 1, buf, format, stream);
 }
 
@@ -271,13 +292,13 @@ bool db_node_dump(adb_node_t *node, u_int8_t buf[], dump_format_t format, FILE *
  * db_node_dump_with_limits
  * Returns: false on error
  */
-bool db_node_conditional_dump(adb_node_t *node,
+bool db_node_conditional_dump(adb_node_t* node,
                               u_int8_t buf[],
                               dump_format_t format,
-                              FILE *stream,
-                              adb_limits_map_t *values_map)
+                              FILE* stream,
+                              adb_limits_map_t* values_map)
 {
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
     return db_node_conditional_range_dump(node, 0, node_w->node->size - 1, buf, format, stream, values_map);
 }
 
@@ -285,8 +306,12 @@ bool db_node_conditional_dump(adb_node_t *node,
  * db_node_range_dump
  * Returns: false on error
  */
-bool db_node_range_dump(adb_node_t *node, u_int32_t from, u_int32_t to,
-                        u_int8_t buf[], dump_format_t format, FILE *stream)
+bool db_node_range_dump(adb_node_t* node,
+                        u_int32_t from,
+                        u_int32_t to,
+                        u_int8_t buf[],
+                        dump_format_t format,
+                        FILE* stream)
 {
     return db_node_conditional_range_dump(node, from, to, buf, format, stream, NULL);
 }
@@ -295,36 +320,41 @@ bool db_node_range_dump(adb_node_t *node, u_int32_t from, u_int32_t to,
  * db_node_range_dump_with_limits
  * Returns: false on error
  */
-bool db_node_conditional_range_dump(adb_node_t *node,
+bool db_node_conditional_range_dump(adb_node_t* node,
                                     u_int32_t from,
                                     u_int32_t to,
                                     u_int8_t buf[],
                                     dump_format_t format,
-                                    FILE *stream,
-                                    adb_limits_map_t *values_map)
+                                    FILE* stream,
+                                    adb_limits_map_t* values_map)
 {
     int i;
-    adb_field_t *field;
+    adb_field_t* field;
     char enum_str[256];
     char name[256];
     int is_enum;
     u_int32_t value;
     u_int32_t offset;
     u_int32_t size;
-    struct node_wrapper *node_w = (struct node_wrapper*)node;
-    if (values_map) {
+    struct node_wrapper* node_w = (struct node_wrapper*)node;
+    if (values_map)
+    {
         // Fill values map for conditions
-        for (i = 0; i < db_node_num_of_fields(node); i++) {
+        for (i = 0; i < db_node_num_of_fields(node); i++)
+        {
             field = db_node_get_field(node, i);
-            if (!field) {
+            if (!field)
+            {
                 return false;
             }
             CHECK_FIELD(field, node_w);
             db_field_full_name(field, 0, name);
             value = db_field_value(field, (u_int8_t*)buf);
-            if (node_w->node->isConditionalNode()) {
-                char *p = strstr(name, ".val");
-                if (p != NULL) {
+            if (node_w->node->isConditionalNode())
+            {
+                char* p = strstr(name, ".val");
+                if (p != NULL)
+                {
                     *p = '\0';
                 }
             }
@@ -332,52 +362,63 @@ bool db_node_conditional_range_dump(adb_node_t *node,
         }
     }
 
-    for (i = 0; i < db_node_num_of_fields(node); i++) {
+    for (i = 0; i < db_node_num_of_fields(node); i++)
+    {
         field = db_node_get_field(node, i);
-        if (!field) {
+        if (!field)
+        {
             return false;
         }
         CHECK_FIELD(field, node_w);
 
         db_field_full_name(field, 0, name);
         value = db_field_value(field, (u_int8_t*)buf);
-        if (node_w->node->isConditionalNode()) {
-            char *p = strstr(name, ".val");
-            if (p != NULL) {
+        if (node_w->node->isConditionalNode())
+        {
+            char* p = strstr(name, ".val");
+            if (p != NULL)
+            {
                 *p = '\0';
             }
         }
         /*
          * Just if the node is Conditional
          */
-        if (node_w->node->isConditionalNode() && values_map != NULL) {
-            try {
-                AdbInstance *parentField = node_w->node->subItems[i];
-                if (!parentField->isConditionValid(((map<string, string>*)values_map))) {
+        if (node_w->node->isConditionalNode() && values_map != NULL)
+        {
+            try
+            {
+                AdbInstance* parentField = node_w->node->subItems[i];
+                if (!parentField->isConditionValid(((map<string, string>*)values_map)))
+                {
                     ((map<string, string>*)values_map)->erase(name);
                     continue;
                 }
-            } catch (...) {
+            }
+            catch (...)
+            {
                 continue;
             }
         }
 
         is_enum = db_field_enum(field, value, enum_str);
         size = db_field_size(field);
-        if (stream != NULL) {
-            switch (format) {
-            case DB_FORMAT_STANDARD:
-                fprintf(stream, "%-40s : 0x%x %s\n", name, value, is_enum ? enum_str : "");
-                break;
-
-            case DB_FORMAT_STANDARD_NO_ENUM:
-                fprintf(stream, "%-40s : 0x%x\n", name, value);
-                break;
-
-            case DB_FORMAT_FULL_DETAILS:
-                fprintf(stream, "%-40s : 0x%x %s - address: 0x%x.%d:%d\n",
-                        name, value, is_enum ? enum_str : "", offset / 32 * 4, offset % 32, size);
-                break;
+        if (stream != NULL)
+        {
+            switch (format)
+            {
+                case DB_FORMAT_STANDARD:
+                    fprintf(stream, "%-40s : 0x%x %s\n", name, value, is_enum ? enum_str : "");
+                    break;
+
+                case DB_FORMAT_STANDARD_NO_ENUM:
+                    fprintf(stream, "%-40s : 0x%x\n", name, value);
+                    break;
+
+                case DB_FORMAT_FULL_DETAILS:
+                    fprintf(stream, "%-40s : 0x%x %s - address: 0x%x.%d:%d\n", name, value, is_enum ? enum_str : "",
+                            offset / 32 * 4, offset % 32, size);
+                    break;
             }
         }
     }
@@ -387,7 +428,7 @@ bool db_node_conditional_range_dump(adb_node_t *node,
 /**
  * db_field_name
  */
-void db_field_name(adb_field_t *field, char name[])
+void db_field_name(adb_field_t* field, char name[])
 {
     strcpy(name, ((AdbInstance*)field)->name.c_str());
 }
@@ -395,7 +436,7 @@ void db_field_name(adb_field_t *field, char name[])
 /**
  * db_field_full_name
  */
-void db_field_full_name(adb_field_t *field, int skip_level, char name[])
+void db_field_full_name(adb_field_t* field, int skip_level, char name[])
 {
     strcpy(name, ((AdbInstance*)field)->fullName(skip_level + 1).c_str());
 }
@@ -403,7 +444,7 @@ void db_field_full_name(adb_field_t *field, int skip_level, char name[])
 /**
  * db_field_offset
  */
-int db_field_offset(adb_field_t *field)
+int db_field_offset(adb_field_t* field)
 {
     return ((AdbInstance*)field)->offset;
 }
@@ -411,7 +452,7 @@ int db_field_offset(adb_field_t *field)
 /**
  * db_field_size
  */
-int db_field_size(adb_field_t *field)
+int db_field_size(adb_field_t* field)
 {
     return ((AdbInstance*)field)->size;
 }
@@ -419,19 +460,19 @@ int db_field_size(adb_field_t *field)
 /**
  * db_field_value
  */
-u_int64_t db_field_value(adb_field_t *field, u_int8_t buf[])
+u_int64_t db_field_value(adb_field_t* field, u_int8_t buf[])
 {
-//    cout << ((AdbInstance*)field)->offset / 8 << endl;
-//    for (unsigned i = 0; i < ((AdbInstance*)field)->offset / 8; i++) {
-//        printf ("%02x ", buf[i]);
-//    }
+    //    cout << ((AdbInstance*)field)->offset / 8 << endl;
+    //    for (unsigned i = 0; i < ((AdbInstance*)field)->offset / 8; i++) {
+    //        printf ("%02x ", buf[i]);
+    //    }
     return ((AdbInstance*)field)->popBuf(buf);
 }
 
 /**
  * db_field_set_value
  */
-void db_field_set_value(adb_field_t *field, u_int8_t buf[], u_int64_t value)
+void db_field_set_value(adb_field_t* field, u_int8_t buf[], u_int64_t value)
 {
     ((AdbInstance*)field)->pushBuf(buf, value);
 }
@@ -439,13 +480,16 @@ void db_field_set_value(adb_field_t *field, u_int8_t buf[], u_int64_t value)
 /**
  * db_field_enum
  */
-int db_field_enum(adb_field_t *field, u_int64_t value, char enum_str[])
+int db_field_enum(adb_field_t* field, u_int64_t value, char enum_str[])
 {
     string s;
-    if (((AdbInstance*)field)->intToEnum(value, s)) {
+    if (((AdbInstance*)field)->intToEnum(value, s))
+    {
         strcpy(enum_str, s.c_str());
         return 1;
-    } else {
+    }
+    else
+    {
         strcpy(enum_str, "");
         return 0;
     }
@@ -454,12 +498,13 @@ int db_field_enum(adb_field_t *field, u_int64_t value, char enum_str[])
 /**
  * db_print_nodes
  */
-void db_print_nodes(adb_db_t *db)
+void db_print_nodes(adb_db_t* db)
 {
     int i = 0;
 
     printf("DB nodes list:\n");
-    for (NodesMap::iterator iter = ((Adb*)db)->nodesMap.begin(); iter != ((Adb*)db)->nodesMap.end(); iter++) {
+    for (NodesMap::iterator iter = ((Adb*)db)->nodesMap.begin(); iter != ((Adb*)db)->nodesMap.end(); iter++)
+    {
         i++;
         printf("%-5d) %s\n", i, iter->first.c_str());
     }
diff --git a/adb_parser/adb_db.h b/adb_parser/adb_db.h
index 21e3b85e..e6f651b2 100644
--- a/adb_parser/adb_db.h
+++ b/adb_parser/adb_db.h
@@ -38,64 +38,76 @@
 #ifndef ADB_DB_H
 #define ADB_DB_H
 
-
 #include <stdio.h>
 #include <common/compatibility.h>
 #include "adb_parser.h"
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-typedef void adb_db_t;
-typedef void adb_node_t;
-typedef void adb_field_t;
-typedef void adb_limits_map_t;
+    typedef void adb_db_t;
+    typedef void adb_node_t;
+    typedef void adb_field_t;
+    typedef void adb_limits_map_t;
 
-typedef enum
-{
-    DB_FORMAT_STANDARD,
-    DB_FORMAT_STANDARD_NO_ENUM,
-    DB_FORMAT_FULL_DETAILS
-} dump_format_t;
+    typedef enum
+    {
+        DB_FORMAT_STANDARD,
+        DB_FORMAT_STANDARD_NO_ENUM,
+        DB_FORMAT_FULL_DETAILS
+    } dump_format_t;
 
-// TODO - this API isn't thread-safe because of the error reporting mechanism
-// DB Functions
-adb_db_t*       db_create();
-int             db_load(adb_db_t *db, const char *adb_file_path, int add_reserved);
-int             db_load_from_str(adb_db_t *db, const char *adb_data, int add_reserved);
-void            db_destroy(adb_db_t *db);
-const char*     db_get_last_err();
+    // TODO - this API isn't thread-safe because of the error reporting mechanism
+    // DB Functions
+    adb_db_t* db_create();
+    int db_load(adb_db_t* db, const char* adb_file_path, int add_reserved);
+    int db_load_from_str(adb_db_t* db, const char* adb_data, int add_reserved);
+    void db_destroy(adb_db_t* db);
+    const char* db_get_last_err();
 
-adb_limits_map_t* db_create_limits_map(adb_db_t *db);
-void            db_destroy_limits_map(adb_limits_map_t *limits);
+    adb_limits_map_t* db_create_limits_map(adb_db_t* db);
+    void db_destroy_limits_map(adb_limits_map_t* limits);
 
-// Node Functions - *** node contains flat fields (full path leaves) ***
-adb_node_t*     db_get_node(adb_db_t *db, const char *node_name);
-void            db_node_destroy(adb_node_t *node);
-void            db_node_name(adb_node_t *node, char name[]);
-int             db_node_size(adb_node_t *node);
-int             db_node_num_of_fields(adb_node_t *node);
-adb_field_t*    db_node_get_field(adb_node_t *node, int field_idx);
-adb_field_t*    db_node_get_field_by_path(adb_node_t *node, const char *path, int is_case_sensitive);
-bool            db_node_dump(adb_node_t *node, u_int8_t buf[], dump_format_t format, FILE *stream);
-bool            db_node_conditional_dump(adb_node_t *node, u_int8_t buf[], dump_format_t format,
-                                         FILE *stream, adb_limits_map_t *values_map);
-bool            db_node_range_dump(adb_node_t *node, u_int32_t from, u_int32_t to,
-                                   u_int8_t buf[], dump_format_t format, FILE *stream);
-bool            db_node_conditional_range_dump(adb_node_t *node, u_int32_t from, u_int32_t to,
-                                               u_int8_t buf[], dump_format_t format, FILE *stream, adb_limits_map_t *values_map);
+    // Node Functions - *** node contains flat fields (full path leaves) ***
+    adb_node_t* db_get_node(adb_db_t* db, const char* node_name);
+    void db_node_destroy(adb_node_t* node);
+    void db_node_name(adb_node_t* node, char name[]);
+    int db_node_size(adb_node_t* node);
+    int db_node_num_of_fields(adb_node_t* node);
+    adb_field_t* db_node_get_field(adb_node_t* node, int field_idx);
+    adb_field_t* db_node_get_field_by_path(adb_node_t* node, const char* path, int is_case_sensitive);
+    bool db_node_dump(adb_node_t* node, u_int8_t buf[], dump_format_t format, FILE* stream);
+    bool db_node_conditional_dump(adb_node_t* node,
+                                  u_int8_t buf[],
+                                  dump_format_t format,
+                                  FILE* stream,
+                                  adb_limits_map_t* values_map);
+    bool db_node_range_dump(adb_node_t* node,
+                            u_int32_t from,
+                            u_int32_t to,
+                            u_int8_t buf[],
+                            dump_format_t format,
+                            FILE* stream);
+    bool db_node_conditional_range_dump(adb_node_t* node,
+                                        u_int32_t from,
+                                        u_int32_t to,
+                                        u_int8_t buf[],
+                                        dump_format_t format,
+                                        FILE* stream,
+                                        adb_limits_map_t* values_map);
 
-// Field Functions
-void            db_field_name(adb_field_t *field, char name[]);
-void            db_field_full_name(adb_field_t *field, int skip_level, char name[]);
-int             db_field_offset(adb_field_t *field);
-int             db_field_size(adb_field_t *field);
-u_int64_t       db_field_value(adb_field_t *field, u_int8_t buf[]);
-void            db_field_set_value(adb_field_t *field, u_int8_t buf[], u_int64_t value);
-int             db_field_enum(adb_field_t *field, u_int64_t value, char enum_str[]);
+    // Field Functions
+    void db_field_name(adb_field_t* field, char name[]);
+    void db_field_full_name(adb_field_t* field, int skip_level, char name[]);
+    int db_field_offset(adb_field_t* field);
+    int db_field_size(adb_field_t* field);
+    u_int64_t db_field_value(adb_field_t* field, u_int8_t buf[]);
+    void db_field_set_value(adb_field_t* field, u_int8_t buf[], u_int64_t value);
+    int db_field_enum(adb_field_t* field, u_int64_t value, char enum_str[]);
 
-// For debug only
-void            db_print_nodes(adb_db_t *db);
+    // For debug only
+    void db_print_nodes(adb_db_t* db);
 
 #ifdef __cplusplus
 }
diff --git a/adb_parser/adb_exceptionHolder.cpp b/adb_parser/adb_exceptionHolder.cpp
index b642393a..32c7b508 100644
--- a/adb_parser/adb_exceptionHolder.cpp
+++ b/adb_parser/adb_exceptionHolder.cpp
@@ -37,17 +37,17 @@
 
 ExceptionsMap ExceptionHolder::adbExceptionMap;
 const string ExceptionHolder::FATAL_EXCEPTION = "FATAL";
-const string ExceptionHolder::ERROR_EXCEPTION = "ERROR"; 
-const string ExceptionHolder::WARN_EXCEPTION = "WARNING"; 
+const string ExceptionHolder::ERROR_EXCEPTION = "ERROR";
+const string ExceptionHolder::WARN_EXCEPTION = "WARNING";
 int ExceptionHolder::exceptionCounter = 0;
 
-AdbException::AdbException() {
-}
+AdbException::AdbException() {}
 
 /**
  * Function: AdbException::AdbException
  **/
-AdbException::AdbException(const char *fmt, ...) {
+AdbException::AdbException(const char* fmt, ...)
+{
     char tmp[1024];
     va_list args;
     va_start(args, fmt);
@@ -59,31 +59,31 @@ AdbException::AdbException(const char *fmt, ...) {
 /**
  * Function: AdbException::AdbException
  **/
-AdbException::AdbException(string msg) :
-    _msg(msg) {
-}
+AdbException::AdbException(string msg) : _msg(msg) {}
 
 /**
  * Function: AdbException::~AdbException
  **/
-AdbException::~AdbException() throw () {
-}
+AdbException::~AdbException() throw() {}
 
 /**
  * Function: AdbException::what
  **/
-const char* AdbException::what() const throw () {
+const char* AdbException::what() const throw()
+{
     return _msg.c_str();
 }
 
 /**
  * Function: AdbException::what_s
  **/
-string AdbException::what_s() const {
+string AdbException::what_s() const
+{
     return _msg;
 }
 
-int ExceptionHolder::getNumberOfExceptions() {
+int ExceptionHolder::getNumberOfExceptions()
+{
     return ExceptionHolder::exceptionCounter;
 }
 
@@ -92,7 +92,8 @@ int ExceptionHolder::getNumberOfExceptions() {
  *   * This function return the adb exception map
  *    **/
 
-ExceptionsMap ExceptionHolder::getAdbExceptionsMap() {
+ExceptionsMap ExceptionHolder::getAdbExceptionsMap()
+{
     return ExceptionHolder::adbExceptionMap;
 }
 
@@ -101,7 +102,8 @@ ExceptionsMap ExceptionHolder::getAdbExceptionsMap() {
  *   * This function take the excpetion type [FATAL:0, ERROR:1, WARNING:2] and the exception string
  *    * Then it insert it to the adb exception map
  *     **/
-void ExceptionHolder::insertNewException(const string exceptionType, string exceptionTxt) {
+void ExceptionHolder::insertNewException(const string exceptionType, string exceptionTxt)
+{
     ExceptionHolder::adbExceptionMap[exceptionType].push_back(exceptionTxt);
     ExceptionHolder::exceptionCounter += 1;
 }
diff --git a/adb_parser/adb_exceptionHolder.h b/adb_parser/adb_exceptionHolder.h
index 80a93500..f6cfd751 100644
--- a/adb_parser/adb_exceptionHolder.h
+++ b/adb_parser/adb_exceptionHolder.h
@@ -45,18 +45,17 @@
 
 using namespace std;
 
-
 typedef vector<string> StringVector;
 typedef map<string, StringVector> ExceptionsMap;
 
-
-
-class ExceptionHolder {
+class ExceptionHolder
+{
 public:
     // METHODS
     static void insertNewException(const string exceptionType, string exceptionTxt);
     static ExceptionsMap getAdbExceptionsMap();
     static int getNumberOfExceptions();
+
 public:
     // VARIABLES
     static ExceptionsMap adbExceptionMap;
@@ -67,21 +66,21 @@ class ExceptionHolder {
 };
 
 /*************************** AdbException ***************************/
-class AdbException: public std::exception {
+class AdbException : public std::exception
+{
 public:
     // Methods
     AdbException();
-    AdbException(const char *msg, ...) __attribute__((format(__printf__, 2, 3)));
+    AdbException(const char* msg, ...) __attribute__((format(__printf__, 2, 3)));
     AdbException(string msg);
-    virtual ~AdbException() throw (); 
-    virtual const char* what() const throw (); 
+    virtual ~AdbException() throw();
+    virtual const char* what() const throw();
     virtual string what_s() const;
 
 private:
     string _msg;
 };
 
-
 /**
  * Function: ExceptionHolder::getNumberOfExceptions
  * This function return the number of exceptions found
diff --git a/adb_parser/adb_expr.cpp b/adb_parser/adb_expr.cpp
index 1d3e85cf..bb775117 100644
--- a/adb_parser/adb_expr.cpp
+++ b/adb_parser/adb_expr.cpp
@@ -38,23 +38,17 @@
 /**
  * Function: AdbExpr::AdbExpr
  **/
-AdbExpr::AdbExpr() : _varsMap(0)
-{
-
-}
+AdbExpr::AdbExpr() : _varsMap(0) {}
 
 /**
  * Function: AdbExpr::~AdbExpr
  **/
-AdbExpr::~AdbExpr()
-{
-
-}
+AdbExpr::~AdbExpr() {}
 
 /**
  * Function: AdbExpr::setVars
  **/
-void AdbExpr::setVars(map<string, string> *varsMap)
+void AdbExpr::setVars(map<string, string>* varsMap)
 {
     _varsMap = varsMap;
 }
@@ -66,35 +60,44 @@ const char* AdbExpr::statusStr(int status)
 {
     switch (status)
     {
-    case Expr::ERR_RPAR_EXP: return "Right parentheses expected";
+        case Expr::ERR_RPAR_EXP:
+            return "Right parentheses expected";
 
-    case Expr::ERR_VALUE_EXP: return "Value expected";
+        case Expr::ERR_VALUE_EXP:
+            return "Value expected";
 
-    case Expr::ERR_BIN_EXP: return "Binary operation expected ";
+        case Expr::ERR_BIN_EXP:
+            return "Binary operation expected ";
 
-    case Expr::ERR_DIV_ZERO: return "Divide zero attempt";
+        case Expr::ERR_DIV_ZERO:
+            return "Divide zero attempt";
 
-    case Expr::ERR_BAD_NUMBER: return "Bad constant syntax";
+        case Expr::ERR_BAD_NUMBER:
+            return "Bad constant syntax";
 
-    case Expr::ERR_BAD_NAME: return "Variable Name not resolved";
+        case Expr::ERR_BAD_NAME:
+            return "Variable Name not resolved";
 
-    default:                    return "Unknown error";
+        default:
+            return "Unknown error";
     }
 }
 
 /**
  * Function: AdbExpr::ResolveName
  **/
-int AdbExpr::ResolveName(char *name, u_int64_t *val)
+int AdbExpr::ResolveName(char* name, u_int64_t* val)
 {
     map<string, string>::iterator it = _varsMap->find(name);
-    if (it == _varsMap->end()) {
+    if (it == _varsMap->end())
+    {
         return ERR_BAD_NAME;
     }
 
-    char *end;
+    char* end;
     *val = strtoul(it->second.c_str(), &end, 0);
-    if (*end != '\0') {
+    if (*end != '\0')
+    {
         return ERR_BAD_NUMBER;
     }
 
diff --git a/adb_parser/adb_expr.h b/adb_parser/adb_expr.h
index 8c92f7f2..87edf552 100644
--- a/adb_parser/adb_expr.h
+++ b/adb_parser/adb_expr.h
@@ -49,12 +49,12 @@ class AdbExpr : public Expr
     ~AdbExpr();
 
     static const char* statusStr(int status);
-    int  ResolveName(char *name, u_int64_t *val);
+    int ResolveName(char* name, u_int64_t* val);
     void Error(const std::string& message);
-    void setVars(map<string, string> *varsMap);
+    void setVars(map<string, string>* varsMap);
 
 private:
-    map<string, string> *_varsMap;
+    map<string, string>* _varsMap;
 };
 
 #endif // ADB_EXPR_H
diff --git a/adb_parser/adb_field.cpp b/adb_parser/adb_field.cpp
index 807885ad..8a165fb2 100644
--- a/adb_parser/adb_field.cpp
+++ b/adb_parser/adb_field.cpp
@@ -43,17 +43,22 @@
 #include <boost/filesystem/operations.hpp>
 #include <iostream>
 
-AdbField::AdbField() : size(0), offset(0xffffffff), definedAsArr(false), lowBound(0),
-                       highBound(0), unlimitedArr(false), isReserved(false), userData(0)
+AdbField::AdbField() :
+    size(0),
+    offset(0xffffffff),
+    definedAsArr(false),
+    lowBound(0),
+    highBound(0),
+    unlimitedArr(false),
+    isReserved(false),
+    userData(0)
 {
 }
 
 /**
  * Function: AdbField::~AdbField
  **/
-AdbField::~AdbField()
-{
-}
+AdbField::~AdbField() {}
 
 /**
  * Function: AdbField::isLeaf
@@ -74,7 +79,7 @@ bool AdbField::isStruct()
 /**
  * Function: AdbField::operator<
  **/
-bool AdbField::operator<(AdbField &other)
+bool AdbField::operator<(AdbField& other)
 {
     return offset < other.offset;
 }
@@ -138,15 +143,15 @@ u_int32_t AdbField::eSize()
 void AdbField::print(int indent)
 {
     cout << indentString(indent);
-    cout << "- FIELD - Name: " << name << " offset: 0x" << hex << offset / 32 * 4 << "." << dec << offset % 32 << " size: 0x" << hex << size / 32 * 4 << "." << dec << size % 32 << " low_bound: " << lowBound
-         << " high_bound: " << highBound << " sub_node: " << subNode
-         << " isReserved: " << isReserved << endl;
+    cout << "- FIELD - Name: " << name << " offset: 0x" << hex << offset / 32 * 4 << "." << dec << offset % 32
+         << " size: 0x" << hex << size / 32 * 4 << "." << dec << size % 32 << " low_bound: " << lowBound
+         << " high_bound: " << highBound << " sub_node: " << subNode << " isReserved: " << isReserved << endl;
 }
 
 /**
  * Function: AdbField::toXml
  **/
-string AdbField::toXml(const string &addPrefix)
+string AdbField::toXml(const string& addPrefix)
 {
     string xml = "<field name=\"" + name + "\" descr=\"" + encodeXml(descNativeToXml(desc)) + "\"";
     if (isStruct())
diff --git a/adb_parser/adb_field.h b/adb_parser/adb_field.h
index d8de9ee8..54f237c4 100644
--- a/adb_parser/adb_field.h
+++ b/adb_parser/adb_field.h
@@ -57,10 +57,10 @@ class AdbField
     u_int32_t arrayLen();
     bool isUnlimitedArr();
     u_int32_t eSize();
-    string toXml(const string &addPrefix);
+    string toXml(const string& addPrefix);
 
     // Operator overloading - useful for sorting
-    bool operator<(AdbField &other);
+    bool operator<(AdbField& other);
 
     // FOR DEBUG
     void print(int indent = 0);
@@ -81,7 +81,7 @@ class AdbField
     string condition; // field's visibility dynamic condition
 
     // FOR USER USAGE
-    void *userData;
+    void* userData;
 };
 
 #endif
diff --git a/adb_parser/adb_instance.cpp b/adb_parser/adb_instance.cpp
index b6a2ef54..717ae031 100644
--- a/adb_parser/adb_instance.cpp
+++ b/adb_parser/adb_instance.cpp
@@ -47,33 +47,45 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 
-string addPathSuffixForArraySupport(string path) {
-    if (path[path.length()-1] == ']') { //Won't add suffix if leaf is in Array
+string addPathSuffixForArraySupport(string path)
+{
+    if (path[path.length() - 1] == ']')
+    { // Won't add suffix if leaf is in Array
         return "";
-    }    
-    size_t pos = 0; 
+    }
+    size_t pos = 0;
     string suffix = "";
-    while ((pos = path.find("[")) != std::string::npos) {//Add array index number in path to suffix.
+    while ((pos = path.find("[")) != std::string::npos)
+    { // Add array index number in path to suffix.
         size_t end_pos = path.find("]");
-        size_t len  = end_pos - pos - 1; 
-        suffix = suffix + "_" + path.substr(pos+1, len);
-        path.erase(0, end_pos+1);
-    }    
+        size_t len = end_pos - pos - 1;
+        suffix = suffix + "_" + path.substr(pos + 1, len);
+        path.erase(0, end_pos + 1);
+    }
     return suffix;
 }
 
 AdbInstance::AdbInstance() :
-    fieldDesc(NULL), nodeDesc(NULL), parent(NULL), offset(0xffffffff), size(0), maxLeafSize(0),
-            arrIdx(0), isNameBeenExtended(false), unionSelector(NULL), isDiff(false), userData(NULL)
+    fieldDesc(NULL),
+    nodeDesc(NULL),
+    parent(NULL),
+    offset(0xffffffff),
+    size(0),
+    maxLeafSize(0),
+    arrIdx(0),
+    isNameBeenExtended(false),
+    unionSelector(NULL),
+    isDiff(false),
+    userData(NULL)
 
 {
-
 }
 
 /**
  * Function: AdbInstance::AdbInstance
  **/
-AdbInstance::~AdbInstance() {
+AdbInstance::~AdbInstance()
+{
     for (size_t i = 0; i < subItems.size(); i++)
         delete subItems[i];
 }
@@ -81,58 +93,69 @@ AdbInstance::~AdbInstance() {
 /**
  * Function: AdbInstance::isLeaf
  **/
-bool AdbInstance::isLeaf() {
+bool AdbInstance::isLeaf()
+{
     return nodeDesc == NULL;
 }
 
 /**
  * Function: isUnionisUnion
  **/
-bool AdbInstance::isUnion() {
+bool AdbInstance::isUnion()
+{
     return isNode() && nodeDesc->isUnion;
 }
 
 /**
  * Function: AdbInstance::isStruct
  **/
-bool AdbInstance::isStruct() {
+bool AdbInstance::isStruct()
+{
     return isNode() && !isUnion();
 }
 
 /**
  * Function: AdbInstance::isNode
  **/
-bool AdbInstance::isNode() {
+bool AdbInstance::isNode()
+{
     return !isLeaf();
 }
 
 /**
  * Function: AdbInstance::isNode
  **/
-bool AdbInstance::isPartOfArray() {
+bool AdbInstance::isPartOfArray()
+{
     return fieldDesc->isArray();
 }
 
 /**
  * Function: AdbInstance::fullName
  **/
-string AdbInstance::fullName(int skipLevel) {
-    list < string > fnList;
-    AdbInstance *p = parent;
+string AdbInstance::fullName(int skipLevel)
+{
+    list<string> fnList;
+    AdbInstance* p = parent;
 
     fnList.push_front(name);
-    while (p != NULL) {
+    while (p != NULL)
+    {
         fnList.push_front(p->name);
         p = p->parent;
     }
 
-    if ((int) fnList.size() > skipLevel) {
-        while (skipLevel--) {
+    if ((int)fnList.size() > skipLevel)
+    {
+        while (skipLevel--)
+        {
             fnList.pop_front();
         }
 
         return boost::algorithm::join(fnList, ".");
-    } else {
+    }
+    else
+    {
         return fnList.back();
     }
 }
@@ -140,92 +163,102 @@ string AdbInstance::fullName(int skipLevel) {
 /**
  * Function: AdbInstance::fullName
  **/
-bool AdbInstance::isReserved() {
+bool AdbInstance::isReserved()
+{
     return fieldDesc->isReserved;
 }
 
 /**
  * Function: AdbInstance::fullName
  **/
-u_int32_t AdbInstance::dwordAddr() {
+u_int32_t AdbInstance::dwordAddr()
+{
     return (offset >> 5) << 2;
 }
 
 /**
  * Function: AdbInstance::fullName
  **/
-u_int32_t AdbInstance::startBit() {
+u_int32_t AdbInstance::startBit()
+{
     return offset % 32;
 }
 
 /**
  * Function: AdbInstance::operator<
  **/
-bool AdbInstance::operator<(const AdbInstance& other) {
+bool AdbInstance::operator<(const AdbInstance& other)
+{
     return offset < other.offset;
 }
 
 /**
  * Function: AdbInstance::getChildByPath
  **/
-AdbInstance* AdbInstance::getChildByPath(const string &path,
-        bool isCaseSensitive) {
-    string effPath = isCaseSensitive ? path : boost::algorithm::to_lower_copy(
-            path);
-    if (effPath[0] == '.') {
+AdbInstance* AdbInstance::getChildByPath(const string& path, bool isCaseSensitive)
+{
+    string effPath = isCaseSensitive ? path : boost::algorithm::to_lower_copy(path);
+    if (effPath[0] == '.')
+    {
         effPath.erase(0, 1);
     }
 
     size_t idx = effPath.find(".");
     string childName = idx == string::npos ? effPath : effPath.substr(0, idx);
-    string grandChildPath = idx == string::npos ? string() : effPath.substr(
-            idx + 1);
+    string grandChildPath = idx == string::npos ? string() : effPath.substr(idx + 1);
 
-    if (path.empty()) {
+    if (path.empty())
+    {
         return this;
     }
 
     // Search for childName
-    AdbInstance *child = NULL;
-    for (size_t i = 0; i < subItems.size(); i++) {
-        string subName = isCaseSensitive ? subItems[i]->name
-                : boost::algorithm::to_lower_copy(subItems[i]->name);
-        if (subName == childName) {
+    AdbInstance* child = NULL;
+    for (size_t i = 0; i < subItems.size(); i++)
+    {
+        string subName = isCaseSensitive ? subItems[i]->name : boost::algorithm::to_lower_copy(subItems[i]->name);
+        if (subName == childName)
+        {
             child = subItems[i];
             break;
         }
     }
 
-    if (!child) {
+    if (!child)
+    {
         return NULL;
     }
 
     // if grandChildPath isn't empty this means we need to continue and find the desired field in grand child node
-    return grandChildPath.empty() ? child : child->getChildByPath(
-            grandChildPath, isCaseSensitive);
+    return grandChildPath.empty() ? child : child->getChildByPath(grandChildPath, isCaseSensitive);
 }
 
 /**
  * Function: AdbInstance::findChild
  **/
-vector<AdbInstance*> AdbInstance::findChild(const string& childName,
-        bool isCaseSensitive, bool by_inst_name) {
-    string effName = isCaseSensitive ? childName
-            : boost::algorithm::to_lower_copy(childName);
+vector<AdbInstance*> AdbInstance::findChild(const string& childName, bool isCaseSensitive, bool by_inst_name)
+{
+    string effName = isCaseSensitive ? childName : boost::algorithm::to_lower_copy(childName);
     vector<AdbInstance*> childList;
 
-    if (by_inst_name || isLeaf()) {
-        if (name == childName) {
+    if (by_inst_name || isLeaf())
+    {
+        if (name == childName)
+        {
             childList.push_back(this);
         }
-    } else {
-        if (isNode() && nodeDesc->name == childName) {
+    }
+    else
+    {
+        if (isNode() && nodeDesc->name == childName)
+        {
             childList.push_back(this);
         }
     }
 
     // do that recursively for all child items
-    for (size_t i = 0; i < subItems.size(); i++) {
+    for (size_t i = 0; i < subItems.size(); i++)
+    {
         vector<AdbInstance*> l = subItems[i]->findChild(effName, true);
         childList.insert(childList.end(), l.begin(), l.end());
     }
@@ -236,48 +269,53 @@ vector<AdbInstance*> AdbInstance::findChild(const string& childName,
 /**
  * Function: AdbInstance::getAttr
  **/
-string AdbInstance::getInstanceAttr(const string &attrName) const
+string AdbInstance::getInstanceAttr(const string& attrName) const
 {
     AttrsMap::const_iterator it = instAttrsMap.find(attrName);
-    if (it == instAttrsMap.end()) {
-        if (fieldDesc) {
+    if (it == instAttrsMap.end())
+    {
+        if (fieldDesc)
+        {
             it = fieldDesc->attrs.find(attrName);
-            if (it == fieldDesc->attrs.end()) {
+            if (it == fieldDesc->attrs.end())
+            {
                 return string();
             }
         }
-        else{
+        else
+        {
             return string();
         }
     }
     return it->second;
 }
 
-
 /**
  * Function: AdbInstance::getInstanceAttrIterator
  **/
-AttrsMap::iterator AdbInstance::getInstanceAttrIterator(const string &attrName, bool &found) 
+AttrsMap::iterator AdbInstance::getInstanceAttrIterator(const string& attrName, bool& found)
 {
     AttrsMap::iterator it = instAttrsMap.find(attrName);
     found = false;
-    if (it != instAttrsMap.end()) {
+    if (it != instAttrsMap.end())
+    {
         found = true;
-    } 
-    else if (fieldDesc){
+    }
+    else if (fieldDesc)
+    {
         it = fieldDesc->attrs.find(attrName);
-        if (it != fieldDesc->attrs.end()) {
-            found =true;
+        if (it != fieldDesc->attrs.end())
+        {
+            found = true;
         }
     }
     return it;
 }
 
-
 /**
  * Function: AdbInstance::setInstanceAttr
  **/
-void AdbInstance::setInstanceAttr(const string &attrName, const string &attrValue)
+void AdbInstance::setInstanceAttr(const string& attrName, const string& attrValue)
 {
     instAttrsMap[attrName] = attrValue;
 }
@@ -285,7 +323,7 @@ void AdbInstance::setInstanceAttr(const string &attrName, const string &attrValu
 /*
  * Function: AdbInstance::copyAllInstanceAttr - copies all attrs from attributes structure
  **/
-void AdbInstance::copyAllInstanceAttr(AttrsMap &attsToCopy) 
+void AdbInstance::copyAllInstanceAttr(AttrsMap& attsToCopy)
 {
     instAttrsMap = attsToCopy;
 }
@@ -296,35 +334,37 @@ void AdbInstance::copyAllInstanceAttr(AttrsMap &attsToCopy)
 AttrsMap AdbInstance::getFullInstanceAttrsMapCopy()
 {
     AttrsMap tmpCopy;
-    // copy first the fields attr map 
-    for (AttrsMap::iterator it = fieldDesc->attrs.begin(); it != fieldDesc->attrs.end(); it++){
+    // copy first the fields attr map
+    for (AttrsMap::iterator it = fieldDesc->attrs.begin(); it != fieldDesc->attrs.end(); it++)
+    {
         tmpCopy[it->first] = it->second;
     }
     // copy the overriden variables - in instAttrsMap
-    for (AttrsMap::iterator it = instAttrsMap.begin(); it != instAttrsMap.end(); it++){
+    for (AttrsMap::iterator it = instAttrsMap.begin(); it != instAttrsMap.end(); it++)
+    {
         tmpCopy[it->first] = it->second;
     }
     return tmpCopy;
 }
 
 /**
- * Function: AdbInstance::setVarsMap - set an item in vars map 
+ * Function: AdbInstance::setVarsMap - set an item in vars map
  **/
-void AdbInstance::setVarsMap(const string &attrName, const string &attrValue)
+void AdbInstance::setVarsMap(const string& attrName, const string& attrValue)
 {
     varsMap[attrName] = attrValue;
 }
 
 /**
- * Function: AdbInstance::setVarsMap - set an item in vars map 
+ * Function: AdbInstance::setVarsMap - set an item in vars map
  **/
-void AdbInstance::setVarsMap(const AttrsMap &AttrsMap)
+void AdbInstance::setVarsMap(const AttrsMap& AttrsMap)
 {
     varsMap = AttrsMap;
 }
 
 /**
- * Function: AdbInstance::setVarsMap - returns a copy of vars map 
+ * Function: AdbInstance::setVarsMap - returns a copy of vars map
  **/
 AttrsMap AdbInstance::getVarsMap()
 {
@@ -334,33 +374,38 @@ AttrsMap AdbInstance::getVarsMap()
 /**
  * Function: AdbInstance::isEnumExists
  **/
-bool AdbInstance::isEnumExists() {
+bool AdbInstance::isEnumExists()
+{
     return !getInstanceAttr("enum").empty();
 }
 
 /**
  * Function: AdbInstance::enumToInt
  **/
-bool AdbInstance::enumToInt(const string &name, u_int64_t &val) {
-    vector < string > enumValues;
+bool AdbInstance::enumToInt(const string& name, u_int64_t& val)
+{
+    vector<string> enumValues;
     string enums = getInstanceAttr("enum");
     boost::algorithm::split(enumValues, enums, boost::is_any_of(string(",")));
 
-    for (size_t i = 0; i < enumValues.size(); i++) {
-        vector < string > pair;
+    for (size_t i = 0; i < enumValues.size(); i++)
+    {
+        vector<string> pair;
         string trimedEnumValues = enumValues[i];
         boost::algorithm::trim(trimedEnumValues);
-        boost::algorithm::split(pair, trimedEnumValues,
-                boost::is_any_of(string("=")));
+        boost::algorithm::split(pair, trimedEnumValues, boost::is_any_of(string("=")));
 
-        if (pair.size() != 2) {
+        if (pair.size() != 2)
+        {
             continue;
         }
 
-        char *end;
-        if (pair[0] == name) {
+        char* end;
+        if (pair[0] == name)
+        {
             val = strtoul(pair[1].c_str(), &end, 0);
-            if (*end != '\0') {
+            if (*end != '\0')
+            {
                 return false;
             }
             return true;
@@ -373,29 +418,33 @@ bool AdbInstance::enumToInt(const string &name, u_int64_t &val) {
 /**
  * Function: AdbInstance::intToEnum
  **/
-bool AdbInstance::intToEnum(u_int64_t val, string &valName) {
-    vector < string > enumValues;
+bool AdbInstance::intToEnum(u_int64_t val, string& valName)
+{
+    vector<string> enumValues;
     string enums = getInstanceAttr("enum");
     boost::algorithm::split(enumValues, enums, boost::is_any_of(string(",")));
 
-    for (size_t i = 0; i < enumValues.size(); i++) {
-        vector < string > pair;
+    for (size_t i = 0; i < enumValues.size(); i++)
+    {
+        vector<string> pair;
         string trimedEnumValues = enumValues[i];
         boost::algorithm::trim(trimedEnumValues);
-        boost::algorithm::split(pair, trimedEnumValues,
-                boost::is_any_of(string("=")));
+        boost::algorithm::split(pair, trimedEnumValues, boost::is_any_of(string("=")));
 
-        if (pair.size() != 2) {
+        if (pair.size() != 2)
+        {
             continue;
         }
 
-        char *end;
+        char* end;
         u_int64_t tmp = strtoul(pair[1].c_str(), &end, 0);
-        if (*end != '\0') {
+        if (*end != '\0')
+        {
             continue;
         }
 
-        if (tmp == val) {
+        if (tmp == val)
+        {
             valName = pair[0];
             return true;
         }
@@ -407,30 +456,31 @@ bool AdbInstance::intToEnum(u_int64_t val, string &valName) {
 /**
  * Function: AdbInstance::getEnumMap
  **/
-map<string, u_int64_t> AdbInstance::getEnumMap() {
-    map < string, u_int64_t > enumMap;
-    vector < string > enumValues;
+map<string, u_int64_t> AdbInstance::getEnumMap()
+{
+    map<string, u_int64_t> enumMap;
+    vector<string> enumValues;
     string enums = getInstanceAttr("enum");
     boost::algorithm::split(enumValues, enums, boost::is_any_of(string(",")));
 
-    for (size_t i = 0; i < enumValues.size(); i++) {
-        vector < string > pair;
+    for (size_t i = 0; i < enumValues.size(); i++)
+    {
+        vector<string> pair;
         string trimedEnumValues = enumValues[i];
         boost::algorithm::trim(trimedEnumValues);
-        boost::algorithm::split(pair, trimedEnumValues,
-                boost::is_any_of(string("=")));
-        if (pair.size() != 2) {
+        boost::algorithm::split(pair, trimedEnumValues, boost::is_any_of(string("=")));
+        if (pair.size() != 2)
+        {
             throw AdbException("Can't parse enum: " + enumValues[i]);
-            //continue;
+            // continue;
         }
 
-        char *end;
+        char* end;
         u_int64_t intVal = strtoul(pair[1].c_str(), &end, 0);
-        if (*end != '\0') {
-            throw AdbException(
-                    string("Can't evaluate enum (") + pair[0].c_str() + "): "
-                            + pair[1].c_str());
-            //continue;
+        if (*end != '\0')
+        {
+            throw AdbException(string("Can't evaluate enum (") + pair[0].c_str() + "): " + pair[1].c_str());
+            // continue;
         }
 
         enumMap[pair[0]] = intVal;
@@ -442,25 +492,28 @@ map<string, u_int64_t> AdbInstance::getEnumMap() {
 /**
  * Function: AdbInstance::getEnumValues
  **/
-vector<u_int64_t> AdbInstance::getEnumValues() {
-    vector < u_int64_t > values;
-    vector < string > enumValues;
+vector<u_int64_t> AdbInstance::getEnumValues()
+{
+    vector<u_int64_t> values;
+    vector<string> enumValues;
     string enums = getInstanceAttr("enum");
     boost::algorithm::split(enumValues, enums, boost::is_any_of(string(",")));
 
-    for (size_t i = 0; i < enumValues.size(); i++) {
-        vector < string > pair;
+    for (size_t i = 0; i < enumValues.size(); i++)
+    {
+        vector<string> pair;
         string trimedEnumValues = enumValues[i];
         boost::algorithm::trim(trimedEnumValues);
-        boost::algorithm::split(pair, trimedEnumValues,
-                boost::is_any_of(string("=")));
-        if (pair.size() != 2) {
+        boost::algorithm::split(pair, trimedEnumValues, boost::is_any_of(string("=")));
+        if (pair.size() != 2)
+        {
             continue;
         }
 
-        char *end;
+        char* end;
         u_int64_t intVal = strtoul(pair[1].c_str(), &end, 0);
-        if (*end != '\0') {
+        if (*end != '\0')
+        {
             continue;
         }
 
@@ -473,70 +526,76 @@ vector<u_int64_t> AdbInstance::getEnumValues() {
 /**
  * Function: AdbInstance::getUnionSelectedNodeName
  **/
-AdbInstance* AdbInstance::getUnionSelectedNodeName(const u_int64_t& selectorVal) {
-    if (!isUnion()) {
-        throw AdbException(
-                "This is not union node (%s), can't get selected node name", fullName().c_str());
+AdbInstance* AdbInstance::getUnionSelectedNodeName(const u_int64_t& selectorVal)
+{
+    if (!isUnion())
+    {
+        throw AdbException("This is not union node (%s), can't get selected node name", fullName().c_str());
     }
 
-    if (!unionSelector) {
+    if (!unionSelector)
+    {
         throw AdbException("Can't find selector for union: " + name);
     }
 
-    map < string, u_int64_t > selectorValMap = unionSelector->getEnumMap();
-    for (map<string, u_int64_t>::iterator it = selectorValMap.begin(); 
-         it != selectorValMap.end(); it++) {
-        if (it->second == selectorVal) {
+    map<string, u_int64_t> selectorValMap = unionSelector->getEnumMap();
+    for (map<string, u_int64_t>::iterator it = selectorValMap.begin(); it != selectorValMap.end(); it++)
+    {
+        if (it->second == selectorVal)
+        {
             const string& selectorEnum = it->first;
             // search for the sub instance with the "selected_by" attribute == selectorEnum
-            for (size_t i = 0; i < subItems.size(); i++) {
-                if (subItems[i]->getInstanceAttr("selected_by") == selectorEnum) {
+            for (size_t i = 0; i < subItems.size(); i++)
+            {
+                if (subItems[i]->getInstanceAttr("selected_by") == selectorEnum)
+                {
                     return subItems[i];
                 }
-
             }
-            throw AdbException("Found selector value (" + selectorEnum
-                            + ") is defined for selector field ("
-                            + unionSelector->name
-                            + ") but no appropriate subfield of this union was found");
+            throw AdbException("Found selector value (" + selectorEnum + ") is defined for selector field (" +
+                               unionSelector->name + ") but no appropriate subfield of this union was found");
         }
     }
 
-    throw AdbException(
-            "Union selector field (" + unionSelector->name
-                    + ") doesn't define selector value ("
-                    + boost::lexical_cast<string>(selectorVal));
+    throw AdbException("Union selector field (" + unionSelector->name + ") doesn't define selector value (" +
+                       boost::lexical_cast<string>(selectorVal));
 }
 
 /**
  * Function: AdbInstance::getUnionSelectedNodeName
  **/
-AdbInstance* AdbInstance::getUnionSelectedNodeName(const string& selectorEnum) {
-    if (!isUnion()) {
-        throw AdbException(
-                "This is not union node (%s), can't get selected node name", fullName().c_str());
+AdbInstance* AdbInstance::getUnionSelectedNodeName(const string& selectorEnum)
+{
+    if (!isUnion())
+    {
+        throw AdbException("This is not union node (%s), can't get selected node name", fullName().c_str());
     }
 
-    if (!unionSelector) {
+    if (!unionSelector)
+    {
         throw AdbException("Can't find selector for union: " + name);
     }
 
-    for (size_t i = 0; i < subItems.size(); i++) {
-        if (subItems[i]->getInstanceAttr("selected_by") == selectorEnum) {
+    for (size_t i = 0; i < subItems.size(); i++)
+    {
+        if (subItems[i]->getInstanceAttr("selected_by") == selectorEnum)
+        {
             return subItems[i];
         }
     }
 
-    throw AdbException("Union selector field (" + unionSelector->name
-                    + ") doesn't define a selector value (" + selectorEnum + ")");
+    throw AdbException("Union selector field (" + unionSelector->name + ") doesn't define a selector value (" +
+                       selectorEnum + ")");
 }
 
 /**
  * Function: AdbInstance::isConditionalNode
  * Throws exception: AdbException
  **/
-bool AdbInstance::isConditionalNode() {
-    if (isNode()) {
+bool AdbInstance::isConditionalNode()
+{
+    if (isNode())
+    {
         return (getInstanceAttr("is_conditional") == "1");
     }
     return false;
@@ -546,38 +605,43 @@ bool AdbInstance::isConditionalNode() {
  * Function: AdbInstance::isConditionValid
  * Throws exception: AdbException
  **/
-bool AdbInstance::isConditionValid(map<string, string> *valuesMap) {
+bool AdbInstance::isConditionValid(map<string, string>* valuesMap)
+{
     u_int64_t res;
     AdbExpr expressionChecker;
     int status = -1;
-    char *condExp;
-    char *exp;
+    char* condExp;
+    char* exp;
 
-    if (fieldDesc->condition.empty()) {
+    if (fieldDesc->condition.empty())
+    {
         return true;
     }
 
     condExp = new char[fieldDesc->condition.size() + 1];
     exp = condExp;
-    if (!exp) {
+    if (!exp)
+    {
         throw AdbException("Memory allocation error");
     }
     strcpy(exp, fieldDesc->condition.c_str());
 
     expressionChecker.setVars(valuesMap);
-    try {
+    try
+    {
         status = expressionChecker.expr(&exp, &res);
-    } catch (AdbException &e) {
+    }
+    catch (AdbException& e)
+    {
         delete[] condExp;
         throw AdbException(string("AdbException: ") + e.what_s());
     }
     delete[] condExp;
 
-    if (status < 0) {
-        throw AdbException(
-                string("Error evaluating expression \"")
-                        + fieldDesc->condition.c_str() + "\" : "
-                        + AdbExpr::statusStr(status));
+    if (status < 0)
+    {
+        throw AdbException(string("Error evaluating expression \"") + fieldDesc->condition.c_str() +
+                           "\" : " + AdbExpr::statusStr(status));
     }
 
     return (status >= 0 && res != 0);
@@ -586,19 +650,28 @@ bool AdbInstance::isConditionValid(map<string, string> *valuesMap) {
 /**
  * Function: AdbInstance::getLeafFields
  **/
-vector<AdbInstance*> AdbInstance::getLeafFields(bool extendenName) {
+vector<AdbInstance*> AdbInstance::getLeafFields(bool extendenName)
+{
     vector<AdbInstance*> fields;
 
-    for (size_t i = 0; i < subItems.size(); i++) {
-        if (subItems[i]->isNode()) {
+    for (size_t i = 0; i < subItems.size(); i++)
+    {
+        if (subItems[i]->isNode())
+        {
             vector<AdbInstance*> subFields = subItems[i]->getLeafFields(extendenName);
             fields.insert(fields.end(), subFields.begin(), subFields.end());
-        } else {
-            if (extendenName && !subItems[i]->isNameBeenExtended) {
-                if (subItems[i]->parent->fieldDesc->subNode == "uint64") {
+        }
+        else
+        {
+            if (extendenName && !subItems[i]->isNameBeenExtended)
+            {
+                if (subItems[i]->parent->fieldDesc->subNode == "uint64")
+                {
                     subItems[i]->name = subItems[i]->parent->name + "_" + subItems[i]->name;
-                } else {
-                subItems[i]->name = subItems[i]->name + addPathSuffixForArraySupport(subItems[i]->fullName());
+                }
+                else
+                {
+                    subItems[i]->name = subItems[i]->name + addPathSuffixForArraySupport(subItems[i]->fullName());
                 }
                 subItems[i]->isNameBeenExtended = true;
             }
@@ -612,28 +685,30 @@ vector<AdbInstance*> AdbInstance::getLeafFields(bool extendenName) {
 /**
  * Function: AdbInstance::pushBuf
  **/
-void AdbInstance::pushBuf(u_int8_t *buf, u_int64_t value) {
+void AdbInstance::pushBuf(u_int8_t* buf, u_int64_t value)
+{
     push_to_buf(buf, offset, size, value);
 }
 
 /**
  * Function: AdbInstance::popBuf
  **/
-u_int64_t AdbInstance::popBuf(u_int8_t *buf) {
+u_int64_t AdbInstance::popBuf(u_int8_t* buf)
+{
     return pop_from_buf(buf, offset, size);
 }
 
 /**
  * Function: AdbInstance::print
  **/
-void AdbInstance::print(int indent) {
+void AdbInstance::print(int indent)
+{
     string indentStr = indentString(indent);
-    printf(
-            "%sfullName: %s, offset: 0x%x.%d, size: 0x%x.%d, isNode:%d, isUnion:%d\n",
-            indentStr.c_str(), fullName().c_str(), (offset >> 5) << 2,
-            offset % 32, (size >> 5) << 2, size % 32, isNode(), isUnion());
+    printf("%sfullName: %s, offset: 0x%x.%d, size: 0x%x.%d, isNode:%d, isUnion:%d\n", indentStr.c_str(),
+           fullName().c_str(), (offset >> 5) << 2, offset % 32, (size >> 5) << 2, size % 32, isNode(), isUnion());
 
-    if (isNode()) {
+    if (isNode())
+    {
         for (size_t i = 0; i < subItems.size(); i++)
             subItems[i]->print(indent + 1);
     }
diff --git a/adb_parser/adb_instance.h b/adb_parser/adb_instance.h
index d9ed2922..dc1a7c26 100644
--- a/adb_parser/adb_instance.h
+++ b/adb_parser/adb_instance.h
@@ -35,8 +35,8 @@
 
 #ifndef ADB_INSTANCE_H
 #define ADB_INSTANCE_H
-\
-#include"adb_xmlCreator.h"
+
+#include "adb_xmlCreator.h"
 #include <map>
 #include <string>
 #include <vector>
@@ -44,12 +44,12 @@
 using namespace std;
 using namespace xmlCreator;
 
-
 typedef map<string, string> AttrsMap;
 class AdbField;
 class AdbNode;
 
-class AdbInstance {
+class AdbInstance
+{
 public:
     // Methods
     AdbInstance();
@@ -64,54 +64,53 @@ class AdbInstance {
     u_int32_t dwordAddr();
     u_int32_t startBit();
     bool isEnumExists();
-    bool enumToInt(const string &name, u_int64_t &val); // false means no enum value found
-    bool intToEnum(u_int64_t val, string &valName); // false means no enum name found
+    bool enumToInt(const string& name, u_int64_t& val); // false means no enum value found
+    bool intToEnum(u_int64_t val, string& valName);     // false means no enum name found
     map<string, u_int64_t> getEnumMap();
     vector<u_int64_t> getEnumValues();
     AdbInstance* getUnionSelectedNodeName(const u_int64_t& selectorVal);
     AdbInstance* getUnionSelectedNodeName(const string& selectorEnum);
     bool operator<(const AdbInstance& other);
     bool isConditionalNode();
-    bool isConditionValid(map<string, string> *valuesMap);
+    bool isConditionValid(map<string, string>* valuesMap);
     // DB like access methods
-    AdbInstance
-    * getChildByPath(const string& path, bool isCaseSensitive = true);
-    vector<AdbInstance*> findChild(const string& name,
-            bool isCaseSensitive = true, bool by_inst_name = false);
-    string getInstanceAttr(const string &attrName) const;
-    AttrsMap::iterator getInstanceAttrIterator(const string &attrName, bool &isEnd);
-    void setInstanceAttr(const string &attrName, const string &attrValue);
-    void copyAllInstanceAttr(AttrsMap &attsToCopy); 
+    AdbInstance* getChildByPath(const string& path, bool isCaseSensitive = true);
+    vector<AdbInstance*> findChild(const string& name, bool isCaseSensitive = true, bool by_inst_name = false);
+    string getInstanceAttr(const string& attrName) const;
+    AttrsMap::iterator getInstanceAttrIterator(const string& attrName, bool& isEnd);
+    void setInstanceAttr(const string& attrName, const string& attrValue);
+    void copyAllInstanceAttr(AttrsMap& attsToCopy);
     AttrsMap getFullInstanceAttrsMapCopy();
-    void setVarsMap(const string &attrName, const string &attrValue);
-    void setVarsMap(const AttrsMap &AttrsMap);
+    void setVarsMap(const string& attrName, const string& attrValue);
+    void setVarsMap(const AttrsMap& AttrsMap);
     AttrsMap getVarsMap();
     vector<AdbInstance*> getLeafFields(bool extendedName); // Get all leaf fields
-    void pushBuf(u_int8_t *buf, u_int64_t value);
-    u_int64_t popBuf(u_int8_t *buf);
-    int instAttrsMapLen() {return instAttrsMap.size();}
+    void pushBuf(u_int8_t* buf, u_int64_t value);
+    u_int64_t popBuf(u_int8_t* buf);
+    int instAttrsMapLen() { return instAttrsMap.size(); }
     // FOR DEBUG
     void print(int indent = 0);
 
 public:
     // Members
-    AdbField *fieldDesc;
-    AdbNode *nodeDesc;
-    AdbInstance *parent;
+    AdbField* fieldDesc;
+    AdbNode* nodeDesc;
+    AdbInstance* parent;
     string name; // instance name
     vector<AdbInstance*> subItems;
-    u_int32_t offset; // Global offset in bits (Relative to 0)
-    u_int32_t size; // in bits
+    u_int32_t offset;      // Global offset in bits (Relative to 0)
+    u_int32_t size;        // in bits
     u_int32_t maxLeafSize; // in bits for DS alignment check
     u_int32_t arrIdx;
-    bool      isNameBeenExtended;
-    AdbInstance *unionSelector; // For union instances only
+    bool isNameBeenExtended;
+    AdbInstance* unionSelector; // For union instances only
     bool isDiff;
     // FOR USER USAGE
-    void *userData;
+    void* userData;
+
 private:
     AttrsMap instAttrsMap; // Attributes after evaluations and array expanding
-    AttrsMap varsMap; // all variables relevant to this item after evaluation
+    AttrsMap varsMap;      // all variables relevant to this item after evaluation
 };
 
 #endif
diff --git a/adb_parser/adb_logfile.cpp b/adb_parser/adb_logfile.cpp
index 8e9a3fe9..e98bdb30 100644
--- a/adb_parser/adb_logfile.cpp
+++ b/adb_parser/adb_logfile.cpp
@@ -34,36 +34,46 @@
 
 #include "adb_logfile.h"
 
-#define WRITE   "w"
+#define WRITE "w"
 
-LogFile::LogFile() : _logFile(NULL) {
-}
+LogFile::LogFile() : _logFile(NULL) {}
 
-void LogFile::init(string logFileName, bool allowMultipleExceptions) {
-    if (logFileName.compare("") != 0) {
+void LogFile::init(string logFileName, bool allowMultipleExceptions)
+{
+    if (logFileName.compare("") != 0)
+    {
         _logFile = fopen(logFileName.c_str(), WRITE);
-        if (!_logFile) {
-            string  _lastError = "Can't open file (" + logFileName + ") for writing: "
-                    + strerror(errno);
-            if (allowMultipleExceptions) {
+        if (!_logFile)
+        {
+            string _lastError = "Can't open file (" + logFileName + ") for writing: " + strerror(errno);
+            if (allowMultipleExceptions)
+            {
                 ExceptionHolder::insertNewException(ExceptionHolder::FATAL_EXCEPTION, _lastError);
-            } else {
+            }
+            else
+            {
                 throw AdbException(_lastError);
             }
         }
-    } else {
+    }
+    else
+    {
         _logFile = NULL;
     }
 }
 
-LogFile::~LogFile() {
-    if (_logFile) {
-        fclose (_logFile);
+LogFile::~LogFile()
+{
+    if (_logFile)
+    {
+        fclose(_logFile);
     }
 }
 
-void LogFile::appendLogFile(string str) {
-    if (_logFile) {
+void LogFile::appendLogFile(string str)
+{
+    if (_logFile)
+    {
         fprintf(_logFile, "%s", str.c_str());
     }
 }
diff --git a/adb_parser/adb_logfile.h b/adb_parser/adb_logfile.h
index caac9bcf..c31197cc 100644
--- a/adb_parser/adb_logfile.h
+++ b/adb_parser/adb_logfile.h
@@ -45,14 +45,16 @@
 
 using namespace std;
 
-class LogFile {
+class LogFile
+{
 public:
     LogFile();
     void init(string logFileName, bool allowMultipleExceptions);
     ~LogFile();
     void appendLogFile(string adbFileName);
+
 private:
-    FILE *_logFile;
+    FILE* _logFile;
 };
 
 #endif
diff --git a/adb_parser/adb_node.cpp b/adb_parser/adb_node.cpp
index 176a733f..25f1292a 100644
--- a/adb_parser/adb_node.cpp
+++ b/adb_parser/adb_node.cpp
@@ -53,9 +53,7 @@ using namespace boost;
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 
-AdbNode::AdbNode() : size(0), _maxLeafSize(0), isUnion(false), inLayout(false), lineNumber(-1), userData(0)
-{
-}
+AdbNode::AdbNode() : size(0), _maxLeafSize(0), isUnion(false), inLayout(false), lineNumber(-1), userData(0) {}
 
 /**
  *  * Function: AdbNode::~AdbNode
@@ -77,7 +75,7 @@ AdbNode::~AdbNode()
 /**
  *  * Function: AdbNode::toXml
  *   **/
-string AdbNode::toXml(const string &addPrefix)
+string AdbNode::toXml(const string& addPrefix)
 {
     string xml = "<node name=\"" + addPrefix + name + "\" descr=\"" + encodeXml(descNativeToXml(desc)) + "\"";
     for (AttrsMap::iterator it = attrs.begin(); it != attrs.end(); it++)
@@ -115,9 +113,8 @@ string AdbNode::toXml(const string &addPrefix)
 void AdbNode::print(int indent)
 {
     cout << indentString(indent);
-    cout << "+ Node Name: " << name << " size: 0x" << hex << size / 32 * 4
-         << "." << dec << size % 32 << " isUnion: " << isUnion
-         << " Description: " << desc << endl;
+    cout << "+ Node Name: " << name << " size: 0x" << hex << size / 32 * 4 << "." << dec << size % 32
+         << " isUnion: " << isUnion << " Description: " << desc << endl;
 
     cout << indentString(indent) << "Fields:" << endl;
     for (size_t i = 0; i < fields.size(); i++)
diff --git a/adb_parser/adb_node.h b/adb_parser/adb_node.h
index 72df9168..f0aa28cf 100644
--- a/adb_parser/adb_node.h
+++ b/adb_parser/adb_node.h
@@ -47,14 +47,14 @@ using namespace xmlCreator;
 class AdbField;
 
 typedef map<string, string> AttrsMap;
-typedef vector<AdbField *> FieldsList;
+typedef vector<AdbField*> FieldsList;
 class AdbNode
 {
 public:
     // Methods
     AdbNode();
     ~AdbNode();
-    string toXml(const string &addPrefix);
+    string toXml(const string& addPrefix);
 
     // FOR DEBUG
     void print(int indent = 0);
@@ -62,7 +62,7 @@ class AdbNode
 public:
     // Members
     string name;
-    u_int32_t size; // in bits
+    u_int32_t size;         // in bits
     u_int32_t _maxLeafSize; // in bits
     bool isUnion;
     string desc;
@@ -76,7 +76,7 @@ class AdbNode
     int lineNumber;
 
     // FOR USER USAGE
-    void *userData;
+    void* userData;
 };
 
 #endif
diff --git a/adb_parser/adb_parser.cpp b/adb_parser/adb_parser.cpp
old mode 100755
new mode 100644
index 04f40689..49357a12
--- a/adb_parser/adb_parser.cpp
+++ b/adb_parser/adb_parser.cpp
@@ -46,7 +46,6 @@
 #include <iostream>
 #include <expat.h>
 
-
 #if __cplusplus >= 201402L
 #include <regex>
 #else
@@ -56,25 +55,30 @@ using namespace boost;
 
 using namespace xmlCreator;
 
-class AdbParser {
+class AdbParser
+{
 public:
     // METHODS
-    AdbParser(string fileName, Adb *adbCtxt, bool addReserved = false,
-            bool strict = true,
-            string includePath = "", bool enforceExtraChecks = false, bool checkDsAlign = false, bool enforceGuiChecks = false);
+    AdbParser(string fileName,
+              Adb* adbCtxt,
+              bool addReserved = false,
+              bool strict = true,
+              string includePath = "",
+              bool enforceExtraChecks = false,
+              bool checkDsAlign = false,
+              bool enforceGuiChecks = false);
     ~AdbParser();
     bool load();
-    bool loadFromString(const char *adbString);
+    bool loadFromString(const char* adbString);
     string getError();
 
     static string descXmlToNative(const string& desc);
     static string descNativeToXml(const string& desc);
-    static void includeAllFilesInDir(AdbParser *adbParser, string dirPath,
-            int lineNumber = -1);
+    static void includeAllFilesInDir(AdbParser* adbParser, string dirPath, int lineNumber = -1);
     static bool checkSpecialChars(string tagName);
     static bool checkBigger32(string num);
     static bool checkHEXFormat(string addr);
-    static bool checkAttrExist(const XML_Char **atts, const XML_Char *name);
+    static bool checkAttrExist(const XML_Char** atts, const XML_Char* name);
     static void setAllowMultipleExceptionsTrue();
 
 public:
@@ -83,35 +87,34 @@ class AdbParser {
 private:
     // METHODS
     string findFile(string fileName);
-    static void addIncludePaths(Adb *adbCtxt, string includePaths);
-    static void includeFile(AdbParser *adbParser, string fileName, int lineNumber = -1);
-    static void startElement(void *adbParser, const XML_Char *name, const XML_Char **atts);
-
-    static void startNodesDefElement(const XML_Char **atts, AdbParser *adbParser);
-    static void startEnumElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
-    static void startConfigElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
-    static void startInfoElement(const XML_Char **atts, AdbParser *adbParser);
-    static void startIncludeElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
-    static void startInstOpAttrReplaceElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
-    static void startNodeElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
-    static void startFieldElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber);
-
-    static void endElement(void *adbParser, const XML_Char *name);
-    static void addReserved(vector<AdbField*> &reserveds, u_int32_t offset, u_int32_t size);
-    static int attrCount(const XML_Char **atts);
-    static string attrValue(const XML_Char **atts, const XML_Char *attrName);
-    static string attrName(const XML_Char **atts, int i);
-    static string attrValue(const XML_Char **atts, int i);
-    static bool is_inst_ifdef_exist_and_correct_project(const XML_Char **atts, AdbParser *adbParser);
+    static void addIncludePaths(Adb* adbCtxt, string includePaths);
+    static void includeFile(AdbParser* adbParser, string fileName, int lineNumber = -1);
+    static void startElement(void* adbParser, const XML_Char* name, const XML_Char** atts);
+
+    static void startNodesDefElement(const XML_Char** atts, AdbParser* adbParser);
+    static void startEnumElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber);
+    static void startConfigElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber);
+    static void startInfoElement(const XML_Char** atts, AdbParser* adbParser);
+    static void startIncludeElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber);
+    static void startInstOpAttrReplaceElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber);
+    static void startNodeElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber);
+    static void startFieldElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber);
+
+    static void endElement(void* adbParser, const XML_Char* name);
+    static void addReserved(vector<AdbField*>& reserveds, u_int32_t offset, u_int32_t size);
+    static int attrCount(const XML_Char** atts);
+    static string attrValue(const XML_Char** atts, const XML_Char* attrName);
+    static string attrName(const XML_Char** atts, int i);
+    static string attrValue(const XML_Char** atts, int i);
+    static bool is_inst_ifdef_exist_and_correct_project(const XML_Char** atts, AdbParser* adbParser);
     static u_int32_t addr2int(string& s);
     static u_int32_t dword(u_int32_t offset);
     static u_int32_t startBit(u_int32_t offset);
-    static bool raiseException(bool allowMultipleExceptions, string exceptionTxt, 
-                              string addedMsg, const string expType);
+    static bool raiseException(bool allowMultipleExceptions, string exceptionTxt, string addedMsg, const string expType);
 
 private:
     // MEMBERS
-    Adb *_adbCtxt;
+    Adb* _adbCtxt;
     XML_Parser _xmlParser;
     string _fileName;
     string _lastError;
@@ -122,9 +125,9 @@ class AdbParser {
     bool skipNode;
     string _includePath;
     string _currentTagValue;
-    AdbNode *_currentNode;
-    AdbField *_currentField;
-    AdbConfig *_currentConfig;
+    AdbNode* _currentNode;
+    AdbField* _currentField;
+    AdbConfig* _currentConfig;
     bool _instanceOps;
     bool _enforceExtraChecks;
     bool _enforceGuiChecks;
@@ -179,12 +182,28 @@ const string AdbParser::TAG_ATTR_DEFINE_PATTERN = "([A-Za-z_]\\w*)=(\\w+)";
 /**
  * Function: AdbParser::AdbParser
  **/
-AdbParser::AdbParser(string fileName, Adb *adbCtxt, bool addReserved,
-                     bool strict, string includePath,
-                     bool enforceExtraChecks, bool _checkDsAlign, bool _enforceGuiChecks) : _adbCtxt(adbCtxt), _fileName(fileName), _addReserved(addReserved),
-                                                _progressCnt(0), _strict(strict), _checkDsAlign(_checkDsAlign),
-                                                 skipNode(false),_includePath(includePath), _currentNode(0), _currentField(0), _currentConfig(0), 
-                                                 _enforceGuiChecks(_enforceGuiChecks), _nname_pattern(".*"), _fname_pattern(".*")
+AdbParser::AdbParser(string fileName,
+                     Adb* adbCtxt,
+                     bool addReserved,
+                     bool strict,
+                     string includePath,
+                     bool enforceExtraChecks,
+                     bool _checkDsAlign,
+                     bool _enforceGuiChecks) :
+    _adbCtxt(adbCtxt),
+    _fileName(fileName),
+    _addReserved(addReserved),
+    _progressCnt(0),
+    _strict(strict),
+    _checkDsAlign(_checkDsAlign),
+    skipNode(false),
+    _includePath(includePath),
+    _currentNode(0),
+    _currentField(0),
+    _currentConfig(0),
+    _enforceGuiChecks(_enforceGuiChecks),
+    _nname_pattern(".*"),
+    _fname_pattern(".*")
 {
     _enforceExtraChecks = enforceExtraChecks;
 
@@ -212,29 +231,23 @@ AdbParser::AdbParser(string fileName, Adb *adbCtxt, bool addReserved,
     {
         // first add the opened project path
         adbCtxt->includePaths.push_back(
-            _fileName.find(OS_PATH_SEP) == string::npos ? "."
-                                                        : _fileName.substr(0, _fileName.rfind(OS_PATH_SEP)));
+          _fileName.find(OS_PATH_SEP) == string::npos ? "." : _fileName.substr(0, _fileName.rfind(OS_PATH_SEP)));
         vector<string> path;
-        boost::algorithm::split(path, fileName,
-                                boost::is_any_of(string(OS_PATH_SEP)));
+        boost::algorithm::split(path, fileName, boost::is_any_of(string(OS_PATH_SEP)));
         IncludeFileInfo info = {fileName, "ROOT", 0};
         _adbCtxt->includedFiles[path[path.size() - 1]] = info;
     }
     _instanceOps = false;
 }
 
-void AdbParser::addIncludePaths(Adb *adbCtxt, string includePaths)
+void AdbParser::addIncludePaths(Adb* adbCtxt, string includePaths)
 {
     vector<string> paths;
-    boost::algorithm::split(paths, includePaths,
-                            boost::is_any_of(string(";")));
-    adbCtxt->includePaths.insert(adbCtxt->includePaths.end(),
-                                 paths.begin(), paths.end());
+    boost::algorithm::split(paths, includePaths, boost::is_any_of(string(";")));
+    adbCtxt->includePaths.insert(adbCtxt->includePaths.end(), paths.begin(), paths.end());
 
     StringVector relatives;
-    string
-        projPath =
-            boost::filesystem::path(adbCtxt->mainFileName).parent_path().string();
+    string projPath = boost::filesystem::path(adbCtxt->mainFileName).parent_path().string();
 
     for (StringVector::iterator it = adbCtxt->includePaths.begin(); it != adbCtxt->includePaths.end(); it++)
     {
@@ -244,8 +257,7 @@ void AdbParser::addIncludePaths(Adb *adbCtxt, string includePaths)
         }
     }
 
-    adbCtxt->includePaths.insert(adbCtxt->includePaths.end(),
-                                 relatives.begin(), relatives.end());
+    adbCtxt->includePaths.insert(adbCtxt->includePaths.end(), relatives.begin(), relatives.end());
 }
 
 /**
@@ -270,8 +282,8 @@ void AdbParser::setAllowMultipleExceptionsTrue()
  **/
 bool AdbParser::load()
 {
-    FILE *file;
-    char *data = NULL;
+    FILE* file;
+    char* data = NULL;
     file = fopen(_fileName.c_str(), "r");
     _adbCtxt->_logFile->appendLogFile("Opening " + _fileName + "\n");
 
@@ -308,7 +320,7 @@ bool AdbParser::load()
         return false;
     }
 
-    data = (char *)malloc(fSize + 1);
+    data = (char*)malloc(fSize + 1);
     if (!data)
     {
         fclose(file);
@@ -316,7 +328,7 @@ bool AdbParser::load()
     }
 
     if (fseek(file, 0L, SEEK_SET) < 0)
-    { //go back to the start of the file
+    { // go back to the start of the file
         _lastError = "Failed to read file (" + _fileName + "): " + strerror(errno);
         fclose(file);
         free(data);
@@ -351,17 +363,17 @@ bool AdbParser::load()
         if (!XML_Parse(_xmlParser, data, strlen(data), 0))
         {
             enum XML_Error errNo = XML_GetErrorCode(_xmlParser);
-            throw AdbException(
-                string("XML parsing issues: ") + XML_ErrorString(errNo));
+            throw AdbException(string("XML parsing issues: ") + XML_ErrorString(errNo));
         }
     }
-    catch (AdbException &exp)
+    catch (AdbException& exp)
     {
         if (exp.what_s().find("in file:") == string::npos)
         {
             int line = XML_GetCurrentLineNumber(_xmlParser);
             int column = XML_GetCurrentColumnNumber(_xmlParser);
-            _lastError = exp.what_s() + " in file: " + _fileName + " at line: " + boost::lexical_cast<string>(line) + " column: " + boost::lexical_cast<string>(column);
+            _lastError = exp.what_s() + " in file: " + _fileName + " at line: " + boost::lexical_cast<string>(line) +
+                         " column: " + boost::lexical_cast<string>(column);
         }
         else
         {
@@ -378,7 +390,7 @@ bool AdbParser::load()
             return false;
         }
     }
-    catch (std::runtime_error &e)
+    catch (std::runtime_error& e)
     {
         _lastError = CHECK_RUNTIME_ERROR(e);
         if (allowMultipleExceptions)
@@ -396,9 +408,9 @@ bool AdbParser::load()
     {
         int line = XML_GetCurrentLineNumber(_xmlParser);
         int column = XML_GetCurrentColumnNumber(_xmlParser);
-        _lastError = string(
-                         "An exception raised during the loading of the file: ") +
-                     _fileName + " at line: " + boost::lexical_cast<string>(line) + " column: " + boost::lexical_cast<string>(column);
+        _lastError = string("An exception raised during the loading of the file: ") + _fileName +
+                     " at line: " + boost::lexical_cast<string>(line) +
+                     " column: " + boost::lexical_cast<string>(column);
         if (allowMultipleExceptions)
         {
             xmlStatus = false;
@@ -418,7 +430,7 @@ bool AdbParser::load()
 /**
  * Function: AdbParser::loadFromString
  **/
-bool AdbParser::loadFromString(const char *adbString)
+bool AdbParser::loadFromString(const char* adbString)
 {
     _fileName = "\"STRING\"";
     try
@@ -426,29 +438,28 @@ bool AdbParser::loadFromString(const char *adbString)
         if (!XML_Parse(_xmlParser, adbString, strlen(adbString), 0))
         {
             enum XML_Error errNo = XML_GetErrorCode(_xmlParser);
-            throw AdbException(
-                string("XML parsing issues: ") + XML_ErrorString(errNo));
+            throw AdbException(string("XML parsing issues: ") + XML_ErrorString(errNo));
         }
     }
-    catch (AdbException &exp)
+    catch (AdbException& exp)
     {
         if (exp.what_s().find("in file:") == string::npos)
         {
             int line = XML_GetCurrentLineNumber(_xmlParser);
             int column = XML_GetCurrentColumnNumber(_xmlParser);
-            _lastError = exp.what_s() + " in file: " + _fileName + " at line: " + boost::lexical_cast<string>(line) + " column: " + boost::lexical_cast<string>(column);
+            _lastError = exp.what_s() + " in file: " + _fileName + " at line: " + boost::lexical_cast<string>(line) +
+                         " column: " + boost::lexical_cast<string>(column);
         }
         else
         {
             _lastError = exp.what_s();
         }
 
-        _lastError += string(
-                          "\nNOTE: this project is configured to work with: \"") +
+        _lastError += string("\nNOTE: this project is configured to work with: \"") +
                       (_adbCtxt->bigEndianArr ? "Big" : "Little") + " Endian Arrays\"";
         return false;
     }
-    catch (std::runtime_error &e)
+    catch (std::runtime_error& e)
     {
         _lastError = CHECK_RUNTIME_ERROR(e);
         return false;
@@ -457,9 +468,9 @@ bool AdbParser::loadFromString(const char *adbString)
     {
         int line = XML_GetCurrentLineNumber(_xmlParser);
         int column = XML_GetCurrentColumnNumber(_xmlParser);
-        _lastError = string(
-                         "An exception raised during the loading of the file: ") +
-                     _fileName + " at line: " + boost::lexical_cast<string>(line) + " column: " + boost::lexical_cast<string>(column);
+        _lastError = string("An exception raised during the loading of the file: ") + _fileName +
+                     " at line: " + boost::lexical_cast<string>(line) +
+                     " column: " + boost::lexical_cast<string>(column);
         return false;
     }
 
@@ -477,7 +488,7 @@ string AdbParser::getError()
 /**
  * Function: AdbParser::attrsCount
  **/
-int AdbParser::attrCount(const XML_Char **atts)
+int AdbParser::attrCount(const XML_Char** atts)
 {
     int i = 0;
     while (atts[i])
@@ -490,7 +501,7 @@ int AdbParser::attrCount(const XML_Char **atts)
 /**
  * Function: AdbParser::attrValue
  **/
-string AdbParser::attrValue(const XML_Char **atts, const XML_Char *attrName)
+string AdbParser::attrValue(const XML_Char** atts, const XML_Char* attrName)
 {
     int i = 0;
     while (atts[i])
@@ -508,10 +519,10 @@ string AdbParser::attrValue(const XML_Char **atts, const XML_Char *attrName)
 /**
  * Function: AdbParser::checkAttrExist
  */
-bool AdbParser::checkAttrExist(const XML_Char **atts, const XML_Char *attrName)
+bool AdbParser::checkAttrExist(const XML_Char** atts, const XML_Char* attrName)
 {
     int i = 0;
-    while(atts[i])
+    while (atts[i])
     {
         if (!strcmp(atts[i], attrName))
         {
@@ -525,7 +536,7 @@ bool AdbParser::checkAttrExist(const XML_Char **atts, const XML_Char *attrName)
 /**
  * Function: AdbParser::attrName
  **/
-string AdbParser::attrName(const XML_Char **atts, int i)
+string AdbParser::attrName(const XML_Char** atts, int i)
 {
     return string(atts[i * 2]);
 }
@@ -533,7 +544,7 @@ string AdbParser::attrName(const XML_Char **atts, int i)
 /**
  * Function: AdbParser::attrName
  **/
-string AdbParser::attrValue(const XML_Char **atts, int i)
+string AdbParser::attrValue(const XML_Char** atts, int i)
 {
     return string(atts[i * 2 + 1]);
 }
@@ -543,7 +554,7 @@ string AdbParser::attrValue(const XML_Char **atts, int i)
  **/
 string AdbParser::findFile(string fileName)
 {
-    FILE *f;
+    FILE* f;
 
     for (size_t i = 0; i < _adbCtxt->includePaths.size(); i++)
     {
@@ -570,13 +581,13 @@ string AdbParser::findFile(string fileName)
 /**
  * Function: AdbParser::addr2int
  **/
-u_int32_t AdbParser::addr2int(string &s)
+u_int32_t AdbParser::addr2int(string& s)
 {
     try
     {
         u_int32_t res;
         boost::algorithm::to_lower(s);
-        char *end;
+        char* end;
         vector<string> words;
         boost::algorithm::split(words, s, boost::is_any_of(string(".")));
 
@@ -588,53 +599,52 @@ u_int32_t AdbParser::addr2int(string &s)
 
         switch (words.size())
         {
-        case 1:
-            res = strtoul(words[0].c_str(), &end, 0);
-            if (*end != '\0')
-            {
-                throw AdbException();
-            }
-
-            res *= 8;
-            break;
-
-        case 2:
-            if (words[0].empty())
-            {
-                // .DDD form
-                res = strtoul(words[1].c_str(), &end, 0);
-                if (*end != '\0')
-                {
-                    throw AdbException();
-                }
-            }
-            else
-            {
-                // 0xHHHHH.DDD or DDDDD.DDD form
+            case 1:
                 res = strtoul(words[0].c_str(), &end, 0);
                 if (*end != '\0')
                 {
                     throw AdbException();
                 }
+
                 res *= 8;
-                res += strtoul(words[1].c_str(), &end, 0);
-                if (*end != '\0')
+                break;
+
+            case 2:
+                if (words[0].empty())
                 {
-                    throw AdbException();
+                    // .DDD form
+                    res = strtoul(words[1].c_str(), &end, 0);
+                    if (*end != '\0')
+                    {
+                        throw AdbException();
+                    }
                 }
-            }
-            break;
+                else
+                {
+                    // 0xHHHHH.DDD or DDDDD.DDD form
+                    res = strtoul(words[0].c_str(), &end, 0);
+                    if (*end != '\0')
+                    {
+                        throw AdbException();
+                    }
+                    res *= 8;
+                    res += strtoul(words[1].c_str(), &end, 0);
+                    if (*end != '\0')
+                    {
+                        throw AdbException();
+                    }
+                }
+                break;
 
-        default:
-            throw AdbException("Invalid size: " + s);
+            default:
+                throw AdbException("Invalid size: " + s);
         }
 
         return res;
     }
-    catch (AdbException &exp)
+    catch (AdbException& exp)
     {
-        throw AdbException(
-            "Failed to retrieve integer from string: " + exp.what_s());
+        throw AdbException("Failed to retrieve integer from string: " + exp.what_s());
     }
 }
 
@@ -657,13 +667,12 @@ u_int32_t AdbParser::startBit(u_int32_t offset)
 /**
  * Function: AdbParser::descXmlToNative
  **/
-string AdbParser::descXmlToNative(const string &desc)
+string AdbParser::descXmlToNative(const string& desc)
 {
     return boost::replace_all_copy(desc, "\\;", "\n");
 }
 
-
-bool AdbParser::is_inst_ifdef_exist_and_correct_project(const XML_Char **atts, AdbParser *adbParser)
+bool AdbParser::is_inst_ifdef_exist_and_correct_project(const XML_Char** atts, AdbParser* adbParser)
 {
     bool cond = true;
     string definedProject = attrValue(atts, "inst_ifdef");
@@ -672,13 +681,11 @@ bool AdbParser::is_inst_ifdef_exist_and_correct_project(const XML_Char **atts, A
         bool found = false;
         for (size_t i = 0; i < adbParser->_adbCtxt->configs.size(); i++)
         {
-            AttrsMap::iterator it_def =
-                adbParser->_adbCtxt->configs[i]->attrs.find("define");
+            AttrsMap::iterator it_def = adbParser->_adbCtxt->configs[i]->attrs.find("define");
             if (it_def != adbParser->_adbCtxt->configs[i]->attrs.end())
             {
                 vector<string> defVal;
-                boost::algorithm::split(defVal, it_def->second,
-                                        boost::is_any_of(string("=")));
+                boost::algorithm::split(defVal, it_def->second, boost::is_any_of(string("=")));
 
                 if (defVal[0] == definedProject)
                 {
@@ -699,12 +706,11 @@ bool AdbParser::is_inst_ifdef_exist_and_correct_project(const XML_Char **atts, A
 /**
  * Function: AdbParser::includeFile
  **/
-void AdbParser::includeFile(AdbParser *adbParser, string fileName,
-                            int lineNumber)
+void AdbParser::includeFile(AdbParser* adbParser, string fileName, int lineNumber)
 {
     // add this file to the included files map
     string filePath;
-    FILE *probeFile = NULL;
+    FILE* probeFile = NULL;
 
     if (!boost::filesystem::path(fileName).is_relative())
     {
@@ -735,9 +741,8 @@ void AdbParser::includeFile(AdbParser *adbParser, string fileName,
         adbParser->_adbCtxt->includedFiles[fileName] = info;
 
         // parse the included file
-        AdbParser p(filePath, adbParser->_adbCtxt, adbParser->_addReserved,
-                    adbParser->_strict,
-                    "", adbParser->_enforceExtraChecks);
+        AdbParser p(filePath, adbParser->_adbCtxt, adbParser->_addReserved, adbParser->_strict, "",
+                    adbParser->_enforceExtraChecks);
         if (!p.load())
         {
             throw AdbException(p.getError());
@@ -748,15 +753,14 @@ void AdbParser::includeFile(AdbParser *adbParser, string fileName,
 /**
  * Function: AdbParser::includeAllFilesInDir
  **/
-void AdbParser::includeAllFilesInDir(AdbParser *adbParser, string dirPath,
-                                     int lineNumber)
+void AdbParser::includeAllFilesInDir(AdbParser* adbParser, string dirPath, int lineNumber)
 {
     vector<string> paths;
     boost::filesystem::path mainFile(adbParser->_fileName);
     boost::algorithm::split(paths, dirPath, boost::is_any_of(string(";")));
     for (StringVector::iterator pathIt = paths.begin(); pathIt != paths.end(); pathIt++)
     {
-        //first look in the main file's path
+        // first look in the main file's path
         boost::filesystem::path fsPath(mainFile.parent_path().string() + "/" + *pathIt);
         if (!boost::filesystem::exists(fsPath))
         {
@@ -773,10 +777,9 @@ void AdbParser::includeAllFilesInDir(AdbParser *adbParser, string dirPath,
                 {
                     try
                     {
-                        includeFile(adbParser, filesIter->path().string(),
-                                    lineNumber);
+                        includeFile(adbParser, filesIter->path().string(), lineNumber);
                     }
-                    catch (AdbException &e)
+                    catch (AdbException& e)
                     {
                         throw(e);
                     }
@@ -843,7 +846,7 @@ bool AdbParser::checkBigger32(string num)
     return false;
 }
 
-void AdbParser::startNodesDefElement(const XML_Char **atts, AdbParser *adbParser)
+void AdbParser::startNodesDefElement(const XML_Char** atts, AdbParser* adbParser)
 {
     if (adbParser->_adbCtxt->version == "")
     {
@@ -852,7 +855,8 @@ void AdbParser::startNodesDefElement(const XML_Char **atts, AdbParser *adbParser
             string adbVersion = attrValue(atts, 0);
             if (adbVersion != "1" && adbVersion != "1.0" && adbVersion != "2")
             {
-                throw AdbException("Requested Adb Version (%s) is not supported. Supporting only version 1 or 2", adbVersion.c_str());
+                throw AdbException("Requested Adb Version (%s) is not supported. Supporting only version 1 or 2",
+                                   adbVersion.c_str());
             }
             if (adbVersion == "1.0")
             {
@@ -874,17 +878,17 @@ void AdbParser::startNodesDefElement(const XML_Char **atts, AdbParser *adbParser
     }
 }
 
-void AdbParser::startEnumElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber)
+void AdbParser::startEnumElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber)
 {
     bool expFound = false;
-    if (!adbParser->_currentConfig ||
-        !adbParser->_currentConfig->attrs.count("type") ||
+    if (!adbParser->_currentConfig || !adbParser->_currentConfig->attrs.count("type") ||
         TAG_ATTR_ENUM.compare(adbParser->_currentConfig->attrs["type"]))
     {
-        expFound = raiseException(allowMultipleExceptions,
-                                  "\"enum\" tag must be inside relevant \"config\" tag",
-                                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                  ExceptionHolder::ERROR_EXCEPTION);
+        expFound =
+          raiseException(allowMultipleExceptions,
+                         "\"enum\" tag must be inside relevant \"config\" tag",
+                         ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                         ExceptionHolder::ERROR_EXCEPTION);
     }
 
     string tagName = attrValue(atts, "name");
@@ -893,18 +897,20 @@ void AdbParser::startEnumElement(const XML_Char **atts, AdbParser *adbParser, co
     {
         if (!AdbParser::checkSpecialChars(tagName))
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Invalid character in enum name, in enum: \"" + tagName + "\"",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::WARN_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Invalid character in enum name, in enum: \"" + tagName + "\"",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::WARN_EXCEPTION);
         }
     }
     if (tagName.empty() || value.empty())
     {
-        expFound = raiseException(allowMultipleExceptions,
-                                  "Both \"name\" and \"value\" attributes must be specified",
-                                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                  ExceptionHolder::ERROR_EXCEPTION);
+        expFound =
+          raiseException(allowMultipleExceptions,
+                         "Both \"name\" and \"value\" attributes must be specified",
+                         ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                         ExceptionHolder::ERROR_EXCEPTION);
     }
     if (!expFound)
     {
@@ -912,15 +918,16 @@ void AdbParser::startEnumElement(const XML_Char **atts, AdbParser *adbParser, co
     }
 }
 
-void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber)
+void AdbParser::startConfigElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber)
 {
     bool expFound = false;
     if (adbParser->_currentConfig)
     {
-        expFound = raiseException(allowMultipleExceptions,
-                                  "config tag can't appear within other config",
-                                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                  ExceptionHolder::FATAL_EXCEPTION);
+        expFound =
+          raiseException(allowMultipleExceptions,
+                         "config tag can't appear within other config",
+                         ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                         ExceptionHolder::FATAL_EXCEPTION);
     }
 
     adbParser->_currentConfig = new AdbConfig;
@@ -929,42 +936,44 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
         // First add this config to context
         string aName = attrName(atts, i);
         string aValue = attrValue(atts, i);
-        adbParser->_currentConfig->attrs.insert(
-            pair<string, string>(aName, aValue));
+        adbParser->_currentConfig->attrs.insert(pair<string, string>(aName, aValue));
 
         // checks that was imported from the gui-parser
-        if(adbParser->_enforceGuiChecks)
+        if (adbParser->_enforceGuiChecks)
         {
             // check if the attribute is mandatory
-            if(!aName.compare("field_mand"))
+            if (!aName.compare("field_mand"))
             {
                 aValue = regex_replace(aValue, regex("\\s+"), "");
                 boost::split(adbParser->field_mand_attr, aValue, boost::is_any_of(","));
             }
 
             // check the define statement is according to format
-            else if(!aName.compare("define"))
+            else if (!aName.compare("define"))
             {
                 smatch result;
                 regex pattern(TAG_ATTR_DEFINE_PATTERN);
-                if(!regex_match(aValue, result, pattern))
+                if (!regex_match(aValue, result, pattern))
                 {
-                    expFound = raiseException(allowMultipleExceptions,
-                                            string("Bad define format: \"") + aName + "\" attribute value: \"" + aValue + "\"",
-                                            ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                            ExceptionHolder::ERROR_EXCEPTION);
+                    expFound = raiseException(
+                      allowMultipleExceptions,
+                      string("Bad define format: \"") + aName + "\" attribute value: \"" + aValue + "\"",
+                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                      ExceptionHolder::ERROR_EXCEPTION);
                 }
                 else
                 {
                     // check for define duplication
                     string define_key = result[1], define_value = result[2];
 
-                    if(adbParser->defines_map.find(define_key) != adbParser->defines_map.end())
+                    if (adbParser->defines_map.find(define_key) != adbParser->defines_map.end())
                     {
                         expFound = raiseException(allowMultipleExceptions,
-                                            string("Multiple definition of preprocessor variable: \"") + define_key + "\" attribute name: \"" + aName + "\"",
-                                            ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                            ExceptionHolder::ERROR_EXCEPTION);
+                                                  string("Multiple definition of preprocessor variable: \"") +
+                                                    define_key + "\" attribute name: \"" + aName + "\"",
+                                                  ", in file: \"" + adbParser->_fileName +
+                                                    "\" line: " + boost::lexical_cast<string>(lineNumber),
+                                                  ExceptionHolder::ERROR_EXCEPTION);
                     }
                     else
                     {
@@ -973,15 +982,16 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                 }
             }
 
-            else if(!expFound && !aName.compare("field_attr"))
+            else if (!expFound && !aName.compare("field_attr"))
             {
                 // check that the field_attr is unique
-                if(adbParser->field_attr_names_set.find(aValue) != adbParser->field_attr_names_set.end())
+                if (adbParser->field_attr_names_set.find(aValue) != adbParser->field_attr_names_set.end())
                 {
-                    expFound = raiseException(allowMultipleExceptions,
-                                            string("Redefinition of field_attr: \"") + aName + "\" attribute name: \"" + aValue + "\"",
-                                            ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                            ExceptionHolder::ERROR_EXCEPTION);
+                    expFound = raiseException(
+                      allowMultipleExceptions,
+                      string("Redefinition of field_attr: \"") + aName + "\" attribute name: \"" + aValue + "\"",
+                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                      ExceptionHolder::ERROR_EXCEPTION);
                 }
                 else
                 {
@@ -991,38 +1001,43 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                 string attr_type = attrValue(atts, "type");
 
                 // check that attr 'type' was provided and not empty
-                if(attr_type.empty())
+                if (attr_type.empty())
                 {
-                    expFound = raiseException(allowMultipleExceptions,
-                                            string("field_attr type must be specified: \"") + aName + "\" attribute value: \"" + aValue + "\"",
-                                            ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                            ExceptionHolder::ERROR_EXCEPTION);
+                    expFound = raiseException(
+                      allowMultipleExceptions,
+                      string("field_attr type must be specified: \"") + aName + "\" attribute value: \"" + aValue + "\"",
+                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                      ExceptionHolder::ERROR_EXCEPTION);
                 }
                 else
                 {
                     // check that type 'multival' has a 'fw_label' value
-                    if(!attr_type.compare("multival") && aValue.compare("fw_label"))
+                    if (!attr_type.compare("multival") && aValue.compare("fw_label"))
                     {
-                        expFound = raiseException(allowMultipleExceptions,
-                                            string("Type \"multival\" is supported only for \"fw_label\" not for: \"") + aName + "\" attribute value: \"" + aValue + "\"",
-                                            ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                            ExceptionHolder::ERROR_EXCEPTION);
+                        expFound =
+                          raiseException(allowMultipleExceptions,
+                                         string("Type \"multival\" is supported only for \"fw_label\" not for: \"") +
+                                           aName + "\" attribute value: \"" + aValue + "\"",
+                                         ", in file: \"" + adbParser->_fileName +
+                                           "\" line: " + boost::lexical_cast<string>(lineNumber),
+                                         ExceptionHolder::ERROR_EXCEPTION);
                     }
                 }
 
                 string attr_used_for = attrValue(atts, "used_for");
 
                 // check that attr 'used_for' was not provided empty
-                if(checkAttrExist(atts, "used_for") && attr_used_for.empty())
+                if (checkAttrExist(atts, "used_for") && attr_used_for.empty())
                 {
-                    expFound = raiseException(allowMultipleExceptions,
-                                            string("used_for is invalid: \"") + aName + "\" attribute value: \"" + aValue + "\"",
-                                            ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                            ExceptionHolder::ERROR_EXCEPTION);
+                    expFound = raiseException(
+                      allowMultipleExceptions,
+                      string("used_for is invalid: \"") + aName + "\" attribute value: \"" + aValue + "\"",
+                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                      ExceptionHolder::ERROR_EXCEPTION);
                 }
 
                 // check if 'pattern' was provided
-                if(checkAttrExist(atts, "pattern"))
+                if (checkAttrExist(atts, "pattern"))
                 {
                     // check if the given pattern is a valid reg expression.
                     try
@@ -1031,19 +1046,20 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                         regex r(pattern_value);
                         adbParser->attr_pattern.insert(pair<string, string>(aValue, pattern_value));
                     }
-                    catch(...)
+                    catch (...)
                     {
-                        expFound = raiseException(
-                          allowMultipleExceptions,
-                          string("Bad attribute pattern: \"") + aValue + "\" name Pattern: \"" + attrValue(atts, "pattern") + "\"",
-                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                          ExceptionHolder::ERROR_EXCEPTION);
+                        expFound = raiseException(allowMultipleExceptions,
+                                                  string("Bad attribute pattern: \"") + aValue + "\" name Pattern: \"" +
+                                                    attrValue(atts, "pattern") + "\"",
+                                                  ", in file: \"" + adbParser->_fileName +
+                                                    "\" line: " + boost::lexical_cast<string>(lineNumber),
+                                                  ExceptionHolder::ERROR_EXCEPTION);
                     }
                 }
             }
 
             // check if nname_pattern was provided
-            else if(!expFound && checkAttrExist(atts, "nname_pattern"))
+            else if (!expFound && checkAttrExist(atts, "nname_pattern"))
             {
                 // check if the given pattern is a valid reg expression.
                 try
@@ -1052,18 +1068,19 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                     regex r(nname_pattern);
                     adbParser->_nname_pattern = nname_pattern;
                 }
-                catch(...)
+                catch (...)
                 {
                     expFound = raiseException(
                       allowMultipleExceptions,
-                      string("Bad node name pattern: \"") + aValue + "\" pattern: \"" + attrValue(atts, "nname_pattern") + "\"",
+                      string("Bad node name pattern: \"") + aValue + "\" pattern: \"" +
+                        attrValue(atts, "nname_pattern") + "\"",
                       ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
                       ExceptionHolder::ERROR_EXCEPTION);
                 }
             }
 
             // check if fname_pattern was provided and the name of the field is compatible with that pattern
-            else if(!expFound && checkAttrExist(atts, "fname_pattern"))
+            else if (!expFound && checkAttrExist(atts, "fname_pattern"))
             {
                 // check if the given pattern is a valid reg expression.
                 try
@@ -1072,12 +1089,12 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                     regex r(fname_pattern);
                     adbParser->_fname_pattern = fname_pattern;
                 }
-                catch(...)
+                catch (...)
                 {
                     expFound = raiseException(
                       allowMultipleExceptions,
-                      string("Bad field name pattern: \"") + aValue + "\" pattern: \"" + attrValue(atts, "fname_pattern") +
-                        "\"",
+                      string("Bad field name pattern: \"") + aValue + "\" pattern: \"" +
+                        attrValue(atts, "fname_pattern") + "\"",
                       ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
                       ExceptionHolder::ERROR_EXCEPTION);
                 }
@@ -1092,12 +1109,13 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                 int val = boost::lexical_cast<int>(aValue);
                 adbParser->_adbCtxt->bigEndianArr = val != 0;
             }
-            catch (std::exception &)
+            catch (std::exception&)
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          string("Filed to parse the \"") + aName + "\" attribute value: \"" + aValue + "\"",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::ERROR_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  string("Filed to parse the \"") + aName + "\" attribute value: \"" + aValue + "\"",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
         }
 
@@ -1108,12 +1126,13 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                 int val = boost::lexical_cast<int>(aValue);
                 adbParser->_adbCtxt->singleEntryArrSupp = val != 0;
             }
-            catch (std::exception &)
+            catch (std::exception&)
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          string("Filed to parse the \"") + aName + "\" attribute value: \"" + aValue + "\"",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::ERROR_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  string("Filed to parse the \"") + aName + "\" attribute value: \"" + aValue + "\"",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
         }
 
@@ -1121,19 +1140,15 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
         {
             vector<string> paths;
             boost::algorithm::split(paths, aValue, boost::is_any_of(string(";")));
-            adbParser->_adbCtxt->includePaths.insert(adbParser->_adbCtxt->includePaths.end(),
-                                                     paths.begin(), paths.end());
+            adbParser->_adbCtxt->includePaths.insert(adbParser->_adbCtxt->includePaths.end(), paths.begin(),
+                                                     paths.end());
 
             StringVector relatives;
-            string
-                projPath = boost::filesystem::path(
-                               adbParser->_adbCtxt->mainFileName)
-                               .parent_path()
-                               .string();
+            string projPath = boost::filesystem::path(adbParser->_adbCtxt->mainFileName).parent_path().string();
 
-            for (StringVector::iterator it =
-                     adbParser->_adbCtxt->includePaths.begin();
-                 it != adbParser->_adbCtxt->includePaths.end(); it++)
+            for (StringVector::iterator it = adbParser->_adbCtxt->includePaths.begin();
+                 it != adbParser->_adbCtxt->includePaths.end();
+                 it++)
             {
                 if (boost::filesystem::path(*it).is_relative())
                 {
@@ -1141,14 +1156,13 @@ void AdbParser::startConfigElement(const XML_Char **atts, AdbParser *adbParser,
                 }
             }
 
-            adbParser->_adbCtxt->includePaths.insert(
-                adbParser->_adbCtxt->includePaths.end(),
-                relatives.begin(), relatives.end());
+            adbParser->_adbCtxt->includePaths.insert(adbParser->_adbCtxt->includePaths.end(), relatives.begin(),
+                                                     relatives.end());
         }
     }
 }
 
-void AdbParser::startInfoElement(const XML_Char **atts, AdbParser *adbParser)
+void AdbParser::startInfoElement(const XML_Char** atts, AdbParser* adbParser)
 {
     string docName = attrValue(atts, "source_doc_name");
     string docVer = attrValue(atts, "source_doc_version");
@@ -1156,11 +1170,12 @@ void AdbParser::startInfoElement(const XML_Char **atts, AdbParser *adbParser)
     adbParser->_adbCtxt->srcDocVer = docVer;
 }
 
-void AdbParser::startIncludeElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber)
+void AdbParser::startIncludeElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber)
 {
     bool cond = is_inst_ifdef_exist_and_correct_project(atts, adbParser);
- 
-    if (cond) {
+
+    if (cond)
+    {
         string includeAttr = attrName(atts, 0);
         boost::algorithm::trim(includeAttr);
 
@@ -1171,10 +1186,11 @@ void AdbParser::startIncludeElement(const XML_Char **atts, AdbParser *adbParser,
             boost::algorithm::trim(fname);
             if (fname.empty())
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          string() + "File attribute isn't given within " + TAG_INCLUDE + " tag",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::FATAL_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  string() + "File attribute isn't given within " + TAG_INCLUDE + " tag",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::FATAL_EXCEPTION);
             }
             if (!expFound)
                 includeFile(adbParser, fname, lineNumber);
@@ -1185,10 +1201,11 @@ void AdbParser::startIncludeElement(const XML_Char **atts, AdbParser *adbParser,
             boost::algorithm::trim(includeAllDirPath);
             if (includeAllDirPath.empty())
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          string() + "Directory to include isn't given within " + TAG_INCLUDE + " tag",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::FATAL_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  string() + "Directory to include isn't given within " + TAG_INCLUDE + " tag",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::FATAL_EXCEPTION);
             }
 
             if (!expFound)
@@ -1196,32 +1213,35 @@ void AdbParser::startIncludeElement(const XML_Char **atts, AdbParser *adbParser,
         }
         else
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      string() + "Include is called without file or dir attribute.",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::ERROR_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              string() + "Include is called without file or dir attribute.",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::ERROR_EXCEPTION);
         }
     }
 }
 
-void AdbParser::startInstOpAttrReplaceElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber)
+void AdbParser::startInstOpAttrReplaceElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber)
 {
     bool expFound = false;
     if (!adbParser->_instanceOps)
     {
-        expFound = raiseException(allowMultipleExceptions,
-                                  "Operation attr_replace must be defined within <instance_ops> element only.",
-                                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                  ExceptionHolder::FATAL_EXCEPTION);
+        expFound =
+          raiseException(allowMultipleExceptions,
+                         "Operation attr_replace must be defined within <instance_ops> element only.",
+                         ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                         ExceptionHolder::FATAL_EXCEPTION);
     }
 
     string path = attrValue(atts, "path");
     if (path.empty())
     {
-        expFound = raiseException(allowMultipleExceptions,
-                                  "path attribute is missing in attr_replace operation",
-                                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                  ExceptionHolder::ERROR_EXCEPTION);
+        expFound =
+          raiseException(allowMultipleExceptions,
+                         "path attribute is missing in attr_replace operation",
+                         ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                         ExceptionHolder::ERROR_EXCEPTION);
     }
 
     if (!expFound)
@@ -1241,7 +1261,7 @@ void AdbParser::startInstOpAttrReplaceElement(const XML_Char **atts, AdbParser *
     }
 }
 
-void AdbParser::startNodeElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber)
+void AdbParser::startNodeElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber)
 {
     if (adbParser->_currentNode || adbParser->skipNode)
     {
@@ -1252,20 +1272,21 @@ void AdbParser::startNodeElement(const XML_Char **atts, AdbParser *adbParser, co
     }
     bool cond = is_inst_ifdef_exist_and_correct_project(atts, adbParser);
 
-    if (cond) {
-
+    if (cond)
+    {
         string nodeName = attrValue(atts, "name");
         boost::algorithm::trim(nodeName);
         string size = attrValue(atts, "size");
 
-        if(adbParser->_enforceGuiChecks)
+        if (adbParser->_enforceGuiChecks)
         {
             // check the node name is compatible with the nname_pattern
-            if(!regex_match(nodeName, regex(adbParser->_nname_pattern)))
+            if (!regex_match(nodeName, regex(adbParser->_nname_pattern)))
             {
                 raiseException(allowMultipleExceptions,
                                "Illegal node name: \"" + nodeName + "\" doesn't match the given node name pattern: \"",
-                               adbParser->_nname_pattern + "\", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                               adbParser->_nname_pattern + "\", in file: \"" + adbParser->_fileName +
+                                 "\" line: " + boost::lexical_cast<string>(lineNumber),
                                ExceptionHolder::WARN_EXCEPTION);
             }
         }
@@ -1274,24 +1295,27 @@ void AdbParser::startNodeElement(const XML_Char **atts, AdbParser *adbParser, co
         {
             if (!AdbParser::checkSpecialChars(nodeName))
             {
-                raiseException(allowMultipleExceptions,
-                               "Invalid character in node name, in Node: \"" + nodeName + "\"",
-                               ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                               ExceptionHolder::WARN_EXCEPTION);
+                raiseException(
+                  allowMultipleExceptions,
+                  "Invalid character in node name, in Node: \"" + nodeName + "\"",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (AdbParser::checkBigger32(size))
             { // the second part of the size after the . max to be 32 0x0.0
-                raiseException(allowMultipleExceptions,
-                               "Invalid size format, valid format 0x0.0 not allowed to be more than 0x0.31",
-                               ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                               ExceptionHolder::WARN_EXCEPTION);
+                raiseException(
+                  allowMultipleExceptions,
+                  "Invalid size format, valid format 0x0.0 not allowed to be more than 0x0.31",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (addr2int(size) == 0)
             {
-                raiseException(allowMultipleExceptions,
-                               "Node Size is not allowed to be 0, in Node: \"" + nodeName + "\"",
-                               ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                               ExceptionHolder::ERROR_EXCEPTION);
+                raiseException(
+                  allowMultipleExceptions,
+                  "Node Size is not allowed to be 0, in Node: \"" + nodeName + "\"",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
         }
         string desc = descXmlToNative(attrValue(atts, "descr"));
@@ -1299,25 +1323,30 @@ void AdbParser::startNodeElement(const XML_Char **atts, AdbParser *adbParser, co
         // Check for mandatory attrs
         if (nodeName.empty())
         {
-            raiseException(allowMultipleExceptions,
-                           "Missing node name",
-                           ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                           ExceptionHolder::FATAL_EXCEPTION);
+            raiseException(
+              allowMultipleExceptions,
+              "Missing node name",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
         if (size.empty())
         {
-            raiseException(allowMultipleExceptions,
-                           "Missing node size",
-                           ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                           ExceptionHolder::FATAL_EXCEPTION);
+            raiseException(
+              allowMultipleExceptions,
+              "Missing node size",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
         // Check for duplications
         if (adbParser->_adbCtxt->nodesMap.count(nodeName))
         {
-            raiseException(allowMultipleExceptions,
-                           "node \"" + nodeName + "\" is already defined in file: \"" + adbParser->_adbCtxt->nodesMap[nodeName]->fileName + "\" line: " + boost::lexical_cast<string>(adbParser->_adbCtxt->nodesMap[nodeName]->lineNumber),
-                           ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                           ExceptionHolder::FATAL_EXCEPTION);
+            raiseException(
+              allowMultipleExceptions,
+              "node \"" + nodeName + "\" is already defined in file: \"" +
+                adbParser->_adbCtxt->nodesMap[nodeName]->fileName +
+                "\" line: " + boost::lexical_cast<string>(adbParser->_adbCtxt->nodesMap[nodeName]->lineNumber),
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
         adbParser->_currentNode = new AdbNode;
@@ -1331,7 +1360,7 @@ void AdbParser::startNodeElement(const XML_Char **atts, AdbParser *adbParser, co
 
         if (adbParser->_strict && adbParser->_currentNode->isUnion && adbParser->_currentNode->size % 32)
         {
-            //throw AdbException("union must be dword aligned");
+            // throw AdbException("union must be dword aligned");
         }
 
         // Add all node attributes
@@ -1343,30 +1372,34 @@ void AdbParser::startNodeElement(const XML_Char **atts, AdbParser *adbParser, co
             }
             adbParser->_currentNode->attrs[attrName(atts, i)] = attrValue(atts, i);
         }
-    } else {
+    }
+    else
+    {
         adbParser->skipNode = true;
     }
 }
 
-void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, const int lineNumber)
+void AdbParser::startFieldElement(const XML_Char** atts, AdbParser* adbParser, const int lineNumber)
 {
     bool expFound = false;
     if (!adbParser->_currentNode && !adbParser->skipNode)
     {
-        expFound = raiseException(allowMultipleExceptions,
-                                  "Field definition outside of node",
-                                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                  ExceptionHolder::FATAL_EXCEPTION);
+        expFound =
+          raiseException(allowMultipleExceptions,
+                         "Field definition outside of node",
+                         ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                         ExceptionHolder::FATAL_EXCEPTION);
     }
 
-    if (!adbParser->skipNode) {
-
+    if (!adbParser->skipNode)
+    {
         if (adbParser->_currentField)
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Nested fields are not allowed",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Nested fields are not allowed",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
         string fieldName = attrValue(atts, "name");
@@ -1378,52 +1411,59 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
         {
             if (addr2int(size) % 32 == 0 && !AdbParser::checkHEXFormat(size))
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Invalid size format",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Invalid size format",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (!AdbParser::checkHEXFormat(offset))
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Invalid offset format",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Invalid offset format",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (!AdbParser::checkSpecialChars(fieldName))
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Invalid character in field name, in Field: \"" + fieldName + "\"",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Invalid character in field name, in Field: \"" + fieldName + "\"",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (!expFound && adbParser->_currentNode->isUnion && addr2int(offset) != 0)
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Offset must be 0x0.0 in Union fields",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Offset must be 0x0.0 in Union fields",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (AdbParser::checkBigger32(size))
             { // the second part of the size after the . max to be 32 0x0.0
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Invalid size format, valid format 0x0.0 not allowed to be more than 0x0.31",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Invalid size format, valid format 0x0.0 not allowed to be more than 0x0.31",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (AdbParser::checkBigger32(offset))
             { // the second part of the size after the . max to be 32 0x0.0
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Invalid offset format, valid format 0x0.0 not allowed to be more than 0x0.31",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Invalid offset format, valid format 0x0.0 not allowed to be more than 0x0.31",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
             if (addr2int(size) == 0)
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Field Size is not allowed to be 0, in Field: \"" + fieldName + "\"",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Field Size is not allowed to be 0, in Field: \"" + fieldName + "\"",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
         }
 
@@ -1443,45 +1483,50 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
             int entrySize = isize / (high - low + 1);
             if (entrySize % 8 != 0 && entrySize > 8)
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Invalid size of array entries",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::ERROR_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Invalid size of array entries",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
-            if (entrySize < 8 && entrySize != 4 && entrySize != 2 && entrySize != 1 && ((isize > 32 && highBound != "VARIABLE") || highBound == "VARIABLE"))
+            if (entrySize < 8 && entrySize != 4 && entrySize != 2 && entrySize != 1 &&
+                ((isize > 32 && highBound != "VARIABLE") || highBound == "VARIABLE"))
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Array with entry size 3, 5, 6 or 7 bits and array size is larger than 32bit",
-                                          ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::ERROR_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Array with entry size 3, 5, 6 or 7 bits and array size is larger than 32bit",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
         }
-        else if(adbParser->_enforceGuiChecks && !(lowBound == "" && highBound == ""))
+        else if (adbParser->_enforceGuiChecks && !(lowBound == "" && highBound == ""))
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                          "Field: \"" + adbParser->_currentField->name + "\": both low_bound or high_bound must be specified",
-                                          ", in file: \"" + adbParser->_fileName +
-                                           "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Field: \"" + adbParser->_currentField->name + "\": both low_bound or high_bound must be specified",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::WARN_EXCEPTION);
         }
 
         string subNode = attrValue(atts, "subnode");
 
         // Check for mandatory attrs
-        if     (fieldName.empty())
+        if (fieldName.empty())
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Missing field name",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Missing field name",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
         if (size.empty())
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Missing field size",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Missing field size",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
         // Create new fields
@@ -1510,8 +1555,7 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
             adbParser->_currentField->definedAsArr = false;
         }
 
-        adbParser->_currentField->lowBound = lowBound.empty() ? 0
-                                                              : boost::lexical_cast<u_int32_t>(lowBound);
+        adbParser->_currentField->lowBound = lowBound.empty() ? 0 : boost::lexical_cast<u_int32_t>(lowBound);
         if (highBound == "VARIABLE")
         {
             adbParser->_currentField->highBound = 0;
@@ -1519,25 +1563,21 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
         }
         else
         {
-            adbParser->_currentField->highBound = highBound.empty() ? 0
-                                                                    : boost::lexical_cast<u_int32_t>(highBound);
+            adbParser->_currentField->highBound = highBound.empty() ? 0 : boost::lexical_cast<u_int32_t>(highBound);
         }
         adbParser->_currentField->subNode = subNode;
 
         // Check array element size
-        if (adbParser->_currentField->isArray() && !adbParser->_currentField->isUnlimitedArr() && adbParser->_currentField->size % (adbParser->_currentField->arrayLen()))
+        if (adbParser->_currentField->isArray() && !adbParser->_currentField->isUnlimitedArr() &&
+            adbParser->_currentField->size % (adbParser->_currentField->arrayLen()))
         {
             char exceptionTxt[1000];
-            sprintf(exceptionTxt,
-                    "In field \"%s\" invalid array element size\"%0.2f\" in file: \"%s\" line: %d",
+            sprintf(exceptionTxt, "In field \"%s\" invalid array element size\"%0.2f\" in file: \"%s\" line: %d",
                     fieldName.c_str(),
                     ((double)adbParser->_currentField->size / (adbParser->_currentField->arrayLen())),
                     adbParser->_fileName.c_str(), lineNumber);
 
-            expFound = raiseException(allowMultipleExceptions,
-                                      exceptionTxt,
-                                      "",
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(allowMultipleExceptions, exceptionTxt, "", ExceptionHolder::FATAL_EXCEPTION);
         }
         if (offset.empty())
         {
@@ -1547,7 +1587,7 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
             }
             else
             {
-                AdbField *lastField = adbParser->_currentNode->fields.back();
+                AdbField* lastField = adbParser->_currentNode->fields.back();
                 adbParser->_currentField->offset = lastField->offset + lastField->size;
             }
         }
@@ -1562,80 +1602,96 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
             u_int32_t offset = adbParser->_currentField->offset;
             u_int32_t size = adbParser->_currentField->eSize();
 
-            adbParser->_currentField->offset = ((offset >> 5) << 5) + ((MIN(32, adbParser->_currentNode->size) - ((offset + size) % 32)) % 32);
+            adbParser->_currentField->offset =
+              ((offset >> 5) << 5) + ((MIN(32, adbParser->_currentNode->size) - ((offset + size) % 32)) % 32);
         }
 
         // For DS alignment check
         u_int32_t esize = adbParser->_currentField->eSize();
-        if ((adbParser->_currentField->isLeaf() || adbParser->_currentField->subNode == "uint64") && (esize == 16 || esize == 32 || esize == 64) && esize > adbParser->_currentNode->_maxLeafSize) {
-            adbParser->_currentNode->_maxLeafSize =  esize;
+        if ((adbParser->_currentField->isLeaf() || adbParser->_currentField->subNode == "uint64") &&
+            (esize == 16 || esize == 32 || esize == 64) && esize > adbParser->_currentNode->_maxLeafSize)
+        {
+            adbParser->_currentNode->_maxLeafSize = esize;
         }
 
         if (!expFound && adbParser->_strict && adbParser->_currentNode->isUnion && adbParser->_currentField->isLeaf())
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Fields are not allowed in unions (only subnodes)",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Fields are not allowed in unions (only subnodes)",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
         if (!expFound && adbParser->_strict && adbParser->_currentNode->isUnion && adbParser->_currentField->size % 32)
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Union is allowed to contains only dword aligned subnodes",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Union is allowed to contains only dword aligned subnodes",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
-        if (!expFound && adbParser->_currentNode->isUnion && adbParser->_currentField->size > adbParser->_currentNode->size)
+        if (!expFound && adbParser->_currentNode->isUnion &&
+            adbParser->_currentField->size > adbParser->_currentNode->size)
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Field size is greater than the parent node size",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Field size is greater than the parent node size",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
-        if (!expFound && adbParser->_strict && !adbParser->_currentField->isArray() && adbParser->_currentField->isLeaf() && adbParser->_currentField->size > 32)
+        if (!expFound && adbParser->_strict && !adbParser->_currentField->isArray() &&
+            adbParser->_currentField->isLeaf() && adbParser->_currentField->size > 32)
         {
-            expFound = raiseException(allowMultipleExceptions,
-                                      "Leaf fields can't be > 32 bits",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::FATAL_EXCEPTION);
+            expFound = raiseException(
+              allowMultipleExceptions,
+              "Leaf fields can't be > 32 bits",
+              ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+              ExceptionHolder::FATAL_EXCEPTION);
         }
 
-        if (!expFound && adbParser->_checkDsAlign) {
+        if (!expFound && adbParser->_checkDsAlign)
+        {
             u_int32_t esize = adbParser->_currentField->eSize();
-            if ((adbParser->_currentField->isLeaf() || adbParser->_currentField->subNode == "uint64") && (esize == 16 || esize == 32 || esize ==64) && adbParser->_currentField->offset % esize != 0) {
-                expFound = raiseException(allowMultipleExceptions,
-                                      "Field: " + adbParser->_currentField->name + " in Node: " + adbParser->_currentNode->name + " offset(" + boost::lexical_cast<string>(adbParser->_currentField->offset) + ") is not aligned to size(" + boost::lexical_cast<string>(esize) + ")",
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::ERROR_EXCEPTION);
+            if ((adbParser->_currentField->isLeaf() || adbParser->_currentField->subNode == "uint64") &&
+                (esize == 16 || esize == 32 || esize == 64) && adbParser->_currentField->offset % esize != 0)
+            {
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Field: " + adbParser->_currentField->name + " in Node: " + adbParser->_currentNode->name +
+                    " offset(" + boost::lexical_cast<string>(adbParser->_currentField->offset) +
+                    ") is not aligned to size(" + boost::lexical_cast<string>(esize) + ")",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
         }
 
-        if(adbParser->_enforceGuiChecks)
+        if (adbParser->_enforceGuiChecks)
         {
             // check if all mandatory attributes were supplied
-            for(unsigned int i = 0; i < adbParser->field_mand_attr.size(); i++)
+            for (unsigned int i = 0; i < adbParser->field_mand_attr.size(); i++)
             {
-                if(attrValue(atts, adbParser->field_mand_attr[i].c_str()) == "")
+                if (attrValue(atts, adbParser->field_mand_attr[i].c_str()) == "")
                 {
-                    expFound = raiseException(allowMultipleExceptions,
-                                      "Atrribute: \"" + adbParser->field_mand_attr[i] + "\" for field must be specified.",
-                                      " in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::ERROR_EXCEPTION);
+                    expFound = raiseException(
+                      allowMultipleExceptions,
+                      "Atrribute: \"" + adbParser->field_mand_attr[i] + "\" for field must be specified.",
+                      " in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                      ExceptionHolder::ERROR_EXCEPTION);
                 }
             }
 
             // check if the field name is compatible with the fname pattern
-            if(!regex_match(adbParser->_currentField->name, regex(adbParser->_fname_pattern)))
+            if (!regex_match(adbParser->_currentField->name, regex(adbParser->_fname_pattern)))
             {
-                expFound = raiseException(allowMultipleExceptions,
-                                          "Illegal field name: \"" + adbParser->_currentField->name +
-                                          "\" doesn't match the given field name pattern",
-                                          ", in file: \"" + adbParser->_fileName +
-                                           "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                expFound = raiseException(
+                  allowMultipleExceptions,
+                  "Illegal field name: \"" + adbParser->_currentField->name +
+                    "\" doesn't match the given field name pattern",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::WARN_EXCEPTION);
             }
         }
 
@@ -1644,50 +1700,53 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
         {
             for (int i = 0; i < attrCount(atts); i++)
             {
-                if(adbParser->_enforceGuiChecks)
+                if (adbParser->_enforceGuiChecks)
                 {
                     string aName = attrName(atts, i);
                     string aValue = attrValue(atts, i);
 
                     // check if the field contains illegal attribute
-                    if(!aName.compare("inst_if") && !aName.compare("inst_ifdef") && !aName.compare("subnode") &&
+                    if (!aName.compare("inst_if") && !aName.compare("inst_ifdef") && !aName.compare("subnode") &&
                         adbParser->field_attr_names_set.find(aName) != adbParser->field_attr_names_set.end() &&
                         adbParser->field_spec_attr.find(aName) != adbParser->field_spec_attr.end())
                     {
-                        expFound = raiseException(allowMultipleExceptions,
-                                      "Unknown attribute: " + aName + " at field: " + adbParser->_currentField->name,
-                                      ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::ERROR_EXCEPTION);
+                        expFound =
+                          raiseException(allowMultipleExceptions,
+                                         "Unknown attribute: " + aName + " at field: " + adbParser->_currentField->name,
+                                         ", in file: \"" + adbParser->_fileName +
+                                           "\" line: " + boost::lexical_cast<string>(lineNumber),
+                                         ExceptionHolder::ERROR_EXCEPTION);
                     }
 
-                    if(!aName.compare("enum"))
+                    if (!aName.compare("enum"))
                     {
                         // check the enum attribute is compatible with the enum pattern
-                        if(!regex_match(aValue, regex(adbParser->_enum_pattern)))
+                        if (!regex_match(aValue, regex(adbParser->_enum_pattern)))
                         {
-                            expFound = raiseException(allowMultipleExceptions,
-                                          "Illegal value: \"" + aValue + "\" for attribute: \"" + aName + "\" ",
-                                          "doesn't match the given attribute pattern, in file: \"" + adbParser->_fileName +
-                                           "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                            expFound = raiseException(
+                              allowMultipleExceptions,
+                              "Illegal value: \"" + aValue + "\" for attribute: \"" + aName + "\" ",
+                              "doesn't match the given attribute pattern, in file: \"" + adbParser->_fileName +
+                                "\" line: " + boost::lexical_cast<string>(lineNumber),
+                              ExceptionHolder::WARN_EXCEPTION);
                         }
                     }
                     else
                     {
                         // check the attribute name is compatible with the attribute pattern
-                        if(adbParser->attr_pattern.find(aName) != adbParser->attr_pattern.end() &&
-                             !regex_match(aValue, regex(adbParser->attr_pattern[aName])))
+                        if (adbParser->attr_pattern.find(aName) != adbParser->attr_pattern.end() &&
+                            !regex_match(aValue, regex(adbParser->attr_pattern[aName])))
                         {
-                            expFound = raiseException(allowMultipleExceptions,
-                                          "Illegal value: \"" + aValue + "\" for attribute: \"" + aName + "\" ",
-                                          "doesn't match the given attribute pattern, in file: \"" + adbParser->_fileName +
-                                           "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                          ExceptionHolder::WARN_EXCEPTION);
+                            expFound = raiseException(
+                              allowMultipleExceptions,
+                              "Illegal value: \"" + aValue + "\" for attribute: \"" + aName + "\" ",
+                              "doesn't match the given attribute pattern, in file: \"" + adbParser->_fileName +
+                                "\" line: " + boost::lexical_cast<string>(lineNumber),
+                              ExceptionHolder::WARN_EXCEPTION);
                         }
                     }
                 }
-                adbParser->_currentField->attrs[attrName(atts, i)] = attrValue(
-                    atts, i);
+                adbParser->_currentField->attrs[attrName(atts, i)] = attrValue(atts, i);
             }
         }
     }
@@ -1696,9 +1755,9 @@ void AdbParser::startFieldElement(const XML_Char **atts, AdbParser *adbParser, c
 /**
  * Function: AdbParser::startElement
  **/
-void AdbParser::startElement(void *_adbParser, const XML_Char *name, const XML_Char **atts)
+void AdbParser::startElement(void* _adbParser, const XML_Char* name, const XML_Char** atts)
 {
-    AdbParser *adbParser = static_cast<AdbParser *>(_adbParser);
+    AdbParser* adbParser = static_cast<AdbParser*>(_adbParser);
 
     int lineNumber = XML_GetCurrentLineNumber(adbParser->_xmlParser);
     adbParser->_currentTagValue = "";
@@ -1748,7 +1807,8 @@ void AdbParser::startElement(void *_adbParser, const XML_Char *name, const XML_C
         string exceptionTxt = "Unsupported tag: " + string(name);
         if (allowMultipleExceptions)
         {
-            exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber);
+            exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName +
+                           "\" line: " + boost::lexical_cast<string>(lineNumber);
             ExceptionHolder::insertNewException(ExceptionHolder::FATAL_EXCEPTION, exceptionTxt);
             return;
         }
@@ -1762,34 +1822,33 @@ void AdbParser::startElement(void *_adbParser, const XML_Char *name, const XML_C
 /**
  * Function: AdbParser::addReserved
  **/
-void AdbParser::addReserved(vector<AdbField *> &reserveds, u_int32_t offset,
-                            u_int32_t size)
+void AdbParser::addReserved(vector<AdbField*>& reserveds, u_int32_t offset, u_int32_t size)
 {
     u_int32_t numOfDwords = (dword(offset + size - 1) - dword(offset)) / 4 + 1;
 
-    //printf("==> %s\n", formatAddr(offset, size).c_str());
-    //printf("numOfDwords = %d\n", numOfDwords);
+    // printf("==> %s\n", formatAddr(offset, size).c_str());
+    // printf("numOfDwords = %d\n", numOfDwords);
 
     if (numOfDwords == 1 || ((offset % 32) == 0 && ((offset + size) % 32) == 0))
     {
-        AdbField *f1 = new AdbField;
+        AdbField* f1 = new AdbField;
         f1->name = "reserved";
         f1->offset = offset;
         f1->isReserved = true;
         f1->size = size;
 
         reserveds.push_back(f1);
-        //printf("case1: reserved0: %s\n", formatAddr(f1->offset, f1->size).c_str());
+        // printf("case1: reserved0: %s\n", formatAddr(f1->offset, f1->size).c_str());
     }
     else if (numOfDwords == 2)
     {
-        AdbField *f1 = new AdbField;
+        AdbField* f1 = new AdbField;
         f1->name = "reserved";
         f1->offset = offset;
         f1->isReserved = true;
         f1->size = 32 - startBit(offset);
 
-        AdbField *f2 = new AdbField;
+        AdbField* f2 = new AdbField;
         f2->name = "reserved";
         f2->offset = dword(offset + 32) * 8;
         f2->isReserved = true;
@@ -1802,13 +1861,13 @@ void AdbParser::addReserved(vector<AdbField *> &reserveds, u_int32_t offset,
     }
     else
     {
-        AdbField *f1 = new AdbField;
+        AdbField* f1 = new AdbField;
         f1->name = "reserved";
         f1->offset = offset;
         f1->isReserved = true;
         f1->size = 32 - startBit(offset);
 
-        AdbField *f2 = new AdbField;
+        AdbField* f2 = new AdbField;
         f2->name = "reserved";
         f2->offset = dword(offset + 32) * 8;
         f2->isReserved = true;
@@ -1841,7 +1900,7 @@ void AdbParser::addReserved(vector<AdbField *> &reserveds, u_int32_t offset,
             else
             {
                 f2->size = (numOfDwords - 2) * 32;
-                AdbField *f3 = new AdbField;
+                AdbField* f3 = new AdbField;
                 f3->name = "reserved";
                 f3->offset = f2->offset + f2->size;
                 f3->isReserved = true;
@@ -1862,9 +1921,9 @@ void AdbParser::addReserved(vector<AdbField *> &reserveds, u_int32_t offset,
 /**
  * Function: AdbParser::endElement
  **/
-void AdbParser::endElement(void *_adbParser, const XML_Char *name)
+void AdbParser::endElement(void* _adbParser, const XML_Char* name)
 {
-    AdbParser *adbParser = static_cast<AdbParser *>(_adbParser);
+    AdbParser* adbParser = static_cast<AdbParser*>(_adbParser);
     int lineNumber = XML_GetCurrentLineNumber(adbParser->_xmlParser);
     /*
      * Config
@@ -1890,9 +1949,12 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
     else if (TAG_NODE == name)
     {
         // Sort the fields by offset
-        if (adbParser->skipNode) {
+        if (adbParser->skipNode)
+        {
             adbParser->skipNode = false;
-        } else {
+        }
+        else
+        {
             if (!adbParser->_currentNode->isUnion)
             {
                 stable_sort(adbParser->_currentNode->fields.begin(),
@@ -1901,24 +1963,27 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
             }
 
             // Check overlapping
-            vector<AdbField *> reserveds;
+            vector<AdbField*> reserveds;
             AdbField prevFieldDummy;
             prevFieldDummy.offset = 0;
             prevFieldDummy.size = 0;
-            AdbField *prevField = &prevFieldDummy;
+            AdbField* prevField = &prevFieldDummy;
             if (!adbParser->_currentNode->isUnion)
             {
                 for (size_t i = 0; i < adbParser->_currentNode->fields.size(); i++)
                 {
-                    AdbField *field = adbParser->_currentNode->fields[i];
+                    AdbField* field = adbParser->_currentNode->fields[i];
                     long int delta = (long)field->offset - (long)(prevField->offset + prevField->size);
 
                     if (delta < 0)
                     { // Overlapping
-                        string exceptionTxt = "Field: " + field->name + " " + formatAddr(field->offset, field->size) + " overlaps with Field: " + prevField->name + " " + formatAddr(prevField->offset, prevField->size);
+                        string exceptionTxt = "Field: " + field->name + " " + formatAddr(field->offset, field->size) +
+                                              " overlaps with Field: " + prevField->name + " " +
+                                              formatAddr(prevField->offset, prevField->size);
                         if (allowMultipleExceptions)
                         {
-                            exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber);
+                            exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName +
+                                           "\" line: " + boost::lexical_cast<string>(lineNumber);
                             ExceptionHolder::insertNewException(ExceptionHolder::ERROR_EXCEPTION, exceptionTxt);
                         }
                         else
@@ -1928,8 +1993,7 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
                     }
                     if (delta > 0 && adbParser->_addReserved)
                     { // Need reserved
-                        addReserved(reserveds, prevField->offset + prevField->size,
-                                    delta);
+                        addReserved(reserveds, prevField->offset + prevField->size, delta);
                     }
 
                     prevField = field;
@@ -1957,23 +2021,25 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
 
                     if (delta > 0)
                     {
-                        addReserved(reserveds, prevField->offset + prevField->size,
-                                    delta);
+                        addReserved(reserveds, prevField->offset + prevField->size, delta);
                     }
                 }
 
-                adbParser->_currentNode->fields.insert(
-                    adbParser->_currentNode->fields.end(), reserveds.begin(),
-                    reserveds.end());
+                adbParser->_currentNode->fields.insert(adbParser->_currentNode->fields.end(), reserveds.begin(),
+                                                       reserveds.end());
             }
 
-            if (adbParser->_checkDsAlign && adbParser->_currentNode->_maxLeafSize != 0 && adbParser->_currentNode->_maxLeafSize != 0 && adbParser->_currentNode->size % adbParser->_currentNode->_maxLeafSize != 0) {
-
-
-                raiseException(allowMultipleExceptions,
-                    "Node: " + adbParser->_currentNode->name + " size(" + boost::lexical_cast<string>(adbParser->_currentNode->size) + ") is not aligned with largest leaf(" + boost::lexical_cast<string>(adbParser->_currentNode->_maxLeafSize) + ")",
-                    ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
-                                      ExceptionHolder::ERROR_EXCEPTION);
+            if (adbParser->_checkDsAlign && adbParser->_currentNode->_maxLeafSize != 0 &&
+                adbParser->_currentNode->_maxLeafSize != 0 &&
+                adbParser->_currentNode->size % adbParser->_currentNode->_maxLeafSize != 0)
+            {
+                raiseException(
+                  allowMultipleExceptions,
+                  "Node: " + adbParser->_currentNode->name + " size(" +
+                    boost::lexical_cast<string>(adbParser->_currentNode->size) + ") is not aligned with largest leaf(" +
+                    boost::lexical_cast<string>(adbParser->_currentNode->_maxLeafSize) + ")",
+                  ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber),
+                  ExceptionHolder::ERROR_EXCEPTION);
             }
 
             // Re-fix fields offset
@@ -1984,9 +2050,8 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
                     u_int32_t offset = adbParser->_currentNode->fields[i]->offset;
                     u_int32_t size = adbParser->_currentNode->fields[i]->eSize();
 
-                    adbParser->_currentNode->fields[i]->offset = ((offset >> 5)
-                                                                  << 5) +
-                                                                 ((MIN(32, adbParser->_currentNode->size) - ((offset + size) % 32)) % 32);
+                    adbParser->_currentNode->fields[i]->offset =
+                      ((offset >> 5) << 5) + ((MIN(32, adbParser->_currentNode->size) - ((offset + size) % 32)) % 32);
                 }
             }
 
@@ -2000,8 +2065,7 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
 
             // Add this node to AdbCtxt
             adbParser->_adbCtxt->nodesMap.insert(
-                pair<string, AdbNode *>(adbParser->_currentNode->name,
-                                        adbParser->_currentNode));
+              pair<string, AdbNode*>(adbParser->_currentNode->name, adbParser->_currentNode));
             adbParser->_currentNode = 0;
         }
     }
@@ -2012,7 +2076,8 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
     else if (TAG_FIELD == name)
     {
         // Add this field to current node
-        if (!adbParser->skipNode) {
+        if (!adbParser->skipNode)
+        {
             if (adbParser->_currentNode->name == "root")
             {
                 adbParser->_adbCtxt->rootNode = adbParser->_currentField->subNode;
@@ -2027,13 +2092,11 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
                 bool found = false;
                 for (size_t i = 0; i < adbParser->_adbCtxt->configs.size(); i++)
                 {
-                    AttrsMap::iterator it_def =
-                        adbParser->_adbCtxt->configs[i]->attrs.find("define");
+                    AttrsMap::iterator it_def = adbParser->_adbCtxt->configs[i]->attrs.find("define");
                     if (it_def != adbParser->_adbCtxt->configs[i]->attrs.end())
                     {
                         vector<string> defVal;
-                        boost::algorithm::split(defVal, it_def->second,
-                                                boost::is_any_of(string("=")));
+                        boost::algorithm::split(defVal, it_def->second, boost::is_any_of(string("=")));
 
                         if (defVal[0] == it->second)
                         {
@@ -2053,13 +2116,11 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
                 map<string, string> vars;
                 for (size_t i = 0; i < adbParser->_adbCtxt->configs.size(); i++)
                 {
-                    AttrsMap::iterator it_def =
-                        adbParser->_adbCtxt->configs[i]->attrs.find("define");
+                    AttrsMap::iterator it_def = adbParser->_adbCtxt->configs[i]->attrs.find("define");
                     if (it_def != adbParser->_adbCtxt->configs[i]->attrs.end())
                     {
                         vector<string> defVal;
-                        boost::algorithm::split(defVal, it_def->second,
-                                                boost::is_any_of(string("=")));
+                        boost::algorithm::split(defVal, it_def->second, boost::is_any_of(string("=")));
 
                         if (defVal.size() == 1)
                         {
@@ -2073,8 +2134,8 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
                 }
 
                 AdbExpr adbExpr;
-                char *expOrg = new char[it->second.size() + 1];
-                char *exp = expOrg;
+                char* expOrg = new char[it->second.size() + 1];
+                char* exp = expOrg;
                 if (!exp)
                 {
                     throw AdbException("Memory allocation error");
@@ -2089,10 +2150,12 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
 
                 if (status < 0)
                 {
-                    string exceptionTxt = string("Error evaluating expression \"") + it->second.c_str() + "\" : " + AdbExpr::statusStr(status);
+                    string exceptionTxt = string("Error evaluating expression \"") + it->second.c_str() +
+                                          "\" : " + AdbExpr::statusStr(status);
                     if (allowMultipleExceptions)
                     {
-                        exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber);
+                        exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName +
+                                       "\" line: " + boost::lexical_cast<string>(lineNumber);
                         ExceptionHolder::insertNewException(ExceptionHolder::ERROR_EXCEPTION, exceptionTxt);
                     }
                     else
@@ -2110,13 +2173,14 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
                 {
                     for (size_t i = 0; i < adbParser->_currentNode->fields.size(); i++)
                     {
-                        if (!adbParser->_currentNode->fields[i]->name.compare(
-                                adbParser->_currentField->name))
+                        if (!adbParser->_currentNode->fields[i]->name.compare(adbParser->_currentField->name))
                         {
-                            string exceptionTxt = "The field \"" + adbParser->_currentField->name + "\" isn't unique in node";
+                            string exceptionTxt =
+                              "The field \"" + adbParser->_currentField->name + "\" isn't unique in node";
                             if (allowMultipleExceptions)
                             {
-                                exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName + "\" line: " + boost::lexical_cast<string>(lineNumber);
+                                exceptionTxt = exceptionTxt + ", in file: \"" + adbParser->_fileName +
+                                               "\" line: " + boost::lexical_cast<string>(lineNumber);
                                 ExceptionHolder::insertNewException(ExceptionHolder::ERROR_EXCEPTION, exceptionTxt);
                             }
                             else
@@ -2136,8 +2200,7 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
             }
             else
             {
-                adbParser->_currentNode->condFields.push_back(
-                    adbParser->_currentField);
+                adbParser->_currentNode->condFields.push_back(adbParser->_currentField);
             }
             adbParser->_currentField = 0;
         }
@@ -2147,8 +2210,7 @@ void AdbParser::endElement(void *_adbParser, const XML_Char *name)
 /**
  * Function: AdbParser::raiseException
  **/
-bool AdbParser::raiseException(bool allowMultipleExceptions, string exceptionTxt,
-                               string addedMsg, const string expType)
+bool AdbParser::raiseException(bool allowMultipleExceptions, string exceptionTxt, string addedMsg, const string expType)
 {
     if (allowMultipleExceptions)
     {
@@ -2212,9 +2274,6 @@ int main()
 }
 #endif
 
-
-
-
 Adb::Adb() : bigEndianArr(false), singleEntryArrSupp(false), _checkDsAlign(false), _enforceGuiChecks(false)
 {
     _logFile = new LogFile;
@@ -2314,9 +2373,16 @@ string Adb::printAdbExceptionMap()
 /**
  * Function: Adb::load
  **/
-bool Adb::load(string fname, bool addReserved,
-               bool strict, string includePath, string includeDir,
-               bool enforceExtraChecks, bool allowMultipleExceptions, string logFileStr, bool checkDsAlign, bool enforceGuiChecks)
+bool Adb::load(string fname,
+               bool addReserved,
+               bool strict,
+               string includePath,
+               string includeDir,
+               bool enforceExtraChecks,
+               bool allowMultipleExceptions,
+               string logFileStr,
+               bool checkDsAlign,
+               bool enforceGuiChecks)
 {
     try
     {
@@ -2327,9 +2393,8 @@ bool Adb::load(string fname, bool addReserved,
             AdbParser::setAllowMultipleExceptionsTrue();
         }
         _logFile->init(logFileStr, allowMultipleExceptions);
-        AdbParser p(fname, this, addReserved, strict, includePath,
-                    enforceExtraChecks, checkDsAlign, enforceGuiChecks);
-        _checkDsAlign=checkDsAlign;
+        AdbParser p(fname, this, addReserved, strict, includePath, enforceExtraChecks, checkDsAlign, enforceGuiChecks);
+        _checkDsAlign = checkDsAlign;
         _enforceGuiChecks = enforceGuiChecks;
         if (!p.load())
         {
@@ -2351,9 +2416,7 @@ bool Adb::load(string fname, bool addReserved,
         }
         if (status)
         {
-            bool checkSizeConsistency = strict ? checkInstSizeConsistency(
-                                                     allowMultipleExceptions)
-                                               : true;
+            bool checkSizeConsistency = strict ? checkInstSizeConsistency(allowMultipleExceptions) : true;
             status = status && checkSizeConsistency;
         }
         if (allowMultipleExceptions && ExceptionHolder::getNumberOfExceptions() > 0)
@@ -2363,7 +2426,7 @@ bool Adb::load(string fname, bool addReserved,
         }
         return status;
     }
-    catch (AdbException &e)
+    catch (AdbException& e)
     {
         _lastError = e.what_s();
         if (allowMultipleExceptions)
@@ -2377,13 +2440,11 @@ bool Adb::load(string fname, bool addReserved,
 /**
  * Function: Adb::loadFromString
  **/
-bool Adb::loadFromString(const char *adbContents, bool addReserved,
-                         bool strict, bool enforceExtraChecks)
+bool Adb::loadFromString(const char* adbContents, bool addReserved, bool strict, bool enforceExtraChecks)
 {
     try
     {
-        AdbParser p(string(), this, addReserved, strict, "",
-                    enforceExtraChecks);
+        AdbParser p(string(), this, addReserved, strict, "", enforceExtraChecks);
         mainFileName = OS_PATH_SEP;
         if (!p.loadFromString(adbContents))
         {
@@ -2399,7 +2460,7 @@ bool Adb::loadFromString(const char *adbContents, bool addReserved,
 
         return strict ? checkInstSizeConsistency() : true;
     }
-    catch (AdbException &e)
+    catch (AdbException& e)
     {
         _lastError = e.what_s();
         return false;
@@ -2409,8 +2470,7 @@ bool Adb::loadFromString(const char *adbContents, bool addReserved,
 /**
  * Function: Adb::toXml
  **/
-string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName,
-                  string addPrefix)
+string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName, string addPrefix)
 {
     try
     {
@@ -2438,13 +2498,14 @@ string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName,
         }
 
         // Add source info
-        xml += "<info source_doc_name=\"" + encodeXml(descNativeToXml(srcDocName)) + "\" source_doc_version=\"" + encodeXml(descNativeToXml(srcDocVer)) + "\" />\n";
+        xml += "<info source_doc_name=\"" + encodeXml(descNativeToXml(srcDocName)) + "\" source_doc_version=\"" +
+               encodeXml(descNativeToXml(srcDocVer)) + "\" />\n";
 
         if (nodeNames.empty())
         {
             for (NodesMap::iterator it = nodesMap.begin(); it != nodesMap.end(); it++)
             {
-                AdbNode *node = it->second;
+                AdbNode* node = it->second;
                 xml += node->toXml(addPrefix);
             }
         }
@@ -2460,7 +2521,7 @@ string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName,
                     return "";
                 }
 
-                AdbNode *node = it->second;
+                AdbNode* node = it->second;
                 xml += node->toXml(addPrefix) + "\n\n";
 
                 maxSize = TOOLS_MAX(node->size, maxSize);
@@ -2469,25 +2530,21 @@ string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName,
             if (addRootNode)
             {
                 stringstream buf;
-                buf << "<node name=\"root\" size=\"0x" << hex
-                    << ((maxSize >> 5) << 2) << "." << dec
-                    << (maxSize % 32) << "\" descr=\"\" >\n";
+                buf << "<node name=\"root\" size=\"0x" << hex << ((maxSize >> 5) << 2) << "." << dec << (maxSize % 32)
+                    << "\" descr=\"\" >\n";
                 buf << "\t<field name=\"" << rootName << "\" offset=\"0x0.0\""
-                    << " size=\"0x" << hex << ((maxSize >> 5) << 2) << "."
-                    << dec << (maxSize % 32) << "\" subnode=\"" << addPrefix + rootName << "\" descr=\"\" />\n";
+                    << " size=\"0x" << hex << ((maxSize >> 5) << 2) << "." << dec << (maxSize % 32) << "\" subnode=\""
+                    << addPrefix + rootName << "\" descr=\"\" />\n";
                 buf << "</node>\n\n";
 
-                buf << "<node name=\"" + addPrefix + rootName + "\" size=\"0x"
-                    << hex << ((maxSize >> 5) << 2) << "." << dec
-                    << (maxSize % 32)
-                    << "\" attr_is_union=\"1\" descr=\"\" >\n";
+                buf << "<node name=\"" + addPrefix + rootName + "\" size=\"0x" << hex << ((maxSize >> 5) << 2) << "."
+                    << dec << (maxSize % 32) << "\" attr_is_union=\"1\" descr=\"\" >\n";
                 for (size_t i = 0; i < nodeNames.size(); i++)
                 {
-                    AdbNode *node = nodesMap[nodeNames[i]];
-                    buf << "\t<field name=\"" << node->name
-                        << "\" offset=\"0x0.0\" size=\"0x" << hex
-                        << ((node->size >> 5) << 2) << "." << dec
-                        << (node->size % 32) << "\" subnode=\"" + addPrefix + node->name + "\" descr=\"\" />\n";
+                    AdbNode* node = nodesMap[nodeNames[i]];
+                    buf << "\t<field name=\"" << node->name << "\" offset=\"0x0.0\" size=\"0x" << hex
+                        << ((node->size >> 5) << 2) << "." << dec << (node->size % 32)
+                        << "\" subnode=\"" + addPrefix + node->name + "\" descr=\"\" />\n";
                 }
                 buf << "</node>\n";
                 xml += buf.str();
@@ -2497,7 +2554,7 @@ string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName,
         xml += "</NodesDefinition>\n";
         return xml;
     }
-    catch (AdbException &exp)
+    catch (AdbException& exp)
     {
         _lastError = exp.what_s();
         return "";
@@ -2508,17 +2565,17 @@ string Adb::toXml(vector<string> nodeNames, bool addRootNode, string rootName,
  * Function: Adb::addMissingNodes
  **/
 
-AdbInstance *Adb::addMissingNodes(int depth, bool allowMultipleExceptions)
+AdbInstance* Adb::addMissingNodes(int depth, bool allowMultipleExceptions)
 {
     try
     {
         NodesMap::iterator it;
         for (it = nodesMap.begin(); it != nodesMap.end(); it++)
         {
-            AdbNode *nodeDesc = it->second;
+            AdbNode* nodeDesc = it->second;
             for (size_t i = 0; (depth == -1 || depth > 0) && i < nodeDesc->fields.size(); i++)
             {
-                AdbField *fieldDesc = nodeDesc->fields[i];
+                AdbField* fieldDesc = nodeDesc->fields[i];
                 for (u_int32_t i = 0; i < fieldDesc->arrayLen(); i++)
                 {
                     if (fieldDesc->isStruct())
@@ -2527,28 +2584,27 @@ AdbInstance *Adb::addMissingNodes(int depth, bool allowMultipleExceptions)
                         if (it2 == nodesMap.end())
                         {
                             // If in ignore missing nodes mode, it should create temporary node with placeholder
-                            AdbNode *tmpNode = new AdbNode;
+                            AdbNode* tmpNode = new AdbNode;
                             tmpNode->name = fieldDesc->subNode;
                             tmpNode->size = fieldDesc->eSize();
                             tmpNode->desc = fieldDesc->desc + " ***MISSING NODE***";
                             tmpNode->isUnion = false;
                             tmpNode->fileName = "tempForMissingNodes.adb";
                             tmpNode->lineNumber = 0;
-                            AdbField *tmpField = new AdbField;
+                            AdbField* tmpField = new AdbField;
                             tmpField->name = "placeholder";
                             tmpField->desc = "This field is part of auto generated node for missing node.";
                             tmpField->size = tmpNode->size;
                             tmpField->offset = 0;
                             tmpNode->fields.push_back(tmpField);
-                            nodesMap.insert(
-                                pair<string, AdbNode *>(tmpNode->name, tmpNode));
+                            nodesMap.insert(pair<string, AdbNode*>(tmpNode->name, tmpNode));
                         }
                     }
                 }
             }
         }
     }
-    catch (AdbException &exp)
+    catch (AdbException& exp)
     {
         _lastError = exp.what_s();
         if (allowMultipleExceptions)
@@ -2580,13 +2636,15 @@ void Adb::cleanInstAttrs()
 /**
  * Function: Adb::createLayout
  **/
-AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
-                               int depth, bool ignoreMissingNodes,
+AdbInstance* Adb::createLayout(string rootNodeName,
+                               bool isExprEval,
+                               int depth,
+                               bool ignoreMissingNodes,
                                bool allowMultipleExceptions)
 {
     try
     {
-        //find root in nodes map
+        // find root in nodes map
         NodesMap::iterator it;
         it = nodesMap.find(rootNodeName);
         if (it == nodesMap.end())
@@ -2596,9 +2654,9 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                            ExceptionHolder::FATAL_EXCEPTION);
         }
 
-        AdbNode *nodeDesc = it->second;
+        AdbNode* nodeDesc = it->second;
         nodeDesc->inLayout = true;
-        AdbInstance *rootItem = new AdbInstance();
+        AdbInstance* rootItem = new AdbInstance();
         rootItem->fieldDesc = NULL;
         rootItem->nodeDesc = nodeDesc;
         rootItem->parent = NULL;
@@ -2616,12 +2674,10 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
 
         for (size_t i = 0; (depth == -1 || depth > 0) && i < nodeDesc->fields.size(); i++)
         {
-            vector<AdbInstance *> subItems = createInstance(nodeDesc->fields[i],
-                                                            rootItem, emptyVars, isExprEval,
-                                                            depth == -1 ? -1 : depth - 1, ignoreMissingNodes,
-                                                            allowMultipleExceptions);
-            rootItem->subItems.insert(rootItem->subItems.end(),
-                                      subItems.begin(), subItems.end());
+            vector<AdbInstance*> subItems =
+              createInstance(nodeDesc->fields[i], rootItem, emptyVars, isExprEval, depth == -1 ? -1 : depth - 1,
+                             ignoreMissingNodes, allowMultipleExceptions);
+            rootItem->subItems.insert(rootItem->subItems.end(), subItems.begin(), subItems.end());
         }
 
         // Now set the instance attributes (override field attrs), only if this is root node instantiation
@@ -2630,10 +2686,9 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
             for (InstanceAttrs::iterator it = instAttrs.begin(); it != instAttrs.end(); it++)
             {
                 size_t idx = it->first.find(".");
-                string path = idx == string::npos ? string()
-                                                  : it->first.substr(idx + 1);
+                string path = idx == string::npos ? string() : it->first.substr(idx + 1);
 
-                AdbInstance *inst = rootItem->getChildByPath(path);
+                AdbInstance* inst = rootItem->getChildByPath(path);
                 if (!inst)
                 {
                     raiseException(allowMultipleExceptions,
@@ -2653,13 +2708,14 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
         }
 
         /* Evaluate unions selector fields*/
-        for (list<AdbInstance *>::iterator it = _unionSelectorEvalDeffered.begin();
-             it != _unionSelectorEvalDeffered.end(); it++)
+        for (list<AdbInstance*>::iterator it = _unionSelectorEvalDeffered.begin();
+             it != _unionSelectorEvalDeffered.end();
+             it++)
         {
             bool foundSelector = true;
             vector<string> path;
-            AdbInstance *inst = *it;
-            AdbInstance *curInst = inst;
+            AdbInstance* inst = *it;
+            AdbInstance* curInst = inst;
             const string splitVal = inst->getInstanceAttr("union_selector");
             boost::algorithm::split(path, splitVal, boost::is_any_of(string(".")));
             for (size_t i = 0; i < path.size(); i++)
@@ -2667,13 +2723,16 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                 if (path[i] == "#(parent)" || path[i] == "$(parent)")
                 {
                     curInst = curInst->parent;
-                    if  (curInst == NULL || i == path.size()-1) {
+                    if (curInst == NULL || i == path.size() - 1)
+                    {
                         foundSelector = false;
                         if (rootNodeName == rootNode)
                         { // give this warning only if this root instantiation
-                            if (allowMultipleExceptions) cout << "allow multiple";
+                            if (allowMultipleExceptions)
+                                cout << "allow multiple";
                             raiseException(allowMultipleExceptions,
-                                           "Invalid union selector (" + inst->fullName() + "), must be a leaf field, cannot be a parent of root",
+                                           "Invalid union selector (" + inst->fullName() +
+                                             "), must be a leaf field, cannot be a parent of root",
                                            ExceptionHolder::ERROR_EXCEPTION);
                         }
                         break;
@@ -2699,7 +2758,8 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                         if (rootNodeName == rootNode)
                         { // give this warning only if this root instantiation
                             raiseException(allowMultipleExceptions,
-                                           "Failed to find union selector for union (" + inst->fullName() + ") Can't find field (" + path[i] + ") under (" + curInst->fullName() + ")",
+                                           "Failed to find union selector for union (" + inst->fullName() +
+                                             ") Can't find field (" + path[i] + ") under (" + curInst->fullName() + ")",
                                            ExceptionHolder::ERROR_EXCEPTION);
                         }
                         break;
@@ -2707,11 +2767,13 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                 }
             }
 
-            if (foundSelector) {
+            if (foundSelector)
+            {
                 inst->unionSelector = curInst;
                 for (size_t i = 0; i < inst->subItems.size(); i++)
                 {
-                    //printf("Field %s, isResered=%d\n", inst->subItems[i]->fullName().c_str(), inst->subItems[i]->isReserved());
+                    // printf("Field %s, isResered=%d\n", inst->subItems[i]->fullName().c_str(),
+                    // inst->subItems[i]->isReserved());
                     if (inst->subItems[i]->isReserved())
                     {
                         continue;
@@ -2723,8 +2785,9 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                     if (!found)
                     {
                         raiseException(allowMultipleExceptions,
-                                    "In union (" + inst->fullName() + ") the union subnode (" + inst->subItems[i]->name + ") doesn't define selection value",
-                                    ExceptionHolder::ERROR_EXCEPTION);
+                                       "In union (" + inst->fullName() + ") the union subnode (" +
+                                         inst->subItems[i]->name + ") doesn't define selection value",
+                                       ExceptionHolder::ERROR_EXCEPTION);
                     }
 
                     // make sure that all union subnodes selector values are defined in the selector field enum
@@ -2733,11 +2796,11 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                         continue;
                     }
 
-                    if (!inst->unionSelector->isEnumExists()) {
-                        string exceptionTxt = "In union (" + inst->fullName() + ") the union selector (" + inst->unionSelector->fullName() + ") is not an enum";
-                        raiseException(allowMultipleExceptions,
-                                    exceptionTxt,
-                                    ExceptionHolder::ERROR_EXCEPTION);
+                    if (!inst->unionSelector->isEnumExists())
+                    {
+                        string exceptionTxt = "In union (" + inst->fullName() + ") the union selector (" +
+                                              inst->unionSelector->fullName() + ") is not an enum";
+                        raiseException(allowMultipleExceptions, exceptionTxt, ExceptionHolder::ERROR_EXCEPTION);
                         break;
                     }
 
@@ -2751,13 +2814,14 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
                         }
                     }
 
-                    //if not found in map throw exeption
+                    // if not found in map throw exeption
                     if (it == selectorValMap.end())
                     {
-                        string exceptionTxt = "In union (" + inst->fullName() + ") the union subnode (" + inst->subItems[i]->name + ") uses a selector value (" + selectorValIt->second + ") which isn't defined in the selector field (" + inst->unionSelector->fullName() + ")";
-                        raiseException(allowMultipleExceptions,
-                                    exceptionTxt,
-                                    ExceptionHolder::ERROR_EXCEPTION);
+                        string exceptionTxt = "In union (" + inst->fullName() + ") the union subnode (" +
+                                              inst->subItems[i]->name + ") uses a selector value (" +
+                                              selectorValIt->second + ") which isn't defined in the selector field (" +
+                                              inst->unionSelector->fullName() + ")";
+                        raiseException(allowMultipleExceptions, exceptionTxt, ExceptionHolder::ERROR_EXCEPTION);
                     }
                 }
             }
@@ -2770,7 +2834,7 @@ AdbInstance *Adb::createLayout(string rootNodeName, bool isExprEval,
         }
         return rootItem;
     }
-    catch (AdbException &exp)
+    catch (AdbException& exp)
     {
         _lastError = exp.what_s();
         if (allowMultipleExceptions)
@@ -2797,7 +2861,7 @@ vector<string> Adb::getNodeDeps(string nodeName)
         throw AdbException("Can't find node definition for: " + nodeName);
     }
 
-    AdbNode *node = it->second;
+    AdbNode* node = it->second;
     vector<string> deps(1, node->name);
 
     for (size_t i = 0; i < node->fields.size(); i++)
@@ -2818,19 +2882,21 @@ vector<string> Adb::getNodeDeps(string nodeName)
 /**
  * Function: Adb::createInstance
  **/
-vector<AdbInstance *> Adb::createInstance(AdbField *field,
-                                          AdbInstance *parent, map<string, string> vars, bool isExprEval,
-                                          int depth, bool ignoreMissingNodes,
-                                          bool allowMultipleExceptions)
+vector<AdbInstance*> Adb::createInstance(AdbField* field,
+                                         AdbInstance* parent,
+                                         map<string, string> vars,
+                                         bool isExprEval,
+                                         int depth,
+                                         bool ignoreMissingNodes,
+                                         bool allowMultipleExceptions)
 {
-    static const regex EXP_PATTERN(
-        "\\s*([a-zA-Z0-9_]+)=((\\$\\(.*?\\)|\\S+|$)*)\\s*");
+    static const regex EXP_PATTERN("\\s*([a-zA-Z0-9_]+)=((\\$\\(.*?\\)|\\S+|$)*)\\s*");
 
     // if array create instance for each item. else - create 1
-    vector<AdbInstance *> instList;
+    vector<AdbInstance*> instList;
     for (u_int32_t i = 0; i < field->arrayLen(); i++)
     {
-        AdbInstance *inst = new AdbInstance;
+        AdbInstance* inst = new AdbInstance;
         inst->fieldDesc = field;
 
         // if field is struct - find field->subNode in nodes map and addto instance not desc
@@ -2873,7 +2939,8 @@ vector<AdbInstance *> Adb::createInstance(AdbField *field,
             inst->name += "[" + boost::lexical_cast<string>(i + field->lowBound) + "]";
             inst->arrIdx = i;
         }
-        //printf("field: %s, offset: %s (%d)\n", inst->name.c_str(),formatAddr(inst->offset, inst->size).c_str(), inst->offset);
+        // printf("field: %s, offset: %s (%d)\n", inst->name.c_str(),formatAddr(inst->offset, inst->size).c_str(),
+        // inst->offset);
 
         if (isExprEval)
         {
@@ -2883,8 +2950,7 @@ vector<AdbInstance *> Adb::createInstance(AdbField *field,
                 char tmpStr[32];
                 vars["NAME"] = inst->name;
                 vars["ARR_IDX"] = boost::lexical_cast<string>(inst->arrIdx);
-                sprintf(tmpStr, "[%d:%d]", inst->offset % 32 + inst->size - 1,
-                        inst->offset % 32);
+                sprintf(tmpStr, "[%d:%d]", inst->offset % 32 + inst->size - 1, inst->offset % 32);
                 vars["BN"] = tmpStr;
                 vars["parent"] = "#(parent)"; // special internal name
 
@@ -2944,10 +3010,10 @@ vector<AdbInstance *> Adb::createInstance(AdbField *field,
                 }
                 inst->setVarsMap(vars);
             }
-            catch (AdbException &exp)
+            catch (AdbException& exp)
             {
                 string exceptionTxt =
-                    "Failed to evaluate expression for field (" + inst->fullName() + "): " + exp.what_s();
+                  "Failed to evaluate expression for field (" + inst->fullName() + "): " + exp.what_s();
                 if (allowMultipleExceptions)
                 {
                     insertNewException(ExceptionHolder::ERROR_EXCEPTION, exceptionTxt);
@@ -2974,14 +3040,15 @@ vector<AdbInstance *> Adb::createInstance(AdbField *field,
 
         if (field->isStruct() && !inst->nodeDesc->fields.empty() && (depth == -1 || depth > 0))
         {
-            if (inst->nodeDesc->inLayout) {
+            if (inst->nodeDesc->inLayout)
+            {
                 delete inst;
                 raiseException(false,
-                            "Cyclic definition of nodes, node: " + field->name + " was already added to the layout",
-                            ExceptionHolder::ERROR_EXCEPTION);
+                               "Cyclic definition of nodes, node: " + field->name + " was already added to the layout",
+                               ExceptionHolder::ERROR_EXCEPTION);
             }
             inst->nodeDesc->inLayout = true;
-            
+
             // validation 2
             if (inst->size != inst->nodeDesc->size)
             {
@@ -2991,49 +3058,56 @@ vector<AdbInstance *> Adb::createInstance(AdbField *field,
                  ") (" +  boost::lexical_cast<string>(inst->nodeDesc->size) + ")";*/
             }
 
-            vector<AdbField *>::iterator it;
+            vector<AdbField*>::iterator it;
             for (it = inst->nodeDesc->fields.begin(); it != inst->nodeDesc->fields.end(); it++)
             {
                 map<string, string> varsCopy = vars;
-                vector<AdbInstance *> subItems = createInstance(*it, inst, vars,
-                                                                isExprEval, depth == -1 ? -1 : depth - 1,
-                                                                ignoreMissingNodes, allowMultipleExceptions);
-                inst->subItems.insert(inst->subItems.end(), subItems.begin(),
-                                      subItems.end());
-                if (subItems[0]->maxLeafSize > inst->maxLeafSize) {
+                vector<AdbInstance*> subItems =
+                  createInstance(*it, inst, vars, isExprEval, depth == -1 ? -1 : depth - 1, ignoreMissingNodes,
+                                 allowMultipleExceptions);
+                inst->subItems.insert(inst->subItems.end(), subItems.begin(), subItems.end());
+                if (subItems[0]->maxLeafSize > inst->maxLeafSize)
+                {
                     inst->maxLeafSize = subItems[0]->maxLeafSize;
                 }
             }
             inst->nodeDesc->inLayout = false;
 
-            if (_checkDsAlign && inst->maxLeafSize != 0 && inst->size % inst->maxLeafSize != 0) {
+            if (_checkDsAlign && inst->maxLeafSize != 0 && inst->size % inst->maxLeafSize != 0)
+            {
                 raiseException(allowMultipleExceptions,
-                            "Node: " + inst->nodeDesc->name + " size(" + boost::lexical_cast<string>(inst->size) + ") is not aligned with largest leaf(" + boost::lexical_cast<string>(inst->maxLeafSize) + ")",
-                            ExceptionHolder::ERROR_EXCEPTION);
+                               "Node: " + inst->nodeDesc->name + " size(" + boost::lexical_cast<string>(inst->size) +
+                                 ") is not aligned with largest leaf(" +
+                                 boost::lexical_cast<string>(inst->maxLeafSize) + ")",
+                               ExceptionHolder::ERROR_EXCEPTION);
             }
 
             if (!inst->isUnion())
             {
-                stable_sort(inst->subItems.begin(), inst->subItems.end(),
-                            compareFieldsPtr<AdbInstance>);
+                stable_sort(inst->subItems.begin(), inst->subItems.end(), compareFieldsPtr<AdbInstance>);
 
                 for (size_t j = 0; j < inst->subItems.size() - 1; j++)
                 {
-                    //printf("field: %s, offset: %s\n", inst->subItems[j+1]->name.c_str(),formatAddr(inst->subItems[j+1]->offset, inst->subItems[j+1]->size).c_str());
-                    //printf("field: %s, offset: %s\n", inst->subItems[j]->name.c_str(),formatAddr(inst->subItems[j]->offset, inst->subItems[j]->size).c_str());
+                    // printf("field: %s, offset: %s\n",
+                    // inst->subItems[j+1]->name.c_str(),formatAddr(inst->subItems[j+1]->offset,
+                    // inst->subItems[j+1]->size).c_str()); printf("field: %s, offset: %s\n",
+                    // inst->subItems[j]->name.c_str(),formatAddr(inst->subItems[j]->offset,
+                    // inst->subItems[j]->size).c_str());
                     if (inst->subItems[j + 1]->offset < inst->subItems[j]->offset + inst->subItems[j]->size)
                     {
-                        string exceptionTxt = "Field (" + inst->subItems[j + 1]->name + ") (" + formatAddr(inst->subItems[j + 1]->offset, inst->subItems[j + 1]->size).c_str() + ") overlaps with (" + inst->subItems[j]->name + ") (" + formatAddr(inst->subItems[j]->offset, inst->subItems[j]->size).c_str() + ")";
-                        raiseException(allowMultipleExceptions,
-                                       exceptionTxt,
-                                       ExceptionHolder::ERROR_EXCEPTION);
+                        string exceptionTxt =
+                          "Field (" + inst->subItems[j + 1]->name + ") (" +
+                          formatAddr(inst->subItems[j + 1]->offset, inst->subItems[j + 1]->size).c_str() +
+                          ") overlaps with (" + inst->subItems[j]->name + ") (" +
+                          formatAddr(inst->subItems[j]->offset, inst->subItems[j]->size).c_str() + ")";
+                        raiseException(allowMultipleExceptions, exceptionTxt, ExceptionHolder::ERROR_EXCEPTION);
                     }
                 }
             }
         }
 
         u_int32_t esize = inst->fieldDesc->size;
-        if ((field->isLeaf() || field->subNode == "uint64") && (esize == 16 || esize == 32 || esize == 64))//A leaf
+        if ((field->isLeaf() || field->subNode == "uint64") && (esize == 16 || esize == 32 || esize == 64)) // A leaf
         {
             inst->maxLeafSize = esize;
         }
@@ -3047,11 +3121,13 @@ vector<AdbInstance *> Adb::createInstance(AdbField *field,
 /**
  * Function: Adb::checkInstanceOffsetValidity
  **/
-void Adb::checkInstanceOffsetValidity(AdbInstance *inst, AdbInstance *parent, bool allowMultipleExceptions)
+void Adb::checkInstanceOffsetValidity(AdbInstance* inst, AdbInstance* parent, bool allowMultipleExceptions)
 {
     if (inst->offset + inst->size > parent->offset + parent->size)
     {
-        string exceptionTxt = "Field (" + inst->name + ") " + formatAddr(inst->offset, inst->size) + " crosses its parent node (" + parent->name + ") " + formatAddr(parent->offset, parent->size) + " boundaries";
+        string exceptionTxt = "Field (" + inst->name + ") " + formatAddr(inst->offset, inst->size) +
+                              " crosses its parent node (" + parent->name + ") " +
+                              formatAddr(parent->offset, parent->size) + " boundaries";
         if (allowMultipleExceptions)
         {
             insertNewException(ExceptionHolder::ERROR_EXCEPTION, exceptionTxt);
@@ -3066,8 +3142,7 @@ void Adb::checkInstanceOffsetValidity(AdbInstance *inst, AdbInstance *parent, bo
 /**
  * Function: Adb::calcArrOffset
  **/
-u_int32_t Adb::calcArrOffset(AdbField *fieldDesc, AdbInstance *parent,
-                             u_int32_t arrIdx)
+u_int32_t Adb::calcArrOffset(AdbField* fieldDesc, AdbInstance* parent, u_int32_t arrIdx)
 {
     int offs;
 
@@ -3105,7 +3180,7 @@ u_int32_t Adb::calcArrOffset(AdbField *fieldDesc, AdbInstance *parent,
 /**
  * Function: Adb::evalExpr
  **/
-string Adb::evalExpr(string expr, AttrsMap *vars)
+string Adb::evalExpr(string expr, AttrsMap* vars)
 {
     if (expr.find('$') == string::npos)
     {
@@ -3120,7 +3195,7 @@ string Adb::evalExpr(string expr, AttrsMap *vars)
         string vvalue;
         regex singleVar("^[a-zA-Z_][a-zA-Z0-9_]*$");
 
-        //Need to change to array-like initialization when we'll move to c++11
+        // Need to change to array-like initialization when we'll move to c++11
         vector<string> specialVars;
         specialVars.push_back("NAME");
         specialVars.push_back("ARR_IDX");
@@ -3158,49 +3233,48 @@ string Adb::evalExpr(string expr, AttrsMap *vars)
             }
 
             char exp[vname.size() + 1];
-            char *expPtr = exp;
+            char* expPtr = exp;
             strcpy(exp, vname.c_str());
             u_int64_t res;
             _adbExpr.setVars(vars);
             int status = _adbExpr.expr(&expPtr, &res);
             string statusStr;
 
-            //printf("-D- Eval expr \"%s\" = %ul.\n", vname.ascii(), (u_int32_t)res);
+            // printf("-D- Eval expr \"%s\" = %ul.\n", vname.ascii(), (u_int32_t)res);
 
             if (status < 0)
             {
                 switch (status)
                 {
-                case Expr::ERR_RPAR_EXP:
-                    statusStr = "Right parentheses expected";
-                    break;
+                    case Expr::ERR_RPAR_EXP:
+                        statusStr = "Right parentheses expected";
+                        break;
 
-                case Expr::ERR_VALUE_EXP:
-                    statusStr = "Value expected";
-                    break;
+                    case Expr::ERR_VALUE_EXP:
+                        statusStr = "Value expected";
+                        break;
 
-                case Expr::ERR_BIN_EXP:
-                    statusStr = "Binary operation expected ";
-                    break;
+                    case Expr::ERR_BIN_EXP:
+                        statusStr = "Binary operation expected ";
+                        break;
 
-                case Expr::ERR_DIV_ZERO:
-                    statusStr = "Divide zero attempt";
-                    break;
+                    case Expr::ERR_DIV_ZERO:
+                        statusStr = "Divide zero attempt";
+                        break;
 
-                case Expr::ERR_BAD_NUMBER:
-                    statusStr = "Bad constant syntax";
-                    break;
+                    case Expr::ERR_BAD_NUMBER:
+                        statusStr = "Bad constant syntax";
+                        break;
 
-                case Expr::ERR_BAD_NAME:
-                    statusStr = "Variable Name not resolved";
-                    break;
+                    case Expr::ERR_BAD_NAME:
+                        statusStr = "Variable Name not resolved";
+                        break;
 
-                default:
-                    statusStr = "Unknown error";
+                    default:
+                        statusStr = "Unknown error";
                 }
 
-                throw AdbException(
-                    "Error evaluating expression " + expr + " : " + statusStr);
+                throw AdbException("Error evaluating expression " + expr + " : " + statusStr);
             }
 
             vvalue = boost::lexical_cast<string>(res);
@@ -3229,8 +3303,7 @@ bool Adb::checkInstSizeConsistency(bool allowMultipleExceptions)
         {
             if (it->second->fields[i]->isStruct())
             {
-                NodesMap::iterator iter = nodesMap.find(
-                    it->second->fields[i]->subNode);
+                NodesMap::iterator iter = nodesMap.find(it->second->fields[i]->subNode);
                 if (iter == nodesMap.end())
                 {
                     continue;
@@ -3240,18 +3313,14 @@ bool Adb::checkInstSizeConsistency(bool allowMultipleExceptions)
                      return false;
                      */
                 }
-                AdbNode *node = nodesMap[it->second->fields[i]->subNode];
+                AdbNode* node = nodesMap[it->second->fields[i]->subNode];
                 if (node->size != it->second->fields[i]->size / it->second->fields[i]->arrayLen())
                 {
                     char tmp[256];
-                    sprintf(
-                        tmp,
-                        "Node (%s) size 0x%x.%d is not consistent with the instance (%s->%s) size 0x%x.%d",
-                        node->name.c_str(), (node->size >> 5) << 2,
-                        node->size % 32, it->second->name.c_str(),
-                        it->second->fields[i]->name.c_str(),
-                        (it->second->fields[i]->size >> 5) << 2,
-                        it->second->fields[i]->size % 32);
+                    sprintf(tmp, "Node (%s) size 0x%x.%d is not consistent with the instance (%s->%s) size 0x%x.%d",
+                            node->name.c_str(), (node->size >> 5) << 2, node->size % 32, it->second->name.c_str(),
+                            it->second->fields[i]->name.c_str(), (it->second->fields[i]->size >> 5) << 2,
+                            it->second->fields[i]->size % 32);
                     _lastError = tmp;
                     if (allowMultipleExceptions)
                     {
@@ -3287,8 +3356,7 @@ void Adb::print(int indent)
     for (size_t i = 0; i < includePaths.size(); i++)
         cout << indentString(indent + 1) << includePaths[i] << endl;
 
-    cout << indentString(indent) << "Is Big Endian Arrays: " << bigEndianArr
-         << endl;
+    cout << indentString(indent) << "Is Big Endian Arrays: " << bigEndianArr << endl;
     cout << "-------------------------------------" << endl;
     cout << indentString(indent) << "Configs: " << endl;
     for (size_t i = 0; i < configs.size(); i++)
diff --git a/adb_parser/adb_parser.h b/adb_parser/adb_parser.h
index 5edc4b99..c7af067c 100644
--- a/adb_parser/adb_parser.h
+++ b/adb_parser/adb_parser.h
@@ -35,8 +35,6 @@
 #ifndef ADB_ADB_H
 #define ADB_ADB_H
 
-
-
 class LogFile;
 
 #include <map>
@@ -81,7 +79,7 @@ class LogFile;
 #define LC_ALL_HINT ""
 #endif
 
-#define PROGRESS_NODE_CNT   100 // each 100 parsed node call progress callback
+#define PROGRESS_NODE_CNT 100 // each 100 parsed node call progress callback
 
 #ifndef MIN
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -90,9 +88,10 @@ class LogFile;
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #endif
 
-#define CHECK_RUNTIME_ERROR(e) ((strstr(e.what(), "locale::facet::_S_create_c_locale") != NULL) ? \
-                                string("Encoding error, please set locale encoding to C") + LC_ALL_HINT + "." : \
-                                string("runtime_error: ") + e.what())
+#define CHECK_RUNTIME_ERROR(e)                                                         \
+    ((strstr(e.what(), "locale::facet::_S_create_c_locale") != NULL) ?                 \
+       string("Encoding error, please set locale encoding to C") + LC_ALL_HINT + "." : \
+       string("runtime_error: ") + e.what())
 
 using namespace std;
 
@@ -111,7 +110,8 @@ using namespace std;
 
 typedef map<string, string> AttrsMap;
 typedef vector<string> StringVector;
-typedef struct {
+typedef struct
+{
     string fullPath;
     string includedFromFile;
     int includedFromLine;
@@ -121,7 +121,8 @@ typedef map<string, AdbNode*> NodesMap;
 typedef vector<AdbConfig*> ConfigList;
 typedef map<string, AttrsMap> InstanceAttrs;
 typedef map<string, StringVector> ExceptionsMap;
-class Adb {
+class Adb
+{
 public:
     // Methods
     Adb();
@@ -131,21 +132,31 @@ class Adb {
     //   1- dwrod aligned unions
     //   2- contains nodes only
     //   3- check node size vs instance size
-    bool loadFromString(const char *adbContents, bool addReserved = false,
-            bool strict = true,
-            bool enforceExtraChecks = false);
-    bool load(string fname, bool addReserved = false,
-            bool strict = true,
-            string includePath = "", string includeDir = "",
-            bool enforceExtraChecks = false, bool getAllExceptions = false,
-            string logFile = "", bool checkDsAlign = false, bool enforceGuiChecks = false);
-    string toXml(vector<string> nodeNames = vector<string> (),
-            bool addRootNode = false, string rootName = "MainNode",
-            string addPrefix = "");
+    bool loadFromString(const char* adbContents,
+                        bool addReserved = false,
+                        bool strict = true,
+                        bool enforceExtraChecks = false);
+    bool load(string fname,
+              bool addReserved = false,
+              bool strict = true,
+              string includePath = "",
+              string includeDir = "",
+              bool enforceExtraChecks = false,
+              bool getAllExceptions = false,
+              string logFile = "",
+              bool checkDsAlign = false,
+              bool enforceGuiChecks = false);
+    string toXml(vector<string> nodeNames = vector<string>(),
+                 bool addRootNode = false,
+                 string rootName = "MainNode",
+                 string addPrefix = "");
 
     AdbInstance* addMissingNodes(int depth, bool allowMultipleExceptions);
-    AdbInstance* createLayout(string rootNodeName, bool isExprEval = false, int depth = -1, /* -1 means instantiate full tree */
-            bool ignoreMissingNodes = false, bool getAllExceptions = false);
+    AdbInstance* createLayout(string rootNodeName,
+                              bool isExprEval = false,
+                              int depth = -1, /* -1 means instantiate full tree */
+                              bool ignoreMissingNodes = false,
+                              bool getAllExceptions = false);
     vector<string> getNodeDeps(string nodeName);
     string getLastError();
 
@@ -177,14 +188,17 @@ class Adb {
     IncludeFileMap includedFiles;
     StringVector warnings;
     ExceptionsMap adbExceptionMap;
+
 private:
-    vector<AdbInstance*> createInstance(AdbField *fieldDesc,
-            AdbInstance *parent, map<string, string> vars, bool isExprEval,
-            int depth,
-            bool ignoreMissingNodes = false, bool getAllExceptions = false);
-    u_int32_t calcArrOffset(AdbField *fieldDesc, AdbInstance *parent,
-            u_int32_t arrIdx);
-    string evalExpr(string expr, AttrsMap *vars);
+    vector<AdbInstance*> createInstance(AdbField* fieldDesc,
+                                        AdbInstance* parent,
+                                        map<string, string> vars,
+                                        bool isExprEval,
+                                        int depth,
+                                        bool ignoreMissingNodes = false,
+                                        bool getAllExceptions = false);
+    u_int32_t calcArrOffset(AdbField* fieldDesc, AdbInstance* parent, u_int32_t arrIdx);
+    string evalExpr(string expr, AttrsMap* vars);
     bool checkInstSizeConsistency(bool getAllExceptions = false);
     void cleanInstAttrs();
 
@@ -194,7 +208,7 @@ class Adb {
     bool _checkDsAlign;
     bool _enforceGuiChecks;
     list<AdbInstance*> _unionSelectorEvalDeffered;
-    void checkInstanceOffsetValidity(AdbInstance *inst, AdbInstance *parent, bool allowMultipleExceptions);
+    void checkInstanceOffsetValidity(AdbInstance* inst, AdbInstance* parent, bool allowMultipleExceptions);
     void throwExeption(bool allowMultipleExceptions, string exceptionTxt, string addedMsgMultiExp);
 };
 
diff --git a/adb_parser/adb_xmlCreator.cpp b/adb_parser/adb_xmlCreator.cpp
index cacbd53a..5af0d5bc 100644
--- a/adb_parser/adb_xmlCreator.cpp
+++ b/adb_parser/adb_xmlCreator.cpp
@@ -40,34 +40,34 @@
 
 string xmlCreator::indentString(int i)
 {
-  string s;
-  while (i--)
-  {
-    s += "\t";
-  }
-  return s;
+    string s;
+    while (i--)
+    {
+        s += "\t";
+    }
+    return s;
 }
 
 int xmlCreator::dword(int bits)
 {
-  if (bits < 0)
-  {
-    bits -= 31;
-  }
+    if (bits < 0)
+    {
+        bits -= 31;
+    }
 
-  return (bits / 32) * 4;
+    return (bits / 32) * 4;
 }
 
 int xmlCreator::startBit(int bits)
 {
-  return bits % 32;
+    return bits % 32;
 }
 
 string xmlCreator::formatAddr(u_int32_t offs, u_int32_t size)
 {
-  char str[64];
-  sprintf(str, "0x%x.%u:%u", dword(offs), startBit(offs), size);
-  return str;
+    char str[64];
+    sprintf(str, "0x%x.%u:%u", dword(offs), startBit(offs), size);
+    return str;
 }
 
 /*template <class AdbInstance>
@@ -76,44 +76,44 @@ bool xmlCreator::compareFieldsPtr(AdbInstance *f1, AdbInstance *f2)
   return (*f1) < (*f2);
 }*/
 
-string xmlCreator::encodeXml(const string &data)
+string xmlCreator::encodeXml(const string& data)
 {
-  std::string buffer;
-  buffer.reserve(data.size());
-  for (size_t pos = 0; pos != data.size(); ++pos)
-  {
-    switch (data[pos])
+    std::string buffer;
+    buffer.reserve(data.size());
+    for (size_t pos = 0; pos != data.size(); ++pos)
     {
-    case '&':
-      buffer.append("&amp;");
-      break;
+        switch (data[pos])
+        {
+            case '&':
+                buffer.append("&amp;");
+                break;
 
-    case '\"':
-      buffer.append("&quot;");
-      break;
+            case '\"':
+                buffer.append("&quot;");
+                break;
 
-    case '\'':
-      buffer.append("&apos;");
-      break;
+            case '\'':
+                buffer.append("&apos;");
+                break;
 
-    case '<':
-      buffer.append("&lt;");
-      break;
+            case '<':
+                buffer.append("&lt;");
+                break;
 
-    case '>':
-      buffer.append("&gt;");
-      break;
+            case '>':
+                buffer.append("&gt;");
+                break;
 
-    default:
-      buffer.append(1, data.at(pos));
-      break;
+            default:
+                buffer.append(1, data.at(pos));
+                break;
+        }
     }
-  }
 
-  return buffer;
+    return buffer;
 }
 
-string xmlCreator::descNativeToXml(const string &desc)
+string xmlCreator::descNativeToXml(const string& desc)
 {
-  return boost::replace_all_copy(desc, "\n", "\\;");
+    return boost::replace_all_copy(desc, "\n", "\\;");
 }
diff --git a/adb_parser/adb_xmlCreator.h b/adb_parser/adb_xmlCreator.h
index 3fc95e04..8721912f 100644
--- a/adb_parser/adb_xmlCreator.h
+++ b/adb_parser/adb_xmlCreator.h
@@ -32,7 +32,6 @@
  *
  */
 
-
 #ifndef xmlCreator_H
 #define xmlCreator_H
 
@@ -43,20 +42,19 @@ using namespace std;
 
 namespace xmlCreator
 {
-
-  template <class T>
-  bool compareFieldsPtr(T *f1, T *f2);
-  string indentString(int i);
-  int dword(int bits);
-  int startBit(int bits);
-  string formatAddr(u_int32_t offs, u_int32_t size);
-  string encodeXml(const string &data);
-  string descNativeToXml(const string &desc);
-
-}
-
-template <class T>
-bool xmlCreator::compareFieldsPtr(T *f1, T *f2)
+template<class T>
+bool compareFieldsPtr(T* f1, T* f2);
+string indentString(int i);
+int dword(int bits);
+int startBit(int bits);
+string formatAddr(u_int32_t offs, u_int32_t size);
+string encodeXml(const string& data);
+string descNativeToXml(const string& desc);
+
+} // namespace xmlCreator
+
+template<class T>
+bool xmlCreator::compareFieldsPtr(T* f1, T* f2)
 {
     return (*f1) < (*f2);
 }
diff --git a/adb_parser/buf_ops.cpp b/adb_parser/buf_ops.cpp
index f951d285..38ff070f 100644
--- a/adb_parser/buf_ops.cpp
+++ b/adb_parser/buf_ops.cpp
@@ -36,83 +36,95 @@
 #include "buf_ops.h"
 
 /************************************
-* Function: calc_array_field_address
-************************************/
-static u_int32_t calc_array_field_address(u_int32_t start_bit_offset, u_int32_t arr_elemnt_size,
-                                          int arr_idx, u_int32_t parent_node_size,
+ * Function: calc_array_field_address
+ ************************************/
+static u_int32_t calc_array_field_address(u_int32_t start_bit_offset,
+                                          u_int32_t arr_elemnt_size,
+                                          int arr_idx,
+                                          u_int32_t parent_node_size,
                                           int is_big_endian_arr)
 {
     u_int32_t offs;
 
-    if (arr_elemnt_size > 32) {
+    if (arr_elemnt_size > 32)
+    {
         assert(!(arr_elemnt_size % 32));
         start_bit_offset += arr_elemnt_size * arr_idx;
         return start_bit_offset;
     }
 
-    if (is_big_endian_arr) {
+    if (is_big_endian_arr)
+    {
         u_int32_t dword_delta;
         offs = start_bit_offset - arr_elemnt_size * arr_idx;
         dword_delta = (((start_bit_offset >> 5) << 2) - ((offs >> 5) << 2)) / 4;
-        if (dword_delta) {
+        if (dword_delta)
+        {
             offs += 64 * dword_delta;
         }
-    } else {
+    }
+    else
+    {
         offs = start_bit_offset + arr_elemnt_size * arr_idx;
     }
 
-    //printf("==> parent_node_size=%d, offs=%d, arr_elemnt_size=%d\n", parent_node_size, offs, arr_elemnt_size);
+    // printf("==> parent_node_size=%d, offs=%d, arr_elemnt_size=%d\n", parent_node_size, offs, arr_elemnt_size);
     return TOOLS_MIN(32, parent_node_size) - (offs % 32) - arr_elemnt_size + ((offs >> 5) << 5);
 }
 
 /************************************
-* Function: push_integer_to_buff
-************************************/
-static void push_integer_to_buff(u_int8_t *buff, u_int32_t bit_offset,  u_int32_t byte_size, u_int64_t field_value)
+ * Function: push_integer_to_buff
+ ************************************/
+static void push_integer_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size, u_int64_t field_value)
 {
     field_value = CPU_TO_BE64(field_value);
     memcpy(buff + bit_offset / 8, (u_int8_t*)&field_value + (8 - byte_size), byte_size);
 }
 
 /************************************
-* Function: push_bits_to_buff
-************************************/
-//the next function will push the field into the buffer by inserting it's MSB bits first
-//and therefore by doing it we save the CPU_TO_BE operation
-static void push_bits_to_buff(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
+ * Function: push_bits_to_buff
+ ************************************/
+// the next function will push the field into the buffer by inserting it's MSB bits first
+// and therefore by doing it we save the CPU_TO_BE operation
+static void push_bits_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
 {
-    u_int32_t i         = 0;
-    u_int32_t byte_n    = bit_offset / 8;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8;
     u_int32_t byte_n_offset = bit_offset % 8;
     u_int32_t to_push;
 
-    //going over all bits in field
-    while (i < field_size) {
+    // going over all bits in field
+    while (i < field_size)
+    {
         to_push = TOOLS_MIN(8 - byte_n_offset, field_size - i);
         i += to_push;
-        BYTE_N(buff, byte_n) = INSERTF(BYTE_N(buff, byte_n), 8 - to_push - byte_n_offset, field_value, field_size - i, to_push);
-        byte_n_offset  = 0; //(byte_n_offset + to_push) % 8;
+        BYTE_N(buff, byte_n) =
+          INSERTF(BYTE_N(buff, byte_n), 8 - to_push - byte_n_offset, field_value, field_size - i, to_push);
+        byte_n_offset = 0; //(byte_n_offset + to_push) % 8;
         byte_n++;
     }
 }
 
 /************************************
-* Function: push_to_buf
-************************************/
-void push_to_buf(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value)
+ * Function: push_to_buf
+ ************************************/
+void push_to_buf(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value)
 {
     bit_offset = calc_array_field_address(bit_offset, field_size, 0, field_size + 32, 0);
-    if (field_size <= 32) {
+    if (field_size <= 32)
+    {
         push_bits_to_buff(buff, bit_offset, field_size, field_value);
-    } else {
-        push_integer_to_buff(buff, bit_offset, field_size / 8,  field_value);
+    }
+    else
+    {
+        push_integer_to_buff(buff, bit_offset, field_size / 8, field_value);
     }
 }
 
 /************************************
-* Function: pop_integer_from_buff
-************************************/
-static u_int64_t pop_integer_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t byte_size)
+ * Function: pop_integer_from_buff
+ ************************************/
+static u_int64_t pop_integer_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size)
 {
     u_int64_t val = 0;
     memcpy((u_int8_t*)&val + (8 - byte_size), buff + bit_offset / 8, byte_size);
@@ -120,24 +132,25 @@ static u_int64_t pop_integer_from_buff(const u_int8_t *buff, u_int32_t bit_offse
 }
 
 /************************************
-* Function: pop_bits_from_buff
-************************************/
-//the next function will pop the field into the buffer by removing it's MSB bits first
-//and therefore by doing it we save the BE_TO_CPU operation
-static u_int32_t pop_bits_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+ * Function: pop_bits_from_buff
+ ************************************/
+// the next function will pop the field into the buffer by removing it's MSB bits first
+// and therefore by doing it we save the BE_TO_CPU operation
+static u_int32_t pop_bits_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
-    u_int32_t i         = 0;
-    u_int32_t byte_n    = bit_offset / 8;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8;
     u_int32_t byte_n_offset = bit_offset % 8;
-    u_int32_t field_32  = 0;
+    u_int32_t field_32 = 0;
     u_int32_t to_pop;
 
-    //going over all bits in field
-    while (i < field_size) {
-        to_pop =  TOOLS_MIN(8 - byte_n_offset, field_size - i);
+    // going over all bits in field
+    while (i < field_size)
+    {
+        to_pop = TOOLS_MIN(8 - byte_n_offset, field_size - i);
         i += to_pop;
         field_32 = INSERTF(field_32, field_size - i, BYTE_N(buff, byte_n), 8 - to_pop - byte_n_offset, to_pop);
-        byte_n_offset  = 0; //(byte_n_offset + to_pop) % 8;
+        byte_n_offset = 0; //(byte_n_offset + to_pop) % 8;
         byte_n++;
     }
 
@@ -145,40 +158,46 @@ static u_int32_t pop_bits_from_buff(const u_int8_t *buff, u_int32_t bit_offset,
 }
 
 /************************************
-* Function: pop_from_buf
-************************************/
-u_int64_t pop_from_buf(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+ * Function: pop_from_buf
+ ************************************/
+u_int64_t pop_from_buf(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
     bit_offset = calc_array_field_address(bit_offset, field_size, 0, field_size + 32, 0);
 
-    if (field_size <= 32) {
+    if (field_size <= 32)
+    {
         return pop_bits_from_buff(buff, bit_offset, field_size);
-    } else {
+    }
+    else
+    {
         return pop_integer_from_buff(buff, bit_offset, field_size / 8);
     }
 }
 
 /************************************
-* Function: add_indentation
-************************************/
-static void add_indentation(FILE *file, int indent_level)
+ * Function: add_indentation
+ ************************************/
+static void add_indentation(FILE* file, int indent_level)
 {
-    while (indent_level) {
+    while (indent_level)
+    {
         fprintf(file, "\\t");
         indent_level--;
     }
 }
 
 /************************************
-* Function: print_raw
-************************************/
-void print_raw(FILE *file, void *buff, int buff_len)
+ * Function: print_raw
+ ************************************/
+void print_raw(FILE* file, void* buff, int buff_len)
 {
-    u_int8_t *data = (u_int8_t*)buff;
+    u_int8_t* data = (u_int8_t*)buff;
     int i;
     add_indentation(file, 0);
-    for (i = 0; i < buff_len; i++) {
-        if (!(i % 4)) {
+    for (i = 0; i < buff_len; i++)
+    {
+        if (!(i % 4))
+        {
             fprintf(file, "\n0x%08x: ", i);
         }
 
diff --git a/adb_parser/buf_ops.h b/adb_parser/buf_ops.h
index 5ebf05c2..3d9c08f0 100644
--- a/adb_parser/buf_ops.h
+++ b/adb_parser/buf_ops.h
@@ -47,7 +47,7 @@
 /************************************/
 /************************************/
 /************************************/
-void print_raw(FILE *file, void *buff, int buff_len);
-u_int64_t pop_from_buf(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size);
-void push_to_buf(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value);
+void print_raw(FILE* file, void* buff, int buff_len);
+u_int64_t pop_from_buf(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size);
+void push_to_buf(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value);
 #endif // BIT_OPS_H
diff --git a/adb_parser/expr.cpp b/adb_parser/expr.cpp
index bf1d73a2..c63c3546 100644
--- a/adb_parser/expr.cpp
+++ b/adb_parser/expr.cpp
@@ -38,9 +38,8 @@
 #include <string.h>
 #include "expr.h"
 
-
-char*Expr::str;
-char*Expr::initial_arg;
+char* Expr::str;
+char* Expr::initial_arg;
 Expr::status Expr::state;
 
 /*
@@ -51,51 +50,51 @@ Expr::status Expr::state;
 /*
  * Unary prefixes which present radix
  */
-#define RADIX16    "0x"
-#define RADIX2     "0b"
+#define RADIX16 "0x"
+#define RADIX2 "0b"
 
 /*
  * Unary operations
  */
-#define ULOGNOT    71   /* !    */
-#define UMINUS     72   /* -    */
-#define UNOT       73   /* ~    */
-#define UPLUS      74   /* +    */
-#define U2POW      75   /* :    */
-#define U2POW_ALT  76   /* POW2 */
-#define ULOG2      77   /* '    */
-#define ULOG2_ALT  78   /* LOG2 */
-#define SWAP32     79   /* SWAP32 */
-#define SWAP16     80   /* SWAP16 */
+#define ULOGNOT 71   /* !    */
+#define UMINUS 72    /* -    */
+#define UNOT 73      /* ~    */
+#define UPLUS 74     /* +    */
+#define U2POW 75     /* :    */
+#define U2POW_ALT 76 /* POW2 */
+#define ULOG2 77     /* '    */
+#define ULOG2_ALT 78 /* LOG2 */
+#define SWAP32 79    /* SWAP32 */
+#define SWAP16 80    /* SWAP16 */
 
 /*
  * Binary operations
  */
-#define AND       1     /* &&     */
-#define BIT_AND   2     /* &      */
-#define BIT_OR    3     /* |      */
-#define BIT_XOR   4     /* ^      */
-#define DIVID     5     /* /      */
-#define EQ        6     /* ==     */
-#define GREAT     7     /* >      */
-#define GREAT_EQ  8     /* >=     */
-#define LESS      9     /* <      */
-#define LESS_EQ   10    /* <=     */
-#define MINUS     11    /* -      */
-#define MODUL     12    /* %      */
-#define MULT      13    /* *      */
-#define NOTEQ     14    /* !=     */
-#define OR        15    /* ||     */
-#define PLUS      16    /* +      */
-#define SHIFT_L   17    /* <<     */
-#define SHIFT_R   18    /* >>     */
-#define XOR       19    /* log.xor*/
+#define AND 1      /* &&     */
+#define BIT_AND 2  /* &      */
+#define BIT_OR 3   /* |      */
+#define BIT_XOR 4  /* ^      */
+#define DIVID 5    /* /      */
+#define EQ 6       /* ==     */
+#define GREAT 7    /* >      */
+#define GREAT_EQ 8 /* >=     */
+#define LESS 9     /* <      */
+#define LESS_EQ 10 /* <=     */
+#define MINUS 11   /* -      */
+#define MODUL 12   /* %      */
+#define MULT 13    /* *      */
+#define NOTEQ 14   /* !=     */
+#define OR 15      /* ||     */
+#define PLUS 16    /* +      */
+#define SHIFT_L 17 /* <<     */
+#define SHIFT_R 18 /* >>     */
+#define XOR 19     /* log.xor*/
 
 /*
  * Other token types
  */
-#define VALUE     103   /* Name or constant */
-#define EXPR_OK   0     /* Expression getted successfully */
+#define VALUE 103 /* Name or constant */
+#define EXPR_OK 0 /* Expression getted successfully */
 
 /*
  * Miscellaneous constant
@@ -103,146 +102,112 @@ Expr::status Expr::state;
 #ifdef IGNORE
 #undef IGNORE
 #endif
-#define IGNORE    " \t\n\r" /* Ignore in parsing */
-#define HIGH_PRI  1
-#define LOW_PRI   9
+#define IGNORE " \t\n\r" /* Ignore in parsing */
+#define HIGH_PRI 1
+#define LOW_PRI 9
 
 /*
  * Unary operations. Priority not applicable,
  * all unary operations have same priority.
  */
-static Expr::table unar[] = {
-    { U2POW,     0, ":"      },
-    { U2POW_ALT, 0, "POW2"   },
-    { ULOG2,     0, "'"      },
-    { ULOG2_ALT, 0, "LOG2"   },
-    { ULOGNOT,   0, "!"      },
-    { UMINUS,    0, "-"      },
-    { UNOT,      0, "~"      },
-    { UPLUS,     0, "+"      },
-    { SWAP32,    0, "SWAP32" },
-    { SWAP16,    0, "SWAP16" }
-};
+static Expr::table unar[] = {{U2POW, 0, ":"},       {U2POW_ALT, 0, "POW2"}, {ULOG2, 0, "'"}, {ULOG2_ALT, 0, "LOG2"},
+                             {ULOGNOT, 0, "!"},     {UMINUS, 0, "-"},       {UNOT, 0, "~"},  {UPLUS, 0, "+"},
+                             {SWAP32, 0, "SWAP32"}, {SWAP16, 0, "SWAP16"}};
 static int Lunar = numbel(unar);
 
 /*
  * Binary operations.
  */
 static Expr::table binar[] = {
-    { MODUL,    1, "%"        },
-    { MULT,     1, "*"        },
-    { DIVID,    1, "/"        },
-    { PLUS,     2, "+"        },
-    { MINUS,    2, "-"        },
-    { SHIFT_L,  3, "<<"       },
-    { SHIFT_L,  3, "SHIFT_L"  },
-    { SHIFT_R,  3, ">>"       },
-    { SHIFT_R,  3, "SHIFT_R"  },
-    { GREAT,    4, ">"        },
-    { GREAT,    4, "GREAT"    },
-    { GREAT_EQ, 4, ">="       },
-    { GREAT_EQ, 4, "GREAT_EQ" },
-    { LESS,     4, "<"        },
-    { LESS,     4, "LESS"     },
-    { LESS_EQ,  4, "<="       },
-    { LESS_EQ,  4, "LESS_EQ"  },
-    { EQ,       5, "=="       },
-    { EQ,       5, "EQ"       },
-    { NOTEQ,    5, "!="       },
-    { NOTEQ,    5, "NOTEQ"    },
-    { BIT_AND,  6, "&"        },
-    { BIT_AND,  6, "BIT_AND"  },
-    { BIT_OR,   7, "|"        },
-    { BIT_OR,   7, "BIT_OR"   },
-    { BIT_XOR,  7, "^"        },
-    { BIT_XOR,  7, "BIT_XOR"  },
-    { AND,      8, "&&"       },
-    { AND,      8, "AND"      },
-    { OR,       9, "||"       },
-    { OR,       9, "OR"       },
-    { XOR,      9, "XOR"      }
-};
+  {MODUL, 1, "%"},           {MULT, 1, "*"},     {DIVID, 1, "/"},         {PLUS, 2, "+"},
+  {MINUS, 2, "-"},           {SHIFT_L, 3, "<<"}, {SHIFT_L, 3, "SHIFT_L"}, {SHIFT_R, 3, ">>"},
+  {SHIFT_R, 3, "SHIFT_R"},   {GREAT, 4, ">"},    {GREAT, 4, "GREAT"},     {GREAT_EQ, 4, ">="},
+  {GREAT_EQ, 4, "GREAT_EQ"}, {LESS, 4, "<"},     {LESS, 4, "LESS"},       {LESS_EQ, 4, "<="},
+  {LESS_EQ, 4, "LESS_EQ"},   {EQ, 5, "=="},      {EQ, 5, "EQ"},           {NOTEQ, 5, "!="},
+  {NOTEQ, 5, "NOTEQ"},       {BIT_AND, 6, "&"},  {BIT_AND, 6, "BIT_AND"}, {BIT_OR, 7, "|"},
+  {BIT_OR, 7, "BIT_OR"},     {BIT_XOR, 7, "^"},  {BIT_XOR, 7, "BIT_XOR"}, {AND, 8, "&&"},
+  {AND, 8, "AND"},           {OR, 9, "||"},      {OR, 9, "OR"},           {XOR, 9, "XOR"}};
 static int Lbinar = numbel(binar);
 
-
 /********************************************************
-* routine:     expr
-*
-* description:
-*     Main routine for expression evaluation. Do some interface
-*     functions and call binary operation evaluation with lowest
-*     priority.
-*
-* arguments:
-*     pstr            pointer to string which contains expression to
-*                     evaluation. After successfully evaluation expr
-*                     moves this pointer to end of expression (first
-*                     unparsed character).
-*     result          pointer to unsigned long to put result of expression.
-*     dr              default radix for numbers.
-*     ErrorRep        pointer to callbeck routine for error reporting.
-*                     arguments - like printf.
-*
-* return code:
-*     >0              length of evaluated expression.
-*     <0              error code, one of following:
-*        ERR_RPAR_EXP   - Right parentheses expected.
-*        ERR_VALUE_EXP  - Value expected.
-*        ERR_BIN_EXP    - Binary operation expected. It is a normal situation
-*                         on experssion end.
-*        ERR_DIV_ZERO   - Divide zero attempt.
-*        ERR_BAD_NUMBER - Bad constant syntax.
-*        ERR_BAD_NAME   - Name not found in symbol table.
-*
-********************************************************/
-int Expr::expr(char **pstr, u_int64_t *result)
+ * routine:     expr
+ *
+ * description:
+ *     Main routine for expression evaluation. Do some interface
+ *     functions and call binary operation evaluation with lowest
+ *     priority.
+ *
+ * arguments:
+ *     pstr            pointer to string which contains expression to
+ *                     evaluation. After successfully evaluation expr
+ *                     moves this pointer to end of expression (first
+ *                     unparsed character).
+ *     result          pointer to unsigned long to put result of expression.
+ *     dr              default radix for numbers.
+ *     ErrorRep        pointer to callbeck routine for error reporting.
+ *                     arguments - like printf.
+ *
+ * return code:
+ *     >0              length of evaluated expression.
+ *     <0              error code, one of following:
+ *        ERR_RPAR_EXP   - Right parentheses expected.
+ *        ERR_VALUE_EXP  - Value expected.
+ *        ERR_BIN_EXP    - Binary operation expected. It is a normal situation
+ *                         on experssion end.
+ *        ERR_DIV_ZERO   - Divide zero attempt.
+ *        ERR_BAD_NUMBER - Bad constant syntax.
+ *        ERR_BAD_NAME   - Name not found in symbol table.
+ *
+ ********************************************************/
+int Expr::expr(char** pstr, u_int64_t* result)
 {
     int rc = 0;
     int len = 0;
 
-    str         = *pstr;
+    str = *pstr;
     initial_arg = *pstr;
-    state       = was_bin;
+    state = was_bin;
 
     /* Operation(s) found, do really evaluation. */
     rc = GetBinaryOp(result, LOW_PRI);
-    if (rc == EXPR_OK  ||
-        rc == ERR_BIN_EXP) {
+    if (rc == EXPR_OK || rc == ERR_BIN_EXP)
+    {
         len = (int)(str - *pstr);
         *pstr = str;
         return len;
-    } else {
+    }
+    else
+    {
         return rc;
     }
 }
 
-
 /********************************************************
-* routine:     GetBinaryOp
-*
-* description:
-*     Executes binary operations with current priority level.
-*     If priority great then constant HIGH_PRI, calls itself
-*     recursive with decreased priority to get  operands for
-*     expression, otherwise calls GetUnaryOp to get operands.
-*
-* arguments:
-*     val             Pointer to unsigned long where result of
-*                     operation will be placed.
-*     priority        Execute operation only with this priority
-*
-* return code:
-*     EXPR_OK         Binary operation was calculated successfully
-*     ERR_DIV_ZERO    Zero divide attempt
-*     otherwise       Error code from GetUnaryOp (see)
-*
-* side effects:
-*     Attention, deep recursion...
-*
-********************************************************/
-int Expr::GetBinaryOp(u_int64_t *val, int priority)
+ * routine:     GetBinaryOp
+ *
+ * description:
+ *     Executes binary operations with current priority level.
+ *     If priority great then constant HIGH_PRI, calls itself
+ *     recursive with decreased priority to get  operands for
+ *     expression, otherwise calls GetUnaryOp to get operands.
+ *
+ * arguments:
+ *     val             Pointer to unsigned long where result of
+ *                     operation will be placed.
+ *     priority        Execute operation only with this priority
+ *
+ * return code:
+ *     EXPR_OK         Binary operation was calculated successfully
+ *     ERR_DIV_ZERO    Zero divide attempt
+ *     otherwise       Error code from GetUnaryOp (see)
+ *
+ * side effects:
+ *     Attention, deep recursion...
+ *
+ ********************************************************/
+int Expr::GetBinaryOp(u_int64_t* val, int priority)
 {
-    char      *str_old;
+    char* str_old;
     int rc = 0;
     int i = 0;
     u_int64_t left = 0;
@@ -250,21 +215,24 @@ int Expr::GetBinaryOp(u_int64_t *val, int priority)
     token curr;
     status stat_old;
 
-    rc = priority > HIGH_PRI ? GetBinaryOp(&left, priority - 1) :
-         GetUnaryOp(&left);
-    if (rc != EXPR_OK) {
+    rc = priority > HIGH_PRI ? GetBinaryOp(&left, priority - 1) : GetUnaryOp(&left);
+    if (rc != EXPR_OK)
+    {
         return rc;
     }
 
-    for (;;) {
+    for (;;)
+    {
         str_old = str;
         stat_old = state;
         GetToken(&curr);
-        for (i = 0; i < Lbinar; i++) {
-            if (binar[i].type == curr.type  &&  binar[i].pri == priority) {
-                rc = priority > HIGH_PRI ? GetBinaryOp(&right, priority - 1) :
-                     GetUnaryOp(&right);
-                if (rc != EXPR_OK) {
+        for (i = 0; i < Lbinar; i++)
+        {
+            if (binar[i].type == curr.type && binar[i].pri == priority)
+            {
+                rc = priority > HIGH_PRI ? GetBinaryOp(&right, priority - 1) : GetUnaryOp(&right);
+                if (rc != EXPR_OK)
+                {
                     str = str_old;
                     state = stat_old;
                     return rc;
@@ -272,94 +240,97 @@ int Expr::GetBinaryOp(u_int64_t *val, int priority)
 
                 switch (curr.type)
                 {
-                case MODUL:
-                    if (right == 0) {
-                        ErrorReport("Zero modulo attempt.\n");
-                        return ERR_DIV_ZERO;
-                    }
-                    left = left % right;
-                    break;
-
-                case MULT:
-                    left = left * right;
-                    break;
-
-                case DIVID:
-                    if (right == 0) {
-                        ErrorReport("Zero divide attempt.\n");
-                        return ERR_DIV_ZERO;
-                    }
-                    left = left / right;
-                    break;
-
-                case PLUS:
-                    left = left + right;
-                    break;
-
-                case MINUS:
-                    left = left - right;
-                    break;
-
-                case SHIFT_L:
-                    left = (left << (int)right);
-                    break;
-
-                case SHIFT_R:
-                    left = (left >> (int)right);
-                    break;
-
-                case GREAT:
-                    left = (left > right);
-                    break;
-
-                case GREAT_EQ:
-                    left = (left >= right);
-                    break;
-
-                case LESS:
-                    left = (left < right);
-                    break;
-
-                case LESS_EQ:
-                    left = (left <= right);
-                    break;
-
-                case EQ:
-                    left = (left == right);
-                    break;
-
-                case NOTEQ:
-                    left = (left != right);
-                    break;
-
-                case BIT_AND:
-                    left = left & right;
-                    break;
-
-                case BIT_OR:
-                    left = left | right;
-                    break;
-
-                case BIT_XOR:
-                    left = left ^ right;
-                    break;
-
-                case AND:
-                    left = (left && right);
-                    break;
-
-                case OR:
-                    left = (left || right);
-                    break;
-
-                case XOR:
-                    left = (left && !right)  ||  (!left && right);
-                    break;
+                    case MODUL:
+                        if (right == 0)
+                        {
+                            ErrorReport("Zero modulo attempt.\n");
+                            return ERR_DIV_ZERO;
+                        }
+                        left = left % right;
+                        break;
+
+                    case MULT:
+                        left = left * right;
+                        break;
+
+                    case DIVID:
+                        if (right == 0)
+                        {
+                            ErrorReport("Zero divide attempt.\n");
+                            return ERR_DIV_ZERO;
+                        }
+                        left = left / right;
+                        break;
+
+                    case PLUS:
+                        left = left + right;
+                        break;
+
+                    case MINUS:
+                        left = left - right;
+                        break;
+
+                    case SHIFT_L:
+                        left = (left << (int)right);
+                        break;
+
+                    case SHIFT_R:
+                        left = (left >> (int)right);
+                        break;
+
+                    case GREAT:
+                        left = (left > right);
+                        break;
+
+                    case GREAT_EQ:
+                        left = (left >= right);
+                        break;
+
+                    case LESS:
+                        left = (left < right);
+                        break;
+
+                    case LESS_EQ:
+                        left = (left <= right);
+                        break;
+
+                    case EQ:
+                        left = (left == right);
+                        break;
+
+                    case NOTEQ:
+                        left = (left != right);
+                        break;
+
+                    case BIT_AND:
+                        left = left & right;
+                        break;
+
+                    case BIT_OR:
+                        left = left | right;
+                        break;
+
+                    case BIT_XOR:
+                        left = left ^ right;
+                        break;
+
+                    case AND:
+                        left = (left && right);
+                        break;
+
+                    case OR:
+                        left = (left || right);
+                        break;
+
+                    case XOR:
+                        left = (left && !right) || (!left && right);
+                        break;
                 }
                 break;
             }
         }
-        if (i >= Lbinar) {
+        if (i >= Lbinar)
+        {
             UngetToken(curr);
             *val = left;
             return EXPR_OK;
@@ -367,23 +338,22 @@ int Expr::GetBinaryOp(u_int64_t *val, int priority)
     }
 }
 
-
 /********************************************************
-* routine:     GetUnaryOp
-*
-* description:
-*     Executes unary operations.
-*
-* arguments:
-*     val             Pointer to unsigned long where result of
-*                     operation will be placed.
-*
-* return code:
-*     EXPR_OK         Binary operation was calculated successfully
-*     otherwise       Error code from GetToken (see)
-*
-********************************************************/
-int Expr::GetUnaryOp(u_int64_t *val)
+ * routine:     GetUnaryOp
+ *
+ * description:
+ *     Executes unary operations.
+ *
+ * arguments:
+ *     val             Pointer to unsigned long where result of
+ *                     operation will be placed.
+ *
+ * return code:
+ *     EXPR_OK         Binary operation was calculated successfully
+ *     otherwise       Error code from GetToken (see)
+ *
+ ********************************************************/
+int Expr::GetUnaryOp(u_int64_t* val)
 {
     int rc, unary_op;
     u_int64_t tmp = 0;
@@ -394,112 +364,110 @@ int Expr::GetUnaryOp(u_int64_t *val)
     GetToken(&curr);
     switch (unary_op = curr.type)
     {
-    case U2POW:
-    case U2POW_ALT:
-    case ULOG2:
-    case ULOG2_ALT:
-    case ULOGNOT:
-    case UMINUS:
-    case UNOT:
-    case UPLUS:
-    case SWAP32:
-    case SWAP16:
-        /*
-         * Was unary operation - retrieve more token.
-         */
-        rc = GetUnaryOp(val);
-        if (rc != EXPR_OK) {
-            return rc;
-        }
-
-        /* OK, execute required unary operation. */
-        switch (unary_op)
-        {
-        case U2POW_ALT:
         case U2POW:
-            *val = (u_int64_t)1 << (int)(*val);
-            break;
-
-        case ULOG2_ALT:
+        case U2POW_ALT:
         case ULOG2:
-            if (*val != 0) {
-                for (tmp = 1, tmp1 = 0; tmp < *val; tmp = tmp << 1)
-                    ++tmp1;
-                *val = tmp1;
+        case ULOG2_ALT:
+        case ULOGNOT:
+        case UMINUS:
+        case UNOT:
+        case UPLUS:
+        case SWAP32:
+        case SWAP16:
+            /*
+             * Was unary operation - retrieve more token.
+             */
+            rc = GetUnaryOp(val);
+            if (rc != EXPR_OK)
+            {
+                return rc;
             }
-            break;
 
-        case ULOGNOT:
-            *val = !(*val);
-            break;
+            /* OK, execute required unary operation. */
+            switch (unary_op)
+            {
+                case U2POW_ALT:
+                case U2POW:
+                    *val = (u_int64_t)1 << (int)(*val);
+                    break;
 
-        case UMINUS:
-            *val = (u_int64_t)(-((int64_t)(*val)));
-            break;
+                case ULOG2_ALT:
+                case ULOG2:
+                    if (*val != 0)
+                    {
+                        for (tmp = 1, tmp1 = 0; tmp < *val; tmp = tmp << 1)
+                            ++tmp1;
+                        *val = tmp1;
+                    }
+                    break;
 
-        case UNOT:
-            *val = ~(*val);
-            break;
+                case ULOGNOT:
+                    *val = !(*val);
+                    break;
 
-        case UPLUS:
-            break;
+                case UMINUS:
+                    *val = (u_int64_t)(-((int64_t)(*val)));
+                    break;
 
-        case SWAP32:
-            *val = ((tmpVal & 0x000000FFUL) << 24)  |
-                   ((tmpVal & 0x0000FF00UL) << 8)   |
-                   ((tmpVal & 0x00FF0000UL) >> 8)   |
-                   ((tmpVal & 0xFF000000UL) >> 24);
-            break;
+                case UNOT:
+                    *val = ~(*val);
+                    break;
 
-        case SWAP16:
-            *val = ((tmpVal & 0xFF000000U) >> 8) |
-                   ((tmpVal & 0x00FF0000U) << 8) |
-                   ((tmpVal & 0x0000FF00U) >> 8) |
-                   ((tmpVal & 0x000000FFU) << 8);
+                case UPLUS:
+                    break;
+
+                case SWAP32:
+                    *val = ((tmpVal & 0x000000FFUL) << 24) | ((tmpVal & 0x0000FF00UL) << 8) |
+                           ((tmpVal & 0x00FF0000UL) >> 8) | ((tmpVal & 0xFF000000UL) >> 24);
+                    break;
+
+                case SWAP16:
+                    *val = ((tmpVal & 0xFF000000U) >> 8) | ((tmpVal & 0x00FF0000U) << 8) |
+                           ((tmpVal & 0x0000FF00U) >> 8) | ((tmpVal & 0x000000FFU) << 8);
+                    break;
+            }
             break;
-        }
-        break;
 
-    case VALUE:
-        /*
-         * Unary operation is omitted. Assume no unary operations.
-         */
-        *val = curr.value;
-        break;
+        case VALUE:
+            /*
+             * Unary operation is omitted. Assume no unary operations.
+             */
+            *val = curr.value;
+            break;
 
-    default:
-        /*
-         * Here we expect only unary operation or value.
-         * Something other - error. Bring error code witch
-         * present by curr.type to caller.
-         */
-        UngetToken(curr);
-        return curr.type;
+        default:
+            /*
+             * Here we expect only unary operation or value.
+             * Something other - error. Bring error code witch
+             * present by curr.type to caller.
+             */
+            UngetToken(curr);
+            return curr.type;
     }
 
     return EXPR_OK;
 }
 
 /********************************************************
-* routine:     GetToken
-*
-* description:
-*     Gets next token from static pointer str.
-*
-* arguments:
-*     pt              pointer to token. GetToken fills in all
-*                     field by this pointer.
-*
-* return code:
-*     None
-*
-* side effects:
-*     1. May insrease pointer str (if token getted successfully).
-*     2. May change static variable state (if token getted
-*        successfully and state was changed).
-*
-********************************************************/
-void Expr::GetToken(token *pt)
+ * routine:     GetToken
+ *
+ * description:
+ *     Gets next token from static pointer str.
+ *
+ * arguments:
+ *     pt              pointer to token. GetToken fills in all
+ *                     field by this pointer.
+ *
+ * return code:
+ *     None
+ *
+ * side effects:
+ *     1. May insrease pointer str (if token getted successfully).
+ *     2. May change static variable state (if token getted
+ *        successfully and state was changed).
+ *
+ ********************************************************/
+void Expr::GetToken(token* pt)
 {
     char *old_str, *p;
     int i, rc, oplen;
@@ -507,10 +475,12 @@ void Expr::GetToken(token *pt)
     /*
      * Skip all leading ignorable characters
      */
-    do {
+    do
+    {
         old_str = str;
         for (p = (char*)IGNORE; *p; p++)
-            if (*str == *p) {
+            if (*str == *p)
+            {
                 str++;
             }
     } while ((old_str != str) && *str);
@@ -519,215 +489,248 @@ void Expr::GetToken(token *pt)
     pt->sta = state;
     switch (state)
     {
-    case was_bin:
-        /*
-         * Was binary operation (or begin of experssion).
-         * Unary operation expected.
-         * Try find unary operation with maximal length.
-         */
-        oplen = 0;
-        for (i = 0; i < Lunar; i++)
-            if (!strncmp(unar[i].st, str, strlen(unar[i].st))) {
-                if ((int)strlen(unar[i].st) > oplen) {
-                    pt->type = unar[i].type;
-                    oplen = strlen(unar[i].st);
-                }
-            }
-        if (oplen) {
-            /* Unary operation found. */
-            str += oplen;
-            state = was_bin;
-            return;
-        }
-
-        /*
-         * Unary operation not found.
-         * Number or name expected.
-         */
-        if (!strncmp(str, RADIX16, strlen(RADIX16))
-            ||  !strncmp(str, RADIX2, strlen(RADIX2))) {
+        case was_bin:
             /*
-             * Number expected.
+             * Was binary operation (or begin of experssion).
+             * Unary operation expected.
+             * Try find unary operation with maximal length.
              */
-            rc = GetNumb(&pt->value);
-            if (rc == EXPR_OK) {
-                pt->type = VALUE;
-            } else {
-                pt->type = rc;
+            oplen = 0;
+            for (i = 0; i < Lunar; i++)
+                if (!strncmp(unar[i].st, str, strlen(unar[i].st)))
+                {
+                    if ((int)strlen(unar[i].st) > oplen)
+                    {
+                        pt->type = unar[i].type;
+                        oplen = strlen(unar[i].st);
+                    }
+                }
+            if (oplen)
+            {
+                /* Unary operation found. */
+                str += oplen;
+                state = was_bin;
                 return;
             }
-        } else if (valid_name(*str) || valid_digit(*str, def_radix)) {
+
             /*
-             * Name or number expected.
+             * Unary operation not found.
+             * Number or name expected.
              */
-            rc = GetName(&pt->value);
-            if (rc == EXPR_OK) {
-                pt->type = VALUE;
-            } else {
-                pt->type = rc;
-                return;
+            if (!strncmp(str, RADIX16, strlen(RADIX16)) || !strncmp(str, RADIX2, strlen(RADIX2)))
+            {
+                /*
+                 * Number expected.
+                 */
+                rc = GetNumb(&pt->value);
+                if (rc == EXPR_OK)
+                {
+                    pt->type = VALUE;
+                }
+                else
+                {
+                    pt->type = rc;
+                    return;
+                }
             }
-        } else if (*str == '(') {
-            /*
-             * Parentheses expression expected.
-             */
-            old_str = str++;
-            rc = GetBinaryOp(&pt->value, LOW_PRI);
-            if (rc == EXPR_OK) {
-                pt->type = VALUE;
-            } else {
-                pt->type = rc;
-                return;
+            else if (valid_name(*str) || valid_digit(*str, def_radix))
+            {
+                /*
+                 * Name or number expected.
+                 */
+                rc = GetName(&pt->value);
+                if (rc == EXPR_OK)
+                {
+                    pt->type = VALUE;
+                }
+                else
+                {
+                    pt->type = rc;
+                    return;
+                }
             }
-            if (*str == ')') {
-                str++;
-            } else {
-                /* error, right parentheses expected. */
-                pt->type = ERR_RPAR_EXP;
-                if (*str) {
-                    ErrorReport("Instead of\"" + std::string(str) + "\" right parentheses expected.\n");
-                } else {
-                    ErrorReport("Unexpected end in expression \"" + std::string(initial_arg) + "\" - right parentheses expected.\n");
+            else if (*str == '(')
+            {
+                /*
+                 * Parentheses expression expected.
+                 */
+                old_str = str++;
+                rc = GetBinaryOp(&pt->value, LOW_PRI);
+                if (rc == EXPR_OK)
+                {
+                    pt->type = VALUE;
+                }
+                else
+                {
+                    pt->type = rc;
+                    return;
+                }
+                if (*str == ')')
+                {
+                    str++;
+                }
+                else
+                {
+                    /* error, right parentheses expected. */
+                    pt->type = ERR_RPAR_EXP;
+                    if (*str)
+                    {
+                        ErrorReport("Instead of\"" + std::string(str) + "\" right parentheses expected.\n");
+                    }
+                    else
+                    {
+                        ErrorReport("Unexpected end in expression \"" + std::string(initial_arg) +
+                                    "\" - right parentheses expected.\n");
+                    }
+                    str = old_str;
+                    return;
                 }
-                str = old_str;
-                return;
             }
-        } else {
-            /* error, number or name or unary operation expected. */
-            pt->type = ERR_VALUE_EXP;
-            if (*str) {
-                ErrorReport("Instead of \"" + std::string(str) + "\" value or unary operation expected.\n");
-            } else {
-                ErrorReport("Unexpected end in expression \"" + std::string(initial_arg) + "\" - value or unary operation expected.\n");
+            else
+            {
+                /* error, number or name or unary operation expected. */
+                pt->type = ERR_VALUE_EXP;
+                if (*str)
+                {
+                    ErrorReport("Instead of \"" + std::string(str) + "\" value or unary operation expected.\n");
+                }
+                else
+                {
+                    ErrorReport("Unexpected end in expression \"" + std::string(initial_arg) +
+                                "\" - value or unary operation expected.\n");
+                }
+                return;
             }
+            state = was_opr;
             return;
-        }
-        state = was_opr;
-        return;
 
-    case was_opr:
-        /*
-         * Was operand. Binary operation expected
-         * Try find binary operation with maximal length.
-         */
-        oplen = 0;
-        for (i = 0; i < Lbinar; i++)
-            if (!strncmp(binar[i].st, str, strlen(binar[i].st))) {
-                if ((int)strlen(binar[i].st) > oplen) {
-                    oplen = strlen(binar[i].st);
-                    pt->type = binar[i].type;
+        case was_opr:
+            /*
+             * Was operand. Binary operation expected
+             * Try find binary operation with maximal length.
+             */
+            oplen = 0;
+            for (i = 0; i < Lbinar; i++)
+                if (!strncmp(binar[i].st, str, strlen(binar[i].st)))
+                {
+                    if ((int)strlen(binar[i].st) > oplen)
+                    {
+                        oplen = strlen(binar[i].st);
+                        pt->type = binar[i].type;
+                    }
                 }
+            if (oplen)
+            {
+                /* Binary operation found. */
+                str += oplen;
+                state = was_bin;
+                return;
             }
-        if (oplen) {
-            /* Binary operation found. */
-            str += oplen;
-            state = was_bin;
-            return;
-        }
 
-        /* error, binary operation expected. */
-        pt->type = ERR_BIN_EXP;
-        return;
+            /* error, binary operation expected. */
+            pt->type = ERR_BIN_EXP;
+            return;
     }
 }
 
 /********************************************************
-* routine:     UngetToken
-*
-* description:
-*     Ungets previously getted token.
-*
-* arguments:
-*     t               token to unget
-*
-* return code:
-*     None
-*
-* side effects:
-*     1. Restores str as was before token.
-*     2. Restores state as was before token
-*
-********************************************************/
+ * routine:     UngetToken
+ *
+ * description:
+ *     Ungets previously getted token.
+ *
+ * arguments:
+ *     t               token to unget
+ *
+ * return code:
+ *     None
+ *
+ * side effects:
+ *     1. Restores str as was before token.
+ *     2. Restores state as was before token
+ *
+ ********************************************************/
 void Expr::UngetToken(token t)
 {
     str = t.beg;
     state = t.sta;
 }
 
-
 /********************************************************
-* routine:     GetNumb
-*
-* description:
-*     Gets constant from str. First character of constant may
-*     be special value to set radix (% for 2, & for 10 and $ for 16).
-*
-* arguments:
-*     val              pointer to unsigned long to put constatnt value.
-*
-* return code:
-*     EXPR_OK        - Constant OK
-*     ERR_BAD_NUMBER - Bad constant syntax
-*
-* side effects:
-*     Moves pointer str to end of constant.
-*
-********************************************************/
-int Expr::GetNumb(u_int64_t *val)
+ * routine:     GetNumb
+ *
+ * description:
+ *     Gets constant from str. First character of constant may
+ *     be special value to set radix (% for 2, & for 10 and $ for 16).
+ *
+ * arguments:
+ *     val              pointer to unsigned long to put constatnt value.
+ *
+ * return code:
+ *     EXPR_OK        - Constant OK
+ *     ERR_BAD_NUMBER - Bad constant syntax
+ *
+ * side effects:
+ *     Moves pointer str to end of constant.
+ *
+ ********************************************************/
+int Expr::GetNumb(u_int64_t* val)
 {
     int radix = def_radix;
 
-    if (!strncmp(str, RADIX16, strlen(RADIX16))) {
+    if (!strncmp(str, RADIX16, strlen(RADIX16)))
+    {
         radix = 16;
         str += strlen(RADIX16);
-    } else if (!strncmp(str, RADIX2, strlen(RADIX2))) {
+    }
+    else if (!strncmp(str, RADIX2, strlen(RADIX2)))
+    {
         radix = 2;
         str += strlen(RADIX2);
     }
 
-    if (!valid_digit(*str, radix)) {
+    if (!valid_digit(*str, radix))
+    {
         ErrorReport("\"" + std::string(str) + "\" -- bad constant syntax.\n");
         return ERR_BAD_NUMBER;
     }
 
     *val = 0L;
     for (; valid_digit(*str, radix); str++)
-        *val = *val * radix +
-               ( ('a' <= *str && *str <= 'f') ? *str - 'a' + 10 :
-                                                ( ('A' <= *str && *str <= 'F') ? *str - 'A' + 10 :
-                                                                                 *str - '0'));
+        *val =
+          *val * radix + (('a' <= *str && *str <= 'f') ? *str - 'a' + 10 :
+                                                         (('A' <= *str && *str <= 'F') ? *str - 'A' + 10 : *str - '0'));
 
     return EXPR_OK;
 }
 
-
 /********************************************************
-* routine:     GetName
-*
-* description:
-*     Gets name from str and tries to find it in symbol
-*     table. If name looks as constant in "def_radix",
-*     interprets it as constant rather than name.
-*
-* arguments:
-*     val          - pointer to unsigned long to put value
-*
-* return code:
-*     EXPR_OK      - Name successfully found in symbol table and
-*                    substituted by its value.
-*     ERR_BAD_NAME - Name not found in symbol table.
-*
-* side effects:
-*     Moves pointer str to end of name.
-*
-********************************************************/
+ * routine:     GetName
+ *
+ * description:
+ *     Gets name from str and tries to find it in symbol
+ *     table. If name looks as constant in "def_radix",
+ *     interprets it as constant rather than name.
+ *
+ * arguments:
+ *     val          - pointer to unsigned long to put value
+ *
+ * return code:
+ *     EXPR_OK      - Name successfully found in symbol table and
+ *                    substituted by its value.
+ *     ERR_BAD_NAME - Name not found in symbol table.
+ *
+ * side effects:
+ *     Moves pointer str to end of name.
+ *
+ ********************************************************/
 #define MAXNAM 100
-int Expr::GetName(u_int64_t *val)
+int Expr::GetName(u_int64_t* val)
 {
     static char name[MAXNAM];
-    char        *p, *old_str;
+    char *p, *old_str;
 
-    old_str = str;     /* Save start name position. */
+    old_str = str; /* Save start name position. */
 
     /* Get name. */
     for (p = name; valid_name(*str);)
@@ -736,10 +739,12 @@ int Expr::GetName(u_int64_t *val)
 
     /* Try interpret as constant first. */
     for (p = name; *p; p++)
-        if (!valid_digit(*p, def_radix)) {
+        if (!valid_digit(*p, def_radix))
+        {
             break;
         }
-    if (!*p) {
+    if (!*p)
+    {
         /*
          * All characters of this name are valid digit in radix
          * "def_radix". So, interpret this name as constant.
@@ -750,79 +755,80 @@ int Expr::GetName(u_int64_t *val)
 
     /* Retrieve name from symbol table. */
     /* -------------------------------- */
-    if (ResolveName(name, val) == 0) {
+    if (ResolveName(name, val) == 0)
+    {
         return EXPR_OK;
-    } else {
-        ErrorReport("Symbolic name \"" +  std::string(name) + "\" not resolved.\n");
+    }
+    else
+    {
+        ErrorReport("Symbolic name \"" + std::string(name) + "\" not resolved.\n");
         return ERR_BAD_NAME;
     }
 }
 
 /********************************************************
-* routine:     valid_name
-*
-* description:
-*     Function checks if character may be part of symbolic name.
-*
-* arguments:
-*     ch           - character to check
-*
-* return code:
-*     0 - character is not valid
-*     1 - character is valid
-*
-********************************************************/
+ * routine:     valid_name
+ *
+ * description:
+ *     Function checks if character may be part of symbolic name.
+ *
+ * arguments:
+ *     ch           - character to check
+ *
+ * return code:
+ *     0 - character is not valid
+ *     1 - character is valid
+ *
+ ********************************************************/
 int Expr::valid_name(char ch)
 {
     return (ch == '_' || ch == '.') ? 1 : isalnum(ch);
 }
 
 /********************************************************
-* routine:     valid_digit
-*
-* description:
-*     Check validity of digit ch (in ASCII, ex. '1') according to radix 'radix'.
-*
-* arguments:
-*     ch           - character to check
-*     radix        - radix
-*
-* return code:
-*     0 - character is not valid
-*     1 - character is valid
-*
-********************************************************/
+ * routine:     valid_digit
+ *
+ * description:
+ *     Check validity of digit ch (in ASCII, ex. '1') according to radix 'radix'.
+ *
+ * arguments:
+ *     ch           - character to check
+ *     radix        - radix
+ *
+ * return code:
+ *     0 - character is not valid
+ *     1 - character is valid
+ *
+ ********************************************************/
 int Expr::valid_digit(char ch, int radix)
 {
     switch (radix)
     {
-    case 2:
-        return (ch == '0' || ch == '1') ? 1 : 0;
+        case 2:
+            return (ch == '0' || ch == '1') ? 1 : 0;
 
-    case 10:
-        return isdigit(ch);
+        case 10:
+            return isdigit(ch);
 
-    case 16:
-        return isxdigit(ch);
+        case 16:
+            return isxdigit(ch);
 
-    default:
-        return 1;
+        default:
+            return 1;
     }
 }
 
-
 /********************************************************
-* routine:     ErrorReport
-*
-* description:
-*     Error reporting
-*
-* arguments:
-*     like printf
-*
-********************************************************/
+ * routine:     ErrorReport
+ *
+ * description:
+ *     Error reporting
+ *
+ * arguments:
+ *     like printf
+ *
+ ********************************************************/
 void Expr::ErrorReport(const std::string& msg)
 {
-    Error(msg);    
+    Error(msg);
 }
-
diff --git a/adb_parser/expr.h b/adb_parser/expr.h
index b99b8b76..a530951d 100644
--- a/adb_parser/expr.h
+++ b/adb_parser/expr.h
@@ -102,67 +102,69 @@
 
 #include <common/compatibility.h>
 
-
 class Expr
 {
 public:
     // Error codes
-    enum {
-        ERR_RPAR_EXP  = -1,   // Right parentheses expected
-        ERR_VALUE_EXP = -2,   // Value expected
-        ERR_BIN_EXP   = -3,   // Binary operation expected (normal at end)
-        ERR_DIV_ZERO  = -4,   // Divide zero attempt
-        ERR_BAD_NUMBER = -5,   // Bad constant syntax
-        ERR_BAD_NAME  = -6    // Name not resolved
+    enum
+    {
+        ERR_RPAR_EXP = -1,   // Right parentheses expected
+        ERR_VALUE_EXP = -2,  // Value expected
+        ERR_BIN_EXP = -3,    // Binary operation expected (normal at end)
+        ERR_DIV_ZERO = -4,   // Divide zero attempt
+        ERR_BAD_NUMBER = -5, // Bad constant syntax
+        ERR_BAD_NAME = -6    // Name not resolved
     };
-    Expr() : def_radix(10) { }
-    virtual ~Expr()        { }
+    Expr() : def_radix(10) {}
+    virtual ~Expr() {}
 
-    int     expr(char **pstr, u_int64_t *result);
+    int expr(char** pstr, u_int64_t* result);
 
     /* Current state of parsing. */
-    typedef enum {
-        was_bin,          /* was binary operation */
-        was_opr           /* was operand          */
+    typedef enum
+    {
+        was_bin, /* was binary operation */
+        was_opr  /* was operand          */
     } status;
 
     /* Token as it read by parser. */
-    typedef struct {
-        char      *beg;  /* pointer to token begining                         */
+    typedef struct
+    {
+        char* beg;       /* pointer to token begining                         */
         status sta;      /* state of parser before this token                 */
         int type;        /* type of token (any operation, VALUE or error code */
         u_int64_t value; /* if type == VALUE value of token                   */
     } token;
 
     /* Table of operations. */
-    typedef struct {
-        int type;         /* type of operation - internal number */
-        int pri;          /* priority of this operation          */
-        const char *st;         /* string which cause this operation   */
+    typedef struct
+    {
+        int type;       /* type of operation - internal number */
+        int pri;        /* priority of this operation          */
+        const char* st; /* string which cause this operation   */
     } table;
 
 private:
-
-    static char    *str;
-    static char    *initial_arg;
+    static char* str;
+    static char* initial_arg;
     static status state;
     int def_radix;
 
-    int     GetBinaryOp(u_int64_t *val, int priority);
-    int     GetUnaryOp(u_int64_t *val);
-    void    GetToken(token *pt);
-    void    UngetToken(token t);
-    int     GetNumb(u_int64_t *val);
-    int     GetName(u_int64_t *val);
-    int     valid_digit(char ch, int radix);
-    int     valid_name(char ch);
+    int GetBinaryOp(u_int64_t* val, int priority);
+    int GetUnaryOp(u_int64_t* val);
+    void GetToken(token* pt);
+    void UngetToken(token t);
+    int GetNumb(u_int64_t* val);
+    int GetName(u_int64_t* val);
+    int valid_digit(char ch, int radix);
+    int valid_name(char ch);
 
-    void    ErrorReport(const std::string& msg);
+    void ErrorReport(const std::string& msg);
 
     /*
      * Pure virtual methods. You must define them to use expr.
      */
-    virtual int  ResolveName(char *name, u_int64_t *val) = 0;
+    virtual int ResolveName(char* name, u_int64_t* val) = 0;
     virtual void Error(const std::string& msg) = 0;
 };
 
diff --git a/cmdif/cmdif.py b/cmdif/cmdif.py
index afbdd7bc..a6422860 100755
--- a/cmdif/cmdif.py
+++ b/cmdif/cmdif.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 from __future__ import print_function
 import os
@@ -37,18 +37,23 @@
 import ctypes
 import mtcr
 
+
 def ones(n):
     return (1 << n) - 1
 
+
 def extractField(val, start, size):
-    return (val & (ones(size)<<start)) >> start
+    return (val & (ones(size) << start)) >> start
+
 
 def insertField(val1, start1, val2, start2, size):
-    return val1 & ~(ones(size)<<start1) | (extractField(val2, start2, size) << start1)
+    return val1 & ~(ones(size) << start1) | (extractField(val2, start2, size) << start1)
+
 
 class CmdIfException(Exception):
     pass
 
+
 ##########################
 CMDIF = None
 try:
@@ -56,12 +61,12 @@ class CmdIfException(Exception):
     if platform.system() == "Windows" or os.name == "nt":
         try:
             CMDIF = CDLL("libcmdif-1.dll")
-        except:
+        except BaseException:
             CMDIF = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libcmdif-1.dll"))
     else:
         try:
             CMDIF = CDLL("ccmdif.so")
-        except:
+        except BaseException:
             CMDIF = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "ccmdif.so"))
 except Exception as exp:
     raise CmdIfException("Failed to load shared library ccmdif.so/libcmdif-1.dll: %s" % exp)
@@ -96,17 +101,17 @@ def __del__(self):
         ##########################
         def sendCmd(self, opcode, data, skipWrite):
             self.mstDev.icmdSendCmd(opcode, data, skipWrite)
-        
+
         ##########################
         def setItrace(self, mask, level, log_delay=0):
             class ITRACE_ST(Structure):
                 _fields_ = [("unit_mask", c_uint32), ("log_level", c_uint8), ("log_delay", c_uint16)]
-                
+
             setItraceStruct = pointer(ITRACE_ST(mask, level, log_delay))
             rc = self.setItraceFunc(self.mstDev.mf, setItraceStruct)
             if rc:
                 raise CmdIfException("Failed to set itrace mask: %s (%d)" % (self.errStrFunc(rc), rc))
-            
+
         ##########################
         def getFwInfo(self):
             class FW_INFO_ST(Structure):
@@ -125,17 +130,17 @@ class FW_INFO_ST(Structure):
 
         ##########################
         class MH_SYNC_ST(Structure):
-            _fields_ = [("input_state",                 c_uint8),
-                        ("input_sync_type",             c_uint8),
-                        ("input_ignore_inactive_host",  c_uint8),
-                        ("fsm_state",                   c_uint8),
-                        ("fsm_sync_type",               c_uint8),
-                        ("fsm_ignore_inactive_host",    c_uint8),
-                        ("fsm_host_ready",              c_uint8),
-                        ("fsm_start_uptime",            c_uint32)]
+            _fields_ = [("input_state", c_uint8),
+                        ("input_sync_type", c_uint8),
+                        ("input_ignore_inactive_host", c_uint8),
+                        ("fsm_state", c_uint8),
+                        ("fsm_sync_type", c_uint8),
+                        ("fsm_ignore_inactive_host", c_uint8),
+                        ("fsm_host_ready", c_uint8),
+                        ("fsm_start_uptime", c_uint32)]
 
         ##########################
-        def multiHostSync(self, state, syncType, ignoreInactiveHost = 0x0):
+        def multiHostSync(self, state, syncType, ignoreInactiveHost=0x0):
             multiHostSyncOutStruct = self.MH_SYNC_ST()
             multiHostSyncOutStructPtr = pointer(multiHostSyncOutStruct)
             multiHostSyncOutStructPtr.contents.input_ignore_inactive_host = c_uint8(ignoreInactiveHost)
@@ -157,30 +162,30 @@ def multiHostSyncStatus(self):
 
         ##########################
         class QUERY_CAP_ST(Structure):
-            _fields_ = [("golden_tlv_version",                     c_uint8),
-                        ("cwcam_reg",                              c_uint8),
-                        ("capability_groups",                      c_uint8),
-                        ("virtual_link_down",                      c_uint8),
-                        ("icmd_exmb",                              c_uint8),
-                        ("capi",                                   c_uint8),
-                        ("qcam_reg",                               c_uint8),
-                        ("mcam_reg",                               c_uint8),
-                        ("pcam_reg",                               c_uint8),
-                        ("mh_sync",                                c_uint8),
+            _fields_ = [("golden_tlv_version", c_uint8),
+                        ("cwcam_reg", c_uint8),
+                        ("capability_groups", c_uint8),
+                        ("virtual_link_down", c_uint8),
+                        ("icmd_exmb", c_uint8),
+                        ("capi", c_uint8),
+                        ("qcam_reg", c_uint8),
+                        ("mcam_reg", c_uint8),
+                        ("pcam_reg", c_uint8),
+                        ("mh_sync", c_uint8),
                         ("allow_icmd_access_reg_on_all_registers", c_uint8),
-                        ("fw_info_psid",                           c_uint8),
-                        ("nv_access",                              c_uint8),
-                        ("wol_p",                                  c_uint8),
-                        ("wol_u",                                  c_uint8),
-                        ("wol_m",                                  c_uint8),
-                        ("wol_b",                                  c_uint8),
-                        ("wol_a",                                  c_uint8),
-                        ("wol_g",                                  c_uint8),
-                        ("wol_s",                                  c_uint8),
-                        ("rol_g",                                  c_uint8),
-                        ("rol_s",                                  c_uint8),
-                        ("fpga",                                   c_uint8),
-                        ("num_of_diagnostic_counters",             c_uint16)]
+                        ("fw_info_psid", c_uint8),
+                        ("nv_access", c_uint8),
+                        ("wol_p", c_uint8),
+                        ("wol_u", c_uint8),
+                        ("wol_m", c_uint8),
+                        ("wol_b", c_uint8),
+                        ("wol_a", c_uint8),
+                        ("wol_g", c_uint8),
+                        ("wol_s", c_uint8),
+                        ("rol_g", c_uint8),
+                        ("rol_s", c_uint8),
+                        ("fpga", c_uint8),
+                        ("num_of_diagnostic_counters", c_uint16)]
 
         ##########################
         def isMultiHostSyncSupported(self):
@@ -198,5 +203,5 @@ def isMultiHostSyncSupported(self):
 if __name__ == "__main__":
     mstdev = mtcr.MstDevice("/dev/mst/mt4113_pciconf0")
     cmdif = CmdIf(mstdev)
-    
+
     cmdif.setItrace(0x1001, 8)
diff --git a/cmdif/icmd_cif_common.c b/cmdif/icmd_cif_common.c
index 108c8d23..202350b5 100644
--- a/cmdif/icmd_cif_common.c
+++ b/cmdif/icmd_cif_common.c
@@ -46,70 +46,70 @@ char* gcif_get_last_err()
  */
 char* gcif_err_str(int rc)
 {
+    switch (rc)
+    {
+        case GCIF_STATUS_SUCCESS:
+            return "OK";
 
-    switch (rc) {
-    case GCIF_STATUS_SUCCESS:
-        return "OK";
+        case GCIF_STATUS_INVALID_OPCODE:
+            return "Invalid opcode";
 
-    case GCIF_STATUS_INVALID_OPCODE:
-        return "Invalid opcode";
+        case GCIF_STATUS_INVALID_CMD:
+            return "Invalid cmd";
 
-    case GCIF_STATUS_INVALID_CMD:
-        return "Invalid cmd";
+        case GCIF_STATUS_OPERATIONAL_ERROR:
+            return "Operational error";
 
-    case GCIF_STATUS_OPERATIONAL_ERROR:
-        return "Operational error";
+        case GCIF_STATUS_CR_FAIL:
+            return "cr-space access failure";
 
-    case GCIF_STATUS_CR_FAIL:
-        return "cr-space access failure";
+        case GCIF_STATUS_BAD_OPCODE:
+            return "unsupported opcode was used";
 
-    case GCIF_STATUS_BAD_OPCODE:
-        return "unsupported opcode was used";
+        case GCIF_STATUS_SEMAPHORE_TO:
+            return "timed out while trying to take semaphore";
 
-    case GCIF_STATUS_SEMAPHORE_TO:
-        return "timed out while trying to take semaphore";
+        case GCIF_STATUS_EXECUTE_TO:
+            return "timed out while waiting for command to execute";
 
-    case GCIF_STATUS_EXECUTE_TO:
-        return "timed out while waiting for command to execute";
+        case GCIF_STATUS_IFC_BUSY:
+            return "command-interface is busy executing another command";
 
-    case GCIF_STATUS_IFC_BUSY:
-        return "command-interface is busy executing another command";
+        case GCIF_STATUS_BAD_PARAMETERS:
+            return "bad parameter";
 
-    case GCIF_STATUS_BAD_PARAMETERS:
-        return "bad parameter";
+        case GCIF_STATUS_ICMD_NOT_READY:
+            return "command interface not ready";
 
-    case GCIF_STATUS_ICMD_NOT_READY:
-        return "command interface not ready";
+        case GCIF_STATUS_BAD_PARAM:
+            return "command interface bad param";
 
-    case GCIF_STATUS_BAD_PARAM:
-        return "command interface bad param";
+        case GCIF_STATUS_UNSUPPORTED_ICMD_VERSION:
+            return "Unsupported icmd version";
 
-    case GCIF_STATUS_UNSUPPORTED_ICMD_VERSION:
-        return "Unsupported icmd version";
+        case GCIF_STATUS_UNKNOWN_STATUS:
+            return "Unknown ICMD Status.";
 
-    case GCIF_STATUS_UNKNOWN_STATUS:
-        return "Unknown ICMD Status.";
+        case GCIF_STATUS_GENERAL_ERROR:
+            return "General error";
 
-    case GCIF_STATUS_GENERAL_ERROR:
-        return "General error";
+        case GCIF_SIZE_EXCEEDS_LIMIT:
+            return "Size exceeds limit";
 
-    case GCIF_SIZE_EXCEEDS_LIMIT:
-        return "Size exceeds limit";
+        case GCIF_ICMD_NOT_SUPPORTED:
+            return "icmd not supported";
 
-    case GCIF_ICMD_NOT_SUPPORTED:
-        return "icmd not supported";
+        case GCIF_ICMD_INIT_FAILED:
+            return "icmd initialization failed";
 
-    case GCIF_ICMD_INIT_FAILED:
-        return "icmd initialization failed";
+        case GCIF_ICMD_BUSY:
+            return "icmd busy";
 
-    case GCIF_ICMD_BUSY:
-        return "icmd busy";
+        case GCIF_STATUS_ICM_NOT_AVAIL:
+            return "ICM not available";
 
-    case GCIF_STATUS_ICM_NOT_AVAIL:
-        return "ICM not available";
-
-    default:
-        return "Unknown error";
+        default:
+            return "Unknown error";
     }
 }
 
@@ -119,60 +119,61 @@ char* gcif_err_str(int rc)
 
 int convert_rc(int rc)
 {
-    switch (rc) {
-    case ME_ICMD_STATUS_CR_FAIL:
-        return GCIF_STATUS_CR_FAIL;
+    switch (rc)
+    {
+        case ME_ICMD_STATUS_CR_FAIL:
+            return GCIF_STATUS_CR_FAIL;
 
-    case ME_ICMD_STATUS_SEMAPHORE_TO:
-        return GCIF_STATUS_SEMAPHORE_TO;
+        case ME_ICMD_STATUS_SEMAPHORE_TO:
+            return GCIF_STATUS_SEMAPHORE_TO;
 
-    case ME_ICMD_STATUS_EXECUTE_TO:
-        return GCIF_STATUS_EXECUTE_TO;
+        case ME_ICMD_STATUS_EXECUTE_TO:
+            return GCIF_STATUS_EXECUTE_TO;
 
-    case ME_ICMD_STATUS_IFC_BUSY:
-        return GCIF_STATUS_IFC_BUSY;
+        case ME_ICMD_STATUS_IFC_BUSY:
+            return GCIF_STATUS_IFC_BUSY;
 
-    case ME_ICMD_STATUS_ICMD_NOT_READY:
-        return GCIF_STATUS_ICMD_NOT_READY;
+        case ME_ICMD_STATUS_ICMD_NOT_READY:
+            return GCIF_STATUS_ICMD_NOT_READY;
 
-    case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
-        return GCIF_STATUS_UNSUPPORTED_ICMD_VERSION;
+        case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
+            return GCIF_STATUS_UNSUPPORTED_ICMD_VERSION;
 
-    case ME_ICMD_INVALID_OPCODE:
-        return GCIF_STATUS_INVALID_OPCODE;
+        case ME_ICMD_INVALID_OPCODE:
+            return GCIF_STATUS_INVALID_OPCODE;
 
-    case ME_ICMD_INVALID_CMD:
-        return GCIF_STATUS_INVALID_CMD;
+        case ME_ICMD_INVALID_CMD:
+            return GCIF_STATUS_INVALID_CMD;
 
-    case ME_ICMD_OPERATIONAL_ERROR:
-        return GCIF_STATUS_OPERATIONAL_ERROR;
+        case ME_ICMD_OPERATIONAL_ERROR:
+            return GCIF_STATUS_OPERATIONAL_ERROR;
 
-    case ME_ICMD_BAD_PARAM:
-        return GCIF_STATUS_BAD_PARAM;
+        case ME_ICMD_BAD_PARAM:
+            return GCIF_STATUS_BAD_PARAM;
 
-    case ME_ICMD_ICM_NOT_AVAIL:
-        return GCIF_STATUS_ICM_NOT_AVAIL;
+        case ME_ICMD_ICM_NOT_AVAIL:
+            return GCIF_STATUS_ICM_NOT_AVAIL;
 
-    case ME_ICMD_WRITE_PROTECT:
-        return GCIF_STATUS_WRITE_PROTECT;
+        case ME_ICMD_WRITE_PROTECT:
+            return GCIF_STATUS_WRITE_PROTECT;
 
-    case ME_ICMD_UNKNOWN_STATUS:
-        return GCIF_STATUS_UNKNOWN_STATUS;
+        case ME_ICMD_UNKNOWN_STATUS:
+            return GCIF_STATUS_UNKNOWN_STATUS;
 
-    case ME_ICMD_SIZE_EXCEEDS_LIMIT:
-        return GCIF_SIZE_EXCEEDS_LIMIT;
+        case ME_ICMD_SIZE_EXCEEDS_LIMIT:
+            return GCIF_SIZE_EXCEEDS_LIMIT;
 
-    case ME_ICMD_NOT_SUPPORTED:
-        return GCIF_ICMD_NOT_SUPPORTED;
+        case ME_ICMD_NOT_SUPPORTED:
+            return GCIF_ICMD_NOT_SUPPORTED;
 
-    case ME_ICMD_INIT_FAILED:
-        return GCIF_ICMD_INIT_FAILED;
+        case ME_ICMD_INIT_FAILED:
+            return GCIF_ICMD_INIT_FAILED;
 
-    case ME_ICMD_BUSY:
-        return GCIF_ICMD_BUSY;
+        case ME_ICMD_BUSY:
+            return GCIF_ICMD_BUSY;
 
-    default:
-        break;
+        default:
+            break;
     }
     return GCIF_STATUS_GENERAL_ERROR;
 }
diff --git a/cmdif/icmd_cif_common.h b/cmdif/icmd_cif_common.h
index 00bddc0c..df881dce 100644
--- a/cmdif/icmd_cif_common.h
+++ b/cmdif/icmd_cif_common.h
@@ -34,7 +34,8 @@
 #define _ICMD_COMMON_
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #ifndef IN
@@ -49,60 +50,60 @@ extern "C" {
 #define INOUT
 #endif
 
+    /* --------- Typedefs & Constants ---------------------------------- */
 
-/* --------- Typedefs & Constants ---------------------------------- */
+    /**
+     * Possible status values returned by the API functions.
+     * In some cases the status indicated in the cr-space may not fit
+     * any of the below enumeration values, in which case the raw status
+     * value will be returned.
+     **/
+    enum
+    {
+        GCIF_STATUS_SUCCESS = 0,
+        GCIF_STATUS_INVALID_OPCODE,
+        GCIF_STATUS_INVALID_CMD,
+        GCIF_STATUS_OPERATIONAL_ERROR,
+        GCIF_STATUS_BAD_PARAM,
+        GCIF_STATUS_CR_FAIL,      // cr-space access failure
+        GCIF_STATUS_BAD_OPCODE,   // unsupported opcode was used
+        GCIF_STATUS_SEMAPHORE_TO, // timed out while trying to take semaphore
+        GCIF_STATUS_EXECUTE_TO,   // timed out while waiting for command to execute
+        GCIF_STATUS_IFC_BUSY,     // command-interface is busy executing another command
+        GCIF_STATUS_BAD_PARAMETERS,
+        GCIF_STATUS_GENERAL_ERROR,
+        GCIF_STATUS_ICMD_NOT_READY,
+        GCIF_STATUS_UNSUPPORTED_ICMD_VERSION,
+        GCIF_STATUS_ICM_NOT_AVAIL,
+        GCIF_STATUS_WRITE_PROTECT,
+        GCIF_STATUS_NO_MEM,
+        GCIF_SIZE_EXCEEDS_LIMIT,
+        GCIF_ICMD_NOT_SUPPORTED,
+        GCIF_ICMD_INIT_FAILED,
+        GCIF_ICMD_BUSY,
+        GCIF_STATUS_UNKNOWN_STATUS
+    };
 
-/**
- * Possible status values returned by the API functions.
- * In some cases the status indicated in the cr-space may not fit
- * any of the below enumeration values, in which case the raw status
- * value will be returned.
- **/
-enum {
-    GCIF_STATUS_SUCCESS = 0,
-    GCIF_STATUS_INVALID_OPCODE,
-    GCIF_STATUS_INVALID_CMD,
-    GCIF_STATUS_OPERATIONAL_ERROR,
-    GCIF_STATUS_BAD_PARAM,
-    GCIF_STATUS_CR_FAIL,        // cr-space access failure
-    GCIF_STATUS_BAD_OPCODE,                 // unsupported opcode was used
-    GCIF_STATUS_SEMAPHORE_TO,               // timed out while trying to take semaphore
-    GCIF_STATUS_EXECUTE_TO,                 // timed out while waiting for command to execute
-    GCIF_STATUS_IFC_BUSY,                   // command-interface is busy executing another command
-    GCIF_STATUS_BAD_PARAMETERS,
-    GCIF_STATUS_GENERAL_ERROR,
-    GCIF_STATUS_ICMD_NOT_READY,
-    GCIF_STATUS_UNSUPPORTED_ICMD_VERSION,
-    GCIF_STATUS_ICM_NOT_AVAIL,
-    GCIF_STATUS_WRITE_PROTECT,
-    GCIF_STATUS_NO_MEM,
-    GCIF_SIZE_EXCEEDS_LIMIT,
-    GCIF_ICMD_NOT_SUPPORTED,
-    GCIF_ICMD_INIT_FAILED,
-    GCIF_ICMD_BUSY,
-    GCIF_STATUS_UNKNOWN_STATUS
-};
+    enum
+    {
+        RW_READ = 0x1,
+        RW_WRITE = 0x0
+    };
 
-enum {
-    RW_READ  = 0x1,
-    RW_WRITE = 0x0
-};
+    /* --------- Functional API ---------------------------------------- */
 
-/* --------- Functional API ---------------------------------------- */
+    /**
+     * Returns the last error message recorded by the library
+     **/
+    char* gcif_get_last_err();
 
-/**
- * Returns the last error message recorded by the library
- **/
-char* gcif_get_last_err();
-
-/**
- * Returns the error message associated with the provided return code
- **/
-char* gcif_err_str(int rc);
+    /**
+     * Returns the error message associated with the provided return code
+     **/
+    char* gcif_err_str(int rc);
 
 #ifdef __cplusplus
 }
 #endif
 
-
 #endif
diff --git a/cmdif/icmd_cif_macros.h b/cmdif/icmd_cif_macros.h
index 0503977d..ada19b91 100644
--- a/cmdif/icmd_cif_macros.h
+++ b/cmdif/icmd_cif_macros.h
@@ -30,10 +30,9 @@
  * SOFTWARE.
  */
 
-#ifndef _ICMD_MACROS     /* guard */
+#ifndef _ICMD_MACROS /* guard */
 #define _ICMD_MACROS
 
-
 int convert_rc(int rc);
 
 #ifdef _DEBUG_MODE
@@ -50,47 +49,53 @@ int convert_rc(int rc);
  * 5th gen icmd structures i.e connectib/switchib/connectx4 (use ## to paste them together in the macro)
  */
 #define SEND_ICMD_FLOW_GENERIC(mf, op, struct_name, cmd_struct, should_pack, skip_write, pack_func, unpack_func) \
-    int _rc; \
-    int _cmd_size = struct_name##_size(); \
-    u_int8_t *_data = (u_int8_t*)malloc(sizeof(u_int8_t) * _cmd_size); \
-    if (!_data) { \
-        return GCIF_STATUS_NO_MEM; \
-    } \
-    memset(_data, 0, sizeof(u_int8_t) * _cmd_size); \
-    if (should_pack) { \
-        pack_func(cmd_struct, _data); \
-    } \
-    _rc = icmd_send_command(mf, op, _data, _cmd_size, skip_write); \
-    if (_rc) { \
-        free(_data); \
-        return convert_rc(_rc); \
-    } \
-    unpack_func(cmd_struct, _data); \
-    free(_data); \
+    int _rc;                                                                                                     \
+    int _cmd_size = struct_name##_size();                                                                        \
+    u_int8_t* _data = (u_int8_t*)malloc(sizeof(u_int8_t) * _cmd_size);                                           \
+    if (!_data)                                                                                                  \
+    {                                                                                                            \
+        return GCIF_STATUS_NO_MEM;                                                                               \
+    }                                                                                                            \
+    memset(_data, 0, sizeof(u_int8_t) * _cmd_size);                                                              \
+    if (should_pack)                                                                                             \
+    {                                                                                                            \
+        pack_func(cmd_struct, _data);                                                                            \
+    }                                                                                                            \
+    _rc = icmd_send_command(mf, op, _data, _cmd_size, skip_write);                                               \
+    if (_rc)                                                                                                     \
+    {                                                                                                            \
+        free(_data);                                                                                             \
+        return convert_rc(_rc);                                                                                  \
+    }                                                                                                            \
+    unpack_func(cmd_struct, _data);                                                                              \
+    free(_data);                                                                                                 \
     return GCIF_STATUS_SUCCESS
 
-#define SEND_ICMD_FLOW(mf, op, struct_name, cmd_struct, should_pack, skip_write) \
-    SEND_ICMD_FLOW_GENERIC(mf, op, struct_name, cmd_struct, should_pack, skip_write, struct_name##_pack, struct_name##_unpack)
+#define SEND_ICMD_FLOW(mf, op, struct_name, cmd_struct, should_pack, skip_write)                         \
+    SEND_ICMD_FLOW_GENERIC(mf, op, struct_name, cmd_struct, should_pack, skip_write, struct_name##_pack, \
+                           struct_name##_unpack)
 
 #define SEND_UNION_ICMD_FLOW(mf, op, struct_name, cmd_struct, should_pack, skip_write) \
-    int _rc; \
-    int _cmd_size = struct_name##_size(); \
-    u_int8_t *_data = (u_int8_t*)malloc(sizeof(u_int8_t) * _cmd_size); \
-    if (!_data) { \
-        return GCIF_STATUS_NO_MEM; \
-    } \
-    memset(_data, 0, sizeof(u_int8_t) * _cmd_size); \
-    if (should_pack) { \
-        struct_name##_in_pack(&(cmd_struct->in), _data); \
-    } \
-    _rc = icmd_send_command(mf, op, _data, _cmd_size, skip_write); \
-    if (_rc) { \
-        free(_data); \
-        return convert_rc(_rc); \
-    } \
-    struct_name##_unpack(cmd_struct, _data); \
-    free(_data); \
+    int _rc;                                                                           \
+    int _cmd_size = struct_name##_size();                                              \
+    u_int8_t* _data = (u_int8_t*)malloc(sizeof(u_int8_t) * _cmd_size);                 \
+    if (!_data)                                                                        \
+    {                                                                                  \
+        return GCIF_STATUS_NO_MEM;                                                     \
+    }                                                                                  \
+    memset(_data, 0, sizeof(u_int8_t) * _cmd_size);                                    \
+    if (should_pack)                                                                   \
+    {                                                                                  \
+        struct_name##_in_pack(&(cmd_struct->in), _data);                               \
+    }                                                                                  \
+    _rc = icmd_send_command(mf, op, _data, _cmd_size, skip_write);                     \
+    if (_rc)                                                                           \
+    {                                                                                  \
+        free(_data);                                                                   \
+        return convert_rc(_rc);                                                        \
+    }                                                                                  \
+    struct_name##_unpack(cmd_struct, _data);                                           \
+    free(_data);                                                                       \
     return GCIF_STATUS_SUCCESS
 
-
 #endif
diff --git a/cmdif/icmd_cif_open.c b/cmdif/icmd_cif_open.c
index 74d89b6b..1e061375 100644
--- a/cmdif/icmd_cif_open.c
+++ b/cmdif/icmd_cif_open.c
@@ -38,14 +38,13 @@
 #include "icmd_cif_open.h"
 #include "icmd_cif_macros.h"
 
-#define MH_SYNC_OPCODE        0x8402
+#define MH_SYNC_OPCODE 0x8402
 #define MH_SYNC_STATUS_OPCODE 0x8403
 
 /*
  * gcif_get_fw_info
  */
-int gcif_get_fw_info(mfile *mf,
-                     OUT struct connectib_icmd_get_fw_info *fw_info)
+int gcif_get_fw_info(mfile* mf, OUT struct connectib_icmd_get_fw_info* fw_info)
 {
     SEND_ICMD_FLOW(mf, GET_FW_INFO, connectib_icmd_get_fw_info, fw_info, 0, 1);
 }
@@ -53,29 +52,28 @@ int gcif_get_fw_info(mfile *mf,
 /*
  * get_icmd_query_cap
  */
-int get_icmd_query_cap(mfile *mf, struct icmd_hca_icmd_query_cap_general *icmd_query_caps)
+int get_icmd_query_cap(mfile* mf, struct icmd_hca_icmd_query_cap_general* icmd_query_caps)
 {
-    SEND_ICMD_FLOW(mf, GET_ICMD_QUERY_CAP, icmd_hca_icmd_query_cap_general,
-                   icmd_query_caps, 1, 0);
+    SEND_ICMD_FLOW(mf, GET_ICMD_QUERY_CAP, icmd_hca_icmd_query_cap_general, icmd_query_caps, 1, 0);
 }
 
-int gcif_mh_sync(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync)
+int gcif_mh_sync(mfile* mf, struct connectx4_icmd_mh_sync* mh_sync)
 {
     SEND_ICMD_FLOW(mf, MH_SYNC_OPCODE, connectx4_icmd_mh_sync, mh_sync, 1, 0);
 }
 
-int gcif_mh_sync_status(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync_out)
+int gcif_mh_sync_status(mfile* mf, struct connectx4_icmd_mh_sync* mh_sync_out)
 {
     memset(mh_sync_out, 0x0, sizeof(*mh_sync_out));
     SEND_ICMD_FLOW(mf, MH_SYNC_STATUS_OPCODE, connectx4_icmd_mh_sync, mh_sync_out, 1, 0);
 }
 
-int gcif_set_itrace(mfile *mf, struct connectib_itrace *itrace)
+int gcif_set_itrace(mfile* mf, struct connectib_itrace* itrace)
 {
     SEND_ICMD_FLOW(mf, SET_ITRACE, connectib_itrace, itrace, 1, 0);
 }
 
-int gcif_set_port_sniffer(mfile *mf, struct connectib_icmd_set_port_sniffer *set_port_sniffer)
+int gcif_set_port_sniffer(mfile* mf, struct connectib_icmd_set_port_sniffer* set_port_sniffer)
 {
     SEND_ICMD_FLOW(mf, SET_PORT_SNIFFER, connectib_icmd_set_port_sniffer, set_port_sniffer, 1, 0);
 }
diff --git a/cmdif/icmd_cif_open.h b/cmdif/icmd_cif_open.h
index 9544742a..ecf0db5f 100644
--- a/cmdif/icmd_cif_open.h
+++ b/cmdif/icmd_cif_open.h
@@ -30,11 +30,12 @@
  * SOFTWARE.
  */
 
-#ifndef _ICMD_OPEN_LIB     /* guard */
+#ifndef _ICMD_OPEN_LIB /* guard */
 #define _ICMD_OPEN_LIB
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <mtcr.h>
@@ -55,31 +56,31 @@ extern "C" {
 #define INOUT
 #endif
 
-enum {
-    GET_FW_INFO = 0x8007,
-    FLASH_REG_ACCESS = 0x9001,
-};
+    enum
+    {
+        GET_FW_INFO = 0x8007,
+        FLASH_REG_ACCESS = 0x9001,
+    };
 
 #ifdef MST_UL
-// instead of cib_cif.h in mstflint
-enum {
-    GET_ICMD_QUERY_CAP = 0x8400,
-    SET_ITRACE = 0xf003,
-    SET_PORT_SNIFFER = 0xc002,
-};
+    // instead of cib_cif.h in mstflint
+    enum
+    {
+        GET_ICMD_QUERY_CAP = 0x8400,
+        SET_ITRACE = 0xf003,
+        SET_PORT_SNIFFER = 0xc002,
+    };
 #endif
 
-int gcif_get_fw_info(mfile *mf,
-                     OUT struct connectib_icmd_get_fw_info *fw_info);
+    int gcif_get_fw_info(mfile* mf, OUT struct connectib_icmd_get_fw_info* fw_info);
 
-int get_icmd_query_cap(mfile *mf,
-                       struct icmd_hca_icmd_query_cap_general *icmd_query_caps);
+    int get_icmd_query_cap(mfile* mf, struct icmd_hca_icmd_query_cap_general* icmd_query_caps);
 
-int gcif_mh_sync(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync);
+    int gcif_mh_sync(mfile* mf, struct connectx4_icmd_mh_sync* mh_sync);
 
-int gcif_mh_sync_status(mfile *mf, struct connectx4_icmd_mh_sync *mh_sync);
+    int gcif_mh_sync_status(mfile* mf, struct connectx4_icmd_mh_sync* mh_sync);
 
-int gcif_set_port_sniffer(mfile *mf, struct connectib_icmd_set_port_sniffer *set_port_sniffer);
+    int gcif_set_port_sniffer(mfile* mf, struct connectib_icmd_set_port_sniffer* set_port_sniffer);
 
 #ifdef __cplusplus
 }
diff --git a/cmdif/tools_cif.c b/cmdif/tools_cif.c
index 7070a7a8..f94d6c58 100644
--- a/cmdif/tools_cif.c
+++ b/cmdif/tools_cif.c
@@ -53,78 +53,81 @@
 #define QPC_READ_OP 0x67
 #define QPC_WRITE_OP 0x69
 
-#define CHECK_RC(rc) \
-    if (rc) {return (MError)rc;}
-
-#define BE32_TO_CPU(s, n) do {                                          \
-        u_int32_t i;                                                   \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (i = 0; i < (n); i++, p++)                                      \
-            *p = __be32_to_cpu(*p);                                    \
-} while (0)
+#define CHECK_RC(rc)       \
+    if (rc)                \
+    {                      \
+        return (MError)rc; \
+    }
+
+#define BE32_TO_CPU(s, n)               \
+    do                                  \
+    {                                   \
+        u_int32_t i;                    \
+        u_int32_t* p = (u_int32_t*)(s); \
+        for (i = 0; i < (n); i++, p++)  \
+            *p = __be32_to_cpu(*p);     \
+    } while (0)
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 
-#define SWAP_DW_BE(uint64_num) \
-    (((uint64_num) & 0xffffffffULL) << 32) | (((uint64_num) >> 32) & 0xffffffffULL)
+#define SWAP_DW_BE(uint64_num) (((uint64_num)&0xffffffffULL) << 32) | (((uint64_num) >> 32) & 0xffffffffULL)
 
 #else
 #define SWAP_DW_BE(uint64_num) (uint64_num)
 #endif
 
-//TODO: adrianc: if we find ourselves adding more and more commands consider using a macro to save code.
-//TODO: adrianc: when library expands consider returning its own error code
+// TODO: adrianc: if we find ourselves adding more and more commands consider using a macro to save code.
+// TODO: adrianc: when library expands consider returning its own error code
 
-MError tcif_query_dev_cap(mfile *dev, u_int32_t offset, u_int64_t *data)
+MError tcif_query_dev_cap(mfile* dev, u_int32_t offset, u_int64_t* data)
 {
-    int rc = tools_cmdif_send_mbox_command(dev, 0, QUERY_DEV_CAP_OP, 0, offset, (u_int32_t*)data, 8, 1); CHECK_RC(rc);
+    int rc = tools_cmdif_send_mbox_command(dev, 0, QUERY_DEV_CAP_OP, 0, offset, (u_int32_t*)data, 8, 1);
+    CHECK_RC(rc);
     BE32_TO_CPU(data, 2);
     *data = SWAP_DW_BE(*data);
     return ME_OK;
 }
 
-
-MError tcif_query_global_def_params(mfile *dev, struct tools_open_query_def_params_global *global_params)
+MError tcif_query_global_def_params(mfile* dev, struct tools_open_query_def_params_global* global_params)
 {
     u_int8_t data[TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE] = {0};
-    int rc = tools_cmdif_send_mbox_command(dev, 0, QUERY_DEF_PARAMS_OP, 0, 0, data, sizeof(data), 0); CHECK_RC(rc);
+    int rc = tools_cmdif_send_mbox_command(dev, 0, QUERY_DEF_PARAMS_OP, 0, 0, data, sizeof(data), 0);
+    CHECK_RC(rc);
     tools_open_query_def_params_global_unpack(global_params, data);
     return ME_OK;
 }
 
-
-MError tcif_query_per_port_def_params(mfile *dev, u_int8_t port, struct tools_open_query_def_params_per_port *port_params)
+MError
+  tcif_query_per_port_def_params(mfile* dev, u_int8_t port, struct tools_open_query_def_params_per_port* port_params)
 {
     u_int8_t data[TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE] = {0};
-    int rc = tools_cmdif_send_mbox_command(dev, 0, QUERY_DEF_PARAMS_OP, port, 0, data, sizeof(data), 0); CHECK_RC(rc);
+    int rc = tools_cmdif_send_mbox_command(dev, 0, QUERY_DEF_PARAMS_OP, port, 0, data, sizeof(data), 0);
+    CHECK_RC(rc);
     tools_open_query_def_params_per_port_unpack(port_params, data);
     return ME_OK;
 }
 
-
-MError tcif_qpc_context_read(mfile *dev, u_int32_t qpn, u_int32_t source, u_int8_t *data, u_int32_t len)
+MError tcif_qpc_context_read(mfile* dev, u_int32_t qpn, u_int32_t source, u_int8_t* data, u_int32_t len)
 {
     u_int32_t input_mod = 0;
-    input_mod = MERGE(input_mod, source, 24,  8);
-    input_mod = MERGE(input_mod, qpn,  0, 24);
+    input_mod = MERGE(input_mod, source, 24, 8);
+    input_mod = MERGE(input_mod, qpn, 0, 24);
     int rc = tools_cmdif_send_mbox_command(dev, input_mod, QPC_READ_OP, 0, 0, data, len, 1);
     CHECK_RC(rc);
     return ME_OK;
 }
 
-
-MError tcif_qpc_context_write(mfile *dev, u_int32_t qpn, u_int32_t source, u_int8_t *data, u_int32_t len)
+MError tcif_qpc_context_write(mfile* dev, u_int32_t qpn, u_int32_t source, u_int8_t* data, u_int32_t len)
 {
     u_int32_t input_mod = 0;
-    input_mod = MERGE(input_mod, source, 24,  8);
-    input_mod = MERGE(input_mod, qpn,  0, 24);
+    input_mod = MERGE(input_mod, source, 24, 8);
+    input_mod = MERGE(input_mod, qpn, 0, 24);
     int rc = tools_cmdif_send_mbox_command(dev, input_mod, QPC_WRITE_OP, 0, 0, data, len, 0);
     CHECK_RC(rc);
     return ME_OK;
 }
 
-
-MError tcif_hw_access(mfile *dev, u_int64_t key, int lock_unlock)
+MError tcif_hw_access(mfile* dev, u_int64_t key, int lock_unlock)
 {
     return (MError)tools_cmdif_send_inline_cmd(dev, key, NULL, 0, HW_ACCESS_OP, lock_unlock);
 }
@@ -133,8 +136,7 @@ const char* tcif_err2str(MError rc)
     return m_err2str(rc);
 }
 
-
-MError tcif_cr_mbox_supported(mfile *dev)
+MError tcif_cr_mbox_supported(mfile* dev)
 {
 #if defined(__FreeBSD__) || defined(UEFI_BUILD)
     (void)dev;
@@ -142,5 +144,4 @@ MError tcif_cr_mbox_supported(mfile *dev)
 #else
     return (MError)tools_cmdif_is_cr_mbox_supported(dev);
 #endif
-
 }
diff --git a/cmdif/tools_cif.h b/cmdif/tools_cif.h
index 2783044a..5e2a5c9a 100644
--- a/cmdif/tools_cif.h
+++ b/cmdif/tools_cif.h
@@ -38,92 +38,93 @@
 #define TOOLS_CIF_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <mtcr.h>
 #include <tools_layouts/tools_open_layouts.h>
 
-
-/**
- * tcif_query_dev_cap:
- * @param[in]  dev           A pointer to a device context.
- * @param[in]  offs          offset in even dword to read from the DEV_CAP vector
- * @param[out] data          Quad-word read from the device capabilities vector from offset: offs
-
- * @return     One of the MError* values, or a raw
- **/
-MError tcif_query_dev_cap(mfile *dev, u_int32_t offs, u_int64_t *data);
-
-/**
- * tcif_query_global_def_params:
- * @param[in]     dev           A pointer to a device context.
- * @param[in/out] global_params pointer to global params struct
-
- * @return     One of the MError* values, or a raw
- **/
-MError tcif_query_global_def_params(mfile *dev, struct tools_open_query_def_params_global *global_params);
-
-/**
- * tcif_query_per_port_def_params:
- * @param[in]     dev           A pointer to a device context.
- * @param[in]     port          Port that the query will be performed on (1 or 2)
- * @param[in/out] port_params   Pointer to port params struct
-
- * @return     One of the MError* values, or a raw
- **/
-MError tcif_query_per_port_def_params(mfile *dev, u_int8_t port, struct tools_open_query_def_params_per_port *port_params);
-
-/**
- * tcif_qpc_context_read:
- * @param[in]     dev           A pointer to a device context.
- * @param[in]     qpn           QP Number
- * @param[in]     source        QP Source
- * @param[in]     data          Data that was read
- *
- * @return     One of the MError* values, or a raw
- **/
-MError tcif_qpc_context_read(mfile *dev, u_int32_t qpn, u_int32_t source, u_int8_t *data, u_int32_t len);
-
-/**
- * tcif_qpc_context_write:
- * @param[in]     dev           A pointer to a device context.
- * @param[in]     qpn           QP Number
- * @param[in]     source        QP Source
- * @param[in]     data          Data to be written
- *
- * @return     One of the MError* values, or a raw
- **/
-MError tcif_qpc_context_write(mfile *dev, u_int32_t qpn, u_int32_t source, u_int8_t *data, u_int32_t len);
-
-
-/**
- * tcif_hw_access:
- * @param[in]  dev           A pointer to a device context.
- * @param[in]  key           key with which we attempt to lock/unlock the cr-space (should be 0 for locking)
- * @param[out] lock_unlock   1-lock , 0-unlock
-
- * @return     One of the MError* values, or a raw
- **/
-MError tcif_hw_access(mfile *dev, u_int64_t key, int lock_unlock);
-
-/**
- * tcif_cr_mailbox_supported:
- * @param[in]  dev           A pointer to a device context.
-
- * @return     ME_OK                - cr mailbox supported
- *             ME_SEM_LOCKED        - tools HCR semaphore locked
- *             ME_CMDIF_NOT_SUPP    - cr mailbox not supported
- **/
-MError tcif_cr_mbox_supported(mfile *dev);
-
-/**
- * tcif_err2str:
- * @param[in]  rc            return code from one of the above functions
-
- * @return     string describing the error occurred.
- **/
-const char* tcif_err2str(MError rc);
+    /**
+     * tcif_query_dev_cap:
+     * @param[in]  dev           A pointer to a device context.
+     * @param[in]  offs          offset in even dword to read from the DEV_CAP vector
+     * @param[out] data          Quad-word read from the device capabilities vector from offset: offs
+
+     * @return     One of the MError* values, or a raw
+     **/
+    MError tcif_query_dev_cap(mfile* dev, u_int32_t offs, u_int64_t* data);
+
+    /**
+     * tcif_query_global_def_params:
+     * @param[in]     dev           A pointer to a device context.
+     * @param[in/out] global_params pointer to global params struct
+
+     * @return     One of the MError* values, or a raw
+     **/
+    MError tcif_query_global_def_params(mfile* dev, struct tools_open_query_def_params_global* global_params);
+
+    /**
+     * tcif_query_per_port_def_params:
+     * @param[in]     dev           A pointer to a device context.
+     * @param[in]     port          Port that the query will be performed on (1 or 2)
+     * @param[in/out] port_params   Pointer to port params struct
+
+     * @return     One of the MError* values, or a raw
+     **/
+    MError tcif_query_per_port_def_params(mfile* dev,
+                                          u_int8_t port,
+                                          struct tools_open_query_def_params_per_port* port_params);
+
+    /**
+     * tcif_qpc_context_read:
+     * @param[in]     dev           A pointer to a device context.
+     * @param[in]     qpn           QP Number
+     * @param[in]     source        QP Source
+     * @param[in]     data          Data that was read
+     *
+     * @return     One of the MError* values, or a raw
+     **/
+    MError tcif_qpc_context_read(mfile* dev, u_int32_t qpn, u_int32_t source, u_int8_t* data, u_int32_t len);
+
+    /**
+     * tcif_qpc_context_write:
+     * @param[in]     dev           A pointer to a device context.
+     * @param[in]     qpn           QP Number
+     * @param[in]     source        QP Source
+     * @param[in]     data          Data to be written
+     *
+     * @return     One of the MError* values, or a raw
+     **/
+    MError tcif_qpc_context_write(mfile* dev, u_int32_t qpn, u_int32_t source, u_int8_t* data, u_int32_t len);
+
+    /**
+     * tcif_hw_access:
+     * @param[in]  dev           A pointer to a device context.
+     * @param[in]  key           key with which we attempt to lock/unlock the cr-space (should be 0 for locking)
+     * @param[out] lock_unlock   1-lock , 0-unlock
+
+     * @return     One of the MError* values, or a raw
+     **/
+    MError tcif_hw_access(mfile* dev, u_int64_t key, int lock_unlock);
+
+    /**
+     * tcif_cr_mailbox_supported:
+     * @param[in]  dev           A pointer to a device context.
+
+     * @return     ME_OK                - cr mailbox supported
+     *             ME_SEM_LOCKED        - tools HCR semaphore locked
+     *             ME_CMDIF_NOT_SUPP    - cr mailbox not supported
+     **/
+    MError tcif_cr_mbox_supported(mfile* dev);
+
+    /**
+     * tcif_err2str:
+     * @param[in]  rc            return code from one of the above functions
+
+     * @return     string describing the error occurred.
+     **/
+    const char* tcif_err2str(MError rc);
 
 #ifdef __cplusplus
 }
diff --git a/cmdparser/cmdparser.cpp b/cmdparser/cmdparser.cpp
index 819140f8..c9c29bef 100644
--- a/cmdparser/cmdparser.cpp
+++ b/cmdparser/cmdparser.cpp
@@ -30,7 +30,6 @@
  * SOFTWARE.
  */
 
-
 /*Includes*/
 #include <stdlib.h>
 #include <stdarg.h>
@@ -42,7 +41,6 @@
 #include "my_getopt.h"
 #include "cmdparser.h"
 
-
 /*Constants*/
 #define IDENT_LENGTH 4
 #define PREFIX_SPACE_SIZE 8
@@ -51,45 +49,54 @@
 #define COLON_AND_SPACE_SIZE 2
 #define TAB_SIZE 4
 
-
 /*Declarations*/
-typedef vector < bool > vec_bool;
+typedef vector<bool> vec_bool;
 
 static string CreateIndentFromInt(int ident_size);
 static void FindAndReplace(string& source, string::size_type pos, string const& find, string const& replace);
-static bool FindAndHandleNewLinePos(string& str, int& product_length, int& local_space_size, int& str_type_len,
-                                    int& new_line_pos, string newline_and_ident, int deli_is_space);
+static bool FindAndHandleNewLinePos(string& str,
+                                    int& product_length,
+                                    int& local_space_size,
+                                    int& str_type_len,
+                                    int& new_line_pos,
+                                    string newline_and_ident,
+                                    int deli_is_space);
 
 /****************************************************/
 /************class CommandLineRequester**************/
 /****************************************************/
 /* private methods */
-string CommandLineRequester::BuildOptStr(option_ifc_t &opt)
+string CommandLineRequester::BuildOptStr(option_ifc_t& opt)
 {
     string str;
-    str += CreateIndentFromInt(opt.numOfSpaces*4);
-    if (opt.option_short_name != ' ') {
+    str += CreateIndentFromInt(opt.numOfSpaces * 4);
+    if (opt.option_short_name != ' ')
+    {
         str += "-";
         str += opt.option_short_name;
         str += "|";
     }
     str += "--";
     str += opt.option_name;
-    if (opt.option_value != "") {
+    if (opt.option_value != "")
+    {
         str += " ";
         str += opt.option_value;
     }
     return str;
 }
 
-string CommandLineRequester::FormatUsageStr(string str, int str_type_len, int ident_size,
-                                            int is_not_description, bool is_left_side)
+string CommandLineRequester::FormatUsageStr(string str,
+                                            int str_type_len,
+                                            int ident_size,
+                                            int is_not_description,
+                                            bool is_left_side)
 {
     string ident = CreateIndentFromInt(ident_size);
     string newline_and_ident = "\n" + ident;
-    //replace tabs in spaces
+    // replace tabs in spaces
     FindAndReplace(str, 0, "\t", CreateIndentFromInt(TAB_SIZE));
-    //helper variables for formatting
+    // helper variables for formatting
     int residual = str.size();
     int initial_residual = residual;
     int product_length = 0;
@@ -97,38 +104,43 @@ string CommandLineRequester::FormatUsageStr(string str, int str_type_len, int id
     int new_line_pos = 0;
     int space_not_exists_count = 0;
 
-    //iterate while the remained text is longer then a valid line length
-    while (residual >= str_type_len + local_space_size) {
-        //search for a user defined new line.
+    // iterate while the remained text is longer then a valid line length
+    while (residual >= str_type_len + local_space_size)
+    {
+        // search for a user defined new line.
         if (FindAndHandleNewLinePos(str, product_length, local_space_size, str_type_len, new_line_pos,
-                                    newline_and_ident, 0)) {
+                                    newline_and_ident, 0))
+        {
             goto next_iteration;
         }
-        //if no such is found. try to find a space to break the line at it's position.
+        // if no such is found. try to find a space to break the line at it's position.
         if (FindAndHandleNewLinePos(str, product_length, local_space_size, str_type_len, new_line_pos,
-                                    newline_and_ident, 1)) {
+                                    newline_and_ident, 1))
+        {
             goto next_iteration;
         }
-        //if not found, break the line in a middle of a spaceless word.
+        // if not found, break the line in a middle of a spaceless word.
         space_not_exists_count++;
         new_line_pos = local_space_size + str_type_len + product_length;
         str.insert(new_line_pos, newline_and_ident);
-next_iteration:
-        //update iteration variables
+    next_iteration:
+        // update iteration variables
         local_space_size = ident_size;
         initial_residual += ident_size;
         residual = initial_residual - new_line_pos - 1 + space_not_exists_count;
         product_length = new_line_pos;
     }
-    //handle the last line remained. if it is the left string - add aligned colon.
-    if (is_left_side) {
-        while (residual < str_type_len + ident_size) {
+    // handle the last line remained. if it is the left string - add aligned colon.
+    if (is_left_side)
+    {
+        while (residual < str_type_len + ident_size)
+        {
             str += " ";
             residual++;
         }
         str += ": ";
     }
-    //Add user defined new lines in last line remained.
+    // Add user defined new lines in last line remained.
     FindAndReplace(str, product_length + local_space_size + 1, "\n", newline_and_ident);
     return str;
 }
@@ -146,20 +158,22 @@ void CommandLineRequester::AddOptionalSectionData(string section_name, string st
     sec_data.str2 = str2;
 
     for (optional_sections_t::iterator it = this->optional_sections_vec.begin();
-         it != this->optional_sections_vec.end(); ++it) {
-        if (it->first == section_name) {
+         it != this->optional_sections_vec.end();
+         ++it)
+    {
+        if (it->first == section_name)
+        {
             pos = distance(optional_sections_vec.begin(), it);
             this->optional_sections_vec[pos].second.push_back(sec_data);
             return;
         }
     }
-    this->optional_sections_vec.push_back(pair < string, vector<struct optional_help_section_data > >
-                                              (section_name, vector < struct optional_help_section_data >()));
+    this->optional_sections_vec.push_back(pair<string, vector<struct optional_help_section_data> >(
+      section_name, vector<struct optional_help_section_data>()));
     pos = optional_sections_vec.size() - 1;
     this->optional_sections_vec[pos].second.push_back(sec_data);
 }
 
-
 string CommandLineRequester::GetUsageSynopsis(bool hidden_options)
 {
     string prefix_space = CreateIndentFromInt(PREFIX_SPACE_SIZE);
@@ -169,21 +183,29 @@ string CommandLineRequester::GetUsageSynopsis(bool hidden_options)
     int curr_line_len = PREFIX_SPACE_SIZE;
     int new_line_pos;
 
-    for (vec_option_t::iterator it = this->options.begin(); it != this->options.end(); ++it) {
-        if (hidden_options == false) {          //display only not hidden options
-            if ((*it).hidden == true) {
+    for (vec_option_t::iterator it = this->options.begin(); it != this->options.end(); ++it)
+    {
+        if (hidden_options == false)
+        { // display only not hidden options
+            if ((*it).hidden == true)
+            {
                 continue;
             }
-        } else {                                //display only hidden options
-            if ((*it).hidden == false) {
+        }
+        else
+        { // display only hidden options
+            if ((*it).hidden == false)
+            {
                 continue;
             }
         }
         curr_str += (*it).is_mandatory ? "<" : "[";
         curr_str += this->BuildOptStr(*it);
         curr_str += (*it).is_mandatory ? ">" : "]";
-        if (curr_str.size() + curr_line_len <  RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN) {
-            if (curr_line_len > PREFIX_SPACE_SIZE) {
+        if (curr_str.size() + curr_line_len < RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN)
+        {
+            if (curr_line_len > PREFIX_SPACE_SIZE)
+            {
                 str += " ";
             }
             curr_line_len += curr_str.size();
@@ -191,20 +213,26 @@ string CommandLineRequester::GetUsageSynopsis(bool hidden_options)
             curr_str = "";
             continue;
         }
-        while (curr_str.size() + curr_line_len >= RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN) {
-            if (curr_str.size() < RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN) {
+        while (curr_str.size() + curr_line_len >= RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN)
+        {
+            if (curr_str.size() < RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN)
+            {
                 str += "\n" + prefix_space + curr_str;
                 curr_line_len = PREFIX_SPACE_SIZE + curr_str.size();
                 curr_str = "";
                 continue;
             }
             new_line_pos = curr_str.find_last_of(" ", RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN);
-            if ((size_t)new_line_pos == curr_str.npos) {
+            if ((size_t)new_line_pos == curr_str.npos)
+            {
                 new_line_pos = RIGHT_STR_MAX_LEN + LEFT_STR_MAX_LEN;
-            } else {
+            }
+            else
+            {
                 new_line_pos += 1;
             }
-            if (curr_line_len > PREFIX_SPACE_SIZE) {
+            if (curr_line_len > PREFIX_SPACE_SIZE)
+            {
                 str += "\n" + prefix_space;
                 curr_line_len = PREFIX_SPACE_SIZE;
             }
@@ -213,24 +241,26 @@ string CommandLineRequester::GetUsageSynopsis(bool hidden_options)
             str += "\n" + prefix_space;
             curr_line_len = PREFIX_SPACE_SIZE;
         }
-        if (curr_str != "") {
+        if (curr_str != "")
+        {
             str += curr_str;
             curr_line_len += PREFIX_SPACE_SIZE + curr_str.size();
             curr_str = "";
         }
     }
-    if (curr_str != prefix_space) {
+    if (curr_str != prefix_space)
+    {
         str += curr_str;
         str += "\n";
     }
-    if (str != "") {
+    if (str != "")
+    {
         str = prefix_short_space + this->name + "\n" + str;
     }
 
     return str;
 }
 
-
 string CommandLineRequester::GetUsageDescription()
 {
     optional_sec_data_t desc_data;
@@ -241,7 +271,6 @@ string CommandLineRequester::GetUsageDescription()
     return this->GetUsageOptionalSection(desc_vector);
 }
 
-
 string CommandLineRequester::GetUsageOptions(bool hidden_options)
 {
     string str = "";
@@ -249,13 +278,19 @@ string CommandLineRequester::GetUsageOptions(bool hidden_options)
     string prefix_space = CreateIndentFromInt(PREFIX_SPACE_SIZE);
     string prefix_short_space = CreateIndentFromInt(IDENT_LENGTH);
 
-    for (vec_option_t::iterator it = this->options.begin(); it != this->options.end(); ++it) {
-        if (hidden_options == false) {          //display only not hidden options
-            if ((*it).hidden == true) {
+    for (vec_option_t::iterator it = this->options.begin(); it != this->options.end(); ++it)
+    {
+        if (hidden_options == false)
+        { // display only not hidden options
+            if ((*it).hidden == true)
+            {
                 continue;
             }
-        } else {                                //display only hidden options
-            if ((*it).hidden == false) {
+        }
+        else
+        { // display only hidden options
+            if ((*it).hidden == false)
+            {
                 continue;
             }
         }
@@ -263,25 +298,27 @@ string CommandLineRequester::GetUsageOptions(bool hidden_options)
         opt_str += this->BuildOptStr(*it);
         opt_str = FormatUsageStr(opt_str, LEFT_STR_MAX_LEN, PREFIX_SPACE_SIZE, 1, true);
         str += opt_str;
-        desc_str = FormatUsageStr((*it).description, RIGHT_STR_MAX_LEN, LEFT_STR_MAX_LEN + PREFIX_SPACE_SIZE +
-                                  COLON_AND_SPACE_SIZE, 0, false);
+        desc_str = FormatUsageStr((*it).description, RIGHT_STR_MAX_LEN,
+                                  LEFT_STR_MAX_LEN + PREFIX_SPACE_SIZE + COLON_AND_SPACE_SIZE, 0, false);
         str += desc_str;
         str += "\n";
     }
-    if (str != "") {
+    if (str != "")
+    {
         str = prefix_short_space + this->name + "\n" + str;
     }
     return str;
 }
 
-
 string CommandLineRequester::GetUsageOptionalSections(vector<string> excluded_sections)
 {
     string res = "";
 
-    for (unsigned i = 0; i < optional_sections_vec.size(); ++i) {
+    for (unsigned i = 0; i < optional_sections_vec.size(); ++i)
+    {
         if (find(excluded_sections.begin(), excluded_sections.end(), optional_sections_vec[i].first) !=
-            excluded_sections.end()) {
+            excluded_sections.end())
+        {
             continue;
         }
         res += optional_sections_vec[i].first + "\n";
@@ -294,8 +331,8 @@ string CommandLineRequester::GetUsageOptional1Str(vector<struct optional_help_se
 {
     string data_string("");
     string prefix_space = CreateIndentFromInt(PREFIX_SPACE_SIZE);
-    data_string += FormatUsageStr(prefix_space + it->str1, LEFT_STR_MAX_LEN + RIGHT_STR_MAX_LEN, PREFIX_SPACE_SIZE, 1,
-                                  false);
+    data_string +=
+      FormatUsageStr(prefix_space + it->str1, LEFT_STR_MAX_LEN + RIGHT_STR_MAX_LEN, PREFIX_SPACE_SIZE, 1, false);
     data_string += "\n";
     return data_string;
 }
@@ -306,7 +343,7 @@ string CommandLineRequester::GetUsageOptional2Str(vector<struct optional_help_se
     string prefix_space = CreateIndentFromInt(PREFIX_SPACE_SIZE);
     data_string += FormatUsageStr(prefix_space + it->str1, LEFT_STR_MAX_LEN, PREFIX_SPACE_SIZE, 1, true);
     data_string += FormatUsageStr(it->str2, RIGHT_STR_MAX_LEN,
-                                  LEFT_STR_MAX_LEN  + PREFIX_SPACE_SIZE + COLON_AND_SPACE_SIZE, 0, false);
+                                  LEFT_STR_MAX_LEN + PREFIX_SPACE_SIZE + COLON_AND_SPACE_SIZE, 0, false);
     data_string += "\n";
     return data_string;
 }
@@ -314,25 +351,29 @@ string CommandLineRequester::GetUsageOptional2Str(vector<struct optional_help_se
 string CommandLineRequester::GetUsageOptionalSection(vector<struct optional_help_section_data> section_vec)
 {
     string section_str("");
-    if (section_vec.empty()) {
+    if (section_vec.empty())
+    {
         return section_str;
     }
-    for (vector<struct optional_help_section_data>::iterator it = section_vec.begin(); it != section_vec.end(); ++it) {
-        if (it->str2 != "") {
+    for (vector<struct optional_help_section_data>::iterator it = section_vec.begin(); it != section_vec.end(); ++it)
+    {
+        if (it->str2 != "")
+        {
             section_str += this->GetUsageOptional2Str(it);
-        } else {
+        }
+        else
+        {
             section_str += this->GetUsageOptional1Str(it);
         }
     }
     return section_str;
 }
 
-
 /****************************************************/
 /**************class CommandLineParser***************/
 /****************************************************/
 /* private methods */
-void CommandLineParser::SetLastError(const char *fmt, ...)
+void CommandLineParser::SetLastError(const char* fmt, ...)
 {
     char buff[1024];
     va_list args;
@@ -346,24 +387,23 @@ void CommandLineParser::SetLastError(const char *fmt, ...)
     return;
 }
 
-
 /* public methods */
-int CommandLineParser::AddRequester(CommandLineRequester *p_req)
+int CommandLineParser::AddRequester(CommandLineRequester* p_req)
 {
-    for (vec_option_t::iterator it = p_req->GetOptions().begin();
-         it != p_req->GetOptions().end(); ++it) {
-        //long option must be valid
-        if ((*it).option_name == "") {
-            this->SetLastError("Requester \"%s\" has long option empty",
-                               p_req->GetName().c_str());
+    for (vec_option_t::iterator it = p_req->GetOptions().begin(); it != p_req->GetOptions().end(); ++it)
+    {
+        // long option must be valid
+        if ((*it).option_name == "")
+        {
+            this->SetLastError("Requester \"%s\" has long option empty", p_req->GetName().c_str());
             return 1;
         }
 
-        //check if long option already exists
-        map_str_p_command_line_req::iterator it2 =
-            this->long_opt_to_req_map.find((*it).option_name);
-        if (it2 != this->long_opt_to_req_map.end()) {
-            this->SetLastError("Option \"%s\" from requester \"%s\" "   \
+        // check if long option already exists
+        map_str_p_command_line_req::iterator it2 = this->long_opt_to_req_map.find((*it).option_name);
+        if (it2 != this->long_opt_to_req_map.end())
+        {
+            this->SetLastError("Option \"%s\" from requester \"%s\" "
                                "already exists in requester \"%s\"",
                                (*it).option_name.c_str(),
                                p_req->GetName().c_str(),
@@ -371,12 +411,13 @@ int CommandLineParser::AddRequester(CommandLineRequester *p_req)
             return 1;
         }
 
-        //check if short option already exists
-        if ((*it).option_short_name != ' ') {   //if space than no short option
-            map_char_str::iterator it2 =
-                this->short_opt_to_long_opt.find((*it).option_short_name);
-            if (it2 != this->short_opt_to_long_opt.end()) {
-                this->SetLastError("Option \'%c\' from requester \"%s\" "   \
+        // check if short option already exists
+        if ((*it).option_short_name != ' ')
+        { // if space than no short option
+            map_char_str::iterator it2 = this->short_opt_to_long_opt.find((*it).option_short_name);
+            if (it2 != this->short_opt_to_long_opt.end())
+            {
+                this->SetLastError("Option \'%c\' from requester \"%s\" "
                                    "already exists in requester \"%s\"",
                                    (*it).option_short_name,
                                    p_req->GetName().c_str(),
@@ -386,11 +427,12 @@ int CommandLineParser::AddRequester(CommandLineRequester *p_req)
         }
     }
 
-    //finally add the requester
-    for (vec_option_t::iterator it = p_req->GetOptions().begin();
-         it != p_req->GetOptions().end(); ++it) {
+    // finally add the requester
+    for (vec_option_t::iterator it = p_req->GetOptions().begin(); it != p_req->GetOptions().end(); ++it)
+    {
         this->long_opt_to_req_map[(*it).option_name] = p_req;
-        if ((*it).option_short_name != ' ') { //if space than no short option
+        if ((*it).option_short_name != ' ')
+        { // if space than no short option
             this->short_opt_to_long_opt[(*it).option_short_name] = (*it).option_name;
         }
     }
@@ -403,16 +445,17 @@ string CommandLineParser::GetSynopsis(bool hidden_options)
     string res;
     string prefix_short_space = CreateIndentFromInt(IDENT_LENGTH);
 
-    //name
+    // name
     res = "NAME\n";
     res += prefix_short_space;
     res += this->name;
     res += "\n\n";
 
-    //synopsis
+    // synopsis
     res += "SYNOPSIS\n";
-    for (list_p_command_line_req::iterator it = this->p_requesters_list.begin();
-         it != this->p_requesters_list.end(); ++it) {
+    for (list_p_command_line_req::iterator it = this->p_requesters_list.begin(); it != this->p_requesters_list.end();
+         ++it)
+    {
         res += (*it)->GetUsageSynopsis(hidden_options);
     }
     res += "\n";
@@ -424,39 +467,46 @@ string CommandLineParser::GetUsage(bool hidden_options, vector<string> excluded_
 {
     string res;
 
-    //synopsis
+    // synopsis
     res = GetSynopsis(hidden_options);
 
-    //description
-    if (hidden_options == false) {
+    // description
+    if (hidden_options == false)
+    {
         res += "DESCRIPTION\n";
         for (list_p_command_line_req::iterator it = this->p_requesters_list.begin();
-             it != this->p_requesters_list.end(); ++it) {
+             it != this->p_requesters_list.end();
+             ++it)
+        {
             res += (*it)->GetUsageDescription() + "\n";
         }
     }
 
-    //options
+    // options
     res += "OPTIONS\n";
-    for (list_p_command_line_req::iterator it = this->p_requesters_list.begin();
-         it != this->p_requesters_list.end(); ++it) {
+    for (list_p_command_line_req::iterator it = this->p_requesters_list.begin(); it != this->p_requesters_list.end();
+         ++it)
+    {
         res += (*it)->GetUsageOptions(hidden_options) + "\n";
     }
 
-    //optinal sections
+    // optinal sections
     for (list_p_command_line_req::iterator req_it = this->p_requesters_list.begin();
-         req_it != this->p_requesters_list.end(); ++req_it) {
+         req_it != this->p_requesters_list.end();
+         ++req_it)
+    {
         res += (*req_it)->GetUsageOptionalSections(excluded_sections);
     }
     return res;
 }
 
-
-ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
-                                            bool to_ignore_unknown_options, list_p_command_line_req *p_ignored_requesters_list)
+ParseStatus CommandLineParser::ParseOptions(int argc,
+                                            char** argv,
+                                            bool to_ignore_unknown_options,
+                                            list_p_command_line_req* p_ignored_requesters_list)
 {
-    char **internal_argv;
-    struct option *options_arr = NULL;
+    char** internal_argv;
+    struct option* options_arr = NULL;
     string options_str = "";
     vec_bool returned_option_types_vec;
     ParseStatus rc = PARSE_ERROR;
@@ -465,18 +515,22 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
     int option_index = 0;
     unsigned i = 0;
 
-    //allocate internal_argv
+    // allocate internal_argv
     internal_argv = new char*[argc];
-    if (!internal_argv) {
+    if (!internal_argv)
+    {
         this->SetLastError("Fail to allocate internal argv for parsing");
         return PARSE_ERROR;
     }
-    for (int j = 0; j < argc; ++j) {
+    for (int j = 0; j < argc; ++j)
+    {
         internal_argv[j] = NULL;
     }
-    for (int j = 0; j < argc; ++j) {
+    for (int j = 0; j < argc; ++j)
+    {
         internal_argv[j] = new char[strlen(argv[j]) + 1];
-        if (!internal_argv[j]) {
+        if (!internal_argv[j])
+        {
             this->SetLastError("Fail to allocate internal argv[%u] for parsing", j);
             rc = PARSE_ERROR;
             goto argv_err_exit;
@@ -484,10 +538,11 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
         strcpy(internal_argv[j], argv[j]);
     }
 
-    //allocate long_options_arr
+    // allocate long_options_arr
     num_options = this->long_opt_to_req_map.size();
     options_arr = new struct option[num_options + 1];
-    if (!options_arr) {
+    if (!options_arr)
+    {
         this->SetLastError("Fail to allocate long_options_arr");
         rc = PARSE_ERROR;
         goto parse_exit;
@@ -501,87 +556,117 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
      * that can be return by getopt_long_only()
      */
     i = 0;
-    for (list_p_command_line_req::iterator it = this->p_requesters_list.begin();
-         it != this->p_requesters_list.end(); ++it) {
-        for (vec_option_t::iterator it2 = (*it)->GetOptions().begin();
-             it2 != (*it)->GetOptions().end(); ++it2) {
+    for (list_p_command_line_req::iterator it = this->p_requesters_list.begin(); it != this->p_requesters_list.end();
+         ++it)
+    {
+        for (vec_option_t::iterator it2 = (*it)->GetOptions().begin(); it2 != (*it)->GetOptions().end(); ++it2)
+        {
             options_str += (*it2).option_short_name;
             options_arr[i].name = (char*)(*it2).option_name.c_str();
-            if ((*it2).option_value != "") {
+            if ((*it2).option_value != "")
+            {
                 options_arr[i].has_arg = 1;
                 options_str += ":";
-            } else {
+            }
+            else
+            {
                 options_arr[i].has_arg = 0;
             }
             options_arr[i].flag = 0;
-            if ((*it2).option_short_name != ' ') {
+            if ((*it2).option_short_name != ' ')
+            {
                 options_arr[i].val = (*it2).option_short_name;
-            } else {
+            }
+            else
+            {
                 options_arr[i].val = 0;
             }
 
-            if (returned_option_types_vec.empty() || (returned_option_types_vec.size() < (unsigned int)options_arr[i].val + 1)) {
+            if (returned_option_types_vec.empty() ||
+                (returned_option_types_vec.size() < (unsigned int)options_arr[i].val + 1))
+            {
                 for (unsigned j = returned_option_types_vec.size(); j < (unsigned int)options_arr[i].val + 1; ++j)
                     returned_option_types_vec.push_back(false);
             }
             returned_option_types_vec[options_arr[i].val] = true;
-            //printf("%c %d ", options_arr[i].val, options_arr[i].val);
+            // printf("%c %d ", options_arr[i].val, options_arr[i].val);
             ++i;
         }
     }
 
-    //finally parse all options
-    if (to_ignore_unknown_options == true) {
+    // finally parse all options
+    if (to_ignore_unknown_options == true)
+    {
         tools_opterr = 0;
-    } else {
+    }
+    else
+    {
         tools_opterr = 1;
     }
     tools_optind = 0;
 
     ParseStatus curr_result;
-    while ((option_type = tools_getopt_long_only(argc, internal_argv, options_str.c_str(),
-                                                 options_arr, &option_index)) != -1) {
-        //printf("option_type=\'%c\'\n", option_type);
+    while ((option_type =
+              tools_getopt_long_only(argc, internal_argv, options_str.c_str(), options_arr, &option_index)) != -1)
+    {
+        // printf("option_type=\'%c\'\n", option_type);
 
         string long_opt_name;
-        if (option_type == 0) {
+        if (option_type == 0)
+        {
             long_opt_name = options_arr[option_index].name;
             goto do_handle_option;
-        } else if (option_type == '?') {
-            if (to_ignore_unknown_options == true) {
+        }
+        else if (option_type == '?')
+        {
+            if (to_ignore_unknown_options == true)
+            {
                 continue;
             }
             this->SetLastError("Bad input parameter");
             rc = PARSE_ERROR_SHOW_USAGE;
             goto argv_err_exit;
-        } else if (returned_option_types_vec[option_type] == true) {
+        }
+        else if (returned_option_types_vec[option_type] == true)
+        {
             long_opt_name = this->short_opt_to_long_opt[option_type];
             goto do_handle_option;
-        } else {
+        }
+        else
+        {
             this->SetLastError("getopt_long_only() returned character code 0%o", option_type);
             goto parse_exit;
         }
 
-do_handle_option:
-        CommandLineRequester * p_req = this->long_opt_to_req_map[long_opt_name];
+    do_handle_option:
+        CommandLineRequester* p_req = this->long_opt_to_req_map[long_opt_name];
         bool ignore_this_req = false;
-        if (p_ignored_requesters_list) {
+        if (p_ignored_requesters_list)
+        {
             for (list_p_command_line_req::iterator it = p_ignored_requesters_list->begin();
-                 it != p_ignored_requesters_list->end(); ++it) {
-                if (p_req == (*it)) {
+                 it != p_ignored_requesters_list->end();
+                 ++it)
+            {
+                if (p_req == (*it))
+                {
                     ignore_this_req = true;
                     break;
                 }
             }
         }
-        if (ignore_this_req == false) {
-            try{
+        if (ignore_this_req == false)
+        {
+            try
+            {
                 curr_result = p_req->HandleOption(long_opt_name, (tools_optarg == NULL) ? "" : tools_optarg);
-            }catch (std::exception &exc){
+            }
+            catch (std::exception& exc)
+            {
                 this->SetLastError(exc.what());
                 goto parse_exit;
             }
-            if (curr_result) {
+            if (curr_result)
+            {
                 rc = curr_result;
                 this->SetLastError("Failed to handle option %s", long_opt_name.c_str());
                 goto parse_exit;
@@ -590,8 +675,10 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
         continue;
     }
 
-    if (tools_optind < argc) {
-        while (tools_optind < argc) {
+    if (tools_optind < argc)
+    {
+        while (tools_optind < argc)
+        {
             this->last_unknown_options += internal_argv[tools_optind];
             this->last_unknown_options += " ";
             ++tools_optind;
@@ -599,7 +686,8 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
         /*if (this->last_unknown_options != "")   //remove last space
             this->last_unknown_options.erase(this->last_unknown_options.end() - 1,
                     this->last_unknown_options.end());*/
-        if (to_ignore_unknown_options == false) {
+        if (to_ignore_unknown_options == false)
+        {
             string str = "Found some non-option ARGV-elements ";
             str += this->last_unknown_options;
             this->SetLastError(str.c_str());
@@ -610,54 +698,62 @@ ParseStatus CommandLineParser::ParseOptions(int argc, char **argv,
     rc = PARSE_OK;
 parse_exit:
     for (int i = 0; i < argc; ++i)
-        delete [] internal_argv[i];
-    delete [] internal_argv;
-    delete [] options_arr;
+        delete[] internal_argv[i];
+    delete[] internal_argv;
+    delete[] options_arr;
     return rc;
 argv_err_exit:
     for (int i = 0; i < argc; ++i)
-        delete [] internal_argv[i];
-    delete [] internal_argv;
-    if (options_arr) {
-        delete [] options_arr;
+        delete[] internal_argv[i];
+    delete[] internal_argv;
+    if (options_arr)
+    {
+        delete[] options_arr;
     }
     return rc;
 }
 
-
 /*Static functions*/
 
 static string CreateIndentFromInt(int ident_size)
 {
     string ident = "";
     int i;
-    for (i = 0; i < ident_size; i++) {
+    for (i = 0; i < ident_size; i++)
+    {
         ident += " ";
     }
     return ident;
 }
 
-
 static void FindAndReplace(string& source, string::size_type pos, string const& find, string const& replace)
 {
-    for (string::size_type i = pos; (i = source.find(find, i)) != string::npos;) {
+    for (string::size_type i = pos; (i = source.find(find, i)) != string::npos;)
+    {
         source.replace(i, find.length(), replace);
         i += replace.length();
     }
 }
 
-
-static bool FindAndHandleNewLinePos(string& str, int& product_length, int& local_space_size, int& str_type_len,
-                                    int& new_line_pos, string newline_and_ident, int deli_is_space)
+static bool FindAndHandleNewLinePos(string& str,
+                                    int& product_length,
+                                    int& local_space_size,
+                                    int& str_type_len,
+                                    int& new_line_pos,
+                                    string newline_and_ident,
+                                    int deli_is_space)
 {
     int plus_one_for_space = 1 * deli_is_space;
-    if (!deli_is_space) {
+    if (!deli_is_space)
+    {
         new_line_pos = str.substr(product_length + local_space_size, str_type_len).find("\n");
-    } else {
-        new_line_pos = str.substr(product_length + local_space_size + 1, str.npos).
-                       find_last_of(" ", str_type_len - 1);
     }
-    if ((size_t)new_line_pos != str.npos) {
+    else
+    {
+        new_line_pos = str.substr(product_length + local_space_size + 1, str.npos).find_last_of(" ", str_type_len - 1);
+    }
+    if ((size_t)new_line_pos != str.npos)
+    {
         new_line_pos += local_space_size + product_length + plus_one_for_space;
         str.replace(new_line_pos, 1, newline_and_ident);
         return true;
diff --git a/cmdparser/cmdparser.h b/cmdparser/cmdparser.h
index 5f7cb6be..564e3701 100644
--- a/cmdparser/cmdparser.h
+++ b/cmdparser/cmdparser.h
@@ -30,11 +30,9 @@
  * SOFTWARE.
  */
 
-
 #ifndef _OPT_PARSER_H_
 #define _OPT_PARSER_H_
 
-
 #include <stdlib.h>
 #include <list>
 #include <vector>
@@ -42,39 +40,41 @@
 #include <string>
 using namespace std;
 
-
 /******************************************************/
 typedef enum
 {
-    //Returns: 0 - OK / 1 - parsing error / 2 - OK but need to exit / 3 - some other error
+    // Returns: 0 - OK / 1 - parsing error / 2 - OK but need to exit / 3 - some other error
     PARSE_OK = 0,
     PARSE_ERROR = 1,
     PARSE_OK_WITH_EXIT = 3,
     PARSE_ERROR_SHOW_USAGE = 4
 } ParseStatus;
 
-typedef struct option_ifc {
-    string option_name;             //must be valid
-    char option_short_name;         //can be used as short option, if space than no short flag
-    string option_value;            //if "" has no argument
-    string description;             //will be display in usage
-    int  numOfSpaces;
-    bool hidden;                    //if hidden than will not be diaplayed in regular usage
+typedef struct option_ifc
+{
+    string option_name;     // must be valid
+    char option_short_name; // can be used as short option, if space than no short flag
+    string option_value;    // if "" has no argument
+    string description;     // will be display in usage
+    int numOfSpaces;
+    bool hidden; // if hidden than will not be diaplayed in regular usage
     bool is_mandatory;
 } option_ifc_t;
 
-typedef struct optional_help_section_data {
+typedef struct optional_help_section_data
+{
     // format is:
     // <str1>: <str2> (with alignments)
-    string name;                    //section's name
-    string str1;                    //left string
-    string str2;                    //right string
+    string name; // section's name
+    string str1; // left string
+    string str2; // right string
 } optional_sec_data_t;
 
-typedef vector < struct option_ifc > vec_option_t;
-typedef vector < pair < string, vector < struct optional_help_section_data > > > optional_sections_t;
+typedef vector<struct option_ifc> vec_option_t;
+typedef vector<pair<string, vector<struct optional_help_section_data> > > optional_sections_t;
 
-class CommandLineRequester {
+class CommandLineRequester
+{
 protected:
     // members
     vec_option_t options;
@@ -83,7 +83,7 @@ class CommandLineRequester {
     optional_sections_t optional_sections_vec;
 
     // methods
-    string BuildOptStr(option_ifc_t &opt);
+    string BuildOptStr(option_ifc_t& opt);
     string FormatUsageStr(string str, int str_type_len, int ident_size, int is_not_description, bool is_left_side);
     string GetUsageOptionalSection(vector<struct optional_help_section_data> section_vec);
     string GetUsageOptional1Str(vector<struct optional_help_section_data>::iterator it);
@@ -93,10 +93,7 @@ class CommandLineRequester {
     // methods
     CommandLineRequester(string req_name) : name(req_name) {}
     virtual ~CommandLineRequester() {}
-    inline void setToolName(string req_name)
-    {
-        name = req_name;
-    }
+    inline void setToolName(string req_name) { name = req_name; }
     inline void AddOptions(option_ifc_t options[], int arr_size)
     {
         for (int i = 0; i < arr_size; ++i)
@@ -108,7 +105,7 @@ class CommandLineRequester {
                            string description,
                            bool hidden = false,
                            bool is_mandatory = false,
-                           int  numOfSpaces = 0)
+                           int numOfSpaces = 0)
     {
         option_ifc_t opt;
         opt.option_name = option_name;
@@ -120,10 +117,7 @@ class CommandLineRequester {
         opt.is_mandatory = is_mandatory;
         this->options.push_back(opt);
     }
-    inline void AddDescription(string desc)
-    {
-        this->description = desc;
-    }
+    inline void AddDescription(string desc) { this->description = desc; }
 
     inline vec_option_t& GetOptions() { return this->options; }
     inline string& GetName() { return this->name; }
@@ -140,14 +134,13 @@ class CommandLineRequester {
     virtual ParseStatus HandleOption(string name, string value) = 0;
 };
 
-
 /******************************************************/
-typedef list < CommandLineRequester* > list_p_command_line_req;
-typedef map < char, string > map_char_str;
-typedef map < string, CommandLineRequester* > map_str_p_command_line_req;
-
+typedef list<CommandLineRequester*> list_p_command_line_req;
+typedef map<char, string> map_char_str;
+typedef map<string, CommandLineRequester*> map_str_p_command_line_req;
 
-class CommandLineParser {
+class CommandLineParser
+{
 private:
     // members
     list_p_command_line_req p_requesters_list;
@@ -159,30 +152,25 @@ class CommandLineParser {
     string last_unknown_options;
 
     // methods
-    void SetLastError(const char *fmt, ...);
+    void SetLastError(const char* fmt, ...);
+
 public:
     // methods
-    CommandLineParser(string parser_name) :
-        name(parser_name), last_error(""), last_unknown_options("") {}
+    CommandLineParser(string parser_name) : name(parser_name), last_error(""), last_unknown_options("") {}
     ~CommandLineParser() {}
 
     inline const char* GetErrDesc() { return this->last_error.c_str(); }
     inline const char* GetUnknownOptions() { return this->last_unknown_options.c_str(); }
-    inline void setParserName(string parser_name)
-    {
-        name = parser_name;
-    }
-    int AddRequester(CommandLineRequester *p_req);      //if multiple option than fail
+    inline void setParserName(string parser_name) { name = parser_name; }
+    int AddRequester(CommandLineRequester* p_req); // if multiple option than fail
 
-    ParseStatus ParseOptions(int argc, char **argv,
+    ParseStatus ParseOptions(int argc,
+                             char** argv,
                              bool to_ignore_unknown_options = false,
-                             list_p_command_line_req *p_ignored_requesters_list = NULL);
+                             list_p_command_line_req* p_ignored_requesters_list = NULL);
 
     string GetSynopsis(bool hidden_options = false);
     string GetUsage(bool hidden_options = false, vector<string> excluded_sections = vector<string>());
 };
 
-
-#endif          /* not defined _OPT_PARSER_H_ */
-
-
+#endif /* not defined _OPT_PARSER_H_ */
diff --git a/cmdparser/my_getopt.c b/cmdparser/my_getopt.c
index 23400cfe..5a3ed01d 100644
--- a/cmdparser/my_getopt.c
+++ b/cmdparser/my_getopt.c
@@ -23,24 +23,24 @@
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
- #ifndef _NO_PROTO
- #define _NO_PROTO
- #endif
+#ifndef _NO_PROTO
+#define _NO_PROTO
+#endif
 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
- #if !defined(__STDC__) || !__STDC__
+#if !defined(__STDC__) || !__STDC__
 /* This is a separate conditional since some stdc systems
    reject `defined (const)'.  */
- #ifndef const
- #define const
- #endif
- #endif
+#ifndef const
+#define const
+#endif
+#endif
 
- #include <stdio.h>
- #include <stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C
@@ -50,50 +50,48 @@
    program understand `configure --with-gnu-libc' and omit the object files,
    it is simpler to just do this in the source for each such file.  */
 
- #define GETOPT_INTERFACE_VERSION 2
- #if !defined(_LIBC) && defined(__GLIBC__) && __GLIBC__ >= 2
- #include <gnu-versions.h>
- #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
- #define ELIDE_CODE
- #endif
- #endif
-
-
+#define GETOPT_INTERFACE_VERSION 2
+#if !defined(_LIBC) && defined(__GLIBC__) && __GLIBC__ >= 2
+#include <gnu-versions.h>
+#if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
+#define ELIDE_CODE
+#endif
+#endif
 
 /* This needs to come after some library #include
    to get __GNU_LIBRARY__ defined.  */
- #ifdef  __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
 /* Don't include stdlib.h for non-GNU C libraries because some of them
    contain conflicting prototypes for getopt.  */
- #include <stdlib.h>
- #include <unistd.h>
- #endif  /* GNU C library.  */
-
- #ifdef HAVE_STRING_H
- # include <string.h>       /* strstr / strdup */
- #else
- # ifdef HAVE_STRINGS_H
- #  include <strings.h>       /* strstr / strdup */
- # endif
- #endif
-
- #ifdef VMS
- #include <unixlib.h>
- #if HAVE_STRING_H - 0
- #include <string.h>
- #endif
- #endif
+#include <stdlib.h>
+#include <unistd.h>
+#endif /* GNU C library.  */
+
+#ifdef HAVE_STRING_H
+#include <string.h> /* strstr / strdup */
+#else
+#ifdef HAVE_STRINGS_H
+#include <strings.h> /* strstr / strdup */
+#endif
+#endif
+
+#ifdef VMS
+#include <unixlib.h>
+#if HAVE_STRING_H - 0
+#include <string.h>
+#endif
+#endif
 #include <string.h>
- #ifndef _
+#ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
- #ifdef HAVE_LIBINTL_H
- # include <libintl.h>
- # define _(msgid)       gettext(msgid)
- #else
- # define _(msgid)       (msgid)
- #endif
- #endif
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#define _(msgid) gettext(msgid)
+#else
+#define _(msgid) (msgid)
+#endif
+#endif
 
 /* This version of `getopt' appears to the caller like standard Unix `getopt'
    but it behaves differently for the user, since it allows the user
@@ -109,7 +107,7 @@
    GNU application programs can use a third alternative mode in which
    they can distinguish the relative order of options and other arguments.  */
 
- #include "my_getopt.h"
+#include "my_getopt.h"
 
 /* For communication from `getopt' to the caller.
    When `getopt' finds an option that takes an argument,
@@ -117,7 +115,7 @@
    Also, when `ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
-char *tools_optarg = NULL;
+char* tools_optarg = NULL;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
@@ -147,7 +145,7 @@ int __getopt_initialized = 0;
    If this is zero, or a null string, it means resume the scan
    by advancing to the next ARGV-element.  */
 
-static char *nextchar;
+static char* nextchar;
 
 /* Callers store zero here to inhibit the error message
    for unrecognized options.  */
@@ -189,30 +187,30 @@ int tools_optopt = '?';
    of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
    `--' can cause `getopt' to return -1 with `tools_optind' != ARGC.  */
 
-static enum
-{
-    REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
+static enum { REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER } ordering;
 
 /* Value of POSIXLY_CORRECT environment variable.  */
-static char *posixly_correct;
+static char* posixly_correct;
 
- #ifdef  __GNU_LIBRARY__
+#ifdef __GNU_LIBRARY__
 /* We want to avoid inclusion of string.h with non-GNU libraries
    because there are many ways it can cause trouble.
    On some systems, it contains special magic macros that don't work
    in GCC.  */
- #include <string.h>
- #define my_index        strchr
- #else
+#include <string.h>
+#define my_index strchr
+#else
 
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
 
-static char* my_index(const char *str, const char chr) {
-    while (*str) {
-        if (*str == chr) {
-            return (char*) str;
+static char* my_index(const char* str, const char chr)
+{
+    while (*str)
+    {
+        if (*str == chr)
+        {
+            return (char*)str;
         }
         str++;
     }
@@ -221,17 +219,17 @@ static char* my_index(const char *str, const char chr) {
 
 /* If using GCC, we can safely declare strlen this way.
    If not using GCC, it is ok not to declare it.  */
- #ifdef __GNUC__
+#ifdef __GNUC__
 /* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h.
    That was relevant to code that was here before.  */
- #if !defined(__STDC__) || !__STDC__
+#if !defined(__STDC__) || !__STDC__
 /* gcc with -traditional declares the built-in strlen to return int,
    and has done so at least since version 2.4.5. -- rms.  */
 extern int strlen(const char*);
- #endif /* not __STDC__ */
- #endif /* __GNUC__ */
+#endif /* not __STDC__ */
+#endif /* __GNUC__ */
 
- #endif /* not __GNU_LIBRARY__ */
+#endif /* not __GNU_LIBRARY__ */
 
 /* Handle permutation of arguments.  */
 
@@ -242,44 +240,43 @@ extern int strlen(const char*);
 static int first_nonopt;
 static int last_nonopt;
 
- #ifdef _LIBC
+#ifdef _LIBC
 /* Bash 2.0 gives us an environment variable containing flags
    indicating ARGV elements that should not be considered arguments.  */
 
 /* Defined in getopt_init.c  */
-extern char *__getopt_nonoption_flags;
+extern char* __getopt_nonoption_flags;
 
 static int nonoption_flags_max_len;
 static int nonoption_flags_len;
 
 static int original_argc;
-static char*const *original_argv;
+static char* const* original_argv;
 
 /* Make sure the environment variable bash 2.0 puts in the environment
    is valid for the getopt call we must make sure that the ARGV passed
    to getopt is that one passed to the process.  */
-static void
-__attribute__ ((unused)) store_args_and_env(int argc, char*const *argv)
+static void __attribute__((unused)) store_args_and_env(int argc, char* const* argv)
 {
     /* XXX This is no good solution.  We should rather copy the args so
        that we can compare them later.  But we must not use malloc(3).  */
     original_argc = argc;
     original_argv = argv;
 }
- # ifdef text_set_element
+#ifdef text_set_element
 text_set_element(__libc_subinit, store_args_and_env);
- # endif /* text_set_element */
-
- # define SWAP_FLAGS(ch1, ch2) \
-    if (nonoption_flags_len > 0)                                                \
-    {                                                                         \
-        char __tmp = __getopt_nonoption_flags[ch1];                             \
-        __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2];          \
-        __getopt_nonoption_flags[ch2] = __tmp;                                  \
+#endif /* text_set_element */
+
+#define SWAP_FLAGS(ch1, ch2)                                           \
+    if (nonoption_flags_len > 0)                                       \
+    {                                                                  \
+        char __tmp = __getopt_nonoption_flags[ch1];                    \
+        __getopt_nonoption_flags[ch1] = __getopt_nonoption_flags[ch2]; \
+        __getopt_nonoption_flags[ch2] = __tmp;                         \
     }
- #else   /* !_LIBC */
- # define SWAP_FLAGS(ch1, ch2)
- #endif  /* _LIBC */
+#else /* !_LIBC */
+#define SWAP_FLAGS(ch1, ch2)
+#endif /* _LIBC */
 
 /* Exchange two adjacent subsequences of ARGV.
    One subsequence is elements [first_nonopt,last_nonopt)
@@ -290,50 +287,56 @@ text_set_element(__libc_subinit, store_args_and_env);
    `first_nonopt' and `last_nonopt' are relocated so that they describe
    the new indices of the non-options in ARGV after they are moved.  */
 
- #if defined(__STDC__) && __STDC__
+#if defined(__STDC__) && __STDC__
 static void exchange(char**);
- #endif
+#endif
 
-static void exchange(char **argv)
+static void exchange(char** argv)
 {
     int bottom = first_nonopt;
     int middle = last_nonopt;
     int top = tools_optind;
-    char *tem;
+    char* tem;
 
     /* Exchange the shorter segment with the far end of the longer segment.
        That puts the shorter segment into the right place.
        It leaves the longer segment in the right place overall,
        but it consists of two parts that need to be swapped next.  */
 
- #ifdef _LIBC
+#ifdef _LIBC
     /* First make sure the handling of the `__getopt_nonoption_flags'
        string can work normally.  Our top argument must be in the range
        of the string.  */
-    if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len) {
+    if (nonoption_flags_len > 0 && top >= nonoption_flags_max_len)
+    {
         /* We must extend the array.  The user plays games with us and
            presents new arguments.  */
-        char *new_str = malloc(top + 1);
-        if (new_str == NULL) {
+        char* new_str = malloc(top + 1);
+        if (new_str == NULL)
+        {
             nonoption_flags_len = nonoption_flags_max_len = 0;
-        } else {
-            memset(__mempcpy(new_str, __getopt_nonoption_flags,
-                             nonoption_flags_max_len),
-                   '\0', top + 1 - nonoption_flags_max_len);
+        }
+        else
+        {
+            memset(__mempcpy(new_str, __getopt_nonoption_flags, nonoption_flags_max_len), '\0',
+                   top + 1 - nonoption_flags_max_len);
             nonoption_flags_max_len = top + 1;
             __getopt_nonoption_flags = new_str;
         }
     }
- #endif
+#endif
 
-    while (top > middle && middle > bottom) {
-        if (top - middle > middle - bottom) {
+    while (top > middle && middle > bottom)
+    {
+        if (top - middle > middle - bottom)
+        {
             /* Bottom segment is the short one.  */
             int len = middle - bottom;
             register int i;
 
             /* Swap it with the top part of the top segment.  */
-            for (i = 0; i < len; i++) {
+            for (i = 0; i < len; i++)
+            {
                 tem = argv[bottom + i];
                 argv[bottom + i] = argv[top - (middle - bottom) + i];
                 argv[top - (middle - bottom) + i] = tem;
@@ -341,13 +344,16 @@ static void exchange(char **argv)
             }
             /* Exclude the moved bottom segment from further swapping.  */
             top -= len;
-        } else {
+        }
+        else
+        {
             /* Top segment is the short one.  */
             int len = top - middle;
             register int i;
 
             /* Swap it with the bottom part of the bottom segment.  */
-            for (i = 0; i < len; i++) {
+            for (i = 0; i < len; i++)
+            {
                 tem = argv[bottom + i];
                 argv[bottom + i] = argv[middle + i];
                 argv[middle + i] = tem;
@@ -366,17 +372,17 @@ static void exchange(char **argv)
 
 /* Initialize the internal data when the first call is made.  */
 
- #if defined(__STDC__) && __STDC__
-static const char* _getopt_initialize(int, char*const*, const char*);
- #endif
-static const char* _getopt_initialize(int argc, char* const *argv, const char *optstring)
+#if defined(__STDC__) && __STDC__
+static const char* _getopt_initialize(int, char* const*, const char*);
+#endif
+static const char* _getopt_initialize(int argc, char* const* argv, const char* optstring)
 {
     /* Start processing options with ARGV-element 1 (since ARGV-element 0
        is the program name); the sequence of previously skipped
        non-option ARGV-elements is empty.  */
     // avoid compiler warnings
-    (void) argc;
-    (void) argv;
+    (void)argc;
+    (void)argv;
     first_nonopt = last_nonopt = tools_optind;
 
     nextchar = NULL;
@@ -385,46 +391,60 @@ static const char* _getopt_initialize(int argc, char* const *argv, const char *o
 
     /* Determine how to handle the ordering of options and nonoptions.  */
 
-    if (optstring[0] == '-') {
+    if (optstring[0] == '-')
+    {
         ordering = RETURN_IN_ORDER;
         ++optstring;
-    } else if (optstring[0] == '+') {
+    }
+    else if (optstring[0] == '+')
+    {
         ordering = REQUIRE_ORDER;
         ++optstring;
-    } else if (posixly_correct != NULL) {
+    }
+    else if (posixly_correct != NULL)
+    {
         ordering = REQUIRE_ORDER;
-    } else {
+    }
+    else
+    {
         ordering = PERMUTE;
     }
 
- #ifdef _LIBC
-    if (posixly_correct == NULL
-        && argc == original_argc && argv == original_argv) {
-        if (nonoption_flags_max_len == 0) {
-            if (__getopt_nonoption_flags == NULL
-                || __getopt_nonoption_flags[0] == '\0') {
+#ifdef _LIBC
+    if (posixly_correct == NULL && argc == original_argc && argv == original_argv)
+    {
+        if (nonoption_flags_max_len == 0)
+        {
+            if (__getopt_nonoption_flags == NULL || __getopt_nonoption_flags[0] == '\0')
+            {
                 nonoption_flags_max_len = -1;
-            } else {
-                const char *orig_str = __getopt_nonoption_flags;
+            }
+            else
+            {
+                const char* orig_str = __getopt_nonoption_flags;
                 int len = nonoption_flags_max_len = strlen(orig_str);
-                if (nonoption_flags_max_len < argc) {
+                if (nonoption_flags_max_len < argc)
+                {
                     nonoption_flags_max_len = argc;
                 }
-                __getopt_nonoption_flags =
-                    (char*) malloc(nonoption_flags_max_len);
-                if (__getopt_nonoption_flags == NULL) {
+                __getopt_nonoption_flags = (char*)malloc(nonoption_flags_max_len);
+                if (__getopt_nonoption_flags == NULL)
+                {
                     nonoption_flags_max_len = -1;
-                } else {
-                    memset(__mempcpy(__getopt_nonoption_flags, orig_str, len),
-                           '\0', nonoption_flags_max_len - len);
+                }
+                else
+                {
+                    memset(__mempcpy(__getopt_nonoption_flags, orig_str, len), '\0', nonoption_flags_max_len - len);
                 }
             }
         }
         nonoption_flags_len = nonoption_flags_max_len;
-    } else {
+    }
+    else
+    {
         nonoption_flags_len = 0;
     }
- #endif
+#endif
 
     return optstring;
 }
@@ -485,13 +505,20 @@ static const char* _getopt_initialize(int argc, char* const *argv, const char *o
    If LONG_ONLY is nonzero, '-' as well as '--' can introduce
    long-named options.  */
 
-int _getopt_internal(int argc, char* const *argv, const char *optstring, const struct option *longopts, int *longind, int long_only)
+int _getopt_internal(int argc,
+                     char* const* argv,
+                     const char* optstring,
+                     const struct option* longopts,
+                     int* longind,
+                     int long_only)
 {
     tools_optarg = NULL;
 
-    if (tools_optind == 0 || !__getopt_initialized) {
-        if (tools_optind == 0) {
-            tools_optind = 1;  /* Don't scan ARGV[0], the program name.  */
+    if (tools_optind == 0 || !__getopt_initialized)
+    {
+        if (tools_optind == 0)
+        {
+            tools_optind = 1; /* Don't scan ARGV[0], the program name.  */
         }
         optstring = _getopt_initialize(argc, argv, optstring);
         __getopt_initialized = 1;
@@ -501,40 +528,48 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
        Either it does not have option syntax, or there is an environment flag
        from the shell indicating it is not an option.  The later information
        is only used when the used in the GNU libc.  */
- #ifdef _LIBC
- #define NONOPTION_P (argv[tools_optind][0] != '-' || argv[tools_optind][1] == '\0'        \
-                      || (tools_optind < nonoption_flags_len                         \
-                          && __getopt_nonoption_flags[tools_optind] == '1'))
- #else
- #define NONOPTION_P (argv[tools_optind][0] != '-' || argv[tools_optind][1] == '\0')
- #endif
-
-    if (nextchar == NULL || *nextchar == '\0') {
+#ifdef _LIBC
+#define NONOPTION_P                                                   \
+    (argv[tools_optind][0] != '-' || argv[tools_optind][1] == '\0' || \
+     (tools_optind < nonoption_flags_len && __getopt_nonoption_flags[tools_optind] == '1'))
+#else
+#define NONOPTION_P (argv[tools_optind][0] != '-' || argv[tools_optind][1] == '\0')
+#endif
+
+    if (nextchar == NULL || *nextchar == '\0')
+    {
         /* Advance to the next ARGV-element.  */
 
         /* Give FIRST_NONOPT & LAST_NONOPT rational values if OPTIND has been
            moved back by the user (who may also have changed the arguments).  */
-        if (last_nonopt > tools_optind) {
+        if (last_nonopt > tools_optind)
+        {
             last_nonopt = tools_optind;
         }
-        if (first_nonopt > tools_optind) {
+        if (first_nonopt > tools_optind)
+        {
             first_nonopt = tools_optind;
         }
 
-        if (ordering == PERMUTE) {
+        if (ordering == PERMUTE)
+        {
             /* If we have just processed some options following some non-options,
                exchange them so that the options come first.  */
 
-            if (first_nonopt != last_nonopt && last_nonopt != tools_optind) {
-                exchange((char**) argv);
-            } else if (last_nonopt != tools_optind) {
+            if (first_nonopt != last_nonopt && last_nonopt != tools_optind)
+            {
+                exchange((char**)argv);
+            }
+            else if (last_nonopt != tools_optind)
+            {
                 first_nonopt = tools_optind;
             }
 
             /* Skip any additional non-options
                and extend the range of non-options previously skipped.  */
 
-            while (tools_optind < argc && NONOPTION_P) {
+            while (tools_optind < argc && NONOPTION_P)
+            {
                 tools_optind++;
             }
             last_nonopt = tools_optind;
@@ -545,12 +580,16 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
            then exchange with previous non-options as if it were an option,
            then skip everything else like a non-option.  */
 
-        if (tools_optind != argc && !strcmp(argv[tools_optind], "--")) {
+        if (tools_optind != argc && !strcmp(argv[tools_optind], "--"))
+        {
             tools_optind++;
 
-            if (first_nonopt != last_nonopt && last_nonopt != tools_optind) {
-                exchange((char**) argv);
-            } else if (first_nonopt == last_nonopt) {
+            if (first_nonopt != last_nonopt && last_nonopt != tools_optind)
+            {
+                exchange((char**)argv);
+            }
+            else if (first_nonopt == last_nonopt)
+            {
                 first_nonopt = tools_optind;
             }
             last_nonopt = argc;
@@ -561,10 +600,12 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
         /* If we have done all the ARGV-elements, stop the scan
            and back over any non-options that we skipped and permuted.  */
 
-        if (tools_optind == argc) {
+        if (tools_optind == argc)
+        {
             /* Set the next-arg-index to point at the non-options
                that we previously skipped, so the caller will digest them.  */
-            if (first_nonopt != last_nonopt) {
+            if (first_nonopt != last_nonopt)
+            {
                 tools_optind = first_nonopt;
             }
             return -1;
@@ -573,8 +614,10 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
         /* If we have come to a non-option and did not permute it,
            either stop the scan or describe it to the caller and pass it by.  */
 
-        if (NONOPTION_P) {
-            if (ordering == REQUIRE_ORDER) {
+        if (NONOPTION_P)
+        {
+            if (ordering == REQUIRE_ORDER)
+            {
                 return -1;
             }
             tools_optarg = argv[tools_optind++];
@@ -584,8 +627,7 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
         /* We have found another option-ARGV-element.
            Skip the initial punctuation.  */
 
-        nextchar = (argv[tools_optind] + 1
-                    + (longopts != NULL && argv[tools_optind][1] == '-'));
+        nextchar = (argv[tools_optind] + 1 + (longopts != NULL && argv[tools_optind][1] == '-'));
     }
 
     /* Decode the current option-ARGV-element.  */
@@ -603,12 +645,12 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
 
        This distinction seems to be the most useful approach.  */
 
-    if (longopts != NULL
-        && (argv[tools_optind][1] == '-'
-            || (long_only && (argv[tools_optind][2] || !my_index(optstring, argv[tools_optind][1]))))) {
-        char *nameend;
-        const struct option *p;
-        const struct option *pfound = NULL;
+    if (longopts != NULL && (argv[tools_optind][1] == '-' ||
+                             (long_only && (argv[tools_optind][2] || !my_index(optstring, argv[tools_optind][1])))))
+    {
+        char* nameend;
+        const struct option* p;
+        const struct option* pfound = NULL;
         int exact = 0;
         int ambig = 0;
         int indfound = -1;
@@ -620,28 +662,34 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
         /* Test all long options for either exact match
            or abbreviated matches.  */
         for (p = longopts, option_index = 0; p->name; p++, option_index++)
-            if (!strncmp(p->name, nextchar, nameend - nextchar)) {
-                if ((unsigned int) (nameend - nextchar)
-                    == (unsigned int) strlen(p->name)) {
+            if (!strncmp(p->name, nextchar, nameend - nextchar))
+            {
+                if ((unsigned int)(nameend - nextchar) == (unsigned int)strlen(p->name))
+                {
                     /* Exact match found.  */
                     pfound = p;
                     indfound = option_index;
                     exact = 1;
                     break;
-                } else if (pfound == NULL) {
+                }
+                else if (pfound == NULL)
+                {
                     /* First nonexact match found.  */
                     pfound = p;
                     indfound = option_index;
-                } else {
+                }
+                else
+                {
                     /* Second or later nonexact match found.  */
                     ambig = 1;
                 }
             }
 
-        if (ambig && !exact) {
-            if (tools_opterr) {
-                fprintf(stderr, _("%s: option `%s' is ambiguous\n"),
-                        argv[0], argv[tools_optind]);
+        if (ambig && !exact)
+        {
+            if (tools_opterr)
+            {
+                fprintf(stderr, _("%s: option `%s' is ambiguous\n"), argv[0], argv[tools_optind]);
             }
             nextchar += strlen(nextchar);
             tools_optind++;
@@ -649,26 +697,32 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
             return '?';
         }
 
-        if (pfound != NULL) {
+        if (pfound != NULL)
+        {
             option_index = indfound;
             tools_optind++;
-            if (*nameend) {
+            if (*nameend)
+            {
                 /* Don't test has_arg with >, because some C compilers don't
                    allow it to be used on enums.  */
-                if (pfound->has_arg) {
+                if (pfound->has_arg)
+                {
                     tools_optarg = nameend + 1;
-                } else {
-                    if (tools_opterr) {
-                        if (argv[tools_optind - 1][1] == '-') {
+                }
+                else
+                {
+                    if (tools_opterr)
+                    {
+                        if (argv[tools_optind - 1][1] == '-')
+                        {
                             /* --option */
-                            fprintf(stderr,
-                                    _("%s: option `--%s' doesn't allow an argument\n"),
-                                    argv[0], pfound->name);
-                        } else {
+                            fprintf(stderr, _("%s: option `--%s' doesn't allow an argument\n"), argv[0], pfound->name);
+                        }
+                        else
+                        {
                             /* +option or -option */
-                            fprintf(stderr,
-                                    _("%s: option `%c%s' doesn't allow an argument\n"),
-                                    argv[0], argv[tools_optind - 1][0], pfound->name);
+                            fprintf(stderr, _("%s: option `%c%s' doesn't allow an argument\n"), argv[0],
+                                    argv[tools_optind - 1][0], pfound->name);
                         }
                     }
                     nextchar += strlen(nextchar);
@@ -676,14 +730,18 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
                     tools_optopt = pfound->val;
                     return '?';
                 }
-            } else if (pfound->has_arg == 1) {
-                if (tools_optind < argc) {
+            }
+            else if (pfound->has_arg == 1)
+            {
+                if (tools_optind < argc)
+                {
                     tools_optarg = argv[tools_optind++];
-                } else {
-                    if (tools_opterr) {
-                        fprintf(stderr,
-                                _("%s: option `%s' requires an argument\n"),
-                                argv[0], argv[tools_optind - 1]);
+                }
+                else
+                {
+                    if (tools_opterr)
+                    {
+                        fprintf(stderr, _("%s: option `%s' requires an argument\n"), argv[0], argv[tools_optind - 1]);
                     }
                     nextchar += strlen(nextchar);
                     tools_optopt = pfound->val;
@@ -691,10 +749,12 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
                 }
             }
             nextchar += strlen(nextchar);
-            if (longind != NULL) {
+            if (longind != NULL)
+            {
                 *longind = option_index;
             }
-            if (pfound->flag) {
+            if (pfound->flag)
+            {
                 *(pfound->flag) = pfound->val;
                 return 0;
             }
@@ -705,20 +765,22 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
            or the option starts with '--' or is not a valid short
            option, then it's an error.
            Otherwise interpret it as a short option.  */
-        if (!long_only || argv[tools_optind][1] == '-'
-            || my_index(optstring, *nextchar) == NULL) {
-            if (tools_opterr) {
-                if (argv[tools_optind][1] == '-') {
+        if (!long_only || argv[tools_optind][1] == '-' || my_index(optstring, *nextchar) == NULL)
+        {
+            if (tools_opterr)
+            {
+                if (argv[tools_optind][1] == '-')
+                {
                     /* --option */
-                    fprintf(stderr, _("%s: unrecognized option `--%s'\n"),
-                            argv[0], nextchar);
-                } else {
+                    fprintf(stderr, _("%s: unrecognized option `--%s'\n"), argv[0], nextchar);
+                }
+                else
+                {
                     /* +option or -option */
-                    fprintf(stderr, _("%s: unrecognized option `%c%s'\n"),
-                            argv[0], argv[tools_optind][0], nextchar);
+                    fprintf(stderr, _("%s: unrecognized option `%c%s'\n"), argv[0], argv[tools_optind][0], nextchar);
                 }
             }
-            nextchar = (char*) "";
+            nextchar = (char*)"";
             tools_optind++;
             tools_optopt = 0;
             return '?';
@@ -729,57 +791,70 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
 
     {
         char c = *nextchar++;
-        char *temp = my_index(optstring, c);
+        char* temp = my_index(optstring, c);
 
         /* Increment `tools_optind' when we start to process its last character.  */
-        if (*nextchar == '\0') {
+        if (*nextchar == '\0')
+        {
             ++tools_optind;
         }
 
-        if (temp == NULL || c == ':') {
-            if (tools_opterr) {
-                if (posixly_correct) {
+        if (temp == NULL || c == ':')
+        {
+            if (tools_opterr)
+            {
+                if (posixly_correct)
+                {
                     /* 1003.2 specifies the format of this message.  */
-                    fprintf(stderr, _("%s: illegal option -- %c\n"),
-                            argv[0], c);
-                } else {
-                    fprintf(stderr, _("%s: invalid option -- %c\n"),
-                            argv[0], c);
+                    fprintf(stderr, _("%s: illegal option -- %c\n"), argv[0], c);
+                }
+                else
+                {
+                    fprintf(stderr, _("%s: invalid option -- %c\n"), argv[0], c);
                 }
             }
             tools_optopt = c;
             return '?';
         }
         /* Convenience. Treat POSIX -W foo same as long option --foo */
-        if (temp[0] == 'W' && temp[1] == ';') {
-            char *nameend;
-            const struct option *p;
-            const struct option *pfound = NULL;
+        if (temp[0] == 'W' && temp[1] == ';')
+        {
+            char* nameend;
+            const struct option* p;
+            const struct option* pfound = NULL;
             int exact = 0;
             int ambig = 0;
             int indfound = 0;
             int option_index;
 
             /* This is an option that requires an argument.  */
-            if (*nextchar != '\0') {
+            if (*nextchar != '\0')
+            {
                 tools_optarg = nextchar;
                 /* If we end this ARGV-element by taking the rest as an arg,
                    we must advance to the next element now.  */
                 tools_optind++;
-            } else if (tools_optind == argc) {
-                if (tools_opterr) {
+            }
+            else if (tools_optind == argc)
+            {
+                if (tools_opterr)
+                {
                     /* 1003.2 specifies the format of this message.  */
-                    fprintf(stderr, _("%s: option requires an argument -- %c\n"),
-                            argv[0], c);
+                    fprintf(stderr, _("%s: option requires an argument -- %c\n"), argv[0], c);
                 }
                 tools_optopt = c;
-                if (optstring[0] == ':') {
+                if (optstring[0] == ':')
+                {
                     c = ':';
-                } else {
+                }
+                else
+                {
                     c = '?';
                 }
                 return c;
-            } else {
+            }
+            else
+            {
                 /* We already incremented `tools_optind' once;
                    increment it again when taking next ARGV-elt as argument.  */
                 tools_optarg = argv[tools_optind++];
@@ -794,40 +869,53 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
             /* Test all long options for either exact match
                or abbreviated matches.  */
             for (p = longopts, option_index = 0; p->name; p++, option_index++)
-                if (!strncmp(p->name, nextchar, nameend - nextchar)) {
-                    if ((unsigned int) (nameend - nextchar) == strlen(p->name)) {
+                if (!strncmp(p->name, nextchar, nameend - nextchar))
+                {
+                    if ((unsigned int)(nameend - nextchar) == strlen(p->name))
+                    {
                         /* Exact match found.  */
                         pfound = p;
                         indfound = option_index;
                         exact = 1;
                         break;
-                    } else if (pfound == NULL) {
+                    }
+                    else if (pfound == NULL)
+                    {
                         /* First nonexact match found.  */
                         pfound = p;
                         indfound = option_index;
-                    } else {
+                    }
+                    else
+                    {
                         /* Second or later nonexact match found.  */
                         ambig = 1;
                     }
                 }
-            if (ambig && !exact) {
-                if (tools_opterr) {
-                    fprintf(stderr, _("%s: option `-W %s' is ambiguous\n"),
-                            argv[0], argv[tools_optind]);
+            if (ambig && !exact)
+            {
+                if (tools_opterr)
+                {
+                    fprintf(stderr, _("%s: option `-W %s' is ambiguous\n"), argv[0], argv[tools_optind]);
                 }
                 nextchar += strlen(nextchar);
                 tools_optind++;
                 return '?';
             }
-            if (pfound != NULL) {
+            if (pfound != NULL)
+            {
                 option_index = indfound;
-                if (*nameend) {
+                if (*nameend)
+                {
                     /* Don't test has_arg with >, because some C compilers don't
                        allow it to be used on enums.  */
-                    if (pfound->has_arg) {
+                    if (pfound->has_arg)
+                    {
                         tools_optarg = nameend + 1;
-                    } else {
-                        if (tools_opterr) {
+                    }
+                    else
+                    {
+                        if (tools_opterr)
+                        {
                             fprintf(stderr, _("\
  %s: option `-W %s' doesn't allow an argument\n"),
                                     argv[0], pfound->name);
@@ -836,63 +924,84 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
                         nextchar += strlen(nextchar);
                         return '?';
                     }
-                } else if (pfound->has_arg == 1) {
-                    if (tools_optind < argc) {
+                }
+                else if (pfound->has_arg == 1)
+                {
+                    if (tools_optind < argc)
+                    {
                         tools_optarg = argv[tools_optind++];
-                    } else {
-                        if (tools_opterr) {
-                            fprintf(stderr,
-                                    _("%s: option `%s' requires an argument\n"),
-                                    argv[0], argv[tools_optind - 1]);
+                    }
+                    else
+                    {
+                        if (tools_opterr)
+                        {
+                            fprintf(stderr, _("%s: option `%s' requires an argument\n"), argv[0],
+                                    argv[tools_optind - 1]);
                         }
                         nextchar += strlen(nextchar);
                         return optstring[0] == ':' ? ':' : '?';
                     }
                 }
                 nextchar += strlen(nextchar);
-                if (longind != NULL) {
+                if (longind != NULL)
+                {
                     *longind = option_index;
                 }
-                if (pfound->flag) {
+                if (pfound->flag)
+                {
                     *(pfound->flag) = pfound->val;
                     return 0;
                 }
                 return pfound->val;
             }
             nextchar = NULL;
-            return 'W';  /* Let the application handle it.   */
+            return 'W'; /* Let the application handle it.   */
         }
-        if (temp[1] == ':') {
-            if (temp[2] == ':') {
+        if (temp[1] == ':')
+        {
+            if (temp[2] == ':')
+            {
                 /* This is an option that accepts an argument optionally.  */
-                if (*nextchar != '\0') {
+                if (*nextchar != '\0')
+                {
                     tools_optarg = nextchar;
                     tools_optind++;
-                } else {
+                }
+                else
+                {
                     tools_optarg = NULL;
                 }
                 nextchar = NULL;
-            } else {
+            }
+            else
+            {
                 /* This is an option that requires an argument.  */
-                if (*nextchar != '\0') {
+                if (*nextchar != '\0')
+                {
                     tools_optarg = nextchar;
                     /* If we end this ARGV-element by taking the rest as an arg,
                        we must advance to the next element now.  */
                     tools_optind++;
-                } else if (tools_optind == argc) {
-                    if (tools_opterr) {
+                }
+                else if (tools_optind == argc)
+                {
+                    if (tools_opterr)
+                    {
                         /* 1003.2 specifies the format of this message.  */
-                        fprintf(stderr,
-                                _("%s: option requires an argument -- %c\n"),
-                                argv[0], c);
+                        fprintf(stderr, _("%s: option requires an argument -- %c\n"), argv[0], c);
                     }
                     tools_optopt = c;
-                    if (optstring[0] == ':') {
+                    if (optstring[0] == ':')
+                    {
                         c = ':';
-                    } else {
+                    }
+                    else
+                    {
                         c = '?';
                     }
-                } else {
+                }
+                else
+                {
                     /* We already incremented `tools_optind' once;
                        increment it again when taking next ARGV-elt as argument.  */
                     tools_optarg = argv[tools_optind++];
@@ -904,92 +1013,90 @@ int _getopt_internal(int argc, char* const *argv, const char *optstring, const s
     }
 }
 
-int tools_getopt(int argc, char* const *argv, const char *optstring)
+int tools_getopt(int argc, char* const* argv, const char* optstring)
 {
-    return _getopt_internal(argc, argv, optstring,
-                            (const struct option*) 0,
-                            (int*) 0,
-                            0);
+    return _getopt_internal(argc, argv, optstring, (const struct option*)0, (int*)0, 0);
 }
 
-int tools_getopt_long(int argc, char* const *argv, const char *optstring, const struct option *longopts, int *longindex)
+int tools_getopt_long(int argc, char* const* argv, const char* optstring, const struct option* longopts, int* longindex)
 {
-    return _getopt_internal(argc, argv, optstring,
-                            longopts,
-                            longindex,
-                            0);
+    return _getopt_internal(argc, argv, optstring, longopts, longindex, 0);
 }
 
-
-int tools_getopt_long_only(int argc, char* const *argv, const char *optstring, const struct option *longopts, int *longindex)
+int tools_getopt_long_only(int argc,
+                           char* const* argv,
+                           const char* optstring,
+                           const struct option* longopts,
+                           int* longindex)
 {
-    return _getopt_internal(argc, argv, optstring,
-                            longopts,
-                            longindex,
-                            1);
+    return _getopt_internal(argc, argv, optstring, longopts, longindex, 1);
 }
 
-
- #ifdef TEST
+#ifdef TEST
 
 /* Compile with -DTEST to make an executable for use in testing
    the above definition of `getopt'.  */
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     int c;
     int digit_optind = 0;
 
-    while (1) {
+    while (1)
+    {
         int this_option_optind = tools_optind ? tools_optind : 1;
 
         c = getopt(argc, argv, "abc:d:0123456789");
-        if (c == -1) {
+        if (c == -1)
+        {
             break;
         }
 
         switch (c)
         {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-            if (digit_optind != 0 && digit_optind != this_option_optind) {
-                printf("digits occur in two different argv-elements.\n");
-            }
-            digit_optind = this_option_optind;
-            printf("option %c\n", c);
-            break;
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                if (digit_optind != 0 && digit_optind != this_option_optind)
+                {
+                    printf("digits occur in two different argv-elements.\n");
+                }
+                digit_optind = this_option_optind;
+                printf("option %c\n", c);
+                break;
 
-        case 'a':
-            printf("option a\n");
-            break;
+            case 'a':
+                printf("option a\n");
+                break;
 
-        case 'b':
-            printf("option b\n");
-            break;
+            case 'b':
+                printf("option b\n");
+                break;
 
-        case 'c':
-            printf("option c with value `%s'\n", tools_optarg);
-            break;
+            case 'c':
+                printf("option c with value `%s'\n", tools_optarg);
+                break;
 
-        case '?':
-            break;
+            case '?':
+                break;
 
-        default:
-            printf("?? getopt returned character code 0%o ??\n", c);
+            default:
+                printf("?? getopt returned character code 0%o ??\n", c);
         }
     }
 
-    if (tools_optind < argc) {
+    if (tools_optind < argc)
+    {
         printf("non-option ARGV-elements: ");
-        while (tools_optind < argc) {
+        while (tools_optind < argc)
+        {
             printf("%s ", argv[tools_optind++]);
         }
         printf("\n");
@@ -998,7 +1105,7 @@ int main(int argc, char **argv)
     exit(0);
 }
 
- #endif /* TEST */
+#endif /* TEST */
 
 int hello()
 {
diff --git a/cmdparser/my_getopt.h b/cmdparser/my_getopt.h
index 932563ab..6aa6be27 100644
--- a/cmdparser/my_getopt.h
+++ b/cmdparser/my_getopt.h
@@ -17,106 +17,99 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
- #ifndef _TOOLS_GETOPT_H
- #define _TOOLS_GETOPT_H
+#ifndef _TOOLS_GETOPT_H
+#define _TOOLS_GETOPT_H
 
- #ifdef  __cplusplus
-extern "C" {
- #endif
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
+    /* For communication from `getopt' to the caller.
+       When `getopt' finds an option that takes an argument,
+       the argument value is returned here.
+       Also, when `ordering' is RETURN_IN_ORDER,
+       each non-option ARGV-element is returned here.  */
 
-extern char *tools_optarg;
+    extern char* tools_optarg;
 
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
+    /* Index in ARGV of the next element to be scanned.
+       This is used for communication to and from the caller
+       and for communication between successive calls to `getopt'.
 
-   On entry to `getopt', zero means this is the first call; initialize.
+       On entry to `getopt', zero means this is the first call; initialize.
 
-   When `getopt' returns -1, this is the index of the first of the
-   non-option elements that the caller should itself scan.
+       When `getopt' returns -1, this is the index of the first of the
+       non-option elements that the caller should itself scan.
 
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
+       Otherwise, `optind' communicates from one call to the next
+       how much of ARGV has been scanned so far.  */
 
-extern int tools_optind;
+    extern int tools_optind;
 
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
+    /* Callers store zero here to inhibit the error message `getopt' prints
+       for unrecognized options.  */
 
-extern int tools_opterr;
+    extern int tools_opterr;
 
-/* Set to an option character which was unrecognized.  */
+    /* Set to an option character which was unrecognized.  */
 
-extern int tools_optopt;
+    extern int tools_optopt;
 
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
+    /* Describe the long-named options requested by the application.
+       The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
+       of `struct option' terminated by an element containing a name which is
+       zero.
 
-   The field `has_arg' is:
-   no_argument          (or 0) if the option does not take an argument,
-   required_argument    (or 1) if the option requires an argument,
-   optional_argument    (or 2) if the option takes an optional argument.
+       The field `has_arg' is:
+       no_argument          (or 0) if the option does not take an argument,
+       required_argument    (or 1) if the option requires an argument,
+       optional_argument    (or 2) if the option takes an optional argument.
 
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
+       If the field `flag' is not NULL, it points to a variable that is set
+       to the value given in the field `val' when the option is found, but
+       left unchanged if the option is not found.
 
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
+       To have a long-named option do something other than set an `int' to
+       a compiled-in constant, such as set a value from `optarg', set the
+       option's `flag' field to zero and its `val' field to a nonzero
+       value (the equivalent single-letter option character, if there is
+       one).  For long options that have a zero `flag' field, `getopt'
+       returns the contents of the `val' field.  */
 
-struct option
-{
- #if defined(__STDC__) && __STDC__
-    const char *name;
- #else
-    char *name;
- #endif
-    /* has_arg can't be an enum because some compilers complain about
-       type mismatches in all the code that assumes it is an int.  */
-    int has_arg;
-    int *flag;
-    int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
- #define tools_no_argument             0
- #define tools_required_argument       1
- #define tools_optional_argument       2
-
-int tools_getopt(
-    int argc,
-    char*const *argv,
-    const char *shortopts);
-
-int tools_getopt_long(
-    int argc,
-    char*const *argv,
-    const char *shortopts,
-    const struct option *longopts,
-    int *longind);
-
-int tools_getopt_long_only(
-    int argc,
-    char*const *argv,
-    const char *shortopts,
-    const struct option *longopts,
-    int *longind);
-
- #ifdef  __cplusplus
+    struct option
+    {
+#if defined(__STDC__) && __STDC__
+        const char* name;
+#else
+    char* name;
+#endif
+        /* has_arg can't be an enum because some compilers complain about
+           type mismatches in all the code that assumes it is an int.  */
+        int has_arg;
+        int* flag;
+        int val;
+    };
+
+    /* Names for the values of the `has_arg' field of `struct option'.  */
+
+#define tools_no_argument 0
+#define tools_required_argument 1
+#define tools_optional_argument 2
+
+    int tools_getopt(int argc, char* const* argv, const char* shortopts);
+
+    int
+      tools_getopt_long(int argc, char* const* argv, const char* shortopts, const struct option* longopts, int* longind);
+
+    int tools_getopt_long_only(int argc,
+                               char* const* argv,
+                               const char* shortopts,
+                               const struct option* longopts,
+                               int* longind);
+
+#ifdef __cplusplus
 }
- #endif
+#endif
 
- #endif /* _TOOLS_GETOPT_H */
+#endif /* _TOOLS_GETOPT_H */
diff --git a/common/autocomplete/mft_help_to_completion.py b/common/autocomplete/mft_help_to_completion.py
index 0a9a544a..2fad2a7b 100755
--- a/common/autocomplete/mft_help_to_completion.py
+++ b/common/autocomplete/mft_help_to_completion.py
@@ -1,4 +1,4 @@
-#--
+# --
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # This software is available to you under a choice of one of two
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 #!/usr/bin/python
 ### imports ###
@@ -37,42 +37,46 @@
 import subprocess
 import argparse
 
-def buildTree( linesList, tabIndex, nodeSons ):
+
+def buildTree(linesList, tabIndex, nodeSons):
     if len(linesList) == 0:
-        return ("" , nodeSons)
+        return ("", nodeSons)
     nodeStr = linesList[0]
     if not isNodeStr(nodeStr):
-        return buildTree( linesList[1:], tabIndex, nodeSons )
+        return buildTree(linesList[1:], tabIndex, nodeSons)
     nodeTab = getNodeTab(nodeStr)
     if nodeTab == tabIndex:
         return (nodeSons, linesList)
     if (tabIndex - nodeTab) == 1:
-        nodeName=getNodeName(nodeStr)
-        remineLines, nodeSons = buildTree(linesList[1:], nodeTab, [] )
-        nodeStruct={ 'nodeName' : nodeName ,  'nodeSons' : nodeSons }
-        return buildTree( linesList[1:], nodeTab, nodeSons.add(nodeStruct) )
+        nodeName = getNodeName(nodeStr)
+        remineLines, nodeSons = buildTree(linesList[1:], nodeTab, [])
+        nodeStruct = {'nodeName': nodeName, 'nodeSons': nodeSons}
+        return buildTree(linesList[1:], nodeTab, nodeSons.add(nodeStruct))
+
 
 def isNewNode(line, queryCommand):
     if queryCommand:
         if ":" in line:
-            index  = line.find(":")
-            charBF = line[index-1]
+            index = line.find(":")
+            charBF = line[index - 1]
             return (charBF == "" or charBF == " ")
     removeLeadingZero = line.strip(" ")
     if removeLeadingZero and removeLeadingZero[0] == "-":
         return True
     return False
 
+
 def isInfoFlag(line):
     if line[0] != " " and line[0] != "-":
         return True
     return False
 
+
 def keepOnlyNodes(filesList):
-    helpLineOnlyNodes=[]
+    helpLineOnlyNodes = []
     onNodedescription = False
     queryCommand = False
-    node=""
+    node = ""
     for line in filesList:
         if line.strip(" ") == "" or line == '\n':
             continue
@@ -87,133 +91,143 @@ def keepOnlyNodes(filesList):
             onNodedescription = False
             continue
         if isNewNode(line, queryCommand):
-            if node!= "":
+            if node != "":
                 helpLineOnlyNodes.append(node)
             onNodedescription = True
-            node=line
+            node = line
             if ":" not in line:
-                node=node+" :"
+                node = node + " :"
             continue
         if onNodedescription:
-            node=node+" " + line.strip(" ")
+            node = node + " " + line.strip(" ")
     helpLineOnlyNodes.append(node)
     return helpLineOnlyNodes
 
 
-#-l |--loopback   <loopback>             : Configure Loopback Mode [NO(no loopback)/PH(phy loopback)/EX(external loopback)]
+# -l |--loopback   <loopback>             : Configure Loopback Mode [NO(no loopback)/PH(phy loopback)/EX(external loopback)]
 
 def isShortCutsLine(line):
     if "|" in line:
-        lineSplit=line.split("|")[0].strip(" ")
-        lineSpaceSplit=lineSplit.split(" ")
-        lineSpaceWords = list(filter( lambda x: x != "" ,lineSpaceSplit))
+        lineSplit = line.split("|")[0].strip(" ")
+        lineSpaceSplit = lineSplit.split(" ")
+        lineSpaceWords = list(filter(lambda x: x != "", lineSpaceSplit))
         return (len(lineSpaceWords) <= 1)
     return False
 
+
 def getNodeShortCutsAndName(line):
-    shortCuts=""
-    name=""
+    shortCuts = ""
+    name = ""
     line = line.strip(" ")
     if isShortCutsLine(line):
         lineSplit = line.split("|")
-        rightFlag=lineSplit[0].strip(" ")
-        leftFlag=lineSplit[1].strip(" ").split(" ")[0]
+        rightFlag = lineSplit[0].strip(" ")
+        leftFlag = lineSplit[1].strip(" ").split(" ")[0]
         if len(rightFlag) > len(leftFlag):
             return leftFlag, rightFlag
         else:
             return rightFlag, leftFlag
-    name=line.split(" ")[0]
+    name = line.split(" ")[0]
     return shortCuts, name
 
+
 def getSonsAndUpperNeededFromVals(sonsValsSplit):
-    upperNeed="1"
-    sons=""
-    lastVal=""
+    upperNeed = "1"
+    sons = ""
+    lastVal = ""
     if "..." in sonsValsSplit:
         threePointsIndex = sonsValsSplit.index("...")
-        if threePointsIndex < len(sonsValsSplit)-1:
-            numBefore = int(sonsValsSplit[threePointsIndex-1]) + 1
-            numAfter  = int(sonsValsSplit[threePointsIndex+1])
-            arr=range(numBefore,numAfter)
-            sonsValsSplit[threePointsIndex] = " ".join(map(lambda x : str(x), arr))
+        if threePointsIndex < len(sonsValsSplit) - 1:
+            numBefore = int(sonsValsSplit[threePointsIndex - 1]) + 1
+            numAfter = int(sonsValsSplit[threePointsIndex + 1])
+            arr = range(numBefore, numAfter)
+            sonsValsSplit[threePointsIndex] = " ".join(map(lambda x: str(x), arr))
     for val in sonsValsSplit:
         sonVal = val.split('(')[0]
-        sons=sons+ " " + sonVal
+        sons = sons + " " + sonVal
         if not sonVal.isupper():
-            upperNeed=""
+            upperNeed = ""
     return sons, upperNeed
 
+
 def getSonsValsFromLine(line):
-    ret=""
+    ret = ""
     lineSplit = line.split("[")[1:]
     for sons in lineSplit:
-        ret=ret + sons.split("]")[0]
+        ret = ret + sons.split("]")[0]
     return ret
 
+
 def getNodeTypeSonsUpperNeedAndLastCommandIndex(line):
-    lastCommandIndex="-1"
-    sons=""
-    nodeType="0"
-    upperNeed=""
+    lastCommandIndex = "-1"
+    sons = ""
+    nodeType = "0"
+    upperNeed = ""
     if "[" in line:
-        lastCommandIndex="1"
-        sonsVals=getSonsValsFromLine(line)
-        sonsValsSplit=[]
+        lastCommandIndex = "1"
+        sonsVals = getSonsValsFromLine(line)
+        sonsValsSplit = []
         if "/" in sonsVals:
-            nodeType="3"
-            sonsValsSplit=sonsVals.split("/")
+            nodeType = "3"
+            sonsValsSplit = sonsVals.split("/")
         elif "," in sonsVals:
-            nodeType="4"
-            sonsValsSplit=sonsVals.split(",")
+            nodeType = "4"
+            sonsValsSplit = sonsVals.split(",")
         else:
-            nodeType="3"
-            sonsValsSplit=[sonsVals]
+            nodeType = "3"
+            sonsValsSplit = [sonsVals]
         sons, upperNeed = getSonsAndUpperNeededFromVals(sonsValsSplit)
     return nodeType, sons, upperNeed, lastCommandIndex
 
+
 def parseLine(line):
-    node={ 'shortCut': "" , 'name' : "" , 'lastCommandIndex' : "" , 'nodeType' :  "" , 'sons' : "" , 'extra' : "" , 'upperNeed' : "" , 'description' : "" }
+    node = {'shortCut': "", 'name': "", 'lastCommandIndex': "", 'nodeType': "", 'sons': "", 'extra': "", 'upperNeed': "", 'description': ""}
     lineSplitByColoumn = line.split(":")
     shortCut, name = getNodeShortCutsAndName(lineSplitByColoumn[0])
-    node["shortCut"]=" ".join(shortCut.split())
-    node["name"] =" ".join(name.split())
-    node["description"]=lineSplitByColoumn[1]
-    nodeType,sons,upperNeed,lastCommandIndex = getNodeTypeSonsUpperNeedAndLastCommandIndex(line)
-    node["nodeType"]=nodeType
-    node["sons"]=sons
-    node["upperNeed"]=upperNeed
-    node["lastCommandIndex"]=lastCommandIndex
+    node["shortCut"] = " ".join(shortCut.split())
+    node["name"] = " ".join(name.split())
+    node["description"] = lineSplitByColoumn[1]
+    nodeType, sons, upperNeed, lastCommandIndex = getNodeTypeSonsUpperNeedAndLastCommandIndex(line)
+    node["nodeType"] = nodeType
+    node["sons"] = sons
+    node["upperNeed"] = upperNeed
+    node["lastCommandIndex"] = lastCommandIndex
     return node
 
+
 def getNumOfLeadingZeroFromLine(line):
-    count=0
+    count = 0
     for char in line:
         if char == " ":
-            count+=1
+            count += 1
         elif char == "\t":
-            count+=4
+            count += 4
         else:
             return count
     return count
 
+
 def getTabLevelFromLine(line):
     numOfLeadingZeros = getNumOfLeadingZeroFromLine(line)
     return int(numOfLeadingZeros / 4)
 
+
 def getUserInput():
     my_parser = argparse.ArgumentParser()
-    my_parser.add_argument('-n','--name', action='store', type=str ,  help="Tool Name", required=True)
-    my_parser.add_argument('-o','--output',  action='store', type=int, default=1, choices=[1],  help="Output: 1- build structs for Auto-Compeletion(Default)")
-    my_parser.add_argument('-c','--command',  action='store', type=str, default="", help="Full Command Line: ")
+    my_parser.add_argument('-n', '--name', action='store', type=str, help="Tool Name", required=True)
+    my_parser.add_argument('-o', '--output', action='store', type=int, default=1, choices=[1], help="Output: 1- build structs for Auto-Compeletion(Default)")
+    my_parser.add_argument('-c', '--command', action='store', type=str, default="", help="Full Command Line: ")
 
     args = my_parser.parse_args()
     return vars(args)
 
+
 def isCommandNode(node):
     return node["name"][0] != "-"
 
+
 def isNeedUpdateNode(prevNode, prevIndex, currNode, CurrIndex):
-    if prevNode == None:
+    if prevNode is None:
         return True
     if isCommandNode(prevNode):
         if isCommandNode(currNode):
@@ -223,71 +237,73 @@ def isNeedUpdateNode(prevNode, prevIndex, currNode, CurrIndex):
     else:
         return CurrIndex > prevIndex
 
+
 def buildMSTNodesTree(commandLine):
-    nodesTree=[]
+    nodesTree = []
     filesList = subprocess.check_output("sudo mst help", shell=True).decode().split("\n")
-    options=""
-    params=""
-    sons=""
-    extra=""
-    lastNodeStruct={ 'shortCut': "" , 'name' : "" , 'lastCommandIndex' : "1" , 'nodeType' :  "0" , 'sons' : "" , 'extra' : "" , 'upperNeed' : "" , 'description' : ""}
-    mstMainNodeSons=""
+    options = ""
+    params = ""
+    sons = ""
+    extra = ""
+    lastNodeStruct = {'shortCut': "", 'name': "", 'lastCommandIndex': "1", 'nodeType': "0", 'sons': "", 'extra': "", 'upperNeed': "", 'description': ""}
+    mstMainNodeSons = ""
     for line in reversed(filesList):
         lineRemovingLeadingZero = line.strip(" ")
         if len(lineRemovingLeadingZero) == 0:
             continue
         if lineRemovingLeadingZero[0:3] == "mst":
             splitLine = lineRemovingLeadingZero[4:].split(" ")
-            nodeName=splitLine.pop(0)
+            nodeName = splitLine.pop(0)
             if nodeName not in mstMainNodeSons.split(" "):
-                mstMainNodeSons = mstMainNodeSons +  " " + nodeName
+                mstMainNodeSons = mstMainNodeSons + " " + nodeName
             if nodeName not in commandLine.split(" "):
                 continue
             if lastNodeStruct["name"] != nodeName:
                 if lastNodeStruct["name"] != "" and lastNodeStruct["sons"].strip(" ") != "":
                     nodesTree.append(lastNodeStruct)
-                lastNodeStruct={ 'shortCut': "" , 'name' : nodeName , 'lastCommandIndex' : "1" , 'nodeType' :  "0" , 'sons' : "" , 'extra' : "" , 'upperNeed' : "" , 'description' : ""}
+                lastNodeStruct = {'shortCut': "", 'name': nodeName, 'lastCommandIndex': "1", 'nodeType': "0", 'sons': "", 'extra': "", 'upperNeed': "", 'description': ""}
             for son in reversed(splitLine):
                 if son[0] == "<":
                     continue
                 if son[0] == "[":
-                    sonName=son.replace("[", "").replace("]","")
+                    sonName = son.replace("[", "").replace("]", "")
                     if sonName == "OPTIONS":
-                        extra=extra+options+sons
-                        sons=""
+                        extra = extra + options + sons
+                        sons = ""
                     elif sonName == "params":
-                        extra=params
+                        extra = params
                     else:
-                        sons=sons+" "+sonName
+                        sons = sons + " " + sonName
                 else:
                     if sons == "":
                         if extra != "":
-                            sons=extra
-                            extra=""
+                            sons = extra
+                            extra = ""
                     if sons != "":
-                        nodesTree.append({ 'shortCut': "" , 'name' : son , 'lastCommandIndex' : "1" , 'nodeType' :  "0" , 'sons' : sons , 'extra' : extra , 'upperNeed' : "" , 'description' : ""})
-                    sons=son
-                    params=""
-                    options=""
-            lastNodeStruct["sons"]= lastNodeStruct["sons"] + " " +   sons
-            sons=""
-            params=""
-            options=""
+                        nodesTree.append({'shortCut': "", 'name': son, 'lastCommandIndex': "1", 'nodeType': "0", 'sons': sons, 'extra': extra, 'upperNeed': "", 'description': ""})
+                    sons = son
+                    params = ""
+                    options = ""
+            lastNodeStruct["sons"] = lastNodeStruct["sons"] + " " + sons
+            sons = ""
+            params = ""
+            options = ""
         elif "params:" in line:
             paramsSplit = lineRemovingLeadingZero.split(" ")
             for param in paramsSplit:
                 if param[0] == "[":
-                    paramMame = param.replace("[", "").replace("]","")
-                    params=params + " " + paramMame
+                    paramMame = param.replace("[", "").replace("]", "")
+                    params = params + " " + paramMame
         elif lineRemovingLeadingZero[0] == "-":
-            options=options + " " + lineRemovingLeadingZero.split(" ")[0].replace(":", "")
+            options = options + " " + lineRemovingLeadingZero.split(" ")[0].replace(":", "")
     nodesTree.append(lastNodeStruct)
-    nodesTree.append({ 'shortCut': "" , 'name' : "mst" , 'lastCommandIndex' : "1" , 'nodeType' :  "0" , 'sons' : mstMainNodeSons , 'extra' : "" , 'upperNeed' : "" , 'description' : ""})
+    nodesTree.append({'shortCut': "", 'name': "mst", 'lastCommandIndex': "1", 'nodeType': "0", 'sons': mstMainNodeSons, 'extra': "", 'upperNeed': "", 'description': ""})
     return nodesTree
 
-def buildMFTTollNodesTree(toolName,commandLine):
-    nodesTree=[]
-    nodesTabs=["","","","","","","","","","","","","","","","","","",""]
+
+def buildMFTTollNodesTree(toolName, commandLine):
+    nodesTree = []
+    nodesTabs = ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""]
     try:
         filesList = subprocess.check_output(toolName + " -h", shell=True).decode().split("\n")
     # some tools supply --help only when executed by root. at this point auto-complete can not support them
@@ -295,81 +311,83 @@ def buildMFTTollNodesTree(toolName,commandLine):
         sys.exit(0)
 
     helpLineOnlyNodes = keepOnlyNodes(filesList)
-    tabLevel=0
+    tabLevel = 0
     tabLevelBestIndex = [0] * 8
-    tabLevelBestNode  = [None] * 8
+    tabLevelBestNode = [None] * 8
     for line in reversed(helpLineOnlyNodes):
         parsedLine = parseLine(line)
         tabLevel = getTabLevelFromLine(line)
         nodesTabs[tabLevel] = nodesTabs[tabLevel] + " " + parsedLine["name"]
-        sons = nodesTabs[tabLevel+1]
-        nodesTabs[tabLevel+1]=""
+        sons = nodesTabs[tabLevel + 1]
+        nodesTabs[tabLevel + 1] = ""
         if parsedLine["sons"] == "":
-            parsedLine["sons"]=sons
+            parsedLine["sons"] = sons
         else:
-            parsedLine["extra"]=sons
+            parsedLine["extra"] = sons
         flagIndex = -1
         splitCommand = commandLine.split(" ")
         if parsedLine["name"] in splitCommand:
             flagIndex = splitCommand.index(parsedLine["name"])
         elif parsedLine["shortCut"] in splitCommand and parsedLine["shortCut"] != "":
-            flagIndex =  splitCommand.index(parsedLine["shortCut"])
+            flagIndex = splitCommand.index(parsedLine["shortCut"])
         if flagIndex > -1:
             if isNeedUpdateNode(tabLevelBestNode[tabLevel], tabLevelBestIndex[tabLevel], parsedLine, flagIndex):
                 tabLevelBestNode[tabLevel] = parsedLine
-                tabLevelBestIndex[tabLevel]= flagIndex
-                for i in range(tabLevel+1, 8):
+                tabLevelBestIndex[tabLevel] = flagIndex
+                for i in range(tabLevel + 1, 8):
                     if tabLevelBestIndex[i] < flagIndex:
                         tabLevelBestNode[i] = None
     for bestTab in tabLevelBestNode:
-        if bestTab != None:
+        if bestTab is not None:
             nodesTree.append(bestTab)
 
-    nodesTree.append({ 'shortCut': "" , 'name' : toolName , 'lastCommandIndex' : "-1" , 'nodeType' :  "0" , 'sons' : " ".join(nodesTabs) , 'extra' : "" , 'upperNeed' : "" , 'description' : ""})
+    nodesTree.append({'shortCut': "", 'name': toolName, 'lastCommandIndex': "-1", 'nodeType': "0", 'sons': " ".join(nodesTabs), 'extra': "", 'upperNeed': "", 'description': ""})
     return nodesTree
 
-def buildNodesTree(toolName,commandLine):
+
+def buildNodesTree(toolName, commandLine):
     if toolName == "mst":
         return buildMSTNodesTree(commandLine)
     else:
-        return buildMFTTollNodesTree(toolName,commandLine)
+        return buildMFTTollNodesTree(toolName, commandLine)
 
 
 def buildShortCutsNodeListNodesDeclary(nodesTree):
-    shortCuts=""
-    nodesList=""
+    shortCuts = ""
+    nodesList = ""
     nodesDeclareArray = []
     for node in nodesTree:
-        shortCutVal  = node["shortCut"]
-        nodeNAme     = node["name"]
-        nodeSons     = node["sons"]
-        extra        = node["extra"]
+        shortCutVal = node["shortCut"]
+        nodeNAme = node["name"]
+        nodeSons = node["sons"]
+        extra = node["extra"]
         if nodeNAme == "--device" or nodeNAme == "-d" or nodeNAme == "-dev" or shortCutVal == "-d":
-            nodeSons="temp"
-            node["lastCommandIndex"]="1"
-            node["nodeType"]="2"
+            nodeSons = "temp"
+            node["lastCommandIndex"] = "1"
+            node["nodeType"] = "2"
         if shortCutVal != "":
-            shortCuts=shortCuts + " [\"" + shortCutVal + "\"]=\"" + nodeNAme + "\""
+            shortCuts = shortCuts + " [\"" + shortCutVal + "\"]=\"" + nodeNAme + "\""
         if nodeSons != "" or extra != "":
-            nodesList=nodesList + " " + nodeNAme
-            nodeDeclare="declare -A "+ nodeNAme.replace("-", "")+"=( [\"lastCommandIndex\"]="+node["lastCommandIndex"]+" [\"nodeType\"]=\""+node["nodeType"]+"\" [\"sons\"]=\""+nodeSons+"\" [\"extra\"]=\""+node["extra"]+"\" [\"upperNeed\"]="+node["upperNeed"]+" )\n"
+            nodesList = nodesList + " " + nodeNAme
+            nodeDeclare = "declare -A " + nodeNAme.replace("-", "") + "=( [\"lastCommandIndex\"]=" + node["lastCommandIndex"] + " [\"nodeType\"]=\"" + node["nodeType"] + "\" [\"sons\"]=\"" + nodeSons + "\" [\"extra\"]=\"" + node["extra"] + "\" [\"upperNeed\"]=" + node["upperNeed"] + " )\n"
             nodesDeclareArray.append(nodeDeclare)
-    return shortCuts,nodesList,nodesDeclareArray
+    return shortCuts, nodesList, nodesDeclareArray
+
 
 def printNodesStructures(nodesTree):
-    shortCuts,nodesList,nodesDeclareArray = buildShortCutsNodeListNodesDeclary(nodesTree)
+    shortCuts, nodesList, nodesDeclareArray = buildShortCutsNodeListNodesDeclary(nodesTree)
 
-    print ("declare -A shortcuts=( " + shortCuts + " )\n")
-    print ("nodes=\""+nodesList+"\"\n")
+    print("declare -A shortcuts=( " + shortCuts + " )\n")
+    print("nodes=\"" + nodesList + "\"\n")
     for declareLine in nodesDeclareArray:
-        print (declareLine)
+        print(declareLine)
 
 
 if __name__ == "__main__":
     userInput = getUserInput()
-    toolName=userInput["name"]
-    commandLine=userInput["command"]
+    toolName = userInput["name"]
+    commandLine = userInput["command"]
 
-    nodesTree = buildNodesTree(toolName,commandLine)
+    nodesTree = buildNodesTree(toolName, commandLine)
 
     printNodesStructures(nodesTree)
diff --git a/common/bit_slice.h b/common/bit_slice.h
index 7707971a..9f176433 100644
--- a/common/bit_slice.h
+++ b/common/bit_slice.h
@@ -34,30 +34,36 @@
 #define BIT_SLICE_H
 
 // BIT Slicing macros
-#define ONES32(size)                    ((size) ? (0xffffffff >> (32 - (size))) : 0)
-#define MASK32(offset, size)             (ONES32(size) << (offset))
+#define ONES32(size) ((size) ? (0xffffffff >> (32 - (size))) : 0)
+#define MASK32(offset, size) (ONES32(size) << (offset))
 
-#define EXTRACT_C(source, offset, size)   ((((unsigned)(source)) >> (offset)) & ONES32(size))
-#define EXTRACT(src, start, len)          (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
-#define EXT(src, end, start)              EXTRACT(src, start, end - start + 1)
+#define EXTRACT_C(source, offset, size) ((((unsigned)(source)) >> (offset)) & ONES32(size))
+#define EXTRACT(src, start, len) (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
+#define EXT(src, end, start) EXTRACT(src, start, end - start + 1)
 
-#define MERGE_C(rsrc1, rsrc2, start, len)  ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
-#define MERGE(rsrc1, rsrc2, start, len)    (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
+#define MERGE_C(rsrc1, rsrc2, start, len) \
+    ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
+#define MERGE(rsrc1, rsrc2, start, len) (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
 #define INSERTF(src1, start1, src2, start2, len) MERGE((src1), EXTRACT((src2), (start2), (len)), (start1), (len))
 
-#define ONES64(size)                    ((size) ? (0xffffffffffffffffULL >> (64 - (size))) : 0)
-#define MASK64(offset, size)             (ONES64(size) << (offset))
+#define ONES64(size) ((size) ? (0xffffffffffffffffULL >> (64 - (size))) : 0)
+#define MASK64(offset, size) (ONES64(size) << (offset))
 
-#define EXTRACT_C64(source, offset, size)   ((((unsigned long long)(source)) >> (offset)) & ONES64(size))
-#define EXTRACT64(src, start, len)          (((len) == 64) ? (src) : EXTRACT_C64(src, start, len))
+#define EXTRACT_C64(source, offset, size) ((((unsigned long long)(source)) >> (offset)) & ONES64(size))
+#define EXTRACT64(src, start, len) (((len) == 64) ? (src) : EXTRACT_C64(src, start, len))
 
-#define MERGE_C64(rsrc1, rsrc2, start, len)  ((((u_int64_t)(rsrc2) << (start)) & (MASK64((start), (len)))) | ((rsrc1) & (~MASK64((start), (len)))))
-#define MERGE64(rsrc1, rsrc2, start, len)    (((len) == 64) ? (rsrc2) : MERGE_C64(rsrc1, rsrc2, start, len))
+#define MERGE_C64(rsrc1, rsrc2, start, len) \
+    ((((u_int64_t)(rsrc2) << (start)) & (MASK64((start), (len)))) | ((rsrc1) & (~MASK64((start), (len)))))
+#define MERGE64(rsrc1, rsrc2, start, len) (((len) == 64) ? (rsrc2) : MERGE_C64(rsrc1, rsrc2, start, len))
 #define INSERTF64(src1, start1, src2, start2, len) MERGE64((src1), EXTRACT64((src2), (start2), (len)), (start1), (len))
-#define EXT64(src, end, start)              EXTRACT64(src, start, end - start + 1)
+#define EXT64(src, end, start) EXTRACT64(src, start, end - start + 1)
 
 #ifndef __cplusplus
-enum cpp_bool {false = 0, true};
+enum cpp_bool
+{
+    false = 0,
+    true
+};
 typedef unsigned char bool;
 #endif
 
diff --git a/common/compatibility.h b/common/compatibility.h
index 2eda7c81..e5991c28 100644
--- a/common/compatibility.h
+++ b/common/compatibility.h
@@ -42,182 +42,177 @@
 #include <stdio.h>
 
 #if defined(__ia64__) || defined(__x86_64__) || defined(__PPC64__) || defined(__arm__)
-    #define U64L       "l"
+#define U64L "l"
 #else
-    #define U64L       "ll"
+#define U64L "ll"
 #endif
 
-
 /* define macros to the architecture of the CPU */
 #if defined(__linux__) || defined(__FreeBSD__)
-#   if defined(__i386__)
-#       define ARCH_x86
-#   elif defined(__x86_64__)
-#       define ARCH_x86_64
-#   elif defined(__ia64__)
-#       define ARCH_ia64
-#   elif defined(__m68k__)
-#       define ARCH_m68k
-#   elif defined(__hppa__)
-#       define ARCH_hppa
-#   elif defined(__PPC64__) || defined(__s390x__)
-#       define ARCH_ppc64
-#   elif defined(__PPC__)
-#       define ARCH_ppc
-#   elif defined(__aarch64__)
-#       define ARCH_arm64
-#   elif defined(__arm__)
-#       define ARCH_arm6l
-#   elif defined(__riscv)
-#       define ARCH_riscv
-#   else
-#       error Unknown CPU architecture using the linux OS
-#   endif
-#elif defined(__MINGW32__) || defined(__MINGW64__)              /* Windows MINGW */
-#   if defined(__MINGW32__)
-#       define ARCH_x86
-#   elif defined(__MINGW64__)
-#       define ARCH_x86_64
-#   else
-#       error Unknown CPU architecture using the windows-mingw OS
-#   endif
-#elif defined(_WIN32) || defined(_WIN64)                /* Windows */
-#   if defined(_WIN32)
-#       define ARCH_x86
-#   elif defined(_WIN64)
-#       define ARCH_x86_64
-#   else
-#       error Unknown CPU architecture using the windows OS
-#   endif
-#else                                                   /* Unknown */
-#   error Unknown OS
+#if defined(__i386__)
+#define ARCH_x86
+#elif defined(__x86_64__)
+#define ARCH_x86_64
+#elif defined(__ia64__)
+#define ARCH_ia64
+#elif defined(__m68k__)
+#define ARCH_m68k
+#elif defined(__hppa__)
+#define ARCH_hppa
+#elif defined(__PPC64__) || defined(__s390x__)
+#define ARCH_ppc64
+#elif defined(__PPC__)
+#define ARCH_ppc
+#elif defined(__aarch64__)
+#define ARCH_arm64
+#elif defined(__arm__)
+#define ARCH_arm6l
+#elif defined(__riscv)
+#define ARCH_riscv
+#else
+#error Unknown CPU architecture using the linux OS
+#endif
+#elif defined(__MINGW32__) || defined(__MINGW64__) /* Windows MINGW */
+#if defined(__MINGW32__)
+#define ARCH_x86
+#elif defined(__MINGW64__)
+#define ARCH_x86_64
+#else
+#error Unknown CPU architecture using the windows-mingw OS
+#endif
+#elif defined(_WIN32) || defined(_WIN64) /* Windows */
+#if defined(_WIN32)
+#define ARCH_x86
+#elif defined(_WIN64)
+#define ARCH_x86_64
+#else
+#error Unknown CPU architecture using the windows OS
+#endif
+#else /* Unknown */
+#error Unknown OS
 #endif
 
 /* define macros for print fields */
-#define U32D_FMT    "%u"
-#define U32H_FMT    "0x%08x"
-#define UH_FMT          "0x%x"
-#define STR_FMT     "%s"
-#define U16H_FMT    "0x%04x"
-#define U8H_FMT     "0x%02x"
-
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || defined(ARCH_hppa)
-#   if defined(__MINGW32__) || defined(__MINGW64__)
-#       include <inttypes.h>
-#       define U64D_FMT    "0x%" PRId64
-#       define U64H_FMT    "0x%" PRIx64
-#       define U64H_FMT_GEN "" PRIx64
-#       define U48H_FMT    "0x%" PRIx64
-#       define U64D_FMT_GEN "" PRId64
-#   else
-#       define U64D_FMT     "%llu"
-#       define U64H_FMT     "0x%016llx"
-#       define U64H_FMT_GEN "llx"
-#       define U48H_FMT     "0x%012llx"
-#       define U64D_FMT_GEN "llu"
-#   endif
+#define U32D_FMT "%u"
+#define U32H_FMT "0x%08x"
+#define UH_FMT "0x%x"
+#define STR_FMT "%s"
+#define U16H_FMT "0x%04x"
+#define U8H_FMT "0x%02x"
+
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || \
+  defined(ARCH_hppa)
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <inttypes.h>
+#define U64D_FMT "0x%" PRId64
+#define U64H_FMT "0x%" PRIx64
+#define U64H_FMT_GEN "" PRIx64
+#define U48H_FMT "0x%" PRIx64
+#define U64D_FMT_GEN "" PRId64
+#else
+#define U64D_FMT "%llu"
+#define U64H_FMT "0x%016llx"
+#define U64H_FMT_GEN "llx"
+#define U48H_FMT "0x%012llx"
+#define U64D_FMT_GEN "llu"
+#endif
 #elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
-#    define U64D_FMT     "%lu"
-#    define U64H_FMT     "0x%016lx"
-#    define U48H_FMT     "0x%012lx"
-#    define U64H_FMT_GEN "lx"
-#    define U64D_FMT_GEN "lu"
+#define U64D_FMT "%lu"
+#define U64H_FMT "0x%016lx"
+#define U48H_FMT "0x%012lx"
+#define U64H_FMT_GEN "lx"
+#define U64D_FMT_GEN "lu"
 #else
-#   error Unknown architecture
-#endif  /* ARCH */
+#error Unknown architecture
+#endif /* ARCH */
 
 /*
  * Only for architectures which can't do swab by themselves
  */
 #define ___my_swab16(x) \
-    ((u_int16_t)( \
-         (((u_int16_t)(x) & (u_int16_t)0x00ffU) << 8) | \
-         (((u_int16_t)(x) & (u_int16_t)0xff00U) >> 8) ))
-#define ___my_swab32(x) \
-    ((u_int32_t)( \
-         (((u_int32_t)(x) & (u_int32_t)0x000000ffUL) << 24) | \
-         (((u_int32_t)(x) & (u_int32_t)0x0000ff00UL) <<  8) | \
-         (((u_int32_t)(x) & (u_int32_t)0x00ff0000UL) >>  8) | \
-         (((u_int32_t)(x) & (u_int32_t)0xff000000UL) >> 24) ))
-#define ___my_swab64(x) \
-    ((u_int64_t)( \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00000000000000ffULL) << 56) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x000000000000ff00ULL) << 40) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x0000000000ff0000ULL) << 24) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00000000ff000000ULL) <<  8) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x000000ff00000000ULL) >>  8) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x0000ff0000000000ULL) >> 24) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00ff000000000000ULL) >> 40) | \
-         (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0xff00000000000000ULL) >> 56) ))
+    ((u_int16_t)((((u_int16_t)(x) & (u_int16_t)0x00ffU) << 8) | (((u_int16_t)(x) & (u_int16_t)0xff00U) >> 8)))
+#define ___my_swab32(x)                                                                                        \
+    ((u_int32_t)(                                                                                              \
+      (((u_int32_t)(x) & (u_int32_t)0x000000ffUL) << 24) | (((u_int32_t)(x) & (u_int32_t)0x0000ff00UL) << 8) | \
+      (((u_int32_t)(x) & (u_int32_t)0x00ff0000UL) >> 8) | (((u_int32_t)(x) & (u_int32_t)0xff000000UL) >> 24)))
+#define ___my_swab64(x)                                                                   \
+    ((u_int64_t)((u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00000000000000ffULL) << 56) | \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x000000000000ff00ULL) << 40) | \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x0000000000ff0000ULL) << 24) | \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00000000ff000000ULL) << 8) |  \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x000000ff00000000ULL) >> 8) |  \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x0000ff0000000000ULL) >> 24) | \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0x00ff000000000000ULL) >> 40) | \
+                 (u_int64_t)(((u_int64_t)(x) & (u_int64_t)0xff00000000000000ULL) >> 56)))
 
 /*
  * Linux
  */
 #if defined(__linux__) || defined(__FreeBSD__)
 // #include <asm/byteorder.h>
-    #include <unistd.h>
-    #include <sys/types.h>
+#include <unistd.h>
+#include <sys/types.h>
 
-    #if defined(__FreeBSD__)
-    #include <sys/endian.h>
+#if defined(__FreeBSD__)
+#include <sys/endian.h>
 // WA: on FBSD the BYTE ORDER AND ENDIANESS names are different
-    #ifndef __BYTE_ORDER
-        #define __BYTE_ORDER _BYTE_ORDER
-    #endif
-    #ifndef __LITTLE_ENDIAN
-        #define __LITTLE_ENDIAN _LITTLE_ENDIAN
-    #endif
-    #ifndef __BIG_ENDIAN
-        #define __BIG_ENDIAN _BIG_ENDIAN
-    #endif
-    #else
-    #include <endian.h>
-    #endif
-
-    #undef __be64_to_cpu
-    #undef __be32_to_cpu
-    #undef __be16_to_cpu
-    #undef __cpu_to_be64
-    #undef __cpu_to_be32
-    #undef __cpu_to_be16
-    #undef __le64_to_cpu
-    #undef __le32_to_cpu
-    #undef __le16_to_cpu
-    #undef __cpu_to_le64
-    #undef __cpu_to_le32
-    #undef __cpu_to_le16
-
-    #if __BYTE_ORDER == __LITTLE_ENDIAN
-
-        #define __be64_to_cpu(x) ___my_swab64(x)
-        #define __be32_to_cpu(x) ___my_swab32(x)
-        #define __be16_to_cpu(x) ___my_swab16(x)
-        #define __cpu_to_be64(x) ___my_swab64(x)
-        #define __cpu_to_be32(x) ___my_swab32(x)
-        #define __cpu_to_be16(x) ___my_swab16(x)
-        #define __le64_to_cpu(x) (x)
-        #define __le32_to_cpu(x) (x)
-        #define __le16_to_cpu(x) (x)
-        #define __cpu_to_le64(x) (x)
-        #define __cpu_to_le32(x) (x)
-        #define __cpu_to_le16(x) (x)
-
-    #elif __BYTE_ORDER == __BIG_ENDIAN
-
-        #define __be64_to_cpu(x) (x)
-        #define __be32_to_cpu(x) (x)
-        #define __be16_to_cpu(x) (x)
-        #define __cpu_to_be64(x) (x)
-        #define __cpu_to_be32(x) (x)
-        #define __cpu_to_be16(x) (x)
-        #define __le64_to_cpu(x) ___my_swab64(x)
-        #define __le32_to_cpu(x) ___my_swab32(x)
-        #define __le16_to_cpu(x) ___my_swab16(x)
-        #define __cpu_to_le64(x) ___my_swab64(x)
-        #define __cpu_to_le32(x) ___my_swab32(x)
-        #define __cpu_to_le16(x) ___my_swab16(x)
-
-    #endif // __BYTE_ORDER
+#ifndef __BYTE_ORDER
+#define __BYTE_ORDER _BYTE_ORDER
+#endif
+#ifndef __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
+#endif
+#ifndef __BIG_ENDIAN
+#define __BIG_ENDIAN _BIG_ENDIAN
+#endif
+#else
+#include <endian.h>
+#endif
+
+#undef __be64_to_cpu
+#undef __be32_to_cpu
+#undef __be16_to_cpu
+#undef __cpu_to_be64
+#undef __cpu_to_be32
+#undef __cpu_to_be16
+#undef __le64_to_cpu
+#undef __le32_to_cpu
+#undef __le16_to_cpu
+#undef __cpu_to_le64
+#undef __cpu_to_le32
+#undef __cpu_to_le16
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+
+#define __be64_to_cpu(x) ___my_swab64(x)
+#define __be32_to_cpu(x) ___my_swab32(x)
+#define __be16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_be64(x) ___my_swab64(x)
+#define __cpu_to_be32(x) ___my_swab32(x)
+#define __cpu_to_be16(x) ___my_swab16(x)
+#define __le64_to_cpu(x) (x)
+#define __le32_to_cpu(x) (x)
+#define __le16_to_cpu(x) (x)
+#define __cpu_to_le64(x) (x)
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_le16(x) (x)
+
+#elif __BYTE_ORDER == __BIG_ENDIAN
+
+#define __be64_to_cpu(x) (x)
+#define __be32_to_cpu(x) (x)
+#define __be16_to_cpu(x) (x)
+#define __cpu_to_be64(x) (x)
+#define __cpu_to_be32(x) (x)
+#define __cpu_to_be16(x) (x)
+#define __le64_to_cpu(x) ___my_swab64(x)
+#define __le32_to_cpu(x) ___my_swab32(x)
+#define __le16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_le64(x) ___my_swab64(x)
+#define __cpu_to_le32(x) ___my_swab32(x)
+#define __cpu_to_le16(x) ___my_swab16(x)
+
+#endif // __BYTE_ORDER
 
 #endif
 
@@ -225,21 +220,21 @@
  * Windows (CYGWIN)
  */
 #if defined(__CYGWIN32__)
-    #include <asm/byteorder.h>
-    #include <unistd.h>
-
-    #define __be64_to_cpu(x) ___my_swab64(x)
-    #define __be32_to_cpu(x) ___my_swab32(x)
-    #define __be16_to_cpu(x) ___my_swab16(x)
-    #define __cpu_to_be64(x) ___my_swab64(x)
-    #define __cpu_to_be32(x) ___my_swab32(x)
-    #define __cpu_to_be16(x) ___my_swab16(x)
-    #define __le64_to_cpu(x) (x)
-    #define __le32_to_cpu(x) (x)
-    #define __le16_to_cpu(x) (x)
-    #define __cpu_to_le64(x) (x)
-    #define __cpu_to_le32(x) (x)
-    #define __cpu_to_le16(x) (x)
+#include <asm/byteorder.h>
+#include <unistd.h>
+
+#define __be64_to_cpu(x) ___my_swab64(x)
+#define __be32_to_cpu(x) ___my_swab32(x)
+#define __be16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_be64(x) ___my_swab64(x)
+#define __cpu_to_be32(x) ___my_swab32(x)
+#define __cpu_to_be16(x) ___my_swab16(x)
+#define __le64_to_cpu(x) (x)
+#define __le32_to_cpu(x) (x)
+#define __le16_to_cpu(x) (x)
+#define __cpu_to_le64(x) (x)
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_le16(x) (x)
 
 #endif
 
@@ -247,47 +242,45 @@
  * Windows (DDK)
  */
 #if defined(__WIN__)
-    #include <winsock2.h>
-    #include <windows.h>
-    #include <io.h>
-
-
-    #define __LITTLE_ENDIAN 1234
-    #define __BIG_ENDIAN 4321
-    #define __BYTE_ORDER __LITTLE_ENDIAN
-
-    #define __be64_to_cpu(x) ___my_swab64(x)
-    #define __be32_to_cpu(x) ___my_swab32(x)
-    #define __be16_to_cpu(x) ___my_swab16(x)
-    #define __cpu_to_be64(x) ___my_swab64(x)
-    #define __cpu_to_be32(x) ___my_swab32(x)
-    #define __cpu_to_be16(x) ___my_swab16(x)
-    #define __le64_to_cpu(x) (x)
-    #define __le32_to_cpu(x) (x)
-    #define __le16_to_cpu(x) (x)
-    #define __cpu_to_le64(x) (x)
-    #define __cpu_to_le32(x) (x)
-    #define __cpu_to_le16(x) (x)
-
-
-    #if defined(_WIN32) || defined(_WIN64) || defined(__MINGW32__) || defined(__MINGW64__)
-        #include <stdint.h>
-        #ifndef   MFT_TOOLS_VARS
-            #define MFT_TOOLS_VARS
+#include <winsock2.h>
+#include <windows.h>
+#include <io.h>
+
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+#define __BYTE_ORDER __LITTLE_ENDIAN
+
+#define __be64_to_cpu(x) ___my_swab64(x)
+#define __be32_to_cpu(x) ___my_swab32(x)
+#define __be16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_be64(x) ___my_swab64(x)
+#define __cpu_to_be32(x) ___my_swab32(x)
+#define __cpu_to_be16(x) ___my_swab16(x)
+#define __le64_to_cpu(x) (x)
+#define __le32_to_cpu(x) (x)
+#define __le16_to_cpu(x) (x)
+#define __cpu_to_le64(x) (x)
+#define __cpu_to_le32(x) (x)
+#define __cpu_to_le16(x) (x)
+
+#if defined(_WIN32) || defined(_WIN64) || defined(__MINGW32__) || defined(__MINGW64__)
+#include <stdint.h>
+#ifndef MFT_TOOLS_VARS
+#define MFT_TOOLS_VARS
 typedef uint8_t u_int8_t;
 typedef uint16_t u_int16_t;
 typedef uint32_t u_int32_t;
 typedef uint64_t u_int64_t;
-        #endif
-        #include <string.h>      // Get a define for strcasecmp
-        #if defined(_MSC_VER)
+#endif
+#include <string.h> // Get a define for strcasecmp
+#if defined(_MSC_VER)
 typedef size_t ssize_t;
 
-            #define strcasecmp  _stricmp
-            #define strncasecmp _strnicmp
-        #endif
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#endif
 
-    #else
+#else
 typedef unsigned __int8 u_int8_t;
 typedef __int8 int8_t;
 typedef unsigned __int16 u_int16_t;
@@ -297,32 +290,32 @@ typedef __int32 int32_t;
 typedef unsigned __int64 u_int64_t;
 typedef __int64 int64_t;
 
-        #define strcasecmp    _stricmp
-        #define strtoll       _strtoi64
-        #define strtoull      _strtoui64
-        #define strdup        _strdup
+#define strcasecmp _stricmp
+#define strtoll _strtoi64
+#define strtoull _strtoui64
+#define strdup _strdup
 
-    #endif
+#endif
 
-    #ifndef __WIN__ // TBD : investigate crash on win
+#ifndef __WIN__ // TBD : investigate crash on win
 inline
-    #endif
+#endif
 
-    #define COMP_CDECL    __cdecl
-    #define COMP_OPEN     ::_open
-    #define COMP_CLOSE    ::_close
-    #define COMP_READ     ::_read
-    #define COMP_FSTAT    ::_fstat
+#define COMP_CDECL __cdecl
+#define COMP_OPEN ::_open
+#define COMP_CLOSE ::_close
+#define COMP_READ ::_read
+#define COMP_FSTAT ::_fstat
 
-    #ifndef __cplusplus
-        #define close _close
-    #endif
+#ifndef __cplusplus
+#define close _close
+#endif
 
-typedef struct _stat Stat;
+  typedef struct _stat Stat;
 
 #ifndef PRIx64
-    #define PRIx64 "I64x"
-    #define PRIu64 "I64u"
+#define PRIx64 "I64x"
+#define PRIu64 "I64u"
 #endif
 /*
  #ifdef __cplusplus
@@ -335,47 +328,45 @@ typedef struct _stat Stat;
  */
 #else
 
-    #define COMP_CDECL
-    #define COMP_OPEN     ::open
-    #define COMP_CLOSE    ::close
-    #define COMP_READ     ::read
-    #define COMP_FSTAT    ::fstat
+#define COMP_CDECL
+#define COMP_OPEN ::open
+#define COMP_CLOSE ::close
+#define COMP_READ ::read
+#define COMP_FSTAT ::fstat
 
 typedef struct stat Stat;
 
-    #include <sys/time.h>
-    #include <strings.h>
+#include <sys/time.h>
+#include <strings.h>
 
 #endif
 
-
-
 /*
  * MAC (Darwin)
  */
 #if defined(__APPLE_CC__)
-    #include <architecture/byte_order.h>
-
-    #define __swab64(x)      NXSwapLongLong(x)
-    #define __swab32(x)      NXSwapLong(x)
-    #define __swab16(x)      NXSwapShort(x)
-    #define __be64_to_cpu(x) NXSwapBigLongLongToHost(x)
-    #define __be32_to_cpu(x) NXSwapBigLongToHost(x)
-    #define __be16_to_cpu(x) NXSwapBigShortToHost(x)
-    #define __le64_to_cpu(x) NXSwapLittleLongLongToHost(x)
-    #define __le32_to_cpu(x) NXSwapLittleLongToHost(x)
-    #define __le16_to_cpu(x) NXSwapLittleShortToHost(x)
-    #define __cpu_to_be64(x) NXSwapHostLongLongToBig(x)
-    #define __cpu_to_be32(x) NXSwapHostLongToBig(x)
-    #define __cpu_to_be16(x) NXSwapHostShortToBig(x)
-    #define __cpu_to_le64(x) NXSwapHostLongLongToLittle(x)
-    #define __cpu_to_le32(x) NXSwapHostLongToLittle(x)
-    #define __cpu_to_le16(x) NXSwapHostShortToLittle(x)
-
-    #define __LITTLE_ENDIAN 1234
-    #define __BIG_ENDIAN    4321
-    #define __PDP_ENDIAN    3412
-    #define __BYTE_ORDER    __BIG_ENDIAN
+#include <architecture/byte_order.h>
+
+#define __swab64(x) NXSwapLongLong(x)
+#define __swab32(x) NXSwapLong(x)
+#define __swab16(x) NXSwapShort(x)
+#define __be64_to_cpu(x) NXSwapBigLongLongToHost(x)
+#define __be32_to_cpu(x) NXSwapBigLongToHost(x)
+#define __be16_to_cpu(x) NXSwapBigShortToHost(x)
+#define __le64_to_cpu(x) NXSwapLittleLongLongToHost(x)
+#define __le32_to_cpu(x) NXSwapLittleLongToHost(x)
+#define __le16_to_cpu(x) NXSwapLittleShortToHost(x)
+#define __cpu_to_be64(x) NXSwapHostLongLongToBig(x)
+#define __cpu_to_be32(x) NXSwapHostLongToBig(x)
+#define __cpu_to_be16(x) NXSwapHostShortToBig(x)
+#define __cpu_to_le64(x) NXSwapHostLongLongToLittle(x)
+#define __cpu_to_le32(x) NXSwapHostLongToLittle(x)
+#define __cpu_to_le16(x) NXSwapHostShortToLittle(x)
+
+#define __LITTLE_ENDIAN 1234
+#define __BIG_ENDIAN 4321
+#define __PDP_ENDIAN 3412
+#define __BYTE_ORDER __BIG_ENDIAN
 #endif
 
 /*
@@ -383,22 +374,22 @@ typedef struct stat Stat;
  * -------
  */
 #if defined(__sparc__)
-    #include <sys/byteorder.h>
-    #include <sys/types.h>
-    #include <unistd.h>
-
-    #define __be64_to_cpu(x) (x)
-    #define __be32_to_cpu(x) (x)
-    #define __be16_to_cpu(x) (x)
-    #define __cpu_to_be64(x) (x)
-    #define __cpu_to_be32(x) (x)
-    #define __cpu_to_be16(x) (x)
-    #define __le64_to_cpu(x) ___my_swab64(x)
-    #define __le32_to_cpu(x) ___my_swab32(x)
-    #define __le16_to_cpu(x) ___my_swab16(x)
-    #define __cpu_to_le64(x) ___my_swab64(x)
-    #define __cpu_to_le32(x) ___my_swab32(x)
-    #define __cpu_to_le16(x) ___my_swab16(x)
+#include <sys/byteorder.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#define __be64_to_cpu(x) (x)
+#define __be32_to_cpu(x) (x)
+#define __be16_to_cpu(x) (x)
+#define __cpu_to_be64(x) (x)
+#define __cpu_to_be32(x) (x)
+#define __cpu_to_be16(x) (x)
+#define __le64_to_cpu(x) ___my_swab64(x)
+#define __le32_to_cpu(x) ___my_swab32(x)
+#define __le16_to_cpu(x) ___my_swab16(x)
+#define __cpu_to_le64(x) ___my_swab64(x)
+#define __cpu_to_le32(x) ___my_swab32(x)
+#define __cpu_to_le16(x) ___my_swab16(x)
 
 typedef uint64_t u_int64_t;
 typedef uint32_t u_int32_t;
@@ -409,39 +400,45 @@ typedef uint8_t u_int8_t;
 
 /* define msleep(x) - sleeps for x milliseconds */
 #if defined(_WIN32) || defined(_WIN64) || defined(__MINGW32__) || defined(__MINGW64__)
-    #define msleep(x)   Sleep(x)
+#define msleep(x) Sleep(x)
 #else
-    #define msleep(x)   usleep(((unsigned long)x) * 1000)
+#define msleep(x) usleep(((unsigned long)x) * 1000)
 #endif
 
 // Convert BYTES - DWORDS with MEMCPY BE
-#define BYTES_TO_DWORD_BE(dw_dest, byte_src) do {   u_int32_t tmp; \
-                                                    memcpy(&tmp, byte_src, 4); \
-                                                    *(dw_dest) = __be32_to_cpu(tmp); \
-} while (0)
-
-#define DWORD_TO_BYTES_BE(bytes_dest, dw_src) do { u_int32_t tmp; \
-                                                   tmp = __cpu_to_be32(*(dw_src)); \
-                                                   memcpy(bytes_dest, &tmp, 4); \
-} while (0)
+#define BYTES_TO_DWORD_BE(dw_dest, byte_src) \
+    do                                       \
+    {                                        \
+        u_int32_t tmp;                       \
+        memcpy(&tmp, byte_src, 4);           \
+        *(dw_dest) = __be32_to_cpu(tmp);     \
+    } while (0)
+
+#define DWORD_TO_BYTES_BE(bytes_dest, dw_src) \
+    do                                        \
+    {                                         \
+        u_int32_t tmp;                        \
+        tmp = __cpu_to_be32(*(dw_src));       \
+        memcpy(bytes_dest, &tmp, 4);          \
+    } while (0)
 
 /*
  * Old GCC
  * -------
  */
 #if !defined(__WIN__) && defined(__cplusplus) && __GNUG__ < 3
-    #include <algo.h>
+#include <algo.h>
 #endif
 
 #define __STDC_FORMAT_MACROS
 #if !defined(__WIN__) && !defined(UEFI_BUILD)
-    #include <inttypes.h>
+#include <inttypes.h>
 #endif
 
 #if defined(__VMKERNEL_UW_NATIVE__)
-    #define ROOT_PATH "/opt/mellanox/"
+#define ROOT_PATH "/opt/mellanox/"
 #else
-    #define ROOT_PATH "/"
+#define ROOT_PATH "/"
 #endif
 
 #ifndef IN
@@ -460,4 +457,3 @@ typedef uint8_t u_int8_t;
 #endif
 
 #endif
-
diff --git a/common/mft_logger.py b/common/mft_logger.py
index 3b86727d..3961e3a3 100755
--- a/common/mft_logger.py
+++ b/common/mft_logger.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 import logging
 
@@ -49,7 +49,6 @@ def get(self, name, level):
         else:
             log_level = self._levels[level]
 
-
         logging.basicConfig(level=log_level, format='%(asctime)s - %(name)s - %(levelname)s - {%(pathname)s:%(lineno)d} - %(message)s')
         logger = logging.getLogger(name)
         return logger
diff --git a/common/tools_utils.h b/common/tools_utils.h
index e8ef84f1..8f4e48cf 100644
--- a/common/tools_utils.h
+++ b/common/tools_utils.h
@@ -35,34 +35,33 @@
 
 #include "compatibility.h"
 
-#define CPU_TO_BE32(x)                __cpu_to_be32(x)
-#define CPU_TO_LE32(x)                __cpu_to_le32(x)
-#define BE32_TO_CPU(x)                __be32_to_cpu(x)
-#define LE32_TO_CPU(x)                __le32_to_cpu(x)
-#define CPU_TO_BE16(x)                __cpu_to_be16(x)
-#define CPU_TO_LE16(x)                __cpu_to_le16(x)
-#define BE16_TO_CPU(x)                __be16_to_cpu(x)
-#define LE16_TO_CPU(x)                __le16_to_cpu(x)
-#define CPU_TO_BE64(x)                __cpu_to_be64(x)
-#define CPU_TO_LE64(x)                __cpu_to_le64(x)
-#define BE64_TO_CPU(x)                __be64_to_cpu(x)
-#define LE64_TO_CPU(x)                __le64_to_cpu(x)
+#define CPU_TO_BE32(x) __cpu_to_be32(x)
+#define CPU_TO_LE32(x) __cpu_to_le32(x)
+#define BE32_TO_CPU(x) __be32_to_cpu(x)
+#define LE32_TO_CPU(x) __le32_to_cpu(x)
+#define CPU_TO_BE16(x) __cpu_to_be16(x)
+#define CPU_TO_LE16(x) __cpu_to_le16(x)
+#define BE16_TO_CPU(x) __be16_to_cpu(x)
+#define LE16_TO_CPU(x) __le16_to_cpu(x)
+#define CPU_TO_BE64(x) __cpu_to_be64(x)
+#define CPU_TO_LE64(x) __cpu_to_le64(x)
+#define BE64_TO_CPU(x) __be64_to_cpu(x)
+#define LE64_TO_CPU(x) __le64_to_cpu(x)
 
 #define FIELD_8_OF_BUFF(buf, offset) (*(u_int8_t*)((u_int8_t*)(buf) + (offset)))
 #define FIELD_16_OF_BUFF(buf, offset) (*(u_int16_t*)((u_int8_t*)(buf) + (offset)))
 #define FIELD_32_OF_BUFF(buf, offset) (*(u_int32_t*)((u_int8_t*)(buf) + (offset)))
 #define FIELD_64_OF_BUFF(buf, offset) (*(u_int64_t*)((u_int8_t*)(buf) + (offset)))
-#define BYTE_N(buf, n)  FIELD_8_OF_BUFF((buf), (n))
-#define WORD_N(buf, n)  FIELD_16_OF_BUFF((buf), (n) * 2)
-#define DWORD_N(buf, n) FIELD_32_OF_BUFF((buf), (n) * 4)
-#define QWORD_N(buf, n) FIELD_64_OF_BUFF((buf), (n) * 8)
+#define BYTE_N(buf, n) FIELD_8_OF_BUFF((buf), (n))
+#define WORD_N(buf, n) FIELD_16_OF_BUFF((buf), (n)*2)
+#define DWORD_N(buf, n) FIELD_32_OF_BUFF((buf), (n)*4)
+#define QWORD_N(buf, n) FIELD_64_OF_BUFF((buf), (n)*8)
 #define QWORD_EXTRACT_DWORD_HI(qword) ((u_int64_t)(qword) >> 32)
 #define QWORD_EXTRACT_DWORD_LO(qword) ((u_int64_t)(qword) & (u_int64_t)0xffffffff)
 #define QWORD_INSERT_DWORD_HI(qword, dword) qword = ((qword & (u_int64_t)0xffffffff) | ((u_int64_t)dword << 32))
 #define QWORD_INSERT_DWORD_LO(qword, dword) qword = ((qword & (u_int64_t)0xffffffff00000000) | ((u_int64_t)dword))
 #define U32_TO_U64(dword1, dword2) ((((u_int64_t)(dword1)) << 32) | (((u_int64_t)(dword2)) & 0xffffffff))
 
-
 #define TOOLS_MAX(a, b) ((a) > (b) ? (a) : (b))
 #define TOOLS_MIN(a, b) ((a) < (b) ? (a) : (b))
 
@@ -73,6 +72,4 @@
  */
 #define TOOLS_UNUSED(var) ((void)var)
 
-
 #endif // TOOLS_UTILS_H
-
diff --git a/common/tools_version.h b/common/tools_version.h
index 8e37872b..c656076c 100644
--- a/common/tools_version.h
+++ b/common/tools_version.h
@@ -37,7 +37,6 @@
 #ifndef TOOLS_VERSION_H
 #define TOOLS_VERSION_H
 
-
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -47,43 +46,40 @@
 #include "gitversion.h"
 #endif
 #ifndef TOOLS_GIT_SHA
-    #define TOOLS_GIT_SHA "6469M"
+#define TOOLS_GIT_SHA "6469M"
 #endif
 
 #ifdef HAVE_CONFIG_H
-    #include <config.h>
-    #ifndef MSTFLINT_VERSION_STR
-        #define MSTFLINT_VERSION_STR PACKAGE_STRING
-    #endif
+#include <config.h>
+#ifndef MSTFLINT_VERSION_STR
+#define MSTFLINT_VERSION_STR PACKAGE_STRING
+#endif
 #endif
 
 #ifndef MFT_VERSION_STR
-    #define MFT_VERSION_STR "mft V.V.V-R"
+#define MFT_VERSION_STR "mft V.V.V-R"
 #endif
 
-static inline
-int get_version_string(char *buf, int buf_size, const char *exe_name, const char *tool_version)
+static inline int get_version_string(char* buf, int buf_size, const char* exe_name, const char* tool_version)
 {
     int len = 0;
     // "svn ci" updates the below line
 
-
-    if (tool_version == NULL || !strcmp(tool_version, "")) {
+    if (tool_version == NULL || !strcmp(tool_version, ""))
+    {
         len = snprintf(buf, buf_size, "%s, ", exe_name);
-    } else {
+    }
+    else
+    {
         len = snprintf(buf, buf_size, "%s %s, ", exe_name, tool_version);
     }
     // cut out first and last "$" from the SVN version string:
-    len += snprintf(buf + len, buf_size - len, "%s, built on %s, %s. Git SHA Hash: %s",
-                    MSTFLINT_VERSION_STR,
-                    __DATE__,
-                    __TIME__,
-                    TOOLS_GIT_SHA);
+    len += snprintf(buf + len, buf_size - len, "%s, built on %s, %s. Git SHA Hash: %s", MSTFLINT_VERSION_STR, __DATE__,
+                    __TIME__, TOOLS_GIT_SHA);
     return len;
 }
 
-static inline
-void print_version_string(const char *exe_name, const char *tool_version)
+static inline void print_version_string(const char* exe_name, const char* tool_version)
 {
     char buf[1024] = {0};
     get_version_string(buf, sizeof(buf), exe_name, tool_version);
diff --git a/dev_mgt/dev_mgt.py b/dev_mgt/dev_mgt.py
index efe1ac66..712369af 100755
--- a/dev_mgt/dev_mgt.py
+++ b/dev_mgt/dev_mgt.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 from __future__ import print_function
 import os
@@ -37,6 +37,7 @@
 import ctypes
 import mtcr
 
+
 class DevMgtException(Exception):
     pass
 
@@ -48,13 +49,13 @@ class DevMgtException(Exception):
     if platform.system() == "Windows" or os.name == "nt":
         try:
             DEV_MGT = CDLL("c_dev_mgt.dll")
-        except:
+        except BaseException:
             DEV_MGT = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "c_dev_mgt.dll"))
     else:
         try:
-            #c_dev_mgt.so must be specified explicitly for pyinstaller collection
+            # c_dev_mgt.so must be specified explicitly for pyinstaller collection
             DEV_MGT = CDLL("c_dev_mgt.so")
-        except:
+        except BaseException:
             DEV_MGT = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "c_dev_mgt.so"))
 except Exception as exp:
     raise DevMgtException("Failed to load shared library c_dev_mgt: %s" % exp)
@@ -64,18 +65,17 @@ class DevMgt:
         ##########################
         def __init__(self, dev):
             self.mf = 0
-            self._isLivefishModeFunc = DEV_MGT.dm_is_livefish_mode  # dm_is_livefish_mode(mfile* mf)   
-            if isinstance(dev,(mtcr.MstDevice)):
-              self._mstdev = dev
+            self._isLivefishModeFunc = DEV_MGT.dm_is_livefish_mode  # dm_is_livefish_mode(mfile* mf)
+            if isinstance(dev, (mtcr.MstDevice)):
+                self._mstdev = dev
             else:
-                self._mstdev  =  mtcr.MstDevice(dev) 
+                self._mstdev = mtcr.MstDevice(dev)
                 if not self._mstdev:
                     raise DevMgtException("Failed to open device (%s): %s" % (dev, os.strerror(ctypes.get_errno())))
 
-        
         ##########################
         def isLivefishMode(self):
             rc = self._isLivefishModeFunc(self._mstdev.mf)
             return not (rc == 0)
 else:
-    raise DevMgtException("Failed to load c_dev_mgt.so/libdev_mgt.dll") 
+    raise DevMgtException("Failed to load c_dev_mgt.so/libdev_mgt.dll")
diff --git a/dev_mgt/tools_dev_types.c b/dev_mgt/tools_dev_types.c
index 43074c4d..8145ca4d 100644
--- a/dev_mgt/tools_dev_types.c
+++ b/dev_mgt/tools_dev_types.c
@@ -48,7 +48,8 @@
 #include "tools_dev_types.h"
 #include "mflash/mflash_types.h"
 
-enum dm_dev_type {
+enum dm_dev_type
+{
     DM_UNKNOWN = -1,
     DM_HCA,
     DM_SWITCH,
@@ -60,20 +61,21 @@ enum dm_dev_type {
     DM_GEARBOX
 };
 
-struct device_info {
+struct device_info
+{
     dm_dev_id_t dm_id;
     u_int16_t hw_dev_id;
-    int hw_rev_id;               /* -1 means all revisions match this record */
-    int sw_dev_id;               /* -1 means all hw ids  match this record */
-    const char *name;
+    int hw_rev_id; /* -1 means all revisions match this record */
+    int sw_dev_id; /* -1 means all hw ids  match this record */
+    const char* name;
     int port_num;
     enum dm_dev_type dev_type;
 };
 
-#define DEVID_ADDR                                             0xf0014
-#define CABLEID_ADDR                                           0x0
-#define SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR     92
-#define SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR                  64
+#define DEVID_ADDR 0xf0014
+#define CABLEID_ADDR 0x0
+#define SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR 92
+#define SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR 64
 
 #define ARDBEG_REV0_DEVID 0x6e
 #define ARDBEG_REV1_DEVID 0x7e
@@ -84,397 +86,397 @@ struct device_info {
 #define MENHIT_DEVID_VER1 0x72
 #define MENHIT_DEVID_VER2 0x73
 
-
 #ifdef CABLES_SUPP
 enum dm_dev_type getCableType(u_int8_t id)
 {
-    switch (id) {
-    case 0xd:
-    case 0x11:
-    case 0xe:
-    case 0xc:
-        return DM_QSFP_CABLE;
-
-    case 0x3:
-        return DM_SFP_CABLE;
-    case 0x18:
-    case 0x19:  // Stallion2
-    case 0x1e:
-        return DM_CMIS_CABLE;
-    default:
-        return DM_UNKNOWN;
+    switch (id)
+    {
+        case 0xd:
+        case 0x11:
+        case 0xe:
+        case 0xc:
+            return DM_QSFP_CABLE;
+
+        case 0x3:
+            return DM_SFP_CABLE;
+        case 0x18:
+        case 0x19: // Stallion2
+        case 0x1e:
+            return DM_CMIS_CABLE;
+        default:
+            return DM_UNKNOWN;
     }
 }
 #endif
 
-static struct device_info g_devs_info[] = {
-    {
-        DeviceInfiniScaleIV,    //dm_id
-        0x01b3,                 //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "InfiniScaleIV",        //name
-        36,                     //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceSwitchX,          //dm_id
-        0x0245,                 //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "SwitchX",              //name
-        64,                     //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceConnectX2,        //dm_id
-        0x190,                  //hw_dev_id
-        0xb0,                   //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX2",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX3,        //dm_id
-        0x1f5,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX3",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectIB,        //dm_id
-        0x1ff,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectIB",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX3Pro,     //dm_id
-        0x1f7,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX3Pro",         //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceSwitchIB,         //dm_id
-        0x247,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "SwitchIB",             //name
-        36,                     //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceSpectrum,         //dm_id
-        0x249,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Spectrum",             //name
-        64,                     //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceConnectX4,        //dm_id
-        0x209,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX4",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX4LX,      //dm_id
-        0x20b,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX4LX",          //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX5,        //dm_id
-        0x20d,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX5",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX6,        //dm_id
-        0x20f,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX6",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX6DX,      //dm_id
-        0x212,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX6DX",          //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX6LX,      //dm_id
-        0x216,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX6LX",          //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceConnectX7,        //dm_id
-        0x218,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "ConnectX7",            //name
-        4,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceBlueField,        //dm_id
-        0x211,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "BlueField",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceBlueField2,        //dm_id
-        0x214,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "BlueField2",            //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceBlueField3,       //dm_id
-        0x21c,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "BlueField3",           //name
-        4,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceSwitchIB2,        //dm_id
-        0x24b,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "SwitchIB2",            //name
-        36,                     //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceCableQSFP,        //dm_id
-        0x0d,                   //hw_dev_id
-        0,                      //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableQSFP",            //name
-        -1,                     //port_num
-        DM_QSFP_CABLE           //dev_type
-    },
-    {
-        DeviceCableQSFPaging,   //dm_id
-        0x11,                   //hw_dev_id
-        0xab,                   //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableQSFPaging",       //name
-        -1,                     //port_num
-        DM_QSFP_CABLE           //dev_type
-    },
-    {
-        DeviceCableCMIS,        //dm_id
-        0x19,                   //hw_dev_id
-        0,                      //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableCMIS",            //name
-        -1,                     //port_num
-        DM_CMIS_CABLE           //dev_type
-    },
-    {
-        DeviceCableCMISPaging,   //dm_id
-        0x19,                   //hw_dev_id
-        0xab,                   //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableCMISPaging",       //name
-        -1,                     //port_num
-        DM_CMIS_CABLE           //dev_type
-    },
-    {
-        DeviceCableSFP,         //dm_id
-        0x03,                   //hw_dev_id
-        1,                      //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableSFP",             //name
-        -1,                     //port_num
-        DM_SFP_CABLE            //dev_type
-    },
-    {
-        DeviceCableSFP51,       //dm_id
-        0x03,                   //hw_dev_id
-        1,                      //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableSFP51",           //name
-        -1,                     //port_num
-        DM_SFP_CABLE            //dev_type
-    },
-    {
-        DeviceCableSFP51Paging, //dm_id
-        0x03,                   //hw_dev_id
-        1,                      //hw_rev_id
-        -1,                     //sw_dev_id
-        "CableSFP51Paging",     //name
-        -1,                     //port_num
-        DM_SFP_CABLE            //dev_type
-    },
-    {
-        DeviceSpectrum2,        //dm_id
-        0x24e,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Spectrum2",            //name
-        128,                    //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceDummy,            //dm_id
-        0x1,                    //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "DummyDevice",          //name
-        2,                      //port_num
-        DM_HCA                  //dev_type
-    },
-    {
-        DeviceQuantum,          //dm_id
-        0x24d,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Quantum",              //name
-        80,                     //port_num
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceArdbeg,           //dm_id
-        0x6e,                   //hw_dev_id (ArdbegMirror 0x70)
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Ardbeg",               //name
-        -1,                     //port_num
-        DM_LINKX                //dev_type
-    },
-    {
-        DeviceBaritone,         //dm_id
-        0x6b,                   //hw_dev_id (BaritoneMirror 0x71)
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Baritone",             //name
-        -1,                     //port_num
-        DM_LINKX                //dev_type
-    },
-    {
-        DeviceMenhit,           //dm_id
-        0x72,                   //hw_dev_id (other versions 0x6f,0x73)
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Menhit",               //name
-        -1,                     //port_num
-        DM_LINKX                //dev_type
-    },
-    {
-        DeviceSecureHost,       //dm_id
-        0xcafe,                 //hw_dev_id
-        0xd0,                   //hw_rev_id
-        0,                      //sw_dev_id
-        "Unknown Device",       //name
-        -1,                     //port_num
-        DM_UNKNOWN              //dev_type
-    },
-    {
-        DeviceSpectrum3,        //dm_id
-        0x250,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Spectrum3",            //name
-        128,                    //port_num NEED_CHECK
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceSpectrum4,        //dm_id
-        0x254,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Spectrum4",            //name
-        128,                    //port_num NEED_CHECK
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceQuantum2,         //dm_id
-        0x257,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "Quantum2",             //name
-        128,                    //port_num NEED_CHECK
-        DM_SWITCH               //dev_type
-    },
-    {
-        DeviceGearBox,          //dm_id
-        0x252,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "AmosGearBox",          //name
-        128,                    //port_num NEED_CHECK
-        DM_GEARBOX              //dev_type
-    },
-    {
-        DeviceGearBoxManager,   //dm_id
-        0x253,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "AmosGearBoxManager",   //name
-        -1,                     //port_num NEED_CHECK
-        DM_GEARBOX              //dev_type
-    },
-    {
-        DeviceAbirGearBox,      //dm_id
-        0x256,                  //hw_dev_id
-        -1,                     //hw_rev_id
-        -1,                     //sw_dev_id
-        "AbirGearBox",          //name
-        -1,                     //port_num NEED_CHECK
-        DM_GEARBOX              //dev_type
-    },
-    {
-        DeviceUnknown,          //dm_id
-        0,                      //hw_dev_id
-        0,                      //hw_rev_id
-        0,                      //sw_dev_id
-        "Unknown Device",       //name
-        -1,                     //port_num
-        DM_UNKNOWN              //dev_type
-    }
-};
+static struct device_info g_devs_info[] = {{
+                                             DeviceInfiniScaleIV, // dm_id
+                                             0x01b3,              // hw_dev_id
+                                             -1,                  // hw_rev_id
+                                             -1,                  // sw_dev_id
+                                             "InfiniScaleIV",     // name
+                                             36,                  // port_num
+                                             DM_SWITCH            // dev_type
+                                           },
+                                           {
+                                             DeviceSwitchX, // dm_id
+                                             0x0245,        // hw_dev_id
+                                             -1,            // hw_rev_id
+                                             -1,            // sw_dev_id
+                                             "SwitchX",     // name
+                                             64,            // port_num
+                                             DM_SWITCH      // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX2, // dm_id
+                                             0x190,           // hw_dev_id
+                                             0xb0,            // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX2",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX3, // dm_id
+                                             0x1f5,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX3",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceConnectIB, // dm_id
+                                             0x1ff,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectIB",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX3Pro, // dm_id
+                                             0x1f7,              // hw_dev_id
+                                             -1,                 // hw_rev_id
+                                             -1,                 // sw_dev_id
+                                             "ConnectX3Pro",     // name
+                                             2,                  // port_num
+                                             DM_HCA              // dev_type
+                                           },
+                                           {
+                                             DeviceSwitchIB, // dm_id
+                                             0x247,          // hw_dev_id
+                                             -1,             // hw_rev_id
+                                             -1,             // sw_dev_id
+                                             "SwitchIB",     // name
+                                             36,             // port_num
+                                             DM_SWITCH       // dev_type
+                                           },
+                                           {
+                                             DeviceSpectrum, // dm_id
+                                             0x249,          // hw_dev_id
+                                             -1,             // hw_rev_id
+                                             -1,             // sw_dev_id
+                                             "Spectrum",     // name
+                                             64,             // port_num
+                                             DM_SWITCH       // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX4, // dm_id
+                                             0x209,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX4",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX4LX, // dm_id
+                                             0x20b,             // hw_dev_id
+                                             -1,                // hw_rev_id
+                                             -1,                // sw_dev_id
+                                             "ConnectX4LX",     // name
+                                             2,                 // port_num
+                                             DM_HCA             // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX5, // dm_id
+                                             0x20d,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX5",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX6, // dm_id
+                                             0x20f,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX6",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX6DX, // dm_id
+                                             0x212,             // hw_dev_id
+                                             -1,                // hw_rev_id
+                                             -1,                // sw_dev_id
+                                             "ConnectX6DX",     // name
+                                             2,                 // port_num
+                                             DM_HCA             // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX6LX, // dm_id
+                                             0x216,             // hw_dev_id
+                                             -1,                // hw_rev_id
+                                             -1,                // sw_dev_id
+                                             "ConnectX6LX",     // name
+                                             2,                 // port_num
+                                             DM_HCA             // dev_type
+                                           },
+                                           {
+                                             DeviceConnectX7, // dm_id
+                                             0x218,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX7",     // name
+                                             4,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceBlueField, // dm_id
+                                             0x211,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "BlueField",     // name
+                                             2,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
+                                           {
+                                             DeviceBlueField2, // dm_id
+                                             0x214,            // hw_dev_id
+                                             -1,               // hw_rev_id
+                                             -1,               // sw_dev_id
+                                             "BlueField2",     // name
+                                             2,                // port_num
+                                             DM_HCA            // dev_type
+                                           },
+                                           {
+                                             DeviceBlueField3, // dm_id
+                                             0x21c,            // hw_dev_id
+                                             -1,               // hw_rev_id
+                                             -1,               // sw_dev_id
+                                             "BlueField3",     // name
+                                             4,                // port_num
+                                             DM_HCA            // dev_type
+                                           },
+                                           {
+                                             DeviceSwitchIB2, // dm_id
+                                             0x24b,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "SwitchIB2",     // name
+                                             36,              // port_num
+                                             DM_SWITCH        // dev_type
+                                           },
+                                           {
+                                             DeviceCableQSFP, // dm_id
+                                             0x0d,            // hw_dev_id
+                                             0,               // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "CableQSFP",     // name
+                                             -1,              // port_num
+                                             DM_QSFP_CABLE    // dev_type
+                                           },
+                                           {
+                                             DeviceCableQSFPaging, // dm_id
+                                             0x11,                 // hw_dev_id
+                                             0xab,                 // hw_rev_id
+                                             -1,                   // sw_dev_id
+                                             "CableQSFPaging",     // name
+                                             -1,                   // port_num
+                                             DM_QSFP_CABLE         // dev_type
+                                           },
+                                           {
+                                             DeviceCableCMIS, // dm_id
+                                             0x19,            // hw_dev_id
+                                             0,               // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "CableCMIS",     // name
+                                             -1,              // port_num
+                                             DM_CMIS_CABLE    // dev_type
+                                           },
+                                           {
+                                             DeviceCableCMISPaging, // dm_id
+                                             0x19,                  // hw_dev_id
+                                             0xab,                  // hw_rev_id
+                                             -1,                    // sw_dev_id
+                                             "CableCMISPaging",     // name
+                                             -1,                    // port_num
+                                             DM_CMIS_CABLE          // dev_type
+                                           },
+                                           {
+                                             DeviceCableSFP, // dm_id
+                                             0x03,           // hw_dev_id
+                                             1,              // hw_rev_id
+                                             -1,             // sw_dev_id
+                                             "CableSFP",     // name
+                                             -1,             // port_num
+                                             DM_SFP_CABLE    // dev_type
+                                           },
+                                           {
+                                             DeviceCableSFP51, // dm_id
+                                             0x03,             // hw_dev_id
+                                             1,                // hw_rev_id
+                                             -1,               // sw_dev_id
+                                             "CableSFP51",     // name
+                                             -1,               // port_num
+                                             DM_SFP_CABLE      // dev_type
+                                           },
+                                           {
+                                             DeviceCableSFP51Paging, // dm_id
+                                             0x03,                   // hw_dev_id
+                                             1,                      // hw_rev_id
+                                             -1,                     // sw_dev_id
+                                             "CableSFP51Paging",     // name
+                                             -1,                     // port_num
+                                             DM_SFP_CABLE            // dev_type
+                                           },
+                                           {
+                                             DeviceSpectrum2, // dm_id
+                                             0x24e,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "Spectrum2",     // name
+                                             128,             // port_num
+                                             DM_SWITCH        // dev_type
+                                           },
+                                           {
+                                             DeviceDummy,   // dm_id
+                                             0x1,           // hw_dev_id
+                                             -1,            // hw_rev_id
+                                             -1,            // sw_dev_id
+                                             "DummyDevice", // name
+                                             2,             // port_num
+                                             DM_HCA         // dev_type
+                                           },
+                                           {
+                                             DeviceQuantum, // dm_id
+                                             0x24d,         // hw_dev_id
+                                             -1,            // hw_rev_id
+                                             -1,            // sw_dev_id
+                                             "Quantum",     // name
+                                             80,            // port_num
+                                             DM_SWITCH      // dev_type
+                                           },
+                                           {
+                                             DeviceArdbeg, // dm_id
+                                             0x6e,         // hw_dev_id (ArdbegMirror 0x70)
+                                             -1,           // hw_rev_id
+                                             -1,           // sw_dev_id
+                                             "Ardbeg",     // name
+                                             -1,           // port_num
+                                             DM_LINKX      // dev_type
+                                           },
+                                           {
+                                             DeviceBaritone, // dm_id
+                                             0x6b,           // hw_dev_id (BaritoneMirror 0x71)
+                                             -1,             // hw_rev_id
+                                             -1,             // sw_dev_id
+                                             "Baritone",     // name
+                                             -1,             // port_num
+                                             DM_LINKX        // dev_type
+                                           },
+                                           {
+                                             DeviceMenhit, // dm_id
+                                             0x72,         // hw_dev_id (other versions 0x6f,0x73)
+                                             -1,           // hw_rev_id
+                                             -1,           // sw_dev_id
+                                             "Menhit",     // name
+                                             -1,           // port_num
+                                             DM_LINKX      // dev_type
+                                           },
+                                           {
+                                             DeviceSecureHost, // dm_id
+                                             0xcafe,           // hw_dev_id
+                                             0xd0,             // hw_rev_id
+                                             0,                // sw_dev_id
+                                             "Unknown Device", // name
+                                             -1,               // port_num
+                                             DM_UNKNOWN        // dev_type
+                                           },
+                                           {
+                                             DeviceSpectrum3, // dm_id
+                                             0x250,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "Spectrum3",     // name
+                                             128,             // port_num NEED_CHECK
+                                             DM_SWITCH        // dev_type
+                                           },
+                                           {
+                                             DeviceSpectrum4, // dm_id
+                                             0x254,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "Spectrum4",     // name
+                                             128,             // port_num NEED_CHECK
+                                             DM_SWITCH        // dev_type
+                                           },
+                                           {
+                                             DeviceQuantum2, // dm_id
+                                             0x257,          // hw_dev_id
+                                             -1,             // hw_rev_id
+                                             -1,             // sw_dev_id
+                                             "Quantum2",     // name
+                                             128,            // port_num NEED_CHECK
+                                             DM_SWITCH       // dev_type
+                                           },
+                                           {
+                                             DeviceGearBox, // dm_id
+                                             0x252,         // hw_dev_id
+                                             -1,            // hw_rev_id
+                                             -1,            // sw_dev_id
+                                             "AmosGearBox", // name
+                                             128,           // port_num NEED_CHECK
+                                             DM_GEARBOX     // dev_type
+                                           },
+                                           {
+                                             DeviceGearBoxManager, // dm_id
+                                             0x253,                // hw_dev_id
+                                             -1,                   // hw_rev_id
+                                             -1,                   // sw_dev_id
+                                             "AmosGearBoxManager", // name
+                                             -1,                   // port_num NEED_CHECK
+                                             DM_GEARBOX            // dev_type
+                                           },
+                                           {
+                                             DeviceAbirGearBox, // dm_id
+                                             0x256,             // hw_dev_id
+                                             -1,                // hw_rev_id
+                                             -1,                // sw_dev_id
+                                             "AbirGearBox",     // name
+                                             -1,                // port_num NEED_CHECK
+                                             DM_GEARBOX         // dev_type
+                                           },
+                                           {
+                                             DeviceUnknown,    // dm_id
+                                             0,                // hw_dev_id
+                                             0,                // hw_rev_id
+                                             0,                // sw_dev_id
+                                             "Unknown Device", // name
+                                             -1,               // port_num
+                                             DM_UNKNOWN        // dev_type
+                                           }};
 
 static const struct device_info* get_entry(dm_dev_id_t type)
 {
-    const struct device_info *p = g_devs_info;
-    while (p->dm_id != DeviceUnknown) {
-        if (type == p->dm_id) {
+    const struct device_info* p = g_devs_info;
+    while (p->dm_id != DeviceUnknown)
+    {
+        if (type == p->dm_id)
+        {
             break;
         }
         p++;
@@ -484,10 +486,13 @@ static const struct device_info* get_entry(dm_dev_id_t type)
 
 static const struct device_info* get_entry_by_dev_rev_id(u_int32_t hw_dev_id, u_int32_t hw_rev_id)
 {
-    const struct device_info *p = g_devs_info;
-    while (p->dm_id != DeviceUnknown) {
-        if (hw_dev_id == p->hw_dev_id) {
-            if ((p->hw_rev_id == -1) ||  ((int)hw_rev_id == p->hw_rev_id)) {
+    const struct device_info* p = g_devs_info;
+    while (p->dm_id != DeviceUnknown)
+    {
+        if (hw_dev_id == p->hw_dev_id)
+        {
+            if ((p->hw_rev_id == -1) || ((int)hw_rev_id == p->hw_rev_id))
+            {
                 break;
             }
         }
@@ -496,26 +501,25 @@ static const struct device_info* get_entry_by_dev_rev_id(u_int32_t hw_dev_id, u_
     return p;
 }
 
-typedef enum get_dev_id_error_t {
+typedef enum get_dev_id_error_t
+{
     GET_DEV_ID_SUCCESS,
     GET_DEV_ID_ERROR,
     CRSPACE_READ_ERROR,
     CHECK_PTR_DEV_ID,
 } dev_id_error;
 
-static int dm_get_device_id_inner(mfile *mf,
-                                 dm_dev_id_t *ptr_dm_dev_id,
-                                 u_int32_t *ptr_hw_dev_id,
-                                 u_int32_t *ptr_hw_rev)
+static int dm_get_device_id_inner(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32_t* ptr_hw_dev_id, u_int32_t* ptr_hw_rev)
 {
     u_int32_t dword = 0;
     int rc;
     u_int32_t dev_flags;
 
 #ifdef CABLES_SUPP
-    if (mf->tp == MST_LINKX_CHIP){
- 
-        switch (mf->linkx_chip_devid){
+    if (mf->tp == MST_LINKX_CHIP)
+    {
+        switch (mf->linkx_chip_devid)
+        {
             case ARDBEG_REV0_DEVID:
             case ARDBEG_REV1_DEVID:
             case ARDBEG_MIRRORED_DEVID:
@@ -536,97 +540,126 @@ static int dm_get_device_id_inner(mfile *mf,
         }
         *ptr_hw_dev_id = (u_int32_t)mf->linkx_chip_devid;
         return GET_DEV_ID_SUCCESS;
-
     }
 
-    if (mf->tp == MST_CABLE) {
-        //printf("-D- Getting cable ID\n");
-        if (mread4(mf, CABLEID_ADDR, &dword) != 4) {
-            //printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
+    if (mf->tp == MST_CABLE)
+    {
+        // printf("-D- Getting cable ID\n");
+        if (mread4(mf, CABLEID_ADDR, &dword) != 4)
+        {
+            // printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
             return GET_DEV_ID_ERROR;
         }
-        //dword = __cpu_to_le32(dword); // Cable pages are read in LE, no need to swap
+        // dword = __cpu_to_le32(dword); // Cable pages are read in LE, no need to swap
         *ptr_hw_dev_id = 0xffff;
         u_int8_t id = EXTRACT(dword, 0, 8);
         enum dm_dev_type cbl_type = getCableType(id);
         u_int8_t paging;
-        if (cbl_type == DM_QSFP_CABLE) {
+        if (cbl_type == DM_QSFP_CABLE)
+        {
             // Get Byte 2 bit 2 ~ bit 18 (flat_mem : upper memory flat or paged. 0=paging, 1=page 0 only)
             paging = EXTRACT(dword, 18, 1);
-            //printf("DWORD: %#x, paging: %d\n", dword, paging);
-            if (paging == 0) {
+            // printf("DWORD: %#x, paging: %d\n", dword, paging);
+            if (paging == 0)
+            {
                 *ptr_dm_dev_id = DeviceCableQSFPaging;
-            } else {
+            }
+            else
+            {
                 *ptr_dm_dev_id = DeviceCableQSFP;
             }
-        } else if (cbl_type == DM_SFP_CABLE) {
+        }
+        else if (cbl_type == DM_SFP_CABLE)
+        {
             *ptr_dm_dev_id = DeviceCableSFP;
-            if (mread4(mf, SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR, &dword) != 4) {
-                //printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
+            if (mread4(mf, SFP_DIGITAL_DIAGNOSTIC_MONITORING_IMPLEMENTED_ADDR, &dword) != 4)
+            {
+                // printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
                 return GET_DEV_ID_ERROR;
             }
-            u_int8_t byte = EXTRACT(dword, 6, 1); //Byte 92 bit 6 (digital diagnostic monitoring implemented)
-            if (byte) {
+            u_int8_t byte = EXTRACT(dword, 6, 1); // Byte 92 bit 6 (digital diagnostic monitoring implemented)
+            if (byte)
+            {
                 *ptr_dm_dev_id = DeviceCableSFP51;
-                if (mread4(mf, SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR, &dword) != 4) {
-                    //printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
+                if (mread4(mf, SFP_PAGING_IMPLEMENTED_INDICATOR_ADDR, &dword) != 4)
+                {
+                    // printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
                     return GET_DEV_ID_ERROR;
                 }
-                byte = EXTRACT(dword, 4, 1); //Byte 64 bit 4 (paging implemented indicator)
-                if (byte) {
+                byte = EXTRACT(dword, 4, 1); // Byte 64 bit 4 (paging implemented indicator)
+                if (byte)
+                {
                     *ptr_dm_dev_id = DeviceCableSFP51Paging;
                 }
             }
-        } else if (cbl_type == DM_CMIS_CABLE) {
+        }
+        else if (cbl_type == DM_CMIS_CABLE)
+        {
             // Get Byte 2 bit 7 ~ bit 23 (flat_mem : upper memory flat or paged. 0=paging, 1=page 0 only)
             paging = EXTRACT(dword, 23, 1);
-            if (paging == 0) {
+            if (paging == 0)
+            {
                 *ptr_dm_dev_id = DeviceCableCMISPaging;
-            } else {
+            }
+            else
+            {
                 *ptr_dm_dev_id = DeviceCableCMIS;
             }
-        } else {
+        }
+        else
+        {
             *ptr_dm_dev_id = DeviceUnknown;
         }
         return GET_DEV_ID_SUCCESS;
     }
 #endif
 
-
     rc = mget_mdevs_flags(mf, &dev_flags);
-    if (rc) {
+    if (rc)
+    {
         dev_flags = 0;
     }
     // get hw id
     // Special case for MLNX OS getting dev_id using REG MGIR
-    if (dev_flags & MDEVS_MLNX_OS) {
+    if (dev_flags & MDEVS_MLNX_OS)
+    {
         reg_access_status_t rc;
         struct reg_access_hca_mgir mgir;
         memset(&mgir, 0, sizeof(mgir));
         rc = reg_access_mgir(mf, REG_ACCESS_METHOD_GET, &mgir);
-        //printf("-D- RC[%s] -- REVID: %d -- DEVID: %d hw_dev_id: %d\n", m_err2str(rc), mgir.HWInfo.REVID, mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
-        if (rc) {
+        // printf("-D- RC[%s] -- REVID: %d -- DEVID: %d hw_dev_id: %d\n", m_err2str(rc), mgir.HWInfo.REVID,
+        // mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
+        if (rc)
+        {
             dword = get_entry(DeviceSwitchX)->hw_dev_id;
-            *ptr_hw_rev    = 0;
+            *ptr_hw_rev = 0;
             *ptr_hw_dev_id = get_entry(DeviceSwitchX)->hw_dev_id;
-        } else {
+        }
+        else
+        {
             dword = mgir.hw_info.hw_dev_id;
-            if (dword == 0) {
+            if (dword == 0)
+            {
                 dword = get_entry(DeviceSwitchX)->hw_dev_id;
                 *ptr_hw_dev_id = get_entry(DeviceSwitchX)->hw_dev_id;
                 *ptr_hw_rev = mgir.hw_info.device_hw_revision & 0xf;
-            } else {
+            }
+            else
+            {
                 *ptr_hw_dev_id = dword;
-                *ptr_hw_rev = 0; //WA: MGIR should have also hw_rev_id and then we can use it.
+                *ptr_hw_rev = 0; // WA: MGIR should have also hw_rev_id and then we can use it.
             }
         }
-    } else {
-        if (mread4(mf, DEVID_ADDR, &dword) != 4) {
+    }
+    else
+    {
+        if (mread4(mf, DEVID_ADDR, &dword) != 4)
+        {
             return CRSPACE_READ_ERROR;
         }
 
         *ptr_hw_dev_id = EXTRACT(dword, 0, 16);
-        *ptr_hw_rev    = EXTRACT(dword, 16, 8);
+        *ptr_hw_rev = EXTRACT(dword, 16, 8);
     }
 
     *ptr_dm_dev_id = get_entry_by_dev_rev_id(*ptr_hw_dev_id, *ptr_hw_rev)->dm_id;
@@ -636,20 +669,19 @@ static int dm_get_device_id_inner(mfile *mf,
 /**
  * Returns 0 on success and 1 on failure.
  */
-int dm_get_device_id(mfile *mf,
-                     dm_dev_id_t *ptr_dm_dev_id,
-                     u_int32_t *ptr_hw_dev_id,
-                     u_int32_t *ptr_hw_rev)
+int dm_get_device_id(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32_t* ptr_hw_dev_id, u_int32_t* ptr_hw_rev)
 {
     int return_value = 1;
-    return_value = dm_get_device_id_inner(mf, ptr_dm_dev_id,
-                                          ptr_hw_dev_id, ptr_hw_rev);
-    if (return_value == CRSPACE_READ_ERROR) {
+    return_value = dm_get_device_id_inner(mf, ptr_dm_dev_id, ptr_hw_dev_id, ptr_hw_rev);
+    if (return_value == CRSPACE_READ_ERROR)
+    {
         printf("FATAL - crspace read (0x%x) failed: %s\n", DEVID_ADDR, strerror(errno));
         return GET_DEV_ID_ERROR;
-    } else if (return_value == CHECK_PTR_DEV_ID) {
-        if (*ptr_dm_dev_id == DeviceUnknown) {
-
+    }
+    else if (return_value == CHECK_PTR_DEV_ID)
+    {
+        if (*ptr_dm_dev_id == DeviceUnknown)
+        {
 // Due to issue 2719128, we prefer to skip this device
 // and not filter using the 'pciconf' FreeBSD tool
 #ifndef __FreeBSD__
@@ -664,16 +696,17 @@ int dm_get_device_id(mfile *mf,
 }
 
 // Due to issue 2846942, added this function to be used on mdevices)
-int dm_get_device_id_without_prints(mfile *mf,
-                                    dm_dev_id_t *ptr_dm_dev_id,
-                                    u_int32_t *ptr_hw_dev_id,
-                                    u_int32_t *ptr_hw_rev)
+int dm_get_device_id_without_prints(mfile* mf,
+                                    dm_dev_id_t* ptr_dm_dev_id,
+                                    u_int32_t* ptr_hw_dev_id,
+                                    u_int32_t* ptr_hw_rev)
 {
     int return_value = 1;
-    return_value = dm_get_device_id_inner(mf, ptr_dm_dev_id,
-                                          ptr_hw_dev_id, ptr_hw_rev);
-    if (return_value == CHECK_PTR_DEV_ID) {
-        if (*ptr_dm_dev_id == DeviceUnknown) {
+    return_value = dm_get_device_id_inner(mf, ptr_dm_dev_id, ptr_hw_dev_id, ptr_hw_rev);
+    if (return_value == CHECK_PTR_DEV_ID)
+    {
+        if (*ptr_dm_dev_id == DeviceUnknown)
+        {
             return MFE_UNSUPPORTED_DEVICE;
         }
         return GET_DEV_ID_SUCCESS;
@@ -681,12 +714,10 @@ int dm_get_device_id_without_prints(mfile *mf,
     return return_value;
 }
 
-int dm_get_device_id_offline(u_int32_t devid,
-                             u_int32_t chip_rev,
-                             dm_dev_id_t *ptr_dev_type)
+int dm_get_device_id_offline(u_int32_t devid, u_int32_t chip_rev, dm_dev_id_t* ptr_dev_type)
 {
     *ptr_dev_type = get_entry_by_dev_rev_id(devid, chip_rev)->dm_id;
-    return *ptr_dev_type == DeviceUnknown ? MFE_UNSUPPORTED_DEVICE: MFE_OK;
+    return *ptr_dev_type == DeviceUnknown ? MFE_UNSUPPORTED_DEVICE : MFE_OK;
 }
 
 const char* dm_dev_type2str(dm_dev_id_t type)
@@ -694,14 +725,17 @@ const char* dm_dev_type2str(dm_dev_id_t type)
     return get_entry(type)->name;
 }
 
-dm_dev_id_t dm_dev_str2type(const char *str)
+dm_dev_id_t dm_dev_str2type(const char* str)
 {
-    const struct device_info *p = g_devs_info;
-    if (!str) {
+    const struct device_info* p = g_devs_info;
+    if (!str)
+    {
         return DeviceUnknown;
     }
-    while (p->dm_id != DeviceUnknown) {
-        if (strcmp(str, p->name) == 0) {
+    while (p->dm_id != DeviceUnknown)
+    {
+        if (strcmp(str, p->name) == 0)
+        {
             return p->dm_id;
         }
         p++;
@@ -722,7 +756,8 @@ int dm_dev_is_hca(dm_dev_id_t type)
 int dm_dev_is_200g_speed_supported_hca(dm_dev_id_t type)
 {
     bool isBlueField = (type == DeviceBlueField || type == DeviceBlueField2 || type == DeviceBlueField3);
-    return !isBlueField && (dm_dev_is_hca(type) && (get_entry(type)->hw_dev_id >= get_entry(DeviceConnectX6)->hw_dev_id));
+    return !isBlueField &&
+           (dm_dev_is_hca(type) && (get_entry(type)->hw_dev_id >= get_entry(DeviceConnectX6)->hw_dev_id));
 }
 
 int dm_dev_is_switch(dm_dev_id_t type)
@@ -740,15 +775,18 @@ int dm_dev_is_bridge(dm_dev_id_t type)
     return get_entry(type)->dev_type == DM_BRIDGE;
 }
 
-int dm_dev_is_qsfp_cable(dm_dev_id_t type) {
+int dm_dev_is_qsfp_cable(dm_dev_id_t type)
+{
     return get_entry(type)->dev_type == DM_QSFP_CABLE;
 }
 
-int dm_dev_is_sfp_cable(dm_dev_id_t type) {
+int dm_dev_is_sfp_cable(dm_dev_id_t type)
+{
     return get_entry(type)->dev_type == DM_SFP_CABLE;
 }
 
-int dm_dev_is_cmis_cable(dm_dev_id_t type) {
+int dm_dev_is_cmis_cable(dm_dev_id_t type)
+{
     return get_entry(type)->dev_type == DM_CMIS_CABLE;
 }
 
@@ -770,7 +808,7 @@ u_int32_t dm_get_hw_rev_id(dm_dev_id_t type)
 int dm_is_fpp_supported(dm_dev_id_t type)
 {
     // Function per port is supported only in HCAs that arrived after CX3
-    const struct device_info *dp = get_entry(type);
+    const struct device_info* dp = get_entry(type);
     return dm_is_5th_gen_hca(dp->dm_id);
 }
 
@@ -779,27 +817,33 @@ int dm_is_device_supported(dm_dev_id_t type)
     return get_entry(type)->dm_id != DeviceUnknown;
 }
 
-int dm_is_livefish_mode(mfile *mf)
+int dm_is_livefish_mode(mfile* mf)
 {
-    if (!mf || !mf->dinfo) {
+    if (!mf || !mf->dinfo)
+    {
         return 0;
     }
-    if (mf->tp == MST_SOFTWARE) {
+    if (mf->tp == MST_SOFTWARE)
+    {
         return 1;
     }
     dm_dev_id_t devid_t = DeviceUnknown;
     u_int32_t devid = 0;
     u_int32_t revid = 0;
     int rc = dm_get_device_id(mf, &devid_t, &devid, &revid);
-    if (rc) {
+    if (rc)
+    {
         // Could not detrmine , by default is not livefish
         return 0;
     }
     u_int32_t swid = mf->dinfo->pci.dev_id;
-    //printf("-D- swid: %#x, devid: %#x\n", swid, devid);
-    if (dm_is_4th_gen(devid_t) || dm_is_switchx(devid_t)) {
+    // printf("-D- swid: %#x, devid: %#x\n", swid, devid);
+    if (dm_is_4th_gen(devid_t) || dm_is_switchx(devid_t))
+    {
         return (devid == swid - 1);
-    } else {
+    }
+    else
+    {
         return (devid == swid);
     }
 
@@ -808,9 +852,7 @@ int dm_is_livefish_mode(mfile *mf)
 
 int dm_is_4th_gen(dm_dev_id_t type)
 {
-    return (type == DeviceConnectX2 ||
-            type == DeviceConnectX3 ||
-            type == DeviceConnectX3Pro);
+    return (type == DeviceConnectX2 || type == DeviceConnectX3 || type == DeviceConnectX3Pro);
 }
 
 int dm_is_5th_gen_hca(dm_dev_id_t type)
@@ -835,11 +877,12 @@ int dm_is_new_gen_switch(dm_dev_id_t type)
 
 int dm_dev_is_raven_family_switch(dm_dev_id_t type)
 {
-    return (dm_dev_is_switch(type) && (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSpectrum2 || type == DeviceSpectrum3 || type == DeviceSpectrum4));
+    return (dm_dev_is_switch(type) && (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSpectrum2 ||
+                                       type == DeviceSpectrum3 || type == DeviceSpectrum4));
 }
 
 int dm_dev_is_ib_switch(dm_dev_id_t type)
 {
-    return (dm_dev_is_switch(type) && (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSwitchIB || type == DeviceSwitchIB2));
+    return (dm_dev_is_switch(type) &&
+            (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSwitchIB || type == DeviceSwitchIB2));
 }
-
diff --git a/dev_mgt/tools_dev_types.h b/dev_mgt/tools_dev_types.h
index 2ccbab2a..98674504 100644
--- a/dev_mgt/tools_dev_types.h
+++ b/dev_mgt/tools_dev_types.h
@@ -44,75 +44,76 @@
 #define TOOLS_DEV_TYPE_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <common/bit_slice.h>
 #include <common/compatibility.h>
 #include <mtcr.h>
 
-enum dm_dev_id
-{
-    DeviceUnknown = -1,       //Dummy Device - Marker for indicating error.
-    DeviceStartMarker = 0,    // Dummy Device - Marker for first device
-                              // to let user iterate from DeviceStartMarker to DeviceEndMarker
-                              // Note: Call dm_is_device_supported() to see if a device is supported by the lib.
-
-    DeviceInfiniScale = 0,  // UnSupported
-    DeviceInfiniHost,       // UnSupported
-    DeviceInfiniHostIIIEx,  // UnSupported
-    DeviceInfiniHostIIIEx_MF,// UnSupported
-    DeviceInfiniScaleIII,   // UnSupported
-    DeviceInfiniHostIIILx,  // UnSupported
-    DeviceConnectX,         // UnSupported
-    DeviceConnectX2,
-    DeviceInfiniScaleIV,
-    DeviceBridgeX,          // UnSupported
-    DeviceSwitchX,
-    DeviceConnectX3,
-    DeviceConnectIB,
-    DeviceConnectX3Pro,
-    DeviceSwitchIB,
-    DeviceSpectrum,
-    DeviceQuantum,
-    DeviceConnectX4,
-    DeviceConnectX4LX,
-    DeviceConnectX5,
-    DeviceConnectX6,
-    DeviceBlueField,
-    DeviceBlueField2,
-    DeviceBlueField3,
-    DeviceFPGA,             // UnSupported
-    DeviceSwitchIB2,
-    DeviceFPGANewton,       // Unsupported
-    DeviceCable,
-    DeviceCableQSFP,
-    DeviceCableQSFPaging,
-    DeviceCableSFP,
-    DeviceCableSFP51,
-    DeviceCableSFP51Paging,
-    DeviceArdbeg,
-    DeviceBaritone,
-    DeviceMenhit,
-    DeviceSpectrum2,
-    DeviceDummy,
-    DeviceSecureHost,
-    DeviceConnectX6DX,
-    DeviceConnectX6LX,
-    DeviceConnectX7,
-    DeviceSpectrum3, // Firebird
-    DeviceSpectrum4, // Albatross
-    DeviceQuantum2, // Blackbird
-    DeviceGearBox,
-    DeviceGearBoxManager,
-    DeviceAbirGearBox,
-    DeviceCableCMIS,
-    DeviceCableCMISPaging,
-    DeviceEndMarker           // Dummy Device - Marker for indicating end of devices when iterating
-};
-
-enum hw_dev_id
-{
+    enum dm_dev_id
+    {
+        DeviceUnknown = -1,    // Dummy Device - Marker for indicating error.
+        DeviceStartMarker = 0, // Dummy Device - Marker for first device
+                               // to let user iterate from DeviceStartMarker to DeviceEndMarker
+                               // Note: Call dm_is_device_supported() to see if a device is supported by the lib.
+
+        DeviceInfiniScale = 0,    // UnSupported
+        DeviceInfiniHost,         // UnSupported
+        DeviceInfiniHostIIIEx,    // UnSupported
+        DeviceInfiniHostIIIEx_MF, // UnSupported
+        DeviceInfiniScaleIII,     // UnSupported
+        DeviceInfiniHostIIILx,    // UnSupported
+        DeviceConnectX,           // UnSupported
+        DeviceConnectX2,
+        DeviceInfiniScaleIV,
+        DeviceBridgeX, // UnSupported
+        DeviceSwitchX,
+        DeviceConnectX3,
+        DeviceConnectIB,
+        DeviceConnectX3Pro,
+        DeviceSwitchIB,
+        DeviceSpectrum,
+        DeviceQuantum,
+        DeviceConnectX4,
+        DeviceConnectX4LX,
+        DeviceConnectX5,
+        DeviceConnectX6,
+        DeviceBlueField,
+        DeviceBlueField2,
+        DeviceBlueField3,
+        DeviceFPGA, // UnSupported
+        DeviceSwitchIB2,
+        DeviceFPGANewton, // Unsupported
+        DeviceCable,
+        DeviceCableQSFP,
+        DeviceCableQSFPaging,
+        DeviceCableSFP,
+        DeviceCableSFP51,
+        DeviceCableSFP51Paging,
+        DeviceArdbeg,
+        DeviceBaritone,
+        DeviceMenhit,
+        DeviceSpectrum2,
+        DeviceDummy,
+        DeviceSecureHost,
+        DeviceConnectX6DX,
+        DeviceConnectX6LX,
+        DeviceConnectX7,
+        DeviceSpectrum3, // Firebird
+        DeviceSpectrum4, // Albatross
+        DeviceQuantum2,  // Blackbird
+        DeviceGearBox,
+        DeviceGearBoxManager,
+        DeviceAbirGearBox,
+        DeviceCableCMIS,
+        DeviceCableCMISPaging,
+        DeviceEndMarker // Dummy Device - Marker for indicating end of devices when iterating
+    };
+
+    enum hw_dev_id
+    {
         DeviceInfiniScale_HwId = 0x01b3,
         DeviceSwitchX_HwId = 0x0245,
         DeviceConnectX2_HwId = 0x190,
@@ -138,7 +139,7 @@ enum hw_dev_id
         DeviceCableCMISPaging_HwId = 0x19,
         DeviceCableSFP_HwId = 0x03,
         DeviceCableSFP51_HwId = 0x03,
-        DeviceCableSFP51Paging_HwId =0x03,
+        DeviceCableSFP51Paging_HwId = 0x03,
         DeviceSpectrum2_HwId = 0x24e,
         DeviceQuantum_HwId = 0x24d,
         DeviceQuantum2_HwId = 0x257,
@@ -151,117 +152,110 @@ enum hw_dev_id
         DeviceGearBox_HwId = 0x252,
         DeviceGearBoxManager_HwId = 0x253,
         DeviceAbirGearBox_HwId = 0x256
-};
-typedef enum dm_dev_id dm_dev_id_t;
-
-/**
- * Returns 0 on success and 1 on failure.
- */
-int dm_get_device_id(mfile *mf,
-                     dm_dev_id_t *ptr_dev_type,
-                     u_int32_t *ptr_dev_id,
-                     u_int32_t *ptr_chip_rev);
-
-int dm_get_device_id_without_prints(mfile *mf,
-                                    dm_dev_id_t *ptr_dm_dev_id,
-                                    u_int32_t *ptr_hw_dev_id,
-                                    u_int32_t *ptr_hw_rev);
-
-/**
- * Returns 0 on success and 1 on failure.
- */
-int dm_get_device_id_offline(u_int32_t devid,
-                             u_int32_t chip_rev,
-                             dm_dev_id_t *ptr_dev_type);
-
-
-/**
- * Returns 1 if device is supported and 0 otherwise (library dependant)
- */
-int dm_is_device_supported(dm_dev_id_t type);
-
-
-/**
- * Returns the device name as a "const char*"
- */
-const char* dm_dev_type2str(dm_dev_id_t type);
-
-/**
- * Returns the device id
- */
-dm_dev_id_t dm_dev_str2type(const char *str);
-
-/**
- * A predicate returning if the device is an hca
- */
-int dm_dev_is_hca(dm_dev_id_t type);
-
-/**
- * A predicate returning if the hca supports 200G speed and above
- */
-int dm_dev_is_200g_speed_supported_hca(dm_dev_id_t type);
-
-/**
- * A predicate returning if the device is a switch
- */
-int dm_dev_is_switch(dm_dev_id_t type);
-
-/**
- * A predicate returning if the switch supports 200G speed and above
- */
-int dm_dev_is_200g_speed_supported_switch(dm_dev_id_t type);
-
-/**
- * A predicate returning if the device is a bridge
- */
-int dm_dev_is_bridge(dm_dev_id_t type);
-
-/**
- * A predicate returning if the device is a Cable
- */
-int dm_dev_is_cable(dm_dev_id_t type);
-
-/**
- * Returns the max num of ports or -1 on error
- */
-int dm_get_hw_ports_num(dm_dev_id_t type);
-
-/**
- * Returns the HW device id of the givn device type or zero on failure.
- */
-u_int32_t dm_get_hw_dev_id(dm_dev_id_t type);
-
-/**
- * Returns the HW chip revision of the given device type or zero on failures,
- * This is useful to distinguish between ConnectX2 and ConnectX.
- */
-u_int32_t dm_get_hw_rev_id(dm_dev_id_t type);
-
-/**
- * A predicate returning if the device supports Function Per Port
- */
-int dm_is_fpp_supported(dm_dev_id_t type);
-
-int dm_is_4th_gen(dm_dev_id_t type);
-
-int dm_is_5th_gen_hca(dm_dev_id_t type);
-
-int dm_is_connectib(dm_dev_id_t type);
-
-int dm_is_switchx(dm_dev_id_t type);
-
-int dm_is_new_gen_switch(dm_dev_id_t type);
-
-int dm_dev_is_raven_family_switch(dm_dev_id_t type);
-
-int dm_dev_is_ib_switch(dm_dev_id_t type);
-/*
- * A predicate returning if the device is in LiveFish mode
- */
-int dm_is_livefish_mode(mfile *mf);
+    };
+    typedef enum dm_dev_id dm_dev_id_t;
+
+    /**
+     * Returns 0 on success and 1 on failure.
+     */
+    int dm_get_device_id(mfile* mf, dm_dev_id_t* ptr_dev_type, u_int32_t* ptr_dev_id, u_int32_t* ptr_chip_rev);
+
+    int dm_get_device_id_without_prints(mfile* mf,
+                                        dm_dev_id_t* ptr_dm_dev_id,
+                                        u_int32_t* ptr_hw_dev_id,
+                                        u_int32_t* ptr_hw_rev);
+
+    /**
+     * Returns 0 on success and 1 on failure.
+     */
+    int dm_get_device_id_offline(u_int32_t devid, u_int32_t chip_rev, dm_dev_id_t* ptr_dev_type);
+
+    /**
+     * Returns 1 if device is supported and 0 otherwise (library dependant)
+     */
+    int dm_is_device_supported(dm_dev_id_t type);
+
+    /**
+     * Returns the device name as a "const char*"
+     */
+    const char* dm_dev_type2str(dm_dev_id_t type);
+
+    /**
+     * Returns the device id
+     */
+    dm_dev_id_t dm_dev_str2type(const char* str);
+
+    /**
+     * A predicate returning if the device is an hca
+     */
+    int dm_dev_is_hca(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the hca supports 200G speed and above
+     */
+    int dm_dev_is_200g_speed_supported_hca(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the device is a switch
+     */
+    int dm_dev_is_switch(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the switch supports 200G speed and above
+     */
+    int dm_dev_is_200g_speed_supported_switch(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the device is a bridge
+     */
+    int dm_dev_is_bridge(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the device is a Cable
+     */
+    int dm_dev_is_cable(dm_dev_id_t type);
+
+    /**
+     * Returns the max num of ports or -1 on error
+     */
+    int dm_get_hw_ports_num(dm_dev_id_t type);
+
+    /**
+     * Returns the HW device id of the givn device type or zero on failure.
+     */
+    u_int32_t dm_get_hw_dev_id(dm_dev_id_t type);
+
+    /**
+     * Returns the HW chip revision of the given device type or zero on failures,
+     * This is useful to distinguish between ConnectX2 and ConnectX.
+     */
+    u_int32_t dm_get_hw_rev_id(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the device supports Function Per Port
+     */
+    int dm_is_fpp_supported(dm_dev_id_t type);
+
+    int dm_is_4th_gen(dm_dev_id_t type);
+
+    int dm_is_5th_gen_hca(dm_dev_id_t type);
+
+    int dm_is_connectib(dm_dev_id_t type);
+
+    int dm_is_switchx(dm_dev_id_t type);
+
+    int dm_is_new_gen_switch(dm_dev_id_t type);
+
+    int dm_dev_is_raven_family_switch(dm_dev_id_t type);
+
+    int dm_dev_is_ib_switch(dm_dev_id_t type);
+    /*
+     * A predicate returning if the device is in LiveFish mode
+     */
+    int dm_is_livefish_mode(mfile* mf);
 
 #ifdef __cplusplus
-}       /* end of 'extern "C"' */
+} /* end of 'extern "C"' */
 #endif
 
 #endif // TOOLS_DEV_TYPE_H
diff --git a/ext_libs/iniParser/dictionary.c b/ext_libs/iniParser/dictionary.c
index 7985ab3f..5e998193 100644
--- a/ext_libs/iniParser/dictionary.c
+++ b/ext_libs/iniParser/dictionary.c
@@ -20,13 +20,13 @@
 #include <string.h>
 
 /** Maximum value size for integers and doubles. */
-#define MAXVALSZ    1024
+#define MAXVALSZ 1024
 
 /** Minimal allocated number of entries in a dictionary */
-#define DICTMINSZ   128
+#define DICTMINSZ 128
 
 /** Invalid key token */
-#define DICT_INVALID_KEY    ((char*)-1)
+#define DICT_INVALID_KEY ((char*)-1)
 
 /*---------------------------------------------------------------------------
                             Private functions
@@ -42,19 +42,20 @@
   for systems that do not have it.
  */
 /*--------------------------------------------------------------------------*/
-static char * xstrdup(const char * s)
+static char* xstrdup(const char* s)
 {
-    char * t ;
-    size_t len ;
+    char* t;
+    size_t len;
     if (!s)
-        return NULL ;
+        return NULL;
 
-    len = strlen(s) + 1 ;
-    t = (char*) malloc(len) ;
-    if (t) {
-        memcpy(t, s, len) ;
+    len = strlen(s) + 1;
+    t = (char*)malloc(len);
+    if (t)
+    {
+        memcpy(t, s, len);
     }
-    return t ;
+    return t;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -64,16 +65,17 @@ static char * xstrdup(const char * s)
   @return   This function returns non-zero in case of failure
  */
 /*--------------------------------------------------------------------------*/
-static int dictionary_grow(dictionary * d)
+static int dictionary_grow(dictionary* d)
 {
-    char        ** new_val ;
-    char        ** new_key ;
-    unsigned     * new_hash ;
-
-    new_val  = (char**) calloc(d->size * 2, sizeof *d->val);
-    new_key  = (char**) calloc(d->size * 2, sizeof *d->key);
-    new_hash = (unsigned*) calloc(d->size * 2, sizeof *d->hash);
-    if (!new_val || !new_key || !new_hash) {
+    char** new_val;
+    char** new_key;
+    unsigned* new_hash;
+
+    new_val = (char**)calloc(d->size * 2, sizeof *d->val);
+    new_key = (char**)calloc(d->size * 2, sizeof *d->key);
+    new_hash = (unsigned*)calloc(d->size * 2, sizeof *d->hash);
+    if (!new_val || !new_key || !new_hash)
+    {
         /* An allocation failed, leave the dictionary unchanged */
         if (new_val)
             free(new_val);
@@ -81,22 +83,22 @@ static int dictionary_grow(dictionary * d)
             free(new_key);
         if (new_hash)
             free(new_hash);
-        return -1 ;
+        return -1;
     }
     /* Initialize the newly allocated space */
-    memcpy(new_val, d->val, d->size * sizeof(char *));
-    memcpy(new_key, d->key, d->size * sizeof(char *));
+    memcpy(new_val, d->val, d->size * sizeof(char*));
+    memcpy(new_key, d->key, d->size * sizeof(char*));
     memcpy(new_hash, d->hash, d->size * sizeof(unsigned));
     /* Delete previous data */
     free(d->val);
     free(d->key);
     free(d->hash);
     /* Actually update the dictionary */
-    d->size *= 2 ;
+    d->size *= 2;
     d->val = new_val;
     d->key = new_key;
     d->hash = new_hash;
-    return 0 ;
+    return 0;
 }
 
 /*---------------------------------------------------------------------------
@@ -114,25 +116,26 @@ static int dictionary_grow(dictionary * d)
   by comparing the key itself in last resort.
  */
 /*--------------------------------------------------------------------------*/
-unsigned dictionary_hash(const char * key)
+unsigned dictionary_hash(const char* key)
 {
-    size_t      len ;
-    unsigned    hash ;
-    size_t      i ;
+    size_t len;
+    unsigned hash;
+    size_t i;
 
     if (!key)
-        return 0 ;
+        return 0;
 
     len = strlen(key);
-    for (hash=0, i=0 ; i<len ; i++) {
-        hash += (unsigned)key[i] ;
-        hash += (hash<<10);
-        hash ^= (hash>>6) ;
+    for (hash = 0, i = 0; i < len; i++)
+    {
+        hash += (unsigned)key[i];
+        hash += (hash << 10);
+        hash ^= (hash >> 6);
     }
-    hash += (hash <<3);
-    hash ^= (hash >>11);
-    hash += (hash <<15);
-    return hash ;
+    hash += (hash << 3);
+    hash ^= (hash >> 11);
+    hash += (hash << 15);
+    return hash;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -146,22 +149,24 @@ unsigned dictionary_hash(const char * key)
   dictionary, give size=0.
  */
 /*-------------------------------------------------------------------------*/
-dictionary * dictionary_new(size_t size)
+dictionary* dictionary_new(size_t size)
 {
-    dictionary  *   d ;
+    dictionary* d;
 
     /* If no size was specified, allocate space for DICTMINSZ */
-    if (size<DICTMINSZ) size=DICTMINSZ ;
+    if (size < DICTMINSZ)
+        size = DICTMINSZ;
 
-    d = (dictionary*) calloc(1, sizeof *d) ;
+    d = (dictionary*)calloc(1, sizeof *d);
 
-    if (d) {
-        d->size = size ;
-        d->val  = (char**) calloc(size, sizeof *d->val);
-        d->key  = (char**) calloc(size, sizeof *d->key);
-        d->hash = (unsigned*) calloc(size, sizeof *d->hash);
+    if (d)
+    {
+        d->size = size;
+        d->val = (char**)calloc(size, sizeof *d->val);
+        d->key = (char**)calloc(size, sizeof *d->key);
+        d->hash = (unsigned*)calloc(size, sizeof *d->hash);
     }
-    return d ;
+    return d;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -173,22 +178,24 @@ dictionary * dictionary_new(size_t size)
   Deallocate a dictionary object and all memory associated to it.
  */
 /*--------------------------------------------------------------------------*/
-void dictionary_del(dictionary * d)
+void dictionary_del(dictionary* d)
 {
-    ssize_t  i ;
+    ssize_t i;
 
-    if (d==NULL) return ;
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]!=NULL)
+    if (d == NULL)
+        return;
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i] != NULL)
             free(d->key[i]);
-        if (d->val[i]!=NULL)
+        if (d->val[i] != NULL)
             free(d->val[i]);
     }
     free(d->val);
     free(d->key);
     free(d->hash);
     free(d);
-    return ;
+    return;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -205,24 +212,27 @@ void dictionary_del(dictionary * d)
   dictionary object, you should not try to free it or modify it.
  */
 /*--------------------------------------------------------------------------*/
-const char * dictionary_get(const dictionary * d, const char * key, const char * def)
+const char* dictionary_get(const dictionary* d, const char* key, const char* def)
 {
-    unsigned    hash ;
-    ssize_t      i ;
+    unsigned hash;
+    ssize_t i;
 
     hash = dictionary_hash(key);
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]==NULL)
-            continue ;
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i] == NULL)
+            continue;
         /* Compare hash */
-        if (hash==d->hash[i]) {
+        if (hash == d->hash[i])
+        {
             /* Compare string, to avoid hash collisions */
-            if (!strcmp(key, d->key[i])) {
-                return d->val[i] ;
+            if (!strcmp(key, d->key[i]))
+            {
+                return d->val[i];
             }
         }
     }
-    return def ;
+    return def;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -251,35 +261,41 @@ const char * dictionary_get(const dictionary * d, const char * key, const char *
   This function returns non-zero in case of failure.
  */
 /*--------------------------------------------------------------------------*/
-int dictionary_set(dictionary * d, const char * key, const char * val)
+int dictionary_set(dictionary* d, const char* key, const char* val)
 {
-    ssize_t         i ;
-    unsigned       hash ;
+    ssize_t i;
+    unsigned hash;
 
-    if (d==NULL || key==NULL) return -1 ;
+    if (d == NULL || key == NULL)
+        return -1;
 
     /* Compute hash for this key */
-    hash = dictionary_hash(key) ;
+    hash = dictionary_hash(key);
     /* Find if value is already in dictionary */
-    if (d->n>0) {
-        for (i=0 ; i<d->size ; i++) {
-            if (d->key[i]==NULL)
-                continue ;
-            if (hash==d->hash[i]) { /* Same hash value */
-                if (!strcmp(key, d->key[i])) {   /* Same key */
+    if (d->n > 0)
+    {
+        for (i = 0; i < d->size; i++)
+        {
+            if (d->key[i] == NULL)
+                continue;
+            if (hash == d->hash[i])
+            { /* Same hash value */
+                if (!strcmp(key, d->key[i]))
+                { /* Same key */
                     /* Found a value: modify and return */
-                    if (d->val[i]!=NULL)
+                    if (d->val[i] != NULL)
                         free(d->val[i]);
                     d->val[i] = (val ? xstrdup(val) : NULL);
                     /* Value has been modified: return */
-                    return 0 ;
+                    return 0;
                 }
             }
         }
     }
     /* Add a new value */
     /* See if dictionary needs to grow */
-    if (d->n==d->size) {
+    if (d->n == d->size)
+    {
         /* Reached maximum size: reallocate dictionary */
         if (dictionary_grow(d) != 0)
             return -1;
@@ -288,15 +304,17 @@ int dictionary_set(dictionary * d, const char * key, const char * val)
     /* Insert key in the first empty slot. Start at d->n and wrap at
        d->size. Because d->n < d->size this will necessarily
        terminate. */
-    for (i=d->n ; d->key[i] ; ) {
-        if(++i == d->size) i = 0;
+    for (i = d->n; d->key[i];)
+    {
+        if (++i == d->size)
+            i = 0;
     }
     /* Copy key */
-    d->key[i]  = xstrdup(key);
-    d->val[i]  = (val ? xstrdup(val) : NULL) ;
+    d->key[i] = xstrdup(key);
+    d->val[i] = (val ? xstrdup(val) : NULL);
     d->hash[i] = hash;
-    d->n ++ ;
-    return 0 ;
+    d->n++;
+    return 0;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -310,41 +328,46 @@ int dictionary_set(dictionary * d, const char * key, const char * val)
   key cannot be found.
  */
 /*--------------------------------------------------------------------------*/
-void dictionary_unset(dictionary * d, const char * key)
+void dictionary_unset(dictionary* d, const char* key)
 {
-    unsigned    hash ;
-    ssize_t      i ;
+    unsigned hash;
+    ssize_t i;
 
-    if (key == NULL || d == NULL) {
+    if (key == NULL || d == NULL)
+    {
         return;
     }
 
     hash = dictionary_hash(key);
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]==NULL)
-            continue ;
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i] == NULL)
+            continue;
         /* Compare hash */
-        if (hash==d->hash[i]) {
+        if (hash == d->hash[i])
+        {
             /* Compare string, to avoid hash collisions */
-            if (!strcmp(key, d->key[i])) {
+            if (!strcmp(key, d->key[i]))
+            {
                 /* Found key */
-                break ;
+                break;
             }
         }
     }
-    if (i>=d->size)
+    if (i >= d->size)
         /* Key not found */
-        return ;
+        return;
 
     free(d->key[i]);
-    d->key[i] = NULL ;
-    if (d->val[i]!=NULL) {
+    d->key[i] = NULL;
+    if (d->val[i] != NULL)
+    {
         free(d->val[i]);
-        d->val[i] = NULL ;
+        d->val[i] = NULL;
     }
-    d->hash[i] = 0 ;
-    d->n -- ;
-    return ;
+    d->hash[i] = 0;
+    d->n--;
+    return;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -359,21 +382,23 @@ void dictionary_unset(dictionary * d, const char * key)
   output file pointers.
  */
 /*--------------------------------------------------------------------------*/
-void dictionary_dump(const dictionary * d, FILE * out)
+void dictionary_dump(const dictionary* d, FILE* out)
 {
-    ssize_t  i ;
+    ssize_t i;
 
-    if (d==NULL || out==NULL) return ;
-    if (d->n<1) {
+    if (d == NULL || out == NULL)
+        return;
+    if (d->n < 1)
+    {
         fprintf(out, "empty dictionary\n");
-        return ;
+        return;
     }
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]) {
-            fprintf(out, "%20s\t[%s]\n",
-                    d->key[i],
-                    d->val[i] ? d->val[i] : "UNDEF");
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i])
+        {
+            fprintf(out, "%20s\t[%s]\n", d->key[i], d->val[i] ? d->val[i] : "UNDEF");
         }
     }
-    return ;
+    return;
 }
diff --git a/ext_libs/iniParser/dictionary.h b/ext_libs/iniParser/dictionary.h
index f7ef8e46..772b5156 100644
--- a/ext_libs/iniParser/dictionary.h
+++ b/ext_libs/iniParser/dictionary.h
@@ -27,147 +27,145 @@
 #include <compatibility.h>
 #endif
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-/*---------------------------------------------------------------------------
-                                New types
- ---------------------------------------------------------------------------*/
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Dictionary object
-
-  This object contains a list of string/string associations. Each
-  association is identified by a unique string key. Looking up values
-  in the dictionary is speeded up by the use of a (hopefully collision-free)
-  hash function.
- */
-/*-------------------------------------------------------------------------*/
-typedef struct _dictionary_ {
-    int             n ;     /** Number of entries in dictionary */
-    ssize_t         size ;  /** Storage size */
-    char        **  val ;   /** List of string values */
-    char        **  key ;   /** List of string keys */
-    unsigned     *  hash ;  /** List of hash values for keys */
-} dictionary ;
-
-
-/*---------------------------------------------------------------------------
-                            Function prototypes
- ---------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Compute the hash key for a string.
-  @param    key     Character string to use for key.
-  @return   1 unsigned int on at least 32 bits.
-
-  This hash function has been taken from an Article in Dr Dobbs Journal.
-  This is normally a collision-free function, distributing keys evenly.
-  The key is stored anyway in the struct so that collision can be avoided
-  by comparing the key itself in last resort.
- */
-/*--------------------------------------------------------------------------*/
-unsigned dictionary_hash(const char * key);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Create a new dictionary object.
-  @param    size    Optional initial size of the dictionary.
-  @return   1 newly allocated dictionary objet.
-
-  This function allocates a new dictionary object of given size and returns
-  it. If you do not know in advance (roughly) the number of entries in the
-  dictionary, give size=0.
- */
-/*--------------------------------------------------------------------------*/
-dictionary * dictionary_new(size_t size);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Delete a dictionary object
-  @param    d   dictionary object to deallocate.
-  @return   void
-
-  Deallocate a dictionary object and all memory associated to it.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_del(dictionary * vd);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get a value from a dictionary.
-  @param    d       dictionary object to search.
-  @param    key     Key to look for in the dictionary.
-  @param    def     Default value to return if key not found.
-  @return   1 pointer to internally allocated character string.
-
-  This function locates a key in a dictionary and returns a pointer to its
-  value, or the passed 'def' pointer if no such key can be found in
-  dictionary. The returned character pointer points to data internal to the
-  dictionary object, you should not try to free it or modify it.
- */
-/*--------------------------------------------------------------------------*/
-const char * dictionary_get(const dictionary * d, const char * key, const char * def);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Set a value in a dictionary.
-  @param    d       dictionary object to modify.
-  @param    key     Key to modify or add.
-  @param    val     Value to add.
-  @return   int     0 if Ok, anything else otherwise
-
-  If the given key is found in the dictionary, the associated value is
-  replaced by the provided one. If the key cannot be found in the
-  dictionary, it is added to it.
-
-  It is Ok to provide a NULL value for val, but NULL values for the dictionary
-  or the key are considered as errors: the function will return immediately
-  in such a case.
-
-  Notice that if you dictionary_set a variable to NULL, a call to
-  dictionary_get will return a NULL value: the variable will be found, and
-  its value (NULL) is returned. In other words, setting the variable
-  content to NULL is equivalent to deleting the variable from the
-  dictionary. It is not possible (in this implementation) to have a key in
-  the dictionary without value.
-
-  This function returns non-zero in case of failure.
- */
-/*--------------------------------------------------------------------------*/
-int dictionary_set(dictionary * vd, const char * key, const char * val);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Delete a key in a dictionary
-  @param    d       dictionary object to modify.
-  @param    key     Key to remove.
-  @return   void
-
-  This function deletes a key in a dictionary. Nothing is done if the
-  key cannot be found.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_unset(dictionary * d, const char * key);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Dump a dictionary to an opened file pointer.
-  @param    d   Dictionary to dump
-  @param    f   Opened file pointer.
-  @return   void
-
-  Dumps a dictionary onto an opened file pointer. Key pairs are printed out
-  as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as
-  output file pointers.
- */
-/*--------------------------------------------------------------------------*/
-void dictionary_dump(const dictionary * d, FILE * out);
+    /*---------------------------------------------------------------------------
+                                    New types
+     ---------------------------------------------------------------------------*/
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Dictionary object
+
+      This object contains a list of string/string associations. Each
+      association is identified by a unique string key. Looking up values
+      in the dictionary is speeded up by the use of a (hopefully collision-free)
+      hash function.
+     */
+    /*-------------------------------------------------------------------------*/
+    typedef struct _dictionary_
+    {
+        int n;          /** Number of entries in dictionary */
+        ssize_t size;   /** Storage size */
+        char** val;     /** List of string values */
+        char** key;     /** List of string keys */
+        unsigned* hash; /** List of hash values for keys */
+    } dictionary;
+
+    /*---------------------------------------------------------------------------
+                                Function prototypes
+     ---------------------------------------------------------------------------*/
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Compute the hash key for a string.
+      @param    key     Character string to use for key.
+      @return   1 unsigned int on at least 32 bits.
+
+      This hash function has been taken from an Article in Dr Dobbs Journal.
+      This is normally a collision-free function, distributing keys evenly.
+      The key is stored anyway in the struct so that collision can be avoided
+      by comparing the key itself in last resort.
+     */
+    /*--------------------------------------------------------------------------*/
+    unsigned dictionary_hash(const char* key);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Create a new dictionary object.
+      @param    size    Optional initial size of the dictionary.
+      @return   1 newly allocated dictionary objet.
+
+      This function allocates a new dictionary object of given size and returns
+      it. If you do not know in advance (roughly) the number of entries in the
+      dictionary, give size=0.
+     */
+    /*--------------------------------------------------------------------------*/
+    dictionary* dictionary_new(size_t size);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Delete a dictionary object
+      @param    d   dictionary object to deallocate.
+      @return   void
+
+      Deallocate a dictionary object and all memory associated to it.
+     */
+    /*--------------------------------------------------------------------------*/
+    void dictionary_del(dictionary* vd);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get a value from a dictionary.
+      @param    d       dictionary object to search.
+      @param    key     Key to look for in the dictionary.
+      @param    def     Default value to return if key not found.
+      @return   1 pointer to internally allocated character string.
+
+      This function locates a key in a dictionary and returns a pointer to its
+      value, or the passed 'def' pointer if no such key can be found in
+      dictionary. The returned character pointer points to data internal to the
+      dictionary object, you should not try to free it or modify it.
+     */
+    /*--------------------------------------------------------------------------*/
+    const char* dictionary_get(const dictionary* d, const char* key, const char* def);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Set a value in a dictionary.
+      @param    d       dictionary object to modify.
+      @param    key     Key to modify or add.
+      @param    val     Value to add.
+      @return   int     0 if Ok, anything else otherwise
+
+      If the given key is found in the dictionary, the associated value is
+      replaced by the provided one. If the key cannot be found in the
+      dictionary, it is added to it.
+
+      It is Ok to provide a NULL value for val, but NULL values for the dictionary
+      or the key are considered as errors: the function will return immediately
+      in such a case.
+
+      Notice that if you dictionary_set a variable to NULL, a call to
+      dictionary_get will return a NULL value: the variable will be found, and
+      its value (NULL) is returned. In other words, setting the variable
+      content to NULL is equivalent to deleting the variable from the
+      dictionary. It is not possible (in this implementation) to have a key in
+      the dictionary without value.
+
+      This function returns non-zero in case of failure.
+     */
+    /*--------------------------------------------------------------------------*/
+    int dictionary_set(dictionary* vd, const char* key, const char* val);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Delete a key in a dictionary
+      @param    d       dictionary object to modify.
+      @param    key     Key to remove.
+      @return   void
+
+      This function deletes a key in a dictionary. Nothing is done if the
+      key cannot be found.
+     */
+    /*--------------------------------------------------------------------------*/
+    void dictionary_unset(dictionary* d, const char* key);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Dump a dictionary to an opened file pointer.
+      @param    d   Dictionary to dump
+      @param    f   Opened file pointer.
+      @return   void
+
+      Dumps a dictionary onto an opened file pointer. Key pairs are printed out
+      as @c [Key]=[Value], one per line. It is Ok to provide stdout or stderr as
+      output file pointers.
+     */
+    /*--------------------------------------------------------------------------*/
+    void dictionary_dump(const dictionary* d, FILE* out);
 
 #ifdef __cplusplus
 }
diff --git a/ext_libs/iniParser/iniparser.c b/ext_libs/iniParser/iniparser.c
index f1d16589..f91962b9 100644
--- a/ext_libs/iniParser/iniparser.c
+++ b/ext_libs/iniParser/iniparser.c
@@ -12,8 +12,8 @@
 #include "iniparser.h"
 
 /*---------------------------- Defines -------------------------------------*/
-#define ASCIILINESZ         (1024)
-#define INI_INVALID_KEY     ((char*)-1)
+#define ASCIILINESZ (1024)
+#define INI_INVALID_KEY ((char*)-1)
 
 /*---------------------------------------------------------------------------
                         Private to this module
@@ -21,14 +21,15 @@
 /**
  * This enum stores the status for each parsed line (internal use only).
  */
-typedef enum _line_status_ {
+typedef enum _line_status_
+{
     LINE_UNPROCESSED,
     LINE_ERROR,
     LINE_EMPTY,
     LINE_COMMENT,
     LINE_SECTION,
     LINE_VALUE
-} line_status ;
+} line_status;
 
 /*-------------------------------------------------------------------------*/
 /**
@@ -42,18 +43,20 @@ typedef enum _line_status_ {
   At most len - 1 elements of the input string will be converted.
  */
 /*--------------------------------------------------------------------------*/
-static const char * strlwc(const char * in, char *out, unsigned len)
+static const char* strlwc(const char* in, char* out, unsigned len)
 {
-    unsigned i ;
+    unsigned i;
 
-    if (in==NULL || out == NULL || len==0) return NULL ;
-    i=0 ;
-    while (in[i] != '\0' && i < len-1) {
+    if (in == NULL || out == NULL || len == 0)
+        return NULL;
+    i = 0;
+    while (in[i] != '\0' && i < len - 1)
+    {
         out[i] = (char)tolower((int)in[i]);
-        i++ ;
+        i++;
     }
     out[i] = '\0';
-    return out ;
+    return out;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -66,19 +69,20 @@ static const char * strlwc(const char * in, char *out, unsigned len)
   for systems that do not have it.
  */
 /*--------------------------------------------------------------------------*/
-static char * xstrdup(const char * s)
+static char* xstrdup(const char* s)
 {
-    char * t ;
-    size_t len ;
+    char* t;
+    size_t len;
     if (!s)
-        return NULL ;
+        return NULL;
 
-    len = strlen(s) + 1 ;
-    t = (char*) malloc(len) ;
-    if (t) {
-        memcpy(t, s, len) ;
+    len = strlen(s) + 1;
+    t = (char*)malloc(len);
+    if (t)
+    {
+        memcpy(t, s, len);
     }
-    return t ;
+    return t;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -88,23 +92,26 @@ static char * xstrdup(const char * s)
   @return   unsigned New size of the string.
  */
 /*--------------------------------------------------------------------------*/
-static unsigned strstrip(char * s)
+static unsigned strstrip(char* s)
 {
-    char *last = NULL ;
-    char *dest = s;
+    char* last = NULL;
+    char* dest = s;
 
-    if (s==NULL) return 0;
+    if (s == NULL)
+        return 0;
 
     last = s + strlen(s);
-    while (isspace((int)*s) && *s) s++;
-    while (last > s) {
-        if (!isspace((int)*(last-1)))
-            break ;
-        last -- ;
+    while (isspace((int)*s) && *s)
+        s++;
+    while (last > s)
+    {
+        if (!isspace((int)*(last - 1)))
+            break;
+        last--;
     }
     *last = (char)0;
 
-    memmove(dest,s,last - s + 1);
+    memmove(dest, s, last - s + 1);
     return last - s;
 }
 
@@ -113,14 +120,14 @@ static unsigned strstrip(char * s)
   @brief    Default error callback for iniparser: wraps `fprintf(stderr, ...)`.
  */
 /*--------------------------------------------------------------------------*/
-static int default_error_callback(const char *format, ...)
+static int default_error_callback(const char* format, ...)
 {
-  int ret;
-  va_list argptr;
-  va_start(argptr, format);
-  ret = vfprintf(stderr, format, argptr);
-  va_end(argptr);
-  return ret;
+    int ret;
+    va_list argptr;
+    va_start(argptr, format);
+    ret = vfprintf(stderr, format, argptr);
+    va_end(argptr);
+    return ret;
 }
 
 static int (*iniparser_error_callback)(const char*, ...) = default_error_callback;
@@ -134,13 +141,16 @@ static int (*iniparser_error_callback)(const char*, ...) = default_error_callbac
   as errback the error callback will be switched back to default.
  */
 /*--------------------------------------------------------------------------*/
-void iniparser_set_error_callback(int (*errback)(const char *, ...))
+void iniparser_set_error_callback(int (*errback)(const char*, ...))
 {
-  if (errback) {
-    iniparser_error_callback = errback;
-  } else {
-    iniparser_error_callback = default_error_callback;
-  }
+    if (errback)
+    {
+        iniparser_error_callback = errback;
+    }
+    else
+    {
+        iniparser_error_callback = default_error_callback;
+    }
 }
 
 /*-------------------------------------------------------------------------*/
@@ -161,21 +171,24 @@ void iniparser_set_error_callback(int (*errback)(const char *, ...))
   This function returns -1 in case of error.
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_getnsec(const dictionary * d)
+int iniparser_getnsec(const dictionary* d)
 {
-    int i ;
-    int nsec ;
-
-    if (d==NULL) return -1 ;
-    nsec=0 ;
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]==NULL)
-            continue ;
-        if (strchr(d->key[i], ':')==NULL) {
-            nsec ++ ;
+    int i;
+    int nsec;
+
+    if (d == NULL)
+        return -1;
+    nsec = 0;
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i] == NULL)
+            continue;
+        if (strchr(d->key[i], ':') == NULL)
+        {
+            nsec++;
         }
     }
-    return nsec ;
+    return nsec;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -192,26 +205,30 @@ int iniparser_getnsec(const dictionary * d)
   This function returns NULL in case of error.
  */
 /*--------------------------------------------------------------------------*/
-const char * iniparser_getsecname(const dictionary * d, int n)
+const char* iniparser_getsecname(const dictionary* d, int n)
 {
-    int i ;
-    int foundsec ;
-
-    if (d==NULL || n<0) return NULL ;
-    foundsec=0 ;
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]==NULL)
-            continue ;
-        if (strchr(d->key[i], ':')==NULL) {
-            foundsec++ ;
-            if (foundsec>n)
-                break ;
+    int i;
+    int foundsec;
+
+    if (d == NULL || n < 0)
+        return NULL;
+    foundsec = 0;
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i] == NULL)
+            continue;
+        if (strchr(d->key[i], ':') == NULL)
+        {
+            foundsec++;
+            if (foundsec > n)
+                break;
         }
     }
-    if (foundsec<=n) {
-        return NULL ;
+    if (foundsec <= n)
+    {
+        return NULL;
     }
-    return d->key[i] ;
+    return d->key[i];
 }
 
 /*-------------------------------------------------------------------------*/
@@ -227,21 +244,26 @@ const char * iniparser_getsecname(const dictionary * d, int n)
   purposes mostly.
  */
 /*--------------------------------------------------------------------------*/
-void iniparser_dump(const dictionary * d, FILE * f)
+void iniparser_dump(const dictionary* d, FILE* f)
 {
-    int     i ;
+    int i;
 
-    if (d==NULL || f==NULL) return ;
-    for (i=0 ; i<d->size ; i++) {
-        if (d->key[i]==NULL)
-            continue ;
-        if (d->val[i]!=NULL) {
+    if (d == NULL || f == NULL)
+        return;
+    for (i = 0; i < d->size; i++)
+    {
+        if (d->key[i] == NULL)
+            continue;
+        if (d->val[i] != NULL)
+        {
             fprintf(f, "[%s]=[%s]\n", d->key[i], d->val[i]);
-        } else {
+        }
+        else
+        {
             fprintf(f, "[%s]=UNDEF\n", d->key[i]);
         }
     }
-    return ;
+    return;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -255,30 +277,34 @@ void iniparser_dump(const dictionary * d, FILE * f)
   It is Ok to specify @c stderr or @c stdout as output files.
  */
 /*--------------------------------------------------------------------------*/
-void iniparser_dump_ini(const dictionary * d, FILE * f)
+void iniparser_dump_ini(const dictionary* d, FILE* f)
 {
-    int          i ;
-    int          nsec ;
-    const char * secname ;
+    int i;
+    int nsec;
+    const char* secname;
 
-    if (d==NULL || f==NULL) return ;
+    if (d == NULL || f == NULL)
+        return;
 
     nsec = iniparser_getnsec(d);
-    if (nsec<1) {
+    if (nsec < 1)
+    {
         /* No section in file: dump all keys as they are */
-        for (i=0 ; i<d->size ; i++) {
-            if (d->key[i]==NULL)
-                continue ;
+        for (i = 0; i < d->size; i++)
+        {
+            if (d->key[i] == NULL)
+                continue;
             fprintf(f, "%s = %s\n", d->key[i], d->val[i]);
         }
-        return ;
+        return;
     }
-    for (i=0 ; i<nsec ; i++) {
-        secname = iniparser_getsecname(d, i) ;
+    for (i = 0; i < nsec; i++)
+    {
+        secname = iniparser_getsecname(d, i);
         iniparser_dumpsection_ini(d, secname, f);
     }
     fprintf(f, "\n");
-    return ;
+    return;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -293,30 +319,31 @@ void iniparser_dump_ini(const dictionary * d, FILE * f)
   file.  It is Ok to specify @c stderr or @c stdout as output files.
  */
 /*--------------------------------------------------------------------------*/
-void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f)
+void iniparser_dumpsection_ini(const dictionary* d, const char* s, FILE* f)
 {
-    int     j ;
-    char    keym[ASCIILINESZ+1];
-    int     seclen ;
+    int j;
+    char keym[ASCIILINESZ + 1];
+    int seclen;
 
-    if (d==NULL || f==NULL) return ;
-    if (! iniparser_find_entry(d, s)) return ;
+    if (d == NULL || f == NULL)
+        return;
+    if (!iniparser_find_entry(d, s))
+        return;
 
-    seclen  = (int)strlen(s);
+    seclen = (int)strlen(s);
     fprintf(f, "\n[%s]\n", s);
     sprintf(keym, "%s:", s);
-    for (j=0 ; j<d->size ; j++) {
-        if (d->key[j]==NULL)
-            continue ;
-        if (!strncmp(d->key[j], keym, seclen+1)) {
-            fprintf(f,
-                    "%-30s = %s\n",
-                    d->key[j]+seclen+1,
-                    d->val[j] ? d->val[j] : "");
+    for (j = 0; j < d->size; j++)
+    {
+        if (d->key[j] == NULL)
+            continue;
+        if (!strncmp(d->key[j], keym, seclen + 1))
+        {
+            fprintf(f, "%-30s = %s\n", d->key[j] + seclen + 1, d->val[j] ? d->val[j] : "");
         }
     }
     fprintf(f, "\n");
-    return ;
+    return;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -327,30 +354,32 @@ void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f)
   @return   Number of keys in section
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_getsecnkeys(const dictionary * d, const char * s)
+int iniparser_getsecnkeys(const dictionary* d, const char* s)
 {
-    int     seclen, nkeys ;
-    char    keym[ASCIILINESZ+1];
-    int j ;
+    int seclen, nkeys;
+    char keym[ASCIILINESZ + 1];
+    int j;
 
     nkeys = 0;
 
-    if (d==NULL) return nkeys;
-    if (! iniparser_find_entry(d, s)) return nkeys;
+    if (d == NULL)
+        return nkeys;
+    if (!iniparser_find_entry(d, s))
+        return nkeys;
 
-    seclen  = (int)strlen(s);
+    seclen = (int)strlen(s);
     strlwc(s, keym, sizeof(keym));
     keym[seclen] = ':';
 
-    for (j=0 ; j<d->size ; j++) {
-        if (d->key[j]==NULL)
-            continue ;
-        if (!strncmp(d->key[j], keym, seclen+1))
+    for (j = 0; j < d->size; j++)
+    {
+        if (d->key[j] == NULL)
+            continue;
+        if (!strncmp(d->key[j], keym, seclen + 1))
             nkeys++;
     }
 
     return nkeys;
-
 }
 
 /*-------------------------------------------------------------------------*/
@@ -369,24 +398,28 @@ int iniparser_getsecnkeys(const dictionary * d, const char * s)
   a string allocated in the dictionary; do not free or modify them.
  */
 /*--------------------------------------------------------------------------*/
-const char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys)
+const char** iniparser_getseckeys(const dictionary* d, const char* s, const char** keys)
 {
-    int i, j, seclen ;
-    char keym[ASCIILINESZ+1];
+    int i, j, seclen;
+    char keym[ASCIILINESZ + 1];
 
-    if (d==NULL || keys==NULL) return NULL;
-    if (! iniparser_find_entry(d, s)) return NULL;
+    if (d == NULL || keys == NULL)
+        return NULL;
+    if (!iniparser_find_entry(d, s))
+        return NULL;
 
-    seclen  = (int)strlen(s);
+    seclen = (int)strlen(s);
     strlwc(s, keym, sizeof(keym));
     keym[seclen] = ':';
 
     i = 0;
 
-    for (j=0 ; j<d->size ; j++) {
-        if (d->key[j]==NULL)
-            continue ;
-        if (!strncmp(d->key[j], keym, seclen+1)) {
+    for (j = 0; j < d->size; j++)
+    {
+        if (d->key[j] == NULL)
+            continue;
+        if (!strncmp(d->key[j], keym, seclen + 1))
+        {
             keys[i] = d->key[j];
             i++;
         }
@@ -410,18 +443,18 @@ const char ** iniparser_getseckeys(const dictionary * d, const char * s, const c
   the dictionary, do not free or modify it.
  */
 /*--------------------------------------------------------------------------*/
-const char * iniparser_getstring(const dictionary * d, const char * key, const char * def)
+const char* iniparser_getstring(const dictionary* d, const char* key, const char* def)
 {
-    const char * lc_key ;
-    const char * sval ;
-    char tmp_str[ASCIILINESZ+1];
+    const char* lc_key;
+    const char* sval;
+    char tmp_str[ASCIILINESZ + 1];
 
-    if (d==NULL || key==NULL)
-        return def ;
+    if (d == NULL || key == NULL)
+        return def;
 
     lc_key = strlwc(key, tmp_str, sizeof(tmp_str));
     sval = dictionary_get(d, lc_key, def);
-    return sval ;
+    return sval;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -451,16 +484,16 @@ const char * iniparser_getstring(const dictionary * d, const char * key, const c
   Credits: Thanks to A. Becker for suggesting strtol()
  */
 /*--------------------------------------------------------------------------*/
-long int iniparser_getlongint(const dictionary * d, const char * key, long int notfound)
+long int iniparser_getlongint(const dictionary* d, const char* key, long int notfound)
 {
-    const char * str ;
+    const char* str;
 
     str = iniparser_getstring(d, key, INI_INVALID_KEY);
-    if (str==INI_INVALID_KEY) return notfound ;
+    if (str == INI_INVALID_KEY)
+        return notfound;
     return strtol(str, NULL, 0);
 }
 
-
 /*-------------------------------------------------------------------------*/
 /**
   @brief    Get the string associated to a key, convert to an int
@@ -488,7 +521,7 @@ long int iniparser_getlongint(const dictionary * d, const char * key, long int n
   Credits: Thanks to A. Becker for suggesting strtol()
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_getint(const dictionary * d, const char * key, int notfound)
+int iniparser_getint(const dictionary* d, const char* key, int notfound)
 {
     return (int)iniparser_getlongint(d, key, notfound);
 }
@@ -506,12 +539,13 @@ int iniparser_getint(const dictionary * d, const char * key, int notfound)
   the notfound value is returned.
  */
 /*--------------------------------------------------------------------------*/
-double iniparser_getdouble(const dictionary * d, const char * key, double notfound)
+double iniparser_getdouble(const dictionary* d, const char* key, double notfound)
 {
-    const char * str ;
+    const char* str;
 
     str = iniparser_getstring(d, key, INI_INVALID_KEY);
-    if (str==INI_INVALID_KEY) return notfound ;
+    if (str == INI_INVALID_KEY)
+        return notfound;
     return atof(str);
 }
 
@@ -547,19 +581,25 @@ double iniparser_getdouble(const dictionary * d, const char * key, double notfou
   necessarily have to be 0 or 1.
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_getboolean(const dictionary * d, const char * key, int notfound)
+int iniparser_getboolean(const dictionary* d, const char* key, int notfound)
 {
-    int          ret ;
-    const char * c ;
+    int ret;
+    const char* c;
 
     c = iniparser_getstring(d, key, INI_INVALID_KEY);
-    if (c==INI_INVALID_KEY) return notfound ;
-    if (c[0]=='y' || c[0]=='Y' || c[0]=='1' || c[0]=='t' || c[0]=='T') {
-        ret = 1 ;
-    } else if (c[0]=='n' || c[0]=='N' || c[0]=='0' || c[0]=='f' || c[0]=='F') {
-        ret = 0 ;
-    } else {
-        ret = notfound ;
+    if (c == INI_INVALID_KEY)
+        return notfound;
+    if (c[0] == 'y' || c[0] == 'Y' || c[0] == '1' || c[0] == 't' || c[0] == 'T')
+    {
+        ret = 1;
+    }
+    else if (c[0] == 'n' || c[0] == 'N' || c[0] == '0' || c[0] == 'f' || c[0] == 'F')
+    {
+        ret = 0;
+    }
+    else
+    {
+        ret = notfound;
     }
     return ret;
 }
@@ -576,13 +616,14 @@ int iniparser_getboolean(const dictionary * d, const char * key, int notfound)
   of querying for the presence of sections in a dictionary.
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_find_entry(const dictionary * ini, const char * entry)
+int iniparser_find_entry(const dictionary* ini, const char* entry)
 {
-    int found=0 ;
-    if (iniparser_getstring(ini, entry, INI_INVALID_KEY)!=INI_INVALID_KEY) {
-        found = 1 ;
+    int found = 0;
+    if (iniparser_getstring(ini, entry, INI_INVALID_KEY) != INI_INVALID_KEY)
+    {
+        found = 1;
     }
-    return found ;
+    return found;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -598,10 +639,10 @@ int iniparser_find_entry(const dictionary * ini, const char * entry)
   It is Ok to set val to NULL.
  */
 /*--------------------------------------------------------------------------*/
-int iniparser_set(dictionary * ini, const char * entry, const char * val)
+int iniparser_set(dictionary* ini, const char* entry, const char* val)
 {
-    char tmp_str[ASCIILINESZ+1];
-    return dictionary_set(ini, strlwc(entry, tmp_str, sizeof(tmp_str)), val) ;
+    char tmp_str[ASCIILINESZ + 1];
+    return dictionary_set(ini, strlwc(entry, tmp_str, sizeof(tmp_str)), val);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -614,9 +655,9 @@ int iniparser_set(dictionary * ini, const char * entry, const char * val)
   If the given entry can be found, it is deleted from the dictionary.
  */
 /*--------------------------------------------------------------------------*/
-void iniparser_unset(dictionary * ini, const char * entry)
+void iniparser_unset(dictionary* ini, const char* entry)
 {
-    char tmp_str[ASCIILINESZ+1];
+    char tmp_str[ASCIILINESZ + 1];
     dictionary_unset(ini, strlwc(entry, tmp_str, sizeof(tmp_str)));
 }
 
@@ -630,40 +671,44 @@ void iniparser_unset(dictionary * ini, const char * entry)
   @return   line_status value
  */
 /*--------------------------------------------------------------------------*/
-static line_status iniparser_line(
-    const char * input_line,
-    char * section,
-    char * key,
-    char * value)
+static line_status iniparser_line(const char* input_line, char* section, char* key, char* value)
 {
-    line_status sta ;
-    char * line = NULL;
-    size_t      len ;
+    line_status sta;
+    char* line = NULL;
+    size_t len;
 
     line = xstrdup(input_line);
     len = strstrip(line);
 
-    sta = LINE_UNPROCESSED ;
-    if (len<1) {
+    sta = LINE_UNPROCESSED;
+    if (len < 1)
+    {
         /* Empty line */
-        sta = LINE_EMPTY ;
-    } else if (line[0]=='#' || line[0]==';') {
+        sta = LINE_EMPTY;
+    }
+    else if (line[0] == '#' || line[0] == ';')
+    {
         /* Comment line */
-        sta = LINE_COMMENT ;
-    } else if (line[0]=='[' && line[len-1]==']') {
+        sta = LINE_COMMENT;
+    }
+    else if (line[0] == '[' && line[len - 1] == ']')
+    {
         /* Section name */
         sscanf(line, "[%[^]]", section);
         strstrip(section);
         strlwc(section, section, len);
-        sta = LINE_SECTION ;
-    } else if (sscanf (line, "%[^=] = \"%[^\"]\"", key, value) == 2
-           ||  sscanf (line, "%[^=] = '%[^\']'",   key, value) == 2) {
+        sta = LINE_SECTION;
+    }
+    else if (sscanf(line, "%[^=] = \"%[^\"]\"", key, value) == 2 || sscanf(line, "%[^=] = '%[^\']'", key, value) == 2)
+    {
         /* Usual key=value with quotes, with or without comments */
         strstrip(key);
         strlwc(key, key, len);
         /* Don't strip spaces from values surrounded with quotes */
-        sta = LINE_VALUE ;
-    } else if (sscanf (line, "%[^=] = %[^;#]", key, value) == 2) {
+        sta = LINE_VALUE;
+    }
+    else if (sscanf(line, "%[^=] = %[^;#]", key, value) == 2)
+    {
         /* Usual key=value without quotes, with or without comments */
         strstrip(key);
         strlwc(key, key, len);
@@ -672,12 +717,14 @@ static line_status iniparser_line(
          * sscanf cannot handle '' or "" as empty values
          * this is done here
          */
-        if (!strcmp(value, "\"\"") || (!strcmp(value, "''"))) {
-            value[0]=0 ;
+        if (!strcmp(value, "\"\"") || (!strcmp(value, "''")))
+        {
+            value[0] = 0;
         }
-        sta = LINE_VALUE ;
-    } else if (sscanf(line, "%[^=] = %[;#]", key, value)==2
-           ||  sscanf(line, "%[^=] %[=]", key, value) == 2) {
+        sta = LINE_VALUE;
+    }
+    else if (sscanf(line, "%[^=] = %[;#]", key, value) == 2 || sscanf(line, "%[^=] %[=]", key, value) == 2)
+    {
         /*
          * Special cases:
          * key=
@@ -686,15 +733,17 @@ static line_status iniparser_line(
          */
         strstrip(key);
         strlwc(key, key, len);
-        value[0]=0 ;
-        sta = LINE_VALUE ;
-    } else {
+        value[0] = 0;
+        sta = LINE_VALUE;
+    }
+    else
+    {
         /* Generate syntax error */
-        sta = LINE_ERROR ;
+        sta = LINE_ERROR;
     }
 
     free(line);
-    return sta ;
+    return sta;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -711,112 +760,116 @@ static line_status iniparser_line(
   The returned dictionary must be freed using iniparser_freedict().
  */
 /*--------------------------------------------------------------------------*/
-dictionary * iniparser_load(const char * ininame)
+dictionary* iniparser_load(const char* ininame)
 {
-    FILE * in ;
+    FILE* in;
 
-    char line    [ASCIILINESZ+1] ;
-    char section [ASCIILINESZ+1] ;
-    char key     [ASCIILINESZ+1] ;
-    char tmp     [(ASCIILINESZ * 2) + 2] ;
-    char val     [ASCIILINESZ+1] ;
+    char line[ASCIILINESZ + 1];
+    char section[ASCIILINESZ + 1];
+    char key[ASCIILINESZ + 1];
+    char tmp[(ASCIILINESZ * 2) + 2];
+    char val[ASCIILINESZ + 1];
 
-    int  last=0 ;
-    int  len ;
-    int  lineno=0 ;
-    int  errs=0;
-    int  mem_err=0;
+    int last = 0;
+    int len;
+    int lineno = 0;
+    int errs = 0;
+    int mem_err = 0;
 
-    dictionary * dict ;
+    dictionary* dict;
 
-    if ((in=fopen(ininame, "r"))==NULL) {
+    if ((in = fopen(ininame, "r")) == NULL)
+    {
         iniparser_error_callback("iniparser: cannot open %s\n", ininame);
-        return NULL ;
+        return NULL;
     }
 
-    dict = dictionary_new(0) ;
-    if (!dict) {
+    dict = dictionary_new(0);
+    if (!dict)
+    {
         fclose(in);
-        return NULL ;
+        return NULL;
     }
 
-    memset(line,    0, ASCIILINESZ);
+    memset(line, 0, ASCIILINESZ);
     memset(section, 0, ASCIILINESZ);
-    memset(key,     0, ASCIILINESZ);
-    memset(val,     0, ASCIILINESZ);
-    last=0 ;
-
-    while (fgets(line+last, ASCIILINESZ-last, in)!=NULL) {
-        lineno++ ;
-        len = (int)strlen(line)-1;
-        if (len<=0)
+    memset(key, 0, ASCIILINESZ);
+    memset(val, 0, ASCIILINESZ);
+    last = 0;
+
+    while (fgets(line + last, ASCIILINESZ - last, in) != NULL)
+    {
+        lineno++;
+        len = (int)strlen(line) - 1;
+        if (len <= 0)
             continue;
         /* Safety check against buffer overflows */
-        if (line[len]!='\n' && !feof(in)) {
-            iniparser_error_callback(
-              "iniparser: input line too long in %s (%d)\n",
-              ininame,
-              lineno);
+        if (line[len] != '\n' && !feof(in))
+        {
+            iniparser_error_callback("iniparser: input line too long in %s (%d)\n", ininame, lineno);
             dictionary_del(dict);
             fclose(in);
-            return NULL ;
+            return NULL;
         }
         /* Get rid of \n and spaces at end of line */
-        while ((len>=0) &&
-                ((line[len]=='\n') || (isspace(line[len])))) {
-            line[len]=0 ;
-            len-- ;
+        while ((len >= 0) && ((line[len] == '\n') || (isspace(line[len]))))
+        {
+            line[len] = 0;
+            len--;
         }
-        if (len < 0) { /* Line was entirely \n and/or spaces */
+        if (len < 0)
+        { /* Line was entirely \n and/or spaces */
             len = 0;
         }
         /* Detect multi-line */
-        if (line[len]=='\\') {
+        if (line[len] == '\\')
+        {
             /* Multi-line value */
-            last=len ;
-            continue ;
-        } else {
-            last=0 ;
+            last = len;
+            continue;
         }
-        switch (iniparser_line(line, section, key, val)) {
+        else
+        {
+            last = 0;
+        }
+        switch (iniparser_line(line, section, key, val))
+        {
             case LINE_EMPTY:
             case LINE_COMMENT:
-            break ;
+                break;
 
             case LINE_SECTION:
-            mem_err = dictionary_set(dict, section, NULL);
-            break ;
+                mem_err = dictionary_set(dict, section, NULL);
+                break;
 
             case LINE_VALUE:
-            sprintf(tmp, "%s:%s", section, key);
-            mem_err = dictionary_set(dict, tmp, val);
-            break ;
+                sprintf(tmp, "%s:%s", section, key);
+                mem_err = dictionary_set(dict, tmp, val);
+                break;
 
             case LINE_ERROR:
-            iniparser_error_callback(
-              "iniparser: syntax error in %s (%d):\n-> %s\n",
-              ininame,
-              lineno,
-              line);
-            errs++ ;
-            break;
+                iniparser_error_callback("iniparser: syntax error in %s (%d):\n-> %s\n", ininame, lineno, line);
+                errs++;
+                break;
 
             default:
-            break ;
+                break;
         }
         memset(line, 0, ASCIILINESZ);
-        last=0;
-        if (mem_err<0) {
+        last = 0;
+        if (mem_err < 0)
+        {
             iniparser_error_callback("iniparser: memory allocation failure\n");
-            break ;
+            break;
         }
     }
-    if (errs) {
+    if (errs)
+    {
         dictionary_del(dict);
-        dict = NULL ;
+        dict = NULL;
     }
     fclose(in);
-    return dict ;
+    return dict;
 }
 
 /*-------------------------------------------------------------------------*/
@@ -830,7 +883,7 @@ dictionary * iniparser_load(const char * ininame)
   gets out of the current context.
  */
 /*--------------------------------------------------------------------------*/
-void iniparser_freedict(dictionary * d)
+void iniparser_freedict(dictionary* d)
 {
     dictionary_del(d);
 }
diff --git a/ext_libs/iniParser/iniparser.h b/ext_libs/iniParser/iniparser.h
index 37ff7b71..f12fc40c 100644
--- a/ext_libs/iniParser/iniparser.h
+++ b/ext_libs/iniParser/iniparser.h
@@ -28,328 +28,323 @@
 #include "dictionary.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Configure a function to receive the error messages.
-  @param    errback  Function to call.
-
-  By default, the error will be printed on stderr. If a null pointer is passed
-  as errback the error callback will be switched back to default.
- */
-/*--------------------------------------------------------------------------*/
-
-void iniparser_set_error_callback(int (*errback)(const char *, ...));
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get number of sections in a dictionary
-  @param    d   Dictionary to examine
-  @return   int Number of sections found in dictionary
-
-  This function returns the number of sections found in a dictionary.
-  The test to recognize sections is done on the string stored in the
-  dictionary: a section name is given as "section" whereas a key is
-  stored as "section:key", thus the test looks for entries that do not
-  contain a colon.
-
-  This clearly fails in the case a section name contains a colon, but
-  this should simply be avoided.
-
-  This function returns -1 in case of error.
- */
-/*--------------------------------------------------------------------------*/
-
-int iniparser_getnsec(const dictionary * d);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get name for section n in a dictionary.
-  @param    d   Dictionary to examine
-  @param    n   Section number (from 0 to nsec-1).
-  @return   Pointer to char string
-
-  This function locates the n-th section in a dictionary and returns
-  its name as a pointer to a string statically allocated inside the
-  dictionary. Do not free or modify the returned string!
-
-  This function returns NULL in case of error.
- */
-/*--------------------------------------------------------------------------*/
-
-const char * iniparser_getsecname(const dictionary * d, int n);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Save a dictionary to a loadable ini file
-  @param    d   Dictionary to dump
-  @param    f   Opened file pointer to dump to
-  @return   void
-
-  This function dumps a given dictionary into a loadable ini file.
-  It is Ok to specify @c stderr or @c stdout as output files.
- */
-/*--------------------------------------------------------------------------*/
-
-void iniparser_dump_ini(const dictionary * d, FILE * f);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Save a dictionary section to a loadable ini file
-  @param    d   Dictionary to dump
-  @param    s   Section name of dictionary to dump
-  @param    f   Opened file pointer to dump to
-  @return   void
-
-  This function dumps a given section of a given dictionary into a loadable ini
-  file.  It is Ok to specify @c stderr or @c stdout as output files.
- */
-/*--------------------------------------------------------------------------*/
-
-void iniparser_dumpsection_ini(const dictionary * d, const char * s, FILE * f);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Dump a dictionary to an opened file pointer.
-  @param    d   Dictionary to dump.
-  @param    f   Opened file pointer to dump to.
-  @return   void
-
-  This function prints out the contents of a dictionary, one element by
-  line, onto the provided file pointer. It is OK to specify @c stderr
-  or @c stdout as output files. This function is meant for debugging
-  purposes mostly.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_dump(const dictionary * d, FILE * f);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the number of keys in a section of a dictionary.
-  @param    d   Dictionary to examine
-  @param    s   Section name of dictionary to examine
-  @return   Number of keys in section
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getsecnkeys(const dictionary * d, const char * s);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the number of keys in a section of a dictionary.
-  @param    d    Dictionary to examine
-  @param    s    Section name of dictionary to examine
-  @param    keys Already allocated array to store the keys in
-  @return   The pointer passed as `keys` argument or NULL in case of error
-
-  This function queries a dictionary and finds all keys in a given section.
-  The keys argument should be an array of pointers which size has been
-  determined by calling `iniparser_getsecnkeys` function prior to this one.
-
-  Each pointer in the returned char pointer-to-pointer is pointing to
-  a string allocated in the dictionary; do not free or modify them.
- */
-/*--------------------------------------------------------------------------*/
-const char ** iniparser_getseckeys(const dictionary * d, const char * s, const char ** keys);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the string associated to a key
-  @param    d       Dictionary to search
-  @param    key     Key string to look for
-  @param    def     Default value to return if key not found.
-  @return   pointer to statically allocated character string
-
-  This function queries a dictionary for a key. A key as read from an
-  ini file is given as "section:key". If the key cannot be found,
-  the pointer passed as 'def' is returned.
-  The returned char pointer is pointing to a string allocated in
-  the dictionary, do not free or modify it.
- */
-/*--------------------------------------------------------------------------*/
-const char * iniparser_getstring(const dictionary * d, const char * key, const char * def);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the string associated to a key, convert to an int
-  @param    d Dictionary to search
-  @param    key Key string to look for
-  @param    notfound Value to return in case of error
-  @return   integer
-
-  This function queries a dictionary for a key. A key as read from an
-  ini file is given as "section:key". If the key cannot be found,
-  the notfound value is returned.
-
-  Supported values for integers include the usual C notation
-  so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
-  are supported. Examples:
-
-  - "42"      ->  42
-  - "042"     ->  34 (octal -> decimal)
-  - "0x42"    ->  66 (hexa  -> decimal)
-
-  Warning: the conversion may overflow in various ways. Conversion is
-  totally outsourced to strtol(), see the associated man page for overflow
-  handling.
-
-  Credits: Thanks to A. Becker for suggesting strtol()
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getint(const dictionary * d, const char * key, int notfound);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the string associated to a key, convert to an long int
-  @param    d Dictionary to search
-  @param    key Key string to look for
-  @param    notfound Value to return in case of error
-  @return   integer
-
-  This function queries a dictionary for a key. A key as read from an
-  ini file is given as "section:key". If the key cannot be found,
-  the notfound value is returned.
-
-  Supported values for integers include the usual C notation
-  so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
-  are supported. Examples:
-
-  - "42"      ->  42
-  - "042"     ->  34 (octal -> decimal)
-  - "0x42"    ->  66 (hexa  -> decimal)
-
-  Warning: the conversion may overflow in various ways. Conversion is
-  totally outsourced to strtol(), see the associated man page for overflow
-  handling.
- */
-/*--------------------------------------------------------------------------*/
-long int iniparser_getlongint(const dictionary * d, const char * key, long int notfound);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the string associated to a key, convert to a double
-  @param    d Dictionary to search
-  @param    key Key string to look for
-  @param    notfound Value to return in case of error
-  @return   double
-
-  This function queries a dictionary for a key. A key as read from an
-  ini file is given as "section:key". If the key cannot be found,
-  the notfound value is returned.
- */
-/*--------------------------------------------------------------------------*/
-double iniparser_getdouble(const dictionary * d, const char * key, double notfound);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Get the string associated to a key, convert to a boolean
-  @param    d Dictionary to search
-  @param    key Key string to look for
-  @param    notfound Value to return in case of error
-  @return   integer
-
-  This function queries a dictionary for a key. A key as read from an
-  ini file is given as "section:key". If the key cannot be found,
-  the notfound value is returned.
-
-  A true boolean is found if one of the following is matched:
-
-  - A string starting with 'y'
-  - A string starting with 'Y'
-  - A string starting with 't'
-  - A string starting with 'T'
-  - A string starting with '1'
-
-  A false boolean is found if one of the following is matched:
-
-  - A string starting with 'n'
-  - A string starting with 'N'
-  - A string starting with 'f'
-  - A string starting with 'F'
-  - A string starting with '0'
-
-  The notfound value returned if no boolean is identified, does not
-  necessarily have to be 0 or 1.
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_getboolean(const dictionary * d, const char * key, int notfound);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Set an entry in a dictionary.
-  @param    ini     Dictionary to modify.
-  @param    entry   Entry to modify (entry name)
-  @param    val     New value to associate to the entry.
-  @return   int     0 if Ok, -1 otherwise.
-
-  If the given entry can be found in the dictionary, it is modified to
-  contain the provided value. If it cannot be found, the entry is created.
-  It is Ok to set val to NULL.
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_set(dictionary * ini, const char * entry, const char * val);
-
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Delete an entry in a dictionary
-  @param    ini     Dictionary to modify
-  @param    entry   Entry to delete (entry name)
-  @return   void
-
-  If the given entry can be found, it is deleted from the dictionary.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_unset(dictionary * ini, const char * entry);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Finds out if a given entry exists in a dictionary
-  @param    ini     Dictionary to search
-  @param    entry   Name of the entry to look for
-  @return   integer 1 if entry exists, 0 otherwise
-
-  Finds out if a given entry exists in the dictionary. Since sections
-  are stored as keys with NULL associated values, this is the only way
-  of querying for the presence of sections in a dictionary.
- */
-/*--------------------------------------------------------------------------*/
-int iniparser_find_entry(const dictionary * ini, const char * entry) ;
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Parse an ini file and return an allocated dictionary object
-  @param    ininame Name of the ini file to read.
-  @return   Pointer to newly allocated dictionary
-
-  This is the parser for ini files. This function is called, providing
-  the name of the file to be read. It returns a dictionary object that
-  should not be accessed directly, but through accessor functions
-  instead.
-
-  The returned dictionary must be freed using iniparser_freedict().
- */
-/*--------------------------------------------------------------------------*/
-dictionary * iniparser_load(const char * ininame);
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Free all memory associated to an ini dictionary
-  @param    d Dictionary to free
-  @return   void
-
-  Free all memory associated to an ini dictionary.
-  It is mandatory to call this function before the dictionary object
-  gets out of the current context.
- */
-/*--------------------------------------------------------------------------*/
-void iniparser_freedict(dictionary * d);
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Configure a function to receive the error messages.
+      @param    errback  Function to call.
+
+      By default, the error will be printed on stderr. If a null pointer is passed
+      as errback the error callback will be switched back to default.
+     */
+    /*--------------------------------------------------------------------------*/
+
+    void iniparser_set_error_callback(int (*errback)(const char*, ...));
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get number of sections in a dictionary
+      @param    d   Dictionary to examine
+      @return   int Number of sections found in dictionary
+
+      This function returns the number of sections found in a dictionary.
+      The test to recognize sections is done on the string stored in the
+      dictionary: a section name is given as "section" whereas a key is
+      stored as "section:key", thus the test looks for entries that do not
+      contain a colon.
+
+      This clearly fails in the case a section name contains a colon, but
+      this should simply be avoided.
+
+      This function returns -1 in case of error.
+     */
+    /*--------------------------------------------------------------------------*/
+
+    int iniparser_getnsec(const dictionary* d);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get name for section n in a dictionary.
+      @param    d   Dictionary to examine
+      @param    n   Section number (from 0 to nsec-1).
+      @return   Pointer to char string
+
+      This function locates the n-th section in a dictionary and returns
+      its name as a pointer to a string statically allocated inside the
+      dictionary. Do not free or modify the returned string!
+
+      This function returns NULL in case of error.
+     */
+    /*--------------------------------------------------------------------------*/
+
+    const char* iniparser_getsecname(const dictionary* d, int n);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Save a dictionary to a loadable ini file
+      @param    d   Dictionary to dump
+      @param    f   Opened file pointer to dump to
+      @return   void
+
+      This function dumps a given dictionary into a loadable ini file.
+      It is Ok to specify @c stderr or @c stdout as output files.
+     */
+    /*--------------------------------------------------------------------------*/
+
+    void iniparser_dump_ini(const dictionary* d, FILE* f);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Save a dictionary section to a loadable ini file
+      @param    d   Dictionary to dump
+      @param    s   Section name of dictionary to dump
+      @param    f   Opened file pointer to dump to
+      @return   void
+
+      This function dumps a given section of a given dictionary into a loadable ini
+      file.  It is Ok to specify @c stderr or @c stdout as output files.
+     */
+    /*--------------------------------------------------------------------------*/
+
+    void iniparser_dumpsection_ini(const dictionary* d, const char* s, FILE* f);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Dump a dictionary to an opened file pointer.
+      @param    d   Dictionary to dump.
+      @param    f   Opened file pointer to dump to.
+      @return   void
+
+      This function prints out the contents of a dictionary, one element by
+      line, onto the provided file pointer. It is OK to specify @c stderr
+      or @c stdout as output files. This function is meant for debugging
+      purposes mostly.
+     */
+    /*--------------------------------------------------------------------------*/
+    void iniparser_dump(const dictionary* d, FILE* f);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the number of keys in a section of a dictionary.
+      @param    d   Dictionary to examine
+      @param    s   Section name of dictionary to examine
+      @return   Number of keys in section
+     */
+    /*--------------------------------------------------------------------------*/
+    int iniparser_getsecnkeys(const dictionary* d, const char* s);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the number of keys in a section of a dictionary.
+      @param    d    Dictionary to examine
+      @param    s    Section name of dictionary to examine
+      @param    keys Already allocated array to store the keys in
+      @return   The pointer passed as `keys` argument or NULL in case of error
+
+      This function queries a dictionary and finds all keys in a given section.
+      The keys argument should be an array of pointers which size has been
+      determined by calling `iniparser_getsecnkeys` function prior to this one.
+
+      Each pointer in the returned char pointer-to-pointer is pointing to
+      a string allocated in the dictionary; do not free or modify them.
+     */
+    /*--------------------------------------------------------------------------*/
+    const char** iniparser_getseckeys(const dictionary* d, const char* s, const char** keys);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the string associated to a key
+      @param    d       Dictionary to search
+      @param    key     Key string to look for
+      @param    def     Default value to return if key not found.
+      @return   pointer to statically allocated character string
+
+      This function queries a dictionary for a key. A key as read from an
+      ini file is given as "section:key". If the key cannot be found,
+      the pointer passed as 'def' is returned.
+      The returned char pointer is pointing to a string allocated in
+      the dictionary, do not free or modify it.
+     */
+    /*--------------------------------------------------------------------------*/
+    const char* iniparser_getstring(const dictionary* d, const char* key, const char* def);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the string associated to a key, convert to an int
+      @param    d Dictionary to search
+      @param    key Key string to look for
+      @param    notfound Value to return in case of error
+      @return   integer
+
+      This function queries a dictionary for a key. A key as read from an
+      ini file is given as "section:key". If the key cannot be found,
+      the notfound value is returned.
+
+      Supported values for integers include the usual C notation
+      so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
+      are supported. Examples:
+
+      - "42"      ->  42
+      - "042"     ->  34 (octal -> decimal)
+      - "0x42"    ->  66 (hexa  -> decimal)
+
+      Warning: the conversion may overflow in various ways. Conversion is
+      totally outsourced to strtol(), see the associated man page for overflow
+      handling.
+
+      Credits: Thanks to A. Becker for suggesting strtol()
+     */
+    /*--------------------------------------------------------------------------*/
+    int iniparser_getint(const dictionary* d, const char* key, int notfound);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the string associated to a key, convert to an long int
+      @param    d Dictionary to search
+      @param    key Key string to look for
+      @param    notfound Value to return in case of error
+      @return   integer
+
+      This function queries a dictionary for a key. A key as read from an
+      ini file is given as "section:key". If the key cannot be found,
+      the notfound value is returned.
+
+      Supported values for integers include the usual C notation
+      so decimal, octal (starting with 0) and hexadecimal (starting with 0x)
+      are supported. Examples:
+
+      - "42"      ->  42
+      - "042"     ->  34 (octal -> decimal)
+      - "0x42"    ->  66 (hexa  -> decimal)
+
+      Warning: the conversion may overflow in various ways. Conversion is
+      totally outsourced to strtol(), see the associated man page for overflow
+      handling.
+     */
+    /*--------------------------------------------------------------------------*/
+    long int iniparser_getlongint(const dictionary* d, const char* key, long int notfound);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the string associated to a key, convert to a double
+      @param    d Dictionary to search
+      @param    key Key string to look for
+      @param    notfound Value to return in case of error
+      @return   double
+
+      This function queries a dictionary for a key. A key as read from an
+      ini file is given as "section:key". If the key cannot be found,
+      the notfound value is returned.
+     */
+    /*--------------------------------------------------------------------------*/
+    double iniparser_getdouble(const dictionary* d, const char* key, double notfound);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Get the string associated to a key, convert to a boolean
+      @param    d Dictionary to search
+      @param    key Key string to look for
+      @param    notfound Value to return in case of error
+      @return   integer
+
+      This function queries a dictionary for a key. A key as read from an
+      ini file is given as "section:key". If the key cannot be found,
+      the notfound value is returned.
+
+      A true boolean is found if one of the following is matched:
+
+      - A string starting with 'y'
+      - A string starting with 'Y'
+      - A string starting with 't'
+      - A string starting with 'T'
+      - A string starting with '1'
+
+      A false boolean is found if one of the following is matched:
+
+      - A string starting with 'n'
+      - A string starting with 'N'
+      - A string starting with 'f'
+      - A string starting with 'F'
+      - A string starting with '0'
+
+      The notfound value returned if no boolean is identified, does not
+      necessarily have to be 0 or 1.
+     */
+    /*--------------------------------------------------------------------------*/
+    int iniparser_getboolean(const dictionary* d, const char* key, int notfound);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Set an entry in a dictionary.
+      @param    ini     Dictionary to modify.
+      @param    entry   Entry to modify (entry name)
+      @param    val     New value to associate to the entry.
+      @return   int     0 if Ok, -1 otherwise.
+
+      If the given entry can be found in the dictionary, it is modified to
+      contain the provided value. If it cannot be found, the entry is created.
+      It is Ok to set val to NULL.
+     */
+    /*--------------------------------------------------------------------------*/
+    int iniparser_set(dictionary* ini, const char* entry, const char* val);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Delete an entry in a dictionary
+      @param    ini     Dictionary to modify
+      @param    entry   Entry to delete (entry name)
+      @return   void
+
+      If the given entry can be found, it is deleted from the dictionary.
+     */
+    /*--------------------------------------------------------------------------*/
+    void iniparser_unset(dictionary* ini, const char* entry);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Finds out if a given entry exists in a dictionary
+      @param    ini     Dictionary to search
+      @param    entry   Name of the entry to look for
+      @return   integer 1 if entry exists, 0 otherwise
+
+      Finds out if a given entry exists in the dictionary. Since sections
+      are stored as keys with NULL associated values, this is the only way
+      of querying for the presence of sections in a dictionary.
+     */
+    /*--------------------------------------------------------------------------*/
+    int iniparser_find_entry(const dictionary* ini, const char* entry);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Parse an ini file and return an allocated dictionary object
+      @param    ininame Name of the ini file to read.
+      @return   Pointer to newly allocated dictionary
+
+      This is the parser for ini files. This function is called, providing
+      the name of the file to be read. It returns a dictionary object that
+      should not be accessed directly, but through accessor functions
+      instead.
+
+      The returned dictionary must be freed using iniparser_freedict().
+     */
+    /*--------------------------------------------------------------------------*/
+    dictionary* iniparser_load(const char* ininame);
+
+    /*-------------------------------------------------------------------------*/
+    /**
+      @brief    Free all memory associated to an ini dictionary
+      @param    d Dictionary to free
+      @return   void
+
+      Free all memory associated to an ini dictionary.
+      It is mandatory to call this function before the dictionary object
+      gets out of the current context.
+     */
+    /*--------------------------------------------------------------------------*/
+    void iniparser_freedict(dictionary* d);
 
 #ifdef __cplusplus
 }
diff --git a/ext_libs/iniParser/test/iniexample.c b/ext_libs/iniParser/test/iniexample.c
index 833b1ccd..00fdcc7e 100644
--- a/ext_libs/iniParser/test/iniexample.c
+++ b/ext_libs/iniParser/test/iniexample.c
@@ -40,95 +40,96 @@
 #include "iniparser.h"
 
 void create_example_ini_file(void);
-int  parse_ini_file(char * ini_name);
+int parse_ini_file(char* ini_name);
 
-int main(int argc, char * argv[])
+int main(int argc, char* argv[])
 {
-	int		status ;
-
-	if (argc<2) {
-		create_example_ini_file();
-		status = parse_ini_file("example.ini");
-	} else {
-		status = parse_ini_file(argv[1]);
-	}
-	return status ;
+    int status;
+
+    if (argc < 2)
+    {
+        create_example_ini_file();
+        status = parse_ini_file("example.ini");
+    }
+    else
+    {
+        status = parse_ini_file(argv[1]);
+    }
+    return status;
 }
 
 void create_example_ini_file(void)
 {
-	FILE	*	ini ;
-
-	ini = fopen("example.ini", "w");
-	fprintf(ini,
-    "#\n"
-    "# This is an example of ini file\n"
-    "#\n"
-    "\n"
-    "[Pizza]\n"
-    "\n"
-    "Ham       = yes ;\n"
-    "Mushrooms = TRUE ;\n"
-    "Capres    = 0 ;\n"
-    "Cheese    = Non ;\n"
-    "\n"
-    "\n"
-    "[Wine]\n"
-    "\n"
-    "Grape     = Cabernet Sauvignon ;\n"
-    "Year      = 1989 ;\n"
-    "Country   = Spain ;\n"
-    "Alcohol   = 12.5  ;\n"
-    "\n");
-	fclose(ini);
+    FILE* ini;
+
+    ini = fopen("example.ini", "w");
+    fprintf(ini,
+            "#\n"
+            "# This is an example of ini file\n"
+            "#\n"
+            "\n"
+            "[Pizza]\n"
+            "\n"
+            "Ham       = yes ;\n"
+            "Mushrooms = TRUE ;\n"
+            "Capres    = 0 ;\n"
+            "Cheese    = Non ;\n"
+            "\n"
+            "\n"
+            "[Wine]\n"
+            "\n"
+            "Grape     = Cabernet Sauvignon ;\n"
+            "Year      = 1989 ;\n"
+            "Country   = Spain ;\n"
+            "Alcohol   = 12.5  ;\n"
+            "\n");
+    fclose(ini);
 }
 
-
-int parse_ini_file(char * ini_name)
+int parse_ini_file(char* ini_name)
 {
-	dictionary	*	ini ;
-
-	/* Some temporary variables to hold query results */
-	int				b ;
-	int				i ;
-	double			d ;
-	char		*	s ;
-
-	ini = iniparser_load(ini_name);
-	if (ini==NULL) {
-		fprintf(stderr, "cannot parse file: %s\n", ini_name);
-		return -1 ;
-	}
-	iniparser_dump(ini, stderr);
-
-	/* Get pizza attributes */
-	printf("Pizza:\n");
-
-	b = iniparser_getboolean(ini, "pizza:ham", -1);
-	printf("Ham:       [%d]\n", b);
-	b = iniparser_getboolean(ini, "pizza:mushrooms", -1);
-	printf("Mushrooms: [%d]\n", b);
-	b = iniparser_getboolean(ini, "pizza:capres", -1);
-	printf("Capres:    [%d]\n", b);
-	b = iniparser_getboolean(ini, "pizza:cheese", -1);
-	printf("Cheese:    [%d]\n", b);
-
-	/* Get wine attributes */
-	printf("Wine:\n");
-	s = iniparser_getstring(ini, "wine:grape", NULL);
+    dictionary* ini;
+
+    /* Some temporary variables to hold query results */
+    int b;
+    int i;
+    double d;
+    char* s;
+
+    ini = iniparser_load(ini_name);
+    if (ini == NULL)
+    {
+        fprintf(stderr, "cannot parse file: %s\n", ini_name);
+        return -1;
+    }
+    iniparser_dump(ini, stderr);
+
+    /* Get pizza attributes */
+    printf("Pizza:\n");
+
+    b = iniparser_getboolean(ini, "pizza:ham", -1);
+    printf("Ham:       [%d]\n", b);
+    b = iniparser_getboolean(ini, "pizza:mushrooms", -1);
+    printf("Mushrooms: [%d]\n", b);
+    b = iniparser_getboolean(ini, "pizza:capres", -1);
+    printf("Capres:    [%d]\n", b);
+    b = iniparser_getboolean(ini, "pizza:cheese", -1);
+    printf("Cheese:    [%d]\n", b);
+
+    /* Get wine attributes */
+    printf("Wine:\n");
+    s = iniparser_getstring(ini, "wine:grape", NULL);
     printf("Grape:     [%s]\n", s ? s : "UNDEF");
 
     i = iniparser_getint(ini, "wine:year", -1);
     printf("Year:      [%d]\n", i);
 
-	s = iniparser_getstring(ini, "wine:country", NULL);
+    s = iniparser_getstring(ini, "wine:country", NULL);
     printf("Country:   [%s]\n", s ? s : "UNDEF");
 
     d = iniparser_getdouble(ini, "wine:alcohol", -1.0);
     printf("Alcohol:   [%g]\n", d);
 
-	iniparser_freedict(ini);
-	return 0 ;
+    iniparser_freedict(ini);
+    return 0;
 }
-
-
diff --git a/ext_libs/iniParser/test/parse.c b/ext_libs/iniParser/test/parse.c
index 9c420c66..940a44fb 100644
--- a/ext_libs/iniParser/test/parse.c
+++ b/ext_libs/iniParser/test/parse.c
@@ -39,20 +39,23 @@
 
 #include "iniparser.h"
 
-int main(int argc, char * argv[])
+int main(int argc, char* argv[])
 {
-    dictionary * ini ;
-    char       * ini_name ;
+    dictionary* ini;
+    char* ini_name;
 
-	if (argc<2) {
+    if (argc < 2)
+    {
         ini_name = "twisted.ini";
-	} else {
-		ini_name = argv[1] ;
-	}
+    }
+    else
+    {
+        ini_name = argv[1];
+    }
 
     ini = iniparser_load(ini_name);
     iniparser_dump(ini, stdout);
     iniparser_freedict(ini);
 
-	return 0 ;
+    return 0;
 }
diff --git a/ext_libs/iniParser/test/sandbox.c b/ext_libs/iniParser/test/sandbox.c
index 36c1e160..6a10ac8a 100644
--- a/ext_libs/iniParser/test/sandbox.c
+++ b/ext_libs/iniParser/test/sandbox.c
@@ -35,10 +35,11 @@
 #include <stdio.h>
 #include "../src/iniparser.h"
 
-char *ini_file = "../example.ini";
+char* ini_file = "../example.ini";
 
-int main() {
-  dictionary* d = iniparser_load(ini_file);
-  iniparser_dump_ini(d, stdout);
-  iniparser_freedict(d);
+int main()
+{
+    dictionary* d = iniparser_load(ini_file);
+    iniparser_dump_ini(d, stdout);
+    iniparser_freedict(d);
 }
diff --git a/ext_libs/iniParser/test/twisted-genhuge.py b/ext_libs/iniParser/test/twisted-genhuge.py
index 3a4a2cad..d42edd39 100644
--- a/ext_libs/iniParser/test/twisted-genhuge.py
+++ b/ext_libs/iniParser/test/twisted-genhuge.py
@@ -28,17 +28,16 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 # -*- coding: utf-8 -*-
 import os
 import sys
 
-if __name__=="__main__":
-    f=open('twisted-massive.ini', 'w')
+if __name__ == "__main__":
+    f = open('twisted-massive.ini', 'w')
     for i in range(100):
         f.write('[%03d]\n' % i)
         for j in range(100):
             f.write('key-%03d=1;\n' % j)
     f.close()
-
diff --git a/ext_libs/json/json/autolink.h b/ext_libs/json/json/autolink.h
old mode 100755
new mode 100644
index 02328d1f..a38df5e8
--- a/ext_libs/json/json/autolink.h
+++ b/ext_libs/json/json/autolink.h
@@ -4,21 +4,21 @@
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 #ifndef JSON_AUTOLINK_H_INCLUDED
-# define JSON_AUTOLINK_H_INCLUDED
+#define JSON_AUTOLINK_H_INCLUDED
 
-# include "config.h"
+#include "config.h"
 
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/cpptl_autolink.h>
-# endif
+#ifdef JSON_IN_CPPTL
+#include <cpptl/cpptl_autolink.h>
+#endif
 
-# if !defined(JSON_NO_AUTOLINK)  &&  !defined(JSON_DLL_BUILD)  &&  !defined(JSON_IN_CPPTL)
-#  define CPPTL_AUTOLINK_NAME "json"
-#  undef CPPTL_AUTOLINK_DLL
-#  ifdef JSON_DLL
-#   define CPPTL_AUTOLINK_DLL
-#  endif
-#  include "autolink.h"
-# endif
+#if !defined(JSON_NO_AUTOLINK) && !defined(JSON_DLL_BUILD) && !defined(JSON_IN_CPPTL)
+#define CPPTL_AUTOLINK_NAME "json"
+#undef CPPTL_AUTOLINK_DLL
+#ifdef JSON_DLL
+#define CPPTL_AUTOLINK_DLL
+#endif
+#include "autolink.h"
+#endif
 
 #endif // JSON_AUTOLINK_H_INCLUDED
diff --git a/ext_libs/json/json/config.h b/ext_libs/json/json/config.h
old mode 100755
new mode 100644
index d3fab364..c57273dd
--- a/ext_libs/json/json/config.h
+++ b/ext_libs/json/json/config.h
@@ -4,7 +4,7 @@
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 #ifndef JSON_CONFIG_H_INCLUDED
-# define JSON_CONFIG_H_INCLUDED
+#define JSON_CONFIG_H_INCLUDED
 
 /// If defined, indicates that json library is embedded in CppTL library.
 //# define JSON_IN_CPPTL 1
@@ -26,23 +26,23 @@
 
 /// If defined, indicates that Json use exception to report invalid type manipulation
 /// instead of C assert macro.
-# define JSON_USE_EXCEPTION 1
+#define JSON_USE_EXCEPTION 1
 
-# ifdef JSON_IN_CPPTL
-#  include <cpptl/config.h>
-#  ifndef JSON_USE_CPPTL
-#   define JSON_USE_CPPTL 1
-#  endif
-# endif
+#ifdef JSON_IN_CPPTL
+#include <cpptl/config.h>
+#ifndef JSON_USE_CPPTL
+#define JSON_USE_CPPTL 1
+#endif
+#endif
 
-# ifdef JSON_IN_CPPTL
-#  define JSON_API CPPTL_API
-# elif defined(JSON_DLL_BUILD)
-#  define JSON_API __declspec(dllexport)
-# elif defined(JSON_DLL)
-#  define JSON_API __declspec(dllimport)
-# else
-#  define JSON_API
-# endif
+#ifdef JSON_IN_CPPTL
+#define JSON_API CPPTL_API
+#elif defined(JSON_DLL_BUILD)
+#define JSON_API __declspec(dllexport)
+#elif defined(JSON_DLL)
+#define JSON_API __declspec(dllimport)
+#else
+#define JSON_API
+#endif
 
 #endif // JSON_CONFIG_H_INCLUDED
diff --git a/ext_libs/json/json/features.h b/ext_libs/json/json/features.h
old mode 100755
new mode 100644
index 3169cb1c..d5de93d5
--- a/ext_libs/json/json/features.h
+++ b/ext_libs/json/json/features.h
@@ -3,45 +3,44 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-
 #ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-# define CPPTL_JSON_FEATURES_H_INCLUDED
-
-# include "forwards.h"
-
-namespace Json {
-
-   /** \brief Configuration passed to reader and writer.
-    * This configuration object can be used to force the Reader or Writer
-    * to behave in a standard conforming way.
-    */
-   class JSON_API Features
-   {
-   public:
-      /** \brief A configuration that allows all features and assumes all strings are UTF-8.
-       * - C & C++ comments are allowed
-       * - Root object can be any JSON value
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features all();
-
-      /** \brief A configuration that is strictly compatible with the JSON specification.
-       * - Comments are forbidden.
-       * - Root object must be either an array or an object value.
-       * - Assumes Value strings are encoded in UTF-8
-       */
-      static Features strictMode();
-
-      /** \brief Initialize the configuration like JsonConfig::allFeatures;
-       */
-      Features();
-
-      /// \c true if comments are allowed. Default: \c true.
-      bool allowComments_;
-
-      /// \c true if root must be either an array or an object value. Default: \c false.
-      bool strictRoot_;
-   };
+#define CPPTL_JSON_FEATURES_H_INCLUDED
+
+#include "forwards.h"
+
+namespace Json
+{
+/** \brief Configuration passed to reader and writer.
+ * This configuration object can be used to force the Reader or Writer
+ * to behave in a standard conforming way.
+ */
+class JSON_API Features
+{
+public:
+    /** \brief A configuration that allows all features and assumes all strings are UTF-8.
+     * - C & C++ comments are allowed
+     * - Root object can be any JSON value
+     * - Assumes Value strings are encoded in UTF-8
+     */
+    static Features all();
+
+    /** \brief A configuration that is strictly compatible with the JSON specification.
+     * - Comments are forbidden.
+     * - Root object must be either an array or an object value.
+     * - Assumes Value strings are encoded in UTF-8
+     */
+    static Features strictMode();
+
+    /** \brief Initialize the configuration like JsonConfig::allFeatures;
+     */
+    Features();
+
+    /// \c true if comments are allowed. Default: \c true.
+    bool allowComments_;
+
+    /// \c true if root must be either an array or an object value. Default: \c false.
+    bool strictRoot_;
+};
 
 } // namespace Json
 
diff --git a/ext_libs/json/json/forwards.h b/ext_libs/json/json/forwards.h
old mode 100755
new mode 100644
index 10c7eddb..04b96a0d
--- a/ext_libs/json/json/forwards.h
+++ b/ext_libs/json/json/forwards.h
@@ -3,43 +3,41 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-
 #ifndef JSON_FORWARDS_H_INCLUDED
-# define JSON_FORWARDS_H_INCLUDED
-
-# include "config.h"
-
-namespace Json {
-
-   // writer.h
-   class FastWriter;
-   class StyledWriter;
-
-   // reader.h
-   class Reader;
-
-   // features.h
-   class Features;
-
-   // value.h
-   typedef int Int;
-   typedef unsigned int UInt;
-   class StaticString;
-   class Path;
-   class PathArgument;
-   class Value;
-   class ValueIteratorBase;
-   class ValueIterator;
-   class ValueConstIterator;
+#define JSON_FORWARDS_H_INCLUDED
+
+#include "config.h"
+
+namespace Json
+{
+// writer.h
+class FastWriter;
+class StyledWriter;
+
+// reader.h
+class Reader;
+
+// features.h
+class Features;
+
+// value.h
+typedef int Int;
+typedef unsigned int UInt;
+class StaticString;
+class Path;
+class PathArgument;
+class Value;
+class ValueIteratorBase;
+class ValueIterator;
+class ValueConstIterator;
 #ifdef JSON_VALUE_USE_INTERNAL_MAP
-   class ValueAllocator;
-   class ValueMapAllocator;
-   class ValueInternalLink;
-   class ValueInternalArray;
-   class ValueInternalMap;
+class ValueAllocator;
+class ValueMapAllocator;
+class ValueInternalLink;
+class ValueInternalArray;
+class ValueInternalMap;
 #endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
 
 } // namespace Json
 
-
 #endif // JSON_FORWARDS_H_INCLUDED
diff --git a/ext_libs/json/json/json.h b/ext_libs/json/json/json.h
old mode 100755
new mode 100644
index 5ad8d68e..8f10ac2b
--- a/ext_libs/json/json/json.h
+++ b/ext_libs/json/json/json.h
@@ -3,14 +3,13 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-
 #ifndef JSON_JSON_H_INCLUDED
-# define JSON_JSON_H_INCLUDED
+#define JSON_JSON_H_INCLUDED
 
-# include "autolink.h"
-# include "value.h"
-# include "reader.h"
-# include "writer.h"
-# include "features.h"
+#include "autolink.h"
+#include "value.h"
+#include "reader.h"
+#include "writer.h"
+#include "features.h"
 
 #endif // JSON_JSON_H_INCLUDED
diff --git a/ext_libs/json/json/reader.h b/ext_libs/json/json/reader.h
old mode 100755
new mode 100644
index c3414e0b..8503280c
--- a/ext_libs/json/json/reader.h
+++ b/ext_libs/json/json/reader.h
@@ -3,199 +3,177 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-
 #ifndef CPPTL_JSON_READER_H_INCLUDED
-# define CPPTL_JSON_READER_H_INCLUDED
-
-# include "features.h"
-# include "value.h"
-# include <deque>
-# include <stack>
-# include <string>
-# include <iostream>
-
-namespace Json {
-
-   /** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
-    *
-    */
-   class JSON_API Reader
-   {
-   public:
-      typedef char Char;
-      typedef const Char *Location;
-
-      /** \brief Constructs a Reader allowing all features
-       * for parsing.
-       */
-      Reader();
-
-      /** \brief Constructs a Reader allowing the specified feature set
-       * for parsing.
-       */
-      Reader( const Features &features );
-
-      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const std::string &document,
-                  Value &root,
-                  bool collectComments = true );
-
-      /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-       * \param document UTF-8 encoded string containing the document to read.
-       * \param root [out] Contains the root value of the document if it was
-       *             successfully parsed.
-       * \param collectComments \c true to collect comment and allow writing them back during
-       *                        serialization, \c false to discard comments.
-       *                        This parameter is ignored if Features::allowComments_
-       *                        is \c false.
-       * \return \c true if the document was successfully parsed, \c false if an error occurred.
-       */
-      bool parse( const char *beginDoc, const char *endDoc,
-                  Value &root,
-                  bool collectComments = true );
-
-      /// \brief Parse from input stream.
-      /// \see Json::operator>>(std::istream&, Json::Value&).
-      bool parse( std::istream &is,
-                  Value &root,
-                  bool collectComments = true );
-
-      /** \brief Returns a user friendly string that list errors in the parsed document.
-       * \return Formatted error message with the list of errors with their location in
-       *         the parsed document. An empty string is returned if no error occurred
-       *         during parsing.
-       */
-      std::string getFormatedErrorMessages() const;
-
-   private:
-      enum TokenType
-      {
-         tokenEndOfStream = 0,
-         tokenObjectBegin,
-         tokenObjectEnd,
-         tokenArrayBegin,
-         tokenArrayEnd,
-         tokenString,
-         tokenNumber,
-         tokenTrue,
-         tokenFalse,
-         tokenNull,
-         tokenArraySeparator,
-         tokenMemberSeparator,
-         tokenComment,
-         tokenError
-      };
-
-      class Token
-      {
-      public:
-         TokenType type_;
-         Location start_;
-         Location end_;
-      };
-
-      class ErrorInfo
-      {
-      public:
-         Token token_;
-         std::string message_;
-         Location extra_;
-      };
-
-      typedef std::deque<ErrorInfo> Errors;
-
-      bool expectToken( TokenType type, Token &token, const char *message );
-      bool readToken( Token &token );
-      void skipSpaces();
-      bool match( Location pattern,
-                  int patternLength );
-      bool readComment();
-      bool readCStyleComment();
-      bool readCppStyleComment();
-      bool readString();
-      void readNumber();
-      bool readValue();
-      bool readObject( Token &token );
-      bool readArray( Token &token );
-      bool decodeNumber( Token &token );
-      bool decodeString( Token &token );
-      bool decodeString( Token &token, std::string &decoded );
-      bool decodeDouble( Token &token );
-      bool decodeUnicodeCodePoint( Token &token,
-                                   Location &current,
-                                   Location end,
-                                   unsigned int &unicode );
-      bool decodeUnicodeEscapeSequence( Token &token,
-                                        Location &current,
-                                        Location end,
-                                        unsigned int &unicode );
-      bool addError( const std::string &message,
-                     Token &token,
-                     Location extra = 0 );
-      bool recoverFromError( TokenType skipUntilToken );
-      bool addErrorAndRecover( const std::string &message,
-                               Token &token,
-                               TokenType skipUntilToken );
-      void skipUntilSpace();
-      Value &currentValue();
-      Char getNextChar();
-      void getLocationLineAndColumn( Location location,
-                                     int &line,
-                                     int &column ) const;
-      std::string getLocationLineAndColumn( Location location ) const;
-      void addComment( Location begin,
-                       Location end,
-                       CommentPlacement placement );
-      void skipCommentTokens( Token &token );
-
-      typedef std::stack<Value *> Nodes;
-      Nodes nodes_;
-      Errors errors_;
-      std::string document_;
-      Location begin_;
-      Location end_;
-      Location current_;
-      Location lastValueEnd_;
-      Value *lastValue_;
-      std::string commentsBefore_;
-      Features features_;
-      bool collectComments_;
-   };
-
-   /** \brief Read from 'sin' into 'root'.
-
-    Always keep comments from the input JSON.
-
-    This can be used to read a file into a particular sub-object.
-    For example:
-    \code
-    Json::Value root;
-    cin >> root["dir"]["file"];
-    cout << root;
-    \endcode
-    Result:
-    \verbatim
+#define CPPTL_JSON_READER_H_INCLUDED
+
+#include "features.h"
+#include "value.h"
+#include <deque>
+#include <stack>
+#include <string>
+#include <iostream>
+
+namespace Json
+{
+/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
+ *
+ */
+class JSON_API Reader
+{
+public:
+    typedef char Char;
+    typedef const Char* Location;
+
+    /** \brief Constructs a Reader allowing all features
+     * for parsing.
+     */
+    Reader();
+
+    /** \brief Constructs a Reader allowing the specified feature set
+     * for parsing.
+     */
+    Reader(const Features& features);
+
+    /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
+     * \param document UTF-8 encoded string containing the document to read.
+     * \param root [out] Contains the root value of the document if it was
+     *             successfully parsed.
+     * \param collectComments \c true to collect comment and allow writing them back during
+     *                        serialization, \c false to discard comments.
+     *                        This parameter is ignored if Features::allowComments_
+     *                        is \c false.
+     * \return \c true if the document was successfully parsed, \c false if an error occurred.
+     */
+    bool parse(const std::string& document, Value& root, bool collectComments = true);
+
+    /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
+     * \param document UTF-8 encoded string containing the document to read.
+     * \param root [out] Contains the root value of the document if it was
+     *             successfully parsed.
+     * \param collectComments \c true to collect comment and allow writing them back during
+     *                        serialization, \c false to discard comments.
+     *                        This parameter is ignored if Features::allowComments_
+     *                        is \c false.
+     * \return \c true if the document was successfully parsed, \c false if an error occurred.
+     */
+    bool parse(const char* beginDoc, const char* endDoc, Value& root, bool collectComments = true);
+
+    /// \brief Parse from input stream.
+    /// \see Json::operator>>(std::istream&, Json::Value&).
+    bool parse(std::istream& is, Value& root, bool collectComments = true);
+
+    /** \brief Returns a user friendly string that list errors in the parsed document.
+     * \return Formatted error message with the list of errors with their location in
+     *         the parsed document. An empty string is returned if no error occurred
+     *         during parsing.
+     */
+    std::string getFormatedErrorMessages() const;
+
+private:
+    enum TokenType
+    {
+        tokenEndOfStream = 0,
+        tokenObjectBegin,
+        tokenObjectEnd,
+        tokenArrayBegin,
+        tokenArrayEnd,
+        tokenString,
+        tokenNumber,
+        tokenTrue,
+        tokenFalse,
+        tokenNull,
+        tokenArraySeparator,
+        tokenMemberSeparator,
+        tokenComment,
+        tokenError
+    };
+
+    class Token
+    {
+    public:
+        TokenType type_;
+        Location start_;
+        Location end_;
+    };
+
+    class ErrorInfo
     {
-	"dir": {
-	    "file": {
-		// The input stream JSON would be nested here.
-	    }
-	}
-    }
-    \endverbatim
-    \throw std::exception on parse error.
-    \see Json::operator<<()
-   */
-   std::istream& operator>>( std::istream&, Value& );
+    public:
+        Token token_;
+        std::string message_;
+        Location extra_;
+    };
+
+    typedef std::deque<ErrorInfo> Errors;
+
+    bool expectToken(TokenType type, Token& token, const char* message);
+    bool readToken(Token& token);
+    void skipSpaces();
+    bool match(Location pattern, int patternLength);
+    bool readComment();
+    bool readCStyleComment();
+    bool readCppStyleComment();
+    bool readString();
+    void readNumber();
+    bool readValue();
+    bool readObject(Token& token);
+    bool readArray(Token& token);
+    bool decodeNumber(Token& token);
+    bool decodeString(Token& token);
+    bool decodeString(Token& token, std::string& decoded);
+    bool decodeDouble(Token& token);
+    bool decodeUnicodeCodePoint(Token& token, Location& current, Location end, unsigned int& unicode);
+    bool decodeUnicodeEscapeSequence(Token& token, Location& current, Location end, unsigned int& unicode);
+    bool addError(const std::string& message, Token& token, Location extra = 0);
+    bool recoverFromError(TokenType skipUntilToken);
+    bool addErrorAndRecover(const std::string& message, Token& token, TokenType skipUntilToken);
+    void skipUntilSpace();
+    Value& currentValue();
+    Char getNextChar();
+    void getLocationLineAndColumn(Location location, int& line, int& column) const;
+    std::string getLocationLineAndColumn(Location location) const;
+    void addComment(Location begin, Location end, CommentPlacement placement);
+    void skipCommentTokens(Token& token);
+
+    typedef std::stack<Value*> Nodes;
+    Nodes nodes_;
+    Errors errors_;
+    std::string document_;
+    Location begin_;
+    Location end_;
+    Location current_;
+    Location lastValueEnd_;
+    Value* lastValue_;
+    std::string commentsBefore_;
+    Features features_;
+    bool collectComments_;
+};
+
+/** \brief Read from 'sin' into 'root'.
+
+ Always keep comments from the input JSON.
+
+ This can be used to read a file into a particular sub-object.
+ For example:
+ \code
+ Json::Value root;
+ cin >> root["dir"]["file"];
+ cout << root;
+ \endcode
+ Result:
+ \verbatim
+ {
+     "dir": {
+         "file": {
+             // The input stream JSON would be nested here.
+         }
+     }
+ }
+ \endverbatim
+ \throw std::exception on parse error.
+ \see Json::operator<<()
+*/
+std::istream& operator>>(std::istream&, Value&);
 
 } // namespace Json
 
diff --git a/ext_libs/json/json/value.h b/ext_libs/json/json/value.h
old mode 100755
new mode 100644
index 6ad1e250..a07a1a44
--- a/ext_libs/json/json/value.h
+++ b/ext_libs/json/json/value.h
@@ -3,1073 +3,1013 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-
 #ifndef CPPTL_JSON_H_INCLUDED
-# define CPPTL_JSON_H_INCLUDED
+#define CPPTL_JSON_H_INCLUDED
 
-# include "forwards.h"
-# include <string>
-# include <vector>
+#include "forwards.h"
+#include <string>
+#include <vector>
 
-# ifndef JSON_USE_CPPTL_SMALLMAP
-#  include <map>
-# else
-#  include <cpptl/smallmap.h>
-# endif
-# ifdef JSON_USE_CPPTL
-#  include <cpptl/forwards.h>
-# endif
+#ifndef JSON_USE_CPPTL_SMALLMAP
+#include <map>
+#else
+#include <cpptl/smallmap.h>
+#endif
+#ifdef JSON_USE_CPPTL
+#include <cpptl/forwards.h>
+#endif
 
 /** \brief JSON (JavaScript Object Notation).
  */
-namespace Json {
-
-   /** \brief Type of the value held by a Value object.
-    */
-   enum ValueType
-   {
-      nullValue = 0, ///< 'null' value
-      intValue,      ///< signed integer value
-      uintValue,     ///< unsigned integer value
-      realValue,     ///< double value
-      stringValue,   ///< UTF-8 string value
-      booleanValue,  ///< bool value
-      arrayValue,    ///< array value (ordered list)
-      objectValue    ///< object value (collection of name/value pairs).
-   };
+namespace Json
+{
+/** \brief Type of the value held by a Value object.
+ */
+enum ValueType
+{
+    nullValue = 0, ///< 'null' value
+    intValue,      ///< signed integer value
+    uintValue,     ///< unsigned integer value
+    realValue,     ///< double value
+    stringValue,   ///< UTF-8 string value
+    booleanValue,  ///< bool value
+    arrayValue,    ///< array value (ordered list)
+    objectValue    ///< object value (collection of name/value pairs).
+};
 
-   enum CommentPlacement
-   {
-      commentBefore = 0,        ///< a comment placed on the line before a value
-      commentAfterOnSameLine,   ///< a comment just after a value on the same line
-      commentAfter,             ///< a comment on the line after a value (only make sense for root value)
-      numberOfCommentPlacement
-   };
+enum CommentPlacement
+{
+    commentBefore = 0,      ///< a comment placed on the line before a value
+    commentAfterOnSameLine, ///< a comment just after a value on the same line
+    commentAfter,           ///< a comment on the line after a value (only make sense for root value)
+    numberOfCommentPlacement
+};
 
 //# ifdef JSON_USE_CPPTL
 //   typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
 //   typedef CppTL::AnyEnumerator<const Value &> EnumValues;
 //# endif
 
-   /** \brief Lightweight wrapper to tag static string.
-    *
-    * Value constructor and objectValue member assignement takes advantage of the
-    * StaticString and avoid the cost of string duplication when storing the
-    * string or the member name.
-    *
-    * Example of usage:
-    * \code
-    * Json::Value aValue( StaticString("some text") );
-    * Json::Value object;
-    * static const StaticString code("code");
-    * object[code] = 1234;
-    * \endcode
-    */
-   class JSON_API StaticString
-   {
-   public:
-      explicit StaticString( const char *czstring )
-         : str_( czstring )
-      {
-      }
+/** \brief Lightweight wrapper to tag static string.
+ *
+ * Value constructor and objectValue member assignement takes advantage of the
+ * StaticString and avoid the cost of string duplication when storing the
+ * string or the member name.
+ *
+ * Example of usage:
+ * \code
+ * Json::Value aValue( StaticString("some text") );
+ * Json::Value object;
+ * static const StaticString code("code");
+ * object[code] = 1234;
+ * \endcode
+ */
+class JSON_API StaticString
+{
+public:
+    explicit StaticString(const char* czstring) : str_(czstring) {}
 
-      operator const char *() const
-      {
-         return str_;
-      }
+    operator const char*() const { return str_; }
 
-      const char *c_str() const
-      {
-         return str_;
-      }
+    const char* c_str() const { return str_; }
 
-   private:
-      const char *str_;
-   };
+private:
+    const char* str_;
+};
 
-   /** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
-    *
-    * This class is a discriminated union wrapper that can represents a:
-    * - signed integer [range: Value::minInt - Value::maxInt]
-    * - unsigned integer (range: 0 - Value::maxUInt)
-    * - double
-    * - UTF-8 string
-    * - boolean
-    * - 'null'
-    * - an ordered list of Value
-    * - collection of name/value pairs (javascript object)
-    *
-    * The type of the held value is represented by a #ValueType and
-    * can be obtained using type().
-    *
-    * values of an #objectValue or #arrayValue can be accessed using operator[]() methods.
-    * Non const methods will automatically create the a #nullValue element
-    * if it does not exist.
-    * The sequence of an #arrayValue will be automatically resize and initialized
-    * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
-    *
-    * The get() methods can be used to obtanis default value in the case the required element
-    * does not exist.
-    *
-    * It is possible to iterate over the list of a #objectValue values using
-    * the getMemberNames() method.
-    */
-   class JSON_API Value
-   {
-      friend class ValueIteratorBase;
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      friend class ValueInternalLink;
-      friend class ValueInternalMap;
-# endif
-   public:
-      typedef std::vector<std::string> Members;
-      typedef ValueIterator iterator;
-      typedef ValueConstIterator const_iterator;
-      typedef Json::UInt UInt;
-      typedef Json::Int Int;
-      typedef UInt ArrayIndex;
-
-      static const Value null;
-      static const Int minInt;
-      static const Int maxInt;
-      static const UInt maxUInt;
-
-   private:
+/** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
+ *
+ * This class is a discriminated union wrapper that can represents a:
+ * - signed integer [range: Value::minInt - Value::maxInt]
+ * - unsigned integer (range: 0 - Value::maxUInt)
+ * - double
+ * - UTF-8 string
+ * - boolean
+ * - 'null'
+ * - an ordered list of Value
+ * - collection of name/value pairs (javascript object)
+ *
+ * The type of the held value is represented by a #ValueType and
+ * can be obtained using type().
+ *
+ * values of an #objectValue or #arrayValue can be accessed using operator[]() methods.
+ * Non const methods will automatically create the a #nullValue element
+ * if it does not exist.
+ * The sequence of an #arrayValue will be automatically resize and initialized
+ * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
+ *
+ * The get() methods can be used to obtanis default value in the case the required element
+ * does not exist.
+ *
+ * It is possible to iterate over the list of a #objectValue values using
+ * the getMemberNames() method.
+ */
+class JSON_API Value
+{
+    friend class ValueIteratorBase;
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    friend class ValueInternalLink;
+    friend class ValueInternalMap;
+#endif
+public:
+    typedef std::vector<std::string> Members;
+    typedef ValueIterator iterator;
+    typedef ValueConstIterator const_iterator;
+    typedef Json::UInt UInt;
+    typedef Json::Int Int;
+    typedef UInt ArrayIndex;
+
+    static const Value null;
+    static const Int minInt;
+    static const Int maxInt;
+    static const UInt maxUInt;
+
+private:
 #ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-# ifndef JSON_VALUE_USE_INTERNAL_MAP
-      class CZString
-      {
-      public:
-         enum DuplicationPolicy
-         {
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+    class CZString
+    {
+    public:
+        enum DuplicationPolicy
+        {
             noDuplication = 0,
             duplicate,
             duplicateOnCopy
-         };
-         CZString( int index );
-         CZString( const char *cstr, DuplicationPolicy allocate );
-         CZString( const CZString &other );
-         ~CZString();
-         CZString &operator =( const CZString &other );
-         bool operator<( const CZString &other ) const;
-         bool operator==( const CZString &other ) const;
-         int index() const;
-         const char *c_str() const;
-         bool isStaticString() const;
-      private:
-         void swap( CZString &other );
-         const char *cstr_;
-         int index_;
-      };
-
-   public:
-#  ifndef JSON_USE_CPPTL_SMALLMAP
-      typedef std::map<CZString, Value> ObjectValues;
-#  else
-      typedef CppTL::SmallMap<CZString, Value> ObjectValues;
-#  endif // ifndef JSON_USE_CPPTL_SMALLMAP
-# endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
+        };
+        CZString(int index);
+        CZString(const char* cstr, DuplicationPolicy allocate);
+        CZString(const CZString& other);
+        ~CZString();
+        CZString& operator=(const CZString& other);
+        bool operator<(const CZString& other) const;
+        bool operator==(const CZString& other) const;
+        int index() const;
+        const char* c_str() const;
+        bool isStaticString() const;
+
+    private:
+        void swap(CZString& other);
+        const char* cstr_;
+        int index_;
+    };
+
+public:
+#ifndef JSON_USE_CPPTL_SMALLMAP
+    typedef std::map<CZString, Value> ObjectValues;
+#else
+    typedef CppTL::SmallMap<CZString, Value> ObjectValues;
+#endif // ifndef JSON_USE_CPPTL_SMALLMAP
+#endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
 #endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
-   public:
-      /** \brief Create a default Value of the given type.
-
-        This is a very useful constructor.
-        To create an empty array, pass arrayValue.
-        To create an empty object, pass objectValue.
-        Another Value can then be set to this one by assignment.
-	This is useful since clear() and resize() will not alter types.
-
-        Examples:
-	\code
-	Json::Value null_value; // null
-	Json::Value arr_value(Json::arrayValue); // []
-	Json::Value obj_value(Json::objectValue); // {}
-	\endcode
-      */
-      Value( ValueType type = nullValue );
-      Value( Int value );
-      Value( UInt value );
-      Value( double value );
-      Value( const char *value );
-      Value( const char *beginValue, const char *endValue );
-      /** \brief Constructs a value from a static string.
-
-       * Like other value string constructor but do not duplicate the string for
-       * internal storage. The given string must remain alive after the call to this
-       * constructor.
-       * Example of usage:
-       * \code
-       * Json::Value aValue( StaticString("some text") );
-       * \endcode
-       */
-      Value( const StaticString &value );
-      Value( const std::string &value );
-# ifdef JSON_USE_CPPTL
-      Value( const CppTL::ConstString &value );
-# endif
-      Value( bool value );
-      Value( const Value &other );
-      ~Value();
-
-      Value &operator=( const Value &other );
-      /// Swap values.
-      /// \note Currently, comments are intentionally not swapped, for
-      /// both logic and efficiency.
-      void swap( Value &other );
-
-      ValueType type() const;
-
-      bool operator <( const Value &other ) const;
-      bool operator <=( const Value &other ) const;
-      bool operator >=( const Value &other ) const;
-      bool operator >( const Value &other ) const;
-
-      bool operator ==( const Value &other ) const;
-      bool operator !=( const Value &other ) const;
-
-      int compare( const Value &other );
-
-      const char *asCString() const;
-      std::string asString() const;
-# ifdef JSON_USE_CPPTL
-      CppTL::ConstString asConstString() const;
-# endif
-      Int asInt() const;
-      UInt asUInt() const;
-      double asDouble() const;
-      bool asBool() const;
-
-      bool isNull() const;
-      bool isBool() const;
-      bool isInt() const;
-      bool isUInt() const;
-      bool isIntegral() const;
-      bool isDouble() const;
-      bool isNumeric() const;
-      bool isString() const;
-      bool isArray() const;
-      bool isObject() const;
-
-      bool isConvertibleTo( ValueType other ) const;
-
-      /// Number of values in array or object
-      UInt size() const;
-
-      /// \brief Return true if empty array, empty object, or null;
-      /// otherwise, false.
-      bool empty() const;
-
-      /// Return isNull()
-      bool operator!() const;
-
-      /// Remove all object members and array elements.
-      /// \pre type() is arrayValue, objectValue, or nullValue
-      /// \post type() is unchanged
-      void clear();
-
-      /// Resize the array to size elements.
-      /// New elements are initialized to null.
-      /// May only be called on nullValue or arrayValue.
-      /// \pre type() is arrayValue or nullValue
-      /// \post type() is arrayValue
-      void resize( UInt size );
-
-      /// Access an array element (zero based index ).
-      /// If the array contains less than index element, then null value are inserted
-      /// in the array so that its size is index+1.
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      Value &operator[]( UInt index );
-      /// Access an array element (zero based index )
-      /// (You may need to say 'value[0u]' to get your compiler to distinguish
-      ///  this from the operator[] which takes a string.)
-      const Value &operator[]( UInt index ) const;
-      /// If the array contains at least index+1 elements, returns the element value,
-      /// otherwise returns defaultValue.
-      Value get( UInt index,
-                 const Value &defaultValue ) const;
-      /// Return true if index < size().
-      bool isValidIndex( UInt index ) const;
-      /// \brief Append value to array at the end.
-      ///
-      /// Equivalent to jsonvalue[jsonvalue.size()] = value;
-      Value &append( const Value &value );
-
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const char *key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const char *key ) const;
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const std::string &key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const std::string &key ) const;
-      /** \brief Access an object value by name, create a null member if it does not exist.
-
-       * If the object as no entry for that name, then the member name used to store
-       * the new entry is not duplicated.
-       * Example of use:
-       * \code
-       * Json::Value object;
-       * static const StaticString code("code");
-       * object[code] = 1234;
-       * \endcode
-       */
-      Value &operator[]( const StaticString &key );
-# ifdef JSON_USE_CPPTL
-      /// Access an object value by name, create a null member if it does not exist.
-      Value &operator[]( const CppTL::ConstString &key );
-      /// Access an object value by name, returns null if there is no member with that name.
-      const Value &operator[]( const CppTL::ConstString &key ) const;
-# endif
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const char *key,
-                 const Value &defaultValue ) const;
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const std::string &key,
-                 const Value &defaultValue ) const;
-# ifdef JSON_USE_CPPTL
-      /// Return the member named key if it exist, defaultValue otherwise.
-      Value get( const CppTL::ConstString &key,
-                 const Value &defaultValue ) const;
-# endif
-      /// \brief Remove and return the named member.
-      ///
-      /// Do nothing if it did not exist.
-      /// \return the removed Value, or null.
-      /// \pre type() is objectValue or nullValue
-      /// \post type() is unchanged
-      Value removeMember( const char* key );
-      /// Same as removeMember(const char*)
-      Value removeMember( const std::string &key );
-
-      /// Return true if the object has a member named key.
-      bool isMember( const char *key ) const;
-      /// Return true if the object has a member named key.
-      bool isMember( const std::string &key ) const;
-# ifdef JSON_USE_CPPTL
-      /// Return true if the object has a member named key.
-      bool isMember( const CppTL::ConstString &key ) const;
-# endif
-
-      /// \brief Return a list of the member names.
-      ///
-      /// If null, return an empty list.
-      /// \pre type() is objectValue or nullValue
-      /// \post if type() was nullValue, it remains nullValue
-      Members getMemberNames() const;
+public:
+    /** \brief Create a default Value of the given type.
 
-//# ifdef JSON_USE_CPPTL
-//      EnumMemberNames enumMemberNames() const;
-//      EnumValues enumValues() const;
-//# endif
+      This is a very useful constructor.
+      To create an empty array, pass arrayValue.
+      To create an empty object, pass objectValue.
+      Another Value can then be set to this one by assignment.
+      This is useful since clear() and resize() will not alter types.
+
+      Examples:
+      \code
+      Json::Value null_value; // null
+      Json::Value arr_value(Json::arrayValue); // []
+      Json::Value obj_value(Json::objectValue); // {}
+      \endcode
+    */
+    Value(ValueType type = nullValue);
+    Value(Int value);
+    Value(UInt value);
+    Value(double value);
+    Value(const char* value);
+    Value(const char* beginValue, const char* endValue);
+    /** \brief Constructs a value from a static string.
+
+     * Like other value string constructor but do not duplicate the string for
+     * internal storage. The given string must remain alive after the call to this
+     * constructor.
+     * Example of usage:
+     * \code
+     * Json::Value aValue( StaticString("some text") );
+     * \endcode
+     */
+    Value(const StaticString& value);
+    Value(const std::string& value);
+#ifdef JSON_USE_CPPTL
+    Value(const CppTL::ConstString& value);
+#endif
+    Value(bool value);
+    Value(const Value& other);
+    ~Value();
+
+    Value& operator=(const Value& other);
+    /// Swap values.
+    /// \note Currently, comments are intentionally not swapped, for
+    /// both logic and efficiency.
+    void swap(Value& other);
+
+    ValueType type() const;
+
+    bool operator<(const Value& other) const;
+    bool operator<=(const Value& other) const;
+    bool operator>=(const Value& other) const;
+    bool operator>(const Value& other) const;
+
+    bool operator==(const Value& other) const;
+    bool operator!=(const Value& other) const;
+
+    int compare(const Value& other);
+
+    const char* asCString() const;
+    std::string asString() const;
+#ifdef JSON_USE_CPPTL
+    CppTL::ConstString asConstString() const;
+#endif
+    Int asInt() const;
+    UInt asUInt() const;
+    double asDouble() const;
+    bool asBool() const;
+
+    bool isNull() const;
+    bool isBool() const;
+    bool isInt() const;
+    bool isUInt() const;
+    bool isIntegral() const;
+    bool isDouble() const;
+    bool isNumeric() const;
+    bool isString() const;
+    bool isArray() const;
+    bool isObject() const;
+
+    bool isConvertibleTo(ValueType other) const;
+
+    /// Number of values in array or object
+    UInt size() const;
+
+    /// \brief Return true if empty array, empty object, or null;
+    /// otherwise, false.
+    bool empty() const;
+
+    /// Return isNull()
+    bool operator!() const;
+
+    /// Remove all object members and array elements.
+    /// \pre type() is arrayValue, objectValue, or nullValue
+    /// \post type() is unchanged
+    void clear();
+
+    /// Resize the array to size elements.
+    /// New elements are initialized to null.
+    /// May only be called on nullValue or arrayValue.
+    /// \pre type() is arrayValue or nullValue
+    /// \post type() is arrayValue
+    void resize(UInt size);
+
+    /// Access an array element (zero based index ).
+    /// If the array contains less than index element, then null value are inserted
+    /// in the array so that its size is index+1.
+    /// (You may need to say 'value[0u]' to get your compiler to distinguish
+    ///  this from the operator[] which takes a string.)
+    Value& operator[](UInt index);
+    /// Access an array element (zero based index )
+    /// (You may need to say 'value[0u]' to get your compiler to distinguish
+    ///  this from the operator[] which takes a string.)
+    const Value& operator[](UInt index) const;
+    /// If the array contains at least index+1 elements, returns the element value,
+    /// otherwise returns defaultValue.
+    Value get(UInt index, const Value& defaultValue) const;
+    /// Return true if index < size().
+    bool isValidIndex(UInt index) const;
+    /// \brief Append value to array at the end.
+    ///
+    /// Equivalent to jsonvalue[jsonvalue.size()] = value;
+    Value& append(const Value& value);
+
+    /// Access an object value by name, create a null member if it does not exist.
+    Value& operator[](const char* key);
+    /// Access an object value by name, returns null if there is no member with that name.
+    const Value& operator[](const char* key) const;
+    /// Access an object value by name, create a null member if it does not exist.
+    Value& operator[](const std::string& key);
+    /// Access an object value by name, returns null if there is no member with that name.
+    const Value& operator[](const std::string& key) const;
+    /** \brief Access an object value by name, create a null member if it does not exist.
+
+     * If the object as no entry for that name, then the member name used to store
+     * the new entry is not duplicated.
+     * Example of use:
+     * \code
+     * Json::Value object;
+     * static const StaticString code("code");
+     * object[code] = 1234;
+     * \endcode
+     */
+    Value& operator[](const StaticString& key);
+#ifdef JSON_USE_CPPTL
+    /// Access an object value by name, create a null member if it does not exist.
+    Value& operator[](const CppTL::ConstString& key);
+    /// Access an object value by name, returns null if there is no member with that name.
+    const Value& operator[](const CppTL::ConstString& key) const;
+#endif
+    /// Return the member named key if it exist, defaultValue otherwise.
+    Value get(const char* key, const Value& defaultValue) const;
+    /// Return the member named key if it exist, defaultValue otherwise.
+    Value get(const std::string& key, const Value& defaultValue) const;
+#ifdef JSON_USE_CPPTL
+    /// Return the member named key if it exist, defaultValue otherwise.
+    Value get(const CppTL::ConstString& key, const Value& defaultValue) const;
+#endif
+    /// \brief Remove and return the named member.
+    ///
+    /// Do nothing if it did not exist.
+    /// \return the removed Value, or null.
+    /// \pre type() is objectValue or nullValue
+    /// \post type() is unchanged
+    Value removeMember(const char* key);
+    /// Same as removeMember(const char*)
+    Value removeMember(const std::string& key);
+
+    /// Return true if the object has a member named key.
+    bool isMember(const char* key) const;
+    /// Return true if the object has a member named key.
+    bool isMember(const std::string& key) const;
+#ifdef JSON_USE_CPPTL
+    /// Return true if the object has a member named key.
+    bool isMember(const CppTL::ConstString& key) const;
+#endif
 
-      /// Comments must be //... or /* ... */
-      void setComment( const char *comment,
-                       CommentPlacement placement );
-      /// Comments must be //... or /* ... */
-      void setComment( const std::string &comment,
-                       CommentPlacement placement );
-      bool hasComment( CommentPlacement placement ) const;
-      /// Include delimiters and embedded newlines.
-      std::string getComment( CommentPlacement placement ) const;
+    /// \brief Return a list of the member names.
+    ///
+    /// If null, return an empty list.
+    /// \pre type() is objectValue or nullValue
+    /// \post if type() was nullValue, it remains nullValue
+    Members getMemberNames() const;
 
-      std::string toStyledString() const;
+    //# ifdef JSON_USE_CPPTL
+    //      EnumMemberNames enumMemberNames() const;
+    //      EnumValues enumValues() const;
+    //# endif
 
-      const_iterator begin() const;
-      const_iterator end() const;
+    /// Comments must be //... or /* ... */
+    void setComment(const char* comment, CommentPlacement placement);
+    /// Comments must be //... or /* ... */
+    void setComment(const std::string& comment, CommentPlacement placement);
+    bool hasComment(CommentPlacement placement) const;
+    /// Include delimiters and embedded newlines.
+    std::string getComment(CommentPlacement placement) const;
 
-      iterator begin();
-      iterator end();
+    std::string toStyledString() const;
 
-   private:
-      Value &resolveReference( const char *key,
-                               bool isStatic );
+    const_iterator begin() const;
+    const_iterator end() const;
 
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      inline bool isItemAvailable() const
+    iterator begin();
+    iterator end();
+
+private:
+    Value& resolveReference(const char* key, bool isStatic);
+
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    inline bool isItemAvailable() const { return itemIsUsed_ == 0; }
+
+    inline void setItemUsed(bool isUsed = true) { itemIsUsed_ = isUsed ? 1 : 0; }
+
+    inline bool isMemberNameStatic() const { return memberNameIsStatic_ == 0; }
+
+    inline void setMemberNameIsStatic(bool isStatic) { memberNameIsStatic_ = isStatic ? 1 : 0; }
+#endif // # ifdef JSON_VALUE_USE_INTERNAL_MAP
+
+private:
+    struct CommentInfo
+    {
+        CommentInfo();
+        ~CommentInfo();
+
+        void setComment(const char* text);
+
+        char* comment_;
+    };
+
+    // struct MemberNamesTransform
+    //{
+    //   typedef const char *result_type;
+    //   const char *operator()( const CZString &name ) const
+    //   {
+    //      return name.c_str();
+    //   }
+    //};
+
+    union ValueHolder
+    {
+        Int int_;
+        UInt uint_;
+        double real_;
+        bool bool_;
+        char* string_;
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+        ValueInternalArray* array_;
+        ValueInternalMap* map_;
+#else
+        ObjectValues* map_;
+#endif
+    } value_;
+    ValueType type_ : 8;
+    int allocated_ : 1; // Notes: if declared as bool, bitfield is useless.
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    unsigned int itemIsUsed_ : 1; // used by the ValueInternalMap container.
+    int memberNameIsStatic_ : 1;  // used by the ValueInternalMap container.
+#endif
+    CommentInfo* comments_;
+};
+
+/** \brief Experimental and untested: represents an element of the "path" to access a node.
+ */
+class PathArgument
+{
+public:
+    friend class Path;
+
+    PathArgument();
+    PathArgument(UInt index);
+    PathArgument(const char* key);
+    PathArgument(const std::string& key);
+
+private:
+    enum Kind
+    {
+        kindNone = 0,
+        kindIndex,
+        kindKey
+    };
+    std::string key_;
+    UInt index_;
+    Kind kind_;
+};
+
+/** \brief Experimental and untested: represents a "path" to access a node.
+ *
+ * Syntax:
+ * - "." => root node
+ * - ".[n]" => elements at index 'n' of root node (an array value)
+ * - ".name" => member named 'name' of root node (an object value)
+ * - ".name1.name2.name3"
+ * - ".[0][1][2].name1[3]"
+ * - ".%" => member name is provided as parameter
+ * - ".[%]" => index is provied as parameter
+ */
+class Path
+{
+public:
+    Path(const std::string& path,
+         const PathArgument& a1 = PathArgument(),
+         const PathArgument& a2 = PathArgument(),
+         const PathArgument& a3 = PathArgument(),
+         const PathArgument& a4 = PathArgument(),
+         const PathArgument& a5 = PathArgument());
+
+    const Value& resolve(const Value& root) const;
+    Value resolve(const Value& root, const Value& defaultValue) const;
+    /// Creates the "path" to access the specified node and returns a reference on the node.
+    Value& make(Value& root) const;
+
+private:
+    typedef std::vector<const PathArgument*> InArgs;
+    typedef std::vector<PathArgument> Args;
+
+    void makePath(const std::string& path, const InArgs& in);
+    void
+      addPathInArg(const std::string& path, const InArgs& in, InArgs::const_iterator& itInArg, PathArgument::Kind kind);
+    void invalidPath(const std::string& path, int location);
+
+    Args args_;
+};
+
+/** \brief Experimental do not use: Allocator to customize member name and string value memory management done by Value.
+ *
+ * - makeMemberName() and releaseMemberName() are called to respectively duplicate and
+ *   free an Json::objectValue member name.
+ * - duplicateStringValue() and releaseStringValue() are called similarly to
+ *   duplicate and free a Json::stringValue value.
+ */
+class ValueAllocator
+{
+public:
+    enum
+    {
+        unknown = (unsigned)-1
+    };
+
+    virtual ~ValueAllocator();
+
+    virtual char* makeMemberName(const char* memberName) = 0;
+    virtual void releaseMemberName(char* memberName) = 0;
+    virtual char* duplicateStringValue(const char* value, unsigned int length = unknown) = 0;
+    virtual void releaseStringValue(char* value) = 0;
+};
+
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+/** \brief Allocator to customize Value internal map.
+ * Below is an example of a simple implementation (default implementation actually
+ * use memory pool for speed).
+ * \code
+   class DefaultValueMapAllocator : public ValueMapAllocator
+   {
+   public: // overridden from ValueMapAllocator
+      virtual ValueInternalMap *newMap()
       {
-         return itemIsUsed_ == 0;
+         return new ValueInternalMap();
       }
 
-      inline void setItemUsed( bool isUsed = true )
+      virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
       {
-         itemIsUsed_ = isUsed ? 1 : 0;
+         return new ValueInternalMap( other );
       }
 
-      inline bool isMemberNameStatic() const
+      virtual void destructMap( ValueInternalMap *map )
       {
-         return memberNameIsStatic_ == 0;
+         delete map;
       }
 
-      inline void setMemberNameIsStatic( bool isStatic )
+      virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
       {
-         memberNameIsStatic_ = isStatic ? 1 : 0;
+         return new ValueInternalLink[size];
       }
-# endif // # ifdef JSON_VALUE_USE_INTERNAL_MAP
 
-   private:
-      struct CommentInfo
+      virtual void releaseMapBuckets( ValueInternalLink *links )
       {
-         CommentInfo();
-         ~CommentInfo();
-
-         void setComment( const char *text );
-
-         char *comment_;
-      };
+         delete [] links;
+      }
 
-      //struct MemberNamesTransform
-      //{
-      //   typedef const char *result_type;
-      //   const char *operator()( const CZString &name ) const
-      //   {
-      //      return name.c_str();
-      //   }
-      //};
+      virtual ValueInternalLink *allocateMapLink()
+      {
+         return new ValueInternalLink();
+      }
 
-      union ValueHolder
+      virtual void releaseMapLink( ValueInternalLink *link )
       {
-         Int int_;
-         UInt uint_;
-         double real_;
-         bool bool_;
-         char *string_;
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-         ValueInternalArray *array_;
-         ValueInternalMap *map_;
-#else
-         ObjectValues *map_;
-# endif
-      } value_;
-      ValueType type_ : 8;
-      int allocated_ : 1;     // Notes: if declared as bool, bitfield is useless.
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-      unsigned int itemIsUsed_ : 1;      // used by the ValueInternalMap container.
-      int memberNameIsStatic_ : 1;       // used by the ValueInternalMap container.
-# endif
-      CommentInfo *comments_;
+         delete link;
+      }
    };
+ * \endcode
+ */
+class JSON_API ValueMapAllocator
+{
+public:
+    virtual ~ValueMapAllocator();
+    virtual ValueInternalMap* newMap() = 0;
+    virtual ValueInternalMap* newMapCopy(const ValueInternalMap& other) = 0;
+    virtual void destructMap(ValueInternalMap* map) = 0;
+    virtual ValueInternalLink* allocateMapBuckets(unsigned int size) = 0;
+    virtual void releaseMapBuckets(ValueInternalLink* links) = 0;
+    virtual ValueInternalLink* allocateMapLink() = 0;
+    virtual void releaseMapLink(ValueInternalLink* link) = 0;
+};
 
+/** \brief ValueInternalMap hash-map bucket chain link (for internal use only).
+ * \internal previous_ & next_ allows for bidirectional traversal.
+ */
+class JSON_API ValueInternalLink
+{
+public:
+    enum
+    {
+        itemPerLink = 6
+    }; // sizeof(ValueInternalLink) = 128 on 32 bits architecture.
+    enum InternalFlags
+    {
+        flagAvailable = 0,
+        flagUsed = 1
+    };
+
+    ValueInternalLink();
+
+    ~ValueInternalLink();
+
+    Value items_[itemPerLink];
+    char* keys_[itemPerLink];
+    ValueInternalLink* previous_;
+    ValueInternalLink* next_;
+};
 
-   /** \brief Experimental and untested: represents an element of the "path" to access a node.
-    */
-   class PathArgument
-   {
-   public:
-      friend class Path;
+/** \brief A linked page based hash-table implementation used internally by Value.
+ * \internal ValueInternalMap is a tradional bucket based hash-table, with a linked
+ * list in each bucket to handle collision. There is an addional twist in that
+ * each node of the collision linked list is a page containing a fixed amount of
+ * value. This provides a better compromise between memory usage and speed.
+ *
+ * Each bucket is made up of a chained list of ValueInternalLink. The last
+ * link of a given bucket can be found in the 'previous_' field of the following bucket.
+ * The last link of the last bucket is stored in tailLink_ as it has no following bucket.
+ * Only the last link of a bucket may contains 'available' item. The last link always
+ * contains at least one element unless is it the bucket one very first link.
+ */
+class JSON_API ValueInternalMap
+{
+    friend class ValueIteratorBase;
+    friend class Value;
 
-      PathArgument();
-      PathArgument( UInt index );
-      PathArgument( const char *key );
-      PathArgument( const std::string &key );
+public:
+    typedef unsigned int HashKey;
+    typedef unsigned int BucketIndex;
 
-   private:
-      enum Kind
-      {
-         kindNone = 0,
-         kindIndex,
-         kindKey
-      };
-      std::string key_;
-      UInt index_;
-      Kind kind_;
-   };
+#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
+    struct IteratorState
+    {
+        IteratorState() : map_(0), link_(0), itemIndex_(0), bucketIndex_(0) {}
+        ValueInternalMap* map_;
+        ValueInternalLink* link_;
+        BucketIndex itemIndex_;
+        BucketIndex bucketIndex_;
+    };
+#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
-   /** \brief Experimental and untested: represents a "path" to access a node.
-    *
-    * Syntax:
-    * - "." => root node
-    * - ".[n]" => elements at index 'n' of root node (an array value)
-    * - ".name" => member named 'name' of root node (an object value)
-    * - ".name1.name2.name3"
-    * - ".[0][1][2].name1[3]"
-    * - ".%" => member name is provided as parameter
-    * - ".[%]" => index is provied as parameter
-    */
-   class Path
-   {
-   public:
-      Path( const std::string &path,
-            const PathArgument &a1 = PathArgument(),
-            const PathArgument &a2 = PathArgument(),
-            const PathArgument &a3 = PathArgument(),
-            const PathArgument &a4 = PathArgument(),
-            const PathArgument &a5 = PathArgument() );
-
-      const Value &resolve( const Value &root ) const;
-      Value resolve( const Value &root,
-                     const Value &defaultValue ) const;
-      /// Creates the "path" to access the specified node and returns a reference on the node.
-      Value &make( Value &root ) const;
-
-   private:
-      typedef std::vector<const PathArgument *> InArgs;
-      typedef std::vector<PathArgument> Args;
-
-      void makePath( const std::string &path,
-                     const InArgs &in );
-      void addPathInArg( const std::string &path,
-                         const InArgs &in,
-                         InArgs::const_iterator &itInArg,
-                         PathArgument::Kind kind );
-      void invalidPath( const std::string &path,
-                        int location );
-
-      Args args_;
-   };
+    ValueInternalMap();
+    ValueInternalMap(const ValueInternalMap& other);
+    ValueInternalMap& operator=(const ValueInternalMap& other);
+    ~ValueInternalMap();
 
-   /** \brief Experimental do not use: Allocator to customize member name and string value memory management done by Value.
-    *
-    * - makeMemberName() and releaseMemberName() are called to respectively duplicate and
-    *   free an Json::objectValue member name.
-    * - duplicateStringValue() and releaseStringValue() are called similarly to
-    *   duplicate and free a Json::stringValue value.
-    */
-   class ValueAllocator
-   {
-   public:
-      enum { unknown = (unsigned)-1 };
+    void swap(ValueInternalMap& other);
 
-      virtual ~ValueAllocator();
+    BucketIndex size() const;
 
-      virtual char *makeMemberName( const char *memberName ) = 0;
-      virtual void releaseMemberName( char *memberName ) = 0;
-      virtual char *duplicateStringValue( const char *value,
-                                          unsigned int length = unknown ) = 0;
-      virtual void releaseStringValue( char *value ) = 0;
-   };
+    void clear();
 
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-   /** \brief Allocator to customize Value internal map.
-    * Below is an example of a simple implementation (default implementation actually
-    * use memory pool for speed).
-    * \code
-      class DefaultValueMapAllocator : public ValueMapAllocator
-      {
-      public: // overridden from ValueMapAllocator
-         virtual ValueInternalMap *newMap()
-         {
-            return new ValueInternalMap();
-         }
-
-         virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-         {
-            return new ValueInternalMap( other );
-         }
-
-         virtual void destructMap( ValueInternalMap *map )
-         {
-            delete map;
-         }
-
-         virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-         {
-            return new ValueInternalLink[size];
-         }
-
-         virtual void releaseMapBuckets( ValueInternalLink *links )
-         {
-            delete [] links;
-         }
-
-         virtual ValueInternalLink *allocateMapLink()
-         {
-            return new ValueInternalLink();
-         }
-
-         virtual void releaseMapLink( ValueInternalLink *link )
-         {
-            delete link;
-         }
-      };
-    * \endcode
-    */
-   class JSON_API ValueMapAllocator
-   {
-   public:
-      virtual ~ValueMapAllocator();
-      virtual ValueInternalMap *newMap() = 0;
-      virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other ) = 0;
-      virtual void destructMap( ValueInternalMap *map ) = 0;
-      virtual ValueInternalLink *allocateMapBuckets( unsigned int size ) = 0;
-      virtual void releaseMapBuckets( ValueInternalLink *links ) = 0;
-      virtual ValueInternalLink *allocateMapLink() = 0;
-      virtual void releaseMapLink( ValueInternalLink *link ) = 0;
-   };
+    bool reserveDelta(BucketIndex growth);
 
-   /** \brief ValueInternalMap hash-map bucket chain link (for internal use only).
-    * \internal previous_ & next_ allows for bidirectional traversal.
-    */
-   class JSON_API ValueInternalLink
-   {
-   public:
-      enum { itemPerLink = 6 };  // sizeof(ValueInternalLink) = 128 on 32 bits architecture.
-      enum InternalFlags {
-         flagAvailable = 0,
-         flagUsed = 1
-      };
+    bool reserve(BucketIndex newItemCount);
 
-      ValueInternalLink();
+    const Value* find(const char* key) const;
 
-      ~ValueInternalLink();
+    Value* find(const char* key);
 
-      Value items_[itemPerLink];
-      char *keys_[itemPerLink];
-      ValueInternalLink *previous_;
-      ValueInternalLink *next_;
-   };
+    Value& resolveReference(const char* key, bool isStatic);
 
+    void remove(const char* key);
 
-   /** \brief A linked page based hash-table implementation used internally by Value.
-    * \internal ValueInternalMap is a tradional bucket based hash-table, with a linked
-    * list in each bucket to handle collision. There is an addional twist in that
-    * each node of the collision linked list is a page containing a fixed amount of
-    * value. This provides a better compromise between memory usage and speed.
-    *
-    * Each bucket is made up of a chained list of ValueInternalLink. The last
-    * link of a given bucket can be found in the 'previous_' field of the following bucket.
-    * The last link of the last bucket is stored in tailLink_ as it has no following bucket.
-    * Only the last link of a bucket may contains 'available' item. The last link always
-    * contains at least one element unless is it the bucket one very first link.
-    */
-   class JSON_API ValueInternalMap
-   {
-      friend class ValueIteratorBase;
-      friend class Value;
-   public:
-      typedef unsigned int HashKey;
-      typedef unsigned int BucketIndex;
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-      struct IteratorState
-      {
-         IteratorState()
-            : map_(0)
-            , link_(0)
-            , itemIndex_(0)
-            , bucketIndex_(0)
-         {
-         }
-         ValueInternalMap *map_;
-         ValueInternalLink *link_;
-         BucketIndex itemIndex_;
-         BucketIndex bucketIndex_;
-      };
-# endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
+    void doActualRemove(ValueInternalLink* link, BucketIndex index, BucketIndex bucketIndex);
 
-      ValueInternalMap();
-      ValueInternalMap( const ValueInternalMap &other );
-      ValueInternalMap &operator =( const ValueInternalMap &other );
-      ~ValueInternalMap();
+    ValueInternalLink*& getLastLinkInBucket(BucketIndex bucketIndex);
 
-      void swap( ValueInternalMap &other );
+    Value& setNewItem(const char* key, bool isStatic, ValueInternalLink* link, BucketIndex index);
 
-      BucketIndex size() const;
+    Value& unsafeAdd(const char* key, bool isStatic, HashKey hashedKey);
 
-      void clear();
+    HashKey hash(const char* key) const;
 
-      bool reserveDelta( BucketIndex growth );
+    int compare(const ValueInternalMap& other) const;
 
-      bool reserve( BucketIndex newItemCount );
+private:
+    void makeBeginIterator(IteratorState& it) const;
+    void makeEndIterator(IteratorState& it) const;
+    static bool equals(const IteratorState& x, const IteratorState& other);
+    static void increment(IteratorState& iterator);
+    static void incrementBucket(IteratorState& iterator);
+    static void decrement(IteratorState& iterator);
+    static const char* key(const IteratorState& iterator);
+    static const char* key(const IteratorState& iterator, bool& isStatic);
+    static Value& value(const IteratorState& iterator);
+    static int distance(const IteratorState& x, const IteratorState& y);
 
-      const Value *find( const char *key ) const;
+private:
+    ValueInternalLink* buckets_;
+    ValueInternalLink* tailLink_;
+    BucketIndex bucketsSize_;
+    BucketIndex itemCount_;
+};
 
-      Value *find( const char *key );
+/** \brief A simplified deque implementation used internally by Value.
+ * \internal
+ * It is based on a list of fixed "page", each page contains a fixed number of items.
+ * Instead of using a linked-list, a array of pointer is used for fast item look-up.
+ * Look-up for an element is as follow:
+ * - compute page index: pageIndex = itemIndex / itemsPerPage
+ * - look-up item in page: pages_[pageIndex][itemIndex % itemsPerPage]
+ *
+ * Insertion is amortized constant time (only the array containing the index of pointers
+ * need to be reallocated when items are appended).
+ */
+class JSON_API ValueInternalArray
+{
+    friend class Value;
+    friend class ValueIteratorBase;
 
-      Value &resolveReference( const char *key,
-                               bool isStatic );
+public:
+    enum
+    {
+        itemsPerPage = 8
+    }; // should be a power of 2 for fast divide and modulo.
+    typedef Value::ArrayIndex ArrayIndex;
+    typedef unsigned int PageIndex;
 
-      void remove( const char *key );
+#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
+    struct IteratorState // Must be a POD
+    {
+        IteratorState() : array_(0), currentPageIndex_(0), currentItemIndex_(0) {}
+        ValueInternalArray* array_;
+        Value** currentPageIndex_;
+        unsigned int currentItemIndex_;
+    };
+#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
-      void doActualRemove( ValueInternalLink *link,
-                           BucketIndex index,
-                           BucketIndex bucketIndex );
+    ValueInternalArray();
+    ValueInternalArray(const ValueInternalArray& other);
+    ValueInternalArray& operator=(const ValueInternalArray& other);
+    ~ValueInternalArray();
+    void swap(ValueInternalArray& other);
 
-      ValueInternalLink *&getLastLinkInBucket( BucketIndex bucketIndex );
+    void clear();
+    void resize(ArrayIndex newSize);
 
-      Value &setNewItem( const char *key,
-                         bool isStatic,
-                         ValueInternalLink *link,
-                         BucketIndex index );
+    Value& resolveReference(ArrayIndex index);
 
-      Value &unsafeAdd( const char *key,
-                        bool isStatic,
-                        HashKey hashedKey );
+    Value* find(ArrayIndex index) const;
 
-      HashKey hash( const char *key ) const;
+    ArrayIndex size() const;
 
-      int compare( const ValueInternalMap &other ) const;
+    int compare(const ValueInternalArray& other) const;
 
-   private:
-      void makeBeginIterator( IteratorState &it ) const;
-      void makeEndIterator( IteratorState &it ) const;
-      static bool equals( const IteratorState &x, const IteratorState &other );
-      static void increment( IteratorState &iterator );
-      static void incrementBucket( IteratorState &iterator );
-      static void decrement( IteratorState &iterator );
-      static const char *key( const IteratorState &iterator );
-      static const char *key( const IteratorState &iterator, bool &isStatic );
-      static Value &value( const IteratorState &iterator );
-      static int distance( const IteratorState &x, const IteratorState &y );
+private:
+    static bool equals(const IteratorState& x, const IteratorState& other);
+    static void increment(IteratorState& iterator);
+    static void decrement(IteratorState& iterator);
+    static Value& dereference(const IteratorState& iterator);
+    static Value& unsafeDereference(const IteratorState& iterator);
+    static int distance(const IteratorState& x, const IteratorState& y);
+    static ArrayIndex indexOf(const IteratorState& iterator);
+    void makeBeginIterator(IteratorState& it) const;
+    void makeEndIterator(IteratorState& it) const;
+    void makeIterator(IteratorState& it, ArrayIndex index) const;
 
-   private:
-      ValueInternalLink *buckets_;
-      ValueInternalLink *tailLink_;
-      BucketIndex bucketsSize_;
-      BucketIndex itemCount_;
-   };
+    void makeIndexValid(ArrayIndex index);
 
-   /** \brief A simplified deque implementation used internally by Value.
-   * \internal
-   * It is based on a list of fixed "page", each page contains a fixed number of items.
-   * Instead of using a linked-list, a array of pointer is used for fast item look-up.
-   * Look-up for an element is as follow:
-   * - compute page index: pageIndex = itemIndex / itemsPerPage
-   * - look-up item in page: pages_[pageIndex][itemIndex % itemsPerPage]
-   *
-   * Insertion is amortized constant time (only the array containing the index of pointers
-   * need to be reallocated when items are appended).
-   */
-   class JSON_API ValueInternalArray
-   {
-      friend class Value;
-      friend class ValueIteratorBase;
-   public:
-      enum { itemsPerPage = 8 };    // should be a power of 2 for fast divide and modulo.
-      typedef Value::ArrayIndex ArrayIndex;
-      typedef unsigned int PageIndex;
-
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-      struct IteratorState // Must be a POD
-      {
-         IteratorState()
-            : array_(0)
-            , currentPageIndex_(0)
-            , currentItemIndex_(0)
-         {
-         }
-         ValueInternalArray *array_;
-         Value **currentPageIndex_;
-         unsigned int currentItemIndex_;
-      };
-# endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-      ValueInternalArray();
-      ValueInternalArray( const ValueInternalArray &other );
-      ValueInternalArray &operator =( const ValueInternalArray &other );
-      ~ValueInternalArray();
-      void swap( ValueInternalArray &other );
-
-      void clear();
-      void resize( ArrayIndex newSize );
-
-      Value &resolveReference( ArrayIndex index );
-
-      Value *find( ArrayIndex index ) const;
-
-      ArrayIndex size() const;
-
-      int compare( const ValueInternalArray &other ) const;
-
-   private:
-      static bool equals( const IteratorState &x, const IteratorState &other );
-      static void increment( IteratorState &iterator );
-      static void decrement( IteratorState &iterator );
-      static Value &dereference( const IteratorState &iterator );
-      static Value &unsafeDereference( const IteratorState &iterator );
-      static int distance( const IteratorState &x, const IteratorState &y );
-      static ArrayIndex indexOf( const IteratorState &iterator );
-      void makeBeginIterator( IteratorState &it ) const;
-      void makeEndIterator( IteratorState &it ) const;
-      void makeIterator( IteratorState &it, ArrayIndex index ) const;
-
-      void makeIndexValid( ArrayIndex index );
-
-      Value **pages_;
-      ArrayIndex size_;
-      PageIndex pageCount_;
-   };
+    Value** pages_;
+    ArrayIndex size_;
+    PageIndex pageCount_;
+};
 
-   /** \brief Experimental: do not use. Allocator to customize Value internal array.
-    * Below is an example of a simple implementation (actual implementation use
-    * memory pool).
-      \code
+/** \brief Experimental: do not use. Allocator to customize Value internal array.
+ * Below is an example of a simple implementation (actual implementation use
+ * memory pool).
+   \code
 class DefaultValueArrayAllocator : public ValueArrayAllocator
 {
 public: // overridden from ValueArrayAllocator
-   virtual ~DefaultValueArrayAllocator()
-   {
-   }
+virtual ~DefaultValueArrayAllocator()
+{
+}
 
-   virtual ValueInternalArray *newArray()
-   {
-      return new ValueInternalArray();
-   }
+virtual ValueInternalArray *newArray()
+{
+   return new ValueInternalArray();
+}
 
-   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-   {
-      return new ValueInternalArray( other );
-   }
+virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
+{
+   return new ValueInternalArray( other );
+}
 
-   virtual void destruct( ValueInternalArray *array )
-   {
-      delete array;
-   }
+virtual void destruct( ValueInternalArray *array )
+{
+   delete array;
+}
 
-   virtual void reallocateArrayPageIndex( Value **&indexes,
-                                          ValueInternalArray::PageIndex &indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount )
-   {
-      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-      if ( minNewIndexCount > newIndexCount )
-         newIndexCount = minNewIndexCount;
-      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-      if ( !newIndexes )
-         throw std::bad_alloc();
-      indexCount = newIndexCount;
-      indexes = static_cast<Value **>( newIndexes );
-   }
-   virtual void releaseArrayPageIndex( Value **indexes,
-                                       ValueInternalArray::PageIndex indexCount )
-   {
-      if ( indexes )
-         free( indexes );
-   }
+virtual void reallocateArrayPageIndex( Value **&indexes,
+                                       ValueInternalArray::PageIndex &indexCount,
+                                       ValueInternalArray::PageIndex minNewIndexCount )
+{
+   ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
+   if ( minNewIndexCount > newIndexCount )
+      newIndexCount = minNewIndexCount;
+   void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
+   if ( !newIndexes )
+      throw std::bad_alloc();
+   indexCount = newIndexCount;
+   indexes = static_cast<Value **>( newIndexes );
+}
+virtual void releaseArrayPageIndex( Value **indexes,
+                                    ValueInternalArray::PageIndex indexCount )
+{
+   if ( indexes )
+      free( indexes );
+}
 
-   virtual Value *allocateArrayPage()
-   {
-      return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
-   }
+virtual Value *allocateArrayPage()
+{
+   return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
+}
 
-   virtual void releaseArrayPage( Value *value )
-   {
-      if ( value )
-         free( value );
-   }
+virtual void releaseArrayPage( Value *value )
+{
+   if ( value )
+      free( value );
+}
+};
+   \endcode
+ */
+class JSON_API ValueArrayAllocator
+{
+public:
+    virtual ~ValueArrayAllocator();
+    virtual ValueInternalArray* newArray() = 0;
+    virtual ValueInternalArray* newArrayCopy(const ValueInternalArray& other) = 0;
+    virtual void destructArray(ValueInternalArray* array) = 0;
+    /** \brief Reallocate array page index.
+     * Reallocates an array of pointer on each page.
+     * \param indexes [input] pointer on the current index. May be \c NULL.
+     *                [output] pointer on the new index of at least
+     *                         \a minNewIndexCount pages.
+     * \param indexCount [input] current number of pages in the index.
+     *                   [output] number of page the reallocated index can handle.
+     *                            \b MUST be >= \a minNewIndexCount.
+     * \param minNewIndexCount Minimum number of page the new index must be able to
+     *                         handle.
+     */
+    virtual void reallocateArrayPageIndex(Value**& indexes,
+                                          ValueInternalArray::PageIndex& indexCount,
+                                          ValueInternalArray::PageIndex minNewIndexCount) = 0;
+    virtual void releaseArrayPageIndex(Value** indexes, ValueInternalArray::PageIndex indexCount) = 0;
+    virtual Value* allocateArrayPage() = 0;
+    virtual void releaseArrayPage(Value* value) = 0;
 };
-      \endcode
-    */
-   class JSON_API ValueArrayAllocator
-   {
-   public:
-      virtual ~ValueArrayAllocator();
-      virtual ValueInternalArray *newArray() = 0;
-      virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other ) = 0;
-      virtual void destructArray( ValueInternalArray *array ) = 0;
-      /** \brief Reallocate array page index.
-       * Reallocates an array of pointer on each page.
-       * \param indexes [input] pointer on the current index. May be \c NULL.
-       *                [output] pointer on the new index of at least
-       *                         \a minNewIndexCount pages.
-       * \param indexCount [input] current number of pages in the index.
-       *                   [output] number of page the reallocated index can handle.
-       *                            \b MUST be >= \a minNewIndexCount.
-       * \param minNewIndexCount Minimum number of page the new index must be able to
-       *                         handle.
-       */
-      virtual void reallocateArrayPageIndex( Value **&indexes,
-                                             ValueInternalArray::PageIndex &indexCount,
-                                             ValueInternalArray::PageIndex minNewIndexCount ) = 0;
-      virtual void releaseArrayPageIndex( Value **indexes,
-                                          ValueInternalArray::PageIndex indexCount ) = 0;
-      virtual Value *allocateArrayPage() = 0;
-      virtual void releaseArrayPage( Value *value ) = 0;
-   };
 #endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
 
+/** \brief base class for Value iterators.
+ *
+ */
+class ValueIteratorBase
+{
+public:
+    typedef unsigned int size_t;
+    typedef int difference_type;
+    typedef ValueIteratorBase SelfType;
 
-   /** \brief base class for Value iterators.
-    *
-    */
-   class ValueIteratorBase
-   {
-   public:
-      typedef unsigned int size_t;
-      typedef int difference_type;
-      typedef ValueIteratorBase SelfType;
-
-      ValueIteratorBase();
+    ValueIteratorBase();
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-      explicit ValueIteratorBase( const Value::ObjectValues::iterator &current );
+    explicit ValueIteratorBase(const Value::ObjectValues::iterator& current);
 #else
-      ValueIteratorBase( const ValueInternalArray::IteratorState &state );
-      ValueIteratorBase( const ValueInternalMap::IteratorState &state );
+    ValueIteratorBase(const ValueInternalArray::IteratorState& state);
+    ValueIteratorBase(const ValueInternalMap::IteratorState& state);
 #endif
 
-      bool operator ==( const SelfType &other ) const
-      {
-         return isEqual( other );
-      }
-
-      bool operator !=( const SelfType &other ) const
-      {
-         return !isEqual( other );
-      }
+    bool operator==(const SelfType& other) const { return isEqual(other); }
 
-      difference_type operator -( const SelfType &other ) const
-      {
-         return computeDistance( other );
-      }
+    bool operator!=(const SelfType& other) const { return !isEqual(other); }
 
-      /// Return either the index or the member name of the referenced value as a Value.
-      Value key() const;
+    difference_type operator-(const SelfType& other) const { return computeDistance(other); }
 
-      /// Return the index of the referenced Value. -1 if it is not an arrayValue.
-      UInt index() const;
+    /// Return either the index or the member name of the referenced value as a Value.
+    Value key() const;
 
-      /// Return the member name of the referenced Value. "" if it is not an objectValue.
-      const char *memberName() const;
+    /// Return the index of the referenced Value. -1 if it is not an arrayValue.
+    UInt index() const;
 
-   protected:
-      Value &deref() const;
+    /// Return the member name of the referenced Value. "" if it is not an objectValue.
+    const char* memberName() const;
 
-      void increment();
+protected:
+    Value& deref() const;
 
-      void decrement();
+    void increment();
 
-      difference_type computeDistance( const SelfType &other ) const;
+    void decrement();
 
-      bool isEqual( const SelfType &other ) const;
+    difference_type computeDistance(const SelfType& other) const;
 
-      void copy( const SelfType &other );
+    bool isEqual(const SelfType& other) const;
 
-   private:
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-      Value::ObjectValues::iterator current_;
-      // Indicates that iterator is for a null value.
-      bool isNull_;
-#else
-      union
-      {
-         ValueInternalArray::IteratorState array_;
-         ValueInternalMap::IteratorState map_;
-      } iterator_;
-      bool isArray_;
-#endif
-   };
+    void copy(const SelfType& other);
 
-   /** \brief const iterator for object and array value.
-    *
-    */
-   class ValueConstIterator : public ValueIteratorBase
-   {
-      friend class Value;
-   public:
-      typedef unsigned int size_t;
-      typedef int difference_type;
-      typedef const Value &reference;
-      typedef const Value *pointer;
-      typedef ValueConstIterator SelfType;
-
-      ValueConstIterator();
-   private:
-      /*! \internal Use by Value to create an iterator.
-       */
+private:
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-      explicit ValueConstIterator( const Value::ObjectValues::iterator &current );
+    Value::ObjectValues::iterator current_;
+    // Indicates that iterator is for a null value.
+    bool isNull_;
 #else
-      ValueConstIterator( const ValueInternalArray::IteratorState &state );
-      ValueConstIterator( const ValueInternalMap::IteratorState &state );
+    union
+    {
+        ValueInternalArray::IteratorState array_;
+        ValueInternalMap::IteratorState map_;
+    } iterator_;
+    bool isArray_;
 #endif
-   public:
-      SelfType &operator =( const ValueIteratorBase &other );
-
-      SelfType operator++( int )
-      {
-         SelfType temp( *this );
-         ++*this;
-         return temp;
-      }
-
-      SelfType operator--( int )
-      {
-         SelfType temp( *this );
-         --*this;
-         return temp;
-      }
-
-      SelfType &operator--()
-      {
-         decrement();
-         return *this;
-      }
+};
 
-      SelfType &operator++()
-      {
-         increment();
-         return *this;
-      }
+/** \brief const iterator for object and array value.
+ *
+ */
+class ValueConstIterator : public ValueIteratorBase
+{
+    friend class Value;
 
-      reference operator *() const
-      {
-         return deref();
-      }
-   };
+public:
+    typedef unsigned int size_t;
+    typedef int difference_type;
+    typedef const Value& reference;
+    typedef const Value* pointer;
+    typedef ValueConstIterator SelfType;
 
+    ValueConstIterator();
 
-   /** \brief Iterator for object and array value.
-    */
-   class ValueIterator : public ValueIteratorBase
-   {
-      friend class Value;
-   public:
-      typedef unsigned int size_t;
-      typedef int difference_type;
-      typedef Value &reference;
-      typedef Value *pointer;
-      typedef ValueIterator SelfType;
-
-      ValueIterator();
-      ValueIterator( const ValueConstIterator &other );
-      ValueIterator( const ValueIterator &other );
-   private:
-      /*! \internal Use by Value to create an iterator.
-       */
+private:
+    /*! \internal Use by Value to create an iterator.
+     */
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-      explicit ValueIterator( const Value::ObjectValues::iterator &current );
+    explicit ValueConstIterator(const Value::ObjectValues::iterator& current);
 #else
-      ValueIterator( const ValueInternalArray::IteratorState &state );
-      ValueIterator( const ValueInternalMap::IteratorState &state );
+    ValueConstIterator(const ValueInternalArray::IteratorState& state);
+    ValueConstIterator(const ValueInternalMap::IteratorState& state);
 #endif
-   public:
-
-      SelfType &operator =( const SelfType &other );
-
-      SelfType operator++( int )
-      {
-         SelfType temp( *this );
-         ++*this;
-         return temp;
-      }
-
-      SelfType operator--( int )
-      {
-         SelfType temp( *this );
-         --*this;
-         return temp;
-      }
-
-      SelfType &operator--()
-      {
-         decrement();
-         return *this;
-      }
-
-      SelfType &operator++()
-      {
-         increment();
-         return *this;
-      }
-
-      reference operator *() const
-      {
-         return deref();
-      }
-   };
+public:
+    SelfType& operator=(const ValueIteratorBase& other);
+
+    SelfType operator++(int)
+    {
+        SelfType temp(*this);
+        ++*this;
+        return temp;
+    }
+
+    SelfType operator--(int)
+    {
+        SelfType temp(*this);
+        --*this;
+        return temp;
+    }
+
+    SelfType& operator--()
+    {
+        decrement();
+        return *this;
+    }
+
+    SelfType& operator++()
+    {
+        increment();
+        return *this;
+    }
+
+    reference operator*() const { return deref(); }
+};
 
+/** \brief Iterator for object and array value.
+ */
+class ValueIterator : public ValueIteratorBase
+{
+    friend class Value;
+
+public:
+    typedef unsigned int size_t;
+    typedef int difference_type;
+    typedef Value& reference;
+    typedef Value* pointer;
+    typedef ValueIterator SelfType;
+
+    ValueIterator();
+    ValueIterator(const ValueConstIterator& other);
+    ValueIterator(const ValueIterator& other);
+
+private:
+    /*! \internal Use by Value to create an iterator.
+     */
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
+    explicit ValueIterator(const Value::ObjectValues::iterator& current);
+#else
+    ValueIterator(const ValueInternalArray::IteratorState& state);
+    ValueIterator(const ValueInternalMap::IteratorState& state);
+#endif
+public:
+    SelfType& operator=(const SelfType& other);
+
+    SelfType operator++(int)
+    {
+        SelfType temp(*this);
+        ++*this;
+        return temp;
+    }
+
+    SelfType operator--(int)
+    {
+        SelfType temp(*this);
+        --*this;
+        return temp;
+    }
+
+    SelfType& operator--()
+    {
+        decrement();
+        return *this;
+    }
+
+    SelfType& operator++()
+    {
+        increment();
+        return *this;
+    }
+
+    reference operator*() const { return deref(); }
+};
 
 } // namespace Json
 
-
 #endif // CPPTL_JSON_H_INCLUDED
diff --git a/ext_libs/json/json/writer.h b/ext_libs/json/json/writer.h
old mode 100755
new mode 100644
index d04ecbf2..3f94cd58
--- a/ext_libs/json/json/writer.h
+++ b/ext_libs/json/json/writer.h
@@ -4,176 +4,174 @@
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 #ifndef JSON_WRITER_H_INCLUDED
-# define JSON_WRITER_H_INCLUDED
-
-# include "value.h"
-# include <vector>
-# include <string>
-# include <iostream>
-
-namespace Json {
-
-   class Value;
-
-   /** \brief Abstract class for writers.
-    */
-   class JSON_API Writer
-   {
-   public:
-      virtual ~Writer();
-
-      virtual std::string write( const Value &root, bool noNewLine=false ) = 0;
-   };
-
-   /** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
-    *
-    * The JSON document is written in a single line. It is not intended for 'human' consumption,
-    * but may be usefull to support feature such as RPC where bandwith is limited.
-    * \sa Reader, Value
-    */
-   class JSON_API FastWriter : public Writer
-   {
-   public:
-      FastWriter();
-      virtual ~FastWriter(){}
-
-      void enableYAMLCompatibility();
-
-   public: // overridden from Writer
-      virtual std::string write( const Value &root, bool noNewLine=false );
-
-   private:
-      void writeValue( const Value &value );
-
-      std::string document_;
-      bool yamlCompatiblityEnabled_;
-   };
-
-   /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
-    *
-    * The rules for line break and indent are as follow:
-    * - Object value:
-    *     - if empty then print {} without indent and line break
-    *     - if not empty the print '{', line break & indent, print one value per line
-    *       and then unindent and line break and print '}'.
-    * - Array value:
-    *     - if empty then print [] without indent and line break
-    *     - if the array contains no object value, empty array or some other value types,
-    *       and all the values fit on one lines, then print the array on a single line.
-    *     - otherwise, it the values do not fit on one line, or the array contains
-    *       object or non empty array, then print one value per line.
-    *
-    * If the Value have comments then they are outputed according to their #CommentPlacement.
-    *
-    * \sa Reader, Value, Value::setComment()
-    */
-   class JSON_API StyledWriter: public Writer
-   {
-   public:
-      StyledWriter();
-      virtual ~StyledWriter(){}
-
-   public: // overridden from Writer
-      /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-       * \param root Value to serialize.
-       * \return String containing the JSON document that represents the root value.
-       */
-      virtual std::string write( const Value &root, bool noNewLine=false  );
-
-   private:
-      void writeValue( const Value &value );
-      void writeArrayValue( const Value &value );
-      bool isMultineArray( const Value &value );
-      void pushValue( const std::string &value );
-      void writeIndent();
-      void writeWithIndent( const std::string &value );
-      void indent();
-      void unindent();
-      void writeCommentBeforeValue( const Value &root );
-      void writeCommentAfterValueOnSameLine( const Value &root );
-      bool hasCommentForValue( const Value &value );
-      static std::string normalizeEOL( const std::string &text );
-
-      typedef std::vector<std::string> ChildValues;
-
-      ChildValues childValues_;
-      std::string document_;
-      std::string indentString_;
-      int rightMargin_;
-      int indentSize_;
-      bool addChildValues_;
-   };
-
-   /** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
-        to a stream rather than to a string.
-    *
-    * The rules for line break and indent are as follow:
-    * - Object value:
-    *     - if empty then print {} without indent and line break
-    *     - if not empty the print '{', line break & indent, print one value per line
-    *       and then unindent and line break and print '}'.
-    * - Array value:
-    *     - if empty then print [] without indent and line break
-    *     - if the array contains no object value, empty array or some other value types,
-    *       and all the values fit on one lines, then print the array on a single line.
-    *     - otherwise, it the values do not fit on one line, or the array contains
-    *       object or non empty array, then print one value per line.
-    *
-    * If the Value have comments then they are outputed according to their #CommentPlacement.
-    *
-    * \param indentation Each level will be indented by this amount extra.
-    * \sa Reader, Value, Value::setComment()
-    */
-   class JSON_API StyledStreamWriter
-   {
-   public:
-      StyledStreamWriter( std::string indentation="\t");
-      ~StyledStreamWriter(){}
-
-   public:
-      /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-       * \param out Stream to write to. (Can be ostringstream, e.g.)
-       * \param root Value to serialize.
-       * \note There is no point in deriving from Writer, since write() should not return a value.
-       */
-      void write( std::ostream &out, const Value &root, bool noNewLine=false );
-
-   private:
-      void writeValue( const Value &value );
-      void writeArrayValue( const Value &value );
-      bool isMultineArray( const Value &value );
-      void pushValue( const std::string &value );
-      void writeIndent();
-      void writeWithIndent( const std::string &value );
-      void indent();
-      void unindent();
-      void writeCommentBeforeValue( const Value &root );
-      void writeCommentAfterValueOnSameLine( const Value &root );
-      bool hasCommentForValue( const Value &value );
-      static std::string normalizeEOL( const std::string &text );
-
-      typedef std::vector<std::string> ChildValues;
-
-      ChildValues childValues_;
-      std::ostream* document_;
-      std::string indentString_;
-      int rightMargin_;
-      std::string indentation_;
-      bool addChildValues_;
-   };
-
-   std::string JSON_API valueToString( Int value );
-   std::string JSON_API valueToString( UInt value );
-   std::string JSON_API valueToString( double value );
-   std::string JSON_API valueToString( bool value );
-   std::string JSON_API valueToQuotedString( const char *value );
-
-   /// \brief Output using the StyledStreamWriter.
-   /// \see Json::operator>>()
-   std::ostream& operator<<( std::ostream&, const Value &root );
+#define JSON_WRITER_H_INCLUDED
+
+#include "value.h"
+#include <vector>
+#include <string>
+#include <iostream>
+
+namespace Json
+{
+class Value;
+
+/** \brief Abstract class for writers.
+ */
+class JSON_API Writer
+{
+public:
+    virtual ~Writer();
+
+    virtual std::string write(const Value& root, bool noNewLine = false) = 0;
+};
+
+/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
+ *
+ * The JSON document is written in a single line. It is not intended for 'human' consumption,
+ * but may be usefull to support feature such as RPC where bandwith is limited.
+ * \sa Reader, Value
+ */
+class JSON_API FastWriter : public Writer
+{
+public:
+    FastWriter();
+    virtual ~FastWriter() {}
+
+    void enableYAMLCompatibility();
+
+public: // overridden from Writer
+    virtual std::string write(const Value& root, bool noNewLine = false);
+
+private:
+    void writeValue(const Value& value);
+
+    std::string document_;
+    bool yamlCompatiblityEnabled_;
+};
+
+/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
+ *
+ * The rules for line break and indent are as follow:
+ * - Object value:
+ *     - if empty then print {} without indent and line break
+ *     - if not empty the print '{', line break & indent, print one value per line
+ *       and then unindent and line break and print '}'.
+ * - Array value:
+ *     - if empty then print [] without indent and line break
+ *     - if the array contains no object value, empty array or some other value types,
+ *       and all the values fit on one lines, then print the array on a single line.
+ *     - otherwise, it the values do not fit on one line, or the array contains
+ *       object or non empty array, then print one value per line.
+ *
+ * If the Value have comments then they are outputed according to their #CommentPlacement.
+ *
+ * \sa Reader, Value, Value::setComment()
+ */
+class JSON_API StyledWriter : public Writer
+{
+public:
+    StyledWriter();
+    virtual ~StyledWriter() {}
+
+public: // overridden from Writer
+    /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
+     * \param root Value to serialize.
+     * \return String containing the JSON document that represents the root value.
+     */
+    virtual std::string write(const Value& root, bool noNewLine = false);
+
+private:
+    void writeValue(const Value& value);
+    void writeArrayValue(const Value& value);
+    bool isMultineArray(const Value& value);
+    void pushValue(const std::string& value);
+    void writeIndent();
+    void writeWithIndent(const std::string& value);
+    void indent();
+    void unindent();
+    void writeCommentBeforeValue(const Value& root);
+    void writeCommentAfterValueOnSameLine(const Value& root);
+    bool hasCommentForValue(const Value& value);
+    static std::string normalizeEOL(const std::string& text);
+
+    typedef std::vector<std::string> ChildValues;
+
+    ChildValues childValues_;
+    std::string document_;
+    std::string indentString_;
+    int rightMargin_;
+    int indentSize_;
+    bool addChildValues_;
+};
+
+/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
+     to a stream rather than to a string.
+ *
+ * The rules for line break and indent are as follow:
+ * - Object value:
+ *     - if empty then print {} without indent and line break
+ *     - if not empty the print '{', line break & indent, print one value per line
+ *       and then unindent and line break and print '}'.
+ * - Array value:
+ *     - if empty then print [] without indent and line break
+ *     - if the array contains no object value, empty array or some other value types,
+ *       and all the values fit on one lines, then print the array on a single line.
+ *     - otherwise, it the values do not fit on one line, or the array contains
+ *       object or non empty array, then print one value per line.
+ *
+ * If the Value have comments then they are outputed according to their #CommentPlacement.
+ *
+ * \param indentation Each level will be indented by this amount extra.
+ * \sa Reader, Value, Value::setComment()
+ */
+class JSON_API StyledStreamWriter
+{
+public:
+    StyledStreamWriter(std::string indentation = "\t");
+    ~StyledStreamWriter() {}
+
+public:
+    /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
+     * \param out Stream to write to. (Can be ostringstream, e.g.)
+     * \param root Value to serialize.
+     * \note There is no point in deriving from Writer, since write() should not return a value.
+     */
+    void write(std::ostream& out, const Value& root, bool noNewLine = false);
+
+private:
+    void writeValue(const Value& value);
+    void writeArrayValue(const Value& value);
+    bool isMultineArray(const Value& value);
+    void pushValue(const std::string& value);
+    void writeIndent();
+    void writeWithIndent(const std::string& value);
+    void indent();
+    void unindent();
+    void writeCommentBeforeValue(const Value& root);
+    void writeCommentAfterValueOnSameLine(const Value& root);
+    bool hasCommentForValue(const Value& value);
+    static std::string normalizeEOL(const std::string& text);
+
+    typedef std::vector<std::string> ChildValues;
+
+    ChildValues childValues_;
+    std::ostream* document_;
+    std::string indentString_;
+    int rightMargin_;
+    std::string indentation_;
+    bool addChildValues_;
+};
+
+std::string JSON_API valueToString(Int value);
+std::string JSON_API valueToString(UInt value);
+std::string JSON_API valueToString(double value);
+std::string JSON_API valueToString(bool value);
+std::string JSON_API valueToQuotedString(const char* value);
+
+/// \brief Output using the StyledStreamWriter.
+/// \see Json::operator>>()
+std::ostream& operator<<(std::ostream&, const Value& root);
 
 } // namespace Json
 
-
-
 #endif // JSON_WRITER_H_INCLUDED
diff --git a/ext_libs/json/json_batchallocator.h b/ext_libs/json/json_batchallocator.h
index 01e7139c..5e64f79f 100644
--- a/ext_libs/json/json_batchallocator.h
+++ b/ext_libs/json/json_batchallocator.h
@@ -4,15 +4,15 @@
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 #ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
-# define JSONCPP_BATCHALLOCATOR_H_INCLUDED
+#define JSONCPP_BATCHALLOCATOR_H_INCLUDED
 
-# include <stdlib.h>
-# include <assert.h>
+#include <stdlib.h>
+#include <assert.h>
 
-# ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-namespace Json {
+#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
+namespace Json
+{
 /* Fast memory allocator.
  *
  * This memory allocator allocates memory for a batch of object (specified by
@@ -25,106 +25,102 @@ namespace Json {
  * The in-place new operator must be used to construct the object using the pointer
  * returned by allocate.
  */
-template<typename AllocatedType
-        ,const unsigned int objectPerAllocation>
+template<typename AllocatedType, const unsigned int objectPerAllocation>
 class BatchAllocator
 {
 public:
-   typedef AllocatedType Type;
-
-   BatchAllocator( unsigned int objectsPerPage = 255 )
-      : freeHead_( 0 )
-      , objectsPerPage_( objectsPerPage )
-   {
-//      printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
-      assert( sizeof(AllocatedType) * objectPerAllocation >= sizeof(AllocatedType *) ); // We must be able to store a slist in the object free space.
-      assert( objectsPerPage >= 16 );
-      batches_ = allocateBatch( 0 );   // allocated a dummy page
-      currentBatch_ = batches_;
-   }
-
-   ~BatchAllocator()
-   {
-      for ( BatchInfo *batch = batches_; batch;  )
-      {
-         BatchInfo *nextBatch = batch->next_;
-         free( batch );
-         batch = nextBatch;
-      }
-   }
-
-   /// allocate space for an array of objectPerAllocation object.
-   /// @warning it is the responsability of the caller to call objects constructors.
-   AllocatedType *allocate()
-   {
-      if ( freeHead_ ) // returns node from free list.
-      {
-         AllocatedType *object = freeHead_;
-         freeHead_ = *(AllocatedType **)object;
-         return object;
-      }
-      if ( currentBatch_->used_ == currentBatch_->end_ )
-      {
-         currentBatch_ = currentBatch_->next_;
-         while ( currentBatch_  &&  currentBatch_->used_ == currentBatch_->end_ )
+    typedef AllocatedType Type;
+
+    BatchAllocator(unsigned int objectsPerPage = 255) : freeHead_(0), objectsPerPage_(objectsPerPage)
+    {
+        //      printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
+        assert(sizeof(AllocatedType) * objectPerAllocation >=
+               sizeof(AllocatedType*)); // We must be able to store a slist in the object free space.
+        assert(objectsPerPage >= 16);
+        batches_ = allocateBatch(0); // allocated a dummy page
+        currentBatch_ = batches_;
+    }
+
+    ~BatchAllocator()
+    {
+        for (BatchInfo* batch = batches_; batch;)
+        {
+            BatchInfo* nextBatch = batch->next_;
+            free(batch);
+            batch = nextBatch;
+        }
+    }
+
+    /// allocate space for an array of objectPerAllocation object.
+    /// @warning it is the responsability of the caller to call objects constructors.
+    AllocatedType* allocate()
+    {
+        if (freeHead_) // returns node from free list.
+        {
+            AllocatedType* object = freeHead_;
+            freeHead_ = *(AllocatedType**)object;
+            return object;
+        }
+        if (currentBatch_->used_ == currentBatch_->end_)
+        {
             currentBatch_ = currentBatch_->next_;
-
-         if ( !currentBatch_  ) // no free batch found, allocate a new one
-         {
-            currentBatch_ = allocateBatch( objectsPerPage_ );
-            currentBatch_->next_ = batches_; // insert at the head of the list
-            batches_ = currentBatch_;
-         }
-      }
-      AllocatedType *allocated = currentBatch_->used_;
-      currentBatch_->used_ += objectPerAllocation;
-      return allocated;
-   }
-
-   /// Release the object.
-   /// @warning it is the responsability of the caller to actually destruct the object.
-   void release( AllocatedType *object )
-   {
-      assert( object != 0 );
-      *(AllocatedType **)object = freeHead_;
-      freeHead_ = object;
-   }
+            while (currentBatch_ && currentBatch_->used_ == currentBatch_->end_)
+                currentBatch_ = currentBatch_->next_;
+
+            if (!currentBatch_) // no free batch found, allocate a new one
+            {
+                currentBatch_ = allocateBatch(objectsPerPage_);
+                currentBatch_->next_ = batches_; // insert at the head of the list
+                batches_ = currentBatch_;
+            }
+        }
+        AllocatedType* allocated = currentBatch_->used_;
+        currentBatch_->used_ += objectPerAllocation;
+        return allocated;
+    }
+
+    /// Release the object.
+    /// @warning it is the responsability of the caller to actually destruct the object.
+    void release(AllocatedType* object)
+    {
+        assert(object != 0);
+        *(AllocatedType**)object = freeHead_;
+        freeHead_ = object;
+    }
 
 private:
-   struct BatchInfo
-   {
-      BatchInfo *next_;
-      AllocatedType *used_;
-      AllocatedType *end_;
-      AllocatedType buffer_[objectPerAllocation];
-   };
-
-   // disabled copy constructor and assignement operator.
-   BatchAllocator( const BatchAllocator & );
-   void operator =( const BatchAllocator &);
-
-   static BatchInfo *allocateBatch( unsigned int objectsPerPage )
-   {
-      const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType)* objectPerAllocation
-                                + sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
-      BatchInfo *batch = static_cast<BatchInfo*>( malloc( mallocSize ) );
-      batch->next_ = 0;
-      batch->used_ = batch->buffer_;
-      batch->end_ = batch->buffer_ + objectsPerPage;
-      return batch;
-   }
-
-   BatchInfo *batches_;
-   BatchInfo *currentBatch_;
-   /// Head of a single linked list within the allocated space of freeed object
-   AllocatedType *freeHead_;
-   unsigned int objectsPerPage_;
+    struct BatchInfo
+    {
+        BatchInfo* next_;
+        AllocatedType* used_;
+        AllocatedType* end_;
+        AllocatedType buffer_[objectPerAllocation];
+    };
+
+    // disabled copy constructor and assignement operator.
+    BatchAllocator(const BatchAllocator&);
+    void operator=(const BatchAllocator&);
+
+    static BatchInfo* allocateBatch(unsigned int objectsPerPage)
+    {
+        const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType) * objectPerAllocation +
+                                        sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
+        BatchInfo* batch = static_cast<BatchInfo*>(malloc(mallocSize));
+        batch->next_ = 0;
+        batch->used_ = batch->buffer_;
+        batch->end_ = batch->buffer_ + objectsPerPage;
+        return batch;
+    }
+
+    BatchInfo* batches_;
+    BatchInfo* currentBatch_;
+    /// Head of a single linked list within the allocated space of freeed object
+    AllocatedType* freeHead_;
+    unsigned int objectsPerPage_;
 };
 
-
 } // namespace Json
 
-# endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
+#endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
 
 #endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
-
diff --git a/ext_libs/json/json_reader.cpp b/ext_libs/json/json_reader.cpp
index e7c40988..c290bdff 100644
--- a/ext_libs/json/json_reader.cpp
+++ b/ext_libs/json/json_reader.cpp
@@ -12,881 +12,775 @@
 #include <iostream>
 #include <stdexcept>
 
-#if _MSC_VER >= 1400 // VC++ 8.0
-#pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
+#if _MSC_VER >= 1400            // VC++ 8.0
+#pragma warning(disable : 4996) // disable warning about strdup being deprecated.
 #endif
 
-namespace Json {
-
+namespace Json
+{
 // Implementation of class Features
 // ////////////////////////////////
 
-Features::Features()
-   : allowComments_( true )
-   , strictRoot_( false )
-{
-}
-
+Features::Features() : allowComments_(true), strictRoot_(false) {}
 
-Features
-Features::all()
+Features Features::all()
 {
-   return Features();
+    return Features();
 }
 
-
-Features
-Features::strictMode()
+Features Features::strictMode()
 {
-   Features features;
-   features.allowComments_ = false;
-   features.strictRoot_ = true;
-   return features;
+    Features features;
+    features.allowComments_ = false;
+    features.strictRoot_ = true;
+    return features;
 }
 
 // Implementation of class Reader
 // ////////////////////////////////
 
-
-static inline bool
-in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4 )
+static inline bool in(Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4)
 {
-   return c == c1  ||  c == c2  ||  c == c3  ||  c == c4;
+    return c == c1 || c == c2 || c == c3 || c == c4;
 }
 
 static inline bool
-in( Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5 )
+  in(Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5)
 {
-   return c == c1  ||  c == c2  ||  c == c3  ||  c == c4  ||  c == c5;
+    return c == c1 || c == c2 || c == c3 || c == c4 || c == c5;
 }
 
-
-static bool
-containsNewLine( Reader::Location begin,
-                 Reader::Location end )
+static bool containsNewLine(Reader::Location begin, Reader::Location end)
 {
-   for ( ;begin < end; ++begin )
-      if ( *begin == '\n'  ||  *begin == '\r' )
-         return true;
-   return false;
+    for (; begin < end; ++begin)
+        if (*begin == '\n' || *begin == '\r')
+            return true;
+    return false;
 }
 
 static std::string codePointToUTF8(unsigned int cp)
 {
-   std::string result;
-
-   // based on description from http://en.wikipedia.org/wiki/UTF-8
-
-   if (cp <= 0x7f)
-   {
-      result.resize(1);
-      result[0] = static_cast<char>(cp);
-   }
-   else if (cp <= 0x7FF)
-   {
-      result.resize(2);
-      result[1] = static_cast<char>(0x80 | (0x3f & cp));
-      result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
-   }
-   else if (cp <= 0xFFFF)
-   {
-      result.resize(3);
-      result[2] = static_cast<char>(0x80 | (0x3f & cp));
-      result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
-      result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
-   }
-   else if (cp <= 0x10FFFF)
-   {
-      result.resize(4);
-      result[3] = static_cast<char>(0x80 | (0x3f & cp));
-      result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-      result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
-      result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
-   }
-
-   return result;
+    std::string result;
+
+    // based on description from http://en.wikipedia.org/wiki/UTF-8
+
+    if (cp <= 0x7f)
+    {
+        result.resize(1);
+        result[0] = static_cast<char>(cp);
+    }
+    else if (cp <= 0x7FF)
+    {
+        result.resize(2);
+        result[1] = static_cast<char>(0x80 | (0x3f & cp));
+        result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
+    }
+    else if (cp <= 0xFFFF)
+    {
+        result.resize(3);
+        result[2] = static_cast<char>(0x80 | (0x3f & cp));
+        result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
+        result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
+    }
+    else if (cp <= 0x10FFFF)
+    {
+        result.resize(4);
+        result[3] = static_cast<char>(0x80 | (0x3f & cp));
+        result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
+        result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
+        result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
+    }
+
+    return result;
 }
 
-
 // Class Reader
 // //////////////////////////////////////////////////////////////////
 
-Reader::Reader()
-   : features_( Features::all() )
-{
+Reader::Reader() : features_(Features::all()) {}
+
+Reader::Reader(const Features& features) : features_(features) {}
+
+bool Reader::parse(const std::string& document, Value& root, bool collectComments)
+{
+    document_ = document;
+    const char* begin = document_.c_str();
+    const char* end = begin + document_.length();
+    return parse(begin, end, root, collectComments);
+}
+
+bool Reader::parse(std::istream& sin, Value& root, bool collectComments)
+{
+    // std::istream_iterator<char> begin(sin);
+    // std::istream_iterator<char> end;
+    // Those would allow streamed input from a file, if parse() were a
+    // template function.
+
+    // Since std::string is reference-counted, this at least does not
+    // create an extra copy.
+    std::string doc;
+    std::getline(sin, doc, (char)EOF);
+    return parse(doc, root, collectComments);
+}
+
+bool Reader::parse(const char* beginDoc, const char* endDoc, Value& root, bool collectComments)
+{
+    if (!features_.allowComments_)
+    {
+        collectComments = false;
+    }
+
+    begin_ = beginDoc;
+    end_ = endDoc;
+    collectComments_ = collectComments;
+    current_ = begin_;
+    lastValueEnd_ = 0;
+    lastValue_ = 0;
+    commentsBefore_ = "";
+    errors_.clear();
+    while (!nodes_.empty())
+        nodes_.pop();
+    nodes_.push(&root);
+
+    bool successful = readValue();
+    Token token;
+    skipCommentTokens(token);
+    if (collectComments_ && !commentsBefore_.empty())
+        root.setComment(commentsBefore_, commentAfter);
+    if (features_.strictRoot_)
+    {
+        if (!root.isArray() && !root.isObject())
+        {
+            // Set error location to start of doc, ideally should be first token found in doc
+            token.type_ = tokenError;
+            token.start_ = beginDoc;
+            token.end_ = endDoc;
+            addError("A valid JSON document must be either an array or an object value.", token);
+            return false;
+        }
+    }
+    return successful;
 }
 
-
-Reader::Reader( const Features &features )
-   : features_( features )
+bool Reader::readValue()
 {
-}
-
-
-bool
-Reader::parse( const std::string &document,
-               Value &root,
-               bool collectComments )
-{
-   document_ = document;
-   const char *begin = document_.c_str();
-   const char *end = begin + document_.length();
-   return parse( begin, end, root, collectComments );
-}
-
-
-bool
-Reader::parse( std::istream& sin,
-               Value &root,
-               bool collectComments )
-{
-   //std::istream_iterator<char> begin(sin);
-   //std::istream_iterator<char> end;
-   // Those would allow streamed input from a file, if parse() were a
-   // template function.
-
-   // Since std::string is reference-counted, this at least does not
-   // create an extra copy.
-   std::string doc;
-   std::getline(sin, doc, (char)EOF);
-   return parse( doc, root, collectComments );
-}
-
-bool
-Reader::parse( const char *beginDoc, const char *endDoc,
-               Value &root,
-               bool collectComments )
-{
-   if ( !features_.allowComments_ )
-   {
-      collectComments = false;
-   }
-
-   begin_ = beginDoc;
-   end_ = endDoc;
-   collectComments_ = collectComments;
-   current_ = begin_;
-   lastValueEnd_ = 0;
-   lastValue_ = 0;
-   commentsBefore_ = "";
-   errors_.clear();
-   while ( !nodes_.empty() )
-      nodes_.pop();
-   nodes_.push( &root );
-
-   bool successful = readValue();
-   Token token;
-   skipCommentTokens( token );
-   if ( collectComments_  &&  !commentsBefore_.empty() )
-      root.setComment( commentsBefore_, commentAfter );
-   if ( features_.strictRoot_ )
-   {
-      if ( !root.isArray()  &&  !root.isObject() )
-      {
-         // Set error location to start of doc, ideally should be first token found in doc
-         token.type_ = tokenError;
-         token.start_ = beginDoc;
-         token.end_ = endDoc;
-         addError( "A valid JSON document must be either an array or an object value.",
-                   token );
-         return false;
-      }
-   }
-   return successful;
-}
-
-
-bool
-Reader::readValue()
-{
-   Token token;
-   skipCommentTokens( token );
-   bool successful = true;
-
-   if ( collectComments_  &&  !commentsBefore_.empty() )
-   {
-      currentValue().setComment( commentsBefore_, commentBefore );
-      commentsBefore_ = "";
-   }
-
-
-   switch ( token.type_ )
-   {
-   case tokenObjectBegin:
-      successful = readObject( token );
-      break;
-   case tokenArrayBegin:
-      successful = readArray( token );
-      break;
-   case tokenNumber:
-      successful = decodeNumber( token );
-      break;
-   case tokenString:
-      successful = decodeString( token );
-      break;
-   case tokenTrue:
-      currentValue() = true;
-      break;
-   case tokenFalse:
-      currentValue() = false;
-      break;
-   case tokenNull:
-      currentValue() = Value();
-      break;
-   default:
-      return addError( "Syntax error: value, object or array expected.", token );
-   }
-
-   if ( collectComments_ )
-   {
-      lastValueEnd_ = current_;
-      lastValue_ = &currentValue();
-   }
-
-   return successful;
-}
-
-
-void
-Reader::skipCommentTokens( Token &token )
-{
-   if ( features_.allowComments_ )
-   {
-      do
-      {
-         readToken( token );
-      }
-      while ( token.type_ == tokenComment );
-   }
-   else
-   {
-      readToken( token );
-   }
-}
-
-
-bool
-Reader::expectToken( TokenType type, Token &token, const char *message )
-{
-   readToken( token );
-   if ( token.type_ != type )
-      return addError( message, token );
-   return true;
-}
-
-
-bool
-Reader::readToken( Token &token )
-{
-   skipSpaces();
-   token.start_ = current_;
-   Char c = getNextChar();
-   bool ok = true;
-   switch ( c )
-   {
-   case '{':
-      token.type_ = tokenObjectBegin;
-      break;
-   case '}':
-      token.type_ = tokenObjectEnd;
-      break;
-   case '[':
-      token.type_ = tokenArrayBegin;
-      break;
-   case ']':
-      token.type_ = tokenArrayEnd;
-      break;
-   case '"':
-      token.type_ = tokenString;
-      ok = readString();
-      break;
-   case '/':
-      token.type_ = tokenComment;
-      ok = readComment();
-      break;
-   case '0':
-   case '1':
-   case '2':
-   case '3':
-   case '4':
-   case '5':
-   case '6':
-   case '7':
-   case '8':
-   case '9':
-   case '-':
-      token.type_ = tokenNumber;
-      readNumber();
-      break;
-   case 't':
-      token.type_ = tokenTrue;
-      ok = match( "rue", 3 );
-      break;
-   case 'f':
-      token.type_ = tokenFalse;
-      ok = match( "alse", 4 );
-      break;
-   case 'n':
-      token.type_ = tokenNull;
-      ok = match( "ull", 3 );
-      break;
-   case ',':
-      token.type_ = tokenArraySeparator;
-      break;
-   case ':':
-      token.type_ = tokenMemberSeparator;
-      break;
-   case 0:
-      token.type_ = tokenEndOfStream;
-      break;
-   default:
-      ok = false;
-      break;
-   }
-   if ( !ok )
-      token.type_ = tokenError;
-   token.end_ = current_;
-   return true;
-}
-
-
-void
-Reader::skipSpaces()
-{
-   while ( current_ != end_ )
-   {
-      Char c = *current_;
-      if ( c == ' '  ||  c == '\t'  ||  c == '\r'  ||  c == '\n' )
-         ++current_;
-      else
-         break;
-   }
-}
-
-
-bool
-Reader::match( Location pattern,
-               int patternLength )
-{
-   if ( end_ - current_ < patternLength )
-      return false;
-   int index = patternLength;
-   while ( index-- )
-      if ( current_[index] != pattern[index] )
-         return false;
-   current_ += patternLength;
-   return true;
-}
-
-
-bool
-Reader::readComment()
-{
-   Location commentBegin = current_ - 1;
-   Char c = getNextChar();
-   bool successful = false;
-   if ( c == '*' )
-      successful = readCStyleComment();
-   else if ( c == '/' )
-      successful = readCppStyleComment();
-   if ( !successful )
-      return false;
-
-   if ( collectComments_ )
-   {
-      CommentPlacement placement = commentBefore;
-      if ( lastValueEnd_  &&  !containsNewLine( lastValueEnd_, commentBegin ) )
-      {
-         if ( c != '*'  ||  !containsNewLine( commentBegin, current_ ) )
-            placement = commentAfterOnSameLine;
-      }
-
-      addComment( commentBegin, current_, placement );
-   }
-   return true;
-}
-
-
-void
-Reader::addComment( Location begin,
-                    Location end,
-                    CommentPlacement placement )
-{
-   assert( collectComments_ );
-   if ( placement == commentAfterOnSameLine )
-   {
-      assert( lastValue_ != 0 );
-      lastValue_->setComment( std::string( begin, end ), placement );
-   }
-   else
-   {
-      if ( !commentsBefore_.empty() )
-         commentsBefore_ += "\n";
-      commentsBefore_ += std::string( begin, end );
-   }
-}
-
-
-bool
-Reader::readCStyleComment()
-{
-   while ( current_ != end_ )
-   {
-      Char c = getNextChar();
-      if ( c == '*'  &&  *current_ == '/' )
-         break;
-   }
-   return getNextChar() == '/';
-}
-
-
-bool
-Reader::readCppStyleComment()
-{
-   while ( current_ != end_ )
-   {
-      Char c = getNextChar();
-      if (  c == '\r'  ||  c == '\n' )
-         break;
-   }
-   return true;
-}
-
-
-void
-Reader::readNumber()
-{
-   while ( current_ != end_ )
-   {
-      if ( !(*current_ >= '0'  &&  *current_ <= '9')  &&
-           !in( *current_, '.', 'e', 'E', '+', '-' ) )
-         break;
-      ++current_;
-   }
-}
-
-bool
-Reader::readString()
-{
-   Char c = 0;
-   while ( current_ != end_ )
-   {
-      c = getNextChar();
-      if ( c == '\\' )
-         getNextChar();
-      else if ( c == '"' )
-         break;
-   }
-   return c == '"';
-}
-
-
-bool
-Reader::readObject( Token &tokenStart )
-{
-   Token tokenName;
-   std::string name;
-   currentValue() = Value( objectValue );
-   (void) tokenStart;
-   while ( readToken( tokenName ) )
-   {
-      bool initialTokenOk = true;
-      while ( tokenName.type_ == tokenComment  &&  initialTokenOk )
-         initialTokenOk = readToken( tokenName );
-      if  ( !initialTokenOk )
-         break;
-      if ( tokenName.type_ == tokenObjectEnd  &&  name.empty() )  // empty object
-         return true;
-      if ( tokenName.type_ != tokenString )
-         break;
-
-      name = "";
-      if ( !decodeString( tokenName, name ) )
-         return recoverFromError( tokenObjectEnd );
-
-      Token colon;
-      if ( !readToken( colon ) ||  colon.type_ != tokenMemberSeparator )
-      {
-         return addErrorAndRecover( "Missing ':' after object member name",
-                                    colon,
-                                    tokenObjectEnd );
-      }
-      Value &value = currentValue()[ name ];
-      nodes_.push( &value );
-      bool ok = readValue();
-      nodes_.pop();
-      if ( !ok ) // error already set
-         return recoverFromError( tokenObjectEnd );
-
-      Token comma;
-      if ( !readToken( comma )
-            ||  ( comma.type_ != tokenObjectEnd  &&
-                  comma.type_ != tokenArraySeparator &&
-		  comma.type_ != tokenComment ) )
-      {
-         return addErrorAndRecover( "Missing ',' or '}' in object declaration",
-                                    comma,
-                                    tokenObjectEnd );
-      }
-      bool finalizeTokenOk = true;
-      while ( comma.type_ == tokenComment &&
-              finalizeTokenOk )
-         finalizeTokenOk = readToken( comma );
-      if ( comma.type_ == tokenObjectEnd )
-         return true;
-   }
-   return addErrorAndRecover( "Missing '}' or object member name",
-                              tokenName,
-                              tokenObjectEnd );
-}
-
-
-bool
-Reader::readArray( Token &tokenStart )
-{
-   currentValue() = Value( arrayValue );
-   skipSpaces();
-   (void) tokenStart;
-   if ( *current_ == ']' ) // empty array
-   {
-      Token endArray;
-      readToken( endArray );
-      return true;
-   }
-   int index = 0;
-   while ( true )
-   {
-      Value &value = currentValue()[ index++ ];
-      nodes_.push( &value );
-      bool ok = readValue();
-      nodes_.pop();
-      if ( !ok ) // error already set
-         return recoverFromError( tokenArrayEnd );
-
-      Token token;
-      // Accept Comment after last item in the array.
-      ok = readToken( token );
-      while ( token.type_ == tokenComment  &&  ok )
-      {
-         ok = readToken( token );
-      }
-      bool badTokenType = ( token.type_ != tokenArraySeparator  &&
-                            token.type_ != tokenArrayEnd );
-      if ( !ok  ||  badTokenType )
-      {
-         return addErrorAndRecover( "Missing ',' or ']' in array declaration",
-                                    token,
-                                    tokenArrayEnd );
-      }
-      if ( token.type_ == tokenArrayEnd )
-         break;
-   }
-   return true;
-}
-
-
-bool
-Reader::decodeNumber( Token &token )
-{
-   bool isDouble = false;
-   for ( Location inspect = token.start_; inspect != token.end_; ++inspect )
-   {
-      isDouble = isDouble
-                 ||  in( *inspect, '.', 'e', 'E', '+' )
-                 ||  ( *inspect == '-'  &&  inspect != token.start_ );
-   }
-   if ( isDouble )
-      return decodeDouble( token );
-   Location current = token.start_;
-   bool isNegative = *current == '-';
-   if ( isNegative )
-      ++current;
-   Value::UInt threshold = (isNegative ? Value::UInt(-Value::minInt)
-                                       : Value::maxUInt) / 10;
-   Value::UInt value = 0;
-   while ( current < token.end_ )
-   {
-      Char c = *current++;
-      if ( c < '0'  ||  c > '9' )
-         return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
-      if ( value >= threshold )
-         return decodeDouble( token );
-      value = value * 10 + Value::UInt(c - '0');
-   }
-   if ( isNegative )
-      currentValue() = -Value::Int( value );
-   else if ( value <= Value::UInt(Value::maxInt) )
-      currentValue() = Value::Int( value );
-   else
-      currentValue() = value;
-   return true;
-}
-
-
-bool
-Reader::decodeDouble( Token &token )
-{
-   double value = 0;
-   const int bufferSize = 32;
-   int count;
-   int length = int(token.end_ - token.start_);
-   if ( length <= bufferSize )
-   {
-      Char buffer[bufferSize];
-      memcpy( buffer, token.start_, length );
-      buffer[length] = 0;
-      count = sscanf( buffer, "%lf", &value );
-   }
-   else
-   {
-      std::string buffer( token.start_, token.end_ );
-      count = sscanf( buffer.c_str(), "%lf", &value );
-   }
-
-   if ( count != 1 )
-      return addError( "'" + std::string( token.start_, token.end_ ) + "' is not a number.", token );
-   currentValue() = value;
-   return true;
-}
-
-
-bool
-Reader::decodeString( Token &token )
-{
-   std::string decoded;
-   if ( !decodeString( token, decoded ) )
-      return false;
-   currentValue() = decoded;
-   return true;
-}
-
-
-bool
-Reader::decodeString( Token &token, std::string &decoded )
-{
-   decoded.reserve( token.end_ - token.start_ - 2 );
-   Location current = token.start_ + 1; // skip '"'
-   Location end = token.end_ - 1;      // do not include '"'
-   while ( current != end )
-   {
-      Char c = *current++;
-      if ( c == '"' )
-         break;
-      else if ( c == '\\' )
-      {
-         if ( current == end )
-            return addError( "Empty escape sequence in string", token, current );
-         Char escape = *current++;
-         switch ( escape )
-         {
-         case '"': decoded += '"'; break;
-         case '/': decoded += '/'; break;
-         case '\\': decoded += '\\'; break;
-         case 'b': decoded += '\b'; break;
-         case 'f': decoded += '\f'; break;
-         case 'n': decoded += '\n'; break;
-         case 'r': decoded += '\r'; break;
-         case 't': decoded += '\t'; break;
-         case 'u':
-            {
-               unsigned int unicode;
-               if ( !decodeUnicodeCodePoint( token, current, end, unicode ) )
-                  return false;
-               decoded += codePointToUTF8(unicode);
-            }
+    Token token;
+    skipCommentTokens(token);
+    bool successful = true;
+
+    if (collectComments_ && !commentsBefore_.empty())
+    {
+        currentValue().setComment(commentsBefore_, commentBefore);
+        commentsBefore_ = "";
+    }
+
+    switch (token.type_)
+    {
+        case tokenObjectBegin:
+            successful = readObject(token);
             break;
-         default:
-            return addError( "Bad escape sequence in string", token, current );
-         }
-      }
-      else
-      {
-         decoded += c;
-      }
-   }
-   return true;
-}
-
-bool
-Reader::decodeUnicodeCodePoint( Token &token,
-                                     Location &current,
-                                     Location end,
-                                     unsigned int &unicode )
-{
-
-   if ( !decodeUnicodeEscapeSequence( token, current, end, unicode ) )
-      return false;
-   if (unicode >= 0xD800 && unicode <= 0xDBFF)
-   {
-      // surrogate pairs
-      if (end - current < 6)
-         return addError( "additional six characters expected to parse unicode surrogate pair.", token, current );
-      unsigned int surrogatePair;
-      if (*(current++) == '\\' && *(current++)== 'u')
-      {
-         if (decodeUnicodeEscapeSequence( token, current, end, surrogatePair ))
-         {
-            unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
-         }
-         else
-            return false;
-      }
-      else
-         return addError( "expecting another \\u token to begin the second half of a unicode surrogate pair", token, current );
-   }
-   return true;
-}
+        case tokenArrayBegin:
+            successful = readArray(token);
+            break;
+        case tokenNumber:
+            successful = decodeNumber(token);
+            break;
+        case tokenString:
+            successful = decodeString(token);
+            break;
+        case tokenTrue:
+            currentValue() = true;
+            break;
+        case tokenFalse:
+            currentValue() = false;
+            break;
+        case tokenNull:
+            currentValue() = Value();
+            break;
+        default:
+            return addError("Syntax error: value, object or array expected.", token);
+    }
 
-bool
-Reader::decodeUnicodeEscapeSequence( Token &token,
-                                     Location &current,
-                                     Location end,
-                                     unsigned int &unicode )
-{
-   if ( end - current < 4 )
-      return addError( "Bad unicode escape sequence in string: four digits expected.", token, current );
-   unicode = 0;
-   for ( int index =0; index < 4; ++index )
-   {
-      Char c = *current++;
-      unicode *= 16;
-      if ( c >= '0'  &&  c <= '9' )
-         unicode += c - '0';
-      else if ( c >= 'a'  &&  c <= 'f' )
-         unicode += c - 'a' + 10;
-      else if ( c >= 'A'  &&  c <= 'F' )
-         unicode += c - 'A' + 10;
-      else
-         return addError( "Bad unicode escape sequence in string: hexadecimal digit expected.", token, current );
-   }
-   return true;
-}
+    if (collectComments_)
+    {
+        lastValueEnd_ = current_;
+        lastValue_ = &currentValue();
+    }
 
+    return successful;
+}
 
-bool
-Reader::addError( const std::string &message,
-                  Token &token,
-                  Location extra )
+void Reader::skipCommentTokens(Token& token)
 {
-   ErrorInfo info;
-   info.token_ = token;
-   info.message_ = message;
-   info.extra_ = extra;
-   errors_.push_back( info );
-   return false;
-}
-
+    if (features_.allowComments_)
+    {
+        do
+        {
+            readToken(token);
+        } while (token.type_ == tokenComment);
+    }
+    else
+    {
+        readToken(token);
+    }
+}
 
-bool
-Reader::recoverFromError( TokenType skipUntilToken )
+bool Reader::expectToken(TokenType type, Token& token, const char* message)
 {
-   int errorCount = int(errors_.size());
-   Token skip;
-   while ( true )
-   {
-      if ( !readToken(skip) )
-         errors_.resize( errorCount ); // discard errors caused by recovery
-      if ( skip.type_ == skipUntilToken  ||  skip.type_ == tokenEndOfStream )
-         break;
-   }
-   errors_.resize( errorCount );
-   return false;
+    readToken(token);
+    if (token.type_ != type)
+        return addError(message, token);
+    return true;
 }
 
-
-bool
-Reader::addErrorAndRecover( const std::string &message,
-                            Token &token,
-                            TokenType skipUntilToken )
+bool Reader::readToken(Token& token)
 {
-   addError( message, token );
-   return recoverFromError( skipUntilToken );
+    skipSpaces();
+    token.start_ = current_;
+    Char c = getNextChar();
+    bool ok = true;
+    switch (c)
+    {
+        case '{':
+            token.type_ = tokenObjectBegin;
+            break;
+        case '}':
+            token.type_ = tokenObjectEnd;
+            break;
+        case '[':
+            token.type_ = tokenArrayBegin;
+            break;
+        case ']':
+            token.type_ = tokenArrayEnd;
+            break;
+        case '"':
+            token.type_ = tokenString;
+            ok = readString();
+            break;
+        case '/':
+            token.type_ = tokenComment;
+            ok = readComment();
+            break;
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+        case '-':
+            token.type_ = tokenNumber;
+            readNumber();
+            break;
+        case 't':
+            token.type_ = tokenTrue;
+            ok = match("rue", 3);
+            break;
+        case 'f':
+            token.type_ = tokenFalse;
+            ok = match("alse", 4);
+            break;
+        case 'n':
+            token.type_ = tokenNull;
+            ok = match("ull", 3);
+            break;
+        case ',':
+            token.type_ = tokenArraySeparator;
+            break;
+        case ':':
+            token.type_ = tokenMemberSeparator;
+            break;
+        case 0:
+            token.type_ = tokenEndOfStream;
+            break;
+        default:
+            ok = false;
+            break;
+    }
+    if (!ok)
+        token.type_ = tokenError;
+    token.end_ = current_;
+    return true;
 }
 
+void Reader::skipSpaces()
+{
+    while (current_ != end_)
+    {
+        Char c = *current_;
+        if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
+            ++current_;
+        else
+            break;
+    }
+}
 
-Value &
-Reader::currentValue()
+bool Reader::match(Location pattern, int patternLength)
 {
-   return *(nodes_.top());
+    if (end_ - current_ < patternLength)
+        return false;
+    int index = patternLength;
+    while (index--)
+        if (current_[index] != pattern[index])
+            return false;
+    current_ += patternLength;
+    return true;
+}
+
+bool Reader::readComment()
+{
+    Location commentBegin = current_ - 1;
+    Char c = getNextChar();
+    bool successful = false;
+    if (c == '*')
+        successful = readCStyleComment();
+    else if (c == '/')
+        successful = readCppStyleComment();
+    if (!successful)
+        return false;
+
+    if (collectComments_)
+    {
+        CommentPlacement placement = commentBefore;
+        if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin))
+        {
+            if (c != '*' || !containsNewLine(commentBegin, current_))
+                placement = commentAfterOnSameLine;
+        }
+
+        addComment(commentBegin, current_, placement);
+    }
+    return true;
+}
+
+void Reader::addComment(Location begin, Location end, CommentPlacement placement)
+{
+    assert(collectComments_);
+    if (placement == commentAfterOnSameLine)
+    {
+        assert(lastValue_ != 0);
+        lastValue_->setComment(std::string(begin, end), placement);
+    }
+    else
+    {
+        if (!commentsBefore_.empty())
+            commentsBefore_ += "\n";
+        commentsBefore_ += std::string(begin, end);
+    }
+}
+
+bool Reader::readCStyleComment()
+{
+    while (current_ != end_)
+    {
+        Char c = getNextChar();
+        if (c == '*' && *current_ == '/')
+            break;
+    }
+    return getNextChar() == '/';
 }
 
+bool Reader::readCppStyleComment()
+{
+    while (current_ != end_)
+    {
+        Char c = getNextChar();
+        if (c == '\r' || c == '\n')
+            break;
+    }
+    return true;
+}
 
-Reader::Char
-Reader::getNextChar()
+void Reader::readNumber()
 {
-   if ( current_ == end_ )
-      return 0;
-   return *current_++;
+    while (current_ != end_)
+    {
+        if (!(*current_ >= '0' && *current_ <= '9') && !in(*current_, '.', 'e', 'E', '+', '-'))
+            break;
+        ++current_;
+    }
 }
 
+bool Reader::readString()
+{
+    Char c = 0;
+    while (current_ != end_)
+    {
+        c = getNextChar();
+        if (c == '\\')
+            getNextChar();
+        else if (c == '"')
+            break;
+    }
+    return c == '"';
+}
+
+bool Reader::readObject(Token& tokenStart)
+{
+    Token tokenName;
+    std::string name;
+    currentValue() = Value(objectValue);
+    (void)tokenStart;
+    while (readToken(tokenName))
+    {
+        bool initialTokenOk = true;
+        while (tokenName.type_ == tokenComment && initialTokenOk)
+            initialTokenOk = readToken(tokenName);
+        if (!initialTokenOk)
+            break;
+        if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
+            return true;
+        if (tokenName.type_ != tokenString)
+            break;
+
+        name = "";
+        if (!decodeString(tokenName, name))
+            return recoverFromError(tokenObjectEnd);
+
+        Token colon;
+        if (!readToken(colon) || colon.type_ != tokenMemberSeparator)
+        {
+            return addErrorAndRecover("Missing ':' after object member name", colon, tokenObjectEnd);
+        }
+        Value& value = currentValue()[name];
+        nodes_.push(&value);
+        bool ok = readValue();
+        nodes_.pop();
+        if (!ok) // error already set
+            return recoverFromError(tokenObjectEnd);
+
+        Token comma;
+        if (!readToken(comma) ||
+            (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator && comma.type_ != tokenComment))
+        {
+            return addErrorAndRecover("Missing ',' or '}' in object declaration", comma, tokenObjectEnd);
+        }
+        bool finalizeTokenOk = true;
+        while (comma.type_ == tokenComment && finalizeTokenOk)
+            finalizeTokenOk = readToken(comma);
+        if (comma.type_ == tokenObjectEnd)
+            return true;
+    }
+    return addErrorAndRecover("Missing '}' or object member name", tokenName, tokenObjectEnd);
+}
+
+bool Reader::readArray(Token& tokenStart)
+{
+    currentValue() = Value(arrayValue);
+    skipSpaces();
+    (void)tokenStart;
+    if (*current_ == ']') // empty array
+    {
+        Token endArray;
+        readToken(endArray);
+        return true;
+    }
+    int index = 0;
+    while (true)
+    {
+        Value& value = currentValue()[index++];
+        nodes_.push(&value);
+        bool ok = readValue();
+        nodes_.pop();
+        if (!ok) // error already set
+            return recoverFromError(tokenArrayEnd);
+
+        Token token;
+        // Accept Comment after last item in the array.
+        ok = readToken(token);
+        while (token.type_ == tokenComment && ok)
+        {
+            ok = readToken(token);
+        }
+        bool badTokenType = (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd);
+        if (!ok || badTokenType)
+        {
+            return addErrorAndRecover("Missing ',' or ']' in array declaration", token, tokenArrayEnd);
+        }
+        if (token.type_ == tokenArrayEnd)
+            break;
+    }
+    return true;
+}
+
+bool Reader::decodeNumber(Token& token)
+{
+    bool isDouble = false;
+    for (Location inspect = token.start_; inspect != token.end_; ++inspect)
+    {
+        isDouble = isDouble || in(*inspect, '.', 'e', 'E', '+') || (*inspect == '-' && inspect != token.start_);
+    }
+    if (isDouble)
+        return decodeDouble(token);
+    Location current = token.start_;
+    bool isNegative = *current == '-';
+    if (isNegative)
+        ++current;
+    Value::UInt threshold = (isNegative ? Value::UInt(-Value::minInt) : Value::maxUInt) / 10;
+    Value::UInt value = 0;
+    while (current < token.end_)
+    {
+        Char c = *current++;
+        if (c < '0' || c > '9')
+            return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token);
+        if (value >= threshold)
+            return decodeDouble(token);
+        value = value * 10 + Value::UInt(c - '0');
+    }
+    if (isNegative)
+        currentValue() = -Value::Int(value);
+    else if (value <= Value::UInt(Value::maxInt))
+        currentValue() = Value::Int(value);
+    else
+        currentValue() = value;
+    return true;
+}
+
+bool Reader::decodeDouble(Token& token)
+{
+    double value = 0;
+    const int bufferSize = 32;
+    int count;
+    int length = int(token.end_ - token.start_);
+    if (length <= bufferSize)
+    {
+        Char buffer[bufferSize];
+        memcpy(buffer, token.start_, length);
+        buffer[length] = 0;
+        count = sscanf(buffer, "%lf", &value);
+    }
+    else
+    {
+        std::string buffer(token.start_, token.end_);
+        count = sscanf(buffer.c_str(), "%lf", &value);
+    }
+
+    if (count != 1)
+        return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token);
+    currentValue() = value;
+    return true;
+}
+
+bool Reader::decodeString(Token& token)
+{
+    std::string decoded;
+    if (!decodeString(token, decoded))
+        return false;
+    currentValue() = decoded;
+    return true;
+}
+
+bool Reader::decodeString(Token& token, std::string& decoded)
+{
+    decoded.reserve(token.end_ - token.start_ - 2);
+    Location current = token.start_ + 1; // skip '"'
+    Location end = token.end_ - 1;       // do not include '"'
+    while (current != end)
+    {
+        Char c = *current++;
+        if (c == '"')
+            break;
+        else if (c == '\\')
+        {
+            if (current == end)
+                return addError("Empty escape sequence in string", token, current);
+            Char escape = *current++;
+            switch (escape)
+            {
+                case '"':
+                    decoded += '"';
+                    break;
+                case '/':
+                    decoded += '/';
+                    break;
+                case '\\':
+                    decoded += '\\';
+                    break;
+                case 'b':
+                    decoded += '\b';
+                    break;
+                case 'f':
+                    decoded += '\f';
+                    break;
+                case 'n':
+                    decoded += '\n';
+                    break;
+                case 'r':
+                    decoded += '\r';
+                    break;
+                case 't':
+                    decoded += '\t';
+                    break;
+                case 'u':
+                {
+                    unsigned int unicode;
+                    if (!decodeUnicodeCodePoint(token, current, end, unicode))
+                        return false;
+                    decoded += codePointToUTF8(unicode);
+                }
+                break;
+                default:
+                    return addError("Bad escape sequence in string", token, current);
+            }
+        }
+        else
+        {
+            decoded += c;
+        }
+    }
+    return true;
+}
+
+bool Reader::decodeUnicodeCodePoint(Token& token, Location& current, Location end, unsigned int& unicode)
+{
+    if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
+        return false;
+    if (unicode >= 0xD800 && unicode <= 0xDBFF)
+    {
+        // surrogate pairs
+        if (end - current < 6)
+            return addError("additional six characters expected to parse unicode surrogate pair.", token, current);
+        unsigned int surrogatePair;
+        if (*(current++) == '\\' && *(current++) == 'u')
+        {
+            if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair))
+            {
+                unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
+            }
+            else
+                return false;
+        }
+        else
+            return addError("expecting another \\u token to begin the second half of a unicode surrogate pair", token,
+                            current);
+    }
+    return true;
+}
+
+bool Reader::decodeUnicodeEscapeSequence(Token& token, Location& current, Location end, unsigned int& unicode)
+{
+    if (end - current < 4)
+        return addError("Bad unicode escape sequence in string: four digits expected.", token, current);
+    unicode = 0;
+    for (int index = 0; index < 4; ++index)
+    {
+        Char c = *current++;
+        unicode *= 16;
+        if (c >= '0' && c <= '9')
+            unicode += c - '0';
+        else if (c >= 'a' && c <= 'f')
+            unicode += c - 'a' + 10;
+        else if (c >= 'A' && c <= 'F')
+            unicode += c - 'A' + 10;
+        else
+            return addError("Bad unicode escape sequence in string: hexadecimal digit expected.", token, current);
+    }
+    return true;
+}
+
+bool Reader::addError(const std::string& message, Token& token, Location extra)
+{
+    ErrorInfo info;
+    info.token_ = token;
+    info.message_ = message;
+    info.extra_ = extra;
+    errors_.push_back(info);
+    return false;
+}
+
+bool Reader::recoverFromError(TokenType skipUntilToken)
+{
+    int errorCount = int(errors_.size());
+    Token skip;
+    while (true)
+    {
+        if (!readToken(skip))
+            errors_.resize(errorCount); // discard errors caused by recovery
+        if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
+            break;
+    }
+    errors_.resize(errorCount);
+    return false;
+}
 
-void
-Reader::getLocationLineAndColumn( Location location,
-                                  int &line,
-                                  int &column ) const
+bool Reader::addErrorAndRecover(const std::string& message, Token& token, TokenType skipUntilToken)
 {
-   Location current = begin_;
-   Location lastLineStart = current;
-   line = 0;
-   while ( current < location  &&  current != end_ )
-   {
-      Char c = *current++;
-      if ( c == '\r' )
-      {
-         if ( *current == '\n' )
-            ++current;
-         lastLineStart = current;
-         ++line;
-      }
-      else if ( c == '\n' )
-      {
-         lastLineStart = current;
-         ++line;
-      }
-   }
-   // column & line start at 1
-   column = int(location - lastLineStart) + 1;
-   ++line;
+    addError(message, token);
+    return recoverFromError(skipUntilToken);
 }
 
+Value& Reader::currentValue()
+{
+    return *(nodes_.top());
+}
 
-std::string
-Reader::getLocationLineAndColumn( Location location ) const
+Reader::Char Reader::getNextChar()
 {
-   int line, column;
-   getLocationLineAndColumn( location, line, column );
-   char buffer[18+16+16+1];
-   sprintf( buffer, "Line %d, Column %d", line, column );
-   return buffer;
+    if (current_ == end_)
+        return 0;
+    return *current_++;
 }
 
+void Reader::getLocationLineAndColumn(Location location, int& line, int& column) const
+{
+    Location current = begin_;
+    Location lastLineStart = current;
+    line = 0;
+    while (current < location && current != end_)
+    {
+        Char c = *current++;
+        if (c == '\r')
+        {
+            if (*current == '\n')
+                ++current;
+            lastLineStart = current;
+            ++line;
+        }
+        else if (c == '\n')
+        {
+            lastLineStart = current;
+            ++line;
+        }
+    }
+    // column & line start at 1
+    column = int(location - lastLineStart) + 1;
+    ++line;
+}
 
-std::string
-Reader::getFormatedErrorMessages() const
+std::string Reader::getLocationLineAndColumn(Location location) const
 {
-   std::string formattedMessage;
-   for ( Errors::const_iterator itError = errors_.begin();
-         itError != errors_.end();
-         ++itError )
-   {
-      const ErrorInfo &error = *itError;
-      formattedMessage += "* " + getLocationLineAndColumn( error.token_.start_ ) + "\n";
-      formattedMessage += "  " + error.message_ + "\n";
-      if ( error.extra_ )
-         formattedMessage += "See " + getLocationLineAndColumn( error.extra_ ) + " for detail.\n";
-   }
-   return formattedMessage;
+    int line, column;
+    getLocationLineAndColumn(location, line, column);
+    char buffer[18 + 16 + 16 + 1];
+    sprintf(buffer, "Line %d, Column %d", line, column);
+    return buffer;
 }
 
+std::string Reader::getFormatedErrorMessages() const
+{
+    std::string formattedMessage;
+    for (Errors::const_iterator itError = errors_.begin(); itError != errors_.end(); ++itError)
+    {
+        const ErrorInfo& error = *itError;
+        formattedMessage += "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
+        formattedMessage += "  " + error.message_ + "\n";
+        if (error.extra_)
+            formattedMessage += "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
+    }
+    return formattedMessage;
+}
 
-std::istream& operator>>( std::istream &sin, Value &root )
+std::istream& operator>>(std::istream& sin, Value& root)
 {
     Json::Reader reader;
     bool ok = reader.parse(sin, root, true);
-    //JSON_ASSERT( ok );
-    if (!ok) throw std::runtime_error(reader.getFormatedErrorMessages());
+    // JSON_ASSERT( ok );
+    if (!ok)
+        throw std::runtime_error(reader.getFormatedErrorMessages());
     return sin;
 }
 
-
 } // namespace Json
diff --git a/ext_libs/json/json_value.cpp b/ext_libs/json/json_value.cpp
index b82d6efe..6f03ee23 100644
--- a/ext_libs/json/json_value.cpp
+++ b/ext_libs/json/json_value.cpp
@@ -11,28 +11,30 @@
 #include <cstring>
 #include <cassert>
 #ifdef JSON_USE_CPPTL
-# include <cpptl/conststring.h>
+#include <cpptl/conststring.h>
 #endif
-#include <cstddef>    // size_t
+#include <cstddef> // size_t
 #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-# include "json_batchallocator.h"
+#include "json_batchallocator.h"
 #endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
 
-#define JSON_ASSERT_UNREACHABLE assert( false )
-#define JSON_ASSERT( condition ) assert( condition );  // @todo <= change this into an exception throw
-#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
-
-namespace Json {
+#define JSON_ASSERT_UNREACHABLE assert(false)
+#define JSON_ASSERT(condition) assert(condition); // @todo <= change this into an exception throw
+#define JSON_ASSERT_MESSAGE(condition, message) \
+    if (!(condition))                           \
+        throw std::runtime_error(message);
 
+namespace Json
+{
 const Value Value::null;
-const Int Value::minInt = Int( ~(UInt(-1)/2) );
-const Int Value::maxInt = Int( UInt(-1)/2 );
+const Int Value::minInt = Int(~(UInt(-1) / 2));
+const Int Value::maxInt = Int(UInt(-1) / 2);
 const UInt Value::maxUInt = UInt(-1);
 
 // A "safe" implementation of strdup. Allow null pointer to be passed.
 // Also avoid warning on msvc80.
 //
-//inline char *safeStringDup( const char *czstring )
+// inline char *safeStringDup( const char *czstring )
 //{
 //   if ( czstring )
 //   {
@@ -44,7 +46,7 @@ const UInt Value::maxUInt = UInt(-1);
 //   return 0;
 //}
 //
-//inline char *safeStringDup( const std::string &str )
+// inline char *safeStringDup( const std::string &str )
 //{
 //   if ( !str.empty() )
 //   {
@@ -57,65 +59,53 @@ const UInt Value::maxUInt = UInt(-1);
 //   return 0;
 //}
 
-ValueAllocator::~ValueAllocator()
-{
-}
+ValueAllocator::~ValueAllocator() {}
 
 class DefaultValueAllocator : public ValueAllocator
 {
 public:
-   virtual ~DefaultValueAllocator()
-   {
-   }
-
-   virtual char *makeMemberName( const char *memberName )
-   {
-      return duplicateStringValue( memberName );
-   }
-
-   virtual void releaseMemberName( char *memberName )
-   {
-      releaseStringValue( memberName );
-   }
-
-   virtual char *duplicateStringValue( const char *value,
-                                       unsigned int length = unknown )
-   {
-      //@todo invesgate this old optimization
-      //if ( !value  ||  value[0] == 0 )
-      //   return 0;
-
-      if ( length == unknown )
-         length = (unsigned int)strlen(value);
-      char *newString = static_cast<char *>( malloc( length + 1 ) );
-      memcpy( newString, value, length );
-      newString[length] = 0;
-      return newString;
-   }
-
-   virtual void releaseStringValue( char *value )
-   {
-      if ( value )
-         free( value );
-   }
+    virtual ~DefaultValueAllocator() {}
+
+    virtual char* makeMemberName(const char* memberName) { return duplicateStringValue(memberName); }
+
+    virtual void releaseMemberName(char* memberName) { releaseStringValue(memberName); }
+
+    virtual char* duplicateStringValue(const char* value, unsigned int length = unknown)
+    {
+        //@todo invesgate this old optimization
+        // if ( !value  ||  value[0] == 0 )
+        //   return 0;
+
+        if (length == unknown)
+            length = (unsigned int)strlen(value);
+        char* newString = static_cast<char*>(malloc(length + 1));
+        memcpy(newString, value, length);
+        newString[length] = 0;
+        return newString;
+    }
+
+    virtual void releaseStringValue(char* value)
+    {
+        if (value)
+            free(value);
+    }
 };
 
-static ValueAllocator *&valueAllocator()
+static ValueAllocator*& valueAllocator()
 {
-   static DefaultValueAllocator defaultAllocator;
-   static ValueAllocator *valueAllocator = &defaultAllocator;
-   return valueAllocator;
+    static DefaultValueAllocator defaultAllocator;
+    static ValueAllocator* valueAllocator = &defaultAllocator;
+    return valueAllocator;
 }
 
-static struct DummyValueAllocatorInitializer {
-   DummyValueAllocatorInitializer()
-   {
-      valueAllocator();      // ensure valueAllocator() statics are initialized before main().
-   }
+static struct DummyValueAllocatorInitializer
+{
+    DummyValueAllocatorInitializer()
+    {
+        valueAllocator(); // ensure valueAllocator() statics are initialized before main().
+    }
 } dummyValueAllocatorInitializer;
 
-
-
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -124,12 +114,11 @@ static struct DummyValueAllocatorInitializer {
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 #ifdef JSON_VALUE_USE_INTERNAL_MAP
-# include "json_internalarray.inl"
-# include "json_internalmap.inl"
+#include "json_internalarray.inl"
+#include "json_internalmap.inl"
 #endif // JSON_VALUE_USE_INTERNAL_MAP
 
-# include "json_valueiterator.inl"
-
+#include "json_valueiterator.inl"
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -139,31 +128,24 @@ static struct DummyValueAllocatorInitializer {
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-
-Value::CommentInfo::CommentInfo()
-   : comment_( 0 )
-{
-}
+Value::CommentInfo::CommentInfo() : comment_(0) {}
 
 Value::CommentInfo::~CommentInfo()
 {
-   if ( comment_ )
-      valueAllocator()->releaseStringValue( comment_ );
+    if (comment_)
+        valueAllocator()->releaseStringValue(comment_);
 }
 
-
-void
-Value::CommentInfo::setComment( const char *text )
+void Value::CommentInfo::setComment(const char* text)
 {
-   if ( comment_ )
-      valueAllocator()->releaseStringValue( comment_ );
-   JSON_ASSERT( text );
-   JSON_ASSERT_MESSAGE( text[0]=='\0' || text[0]=='/', "Comments must start with /");
-   // It seems that /**/ style comments are acceptable as well.
-   comment_ = valueAllocator()->duplicateStringValue( text );
+    if (comment_)
+        valueAllocator()->releaseStringValue(comment_);
+    JSON_ASSERT(text);
+    JSON_ASSERT_MESSAGE(text[0] == '\0' || text[0] == '/', "Comments must start with /");
+    // It seems that /**/ style comments are acceptable as well.
+    comment_ = valueAllocator()->duplicateStringValue(text);
 }
 
-
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -171,93 +153,75 @@ Value::CommentInfo::setComment( const char *text )
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
-# ifndef JSON_VALUE_USE_INTERNAL_MAP
+#ifndef JSON_VALUE_USE_INTERNAL_MAP
 
 // Notes: index_ indicates if the string was allocated when
 // a string is stored.
 
-Value::CZString::CZString( int index )
-   : cstr_( 0 )
-   , index_( index )
-{
-}
+Value::CZString::CZString(int index) : cstr_(0), index_(index) {}
 
-Value::CZString::CZString( const char *cstr, DuplicationPolicy allocate )
-   : cstr_( allocate == duplicate ? valueAllocator()->makeMemberName(cstr)
-                                  : cstr )
-   , index_( allocate )
+Value::CZString::CZString(const char* cstr, DuplicationPolicy allocate) :
+    cstr_(allocate == duplicate ? valueAllocator()->makeMemberName(cstr) : cstr), index_(allocate)
 {
 }
 
-Value::CZString::CZString( const CZString &other )
-: cstr_( other.index_ != noDuplication &&  other.cstr_ != 0
-                ?  valueAllocator()->makeMemberName( other.cstr_ )
-                : other.cstr_ )
-   , index_( other.cstr_ ? (other.index_ == noDuplication ? noDuplication : duplicate)
-                         : other.index_ )
+Value::CZString::CZString(const CZString& other) :
+    cstr_(other.index_ != noDuplication && other.cstr_ != 0 ? valueAllocator()->makeMemberName(other.cstr_) :
+                                                              other.cstr_),
+    index_(other.cstr_ ? (other.index_ == noDuplication ? noDuplication : duplicate) : other.index_)
 {
 }
 
 Value::CZString::~CZString()
 {
-   if ( cstr_  &&  index_ == duplicate )
-      valueAllocator()->releaseMemberName( const_cast<char *>( cstr_ ) );
+    if (cstr_ && index_ == duplicate)
+        valueAllocator()->releaseMemberName(const_cast<char*>(cstr_));
 }
 
-void
-Value::CZString::swap( CZString &other )
+void Value::CZString::swap(CZString& other)
 {
-   std::swap( cstr_, other.cstr_ );
-   std::swap( index_, other.index_ );
+    std::swap(cstr_, other.cstr_);
+    std::swap(index_, other.index_);
 }
 
-Value::CZString &
-Value::CZString::operator =( const CZString &other )
+Value::CZString& Value::CZString::operator=(const CZString& other)
 {
-   CZString temp( other );
-   swap( temp );
-   return *this;
+    CZString temp(other);
+    swap(temp);
+    return *this;
 }
 
-bool
-Value::CZString::operator<( const CZString &other ) const
+bool Value::CZString::operator<(const CZString& other) const
 {
-   if ( cstr_ )
-      return strcmp( cstr_, other.cstr_ ) < 0;
-   return index_ < other.index_;
+    if (cstr_)
+        return strcmp(cstr_, other.cstr_) < 0;
+    return index_ < other.index_;
 }
 
-bool
-Value::CZString::operator==( const CZString &other ) const
+bool Value::CZString::operator==(const CZString& other) const
 {
-   if ( cstr_ )
-      return strcmp( cstr_, other.cstr_ ) == 0;
-   return index_ == other.index_;
+    if (cstr_)
+        return strcmp(cstr_, other.cstr_) == 0;
+    return index_ == other.index_;
 }
 
-
-int
-Value::CZString::index() const
+int Value::CZString::index() const
 {
-   return index_;
+    return index_;
 }
 
-
-const char *
-Value::CZString::c_str() const
+const char* Value::CZString::c_str() const
 {
-   return cstr_;
+    return cstr_;
 }
 
-bool
-Value::CZString::isStaticString() const
+bool Value::CZString::isStaticString() const
 {
-   return index_ == noDuplication;
+    return index_ == noDuplication;
 }
 
 #endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
 
-
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -270,970 +234,878 @@ Value::CZString::isStaticString() const
  * memset( this, 0, sizeof(Value) )
  * This optimization is used in ValueInternalMap fast allocator.
  */
-Value::Value( ValueType type )
-   : type_( type )
-   , allocated_( 0 )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(ValueType type) :
+    type_(type),
+    allocated_(0),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   switch ( type )
-   {
-   case nullValue:
-      break;
-   case intValue:
-   case uintValue:
-      value_.int_ = 0;
-      break;
-   case realValue:
-      value_.real_ = 0.0;
-      break;
-   case stringValue:
-      value_.string_ = 0;
-      break;
+    switch (type)
+    {
+        case nullValue:
+            break;
+        case intValue:
+        case uintValue:
+            value_.int_ = 0;
+            break;
+        case realValue:
+            value_.real_ = 0.0;
+            break;
+        case stringValue:
+            value_.string_ = 0;
+            break;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      value_.map_ = new ObjectValues();
-      break;
+        case arrayValue:
+        case objectValue:
+            value_.map_ = new ObjectValues();
+            break;
 #else
-   case arrayValue:
-      value_.array_ = arrayAllocator()->newArray();
-      break;
-   case objectValue:
-      value_.map_ = mapAllocator()->newMap();
-      break;
+        case arrayValue:
+            value_.array_ = arrayAllocator()->newArray();
+            break;
+        case objectValue:
+            value_.map_ = mapAllocator()->newMap();
+            break;
 #endif
-   case booleanValue:
-      value_.bool_ = false;
-      break;
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
+        case booleanValue:
+            value_.bool_ = false;
+            break;
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
 }
 
-
-Value::Value( Int value )
-   : type_( intValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(Int value) :
+    type_(intValue),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.int_ = value;
+    value_.int_ = value;
 }
 
-
-Value::Value( UInt value )
-   : type_( uintValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(UInt value) :
+    type_(uintValue),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.uint_ = value;
+    value_.uint_ = value;
 }
 
-Value::Value( double value )
-   : type_( realValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(double value) :
+    type_(realValue),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.real_ = value;
+    value_.real_ = value;
 }
 
-Value::Value( const char *value )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(const char* value) :
+    type_(stringValue),
+    allocated_(true),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.string_ = valueAllocator()->duplicateStringValue( value );
+    value_.string_ = valueAllocator()->duplicateStringValue(value);
 }
 
-
-Value::Value( const char *beginValue,
-              const char *endValue )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(const char* beginValue, const char* endValue) :
+    type_(stringValue),
+    allocated_(true),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.string_ = valueAllocator()->duplicateStringValue( beginValue,
-                                                            UInt(endValue - beginValue) );
+    value_.string_ = valueAllocator()->duplicateStringValue(beginValue, UInt(endValue - beginValue));
 }
 
-
-Value::Value( const std::string &value )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(const std::string& value) :
+    type_(stringValue),
+    allocated_(true),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.string_ = valueAllocator()->duplicateStringValue( value.c_str(),
-                                                            (unsigned int)value.length() );
-
+    value_.string_ = valueAllocator()->duplicateStringValue(value.c_str(), (unsigned int)value.length());
 }
 
-Value::Value( const StaticString &value )
-   : type_( stringValue )
-   , allocated_( false )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(const StaticString& value) :
+    type_(stringValue),
+    allocated_(false),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.string_ = const_cast<char *>( value.c_str() );
+    value_.string_ = const_cast<char*>(value.c_str());
 }
 
-
-# ifdef JSON_USE_CPPTL
-Value::Value( const CppTL::ConstString &value )
-   : type_( stringValue )
-   , allocated_( true )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+#ifdef JSON_USE_CPPTL
+Value::Value(const CppTL::ConstString& value) :
+    type_(stringValue),
+    allocated_(true),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.string_ = valueAllocator()->duplicateStringValue( value, value.length() );
+    value_.string_ = valueAllocator()->duplicateStringValue(value, value.length());
 }
-# endif
+#endif
 
-Value::Value( bool value )
-   : type_( booleanValue )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(bool value) :
+    type_(booleanValue),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   value_.bool_ = value;
+    value_.bool_ = value;
 }
 
-
-Value::Value( const Value &other )
-   : type_( other.type_ )
-   , comments_( 0 )
-# ifdef JSON_VALUE_USE_INTERNAL_MAP
-   , itemIsUsed_( 0 )
+Value::Value(const Value& other) :
+    type_(other.type_),
+    comments_(0)
+#ifdef JSON_VALUE_USE_INTERNAL_MAP
+    ,
+    itemIsUsed_(0)
 #endif
 {
-   switch ( type_ )
-   {
-   case nullValue:
-   case intValue:
-   case uintValue:
-   case realValue:
-   case booleanValue:
-      value_ = other.value_;
-      break;
-   case stringValue:
-      if ( other.value_.string_ )
-      {
-         value_.string_ = valueAllocator()->duplicateStringValue( other.value_.string_ );
-         allocated_ = true;
-      }
-      else
-         value_.string_ = 0;
-      break;
+    switch (type_)
+    {
+        case nullValue:
+        case intValue:
+        case uintValue:
+        case realValue:
+        case booleanValue:
+            value_ = other.value_;
+            break;
+        case stringValue:
+            if (other.value_.string_)
+            {
+                value_.string_ = valueAllocator()->duplicateStringValue(other.value_.string_);
+                allocated_ = true;
+            }
+            else
+                value_.string_ = 0;
+            break;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      value_.map_ = new ObjectValues( *other.value_.map_ );
-      break;
+        case arrayValue:
+        case objectValue:
+            value_.map_ = new ObjectValues(*other.value_.map_);
+            break;
 #else
-   case arrayValue:
-      value_.array_ = arrayAllocator()->newArrayCopy( *other.value_.array_ );
-      break;
-   case objectValue:
-      value_.map_ = mapAllocator()->newMapCopy( *other.value_.map_ );
-      break;
+        case arrayValue:
+            value_.array_ = arrayAllocator()->newArrayCopy(*other.value_.array_);
+            break;
+        case objectValue:
+            value_.map_ = mapAllocator()->newMapCopy(*other.value_.map_);
+            break;
 #endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   if ( other.comments_ )
-   {
-      comments_ = new CommentInfo[numberOfCommentPlacement];
-      for ( int comment =0; comment < numberOfCommentPlacement; ++comment )
-      {
-         const CommentInfo &otherComment = other.comments_[comment];
-         if ( otherComment.comment_ )
-            comments_[comment].setComment( otherComment.comment_ );
-      }
-   }
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    if (other.comments_)
+    {
+        comments_ = new CommentInfo[numberOfCommentPlacement];
+        for (int comment = 0; comment < numberOfCommentPlacement; ++comment)
+        {
+            const CommentInfo& otherComment = other.comments_[comment];
+            if (otherComment.comment_)
+                comments_[comment].setComment(otherComment.comment_);
+        }
+    }
 }
 
-
 Value::~Value()
 {
-   switch ( type_ )
-   {
-   case nullValue:
-   case intValue:
-   case uintValue:
-   case realValue:
-   case booleanValue:
-      break;
-   case stringValue:
-      if ( allocated_ )
-         valueAllocator()->releaseStringValue( value_.string_ );
-      break;
+    switch (type_)
+    {
+        case nullValue:
+        case intValue:
+        case uintValue:
+        case realValue:
+        case booleanValue:
+            break;
+        case stringValue:
+            if (allocated_)
+                valueAllocator()->releaseStringValue(value_.string_);
+            break;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      delete value_.map_;
-      break;
+        case arrayValue:
+        case objectValue:
+            delete value_.map_;
+            break;
 #else
-   case arrayValue:
-      arrayAllocator()->destructArray( value_.array_ );
-      break;
-   case objectValue:
-      mapAllocator()->destructMap( value_.map_ );
-      break;
+        case arrayValue:
+            arrayAllocator()->destructArray(value_.array_);
+            break;
+        case objectValue:
+            mapAllocator()->destructMap(value_.map_);
+            break;
 #endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-
-   if ( comments_ )
-      delete[] comments_;
-}
-
-Value &
-Value::operator=( const Value &other )
-{
-   Value temp( other );
-   swap( temp );
-   return *this;
-}
-
-void
-Value::swap( Value &other )
-{
-   ValueType temp = type_;
-   type_ = other.type_;
-   other.type_ = temp;
-   std::swap( value_, other.value_ );
-   int temp2 = allocated_;
-   allocated_ = other.allocated_;
-   other.allocated_ = temp2;
-}
-
-ValueType
-Value::type() const
-{
-   return type_;
-}
-
-
-int
-Value::compare( const Value &other )
-{
-   /*
-   int typeDelta = other.type_ - type_;
-   switch ( type_ )
-   {
-   case nullValue:
-
-      return other.type_ == type_;
-   case intValue:
-      if ( other.type_.isNumeric()
-   case uintValue:
-   case realValue:
-   case booleanValue:
-      break;
-   case stringValue,
-      break;
-   case arrayValue:
-      delete value_.array_;
-      break;
-   case objectValue:
-      delete value_.map_;
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   */
-   (void) other;
-   return 0;  // unreachable
-}
-
-bool
-Value::operator <( const Value &other ) const
-{
-   int typeDelta = type_ - other.type_;
-   if ( typeDelta )
-      return typeDelta < 0 ? true : false;
-   switch ( type_ )
-   {
-   case nullValue:
-      return false;
-   case intValue:
-      return value_.int_ < other.value_.int_;
-   case uintValue:
-      return value_.uint_ < other.value_.uint_;
-   case realValue:
-      return value_.real_ < other.value_.real_;
-   case booleanValue:
-      return value_.bool_ < other.value_.bool_;
-   case stringValue:
-      return ( value_.string_ == 0  &&  other.value_.string_ )
-             || ( other.value_.string_
-                  &&  value_.string_
-                  && strcmp( value_.string_, other.value_.string_ ) < 0 );
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+
+    if (comments_)
+        delete[] comments_;
+}
+
+Value& Value::operator=(const Value& other)
+{
+    Value temp(other);
+    swap(temp);
+    return *this;
+}
+
+void Value::swap(Value& other)
+{
+    ValueType temp = type_;
+    type_ = other.type_;
+    other.type_ = temp;
+    std::swap(value_, other.value_);
+    int temp2 = allocated_;
+    allocated_ = other.allocated_;
+    other.allocated_ = temp2;
+}
+
+ValueType Value::type() const
+{
+    return type_;
+}
+
+int Value::compare(const Value& other)
+{
+    /*
+    int typeDelta = other.type_ - type_;
+    switch ( type_ )
+    {
+    case nullValue:
+
+       return other.type_ == type_;
+    case intValue:
+       if ( other.type_.isNumeric()
+    case uintValue:
+    case realValue:
+    case booleanValue:
+       break;
+    case stringValue,
+       break;
+    case arrayValue:
+       delete value_.array_;
+       break;
+    case objectValue:
+       delete value_.map_;
+    default:
+       JSON_ASSERT_UNREACHABLE;
+    }
+    */
+    (void)other;
+    return 0; // unreachable
+}
+
+bool Value::operator<(const Value& other) const
+{
+    int typeDelta = type_ - other.type_;
+    if (typeDelta)
+        return typeDelta < 0 ? true : false;
+    switch (type_)
+    {
+        case nullValue:
+            return false;
+        case intValue:
+            return value_.int_ < other.value_.int_;
+        case uintValue:
+            return value_.uint_ < other.value_.uint_;
+        case realValue:
+            return value_.real_ < other.value_.real_;
+        case booleanValue:
+            return value_.bool_ < other.value_.bool_;
+        case stringValue:
+            return (value_.string_ == 0 && other.value_.string_) ||
+                   (other.value_.string_ && value_.string_ && strcmp(value_.string_, other.value_.string_) < 0);
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      {
-         int delta = int( value_.map_->size() - other.value_.map_->size() );
-         if ( delta )
-            return delta < 0;
-         return (*value_.map_) < (*other.value_.map_);
-      }
+        case arrayValue:
+        case objectValue:
+        {
+            int delta = int(value_.map_->size() - other.value_.map_->size());
+            if (delta)
+                return delta < 0;
+            return (*value_.map_) < (*other.value_.map_);
+        }
 #else
-   case arrayValue:
-      return value_.array_->compare( *(other.value_.array_) ) < 0;
-   case objectValue:
-      return value_.map_->compare( *(other.value_.map_) ) < 0;
+        case arrayValue:
+            return value_.array_->compare(*(other.value_.array_)) < 0;
+        case objectValue:
+            return value_.map_->compare(*(other.value_.map_)) < 0;
 #endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0;  // unreachable
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return 0; // unreachable
 }
 
-bool
-Value::operator <=( const Value &other ) const
+bool Value::operator<=(const Value& other) const
 {
-   return !(other > *this);
+    return !(other > *this);
 }
 
-bool
-Value::operator >=( const Value &other ) const
+bool Value::operator>=(const Value& other) const
 {
-   return !(*this < other);
+    return !(*this < other);
 }
 
-bool
-Value::operator >( const Value &other ) const
+bool Value::operator>(const Value& other) const
 {
-   return other < *this;
+    return other < *this;
 }
 
-bool
-Value::operator ==( const Value &other ) const
+bool Value::operator==(const Value& other) const
 {
-   //if ( type_ != other.type_ )
-   // GCC 2.95.3 says:
-   // attempt to take address of bit-field structure member `Json::Value::type_'
-   // Beats me, but a temp solves the problem.
-   int temp = other.type_;
-   if ( type_ != temp )
-      return false;
-   switch ( type_ )
-   {
-   case nullValue:
-      return true;
-   case intValue:
-      return value_.int_ == other.value_.int_;
-   case uintValue:
-      return value_.uint_ == other.value_.uint_;
-   case realValue:
-      return value_.real_ == other.value_.real_;
-   case booleanValue:
-      return value_.bool_ == other.value_.bool_;
-   case stringValue:
-      return ( value_.string_ == other.value_.string_ )
-             || ( other.value_.string_
-                  &&  value_.string_
-                  && strcmp( value_.string_, other.value_.string_ ) == 0 );
+    // if ( type_ != other.type_ )
+    // GCC 2.95.3 says:
+    // attempt to take address of bit-field structure member `Json::Value::type_'
+    // Beats me, but a temp solves the problem.
+    int temp = other.type_;
+    if (type_ != temp)
+        return false;
+    switch (type_)
+    {
+        case nullValue:
+            return true;
+        case intValue:
+            return value_.int_ == other.value_.int_;
+        case uintValue:
+            return value_.uint_ == other.value_.uint_;
+        case realValue:
+            return value_.real_ == other.value_.real_;
+        case booleanValue:
+            return value_.bool_ == other.value_.bool_;
+        case stringValue:
+            return (value_.string_ == other.value_.string_) ||
+                   (other.value_.string_ && value_.string_ && strcmp(value_.string_, other.value_.string_) == 0);
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      return value_.map_->size() == other.value_.map_->size()
-             && (*value_.map_) == (*other.value_.map_);
+        case arrayValue:
+        case objectValue:
+            return value_.map_->size() == other.value_.map_->size() && (*value_.map_) == (*other.value_.map_);
 #else
-   case arrayValue:
-      return value_.array_->compare( *(other.value_.array_) ) == 0;
-   case objectValue:
-      return value_.map_->compare( *(other.value_.map_) ) == 0;
+        case arrayValue:
+            return value_.array_->compare(*(other.value_.array_)) == 0;
+        case objectValue:
+            return value_.map_->compare(*(other.value_.map_)) == 0;
 #endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0;  // unreachable
-}
-
-bool
-Value::operator !=( const Value &other ) const
-{
-   return !( *this == other );
-}
-
-const char *
-Value::asCString() const
-{
-   JSON_ASSERT( type_ == stringValue );
-   return value_.string_;
-}
-
-
-std::string
-Value::asString() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return "";
-   case stringValue:
-      return value_.string_ ? value_.string_ : "";
-   case booleanValue:
-      return value_.bool_ ? "true" : "false";
-   case intValue:
-   case uintValue:
-   case realValue:
-   case arrayValue:
-   case objectValue:
-      JSON_ASSERT_MESSAGE( false, "Type is not convertible to string" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return ""; // unreachable
-}
-
-# ifdef JSON_USE_CPPTL
-CppTL::ConstString
-Value::asConstString() const
-{
-   return CppTL::ConstString( asString().c_str() );
-}
-# endif
-
-Value::Int
-Value::asInt() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0;
-   case intValue:
-      return value_.int_;
-   case uintValue:
-      JSON_ASSERT_MESSAGE( value_.uint_ < (unsigned)maxInt, "integer out of signed integer range" );
-      return value_.uint_;
-   case realValue:
-      JSON_ASSERT_MESSAGE( value_.real_ >= minInt  &&  value_.real_ <= maxInt, "Real out of signed integer range" );
-      return Int( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1 : 0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_ASSERT_MESSAGE( false, "Type is not convertible to int" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-Value::UInt
-Value::asUInt() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0;
-   case intValue:
-      JSON_ASSERT_MESSAGE( value_.int_ >= 0, "Negative integer can not be converted to unsigned integer" );
-      return value_.int_;
-   case uintValue:
-      return value_.uint_;
-   case realValue:
-      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ <= maxUInt,  "Real out of unsigned integer range" );
-      return UInt( value_.real_ );
-   case booleanValue:
-      return value_.bool_ ? 1 : 0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_ASSERT_MESSAGE( false, "Type is not convertible to uint" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-double
-Value::asDouble() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return 0.0;
-   case intValue:
-      return value_.int_;
-   case uintValue:
-      return value_.uint_;
-   case realValue:
-      return value_.real_;
-   case booleanValue:
-      return value_.bool_ ? 1.0 : 0.0;
-   case stringValue:
-   case arrayValue:
-   case objectValue:
-      JSON_ASSERT_MESSAGE( false, "Type is not convertible to double" );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
-}
-
-bool
-Value::asBool() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return false;
-   case intValue:
-   case uintValue:
-      return value_.int_ != 0;
-   case realValue:
-      return value_.real_ != 0.0;
-   case booleanValue:
-      return value_.bool_;
-   case stringValue:
-      return value_.string_  &&  value_.string_[0] != 0;
-   case arrayValue:
-   case objectValue:
-      return value_.map_->size() != 0;
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return false; // unreachable;
-}
-
-
-bool
-Value::isConvertibleTo( ValueType other ) const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-      return true;
-   case intValue:
-      return ( other == nullValue  &&  value_.int_ == 0 )
-             || other == intValue
-             || ( other == uintValue  && value_.int_ >= 0 )
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case uintValue:
-      return ( other == nullValue  &&  value_.uint_ == 0 )
-             || ( other == intValue  && value_.uint_ <= (unsigned)maxInt )
-             || other == uintValue
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case realValue:
-      return ( other == nullValue  &&  value_.real_ == 0.0 )
-             || ( other == intValue  &&  value_.real_ >= minInt  &&  value_.real_ <= maxInt )
-             || ( other == uintValue  &&  value_.real_ >= 0  &&  value_.real_ <= maxUInt )
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case booleanValue:
-      return ( other == nullValue  &&  value_.bool_ == false )
-             || other == intValue
-             || other == uintValue
-             || other == realValue
-             || other == stringValue
-             || other == booleanValue;
-   case stringValue:
-      return other == stringValue
-             || ( other == nullValue  &&  (!value_.string_  ||  value_.string_[0] == 0) );
-   case arrayValue:
-      return other == arrayValue
-             ||  ( other == nullValue  &&  value_.map_->size() == 0 );
-   case objectValue:
-      return other == objectValue
-             ||  ( other == nullValue  &&  value_.map_->size() == 0 );
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return false; // unreachable;
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return 0; // unreachable
+}
+
+bool Value::operator!=(const Value& other) const
+{
+    return !(*this == other);
+}
+
+const char* Value::asCString() const
+{
+    JSON_ASSERT(type_ == stringValue);
+    return value_.string_;
+}
+
+std::string Value::asString() const
+{
+    switch (type_)
+    {
+        case nullValue:
+            return "";
+        case stringValue:
+            return value_.string_ ? value_.string_ : "";
+        case booleanValue:
+            return value_.bool_ ? "true" : "false";
+        case intValue:
+        case uintValue:
+        case realValue:
+        case arrayValue:
+        case objectValue:
+            JSON_ASSERT_MESSAGE(false, "Type is not convertible to string");
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return ""; // unreachable
 }
 
+#ifdef JSON_USE_CPPTL
+CppTL::ConstString Value::asConstString() const
+{
+    return CppTL::ConstString(asString().c_str());
+}
+#endif
+
+Value::Int Value::asInt() const
+{
+    switch (type_)
+    {
+        case nullValue:
+            return 0;
+        case intValue:
+            return value_.int_;
+        case uintValue:
+            JSON_ASSERT_MESSAGE(value_.uint_ < (unsigned)maxInt, "integer out of signed integer range");
+            return value_.uint_;
+        case realValue:
+            JSON_ASSERT_MESSAGE(value_.real_ >= minInt && value_.real_ <= maxInt, "Real out of signed integer range");
+            return Int(value_.real_);
+        case booleanValue:
+            return value_.bool_ ? 1 : 0;
+        case stringValue:
+        case arrayValue:
+        case objectValue:
+            JSON_ASSERT_MESSAGE(false, "Type is not convertible to int");
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return 0; // unreachable;
+}
+
+Value::UInt Value::asUInt() const
+{
+    switch (type_)
+    {
+        case nullValue:
+            return 0;
+        case intValue:
+            JSON_ASSERT_MESSAGE(value_.int_ >= 0, "Negative integer can not be converted to unsigned integer");
+            return value_.int_;
+        case uintValue:
+            return value_.uint_;
+        case realValue:
+            JSON_ASSERT_MESSAGE(value_.real_ >= 0 && value_.real_ <= maxUInt, "Real out of unsigned integer range");
+            return UInt(value_.real_);
+        case booleanValue:
+            return value_.bool_ ? 1 : 0;
+        case stringValue:
+        case arrayValue:
+        case objectValue:
+            JSON_ASSERT_MESSAGE(false, "Type is not convertible to uint");
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return 0; // unreachable;
+}
+
+double Value::asDouble() const
+{
+    switch (type_)
+    {
+        case nullValue:
+            return 0.0;
+        case intValue:
+            return value_.int_;
+        case uintValue:
+            return value_.uint_;
+        case realValue:
+            return value_.real_;
+        case booleanValue:
+            return value_.bool_ ? 1.0 : 0.0;
+        case stringValue:
+        case arrayValue:
+        case objectValue:
+            JSON_ASSERT_MESSAGE(false, "Type is not convertible to double");
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return 0; // unreachable;
+}
+
+bool Value::asBool() const
+{
+    switch (type_)
+    {
+        case nullValue:
+            return false;
+        case intValue:
+        case uintValue:
+            return value_.int_ != 0;
+        case realValue:
+            return value_.real_ != 0.0;
+        case booleanValue:
+            return value_.bool_;
+        case stringValue:
+            return value_.string_ && value_.string_[0] != 0;
+        case arrayValue:
+        case objectValue:
+            return value_.map_->size() != 0;
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return false; // unreachable;
+}
+
+bool Value::isConvertibleTo(ValueType other) const
+{
+    switch (type_)
+    {
+        case nullValue:
+            return true;
+        case intValue:
+            return (other == nullValue && value_.int_ == 0) || other == intValue ||
+                   (other == uintValue && value_.int_ >= 0) || other == realValue || other == stringValue ||
+                   other == booleanValue;
+        case uintValue:
+            return (other == nullValue && value_.uint_ == 0) ||
+                   (other == intValue && value_.uint_ <= (unsigned)maxInt) || other == uintValue ||
+                   other == realValue || other == stringValue || other == booleanValue;
+        case realValue:
+            return (other == nullValue && value_.real_ == 0.0) ||
+                   (other == intValue && value_.real_ >= minInt && value_.real_ <= maxInt) ||
+                   (other == uintValue && value_.real_ >= 0 && value_.real_ <= maxUInt) || other == realValue ||
+                   other == stringValue || other == booleanValue;
+        case booleanValue:
+            return (other == nullValue && value_.bool_ == false) || other == intValue || other == uintValue ||
+                   other == realValue || other == stringValue || other == booleanValue;
+        case stringValue:
+            return other == stringValue || (other == nullValue && (!value_.string_ || value_.string_[0] == 0));
+        case arrayValue:
+            return other == arrayValue || (other == nullValue && value_.map_->size() == 0);
+        case objectValue:
+            return other == objectValue || (other == nullValue && value_.map_->size() == 0);
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return false; // unreachable;
+}
 
 /// Number of values in array or object
-Value::UInt
-Value::size() const
-{
-   switch ( type_ )
-   {
-   case nullValue:
-   case intValue:
-   case uintValue:
-   case realValue:
-   case booleanValue:
-   case stringValue:
-      return 0;
+Value::UInt Value::size() const
+{
+    switch (type_)
+    {
+        case nullValue:
+        case intValue:
+        case uintValue:
+        case realValue:
+        case booleanValue:
+        case stringValue:
+            return 0;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:  // size of the array is highest index + 1
-      if ( !value_.map_->empty() )
-      {
-         ObjectValues::const_iterator itLast = value_.map_->end();
-         --itLast;
-         return (*itLast).first.index()+1;
-      }
-      return 0;
-   case objectValue:
-      return Int( value_.map_->size() );
+        case arrayValue: // size of the array is highest index + 1
+            if (!value_.map_->empty())
+            {
+                ObjectValues::const_iterator itLast = value_.map_->end();
+                --itLast;
+                return (*itLast).first.index() + 1;
+            }
+            return 0;
+        case objectValue:
+            return Int(value_.map_->size());
 #else
-   case arrayValue:
-      return Int( value_.array_->size() );
-   case objectValue:
-      return Int( value_.map_->size() );
+        case arrayValue:
+            return Int(value_.array_->size());
+        case objectValue:
+            return Int(value_.map_->size());
 #endif
-   default:
-      JSON_ASSERT_UNREACHABLE;
-   }
-   return 0; // unreachable;
+        default:
+            JSON_ASSERT_UNREACHABLE;
+    }
+    return 0; // unreachable;
 }
 
-
-bool
-Value::empty() const
+bool Value::empty() const
 {
-   if ( isNull() || isArray() || isObject() )
-      return size() == 0u;
-   else
-      return false;
+    if (isNull() || isArray() || isObject())
+        return size() == 0u;
+    else
+        return false;
 }
 
-
-bool
-Value::operator!() const
+bool Value::operator!() const
 {
-   return isNull();
+    return isNull();
 }
 
-
-void
-Value::clear()
+void Value::clear()
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue  || type_ == objectValue );
+    JSON_ASSERT(type_ == nullValue || type_ == arrayValue || type_ == objectValue);
 
-   switch ( type_ )
-   {
+    switch (type_)
+    {
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-   case objectValue:
-      value_.map_->clear();
-      break;
+        case arrayValue:
+        case objectValue:
+            value_.map_->clear();
+            break;
 #else
-   case arrayValue:
-      value_.array_->clear();
-      break;
-   case objectValue:
-      value_.map_->clear();
-      break;
+        case arrayValue:
+            value_.array_->clear();
+            break;
+        case objectValue:
+            value_.map_->clear();
+            break;
 #endif
-   default:
-      break;
-   }
+        default:
+            break;
+    }
 }
 
-void
-Value::resize( UInt newSize )
+void Value::resize(UInt newSize)
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue );
-   if ( type_ == nullValue )
-      *this = Value( arrayValue );
+    JSON_ASSERT(type_ == nullValue || type_ == arrayValue);
+    if (type_ == nullValue)
+        *this = Value(arrayValue);
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   UInt oldSize = size();
-   if ( newSize == 0 )
-      clear();
-   else if ( newSize > oldSize )
-      (*this)[ newSize - 1 ];
-   else
-   {
-      for ( UInt index = newSize; index < oldSize; ++index )
-         value_.map_->erase( index );
-      assert( size() == newSize );
-   }
+    UInt oldSize = size();
+    if (newSize == 0)
+        clear();
+    else if (newSize > oldSize)
+        (*this)[newSize - 1];
+    else
+    {
+        for (UInt index = newSize; index < oldSize; ++index)
+            value_.map_->erase(index);
+        assert(size() == newSize);
+    }
 #else
-   value_.array_->resize( newSize );
+    value_.array_->resize(newSize);
 #endif
 }
 
-
-Value &
-Value::operator[]( UInt index )
+Value& Value::operator[](UInt index)
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue );
-   if ( type_ == nullValue )
-      *this = Value( arrayValue );
+    JSON_ASSERT(type_ == nullValue || type_ == arrayValue);
+    if (type_ == nullValue)
+        *this = Value(arrayValue);
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString key( index );
-   ObjectValues::iterator it = value_.map_->lower_bound( key );
-   if ( it != value_.map_->end()  &&  (*it).first == key )
-      return (*it).second;
-
-   ObjectValues::value_type defaultValue( key, null );
-   it = value_.map_->insert( it, defaultValue );
-   return (*it).second;
+    CZString key(index);
+    ObjectValues::iterator it = value_.map_->lower_bound(key);
+    if (it != value_.map_->end() && (*it).first == key)
+        return (*it).second;
+
+    ObjectValues::value_type defaultValue(key, null);
+    it = value_.map_->insert(it, defaultValue);
+    return (*it).second;
 #else
-   return value_.array_->resolveReference( index );
+    return value_.array_->resolveReference(index);
 #endif
 }
 
-
-const Value &
-Value::operator[]( UInt index ) const
+const Value& Value::operator[](UInt index) const
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == arrayValue );
-   if ( type_ == nullValue )
-      return null;
+    JSON_ASSERT(type_ == nullValue || type_ == arrayValue);
+    if (type_ == nullValue)
+        return null;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString key( index );
-   ObjectValues::const_iterator it = value_.map_->find( key );
-   if ( it == value_.map_->end() )
-      return null;
-   return (*it).second;
+    CZString key(index);
+    ObjectValues::const_iterator it = value_.map_->find(key);
+    if (it == value_.map_->end())
+        return null;
+    return (*it).second;
 #else
-   Value *value = value_.array_->find( index );
-   return value ? *value : null;
+    Value* value = value_.array_->find(index);
+    return value ? *value : null;
 #endif
 }
 
-
-Value &
-Value::operator[]( const char *key )
+Value& Value::operator[](const char* key)
 {
-   return resolveReference( key, false );
+    return resolveReference(key, false);
 }
 
-
-Value &
-Value::resolveReference( const char *key,
-                         bool isStatic )
+Value& Value::resolveReference(const char* key, bool isStatic)
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-      *this = Value( objectValue );
+    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
+    if (type_ == nullValue)
+        *this = Value(objectValue);
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString actualKey( key, isStatic ? CZString::noDuplication
-                                     : CZString::duplicateOnCopy );
-   ObjectValues::iterator it = value_.map_->lower_bound( actualKey );
-   if ( it != value_.map_->end()  &&  (*it).first == actualKey )
-      return (*it).second;
-
-   ObjectValues::value_type defaultValue( actualKey, null );
-   it = value_.map_->insert( it, defaultValue );
-   Value &value = (*it).second;
-   return value;
+    CZString actualKey(key, isStatic ? CZString::noDuplication : CZString::duplicateOnCopy);
+    ObjectValues::iterator it = value_.map_->lower_bound(actualKey);
+    if (it != value_.map_->end() && (*it).first == actualKey)
+        return (*it).second;
+
+    ObjectValues::value_type defaultValue(actualKey, null);
+    it = value_.map_->insert(it, defaultValue);
+    Value& value = (*it).second;
+    return value;
 #else
-   return value_.map_->resolveReference( key, isStatic );
+    return value_.map_->resolveReference(key, isStatic);
 #endif
 }
 
-
-Value
-Value::get( UInt index,
-            const Value &defaultValue ) const
+Value Value::get(UInt index, const Value& defaultValue) const
 {
-   const Value *value = &((*this)[index]);
-   return value == &null ? defaultValue : *value;
+    const Value* value = &((*this)[index]);
+    return value == &null ? defaultValue : *value;
 }
 
-
-bool
-Value::isValidIndex( UInt index ) const
+bool Value::isValidIndex(UInt index) const
 {
-   return index < size();
+    return index < size();
 }
 
-
-
-const Value &
-Value::operator[]( const char *key ) const
+const Value& Value::operator[](const char* key) const
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-      return null;
+    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
+    if (type_ == nullValue)
+        return null;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString actualKey( key, CZString::noDuplication );
-   ObjectValues::const_iterator it = value_.map_->find( actualKey );
-   if ( it == value_.map_->end() )
-      return null;
-   return (*it).second;
+    CZString actualKey(key, CZString::noDuplication);
+    ObjectValues::const_iterator it = value_.map_->find(actualKey);
+    if (it == value_.map_->end())
+        return null;
+    return (*it).second;
 #else
-   const Value *value = value_.map_->find( key );
-   return value ? *value : null;
+    const Value* value = value_.map_->find(key);
+    return value ? *value : null;
 #endif
 }
 
-
-Value &
-Value::operator[]( const std::string &key )
+Value& Value::operator[](const std::string& key)
 {
-   return (*this)[ key.c_str() ];
+    return (*this)[key.c_str()];
 }
 
-
-const Value &
-Value::operator[]( const std::string &key ) const
+const Value& Value::operator[](const std::string& key) const
 {
-   return (*this)[ key.c_str() ];
+    return (*this)[key.c_str()];
 }
 
-Value &
-Value::operator[]( const StaticString &key )
+Value& Value::operator[](const StaticString& key)
 {
-   return resolveReference( key, true );
+    return resolveReference(key, true);
 }
 
-
-# ifdef JSON_USE_CPPTL
-Value &
-Value::operator[]( const CppTL::ConstString &key )
+#ifdef JSON_USE_CPPTL
+Value& Value::operator[](const CppTL::ConstString& key)
 {
-   return (*this)[ key.c_str() ];
+    return (*this)[key.c_str()];
 }
 
-
-const Value &
-Value::operator[]( const CppTL::ConstString &key ) const
+const Value& Value::operator[](const CppTL::ConstString& key) const
 {
-   return (*this)[ key.c_str() ];
+    return (*this)[key.c_str()];
 }
-# endif
-
+#endif
 
-Value &
-Value::append( const Value &value )
+Value& Value::append(const Value& value)
 {
-   return (*this)[size()] = value;
+    return (*this)[size()] = value;
 }
 
-
-Value
-Value::get( const char *key,
-            const Value &defaultValue ) const
+Value Value::get(const char* key, const Value& defaultValue) const
 {
-   const Value *value = &((*this)[key]);
-   return value == &null ? defaultValue : *value;
+    const Value* value = &((*this)[key]);
+    return value == &null ? defaultValue : *value;
 }
 
-
-Value
-Value::get( const std::string &key,
-            const Value &defaultValue ) const
+Value Value::get(const std::string& key, const Value& defaultValue) const
 {
-   return get( key.c_str(), defaultValue );
+    return get(key.c_str(), defaultValue);
 }
 
-Value
-Value::removeMember( const char* key )
+Value Value::removeMember(const char* key)
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-      return null;
+    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
+    if (type_ == nullValue)
+        return null;
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   CZString actualKey( key, CZString::noDuplication );
-   ObjectValues::iterator it = value_.map_->find( actualKey );
-   if ( it == value_.map_->end() )
-      return null;
-   Value old(it->second);
-   value_.map_->erase(it);
-   return old;
+    CZString actualKey(key, CZString::noDuplication);
+    ObjectValues::iterator it = value_.map_->find(actualKey);
+    if (it == value_.map_->end())
+        return null;
+    Value old(it->second);
+    value_.map_->erase(it);
+    return old;
 #else
-   Value *value = value_.map_->find( key );
-   if (value){
-      Value old(*value);
-      value_.map_.remove( key );
-      return old;
-   } else {
-      return null;
-   }
+    Value* value = value_.map_->find(key);
+    if (value)
+    {
+        Value old(*value);
+        value_.map_.remove(key);
+        return old;
+    }
+    else
+    {
+        return null;
+    }
 #endif
 }
 
-Value
-Value::removeMember( const std::string &key )
+Value Value::removeMember(const std::string& key)
 {
-   return removeMember( key.c_str() );
+    return removeMember(key.c_str());
 }
 
-# ifdef JSON_USE_CPPTL
-Value
-Value::get( const CppTL::ConstString &key,
-            const Value &defaultValue ) const
+#ifdef JSON_USE_CPPTL
+Value Value::get(const CppTL::ConstString& key, const Value& defaultValue) const
 {
-   return get( key.c_str(), defaultValue );
+    return get(key.c_str(), defaultValue);
 }
-# endif
+#endif
 
-bool
-Value::isMember( const char *key ) const
+bool Value::isMember(const char* key) const
 {
-   const Value *value = &((*this)[key]);
-   return value != &null;
+    const Value* value = &((*this)[key]);
+    return value != &null;
 }
 
-
-bool
-Value::isMember( const std::string &key ) const
+bool Value::isMember(const std::string& key) const
 {
-   return isMember( key.c_str() );
+    return isMember(key.c_str());
 }
 
-
-# ifdef JSON_USE_CPPTL
-bool
-Value::isMember( const CppTL::ConstString &key ) const
+#ifdef JSON_USE_CPPTL
+bool Value::isMember(const CppTL::ConstString& key) const
 {
-   return isMember( key.c_str() );
+    return isMember(key.c_str());
 }
 #endif
 
-Value::Members
-Value::getMemberNames() const
+Value::Members Value::getMemberNames() const
 {
-   JSON_ASSERT( type_ == nullValue  ||  type_ == objectValue );
-   if ( type_ == nullValue )
-       return Value::Members();
-   Members members;
-   members.reserve( value_.map_->size() );
+    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
+    if (type_ == nullValue)
+        return Value::Members();
+    Members members;
+    members.reserve(value_.map_->size());
 #ifndef JSON_VALUE_USE_INTERNAL_MAP
-   ObjectValues::const_iterator it = value_.map_->begin();
-   ObjectValues::const_iterator itEnd = value_.map_->end();
-   for ( ; it != itEnd; ++it )
-      members.push_back( std::string( (*it).first.c_str() ) );
+    ObjectValues::const_iterator it = value_.map_->begin();
+    ObjectValues::const_iterator itEnd = value_.map_->end();
+    for (; it != itEnd; ++it)
+        members.push_back(std::string((*it).first.c_str()));
 #else
-   ValueInternalMap::IteratorState it;
-   ValueInternalMap::IteratorState itEnd;
-   value_.map_->makeBeginIterator( it );
-   value_.map_->makeEndIterator( itEnd );
-   for ( ; !ValueInternalMap::equals( it, itEnd ); ValueInternalMap::increment(it) )
-      members.push_back( std::string( ValueInternalMap::key( it ) ) );
+    ValueInternalMap::IteratorState it;
+    ValueInternalMap::IteratorState itEnd;
+    value_.map_->makeBeginIterator(it);
+    value_.map_->makeEndIterator(itEnd);
+    for (; !ValueInternalMap::equals(it, itEnd); ValueInternalMap::increment(it))
+        members.push_back(std::string(ValueInternalMap::key(it)));
 #endif
-   return members;
+    return members;
 }
 //
 //# ifdef JSON_USE_CPPTL
-//EnumMemberNames
-//Value::enumMemberNames() const
+// EnumMemberNames
+// Value::enumMemberNames() const
 //{
 //   if ( type_ == objectValue )
 //   {
@@ -1245,8 +1117,8 @@ Value::getMemberNames() const
 //}
 //
 //
-//EnumValues
-//Value::enumValues() const
+// EnumValues
+// Value::enumValues() const
 //{
 //   if ( type_ == objectValue  ||  type_ == arrayValue )
 //      return CppTL::Enum::anyValues( *(value_.map_),
@@ -1256,472 +1128,398 @@ Value::getMemberNames() const
 //
 //# endif
 
-
-bool
-Value::isNull() const
+bool Value::isNull() const
 {
-   return type_ == nullValue;
+    return type_ == nullValue;
 }
 
-
-bool
-Value::isBool() const
+bool Value::isBool() const
 {
-   return type_ == booleanValue;
+    return type_ == booleanValue;
 }
 
-
-bool
-Value::isInt() const
+bool Value::isInt() const
 {
-   return type_ == intValue;
+    return type_ == intValue;
 }
 
-
-bool
-Value::isUInt() const
+bool Value::isUInt() const
 {
-   return type_ == uintValue;
+    return type_ == uintValue;
 }
 
-
-bool
-Value::isIntegral() const
+bool Value::isIntegral() const
 {
-   return type_ == intValue
-          ||  type_ == uintValue
-          ||  type_ == booleanValue;
+    return type_ == intValue || type_ == uintValue || type_ == booleanValue;
 }
 
-
-bool
-Value::isDouble() const
+bool Value::isDouble() const
 {
-   return type_ == realValue;
+    return type_ == realValue;
 }
 
-
-bool
-Value::isNumeric() const
+bool Value::isNumeric() const
 {
-   return isIntegral() || isDouble();
+    return isIntegral() || isDouble();
 }
 
-
-bool
-Value::isString() const
+bool Value::isString() const
 {
-   return type_ == stringValue;
+    return type_ == stringValue;
 }
 
-
-bool
-Value::isArray() const
+bool Value::isArray() const
 {
-   return type_ == nullValue  ||  type_ == arrayValue;
+    return type_ == nullValue || type_ == arrayValue;
 }
 
-
-bool
-Value::isObject() const
+bool Value::isObject() const
 {
-   return type_ == nullValue  ||  type_ == objectValue;
+    return type_ == nullValue || type_ == objectValue;
 }
 
-
-void
-Value::setComment( const char *comment,
-                   CommentPlacement placement )
+void Value::setComment(const char* comment, CommentPlacement placement)
 {
-   if ( !comments_ )
-      comments_ = new CommentInfo[numberOfCommentPlacement];
-   comments_[placement].setComment( comment );
+    if (!comments_)
+        comments_ = new CommentInfo[numberOfCommentPlacement];
+    comments_[placement].setComment(comment);
 }
 
-
-void
-Value::setComment( const std::string &comment,
-                   CommentPlacement placement )
+void Value::setComment(const std::string& comment, CommentPlacement placement)
 {
-   setComment( comment.c_str(), placement );
+    setComment(comment.c_str(), placement);
 }
 
-
-bool
-Value::hasComment( CommentPlacement placement ) const
+bool Value::hasComment(CommentPlacement placement) const
 {
-   return comments_ != 0  &&  comments_[placement].comment_ != 0;
+    return comments_ != 0 && comments_[placement].comment_ != 0;
 }
 
-std::string
-Value::getComment( CommentPlacement placement ) const
+std::string Value::getComment(CommentPlacement placement) const
 {
-   if ( hasComment(placement) )
-      return comments_[placement].comment_;
-   return "";
+    if (hasComment(placement))
+        return comments_[placement].comment_;
+    return "";
 }
 
-
-std::string
-Value::toStyledString() const
+std::string Value::toStyledString() const
 {
-   StyledWriter writer;
-   return writer.write( *this );
+    StyledWriter writer;
+    return writer.write(*this);
 }
 
-
-Value::const_iterator
-Value::begin() const
+Value::const_iterator Value::begin() const
 {
-   switch ( type_ )
-   {
+    switch (type_)
+    {
 #ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeBeginIterator( it );
-         return const_iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeBeginIterator( it );
-         return const_iterator( it );
-      }
-      break;
+        case arrayValue:
+            if (value_.array_)
+            {
+                ValueInternalArray::IteratorState it;
+                value_.array_->makeBeginIterator(it);
+                return const_iterator(it);
+            }
+            break;
+        case objectValue:
+            if (value_.map_)
+            {
+                ValueInternalMap::IteratorState it;
+                value_.map_->makeBeginIterator(it);
+                return const_iterator(it);
+            }
+            break;
 #else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return const_iterator( value_.map_->begin() );
-      break;
+        case arrayValue:
+        case objectValue:
+            if (value_.map_)
+                return const_iterator(value_.map_->begin());
+            break;
 #endif
-   default:
-      break;
-   }
-   return const_iterator();
+        default:
+            break;
+    }
+    return const_iterator();
 }
 
-Value::const_iterator
-Value::end() const
+Value::const_iterator Value::end() const
 {
-   switch ( type_ )
-   {
+    switch (type_)
+    {
 #ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeEndIterator( it );
-         return const_iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeEndIterator( it );
-         return const_iterator( it );
-      }
-      break;
+        case arrayValue:
+            if (value_.array_)
+            {
+                ValueInternalArray::IteratorState it;
+                value_.array_->makeEndIterator(it);
+                return const_iterator(it);
+            }
+            break;
+        case objectValue:
+            if (value_.map_)
+            {
+                ValueInternalMap::IteratorState it;
+                value_.map_->makeEndIterator(it);
+                return const_iterator(it);
+            }
+            break;
 #else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return const_iterator( value_.map_->end() );
-      break;
+        case arrayValue:
+        case objectValue:
+            if (value_.map_)
+                return const_iterator(value_.map_->end());
+            break;
 #endif
-   default:
-      break;
-   }
-   return const_iterator();
+        default:
+            break;
+    }
+    return const_iterator();
 }
 
-
-Value::iterator
-Value::begin()
+Value::iterator Value::begin()
 {
-   switch ( type_ )
-   {
+    switch (type_)
+    {
 #ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeBeginIterator( it );
-         return iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeBeginIterator( it );
-         return iterator( it );
-      }
-      break;
+        case arrayValue:
+            if (value_.array_)
+            {
+                ValueInternalArray::IteratorState it;
+                value_.array_->makeBeginIterator(it);
+                return iterator(it);
+            }
+            break;
+        case objectValue:
+            if (value_.map_)
+            {
+                ValueInternalMap::IteratorState it;
+                value_.map_->makeBeginIterator(it);
+                return iterator(it);
+            }
+            break;
 #else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return iterator( value_.map_->begin() );
-      break;
+        case arrayValue:
+        case objectValue:
+            if (value_.map_)
+                return iterator(value_.map_->begin());
+            break;
 #endif
-   default:
-      break;
-   }
-   return iterator();
+        default:
+            break;
+    }
+    return iterator();
 }
 
-Value::iterator
-Value::end()
+Value::iterator Value::end()
 {
-   switch ( type_ )
-   {
+    switch (type_)
+    {
 #ifdef JSON_VALUE_USE_INTERNAL_MAP
-   case arrayValue:
-      if ( value_.array_ )
-      {
-         ValueInternalArray::IteratorState it;
-         value_.array_->makeEndIterator( it );
-         return iterator( it );
-      }
-      break;
-   case objectValue:
-      if ( value_.map_ )
-      {
-         ValueInternalMap::IteratorState it;
-         value_.map_->makeEndIterator( it );
-         return iterator( it );
-      }
-      break;
+        case arrayValue:
+            if (value_.array_)
+            {
+                ValueInternalArray::IteratorState it;
+                value_.array_->makeEndIterator(it);
+                return iterator(it);
+            }
+            break;
+        case objectValue:
+            if (value_.map_)
+            {
+                ValueInternalMap::IteratorState it;
+                value_.map_->makeEndIterator(it);
+                return iterator(it);
+            }
+            break;
 #else
-   case arrayValue:
-   case objectValue:
-      if ( value_.map_ )
-         return iterator( value_.map_->end() );
-      break;
+        case arrayValue:
+        case objectValue:
+            if (value_.map_)
+                return iterator(value_.map_->end());
+            break;
 #endif
-   default:
-      break;
-   }
-   return iterator();
+        default:
+            break;
+    }
+    return iterator();
 }
 
-
 // class PathArgument
 // //////////////////////////////////////////////////////////////////
 
-PathArgument::PathArgument()
-   : kind_( kindNone )
-{
-}
-
+PathArgument::PathArgument() : kind_(kindNone) {}
 
-PathArgument::PathArgument( Value::UInt index )
-   : index_( index )
-   , kind_( kindIndex )
-{
-}
-
-
-PathArgument::PathArgument( const char *key )
-   : key_( key )
-   , kind_( kindKey )
-{
-}
+PathArgument::PathArgument(Value::UInt index) : index_(index), kind_(kindIndex) {}
 
+PathArgument::PathArgument(const char* key) : key_(key), kind_(kindKey) {}
 
-PathArgument::PathArgument( const std::string &key )
-   : key_( key.c_str() )
-   , kind_( kindKey )
-{
-}
+PathArgument::PathArgument(const std::string& key) : key_(key.c_str()), kind_(kindKey) {}
 
 // class Path
 // //////////////////////////////////////////////////////////////////
 
-Path::Path( const std::string &path,
-            const PathArgument &a1,
-            const PathArgument &a2,
-            const PathArgument &a3,
-            const PathArgument &a4,
-            const PathArgument &a5 )
-{
-   InArgs in;
-   in.push_back( &a1 );
-   in.push_back( &a2 );
-   in.push_back( &a3 );
-   in.push_back( &a4 );
-   in.push_back( &a5 );
-   makePath( path, in );
-}
-
-
-void
-Path::makePath( const std::string &path,
-                const InArgs &in )
-{
-   const char *current = path.c_str();
-   const char *end = current + path.length();
-   InArgs::const_iterator itInArg = in.begin();
-   while ( current != end )
-   {
-      if ( *current == '[' )
-      {
-         ++current;
-         if ( *current == '%' )
-            addPathInArg( path, in, itInArg, PathArgument::kindIndex );
-         else
-         {
-            Value::UInt index = 0;
-            for ( ; current != end && *current >= '0'  &&  *current <= '9'; ++current )
-               index = index * 10 + Value::UInt(*current - '0');
-            args_.push_back( index );
-         }
-         if ( current == end  ||  *current++ != ']' )
-            invalidPath( path, int(current - path.c_str()) );
-      }
-      else if ( *current == '%' )
-      {
-         addPathInArg( path, in, itInArg, PathArgument::kindKey );
-         ++current;
-      }
-      else if ( *current == '.' )
-      {
-         ++current;
-      }
-      else
-      {
-         const char *beginName = current;
-         while ( current != end  &&  !strchr( "[.", *current ) )
+Path::Path(const std::string& path,
+           const PathArgument& a1,
+           const PathArgument& a2,
+           const PathArgument& a3,
+           const PathArgument& a4,
+           const PathArgument& a5)
+{
+    InArgs in;
+    in.push_back(&a1);
+    in.push_back(&a2);
+    in.push_back(&a3);
+    in.push_back(&a4);
+    in.push_back(&a5);
+    makePath(path, in);
+}
+
+void Path::makePath(const std::string& path, const InArgs& in)
+{
+    const char* current = path.c_str();
+    const char* end = current + path.length();
+    InArgs::const_iterator itInArg = in.begin();
+    while (current != end)
+    {
+        if (*current == '[')
+        {
             ++current;
-         args_.push_back( std::string( beginName, current ) );
-      }
-   }
-}
-
-
-void
-Path::addPathInArg( const std::string &path,
-                    const InArgs &in,
-                    InArgs::const_iterator &itInArg,
-                    PathArgument::Kind kind )
-{
-   (void)path;
-   if ( itInArg == in.end() )
-   {
-      // Error: missing argument %d
-   }
-   else if ( (*itInArg)->kind_ != kind )
-   {
-      // Error: bad argument type
-   }
-   else
-   {
-      args_.push_back( **itInArg );
-   }
-}
-
-
-void
-Path::invalidPath( const std::string &path,
-                   int location )
+            if (*current == '%')
+                addPathInArg(path, in, itInArg, PathArgument::kindIndex);
+            else
+            {
+                Value::UInt index = 0;
+                for (; current != end && *current >= '0' && *current <= '9'; ++current)
+                    index = index * 10 + Value::UInt(*current - '0');
+                args_.push_back(index);
+            }
+            if (current == end || *current++ != ']')
+                invalidPath(path, int(current - path.c_str()));
+        }
+        else if (*current == '%')
+        {
+            addPathInArg(path, in, itInArg, PathArgument::kindKey);
+            ++current;
+        }
+        else if (*current == '.')
+        {
+            ++current;
+        }
+        else
+        {
+            const char* beginName = current;
+            while (current != end && !strchr("[.", *current))
+                ++current;
+            args_.push_back(std::string(beginName, current));
+        }
+    }
+}
+
+void Path::addPathInArg(const std::string& path,
+                        const InArgs& in,
+                        InArgs::const_iterator& itInArg,
+                        PathArgument::Kind kind)
 {
-   // Error: invalid path.
+    (void)path;
+    if (itInArg == in.end())
+    {
+        // Error: missing argument %d
+    }
+    else if ((*itInArg)->kind_ != kind)
+    {
+        // Error: bad argument type
+    }
+    else
+    {
+        args_.push_back(**itInArg);
+    }
+}
+
+void Path::invalidPath(const std::string& path, int location)
+{
+    // Error: invalid path.
     (void)path;
     (void)location;
 }
 
-
-const Value &
-Path::resolve( const Value &root ) const
-{
-   const Value *node = &root;
-   for ( Args::const_iterator it = args_.begin(); it != args_.end(); ++it )
-   {
-      const PathArgument &arg = *it;
-      if ( arg.kind_ == PathArgument::kindIndex )
-      {
-         if ( !node->isArray()  ||  node->isValidIndex( arg.index_ ) )
-         {
-            // Error: unable to resolve path (array value expected at position...
-         }
-         node = &((*node)[arg.index_]);
-      }
-      else if ( arg.kind_ == PathArgument::kindKey )
-      {
-         if ( !node->isObject() )
-         {
-            // Error: unable to resolve path (object value expected at position...)
-         }
-         node = &((*node)[arg.key_]);
-         if ( node == &Value::null )
-         {
-            // Error: unable to resolve path (object has no member named '' at position...)
-         }
-      }
-   }
-   return *node;
-}
-
-
-Value
-Path::resolve( const Value &root,
-               const Value &defaultValue ) const
-{
-   const Value *node = &root;
-   for ( Args::const_iterator it = args_.begin(); it != args_.end(); ++it )
-   {
-      const PathArgument &arg = *it;
-      if ( arg.kind_ == PathArgument::kindIndex )
-      {
-         if ( !node->isArray()  ||  node->isValidIndex( arg.index_ ) )
-            return defaultValue;
-         node = &((*node)[arg.index_]);
-      }
-      else if ( arg.kind_ == PathArgument::kindKey )
-      {
-         if ( !node->isObject() )
-            return defaultValue;
-         node = &((*node)[arg.key_]);
-         if ( node == &Value::null )
-            return defaultValue;
-      }
-   }
-   return *node;
-}
-
-
-Value &
-Path::make( Value &root ) const
-{
-   Value *node = &root;
-   for ( Args::const_iterator it = args_.begin(); it != args_.end(); ++it )
-   {
-      const PathArgument &arg = *it;
-      if ( arg.kind_ == PathArgument::kindIndex )
-      {
-         if ( !node->isArray() )
-         {
-            // Error: node is not an array at position ...
-         }
-         node = &((*node)[arg.index_]);
-      }
-      else if ( arg.kind_ == PathArgument::kindKey )
-      {
-         if ( !node->isObject() )
-         {
-            // Error: node is not an object at position...
-         }
-         node = &((*node)[arg.key_]);
-      }
-   }
-   return *node;
+const Value& Path::resolve(const Value& root) const
+{
+    const Value* node = &root;
+    for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it)
+    {
+        const PathArgument& arg = *it;
+        if (arg.kind_ == PathArgument::kindIndex)
+        {
+            if (!node->isArray() || node->isValidIndex(arg.index_))
+            {
+                // Error: unable to resolve path (array value expected at position...
+            }
+            node = &((*node)[arg.index_]);
+        }
+        else if (arg.kind_ == PathArgument::kindKey)
+        {
+            if (!node->isObject())
+            {
+                // Error: unable to resolve path (object value expected at position...)
+            }
+            node = &((*node)[arg.key_]);
+            if (node == &Value::null)
+            {
+                // Error: unable to resolve path (object has no member named '' at position...)
+            }
+        }
+    }
+    return *node;
+}
+
+Value Path::resolve(const Value& root, const Value& defaultValue) const
+{
+    const Value* node = &root;
+    for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it)
+    {
+        const PathArgument& arg = *it;
+        if (arg.kind_ == PathArgument::kindIndex)
+        {
+            if (!node->isArray() || node->isValidIndex(arg.index_))
+                return defaultValue;
+            node = &((*node)[arg.index_]);
+        }
+        else if (arg.kind_ == PathArgument::kindKey)
+        {
+            if (!node->isObject())
+                return defaultValue;
+            node = &((*node)[arg.key_]);
+            if (node == &Value::null)
+                return defaultValue;
+        }
+    }
+    return *node;
+}
+
+Value& Path::make(Value& root) const
+{
+    Value* node = &root;
+    for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it)
+    {
+        const PathArgument& arg = *it;
+        if (arg.kind_ == PathArgument::kindIndex)
+        {
+            if (!node->isArray())
+            {
+                // Error: node is not an array at position ...
+            }
+            node = &((*node)[arg.index_]);
+        }
+        else if (arg.kind_ == PathArgument::kindKey)
+        {
+            if (!node->isObject())
+            {
+                // Error: node is not an object at position...
+            }
+            node = &((*node)[arg.key_]);
+        }
+    }
+    return *node;
 }
 
-
 } // namespace Json
diff --git a/ext_libs/json/json_writer.cpp b/ext_libs/json/json_writer.cpp
index 4c36c5bd..a74afaf5 100644
--- a/ext_libs/json/json_writer.cpp
+++ b/ext_libs/json/json_writer.cpp
@@ -3,7 +3,6 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-
 #include <json/writer.h>
 #include <utility>
 #include <assert.h>
@@ -13,145 +12,145 @@
 #include <sstream>
 #include <iomanip>
 
-#if _MSC_VER >= 1400 // VC++ 8.0
-#pragma warning( disable : 4996 )   // disable warning about strdup being deprecated.
+#if _MSC_VER >= 1400            // VC++ 8.0
+#pragma warning(disable : 4996) // disable warning about strdup being deprecated.
 #endif
 
-namespace Json {
-
+namespace Json
+{
 static bool isControlCharacter(char ch)
 {
-   return ch > 0 && ch <= 0x1F;
+    return ch > 0 && ch <= 0x1F;
 }
 
-static bool containsControlCharacter( const char* str )
+static bool containsControlCharacter(const char* str)
 {
-   while ( *str )
-   {
-      if ( isControlCharacter( *(str++) ) )
-         return true;
-   }
-   return false;
+    while (*str)
+    {
+        if (isControlCharacter(*(str++)))
+            return true;
+    }
+    return false;
 }
-static void uintToString( unsigned int value,
-                          char *&current )
+static void uintToString(unsigned int value, char*& current)
 {
-   *--current = 0;
-   do
-   {
-      *--current = (value % 10) + '0';
-      value /= 10;
-   }
-   while ( value != 0 );
+    *--current = 0;
+    do
+    {
+        *--current = (value % 10) + '0';
+        value /= 10;
+    } while (value != 0);
 }
 
-std::string valueToString( Int value )
+std::string valueToString(Int value)
 {
-   char buffer[32];
-   char *current = buffer + sizeof(buffer);
-   bool isNegative = value < 0;
-   if ( isNegative )
-      value = -value;
-   uintToString( UInt(value), current );
-   if ( isNegative )
-      *--current = '-';
-   assert( current >= buffer );
-   return current;
+    char buffer[32];
+    char* current = buffer + sizeof(buffer);
+    bool isNegative = value < 0;
+    if (isNegative)
+        value = -value;
+    uintToString(UInt(value), current);
+    if (isNegative)
+        *--current = '-';
+    assert(current >= buffer);
+    return current;
 }
 
-
-std::string valueToString( UInt value )
+std::string valueToString(UInt value)
 {
-   char buffer[32];
-   char *current = buffer + sizeof(buffer);
-   uintToString( value, current );
-   assert( current >= buffer );
-   return current;
+    char buffer[32];
+    char* current = buffer + sizeof(buffer);
+    uintToString(value, current);
+    assert(current >= buffer);
+    return current;
 }
 
-std::string valueToString( double value )
+std::string valueToString(double value)
 {
-   char buffer[32];
+    char buffer[32];
 #if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
-   sprintf_s(buffer, sizeof(buffer), "%#.16g", value);
+    sprintf_s(buffer, sizeof(buffer), "%#.16g", value);
 #else
-   sprintf(buffer, "%#.16g", value);
+    sprintf(buffer, "%#.16g", value);
 #endif
-   char* ch = buffer + strlen(buffer) - 1;
-   if (*ch != '0') return buffer; // nothing to truncate, so save time
-   while(ch > buffer && *ch == '0'){
-     --ch;
-   }
-   char* last_nonzero = ch;
-   while(ch >= buffer){
-     switch(*ch){
-     case '0':
-     case '1':
-     case '2':
-     case '3':
-     case '4':
-     case '5':
-     case '6':
-     case '7':
-     case '8':
-     case '9':
-       --ch;
-       continue;
-     case '.':
-       // Truncate zeroes to save bytes in output, but keep one.
-       *(last_nonzero+2) = '\0';
-       return buffer;
-     default:
-       return buffer;
-     }
-   }
-   return buffer;
-}
-
-
-std::string valueToString( bool value )
-{
-   return value ? "true" : "false";
-}
-
-std::string valueToQuotedString( const char *value )
-{
-   // Not sure how to handle unicode...
-   if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
-      return std::string("\"") + value + "\"";
-   // We have to walk value and escape any special characters.
-   // Appending to std::string is not efficient, but this should be rare.
-   // (Note: forward slashes are *not* rare, but I am not escaping them.)
-   unsigned maxsize = strlen(value)*2 + 3; // allescaped+quotes+NULL
-   std::string result;
-   result.reserve(maxsize); // to avoid lots of mallocs
-   result += "\"";
-   for (const char* c=value; *c != 0; ++c)
-   {
-      switch(*c)
-      {
-         case '\"':
-            result += "\\\"";
-            break;
-         case '\\':
-            result += "\\\\";
-            break;
-         case '\b':
-            result += "\\b";
-            break;
-         case '\f':
-            result += "\\f";
-            break;
-         case '\n':
-            result += "\\n";
-            break;
-         case '\r':
-            result += "\\r";
-            break;
-         case '\t':
-            result += "\\t";
-            break;
-         //case '/':
+    char* ch = buffer + strlen(buffer) - 1;
+    if (*ch != '0')
+        return buffer; // nothing to truncate, so save time
+    while (ch > buffer && *ch == '0')
+    {
+        --ch;
+    }
+    char* last_nonzero = ch;
+    while (ch >= buffer)
+    {
+        switch (*ch)
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                --ch;
+                continue;
+            case '.':
+                // Truncate zeroes to save bytes in output, but keep one.
+                *(last_nonzero + 2) = '\0';
+                return buffer;
+            default:
+                return buffer;
+        }
+    }
+    return buffer;
+}
+
+std::string valueToString(bool value)
+{
+    return value ? "true" : "false";
+}
+
+std::string valueToQuotedString(const char* value)
+{
+    // Not sure how to handle unicode...
+    if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter(value))
+        return std::string("\"") + value + "\"";
+    // We have to walk value and escape any special characters.
+    // Appending to std::string is not efficient, but this should be rare.
+    // (Note: forward slashes are *not* rare, but I am not escaping them.)
+    unsigned maxsize = strlen(value) * 2 + 3; // allescaped+quotes+NULL
+    std::string result;
+    result.reserve(maxsize); // to avoid lots of mallocs
+    result += "\"";
+    for (const char* c = value; *c != 0; ++c)
+    {
+        switch (*c)
+        {
+            case '\"':
+                result += "\\\"";
+                break;
+            case '\\':
+                result += "\\\\";
+                break;
+            case '\b':
+                result += "\\b";
+                break;
+            case '\f':
+                result += "\\f";
+                break;
+            case '\n':
+                result += "\\n";
+                break;
+            case '\r':
+                result += "\\r";
+                break;
+            case '\t':
+                result += "\\t";
+                break;
+            // case '/':
             // Even though \/ is considered a legal escape in JSON, a bare
             // slash is also legal, so I see no reason to escape it.
             // (I hope I am not misunderstanding something.
@@ -159,683 +158,604 @@ std::string valueToQuotedString( const char *value )
             // sequence.
             // Should add a flag to allow this compatibility mode and prevent this
             // sequence from occurring.
-         default:
-            if ( isControlCharacter( *c ) )
-            {
-               std::ostringstream oss;
-               oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4) << static_cast<int>(*c);
-               result += oss.str();
-            }
-            else
-            {
-               result += *c;
-            }
-            break;
-      }
-   }
-   result += "\"";
-   return result;
+            default:
+                if (isControlCharacter(*c))
+                {
+                    std::ostringstream oss;
+                    oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4)
+                        << static_cast<int>(*c);
+                    result += oss.str();
+                }
+                else
+                {
+                    result += *c;
+                }
+                break;
+        }
+    }
+    result += "\"";
+    return result;
 }
 
 // Class Writer
 // //////////////////////////////////////////////////////////////////
-Writer::~Writer()
-{
-}
-
+Writer::~Writer() {}
 
 // Class FastWriter
 // //////////////////////////////////////////////////////////////////
 
-FastWriter::FastWriter()
-   : yamlCompatiblityEnabled_( false )
-{
-}
-
+FastWriter::FastWriter() : yamlCompatiblityEnabled_(false) {}
 
-void
-FastWriter::enableYAMLCompatibility()
+void FastWriter::enableYAMLCompatibility()
 {
-   yamlCompatiblityEnabled_ = true;
+    yamlCompatiblityEnabled_ = true;
 }
 
-
-std::string
-FastWriter::write( const Value &root, bool noNewLine )
+std::string FastWriter::write(const Value& root, bool noNewLine)
 {
-   document_ = "";
-   writeValue( root );
-   if(!noNewLine) {
+    document_ = "";
+    writeValue(root);
+    if (!noNewLine)
+    {
         document_ += "\n";
-   }
-   return document_;
-}
-
-
-void
-FastWriter::writeValue( const Value &value )
-{
-   switch ( value.type() )
-   {
-   case nullValue:
-      document_ += "null";
-      break;
-   case intValue:
-      document_ += valueToString( value.asInt() );
-      break;
-   case uintValue:
-      document_ += valueToString( value.asUInt() );
-      break;
-   case realValue:
-      document_ += valueToString( value.asDouble() );
-      break;
-   case stringValue:
-      document_ += valueToQuotedString( value.asCString() );
-      break;
-   case booleanValue:
-      document_ += valueToString( value.asBool() );
-      break;
-   case arrayValue:
-      {
-         document_ += "[";
-         int size = value.size();
-         for ( int index =0; index < size; ++index )
-         {
-            if ( index > 0 )
-               document_ += ",";
-            writeValue( value[index] );
-         }
-         document_ += "]";
-      }
-      break;
-   case objectValue:
-      {
-         Value::Members members( value.getMemberNames() );
-         document_ += "{";
-         for ( Value::Members::iterator it = members.begin();
-               it != members.end();
-               ++it )
-         {
-            const std::string &name = *it;
-            if ( it != members.begin() )
-               document_ += ",";
-            document_ += valueToQuotedString( name.c_str() );
-            document_ += yamlCompatiblityEnabled_ ? ": "
-                                                  : ":";
-            writeValue( value[name] );
-         }
-         document_ += "}";
-      }
-      break;
-   }
+    }
+    return document_;
 }
 
+void FastWriter::writeValue(const Value& value)
+{
+    switch (value.type())
+    {
+        case nullValue:
+            document_ += "null";
+            break;
+        case intValue:
+            document_ += valueToString(value.asInt());
+            break;
+        case uintValue:
+            document_ += valueToString(value.asUInt());
+            break;
+        case realValue:
+            document_ += valueToString(value.asDouble());
+            break;
+        case stringValue:
+            document_ += valueToQuotedString(value.asCString());
+            break;
+        case booleanValue:
+            document_ += valueToString(value.asBool());
+            break;
+        case arrayValue:
+        {
+            document_ += "[";
+            int size = value.size();
+            for (int index = 0; index < size; ++index)
+            {
+                if (index > 0)
+                    document_ += ",";
+                writeValue(value[index]);
+            }
+            document_ += "]";
+        }
+        break;
+        case objectValue:
+        {
+            Value::Members members(value.getMemberNames());
+            document_ += "{";
+            for (Value::Members::iterator it = members.begin(); it != members.end(); ++it)
+            {
+                const std::string& name = *it;
+                if (it != members.begin())
+                    document_ += ",";
+                document_ += valueToQuotedString(name.c_str());
+                document_ += yamlCompatiblityEnabled_ ? ": " : ":";
+                writeValue(value[name]);
+            }
+            document_ += "}";
+        }
+        break;
+    }
+}
 
 // Class StyledWriter
 // //////////////////////////////////////////////////////////////////
 
-StyledWriter::StyledWriter()
-   : rightMargin_( 74 )
-   , indentSize_( 3 )
+StyledWriter::StyledWriter() : rightMargin_(74), indentSize_(3) {}
+
+std::string StyledWriter::write(const Value& root, bool noNewLine)
 {
+    document_ = "";
+    addChildValues_ = false;
+    indentString_ = "";
+    writeCommentBeforeValue(root);
+    writeValue(root);
+    writeCommentAfterValueOnSameLine(root);
+    if (!noNewLine)
+    {
+        document_ += "\n";
+    }
+    return document_;
 }
 
-
-std::string
-StyledWriter::write( const Value &root, bool noNewLine)
+void StyledWriter::writeValue(const Value& value)
 {
-   document_ = "";
-   addChildValues_ = false;
-   indentString_ = "";
-   writeCommentBeforeValue( root );
-   writeValue( root );
-   writeCommentAfterValueOnSameLine( root );
-   if(!noNewLine) {
-        document_ += "\n";
-   }
-   return document_;
-}
-
-
-void
-StyledWriter::writeValue( const Value &value )
-{
-   switch ( value.type() )
-   {
-   case nullValue:
-      pushValue( "null" );
-      break;
-   case intValue:
-      pushValue( valueToString( value.asInt() ) );
-      break;
-   case uintValue:
-      pushValue( valueToString( value.asUInt() ) );
-      break;
-   case realValue:
-      pushValue( valueToString( value.asDouble() ) );
-      break;
-   case stringValue:
-      pushValue( valueToQuotedString( value.asCString() ) );
-      break;
-   case booleanValue:
-      pushValue( valueToString( value.asBool() ) );
-      break;
-   case arrayValue:
-      writeArrayValue( value);
-      break;
-   case objectValue:
-      {
-         Value::Members members( value.getMemberNames() );
-         if ( members.empty() )
-            pushValue( "{}" );
-         else
-         {
-            writeWithIndent( "{" );
-            indent();
-            Value::Members::iterator it = members.begin();
-            while ( true )
+    switch (value.type())
+    {
+        case nullValue:
+            pushValue("null");
+            break;
+        case intValue:
+            pushValue(valueToString(value.asInt()));
+            break;
+        case uintValue:
+            pushValue(valueToString(value.asUInt()));
+            break;
+        case realValue:
+            pushValue(valueToString(value.asDouble()));
+            break;
+        case stringValue:
+            pushValue(valueToQuotedString(value.asCString()));
+            break;
+        case booleanValue:
+            pushValue(valueToString(value.asBool()));
+            break;
+        case arrayValue:
+            writeArrayValue(value);
+            break;
+        case objectValue:
+        {
+            Value::Members members(value.getMemberNames());
+            if (members.empty())
+                pushValue("{}");
+            else
             {
-               const std::string &name = *it;
-               const Value &childValue = value[name];
-               writeCommentBeforeValue( childValue );
-               writeWithIndent( valueToQuotedString( name.c_str() ) );
-               document_ += " : ";
-               writeValue( childValue );
-               if ( ++it == members.end() )
-               {
-                  writeCommentAfterValueOnSameLine( childValue );
-                  break;
-               }
-               document_ += ",";
-               writeCommentAfterValueOnSameLine( childValue );
+                writeWithIndent("{");
+                indent();
+                Value::Members::iterator it = members.begin();
+                while (true)
+                {
+                    const std::string& name = *it;
+                    const Value& childValue = value[name];
+                    writeCommentBeforeValue(childValue);
+                    writeWithIndent(valueToQuotedString(name.c_str()));
+                    document_ += " : ";
+                    writeValue(childValue);
+                    if (++it == members.end())
+                    {
+                        writeCommentAfterValueOnSameLine(childValue);
+                        break;
+                    }
+                    document_ += ",";
+                    writeCommentAfterValueOnSameLine(childValue);
+                }
+                unindent();
+                writeWithIndent("}");
             }
-            unindent();
-            writeWithIndent( "}" );
-         }
-      }
-      break;
-   }
-}
-
-
-void
-StyledWriter::writeArrayValue( const Value &value )
-{
-   unsigned size = value.size();
-   if ( size == 0 )
-      pushValue( "[]" );
-   else
-   {
-      bool isArrayMultiLine = isMultineArray( value );
-      if ( isArrayMultiLine )
-      {
-         writeWithIndent( "[" );
-         indent();
-         bool hasChildValue = !childValues_.empty();
-         unsigned index =0;
-         while ( true )
-         {
-            const Value &childValue = value[index];
-            writeCommentBeforeValue( childValue );
-            if ( hasChildValue )
-               writeWithIndent( childValues_[index] );
-            else
+        }
+        break;
+    }
+}
+
+void StyledWriter::writeArrayValue(const Value& value)
+{
+    unsigned size = value.size();
+    if (size == 0)
+        pushValue("[]");
+    else
+    {
+        bool isArrayMultiLine = isMultineArray(value);
+        if (isArrayMultiLine)
+        {
+            writeWithIndent("[");
+            indent();
+            bool hasChildValue = !childValues_.empty();
+            unsigned index = 0;
+            while (true)
             {
-               writeIndent();
-               writeValue( childValue );
+                const Value& childValue = value[index];
+                writeCommentBeforeValue(childValue);
+                if (hasChildValue)
+                    writeWithIndent(childValues_[index]);
+                else
+                {
+                    writeIndent();
+                    writeValue(childValue);
+                }
+                if (++index == size)
+                {
+                    writeCommentAfterValueOnSameLine(childValue);
+                    break;
+                }
+                document_ += ",";
+                writeCommentAfterValueOnSameLine(childValue);
             }
-            if ( ++index == size )
+            unindent();
+            writeWithIndent("]");
+        }
+        else // output on a single line
+        {
+            assert(childValues_.size() == size);
+            document_ += "[ ";
+            for (unsigned index = 0; index < size; ++index)
             {
-               writeCommentAfterValueOnSameLine( childValue );
-               break;
+                if (index > 0)
+                    document_ += ", ";
+                document_ += childValues_[index];
             }
-            document_ += ",";
-            writeCommentAfterValueOnSameLine( childValue );
-         }
-         unindent();
-         writeWithIndent( "]" );
-      }
-      else // output on a single line
-      {
-         assert( childValues_.size() == size );
-         document_ += "[ ";
-         for ( unsigned index =0; index < size; ++index )
-         {
-            if ( index > 0 )
-               document_ += ", ";
-            document_ += childValues_[index];
-         }
-         document_ += " ]";
-      }
-   }
+            document_ += " ]";
+        }
+    }
 }
 
-
-bool
-StyledWriter::isMultineArray( const Value &value )
+bool StyledWriter::isMultineArray(const Value& value)
 {
-   int size = value.size();
-   bool isMultiLine = size*3 >= rightMargin_ ;
-   childValues_.clear();
-   for ( int index =0; index < size  &&  !isMultiLine; ++index )
-   {
-      const Value &childValue = value[index];
-      isMultiLine = isMultiLine  ||
-                     ( (childValue.isArray()  ||  childValue.isObject())  &&
-                        childValue.size() > 0 );
-   }
-   if ( !isMultiLine ) // check if line length > max line length
-   {
-      childValues_.reserve( size );
-      addChildValues_ = true;
-      int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
-      for ( int index =0; index < size  &&  !isMultiLine; ++index )
-      {
-         writeValue( value[index] );
-         lineLength += int( childValues_[index].length() );
-         isMultiLine = isMultiLine  &&  hasCommentForValue( value[index] );
-      }
-      addChildValues_ = false;
-      isMultiLine = isMultiLine  ||  lineLength >= rightMargin_;
-   }
-   return isMultiLine;
+    int size = value.size();
+    bool isMultiLine = size * 3 >= rightMargin_;
+    childValues_.clear();
+    for (int index = 0; index < size && !isMultiLine; ++index)
+    {
+        const Value& childValue = value[index];
+        isMultiLine = isMultiLine || ((childValue.isArray() || childValue.isObject()) && childValue.size() > 0);
+    }
+    if (!isMultiLine) // check if line length > max line length
+    {
+        childValues_.reserve(size);
+        addChildValues_ = true;
+        int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
+        for (int index = 0; index < size && !isMultiLine; ++index)
+        {
+            writeValue(value[index]);
+            lineLength += int(childValues_[index].length());
+            isMultiLine = isMultiLine && hasCommentForValue(value[index]);
+        }
+        addChildValues_ = false;
+        isMultiLine = isMultiLine || lineLength >= rightMargin_;
+    }
+    return isMultiLine;
 }
 
-
-void
-StyledWriter::pushValue( const std::string &value )
+void StyledWriter::pushValue(const std::string& value)
 {
-   if ( addChildValues_ )
-      childValues_.push_back( value );
-   else
-      document_ += value;
+    if (addChildValues_)
+        childValues_.push_back(value);
+    else
+        document_ += value;
 }
 
-
-void
-StyledWriter::writeIndent()
+void StyledWriter::writeIndent()
 {
-   if ( !document_.empty() )
-   {
-      char last = document_[document_.length()-1];
-      if ( last == ' ' )     // already indented
-         return;
-      if ( last != '\n' )    // Comments may add new-line
-         document_ += '\n';
-   }
-   document_ += indentString_;
+    if (!document_.empty())
+    {
+        char last = document_[document_.length() - 1];
+        if (last == ' ') // already indented
+            return;
+        if (last != '\n') // Comments may add new-line
+            document_ += '\n';
+    }
+    document_ += indentString_;
 }
 
-
-void
-StyledWriter::writeWithIndent( const std::string &value )
+void StyledWriter::writeWithIndent(const std::string& value)
 {
-   writeIndent();
-   document_ += value;
+    writeIndent();
+    document_ += value;
 }
 
-
-void
-StyledWriter::indent()
+void StyledWriter::indent()
 {
-   indentString_ += std::string( indentSize_, ' ' );
+    indentString_ += std::string(indentSize_, ' ');
 }
 
-
-void
-StyledWriter::unindent()
+void StyledWriter::unindent()
 {
-   assert( int(indentString_.size()) >= indentSize_ );
-   indentString_.resize( indentString_.size() - indentSize_ );
+    assert(int(indentString_.size()) >= indentSize_);
+    indentString_.resize(indentString_.size() - indentSize_);
 }
 
-
-void
-StyledWriter::writeCommentBeforeValue( const Value &root )
+void StyledWriter::writeCommentBeforeValue(const Value& root)
 {
-   if ( !root.hasComment( commentBefore ) )
-      return;
-   document_ += normalizeEOL( root.getComment( commentBefore ) );
-   document_ += "\n";
+    if (!root.hasComment(commentBefore))
+        return;
+    document_ += normalizeEOL(root.getComment(commentBefore));
+    document_ += "\n";
 }
 
-
-void
-StyledWriter::writeCommentAfterValueOnSameLine( const Value &root )
+void StyledWriter::writeCommentAfterValueOnSameLine(const Value& root)
 {
-   if ( root.hasComment( commentAfterOnSameLine ) )
-      document_ += " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
+    if (root.hasComment(commentAfterOnSameLine))
+        document_ += " " + normalizeEOL(root.getComment(commentAfterOnSameLine));
 
-   if ( root.hasComment( commentAfter ) )
-   {
-      document_ += "\n";
-      document_ += normalizeEOL( root.getComment( commentAfter ) );
-      document_ += "\n";
-   }
+    if (root.hasComment(commentAfter))
+    {
+        document_ += "\n";
+        document_ += normalizeEOL(root.getComment(commentAfter));
+        document_ += "\n";
+    }
 }
 
-
-bool
-StyledWriter::hasCommentForValue( const Value &value )
+bool StyledWriter::hasCommentForValue(const Value& value)
 {
-   return value.hasComment( commentBefore )
-          ||  value.hasComment( commentAfterOnSameLine )
-          ||  value.hasComment( commentAfter );
+    return value.hasComment(commentBefore) || value.hasComment(commentAfterOnSameLine) ||
+           value.hasComment(commentAfter);
 }
 
-
-std::string
-StyledWriter::normalizeEOL( const std::string &text )
+std::string StyledWriter::normalizeEOL(const std::string& text)
 {
-   std::string normalized;
-   normalized.reserve( text.length() );
-   const char *begin = text.c_str();
-   const char *end = begin + text.length();
-   const char *current = begin;
-   while ( current != end )
-   {
-      char c = *current++;
-      if ( c == '\r' ) // mac or dos EOL
-      {
-         if ( *current == '\n' ) // convert dos EOL
-            ++current;
-         normalized += '\n';
-      }
-      else // handle unix EOL & other char
-         normalized += c;
-   }
-   return normalized;
+    std::string normalized;
+    normalized.reserve(text.length());
+    const char* begin = text.c_str();
+    const char* end = begin + text.length();
+    const char* current = begin;
+    while (current != end)
+    {
+        char c = *current++;
+        if (c == '\r') // mac or dos EOL
+        {
+            if (*current == '\n') // convert dos EOL
+                ++current;
+            normalized += '\n';
+        }
+        else // handle unix EOL & other char
+            normalized += c;
+    }
+    return normalized;
 }
 
-
 // Class StyledStreamWriter
 // //////////////////////////////////////////////////////////////////
 
-StyledStreamWriter::StyledStreamWriter( std::string indentation )
-   : document_(NULL)
-   , rightMargin_( 74 )
-   , indentation_( indentation )
-{
-}
-
-
-void
-StyledStreamWriter::write( std::ostream &out, const Value &root, bool noNewLine)
-{
-   document_ = &out;
-   addChildValues_ = false;
-   indentString_ = "";
-   writeCommentBeforeValue( root );
-   writeValue( root );
-   writeCommentAfterValueOnSameLine( root );
-   if(!noNewLine) {
-       *document_ << "\n";
-   }
-   document_ = NULL; // Forget the stream, for safety.
-}
-
-
-void
-StyledStreamWriter::writeValue( const Value &value )
-{
-   switch ( value.type() )
-   {
-   case nullValue:
-      pushValue( "null" );
-      break;
-   case intValue:
-      pushValue( valueToString( value.asInt() ) );
-      break;
-   case uintValue:
-      pushValue( valueToString( value.asUInt() ) );
-      break;
-   case realValue:
-      pushValue( valueToString( value.asDouble() ) );
-      break;
-   case stringValue:
-      pushValue( valueToQuotedString( value.asCString() ) );
-      break;
-   case booleanValue:
-      pushValue( valueToString( value.asBool() ) );
-      break;
-   case arrayValue:
-      writeArrayValue( value);
-      break;
-   case objectValue:
-      {
-         Value::Members members( value.getMemberNames() );
-         if ( members.empty() )
-            pushValue( "{}" );
-         else
-         {
-            writeWithIndent( "{" );
-            indent();
-            Value::Members::iterator it = members.begin();
-            while ( true )
-            {
-               const std::string &name = *it;
-               const Value &childValue = value[name];
-               writeCommentBeforeValue( childValue );
-               writeWithIndent( valueToQuotedString( name.c_str() ) );
-               *document_ << " : ";
-               writeValue( childValue );
-               if ( ++it == members.end() )
-               {
-                  writeCommentAfterValueOnSameLine( childValue );
-                  break;
-               }
-               *document_ << ",";
-               writeCommentAfterValueOnSameLine( childValue );
-            }
-            unindent();
-            writeWithIndent( "}" );
-         }
-      }
-      break;
-   }
-}
-
-
-void
-StyledStreamWriter::writeArrayValue( const Value &value )
-{
-   unsigned size = value.size();
-   if ( size == 0 )
-      pushValue( "[]" );
-   else
-   {
-      bool isArrayMultiLine = isMultineArray( value );
-      if ( isArrayMultiLine )
-      {
-         writeWithIndent( "[" );
-         indent();
-         bool hasChildValue = !childValues_.empty();
-         unsigned index =0;
-         while ( true )
-         {
-            const Value &childValue = value[index];
-            writeCommentBeforeValue( childValue );
-            if ( hasChildValue )
-               writeWithIndent( childValues_[index] );
-            else
-            {
-	       writeIndent();
-               writeValue( childValue );
-            }
-            if ( ++index == size )
-            {
-               writeCommentAfterValueOnSameLine( childValue );
-               break;
-            }
-            *document_ << ",";
-            writeCommentAfterValueOnSameLine( childValue );
-         }
-         unindent();
-         writeWithIndent( "]" );
-      }
-      else // output on a single line
-      {
-         assert( childValues_.size() == size );
-         *document_ << "[ ";
-         for ( unsigned index =0; index < size; ++index )
-         {
-            if ( index > 0 )
-               *document_ << ", ";
-            *document_ << childValues_[index];
-         }
-         *document_ << " ]";
-      }
-   }
-}
-
-
-bool
-StyledStreamWriter::isMultineArray( const Value &value )
+StyledStreamWriter::StyledStreamWriter(std::string indentation) :
+    document_(NULL), rightMargin_(74), indentation_(indentation)
 {
-   int size = value.size();
-   bool isMultiLine = size*3 >= rightMargin_ ;
-   childValues_.clear();
-   for ( int index =0; index < size  &&  !isMultiLine; ++index )
-   {
-      const Value &childValue = value[index];
-      isMultiLine = isMultiLine  ||
-                     ( (childValue.isArray()  ||  childValue.isObject())  &&
-                        childValue.size() > 0 );
-   }
-   if ( !isMultiLine ) // check if line length > max line length
-   {
-      childValues_.reserve( size );
-      addChildValues_ = true;
-      int lineLength = 4 + (size-1)*2; // '[ ' + ', '*n + ' ]'
-      for ( int index =0; index < size  &&  !isMultiLine; ++index )
-      {
-         writeValue( value[index] );
-         lineLength += int( childValues_[index].length() );
-         isMultiLine = isMultiLine  &&  hasCommentForValue( value[index] );
-      }
-      addChildValues_ = false;
-      isMultiLine = isMultiLine  ||  lineLength >= rightMargin_;
-   }
-   return isMultiLine;
 }
 
-
-void
-StyledStreamWriter::pushValue( const std::string &value )
+void StyledStreamWriter::write(std::ostream& out, const Value& root, bool noNewLine)
 {
-   if ( addChildValues_ )
-      childValues_.push_back( value );
-   else
-      *document_ << value;
+    document_ = &out;
+    addChildValues_ = false;
+    indentString_ = "";
+    writeCommentBeforeValue(root);
+    writeValue(root);
+    writeCommentAfterValueOnSameLine(root);
+    if (!noNewLine)
+    {
+        *document_ << "\n";
+    }
+    document_ = NULL; // Forget the stream, for safety.
 }
 
-
-void
-StyledStreamWriter::writeIndent()
+void StyledStreamWriter::writeValue(const Value& value)
 {
-  /*
-    Some comments in this method would have been nice. ;-)
-
-   if ( !document_.empty() )
-   {
-      char last = document_[document_.length()-1];
-      if ( last == ' ' )     // already indented
-         return;
-      if ( last != '\n' )    // Comments may add new-line
-         *document_ << '\n';
-   }
-  */
-   *document_ << '\n' << indentString_;
+    switch (value.type())
+    {
+        case nullValue:
+            pushValue("null");
+            break;
+        case intValue:
+            pushValue(valueToString(value.asInt()));
+            break;
+        case uintValue:
+            pushValue(valueToString(value.asUInt()));
+            break;
+        case realValue:
+            pushValue(valueToString(value.asDouble()));
+            break;
+        case stringValue:
+            pushValue(valueToQuotedString(value.asCString()));
+            break;
+        case booleanValue:
+            pushValue(valueToString(value.asBool()));
+            break;
+        case arrayValue:
+            writeArrayValue(value);
+            break;
+        case objectValue:
+        {
+            Value::Members members(value.getMemberNames());
+            if (members.empty())
+                pushValue("{}");
+            else
+            {
+                writeWithIndent("{");
+                indent();
+                Value::Members::iterator it = members.begin();
+                while (true)
+                {
+                    const std::string& name = *it;
+                    const Value& childValue = value[name];
+                    writeCommentBeforeValue(childValue);
+                    writeWithIndent(valueToQuotedString(name.c_str()));
+                    *document_ << " : ";
+                    writeValue(childValue);
+                    if (++it == members.end())
+                    {
+                        writeCommentAfterValueOnSameLine(childValue);
+                        break;
+                    }
+                    *document_ << ",";
+                    writeCommentAfterValueOnSameLine(childValue);
+                }
+                unindent();
+                writeWithIndent("}");
+            }
+        }
+        break;
+    }
+}
+
+void StyledStreamWriter::writeArrayValue(const Value& value)
+{
+    unsigned size = value.size();
+    if (size == 0)
+        pushValue("[]");
+    else
+    {
+        bool isArrayMultiLine = isMultineArray(value);
+        if (isArrayMultiLine)
+        {
+            writeWithIndent("[");
+            indent();
+            bool hasChildValue = !childValues_.empty();
+            unsigned index = 0;
+            while (true)
+            {
+                const Value& childValue = value[index];
+                writeCommentBeforeValue(childValue);
+                if (hasChildValue)
+                    writeWithIndent(childValues_[index]);
+                else
+                {
+                    writeIndent();
+                    writeValue(childValue);
+                }
+                if (++index == size)
+                {
+                    writeCommentAfterValueOnSameLine(childValue);
+                    break;
+                }
+                *document_ << ",";
+                writeCommentAfterValueOnSameLine(childValue);
+            }
+            unindent();
+            writeWithIndent("]");
+        }
+        else // output on a single line
+        {
+            assert(childValues_.size() == size);
+            *document_ << "[ ";
+            for (unsigned index = 0; index < size; ++index)
+            {
+                if (index > 0)
+                    *document_ << ", ";
+                *document_ << childValues_[index];
+            }
+            *document_ << " ]";
+        }
+    }
+}
+
+bool StyledStreamWriter::isMultineArray(const Value& value)
+{
+    int size = value.size();
+    bool isMultiLine = size * 3 >= rightMargin_;
+    childValues_.clear();
+    for (int index = 0; index < size && !isMultiLine; ++index)
+    {
+        const Value& childValue = value[index];
+        isMultiLine = isMultiLine || ((childValue.isArray() || childValue.isObject()) && childValue.size() > 0);
+    }
+    if (!isMultiLine) // check if line length > max line length
+    {
+        childValues_.reserve(size);
+        addChildValues_ = true;
+        int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
+        for (int index = 0; index < size && !isMultiLine; ++index)
+        {
+            writeValue(value[index]);
+            lineLength += int(childValues_[index].length());
+            isMultiLine = isMultiLine && hasCommentForValue(value[index]);
+        }
+        addChildValues_ = false;
+        isMultiLine = isMultiLine || lineLength >= rightMargin_;
+    }
+    return isMultiLine;
+}
+
+void StyledStreamWriter::pushValue(const std::string& value)
+{
+    if (addChildValues_)
+        childValues_.push_back(value);
+    else
+        *document_ << value;
+}
+
+void StyledStreamWriter::writeIndent()
+{
+    /*
+      Some comments in this method would have been nice. ;-)
+
+     if ( !document_.empty() )
+     {
+        char last = document_[document_.length()-1];
+        if ( last == ' ' )     // already indented
+           return;
+        if ( last != '\n' )    // Comments may add new-line
+           *document_ << '\n';
+     }
+    */
+    *document_ << '\n' << indentString_;
 }
 
-
-void
-StyledStreamWriter::writeWithIndent( const std::string &value )
+void StyledStreamWriter::writeWithIndent(const std::string& value)
 {
-   writeIndent();
-   *document_ << value;
+    writeIndent();
+    *document_ << value;
 }
 
-
-void
-StyledStreamWriter::indent()
+void StyledStreamWriter::indent()
 {
-   indentString_ += indentation_;
+    indentString_ += indentation_;
 }
 
-
-void
-StyledStreamWriter::unindent()
+void StyledStreamWriter::unindent()
 {
-   assert( indentString_.size() >= indentation_.size() );
-   indentString_.resize( indentString_.size() - indentation_.size() );
+    assert(indentString_.size() >= indentation_.size());
+    indentString_.resize(indentString_.size() - indentation_.size());
 }
 
-
-void
-StyledStreamWriter::writeCommentBeforeValue( const Value &root )
+void StyledStreamWriter::writeCommentBeforeValue(const Value& root)
 {
-   if ( !root.hasComment( commentBefore ) )
-      return;
-   *document_ << normalizeEOL( root.getComment( commentBefore ) );
-   *document_ << "\n";
+    if (!root.hasComment(commentBefore))
+        return;
+    *document_ << normalizeEOL(root.getComment(commentBefore));
+    *document_ << "\n";
 }
 
-
-void
-StyledStreamWriter::writeCommentAfterValueOnSameLine( const Value &root )
+void StyledStreamWriter::writeCommentAfterValueOnSameLine(const Value& root)
 {
-   if ( root.hasComment( commentAfterOnSameLine ) )
-      *document_ << " " + normalizeEOL( root.getComment( commentAfterOnSameLine ) );
+    if (root.hasComment(commentAfterOnSameLine))
+        *document_ << " " + normalizeEOL(root.getComment(commentAfterOnSameLine));
 
-   if ( root.hasComment( commentAfter ) )
-   {
-      *document_ << "\n";
-      *document_ << normalizeEOL( root.getComment( commentAfter ) );
-      *document_ << "\n";
-   }
+    if (root.hasComment(commentAfter))
+    {
+        *document_ << "\n";
+        *document_ << normalizeEOL(root.getComment(commentAfter));
+        *document_ << "\n";
+    }
 }
 
-
-bool
-StyledStreamWriter::hasCommentForValue( const Value &value )
+bool StyledStreamWriter::hasCommentForValue(const Value& value)
 {
-   return value.hasComment( commentBefore )
-          ||  value.hasComment( commentAfterOnSameLine )
-          ||  value.hasComment( commentAfter );
+    return value.hasComment(commentBefore) || value.hasComment(commentAfterOnSameLine) ||
+           value.hasComment(commentAfter);
 }
 
-
-std::string
-StyledStreamWriter::normalizeEOL( const std::string &text )
+std::string StyledStreamWriter::normalizeEOL(const std::string& text)
 {
-   std::string normalized;
-   normalized.reserve( text.length() );
-   const char *begin = text.c_str();
-   const char *end = begin + text.length();
-   const char *current = begin;
-   while ( current != end )
-   {
-      char c = *current++;
-      if ( c == '\r' ) // mac or dos EOL
-      {
-         if ( *current == '\n' ) // convert dos EOL
-            ++current;
-         normalized += '\n';
-      }
-      else // handle unix EOL & other char
-         normalized += c;
-   }
-   return normalized;
+    std::string normalized;
+    normalized.reserve(text.length());
+    const char* begin = text.c_str();
+    const char* end = begin + text.length();
+    const char* current = begin;
+    while (current != end)
+    {
+        char c = *current++;
+        if (c == '\r') // mac or dos EOL
+        {
+            if (*current == '\n') // convert dos EOL
+                ++current;
+            normalized += '\n';
+        }
+        else // handle unix EOL & other char
+            normalized += c;
+    }
+    return normalized;
 }
 
-
-std::ostream& operator<<( std::ostream &sout, const Value &root )
+std::ostream& operator<<(std::ostream& sout, const Value& root)
 {
-   Json::StyledStreamWriter writer;
-   writer.write(sout, root);
-   return sout;
+    Json::StyledStreamWriter writer;
+    writer.write(sout, root);
+    return sout;
 }
 
-
 } // namespace Json
diff --git a/ext_libs/minixz/xz.h b/ext_libs/minixz/xz.h
index 578a1c7f..413ed569 100644
--- a/ext_libs/minixz/xz.h
+++ b/ext_libs/minixz/xz.h
@@ -42,230 +42,234 @@
 #define XZ_H
 
 #ifdef __KERNEL__
-#	include <linux/stddef.h>
-#	include <linux/types.h>
+#include <linux/stddef.h>
+#include <linux/types.h>
 #else
-#	include <stddef.h>
-#	include <stdint.h>
+#include <stddef.h>
+#include <stdint.h>
 #endif
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /* In Linux, this is used to make extern functions static when needed. */
 #ifndef XZ_EXTERN
-#	define XZ_EXTERN extern
+#define XZ_EXTERN extern
 #endif
 
-/**
- * enum xz_mode - Operation mode
- *
- * @XZ_SINGLE:              Single-call mode. This uses less RAM than
- *                          than multi-call modes, because the LZMA2
- *                          dictionary doesn't need to be allocated as
- *                          part of the decoder state. All required data
- *                          structures are allocated at initialization,
- *                          so xz_dec_run() cannot return XZ_MEM_ERROR.
- * @XZ_PREALLOC:            Multi-call mode with preallocated LZMA2
- *                          dictionary buffer. All data structures are
- *                          allocated at initialization, so xz_dec_run()
- *                          cannot return XZ_MEM_ERROR.
- * @XZ_DYNALLOC:            Multi-call mode. The LZMA2 dictionary is
- *                          allocated once the required size has been
- *                          parsed from the stream headers. If the
- *                          allocation fails, xz_dec_run() will return
- *                          XZ_MEM_ERROR.
- *
- * It is possible to enable support only for a subset of the above
- * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,
- * or XZ_DEC_DYNALLOC. The xz_dec kernel module is always compiled
- * with support for all operation modes, but the preboot code may
- * be built with fewer features to minimize code size.
- */
-enum xz_mode {
-	XZ_SINGLE,
-	XZ_PREALLOC,
-	XZ_DYNALLOC
-};
+    /**
+     * enum xz_mode - Operation mode
+     *
+     * @XZ_SINGLE:              Single-call mode. This uses less RAM than
+     *                          than multi-call modes, because the LZMA2
+     *                          dictionary doesn't need to be allocated as
+     *                          part of the decoder state. All required data
+     *                          structures are allocated at initialization,
+     *                          so xz_dec_run() cannot return XZ_MEM_ERROR.
+     * @XZ_PREALLOC:            Multi-call mode with preallocated LZMA2
+     *                          dictionary buffer. All data structures are
+     *                          allocated at initialization, so xz_dec_run()
+     *                          cannot return XZ_MEM_ERROR.
+     * @XZ_DYNALLOC:            Multi-call mode. The LZMA2 dictionary is
+     *                          allocated once the required size has been
+     *                          parsed from the stream headers. If the
+     *                          allocation fails, xz_dec_run() will return
+     *                          XZ_MEM_ERROR.
+     *
+     * It is possible to enable support only for a subset of the above
+     * modes at compile time by defining XZ_DEC_SINGLE, XZ_DEC_PREALLOC,
+     * or XZ_DEC_DYNALLOC. The xz_dec kernel module is always compiled
+     * with support for all operation modes, but the preboot code may
+     * be built with fewer features to minimize code size.
+     */
+    enum xz_mode
+    {
+        XZ_SINGLE,
+        XZ_PREALLOC,
+        XZ_DYNALLOC
+    };
 
-/**
- * enum xz_ret - Return codes
- * @XZ_OK:                  Everything is OK so far. More input or more
- *                          output space is required to continue. This
- *                          return code is possible only in multi-call mode
- *                          (XZ_PREALLOC or XZ_DYNALLOC).
- * @XZ_STREAM_END:          Operation finished successfully.
- * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
- *                          is still possible in multi-call mode by simply
- *                          calling xz_dec_run() again.
- *                          Note that this return value is used only if
- *                          XZ_DEC_ANY_CHECK was defined at build time,
- *                          which is not used in the kernel. Unsupported
- *                          check types return XZ_OPTIONS_ERROR if
- *                          XZ_DEC_ANY_CHECK was not defined at build time.
- * @XZ_MEM_ERROR:           Allocating memory failed. This return code is
- *                          possible only if the decoder was initialized
- *                          with XZ_DYNALLOC. The amount of memory that was
- *                          tried to be allocated was no more than the
- *                          dict_max argument given to xz_dec_init().
- * @XZ_MEMLIMIT_ERROR:      A bigger LZMA2 dictionary would be needed than
- *                          allowed by the dict_max argument given to
- *                          xz_dec_init(). This return value is possible
- *                          only in multi-call mode (XZ_PREALLOC or
- *                          XZ_DYNALLOC); the single-call mode (XZ_SINGLE)
- *                          ignores the dict_max argument.
- * @XZ_FORMAT_ERROR:        File format was not recognized (wrong magic
- *                          bytes).
- * @XZ_OPTIONS_ERROR:       This implementation doesn't support the requested
- *                          compression options. In the decoder this means
- *                          that the header CRC32 matches, but the header
- *                          itself specifies something that we don't support.
- * @XZ_DATA_ERROR:          Compressed data is corrupt.
- * @XZ_BUF_ERROR:           Cannot make any progress. Details are slightly
- *                          different between multi-call and single-call
- *                          mode; more information below.
- *
- * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
- * to XZ code cannot consume any input and cannot produce any new output.
- * This happens when there is no new input available, or the output buffer
- * is full while at least one output byte is still pending. Assuming your
- * code is not buggy, you can get this error only when decoding a compressed
- * stream that is truncated or otherwise corrupt.
- *
- * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
- * is too small or the compressed input is corrupt in a way that makes the
- * decoder produce more output than the caller expected. When it is
- * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
- * is used instead of XZ_BUF_ERROR.
- */
-enum xz_ret {
-	XZ_OK,
-	XZ_STREAM_END,
-	XZ_UNSUPPORTED_CHECK,
-	XZ_MEM_ERROR,
-	XZ_MEMLIMIT_ERROR,
-	XZ_FORMAT_ERROR,
-	XZ_OPTIONS_ERROR,
-	XZ_DATA_ERROR,
-	XZ_BUF_ERROR
-};
+    /**
+     * enum xz_ret - Return codes
+     * @XZ_OK:                  Everything is OK so far. More input or more
+     *                          output space is required to continue. This
+     *                          return code is possible only in multi-call mode
+     *                          (XZ_PREALLOC or XZ_DYNALLOC).
+     * @XZ_STREAM_END:          Operation finished successfully.
+     * @XZ_UNSUPPORTED_CHECK:   Integrity check type is not supported. Decoding
+     *                          is still possible in multi-call mode by simply
+     *                          calling xz_dec_run() again.
+     *                          Note that this return value is used only if
+     *                          XZ_DEC_ANY_CHECK was defined at build time,
+     *                          which is not used in the kernel. Unsupported
+     *                          check types return XZ_OPTIONS_ERROR if
+     *                          XZ_DEC_ANY_CHECK was not defined at build time.
+     * @XZ_MEM_ERROR:           Allocating memory failed. This return code is
+     *                          possible only if the decoder was initialized
+     *                          with XZ_DYNALLOC. The amount of memory that was
+     *                          tried to be allocated was no more than the
+     *                          dict_max argument given to xz_dec_init().
+     * @XZ_MEMLIMIT_ERROR:      A bigger LZMA2 dictionary would be needed than
+     *                          allowed by the dict_max argument given to
+     *                          xz_dec_init(). This return value is possible
+     *                          only in multi-call mode (XZ_PREALLOC or
+     *                          XZ_DYNALLOC); the single-call mode (XZ_SINGLE)
+     *                          ignores the dict_max argument.
+     * @XZ_FORMAT_ERROR:        File format was not recognized (wrong magic
+     *                          bytes).
+     * @XZ_OPTIONS_ERROR:       This implementation doesn't support the requested
+     *                          compression options. In the decoder this means
+     *                          that the header CRC32 matches, but the header
+     *                          itself specifies something that we don't support.
+     * @XZ_DATA_ERROR:          Compressed data is corrupt.
+     * @XZ_BUF_ERROR:           Cannot make any progress. Details are slightly
+     *                          different between multi-call and single-call
+     *                          mode; more information below.
+     *
+     * In multi-call mode, XZ_BUF_ERROR is returned when two consecutive calls
+     * to XZ code cannot consume any input and cannot produce any new output.
+     * This happens when there is no new input available, or the output buffer
+     * is full while at least one output byte is still pending. Assuming your
+     * code is not buggy, you can get this error only when decoding a compressed
+     * stream that is truncated or otherwise corrupt.
+     *
+     * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
+     * is too small or the compressed input is corrupt in a way that makes the
+     * decoder produce more output than the caller expected. When it is
+     * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
+     * is used instead of XZ_BUF_ERROR.
+     */
+    enum xz_ret
+    {
+        XZ_OK,
+        XZ_STREAM_END,
+        XZ_UNSUPPORTED_CHECK,
+        XZ_MEM_ERROR,
+        XZ_MEMLIMIT_ERROR,
+        XZ_FORMAT_ERROR,
+        XZ_OPTIONS_ERROR,
+        XZ_DATA_ERROR,
+        XZ_BUF_ERROR
+    };
 
-/**
- * struct xz_buf - Passing input and output buffers to XZ code
- * @in:         Beginning of the input buffer. This may be NULL if and only
- *              if in_pos is equal to in_size.
- * @in_pos:     Current position in the input buffer. This must not exceed
- *              in_size.
- * @in_size:    Size of the input buffer
- * @out:        Beginning of the output buffer. This may be NULL if and only
- *              if out_pos is equal to out_size.
- * @out_pos:    Current position in the output buffer. This must not exceed
- *              out_size.
- * @out_size:   Size of the output buffer
- *
- * Only the contents of the output buffer from out[out_pos] onward, and
- * the variables in_pos and out_pos are modified by the XZ code.
- */
-struct xz_buf {
-	const uint8_t *in;
-	size_t in_pos;
-	size_t in_size;
+    /**
+     * struct xz_buf - Passing input and output buffers to XZ code
+     * @in:         Beginning of the input buffer. This may be NULL if and only
+     *              if in_pos is equal to in_size.
+     * @in_pos:     Current position in the input buffer. This must not exceed
+     *              in_size.
+     * @in_size:    Size of the input buffer
+     * @out:        Beginning of the output buffer. This may be NULL if and only
+     *              if out_pos is equal to out_size.
+     * @out_pos:    Current position in the output buffer. This must not exceed
+     *              out_size.
+     * @out_size:   Size of the output buffer
+     *
+     * Only the contents of the output buffer from out[out_pos] onward, and
+     * the variables in_pos and out_pos are modified by the XZ code.
+     */
+    struct xz_buf
+    {
+        const uint8_t* in;
+        size_t in_pos;
+        size_t in_size;
 
-	uint8_t *out;
-	size_t out_pos;
-	size_t out_size;
-};
+        uint8_t* out;
+        size_t out_pos;
+        size_t out_size;
+    };
 
-/**
- * struct xz_dec - Opaque type to hold the XZ decoder state
- */
-struct xz_dec;
+    /**
+     * struct xz_dec - Opaque type to hold the XZ decoder state
+     */
+    struct xz_dec;
 
-/**
- * xz_dec_init() - Allocate and initialize a XZ decoder state
- * @mode:       Operation mode
- * @dict_max:   Maximum size of the LZMA2 dictionary (history buffer) for
- *              multi-call decoding. This is ignored in single-call mode
- *              (mode == XZ_SINGLE). LZMA2 dictionary is always 2^n bytes
- *              or 2^n + 2^(n-1) bytes (the latter sizes are less common
- *              in practice), so other values for dict_max don't make sense.
- *              In the kernel, dictionary sizes of 64 KiB, 128 KiB, 256 KiB,
- *              512 KiB, and 1 MiB are probably the only reasonable values,
- *              except for kernel and initramfs images where a bigger
- *              dictionary can be fine and useful.
- *
- * Single-call mode (XZ_SINGLE): xz_dec_run() decodes the whole stream at
- * once. The caller must provide enough output space or the decoding will
- * fail. The output space is used as the dictionary buffer, which is why
- * there is no need to allocate the dictionary as part of the decoder's
- * internal state.
- *
- * Because the output buffer is used as the workspace, streams encoded using
- * a big dictionary are not a problem in single-call mode. It is enough that
- * the output buffer is big enough to hold the actual uncompressed data; it
- * can be smaller than the dictionary size stored in the stream headers.
- *
- * Multi-call mode with preallocated dictionary (XZ_PREALLOC): dict_max bytes
- * of memory is preallocated for the LZMA2 dictionary. This way there is no
- * risk that xz_dec_run() could run out of memory, since xz_dec_run() will
- * never allocate any memory. Instead, if the preallocated dictionary is too
- * small for decoding the given input stream, xz_dec_run() will return
- * XZ_MEMLIMIT_ERROR. Thus, it is important to know what kind of data will be
- * decoded to avoid allocating excessive amount of memory for the dictionary.
- *
- * Multi-call mode with dynamically allocated dictionary (XZ_DYNALLOC):
- * dict_max specifies the maximum allowed dictionary size that xz_dec_run()
- * may allocate once it has parsed the dictionary size from the stream
- * headers. This way excessive allocations can be avoided while still
- * limiting the maximum memory usage to a sane value to prevent running the
- * system out of memory when decompressing streams from untrusted sources.
- *
- * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
- * ready to be used with xz_dec_run(). If memory allocation fails,
- * xz_dec_init() returns NULL.
- */
-XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max);
+    /**
+     * xz_dec_init() - Allocate and initialize a XZ decoder state
+     * @mode:       Operation mode
+     * @dict_max:   Maximum size of the LZMA2 dictionary (history buffer) for
+     *              multi-call decoding. This is ignored in single-call mode
+     *              (mode == XZ_SINGLE). LZMA2 dictionary is always 2^n bytes
+     *              or 2^n + 2^(n-1) bytes (the latter sizes are less common
+     *              in practice), so other values for dict_max don't make sense.
+     *              In the kernel, dictionary sizes of 64 KiB, 128 KiB, 256 KiB,
+     *              512 KiB, and 1 MiB are probably the only reasonable values,
+     *              except for kernel and initramfs images where a bigger
+     *              dictionary can be fine and useful.
+     *
+     * Single-call mode (XZ_SINGLE): xz_dec_run() decodes the whole stream at
+     * once. The caller must provide enough output space or the decoding will
+     * fail. The output space is used as the dictionary buffer, which is why
+     * there is no need to allocate the dictionary as part of the decoder's
+     * internal state.
+     *
+     * Because the output buffer is used as the workspace, streams encoded using
+     * a big dictionary are not a problem in single-call mode. It is enough that
+     * the output buffer is big enough to hold the actual uncompressed data; it
+     * can be smaller than the dictionary size stored in the stream headers.
+     *
+     * Multi-call mode with preallocated dictionary (XZ_PREALLOC): dict_max bytes
+     * of memory is preallocated for the LZMA2 dictionary. This way there is no
+     * risk that xz_dec_run() could run out of memory, since xz_dec_run() will
+     * never allocate any memory. Instead, if the preallocated dictionary is too
+     * small for decoding the given input stream, xz_dec_run() will return
+     * XZ_MEMLIMIT_ERROR. Thus, it is important to know what kind of data will be
+     * decoded to avoid allocating excessive amount of memory for the dictionary.
+     *
+     * Multi-call mode with dynamically allocated dictionary (XZ_DYNALLOC):
+     * dict_max specifies the maximum allowed dictionary size that xz_dec_run()
+     * may allocate once it has parsed the dictionary size from the stream
+     * headers. This way excessive allocations can be avoided while still
+     * limiting the maximum memory usage to a sane value to prevent running the
+     * system out of memory when decompressing streams from untrusted sources.
+     *
+     * On success, xz_dec_init() returns a pointer to struct xz_dec, which is
+     * ready to be used with xz_dec_run(). If memory allocation fails,
+     * xz_dec_init() returns NULL.
+     */
+    XZ_EXTERN struct xz_dec* xz_dec_init(enum xz_mode mode, uint32_t dict_max);
 
-/**
- * xz_dec_run() - Run the XZ decoder
- * @s:          Decoder state allocated using xz_dec_init()
- * @b:          Input and output buffers
- *
- * The possible return values depend on build options and operation mode.
- * See enum xz_ret for details.
- *
- * Note that if an error occurs in single-call mode (return value is not
- * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
- * contents of the output buffer from b->out[b->out_pos] onward are
- * undefined. This is true even after XZ_BUF_ERROR, because with some filter
- * chains, there may be a second pass over the output buffer, and this pass
- * cannot be properly done if the output buffer is truncated. Thus, you
- * cannot give the single-call decoder a too small buffer and then expect to
- * get that amount valid data from the beginning of the stream. You must use
- * the multi-call decoder if you don't want to uncompress the whole stream.
- */
-XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b);
+    /**
+     * xz_dec_run() - Run the XZ decoder
+     * @s:          Decoder state allocated using xz_dec_init()
+     * @b:          Input and output buffers
+     *
+     * The possible return values depend on build options and operation mode.
+     * See enum xz_ret for details.
+     *
+     * Note that if an error occurs in single-call mode (return value is not
+     * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
+     * contents of the output buffer from b->out[b->out_pos] onward are
+     * undefined. This is true even after XZ_BUF_ERROR, because with some filter
+     * chains, there may be a second pass over the output buffer, and this pass
+     * cannot be properly done if the output buffer is truncated. Thus, you
+     * cannot give the single-call decoder a too small buffer and then expect to
+     * get that amount valid data from the beginning of the stream. You must use
+     * the multi-call decoder if you don't want to uncompress the whole stream.
+     */
+    XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec* s, struct xz_buf* b);
 
-/**
- * xz_dec_reset() - Reset an already allocated decoder state
- * @s:          Decoder state allocated using xz_dec_init()
- *
- * This function can be used to reset the multi-call decoder state without
- * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
- *
- * In single-call mode, xz_dec_reset() is always called in the beginning of
- * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
- * multi-call mode.
- */
-XZ_EXTERN void xz_dec_reset(struct xz_dec *s);
+    /**
+     * xz_dec_reset() - Reset an already allocated decoder state
+     * @s:          Decoder state allocated using xz_dec_init()
+     *
+     * This function can be used to reset the multi-call decoder state without
+     * freeing and reallocating memory with xz_dec_end() and xz_dec_init().
+     *
+     * In single-call mode, xz_dec_reset() is always called in the beginning of
+     * xz_dec_run(). Thus, explicit call to xz_dec_reset() is useful only in
+     * multi-call mode.
+     */
+    XZ_EXTERN void xz_dec_reset(struct xz_dec* s);
 
-/**
- * xz_dec_end() - Free the memory allocated for the decoder state
- * @s:          Decoder state allocated using xz_dec_init(). If s is NULL,
- *              this function does nothing.
- */
-XZ_EXTERN void xz_dec_end(struct xz_dec *s);
+    /**
+     * xz_dec_end() - Free the memory allocated for the decoder state
+     * @s:          Decoder state allocated using xz_dec_init(). If s is NULL,
+     *              this function does nothing.
+     */
+    XZ_EXTERN void xz_dec_end(struct xz_dec* s);
 
 /*
  * Standalone build (userspace build or in-kernel build for boot time use)
@@ -274,26 +278,26 @@ XZ_EXTERN void xz_dec_end(struct xz_dec *s);
  * care about the functions below.
  */
 #ifndef XZ_INTERNAL_CRC32
-#	ifdef __KERNEL__
-#		define XZ_INTERNAL_CRC32 0
-#	else
-#		define XZ_INTERNAL_CRC32 1
-#	endif
+#ifdef __KERNEL__
+#define XZ_INTERNAL_CRC32 0
+#else
+#define XZ_INTERNAL_CRC32 1
+#endif
 #endif
 
 #if XZ_INTERNAL_CRC32
-/*
- * This must be called before any other xz_* function to initialize
- * the CRC32 lookup table.
- */
-XZ_EXTERN void xz_crc32_init(void);
+    /*
+     * This must be called before any other xz_* function to initialize
+     * the CRC32 lookup table.
+     */
+    XZ_EXTERN void xz_crc32_init(void);
 
-/*
- * Update CRC32 value using the polynomial from IEEE-802.3. To start a new
- * calculation, the third argument must be zero. To continue the calculation,
- * the previously returned value is passed as the third argument.
- */
-XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc);
+    /*
+     * Update CRC32 value using the polynomial from IEEE-802.3. To start a new
+     * calculation, the third argument must be zero. To continue the calculation,
+     * the previously returned value is passed as the third argument.
+     */
+    XZ_EXTERN uint32_t xz_crc32(const uint8_t* buf, size_t size, uint32_t crc);
 #endif
 
 #ifdef __cplusplus
diff --git a/ext_libs/minixz/xz_config.h b/ext_libs/minixz/xz_config.h
index 87af0a2f..aa96a752 100644
--- a/ext_libs/minixz/xz_config.h
+++ b/ext_libs/minixz/xz_config.h
@@ -65,7 +65,7 @@
 #define memzero(buf, size) memset(buf, 0, size)
 
 #ifndef min
-#	define min(x, y) ((x) < (y) ? (x) : (y))
+#define min(x, y) ((x) < (y) ? (x) : (y))
 #endif
 #define min_t(type, x, y) min(x, y)
 
@@ -80,52 +80,45 @@
  * so if you want to change it, you need to #undef it first.
  */
 #ifndef __always_inline
-#	ifdef __GNUC__
-#		define __always_inline \
-			inline __attribute__((__always_inline__))
-#	else
-#		define __always_inline inline
-#	endif
+#ifdef __GNUC__
+#define __always_inline inline __attribute__((__always_inline__))
+#else
+#define __always_inline inline
+#endif
 #endif
 
 /* Inline functions to access unaligned unsigned 32-bit integers */
 #ifndef get_unaligned_le32
-static inline uint32_t get_unaligned_le32(const uint8_t *buf)
+static inline uint32_t get_unaligned_le32(const uint8_t* buf)
 {
-	return (uint32_t)buf[0]
-			| ((uint32_t)buf[1] << 8)
-			| ((uint32_t)buf[2] << 16)
-			| ((uint32_t)buf[3] << 24);
+    return (uint32_t)buf[0] | ((uint32_t)buf[1] << 8) | ((uint32_t)buf[2] << 16) | ((uint32_t)buf[3] << 24);
 }
 #endif
 
 #ifndef get_unaligned_be32
-static inline uint32_t get_unaligned_be32(const uint8_t *buf)
+static inline uint32_t get_unaligned_be32(const uint8_t* buf)
 {
-	return (uint32_t)(buf[0] << 24)
-			| ((uint32_t)buf[1] << 16)
-			| ((uint32_t)buf[2] << 8)
-			| (uint32_t)buf[3];
+    return (uint32_t)(buf[0] << 24) | ((uint32_t)buf[1] << 16) | ((uint32_t)buf[2] << 8) | (uint32_t)buf[3];
 }
 #endif
 
 #ifndef put_unaligned_le32
-static inline void put_unaligned_le32(uint32_t val, uint8_t *buf)
+static inline void put_unaligned_le32(uint32_t val, uint8_t* buf)
 {
-	buf[0] = (uint8_t)val;
-	buf[1] = (uint8_t)(val >> 8);
-	buf[2] = (uint8_t)(val >> 16);
-	buf[3] = (uint8_t)(val >> 24);
+    buf[0] = (uint8_t)val;
+    buf[1] = (uint8_t)(val >> 8);
+    buf[2] = (uint8_t)(val >> 16);
+    buf[3] = (uint8_t)(val >> 24);
 }
 #endif
 
 #ifndef put_unaligned_be32
-static inline void put_unaligned_be32(uint32_t val, uint8_t *buf)
+static inline void put_unaligned_be32(uint32_t val, uint8_t* buf)
 {
-	buf[0] = (uint8_t)(val >> 24);
-	buf[1] = (uint8_t)(val >> 16);
-	buf[2] = (uint8_t)(val >> 8);
-	buf[3] = (uint8_t)val;
+    buf[0] = (uint8_t)(val >> 24);
+    buf[1] = (uint8_t)(val >> 16);
+    buf[2] = (uint8_t)(val >> 8);
+    buf[3] = (uint8_t)val;
 }
 #endif
 
@@ -135,7 +128,7 @@ static inline void put_unaligned_be32(uint32_t val, uint8_t *buf)
  * could save a few bytes in code size.
  */
 #ifndef get_le32
-#	define get_le32 get_unaligned_le32
+#define get_le32 get_unaligned_le32
 #endif
 
 #endif
diff --git a/ext_libs/minixz/xz_crc32.c b/ext_libs/minixz/xz_crc32.c
index b89bfc23..06861d7d 100644
--- a/ext_libs/minixz/xz_crc32.c
+++ b/ext_libs/minixz/xz_crc32.c
@@ -54,38 +54,40 @@
  * See <linux/decompress/mm.h> for details.
  */
 #ifndef STATIC_RW_DATA
-#	define STATIC_RW_DATA static
+#define STATIC_RW_DATA static
 #endif
 
 STATIC_RW_DATA uint32_t xz_crc32_table[256];
 
 XZ_EXTERN void xz_crc32_init(void)
 {
-	const uint32_t poly = 0xEDB88320;
+    const uint32_t poly = 0xEDB88320;
 
-	uint32_t i;
-	uint32_t j;
-	uint32_t r;
+    uint32_t i;
+    uint32_t j;
+    uint32_t r;
 
-	for (i = 0; i < 256; ++i) {
-		r = i;
-		for (j = 0; j < 8; ++j)
-			r = (r >> 1) ^ (poly & ~((r & 1) - 1));
+    for (i = 0; i < 256; ++i)
+    {
+        r = i;
+        for (j = 0; j < 8; ++j)
+            r = (r >> 1) ^ (poly & ~((r & 1) - 1));
 
-		xz_crc32_table[i] = r;
-	}
+        xz_crc32_table[i] = r;
+    }
 
-	return;
+    return;
 }
 
-XZ_EXTERN uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
+XZ_EXTERN uint32_t xz_crc32(const uint8_t* buf, size_t size, uint32_t crc)
 {
-	crc = ~crc;
+    crc = ~crc;
 
-	while (size != 0) {
-		crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
-		--size;
-	}
+    while (size != 0)
+    {
+        crc = xz_crc32_table[*buf++ ^ (crc & 0xFF)] ^ (crc >> 8);
+        --size;
+    }
 
-	return ~crc;
+    return ~crc;
 }
diff --git a/ext_libs/minixz/xz_dec_bcj.c b/ext_libs/minixz/xz_dec_bcj.c
index 37640f9f..5afd2964 100644
--- a/ext_libs/minixz/xz_dec_bcj.c
+++ b/ext_libs/minixz/xz_dec_bcj.c
@@ -49,63 +49,66 @@
  */
 #ifdef XZ_DEC_BCJ
 
-struct xz_dec_bcj {
-	/* Type of the BCJ filter being used */
-	enum {
-		BCJ_X86 = 4,        /* x86 or x86-64 */
-		BCJ_POWERPC = 5,    /* Big endian only */
-		BCJ_IA64 = 6,       /* Big or little endian */
-		BCJ_ARM = 7,        /* Little endian only */
-		BCJ_ARMTHUMB = 8,   /* Little endian only */
-		BCJ_SPARC = 9       /* Big or little endian */
-	} type;
-
-	/*
-	 * Return value of the next filter in the chain. We need to preserve
-	 * this information across calls, because we must not call the next
-	 * filter anymore once it has returned XZ_STREAM_END.
-	 */
-	enum xz_ret ret;
-
-	/* True if we are operating in single-call mode. */
-	bool single_call;
-
-	/*
-	 * Absolute position relative to the beginning of the uncompressed
-	 * data (in a single .xz Block). We care only about the lowest 32
-	 * bits so this doesn't need to be uint64_t even with big files.
-	 */
-	uint32_t pos;
-
-	/* x86 filter state */
-	uint32_t x86_prev_mask;
-
-	/* Temporary space to hold the variables from struct xz_buf */
-	uint8_t *out;
-	size_t out_pos;
-	size_t out_size;
-
-	struct {
-		/* Amount of already filtered data in the beginning of buf */
-		size_t filtered;
-
-		/* Total amount of data currently stored in buf  */
-		size_t size;
-
-		/*
-		 * Buffer to hold a mix of filtered and unfiltered data. This
-		 * needs to be big enough to hold Alignment + 2 * Look-ahead:
-		 *
-		 * Type         Alignment   Look-ahead
-		 * x86              1           4
-		 * PowerPC          4           0
-		 * IA-64           16           0
-		 * ARM              4           0
-		 * ARM-Thumb        2           2
-		 * SPARC            4           0
-		 */
-		uint8_t buf[16];
-	} temp;
+struct xz_dec_bcj
+{
+    /* Type of the BCJ filter being used */
+    enum
+    {
+        BCJ_X86 = 4,      /* x86 or x86-64 */
+        BCJ_POWERPC = 5,  /* Big endian only */
+        BCJ_IA64 = 6,     /* Big or little endian */
+        BCJ_ARM = 7,      /* Little endian only */
+        BCJ_ARMTHUMB = 8, /* Little endian only */
+        BCJ_SPARC = 9     /* Big or little endian */
+    } type;
+
+    /*
+     * Return value of the next filter in the chain. We need to preserve
+     * this information across calls, because we must not call the next
+     * filter anymore once it has returned XZ_STREAM_END.
+     */
+    enum xz_ret ret;
+
+    /* True if we are operating in single-call mode. */
+    bool single_call;
+
+    /*
+     * Absolute position relative to the beginning of the uncompressed
+     * data (in a single .xz Block). We care only about the lowest 32
+     * bits so this doesn't need to be uint64_t even with big files.
+     */
+    uint32_t pos;
+
+    /* x86 filter state */
+    uint32_t x86_prev_mask;
+
+    /* Temporary space to hold the variables from struct xz_buf */
+    uint8_t* out;
+    size_t out_pos;
+    size_t out_size;
+
+    struct
+    {
+        /* Amount of already filtered data in the beginning of buf */
+        size_t filtered;
+
+        /* Total amount of data currently stored in buf  */
+        size_t size;
+
+        /*
+         * Buffer to hold a mix of filtered and unfiltered data. This
+         * needs to be big enough to hold Alignment + 2 * Look-ahead:
+         *
+         * Type         Alignment   Look-ahead
+         * x86              1           4
+         * PowerPC          4           0
+         * IA-64           16           0
+         * ARM              4           0
+         * ARM-Thumb        2           2
+         * SPARC            4           0
+         */
+        uint8_t buf[16];
+    } temp;
 };
 
 #ifdef XZ_DEC_X86
@@ -115,255 +118,261 @@ struct xz_dec_bcj {
  */
 static inline int bcj_x86_test_msbyte(uint8_t b)
 {
-	return b == 0x00 || b == 0xFF;
+    return b == 0x00 || b == 0xFF;
 }
 
-static size_t bcj_x86(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+static size_t bcj_x86(struct xz_dec_bcj* s, uint8_t* buf, size_t size)
 {
-	static const bool mask_to_allowed_status[8]
-		= { true, true, true, false, true, false, false, false };
-
-	static const uint8_t mask_to_bit_num[8] = { 0, 1, 2, 2, 3, 3, 3, 3 };
-
-	size_t i;
-	size_t prev_pos = (size_t)-1;
-	uint32_t prev_mask = s->x86_prev_mask;
-	uint32_t src;
-	uint32_t dest;
-	uint32_t j;
-	uint8_t b;
-
-	if (size <= 4)
-		return 0;
-
-	size -= 4;
-	for (i = 0; i < size; ++i) {
-		if ((buf[i] & 0xFE) != 0xE8)
-			continue;
-
-		prev_pos = i - prev_pos;
-		if (prev_pos > 3) {
-			prev_mask = 0;
-		} else {
-			prev_mask = (prev_mask << (prev_pos - 1)) & 7;
-			if (prev_mask != 0) {
-				b = buf[i + 4 - mask_to_bit_num[prev_mask]];
-				if (!mask_to_allowed_status[prev_mask]
-						|| bcj_x86_test_msbyte(b)) {
-					prev_pos = i;
-					prev_mask = (prev_mask << 1) | 1;
-					continue;
-				}
-			}
-		}
-
-		prev_pos = i;
-
-		if (bcj_x86_test_msbyte(buf[i + 4])) {
-			src = get_unaligned_le32(buf + i + 1);
-			while (true) {
-				dest = src - (s->pos + (uint32_t)i + 5);
-				if (prev_mask == 0)
-					break;
-
-				j = mask_to_bit_num[prev_mask] * 8;
-				b = (uint8_t)(dest >> (24 - j));
-				if (!bcj_x86_test_msbyte(b))
-					break;
-
-				src = dest ^ (((uint32_t)1 << (32 - j)) - 1);
-			}
-
-			dest &= 0x01FFFFFF;
-			dest |= (uint32_t)0 - (dest & 0x01000000);
-			put_unaligned_le32(dest, buf + i + 1);
-			i += 4;
-		} else {
-			prev_mask = (prev_mask << 1) | 1;
-		}
-	}
-
-	prev_pos = i - prev_pos;
-	s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);
-	return i;
+    static const bool mask_to_allowed_status[8] = {true, true, true, false, true, false, false, false};
+
+    static const uint8_t mask_to_bit_num[8] = {0, 1, 2, 2, 3, 3, 3, 3};
+
+    size_t i;
+    size_t prev_pos = (size_t)-1;
+    uint32_t prev_mask = s->x86_prev_mask;
+    uint32_t src;
+    uint32_t dest;
+    uint32_t j;
+    uint8_t b;
+
+    if (size <= 4)
+        return 0;
+
+    size -= 4;
+    for (i = 0; i < size; ++i)
+    {
+        if ((buf[i] & 0xFE) != 0xE8)
+            continue;
+
+        prev_pos = i - prev_pos;
+        if (prev_pos > 3)
+        {
+            prev_mask = 0;
+        }
+        else
+        {
+            prev_mask = (prev_mask << (prev_pos - 1)) & 7;
+            if (prev_mask != 0)
+            {
+                b = buf[i + 4 - mask_to_bit_num[prev_mask]];
+                if (!mask_to_allowed_status[prev_mask] || bcj_x86_test_msbyte(b))
+                {
+                    prev_pos = i;
+                    prev_mask = (prev_mask << 1) | 1;
+                    continue;
+                }
+            }
+        }
+
+        prev_pos = i;
+
+        if (bcj_x86_test_msbyte(buf[i + 4]))
+        {
+            src = get_unaligned_le32(buf + i + 1);
+            while (true)
+            {
+                dest = src - (s->pos + (uint32_t)i + 5);
+                if (prev_mask == 0)
+                    break;
+
+                j = mask_to_bit_num[prev_mask] * 8;
+                b = (uint8_t)(dest >> (24 - j));
+                if (!bcj_x86_test_msbyte(b))
+                    break;
+
+                src = dest ^ (((uint32_t)1 << (32 - j)) - 1);
+            }
+
+            dest &= 0x01FFFFFF;
+            dest |= (uint32_t)0 - (dest & 0x01000000);
+            put_unaligned_le32(dest, buf + i + 1);
+            i += 4;
+        }
+        else
+        {
+            prev_mask = (prev_mask << 1) | 1;
+        }
+    }
+
+    prev_pos = i - prev_pos;
+    s->x86_prev_mask = prev_pos > 3 ? 0 : prev_mask << (prev_pos - 1);
+    return i;
 }
 #endif
 
 #ifdef XZ_DEC_POWERPC
-static size_t bcj_powerpc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+static size_t bcj_powerpc(struct xz_dec_bcj* s, uint8_t* buf, size_t size)
 {
-	size_t i;
-	uint32_t instr;
-
-	for (i = 0; i + 4 <= size; i += 4) {
-		instr = get_unaligned_be32(buf + i);
-		if ((instr & 0xFC000003) == 0x48000001) {
-			instr &= 0x03FFFFFC;
-			instr -= s->pos + (uint32_t)i;
-			instr &= 0x03FFFFFC;
-			instr |= 0x48000001;
-			put_unaligned_be32(instr, buf + i);
-		}
-	}
-
-	return i;
+    size_t i;
+    uint32_t instr;
+
+    for (i = 0; i + 4 <= size; i += 4)
+    {
+        instr = get_unaligned_be32(buf + i);
+        if ((instr & 0xFC000003) == 0x48000001)
+        {
+            instr &= 0x03FFFFFC;
+            instr -= s->pos + (uint32_t)i;
+            instr &= 0x03FFFFFC;
+            instr |= 0x48000001;
+            put_unaligned_be32(instr, buf + i);
+        }
+    }
+
+    return i;
 }
 #endif
 
 #ifdef XZ_DEC_IA64
-static size_t bcj_ia64(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+static size_t bcj_ia64(struct xz_dec_bcj* s, uint8_t* buf, size_t size)
 {
-	static const uint8_t branch_table[32] = {
-		0, 0, 0, 0, 0, 0, 0, 0,
-		0, 0, 0, 0, 0, 0, 0, 0,
-		4, 4, 6, 6, 0, 0, 7, 7,
-		4, 4, 0, 0, 4, 4, 0, 0
-	};
-
-	/*
-	 * The local variables take a little bit stack space, but it's less
-	 * than what LZMA2 decoder takes, so it doesn't make sense to reduce
-	 * stack usage here without doing that for the LZMA2 decoder too.
-	 */
-
-	/* Loop counters */
-	size_t i;
-	size_t j;
-
-	/* Instruction slot (0, 1, or 2) in the 128-bit instruction word */
-	uint32_t slot;
-
-	/* Bitwise offset of the instruction indicated by slot */
-	uint32_t bit_pos;
-
-	/* bit_pos split into byte and bit parts */
-	uint32_t byte_pos;
-	uint32_t bit_res;
-
-	/* Address part of an instruction */
-	uint32_t addr;
-
-	/* Mask used to detect which instructions to convert */
-	uint32_t mask;
-
-	/* 41-bit instruction stored somewhere in the lowest 48 bits */
-	uint64_t instr;
-
-	/* Instruction normalized with bit_res for easier manipulation */
-	uint64_t norm;
-
-	for (i = 0; i + 16 <= size; i += 16) {
-		mask = branch_table[buf[i] & 0x1F];
-		for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41) {
-			if (((mask >> slot) & 1) == 0)
-				continue;
-
-			byte_pos = bit_pos >> 3;
-			bit_res = bit_pos & 7;
-			instr = 0;
-			for (j = 0; j < 6; ++j)
-				instr |= (uint64_t)(buf[i + j + byte_pos])
-						<< (8 * j);
-
-			norm = instr >> bit_res;
-
-			if (((norm >> 37) & 0x0F) == 0x05
-					&& ((norm >> 9) & 0x07) == 0) {
-				addr = (norm >> 13) & 0x0FFFFF;
-				addr |= ((uint32_t)(norm >> 36) & 1) << 20;
-				addr <<= 4;
-				addr -= s->pos + (uint32_t)i;
-				addr >>= 4;
-
-				norm &= ~((uint64_t)0x8FFFFF << 13);
-				norm |= (uint64_t)(addr & 0x0FFFFF) << 13;
-				norm |= (uint64_t)(addr & 0x100000)
-						<< (36 - 20);
-
-				instr &= (1 << bit_res) - 1;
-				instr |= norm << bit_res;
-
-				for (j = 0; j < 6; j++)
-					buf[i + j + byte_pos]
-						= (uint8_t)(instr >> (8 * j));
-			}
-		}
-	}
-
-	return i;
+    static const uint8_t branch_table[32] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                                             4, 4, 6, 6, 0, 0, 7, 7, 4, 4, 0, 0, 4, 4, 0, 0};
+
+    /*
+     * The local variables take a little bit stack space, but it's less
+     * than what LZMA2 decoder takes, so it doesn't make sense to reduce
+     * stack usage here without doing that for the LZMA2 decoder too.
+     */
+
+    /* Loop counters */
+    size_t i;
+    size_t j;
+
+    /* Instruction slot (0, 1, or 2) in the 128-bit instruction word */
+    uint32_t slot;
+
+    /* Bitwise offset of the instruction indicated by slot */
+    uint32_t bit_pos;
+
+    /* bit_pos split into byte and bit parts */
+    uint32_t byte_pos;
+    uint32_t bit_res;
+
+    /* Address part of an instruction */
+    uint32_t addr;
+
+    /* Mask used to detect which instructions to convert */
+    uint32_t mask;
+
+    /* 41-bit instruction stored somewhere in the lowest 48 bits */
+    uint64_t instr;
+
+    /* Instruction normalized with bit_res for easier manipulation */
+    uint64_t norm;
+
+    for (i = 0; i + 16 <= size; i += 16)
+    {
+        mask = branch_table[buf[i] & 0x1F];
+        for (slot = 0, bit_pos = 5; slot < 3; ++slot, bit_pos += 41)
+        {
+            if (((mask >> slot) & 1) == 0)
+                continue;
+
+            byte_pos = bit_pos >> 3;
+            bit_res = bit_pos & 7;
+            instr = 0;
+            for (j = 0; j < 6; ++j)
+                instr |= (uint64_t)(buf[i + j + byte_pos]) << (8 * j);
+
+            norm = instr >> bit_res;
+
+            if (((norm >> 37) & 0x0F) == 0x05 && ((norm >> 9) & 0x07) == 0)
+            {
+                addr = (norm >> 13) & 0x0FFFFF;
+                addr |= ((uint32_t)(norm >> 36) & 1) << 20;
+                addr <<= 4;
+                addr -= s->pos + (uint32_t)i;
+                addr >>= 4;
+
+                norm &= ~((uint64_t)0x8FFFFF << 13);
+                norm |= (uint64_t)(addr & 0x0FFFFF) << 13;
+                norm |= (uint64_t)(addr & 0x100000) << (36 - 20);
+
+                instr &= (1 << bit_res) - 1;
+                instr |= norm << bit_res;
+
+                for (j = 0; j < 6; j++)
+                    buf[i + j + byte_pos] = (uint8_t)(instr >> (8 * j));
+            }
+        }
+    }
+
+    return i;
 }
 #endif
 
 #ifdef XZ_DEC_ARM
-static size_t bcj_arm(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+static size_t bcj_arm(struct xz_dec_bcj* s, uint8_t* buf, size_t size)
 {
-	size_t i;
-	uint32_t addr;
-
-	for (i = 0; i + 4 <= size; i += 4) {
-		if (buf[i + 3] == 0xEB) {
-			addr = (uint32_t)buf[i] | ((uint32_t)buf[i + 1] << 8)
-					| ((uint32_t)buf[i + 2] << 16);
-			addr <<= 2;
-			addr -= s->pos + (uint32_t)i + 8;
-			addr >>= 2;
-			buf[i] = (uint8_t)addr;
-			buf[i + 1] = (uint8_t)(addr >> 8);
-			buf[i + 2] = (uint8_t)(addr >> 16);
-		}
-	}
-
-	return i;
+    size_t i;
+    uint32_t addr;
+
+    for (i = 0; i + 4 <= size; i += 4)
+    {
+        if (buf[i + 3] == 0xEB)
+        {
+            addr = (uint32_t)buf[i] | ((uint32_t)buf[i + 1] << 8) | ((uint32_t)buf[i + 2] << 16);
+            addr <<= 2;
+            addr -= s->pos + (uint32_t)i + 8;
+            addr >>= 2;
+            buf[i] = (uint8_t)addr;
+            buf[i + 1] = (uint8_t)(addr >> 8);
+            buf[i + 2] = (uint8_t)(addr >> 16);
+        }
+    }
+
+    return i;
 }
 #endif
 
 #ifdef XZ_DEC_ARMTHUMB
-static size_t bcj_armthumb(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+static size_t bcj_armthumb(struct xz_dec_bcj* s, uint8_t* buf, size_t size)
 {
-	size_t i;
-	uint32_t addr;
-
-	for (i = 0; i + 4 <= size; i += 2) {
-		if ((buf[i + 1] & 0xF8) == 0xF0
-				&& (buf[i + 3] & 0xF8) == 0xF8) {
-			addr = (((uint32_t)buf[i + 1] & 0x07) << 19)
-					| ((uint32_t)buf[i] << 11)
-					| (((uint32_t)buf[i + 3] & 0x07) << 8)
-					| (uint32_t)buf[i + 2];
-			addr <<= 1;
-			addr -= s->pos + (uint32_t)i + 4;
-			addr >>= 1;
-			buf[i + 1] = (uint8_t)(0xF0 | ((addr >> 19) & 0x07));
-			buf[i] = (uint8_t)(addr >> 11);
-			buf[i + 3] = (uint8_t)(0xF8 | ((addr >> 8) & 0x07));
-			buf[i + 2] = (uint8_t)addr;
-			i += 2;
-		}
-	}
-
-	return i;
+    size_t i;
+    uint32_t addr;
+
+    for (i = 0; i + 4 <= size; i += 2)
+    {
+        if ((buf[i + 1] & 0xF8) == 0xF0 && (buf[i + 3] & 0xF8) == 0xF8)
+        {
+            addr = (((uint32_t)buf[i + 1] & 0x07) << 19) | ((uint32_t)buf[i] << 11) |
+                   (((uint32_t)buf[i + 3] & 0x07) << 8) | (uint32_t)buf[i + 2];
+            addr <<= 1;
+            addr -= s->pos + (uint32_t)i + 4;
+            addr >>= 1;
+            buf[i + 1] = (uint8_t)(0xF0 | ((addr >> 19) & 0x07));
+            buf[i] = (uint8_t)(addr >> 11);
+            buf[i + 3] = (uint8_t)(0xF8 | ((addr >> 8) & 0x07));
+            buf[i + 2] = (uint8_t)addr;
+            i += 2;
+        }
+    }
+
+    return i;
 }
 #endif
 
 #ifdef XZ_DEC_SPARC
-static size_t bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
+static size_t bcj_sparc(struct xz_dec_bcj* s, uint8_t* buf, size_t size)
 {
-	size_t i;
-	uint32_t instr;
-
-	for (i = 0; i + 4 <= size; i += 4) {
-		instr = get_unaligned_be32(buf + i);
-		if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF) {
-			instr <<= 2;
-			instr -= s->pos + (uint32_t)i;
-			instr >>= 2;
-			instr = ((uint32_t)0x40000000 - (instr & 0x400000))
-					| 0x40000000 | (instr & 0x3FFFFF);
-			put_unaligned_be32(instr, buf + i);
-		}
-	}
-
-	return i;
+    size_t i;
+    uint32_t instr;
+
+    for (i = 0; i + 4 <= size; i += 4)
+    {
+        instr = get_unaligned_be32(buf + i);
+        if ((instr >> 22) == 0x100 || (instr >> 22) == 0x1FF)
+        {
+            instr <<= 2;
+            instr -= s->pos + (uint32_t)i;
+            instr >>= 2;
+            instr = ((uint32_t)0x40000000 - (instr & 0x400000)) | 0x40000000 | (instr & 0x3FFFFF);
+            put_unaligned_be32(instr, buf + i);
+        }
+    }
+
+    return i;
 }
 #endif
 
@@ -375,53 +384,53 @@ static size_t bcj_sparc(struct xz_dec_bcj *s, uint8_t *buf, size_t size)
  * pointers, which could be problematic in the kernel boot code, which must
  * avoid pointers to static data (at least on x86).
  */
-static void bcj_apply(struct xz_dec_bcj *s,
-		      uint8_t *buf, size_t *pos, size_t size)
+static void bcj_apply(struct xz_dec_bcj* s, uint8_t* buf, size_t* pos, size_t size)
 {
-	size_t filtered;
+    size_t filtered;
 
-	buf += *pos;
-	size -= *pos;
+    buf += *pos;
+    size -= *pos;
 
-	switch (s->type) {
+    switch (s->type)
+    {
 #ifdef XZ_DEC_X86
-	case BCJ_X86:
-		filtered = bcj_x86(s, buf, size);
-		break;
+        case BCJ_X86:
+            filtered = bcj_x86(s, buf, size);
+            break;
 #endif
 #ifdef XZ_DEC_POWERPC
-	case BCJ_POWERPC:
-		filtered = bcj_powerpc(s, buf, size);
-		break;
+        case BCJ_POWERPC:
+            filtered = bcj_powerpc(s, buf, size);
+            break;
 #endif
 #ifdef XZ_DEC_IA64
-	case BCJ_IA64:
-		filtered = bcj_ia64(s, buf, size);
-		break;
+        case BCJ_IA64:
+            filtered = bcj_ia64(s, buf, size);
+            break;
 #endif
 #ifdef XZ_DEC_ARM
-	case BCJ_ARM:
-		filtered = bcj_arm(s, buf, size);
-		break;
+        case BCJ_ARM:
+            filtered = bcj_arm(s, buf, size);
+            break;
 #endif
 #ifdef XZ_DEC_ARMTHUMB
-	case BCJ_ARMTHUMB:
-		filtered = bcj_armthumb(s, buf, size);
-		break;
+        case BCJ_ARMTHUMB:
+            filtered = bcj_armthumb(s, buf, size);
+            break;
 #endif
 #ifdef XZ_DEC_SPARC
-	case BCJ_SPARC:
-		filtered = bcj_sparc(s, buf, size);
-		break;
+        case BCJ_SPARC:
+            filtered = bcj_sparc(s, buf, size);
+            break;
 #endif
-	default:
-		/* Never reached but silence compiler warnings. */
-		filtered = 0;
-		break;
-	}
-
-	*pos += filtered;
-	s->pos += filtered;
+        default:
+            /* Never reached but silence compiler warnings. */
+            filtered = 0;
+            break;
+    }
+
+    *pos += filtered;
+    s->pos += filtered;
 }
 
 /*
@@ -429,17 +438,17 @@ static void bcj_apply(struct xz_dec_bcj *s,
  * Move the remaining mixture of possibly filtered and unfiltered
  * data to the beginning of temp.
  */
-static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b)
+static void bcj_flush(struct xz_dec_bcj* s, struct xz_buf* b)
 {
-	size_t copy_size;
+    size_t copy_size;
 
-	copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);
-	memcpy(b->out + b->out_pos, s->temp.buf, copy_size);
-	b->out_pos += copy_size;
+    copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos);
+    memcpy(b->out + b->out_pos, s->temp.buf, copy_size);
+    b->out_pos += copy_size;
 
-	s->temp.filtered -= copy_size;
-	s->temp.size -= copy_size;
-	memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);
+    s->temp.filtered -= copy_size;
+    s->temp.size -= copy_size;
+    memmove(s->temp.buf, s->temp.buf + copy_size, s->temp.size);
 }
 
 /*
@@ -447,161 +456,162 @@ static void bcj_flush(struct xz_dec_bcj *s, struct xz_buf *b)
  * data in chunks of 1-16 bytes. To hide this issue, this function does
  * some buffering.
  */
-XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
-				     struct xz_dec_lzma2 *lzma2,
-				     struct xz_buf *b)
+XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj* s, struct xz_dec_lzma2* lzma2, struct xz_buf* b)
 {
-	size_t out_start;
-
-	/*
-	 * Flush pending already filtered data to the output buffer. Return
-	 * immediatelly if we couldn't flush everything, or if the next
-	 * filter in the chain had already returned XZ_STREAM_END.
-	 */
-	if (s->temp.filtered > 0) {
-		bcj_flush(s, b);
-		if (s->temp.filtered > 0)
-			return XZ_OK;
-
-		if (s->ret == XZ_STREAM_END)
-			return XZ_STREAM_END;
-	}
-
-	/*
-	 * If we have more output space than what is currently pending in
-	 * temp, copy the unfiltered data from temp to the output buffer
-	 * and try to fill the output buffer by decoding more data from the
-	 * next filter in the chain. Apply the BCJ filter on the new data
-	 * in the output buffer. If everything cannot be filtered, copy it
-	 * to temp and rewind the output buffer position accordingly.
-	 *
-	 * This needs to be always run when temp.size == 0 to handle a special
-	 * case where the output buffer is full and the next filter has no
-	 * more output coming but hasn't returned XZ_STREAM_END yet.
-	 */
-	if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0) {
-		out_start = b->out_pos;
-		memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
-		b->out_pos += s->temp.size;
-
-		s->ret = xz_dec_lzma2_run(lzma2, b);
-		if (s->ret != XZ_STREAM_END
-				&& (s->ret != XZ_OK || s->single_call))
-			return s->ret;
-
-		bcj_apply(s, b->out, &out_start, b->out_pos);
-
-		/*
-		 * As an exception, if the next filter returned XZ_STREAM_END,
-		 * we can do that too, since the last few bytes that remain
-		 * unfiltered are meant to remain unfiltered.
-		 */
-		if (s->ret == XZ_STREAM_END)
-			return XZ_STREAM_END;
-
-		s->temp.size = b->out_pos - out_start;
-		b->out_pos -= s->temp.size;
-		memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
-
-		/*
-		 * If there wasn't enough input to the next filter to fill
-		 * the output buffer with unfiltered data, there's no point
-		 * to try decoding more data to temp.
-		 */
-		if (b->out_pos + s->temp.size < b->out_size)
-			return XZ_OK;
-	}
-
-	/*
-	 * We have unfiltered data in temp. If the output buffer isn't full
-	 * yet, try to fill the temp buffer by decoding more data from the
-	 * next filter. Apply the BCJ filter on temp. Then we hopefully can
-	 * fill the actual output buffer by copying filtered data from temp.
-	 * A mix of filtered and unfiltered data may be left in temp; it will
-	 * be taken care on the next call to this function.
-	 */
-	if (b->out_pos < b->out_size) {
-		/* Make b->out{,_pos,_size} temporarily point to s->temp. */
-		s->out = b->out;
-		s->out_pos = b->out_pos;
-		s->out_size = b->out_size;
-		b->out = s->temp.buf;
-		b->out_pos = s->temp.size;
-		b->out_size = sizeof(s->temp.buf);
-
-		s->ret = xz_dec_lzma2_run(lzma2, b);
-
-		s->temp.size = b->out_pos;
-		b->out = s->out;
-		b->out_pos = s->out_pos;
-		b->out_size = s->out_size;
-
-		if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)
-			return s->ret;
-
-		bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);
-
-		/*
-		 * If the next filter returned XZ_STREAM_END, we mark that
-		 * everything is filtered, since the last unfiltered bytes
-		 * of the stream are meant to be left as is.
-		 */
-		if (s->ret == XZ_STREAM_END)
-			s->temp.filtered = s->temp.size;
-
-		bcj_flush(s, b);
-		if (s->temp.filtered > 0)
-			return XZ_OK;
-	}
-
-	return s->ret;
+    size_t out_start;
+
+    /*
+     * Flush pending already filtered data to the output buffer. Return
+     * immediatelly if we couldn't flush everything, or if the next
+     * filter in the chain had already returned XZ_STREAM_END.
+     */
+    if (s->temp.filtered > 0)
+    {
+        bcj_flush(s, b);
+        if (s->temp.filtered > 0)
+            return XZ_OK;
+
+        if (s->ret == XZ_STREAM_END)
+            return XZ_STREAM_END;
+    }
+
+    /*
+     * If we have more output space than what is currently pending in
+     * temp, copy the unfiltered data from temp to the output buffer
+     * and try to fill the output buffer by decoding more data from the
+     * next filter in the chain. Apply the BCJ filter on the new data
+     * in the output buffer. If everything cannot be filtered, copy it
+     * to temp and rewind the output buffer position accordingly.
+     *
+     * This needs to be always run when temp.size == 0 to handle a special
+     * case where the output buffer is full and the next filter has no
+     * more output coming but hasn't returned XZ_STREAM_END yet.
+     */
+    if (s->temp.size < b->out_size - b->out_pos || s->temp.size == 0)
+    {
+        out_start = b->out_pos;
+        memcpy(b->out + b->out_pos, s->temp.buf, s->temp.size);
+        b->out_pos += s->temp.size;
+
+        s->ret = xz_dec_lzma2_run(lzma2, b);
+        if (s->ret != XZ_STREAM_END && (s->ret != XZ_OK || s->single_call))
+            return s->ret;
+
+        bcj_apply(s, b->out, &out_start, b->out_pos);
+
+        /*
+         * As an exception, if the next filter returned XZ_STREAM_END,
+         * we can do that too, since the last few bytes that remain
+         * unfiltered are meant to remain unfiltered.
+         */
+        if (s->ret == XZ_STREAM_END)
+            return XZ_STREAM_END;
+
+        s->temp.size = b->out_pos - out_start;
+        b->out_pos -= s->temp.size;
+        memcpy(s->temp.buf, b->out + b->out_pos, s->temp.size);
+
+        /*
+         * If there wasn't enough input to the next filter to fill
+         * the output buffer with unfiltered data, there's no point
+         * to try decoding more data to temp.
+         */
+        if (b->out_pos + s->temp.size < b->out_size)
+            return XZ_OK;
+    }
+
+    /*
+     * We have unfiltered data in temp. If the output buffer isn't full
+     * yet, try to fill the temp buffer by decoding more data from the
+     * next filter. Apply the BCJ filter on temp. Then we hopefully can
+     * fill the actual output buffer by copying filtered data from temp.
+     * A mix of filtered and unfiltered data may be left in temp; it will
+     * be taken care on the next call to this function.
+     */
+    if (b->out_pos < b->out_size)
+    {
+        /* Make b->out{,_pos,_size} temporarily point to s->temp. */
+        s->out = b->out;
+        s->out_pos = b->out_pos;
+        s->out_size = b->out_size;
+        b->out = s->temp.buf;
+        b->out_pos = s->temp.size;
+        b->out_size = sizeof(s->temp.buf);
+
+        s->ret = xz_dec_lzma2_run(lzma2, b);
+
+        s->temp.size = b->out_pos;
+        b->out = s->out;
+        b->out_pos = s->out_pos;
+        b->out_size = s->out_size;
+
+        if (s->ret != XZ_OK && s->ret != XZ_STREAM_END)
+            return s->ret;
+
+        bcj_apply(s, s->temp.buf, &s->temp.filtered, s->temp.size);
+
+        /*
+         * If the next filter returned XZ_STREAM_END, we mark that
+         * everything is filtered, since the last unfiltered bytes
+         * of the stream are meant to be left as is.
+         */
+        if (s->ret == XZ_STREAM_END)
+            s->temp.filtered = s->temp.size;
+
+        bcj_flush(s, b);
+        if (s->temp.filtered > 0)
+            return XZ_OK;
+    }
+
+    return s->ret;
 }
 
-XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call)
+XZ_EXTERN struct xz_dec_bcj* xz_dec_bcj_create(bool single_call)
 {
-	struct xz_dec_bcj *s = kmalloc(sizeof(*s), GFP_KERNEL);
-	if (s != NULL)
-		s->single_call = single_call;
+    struct xz_dec_bcj* s = kmalloc(sizeof(*s), GFP_KERNEL);
+    if (s != NULL)
+        s->single_call = single_call;
 
-	return s;
+    return s;
 }
 
-XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id)
+XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj* s, uint8_t id)
 {
-	switch (id) {
+    switch (id)
+    {
 #ifdef XZ_DEC_X86
-	case BCJ_X86:
+        case BCJ_X86:
 #endif
 #ifdef XZ_DEC_POWERPC
-	case BCJ_POWERPC:
+        case BCJ_POWERPC:
 #endif
 #ifdef XZ_DEC_IA64
-	case BCJ_IA64:
+        case BCJ_IA64:
 #endif
 #ifdef XZ_DEC_ARM
-	case BCJ_ARM:
+        case BCJ_ARM:
 #endif
 #ifdef XZ_DEC_ARMTHUMB
-	case BCJ_ARMTHUMB:
+        case BCJ_ARMTHUMB:
 #endif
 #ifdef XZ_DEC_SPARC
-	case BCJ_SPARC:
+        case BCJ_SPARC:
 #endif
-		break;
+            break;
 
-	default:
-		/* Unsupported Filter ID */
-		return XZ_OPTIONS_ERROR;
-	}
+        default:
+            /* Unsupported Filter ID */
+            return XZ_OPTIONS_ERROR;
+    }
 
-	s->type = id;
-	s->ret = XZ_OK;
-	s->pos = 0;
-	s->x86_prev_mask = 0;
-	s->temp.filtered = 0;
-	s->temp.size = 0;
+    s->type = id;
+    s->ret = XZ_OK;
+    s->pos = 0;
+    s->x86_prev_mask = 0;
+    s->temp.filtered = 0;
+    s->temp.size = 0;
 
-	return XZ_OK;
+    return XZ_OK;
 }
 
 #endif
diff --git a/ext_libs/minixz/xz_dec_lzma2.c b/ext_libs/minixz/xz_dec_lzma2.c
index a61a04fd..58a28a2b 100644
--- a/ext_libs/minixz/xz_dec_lzma2.c
+++ b/ext_libs/minixz/xz_dec_lzma2.c
@@ -75,238 +75,246 @@
  * in which the dictionary variables address the actual output
  * buffer directly.
  */
-struct dictionary {
-	/* Beginning of the history buffer */
-	uint8_t *buf;
-
-	/* Old position in buf (before decoding more data) */
-	size_t start;
-
-	/* Position in buf */
-	size_t pos;
-
-	/*
-	 * How full dictionary is. This is used to detect corrupt input that
-	 * would read beyond the beginning of the uncompressed stream.
-	 */
-	size_t full;
-
-	/* Write limit; we don't write to buf[limit] or later bytes. */
-	size_t limit;
-
-	/*
-	 * End of the dictionary buffer. In multi-call mode, this is
-	 * the same as the dictionary size. In single-call mode, this
-	 * indicates the size of the output buffer.
-	 */
-	size_t end;
-
-	/*
-	 * Size of the dictionary as specified in Block Header. This is used
-	 * together with "full" to detect corrupt input that would make us
-	 * read beyond the beginning of the uncompressed stream.
-	 */
-	uint32_t size;
-
-	/*
-	 * Maximum allowed dictionary size in multi-call mode.
-	 * This is ignored in single-call mode.
-	 */
-	uint32_t size_max;
-
-	/*
-	 * Amount of memory currently allocated for the dictionary.
-	 * This is used only with XZ_DYNALLOC. (With XZ_PREALLOC,
-	 * size_max is always the same as the allocated size.)
-	 */
-	uint32_t allocated;
-
-	/* Operation mode */
-	enum xz_mode mode;
+struct dictionary
+{
+    /* Beginning of the history buffer */
+    uint8_t* buf;
+
+    /* Old position in buf (before decoding more data) */
+    size_t start;
+
+    /* Position in buf */
+    size_t pos;
+
+    /*
+     * How full dictionary is. This is used to detect corrupt input that
+     * would read beyond the beginning of the uncompressed stream.
+     */
+    size_t full;
+
+    /* Write limit; we don't write to buf[limit] or later bytes. */
+    size_t limit;
+
+    /*
+     * End of the dictionary buffer. In multi-call mode, this is
+     * the same as the dictionary size. In single-call mode, this
+     * indicates the size of the output buffer.
+     */
+    size_t end;
+
+    /*
+     * Size of the dictionary as specified in Block Header. This is used
+     * together with "full" to detect corrupt input that would make us
+     * read beyond the beginning of the uncompressed stream.
+     */
+    uint32_t size;
+
+    /*
+     * Maximum allowed dictionary size in multi-call mode.
+     * This is ignored in single-call mode.
+     */
+    uint32_t size_max;
+
+    /*
+     * Amount of memory currently allocated for the dictionary.
+     * This is used only with XZ_DYNALLOC. (With XZ_PREALLOC,
+     * size_max is always the same as the allocated size.)
+     */
+    uint32_t allocated;
+
+    /* Operation mode */
+    enum xz_mode mode;
 };
 
 /* Range decoder */
-struct rc_dec {
-	uint32_t range;
-	uint32_t code;
-
-	/*
-	 * Number of initializing bytes remaining to be read
-	 * by rc_read_init().
-	 */
-	uint32_t init_bytes_left;
-
-	/*
-	 * Buffer from which we read our input. It can be either
-	 * temp.buf or the caller-provided input buffer.
-	 */
-	const uint8_t *in;
-	size_t in_pos;
-	size_t in_limit;
+struct rc_dec
+{
+    uint32_t range;
+    uint32_t code;
+
+    /*
+     * Number of initializing bytes remaining to be read
+     * by rc_read_init().
+     */
+    uint32_t init_bytes_left;
+
+    /*
+     * Buffer from which we read our input. It can be either
+     * temp.buf or the caller-provided input buffer.
+     */
+    const uint8_t* in;
+    size_t in_pos;
+    size_t in_limit;
 };
 
 /* Probabilities for a length decoder. */
-struct lzma_len_dec {
-	/* Probability of match length being at least 10 */
-	uint16_t choice;
+struct lzma_len_dec
+{
+    /* Probability of match length being at least 10 */
+    uint16_t choice;
 
-	/* Probability of match length being at least 18 */
-	uint16_t choice2;
+    /* Probability of match length being at least 18 */
+    uint16_t choice2;
 
-	/* Probabilities for match lengths 2-9 */
-	uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
+    /* Probabilities for match lengths 2-9 */
+    uint16_t low[POS_STATES_MAX][LEN_LOW_SYMBOLS];
 
-	/* Probabilities for match lengths 10-17 */
-	uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
+    /* Probabilities for match lengths 10-17 */
+    uint16_t mid[POS_STATES_MAX][LEN_MID_SYMBOLS];
 
-	/* Probabilities for match lengths 18-273 */
-	uint16_t high[LEN_HIGH_SYMBOLS];
+    /* Probabilities for match lengths 18-273 */
+    uint16_t high[LEN_HIGH_SYMBOLS];
 };
 
-struct lzma_dec {
-	/* Distances of latest four matches */
-	uint32_t rep0;
-	uint32_t rep1;
-	uint32_t rep2;
-	uint32_t rep3;
-
-	/* Types of the most recently seen LZMA symbols */
-	enum lzma_state state;
-
-	/*
-	 * Length of a match. This is updated so that dict_repeat can
-	 * be called again to finish repeating the whole match.
-	 */
-	uint32_t len;
-
-	/*
-	 * LZMA properties or related bit masks (number of literal
-	 * context bits, a mask dervied from the number of literal
-	 * position bits, and a mask dervied from the number
-	 * position bits)
-	 */
-	uint32_t lc;
-	uint32_t literal_pos_mask; /* (1 << lp) - 1 */
-	uint32_t pos_mask;         /* (1 << pb) - 1 */
-
-	/* If 1, it's a match. Otherwise it's a single 8-bit literal. */
-	uint16_t is_match[STATES][POS_STATES_MAX];
-
-	/* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */
-	uint16_t is_rep[STATES];
-
-	/*
-	 * If 0, distance of a repeated match is rep0.
-	 * Otherwise check is_rep1.
-	 */
-	uint16_t is_rep0[STATES];
-
-	/*
-	 * If 0, distance of a repeated match is rep1.
-	 * Otherwise check is_rep2.
-	 */
-	uint16_t is_rep1[STATES];
-
-	/* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */
-	uint16_t is_rep2[STATES];
-
-	/*
-	 * If 1, the repeated match has length of one byte. Otherwise
-	 * the length is decoded from rep_len_decoder.
-	 */
-	uint16_t is_rep0_long[STATES][POS_STATES_MAX];
-
-	/*
-	 * Probability tree for the highest two bits of the match
-	 * distance. There is a separate probability tree for match
-	 * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
-	 */
-	uint16_t dist_slot[DIST_STATES][DIST_SLOTS];
-
-	/*
-	 * Probility trees for additional bits for match distance
-	 * when the distance is in the range [4, 127].
-	 */
-	uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];
-
-	/*
-	 * Probability tree for the lowest four bits of a match
-	 * distance that is equal to or greater than 128.
-	 */
-	uint16_t dist_align[ALIGN_SIZE];
-
-	/* Length of a normal match */
-	struct lzma_len_dec match_len_dec;
-
-	/* Length of a repeated match */
-	struct lzma_len_dec rep_len_dec;
-
-	/* Probabilities of literals */
-	uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
+struct lzma_dec
+{
+    /* Distances of latest four matches */
+    uint32_t rep0;
+    uint32_t rep1;
+    uint32_t rep2;
+    uint32_t rep3;
+
+    /* Types of the most recently seen LZMA symbols */
+    enum lzma_state state;
+
+    /*
+     * Length of a match. This is updated so that dict_repeat can
+     * be called again to finish repeating the whole match.
+     */
+    uint32_t len;
+
+    /*
+     * LZMA properties or related bit masks (number of literal
+     * context bits, a mask dervied from the number of literal
+     * position bits, and a mask dervied from the number
+     * position bits)
+     */
+    uint32_t lc;
+    uint32_t literal_pos_mask; /* (1 << lp) - 1 */
+    uint32_t pos_mask;         /* (1 << pb) - 1 */
+
+    /* If 1, it's a match. Otherwise it's a single 8-bit literal. */
+    uint16_t is_match[STATES][POS_STATES_MAX];
+
+    /* If 1, it's a repeated match. The distance is one of rep0 .. rep3. */
+    uint16_t is_rep[STATES];
+
+    /*
+     * If 0, distance of a repeated match is rep0.
+     * Otherwise check is_rep1.
+     */
+    uint16_t is_rep0[STATES];
+
+    /*
+     * If 0, distance of a repeated match is rep1.
+     * Otherwise check is_rep2.
+     */
+    uint16_t is_rep1[STATES];
+
+    /* If 0, distance of a repeated match is rep2. Otherwise it is rep3. */
+    uint16_t is_rep2[STATES];
+
+    /*
+     * If 1, the repeated match has length of one byte. Otherwise
+     * the length is decoded from rep_len_decoder.
+     */
+    uint16_t is_rep0_long[STATES][POS_STATES_MAX];
+
+    /*
+     * Probability tree for the highest two bits of the match
+     * distance. There is a separate probability tree for match
+     * lengths of 2 (i.e. MATCH_LEN_MIN), 3, 4, and [5, 273].
+     */
+    uint16_t dist_slot[DIST_STATES][DIST_SLOTS];
+
+    /*
+     * Probility trees for additional bits for match distance
+     * when the distance is in the range [4, 127].
+     */
+    uint16_t dist_special[FULL_DISTANCES - DIST_MODEL_END];
+
+    /*
+     * Probability tree for the lowest four bits of a match
+     * distance that is equal to or greater than 128.
+     */
+    uint16_t dist_align[ALIGN_SIZE];
+
+    /* Length of a normal match */
+    struct lzma_len_dec match_len_dec;
+
+    /* Length of a repeated match */
+    struct lzma_len_dec rep_len_dec;
+
+    /* Probabilities of literals */
+    uint16_t literal[LITERAL_CODERS_MAX][LITERAL_CODER_SIZE];
 };
 
-struct lzma2_dec {
-	/* Position in xz_dec_lzma2_run(). */
-	enum lzma2_seq {
-		SEQ_CONTROL,
-		SEQ_UNCOMPRESSED_1,
-		SEQ_UNCOMPRESSED_2,
-		SEQ_COMPRESSED_0,
-		SEQ_COMPRESSED_1,
-		SEQ_PROPERTIES,
-		SEQ_LZMA_PREPARE,
-		SEQ_LZMA_RUN,
-		SEQ_COPY
-	} sequence;
-
-	/* Next position after decoding the compressed size of the chunk. */
-	enum lzma2_seq next_sequence;
-
-	/* Uncompressed size of LZMA chunk (2 MiB at maximum) */
-	uint32_t uncompressed;
-
-	/*
-	 * Compressed size of LZMA chunk or compressed/uncompressed
-	 * size of uncompressed chunk (64 KiB at maximum)
-	 */
-	uint32_t compressed;
-
-	/*
-	 * True if dictionary reset is needed. This is false before
-	 * the first chunk (LZMA or uncompressed).
-	 */
-	bool need_dict_reset;
-
-	/*
-	 * True if new LZMA properties are needed. This is false
-	 * before the first LZMA chunk.
-	 */
-	bool need_props;
+struct lzma2_dec
+{
+    /* Position in xz_dec_lzma2_run(). */
+    enum lzma2_seq
+    {
+        SEQ_CONTROL,
+        SEQ_UNCOMPRESSED_1,
+        SEQ_UNCOMPRESSED_2,
+        SEQ_COMPRESSED_0,
+        SEQ_COMPRESSED_1,
+        SEQ_PROPERTIES,
+        SEQ_LZMA_PREPARE,
+        SEQ_LZMA_RUN,
+        SEQ_COPY
+    } sequence;
+
+    /* Next position after decoding the compressed size of the chunk. */
+    enum lzma2_seq next_sequence;
+
+    /* Uncompressed size of LZMA chunk (2 MiB at maximum) */
+    uint32_t uncompressed;
+
+    /*
+     * Compressed size of LZMA chunk or compressed/uncompressed
+     * size of uncompressed chunk (64 KiB at maximum)
+     */
+    uint32_t compressed;
+
+    /*
+     * True if dictionary reset is needed. This is false before
+     * the first chunk (LZMA or uncompressed).
+     */
+    bool need_dict_reset;
+
+    /*
+     * True if new LZMA properties are needed. This is false
+     * before the first LZMA chunk.
+     */
+    bool need_props;
 };
 
-struct xz_dec_lzma2 {
-	/*
-	 * The order below is important on x86 to reduce code size and
-	 * it shouldn't hurt on other platforms. Everything up to and
-	 * including lzma.pos_mask are in the first 128 bytes on x86-32,
-	 * which allows using smaller instructions to access those
-	 * variables. On x86-64, fewer variables fit into the first 128
-	 * bytes, but this is still the best order without sacrificing
-	 * the readability by splitting the structures.
-	 */
-	struct rc_dec rc;
-	struct dictionary dict;
-	struct lzma2_dec lzma2;
-	struct lzma_dec lzma;
-
-	/*
-	 * Temporary buffer which holds small number of input bytes between
-	 * decoder calls. See lzma2_lzma() for details.
-	 */
-	struct {
-		uint32_t size;
-		uint8_t buf[3 * LZMA_IN_REQUIRED];
-	} temp;
+struct xz_dec_lzma2
+{
+    /*
+     * The order below is important on x86 to reduce code size and
+     * it shouldn't hurt on other platforms. Everything up to and
+     * including lzma.pos_mask are in the first 128 bytes on x86-32,
+     * which allows using smaller instructions to access those
+     * variables. On x86-64, fewer variables fit into the first 128
+     * bytes, but this is still the best order without sacrificing
+     * the readability by splitting the structures.
+     */
+    struct rc_dec rc;
+    struct dictionary dict;
+    struct lzma2_dec lzma2;
+    struct lzma_dec lzma;
+
+    /*
+     * Temporary buffer which holds small number of input bytes between
+     * decoder calls. See lzma2_lzma() for details.
+     */
+    struct
+    {
+        uint32_t size;
+        uint8_t buf[3 * LZMA_IN_REQUIRED];
+    } temp;
 };
 
 /**************
@@ -317,32 +325,33 @@ struct xz_dec_lzma2 {
  * Reset the dictionary state. When in single-call mode, set up the beginning
  * of the dictionary to point to the actual output buffer.
  */
-static void dict_reset(struct dictionary *dict, struct xz_buf *b)
+static void dict_reset(struct dictionary* dict, struct xz_buf* b)
 {
-	if (DEC_IS_SINGLE(dict->mode)) {
-		dict->buf = b->out + b->out_pos;
-		dict->end = b->out_size - b->out_pos;
-	}
-
-	dict->start = 0;
-	dict->pos = 0;
-	dict->limit = 0;
-	dict->full = 0;
+    if (DEC_IS_SINGLE(dict->mode))
+    {
+        dict->buf = b->out + b->out_pos;
+        dict->end = b->out_size - b->out_pos;
+    }
+
+    dict->start = 0;
+    dict->pos = 0;
+    dict->limit = 0;
+    dict->full = 0;
 }
 
 /* Set dictionary write limit */
-static void dict_limit(struct dictionary *dict, size_t out_max)
+static void dict_limit(struct dictionary* dict, size_t out_max)
 {
-	if (dict->end - dict->pos <= out_max)
-		dict->limit = dict->end;
-	else
-		dict->limit = dict->pos + out_max;
+    if (dict->end - dict->pos <= out_max)
+        dict->limit = dict->end;
+    else
+        dict->limit = dict->pos + out_max;
 }
 
 /* Return true if at least one byte can be written into the dictionary. */
-static inline bool dict_has_space(const struct dictionary *dict)
+static inline bool dict_has_space(const struct dictionary* dict)
 {
-	return dict->pos < dict->limit;
+    return dict->pos < dict->limit;
 }
 
 /*
@@ -351,25 +360,25 @@ static inline bool dict_has_space(const struct dictionary *dict)
  * still empty. This special case is needed for single-call decoding to
  * avoid writing a '\0' to the end of the destination buffer.
  */
-static inline uint32_t dict_get(const struct dictionary *dict, uint32_t dist)
+static inline uint32_t dict_get(const struct dictionary* dict, uint32_t dist)
 {
-	size_t offset = dict->pos - dist - 1;
+    size_t offset = dict->pos - dist - 1;
 
-	if (dist >= dict->pos)
-		offset += dict->end;
+    if (dist >= dict->pos)
+        offset += dict->end;
 
-	return dict->full > 0 ? dict->buf[offset] : 0;
+    return dict->full > 0 ? dict->buf[offset] : 0;
 }
 
 /*
  * Put one byte into the dictionary. It is assumed that there is space for it.
  */
-static inline void dict_put(struct dictionary *dict, uint8_t byte)
+static inline void dict_put(struct dictionary* dict, uint8_t byte)
 {
-	dict->buf[dict->pos++] = byte;
+    dict->buf[dict->pos++] = byte;
 
-	if (dict->full < dict->pos)
-		dict->full = dict->pos;
+    if (dict->full < dict->pos)
+        dict->full = dict->pos;
 }
 
 /*
@@ -377,69 +386,68 @@ static inline void dict_put(struct dictionary *dict, uint8_t byte)
  * invalid, false is returned. On success, true is returned and *len is
  * updated to indicate how many bytes were left to be repeated.
  */
-static bool dict_repeat(struct dictionary *dict, uint32_t *len, uint32_t dist)
+static bool dict_repeat(struct dictionary* dict, uint32_t* len, uint32_t dist)
 {
-	size_t back;
-	uint32_t left;
+    size_t back;
+    uint32_t left;
 
-	if (dist >= dict->full || dist >= dict->size)
-		return false;
+    if (dist >= dict->full || dist >= dict->size)
+        return false;
 
-	left = min_t(size_t, dict->limit - dict->pos, *len);
-	*len -= left;
+    left = min_t(size_t, dict->limit - dict->pos, *len);
+    *len -= left;
 
-	back = dict->pos - dist - 1;
-	if (dist >= dict->pos)
-		back += dict->end;
+    back = dict->pos - dist - 1;
+    if (dist >= dict->pos)
+        back += dict->end;
 
-	do {
-		dict->buf[dict->pos++] = dict->buf[back++];
-		if (back == dict->end)
-			back = 0;
-	} while (--left > 0);
+    do
+    {
+        dict->buf[dict->pos++] = dict->buf[back++];
+        if (back == dict->end)
+            back = 0;
+    } while (--left > 0);
 
-	if (dict->full < dict->pos)
-		dict->full = dict->pos;
+    if (dict->full < dict->pos)
+        dict->full = dict->pos;
 
-	return true;
+    return true;
 }
 
 /* Copy uncompressed data as is from input to dictionary and output buffers. */
-static void dict_uncompressed(struct dictionary *dict, struct xz_buf *b,
-			      uint32_t *left)
+static void dict_uncompressed(struct dictionary* dict, struct xz_buf* b, uint32_t* left)
 {
-	size_t copy_size;
+    size_t copy_size;
 
-	while (*left > 0 && b->in_pos < b->in_size
-			&& b->out_pos < b->out_size) {
-		copy_size = min(b->in_size - b->in_pos,
-				b->out_size - b->out_pos);
-		if (copy_size > dict->end - dict->pos)
-			copy_size = dict->end - dict->pos;
-		if (copy_size > *left)
-			copy_size = *left;
+    while (*left > 0 && b->in_pos < b->in_size && b->out_pos < b->out_size)
+    {
+        copy_size = min(b->in_size - b->in_pos, b->out_size - b->out_pos);
+        if (copy_size > dict->end - dict->pos)
+            copy_size = dict->end - dict->pos;
+        if (copy_size > *left)
+            copy_size = *left;
 
-		*left -= copy_size;
+        *left -= copy_size;
 
-		memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
-		dict->pos += copy_size;
+        memcpy(dict->buf + dict->pos, b->in + b->in_pos, copy_size);
+        dict->pos += copy_size;
 
-		if (dict->full < dict->pos)
-			dict->full = dict->pos;
+        if (dict->full < dict->pos)
+            dict->full = dict->pos;
 
-		if (DEC_IS_MULTI(dict->mode)) {
-			if (dict->pos == dict->end)
-				dict->pos = 0;
+        if (DEC_IS_MULTI(dict->mode))
+        {
+            if (dict->pos == dict->end)
+                dict->pos = 0;
 
-			memcpy(b->out + b->out_pos, b->in + b->in_pos,
-					copy_size);
-		}
+            memcpy(b->out + b->out_pos, b->in + b->in_pos, copy_size);
+        }
 
-		dict->start = dict->pos;
+        dict->start = dict->pos;
 
-		b->out_pos += copy_size;
-		b->in_pos += copy_size;
-	}
+        b->out_pos += copy_size;
+        b->in_pos += copy_size;
+    }
 }
 
 /*
@@ -447,21 +455,21 @@ static void dict_uncompressed(struct dictionary *dict, struct xz_buf *b,
  * enough space in b->out. This is guaranteed because caller uses dict_limit()
  * before decoding data into the dictionary.
  */
-static uint32_t dict_flush(struct dictionary *dict, struct xz_buf *b)
+static uint32_t dict_flush(struct dictionary* dict, struct xz_buf* b)
 {
-	size_t copy_size = dict->pos - dict->start;
+    size_t copy_size = dict->pos - dict->start;
 
-	if (DEC_IS_MULTI(dict->mode)) {
-		if (dict->pos == dict->end)
-			dict->pos = 0;
+    if (DEC_IS_MULTI(dict->mode))
+    {
+        if (dict->pos == dict->end)
+            dict->pos = 0;
 
-		memcpy(b->out + b->out_pos, dict->buf + dict->start,
-				copy_size);
-	}
+        memcpy(b->out + b->out_pos, dict->buf + dict->start, copy_size);
+    }
 
-	dict->start = dict->pos;
-	b->out_pos += copy_size;
-	return copy_size;
+    dict->start = dict->pos;
+    b->out_pos += copy_size;
+    return copy_size;
 }
 
 /*****************
@@ -469,52 +477,54 @@ static uint32_t dict_flush(struct dictionary *dict, struct xz_buf *b)
  *****************/
 
 /* Reset the range decoder. */
-static void rc_reset(struct rc_dec *rc)
+static void rc_reset(struct rc_dec* rc)
 {
-	rc->range = (uint32_t)-1;
-	rc->code = 0;
-	rc->init_bytes_left = RC_INIT_BYTES;
+    rc->range = (uint32_t)-1;
+    rc->code = 0;
+    rc->init_bytes_left = RC_INIT_BYTES;
 }
 
 /*
  * Read the first five initial bytes into rc->code if they haven't been
  * read already. (Yes, the first byte gets completely ignored.)
  */
-static bool rc_read_init(struct rc_dec *rc, struct xz_buf *b)
+static bool rc_read_init(struct rc_dec* rc, struct xz_buf* b)
 {
-	while (rc->init_bytes_left > 0) {
-		if (b->in_pos == b->in_size)
-			return false;
+    while (rc->init_bytes_left > 0)
+    {
+        if (b->in_pos == b->in_size)
+            return false;
 
-		rc->code = (rc->code << 8) + b->in[b->in_pos++];
-		--rc->init_bytes_left;
-	}
+        rc->code = (rc->code << 8) + b->in[b->in_pos++];
+        --rc->init_bytes_left;
+    }
 
-	return true;
+    return true;
 }
 
 /* Return true if there may not be enough input for the next decoding loop. */
-static inline bool rc_limit_exceeded(const struct rc_dec *rc)
+static inline bool rc_limit_exceeded(const struct rc_dec* rc)
 {
-	return rc->in_pos > rc->in_limit;
+    return rc->in_pos > rc->in_limit;
 }
 
 /*
  * Return true if it is possible (from point of view of range decoder) that
  * we have reached the end of the LZMA chunk.
  */
-static inline bool rc_is_finished(const struct rc_dec *rc)
+static inline bool rc_is_finished(const struct rc_dec* rc)
 {
-	return rc->code == 0;
+    return rc->code == 0;
 }
 
 /* Read the next input byte if needed. */
-static __always_inline void rc_normalize(struct rc_dec *rc)
+static __always_inline void rc_normalize(struct rc_dec* rc)
 {
-	if (rc->range < RC_TOP_VALUE) {
-		rc->range <<= RC_SHIFT_BITS;
-		rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];
-	}
+    if (rc->range < RC_TOP_VALUE)
+    {
+        rc->range <<= RC_SHIFT_BITS;
+        rc->code = (rc->code << RC_SHIFT_BITS) + rc->in[rc->in_pos++];
+    }
 }
 
 /*
@@ -528,74 +538,80 @@ static __always_inline void rc_normalize(struct rc_dec *rc)
  * of the code generated by GCC 3.x decreases 10-15 %. (GCC 4.3 doesn't care,
  * and it generates 10-20 % faster code than GCC 3.x from this file anyway.)
  */
-static __always_inline int rc_bit(struct rc_dec *rc, uint16_t *prob)
+static __always_inline int rc_bit(struct rc_dec* rc, uint16_t* prob)
 {
-	uint32_t bound;
-	int bit;
-
-	rc_normalize(rc);
-	bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;
-	if (rc->code < bound) {
-		rc->range = bound;
-		*prob += (RC_BIT_MODEL_TOTAL - *prob) >> RC_MOVE_BITS;
-		bit = 0;
-	} else {
-		rc->range -= bound;
-		rc->code -= bound;
-		*prob -= *prob >> RC_MOVE_BITS;
-		bit = 1;
-	}
-
-	return bit;
+    uint32_t bound;
+    int bit;
+
+    rc_normalize(rc);
+    bound = (rc->range >> RC_BIT_MODEL_TOTAL_BITS) * *prob;
+    if (rc->code < bound)
+    {
+        rc->range = bound;
+        *prob += (RC_BIT_MODEL_TOTAL - *prob) >> RC_MOVE_BITS;
+        bit = 0;
+    }
+    else
+    {
+        rc->range -= bound;
+        rc->code -= bound;
+        *prob -= *prob >> RC_MOVE_BITS;
+        bit = 1;
+    }
+
+    return bit;
 }
 
 /* Decode a bittree starting from the most significant bit. */
-static __always_inline uint32_t rc_bittree(struct rc_dec *rc,
-					   uint16_t *probs, uint32_t limit)
+static __always_inline uint32_t rc_bittree(struct rc_dec* rc, uint16_t* probs, uint32_t limit)
 {
-	uint32_t symbol = 1;
+    uint32_t symbol = 1;
 
-	do {
-		if (rc_bit(rc, &probs[symbol]))
-			symbol = (symbol << 1) + 1;
-		else
-			symbol <<= 1;
-	} while (symbol < limit);
+    do
+    {
+        if (rc_bit(rc, &probs[symbol]))
+            symbol = (symbol << 1) + 1;
+        else
+            symbol <<= 1;
+    } while (symbol < limit);
 
-	return symbol;
+    return symbol;
 }
 
 /* Decode a bittree starting from the least significant bit. */
-static __always_inline void rc_bittree_reverse(struct rc_dec *rc,
-					       uint16_t *probs,
-					       uint32_t *dest, uint32_t limit)
+static __always_inline void rc_bittree_reverse(struct rc_dec* rc, uint16_t* probs, uint32_t* dest, uint32_t limit)
 {
-	uint32_t symbol = 1;
-	uint32_t i = 0;
-
-	do {
-		if (rc_bit(rc, &probs[symbol])) {
-			symbol = (symbol << 1) + 1;
-			*dest += 1 << i;
-		} else {
-			symbol <<= 1;
-		}
-	} while (++i < limit);
+    uint32_t symbol = 1;
+    uint32_t i = 0;
+
+    do
+    {
+        if (rc_bit(rc, &probs[symbol]))
+        {
+            symbol = (symbol << 1) + 1;
+            *dest += 1 << i;
+        }
+        else
+        {
+            symbol <<= 1;
+        }
+    } while (++i < limit);
 }
 
 /* Decode direct bits (fixed fifty-fifty probability) */
-static inline void rc_direct(struct rc_dec *rc, uint32_t *dest, uint32_t limit)
+static inline void rc_direct(struct rc_dec* rc, uint32_t* dest, uint32_t limit)
 {
-	uint32_t mask;
-
-	do {
-		rc_normalize(rc);
-		rc->range >>= 1;
-		rc->code -= rc->range;
-		mask = (uint32_t)0 - (rc->code >> 31);
-		rc->code += rc->range & mask;
-		*dest = (*dest << 1) + (mask + 1);
-	} while (--limit > 0);
+    uint32_t mask;
+
+    do
+    {
+        rc_normalize(rc);
+        rc->range >>= 1;
+        rc->code -= rc->range;
+        mask = (uint32_t)0 - (rc->code >> 31);
+        rc->code += rc->range & mask;
+        *dest = (*dest << 1) + (mask + 1);
+    } while (--limit > 0);
 }
 
 /********
@@ -603,226 +619,252 @@ static inline void rc_direct(struct rc_dec *rc, uint32_t *dest, uint32_t limit)
  ********/
 
 /* Get pointer to literal coder probability array. */
-static uint16_t *lzma_literal_probs(struct xz_dec_lzma2 *s)
+static uint16_t* lzma_literal_probs(struct xz_dec_lzma2* s)
 {
-	uint32_t prev_byte = dict_get(&s->dict, 0);
-	uint32_t low = prev_byte >> (8 - s->lzma.lc);
-	uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;
-	return s->lzma.literal[low + high];
+    uint32_t prev_byte = dict_get(&s->dict, 0);
+    uint32_t low = prev_byte >> (8 - s->lzma.lc);
+    uint32_t high = (s->dict.pos & s->lzma.literal_pos_mask) << s->lzma.lc;
+    return s->lzma.literal[low + high];
 }
 
 /* Decode a literal (one 8-bit byte) */
-static void lzma_literal(struct xz_dec_lzma2 *s)
+static void lzma_literal(struct xz_dec_lzma2* s)
 {
-	uint16_t *probs;
-	uint32_t symbol;
-	uint32_t match_byte;
-	uint32_t match_bit;
-	uint32_t offset;
-	uint32_t i;
-
-	probs = lzma_literal_probs(s);
-
-	if (lzma_state_is_literal(s->lzma.state)) {
-		symbol = rc_bittree(&s->rc, probs, 0x100);
-	} else {
-		symbol = 1;
-		match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;
-		offset = 0x100;
-
-		do {
-			match_bit = match_byte & offset;
-			match_byte <<= 1;
-			i = offset + match_bit + symbol;
-
-			if (rc_bit(&s->rc, &probs[i])) {
-				symbol = (symbol << 1) + 1;
-				offset &= match_bit;
-			} else {
-				symbol <<= 1;
-				offset &= ~match_bit;
-			}
-		} while (symbol < 0x100);
-	}
-
-	dict_put(&s->dict, (uint8_t)symbol);
-	lzma_state_literal(&s->lzma.state);
+    uint16_t* probs;
+    uint32_t symbol;
+    uint32_t match_byte;
+    uint32_t match_bit;
+    uint32_t offset;
+    uint32_t i;
+
+    probs = lzma_literal_probs(s);
+
+    if (lzma_state_is_literal(s->lzma.state))
+    {
+        symbol = rc_bittree(&s->rc, probs, 0x100);
+    }
+    else
+    {
+        symbol = 1;
+        match_byte = dict_get(&s->dict, s->lzma.rep0) << 1;
+        offset = 0x100;
+
+        do
+        {
+            match_bit = match_byte & offset;
+            match_byte <<= 1;
+            i = offset + match_bit + symbol;
+
+            if (rc_bit(&s->rc, &probs[i]))
+            {
+                symbol = (symbol << 1) + 1;
+                offset &= match_bit;
+            }
+            else
+            {
+                symbol <<= 1;
+                offset &= ~match_bit;
+            }
+        } while (symbol < 0x100);
+    }
+
+    dict_put(&s->dict, (uint8_t)symbol);
+    lzma_state_literal(&s->lzma.state);
 }
 
 /* Decode the length of the match into s->lzma.len. */
-static void lzma_len(struct xz_dec_lzma2 *s, struct lzma_len_dec *l,
-		     uint32_t pos_state)
+static void lzma_len(struct xz_dec_lzma2* s, struct lzma_len_dec* l, uint32_t pos_state)
 {
-	uint16_t *probs;
-	uint32_t limit;
-
-	if (!rc_bit(&s->rc, &l->choice)) {
-		probs = l->low[pos_state];
-		limit = LEN_LOW_SYMBOLS;
-		s->lzma.len = MATCH_LEN_MIN;
-	} else {
-		if (!rc_bit(&s->rc, &l->choice2)) {
-			probs = l->mid[pos_state];
-			limit = LEN_MID_SYMBOLS;
-			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;
-		} else {
-			probs = l->high;
-			limit = LEN_HIGH_SYMBOLS;
-			s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS
-					+ LEN_MID_SYMBOLS;
-		}
-	}
-
-	s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;
+    uint16_t* probs;
+    uint32_t limit;
+
+    if (!rc_bit(&s->rc, &l->choice))
+    {
+        probs = l->low[pos_state];
+        limit = LEN_LOW_SYMBOLS;
+        s->lzma.len = MATCH_LEN_MIN;
+    }
+    else
+    {
+        if (!rc_bit(&s->rc, &l->choice2))
+        {
+            probs = l->mid[pos_state];
+            limit = LEN_MID_SYMBOLS;
+            s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS;
+        }
+        else
+        {
+            probs = l->high;
+            limit = LEN_HIGH_SYMBOLS;
+            s->lzma.len = MATCH_LEN_MIN + LEN_LOW_SYMBOLS + LEN_MID_SYMBOLS;
+        }
+    }
+
+    s->lzma.len += rc_bittree(&s->rc, probs, limit) - limit;
 }
 
 /* Decode a match. The distance will be stored in s->lzma.rep0. */
-static void lzma_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
+static void lzma_match(struct xz_dec_lzma2* s, uint32_t pos_state)
 {
-	uint16_t *probs;
-	uint32_t dist_slot;
-	uint32_t limit;
-
-	lzma_state_match(&s->lzma.state);
-
-	s->lzma.rep3 = s->lzma.rep2;
-	s->lzma.rep2 = s->lzma.rep1;
-	s->lzma.rep1 = s->lzma.rep0;
-
-	lzma_len(s, &s->lzma.match_len_dec, pos_state);
-
-	probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];
-	dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;
-
-	if (dist_slot < DIST_MODEL_START) {
-		s->lzma.rep0 = dist_slot;
-	} else {
-		limit = (dist_slot >> 1) - 1;
-		s->lzma.rep0 = 2 + (dist_slot & 1);
-
-		if (dist_slot < DIST_MODEL_END) {
-			s->lzma.rep0 <<= limit;
-			probs = s->lzma.dist_special + s->lzma.rep0
-					- dist_slot - 1;
-			rc_bittree_reverse(&s->rc, probs,
-					&s->lzma.rep0, limit);
-		} else {
-			rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);
-			s->lzma.rep0 <<= ALIGN_BITS;
-			rc_bittree_reverse(&s->rc, s->lzma.dist_align,
-					&s->lzma.rep0, ALIGN_BITS);
-		}
-	}
+    uint16_t* probs;
+    uint32_t dist_slot;
+    uint32_t limit;
+
+    lzma_state_match(&s->lzma.state);
+
+    s->lzma.rep3 = s->lzma.rep2;
+    s->lzma.rep2 = s->lzma.rep1;
+    s->lzma.rep1 = s->lzma.rep0;
+
+    lzma_len(s, &s->lzma.match_len_dec, pos_state);
+
+    probs = s->lzma.dist_slot[lzma_get_dist_state(s->lzma.len)];
+    dist_slot = rc_bittree(&s->rc, probs, DIST_SLOTS) - DIST_SLOTS;
+
+    if (dist_slot < DIST_MODEL_START)
+    {
+        s->lzma.rep0 = dist_slot;
+    }
+    else
+    {
+        limit = (dist_slot >> 1) - 1;
+        s->lzma.rep0 = 2 + (dist_slot & 1);
+
+        if (dist_slot < DIST_MODEL_END)
+        {
+            s->lzma.rep0 <<= limit;
+            probs = s->lzma.dist_special + s->lzma.rep0 - dist_slot - 1;
+            rc_bittree_reverse(&s->rc, probs, &s->lzma.rep0, limit);
+        }
+        else
+        {
+            rc_direct(&s->rc, &s->lzma.rep0, limit - ALIGN_BITS);
+            s->lzma.rep0 <<= ALIGN_BITS;
+            rc_bittree_reverse(&s->rc, s->lzma.dist_align, &s->lzma.rep0, ALIGN_BITS);
+        }
+    }
 }
 
 /*
  * Decode a repeated match. The distance is one of the four most recently
  * seen matches. The distance will be stored in s->lzma.rep0.
  */
-static void lzma_rep_match(struct xz_dec_lzma2 *s, uint32_t pos_state)
+static void lzma_rep_match(struct xz_dec_lzma2* s, uint32_t pos_state)
 {
-	uint32_t tmp;
-
-	if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state])) {
-		if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[
-				s->lzma.state][pos_state])) {
-			lzma_state_short_rep(&s->lzma.state);
-			s->lzma.len = 1;
-			return;
-		}
-	} else {
-		if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state])) {
-			tmp = s->lzma.rep1;
-		} else {
-			if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state])) {
-				tmp = s->lzma.rep2;
-			} else {
-				tmp = s->lzma.rep3;
-				s->lzma.rep3 = s->lzma.rep2;
-			}
-
-			s->lzma.rep2 = s->lzma.rep1;
-		}
-
-		s->lzma.rep1 = s->lzma.rep0;
-		s->lzma.rep0 = tmp;
-	}
-
-	lzma_state_long_rep(&s->lzma.state);
-	lzma_len(s, &s->lzma.rep_len_dec, pos_state);
+    uint32_t tmp;
+
+    if (!rc_bit(&s->rc, &s->lzma.is_rep0[s->lzma.state]))
+    {
+        if (!rc_bit(&s->rc, &s->lzma.is_rep0_long[s->lzma.state][pos_state]))
+        {
+            lzma_state_short_rep(&s->lzma.state);
+            s->lzma.len = 1;
+            return;
+        }
+    }
+    else
+    {
+        if (!rc_bit(&s->rc, &s->lzma.is_rep1[s->lzma.state]))
+        {
+            tmp = s->lzma.rep1;
+        }
+        else
+        {
+            if (!rc_bit(&s->rc, &s->lzma.is_rep2[s->lzma.state]))
+            {
+                tmp = s->lzma.rep2;
+            }
+            else
+            {
+                tmp = s->lzma.rep3;
+                s->lzma.rep3 = s->lzma.rep2;
+            }
+
+            s->lzma.rep2 = s->lzma.rep1;
+        }
+
+        s->lzma.rep1 = s->lzma.rep0;
+        s->lzma.rep0 = tmp;
+    }
+
+    lzma_state_long_rep(&s->lzma.state);
+    lzma_len(s, &s->lzma.rep_len_dec, pos_state);
 }
 
 /* LZMA decoder core */
-static bool lzma_main(struct xz_dec_lzma2 *s)
+static bool lzma_main(struct xz_dec_lzma2* s)
 {
-	uint32_t pos_state;
-
-	/*
-	 * If the dictionary was reached during the previous call, try to
-	 * finish the possibly pending repeat in the dictionary.
-	 */
-	if (dict_has_space(&s->dict) && s->lzma.len > 0)
-		dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);
-
-	/*
-	 * Decode more LZMA symbols. One iteration may consume up to
-	 * LZMA_IN_REQUIRED - 1 bytes.
-	 */
-	while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc)) {
-		pos_state = s->dict.pos & s->lzma.pos_mask;
-
-		if (!rc_bit(&s->rc, &s->lzma.is_match[
-				s->lzma.state][pos_state])) {
-			lzma_literal(s);
-		} else {
-			if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))
-				lzma_rep_match(s, pos_state);
-			else
-				lzma_match(s, pos_state);
-
-			if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))
-				return false;
-		}
-	}
-
-	/*
-	 * Having the range decoder always normalized when we are outside
-	 * this function makes it easier to correctly handle end of the chunk.
-	 */
-	rc_normalize(&s->rc);
-
-	return true;
+    uint32_t pos_state;
+
+    /*
+     * If the dictionary was reached during the previous call, try to
+     * finish the possibly pending repeat in the dictionary.
+     */
+    if (dict_has_space(&s->dict) && s->lzma.len > 0)
+        dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0);
+
+    /*
+     * Decode more LZMA symbols. One iteration may consume up to
+     * LZMA_IN_REQUIRED - 1 bytes.
+     */
+    while (dict_has_space(&s->dict) && !rc_limit_exceeded(&s->rc))
+    {
+        pos_state = s->dict.pos & s->lzma.pos_mask;
+
+        if (!rc_bit(&s->rc, &s->lzma.is_match[s->lzma.state][pos_state]))
+        {
+            lzma_literal(s);
+        }
+        else
+        {
+            if (rc_bit(&s->rc, &s->lzma.is_rep[s->lzma.state]))
+                lzma_rep_match(s, pos_state);
+            else
+                lzma_match(s, pos_state);
+
+            if (!dict_repeat(&s->dict, &s->lzma.len, s->lzma.rep0))
+                return false;
+        }
+    }
+
+    /*
+     * Having the range decoder always normalized when we are outside
+     * this function makes it easier to correctly handle end of the chunk.
+     */
+    rc_normalize(&s->rc);
+
+    return true;
 }
 
 /*
  * Reset the LZMA decoder and range decoder state. Dictionary is nore reset
  * here, because LZMA state may be reset without resetting the dictionary.
  */
-static void lzma_reset(struct xz_dec_lzma2 *s)
+static void lzma_reset(struct xz_dec_lzma2* s)
 {
-	uint16_t *probs;
-	size_t i;
-
-	s->lzma.state = STATE_LIT_LIT;
-	s->lzma.rep0 = 0;
-	s->lzma.rep1 = 0;
-	s->lzma.rep2 = 0;
-	s->lzma.rep3 = 0;
-
-	/*
-	 * All probabilities are initialized to the same value. This hack
-	 * makes the code smaller by avoiding a separate loop for each
-	 * probability array.
-	 *
-	 * This could be optimized so that only that part of literal
-	 * probabilities that are actually required. In the common case
-	 * we would write 12 KiB less.
-	 */
-	probs = s->lzma.is_match[0];
-	for (i = 0; i < PROBS_TOTAL; ++i)
-		probs[i] = RC_BIT_MODEL_TOTAL / 2;
-
-	rc_reset(&s->rc);
+    uint16_t* probs;
+    size_t i;
+
+    s->lzma.state = STATE_LIT_LIT;
+    s->lzma.rep0 = 0;
+    s->lzma.rep1 = 0;
+    s->lzma.rep2 = 0;
+    s->lzma.rep3 = 0;
+
+    /*
+     * All probabilities are initialized to the same value. This hack
+     * makes the code smaller by avoiding a separate loop for each
+     * probability array.
+     *
+     * This could be optimized so that only that part of literal
+     * probabilities that are actually required. In the common case
+     * we would write 12 KiB less.
+     */
+    probs = s->lzma.is_match[0];
+    for (i = 0; i < PROBS_TOTAL; ++i)
+        probs[i] = RC_BIT_MODEL_TOTAL / 2;
+
+    rc_reset(&s->rc);
 }
 
 /*
@@ -830,35 +872,37 @@ static void lzma_reset(struct xz_dec_lzma2 *s)
  * from the decoded lp and pb values. On success, the LZMA decoder state is
  * reset and true is returned.
  */
-static bool lzma_props(struct xz_dec_lzma2 *s, uint8_t props)
+static bool lzma_props(struct xz_dec_lzma2* s, uint8_t props)
 {
-	if (props > (4 * 5 + 4) * 9 + 8)
-		return false;
+    if (props > (4 * 5 + 4) * 9 + 8)
+        return false;
 
-	s->lzma.pos_mask = 0;
-	while (props >= 9 * 5) {
-		props -= 9 * 5;
-		++s->lzma.pos_mask;
-	}
+    s->lzma.pos_mask = 0;
+    while (props >= 9 * 5)
+    {
+        props -= 9 * 5;
+        ++s->lzma.pos_mask;
+    }
 
-	s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;
+    s->lzma.pos_mask = (1 << s->lzma.pos_mask) - 1;
 
-	s->lzma.literal_pos_mask = 0;
-	while (props >= 9) {
-		props -= 9;
-		++s->lzma.literal_pos_mask;
-	}
+    s->lzma.literal_pos_mask = 0;
+    while (props >= 9)
+    {
+        props -= 9;
+        ++s->lzma.literal_pos_mask;
+    }
 
-	s->lzma.lc = props;
+    s->lzma.lc = props;
 
-	if (s->lzma.lc + s->lzma.literal_pos_mask > 4)
-		return false;
+    if (s->lzma.lc + s->lzma.literal_pos_mask > 4)
+        return false;
 
-	s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;
+    s->lzma.literal_pos_mask = (1 << s->lzma.literal_pos_mask) - 1;
 
-	lzma_reset(s);
+    lzma_reset(s);
 
-	return true;
+    return true;
 }
 
 /*********
@@ -877,329 +921,342 @@ static bool lzma_props(struct xz_dec_lzma2 *s, uint8_t props)
  * function. We decode a few bytes from the temporary buffer so that we can
  * continue decoding from the caller-supplied input buffer again.
  */
-static bool lzma2_lzma(struct xz_dec_lzma2 *s, struct xz_buf *b)
+static bool lzma2_lzma(struct xz_dec_lzma2* s, struct xz_buf* b)
 {
-	size_t in_avail;
-	uint32_t tmp;
-
-	in_avail = b->in_size - b->in_pos;
-	if (s->temp.size > 0 || s->lzma2.compressed == 0) {
-		tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;
-		if (tmp > s->lzma2.compressed - s->temp.size)
-			tmp = s->lzma2.compressed - s->temp.size;
-		if (tmp > in_avail)
-			tmp = in_avail;
-
-		memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);
-
-		if (s->temp.size + tmp == s->lzma2.compressed) {
-			memzero(s->temp.buf + s->temp.size + tmp,
-					sizeof(s->temp.buf)
-						- s->temp.size - tmp);
-			s->rc.in_limit = s->temp.size + tmp;
-		} else if (s->temp.size + tmp < LZMA_IN_REQUIRED) {
-			s->temp.size += tmp;
-			b->in_pos += tmp;
-			return true;
-		} else {
-			s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;
-		}
-
-		s->rc.in = s->temp.buf;
-		s->rc.in_pos = 0;
-
-		if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)
-			return false;
-
-		s->lzma2.compressed -= s->rc.in_pos;
-
-		if (s->rc.in_pos < s->temp.size) {
-			s->temp.size -= s->rc.in_pos;
-			memmove(s->temp.buf, s->temp.buf + s->rc.in_pos,
-					s->temp.size);
-			return true;
-		}
-
-		b->in_pos += s->rc.in_pos - s->temp.size;
-		s->temp.size = 0;
-	}
-
-	in_avail = b->in_size - b->in_pos;
-	if (in_avail >= LZMA_IN_REQUIRED) {
-		s->rc.in = b->in;
-		s->rc.in_pos = b->in_pos;
-
-		if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)
-			s->rc.in_limit = b->in_pos + s->lzma2.compressed;
-		else
-			s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;
-
-		if (!lzma_main(s))
-			return false;
-
-		in_avail = s->rc.in_pos - b->in_pos;
-		if (in_avail > s->lzma2.compressed)
-			return false;
-
-		s->lzma2.compressed -= in_avail;
-		b->in_pos = s->rc.in_pos;
-	}
-
-	in_avail = b->in_size - b->in_pos;
-	if (in_avail < LZMA_IN_REQUIRED) {
-		if (in_avail > s->lzma2.compressed)
-			in_avail = s->lzma2.compressed;
-
-		memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
-		s->temp.size = in_avail;
-		b->in_pos += in_avail;
-	}
-
-	return true;
+    size_t in_avail;
+    uint32_t tmp;
+
+    in_avail = b->in_size - b->in_pos;
+    if (s->temp.size > 0 || s->lzma2.compressed == 0)
+    {
+        tmp = 2 * LZMA_IN_REQUIRED - s->temp.size;
+        if (tmp > s->lzma2.compressed - s->temp.size)
+            tmp = s->lzma2.compressed - s->temp.size;
+        if (tmp > in_avail)
+            tmp = in_avail;
+
+        memcpy(s->temp.buf + s->temp.size, b->in + b->in_pos, tmp);
+
+        if (s->temp.size + tmp == s->lzma2.compressed)
+        {
+            memzero(s->temp.buf + s->temp.size + tmp, sizeof(s->temp.buf) - s->temp.size - tmp);
+            s->rc.in_limit = s->temp.size + tmp;
+        }
+        else if (s->temp.size + tmp < LZMA_IN_REQUIRED)
+        {
+            s->temp.size += tmp;
+            b->in_pos += tmp;
+            return true;
+        }
+        else
+        {
+            s->rc.in_limit = s->temp.size + tmp - LZMA_IN_REQUIRED;
+        }
+
+        s->rc.in = s->temp.buf;
+        s->rc.in_pos = 0;
+
+        if (!lzma_main(s) || s->rc.in_pos > s->temp.size + tmp)
+            return false;
+
+        s->lzma2.compressed -= s->rc.in_pos;
+
+        if (s->rc.in_pos < s->temp.size)
+        {
+            s->temp.size -= s->rc.in_pos;
+            memmove(s->temp.buf, s->temp.buf + s->rc.in_pos, s->temp.size);
+            return true;
+        }
+
+        b->in_pos += s->rc.in_pos - s->temp.size;
+        s->temp.size = 0;
+    }
+
+    in_avail = b->in_size - b->in_pos;
+    if (in_avail >= LZMA_IN_REQUIRED)
+    {
+        s->rc.in = b->in;
+        s->rc.in_pos = b->in_pos;
+
+        if (in_avail >= s->lzma2.compressed + LZMA_IN_REQUIRED)
+            s->rc.in_limit = b->in_pos + s->lzma2.compressed;
+        else
+            s->rc.in_limit = b->in_size - LZMA_IN_REQUIRED;
+
+        if (!lzma_main(s))
+            return false;
+
+        in_avail = s->rc.in_pos - b->in_pos;
+        if (in_avail > s->lzma2.compressed)
+            return false;
+
+        s->lzma2.compressed -= in_avail;
+        b->in_pos = s->rc.in_pos;
+    }
+
+    in_avail = b->in_size - b->in_pos;
+    if (in_avail < LZMA_IN_REQUIRED)
+    {
+        if (in_avail > s->lzma2.compressed)
+            in_avail = s->lzma2.compressed;
+
+        memcpy(s->temp.buf, b->in + b->in_pos, in_avail);
+        s->temp.size = in_avail;
+        b->in_pos += in_avail;
+    }
+
+    return true;
 }
 
 /*
  * Take care of the LZMA2 control layer, and forward the job of actual LZMA
  * decoding or copying of uncompressed chunks to other functions.
  */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
-				       struct xz_buf *b)
+XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2* s, struct xz_buf* b)
 {
-	uint32_t tmp;
-
-	while (b->in_pos < b->in_size || s->lzma2.sequence == SEQ_LZMA_RUN) {
-		switch (s->lzma2.sequence) {
-		case SEQ_CONTROL:
-			/*
-			 * LZMA2 control byte
-			 *
-			 * Exact values:
-			 *   0x00   End marker
-			 *   0x01   Dictionary reset followed by
-			 *          an uncompressed chunk
-			 *   0x02   Uncompressed chunk (no dictionary reset)
-			 *
-			 * Highest three bits (s->control & 0xE0):
-			 *   0xE0   Dictionary reset, new properties and state
-			 *          reset, followed by LZMA compressed chunk
-			 *   0xC0   New properties and state reset, followed
-			 *          by LZMA compressed chunk (no dictionary
-			 *          reset)
-			 *   0xA0   State reset using old properties,
-			 *          followed by LZMA compressed chunk (no
-			 *          dictionary reset)
-			 *   0x80   LZMA chunk (no dictionary or state reset)
-			 *
-			 * For LZMA compressed chunks, the lowest five bits
-			 * (s->control & 1F) are the highest bits of the
-			 * uncompressed size (bits 16-20).
-			 *
-			 * A new LZMA2 stream must begin with a dictionary
-			 * reset. The first LZMA chunk must set new
-			 * properties and reset the LZMA state.
-			 *
-			 * Values that don't match anything described above
-			 * are invalid and we return XZ_DATA_ERROR.
-			 */
-			tmp = b->in[b->in_pos++];
-
-			if (tmp == 0x00)
-				return XZ_STREAM_END;
-
-			if (tmp >= 0xE0 || tmp == 0x01) {
-				s->lzma2.need_props = true;
-				s->lzma2.need_dict_reset = false;
-				dict_reset(&s->dict, b);
-			} else if (s->lzma2.need_dict_reset) {
-				return XZ_DATA_ERROR;
-			}
-
-			if (tmp >= 0x80) {
-				s->lzma2.uncompressed = (tmp & 0x1F) << 16;
-				s->lzma2.sequence = SEQ_UNCOMPRESSED_1;
-
-				if (tmp >= 0xC0) {
-					/*
-					 * When there are new properties,
-					 * state reset is done at
-					 * SEQ_PROPERTIES.
-					 */
-					s->lzma2.need_props = false;
-					s->lzma2.next_sequence
-							= SEQ_PROPERTIES;
-
-				} else if (s->lzma2.need_props) {
-					return XZ_DATA_ERROR;
-
-				} else {
-					s->lzma2.next_sequence
-							= SEQ_LZMA_PREPARE;
-					if (tmp >= 0xA0)
-						lzma_reset(s);
-				}
-			} else {
-				if (tmp > 0x02)
-					return XZ_DATA_ERROR;
-
-				s->lzma2.sequence = SEQ_COMPRESSED_0;
-				s->lzma2.next_sequence = SEQ_COPY;
-			}
-
-			break;
-
-		case SEQ_UNCOMPRESSED_1:
-			s->lzma2.uncompressed
-					+= (uint32_t)b->in[b->in_pos++] << 8;
-			s->lzma2.sequence = SEQ_UNCOMPRESSED_2;
-			break;
-
-		case SEQ_UNCOMPRESSED_2:
-			s->lzma2.uncompressed
-					+= (uint32_t)b->in[b->in_pos++] + 1;
-			s->lzma2.sequence = SEQ_COMPRESSED_0;
-			break;
-
-		case SEQ_COMPRESSED_0:
-			s->lzma2.compressed
-					= (uint32_t)b->in[b->in_pos++] << 8;
-			s->lzma2.sequence = SEQ_COMPRESSED_1;
-			break;
-
-		case SEQ_COMPRESSED_1:
-			s->lzma2.compressed
-					+= (uint32_t)b->in[b->in_pos++] + 1;
-			s->lzma2.sequence = s->lzma2.next_sequence;
-			break;
-
-		case SEQ_PROPERTIES:
-			if (!lzma_props(s, b->in[b->in_pos++]))
-				return XZ_DATA_ERROR;
-
-			s->lzma2.sequence = SEQ_LZMA_PREPARE;
-
-		case SEQ_LZMA_PREPARE:
-			if (s->lzma2.compressed < RC_INIT_BYTES)
-				return XZ_DATA_ERROR;
-
-			if (!rc_read_init(&s->rc, b))
-				return XZ_OK;
-
-			s->lzma2.compressed -= RC_INIT_BYTES;
-			s->lzma2.sequence = SEQ_LZMA_RUN;
-
-		case SEQ_LZMA_RUN:
-			/*
-			 * Set dictionary limit to indicate how much we want
-			 * to be encoded at maximum. Decode new data into the
-			 * dictionary. Flush the new data from dictionary to
-			 * b->out. Check if we finished decoding this chunk.
-			 * In case the dictionary got full but we didn't fill
-			 * the output buffer yet, we may run this loop
-			 * multiple times without changing s->lzma2.sequence.
-			 */
-			dict_limit(&s->dict, min_t(size_t,
-					b->out_size - b->out_pos,
-					s->lzma2.uncompressed));
-			if (!lzma2_lzma(s, b))
-				return XZ_DATA_ERROR;
-
-			s->lzma2.uncompressed -= dict_flush(&s->dict, b);
-
-			if (s->lzma2.uncompressed == 0) {
-				if (s->lzma2.compressed > 0 || s->lzma.len > 0
-						|| !rc_is_finished(&s->rc))
-					return XZ_DATA_ERROR;
-
-				rc_reset(&s->rc);
-				s->lzma2.sequence = SEQ_CONTROL;
-
-			} else if (b->out_pos == b->out_size
-					|| (b->in_pos == b->in_size
-						&& s->temp.size
-						< s->lzma2.compressed)) {
-				return XZ_OK;
-			}
-
-			break;
-
-		case SEQ_COPY:
-			dict_uncompressed(&s->dict, b, &s->lzma2.compressed);
-			if (s->lzma2.compressed > 0)
-				return XZ_OK;
-
-			s->lzma2.sequence = SEQ_CONTROL;
-			break;
-		}
-	}
-
-	return XZ_OK;
+    uint32_t tmp;
+
+    while (b->in_pos < b->in_size || s->lzma2.sequence == SEQ_LZMA_RUN)
+    {
+        switch (s->lzma2.sequence)
+        {
+            case SEQ_CONTROL:
+                /*
+                 * LZMA2 control byte
+                 *
+                 * Exact values:
+                 *   0x00   End marker
+                 *   0x01   Dictionary reset followed by
+                 *          an uncompressed chunk
+                 *   0x02   Uncompressed chunk (no dictionary reset)
+                 *
+                 * Highest three bits (s->control & 0xE0):
+                 *   0xE0   Dictionary reset, new properties and state
+                 *          reset, followed by LZMA compressed chunk
+                 *   0xC0   New properties and state reset, followed
+                 *          by LZMA compressed chunk (no dictionary
+                 *          reset)
+                 *   0xA0   State reset using old properties,
+                 *          followed by LZMA compressed chunk (no
+                 *          dictionary reset)
+                 *   0x80   LZMA chunk (no dictionary or state reset)
+                 *
+                 * For LZMA compressed chunks, the lowest five bits
+                 * (s->control & 1F) are the highest bits of the
+                 * uncompressed size (bits 16-20).
+                 *
+                 * A new LZMA2 stream must begin with a dictionary
+                 * reset. The first LZMA chunk must set new
+                 * properties and reset the LZMA state.
+                 *
+                 * Values that don't match anything described above
+                 * are invalid and we return XZ_DATA_ERROR.
+                 */
+                tmp = b->in[b->in_pos++];
+
+                if (tmp == 0x00)
+                    return XZ_STREAM_END;
+
+                if (tmp >= 0xE0 || tmp == 0x01)
+                {
+                    s->lzma2.need_props = true;
+                    s->lzma2.need_dict_reset = false;
+                    dict_reset(&s->dict, b);
+                }
+                else if (s->lzma2.need_dict_reset)
+                {
+                    return XZ_DATA_ERROR;
+                }
+
+                if (tmp >= 0x80)
+                {
+                    s->lzma2.uncompressed = (tmp & 0x1F) << 16;
+                    s->lzma2.sequence = SEQ_UNCOMPRESSED_1;
+
+                    if (tmp >= 0xC0)
+                    {
+                        /*
+                         * When there are new properties,
+                         * state reset is done at
+                         * SEQ_PROPERTIES.
+                         */
+                        s->lzma2.need_props = false;
+                        s->lzma2.next_sequence = SEQ_PROPERTIES;
+                    }
+                    else if (s->lzma2.need_props)
+                    {
+                        return XZ_DATA_ERROR;
+                    }
+                    else
+                    {
+                        s->lzma2.next_sequence = SEQ_LZMA_PREPARE;
+                        if (tmp >= 0xA0)
+                            lzma_reset(s);
+                    }
+                }
+                else
+                {
+                    if (tmp > 0x02)
+                        return XZ_DATA_ERROR;
+
+                    s->lzma2.sequence = SEQ_COMPRESSED_0;
+                    s->lzma2.next_sequence = SEQ_COPY;
+                }
+
+                break;
+
+            case SEQ_UNCOMPRESSED_1:
+                s->lzma2.uncompressed += (uint32_t)b->in[b->in_pos++] << 8;
+                s->lzma2.sequence = SEQ_UNCOMPRESSED_2;
+                break;
+
+            case SEQ_UNCOMPRESSED_2:
+                s->lzma2.uncompressed += (uint32_t)b->in[b->in_pos++] + 1;
+                s->lzma2.sequence = SEQ_COMPRESSED_0;
+                break;
+
+            case SEQ_COMPRESSED_0:
+                s->lzma2.compressed = (uint32_t)b->in[b->in_pos++] << 8;
+                s->lzma2.sequence = SEQ_COMPRESSED_1;
+                break;
+
+            case SEQ_COMPRESSED_1:
+                s->lzma2.compressed += (uint32_t)b->in[b->in_pos++] + 1;
+                s->lzma2.sequence = s->lzma2.next_sequence;
+                break;
+
+            case SEQ_PROPERTIES:
+                if (!lzma_props(s, b->in[b->in_pos++]))
+                    return XZ_DATA_ERROR;
+
+                s->lzma2.sequence = SEQ_LZMA_PREPARE;
+
+            case SEQ_LZMA_PREPARE:
+                if (s->lzma2.compressed < RC_INIT_BYTES)
+                    return XZ_DATA_ERROR;
+
+                if (!rc_read_init(&s->rc, b))
+                    return XZ_OK;
+
+                s->lzma2.compressed -= RC_INIT_BYTES;
+                s->lzma2.sequence = SEQ_LZMA_RUN;
+
+            case SEQ_LZMA_RUN:
+                /*
+                 * Set dictionary limit to indicate how much we want
+                 * to be encoded at maximum. Decode new data into the
+                 * dictionary. Flush the new data from dictionary to
+                 * b->out. Check if we finished decoding this chunk.
+                 * In case the dictionary got full but we didn't fill
+                 * the output buffer yet, we may run this loop
+                 * multiple times without changing s->lzma2.sequence.
+                 */
+                dict_limit(&s->dict, min_t(size_t, b->out_size - b->out_pos, s->lzma2.uncompressed));
+                if (!lzma2_lzma(s, b))
+                    return XZ_DATA_ERROR;
+
+                s->lzma2.uncompressed -= dict_flush(&s->dict, b);
+
+                if (s->lzma2.uncompressed == 0)
+                {
+                    if (s->lzma2.compressed > 0 || s->lzma.len > 0 || !rc_is_finished(&s->rc))
+                        return XZ_DATA_ERROR;
+
+                    rc_reset(&s->rc);
+                    s->lzma2.sequence = SEQ_CONTROL;
+                }
+                else if (b->out_pos == b->out_size || (b->in_pos == b->in_size && s->temp.size < s->lzma2.compressed))
+                {
+                    return XZ_OK;
+                }
+
+                break;
+
+            case SEQ_COPY:
+                dict_uncompressed(&s->dict, b, &s->lzma2.compressed);
+                if (s->lzma2.compressed > 0)
+                    return XZ_OK;
+
+                s->lzma2.sequence = SEQ_CONTROL;
+                break;
+        }
+    }
+
+    return XZ_OK;
 }
 
-XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
-						   uint32_t dict_max)
+XZ_EXTERN struct xz_dec_lzma2* xz_dec_lzma2_create(enum xz_mode mode, uint32_t dict_max)
 {
-	struct xz_dec_lzma2 *s = kmalloc(sizeof(*s), GFP_KERNEL);
-	if (s == NULL)
-		return NULL;
-
-	s->dict.mode = mode;
-	s->dict.size_max = dict_max;
-
-	if (DEC_IS_PREALLOC(mode)) {
-		s->dict.buf = vmalloc(dict_max);
-		if (s->dict.buf == NULL) {
-			kfree(s);
-			return NULL;
-		}
-	} else if (DEC_IS_DYNALLOC(mode)) {
-		s->dict.buf = NULL;
-		s->dict.allocated = 0;
-	}
-
-	return s;
+    struct xz_dec_lzma2* s = kmalloc(sizeof(*s), GFP_KERNEL);
+    if (s == NULL)
+        return NULL;
+
+    s->dict.mode = mode;
+    s->dict.size_max = dict_max;
+
+    if (DEC_IS_PREALLOC(mode))
+    {
+        s->dict.buf = vmalloc(dict_max);
+        if (s->dict.buf == NULL)
+        {
+            kfree(s);
+            return NULL;
+        }
+    }
+    else if (DEC_IS_DYNALLOC(mode))
+    {
+        s->dict.buf = NULL;
+        s->dict.allocated = 0;
+    }
+
+    return s;
 }
 
-XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s, uint8_t props)
+XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2* s, uint8_t props)
 {
-	/* This limits dictionary size to 3 GiB to keep parsing simpler. */
-	if (props > 39)
-		return XZ_OPTIONS_ERROR;
-
-	s->dict.size = 2 + (props & 1);
-	s->dict.size <<= (props >> 1) + 11;
-
-	if (DEC_IS_MULTI(s->dict.mode)) {
-		if (s->dict.size > s->dict.size_max)
-			return XZ_MEMLIMIT_ERROR;
-
-		s->dict.end = s->dict.size;
-
-		if (DEC_IS_DYNALLOC(s->dict.mode)) {
-			if (s->dict.allocated < s->dict.size) {
-				vfree(s->dict.buf);
-				s->dict.buf = vmalloc(s->dict.size);
-				if (s->dict.buf == NULL) {
-					s->dict.allocated = 0;
-					return XZ_MEM_ERROR;
-				}
-			}
-		}
-	}
-
-	s->lzma.len = 0;
-
-	s->lzma2.sequence = SEQ_CONTROL;
-	s->lzma2.need_dict_reset = true;
-
-	s->temp.size = 0;
-
-	return XZ_OK;
+    /* This limits dictionary size to 3 GiB to keep parsing simpler. */
+    if (props > 39)
+        return XZ_OPTIONS_ERROR;
+
+    s->dict.size = 2 + (props & 1);
+    s->dict.size <<= (props >> 1) + 11;
+
+    if (DEC_IS_MULTI(s->dict.mode))
+    {
+        if (s->dict.size > s->dict.size_max)
+            return XZ_MEMLIMIT_ERROR;
+
+        s->dict.end = s->dict.size;
+
+        if (DEC_IS_DYNALLOC(s->dict.mode))
+        {
+            if (s->dict.allocated < s->dict.size)
+            {
+                vfree(s->dict.buf);
+                s->dict.buf = vmalloc(s->dict.size);
+                if (s->dict.buf == NULL)
+                {
+                    s->dict.allocated = 0;
+                    return XZ_MEM_ERROR;
+                }
+            }
+        }
+    }
+
+    s->lzma.len = 0;
+
+    s->lzma2.sequence = SEQ_CONTROL;
+    s->lzma2.need_dict_reset = true;
+
+    s->temp.size = 0;
+
+    return XZ_OK;
 }
 
-XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s)
+XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2* s)
 {
-	if (DEC_IS_MULTI(s->dict.mode))
-		vfree(s->dict.buf);
+    if (DEC_IS_MULTI(s->dict.mode))
+        vfree(s->dict.buf);
 
-	kfree(s);
+    kfree(s);
 }
diff --git a/ext_libs/minixz/xz_dec_stream.c b/ext_libs/minixz/xz_dec_stream.c
index 037b52c8..a81a39b5 100644
--- a/ext_libs/minixz/xz_dec_stream.c
+++ b/ext_libs/minixz/xz_dec_stream.c
@@ -45,141 +45,142 @@
 #include "xz_stream.h"
 
 /* Hash used to validate the Index field */
-struct xz_dec_hash {
-	vli_type unpadded;
-	vli_type uncompressed;
-	uint32_t crc32;
+struct xz_dec_hash
+{
+    vli_type unpadded;
+    vli_type uncompressed;
+    uint32_t crc32;
 };
 
-struct xz_dec {
-	/* Position in dec_main() */
-	enum {
-		SEQ_STREAM_HEADER,
-		SEQ_BLOCK_START,
-		SEQ_BLOCK_HEADER,
-		SEQ_BLOCK_UNCOMPRESS,
-		SEQ_BLOCK_PADDING,
-		SEQ_BLOCK_CHECK,
-		SEQ_INDEX,
-		SEQ_INDEX_PADDING,
-		SEQ_INDEX_CRC32,
-		SEQ_STREAM_FOOTER
-	} sequence;
-
-	/* Position in variable-length integers and Check fields */
-	uint32_t pos;
-
-	/* Variable-length integer decoded by dec_vli() */
-	vli_type vli;
-
-	/* Saved in_pos and out_pos */
-	size_t in_start;
-	size_t out_start;
-
-	/* CRC32 value in Block or Index */
-	uint32_t crc32;
-
-	/* Type of the integrity check calculated from uncompressed data */
-	enum xz_check check_type;
-
-	/* Operation mode */
-	enum xz_mode mode;
-
-	/*
-	 * True if the next call to xz_dec_run() is allowed to return
-	 * XZ_BUF_ERROR.
-	 */
-	bool allow_buf_error;
-
-	/* Information stored in Block Header */
-	struct {
-		/*
-		 * Value stored in the Compressed Size field, or
-		 * VLI_UNKNOWN if Compressed Size is not present.
-		 */
-		vli_type compressed;
-
-		/*
-		 * Value stored in the Uncompressed Size field, or
-		 * VLI_UNKNOWN if Uncompressed Size is not present.
-		 */
-		vli_type uncompressed;
-
-		/* Size of the Block Header field */
-		uint32_t size;
-	} block_header;
-
-	/* Information collected when decoding Blocks */
-	struct {
-		/* Observed compressed size of the current Block */
-		vli_type compressed;
-
-		/* Observed uncompressed size of the current Block */
-		vli_type uncompressed;
-
-		/* Number of Blocks decoded so far */
-		vli_type count;
-
-		/*
-		 * Hash calculated from the Block sizes. This is used to
-		 * validate the Index field.
-		 */
-		struct xz_dec_hash hash;
-	} block;
-
-	/* Variables needed when verifying the Index field */
-	struct {
-		/* Position in dec_index() */
-		enum {
-			SEQ_INDEX_COUNT,
-			SEQ_INDEX_UNPADDED,
-			SEQ_INDEX_UNCOMPRESSED
-		} sequence;
-
-		/* Size of the Index in bytes */
-		vli_type size;
-
-		/* Number of Records (matches block.count in valid files) */
-		vli_type count;
-
-		/*
-		 * Hash calculated from the Records (matches block.hash in
-		 * valid files).
-		 */
-		struct xz_dec_hash hash;
-	} index;
-
-	/*
-	 * Temporary buffer needed to hold Stream Header, Block Header,
-	 * and Stream Footer. The Block Header is the biggest (1 KiB)
-	 * so we reserve space according to that. buf[] has to be aligned
-	 * to a multiple of four bytes; the size_t variables before it
-	 * should guarantee this.
-	 */
-	struct {
-		size_t pos;
-		size_t size;
-		uint8_t buf[1024];
-	} temp;
-
-	struct xz_dec_lzma2 *lzma2;
+struct xz_dec
+{
+    /* Position in dec_main() */
+    enum
+    {
+        SEQ_STREAM_HEADER,
+        SEQ_BLOCK_START,
+        SEQ_BLOCK_HEADER,
+        SEQ_BLOCK_UNCOMPRESS,
+        SEQ_BLOCK_PADDING,
+        SEQ_BLOCK_CHECK,
+        SEQ_INDEX,
+        SEQ_INDEX_PADDING,
+        SEQ_INDEX_CRC32,
+        SEQ_STREAM_FOOTER
+    } sequence;
+
+    /* Position in variable-length integers and Check fields */
+    uint32_t pos;
+
+    /* Variable-length integer decoded by dec_vli() */
+    vli_type vli;
+
+    /* Saved in_pos and out_pos */
+    size_t in_start;
+    size_t out_start;
+
+    /* CRC32 value in Block or Index */
+    uint32_t crc32;
+
+    /* Type of the integrity check calculated from uncompressed data */
+    enum xz_check check_type;
+
+    /* Operation mode */
+    enum xz_mode mode;
+
+    /*
+     * True if the next call to xz_dec_run() is allowed to return
+     * XZ_BUF_ERROR.
+     */
+    bool allow_buf_error;
+
+    /* Information stored in Block Header */
+    struct
+    {
+        /*
+         * Value stored in the Compressed Size field, or
+         * VLI_UNKNOWN if Compressed Size is not present.
+         */
+        vli_type compressed;
+
+        /*
+         * Value stored in the Uncompressed Size field, or
+         * VLI_UNKNOWN if Uncompressed Size is not present.
+         */
+        vli_type uncompressed;
+
+        /* Size of the Block Header field */
+        uint32_t size;
+    } block_header;
+
+    /* Information collected when decoding Blocks */
+    struct
+    {
+        /* Observed compressed size of the current Block */
+        vli_type compressed;
+
+        /* Observed uncompressed size of the current Block */
+        vli_type uncompressed;
+
+        /* Number of Blocks decoded so far */
+        vli_type count;
+
+        /*
+         * Hash calculated from the Block sizes. This is used to
+         * validate the Index field.
+         */
+        struct xz_dec_hash hash;
+    } block;
+
+    /* Variables needed when verifying the Index field */
+    struct
+    {
+        /* Position in dec_index() */
+        enum
+        {
+            SEQ_INDEX_COUNT,
+            SEQ_INDEX_UNPADDED,
+            SEQ_INDEX_UNCOMPRESSED
+        } sequence;
+
+        /* Size of the Index in bytes */
+        vli_type size;
+
+        /* Number of Records (matches block.count in valid files) */
+        vli_type count;
+
+        /*
+         * Hash calculated from the Records (matches block.hash in
+         * valid files).
+         */
+        struct xz_dec_hash hash;
+    } index;
+
+    /*
+     * Temporary buffer needed to hold Stream Header, Block Header,
+     * and Stream Footer. The Block Header is the biggest (1 KiB)
+     * so we reserve space according to that. buf[] has to be aligned
+     * to a multiple of four bytes; the size_t variables before it
+     * should guarantee this.
+     */
+    struct
+    {
+        size_t pos;
+        size_t size;
+        uint8_t buf[1024];
+    } temp;
+
+    struct xz_dec_lzma2* lzma2;
 
 #ifdef XZ_DEC_BCJ
-	struct xz_dec_bcj *bcj;
-	bool bcj_active;
+    struct xz_dec_bcj* bcj;
+    bool bcj_active;
 #endif
 };
 
 #ifdef XZ_DEC_ANY_CHECK
 /* Sizes of the Check field with different Check IDs */
-static const uint8_t check_sizes[16] = {
-	0,
-	4, 4, 4,
-	8, 8, 8,
-	16, 16, 16,
-	32, 32, 32,
-	64, 64, 64
-};
+static const uint8_t check_sizes[16] = {0, 4, 4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64, 64};
 #endif
 
 /*
@@ -188,53 +189,54 @@ static const uint8_t check_sizes[16] = {
  * to copy into s->temp.buf. Return true once s->temp.pos has reached
  * s->temp.size.
  */
-static bool fill_temp(struct xz_dec *s, struct xz_buf *b)
+static bool fill_temp(struct xz_dec* s, struct xz_buf* b)
 {
-	size_t copy_size = min_t(size_t,
-			b->in_size - b->in_pos, s->temp.size - s->temp.pos);
+    size_t copy_size = min_t(size_t, b->in_size - b->in_pos, s->temp.size - s->temp.pos);
 
-	memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);
-	b->in_pos += copy_size;
-	s->temp.pos += copy_size;
+    memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size);
+    b->in_pos += copy_size;
+    s->temp.pos += copy_size;
 
-	if (s->temp.pos == s->temp.size) {
-		s->temp.pos = 0;
-		return true;
-	}
+    if (s->temp.pos == s->temp.size)
+    {
+        s->temp.pos = 0;
+        return true;
+    }
 
-	return false;
+    return false;
 }
 
 /* Decode a variable-length integer (little-endian base-128 encoding) */
-static enum xz_ret dec_vli(struct xz_dec *s, const uint8_t *in,
-			   size_t *in_pos, size_t in_size)
+static enum xz_ret dec_vli(struct xz_dec* s, const uint8_t* in, size_t* in_pos, size_t in_size)
 {
-	uint8_t byte;
+    uint8_t byte;
 
-	if (s->pos == 0)
-		s->vli = 0;
+    if (s->pos == 0)
+        s->vli = 0;
 
-	while (*in_pos < in_size) {
-		byte = in[*in_pos];
-		++*in_pos;
+    while (*in_pos < in_size)
+    {
+        byte = in[*in_pos];
+        ++*in_pos;
 
-		s->vli |= (vli_type)(byte & 0x7F) << s->pos;
+        s->vli |= (vli_type)(byte & 0x7F) << s->pos;
 
-		if ((byte & 0x80) == 0) {
-			/* Don't allow non-minimal encodings. */
-			if (byte == 0 && s->pos != 0)
-				return XZ_DATA_ERROR;
+        if ((byte & 0x80) == 0)
+        {
+            /* Don't allow non-minimal encodings. */
+            if (byte == 0 && s->pos != 0)
+                return XZ_DATA_ERROR;
 
-			s->pos = 0;
-			return XZ_STREAM_END;
-		}
+            s->pos = 0;
+            return XZ_STREAM_END;
+        }
 
-		s->pos += 7;
-		if (s->pos == 7 * VLI_BYTES_MAX)
-			return XZ_DATA_ERROR;
-	}
+        s->pos += 7;
+        if (s->pos == 7 * VLI_BYTES_MAX)
+            return XZ_DATA_ERROR;
+    }
 
-	return XZ_OK;
+    return XZ_OK;
 }
 
 /*
@@ -249,74 +251,65 @@ static enum xz_ret dec_vli(struct xz_dec *s, const uint8_t *in,
  * the sizes possibly stored in the Block Header. Update the hash and
  * Block count, which are later used to validate the Index field.
  */
-static enum xz_ret dec_block(struct xz_dec *s, struct xz_buf *b)
+static enum xz_ret dec_block(struct xz_dec* s, struct xz_buf* b)
 {
-	enum xz_ret ret;
+    enum xz_ret ret;
 
-	s->in_start = b->in_pos;
-	s->out_start = b->out_pos;
+    s->in_start = b->in_pos;
+    s->out_start = b->out_pos;
 
 #ifdef XZ_DEC_BCJ
-	if (s->bcj_active)
-		ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);
-	else
+    if (s->bcj_active)
+        ret = xz_dec_bcj_run(s->bcj, s->lzma2, b);
+    else
 #endif
-		ret = xz_dec_lzma2_run(s->lzma2, b);
-
-	s->block.compressed += b->in_pos - s->in_start;
-	s->block.uncompressed += b->out_pos - s->out_start;
-
-	/*
-	 * There is no need to separately check for VLI_UNKNOWN, since
-	 * the observed sizes are always smaller than VLI_UNKNOWN.
-	 */
-	if (s->block.compressed > s->block_header.compressed
-			|| s->block.uncompressed
-				> s->block_header.uncompressed)
-		return XZ_DATA_ERROR;
-
-	if (s->check_type == XZ_CHECK_CRC32)
-		s->crc32 = xz_crc32(b->out + s->out_start,
-				b->out_pos - s->out_start, s->crc32);
-
-	if (ret == XZ_STREAM_END) {
-		if (s->block_header.compressed != VLI_UNKNOWN
-				&& s->block_header.compressed
-					!= s->block.compressed)
-			return XZ_DATA_ERROR;
-
-		if (s->block_header.uncompressed != VLI_UNKNOWN
-				&& s->block_header.uncompressed
-					!= s->block.uncompressed)
-			return XZ_DATA_ERROR;
-
-		s->block.hash.unpadded += s->block_header.size
-				+ s->block.compressed;
+        ret = xz_dec_lzma2_run(s->lzma2, b);
+
+    s->block.compressed += b->in_pos - s->in_start;
+    s->block.uncompressed += b->out_pos - s->out_start;
+
+    /*
+     * There is no need to separately check for VLI_UNKNOWN, since
+     * the observed sizes are always smaller than VLI_UNKNOWN.
+     */
+    if (s->block.compressed > s->block_header.compressed || s->block.uncompressed > s->block_header.uncompressed)
+        return XZ_DATA_ERROR;
+
+    if (s->check_type == XZ_CHECK_CRC32)
+        s->crc32 = xz_crc32(b->out + s->out_start, b->out_pos - s->out_start, s->crc32);
+
+    if (ret == XZ_STREAM_END)
+    {
+        if (s->block_header.compressed != VLI_UNKNOWN && s->block_header.compressed != s->block.compressed)
+            return XZ_DATA_ERROR;
+
+        if (s->block_header.uncompressed != VLI_UNKNOWN && s->block_header.uncompressed != s->block.uncompressed)
+            return XZ_DATA_ERROR;
+
+        s->block.hash.unpadded += s->block_header.size + s->block.compressed;
 
 #ifdef XZ_DEC_ANY_CHECK
-		s->block.hash.unpadded += check_sizes[s->check_type];
+        s->block.hash.unpadded += check_sizes[s->check_type];
 #else
-		if (s->check_type == XZ_CHECK_CRC32)
-			s->block.hash.unpadded += 4;
+        if (s->check_type == XZ_CHECK_CRC32)
+            s->block.hash.unpadded += 4;
 #endif
 
-		s->block.hash.uncompressed += s->block.uncompressed;
-		s->block.hash.crc32 = xz_crc32(
-				(const uint8_t *)&s->block.hash,
-				sizeof(s->block.hash), s->block.hash.crc32);
+        s->block.hash.uncompressed += s->block.uncompressed;
+        s->block.hash.crc32 = xz_crc32((const uint8_t*)&s->block.hash, sizeof(s->block.hash), s->block.hash.crc32);
 
-		++s->block.count;
-	}
+        ++s->block.count;
+    }
 
-	return ret;
+    return ret;
 }
 
 /* Update the Index size and the CRC32 value. */
-static void index_update(struct xz_dec *s, const struct xz_buf *b)
+static void index_update(struct xz_dec* s, const struct xz_buf* b)
 {
-	size_t in_used = b->in_pos - s->in_start;
-	s->index.size += in_used;
-	s->crc32 = xz_crc32(b->in + s->in_start, in_used, s->crc32);
+    size_t in_used = b->in_pos - s->in_start;
+    s->index.size += in_used;
+    s->crc32 = xz_crc32(b->in + s->in_start, in_used, s->crc32);
 }
 
 /*
@@ -327,73 +320,75 @@ static void index_update(struct xz_dec *s, const struct xz_buf *b)
  * This can return XZ_OK (more input needed), XZ_STREAM_END (everything
  * successfully decoded), or XZ_DATA_ERROR (input is corrupt).
  */
-static enum xz_ret dec_index(struct xz_dec *s, struct xz_buf *b)
+static enum xz_ret dec_index(struct xz_dec* s, struct xz_buf* b)
 {
-	enum xz_ret ret;
-
-	do {
-		ret = dec_vli(s, b->in, &b->in_pos, b->in_size);
-		if (ret != XZ_STREAM_END) {
-			index_update(s, b);
-			return ret;
-		}
-
-		switch (s->index.sequence) {
-		case SEQ_INDEX_COUNT:
-			s->index.count = s->vli;
-
-			/*
-			 * Validate that the Number of Records field
-			 * indicates the same number of Records as
-			 * there were Blocks in the Stream.
-			 */
-			if (s->index.count != s->block.count)
-				return XZ_DATA_ERROR;
-
-			s->index.sequence = SEQ_INDEX_UNPADDED;
-			break;
-
-		case SEQ_INDEX_UNPADDED:
-			s->index.hash.unpadded += s->vli;
-			s->index.sequence = SEQ_INDEX_UNCOMPRESSED;
-			break;
-
-		case SEQ_INDEX_UNCOMPRESSED:
-			s->index.hash.uncompressed += s->vli;
-			s->index.hash.crc32 = xz_crc32(
-					(const uint8_t *)&s->index.hash,
-					sizeof(s->index.hash),
-					s->index.hash.crc32);
-			--s->index.count;
-			s->index.sequence = SEQ_INDEX_UNPADDED;
-			break;
-		}
-	} while (s->index.count > 0);
-
-	return XZ_STREAM_END;
+    enum xz_ret ret;
+
+    do
+    {
+        ret = dec_vli(s, b->in, &b->in_pos, b->in_size);
+        if (ret != XZ_STREAM_END)
+        {
+            index_update(s, b);
+            return ret;
+        }
+
+        switch (s->index.sequence)
+        {
+            case SEQ_INDEX_COUNT:
+                s->index.count = s->vli;
+
+                /*
+                 * Validate that the Number of Records field
+                 * indicates the same number of Records as
+                 * there were Blocks in the Stream.
+                 */
+                if (s->index.count != s->block.count)
+                    return XZ_DATA_ERROR;
+
+                s->index.sequence = SEQ_INDEX_UNPADDED;
+                break;
+
+            case SEQ_INDEX_UNPADDED:
+                s->index.hash.unpadded += s->vli;
+                s->index.sequence = SEQ_INDEX_UNCOMPRESSED;
+                break;
+
+            case SEQ_INDEX_UNCOMPRESSED:
+                s->index.hash.uncompressed += s->vli;
+                s->index.hash.crc32 =
+                  xz_crc32((const uint8_t*)&s->index.hash, sizeof(s->index.hash), s->index.hash.crc32);
+                --s->index.count;
+                s->index.sequence = SEQ_INDEX_UNPADDED;
+                break;
+        }
+    } while (s->index.count > 0);
+
+    return XZ_STREAM_END;
 }
 
 /*
  * Validate that the next four input bytes match the value of s->crc32.
  * s->pos must be zero when starting to validate the first byte.
  */
-static enum xz_ret crc32_validate(struct xz_dec *s, struct xz_buf *b)
+static enum xz_ret crc32_validate(struct xz_dec* s, struct xz_buf* b)
 {
-	do {
-		if (b->in_pos == b->in_size)
-			return XZ_OK;
+    do
+    {
+        if (b->in_pos == b->in_size)
+            return XZ_OK;
 
-		if (((s->crc32 >> s->pos) & 0xFF) != b->in[b->in_pos++])
-			return XZ_DATA_ERROR;
+        if (((s->crc32 >> s->pos) & 0xFF) != b->in[b->in_pos++])
+            return XZ_DATA_ERROR;
 
-		s->pos += 8;
+        s->pos += 8;
 
-	} while (s->pos < 32);
+    } while (s->pos < 32);
 
-	s->crc32 = 0;
-	s->pos = 0;
+    s->crc32 = 0;
+    s->pos = 0;
 
-	return XZ_STREAM_END;
+    return XZ_STREAM_END;
 }
 
 #ifdef XZ_DEC_ANY_CHECK
@@ -401,343 +396,352 @@ static enum xz_ret crc32_validate(struct xz_dec *s, struct xz_buf *b)
  * Skip over the Check field when the Check ID is not supported.
  * Returns true once the whole Check field has been skipped over.
  */
-static bool check_skip(struct xz_dec *s, struct xz_buf *b)
+static bool check_skip(struct xz_dec* s, struct xz_buf* b)
 {
-	while (s->pos < check_sizes[s->check_type]) {
-		if (b->in_pos == b->in_size)
-			return false;
+    while (s->pos < check_sizes[s->check_type])
+    {
+        if (b->in_pos == b->in_size)
+            return false;
 
-		++b->in_pos;
-		++s->pos;
-	}
+        ++b->in_pos;
+        ++s->pos;
+    }
 
-	s->pos = 0;
+    s->pos = 0;
 
-	return true;
+    return true;
 }
 #endif
 
 /* Decode the Stream Header field (the first 12 bytes of the .xz Stream). */
-static enum xz_ret dec_stream_header(struct xz_dec *s)
+static enum xz_ret dec_stream_header(struct xz_dec* s)
 {
-	if (!memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))
-		return XZ_FORMAT_ERROR;
+    if (!memeq(s->temp.buf, HEADER_MAGIC, HEADER_MAGIC_SIZE))
+        return XZ_FORMAT_ERROR;
 
-	if (xz_crc32(s->temp.buf + HEADER_MAGIC_SIZE, 2, 0)
-			!= get_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2))
-		return XZ_DATA_ERROR;
+    if (xz_crc32(s->temp.buf + HEADER_MAGIC_SIZE, 2, 0) != get_le32(s->temp.buf + HEADER_MAGIC_SIZE + 2))
+        return XZ_DATA_ERROR;
 
-	if (s->temp.buf[HEADER_MAGIC_SIZE] != 0)
-		return XZ_OPTIONS_ERROR;
+    if (s->temp.buf[HEADER_MAGIC_SIZE] != 0)
+        return XZ_OPTIONS_ERROR;
 
-	/*
-	 * Of integrity checks, we support only none (Check ID = 0) and
-	 * CRC32 (Check ID = 1). However, if XZ_DEC_ANY_CHECK is defined,
-	 * we will accept other check types too, but then the check won't
-	 * be verified and a warning (XZ_UNSUPPORTED_CHECK) will be given.
-	 */
-	s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];
+    /*
+     * Of integrity checks, we support only none (Check ID = 0) and
+     * CRC32 (Check ID = 1). However, if XZ_DEC_ANY_CHECK is defined,
+     * we will accept other check types too, but then the check won't
+     * be verified and a warning (XZ_UNSUPPORTED_CHECK) will be given.
+     */
+    s->check_type = s->temp.buf[HEADER_MAGIC_SIZE + 1];
 
 #ifdef XZ_DEC_ANY_CHECK
-	if (s->check_type > XZ_CHECK_MAX)
-		return XZ_OPTIONS_ERROR;
+    if (s->check_type > XZ_CHECK_MAX)
+        return XZ_OPTIONS_ERROR;
 
-	if (s->check_type > XZ_CHECK_CRC32)
-		return XZ_UNSUPPORTED_CHECK;
+    if (s->check_type > XZ_CHECK_CRC32)
+        return XZ_UNSUPPORTED_CHECK;
 #else
-	if (s->check_type > XZ_CHECK_CRC32)
-		return XZ_OPTIONS_ERROR;
+    if (s->check_type > XZ_CHECK_CRC32)
+        return XZ_OPTIONS_ERROR;
 #endif
 
-	return XZ_OK;
+    return XZ_OK;
 }
 
 /* Decode the Stream Footer field (the last 12 bytes of the .xz Stream) */
-static enum xz_ret dec_stream_footer(struct xz_dec *s)
+static enum xz_ret dec_stream_footer(struct xz_dec* s)
 {
-	if (!memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))
-		return XZ_DATA_ERROR;
-
-	if (xz_crc32(s->temp.buf + 4, 6, 0) != get_le32(s->temp.buf))
-		return XZ_DATA_ERROR;
-
-	/*
-	 * Validate Backward Size. Note that we never added the size of the
-	 * Index CRC32 field to s->index.size, thus we use s->index.size / 4
-	 * instead of s->index.size / 4 - 1.
-	 */
-	if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))
-		return XZ_DATA_ERROR;
-
-	if (s->temp.buf[8] != 0 || s->temp.buf[9] != s->check_type)
-		return XZ_DATA_ERROR;
-
-	/*
-	 * Use XZ_STREAM_END instead of XZ_OK to be more convenient
-	 * for the caller.
-	 */
-	return XZ_STREAM_END;
+    if (!memeq(s->temp.buf + 10, FOOTER_MAGIC, FOOTER_MAGIC_SIZE))
+        return XZ_DATA_ERROR;
+
+    if (xz_crc32(s->temp.buf + 4, 6, 0) != get_le32(s->temp.buf))
+        return XZ_DATA_ERROR;
+
+    /*
+     * Validate Backward Size. Note that we never added the size of the
+     * Index CRC32 field to s->index.size, thus we use s->index.size / 4
+     * instead of s->index.size / 4 - 1.
+     */
+    if ((s->index.size >> 2) != get_le32(s->temp.buf + 4))
+        return XZ_DATA_ERROR;
+
+    if (s->temp.buf[8] != 0 || s->temp.buf[9] != s->check_type)
+        return XZ_DATA_ERROR;
+
+    /*
+     * Use XZ_STREAM_END instead of XZ_OK to be more convenient
+     * for the caller.
+     */
+    return XZ_STREAM_END;
 }
 
 /* Decode the Block Header and initialize the filter chain. */
-static enum xz_ret dec_block_header(struct xz_dec *s)
+static enum xz_ret dec_block_header(struct xz_dec* s)
 {
-	enum xz_ret ret;
-
-	/*
-	 * Validate the CRC32. We know that the temp buffer is at least
-	 * eight bytes so this is safe.
-	 */
-	s->temp.size -= 4;
-	if (xz_crc32(s->temp.buf, s->temp.size, 0)
-			!= get_le32(s->temp.buf + s->temp.size))
-		return XZ_DATA_ERROR;
-
-	s->temp.pos = 2;
-
-	/*
-	 * Catch unsupported Block Flags. We support only one or two filters
-	 * in the chain, so we catch that with the same test.
-	 */
+    enum xz_ret ret;
+
+    /*
+     * Validate the CRC32. We know that the temp buffer is at least
+     * eight bytes so this is safe.
+     */
+    s->temp.size -= 4;
+    if (xz_crc32(s->temp.buf, s->temp.size, 0) != get_le32(s->temp.buf + s->temp.size))
+        return XZ_DATA_ERROR;
+
+    s->temp.pos = 2;
+
+    /*
+     * Catch unsupported Block Flags. We support only one or two filters
+     * in the chain, so we catch that with the same test.
+     */
 #ifdef XZ_DEC_BCJ
-	if (s->temp.buf[1] & 0x3E)
+    if (s->temp.buf[1] & 0x3E)
 #else
-	if (s->temp.buf[1] & 0x3F)
+    if (s->temp.buf[1] & 0x3F)
 #endif
-		return XZ_OPTIONS_ERROR;
-
-	/* Compressed Size */
-	if (s->temp.buf[1] & 0x40) {
-		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)
-					!= XZ_STREAM_END)
-			return XZ_DATA_ERROR;
-
-		s->block_header.compressed = s->vli;
-	} else {
-		s->block_header.compressed = VLI_UNKNOWN;
-	}
-
-	/* Uncompressed Size */
-	if (s->temp.buf[1] & 0x80) {
-		if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size)
-				!= XZ_STREAM_END)
-			return XZ_DATA_ERROR;
-
-		s->block_header.uncompressed = s->vli;
-	} else {
-		s->block_header.uncompressed = VLI_UNKNOWN;
-	}
+        return XZ_OPTIONS_ERROR;
+
+    /* Compressed Size */
+    if (s->temp.buf[1] & 0x40)
+    {
+        if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size) != XZ_STREAM_END)
+            return XZ_DATA_ERROR;
+
+        s->block_header.compressed = s->vli;
+    }
+    else
+    {
+        s->block_header.compressed = VLI_UNKNOWN;
+    }
+
+    /* Uncompressed Size */
+    if (s->temp.buf[1] & 0x80)
+    {
+        if (dec_vli(s, s->temp.buf, &s->temp.pos, s->temp.size) != XZ_STREAM_END)
+            return XZ_DATA_ERROR;
+
+        s->block_header.uncompressed = s->vli;
+    }
+    else
+    {
+        s->block_header.uncompressed = VLI_UNKNOWN;
+    }
 
 #ifdef XZ_DEC_BCJ
-	/* If there are two filters, the first one must be a BCJ filter. */
-	s->bcj_active = s->temp.buf[1] & 0x01;
-	if (s->bcj_active) {
-		if (s->temp.size - s->temp.pos < 2)
-			return XZ_OPTIONS_ERROR;
-
-		ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);
-		if (ret != XZ_OK)
-			return ret;
-
-		/*
-		 * We don't support custom start offset,
-		 * so Size of Properties must be zero.
-		 */
-		if (s->temp.buf[s->temp.pos++] != 0x00)
-			return XZ_OPTIONS_ERROR;
-	}
+    /* If there are two filters, the first one must be a BCJ filter. */
+    s->bcj_active = s->temp.buf[1] & 0x01;
+    if (s->bcj_active)
+    {
+        if (s->temp.size - s->temp.pos < 2)
+            return XZ_OPTIONS_ERROR;
+
+        ret = xz_dec_bcj_reset(s->bcj, s->temp.buf[s->temp.pos++]);
+        if (ret != XZ_OK)
+            return ret;
+
+        /*
+         * We don't support custom start offset,
+         * so Size of Properties must be zero.
+         */
+        if (s->temp.buf[s->temp.pos++] != 0x00)
+            return XZ_OPTIONS_ERROR;
+    }
 #endif
 
-	/* Valid Filter Flags always take at least two bytes. */
-	if (s->temp.size - s->temp.pos < 2)
-		return XZ_DATA_ERROR;
+    /* Valid Filter Flags always take at least two bytes. */
+    if (s->temp.size - s->temp.pos < 2)
+        return XZ_DATA_ERROR;
 
-	/* Filter ID = LZMA2 */
-	if (s->temp.buf[s->temp.pos++] != 0x21)
-		return XZ_OPTIONS_ERROR;
+    /* Filter ID = LZMA2 */
+    if (s->temp.buf[s->temp.pos++] != 0x21)
+        return XZ_OPTIONS_ERROR;
 
-	/* Size of Properties = 1-byte Filter Properties */
-	if (s->temp.buf[s->temp.pos++] != 0x01)
-		return XZ_OPTIONS_ERROR;
+    /* Size of Properties = 1-byte Filter Properties */
+    if (s->temp.buf[s->temp.pos++] != 0x01)
+        return XZ_OPTIONS_ERROR;
 
-	/* Filter Properties contains LZMA2 dictionary size. */
-	if (s->temp.size - s->temp.pos < 1)
-		return XZ_DATA_ERROR;
+    /* Filter Properties contains LZMA2 dictionary size. */
+    if (s->temp.size - s->temp.pos < 1)
+        return XZ_DATA_ERROR;
 
-	ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);
-	if (ret != XZ_OK)
-		return ret;
+    ret = xz_dec_lzma2_reset(s->lzma2, s->temp.buf[s->temp.pos++]);
+    if (ret != XZ_OK)
+        return ret;
 
-	/* The rest must be Header Padding. */
-	while (s->temp.pos < s->temp.size)
-		if (s->temp.buf[s->temp.pos++] != 0x00)
-			return XZ_OPTIONS_ERROR;
+    /* The rest must be Header Padding. */
+    while (s->temp.pos < s->temp.size)
+        if (s->temp.buf[s->temp.pos++] != 0x00)
+            return XZ_OPTIONS_ERROR;
 
-	s->temp.pos = 0;
-	s->block.compressed = 0;
-	s->block.uncompressed = 0;
+    s->temp.pos = 0;
+    s->block.compressed = 0;
+    s->block.uncompressed = 0;
 
-	return XZ_OK;
+    return XZ_OK;
 }
 
-static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
+static enum xz_ret dec_main(struct xz_dec* s, struct xz_buf* b)
 {
-	enum xz_ret ret;
-
-	/*
-	 * Store the start position for the case when we are in the middle
-	 * of the Index field.
-	 */
-	s->in_start = b->in_pos;
-
-	while (true) {
-		switch (s->sequence) {
-		case SEQ_STREAM_HEADER:
-			/*
-			 * Stream Header is copied to s->temp, and then
-			 * decoded from there. This way if the caller
-			 * gives us only little input at a time, we can
-			 * still keep the Stream Header decoding code
-			 * simple. Similar approach is used in many places
-			 * in this file.
-			 */
-			if (!fill_temp(s, b))
-				return XZ_OK;
-
-			/*
-			 * If dec_stream_header() returns
-			 * XZ_UNSUPPORTED_CHECK, it is still possible
-			 * to continue decoding if working in multi-call
-			 * mode. Thus, update s->sequence before calling
-			 * dec_stream_header().
-			 */
-			s->sequence = SEQ_BLOCK_START;
-
-			ret = dec_stream_header(s);
-			if (ret != XZ_OK)
-				return ret;
-
-		case SEQ_BLOCK_START:
-			/* We need one byte of input to continue. */
-			if (b->in_pos == b->in_size)
-				return XZ_OK;
-
-			/* See if this is the beginning of the Index field. */
-			if (b->in[b->in_pos] == 0) {
-				s->in_start = b->in_pos++;
-				s->sequence = SEQ_INDEX;
-				break;
-			}
-
-			/*
-			 * Calculate the size of the Block Header and
-			 * prepare to decode it.
-			 */
-			s->block_header.size
-				= ((uint32_t)b->in[b->in_pos] + 1) * 4;
-
-			s->temp.size = s->block_header.size;
-			s->temp.pos = 0;
-			s->sequence = SEQ_BLOCK_HEADER;
-
-		case SEQ_BLOCK_HEADER:
-			if (!fill_temp(s, b))
-				return XZ_OK;
-
-			ret = dec_block_header(s);
-			if (ret != XZ_OK)
-				return ret;
-
-			s->sequence = SEQ_BLOCK_UNCOMPRESS;
-
-		case SEQ_BLOCK_UNCOMPRESS:
-			ret = dec_block(s, b);
-			if (ret != XZ_STREAM_END)
-				return ret;
-
-			s->sequence = SEQ_BLOCK_PADDING;
-
-		case SEQ_BLOCK_PADDING:
-			/*
-			 * Size of Compressed Data + Block Padding
-			 * must be a multiple of four. We don't need
-			 * s->block.compressed for anything else
-			 * anymore, so we use it here to test the size
-			 * of the Block Padding field.
-			 */
-			while (s->block.compressed & 3) {
-				if (b->in_pos == b->in_size)
-					return XZ_OK;
-
-				if (b->in[b->in_pos++] != 0)
-					return XZ_DATA_ERROR;
-
-				++s->block.compressed;
-			}
-
-			s->sequence = SEQ_BLOCK_CHECK;
-
-		case SEQ_BLOCK_CHECK:
-			if (s->check_type == XZ_CHECK_CRC32) {
-				ret = crc32_validate(s, b);
-				if (ret != XZ_STREAM_END)
-					return ret;
-			}
+    enum xz_ret ret;
+
+    /*
+     * Store the start position for the case when we are in the middle
+     * of the Index field.
+     */
+    s->in_start = b->in_pos;
+
+    while (true)
+    {
+        switch (s->sequence)
+        {
+            case SEQ_STREAM_HEADER:
+                /*
+                 * Stream Header is copied to s->temp, and then
+                 * decoded from there. This way if the caller
+                 * gives us only little input at a time, we can
+                 * still keep the Stream Header decoding code
+                 * simple. Similar approach is used in many places
+                 * in this file.
+                 */
+                if (!fill_temp(s, b))
+                    return XZ_OK;
+
+                /*
+                 * If dec_stream_header() returns
+                 * XZ_UNSUPPORTED_CHECK, it is still possible
+                 * to continue decoding if working in multi-call
+                 * mode. Thus, update s->sequence before calling
+                 * dec_stream_header().
+                 */
+                s->sequence = SEQ_BLOCK_START;
+
+                ret = dec_stream_header(s);
+                if (ret != XZ_OK)
+                    return ret;
+
+            case SEQ_BLOCK_START:
+                /* We need one byte of input to continue. */
+                if (b->in_pos == b->in_size)
+                    return XZ_OK;
+
+                /* See if this is the beginning of the Index field. */
+                if (b->in[b->in_pos] == 0)
+                {
+                    s->in_start = b->in_pos++;
+                    s->sequence = SEQ_INDEX;
+                    break;
+                }
+
+                /*
+                 * Calculate the size of the Block Header and
+                 * prepare to decode it.
+                 */
+                s->block_header.size = ((uint32_t)b->in[b->in_pos] + 1) * 4;
+
+                s->temp.size = s->block_header.size;
+                s->temp.pos = 0;
+                s->sequence = SEQ_BLOCK_HEADER;
+
+            case SEQ_BLOCK_HEADER:
+                if (!fill_temp(s, b))
+                    return XZ_OK;
+
+                ret = dec_block_header(s);
+                if (ret != XZ_OK)
+                    return ret;
+
+                s->sequence = SEQ_BLOCK_UNCOMPRESS;
+
+            case SEQ_BLOCK_UNCOMPRESS:
+                ret = dec_block(s, b);
+                if (ret != XZ_STREAM_END)
+                    return ret;
+
+                s->sequence = SEQ_BLOCK_PADDING;
+
+            case SEQ_BLOCK_PADDING:
+                /*
+                 * Size of Compressed Data + Block Padding
+                 * must be a multiple of four. We don't need
+                 * s->block.compressed for anything else
+                 * anymore, so we use it here to test the size
+                 * of the Block Padding field.
+                 */
+                while (s->block.compressed & 3)
+                {
+                    if (b->in_pos == b->in_size)
+                        return XZ_OK;
+
+                    if (b->in[b->in_pos++] != 0)
+                        return XZ_DATA_ERROR;
+
+                    ++s->block.compressed;
+                }
+
+                s->sequence = SEQ_BLOCK_CHECK;
+
+            case SEQ_BLOCK_CHECK:
+                if (s->check_type == XZ_CHECK_CRC32)
+                {
+                    ret = crc32_validate(s, b);
+                    if (ret != XZ_STREAM_END)
+                        return ret;
+                }
 #ifdef XZ_DEC_ANY_CHECK
-			else if (!check_skip(s, b)) {
-				return XZ_OK;
-			}
+                else if (!check_skip(s, b))
+                {
+                    return XZ_OK;
+                }
 #endif
 
-			s->sequence = SEQ_BLOCK_START;
-			break;
+                s->sequence = SEQ_BLOCK_START;
+                break;
 
-		case SEQ_INDEX:
-			ret = dec_index(s, b);
-			if (ret != XZ_STREAM_END)
-				return ret;
+            case SEQ_INDEX:
+                ret = dec_index(s, b);
+                if (ret != XZ_STREAM_END)
+                    return ret;
 
-			s->sequence = SEQ_INDEX_PADDING;
+                s->sequence = SEQ_INDEX_PADDING;
 
-		case SEQ_INDEX_PADDING:
-			while ((s->index.size + (b->in_pos - s->in_start))
-					& 3) {
-				if (b->in_pos == b->in_size) {
-					index_update(s, b);
-					return XZ_OK;
-				}
+            case SEQ_INDEX_PADDING:
+                while ((s->index.size + (b->in_pos - s->in_start)) & 3)
+                {
+                    if (b->in_pos == b->in_size)
+                    {
+                        index_update(s, b);
+                        return XZ_OK;
+                    }
 
-				if (b->in[b->in_pos++] != 0)
-					return XZ_DATA_ERROR;
-			}
+                    if (b->in[b->in_pos++] != 0)
+                        return XZ_DATA_ERROR;
+                }
 
-			/* Finish the CRC32 value and Index size. */
-			index_update(s, b);
+                /* Finish the CRC32 value and Index size. */
+                index_update(s, b);
 
-			/* Compare the hashes to validate the Index field. */
-			if (!memeq(&s->block.hash, &s->index.hash,
-					sizeof(s->block.hash)))
-				return XZ_DATA_ERROR;
+                /* Compare the hashes to validate the Index field. */
+                if (!memeq(&s->block.hash, &s->index.hash, sizeof(s->block.hash)))
+                    return XZ_DATA_ERROR;
 
-			s->sequence = SEQ_INDEX_CRC32;
+                s->sequence = SEQ_INDEX_CRC32;
 
-		case SEQ_INDEX_CRC32:
-			ret = crc32_validate(s, b);
-			if (ret != XZ_STREAM_END)
-				return ret;
+            case SEQ_INDEX_CRC32:
+                ret = crc32_validate(s, b);
+                if (ret != XZ_STREAM_END)
+                    return ret;
 
-			s->temp.size = STREAM_HEADER_SIZE;
-			s->sequence = SEQ_STREAM_FOOTER;
+                s->temp.size = STREAM_HEADER_SIZE;
+                s->sequence = SEQ_STREAM_FOOTER;
 
-		case SEQ_STREAM_FOOTER:
-			if (!fill_temp(s, b))
-				return XZ_OK;
+            case SEQ_STREAM_FOOTER:
+                if (!fill_temp(s, b))
+                    return XZ_OK;
 
-			return dec_stream_footer(s);
-		}
-	}
+                return dec_stream_footer(s);
+        }
+    }
 
-	/* Never reached */
+    /* Never reached */
 }
 
 /*
@@ -765,91 +769,95 @@ static enum xz_ret dec_main(struct xz_dec *s, struct xz_buf *b)
  * actually succeeds (that's the price to pay of using the output buffer as
  * the workspace).
  */
-XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec *s, struct xz_buf *b)
+XZ_EXTERN enum xz_ret xz_dec_run(struct xz_dec* s, struct xz_buf* b)
 {
-	size_t in_start;
-	size_t out_start;
-	enum xz_ret ret;
-
-	if (DEC_IS_SINGLE(s->mode))
-		xz_dec_reset(s);
-
-	in_start = b->in_pos;
-	out_start = b->out_pos;
-	ret = dec_main(s, b);
-
-	if (DEC_IS_SINGLE(s->mode)) {
-		if (ret == XZ_OK)
-			ret = b->in_pos == b->in_size
-					? XZ_DATA_ERROR : XZ_BUF_ERROR;
-
-		if (ret != XZ_STREAM_END) {
-			b->in_pos = in_start;
-			b->out_pos = out_start;
-		}
-
-	} else if (ret == XZ_OK && in_start == b->in_pos
-			&& out_start == b->out_pos) {
-		if (s->allow_buf_error)
-			ret = XZ_BUF_ERROR;
-
-		s->allow_buf_error = true;
-	} else {
-		s->allow_buf_error = false;
-	}
-
-	return ret;
+    size_t in_start;
+    size_t out_start;
+    enum xz_ret ret;
+
+    if (DEC_IS_SINGLE(s->mode))
+        xz_dec_reset(s);
+
+    in_start = b->in_pos;
+    out_start = b->out_pos;
+    ret = dec_main(s, b);
+
+    if (DEC_IS_SINGLE(s->mode))
+    {
+        if (ret == XZ_OK)
+            ret = b->in_pos == b->in_size ? XZ_DATA_ERROR : XZ_BUF_ERROR;
+
+        if (ret != XZ_STREAM_END)
+        {
+            b->in_pos = in_start;
+            b->out_pos = out_start;
+        }
+    }
+    else if (ret == XZ_OK && in_start == b->in_pos && out_start == b->out_pos)
+    {
+        if (s->allow_buf_error)
+            ret = XZ_BUF_ERROR;
+
+        s->allow_buf_error = true;
+    }
+    else
+    {
+        s->allow_buf_error = false;
+    }
+
+    return ret;
 }
 
-XZ_EXTERN struct xz_dec *xz_dec_init(enum xz_mode mode, uint32_t dict_max)
+XZ_EXTERN struct xz_dec* xz_dec_init(enum xz_mode mode, uint32_t dict_max)
 {
-	struct xz_dec *s = kmalloc(sizeof(*s), GFP_KERNEL);
-	if (s == NULL)
-		return NULL;
+    struct xz_dec* s = kmalloc(sizeof(*s), GFP_KERNEL);
+    if (s == NULL)
+        return NULL;
 
-	s->mode = mode;
+    s->mode = mode;
 
 #ifdef XZ_DEC_BCJ
-	s->bcj = xz_dec_bcj_create(DEC_IS_SINGLE(mode));
-	if (s->bcj == NULL)
-		goto error_bcj;
+    s->bcj = xz_dec_bcj_create(DEC_IS_SINGLE(mode));
+    if (s->bcj == NULL)
+        goto error_bcj;
 #endif
 
-	s->lzma2 = xz_dec_lzma2_create(mode, dict_max);
-	if (s->lzma2 == NULL)
-		goto error_lzma2;
+    s->lzma2 = xz_dec_lzma2_create(mode, dict_max);
+    if (s->lzma2 == NULL)
+        goto error_lzma2;
 
-	xz_dec_reset(s);
-	return s;
+    xz_dec_reset(s);
+    return s;
 
 error_lzma2:
 #ifdef XZ_DEC_BCJ
-	xz_dec_bcj_end(s->bcj);
+    xz_dec_bcj_end(s->bcj);
 error_bcj:
 #endif
-	kfree(s);
-	return NULL;
+    kfree(s);
+    return NULL;
 }
 
-XZ_EXTERN void xz_dec_reset(struct xz_dec *s)
+XZ_EXTERN void xz_dec_reset(struct xz_dec* s)
 {
-	s->sequence = SEQ_STREAM_HEADER;
-	s->allow_buf_error = false;
-	s->pos = 0;
-	s->crc32 = 0;
-	memzero(&s->block, sizeof(s->block));
-	memzero(&s->index, sizeof(s->index));
-	s->temp.pos = 0;
-	s->temp.size = STREAM_HEADER_SIZE;
+    s->sequence = SEQ_STREAM_HEADER;
+    s->allow_buf_error = false;
+    s->pos = 0;
+    s->crc32 = 0;
+    memzero(&s->block, sizeof(s->block));
+    memzero(&s->index, sizeof(s->index));
+    s->temp.pos = 0;
+    s->temp.size = STREAM_HEADER_SIZE;
 }
 
-XZ_EXTERN void xz_dec_end(struct xz_dec *s)
+XZ_EXTERN void xz_dec_end(struct xz_dec* s)
 {
-	if (s != NULL) {
-		xz_dec_lzma2_end(s->lzma2);
+    if (s != NULL)
+    {
+        xz_dec_lzma2_end(s->lzma2);
 #ifdef XZ_DEC_BCJ
-		xz_dec_bcj_end(s->bcj);
+        xz_dec_bcj_end(s->bcj);
 #endif
-		kfree(s);
-	}
+        kfree(s);
+    }
 }
diff --git a/ext_libs/minixz/xz_lzma2.h b/ext_libs/minixz/xz_lzma2.h
index 40c20cce..0c7632dc 100644
--- a/ext_libs/minixz/xz_lzma2.h
+++ b/ext_libs/minixz/xz_lzma2.h
@@ -72,19 +72,20 @@
  * The symbol names are in from STATE_oldest_older_previous. REP means
  * either short or long repeated match, and NONLIT means any non-literal.
  */
-enum lzma_state {
-	STATE_LIT_LIT,
-	STATE_MATCH_LIT_LIT,
-	STATE_REP_LIT_LIT,
-	STATE_SHORTREP_LIT_LIT,
-	STATE_MATCH_LIT,
-	STATE_REP_LIT,
-	STATE_SHORTREP_LIT,
-	STATE_LIT_MATCH,
-	STATE_LIT_LONGREP,
-	STATE_LIT_SHORTREP,
-	STATE_NONLIT_MATCH,
-	STATE_NONLIT_REP
+enum lzma_state
+{
+    STATE_LIT_LIT,
+    STATE_MATCH_LIT_LIT,
+    STATE_REP_LIT_LIT,
+    STATE_SHORTREP_LIT_LIT,
+    STATE_MATCH_LIT,
+    STATE_REP_LIT,
+    STATE_SHORTREP_LIT,
+    STATE_LIT_MATCH,
+    STATE_LIT_LONGREP,
+    STATE_LIT_SHORTREP,
+    STATE_NONLIT_MATCH,
+    STATE_NONLIT_REP
 };
 
 /* Total number of states */
@@ -94,38 +95,38 @@ enum lzma_state {
 #define LIT_STATES 7
 
 /* Indicate that the latest symbol was a literal. */
-static inline void lzma_state_literal(enum lzma_state *state)
+static inline void lzma_state_literal(enum lzma_state* state)
 {
-	if (*state <= STATE_SHORTREP_LIT_LIT)
-		*state = STATE_LIT_LIT;
-	else if (*state <= STATE_LIT_SHORTREP)
-		*state -= 3;
-	else
-		*state -= 6;
+    if (*state <= STATE_SHORTREP_LIT_LIT)
+        *state = STATE_LIT_LIT;
+    else if (*state <= STATE_LIT_SHORTREP)
+        *state -= 3;
+    else
+        *state -= 6;
 }
 
 /* Indicate that the latest symbol was a match. */
-static inline void lzma_state_match(enum lzma_state *state)
+static inline void lzma_state_match(enum lzma_state* state)
 {
-	*state = *state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;
+    *state = *state < LIT_STATES ? STATE_LIT_MATCH : STATE_NONLIT_MATCH;
 }
 
 /* Indicate that the latest state was a long repeated match. */
-static inline void lzma_state_long_rep(enum lzma_state *state)
+static inline void lzma_state_long_rep(enum lzma_state* state)
 {
-	*state = *state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;
+    *state = *state < LIT_STATES ? STATE_LIT_LONGREP : STATE_NONLIT_REP;
 }
 
 /* Indicate that the latest symbol was a short match. */
-static inline void lzma_state_short_rep(enum lzma_state *state)
+static inline void lzma_state_short_rep(enum lzma_state* state)
 {
-	*state = *state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;
+    *state = *state < LIT_STATES ? STATE_LIT_SHORTREP : STATE_NONLIT_REP;
 }
 
 /* Test if the previous symbol was a literal. */
 static inline bool lzma_state_is_literal(enum lzma_state state)
 {
-	return state < LIT_STATES;
+    return state < LIT_STATES;
 }
 
 /* Each literal coder is divided in three sections:
@@ -179,8 +180,7 @@ static inline bool lzma_state_is_literal(enum lzma_state state)
  */
 static inline uint32_t lzma_get_dist_state(uint32_t len)
 {
-	return len < DIST_STATES + MATCH_LEN_MIN
-			? len - MATCH_LEN_MIN : DIST_STATES - 1;
+    return len < DIST_STATES + MATCH_LEN_MIN ? len - MATCH_LEN_MIN : DIST_STATES - 1;
 }
 
 /*
diff --git a/ext_libs/minixz/xz_private.h b/ext_libs/minixz/xz_private.h
index 396cf32f..a49aa352 100644
--- a/ext_libs/minixz/xz_private.h
+++ b/ext_libs/minixz/xz_private.h
@@ -43,51 +43,50 @@
 #define XZ_PRIVATE_H
 
 #ifdef __KERNEL__
-#	include <linux/xz.h>
-#	include <linux/kernel.h>
-#	include <asm/unaligned.h>
-	/* XZ_PREBOOT may be defined only via decompress_unxz.c. */
-#	ifndef XZ_PREBOOT
-#		include <linux/slab.h>
-#		include <linux/vmalloc.h>
-#		include <linux/string.h>
-#		ifdef CONFIG_XZ_DEC_X86
-#			define XZ_DEC_X86
-#		endif
-#		ifdef CONFIG_XZ_DEC_POWERPC
-#			define XZ_DEC_POWERPC
-#		endif
-#		ifdef CONFIG_XZ_DEC_IA64
-#			define XZ_DEC_IA64
-#		endif
-#		ifdef CONFIG_XZ_DEC_ARM
-#			define XZ_DEC_ARM
-#		endif
-#		ifdef CONFIG_XZ_DEC_ARMTHUMB
-#			define XZ_DEC_ARMTHUMB
-#		endif
-#		ifdef CONFIG_XZ_DEC_SPARC
-#			define XZ_DEC_SPARC
-#		endif
-#		define memeq(a, b, size) (memcmp(a, b, size) == 0)
-#		define memzero(buf, size) memset(buf, 0, size)
-#	endif
-#	define get_le32(p) le32_to_cpup((const uint32_t *)(p))
+#include <linux/xz.h>
+#include <linux/kernel.h>
+#include <asm/unaligned.h>
+/* XZ_PREBOOT may be defined only via decompress_unxz.c. */
+#ifndef XZ_PREBOOT
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/string.h>
+#ifdef CONFIG_XZ_DEC_X86
+#define XZ_DEC_X86
+#endif
+#ifdef CONFIG_XZ_DEC_POWERPC
+#define XZ_DEC_POWERPC
+#endif
+#ifdef CONFIG_XZ_DEC_IA64
+#define XZ_DEC_IA64
+#endif
+#ifdef CONFIG_XZ_DEC_ARM
+#define XZ_DEC_ARM
+#endif
+#ifdef CONFIG_XZ_DEC_ARMTHUMB
+#define XZ_DEC_ARMTHUMB
+#endif
+#ifdef CONFIG_XZ_DEC_SPARC
+#define XZ_DEC_SPARC
+#endif
+#define memeq(a, b, size) (memcmp(a, b, size) == 0)
+#define memzero(buf, size) memset(buf, 0, size)
+#endif
+#define get_le32(p) le32_to_cpup((const uint32_t*)(p))
 #else
-	/*
-	 * For userspace builds, use a separate header to define the required
-	 * macros and functions. This makes it easier to adapt the code into
-	 * different environments and avoids clutter in the Linux kernel tree.
-	 */
-#	include <xz_config.h>
+/*
+ * For userspace builds, use a separate header to define the required
+ * macros and functions. This makes it easier to adapt the code into
+ * different environments and avoids clutter in the Linux kernel tree.
+ */
+#include <xz_config.h>
 #endif
 
 /* If no specific decoding mode is requested, enable support for all modes. */
-#if !defined(XZ_DEC_SINGLE) && !defined(XZ_DEC_PREALLOC) \
-		&& !defined(XZ_DEC_DYNALLOC)
-#	define XZ_DEC_SINGLE
-#	define XZ_DEC_PREALLOC
-#	define XZ_DEC_DYNALLOC
+#if !defined(XZ_DEC_SINGLE) && !defined(XZ_DEC_PREALLOC) && !defined(XZ_DEC_DYNALLOC)
+#define XZ_DEC_SINGLE
+#define XZ_DEC_PREALLOC
+#define XZ_DEC_DYNALLOC
 #endif
 
 /*
@@ -96,29 +95,29 @@
  * false at compile time and thus allow the compiler to omit unneeded code.
  */
 #ifdef XZ_DEC_SINGLE
-#	define DEC_IS_SINGLE(mode) ((mode) == XZ_SINGLE)
+#define DEC_IS_SINGLE(mode) ((mode) == XZ_SINGLE)
 #else
-#	define DEC_IS_SINGLE(mode) (false)
+#define DEC_IS_SINGLE(mode) (false)
 #endif
 
 #ifdef XZ_DEC_PREALLOC
-#	define DEC_IS_PREALLOC(mode) ((mode) == XZ_PREALLOC)
+#define DEC_IS_PREALLOC(mode) ((mode) == XZ_PREALLOC)
 #else
-#	define DEC_IS_PREALLOC(mode) (false)
+#define DEC_IS_PREALLOC(mode) (false)
 #endif
 
 #ifdef XZ_DEC_DYNALLOC
-#	define DEC_IS_DYNALLOC(mode) ((mode) == XZ_DYNALLOC)
+#define DEC_IS_DYNALLOC(mode) ((mode) == XZ_DYNALLOC)
 #else
-#	define DEC_IS_DYNALLOC(mode) (false)
+#define DEC_IS_DYNALLOC(mode) (false)
 #endif
 
 #if !defined(XZ_DEC_SINGLE)
-#	define DEC_IS_MULTI(mode) (true)
+#define DEC_IS_MULTI(mode) (true)
 #elif defined(XZ_DEC_PREALLOC) || defined(XZ_DEC_DYNALLOC)
-#	define DEC_IS_MULTI(mode) ((mode) != XZ_SINGLE)
+#define DEC_IS_MULTI(mode) ((mode) != XZ_SINGLE)
 #else
-#	define DEC_IS_MULTI(mode) (false)
+#define DEC_IS_MULTI(mode) (false)
 #endif
 
 /*
@@ -126,20 +125,17 @@
  * XZ_DEC_BCJ is used to enable generic support for BCJ decoders.
  */
 #ifndef XZ_DEC_BCJ
-#	if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) \
-			|| defined(XZ_DEC_IA64) || defined(XZ_DEC_ARM) \
-			|| defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) \
-			|| defined(XZ_DEC_SPARC)
-#		define XZ_DEC_BCJ
-#	endif
+#if defined(XZ_DEC_X86) || defined(XZ_DEC_POWERPC) || defined(XZ_DEC_IA64) || defined(XZ_DEC_ARM) || \
+  defined(XZ_DEC_ARM) || defined(XZ_DEC_ARMTHUMB) || defined(XZ_DEC_SPARC)
+#define XZ_DEC_BCJ
+#endif
 #endif
 
 /*
  * Allocate memory for LZMA2 decoder. xz_dec_lzma2_reset() must be used
  * before calling xz_dec_lzma2_run().
  */
-XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
-						   uint32_t dict_max);
+XZ_EXTERN struct xz_dec_lzma2* xz_dec_lzma2_create(enum xz_mode mode, uint32_t dict_max);
 
 /*
  * Decode the LZMA2 properties (one byte) and reset the decoder. Return
@@ -147,22 +143,20 @@ XZ_EXTERN struct xz_dec_lzma2 *xz_dec_lzma2_create(enum xz_mode mode,
  * big enough, and XZ_OPTIONS_ERROR if props indicates something that this
  * decoder doesn't support.
  */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2 *s,
-					 uint8_t props);
+XZ_EXTERN enum xz_ret xz_dec_lzma2_reset(struct xz_dec_lzma2* s, uint8_t props);
 
 /* Decode raw LZMA2 stream from b->in to b->out. */
-XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2 *s,
-				       struct xz_buf *b);
+XZ_EXTERN enum xz_ret xz_dec_lzma2_run(struct xz_dec_lzma2* s, struct xz_buf* b);
 
 /* Free the memory allocated for the LZMA2 decoder. */
-XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2 *s);
+XZ_EXTERN void xz_dec_lzma2_end(struct xz_dec_lzma2* s);
 
 #ifdef XZ_DEC_BCJ
 /*
  * Allocate memory for BCJ decoders. xz_dec_bcj_reset() must be used before
  * calling xz_dec_bcj_run().
  */
-XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call);
+XZ_EXTERN struct xz_dec_bcj* xz_dec_bcj_create(bool single_call);
 
 /*
  * Decode the Filter ID of a BCJ filter. This implementation doesn't
@@ -170,16 +164,14 @@ XZ_EXTERN struct xz_dec_bcj *xz_dec_bcj_create(bool single_call);
  * is needed. Returns XZ_OK if the given Filter ID is supported.
  * Otherwise XZ_OPTIONS_ERROR is returned.
  */
-XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj *s, uint8_t id);
+XZ_EXTERN enum xz_ret xz_dec_bcj_reset(struct xz_dec_bcj* s, uint8_t id);
 
 /*
  * Decode raw BCJ + LZMA2 stream. This must be used only if there actually is
  * a BCJ filter in the chain. If the chain has only LZMA2, xz_dec_lzma2_run()
  * must be called directly.
  */
-XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj *s,
-				     struct xz_dec_lzma2 *lzma2,
-				     struct xz_buf *b);
+XZ_EXTERN enum xz_ret xz_dec_bcj_run(struct xz_dec_bcj* s, struct xz_dec_lzma2* lzma2, struct xz_buf* b);
 
 /* Free the memory allocated for the BCJ filters. */
 #define xz_dec_bcj_end(s) kfree(s)
diff --git a/ext_libs/minixz/xz_stream.h b/ext_libs/minixz/xz_stream.h
index 8c1913da..e601e6db 100644
--- a/ext_libs/minixz/xz_stream.h
+++ b/ext_libs/minixz/xz_stream.h
@@ -42,10 +42,9 @@
 #define XZ_STREAM_H
 
 #if defined(__KERNEL__) && !XZ_INTERNAL_CRC32
-#	include <linux/crc32.h>
-#	undef crc32
-#	define xz_crc32(buf, size, crc) \
-		(~crc32_le(~(uint32_t)(crc), buf, size))
+#include <linux/crc32.h>
+#undef crc32
+#define xz_crc32(buf, size, crc) (~crc32_le(~(uint32_t)(crc), buf, size))
 #endif
 
 /*
@@ -80,11 +79,12 @@ typedef uint64_t vli_type;
 #define VLI_BYTES_MAX (sizeof(vli_type) * 8 / 7)
 
 /* Integrity Check types */
-enum xz_check {
-	XZ_CHECK_NONE = 0,
-	XZ_CHECK_CRC32 = 1,
-	XZ_CHECK_CRC64 = 4,
-	XZ_CHECK_SHA256 = 10
+enum xz_check
+{
+    XZ_CHECK_NONE = 0,
+    XZ_CHECK_CRC32 = 1,
+    XZ_CHECK_CRC64 = 4,
+    XZ_CHECK_SHA256 = 10
 };
 
 /* Maximum possible Check ID */
diff --git a/ext_libs/muparser/muParser.cpp b/ext_libs/muparser/muParser.cpp
old mode 100755
new mode 100644
index 39ea8610..ca38ae35
--- a/ext_libs/muparser/muParser.cpp
+++ b/ext_libs/muparser/muParser.cpp
@@ -1,27 +1,27 @@
-/* 
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+/*
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
 
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "muParser.h"
 #include "muParserTemplateMagic.h"
@@ -32,10 +32,10 @@
 #include <numeric>
 
 /** \brief Pi (what else?). */
-#define PARSER_CONST_PI  3.141592653589793238462643
+#define PARSER_CONST_PI 3.141592653589793238462643
 
 /** \brief The Eulerian number. */
-#define PARSER_CONST_E   2.718281828459045235360287
+#define PARSER_CONST_E 2.718281828459045235360287
 
 using namespace std;
 
@@ -43,299 +43,344 @@ using namespace std;
     \brief Implementation of the standard floating point parser.
 */
 
-
-
 /** \brief Namespace for mathematical applications. */
 namespace mu
 {
+//---------------------------------------------------------------------------
+// Trigonometric function
+value_type Parser::Sin(value_type v)
+{
+    return MathImpl<value_type>::Sin(v);
+}
+value_type Parser::Cos(value_type v)
+{
+    return MathImpl<value_type>::Cos(v);
+}
+value_type Parser::Tan(value_type v)
+{
+    return MathImpl<value_type>::Tan(v);
+}
+value_type Parser::ASin(value_type v)
+{
+    return MathImpl<value_type>::ASin(v);
+}
+value_type Parser::ACos(value_type v)
+{
+    return MathImpl<value_type>::ACos(v);
+}
+value_type Parser::ATan(value_type v)
+{
+    return MathImpl<value_type>::ATan(v);
+}
+value_type Parser::ATan2(value_type v1, value_type v2)
+{
+    return MathImpl<value_type>::ATan2(v1, v2);
+}
+value_type Parser::Sinh(value_type v)
+{
+    return MathImpl<value_type>::Sinh(v);
+}
+value_type Parser::Cosh(value_type v)
+{
+    return MathImpl<value_type>::Cosh(v);
+}
+value_type Parser::Tanh(value_type v)
+{
+    return MathImpl<value_type>::Tanh(v);
+}
+value_type Parser::ASinh(value_type v)
+{
+    return MathImpl<value_type>::ASinh(v);
+}
+value_type Parser::ACosh(value_type v)
+{
+    return MathImpl<value_type>::ACosh(v);
+}
+value_type Parser::ATanh(value_type v)
+{
+    return MathImpl<value_type>::ATanh(v);
+}
 
+//---------------------------------------------------------------------------
+// Logarithm functions
 
-  //---------------------------------------------------------------------------
-  // Trigonometric function
-  value_type Parser::Sin(value_type v)   { return MathImpl<value_type>::Sin(v);  }
-  value_type Parser::Cos(value_type v)   { return MathImpl<value_type>::Cos(v);  }
-  value_type Parser::Tan(value_type v)   { return MathImpl<value_type>::Tan(v);  }
-  value_type Parser::ASin(value_type v)  { return MathImpl<value_type>::ASin(v); }
-  value_type Parser::ACos(value_type v)  { return MathImpl<value_type>::ACos(v); }
-  value_type Parser::ATan(value_type v)  { return MathImpl<value_type>::ATan(v); }
-  value_type Parser::ATan2(value_type v1, value_type v2) { return MathImpl<value_type>::ATan2(v1, v2); }
-  value_type Parser::Sinh(value_type v)  { return MathImpl<value_type>::Sinh(v); }
-  value_type Parser::Cosh(value_type v)  { return MathImpl<value_type>::Cosh(v); }
-  value_type Parser::Tanh(value_type v)  { return MathImpl<value_type>::Tanh(v); }
-  value_type Parser::ASinh(value_type v) { return MathImpl<value_type>::ASinh(v); }
-  value_type Parser::ACosh(value_type v) { return MathImpl<value_type>::ACosh(v); }
-  value_type Parser::ATanh(value_type v) { return MathImpl<value_type>::ATanh(v); }
-
-  //---------------------------------------------------------------------------
-  // Logarithm functions
-
-  // Logarithm base 2
-  value_type Parser::Log2(value_type v)  
-  { 
-    #ifdef MUP_MATH_EXCEPTIONS
-        if (v<=0)
-          throw ParserError(ecDOMAIN_ERROR, _T("Log2"));
-    #endif
-
-    return MathImpl<value_type>::Log2(v);  
-  }  
-
-  // Logarithm base 10
-  value_type Parser::Log10(value_type v) 
-  { 
-    #ifdef MUP_MATH_EXCEPTIONS
-        if (v<=0)
-          throw ParserError(ecDOMAIN_ERROR, _T("Log10"));
-    #endif
-
-    return MathImpl<value_type>::Log10(v); 
-  } 
+// Logarithm base 2
+value_type Parser::Log2(value_type v)
+{
+#ifdef MUP_MATH_EXCEPTIONS
+    if (v <= 0)
+        throw ParserError(ecDOMAIN_ERROR, _T("Log2"));
+#endif
+
+    return MathImpl<value_type>::Log2(v);
+}
+
+// Logarithm base 10
+value_type Parser::Log10(value_type v)
+{
+#ifdef MUP_MATH_EXCEPTIONS
+    if (v <= 0)
+        throw ParserError(ecDOMAIN_ERROR, _T("Log10"));
+#endif
+
+    return MathImpl<value_type>::Log10(v);
+}
 
 // Logarithm base e (natural logarithm)
-  value_type Parser::Ln(value_type v)    
-  { 
-    #ifdef MUP_MATH_EXCEPTIONS
-        if (v<=0)
-          throw ParserError(ecDOMAIN_ERROR, _T("Ln"));
-    #endif
-
-    return MathImpl<value_type>::Log(v);   
-  } 
-
-  //---------------------------------------------------------------------------
-  //  misc
-  value_type Parser::Exp(value_type v)  { return MathImpl<value_type>::Exp(v);  }
-  value_type Parser::Abs(value_type v)  { return MathImpl<value_type>::Abs(v);  }
-  value_type Parser::Sqrt(value_type v) 
-  { 
-    #ifdef MUP_MATH_EXCEPTIONS
-        if (v<0)
-          throw ParserError(ecDOMAIN_ERROR, _T("sqrt"));
-    #endif
-
-    return MathImpl<value_type>::Sqrt(v); 
-  }
-  value_type Parser::Rint(value_type v) { return MathImpl<value_type>::Rint(v); }
-  value_type Parser::Sign(value_type v) { return MathImpl<value_type>::Sign(v); }
-
-  //---------------------------------------------------------------------------
-  /** \brief Callback for the unary minus operator.
-      \param v The value to negate
-      \return -v
-  */
-  value_type Parser::UnaryMinus(value_type v) 
-  { 
-    return -v; 
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Callback for the unary minus operator.
-      \param v The value to negate
-      \return -v
-  */
-  value_type Parser::UnaryPlus(value_type v) 
-  { 
-    return v; 
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Callback for adding multiple values. 
-      \param [in] a_afArg Vector with the function arguments
-      \param [in] a_iArgc The size of a_afArg
-  */
-  value_type Parser::Sum(const value_type *a_afArg, int a_iArgc)
-  { 
-    if (!a_iArgc)	
-      throw exception_type(_T("too few arguments for function sum."));
-
-    value_type fRes=0;
-    for (int i=0; i<a_iArgc; ++i) fRes += a_afArg[i];
-    return fRes;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Callback for averaging multiple values. 
-      \param [in] a_afArg Vector with the function arguments
-      \param [in] a_iArgc The size of a_afArg
-  */
-  value_type Parser::Avg(const value_type *a_afArg, int a_iArgc)
-  { 
-    if (!a_iArgc)	
-      throw exception_type(_T("too few arguments for function sum."));
-
-    value_type fRes=0;
-    for (int i=0; i<a_iArgc; ++i) fRes += a_afArg[i];
-    return fRes/(value_type)a_iArgc;
-  }
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Callback for determining the minimum value out of a vector. 
-      \param [in] a_afArg Vector with the function arguments
-      \param [in] a_iArgc The size of a_afArg
-  */
-  value_type Parser::Min(const value_type *a_afArg, int a_iArgc)
-  { 
-    if (!a_iArgc)	
-      throw exception_type(_T("too few arguments for function min."));
-
-    value_type fRes=a_afArg[0];
-    for (int i=0; i<a_iArgc; ++i) 
-      fRes = std::min(fRes, a_afArg[i]);
+value_type Parser::Ln(value_type v)
+{
+#ifdef MUP_MATH_EXCEPTIONS
+    if (v <= 0)
+        throw ParserError(ecDOMAIN_ERROR, _T("Ln"));
+#endif
+
+    return MathImpl<value_type>::Log(v);
+}
+
+//---------------------------------------------------------------------------
+//  misc
+value_type Parser::Exp(value_type v)
+{
+    return MathImpl<value_type>::Exp(v);
+}
+value_type Parser::Abs(value_type v)
+{
+    return MathImpl<value_type>::Abs(v);
+}
+value_type Parser::Sqrt(value_type v)
+{
+#ifdef MUP_MATH_EXCEPTIONS
+    if (v < 0)
+        throw ParserError(ecDOMAIN_ERROR, _T("sqrt"));
+#endif
+
+    return MathImpl<value_type>::Sqrt(v);
+}
+value_type Parser::Rint(value_type v)
+{
+    return MathImpl<value_type>::Rint(v);
+}
+value_type Parser::Sign(value_type v)
+{
+    return MathImpl<value_type>::Sign(v);
+}
 
+//---------------------------------------------------------------------------
+/** \brief Callback for the unary minus operator.
+    \param v The value to negate
+    \return -v
+*/
+value_type Parser::UnaryMinus(value_type v)
+{
+    return -v;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Callback for the unary minus operator.
+    \param v The value to negate
+    \return -v
+*/
+value_type Parser::UnaryPlus(value_type v)
+{
+    return v;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Callback for adding multiple values.
+    \param [in] a_afArg Vector with the function arguments
+    \param [in] a_iArgc The size of a_afArg
+*/
+value_type Parser::Sum(const value_type* a_afArg, int a_iArgc)
+{
+    if (!a_iArgc)
+        throw exception_type(_T("too few arguments for function sum."));
+
+    value_type fRes = 0;
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes += a_afArg[i];
     return fRes;
-  }
+}
 
+//---------------------------------------------------------------------------
+/** \brief Callback for averaging multiple values.
+    \param [in] a_afArg Vector with the function arguments
+    \param [in] a_iArgc The size of a_afArg
+*/
+value_type Parser::Avg(const value_type* a_afArg, int a_iArgc)
+{
+    if (!a_iArgc)
+        throw exception_type(_T("too few arguments for function sum."));
+
+    value_type fRes = 0;
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes += a_afArg[i];
+    return fRes / (value_type)a_iArgc;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Callback for determining the minimum value out of a vector.
+    \param [in] a_afArg Vector with the function arguments
+    \param [in] a_iArgc The size of a_afArg
+*/
+value_type Parser::Min(const value_type* a_afArg, int a_iArgc)
+{
+    if (!a_iArgc)
+        throw exception_type(_T("too few arguments for function min."));
 
-  //---------------------------------------------------------------------------
-  /** \brief Callback for determining the maximum value out of a vector. 
-      \param [in] a_afArg Vector with the function arguments
-      \param [in] a_iArgc The size of a_afArg
-  */
-  value_type Parser::Max(const value_type *a_afArg, int a_iArgc)
-  { 
-    if (!a_iArgc)	
-      throw exception_type(_T("too few arguments for function min."));
+    value_type fRes = a_afArg[0];
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes = std::min(fRes, a_afArg[i]);
+
+    return fRes;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Callback for determining the maximum value out of a vector.
+    \param [in] a_afArg Vector with the function arguments
+    \param [in] a_iArgc The size of a_afArg
+*/
+value_type Parser::Max(const value_type* a_afArg, int a_iArgc)
+{
+    if (!a_iArgc)
+        throw exception_type(_T("too few arguments for function min."));
 
-    value_type fRes=a_afArg[0];
-    for (int i=0; i<a_iArgc; ++i) fRes = std::max(fRes, a_afArg[i]);
+    value_type fRes = a_afArg[0];
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes = std::max(fRes, a_afArg[i]);
 
     return fRes;
-  }
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Default value recognition callback. 
-      \param [in] a_szExpr Pointer to the expression
-      \param [in, out] a_iPos Pointer to an index storing the current position within the expression
-      \param [out] a_fVal Pointer where the value should be stored in case one is found.
-      \return 1 if a value was found 0 otherwise.
-  */
-  int Parser::IsVal(const char_type* a_szExpr, int *a_iPos, value_type *a_fVal)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Default value recognition callback.
+    \param [in] a_szExpr Pointer to the expression
+    \param [in, out] a_iPos Pointer to an index storing the current position within the expression
+    \param [out] a_fVal Pointer where the value should be stored in case one is found.
+    \return 1 if a value was found 0 otherwise.
+*/
+int Parser::IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal)
+{
     value_type fVal(0);
 
     stringstream_type stream(a_szExpr);
-    stream.seekg(0);        // todo:  check if this really is necessary
+    stream.seekg(0); // todo:  check if this really is necessary
     stream.imbue(Parser::s_locale);
     stream >> fVal;
     stringstream_type::pos_type iEnd = stream.tellg(); // Position after reading
 
-    if (iEnd==(stringstream_type::pos_type)-1)
-      return 0;
+    if (iEnd == (stringstream_type::pos_type)-1)
+        return 0;
 
     *a_iPos += (int)iEnd;
     *a_fVal = fVal;
     return 1;
-  }
+}
 
+//---------------------------------------------------------------------------
+/** \brief Constructor.
 
-  //---------------------------------------------------------------------------
-  /** \brief Constructor. 
-
-    Call ParserBase class constructor and trigger Function, Operator and Constant initialization.
-  */
-  Parser::Parser()
-    :ParserBase()
-  {
+  Call ParserBase class constructor and trigger Function, Operator and Constant initialization.
+*/
+Parser::Parser() : ParserBase()
+{
     AddValIdent(IsVal);
 
     InitCharSets();
     InitFun();
     InitConst();
     InitOprt();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Define the character sets. 
-      \sa DefineNameChars, DefineOprtChars, DefineInfixOprtChars
-    
-    This function is used for initializing the default character sets that define
-    the characters to be useable in function and variable names and operators.
-  */
-  void Parser::InitCharSets()
-  {
-    DefineNameChars( _T("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") );
-    DefineOprtChars( _T("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+-*^/?<>=#!$%&|~'_{}") );
-    DefineInfixOprtChars( _T("/+-*^?<>=#!$%&|~'_") );
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Initialize the default functions. */
-  void Parser::InitFun()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Define the character sets.
+    \sa DefineNameChars, DefineOprtChars, DefineInfixOprtChars
+
+  This function is used for initializing the default character sets that define
+  the characters to be useable in function and variable names and operators.
+*/
+void Parser::InitCharSets()
+{
+    DefineNameChars(_T("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+    DefineOprtChars(_T("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ+-*^/?<>=#!$%&|~'_{}"));
+    DefineInfixOprtChars(_T("/+-*^?<>=#!$%&|~'_"));
+}
+
+//---------------------------------------------------------------------------
+/** \brief Initialize the default functions. */
+void Parser::InitFun()
+{
     if (mu::TypeInfo<mu::value_type>::IsInteger())
     {
-      // When setting MUP_BASETYPE to an integer type
-      // Place functions for dealing with integer values here
-      // ...
-      // ...
-      // ...
+        // When setting MUP_BASETYPE to an integer type
+        // Place functions for dealing with integer values here
+        // ...
+        // ...
+        // ...
     }
     else
     {
-      // trigonometric functions
-      DefineFun(_T("sin"), Sin);
-      DefineFun(_T("cos"), Cos);
-      DefineFun(_T("tan"), Tan);
-      // arcus functions
-      DefineFun(_T("asin"), ASin);
-      DefineFun(_T("acos"), ACos);
-      DefineFun(_T("atan"), ATan);
-      DefineFun(_T("atan2"), ATan2);
-      // hyperbolic functions
-      DefineFun(_T("sinh"), Sinh);
-      DefineFun(_T("cosh"), Cosh);
-      DefineFun(_T("tanh"), Tanh);
-      // arcus hyperbolic functions
-      DefineFun(_T("asinh"), ASinh);
-      DefineFun(_T("acosh"), ACosh);
-      DefineFun(_T("atanh"), ATanh);
-      // Logarithm functions
-      DefineFun(_T("log2"), Log2);
-      DefineFun(_T("log10"), Log10);
-      DefineFun(_T("log"), Ln);
-      DefineFun(_T("ln"), Ln);
-      // misc
-      DefineFun(_T("exp"), Exp);
-      DefineFun(_T("sqrt"), Sqrt);
-      DefineFun(_T("sign"), Sign);
-      DefineFun(_T("rint"), Rint);
-      DefineFun(_T("abs"), Abs);
-      // Functions with variable number of arguments
-      DefineFun(_T("sum"), Sum);
-      DefineFun(_T("avg"), Avg);
-      DefineFun(_T("min"), Min);
-      DefineFun(_T("max"), Max);
+        // trigonometric functions
+        DefineFun(_T("sin"), Sin);
+        DefineFun(_T("cos"), Cos);
+        DefineFun(_T("tan"), Tan);
+        // arcus functions
+        DefineFun(_T("asin"), ASin);
+        DefineFun(_T("acos"), ACos);
+        DefineFun(_T("atan"), ATan);
+        DefineFun(_T("atan2"), ATan2);
+        // hyperbolic functions
+        DefineFun(_T("sinh"), Sinh);
+        DefineFun(_T("cosh"), Cosh);
+        DefineFun(_T("tanh"), Tanh);
+        // arcus hyperbolic functions
+        DefineFun(_T("asinh"), ASinh);
+        DefineFun(_T("acosh"), ACosh);
+        DefineFun(_T("atanh"), ATanh);
+        // Logarithm functions
+        DefineFun(_T("log2"), Log2);
+        DefineFun(_T("log10"), Log10);
+        DefineFun(_T("log"), Ln);
+        DefineFun(_T("ln"), Ln);
+        // misc
+        DefineFun(_T("exp"), Exp);
+        DefineFun(_T("sqrt"), Sqrt);
+        DefineFun(_T("sign"), Sign);
+        DefineFun(_T("rint"), Rint);
+        DefineFun(_T("abs"), Abs);
+        // Functions with variable number of arguments
+        DefineFun(_T("sum"), Sum);
+        DefineFun(_T("avg"), Avg);
+        DefineFun(_T("min"), Min);
+        DefineFun(_T("max"), Max);
     }
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Initialize constants.
-  
-    By default the parser recognizes two constants. Pi ("pi") and the Eulerian
-    number ("_e").
-  */
-  void Parser::InitConst()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Initialize constants.
+
+  By default the parser recognizes two constants. Pi ("pi") and the Eulerian
+  number ("_e").
+*/
+void Parser::InitConst()
+{
     DefineConst(_T("_pi"), (value_type)PARSER_CONST_PI);
     DefineConst(_T("_e"), (value_type)PARSER_CONST_E);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Initialize operators. 
-  
-    By default only the unary minus operator is added.
-  */
-  void Parser::InitOprt()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Initialize operators.
+
+  By default only the unary minus operator is added.
+*/
+void Parser::InitOprt()
+{
     DefineInfixOprt(_T("-"), UnaryMinus);
     DefineInfixOprt(_T("+"), UnaryPlus);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void Parser::OnDetectVar(string_type * /*pExpr*/, int & /*nStart*/, int & /*nEnd*/)
-  {
+//---------------------------------------------------------------------------
+void Parser::OnDetectVar(string_type* /*pExpr*/, int& /*nStart*/, int& /*nEnd*/)
+{
     // this is just sample code to illustrate modifying variable names on the fly.
     // I'm not sure anyone really needs such a feature...
     /*
@@ -343,7 +388,7 @@ namespace mu
 
     string sVar(pExpr->begin()+nStart, pExpr->begin()+nEnd);
     string sRepl = std::string("_") + sVar + "_";
-  
+
     int nOrigVarEnd = nEnd;
     cout << "variable detected!\n";
     cout << "  Expr: " << *pExpr << "\n";
@@ -356,42 +401,41 @@ namespace mu
     pExpr->replace(pExpr->begin()+nStart, pExpr->begin()+nOrigVarEnd, sRepl);
     cout << "  New expr: " << *pExpr << "\n";
     */
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Numerically differentiate with regard to a variable. 
-      \param [in] a_Var Pointer to the differentiation variable.
-      \param [in] a_fPos Position at which the differentiation should take place.
-      \param [in] a_fEpsilon Epsilon used for the numerical differentiation.
-
-    Numerical differentiation uses a 5 point operator yielding a 4th order 
-    formula. The default value for epsilon is 0.00074 which is
-    numeric_limits<double>::epsilon() ^ (1/5) as suggested in the muparser
-    forum:
-
-    http://sourceforge.net/forum/forum.php?thread_id=1994611&forum_id=462843
-  */
-  value_type Parser::Diff(value_type *a_Var, 
-                          value_type  a_fPos, 
-                          value_type  a_fEpsilon) const
-  {
-    value_type fRes(0), 
-               fBuf(*a_Var),
-               f[4] = {0,0,0,0},
-               fEpsilon(a_fEpsilon);
+}
+
+//---------------------------------------------------------------------------
+/** \brief Numerically differentiate with regard to a variable.
+    \param [in] a_Var Pointer to the differentiation variable.
+    \param [in] a_fPos Position at which the differentiation should take place.
+    \param [in] a_fEpsilon Epsilon used for the numerical differentiation.
+
+  Numerical differentiation uses a 5 point operator yielding a 4th order
+  formula. The default value for epsilon is 0.00074 which is
+  numeric_limits<double>::epsilon() ^ (1/5) as suggested in the muparser
+  forum:
+
+  http://sourceforge.net/forum/forum.php?thread_id=1994611&forum_id=462843
+*/
+value_type Parser::Diff(value_type* a_Var, value_type a_fPos, value_type a_fEpsilon) const
+{
+    value_type fRes(0), fBuf(*a_Var), f[4] = {0, 0, 0, 0}, fEpsilon(a_fEpsilon);
 
     // Backwards compatible calculation of epsilon inc case the user doesn't provide
     // his own epsilon
-    if (fEpsilon==0)
-      fEpsilon = (a_fPos==0) ? (value_type)1e-10 : (value_type)1e-7 * a_fPos;
-
-    *a_Var = a_fPos+2 * fEpsilon;  f[0] = Eval();
-    *a_Var = a_fPos+1 * fEpsilon;  f[1] = Eval();
-    *a_Var = a_fPos-1 * fEpsilon;  f[2] = Eval();
-    *a_Var = a_fPos-2 * fEpsilon;  f[3] = Eval();
+    if (fEpsilon == 0)
+        fEpsilon = (a_fPos == 0) ? (value_type)1e-10 : (value_type)1e-7 * a_fPos;
+
+    *a_Var = a_fPos + 2 * fEpsilon;
+    f[0] = Eval();
+    *a_Var = a_fPos + 1 * fEpsilon;
+    f[1] = Eval();
+    *a_Var = a_fPos - 1 * fEpsilon;
+    f[2] = Eval();
+    *a_Var = a_fPos - 2 * fEpsilon;
+    f[3] = Eval();
     *a_Var = fBuf; // restore variable
 
-    fRes = (-f[0] + 8*f[1] - 8*f[2] + f[3]) / (12*fEpsilon);
+    fRes = (-f[0] + 8 * f[1] - 8 * f[2] + f[3]) / (12 * fEpsilon);
     return fRes;
-  }
+}
 } // namespace mu
diff --git a/ext_libs/muparser/muParser.h b/ext_libs/muparser/muParser.h
old mode 100755
new mode 100644
index 39fe137f..c864a93f
--- a/ext_libs/muparser/muParser.h
+++ b/ext_libs/muparser/muParser.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef MU_PARSER_H
 #define MU_PARSER_H
@@ -38,78 +38,73 @@
 
 namespace mu
 {
-  /** \brief Mathematical expressions parser.
-    
-    Standard implementation of the mathematical expressions parser. 
-    Can be used as a reference implementation for subclassing the parser.
-
-    <small>
-    (C) 2011 Ingo Berg<br>
-    muparser(at)beltoforion.de
-    </small>
-  */
-  /* final */ class Parser : public ParserBase
-  {
-  public:
+/** \brief Mathematical expressions parser.
 
+  Standard implementation of the mathematical expressions parser.
+  Can be used as a reference implementation for subclassing the parser.
+
+  <small>
+  (C) 2011 Ingo Berg<br>
+  muparser(at)beltoforion.de
+  </small>
+*/
+/* final */ class Parser : public ParserBase
+{
+public:
     Parser();
 
     virtual void InitCharSets();
     virtual void InitFun();
     virtual void InitConst();
     virtual void InitOprt();
-    virtual void OnDetectVar(string_type *pExpr, int &nStart, int &nEnd);
+    virtual void OnDetectVar(string_type* pExpr, int& nStart, int& nEnd);
 
-    value_type Diff(value_type *a_Var, 
-                    value_type a_fPos, 
-                    value_type a_fEpsilon = 0) const;
-
-  protected:
+    value_type Diff(value_type* a_Var, value_type a_fPos, value_type a_fEpsilon = 0) const;
 
+protected:
     // Trigonometric functions
-    static value_type  Sin(value_type);
-    static value_type  Cos(value_type);
-    static value_type  Tan(value_type);
-    static value_type  Tan2(value_type, value_type);
+    static value_type Sin(value_type);
+    static value_type Cos(value_type);
+    static value_type Tan(value_type);
+    static value_type Tan2(value_type, value_type);
     // arcus functions
-    static value_type  ASin(value_type);
-    static value_type  ACos(value_type);
-    static value_type  ATan(value_type);
-    static value_type  ATan2(value_type, value_type);
+    static value_type ASin(value_type);
+    static value_type ACos(value_type);
+    static value_type ATan(value_type);
+    static value_type ATan2(value_type, value_type);
 
     // hyperbolic functions
-    static value_type  Sinh(value_type);
-    static value_type  Cosh(value_type);
-    static value_type  Tanh(value_type);
+    static value_type Sinh(value_type);
+    static value_type Cosh(value_type);
+    static value_type Tanh(value_type);
     // arcus hyperbolic functions
-    static value_type  ASinh(value_type);
-    static value_type  ACosh(value_type);
-    static value_type  ATanh(value_type);
+    static value_type ASinh(value_type);
+    static value_type ACosh(value_type);
+    static value_type ATanh(value_type);
     // Logarithm functions
-    static value_type  Log2(value_type);  // Logarithm Base 2
-    static value_type  Log10(value_type); // Logarithm Base 10
-    static value_type  Ln(value_type);    // Logarithm Base e (natural logarithm)
+    static value_type Log2(value_type);  // Logarithm Base 2
+    static value_type Log10(value_type); // Logarithm Base 10
+    static value_type Ln(value_type);    // Logarithm Base e (natural logarithm)
     // misc
-    static value_type  Exp(value_type);
-    static value_type  Abs(value_type);
-    static value_type  Sqrt(value_type);
-    static value_type  Rint(value_type);
-    static value_type  Sign(value_type);
+    static value_type Exp(value_type);
+    static value_type Abs(value_type);
+    static value_type Sqrt(value_type);
+    static value_type Rint(value_type);
+    static value_type Sign(value_type);
 
     // Prefix operators
     // !!! Unary Minus is a MUST if you want to use negative signs !!!
-    static value_type  UnaryMinus(value_type);
-    static value_type  UnaryPlus(value_type);
+    static value_type UnaryMinus(value_type);
+    static value_type UnaryPlus(value_type);
 
     // Functions with variable number of arguments
-    static value_type Sum(const value_type*, int);  // sum
-    static value_type Avg(const value_type*, int);  // mean value
-    static value_type Min(const value_type*, int);  // minimum
-    static value_type Max(const value_type*, int);  // maximum
+    static value_type Sum(const value_type*, int); // sum
+    static value_type Avg(const value_type*, int); // mean value
+    static value_type Min(const value_type*, int); // minimum
+    static value_type Max(const value_type*, int); // maximum
 
-    static int IsVal(const char_type* a_szExpr, int *a_iPos, value_type *a_fVal);
-  };
+    static int IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal);
+};
 } // namespace mu
 
 #endif
-
diff --git a/ext_libs/muparser/muParserBase.cpp b/ext_libs/muparser/muParserBase.cpp
old mode 100755
new mode 100644
index b5e17aa4..773b0627
--- a/ext_libs/muparser/muParserBase.cpp
+++ b/ext_libs/muparser/muParserBase.cpp
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "muParserBase.h"
@@ -37,7 +37,7 @@
 #include <locale>
 
 #ifdef MUP_USE_OPENMP
-  #include <omp.h>
+#include <omp.h>
 #endif
 
 using namespace std;
@@ -48,128 +48,121 @@ using namespace std;
 
 namespace mu
 {
-  std::locale ParserBase::s_locale = std::locale(std::locale::classic(), new change_dec_sep<char_type>('.'));
-
-  bool ParserBase::g_DbgDumpCmdCode = false;
-  bool ParserBase::g_DbgDumpStack = false;
-
-  //------------------------------------------------------------------------------
-  /** \brief Identifiers for built in binary operators. 
-
-      When defining custom binary operators with #AddOprt(...) make sure not to choose 
-      names conflicting with these definitions. 
-  */
-  const char_type* ParserBase::c_DefaultOprt[] = 
-  { 
-    _T("<="), _T(">="),  _T("!="), 
-    _T("=="), _T("<"),   _T(">"), 
-    _T("+"),  _T("-"),   _T("*"), 
-    _T("/"),  _T("^"),   _T("&&"), 
-    _T("||"), _T("="),   _T("("),  
-    _T(")"),   _T("?"),  _T(":"), 0 
-  };
-
-  //------------------------------------------------------------------------------
-  /** \brief Constructor.
-      \param a_szFormula the formula to interpret.
-      \throw ParserException if a_szFormula is null.
-  */
-  ParserBase::ParserBase()
-    :m_pParseFormula(&ParserBase::ParseString)
-    ,m_vRPN()
-    ,m_vStringBuf()
-    ,m_pTokenReader()
-    ,m_FunDef()
-    ,m_PostOprtDef()
-    ,m_InfixOprtDef()
-    ,m_OprtDef()
-    ,m_ConstDef()
-    ,m_StrVarDef()
-    ,m_VarDef()
-    ,m_bBuiltInOp(true)
-    ,m_sNameChars()
-    ,m_sOprtChars()
-    ,m_sInfixOprtChars()
-    ,m_nIfElseCounter(0)
-    ,m_vStackBuffer()
-    ,m_nFinalResultIdx(0)
-  {
+std::locale ParserBase::s_locale = std::locale(std::locale::classic(), new change_dec_sep<char_type>('.'));
+
+bool ParserBase::g_DbgDumpCmdCode = false;
+bool ParserBase::g_DbgDumpStack = false;
+
+//------------------------------------------------------------------------------
+/** \brief Identifiers for built in binary operators.
+
+    When defining custom binary operators with #AddOprt(...) make sure not to choose
+    names conflicting with these definitions.
+*/
+const char_type* ParserBase::c_DefaultOprt[] = {_T("<="), _T(">="), _T("!="), _T("=="), _T("<"),  _T(">"),  _T("+"),
+                                                _T("-"),  _T("*"),  _T("/"),  _T("^"),  _T("&&"), _T("||"), _T("="),
+                                                _T("("),  _T(")"),  _T("?"),  _T(":"),  0};
+
+//------------------------------------------------------------------------------
+/** \brief Constructor.
+    \param a_szFormula the formula to interpret.
+    \throw ParserException if a_szFormula is null.
+*/
+ParserBase::ParserBase() :
+    m_pParseFormula(&ParserBase::ParseString),
+    m_vRPN(),
+    m_vStringBuf(),
+    m_pTokenReader(),
+    m_FunDef(),
+    m_PostOprtDef(),
+    m_InfixOprtDef(),
+    m_OprtDef(),
+    m_ConstDef(),
+    m_StrVarDef(),
+    m_VarDef(),
+    m_bBuiltInOp(true),
+    m_sNameChars(),
+    m_sOprtChars(),
+    m_sInfixOprtChars(),
+    m_nIfElseCounter(0),
+    m_vStackBuffer(),
+    m_nFinalResultIdx(0)
+{
     InitTokenReader();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Copy constructor. 
-
-    The parser can be safely copy constructed but the bytecode is reset during
-    copy construction.
-  */
-  ParserBase::ParserBase(const ParserBase &a_Parser)
-    :m_pParseFormula(&ParserBase::ParseString)
-    ,m_vRPN()
-    ,m_vStringBuf()
-    ,m_pTokenReader()
-    ,m_FunDef()
-    ,m_PostOprtDef()
-    ,m_InfixOprtDef()
-    ,m_OprtDef()
-    ,m_ConstDef()
-    ,m_StrVarDef()
-    ,m_VarDef()
-    ,m_bBuiltInOp(true)
-    ,m_sNameChars()
-    ,m_sOprtChars()
-    ,m_sInfixOprtChars()
-    ,m_nIfElseCounter(0)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Copy constructor.
+
+  The parser can be safely copy constructed but the bytecode is reset during
+  copy construction.
+*/
+ParserBase::ParserBase(const ParserBase& a_Parser) :
+    m_pParseFormula(&ParserBase::ParseString),
+    m_vRPN(),
+    m_vStringBuf(),
+    m_pTokenReader(),
+    m_FunDef(),
+    m_PostOprtDef(),
+    m_InfixOprtDef(),
+    m_OprtDef(),
+    m_ConstDef(),
+    m_StrVarDef(),
+    m_VarDef(),
+    m_bBuiltInOp(true),
+    m_sNameChars(),
+    m_sOprtChars(),
+    m_sInfixOprtChars(),
+    m_nIfElseCounter(0)
+{
     m_pTokenReader.reset(new token_reader_type(this));
     Assign(a_Parser);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  ParserBase::~ParserBase()
-  {}
+//---------------------------------------------------------------------------
+ParserBase::~ParserBase() {}
 
-  //---------------------------------------------------------------------------
-  /** \brief Assignment operator. 
+//---------------------------------------------------------------------------
+/** \brief Assignment operator.
 
-    Implemented by calling Assign(a_Parser). Self assignment is suppressed.
-    \param a_Parser Object to copy to this.
-    \return *this
-    \throw nothrow
-  */
-  ParserBase& ParserBase::operator=(const ParserBase &a_Parser)
-  {
+  Implemented by calling Assign(a_Parser). Self assignment is suppressed.
+  \param a_Parser Object to copy to this.
+  \return *this
+  \throw nothrow
+*/
+ParserBase& ParserBase::operator=(const ParserBase& a_Parser)
+{
     Assign(a_Parser);
     return *this;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Copy state of a parser object to this. 
+//---------------------------------------------------------------------------
+/** \brief Copy state of a parser object to this.
 
-    Clears Variables and Functions of this parser.
-    Copies the states of all internal variables.
-    Resets parse function to string parse mode.
+  Clears Variables and Functions of this parser.
+  Copies the states of all internal variables.
+  Resets parse function to string parse mode.
 
-    \param a_Parser the source object.
-  */
-  void ParserBase::Assign(const ParserBase &a_Parser)
-  {
-    if (&a_Parser==this)
-      return;
+  \param a_Parser the source object.
+*/
+void ParserBase::Assign(const ParserBase& a_Parser)
+{
+    if (&a_Parser == this)
+        return;
 
     // Don't copy bytecode instead cause the parser to create new bytecode
     // by resetting the parse function.
     ReInit();
 
-    m_ConstDef        = a_Parser.m_ConstDef;         // Copy user define constants
-    m_VarDef          = a_Parser.m_VarDef;           // Copy user defined variables
-    m_bBuiltInOp      = a_Parser.m_bBuiltInOp;
-    m_vStringBuf      = a_Parser.m_vStringBuf;
-    m_vStackBuffer    = a_Parser.m_vStackBuffer;
+    m_ConstDef = a_Parser.m_ConstDef; // Copy user define constants
+    m_VarDef = a_Parser.m_VarDef;     // Copy user defined variables
+    m_bBuiltInOp = a_Parser.m_bBuiltInOp;
+    m_vStringBuf = a_Parser.m_vStringBuf;
+    m_vStackBuffer = a_Parser.m_vStackBuffer;
     m_nFinalResultIdx = a_Parser.m_nFinalResultIdx;
-    m_StrVarDef       = a_Parser.m_StrVarDef;
-    m_vStringVarBuf   = a_Parser.m_vStringVarBuf;
-    m_nIfElseCounter  = a_Parser.m_nIfElseCounter;
+    m_StrVarDef = a_Parser.m_StrVarDef;
+    m_vStringVarBuf = a_Parser.m_vStringVarBuf;
+    m_nIfElseCounter = a_Parser.m_nIfElseCounter;
     m_pTokenReader.reset(a_Parser.m_pTokenReader->Clone(this));
 
     // Copy function and operator callbacks
@@ -181,622 +174,634 @@ namespace mu
     m_sNameChars = a_Parser.m_sNameChars;
     m_sOprtChars = a_Parser.m_sOprtChars;
     m_sInfixOprtChars = a_Parser.m_sInfixOprtChars;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Set the decimal separator.
-      \param cDecSep Decimal separator as a character value.
-      \sa SetThousandsSep
-
-      By default muparser uses the "C" locale. The decimal separator of this
-      locale is overwritten by the one provided here.
-  */
-  void ParserBase::SetDecSep(char_type cDecSep)
-  {
-    char_type cThousandsSep = std::use_facet< change_dec_sep<char_type> >(s_locale).thousands_sep();
+}
+
+//---------------------------------------------------------------------------
+/** \brief Set the decimal separator.
+    \param cDecSep Decimal separator as a character value.
+    \sa SetThousandsSep
+
+    By default muparser uses the "C" locale. The decimal separator of this
+    locale is overwritten by the one provided here.
+*/
+void ParserBase::SetDecSep(char_type cDecSep)
+{
+    char_type cThousandsSep = std::use_facet<change_dec_sep<char_type> >(s_locale).thousands_sep();
     s_locale = std::locale(std::locale("C"), new change_dec_sep<char_type>(cDecSep, cThousandsSep));
-  }
-  
-  //---------------------------------------------------------------------------
-  /** \brief Sets the thousands operator. 
-      \param cThousandsSep The thousands separator as a character
-      \sa SetDecSep
-
-      By default muparser uses the "C" locale. The thousands separator of this
-      locale is overwritten by the one provided here.
-  */
-  void ParserBase::SetThousandsSep(char_type cThousandsSep)
-  {
-    char_type cDecSep = std::use_facet< change_dec_sep<char_type> >(s_locale).decimal_point();
+}
+
+//---------------------------------------------------------------------------
+/** \brief Sets the thousands operator.
+    \param cThousandsSep The thousands separator as a character
+    \sa SetDecSep
+
+    By default muparser uses the "C" locale. The thousands separator of this
+    locale is overwritten by the one provided here.
+*/
+void ParserBase::SetThousandsSep(char_type cThousandsSep)
+{
+    char_type cDecSep = std::use_facet<change_dec_sep<char_type> >(s_locale).decimal_point();
     s_locale = std::locale(std::locale("C"), new change_dec_sep<char_type>(cDecSep, cThousandsSep));
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Resets the locale. 
+//---------------------------------------------------------------------------
+/** \brief Resets the locale.
 
-    The default locale used "." as decimal separator, no thousands separator and
-    "," as function argument separator.
-  */
-  void ParserBase::ResetLocale()
-  {
+  The default locale used "." as decimal separator, no thousands separator and
+  "," as function argument separator.
+*/
+void ParserBase::ResetLocale()
+{
     s_locale = std::locale(std::locale("C"), new change_dec_sep<char_type>('.'));
     SetArgSep(',');
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Initialize the token reader. 
+//---------------------------------------------------------------------------
+/** \brief Initialize the token reader.
 
-    Create new token reader object and submit pointers to function, operator,
-    constant and variable definitions.
+  Create new token reader object and submit pointers to function, operator,
+  constant and variable definitions.
 
-    \post m_pTokenReader.get()!=0
-    \throw nothrow
-  */
-  void ParserBase::InitTokenReader()
-  {
+  \post m_pTokenReader.get()!=0
+  \throw nothrow
+*/
+void ParserBase::InitTokenReader()
+{
     m_pTokenReader.reset(new token_reader_type(this));
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Reset parser to string parsing mode and clear internal buffers.
+//---------------------------------------------------------------------------
+/** \brief Reset parser to string parsing mode and clear internal buffers.
 
-      Clear bytecode, reset the token reader.
-      \throw nothrow
-  */
-  void ParserBase::ReInit() const
-  {
+    Clear bytecode, reset the token reader.
+    \throw nothrow
+*/
+void ParserBase::ReInit() const
+{
     m_pParseFormula = &ParserBase::ParseString;
     m_vStringBuf.clear();
     m_vRPN.clear();
     m_pTokenReader->ReInit();
     m_nIfElseCounter = 0;
-  }
-
-  //---------------------------------------------------------------------------
-  void ParserBase::OnDetectVar(string_type * /*pExpr*/, int & /*nStart*/, int & /*nEnd*/)
-  {}
-
-  //---------------------------------------------------------------------------
-  /** \brief Returns the version of muparser. 
-      \param eInfo A flag indicating whether the full version info should be 
-                   returned or not.
-
-    Format is as follows: "MAJOR.MINOR (COMPILER_FLAGS)" The COMPILER_FLAGS
-    are returned only if eInfo==pviFULL.
-  */
-  string_type ParserBase::GetVersion(EParserVersionInfo eInfo) const
-  {
+}
+
+//---------------------------------------------------------------------------
+void ParserBase::OnDetectVar(string_type* /*pExpr*/, int& /*nStart*/, int& /*nEnd*/) {}
+
+//---------------------------------------------------------------------------
+/** \brief Returns the version of muparser.
+    \param eInfo A flag indicating whether the full version info should be
+                 returned or not.
+
+  Format is as follows: "MAJOR.MINOR (COMPILER_FLAGS)" The COMPILER_FLAGS
+  are returned only if eInfo==pviFULL.
+*/
+string_type ParserBase::GetVersion(EParserVersionInfo eInfo) const
+{
     stringstream_type ss;
 
     ss << MUP_VERSION;
 
-    if (eInfo==pviFULL)
+    if (eInfo == pviFULL)
     {
-      ss << _T(" (") << MUP_VERSION_DATE;
-      ss << std::dec << _T("; ") << sizeof(void*)*8 << _T("BIT");
+        ss << _T(" (") << MUP_VERSION_DATE;
+        ss << std::dec << _T("; ") << sizeof(void*) * 8 << _T("BIT");
 
 #ifdef _DEBUG
-      ss << _T("; DEBUG");
-#else 
-      ss << _T("; RELEASE");
+        ss << _T("; DEBUG");
+#else
+        ss << _T("; RELEASE");
 #endif
 
 #ifdef _UNICODE
-      ss << _T("; UNICODE");
+        ss << _T("; UNICODE");
 #else
-  #ifdef _MBCS
-      ss << _T("; MBCS");
-  #else
-      ss << _T("; ASCII");
-  #endif
+#ifdef _MBCS
+        ss << _T("; MBCS");
+#else
+        ss << _T("; ASCII");
+#endif
 #endif
 
 #ifdef MUP_USE_OPENMP
-      ss << _T("; OPENMP");
+        ss << _T("; OPENMP");
 //#else
 //      ss << _T("; NO_OPENMP");
 #endif
 
 #if defined(MUP_MATH_EXCEPTIONS)
-      ss << _T("; MATHEXC");
+        ss << _T("; MATHEXC");
 //#else
 //      ss << _T("; NO_MATHEXC");
 #endif
 
-      ss << _T(")");
+        ss << _T(")");
     }
 
     return ss.str();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a value parsing function. 
-      
-      When parsing an expression muParser tries to detect values in the expression
-      string using different valident callbacks. Thus it's possible to parse
-      for hex values, binary values and floating point values. 
-  */
-  void ParserBase::AddValIdent(identfun_type a_pCallback)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a value parsing function.
+
+    When parsing an expression muParser tries to detect values in the expression
+    string using different valident callbacks. Thus it's possible to parse
+    for hex values, binary values and floating point values.
+*/
+void ParserBase::AddValIdent(identfun_type a_pCallback)
+{
     m_pTokenReader->AddValIdent(a_pCallback);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Set a function that can create variable pointer for unknown expression variables. 
-      \param a_pFactory A pointer to the variable factory.
-      \param pUserData A user defined context pointer.
-  */
-  void ParserBase::SetVarFactory(facfun_type a_pFactory, void *pUserData)
-  {
-    m_pTokenReader->SetVarCreator(a_pFactory, pUserData);  
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a function or operator callback to the parser. */
-  void ParserBase::AddCallback( const string_type &a_strName,
-                                const ParserCallback &a_Callback, 
-                                funmap_type &a_Storage,
-                                const char_type *a_szCharSet )
-  {
-    if (a_Callback.GetAddr()==0)
+}
+
+//---------------------------------------------------------------------------
+/** \brief Set a function that can create variable pointer for unknown expression variables.
+    \param a_pFactory A pointer to the variable factory.
+    \param pUserData A user defined context pointer.
+*/
+void ParserBase::SetVarFactory(facfun_type a_pFactory, void* pUserData)
+{
+    m_pTokenReader->SetVarCreator(a_pFactory, pUserData);
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a function or operator callback to the parser. */
+void ParserBase::AddCallback(const string_type& a_strName,
+                             const ParserCallback& a_Callback,
+                             funmap_type& a_Storage,
+                             const char_type* a_szCharSet)
+{
+    if (a_Callback.GetAddr() == 0)
         Error(ecINVALID_FUN_PTR);
 
-    const funmap_type *pFunMap = &a_Storage;
+    const funmap_type* pFunMap = &a_Storage;
 
     // Check for conflicting operator or function names
-    if ( pFunMap!=&m_FunDef && m_FunDef.find(a_strName)!=m_FunDef.end() )
-      Error(ecNAME_CONFLICT, -1, a_strName);
+    if (pFunMap != &m_FunDef && m_FunDef.find(a_strName) != m_FunDef.end())
+        Error(ecNAME_CONFLICT, -1, a_strName);
 
-    if ( pFunMap!=&m_PostOprtDef && m_PostOprtDef.find(a_strName)!=m_PostOprtDef.end() )
-      Error(ecNAME_CONFLICT, -1, a_strName);
+    if (pFunMap != &m_PostOprtDef && m_PostOprtDef.find(a_strName) != m_PostOprtDef.end())
+        Error(ecNAME_CONFLICT, -1, a_strName);
 
-    if ( pFunMap!=&m_InfixOprtDef && pFunMap!=&m_OprtDef && m_InfixOprtDef.find(a_strName)!=m_InfixOprtDef.end() )
-      Error(ecNAME_CONFLICT, -1, a_strName);
+    if (pFunMap != &m_InfixOprtDef && pFunMap != &m_OprtDef && m_InfixOprtDef.find(a_strName) != m_InfixOprtDef.end())
+        Error(ecNAME_CONFLICT, -1, a_strName);
 
-    if ( pFunMap!=&m_InfixOprtDef && pFunMap!=&m_OprtDef && m_OprtDef.find(a_strName)!=m_OprtDef.end() )
-      Error(ecNAME_CONFLICT, -1, a_strName);
+    if (pFunMap != &m_InfixOprtDef && pFunMap != &m_OprtDef && m_OprtDef.find(a_strName) != m_OprtDef.end())
+        Error(ecNAME_CONFLICT, -1, a_strName);
 
     CheckOprt(a_strName, a_Callback, a_szCharSet);
     a_Storage[a_strName] = a_Callback;
     ReInit();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check if a name contains invalid characters. 
-
-      \throw ParserException if the name contains invalid characters.
-  */
-  void ParserBase::CheckOprt(const string_type &a_sName,
-                             const ParserCallback &a_Callback,
-                             const string_type &a_szCharSet) const
-  {
-    if ( !a_sName.length() ||
-        (a_sName.find_first_not_of(a_szCharSet)!=string_type::npos) ||
-        (a_sName[0]>='0' && a_sName[0]<='9'))
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check if a name contains invalid characters.
+
+    \throw ParserException if the name contains invalid characters.
+*/
+void ParserBase::CheckOprt(const string_type& a_sName,
+                           const ParserCallback& a_Callback,
+                           const string_type& a_szCharSet) const
+{
+    if (!a_sName.length() || (a_sName.find_first_not_of(a_szCharSet) != string_type::npos) ||
+        (a_sName[0] >= '0' && a_sName[0] <= '9'))
     {
-      switch(a_Callback.GetCode())
-      {
-      case cmOPRT_POSTFIX: Error(ecINVALID_POSTFIX_IDENT, -1, a_sName);
-      case cmOPRT_INFIX:   Error(ecINVALID_INFIX_IDENT, -1, a_sName);
-      default:             Error(ecINVALID_NAME, -1, a_sName);
-      }
+        switch (a_Callback.GetCode())
+        {
+            case cmOPRT_POSTFIX:
+                Error(ecINVALID_POSTFIX_IDENT, -1, a_sName);
+            case cmOPRT_INFIX:
+                Error(ecINVALID_INFIX_IDENT, -1, a_sName);
+            default:
+                Error(ecINVALID_NAME, -1, a_sName);
+        }
     }
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check if a name contains invalid characters. 
-
-      \throw ParserException if the name contains invalid characters.
-  */
-  void ParserBase::CheckName(const string_type &a_sName,
-                             const string_type &a_szCharSet) const
-  {
-    if ( !a_sName.length() ||
-        (a_sName.find_first_not_of(a_szCharSet)!=string_type::npos) ||
-        (a_sName[0]>='0' && a_sName[0]<='9'))
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check if a name contains invalid characters.
+
+    \throw ParserException if the name contains invalid characters.
+*/
+void ParserBase::CheckName(const string_type& a_sName, const string_type& a_szCharSet) const
+{
+    if (!a_sName.length() || (a_sName.find_first_not_of(a_szCharSet) != string_type::npos) ||
+        (a_sName[0] >= '0' && a_sName[0] <= '9'))
     {
-      Error(ecINVALID_NAME);
+        Error(ecINVALID_NAME);
     }
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Set the formula. 
-      \param a_strFormula Formula as string_type
-      \throw ParserException in case of syntax errors.
-
-      Triggers first time calculation thus the creation of the bytecode and
-      scanning of used variables.
-  */
-  void ParserBase::SetExpr(const string_type &a_sExpr)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Set the formula.
+    \param a_strFormula Formula as string_type
+    \throw ParserException in case of syntax errors.
+
+    Triggers first time calculation thus the creation of the bytecode and
+    scanning of used variables.
+*/
+void ParserBase::SetExpr(const string_type& a_sExpr)
+{
     // Check locale compatibility
     std::locale loc;
-    if (m_pTokenReader->GetArgSep()==std::use_facet<numpunct<char_type> >(loc).decimal_point())
-      Error(ecLOCALE);
+    if (m_pTokenReader->GetArgSep() == std::use_facet<numpunct<char_type> >(loc).decimal_point())
+        Error(ecLOCALE);
 
     // <ibg> 20060222: Bugfix for Borland-Kylix:
     // adding a space to the expression will keep Borlands KYLIX from going wild
-    // when calling tellg on a stringstream created from the expression after 
+    // when calling tellg on a stringstream created from the expression after
     // reading a value at the end of an expression. (mu::Parser::IsVal function)
     // (tellg returns -1 otherwise causing the parser to ignore the value)
-    string_type sBuf(a_sExpr + _T(" ") );
+    string_type sBuf(a_sExpr + _T(" "));
     m_pTokenReader->SetFormula(sBuf);
     ReInit();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Get the default symbols used for the built in operators. 
-      \sa c_DefaultOprt
-  */
-  const char_type** ParserBase::GetOprtDef() const
-  {
-    return (const char_type **)(&c_DefaultOprt[0]);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Define the set of valid characters to be used in names of
-             functions, variables, constants.
-  */
-  void ParserBase::DefineNameChars(const char_type *a_szCharset)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Get the default symbols used for the built in operators.
+    \sa c_DefaultOprt
+*/
+const char_type** ParserBase::GetOprtDef() const
+{
+    return (const char_type**)(&c_DefaultOprt[0]);
+}
+
+//---------------------------------------------------------------------------
+/** \brief Define the set of valid characters to be used in names of
+           functions, variables, constants.
+*/
+void ParserBase::DefineNameChars(const char_type* a_szCharset)
+{
     m_sNameChars = a_szCharset;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Define the set of valid characters to be used in names of
-             binary operators and postfix operators.
-  */
-  void ParserBase::DefineOprtChars(const char_type *a_szCharset)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Define the set of valid characters to be used in names of
+           binary operators and postfix operators.
+*/
+void ParserBase::DefineOprtChars(const char_type* a_szCharset)
+{
     m_sOprtChars = a_szCharset;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Define the set of valid characters to be used in names of
-             infix operators.
-  */
-  void ParserBase::DefineInfixOprtChars(const char_type *a_szCharset)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Define the set of valid characters to be used in names of
+           infix operators.
+*/
+void ParserBase::DefineInfixOprtChars(const char_type* a_szCharset)
+{
     m_sInfixOprtChars = a_szCharset;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Virtual function that defines the characters allowed in name identifiers. 
-      \sa #ValidOprtChars, #ValidPrefixOprtChars
-  */ 
-  const char_type* ParserBase::ValidNameChars() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Virtual function that defines the characters allowed in name identifiers.
+    \sa #ValidOprtChars, #ValidPrefixOprtChars
+*/
+const char_type* ParserBase::ValidNameChars() const
+{
     assert(m_sNameChars.size());
     return m_sNameChars.c_str();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Virtual function that defines the characters allowed in operator definitions. 
-      \sa #ValidNameChars, #ValidPrefixOprtChars
-  */
-  const char_type* ParserBase::ValidOprtChars() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Virtual function that defines the characters allowed in operator definitions.
+    \sa #ValidNameChars, #ValidPrefixOprtChars
+*/
+const char_type* ParserBase::ValidOprtChars() const
+{
     assert(m_sOprtChars.size());
     return m_sOprtChars.c_str();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Virtual function that defines the characters allowed in infix operator definitions.
-      \sa #ValidNameChars, #ValidOprtChars
-  */
-  const char_type* ParserBase::ValidInfixOprtChars() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Virtual function that defines the characters allowed in infix operator definitions.
+    \sa #ValidNameChars, #ValidOprtChars
+*/
+const char_type* ParserBase::ValidInfixOprtChars() const
+{
     assert(m_sInfixOprtChars.size());
     return m_sInfixOprtChars.c_str();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a user defined operator. 
-      \post Will reset the Parser to string parsing mode.
-  */
-  void ParserBase::DefinePostfixOprt(const string_type &a_sName, 
-                                     fun_type1 a_pFun,
-                                     bool a_bAllowOpt)
-  {
-    AddCallback(a_sName, 
-                ParserCallback(a_pFun, a_bAllowOpt, prPOSTFIX, cmOPRT_POSTFIX),
-                m_PostOprtDef, 
-                ValidOprtChars() );
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Initialize user defined functions. 
-   
-    Calls the virtual functions InitFun(), InitConst() and InitOprt().
-  */
-  void ParserBase::Init()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a user defined operator.
+    \post Will reset the Parser to string parsing mode.
+*/
+void ParserBase::DefinePostfixOprt(const string_type& a_sName, fun_type1 a_pFun, bool a_bAllowOpt)
+{
+    AddCallback(
+      a_sName, ParserCallback(a_pFun, a_bAllowOpt, prPOSTFIX, cmOPRT_POSTFIX), m_PostOprtDef, ValidOprtChars());
+}
+
+//---------------------------------------------------------------------------
+/** \brief Initialize user defined functions.
+
+  Calls the virtual functions InitFun(), InitConst() and InitOprt().
+*/
+void ParserBase::Init()
+{
     InitCharSets();
     InitFun();
     InitConst();
     InitOprt();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a user defined operator. 
-      \post Will reset the Parser to string parsing mode.
-      \param [in] a_sName  operator Identifier 
-      \param [in] a_pFun  Operator callback function
-      \param [in] a_iPrec  Operator Precedence (default=prSIGN)
-      \param [in] a_bAllowOpt  True if operator is volatile (default=false)
-      \sa EPrec
-  */
-  void ParserBase::DefineInfixOprt(const string_type &a_sName, 
-                                  fun_type1 a_pFun, 
-                                  int a_iPrec, 
-                                  bool a_bAllowOpt)
-  {
-    AddCallback(a_sName, 
-                ParserCallback(a_pFun, a_bAllowOpt, a_iPrec, cmOPRT_INFIX), 
-                m_InfixOprtDef, 
-                ValidInfixOprtChars() );
-  }
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Define a binary operator. 
-      \param [in] a_sName The identifier of the operator.
-      \param [in] a_pFun Pointer to the callback function.
-      \param [in] a_iPrec Precedence of the operator.
-      \param [in] a_eAssociativity The associativity of the operator.
-      \param [in] a_bAllowOpt If this is true the operator may be optimized away.
-      
-      Adds a new Binary operator the the parser instance. 
-  */
-  void ParserBase::DefineOprt( const string_type &a_sName, 
-                               fun_type2 a_pFun, 
-                               unsigned a_iPrec, 
-                               EOprtAssociativity a_eAssociativity,
-                               bool a_bAllowOpt )
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a user defined operator.
+    \post Will reset the Parser to string parsing mode.
+    \param [in] a_sName  operator Identifier
+    \param [in] a_pFun  Operator callback function
+    \param [in] a_iPrec  Operator Precedence (default=prSIGN)
+    \param [in] a_bAllowOpt  True if operator is volatile (default=false)
+    \sa EPrec
+*/
+void ParserBase::DefineInfixOprt(const string_type& a_sName, fun_type1 a_pFun, int a_iPrec, bool a_bAllowOpt)
+{
+    AddCallback(
+      a_sName, ParserCallback(a_pFun, a_bAllowOpt, a_iPrec, cmOPRT_INFIX), m_InfixOprtDef, ValidInfixOprtChars());
+}
+
+//---------------------------------------------------------------------------
+/** \brief Define a binary operator.
+    \param [in] a_sName The identifier of the operator.
+    \param [in] a_pFun Pointer to the callback function.
+    \param [in] a_iPrec Precedence of the operator.
+    \param [in] a_eAssociativity The associativity of the operator.
+    \param [in] a_bAllowOpt If this is true the operator may be optimized away.
+
+    Adds a new Binary operator the the parser instance.
+*/
+void ParserBase::DefineOprt(const string_type& a_sName,
+                            fun_type2 a_pFun,
+                            unsigned a_iPrec,
+                            EOprtAssociativity a_eAssociativity,
+                            bool a_bAllowOpt)
+{
     // Check for conflicts with built in operator names
-    for (int i=0; m_bBuiltInOp && i<cmENDIF; ++i)
-      if (a_sName == string_type(c_DefaultOprt[i]))
-        Error(ecBUILTIN_OVERLOAD, -1, a_sName);
-
-    AddCallback(a_sName, 
-                ParserCallback(a_pFun, a_bAllowOpt, a_iPrec, a_eAssociativity), 
-                m_OprtDef, 
-                ValidOprtChars() );
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Define a new string constant.
-      \param [in] a_strName The name of the constant.
-      \param [in] a_strVal the value of the constant. 
-  */
-  void ParserBase::DefineStrConst(const string_type &a_strName, const string_type &a_strVal)
-  {
+    for (int i = 0; m_bBuiltInOp && i < cmENDIF; ++i)
+        if (a_sName == string_type(c_DefaultOprt[i]))
+            Error(ecBUILTIN_OVERLOAD, -1, a_sName);
+
+    AddCallback(a_sName, ParserCallback(a_pFun, a_bAllowOpt, a_iPrec, a_eAssociativity), m_OprtDef, ValidOprtChars());
+}
+
+//---------------------------------------------------------------------------
+/** \brief Define a new string constant.
+    \param [in] a_strName The name of the constant.
+    \param [in] a_strVal the value of the constant.
+*/
+void ParserBase::DefineStrConst(const string_type& a_strName, const string_type& a_strVal)
+{
     // Test if a constant with that names already exists
-    if (m_StrVarDef.find(a_strName)!=m_StrVarDef.end())
-      Error(ecNAME_CONFLICT);
+    if (m_StrVarDef.find(a_strName) != m_StrVarDef.end())
+        Error(ecNAME_CONFLICT);
 
     CheckName(a_strName, ValidNameChars());
-    
-    m_vStringVarBuf.push_back(a_strVal);                // Store variable string in internal buffer
-    m_StrVarDef[a_strName] = m_vStringVarBuf.size()-1;  // bind buffer index to variable name
+
+    m_vStringVarBuf.push_back(a_strVal);                 // Store variable string in internal buffer
+    m_StrVarDef[a_strName] = m_vStringVarBuf.size() - 1; // bind buffer index to variable name
 
     ReInit();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a user defined variable. 
-      \param [in] a_sName the variable name
-      \param [in] a_pVar A pointer to the variable value.
-      \post Will reset the Parser to string parsing mode.
-      \throw ParserException in case the name contains invalid signs or a_pVar is NULL.
-  */
-  void ParserBase::DefineVar(const string_type &a_sName, value_type *a_pVar)
-  {
-    if (a_pVar==0)
-      Error(ecINVALID_VAR_PTR);
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a user defined variable.
+    \param [in] a_sName the variable name
+    \param [in] a_pVar A pointer to the variable value.
+    \post Will reset the Parser to string parsing mode.
+    \throw ParserException in case the name contains invalid signs or a_pVar is NULL.
+*/
+void ParserBase::DefineVar(const string_type& a_sName, value_type* a_pVar)
+{
+    if (a_pVar == 0)
+        Error(ecINVALID_VAR_PTR);
 
     // Test if a constant with that names already exists
-    if (m_ConstDef.find(a_sName)!=m_ConstDef.end())
-      Error(ecNAME_CONFLICT);
+    if (m_ConstDef.find(a_sName) != m_ConstDef.end())
+        Error(ecNAME_CONFLICT);
 
     CheckName(a_sName, ValidNameChars());
     m_VarDef[a_sName] = a_pVar;
     ReInit();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a user defined constant. 
-      \param [in] a_sName The name of the constant.
-      \param [in] a_fVal the value of the constant.
-      \post Will reset the Parser to string parsing mode.
-      \throw ParserException in case the name contains invalid signs.
-  */
-  void ParserBase::DefineConst(const string_type &a_sName, value_type a_fVal)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a user defined constant.
+    \param [in] a_sName The name of the constant.
+    \param [in] a_fVal the value of the constant.
+    \post Will reset the Parser to string parsing mode.
+    \throw ParserException in case the name contains invalid signs.
+*/
+void ParserBase::DefineConst(const string_type& a_sName, value_type a_fVal)
+{
     CheckName(a_sName, ValidNameChars());
     m_ConstDef[a_sName] = a_fVal;
     ReInit();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Get operator priority.
-      \throw ParserException if a_Oprt is no operator code
-  */
-  int ParserBase::GetOprtPrecedence(const token_type &a_Tok) const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Get operator priority.
+    \throw ParserException if a_Oprt is no operator code
+*/
+int ParserBase::GetOprtPrecedence(const token_type& a_Tok) const
+{
     switch (a_Tok.GetCode())
     {
-    // built in operators
-    case cmEND:      return -5;
-    case cmARG_SEP:  return -4;
-    case cmASSIGN:   return -1;               
-    case cmELSE:
-    case cmIF:       return  0;
-    case cmLAND:     return  prLAND;
-    case cmLOR:      return  prLOR;
-    case cmLT:
-    case cmGT:
-    case cmLE:
-    case cmGE:
-    case cmNEQ:
-    case cmEQ:       return  prCMP; 
-    case cmADD:
-    case cmSUB:      return  prADD_SUB;
-    case cmMUL:
-    case cmDIV:      return  prMUL_DIV;
-    case cmPOW:      return  prPOW;
-
-    // user defined binary operators
-    case cmOPRT_INFIX: 
-    case cmOPRT_BIN: return a_Tok.GetPri();
-    default:  Error(ecINTERNAL_ERROR, 5);
-              return 999;
-    }  
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Get operator priority.
-      \throw ParserException if a_Oprt is no operator code
-  */
-  EOprtAssociativity ParserBase::GetOprtAssociativity(const token_type &a_Tok) const
-  {
+        // built in operators
+        case cmEND:
+            return -5;
+        case cmARG_SEP:
+            return -4;
+        case cmASSIGN:
+            return -1;
+        case cmELSE:
+        case cmIF:
+            return 0;
+        case cmLAND:
+            return prLAND;
+        case cmLOR:
+            return prLOR;
+        case cmLT:
+        case cmGT:
+        case cmLE:
+        case cmGE:
+        case cmNEQ:
+        case cmEQ:
+            return prCMP;
+        case cmADD:
+        case cmSUB:
+            return prADD_SUB;
+        case cmMUL:
+        case cmDIV:
+            return prMUL_DIV;
+        case cmPOW:
+            return prPOW;
+
+        // user defined binary operators
+        case cmOPRT_INFIX:
+        case cmOPRT_BIN:
+            return a_Tok.GetPri();
+        default:
+            Error(ecINTERNAL_ERROR, 5);
+            return 999;
+    }
+}
+
+//---------------------------------------------------------------------------
+/** \brief Get operator priority.
+    \throw ParserException if a_Oprt is no operator code
+*/
+EOprtAssociativity ParserBase::GetOprtAssociativity(const token_type& a_Tok) const
+{
     switch (a_Tok.GetCode())
     {
-    case cmASSIGN:
-    case cmLAND:
-    case cmLOR:
-    case cmLT:
-    case cmGT:
-    case cmLE:
-    case cmGE:
-    case cmNEQ:
-    case cmEQ: 
-    case cmADD:
-    case cmSUB:
-    case cmMUL:
-    case cmDIV:      return oaLEFT;
-    case cmPOW:      return oaRIGHT;
-    case cmOPRT_BIN: return a_Tok.GetAssociativity();
-    default:         return oaNONE;
-    }  
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Return a map containing the used variables only. */
-  const varmap_type& ParserBase::GetUsedVar() const
-  {
+        case cmASSIGN:
+        case cmLAND:
+        case cmLOR:
+        case cmLT:
+        case cmGT:
+        case cmLE:
+        case cmGE:
+        case cmNEQ:
+        case cmEQ:
+        case cmADD:
+        case cmSUB:
+        case cmMUL:
+        case cmDIV:
+            return oaLEFT;
+        case cmPOW:
+            return oaRIGHT;
+        case cmOPRT_BIN:
+            return a_Tok.GetAssociativity();
+        default:
+            return oaNONE;
+    }
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return a map containing the used variables only. */
+const varmap_type& ParserBase::GetUsedVar() const
+{
     try
     {
-      m_pTokenReader->IgnoreUndefVar(true);
-      CreateRPN(); // try to create bytecode, but don't use it for any further calculations since it
-                   // may contain references to nonexisting variables.
-      m_pParseFormula = &ParserBase::ParseString;
-      m_pTokenReader->IgnoreUndefVar(false);
+        m_pTokenReader->IgnoreUndefVar(true);
+        CreateRPN(); // try to create bytecode, but don't use it for any further calculations since it
+                     // may contain references to nonexisting variables.
+        m_pParseFormula = &ParserBase::ParseString;
+        m_pTokenReader->IgnoreUndefVar(false);
     }
-    catch(exception_type & /*e*/)
+    catch (exception_type& /*e*/)
     {
-      // Make sure to stay in string parse mode, dont call ReInit()
-      // because it deletes the array with the used variables
-      m_pParseFormula = &ParserBase::ParseString;
-      m_pTokenReader->IgnoreUndefVar(false);
-      throw;
+        // Make sure to stay in string parse mode, dont call ReInit()
+        // because it deletes the array with the used variables
+        m_pParseFormula = &ParserBase::ParseString;
+        m_pTokenReader->IgnoreUndefVar(false);
+        throw;
     }
-    
+
     return m_pTokenReader->GetUsedVar();
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Return a map containing the used variables only. */
-  const varmap_type& ParserBase::GetVar() const
-  {
+//---------------------------------------------------------------------------
+/** \brief Return a map containing the used variables only. */
+const varmap_type& ParserBase::GetVar() const
+{
     return m_VarDef;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Return a map containing all parser constants. */
-  const valmap_type& ParserBase::GetConst() const
-  {
+//---------------------------------------------------------------------------
+/** \brief Return a map containing all parser constants. */
+const valmap_type& ParserBase::GetConst() const
+{
     return m_ConstDef;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Return prototypes of all parser functions.
-      \return #m_FunDef
-      \sa FunProt
-      \throw nothrow
-      
-      The return type is a map of the public type #funmap_type containing the prototype
-      definitions for all numerical parser functions. String functions are not part of 
-      this map. The Prototype definition is encapsulated in objects of the class FunProt
-      one per parser function each associated with function names via a map construct.
-  */
-  const funmap_type& ParserBase::GetFunDef() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return prototypes of all parser functions.
+    \return #m_FunDef
+    \sa FunProt
+    \throw nothrow
+
+    The return type is a map of the public type #funmap_type containing the prototype
+    definitions for all numerical parser functions. String functions are not part of
+    this map. The Prototype definition is encapsulated in objects of the class FunProt
+    one per parser function each associated with function names via a map construct.
+*/
+const funmap_type& ParserBase::GetFunDef() const
+{
     return m_FunDef;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Retrieve the formula. */
-  const string_type& ParserBase::GetExpr() const
-  {
+//---------------------------------------------------------------------------
+/** \brief Retrieve the formula. */
+const string_type& ParserBase::GetExpr() const
+{
     return m_pTokenReader->GetExpr();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Execute a function that takes a single string argument.
-      \param a_FunTok Function token.
-      \throw exception_type If the function token is not a string function
-  */
-  ParserBase::token_type ParserBase::ApplyStrFunc(const token_type &a_FunTok,
-                                                  const std::vector<token_type> &a_vArg) const
-  {
-    if (a_vArg.back().GetCode()!=cmSTRING)
-      Error(ecSTRING_EXPECTED, m_pTokenReader->GetPos(), a_FunTok.GetAsString());
-
-    token_type  valTok;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Execute a function that takes a single string argument.
+    \param a_FunTok Function token.
+    \throw exception_type If the function token is not a string function
+*/
+ParserBase::token_type ParserBase::ApplyStrFunc(const token_type& a_FunTok, const std::vector<token_type>& a_vArg) const
+{
+    if (a_vArg.back().GetCode() != cmSTRING)
+        Error(ecSTRING_EXPECTED, m_pTokenReader->GetPos(), a_FunTok.GetAsString());
+
+    token_type valTok;
     generic_fun_type pFunc = a_FunTok.GetFuncAddr();
     assert(pFunc);
 
     try
     {
-      // Check function arguments; write dummy value into valtok to represent the result
-      switch(a_FunTok.GetArgCount())
-      {
-      case 0: valTok.SetVal(1); a_vArg[0].GetAsString();  break;
-      case 1: valTok.SetVal(1); a_vArg[1].GetAsString();  a_vArg[0].GetVal();  break;
-      case 2: valTok.SetVal(1); a_vArg[2].GetAsString();  a_vArg[1].GetVal();  a_vArg[0].GetVal();  break;
-      default: Error(ecINTERNAL_ERROR);
-      }
+        // Check function arguments; write dummy value into valtok to represent the result
+        switch (a_FunTok.GetArgCount())
+        {
+            case 0:
+                valTok.SetVal(1);
+                a_vArg[0].GetAsString();
+                break;
+            case 1:
+                valTok.SetVal(1);
+                a_vArg[1].GetAsString();
+                a_vArg[0].GetVal();
+                break;
+            case 2:
+                valTok.SetVal(1);
+                a_vArg[2].GetAsString();
+                a_vArg[1].GetVal();
+                a_vArg[0].GetVal();
+                break;
+            default:
+                Error(ecINTERNAL_ERROR);
+        }
     }
-    catch(ParserError& )
+    catch (ParserError&)
     {
-      Error(ecVAL_EXPECTED, m_pTokenReader->GetPos(), a_FunTok.GetAsString());
+        Error(ecVAL_EXPECTED, m_pTokenReader->GetPos(), a_FunTok.GetAsString());
     }
 
     // string functions won't be optimized
     m_vRPN.AddStrFun(pFunc, a_FunTok.GetArgCount(), a_vArg.back().GetIdx());
-    
+
     // Push dummy value representing the function result to the stack
     return valTok;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Apply a function token. 
-      \param iArgCount Number of Arguments actually gathered used only for multiarg functions.
-      \post The result is pushed to the value stack
-      \post The function token is removed from the stack
-      \throw exception_type if Argument count does not match function requirements.
-  */
-  void ParserBase::ApplyFunc( ParserStack<token_type> &a_stOpt,
-                              ParserStack<token_type> &a_stVal, 
-                              int a_iArgCount) const
-  { 
+}
+
+//---------------------------------------------------------------------------
+/** \brief Apply a function token.
+    \param iArgCount Number of Arguments actually gathered used only for multiarg functions.
+    \post The result is pushed to the value stack
+    \post The function token is removed from the stack
+    \throw exception_type if Argument count does not match function requirements.
+*/
+void ParserBase::ApplyFunc(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal, int a_iArgCount) const
+{
     assert(m_pTokenReader.get());
 
     // Operator stack empty or does not contain tokens with callback functions
-    if (a_stOpt.empty() || a_stOpt.top().GetFuncAddr()==0 )
-      return;
+    if (a_stOpt.empty() || a_stOpt.top().GetFuncAddr() == 0)
+        return;
 
     token_type funTok = a_stOpt.pop();
     assert(funTok.GetFuncAddr());
@@ -804,975 +809,1183 @@ namespace mu
     // Binary operators must rely on their internal operator number
     // since counting of operators relies on commas for function arguments
     // binary operators do not have commas in their expression
-    int iArgCount = (funTok.GetCode()==cmOPRT_BIN) ? funTok.GetArgCount() : a_iArgCount;
+    int iArgCount = (funTok.GetCode() == cmOPRT_BIN) ? funTok.GetArgCount() : a_iArgCount;
 
-    // determine how many parameters the function needs. To remember iArgCount includes the 
+    // determine how many parameters the function needs. To remember iArgCount includes the
     // string parameter whilst GetArgCount() counts only numeric parameters.
-    int iArgRequired = funTok.GetArgCount() + ((funTok.GetType()==tpSTR) ? 1 : 0);
+    int iArgRequired = funTok.GetArgCount() + ((funTok.GetType() == tpSTR) ? 1 : 0);
 
     // Thats the number of numerical parameters
-    int iArgNumerical = iArgCount - ((funTok.GetType()==tpSTR) ? 1 : 0);
+    int iArgNumerical = iArgCount - ((funTok.GetType() == tpSTR) ? 1 : 0);
 
-    if (funTok.GetCode()==cmFUNC_STR && iArgCount-iArgNumerical>1)
-      Error(ecINTERNAL_ERROR);
+    if (funTok.GetCode() == cmFUNC_STR && iArgCount - iArgNumerical > 1)
+        Error(ecINTERNAL_ERROR);
 
-    if (funTok.GetArgCount()>=0 && iArgCount>iArgRequired) 
-      Error(ecTOO_MANY_PARAMS, m_pTokenReader->GetPos()-1, funTok.GetAsString());
+    if (funTok.GetArgCount() >= 0 && iArgCount > iArgRequired)
+        Error(ecTOO_MANY_PARAMS, m_pTokenReader->GetPos() - 1, funTok.GetAsString());
 
-    if (funTok.GetCode()!=cmOPRT_BIN && iArgCount<iArgRequired )
-      Error(ecTOO_FEW_PARAMS, m_pTokenReader->GetPos()-1, funTok.GetAsString());
+    if (funTok.GetCode() != cmOPRT_BIN && iArgCount < iArgRequired)
+        Error(ecTOO_FEW_PARAMS, m_pTokenReader->GetPos() - 1, funTok.GetAsString());
 
-    if (funTok.GetCode()==cmFUNC_STR && iArgCount>iArgRequired )
-      Error(ecTOO_MANY_PARAMS, m_pTokenReader->GetPos()-1, funTok.GetAsString());
+    if (funTok.GetCode() == cmFUNC_STR && iArgCount > iArgRequired)
+        Error(ecTOO_MANY_PARAMS, m_pTokenReader->GetPos() - 1, funTok.GetAsString());
 
     // Collect the numeric function arguments from the value stack and store them
     // in a vector
-    std::vector<token_type> stArg;  
-    for (int i=0; i<iArgNumerical; ++i)
+    std::vector<token_type> stArg;
+    for (int i = 0; i < iArgNumerical; ++i)
     {
-      stArg.push_back( a_stVal.pop() );
-      if ( stArg.back().GetType()==tpSTR && funTok.GetType()!=tpSTR )
-        Error(ecVAL_EXPECTED, m_pTokenReader->GetPos(), funTok.GetAsString());
+        stArg.push_back(a_stVal.pop());
+        if (stArg.back().GetType() == tpSTR && funTok.GetType() != tpSTR)
+            Error(ecVAL_EXPECTED, m_pTokenReader->GetPos(), funTok.GetAsString());
     }
 
-    switch((int)funTok.GetCode())
+    switch ((int)funTok.GetCode())
     {
-    case  cmFUNC_STR:  
-          stArg.push_back(a_stVal.pop());
-          
-          if ( stArg.back().GetType()==tpSTR && funTok.GetType()!=tpSTR )
-            Error(ecVAL_EXPECTED, m_pTokenReader->GetPos(), funTok.GetAsString());
+        case cmFUNC_STR:
+            stArg.push_back(a_stVal.pop());
 
-          ApplyStrFunc(funTok, stArg); 
-          break;
+            if (stArg.back().GetType() == tpSTR && funTok.GetType() != tpSTR)
+                Error(ecVAL_EXPECTED, m_pTokenReader->GetPos(), funTok.GetAsString());
 
-    case  cmFUNC_BULK: 
-          m_vRPN.AddBulkFun(funTok.GetFuncAddr(), (int)stArg.size()); 
-          break;
+            ApplyStrFunc(funTok, stArg);
+            break;
 
-    case  cmOPRT_BIN:
-    case  cmOPRT_POSTFIX:
-    case  cmOPRT_INFIX:
-    case  cmFUNC:
-          if (funTok.GetArgCount()==-1 && iArgCount==0)
-            Error(ecTOO_FEW_PARAMS, m_pTokenReader->GetPos(), funTok.GetAsString());
+        case cmFUNC_BULK:
+            m_vRPN.AddBulkFun(funTok.GetFuncAddr(), (int)stArg.size());
+            break;
 
-          m_vRPN.AddFun(funTok.GetFuncAddr(), (funTok.GetArgCount()==-1) ? -iArgNumerical : iArgNumerical);
-          break;
+        case cmOPRT_BIN:
+        case cmOPRT_POSTFIX:
+        case cmOPRT_INFIX:
+        case cmFUNC:
+            if (funTok.GetArgCount() == -1 && iArgCount == 0)
+                Error(ecTOO_FEW_PARAMS, m_pTokenReader->GetPos(), funTok.GetAsString());
+
+            m_vRPN.AddFun(funTok.GetFuncAddr(), (funTok.GetArgCount() == -1) ? -iArgNumerical : iArgNumerical);
+            break;
     }
 
     // Push dummy value representing the function result to the stack
     token_type token;
-    token.SetVal(1);  
+    token.SetVal(1);
     a_stVal.push(token);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserBase::ApplyIfElse(ParserStack<token_type> &a_stOpt,
-                               ParserStack<token_type> &a_stVal) const
-  {
+//---------------------------------------------------------------------------
+void ParserBase::ApplyIfElse(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal) const
+{
     // Check if there is an if Else clause to be calculated
-    while (a_stOpt.size() && a_stOpt.top().GetCode()==cmELSE)
+    while (a_stOpt.size() && a_stOpt.top().GetCode() == cmELSE)
     {
-      token_type opElse = a_stOpt.pop();
-      MUP_ASSERT(a_stOpt.size()>0);
+        token_type opElse = a_stOpt.pop();
+        MUP_ASSERT(a_stOpt.size() > 0);
 
-      // Take the value associated with the else branch from the value stack
-      token_type vVal2 = a_stVal.pop();
+        // Take the value associated with the else branch from the value stack
+        token_type vVal2 = a_stVal.pop();
 
-      MUP_ASSERT(a_stOpt.size()>0);
-      MUP_ASSERT(a_stVal.size()>=2);
+        MUP_ASSERT(a_stOpt.size() > 0);
+        MUP_ASSERT(a_stVal.size() >= 2);
 
-      // it then else is a ternary operator Pop all three values from the value s
-      // tack and just return the right value
-      token_type vVal1 = a_stVal.pop();
-      token_type vExpr = a_stVal.pop();
+        // it then else is a ternary operator Pop all three values from the value s
+        // tack and just return the right value
+        token_type vVal1 = a_stVal.pop();
+        token_type vExpr = a_stVal.pop();
 
-      a_stVal.push( (vExpr.GetVal()!=0) ? vVal1 : vVal2);
+        a_stVal.push((vExpr.GetVal() != 0) ? vVal1 : vVal2);
 
-      token_type opIf = a_stOpt.pop();
-      MUP_ASSERT(opElse.GetCode()==cmELSE);
-      MUP_ASSERT(opIf.GetCode()==cmIF);
+        token_type opIf = a_stOpt.pop();
+        MUP_ASSERT(opElse.GetCode() == cmELSE);
+        MUP_ASSERT(opIf.GetCode() == cmIF);
 
-      m_vRPN.AddIfElse(cmENDIF);
+        m_vRPN.AddIfElse(cmENDIF);
     } // while pending if-else-clause found
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Performs the necessary steps to write code for
-             the execution of binary operators into the bytecode. 
-  */
-  void ParserBase::ApplyBinOprt(ParserStack<token_type> &a_stOpt,
-                                ParserStack<token_type> &a_stVal) const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Performs the necessary steps to write code for
+           the execution of binary operators into the bytecode.
+*/
+void ParserBase::ApplyBinOprt(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal) const
+{
     // is it a user defined binary operator?
-    if (a_stOpt.top().GetCode()==cmOPRT_BIN)
+    if (a_stOpt.top().GetCode() == cmOPRT_BIN)
     {
-      ApplyFunc(a_stOpt, a_stVal, 2);
+        ApplyFunc(a_stOpt, a_stVal, 2);
     }
     else
     {
-      MUP_ASSERT(a_stVal.size()>=2);
-      token_type valTok1 = a_stVal.pop(),
-                 valTok2 = a_stVal.pop(),
-                 optTok  = a_stOpt.pop(),
-                 resTok; 
-
-      if ( valTok1.GetType()!=valTok2.GetType() || 
-          (valTok1.GetType()==tpSTR && valTok2.GetType()==tpSTR) )
-        Error(ecOPRT_TYPE_CONFLICT, m_pTokenReader->GetPos(), optTok.GetAsString());
-
-      if (optTok.GetCode()==cmASSIGN)
-      {
-        if (valTok2.GetCode()!=cmVAR)
-          Error(ecUNEXPECTED_OPERATOR, -1, _T("="));
-                      
-        m_vRPN.AddAssignOp(valTok2.GetVar());
-      }
-      else
-        m_vRPN.AddOp(optTok.GetCode());
-
-      resTok.SetVal(1);
-      a_stVal.push(resTok);
+        MUP_ASSERT(a_stVal.size() >= 2);
+        token_type valTok1 = a_stVal.pop(), valTok2 = a_stVal.pop(), optTok = a_stOpt.pop(), resTok;
+
+        if (valTok1.GetType() != valTok2.GetType() || (valTok1.GetType() == tpSTR && valTok2.GetType() == tpSTR))
+            Error(ecOPRT_TYPE_CONFLICT, m_pTokenReader->GetPos(), optTok.GetAsString());
+
+        if (optTok.GetCode() == cmASSIGN)
+        {
+            if (valTok2.GetCode() != cmVAR)
+                Error(ecUNEXPECTED_OPERATOR, -1, _T("="));
+
+            m_vRPN.AddAssignOp(valTok2.GetVar());
+        }
+        else
+            m_vRPN.AddOp(optTok.GetCode());
+
+        resTok.SetVal(1);
+        a_stVal.push(resTok);
     }
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Apply a binary operator. 
-      \param a_stOpt The operator stack
-      \param a_stVal The value stack
-  */
-  void ParserBase::ApplyRemainingOprt(ParserStack<token_type> &stOpt,
-                                      ParserStack<token_type> &stVal) const
-  {
-    while (stOpt.size() && 
-           stOpt.top().GetCode() != cmBO &&
-           stOpt.top().GetCode() != cmIF)
+}
+
+//---------------------------------------------------------------------------
+/** \brief Apply a binary operator.
+    \param a_stOpt The operator stack
+    \param a_stVal The value stack
+*/
+void ParserBase::ApplyRemainingOprt(ParserStack<token_type>& stOpt, ParserStack<token_type>& stVal) const
+{
+    while (stOpt.size() && stOpt.top().GetCode() != cmBO && stOpt.top().GetCode() != cmIF)
     {
-      token_type tok = stOpt.top();
-      switch (tok.GetCode())
-      {
-      case cmOPRT_INFIX:
-      case cmOPRT_BIN:
-      case cmLE:
-      case cmGE:
-      case cmNEQ:
-      case cmEQ:
-      case cmLT:
-      case cmGT:
-      case cmADD:
-      case cmSUB:
-      case cmMUL:
-      case cmDIV:
-      case cmPOW:
-      case cmLAND:
-      case cmLOR:
-      case cmASSIGN:
-          if (stOpt.top().GetCode()==cmOPRT_INFIX)
-            ApplyFunc(stOpt, stVal, 1);
-          else
-            ApplyBinOprt(stOpt, stVal);
-          break;
-
-      case cmELSE:
-          ApplyIfElse(stOpt, stVal);
-          break;
-
-      default:
-          Error(ecINTERNAL_ERROR);
-      }
+        token_type tok = stOpt.top();
+        switch (tok.GetCode())
+        {
+            case cmOPRT_INFIX:
+            case cmOPRT_BIN:
+            case cmLE:
+            case cmGE:
+            case cmNEQ:
+            case cmEQ:
+            case cmLT:
+            case cmGT:
+            case cmADD:
+            case cmSUB:
+            case cmMUL:
+            case cmDIV:
+            case cmPOW:
+            case cmLAND:
+            case cmLOR:
+            case cmASSIGN:
+                if (stOpt.top().GetCode() == cmOPRT_INFIX)
+                    ApplyFunc(stOpt, stVal, 1);
+                else
+                    ApplyBinOprt(stOpt, stVal);
+                break;
+
+            case cmELSE:
+                ApplyIfElse(stOpt, stVal);
+                break;
+
+            default:
+                Error(ecINTERNAL_ERROR);
+        }
     }
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Parse the command code.
-      \sa ParseString(...)
-
-      Command code contains precalculated stack positions of the values and the
-      associated operators. The Stack is filled beginning from index one the 
-      value at index zero is not used at all.
-  */
-  value_type ParserBase::ParseCmdCode() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Parse the command code.
+    \sa ParseString(...)
+
+    Command code contains precalculated stack positions of the values and the
+    associated operators. The Stack is filled beginning from index one the
+    value at index zero is not used at all.
+*/
+value_type ParserBase::ParseCmdCode() const
+{
     return ParseCmdCodeBulk(0, 0);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Evaluate the RPN. 
-      \param nOffset The offset added to variable addresses (for bulk mode)
-      \param nThreadID OpenMP Thread id of the calling thread
-  */
-  value_type ParserBase::ParseCmdCodeBulk(int nOffset, int nThreadID) const
-  {
-    assert(nThreadID<=s_MaxNumOpenMPThreads);
-
-    // Note: The check for nOffset==0 and nThreadID here is not necessary but 
+}
+
+//---------------------------------------------------------------------------
+/** \brief Evaluate the RPN.
+    \param nOffset The offset added to variable addresses (for bulk mode)
+    \param nThreadID OpenMP Thread id of the calling thread
+*/
+value_type ParserBase::ParseCmdCodeBulk(int nOffset, int nThreadID) const
+{
+    assert(nThreadID <= s_MaxNumOpenMPThreads);
+
+    // Note: The check for nOffset==0 and nThreadID here is not necessary but
     //       brings a minor performance gain when not in bulk mode.
-    value_type *Stack = ((nOffset==0) && (nThreadID==0)) ? &m_vStackBuffer[0] : &m_vStackBuffer[nThreadID * (m_vStackBuffer.size() / s_MaxNumOpenMPThreads)];
+    value_type* Stack = ((nOffset == 0) && (nThreadID == 0)) ?
+                          &m_vStackBuffer[0] :
+                          &m_vStackBuffer[nThreadID * (m_vStackBuffer.size() / s_MaxNumOpenMPThreads)];
     value_type buf;
     int sidx(0);
-    for (const SToken *pTok = m_vRPN.GetBase(); pTok->Cmd!=cmEND ; ++pTok)
+    for (const SToken* pTok = m_vRPN.GetBase(); pTok->Cmd != cmEND; ++pTok)
     {
-      switch (pTok->Cmd)
-      {
-      // built in binary operators
-      case  cmLE:   --sidx; Stack[sidx]  = Stack[sidx] <= Stack[sidx+1]; continue;
-      case  cmGE:   --sidx; Stack[sidx]  = Stack[sidx] >= Stack[sidx+1]; continue;
-      case  cmNEQ:  --sidx; Stack[sidx]  = Stack[sidx] != Stack[sidx+1]; continue;
-      case  cmEQ:   --sidx; Stack[sidx]  = Stack[sidx] == Stack[sidx+1]; continue;
-      case  cmLT:   --sidx; Stack[sidx]  = Stack[sidx] < Stack[sidx+1];  continue;
-      case  cmGT:   --sidx; Stack[sidx]  = Stack[sidx] > Stack[sidx+1];  continue;
-      case  cmADD:  --sidx; Stack[sidx] += Stack[1+sidx]; continue;
-      case  cmSUB:  --sidx; Stack[sidx] -= Stack[1+sidx]; continue;
-      case  cmMUL:  --sidx; Stack[sidx] *= Stack[1+sidx]; continue;
-      case  cmDIV:  --sidx;
-
-  #if defined(MUP_MATH_EXCEPTIONS)
-                  if (Stack[1+sidx]==0)
+        switch (pTok->Cmd)
+        {
+            // built in binary operators
+            case cmLE:
+                --sidx;
+                Stack[sidx] = Stack[sidx] <= Stack[sidx + 1];
+                continue;
+            case cmGE:
+                --sidx;
+                Stack[sidx] = Stack[sidx] >= Stack[sidx + 1];
+                continue;
+            case cmNEQ:
+                --sidx;
+                Stack[sidx] = Stack[sidx] != Stack[sidx + 1];
+                continue;
+            case cmEQ:
+                --sidx;
+                Stack[sidx] = Stack[sidx] == Stack[sidx + 1];
+                continue;
+            case cmLT:
+                --sidx;
+                Stack[sidx] = Stack[sidx] < Stack[sidx + 1];
+                continue;
+            case cmGT:
+                --sidx;
+                Stack[sidx] = Stack[sidx] > Stack[sidx + 1];
+                continue;
+            case cmADD:
+                --sidx;
+                Stack[sidx] += Stack[1 + sidx];
+                continue;
+            case cmSUB:
+                --sidx;
+                Stack[sidx] -= Stack[1 + sidx];
+                continue;
+            case cmMUL:
+                --sidx;
+                Stack[sidx] *= Stack[1 + sidx];
+                continue;
+            case cmDIV:
+                --sidx;
+
+#if defined(MUP_MATH_EXCEPTIONS)
+                if (Stack[1 + sidx] == 0)
                     Error(ecDIV_BY_ZERO);
-  #endif
-                  Stack[sidx] /= Stack[1+sidx]; 
-                  continue;
-
-      case  cmPOW: 
-              --sidx; Stack[sidx] = MathImpl<value_type>::Pow(Stack[sidx], Stack[1+sidx]);
-              continue;
-
-      case  cmLAND: --sidx; Stack[sidx]  = Stack[sidx] && Stack[sidx+1]; continue;
-      case  cmLOR:  --sidx; Stack[sidx]  = Stack[sidx] || Stack[sidx+1]; continue;
-
-      case  cmASSIGN: 
-          // Bugfix for Bulkmode:
-          // for details see:
-          //    https://groups.google.com/forum/embed/?place=forum/muparser-dev&showsearch=true&showpopout=true&showtabs=false&parenturl=http://muparser.beltoforion.de/mup_forum.html&afterlogin&pli=1#!topic/muparser-dev/szgatgoHTws
-          --sidx; Stack[sidx] = *(pTok->Oprt.ptr + nOffset) = Stack[sidx + 1]; continue;
-          // original code:
-          //--sidx; Stack[sidx] = *pTok->Oprt.ptr = Stack[sidx+1]; continue;
-
-      //case  cmBO:  // unused, listed for compiler optimization purposes
-      //case  cmBC:
-      //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
-      //      continue;
-
-      case  cmIF:
-            if (Stack[sidx--]==0)
-              pTok += pTok->Oprt.offset;
-            continue;
-
-      case  cmELSE:
-            pTok += pTok->Oprt.offset;
-            continue;
-
-      case  cmENDIF:
-            continue;
-
-      //case  cmARG_SEP:
-      //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
-      //      continue;
-
-      // value and variable tokens
-      case  cmVAR:    Stack[++sidx] = *(pTok->Val.ptr + nOffset);  continue;
-      case  cmVAL:    Stack[++sidx] =  pTok->Val.data2;  continue;
-      
-      case  cmVARPOW2: buf = *(pTok->Val.ptr + nOffset);
-                       Stack[++sidx] = buf*buf;
-                       continue;
-
-      case  cmVARPOW3: buf = *(pTok->Val.ptr + nOffset);
-                       Stack[++sidx] = buf*buf*buf;
-                       continue;
-
-      case  cmVARPOW4: buf = *(pTok->Val.ptr + nOffset);
-                       Stack[++sidx] = buf*buf*buf*buf;
-                       continue;
-      
-      case  cmVARMUL:  Stack[++sidx] = *(pTok->Val.ptr + nOffset) * pTok->Val.data + pTok->Val.data2;
-                       continue;
-
-      // Next is treatment of numeric functions
-      case  cmFUNC:
-            {
-              int iArgCount = pTok->Fun.argc;
-
-              // switch according to argument count
-              switch(iArgCount)  
-              {
-              case 0: sidx += 1; Stack[sidx] = (*(fun_type0)pTok->Fun.ptr)(); continue;
-              case 1:            Stack[sidx] = (*(fun_type1)pTok->Fun.ptr)(Stack[sidx]);   continue;
-              case 2: sidx -= 1; Stack[sidx] = (*(fun_type2)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1]); continue;
-              case 3: sidx -= 2; Stack[sidx] = (*(fun_type3)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2]); continue;
-              case 4: sidx -= 3; Stack[sidx] = (*(fun_type4)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3]); continue;
-              case 5: sidx -= 4; Stack[sidx] = (*(fun_type5)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4]); continue;
-              case 6: sidx -= 5; Stack[sidx] = (*(fun_type6)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5]); continue;
-              case 7: sidx -= 6; Stack[sidx] = (*(fun_type7)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6]); continue;
-              case 8: sidx -= 7; Stack[sidx] = (*(fun_type8)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6], Stack[sidx+7]); continue;
-              case 9: sidx -= 8; Stack[sidx] = (*(fun_type9)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6], Stack[sidx+7], Stack[sidx+8]); continue;
-              case 10:sidx -= 9; Stack[sidx] = (*(fun_type10)pTok->Fun.ptr)(Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6], Stack[sidx+7], Stack[sidx+8], Stack[sidx+9]); continue;
-              default:
-                if (iArgCount>0) // function with variable arguments store the number as a negative value
-                  Error(ecINTERNAL_ERROR, 1);
-
-                sidx -= -iArgCount - 1;
-                Stack[sidx] =(*(multfun_type)pTok->Fun.ptr)(&Stack[sidx], -iArgCount);
+#endif
+                Stack[sidx] /= Stack[1 + sidx];
+                continue;
+
+            case cmPOW:
+                --sidx;
+                Stack[sidx] = MathImpl<value_type>::Pow(Stack[sidx], Stack[1 + sidx]);
+                continue;
+
+            case cmLAND:
+                --sidx;
+                Stack[sidx] = Stack[sidx] && Stack[sidx + 1];
+                continue;
+            case cmLOR:
+                --sidx;
+                Stack[sidx] = Stack[sidx] || Stack[sidx + 1];
+                continue;
+
+            case cmASSIGN:
+                // Bugfix for Bulkmode:
+                // for details see:
+                //    https://groups.google.com/forum/embed/?place=forum/muparser-dev&showsearch=true&showpopout=true&showtabs=false&parenturl=http://muparser.beltoforion.de/mup_forum.html&afterlogin&pli=1#!topic/muparser-dev/szgatgoHTws
+                --sidx;
+                Stack[sidx] = *(pTok->Oprt.ptr + nOffset) = Stack[sidx + 1];
+                continue;
+                // original code:
+                //--sidx; Stack[sidx] = *pTok->Oprt.ptr = Stack[sidx+1]; continue;
+
+                // case  cmBO:  // unused, listed for compiler optimization purposes
+                // case  cmBC:
+                //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
+                //      continue;
+
+            case cmIF:
+                if (Stack[sidx--] == 0)
+                    pTok += pTok->Oprt.offset;
+                continue;
+
+            case cmELSE:
+                pTok += pTok->Oprt.offset;
+                continue;
+
+            case cmENDIF:
                 continue;
-              }
+
+            // case  cmARG_SEP:
+            //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
+            //      continue;
+
+            // value and variable tokens
+            case cmVAR:
+                Stack[++sidx] = *(pTok->Val.ptr + nOffset);
+                continue;
+            case cmVAL:
+                Stack[++sidx] = pTok->Val.data2;
+                continue;
+
+            case cmVARPOW2:
+                buf = *(pTok->Val.ptr + nOffset);
+                Stack[++sidx] = buf * buf;
+                continue;
+
+            case cmVARPOW3:
+                buf = *(pTok->Val.ptr + nOffset);
+                Stack[++sidx] = buf * buf * buf;
+                continue;
+
+            case cmVARPOW4:
+                buf = *(pTok->Val.ptr + nOffset);
+                Stack[++sidx] = buf * buf * buf * buf;
+                continue;
+
+            case cmVARMUL:
+                Stack[++sidx] = *(pTok->Val.ptr + nOffset) * pTok->Val.data + pTok->Val.data2;
+                continue;
+
+            // Next is treatment of numeric functions
+            case cmFUNC:
+            {
+                int iArgCount = pTok->Fun.argc;
+
+                // switch according to argument count
+                switch (iArgCount)
+                {
+                    case 0:
+                        sidx += 1;
+                        Stack[sidx] = (*(fun_type0)pTok->Fun.ptr)();
+                        continue;
+                    case 1:
+                        Stack[sidx] = (*(fun_type1)pTok->Fun.ptr)(Stack[sidx]);
+                        continue;
+                    case 2:
+                        sidx -= 1;
+                        Stack[sidx] = (*(fun_type2)pTok->Fun.ptr)(Stack[sidx], Stack[sidx + 1]);
+                        continue;
+                    case 3:
+                        sidx -= 2;
+                        Stack[sidx] = (*(fun_type3)pTok->Fun.ptr)(Stack[sidx], Stack[sidx + 1], Stack[sidx + 2]);
+                        continue;
+                    case 4:
+                        sidx -= 3;
+                        Stack[sidx] =
+                          (*(fun_type4)pTok->Fun.ptr)(Stack[sidx], Stack[sidx + 1], Stack[sidx + 2], Stack[sidx + 3]);
+                        continue;
+                    case 5:
+                        sidx -= 4;
+                        Stack[sidx] = (*(fun_type5)pTok->Fun.ptr)(
+                          Stack[sidx], Stack[sidx + 1], Stack[sidx + 2], Stack[sidx + 3], Stack[sidx + 4]);
+                        continue;
+                    case 6:
+                        sidx -= 5;
+                        Stack[sidx] = (*(fun_type6)pTok->Fun.ptr)(Stack[sidx],
+                                                                  Stack[sidx + 1],
+                                                                  Stack[sidx + 2],
+                                                                  Stack[sidx + 3],
+                                                                  Stack[sidx + 4],
+                                                                  Stack[sidx + 5]);
+                        continue;
+                    case 7:
+                        sidx -= 6;
+                        Stack[sidx] = (*(fun_type7)pTok->Fun.ptr)(Stack[sidx],
+                                                                  Stack[sidx + 1],
+                                                                  Stack[sidx + 2],
+                                                                  Stack[sidx + 3],
+                                                                  Stack[sidx + 4],
+                                                                  Stack[sidx + 5],
+                                                                  Stack[sidx + 6]);
+                        continue;
+                    case 8:
+                        sidx -= 7;
+                        Stack[sidx] = (*(fun_type8)pTok->Fun.ptr)(Stack[sidx],
+                                                                  Stack[sidx + 1],
+                                                                  Stack[sidx + 2],
+                                                                  Stack[sidx + 3],
+                                                                  Stack[sidx + 4],
+                                                                  Stack[sidx + 5],
+                                                                  Stack[sidx + 6],
+                                                                  Stack[sidx + 7]);
+                        continue;
+                    case 9:
+                        sidx -= 8;
+                        Stack[sidx] = (*(fun_type9)pTok->Fun.ptr)(Stack[sidx],
+                                                                  Stack[sidx + 1],
+                                                                  Stack[sidx + 2],
+                                                                  Stack[sidx + 3],
+                                                                  Stack[sidx + 4],
+                                                                  Stack[sidx + 5],
+                                                                  Stack[sidx + 6],
+                                                                  Stack[sidx + 7],
+                                                                  Stack[sidx + 8]);
+                        continue;
+                    case 10:
+                        sidx -= 9;
+                        Stack[sidx] = (*(fun_type10)pTok->Fun.ptr)(Stack[sidx],
+                                                                   Stack[sidx + 1],
+                                                                   Stack[sidx + 2],
+                                                                   Stack[sidx + 3],
+                                                                   Stack[sidx + 4],
+                                                                   Stack[sidx + 5],
+                                                                   Stack[sidx + 6],
+                                                                   Stack[sidx + 7],
+                                                                   Stack[sidx + 8],
+                                                                   Stack[sidx + 9]);
+                        continue;
+                    default:
+                        if (iArgCount > 0) // function with variable arguments store the number as a negative value
+                            Error(ecINTERNAL_ERROR, 1);
+
+                        sidx -= -iArgCount - 1;
+                        Stack[sidx] = (*(multfun_type)pTok->Fun.ptr)(&Stack[sidx], -iArgCount);
+                        continue;
+                }
             }
 
-      // Next is treatment of string functions
-      case  cmFUNC_STR:
+            // Next is treatment of string functions
+            case cmFUNC_STR:
             {
-              sidx -= pTok->Fun.argc -1;
+                sidx -= pTok->Fun.argc - 1;
 
-              // The index of the string argument in the string table
-              int iIdxStack = pTok->Fun.idx;  
-              MUP_ASSERT( iIdxStack>=0 && iIdxStack<(int)m_vStringBuf.size() );
+                // The index of the string argument in the string table
+                int iIdxStack = pTok->Fun.idx;
+                MUP_ASSERT(iIdxStack >= 0 && iIdxStack < (int)m_vStringBuf.size());
 
-              switch(pTok->Fun.argc)  // switch according to argument count
-              {
-              case 0: Stack[sidx] = (*(strfun_type1)pTok->Fun.ptr)(m_vStringBuf[iIdxStack].c_str()); continue;
-              case 1: Stack[sidx] = (*(strfun_type2)pTok->Fun.ptr)(m_vStringBuf[iIdxStack].c_str(), Stack[sidx]); continue;
-              case 2: Stack[sidx] = (*(strfun_type3)pTok->Fun.ptr)(m_vStringBuf[iIdxStack].c_str(), Stack[sidx], Stack[sidx+1]); continue;
-              }
+                switch (pTok->Fun.argc) // switch according to argument count
+                {
+                    case 0:
+                        Stack[sidx] = (*(strfun_type1)pTok->Fun.ptr)(m_vStringBuf[iIdxStack].c_str());
+                        continue;
+                    case 1:
+                        Stack[sidx] = (*(strfun_type2)pTok->Fun.ptr)(m_vStringBuf[iIdxStack].c_str(), Stack[sidx]);
+                        continue;
+                    case 2:
+                        Stack[sidx] =
+                          (*(strfun_type3)pTok->Fun.ptr)(m_vStringBuf[iIdxStack].c_str(), Stack[sidx], Stack[sidx + 1]);
+                        continue;
+                }
 
-              continue;
+                continue;
             }
 
-        case  cmFUNC_BULK:
-              {
+            case cmFUNC_BULK:
+            {
                 int iArgCount = pTok->Fun.argc;
 
                 // switch according to argument count
-                switch(iArgCount)  
+                switch (iArgCount)
                 {
-                case 0: sidx += 1; Stack[sidx] = (*(bulkfun_type0 )pTok->Fun.ptr)(nOffset, nThreadID); continue;
-                case 1:            Stack[sidx] = (*(bulkfun_type1 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx]); continue;
-                case 2: sidx -= 1; Stack[sidx] = (*(bulkfun_type2 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1]); continue;
-                case 3: sidx -= 2; Stack[sidx] = (*(bulkfun_type3 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2]); continue;
-                case 4: sidx -= 3; Stack[sidx] = (*(bulkfun_type4 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3]); continue;
-                case 5: sidx -= 4; Stack[sidx] = (*(bulkfun_type5 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4]); continue;
-                case 6: sidx -= 5; Stack[sidx] = (*(bulkfun_type6 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5]); continue;
-                case 7: sidx -= 6; Stack[sidx] = (*(bulkfun_type7 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6]); continue;
-                case 8: sidx -= 7; Stack[sidx] = (*(bulkfun_type8 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6], Stack[sidx+7]); continue;
-                case 9: sidx -= 8; Stack[sidx] = (*(bulkfun_type9 )pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6], Stack[sidx+7], Stack[sidx+8]); continue;
-                case 10:sidx -= 9; Stack[sidx] = (*(bulkfun_type10)pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx+1], Stack[sidx+2], Stack[sidx+3], Stack[sidx+4], Stack[sidx+5], Stack[sidx+6], Stack[sidx+7], Stack[sidx+8], Stack[sidx+9]); continue;
-                default:
-                  Error(ecINTERNAL_ERROR, 2);
-                  continue;
+                    case 0:
+                        sidx += 1;
+                        Stack[sidx] = (*(bulkfun_type0)pTok->Fun.ptr)(nOffset, nThreadID);
+                        continue;
+                    case 1:
+                        Stack[sidx] = (*(bulkfun_type1)pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx]);
+                        continue;
+                    case 2:
+                        sidx -= 1;
+                        Stack[sidx] = (*(bulkfun_type2)pTok->Fun.ptr)(nOffset, nThreadID, Stack[sidx], Stack[sidx + 1]);
+                        continue;
+                    case 3:
+                        sidx -= 2;
+                        Stack[sidx] = (*(bulkfun_type3)pTok->Fun.ptr)(
+                          nOffset, nThreadID, Stack[sidx], Stack[sidx + 1], Stack[sidx + 2]);
+                        continue;
+                    case 4:
+                        sidx -= 3;
+                        Stack[sidx] = (*(bulkfun_type4)pTok->Fun.ptr)(
+                          nOffset, nThreadID, Stack[sidx], Stack[sidx + 1], Stack[sidx + 2], Stack[sidx + 3]);
+                        continue;
+                    case 5:
+                        sidx -= 4;
+                        Stack[sidx] = (*(bulkfun_type5)pTok->Fun.ptr)(nOffset,
+                                                                      nThreadID,
+                                                                      Stack[sidx],
+                                                                      Stack[sidx + 1],
+                                                                      Stack[sidx + 2],
+                                                                      Stack[sidx + 3],
+                                                                      Stack[sidx + 4]);
+                        continue;
+                    case 6:
+                        sidx -= 5;
+                        Stack[sidx] = (*(bulkfun_type6)pTok->Fun.ptr)(nOffset,
+                                                                      nThreadID,
+                                                                      Stack[sidx],
+                                                                      Stack[sidx + 1],
+                                                                      Stack[sidx + 2],
+                                                                      Stack[sidx + 3],
+                                                                      Stack[sidx + 4],
+                                                                      Stack[sidx + 5]);
+                        continue;
+                    case 7:
+                        sidx -= 6;
+                        Stack[sidx] = (*(bulkfun_type7)pTok->Fun.ptr)(nOffset,
+                                                                      nThreadID,
+                                                                      Stack[sidx],
+                                                                      Stack[sidx + 1],
+                                                                      Stack[sidx + 2],
+                                                                      Stack[sidx + 3],
+                                                                      Stack[sidx + 4],
+                                                                      Stack[sidx + 5],
+                                                                      Stack[sidx + 6]);
+                        continue;
+                    case 8:
+                        sidx -= 7;
+                        Stack[sidx] = (*(bulkfun_type8)pTok->Fun.ptr)(nOffset,
+                                                                      nThreadID,
+                                                                      Stack[sidx],
+                                                                      Stack[sidx + 1],
+                                                                      Stack[sidx + 2],
+                                                                      Stack[sidx + 3],
+                                                                      Stack[sidx + 4],
+                                                                      Stack[sidx + 5],
+                                                                      Stack[sidx + 6],
+                                                                      Stack[sidx + 7]);
+                        continue;
+                    case 9:
+                        sidx -= 8;
+                        Stack[sidx] = (*(bulkfun_type9)pTok->Fun.ptr)(nOffset,
+                                                                      nThreadID,
+                                                                      Stack[sidx],
+                                                                      Stack[sidx + 1],
+                                                                      Stack[sidx + 2],
+                                                                      Stack[sidx + 3],
+                                                                      Stack[sidx + 4],
+                                                                      Stack[sidx + 5],
+                                                                      Stack[sidx + 6],
+                                                                      Stack[sidx + 7],
+                                                                      Stack[sidx + 8]);
+                        continue;
+                    case 10:
+                        sidx -= 9;
+                        Stack[sidx] = (*(bulkfun_type10)pTok->Fun.ptr)(nOffset,
+                                                                       nThreadID,
+                                                                       Stack[sidx],
+                                                                       Stack[sidx + 1],
+                                                                       Stack[sidx + 2],
+                                                                       Stack[sidx + 3],
+                                                                       Stack[sidx + 4],
+                                                                       Stack[sidx + 5],
+                                                                       Stack[sidx + 6],
+                                                                       Stack[sidx + 7],
+                                                                       Stack[sidx + 8],
+                                                                       Stack[sidx + 9]);
+                        continue;
+                    default:
+                        Error(ecINTERNAL_ERROR, 2);
+                        continue;
                 }
-              }
+            }
 
-        default:
-              Error(ecINTERNAL_ERROR, 3);
-              return 0;
-      } // switch CmdCode
-    } // for all bytecode tokens
+            default:
+                Error(ecINTERNAL_ERROR, 3);
+                return 0;
+        } // switch CmdCode
+    }     // for all bytecode tokens
 
-    return Stack[m_nFinalResultIdx];  
-  }
+    return Stack[m_nFinalResultIdx];
+}
 
-  //---------------------------------------------------------------------------
-  void ParserBase::CreateRPN() const
-  {
+//---------------------------------------------------------------------------
+void ParserBase::CreateRPN() const
+{
     if (!m_pTokenReader->GetExpr().length())
-      Error(ecUNEXPECTED_EOF, 0);
+        Error(ecUNEXPECTED_EOF, 0);
 
     ParserStack<token_type> stOpt, stVal;
     ParserStack<int> stArgCount;
-    token_type opta, opt;  // for storing operators
-    token_type val, tval;  // for storing value
+    token_type opta, opt; // for storing operators
+    token_type val, tval; // for storing value
 
     ReInit();
-    
+
     // The outermost counter counts the number of separated items
     // such as in "a=10,b=20,c=c+a"
     stArgCount.push(1);
-    
-    for(;;)
+
+    for (;;)
     {
-      opt = m_pTokenReader->ReadNextToken();
-
-      switch (opt.GetCode())
-      {
-        //
-        // Next three are different kind of value entries
-        //
-        case cmSTRING:
-                opt.SetIdx((int)m_vStringBuf.size());      // Assign buffer index to token 
+        opt = m_pTokenReader->ReadNextToken();
+
+        switch (opt.GetCode())
+        {
+            //
+            // Next three are different kind of value entries
+            //
+            case cmSTRING:
+                opt.SetIdx((int)m_vStringBuf.size()); // Assign buffer index to token
                 stVal.push(opt);
-		            m_vStringBuf.push_back(opt.GetAsString()); // Store string in internal buffer
+                m_vStringBuf.push_back(opt.GetAsString()); // Store string in internal buffer
                 break;
-   
-        case cmVAR:
+
+            case cmVAR:
                 stVal.push(opt);
-                m_vRPN.AddVar( static_cast<value_type*>(opt.GetVar()) );
+                m_vRPN.AddVar(static_cast<value_type*>(opt.GetVar()));
                 break;
 
-        case cmVAL:
-		        stVal.push(opt);
-                m_vRPN.AddVal( opt.GetVal() );
+            case cmVAL:
+                stVal.push(opt);
+                m_vRPN.AddVal(opt.GetVal());
                 break;
 
-        case cmELSE:
+            case cmELSE:
                 m_nIfElseCounter--;
-                if (m_nIfElseCounter<0)
-                  Error(ecMISPLACED_COLON, m_pTokenReader->GetPos());
+                if (m_nIfElseCounter < 0)
+                    Error(ecMISPLACED_COLON, m_pTokenReader->GetPos());
 
                 ApplyRemainingOprt(stOpt, stVal);
                 m_vRPN.AddIfElse(cmELSE);
                 stOpt.push(opt);
                 break;
 
-
-        case cmARG_SEP:
+            case cmARG_SEP:
                 if (stArgCount.empty())
-                  Error(ecUNEXPECTED_ARG_SEP, m_pTokenReader->GetPos());
+                    Error(ecUNEXPECTED_ARG_SEP, m_pTokenReader->GetPos());
 
                 ++stArgCount.top();
                 // fallthrough intentional (no break!)
 
-        case cmEND:
+            case cmEND:
                 ApplyRemainingOprt(stOpt, stVal);
                 break;
 
-       case cmBC:
-                {
-                  // The argument count for parameterless functions is zero
-                  // by default an opening bracket sets parameter count to 1
-                  // in preparation of arguments to come. If the last token
-                  // was an opening bracket we know better...
-                  if (opta.GetCode()==cmBO)
+            case cmBC:
+            {
+                // The argument count for parameterless functions is zero
+                // by default an opening bracket sets parameter count to 1
+                // in preparation of arguments to come. If the last token
+                // was an opening bracket we know better...
+                if (opta.GetCode() == cmBO)
                     --stArgCount.top();
-                  
-                  ApplyRemainingOprt(stOpt, stVal);
 
-                  // Check if the bracket content has been evaluated completely
-                  if (stOpt.size() && stOpt.top().GetCode()==cmBO)
-                  {
+                ApplyRemainingOprt(stOpt, stVal);
+
+                // Check if the bracket content has been evaluated completely
+                if (stOpt.size() && stOpt.top().GetCode() == cmBO)
+                {
                     // if opt is ")" and opta is "(" the bracket has been evaluated, now its time to check
                     // if there is either a function or a sign pending
                     // neither the opening nor the closing bracket will be pushed back to
                     // the operator stack
-                    // Check if a function is standing in front of the opening bracket, 
+                    // Check if a function is standing in front of the opening bracket,
                     // if yes evaluate it afterwards check for infix operators
                     assert(stArgCount.size());
                     int iArgCount = stArgCount.pop();
-                    
+
                     stOpt.pop(); // Take opening bracket from stack
 
-                    if (iArgCount>1 && ( stOpt.size()==0 || 
-                                        (stOpt.top().GetCode()!=cmFUNC && 
-                                         stOpt.top().GetCode()!=cmFUNC_BULK && 
-                                         stOpt.top().GetCode()!=cmFUNC_STR) ) )
-                      Error(ecUNEXPECTED_ARG, m_pTokenReader->GetPos());
-                    
+                    if (iArgCount > 1 && (stOpt.size() == 0 ||
+                                          (stOpt.top().GetCode() != cmFUNC && stOpt.top().GetCode() != cmFUNC_BULK &&
+                                           stOpt.top().GetCode() != cmFUNC_STR)))
+                        Error(ecUNEXPECTED_ARG, m_pTokenReader->GetPos());
+
                     // The opening bracket was popped from the stack now check if there
                     // was a function before this bracket
-                    if (stOpt.size() && 
-                        stOpt.top().GetCode()!=cmOPRT_INFIX && 
-                        stOpt.top().GetCode()!=cmOPRT_BIN && 
-                        stOpt.top().GetFuncAddr()!=0)
+                    if (stOpt.size() && stOpt.top().GetCode() != cmOPRT_INFIX && stOpt.top().GetCode() != cmOPRT_BIN &&
+                        stOpt.top().GetFuncAddr() != 0)
                     {
-                      ApplyFunc(stOpt, stVal, iArgCount);
+                        ApplyFunc(stOpt, stVal, iArgCount);
                     }
-                  }
-                } // if bracket content is evaluated
-                break;
-
-        //
-        // Next are the binary operator entries
-        //
-        //case cmAND:   // built in binary operators
-        //case cmOR:
-        //case cmXOR:
-        case cmIF:
+                }
+            } // if bracket content is evaluated
+            break;
+
+            //
+            // Next are the binary operator entries
+            //
+            // case cmAND:   // built in binary operators
+            // case cmOR:
+            // case cmXOR:
+            case cmIF:
                 m_nIfElseCounter++;
                 // fallthrough intentional (no break!)
 
-        case cmLAND:
-        case cmLOR:
-        case cmLT:
-        case cmGT:
-        case cmLE:
-        case cmGE:
-        case cmNEQ:
-        case cmEQ:
-        case cmADD:
-        case cmSUB:
-        case cmMUL:
-        case cmDIV:
-        case cmPOW:
-        case cmASSIGN:
-        case cmOPRT_BIN:
-
-                // A binary operator (user defined or built in) has been found. 
-                while ( stOpt.size() && 
-                        stOpt.top().GetCode() != cmBO &&
-                        stOpt.top().GetCode() != cmELSE &&
-                        stOpt.top().GetCode() != cmIF)
+            case cmLAND:
+            case cmLOR:
+            case cmLT:
+            case cmGT:
+            case cmLE:
+            case cmGE:
+            case cmNEQ:
+            case cmEQ:
+            case cmADD:
+            case cmSUB:
+            case cmMUL:
+            case cmDIV:
+            case cmPOW:
+            case cmASSIGN:
+            case cmOPRT_BIN:
+
+                // A binary operator (user defined or built in) has been found.
+                while (stOpt.size() && stOpt.top().GetCode() != cmBO && stOpt.top().GetCode() != cmELSE &&
+                       stOpt.top().GetCode() != cmIF)
                 {
-                  int nPrec1 = GetOprtPrecedence(stOpt.top()),
-                      nPrec2 = GetOprtPrecedence(opt);
-
-                  if (stOpt.top().GetCode()==opt.GetCode())
-                  {
+                    int nPrec1 = GetOprtPrecedence(stOpt.top()), nPrec2 = GetOprtPrecedence(opt);
 
-                    // Deal with operator associativity
-                    EOprtAssociativity eOprtAsct = GetOprtAssociativity(opt);
-                    if ( (eOprtAsct==oaRIGHT && (nPrec1 <= nPrec2)) || 
-                         (eOprtAsct==oaLEFT  && (nPrec1 <  nPrec2)) )
+                    if (stOpt.top().GetCode() == opt.GetCode())
                     {
-                      break;
+                        // Deal with operator associativity
+                        EOprtAssociativity eOprtAsct = GetOprtAssociativity(opt);
+                        if ((eOprtAsct == oaRIGHT && (nPrec1 <= nPrec2)) || (eOprtAsct == oaLEFT && (nPrec1 < nPrec2)))
+                        {
+                            break;
+                        }
                     }
-                  }
-                  else if (nPrec1 < nPrec2)
-                  {
-                    // In case the operators are not equal the precedence decides alone...
-                    break;
-                  }
-                  
-                  if (stOpt.top().GetCode()==cmOPRT_INFIX)
-                    ApplyFunc(stOpt, stVal, 1);
-                  else
-                    ApplyBinOprt(stOpt, stVal);
+                    else if (nPrec1 < nPrec2)
+                    {
+                        // In case the operators are not equal the precedence decides alone...
+                        break;
+                    }
+
+                    if (stOpt.top().GetCode() == cmOPRT_INFIX)
+                        ApplyFunc(stOpt, stVal, 1);
+                    else
+                        ApplyBinOprt(stOpt, stVal);
                 } // while ( ... )
 
-                if (opt.GetCode()==cmIF)
-                  m_vRPN.AddIfElse(opt.GetCode());
+                if (opt.GetCode() == cmIF)
+                    m_vRPN.AddIfElse(opt.GetCode());
 
-    			      // The operator can't be evaluated right now, push back to the operator stack
+                // The operator can't be evaluated right now, push back to the operator stack
                 stOpt.push(opt);
                 break;
 
-        //
-        // Last section contains functions and operators implicitly mapped to functions
-        //
-        case cmBO:
+            //
+            // Last section contains functions and operators implicitly mapped to functions
+            //
+            case cmBO:
                 stArgCount.push(1);
                 stOpt.push(opt);
                 break;
 
-        case cmOPRT_INFIX:
-        case cmFUNC:
-        case cmFUNC_BULK:
-        case cmFUNC_STR:  
+            case cmOPRT_INFIX:
+            case cmFUNC:
+            case cmFUNC_BULK:
+            case cmFUNC_STR:
                 stOpt.push(opt);
                 break;
 
-        case cmOPRT_POSTFIX:
+            case cmOPRT_POSTFIX:
                 stOpt.push(opt);
-                ApplyFunc(stOpt, stVal, 1);  // this is the postfix operator
+                ApplyFunc(stOpt, stVal, 1); // this is the postfix operator
                 break;
 
-        default:  Error(ecINTERNAL_ERROR, 3);
-      } // end of switch operator-token
+            default:
+                Error(ecINTERNAL_ERROR, 3);
+        } // end of switch operator-token
 
-      opta = opt;
+        opta = opt;
 
-      if ( opt.GetCode() == cmEND )
-      {
-        m_vRPN.Finalize();
-        break;
-      }
+        if (opt.GetCode() == cmEND)
+        {
+            m_vRPN.Finalize();
+            break;
+        }
 
-      if (ParserBase::g_DbgDumpStack)
-      {
-        StackDump(stVal, stOpt);
-        m_vRPN.AsciiDump();
-      }
+        if (ParserBase::g_DbgDumpStack)
+        {
+            StackDump(stVal, stOpt);
+            m_vRPN.AsciiDump();
+        }
     } // while (true)
 
     if (ParserBase::g_DbgDumpCmdCode)
-      m_vRPN.AsciiDump();
+        m_vRPN.AsciiDump();
 
-    if (m_nIfElseCounter>0)
-      Error(ecMISSING_ELSE_CLAUSE);
+    if (m_nIfElseCounter > 0)
+        Error(ecMISSING_ELSE_CLAUSE);
 
     // get the last value (= final result) from the stack
-    MUP_ASSERT(stArgCount.size()==1);
+    MUP_ASSERT(stArgCount.size() == 1);
     m_nFinalResultIdx = stArgCount.top();
-    if (m_nFinalResultIdx==0)
-      Error(ecINTERNAL_ERROR, 9);
+    if (m_nFinalResultIdx == 0)
+        Error(ecINTERNAL_ERROR, 9);
 
-    if (stVal.size()==0)
-      Error(ecEMPTY_EXPRESSION);
+    if (stVal.size() == 0)
+        Error(ecEMPTY_EXPRESSION);
 
-    if (stVal.top().GetType()!=tpDBL)
-      Error(ecSTR_RESULT);
+    if (stVal.top().GetType() != tpDBL)
+        Error(ecSTR_RESULT);
 
     m_vStackBuffer.resize(m_vRPN.GetMaxStackSize() * s_MaxNumOpenMPThreads);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief One of the two main parse functions.
-      \sa ParseCmdCode(...)
-
-    Parse expression from input string. Perform syntax checking and create 
-    bytecode. After parsing the string and creating the bytecode the function 
-    pointer #m_pParseFormula will be changed to the second parse routine the 
-    uses bytecode instead of string parsing.
-  */
-  value_type ParserBase::ParseString() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief One of the two main parse functions.
+    \sa ParseCmdCode(...)
+
+  Parse expression from input string. Perform syntax checking and create
+  bytecode. After parsing the string and creating the bytecode the function
+  pointer #m_pParseFormula will be changed to the second parse routine the
+  uses bytecode instead of string parsing.
+*/
+value_type ParserBase::ParseString() const
+{
     try
     {
-      CreateRPN();
-      m_pParseFormula = &ParserBase::ParseCmdCode;
-      return (this->*m_pParseFormula)(); 
+        CreateRPN();
+        m_pParseFormula = &ParserBase::ParseCmdCode;
+        return (this->*m_pParseFormula)();
     }
-    catch(ParserError &exc)
+    catch (ParserError& exc)
     {
-      exc.SetFormula(m_pTokenReader->GetExpr());
-      throw;
+        exc.SetFormula(m_pTokenReader->GetExpr());
+        throw;
     }
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Create an error containing the parse error position.
+//---------------------------------------------------------------------------
+/** \brief Create an error containing the parse error position.
 
-    This function will create an Parser Exception object containing the error text and
-    its position.
+  This function will create an Parser Exception object containing the error text and
+  its position.
 
-    \param a_iErrc [in] The error code of type #EErrorCodes.
-    \param a_iPos [in] The position where the error was detected.
-    \param a_strTok [in] The token string representation associated with the error.
-    \throw ParserException always throws thats the only purpose of this function.
-  */
-  void  ParserBase::Error(EErrorCodes a_iErrc, int a_iPos, const string_type &a_sTok) const
-  {
+  \param a_iErrc [in] The error code of type #EErrorCodes.
+  \param a_iPos [in] The position where the error was detected.
+  \param a_strTok [in] The token string representation associated with the error.
+  \throw ParserException always throws thats the only purpose of this function.
+*/
+void ParserBase::Error(EErrorCodes a_iErrc, int a_iPos, const string_type& a_sTok) const
+{
     throw exception_type(a_iErrc, a_sTok, m_pTokenReader->GetExpr(), a_iPos);
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Clear all user defined variables.
-      \throw nothrow
+//------------------------------------------------------------------------------
+/** \brief Clear all user defined variables.
+    \throw nothrow
 
-      Resets the parser to string parsing mode by calling #ReInit.
-  */
-  void ParserBase::ClearVar()
-  {
+    Resets the parser to string parsing mode by calling #ReInit.
+*/
+void ParserBase::ClearVar()
+{
     m_VarDef.clear();
     ReInit();
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Remove a variable from internal storage.
-      \throw nothrow
+//------------------------------------------------------------------------------
+/** \brief Remove a variable from internal storage.
+    \throw nothrow
 
-      Removes a variable if it exists. If the Variable does not exist nothing will be done.
-  */
-  void ParserBase::RemoveVar(const string_type &a_strVarName)
-  {
+    Removes a variable if it exists. If the Variable does not exist nothing will be done.
+*/
+void ParserBase::RemoveVar(const string_type& a_strVarName)
+{
     varmap_type::iterator item = m_VarDef.find(a_strVarName);
-    if (item!=m_VarDef.end())
+    if (item != m_VarDef.end())
     {
-      m_VarDef.erase(item);
-      ReInit();
+        m_VarDef.erase(item);
+        ReInit();
     }
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Clear all functions.
-      \post Resets the parser to string parsing mode.
-      \throw nothrow
-  */
-  void ParserBase::ClearFun()
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Clear all functions.
+    \post Resets the parser to string parsing mode.
+    \throw nothrow
+*/
+void ParserBase::ClearFun()
+{
     m_FunDef.clear();
     ReInit();
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Clear all user defined constants.
+//------------------------------------------------------------------------------
+/** \brief Clear all user defined constants.
 
-      Both numeric and string constants will be removed from the internal storage.
-      \post Resets the parser to string parsing mode.
-      \throw nothrow
-  */
-  void ParserBase::ClearConst()
-  {
+    Both numeric and string constants will be removed from the internal storage.
+    \post Resets the parser to string parsing mode.
+    \throw nothrow
+*/
+void ParserBase::ClearConst()
+{
     m_ConstDef.clear();
     m_StrVarDef.clear();
     ReInit();
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Clear all user defined postfix operators.
-      \post Resets the parser to string parsing mode.
-      \throw nothrow
-  */
-  void ParserBase::ClearPostfixOprt()
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Clear all user defined postfix operators.
+    \post Resets the parser to string parsing mode.
+    \throw nothrow
+*/
+void ParserBase::ClearPostfixOprt()
+{
     m_PostOprtDef.clear();
     ReInit();
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Clear all user defined binary operators.
-      \post Resets the parser to string parsing mode.
-      \throw nothrow
-  */
-  void ParserBase::ClearOprt()
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Clear all user defined binary operators.
+    \post Resets the parser to string parsing mode.
+    \throw nothrow
+*/
+void ParserBase::ClearOprt()
+{
     m_OprtDef.clear();
     ReInit();
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Clear the user defined Prefix operators. 
-      \post Resets the parser to string parser mode.
-      \throw nothrow
-  */
-  void ParserBase::ClearInfixOprt()
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Clear the user defined Prefix operators.
+    \post Resets the parser to string parser mode.
+    \throw nothrow
+*/
+void ParserBase::ClearInfixOprt()
+{
     m_InfixOprtDef.clear();
     ReInit();
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Enable or disable the formula optimization feature. 
-      \post Resets the parser to string parser mode.
-      \throw nothrow
-  */
-  void ParserBase::EnableOptimizer(bool a_bIsOn)
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Enable or disable the formula optimization feature.
+    \post Resets the parser to string parser mode.
+    \throw nothrow
+*/
+void ParserBase::EnableOptimizer(bool a_bIsOn)
+{
     m_vRPN.EnableOptimizer(a_bIsOn);
     ReInit();
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Enable the dumping of bytecode and stack content on the console. 
-      \param bDumpCmd Flag to enable dumping of the current bytecode to the console.
-      \param bDumpStack Flag to enable dumping of the stack content is written to the console.
+//---------------------------------------------------------------------------
+/** \brief Enable the dumping of bytecode and stack content on the console.
+    \param bDumpCmd Flag to enable dumping of the current bytecode to the console.
+    \param bDumpStack Flag to enable dumping of the stack content is written to the console.
 
-     This function is for debug purposes only!
-  */
-  void ParserBase::EnableDebugDump(bool bDumpCmd, bool bDumpStack)
-  {
+   This function is for debug purposes only!
+*/
+void ParserBase::EnableDebugDump(bool bDumpCmd, bool bDumpStack)
+{
     ParserBase::g_DbgDumpCmdCode = bDumpCmd;
-    ParserBase::g_DbgDumpStack   = bDumpStack;
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Enable or disable the built in binary operators.
-      \throw nothrow
-      \sa m_bBuiltInOp, ReInit()
-
-    If you disable the built in binary operators there will be no binary operators
-    defined. Thus you must add them manually one by one. It is not possible to
-    disable built in operators selectively. This function will Reinitialize the
-    parser by calling ReInit().
-  */
-  void ParserBase::EnableBuiltInOprt(bool a_bIsOn)
-  {
+    ParserBase::g_DbgDumpStack = bDumpStack;
+}
+
+//------------------------------------------------------------------------------
+/** \brief Enable or disable the built in binary operators.
+    \throw nothrow
+    \sa m_bBuiltInOp, ReInit()
+
+  If you disable the built in binary operators there will be no binary operators
+  defined. Thus you must add them manually one by one. It is not possible to
+  disable built in operators selectively. This function will Reinitialize the
+  parser by calling ReInit().
+*/
+void ParserBase::EnableBuiltInOprt(bool a_bIsOn)
+{
     m_bBuiltInOp = a_bIsOn;
     ReInit();
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Query status of built in variables.
-      \return #m_bBuiltInOp; true if built in operators are enabled.
-      \throw nothrow
-  */
-  bool ParserBase::HasBuiltInOprt() const
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Query status of built in variables.
+    \return #m_bBuiltInOp; true if built in operators are enabled.
+    \throw nothrow
+*/
+bool ParserBase::HasBuiltInOprt() const
+{
     return m_bBuiltInOp;
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Get the argument separator character. 
-  */
-  char_type ParserBase::GetArgSep() const
-  {
+//------------------------------------------------------------------------------
+/** \brief Get the argument separator character.
+ */
+char_type ParserBase::GetArgSep() const
+{
     return m_pTokenReader->GetArgSep();
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Set argument separator. 
-      \param cArgSep the argument separator character.
-  */
-  void ParserBase::SetArgSep(char_type cArgSep)
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Set argument separator.
+    \param cArgSep the argument separator character.
+*/
+void ParserBase::SetArgSep(char_type cArgSep)
+{
     m_pTokenReader->SetArgSep(cArgSep);
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Dump stack content. 
+//------------------------------------------------------------------------------
+/** \brief Dump stack content.
 
-      This function is used for debugging only.
-  */
-  void ParserBase::StackDump(const ParserStack<token_type> &a_stVal, 
-                             const ParserStack<token_type> &a_stOprt) const
-  {
-    ParserStack<token_type> stOprt(a_stOprt), 
-                            stVal(a_stVal);
+    This function is used for debugging only.
+*/
+void ParserBase::StackDump(const ParserStack<token_type>& a_stVal, const ParserStack<token_type>& a_stOprt) const
+{
+    ParserStack<token_type> stOprt(a_stOprt), stVal(a_stVal);
 
     mu::console() << _T("\nValue stack:\n");
-    while ( !stVal.empty() ) 
+    while (!stVal.empty())
     {
-      token_type val = stVal.pop();
-      if (val.GetType()==tpSTR)
-        mu::console() << _T(" \"") << val.GetAsString() << _T("\" ");
-      else
-        mu::console() << _T(" ") << val.GetVal() << _T(" ");
+        token_type val = stVal.pop();
+        if (val.GetType() == tpSTR)
+            mu::console() << _T(" \"") << val.GetAsString() << _T("\" ");
+        else
+            mu::console() << _T(" ") << val.GetVal() << _T(" ");
     }
     mu::console() << "\nOperator stack:\n";
 
-    while ( !stOprt.empty() )
+    while (!stOprt.empty())
     {
-      if (stOprt.top().GetCode()<=cmASSIGN) 
-      {
-        mu::console() << _T("OPRT_INTRNL \"")
-                      << ParserBase::c_DefaultOprt[stOprt.top().GetCode()] 
-                      << _T("\" \n");
-      }
-      else
-      {
-        switch(stOprt.top().GetCode())
+        if (stOprt.top().GetCode() <= cmASSIGN)
         {
-        case cmVAR:   mu::console() << _T("VAR\n");  break;
-        case cmVAL:   mu::console() << _T("VAL\n");  break;
-        case cmFUNC:  mu::console() << _T("FUNC \"") 
-                                    << stOprt.top().GetAsString() 
-                                    << _T("\"\n");   break;
-        case cmFUNC_BULK:  mu::console() << _T("FUNC_BULK \"") 
-                                         << stOprt.top().GetAsString() 
-                                         << _T("\"\n");   break;
-        case cmOPRT_INFIX: mu::console() << _T("OPRT_INFIX \"")
-                                         << stOprt.top().GetAsString() 
-                                         << _T("\"\n");      break;
-        case cmOPRT_BIN:   mu::console() << _T("OPRT_BIN \"") 
-                                         << stOprt.top().GetAsString() 
-                                         << _T("\"\n");           break;
-        case cmFUNC_STR: mu::console() << _T("FUNC_STR\n");       break;
-        case cmEND:      mu::console() << _T("END\n");            break;
-        case cmUNKNOWN:  mu::console() << _T("UNKNOWN\n");        break;
-        case cmBO:       mu::console() << _T("BRACKET \"(\"\n");  break;
-        case cmBC:       mu::console() << _T("BRACKET \")\"\n");  break;
-        case cmIF:       mu::console() << _T("IF\n");  break;
-        case cmELSE:     mu::console() << _T("ELSE\n");  break;
-        case cmENDIF:    mu::console() << _T("ENDIF\n");  break;
-        default:         mu::console() << stOprt.top().GetCode() << _T(" ");  break;
+            mu::console() << _T("OPRT_INTRNL \"") << ParserBase::c_DefaultOprt[stOprt.top().GetCode()] << _T("\" \n");
+        }
+        else
+        {
+            switch (stOprt.top().GetCode())
+            {
+                case cmVAR:
+                    mu::console() << _T("VAR\n");
+                    break;
+                case cmVAL:
+                    mu::console() << _T("VAL\n");
+                    break;
+                case cmFUNC:
+                    mu::console() << _T("FUNC \"") << stOprt.top().GetAsString() << _T("\"\n");
+                    break;
+                case cmFUNC_BULK:
+                    mu::console() << _T("FUNC_BULK \"") << stOprt.top().GetAsString() << _T("\"\n");
+                    break;
+                case cmOPRT_INFIX:
+                    mu::console() << _T("OPRT_INFIX \"") << stOprt.top().GetAsString() << _T("\"\n");
+                    break;
+                case cmOPRT_BIN:
+                    mu::console() << _T("OPRT_BIN \"") << stOprt.top().GetAsString() << _T("\"\n");
+                    break;
+                case cmFUNC_STR:
+                    mu::console() << _T("FUNC_STR\n");
+                    break;
+                case cmEND:
+                    mu::console() << _T("END\n");
+                    break;
+                case cmUNKNOWN:
+                    mu::console() << _T("UNKNOWN\n");
+                    break;
+                case cmBO:
+                    mu::console() << _T("BRACKET \"(\"\n");
+                    break;
+                case cmBC:
+                    mu::console() << _T("BRACKET \")\"\n");
+                    break;
+                case cmIF:
+                    mu::console() << _T("IF\n");
+                    break;
+                case cmELSE:
+                    mu::console() << _T("ELSE\n");
+                    break;
+                case cmENDIF:
+                    mu::console() << _T("ENDIF\n");
+                    break;
+                default:
+                    mu::console() << stOprt.top().GetCode() << _T(" ");
+                    break;
+            }
         }
-      }	
-      stOprt.pop();
+        stOprt.pop();
     }
 
     mu::console() << dec << endl;
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Evaluate an expression containing comma separated subexpressions 
-      \param [out] nStackSize The total number of results available
-      \return Pointer to the array containing all expression results
-
-      This member function can be used to retrieve all results of an expression
-      made up of multiple comma separated subexpressions (i.e. "x+y,sin(x),cos(y)")
-  */
-  value_type* ParserBase::Eval(int &nStackSize) const
-  {
-    (this->*m_pParseFormula)(); 
+}
+
+//------------------------------------------------------------------------------
+/** \brief Evaluate an expression containing comma separated subexpressions
+    \param [out] nStackSize The total number of results available
+    \return Pointer to the array containing all expression results
+
+    This member function can be used to retrieve all results of an expression
+    made up of multiple comma separated subexpressions (i.e. "x+y,sin(x),cos(y)")
+*/
+value_type* ParserBase::Eval(int& nStackSize) const
+{
+    (this->*m_pParseFormula)();
     nStackSize = m_nFinalResultIdx;
 
     // (for historic reasons the stack starts at position 1)
     return &m_vStackBuffer[1];
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Return the number of results on the calculation stack. 
-  
-    If the expression contains comma separated subexpressions (i.e. "sin(y), x+y"). 
-    There may be more than one return value. This function returns the number of 
-    available results.
-  */
-  int ParserBase::GetNumResults() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return the number of results on the calculation stack.
+
+  If the expression contains comma separated subexpressions (i.e. "sin(y), x+y").
+  There may be more than one return value. This function returns the number of
+  available results.
+*/
+int ParserBase::GetNumResults() const
+{
     return m_nFinalResultIdx;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Calculate the result.
-
-    A note on const correctness: 
-    I consider it important that Calc is a const function.
-    Due to caching operations Calc changes only the state of internal variables with one exception
-    m_UsedVar this is reset during string parsing and accessible from the outside. Instead of making
-    Calc non const GetUsedVar is non const because it explicitly calls Eval() forcing this update. 
-
-    \pre A formula must be set.
-    \pre Variables must have been set (if needed)
-
-    \sa #m_pParseFormula
-    \return The evaluation result
-    \throw ParseException if no Formula is set or in case of any other error related to the formula.
-  */
-  value_type ParserBase::Eval() const
-  {
-    return (this->*m_pParseFormula)(); 
-  }
-
-  //---------------------------------------------------------------------------
-  void ParserBase::Eval(value_type *results, int nBulkSize)
-  {
-/* <ibg 2014-09-24/> Commented because it is making a unit test impossible
-
-    // Parallelization does not make sense for fewer than 10000 computations 
-    // due to thread creation overhead. If the bulk size is below 2000
-    // computation is refused. 
-    if (nBulkSize<2000)
-    {
-      throw ParserError(ecUNREASONABLE_NUMBER_OF_COMPUTATIONS);
-    }
+}
+
+//---------------------------------------------------------------------------
+/** \brief Calculate the result.
+
+  A note on const correctness:
+  I consider it important that Calc is a const function.
+  Due to caching operations Calc changes only the state of internal variables with one exception
+  m_UsedVar this is reset during string parsing and accessible from the outside. Instead of making
+  Calc non const GetUsedVar is non const because it explicitly calls Eval() forcing this update.
+
+  \pre A formula must be set.
+  \pre Variables must have been set (if needed)
+
+  \sa #m_pParseFormula
+  \return The evaluation result
+  \throw ParseException if no Formula is set or in case of any other error related to the formula.
 */
+value_type ParserBase::Eval() const
+{
+    return (this->*m_pParseFormula)();
+}
+
+//---------------------------------------------------------------------------
+void ParserBase::Eval(value_type* results, int nBulkSize)
+{
+    /* <ibg 2014-09-24/> Commented because it is making a unit test impossible
+
+        // Parallelization does not make sense for fewer than 10000 computations
+        // due to thread creation overhead. If the bulk size is below 2000
+        // computation is refused.
+        if (nBulkSize<2000)
+        {
+          throw ParserError(ecUNREASONABLE_NUMBER_OF_COMPUTATIONS);
+        }
+    */
     CreateRPN();
 
     int i = 0;
 
 #ifdef MUP_USE_OPENMP
-//#define DEBUG_OMP_STUFF
-    #ifdef DEBUG_OMP_STUFF
-    int *pThread = new int[nBulkSize];
-    int *pIdx = new int[nBulkSize];
-    #endif
+    //#define DEBUG_OMP_STUFF
+#ifdef DEBUG_OMP_STUFF
+    int* pThread = new int[nBulkSize];
+    int* pIdx = new int[nBulkSize];
+#endif
 
     int nMaxThreads = std::min(omp_get_max_threads(), s_MaxNumOpenMPThreads);
-	int nThreadID = 0, ct = 0;
+    int nThreadID = 0, ct = 0;
     omp_set_num_threads(nMaxThreads);
 
-    #pragma omp parallel for schedule(static, nBulkSize/nMaxThreads) private(nThreadID)
-    for (i=0; i<nBulkSize; ++i)
+#pragma omp parallel for schedule(static, nBulkSize / nMaxThreads) private(nThreadID)
+    for (i = 0; i < nBulkSize; ++i)
     {
-      nThreadID = omp_get_thread_num();
-      results[i] = ParseCmdCodeBulk(i, nThreadID);
-
-      #ifdef DEBUG_OMP_STUFF
-      #pragma omp critical
-      {
-        pThread[ct] = nThreadID;  
-        pIdx[ct] = i; 
-        ct++;
-      }
-      #endif
+        nThreadID = omp_get_thread_num();
+        results[i] = ParseCmdCodeBulk(i, nThreadID);
+
+#ifdef DEBUG_OMP_STUFF
+#pragma omp critical
+        {
+            pThread[ct] = nThreadID;
+            pIdx[ct] = i;
+            ct++;
+        }
+#endif
     }
 
 #ifdef DEBUG_OMP_STUFF
-    FILE *pFile = fopen("bulk_dbg.txt", "w");
-    for (i=0; i<nBulkSize; ++i)
+    FILE* pFile = fopen("bulk_dbg.txt", "w");
+    for (i = 0; i < nBulkSize; ++i)
     {
-      fprintf(pFile, "idx: %d  thread: %d \n", pIdx[i], pThread[i]);
+        fprintf(pFile, "idx: %d  thread: %d \n", pIdx[i], pThread[i]);
     }
-    
-    delete [] pIdx;
-    delete [] pThread;
+
+    delete[] pIdx;
+    delete[] pThread;
 
     fclose(pFile);
 #endif
 
 #else
-    for (i=0; i<nBulkSize; ++i)
+    for (i = 0; i < nBulkSize; ++i)
     {
-      results[i] = ParseCmdCodeBulk(i, 0);
+        results[i] = ParseCmdCodeBulk(i, 0);
     }
 #endif
-
-  }
+}
 } // namespace mu
diff --git a/ext_libs/muparser/muParserBase.h b/ext_libs/muparser/muParserBase.h
old mode 100755
new mode 100644
index beb15bb1..f9932b26
--- a/ext_libs/muparser/muParserBase.h
+++ b/ext_libs/muparser/muParserBase.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef MU_PARSER_BASE_H
 #define MU_PARSER_BASE_H
@@ -41,7 +41,6 @@
 #include "muParserBytecode.h"
 #include "muParserError.h"
 
-
 namespace mu
 {
 /** \file
@@ -52,26 +51,25 @@ namespace mu
 /** \brief Mathematical expressions parser (base parser engine).
     \author (C) 2013 Ingo Berg
 
-  This is the implementation of a bytecode based mathematical expressions parser. 
-  The formula will be parsed from string and converted into a bytecode. 
+  This is the implementation of a bytecode based mathematical expressions parser.
+  The formula will be parsed from string and converted into a bytecode.
   Future calculations will be done with the bytecode instead the formula string
-  resulting in a significant performance increase. 
-  Complementary to a set of internally implemented functions the parser is able to handle 
-  user defined functions and variables. 
+  resulting in a significant performance increase.
+  Complementary to a set of internally implemented functions the parser is able to handle
+  user defined functions and variables.
 */
-class ParserBase 
+class ParserBase
 {
-friend class ParserTokenReader;
+    friend class ParserTokenReader;
 
 private:
+    /** \brief Typedef for the parse functions.
 
-    /** \brief Typedef for the parse functions. 
-    
       The parse function do the actual work. The parser exchanges
-      the function pointer to the parser function depending on 
+      the function pointer to the parser function depending on
       which state it is in. (i.e. bytecode parser vs. string parser)
     */
-    typedef value_type (ParserBase::*ParseFunction)() const;  
+    typedef value_type (ParserBase::*ParseFunction)() const;
 
     /** \brief Type used for storing an array of values. */
     typedef std::vector<value_type> valbuf_type;
@@ -81,70 +79,70 @@ friend class ParserTokenReader;
 
     /** \brief Typedef for the token reader. */
     typedef ParserTokenReader token_reader_type;
-    
+
     /** \brief Type used for parser tokens. */
     typedef ParserToken<value_type, string_type> token_type;
 
     /** \brief Maximum number of threads spawned by OpenMP when using the bulk mode. */
     static const int s_MaxNumOpenMPThreads = 16;
 
- public:
+public:
+    /** \brief Type of the error class.
 
-    /** \brief Type of the error class. 
-    
       Included for backwards compatibility.
     */
     typedef ParserError exception_type;
 
     static void EnableDebugDump(bool bDumpCmd, bool bDumpStack);
 
-    ParserBase(); 
-    ParserBase(const ParserBase &a_Parser);
-    ParserBase& operator=(const ParserBase &a_Parser);
+    ParserBase();
+    ParserBase(const ParserBase& a_Parser);
+    ParserBase& operator=(const ParserBase& a_Parser);
 
     virtual ~ParserBase();
-    
-	  value_type  Eval() const;
-    value_type* Eval(int &nStackSize) const;
-    void Eval(value_type *results, int nBulkSize);
+
+    value_type Eval() const;
+    value_type* Eval(int& nStackSize) const;
+    void Eval(value_type* results, int nBulkSize);
 
     int GetNumResults() const;
 
-    void SetExpr(const string_type &a_sExpr);
-    void SetVarFactory(facfun_type a_pFactory, void *pUserData = NULL);
+    void SetExpr(const string_type& a_sExpr);
+    void SetVarFactory(facfun_type a_pFactory, void* pUserData = NULL);
 
     void SetDecSep(char_type cDecSep);
     void SetThousandsSep(char_type cThousandsSep = 0);
     void ResetLocale();
 
-    void EnableOptimizer(bool a_bIsOn=true);
-    void EnableBuiltInOprt(bool a_bIsOn=true);
+    void EnableOptimizer(bool a_bIsOn = true);
+    void EnableBuiltInOprt(bool a_bIsOn = true);
 
     bool HasBuiltInOprt() const;
     void AddValIdent(identfun_type a_pCallback);
 
-    /** \fn void mu::ParserBase::DefineFun(const string_type &a_strName, fun_type0 a_pFun, bool a_bAllowOpt = true) 
+    /** \fn void mu::ParserBase::DefineFun(const string_type &a_strName, fun_type0 a_pFun, bool a_bAllowOpt = true)
         \brief Define a parser function without arguments.
         \param a_strName Name of the function
         \param a_pFun Pointer to the callback function
         \param a_bAllowOpt A flag indicating this function may be optimized
     */
     template<typename T>
-    void DefineFun(const string_type &a_strName, T a_pFun, bool a_bAllowOpt = true)
+    void DefineFun(const string_type& a_strName, T a_pFun, bool a_bAllowOpt = true)
     {
-      AddCallback( a_strName, ParserCallback(a_pFun, a_bAllowOpt), m_FunDef, ValidNameChars() );
+        AddCallback(a_strName, ParserCallback(a_pFun, a_bAllowOpt), m_FunDef, ValidNameChars());
     }
 
-    void DefineOprt(const string_type &a_strName, 
-                    fun_type2 a_pFun, 
-                    unsigned a_iPri=0, 
+    void DefineOprt(const string_type& a_strName,
+                    fun_type2 a_pFun,
+                    unsigned a_iPri = 0,
                     EOprtAssociativity a_eAssociativity = oaLEFT,
                     bool a_bAllowOpt = false);
-    void DefineConst(const string_type &a_sName, value_type a_fVal);
-    void DefineStrConst(const string_type &a_sName, const string_type &a_strVal);
-    void DefineVar(const string_type &a_sName, value_type *a_fVar);
-    void DefinePostfixOprt(const string_type &a_strFun, fun_type1 a_pOprt, bool a_bAllowOpt=true);
-    void DefineInfixOprt(const string_type &a_strName, fun_type1 a_pOprt, int a_iPrec=prINFIX, bool a_bAllowOpt=true);
+    void DefineConst(const string_type& a_sName, value_type a_fVal);
+    void DefineStrConst(const string_type& a_sName, const string_type& a_strVal);
+    void DefineVar(const string_type& a_sName, value_type* a_fVar);
+    void DefinePostfixOprt(const string_type& a_strFun, fun_type1 a_pOprt, bool a_bAllowOpt = true);
+    void
+      DefineInfixOprt(const string_type& a_strName, fun_type1 a_pOprt, int a_iPrec = prINFIX, bool a_bAllowOpt = true);
 
     // Clear user defined variables, constants or functions
     void ClearVar();
@@ -153,8 +151,8 @@ friend class ParserTokenReader;
     void ClearInfixOprt();
     void ClearPostfixOprt();
     void ClearOprt();
-    
-    void RemoveVar(const string_type &a_strVarName);
+
+    void RemoveVar(const string_type& a_strVarName);
     const varmap_type& GetUsedVar() const;
     const varmap_type& GetVar() const;
     const valmap_type& GetConst() const;
@@ -162,10 +160,10 @@ friend class ParserTokenReader;
     const funmap_type& GetFunDef() const;
     string_type GetVersion(EParserVersionInfo eInfo = pviFULL) const;
 
-    const char_type ** GetOprtDef() const;
-    void DefineNameChars(const char_type *a_szCharset);
-    void DefineOprtChars(const char_type *a_szCharset);
-    void DefineInfixOprtChars(const char_type *a_szCharset);
+    const char_type** GetOprtDef() const;
+    void DefineNameChars(const char_type* a_szCharset);
+    void DefineOprtChars(const char_type* a_szCharset);
+    void DefineInfixOprtChars(const char_type* a_szCharset);
 
     const char_type* ValidNameChars() const;
     const char_type* ValidOprtChars() const;
@@ -173,24 +171,23 @@ friend class ParserTokenReader;
 
     void SetArgSep(char_type cArgSep);
     char_type GetArgSep() const;
-    
-    void  Error(EErrorCodes a_iErrc, 
-                int a_iPos = (int)mu::string_type::npos, 
-                const string_type &a_strTok = string_type() ) const;
 
- protected:
-	  
+    void Error(EErrorCodes a_iErrc,
+               int a_iPos = (int)mu::string_type::npos,
+               const string_type& a_strTok = string_type()) const;
+
+protected:
     void Init();
 
     virtual void InitCharSets() = 0;
     virtual void InitFun() = 0;
     virtual void InitConst() = 0;
-    virtual void InitOprt() = 0; 
+    virtual void InitOprt() = 0;
 
-    virtual void OnDetectVar(string_type *pExpr, int &nStart, int &nEnd);
+    virtual void OnDetectVar(string_type* pExpr, int& nStart, int& nEnd);
 
-    static const char_type *c_DefaultOprt[]; 
-    static std::locale s_locale;  ///< The locale used by the parser
+    static const char_type* c_DefaultOprt[];
+    static std::locale s_locale; ///< The locale used by the parser
     static bool g_DbgDumpCmdCode;
     static bool g_DbgDumpStack;
 
@@ -199,112 +196,91 @@ friend class ParserTokenReader;
     class change_dec_sep : public std::numpunct<TChar>
     {
     public:
-      
-      explicit change_dec_sep(char_type cDecSep, char_type cThousandsSep = 0, int nGroup = 3)
-        :std::numpunct<TChar>()
-        ,m_nGroup(nGroup)
-        ,m_cDecPoint(cDecSep)
-        ,m_cThousandsSep(cThousandsSep)
-      {}
-      
+        explicit change_dec_sep(char_type cDecSep, char_type cThousandsSep = 0, int nGroup = 3) :
+            std::numpunct<TChar>(), m_nGroup(nGroup), m_cDecPoint(cDecSep), m_cThousandsSep(cThousandsSep)
+        {
+        }
+
     protected:
-      
-      virtual char_type do_decimal_point() const
-      {
-        return m_cDecPoint;
-      }
-
-      virtual char_type do_thousands_sep() const
-      {
-        return m_cThousandsSep;
-      }
-
-      virtual std::string do_grouping() const 
-      { 
-		// fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4
-		// courtesy of Jens Bartsch
-		// original code:
-		//        return std::string(1, (char)m_nGroup); 
-		// new code:
-		return std::string(1, (char)(m_cThousandsSep > 0 ? m_nGroup : CHAR_MAX));
-      }
+        virtual char_type do_decimal_point() const { return m_cDecPoint; }
 
-    private:
+        virtual char_type do_thousands_sep() const { return m_cThousandsSep; }
 
-      int m_nGroup;
-      char_type m_cDecPoint;  
-      char_type m_cThousandsSep;
-    };
+        virtual std::string do_grouping() const
+        {
+            // fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4
+            // courtesy of Jens Bartsch
+            // original code:
+            //        return std::string(1, (char)m_nGroup);
+            // new code:
+            return std::string(1, (char)(m_cThousandsSep > 0 ? m_nGroup : CHAR_MAX));
+        }
 
- private:
+    private:
+        int m_nGroup;
+        char_type m_cDecPoint;
+        char_type m_cThousandsSep;
+    };
 
-    void Assign(const ParserBase &a_Parser);
+private:
+    void Assign(const ParserBase& a_Parser);
     void InitTokenReader();
     void ReInit() const;
 
-    void AddCallback( const string_type &a_strName, 
-                      const ParserCallback &a_Callback, 
-                      funmap_type &a_Storage,
-                      const char_type *a_szCharSet );
+    void AddCallback(const string_type& a_strName,
+                     const ParserCallback& a_Callback,
+                     funmap_type& a_Storage,
+                     const char_type* a_szCharSet);
 
-    void ApplyRemainingOprt(ParserStack<token_type> &a_stOpt,
-                                ParserStack<token_type> &a_stVal) const;
-    void ApplyBinOprt(ParserStack<token_type> &a_stOpt,
-                      ParserStack<token_type> &a_stVal) const;
+    void ApplyRemainingOprt(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal) const;
+    void ApplyBinOprt(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal) const;
 
-    void ApplyIfElse(ParserStack<token_type> &a_stOpt,
-                     ParserStack<token_type> &a_stVal) const;
+    void ApplyIfElse(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal) const;
 
-    void ApplyFunc(ParserStack<token_type> &a_stOpt,
-                   ParserStack<token_type> &a_stVal, 
-                   int iArgCount) const; 
+    void ApplyFunc(ParserStack<token_type>& a_stOpt, ParserStack<token_type>& a_stVal, int iArgCount) const;
 
-    token_type ApplyStrFunc(const token_type &a_FunTok,
-                            const std::vector<token_type> &a_vArg) const;
+    token_type ApplyStrFunc(const token_type& a_FunTok, const std::vector<token_type>& a_vArg) const;
 
-    int GetOprtPrecedence(const token_type &a_Tok) const;
-    EOprtAssociativity GetOprtAssociativity(const token_type &a_Tok) const;
+    int GetOprtPrecedence(const token_type& a_Tok) const;
+    EOprtAssociativity GetOprtAssociativity(const token_type& a_Tok) const;
 
     void CreateRPN() const;
 
-    value_type ParseString() const; 
+    value_type ParseString() const;
     value_type ParseCmdCode() const;
     value_type ParseCmdCodeBulk(int nOffset, int nThreadID) const;
 
-    void  CheckName(const string_type &a_strName, const string_type &a_CharSet) const;
-    void  CheckOprt(const string_type &a_sName,
-                    const ParserCallback &a_Callback,
-                    const string_type &a_szCharSet) const;
+    void CheckName(const string_type& a_strName, const string_type& a_CharSet) const;
+    void CheckOprt(const string_type& a_sName, const ParserCallback& a_Callback, const string_type& a_szCharSet) const;
 
-    void StackDump(const ParserStack<token_type > &a_stVal, 
-                   const ParserStack<token_type > &a_stOprt) const;
+    void StackDump(const ParserStack<token_type>& a_stVal, const ParserStack<token_type>& a_stOprt) const;
+
+    /** \brief Pointer to the parser function.
 
-    /** \brief Pointer to the parser function. 
-    
       Eval() calls the function whose address is stored there.
     */
-    mutable ParseFunction  m_pParseFormula;
-    mutable ParserByteCode m_vRPN;        ///< The Bytecode class.
-    mutable stringbuf_type  m_vStringBuf; ///< String buffer, used for storing string function arguments
-    stringbuf_type  m_vStringVarBuf;
+    mutable ParseFunction m_pParseFormula;
+    mutable ParserByteCode m_vRPN;       ///< The Bytecode class.
+    mutable stringbuf_type m_vStringBuf; ///< String buffer, used for storing string function arguments
+    stringbuf_type m_vStringVarBuf;
 
     std::auto_ptr<token_reader_type> m_pTokenReader; ///< Managed pointer to the token reader object.
 
-    funmap_type  m_FunDef;         ///< Map of function names and pointers.
-    funmap_type  m_PostOprtDef;    ///< Postfix operator callbacks
-    funmap_type  m_InfixOprtDef;   ///< unary infix operator.
-    funmap_type  m_OprtDef;        ///< Binary operator callbacks
-    valmap_type  m_ConstDef;       ///< user constants.
-    strmap_type  m_StrVarDef;      ///< user defined string constants
-    varmap_type  m_VarDef;         ///< user defind variables.
+    funmap_type m_FunDef;       ///< Map of function names and pointers.
+    funmap_type m_PostOprtDef;  ///< Postfix operator callbacks
+    funmap_type m_InfixOprtDef; ///< unary infix operator.
+    funmap_type m_OprtDef;      ///< Binary operator callbacks
+    valmap_type m_ConstDef;     ///< user constants.
+    strmap_type m_StrVarDef;    ///< user defined string constants
+    varmap_type m_VarDef;       ///< user defind variables.
 
-    bool m_bBuiltInOp;             ///< Flag that can be used for switching built in operators on and off
+    bool m_bBuiltInOp; ///< Flag that can be used for switching built in operators on and off
 
     string_type m_sNameChars;      ///< Charset for names
     string_type m_sOprtChars;      ///< Charset for postfix/ binary operator tokens
     string_type m_sInfixOprtChars; ///< Charset for infix operator tokens
-    
-    mutable int m_nIfElseCounter;  ///< Internal counter for keeping track of nested if-then-else clauses
+
+    mutable int m_nIfElseCounter; ///< Internal counter for keeping track of nested if-then-else clauses
 
     // items merely used for caching state information
     mutable valbuf_type m_vStackBuffer; ///< This is merely a buffer used for the stack in the cmd parsing routine
@@ -314,4 +290,3 @@ friend class ParserTokenReader;
 } // namespace mu
 
 #endif
-
diff --git a/ext_libs/muparser/muParserBytecode.cpp b/ext_libs/muparser/muParserBytecode.cpp
old mode 100755
new mode 100644
index 86d99127..2d67f336
--- a/ext_libs/muparser/muParserBytecode.cpp
+++ b/ext_libs/muparser/muParserBytecode.cpp
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "muParserBytecode.h"
@@ -38,334 +38,370 @@
 #include "muParserStack.h"
 #include "muParserTemplateMagic.h"
 
-
 namespace mu
 {
-  //---------------------------------------------------------------------------
-  /** \brief Bytecode default constructor. */
-  ParserByteCode::ParserByteCode()
-    :m_iStackPos(0)
-    ,m_iMaxStackSize(0)
-    ,m_vRPN()
-    ,m_bEnableOptimizer(true)
-  {
+//---------------------------------------------------------------------------
+/** \brief Bytecode default constructor. */
+ParserByteCode::ParserByteCode() : m_iStackPos(0), m_iMaxStackSize(0), m_vRPN(), m_bEnableOptimizer(true)
+{
     m_vRPN.reserve(50);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Copy constructor. 
-    
-      Implemented in Terms of Assign(const ParserByteCode &a_ByteCode)
-  */
-  ParserByteCode::ParserByteCode(const ParserByteCode &a_ByteCode)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Copy constructor.
+
+    Implemented in Terms of Assign(const ParserByteCode &a_ByteCode)
+*/
+ParserByteCode::ParserByteCode(const ParserByteCode& a_ByteCode)
+{
     Assign(a_ByteCode);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Assignment operator.
-    
-      Implemented in Terms of Assign(const ParserByteCode &a_ByteCode)
-  */
-  ParserByteCode& ParserByteCode::operator=(const ParserByteCode &a_ByteCode)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Assignment operator.
+
+    Implemented in Terms of Assign(const ParserByteCode &a_ByteCode)
+*/
+ParserByteCode& ParserByteCode::operator=(const ParserByteCode& a_ByteCode)
+{
     Assign(a_ByteCode);
     return *this;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserByteCode::EnableOptimizer(bool bStat)
-  {
+//---------------------------------------------------------------------------
+void ParserByteCode::EnableOptimizer(bool bStat)
+{
     m_bEnableOptimizer = bStat;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Copy state of another object to this. 
-    
-      \throw nowthrow
-  */
-  void ParserByteCode::Assign(const ParserByteCode &a_ByteCode)
-  {
-    if (this==&a_ByteCode)    
-      return;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Copy state of another object to this.
+
+    \throw nowthrow
+*/
+void ParserByteCode::Assign(const ParserByteCode& a_ByteCode)
+{
+    if (this == &a_ByteCode)
+        return;
 
     m_iStackPos = a_ByteCode.m_iStackPos;
     m_vRPN = a_ByteCode.m_vRPN;
     m_iMaxStackSize = a_ByteCode.m_iMaxStackSize;
-	m_bEnableOptimizer = a_ByteCode.m_bEnableOptimizer;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a Variable pointer to bytecode. 
-      \param a_pVar Pointer to be added.
-      \throw nothrow
-  */
-  void ParserByteCode::AddVar(value_type *a_pVar)
-  {
+    m_bEnableOptimizer = a_ByteCode.m_bEnableOptimizer;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a Variable pointer to bytecode.
+    \param a_pVar Pointer to be added.
+    \throw nothrow
+*/
+void ParserByteCode::AddVar(value_type* a_pVar)
+{
     ++m_iStackPos;
     m_iMaxStackSize = std::max(m_iMaxStackSize, (size_t)m_iStackPos);
 
     // optimization does not apply
     SToken tok;
-    tok.Cmd       = cmVAR;
-    tok.Val.ptr   = a_pVar;
-    tok.Val.data  = 1;
+    tok.Cmd = cmVAR;
+    tok.Val.ptr = a_pVar;
+    tok.Val.data = 1;
     tok.Val.data2 = 0;
     m_vRPN.push_back(tok);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add a Variable pointer to bytecode. 
-
-      Value entries in byte code consist of:
-      <ul>
-        <li>value array position of the value</li>
-        <li>the operator code according to ParserToken::cmVAL</li>
-        <li>the value stored in #mc_iSizeVal number of bytecode entries.</li>
-      </ul>
-
-      \param a_pVal Value to be added.
-      \throw nothrow
-  */
-  void ParserByteCode::AddVal(value_type a_fVal)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add a Variable pointer to bytecode.
+
+    Value entries in byte code consist of:
+    <ul>
+      <li>value array position of the value</li>
+      <li>the operator code according to ParserToken::cmVAL</li>
+      <li>the value stored in #mc_iSizeVal number of bytecode entries.</li>
+    </ul>
+
+    \param a_pVal Value to be added.
+    \throw nothrow
+*/
+void ParserByteCode::AddVal(value_type a_fVal)
+{
     ++m_iStackPos;
     m_iMaxStackSize = std::max(m_iMaxStackSize, (size_t)m_iStackPos);
 
     // If optimization does not apply
     SToken tok;
     tok.Cmd = cmVAL;
-    tok.Val.ptr   = NULL;
-    tok.Val.data  = 0;
+    tok.Val.ptr = NULL;
+    tok.Val.data = 0;
     tok.Val.data2 = a_fVal;
     m_vRPN.push_back(tok);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserByteCode::ConstantFolding(ECmdCode a_Oprt)
-  {
+//---------------------------------------------------------------------------
+void ParserByteCode::ConstantFolding(ECmdCode a_Oprt)
+{
     std::size_t sz = m_vRPN.size();
-    value_type &x = m_vRPN[sz-2].Val.data2,
-               &y = m_vRPN[sz-1].Val.data2;
+    value_type &x = m_vRPN[sz - 2].Val.data2, &y = m_vRPN[sz - 1].Val.data2;
     switch (a_Oprt)
     {
-    case cmLAND: x = (int)x && (int)y; m_vRPN.pop_back(); break;
-    case cmLOR:  x = (int)x || (int)y; m_vRPN.pop_back(); break;
-    case cmLT:   x = x < y;  m_vRPN.pop_back();  break;
-    case cmGT:   x = x > y;  m_vRPN.pop_back();  break;
-    case cmLE:   x = x <= y; m_vRPN.pop_back();  break;
-    case cmGE:   x = x >= y; m_vRPN.pop_back();  break;
-    case cmNEQ:  x = x != y; m_vRPN.pop_back();  break;
-    case cmEQ:   x = x == y; m_vRPN.pop_back();  break;
-    case cmADD:  x = x + y;  m_vRPN.pop_back();  break;
-    case cmSUB:  x = x - y;  m_vRPN.pop_back();  break;
-    case cmMUL:  x = x * y;  m_vRPN.pop_back();  break;
-    case cmDIV: 
+        case cmLAND:
+            x = (int)x && (int)y;
+            m_vRPN.pop_back();
+            break;
+        case cmLOR:
+            x = (int)x || (int)y;
+            m_vRPN.pop_back();
+            break;
+        case cmLT:
+            x = x < y;
+            m_vRPN.pop_back();
+            break;
+        case cmGT:
+            x = x > y;
+            m_vRPN.pop_back();
+            break;
+        case cmLE:
+            x = x <= y;
+            m_vRPN.pop_back();
+            break;
+        case cmGE:
+            x = x >= y;
+            m_vRPN.pop_back();
+            break;
+        case cmNEQ:
+            x = x != y;
+            m_vRPN.pop_back();
+            break;
+        case cmEQ:
+            x = x == y;
+            m_vRPN.pop_back();
+            break;
+        case cmADD:
+            x = x + y;
+            m_vRPN.pop_back();
+            break;
+        case cmSUB:
+            x = x - y;
+            m_vRPN.pop_back();
+            break;
+        case cmMUL:
+            x = x * y;
+            m_vRPN.pop_back();
+            break;
+        case cmDIV:
 
 #if defined(MUP_MATH_EXCEPTIONS)
-        if (y==0)
-          throw ParserError(ecDIV_BY_ZERO, _T("0"));
+            if (y == 0)
+                throw ParserError(ecDIV_BY_ZERO, _T("0"));
 #endif
 
-        x = x / y;   
-        m_vRPN.pop_back();
-        break;
+            x = x / y;
+            m_vRPN.pop_back();
+            break;
 
-    case cmPOW: x = MathImpl<value_type>::Pow(x, y); 
-                m_vRPN.pop_back();
-                break;
+        case cmPOW:
+            x = MathImpl<value_type>::Pow(x, y);
+            m_vRPN.pop_back();
+            break;
 
-    default:
-        break;
+        default:
+            break;
     } // switch opcode
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add an operator identifier to bytecode. 
-    
-      Operator entries in byte code consist of:
-      <ul>
-        <li>value array position of the result</li>
-        <li>the operator code according to ParserToken::ECmdCode</li>
-      </ul>
-
-      \sa  ParserToken::ECmdCode
-  */
-  void ParserByteCode::AddOp(ECmdCode a_Oprt)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add an operator identifier to bytecode.
+
+    Operator entries in byte code consist of:
+    <ul>
+      <li>value array position of the result</li>
+      <li>the operator code according to ParserToken::ECmdCode</li>
+    </ul>
+
+    \sa  ParserToken::ECmdCode
+*/
+void ParserByteCode::AddOp(ECmdCode a_Oprt)
+{
     bool bOptimized = false;
 
     if (m_bEnableOptimizer)
     {
-      std::size_t sz = m_vRPN.size();
-
-      // Check for foldable constants like:
-      //   cmVAL cmVAL cmADD 
-      // where cmADD can stand fopr any binary operator applied to
-      // two constant values.
-      if (sz>=2 && m_vRPN[sz-2].Cmd == cmVAL && m_vRPN[sz-1].Cmd == cmVAL)
-      {
-        ConstantFolding(a_Oprt);
-        bOptimized = true;
-      }
-      else
-      {
-        switch((int)a_Oprt)
+        std::size_t sz = m_vRPN.size();
+
+        // Check for foldable constants like:
+        //   cmVAL cmVAL cmADD
+        // where cmADD can stand fopr any binary operator applied to
+        // two constant values.
+        if (sz >= 2 && m_vRPN[sz - 2].Cmd == cmVAL && m_vRPN[sz - 1].Cmd == cmVAL)
+        {
+            ConstantFolding(a_Oprt);
+            bOptimized = true;
+        }
+        else
         {
-        case  cmPOW:
-              // Optimization for polynomials of low order
-              if (m_vRPN[sz-2].Cmd == cmVAR && m_vRPN[sz-1].Cmd == cmVAL)
-              {
-                if (m_vRPN[sz-1].Val.data2==2)
-                  m_vRPN[sz-2].Cmd = cmVARPOW2;
-                else if (m_vRPN[sz-1].Val.data2==3)
-                  m_vRPN[sz-2].Cmd = cmVARPOW3;
-                else if (m_vRPN[sz-1].Val.data2==4)
-                  m_vRPN[sz-2].Cmd = cmVARPOW4;
-                else
-                  break;
-
-                m_vRPN.pop_back();
-                bOptimized = true;
-              }
-              break;
-
-        case  cmSUB:
-        case  cmADD:
-              // Simple optimization based on pattern recognition for a shitload of different
-              // bytecode combinations of addition/subtraction
-              if ( (m_vRPN[sz-1].Cmd == cmVAR    && m_vRPN[sz-2].Cmd == cmVAL)    ||
-                   (m_vRPN[sz-1].Cmd == cmVAL    && m_vRPN[sz-2].Cmd == cmVAR)    || 
-                   (m_vRPN[sz-1].Cmd == cmVAL    && m_vRPN[sz-2].Cmd == cmVARMUL) ||
-                   (m_vRPN[sz-1].Cmd == cmVARMUL && m_vRPN[sz-2].Cmd == cmVAL)    ||
-                   (m_vRPN[sz-1].Cmd == cmVAR    && m_vRPN[sz-2].Cmd == cmVAR    && m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) ||
-                   (m_vRPN[sz-1].Cmd == cmVAR    && m_vRPN[sz-2].Cmd == cmVARMUL && m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) ||
-                   (m_vRPN[sz-1].Cmd == cmVARMUL && m_vRPN[sz-2].Cmd == cmVAR    && m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) ||
-                   (m_vRPN[sz-1].Cmd == cmVARMUL && m_vRPN[sz-2].Cmd == cmVARMUL && m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) )
-              {
-                assert( (m_vRPN[sz-2].Val.ptr==NULL && m_vRPN[sz-1].Val.ptr!=NULL) ||
-                        (m_vRPN[sz-2].Val.ptr!=NULL && m_vRPN[sz-1].Val.ptr==NULL) || 
-                        (m_vRPN[sz-2].Val.ptr == m_vRPN[sz-1].Val.ptr) );
-
-                m_vRPN[sz-2].Cmd = cmVARMUL;
-                m_vRPN[sz-2].Val.ptr    = (value_type*)((long long)(m_vRPN[sz-2].Val.ptr) | (long long)(m_vRPN[sz-1].Val.ptr));    // variable
-                m_vRPN[sz-2].Val.data2 += ((a_Oprt==cmSUB) ? -1 : 1) * m_vRPN[sz-1].Val.data2;  // offset
-                m_vRPN[sz-2].Val.data  += ((a_Oprt==cmSUB) ? -1 : 1) * m_vRPN[sz-1].Val.data;   // multiplicand
-                m_vRPN.pop_back();
-                bOptimized = true;
-              } 
-              break;
-
-        case  cmMUL:
-              if ( (m_vRPN[sz-1].Cmd == cmVAR && m_vRPN[sz-2].Cmd == cmVAL) ||
-                   (m_vRPN[sz-1].Cmd == cmVAL && m_vRPN[sz-2].Cmd == cmVAR) ) 
-              {
-                m_vRPN[sz-2].Cmd        = cmVARMUL;
-                m_vRPN[sz-2].Val.ptr    = (value_type*)((long long)(m_vRPN[sz-2].Val.ptr) | (long long)(m_vRPN[sz-1].Val.ptr));
-                m_vRPN[sz-2].Val.data   = m_vRPN[sz-2].Val.data2 + m_vRPN[sz-1].Val.data2;
-                m_vRPN[sz-2].Val.data2  = 0;
-                m_vRPN.pop_back();
-                bOptimized = true;
-              } 
-              else if ( (m_vRPN[sz-1].Cmd == cmVAL    && m_vRPN[sz-2].Cmd == cmVARMUL) ||
-                        (m_vRPN[sz-1].Cmd == cmVARMUL && m_vRPN[sz-2].Cmd == cmVAL) )
-              {
-                // Optimization: 2*(3*b+1) or (3*b+1)*2 -> 6*b+2
-                m_vRPN[sz-2].Cmd     = cmVARMUL;
-                m_vRPN[sz-2].Val.ptr = (value_type*)((long long)(m_vRPN[sz-2].Val.ptr) | (long long)(m_vRPN[sz-1].Val.ptr));
-                if (m_vRPN[sz-1].Cmd == cmVAL)
-                {
-                  m_vRPN[sz-2].Val.data  *= m_vRPN[sz-1].Val.data2;
-                  m_vRPN[sz-2].Val.data2 *= m_vRPN[sz-1].Val.data2;
-                }
-                else
-                {
-                  m_vRPN[sz-2].Val.data  = m_vRPN[sz-1].Val.data  * m_vRPN[sz-2].Val.data2;
-                  m_vRPN[sz-2].Val.data2 = m_vRPN[sz-1].Val.data2 * m_vRPN[sz-2].Val.data2;
-                }
-                m_vRPN.pop_back();
-                bOptimized = true;
-              }
-              else if (m_vRPN[sz-1].Cmd == cmVAR && m_vRPN[sz-2].Cmd == cmVAR &&
-                       m_vRPN[sz-1].Val.ptr == m_vRPN[sz-2].Val.ptr)
-              {
-                // Optimization: a*a -> a^2
-                m_vRPN[sz-2].Cmd = cmVARPOW2;
-                m_vRPN.pop_back();
-                bOptimized = true;
-              }
-              break;
+            switch ((int)a_Oprt)
+            {
+                case cmPOW:
+                    // Optimization for polynomials of low order
+                    if (m_vRPN[sz - 2].Cmd == cmVAR && m_vRPN[sz - 1].Cmd == cmVAL)
+                    {
+                        if (m_vRPN[sz - 1].Val.data2 == 2)
+                            m_vRPN[sz - 2].Cmd = cmVARPOW2;
+                        else if (m_vRPN[sz - 1].Val.data2 == 3)
+                            m_vRPN[sz - 2].Cmd = cmVARPOW3;
+                        else if (m_vRPN[sz - 1].Val.data2 == 4)
+                            m_vRPN[sz - 2].Cmd = cmVARPOW4;
+                        else
+                            break;
+
+                        m_vRPN.pop_back();
+                        bOptimized = true;
+                    }
+                    break;
 
-        case cmDIV:
-              if (m_vRPN[sz-1].Cmd == cmVAL && m_vRPN[sz-2].Cmd == cmVARMUL && m_vRPN[sz-1].Val.data2!=0)
-              {
-                // Optimization: 4*a/2 -> 2*a
-                m_vRPN[sz-2].Val.data  /= m_vRPN[sz-1].Val.data2;
-                m_vRPN[sz-2].Val.data2 /= m_vRPN[sz-1].Val.data2;
-                m_vRPN.pop_back();
-                bOptimized = true;
-              }
-              break;
-              
-        } // switch a_Oprt
-      }
+                case cmSUB:
+                case cmADD:
+                    // Simple optimization based on pattern recognition for a shitload of different
+                    // bytecode combinations of addition/subtraction
+                    if ((m_vRPN[sz - 1].Cmd == cmVAR && m_vRPN[sz - 2].Cmd == cmVAL) ||
+                        (m_vRPN[sz - 1].Cmd == cmVAL && m_vRPN[sz - 2].Cmd == cmVAR) ||
+                        (m_vRPN[sz - 1].Cmd == cmVAL && m_vRPN[sz - 2].Cmd == cmVARMUL) ||
+                        (m_vRPN[sz - 1].Cmd == cmVARMUL && m_vRPN[sz - 2].Cmd == cmVAL) ||
+                        (m_vRPN[sz - 1].Cmd == cmVAR && m_vRPN[sz - 2].Cmd == cmVAR &&
+                         m_vRPN[sz - 2].Val.ptr == m_vRPN[sz - 1].Val.ptr) ||
+                        (m_vRPN[sz - 1].Cmd == cmVAR && m_vRPN[sz - 2].Cmd == cmVARMUL &&
+                         m_vRPN[sz - 2].Val.ptr == m_vRPN[sz - 1].Val.ptr) ||
+                        (m_vRPN[sz - 1].Cmd == cmVARMUL && m_vRPN[sz - 2].Cmd == cmVAR &&
+                         m_vRPN[sz - 2].Val.ptr == m_vRPN[sz - 1].Val.ptr) ||
+                        (m_vRPN[sz - 1].Cmd == cmVARMUL && m_vRPN[sz - 2].Cmd == cmVARMUL &&
+                         m_vRPN[sz - 2].Val.ptr == m_vRPN[sz - 1].Val.ptr))
+                    {
+                        assert((m_vRPN[sz - 2].Val.ptr == NULL && m_vRPN[sz - 1].Val.ptr != NULL) ||
+                               (m_vRPN[sz - 2].Val.ptr != NULL && m_vRPN[sz - 1].Val.ptr == NULL) ||
+                               (m_vRPN[sz - 2].Val.ptr == m_vRPN[sz - 1].Val.ptr));
+
+                        m_vRPN[sz - 2].Cmd = cmVARMUL;
+                        m_vRPN[sz - 2].Val.ptr = (value_type*)((long long)(m_vRPN[sz - 2].Val.ptr) |
+                                                               (long long)(m_vRPN[sz - 1].Val.ptr));         // variable
+                        m_vRPN[sz - 2].Val.data2 += ((a_Oprt == cmSUB) ? -1 : 1) * m_vRPN[sz - 1].Val.data2; // offset
+                        m_vRPN[sz - 2].Val.data +=
+                          ((a_Oprt == cmSUB) ? -1 : 1) * m_vRPN[sz - 1].Val.data; // multiplicand
+                        m_vRPN.pop_back();
+                        bOptimized = true;
+                    }
+                    break;
+
+                case cmMUL:
+                    if ((m_vRPN[sz - 1].Cmd == cmVAR && m_vRPN[sz - 2].Cmd == cmVAL) ||
+                        (m_vRPN[sz - 1].Cmd == cmVAL && m_vRPN[sz - 2].Cmd == cmVAR))
+                    {
+                        m_vRPN[sz - 2].Cmd = cmVARMUL;
+                        m_vRPN[sz - 2].Val.ptr =
+                          (value_type*)((long long)(m_vRPN[sz - 2].Val.ptr) | (long long)(m_vRPN[sz - 1].Val.ptr));
+                        m_vRPN[sz - 2].Val.data = m_vRPN[sz - 2].Val.data2 + m_vRPN[sz - 1].Val.data2;
+                        m_vRPN[sz - 2].Val.data2 = 0;
+                        m_vRPN.pop_back();
+                        bOptimized = true;
+                    }
+                    else if ((m_vRPN[sz - 1].Cmd == cmVAL && m_vRPN[sz - 2].Cmd == cmVARMUL) ||
+                             (m_vRPN[sz - 1].Cmd == cmVARMUL && m_vRPN[sz - 2].Cmd == cmVAL))
+                    {
+                        // Optimization: 2*(3*b+1) or (3*b+1)*2 -> 6*b+2
+                        m_vRPN[sz - 2].Cmd = cmVARMUL;
+                        m_vRPN[sz - 2].Val.ptr =
+                          (value_type*)((long long)(m_vRPN[sz - 2].Val.ptr) | (long long)(m_vRPN[sz - 1].Val.ptr));
+                        if (m_vRPN[sz - 1].Cmd == cmVAL)
+                        {
+                            m_vRPN[sz - 2].Val.data *= m_vRPN[sz - 1].Val.data2;
+                            m_vRPN[sz - 2].Val.data2 *= m_vRPN[sz - 1].Val.data2;
+                        }
+                        else
+                        {
+                            m_vRPN[sz - 2].Val.data = m_vRPN[sz - 1].Val.data * m_vRPN[sz - 2].Val.data2;
+                            m_vRPN[sz - 2].Val.data2 = m_vRPN[sz - 1].Val.data2 * m_vRPN[sz - 2].Val.data2;
+                        }
+                        m_vRPN.pop_back();
+                        bOptimized = true;
+                    }
+                    else if (m_vRPN[sz - 1].Cmd == cmVAR && m_vRPN[sz - 2].Cmd == cmVAR &&
+                             m_vRPN[sz - 1].Val.ptr == m_vRPN[sz - 2].Val.ptr)
+                    {
+                        // Optimization: a*a -> a^2
+                        m_vRPN[sz - 2].Cmd = cmVARPOW2;
+                        m_vRPN.pop_back();
+                        bOptimized = true;
+                    }
+                    break;
+
+                case cmDIV:
+                    if (m_vRPN[sz - 1].Cmd == cmVAL && m_vRPN[sz - 2].Cmd == cmVARMUL && m_vRPN[sz - 1].Val.data2 != 0)
+                    {
+                        // Optimization: 4*a/2 -> 2*a
+                        m_vRPN[sz - 2].Val.data /= m_vRPN[sz - 1].Val.data2;
+                        m_vRPN[sz - 2].Val.data2 /= m_vRPN[sz - 1].Val.data2;
+                        m_vRPN.pop_back();
+                        bOptimized = true;
+                    }
+                    break;
+
+            } // switch a_Oprt
+        }
     }
 
     // If optimization can't be applied just write the value
     if (!bOptimized)
     {
-      --m_iStackPos;
-      SToken tok;
-      tok.Cmd = a_Oprt;
-      m_vRPN.push_back(tok);
+        --m_iStackPos;
+        SToken tok;
+        tok.Cmd = a_Oprt;
+        m_vRPN.push_back(tok);
     }
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserByteCode::AddIfElse(ECmdCode a_Oprt)
-  {
+//---------------------------------------------------------------------------
+void ParserByteCode::AddIfElse(ECmdCode a_Oprt)
+{
     SToken tok;
     tok.Cmd = a_Oprt;
     m_vRPN.push_back(tok);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add an assignment operator
-    
-      Operator entries in byte code consist of:
-      <ul>
-        <li>cmASSIGN code</li>
-        <li>the pointer of the destination variable</li>
-      </ul>
-
-      \sa  ParserToken::ECmdCode
-  */
-  void ParserByteCode::AddAssignOp(value_type *a_pVar)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add an assignment operator
+
+    Operator entries in byte code consist of:
+    <ul>
+      <li>cmASSIGN code</li>
+      <li>the pointer of the destination variable</li>
+    </ul>
+
+    \sa  ParserToken::ECmdCode
+*/
+void ParserByteCode::AddAssignOp(value_type* a_pVar)
+{
     --m_iStackPos;
 
     SToken tok;
     tok.Cmd = cmASSIGN;
     tok.Oprt.ptr = a_pVar;
     m_vRPN.push_back(tok);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Add function to bytecode. 
+//---------------------------------------------------------------------------
+/** \brief Add function to bytecode.
 
-      \param a_iArgc Number of arguments, negative numbers indicate multiarg functions.
-      \param a_pFun Pointer to function callback.
-  */
-  void ParserByteCode::AddFun(generic_fun_type a_pFun, int a_iArgc)
-  {
-    if (a_iArgc>=0)
+    \param a_iArgc Number of arguments, negative numbers indicate multiarg functions.
+    \param a_pFun Pointer to function callback.
+*/
+void ParserByteCode::AddFun(generic_fun_type a_pFun, int a_iArgc)
+{
+    if (a_iArgc >= 0)
     {
-      m_iStackPos = m_iStackPos - a_iArgc + 1; 
+        m_iStackPos = m_iStackPos - a_iArgc + 1;
     }
     else
     {
-      // function with unlimited number of arguments
-      m_iStackPos = m_iStackPos + a_iArgc + 1; 
+        // function with unlimited number of arguments
+        m_iStackPos = m_iStackPos + a_iArgc + 1;
     }
     m_iMaxStackSize = std::max(m_iMaxStackSize, (size_t)m_iStackPos);
 
@@ -374,17 +410,17 @@ namespace mu
     tok.Fun.argc = a_iArgc;
     tok.Fun.ptr = a_pFun;
     m_vRPN.push_back(tok);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Add a bulk function to bytecode. 
+//---------------------------------------------------------------------------
+/** \brief Add a bulk function to bytecode.
 
-      \param a_iArgc Number of arguments, negative numbers indicate multiarg functions.
-      \param a_pFun Pointer to function callback.
-  */
-  void ParserByteCode::AddBulkFun(generic_fun_type a_pFun, int a_iArgc)
-  {
-    m_iStackPos = m_iStackPos - a_iArgc + 1; 
+    \param a_iArgc Number of arguments, negative numbers indicate multiarg functions.
+    \param a_pFun Pointer to function callback.
+*/
+void ParserByteCode::AddBulkFun(generic_fun_type a_pFun, int a_iArgc)
+{
+    m_iStackPos = m_iStackPos - a_iArgc + 1;
     m_iMaxStackSize = std::max(m_iMaxStackSize, (size_t)m_iStackPos);
 
     SToken tok;
@@ -392,18 +428,18 @@ namespace mu
     tok.Fun.argc = a_iArgc;
     tok.Fun.ptr = a_pFun;
     m_vRPN.push_back(tok);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add Strung function entry to the parser bytecode. 
-      \throw nothrow
-
-      A string function entry consists of the stack position of the return value,
-      followed by a cmSTRFUNC code, the function pointer and an index into the 
-      string buffer maintained by the parser.
-  */
-  void ParserByteCode::AddStrFun(generic_fun_type a_pFun, int a_iArgc, int a_iIdx)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add Strung function entry to the parser bytecode.
+    \throw nothrow
+
+    A string function entry consists of the stack position of the return value,
+    followed by a cmSTRFUNC code, the function pointer and an index into the
+    string buffer maintained by the parser.
+*/
+void ParserByteCode::AddStrFun(generic_fun_type a_pFun, int a_iArgc, int a_iIdx)
+{
     m_iStackPos = m_iStackPos - a_iArgc + 1;
 
     SToken tok;
@@ -414,175 +450,213 @@ namespace mu
     m_vRPN.push_back(tok);
 
     m_iMaxStackSize = std::max(m_iMaxStackSize, (size_t)m_iStackPos);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Add end marker to bytecode.
-      
-      \throw nothrow 
-  */
-  void ParserByteCode::Finalize()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Add end marker to bytecode.
+
+    \throw nothrow
+*/
+void ParserByteCode::Finalize()
+{
     SToken tok;
     tok.Cmd = cmEND;
     m_vRPN.push_back(tok);
-    rpn_type(m_vRPN).swap(m_vRPN);     // shrink bytecode vector to fit
+    rpn_type(m_vRPN).swap(m_vRPN); // shrink bytecode vector to fit
 
     // Determine the if-then-else jump offsets
     ParserStack<int> stIf, stElse;
     int idx;
-    for (int i=0; i<(int)m_vRPN.size(); ++i)
+    for (int i = 0; i < (int)m_vRPN.size(); ++i)
     {
-      switch(m_vRPN[i].Cmd)
-      {
-      case cmIF:
-            stIf.push(i);
-            break;
+        switch (m_vRPN[i].Cmd)
+        {
+            case cmIF:
+                stIf.push(i);
+                break;
 
-      case  cmELSE:
-            stElse.push(i);
-            idx = stIf.pop();
-            m_vRPN[idx].Oprt.offset = i - idx;
-            break;
-      
-      case cmENDIF:
-            idx = stElse.pop();
-            m_vRPN[idx].Oprt.offset = i - idx;
-            break;
+            case cmELSE:
+                stElse.push(i);
+                idx = stIf.pop();
+                m_vRPN[idx].Oprt.offset = i - idx;
+                break;
 
-      default:
-            break;
-      }
+            case cmENDIF:
+                idx = stElse.pop();
+                m_vRPN[idx].Oprt.offset = i - idx;
+                break;
+
+            default:
+                break;
+        }
     }
-  }
+}
 
-  //---------------------------------------------------------------------------
-  const SToken* ParserByteCode::GetBase() const
-  {
-    if (m_vRPN.size()==0)
-      throw ParserError(ecINTERNAL_ERROR);
+//---------------------------------------------------------------------------
+const SToken* ParserByteCode::GetBase() const
+{
+    if (m_vRPN.size() == 0)
+        throw ParserError(ecINTERNAL_ERROR);
     else
-      return &m_vRPN[0];
-  }
-
-  //---------------------------------------------------------------------------
-  std::size_t ParserByteCode::GetMaxStackSize() const
-  {
-    return m_iMaxStackSize+1;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Returns the number of entries in the bytecode. */
-  std::size_t ParserByteCode::GetSize() const
-  {
+        return &m_vRPN[0];
+}
+
+//---------------------------------------------------------------------------
+std::size_t ParserByteCode::GetMaxStackSize() const
+{
+    return m_iMaxStackSize + 1;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Returns the number of entries in the bytecode. */
+std::size_t ParserByteCode::GetSize() const
+{
     return m_vRPN.size();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Delete the bytecode. 
-  
-      \throw nothrow
-
-      The name of this function is a violation of my own coding guidelines
-      but this way it's more in line with the STL functions thus more 
-      intuitive.
-  */
-  void ParserByteCode::clear()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Delete the bytecode.
+
+    \throw nothrow
+
+    The name of this function is a violation of my own coding guidelines
+    but this way it's more in line with the STL functions thus more
+    intuitive.
+*/
+void ParserByteCode::clear()
+{
     m_vRPN.clear();
     m_iStackPos = 0;
     m_iMaxStackSize = 0;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Dump bytecode (for debugging only!). */
-  void ParserByteCode::AsciiDump()
-  {
-    if (!m_vRPN.size()) 
+//---------------------------------------------------------------------------
+/** \brief Dump bytecode (for debugging only!). */
+void ParserByteCode::AsciiDump()
+{
+    if (!m_vRPN.size())
     {
-      mu::console() << _T("No bytecode available\n");
-      return;
+        mu::console() << _T("No bytecode available\n");
+        return;
     }
 
     mu::console() << _T("Number of RPN tokens:") << (int)m_vRPN.size() << _T("\n");
-    for (std::size_t i=0; i<m_vRPN.size() && m_vRPN[i].Cmd!=cmEND; ++i)
+    for (std::size_t i = 0; i < m_vRPN.size() && m_vRPN[i].Cmd != cmEND; ++i)
     {
-      mu::console() << std::dec << i << _T(" : \t");
-      switch (m_vRPN[i].Cmd)
-      {
-      case cmVAL:   mu::console() << _T("VAL \t");
-                    mu::console() << _T("[") << m_vRPN[i].Val.data2 << _T("]\n");
-                    break;
+        mu::console() << std::dec << i << _T(" : \t");
+        switch (m_vRPN[i].Cmd)
+        {
+            case cmVAL:
+                mu::console() << _T("VAL \t");
+                mu::console() << _T("[") << m_vRPN[i].Val.data2 << _T("]\n");
+                break;
 
-      case cmVAR:   mu::console() << _T("VAR \t");
-	                  mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n"); 
-                    break;
+            case cmVAR:
+                mu::console() << _T("VAR \t");
+                mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n");
+                break;
 
-      case cmVARPOW2: mu::console() << _T("VARPOW2 \t");
-	                    mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n"); 
-                      break;
+            case cmVARPOW2:
+                mu::console() << _T("VARPOW2 \t");
+                mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n");
+                break;
 
-      case cmVARPOW3: mu::console() << _T("VARPOW3 \t");
-	                    mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n"); 
-                      break;
+            case cmVARPOW3:
+                mu::console() << _T("VARPOW3 \t");
+                mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n");
+                break;
 
-      case cmVARPOW4: mu::console() << _T("VARPOW4 \t");
-	                    mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n"); 
-                      break;
+            case cmVARPOW4:
+                mu::console() << _T("VARPOW4 \t");
+                mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]\n");
+                break;
 
-      case cmVARMUL:  mu::console() << _T("VARMUL \t");
-	                    mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]"); 
-                      mu::console() << _T(" * [") << m_vRPN[i].Val.data << _T("]");
-                      mu::console() << _T(" + [") << m_vRPN[i].Val.data2 << _T("]\n");
-                      break;
+            case cmVARMUL:
+                mu::console() << _T("VARMUL \t");
+                mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Val.ptr << _T("]");
+                mu::console() << _T(" * [") << m_vRPN[i].Val.data << _T("]");
+                mu::console() << _T(" + [") << m_vRPN[i].Val.data2 << _T("]\n");
+                break;
 
-      case cmFUNC:  mu::console() << _T("CALL\t");
-                    mu::console() << _T("[ARG:") << std::dec << m_vRPN[i].Fun.argc << _T("]"); 
-                    mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Fun.ptr << _T("]"); 
-                    mu::console() << _T("\n");
-                    break;
+            case cmFUNC:
+                mu::console() << _T("CALL\t");
+                mu::console() << _T("[ARG:") << std::dec << m_vRPN[i].Fun.argc << _T("]");
+                mu::console() << _T("[ADDR: 0x") << std::hex << m_vRPN[i].Fun.ptr << _T("]");
+                mu::console() << _T("\n");
+                break;
 
-      case cmFUNC_STR:
-                    mu::console() << _T("CALL STRFUNC\t");
-                    mu::console() << _T("[ARG:") << std::dec << m_vRPN[i].Fun.argc << _T("]");
-                    mu::console() << _T("[IDX:") << std::dec << m_vRPN[i].Fun.idx << _T("]");
-                    mu::console() << _T("[ADDR: 0x") << m_vRPN[i].Fun.ptr << _T("]\n"); 
-                    break;
+            case cmFUNC_STR:
+                mu::console() << _T("CALL STRFUNC\t");
+                mu::console() << _T("[ARG:") << std::dec << m_vRPN[i].Fun.argc << _T("]");
+                mu::console() << _T("[IDX:") << std::dec << m_vRPN[i].Fun.idx << _T("]");
+                mu::console() << _T("[ADDR: 0x") << m_vRPN[i].Fun.ptr << _T("]\n");
+                break;
 
-      case cmLT:    mu::console() << _T("LT\n");  break;
-      case cmGT:    mu::console() << _T("GT\n");  break;
-      case cmLE:    mu::console() << _T("LE\n");  break;
-      case cmGE:    mu::console() << _T("GE\n");  break;
-      case cmEQ:    mu::console() << _T("EQ\n");  break;
-      case cmNEQ:   mu::console() << _T("NEQ\n"); break;
-      case cmADD:   mu::console() << _T("ADD\n"); break;
-      case cmLAND:  mu::console() << _T("&&\n"); break;
-      case cmLOR:   mu::console() << _T("||\n"); break;
-      case cmSUB:   mu::console() << _T("SUB\n"); break;
-      case cmMUL:   mu::console() << _T("MUL\n"); break;
-      case cmDIV:   mu::console() << _T("DIV\n"); break;
-      case cmPOW:   mu::console() << _T("POW\n"); break;
-
-      case cmIF:    mu::console() << _T("IF\t");
-                    mu::console() << _T("[OFFSET:") << std::dec << m_vRPN[i].Oprt.offset << _T("]\n");
-                    break;
+            case cmLT:
+                mu::console() << _T("LT\n");
+                break;
+            case cmGT:
+                mu::console() << _T("GT\n");
+                break;
+            case cmLE:
+                mu::console() << _T("LE\n");
+                break;
+            case cmGE:
+                mu::console() << _T("GE\n");
+                break;
+            case cmEQ:
+                mu::console() << _T("EQ\n");
+                break;
+            case cmNEQ:
+                mu::console() << _T("NEQ\n");
+                break;
+            case cmADD:
+                mu::console() << _T("ADD\n");
+                break;
+            case cmLAND:
+                mu::console() << _T("&&\n");
+                break;
+            case cmLOR:
+                mu::console() << _T("||\n");
+                break;
+            case cmSUB:
+                mu::console() << _T("SUB\n");
+                break;
+            case cmMUL:
+                mu::console() << _T("MUL\n");
+                break;
+            case cmDIV:
+                mu::console() << _T("DIV\n");
+                break;
+            case cmPOW:
+                mu::console() << _T("POW\n");
+                break;
 
-      case cmELSE:  mu::console() << _T("ELSE\t");
-                    mu::console() << _T("[OFFSET:") << std::dec << m_vRPN[i].Oprt.offset << _T("]\n");
-                    break;
+            case cmIF:
+                mu::console() << _T("IF\t");
+                mu::console() << _T("[OFFSET:") << std::dec << m_vRPN[i].Oprt.offset << _T("]\n");
+                break;
+
+            case cmELSE:
+                mu::console() << _T("ELSE\t");
+                mu::console() << _T("[OFFSET:") << std::dec << m_vRPN[i].Oprt.offset << _T("]\n");
+                break;
 
-      case cmENDIF: mu::console() << _T("ENDIF\n"); break;
+            case cmENDIF:
+                mu::console() << _T("ENDIF\n");
+                break;
 
-      case cmASSIGN: 
-                    mu::console() << _T("ASSIGN\t");
-                    mu::console() << _T("[ADDR: 0x") << m_vRPN[i].Oprt.ptr << _T("]\n"); 
-                    break; 
+            case cmASSIGN:
+                mu::console() << _T("ASSIGN\t");
+                mu::console() << _T("[ADDR: 0x") << m_vRPN[i].Oprt.ptr << _T("]\n");
+                break;
 
-      default:      mu::console() << _T("(unknown code: ") << m_vRPN[i].Cmd << _T(")\n"); 
-                    break;
-      } // switch cmdCode
-    } // while bytecode
+            default:
+                mu::console() << _T("(unknown code: ") << m_vRPN[i].Cmd << _T(")\n");
+                break;
+        } // switch cmdCode
+    }     // while bytecode
 
     mu::console() << _T("END") << std::endl;
-  }
+}
 } // namespace mu
diff --git a/ext_libs/muparser/muParserBytecode.h b/ext_libs/muparser/muParserBytecode.h
old mode 100755
new mode 100644
index 39ab39d5..9a8fad38
--- a/ext_libs/muparser/muParserBytecode.h
+++ b/ext_libs/muparser/muParserBytecode.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef MU_PARSER_BYTECODE_H
 #define MU_PARSER_BYTECODE_H
@@ -38,56 +38,53 @@
     \brief Definition of the parser bytecode class.
 */
 
-
 namespace mu
 {
-  struct SToken
-  {
+struct SToken
+{
     ECmdCode Cmd;
     int StackPos;
 
     union
     {
-      struct //SValData
-      {
-        value_type *ptr;
-        value_type  data;
-        value_type  data2;
-      } Val;
-
-      struct //SFunData
-      {
-        // Note: generic_fun_type is merely a placeholder. The real type could be 
-        //       anything between gun_type1 and fun_type9. I can't use a void
-        //       pointer due to constraints in the ANSI standard which allows
-        //       data pointers and function pointers to differ in size.
-        generic_fun_type ptr;
-        int   argc;
-        int   idx;
-      } Fun;
-
-      struct //SOprtData
-      {
-        value_type *ptr;
-        int offset;
-      } Oprt;
+        struct // SValData
+        {
+            value_type* ptr;
+            value_type data;
+            value_type data2;
+        } Val;
+
+        struct // SFunData
+        {
+            // Note: generic_fun_type is merely a placeholder. The real type could be
+            //       anything between gun_type1 and fun_type9. I can't use a void
+            //       pointer due to constraints in the ANSI standard which allows
+            //       data pointers and function pointers to differ in size.
+            generic_fun_type ptr;
+            int argc;
+            int idx;
+        } Fun;
+
+        struct // SOprtData
+        {
+            value_type* ptr;
+            int offset;
+        } Oprt;
     };
-  };
-  
-  
-  /** \brief Bytecode implementation of the Math Parser.
+};
 
-  The bytecode contains the formula converted to revers polish notation stored in a continious
-  memory area. Associated with this data are operator codes, variable pointers, constant 
-  values and function pointers. Those are necessary in order to calculate the result.
-  All those data items will be casted to the underlying datatype of the bytecode.
+/** \brief Bytecode implementation of the Math Parser.
 
-  \author (C) 2004-2013 Ingo Berg 
+The bytecode contains the formula converted to revers polish notation stored in a continious
+memory area. Associated with this data are operator codes, variable pointers, constant
+values and function pointers. Those are necessary in order to calculate the result.
+All those data items will be casted to the underlying datatype of the bytecode.
+
+\author (C) 2004-2013 Ingo Berg
 */
 class ParserByteCode
 {
 private:
-
     /** \brief Token type for internal use only. */
     typedef ParserToken<value_type, string_type> token_type;
 
@@ -99,26 +96,25 @@ class ParserByteCode
 
     /** \brief Maximum size needed for the stack. */
     std::size_t m_iMaxStackSize;
-    
+
     /** \brief The actual rpn storage. */
-    rpn_type  m_vRPN;
+    rpn_type m_vRPN;
 
     bool m_bEnableOptimizer;
 
     void ConstantFolding(ECmdCode a_Oprt);
 
 public:
-
     ParserByteCode();
-    ParserByteCode(const ParserByteCode &a_ByteCode);
-    ParserByteCode& operator=(const ParserByteCode &a_ByteCode);
-    void Assign(const ParserByteCode &a_ByteCode);
+    ParserByteCode(const ParserByteCode& a_ByteCode);
+    ParserByteCode& operator=(const ParserByteCode& a_ByteCode);
+    void Assign(const ParserByteCode& a_ByteCode);
 
-    void AddVar(value_type *a_pVar);
+    void AddVar(value_type* a_pVar);
     void AddVal(value_type a_fVal);
     void AddOp(ECmdCode a_Oprt);
     void AddIfElse(ECmdCode a_Oprt);
-    void AddAssignOp(value_type *a_pVar);
+    void AddAssignOp(value_type* a_pVar);
     void AddFun(generic_fun_type a_pFun, int a_iArgc);
     void AddBulkFun(generic_fun_type a_pFun, int a_iArgc);
     void AddStrFun(generic_fun_type a_pFun, int a_iArgc, int a_iIdx);
@@ -137,5 +133,3 @@ class ParserByteCode
 } // namespace mu
 
 #endif
-
-
diff --git a/ext_libs/muparser/muParserCallback.cpp b/ext_libs/muparser/muParserCallback.cpp
old mode 100755
new mode 100644
index 2044fe1c..8db3c1d6
--- a/ext_libs/muparser/muParserCallback.cpp
+++ b/ext_libs/muparser/muParserCallback.cpp
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "muParserCallback.h"
@@ -29,435 +29,440 @@
     \brief Implementation of the parser callback class.
 */
 
-
 namespace mu
 {
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type0 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(0)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type1 a_pFun, bool a_bAllowOpti, int a_iPrec, ECmdCode a_iCode)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(1)
-    ,m_iPri(a_iPrec)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(a_iCode)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Constructor for constructing function callbacks taking two arguments. 
-      \throw nothrow
-  */
-  ParserCallback::ParserCallback(fun_type2 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(2)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  /** \brief Constructor for constructing binary operator callbacks. 
-      \param a_pFun Pointer to a static function taking two arguments
-      \param a_bAllowOpti A flag indicating this function can be optimized
-      \param a_iPrec The operator precedence
-      \param a_eOprtAsct The operators associativity
-      \throw nothrow
-  */
-  ParserCallback::ParserCallback(fun_type2 a_pFun, 
-                                 bool a_bAllowOpti, 
-                                 int a_iPrec, 
-                                 EOprtAssociativity a_eOprtAsct)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(2)
-    ,m_iPri(a_iPrec)
-    ,m_eOprtAsct(a_eOprtAsct)
-    ,m_iCode(cmOPRT_BIN)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type3 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(3)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type4 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(4)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type5 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(5)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type6 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(6)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type7 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(7)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type8 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(8)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type9 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(9)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(fun_type10 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(10)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type0 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(0)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type1 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(1)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Constructor for constructing function callbacks taking two arguments. 
-      \throw nothrow
-  */
-  ParserCallback::ParserCallback(bulkfun_type2 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(2)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type3 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(3)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type4 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(4)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type5 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(5)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type6 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(6)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type7 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(7)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type8 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(8)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type9 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(9)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(bulkfun_type10 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(10)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_BULK)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(multfun_type a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(-1)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC)
-    ,m_iType(tpDBL)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(strfun_type1 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(0)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_STR)
-    ,m_iType(tpSTR)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(strfun_type2 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(1)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_STR)
-    ,m_iType(tpSTR)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  ParserCallback::ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti)
-    :m_pFun((void*)a_pFun)
-    ,m_iArgc(2)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmFUNC_STR)
-    ,m_iType(tpSTR)
-    ,m_bAllowOpti(a_bAllowOpti)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Default constructor. 
-      \throw nothrow
-  */
-  ParserCallback::ParserCallback()
-    :m_pFun(0)
-    ,m_iArgc(0)
-    ,m_iPri(-1)
-    ,m_eOprtAsct(oaNONE)
-    ,m_iCode(cmUNKNOWN)
-    ,m_iType(tpVOID)
-    ,m_bAllowOpti(0)
-  {}
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Copy constructor. 
-      \throw nothrow
-  */
-  ParserCallback::ParserCallback(const ParserCallback &ref)
-  {
-    m_pFun       = ref.m_pFun;
-    m_iArgc      = ref.m_iArgc;
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type0 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(0),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type1 a_pFun, bool a_bAllowOpti, int a_iPrec, ECmdCode a_iCode) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(1),
+    m_iPri(a_iPrec),
+    m_eOprtAsct(oaNONE),
+    m_iCode(a_iCode),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+/** \brief Constructor for constructing function callbacks taking two arguments.
+    \throw nothrow
+*/
+ParserCallback::ParserCallback(fun_type2 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(2),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+/** \brief Constructor for constructing binary operator callbacks.
+    \param a_pFun Pointer to a static function taking two arguments
+    \param a_bAllowOpti A flag indicating this function can be optimized
+    \param a_iPrec The operator precedence
+    \param a_eOprtAsct The operators associativity
+    \throw nothrow
+*/
+ParserCallback::ParserCallback(fun_type2 a_pFun, bool a_bAllowOpti, int a_iPrec, EOprtAssociativity a_eOprtAsct) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(2),
+    m_iPri(a_iPrec),
+    m_eOprtAsct(a_eOprtAsct),
+    m_iCode(cmOPRT_BIN),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type3 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(3),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type4 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(4),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type5 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(5),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type6 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(6),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type7 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(7),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type8 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(8),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type9 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(9),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(fun_type10 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(10),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type0 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(0),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type1 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(1),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+/** \brief Constructor for constructing function callbacks taking two arguments.
+    \throw nothrow
+*/
+ParserCallback::ParserCallback(bulkfun_type2 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(2),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type3 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(3),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type4 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(4),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type5 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(5),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type6 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(6),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type7 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(7),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type8 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(8),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type9 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(9),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(bulkfun_type10 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(10),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_BULK),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(multfun_type a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(-1),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC),
+    m_iType(tpDBL),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(strfun_type1 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(0),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_STR),
+    m_iType(tpSTR),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(strfun_type2 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(1),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_STR),
+    m_iType(tpSTR),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+ParserCallback::ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti) :
+    m_pFun((void*)a_pFun),
+    m_iArgc(2),
+    m_iPri(-1),
+    m_eOprtAsct(oaNONE),
+    m_iCode(cmFUNC_STR),
+    m_iType(tpSTR),
+    m_bAllowOpti(a_bAllowOpti)
+{
+}
+
+//---------------------------------------------------------------------------
+/** \brief Default constructor.
+    \throw nothrow
+*/
+ParserCallback::ParserCallback() :
+    m_pFun(0), m_iArgc(0), m_iPri(-1), m_eOprtAsct(oaNONE), m_iCode(cmUNKNOWN), m_iType(tpVOID), m_bAllowOpti(0)
+{
+}
+
+//---------------------------------------------------------------------------
+/** \brief Copy constructor.
+    \throw nothrow
+*/
+ParserCallback::ParserCallback(const ParserCallback& ref)
+{
+    m_pFun = ref.m_pFun;
+    m_iArgc = ref.m_iArgc;
     m_bAllowOpti = ref.m_bAllowOpti;
-    m_iCode      = ref.m_iCode;
-    m_iType      = ref.m_iType;
-    m_iPri       = ref.m_iPri;
-    m_eOprtAsct  = ref.m_eOprtAsct;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Clone this instance and return a pointer to the new instance. */
-  ParserCallback* ParserCallback::Clone() const
-  {
+    m_iCode = ref.m_iCode;
+    m_iType = ref.m_iType;
+    m_iPri = ref.m_iPri;
+    m_eOprtAsct = ref.m_eOprtAsct;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Clone this instance and return a pointer to the new instance. */
+ParserCallback* ParserCallback::Clone() const
+{
     return new ParserCallback(*this);
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Return tru if the function is conservative.
-
-      Conservative functions return always the same result for the same argument.
-      \throw nothrow
-  */
-  bool ParserCallback::IsOptimizable() const  
-  { 
-    return m_bAllowOpti; 
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Get the callback address for the parser function. 
-  
-      The type of the address is void. It needs to be recasted according to the
-      argument number to the right type.
-
-      \throw nothrow
-      \return #pFun
-  */
-  void* ParserCallback::GetAddr() const 
-  { 
-    return m_pFun;  
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Return the callback code. */
-  ECmdCode  ParserCallback::GetCode() const 
-  { 
-    return m_iCode; 
-  }
-  
-  //---------------------------------------------------------------------------
-  ETypeCode ParserCallback::GetType() const 
-  { 
-    return m_iType; 
-  }
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Return the operator precedence. 
-      \throw nothrown
-
-     Only valid if the callback token is an operator token (binary or infix).
-  */
-  int ParserCallback::GetPri()  const 
-  { 
-    return m_iPri;  
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Return the operators associativity. 
-      \throw nothrown
-
-     Only valid if the callback token is a binary operator token.
-  */
-  EOprtAssociativity ParserCallback::GetAssociativity() const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return tru if the function is conservative.
+
+    Conservative functions return always the same result for the same argument.
+    \throw nothrow
+*/
+bool ParserCallback::IsOptimizable() const
+{
+    return m_bAllowOpti;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Get the callback address for the parser function.
+
+    The type of the address is void. It needs to be recasted according to the
+    argument number to the right type.
+
+    \throw nothrow
+    \return #pFun
+*/
+void* ParserCallback::GetAddr() const
+{
+    return m_pFun;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return the callback code. */
+ECmdCode ParserCallback::GetCode() const
+{
+    return m_iCode;
+}
+
+//---------------------------------------------------------------------------
+ETypeCode ParserCallback::GetType() const
+{
+    return m_iType;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return the operator precedence.
+    \throw nothrown
+
+   Only valid if the callback token is an operator token (binary or infix).
+*/
+int ParserCallback::GetPri() const
+{
+    return m_iPri;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Return the operators associativity.
+    \throw nothrown
+
+   Only valid if the callback token is a binary operator token.
+*/
+EOprtAssociativity ParserCallback::GetAssociativity() const
+{
     return m_eOprtAsct;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Returns the number of function Arguments. */
-  int ParserCallback::GetArgc() const 
-  { 
-    return m_iArgc; 
-  }
+}
+
+//---------------------------------------------------------------------------
+/** \brief Returns the number of function Arguments. */
+int ParserCallback::GetArgc() const
+{
+    return m_iArgc;
+}
 } // namespace mu
diff --git a/ext_libs/muparser/muParserCallback.h b/ext_libs/muparser/muParserCallback.h
old mode 100755
new mode 100644
index ef32b498..d7560991
--- a/ext_libs/muparser/muParserCallback.h
+++ b/ext_libs/muparser/muParserCallback.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_CALLBACK_H
@@ -34,45 +34,44 @@
 
 namespace mu
 {
-
 /** \brief Encapsulation of prototypes for a numerical parser function.
 
     Encapsulates the prototyp for numerical parser functions. The class
     stores the number of arguments for parser functions as well
     as additional flags indication the function is non optimizeable.
-    The pointer to the callback function pointer is stored as void* 
+    The pointer to the callback function pointer is stored as void*
     and needs to be casted according to the argument count.
     Negative argument counts indicate a parser function with a variable number
-    of arguments. 
+    of arguments.
 
     \author (C) 2004-2011 Ingo Berg
 */
 class ParserCallback
 {
 public:
-    ParserCallback(fun_type0  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type1  a_pFun, bool a_bAllowOpti, int a_iPrec = -1, ECmdCode a_iCode=cmFUNC);
-    ParserCallback(fun_type2  a_pFun, bool a_bAllowOpti, int a_iPrec, EOprtAssociativity a_eAssociativity);
-    ParserCallback(fun_type2  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type3  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type4  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type5  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type6  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type7  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type8  a_pFun, bool a_bAllowOpti);
-    ParserCallback(fun_type9  a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type0 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type1 a_pFun, bool a_bAllowOpti, int a_iPrec = -1, ECmdCode a_iCode = cmFUNC);
+    ParserCallback(fun_type2 a_pFun, bool a_bAllowOpti, int a_iPrec, EOprtAssociativity a_eAssociativity);
+    ParserCallback(fun_type2 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type3 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type4 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type5 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type6 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type7 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type8 a_pFun, bool a_bAllowOpti);
+    ParserCallback(fun_type9 a_pFun, bool a_bAllowOpti);
     ParserCallback(fun_type10 a_pFun, bool a_bAllowOpti);
 
-    ParserCallback(bulkfun_type0  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type1  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type2  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type3  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type4  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type5  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type6  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type7  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type8  a_pFun, bool a_bAllowOpti);
-    ParserCallback(bulkfun_type9  a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type0 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type1 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type2 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type3 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type4 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type5 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type6 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type7 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type8 a_pFun, bool a_bAllowOpti);
+    ParserCallback(bulkfun_type9 a_pFun, bool a_bAllowOpti);
     ParserCallback(bulkfun_type10 a_pFun, bool a_bAllowOpti);
 
     ParserCallback(multfun_type a_pFun, bool a_bAllowOpti);
@@ -80,39 +79,38 @@ class ParserCallback
     ParserCallback(strfun_type2 a_pFun, bool a_bAllowOpti);
     ParserCallback(strfun_type3 a_pFun, bool a_bAllowOpti);
     ParserCallback();
-    ParserCallback(const ParserCallback &a_Fun);
-    
+    ParserCallback(const ParserCallback& a_Fun);
+
     ParserCallback* Clone() const;
 
-    bool  IsOptimizable() const;
+    bool IsOptimizable() const;
     void* GetAddr() const;
-    ECmdCode  GetCode() const;
+    ECmdCode GetCode() const;
     ETypeCode GetType() const;
-    int GetPri()  const;
+    int GetPri() const;
     EOprtAssociativity GetAssociativity() const;
     int GetArgc() const;
 
 private:
-    void *m_pFun;                   ///< Pointer to the callback function, casted to void
-    
+    void* m_pFun; ///< Pointer to the callback function, casted to void
+
     /** \brief Number of numeric function arguments
-    
+
         This number is negative for functions with variable number of arguments. in this cases
         they represent the actual number of arguments found.
     */
-    int   m_iArgc;      
-    int   m_iPri;                   ///< Valid only for binary and infix operators; Operator precedence.
-    EOprtAssociativity m_eOprtAsct; ///< Operator associativity; Valid only for binary operators 
-    ECmdCode  m_iCode;
+    int m_iArgc;
+    int m_iPri;                     ///< Valid only for binary and infix operators; Operator precedence.
+    EOprtAssociativity m_eOprtAsct; ///< Operator associativity; Valid only for binary operators
+    ECmdCode m_iCode;
     ETypeCode m_iType;
-    bool  m_bAllowOpti;             ///< Flag indication optimizeability 
+    bool m_bAllowOpti; ///< Flag indication optimizeability
 };
 
 //------------------------------------------------------------------------------
 /** \brief Container for Callback objects. */
-typedef std::map<string_type, ParserCallback> funmap_type; 
+typedef std::map<string_type, ParserCallback> funmap_type;
 
 } // namespace mu
 
 #endif
-
diff --git a/ext_libs/muparser/muParserDLL.cpp b/ext_libs/muparser/muParserDLL.cpp
old mode 100755
new mode 100644
index 15c88003..3e2a8d51
--- a/ext_libs/muparser/muParserDLL.cpp
+++ b/ext_libs/muparser/muParserDLL.cpp
@@ -22,7 +22,7 @@
                  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
                  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
                  */
-#if defined(MUPARSER_DLL) 
+#if defined(MUPARSER_DLL)
 
 #if defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
@@ -34,29 +34,27 @@
 #include "muParserInt.h"
 #include "muParserError.h"
 
-
-#define MU_TRY  \
-    try     \
-        {
-
-#define MU_CATCH                                                 \
-        }                                                        \
-        catch (muError_t &e)                                      \
-        {                                                        \
-        ParserTag *pTag = static_cast<ParserTag*>(a_hParser);  \
-        pTag->exc = e;                                         \
-        pTag->bError = true;                                   \
-if (pTag->errHandler)                                  \
-    (pTag->errHandler)(a_hParser);                       \
-        }                                                        \
-        catch (...)                                               \
-        {                                                        \
-        ParserTag *pTag = static_cast<ParserTag*>(a_hParser);  \
-        pTag->exc = muError_t(mu::ecINTERNAL_ERROR);           \
-        pTag->bError = true;                                   \
-if (pTag->errHandler)                                  \
-    (pTag->errHandler)(a_hParser);                       \
-        }
+#define MU_TRY \
+    try        \
+    {
+#define MU_CATCH                                              \
+    }                                                         \
+    catch (muError_t & e)                                     \
+    {                                                         \
+        ParserTag* pTag = static_cast<ParserTag*>(a_hParser); \
+        pTag->exc = e;                                        \
+        pTag->bError = true;                                  \
+        if (pTag->errHandler)                                 \
+            (pTag->errHandler)(a_hParser);                    \
+    }                                                         \
+    catch (...)                                               \
+    {                                                         \
+        ParserTag* pTag = static_cast<ParserTag*>(a_hParser); \
+        pTag->exc = muError_t(mu::ecINTERNAL_ERROR);          \
+        pTag->bError = true;                                  \
+        if (pTag->errHandler)                                 \
+            (pTag->errHandler)(a_hParser);                    \
+    }
 
 /** \file
     \brief This file contains the implementation of the DLL interface of muparser.
@@ -73,28 +71,26 @@ int g_nBulkSize;
 class ParserTag
 {
 public:
-    ParserTag(int nType)
-        :pParser((nType == muBASETYPE_FLOAT) ? (mu::ParserBase*)new mu::Parser() :
-        (nType == muBASETYPE_INT) ? (mu::ParserBase*)new mu::ParserInt() : NULL)
-        , exc()
-        , errHandler(NULL)
-        , bError(false)
-        , m_nParserType(nType)
-    {}
-
-    ~ParserTag()
+    ParserTag(int nType) :
+        pParser((nType == muBASETYPE_FLOAT) ? (mu::ParserBase*)new mu::Parser() :
+                                              (nType == muBASETYPE_INT) ? (mu::ParserBase*)new mu::ParserInt() : NULL),
+        exc(),
+        errHandler(NULL),
+        bError(false),
+        m_nParserType(nType)
     {
-        delete pParser;
     }
 
-    mu::ParserBase *pParser;
+    ~ParserTag() { delete pParser; }
+
+    mu::ParserBase* pParser;
     mu::ParserBase::exception_type exc;
     muErrorHandler_t errHandler;
     bool bError;
 
 private:
-    ParserTag(const ParserTag &ref);
-    ParserTag& operator=(const ParserTag &ref);
+    ParserTag(const ParserTag& ref);
+    ParserTag& operator=(const ParserTag& ref);
 
     int m_nParserType;
 };
@@ -125,19 +121,17 @@ ParserTag* AsParserTag(muParserHandle_t a_hParser)
 #if defined(_WIN32)
 #define _CRT_SECURE_NO_DEPRECATE
 
-BOOL APIENTRY DllMain(HANDLE /*hModule*/,
-    DWORD ul_reason_for_call,
-    LPVOID /*lpReserved*/)
+BOOL APIENTRY DllMain(HANDLE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
 {
     switch (ul_reason_for_call)
     {
-    case  DLL_PROCESS_ATTACH:
-        break;
+        case DLL_PROCESS_ATTACH:
+            break;
 
-    case  DLL_THREAD_ATTACH:
-    case  DLL_THREAD_DETACH:
-    case  DLL_PROCESS_DETACH:
-        break;
+        case DLL_THREAD_ATTACH:
+        case DLL_THREAD_DETACH:
+        case DLL_PROCESS_DETACH:
+            break;
     }
 
     return TRUE;
@@ -153,34 +147,37 @@ BOOL APIENTRY DllMain(HANDLE /*hModule*/,
 //
 //---------------------------------------------------------------------------
 
-API_EXPORT(void) mupSetVarFactory(muParserHandle_t a_hParser, muFacFun_t a_pFactory, void *pUserData)
+API_EXPORT(void) mupSetVarFactory(muParserHandle_t a_hParser, muFacFun_t a_pFactory, void* pUserData)
 {
     MU_TRY
-        muParser_t* p(AsParser(a_hParser));
+    muParser_t* p(AsParser(a_hParser));
     p->SetVarFactory(a_pFactory, pUserData);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
 /** \brief Create a new Parser instance and return its handle.
-*/
+ */
 API_EXPORT(muParserHandle_t) mupCreate(int nBaseType)
 {
     switch (nBaseType)
     {
-    case  muBASETYPE_FLOAT:   return (void*)(new ParserTag(muBASETYPE_FLOAT));
-    case  muBASETYPE_INT:     return (void*)(new ParserTag(muBASETYPE_INT));
-    default:                  return NULL;
+        case muBASETYPE_FLOAT:
+            return (void*)(new ParserTag(muBASETYPE_FLOAT));
+        case muBASETYPE_INT:
+            return (void*)(new ParserTag(muBASETYPE_INT));
+        default:
+            return NULL;
     }
 }
 
 //---------------------------------------------------------------------------
 /** \brief Release the parser instance related with a parser handle.
-*/
+ */
 API_EXPORT(void) mupRelease(muParserHandle_t a_hParser)
 {
     MU_TRY
-        ParserTag* p = static_cast<ParserTag*>(a_hParser);
+    ParserTag* p = static_cast<ParserTag*>(a_hParser);
     delete p;
     MU_CATCH
 }
@@ -189,7 +186,7 @@ API_EXPORT(void) mupRelease(muParserHandle_t a_hParser)
 API_EXPORT(const muChar_t*) mupGetVersion(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
 
 #ifndef _UNICODE
     sprintf(s_tmpOutBuf, "%s", p->GetVersion().c_str());
@@ -200,40 +197,40 @@ API_EXPORT(const muChar_t*) mupGetVersion(muParserHandle_t a_hParser)
     return s_tmpOutBuf;
     MU_CATCH
 
-        return _T("");
+    return _T("");
 }
 
 //---------------------------------------------------------------------------
 /** \brief Evaluate the expression.
-*/
+ */
 API_EXPORT(muFloat_t) mupEval(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     return p->Eval();
     MU_CATCH
 
-        return 0;
+    return 0;
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(muFloat_t*) mupEvalMulti(muParserHandle_t a_hParser, int *nNum)
+API_EXPORT(muFloat_t*) mupEvalMulti(muParserHandle_t a_hParser, int* nNum)
 {
     MU_TRY
-        assert(nNum != NULL);
+    assert(nNum != NULL);
 
     muParser_t* const p(AsParser(a_hParser));
     return p->Eval(*nNum);
     MU_CATCH
 
-        return 0;
+    return 0;
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupEvalBulk(muParserHandle_t a_hParser, muFloat_t *a_res, int nSize)
+API_EXPORT(void) mupEvalBulk(muParserHandle_t a_hParser, muFloat_t* a_res, int nSize)
 {
     MU_TRY
-        muParser_t* p(AsParser(a_hParser));
+    muParser_t* p(AsParser(a_hParser));
     p->Eval(a_res, nSize);
     MU_CATCH
 }
@@ -242,7 +239,7 @@ API_EXPORT(void) mupEvalBulk(muParserHandle_t a_hParser, muFloat_t *a_res, int n
 API_EXPORT(void) mupSetExpr(muParserHandle_t a_hParser, const muChar_t* a_szExpr)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->SetExpr(a_szExpr);
     MU_CATCH
 }
@@ -251,7 +248,7 @@ API_EXPORT(void) mupSetExpr(muParserHandle_t a_hParser, const muChar_t* a_szExpr
 API_EXPORT(void) mupRemoveVar(muParserHandle_t a_hParser, const muChar_t* a_szName)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->RemoveVar(a_szName);
     MU_CATCH
 }
@@ -263,7 +260,7 @@ API_EXPORT(void) mupRemoveVar(muParserHandle_t a_hParser, const muChar_t* a_szNa
 API_EXPORT(void) mupClearVar(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->ClearVar();
     MU_CATCH
 }
@@ -275,7 +272,7 @@ API_EXPORT(void) mupClearVar(muParserHandle_t a_hParser)
 API_EXPORT(void) mupClearConst(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->ClearConst();
     MU_CATCH
 }
@@ -287,7 +284,7 @@ API_EXPORT(void) mupClearConst(muParserHandle_t a_hParser)
 API_EXPORT(void) mupClearOprt(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->ClearOprt();
     MU_CATCH
 }
@@ -296,367 +293,304 @@ API_EXPORT(void) mupClearOprt(muParserHandle_t a_hParser)
 API_EXPORT(void) mupClearFun(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->ClearFun();
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun0(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muFun0_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun0(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun0_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun1(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muFun1_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun1(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun1_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun2(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muFun2_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun2(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun2_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun3(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun3_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun3(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun3_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun4(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun4_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun4(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun4_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun5(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun5_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun5(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun5_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun6(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun6_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun6(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun6_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun7(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun7_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun7(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun7_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun8(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun8_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun8(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun8_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun9(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun9_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun9(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun9_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineFun10(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFun10_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineFun10(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun10_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun0(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muBulkFun0_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun0(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun0_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun1(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muBulkFun1_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun1(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun1_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun2(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muBulkFun2_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun2(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun2_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun3(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun3_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun3(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun3_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun4(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun4_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun4(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun4_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun5(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun5_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun5(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun5_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun6(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun6_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun6(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun6_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun7(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun7_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun7(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun7_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun8(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun8_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun8(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun8_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun9(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun9_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun9(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun9_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkFun10(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muBulkFun10_t a_pFun)
+API_EXPORT(void) mupDefineBulkFun10(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun10_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineStrFun1(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muStrFun1_t a_pFun)
+API_EXPORT(void) mupDefineStrFun1(muParserHandle_t a_hParser, const muChar_t* a_szName, muStrFun1_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineStrFun2(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muStrFun2_t a_pFun)
+API_EXPORT(void) mupDefineStrFun2(muParserHandle_t a_hParser, const muChar_t* a_szName, muStrFun2_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineStrFun3(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muStrFun3_t a_pFun)
+API_EXPORT(void) mupDefineStrFun3(muParserHandle_t a_hParser, const muChar_t* a_szName, muStrFun3_t a_pFun)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, false);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineMultFun(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muMultFun_t a_pFun,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineMultFun(muParserHandle_t a_hParser, const muChar_t* a_szName, muMultFun_t a_pFun, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineFun(a_szName, a_pFun, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineOprt(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muFun2_t a_pFun,
-    muInt_t a_nPrec,
-    muInt_t a_nOprtAsct,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineOprt(muParserHandle_t a_hParser,
+              const muChar_t* a_szName,
+              muFun2_t a_pFun,
+              muInt_t a_nPrec,
+              muInt_t a_nOprtAsct,
+              muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
-    p->DefineOprt(a_szName,
-        a_pFun,
-        a_nPrec,
-        (mu::EOprtAssociativity)a_nOprtAsct,
-        a_bAllowOpt != 0);
+    muParser_t* const p(AsParser(a_hParser));
+    p->DefineOprt(a_szName, a_pFun, a_nPrec, (mu::EOprtAssociativity)a_nOprtAsct, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineVar(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFloat_t *a_pVar)
+API_EXPORT(void) mupDefineVar(muParserHandle_t a_hParser, const muChar_t* a_szName, muFloat_t* a_pVar)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineVar(a_szName, a_pVar);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineBulkVar(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFloat_t *a_pVar)
+API_EXPORT(void) mupDefineBulkVar(muParserHandle_t a_hParser, const muChar_t* a_szName, muFloat_t* a_pVar)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineVar(a_szName, a_pVar);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineConst(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    muFloat_t a_fVal)
+API_EXPORT(void) mupDefineConst(muParserHandle_t a_hParser, const muChar_t* a_szName, muFloat_t a_fVal)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineConst(a_szName, a_fVal);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineStrConst(muParserHandle_t a_hParser,
-    const muChar_t *a_szName,
-    const muChar_t *a_szVal)
+API_EXPORT(void) mupDefineStrConst(muParserHandle_t a_hParser, const muChar_t* a_szName, const muChar_t* a_szVal)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineStrConst(a_szName, a_szVal);
     MU_CATCH
 }
@@ -665,7 +599,7 @@ API_EXPORT(void) mupDefineStrConst(muParserHandle_t a_hParser,
 API_EXPORT(const muChar_t*) mupGetExpr(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
 
     // C# explodes when pMsg is returned directly. For some reason it can't access
     // the memory where the message lies directly.
@@ -679,53 +613,46 @@ API_EXPORT(const muChar_t*) mupGetExpr(muParserHandle_t a_hParser)
 
     MU_CATCH
 
-        return _T("");
+    return _T("");
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefinePostfixOprt(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muFun1_t a_pOprt,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefinePostfixOprt(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun1_t a_pOprt, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefinePostfixOprt(a_szName, a_pOprt, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineInfixOprt(muParserHandle_t a_hParser,
-    const muChar_t* a_szName,
-    muFun1_t a_pOprt,
-    muBool_t a_bAllowOpt)
+API_EXPORT(void)
+mupDefineInfixOprt(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun1_t a_pOprt, muBool_t a_bAllowOpt)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->DefineInfixOprt(a_szName, a_pOprt, a_bAllowOpt != 0);
     MU_CATCH
 }
 
 // Define character sets for identifiers
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineNameChars(muParserHandle_t a_hParser,
-    const muChar_t* a_szCharset)
+API_EXPORT(void) mupDefineNameChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset)
 {
     muParser_t* const p(AsParser(a_hParser));
     p->DefineNameChars(a_szCharset);
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineOprtChars(muParserHandle_t a_hParser,
-    const muChar_t* a_szCharset)
+API_EXPORT(void) mupDefineOprtChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset)
 {
     muParser_t* const p(AsParser(a_hParser));
     p->DefineOprtChars(a_szCharset);
 }
 
 //---------------------------------------------------------------------------
-API_EXPORT(void) mupDefineInfixOprtChars(muParserHandle_t a_hParser,
-    const muChar_t *a_szCharset)
+API_EXPORT(void) mupDefineInfixOprtChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset)
 {
     muParser_t* const p(AsParser(a_hParser));
     p->DefineInfixOprtChars(a_szCharset);
@@ -740,12 +667,12 @@ API_EXPORT(void) mupDefineInfixOprtChars(muParserHandle_t a_hParser,
 API_EXPORT(int) mupGetVarNum(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     const mu::varmap_type VarMap = p->GetVar();
     return (int)VarMap.size();
     MU_CATCH
 
-        return 0; // never reached
+    return 0; // never reached
 }
 
 //---------------------------------------------------------------------------
@@ -764,17 +691,14 @@ API_EXPORT(int) mupGetVarNum(muParserHandle_t a_hParser)
     During the calculation user defined callback functions present in the expression
     will be called, this is unavoidable.
     */
-API_EXPORT(void) mupGetVar(muParserHandle_t a_hParser,
-    unsigned a_iVar,
-    const muChar_t **a_szName,
-    muFloat_t **a_pVar)
+API_EXPORT(void) mupGetVar(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_szName, muFloat_t** a_pVar)
 {
     // A static buffer is needed for the name since i cant return the
     // pointer from the map.
-    static muChar_t  szName[1024];
+    static muChar_t szName[1024];
 
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     const mu::varmap_type VarMap = p->GetVar();
 
     if (a_iVar >= VarMap.size())
@@ -795,7 +719,7 @@ API_EXPORT(void) mupGetVar(muParserHandle_t a_hParser,
     wcsncpy(szName, item->first.c_str(), sizeof(szName));
 #endif
 
-    szName[sizeof(szName)-1] = 0;
+    szName[sizeof(szName) - 1] = 0;
 
     *a_szName = &szName[0];
     *a_pVar = item->second;
@@ -803,7 +727,7 @@ API_EXPORT(void) mupGetVar(muParserHandle_t a_hParser,
 
     MU_CATCH
 
-        *a_szName = 0;
+    *a_szName = 0;
     *a_pVar = 0;
 }
 
@@ -816,12 +740,12 @@ API_EXPORT(void) mupGetVar(muParserHandle_t a_hParser,
 API_EXPORT(int) mupGetExprVarNum(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     const mu::varmap_type VarMap = p->GetUsedVar();
     return (int)VarMap.size();
     MU_CATCH
 
-        return 0; // never reached
+    return 0; // never reached
 }
 
 //---------------------------------------------------------------------------
@@ -841,17 +765,15 @@ API_EXPORT(int) mupGetExprVarNum(muParserHandle_t a_hParser)
     \param a_pVar [out] Pointer to the variable.
     \throw nothrow
     */
-API_EXPORT(void) mupGetExprVar(muParserHandle_t a_hParser,
-    unsigned a_iVar,
-    const muChar_t **a_szName,
-    muFloat_t **a_pVar)
+API_EXPORT(void)
+mupGetExprVar(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_szName, muFloat_t** a_pVar)
 {
     // A static buffer is needed for the name since i cant return the
     // pointer from the map.
-    static muChar_t  szName[1024];
+    static muChar_t szName[1024];
 
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     const mu::varmap_type VarMap = p->GetUsedVar();
 
     if (a_iVar >= VarMap.size())
@@ -872,7 +794,7 @@ API_EXPORT(void) mupGetExprVar(muParserHandle_t a_hParser,
     wcsncpy(szName, item->first.c_str(), sizeof(szName));
 #endif
 
-    szName[sizeof(szName)-1] = 0;
+    szName[sizeof(szName) - 1] = 0;
 
     *a_szName = &szName[0];
     *a_pVar = item->second;
@@ -880,7 +802,7 @@ API_EXPORT(void) mupGetExprVar(muParserHandle_t a_hParser,
 
     MU_CATCH
 
-        *a_szName = 0;
+    *a_szName = 0;
     *a_pVar = 0;
 }
 
@@ -889,19 +811,19 @@ API_EXPORT(void) mupGetExprVar(muParserHandle_t a_hParser,
 API_EXPORT(int) mupGetConstNum(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     const mu::valmap_type ValMap = p->GetConst();
     return (int)ValMap.size();
     MU_CATCH
 
-        return 0; // never reached
+    return 0; // never reached
 }
 
 //-----------------------------------------------------------------------------------------------------
 API_EXPORT(void) mupSetArgSep(muParserHandle_t a_hParser, const muChar_t cArgSep)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->SetArgSep(cArgSep);
     MU_CATCH
 }
@@ -910,7 +832,7 @@ API_EXPORT(void) mupSetArgSep(muParserHandle_t a_hParser, const muChar_t cArgSep
 API_EXPORT(void) mupResetLocale(muParserHandle_t a_hParser)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->ResetLocale();
     MU_CATCH
 }
@@ -919,7 +841,7 @@ API_EXPORT(void) mupResetLocale(muParserHandle_t a_hParser)
 API_EXPORT(void) mupSetDecSep(muParserHandle_t a_hParser, const muChar_t cDecSep)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->SetDecSep(cDecSep);
     MU_CATCH
 }
@@ -928,7 +850,7 @@ API_EXPORT(void) mupSetDecSep(muParserHandle_t a_hParser, const muChar_t cDecSep
 API_EXPORT(void) mupSetThousandsSep(muParserHandle_t a_hParser, const muChar_t cThousandsSep)
 {
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     p->SetThousandsSep(cThousandsSep);
     MU_CATCH
 }
@@ -940,17 +862,14 @@ API_EXPORT(void) mupSetThousandsSep(muParserHandle_t a_hParser, const muChar_t c
     \param a_pszName [out] pointer to a null terminated string with the constant name
     \param [out] The constant value
     */
-API_EXPORT(void) mupGetConst(muParserHandle_t a_hParser,
-    unsigned a_iVar,
-    const muChar_t **a_pszName,
-    muFloat_t *a_fVal)
+API_EXPORT(void) mupGetConst(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t* a_fVal)
 {
     // A static buffer is needed for the name since i cant return the
     // pointer from the map.
     static muChar_t szName[1024];
 
     MU_TRY
-        muParser_t* const p(AsParser(a_hParser));
+    muParser_t* const p(AsParser(a_hParser));
     const mu::valmap_type ValMap = p->GetConst();
 
     if (a_iVar >= ValMap.size())
@@ -971,7 +890,7 @@ API_EXPORT(void) mupGetConst(muParserHandle_t a_hParser,
     wcsncpy(szName, item->first.c_str(), sizeof(szName));
 #endif
 
-    szName[sizeof(szName)-1] = 0;
+    szName[sizeof(szName) - 1] = 0;
 
     *a_pszName = &szName[0];
     *a_fVal = item->second;
@@ -979,18 +898,17 @@ API_EXPORT(void) mupGetConst(muParserHandle_t a_hParser,
 
     MU_CATCH
 
-        *a_pszName = 0;
+    *a_pszName = 0;
     *a_fVal = 0;
 }
 
 //---------------------------------------------------------------------------
 /** \brief Add a custom value recognition function.
-*/
-API_EXPORT(void) mupAddValIdent(muParserHandle_t a_hParser,
-    muIdentFun_t a_pFun)
+ */
+API_EXPORT(void) mupAddValIdent(muParserHandle_t a_hParser, muIdentFun_t a_pFun)
 {
     MU_TRY
-        muParser_t* p(AsParser(a_hParser));
+    muParser_t* p(AsParser(a_hParser));
     p->AddValIdent(a_pFun);
     MU_CATCH
 }
@@ -1010,7 +928,7 @@ API_EXPORT(muBool_t) mupError(muParserHandle_t a_hParser)
 
 //---------------------------------------------------------------------------
 /** \brief Reset the internal error flag.
-*/
+ */
 API_EXPORT(void) mupErrorReset(muParserHandle_t a_hParser)
 {
     AsParserTag(a_hParser)->bError = false;
@@ -1024,11 +942,11 @@ API_EXPORT(void) mupSetErrorHandler(muParserHandle_t a_hParser, muErrorHandler_t
 
 //---------------------------------------------------------------------------
 /** \brief Return the message associated with the last error.
-*/
+ */
 API_EXPORT(const muChar_t*) mupGetErrorMsg(muParserHandle_t a_hParser)
 {
     ParserTag* const p(AsParserTag(a_hParser));
-    const muChar_t *pMsg = p->exc.GetMsg().c_str();
+    const muChar_t* pMsg = p->exc.GetMsg().c_str();
 
     // C# explodes when pMsg is returned directly. For some reason it can't access
     // the memory where the message lies directly.
@@ -1043,11 +961,11 @@ API_EXPORT(const muChar_t*) mupGetErrorMsg(muParserHandle_t a_hParser)
 
 //---------------------------------------------------------------------------
 /** \brief Return the message associated with the last error.
-*/
+ */
 API_EXPORT(const muChar_t*) mupGetErrorToken(muParserHandle_t a_hParser)
 {
     ParserTag* const p(AsParserTag(a_hParser));
-    const muChar_t *pToken = p->exc.GetToken().c_str();
+    const muChar_t* pToken = p->exc.GetToken().c_str();
 
     // C# explodes when pMsg is returned directly. For some reason it can't access
     // the memory where the message lies directly.
@@ -1062,7 +980,7 @@ API_EXPORT(const muChar_t*) mupGetErrorToken(muParserHandle_t a_hParser)
 
 //---------------------------------------------------------------------------
 /** \brief Return the code associated with the last error.
-*/
+ */
 API_EXPORT(int) mupGetErrorCode(muParserHandle_t a_hParser)
 {
     return AsParserTag(a_hParser)->exc.GetCode();
@@ -1076,7 +994,7 @@ API_EXPORT(int) mupGetErrorPos(muParserHandle_t a_hParser)
 }
 
 ////-----------------------------------------------------------------------------------------------------
-//API_EXPORT(const muChar_t*) mupGetErrorExpr(muParserHandle_t a_hParser)
+// API_EXPORT(const muChar_t*) mupGetErrorExpr(muParserHandle_t a_hParser)
 //{
 //  return AsParserTag(a_hParser)->exc.GetExpr().c_str();
 //}
@@ -1088,9 +1006,9 @@ API_EXPORT(muFloat_t*) mupCreateVar()
 }
 
 //-----------------------------------------------------------------------------------------------------
-API_EXPORT(void) mupReleaseVar(muFloat_t *ptr)
+API_EXPORT(void) mupReleaseVar(muFloat_t* ptr)
 {
     delete ptr;
 }
 
-#endif      // MUPARSER_DLL
+#endif // MUPARSER_DLL
diff --git a/ext_libs/muparser/muParserDLL.h b/ext_libs/muparser/muParserDLL.h
old mode 100755
new mode 100644
index 155ef8a0..ddb93da2
--- a/ext_libs/muparser/muParserDLL.h
+++ b/ext_libs/muparser/muParserDLL.h
@@ -1,238 +1,270 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef MU_PARSER_DLL_H
 #define MU_PARSER_DLL_H
 
 #if defined(WIN32) || defined(_WIN32)
-    #ifdef MUPARSERLIB_EXPORTS
-        #define API_EXPORT(TYPE) __declspec(dllexport) TYPE __cdecl
-    #else
-        #define API_EXPORT(TYPE) __declspec(dllimport) TYPE __cdecl
-    #endif
+#ifdef MUPARSERLIB_EXPORTS
+#define API_EXPORT(TYPE) __declspec(dllexport) TYPE __cdecl
 #else
-    #define API_EXPORT(TYPE) TYPE
+#define API_EXPORT(TYPE) __declspec(dllimport) TYPE __cdecl
+#endif
+#else
+#define API_EXPORT(TYPE) TYPE
 #endif
-
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-/** \file 
-    \brief This file contains the DLL interface of muparser.
-*/
+    /** \file
+        \brief This file contains the DLL interface of muparser.
+    */
 
-// Basic types
-typedef void*  muParserHandle_t;    // parser handle
+    // Basic types
+    typedef void* muParserHandle_t; // parser handle
 
 #ifndef _UNICODE
-    typedef char   muChar_t;            // character type
+    typedef char muChar_t; // character type
 #else
-    typedef wchar_t   muChar_t;            // character type
+typedef wchar_t muChar_t; // character type
 #endif
 
-typedef int    muBool_t;            // boolean type
-typedef int    muInt_t;             // integer type 
-typedef double muFloat_t;           // floating point type
-
-// function types for calculation
-typedef muFloat_t (*muFun0_t )(); 
-typedef muFloat_t (*muFun1_t )(muFloat_t); 
-typedef muFloat_t (*muFun2_t )(muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun3_t )(muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun4_t )(muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun5_t )(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun6_t )(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun7_t )(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun8_t )(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun9_t )(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muFun10_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-
-// Function prototypes for bulkmode functions
-typedef muFloat_t (*muBulkFun0_t )(int, int); 
-typedef muFloat_t (*muBulkFun1_t )(int, int, muFloat_t); 
-typedef muFloat_t (*muBulkFun2_t )(int, int, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun3_t )(int, int, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun4_t )(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun5_t )(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun6_t )(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun7_t )(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun8_t )(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun9_t )(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-typedef muFloat_t (*muBulkFun10_t)(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t); 
-
-typedef muFloat_t (*muMultFun_t)(const muFloat_t*, muInt_t);
-typedef muFloat_t (*muStrFun1_t)(const muChar_t*);
-typedef muFloat_t (*muStrFun2_t)(const muChar_t*, muFloat_t);
-typedef muFloat_t (*muStrFun3_t)(const muChar_t*, muFloat_t, muFloat_t);
-
-// Functions for parser management
-typedef void (*muErrorHandler_t)(muParserHandle_t a_hParser);           // [optional] callback to an error handler
-typedef muFloat_t* (*muFacFun_t)(const muChar_t*, void*);               // [optional] callback for creating new variables
-typedef muInt_t (*muIdentFun_t)(const muChar_t*, muInt_t*, muFloat_t*); // [optional] value identification callbacks
-
-//-----------------------------------------------------------------------------------------------------
-// Constants
-static const int muOPRT_ASCT_LEFT  = 0;
-static const int muOPRT_ASCT_RIGHT = 1;
-
-static const int muBASETYPE_FLOAT  = 0;
-static const int muBASETYPE_INT    = 1;
-
-//-----------------------------------------------------------------------------------------------------
-//
-//
-// muParser C compatible bindings
-//
-//
-//-----------------------------------------------------------------------------------------------------
-
-
-// Basic operations / initialization  
-API_EXPORT(muParserHandle_t) mupCreate(int nBaseType);
-API_EXPORT(void) mupRelease(muParserHandle_t a_hParser);
-API_EXPORT(const muChar_t*) mupGetExpr(muParserHandle_t a_hParser);
-API_EXPORT(void) mupSetExpr(muParserHandle_t a_hParser, const muChar_t *a_szExpr);
-API_EXPORT(void) mupSetVarFactory(muParserHandle_t a_hParser, muFacFun_t a_pFactory, void* pUserData);
-API_EXPORT(const muChar_t*) mupGetVersion(muParserHandle_t a_hParser);
-API_EXPORT(muFloat_t) mupEval(muParserHandle_t a_hParser);
-API_EXPORT(muFloat_t*) mupEvalMulti(muParserHandle_t a_hParser, int *nNum);
-API_EXPORT(void) mupEvalBulk(muParserHandle_t a_hParser, muFloat_t *a_fResult, int nSize);
-
-// Defining callbacks / variables / constants
-API_EXPORT(void) mupDefineFun0(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun0_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun1(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun1_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun2(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun2_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun3(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun3_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun4(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun4_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun5(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun5_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun6(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun6_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun7(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun7_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun8(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun8_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun9(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun9_t a_pFun, muBool_t a_bOptimize);
-API_EXPORT(void) mupDefineFun10(muParserHandle_t a_hParser, const muChar_t *a_szName, muFun10_t a_pFun, muBool_t a_bOptimize);
-
-// Defining bulkmode functions
-API_EXPORT(void) mupDefineBulkFun0(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun0_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun1(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun1_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun2(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun2_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun3(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun3_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun4(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun4_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun5(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun5_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun6(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun6_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun7(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun7_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun8(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun8_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun9(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun9_t a_pFun);
-API_EXPORT(void) mupDefineBulkFun10(muParserHandle_t a_hParser, const muChar_t *a_szName, muBulkFun10_t a_pFun);
-
-// string functions
-API_EXPORT(void) mupDefineStrFun1(muParserHandle_t a_hParser, const muChar_t *a_szName, muStrFun1_t a_pFun);
-API_EXPORT(void) mupDefineStrFun2(muParserHandle_t a_hParser, const muChar_t *a_szName, muStrFun2_t a_pFun);
-API_EXPORT(void) mupDefineStrFun3(muParserHandle_t a_hParser, const muChar_t *a_szName, muStrFun3_t a_pFun);
-
-API_EXPORT(void) mupDefineMultFun( muParserHandle_t a_hParser, 
-                                   const muChar_t* a_szName, 
-                                   muMultFun_t a_pFun, 
-                                   muBool_t a_bOptimize);
-
-API_EXPORT(void) mupDefineOprt( muParserHandle_t a_hParser, 
-                                const muChar_t* a_szName, 
-                                muFun2_t a_pFun, 
-                                muInt_t a_nPrec, 
-                                muInt_t a_nOprtAsct,
-                                muBool_t a_bOptimize);
-
-API_EXPORT(void) mupDefineConst( muParserHandle_t a_hParser, 
-                                 const muChar_t* a_szName, 
-                                 muFloat_t a_fVal );
-
-API_EXPORT(void) mupDefineStrConst( muParserHandle_t a_hParser, 
-                                    const muChar_t* a_szName, 
-                                    const muChar_t *a_sVal );
-
-API_EXPORT(void) mupDefineVar( muParserHandle_t a_hParser, 
-                               const muChar_t* a_szName, 
-                               muFloat_t *a_fVar);
-
-API_EXPORT(void) mupDefineBulkVar( muParserHandle_t a_hParser, 
-                               const muChar_t* a_szName, 
-                               muFloat_t *a_fVar);
-
-API_EXPORT(void) mupDefinePostfixOprt( muParserHandle_t a_hParser, 
-                                       const muChar_t* a_szName, 
-                                       muFun1_t a_pOprt, 
-                                       muBool_t a_bOptimize);
-
-
-API_EXPORT(void) mupDefineInfixOprt( muParserHandle_t a_hParser, 
-                                     const muChar_t* a_szName, 
-                                     muFun1_t a_pOprt, 
-                                     muBool_t a_bOptimize);
-
-// Define character sets for identifiers
-API_EXPORT(void) mupDefineNameChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset);
-API_EXPORT(void) mupDefineOprtChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset);
-API_EXPORT(void) mupDefineInfixOprtChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset);
-
-// Remove all / single variables
-API_EXPORT(void) mupRemoveVar(muParserHandle_t a_hParser, const muChar_t* a_szName);
-API_EXPORT(void) mupClearVar(muParserHandle_t a_hParser);
-API_EXPORT(void) mupClearConst(muParserHandle_t a_hParser);
-API_EXPORT(void) mupClearOprt(muParserHandle_t a_hParser);
-API_EXPORT(void) mupClearFun(muParserHandle_t a_hParser);
-
-// Querying variables / expression variables / constants
-API_EXPORT(int) mupGetExprVarNum(muParserHandle_t a_hParser);
-API_EXPORT(int) mupGetVarNum(muParserHandle_t a_hParser);
-API_EXPORT(int) mupGetConstNum(muParserHandle_t a_hParser);
-API_EXPORT(void) mupGetExprVar(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t** a_pVar);
-API_EXPORT(void) mupGetVar(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t** a_pVar);
-API_EXPORT(void) mupGetConst(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t* a_pVar);
-API_EXPORT(void) mupSetArgSep(muParserHandle_t a_hParser, const muChar_t cArgSep);
-API_EXPORT(void) mupSetDecSep(muParserHandle_t a_hParser, const muChar_t cArgSep);
-API_EXPORT(void) mupSetThousandsSep(muParserHandle_t a_hParser, const muChar_t cArgSep);
-API_EXPORT(void) mupResetLocale(muParserHandle_t a_hParser);
-
-// Add value recognition callbacks
-API_EXPORT(void) mupAddValIdent(muParserHandle_t a_hParser, muIdentFun_t);
-
-// Error handling
-API_EXPORT(muBool_t) mupError(muParserHandle_t a_hParser);
-API_EXPORT(void) mupErrorReset(muParserHandle_t a_hParser);
-API_EXPORT(void) mupSetErrorHandler(muParserHandle_t a_hParser, muErrorHandler_t a_pErrHandler);
-API_EXPORT(const muChar_t*) mupGetErrorMsg(muParserHandle_t a_hParser);
-API_EXPORT(muInt_t) mupGetErrorCode(muParserHandle_t a_hParser);
-API_EXPORT(muInt_t) mupGetErrorPos(muParserHandle_t a_hParser);
-API_EXPORT(const muChar_t*) mupGetErrorToken(muParserHandle_t a_hParser);
-//API_EXPORT(const muChar_t*) mupGetErrorExpr(muParserHandle_t a_hParser);
-
-// This is used for .NET only. It creates a new variable allowing the dll to
-// manage the variable rather than the .NET garbage collector.
-API_EXPORT(muFloat_t*) mupCreateVar();
-API_EXPORT(void) mupReleaseVar(muFloat_t*);
+    typedef int muBool_t;     // boolean type
+    typedef int muInt_t;      // integer type
+    typedef double muFloat_t; // floating point type
+
+    // function types for calculation
+    typedef muFloat_t (*muFun0_t)();
+    typedef muFloat_t (*muFun1_t)(muFloat_t);
+    typedef muFloat_t (*muFun2_t)(muFloat_t, muFloat_t);
+    typedef muFloat_t (*muFun3_t)(muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muFun4_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muFun5_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muFun6_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muFun7_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (
+      *muFun8_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (
+      *muFun9_t)(muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muFun10_t)(muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t,
+                                   muFloat_t);
+
+    // Function prototypes for bulkmode functions
+    typedef muFloat_t (*muBulkFun0_t)(int, int);
+    typedef muFloat_t (*muBulkFun1_t)(int, int, muFloat_t);
+    typedef muFloat_t (*muBulkFun2_t)(int, int, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muBulkFun3_t)(int, int, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muBulkFun4_t)(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muBulkFun5_t)(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muBulkFun6_t)(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (
+      *muBulkFun7_t)(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (
+      *muBulkFun8_t)(int, int, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t, muFloat_t);
+    typedef muFloat_t (*muBulkFun9_t)(int,
+                                      int,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t,
+                                      muFloat_t);
+    typedef muFloat_t (*muBulkFun10_t)(int,
+                                       int,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t,
+                                       muFloat_t);
+
+    typedef muFloat_t (*muMultFun_t)(const muFloat_t*, muInt_t);
+    typedef muFloat_t (*muStrFun1_t)(const muChar_t*);
+    typedef muFloat_t (*muStrFun2_t)(const muChar_t*, muFloat_t);
+    typedef muFloat_t (*muStrFun3_t)(const muChar_t*, muFloat_t, muFloat_t);
+
+    // Functions for parser management
+    typedef void (*muErrorHandler_t)(muParserHandle_t a_hParser); // [optional] callback to an error handler
+    typedef muFloat_t* (*muFacFun_t)(const muChar_t*, void*);     // [optional] callback for creating new variables
+    typedef muInt_t (*muIdentFun_t)(const muChar_t*, muInt_t*, muFloat_t*); // [optional] value identification callbacks
+
+    //-----------------------------------------------------------------------------------------------------
+    // Constants
+    static const int muOPRT_ASCT_LEFT = 0;
+    static const int muOPRT_ASCT_RIGHT = 1;
+
+    static const int muBASETYPE_FLOAT = 0;
+    static const int muBASETYPE_INT = 1;
+
+    //-----------------------------------------------------------------------------------------------------
+    //
+    //
+    // muParser C compatible bindings
+    //
+    //
+    //-----------------------------------------------------------------------------------------------------
+
+    // Basic operations / initialization
+    API_EXPORT(muParserHandle_t) mupCreate(int nBaseType);
+    API_EXPORT(void) mupRelease(muParserHandle_t a_hParser);
+    API_EXPORT(const muChar_t*) mupGetExpr(muParserHandle_t a_hParser);
+    API_EXPORT(void) mupSetExpr(muParserHandle_t a_hParser, const muChar_t* a_szExpr);
+    API_EXPORT(void) mupSetVarFactory(muParserHandle_t a_hParser, muFacFun_t a_pFactory, void* pUserData);
+    API_EXPORT(const muChar_t*) mupGetVersion(muParserHandle_t a_hParser);
+    API_EXPORT(muFloat_t) mupEval(muParserHandle_t a_hParser);
+    API_EXPORT(muFloat_t*) mupEvalMulti(muParserHandle_t a_hParser, int* nNum);
+    API_EXPORT(void) mupEvalBulk(muParserHandle_t a_hParser, muFloat_t* a_fResult, int nSize);
+
+    // Defining callbacks / variables / constants
+    API_EXPORT(void)
+    mupDefineFun0(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun0_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun1(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun1_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun2(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun2_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun3(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun3_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun4(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun4_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun5(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun5_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun6(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun6_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun7(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun7_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun8(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun8_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun9(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun9_t a_pFun, muBool_t a_bOptimize);
+    API_EXPORT(void)
+    mupDefineFun10(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun10_t a_pFun, muBool_t a_bOptimize);
+
+    // Defining bulkmode functions
+    API_EXPORT(void) mupDefineBulkFun0(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun0_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun1(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun1_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun2(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun2_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun3(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun3_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun4(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun4_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun5(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun5_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun6(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun6_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun7(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun7_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun8(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun8_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun9(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun9_t a_pFun);
+    API_EXPORT(void) mupDefineBulkFun10(muParserHandle_t a_hParser, const muChar_t* a_szName, muBulkFun10_t a_pFun);
+
+    // string functions
+    API_EXPORT(void) mupDefineStrFun1(muParserHandle_t a_hParser, const muChar_t* a_szName, muStrFun1_t a_pFun);
+    API_EXPORT(void) mupDefineStrFun2(muParserHandle_t a_hParser, const muChar_t* a_szName, muStrFun2_t a_pFun);
+    API_EXPORT(void) mupDefineStrFun3(muParserHandle_t a_hParser, const muChar_t* a_szName, muStrFun3_t a_pFun);
+
+    API_EXPORT(void)
+    mupDefineMultFun(muParserHandle_t a_hParser, const muChar_t* a_szName, muMultFun_t a_pFun, muBool_t a_bOptimize);
+
+    API_EXPORT(void)
+    mupDefineOprt(muParserHandle_t a_hParser,
+                  const muChar_t* a_szName,
+                  muFun2_t a_pFun,
+                  muInt_t a_nPrec,
+                  muInt_t a_nOprtAsct,
+                  muBool_t a_bOptimize);
+
+    API_EXPORT(void) mupDefineConst(muParserHandle_t a_hParser, const muChar_t* a_szName, muFloat_t a_fVal);
+
+    API_EXPORT(void) mupDefineStrConst(muParserHandle_t a_hParser, const muChar_t* a_szName, const muChar_t* a_sVal);
+
+    API_EXPORT(void) mupDefineVar(muParserHandle_t a_hParser, const muChar_t* a_szName, muFloat_t* a_fVar);
+
+    API_EXPORT(void) mupDefineBulkVar(muParserHandle_t a_hParser, const muChar_t* a_szName, muFloat_t* a_fVar);
+
+    API_EXPORT(void)
+    mupDefinePostfixOprt(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun1_t a_pOprt, muBool_t a_bOptimize);
+
+    API_EXPORT(void)
+    mupDefineInfixOprt(muParserHandle_t a_hParser, const muChar_t* a_szName, muFun1_t a_pOprt, muBool_t a_bOptimize);
+
+    // Define character sets for identifiers
+    API_EXPORT(void) mupDefineNameChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset);
+    API_EXPORT(void) mupDefineOprtChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset);
+    API_EXPORT(void) mupDefineInfixOprtChars(muParserHandle_t a_hParser, const muChar_t* a_szCharset);
+
+    // Remove all / single variables
+    API_EXPORT(void) mupRemoveVar(muParserHandle_t a_hParser, const muChar_t* a_szName);
+    API_EXPORT(void) mupClearVar(muParserHandle_t a_hParser);
+    API_EXPORT(void) mupClearConst(muParserHandle_t a_hParser);
+    API_EXPORT(void) mupClearOprt(muParserHandle_t a_hParser);
+    API_EXPORT(void) mupClearFun(muParserHandle_t a_hParser);
+
+    // Querying variables / expression variables / constants
+    API_EXPORT(int) mupGetExprVarNum(muParserHandle_t a_hParser);
+    API_EXPORT(int) mupGetVarNum(muParserHandle_t a_hParser);
+    API_EXPORT(int) mupGetConstNum(muParserHandle_t a_hParser);
+    API_EXPORT(void)
+    mupGetExprVar(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t** a_pVar);
+    API_EXPORT(void)
+    mupGetVar(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t** a_pVar);
+    API_EXPORT(void)
+    mupGetConst(muParserHandle_t a_hParser, unsigned a_iVar, const muChar_t** a_pszName, muFloat_t* a_pVar);
+    API_EXPORT(void) mupSetArgSep(muParserHandle_t a_hParser, const muChar_t cArgSep);
+    API_EXPORT(void) mupSetDecSep(muParserHandle_t a_hParser, const muChar_t cArgSep);
+    API_EXPORT(void) mupSetThousandsSep(muParserHandle_t a_hParser, const muChar_t cArgSep);
+    API_EXPORT(void) mupResetLocale(muParserHandle_t a_hParser);
+
+    // Add value recognition callbacks
+    API_EXPORT(void) mupAddValIdent(muParserHandle_t a_hParser, muIdentFun_t);
+
+    // Error handling
+    API_EXPORT(muBool_t) mupError(muParserHandle_t a_hParser);
+    API_EXPORT(void) mupErrorReset(muParserHandle_t a_hParser);
+    API_EXPORT(void) mupSetErrorHandler(muParserHandle_t a_hParser, muErrorHandler_t a_pErrHandler);
+    API_EXPORT(const muChar_t*) mupGetErrorMsg(muParserHandle_t a_hParser);
+    API_EXPORT(muInt_t) mupGetErrorCode(muParserHandle_t a_hParser);
+    API_EXPORT(muInt_t) mupGetErrorPos(muParserHandle_t a_hParser);
+    API_EXPORT(const muChar_t*) mupGetErrorToken(muParserHandle_t a_hParser);
+    // API_EXPORT(const muChar_t*) mupGetErrorExpr(muParserHandle_t a_hParser);
+
+    // This is used for .NET only. It creates a new variable allowing the dll to
+    // manage the variable rather than the .NET garbage collector.
+    API_EXPORT(muFloat_t*) mupCreateVar();
+    API_EXPORT(void) mupReleaseVar(muFloat_t*);
 
 #ifdef __cplusplus
 }
diff --git a/ext_libs/muparser/muParserDef.h b/ext_libs/muparser/muParserDef.h
old mode 100755
new mode 100644
index 437f2eaf..87d2510b
--- a/ext_libs/muparser/muParserDef.h
+++ b/ext_libs/muparser/muParserDef.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2014 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #ifndef MUP_DEF_H
 #define MUP_DEF_H
@@ -51,128 +51,125 @@
 */
 #define MUP_BASETYPE double
 
-/** \brief Activate this option in order to compile with OpenMP support. 
+/** \brief Activate this option in order to compile with OpenMP support.
 
-  OpenMP is used only in the bulk mode it may increase the performance a bit. 
+  OpenMP is used only in the bulk mode it may increase the performance a bit.
 */
 //#define MUP_USE_OPENMP
 
 #if defined(_UNICODE)
-  /** \brief Definition of the basic parser string type. */
-  #define MUP_STRING_TYPE std::wstring
+/** \brief Definition of the basic parser string type. */
+#define MUP_STRING_TYPE std::wstring
 
-  #if !defined(_T)
-    #define _T(x) L##x
-  #endif // not defined _T
+#if !defined(_T)
+#define _T(x) L##x
+#endif // not defined _T
 #else
-  #ifndef _T
-  #define _T(x) x
-  #endif
-  
-  /** \brief Definition of the basic parser string type. */
-  #define MUP_STRING_TYPE std::string
+#ifndef _T
+#define _T(x) x
+#endif
+
+/** \brief Definition of the basic parser string type. */
+#define MUP_STRING_TYPE std::string
 #endif
 
 #if defined(_DEBUG)
-  /** \brief Debug macro to force an abortion of the programm with a certain message.
-  */
-  #define MUP_FAIL(MSG)     \
-          {                 \
-            bool MSG=false; \
-            assert(MSG);    \
-          }
-
-    /** \brief An assertion that does not kill the program.
-
-        This macro is neutralised in UNICODE builds. It's
-        too difficult to translate.
-    */
-    #define MUP_ASSERT(COND)                         \
-            if (!(COND))                             \
-            {                                        \
-              stringstream_type ss;                  \
-              ss << _T("Assertion \"") _T(#COND) _T("\" failed: ") \
-                 << __FILE__ << _T(" line ")         \
-                 << __LINE__ << _T(".");             \
-              throw ParserError( ss.str() );         \
-            }
+/** \brief Debug macro to force an abortion of the programm with a certain message.
+ */
+#define MUP_FAIL(MSG)     \
+    {                     \
+        bool MSG = false; \
+        assert(MSG);      \
+    }
+
+/** \brief An assertion that does not kill the program.
+
+    This macro is neutralised in UNICODE builds. It's
+    too difficult to translate.
+*/
+#define MUP_ASSERT(COND)                                                                                         \
+    if (!(COND))                                                                                                 \
+    {                                                                                                            \
+        stringstream_type ss;                                                                                    \
+        ss << _T("Assertion \"") _T(#COND) _T("\" failed: ") << __FILE__ << _T(" line ") << __LINE__ << _T("."); \
+        throw ParserError(ss.str());                                                                             \
+    }
 #else
-  #define MUP_FAIL(MSG)
-  #define MUP_ASSERT(COND)
+#define MUP_FAIL(MSG)
+#define MUP_ASSERT(COND)
 #endif
 
-
 namespace mu
 {
 #if defined(_UNICODE)
 
-  //------------------------------------------------------------------------------
-  /** \brief Encapsulate wcout. */
-  inline std::wostream& console()
-  {
+//------------------------------------------------------------------------------
+/** \brief Encapsulate wcout. */
+inline std::wostream& console()
+{
     return std::wcout;
-  }
+}
 
-  /** \brief Encapsulate cin. */
-  inline std::wistream& console_in()
-  {
+/** \brief Encapsulate cin. */
+inline std::wistream& console_in()
+{
     return std::wcin;
-  }
+}
 
 #else
 
-  /** \brief Encapsulate cout. 
-  
-    Used for supporting UNICODE more easily.
-  */
-  inline std::ostream& console()
-  {
+/** \brief Encapsulate cout.
+
+  Used for supporting UNICODE more easily.
+*/
+inline std::ostream& console()
+{
     return std::cout;
-  }
+}
 
-  /** \brief Encapsulate cin. 
+/** \brief Encapsulate cin.
 
-    Used for supporting UNICODE more easily.
-  */
-  inline std::istream& console_in()
-  {
+  Used for supporting UNICODE more easily.
+*/
+inline std::istream& console_in()
+{
     return std::cin;
-  }
+}
 
 #endif
 
-  //------------------------------------------------------------------------------
-  /** \brief Bytecode values.
+//------------------------------------------------------------------------------
+/** \brief Bytecode values.
 
-      \attention The order of the operator entries must match the order in ParserBase::c_DefaultOprt!
-  */
-  enum ECmdCode
-  {
+    \attention The order of the operator entries must match the order in ParserBase::c_DefaultOprt!
+*/
+enum ECmdCode
+{
     // The following are codes for built in binary operators
     // apart from built in operators the user has the opportunity to
     // add user defined operators.
-    cmLE            = 0,   ///< Operator item:  less or equal
-    cmGE            = 1,   ///< Operator item:  greater or equal
-    cmNEQ           = 2,   ///< Operator item:  not equal
-    cmEQ            = 3,   ///< Operator item:  equals
-    cmLT            = 4,   ///< Operator item:  less than
-    cmGT            = 5,   ///< Operator item:  greater than
-    cmADD           = 6,   ///< Operator item:  add
-    cmSUB           = 7,   ///< Operator item:  subtract
-    cmMUL           = 8,   ///< Operator item:  multiply
-    cmDIV           = 9,   ///< Operator item:  division
-    cmPOW           = 10,  ///< Operator item:  y to the power of ...
-    cmLAND          = 11,
-    cmLOR           = 12,
-    cmASSIGN        = 13,  ///< Operator item:  Assignment operator
-    cmBO            = 14,  ///< Operator item:  opening bracket
-    cmBC            = 15,  ///< Operator item:  closing bracket
-    cmIF            = 16,  ///< For use in the ternary if-then-else operator
-    cmELSE          = 17,  ///< For use in the ternary if-then-else operator
-    cmENDIF         = 18,  ///< For use in the ternary if-then-else operator
-    cmARG_SEP       = 19,  ///< function argument separator
-    cmVAR           = 20,  ///< variable item
-    cmVAL           = 21,  ///< value item
+    cmLE = 0,   ///< Operator item:  less or equal
+    cmGE = 1,   ///< Operator item:  greater or equal
+    cmNEQ = 2,  ///< Operator item:  not equal
+    cmEQ = 3,   ///< Operator item:  equals
+    cmLT = 4,   ///< Operator item:  less than
+    cmGT = 5,   ///< Operator item:  greater than
+    cmADD = 6,  ///< Operator item:  add
+    cmSUB = 7,  ///< Operator item:  subtract
+    cmMUL = 8,  ///< Operator item:  multiply
+    cmDIV = 9,  ///< Operator item:  division
+    cmPOW = 10, ///< Operator item:  y to the power of ...
+    cmLAND = 11,
+    cmLOR = 12,
+    cmASSIGN = 13,  ///< Operator item:  Assignment operator
+    cmBO = 14,      ///< Operator item:  opening bracket
+    cmBC = 15,      ///< Operator item:  closing bracket
+    cmIF = 16,      ///< For use in the ternary if-then-else operator
+    cmELSE = 17,    ///< For use in the ternary if-then-else operator
+    cmENDIF = 18,   ///< For use in the ternary if-then-else operator
+    cmARG_SEP = 19, ///< function argument separator
+    cmVAR = 20,     ///< variable item
+    cmVAL = 21,     ///< value item
 
     // For optimization purposes
     cmVARPOW2,
@@ -182,187 +179,226 @@ namespace mu
     cmPOW2,
 
     // operators and functions
-    cmFUNC,                ///< Code for a generic function item
-    cmFUNC_STR,            ///< Code for a function with a string parameter
-    cmFUNC_BULK,           ///< Special callbacks for Bulk mode with an additional parameter for the bulk index 
-    cmSTRING,              ///< Code for a string token
-    cmOPRT_BIN,            ///< user defined binary operator
-    cmOPRT_POSTFIX,        ///< code for postfix operators
-    cmOPRT_INFIX,          ///< code for infix operators
-    cmEND,                 ///< end of formula
-    cmUNKNOWN              ///< uninitialized item
-  };
-
-  //------------------------------------------------------------------------------
-  /** \brief Types internally used by the parser.
-  */
-  enum ETypeCode
-  {
-    tpSTR  = 0,     ///< String type (Function arguments and constants only, no string variables)
-    tpDBL  = 1,     ///< Floating point variables
-    tpVOID = 2      ///< Undefined type.
-  };
-
-  //------------------------------------------------------------------------------
-  enum EParserVersionInfo
-  {
+    cmFUNC,         ///< Code for a generic function item
+    cmFUNC_STR,     ///< Code for a function with a string parameter
+    cmFUNC_BULK,    ///< Special callbacks for Bulk mode with an additional parameter for the bulk index
+    cmSTRING,       ///< Code for a string token
+    cmOPRT_BIN,     ///< user defined binary operator
+    cmOPRT_POSTFIX, ///< code for postfix operators
+    cmOPRT_INFIX,   ///< code for infix operators
+    cmEND,          ///< end of formula
+    cmUNKNOWN       ///< uninitialized item
+};
+
+//------------------------------------------------------------------------------
+/** \brief Types internally used by the parser.
+ */
+enum ETypeCode
+{
+    tpSTR = 0, ///< String type (Function arguments and constants only, no string variables)
+    tpDBL = 1, ///< Floating point variables
+    tpVOID = 2 ///< Undefined type.
+};
+
+//------------------------------------------------------------------------------
+enum EParserVersionInfo
+{
     pviBRIEF,
     pviFULL
-  };
+};
 
-  //------------------------------------------------------------------------------
-  /** \brief Parser operator precedence values. */
-  enum EOprtAssociativity
-  {
-    oaLEFT  = 0,
+//------------------------------------------------------------------------------
+/** \brief Parser operator precedence values. */
+enum EOprtAssociativity
+{
+    oaLEFT = 0,
     oaRIGHT = 1,
-    oaNONE  = 2
-  };
+    oaNONE = 2
+};
 
-  //------------------------------------------------------------------------------
-  /** \brief Parser operator precedence values. */
-  enum EOprtPrecedence
-  {
+//------------------------------------------------------------------------------
+/** \brief Parser operator precedence values. */
+enum EOprtPrecedence
+{
     // binary operators
-    prLOR     = 1,
-    prLAND    = 2,
-    prLOGIC   = 3,  ///< logic operators
-    prCMP     = 4,  ///< comparsion operators
-    prADD_SUB = 5,  ///< addition
-    prMUL_DIV = 6,  ///< multiplication/division
-    prPOW     = 7,  ///< power operator priority (highest)
+    prLOR = 1,
+    prLAND = 2,
+    prLOGIC = 3,   ///< logic operators
+    prCMP = 4,     ///< comparsion operators
+    prADD_SUB = 5, ///< addition
+    prMUL_DIV = 6, ///< multiplication/division
+    prPOW = 7,     ///< power operator priority (highest)
 
     // infix operators
-    prINFIX   = 6, ///< Signs have a higher priority than ADD_SUB, but lower than power operator
-    prPOSTFIX = 6  ///< Postfix operator priority (currently unused)
-  };
-
-  //------------------------------------------------------------------------------
-  // basic types
-
-  /** \brief The numeric datatype used by the parser. 
-  
-    Normally this is a floating point type either single or double precision.
-  */
-  typedef MUP_BASETYPE value_type;
-
-  /** \brief The stringtype used by the parser. 
-
-    Depends on wether UNICODE is used or not.
-  */
-  typedef MUP_STRING_TYPE string_type;
+    prINFIX = 6,  ///< Signs have a higher priority than ADD_SUB, but lower than power operator
+    prPOSTFIX = 6 ///< Postfix operator priority (currently unused)
+};
 
-  /** \brief The character type used by the parser. 
-  
-    Depends on wether UNICODE is used or not.
-  */
-  typedef string_type::value_type char_type;
+//------------------------------------------------------------------------------
+// basic types
 
-  /** \brief Typedef for easily using stringstream that respect the parser stringtype. */
-  typedef std::basic_stringstream<char_type,
-                                  std::char_traits<char_type>,
-                                  std::allocator<char_type> > stringstream_type;
+/** \brief The numeric datatype used by the parser.
 
-  // Data container types
-
-  /** \brief Type used for storing variables. */
-  typedef std::map<string_type, value_type*> varmap_type;
-  
-  /** \brief Type used for storing constants. */
-  typedef std::map<string_type, value_type> valmap_type;
-  
-  /** \brief Type for assigning a string name to an index in the internal string table. */
-  typedef std::map<string_type, std::size_t> strmap_type;
-
-  // Parser callbacks
-  
-  /** \brief Callback type used for functions without arguments. */
-  typedef value_type (*generic_fun_type)();
-
-  /** \brief Callback type used for functions without arguments. */
-  typedef value_type (*fun_type0)();
-
-  /** \brief Callback type used for functions with a single arguments. */
-  typedef value_type (*fun_type1)(value_type);
-
-  /** \brief Callback type used for functions with two arguments. */
-  typedef value_type (*fun_type2)(value_type, value_type);
-
-  /** \brief Callback type used for functions with three arguments. */
-  typedef value_type (*fun_type3)(value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with four arguments. */
-  typedef value_type (*fun_type4)(value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*fun_type5)(value_type, value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*fun_type6)(value_type, value_type, value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*fun_type7)(value_type, value_type, value_type, value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*fun_type8)(value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*fun_type9)(value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*fun_type10)(value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions without arguments. */
-  typedef value_type (*bulkfun_type0)(int, int);
-
-  /** \brief Callback type used for functions with a single arguments. */
-  typedef value_type (*bulkfun_type1)(int, int, value_type);
-
-  /** \brief Callback type used for functions with two arguments. */
-  typedef value_type (*bulkfun_type2)(int, int, value_type, value_type);
-
-  /** \brief Callback type used for functions with three arguments. */
-  typedef value_type (*bulkfun_type3)(int, int, value_type, value_type, value_type);
-
-  /** \brief Callback type used for functions with four arguments. */
-  typedef value_type (*bulkfun_type4)(int, int, value_type, value_type, value_type, value_type);
+  Normally this is a floating point type either single or double precision.
+*/
+typedef MUP_BASETYPE value_type;
 
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*bulkfun_type5)(int, int, value_type, value_type, value_type, value_type, value_type);
+/** \brief The stringtype used by the parser.
 
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*bulkfun_type6)(int, int, value_type, value_type, value_type, value_type, value_type, value_type);
+  Depends on wether UNICODE is used or not.
+*/
+typedef MUP_STRING_TYPE string_type;
 
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*bulkfun_type7)(int, int, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+/** \brief The character type used by the parser.
 
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*bulkfun_type8)(int, int, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+  Depends on wether UNICODE is used or not.
+*/
+typedef string_type::value_type char_type;
 
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*bulkfun_type9)(int, int, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+/** \brief Typedef for easily using stringstream that respect the parser stringtype. */
+typedef std::basic_stringstream<char_type, std::char_traits<char_type>, std::allocator<char_type> > stringstream_type;
 
-  /** \brief Callback type used for functions with five arguments. */
-  typedef value_type (*bulkfun_type10)(int, int, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+// Data container types
 
-  /** \brief Callback type used for functions with a variable argument list. */
-  typedef value_type (*multfun_type)(const value_type*, int);
+/** \brief Type used for storing variables. */
+typedef std::map<string_type, value_type*> varmap_type;
 
-  /** \brief Callback type used for functions taking a string as an argument. */
-  typedef value_type (*strfun_type1)(const char_type*);
+/** \brief Type used for storing constants. */
+typedef std::map<string_type, value_type> valmap_type;
 
-  /** \brief Callback type used for functions taking a string and a value as arguments. */
-  typedef value_type (*strfun_type2)(const char_type*, value_type);
+/** \brief Type for assigning a string name to an index in the internal string table. */
+typedef std::map<string_type, std::size_t> strmap_type;
 
-  /** \brief Callback type used for functions taking a string and two values as arguments. */
-  typedef value_type (*strfun_type3)(const char_type*, value_type, value_type);
+// Parser callbacks
 
-  /** \brief Callback used for functions that identify values in a string. */
-  typedef int (*identfun_type)(const char_type *sExpr, int *nPos, value_type *fVal);
+/** \brief Callback type used for functions without arguments. */
+typedef value_type (*generic_fun_type)();
+
+/** \brief Callback type used for functions without arguments. */
+typedef value_type (*fun_type0)();
+
+/** \brief Callback type used for functions with a single arguments. */
+typedef value_type (*fun_type1)(value_type);
+
+/** \brief Callback type used for functions with two arguments. */
+typedef value_type (*fun_type2)(value_type, value_type);
+
+/** \brief Callback type used for functions with three arguments. */
+typedef value_type (*fun_type3)(value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with four arguments. */
+typedef value_type (*fun_type4)(value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*fun_type5)(value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*fun_type6)(value_type, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*fun_type7)(value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (
+  *fun_type8)(value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (
+  *fun_type9)(value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*fun_type10)(value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type,
+                                 value_type);
+
+/** \brief Callback type used for functions without arguments. */
+typedef value_type (*bulkfun_type0)(int, int);
+
+/** \brief Callback type used for functions with a single arguments. */
+typedef value_type (*bulkfun_type1)(int, int, value_type);
+
+/** \brief Callback type used for functions with two arguments. */
+typedef value_type (*bulkfun_type2)(int, int, value_type, value_type);
+
+/** \brief Callback type used for functions with three arguments. */
+typedef value_type (*bulkfun_type3)(int, int, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with four arguments. */
+typedef value_type (*bulkfun_type4)(int, int, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*bulkfun_type5)(int, int, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*bulkfun_type6)(int, int, value_type, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (
+  *bulkfun_type7)(int, int, value_type, value_type, value_type, value_type, value_type, value_type, value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*bulkfun_type8)(int,
+                                    int,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type);
 
-  /** \brief Callback used for variable creation factory functions. */
-  typedef value_type* (*facfun_type)(const char_type*, void*);
-} // end of namespace
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*bulkfun_type9)(int,
+                                    int,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type,
+                                    value_type);
+
+/** \brief Callback type used for functions with five arguments. */
+typedef value_type (*bulkfun_type10)(int,
+                                     int,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type,
+                                     value_type);
+
+/** \brief Callback type used for functions with a variable argument list. */
+typedef value_type (*multfun_type)(const value_type*, int);
+
+/** \brief Callback type used for functions taking a string as an argument. */
+typedef value_type (*strfun_type1)(const char_type*);
+
+/** \brief Callback type used for functions taking a string and a value as arguments. */
+typedef value_type (*strfun_type2)(const char_type*, value_type);
+
+/** \brief Callback type used for functions taking a string and two values as arguments. */
+typedef value_type (*strfun_type3)(const char_type*, value_type, value_type);
+
+/** \brief Callback used for functions that identify values in a string. */
+typedef int (*identfun_type)(const char_type* sExpr, int* nPos, value_type* fVal);
+
+/** \brief Callback used for variable creation factory functions. */
+typedef value_type* (*facfun_type)(const char_type*, void*);
+} // namespace mu
 
 #endif
-
diff --git a/ext_libs/muparser/muParserError.cpp b/ext_libs/muparser/muParserError.cpp
old mode 100755
new mode 100644
index 6fe4e1d2..2a932e75
--- a/ext_libs/muparser/muParserError.cpp
+++ b/ext_libs/muparser/muParserError.cpp
@@ -1,244 +1,217 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include "muParserError.h"
 
-
 namespace mu
 {
-  const ParserErrorMsg ParserErrorMsg::m_Instance;
+const ParserErrorMsg ParserErrorMsg::m_Instance;
 
-  //------------------------------------------------------------------------------
-  const ParserErrorMsg& ParserErrorMsg::Instance()
-  {
+//------------------------------------------------------------------------------
+const ParserErrorMsg& ParserErrorMsg::Instance()
+{
     return m_Instance;
-  }
-
-  //------------------------------------------------------------------------------
-  string_type ParserErrorMsg::operator[](unsigned a_iIdx) const
-  {
-    return (a_iIdx<m_vErrMsg.size()) ? m_vErrMsg[a_iIdx] : string_type();
-  }
-
-  //---------------------------------------------------------------------------
-  ParserErrorMsg::~ParserErrorMsg()
-  {}
-
-  //---------------------------------------------------------------------------
-  /** \brief Assignement operator is deactivated.
-  */
-  ParserErrorMsg& ParserErrorMsg::operator=(const ParserErrorMsg& )
-  {
+}
+
+//------------------------------------------------------------------------------
+string_type ParserErrorMsg::operator[](unsigned a_iIdx) const
+{
+    return (a_iIdx < m_vErrMsg.size()) ? m_vErrMsg[a_iIdx] : string_type();
+}
+
+//---------------------------------------------------------------------------
+ParserErrorMsg::~ParserErrorMsg() {}
+
+//---------------------------------------------------------------------------
+/** \brief Assignement operator is deactivated.
+ */
+ParserErrorMsg& ParserErrorMsg::operator=(const ParserErrorMsg&)
+{
     assert(false);
     return *this;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  ParserErrorMsg::ParserErrorMsg(const ParserErrorMsg&)
-  {}
+//---------------------------------------------------------------------------
+ParserErrorMsg::ParserErrorMsg(const ParserErrorMsg&) {}
 
-  //---------------------------------------------------------------------------
-  ParserErrorMsg::ParserErrorMsg()
-    :m_vErrMsg(0)
-  {
+//---------------------------------------------------------------------------
+ParserErrorMsg::ParserErrorMsg() : m_vErrMsg(0)
+{
     m_vErrMsg.resize(ecCOUNT);
 
-    m_vErrMsg[ecUNASSIGNABLE_TOKEN]     = _T("Unexpected token \"$TOK$\" found at position $POS$.");
-    m_vErrMsg[ecINTERNAL_ERROR]         = _T("Internal error");
-    m_vErrMsg[ecINVALID_NAME]           = _T("Invalid function-, variable- or constant name: \"$TOK$\".");
-    m_vErrMsg[ecINVALID_BINOP_IDENT]    = _T("Invalid binary operator identifier: \"$TOK$\".");
-    m_vErrMsg[ecINVALID_INFIX_IDENT]    = _T("Invalid infix operator identifier: \"$TOK$\".");
-    m_vErrMsg[ecINVALID_POSTFIX_IDENT]  = _T("Invalid postfix operator identifier: \"$TOK$\".");
-    m_vErrMsg[ecINVALID_FUN_PTR]        = _T("Invalid pointer to callback function.");
-    m_vErrMsg[ecEMPTY_EXPRESSION]       = _T("Expression is empty.");
-    m_vErrMsg[ecINVALID_VAR_PTR]        = _T("Invalid pointer to variable.");
-    m_vErrMsg[ecUNEXPECTED_OPERATOR]    = _T("Unexpected operator \"$TOK$\" found at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_EOF]         = _T("Unexpected end of expression at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_ARG_SEP]     = _T("Unexpected argument separator at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_PARENS]      = _T("Unexpected parenthesis \"$TOK$\" at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_FUN]         = _T("Unexpected function \"$TOK$\" at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_VAL]         = _T("Unexpected value \"$TOK$\" found at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_VAR]         = _T("Unexpected variable \"$TOK$\" found at position $POS$");
-    m_vErrMsg[ecUNEXPECTED_ARG]         = _T("Function arguments used without a function (position: $POS$)");
-    m_vErrMsg[ecMISSING_PARENS]         = _T("Missing parenthesis");
-    m_vErrMsg[ecTOO_MANY_PARAMS]        = _T("Too many parameters for function \"$TOK$\" at expression position $POS$");
-    m_vErrMsg[ecTOO_FEW_PARAMS]         = _T("Too few parameters for function \"$TOK$\" at expression position $POS$");
-    m_vErrMsg[ecDIV_BY_ZERO]            = _T("Divide by zero");
-    m_vErrMsg[ecDOMAIN_ERROR]           = _T("Domain error");
-    m_vErrMsg[ecNAME_CONFLICT]          = _T("Name conflict");
-    m_vErrMsg[ecOPT_PRI]                = _T("Invalid value for operator priority (must be greater or equal to zero).");
-    m_vErrMsg[ecBUILTIN_OVERLOAD]       = _T("user defined binary operator \"$TOK$\" conflicts with a built in operator.");
-    m_vErrMsg[ecUNEXPECTED_STR]         = _T("Unexpected string token found at position $POS$.");
-    m_vErrMsg[ecUNTERMINATED_STRING]    = _T("Unterminated string starting at position $POS$.");
-    m_vErrMsg[ecSTRING_EXPECTED]        = _T("String function called with a non string type of argument.");
-    m_vErrMsg[ecVAL_EXPECTED]           = _T("String value used where a numerical argument is expected.");
-    m_vErrMsg[ecOPRT_TYPE_CONFLICT]     = _T("No suitable overload for operator \"$TOK$\" at position $POS$.");
-    m_vErrMsg[ecSTR_RESULT]             = _T("Function result is a string.");
-    m_vErrMsg[ecGENERIC]                = _T("Parser error.");
-    m_vErrMsg[ecLOCALE]                 = _T("Decimal separator is identic to function argument separator.");
+    m_vErrMsg[ecUNASSIGNABLE_TOKEN] = _T("Unexpected token \"$TOK$\" found at position $POS$.");
+    m_vErrMsg[ecINTERNAL_ERROR] = _T("Internal error");
+    m_vErrMsg[ecINVALID_NAME] = _T("Invalid function-, variable- or constant name: \"$TOK$\".");
+    m_vErrMsg[ecINVALID_BINOP_IDENT] = _T("Invalid binary operator identifier: \"$TOK$\".");
+    m_vErrMsg[ecINVALID_INFIX_IDENT] = _T("Invalid infix operator identifier: \"$TOK$\".");
+    m_vErrMsg[ecINVALID_POSTFIX_IDENT] = _T("Invalid postfix operator identifier: \"$TOK$\".");
+    m_vErrMsg[ecINVALID_FUN_PTR] = _T("Invalid pointer to callback function.");
+    m_vErrMsg[ecEMPTY_EXPRESSION] = _T("Expression is empty.");
+    m_vErrMsg[ecINVALID_VAR_PTR] = _T("Invalid pointer to variable.");
+    m_vErrMsg[ecUNEXPECTED_OPERATOR] = _T("Unexpected operator \"$TOK$\" found at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_EOF] = _T("Unexpected end of expression at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_ARG_SEP] = _T("Unexpected argument separator at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_PARENS] = _T("Unexpected parenthesis \"$TOK$\" at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_FUN] = _T("Unexpected function \"$TOK$\" at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_VAL] = _T("Unexpected value \"$TOK$\" found at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_VAR] = _T("Unexpected variable \"$TOK$\" found at position $POS$");
+    m_vErrMsg[ecUNEXPECTED_ARG] = _T("Function arguments used without a function (position: $POS$)");
+    m_vErrMsg[ecMISSING_PARENS] = _T("Missing parenthesis");
+    m_vErrMsg[ecTOO_MANY_PARAMS] = _T("Too many parameters for function \"$TOK$\" at expression position $POS$");
+    m_vErrMsg[ecTOO_FEW_PARAMS] = _T("Too few parameters for function \"$TOK$\" at expression position $POS$");
+    m_vErrMsg[ecDIV_BY_ZERO] = _T("Divide by zero");
+    m_vErrMsg[ecDOMAIN_ERROR] = _T("Domain error");
+    m_vErrMsg[ecNAME_CONFLICT] = _T("Name conflict");
+    m_vErrMsg[ecOPT_PRI] = _T("Invalid value for operator priority (must be greater or equal to zero).");
+    m_vErrMsg[ecBUILTIN_OVERLOAD] = _T("user defined binary operator \"$TOK$\" conflicts with a built in operator.");
+    m_vErrMsg[ecUNEXPECTED_STR] = _T("Unexpected string token found at position $POS$.");
+    m_vErrMsg[ecUNTERMINATED_STRING] = _T("Unterminated string starting at position $POS$.");
+    m_vErrMsg[ecSTRING_EXPECTED] = _T("String function called with a non string type of argument.");
+    m_vErrMsg[ecVAL_EXPECTED] = _T("String value used where a numerical argument is expected.");
+    m_vErrMsg[ecOPRT_TYPE_CONFLICT] = _T("No suitable overload for operator \"$TOK$\" at position $POS$.");
+    m_vErrMsg[ecSTR_RESULT] = _T("Function result is a string.");
+    m_vErrMsg[ecGENERIC] = _T("Parser error.");
+    m_vErrMsg[ecLOCALE] = _T("Decimal separator is identic to function argument separator.");
     m_vErrMsg[ecUNEXPECTED_CONDITIONAL] = _T("The \"$TOK$\" operator must be preceeded by a closing bracket.");
-    m_vErrMsg[ecMISSING_ELSE_CLAUSE]    = _T("If-then-else operator is missing an else clause");
-    m_vErrMsg[ecMISPLACED_COLON]        = _T("Misplaced colon at position $POS$");
-    m_vErrMsg[ecUNREASONABLE_NUMBER_OF_COMPUTATIONS] = _T("Number of computations to small for bulk mode. (Vectorisation overhead too costly)");
-    
-    #if defined(_DEBUG)
-      for (int i=0; i<ecCOUNT; ++i)
+    m_vErrMsg[ecMISSING_ELSE_CLAUSE] = _T("If-then-else operator is missing an else clause");
+    m_vErrMsg[ecMISPLACED_COLON] = _T("Misplaced colon at position $POS$");
+    m_vErrMsg[ecUNREASONABLE_NUMBER_OF_COMPUTATIONS] =
+      _T("Number of computations to small for bulk mode. (Vectorisation overhead too costly)");
+
+#if defined(_DEBUG)
+    for (int i = 0; i < ecCOUNT; ++i)
         if (!m_vErrMsg[i].length())
-          assert(false);
-    #endif
-  }
-
-  //---------------------------------------------------------------------------
-  //
-  //  ParserError class
-  //
-  //---------------------------------------------------------------------------
-
-  /** \brief Default constructor. */
-  ParserError::ParserError()
-    :m_strMsg()
-    ,m_strFormula()
-    ,m_strTok()
-    ,m_iPos(-1)
-    ,m_iErrc(ecUNDEFINED)
-    ,m_ErrMsg(ParserErrorMsg::Instance())
-  {
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief This Constructor is used for internal exceptions only. 
-      
-    It does not contain any information but the error code.
-  */
-  ParserError::ParserError(EErrorCodes a_iErrc) 
-    :m_strMsg()
-    ,m_strFormula()
-    ,m_strTok()
-    ,m_iPos(-1)
-    ,m_iErrc(a_iErrc)
-    ,m_ErrMsg(ParserErrorMsg::Instance())
-  {
+            assert(false);
+#endif
+}
+
+//---------------------------------------------------------------------------
+//
+//  ParserError class
+//
+//---------------------------------------------------------------------------
+
+/** \brief Default constructor. */
+ParserError::ParserError() :
+    m_strMsg(), m_strFormula(), m_strTok(), m_iPos(-1), m_iErrc(ecUNDEFINED), m_ErrMsg(ParserErrorMsg::Instance())
+{
+}
+
+//------------------------------------------------------------------------------
+/** \brief This Constructor is used for internal exceptions only.
+
+  It does not contain any information but the error code.
+*/
+ParserError::ParserError(EErrorCodes a_iErrc) :
+    m_strMsg(), m_strFormula(), m_strTok(), m_iPos(-1), m_iErrc(a_iErrc), m_ErrMsg(ParserErrorMsg::Instance())
+{
     m_strMsg = m_ErrMsg[m_iErrc];
     stringstream_type stream;
     stream << (int)m_iPos;
     ReplaceSubString(m_strMsg, _T("$POS$"), stream.str());
     ReplaceSubString(m_strMsg, _T("$TOK$"), m_strTok);
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Construct an error from a message text. */
-  ParserError::ParserError(const string_type &sMsg) 
-    :m_ErrMsg(ParserErrorMsg::Instance())
-  {
+//------------------------------------------------------------------------------
+/** \brief Construct an error from a message text. */
+ParserError::ParserError(const string_type& sMsg) : m_ErrMsg(ParserErrorMsg::Instance())
+{
     Reset();
     m_strMsg = sMsg;
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Construct an error object. 
-      \param [in] a_iErrc the error code.
-      \param [in] sTok The token string related to this error.
-      \param [in] sExpr The expression related to the error.
-      \param [in] a_iPos the position in the expression where the error occurred. 
-  */
-  ParserError::ParserError( EErrorCodes iErrc,
-                            const string_type &sTok,
-                            const string_type &sExpr,
-                            int iPos )
-    :m_strMsg()
-    ,m_strFormula(sExpr)
-    ,m_strTok(sTok)
-    ,m_iPos(iPos)
-    ,m_iErrc(iErrc)
-    ,m_ErrMsg(ParserErrorMsg::Instance())
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Construct an error object.
+    \param [in] a_iErrc the error code.
+    \param [in] sTok The token string related to this error.
+    \param [in] sExpr The expression related to the error.
+    \param [in] a_iPos the position in the expression where the error occurred.
+*/
+ParserError::ParserError(EErrorCodes iErrc, const string_type& sTok, const string_type& sExpr, int iPos) :
+    m_strMsg(), m_strFormula(sExpr), m_strTok(sTok), m_iPos(iPos), m_iErrc(iErrc), m_ErrMsg(ParserErrorMsg::Instance())
+{
     m_strMsg = m_ErrMsg[m_iErrc];
     stringstream_type stream;
     stream << (int)m_iPos;
     ReplaceSubString(m_strMsg, _T("$POS$"), stream.str());
     ReplaceSubString(m_strMsg, _T("$TOK$"), m_strTok);
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Construct an error object. 
-      \param [in] iErrc the error code.
-      \param [in] iPos the position in the expression where the error occurred. 
-      \param [in] sTok The token string related to this error.
-  */
-  ParserError::ParserError(EErrorCodes iErrc, int iPos, const string_type &sTok) 
-    :m_strMsg()
-    ,m_strFormula()
-    ,m_strTok(sTok)
-    ,m_iPos(iPos)
-    ,m_iErrc(iErrc)
-    ,m_ErrMsg(ParserErrorMsg::Instance())
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Construct an error object.
+    \param [in] iErrc the error code.
+    \param [in] iPos the position in the expression where the error occurred.
+    \param [in] sTok The token string related to this error.
+*/
+ParserError::ParserError(EErrorCodes iErrc, int iPos, const string_type& sTok) :
+    m_strMsg(), m_strFormula(), m_strTok(sTok), m_iPos(iPos), m_iErrc(iErrc), m_ErrMsg(ParserErrorMsg::Instance())
+{
     m_strMsg = m_ErrMsg[m_iErrc];
     stringstream_type stream;
     stream << (int)m_iPos;
     ReplaceSubString(m_strMsg, _T("$POS$"), stream.str());
     ReplaceSubString(m_strMsg, _T("$TOK$"), m_strTok);
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Construct an error object. 
-      \param [in] szMsg The error message text.
-      \param [in] iPos the position related to the error.
-      \param [in] sTok The token string related to this error.
-  */
-  ParserError::ParserError(const char_type *szMsg, int iPos, const string_type &sTok) 
-    :m_strMsg(szMsg)
-    ,m_strFormula()
-    ,m_strTok(sTok)
-    ,m_iPos(iPos)
-    ,m_iErrc(ecGENERIC)
-    ,m_ErrMsg(ParserErrorMsg::Instance())
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Construct an error object.
+    \param [in] szMsg The error message text.
+    \param [in] iPos the position related to the error.
+    \param [in] sTok The token string related to this error.
+*/
+ParserError::ParserError(const char_type* szMsg, int iPos, const string_type& sTok) :
+    m_strMsg(szMsg),
+    m_strFormula(),
+    m_strTok(sTok),
+    m_iPos(iPos),
+    m_iErrc(ecGENERIC),
+    m_ErrMsg(ParserErrorMsg::Instance())
+{
     stringstream_type stream;
     stream << (int)m_iPos;
     ReplaceSubString(m_strMsg, _T("$POS$"), stream.str());
     ReplaceSubString(m_strMsg, _T("$TOK$"), m_strTok);
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Copy constructor. */
-  ParserError::ParserError(const ParserError &a_Obj)
-    :m_strMsg(a_Obj.m_strMsg)
-    ,m_strFormula(a_Obj.m_strFormula)
-    ,m_strTok(a_Obj.m_strTok)
-    ,m_iPos(a_Obj.m_iPos)
-    ,m_iErrc(a_Obj.m_iErrc)
-    ,m_ErrMsg(ParserErrorMsg::Instance())
-  {
-  }
-
-  //------------------------------------------------------------------------------
-  /** \brief Assignment operator. */
-  ParserError& ParserError::operator=(const ParserError &a_Obj)
-  {
-    if (this==&a_Obj)
-      return *this;
+}
+
+//------------------------------------------------------------------------------
+/** \brief Copy constructor. */
+ParserError::ParserError(const ParserError& a_Obj) :
+    m_strMsg(a_Obj.m_strMsg),
+    m_strFormula(a_Obj.m_strFormula),
+    m_strTok(a_Obj.m_strTok),
+    m_iPos(a_Obj.m_iPos),
+    m_iErrc(a_Obj.m_iErrc),
+    m_ErrMsg(ParserErrorMsg::Instance())
+{
+}
+
+//------------------------------------------------------------------------------
+/** \brief Assignment operator. */
+ParserError& ParserError::operator=(const ParserError& a_Obj)
+{
+    if (this == &a_Obj)
+        return *this;
 
     m_strMsg = a_Obj.m_strMsg;
     m_strFormula = a_Obj.m_strFormula;
@@ -246,92 +219,89 @@ namespace mu
     m_iPos = a_Obj.m_iPos;
     m_iErrc = a_Obj.m_iErrc;
     return *this;
-  }
-
-  //------------------------------------------------------------------------------
-  ParserError::~ParserError()
-  {}
-
-  //------------------------------------------------------------------------------
-  /** \brief Replace all occurrences of a substring with another string. 
-      \param strFind The string that shall be replaced.
-      \param strReplaceWith The string that should be inserted instead of strFind
-  */
-  void ParserError::ReplaceSubString( string_type &strSource,
-                                      const string_type &strFind,
-                                      const string_type &strReplaceWith)
-  {
+}
+
+//------------------------------------------------------------------------------
+ParserError::~ParserError() {}
+
+//------------------------------------------------------------------------------
+/** \brief Replace all occurrences of a substring with another string.
+    \param strFind The string that shall be replaced.
+    \param strReplaceWith The string that should be inserted instead of strFind
+*/
+void ParserError::ReplaceSubString(string_type& strSource, const string_type& strFind, const string_type& strReplaceWith)
+{
     string_type strResult;
     string_type::size_type iPos(0), iNext(0);
 
-    for(;;)
+    for (;;)
     {
-      iNext = strSource.find(strFind, iPos);
-      strResult.append(strSource, iPos, iNext-iPos);
+        iNext = strSource.find(strFind, iPos);
+        strResult.append(strSource, iPos, iNext - iPos);
 
-      if( iNext==string_type::npos )
-        break;
+        if (iNext == string_type::npos)
+            break;
 
-      strResult.append(strReplaceWith);
-      iPos = iNext + strFind.length();
-    } 
+        strResult.append(strReplaceWith);
+        iPos = iNext + strFind.length();
+    }
 
     strSource.swap(strResult);
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Reset the erro object. */
-  void ParserError::Reset()
-  {
+//------------------------------------------------------------------------------
+/** \brief Reset the erro object. */
+void ParserError::Reset()
+{
     m_strMsg = _T("");
     m_strFormula = _T("");
     m_strTok = _T("");
     m_iPos = -1;
     m_iErrc = ecUNDEFINED;
-  }
-      
-  //------------------------------------------------------------------------------
-  /** \brief Set the expression related to this error. */
-  void ParserError::SetFormula(const string_type &a_strFormula)
-  {
+}
+
+//------------------------------------------------------------------------------
+/** \brief Set the expression related to this error. */
+void ParserError::SetFormula(const string_type& a_strFormula)
+{
     m_strFormula = a_strFormula;
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief gets the expression related tp this error.*/
-  const string_type& ParserError::GetExpr() const 
-  {
+//------------------------------------------------------------------------------
+/** \brief gets the expression related tp this error.*/
+const string_type& ParserError::GetExpr() const
+{
     return m_strFormula;
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Returns the message string for this error. */
-  const string_type& ParserError::GetMsg() const
-  {
+//------------------------------------------------------------------------------
+/** \brief Returns the message string for this error. */
+const string_type& ParserError::GetMsg() const
+{
     return m_strMsg;
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Return the formula position related to the error. 
+//------------------------------------------------------------------------------
+/** \brief Return the formula position related to the error.
 
-    If the error is not related to a distinct position this will return -1
-  */
-  int ParserError::GetPos() const
-  {
+  If the error is not related to a distinct position this will return -1
+*/
+int ParserError::GetPos() const
+{
     return m_iPos;
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Return string related with this token (if available). */
-  const string_type& ParserError::GetToken() const
-  {
+//------------------------------------------------------------------------------
+/** \brief Return string related with this token (if available). */
+const string_type& ParserError::GetToken() const
+{
     return m_strTok;
-  }
+}
 
-  //------------------------------------------------------------------------------
-  /** \brief Return the error code. */
-  EErrorCodes ParserError::GetCode() const
-  {
+//------------------------------------------------------------------------------
+/** \brief Return the error code. */
+EErrorCodes ParserError::GetCode() const
+{
     return m_iErrc;
-  }
+}
 } // namespace mu
diff --git a/ext_libs/muparser/muParserError.h b/ext_libs/muparser/muParserError.h
old mode 100755
new mode 100644
index 7f88e991..403b700d
--- a/ext_libs/muparser/muParserError.h
+++ b/ext_libs/muparser/muParserError.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_ERROR_H
@@ -35,92 +35,91 @@
 
 #include "muParserDef.h"
 
-/** \file 
+/** \file
     \brief This file defines the error class used by the parser.
 */
 
 namespace mu
 {
-
 /** \brief Error codes. */
 enum EErrorCodes
 {
-  // Formula syntax errors
-  ecUNEXPECTED_OPERATOR    = 0,  ///< Unexpected binary operator found
-  ecUNASSIGNABLE_TOKEN     = 1,  ///< Token cant be identified.
-  ecUNEXPECTED_EOF         = 2,  ///< Unexpected end of formula. (Example: "2+sin(")
-  ecUNEXPECTED_ARG_SEP     = 3,  ///< An unexpected comma has been found. (Example: "1,23")
-  ecUNEXPECTED_ARG         = 4,  ///< An unexpected argument has been found
-  ecUNEXPECTED_VAL         = 5,  ///< An unexpected value token has been found
-  ecUNEXPECTED_VAR         = 6,  ///< An unexpected variable token has been found
-  ecUNEXPECTED_PARENS      = 7,  ///< Unexpected Parenthesis, opening or closing
-  ecUNEXPECTED_STR         = 8,  ///< A string has been found at an inapropriate position
-  ecSTRING_EXPECTED        = 9,  ///< A string function has been called with a different type of argument
-  ecVAL_EXPECTED           = 10, ///< A numerical function has been called with a non value type of argument
-  ecMISSING_PARENS         = 11, ///< Missing parens. (Example: "3*sin(3")
-  ecUNEXPECTED_FUN         = 12, ///< Unexpected function found. (Example: "sin(8)cos(9)")
-  ecUNTERMINATED_STRING    = 13, ///< unterminated string constant. (Example: "3*valueof("hello)")
-  ecTOO_MANY_PARAMS        = 14, ///< Too many function parameters
-  ecTOO_FEW_PARAMS         = 15, ///< Too few function parameters. (Example: "ite(1<2,2)")
-  ecOPRT_TYPE_CONFLICT     = 16, ///< binary operators may only be applied to value items of the same type
-  ecSTR_RESULT             = 17, ///< result is a string
-
-  // Invalid Parser input Parameters
-  ecINVALID_NAME           = 18, ///< Invalid function, variable or constant name.
-  ecINVALID_BINOP_IDENT    = 19, ///< Invalid binary operator identifier
-  ecINVALID_INFIX_IDENT    = 20, ///< Invalid function, variable or constant name.
-  ecINVALID_POSTFIX_IDENT  = 21, ///< Invalid function, variable or constant name.
-
-  ecBUILTIN_OVERLOAD       = 22, ///< Trying to overload builtin operator
-  ecINVALID_FUN_PTR        = 23, ///< Invalid callback function pointer 
-  ecINVALID_VAR_PTR        = 24, ///< Invalid variable pointer 
-  ecEMPTY_EXPRESSION       = 25, ///< The Expression is empty
-  ecNAME_CONFLICT          = 26, ///< Name conflict
-  ecOPT_PRI                = 27, ///< Invalid operator priority
-  // 
-  ecDOMAIN_ERROR           = 28, ///< catch division by zero, sqrt(-1), log(0) (currently unused)
-  ecDIV_BY_ZERO            = 29, ///< Division by zero (currently unused)
-  ecGENERIC                = 30, ///< Generic error
-  ecLOCALE                 = 31, ///< Conflict with current locale
-
-  ecUNEXPECTED_CONDITIONAL = 32,
-  ecMISSING_ELSE_CLAUSE    = 33, 
-  ecMISPLACED_COLON        = 34,
-
-  ecUNREASONABLE_NUMBER_OF_COMPUTATIONS = 35,
-
-  // internal errors
-  ecINTERNAL_ERROR         = 36, ///< Internal error of any kind.
-  
-  // The last two are special entries 
-  ecCOUNT,                      ///< This is no error code, It just stores just the total number of error codes
-  ecUNDEFINED              = -1  ///< Undefined message, placeholder to detect unassigned error messages
+    // Formula syntax errors
+    ecUNEXPECTED_OPERATOR = 0,  ///< Unexpected binary operator found
+    ecUNASSIGNABLE_TOKEN = 1,   ///< Token cant be identified.
+    ecUNEXPECTED_EOF = 2,       ///< Unexpected end of formula. (Example: "2+sin(")
+    ecUNEXPECTED_ARG_SEP = 3,   ///< An unexpected comma has been found. (Example: "1,23")
+    ecUNEXPECTED_ARG = 4,       ///< An unexpected argument has been found
+    ecUNEXPECTED_VAL = 5,       ///< An unexpected value token has been found
+    ecUNEXPECTED_VAR = 6,       ///< An unexpected variable token has been found
+    ecUNEXPECTED_PARENS = 7,    ///< Unexpected Parenthesis, opening or closing
+    ecUNEXPECTED_STR = 8,       ///< A string has been found at an inapropriate position
+    ecSTRING_EXPECTED = 9,      ///< A string function has been called with a different type of argument
+    ecVAL_EXPECTED = 10,        ///< A numerical function has been called with a non value type of argument
+    ecMISSING_PARENS = 11,      ///< Missing parens. (Example: "3*sin(3")
+    ecUNEXPECTED_FUN = 12,      ///< Unexpected function found. (Example: "sin(8)cos(9)")
+    ecUNTERMINATED_STRING = 13, ///< unterminated string constant. (Example: "3*valueof("hello)")
+    ecTOO_MANY_PARAMS = 14,     ///< Too many function parameters
+    ecTOO_FEW_PARAMS = 15,      ///< Too few function parameters. (Example: "ite(1<2,2)")
+    ecOPRT_TYPE_CONFLICT = 16,  ///< binary operators may only be applied to value items of the same type
+    ecSTR_RESULT = 17,          ///< result is a string
+
+    // Invalid Parser input Parameters
+    ecINVALID_NAME = 18,          ///< Invalid function, variable or constant name.
+    ecINVALID_BINOP_IDENT = 19,   ///< Invalid binary operator identifier
+    ecINVALID_INFIX_IDENT = 20,   ///< Invalid function, variable or constant name.
+    ecINVALID_POSTFIX_IDENT = 21, ///< Invalid function, variable or constant name.
+
+    ecBUILTIN_OVERLOAD = 22, ///< Trying to overload builtin operator
+    ecINVALID_FUN_PTR = 23,  ///< Invalid callback function pointer
+    ecINVALID_VAR_PTR = 24,  ///< Invalid variable pointer
+    ecEMPTY_EXPRESSION = 25, ///< The Expression is empty
+    ecNAME_CONFLICT = 26,    ///< Name conflict
+    ecOPT_PRI = 27,          ///< Invalid operator priority
+                             //
+    ecDOMAIN_ERROR = 28,     ///< catch division by zero, sqrt(-1), log(0) (currently unused)
+    ecDIV_BY_ZERO = 29,      ///< Division by zero (currently unused)
+    ecGENERIC = 30,          ///< Generic error
+    ecLOCALE = 31,           ///< Conflict with current locale
+
+    ecUNEXPECTED_CONDITIONAL = 32,
+    ecMISSING_ELSE_CLAUSE = 33,
+    ecMISPLACED_COLON = 34,
+
+    ecUNREASONABLE_NUMBER_OF_COMPUTATIONS = 35,
+
+    // internal errors
+    ecINTERNAL_ERROR = 36, ///< Internal error of any kind.
+
+    // The last two are special entries
+    ecCOUNT,         ///< This is no error code, It just stores just the total number of error codes
+    ecUNDEFINED = -1 ///< Undefined message, placeholder to detect unassigned error messages
 };
 
 //---------------------------------------------------------------------------
 /** \brief A class that handles the error messages.
-*/
+ */
 class ParserErrorMsg
 {
 public:
     typedef ParserErrorMsg self_type;
 
-    ParserErrorMsg& operator=(const ParserErrorMsg &);
+    ParserErrorMsg& operator=(const ParserErrorMsg&);
     ParserErrorMsg(const ParserErrorMsg&);
     ParserErrorMsg();
 
-   ~ParserErrorMsg();
+    ~ParserErrorMsg();
 
     static const ParserErrorMsg& Instance();
     string_type operator[](unsigned a_iIdx) const;
 
 private:
-    std::vector<string_type>  m_vErrMsg;  ///< A vector with the predefined error messages
-    static const self_type m_Instance;    ///< The instance pointer
+    std::vector<string_type> m_vErrMsg; ///< A vector with the predefined error messages
+    static const self_type m_Instance;  ///< The instance pointer
 };
 
 //---------------------------------------------------------------------------
-/** \brief Error class of the parser. 
+/** \brief Error class of the parser.
     \author Ingo Berg
 
   Part of the math parser package.
@@ -128,33 +127,25 @@ class ParserErrorMsg
 class ParserError
 {
 private:
-
     /** \brief Replace all ocuurences of a substring with another string. */
-    void ReplaceSubString( string_type &strSource, 
-                           const string_type &strFind,
-                           const string_type &strReplaceWith);
+    void ReplaceSubString(string_type& strSource, const string_type& strFind, const string_type& strReplaceWith);
     void Reset();
 
 public:
-
     ParserError();
     explicit ParserError(EErrorCodes a_iErrc);
-    explicit ParserError(const string_type &sMsg);
-    ParserError( EErrorCodes a_iErrc,
-                 const string_type &sTok,
-                 const string_type &sFormula = string_type(),
-                 int a_iPos = -1);
-    ParserError( EErrorCodes a_iErrc, 
-                 int a_iPos, 
-                 const string_type &sTok);
-    ParserError( const char_type *a_szMsg, 
-                 int a_iPos = -1, 
-                 const string_type &sTok = string_type());
-    ParserError(const ParserError &a_Obj);
-    ParserError& operator=(const ParserError &a_Obj);
-   ~ParserError();
-
-    void SetFormula(const string_type &a_strFormula);
+    explicit ParserError(const string_type& sMsg);
+    ParserError(EErrorCodes a_iErrc,
+                const string_type& sTok,
+                const string_type& sFormula = string_type(),
+                int a_iPos = -1);
+    ParserError(EErrorCodes a_iErrc, int a_iPos, const string_type& sTok);
+    ParserError(const char_type* a_szMsg, int a_iPos = -1, const string_type& sTok = string_type());
+    ParserError(const ParserError& a_Obj);
+    ParserError& operator=(const ParserError& a_Obj);
+    ~ParserError();
+
+    void SetFormula(const string_type& a_strFormula);
     const string_type& GetExpr() const;
     const string_type& GetMsg() const;
     int GetPos() const;
@@ -165,12 +156,11 @@ class ParserError
     string_type m_strMsg;     ///< The message string
     string_type m_strFormula; ///< Formula string
     string_type m_strTok;     ///< Token related with the error
-    int m_iPos;               ///< Formula position related to the error 
+    int m_iPos;               ///< Formula position related to the error
     EErrorCodes m_iErrc;      ///< Error code
-    const ParserErrorMsg &m_ErrMsg;
-};		
+    const ParserErrorMsg& m_ErrMsg;
+};
 
 } // namespace mu
 
 #endif
-
diff --git a/ext_libs/muparser/muParserFixes.h b/ext_libs/muparser/muParserFixes.h
old mode 100755
new mode 100644
index 1cd15e02..74a54828
--- a/ext_libs/muparser/muParserFixes.h
+++ b/ext_libs/muparser/muParserFixes.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_FIXES_H
@@ -45,18 +45,16 @@
 // remark #981: operands are evaluated in unspecified order
 // disabled -> completely pointless if the functions do not have side effects
 //
-#pragma warning(disable:981)
+#pragma warning(disable : 981)
 
 // remark #383: value copied to temporary, reference to temporary used
-#pragma warning(disable:383)
+#pragma warning(disable : 383)
 
 // remark #1572: floating-point equality and inequality comparisons are unreliable
 // disabled -> everyone knows it, the parser passes this problem
 //             deliberately to the user
-#pragma warning(disable:1572)
+#pragma warning(disable : 1572)
 
 #endif
 
 #endif // include guard
-
-
diff --git a/ext_libs/muparser/muParserInt.cpp b/ext_libs/muparser/muParserInt.cpp
old mode 100755
new mode 100644
index 8b5aae60..44c3e6ed
--- a/ext_libs/muparser/muParserInt.cpp
+++ b/ext_libs/muparser/muParserInt.cpp
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "muParserInt.h"
@@ -38,243 +38,299 @@ using namespace std;
 /** \brief Namespace for mathematical applications. */
 namespace mu
 {
-value_type ParserInt::Abs(value_type v)  { return (value_type)Round(fabs((double)v)); }
-value_type ParserInt::Sign(value_type v) { return (Round(v)<0) ? -1 : (Round(v)>0) ? 1 : 0; }
-value_type ParserInt::Ite(value_type v1, 
-                          value_type v2, 
-                          value_type v3) { return (Round(v1)==1) ? Round(v2) : Round(v3); }
-value_type ParserInt::Add(value_type v1, value_type v2) { return Round(v1)  + Round(v2); }
-value_type ParserInt::Sub(value_type v1, value_type v2) { return Round(v1)  - Round(v2); }
-value_type ParserInt::Mul(value_type v1, value_type v2) { return Round(v1)  * Round(v2); }
-value_type ParserInt::Div(value_type v1, value_type v2) { return Round(v1)  / Round(v2); }
-value_type ParserInt::Mod(value_type v1, value_type v2) { return Round(v1)  % Round(v2); }
-value_type ParserInt::Shr(value_type v1, value_type v2) { return Round(v1) >> Round(v2); }
-value_type ParserInt::Shl(value_type v1, value_type v2) { return Round(v1) << Round(v2); }
-value_type ParserInt::LogAnd(value_type v1, value_type v2) { return Round(v1) & Round(v2); }
-value_type ParserInt::LogOr(value_type v1, value_type v2)  { return Round(v1) | Round(v2); }
-value_type ParserInt::And(value_type v1, value_type v2) { return Round(v1) && Round(v2); }
-value_type ParserInt::Or(value_type v1, value_type v2)  { return Round(v1) || Round(v2); }
-value_type ParserInt::Less(value_type v1, value_type v2)      { return Round(v1)  < Round(v2); }
-value_type ParserInt::Greater(value_type v1, value_type v2)   { return Round(v1)  > Round(v2); }
-value_type ParserInt::LessEq(value_type v1, value_type v2)    { return Round(v1) <= Round(v2); }
-value_type ParserInt::GreaterEq(value_type v1, value_type v2) { return Round(v1) >= Round(v2); }
-value_type ParserInt::Equal(value_type v1, value_type v2)     { return Round(v1) == Round(v2); }
-value_type ParserInt::NotEqual(value_type v1, value_type v2)  { return Round(v1) != Round(v2); }
-value_type ParserInt::Not(value_type v) { return !Round(v); }
-
-value_type ParserInt::Pow(value_type v1, value_type v2) 
-{ 
-  return std::pow((double)Round(v1), (double)Round(v2)); 
+value_type ParserInt::Abs(value_type v)
+{
+    return (value_type)Round(fabs((double)v));
+}
+value_type ParserInt::Sign(value_type v)
+{
+    return (Round(v) < 0) ? -1 : (Round(v) > 0) ? 1 : 0;
+}
+value_type ParserInt::Ite(value_type v1, value_type v2, value_type v3)
+{
+    return (Round(v1) == 1) ? Round(v2) : Round(v3);
+}
+value_type ParserInt::Add(value_type v1, value_type v2)
+{
+    return Round(v1) + Round(v2);
+}
+value_type ParserInt::Sub(value_type v1, value_type v2)
+{
+    return Round(v1) - Round(v2);
+}
+value_type ParserInt::Mul(value_type v1, value_type v2)
+{
+    return Round(v1) * Round(v2);
+}
+value_type ParserInt::Div(value_type v1, value_type v2)
+{
+    return Round(v1) / Round(v2);
+}
+value_type ParserInt::Mod(value_type v1, value_type v2)
+{
+    return Round(v1) % Round(v2);
+}
+value_type ParserInt::Shr(value_type v1, value_type v2)
+{
+    return Round(v1) >> Round(v2);
+}
+value_type ParserInt::Shl(value_type v1, value_type v2)
+{
+    return Round(v1) << Round(v2);
+}
+value_type ParserInt::LogAnd(value_type v1, value_type v2)
+{
+    return Round(v1) & Round(v2);
+}
+value_type ParserInt::LogOr(value_type v1, value_type v2)
+{
+    return Round(v1) | Round(v2);
+}
+value_type ParserInt::And(value_type v1, value_type v2)
+{
+    return Round(v1) && Round(v2);
+}
+value_type ParserInt::Or(value_type v1, value_type v2)
+{
+    return Round(v1) || Round(v2);
+}
+value_type ParserInt::Less(value_type v1, value_type v2)
+{
+    return Round(v1) < Round(v2);
+}
+value_type ParserInt::Greater(value_type v1, value_type v2)
+{
+    return Round(v1) > Round(v2);
+}
+value_type ParserInt::LessEq(value_type v1, value_type v2)
+{
+    return Round(v1) <= Round(v2);
+}
+value_type ParserInt::GreaterEq(value_type v1, value_type v2)
+{
+    return Round(v1) >= Round(v2);
+}
+value_type ParserInt::Equal(value_type v1, value_type v2)
+{
+    return Round(v1) == Round(v2);
+}
+value_type ParserInt::NotEqual(value_type v1, value_type v2)
+{
+    return Round(v1) != Round(v2);
+}
+value_type ParserInt::Not(value_type v)
+{
+    return !Round(v);
+}
+
+value_type ParserInt::Pow(value_type v1, value_type v2)
+{
+    return std::pow((double)Round(v1), (double)Round(v2));
 }
 
 //---------------------------------------------------------------------------
 // Unary operator Callbacks: Infix operators
-value_type ParserInt::UnaryMinus(value_type v) 
-{ 
-  return -Round(v); 
+value_type ParserInt::UnaryMinus(value_type v)
+{
+    return -Round(v);
 }
 
 //---------------------------------------------------------------------------
 value_type ParserInt::Sum(const value_type* a_afArg, int a_iArgc)
-{ 
-  if (!a_iArgc)	
-    throw ParserError(_T("too few arguments for function sum."));
+{
+    if (!a_iArgc)
+        throw ParserError(_T("too few arguments for function sum."));
 
-  value_type fRes=0;
-  for (int i=0; i<a_iArgc; ++i) 
-    fRes += a_afArg[i];
+    value_type fRes = 0;
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes += a_afArg[i];
 
-  return fRes;
+    return fRes;
 }
 
 //---------------------------------------------------------------------------
 value_type ParserInt::Min(const value_type* a_afArg, int a_iArgc)
-{ 
-  if (!a_iArgc)	
-    throw ParserError( _T("too few arguments for function min.") );
+{
+    if (!a_iArgc)
+        throw ParserError(_T("too few arguments for function min."));
 
-  value_type fRes=a_afArg[0];
-  for (int i=0; i<a_iArgc; ++i) 
-    fRes = std::min(fRes, a_afArg[i]);
+    value_type fRes = a_afArg[0];
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes = std::min(fRes, a_afArg[i]);
 
-  return fRes;
+    return fRes;
 }
 
 //---------------------------------------------------------------------------
 value_type ParserInt::Max(const value_type* a_afArg, int a_iArgc)
-{ 
-  if (!a_iArgc)	
-    throw ParserError(_T("too few arguments for function min."));
+{
+    if (!a_iArgc)
+        throw ParserError(_T("too few arguments for function min."));
 
-  value_type fRes=a_afArg[0];
-  for (int i=0; i<a_iArgc; ++i) 
-    fRes = std::max(fRes, a_afArg[i]);
+    value_type fRes = a_afArg[0];
+    for (int i = 0; i < a_iArgc; ++i)
+        fRes = std::max(fRes, a_afArg[i]);
 
-  return fRes;
+    return fRes;
 }
 
 //---------------------------------------------------------------------------
 // Default value recognition callback
-int ParserInt::IsVal(const char_type *a_szExpr, int *a_iPos, value_type *a_fVal)
+int ParserInt::IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal)
 {
-  string_type buf(a_szExpr);
-  std::size_t pos = buf.find_first_not_of(_T("0123456789"));
+    string_type buf(a_szExpr);
+    std::size_t pos = buf.find_first_not_of(_T("0123456789"));
+
+    if (pos == std::string::npos)
+        return 0;
 
-  if (pos==std::string::npos)
-    return 0;
+    stringstream_type stream(buf.substr(0, pos));
+    int iVal(0);
 
-  stringstream_type stream( buf.substr(0, pos ) );
-  int iVal(0);
+    stream >> iVal;
+    if (stream.fail())
+        return 0;
 
-  stream >> iVal;
-  if (stream.fail())
-    return 0;
-      
-  stringstream_type::pos_type iEnd = stream.tellg();   // Position after reading
-  if (stream.fail())
-    iEnd = stream.str().length();  
+    stringstream_type::pos_type iEnd = stream.tellg(); // Position after reading
+    if (stream.fail())
+        iEnd = stream.str().length();
 
-  if (iEnd==(stringstream_type::pos_type)-1)
-    return 0;
+    if (iEnd == (stringstream_type::pos_type)-1)
+        return 0;
 
-  *a_iPos += (int)iEnd;
-  *a_fVal = (value_type)iVal;
-  return 1;
+    *a_iPos += (int)iEnd;
+    *a_fVal = (value_type)iVal;
+    return 1;
 }
 
 //---------------------------------------------------------------------------
-/** \brief Check a given position in the expression for the presence of 
-           a hex value. 
+/** \brief Check a given position in the expression for the presence of
+           a hex value.
     \param a_szExpr Pointer to the expression string
-    \param [in/out] a_iPos Pointer to an integer value holding the current parsing 
+    \param [in/out] a_iPos Pointer to an integer value holding the current parsing
            position in the expression.
     \param [out] a_fVal Pointer to the position where the detected value shall be stored.
 
   Hey values must be prefixed with "0x" in order to be detected properly.
 */
-int ParserInt::IsHexVal(const char_type *a_szExpr, int *a_iPos, value_type *a_fVal)
+int ParserInt::IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal)
 {
-  if (a_szExpr[1]==0 || (a_szExpr[0]!='0' || a_szExpr[1]!='x') ) 
-    return 0;
+    if (a_szExpr[1] == 0 || (a_szExpr[0] != '0' || a_szExpr[1] != 'x'))
+        return 0;
 
-  unsigned iVal(0);
+    unsigned iVal(0);
 
-  // New code based on streams for UNICODE compliance:
-  stringstream_type::pos_type nPos(0);
-  stringstream_type ss(a_szExpr + 2);
-  ss >> std::hex >> iVal;
-  nPos = ss.tellg();
+    // New code based on streams for UNICODE compliance:
+    stringstream_type::pos_type nPos(0);
+    stringstream_type ss(a_szExpr + 2);
+    ss >> std::hex >> iVal;
+    nPos = ss.tellg();
 
-  if (nPos==(stringstream_type::pos_type)0)
-    return 1;
+    if (nPos == (stringstream_type::pos_type)0)
+        return 1;
 
-  *a_iPos += (int)(2 + nPos);
-  *a_fVal = (value_type)iVal;
-  return 1;
+    *a_iPos += (int)(2 + nPos);
+    *a_fVal = (value_type)iVal;
+    return 1;
 }
 
 //---------------------------------------------------------------------------
-int ParserInt::IsBinVal(const char_type *a_szExpr, int *a_iPos, value_type *a_fVal)
+int ParserInt::IsBinVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal)
 {
-  if (a_szExpr[0]!='#') 
-    return 0;
+    if (a_szExpr[0] != '#')
+        return 0;
 
-  unsigned iVal(0), 
-           iBits(sizeof(iVal)*8),
-           i(0);
+    unsigned iVal(0), iBits(sizeof(iVal) * 8), i(0);
 
-  for (i=0; (a_szExpr[i+1]=='0' || a_szExpr[i+1]=='1') && i<iBits; ++i)
-    iVal |= (int)(a_szExpr[i+1]=='1') << ((iBits-1)-i);
+    for (i = 0; (a_szExpr[i + 1] == '0' || a_szExpr[i + 1] == '1') && i < iBits; ++i)
+        iVal |= (int)(a_szExpr[i + 1] == '1') << ((iBits - 1) - i);
 
-  if (i==0) 
-    return 0;
+    if (i == 0)
+        return 0;
 
-  if (i==iBits)
-    throw exception_type(_T("Binary to integer conversion error (overflow)."));
+    if (i == iBits)
+        throw exception_type(_T("Binary to integer conversion error (overflow)."));
 
-  *a_fVal = (unsigned)(iVal >> (iBits-i) );
-  *a_iPos += i+1;
+    *a_fVal = (unsigned)(iVal >> (iBits - i));
+    *a_iPos += i + 1;
 
-  return 1;
+    return 1;
 }
 
 //---------------------------------------------------------------------------
-/** \brief Constructor. 
+/** \brief Constructor.
 
   Call ParserBase class constructor and trigger Function, Operator and Constant initialization.
 */
-ParserInt::ParserInt()
-  :ParserBase()
+ParserInt::ParserInt() : ParserBase()
 {
-  AddValIdent(IsVal);    // lowest priority
-  AddValIdent(IsBinVal);
-  AddValIdent(IsHexVal); // highest priority
+    AddValIdent(IsVal); // lowest priority
+    AddValIdent(IsBinVal);
+    AddValIdent(IsHexVal); // highest priority
 
-  InitCharSets();
-  InitFun();
-  InitOprt();
+    InitCharSets();
+    InitFun();
+    InitOprt();
 }
 
 //---------------------------------------------------------------------------
-void ParserInt::InitConst()
-{
-}
+void ParserInt::InitConst() {}
 
 //---------------------------------------------------------------------------
 void ParserInt::InitCharSets()
 {
-  DefineNameChars( _T("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ") );
-  DefineOprtChars( _T("+-*^/?<>=!%&|~'_") );
-  DefineInfixOprtChars( _T("/+-*^?<>=!%&|~'_") );
+    DefineNameChars(_T("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+    DefineOprtChars(_T("+-*^/?<>=!%&|~'_"));
+    DefineInfixOprtChars(_T("/+-*^?<>=!%&|~'_"));
 }
 
 //---------------------------------------------------------------------------
 /** \brief Initialize the default functions. */
 void ParserInt::InitFun()
 {
-  DefineFun( _T("sign"), Sign);
-  DefineFun( _T("abs"), Abs);
-  DefineFun( _T("if"), Ite);
-  DefineFun( _T("sum"), Sum);
-  DefineFun( _T("min"), Min);
-  DefineFun( _T("max"), Max);
+    DefineFun(_T("sign"), Sign);
+    DefineFun(_T("abs"), Abs);
+    DefineFun(_T("if"), Ite);
+    DefineFun(_T("sum"), Sum);
+    DefineFun(_T("min"), Min);
+    DefineFun(_T("max"), Max);
 }
 
 //---------------------------------------------------------------------------
 /** \brief Initialize operators. */
 void ParserInt::InitOprt()
 {
-  // disable all built in operators, not all of them useful for integer numbers
-  // (they don't do rounding of values)
-  EnableBuiltInOprt(false);
-
-  // Disable all built in operators, they wont work with integer numbers
-  // since they are designed for floating point numbers
-  DefineInfixOprt( _T("-"), UnaryMinus);
-  DefineInfixOprt( _T("!"), Not);
-
-  DefineOprt( _T("&"), LogAnd, prLOGIC);
-  DefineOprt( _T("|"), LogOr, prLOGIC);
-  DefineOprt( _T("&&"), And, prLOGIC);
-  DefineOprt( _T("||"), Or, prLOGIC);
-
-  DefineOprt( _T("<"), Less, prCMP);
-  DefineOprt( _T(">"), Greater, prCMP);
-  DefineOprt( _T("<="), LessEq, prCMP);
-  DefineOprt( _T(">="), GreaterEq, prCMP);
-  DefineOprt( _T("=="), Equal, prCMP);
-  DefineOprt( _T("!="), NotEqual, prCMP);
-
-  DefineOprt( _T("+"), Add, prADD_SUB);
-  DefineOprt( _T("-"), Sub, prADD_SUB);
-
-  DefineOprt( _T("*"), Mul, prMUL_DIV);
-  DefineOprt( _T("/"), Div, prMUL_DIV);
-  DefineOprt( _T("%"), Mod, prMUL_DIV);
-
-  DefineOprt( _T("^"), Pow, prPOW, oaRIGHT);
-  DefineOprt( _T(">>"), Shr, prMUL_DIV+1);
-  DefineOprt( _T("<<"), Shl, prMUL_DIV+1);
+    // disable all built in operators, not all of them useful for integer numbers
+    // (they don't do rounding of values)
+    EnableBuiltInOprt(false);
+
+    // Disable all built in operators, they wont work with integer numbers
+    // since they are designed for floating point numbers
+    DefineInfixOprt(_T("-"), UnaryMinus);
+    DefineInfixOprt(_T("!"), Not);
+
+    DefineOprt(_T("&"), LogAnd, prLOGIC);
+    DefineOprt(_T("|"), LogOr, prLOGIC);
+    DefineOprt(_T("&&"), And, prLOGIC);
+    DefineOprt(_T("||"), Or, prLOGIC);
+
+    DefineOprt(_T("<"), Less, prCMP);
+    DefineOprt(_T(">"), Greater, prCMP);
+    DefineOprt(_T("<="), LessEq, prCMP);
+    DefineOprt(_T(">="), GreaterEq, prCMP);
+    DefineOprt(_T("=="), Equal, prCMP);
+    DefineOprt(_T("!="), NotEqual, prCMP);
+
+    DefineOprt(_T("+"), Add, prADD_SUB);
+    DefineOprt(_T("-"), Sub, prADD_SUB);
+
+    DefineOprt(_T("*"), Mul, prMUL_DIV);
+    DefineOprt(_T("/"), Div, prMUL_DIV);
+    DefineOprt(_T("%"), Mod, prMUL_DIV);
+
+    DefineOprt(_T("^"), Pow, prPOW, oaRIGHT);
+    DefineOprt(_T(">>"), Shr, prMUL_DIV + 1);
+    DefineOprt(_T("<<"), Shl, prMUL_DIV + 1);
 }
 
 } // namespace mu
diff --git a/ext_libs/muparser/muParserInt.h b/ext_libs/muparser/muParserInt.h
old mode 100755
new mode 100644
index 136de339..bb6176d1
--- a/ext_libs/muparser/muParserInt.h
+++ b/ext_libs/muparser/muParserInt.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_INT_H
@@ -29,100 +29,86 @@
 #include "muParserBase.h"
 #include <vector>
 
-
 /** \file
     \brief Definition of a parser using integer value.
 */
 
-
 namespace mu
 {
-
 /** \brief Mathematical expressions parser.
-  
-  This version of the parser handles only integer numbers. It disables the built in operators thus it is 
+
+  This version of the parser handles only integer numbers. It disables the built in operators thus it is
   slower than muParser. Integer values are stored in the double value_type and converted if needed.
 */
 class ParserInt : public ParserBase
 {
 private:
-    static int  Round(value_type v) { return (int)(v + ((v>=0) ? 0.5 : -0.5) ); };
-  
-    static value_type  Abs(value_type);
-    static value_type  Sign(value_type);
-    static value_type  Ite(value_type, value_type, value_type);
+    static int Round(value_type v) { return (int)(v + ((v >= 0) ? 0.5 : -0.5)); };
+
+    static value_type Abs(value_type);
+    static value_type Sign(value_type);
+    static value_type Ite(value_type, value_type, value_type);
     // !! The unary Minus is a MUST, otherwise you cant use negative signs !!
-    static value_type  UnaryMinus(value_type);
+    static value_type UnaryMinus(value_type);
     // Functions with variable number of arguments
-    static value_type  Sum(const value_type* a_afArg, int a_iArgc);  // sum
-    static value_type  Min(const value_type* a_afArg, int a_iArgc);  // minimum
-    static value_type  Max(const value_type* a_afArg, int a_iArgc);  // maximum
+    static value_type Sum(const value_type* a_afArg, int a_iArgc); // sum
+    static value_type Min(const value_type* a_afArg, int a_iArgc); // minimum
+    static value_type Max(const value_type* a_afArg, int a_iArgc); // maximum
     // binary operator callbacks
-    static value_type  Add(value_type v1, value_type v2);
-    static value_type  Sub(value_type v1, value_type v2);
-    static value_type  Mul(value_type v1, value_type v2);
-    static value_type  Div(value_type v1, value_type v2);
-    static value_type  Mod(value_type v1, value_type v2);
-    static value_type  Pow(value_type v1, value_type v2);
-    static value_type  Shr(value_type v1, value_type v2);
-    static value_type  Shl(value_type v1, value_type v2);
-    static value_type  LogAnd(value_type v1, value_type v2);
-    static value_type  LogOr(value_type v1, value_type v2);
-    static value_type  And(value_type v1, value_type v2);
-    static value_type  Or(value_type v1, value_type v2);
-    static value_type  Xor(value_type v1, value_type v2);
-    static value_type  Less(value_type v1, value_type v2);
-    static value_type  Greater(value_type v1, value_type v2);
-    static value_type  LessEq(value_type v1, value_type v2);
-    static value_type  GreaterEq(value_type v1, value_type v2);
-    static value_type  Equal(value_type v1, value_type v2);
-    static value_type  NotEqual(value_type v1, value_type v2);
-    static value_type  Not(value_type v1);
-
-    static int IsHexVal(const char_type* a_szExpr, int *a_iPos, value_type *a_iVal);
-    static int IsBinVal(const char_type* a_szExpr, int *a_iPos, value_type *a_iVal);
-    static int IsVal   (const char_type* a_szExpr, int *a_iPos, value_type *a_iVal);
+    static value_type Add(value_type v1, value_type v2);
+    static value_type Sub(value_type v1, value_type v2);
+    static value_type Mul(value_type v1, value_type v2);
+    static value_type Div(value_type v1, value_type v2);
+    static value_type Mod(value_type v1, value_type v2);
+    static value_type Pow(value_type v1, value_type v2);
+    static value_type Shr(value_type v1, value_type v2);
+    static value_type Shl(value_type v1, value_type v2);
+    static value_type LogAnd(value_type v1, value_type v2);
+    static value_type LogOr(value_type v1, value_type v2);
+    static value_type And(value_type v1, value_type v2);
+    static value_type Or(value_type v1, value_type v2);
+    static value_type Xor(value_type v1, value_type v2);
+    static value_type Less(value_type v1, value_type v2);
+    static value_type Greater(value_type v1, value_type v2);
+    static value_type LessEq(value_type v1, value_type v2);
+    static value_type GreaterEq(value_type v1, value_type v2);
+    static value_type Equal(value_type v1, value_type v2);
+    static value_type NotEqual(value_type v1, value_type v2);
+    static value_type Not(value_type v1);
+
+    static int IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_iVal);
+    static int IsBinVal(const char_type* a_szExpr, int* a_iPos, value_type* a_iVal);
+    static int IsVal(const char_type* a_szExpr, int* a_iPos, value_type* a_iVal);
 
     /** \brief A facet class used to change decimal and thousands separator. */
     template<class TChar>
     class change_dec_sep : public std::numpunct<TChar>
     {
     public:
-      
-      explicit change_dec_sep(char_type cDecSep, char_type cThousandsSep = 0, int nGroup = 3)
-        :std::numpunct<TChar>()
-        ,m_cDecPoint(cDecSep)
-        ,m_cThousandsSep(cThousandsSep)
-        ,m_nGroup(nGroup)
-      {}
-      
+        explicit change_dec_sep(char_type cDecSep, char_type cThousandsSep = 0, int nGroup = 3) :
+            std::numpunct<TChar>(), m_cDecPoint(cDecSep), m_cThousandsSep(cThousandsSep), m_nGroup(nGroup)
+        {
+        }
+
     protected:
-      
-      virtual char_type do_decimal_point() const
-      {
-        return m_cDecPoint;
-      }
-
-      virtual char_type do_thousands_sep() const
-      {
-        return m_cThousandsSep;
-      }
-
-      virtual std::string do_grouping() const 
-      { 
-        // fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4
-        // courtesy of Jens Bartsch
-        // original code:
-        //        return std::string(1, (char)m_nGroup); 
-        // new code:
-        return std::string(1, (char)(m_cThousandsSep > 0 ? m_nGroup : CHAR_MAX));
-      }
+        virtual char_type do_decimal_point() const { return m_cDecPoint; }
 
-    private:
+        virtual char_type do_thousands_sep() const { return m_cThousandsSep; }
+
+        virtual std::string do_grouping() const
+        {
+            // fix for issue 4: https://code.google.com/p/muparser/issues/detail?id=4
+            // courtesy of Jens Bartsch
+            // original code:
+            //        return std::string(1, (char)m_nGroup);
+            // new code:
+            return std::string(1, (char)(m_cThousandsSep > 0 ? m_nGroup : CHAR_MAX));
+        }
 
-      int m_nGroup;
-      char_type m_cDecPoint;  
-      char_type m_cThousandsSep;
+    private:
+        int m_nGroup;
+        char_type m_cDecPoint;
+        char_type m_cThousandsSep;
     };
 
 public:
@@ -137,4 +123,3 @@ class ParserInt : public ParserBase
 } // namespace mu
 
 #endif
-
diff --git a/ext_libs/muparser/muParserStack.h b/ext_libs/muparser/muParserStack.h
old mode 100755
new mode 100644
index f8437e30..ce675189
--- a/ext_libs/muparser/muParserStack.h
+++ b/ext_libs/muparser/muParserStack.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2011 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_STACK_H
@@ -34,92 +34,74 @@
 #include "muParserError.h"
 #include "muParserToken.h"
 
-/** \file 
+/** \file
     \brief This file defines the stack used by muparser.
 */
 
 namespace mu
 {
+/** \brief Parser stack implementation.
 
-  /** \brief Parser stack implementation. 
-
-      Stack implementation based on a std::stack. The behaviour of pop() had been
-      slightly changed in order to get an error code if the stack is empty.
-      The stack is used within the Parser both as a value stack and as an operator stack.
-
-      \author (C) 2004-2011 Ingo Berg 
-  */
-  template <typename TValueType>
-  class ParserStack 
-  {
-    private:
-
-      /** \brief Type of the underlying stack implementation. */
-      typedef std::stack<TValueType, std::vector<TValueType> > impl_type;
-      
-      impl_type m_Stack;  ///< This is the actual stack.
-
-    public:	
-  	 
-      //---------------------------------------------------------------------------
-      ParserStack()
-        :m_Stack()
-      {}
-
-      //---------------------------------------------------------------------------
-      virtual ~ParserStack()
-      {}
-
-      //---------------------------------------------------------------------------
-      /** \brief Pop a value from the stack.
-       
-        Unlike the standard implementation this function will return the value that
-        is going to be taken from the stack.
-
-        \throw ParserException in case the stack is empty.
-        \sa pop(int &a_iErrc)
-      */
-	    TValueType pop()
-      {
+    Stack implementation based on a std::stack. The behaviour of pop() had been
+    slightly changed in order to get an error code if the stack is empty.
+    The stack is used within the Parser both as a value stack and as an operator stack.
+
+    \author (C) 2004-2011 Ingo Berg
+*/
+template<typename TValueType>
+class ParserStack
+{
+private:
+    /** \brief Type of the underlying stack implementation. */
+    typedef std::stack<TValueType, std::vector<TValueType> > impl_type;
+
+    impl_type m_Stack; ///< This is the actual stack.
+
+public:
+    //---------------------------------------------------------------------------
+    ParserStack() : m_Stack() {}
+
+    //---------------------------------------------------------------------------
+    virtual ~ParserStack() {}
+
+    //---------------------------------------------------------------------------
+    /** \brief Pop a value from the stack.
+
+      Unlike the standard implementation this function will return the value that
+      is going to be taken from the stack.
+
+      \throw ParserException in case the stack is empty.
+      \sa pop(int &a_iErrc)
+    */
+    TValueType pop()
+    {
         if (empty())
-          throw ParserError( _T("stack is empty.") );
+            throw ParserError(_T("stack is empty."));
 
         TValueType el = top();
         m_Stack.pop();
         return el;
-      }
-
-      /** \brief Push an object into the stack. 
-
-          \param a_Val object to push into the stack.
-          \throw nothrow
-      */
-      void push(const TValueType& a_Val) 
-      { 
-        m_Stack.push(a_Val); 
-      }
-
-      /** \brief Return the number of stored elements. */
-      unsigned size() const
-      { 
-        return (unsigned)m_Stack.size(); 
-      }
-
-      /** \brief Returns true if stack is empty false otherwise. */
-      bool empty() const
-      {
-        return m_Stack.empty(); 
-      }
-       
-      /** \brief Return reference to the top object in the stack. 
-       
-          The top object is the one pushed most recently.
-      */
-      TValueType& top() 
-      { 
-        return m_Stack.top(); 
-      }
-  };
-} // namespace MathUtils
+    }
+
+    /** \brief Push an object into the stack.
+
+        \param a_Val object to push into the stack.
+        \throw nothrow
+    */
+    void push(const TValueType& a_Val) { m_Stack.push(a_Val); }
+
+    /** \brief Return the number of stored elements. */
+    unsigned size() const { return (unsigned)m_Stack.size(); }
+
+    /** \brief Returns true if stack is empty false otherwise. */
+    bool empty() const { return m_Stack.empty(); }
+
+    /** \brief Return reference to the top object in the stack.
+
+        The top object is the one pushed most recently.
+    */
+    TValueType& top() { return m_Stack.top(); }
+};
+} // namespace mu
 
 #endif
diff --git a/ext_libs/muparser/muParserTemplateMagic.h b/ext_libs/muparser/muParserTemplateMagic.h
old mode 100755
new mode 100644
index 1626caea..42dd0522
--- a/ext_libs/muparser/muParserTemplateMagic.h
+++ b/ext_libs/muparser/muParserTemplateMagic.h
@@ -4,110 +4,108 @@
 #include <cmath>
 #include "muParserError.h"
 
-
 namespace mu
 {
-  //-----------------------------------------------------------------------------------------------
-  //
-  // Compile time type detection
-  //
-  //-----------------------------------------------------------------------------------------------
-
-  /** \brief A class singling out integer types at compile time using 
-             template meta programming.
-  */
-  template<typename T>
-  struct TypeInfo
-  {
+//-----------------------------------------------------------------------------------------------
+//
+// Compile time type detection
+//
+//-----------------------------------------------------------------------------------------------
+
+/** \brief A class singling out integer types at compile time using
+           template meta programming.
+*/
+template<typename T>
+struct TypeInfo
+{
     static bool IsInteger() { return false; }
-  };
-
-  template<>
-  struct TypeInfo<char>
-  {
-    static bool IsInteger() { return true;  }
-  };
+};
 
-  template<>
-  struct TypeInfo<short>
-  {
-    static bool IsInteger() { return true;  }
-  };
-
-  template<>
-  struct TypeInfo<int>
-  {
-    static bool IsInteger() { return true;  }
-  };
-
-  template<>
-  struct TypeInfo<long>
-  {
-    static bool IsInteger() { return true;  }
-  };
-
-  template<>
-  struct TypeInfo<unsigned char>
-  {
-    static bool IsInteger() { return true;  }
-  };
+template<>
+struct TypeInfo<char>
+{
+    static bool IsInteger() { return true; }
+};
 
-  template<>
-  struct TypeInfo<unsigned short>
-  {
-    static bool IsInteger() { return true;  }
-  };
+template<>
+struct TypeInfo<short>
+{
+    static bool IsInteger() { return true; }
+};
 
-  template<>
-  struct TypeInfo<unsigned int>
-  {
-    static bool IsInteger() { return true;  }
-  };
+template<>
+struct TypeInfo<int>
+{
+    static bool IsInteger() { return true; }
+};
 
-  template<>
-  struct TypeInfo<unsigned long>
-  {
-    static bool IsInteger() { return true;  }
-  };
+template<>
+struct TypeInfo<long>
+{
+    static bool IsInteger() { return true; }
+};
 
+template<>
+struct TypeInfo<unsigned char>
+{
+    static bool IsInteger() { return true; }
+};
 
-  //-----------------------------------------------------------------------------------------------
-  //
-  // Standard math functions with dummy overload for integer types
-  //
-  //-----------------------------------------------------------------------------------------------
+template<>
+struct TypeInfo<unsigned short>
+{
+    static bool IsInteger() { return true; }
+};
 
-  /** \brief A template class for providing wrappers for essential math functions.
+template<>
+struct TypeInfo<unsigned int>
+{
+    static bool IsInteger() { return true; }
+};
 
-    This template is spezialized for several types in order to provide a unified interface
-    for parser internal math function calls regardless of the data type.
-  */
-  template<typename T>
-  struct MathImpl
-  {
-    static T Sin(T v)   { return sin(v);  }
-    static T Cos(T v)   { return cos(v);  }
-    static T Tan(T v)   { return tan(v);  }
-    static T ASin(T v)  { return asin(v); }
-    static T ACos(T v)  { return acos(v); }
-    static T ATan(T v)  { return atan(v); }
+template<>
+struct TypeInfo<unsigned long>
+{
+    static bool IsInteger() { return true; }
+};
+
+//-----------------------------------------------------------------------------------------------
+//
+// Standard math functions with dummy overload for integer types
+//
+//-----------------------------------------------------------------------------------------------
+
+/** \brief A template class for providing wrappers for essential math functions.
+
+  This template is spezialized for several types in order to provide a unified interface
+  for parser internal math function calls regardless of the data type.
+*/
+template<typename T>
+struct MathImpl
+{
+    static T Sin(T v) { return sin(v); }
+    static T Cos(T v) { return cos(v); }
+    static T Tan(T v) { return tan(v); }
+    static T ASin(T v) { return asin(v); }
+    static T ACos(T v) { return acos(v); }
+    static T ATan(T v) { return atan(v); }
     static T ATan2(T v1, T v2) { return atan2(v1, v2); }
-    static T Sinh(T v)  { return sinh(v); }
-    static T Cosh(T v)  { return cosh(v); }
-    static T Tanh(T v)  { return tanh(v); }
+    static T Sinh(T v) { return sinh(v); }
+    static T Cosh(T v) { return cosh(v); }
+    static T Tanh(T v) { return tanh(v); }
     static T ASinh(T v) { return log(v + sqrt(v * v + 1)); }
     static T ACosh(T v) { return log(v + sqrt(v * v - 1)); }
     static T ATanh(T v) { return ((T)0.5 * log((1 + v) / (1 - v))); }
-    static T Log(T v)   { return log(v); } 
-    static T Log2(T v)  { return log(v)/log((T)2); } // Logarithm base 2
-    static T Log10(T v) { return log10(v); }         // Logarithm base 10
-    static T Exp(T v)   { return exp(v);   }
-    static T Abs(T v)   { return (v>=0) ? v : -v; }
-    static T Sqrt(T v)  { return sqrt(v); }
-    static T Rint(T v)  { return floor(v + (T)0.5); }
-    static T Sign(T v)  { return (T)((v<0) ? -1 : (v>0) ? 1 : 0); }
+    static T Log(T v) { return log(v); }
+    static T Log2(T v) { return log(v) / log((T)2); } // Logarithm base 2
+    static T Log10(T v) { return log10(v); }          // Logarithm base 10
+    static T Exp(T v) { return exp(v); }
+    static T Abs(T v) { return (v >= 0) ? v : -v; }
+    static T Sqrt(T v) { return sqrt(v); }
+    static T Rint(T v) { return floor(v + (T)0.5); }
+    static T Sign(T v) { return (T)((v < 0) ? -1 : (v > 0) ? 1 : 0); }
     static T Pow(T v1, T v2) { return std::pow(v1, v2); }
-  };
-}
+};
+} // namespace mu
 
 #endif
diff --git a/ext_libs/muparser/muParserTest.cpp b/ext_libs/muparser/muParserTest.cpp
old mode 100755
new mode 100644
index e8dd2b7d..77050a03
--- a/ext_libs/muparser/muParserTest.cpp
+++ b/ext_libs/muparser/muParserTest.cpp
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "muParserTest.h"
@@ -30,8 +30,8 @@
 #include <iostream>
 #include <limits.h>
 
-#define PARSER_CONST_PI  3.141592653589793238462643
-#define PARSER_CONST_E   2.718281828459045235360287
+#define PARSER_CONST_PI 3.141592653589793238462643
+#define PARSER_CONST_E 2.718281828459045235360287
 
 using namespace std;
 
@@ -41,1177 +41,1170 @@ using namespace std;
 
 namespace mu
 {
-  namespace Test
-  {
-    int ParserTester::c_iCount = 0;
-
-    //---------------------------------------------------------------------------------------------
-    ParserTester::ParserTester()
-      :m_vTestFun()
-    {
-      AddTest(&ParserTester::TestNames);
-      AddTest(&ParserTester::TestSyntax);
-      AddTest(&ParserTester::TestPostFix);
-      AddTest(&ParserTester::TestInfixOprt);
-      AddTest(&ParserTester::TestVarConst);
-      AddTest(&ParserTester::TestMultiArg);
-      AddTest(&ParserTester::TestExpression);
-      AddTest(&ParserTester::TestIfThenElse);
-      AddTest(&ParserTester::TestInterface);
-      AddTest(&ParserTester::TestBinOprt);
-      AddTest(&ParserTester::TestException);
-      AddTest(&ParserTester::TestStrArg);
-      AddTest(&ParserTester::TestBulkMode);
-
-      ParserTester::c_iCount = 0;
-    }
+namespace Test
+{
+int ParserTester::c_iCount = 0;
 
-    //---------------------------------------------------------------------------------------------
-    int ParserTester::IsHexVal(const char_type *a_szExpr, int *a_iPos, value_type *a_fVal)
-    {
-      if (a_szExpr[1]==0 || (a_szExpr[0]!='0' || a_szExpr[1]!='x') ) 
+//---------------------------------------------------------------------------------------------
+ParserTester::ParserTester() : m_vTestFun()
+{
+    AddTest(&ParserTester::TestNames);
+    AddTest(&ParserTester::TestSyntax);
+    AddTest(&ParserTester::TestPostFix);
+    AddTest(&ParserTester::TestInfixOprt);
+    AddTest(&ParserTester::TestVarConst);
+    AddTest(&ParserTester::TestMultiArg);
+    AddTest(&ParserTester::TestExpression);
+    AddTest(&ParserTester::TestIfThenElse);
+    AddTest(&ParserTester::TestInterface);
+    AddTest(&ParserTester::TestBinOprt);
+    AddTest(&ParserTester::TestException);
+    AddTest(&ParserTester::TestStrArg);
+    AddTest(&ParserTester::TestBulkMode);
+
+    ParserTester::c_iCount = 0;
+}
+
+//---------------------------------------------------------------------------------------------
+int ParserTester::IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal)
+{
+    if (a_szExpr[1] == 0 || (a_szExpr[0] != '0' || a_szExpr[1] != 'x'))
         return 0;
 
-      unsigned iVal(0);
+    unsigned iVal(0);
 
-      // New code based on streams for UNICODE compliance:
-      stringstream_type::pos_type nPos(0);
-      stringstream_type ss(a_szExpr + 2);
-      ss >> std::hex >> iVal;
-      nPos = ss.tellg();
+    // New code based on streams for UNICODE compliance:
+    stringstream_type::pos_type nPos(0);
+    stringstream_type ss(a_szExpr + 2);
+    ss >> std::hex >> iVal;
+    nPos = ss.tellg();
 
-      if (nPos==(stringstream_type::pos_type)0)
+    if (nPos == (stringstream_type::pos_type)0)
         return 1;
 
-      *a_iPos += (int)(2 + nPos);
-      *a_fVal = (value_type)iVal;
-      return 1;
-    }
+    *a_iPos += (int)(2 + nPos);
+    *a_fVal = (value_type)iVal;
+    return 1;
+}
+
+//---------------------------------------------------------------------------------------------
+int ParserTester::TestInterface()
+{
+    int iStat = 0;
+    mu::console() << _T("testing member functions...");
 
-    //---------------------------------------------------------------------------------------------
-    int ParserTester::TestInterface()
+    // Test RemoveVar
+    value_type afVal[3] = {1, 2, 3};
+    Parser p;
+
+    try
     {
-      int iStat = 0;
-      mu::console() << _T("testing member functions...");
-   
-      // Test RemoveVar
-      value_type afVal[3] = {1,2,3};
-      Parser p;
-  
-      try
-      {
-        p.DefineVar( _T("a"), &afVal[0]);
-        p.DefineVar( _T("b"), &afVal[1]);
-        p.DefineVar( _T("c"), &afVal[2]);
-        p.SetExpr( _T("a+b+c") );
+        p.DefineVar(_T("a"), &afVal[0]);
+        p.DefineVar(_T("b"), &afVal[1]);
+        p.DefineVar(_T("c"), &afVal[2]);
+        p.SetExpr(_T("a+b+c"));
         p.Eval();
-      }
-      catch(...)
-      {
-        iStat += 1;  // this is not supposed to happen 
-      }
-
-      try
-      {
-        p.RemoveVar( _T("c") );
+    }
+    catch (...)
+    {
+        iStat += 1; // this is not supposed to happen
+    }
+
+    try
+    {
+        p.RemoveVar(_T("c"));
         p.Eval();
-        iStat += 1;  // not supposed to reach this, nonexisting variable "c" deleted...
-      }
-      catch(...)
-      {
+        iStat += 1; // not supposed to reach this, nonexisting variable "c" deleted...
+    }
+    catch (...)
+    {
         // failure is expected...
-      }
+    }
 
-      if (iStat==0) 
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else 
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------------------------
-    int ParserTester::TestStrArg()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing string arguments...");
- 
-      iStat += EqnTest(_T("valueof(\"\")"), 123, true);   // empty string arguments caused a crash
-      iStat += EqnTest(_T("valueof(\"aaa\")+valueof(\"bbb\")  "), 246, true);
-      iStat += EqnTest(_T("2*(valueof(\"aaa\")-23)+valueof(\"bbb\")"), 323, true);
-      // use in expressions with variables
-      iStat += EqnTest(_T("a*(atof(\"10\")-b)"), 8, true);
-      iStat += EqnTest(_T("a-(atof(\"10\")*b)"), -19, true);
-      // string + numeric arguments
-      iStat += EqnTest(_T("strfun1(\"100\")"), 100, true);
-      iStat += EqnTest(_T("strfun2(\"100\",1)"), 101, true);
-      iStat += EqnTest(_T("strfun3(\"99\",1,2)"), 102, true);
-      // string constants
-      iStat += EqnTest(_T("atof(str1)+atof(str2)"), 3.33, true);
-
-      if (iStat==0)
+//---------------------------------------------------------------------------------------------
+int ParserTester::TestStrArg()
+{
+    int iStat = 0;
+    mu::console() << _T("testing string arguments...");
+
+    iStat += EqnTest(_T("valueof(\"\")"), 123, true); // empty string arguments caused a crash
+    iStat += EqnTest(_T("valueof(\"aaa\")+valueof(\"bbb\")  "), 246, true);
+    iStat += EqnTest(_T("2*(valueof(\"aaa\")-23)+valueof(\"bbb\")"), 323, true);
+    // use in expressions with variables
+    iStat += EqnTest(_T("a*(atof(\"10\")-b)"), 8, true);
+    iStat += EqnTest(_T("a-(atof(\"10\")*b)"), -19, true);
+    // string + numeric arguments
+    iStat += EqnTest(_T("strfun1(\"100\")"), 100, true);
+    iStat += EqnTest(_T("strfun2(\"100\",1)"), 101, true);
+    iStat += EqnTest(_T("strfun3(\"99\",1,2)"), 102, true);
+    // string constants
+    iStat += EqnTest(_T("atof(str1)+atof(str2)"), 3.33, true);
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else 
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------------------------
-    int ParserTester::TestBulkMode()
-    {
-        int iStat = 0;
-        mu::console() << _T("testing bulkmode...");
+//---------------------------------------------------------------------------------------------
+int ParserTester::TestBulkMode()
+{
+    int iStat = 0;
+    mu::console() << _T("testing bulkmode...");
 
-#define EQN_TEST_BULK(EXPR, R1, R2, R3, R4, PASS) \
-        { \
-          double res[] = { R1, R2, R3, R4 }; \
-          iStat += EqnTestBulk(_T(EXPR), res, (PASS)); \
-        }
+#define EQN_TEST_BULK(EXPR, R1, R2, R3, R4, PASS)    \
+    {                                                \
+        double res[] = {R1, R2, R3, R4};             \
+        iStat += EqnTestBulk(_T(EXPR), res, (PASS)); \
+    }
 
-        // Bulk Variables for the test:
-        // a: 1,2,3,4
-        // b: 2,2,2,2
-        // c: 3,3,3,3
-        // d: 5,4,3,2
-        EQN_TEST_BULK("a",   1, 1, 1, 1, false)
-        EQN_TEST_BULK("a",   1, 2, 3, 4, true)
-        EQN_TEST_BULK("b=a", 1, 2, 3, 4, true)
-        EQN_TEST_BULK("b=a, b*10", 10, 20, 30, 40, true)
-        EQN_TEST_BULK("b=a, b*10, a", 1, 2, 3, 4, true)
-        EQN_TEST_BULK("a+b", 3, 4, 5, 6, true)
-        EQN_TEST_BULK("c*(a+b)", 9, 12, 15, 18, true)
+    // Bulk Variables for the test:
+    // a: 1,2,3,4
+    // b: 2,2,2,2
+    // c: 3,3,3,3
+    // d: 5,4,3,2
+    EQN_TEST_BULK("a", 1, 1, 1, 1, false)
+    EQN_TEST_BULK("a", 1, 2, 3, 4, true)
+    EQN_TEST_BULK("b=a", 1, 2, 3, 4, true)
+    EQN_TEST_BULK("b=a, b*10", 10, 20, 30, 40, true)
+    EQN_TEST_BULK("b=a, b*10, a", 1, 2, 3, 4, true)
+    EQN_TEST_BULK("a+b", 3, 4, 5, 6, true)
+    EQN_TEST_BULK("c*(a+b)", 9, 12, 15, 18, true)
 #undef EQN_TEST_BULK
 
-        if (iStat == 0)
-            mu::console() << _T("passed") << endl;
-        else
-            mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
+    if (iStat == 0)
+        mu::console() << _T("passed") << endl;
+    else
+        mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-        return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------------------------
-    int ParserTester::TestBinOprt()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing binary operators...");
-   
-      // built in operators
-      // xor operator
-
-      iStat += EqnTest(_T("a++b"), 3, true);
-      iStat += EqnTest(_T("a ++ b"), 3, true);
-      iStat += EqnTest(_T("1++2"), 3, true);
-      iStat += EqnTest(_T("1 ++ 2"), 3, true);
-      iStat += EqnTest(_T("a add b"), 3, true);
-      iStat += EqnTest(_T("1 add 2"), 3, true);
-      iStat += EqnTest(_T("a<b"), 1, true);
-      iStat += EqnTest(_T("b>a"), 1, true);
-      iStat += EqnTest(_T("a>a"), 0, true);
-      iStat += EqnTest(_T("a<a"), 0, true);
-      iStat += EqnTest(_T("a>a"), 0, true);
-      iStat += EqnTest(_T("a<=a"), 1, true);
-      iStat += EqnTest(_T("a<=b"), 1, true);
-      iStat += EqnTest(_T("b<=a"), 0, true);
-      iStat += EqnTest(_T("a>=a"), 1, true);
-      iStat += EqnTest(_T("b>=a"), 1, true);
-      iStat += EqnTest(_T("a>=b"), 0, true);
-
-      // Test logical operators, especially if user defined "&" and the internal "&&" collide
-      iStat += EqnTest(_T("1 && 1"), 1, true); 
-      iStat += EqnTest(_T("1 && 0"), 0, true); 
-      iStat += EqnTest(_T("(a<b) && (b>a)"), 1, true); 
-      iStat += EqnTest(_T("(a<b) && (a>b)"), 0, true); 
-      //iStat += EqnTest(_T("12 and 255"), 12, true); 
-      //iStat += EqnTest(_T("12 and 0"), 0, true); 
-      iStat += EqnTest(_T("12 & 255"), 12, true); 
-      iStat += EqnTest(_T("12 & 0"), 0, true); 
-      iStat += EqnTest(_T("12&255"), 12, true); 
-      iStat += EqnTest(_T("12&0"), 0, true); 
-
-      // Assignment operator
-      iStat += EqnTest(_T("a = b"), 2, true); 
-      iStat += EqnTest(_T("a = sin(b)"), 0.909297, true); 
-      iStat += EqnTest(_T("a = 1+sin(b)"), 1.909297, true);
-      iStat += EqnTest(_T("(a=b)*2"), 4, true);
-      iStat += EqnTest(_T("2*(a=b)"), 4, true);
-      iStat += EqnTest(_T("2*(a=b+1)"), 6, true);
-      iStat += EqnTest(_T("(a=b+1)*2"), 6, true);
-      iStat += EqnTest(_T("a=c, a*10"), 30, true);
-
-      iStat += EqnTest(_T("2^2^3"), 256, true); 
-      iStat += EqnTest(_T("1/2/3"), 1.0/6.0, true); 
-
-      // reference: http://www.wolframalpha.com/input/?i=3%2B4*2%2F%281-5%29^2^3
-      iStat += EqnTest(_T("3+4*2/(1-5)^2^3"), 3.0001220703125, true); 
-
-      // Test user defined binary operators
-      iStat += EqnTestInt(_T("1 | 2"), 3, true);          
-      iStat += EqnTestInt(_T("1 || 2"), 1, true);          
-      iStat += EqnTestInt(_T("123 & 456"), 72, true);          
-      iStat += EqnTestInt(_T("(123 & 456) % 10"), 2, true);
-      iStat += EqnTestInt(_T("1 && 0"), 0, true);          
-      iStat += EqnTestInt(_T("123 && 456"), 1, true);          
-      iStat += EqnTestInt(_T("1 << 3"), 8, true);          
-      iStat += EqnTestInt(_T("8 >> 3"), 1, true);          
-      iStat += EqnTestInt(_T("9 / 4"), 2, true);  
-      iStat += EqnTestInt(_T("9 % 4"), 1, true);  
-      iStat += EqnTestInt(_T("if(5%2,1,0)"), 1, true);
-      iStat += EqnTestInt(_T("if(4%2,1,0)"), 0, true);
-      iStat += EqnTestInt(_T("-10+1"), -9, true);
-      iStat += EqnTestInt(_T("1+2*3"), 7, true);
-      iStat += EqnTestInt(_T("const1 != const2"), 1, true);
-      iStat += EqnTestInt(_T("const1 != const2"), 0, false);
-      iStat += EqnTestInt(_T("const1 == const2"), 0, true);
-      iStat += EqnTestInt(_T("const1 == 1"), 1, true);
-      iStat += EqnTestInt(_T("10*(const1 == 1)"), 10, true);
-      iStat += EqnTestInt(_T("2*(const1 | const2)"), 6, true);
-      iStat += EqnTestInt(_T("2*(const1 | const2)"), 7, false);
-      iStat += EqnTestInt(_T("const1 < const2"), 1, true);
-      iStat += EqnTestInt(_T("const2 > const1"), 1, true);
-      iStat += EqnTestInt(_T("const1 <= 1"), 1, true);
-      iStat += EqnTestInt(_T("const2 >= 2"), 1, true);
-      iStat += EqnTestInt(_T("2*(const1 + const2)"), 6, true);
-      iStat += EqnTestInt(_T("2*(const1 - const2)"), -2, true);
-      iStat += EqnTestInt(_T("a != b"), 1, true);
-      iStat += EqnTestInt(_T("a != b"), 0, false);
-      iStat += EqnTestInt(_T("a == b"), 0, true);
-      iStat += EqnTestInt(_T("a == 1"), 1, true);
-      iStat += EqnTestInt(_T("10*(a == 1)"), 10, true);
-      iStat += EqnTestInt(_T("2*(a | b)"), 6, true);
-      iStat += EqnTestInt(_T("2*(a | b)"), 7, false);
-      iStat += EqnTestInt(_T("a < b"), 1, true);
-      iStat += EqnTestInt(_T("b > a"), 1, true);
-      iStat += EqnTestInt(_T("a <= 1"), 1, true);
-      iStat += EqnTestInt(_T("b >= 2"), 1, true);
-      iStat += EqnTestInt(_T("2*(a + b)"), 6, true);
-      iStat += EqnTestInt(_T("2*(a - b)"), -2, true);
-      iStat += EqnTestInt(_T("a + (a << b)"), 5, true);
-      iStat += EqnTestInt(_T("-2^2"), -4, true);
-      iStat += EqnTestInt(_T("3--a"), 4, true);
-      iStat += EqnTestInt(_T("3+-3^2"), -6, true);
-
-      // Test reading of hex values:
-      iStat += EqnTestInt(_T("0xff"), 255, true);
-      iStat += EqnTestInt(_T("10+0xff"), 265, true);
-      iStat += EqnTestInt(_T("0xff+10"), 265, true);
-      iStat += EqnTestInt(_T("10*0xff"), 2550, true);
-      iStat += EqnTestInt(_T("0xff*10"), 2550, true);
-      iStat += EqnTestInt(_T("10+0xff+1"), 266, true);
-      iStat += EqnTestInt(_T("1+0xff+10"), 266, true);
-
-// incorrect: '^' is yor here, not power
-//    iStat += EqnTestInt("-(1+2)^2", -9, true);
-//    iStat += EqnTestInt("-1^3", -1, true);          
-
-      // Test precedence
-      // a=1, b=2, c=3
-      iStat += EqnTestInt(_T("a + b * c"), 7, true);
-      iStat += EqnTestInt(_T("a * b + c"), 5, true);
-      iStat += EqnTestInt(_T("a<b && b>10"), 0, true);
-      iStat += EqnTestInt(_T("a<b && b<10"), 1, true);
-
-      iStat += EqnTestInt(_T("a + b << c"), 17, true);
-      iStat += EqnTestInt(_T("a << b + c"), 7, true);
-      iStat += EqnTestInt(_T("c * b < a"), 0, true);
-      iStat += EqnTestInt(_T("c * b == 6 * a"), 1, true);
-      iStat += EqnTestInt(_T("2^2^3"), 256, true); 
-
-
-      if (iStat==0)
+//---------------------------------------------------------------------------------------------
+int ParserTester::TestBinOprt()
+{
+    int iStat = 0;
+    mu::console() << _T("testing binary operators...");
+
+    // built in operators
+    // xor operator
+
+    iStat += EqnTest(_T("a++b"), 3, true);
+    iStat += EqnTest(_T("a ++ b"), 3, true);
+    iStat += EqnTest(_T("1++2"), 3, true);
+    iStat += EqnTest(_T("1 ++ 2"), 3, true);
+    iStat += EqnTest(_T("a add b"), 3, true);
+    iStat += EqnTest(_T("1 add 2"), 3, true);
+    iStat += EqnTest(_T("a<b"), 1, true);
+    iStat += EqnTest(_T("b>a"), 1, true);
+    iStat += EqnTest(_T("a>a"), 0, true);
+    iStat += EqnTest(_T("a<a"), 0, true);
+    iStat += EqnTest(_T("a>a"), 0, true);
+    iStat += EqnTest(_T("a<=a"), 1, true);
+    iStat += EqnTest(_T("a<=b"), 1, true);
+    iStat += EqnTest(_T("b<=a"), 0, true);
+    iStat += EqnTest(_T("a>=a"), 1, true);
+    iStat += EqnTest(_T("b>=a"), 1, true);
+    iStat += EqnTest(_T("a>=b"), 0, true);
+
+    // Test logical operators, especially if user defined "&" and the internal "&&" collide
+    iStat += EqnTest(_T("1 && 1"), 1, true);
+    iStat += EqnTest(_T("1 && 0"), 0, true);
+    iStat += EqnTest(_T("(a<b) && (b>a)"), 1, true);
+    iStat += EqnTest(_T("(a<b) && (a>b)"), 0, true);
+    // iStat += EqnTest(_T("12 and 255"), 12, true);
+    // iStat += EqnTest(_T("12 and 0"), 0, true);
+    iStat += EqnTest(_T("12 & 255"), 12, true);
+    iStat += EqnTest(_T("12 & 0"), 0, true);
+    iStat += EqnTest(_T("12&255"), 12, true);
+    iStat += EqnTest(_T("12&0"), 0, true);
+
+    // Assignment operator
+    iStat += EqnTest(_T("a = b"), 2, true);
+    iStat += EqnTest(_T("a = sin(b)"), 0.909297, true);
+    iStat += EqnTest(_T("a = 1+sin(b)"), 1.909297, true);
+    iStat += EqnTest(_T("(a=b)*2"), 4, true);
+    iStat += EqnTest(_T("2*(a=b)"), 4, true);
+    iStat += EqnTest(_T("2*(a=b+1)"), 6, true);
+    iStat += EqnTest(_T("(a=b+1)*2"), 6, true);
+    iStat += EqnTest(_T("a=c, a*10"), 30, true);
+
+    iStat += EqnTest(_T("2^2^3"), 256, true);
+    iStat += EqnTest(_T("1/2/3"), 1.0 / 6.0, true);
+
+    // reference: http://www.wolframalpha.com/input/?i=3%2B4*2%2F%281-5%29^2^3
+    iStat += EqnTest(_T("3+4*2/(1-5)^2^3"), 3.0001220703125, true);
+
+    // Test user defined binary operators
+    iStat += EqnTestInt(_T("1 | 2"), 3, true);
+    iStat += EqnTestInt(_T("1 || 2"), 1, true);
+    iStat += EqnTestInt(_T("123 & 456"), 72, true);
+    iStat += EqnTestInt(_T("(123 & 456) % 10"), 2, true);
+    iStat += EqnTestInt(_T("1 && 0"), 0, true);
+    iStat += EqnTestInt(_T("123 && 456"), 1, true);
+    iStat += EqnTestInt(_T("1 << 3"), 8, true);
+    iStat += EqnTestInt(_T("8 >> 3"), 1, true);
+    iStat += EqnTestInt(_T("9 / 4"), 2, true);
+    iStat += EqnTestInt(_T("9 % 4"), 1, true);
+    iStat += EqnTestInt(_T("if(5%2,1,0)"), 1, true);
+    iStat += EqnTestInt(_T("if(4%2,1,0)"), 0, true);
+    iStat += EqnTestInt(_T("-10+1"), -9, true);
+    iStat += EqnTestInt(_T("1+2*3"), 7, true);
+    iStat += EqnTestInt(_T("const1 != const2"), 1, true);
+    iStat += EqnTestInt(_T("const1 != const2"), 0, false);
+    iStat += EqnTestInt(_T("const1 == const2"), 0, true);
+    iStat += EqnTestInt(_T("const1 == 1"), 1, true);
+    iStat += EqnTestInt(_T("10*(const1 == 1)"), 10, true);
+    iStat += EqnTestInt(_T("2*(const1 | const2)"), 6, true);
+    iStat += EqnTestInt(_T("2*(const1 | const2)"), 7, false);
+    iStat += EqnTestInt(_T("const1 < const2"), 1, true);
+    iStat += EqnTestInt(_T("const2 > const1"), 1, true);
+    iStat += EqnTestInt(_T("const1 <= 1"), 1, true);
+    iStat += EqnTestInt(_T("const2 >= 2"), 1, true);
+    iStat += EqnTestInt(_T("2*(const1 + const2)"), 6, true);
+    iStat += EqnTestInt(_T("2*(const1 - const2)"), -2, true);
+    iStat += EqnTestInt(_T("a != b"), 1, true);
+    iStat += EqnTestInt(_T("a != b"), 0, false);
+    iStat += EqnTestInt(_T("a == b"), 0, true);
+    iStat += EqnTestInt(_T("a == 1"), 1, true);
+    iStat += EqnTestInt(_T("10*(a == 1)"), 10, true);
+    iStat += EqnTestInt(_T("2*(a | b)"), 6, true);
+    iStat += EqnTestInt(_T("2*(a | b)"), 7, false);
+    iStat += EqnTestInt(_T("a < b"), 1, true);
+    iStat += EqnTestInt(_T("b > a"), 1, true);
+    iStat += EqnTestInt(_T("a <= 1"), 1, true);
+    iStat += EqnTestInt(_T("b >= 2"), 1, true);
+    iStat += EqnTestInt(_T("2*(a + b)"), 6, true);
+    iStat += EqnTestInt(_T("2*(a - b)"), -2, true);
+    iStat += EqnTestInt(_T("a + (a << b)"), 5, true);
+    iStat += EqnTestInt(_T("-2^2"), -4, true);
+    iStat += EqnTestInt(_T("3--a"), 4, true);
+    iStat += EqnTestInt(_T("3+-3^2"), -6, true);
+
+    // Test reading of hex values:
+    iStat += EqnTestInt(_T("0xff"), 255, true);
+    iStat += EqnTestInt(_T("10+0xff"), 265, true);
+    iStat += EqnTestInt(_T("0xff+10"), 265, true);
+    iStat += EqnTestInt(_T("10*0xff"), 2550, true);
+    iStat += EqnTestInt(_T("0xff*10"), 2550, true);
+    iStat += EqnTestInt(_T("10+0xff+1"), 266, true);
+    iStat += EqnTestInt(_T("1+0xff+10"), 266, true);
+
+    // incorrect: '^' is yor here, not power
+    //    iStat += EqnTestInt("-(1+2)^2", -9, true);
+    //    iStat += EqnTestInt("-1^3", -1, true);
+
+    // Test precedence
+    // a=1, b=2, c=3
+    iStat += EqnTestInt(_T("a + b * c"), 7, true);
+    iStat += EqnTestInt(_T("a * b + c"), 5, true);
+    iStat += EqnTestInt(_T("a<b && b>10"), 0, true);
+    iStat += EqnTestInt(_T("a<b && b<10"), 1, true);
+
+    iStat += EqnTestInt(_T("a + b << c"), 17, true);
+    iStat += EqnTestInt(_T("a << b + c"), 7, true);
+    iStat += EqnTestInt(_T("c * b < a"), 0, true);
+    iStat += EqnTestInt(_T("c * b == 6 * a"), 1, true);
+    iStat += EqnTestInt(_T("2^2^3"), 256, true);
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else 
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------------------------
-    /** \brief Check muParser name restriction enforcement. */
-    int ParserTester::TestNames()
-    {
-      int  iStat= 0,
-           iErr = 0;
-
-      mu::console() << "testing name restriction enforcement...";
-    
-      Parser p;
-
-  #define PARSER_THROWCHECK(DOMAIN, FAIL, EXPR, ARG) \
-      iErr = 0;                                      \
-      ParserTester::c_iCount++;                      \
-      try                                            \
-      {                                              \
-        p.Define##DOMAIN(EXPR, ARG);                 \
-      }                                              \
-      catch(Parser::exception_type&)                 \
-      {                                              \
-        iErr = (FAIL==false) ? 0 : 1;                \
-      }                                              \
-      iStat += iErr;      
-      
-      // constant names
-      PARSER_THROWCHECK(Const, false, _T("0a"), 1)
-      PARSER_THROWCHECK(Const, false, _T("9a"), 1)
-      PARSER_THROWCHECK(Const, false, _T("+a"), 1)
-      PARSER_THROWCHECK(Const, false, _T("-a"), 1)
-      PARSER_THROWCHECK(Const, false, _T("a-"), 1)
-      PARSER_THROWCHECK(Const, false, _T("a*"), 1)
-      PARSER_THROWCHECK(Const, false, _T("a?"), 1)
-      PARSER_THROWCHECK(Const, true, _T("a"), 1)
-      PARSER_THROWCHECK(Const, true, _T("a_min"), 1)
-      PARSER_THROWCHECK(Const, true, _T("a_min0"), 1)
-      PARSER_THROWCHECK(Const, true, _T("a_min9"), 1)
-      // variable names
-      value_type a;
-      p.ClearConst();
-      PARSER_THROWCHECK(Var, false, _T("123abc"), &a)
-      PARSER_THROWCHECK(Var, false, _T("9a"), &a)
-      PARSER_THROWCHECK(Var, false, _T("0a"), &a)
-      PARSER_THROWCHECK(Var, false, _T("+a"), &a)
-      PARSER_THROWCHECK(Var, false, _T("-a"), &a)
-      PARSER_THROWCHECK(Var, false, _T("?a"), &a)
-      PARSER_THROWCHECK(Var, false, _T("!a"), &a)
-      PARSER_THROWCHECK(Var, false, _T("a+"), &a)
-      PARSER_THROWCHECK(Var, false, _T("a-"), &a)
-      PARSER_THROWCHECK(Var, false, _T("a*"), &a)
-      PARSER_THROWCHECK(Var, false, _T("a?"), &a)
-      PARSER_THROWCHECK(Var, true, _T("a"), &a)
-      PARSER_THROWCHECK(Var, true, _T("a_min"), &a)
-      PARSER_THROWCHECK(Var, true, _T("a_min0"), &a)
-      PARSER_THROWCHECK(Var, true, _T("a_min9"), &a)
-      PARSER_THROWCHECK(Var, false, _T("a_min9"), 0)
-      // Postfix operators
-      // fail
-      PARSER_THROWCHECK(PostfixOprt, false, _T("(k"), f1of1)
-      PARSER_THROWCHECK(PostfixOprt, false, _T("9+"), f1of1)
-      PARSER_THROWCHECK(PostfixOprt, false, _T("+"), 0)
-      // pass
-      PARSER_THROWCHECK(PostfixOprt, true, _T("-a"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("?a"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("_"),   f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("#"),   f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("&&"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("||"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("&"),   f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("|"),   f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("++"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("--"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("?>"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("?<"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("**"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("xor"), f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("and"), f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("or"),  f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("not"), f1of1)
-      PARSER_THROWCHECK(PostfixOprt, true, _T("!"),   f1of1)
-      // Binary operator
-      // The following must fail with builtin operators activated
-      // p.EnableBuiltInOp(true); -> this is the default
-      p.ClearPostfixOprt();
-      PARSER_THROWCHECK(Oprt, false, _T("+"),  f1of2)
-      PARSER_THROWCHECK(Oprt, false, _T("-"),  f1of2)
-      PARSER_THROWCHECK(Oprt, false, _T("*"),  f1of2)
-      PARSER_THROWCHECK(Oprt, false, _T("/"),  f1of2)
-      PARSER_THROWCHECK(Oprt, false, _T("^"),  f1of2)
-      PARSER_THROWCHECK(Oprt, false, _T("&&"),  f1of2)
-      PARSER_THROWCHECK(Oprt, false, _T("||"),  f1of2)
-      // without activated built in operators it should work
-      p.EnableBuiltInOprt(false);
-      PARSER_THROWCHECK(Oprt, true, _T("+"),  f1of2)
-      PARSER_THROWCHECK(Oprt, true, _T("-"),  f1of2)
-      PARSER_THROWCHECK(Oprt, true, _T("*"),  f1of2)
-      PARSER_THROWCHECK(Oprt, true, _T("/"),  f1of2)
-      PARSER_THROWCHECK(Oprt, true, _T("^"),  f1of2)
-      PARSER_THROWCHECK(Oprt, true, _T("&&"),  f1of2)
-      PARSER_THROWCHECK(Oprt, true, _T("||"),  f1of2)
-  #undef PARSER_THROWCHECK
-
-      if (iStat==0) 
+//---------------------------------------------------------------------------------------------
+/** \brief Check muParser name restriction enforcement. */
+int ParserTester::TestNames()
+{
+    int iStat = 0, iErr = 0;
+
+    mu::console() << "testing name restriction enforcement...";
+
+    Parser p;
+
+#define PARSER_THROWCHECK(DOMAIN, FAIL, EXPR, ARG) \
+    iErr = 0;                                      \
+    ParserTester::c_iCount++;                      \
+    try                                            \
+    {                                              \
+        p.Define##DOMAIN(EXPR, ARG);               \
+    }                                              \
+    catch (Parser::exception_type&)                \
+    {                                              \
+        iErr = (FAIL == false) ? 0 : 1;            \
+    }                                              \
+    iStat += iErr;
+
+    // constant names
+    PARSER_THROWCHECK(Const, false, _T("0a"), 1)
+    PARSER_THROWCHECK(Const, false, _T("9a"), 1)
+    PARSER_THROWCHECK(Const, false, _T("+a"), 1)
+    PARSER_THROWCHECK(Const, false, _T("-a"), 1)
+    PARSER_THROWCHECK(Const, false, _T("a-"), 1)
+    PARSER_THROWCHECK(Const, false, _T("a*"), 1)
+    PARSER_THROWCHECK(Const, false, _T("a?"), 1)
+    PARSER_THROWCHECK(Const, true, _T("a"), 1)
+    PARSER_THROWCHECK(Const, true, _T("a_min"), 1)
+    PARSER_THROWCHECK(Const, true, _T("a_min0"), 1)
+    PARSER_THROWCHECK(Const, true, _T("a_min9"), 1)
+    // variable names
+    value_type a;
+    p.ClearConst();
+    PARSER_THROWCHECK(Var, false, _T("123abc"), &a)
+    PARSER_THROWCHECK(Var, false, _T("9a"), &a)
+    PARSER_THROWCHECK(Var, false, _T("0a"), &a)
+    PARSER_THROWCHECK(Var, false, _T("+a"), &a)
+    PARSER_THROWCHECK(Var, false, _T("-a"), &a)
+    PARSER_THROWCHECK(Var, false, _T("?a"), &a)
+    PARSER_THROWCHECK(Var, false, _T("!a"), &a)
+    PARSER_THROWCHECK(Var, false, _T("a+"), &a)
+    PARSER_THROWCHECK(Var, false, _T("a-"), &a)
+    PARSER_THROWCHECK(Var, false, _T("a*"), &a)
+    PARSER_THROWCHECK(Var, false, _T("a?"), &a)
+    PARSER_THROWCHECK(Var, true, _T("a"), &a)
+    PARSER_THROWCHECK(Var, true, _T("a_min"), &a)
+    PARSER_THROWCHECK(Var, true, _T("a_min0"), &a)
+    PARSER_THROWCHECK(Var, true, _T("a_min9"), &a)
+    PARSER_THROWCHECK(Var, false, _T("a_min9"), 0)
+    // Postfix operators
+    // fail
+    PARSER_THROWCHECK(PostfixOprt, false, _T("(k"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, false, _T("9+"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, false, _T("+"), 0)
+    // pass
+    PARSER_THROWCHECK(PostfixOprt, true, _T("-a"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("?a"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("_"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("#"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("&&"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("||"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("&"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("|"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("++"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("--"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("?>"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("?<"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("**"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("xor"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("and"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("or"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("not"), f1of1)
+    PARSER_THROWCHECK(PostfixOprt, true, _T("!"), f1of1)
+    // Binary operator
+    // The following must fail with builtin operators activated
+    // p.EnableBuiltInOp(true); -> this is the default
+    p.ClearPostfixOprt();
+    PARSER_THROWCHECK(Oprt, false, _T("+"), f1of2)
+    PARSER_THROWCHECK(Oprt, false, _T("-"), f1of2)
+    PARSER_THROWCHECK(Oprt, false, _T("*"), f1of2)
+    PARSER_THROWCHECK(Oprt, false, _T("/"), f1of2)
+    PARSER_THROWCHECK(Oprt, false, _T("^"), f1of2)
+    PARSER_THROWCHECK(Oprt, false, _T("&&"), f1of2)
+    PARSER_THROWCHECK(Oprt, false, _T("||"), f1of2)
+    // without activated built in operators it should work
+    p.EnableBuiltInOprt(false);
+    PARSER_THROWCHECK(Oprt, true, _T("+"), f1of2)
+    PARSER_THROWCHECK(Oprt, true, _T("-"), f1of2)
+    PARSER_THROWCHECK(Oprt, true, _T("*"), f1of2)
+    PARSER_THROWCHECK(Oprt, true, _T("/"), f1of2)
+    PARSER_THROWCHECK(Oprt, true, _T("^"), f1of2)
+    PARSER_THROWCHECK(Oprt, true, _T("&&"), f1of2)
+    PARSER_THROWCHECK(Oprt, true, _T("||"), f1of2)
+#undef PARSER_THROWCHECK
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else 
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestSyntax()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing syntax engine...");
-
-      iStat += ThrowTest(_T("1,"), ecUNEXPECTED_EOF);  // incomplete hex definition
-      iStat += ThrowTest(_T("a,"), ecUNEXPECTED_EOF);  // incomplete hex definition
-      iStat += ThrowTest(_T("sin(8),"), ecUNEXPECTED_EOF);  // incomplete hex definition
-      iStat += ThrowTest(_T("(sin(8)),"), ecUNEXPECTED_EOF);  // incomplete hex definition
-      iStat += ThrowTest(_T("a{m},"), ecUNEXPECTED_EOF);  // incomplete hex definition
-
-      iStat += EqnTest(_T("(1+ 2*a)"), 3, true);   // Spaces within formula
-      iStat += EqnTest(_T("sqrt((4))"), 2, true);  // Multiple brackets
-      iStat += EqnTest(_T("sqrt((2)+2)"), 2, true);// Multiple brackets
-      iStat += EqnTest(_T("sqrt(2+(2))"), 2, true);// Multiple brackets
-      iStat += EqnTest(_T("sqrt(a+(3))"), 2, true);// Multiple brackets
-      iStat += EqnTest(_T("sqrt((3)+a)"), 2, true);// Multiple brackets
-      iStat += EqnTest(_T("order(1,2)"), 1, true); // May not cause name collision with operator "or"
-      iStat += EqnTest(_T("(2+"), 0, false);       // missing closing bracket 
-      iStat += EqnTest(_T("2++4"), 0, false);      // unexpected operator
-      iStat += EqnTest(_T("2+-4"), 0, false);      // unexpected operator
-      iStat += EqnTest(_T("(2+)"), 0, false);      // unexpected closing bracket
-      iStat += EqnTest(_T("--2"), 0, false);       // double sign
-      iStat += EqnTest(_T("ksdfj"), 0, false);     // unknown token
-      iStat += EqnTest(_T("()"), 0, false);        // empty bracket without a function
-      iStat += EqnTest(_T("5+()"), 0, false);      // empty bracket without a function
-      iStat += EqnTest(_T("sin(cos)"), 0, false);  // unexpected function
-      iStat += EqnTest(_T("5t6"), 0, false);       // unknown token
-      iStat += EqnTest(_T("5 t 6"), 0, false);     // unknown token
-      iStat += EqnTest(_T("8*"), 0, false);        // unexpected end of formula
-      iStat += EqnTest(_T(",3"), 0, false);        // unexpected comma
-      iStat += EqnTest(_T("3,5"), 0, false);       // unexpected comma
-      iStat += EqnTest(_T("sin(8,8)"), 0, false);  // too many function args
-      iStat += EqnTest(_T("(7,8)"), 0, false);     // too many function args
-      iStat += EqnTest(_T("sin)"), 0, false);      // unexpected closing bracket
-      iStat += EqnTest(_T("a)"), 0, false);        // unexpected closing bracket
-      iStat += EqnTest(_T("pi)"), 0, false);       // unexpected closing bracket
-      iStat += EqnTest(_T("sin(())"), 0, false);   // unexpected closing bracket
-      iStat += EqnTest(_T("sin()"), 0, false);     // unexpected closing bracket
-
-      if (iStat==0)
+//---------------------------------------------------------------------------
+int ParserTester::TestSyntax()
+{
+    int iStat = 0;
+    mu::console() << _T("testing syntax engine...");
+
+    iStat += ThrowTest(_T("1,"), ecUNEXPECTED_EOF);        // incomplete hex definition
+    iStat += ThrowTest(_T("a,"), ecUNEXPECTED_EOF);        // incomplete hex definition
+    iStat += ThrowTest(_T("sin(8),"), ecUNEXPECTED_EOF);   // incomplete hex definition
+    iStat += ThrowTest(_T("(sin(8)),"), ecUNEXPECTED_EOF); // incomplete hex definition
+    iStat += ThrowTest(_T("a{m},"), ecUNEXPECTED_EOF);     // incomplete hex definition
+
+    iStat += EqnTest(_T("(1+ 2*a)"), 3, true);    // Spaces within formula
+    iStat += EqnTest(_T("sqrt((4))"), 2, true);   // Multiple brackets
+    iStat += EqnTest(_T("sqrt((2)+2)"), 2, true); // Multiple brackets
+    iStat += EqnTest(_T("sqrt(2+(2))"), 2, true); // Multiple brackets
+    iStat += EqnTest(_T("sqrt(a+(3))"), 2, true); // Multiple brackets
+    iStat += EqnTest(_T("sqrt((3)+a)"), 2, true); // Multiple brackets
+    iStat += EqnTest(_T("order(1,2)"), 1, true);  // May not cause name collision with operator "or"
+    iStat += EqnTest(_T("(2+"), 0, false);        // missing closing bracket
+    iStat += EqnTest(_T("2++4"), 0, false);       // unexpected operator
+    iStat += EqnTest(_T("2+-4"), 0, false);       // unexpected operator
+    iStat += EqnTest(_T("(2+)"), 0, false);       // unexpected closing bracket
+    iStat += EqnTest(_T("--2"), 0, false);        // double sign
+    iStat += EqnTest(_T("ksdfj"), 0, false);      // unknown token
+    iStat += EqnTest(_T("()"), 0, false);         // empty bracket without a function
+    iStat += EqnTest(_T("5+()"), 0, false);       // empty bracket without a function
+    iStat += EqnTest(_T("sin(cos)"), 0, false);   // unexpected function
+    iStat += EqnTest(_T("5t6"), 0, false);        // unknown token
+    iStat += EqnTest(_T("5 t 6"), 0, false);      // unknown token
+    iStat += EqnTest(_T("8*"), 0, false);         // unexpected end of formula
+    iStat += EqnTest(_T(",3"), 0, false);         // unexpected comma
+    iStat += EqnTest(_T("3,5"), 0, false);        // unexpected comma
+    iStat += EqnTest(_T("sin(8,8)"), 0, false);   // too many function args
+    iStat += EqnTest(_T("(7,8)"), 0, false);      // too many function args
+    iStat += EqnTest(_T("sin)"), 0, false);       // unexpected closing bracket
+    iStat += EqnTest(_T("a)"), 0, false);         // unexpected closing bracket
+    iStat += EqnTest(_T("pi)"), 0, false);        // unexpected closing bracket
+    iStat += EqnTest(_T("sin(())"), 0, false);    // unexpected closing bracket
+    iStat += EqnTest(_T("sin()"), 0, false);      // unexpected closing bracket
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else 
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestVarConst()
+//---------------------------------------------------------------------------
+int ParserTester::TestVarConst()
+{
+    int iStat = 0;
+    mu::console() << _T("testing variable/constant detection...");
+
+    // Test if the result changes when a variable changes
+    iStat += EqnTestWithVarChange(_T("a"), 1, 1, 2, 2);
+    iStat += EqnTestWithVarChange(_T("2*a"), 2, 4, 3, 6);
+
+    // distinguish constants with same basename
+    iStat += EqnTest(_T("const"), 1, true);
+    iStat += EqnTest(_T("const1"), 2, true);
+    iStat += EqnTest(_T("const2"), 3, true);
+    iStat += EqnTest(_T("2*const"), 2, true);
+    iStat += EqnTest(_T("2*const1"), 4, true);
+    iStat += EqnTest(_T("2*const2"), 6, true);
+    iStat += EqnTest(_T("2*const+1"), 3, true);
+    iStat += EqnTest(_T("2*const1+1"), 5, true);
+    iStat += EqnTest(_T("2*const2+1"), 7, true);
+    iStat += EqnTest(_T("const"), 0, false);
+    iStat += EqnTest(_T("const1"), 0, false);
+    iStat += EqnTest(_T("const2"), 0, false);
+
+    // distinguish variables with same basename
+    iStat += EqnTest(_T("a"), 1, true);
+    iStat += EqnTest(_T("aa"), 2, true);
+    iStat += EqnTest(_T("2*a"), 2, true);
+    iStat += EqnTest(_T("2*aa"), 4, true);
+    iStat += EqnTest(_T("2*a-1"), 1, true);
+    iStat += EqnTest(_T("2*aa-1"), 3, true);
+
+    // custom value recognition
+    iStat += EqnTest(_T("0xff"), 255, true);
+    iStat += EqnTest(_T("0x97 + 0xff"), 406, true);
+
+    // Finally test querying of used variables
+    try
     {
-      int iStat = 0;
-      mu::console() << _T("testing variable/constant detection...");
-
-      // Test if the result changes when a variable changes
-      iStat += EqnTestWithVarChange( _T("a"), 1, 1, 2, 2 );
-      iStat += EqnTestWithVarChange( _T("2*a"), 2, 4, 3, 6 );
-
-      // distinguish constants with same basename
-      iStat += EqnTest( _T("const"), 1, true);
-      iStat += EqnTest( _T("const1"), 2, true);
-      iStat += EqnTest( _T("const2"), 3, true);
-      iStat += EqnTest( _T("2*const"), 2, true);
-      iStat += EqnTest( _T("2*const1"), 4, true);
-      iStat += EqnTest( _T("2*const2"), 6, true);
-      iStat += EqnTest( _T("2*const+1"), 3, true);
-      iStat += EqnTest( _T("2*const1+1"), 5, true);
-      iStat += EqnTest( _T("2*const2+1"), 7, true);
-      iStat += EqnTest( _T("const"), 0, false);
-      iStat += EqnTest( _T("const1"), 0, false);
-      iStat += EqnTest( _T("const2"), 0, false);
-
-      // distinguish variables with same basename
-      iStat += EqnTest( _T("a"), 1, true);
-      iStat += EqnTest( _T("aa"), 2, true);
-      iStat += EqnTest( _T("2*a"), 2, true);
-      iStat += EqnTest( _T("2*aa"), 4, true);
-      iStat += EqnTest( _T("2*a-1"), 1, true);
-      iStat += EqnTest( _T("2*aa-1"), 3, true);
-
-      // custom value recognition
-      iStat += EqnTest( _T("0xff"), 255, true);
-      iStat += EqnTest( _T("0x97 + 0xff"), 406, true);
-
-      // Finally test querying of used variables
-      try
-      {
         int idx;
         mu::Parser p;
-        mu::value_type vVarVal[] = { 1, 2, 3, 4, 5};
-        p.DefineVar( _T("a"), &vVarVal[0]);
-        p.DefineVar( _T("b"), &vVarVal[1]);
-        p.DefineVar( _T("c"), &vVarVal[2]);
-        p.DefineVar( _T("d"), &vVarVal[3]);
-        p.DefineVar( _T("e"), &vVarVal[4]);
+        mu::value_type vVarVal[] = {1, 2, 3, 4, 5};
+        p.DefineVar(_T("a"), &vVarVal[0]);
+        p.DefineVar(_T("b"), &vVarVal[1]);
+        p.DefineVar(_T("c"), &vVarVal[2]);
+        p.DefineVar(_T("d"), &vVarVal[3]);
+        p.DefineVar(_T("e"), &vVarVal[4]);
 
         // Test lookup of defined variables
         // 4 used variables
-        p.SetExpr( _T("a+b+c+d") );
+        p.SetExpr(_T("a+b+c+d"));
         mu::varmap_type UsedVar = p.GetUsedVar();
         int iCount = (int)UsedVar.size();
-        if (iCount!=4) 
-          throw false;
-        
-        // the next check will fail if the parser 
+        if (iCount != 4)
+            throw false;
+
+        // the next check will fail if the parser
         // erroneously creates new variables internally
-        if (p.GetVar().size()!=5)
-          throw false;
+        if (p.GetVar().size() != 5)
+            throw false;
 
         mu::varmap_type::const_iterator item = UsedVar.begin();
-        for (idx=0; item!=UsedVar.end(); ++item)
+        for (idx = 0; item != UsedVar.end(); ++item)
         {
-          if (&vVarVal[idx++]!=item->second) 
-            throw false;
+            if (&vVarVal[idx++] != item->second)
+                throw false;
         }
 
         // Test lookup of undefined variables
-        p.SetExpr( _T("undef1+undef2+undef3") );
+        p.SetExpr(_T("undef1+undef2+undef3"));
         UsedVar = p.GetUsedVar();
         iCount = (int)UsedVar.size();
-        if (iCount!=3) 
-          throw false;
+        if (iCount != 3)
+            throw false;
 
-        // the next check will fail if the parser 
+        // the next check will fail if the parser
         // erroneously creates new variables internally
-        if (p.GetVar().size()!=5)
-          throw false;
+        if (p.GetVar().size() != 5)
+            throw false;
 
-        for (item = UsedVar.begin(); item!=UsedVar.end(); ++item)
+        for (item = UsedVar.begin(); item != UsedVar.end(); ++item)
         {
-          if (item->second!=0) 
-            throw false; // all pointers to undefined variables must be null
+            if (item->second != 0)
+                throw false; // all pointers to undefined variables must be null
         }
 
         // 1 used variables
-        p.SetExpr( _T("a+b") );
+        p.SetExpr(_T("a+b"));
         UsedVar = p.GetUsedVar();
         iCount = (int)UsedVar.size();
-        if (iCount!=2) throw false;
+        if (iCount != 2)
+            throw false;
         item = UsedVar.begin();
-        for (idx=0; item!=UsedVar.end(); ++item)
-          if (&vVarVal[idx++]!=item->second) throw false;
-
-      }
-      catch(...)
-      {
+        for (idx = 0; item != UsedVar.end(); ++item)
+            if (&vVarVal[idx++] != item->second)
+                throw false;
+    }
+    catch (...)
+    {
         iStat += 1;
-      }
+    }
 
-      if (iStat==0)  
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestMultiArg()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing multiarg functions...");
-    
-      // Compound expressions
-      iStat += EqnTest( _T("1,2,3"), 3, true);
-      iStat += EqnTest( _T("a,b,c"), 3, true);
-      iStat += EqnTest( _T("a=10,b=20,c=a*b"), 200, true);
-      iStat += EqnTest( _T("1,\n2,\n3"), 3, true);
-      iStat += EqnTest( _T("a,\nb,\nc"), 3, true);
-      iStat += EqnTest( _T("a=10,\nb=20,\nc=a*b"), 200, true);
-      iStat += EqnTest( _T("1,\r\n2,\r\n3"), 3, true);
-      iStat += EqnTest( _T("a,\r\nb,\r\nc"), 3, true);
-      iStat += EqnTest( _T("a=10,\r\nb=20,\r\nc=a*b"), 200, true);
-
-      // picking the right argument
-      iStat += EqnTest( _T("f1of1(1)"), 1, true);
-      iStat += EqnTest( _T("f1of2(1, 2)"), 1, true);
-      iStat += EqnTest( _T("f2of2(1, 2)"), 2, true);
-      iStat += EqnTest( _T("f1of3(1, 2, 3)"), 1, true);
-      iStat += EqnTest( _T("f2of3(1, 2, 3)"), 2, true);
-      iStat += EqnTest( _T("f3of3(1, 2, 3)"), 3, true);
-      iStat += EqnTest( _T("f1of4(1, 2, 3, 4)"), 1, true);
-      iStat += EqnTest( _T("f2of4(1, 2, 3, 4)"), 2, true);
-      iStat += EqnTest( _T("f3of4(1, 2, 3, 4)"), 3, true);
-      iStat += EqnTest( _T("f4of4(1, 2, 3, 4)"), 4, true);
-      iStat += EqnTest( _T("f1of5(1, 2, 3, 4, 5)"), 1, true);
-      iStat += EqnTest( _T("f2of5(1, 2, 3, 4, 5)"), 2, true);
-      iStat += EqnTest( _T("f3of5(1, 2, 3, 4, 5)"), 3, true);
-      iStat += EqnTest( _T("f4of5(1, 2, 3, 4, 5)"), 4, true);
-      iStat += EqnTest( _T("f5of5(1, 2, 3, 4, 5)"), 5, true);
-      // Too few arguments / Too many arguments
-      iStat += EqnTest( _T("1+ping()"), 11, true);
-      iStat += EqnTest( _T("ping()+1"), 11, true);
-      iStat += EqnTest( _T("2*ping()"), 20, true);
-      iStat += EqnTest( _T("ping()*2"), 20, true);
-      iStat += EqnTest( _T("ping(1,2)"), 0, false);
-      iStat += EqnTest( _T("1+ping(1,2)"), 0, false);
-      iStat += EqnTest( _T("f1of1(1,2)"), 0, false);
-      iStat += EqnTest( _T("f1of1()"), 0, false);
-      iStat += EqnTest( _T("f1of2(1, 2, 3)"), 0, false);
-      iStat += EqnTest( _T("f1of2(1)"), 0, false);
-      iStat += EqnTest( _T("f1of3(1, 2, 3, 4)"), 0, false);
-      iStat += EqnTest( _T("f1of3(1)"), 0, false);
-      iStat += EqnTest( _T("f1of4(1, 2, 3, 4, 5)"), 0, false);
-      iStat += EqnTest( _T("f1of4(1)"), 0, false);
-      iStat += EqnTest( _T("(1,2,3)"), 0, false);
-      iStat += EqnTest( _T("1,2,3"), 0, false);
-      iStat += EqnTest( _T("(1*a,2,3)"), 0, false);
-      iStat += EqnTest( _T("1,2*a,3"), 0, false);
-     
-      // correct calculation of arguments
-      iStat += EqnTest( _T("min(a, 1)"),  1, true);
-      iStat += EqnTest( _T("min(3*2, 1)"),  1, true);
-      iStat += EqnTest( _T("min(3*2, 1)"),  6, false);
-      iStat += EqnTest( _T("firstArg(2,3,4)"), 2, true);
-      iStat += EqnTest( _T("lastArg(2,3,4)"), 4, true);
-      iStat += EqnTest( _T("min(3*a+1, 1)"),  1, true);
-      iStat += EqnTest( _T("max(3*a+1, 1)"),  4, true);
-      iStat += EqnTest( _T("max(3*a+1, 1)*2"),  8, true);
-      iStat += EqnTest( _T("2*max(3*a+1, 1)+2"),  10, true);
-
-      // functions with Variable argument count
-      iStat += EqnTest( _T("sum(a)"), 1, true);
-      iStat += EqnTest( _T("sum(1,2,3)"),  6, true);
-      iStat += EqnTest( _T("sum(a,b,c)"),  6, true);
-      iStat += EqnTest( _T("sum(1,-max(1,2),3)*2"),  4, true);
-      iStat += EqnTest( _T("2*sum(1,2,3)"),  12, true);
-      iStat += EqnTest( _T("2*sum(1,2,3)+2"),  14, true);
-      iStat += EqnTest( _T("2*sum(-1,2,3)+2"),  10, true);
-      iStat += EqnTest( _T("2*sum(-1,2,-(-a))+2"),  6, true);
-      iStat += EqnTest( _T("2*sum(-1,10,-a)+2"),  18, true);
-      iStat += EqnTest( _T("2*sum(1,2,3)*2"),  24, true);
-      iStat += EqnTest( _T("sum(1,-max(1,2),3)*2"),  4, true);
-      iStat += EqnTest( _T("sum(1*3, 4, a+2)"),  10, true);
-      iStat += EqnTest( _T("sum(1*3, 2*sum(1,2,2), a+2)"),  16, true);
-      iStat += EqnTest( _T("sum(1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2)"), 24, true);
-
-      // some failures
-      iStat += EqnTest( _T("sum()"),  0, false);
-      iStat += EqnTest( _T("sum(,)"),  0, false);
-      iStat += EqnTest( _T("sum(1,2,)"),  0, false);
-      iStat += EqnTest( _T("sum(,1,2)"),  0, false);
-
-      if (iStat==0) 
+//---------------------------------------------------------------------------
+int ParserTester::TestMultiArg()
+{
+    int iStat = 0;
+    mu::console() << _T("testing multiarg functions...");
+
+    // Compound expressions
+    iStat += EqnTest(_T("1,2,3"), 3, true);
+    iStat += EqnTest(_T("a,b,c"), 3, true);
+    iStat += EqnTest(_T("a=10,b=20,c=a*b"), 200, true);
+    iStat += EqnTest(_T("1,\n2,\n3"), 3, true);
+    iStat += EqnTest(_T("a,\nb,\nc"), 3, true);
+    iStat += EqnTest(_T("a=10,\nb=20,\nc=a*b"), 200, true);
+    iStat += EqnTest(_T("1,\r\n2,\r\n3"), 3, true);
+    iStat += EqnTest(_T("a,\r\nb,\r\nc"), 3, true);
+    iStat += EqnTest(_T("a=10,\r\nb=20,\r\nc=a*b"), 200, true);
+
+    // picking the right argument
+    iStat += EqnTest(_T("f1of1(1)"), 1, true);
+    iStat += EqnTest(_T("f1of2(1, 2)"), 1, true);
+    iStat += EqnTest(_T("f2of2(1, 2)"), 2, true);
+    iStat += EqnTest(_T("f1of3(1, 2, 3)"), 1, true);
+    iStat += EqnTest(_T("f2of3(1, 2, 3)"), 2, true);
+    iStat += EqnTest(_T("f3of3(1, 2, 3)"), 3, true);
+    iStat += EqnTest(_T("f1of4(1, 2, 3, 4)"), 1, true);
+    iStat += EqnTest(_T("f2of4(1, 2, 3, 4)"), 2, true);
+    iStat += EqnTest(_T("f3of4(1, 2, 3, 4)"), 3, true);
+    iStat += EqnTest(_T("f4of4(1, 2, 3, 4)"), 4, true);
+    iStat += EqnTest(_T("f1of5(1, 2, 3, 4, 5)"), 1, true);
+    iStat += EqnTest(_T("f2of5(1, 2, 3, 4, 5)"), 2, true);
+    iStat += EqnTest(_T("f3of5(1, 2, 3, 4, 5)"), 3, true);
+    iStat += EqnTest(_T("f4of5(1, 2, 3, 4, 5)"), 4, true);
+    iStat += EqnTest(_T("f5of5(1, 2, 3, 4, 5)"), 5, true);
+    // Too few arguments / Too many arguments
+    iStat += EqnTest(_T("1+ping()"), 11, true);
+    iStat += EqnTest(_T("ping()+1"), 11, true);
+    iStat += EqnTest(_T("2*ping()"), 20, true);
+    iStat += EqnTest(_T("ping()*2"), 20, true);
+    iStat += EqnTest(_T("ping(1,2)"), 0, false);
+    iStat += EqnTest(_T("1+ping(1,2)"), 0, false);
+    iStat += EqnTest(_T("f1of1(1,2)"), 0, false);
+    iStat += EqnTest(_T("f1of1()"), 0, false);
+    iStat += EqnTest(_T("f1of2(1, 2, 3)"), 0, false);
+    iStat += EqnTest(_T("f1of2(1)"), 0, false);
+    iStat += EqnTest(_T("f1of3(1, 2, 3, 4)"), 0, false);
+    iStat += EqnTest(_T("f1of3(1)"), 0, false);
+    iStat += EqnTest(_T("f1of4(1, 2, 3, 4, 5)"), 0, false);
+    iStat += EqnTest(_T("f1of4(1)"), 0, false);
+    iStat += EqnTest(_T("(1,2,3)"), 0, false);
+    iStat += EqnTest(_T("1,2,3"), 0, false);
+    iStat += EqnTest(_T("(1*a,2,3)"), 0, false);
+    iStat += EqnTest(_T("1,2*a,3"), 0, false);
+
+    // correct calculation of arguments
+    iStat += EqnTest(_T("min(a, 1)"), 1, true);
+    iStat += EqnTest(_T("min(3*2, 1)"), 1, true);
+    iStat += EqnTest(_T("min(3*2, 1)"), 6, false);
+    iStat += EqnTest(_T("firstArg(2,3,4)"), 2, true);
+    iStat += EqnTest(_T("lastArg(2,3,4)"), 4, true);
+    iStat += EqnTest(_T("min(3*a+1, 1)"), 1, true);
+    iStat += EqnTest(_T("max(3*a+1, 1)"), 4, true);
+    iStat += EqnTest(_T("max(3*a+1, 1)*2"), 8, true);
+    iStat += EqnTest(_T("2*max(3*a+1, 1)+2"), 10, true);
+
+    // functions with Variable argument count
+    iStat += EqnTest(_T("sum(a)"), 1, true);
+    iStat += EqnTest(_T("sum(1,2,3)"), 6, true);
+    iStat += EqnTest(_T("sum(a,b,c)"), 6, true);
+    iStat += EqnTest(_T("sum(1,-max(1,2),3)*2"), 4, true);
+    iStat += EqnTest(_T("2*sum(1,2,3)"), 12, true);
+    iStat += EqnTest(_T("2*sum(1,2,3)+2"), 14, true);
+    iStat += EqnTest(_T("2*sum(-1,2,3)+2"), 10, true);
+    iStat += EqnTest(_T("2*sum(-1,2,-(-a))+2"), 6, true);
+    iStat += EqnTest(_T("2*sum(-1,10,-a)+2"), 18, true);
+    iStat += EqnTest(_T("2*sum(1,2,3)*2"), 24, true);
+    iStat += EqnTest(_T("sum(1,-max(1,2),3)*2"), 4, true);
+    iStat += EqnTest(_T("sum(1*3, 4, a+2)"), 10, true);
+    iStat += EqnTest(_T("sum(1*3, 2*sum(1,2,2), a+2)"), 16, true);
+    iStat += EqnTest(_T("sum(1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2)"), 24, true);
+
+    // some failures
+    iStat += EqnTest(_T("sum()"), 0, false);
+    iStat += EqnTest(_T("sum(,)"), 0, false);
+    iStat += EqnTest(_T("sum(1,2,)"), 0, false);
+    iStat += EqnTest(_T("sum(,1,2)"), 0, false);
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
-  
-      return iStat;
-    }
 
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestInfixOprt()
-    {
-      int iStat(0);
-      mu::console() << "testing infix operators...";
-
-      iStat += EqnTest( _T("+1"),    +1, true);
-      iStat += EqnTest( _T("-(+1)"), -1, true);
-      iStat += EqnTest( _T("-(+1)*2"),  -2, true);
-      iStat += EqnTest( _T("-(+2)*sqrt(4)"),  -4, true);
-      iStat += EqnTest( _T("3-+a"), 2, true);
-      iStat += EqnTest( _T("+1*3"),  3, true);
-
-      iStat += EqnTest( _T("-1"),    -1, true);
-      iStat += EqnTest( _T("-(-1)"),  1, true);
-      iStat += EqnTest( _T("-(-1)*2"),  2, true);
-      iStat += EqnTest( _T("-(-2)*sqrt(4)"),  4, true);
-      iStat += EqnTest( _T("-_pi"), -PARSER_CONST_PI, true);
-      iStat += EqnTest( _T("-a"),  -1, true);
-      iStat += EqnTest( _T("-(a)"),  -1, true);
-      iStat += EqnTest( _T("-(-a)"),  1, true);
-      iStat += EqnTest( _T("-(-a)*2"),  2, true);
-      iStat += EqnTest( _T("-(8)"), -8, true);
-      iStat += EqnTest( _T("-8"), -8, true);
-      iStat += EqnTest( _T("-(2+1)"), -3, true);
-      iStat += EqnTest( _T("-(f1of1(1+2*3)+1*2)"), -9, true);
-      iStat += EqnTest( _T("-(-f1of1(1+2*3)+1*2)"), 5, true);
-      iStat += EqnTest( _T("-sin(8)"), -0.989358, true);
-      iStat += EqnTest( _T("3-(-a)"), 4, true);
-      iStat += EqnTest( _T("3--a"), 4, true);
-      iStat += EqnTest( _T("-1*3"),  -3, true);
-
-      // Postfix / infix priorities
-      iStat += EqnTest( _T("~2#"), 8, true);
-      iStat += EqnTest( _T("~f1of1(2)#"), 8, true);
-      iStat += EqnTest( _T("~(b)#"), 8, true);
-      iStat += EqnTest( _T("(~b)#"), 12, true);
-      iStat += EqnTest( _T("~(2#)"), 8, true);
-      iStat += EqnTest( _T("~(f1of1(2)#)"), 8, true);
-      //
-      iStat += EqnTest( _T("-2^2"),-4, true);
-      iStat += EqnTest( _T("-(a+b)^2"),-9, true);
-      iStat += EqnTest( _T("(-3)^2"),9, true);
-      iStat += EqnTest( _T("-(-2^2)"),4, true);
-      iStat += EqnTest( _T("3+-3^2"),-6, true);
-      // The following assumes use of sqr as postfix operator ("§") together
-      // with a sign operator of low priority:
-      iStat += EqnTest( _T("-2'"), -4, true);
-      iStat += EqnTest( _T("-(1+1)'"),-4, true);
-      iStat += EqnTest( _T("2+-(1+1)'"),-2, true);
-      iStat += EqnTest( _T("2+-2'"), -2, true);
-      // This is the classic behaviour of the infix sign operator (here: "$") which is
-      // now deprecated:
-      iStat += EqnTest( _T("$2^2"),4, true);
-      iStat += EqnTest( _T("$(a+b)^2"),9, true);
-      iStat += EqnTest( _T("($3)^2"),9, true);
-      iStat += EqnTest( _T("$($2^2)"),-4, true);
-      iStat += EqnTest( _T("3+$3^2"),12, true);
-
-      // infix operators sharing the first few characters
-      iStat += EqnTest( _T("~ 123"),  123+2, true);
-      iStat += EqnTest( _T("~~ 123"),  123+2, true);
-
-      if (iStat==0)
+//---------------------------------------------------------------------------
+int ParserTester::TestInfixOprt()
+{
+    int iStat(0);
+    mu::console() << "testing infix operators...";
+
+    iStat += EqnTest(_T("+1"), +1, true);
+    iStat += EqnTest(_T("-(+1)"), -1, true);
+    iStat += EqnTest(_T("-(+1)*2"), -2, true);
+    iStat += EqnTest(_T("-(+2)*sqrt(4)"), -4, true);
+    iStat += EqnTest(_T("3-+a"), 2, true);
+    iStat += EqnTest(_T("+1*3"), 3, true);
+
+    iStat += EqnTest(_T("-1"), -1, true);
+    iStat += EqnTest(_T("-(-1)"), 1, true);
+    iStat += EqnTest(_T("-(-1)*2"), 2, true);
+    iStat += EqnTest(_T("-(-2)*sqrt(4)"), 4, true);
+    iStat += EqnTest(_T("-_pi"), -PARSER_CONST_PI, true);
+    iStat += EqnTest(_T("-a"), -1, true);
+    iStat += EqnTest(_T("-(a)"), -1, true);
+    iStat += EqnTest(_T("-(-a)"), 1, true);
+    iStat += EqnTest(_T("-(-a)*2"), 2, true);
+    iStat += EqnTest(_T("-(8)"), -8, true);
+    iStat += EqnTest(_T("-8"), -8, true);
+    iStat += EqnTest(_T("-(2+1)"), -3, true);
+    iStat += EqnTest(_T("-(f1of1(1+2*3)+1*2)"), -9, true);
+    iStat += EqnTest(_T("-(-f1of1(1+2*3)+1*2)"), 5, true);
+    iStat += EqnTest(_T("-sin(8)"), -0.989358, true);
+    iStat += EqnTest(_T("3-(-a)"), 4, true);
+    iStat += EqnTest(_T("3--a"), 4, true);
+    iStat += EqnTest(_T("-1*3"), -3, true);
+
+    // Postfix / infix priorities
+    iStat += EqnTest(_T("~2#"), 8, true);
+    iStat += EqnTest(_T("~f1of1(2)#"), 8, true);
+    iStat += EqnTest(_T("~(b)#"), 8, true);
+    iStat += EqnTest(_T("(~b)#"), 12, true);
+    iStat += EqnTest(_T("~(2#)"), 8, true);
+    iStat += EqnTest(_T("~(f1of1(2)#)"), 8, true);
+    //
+    iStat += EqnTest(_T("-2^2"), -4, true);
+    iStat += EqnTest(_T("-(a+b)^2"), -9, true);
+    iStat += EqnTest(_T("(-3)^2"), 9, true);
+    iStat += EqnTest(_T("-(-2^2)"), 4, true);
+    iStat += EqnTest(_T("3+-3^2"), -6, true);
+    // The following assumes use of sqr as postfix operator ("§") together
+    // with a sign operator of low priority:
+    iStat += EqnTest(_T("-2'"), -4, true);
+    iStat += EqnTest(_T("-(1+1)'"), -4, true);
+    iStat += EqnTest(_T("2+-(1+1)'"), -2, true);
+    iStat += EqnTest(_T("2+-2'"), -2, true);
+    // This is the classic behaviour of the infix sign operator (here: "$") which is
+    // now deprecated:
+    iStat += EqnTest(_T("$2^2"), 4, true);
+    iStat += EqnTest(_T("$(a+b)^2"), 9, true);
+    iStat += EqnTest(_T("($3)^2"), 9, true);
+    iStat += EqnTest(_T("$($2^2)"), -4, true);
+    iStat += EqnTest(_T("3+$3^2"), 12, true);
+
+    // infix operators sharing the first few characters
+    iStat += EqnTest(_T("~ 123"), 123 + 2, true);
+    iStat += EqnTest(_T("~~ 123"), 123 + 2, true);
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-
-    //---------------------------------------------------------------------------
-    int ParserTester::TestPostFix()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing postfix operators...");
-
-      // application
-      iStat += EqnTest( _T("3{m}+5"), 5.003, true);
-      iStat += EqnTest( _T("1000{m}"), 1, true);
-      iStat += EqnTest( _T("1000 {m}"), 1, true);
-      iStat += EqnTest( _T("(a){m}"), 1e-3, true);
-      iStat += EqnTest( _T("a{m}"), 1e-3, true);
-      iStat += EqnTest( _T("a {m}"), 1e-3, true);
-      iStat += EqnTest( _T("-(a){m}"), -1e-3, true);
-      iStat += EqnTest( _T("-2{m}"), -2e-3, true);
-      iStat += EqnTest( _T("-2 {m}"), -2e-3, true);
-      iStat += EqnTest( _T("f1of1(1000){m}"), 1, true);
-      iStat += EqnTest( _T("-f1of1(1000){m}"), -1, true);
-      iStat += EqnTest( _T("-f1of1(-1000){m}"), 1, true);
-      iStat += EqnTest( _T("f4of4(0,0,0,1000){m}"), 1, true);
-      iStat += EqnTest( _T("2+(a*1000){m}"), 3, true);
-
-      // can postfix operators "m" und "meg" be told apart properly?
-      iStat += EqnTest( _T("2*3000meg+2"), 2*3e9+2, true);   
-
-      // some incorrect results
-      iStat += EqnTest( _T("1000{m}"), 0.1, false);
-      iStat += EqnTest( _T("(a){m}"), 2, false);
-      // failure due to syntax checking
-      iStat += ThrowTest(_T("0x"), ecUNASSIGNABLE_TOKEN);  // incomplete hex definition
-      iStat += ThrowTest(_T("3+"), ecUNEXPECTED_EOF);
-      iStat += ThrowTest( _T("4 + {m}"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("{m}4"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("sin({m})"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("{m} {m}"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("{m}(8)"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("4,{m}"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("-{m}"), ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest( _T("2(-{m})"), ecUNEXPECTED_PARENS);
-      iStat += ThrowTest( _T("2({m})"), ecUNEXPECTED_PARENS);
- 
-      iStat += ThrowTest( _T("multi*1.0"), ecUNASSIGNABLE_TOKEN);
-
-      if (iStat==0)
+//---------------------------------------------------------------------------
+int ParserTester::TestPostFix()
+{
+    int iStat = 0;
+    mu::console() << _T("testing postfix operators...");
+
+    // application
+    iStat += EqnTest(_T("3{m}+5"), 5.003, true);
+    iStat += EqnTest(_T("1000{m}"), 1, true);
+    iStat += EqnTest(_T("1000 {m}"), 1, true);
+    iStat += EqnTest(_T("(a){m}"), 1e-3, true);
+    iStat += EqnTest(_T("a{m}"), 1e-3, true);
+    iStat += EqnTest(_T("a {m}"), 1e-3, true);
+    iStat += EqnTest(_T("-(a){m}"), -1e-3, true);
+    iStat += EqnTest(_T("-2{m}"), -2e-3, true);
+    iStat += EqnTest(_T("-2 {m}"), -2e-3, true);
+    iStat += EqnTest(_T("f1of1(1000){m}"), 1, true);
+    iStat += EqnTest(_T("-f1of1(1000){m}"), -1, true);
+    iStat += EqnTest(_T("-f1of1(-1000){m}"), 1, true);
+    iStat += EqnTest(_T("f4of4(0,0,0,1000){m}"), 1, true);
+    iStat += EqnTest(_T("2+(a*1000){m}"), 3, true);
+
+    // can postfix operators "m" und "meg" be told apart properly?
+    iStat += EqnTest(_T("2*3000meg+2"), 2 * 3e9 + 2, true);
+
+    // some incorrect results
+    iStat += EqnTest(_T("1000{m}"), 0.1, false);
+    iStat += EqnTest(_T("(a){m}"), 2, false);
+    // failure due to syntax checking
+    iStat += ThrowTest(_T("0x"), ecUNASSIGNABLE_TOKEN); // incomplete hex definition
+    iStat += ThrowTest(_T("3+"), ecUNEXPECTED_EOF);
+    iStat += ThrowTest(_T("4 + {m}"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("{m}4"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("sin({m})"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("{m} {m}"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("{m}(8)"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("4,{m}"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("-{m}"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("2(-{m})"), ecUNEXPECTED_PARENS);
+    iStat += ThrowTest(_T("2({m})"), ecUNEXPECTED_PARENS);
+
+    iStat += ThrowTest(_T("multi*1.0"), ecUNASSIGNABLE_TOKEN);
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestExpression()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing expression samples...");
-
-      value_type b = 2;
-
-      // Optimization
-      iStat += EqnTest( _T("2*b*5"), 20, true);
-      iStat += EqnTest( _T("2*b*5 + 4*b"), 28, true);
-      iStat += EqnTest( _T("2*a/3"), 2.0/3.0, true);
-
-      // Addition auf cmVARMUL 
-      iStat += EqnTest( _T("3+b"), b+3, true);
-      iStat += EqnTest( _T("b+3"), b+3, true);
-      iStat += EqnTest( _T("b*3+2"), b*3+2, true);
-      iStat += EqnTest( _T("3*b+2"), b*3+2, true);
-      iStat += EqnTest( _T("2+b*3"), b*3+2, true);
-      iStat += EqnTest( _T("2+3*b"), b*3+2, true);
-      iStat += EqnTest( _T("b+3*b"), b+3*b, true);
-      iStat += EqnTest( _T("3*b+b"), b+3*b, true);
-
-      iStat += EqnTest( _T("2+b*3+b"), 2+b*3+b, true);
-      iStat += EqnTest( _T("b+2+b*3"), b+2+b*3, true);
-
-      iStat += EqnTest( _T("(2*b+1)*4"), (2*b+1)*4, true);
-      iStat += EqnTest( _T("4*(2*b+1)"), (2*b+1)*4, true);
-
-      // operator precedences
-      iStat += EqnTest( _T("1+2-3*4/5^6"), 2.99923, true);
-      iStat += EqnTest( _T("1^2/3*4-5+6"), 2.33333333, true);
-      iStat += EqnTest( _T("1+2*3"), 7, true);
-      iStat += EqnTest( _T("1+2*3"), 7, true);
-      iStat += EqnTest( _T("(1+2)*3"), 9, true);
-      iStat += EqnTest( _T("(1+2)*(-3)"), -9, true);
-      iStat += EqnTest( _T("2/4"), 0.5, true);
-
-      iStat += EqnTest( _T("exp(ln(7))"), 7, true);
-      iStat += EqnTest( _T("e^ln(7)"), 7, true);
-      iStat += EqnTest( _T("e^(ln(7))"), 7, true);
-      iStat += EqnTest( _T("(e^(ln(7)))"), 7, true);
-      iStat += EqnTest( _T("1-(e^(ln(7)))"), -6, true);
-      iStat += EqnTest( _T("2*(e^(ln(7)))"), 14, true);
-      iStat += EqnTest( _T("10^log(5)"), pow(10.0, log(5.0)), true);
-      iStat += EqnTest( _T("10^log10(5)"), 5, true);
-      iStat += EqnTest( _T("2^log2(4)"), 4, true);
-      iStat += EqnTest( _T("-(sin(0)+1)"), -1, true);
-      iStat += EqnTest( _T("-(2^1.1)"), -2.14354692, true);
-
-      iStat += EqnTest( _T("(cos(2.41)/b)"), -0.372056, true);
-      iStat += EqnTest( _T("(1*(2*(3*(4*(5*(6*(a+b)))))))"), 2160, true);
-      iStat += EqnTest( _T("(1*(2*(3*(4*(5*(6*(7*(a+b))))))))"), 15120, true);
-      iStat += EqnTest( _T("(a/((((b+(((e*(((((pi*((((3.45*((pi+a)+pi))+b)+b)*a))+0.68)+e)+a)/a))+a)+b))+b)*a)-pi))"), 0.00377999, true);
-
-      // long formula (Reference: Matlab)
-      iStat += EqnTest(
-        _T("(((-9))-e/(((((((pi-(((-7)+(-3)/4/e))))/(((-5))-2)-((pi+(-0))*(sqrt((e+e))*(-8))*(((-pi)+(-pi)-(-9)*(6*5))")
-        _T("/(-e)-e))/2)/((((sqrt(2/(-e)+6)-(4-2))+((5/(-2))/(1*(-pi)+3))/8)*pi*((pi/((-2)/(-6)*1*(-1))*(-6)+(-e)))))/")
-        _T("((e+(-2)+(-e)*((((-3)*9+(-e)))+(-9)))))))-((((e-7+(((5/pi-(3/1+pi)))))/e)/(-5))/(sqrt((((((1+(-7))))+((((-")
-        _T("e)*(-e)))-8))*(-5)/((-e)))*(-6)-((((((-2)-(-9)-(-e)-1)/3))))/(sqrt((8+(e-((-6))+(9*(-9))))*(((3+2-8))*(7+6")
-        _T("+(-5))+((0/(-e)*(-pi))+7)))+(((((-e)/e/e)+((-6)*5)*e+(3+(-5)/pi))))+pi))/sqrt((((9))+((((pi))-8+2))+pi))/e")
-        _T("*4)*((-5)/(((-pi))*(sqrt(e)))))-(((((((-e)*(e)-pi))/4+(pi)*(-9)))))))+(-pi)"), -12.23016549, true);
-
-      // long formula (Reference: Matlab)
-      iStat += EqnTest(
-          _T("(atan(sin((((((((((((((((pi/cos((a/((((0.53-b)-pi)*e)/b))))+2.51)+a)-0.54)/0.98)+b)*b)+e)/a)+b)+a)+b)+pi)/e")
-          _T(")+a)))*2.77)"), -2.16995656, true);
-
-      // long formula (Reference: Matlab)
-      iStat += EqnTest( _T("1+2-3*4/5^6*(2*(1-5+(3*7^9)*(4+6*7-3)))+12"), -7995810.09926, true);
-	  
-      if (iStat==0) 
-        mu::console() << _T("passed") << endl;  
-      else 
+//---------------------------------------------------------------------------
+int ParserTester::TestExpression()
+{
+    int iStat = 0;
+    mu::console() << _T("testing expression samples...");
+
+    value_type b = 2;
+
+    // Optimization
+    iStat += EqnTest(_T("2*b*5"), 20, true);
+    iStat += EqnTest(_T("2*b*5 + 4*b"), 28, true);
+    iStat += EqnTest(_T("2*a/3"), 2.0 / 3.0, true);
+
+    // Addition auf cmVARMUL
+    iStat += EqnTest(_T("3+b"), b + 3, true);
+    iStat += EqnTest(_T("b+3"), b + 3, true);
+    iStat += EqnTest(_T("b*3+2"), b * 3 + 2, true);
+    iStat += EqnTest(_T("3*b+2"), b * 3 + 2, true);
+    iStat += EqnTest(_T("2+b*3"), b * 3 + 2, true);
+    iStat += EqnTest(_T("2+3*b"), b * 3 + 2, true);
+    iStat += EqnTest(_T("b+3*b"), b + 3 * b, true);
+    iStat += EqnTest(_T("3*b+b"), b + 3 * b, true);
+
+    iStat += EqnTest(_T("2+b*3+b"), 2 + b * 3 + b, true);
+    iStat += EqnTest(_T("b+2+b*3"), b + 2 + b * 3, true);
+
+    iStat += EqnTest(_T("(2*b+1)*4"), (2 * b + 1) * 4, true);
+    iStat += EqnTest(_T("4*(2*b+1)"), (2 * b + 1) * 4, true);
+
+    // operator precedences
+    iStat += EqnTest(_T("1+2-3*4/5^6"), 2.99923, true);
+    iStat += EqnTest(_T("1^2/3*4-5+6"), 2.33333333, true);
+    iStat += EqnTest(_T("1+2*3"), 7, true);
+    iStat += EqnTest(_T("1+2*3"), 7, true);
+    iStat += EqnTest(_T("(1+2)*3"), 9, true);
+    iStat += EqnTest(_T("(1+2)*(-3)"), -9, true);
+    iStat += EqnTest(_T("2/4"), 0.5, true);
+
+    iStat += EqnTest(_T("exp(ln(7))"), 7, true);
+    iStat += EqnTest(_T("e^ln(7)"), 7, true);
+    iStat += EqnTest(_T("e^(ln(7))"), 7, true);
+    iStat += EqnTest(_T("(e^(ln(7)))"), 7, true);
+    iStat += EqnTest(_T("1-(e^(ln(7)))"), -6, true);
+    iStat += EqnTest(_T("2*(e^(ln(7)))"), 14, true);
+    iStat += EqnTest(_T("10^log(5)"), pow(10.0, log(5.0)), true);
+    iStat += EqnTest(_T("10^log10(5)"), 5, true);
+    iStat += EqnTest(_T("2^log2(4)"), 4, true);
+    iStat += EqnTest(_T("-(sin(0)+1)"), -1, true);
+    iStat += EqnTest(_T("-(2^1.1)"), -2.14354692, true);
+
+    iStat += EqnTest(_T("(cos(2.41)/b)"), -0.372056, true);
+    iStat += EqnTest(_T("(1*(2*(3*(4*(5*(6*(a+b)))))))"), 2160, true);
+    iStat += EqnTest(_T("(1*(2*(3*(4*(5*(6*(7*(a+b))))))))"), 15120, true);
+    iStat += EqnTest(_T("(a/((((b+(((e*(((((pi*((((3.45*((pi+a)+pi))+b)+b)*a))+0.68)+e)+a)/a))+a)+b))+b)*a)-pi))"),
+                     0.00377999, true);
+
+    // long formula (Reference: Matlab)
+    iStat += EqnTest(
+      _T("(((-9))-e/(((((((pi-(((-7)+(-3)/4/e))))/(((-5))-2)-((pi+(-0))*(sqrt((e+e))*(-8))*(((-pi)+(-pi)-(-9)*(6*5))")
+      _T("/(-e)-e))/2)/((((sqrt(2/(-e)+6)-(4-2))+((5/(-2))/(1*(-pi)+3))/8)*pi*((pi/((-2)/(-6)*1*(-1))*(-6)+(-e)))))/")
+      _T("((e+(-2)+(-e)*((((-3)*9+(-e)))+(-9)))))))-((((e-7+(((5/pi-(3/1+pi)))))/e)/(-5))/(sqrt((((((1+(-7))))+((((-")
+      _T("e)*(-e)))-8))*(-5)/((-e)))*(-6)-((((((-2)-(-9)-(-e)-1)/3))))/(sqrt((8+(e-((-6))+(9*(-9))))*(((3+2-8))*(7+6")
+      _T("+(-5))+((0/(-e)*(-pi))+7)))+(((((-e)/e/e)+((-6)*5)*e+(3+(-5)/pi))))+pi))/sqrt((((9))+((((pi))-8+2))+pi))/e")
+      _T("*4)*((-5)/(((-pi))*(sqrt(e)))))-(((((((-e)*(e)-pi))/4+(pi)*(-9)))))))+(-pi)"),
+      -12.23016549, true);
+
+    // long formula (Reference: Matlab)
+    iStat += EqnTest(
+      _T("(atan(sin((((((((((((((((pi/cos((a/((((0.53-b)-pi)*e)/b))))+2.51)+a)-0.54)/0.98)+b)*b)+e)/a)+b)+a)+b)+pi)/e")
+      _T(")+a)))*2.77)"),
+      -2.16995656, true);
+
+    // long formula (Reference: Matlab)
+    iStat += EqnTest(_T("1+2-3*4/5^6*(2*(1-5+(3*7^9)*(4+6*7-3)))+12"), -7995810.09926, true);
+
+    if (iStat == 0)
+        mu::console() << _T("passed") << endl;
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
-
-
+    return iStat;
+}
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestIfThenElse()
-    {
-      int iStat = 0;
-      mu::console() << _T("testing if-then-else operator...");
-
-      // Test error detection
-      iStat += ThrowTest(_T(":3"), ecUNEXPECTED_CONDITIONAL); 
-      iStat += ThrowTest(_T("? 1 : 2"), ecUNEXPECTED_CONDITIONAL); 
-      iStat += ThrowTest(_T("(a<b) ? (b<c) ? 1 : 2"), ecMISSING_ELSE_CLAUSE); 
-      iStat += ThrowTest(_T("(a<b) ? 1"), ecMISSING_ELSE_CLAUSE); 
-      iStat += ThrowTest(_T("(a<b) ? a"), ecMISSING_ELSE_CLAUSE); 
-      iStat += ThrowTest(_T("(a<b) ? a+b"), ecMISSING_ELSE_CLAUSE); 
-      iStat += ThrowTest(_T("a : b"), ecMISPLACED_COLON); 
-      iStat += ThrowTest(_T("1 : 2"), ecMISPLACED_COLON); 
-      iStat += ThrowTest(_T("(1) ? 1 : 2 : 3"), ecMISPLACED_COLON); 
-      iStat += ThrowTest(_T("(true) ? 1 : 2 : 3"), ecUNASSIGNABLE_TOKEN); 
-
-      iStat += EqnTest(_T("1 ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("1<2 ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("a<b ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("(a<b) ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("(1) ? 10 : 11"), 10, true);
-      iStat += EqnTest(_T("(0) ? 10 : 11"), 11, true);
-      iStat += EqnTest(_T("(1) ? a+b : c+d"), 3, true);
-      iStat += EqnTest(_T("(0) ? a+b : c+d"), 1, true);
-      iStat += EqnTest(_T("(1) ? 0 : 1"), 0, true);
-      iStat += EqnTest(_T("(0) ? 0 : 1"), 1, true);
-      iStat += EqnTest(_T("(a<b) ? 10 : 11"), 10, true);
-      iStat += EqnTest(_T("(a>b) ? 10 : 11"), 11, true);
-      iStat += EqnTest(_T("(a<b) ? c : d"), 3, true);
-      iStat += EqnTest(_T("(a>b) ? c : d"), -2, true);
-
-      iStat += EqnTest(_T("(a>b) ? 1 : 0"), 0, true);
-      iStat += EqnTest(_T("((a>b) ? 1 : 0) ? 1 : 2"), 2, true);
-      iStat += EqnTest(_T("((a>b) ? 1 : 0) ? 1 : sum((a>b) ? 1 : 2)"), 2, true);
-      iStat += EqnTest(_T("((a>b) ? 0 : 1) ? 1 : sum((a>b) ? 1 : 2)"), 1, true);
-
-      iStat += EqnTest(_T("sum((a>b) ? 1 : 2)"), 2, true);
-      iStat += EqnTest(_T("sum((1) ? 1 : 2)"), 1, true);
-      iStat += EqnTest(_T("sum((a>b) ? 1 : 2, 100)"), 102, true);
-      iStat += EqnTest(_T("sum((1) ? 1 : 2, 100)"), 101, true);
-      iStat += EqnTest(_T("sum(3, (a>b) ? 3 : 10)"), 13, true);
-      iStat += EqnTest(_T("sum(3, (a<b) ? 3 : 10)"), 6, true);
-      iStat += EqnTest(_T("10*sum(3, (a>b) ? 3 : 10)"), 130, true);
-      iStat += EqnTest(_T("10*sum(3, (a<b) ? 3 : 10)"), 60, true);
-      iStat += EqnTest(_T("sum(3, (a>b) ? 3 : 10)*10"), 130, true);
-      iStat += EqnTest(_T("sum(3, (a<b) ? 3 : 10)*10"), 60, true);
-      iStat += EqnTest(_T("(a<b) ? sum(3, (a<b) ? 3 : 10)*10 : 99"), 60, true);
-      iStat += EqnTest(_T("(a>b) ? sum(3, (a<b) ? 3 : 10)*10 : 99"), 99, true);
-      iStat += EqnTest(_T("(a<b) ? sum(3, (a<b) ? 3 : 10,10,20)*10 : 99"), 360, true);
-      iStat += EqnTest(_T("(a>b) ? sum(3, (a<b) ? 3 : 10,10,20)*10 : 99"), 99, true);
-      iStat += EqnTest(_T("(a>b) ? sum(3, (a<b) ? 3 : 10,10,20)*10 : sum(3, (a<b) ? 3 : 10)*10"), 60, true);
-
-      // todo: auch für muParserX hinzufügen!
-      iStat += EqnTest(_T("(a<b)&&(a<b) ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("(a>b)&&(a<b) ? 128 : 255"), 255, true);
-      iStat += EqnTest(_T("(1<2)&&(1<2) ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("(1>2)&&(1<2) ? 128 : 255"), 255, true);
-      iStat += EqnTest(_T("((1<2)&&(1<2)) ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("((1>2)&&(1<2)) ? 128 : 255"), 255, true);
-      iStat += EqnTest(_T("((a<b)&&(a<b)) ? 128 : 255"), 128, true);
-      iStat += EqnTest(_T("((a>b)&&(a<b)) ? 128 : 255"), 255, true);
-
-      iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 : 1>0 ? 32 : 64"), 255, true);
-      iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 :(1>0 ? 32 : 64)"), 255, true);
-      iStat += EqnTest(_T("1>0 ? 1>0 ? 128 : 255 : 1>2 ? 32 : 64"), 128, true);
-      iStat += EqnTest(_T("1>0 ? 1>0 ? 128 : 255 :(1>2 ? 32 : 64)"), 128, true);
-      iStat += EqnTest(_T("1>2 ? 1>2 ? 128 : 255 : 1>0 ? 32 : 64"), 32, true);
-      iStat += EqnTest(_T("1>2 ? 1>0 ? 128 : 255 : 1>2 ? 32 : 64"), 64, true);
-      iStat += EqnTest(_T("1>0 ? 50 :  1>0 ? 128 : 255"), 50, true);
-      iStat += EqnTest(_T("1>0 ? 50 : (1>0 ? 128 : 255)"), 50, true);
-      iStat += EqnTest(_T("1>0 ? 1>0 ? 128 : 255 : 50"), 128, true);
-      iStat += EqnTest(_T("1>2 ? 1>2 ? 128 : 255 : 1>0 ? 32 : 1>2 ? 64 : 16"), 32, true);
-      iStat += EqnTest(_T("1>2 ? 1>2 ? 128 : 255 : 1>0 ? 32 :(1>2 ? 64 : 16)"), 32, true);
-      iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 :  1>0 ? 32 :1>2 ? 64 : 16"), 255, true);
-      iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 : (1>0 ? 32 :1>2 ? 64 : 16)"), 255, true);
-      iStat += EqnTest(_T("1 ? 0 ? 128 : 255 : 1 ? 32 : 64"), 255, true);
-
-      // assignment operators
-      iStat += EqnTest(_T("a= 0 ? 128 : 255, a"), 255, true);
-      iStat += EqnTest(_T("a=((a>b)&&(a<b)) ? 128 : 255, a"), 255, true);
-      iStat += EqnTest(_T("c=(a<b)&&(a<b) ? 128 : 255, c"), 128, true);
-      iStat += EqnTest(_T("0 ? a=a+1 : 666, a"), 1, true);
-      iStat += EqnTest(_T("1?a=10:a=20, a"), 10, true);
-      iStat += EqnTest(_T("0?a=10:a=20, a"), 20, true);
-      iStat += EqnTest(_T("0?a=sum(3,4):10, a"), 1, true);  // a should not change its value due to lazy calculation
-      
-      iStat += EqnTest(_T("a=1?b=1?3:4:5, a"), 3, true);
-      iStat += EqnTest(_T("a=1?b=1?3:4:5, b"), 3, true);
-      iStat += EqnTest(_T("a=0?b=1?3:4:5, a"), 5, true);
-      iStat += EqnTest(_T("a=0?b=1?3:4:5, b"), 2, true);
-
-      iStat += EqnTest(_T("a=1?5:b=1?3:4, a"), 5, true);
-      iStat += EqnTest(_T("a=1?5:b=1?3:4, b"), 2, true);
-      iStat += EqnTest(_T("a=0?5:b=1?3:4, a"), 3, true);
-      iStat += EqnTest(_T("a=0?5:b=1?3:4, b"), 3, true);
-
-      if (iStat==0) 
-        mu::console() << _T("passed") << endl;  
-      else 
+//---------------------------------------------------------------------------
+int ParserTester::TestIfThenElse()
+{
+    int iStat = 0;
+    mu::console() << _T("testing if-then-else operator...");
+
+    // Test error detection
+    iStat += ThrowTest(_T(":3"), ecUNEXPECTED_CONDITIONAL);
+    iStat += ThrowTest(_T("? 1 : 2"), ecUNEXPECTED_CONDITIONAL);
+    iStat += ThrowTest(_T("(a<b) ? (b<c) ? 1 : 2"), ecMISSING_ELSE_CLAUSE);
+    iStat += ThrowTest(_T("(a<b) ? 1"), ecMISSING_ELSE_CLAUSE);
+    iStat += ThrowTest(_T("(a<b) ? a"), ecMISSING_ELSE_CLAUSE);
+    iStat += ThrowTest(_T("(a<b) ? a+b"), ecMISSING_ELSE_CLAUSE);
+    iStat += ThrowTest(_T("a : b"), ecMISPLACED_COLON);
+    iStat += ThrowTest(_T("1 : 2"), ecMISPLACED_COLON);
+    iStat += ThrowTest(_T("(1) ? 1 : 2 : 3"), ecMISPLACED_COLON);
+    iStat += ThrowTest(_T("(true) ? 1 : 2 : 3"), ecUNASSIGNABLE_TOKEN);
+
+    iStat += EqnTest(_T("1 ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("1<2 ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("a<b ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("(a<b) ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("(1) ? 10 : 11"), 10, true);
+    iStat += EqnTest(_T("(0) ? 10 : 11"), 11, true);
+    iStat += EqnTest(_T("(1) ? a+b : c+d"), 3, true);
+    iStat += EqnTest(_T("(0) ? a+b : c+d"), 1, true);
+    iStat += EqnTest(_T("(1) ? 0 : 1"), 0, true);
+    iStat += EqnTest(_T("(0) ? 0 : 1"), 1, true);
+    iStat += EqnTest(_T("(a<b) ? 10 : 11"), 10, true);
+    iStat += EqnTest(_T("(a>b) ? 10 : 11"), 11, true);
+    iStat += EqnTest(_T("(a<b) ? c : d"), 3, true);
+    iStat += EqnTest(_T("(a>b) ? c : d"), -2, true);
+
+    iStat += EqnTest(_T("(a>b) ? 1 : 0"), 0, true);
+    iStat += EqnTest(_T("((a>b) ? 1 : 0) ? 1 : 2"), 2, true);
+    iStat += EqnTest(_T("((a>b) ? 1 : 0) ? 1 : sum((a>b) ? 1 : 2)"), 2, true);
+    iStat += EqnTest(_T("((a>b) ? 0 : 1) ? 1 : sum((a>b) ? 1 : 2)"), 1, true);
+
+    iStat += EqnTest(_T("sum((a>b) ? 1 : 2)"), 2, true);
+    iStat += EqnTest(_T("sum((1) ? 1 : 2)"), 1, true);
+    iStat += EqnTest(_T("sum((a>b) ? 1 : 2, 100)"), 102, true);
+    iStat += EqnTest(_T("sum((1) ? 1 : 2, 100)"), 101, true);
+    iStat += EqnTest(_T("sum(3, (a>b) ? 3 : 10)"), 13, true);
+    iStat += EqnTest(_T("sum(3, (a<b) ? 3 : 10)"), 6, true);
+    iStat += EqnTest(_T("10*sum(3, (a>b) ? 3 : 10)"), 130, true);
+    iStat += EqnTest(_T("10*sum(3, (a<b) ? 3 : 10)"), 60, true);
+    iStat += EqnTest(_T("sum(3, (a>b) ? 3 : 10)*10"), 130, true);
+    iStat += EqnTest(_T("sum(3, (a<b) ? 3 : 10)*10"), 60, true);
+    iStat += EqnTest(_T("(a<b) ? sum(3, (a<b) ? 3 : 10)*10 : 99"), 60, true);
+    iStat += EqnTest(_T("(a>b) ? sum(3, (a<b) ? 3 : 10)*10 : 99"), 99, true);
+    iStat += EqnTest(_T("(a<b) ? sum(3, (a<b) ? 3 : 10,10,20)*10 : 99"), 360, true);
+    iStat += EqnTest(_T("(a>b) ? sum(3, (a<b) ? 3 : 10,10,20)*10 : 99"), 99, true);
+    iStat += EqnTest(_T("(a>b) ? sum(3, (a<b) ? 3 : 10,10,20)*10 : sum(3, (a<b) ? 3 : 10)*10"), 60, true);
+
+    // todo: auch für muParserX hinzufügen!
+    iStat += EqnTest(_T("(a<b)&&(a<b) ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("(a>b)&&(a<b) ? 128 : 255"), 255, true);
+    iStat += EqnTest(_T("(1<2)&&(1<2) ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("(1>2)&&(1<2) ? 128 : 255"), 255, true);
+    iStat += EqnTest(_T("((1<2)&&(1<2)) ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("((1>2)&&(1<2)) ? 128 : 255"), 255, true);
+    iStat += EqnTest(_T("((a<b)&&(a<b)) ? 128 : 255"), 128, true);
+    iStat += EqnTest(_T("((a>b)&&(a<b)) ? 128 : 255"), 255, true);
+
+    iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 : 1>0 ? 32 : 64"), 255, true);
+    iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 :(1>0 ? 32 : 64)"), 255, true);
+    iStat += EqnTest(_T("1>0 ? 1>0 ? 128 : 255 : 1>2 ? 32 : 64"), 128, true);
+    iStat += EqnTest(_T("1>0 ? 1>0 ? 128 : 255 :(1>2 ? 32 : 64)"), 128, true);
+    iStat += EqnTest(_T("1>2 ? 1>2 ? 128 : 255 : 1>0 ? 32 : 64"), 32, true);
+    iStat += EqnTest(_T("1>2 ? 1>0 ? 128 : 255 : 1>2 ? 32 : 64"), 64, true);
+    iStat += EqnTest(_T("1>0 ? 50 :  1>0 ? 128 : 255"), 50, true);
+    iStat += EqnTest(_T("1>0 ? 50 : (1>0 ? 128 : 255)"), 50, true);
+    iStat += EqnTest(_T("1>0 ? 1>0 ? 128 : 255 : 50"), 128, true);
+    iStat += EqnTest(_T("1>2 ? 1>2 ? 128 : 255 : 1>0 ? 32 : 1>2 ? 64 : 16"), 32, true);
+    iStat += EqnTest(_T("1>2 ? 1>2 ? 128 : 255 : 1>0 ? 32 :(1>2 ? 64 : 16)"), 32, true);
+    iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 :  1>0 ? 32 :1>2 ? 64 : 16"), 255, true);
+    iStat += EqnTest(_T("1>0 ? 1>2 ? 128 : 255 : (1>0 ? 32 :1>2 ? 64 : 16)"), 255, true);
+    iStat += EqnTest(_T("1 ? 0 ? 128 : 255 : 1 ? 32 : 64"), 255, true);
+
+    // assignment operators
+    iStat += EqnTest(_T("a= 0 ? 128 : 255, a"), 255, true);
+    iStat += EqnTest(_T("a=((a>b)&&(a<b)) ? 128 : 255, a"), 255, true);
+    iStat += EqnTest(_T("c=(a<b)&&(a<b) ? 128 : 255, c"), 128, true);
+    iStat += EqnTest(_T("0 ? a=a+1 : 666, a"), 1, true);
+    iStat += EqnTest(_T("1?a=10:a=20, a"), 10, true);
+    iStat += EqnTest(_T("0?a=10:a=20, a"), 20, true);
+    iStat += EqnTest(_T("0?a=sum(3,4):10, a"), 1, true); // a should not change its value due to lazy calculation
+
+    iStat += EqnTest(_T("a=1?b=1?3:4:5, a"), 3, true);
+    iStat += EqnTest(_T("a=1?b=1?3:4:5, b"), 3, true);
+    iStat += EqnTest(_T("a=0?b=1?3:4:5, a"), 5, true);
+    iStat += EqnTest(_T("a=0?b=1?3:4:5, b"), 2, true);
+
+    iStat += EqnTest(_T("a=1?5:b=1?3:4, a"), 5, true);
+    iStat += EqnTest(_T("a=1?5:b=1?3:4, b"), 2, true);
+    iStat += EqnTest(_T("a=0?5:b=1?3:4, a"), 3, true);
+    iStat += EqnTest(_T("a=0?5:b=1?3:4, b"), 3, true);
+
+    if (iStat == 0)
+        mu::console() << _T("passed") << endl;
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
+
+//---------------------------------------------------------------------------
+int ParserTester::TestException()
+{
+    int iStat = 0;
+    mu::console() << _T("testing error codes...");
+
+    iStat += ThrowTest(_T("3+"), ecUNEXPECTED_EOF);
+    iStat += ThrowTest(_T("3+)"), ecUNEXPECTED_PARENS);
+    iStat += ThrowTest(_T("()"), ecUNEXPECTED_PARENS);
+    iStat += ThrowTest(_T("3+()"), ecUNEXPECTED_PARENS);
+    iStat += ThrowTest(_T("sin(3,4)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("sin()"), ecTOO_FEW_PARAMS);
+    iStat += ThrowTest(_T("(1+2"), ecMISSING_PARENS);
+    iStat += ThrowTest(_T("sin(3)3"), ecUNEXPECTED_VAL);
+    iStat += ThrowTest(_T("sin(3)xyz"), ecUNASSIGNABLE_TOKEN);
+    iStat += ThrowTest(_T("sin(3)cos(3)"), ecUNEXPECTED_FUN);
+    iStat += ThrowTest(_T("a+b+c=10"), ecUNEXPECTED_OPERATOR);
+    iStat += ThrowTest(_T("a=b=3"), ecUNEXPECTED_OPERATOR);
 
-    //---------------------------------------------------------------------------
-    int ParserTester::TestException()
-    {
-      int  iStat = 0;
-      mu::console() << _T("testing error codes...");
-
-      iStat += ThrowTest(_T("3+"),           ecUNEXPECTED_EOF);
-      iStat += ThrowTest(_T("3+)"),          ecUNEXPECTED_PARENS);
-      iStat += ThrowTest(_T("()"),           ecUNEXPECTED_PARENS);
-      iStat += ThrowTest(_T("3+()"),         ecUNEXPECTED_PARENS);
-      iStat += ThrowTest(_T("sin(3,4)"),     ecTOO_MANY_PARAMS);
-      iStat += ThrowTest(_T("sin()"),        ecTOO_FEW_PARAMS);
-      iStat += ThrowTest(_T("(1+2"),         ecMISSING_PARENS);
-      iStat += ThrowTest(_T("sin(3)3"),      ecUNEXPECTED_VAL);
-      iStat += ThrowTest(_T("sin(3)xyz"),    ecUNASSIGNABLE_TOKEN);
-      iStat += ThrowTest(_T("sin(3)cos(3)"), ecUNEXPECTED_FUN);
-      iStat += ThrowTest(_T("a+b+c=10"),     ecUNEXPECTED_OPERATOR);
-      iStat += ThrowTest(_T("a=b=3"),        ecUNEXPECTED_OPERATOR);
-      
 #if defined(MUP_MATH_EXCEPTIONS)
-      // divide by zero whilst constant folding
-      iStat += ThrowTest(_T("1/0"),          ecDIV_BY_ZERO);
-      // square root of a negative number
-      iStat += ThrowTest(_T("sqrt(-1)"),     ecDOMAIN_ERROR);
-      // logarithms of zero
-      iStat += ThrowTest(_T("ln(0)"),        ecDOMAIN_ERROR);
-      iStat += ThrowTest(_T("log2(0)"),      ecDOMAIN_ERROR);
-      iStat += ThrowTest(_T("log10(0)"),     ecDOMAIN_ERROR);
-      iStat += ThrowTest(_T("log(0)"),       ecDOMAIN_ERROR);
-      // logarithms of negative values
-      iStat += ThrowTest(_T("ln(-1)"),       ecDOMAIN_ERROR);
-      iStat += ThrowTest(_T("log2(-1)"),     ecDOMAIN_ERROR);
-      iStat += ThrowTest(_T("log10(-1)"),    ecDOMAIN_ERROR);
-      iStat += ThrowTest(_T("log(-1)"),      ecDOMAIN_ERROR);
+    // divide by zero whilst constant folding
+    iStat += ThrowTest(_T("1/0"), ecDIV_BY_ZERO);
+    // square root of a negative number
+    iStat += ThrowTest(_T("sqrt(-1)"), ecDOMAIN_ERROR);
+    // logarithms of zero
+    iStat += ThrowTest(_T("ln(0)"), ecDOMAIN_ERROR);
+    iStat += ThrowTest(_T("log2(0)"), ecDOMAIN_ERROR);
+    iStat += ThrowTest(_T("log10(0)"), ecDOMAIN_ERROR);
+    iStat += ThrowTest(_T("log(0)"), ecDOMAIN_ERROR);
+    // logarithms of negative values
+    iStat += ThrowTest(_T("ln(-1)"), ecDOMAIN_ERROR);
+    iStat += ThrowTest(_T("log2(-1)"), ecDOMAIN_ERROR);
+    iStat += ThrowTest(_T("log10(-1)"), ecDOMAIN_ERROR);
+    iStat += ThrowTest(_T("log(-1)"), ecDOMAIN_ERROR);
 #endif
 
-      // functions without parameter
-      iStat += ThrowTest( _T("3+ping(2)"),    ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("3+ping(a+2)"),  ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("3+ping(sin(a)+2)"),  ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("3+ping(1+sin(a))"),  ecTOO_MANY_PARAMS);
-
-      // String function related
-      iStat += ThrowTest( _T("valueof(\"xxx\")"),  999, false);
-      iStat += ThrowTest( _T("valueof()"),          ecUNEXPECTED_PARENS);
-      iStat += ThrowTest( _T("1+valueof(\"abc\""),  ecMISSING_PARENS);
-      iStat += ThrowTest( _T("valueof(\"abc\""),    ecMISSING_PARENS);
-      iStat += ThrowTest( _T("valueof(\"abc"),      ecUNTERMINATED_STRING);
-      iStat += ThrowTest( _T("valueof(\"abc\",3)"), ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("valueof(3)"),         ecSTRING_EXPECTED);
-      iStat += ThrowTest( _T("sin(\"abc\")"),       ecVAL_EXPECTED);
-      iStat += ThrowTest( _T("valueof(\"\\\"abc\\\"\")"),  999, false);
-      iStat += ThrowTest( _T("\"hello world\""),    ecSTR_RESULT);
-      iStat += ThrowTest( _T("(\"hello world\")"),  ecSTR_RESULT);
-      iStat += ThrowTest( _T("\"abcd\"+100"),       ecOPRT_TYPE_CONFLICT);
-      iStat += ThrowTest( _T("\"a\"+\"b\""),        ecOPRT_TYPE_CONFLICT);
-      iStat += ThrowTest( _T("strfun1(\"100\",3)"),     ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("strfun2(\"100\",3,5)"),   ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("strfun3(\"100\",3,5,6)"), ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("strfun2(\"100\")"),       ecTOO_FEW_PARAMS);
-      iStat += ThrowTest( _T("strfun3(\"100\",6)"),   ecTOO_FEW_PARAMS);
-      iStat += ThrowTest( _T("strfun2(1,1)"),         ecSTRING_EXPECTED);
-      iStat += ThrowTest( _T("strfun2(a,1)"),         ecSTRING_EXPECTED);
-      iStat += ThrowTest( _T("strfun2(1,1,1)"),       ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("strfun2(a,1,1)"),       ecTOO_MANY_PARAMS);
-      iStat += ThrowTest( _T("strfun3(1,2,3)"),         ecSTRING_EXPECTED);
-      iStat += ThrowTest( _T("strfun3(1, \"100\",3)"),  ecSTRING_EXPECTED);
-      iStat += ThrowTest( _T("strfun3(\"1\", \"100\",3)"),  ecVAL_EXPECTED);
-      iStat += ThrowTest( _T("strfun3(\"1\", 3, \"100\")"),  ecVAL_EXPECTED);
-      iStat += ThrowTest( _T("strfun3(\"1\", \"100\", \"100\", \"100\")"),  ecTOO_MANY_PARAMS);
-
-      // assignment operator
-      iStat += ThrowTest( _T("3=4"), ecUNEXPECTED_OPERATOR);
-      iStat += ThrowTest( _T("sin(8)=4"), ecUNEXPECTED_OPERATOR);
-      iStat += ThrowTest( _T("\"test\"=a"), ecUNEXPECTED_OPERATOR);
-
-      // <ibg 20090529>
-      // this is now legal, for reference see:
-      // https://sourceforge.net/forum/message.php?msg_id=7411373
-      //      iStat += ThrowTest( _T("sin=9"), ecUNEXPECTED_OPERATOR);    
-      // </ibg>
-
-      iStat += ThrowTest( _T("(8)=5"), ecUNEXPECTED_OPERATOR);
-      iStat += ThrowTest( _T("(a)=5"), ecUNEXPECTED_OPERATOR);
-      iStat += ThrowTest( _T("a=\"tttt\""), ecOPRT_TYPE_CONFLICT);
-
-      if (iStat==0) 
+    // functions without parameter
+    iStat += ThrowTest(_T("3+ping(2)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("3+ping(a+2)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("3+ping(sin(a)+2)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("3+ping(1+sin(a))"), ecTOO_MANY_PARAMS);
+
+    // String function related
+    iStat += ThrowTest(_T("valueof(\"xxx\")"), 999, false);
+    iStat += ThrowTest(_T("valueof()"), ecUNEXPECTED_PARENS);
+    iStat += ThrowTest(_T("1+valueof(\"abc\""), ecMISSING_PARENS);
+    iStat += ThrowTest(_T("valueof(\"abc\""), ecMISSING_PARENS);
+    iStat += ThrowTest(_T("valueof(\"abc"), ecUNTERMINATED_STRING);
+    iStat += ThrowTest(_T("valueof(\"abc\",3)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("valueof(3)"), ecSTRING_EXPECTED);
+    iStat += ThrowTest(_T("sin(\"abc\")"), ecVAL_EXPECTED);
+    iStat += ThrowTest(_T("valueof(\"\\\"abc\\\"\")"), 999, false);
+    iStat += ThrowTest(_T("\"hello world\""), ecSTR_RESULT);
+    iStat += ThrowTest(_T("(\"hello world\")"), ecSTR_RESULT);
+    iStat += ThrowTest(_T("\"abcd\"+100"), ecOPRT_TYPE_CONFLICT);
+    iStat += ThrowTest(_T("\"a\"+\"b\""), ecOPRT_TYPE_CONFLICT);
+    iStat += ThrowTest(_T("strfun1(\"100\",3)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("strfun2(\"100\",3,5)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("strfun3(\"100\",3,5,6)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("strfun2(\"100\")"), ecTOO_FEW_PARAMS);
+    iStat += ThrowTest(_T("strfun3(\"100\",6)"), ecTOO_FEW_PARAMS);
+    iStat += ThrowTest(_T("strfun2(1,1)"), ecSTRING_EXPECTED);
+    iStat += ThrowTest(_T("strfun2(a,1)"), ecSTRING_EXPECTED);
+    iStat += ThrowTest(_T("strfun2(1,1,1)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("strfun2(a,1,1)"), ecTOO_MANY_PARAMS);
+    iStat += ThrowTest(_T("strfun3(1,2,3)"), ecSTRING_EXPECTED);
+    iStat += ThrowTest(_T("strfun3(1, \"100\",3)"), ecSTRING_EXPECTED);
+    iStat += ThrowTest(_T("strfun3(\"1\", \"100\",3)"), ecVAL_EXPECTED);
+    iStat += ThrowTest(_T("strfun3(\"1\", 3, \"100\")"), ecVAL_EXPECTED);
+    iStat += ThrowTest(_T("strfun3(\"1\", \"100\", \"100\", \"100\")"), ecTOO_MANY_PARAMS);
+
+    // assignment operator
+    iStat += ThrowTest(_T("3=4"), ecUNEXPECTED_OPERATOR);
+    iStat += ThrowTest(_T("sin(8)=4"), ecUNEXPECTED_OPERATOR);
+    iStat += ThrowTest(_T("\"test\"=a"), ecUNEXPECTED_OPERATOR);
+
+    // <ibg 20090529>
+    // this is now legal, for reference see:
+    // https://sourceforge.net/forum/message.php?msg_id=7411373
+    //      iStat += ThrowTest( _T("sin=9"), ecUNEXPECTED_OPERATOR);
+    // </ibg>
+
+    iStat += ThrowTest(_T("(8)=5"), ecUNEXPECTED_OPERATOR);
+    iStat += ThrowTest(_T("(a)=5"), ecUNEXPECTED_OPERATOR);
+    iStat += ThrowTest(_T("a=\"tttt\""), ecOPRT_TYPE_CONFLICT);
+
+    if (iStat == 0)
         mu::console() << _T("passed") << endl;
-      else 
+    else
         mu::console() << _T("\n  failed with ") << iStat << _T(" errors") << endl;
 
-      return iStat;
-    }
+    return iStat;
+}
 
+//---------------------------------------------------------------------------
+void ParserTester::AddTest(testfun_type a_pFun)
+{
+    m_vTestFun.push_back(a_pFun);
+}
 
-    //---------------------------------------------------------------------------
-    void ParserTester::AddTest(testfun_type a_pFun)
+//---------------------------------------------------------------------------
+void ParserTester::Run()
+{
+    int iStat = 0;
+    try
     {
-      m_vTestFun.push_back(a_pFun);
+        for (int i = 0; i < (int)m_vTestFun.size(); ++i)
+            iStat += (this->*m_vTestFun[i])();
     }
-
-    //---------------------------------------------------------------------------
-    void ParserTester::Run()
+    catch (Parser::exception_type& e)
     {
-      int iStat = 0;
-      try
-      {
-        for (int i=0; i<(int)m_vTestFun.size(); ++i)
-          iStat += (this->*m_vTestFun[i])();
-      }
-      catch(Parser::exception_type &e)
-      {
         mu::console() << "\n" << e.GetMsg() << endl;
         mu::console() << e.GetToken() << endl;
         Abort();
-      }
-      catch(std::exception &e)
-      {
+    }
+    catch (std::exception& e)
+    {
         mu::console() << e.what() << endl;
         Abort();
-      }
-      catch(...)
-      {
+    }
+    catch (...)
+    {
         mu::console() << "Internal error";
         Abort();
-      }
-
-      if (iStat==0) 
-      {
-        mu::console() << "Test passed (" <<  ParserTester::c_iCount << " expressions)" << endl;
-      }
-      else 
-      {
-        mu::console() << "Test failed with " << iStat 
-                  << " errors (" <<  ParserTester::c_iCount 
-                  << " expressions)" << endl;
-      }
-      ParserTester::c_iCount = 0;
     }
 
-
-    //---------------------------------------------------------------------------
-    int ParserTester::ThrowTest(const string_type &a_str, int a_iErrc, bool a_bFail)
+    if (iStat == 0)
     {
-      ParserTester::c_iCount++;
+        mu::console() << "Test passed (" << ParserTester::c_iCount << " expressions)" << endl;
+    }
+    else
+    {
+        mu::console() << "Test failed with " << iStat << " errors (" << ParserTester::c_iCount << " expressions)"
+                      << endl;
+    }
+    ParserTester::c_iCount = 0;
+}
+
+//---------------------------------------------------------------------------
+int ParserTester::ThrowTest(const string_type& a_str, int a_iErrc, bool a_bFail)
+{
+    ParserTester::c_iCount++;
 
-      try
-      {
-        value_type fVal[] = {1,1,1};
+    try
+    {
+        value_type fVal[] = {1, 1, 1};
         Parser p;
 
-        p.DefineVar( _T("a"), &fVal[0]);
-        p.DefineVar( _T("b"), &fVal[1]);
-        p.DefineVar( _T("c"), &fVal[2]);
-        p.DefinePostfixOprt( _T("{m}"), Milli);
-        p.DefinePostfixOprt( _T("m"), Milli);
-        p.DefineFun( _T("ping"), Ping);
-        p.DefineFun( _T("valueof"), ValueOf);
-        p.DefineFun( _T("strfun1"), StrFun1);
-        p.DefineFun( _T("strfun2"), StrFun2);
-        p.DefineFun( _T("strfun3"), StrFun3);
+        p.DefineVar(_T("a"), &fVal[0]);
+        p.DefineVar(_T("b"), &fVal[1]);
+        p.DefineVar(_T("c"), &fVal[2]);
+        p.DefinePostfixOprt(_T("{m}"), Milli);
+        p.DefinePostfixOprt(_T("m"), Milli);
+        p.DefineFun(_T("ping"), Ping);
+        p.DefineFun(_T("valueof"), ValueOf);
+        p.DefineFun(_T("strfun1"), StrFun1);
+        p.DefineFun(_T("strfun2"), StrFun2);
+        p.DefineFun(_T("strfun3"), StrFun3);
         p.SetExpr(a_str);
         p.Eval();
-      }
-      catch(ParserError &e)
-      {
+    }
+    catch (ParserError& e)
+    {
         // output the formula in case of an failed test
-        if (a_bFail==false || (a_bFail==true && a_iErrc!=e.GetCode()) )
+        if (a_bFail == false || (a_bFail == true && a_iErrc != e.GetCode()))
         {
-          mu::console() << _T("\n  ") 
-                        << _T("Expression: ") << a_str 
-                        << _T("  Code:") << e.GetCode() << _T("(") << e.GetMsg() << _T(")")
-                        << _T("  Expected:") << a_iErrc;
+            mu::console() << _T("\n  ")
+                          << _T("Expression: ") << a_str << _T("  Code:") << e.GetCode() << _T("(") << e.GetMsg()
+                          << _T(")")
+                          << _T("  Expected:") << a_iErrc;
         }
 
-        return (a_iErrc==e.GetCode()) ? 0 : 1;
-      }
-
-      // if a_bFail==false no exception is expected
-      bool bRet((a_bFail==false) ? 0 : 1);
-      if (bRet==1)
-      {
-        mu::console() << _T("\n  ") 
-                      << _T("Expression: ") << a_str 
-                      << _T("  did evaluate; Expected error:") << a_iErrc;
-      }
+        return (a_iErrc == e.GetCode()) ? 0 : 1;
+    }
 
-      return bRet; 
+    // if a_bFail==false no exception is expected
+    bool bRet((a_bFail == false) ? 0 : 1);
+    if (bRet == 1)
+    {
+        mu::console() << _T("\n  ")
+                      << _T("Expression: ") << a_str << _T("  did evaluate; Expected error:") << a_iErrc;
     }
 
-    //---------------------------------------------------------------------------
-    /** \brief Evaluate a tet expression. 
+    return bRet;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Evaluate a tet expression.
+
+    \return 1 in case of a failure, 0 otherwise.
+*/
+int ParserTester::EqnTestWithVarChange(const string_type& a_str,
+                                       double a_fVar1,
+                                       double a_fRes1,
+                                       double a_fVar2,
+                                       double a_fRes2)
+{
+    ParserTester::c_iCount++;
 
-        \return 1 in case of a failure, 0 otherwise.
-    */
-    int ParserTester::EqnTestWithVarChange(const string_type &a_str, 
-                                           double a_fVar1, 
-                                           double a_fRes1, 
-                                           double a_fVar2, 
-                                           double a_fRes2)
+    try
     {
-      ParserTester::c_iCount++;
+        value_type fVal[2] = {-999, -999}; // should be equal
 
-      try
-      {
-        value_type fVal[2] = {-999, -999 }; // should be equal
-	  
-        Parser  p;
+        Parser p;
         value_type var = 0;
 
         // variable
-        p.DefineVar( _T("a"), &var);
+        p.DefineVar(_T("a"), &var);
         p.SetExpr(a_str);
 
         var = a_fVar1;
@@ -1219,334 +1212,329 @@ namespace mu
 
         var = a_fVar2;
         fVal[1] = p.Eval();
-        
-        if ( fabs(a_fRes1-fVal[0]) > 0.0000000001)
-          throw std::runtime_error("incorrect result (first pass)");
-
-        if ( fabs(a_fRes2-fVal[1]) > 0.0000000001)
-          throw std::runtime_error("incorrect result (second pass)");
-      }
-      catch(Parser::exception_type &e)
-      {
+
+        if (fabs(a_fRes1 - fVal[0]) > 0.0000000001)
+            throw std::runtime_error("incorrect result (first pass)");
+
+        if (fabs(a_fRes2 - fVal[1]) > 0.0000000001)
+            throw std::runtime_error("incorrect result (second pass)");
+    }
+    catch (Parser::exception_type& e)
+    {
         mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (") << e.GetMsg() << _T(")");
         return 1;
-      }
-      catch(std::exception &e)
-      {
+    }
+    catch (std::exception& e)
+    {
         mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (") << e.what() << _T(")");
-        return 1;  // always return a failure since this exception is not expected
-      }
-      catch(...)
-      {
-        mu::console() << _T("\n  fail: ") << a_str.c_str() <<  _T(" (unexpected exception)");
-        return 1;  // exceptions other than ParserException are not allowed
-      }
-
-      return 0;
+        return 1; // always return a failure since this exception is not expected
+    }
+    catch (...)
+    {
+        mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (unexpected exception)");
+        return 1; // exceptions other than ParserException are not allowed
     }
 
-    //---------------------------------------------------------------------------
-    /** \brief Evaluate a tet expression. 
+    return 0;
+}
 
-        \return 1 in case of a failure, 0 otherwise.
-    */
-    int ParserTester::EqnTest(const string_type &a_str, double a_fRes, bool a_fPass)
-    {
-      ParserTester::c_iCount++;
-      int iRet(0);
-      value_type fVal[5] = {-999, -998, -997, -996, -995}; // initially should be different
+//---------------------------------------------------------------------------
+/** \brief Evaluate a tet expression.
 
-      try
-      {
+    \return 1 in case of a failure, 0 otherwise.
+*/
+int ParserTester::EqnTest(const string_type& a_str, double a_fRes, bool a_fPass)
+{
+    ParserTester::c_iCount++;
+    int iRet(0);
+    value_type fVal[5] = {-999, -998, -997, -996, -995}; // initially should be different
+
+    try
+    {
         std::auto_ptr<Parser> p1;
-        Parser  p2, p3;   // three parser objects
-                          // they will be used for testing copy and assignment operators
+        Parser p2, p3; // three parser objects
+                       // they will be used for testing copy and assignment operators
         // p1 is a pointer since i'm going to delete it in order to test if
         // parsers after copy construction still refer to members of it.
         // !! If this is the case this function will crash !!
-      
-        p1.reset(new mu::Parser()); 
+
+        p1.reset(new mu::Parser());
         // Add constants
-        p1->DefineConst( _T("pi"), (value_type)PARSER_CONST_PI);
-        p1->DefineConst( _T("e"), (value_type)PARSER_CONST_E);
-        p1->DefineConst( _T("const"), 1);
-        p1->DefineConst( _T("const1"), 2);
-        p1->DefineConst( _T("const2"), 3);
+        p1->DefineConst(_T("pi"), (value_type)PARSER_CONST_PI);
+        p1->DefineConst(_T("e"), (value_type)PARSER_CONST_E);
+        p1->DefineConst(_T("const"), 1);
+        p1->DefineConst(_T("const1"), 2);
+        p1->DefineConst(_T("const2"), 3);
         // string constants
-        p1->DefineStrConst( _T("str1"), _T("1.11"));
-        p1->DefineStrConst( _T("str2"), _T("2.22"));
+        p1->DefineStrConst(_T("str1"), _T("1.11"));
+        p1->DefineStrConst(_T("str2"), _T("2.22"));
         // variables
-        value_type vVarVal[] = { 1, 2, 3, -2};
-        p1->DefineVar( _T("a"), &vVarVal[0]);
-        p1->DefineVar( _T("aa"), &vVarVal[1]);
-        p1->DefineVar( _T("b"), &vVarVal[1]);
-        p1->DefineVar( _T("c"), &vVarVal[2]);
-        p1->DefineVar( _T("d"), &vVarVal[3]);
-        
+        value_type vVarVal[] = {1, 2, 3, -2};
+        p1->DefineVar(_T("a"), &vVarVal[0]);
+        p1->DefineVar(_T("aa"), &vVarVal[1]);
+        p1->DefineVar(_T("b"), &vVarVal[1]);
+        p1->DefineVar(_T("c"), &vVarVal[2]);
+        p1->DefineVar(_T("d"), &vVarVal[3]);
+
         // custom value ident functions
-        p1->AddValIdent(&ParserTester::IsHexVal);        
+        p1->AddValIdent(&ParserTester::IsHexVal);
 
         // functions
-        p1->DefineFun( _T("ping"), Ping);
-        p1->DefineFun( _T("f1of1"), f1of1);  // one parameter
-        p1->DefineFun( _T("f1of2"), f1of2);  // two parameter
-        p1->DefineFun( _T("f2of2"), f2of2);
-        p1->DefineFun( _T("f1of3"), f1of3);  // three parameter
-        p1->DefineFun( _T("f2of3"), f2of3);
-        p1->DefineFun( _T("f3of3"), f3of3);
-        p1->DefineFun( _T("f1of4"), f1of4);  // four parameter
-        p1->DefineFun( _T("f2of4"), f2of4);
-        p1->DefineFun( _T("f3of4"), f3of4);
-        p1->DefineFun( _T("f4of4"), f4of4);
-        p1->DefineFun( _T("f1of5"), f1of5);  // five parameter
-        p1->DefineFun( _T("f2of5"), f2of5);
-        p1->DefineFun( _T("f3of5"), f3of5);
-        p1->DefineFun( _T("f4of5"), f4of5);
-        p1->DefineFun( _T("f5of5"), f5of5);
+        p1->DefineFun(_T("ping"), Ping);
+        p1->DefineFun(_T("f1of1"), f1of1); // one parameter
+        p1->DefineFun(_T("f1of2"), f1of2); // two parameter
+        p1->DefineFun(_T("f2of2"), f2of2);
+        p1->DefineFun(_T("f1of3"), f1of3); // three parameter
+        p1->DefineFun(_T("f2of3"), f2of3);
+        p1->DefineFun(_T("f3of3"), f3of3);
+        p1->DefineFun(_T("f1of4"), f1of4); // four parameter
+        p1->DefineFun(_T("f2of4"), f2of4);
+        p1->DefineFun(_T("f3of4"), f3of4);
+        p1->DefineFun(_T("f4of4"), f4of4);
+        p1->DefineFun(_T("f1of5"), f1of5); // five parameter
+        p1->DefineFun(_T("f2of5"), f2of5);
+        p1->DefineFun(_T("f3of5"), f3of5);
+        p1->DefineFun(_T("f4of5"), f4of5);
+        p1->DefineFun(_T("f5of5"), f5of5);
 
         // binary operators
-        p1->DefineOprt( _T("add"), add, 0);
-        p1->DefineOprt( _T("++"), add, 0);
-        p1->DefineOprt( _T("&"), land, prLAND);
+        p1->DefineOprt(_T("add"), add, 0);
+        p1->DefineOprt(_T("++"), add, 0);
+        p1->DefineOprt(_T("&"), land, prLAND);
 
         // sample functions
-        p1->DefineFun( _T("min"), Min);
-        p1->DefineFun( _T("max"), Max);
-        p1->DefineFun( _T("sum"), Sum);
-        p1->DefineFun( _T("valueof"), ValueOf);
-        p1->DefineFun( _T("atof"), StrToFloat);
-        p1->DefineFun( _T("strfun1"), StrFun1);
-        p1->DefineFun( _T("strfun2"), StrFun2);
-        p1->DefineFun( _T("strfun3"), StrFun3);
-        p1->DefineFun( _T("lastArg"), LastArg);
-        p1->DefineFun( _T("firstArg"), FirstArg);
-        p1->DefineFun( _T("order"), FirstArg);
+        p1->DefineFun(_T("min"), Min);
+        p1->DefineFun(_T("max"), Max);
+        p1->DefineFun(_T("sum"), Sum);
+        p1->DefineFun(_T("valueof"), ValueOf);
+        p1->DefineFun(_T("atof"), StrToFloat);
+        p1->DefineFun(_T("strfun1"), StrFun1);
+        p1->DefineFun(_T("strfun2"), StrFun2);
+        p1->DefineFun(_T("strfun3"), StrFun3);
+        p1->DefineFun(_T("lastArg"), LastArg);
+        p1->DefineFun(_T("firstArg"), FirstArg);
+        p1->DefineFun(_T("order"), FirstArg);
 
         // infix / postfix operator
-        // Note: Identifiers used here do not have any meaning 
+        // Note: Identifiers used here do not have any meaning
         //       they are mere placeholders to test certain features.
-        p1->DefineInfixOprt( _T("$"), sign, prPOW+1);  // sign with high priority
-        p1->DefineInfixOprt( _T("~"), plus2);          // high priority
-        p1->DefineInfixOprt( _T("~~"), plus2);
-        p1->DefinePostfixOprt( _T("{m}"), Milli);
-        p1->DefinePostfixOprt( _T("{M}"), Mega);
-        p1->DefinePostfixOprt( _T("m"), Milli);
-        p1->DefinePostfixOprt( _T("meg"), Mega);
-        p1->DefinePostfixOprt( _T("#"), times3);
-        p1->DefinePostfixOprt( _T("'"), sqr); 
+        p1->DefineInfixOprt(_T("$"), sign, prPOW + 1); // sign with high priority
+        p1->DefineInfixOprt(_T("~"), plus2);           // high priority
+        p1->DefineInfixOprt(_T("~~"), plus2);
+        p1->DefinePostfixOprt(_T("{m}"), Milli);
+        p1->DefinePostfixOprt(_T("{M}"), Mega);
+        p1->DefinePostfixOprt(_T("m"), Milli);
+        p1->DefinePostfixOprt(_T("meg"), Mega);
+        p1->DefinePostfixOprt(_T("#"), times3);
+        p1->DefinePostfixOprt(_T("'"), sqr);
         p1->SetExpr(a_str);
 
         // Test bytecode integrity
         // String parsing and bytecode parsing must yield the same result
         fVal[0] = p1->Eval(); // result from stringparsing
         fVal[1] = p1->Eval(); // result from bytecode
-        if (fVal[0]!=fVal[1])
-          throw Parser::exception_type( _T("Bytecode / string parsing mismatch.") );
+        if (fVal[0] != fVal[1])
+            throw Parser::exception_type(_T("Bytecode / string parsing mismatch."));
 
         // Test copy and assignment operators
         try
         {
-          // Test copy constructor
-          std::vector<mu::Parser> vParser;
-          vParser.push_back(*(p1.get()));
-          mu::Parser p2 = vParser[0];   // take parser from vector
-        
-          // destroy the originals from p2
-          vParser.clear();              // delete the vector
-          p1.reset(0);
-
-          fVal[2] = p2.Eval();
-
-          // Test assignment operator
-          // additionally  disable Optimizer this time
-          mu::Parser p3;
-          p3 = p2;
-          p3.EnableOptimizer(false);
-          fVal[3] = p3.Eval();
-
-          // Test Eval function for multiple return values
-          // use p2 since it has the optimizer enabled!
-          int nNum;
-          value_type *v = p2.Eval(nNum);
-          fVal[4] = v[nNum-1];
+            // Test copy constructor
+            std::vector<mu::Parser> vParser;
+            vParser.push_back(*(p1.get()));
+            mu::Parser p2 = vParser[0]; // take parser from vector
+
+            // destroy the originals from p2
+            vParser.clear(); // delete the vector
+            p1.reset(0);
+
+            fVal[2] = p2.Eval();
+
+            // Test assignment operator
+            // additionally  disable Optimizer this time
+            mu::Parser p3;
+            p3 = p2;
+            p3.EnableOptimizer(false);
+            fVal[3] = p3.Eval();
+
+            // Test Eval function for multiple return values
+            // use p2 since it has the optimizer enabled!
+            int nNum;
+            value_type* v = p2.Eval(nNum);
+            fVal[4] = v[nNum - 1];
         }
-        catch(std::exception &e)
+        catch (std::exception& e)
         {
-          mu::console() << _T("\n  ") << e.what() << _T("\n");
+            mu::console() << _T("\n  ") << e.what() << _T("\n");
         }
 
         // limited floating point accuracy requires the following test
         bool bCloseEnough(true);
-        for (unsigned i=0; i<sizeof(fVal)/sizeof(value_type); ++i)
+        for (unsigned i = 0; i < sizeof(fVal) / sizeof(value_type); ++i)
         {
-          bCloseEnough &= (fabs(a_fRes-fVal[i]) <= fabs(fVal[i]*0.00001));
-
-          // The tests equations never result in infinity, if they do thats a bug.
-          // reference:
-          // http://sourceforge.net/projects/muparser/forums/forum/462843/topic/5037825
-          #pragma warning(push)
-          #pragma warning(disable:4127)
-		  if (std::numeric_limits<value_type>::has_infinity)
-          #pragma warning(pop)
-		  {
-            bCloseEnough &= (fabs(fVal[i]) != numeric_limits<value_type>::infinity());
-		  }
-		}
+            bCloseEnough &= (fabs(a_fRes - fVal[i]) <= fabs(fVal[i] * 0.00001));
+
+// The tests equations never result in infinity, if they do thats a bug.
+// reference:
+// http://sourceforge.net/projects/muparser/forums/forum/462843/topic/5037825
+#pragma warning(push)
+#pragma warning(disable : 4127)
+            if (std::numeric_limits<value_type>::has_infinity)
+#pragma warning(pop)
+            {
+                bCloseEnough &= (fabs(fVal[i]) != numeric_limits<value_type>::infinity());
+            }
+        }
 
         iRet = ((bCloseEnough && a_fPass) || (!bCloseEnough && !a_fPass)) ? 0 : 1;
-        
-        
-        if (iRet==1)
+
+        if (iRet == 1)
         {
-          mu::console() << _T("\n  fail: ") << a_str.c_str() 
-                        << _T(" (incorrect result; expected: ") << a_fRes
-                        << _T(" ;calculated: ") << fVal[0] << _T(",") 
-                                                << fVal[1] << _T(",")
-                                                << fVal[2] << _T(",")
-                                                << fVal[3] << _T(",")
-                                                << fVal[4] << _T(").");
+            mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (incorrect result; expected: ") << a_fRes
+                          << _T(" ;calculated: ") << fVal[0] << _T(",") << fVal[1] << _T(",") << fVal[2] << _T(",")
+                          << fVal[3] << _T(",") << fVal[4] << _T(").");
         }
-      }
-      catch(Parser::exception_type &e)
-      {
+    }
+    catch (Parser::exception_type& e)
+    {
         if (a_fPass)
         {
-          if (fVal[0]!=fVal[2] && fVal[0]!=-999 && fVal[1]!=-998)
-            mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (copy construction)");
-          else
-            mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (") << e.GetMsg() << _T(")");
-          return 1;
+            if (fVal[0] != fVal[2] && fVal[0] != -999 && fVal[1] != -998)
+                mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (copy construction)");
+            else
+                mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (") << e.GetMsg() << _T(")");
+            return 1;
         }
-      }
-      catch(std::exception &e)
-      {
+    }
+    catch (std::exception& e)
+    {
         mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (") << e.what() << _T(")");
-        return 1;  // always return a failure since this exception is not expected
-      }
-      catch(...)
-      {
-        mu::console() << _T("\n  fail: ") << a_str.c_str() <<  _T(" (unexpected exception)");
-        return 1;  // exceptions other than ParserException are not allowed
-      }
-
-      return iRet;
+        return 1; // always return a failure since this exception is not expected
     }
-
-    //---------------------------------------------------------------------------
-    int ParserTester::EqnTestInt(const string_type &a_str, double a_fRes, bool a_fPass)
+    catch (...)
     {
-      ParserTester::c_iCount++;
+        mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (unexpected exception)");
+        return 1; // exceptions other than ParserException are not allowed
+    }
+
+    return iRet;
+}
 
-      value_type vVarVal[] = {1, 2, 3};   // variable values
-      int iRet(0);
+//---------------------------------------------------------------------------
+int ParserTester::EqnTestInt(const string_type& a_str, double a_fRes, bool a_fPass)
+{
+    ParserTester::c_iCount++;
 
-      try
-      {
-        value_type fVal[2] = {-99, -999};   // results: initially should be different
+    value_type vVarVal[] = {1, 2, 3}; // variable values
+    int iRet(0);
+
+    try
+    {
+        value_type fVal[2] = {-99, -999}; // results: initially should be different
         ParserInt p;
-        p.DefineConst( _T("const1"), 1);
-        p.DefineConst( _T("const2"), 2);
-        p.DefineVar( _T("a"), &vVarVal[0]);
-        p.DefineVar( _T("b"), &vVarVal[1]);
-        p.DefineVar( _T("c"), &vVarVal[2]);
+        p.DefineConst(_T("const1"), 1);
+        p.DefineConst(_T("const2"), 2);
+        p.DefineVar(_T("a"), &vVarVal[0]);
+        p.DefineVar(_T("b"), &vVarVal[1]);
+        p.DefineVar(_T("c"), &vVarVal[2]);
 
         p.SetExpr(a_str);
         fVal[0] = p.Eval(); // result from stringparsing
         fVal[1] = p.Eval(); // result from bytecode
 
-        if (fVal[0]!=fVal[1])
-          throw Parser::exception_type( _T("Bytecode corrupt.") );
+        if (fVal[0] != fVal[1])
+            throw Parser::exception_type(_T("Bytecode corrupt."));
 
-        iRet =  ( (a_fRes==fVal[0] &&  a_fPass) || 
-                  (a_fRes!=fVal[0] && !a_fPass) ) ? 0 : 1;
-        if (iRet==1)
+        iRet = ((a_fRes == fVal[0] && a_fPass) || (a_fRes != fVal[0] && !a_fPass)) ? 0 : 1;
+        if (iRet == 1)
         {
-          mu::console() << _T("\n  fail: ") << a_str.c_str() 
-                        << _T(" (incorrect result; expected: ") << a_fRes 
-                        << _T(" ;calculated: ") << fVal[0]<< _T(").");
+            mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (incorrect result; expected: ") << a_fRes
+                          << _T(" ;calculated: ") << fVal[0] << _T(").");
         }
-      }
-      catch(Parser::exception_type &e)
-      {
+    }
+    catch (Parser::exception_type& e)
+    {
         if (a_fPass)
         {
-          mu::console() << _T("\n  fail: ") << e.GetExpr() << _T(" : ") << e.GetMsg();
-          iRet = 1;
+            mu::console() << _T("\n  fail: ") << e.GetExpr() << _T(" : ") << e.GetMsg();
+            iRet = 1;
         }
-      }
-      catch(...)
-      {
-        mu::console() << _T("\n  fail: ") << a_str.c_str() <<  _T(" (unexpected exception)");
-        iRet = 1;  // exceptions other than ParserException are not allowed
-      }
-
-      return iRet;
     }
+    catch (...)
+    {
+        mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (unexpected exception)");
+        iRet = 1; // exceptions other than ParserException are not allowed
+    }
+
+    return iRet;
+}
 
-    //---------------------------------------------------------------------------
-    /** \brief Test an expression in Bulk Mode. */
-    int ParserTester::EqnTestBulk(const string_type &a_str, double a_fRes[4], bool a_fPass)
+//---------------------------------------------------------------------------
+/** \brief Test an expression in Bulk Mode. */
+int ParserTester::EqnTestBulk(const string_type& a_str, double a_fRes[4], bool a_fPass)
+{
+    ParserTester::c_iCount++;
+
+    // Define Bulk Variables
+    int nBulkSize = 4;
+    value_type vVariableA[] = {1, 2, 3, 4}; // variable values
+    value_type vVariableB[] = {2, 2, 2, 2}; // variable values
+    value_type vVariableC[] = {3, 3, 3, 3}; // variable values
+    value_type vResults[] = {0, 0, 0, 0};   // variable values
+    int iRet(0);
+
+    try
     {
-        ParserTester::c_iCount++;
+        Parser p;
+        p.DefineConst(_T("const1"), 1);
+        p.DefineConst(_T("const2"), 2);
+        p.DefineVar(_T("a"), vVariableA);
+        p.DefineVar(_T("b"), vVariableB);
+        p.DefineVar(_T("c"), vVariableC);
 
-        // Define Bulk Variables
-        int nBulkSize = 4;
-        value_type vVariableA[] = { 1, 2, 3, 4 };   // variable values
-        value_type vVariableB[] = { 2, 2, 2, 2 };   // variable values
-        value_type vVariableC[] = { 3, 3, 3, 3 };   // variable values
-        value_type vResults[] = { 0, 0, 0, 0 };   // variable values
-        int iRet(0);
+        p.SetExpr(a_str);
+        p.Eval(vResults, nBulkSize);
 
-        try
+        bool bCloseEnough(true);
+        for (int i = 0; i < nBulkSize; ++i)
         {
-            Parser p;
-            p.DefineConst(_T("const1"), 1);
-            p.DefineConst(_T("const2"), 2);
-            p.DefineVar(_T("a"), vVariableA);
-            p.DefineVar(_T("b"), vVariableB);
-            p.DefineVar(_T("c"), vVariableC);
-
-            p.SetExpr(a_str);
-            p.Eval(vResults, nBulkSize);
-
-            bool bCloseEnough(true);
-            for (int i = 0; i < nBulkSize; ++i)
-            {
-                bCloseEnough &= (fabs(a_fRes[i] - vResults[i]) <= fabs(a_fRes[i] * 0.00001));
-            }
-
-            iRet = ((bCloseEnough && a_fPass) || (!bCloseEnough && !a_fPass)) ? 0 : 1;
-            if (iRet == 1)
-            {
-                mu::console() << _T("\n  fail: ") << a_str.c_str()
-                    << _T(" (incorrect result; expected: {") << a_fRes[0] << _T(",") << a_fRes[1] << _T(",") << a_fRes[2] << _T(",") << a_fRes[3] << _T("}")
-                    << _T(" ;calculated: ") << vResults[0] << _T(",") << vResults[1] << _T(",") << vResults[2] << _T(",") << vResults[3] << _T("}");
-            }
+            bCloseEnough &= (fabs(a_fRes[i] - vResults[i]) <= fabs(a_fRes[i] * 0.00001));
         }
-        catch (Parser::exception_type &e)
+
+        iRet = ((bCloseEnough && a_fPass) || (!bCloseEnough && !a_fPass)) ? 0 : 1;
+        if (iRet == 1)
         {
-            if (a_fPass)
-            {
-                mu::console() << _T("\n  fail: ") << e.GetExpr() << _T(" : ") << e.GetMsg();
-                iRet = 1;
-            }
+            mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (incorrect result; expected: {") << a_fRes[0]
+                          << _T(",") << a_fRes[1] << _T(",") << a_fRes[2] << _T(",") << a_fRes[3] << _T("}")
+                          << _T(" ;calculated: ") << vResults[0] << _T(",") << vResults[1] << _T(",") << vResults[2]
+                          << _T(",") << vResults[3] << _T("}");
         }
-        catch (...)
+    }
+    catch (Parser::exception_type& e)
+    {
+        if (a_fPass)
         {
-            mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (unexpected exception)");
-            iRet = 1;  // exceptions other than ParserException are not allowed
+            mu::console() << _T("\n  fail: ") << e.GetExpr() << _T(" : ") << e.GetMsg();
+            iRet = 1;
         }
-
-        return iRet;
     }
-
-    //---------------------------------------------------------------------------
-    /** \brief Internal error in test class Test is going to be aborted. */
-    void ParserTester::Abort() const
+    catch (...)
     {
-      mu::console() << _T("Test failed (internal error in test class)") << endl;
-      while (!getchar());
-      exit(-1);
+        mu::console() << _T("\n  fail: ") << a_str.c_str() << _T(" (unexpected exception)");
+        iRet = 1; // exceptions other than ParserException are not allowed
     }
-  } // namespace test
+
+    return iRet;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Internal error in test class Test is going to be aborted. */
+void ParserTester::Abort() const
+{
+    mu::console() << _T("Test failed (internal error in test class)") << endl;
+    while (!getchar())
+        ;
+    exit(-1);
+}
+} // namespace Test
 } // namespace mu
diff --git a/ext_libs/muparser/muParserTest.h b/ext_libs/muparser/muParserTest.h
old mode 100755
new mode 100644
index c02b0218..6e266e57
--- a/ext_libs/muparser/muParserTest.h
+++ b/ext_libs/muparser/muParserTest.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_TEST_H
@@ -38,177 +38,162 @@
 
 namespace mu
 {
-  /** \brief Namespace for test cases. */
-  namespace Test
-  {
-    //------------------------------------------------------------------------------
-    /** \brief Test cases for unit testing.
-
-      (C) 2004-2011 Ingo Berg
-    */
-    class ParserTester // final
+/** \brief Namespace for test cases. */
+namespace Test
+{
+//------------------------------------------------------------------------------
+/** \brief Test cases for unit testing.
+
+  (C) 2004-2011 Ingo Berg
+*/
+class ParserTester // final
+{
+private:
+    static int c_iCount;
+
+    // Multiarg callbacks
+    static value_type f1of1(value_type v) { return v; };
+
+    static value_type f1of2(value_type v, value_type) { return v; };
+    static value_type f2of2(value_type, value_type v) { return v; };
+
+    static value_type f1of3(value_type v, value_type, value_type) { return v; };
+    static value_type f2of3(value_type, value_type v, value_type) { return v; };
+    static value_type f3of3(value_type, value_type, value_type v) { return v; };
+
+    static value_type f1of4(value_type v, value_type, value_type, value_type) { return v; }
+    static value_type f2of4(value_type, value_type v, value_type, value_type) { return v; }
+    static value_type f3of4(value_type, value_type, value_type v, value_type) { return v; }
+    static value_type f4of4(value_type, value_type, value_type, value_type v) { return v; }
+
+    static value_type f1of5(value_type v, value_type, value_type, value_type, value_type) { return v; }
+    static value_type f2of5(value_type, value_type v, value_type, value_type, value_type) { return v; }
+    static value_type f3of5(value_type, value_type, value_type v, value_type, value_type) { return v; }
+    static value_type f4of5(value_type, value_type, value_type, value_type v, value_type) { return v; }
+    static value_type f5of5(value_type, value_type, value_type, value_type, value_type v) { return v; }
+
+    static value_type Min(value_type a_fVal1, value_type a_fVal2) { return (a_fVal1 < a_fVal2) ? a_fVal1 : a_fVal2; }
+    static value_type Max(value_type a_fVal1, value_type a_fVal2) { return (a_fVal1 > a_fVal2) ? a_fVal1 : a_fVal2; }
+
+    static value_type plus2(value_type v1) { return v1 + 2; }
+    static value_type times3(value_type v1) { return v1 * 3; }
+    static value_type sqr(value_type v1) { return v1 * v1; }
+    static value_type sign(value_type v) { return -v; }
+    static value_type add(value_type v1, value_type v2) { return v1 + v2; }
+    static value_type land(value_type v1, value_type v2) { return (int)v1 & (int)v2; }
+
+    static value_type FirstArg(const value_type* a_afArg, int a_iArgc)
     {
-    private:
-        static int c_iCount;
-
-        // Multiarg callbacks
-        static value_type f1of1(value_type v) { return v;};
-      	
-        static value_type f1of2(value_type v, value_type  ) {return v;};
-        static value_type f2of2(value_type  , value_type v) {return v;};
-
-        static value_type f1of3(value_type v, value_type  , value_type  ) {return v;};
-        static value_type f2of3(value_type  , value_type v, value_type  ) {return v;};
-        static value_type f3of3(value_type  , value_type  , value_type v) {return v;};
-      	
-        static value_type f1of4(value_type v, value_type,   value_type  , value_type  ) {return v;}
-        static value_type f2of4(value_type  , value_type v, value_type  , value_type  ) {return v;}
-        static value_type f3of4(value_type  , value_type,   value_type v, value_type  ) {return v;}
-        static value_type f4of4(value_type  , value_type,   value_type  , value_type v) {return v;}
-
-        static value_type f1of5(value_type v, value_type,   value_type  , value_type  , value_type  ) { return v; }
-        static value_type f2of5(value_type  , value_type v, value_type  , value_type  , value_type  ) { return v; }
-        static value_type f3of5(value_type  , value_type,   value_type v, value_type  , value_type  ) { return v; }
-        static value_type f4of5(value_type  , value_type,   value_type  , value_type v, value_type  ) { return v; }
-        static value_type f5of5(value_type  , value_type,   value_type  , value_type  , value_type v) { return v; }
-
-        static value_type Min(value_type a_fVal1, value_type a_fVal2) { return (a_fVal1<a_fVal2) ? a_fVal1 : a_fVal2; }
-  	    static value_type Max(value_type a_fVal1, value_type a_fVal2) { return (a_fVal1>a_fVal2) ? a_fVal1 : a_fVal2; }
-
-        static value_type plus2(value_type v1) { return v1+2; }
-        static value_type times3(value_type v1) { return v1*3; }
-        static value_type sqr(value_type v1) { return v1*v1; }
-        static value_type sign(value_type v) { return -v; }
-        static value_type add(value_type v1, value_type v2) { return v1+v2; }
-        static value_type land(value_type v1, value_type v2) { return (int)v1 & (int)v2; }
-        
-
-        static value_type FirstArg(const value_type* a_afArg, int a_iArgc)
-        {
-          if (!a_iArgc)	
-            throw mu::Parser::exception_type( _T("too few arguments for function FirstArg.") );
-
-          return  a_afArg[0];
-        }
-
-        static value_type LastArg(const value_type* a_afArg, int a_iArgc)
-        {
-          if (!a_iArgc)	
-            throw mu::Parser::exception_type( _T("too few arguments for function LastArg.") );
-
-          return  a_afArg[a_iArgc-1];
-        }
-
-        static value_type Sum(const value_type* a_afArg, int a_iArgc)
-        { 
-          if (!a_iArgc)	
-            throw mu::Parser::exception_type( _T("too few arguments for function sum.") );
-
-          value_type fRes=0;
-          for (int i=0; i<a_iArgc; ++i) fRes += a_afArg[i];
-          return fRes;
-        }
-
-        static value_type Rnd(value_type v)
-        {
-          return (value_type)(1+(v*std::rand()/(RAND_MAX+1.0)));
-        }
-
-        static value_type RndWithString(const char_type*)
-        {
-          return (value_type)( 1 + (1000.0f * std::rand() / (RAND_MAX + 1.0) ) );
-        }
-
-        static value_type Ping()
-        { 
-          return 10; 
-        }
-
-        static value_type ValueOf(const char_type*)      
-        { 
-          return 123; 
-        }
-
-        static value_type StrFun1(const char_type* v1)                               
-        { 
-          int val(0);
-          stringstream_type(v1) >> val;
-          return (value_type)val;
-        }
-
-        static value_type StrFun2(const char_type* v1, value_type v2)                
-        { 
-          int val(0);
-          stringstream_type(v1) >> val;
-          return (value_type)(val + v2);
-        }
-        
-        static value_type StrFun3(const char_type* v1, value_type v2, value_type v3) 
-        { 
-          int val(0);
-          stringstream_type(v1) >> val;
-          return val + v2 + v3;
-        }
-
-        static value_type StrToFloat(const char_type* a_szMsg)
-        {
-          value_type val(0);
-          stringstream_type(a_szMsg) >> val;
-          return val;
-        }
-
-        // postfix operator callback
-        static value_type Mega(value_type a_fVal)  { return a_fVal * (value_type)1e6; }
-        static value_type Micro(value_type a_fVal) { return a_fVal * (value_type)1e-6; }
-        static value_type Milli(value_type a_fVal) { return a_fVal / (value_type)1e3; }
-
-        // Custom value recognition
-        static int IsHexVal(const char_type *a_szExpr, int *a_iPos, value_type *a_fVal);
-
-        int TestNames();
-        int TestSyntax();
-        int TestMultiArg();
-        int TestPostFix();
-        int TestExpression();
-        int TestInfixOprt();
-        int TestBinOprt();
-        int TestVarConst();
-        int TestInterface();
-        int TestException();
-        int TestStrArg();
-        int TestIfThenElse();
-        int TestBulkMode();
-
-        void Abort() const;
-
-    public:
-        typedef int (ParserTester::*testfun_type)();
-
-	      ParserTester();
-	      void Run();
-
-    private:
-        std::vector<testfun_type> m_vTestFun;
-	      void AddTest(testfun_type a_pFun);
-
-        // Test Double Parser
-        int EqnTest(const string_type& a_str, double a_fRes, bool a_fPass);
-        int EqnTestWithVarChange(const string_type& a_str, 
-                                 double a_fRes1, 
-                                 double a_fVar1, 
-                                 double a_fRes2, 
-                                 double a_fVar2);
-        int ThrowTest(const string_type& a_str, int a_iErrc, bool a_bFail = true);
-
-        // Test Int Parser
-        int EqnTestInt(const string_type& a_str, double a_fRes, bool a_fPass);
-
-        // Test Bulkmode
-        int EqnTestBulk(const string_type& a_str, double a_fRes[4], bool a_fPass);
-    };
-  } // namespace Test
-} // namespace mu
+        if (!a_iArgc)
+            throw mu::Parser::exception_type(_T("too few arguments for function FirstArg."));
 
-#endif
+        return a_afArg[0];
+    }
+
+    static value_type LastArg(const value_type* a_afArg, int a_iArgc)
+    {
+        if (!a_iArgc)
+            throw mu::Parser::exception_type(_T("too few arguments for function LastArg."));
+
+        return a_afArg[a_iArgc - 1];
+    }
 
+    static value_type Sum(const value_type* a_afArg, int a_iArgc)
+    {
+        if (!a_iArgc)
+            throw mu::Parser::exception_type(_T("too few arguments for function sum."));
+
+        value_type fRes = 0;
+        for (int i = 0; i < a_iArgc; ++i)
+            fRes += a_afArg[i];
+        return fRes;
+    }
+
+    static value_type Rnd(value_type v) { return (value_type)(1 + (v * std::rand() / (RAND_MAX + 1.0))); }
+
+    static value_type RndWithString(const char_type*)
+    {
+        return (value_type)(1 + (1000.0f * std::rand() / (RAND_MAX + 1.0)));
+    }
+
+    static value_type Ping() { return 10; }
+
+    static value_type ValueOf(const char_type*) { return 123; }
+
+    static value_type StrFun1(const char_type* v1)
+    {
+        int val(0);
+        stringstream_type(v1) >> val;
+        return (value_type)val;
+    }
 
+    static value_type StrFun2(const char_type* v1, value_type v2)
+    {
+        int val(0);
+        stringstream_type(v1) >> val;
+        return (value_type)(val + v2);
+    }
+
+    static value_type StrFun3(const char_type* v1, value_type v2, value_type v3)
+    {
+        int val(0);
+        stringstream_type(v1) >> val;
+        return val + v2 + v3;
+    }
+
+    static value_type StrToFloat(const char_type* a_szMsg)
+    {
+        value_type val(0);
+        stringstream_type(a_szMsg) >> val;
+        return val;
+    }
+
+    // postfix operator callback
+    static value_type Mega(value_type a_fVal) { return a_fVal * (value_type)1e6; }
+    static value_type Micro(value_type a_fVal) { return a_fVal * (value_type)1e-6; }
+    static value_type Milli(value_type a_fVal) { return a_fVal / (value_type)1e3; }
+
+    // Custom value recognition
+    static int IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal);
+
+    int TestNames();
+    int TestSyntax();
+    int TestMultiArg();
+    int TestPostFix();
+    int TestExpression();
+    int TestInfixOprt();
+    int TestBinOprt();
+    int TestVarConst();
+    int TestInterface();
+    int TestException();
+    int TestStrArg();
+    int TestIfThenElse();
+    int TestBulkMode();
+
+    void Abort() const;
+
+public:
+    typedef int (ParserTester::*testfun_type)();
+
+    ParserTester();
+    void Run();
+
+private:
+    std::vector<testfun_type> m_vTestFun;
+    void AddTest(testfun_type a_pFun);
+
+    // Test Double Parser
+    int EqnTest(const string_type& a_str, double a_fRes, bool a_fPass);
+    int EqnTestWithVarChange(const string_type& a_str, double a_fRes1, double a_fVar1, double a_fRes2, double a_fVar2);
+    int ThrowTest(const string_type& a_str, int a_iErrc, bool a_bFail = true);
+
+    // Test Int Parser
+    int EqnTestInt(const string_type& a_str, double a_fRes, bool a_fPass);
+
+    // Test Bulkmode
+    int EqnTestBulk(const string_type& a_str, double a_fRes[4], bool a_fPass);
+};
+} // namespace Test
+} // namespace mu
+
+#endif
diff --git a/ext_libs/muparser/muParserToken.h b/ext_libs/muparser/muParserToken.h
old mode 100755
new mode 100644
index fc91d781..07e349f3
--- a/ext_libs/muparser/muParserToken.h
+++ b/ext_libs/muparser/muParserToken.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_TOKEN_H
@@ -41,89 +41,78 @@
 
 namespace mu
 {
-  /** \brief Encapsulation of the data for a single formula token. 
-
-    Formula token implementation. Part of the Math Parser Package.
-    Formula tokens can be either one of the following:
-    <ul>
-      <li>value</li>
-      <li>variable</li>
-      <li>function with numerical arguments</li>
-      <li>functions with a string as argument</li>
-      <li>prefix operators</li>
-      <li>infix operators</li>
-	    <li>binary operator</li>
-    </ul>
-
-   \author (C) 2004-2013 Ingo Berg 
-  */
-  template<typename TBase, typename TString>
-  class ParserToken
-  {
-  private:
-
-      ECmdCode  m_iCode;  ///< Type of the token; The token type is a constant of type #ECmdCode.
-      ETypeCode m_iType;
-      void  *m_pTok;      ///< Stores Token pointer; not applicable for all tokens
-      int  m_iIdx;        ///< An otional index to an external buffer storing the token data
-      TString m_strTok;   ///< Token string
-      TString m_strVal;   ///< Value for string variables
-      value_type m_fVal;  ///< the value 
-      std::auto_ptr<ParserCallback> m_pCallback;
-
-  public:
-
-      //---------------------------------------------------------------------------
-      /** \brief Constructor (default).
-        
-          Sets token to an neutral state of type cmUNKNOWN.
-          \throw nothrow
-          \sa ECmdCode
-      */
-      ParserToken()
-        :m_iCode(cmUNKNOWN)
-        ,m_iType(tpVOID)
-        ,m_pTok(0)
-        ,m_iIdx(-1)
-        ,m_strTok()
-		,m_strVal()
-		,m_fVal(0)
-        ,m_pCallback()
-      {}
-
-      //------------------------------------------------------------------------------
-      /** \brief Create token from another one.
-      
-          Implemented by calling Assign(...)
-          \throw nothrow
-          \post m_iType==cmUNKNOWN
-          \sa #Assign
-      */
-      ParserToken(const ParserToken &a_Tok)
-      {
-        Assign(a_Tok);
-      }
-      
-      //------------------------------------------------------------------------------
-      /** \brief Assignement operator. 
-      
-          Copy token state from another token and return this.
-          Implemented by calling Assign(...).
-          \throw nothrow
-      */
-      ParserToken& operator=(const ParserToken &a_Tok)
-      {
+/** \brief Encapsulation of the data for a single formula token.
+
+  Formula token implementation. Part of the Math Parser Package.
+  Formula tokens can be either one of the following:
+  <ul>
+    <li>value</li>
+    <li>variable</li>
+    <li>function with numerical arguments</li>
+    <li>functions with a string as argument</li>
+    <li>prefix operators</li>
+    <li>infix operators</li>
+          <li>binary operator</li>
+  </ul>
+
+ \author (C) 2004-2013 Ingo Berg
+*/
+template<typename TBase, typename TString>
+class ParserToken
+{
+private:
+    ECmdCode m_iCode; ///< Type of the token; The token type is a constant of type #ECmdCode.
+    ETypeCode m_iType;
+    void* m_pTok;      ///< Stores Token pointer; not applicable for all tokens
+    int m_iIdx;        ///< An otional index to an external buffer storing the token data
+    TString m_strTok;  ///< Token string
+    TString m_strVal;  ///< Value for string variables
+    value_type m_fVal; ///< the value
+    std::auto_ptr<ParserCallback> m_pCallback;
+
+public:
+    //---------------------------------------------------------------------------
+    /** \brief Constructor (default).
+
+        Sets token to an neutral state of type cmUNKNOWN.
+        \throw nothrow
+        \sa ECmdCode
+    */
+    ParserToken() :
+        m_iCode(cmUNKNOWN), m_iType(tpVOID), m_pTok(0), m_iIdx(-1), m_strTok(), m_strVal(), m_fVal(0), m_pCallback()
+    {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Create token from another one.
+
+        Implemented by calling Assign(...)
+        \throw nothrow
+        \post m_iType==cmUNKNOWN
+        \sa #Assign
+    */
+    ParserToken(const ParserToken& a_Tok) { Assign(a_Tok); }
+
+    //------------------------------------------------------------------------------
+    /** \brief Assignement operator.
+
+        Copy token state from another token and return this.
+        Implemented by calling Assign(...).
+        \throw nothrow
+    */
+    ParserToken& operator=(const ParserToken& a_Tok)
+    {
         Assign(a_Tok);
         return *this;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Copy token information from argument.
-      
-          \throw nothrow
-      */
-      void Assign(const ParserToken &a_Tok)
-      {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Copy token information from argument.
+
+        \throw nothrow
+    */
+    void Assign(const ParserToken& a_Tok)
+    {
         m_iCode = a_Tok.m_iCode;
         m_pTok = a_Tok.m_pTok;
         m_strTok = a_Tok.m_strTok;
@@ -131,27 +120,27 @@ namespace mu
         m_strVal = a_Tok.m_strVal;
         m_iType = a_Tok.m_iType;
         m_fVal = a_Tok.m_fVal;
-        // create new callback object if a_Tok has one 
+        // create new callback object if a_Tok has one
         m_pCallback.reset(a_Tok.m_pCallback.get() ? a_Tok.m_pCallback->Clone() : 0);
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      /** \brief Assign a token type. 
+    //------------------------------------------------------------------------------
+    /** \brief Assign a token type.
 
-        Token may not be of type value, variable or function. Those have seperate set functions. 
+      Token may not be of type value, variable or function. Those have seperate set functions.
 
-        \pre [assert] a_iType!=cmVAR
-        \pre [assert] a_iType!=cmVAL
-        \pre [assert] a_iType!=cmFUNC
-        \post m_fVal = 0
-        \post m_pTok = 0
-      */
-      ParserToken& Set(ECmdCode a_iType, const TString &a_strTok=TString())
-      {
+      \pre [assert] a_iType!=cmVAR
+      \pre [assert] a_iType!=cmVAL
+      \pre [assert] a_iType!=cmFUNC
+      \post m_fVal = 0
+      \post m_pTok = 0
+    */
+    ParserToken& Set(ECmdCode a_iType, const TString& a_strTok = TString())
+    {
         // The following types cant be set this way, they have special Set functions
-        assert(a_iType!=cmVAR);
-        assert(a_iType!=cmVAL);
-        assert(a_iType!=cmFUNC);
+        assert(a_iType != cmVAR);
+        assert(a_iType != cmVAL);
+        assert(a_iType != cmFUNC);
 
         m_iCode = a_iType;
         m_iType = tpVOID;
@@ -160,12 +149,12 @@ namespace mu
         m_iIdx = -1;
 
         return *this;
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      /** \brief Set Callback type. */
-      ParserToken& Set(const ParserCallback &a_pCallback, const TString &a_sTok)
-      {
+    //------------------------------------------------------------------------------
+    /** \brief Set Callback type. */
+    ParserToken& Set(const ParserCallback& a_pCallback, const TString& a_sTok)
+    {
         assert(a_pCallback.GetAddr());
 
         m_iCode = a_pCallback.GetCode();
@@ -175,38 +164,38 @@ namespace mu
 
         m_pTok = 0;
         m_iIdx = -1;
-        
+
         return *this;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Make this token a value token. 
-      
-          Member variables not necessary for value tokens will be invalidated.
-          \throw nothrow
-      */
-      ParserToken& SetVal(TBase a_fVal, const TString &a_strTok=TString())
-      {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Make this token a value token.
+
+        Member variables not necessary for value tokens will be invalidated.
+        \throw nothrow
+    */
+    ParserToken& SetVal(TBase a_fVal, const TString& a_strTok = TString())
+    {
         m_iCode = cmVAL;
         m_iType = tpDBL;
         m_fVal = a_fVal;
         m_strTok = a_strTok;
         m_iIdx = -1;
-        
+
         m_pTok = 0;
         m_pCallback.reset(0);
 
         return *this;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief make this token a variable token. 
-      
-          Member variables not necessary for variable tokens will be invalidated.
-          \throw nothrow
-      */
-      ParserToken& SetVar(TBase *a_pVar, const TString &a_strTok)
-      {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief make this token a variable token.
+
+        Member variables not necessary for variable tokens will be invalidated.
+        \throw nothrow
+    */
+    ParserToken& SetVar(TBase* a_pVar, const TString& a_strTok)
+    {
         m_iCode = cmVAR;
         m_iType = tpDBL;
         m_strTok = a_strTok;
@@ -214,16 +203,16 @@ namespace mu
         m_pTok = (void*)a_pVar;
         m_pCallback.reset(0);
         return *this;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Make this token a variable token. 
-      
-          Member variables not necessary for variable tokens will be invalidated.
-          \throw nothrow
-      */
-      ParserToken& SetString(const TString &a_strTok, std::size_t a_iSize)
-      {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Make this token a variable token.
+
+        Member variables not necessary for variable tokens will be invalidated.
+        \throw nothrow
+    */
+    ParserToken& SetString(const TString& a_strTok, std::size_t a_iSize)
+    {
         m_iCode = cmSTRING;
         m_iType = tpSTR;
         m_strTok = a_strTok;
@@ -232,170 +221,167 @@ namespace mu
         m_pTok = 0;
         m_pCallback.reset(0);
         return *this;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Set an index associated with the token related data. 
-      
-          In cmSTRFUNC - This is the index to a string table in the main parser.
-          \param a_iIdx The index the string function result will take in the bytecode parser.
-          \throw exception_type if #a_iIdx<0 or #m_iType!=cmSTRING
-      */
-      void SetIdx(int a_iIdx)
-      {
-        if (m_iCode!=cmSTRING || a_iIdx<0)
-	        throw ParserError(ecINTERNAL_ERROR);
-        
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Set an index associated with the token related data.
+
+        In cmSTRFUNC - This is the index to a string table in the main parser.
+        \param a_iIdx The index the string function result will take in the bytecode parser.
+        \throw exception_type if #a_iIdx<0 or #m_iType!=cmSTRING
+    */
+    void SetIdx(int a_iIdx)
+    {
+        if (m_iCode != cmSTRING || a_iIdx < 0)
+            throw ParserError(ecINTERNAL_ERROR);
+
         m_iIdx = a_iIdx;
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      /** \brief Return Index associated with the token related data. 
-      
-          In cmSTRFUNC - This is the index to a string table in the main parser.
+    //------------------------------------------------------------------------------
+    /** \brief Return Index associated with the token related data.
 
-          \throw exception_type if #m_iIdx<0 or #m_iType!=cmSTRING
-          \return The index the result will take in the Bytecode calculatin array (#m_iIdx).
-      */
-      int GetIdx() const
-      {
-        if (m_iIdx<0 || m_iCode!=cmSTRING )
-          throw ParserError(ecINTERNAL_ERROR);
+        In cmSTRFUNC - This is the index to a string table in the main parser.
+
+        \throw exception_type if #m_iIdx<0 or #m_iType!=cmSTRING
+        \return The index the result will take in the Bytecode calculatin array (#m_iIdx).
+    */
+    int GetIdx() const
+    {
+        if (m_iIdx < 0 || m_iCode != cmSTRING)
+            throw ParserError(ecINTERNAL_ERROR);
 
         return m_iIdx;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Return the token type.
-      
-          \return #m_iType
-          \throw nothrow
-      */
-      ECmdCode GetCode() const
-      {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Return the token type.
+
+        \return #m_iType
+        \throw nothrow
+    */
+    ECmdCode GetCode() const
+    {
         if (m_pCallback.get())
         {
-          return m_pCallback->GetCode();
+            return m_pCallback->GetCode();
         }
         else
         {
-          return m_iCode;
+            return m_iCode;
         }
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      ETypeCode GetType() const
-      {
+    //------------------------------------------------------------------------------
+    ETypeCode GetType() const
+    {
         if (m_pCallback.get())
         {
-          return m_pCallback->GetType();
+            return m_pCallback->GetType();
         }
         else
         {
-          return m_iType;
+            return m_iType;
         }
-      }
-      
-      //------------------------------------------------------------------------------
-      int GetPri() const
-      {
-        if ( !m_pCallback.get())
-	        throw ParserError(ecINTERNAL_ERROR);
-            
-        if ( m_pCallback->GetCode()!=cmOPRT_BIN && m_pCallback->GetCode()!=cmOPRT_INFIX)
-	        throw ParserError(ecINTERNAL_ERROR);
+    }
+
+    //------------------------------------------------------------------------------
+    int GetPri() const
+    {
+        if (!m_pCallback.get())
+            throw ParserError(ecINTERNAL_ERROR);
+
+        if (m_pCallback->GetCode() != cmOPRT_BIN && m_pCallback->GetCode() != cmOPRT_INFIX)
+            throw ParserError(ecINTERNAL_ERROR);
 
         return m_pCallback->GetPri();
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      EOprtAssociativity GetAssociativity() const
-      {
-        if (m_pCallback.get()==NULL || m_pCallback->GetCode()!=cmOPRT_BIN)
-	        throw ParserError(ecINTERNAL_ERROR);
+    //------------------------------------------------------------------------------
+    EOprtAssociativity GetAssociativity() const
+    {
+        if (m_pCallback.get() == NULL || m_pCallback->GetCode() != cmOPRT_BIN)
+            throw ParserError(ecINTERNAL_ERROR);
 
         return m_pCallback->GetAssociativity();
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Return the address of the callback function assoziated with
-                 function and operator tokens.
-
-          \return The pointer stored in #m_pTok.
-          \throw exception_type if token type is non of:
-                 <ul>
-                   <li>cmFUNC</li>
-                   <li>cmSTRFUNC</li>
-                   <li>cmPOSTOP</li>
-                   <li>cmINFIXOP</li>
-                   <li>cmOPRT_BIN</li>
-                 </ul>
-          \sa ECmdCode
-      */
-      generic_fun_type GetFuncAddr() const
-      {
-        return (m_pCallback.get()) ? (generic_fun_type)m_pCallback->GetAddr() : 0;
-      }
-
-      //------------------------------------------------------------------------------
-      /** \biref Get value of the token.
-        
-          Only applicable to variable and value tokens.
-          \throw exception_type if token is no value/variable token.
-      */
-      TBase GetVal() const
-      {
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Return the address of the callback function assoziated with
+               function and operator tokens.
+
+        \return The pointer stored in #m_pTok.
+        \throw exception_type if token type is non of:
+               <ul>
+                 <li>cmFUNC</li>
+                 <li>cmSTRFUNC</li>
+                 <li>cmPOSTOP</li>
+                 <li>cmINFIXOP</li>
+                 <li>cmOPRT_BIN</li>
+               </ul>
+        \sa ECmdCode
+    */
+    generic_fun_type GetFuncAddr() const { return (m_pCallback.get()) ? (generic_fun_type)m_pCallback->GetAddr() : 0; }
+
+    //------------------------------------------------------------------------------
+    /** \biref Get value of the token.
+
+        Only applicable to variable and value tokens.
+        \throw exception_type if token is no value/variable token.
+    */
+    TBase GetVal() const
+    {
         switch (m_iCode)
         {
-          case cmVAL:  return m_fVal;
-          case cmVAR:  return *((TBase*)m_pTok);
-          default:     throw ParserError(ecVAL_EXPECTED);
+            case cmVAL:
+                return m_fVal;
+            case cmVAR:
+                return *((TBase*)m_pTok);
+            default:
+                throw ParserError(ecVAL_EXPECTED);
         }
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      /** \brief Get address of a variable token.
+    //------------------------------------------------------------------------------
+    /** \brief Get address of a variable token.
 
-        Valid only if m_iType==CmdVar.
-        \throw exception_type if token is no variable token.
-      */
-      TBase* GetVar() const
-      {
-        if (m_iCode!=cmVAR)
-	        throw ParserError(ecINTERNAL_ERROR);
+      Valid only if m_iType==CmdVar.
+      \throw exception_type if token is no variable token.
+    */
+    TBase* GetVar() const
+    {
+        if (m_iCode != cmVAR)
+            throw ParserError(ecINTERNAL_ERROR);
 
         return (TBase*)m_pTok;
-      }
+    }
 
-      //------------------------------------------------------------------------------
-      /** \brief Return the number of function arguments. 
+    //------------------------------------------------------------------------------
+    /** \brief Return the number of function arguments.
 
-        Valid only if m_iType==CmdFUNC.
-      */
-      int GetArgCount() const
-      {
+      Valid only if m_iType==CmdFUNC.
+    */
+    int GetArgCount() const
+    {
         assert(m_pCallback.get());
 
         if (!m_pCallback->GetAddr())
-	        throw ParserError(ecINTERNAL_ERROR);
+            throw ParserError(ecINTERNAL_ERROR);
 
         return m_pCallback->GetArgc();
-      }
-
-      //------------------------------------------------------------------------------
-      /** \brief Return the token identifier. 
-          
-          If #m_iType is cmSTRING the token identifier is the value of the string argument
-          for a string function.
-          \return #m_strTok
-          \throw nothrow
-          \sa m_strTok
-      */
-      const TString& GetAsString() const
-      {
-        return m_strTok;
-      }
-  };
+    }
+
+    //------------------------------------------------------------------------------
+    /** \brief Return the token identifier.
+
+        If #m_iType is cmSTRING the token identifier is the value of the string argument
+        for a string function.
+        \return #m_strTok
+        \throw nothrow
+        \sa m_strTok
+    */
+    const TString& GetAsString() const { return m_strTok; }
+};
 } // namespace mu
 
 #endif
diff --git a/ext_libs/muparser/muParserTokenReader.cpp b/ext_libs/muparser/muParserTokenReader.cpp
old mode 100755
new mode 100644
index 8da1e402..20f99456
--- a/ext_libs/muparser/muParserTokenReader.cpp
+++ b/ext_libs/muparser/muParserTokenReader.cpp
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 #include <cassert>
 #include <cstdio>
@@ -36,846 +36,850 @@
     \brief This file contains the parser token reader implementation.
 */
 
-
 namespace mu
 {
+// Forward declaration
+class ParserBase;
 
-  // Forward declaration
-  class ParserBase;
-
-  //---------------------------------------------------------------------------
-  /** \brief Copy constructor.
+//---------------------------------------------------------------------------
+/** \brief Copy constructor.
 
-      \sa Assign
-      \throw nothrow
-  */
-  ParserTokenReader::ParserTokenReader(const ParserTokenReader &a_Reader) 
-  { 
+    \sa Assign
+    \throw nothrow
+*/
+ParserTokenReader::ParserTokenReader(const ParserTokenReader& a_Reader)
+{
     Assign(a_Reader);
-  }
-    
-  //---------------------------------------------------------------------------
-  /** \brief Assignment operator.
+}
 
-      Self assignment will be suppressed otherwise #Assign is called.
+//---------------------------------------------------------------------------
+/** \brief Assignment operator.
 
-      \param a_Reader Object to copy to this token reader.
-      \throw nothrow
-  */
-  ParserTokenReader& ParserTokenReader::operator=(const ParserTokenReader &a_Reader) 
-  {
-    if (&a_Reader!=this)
-      Assign(a_Reader);
+    Self assignment will be suppressed otherwise #Assign is called.
+
+    \param a_Reader Object to copy to this token reader.
+    \throw nothrow
+*/
+ParserTokenReader& ParserTokenReader::operator=(const ParserTokenReader& a_Reader)
+{
+    if (&a_Reader != this)
+        Assign(a_Reader);
 
     return *this;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Assign state of a token reader to this token reader. 
-      
-      \param a_Reader Object from which the state should be copied.
-      \throw nothrow
-  */
-  void ParserTokenReader::Assign(const ParserTokenReader &a_Reader)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Assign state of a token reader to this token reader.
+
+    \param a_Reader Object from which the state should be copied.
+    \throw nothrow
+*/
+void ParserTokenReader::Assign(const ParserTokenReader& a_Reader)
+{
     m_pParser = a_Reader.m_pParser;
     m_strFormula = a_Reader.m_strFormula;
     m_iPos = a_Reader.m_iPos;
     m_iSynFlags = a_Reader.m_iSynFlags;
-    
-    m_UsedVar         = a_Reader.m_UsedVar;
-    m_pFunDef         = a_Reader.m_pFunDef;
-    m_pConstDef       = a_Reader.m_pConstDef;
-    m_pVarDef         = a_Reader.m_pVarDef;
-    m_pStrVarDef      = a_Reader.m_pStrVarDef;
-    m_pPostOprtDef    = a_Reader.m_pPostOprtDef;
-    m_pInfixOprtDef   = a_Reader.m_pInfixOprtDef;
-    m_pOprtDef        = a_Reader.m_pOprtDef;
+
+    m_UsedVar = a_Reader.m_UsedVar;
+    m_pFunDef = a_Reader.m_pFunDef;
+    m_pConstDef = a_Reader.m_pConstDef;
+    m_pVarDef = a_Reader.m_pVarDef;
+    m_pStrVarDef = a_Reader.m_pStrVarDef;
+    m_pPostOprtDef = a_Reader.m_pPostOprtDef;
+    m_pInfixOprtDef = a_Reader.m_pInfixOprtDef;
+    m_pOprtDef = a_Reader.m_pOprtDef;
     m_bIgnoreUndefVar = a_Reader.m_bIgnoreUndefVar;
-    m_vIdentFun       = a_Reader.m_vIdentFun;
-    m_pFactory        = a_Reader.m_pFactory;
-    m_pFactoryData    = a_Reader.m_pFactoryData;
-    m_iBrackets       = a_Reader.m_iBrackets;
-    m_cArgSep         = a_Reader.m_cArgSep;
-	m_fZero           = a_Reader.m_fZero;
-	m_lastTok         = a_Reader.m_lastTok;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Constructor. 
-      
-      Create a Token reader and bind it to a parser object. 
-
-      \pre [assert] a_pParser may not be NULL
-      \post #m_pParser==a_pParser
-      \param a_pParent Parent parser object of the token reader.
-  */
-  ParserTokenReader::ParserTokenReader(ParserBase *a_pParent)
-    :m_pParser(a_pParent)
-    ,m_strFormula()
-    ,m_iPos(0)
-    ,m_iSynFlags(0)
-    ,m_bIgnoreUndefVar(false)
-    ,m_pFunDef(NULL)
-    ,m_pPostOprtDef(NULL)
-    ,m_pInfixOprtDef(NULL)
-    ,m_pOprtDef(NULL)
-    ,m_pConstDef(NULL)
-    ,m_pStrVarDef(NULL)
-    ,m_pVarDef(NULL)
-    ,m_pFactory(NULL)
-    ,m_pFactoryData(NULL)
-    ,m_vIdentFun()
-    ,m_UsedVar()
-    ,m_fZero(0)
-    ,m_iBrackets(0)
-    ,m_lastTok()
-    ,m_cArgSep(',')
-  {
+    m_vIdentFun = a_Reader.m_vIdentFun;
+    m_pFactory = a_Reader.m_pFactory;
+    m_pFactoryData = a_Reader.m_pFactoryData;
+    m_iBrackets = a_Reader.m_iBrackets;
+    m_cArgSep = a_Reader.m_cArgSep;
+    m_fZero = a_Reader.m_fZero;
+    m_lastTok = a_Reader.m_lastTok;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Constructor.
+
+    Create a Token reader and bind it to a parser object.
+
+    \pre [assert] a_pParser may not be NULL
+    \post #m_pParser==a_pParser
+    \param a_pParent Parent parser object of the token reader.
+*/
+ParserTokenReader::ParserTokenReader(ParserBase* a_pParent) :
+    m_pParser(a_pParent),
+    m_strFormula(),
+    m_iPos(0),
+    m_iSynFlags(0),
+    m_bIgnoreUndefVar(false),
+    m_pFunDef(NULL),
+    m_pPostOprtDef(NULL),
+    m_pInfixOprtDef(NULL),
+    m_pOprtDef(NULL),
+    m_pConstDef(NULL),
+    m_pStrVarDef(NULL),
+    m_pVarDef(NULL),
+    m_pFactory(NULL),
+    m_pFactoryData(NULL),
+    m_vIdentFun(),
+    m_UsedVar(),
+    m_fZero(0),
+    m_iBrackets(0),
+    m_lastTok(),
+    m_cArgSep(',')
+{
     assert(m_pParser);
     SetParent(m_pParser);
-  }
-    
-  //---------------------------------------------------------------------------
-  /** \brief Create instance of a ParserTokenReader identical with this 
-              and return its pointer. 
-
-      This is a factory method the calling function must take care of the object destruction.
-
-      \return A new ParserTokenReader object.
-      \throw nothrow
-  */
-  ParserTokenReader* ParserTokenReader::Clone(ParserBase *a_pParent) const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Create instance of a ParserTokenReader identical with this
+            and return its pointer.
+
+    This is a factory method the calling function must take care of the object destruction.
+
+    \return A new ParserTokenReader object.
+    \throw nothrow
+*/
+ParserTokenReader* ParserTokenReader::Clone(ParserBase* a_pParent) const
+{
     std::auto_ptr<ParserTokenReader> ptr(new ParserTokenReader(*this));
     ptr->SetParent(a_pParent);
     return ptr.release();
-  }
+}
 
-  //---------------------------------------------------------------------------
-  ParserTokenReader::token_type& ParserTokenReader::SaveBeforeReturn(const token_type &tok)
-  {
+//---------------------------------------------------------------------------
+ParserTokenReader::token_type& ParserTokenReader::SaveBeforeReturn(const token_type& tok)
+{
     m_lastTok = tok;
     return m_lastTok;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserTokenReader::AddValIdent(identfun_type a_pCallback)
-  {
+//---------------------------------------------------------------------------
+void ParserTokenReader::AddValIdent(identfun_type a_pCallback)
+{
     // Use push_front is used to give user defined callbacks a higher priority than
     // the built in ones. Otherwise reading hex numbers would not work
-    // since the "0" in "0xff" would always be read first making parsing of 
+    // since the "0" in "0xff" would always be read first making parsing of
     // the rest impossible.
     // reference:
     // http://sourceforge.net/projects/muparser/forums/forum/462843/topic/4824956
     m_vIdentFun.push_front(a_pCallback);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserTokenReader::SetVarCreator(facfun_type a_pFactory, void *pUserData)
-  {
+//---------------------------------------------------------------------------
+void ParserTokenReader::SetVarCreator(facfun_type a_pFactory, void* pUserData)
+{
     m_pFactory = a_pFactory;
     m_pFactoryData = pUserData;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Return the current position of the token reader in the formula string. 
+//---------------------------------------------------------------------------
+/** \brief Return the current position of the token reader in the formula string.
 
-      \return #m_iPos
-      \throw nothrow
-  */
-  int ParserTokenReader::GetPos() const
-  {
+    \return #m_iPos
+    \throw nothrow
+*/
+int ParserTokenReader::GetPos() const
+{
     return m_iPos;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Return a reference to the formula. 
+//---------------------------------------------------------------------------
+/** \brief Return a reference to the formula.
 
-      \return #m_strFormula
-      \throw nothrow
-  */
-  const string_type& ParserTokenReader::GetExpr() const
-  {
+    \return #m_strFormula
+    \throw nothrow
+*/
+const string_type& ParserTokenReader::GetExpr() const
+{
     return m_strFormula;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Return a map containing the used variables only. */
-  varmap_type& ParserTokenReader::GetUsedVar() 
-  {
+//---------------------------------------------------------------------------
+/** \brief Return a map containing the used variables only. */
+varmap_type& ParserTokenReader::GetUsedVar()
+{
     return m_UsedVar;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Initialize the token Reader. 
-  
-      Sets the formula position index to zero and set Syntax flags to default for initial formula parsing.
-      \pre [assert] triggered if a_szFormula==0
-  */
-  void ParserTokenReader::SetFormula(const string_type &a_strFormula)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Initialize the token Reader.
+
+    Sets the formula position index to zero and set Syntax flags to default for initial formula parsing.
+    \pre [assert] triggered if a_szFormula==0
+*/
+void ParserTokenReader::SetFormula(const string_type& a_strFormula)
+{
     m_strFormula = a_strFormula;
     ReInit();
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Set Flag that controls behaviour in case of undefined variables being found. 
-  
-    If true, the parser does not throw an exception if an undefined variable is found. 
-    otherwise it does. This variable is used internally only!
-    It suppresses a "undefined variable" exception in GetUsedVar().  
-    Those function should return a complete list of variables including 
-    those the are not defined by the time of it's call.
-  */
-  void ParserTokenReader::IgnoreUndefVar(bool bIgnore)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Set Flag that controls behaviour in case of undefined variables being found.
+
+  If true, the parser does not throw an exception if an undefined variable is found.
+  otherwise it does. This variable is used internally only!
+  It suppresses a "undefined variable" exception in GetUsedVar().
+  Those function should return a complete list of variables including
+  those the are not defined by the time of it's call.
+*/
+void ParserTokenReader::IgnoreUndefVar(bool bIgnore)
+{
     m_bIgnoreUndefVar = bIgnore;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Reset the token reader to the start of the formula. 
-
-      The syntax flags will be reset to a value appropriate for the 
-      start of a formula.
-      \post #m_iPos==0, #m_iSynFlags = noOPT | noBC | noPOSTOP | noSTR
-      \throw nothrow
-      \sa ESynCodes
-  */
-  void ParserTokenReader::ReInit()
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Reset the token reader to the start of the formula.
+
+    The syntax flags will be reset to a value appropriate for the
+    start of a formula.
+    \post #m_iPos==0, #m_iSynFlags = noOPT | noBC | noPOSTOP | noSTR
+    \throw nothrow
+    \sa ESynCodes
+*/
+void ParserTokenReader::ReInit()
+{
     m_iPos = 0;
     m_iSynFlags = sfSTART_OF_LINE;
     m_iBrackets = 0;
     m_UsedVar.clear();
     m_lastTok = token_type();
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Read the next token from the string. */ 
-  ParserTokenReader::token_type ParserTokenReader::ReadNextToken()
-  {
+//---------------------------------------------------------------------------
+/** \brief Read the next token from the string. */
+ParserTokenReader::token_type ParserTokenReader::ReadNextToken()
+{
     assert(m_pParser);
 
-    const char_type *szFormula = m_strFormula.c_str();
+    const char_type* szFormula = m_strFormula.c_str();
     token_type tok;
 
     // Ignore all non printable characters when reading the expression
-    while (szFormula[m_iPos]>0 && szFormula[m_iPos]<=0x20) 
-      ++m_iPos;
-
-    if ( IsEOF(tok) )        return SaveBeforeReturn(tok); // Check for end of formula
-    if ( IsOprt(tok) )       return SaveBeforeReturn(tok); // Check for user defined binary operator
-    if ( IsFunTok(tok) )     return SaveBeforeReturn(tok); // Check for function token
-    if ( IsBuiltIn(tok) )    return SaveBeforeReturn(tok); // Check built in operators / tokens
-    if ( IsArgSep(tok) )     return SaveBeforeReturn(tok); // Check for function argument separators
-    if ( IsValTok(tok) )     return SaveBeforeReturn(tok); // Check for values / constant tokens
-    if ( IsVarTok(tok) )     return SaveBeforeReturn(tok); // Check for variable tokens
-    if ( IsStrVarTok(tok) )  return SaveBeforeReturn(tok); // Check for string variables
-    if ( IsString(tok) )     return SaveBeforeReturn(tok); // Check for String tokens
-    if ( IsInfixOpTok(tok) ) return SaveBeforeReturn(tok); // Check for unary operators
-    if ( IsPostOpTok(tok) )  return SaveBeforeReturn(tok); // Check for unary operators
-
-    // Check String for undefined variable token. Done only if a 
+    while (szFormula[m_iPos] > 0 && szFormula[m_iPos] <= 0x20)
+        ++m_iPos;
+
+    if (IsEOF(tok))
+        return SaveBeforeReturn(tok); // Check for end of formula
+    if (IsOprt(tok))
+        return SaveBeforeReturn(tok); // Check for user defined binary operator
+    if (IsFunTok(tok))
+        return SaveBeforeReturn(tok); // Check for function token
+    if (IsBuiltIn(tok))
+        return SaveBeforeReturn(tok); // Check built in operators / tokens
+    if (IsArgSep(tok))
+        return SaveBeforeReturn(tok); // Check for function argument separators
+    if (IsValTok(tok))
+        return SaveBeforeReturn(tok); // Check for values / constant tokens
+    if (IsVarTok(tok))
+        return SaveBeforeReturn(tok); // Check for variable tokens
+    if (IsStrVarTok(tok))
+        return SaveBeforeReturn(tok); // Check for string variables
+    if (IsString(tok))
+        return SaveBeforeReturn(tok); // Check for String tokens
+    if (IsInfixOpTok(tok))
+        return SaveBeforeReturn(tok); // Check for unary operators
+    if (IsPostOpTok(tok))
+        return SaveBeforeReturn(tok); // Check for unary operators
+
+    // Check String for undefined variable token. Done only if a
     // flag is set indicating to ignore undefined variables.
-    // This is a way to conditionally avoid an error if 
-    // undefined variables occur. 
+    // This is a way to conditionally avoid an error if
+    // undefined variables occur.
     // (The GetUsedVar function must suppress the error for
-    // undefined variables in order to collect all variable 
+    // undefined variables in order to collect all variable
     // names including the undefined ones.)
-    if ( (m_bIgnoreUndefVar || m_pFactory) && IsUndefVarTok(tok) )  
-      return SaveBeforeReturn(tok);
+    if ((m_bIgnoreUndefVar || m_pFactory) && IsUndefVarTok(tok))
+        return SaveBeforeReturn(tok);
 
     // Check for unknown token
-    // 
+    //
     // !!! From this point on there is no exit without an exception possible...
-    // 
+    //
     string_type strTok;
     int iEnd = ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos);
-    if (iEnd!=m_iPos)
-      Error(ecUNASSIGNABLE_TOKEN, m_iPos, strTok);
+    if (iEnd != m_iPos)
+        Error(ecUNASSIGNABLE_TOKEN, m_iPos, strTok);
 
     Error(ecUNASSIGNABLE_TOKEN, m_iPos, m_strFormula.substr(m_iPos));
     return token_type(); // never reached
-  }
-
-  //---------------------------------------------------------------------------
-  void ParserTokenReader::SetParent(ParserBase *a_pParent)
-  {
-    m_pParser       = a_pParent; 
-    m_pFunDef       = &a_pParent->m_FunDef;
-    m_pOprtDef      = &a_pParent->m_OprtDef;
+}
+
+//---------------------------------------------------------------------------
+void ParserTokenReader::SetParent(ParserBase* a_pParent)
+{
+    m_pParser = a_pParent;
+    m_pFunDef = &a_pParent->m_FunDef;
+    m_pOprtDef = &a_pParent->m_OprtDef;
     m_pInfixOprtDef = &a_pParent->m_InfixOprtDef;
-    m_pPostOprtDef  = &a_pParent->m_PostOprtDef;
-    m_pVarDef       = &a_pParent->m_VarDef;
-    m_pStrVarDef    = &a_pParent->m_StrVarDef;
-    m_pConstDef     = &a_pParent->m_ConstDef;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Extract all characters that belong to a certain charset.
-
-    \param a_szCharSet [in] Const char array of the characters allowed in the token. 
-    \param a_strTok [out]  The string that consists entirely of characters listed in a_szCharSet.
-    \param a_iPos [in] Position in the string from where to start reading.
-    \return The Position of the first character not listed in a_szCharSet.
-    \throw nothrow
-  */
-  int ParserTokenReader::ExtractToken(const char_type *a_szCharSet, 
-                                      string_type &a_sTok, 
-                                      int a_iPos) const
-  {
+    m_pPostOprtDef = &a_pParent->m_PostOprtDef;
+    m_pVarDef = &a_pParent->m_VarDef;
+    m_pStrVarDef = &a_pParent->m_StrVarDef;
+    m_pConstDef = &a_pParent->m_ConstDef;
+}
+
+//---------------------------------------------------------------------------
+/** \brief Extract all characters that belong to a certain charset.
+
+  \param a_szCharSet [in] Const char array of the characters allowed in the token.
+  \param a_strTok [out]  The string that consists entirely of characters listed in a_szCharSet.
+  \param a_iPos [in] Position in the string from where to start reading.
+  \return The Position of the first character not listed in a_szCharSet.
+  \throw nothrow
+*/
+int ParserTokenReader::ExtractToken(const char_type* a_szCharSet, string_type& a_sTok, int a_iPos) const
+{
     int iEnd = (int)m_strFormula.find_first_not_of(a_szCharSet, a_iPos);
 
-    if (iEnd==(int)string_type::npos)
+    if (iEnd == (int)string_type::npos)
         iEnd = (int)m_strFormula.length();
-    
+
     // Assign token string if there was something found
-    if (a_iPos!=iEnd)
-      a_sTok = string_type( m_strFormula.begin()+a_iPos, m_strFormula.begin()+iEnd);
+    if (a_iPos != iEnd)
+        a_sTok = string_type(m_strFormula.begin() + a_iPos, m_strFormula.begin() + iEnd);
 
     return iEnd;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check Expression for the presence of a binary operator token.
-  
-    Userdefined binary operator "++" gives inconsistent parsing result for
-    the equations "a++b" and "a ++ b" if alphabetic characters are allowed
-    in operator tokens. To avoid this this function checks specifically
-    for operator tokens.
-  */
-  int ParserTokenReader::ExtractOperatorToken(string_type &a_sTok, 
-                                              int a_iPos) const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check Expression for the presence of a binary operator token.
+
+  Userdefined binary operator "++" gives inconsistent parsing result for
+  the equations "a++b" and "a ++ b" if alphabetic characters are allowed
+  in operator tokens. To avoid this this function checks specifically
+  for operator tokens.
+*/
+int ParserTokenReader::ExtractOperatorToken(string_type& a_sTok, int a_iPos) const
+{
     // Changed as per Issue 6: https://code.google.com/p/muparser/issues/detail?id=6
     int iEnd = (int)m_strFormula.find_first_not_of(m_pParser->ValidOprtChars(), a_iPos);
-    if (iEnd==(int)string_type::npos)
-      iEnd = (int)m_strFormula.length();
+    if (iEnd == (int)string_type::npos)
+        iEnd = (int)m_strFormula.length();
 
     // Assign token string if there was something found
-    if (a_iPos!=iEnd)
+    if (a_iPos != iEnd)
     {
-      a_sTok = string_type( m_strFormula.begin() + a_iPos, m_strFormula.begin() + iEnd);
-      return iEnd;
+        a_sTok = string_type(m_strFormula.begin() + a_iPos, m_strFormula.begin() + iEnd);
+        return iEnd;
     }
     else
     {
-      // There is still the chance of having to deal with an operator consisting exclusively
-      // of alphabetic characters.
-      return ExtractToken(MUP_CHARS, a_sTok, a_iPos);
+        // There is still the chance of having to deal with an operator consisting exclusively
+        // of alphabetic characters.
+        return ExtractToken(MUP_CHARS, a_sTok, a_iPos);
     }
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check if a built in operator or other token can be found
-      \param a_Tok  [out] Operator token if one is found. This can either be a binary operator or an infix operator token.
-      \return true if an operator token has been found.
-  */
-  bool ParserTokenReader::IsBuiltIn(token_type &a_Tok)
-  {
-    const char_type **const pOprtDef = m_pParser->GetOprtDef(),
-                     *const szFormula = m_strFormula.c_str();
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check if a built in operator or other token can be found
+    \param a_Tok  [out] Operator token if one is found. This can either be a binary operator or an infix operator token.
+    \return true if an operator token has been found.
+*/
+bool ParserTokenReader::IsBuiltIn(token_type& a_Tok)
+{
+    const char_type **const pOprtDef = m_pParser->GetOprtDef(), *const szFormula = m_strFormula.c_str();
 
     // Compare token with function and operator strings
     // check string for operator/function
-    for (int i=0; pOprtDef[i]; i++)
+    for (int i = 0; pOprtDef[i]; i++)
     {
-      std::size_t len( std::char_traits<char_type>::length(pOprtDef[i]) );
-      if ( string_type(pOprtDef[i]) == string_type(szFormula + m_iPos, szFormula + m_iPos + len) )
-      {
-        switch(i)
+        std::size_t len(std::char_traits<char_type>::length(pOprtDef[i]));
+        if (string_type(pOprtDef[i]) == string_type(szFormula + m_iPos, szFormula + m_iPos + len))
         {
-        //case cmAND:
-        //case cmOR:
-        //case cmXOR:
-        case cmLAND:
-        case cmLOR:
-        case cmLT:
-        case cmGT:
-        case cmLE:
-        case cmGE:
-        case cmNEQ:  
-        case cmEQ:
-        case cmADD:
-        case cmSUB:
-        case cmMUL:
-        case cmDIV:
-        case cmPOW:
-        case cmASSIGN:
-              //if (len!=sTok.length())
-              //  continue;
-
-              // The assignment operator need special treatment
-              if (i==cmASSIGN && m_iSynFlags & noASSIGN)
-                Error(ecUNEXPECTED_OPERATOR, m_iPos, pOprtDef[i]);
-
-              if (!m_pParser->HasBuiltInOprt()) continue;
-              if (m_iSynFlags & noOPT) 
-              {
-                // Maybe its an infix operator not an operator
-                // Both operator types can share characters in 
-                // their identifiers
-                if ( IsInfixOpTok(a_Tok) ) 
-                  return true;
-
-                Error(ecUNEXPECTED_OPERATOR, m_iPos, pOprtDef[i]);
-              }
-
-              m_iSynFlags  = noBC | noOPT | noARG_SEP | noPOSTOP | noASSIGN | noIF | noELSE | noEND;
-              break;
-
-		    case cmBO:
-              if (m_iSynFlags & noBO)
-	              Error(ecUNEXPECTED_PARENS, m_iPos, pOprtDef[i]);
-              
-              if (m_lastTok.GetCode()==cmFUNC)
-                m_iSynFlags = noOPT | noEND | noARG_SEP | noPOSTOP | noASSIGN | noIF | noELSE;
-              else
-                m_iSynFlags = noBC | noOPT | noEND | noARG_SEP | noPOSTOP | noASSIGN| noIF | noELSE;
-
-              ++m_iBrackets;
-              break;
-
-		    case cmBC:
-              if (m_iSynFlags & noBC)
-                Error(ecUNEXPECTED_PARENS, m_iPos, pOprtDef[i]);
-
-              m_iSynFlags  = noBO | noVAR | noVAL | noFUN | noINFIXOP | noSTR | noASSIGN;
-
-              if (--m_iBrackets<0)
-                Error(ecUNEXPECTED_PARENS, m_iPos, pOprtDef[i]);
-              break;
-
-        case cmELSE:
-              if (m_iSynFlags & noELSE)
-                Error(ecUNEXPECTED_CONDITIONAL, m_iPos, pOprtDef[i]);
-
-              m_iSynFlags = noBC | noPOSTOP | noEND | noOPT | noIF | noELSE;
-              break;
-
-        case cmIF:
-              if (m_iSynFlags & noIF)
-                Error(ecUNEXPECTED_CONDITIONAL, m_iPos, pOprtDef[i]);
-
-              m_iSynFlags = noBC | noPOSTOP | noEND | noOPT | noIF | noELSE;
-              break;
-
-		    default:      // The operator is listed in c_DefaultOprt, but not here. This is a bad thing...
-              Error(ecINTERNAL_ERROR);
-        } // switch operator id
-
-        m_iPos += (int)len;
-        a_Tok.Set( (ECmdCode)i, pOprtDef[i] );
-        return true;
-	    } // if operator string found
-    } // end of for all operator strings
-  
+            switch (i)
+            {
+                // case cmAND:
+                // case cmOR:
+                // case cmXOR:
+                case cmLAND:
+                case cmLOR:
+                case cmLT:
+                case cmGT:
+                case cmLE:
+                case cmGE:
+                case cmNEQ:
+                case cmEQ:
+                case cmADD:
+                case cmSUB:
+                case cmMUL:
+                case cmDIV:
+                case cmPOW:
+                case cmASSIGN:
+                    // if (len!=sTok.length())
+                    //  continue;
+
+                    // The assignment operator need special treatment
+                    if (i == cmASSIGN && m_iSynFlags & noASSIGN)
+                        Error(ecUNEXPECTED_OPERATOR, m_iPos, pOprtDef[i]);
+
+                    if (!m_pParser->HasBuiltInOprt())
+                        continue;
+                    if (m_iSynFlags & noOPT)
+                    {
+                        // Maybe its an infix operator not an operator
+                        // Both operator types can share characters in
+                        // their identifiers
+                        if (IsInfixOpTok(a_Tok))
+                            return true;
+
+                        Error(ecUNEXPECTED_OPERATOR, m_iPos, pOprtDef[i]);
+                    }
+
+                    m_iSynFlags = noBC | noOPT | noARG_SEP | noPOSTOP | noASSIGN | noIF | noELSE | noEND;
+                    break;
+
+                case cmBO:
+                    if (m_iSynFlags & noBO)
+                        Error(ecUNEXPECTED_PARENS, m_iPos, pOprtDef[i]);
+
+                    if (m_lastTok.GetCode() == cmFUNC)
+                        m_iSynFlags = noOPT | noEND | noARG_SEP | noPOSTOP | noASSIGN | noIF | noELSE;
+                    else
+                        m_iSynFlags = noBC | noOPT | noEND | noARG_SEP | noPOSTOP | noASSIGN | noIF | noELSE;
+
+                    ++m_iBrackets;
+                    break;
+
+                case cmBC:
+                    if (m_iSynFlags & noBC)
+                        Error(ecUNEXPECTED_PARENS, m_iPos, pOprtDef[i]);
+
+                    m_iSynFlags = noBO | noVAR | noVAL | noFUN | noINFIXOP | noSTR | noASSIGN;
+
+                    if (--m_iBrackets < 0)
+                        Error(ecUNEXPECTED_PARENS, m_iPos, pOprtDef[i]);
+                    break;
+
+                case cmELSE:
+                    if (m_iSynFlags & noELSE)
+                        Error(ecUNEXPECTED_CONDITIONAL, m_iPos, pOprtDef[i]);
+
+                    m_iSynFlags = noBC | noPOSTOP | noEND | noOPT | noIF | noELSE;
+                    break;
+
+                case cmIF:
+                    if (m_iSynFlags & noIF)
+                        Error(ecUNEXPECTED_CONDITIONAL, m_iPos, pOprtDef[i]);
+
+                    m_iSynFlags = noBC | noPOSTOP | noEND | noOPT | noIF | noELSE;
+                    break;
+
+                default: // The operator is listed in c_DefaultOprt, but not here. This is a bad thing...
+                    Error(ecINTERNAL_ERROR);
+            } // switch operator id
+
+            m_iPos += (int)len;
+            a_Tok.Set((ECmdCode)i, pOprtDef[i]);
+            return true;
+        } // if operator string found
+    }     // end of for all operator strings
+
     return false;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  bool ParserTokenReader::IsArgSep(token_type &a_Tok)
-  {
+//---------------------------------------------------------------------------
+bool ParserTokenReader::IsArgSep(token_type& a_Tok)
+{
     const char_type* szFormula = m_strFormula.c_str();
 
-    if (szFormula[m_iPos]==m_cArgSep)
+    if (szFormula[m_iPos] == m_cArgSep)
     {
-      // copy the separator into null terminated string
-      char_type szSep[2];
-      szSep[0] = m_cArgSep;
-      szSep[1] = 0;
-
-      if (m_iSynFlags & noARG_SEP)
-        Error(ecUNEXPECTED_ARG_SEP, m_iPos, szSep);
-
-      m_iSynFlags  = noBC | noOPT | noEND | noARG_SEP | noPOSTOP | noASSIGN;
-      m_iPos++;
-      a_Tok.Set(cmARG_SEP, szSep);
-      return true;
+        // copy the separator into null terminated string
+        char_type szSep[2];
+        szSep[0] = m_cArgSep;
+        szSep[1] = 0;
+
+        if (m_iSynFlags & noARG_SEP)
+            Error(ecUNEXPECTED_ARG_SEP, m_iPos, szSep);
+
+        m_iSynFlags = noBC | noOPT | noEND | noARG_SEP | noPOSTOP | noASSIGN;
+        m_iPos++;
+        a_Tok.Set(cmARG_SEP, szSep);
+        return true;
     }
 
     return false;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check for End of Formula.
-
-      \return true if an end of formula is found false otherwise.
-      \param a_Tok [out] If an eof is found the corresponding token will be stored there.
-      \throw nothrow
-      \sa IsOprt, IsFunTok, IsStrFunTok, IsValTok, IsVarTok, IsString, IsInfixOpTok, IsPostOpTok
-  */
-  bool ParserTokenReader::IsEOF(token_type &a_Tok)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check for End of Formula.
+
+    \return true if an end of formula is found false otherwise.
+    \param a_Tok [out] If an eof is found the corresponding token will be stored there.
+    \throw nothrow
+    \sa IsOprt, IsFunTok, IsStrFunTok, IsValTok, IsVarTok, IsString, IsInfixOpTok, IsPostOpTok
+*/
+bool ParserTokenReader::IsEOF(token_type& a_Tok)
+{
     const char_type* szFormula = m_strFormula.c_str();
 
     // check for EOF
-    if ( !szFormula[m_iPos] /*|| szFormula[m_iPos] == '\n'*/)
+    if (!szFormula[m_iPos] /*|| szFormula[m_iPos] == '\n'*/)
     {
-      if ( m_iSynFlags & noEND )
-        Error(ecUNEXPECTED_EOF, m_iPos);
+        if (m_iSynFlags & noEND)
+            Error(ecUNEXPECTED_EOF, m_iPos);
 
-      if (m_iBrackets>0)
-        Error(ecMISSING_PARENS, m_iPos, _T(")"));
+        if (m_iBrackets > 0)
+            Error(ecMISSING_PARENS, m_iPos, _T(")"));
 
-      m_iSynFlags = 0;
-      a_Tok.Set(cmEND);
-      return true;
+        m_iSynFlags = 0;
+        a_Tok.Set(cmEND);
+        return true;
     }
 
     return false;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check if a string position contains a unary infix operator. 
-      \return true if a function token has been found false otherwise.
-  */
-  bool ParserTokenReader::IsInfixOpTok(token_type &a_Tok)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check if a string position contains a unary infix operator.
+    \return true if a function token has been found false otherwise.
+*/
+bool ParserTokenReader::IsInfixOpTok(token_type& a_Tok)
+{
     string_type sTok;
     int iEnd = ExtractToken(m_pParser->ValidInfixOprtChars(), sTok, m_iPos);
-    if (iEnd==m_iPos)
-      return false;
+    if (iEnd == m_iPos)
+        return false;
 
     // iterate over all postfix operator strings
     funmap_type::const_reverse_iterator it = m_pInfixOprtDef->rbegin();
-    for ( ; it!=m_pInfixOprtDef->rend(); ++it)
+    for (; it != m_pInfixOprtDef->rend(); ++it)
     {
-      if (sTok.find(it->first)!=0)
-        continue;
+        if (sTok.find(it->first) != 0)
+            continue;
 
-      a_Tok.Set(it->second, it->first);
-      m_iPos += (int)it->first.length();
+        a_Tok.Set(it->second, it->first);
+        m_iPos += (int)it->first.length();
 
-      if (m_iSynFlags & noINFIXOP) 
-        Error(ecUNEXPECTED_OPERATOR, m_iPos, a_Tok.GetAsString());
+        if (m_iSynFlags & noINFIXOP)
+            Error(ecUNEXPECTED_OPERATOR, m_iPos, a_Tok.GetAsString());
 
-      m_iSynFlags = noPOSTOP | noINFIXOP | noOPT | noBC | noSTR | noASSIGN;
-      return true;
+        m_iSynFlags = noPOSTOP | noINFIXOP | noOPT | noBC | noSTR | noASSIGN;
+        return true;
     }
 
     return false;
 
-/*
-    a_Tok.Set(item->second, sTok);
-    m_iPos = (int)iEnd;
+    /*
+        a_Tok.Set(item->second, sTok);
+        m_iPos = (int)iEnd;
 
-    if (m_iSynFlags & noINFIXOP) 
-      Error(ecUNEXPECTED_OPERATOR, m_iPos, a_Tok.GetAsString());
+        if (m_iSynFlags & noINFIXOP)
+          Error(ecUNEXPECTED_OPERATOR, m_iPos, a_Tok.GetAsString());
 
-    m_iSynFlags = noPOSTOP | noINFIXOP | noOPT | noBC | noSTR | noASSIGN; 
-    return true;
+        m_iSynFlags = noPOSTOP | noINFIXOP | noOPT | noBC | noSTR | noASSIGN;
+        return true;
+    */
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check whether the token at a given position is a function token.
+    \param a_Tok [out] If a value token is found it will be placed here.
+    \throw ParserException if Syntaxflags do not allow a function at a_iPos
+    \return true if a function token has been found false otherwise.
+    \pre [assert] m_pParser!=0
 */
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check whether the token at a given position is a function token.
-      \param a_Tok [out] If a value token is found it will be placed here.
-      \throw ParserException if Syntaxflags do not allow a function at a_iPos
-      \return true if a function token has been found false otherwise.
-      \pre [assert] m_pParser!=0
-  */
-  bool ParserTokenReader::IsFunTok(token_type &a_Tok)
-  {
+bool ParserTokenReader::IsFunTok(token_type& a_Tok)
+{
     string_type strTok;
     int iEnd = ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos);
-    if (iEnd==m_iPos)
-      return false;
+    if (iEnd == m_iPos)
+        return false;
 
     funmap_type::const_iterator item = m_pFunDef->find(strTok);
-    if (item==m_pFunDef->end())
-      return false;
+    if (item == m_pFunDef->end())
+        return false;
 
     // Check if the next sign is an opening bracket
-    const char_type *szFormula = m_strFormula.c_str();
-    if (szFormula[iEnd]!='(')
-      return false;
+    const char_type* szFormula = m_strFormula.c_str();
+    if (szFormula[iEnd] != '(')
+        return false;
 
     a_Tok.Set(item->second, strTok);
 
     m_iPos = (int)iEnd;
     if (m_iSynFlags & noFUN)
-      Error(ecUNEXPECTED_FUN, m_iPos-(int)a_Tok.GetAsString().length(), a_Tok.GetAsString());
+        Error(ecUNEXPECTED_FUN, m_iPos - (int)a_Tok.GetAsString().length(), a_Tok.GetAsString());
 
     m_iSynFlags = noANY ^ noBO;
     return true;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check if a string position contains a binary operator.
-      \param a_Tok  [out] Operator token if one is found. This can either be a binary operator or an infix operator token.
-      \return true if an operator token has been found.
-  */
-  bool ParserTokenReader::IsOprt(token_type &a_Tok)
-  {
-    const char_type *const szExpr = m_strFormula.c_str();
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check if a string position contains a binary operator.
+    \param a_Tok  [out] Operator token if one is found. This can either be a binary operator or an infix operator token.
+    \return true if an operator token has been found.
+*/
+bool ParserTokenReader::IsOprt(token_type& a_Tok)
+{
+    const char_type* const szExpr = m_strFormula.c_str();
     string_type strTok;
 
     int iEnd = ExtractOperatorToken(strTok, m_iPos);
-    if (iEnd==m_iPos)
-      return false;
+    if (iEnd == m_iPos)
+        return false;
 
     // Check if the operator is a built in operator, if so ignore it here
-    const char_type **const pOprtDef = m_pParser->GetOprtDef();
-    for (int i=0; m_pParser->HasBuiltInOprt() && pOprtDef[i]; ++i)
+    const char_type** const pOprtDef = m_pParser->GetOprtDef();
+    for (int i = 0; m_pParser->HasBuiltInOprt() && pOprtDef[i]; ++i)
     {
-      if (string_type(pOprtDef[i])==strTok)
-        return false;
+        if (string_type(pOprtDef[i]) == strTok)
+            return false;
     }
 
     // Note:
     // All tokens in oprt_bin_maptype are have been sorted by their length
     // Long operators must come first! Otherwise short names (like: "add") that
-    // are part of long token names (like: "add123") will be found instead 
+    // are part of long token names (like: "add123") will be found instead
     // of the long ones.
     // Length sorting is done with ascending length so we use a reverse iterator here.
     funmap_type::const_reverse_iterator it = m_pOprtDef->rbegin();
-    for ( ; it!=m_pOprtDef->rend(); ++it)
+    for (; it != m_pOprtDef->rend(); ++it)
     {
-      const string_type &sID = it->first;
-      if ( sID == string_type(szExpr + m_iPos, szExpr + m_iPos + sID.length()) )
-      {
-        a_Tok.Set(it->second, strTok);
-
-        // operator was found
-        if (m_iSynFlags & noOPT) 
+        const string_type& sID = it->first;
+        if (sID == string_type(szExpr + m_iPos, szExpr + m_iPos + sID.length()))
         {
-          // An operator was found but is not expected to occur at
-          // this position of the formula, maybe it is an infix 
-          // operator, not a binary operator. Both operator types
-          // can share characters in their identifiers.
-          if ( IsInfixOpTok(a_Tok) ) 
+            a_Tok.Set(it->second, strTok);
+
+            // operator was found
+            if (m_iSynFlags & noOPT)
+            {
+                // An operator was found but is not expected to occur at
+                // this position of the formula, maybe it is an infix
+                // operator, not a binary operator. Both operator types
+                // can share characters in their identifiers.
+                if (IsInfixOpTok(a_Tok))
+                    return true;
+                else
+                {
+                    // nope, no infix operator
+                    return false;
+                    // Error(ecUNEXPECTED_OPERATOR, m_iPos, a_Tok.GetAsString());
+                }
+            }
+
+            m_iPos += (int)sID.length();
+            m_iSynFlags = noBC | noOPT | noARG_SEP | noPOSTOP | noEND | noASSIGN;
             return true;
-          else
-          {
-            // nope, no infix operator
-            return false;
-            //Error(ecUNEXPECTED_OPERATOR, m_iPos, a_Tok.GetAsString()); 
-          }
-
         }
-
-        m_iPos += (int)sID.length();
-        m_iSynFlags  = noBC | noOPT | noARG_SEP | noPOSTOP | noEND | noASSIGN;
-        return true;
-      }
     }
 
     return false;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Check if a string position contains a unary post value operator. */
-  bool ParserTokenReader::IsPostOpTok(token_type &a_Tok)
-  {
+//---------------------------------------------------------------------------
+/** \brief Check if a string position contains a unary post value operator. */
+bool ParserTokenReader::IsPostOpTok(token_type& a_Tok)
+{
     // <ibg 20110629> Do not check for postfix operators if they are not allowed at
     //                the current expression index.
     //
-    //  This will fix the bug reported here:  
+    //  This will fix the bug reported here:
     //
     //  http://sourceforge.net/tracker/index.php?func=detail&aid=3343891&group_id=137191&atid=737979
     //
     if (m_iSynFlags & noPOSTOP)
-      return false;
+        return false;
     // </ibg>
 
     // Tricky problem with equations like "3m+5":
-    //     m is a postfix operator, + is a valid sign for postfix operators and 
-    //     for binary operators parser detects "m+" as operator string and 
+    //     m is a postfix operator, + is a valid sign for postfix operators and
+    //     for binary operators parser detects "m+" as operator string and
     //     finds no matching postfix operator.
-    // 
+    //
     // This is a special case so this routine slightly differs from the other
     // token readers.
-    
+
     // Test if there could be a postfix operator
     string_type sTok;
     int iEnd = ExtractToken(m_pParser->ValidOprtChars(), sTok, m_iPos);
-    if (iEnd==m_iPos)
-      return false;
+    if (iEnd == m_iPos)
+        return false;
 
     // iterate over all postfix operator strings
     funmap_type::const_reverse_iterator it = m_pPostOprtDef->rbegin();
-    for ( ; it!=m_pPostOprtDef->rend(); ++it)
+    for (; it != m_pPostOprtDef->rend(); ++it)
     {
-      if (sTok.find(it->first)!=0)
-        continue;
+        if (sTok.find(it->first) != 0)
+            continue;
 
-      a_Tok.Set(it->second, sTok);
-  	  m_iPos += (int)it->first.length();
+        a_Tok.Set(it->second, sTok);
+        m_iPos += (int)it->first.length();
 
-      m_iSynFlags = noVAL | noVAR | noFUN | noBO | noPOSTOP | noSTR | noASSIGN;
-      return true;
+        m_iSynFlags = noVAL | noVAR | noFUN | noBO | noPOSTOP | noSTR | noASSIGN;
+        return true;
     }
 
     return false;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Check whether the token at a given position is a value token.
+//---------------------------------------------------------------------------
+/** \brief Check whether the token at a given position is a value token.
 
-    Value tokens are either values or constants.
+  Value tokens are either values or constants.
 
-    \param a_Tok [out] If a value token is found it will be placed here.
-    \return true if a value token has been found.
-  */
-  bool ParserTokenReader::IsValTok(token_type &a_Tok)
-  {
+  \param a_Tok [out] If a value token is found it will be placed here.
+  \return true if a value token has been found.
+*/
+bool ParserTokenReader::IsValTok(token_type& a_Tok)
+{
     assert(m_pConstDef);
     assert(m_pParser);
 
     string_type strTok;
     value_type fVal(0);
     int iEnd(0);
-    
+
     // 2.) Check for user defined constant
     // Read everything that could be a constant name
     iEnd = ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos);
-    if (iEnd!=m_iPos)
+    if (iEnd != m_iPos)
     {
-      valmap_type::const_iterator item = m_pConstDef->find(strTok);
-      if (item!=m_pConstDef->end())
-      {
-        m_iPos = iEnd;
-        a_Tok.SetVal(item->second, strTok);
+        valmap_type::const_iterator item = m_pConstDef->find(strTok);
+        if (item != m_pConstDef->end())
+        {
+            m_iPos = iEnd;
+            a_Tok.SetVal(item->second, strTok);
 
-        if (m_iSynFlags & noVAL)
-          Error(ecUNEXPECTED_VAL, m_iPos - (int)strTok.length(), strTok);
+            if (m_iSynFlags & noVAL)
+                Error(ecUNEXPECTED_VAL, m_iPos - (int)strTok.length(), strTok);
 
-        m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR | noASSIGN; 
-        return true;
-      }
+            m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR | noASSIGN;
+            return true;
+        }
     }
 
     // 3.call the value recognition functions provided by the user
     // Call user defined value recognition functions
     std::list<identfun_type>::const_iterator item = m_vIdentFun.begin();
-    for (item = m_vIdentFun.begin(); item!=m_vIdentFun.end(); ++item)
+    for (item = m_vIdentFun.begin(); item != m_vIdentFun.end(); ++item)
     {
-      int iStart = m_iPos;
-      if ( (*item)(m_strFormula.c_str() + m_iPos, &m_iPos, &fVal)==1 )
-      {
-        // 2013-11-27 Issue 2:  https://code.google.com/p/muparser/issues/detail?id=2
-        strTok.assign(m_strFormula.c_str(), iStart, m_iPos-iStart);
+        int iStart = m_iPos;
+        if ((*item)(m_strFormula.c_str() + m_iPos, &m_iPos, &fVal) == 1)
+        {
+            // 2013-11-27 Issue 2:  https://code.google.com/p/muparser/issues/detail?id=2
+            strTok.assign(m_strFormula.c_str(), iStart, m_iPos - iStart);
 
-        if (m_iSynFlags & noVAL)
-          Error(ecUNEXPECTED_VAL, m_iPos - (int)strTok.length(), strTok);
+            if (m_iSynFlags & noVAL)
+                Error(ecUNEXPECTED_VAL, m_iPos - (int)strTok.length(), strTok);
 
-        a_Tok.SetVal(fVal, strTok);
-        m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR | noASSIGN;
-        return true;
-      }
+            a_Tok.SetVal(fVal, strTok);
+            m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR | noASSIGN;
+            return true;
+        }
     }
 
     return false;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Check wheter a token at a given position is a variable token. 
-      \param a_Tok [out] If a variable token has been found it will be placed here.
-	    \return true if a variable token has been found.
-  */
-  bool ParserTokenReader::IsVarTok(token_type &a_Tok)
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check wheter a token at a given position is a variable token.
+    \param a_Tok [out] If a variable token has been found it will be placed here.
+          \return true if a variable token has been found.
+*/
+bool ParserTokenReader::IsVarTok(token_type& a_Tok)
+{
     if (m_pVarDef->empty())
-      return false;
+        return false;
 
     string_type strTok;
     int iEnd = ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos);
-    if (iEnd==m_iPos)
-      return false;
+    if (iEnd == m_iPos)
+        return false;
 
-    varmap_type::const_iterator item =  m_pVarDef->find(strTok);
-    if (item==m_pVarDef->end())
-      return false;
+    varmap_type::const_iterator item = m_pVarDef->find(strTok);
+    if (item == m_pVarDef->end())
+        return false;
 
     if (m_iSynFlags & noVAR)
-      Error(ecUNEXPECTED_VAR, m_iPos, strTok);
+        Error(ecUNEXPECTED_VAR, m_iPos, strTok);
 
     m_pParser->OnDetectVar(&m_strFormula, m_iPos, iEnd);
 
     m_iPos = iEnd;
     a_Tok.SetVar(item->second, strTok);
-    m_UsedVar[item->first] = item->second;  // Add variable to used-var-list
+    m_UsedVar[item->first] = item->second; // Add variable to used-var-list
 
     m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR;
 
-//  Zur Info hier die SynFlags von IsVal():
-//    m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR | noASSIGN; 
+    //  Zur Info hier die SynFlags von IsVal():
+    //    m_iSynFlags = noVAL | noVAR | noFUN | noBO | noINFIXOP | noSTR | noASSIGN;
     return true;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  bool ParserTokenReader::IsStrVarTok(token_type &a_Tok)
-  {
+//---------------------------------------------------------------------------
+bool ParserTokenReader::IsStrVarTok(token_type& a_Tok)
+{
     if (!m_pStrVarDef || m_pStrVarDef->empty())
-      return false;
+        return false;
 
     string_type strTok;
     int iEnd = ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos);
-    if (iEnd==m_iPos)
-      return false;
+    if (iEnd == m_iPos)
+        return false;
 
-    strmap_type::const_iterator item =  m_pStrVarDef->find(strTok);
-    if (item==m_pStrVarDef->end())
-      return false;
+    strmap_type::const_iterator item = m_pStrVarDef->find(strTok);
+    if (item == m_pStrVarDef->end())
+        return false;
 
     if (m_iSynFlags & noSTR)
-      Error(ecUNEXPECTED_VAR, m_iPos, strTok);
+        Error(ecUNEXPECTED_VAR, m_iPos, strTok);
 
     m_iPos = iEnd;
     if (!m_pParser->m_vStringVarBuf.size())
-      Error(ecINTERNAL_ERROR);
+        Error(ecINTERNAL_ERROR);
 
-    a_Tok.SetString(m_pParser->m_vStringVarBuf[item->second], m_pParser->m_vStringVarBuf.size() );
+    a_Tok.SetString(m_pParser->m_vStringVarBuf[item->second], m_pParser->m_vStringVarBuf.size());
 
-    m_iSynFlags = noANY ^ ( noBC | noOPT | noEND | noARG_SEP);
+    m_iSynFlags = noANY ^ (noBC | noOPT | noEND | noARG_SEP);
     return true;
-  }
-
+}
 
-  //---------------------------------------------------------------------------
-  /** \brief Check wheter a token at a given position is an undefined variable. 
+//---------------------------------------------------------------------------
+/** \brief Check wheter a token at a given position is an undefined variable.
 
-      \param a_Tok [out] If a variable tom_pParser->m_vStringBufken has been found it will be placed here.
-	    \return true if a variable token has been found.
-      \throw nothrow
-  */
-  bool ParserTokenReader::IsUndefVarTok(token_type &a_Tok)
-  {
+    \param a_Tok [out] If a variable tom_pParser->m_vStringBufken has been found it will be placed here.
+          \return true if a variable token has been found.
+    \throw nothrow
+*/
+bool ParserTokenReader::IsUndefVarTok(token_type& a_Tok)
+{
     string_type strTok;
-    int iEnd( ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos) );
-    if ( iEnd==m_iPos )
-      return false;
+    int iEnd(ExtractToken(m_pParser->ValidNameChars(), strTok, m_iPos));
+    if (iEnd == m_iPos)
+        return false;
 
     if (m_iSynFlags & noVAR)
     {
-      // <ibg/> 20061021 added token string strTok instead of a_Tok.GetAsString() as the 
-      //                 token identifier. 
-      // related bug report:
-      // http://sourceforge.net/tracker/index.php?func=detail&aid=1578779&group_id=137191&atid=737979
-      Error(ecUNEXPECTED_VAR, m_iPos - (int)a_Tok.GetAsString().length(), strTok);
+        // <ibg/> 20061021 added token string strTok instead of a_Tok.GetAsString() as the
+        //                 token identifier.
+        // related bug report:
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1578779&group_id=137191&atid=737979
+        Error(ecUNEXPECTED_VAR, m_iPos - (int)a_Tok.GetAsString().length(), strTok);
     }
 
     // If a factory is available implicitely create new variables
     if (m_pFactory)
     {
-      value_type *fVar = m_pFactory(strTok.c_str(), m_pFactoryData);
-      a_Tok.SetVar(fVar, strTok );
-
-      // Do not use m_pParser->DefineVar( strTok, fVar );
-      // in order to define the new variable, it will clear the
-      // m_UsedVar array which will kill previously defined variables
-      // from the list
-      // This is safe because the new variable can never override an existing one
-      // because they are checked first!
-      (*m_pVarDef)[strTok] = fVar;
-      m_UsedVar[strTok] = fVar;  // Add variable to used-var-list
+        value_type* fVar = m_pFactory(strTok.c_str(), m_pFactoryData);
+        a_Tok.SetVar(fVar, strTok);
+
+        // Do not use m_pParser->DefineVar( strTok, fVar );
+        // in order to define the new variable, it will clear the
+        // m_UsedVar array which will kill previously defined variables
+        // from the list
+        // This is safe because the new variable can never override an existing one
+        // because they are checked first!
+        (*m_pVarDef)[strTok] = fVar;
+        m_UsedVar[strTok] = fVar; // Add variable to used-var-list
     }
     else
     {
-      a_Tok.SetVar((value_type*)&m_fZero, strTok);
-      m_UsedVar[strTok] = 0;  // Add variable to used-var-list
+        a_Tok.SetVar((value_type*)&m_fZero, strTok);
+        m_UsedVar[strTok] = 0; // Add variable to used-var-list
     }
 
     m_iPos = iEnd;
@@ -883,76 +887,74 @@ namespace mu
     // Call the variable factory in order to let it define a new parser variable
     m_iSynFlags = noVAL | noVAR | noFUN | noBO | noPOSTOP | noINFIXOP | noSTR;
     return true;
-  }
-
-
-  //---------------------------------------------------------------------------
-  /** \brief Check wheter a token at a given position is a string.
-      \param a_Tok [out] If a variable token has been found it will be placed here.
-  	  \return true if a string token has been found.
-      \sa IsOprt, IsFunTok, IsStrFunTok, IsValTok, IsVarTok, IsEOF, IsInfixOpTok, IsPostOpTok
-      \throw nothrow
-  */
-  bool ParserTokenReader::IsString(token_type &a_Tok)
-  {
-    if (m_strFormula[m_iPos]!='"') 
-      return false;
-
-    string_type strBuf(&m_strFormula[m_iPos+1]);
+}
+
+//---------------------------------------------------------------------------
+/** \brief Check wheter a token at a given position is a string.
+    \param a_Tok [out] If a variable token has been found it will be placed here.
+        \return true if a string token has been found.
+    \sa IsOprt, IsFunTok, IsStrFunTok, IsValTok, IsVarTok, IsEOF, IsInfixOpTok, IsPostOpTok
+    \throw nothrow
+*/
+bool ParserTokenReader::IsString(token_type& a_Tok)
+{
+    if (m_strFormula[m_iPos] != '"')
+        return false;
+
+    string_type strBuf(&m_strFormula[m_iPos + 1]);
     std::size_t iEnd(0), iSkip(0);
 
     // parser over escaped '\"' end replace them with '"'
-    for(iEnd=(int)strBuf.find( _T("\"") ); iEnd!=0 && iEnd!=string_type::npos; iEnd=(int)strBuf.find( _T("\""), iEnd))
+    for (iEnd = (int)strBuf.find(_T("\"")); iEnd != 0 && iEnd != string_type::npos;
+         iEnd = (int)strBuf.find(_T("\""), iEnd))
     {
-      if (strBuf[iEnd-1]!='\\') break;
-      strBuf.replace(iEnd-1, 2, _T("\"") );
-      iSkip++;
+        if (strBuf[iEnd - 1] != '\\')
+            break;
+        strBuf.replace(iEnd - 1, 2, _T("\""));
+        iSkip++;
     }
 
-    if (iEnd==string_type::npos)
-      Error(ecUNTERMINATED_STRING, m_iPos, _T("\"") );
+    if (iEnd == string_type::npos)
+        Error(ecUNTERMINATED_STRING, m_iPos, _T("\""));
 
-    string_type strTok(strBuf.begin(), strBuf.begin()+iEnd);
+    string_type strTok(strBuf.begin(), strBuf.begin() + iEnd);
 
     if (m_iSynFlags & noSTR)
-      Error(ecUNEXPECTED_STR, m_iPos, strTok);
+        Error(ecUNEXPECTED_STR, m_iPos, strTok);
 
-		m_pParser->m_vStringBuf.push_back(strTok); // Store string in internal buffer
+    m_pParser->m_vStringBuf.push_back(strTok); // Store string in internal buffer
     a_Tok.SetString(strTok, m_pParser->m_vStringBuf.size());
 
-    m_iPos += (int)strTok.length() + 2 + (int)iSkip;  // +2 wg Anführungszeichen; +iSkip für entfernte escape zeichen
-    m_iSynFlags = noANY ^ ( noARG_SEP | noBC | noOPT | noEND );
+    m_iPos += (int)strTok.length() + 2 + (int)iSkip; // +2 wg Anführungszeichen; +iSkip für entfernte escape zeichen
+    m_iSynFlags = noANY ^ (noARG_SEP | noBC | noOPT | noEND);
 
     return true;
-  }
-
-  //---------------------------------------------------------------------------
-  /** \brief Create an error containing the parse error position.
-
-    This function will create an Parser Exception object containing the error text and its position.
-
-    \param a_iErrc [in] The error code of type #EErrorCodes.
-    \param a_iPos [in] The position where the error was detected.
-    \param a_strTok [in] The token string representation associated with the error.
-    \throw ParserException always throws thats the only purpose of this function.
-  */
-  void  ParserTokenReader::Error( EErrorCodes a_iErrc, 
-                                  int a_iPos, 
-                                  const string_type &a_sTok) const
-  {
+}
+
+//---------------------------------------------------------------------------
+/** \brief Create an error containing the parse error position.
+
+  This function will create an Parser Exception object containing the error text and its position.
+
+  \param a_iErrc [in] The error code of type #EErrorCodes.
+  \param a_iPos [in] The position where the error was detected.
+  \param a_strTok [in] The token string representation associated with the error.
+  \throw ParserException always throws thats the only purpose of this function.
+*/
+void ParserTokenReader::Error(EErrorCodes a_iErrc, int a_iPos, const string_type& a_sTok) const
+{
     m_pParser->Error(a_iErrc, a_iPos, a_sTok);
-  }
+}
 
-  //---------------------------------------------------------------------------
-  void ParserTokenReader::SetArgSep(char_type cArgSep)
-  {
+//---------------------------------------------------------------------------
+void ParserTokenReader::SetArgSep(char_type cArgSep)
+{
     m_cArgSep = cArgSep;
-  }
+}
 
-  //---------------------------------------------------------------------------
-  char_type ParserTokenReader::GetArgSep() const
-  {
+//---------------------------------------------------------------------------
+char_type ParserTokenReader::GetArgSep() const
+{
     return m_cArgSep;
-  }
+}
 } // namespace mu
-
diff --git a/ext_libs/muparser/muParserTokenReader.h b/ext_libs/muparser/muParserTokenReader.h
old mode 100755
new mode 100644
index 9d96225d..5ac4e598
--- a/ext_libs/muparser/muParserTokenReader.h
+++ b/ext_libs/muparser/muParserTokenReader.h
@@ -1,26 +1,26 @@
 /*
-                 __________                                      
-    _____   __ __\______   \_____  _______  ______  ____ _______ 
+                 __________
+    _____   __ __\______   \_____  _______  ______  ____ _______
    /     \ |  |  \|     ___/\__  \ \_  __ \/  ___/_/ __ \\_  __ \
   |  Y Y  \|  |  /|    |     / __ \_|  | \/\___ \ \  ___/ |  | \/
-  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|   
-        \/                       \/            \/      \/        
+  |__|_|  /|____/ |____|    (____  /|__|  /____  > \___  >|__|
+        \/                       \/            \/      \/
   Copyright (C) 2004-2013 Ingo Berg
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy of this 
+  Permission is hereby granted, free of charge, to any person obtaining a copy of this
   software and associated documentation files (the "Software"), to deal in the Software
-  without restriction, including without limitation the rights to use, copy, modify, 
-  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
+  without restriction, including without limitation the rights to use, copy, modify,
+  merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
   permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The above copyright notice and this permission notice shall be included in all copies or 
+  The above copyright notice and this permission notice shall be included in all copies or
   substantial portions of the Software.
 
   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
-  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
+  NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #ifndef MU_PARSER_TOKEN_READER_H
@@ -42,120 +42,110 @@
     \brief This file contains the parser token reader definition.
 */
 
-
 namespace mu
 {
-  // Forward declaration
-  class ParserBase;
-
-  /** \brief Token reader for the ParserBase class.
-
-  */
-  class ParserTokenReader 
-  {
-  private:
-
-      typedef ParserToken<value_type, string_type> token_type;
-
-  public:
-
-      ParserTokenReader(ParserBase *a_pParent);
-      ParserTokenReader* Clone(ParserBase *a_pParent) const;
-
-      void AddValIdent(identfun_type a_pCallback);
-      void SetVarCreator(facfun_type a_pFactory, void *pUserData);
-      void SetFormula(const string_type &a_strFormula);
-      void SetArgSep(char_type cArgSep);
-
-      int GetPos() const;
-      const string_type& GetExpr() const;
-      varmap_type& GetUsedVar();
-      char_type GetArgSep() const;
-
-      void IgnoreUndefVar(bool bIgnore);
-      void ReInit();
-      token_type ReadNextToken();
-
-  private:
-
-      /** \brief Syntax codes. 
-  	
-	        The syntax codes control the syntax check done during the first time parsing of 
-          the expression string. They are flags that indicate which tokens are allowed next
-          if certain tokens are identified.
-  	  */
-      enum ESynCodes
-      {
-        noBO      = 1 << 0,  ///< to avoid i.e. "cos(7)(" 
-        noBC      = 1 << 1,  ///< to avoid i.e. "sin)" or "()"
-        noVAL     = 1 << 2,  ///< to avoid i.e. "tan 2" or "sin(8)3.14"
-        noVAR     = 1 << 3,  ///< to avoid i.e. "sin a" or "sin(8)a"
-        noARG_SEP = 1 << 4,  ///< to avoid i.e. ",," or "+," ...
-        noFUN     = 1 << 5,  ///< to avoid i.e. "sqrt cos" or "(1)sin"	
-        noOPT     = 1 << 6,  ///< to avoid i.e. "(+)"
-        noPOSTOP  = 1 << 7,  ///< to avoid i.e. "(5!!)" "sin!"
-	      noINFIXOP = 1 << 8,  ///< to avoid i.e. "++4" "!!4"
-        noEND     = 1 << 9,  ///< to avoid unexpected end of formula
-        noSTR     = 1 << 10, ///< to block numeric arguments on string functions
-        noASSIGN  = 1 << 11, ///< to block assignement to constant i.e. "4=7"
-        noIF      = 1 << 12,
-        noELSE    = 1 << 13,
+// Forward declaration
+class ParserBase;
+
+/** \brief Token reader for the ParserBase class.
+
+*/
+class ParserTokenReader
+{
+private:
+    typedef ParserToken<value_type, string_type> token_type;
+
+public:
+    ParserTokenReader(ParserBase* a_pParent);
+    ParserTokenReader* Clone(ParserBase* a_pParent) const;
+
+    void AddValIdent(identfun_type a_pCallback);
+    void SetVarCreator(facfun_type a_pFactory, void* pUserData);
+    void SetFormula(const string_type& a_strFormula);
+    void SetArgSep(char_type cArgSep);
+
+    int GetPos() const;
+    const string_type& GetExpr() const;
+    varmap_type& GetUsedVar();
+    char_type GetArgSep() const;
+
+    void IgnoreUndefVar(bool bIgnore);
+    void ReInit();
+    token_type ReadNextToken();
+
+private:
+    /** \brief Syntax codes.
+
+              The syntax codes control the syntax check done during the first time parsing of
+        the expression string. They are flags that indicate which tokens are allowed next
+        if certain tokens are identified.
+        */
+    enum ESynCodes
+    {
+        noBO = 1 << 0,      ///< to avoid i.e. "cos(7)("
+        noBC = 1 << 1,      ///< to avoid i.e. "sin)" or "()"
+        noVAL = 1 << 2,     ///< to avoid i.e. "tan 2" or "sin(8)3.14"
+        noVAR = 1 << 3,     ///< to avoid i.e. "sin a" or "sin(8)a"
+        noARG_SEP = 1 << 4, ///< to avoid i.e. ",," or "+," ...
+        noFUN = 1 << 5,     ///< to avoid i.e. "sqrt cos" or "(1)sin"
+        noOPT = 1 << 6,     ///< to avoid i.e. "(+)"
+        noPOSTOP = 1 << 7,  ///< to avoid i.e. "(5!!)" "sin!"
+        noINFIXOP = 1 << 8, ///< to avoid i.e. "++4" "!!4"
+        noEND = 1 << 9,     ///< to avoid unexpected end of formula
+        noSTR = 1 << 10,    ///< to block numeric arguments on string functions
+        noASSIGN = 1 << 11, ///< to block assignement to constant i.e. "4=7"
+        noIF = 1 << 12,
+        noELSE = 1 << 13,
         sfSTART_OF_LINE = noOPT | noBC | noPOSTOP | noASSIGN | noIF | noELSE | noARG_SEP,
-        noANY     = ~0       ///< All of he above flags set
-      };	
-
-      ParserTokenReader(const ParserTokenReader &a_Reader);
-      ParserTokenReader& operator=(const ParserTokenReader &a_Reader);
-      void Assign(const ParserTokenReader &a_Reader);
-
-      void SetParent(ParserBase *a_pParent);
-      int ExtractToken(const char_type *a_szCharSet, 
-                       string_type &a_strTok, 
-                       int a_iPos) const;
-      int ExtractOperatorToken(string_type &a_sTok, int a_iPos) const;
-
-      bool IsBuiltIn(token_type &a_Tok);
-      bool IsArgSep(token_type &a_Tok);
-      bool IsEOF(token_type &a_Tok);
-      bool IsInfixOpTok(token_type &a_Tok);
-      bool IsFunTok(token_type &a_Tok);
-      bool IsPostOpTok(token_type &a_Tok);
-      bool IsOprt(token_type &a_Tok);
-      bool IsValTok(token_type &a_Tok);
-      bool IsVarTok(token_type &a_Tok);
-      bool IsStrVarTok(token_type &a_Tok);
-      bool IsUndefVarTok(token_type &a_Tok);
-      bool IsString(token_type &a_Tok);
-      void Error(EErrorCodes a_iErrc, 
-                 int a_iPos = -1, 
-                 const string_type &a_sTok = string_type() ) const;
-
-      token_type& SaveBeforeReturn(const token_type &tok);
-
-      ParserBase *m_pParser;
-      string_type m_strFormula;
-      int  m_iPos;
-      int  m_iSynFlags;
-      bool m_bIgnoreUndefVar;
-
-      const funmap_type *m_pFunDef;
-      const funmap_type *m_pPostOprtDef;
-      const funmap_type *m_pInfixOprtDef;
-      const funmap_type *m_pOprtDef;
-      const valmap_type *m_pConstDef;
-      const strmap_type *m_pStrVarDef;
-      varmap_type *m_pVarDef;  ///< The only non const pointer to parser internals
-      facfun_type m_pFactory;
-      void *m_pFactoryData;
-      std::list<identfun_type> m_vIdentFun; ///< Value token identification function
-      varmap_type m_UsedVar;
-      value_type m_fZero;      ///< Dummy value of zero, referenced by undefined variables
-      int m_iBrackets;
-      token_type m_lastTok;
-      char_type m_cArgSep;     ///< The character used for separating function arguments
-  };
+        noANY = ~0 ///< All of he above flags set
+    };
+
+    ParserTokenReader(const ParserTokenReader& a_Reader);
+    ParserTokenReader& operator=(const ParserTokenReader& a_Reader);
+    void Assign(const ParserTokenReader& a_Reader);
+
+    void SetParent(ParserBase* a_pParent);
+    int ExtractToken(const char_type* a_szCharSet, string_type& a_strTok, int a_iPos) const;
+    int ExtractOperatorToken(string_type& a_sTok, int a_iPos) const;
+
+    bool IsBuiltIn(token_type& a_Tok);
+    bool IsArgSep(token_type& a_Tok);
+    bool IsEOF(token_type& a_Tok);
+    bool IsInfixOpTok(token_type& a_Tok);
+    bool IsFunTok(token_type& a_Tok);
+    bool IsPostOpTok(token_type& a_Tok);
+    bool IsOprt(token_type& a_Tok);
+    bool IsValTok(token_type& a_Tok);
+    bool IsVarTok(token_type& a_Tok);
+    bool IsStrVarTok(token_type& a_Tok);
+    bool IsUndefVarTok(token_type& a_Tok);
+    bool IsString(token_type& a_Tok);
+    void Error(EErrorCodes a_iErrc, int a_iPos = -1, const string_type& a_sTok = string_type()) const;
+
+    token_type& SaveBeforeReturn(const token_type& tok);
+
+    ParserBase* m_pParser;
+    string_type m_strFormula;
+    int m_iPos;
+    int m_iSynFlags;
+    bool m_bIgnoreUndefVar;
+
+    const funmap_type* m_pFunDef;
+    const funmap_type* m_pPostOprtDef;
+    const funmap_type* m_pInfixOprtDef;
+    const funmap_type* m_pOprtDef;
+    const valmap_type* m_pConstDef;
+    const strmap_type* m_pStrVarDef;
+    varmap_type* m_pVarDef; ///< The only non const pointer to parser internals
+    facfun_type m_pFactory;
+    void* m_pFactoryData;
+    std::list<identfun_type> m_vIdentFun; ///< Value token identification function
+    varmap_type m_UsedVar;
+    value_type m_fZero; ///< Dummy value of zero, referenced by undefined variables
+    int m_iBrackets;
+    token_type m_lastTok;
+    char_type m_cArgSep; ///< The character used for separating function arguments
+};
 } // namespace mu
 
 #endif
-
-
diff --git a/ext_libs/sqlite/sqlite3.h b/ext_libs/sqlite/sqlite3.h
index 34636b9b..16f81c2f 100644
--- a/ext_libs/sqlite/sqlite3.h
+++ b/ext_libs/sqlite/sqlite3.h
@@ -32,16 +32,16 @@
 */
 #ifndef SQLITE3_H
 #define SQLITE3_H
-#include <stdarg.h>     /* Needed for the definition of va_list */
+#include <stdarg.h> /* Needed for the definition of va_list */
 
 /*
 ** Make sure we can call this stuff from C++.
 */
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-
 /*
 ** Facilitate override of interface linkage and calling conventions.
 ** Be aware that these macros may not be used within this particular
@@ -69,25 +69,25 @@ extern "C" {
 ** that require non-default calling conventions.
 */
 #ifndef SQLITE_EXTERN
-# define SQLITE_EXTERN extern
+#define SQLITE_EXTERN extern
 #endif
 #ifndef SQLITE_API
-# define SQLITE_API
+#define SQLITE_API
 #endif
 #ifndef SQLITE_CDECL
-# define SQLITE_CDECL
+#define SQLITE_CDECL
 #endif
 #ifndef SQLITE_APICALL
-# define SQLITE_APICALL
+#define SQLITE_APICALL
 #endif
 #ifndef SQLITE_STDCALL
-# define SQLITE_STDCALL SQLITE_APICALL
+#define SQLITE_STDCALL SQLITE_APICALL
 #endif
 #ifndef SQLITE_CALLBACK
-# define SQLITE_CALLBACK
+#define SQLITE_CALLBACK
 #endif
 #ifndef SQLITE_SYSAPI
-# define SQLITE_SYSAPI
+#define SQLITE_SYSAPI
 #endif
 
 /*
@@ -110,10 +110,10 @@ extern "C" {
 ** Ensure these symbols were not defined by some previous header file.
 */
 #ifdef SQLITE_VERSION
-# undef SQLITE_VERSION
+#undef SQLITE_VERSION
 #endif
 #ifdef SQLITE_VERSION_NUMBER
-# undef SQLITE_VERSION_NUMBER
+#undef SQLITE_VERSION_NUMBER
 #endif
 
 /*
@@ -146,46 +146,46 @@ extern "C" {
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
 ** [sqlite_version()] and [sqlite_source_id()].
 */
-#define SQLITE_VERSION        "3.38.0"
+#define SQLITE_VERSION "3.38.0"
 #define SQLITE_VERSION_NUMBER 3038000
-#define SQLITE_SOURCE_ID      "2022-02-22 18:58:40 40fa792d359f84c3b9e9d6623743e1a59826274e221df1bde8f47086968a1bab"
-
-/*
-** CAPI3REF: Run-Time Library Version Numbers
-** KEYWORDS: sqlite3_version sqlite3_sourceid
-**
-** These interfaces provide the same information as the [SQLITE_VERSION],
-** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
-** but are associated with the library instead of the header file.  ^(Cautious
-** programmers might include assert() statements in their application to
-** verify that values returned by these interfaces match the macros in
-** the header, and thus ensure that the application is
-** compiled with matching library and header files.
-**
-** <blockquote><pre>
-** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
-** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
-** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
-** </pre></blockquote>)^
-**
-** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
-** macro.  ^The sqlite3_libversion() function returns a pointer to the
-** to the sqlite3_version[] string constant.  The sqlite3_libversion()
-** function is provided for use in DLLs since DLL users usually do not have
-** direct access to string constants within the DLL.  ^The
-** sqlite3_libversion_number() function returns an integer equal to
-** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
-** a pointer to a string constant whose value is the same as the
-** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
-** using an edited copy of [the amalgamation], then the last four characters
-** of the hash might be different from [SQLITE_SOURCE_ID].)^
-**
-** See also: [sqlite_version()] and [sqlite_source_id()].
-*/
-SQLITE_API SQLITE_EXTERN const char sqlite3_version[];
-SQLITE_API const char *sqlite3_libversion(void);
-SQLITE_API const char *sqlite3_sourceid(void);
-SQLITE_API int sqlite3_libversion_number(void);
+#define SQLITE_SOURCE_ID "2022-02-22 18:58:40 40fa792d359f84c3b9e9d6623743e1a59826274e221df1bde8f47086968a1bab"
+
+    /*
+    ** CAPI3REF: Run-Time Library Version Numbers
+    ** KEYWORDS: sqlite3_version sqlite3_sourceid
+    **
+    ** These interfaces provide the same information as the [SQLITE_VERSION],
+    ** [SQLITE_VERSION_NUMBER], and [SQLITE_SOURCE_ID] C preprocessor macros
+    ** but are associated with the library instead of the header file.  ^(Cautious
+    ** programmers might include assert() statements in their application to
+    ** verify that values returned by these interfaces match the macros in
+    ** the header, and thus ensure that the application is
+    ** compiled with matching library and header files.
+    **
+    ** <blockquote><pre>
+    ** assert( sqlite3_libversion_number()==SQLITE_VERSION_NUMBER );
+    ** assert( strncmp(sqlite3_sourceid(),SQLITE_SOURCE_ID,80)==0 );
+    ** assert( strcmp(sqlite3_libversion(),SQLITE_VERSION)==0 );
+    ** </pre></blockquote>)^
+    **
+    ** ^The sqlite3_version[] string constant contains the text of [SQLITE_VERSION]
+    ** macro.  ^The sqlite3_libversion() function returns a pointer to the
+    ** to the sqlite3_version[] string constant.  The sqlite3_libversion()
+    ** function is provided for use in DLLs since DLL users usually do not have
+    ** direct access to string constants within the DLL.  ^The
+    ** sqlite3_libversion_number() function returns an integer equal to
+    ** [SQLITE_VERSION_NUMBER].  ^(The sqlite3_sourceid() function returns
+    ** a pointer to a string constant whose value is the same as the
+    ** [SQLITE_SOURCE_ID] C preprocessor macro.  Except if SQLite is built
+    ** using an edited copy of [the amalgamation], then the last four characters
+    ** of the hash might be different from [SQLITE_SOURCE_ID].)^
+    **
+    ** See also: [sqlite_version()] and [sqlite_source_id()].
+    */
+    SQLITE_API SQLITE_EXTERN const char sqlite3_version[];
+    SQLITE_API const char* sqlite3_libversion(void);
+    SQLITE_API const char* sqlite3_sourceid(void);
+    SQLITE_API int sqlite3_libversion_number(void);
 
 /*
 ** CAPI3REF: Run-Time Library Compilation Options Diagnostics
@@ -210,66 +210,66 @@ SQLITE_API int sqlite3_libversion_number(void);
 ** [sqlite_compileoption_get()] and the [compile_options pragma].
 */
 #ifndef SQLITE_OMIT_COMPILEOPTION_DIAGS
-SQLITE_API int sqlite3_compileoption_used(const char *zOptName);
-SQLITE_API const char *sqlite3_compileoption_get(int N);
+    SQLITE_API int sqlite3_compileoption_used(const char* zOptName);
+    SQLITE_API const char* sqlite3_compileoption_get(int N);
 #else
-# define sqlite3_compileoption_used(X) 0
-# define sqlite3_compileoption_get(X)  ((void*)0)
+#define sqlite3_compileoption_used(X) 0
+#define sqlite3_compileoption_get(X) ((void*)0)
 #endif
 
-/*
-** CAPI3REF: Test To See If The Library Is Threadsafe
-**
-** ^The sqlite3_threadsafe() function returns zero if and only if
-** SQLite was compiled with mutexing code omitted due to the
-** [SQLITE_THREADSAFE] compile-time option being set to 0.
-**
-** SQLite can be compiled with or without mutexes.  When
-** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
-** are enabled and SQLite is threadsafe.  When the
-** [SQLITE_THREADSAFE] macro is 0,
-** the mutexes are omitted.  Without the mutexes, it is not safe
-** to use SQLite concurrently from more than one thread.
-**
-** Enabling mutexes incurs a measurable performance penalty.
-** So if speed is of utmost importance, it makes sense to disable
-** the mutexes.  But for maximum safety, mutexes should be enabled.
-** ^The default behavior is for mutexes to be enabled.
-**
-** This interface can be used by an application to make sure that the
-** version of SQLite that it is linking against was compiled with
-** the desired setting of the [SQLITE_THREADSAFE] macro.
-**
-** This interface only reports on the compile-time mutex setting
-** of the [SQLITE_THREADSAFE] flag.  If SQLite is compiled with
-** SQLITE_THREADSAFE=1 or =2 then mutexes are enabled by default but
-** can be fully or partially disabled using a call to [sqlite3_config()]
-** with the verbs [SQLITE_CONFIG_SINGLETHREAD], [SQLITE_CONFIG_MULTITHREAD],
-** or [SQLITE_CONFIG_SERIALIZED].  ^(The return value of the
-** sqlite3_threadsafe() function shows only the compile-time setting of
-** thread safety, not any run-time changes to that setting made by
-** sqlite3_config(). In other words, the return value from sqlite3_threadsafe()
-** is unchanged by calls to sqlite3_config().)^
-**
-** See the [threading mode] documentation for additional information.
-*/
-SQLITE_API int sqlite3_threadsafe(void);
-
-/*
-** CAPI3REF: Database Connection Handle
-** KEYWORDS: {database connection} {database connections}
-**
-** Each open SQLite database is represented by a pointer to an instance of
-** the opaque structure named "sqlite3".  It is useful to think of an sqlite3
-** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
-** [sqlite3_open_v2()] interfaces are its constructors, and [sqlite3_close()]
-** and [sqlite3_close_v2()] are its destructors.  There are many other
-** interfaces (such as
-** [sqlite3_prepare_v2()], [sqlite3_create_function()], and
-** [sqlite3_busy_timeout()] to name but three) that are methods on an
-** sqlite3 object.
-*/
-typedef struct sqlite3 sqlite3;
+    /*
+    ** CAPI3REF: Test To See If The Library Is Threadsafe
+    **
+    ** ^The sqlite3_threadsafe() function returns zero if and only if
+    ** SQLite was compiled with mutexing code omitted due to the
+    ** [SQLITE_THREADSAFE] compile-time option being set to 0.
+    **
+    ** SQLite can be compiled with or without mutexes.  When
+    ** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
+    ** are enabled and SQLite is threadsafe.  When the
+    ** [SQLITE_THREADSAFE] macro is 0,
+    ** the mutexes are omitted.  Without the mutexes, it is not safe
+    ** to use SQLite concurrently from more than one thread.
+    **
+    ** Enabling mutexes incurs a measurable performance penalty.
+    ** So if speed is of utmost importance, it makes sense to disable
+    ** the mutexes.  But for maximum safety, mutexes should be enabled.
+    ** ^The default behavior is for mutexes to be enabled.
+    **
+    ** This interface can be used by an application to make sure that the
+    ** version of SQLite that it is linking against was compiled with
+    ** the desired setting of the [SQLITE_THREADSAFE] macro.
+    **
+    ** This interface only reports on the compile-time mutex setting
+    ** of the [SQLITE_THREADSAFE] flag.  If SQLite is compiled with
+    ** SQLITE_THREADSAFE=1 or =2 then mutexes are enabled by default but
+    ** can be fully or partially disabled using a call to [sqlite3_config()]
+    ** with the verbs [SQLITE_CONFIG_SINGLETHREAD], [SQLITE_CONFIG_MULTITHREAD],
+    ** or [SQLITE_CONFIG_SERIALIZED].  ^(The return value of the
+    ** sqlite3_threadsafe() function shows only the compile-time setting of
+    ** thread safety, not any run-time changes to that setting made by
+    ** sqlite3_config(). In other words, the return value from sqlite3_threadsafe()
+    ** is unchanged by calls to sqlite3_config().)^
+    **
+    ** See the [threading mode] documentation for additional information.
+    */
+    SQLITE_API int sqlite3_threadsafe(void);
+
+    /*
+    ** CAPI3REF: Database Connection Handle
+    ** KEYWORDS: {database connection} {database connections}
+    **
+    ** Each open SQLite database is represented by a pointer to an instance of
+    ** the opaque structure named "sqlite3".  It is useful to think of an sqlite3
+    ** pointer as an object.  The [sqlite3_open()], [sqlite3_open16()], and
+    ** [sqlite3_open_v2()] interfaces are its constructors, and [sqlite3_close()]
+    ** and [sqlite3_close_v2()] are its destructors.  There are many other
+    ** interfaces (such as
+    ** [sqlite3_prepare_v2()], [sqlite3_create_function()], and
+    ** [sqlite3_busy_timeout()] to name but three) that are methods on an
+    ** sqlite3 object.
+    */
+    typedef struct sqlite3 sqlite3;
 
 /*
 ** CAPI3REF: 64-Bit Integer Types
@@ -288,147 +288,146 @@ typedef struct sqlite3 sqlite3;
 ** between 0 and +18446744073709551615 inclusive.
 */
 #ifdef SQLITE_INT64_TYPE
-  typedef SQLITE_INT64_TYPE sqlite_int64;
-# ifdef SQLITE_UINT64_TYPE
+    typedef SQLITE_INT64_TYPE sqlite_int64;
+#ifdef SQLITE_UINT64_TYPE
     typedef SQLITE_UINT64_TYPE sqlite_uint64;
-# else
+#else
     typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
-# endif
+#endif
 #elif defined(_MSC_VER) || defined(__BORLANDC__)
-  typedef __int64 sqlite_int64;
-  typedef unsigned __int64 sqlite_uint64;
+typedef __int64 sqlite_int64;
+typedef unsigned __int64 sqlite_uint64;
 #else
-  typedef long long int sqlite_int64;
-  typedef unsigned long long int sqlite_uint64;
+typedef long long int sqlite_int64;
+typedef unsigned long long int sqlite_uint64;
 #endif
-typedef sqlite_int64 sqlite3_int64;
-typedef sqlite_uint64 sqlite3_uint64;
+    typedef sqlite_int64 sqlite3_int64;
+    typedef sqlite_uint64 sqlite3_uint64;
 
 /*
 ** If compiling for a processor that lacks floating point support,
 ** substitute integer for floating-point.
 */
 #ifdef SQLITE_OMIT_FLOATING_POINT
-# define double sqlite3_int64
+#define double sqlite3_int64
 #endif
 
-/*
-** CAPI3REF: Closing A Database Connection
-** DESTRUCTOR: sqlite3
-**
-** ^The sqlite3_close() and sqlite3_close_v2() routines are destructors
-** for the [sqlite3] object.
-** ^Calls to sqlite3_close() and sqlite3_close_v2() return [SQLITE_OK] if
-** the [sqlite3] object is successfully destroyed and all associated
-** resources are deallocated.
-**
-** Ideally, applications should [sqlite3_finalize | finalize] all
-** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
-** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
-** with the [sqlite3] object prior to attempting to close the object.
-** ^If the database connection is associated with unfinalized prepared
-** statements, BLOB handlers, and/or unfinished sqlite3_backup objects then
-** sqlite3_close() will leave the database connection open and return
-** [SQLITE_BUSY]. ^If sqlite3_close_v2() is called with unfinalized prepared
-** statements, unclosed BLOB handlers, and/or unfinished sqlite3_backups,
-** it returns [SQLITE_OK] regardless, but instead of deallocating the database
-** connection immediately, it marks the database connection as an unusable
-** "zombie" and makes arrangements to automatically deallocate the database
-** connection after all prepared statements are finalized, all BLOB handles
-** are closed, and all backups have finished. The sqlite3_close_v2() interface
-** is intended for use with host languages that are garbage collected, and
-** where the order in which destructors are called is arbitrary.
-**
-** ^If an [sqlite3] object is destroyed while a transaction is open,
-** the transaction is automatically rolled back.
-**
-** The C parameter to [sqlite3_close(C)] and [sqlite3_close_v2(C)]
-** must be either a NULL
-** pointer or an [sqlite3] object pointer obtained
-** from [sqlite3_open()], [sqlite3_open16()], or
-** [sqlite3_open_v2()], and not previously closed.
-** ^Calling sqlite3_close() or sqlite3_close_v2() with a NULL pointer
-** argument is a harmless no-op.
-*/
-SQLITE_API int sqlite3_close(sqlite3*);
-SQLITE_API int sqlite3_close_v2(sqlite3*);
-
-/*
-** The type for a callback function.
-** This is legacy and deprecated.  It is included for historical
-** compatibility and is not documented.
-*/
-typedef int (*sqlite3_callback)(void*,int,char**, char**);
-
-/*
-** CAPI3REF: One-Step Query Execution Interface
-** METHOD: sqlite3
-**
-** The sqlite3_exec() interface is a convenience wrapper around
-** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
-** that allows an application to run multiple statements of SQL
-** without having to use a lot of C code.
-**
-** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
-** semicolon-separate SQL statements passed into its 2nd argument,
-** in the context of the [database connection] passed in as its 1st
-** argument.  ^If the callback function of the 3rd argument to
-** sqlite3_exec() is not NULL, then it is invoked for each result row
-** coming out of the evaluated SQL statements.  ^The 4th argument to
-** sqlite3_exec() is relayed through to the 1st argument of each
-** callback invocation.  ^If the callback pointer to sqlite3_exec()
-** is NULL, then no callback is ever invoked and result rows are
-** ignored.
-**
-** ^If an error occurs while evaluating the SQL statements passed into
-** sqlite3_exec(), then execution of the current statement stops and
-** subsequent statements are skipped.  ^If the 5th parameter to sqlite3_exec()
-** is not NULL then any error message is written into memory obtained
-** from [sqlite3_malloc()] and passed back through the 5th parameter.
-** To avoid memory leaks, the application should invoke [sqlite3_free()]
-** on error message strings returned through the 5th parameter of
-** sqlite3_exec() after the error message string is no longer needed.
-** ^If the 5th parameter to sqlite3_exec() is not NULL and no errors
-** occur, then sqlite3_exec() sets the pointer in its 5th parameter to
-** NULL before returning.
-**
-** ^If an sqlite3_exec() callback returns non-zero, the sqlite3_exec()
-** routine returns SQLITE_ABORT without invoking the callback again and
-** without running any subsequent SQL statements.
-**
-** ^The 2nd argument to the sqlite3_exec() callback function is the
-** number of columns in the result.  ^The 3rd argument to the sqlite3_exec()
-** callback is an array of pointers to strings obtained as if from
-** [sqlite3_column_text()], one for each column.  ^If an element of a
-** result row is NULL then the corresponding string pointer for the
-** sqlite3_exec() callback is a NULL pointer.  ^The 4th argument to the
-** sqlite3_exec() callback is an array of pointers to strings where each
-** entry represents the name of corresponding result column as obtained
-** from [sqlite3_column_name()].
-**
-** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
-** to an empty string, or a pointer that contains only whitespace and/or
-** SQL comments, then no SQL statements are evaluated and the database
-** is not changed.
-**
-** Restrictions:
-**
-** <ul>
-** <li> The application must ensure that the 1st parameter to sqlite3_exec()
-**      is a valid and open [database connection].
-** <li> The application must not close the [database connection] specified by
-**      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
-** <li> The application must not modify the SQL statement text passed into
-**      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
-** </ul>
-*/
-SQLITE_API int sqlite3_exec(
-  sqlite3*,                                  /* An open database */
-  const char *sql,                           /* SQL to be evaluated */
-  int (*callback)(void*,int,char**,char**),  /* Callback function */
-  void *,                                    /* 1st argument to callback */
-  char **errmsg                              /* Error msg written here */
-);
+    /*
+    ** CAPI3REF: Closing A Database Connection
+    ** DESTRUCTOR: sqlite3
+    **
+    ** ^The sqlite3_close() and sqlite3_close_v2() routines are destructors
+    ** for the [sqlite3] object.
+    ** ^Calls to sqlite3_close() and sqlite3_close_v2() return [SQLITE_OK] if
+    ** the [sqlite3] object is successfully destroyed and all associated
+    ** resources are deallocated.
+    **
+    ** Ideally, applications should [sqlite3_finalize | finalize] all
+    ** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
+    ** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
+    ** with the [sqlite3] object prior to attempting to close the object.
+    ** ^If the database connection is associated with unfinalized prepared
+    ** statements, BLOB handlers, and/or unfinished sqlite3_backup objects then
+    ** sqlite3_close() will leave the database connection open and return
+    ** [SQLITE_BUSY]. ^If sqlite3_close_v2() is called with unfinalized prepared
+    ** statements, unclosed BLOB handlers, and/or unfinished sqlite3_backups,
+    ** it returns [SQLITE_OK] regardless, but instead of deallocating the database
+    ** connection immediately, it marks the database connection as an unusable
+    ** "zombie" and makes arrangements to automatically deallocate the database
+    ** connection after all prepared statements are finalized, all BLOB handles
+    ** are closed, and all backups have finished. The sqlite3_close_v2() interface
+    ** is intended for use with host languages that are garbage collected, and
+    ** where the order in which destructors are called is arbitrary.
+    **
+    ** ^If an [sqlite3] object is destroyed while a transaction is open,
+    ** the transaction is automatically rolled back.
+    **
+    ** The C parameter to [sqlite3_close(C)] and [sqlite3_close_v2(C)]
+    ** must be either a NULL
+    ** pointer or an [sqlite3] object pointer obtained
+    ** from [sqlite3_open()], [sqlite3_open16()], or
+    ** [sqlite3_open_v2()], and not previously closed.
+    ** ^Calling sqlite3_close() or sqlite3_close_v2() with a NULL pointer
+    ** argument is a harmless no-op.
+    */
+    SQLITE_API int sqlite3_close(sqlite3*);
+    SQLITE_API int sqlite3_close_v2(sqlite3*);
+
+    /*
+    ** The type for a callback function.
+    ** This is legacy and deprecated.  It is included for historical
+    ** compatibility and is not documented.
+    */
+    typedef int (*sqlite3_callback)(void*, int, char**, char**);
+
+    /*
+    ** CAPI3REF: One-Step Query Execution Interface
+    ** METHOD: sqlite3
+    **
+    ** The sqlite3_exec() interface is a convenience wrapper around
+    ** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
+    ** that allows an application to run multiple statements of SQL
+    ** without having to use a lot of C code.
+    **
+    ** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
+    ** semicolon-separate SQL statements passed into its 2nd argument,
+    ** in the context of the [database connection] passed in as its 1st
+    ** argument.  ^If the callback function of the 3rd argument to
+    ** sqlite3_exec() is not NULL, then it is invoked for each result row
+    ** coming out of the evaluated SQL statements.  ^The 4th argument to
+    ** sqlite3_exec() is relayed through to the 1st argument of each
+    ** callback invocation.  ^If the callback pointer to sqlite3_exec()
+    ** is NULL, then no callback is ever invoked and result rows are
+    ** ignored.
+    **
+    ** ^If an error occurs while evaluating the SQL statements passed into
+    ** sqlite3_exec(), then execution of the current statement stops and
+    ** subsequent statements are skipped.  ^If the 5th parameter to sqlite3_exec()
+    ** is not NULL then any error message is written into memory obtained
+    ** from [sqlite3_malloc()] and passed back through the 5th parameter.
+    ** To avoid memory leaks, the application should invoke [sqlite3_free()]
+    ** on error message strings returned through the 5th parameter of
+    ** sqlite3_exec() after the error message string is no longer needed.
+    ** ^If the 5th parameter to sqlite3_exec() is not NULL and no errors
+    ** occur, then sqlite3_exec() sets the pointer in its 5th parameter to
+    ** NULL before returning.
+    **
+    ** ^If an sqlite3_exec() callback returns non-zero, the sqlite3_exec()
+    ** routine returns SQLITE_ABORT without invoking the callback again and
+    ** without running any subsequent SQL statements.
+    **
+    ** ^The 2nd argument to the sqlite3_exec() callback function is the
+    ** number of columns in the result.  ^The 3rd argument to the sqlite3_exec()
+    ** callback is an array of pointers to strings obtained as if from
+    ** [sqlite3_column_text()], one for each column.  ^If an element of a
+    ** result row is NULL then the corresponding string pointer for the
+    ** sqlite3_exec() callback is a NULL pointer.  ^The 4th argument to the
+    ** sqlite3_exec() callback is an array of pointers to strings where each
+    ** entry represents the name of corresponding result column as obtained
+    ** from [sqlite3_column_name()].
+    **
+    ** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
+    ** to an empty string, or a pointer that contains only whitespace and/or
+    ** SQL comments, then no SQL statements are evaluated and the database
+    ** is not changed.
+    **
+    ** Restrictions:
+    **
+    ** <ul>
+    ** <li> The application must ensure that the 1st parameter to sqlite3_exec()
+    **      is a valid and open [database connection].
+    ** <li> The application must not close the [database connection] specified by
+    **      the 1st parameter to sqlite3_exec() while sqlite3_exec() is running.
+    ** <li> The application must not modify the SQL statement text passed into
+    **      the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running.
+    ** </ul>
+    */
+    SQLITE_API int sqlite3_exec(sqlite3*,                                    /* An open database */
+                                const char* sql,                             /* SQL to be evaluated */
+                                int (*callback)(void*, int, char**, char**), /* Callback function */
+                                void*,                                       /* 1st argument to callback */
+                                char** errmsg                                /* Error msg written here */
+    );
 
 /*
 ** CAPI3REF: Result Codes
@@ -441,38 +440,38 @@ SQLITE_API int sqlite3_exec(
 **
 ** See also: [extended result code definitions]
 */
-#define SQLITE_OK           0   /* Successful result */
+#define SQLITE_OK 0 /* Successful result */
 /* beginning-of-error-codes */
-#define SQLITE_ERROR        1   /* Generic error */
-#define SQLITE_INTERNAL     2   /* Internal logic error in SQLite */
-#define SQLITE_PERM         3   /* Access permission denied */
-#define SQLITE_ABORT        4   /* Callback routine requested an abort */
-#define SQLITE_BUSY         5   /* The database file is locked */
-#define SQLITE_LOCKED       6   /* A table in the database is locked */
-#define SQLITE_NOMEM        7   /* A malloc() failed */
-#define SQLITE_READONLY     8   /* Attempt to write a readonly database */
-#define SQLITE_INTERRUPT    9   /* Operation terminated by sqlite3_interrupt()*/
-#define SQLITE_IOERR       10   /* Some kind of disk I/O error occurred */
-#define SQLITE_CORRUPT     11   /* The database disk image is malformed */
-#define SQLITE_NOTFOUND    12   /* Unknown opcode in sqlite3_file_control() */
-#define SQLITE_FULL        13   /* Insertion failed because database is full */
-#define SQLITE_CANTOPEN    14   /* Unable to open the database file */
-#define SQLITE_PROTOCOL    15   /* Database lock protocol error */
-#define SQLITE_EMPTY       16   /* Internal use only */
-#define SQLITE_SCHEMA      17   /* The database schema changed */
-#define SQLITE_TOOBIG      18   /* String or BLOB exceeds size limit */
-#define SQLITE_CONSTRAINT  19   /* Abort due to constraint violation */
-#define SQLITE_MISMATCH    20   /* Data type mismatch */
-#define SQLITE_MISUSE      21   /* Library used incorrectly */
-#define SQLITE_NOLFS       22   /* Uses OS features not supported on host */
-#define SQLITE_AUTH        23   /* Authorization denied */
-#define SQLITE_FORMAT      24   /* Not used */
-#define SQLITE_RANGE       25   /* 2nd parameter to sqlite3_bind out of range */
-#define SQLITE_NOTADB      26   /* File opened that is not a database file */
-#define SQLITE_NOTICE      27   /* Notifications from sqlite3_log() */
-#define SQLITE_WARNING     28   /* Warnings from sqlite3_log() */
-#define SQLITE_ROW         100  /* sqlite3_step() has another row ready */
-#define SQLITE_DONE        101  /* sqlite3_step() has finished executing */
+#define SQLITE_ERROR 1       /* Generic error */
+#define SQLITE_INTERNAL 2    /* Internal logic error in SQLite */
+#define SQLITE_PERM 3        /* Access permission denied */
+#define SQLITE_ABORT 4       /* Callback routine requested an abort */
+#define SQLITE_BUSY 5        /* The database file is locked */
+#define SQLITE_LOCKED 6      /* A table in the database is locked */
+#define SQLITE_NOMEM 7       /* A malloc() failed */
+#define SQLITE_READONLY 8    /* Attempt to write a readonly database */
+#define SQLITE_INTERRUPT 9   /* Operation terminated by sqlite3_interrupt()*/
+#define SQLITE_IOERR 10      /* Some kind of disk I/O error occurred */
+#define SQLITE_CORRUPT 11    /* The database disk image is malformed */
+#define SQLITE_NOTFOUND 12   /* Unknown opcode in sqlite3_file_control() */
+#define SQLITE_FULL 13       /* Insertion failed because database is full */
+#define SQLITE_CANTOPEN 14   /* Unable to open the database file */
+#define SQLITE_PROTOCOL 15   /* Database lock protocol error */
+#define SQLITE_EMPTY 16      /* Internal use only */
+#define SQLITE_SCHEMA 17     /* The database schema changed */
+#define SQLITE_TOOBIG 18     /* String or BLOB exceeds size limit */
+#define SQLITE_CONSTRAINT 19 /* Abort due to constraint violation */
+#define SQLITE_MISMATCH 20   /* Data type mismatch */
+#define SQLITE_MISUSE 21     /* Library used incorrectly */
+#define SQLITE_NOLFS 22      /* Uses OS features not supported on host */
+#define SQLITE_AUTH 23       /* Authorization denied */
+#define SQLITE_FORMAT 24     /* Not used */
+#define SQLITE_RANGE 25      /* 2nd parameter to sqlite3_bind out of range */
+#define SQLITE_NOTADB 26     /* File opened that is not a database file */
+#define SQLITE_NOTICE 27     /* Notifications from sqlite3_log() */
+#define SQLITE_WARNING 28    /* Warnings from sqlite3_log() */
+#define SQLITE_ROW 100       /* sqlite3_step() has another row ready */
+#define SQLITE_DONE 101      /* sqlite3_step() has finished executing */
 /* end-of-error-codes */
 
 /*
@@ -492,81 +491,81 @@ SQLITE_API int sqlite3_exec(
 ** the most recent error can be obtained using
 ** [sqlite3_extended_errcode()].
 */
-#define SQLITE_ERROR_MISSING_COLLSEQ   (SQLITE_ERROR | (1<<8))
-#define SQLITE_ERROR_RETRY             (SQLITE_ERROR | (2<<8))
-#define SQLITE_ERROR_SNAPSHOT          (SQLITE_ERROR | (3<<8))
-#define SQLITE_IOERR_READ              (SQLITE_IOERR | (1<<8))
-#define SQLITE_IOERR_SHORT_READ        (SQLITE_IOERR | (2<<8))
-#define SQLITE_IOERR_WRITE             (SQLITE_IOERR | (3<<8))
-#define SQLITE_IOERR_FSYNC             (SQLITE_IOERR | (4<<8))
-#define SQLITE_IOERR_DIR_FSYNC         (SQLITE_IOERR | (5<<8))
-#define SQLITE_IOERR_TRUNCATE          (SQLITE_IOERR | (6<<8))
-#define SQLITE_IOERR_FSTAT             (SQLITE_IOERR | (7<<8))
-#define SQLITE_IOERR_UNLOCK            (SQLITE_IOERR | (8<<8))
-#define SQLITE_IOERR_RDLOCK            (SQLITE_IOERR | (9<<8))
-#define SQLITE_IOERR_DELETE            (SQLITE_IOERR | (10<<8))
-#define SQLITE_IOERR_BLOCKED           (SQLITE_IOERR | (11<<8))
-#define SQLITE_IOERR_NOMEM             (SQLITE_IOERR | (12<<8))
-#define SQLITE_IOERR_ACCESS            (SQLITE_IOERR | (13<<8))
-#define SQLITE_IOERR_CHECKRESERVEDLOCK (SQLITE_IOERR | (14<<8))
-#define SQLITE_IOERR_LOCK              (SQLITE_IOERR | (15<<8))
-#define SQLITE_IOERR_CLOSE             (SQLITE_IOERR | (16<<8))
-#define SQLITE_IOERR_DIR_CLOSE         (SQLITE_IOERR | (17<<8))
-#define SQLITE_IOERR_SHMOPEN           (SQLITE_IOERR | (18<<8))
-#define SQLITE_IOERR_SHMSIZE           (SQLITE_IOERR | (19<<8))
-#define SQLITE_IOERR_SHMLOCK           (SQLITE_IOERR | (20<<8))
-#define SQLITE_IOERR_SHMMAP            (SQLITE_IOERR | (21<<8))
-#define SQLITE_IOERR_SEEK              (SQLITE_IOERR | (22<<8))
-#define SQLITE_IOERR_DELETE_NOENT      (SQLITE_IOERR | (23<<8))
-#define SQLITE_IOERR_MMAP              (SQLITE_IOERR | (24<<8))
-#define SQLITE_IOERR_GETTEMPPATH       (SQLITE_IOERR | (25<<8))
-#define SQLITE_IOERR_CONVPATH          (SQLITE_IOERR | (26<<8))
-#define SQLITE_IOERR_VNODE             (SQLITE_IOERR | (27<<8))
-#define SQLITE_IOERR_AUTH              (SQLITE_IOERR | (28<<8))
-#define SQLITE_IOERR_BEGIN_ATOMIC      (SQLITE_IOERR | (29<<8))
-#define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
-#define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
-#define SQLITE_IOERR_DATA              (SQLITE_IOERR | (32<<8))
-#define SQLITE_IOERR_CORRUPTFS         (SQLITE_IOERR | (33<<8))
-#define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
-#define SQLITE_LOCKED_VTAB             (SQLITE_LOCKED |  (2<<8))
-#define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
-#define SQLITE_BUSY_SNAPSHOT           (SQLITE_BUSY   |  (2<<8))
-#define SQLITE_BUSY_TIMEOUT            (SQLITE_BUSY   |  (3<<8))
-#define SQLITE_CANTOPEN_NOTEMPDIR      (SQLITE_CANTOPEN | (1<<8))
-#define SQLITE_CANTOPEN_ISDIR          (SQLITE_CANTOPEN | (2<<8))
-#define SQLITE_CANTOPEN_FULLPATH       (SQLITE_CANTOPEN | (3<<8))
-#define SQLITE_CANTOPEN_CONVPATH       (SQLITE_CANTOPEN | (4<<8))
-#define SQLITE_CANTOPEN_DIRTYWAL       (SQLITE_CANTOPEN | (5<<8)) /* Not Used */
-#define SQLITE_CANTOPEN_SYMLINK        (SQLITE_CANTOPEN | (6<<8))
-#define SQLITE_CORRUPT_VTAB            (SQLITE_CORRUPT | (1<<8))
-#define SQLITE_CORRUPT_SEQUENCE        (SQLITE_CORRUPT | (2<<8))
-#define SQLITE_CORRUPT_INDEX           (SQLITE_CORRUPT | (3<<8))
-#define SQLITE_READONLY_RECOVERY       (SQLITE_READONLY | (1<<8))
-#define SQLITE_READONLY_CANTLOCK       (SQLITE_READONLY | (2<<8))
-#define SQLITE_READONLY_ROLLBACK       (SQLITE_READONLY | (3<<8))
-#define SQLITE_READONLY_DBMOVED        (SQLITE_READONLY | (4<<8))
-#define SQLITE_READONLY_CANTINIT       (SQLITE_READONLY | (5<<8))
-#define SQLITE_READONLY_DIRECTORY      (SQLITE_READONLY | (6<<8))
-#define SQLITE_ABORT_ROLLBACK          (SQLITE_ABORT | (2<<8))
-#define SQLITE_CONSTRAINT_CHECK        (SQLITE_CONSTRAINT | (1<<8))
-#define SQLITE_CONSTRAINT_COMMITHOOK   (SQLITE_CONSTRAINT | (2<<8))
-#define SQLITE_CONSTRAINT_FOREIGNKEY   (SQLITE_CONSTRAINT | (3<<8))
-#define SQLITE_CONSTRAINT_FUNCTION     (SQLITE_CONSTRAINT | (4<<8))
-#define SQLITE_CONSTRAINT_NOTNULL      (SQLITE_CONSTRAINT | (5<<8))
-#define SQLITE_CONSTRAINT_PRIMARYKEY   (SQLITE_CONSTRAINT | (6<<8))
-#define SQLITE_CONSTRAINT_TRIGGER      (SQLITE_CONSTRAINT | (7<<8))
-#define SQLITE_CONSTRAINT_UNIQUE       (SQLITE_CONSTRAINT | (8<<8))
-#define SQLITE_CONSTRAINT_VTAB         (SQLITE_CONSTRAINT | (9<<8))
-#define SQLITE_CONSTRAINT_ROWID        (SQLITE_CONSTRAINT |(10<<8))
-#define SQLITE_CONSTRAINT_PINNED       (SQLITE_CONSTRAINT |(11<<8))
-#define SQLITE_CONSTRAINT_DATATYPE     (SQLITE_CONSTRAINT |(12<<8))
-#define SQLITE_NOTICE_RECOVER_WAL      (SQLITE_NOTICE | (1<<8))
-#define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2<<8))
-#define SQLITE_WARNING_AUTOINDEX       (SQLITE_WARNING | (1<<8))
-#define SQLITE_AUTH_USER               (SQLITE_AUTH | (1<<8))
-#define SQLITE_OK_LOAD_PERMANENTLY     (SQLITE_OK | (1<<8))
-#define SQLITE_OK_SYMLINK              (SQLITE_OK | (2<<8)) /* internal use only */
+#define SQLITE_ERROR_MISSING_COLLSEQ (SQLITE_ERROR | (1 << 8))
+#define SQLITE_ERROR_RETRY (SQLITE_ERROR | (2 << 8))
+#define SQLITE_ERROR_SNAPSHOT (SQLITE_ERROR | (3 << 8))
+#define SQLITE_IOERR_READ (SQLITE_IOERR | (1 << 8))
+#define SQLITE_IOERR_SHORT_READ (SQLITE_IOERR | (2 << 8))
+#define SQLITE_IOERR_WRITE (SQLITE_IOERR | (3 << 8))
+#define SQLITE_IOERR_FSYNC (SQLITE_IOERR | (4 << 8))
+#define SQLITE_IOERR_DIR_FSYNC (SQLITE_IOERR | (5 << 8))
+#define SQLITE_IOERR_TRUNCATE (SQLITE_IOERR | (6 << 8))
+#define SQLITE_IOERR_FSTAT (SQLITE_IOERR | (7 << 8))
+#define SQLITE_IOERR_UNLOCK (SQLITE_IOERR | (8 << 8))
+#define SQLITE_IOERR_RDLOCK (SQLITE_IOERR | (9 << 8))
+#define SQLITE_IOERR_DELETE (SQLITE_IOERR | (10 << 8))
+#define SQLITE_IOERR_BLOCKED (SQLITE_IOERR | (11 << 8))
+#define SQLITE_IOERR_NOMEM (SQLITE_IOERR | (12 << 8))
+#define SQLITE_IOERR_ACCESS (SQLITE_IOERR | (13 << 8))
+#define SQLITE_IOERR_CHECKRESERVEDLOCK (SQLITE_IOERR | (14 << 8))
+#define SQLITE_IOERR_LOCK (SQLITE_IOERR | (15 << 8))
+#define SQLITE_IOERR_CLOSE (SQLITE_IOERR | (16 << 8))
+#define SQLITE_IOERR_DIR_CLOSE (SQLITE_IOERR | (17 << 8))
+#define SQLITE_IOERR_SHMOPEN (SQLITE_IOERR | (18 << 8))
+#define SQLITE_IOERR_SHMSIZE (SQLITE_IOERR | (19 << 8))
+#define SQLITE_IOERR_SHMLOCK (SQLITE_IOERR | (20 << 8))
+#define SQLITE_IOERR_SHMMAP (SQLITE_IOERR | (21 << 8))
+#define SQLITE_IOERR_SEEK (SQLITE_IOERR | (22 << 8))
+#define SQLITE_IOERR_DELETE_NOENT (SQLITE_IOERR | (23 << 8))
+#define SQLITE_IOERR_MMAP (SQLITE_IOERR | (24 << 8))
+#define SQLITE_IOERR_GETTEMPPATH (SQLITE_IOERR | (25 << 8))
+#define SQLITE_IOERR_CONVPATH (SQLITE_IOERR | (26 << 8))
+#define SQLITE_IOERR_VNODE (SQLITE_IOERR | (27 << 8))
+#define SQLITE_IOERR_AUTH (SQLITE_IOERR | (28 << 8))
+#define SQLITE_IOERR_BEGIN_ATOMIC (SQLITE_IOERR | (29 << 8))
+#define SQLITE_IOERR_COMMIT_ATOMIC (SQLITE_IOERR | (30 << 8))
+#define SQLITE_IOERR_ROLLBACK_ATOMIC (SQLITE_IOERR | (31 << 8))
+#define SQLITE_IOERR_DATA (SQLITE_IOERR | (32 << 8))
+#define SQLITE_IOERR_CORRUPTFS (SQLITE_IOERR | (33 << 8))
+#define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1 << 8))
+#define SQLITE_LOCKED_VTAB (SQLITE_LOCKED | (2 << 8))
+#define SQLITE_BUSY_RECOVERY (SQLITE_BUSY | (1 << 8))
+#define SQLITE_BUSY_SNAPSHOT (SQLITE_BUSY | (2 << 8))
+#define SQLITE_BUSY_TIMEOUT (SQLITE_BUSY | (3 << 8))
+#define SQLITE_CANTOPEN_NOTEMPDIR (SQLITE_CANTOPEN | (1 << 8))
+#define SQLITE_CANTOPEN_ISDIR (SQLITE_CANTOPEN | (2 << 8))
+#define SQLITE_CANTOPEN_FULLPATH (SQLITE_CANTOPEN | (3 << 8))
+#define SQLITE_CANTOPEN_CONVPATH (SQLITE_CANTOPEN | (4 << 8))
+#define SQLITE_CANTOPEN_DIRTYWAL (SQLITE_CANTOPEN | (5 << 8)) /* Not Used */
+#define SQLITE_CANTOPEN_SYMLINK (SQLITE_CANTOPEN | (6 << 8))
+#define SQLITE_CORRUPT_VTAB (SQLITE_CORRUPT | (1 << 8))
+#define SQLITE_CORRUPT_SEQUENCE (SQLITE_CORRUPT | (2 << 8))
+#define SQLITE_CORRUPT_INDEX (SQLITE_CORRUPT | (3 << 8))
+#define SQLITE_READONLY_RECOVERY (SQLITE_READONLY | (1 << 8))
+#define SQLITE_READONLY_CANTLOCK (SQLITE_READONLY | (2 << 8))
+#define SQLITE_READONLY_ROLLBACK (SQLITE_READONLY | (3 << 8))
+#define SQLITE_READONLY_DBMOVED (SQLITE_READONLY | (4 << 8))
+#define SQLITE_READONLY_CANTINIT (SQLITE_READONLY | (5 << 8))
+#define SQLITE_READONLY_DIRECTORY (SQLITE_READONLY | (6 << 8))
+#define SQLITE_ABORT_ROLLBACK (SQLITE_ABORT | (2 << 8))
+#define SQLITE_CONSTRAINT_CHECK (SQLITE_CONSTRAINT | (1 << 8))
+#define SQLITE_CONSTRAINT_COMMITHOOK (SQLITE_CONSTRAINT | (2 << 8))
+#define SQLITE_CONSTRAINT_FOREIGNKEY (SQLITE_CONSTRAINT | (3 << 8))
+#define SQLITE_CONSTRAINT_FUNCTION (SQLITE_CONSTRAINT | (4 << 8))
+#define SQLITE_CONSTRAINT_NOTNULL (SQLITE_CONSTRAINT | (5 << 8))
+#define SQLITE_CONSTRAINT_PRIMARYKEY (SQLITE_CONSTRAINT | (6 << 8))
+#define SQLITE_CONSTRAINT_TRIGGER (SQLITE_CONSTRAINT | (7 << 8))
+#define SQLITE_CONSTRAINT_UNIQUE (SQLITE_CONSTRAINT | (8 << 8))
+#define SQLITE_CONSTRAINT_VTAB (SQLITE_CONSTRAINT | (9 << 8))
+#define SQLITE_CONSTRAINT_ROWID (SQLITE_CONSTRAINT | (10 << 8))
+#define SQLITE_CONSTRAINT_PINNED (SQLITE_CONSTRAINT | (11 << 8))
+#define SQLITE_CONSTRAINT_DATATYPE (SQLITE_CONSTRAINT | (12 << 8))
+#define SQLITE_NOTICE_RECOVER_WAL (SQLITE_NOTICE | (1 << 8))
+#define SQLITE_NOTICE_RECOVER_ROLLBACK (SQLITE_NOTICE | (2 << 8))
+#define SQLITE_WARNING_AUTOINDEX (SQLITE_WARNING | (1 << 8))
+#define SQLITE_AUTH_USER (SQLITE_AUTH | (1 << 8))
+#define SQLITE_OK_LOAD_PERMANENTLY (SQLITE_OK | (1 << 8))
+#define SQLITE_OK_SYMLINK (SQLITE_OK | (2 << 8)) /* internal use only */
 
 /*
 ** CAPI3REF: Flags For File Open Operations
@@ -588,33 +587,32 @@ SQLITE_API int sqlite3_exec(
 ** [sqlite3_open_v2()] has historically be a no-op and might become an
 ** error in future versions of SQLite.
 */
-#define SQLITE_OPEN_READONLY         0x00000001  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_READWRITE        0x00000002  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_CREATE           0x00000004  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_DELETEONCLOSE    0x00000008  /* VFS only */
-#define SQLITE_OPEN_EXCLUSIVE        0x00000010  /* VFS only */
-#define SQLITE_OPEN_AUTOPROXY        0x00000020  /* VFS only */
-#define SQLITE_OPEN_URI              0x00000040  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_MEMORY           0x00000080  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_MAIN_DB          0x00000100  /* VFS only */
-#define SQLITE_OPEN_TEMP_DB          0x00000200  /* VFS only */
-#define SQLITE_OPEN_TRANSIENT_DB     0x00000400  /* VFS only */
-#define SQLITE_OPEN_MAIN_JOURNAL     0x00000800  /* VFS only */
-#define SQLITE_OPEN_TEMP_JOURNAL     0x00001000  /* VFS only */
-#define SQLITE_OPEN_SUBJOURNAL       0x00002000  /* VFS only */
-#define SQLITE_OPEN_SUPER_JOURNAL    0x00004000  /* VFS only */
-#define SQLITE_OPEN_NOMUTEX          0x00008000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_FULLMUTEX        0x00010000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_SHAREDCACHE      0x00020000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_PRIVATECACHE     0x00040000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_WAL              0x00080000  /* VFS only */
-#define SQLITE_OPEN_NOFOLLOW         0x01000000  /* Ok for sqlite3_open_v2() */
-#define SQLITE_OPEN_EXRESCODE        0x02000000  /* Extended result codes */
+#define SQLITE_OPEN_READONLY 0x00000001      /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_READWRITE 0x00000002     /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_CREATE 0x00000004        /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_DELETEONCLOSE 0x00000008 /* VFS only */
+#define SQLITE_OPEN_EXCLUSIVE 0x00000010     /* VFS only */
+#define SQLITE_OPEN_AUTOPROXY 0x00000020     /* VFS only */
+#define SQLITE_OPEN_URI 0x00000040           /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_MEMORY 0x00000080        /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_MAIN_DB 0x00000100       /* VFS only */
+#define SQLITE_OPEN_TEMP_DB 0x00000200       /* VFS only */
+#define SQLITE_OPEN_TRANSIENT_DB 0x00000400  /* VFS only */
+#define SQLITE_OPEN_MAIN_JOURNAL 0x00000800  /* VFS only */
+#define SQLITE_OPEN_TEMP_JOURNAL 0x00001000  /* VFS only */
+#define SQLITE_OPEN_SUBJOURNAL 0x00002000    /* VFS only */
+#define SQLITE_OPEN_SUPER_JOURNAL 0x00004000 /* VFS only */
+#define SQLITE_OPEN_NOMUTEX 0x00008000       /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_FULLMUTEX 0x00010000     /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_SHAREDCACHE 0x00020000   /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_PRIVATECACHE 0x00040000  /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_WAL 0x00080000           /* VFS only */
+#define SQLITE_OPEN_NOFOLLOW 0x01000000      /* Ok for sqlite3_open_v2() */
+#define SQLITE_OPEN_EXRESCODE 0x02000000     /* Extended result codes */
 
 /* Reserved:                         0x00F00000 */
 /* Legacy compatibility: */
-#define SQLITE_OPEN_MASTER_JOURNAL   0x00004000  /* VFS only */
-
+#define SQLITE_OPEN_MASTER_JOURNAL 0x00004000 /* VFS only */
 
 /*
 ** CAPI3REF: Device Characteristics
@@ -649,21 +647,21 @@ SQLITE_API int sqlite3_exec(
 ** write operations are bracketed by [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] and
 ** [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE].
 */
-#define SQLITE_IOCAP_ATOMIC                 0x00000001
-#define SQLITE_IOCAP_ATOMIC512              0x00000002
-#define SQLITE_IOCAP_ATOMIC1K               0x00000004
-#define SQLITE_IOCAP_ATOMIC2K               0x00000008
-#define SQLITE_IOCAP_ATOMIC4K               0x00000010
-#define SQLITE_IOCAP_ATOMIC8K               0x00000020
-#define SQLITE_IOCAP_ATOMIC16K              0x00000040
-#define SQLITE_IOCAP_ATOMIC32K              0x00000080
-#define SQLITE_IOCAP_ATOMIC64K              0x00000100
-#define SQLITE_IOCAP_SAFE_APPEND            0x00000200
-#define SQLITE_IOCAP_SEQUENTIAL             0x00000400
-#define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN  0x00000800
-#define SQLITE_IOCAP_POWERSAFE_OVERWRITE    0x00001000
-#define SQLITE_IOCAP_IMMUTABLE              0x00002000
-#define SQLITE_IOCAP_BATCH_ATOMIC           0x00004000
+#define SQLITE_IOCAP_ATOMIC 0x00000001
+#define SQLITE_IOCAP_ATOMIC512 0x00000002
+#define SQLITE_IOCAP_ATOMIC1K 0x00000004
+#define SQLITE_IOCAP_ATOMIC2K 0x00000008
+#define SQLITE_IOCAP_ATOMIC4K 0x00000010
+#define SQLITE_IOCAP_ATOMIC8K 0x00000020
+#define SQLITE_IOCAP_ATOMIC16K 0x00000040
+#define SQLITE_IOCAP_ATOMIC32K 0x00000080
+#define SQLITE_IOCAP_ATOMIC64K 0x00000100
+#define SQLITE_IOCAP_SAFE_APPEND 0x00000200
+#define SQLITE_IOCAP_SEQUENTIAL 0x00000400
+#define SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN 0x00000800
+#define SQLITE_IOCAP_POWERSAFE_OVERWRITE 0x00001000
+#define SQLITE_IOCAP_IMMUTABLE 0x00002000
+#define SQLITE_IOCAP_BATCH_ATOMIC 0x00004000
 
 /*
 ** CAPI3REF: File Locking Levels
@@ -672,11 +670,11 @@ SQLITE_API int sqlite3_exec(
 ** argument to calls it makes to the xLock() and xUnlock() methods
 ** of an [sqlite3_io_methods] object.
 */
-#define SQLITE_LOCK_NONE          0
-#define SQLITE_LOCK_SHARED        1
-#define SQLITE_LOCK_RESERVED      2
-#define SQLITE_LOCK_PENDING       3
-#define SQLITE_LOCK_EXCLUSIVE     4
+#define SQLITE_LOCK_NONE 0
+#define SQLITE_LOCK_SHARED 1
+#define SQLITE_LOCK_RESERVED 2
+#define SQLITE_LOCK_PENDING 3
+#define SQLITE_LOCK_EXCLUSIVE 4
 
 /*
 ** CAPI3REF: Synchronization Type Flags
@@ -704,146 +702,148 @@ SQLITE_API int sqlite3_exec(
 ** operating systems natively supported by SQLite, only Mac OSX
 ** cares about the difference.)
 */
-#define SQLITE_SYNC_NORMAL        0x00002
-#define SQLITE_SYNC_FULL          0x00003
-#define SQLITE_SYNC_DATAONLY      0x00010
-
-/*
-** CAPI3REF: OS Interface Open File Handle
-**
-** An [sqlite3_file] object represents an open file in the
-** [sqlite3_vfs | OS interface layer].  Individual OS interface
-** implementations will
-** want to subclass this object by appending additional fields
-** for their own use.  The pMethods entry is a pointer to an
-** [sqlite3_io_methods] object that defines methods for performing
-** I/O operations on the open file.
-*/
-typedef struct sqlite3_file sqlite3_file;
-struct sqlite3_file {
-  const struct sqlite3_io_methods *pMethods;  /* Methods for an open file */
-};
-
-/*
-** CAPI3REF: OS Interface File Virtual Methods Object
-**
-** Every file opened by the [sqlite3_vfs.xOpen] method populates an
-** [sqlite3_file] object (or, more commonly, a subclass of the
-** [sqlite3_file] object) with a pointer to an instance of this object.
-** This object defines the methods used to perform various operations
-** against the open file represented by the [sqlite3_file] object.
-**
-** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element
-** to a non-NULL pointer, then the sqlite3_io_methods.xClose method
-** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed.  The
-** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen]
-** is for the [sqlite3_vfs.xOpen] to set the sqlite3_file.pMethods element
-** to NULL.
-**
-** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or
-** [SQLITE_SYNC_FULL].  The first choice is the normal fsync().
-** The second choice is a Mac OS X style fullsync.  The [SQLITE_SYNC_DATAONLY]
-** flag may be ORed in to indicate that only the data of the file
-** and not its inode needs to be synced.
-**
-** The integer values to xLock() and xUnlock() are one of
-** <ul>
-** <li> [SQLITE_LOCK_NONE],
-** <li> [SQLITE_LOCK_SHARED],
-** <li> [SQLITE_LOCK_RESERVED],
-** <li> [SQLITE_LOCK_PENDING], or
-** <li> [SQLITE_LOCK_EXCLUSIVE].
-** </ul>
-** xLock() increases the lock. xUnlock() decreases the lock.
-** The xCheckReservedLock() method checks whether any database connection,
-** either in this process or in some other process, is holding a RESERVED,
-** PENDING, or EXCLUSIVE lock on the file.  It returns true
-** if such a lock exists and false otherwise.
-**
-** The xFileControl() method is a generic interface that allows custom
-** VFS implementations to directly control an open file using the
-** [sqlite3_file_control()] interface.  The second "op" argument is an
-** integer opcode.  The third argument is a generic pointer intended to
-** point to a structure that may contain arguments or space in which to
-** write return values.  Potential uses for xFileControl() might be
-** functions to enable blocking locks with timeouts, to change the
-** locking strategy (for example to use dot-file locks), to inquire
-** about the status of a lock, or to break stale locks.  The SQLite
-** core reserves all opcodes less than 100 for its own use.
-** A [file control opcodes | list of opcodes] less than 100 is available.
-** Applications that define a custom xFileControl method should use opcodes
-** greater than 100 to avoid conflicts.  VFS implementations should
-** return [SQLITE_NOTFOUND] for file control opcodes that they do not
-** recognize.
-**
-** The xSectorSize() method returns the sector size of the
-** device that underlies the file.  The sector size is the
-** minimum write that can be performed without disturbing
-** other bytes in the file.  The xDeviceCharacteristics()
-** method returns a bit vector describing behaviors of the
-** underlying device:
-**
-** <ul>
-** <li> [SQLITE_IOCAP_ATOMIC]
-** <li> [SQLITE_IOCAP_ATOMIC512]
-** <li> [SQLITE_IOCAP_ATOMIC1K]
-** <li> [SQLITE_IOCAP_ATOMIC2K]
-** <li> [SQLITE_IOCAP_ATOMIC4K]
-** <li> [SQLITE_IOCAP_ATOMIC8K]
-** <li> [SQLITE_IOCAP_ATOMIC16K]
-** <li> [SQLITE_IOCAP_ATOMIC32K]
-** <li> [SQLITE_IOCAP_ATOMIC64K]
-** <li> [SQLITE_IOCAP_SAFE_APPEND]
-** <li> [SQLITE_IOCAP_SEQUENTIAL]
-** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
-** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
-** <li> [SQLITE_IOCAP_IMMUTABLE]
-** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
-** </ul>
-**
-** The SQLITE_IOCAP_ATOMIC property means that all writes of
-** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
-** mean that writes of blocks that are nnn bytes in size and
-** are aligned to an address which is an integer multiple of
-** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
-** that when data is appended to a file, the data is appended
-** first then the size of the file is extended, never the other
-** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
-** information is written to disk in the same order as calls
-** to xWrite().
-**
-** If xRead() returns SQLITE_IOERR_SHORT_READ it must also fill
-** in the unread portions of the buffer with zeros.  A VFS that
-** fails to zero-fill short reads might seem to work.  However,
-** failure to zero-fill short reads will eventually lead to
-** database corruption.
-*/
-typedef struct sqlite3_io_methods sqlite3_io_methods;
-struct sqlite3_io_methods {
-  int iVersion;
-  int (*xClose)(sqlite3_file*);
-  int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
-  int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst);
-  int (*xTruncate)(sqlite3_file*, sqlite3_int64 size);
-  int (*xSync)(sqlite3_file*, int flags);
-  int (*xFileSize)(sqlite3_file*, sqlite3_int64 *pSize);
-  int (*xLock)(sqlite3_file*, int);
-  int (*xUnlock)(sqlite3_file*, int);
-  int (*xCheckReservedLock)(sqlite3_file*, int *pResOut);
-  int (*xFileControl)(sqlite3_file*, int op, void *pArg);
-  int (*xSectorSize)(sqlite3_file*);
-  int (*xDeviceCharacteristics)(sqlite3_file*);
-  /* Methods above are valid for version 1 */
-  int (*xShmMap)(sqlite3_file*, int iPg, int pgsz, int, void volatile**);
-  int (*xShmLock)(sqlite3_file*, int offset, int n, int flags);
-  void (*xShmBarrier)(sqlite3_file*);
-  int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
-  /* Methods above are valid for version 2 */
-  int (*xFetch)(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void **pp);
-  int (*xUnfetch)(sqlite3_file*, sqlite3_int64 iOfst, void *p);
-  /* Methods above are valid for version 3 */
-  /* Additional methods may be added in future releases */
-};
+#define SQLITE_SYNC_NORMAL 0x00002
+#define SQLITE_SYNC_FULL 0x00003
+#define SQLITE_SYNC_DATAONLY 0x00010
+
+    /*
+    ** CAPI3REF: OS Interface Open File Handle
+    **
+    ** An [sqlite3_file] object represents an open file in the
+    ** [sqlite3_vfs | OS interface layer].  Individual OS interface
+    ** implementations will
+    ** want to subclass this object by appending additional fields
+    ** for their own use.  The pMethods entry is a pointer to an
+    ** [sqlite3_io_methods] object that defines methods for performing
+    ** I/O operations on the open file.
+    */
+    typedef struct sqlite3_file sqlite3_file;
+    struct sqlite3_file
+    {
+        const struct sqlite3_io_methods* pMethods; /* Methods for an open file */
+    };
+
+    /*
+    ** CAPI3REF: OS Interface File Virtual Methods Object
+    **
+    ** Every file opened by the [sqlite3_vfs.xOpen] method populates an
+    ** [sqlite3_file] object (or, more commonly, a subclass of the
+    ** [sqlite3_file] object) with a pointer to an instance of this object.
+    ** This object defines the methods used to perform various operations
+    ** against the open file represented by the [sqlite3_file] object.
+    **
+    ** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element
+    ** to a non-NULL pointer, then the sqlite3_io_methods.xClose method
+    ** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed.  The
+    ** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen]
+    ** is for the [sqlite3_vfs.xOpen] to set the sqlite3_file.pMethods element
+    ** to NULL.
+    **
+    ** The flags argument to xSync may be one of [SQLITE_SYNC_NORMAL] or
+    ** [SQLITE_SYNC_FULL].  The first choice is the normal fsync().
+    ** The second choice is a Mac OS X style fullsync.  The [SQLITE_SYNC_DATAONLY]
+    ** flag may be ORed in to indicate that only the data of the file
+    ** and not its inode needs to be synced.
+    **
+    ** The integer values to xLock() and xUnlock() are one of
+    ** <ul>
+    ** <li> [SQLITE_LOCK_NONE],
+    ** <li> [SQLITE_LOCK_SHARED],
+    ** <li> [SQLITE_LOCK_RESERVED],
+    ** <li> [SQLITE_LOCK_PENDING], or
+    ** <li> [SQLITE_LOCK_EXCLUSIVE].
+    ** </ul>
+    ** xLock() increases the lock. xUnlock() decreases the lock.
+    ** The xCheckReservedLock() method checks whether any database connection,
+    ** either in this process or in some other process, is holding a RESERVED,
+    ** PENDING, or EXCLUSIVE lock on the file.  It returns true
+    ** if such a lock exists and false otherwise.
+    **
+    ** The xFileControl() method is a generic interface that allows custom
+    ** VFS implementations to directly control an open file using the
+    ** [sqlite3_file_control()] interface.  The second "op" argument is an
+    ** integer opcode.  The third argument is a generic pointer intended to
+    ** point to a structure that may contain arguments or space in which to
+    ** write return values.  Potential uses for xFileControl() might be
+    ** functions to enable blocking locks with timeouts, to change the
+    ** locking strategy (for example to use dot-file locks), to inquire
+    ** about the status of a lock, or to break stale locks.  The SQLite
+    ** core reserves all opcodes less than 100 for its own use.
+    ** A [file control opcodes | list of opcodes] less than 100 is available.
+    ** Applications that define a custom xFileControl method should use opcodes
+    ** greater than 100 to avoid conflicts.  VFS implementations should
+    ** return [SQLITE_NOTFOUND] for file control opcodes that they do not
+    ** recognize.
+    **
+    ** The xSectorSize() method returns the sector size of the
+    ** device that underlies the file.  The sector size is the
+    ** minimum write that can be performed without disturbing
+    ** other bytes in the file.  The xDeviceCharacteristics()
+    ** method returns a bit vector describing behaviors of the
+    ** underlying device:
+    **
+    ** <ul>
+    ** <li> [SQLITE_IOCAP_ATOMIC]
+    ** <li> [SQLITE_IOCAP_ATOMIC512]
+    ** <li> [SQLITE_IOCAP_ATOMIC1K]
+    ** <li> [SQLITE_IOCAP_ATOMIC2K]
+    ** <li> [SQLITE_IOCAP_ATOMIC4K]
+    ** <li> [SQLITE_IOCAP_ATOMIC8K]
+    ** <li> [SQLITE_IOCAP_ATOMIC16K]
+    ** <li> [SQLITE_IOCAP_ATOMIC32K]
+    ** <li> [SQLITE_IOCAP_ATOMIC64K]
+    ** <li> [SQLITE_IOCAP_SAFE_APPEND]
+    ** <li> [SQLITE_IOCAP_SEQUENTIAL]
+    ** <li> [SQLITE_IOCAP_UNDELETABLE_WHEN_OPEN]
+    ** <li> [SQLITE_IOCAP_POWERSAFE_OVERWRITE]
+    ** <li> [SQLITE_IOCAP_IMMUTABLE]
+    ** <li> [SQLITE_IOCAP_BATCH_ATOMIC]
+    ** </ul>
+    **
+    ** The SQLITE_IOCAP_ATOMIC property means that all writes of
+    ** any size are atomic.  The SQLITE_IOCAP_ATOMICnnn values
+    ** mean that writes of blocks that are nnn bytes in size and
+    ** are aligned to an address which is an integer multiple of
+    ** nnn are atomic.  The SQLITE_IOCAP_SAFE_APPEND value means
+    ** that when data is appended to a file, the data is appended
+    ** first then the size of the file is extended, never the other
+    ** way around.  The SQLITE_IOCAP_SEQUENTIAL property means that
+    ** information is written to disk in the same order as calls
+    ** to xWrite().
+    **
+    ** If xRead() returns SQLITE_IOERR_SHORT_READ it must also fill
+    ** in the unread portions of the buffer with zeros.  A VFS that
+    ** fails to zero-fill short reads might seem to work.  However,
+    ** failure to zero-fill short reads will eventually lead to
+    ** database corruption.
+    */
+    typedef struct sqlite3_io_methods sqlite3_io_methods;
+    struct sqlite3_io_methods
+    {
+        int iVersion;
+        int (*xClose)(sqlite3_file*);
+        int (*xRead)(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
+        int (*xWrite)(sqlite3_file*, const void*, int iAmt, sqlite3_int64 iOfst);
+        int (*xTruncate)(sqlite3_file*, sqlite3_int64 size);
+        int (*xSync)(sqlite3_file*, int flags);
+        int (*xFileSize)(sqlite3_file*, sqlite3_int64* pSize);
+        int (*xLock)(sqlite3_file*, int);
+        int (*xUnlock)(sqlite3_file*, int);
+        int (*xCheckReservedLock)(sqlite3_file*, int* pResOut);
+        int (*xFileControl)(sqlite3_file*, int op, void* pArg);
+        int (*xSectorSize)(sqlite3_file*);
+        int (*xDeviceCharacteristics)(sqlite3_file*);
+        /* Methods above are valid for version 1 */
+        int (*xShmMap)(sqlite3_file*, int iPg, int pgsz, int, void volatile**);
+        int (*xShmLock)(sqlite3_file*, int offset, int n, int flags);
+        void (*xShmBarrier)(sqlite3_file*);
+        int (*xShmUnmap)(sqlite3_file*, int deleteFlag);
+        /* Methods above are valid for version 2 */
+        int (*xFetch)(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void** pp);
+        int (*xUnfetch)(sqlite3_file*, sqlite3_int64 iOfst, void* p);
+        /* Methods above are valid for version 3 */
+        /* Additional methods may be added in future releases */
+    };
 
 /*
 ** CAPI3REF: Standard File Control Opcodes
@@ -1184,284 +1184,283 @@ struct sqlite3_io_methods {
 ** Used by the cksmvfs VFS module only.
 ** </ul>
 */
-#define SQLITE_FCNTL_LOCKSTATE               1
-#define SQLITE_FCNTL_GET_LOCKPROXYFILE       2
-#define SQLITE_FCNTL_SET_LOCKPROXYFILE       3
-#define SQLITE_FCNTL_LAST_ERRNO              4
-#define SQLITE_FCNTL_SIZE_HINT               5
-#define SQLITE_FCNTL_CHUNK_SIZE              6
-#define SQLITE_FCNTL_FILE_POINTER            7
-#define SQLITE_FCNTL_SYNC_OMITTED            8
-#define SQLITE_FCNTL_WIN32_AV_RETRY          9
-#define SQLITE_FCNTL_PERSIST_WAL            10
-#define SQLITE_FCNTL_OVERWRITE              11
-#define SQLITE_FCNTL_VFSNAME                12
-#define SQLITE_FCNTL_POWERSAFE_OVERWRITE    13
-#define SQLITE_FCNTL_PRAGMA                 14
-#define SQLITE_FCNTL_BUSYHANDLER            15
-#define SQLITE_FCNTL_TEMPFILENAME           16
-#define SQLITE_FCNTL_MMAP_SIZE              18
-#define SQLITE_FCNTL_TRACE                  19
-#define SQLITE_FCNTL_HAS_MOVED              20
-#define SQLITE_FCNTL_SYNC                   21
-#define SQLITE_FCNTL_COMMIT_PHASETWO        22
-#define SQLITE_FCNTL_WIN32_SET_HANDLE       23
-#define SQLITE_FCNTL_WAL_BLOCK              24
-#define SQLITE_FCNTL_ZIPVFS                 25
-#define SQLITE_FCNTL_RBU                    26
-#define SQLITE_FCNTL_VFS_POINTER            27
-#define SQLITE_FCNTL_JOURNAL_POINTER        28
-#define SQLITE_FCNTL_WIN32_GET_HANDLE       29
-#define SQLITE_FCNTL_PDB                    30
-#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE     31
-#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE    32
-#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE  33
-#define SQLITE_FCNTL_LOCK_TIMEOUT           34
-#define SQLITE_FCNTL_DATA_VERSION           35
-#define SQLITE_FCNTL_SIZE_LIMIT             36
-#define SQLITE_FCNTL_CKPT_DONE              37
-#define SQLITE_FCNTL_RESERVE_BYTES          38
-#define SQLITE_FCNTL_CKPT_START             39
-#define SQLITE_FCNTL_EXTERNAL_READER        40
-#define SQLITE_FCNTL_CKSM_FILE              41
+#define SQLITE_FCNTL_LOCKSTATE 1
+#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
+#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
+#define SQLITE_FCNTL_LAST_ERRNO 4
+#define SQLITE_FCNTL_SIZE_HINT 5
+#define SQLITE_FCNTL_CHUNK_SIZE 6
+#define SQLITE_FCNTL_FILE_POINTER 7
+#define SQLITE_FCNTL_SYNC_OMITTED 8
+#define SQLITE_FCNTL_WIN32_AV_RETRY 9
+#define SQLITE_FCNTL_PERSIST_WAL 10
+#define SQLITE_FCNTL_OVERWRITE 11
+#define SQLITE_FCNTL_VFSNAME 12
+#define SQLITE_FCNTL_POWERSAFE_OVERWRITE 13
+#define SQLITE_FCNTL_PRAGMA 14
+#define SQLITE_FCNTL_BUSYHANDLER 15
+#define SQLITE_FCNTL_TEMPFILENAME 16
+#define SQLITE_FCNTL_MMAP_SIZE 18
+#define SQLITE_FCNTL_TRACE 19
+#define SQLITE_FCNTL_HAS_MOVED 20
+#define SQLITE_FCNTL_SYNC 21
+#define SQLITE_FCNTL_COMMIT_PHASETWO 22
+#define SQLITE_FCNTL_WIN32_SET_HANDLE 23
+#define SQLITE_FCNTL_WAL_BLOCK 24
+#define SQLITE_FCNTL_ZIPVFS 25
+#define SQLITE_FCNTL_RBU 26
+#define SQLITE_FCNTL_VFS_POINTER 27
+#define SQLITE_FCNTL_JOURNAL_POINTER 28
+#define SQLITE_FCNTL_WIN32_GET_HANDLE 29
+#define SQLITE_FCNTL_PDB 30
+#define SQLITE_FCNTL_BEGIN_ATOMIC_WRITE 31
+#define SQLITE_FCNTL_COMMIT_ATOMIC_WRITE 32
+#define SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE 33
+#define SQLITE_FCNTL_LOCK_TIMEOUT 34
+#define SQLITE_FCNTL_DATA_VERSION 35
+#define SQLITE_FCNTL_SIZE_LIMIT 36
+#define SQLITE_FCNTL_CKPT_DONE 37
+#define SQLITE_FCNTL_RESERVE_BYTES 38
+#define SQLITE_FCNTL_CKPT_START 39
+#define SQLITE_FCNTL_EXTERNAL_READER 40
+#define SQLITE_FCNTL_CKSM_FILE 41
 
 /* deprecated names */
-#define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
-#define SQLITE_SET_LOCKPROXYFILE      SQLITE_FCNTL_SET_LOCKPROXYFILE
-#define SQLITE_LAST_ERRNO             SQLITE_FCNTL_LAST_ERRNO
-
-
-/*
-** CAPI3REF: Mutex Handle
-**
-** The mutex module within SQLite defines [sqlite3_mutex] to be an
-** abstract type for a mutex object.  The SQLite core never looks
-** at the internal representation of an [sqlite3_mutex].  It only
-** deals with pointers to the [sqlite3_mutex] object.
-**
-** Mutexes are created using [sqlite3_mutex_alloc()].
-*/
-typedef struct sqlite3_mutex sqlite3_mutex;
-
-/*
-** CAPI3REF: Loadable Extension Thunk
-**
-** A pointer to the opaque sqlite3_api_routines structure is passed as
-** the third parameter to entry points of [loadable extensions].  This
-** structure must be typedefed in order to work around compiler warnings
-** on some platforms.
-*/
-typedef struct sqlite3_api_routines sqlite3_api_routines;
-
-/*
-** CAPI3REF: OS Interface Object
-**
-** An instance of the sqlite3_vfs object defines the interface between
-** the SQLite core and the underlying operating system.  The "vfs"
-** in the name of the object stands for "virtual file system".  See
-** the [VFS | VFS documentation] for further information.
-**
-** The VFS interface is sometimes extended by adding new methods onto
-** the end.  Each time such an extension occurs, the iVersion field
-** is incremented.  The iVersion value started out as 1 in
-** SQLite [version 3.5.0] on [dateof:3.5.0], then increased to 2
-** with SQLite [version 3.7.0] on [dateof:3.7.0], and then increased
-** to 3 with SQLite [version 3.7.6] on [dateof:3.7.6].  Additional fields
-** may be appended to the sqlite3_vfs object and the iVersion value
-** may increase again in future versions of SQLite.
-** Note that due to an oversight, the structure
-** of the sqlite3_vfs object changed in the transition from
-** SQLite [version 3.5.9] to [version 3.6.0] on [dateof:3.6.0]
-** and yet the iVersion field was not increased.
-**
-** The szOsFile field is the size of the subclassed [sqlite3_file]
-** structure used by this VFS.  mxPathname is the maximum length of
-** a pathname in this VFS.
-**
-** Registered sqlite3_vfs objects are kept on a linked list formed by
-** the pNext pointer.  The [sqlite3_vfs_register()]
-** and [sqlite3_vfs_unregister()] interfaces manage this list
-** in a thread-safe way.  The [sqlite3_vfs_find()] interface
-** searches the list.  Neither the application code nor the VFS
-** implementation should use the pNext pointer.
-**
-** The pNext field is the only field in the sqlite3_vfs
-** structure that SQLite will ever modify.  SQLite will only access
-** or modify this field while holding a particular static mutex.
-** The application should never modify anything within the sqlite3_vfs
-** object once the object has been registered.
-**
-** The zName field holds the name of the VFS module.  The name must
-** be unique across all VFS modules.
-**
-** [[sqlite3_vfs.xOpen]]
-** ^SQLite guarantees that the zFilename parameter to xOpen
-** is either a NULL pointer or string obtained
-** from xFullPathname() with an optional suffix added.
-** ^If a suffix is added to the zFilename parameter, it will
-** consist of a single "-" character followed by no more than
-** 11 alphanumeric and/or "-" characters.
-** ^SQLite further guarantees that
-** the string will be valid and unchanged until xClose() is
-** called. Because of the previous sentence,
-** the [sqlite3_file] can safely store a pointer to the
-** filename if it needs to remember the filename for some reason.
-** If the zFilename parameter to xOpen is a NULL pointer then xOpen
-** must invent its own temporary name for the file.  ^Whenever the
-** xFilename parameter is NULL it will also be the case that the
-** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE].
-**
-** The flags argument to xOpen() includes all bits set in
-** the flags argument to [sqlite3_open_v2()].  Or if [sqlite3_open()]
-** or [sqlite3_open16()] is used, then flags includes at least
-** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE].
-** If xOpen() opens a file read-only then it sets *pOutFlags to
-** include [SQLITE_OPEN_READONLY].  Other bits in *pOutFlags may be set.
-**
-** ^(SQLite will also add one of the following flags to the xOpen()
-** call, depending on the object being opened:
-**
-** <ul>
-** <li>  [SQLITE_OPEN_MAIN_DB]
-** <li>  [SQLITE_OPEN_MAIN_JOURNAL]
-** <li>  [SQLITE_OPEN_TEMP_DB]
-** <li>  [SQLITE_OPEN_TEMP_JOURNAL]
-** <li>  [SQLITE_OPEN_TRANSIENT_DB]
-** <li>  [SQLITE_OPEN_SUBJOURNAL]
-** <li>  [SQLITE_OPEN_SUPER_JOURNAL]
-** <li>  [SQLITE_OPEN_WAL]
-** </ul>)^
-**
-** The file I/O implementation can use the object type flags to
-** change the way it deals with files.  For example, an application
-** that does not care about crash recovery or rollback might make
-** the open of a journal file a no-op.  Writes to this journal would
-** also be no-ops, and any attempt to read the journal would return
-** SQLITE_IOERR.  Or the implementation might recognize that a database
-** file will be doing page-aligned sector reads and writes in a random
-** order and set up its I/O subsystem accordingly.
-**
-** SQLite might also add one of the following flags to the xOpen method:
-**
-** <ul>
-** <li> [SQLITE_OPEN_DELETEONCLOSE]
-** <li> [SQLITE_OPEN_EXCLUSIVE]
-** </ul>
-**
-** The [SQLITE_OPEN_DELETEONCLOSE] flag means the file should be
-** deleted when it is closed.  ^The [SQLITE_OPEN_DELETEONCLOSE]
-** will be set for TEMP databases and their journals, transient
-** databases, and subjournals.
-**
-** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction
-** with the [SQLITE_OPEN_CREATE] flag, which are both directly
-** analogous to the O_EXCL and O_CREAT flags of the POSIX open()
-** API.  The SQLITE_OPEN_EXCLUSIVE flag, when paired with the
-** SQLITE_OPEN_CREATE, is used to indicate that file should always
-** be created, and that it is an error if it already exists.
-** It is <i>not</i> used to indicate the file should be opened
-** for exclusive access.
-**
-** ^At least szOsFile bytes of memory are allocated by SQLite
-** to hold the [sqlite3_file] structure passed as the third
-** argument to xOpen.  The xOpen method does not have to
-** allocate the structure; it should just fill it in.  Note that
-** the xOpen method must set the sqlite3_file.pMethods to either
-** a valid [sqlite3_io_methods] object or to NULL.  xOpen must do
-** this even if the open fails.  SQLite expects that the sqlite3_file.pMethods
-** element will be valid after xOpen returns regardless of the success
-** or failure of the xOpen call.
-**
-** [[sqlite3_vfs.xAccess]]
-** ^The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
-** to test for the existence of a file, or [SQLITE_ACCESS_READWRITE] to
-** test whether a file is readable and writable, or [SQLITE_ACCESS_READ]
-** to test whether a file is at least readable.  The SQLITE_ACCESS_READ
-** flag is never actually used and is not implemented in the built-in
-** VFSes of SQLite.  The file is named by the second argument and can be a
-** directory. The xAccess method returns [SQLITE_OK] on success or some
-** non-zero error code if there is an I/O error or if the name of
-** the file given in the second argument is illegal.  If SQLITE_OK
-** is returned, then non-zero or zero is written into *pResOut to indicate
-** whether or not the file is accessible.
-**
-** ^SQLite will always allocate at least mxPathname+1 bytes for the
-** output buffer xFullPathname.  The exact size of the output buffer
-** is also passed as a parameter to both  methods. If the output buffer
-** is not large enough, [SQLITE_CANTOPEN] should be returned. Since this is
-** handled as a fatal error by SQLite, vfs implementations should endeavor
-** to prevent this by setting mxPathname to a sufficiently large value.
-**
-** The xRandomness(), xSleep(), xCurrentTime(), and xCurrentTimeInt64()
-** interfaces are not strictly a part of the filesystem, but they are
-** included in the VFS structure for completeness.
-** The xRandomness() function attempts to return nBytes bytes
-** of good-quality randomness into zOut.  The return value is
-** the actual number of bytes of randomness obtained.
-** The xSleep() method causes the calling thread to sleep for at
-** least the number of microseconds given.  ^The xCurrentTime()
-** method returns a Julian Day Number for the current date and time as
-** a floating point value.
-** ^The xCurrentTimeInt64() method returns, as an integer, the Julian
-** Day Number multiplied by 86400000 (the number of milliseconds in
-** a 24-hour day).
-** ^SQLite will use the xCurrentTimeInt64() method to get the current
-** date and time if that method is available (if iVersion is 2 or
-** greater and the function pointer is not NULL) and will fall back
-** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
-**
-** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
-** are not used by the SQLite core.  These optional interfaces are provided
-** by some VFSes to facilitate testing of the VFS code. By overriding
-** system calls with functions under its control, a test program can
-** simulate faults and error conditions that would otherwise be difficult
-** or impossible to induce.  The set of system calls that can be overridden
-** varies from one VFS to another, and from one version of the same VFS to the
-** next.  Applications that use these interfaces must be prepared for any
-** or all of these interfaces to be NULL or for their behavior to change
-** from one release to the next.  Applications must not attempt to access
-** any of these methods if the iVersion of the VFS is less than 3.
-*/
-typedef struct sqlite3_vfs sqlite3_vfs;
-typedef void (*sqlite3_syscall_ptr)(void);
-struct sqlite3_vfs {
-  int iVersion;            /* Structure version number (currently 3) */
-  int szOsFile;            /* Size of subclassed sqlite3_file */
-  int mxPathname;          /* Maximum file pathname length */
-  sqlite3_vfs *pNext;      /* Next registered VFS */
-  const char *zName;       /* Name of this virtual file system */
-  void *pAppData;          /* Pointer to application-specific data */
-  int (*xOpen)(sqlite3_vfs*, const char *zName, sqlite3_file*,
-               int flags, int *pOutFlags);
-  int (*xDelete)(sqlite3_vfs*, const char *zName, int syncDir);
-  int (*xAccess)(sqlite3_vfs*, const char *zName, int flags, int *pResOut);
-  int (*xFullPathname)(sqlite3_vfs*, const char *zName, int nOut, char *zOut);
-  void *(*xDlOpen)(sqlite3_vfs*, const char *zFilename);
-  void (*xDlError)(sqlite3_vfs*, int nByte, char *zErrMsg);
-  void (*(*xDlSym)(sqlite3_vfs*,void*, const char *zSymbol))(void);
-  void (*xDlClose)(sqlite3_vfs*, void*);
-  int (*xRandomness)(sqlite3_vfs*, int nByte, char *zOut);
-  int (*xSleep)(sqlite3_vfs*, int microseconds);
-  int (*xCurrentTime)(sqlite3_vfs*, double*);
-  int (*xGetLastError)(sqlite3_vfs*, int, char *);
-  /*
-  ** The methods above are in version 1 of the sqlite_vfs object
-  ** definition.  Those that follow are added in version 2 or later
-  */
-  int (*xCurrentTimeInt64)(sqlite3_vfs*, sqlite3_int64*);
-  /*
-  ** The methods above are in versions 1 and 2 of the sqlite_vfs object.
-  ** Those below are for version 3 and greater.
-  */
-  int (*xSetSystemCall)(sqlite3_vfs*, const char *zName, sqlite3_syscall_ptr);
-  sqlite3_syscall_ptr (*xGetSystemCall)(sqlite3_vfs*, const char *zName);
-  const char *(*xNextSystemCall)(sqlite3_vfs*, const char *zName);
-  /*
-  ** The methods above are in versions 1 through 3 of the sqlite_vfs object.
-  ** New fields may be appended in future versions.  The iVersion
-  ** value will increment whenever this happens.
-  */
-};
+#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
+#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
+#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
+
+    /*
+    ** CAPI3REF: Mutex Handle
+    **
+    ** The mutex module within SQLite defines [sqlite3_mutex] to be an
+    ** abstract type for a mutex object.  The SQLite core never looks
+    ** at the internal representation of an [sqlite3_mutex].  It only
+    ** deals with pointers to the [sqlite3_mutex] object.
+    **
+    ** Mutexes are created using [sqlite3_mutex_alloc()].
+    */
+    typedef struct sqlite3_mutex sqlite3_mutex;
+
+    /*
+    ** CAPI3REF: Loadable Extension Thunk
+    **
+    ** A pointer to the opaque sqlite3_api_routines structure is passed as
+    ** the third parameter to entry points of [loadable extensions].  This
+    ** structure must be typedefed in order to work around compiler warnings
+    ** on some platforms.
+    */
+    typedef struct sqlite3_api_routines sqlite3_api_routines;
+
+    /*
+    ** CAPI3REF: OS Interface Object
+    **
+    ** An instance of the sqlite3_vfs object defines the interface between
+    ** the SQLite core and the underlying operating system.  The "vfs"
+    ** in the name of the object stands for "virtual file system".  See
+    ** the [VFS | VFS documentation] for further information.
+    **
+    ** The VFS interface is sometimes extended by adding new methods onto
+    ** the end.  Each time such an extension occurs, the iVersion field
+    ** is incremented.  The iVersion value started out as 1 in
+    ** SQLite [version 3.5.0] on [dateof:3.5.0], then increased to 2
+    ** with SQLite [version 3.7.0] on [dateof:3.7.0], and then increased
+    ** to 3 with SQLite [version 3.7.6] on [dateof:3.7.6].  Additional fields
+    ** may be appended to the sqlite3_vfs object and the iVersion value
+    ** may increase again in future versions of SQLite.
+    ** Note that due to an oversight, the structure
+    ** of the sqlite3_vfs object changed in the transition from
+    ** SQLite [version 3.5.9] to [version 3.6.0] on [dateof:3.6.0]
+    ** and yet the iVersion field was not increased.
+    **
+    ** The szOsFile field is the size of the subclassed [sqlite3_file]
+    ** structure used by this VFS.  mxPathname is the maximum length of
+    ** a pathname in this VFS.
+    **
+    ** Registered sqlite3_vfs objects are kept on a linked list formed by
+    ** the pNext pointer.  The [sqlite3_vfs_register()]
+    ** and [sqlite3_vfs_unregister()] interfaces manage this list
+    ** in a thread-safe way.  The [sqlite3_vfs_find()] interface
+    ** searches the list.  Neither the application code nor the VFS
+    ** implementation should use the pNext pointer.
+    **
+    ** The pNext field is the only field in the sqlite3_vfs
+    ** structure that SQLite will ever modify.  SQLite will only access
+    ** or modify this field while holding a particular static mutex.
+    ** The application should never modify anything within the sqlite3_vfs
+    ** object once the object has been registered.
+    **
+    ** The zName field holds the name of the VFS module.  The name must
+    ** be unique across all VFS modules.
+    **
+    ** [[sqlite3_vfs.xOpen]]
+    ** ^SQLite guarantees that the zFilename parameter to xOpen
+    ** is either a NULL pointer or string obtained
+    ** from xFullPathname() with an optional suffix added.
+    ** ^If a suffix is added to the zFilename parameter, it will
+    ** consist of a single "-" character followed by no more than
+    ** 11 alphanumeric and/or "-" characters.
+    ** ^SQLite further guarantees that
+    ** the string will be valid and unchanged until xClose() is
+    ** called. Because of the previous sentence,
+    ** the [sqlite3_file] can safely store a pointer to the
+    ** filename if it needs to remember the filename for some reason.
+    ** If the zFilename parameter to xOpen is a NULL pointer then xOpen
+    ** must invent its own temporary name for the file.  ^Whenever the
+    ** xFilename parameter is NULL it will also be the case that the
+    ** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE].
+    **
+    ** The flags argument to xOpen() includes all bits set in
+    ** the flags argument to [sqlite3_open_v2()].  Or if [sqlite3_open()]
+    ** or [sqlite3_open16()] is used, then flags includes at least
+    ** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE].
+    ** If xOpen() opens a file read-only then it sets *pOutFlags to
+    ** include [SQLITE_OPEN_READONLY].  Other bits in *pOutFlags may be set.
+    **
+    ** ^(SQLite will also add one of the following flags to the xOpen()
+    ** call, depending on the object being opened:
+    **
+    ** <ul>
+    ** <li>  [SQLITE_OPEN_MAIN_DB]
+    ** <li>  [SQLITE_OPEN_MAIN_JOURNAL]
+    ** <li>  [SQLITE_OPEN_TEMP_DB]
+    ** <li>  [SQLITE_OPEN_TEMP_JOURNAL]
+    ** <li>  [SQLITE_OPEN_TRANSIENT_DB]
+    ** <li>  [SQLITE_OPEN_SUBJOURNAL]
+    ** <li>  [SQLITE_OPEN_SUPER_JOURNAL]
+    ** <li>  [SQLITE_OPEN_WAL]
+    ** </ul>)^
+    **
+    ** The file I/O implementation can use the object type flags to
+    ** change the way it deals with files.  For example, an application
+    ** that does not care about crash recovery or rollback might make
+    ** the open of a journal file a no-op.  Writes to this journal would
+    ** also be no-ops, and any attempt to read the journal would return
+    ** SQLITE_IOERR.  Or the implementation might recognize that a database
+    ** file will be doing page-aligned sector reads and writes in a random
+    ** order and set up its I/O subsystem accordingly.
+    **
+    ** SQLite might also add one of the following flags to the xOpen method:
+    **
+    ** <ul>
+    ** <li> [SQLITE_OPEN_DELETEONCLOSE]
+    ** <li> [SQLITE_OPEN_EXCLUSIVE]
+    ** </ul>
+    **
+    ** The [SQLITE_OPEN_DELETEONCLOSE] flag means the file should be
+    ** deleted when it is closed.  ^The [SQLITE_OPEN_DELETEONCLOSE]
+    ** will be set for TEMP databases and their journals, transient
+    ** databases, and subjournals.
+    **
+    ** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction
+    ** with the [SQLITE_OPEN_CREATE] flag, which are both directly
+    ** analogous to the O_EXCL and O_CREAT flags of the POSIX open()
+    ** API.  The SQLITE_OPEN_EXCLUSIVE flag, when paired with the
+    ** SQLITE_OPEN_CREATE, is used to indicate that file should always
+    ** be created, and that it is an error if it already exists.
+    ** It is <i>not</i> used to indicate the file should be opened
+    ** for exclusive access.
+    **
+    ** ^At least szOsFile bytes of memory are allocated by SQLite
+    ** to hold the [sqlite3_file] structure passed as the third
+    ** argument to xOpen.  The xOpen method does not have to
+    ** allocate the structure; it should just fill it in.  Note that
+    ** the xOpen method must set the sqlite3_file.pMethods to either
+    ** a valid [sqlite3_io_methods] object or to NULL.  xOpen must do
+    ** this even if the open fails.  SQLite expects that the sqlite3_file.pMethods
+    ** element will be valid after xOpen returns regardless of the success
+    ** or failure of the xOpen call.
+    **
+    ** [[sqlite3_vfs.xAccess]]
+    ** ^The flags argument to xAccess() may be [SQLITE_ACCESS_EXISTS]
+    ** to test for the existence of a file, or [SQLITE_ACCESS_READWRITE] to
+    ** test whether a file is readable and writable, or [SQLITE_ACCESS_READ]
+    ** to test whether a file is at least readable.  The SQLITE_ACCESS_READ
+    ** flag is never actually used and is not implemented in the built-in
+    ** VFSes of SQLite.  The file is named by the second argument and can be a
+    ** directory. The xAccess method returns [SQLITE_OK] on success or some
+    ** non-zero error code if there is an I/O error or if the name of
+    ** the file given in the second argument is illegal.  If SQLITE_OK
+    ** is returned, then non-zero or zero is written into *pResOut to indicate
+    ** whether or not the file is accessible.
+    **
+    ** ^SQLite will always allocate at least mxPathname+1 bytes for the
+    ** output buffer xFullPathname.  The exact size of the output buffer
+    ** is also passed as a parameter to both  methods. If the output buffer
+    ** is not large enough, [SQLITE_CANTOPEN] should be returned. Since this is
+    ** handled as a fatal error by SQLite, vfs implementations should endeavor
+    ** to prevent this by setting mxPathname to a sufficiently large value.
+    **
+    ** The xRandomness(), xSleep(), xCurrentTime(), and xCurrentTimeInt64()
+    ** interfaces are not strictly a part of the filesystem, but they are
+    ** included in the VFS structure for completeness.
+    ** The xRandomness() function attempts to return nBytes bytes
+    ** of good-quality randomness into zOut.  The return value is
+    ** the actual number of bytes of randomness obtained.
+    ** The xSleep() method causes the calling thread to sleep for at
+    ** least the number of microseconds given.  ^The xCurrentTime()
+    ** method returns a Julian Day Number for the current date and time as
+    ** a floating point value.
+    ** ^The xCurrentTimeInt64() method returns, as an integer, the Julian
+    ** Day Number multiplied by 86400000 (the number of milliseconds in
+    ** a 24-hour day).
+    ** ^SQLite will use the xCurrentTimeInt64() method to get the current
+    ** date and time if that method is available (if iVersion is 2 or
+    ** greater and the function pointer is not NULL) and will fall back
+    ** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
+    **
+    ** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
+    ** are not used by the SQLite core.  These optional interfaces are provided
+    ** by some VFSes to facilitate testing of the VFS code. By overriding
+    ** system calls with functions under its control, a test program can
+    ** simulate faults and error conditions that would otherwise be difficult
+    ** or impossible to induce.  The set of system calls that can be overridden
+    ** varies from one VFS to another, and from one version of the same VFS to the
+    ** next.  Applications that use these interfaces must be prepared for any
+    ** or all of these interfaces to be NULL or for their behavior to change
+    ** from one release to the next.  Applications must not attempt to access
+    ** any of these methods if the iVersion of the VFS is less than 3.
+    */
+    typedef struct sqlite3_vfs sqlite3_vfs;
+    typedef void (*sqlite3_syscall_ptr)(void);
+    struct sqlite3_vfs
+    {
+        int iVersion;       /* Structure version number (currently 3) */
+        int szOsFile;       /* Size of subclassed sqlite3_file */
+        int mxPathname;     /* Maximum file pathname length */
+        sqlite3_vfs* pNext; /* Next registered VFS */
+        const char* zName;  /* Name of this virtual file system */
+        void* pAppData;     /* Pointer to application-specific data */
+        int (*xOpen)(sqlite3_vfs*, const char* zName, sqlite3_file*, int flags, int* pOutFlags);
+        int (*xDelete)(sqlite3_vfs*, const char* zName, int syncDir);
+        int (*xAccess)(sqlite3_vfs*, const char* zName, int flags, int* pResOut);
+        int (*xFullPathname)(sqlite3_vfs*, const char* zName, int nOut, char* zOut);
+        void* (*xDlOpen)(sqlite3_vfs*, const char* zFilename);
+        void (*xDlError)(sqlite3_vfs*, int nByte, char* zErrMsg);
+        void (*(*xDlSym)(sqlite3_vfs*, void*, const char* zSymbol))(void);
+        void (*xDlClose)(sqlite3_vfs*, void*);
+        int (*xRandomness)(sqlite3_vfs*, int nByte, char* zOut);
+        int (*xSleep)(sqlite3_vfs*, int microseconds);
+        int (*xCurrentTime)(sqlite3_vfs*, double*);
+        int (*xGetLastError)(sqlite3_vfs*, int, char*);
+        /*
+        ** The methods above are in version 1 of the sqlite_vfs object
+        ** definition.  Those that follow are added in version 2 or later
+        */
+        int (*xCurrentTimeInt64)(sqlite3_vfs*, sqlite3_int64*);
+        /*
+        ** The methods above are in versions 1 and 2 of the sqlite_vfs object.
+        ** Those below are for version 3 and greater.
+        */
+        int (*xSetSystemCall)(sqlite3_vfs*, const char* zName, sqlite3_syscall_ptr);
+        sqlite3_syscall_ptr (*xGetSystemCall)(sqlite3_vfs*, const char* zName);
+        const char* (*xNextSystemCall)(sqlite3_vfs*, const char* zName);
+        /*
+        ** The methods above are in versions 1 through 3 of the sqlite_vfs object.
+        ** New fields may be appended in future versions.  The iVersion
+        ** value will increment whenever this happens.
+        */
+    };
 
 /*
 ** CAPI3REF: Flags for the xAccess VFS method
@@ -1483,9 +1482,9 @@ struct sqlite3_vfs {
 ** currently unused, though it might be used in a future release of
 ** SQLite.
 */
-#define SQLITE_ACCESS_EXISTS    0
-#define SQLITE_ACCESS_READWRITE 1   /* Used by PRAGMA temp_store_directory */
-#define SQLITE_ACCESS_READ      2   /* Unused */
+#define SQLITE_ACCESS_EXISTS 0
+#define SQLITE_ACCESS_READWRITE 1 /* Used by PRAGMA temp_store_directory */
+#define SQLITE_ACCESS_READ 2      /* Unused */
 
 /*
 ** CAPI3REF: Flags for the xShmLock VFS method
@@ -1509,10 +1508,10 @@ struct sqlite3_vfs {
 ** between unlocked and EXCLUSIVE.  It cannot transition between SHARED
 ** and EXCLUSIVE.
 */
-#define SQLITE_SHM_UNLOCK       1
-#define SQLITE_SHM_LOCK         2
-#define SQLITE_SHM_SHARED       4
-#define SQLITE_SHM_EXCLUSIVE    8
+#define SQLITE_SHM_UNLOCK 1
+#define SQLITE_SHM_LOCK 2
+#define SQLITE_SHM_SHARED 4
+#define SQLITE_SHM_EXCLUSIVE 8
 
 /*
 ** CAPI3REF: Maximum xShmLock index
@@ -1522,215 +1521,215 @@ struct sqlite3_vfs {
 ** The SQLite core will never attempt to acquire or release a
 ** lock outside of this range
 */
-#define SQLITE_SHM_NLOCK        8
-
-
-/*
-** CAPI3REF: Initialize The SQLite Library
-**
-** ^The sqlite3_initialize() routine initializes the
-** SQLite library.  ^The sqlite3_shutdown() routine
-** deallocates any resources that were allocated by sqlite3_initialize().
-** These routines are designed to aid in process initialization and
-** shutdown on embedded systems.  Workstation applications using
-** SQLite normally do not need to invoke either of these routines.
-**
-** A call to sqlite3_initialize() is an "effective" call if it is
-** the first time sqlite3_initialize() is invoked during the lifetime of
-** the process, or if it is the first time sqlite3_initialize() is invoked
-** following a call to sqlite3_shutdown().  ^(Only an effective call
-** of sqlite3_initialize() does any initialization.  All other calls
-** are harmless no-ops.)^
-**
-** A call to sqlite3_shutdown() is an "effective" call if it is the first
-** call to sqlite3_shutdown() since the last sqlite3_initialize().  ^(Only
-** an effective call to sqlite3_shutdown() does any deinitialization.
-** All other valid calls to sqlite3_shutdown() are harmless no-ops.)^
-**
-** The sqlite3_initialize() interface is threadsafe, but sqlite3_shutdown()
-** is not.  The sqlite3_shutdown() interface must only be called from a
-** single thread.  All open [database connections] must be closed and all
-** other SQLite resources must be deallocated prior to invoking
-** sqlite3_shutdown().
-**
-** Among other things, ^sqlite3_initialize() will invoke
-** sqlite3_os_init().  Similarly, ^sqlite3_shutdown()
-** will invoke sqlite3_os_end().
-**
-** ^The sqlite3_initialize() routine returns [SQLITE_OK] on success.
-** ^If for some reason, sqlite3_initialize() is unable to initialize
-** the library (perhaps it is unable to allocate a needed resource such
-** as a mutex) it returns an [error code] other than [SQLITE_OK].
-**
-** ^The sqlite3_initialize() routine is called internally by many other
-** SQLite interfaces so that an application usually does not need to
-** invoke sqlite3_initialize() directly.  For example, [sqlite3_open()]
-** calls sqlite3_initialize() so the SQLite library will be automatically
-** initialized when [sqlite3_open()] is called if it has not be initialized
-** already.  ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
-** compile-time option, then the automatic calls to sqlite3_initialize()
-** are omitted and the application must call sqlite3_initialize() directly
-** prior to using any other SQLite interface.  For maximum portability,
-** it is recommended that applications always invoke sqlite3_initialize()
-** directly prior to using any other SQLite interface.  Future releases
-** of SQLite may require this.  In other words, the behavior exhibited
-** when SQLite is compiled with [SQLITE_OMIT_AUTOINIT] might become the
-** default behavior in some future release of SQLite.
-**
-** The sqlite3_os_init() routine does operating-system specific
-** initialization of the SQLite library.  The sqlite3_os_end()
-** routine undoes the effect of sqlite3_os_init().  Typical tasks
-** performed by these routines include allocation or deallocation
-** of static resources, initialization of global variables,
-** setting up a default [sqlite3_vfs] module, or setting up
-** a default configuration using [sqlite3_config()].
-**
-** The application should never invoke either sqlite3_os_init()
-** or sqlite3_os_end() directly.  The application should only invoke
-** sqlite3_initialize() and sqlite3_shutdown().  The sqlite3_os_init()
-** interface is called automatically by sqlite3_initialize() and
-** sqlite3_os_end() is called by sqlite3_shutdown().  Appropriate
-** implementations for sqlite3_os_init() and sqlite3_os_end()
-** are built into SQLite when it is compiled for Unix, Windows, or OS/2.
-** When [custom builds | built for other platforms]
-** (using the [SQLITE_OS_OTHER=1] compile-time
-** option) the application must supply a suitable implementation for
-** sqlite3_os_init() and sqlite3_os_end().  An application-supplied
-** implementation of sqlite3_os_init() or sqlite3_os_end()
-** must return [SQLITE_OK] on success and some other [error code] upon
-** failure.
-*/
-SQLITE_API int sqlite3_initialize(void);
-SQLITE_API int sqlite3_shutdown(void);
-SQLITE_API int sqlite3_os_init(void);
-SQLITE_API int sqlite3_os_end(void);
-
-/*
-** CAPI3REF: Configuring The SQLite Library
-**
-** The sqlite3_config() interface is used to make global configuration
-** changes to SQLite in order to tune SQLite to the specific needs of
-** the application.  The default configuration is recommended for most
-** applications and so this routine is usually not necessary.  It is
-** provided to support rare applications with unusual needs.
-**
-** <b>The sqlite3_config() interface is not threadsafe. The application
-** must ensure that no other SQLite interfaces are invoked by other
-** threads while sqlite3_config() is running.</b>
-**
-** The sqlite3_config() interface
-** may only be invoked prior to library initialization using
-** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
-** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
-** [sqlite3_shutdown()] then it will return SQLITE_MISUSE.
-** Note, however, that ^sqlite3_config() can be called as part of the
-** implementation of an application-defined [sqlite3_os_init()].
-**
-** The first argument to sqlite3_config() is an integer
-** [configuration option] that determines
-** what property of SQLite is to be configured.  Subsequent arguments
-** vary depending on the [configuration option]
-** in the first argument.
-**
-** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
-** ^If the option is unknown or SQLite is unable to set the option
-** then this routine returns a non-zero [error code].
-*/
-SQLITE_API int sqlite3_config(int, ...);
-
-/*
-** CAPI3REF: Configure database connections
-** METHOD: sqlite3
-**
-** The sqlite3_db_config() interface is used to make configuration
-** changes to a [database connection].  The interface is similar to
-** [sqlite3_config()] except that the changes apply to a single
-** [database connection] (specified in the first argument).
-**
-** The second argument to sqlite3_db_config(D,V,...)  is the
-** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code
-** that indicates what aspect of the [database connection] is being configured.
-** Subsequent arguments vary depending on the configuration verb.
-**
-** ^Calls to sqlite3_db_config() return SQLITE_OK if and only if
-** the call is considered successful.
-*/
-SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
-
-/*
-** CAPI3REF: Memory Allocation Routines
-**
-** An instance of this object defines the interface between SQLite
-** and low-level memory allocation routines.
-**
-** This object is used in only one place in the SQLite interface.
-** A pointer to an instance of this object is the argument to
-** [sqlite3_config()] when the configuration option is
-** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].
-** By creating an instance of this object
-** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC])
-** during configuration, an application can specify an alternative
-** memory allocation subsystem for SQLite to use for all of its
-** dynamic memory needs.
-**
-** Note that SQLite comes with several [built-in memory allocators]
-** that are perfectly adequate for the overwhelming majority of applications
-** and that this object is only useful to a tiny minority of applications
-** with specialized memory allocation requirements.  This object is
-** also used during testing of SQLite in order to specify an alternative
-** memory allocator that simulates memory out-of-memory conditions in
-** order to verify that SQLite recovers gracefully from such
-** conditions.
-**
-** The xMalloc, xRealloc, and xFree methods must work like the
-** malloc(), realloc() and free() functions from the standard C library.
-** ^SQLite guarantees that the second argument to
-** xRealloc is always a value returned by a prior call to xRoundup.
-**
-** xSize should return the allocated size of a memory allocation
-** previously obtained from xMalloc or xRealloc.  The allocated size
-** is always at least as big as the requested size but may be larger.
-**
-** The xRoundup method returns what would be the allocated size of
-** a memory allocation given a particular requested size.  Most memory
-** allocators round up memory allocations at least to the next multiple
-** of 8.  Some allocators round up to a larger multiple or to a power of 2.
-** Every memory allocation request coming in through [sqlite3_malloc()]
-** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0,
-** that causes the corresponding memory allocation to fail.
-**
-** The xInit method initializes the memory allocator.  For example,
-** it might allocate any required mutexes or initialize internal data
-** structures.  The xShutdown method is invoked (indirectly) by
-** [sqlite3_shutdown()] and should deallocate any resources acquired
-** by xInit.  The pAppData pointer is used as the only parameter to
-** xInit and xShutdown.
-**
-** SQLite holds the [SQLITE_MUTEX_STATIC_MAIN] mutex when it invokes
-** the xInit method, so the xInit method need not be threadsafe.  The
-** xShutdown method is only called from [sqlite3_shutdown()] so it does
-** not need to be threadsafe either.  For all other methods, SQLite
-** holds the [SQLITE_MUTEX_STATIC_MEM] mutex as long as the
-** [SQLITE_CONFIG_MEMSTATUS] configuration option is turned on (which
-** it is by default) and so the methods are automatically serialized.
-** However, if [SQLITE_CONFIG_MEMSTATUS] is disabled, then the other
-** methods must be threadsafe or else make their own arrangements for
-** serialization.
-**
-** SQLite will never invoke xInit() more than once without an intervening
-** call to xShutdown().
-*/
-typedef struct sqlite3_mem_methods sqlite3_mem_methods;
-struct sqlite3_mem_methods {
-  void *(*xMalloc)(int);         /* Memory allocation function */
-  void (*xFree)(void*);          /* Free a prior allocation */
-  void *(*xRealloc)(void*,int);  /* Resize an allocation */
-  int (*xSize)(void*);           /* Return the size of an allocation */
-  int (*xRoundup)(int);          /* Round up request size to allocation size */
-  int (*xInit)(void*);           /* Initialize the memory allocator */
-  void (*xShutdown)(void*);      /* Deinitialize the memory allocator */
-  void *pAppData;                /* Argument to xInit() and xShutdown() */
-};
+#define SQLITE_SHM_NLOCK 8
+
+    /*
+    ** CAPI3REF: Initialize The SQLite Library
+    **
+    ** ^The sqlite3_initialize() routine initializes the
+    ** SQLite library.  ^The sqlite3_shutdown() routine
+    ** deallocates any resources that were allocated by sqlite3_initialize().
+    ** These routines are designed to aid in process initialization and
+    ** shutdown on embedded systems.  Workstation applications using
+    ** SQLite normally do not need to invoke either of these routines.
+    **
+    ** A call to sqlite3_initialize() is an "effective" call if it is
+    ** the first time sqlite3_initialize() is invoked during the lifetime of
+    ** the process, or if it is the first time sqlite3_initialize() is invoked
+    ** following a call to sqlite3_shutdown().  ^(Only an effective call
+    ** of sqlite3_initialize() does any initialization.  All other calls
+    ** are harmless no-ops.)^
+    **
+    ** A call to sqlite3_shutdown() is an "effective" call if it is the first
+    ** call to sqlite3_shutdown() since the last sqlite3_initialize().  ^(Only
+    ** an effective call to sqlite3_shutdown() does any deinitialization.
+    ** All other valid calls to sqlite3_shutdown() are harmless no-ops.)^
+    **
+    ** The sqlite3_initialize() interface is threadsafe, but sqlite3_shutdown()
+    ** is not.  The sqlite3_shutdown() interface must only be called from a
+    ** single thread.  All open [database connections] must be closed and all
+    ** other SQLite resources must be deallocated prior to invoking
+    ** sqlite3_shutdown().
+    **
+    ** Among other things, ^sqlite3_initialize() will invoke
+    ** sqlite3_os_init().  Similarly, ^sqlite3_shutdown()
+    ** will invoke sqlite3_os_end().
+    **
+    ** ^The sqlite3_initialize() routine returns [SQLITE_OK] on success.
+    ** ^If for some reason, sqlite3_initialize() is unable to initialize
+    ** the library (perhaps it is unable to allocate a needed resource such
+    ** as a mutex) it returns an [error code] other than [SQLITE_OK].
+    **
+    ** ^The sqlite3_initialize() routine is called internally by many other
+    ** SQLite interfaces so that an application usually does not need to
+    ** invoke sqlite3_initialize() directly.  For example, [sqlite3_open()]
+    ** calls sqlite3_initialize() so the SQLite library will be automatically
+    ** initialized when [sqlite3_open()] is called if it has not be initialized
+    ** already.  ^However, if SQLite is compiled with the [SQLITE_OMIT_AUTOINIT]
+    ** compile-time option, then the automatic calls to sqlite3_initialize()
+    ** are omitted and the application must call sqlite3_initialize() directly
+    ** prior to using any other SQLite interface.  For maximum portability,
+    ** it is recommended that applications always invoke sqlite3_initialize()
+    ** directly prior to using any other SQLite interface.  Future releases
+    ** of SQLite may require this.  In other words, the behavior exhibited
+    ** when SQLite is compiled with [SQLITE_OMIT_AUTOINIT] might become the
+    ** default behavior in some future release of SQLite.
+    **
+    ** The sqlite3_os_init() routine does operating-system specific
+    ** initialization of the SQLite library.  The sqlite3_os_end()
+    ** routine undoes the effect of sqlite3_os_init().  Typical tasks
+    ** performed by these routines include allocation or deallocation
+    ** of static resources, initialization of global variables,
+    ** setting up a default [sqlite3_vfs] module, or setting up
+    ** a default configuration using [sqlite3_config()].
+    **
+    ** The application should never invoke either sqlite3_os_init()
+    ** or sqlite3_os_end() directly.  The application should only invoke
+    ** sqlite3_initialize() and sqlite3_shutdown().  The sqlite3_os_init()
+    ** interface is called automatically by sqlite3_initialize() and
+    ** sqlite3_os_end() is called by sqlite3_shutdown().  Appropriate
+    ** implementations for sqlite3_os_init() and sqlite3_os_end()
+    ** are built into SQLite when it is compiled for Unix, Windows, or OS/2.
+    ** When [custom builds | built for other platforms]
+    ** (using the [SQLITE_OS_OTHER=1] compile-time
+    ** option) the application must supply a suitable implementation for
+    ** sqlite3_os_init() and sqlite3_os_end().  An application-supplied
+    ** implementation of sqlite3_os_init() or sqlite3_os_end()
+    ** must return [SQLITE_OK] on success and some other [error code] upon
+    ** failure.
+    */
+    SQLITE_API int sqlite3_initialize(void);
+    SQLITE_API int sqlite3_shutdown(void);
+    SQLITE_API int sqlite3_os_init(void);
+    SQLITE_API int sqlite3_os_end(void);
+
+    /*
+    ** CAPI3REF: Configuring The SQLite Library
+    **
+    ** The sqlite3_config() interface is used to make global configuration
+    ** changes to SQLite in order to tune SQLite to the specific needs of
+    ** the application.  The default configuration is recommended for most
+    ** applications and so this routine is usually not necessary.  It is
+    ** provided to support rare applications with unusual needs.
+    **
+    ** <b>The sqlite3_config() interface is not threadsafe. The application
+    ** must ensure that no other SQLite interfaces are invoked by other
+    ** threads while sqlite3_config() is running.</b>
+    **
+    ** The sqlite3_config() interface
+    ** may only be invoked prior to library initialization using
+    ** [sqlite3_initialize()] or after shutdown by [sqlite3_shutdown()].
+    ** ^If sqlite3_config() is called after [sqlite3_initialize()] and before
+    ** [sqlite3_shutdown()] then it will return SQLITE_MISUSE.
+    ** Note, however, that ^sqlite3_config() can be called as part of the
+    ** implementation of an application-defined [sqlite3_os_init()].
+    **
+    ** The first argument to sqlite3_config() is an integer
+    ** [configuration option] that determines
+    ** what property of SQLite is to be configured.  Subsequent arguments
+    ** vary depending on the [configuration option]
+    ** in the first argument.
+    **
+    ** ^When a configuration option is set, sqlite3_config() returns [SQLITE_OK].
+    ** ^If the option is unknown or SQLite is unable to set the option
+    ** then this routine returns a non-zero [error code].
+    */
+    SQLITE_API int sqlite3_config(int, ...);
+
+    /*
+    ** CAPI3REF: Configure database connections
+    ** METHOD: sqlite3
+    **
+    ** The sqlite3_db_config() interface is used to make configuration
+    ** changes to a [database connection].  The interface is similar to
+    ** [sqlite3_config()] except that the changes apply to a single
+    ** [database connection] (specified in the first argument).
+    **
+    ** The second argument to sqlite3_db_config(D,V,...)  is the
+    ** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code
+    ** that indicates what aspect of the [database connection] is being configured.
+    ** Subsequent arguments vary depending on the configuration verb.
+    **
+    ** ^Calls to sqlite3_db_config() return SQLITE_OK if and only if
+    ** the call is considered successful.
+    */
+    SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
+
+    /*
+    ** CAPI3REF: Memory Allocation Routines
+    **
+    ** An instance of this object defines the interface between SQLite
+    ** and low-level memory allocation routines.
+    **
+    ** This object is used in only one place in the SQLite interface.
+    ** A pointer to an instance of this object is the argument to
+    ** [sqlite3_config()] when the configuration option is
+    ** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].
+    ** By creating an instance of this object
+    ** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC])
+    ** during configuration, an application can specify an alternative
+    ** memory allocation subsystem for SQLite to use for all of its
+    ** dynamic memory needs.
+    **
+    ** Note that SQLite comes with several [built-in memory allocators]
+    ** that are perfectly adequate for the overwhelming majority of applications
+    ** and that this object is only useful to a tiny minority of applications
+    ** with specialized memory allocation requirements.  This object is
+    ** also used during testing of SQLite in order to specify an alternative
+    ** memory allocator that simulates memory out-of-memory conditions in
+    ** order to verify that SQLite recovers gracefully from such
+    ** conditions.
+    **
+    ** The xMalloc, xRealloc, and xFree methods must work like the
+    ** malloc(), realloc() and free() functions from the standard C library.
+    ** ^SQLite guarantees that the second argument to
+    ** xRealloc is always a value returned by a prior call to xRoundup.
+    **
+    ** xSize should return the allocated size of a memory allocation
+    ** previously obtained from xMalloc or xRealloc.  The allocated size
+    ** is always at least as big as the requested size but may be larger.
+    **
+    ** The xRoundup method returns what would be the allocated size of
+    ** a memory allocation given a particular requested size.  Most memory
+    ** allocators round up memory allocations at least to the next multiple
+    ** of 8.  Some allocators round up to a larger multiple or to a power of 2.
+    ** Every memory allocation request coming in through [sqlite3_malloc()]
+    ** or [sqlite3_realloc()] first calls xRoundup.  If xRoundup returns 0,
+    ** that causes the corresponding memory allocation to fail.
+    **
+    ** The xInit method initializes the memory allocator.  For example,
+    ** it might allocate any required mutexes or initialize internal data
+    ** structures.  The xShutdown method is invoked (indirectly) by
+    ** [sqlite3_shutdown()] and should deallocate any resources acquired
+    ** by xInit.  The pAppData pointer is used as the only parameter to
+    ** xInit and xShutdown.
+    **
+    ** SQLite holds the [SQLITE_MUTEX_STATIC_MAIN] mutex when it invokes
+    ** the xInit method, so the xInit method need not be threadsafe.  The
+    ** xShutdown method is only called from [sqlite3_shutdown()] so it does
+    ** not need to be threadsafe either.  For all other methods, SQLite
+    ** holds the [SQLITE_MUTEX_STATIC_MEM] mutex as long as the
+    ** [SQLITE_CONFIG_MEMSTATUS] configuration option is turned on (which
+    ** it is by default) and so the methods are automatically serialized.
+    ** However, if [SQLITE_CONFIG_MEMSTATUS] is disabled, then the other
+    ** methods must be threadsafe or else make their own arrangements for
+    ** serialization.
+    **
+    ** SQLite will never invoke xInit() more than once without an intervening
+    ** call to xShutdown().
+    */
+    typedef struct sqlite3_mem_methods sqlite3_mem_methods;
+    struct sqlite3_mem_methods
+    {
+        void* (*xMalloc)(int);         /* Memory allocation function */
+        void (*xFree)(void*);          /* Free a prior allocation */
+        void* (*xRealloc)(void*, int); /* Resize an allocation */
+        int (*xSize)(void*);           /* Return the size of an allocation */
+        int (*xRoundup)(int);          /* Round up request size to allocation size */
+        int (*xInit)(void*);           /* Initialize the memory allocator */
+        void (*xShutdown)(void*);      /* Deinitialize the memory allocator */
+        void* pAppData;                /* Argument to xInit() and xShutdown() */
+    };
 
 /*
 ** CAPI3REF: Configuration Options
@@ -2085,35 +2084,35 @@ struct sqlite3_mem_methods {
 ** compile-time option is not set, then the default maximum is 1073741824.
 ** </dl>
 */
-#define SQLITE_CONFIG_SINGLETHREAD  1  /* nil */
-#define SQLITE_CONFIG_MULTITHREAD   2  /* nil */
-#define SQLITE_CONFIG_SERIALIZED    3  /* nil */
-#define SQLITE_CONFIG_MALLOC        4  /* sqlite3_mem_methods* */
-#define SQLITE_CONFIG_GETMALLOC     5  /* sqlite3_mem_methods* */
-#define SQLITE_CONFIG_SCRATCH       6  /* No longer used */
-#define SQLITE_CONFIG_PAGECACHE     7  /* void*, int sz, int N */
-#define SQLITE_CONFIG_HEAP          8  /* void*, int nByte, int min */
-#define SQLITE_CONFIG_MEMSTATUS     9  /* boolean */
-#define SQLITE_CONFIG_MUTEX        10  /* sqlite3_mutex_methods* */
-#define SQLITE_CONFIG_GETMUTEX     11  /* sqlite3_mutex_methods* */
+#define SQLITE_CONFIG_SINGLETHREAD 1 /* nil */
+#define SQLITE_CONFIG_MULTITHREAD 2  /* nil */
+#define SQLITE_CONFIG_SERIALIZED 3   /* nil */
+#define SQLITE_CONFIG_MALLOC 4       /* sqlite3_mem_methods* */
+#define SQLITE_CONFIG_GETMALLOC 5    /* sqlite3_mem_methods* */
+#define SQLITE_CONFIG_SCRATCH 6      /* No longer used */
+#define SQLITE_CONFIG_PAGECACHE 7    /* void*, int sz, int N */
+#define SQLITE_CONFIG_HEAP 8         /* void*, int nByte, int min */
+#define SQLITE_CONFIG_MEMSTATUS 9    /* boolean */
+#define SQLITE_CONFIG_MUTEX 10       /* sqlite3_mutex_methods* */
+#define SQLITE_CONFIG_GETMUTEX 11    /* sqlite3_mutex_methods* */
 /* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */
-#define SQLITE_CONFIG_LOOKASIDE    13  /* int int */
-#define SQLITE_CONFIG_PCACHE       14  /* no-op */
-#define SQLITE_CONFIG_GETPCACHE    15  /* no-op */
-#define SQLITE_CONFIG_LOG          16  /* xFunc, void* */
-#define SQLITE_CONFIG_URI          17  /* int */
-#define SQLITE_CONFIG_PCACHE2      18  /* sqlite3_pcache_methods2* */
-#define SQLITE_CONFIG_GETPCACHE2   19  /* sqlite3_pcache_methods2* */
-#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20  /* int */
-#define SQLITE_CONFIG_SQLLOG       21  /* xSqllog, void* */
-#define SQLITE_CONFIG_MMAP_SIZE    22  /* sqlite3_int64, sqlite3_int64 */
-#define SQLITE_CONFIG_WIN32_HEAPSIZE      23  /* int nByte */
-#define SQLITE_CONFIG_PCACHE_HDRSZ        24  /* int *psz */
-#define SQLITE_CONFIG_PMASZ               25  /* unsigned int szPma */
-#define SQLITE_CONFIG_STMTJRNL_SPILL      26  /* int nByte */
-#define SQLITE_CONFIG_SMALL_MALLOC        27  /* boolean */
-#define SQLITE_CONFIG_SORTERREF_SIZE      28  /* int nByte */
-#define SQLITE_CONFIG_MEMDB_MAXSIZE       29  /* sqlite3_int64 */
+#define SQLITE_CONFIG_LOOKASIDE 13           /* int int */
+#define SQLITE_CONFIG_PCACHE 14              /* no-op */
+#define SQLITE_CONFIG_GETPCACHE 15           /* no-op */
+#define SQLITE_CONFIG_LOG 16                 /* xFunc, void* */
+#define SQLITE_CONFIG_URI 17                 /* int */
+#define SQLITE_CONFIG_PCACHE2 18             /* sqlite3_pcache_methods2* */
+#define SQLITE_CONFIG_GETPCACHE2 19          /* sqlite3_pcache_methods2* */
+#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20 /* int */
+#define SQLITE_CONFIG_SQLLOG 21              /* xSqllog, void* */
+#define SQLITE_CONFIG_MMAP_SIZE 22           /* sqlite3_int64, sqlite3_int64 */
+#define SQLITE_CONFIG_WIN32_HEAPSIZE 23      /* int nByte */
+#define SQLITE_CONFIG_PCACHE_HDRSZ 24        /* int *psz */
+#define SQLITE_CONFIG_PMASZ 25               /* unsigned int szPma */
+#define SQLITE_CONFIG_STMTJRNL_SPILL 26      /* int nByte */
+#define SQLITE_CONFIG_SMALL_MALLOC 27        /* boolean */
+#define SQLITE_CONFIG_SORTERREF_SIZE 28      /* int nByte */
+#define SQLITE_CONFIG_MEMDB_MAXSIZE 29       /* sqlite3_int64 */
 
 /*
 ** CAPI3REF: Database Connection Configuration Options
@@ -2396,722 +2395,719 @@ struct sqlite3_mem_methods {
 ** </dd>
 ** </dl>
 */
-#define SQLITE_DBCONFIG_MAINDBNAME            1000 /* const char* */
-#define SQLITE_DBCONFIG_LOOKASIDE             1001 /* void* int int */
-#define SQLITE_DBCONFIG_ENABLE_FKEY           1002 /* int int* */
-#define SQLITE_DBCONFIG_ENABLE_TRIGGER        1003 /* int int* */
+#define SQLITE_DBCONFIG_MAINDBNAME 1000            /* const char* */
+#define SQLITE_DBCONFIG_LOOKASIDE 1001             /* void* int int */
+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002           /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003        /* int int* */
 #define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
 #define SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION 1005 /* int int* */
-#define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE      1006 /* int int* */
-#define SQLITE_DBCONFIG_ENABLE_QPSG           1007 /* int int* */
-#define SQLITE_DBCONFIG_TRIGGER_EQP           1008 /* int int* */
-#define SQLITE_DBCONFIG_RESET_DATABASE        1009 /* int int* */
-#define SQLITE_DBCONFIG_DEFENSIVE             1010 /* int int* */
-#define SQLITE_DBCONFIG_WRITABLE_SCHEMA       1011 /* int int* */
-#define SQLITE_DBCONFIG_LEGACY_ALTER_TABLE    1012 /* int int* */
-#define SQLITE_DBCONFIG_DQS_DML               1013 /* int int* */
-#define SQLITE_DBCONFIG_DQS_DDL               1014 /* int int* */
-#define SQLITE_DBCONFIG_ENABLE_VIEW           1015 /* int int* */
-#define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT    1016 /* int int* */
-#define SQLITE_DBCONFIG_TRUSTED_SCHEMA        1017 /* int int* */
-#define SQLITE_DBCONFIG_MAX                   1017 /* Largest DBCONFIG */
-
-/*
-** CAPI3REF: Enable Or Disable Extended Result Codes
-** METHOD: sqlite3
-**
-** ^The sqlite3_extended_result_codes() routine enables or disables the
-** [extended result codes] feature of SQLite. ^The extended result
-** codes are disabled by default for historical compatibility.
-*/
-SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
-
-/*
-** CAPI3REF: Last Insert Rowid
-** METHOD: sqlite3
-**
-** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
-** has a unique 64-bit signed
-** integer key called the [ROWID | "rowid"]. ^The rowid is always available
-** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
-** names are not also used by explicitly declared columns. ^If
-** the table has a column of type [INTEGER PRIMARY KEY] then that column
-** is another alias for the rowid.
-**
-** ^The sqlite3_last_insert_rowid(D) interface usually returns the [rowid] of
-** the most recent successful [INSERT] into a rowid table or [virtual table]
-** on database connection D. ^Inserts into [WITHOUT ROWID] tables are not
-** recorded. ^If no successful [INSERT]s into rowid tables have ever occurred
-** on the database connection D, then sqlite3_last_insert_rowid(D) returns
-** zero.
-**
-** As well as being set automatically as rows are inserted into database
-** tables, the value returned by this function may be set explicitly by
-** [sqlite3_set_last_insert_rowid()]
-**
-** Some virtual table implementations may INSERT rows into rowid tables as
-** part of committing a transaction (e.g. to flush data accumulated in memory
-** to disk). In this case subsequent calls to this function return the rowid
-** associated with these internal INSERT operations, which leads to
-** unintuitive results. Virtual table implementations that do write to rowid
-** tables in this way can avoid this problem by restoring the original
-** rowid value using [sqlite3_set_last_insert_rowid()] before returning
-** control to the user.
-**
-** ^(If an [INSERT] occurs within a trigger then this routine will
-** return the [rowid] of the inserted row as long as the trigger is
-** running. Once the trigger program ends, the value returned
-** by this routine reverts to what it was before the trigger was fired.)^
-**
-** ^An [INSERT] that fails due to a constraint violation is not a
-** successful [INSERT] and does not change the value returned by this
-** routine.  ^Thus INSERT OR FAIL, INSERT OR IGNORE, INSERT OR ROLLBACK,
-** and INSERT OR ABORT make no changes to the return value of this
-** routine when their insertion fails.  ^(When INSERT OR REPLACE
-** encounters a constraint violation, it does not fail.  The
-** INSERT continues to completion after deleting rows that caused
-** the constraint problem so INSERT OR REPLACE will always change
-** the return value of this interface.)^
-**
-** ^For the purposes of this routine, an [INSERT] is considered to
-** be successful even if it is subsequently rolled back.
-**
-** This function is accessible to SQL statements via the
-** [last_insert_rowid() SQL function].
-**
-** If a separate thread performs a new [INSERT] on the same
-** database connection while the [sqlite3_last_insert_rowid()]
-** function is running and thus changes the last insert [rowid],
-** then the value returned by [sqlite3_last_insert_rowid()] is
-** unpredictable and might not equal either the old or the new
-** last insert [rowid].
-*/
-SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
-
-/*
-** CAPI3REF: Set the Last Insert Rowid value.
-** METHOD: sqlite3
-**
-** The sqlite3_set_last_insert_rowid(D, R) method allows the application to
-** set the value returned by calling sqlite3_last_insert_rowid(D) to R
-** without inserting a row into the database.
-*/
-SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*,sqlite3_int64);
-
-/*
-** CAPI3REF: Count The Number Of Rows Modified
-** METHOD: sqlite3
-**
-** ^These functions return the number of rows modified, inserted or
-** deleted by the most recently completed INSERT, UPDATE or DELETE
-** statement on the database connection specified by the only parameter.
-** The two functions are identical except for the type of the return value
-** and that if the number of rows modified by the most recent INSERT, UPDATE
-** or DELETE is greater than the maximum value supported by type "int", then
-** the return value of sqlite3_changes() is undefined. ^Executing any other
-** type of SQL statement does not modify the value returned by these functions.
-**
-** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are
-** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],
-** [foreign key actions] or [REPLACE] constraint resolution are not counted.
-**
-** Changes to a view that are intercepted by
-** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value
-** returned by sqlite3_changes() immediately after an INSERT, UPDATE or
-** DELETE statement run on a view is always zero. Only changes made to real
-** tables are counted.
-**
-** Things are more complicated if the sqlite3_changes() function is
-** executed while a trigger program is running. This may happen if the
-** program uses the [changes() SQL function], or if some other callback
-** function invokes sqlite3_changes() directly. Essentially:
-**
-** <ul>
-**   <li> ^(Before entering a trigger program the value returned by
-**        sqlite3_changes() function is saved. After the trigger program
-**        has finished, the original value is restored.)^
-**
-**   <li> ^(Within a trigger program each INSERT, UPDATE and DELETE
-**        statement sets the value returned by sqlite3_changes()
-**        upon completion as normal. Of course, this value will not include
-**        any changes performed by sub-triggers, as the sqlite3_changes()
-**        value will be saved and restored after each sub-trigger has run.)^
-** </ul>
-**
-** ^This means that if the changes() SQL function (or similar) is used
-** by the first INSERT, UPDATE or DELETE statement within a trigger, it
-** returns the value as set when the calling statement began executing.
-** ^If it is used by the second or subsequent such statement within a trigger
-** program, the value returned reflects the number of rows modified by the
-** previous INSERT, UPDATE or DELETE statement within the same trigger.
-**
-** If a separate thread makes changes on the same database connection
-** while [sqlite3_changes()] is running then the value returned
-** is unpredictable and not meaningful.
-**
-** See also:
-** <ul>
-** <li> the [sqlite3_total_changes()] interface
-** <li> the [count_changes pragma]
-** <li> the [changes() SQL function]
-** <li> the [data_version pragma]
-** </ul>
-*/
-SQLITE_API int sqlite3_changes(sqlite3*);
-SQLITE_API sqlite3_int64 sqlite3_changes64(sqlite3*);
-
-/*
-** CAPI3REF: Total Number Of Rows Modified
-** METHOD: sqlite3
-**
-** ^These functions return the total number of rows inserted, modified or
-** deleted by all [INSERT], [UPDATE] or [DELETE] statements completed
-** since the database connection was opened, including those executed as
-** part of trigger programs. The two functions are identical except for the
-** type of the return value and that if the number of rows modified by the
-** connection exceeds the maximum value supported by type "int", then
-** the return value of sqlite3_total_changes() is undefined. ^Executing
-** any other type of SQL statement does not affect the value returned by
-** sqlite3_total_changes().
-**
-** ^Changes made as part of [foreign key actions] are included in the
-** count, but those made as part of REPLACE constraint resolution are
-** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
-** are not counted.
-**
-** The [sqlite3_total_changes(D)] interface only reports the number
-** of rows that changed due to SQL statement run against database
-** connection D.  Any changes by other database connections are ignored.
-** To detect changes against a database file from other database
-** connections use the [PRAGMA data_version] command or the
-** [SQLITE_FCNTL_DATA_VERSION] [file control].
-**
-** If a separate thread makes changes on the same database connection
-** while [sqlite3_total_changes()] is running then the value
-** returned is unpredictable and not meaningful.
-**
-** See also:
-** <ul>
-** <li> the [sqlite3_changes()] interface
-** <li> the [count_changes pragma]
-** <li> the [changes() SQL function]
-** <li> the [data_version pragma]
-** <li> the [SQLITE_FCNTL_DATA_VERSION] [file control]
-** </ul>
-*/
-SQLITE_API int sqlite3_total_changes(sqlite3*);
-SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3*);
-
-/*
-** CAPI3REF: Interrupt A Long-Running Query
-** METHOD: sqlite3
-**
-** ^This function causes any pending database operation to abort and
-** return at its earliest opportunity. This routine is typically
-** called in response to a user action such as pressing "Cancel"
-** or Ctrl-C where the user wants a long query operation to halt
-** immediately.
-**
-** ^It is safe to call this routine from a thread different from the
-** thread that is currently running the database operation.  But it
-** is not safe to call this routine with a [database connection] that
-** is closed or might close before sqlite3_interrupt() returns.
-**
-** ^If an SQL operation is very nearly finished at the time when
-** sqlite3_interrupt() is called, then it might not have an opportunity
-** to be interrupted and might continue to completion.
-**
-** ^An SQL operation that is interrupted will return [SQLITE_INTERRUPT].
-** ^If the interrupted SQL operation is an INSERT, UPDATE, or DELETE
-** that is inside an explicit transaction, then the entire transaction
-** will be rolled back automatically.
-**
-** ^The sqlite3_interrupt(D) call is in effect until all currently running
-** SQL statements on [database connection] D complete.  ^Any new SQL statements
-** that are started after the sqlite3_interrupt() call and before the
-** running statement count reaches zero are interrupted as if they had been
-** running prior to the sqlite3_interrupt() call.  ^New SQL statements
-** that are started after the running statement count reaches zero are
-** not effected by the sqlite3_interrupt().
-** ^A call to sqlite3_interrupt(D) that occurs when there are no running
-** SQL statements is a no-op and has no effect on SQL statements
-** that are started after the sqlite3_interrupt() call returns.
-*/
-SQLITE_API void sqlite3_interrupt(sqlite3*);
-
-/*
-** CAPI3REF: Determine If An SQL Statement Is Complete
-**
-** These routines are useful during command-line input to determine if the
-** currently entered text seems to form a complete SQL statement or
-** if additional input is needed before sending the text into
-** SQLite for parsing.  ^These routines return 1 if the input string
-** appears to be a complete SQL statement.  ^A statement is judged to be
-** complete if it ends with a semicolon token and is not a prefix of a
-** well-formed CREATE TRIGGER statement.  ^Semicolons that are embedded within
-** string literals or quoted identifier names or comments are not
-** independent tokens (they are part of the token in which they are
-** embedded) and thus do not count as a statement terminator.  ^Whitespace
-** and comments that follow the final semicolon are ignored.
-**
-** ^These routines return 0 if the statement is incomplete.  ^If a
-** memory allocation fails, then SQLITE_NOMEM is returned.
-**
-** ^These routines do not parse the SQL statements thus
-** will not detect syntactically incorrect SQL.
-**
-** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
-** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
-** automatically by sqlite3_complete16().  If that initialization fails,
-** then the return value from sqlite3_complete16() will be non-zero
-** regardless of whether or not the input SQL is complete.)^
-**
-** The input to [sqlite3_complete()] must be a zero-terminated
-** UTF-8 string.
-**
-** The input to [sqlite3_complete16()] must be a zero-terminated
-** UTF-16 string in native byte order.
-*/
-SQLITE_API int sqlite3_complete(const char *sql);
-SQLITE_API int sqlite3_complete16(const void *sql);
-
-/*
-** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors
-** KEYWORDS: {busy-handler callback} {busy handler}
-** METHOD: sqlite3
-**
-** ^The sqlite3_busy_handler(D,X,P) routine sets a callback function X
-** that might be invoked with argument P whenever
-** an attempt is made to access a database table associated with
-** [database connection] D when another thread
-** or process has the table locked.
-** The sqlite3_busy_handler() interface is used to implement
-** [sqlite3_busy_timeout()] and [PRAGMA busy_timeout].
-**
-** ^If the busy callback is NULL, then [SQLITE_BUSY]
-** is returned immediately upon encountering the lock.  ^If the busy callback
-** is not NULL, then the callback might be invoked with two arguments.
-**
-** ^The first argument to the busy handler is a copy of the void* pointer which
-** is the third argument to sqlite3_busy_handler().  ^The second argument to
-** the busy handler callback is the number of times that the busy handler has
-** been invoked previously for the same locking event.  ^If the
-** busy callback returns 0, then no additional attempts are made to
-** access the database and [SQLITE_BUSY] is returned
-** to the application.
-** ^If the callback returns non-zero, then another attempt
-** is made to access the database and the cycle repeats.
-**
-** The presence of a busy handler does not guarantee that it will be invoked
-** when there is lock contention. ^If SQLite determines that invoking the busy
-** handler could result in a deadlock, it will go ahead and return [SQLITE_BUSY]
-** to the application instead of invoking the
-** busy handler.
-** Consider a scenario where one process is holding a read lock that
-** it is trying to promote to a reserved lock and
-** a second process is holding a reserved lock that it is trying
-** to promote to an exclusive lock.  The first process cannot proceed
-** because it is blocked by the second and the second process cannot
-** proceed because it is blocked by the first.  If both processes
-** invoke the busy handlers, neither will make any progress.  Therefore,
-** SQLite returns [SQLITE_BUSY] for the first process, hoping that this
-** will induce the first process to release its read lock and allow
-** the second process to proceed.
-**
-** ^The default busy callback is NULL.
-**
-** ^(There can only be a single busy handler defined for each
-** [database connection].  Setting a new busy handler clears any
-** previously set handler.)^  ^Note that calling [sqlite3_busy_timeout()]
-** or evaluating [PRAGMA busy_timeout=N] will change the
-** busy handler and thus clear any previously set busy handler.
-**
-** The busy callback should not take any actions which modify the
-** database connection that invoked the busy handler.  In other words,
-** the busy handler is not reentrant.  Any such actions
-** result in undefined behavior.
-**
-** A busy handler must not close the database connection
-** or [prepared statement] that invoked the busy handler.
-*/
-SQLITE_API int sqlite3_busy_handler(sqlite3*,int(*)(void*,int),void*);
-
-/*
-** CAPI3REF: Set A Busy Timeout
-** METHOD: sqlite3
-**
-** ^This routine sets a [sqlite3_busy_handler | busy handler] that sleeps
-** for a specified amount of time when a table is locked.  ^The handler
-** will sleep multiple times until at least "ms" milliseconds of sleeping
-** have accumulated.  ^After at least "ms" milliseconds of sleeping,
-** the handler returns 0 which causes [sqlite3_step()] to return
-** [SQLITE_BUSY].
-**
-** ^Calling this routine with an argument less than or equal to zero
-** turns off all busy handlers.
-**
-** ^(There can only be a single busy handler for a particular
-** [database connection] at any given moment.  If another busy handler
-** was defined  (using [sqlite3_busy_handler()]) prior to calling
-** this routine, that other busy handler is cleared.)^
-**
-** See also:  [PRAGMA busy_timeout]
-*/
-SQLITE_API int sqlite3_busy_timeout(sqlite3*, int ms);
-
-/*
-** CAPI3REF: Convenience Routines For Running Queries
-** METHOD: sqlite3
-**
-** This is a legacy interface that is preserved for backwards compatibility.
-** Use of this interface is not recommended.
-**
-** Definition: A <b>result table</b> is memory data structure created by the
-** [sqlite3_get_table()] interface.  A result table records the
-** complete query results from one or more queries.
-**
-** The table conceptually has a number of rows and columns.  But
-** these numbers are not part of the result table itself.  These
-** numbers are obtained separately.  Let N be the number of rows
-** and M be the number of columns.
-**
-** A result table is an array of pointers to zero-terminated UTF-8 strings.
-** There are (N+1)*M elements in the array.  The first M pointers point
-** to zero-terminated strings that  contain the names of the columns.
-** The remaining entries all point to query results.  NULL values result
-** in NULL pointers.  All other values are in their UTF-8 zero-terminated
-** string representation as returned by [sqlite3_column_text()].
-**
-** A result table might consist of one or more memory allocations.
-** It is not safe to pass a result table directly to [sqlite3_free()].
-** A result table should be deallocated using [sqlite3_free_table()].
-**
-** ^(As an example of the result table format, suppose a query result
-** is as follows:
-**
-** <blockquote><pre>
-**        Name        | Age
-**        -----------------------
-**        Alice       | 43
-**        Bob         | 28
-**        Cindy       | 21
-** </pre></blockquote>
-**
-** There are two columns (M==2) and three rows (N==3).  Thus the
-** result table has 8 entries.  Suppose the result table is stored
-** in an array named azResult.  Then azResult holds this content:
-**
-** <blockquote><pre>
-**        azResult&#91;0] = "Name";
-**        azResult&#91;1] = "Age";
-**        azResult&#91;2] = "Alice";
-**        azResult&#91;3] = "43";
-**        azResult&#91;4] = "Bob";
-**        azResult&#91;5] = "28";
-**        azResult&#91;6] = "Cindy";
-**        azResult&#91;7] = "21";
-** </pre></blockquote>)^
-**
-** ^The sqlite3_get_table() function evaluates one or more
-** semicolon-separated SQL statements in the zero-terminated UTF-8
-** string of its 2nd parameter and returns a result table to the
-** pointer given in its 3rd parameter.
-**
-** After the application has finished with the result from sqlite3_get_table(),
-** it must pass the result table pointer to sqlite3_free_table() in order to
-** release the memory that was malloced.  Because of the way the
-** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
-** function must not try to call [sqlite3_free()] directly.  Only
-** [sqlite3_free_table()] is able to release the memory properly and safely.
-**
-** The sqlite3_get_table() interface is implemented as a wrapper around
-** [sqlite3_exec()].  The sqlite3_get_table() routine does not have access
-** to any internal data structures of SQLite.  It uses only the public
-** interface defined here.  As a consequence, errors that occur in the
-** wrapper layer outside of the internal [sqlite3_exec()] call are not
-** reflected in subsequent calls to [sqlite3_errcode()] or
-** [sqlite3_errmsg()].
-*/
-SQLITE_API int sqlite3_get_table(
-  sqlite3 *db,          /* An open database */
-  const char *zSql,     /* SQL to be evaluated */
-  char ***pazResult,    /* Results of the query */
-  int *pnRow,           /* Number of result rows written here */
-  int *pnColumn,        /* Number of result columns written here */
-  char **pzErrmsg       /* Error msg written here */
-);
-SQLITE_API void sqlite3_free_table(char **result);
-
-/*
-** CAPI3REF: Formatted String Printing Functions
-**
-** These routines are work-alikes of the "printf()" family of functions
-** from the standard C library.
-** These routines understand most of the common formatting options from
-** the standard library printf()
-** plus some additional non-standard formats ([%q], [%Q], [%w], and [%z]).
-** See the [built-in printf()] documentation for details.
-**
-** ^The sqlite3_mprintf() and sqlite3_vmprintf() routines write their
-** results into memory obtained from [sqlite3_malloc64()].
-** The strings returned by these two routines should be
-** released by [sqlite3_free()].  ^Both routines return a
-** NULL pointer if [sqlite3_malloc64()] is unable to allocate enough
-** memory to hold the resulting string.
-**
-** ^(The sqlite3_snprintf() routine is similar to "snprintf()" from
-** the standard C library.  The result is written into the
-** buffer supplied as the second parameter whose size is given by
-** the first parameter. Note that the order of the
-** first two parameters is reversed from snprintf().)^  This is an
-** historical accident that cannot be fixed without breaking
-** backwards compatibility.  ^(Note also that sqlite3_snprintf()
-** returns a pointer to its buffer instead of the number of
-** characters actually written into the buffer.)^  We admit that
-** the number of characters written would be a more useful return
-** value but we cannot change the implementation of sqlite3_snprintf()
-** now without breaking compatibility.
-**
-** ^As long as the buffer size is greater than zero, sqlite3_snprintf()
-** guarantees that the buffer is always zero-terminated.  ^The first
-** parameter "n" is the total size of the buffer, including space for
-** the zero terminator.  So the longest string that can be completely
-** written will be n-1 characters.
-**
-** ^The sqlite3_vsnprintf() routine is a varargs version of sqlite3_snprintf().
-**
-** See also:  [built-in printf()], [printf() SQL function]
-*/
-SQLITE_API char *sqlite3_mprintf(const char*,...);
-SQLITE_API char *sqlite3_vmprintf(const char*, va_list);
-SQLITE_API char *sqlite3_snprintf(int,char*,const char*, ...);
-SQLITE_API char *sqlite3_vsnprintf(int,char*,const char*, va_list);
-
-/*
-** CAPI3REF: Memory Allocation Subsystem
-**
-** The SQLite core uses these three routines for all of its own
-** internal memory allocation needs. "Core" in the previous sentence
-** does not include operating-system specific [VFS] implementation.  The
-** Windows VFS uses native malloc() and free() for some operations.
-**
-** ^The sqlite3_malloc() routine returns a pointer to a block
-** of memory at least N bytes in length, where N is the parameter.
-** ^If sqlite3_malloc() is unable to obtain sufficient free
-** memory, it returns a NULL pointer.  ^If the parameter N to
-** sqlite3_malloc() is zero or negative then sqlite3_malloc() returns
-** a NULL pointer.
-**
-** ^The sqlite3_malloc64(N) routine works just like
-** sqlite3_malloc(N) except that N is an unsigned 64-bit integer instead
-** of a signed 32-bit integer.
-**
-** ^Calling sqlite3_free() with a pointer previously returned
-** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
-** that it might be reused.  ^The sqlite3_free() routine is
-** a no-op if is called with a NULL pointer.  Passing a NULL pointer
-** to sqlite3_free() is harmless.  After being freed, memory
-** should neither be read nor written.  Even reading previously freed
-** memory might result in a segmentation fault or other severe error.
-** Memory corruption, a segmentation fault, or other severe error
-** might result if sqlite3_free() is called with a non-NULL pointer that
-** was not obtained from sqlite3_malloc() or sqlite3_realloc().
-**
-** ^The sqlite3_realloc(X,N) interface attempts to resize a
-** prior memory allocation X to be at least N bytes.
-** ^If the X parameter to sqlite3_realloc(X,N)
-** is a NULL pointer then its behavior is identical to calling
-** sqlite3_malloc(N).
-** ^If the N parameter to sqlite3_realloc(X,N) is zero or
-** negative then the behavior is exactly the same as calling
-** sqlite3_free(X).
-** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
-** of at least N bytes in size or NULL if insufficient memory is available.
-** ^If M is the size of the prior allocation, then min(N,M) bytes
-** of the prior allocation are copied into the beginning of buffer returned
-** by sqlite3_realloc(X,N) and the prior allocation is freed.
-** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
-** prior allocation is not freed.
-**
-** ^The sqlite3_realloc64(X,N) interfaces works the same as
-** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
-** of a 32-bit signed integer.
-**
-** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
-** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
-** sqlite3_msize(X) returns the size of that memory allocation in bytes.
-** ^The value returned by sqlite3_msize(X) might be larger than the number
-** of bytes requested when X was allocated.  ^If X is a NULL pointer then
-** sqlite3_msize(X) returns zero.  If X points to something that is not
-** the beginning of memory allocation, or if it points to a formerly
-** valid memory allocation that has now been freed, then the behavior
-** of sqlite3_msize(X) is undefined and possibly harmful.
-**
-** ^The memory returned by sqlite3_malloc(), sqlite3_realloc(),
-** sqlite3_malloc64(), and sqlite3_realloc64()
-** is always aligned to at least an 8 byte boundary, or to a
-** 4 byte boundary if the [SQLITE_4_BYTE_ALIGNED_MALLOC] compile-time
-** option is used.
-**
-** The pointer arguments to [sqlite3_free()] and [sqlite3_realloc()]
-** must be either NULL or else pointers obtained from a prior
-** invocation of [sqlite3_malloc()] or [sqlite3_realloc()] that have
-** not yet been released.
-**
-** The application must not read or write any part of
-** a block of memory after it has been released using
-** [sqlite3_free()] or [sqlite3_realloc()].
-*/
-SQLITE_API void *sqlite3_malloc(int);
-SQLITE_API void *sqlite3_malloc64(sqlite3_uint64);
-SQLITE_API void *sqlite3_realloc(void*, int);
-SQLITE_API void *sqlite3_realloc64(void*, sqlite3_uint64);
-SQLITE_API void sqlite3_free(void*);
-SQLITE_API sqlite3_uint64 sqlite3_msize(void*);
-
-/*
-** CAPI3REF: Memory Allocator Statistics
-**
-** SQLite provides these two interfaces for reporting on the status
-** of the [sqlite3_malloc()], [sqlite3_free()], and [sqlite3_realloc()]
-** routines, which form the built-in memory allocation subsystem.
-**
-** ^The [sqlite3_memory_used()] routine returns the number of bytes
-** of memory currently outstanding (malloced but not freed).
-** ^The [sqlite3_memory_highwater()] routine returns the maximum
-** value of [sqlite3_memory_used()] since the high-water mark
-** was last reset.  ^The values returned by [sqlite3_memory_used()] and
-** [sqlite3_memory_highwater()] include any overhead
-** added by SQLite in its implementation of [sqlite3_malloc()],
-** but not overhead added by the any underlying system library
-** routines that [sqlite3_malloc()] may call.
-**
-** ^The memory high-water mark is reset to the current value of
-** [sqlite3_memory_used()] if and only if the parameter to
-** [sqlite3_memory_highwater()] is true.  ^The value returned
-** by [sqlite3_memory_highwater(1)] is the high-water mark
-** prior to the reset.
-*/
-SQLITE_API sqlite3_int64 sqlite3_memory_used(void);
-SQLITE_API sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
-
-/*
-** CAPI3REF: Pseudo-Random Number Generator
-**
-** SQLite contains a high-quality pseudo-random number generator (PRNG) used to
-** select random [ROWID | ROWIDs] when inserting new records into a table that
-** already uses the largest possible [ROWID].  The PRNG is also used for
-** the built-in random() and randomblob() SQL functions.  This interface allows
-** applications to access the same PRNG for other purposes.
-**
-** ^A call to this routine stores N bytes of randomness into buffer P.
-** ^The P parameter can be a NULL pointer.
-**
-** ^If this routine has not been previously called or if the previous
-** call had N less than one or a NULL pointer for P, then the PRNG is
-** seeded using randomness obtained from the xRandomness method of
-** the default [sqlite3_vfs] object.
-** ^If the previous call to this routine had an N of 1 or more and a
-** non-NULL P then the pseudo-randomness is generated
-** internally and without recourse to the [sqlite3_vfs] xRandomness
-** method.
-*/
-SQLITE_API void sqlite3_randomness(int N, void *P);
-
-/*
-** CAPI3REF: Compile-Time Authorization Callbacks
-** METHOD: sqlite3
-** KEYWORDS: {authorizer callback}
-**
-** ^This routine registers an authorizer callback with a particular
-** [database connection], supplied in the first argument.
-** ^The authorizer callback is invoked as SQL statements are being compiled
-** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()],
-** [sqlite3_prepare_v3()], [sqlite3_prepare16()], [sqlite3_prepare16_v2()],
-** and [sqlite3_prepare16_v3()].  ^At various
-** points during the compilation process, as logic is being created
-** to perform various actions, the authorizer callback is invoked to
-** see if those actions are allowed.  ^The authorizer callback should
-** return [SQLITE_OK] to allow the action, [SQLITE_IGNORE] to disallow the
-** specific action but allow the SQL statement to continue to be
-** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be
-** rejected with an error.  ^If the authorizer callback returns
-** any value other than [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY]
-** then the [sqlite3_prepare_v2()] or equivalent call that triggered
-** the authorizer will fail with an error message.
-**
-** When the callback returns [SQLITE_OK], that means the operation
-** requested is ok.  ^When the callback returns [SQLITE_DENY], the
-** [sqlite3_prepare_v2()] or equivalent call that triggered the
-** authorizer will fail with an error message explaining that
-** access is denied.
-**
-** ^The first parameter to the authorizer callback is a copy of the third
-** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
-** to the callback is an integer [SQLITE_COPY | action code] that specifies
-** the particular action to be authorized. ^The third through sixth parameters
-** to the callback are either NULL pointers or zero-terminated strings
-** that contain additional details about the action to be authorized.
-** Applications must always be prepared to encounter a NULL pointer in any
-** of the third through the sixth parameters of the authorization callback.
-**
-** ^If the action code is [SQLITE_READ]
-** and the callback returns [SQLITE_IGNORE] then the
-** [prepared statement] statement is constructed to substitute
-** a NULL value in place of the table column that would have
-** been read if [SQLITE_OK] had been returned.  The [SQLITE_IGNORE]
-** return can be used to deny an untrusted user access to individual
-** columns of a table.
-** ^When a table is referenced by a [SELECT] but no column values are
-** extracted from that table (for example in a query like
-** "SELECT count(*) FROM tab") then the [SQLITE_READ] authorizer callback
-** is invoked once for that table with a column name that is an empty string.
-** ^If the action code is [SQLITE_DELETE] and the callback returns
-** [SQLITE_IGNORE] then the [DELETE] operation proceeds but the
-** [truncate optimization] is disabled and all rows are deleted individually.
-**
-** An authorizer is used when [sqlite3_prepare | preparing]
-** SQL statements from an untrusted source, to ensure that the SQL statements
-** do not try to access data they are not allowed to see, or that they do not
-** try to execute malicious statements that damage the database.  For
-** example, an application may allow a user to enter arbitrary
-** SQL queries for evaluation by a database.  But the application does
-** not want the user to be able to make arbitrary changes to the
-** database.  An authorizer could then be put in place while the
-** user-entered SQL is being [sqlite3_prepare | prepared] that
-** disallows everything except [SELECT] statements.
-**
-** Applications that need to process SQL from untrusted sources
-** might also consider lowering resource limits using [sqlite3_limit()]
-** and limiting database size using the [max_page_count] [PRAGMA]
-** in addition to using an authorizer.
-**
-** ^(Only a single authorizer can be in place on a database connection
-** at a time.  Each call to sqlite3_set_authorizer overrides the
-** previous call.)^  ^Disable the authorizer by installing a NULL callback.
-** The authorizer is disabled by default.
-**
-** The authorizer callback must not do anything that will modify
-** the database connection that invoked the authorizer callback.
-** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
-** database connections for the meaning of "modify" in this paragraph.
-**
-** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the
-** statement might be re-prepared during [sqlite3_step()] due to a
-** schema change.  Hence, the application should ensure that the
-** correct authorizer callback remains in place during the [sqlite3_step()].
-**
-** ^Note that the authorizer callback is invoked only during
-** [sqlite3_prepare()] or its variants.  Authorization is not
-** performed during statement evaluation in [sqlite3_step()], unless
-** as stated in the previous paragraph, sqlite3_step() invokes
-** sqlite3_prepare_v2() to reprepare a statement after a schema change.
-*/
-SQLITE_API int sqlite3_set_authorizer(
-  sqlite3*,
-  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*),
-  void *pUserData
-);
+#define SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE 1006      /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_QPSG 1007           /* int int* */
+#define SQLITE_DBCONFIG_TRIGGER_EQP 1008           /* int int* */
+#define SQLITE_DBCONFIG_RESET_DATABASE 1009        /* int int* */
+#define SQLITE_DBCONFIG_DEFENSIVE 1010             /* int int* */
+#define SQLITE_DBCONFIG_WRITABLE_SCHEMA 1011       /* int int* */
+#define SQLITE_DBCONFIG_LEGACY_ALTER_TABLE 1012    /* int int* */
+#define SQLITE_DBCONFIG_DQS_DML 1013               /* int int* */
+#define SQLITE_DBCONFIG_DQS_DDL 1014               /* int int* */
+#define SQLITE_DBCONFIG_ENABLE_VIEW 1015           /* int int* */
+#define SQLITE_DBCONFIG_LEGACY_FILE_FORMAT 1016    /* int int* */
+#define SQLITE_DBCONFIG_TRUSTED_SCHEMA 1017        /* int int* */
+#define SQLITE_DBCONFIG_MAX 1017                   /* Largest DBCONFIG */
+
+    /*
+    ** CAPI3REF: Enable Or Disable Extended Result Codes
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_extended_result_codes() routine enables or disables the
+    ** [extended result codes] feature of SQLite. ^The extended result
+    ** codes are disabled by default for historical compatibility.
+    */
+    SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
+
+    /*
+    ** CAPI3REF: Last Insert Rowid
+    ** METHOD: sqlite3
+    **
+    ** ^Each entry in most SQLite tables (except for [WITHOUT ROWID] tables)
+    ** has a unique 64-bit signed
+    ** integer key called the [ROWID | "rowid"]. ^The rowid is always available
+    ** as an undeclared column named ROWID, OID, or _ROWID_ as long as those
+    ** names are not also used by explicitly declared columns. ^If
+    ** the table has a column of type [INTEGER PRIMARY KEY] then that column
+    ** is another alias for the rowid.
+    **
+    ** ^The sqlite3_last_insert_rowid(D) interface usually returns the [rowid] of
+    ** the most recent successful [INSERT] into a rowid table or [virtual table]
+    ** on database connection D. ^Inserts into [WITHOUT ROWID] tables are not
+    ** recorded. ^If no successful [INSERT]s into rowid tables have ever occurred
+    ** on the database connection D, then sqlite3_last_insert_rowid(D) returns
+    ** zero.
+    **
+    ** As well as being set automatically as rows are inserted into database
+    ** tables, the value returned by this function may be set explicitly by
+    ** [sqlite3_set_last_insert_rowid()]
+    **
+    ** Some virtual table implementations may INSERT rows into rowid tables as
+    ** part of committing a transaction (e.g. to flush data accumulated in memory
+    ** to disk). In this case subsequent calls to this function return the rowid
+    ** associated with these internal INSERT operations, which leads to
+    ** unintuitive results. Virtual table implementations that do write to rowid
+    ** tables in this way can avoid this problem by restoring the original
+    ** rowid value using [sqlite3_set_last_insert_rowid()] before returning
+    ** control to the user.
+    **
+    ** ^(If an [INSERT] occurs within a trigger then this routine will
+    ** return the [rowid] of the inserted row as long as the trigger is
+    ** running. Once the trigger program ends, the value returned
+    ** by this routine reverts to what it was before the trigger was fired.)^
+    **
+    ** ^An [INSERT] that fails due to a constraint violation is not a
+    ** successful [INSERT] and does not change the value returned by this
+    ** routine.  ^Thus INSERT OR FAIL, INSERT OR IGNORE, INSERT OR ROLLBACK,
+    ** and INSERT OR ABORT make no changes to the return value of this
+    ** routine when their insertion fails.  ^(When INSERT OR REPLACE
+    ** encounters a constraint violation, it does not fail.  The
+    ** INSERT continues to completion after deleting rows that caused
+    ** the constraint problem so INSERT OR REPLACE will always change
+    ** the return value of this interface.)^
+    **
+    ** ^For the purposes of this routine, an [INSERT] is considered to
+    ** be successful even if it is subsequently rolled back.
+    **
+    ** This function is accessible to SQL statements via the
+    ** [last_insert_rowid() SQL function].
+    **
+    ** If a separate thread performs a new [INSERT] on the same
+    ** database connection while the [sqlite3_last_insert_rowid()]
+    ** function is running and thus changes the last insert [rowid],
+    ** then the value returned by [sqlite3_last_insert_rowid()] is
+    ** unpredictable and might not equal either the old or the new
+    ** last insert [rowid].
+    */
+    SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
+
+    /*
+    ** CAPI3REF: Set the Last Insert Rowid value.
+    ** METHOD: sqlite3
+    **
+    ** The sqlite3_set_last_insert_rowid(D, R) method allows the application to
+    ** set the value returned by calling sqlite3_last_insert_rowid(D) to R
+    ** without inserting a row into the database.
+    */
+    SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*, sqlite3_int64);
+
+    /*
+    ** CAPI3REF: Count The Number Of Rows Modified
+    ** METHOD: sqlite3
+    **
+    ** ^These functions return the number of rows modified, inserted or
+    ** deleted by the most recently completed INSERT, UPDATE or DELETE
+    ** statement on the database connection specified by the only parameter.
+    ** The two functions are identical except for the type of the return value
+    ** and that if the number of rows modified by the most recent INSERT, UPDATE
+    ** or DELETE is greater than the maximum value supported by type "int", then
+    ** the return value of sqlite3_changes() is undefined. ^Executing any other
+    ** type of SQL statement does not modify the value returned by these functions.
+    **
+    ** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are
+    ** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],
+    ** [foreign key actions] or [REPLACE] constraint resolution are not counted.
+    **
+    ** Changes to a view that are intercepted by
+    ** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value
+    ** returned by sqlite3_changes() immediately after an INSERT, UPDATE or
+    ** DELETE statement run on a view is always zero. Only changes made to real
+    ** tables are counted.
+    **
+    ** Things are more complicated if the sqlite3_changes() function is
+    ** executed while a trigger program is running. This may happen if the
+    ** program uses the [changes() SQL function], or if some other callback
+    ** function invokes sqlite3_changes() directly. Essentially:
+    **
+    ** <ul>
+    **   <li> ^(Before entering a trigger program the value returned by
+    **        sqlite3_changes() function is saved. After the trigger program
+    **        has finished, the original value is restored.)^
+    **
+    **   <li> ^(Within a trigger program each INSERT, UPDATE and DELETE
+    **        statement sets the value returned by sqlite3_changes()
+    **        upon completion as normal. Of course, this value will not include
+    **        any changes performed by sub-triggers, as the sqlite3_changes()
+    **        value will be saved and restored after each sub-trigger has run.)^
+    ** </ul>
+    **
+    ** ^This means that if the changes() SQL function (or similar) is used
+    ** by the first INSERT, UPDATE or DELETE statement within a trigger, it
+    ** returns the value as set when the calling statement began executing.
+    ** ^If it is used by the second or subsequent such statement within a trigger
+    ** program, the value returned reflects the number of rows modified by the
+    ** previous INSERT, UPDATE or DELETE statement within the same trigger.
+    **
+    ** If a separate thread makes changes on the same database connection
+    ** while [sqlite3_changes()] is running then the value returned
+    ** is unpredictable and not meaningful.
+    **
+    ** See also:
+    ** <ul>
+    ** <li> the [sqlite3_total_changes()] interface
+    ** <li> the [count_changes pragma]
+    ** <li> the [changes() SQL function]
+    ** <li> the [data_version pragma]
+    ** </ul>
+    */
+    SQLITE_API int sqlite3_changes(sqlite3*);
+    SQLITE_API sqlite3_int64 sqlite3_changes64(sqlite3*);
+
+    /*
+    ** CAPI3REF: Total Number Of Rows Modified
+    ** METHOD: sqlite3
+    **
+    ** ^These functions return the total number of rows inserted, modified or
+    ** deleted by all [INSERT], [UPDATE] or [DELETE] statements completed
+    ** since the database connection was opened, including those executed as
+    ** part of trigger programs. The two functions are identical except for the
+    ** type of the return value and that if the number of rows modified by the
+    ** connection exceeds the maximum value supported by type "int", then
+    ** the return value of sqlite3_total_changes() is undefined. ^Executing
+    ** any other type of SQL statement does not affect the value returned by
+    ** sqlite3_total_changes().
+    **
+    ** ^Changes made as part of [foreign key actions] are included in the
+    ** count, but those made as part of REPLACE constraint resolution are
+    ** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
+    ** are not counted.
+    **
+    ** The [sqlite3_total_changes(D)] interface only reports the number
+    ** of rows that changed due to SQL statement run against database
+    ** connection D.  Any changes by other database connections are ignored.
+    ** To detect changes against a database file from other database
+    ** connections use the [PRAGMA data_version] command or the
+    ** [SQLITE_FCNTL_DATA_VERSION] [file control].
+    **
+    ** If a separate thread makes changes on the same database connection
+    ** while [sqlite3_total_changes()] is running then the value
+    ** returned is unpredictable and not meaningful.
+    **
+    ** See also:
+    ** <ul>
+    ** <li> the [sqlite3_changes()] interface
+    ** <li> the [count_changes pragma]
+    ** <li> the [changes() SQL function]
+    ** <li> the [data_version pragma]
+    ** <li> the [SQLITE_FCNTL_DATA_VERSION] [file control]
+    ** </ul>
+    */
+    SQLITE_API int sqlite3_total_changes(sqlite3*);
+    SQLITE_API sqlite3_int64 sqlite3_total_changes64(sqlite3*);
+
+    /*
+    ** CAPI3REF: Interrupt A Long-Running Query
+    ** METHOD: sqlite3
+    **
+    ** ^This function causes any pending database operation to abort and
+    ** return at its earliest opportunity. This routine is typically
+    ** called in response to a user action such as pressing "Cancel"
+    ** or Ctrl-C where the user wants a long query operation to halt
+    ** immediately.
+    **
+    ** ^It is safe to call this routine from a thread different from the
+    ** thread that is currently running the database operation.  But it
+    ** is not safe to call this routine with a [database connection] that
+    ** is closed or might close before sqlite3_interrupt() returns.
+    **
+    ** ^If an SQL operation is very nearly finished at the time when
+    ** sqlite3_interrupt() is called, then it might not have an opportunity
+    ** to be interrupted and might continue to completion.
+    **
+    ** ^An SQL operation that is interrupted will return [SQLITE_INTERRUPT].
+    ** ^If the interrupted SQL operation is an INSERT, UPDATE, or DELETE
+    ** that is inside an explicit transaction, then the entire transaction
+    ** will be rolled back automatically.
+    **
+    ** ^The sqlite3_interrupt(D) call is in effect until all currently running
+    ** SQL statements on [database connection] D complete.  ^Any new SQL statements
+    ** that are started after the sqlite3_interrupt() call and before the
+    ** running statement count reaches zero are interrupted as if they had been
+    ** running prior to the sqlite3_interrupt() call.  ^New SQL statements
+    ** that are started after the running statement count reaches zero are
+    ** not effected by the sqlite3_interrupt().
+    ** ^A call to sqlite3_interrupt(D) that occurs when there are no running
+    ** SQL statements is a no-op and has no effect on SQL statements
+    ** that are started after the sqlite3_interrupt() call returns.
+    */
+    SQLITE_API void sqlite3_interrupt(sqlite3*);
+
+    /*
+    ** CAPI3REF: Determine If An SQL Statement Is Complete
+    **
+    ** These routines are useful during command-line input to determine if the
+    ** currently entered text seems to form a complete SQL statement or
+    ** if additional input is needed before sending the text into
+    ** SQLite for parsing.  ^These routines return 1 if the input string
+    ** appears to be a complete SQL statement.  ^A statement is judged to be
+    ** complete if it ends with a semicolon token and is not a prefix of a
+    ** well-formed CREATE TRIGGER statement.  ^Semicolons that are embedded within
+    ** string literals or quoted identifier names or comments are not
+    ** independent tokens (they are part of the token in which they are
+    ** embedded) and thus do not count as a statement terminator.  ^Whitespace
+    ** and comments that follow the final semicolon are ignored.
+    **
+    ** ^These routines return 0 if the statement is incomplete.  ^If a
+    ** memory allocation fails, then SQLITE_NOMEM is returned.
+    **
+    ** ^These routines do not parse the SQL statements thus
+    ** will not detect syntactically incorrect SQL.
+    **
+    ** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
+    ** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
+    ** automatically by sqlite3_complete16().  If that initialization fails,
+    ** then the return value from sqlite3_complete16() will be non-zero
+    ** regardless of whether or not the input SQL is complete.)^
+    **
+    ** The input to [sqlite3_complete()] must be a zero-terminated
+    ** UTF-8 string.
+    **
+    ** The input to [sqlite3_complete16()] must be a zero-terminated
+    ** UTF-16 string in native byte order.
+    */
+    SQLITE_API int sqlite3_complete(const char* sql);
+    SQLITE_API int sqlite3_complete16(const void* sql);
+
+    /*
+    ** CAPI3REF: Register A Callback To Handle SQLITE_BUSY Errors
+    ** KEYWORDS: {busy-handler callback} {busy handler}
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_busy_handler(D,X,P) routine sets a callback function X
+    ** that might be invoked with argument P whenever
+    ** an attempt is made to access a database table associated with
+    ** [database connection] D when another thread
+    ** or process has the table locked.
+    ** The sqlite3_busy_handler() interface is used to implement
+    ** [sqlite3_busy_timeout()] and [PRAGMA busy_timeout].
+    **
+    ** ^If the busy callback is NULL, then [SQLITE_BUSY]
+    ** is returned immediately upon encountering the lock.  ^If the busy callback
+    ** is not NULL, then the callback might be invoked with two arguments.
+    **
+    ** ^The first argument to the busy handler is a copy of the void* pointer which
+    ** is the third argument to sqlite3_busy_handler().  ^The second argument to
+    ** the busy handler callback is the number of times that the busy handler has
+    ** been invoked previously for the same locking event.  ^If the
+    ** busy callback returns 0, then no additional attempts are made to
+    ** access the database and [SQLITE_BUSY] is returned
+    ** to the application.
+    ** ^If the callback returns non-zero, then another attempt
+    ** is made to access the database and the cycle repeats.
+    **
+    ** The presence of a busy handler does not guarantee that it will be invoked
+    ** when there is lock contention. ^If SQLite determines that invoking the busy
+    ** handler could result in a deadlock, it will go ahead and return [SQLITE_BUSY]
+    ** to the application instead of invoking the
+    ** busy handler.
+    ** Consider a scenario where one process is holding a read lock that
+    ** it is trying to promote to a reserved lock and
+    ** a second process is holding a reserved lock that it is trying
+    ** to promote to an exclusive lock.  The first process cannot proceed
+    ** because it is blocked by the second and the second process cannot
+    ** proceed because it is blocked by the first.  If both processes
+    ** invoke the busy handlers, neither will make any progress.  Therefore,
+    ** SQLite returns [SQLITE_BUSY] for the first process, hoping that this
+    ** will induce the first process to release its read lock and allow
+    ** the second process to proceed.
+    **
+    ** ^The default busy callback is NULL.
+    **
+    ** ^(There can only be a single busy handler defined for each
+    ** [database connection].  Setting a new busy handler clears any
+    ** previously set handler.)^  ^Note that calling [sqlite3_busy_timeout()]
+    ** or evaluating [PRAGMA busy_timeout=N] will change the
+    ** busy handler and thus clear any previously set busy handler.
+    **
+    ** The busy callback should not take any actions which modify the
+    ** database connection that invoked the busy handler.  In other words,
+    ** the busy handler is not reentrant.  Any such actions
+    ** result in undefined behavior.
+    **
+    ** A busy handler must not close the database connection
+    ** or [prepared statement] that invoked the busy handler.
+    */
+    SQLITE_API int sqlite3_busy_handler(sqlite3*, int (*)(void*, int), void*);
+
+    /*
+    ** CAPI3REF: Set A Busy Timeout
+    ** METHOD: sqlite3
+    **
+    ** ^This routine sets a [sqlite3_busy_handler | busy handler] that sleeps
+    ** for a specified amount of time when a table is locked.  ^The handler
+    ** will sleep multiple times until at least "ms" milliseconds of sleeping
+    ** have accumulated.  ^After at least "ms" milliseconds of sleeping,
+    ** the handler returns 0 which causes [sqlite3_step()] to return
+    ** [SQLITE_BUSY].
+    **
+    ** ^Calling this routine with an argument less than or equal to zero
+    ** turns off all busy handlers.
+    **
+    ** ^(There can only be a single busy handler for a particular
+    ** [database connection] at any given moment.  If another busy handler
+    ** was defined  (using [sqlite3_busy_handler()]) prior to calling
+    ** this routine, that other busy handler is cleared.)^
+    **
+    ** See also:  [PRAGMA busy_timeout]
+    */
+    SQLITE_API int sqlite3_busy_timeout(sqlite3*, int ms);
+
+    /*
+    ** CAPI3REF: Convenience Routines For Running Queries
+    ** METHOD: sqlite3
+    **
+    ** This is a legacy interface that is preserved for backwards compatibility.
+    ** Use of this interface is not recommended.
+    **
+    ** Definition: A <b>result table</b> is memory data structure created by the
+    ** [sqlite3_get_table()] interface.  A result table records the
+    ** complete query results from one or more queries.
+    **
+    ** The table conceptually has a number of rows and columns.  But
+    ** these numbers are not part of the result table itself.  These
+    ** numbers are obtained separately.  Let N be the number of rows
+    ** and M be the number of columns.
+    **
+    ** A result table is an array of pointers to zero-terminated UTF-8 strings.
+    ** There are (N+1)*M elements in the array.  The first M pointers point
+    ** to zero-terminated strings that  contain the names of the columns.
+    ** The remaining entries all point to query results.  NULL values result
+    ** in NULL pointers.  All other values are in their UTF-8 zero-terminated
+    ** string representation as returned by [sqlite3_column_text()].
+    **
+    ** A result table might consist of one or more memory allocations.
+    ** It is not safe to pass a result table directly to [sqlite3_free()].
+    ** A result table should be deallocated using [sqlite3_free_table()].
+    **
+    ** ^(As an example of the result table format, suppose a query result
+    ** is as follows:
+    **
+    ** <blockquote><pre>
+    **        Name        | Age
+    **        -----------------------
+    **        Alice       | 43
+    **        Bob         | 28
+    **        Cindy       | 21
+    ** </pre></blockquote>
+    **
+    ** There are two columns (M==2) and three rows (N==3).  Thus the
+    ** result table has 8 entries.  Suppose the result table is stored
+    ** in an array named azResult.  Then azResult holds this content:
+    **
+    ** <blockquote><pre>
+    **        azResult&#91;0] = "Name";
+    **        azResult&#91;1] = "Age";
+    **        azResult&#91;2] = "Alice";
+    **        azResult&#91;3] = "43";
+    **        azResult&#91;4] = "Bob";
+    **        azResult&#91;5] = "28";
+    **        azResult&#91;6] = "Cindy";
+    **        azResult&#91;7] = "21";
+    ** </pre></blockquote>)^
+    **
+    ** ^The sqlite3_get_table() function evaluates one or more
+    ** semicolon-separated SQL statements in the zero-terminated UTF-8
+    ** string of its 2nd parameter and returns a result table to the
+    ** pointer given in its 3rd parameter.
+    **
+    ** After the application has finished with the result from sqlite3_get_table(),
+    ** it must pass the result table pointer to sqlite3_free_table() in order to
+    ** release the memory that was malloced.  Because of the way the
+    ** [sqlite3_malloc()] happens within sqlite3_get_table(), the calling
+    ** function must not try to call [sqlite3_free()] directly.  Only
+    ** [sqlite3_free_table()] is able to release the memory properly and safely.
+    **
+    ** The sqlite3_get_table() interface is implemented as a wrapper around
+    ** [sqlite3_exec()].  The sqlite3_get_table() routine does not have access
+    ** to any internal data structures of SQLite.  It uses only the public
+    ** interface defined here.  As a consequence, errors that occur in the
+    ** wrapper layer outside of the internal [sqlite3_exec()] call are not
+    ** reflected in subsequent calls to [sqlite3_errcode()] or
+    ** [sqlite3_errmsg()].
+    */
+    SQLITE_API int sqlite3_get_table(sqlite3* db,       /* An open database */
+                                     const char* zSql,  /* SQL to be evaluated */
+                                     char*** pazResult, /* Results of the query */
+                                     int* pnRow,        /* Number of result rows written here */
+                                     int* pnColumn,     /* Number of result columns written here */
+                                     char** pzErrmsg    /* Error msg written here */
+    );
+    SQLITE_API void sqlite3_free_table(char** result);
+
+    /*
+    ** CAPI3REF: Formatted String Printing Functions
+    **
+    ** These routines are work-alikes of the "printf()" family of functions
+    ** from the standard C library.
+    ** These routines understand most of the common formatting options from
+    ** the standard library printf()
+    ** plus some additional non-standard formats ([%q], [%Q], [%w], and [%z]).
+    ** See the [built-in printf()] documentation for details.
+    **
+    ** ^The sqlite3_mprintf() and sqlite3_vmprintf() routines write their
+    ** results into memory obtained from [sqlite3_malloc64()].
+    ** The strings returned by these two routines should be
+    ** released by [sqlite3_free()].  ^Both routines return a
+    ** NULL pointer if [sqlite3_malloc64()] is unable to allocate enough
+    ** memory to hold the resulting string.
+    **
+    ** ^(The sqlite3_snprintf() routine is similar to "snprintf()" from
+    ** the standard C library.  The result is written into the
+    ** buffer supplied as the second parameter whose size is given by
+    ** the first parameter. Note that the order of the
+    ** first two parameters is reversed from snprintf().)^  This is an
+    ** historical accident that cannot be fixed without breaking
+    ** backwards compatibility.  ^(Note also that sqlite3_snprintf()
+    ** returns a pointer to its buffer instead of the number of
+    ** characters actually written into the buffer.)^  We admit that
+    ** the number of characters written would be a more useful return
+    ** value but we cannot change the implementation of sqlite3_snprintf()
+    ** now without breaking compatibility.
+    **
+    ** ^As long as the buffer size is greater than zero, sqlite3_snprintf()
+    ** guarantees that the buffer is always zero-terminated.  ^The first
+    ** parameter "n" is the total size of the buffer, including space for
+    ** the zero terminator.  So the longest string that can be completely
+    ** written will be n-1 characters.
+    **
+    ** ^The sqlite3_vsnprintf() routine is a varargs version of sqlite3_snprintf().
+    **
+    ** See also:  [built-in printf()], [printf() SQL function]
+    */
+    SQLITE_API char* sqlite3_mprintf(const char*, ...);
+    SQLITE_API char* sqlite3_vmprintf(const char*, va_list);
+    SQLITE_API char* sqlite3_snprintf(int, char*, const char*, ...);
+    SQLITE_API char* sqlite3_vsnprintf(int, char*, const char*, va_list);
+
+    /*
+    ** CAPI3REF: Memory Allocation Subsystem
+    **
+    ** The SQLite core uses these three routines for all of its own
+    ** internal memory allocation needs. "Core" in the previous sentence
+    ** does not include operating-system specific [VFS] implementation.  The
+    ** Windows VFS uses native malloc() and free() for some operations.
+    **
+    ** ^The sqlite3_malloc() routine returns a pointer to a block
+    ** of memory at least N bytes in length, where N is the parameter.
+    ** ^If sqlite3_malloc() is unable to obtain sufficient free
+    ** memory, it returns a NULL pointer.  ^If the parameter N to
+    ** sqlite3_malloc() is zero or negative then sqlite3_malloc() returns
+    ** a NULL pointer.
+    **
+    ** ^The sqlite3_malloc64(N) routine works just like
+    ** sqlite3_malloc(N) except that N is an unsigned 64-bit integer instead
+    ** of a signed 32-bit integer.
+    **
+    ** ^Calling sqlite3_free() with a pointer previously returned
+    ** by sqlite3_malloc() or sqlite3_realloc() releases that memory so
+    ** that it might be reused.  ^The sqlite3_free() routine is
+    ** a no-op if is called with a NULL pointer.  Passing a NULL pointer
+    ** to sqlite3_free() is harmless.  After being freed, memory
+    ** should neither be read nor written.  Even reading previously freed
+    ** memory might result in a segmentation fault or other severe error.
+    ** Memory corruption, a segmentation fault, or other severe error
+    ** might result if sqlite3_free() is called with a non-NULL pointer that
+    ** was not obtained from sqlite3_malloc() or sqlite3_realloc().
+    **
+    ** ^The sqlite3_realloc(X,N) interface attempts to resize a
+    ** prior memory allocation X to be at least N bytes.
+    ** ^If the X parameter to sqlite3_realloc(X,N)
+    ** is a NULL pointer then its behavior is identical to calling
+    ** sqlite3_malloc(N).
+    ** ^If the N parameter to sqlite3_realloc(X,N) is zero or
+    ** negative then the behavior is exactly the same as calling
+    ** sqlite3_free(X).
+    ** ^sqlite3_realloc(X,N) returns a pointer to a memory allocation
+    ** of at least N bytes in size or NULL if insufficient memory is available.
+    ** ^If M is the size of the prior allocation, then min(N,M) bytes
+    ** of the prior allocation are copied into the beginning of buffer returned
+    ** by sqlite3_realloc(X,N) and the prior allocation is freed.
+    ** ^If sqlite3_realloc(X,N) returns NULL and N is positive, then the
+    ** prior allocation is not freed.
+    **
+    ** ^The sqlite3_realloc64(X,N) interfaces works the same as
+    ** sqlite3_realloc(X,N) except that N is a 64-bit unsigned integer instead
+    ** of a 32-bit signed integer.
+    **
+    ** ^If X is a memory allocation previously obtained from sqlite3_malloc(),
+    ** sqlite3_malloc64(), sqlite3_realloc(), or sqlite3_realloc64(), then
+    ** sqlite3_msize(X) returns the size of that memory allocation in bytes.
+    ** ^The value returned by sqlite3_msize(X) might be larger than the number
+    ** of bytes requested when X was allocated.  ^If X is a NULL pointer then
+    ** sqlite3_msize(X) returns zero.  If X points to something that is not
+    ** the beginning of memory allocation, or if it points to a formerly
+    ** valid memory allocation that has now been freed, then the behavior
+    ** of sqlite3_msize(X) is undefined and possibly harmful.
+    **
+    ** ^The memory returned by sqlite3_malloc(), sqlite3_realloc(),
+    ** sqlite3_malloc64(), and sqlite3_realloc64()
+    ** is always aligned to at least an 8 byte boundary, or to a
+    ** 4 byte boundary if the [SQLITE_4_BYTE_ALIGNED_MALLOC] compile-time
+    ** option is used.
+    **
+    ** The pointer arguments to [sqlite3_free()] and [sqlite3_realloc()]
+    ** must be either NULL or else pointers obtained from a prior
+    ** invocation of [sqlite3_malloc()] or [sqlite3_realloc()] that have
+    ** not yet been released.
+    **
+    ** The application must not read or write any part of
+    ** a block of memory after it has been released using
+    ** [sqlite3_free()] or [sqlite3_realloc()].
+    */
+    SQLITE_API void* sqlite3_malloc(int);
+    SQLITE_API void* sqlite3_malloc64(sqlite3_uint64);
+    SQLITE_API void* sqlite3_realloc(void*, int);
+    SQLITE_API void* sqlite3_realloc64(void*, sqlite3_uint64);
+    SQLITE_API void sqlite3_free(void*);
+    SQLITE_API sqlite3_uint64 sqlite3_msize(void*);
+
+    /*
+    ** CAPI3REF: Memory Allocator Statistics
+    **
+    ** SQLite provides these two interfaces for reporting on the status
+    ** of the [sqlite3_malloc()], [sqlite3_free()], and [sqlite3_realloc()]
+    ** routines, which form the built-in memory allocation subsystem.
+    **
+    ** ^The [sqlite3_memory_used()] routine returns the number of bytes
+    ** of memory currently outstanding (malloced but not freed).
+    ** ^The [sqlite3_memory_highwater()] routine returns the maximum
+    ** value of [sqlite3_memory_used()] since the high-water mark
+    ** was last reset.  ^The values returned by [sqlite3_memory_used()] and
+    ** [sqlite3_memory_highwater()] include any overhead
+    ** added by SQLite in its implementation of [sqlite3_malloc()],
+    ** but not overhead added by the any underlying system library
+    ** routines that [sqlite3_malloc()] may call.
+    **
+    ** ^The memory high-water mark is reset to the current value of
+    ** [sqlite3_memory_used()] if and only if the parameter to
+    ** [sqlite3_memory_highwater()] is true.  ^The value returned
+    ** by [sqlite3_memory_highwater(1)] is the high-water mark
+    ** prior to the reset.
+    */
+    SQLITE_API sqlite3_int64 sqlite3_memory_used(void);
+    SQLITE_API sqlite3_int64 sqlite3_memory_highwater(int resetFlag);
+
+    /*
+    ** CAPI3REF: Pseudo-Random Number Generator
+    **
+    ** SQLite contains a high-quality pseudo-random number generator (PRNG) used to
+    ** select random [ROWID | ROWIDs] when inserting new records into a table that
+    ** already uses the largest possible [ROWID].  The PRNG is also used for
+    ** the built-in random() and randomblob() SQL functions.  This interface allows
+    ** applications to access the same PRNG for other purposes.
+    **
+    ** ^A call to this routine stores N bytes of randomness into buffer P.
+    ** ^The P parameter can be a NULL pointer.
+    **
+    ** ^If this routine has not been previously called or if the previous
+    ** call had N less than one or a NULL pointer for P, then the PRNG is
+    ** seeded using randomness obtained from the xRandomness method of
+    ** the default [sqlite3_vfs] object.
+    ** ^If the previous call to this routine had an N of 1 or more and a
+    ** non-NULL P then the pseudo-randomness is generated
+    ** internally and without recourse to the [sqlite3_vfs] xRandomness
+    ** method.
+    */
+    SQLITE_API void sqlite3_randomness(int N, void* P);
+
+    /*
+    ** CAPI3REF: Compile-Time Authorization Callbacks
+    ** METHOD: sqlite3
+    ** KEYWORDS: {authorizer callback}
+    **
+    ** ^This routine registers an authorizer callback with a particular
+    ** [database connection], supplied in the first argument.
+    ** ^The authorizer callback is invoked as SQL statements are being compiled
+    ** by [sqlite3_prepare()] or its variants [sqlite3_prepare_v2()],
+    ** [sqlite3_prepare_v3()], [sqlite3_prepare16()], [sqlite3_prepare16_v2()],
+    ** and [sqlite3_prepare16_v3()].  ^At various
+    ** points during the compilation process, as logic is being created
+    ** to perform various actions, the authorizer callback is invoked to
+    ** see if those actions are allowed.  ^The authorizer callback should
+    ** return [SQLITE_OK] to allow the action, [SQLITE_IGNORE] to disallow the
+    ** specific action but allow the SQL statement to continue to be
+    ** compiled, or [SQLITE_DENY] to cause the entire SQL statement to be
+    ** rejected with an error.  ^If the authorizer callback returns
+    ** any value other than [SQLITE_IGNORE], [SQLITE_OK], or [SQLITE_DENY]
+    ** then the [sqlite3_prepare_v2()] or equivalent call that triggered
+    ** the authorizer will fail with an error message.
+    **
+    ** When the callback returns [SQLITE_OK], that means the operation
+    ** requested is ok.  ^When the callback returns [SQLITE_DENY], the
+    ** [sqlite3_prepare_v2()] or equivalent call that triggered the
+    ** authorizer will fail with an error message explaining that
+    ** access is denied.
+    **
+    ** ^The first parameter to the authorizer callback is a copy of the third
+    ** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
+    ** to the callback is an integer [SQLITE_COPY | action code] that specifies
+    ** the particular action to be authorized. ^The third through sixth parameters
+    ** to the callback are either NULL pointers or zero-terminated strings
+    ** that contain additional details about the action to be authorized.
+    ** Applications must always be prepared to encounter a NULL pointer in any
+    ** of the third through the sixth parameters of the authorization callback.
+    **
+    ** ^If the action code is [SQLITE_READ]
+    ** and the callback returns [SQLITE_IGNORE] then the
+    ** [prepared statement] statement is constructed to substitute
+    ** a NULL value in place of the table column that would have
+    ** been read if [SQLITE_OK] had been returned.  The [SQLITE_IGNORE]
+    ** return can be used to deny an untrusted user access to individual
+    ** columns of a table.
+    ** ^When a table is referenced by a [SELECT] but no column values are
+    ** extracted from that table (for example in a query like
+    ** "SELECT count(*) FROM tab") then the [SQLITE_READ] authorizer callback
+    ** is invoked once for that table with a column name that is an empty string.
+    ** ^If the action code is [SQLITE_DELETE] and the callback returns
+    ** [SQLITE_IGNORE] then the [DELETE] operation proceeds but the
+    ** [truncate optimization] is disabled and all rows are deleted individually.
+    **
+    ** An authorizer is used when [sqlite3_prepare | preparing]
+    ** SQL statements from an untrusted source, to ensure that the SQL statements
+    ** do not try to access data they are not allowed to see, or that they do not
+    ** try to execute malicious statements that damage the database.  For
+    ** example, an application may allow a user to enter arbitrary
+    ** SQL queries for evaluation by a database.  But the application does
+    ** not want the user to be able to make arbitrary changes to the
+    ** database.  An authorizer could then be put in place while the
+    ** user-entered SQL is being [sqlite3_prepare | prepared] that
+    ** disallows everything except [SELECT] statements.
+    **
+    ** Applications that need to process SQL from untrusted sources
+    ** might also consider lowering resource limits using [sqlite3_limit()]
+    ** and limiting database size using the [max_page_count] [PRAGMA]
+    ** in addition to using an authorizer.
+    **
+    ** ^(Only a single authorizer can be in place on a database connection
+    ** at a time.  Each call to sqlite3_set_authorizer overrides the
+    ** previous call.)^  ^Disable the authorizer by installing a NULL callback.
+    ** The authorizer is disabled by default.
+    **
+    ** The authorizer callback must not do anything that will modify
+    ** the database connection that invoked the authorizer callback.
+    ** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+    ** database connections for the meaning of "modify" in this paragraph.
+    **
+    ** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the
+    ** statement might be re-prepared during [sqlite3_step()] due to a
+    ** schema change.  Hence, the application should ensure that the
+    ** correct authorizer callback remains in place during the [sqlite3_step()].
+    **
+    ** ^Note that the authorizer callback is invoked only during
+    ** [sqlite3_prepare()] or its variants.  Authorization is not
+    ** performed during statement evaluation in [sqlite3_step()], unless
+    ** as stated in the previous paragraph, sqlite3_step() invokes
+    ** sqlite3_prepare_v2() to reprepare a statement after a schema change.
+    */
+    SQLITE_API int sqlite3_set_authorizer(sqlite3*,
+                                          int (*xAuth)(void*, int, const char*, const char*, const char*, const char*),
+                                          void* pUserData);
 
 /*
 ** CAPI3REF: Authorizer Return Codes
@@ -3125,8 +3121,8 @@ SQLITE_API int sqlite3_set_authorizer(
 ** Note that SQLITE_IGNORE is also used as a [conflict resolution mode]
 ** returned from the [sqlite3_vtab_on_conflict()] interface.
 */
-#define SQLITE_DENY   1   /* Abort the SQL statement with an error */
-#define SQLITE_IGNORE 2   /* Don't allow access, but don't generate an error */
+#define SQLITE_DENY 1   /* Abort the SQL statement with an error */
+#define SQLITE_IGNORE 2 /* Don't allow access, but don't generate an error */
 
 /*
 ** CAPI3REF: Authorizer Action Codes
@@ -3148,77 +3144,76 @@ SQLITE_API int sqlite3_set_authorizer(
 ** top-level SQL code.
 */
 /******************************************* 3rd ************ 4th ***********/
-#define SQLITE_CREATE_INDEX          1   /* Index Name      Table Name      */
-#define SQLITE_CREATE_TABLE          2   /* Table Name      NULL            */
-#define SQLITE_CREATE_TEMP_INDEX     3   /* Index Name      Table Name      */
-#define SQLITE_CREATE_TEMP_TABLE     4   /* Table Name      NULL            */
-#define SQLITE_CREATE_TEMP_TRIGGER   5   /* Trigger Name    Table Name      */
-#define SQLITE_CREATE_TEMP_VIEW      6   /* View Name       NULL            */
-#define SQLITE_CREATE_TRIGGER        7   /* Trigger Name    Table Name      */
-#define SQLITE_CREATE_VIEW           8   /* View Name       NULL            */
-#define SQLITE_DELETE                9   /* Table Name      NULL            */
-#define SQLITE_DROP_INDEX           10   /* Index Name      Table Name      */
-#define SQLITE_DROP_TABLE           11   /* Table Name      NULL            */
-#define SQLITE_DROP_TEMP_INDEX      12   /* Index Name      Table Name      */
-#define SQLITE_DROP_TEMP_TABLE      13   /* Table Name      NULL            */
-#define SQLITE_DROP_TEMP_TRIGGER    14   /* Trigger Name    Table Name      */
-#define SQLITE_DROP_TEMP_VIEW       15   /* View Name       NULL            */
-#define SQLITE_DROP_TRIGGER         16   /* Trigger Name    Table Name      */
-#define SQLITE_DROP_VIEW            17   /* View Name       NULL            */
-#define SQLITE_INSERT               18   /* Table Name      NULL            */
-#define SQLITE_PRAGMA               19   /* Pragma Name     1st arg or NULL */
-#define SQLITE_READ                 20   /* Table Name      Column Name     */
-#define SQLITE_SELECT               21   /* NULL            NULL            */
-#define SQLITE_TRANSACTION          22   /* Operation       NULL            */
-#define SQLITE_UPDATE               23   /* Table Name      Column Name     */
-#define SQLITE_ATTACH               24   /* Filename        NULL            */
-#define SQLITE_DETACH               25   /* Database Name   NULL            */
-#define SQLITE_ALTER_TABLE          26   /* Database Name   Table Name      */
-#define SQLITE_REINDEX              27   /* Index Name      NULL            */
-#define SQLITE_ANALYZE              28   /* Table Name      NULL            */
-#define SQLITE_CREATE_VTABLE        29   /* Table Name      Module Name     */
-#define SQLITE_DROP_VTABLE          30   /* Table Name      Module Name     */
-#define SQLITE_FUNCTION             31   /* NULL            Function Name   */
-#define SQLITE_SAVEPOINT            32   /* Operation       Savepoint Name  */
-#define SQLITE_COPY                  0   /* No longer used */
-#define SQLITE_RECURSIVE            33   /* NULL            NULL            */
-
-/*
-** CAPI3REF: Tracing And Profiling Functions
-** METHOD: sqlite3
-**
-** These routines are deprecated. Use the [sqlite3_trace_v2()] interface
-** instead of the routines described here.
-**
-** These routines register callback functions that can be used for
-** tracing and profiling the execution of SQL statements.
-**
-** ^The callback function registered by sqlite3_trace() is invoked at
-** various times when an SQL statement is being run by [sqlite3_step()].
-** ^The sqlite3_trace() callback is invoked with a UTF-8 rendering of the
-** SQL statement text as the statement first begins executing.
-** ^(Additional sqlite3_trace() callbacks might occur
-** as each triggered subprogram is entered.  The callbacks for triggers
-** contain a UTF-8 SQL comment that identifies the trigger.)^
-**
-** The [SQLITE_TRACE_SIZE_LIMIT] compile-time option can be used to limit
-** the length of [bound parameter] expansion in the output of sqlite3_trace().
-**
-** ^The callback function registered by sqlite3_profile() is invoked
-** as each SQL statement finishes.  ^The profile callback contains
-** the original statement text and an estimate of wall-clock time
-** of how long that statement took to run.  ^The profile callback
-** time is in units of nanoseconds, however the current implementation
-** is only capable of millisecond resolution so the six least significant
-** digits in the time are meaningless.  Future versions of SQLite
-** might provide greater resolution on the profiler callback.  Invoking
-** either [sqlite3_trace()] or [sqlite3_trace_v2()] will cancel the
-** profile callback.
-*/
-SQLITE_API SQLITE_DEPRECATED void *sqlite3_trace(sqlite3*,
-   void(*xTrace)(void*,const char*), void*);
-SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
-   void(*xProfile)(void*,const char*,sqlite3_uint64), void*);
+#define SQLITE_CREATE_INDEX 1        /* Index Name      Table Name      */
+#define SQLITE_CREATE_TABLE 2        /* Table Name      NULL            */
+#define SQLITE_CREATE_TEMP_INDEX 3   /* Index Name      Table Name      */
+#define SQLITE_CREATE_TEMP_TABLE 4   /* Table Name      NULL            */
+#define SQLITE_CREATE_TEMP_TRIGGER 5 /* Trigger Name    Table Name      */
+#define SQLITE_CREATE_TEMP_VIEW 6    /* View Name       NULL            */
+#define SQLITE_CREATE_TRIGGER 7      /* Trigger Name    Table Name      */
+#define SQLITE_CREATE_VIEW 8         /* View Name       NULL            */
+#define SQLITE_DELETE 9              /* Table Name      NULL            */
+#define SQLITE_DROP_INDEX 10         /* Index Name      Table Name      */
+#define SQLITE_DROP_TABLE 11         /* Table Name      NULL            */
+#define SQLITE_DROP_TEMP_INDEX 12    /* Index Name      Table Name      */
+#define SQLITE_DROP_TEMP_TABLE 13    /* Table Name      NULL            */
+#define SQLITE_DROP_TEMP_TRIGGER 14  /* Trigger Name    Table Name      */
+#define SQLITE_DROP_TEMP_VIEW 15     /* View Name       NULL            */
+#define SQLITE_DROP_TRIGGER 16       /* Trigger Name    Table Name      */
+#define SQLITE_DROP_VIEW 17          /* View Name       NULL            */
+#define SQLITE_INSERT 18             /* Table Name      NULL            */
+#define SQLITE_PRAGMA 19             /* Pragma Name     1st arg or NULL */
+#define SQLITE_READ 20               /* Table Name      Column Name     */
+#define SQLITE_SELECT 21             /* NULL            NULL            */
+#define SQLITE_TRANSACTION 22        /* Operation       NULL            */
+#define SQLITE_UPDATE 23             /* Table Name      Column Name     */
+#define SQLITE_ATTACH 24             /* Filename        NULL            */
+#define SQLITE_DETACH 25             /* Database Name   NULL            */
+#define SQLITE_ALTER_TABLE 26        /* Database Name   Table Name      */
+#define SQLITE_REINDEX 27            /* Index Name      NULL            */
+#define SQLITE_ANALYZE 28            /* Table Name      NULL            */
+#define SQLITE_CREATE_VTABLE 29      /* Table Name      Module Name     */
+#define SQLITE_DROP_VTABLE 30        /* Table Name      Module Name     */
+#define SQLITE_FUNCTION 31           /* NULL            Function Name   */
+#define SQLITE_SAVEPOINT 32          /* Operation       Savepoint Name  */
+#define SQLITE_COPY 0                /* No longer used */
+#define SQLITE_RECURSIVE 33          /* NULL            NULL            */
+
+    /*
+    ** CAPI3REF: Tracing And Profiling Functions
+    ** METHOD: sqlite3
+    **
+    ** These routines are deprecated. Use the [sqlite3_trace_v2()] interface
+    ** instead of the routines described here.
+    **
+    ** These routines register callback functions that can be used for
+    ** tracing and profiling the execution of SQL statements.
+    **
+    ** ^The callback function registered by sqlite3_trace() is invoked at
+    ** various times when an SQL statement is being run by [sqlite3_step()].
+    ** ^The sqlite3_trace() callback is invoked with a UTF-8 rendering of the
+    ** SQL statement text as the statement first begins executing.
+    ** ^(Additional sqlite3_trace() callbacks might occur
+    ** as each triggered subprogram is entered.  The callbacks for triggers
+    ** contain a UTF-8 SQL comment that identifies the trigger.)^
+    **
+    ** The [SQLITE_TRACE_SIZE_LIMIT] compile-time option can be used to limit
+    ** the length of [bound parameter] expansion in the output of sqlite3_trace().
+    **
+    ** ^The callback function registered by sqlite3_profile() is invoked
+    ** as each SQL statement finishes.  ^The profile callback contains
+    ** the original statement text and an estimate of wall-clock time
+    ** of how long that statement took to run.  ^The profile callback
+    ** time is in units of nanoseconds, however the current implementation
+    ** is only capable of millisecond resolution so the six least significant
+    ** digits in the time are meaningless.  Future versions of SQLite
+    ** might provide greater resolution on the profiler callback.  Invoking
+    ** either [sqlite3_trace()] or [sqlite3_trace_v2()] will cancel the
+    ** profile callback.
+    */
+    SQLITE_API SQLITE_DEPRECATED void* sqlite3_trace(sqlite3*, void (*xTrace)(void*, const char*), void*);
+    SQLITE_API SQLITE_DEPRECATED void*
+      sqlite3_profile(sqlite3*, void (*xProfile)(void*, const char*, sqlite3_uint64), void*);
 
 /*
 ** CAPI3REF: SQL Trace Event Codes
@@ -3272,675 +3267,666 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
 ** and the X argument is unused.
 ** </dl>
 */
-#define SQLITE_TRACE_STMT       0x01
-#define SQLITE_TRACE_PROFILE    0x02
-#define SQLITE_TRACE_ROW        0x04
-#define SQLITE_TRACE_CLOSE      0x08
-
-/*
-** CAPI3REF: SQL Trace Hook
-** METHOD: sqlite3
-**
-** ^The sqlite3_trace_v2(D,M,X,P) interface registers a trace callback
-** function X against [database connection] D, using property mask M
-** and context pointer P.  ^If the X callback is
-** NULL or if the M mask is zero, then tracing is disabled.  The
-** M argument should be the bitwise OR-ed combination of
-** zero or more [SQLITE_TRACE] constants.
-**
-** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides
-** (cancels) any prior calls to sqlite3_trace() or sqlite3_trace_v2().
-**
-** ^The X callback is invoked whenever any of the events identified by
-** mask M occur.  ^The integer return value from the callback is currently
-** ignored, though this may change in future releases.  Callback
-** implementations should return zero to ensure future compatibility.
-**
-** ^A trace callback is invoked with four arguments: callback(T,C,P,X).
-** ^The T argument is one of the [SQLITE_TRACE]
-** constants to indicate why the callback was invoked.
-** ^The C argument is a copy of the context pointer.
-** The P and X arguments are pointers whose meanings depend on T.
-**
-** The sqlite3_trace_v2() interface is intended to replace the legacy
-** interfaces [sqlite3_trace()] and [sqlite3_profile()], both of which
-** are deprecated.
-*/
-SQLITE_API int sqlite3_trace_v2(
-  sqlite3*,
-  unsigned uMask,
-  int(*xCallback)(unsigned,void*,void*,void*),
-  void *pCtx
-);
-
-/*
-** CAPI3REF: Query Progress Callbacks
-** METHOD: sqlite3
-**
-** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback
-** function X to be invoked periodically during long running calls to
-** [sqlite3_exec()], [sqlite3_step()] and [sqlite3_get_table()] for
-** database connection D.  An example use for this
-** interface is to keep a GUI updated during a large query.
-**
-** ^The parameter P is passed through as the only parameter to the
-** callback function X.  ^The parameter N is the approximate number of
-** [virtual machine instructions] that are evaluated between successive
-** invocations of the callback X.  ^If N is less than one then the progress
-** handler is disabled.
-**
-** ^Only a single progress handler may be defined at one time per
-** [database connection]; setting a new progress handler cancels the
-** old one.  ^Setting parameter X to NULL disables the progress handler.
-** ^The progress handler is also disabled by setting N to a value less
-** than 1.
-**
-** ^If the progress callback returns non-zero, the operation is
-** interrupted.  This feature can be used to implement a
-** "Cancel" button on a GUI progress dialog box.
-**
-** The progress handler callback must not do anything that will modify
-** the database connection that invoked the progress handler.
-** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
-** database connections for the meaning of "modify" in this paragraph.
-**
-*/
-SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
-
-/*
-** CAPI3REF: Opening A New Database Connection
-** CONSTRUCTOR: sqlite3
-**
-** ^These routines open an SQLite database file as specified by the
-** filename argument. ^The filename argument is interpreted as UTF-8 for
-** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte
-** order for sqlite3_open16(). ^(A [database connection] handle is usually
-** returned in *ppDb, even if an error occurs.  The only exception is that
-** if SQLite is unable to allocate memory to hold the [sqlite3] object,
-** a NULL will be written into *ppDb instead of a pointer to the [sqlite3]
-** object.)^ ^(If the database is opened (and/or created) successfully, then
-** [SQLITE_OK] is returned.  Otherwise an [error code] is returned.)^ ^The
-** [sqlite3_errmsg()] or [sqlite3_errmsg16()] routines can be used to obtain
-** an English language description of the error following a failure of any
-** of the sqlite3_open() routines.
-**
-** ^The default encoding will be UTF-8 for databases created using
-** sqlite3_open() or sqlite3_open_v2().  ^The default encoding for databases
-** created using sqlite3_open16() will be UTF-16 in the native byte order.
-**
-** Whether or not an error occurs when it is opened, resources
-** associated with the [database connection] handle should be released by
-** passing it to [sqlite3_close()] when it is no longer required.
-**
-** The sqlite3_open_v2() interface works like sqlite3_open()
-** except that it accepts two additional parameters for additional control
-** over the new database connection.  ^(The flags parameter to
-** sqlite3_open_v2() must include, at a minimum, one of the following
-** three flag combinations:)^
-**
-** <dl>
-** ^(<dt>[SQLITE_OPEN_READONLY]</dt>
-** <dd>The database is opened in read-only mode.  If the database does not
-** already exist, an error is returned.</dd>)^
-**
-** ^(<dt>[SQLITE_OPEN_READWRITE]</dt>
-** <dd>The database is opened for reading and writing if possible, or reading
-** only if the file is write protected by the operating system.  In either
-** case the database must already exist, otherwise an error is returned.</dd>)^
-**
-** ^(<dt>[SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]</dt>
-** <dd>The database is opened for reading and writing, and is created if
-** it does not already exist. This is the behavior that is always used for
-** sqlite3_open() and sqlite3_open16().</dd>)^
-** </dl>
-**
-** In addition to the required flags, the following optional flags are
-** also supported:
-**
-** <dl>
-** ^(<dt>[SQLITE_OPEN_URI]</dt>
-** <dd>The filename can be interpreted as a URI if this flag is set.</dd>)^
-**
-** ^(<dt>[SQLITE_OPEN_MEMORY]</dt>
-** <dd>The database will be opened as an in-memory database.  The database
-** is named by the "filename" argument for the purposes of cache-sharing,
-** if shared cache mode is enabled, but the "filename" is otherwise ignored.
-** </dd>)^
-**
-** ^(<dt>[SQLITE_OPEN_NOMUTEX]</dt>
-** <dd>The new database connection will use the "multi-thread"
-** [threading mode].)^  This means that separate threads are allowed
-** to use SQLite at the same time, as long as each thread is using
-** a different [database connection].
-**
-** ^(<dt>[SQLITE_OPEN_FULLMUTEX]</dt>
-** <dd>The new database connection will use the "serialized"
-** [threading mode].)^  This means the multiple threads can safely
-** attempt to use the same database connection at the same time.
-** (Mutexes will block any actual concurrency, but in this mode
-** there is no harm in trying.)
-**
-** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
-** <dd>The database is opened [shared cache] enabled, overriding
-** the default shared cache setting provided by
-** [sqlite3_enable_shared_cache()].)^
-**
-** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
-** <dd>The database is opened [shared cache] disabled, overriding
-** the default shared cache setting provided by
-** [sqlite3_enable_shared_cache()].)^
-**
-** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
-** <dd>The database connection comes up in "extended result code mode".
-** In other words, the database behaves has if
-** [sqlite3_extended_result_codes(db,1)] where called on the database
-** connection as soon as the connection is created. In addition to setting
-** the extended result code mode, this flag also causes [sqlite3_open_v2()]
-** to return an extended result code.</dd>
-**
-** [[OPEN_NOFOLLOW]] ^(<dt>[SQLITE_OPEN_NOFOLLOW]</dt>
-** <dd>The database filename is not allowed to be a symbolic link</dd>
-** </dl>)^
-**
-** If the 3rd parameter to sqlite3_open_v2() is not one of the
-** required combinations shown above optionally combined with other
-** [SQLITE_OPEN_READONLY | SQLITE_OPEN_* bits]
-** then the behavior is undefined.  Historic versions of SQLite
-** have silently ignored surplus bits in the flags parameter to
-** sqlite3_open_v2(), however that behavior might not be carried through
-** into future versions of SQLite and so applications should not rely
-** upon it.  Note in particular that the SQLITE_OPEN_EXCLUSIVE flag is a no-op
-** for sqlite3_open_v2().  The SQLITE_OPEN_EXCLUSIVE does *not* cause
-** the open to fail if the database already exists.  The SQLITE_OPEN_EXCLUSIVE
-** flag is intended for use by the [sqlite3_vfs|VFS interface] only, and not
-** by sqlite3_open_v2().
-**
-** ^The fourth parameter to sqlite3_open_v2() is the name of the
-** [sqlite3_vfs] object that defines the operating system interface that
-** the new database connection should use.  ^If the fourth parameter is
-** a NULL pointer then the default [sqlite3_vfs] object is used.
-**
-** ^If the filename is ":memory:", then a private, temporary in-memory database
-** is created for the connection.  ^This in-memory database will vanish when
-** the database connection is closed.  Future versions of SQLite might
-** make use of additional special filenames that begin with the ":" character.
-** It is recommended that when a database filename actually does begin with
-** a ":" character you should prefix the filename with a pathname such as
-** "./" to avoid ambiguity.
-**
-** ^If the filename is an empty string, then a private, temporary
-** on-disk database will be created.  ^This private database will be
-** automatically deleted as soon as the database connection is closed.
-**
-** [[URI filenames in sqlite3_open()]] <h3>URI Filenames</h3>
-**
-** ^If [URI filename] interpretation is enabled, and the filename argument
-** begins with "file:", then the filename is interpreted as a URI. ^URI
-** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
-** set in the third argument to sqlite3_open_v2(), or if it has
-** been enabled globally using the [SQLITE_CONFIG_URI] option with the
-** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
-** URI filename interpretation is turned off
-** by default, but future releases of SQLite might enable URI filename
-** interpretation by default.  See "[URI filenames]" for additional
-** information.
-**
-** URI filenames are parsed according to RFC 3986. ^If the URI contains an
-** authority, then it must be either an empty string or the string
-** "localhost". ^If the authority is not an empty string or "localhost", an
-** error is returned to the caller. ^The fragment component of a URI, if
-** present, is ignored.
-**
-** ^SQLite uses the path component of the URI as the name of the disk file
-** which contains the database. ^If the path begins with a '/' character,
-** then it is interpreted as an absolute path. ^If the path does not begin
-** with a '/' (meaning that the authority section is omitted from the URI)
-** then the path is interpreted as a relative path.
-** ^(On windows, the first component of an absolute path
-** is a drive specification (e.g. "C:").)^
-**
-** [[core URI query parameters]]
-** The query component of a URI may contain parameters that are interpreted
-** either by SQLite itself, or by a [VFS | custom VFS implementation].
-** SQLite and its built-in [VFSes] interpret the
-** following query parameters:
-**
-** <ul>
-**   <li> <b>vfs</b>: ^The "vfs" parameter may be used to specify the name of
-**     a VFS object that provides the operating system interface that should
-**     be used to access the database file on disk. ^If this option is set to
-**     an empty string the default VFS object is used. ^Specifying an unknown
-**     VFS is an error. ^If sqlite3_open_v2() is used and the vfs option is
-**     present, then the VFS specified by the option takes precedence over
-**     the value passed as the fourth parameter to sqlite3_open_v2().
-**
-**   <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw",
-**     "rwc", or "memory". Attempting to set it to any other value is
-**     an error)^.
-**     ^If "ro" is specified, then the database is opened for read-only
-**     access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
-**     third argument to sqlite3_open_v2(). ^If the mode option is set to
-**     "rw", then the database is opened for read-write (but not create)
-**     access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
-**     been set. ^Value "rwc" is equivalent to setting both
-**     SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE.  ^If the mode option is
-**     set to "memory" then a pure [in-memory database] that never reads
-**     or writes from disk is used. ^It is an error to specify a value for
-**     the mode parameter that is less restrictive than that specified by
-**     the flags passed in the third parameter to sqlite3_open_v2().
-**
-**   <li> <b>cache</b>: ^The cache parameter may be set to either "shared" or
-**     "private". ^Setting it to "shared" is equivalent to setting the
-**     SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to
-**     sqlite3_open_v2(). ^Setting the cache parameter to "private" is
-**     equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit.
-**     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
-**     a URI filename, its value overrides any behavior requested by setting
-**     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
-**
-**  <li> <b>psow</b>: ^The psow parameter indicates whether or not the
-**     [powersafe overwrite] property does or does not apply to the
-**     storage media on which the database file resides.
-**
-**  <li> <b>nolock</b>: ^The nolock parameter is a boolean query parameter
-**     which if set disables file locking in rollback journal modes.  This
-**     is useful for accessing a database on a filesystem that does not
-**     support locking.  Caution:  Database corruption might result if two
-**     or more processes write to the same database and any one of those
-**     processes uses nolock=1.
-**
-**  <li> <b>immutable</b>: ^The immutable parameter is a boolean query
-**     parameter that indicates that the database file is stored on
-**     read-only media.  ^When immutable is set, SQLite assumes that the
-**     database file cannot be changed, even by a process with higher
-**     privilege, and so the database is opened read-only and all locking
-**     and change detection is disabled.  Caution: Setting the immutable
-**     property on a database file that does in fact change can result
-**     in incorrect query results and/or [SQLITE_CORRUPT] errors.
-**     See also: [SQLITE_IOCAP_IMMUTABLE].
-**
-** </ul>
-**
-** ^Specifying an unknown parameter in the query component of a URI is not an
-** error.  Future versions of SQLite might understand additional query
-** parameters.  See "[query parameters with special meaning to SQLite]" for
-** additional information.
-**
-** [[URI filename examples]] <h3>URI filename examples</h3>
-**
-** <table border="1" align=center cellpadding=5>
-** <tr><th> URI filenames <th> Results
-** <tr><td> file:data.db <td>
-**          Open the file "data.db" in the current directory.
-** <tr><td> file:/home/fred/data.db<br>
-**          file:///home/fred/data.db <br>
-**          file://localhost/home/fred/data.db <br> <td>
-**          Open the database file "/home/fred/data.db".
-** <tr><td> file://darkstar/home/fred/data.db <td>
-**          An error. "darkstar" is not a recognized authority.
-** <tr><td style="white-space:nowrap">
-**          file:///C:/Documents%20and%20Settings/fred/Desktop/data.db
-**     <td> Windows only: Open the file "data.db" on fred's desktop on drive
-**          C:. Note that the %20 escaping in this example is not strictly
-**          necessary - space characters can be used literally
-**          in URI filenames.
-** <tr><td> file:data.db?mode=ro&cache=private <td>
-**          Open file "data.db" in the current directory for read-only access.
-**          Regardless of whether or not shared-cache mode is enabled by
-**          default, use a private cache.
-** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
-**          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
-**          that uses dot-files in place of posix advisory locking.
-** <tr><td> file:data.db?mode=readonly <td>
-**          An error. "readonly" is not a valid option for the "mode" parameter.
-**          Use "ro" instead:  "file:data.db?mode=ro".
-** </table>
-**
-** ^URI hexadecimal escape sequences (%HH) are supported within the path and
-** query components of a URI. A hexadecimal escape sequence consists of a
-** percent sign - "%" - followed by exactly two hexadecimal digits
-** specifying an octet value. ^Before the path or query components of a
-** URI filename are interpreted, they are encoded using UTF-8 and all
-** hexadecimal escape sequences replaced by a single byte containing the
-** corresponding octet. If this process generates an invalid UTF-8 encoding,
-** the results are undefined.
-**
-** <b>Note to Windows users:</b>  The encoding used for the filename argument
-** of sqlite3_open() and sqlite3_open_v2() must be UTF-8, not whatever
-** codepage is currently defined.  Filenames containing international
-** characters must be converted to UTF-8 prior to passing them into
-** sqlite3_open() or sqlite3_open_v2().
-**
-** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
-** prior to calling sqlite3_open() or sqlite3_open_v2().  Otherwise, various
-** features that require the use of temporary files may fail.
-**
-** See also: [sqlite3_temp_directory]
-*/
-SQLITE_API int sqlite3_open(
-  const char *filename,   /* Database filename (UTF-8) */
-  sqlite3 **ppDb          /* OUT: SQLite db handle */
-);
-SQLITE_API int sqlite3_open16(
-  const void *filename,   /* Database filename (UTF-16) */
-  sqlite3 **ppDb          /* OUT: SQLite db handle */
-);
-SQLITE_API int sqlite3_open_v2(
-  const char *filename,   /* Database filename (UTF-8) */
-  sqlite3 **ppDb,         /* OUT: SQLite db handle */
-  int flags,              /* Flags */
-  const char *zVfs        /* Name of VFS module to use */
-);
-
-/*
-** CAPI3REF: Obtain Values For URI Parameters
-**
-** These are utility routines, useful to [VFS|custom VFS implementations],
-** that check if a database file was a URI that contained a specific query
-** parameter, and if so obtains the value of that query parameter.
-**
-** The first parameter to these interfaces (hereafter referred to
-** as F) must be one of:
-** <ul>
-** <li> A database filename pointer created by the SQLite core and
-** passed into the xOpen() method of a VFS implemention, or
-** <li> A filename obtained from [sqlite3_db_filename()], or
-** <li> A new filename constructed using [sqlite3_create_filename()].
-** </ul>
-** If the F parameter is not one of the above, then the behavior is
-** undefined and probably undesirable.  Older versions of SQLite were
-** more tolerant of invalid F parameters than newer versions.
-**
-** If F is a suitable filename (as described in the previous paragraph)
-** and if P is the name of the query parameter, then
-** sqlite3_uri_parameter(F,P) returns the value of the P
-** parameter if it exists or a NULL pointer if P does not appear as a
-** query parameter on F.  If P is a query parameter of F and it
-** has no explicit value, then sqlite3_uri_parameter(F,P) returns
-** a pointer to an empty string.
-**
-** The sqlite3_uri_boolean(F,P,B) routine assumes that P is a boolean
-** parameter and returns true (1) or false (0) according to the value
-** of P.  The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the
-** value of query parameter P is one of "yes", "true", or "on" in any
-** case or if the value begins with a non-zero number.  The
-** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of
-** query parameter P is one of "no", "false", or "off" in any case or
-** if the value begins with a numeric zero.  If P is not a query
-** parameter on F or if the value of P does not match any of the
-** above, then sqlite3_uri_boolean(F,P,B) returns (B!=0).
-**
-** The sqlite3_uri_int64(F,P,D) routine converts the value of P into a
-** 64-bit signed integer and returns that integer, or D if P does not
-** exist.  If the value of P is something other than an integer, then
-** zero is returned.
-**
-** The sqlite3_uri_key(F,N) returns a pointer to the name (not
-** the value) of the N-th query parameter for filename F, or a NULL
-** pointer if N is less than zero or greater than the number of query
-** parameters minus 1.  The N value is zero-based so N should be 0 to obtain
-** the name of the first query parameter, 1 for the second parameter, and
-** so forth.
-**
-** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
-** sqlite3_uri_boolean(F,P,B) returns B.  If F is not a NULL pointer and
-** is not a database file pathname pointer that the SQLite core passed
-** into the xOpen VFS method, then the behavior of this routine is undefined
-** and probably undesirable.
-**
-** Beginning with SQLite [version 3.31.0] ([dateof:3.31.0]) the input F
-** parameter can also be the name of a rollback journal file or WAL file
-** in addition to the main database file.  Prior to version 3.31.0, these
-** routines would only work if F was the name of the main database file.
-** When the F parameter is the name of the rollback journal or WAL file,
-** it has access to all the same query parameters as were found on the
-** main database file.
-**
-** See the [URI filename] documentation for additional information.
-*/
-SQLITE_API const char *sqlite3_uri_parameter(const char *zFilename, const char *zParam);
-SQLITE_API int sqlite3_uri_boolean(const char *zFile, const char *zParam, int bDefault);
-SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
-SQLITE_API const char *sqlite3_uri_key(const char *zFilename, int N);
-
-/*
-** CAPI3REF:  Translate filenames
-**
-** These routines are available to [VFS|custom VFS implementations] for
-** translating filenames between the main database file, the journal file,
-** and the WAL file.
-**
-** If F is the name of an sqlite database file, journal file, or WAL file
-** passed by the SQLite core into the VFS, then sqlite3_filename_database(F)
-** returns the name of the corresponding database file.
-**
-** If F is the name of an sqlite database file, journal file, or WAL file
-** passed by the SQLite core into the VFS, or if F is a database filename
-** obtained from [sqlite3_db_filename()], then sqlite3_filename_journal(F)
-** returns the name of the corresponding rollback journal file.
-**
-** If F is the name of an sqlite database file, journal file, or WAL file
-** that was passed by the SQLite core into the VFS, or if F is a database
-** filename obtained from [sqlite3_db_filename()], then
-** sqlite3_filename_wal(F) returns the name of the corresponding
-** WAL file.
-**
-** In all of the above, if F is not the name of a database, journal or WAL
-** filename passed into the VFS from the SQLite core and F is not the
-** return value from [sqlite3_db_filename()], then the result is
-** undefined and is likely a memory access violation.
-*/
-SQLITE_API const char *sqlite3_filename_database(const char*);
-SQLITE_API const char *sqlite3_filename_journal(const char*);
-SQLITE_API const char *sqlite3_filename_wal(const char*);
-
-/*
-** CAPI3REF:  Database File Corresponding To A Journal
-**
-** ^If X is the name of a rollback or WAL-mode journal file that is
-** passed into the xOpen method of [sqlite3_vfs], then
-** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file]
-** object that represents the main database file.
-**
-** This routine is intended for use in custom [VFS] implementations
-** only.  It is not a general-purpose interface.
-** The argument sqlite3_file_object(X) must be a filename pointer that
-** has been passed into [sqlite3_vfs].xOpen method where the
-** flags parameter to xOpen contains one of the bits
-** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL].  Any other use
-** of this routine results in undefined and probably undesirable
-** behavior.
-*/
-SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
-
-/*
-** CAPI3REF: Create and Destroy VFS Filenames
-**
-** These interfces are provided for use by [VFS shim] implementations and
-** are not useful outside of that context.
-**
-** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
-** database filename D with corresponding journal file J and WAL file W and
-** with N URI parameters key/values pairs in the array P.  The result from
-** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
-** is safe to pass to routines like:
-** <ul>
-** <li> [sqlite3_uri_parameter()],
-** <li> [sqlite3_uri_boolean()],
-** <li> [sqlite3_uri_int64()],
-** <li> [sqlite3_uri_key()],
-** <li> [sqlite3_filename_database()],
-** <li> [sqlite3_filename_journal()], or
-** <li> [sqlite3_filename_wal()].
-** </ul>
-** If a memory allocation error occurs, sqlite3_create_filename() might
-** return a NULL pointer.  The memory obtained from sqlite3_create_filename(X)
-** must be released by a corresponding call to sqlite3_free_filename(Y).
-**
-** The P parameter in sqlite3_create_filename(D,J,W,N,P) should be an array
-** of 2*N pointers to strings.  Each pair of pointers in this array corresponds
-** to a key and value for a query parameter.  The P parameter may be a NULL
-** pointer if N is zero.  None of the 2*N pointers in the P array may be
-** NULL pointers and key pointers should not be empty strings.
-** None of the D, J, or W parameters to sqlite3_create_filename(D,J,W,N,P) may
-** be NULL pointers, though they can be empty strings.
-**
-** The sqlite3_free_filename(Y) routine releases a memory allocation
-** previously obtained from sqlite3_create_filename().  Invoking
-** sqlite3_free_filename(Y) where Y is a NULL pointer is a harmless no-op.
-**
-** If the Y parameter to sqlite3_free_filename(Y) is anything other
-** than a NULL pointer or a pointer previously acquired from
-** sqlite3_create_filename(), then bad things such as heap
-** corruption or segfaults may occur. The value Y should not be
-** used again after sqlite3_free_filename(Y) has been called.  This means
-** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
-** then the corresponding [sqlite3_module.xClose() method should also be
-** invoked prior to calling sqlite3_free_filename(Y).
-*/
-SQLITE_API char *sqlite3_create_filename(
-  const char *zDatabase,
-  const char *zJournal,
-  const char *zWal,
-  int nParam,
-  const char **azParam
-);
-SQLITE_API void sqlite3_free_filename(char*);
-
-/*
-** CAPI3REF: Error Codes And Messages
-** METHOD: sqlite3
-**
-** ^If the most recent sqlite3_* API call associated with
-** [database connection] D failed, then the sqlite3_errcode(D) interface
-** returns the numeric [result code] or [extended result code] for that
-** API call.
-** ^The sqlite3_extended_errcode()
-** interface is the same except that it always returns the
-** [extended result code] even when extended result codes are
-** disabled.
-**
-** The values returned by sqlite3_errcode() and/or
-** sqlite3_extended_errcode() might change with each API call.
-** Except, there are some interfaces that are guaranteed to never
-** change the value of the error code.  The error-code preserving
-** interfaces include the following:
-**
-** <ul>
-** <li> sqlite3_errcode()
-** <li> sqlite3_extended_errcode()
-** <li> sqlite3_errmsg()
-** <li> sqlite3_errmsg16()
-** <li> sqlite3_error_offset()
-** </ul>
-**
-** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
-** text that describes the error, as either UTF-8 or UTF-16 respectively.
-** ^(Memory to hold the error message string is managed internally.
-** The application does not need to worry about freeing the result.
-** However, the error string might be overwritten or deallocated by
-** subsequent calls to other SQLite interface functions.)^
-**
-** ^The sqlite3_errstr() interface returns the English-language text
-** that describes the [result code], as UTF-8.
-** ^(Memory to hold the error message string is managed internally
-** and must not be freed by the application)^.
-**
-** ^If the most recent error references a specific token in the input
-** SQL, the sqlite3_error_offset() interface returns the byte offset
-** of the start of that token.  ^The byte offset returned by
-** sqlite3_error_offset() assumes that the input SQL is UTF8.
-** ^If the most recent error does not reference a specific token in the input
-** SQL, then the sqlite3_error_offset() function returns -1.
-**
-** When the serialized [threading mode] is in use, it might be the
-** case that a second error occurs on a separate thread in between
-** the time of the first error and the call to these interfaces.
-** When that happens, the second error will be reported since these
-** interfaces always report the most recent result.  To avoid
-** this, each thread can obtain exclusive use of the [database connection] D
-** by invoking [sqlite3_mutex_enter]([sqlite3_db_mutex](D)) before beginning
-** to use D and invoking [sqlite3_mutex_leave]([sqlite3_db_mutex](D)) after
-** all calls to the interfaces listed here are completed.
-**
-** If an interface fails with SQLITE_MISUSE, that means the interface
-** was invoked incorrectly by the application.  In that case, the
-** error code and message may or may not be set.
-*/
-SQLITE_API int sqlite3_errcode(sqlite3 *db);
-SQLITE_API int sqlite3_extended_errcode(sqlite3 *db);
-SQLITE_API const char *sqlite3_errmsg(sqlite3*);
-SQLITE_API const void *sqlite3_errmsg16(sqlite3*);
-SQLITE_API const char *sqlite3_errstr(int);
-SQLITE_API int sqlite3_error_offset(sqlite3 *db);
-
-/*
-** CAPI3REF: Prepared Statement Object
-** KEYWORDS: {prepared statement} {prepared statements}
-**
-** An instance of this object represents a single SQL statement that
-** has been compiled into binary form and is ready to be evaluated.
-**
-** Think of each SQL statement as a separate computer program.  The
-** original SQL text is source code.  A prepared statement object
-** is the compiled object code.  All SQL must be converted into a
-** prepared statement before it can be run.
-**
-** The life-cycle of a prepared statement object usually goes like this:
-**
-** <ol>
-** <li> Create the prepared statement object using [sqlite3_prepare_v2()].
-** <li> Bind values to [parameters] using the sqlite3_bind_*()
-**      interfaces.
-** <li> Run the SQL by calling [sqlite3_step()] one or more times.
-** <li> Reset the prepared statement using [sqlite3_reset()] then go back
-**      to step 2.  Do this zero or more times.
-** <li> Destroy the object using [sqlite3_finalize()].
-** </ol>
-*/
-typedef struct sqlite3_stmt sqlite3_stmt;
-
-/*
-** CAPI3REF: Run-time Limits
-** METHOD: sqlite3
-**
-** ^(This interface allows the size of various constructs to be limited
-** on a connection by connection basis.  The first parameter is the
-** [database connection] whose limit is to be set or queried.  The
-** second parameter is one of the [limit categories] that define a
-** class of constructs to be size limited.  The third parameter is the
-** new limit for that construct.)^
-**
-** ^If the new limit is a negative number, the limit is unchanged.
-** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a
-** [limits | hard upper bound]
-** set at compile-time by a C preprocessor macro called
-** [limits | SQLITE_MAX_<i>NAME</i>].
-** (The "_LIMIT_" in the name is changed to "_MAX_".))^
-** ^Attempts to increase a limit above its hard upper bound are
-** silently truncated to the hard upper bound.
-**
-** ^Regardless of whether or not the limit was changed, the
-** [sqlite3_limit()] interface returns the prior value of the limit.
-** ^Hence, to find the current value of a limit without changing it,
-** simply invoke this interface with the third parameter set to -1.
-**
-** Run-time limits are intended for use in applications that manage
-** both their own internal database and also databases that are controlled
-** by untrusted external sources.  An example application might be a
-** web browser that has its own databases for storing history and
-** separate databases controlled by JavaScript applications downloaded
-** off the Internet.  The internal databases can be given the
-** large, default limits.  Databases managed by external sources can
-** be given much smaller limits designed to prevent a denial of service
-** attack.  Developers might also want to use the [sqlite3_set_authorizer()]
-** interface to further control untrusted SQL.  The size of the database
-** created by an untrusted script can be contained using the
-** [max_page_count] [PRAGMA].
-**
-** New run-time limit categories may be added in future releases.
-*/
-SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
+#define SQLITE_TRACE_STMT 0x01
+#define SQLITE_TRACE_PROFILE 0x02
+#define SQLITE_TRACE_ROW 0x04
+#define SQLITE_TRACE_CLOSE 0x08
+
+    /*
+    ** CAPI3REF: SQL Trace Hook
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_trace_v2(D,M,X,P) interface registers a trace callback
+    ** function X against [database connection] D, using property mask M
+    ** and context pointer P.  ^If the X callback is
+    ** NULL or if the M mask is zero, then tracing is disabled.  The
+    ** M argument should be the bitwise OR-ed combination of
+    ** zero or more [SQLITE_TRACE] constants.
+    **
+    ** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides
+    ** (cancels) any prior calls to sqlite3_trace() or sqlite3_trace_v2().
+    **
+    ** ^The X callback is invoked whenever any of the events identified by
+    ** mask M occur.  ^The integer return value from the callback is currently
+    ** ignored, though this may change in future releases.  Callback
+    ** implementations should return zero to ensure future compatibility.
+    **
+    ** ^A trace callback is invoked with four arguments: callback(T,C,P,X).
+    ** ^The T argument is one of the [SQLITE_TRACE]
+    ** constants to indicate why the callback was invoked.
+    ** ^The C argument is a copy of the context pointer.
+    ** The P and X arguments are pointers whose meanings depend on T.
+    **
+    ** The sqlite3_trace_v2() interface is intended to replace the legacy
+    ** interfaces [sqlite3_trace()] and [sqlite3_profile()], both of which
+    ** are deprecated.
+    */
+    SQLITE_API int
+      sqlite3_trace_v2(sqlite3*, unsigned uMask, int (*xCallback)(unsigned, void*, void*, void*), void* pCtx);
+
+    /*
+    ** CAPI3REF: Query Progress Callbacks
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_progress_handler(D,N,X,P) interface causes the callback
+    ** function X to be invoked periodically during long running calls to
+    ** [sqlite3_exec()], [sqlite3_step()] and [sqlite3_get_table()] for
+    ** database connection D.  An example use for this
+    ** interface is to keep a GUI updated during a large query.
+    **
+    ** ^The parameter P is passed through as the only parameter to the
+    ** callback function X.  ^The parameter N is the approximate number of
+    ** [virtual machine instructions] that are evaluated between successive
+    ** invocations of the callback X.  ^If N is less than one then the progress
+    ** handler is disabled.
+    **
+    ** ^Only a single progress handler may be defined at one time per
+    ** [database connection]; setting a new progress handler cancels the
+    ** old one.  ^Setting parameter X to NULL disables the progress handler.
+    ** ^The progress handler is also disabled by setting N to a value less
+    ** than 1.
+    **
+    ** ^If the progress callback returns non-zero, the operation is
+    ** interrupted.  This feature can be used to implement a
+    ** "Cancel" button on a GUI progress dialog box.
+    **
+    ** The progress handler callback must not do anything that will modify
+    ** the database connection that invoked the progress handler.
+    ** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+    ** database connections for the meaning of "modify" in this paragraph.
+    **
+    */
+    SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int (*)(void*), void*);
+
+    /*
+    ** CAPI3REF: Opening A New Database Connection
+    ** CONSTRUCTOR: sqlite3
+    **
+    ** ^These routines open an SQLite database file as specified by the
+    ** filename argument. ^The filename argument is interpreted as UTF-8 for
+    ** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte
+    ** order for sqlite3_open16(). ^(A [database connection] handle is usually
+    ** returned in *ppDb, even if an error occurs.  The only exception is that
+    ** if SQLite is unable to allocate memory to hold the [sqlite3] object,
+    ** a NULL will be written into *ppDb instead of a pointer to the [sqlite3]
+    ** object.)^ ^(If the database is opened (and/or created) successfully, then
+    ** [SQLITE_OK] is returned.  Otherwise an [error code] is returned.)^ ^The
+    ** [sqlite3_errmsg()] or [sqlite3_errmsg16()] routines can be used to obtain
+    ** an English language description of the error following a failure of any
+    ** of the sqlite3_open() routines.
+    **
+    ** ^The default encoding will be UTF-8 for databases created using
+    ** sqlite3_open() or sqlite3_open_v2().  ^The default encoding for databases
+    ** created using sqlite3_open16() will be UTF-16 in the native byte order.
+    **
+    ** Whether or not an error occurs when it is opened, resources
+    ** associated with the [database connection] handle should be released by
+    ** passing it to [sqlite3_close()] when it is no longer required.
+    **
+    ** The sqlite3_open_v2() interface works like sqlite3_open()
+    ** except that it accepts two additional parameters for additional control
+    ** over the new database connection.  ^(The flags parameter to
+    ** sqlite3_open_v2() must include, at a minimum, one of the following
+    ** three flag combinations:)^
+    **
+    ** <dl>
+    ** ^(<dt>[SQLITE_OPEN_READONLY]</dt>
+    ** <dd>The database is opened in read-only mode.  If the database does not
+    ** already exist, an error is returned.</dd>)^
+    **
+    ** ^(<dt>[SQLITE_OPEN_READWRITE]</dt>
+    ** <dd>The database is opened for reading and writing if possible, or reading
+    ** only if the file is write protected by the operating system.  In either
+    ** case the database must already exist, otherwise an error is returned.</dd>)^
+    **
+    ** ^(<dt>[SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE]</dt>
+    ** <dd>The database is opened for reading and writing, and is created if
+    ** it does not already exist. This is the behavior that is always used for
+    ** sqlite3_open() and sqlite3_open16().</dd>)^
+    ** </dl>
+    **
+    ** In addition to the required flags, the following optional flags are
+    ** also supported:
+    **
+    ** <dl>
+    ** ^(<dt>[SQLITE_OPEN_URI]</dt>
+    ** <dd>The filename can be interpreted as a URI if this flag is set.</dd>)^
+    **
+    ** ^(<dt>[SQLITE_OPEN_MEMORY]</dt>
+    ** <dd>The database will be opened as an in-memory database.  The database
+    ** is named by the "filename" argument for the purposes of cache-sharing,
+    ** if shared cache mode is enabled, but the "filename" is otherwise ignored.
+    ** </dd>)^
+    **
+    ** ^(<dt>[SQLITE_OPEN_NOMUTEX]</dt>
+    ** <dd>The new database connection will use the "multi-thread"
+    ** [threading mode].)^  This means that separate threads are allowed
+    ** to use SQLite at the same time, as long as each thread is using
+    ** a different [database connection].
+    **
+    ** ^(<dt>[SQLITE_OPEN_FULLMUTEX]</dt>
+    ** <dd>The new database connection will use the "serialized"
+    ** [threading mode].)^  This means the multiple threads can safely
+    ** attempt to use the same database connection at the same time.
+    ** (Mutexes will block any actual concurrency, but in this mode
+    ** there is no harm in trying.)
+    **
+    ** ^(<dt>[SQLITE_OPEN_SHAREDCACHE]</dt>
+    ** <dd>The database is opened [shared cache] enabled, overriding
+    ** the default shared cache setting provided by
+    ** [sqlite3_enable_shared_cache()].)^
+    **
+    ** ^(<dt>[SQLITE_OPEN_PRIVATECACHE]</dt>
+    ** <dd>The database is opened [shared cache] disabled, overriding
+    ** the default shared cache setting provided by
+    ** [sqlite3_enable_shared_cache()].)^
+    **
+    ** [[OPEN_EXRESCODE]] ^(<dt>[SQLITE_OPEN_EXRESCODE]</dt>
+    ** <dd>The database connection comes up in "extended result code mode".
+    ** In other words, the database behaves has if
+    ** [sqlite3_extended_result_codes(db,1)] where called on the database
+    ** connection as soon as the connection is created. In addition to setting
+    ** the extended result code mode, this flag also causes [sqlite3_open_v2()]
+    ** to return an extended result code.</dd>
+    **
+    ** [[OPEN_NOFOLLOW]] ^(<dt>[SQLITE_OPEN_NOFOLLOW]</dt>
+    ** <dd>The database filename is not allowed to be a symbolic link</dd>
+    ** </dl>)^
+    **
+    ** If the 3rd parameter to sqlite3_open_v2() is not one of the
+    ** required combinations shown above optionally combined with other
+    ** [SQLITE_OPEN_READONLY | SQLITE_OPEN_* bits]
+    ** then the behavior is undefined.  Historic versions of SQLite
+    ** have silently ignored surplus bits in the flags parameter to
+    ** sqlite3_open_v2(), however that behavior might not be carried through
+    ** into future versions of SQLite and so applications should not rely
+    ** upon it.  Note in particular that the SQLITE_OPEN_EXCLUSIVE flag is a no-op
+    ** for sqlite3_open_v2().  The SQLITE_OPEN_EXCLUSIVE does *not* cause
+    ** the open to fail if the database already exists.  The SQLITE_OPEN_EXCLUSIVE
+    ** flag is intended for use by the [sqlite3_vfs|VFS interface] only, and not
+    ** by sqlite3_open_v2().
+    **
+    ** ^The fourth parameter to sqlite3_open_v2() is the name of the
+    ** [sqlite3_vfs] object that defines the operating system interface that
+    ** the new database connection should use.  ^If the fourth parameter is
+    ** a NULL pointer then the default [sqlite3_vfs] object is used.
+    **
+    ** ^If the filename is ":memory:", then a private, temporary in-memory database
+    ** is created for the connection.  ^This in-memory database will vanish when
+    ** the database connection is closed.  Future versions of SQLite might
+    ** make use of additional special filenames that begin with the ":" character.
+    ** It is recommended that when a database filename actually does begin with
+    ** a ":" character you should prefix the filename with a pathname such as
+    ** "./" to avoid ambiguity.
+    **
+    ** ^If the filename is an empty string, then a private, temporary
+    ** on-disk database will be created.  ^This private database will be
+    ** automatically deleted as soon as the database connection is closed.
+    **
+    ** [[URI filenames in sqlite3_open()]] <h3>URI Filenames</h3>
+    **
+    ** ^If [URI filename] interpretation is enabled, and the filename argument
+    ** begins with "file:", then the filename is interpreted as a URI. ^URI
+    ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is
+    ** set in the third argument to sqlite3_open_v2(), or if it has
+    ** been enabled globally using the [SQLITE_CONFIG_URI] option with the
+    ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option.
+    ** URI filename interpretation is turned off
+    ** by default, but future releases of SQLite might enable URI filename
+    ** interpretation by default.  See "[URI filenames]" for additional
+    ** information.
+    **
+    ** URI filenames are parsed according to RFC 3986. ^If the URI contains an
+    ** authority, then it must be either an empty string or the string
+    ** "localhost". ^If the authority is not an empty string or "localhost", an
+    ** error is returned to the caller. ^The fragment component of a URI, if
+    ** present, is ignored.
+    **
+    ** ^SQLite uses the path component of the URI as the name of the disk file
+    ** which contains the database. ^If the path begins with a '/' character,
+    ** then it is interpreted as an absolute path. ^If the path does not begin
+    ** with a '/' (meaning that the authority section is omitted from the URI)
+    ** then the path is interpreted as a relative path.
+    ** ^(On windows, the first component of an absolute path
+    ** is a drive specification (e.g. "C:").)^
+    **
+    ** [[core URI query parameters]]
+    ** The query component of a URI may contain parameters that are interpreted
+    ** either by SQLite itself, or by a [VFS | custom VFS implementation].
+    ** SQLite and its built-in [VFSes] interpret the
+    ** following query parameters:
+    **
+    ** <ul>
+    **   <li> <b>vfs</b>: ^The "vfs" parameter may be used to specify the name of
+    **     a VFS object that provides the operating system interface that should
+    **     be used to access the database file on disk. ^If this option is set to
+    **     an empty string the default VFS object is used. ^Specifying an unknown
+    **     VFS is an error. ^If sqlite3_open_v2() is used and the vfs option is
+    **     present, then the VFS specified by the option takes precedence over
+    **     the value passed as the fourth parameter to sqlite3_open_v2().
+    **
+    **   <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw",
+    **     "rwc", or "memory". Attempting to set it to any other value is
+    **     an error)^.
+    **     ^If "ro" is specified, then the database is opened for read-only
+    **     access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
+    **     third argument to sqlite3_open_v2(). ^If the mode option is set to
+    **     "rw", then the database is opened for read-write (but not create)
+    **     access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
+    **     been set. ^Value "rwc" is equivalent to setting both
+    **     SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE.  ^If the mode option is
+    **     set to "memory" then a pure [in-memory database] that never reads
+    **     or writes from disk is used. ^It is an error to specify a value for
+    **     the mode parameter that is less restrictive than that specified by
+    **     the flags passed in the third parameter to sqlite3_open_v2().
+    **
+    **   <li> <b>cache</b>: ^The cache parameter may be set to either "shared" or
+    **     "private". ^Setting it to "shared" is equivalent to setting the
+    **     SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to
+    **     sqlite3_open_v2(). ^Setting the cache parameter to "private" is
+    **     equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit.
+    **     ^If sqlite3_open_v2() is used and the "cache" parameter is present in
+    **     a URI filename, its value overrides any behavior requested by setting
+    **     SQLITE_OPEN_PRIVATECACHE or SQLITE_OPEN_SHAREDCACHE flag.
+    **
+    **  <li> <b>psow</b>: ^The psow parameter indicates whether or not the
+    **     [powersafe overwrite] property does or does not apply to the
+    **     storage media on which the database file resides.
+    **
+    **  <li> <b>nolock</b>: ^The nolock parameter is a boolean query parameter
+    **     which if set disables file locking in rollback journal modes.  This
+    **     is useful for accessing a database on a filesystem that does not
+    **     support locking.  Caution:  Database corruption might result if two
+    **     or more processes write to the same database and any one of those
+    **     processes uses nolock=1.
+    **
+    **  <li> <b>immutable</b>: ^The immutable parameter is a boolean query
+    **     parameter that indicates that the database file is stored on
+    **     read-only media.  ^When immutable is set, SQLite assumes that the
+    **     database file cannot be changed, even by a process with higher
+    **     privilege, and so the database is opened read-only and all locking
+    **     and change detection is disabled.  Caution: Setting the immutable
+    **     property on a database file that does in fact change can result
+    **     in incorrect query results and/or [SQLITE_CORRUPT] errors.
+    **     See also: [SQLITE_IOCAP_IMMUTABLE].
+    **
+    ** </ul>
+    **
+    ** ^Specifying an unknown parameter in the query component of a URI is not an
+    ** error.  Future versions of SQLite might understand additional query
+    ** parameters.  See "[query parameters with special meaning to SQLite]" for
+    ** additional information.
+    **
+    ** [[URI filename examples]] <h3>URI filename examples</h3>
+    **
+    ** <table border="1" align=center cellpadding=5>
+    ** <tr><th> URI filenames <th> Results
+    ** <tr><td> file:data.db <td>
+    **          Open the file "data.db" in the current directory.
+    ** <tr><td> file:/home/fred/data.db<br>
+    **          file:///home/fred/data.db <br>
+    **          file://localhost/home/fred/data.db <br> <td>
+    **          Open the database file "/home/fred/data.db".
+    ** <tr><td> file://darkstar/home/fred/data.db <td>
+    **          An error. "darkstar" is not a recognized authority.
+    ** <tr><td style="white-space:nowrap">
+    **          file:///C:/Documents%20and%20Settings/fred/Desktop/data.db
+    **     <td> Windows only: Open the file "data.db" on fred's desktop on drive
+    **          C:. Note that the %20 escaping in this example is not strictly
+    **          necessary - space characters can be used literally
+    **          in URI filenames.
+    ** <tr><td> file:data.db?mode=ro&cache=private <td>
+    **          Open file "data.db" in the current directory for read-only access.
+    **          Regardless of whether or not shared-cache mode is enabled by
+    **          default, use a private cache.
+    ** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
+    **          Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
+    **          that uses dot-files in place of posix advisory locking.
+    ** <tr><td> file:data.db?mode=readonly <td>
+    **          An error. "readonly" is not a valid option for the "mode" parameter.
+    **          Use "ro" instead:  "file:data.db?mode=ro".
+    ** </table>
+    **
+    ** ^URI hexadecimal escape sequences (%HH) are supported within the path and
+    ** query components of a URI. A hexadecimal escape sequence consists of a
+    ** percent sign - "%" - followed by exactly two hexadecimal digits
+    ** specifying an octet value. ^Before the path or query components of a
+    ** URI filename are interpreted, they are encoded using UTF-8 and all
+    ** hexadecimal escape sequences replaced by a single byte containing the
+    ** corresponding octet. If this process generates an invalid UTF-8 encoding,
+    ** the results are undefined.
+    **
+    ** <b>Note to Windows users:</b>  The encoding used for the filename argument
+    ** of sqlite3_open() and sqlite3_open_v2() must be UTF-8, not whatever
+    ** codepage is currently defined.  Filenames containing international
+    ** characters must be converted to UTF-8 prior to passing them into
+    ** sqlite3_open() or sqlite3_open_v2().
+    **
+    ** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
+    ** prior to calling sqlite3_open() or sqlite3_open_v2().  Otherwise, various
+    ** features that require the use of temporary files may fail.
+    **
+    ** See also: [sqlite3_temp_directory]
+    */
+    SQLITE_API int sqlite3_open(const char* filename, /* Database filename (UTF-8) */
+                                sqlite3** ppDb        /* OUT: SQLite db handle */
+    );
+    SQLITE_API int sqlite3_open16(const void* filename, /* Database filename (UTF-16) */
+                                  sqlite3** ppDb        /* OUT: SQLite db handle */
+    );
+    SQLITE_API int sqlite3_open_v2(const char* filename, /* Database filename (UTF-8) */
+                                   sqlite3** ppDb,       /* OUT: SQLite db handle */
+                                   int flags,            /* Flags */
+                                   const char* zVfs      /* Name of VFS module to use */
+    );
+
+    /*
+    ** CAPI3REF: Obtain Values For URI Parameters
+    **
+    ** These are utility routines, useful to [VFS|custom VFS implementations],
+    ** that check if a database file was a URI that contained a specific query
+    ** parameter, and if so obtains the value of that query parameter.
+    **
+    ** The first parameter to these interfaces (hereafter referred to
+    ** as F) must be one of:
+    ** <ul>
+    ** <li> A database filename pointer created by the SQLite core and
+    ** passed into the xOpen() method of a VFS implemention, or
+    ** <li> A filename obtained from [sqlite3_db_filename()], or
+    ** <li> A new filename constructed using [sqlite3_create_filename()].
+    ** </ul>
+    ** If the F parameter is not one of the above, then the behavior is
+    ** undefined and probably undesirable.  Older versions of SQLite were
+    ** more tolerant of invalid F parameters than newer versions.
+    **
+    ** If F is a suitable filename (as described in the previous paragraph)
+    ** and if P is the name of the query parameter, then
+    ** sqlite3_uri_parameter(F,P) returns the value of the P
+    ** parameter if it exists or a NULL pointer if P does not appear as a
+    ** query parameter on F.  If P is a query parameter of F and it
+    ** has no explicit value, then sqlite3_uri_parameter(F,P) returns
+    ** a pointer to an empty string.
+    **
+    ** The sqlite3_uri_boolean(F,P,B) routine assumes that P is a boolean
+    ** parameter and returns true (1) or false (0) according to the value
+    ** of P.  The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the
+    ** value of query parameter P is one of "yes", "true", or "on" in any
+    ** case or if the value begins with a non-zero number.  The
+    ** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of
+    ** query parameter P is one of "no", "false", or "off" in any case or
+    ** if the value begins with a numeric zero.  If P is not a query
+    ** parameter on F or if the value of P does not match any of the
+    ** above, then sqlite3_uri_boolean(F,P,B) returns (B!=0).
+    **
+    ** The sqlite3_uri_int64(F,P,D) routine converts the value of P into a
+    ** 64-bit signed integer and returns that integer, or D if P does not
+    ** exist.  If the value of P is something other than an integer, then
+    ** zero is returned.
+    **
+    ** The sqlite3_uri_key(F,N) returns a pointer to the name (not
+    ** the value) of the N-th query parameter for filename F, or a NULL
+    ** pointer if N is less than zero or greater than the number of query
+    ** parameters minus 1.  The N value is zero-based so N should be 0 to obtain
+    ** the name of the first query parameter, 1 for the second parameter, and
+    ** so forth.
+    **
+    ** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
+    ** sqlite3_uri_boolean(F,P,B) returns B.  If F is not a NULL pointer and
+    ** is not a database file pathname pointer that the SQLite core passed
+    ** into the xOpen VFS method, then the behavior of this routine is undefined
+    ** and probably undesirable.
+    **
+    ** Beginning with SQLite [version 3.31.0] ([dateof:3.31.0]) the input F
+    ** parameter can also be the name of a rollback journal file or WAL file
+    ** in addition to the main database file.  Prior to version 3.31.0, these
+    ** routines would only work if F was the name of the main database file.
+    ** When the F parameter is the name of the rollback journal or WAL file,
+    ** it has access to all the same query parameters as were found on the
+    ** main database file.
+    **
+    ** See the [URI filename] documentation for additional information.
+    */
+    SQLITE_API const char* sqlite3_uri_parameter(const char* zFilename, const char* zParam);
+    SQLITE_API int sqlite3_uri_boolean(const char* zFile, const char* zParam, int bDefault);
+    SQLITE_API sqlite3_int64 sqlite3_uri_int64(const char*, const char*, sqlite3_int64);
+    SQLITE_API const char* sqlite3_uri_key(const char* zFilename, int N);
+
+    /*
+    ** CAPI3REF:  Translate filenames
+    **
+    ** These routines are available to [VFS|custom VFS implementations] for
+    ** translating filenames between the main database file, the journal file,
+    ** and the WAL file.
+    **
+    ** If F is the name of an sqlite database file, journal file, or WAL file
+    ** passed by the SQLite core into the VFS, then sqlite3_filename_database(F)
+    ** returns the name of the corresponding database file.
+    **
+    ** If F is the name of an sqlite database file, journal file, or WAL file
+    ** passed by the SQLite core into the VFS, or if F is a database filename
+    ** obtained from [sqlite3_db_filename()], then sqlite3_filename_journal(F)
+    ** returns the name of the corresponding rollback journal file.
+    **
+    ** If F is the name of an sqlite database file, journal file, or WAL file
+    ** that was passed by the SQLite core into the VFS, or if F is a database
+    ** filename obtained from [sqlite3_db_filename()], then
+    ** sqlite3_filename_wal(F) returns the name of the corresponding
+    ** WAL file.
+    **
+    ** In all of the above, if F is not the name of a database, journal or WAL
+    ** filename passed into the VFS from the SQLite core and F is not the
+    ** return value from [sqlite3_db_filename()], then the result is
+    ** undefined and is likely a memory access violation.
+    */
+    SQLITE_API const char* sqlite3_filename_database(const char*);
+    SQLITE_API const char* sqlite3_filename_journal(const char*);
+    SQLITE_API const char* sqlite3_filename_wal(const char*);
+
+    /*
+    ** CAPI3REF:  Database File Corresponding To A Journal
+    **
+    ** ^If X is the name of a rollback or WAL-mode journal file that is
+    ** passed into the xOpen method of [sqlite3_vfs], then
+    ** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file]
+    ** object that represents the main database file.
+    **
+    ** This routine is intended for use in custom [VFS] implementations
+    ** only.  It is not a general-purpose interface.
+    ** The argument sqlite3_file_object(X) must be a filename pointer that
+    ** has been passed into [sqlite3_vfs].xOpen method where the
+    ** flags parameter to xOpen contains one of the bits
+    ** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL].  Any other use
+    ** of this routine results in undefined and probably undesirable
+    ** behavior.
+    */
+    SQLITE_API sqlite3_file* sqlite3_database_file_object(const char*);
+
+    /*
+    ** CAPI3REF: Create and Destroy VFS Filenames
+    **
+    ** These interfces are provided for use by [VFS shim] implementations and
+    ** are not useful outside of that context.
+    **
+    ** The sqlite3_create_filename(D,J,W,N,P) allocates memory to hold a version of
+    ** database filename D with corresponding journal file J and WAL file W and
+    ** with N URI parameters key/values pairs in the array P.  The result from
+    ** sqlite3_create_filename(D,J,W,N,P) is a pointer to a database filename that
+    ** is safe to pass to routines like:
+    ** <ul>
+    ** <li> [sqlite3_uri_parameter()],
+    ** <li> [sqlite3_uri_boolean()],
+    ** <li> [sqlite3_uri_int64()],
+    ** <li> [sqlite3_uri_key()],
+    ** <li> [sqlite3_filename_database()],
+    ** <li> [sqlite3_filename_journal()], or
+    ** <li> [sqlite3_filename_wal()].
+    ** </ul>
+    ** If a memory allocation error occurs, sqlite3_create_filename() might
+    ** return a NULL pointer.  The memory obtained from sqlite3_create_filename(X)
+    ** must be released by a corresponding call to sqlite3_free_filename(Y).
+    **
+    ** The P parameter in sqlite3_create_filename(D,J,W,N,P) should be an array
+    ** of 2*N pointers to strings.  Each pair of pointers in this array corresponds
+    ** to a key and value for a query parameter.  The P parameter may be a NULL
+    ** pointer if N is zero.  None of the 2*N pointers in the P array may be
+    ** NULL pointers and key pointers should not be empty strings.
+    ** None of the D, J, or W parameters to sqlite3_create_filename(D,J,W,N,P) may
+    ** be NULL pointers, though they can be empty strings.
+    **
+    ** The sqlite3_free_filename(Y) routine releases a memory allocation
+    ** previously obtained from sqlite3_create_filename().  Invoking
+    ** sqlite3_free_filename(Y) where Y is a NULL pointer is a harmless no-op.
+    **
+    ** If the Y parameter to sqlite3_free_filename(Y) is anything other
+    ** than a NULL pointer or a pointer previously acquired from
+    ** sqlite3_create_filename(), then bad things such as heap
+    ** corruption or segfaults may occur. The value Y should not be
+    ** used again after sqlite3_free_filename(Y) has been called.  This means
+    ** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
+    ** then the corresponding [sqlite3_module.xClose() method should also be
+    ** invoked prior to calling sqlite3_free_filename(Y).
+    */
+    SQLITE_API char* sqlite3_create_filename(const char* zDatabase,
+                                             const char* zJournal,
+                                             const char* zWal,
+                                             int nParam,
+                                             const char** azParam);
+    SQLITE_API void sqlite3_free_filename(char*);
+
+    /*
+    ** CAPI3REF: Error Codes And Messages
+    ** METHOD: sqlite3
+    **
+    ** ^If the most recent sqlite3_* API call associated with
+    ** [database connection] D failed, then the sqlite3_errcode(D) interface
+    ** returns the numeric [result code] or [extended result code] for that
+    ** API call.
+    ** ^The sqlite3_extended_errcode()
+    ** interface is the same except that it always returns the
+    ** [extended result code] even when extended result codes are
+    ** disabled.
+    **
+    ** The values returned by sqlite3_errcode() and/or
+    ** sqlite3_extended_errcode() might change with each API call.
+    ** Except, there are some interfaces that are guaranteed to never
+    ** change the value of the error code.  The error-code preserving
+    ** interfaces include the following:
+    **
+    ** <ul>
+    ** <li> sqlite3_errcode()
+    ** <li> sqlite3_extended_errcode()
+    ** <li> sqlite3_errmsg()
+    ** <li> sqlite3_errmsg16()
+    ** <li> sqlite3_error_offset()
+    ** </ul>
+    **
+    ** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
+    ** text that describes the error, as either UTF-8 or UTF-16 respectively.
+    ** ^(Memory to hold the error message string is managed internally.
+    ** The application does not need to worry about freeing the result.
+    ** However, the error string might be overwritten or deallocated by
+    ** subsequent calls to other SQLite interface functions.)^
+    **
+    ** ^The sqlite3_errstr() interface returns the English-language text
+    ** that describes the [result code], as UTF-8.
+    ** ^(Memory to hold the error message string is managed internally
+    ** and must not be freed by the application)^.
+    **
+    ** ^If the most recent error references a specific token in the input
+    ** SQL, the sqlite3_error_offset() interface returns the byte offset
+    ** of the start of that token.  ^The byte offset returned by
+    ** sqlite3_error_offset() assumes that the input SQL is UTF8.
+    ** ^If the most recent error does not reference a specific token in the input
+    ** SQL, then the sqlite3_error_offset() function returns -1.
+    **
+    ** When the serialized [threading mode] is in use, it might be the
+    ** case that a second error occurs on a separate thread in between
+    ** the time of the first error and the call to these interfaces.
+    ** When that happens, the second error will be reported since these
+    ** interfaces always report the most recent result.  To avoid
+    ** this, each thread can obtain exclusive use of the [database connection] D
+    ** by invoking [sqlite3_mutex_enter]([sqlite3_db_mutex](D)) before beginning
+    ** to use D and invoking [sqlite3_mutex_leave]([sqlite3_db_mutex](D)) after
+    ** all calls to the interfaces listed here are completed.
+    **
+    ** If an interface fails with SQLITE_MISUSE, that means the interface
+    ** was invoked incorrectly by the application.  In that case, the
+    ** error code and message may or may not be set.
+    */
+    SQLITE_API int sqlite3_errcode(sqlite3* db);
+    SQLITE_API int sqlite3_extended_errcode(sqlite3* db);
+    SQLITE_API const char* sqlite3_errmsg(sqlite3*);
+    SQLITE_API const void* sqlite3_errmsg16(sqlite3*);
+    SQLITE_API const char* sqlite3_errstr(int);
+    SQLITE_API int sqlite3_error_offset(sqlite3* db);
+
+    /*
+    ** CAPI3REF: Prepared Statement Object
+    ** KEYWORDS: {prepared statement} {prepared statements}
+    **
+    ** An instance of this object represents a single SQL statement that
+    ** has been compiled into binary form and is ready to be evaluated.
+    **
+    ** Think of each SQL statement as a separate computer program.  The
+    ** original SQL text is source code.  A prepared statement object
+    ** is the compiled object code.  All SQL must be converted into a
+    ** prepared statement before it can be run.
+    **
+    ** The life-cycle of a prepared statement object usually goes like this:
+    **
+    ** <ol>
+    ** <li> Create the prepared statement object using [sqlite3_prepare_v2()].
+    ** <li> Bind values to [parameters] using the sqlite3_bind_*()
+    **      interfaces.
+    ** <li> Run the SQL by calling [sqlite3_step()] one or more times.
+    ** <li> Reset the prepared statement using [sqlite3_reset()] then go back
+    **      to step 2.  Do this zero or more times.
+    ** <li> Destroy the object using [sqlite3_finalize()].
+    ** </ol>
+    */
+    typedef struct sqlite3_stmt sqlite3_stmt;
+
+    /*
+    ** CAPI3REF: Run-time Limits
+    ** METHOD: sqlite3
+    **
+    ** ^(This interface allows the size of various constructs to be limited
+    ** on a connection by connection basis.  The first parameter is the
+    ** [database connection] whose limit is to be set or queried.  The
+    ** second parameter is one of the [limit categories] that define a
+    ** class of constructs to be size limited.  The third parameter is the
+    ** new limit for that construct.)^
+    **
+    ** ^If the new limit is a negative number, the limit is unchanged.
+    ** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a
+    ** [limits | hard upper bound]
+    ** set at compile-time by a C preprocessor macro called
+    ** [limits | SQLITE_MAX_<i>NAME</i>].
+    ** (The "_LIMIT_" in the name is changed to "_MAX_".))^
+    ** ^Attempts to increase a limit above its hard upper bound are
+    ** silently truncated to the hard upper bound.
+    **
+    ** ^Regardless of whether or not the limit was changed, the
+    ** [sqlite3_limit()] interface returns the prior value of the limit.
+    ** ^Hence, to find the current value of a limit without changing it,
+    ** simply invoke this interface with the third parameter set to -1.
+    **
+    ** Run-time limits are intended for use in applications that manage
+    ** both their own internal database and also databases that are controlled
+    ** by untrusted external sources.  An example application might be a
+    ** web browser that has its own databases for storing history and
+    ** separate databases controlled by JavaScript applications downloaded
+    ** off the Internet.  The internal databases can be given the
+    ** large, default limits.  Databases managed by external sources can
+    ** be given much smaller limits designed to prevent a denial of service
+    ** attack.  Developers might also want to use the [sqlite3_set_authorizer()]
+    ** interface to further control untrusted SQL.  The size of the database
+    ** created by an untrusted script can be contained using the
+    ** [max_page_count] [PRAGMA].
+    **
+    ** New run-time limit categories may be added in future releases.
+    */
+    SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 
 /*
 ** CAPI3REF: Run-Time Limit Categories
@@ -3998,18 +3984,18 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 ** [prepared statement] may start.</dd>)^
 ** </dl>
 */
-#define SQLITE_LIMIT_LENGTH                    0
-#define SQLITE_LIMIT_SQL_LENGTH                1
-#define SQLITE_LIMIT_COLUMN                    2
-#define SQLITE_LIMIT_EXPR_DEPTH                3
-#define SQLITE_LIMIT_COMPOUND_SELECT           4
-#define SQLITE_LIMIT_VDBE_OP                   5
-#define SQLITE_LIMIT_FUNCTION_ARG              6
-#define SQLITE_LIMIT_ATTACHED                  7
-#define SQLITE_LIMIT_LIKE_PATTERN_LENGTH       8
-#define SQLITE_LIMIT_VARIABLE_NUMBER           9
-#define SQLITE_LIMIT_TRIGGER_DEPTH            10
-#define SQLITE_LIMIT_WORKER_THREADS           11
+#define SQLITE_LIMIT_LENGTH 0
+#define SQLITE_LIMIT_SQL_LENGTH 1
+#define SQLITE_LIMIT_COLUMN 2
+#define SQLITE_LIMIT_EXPR_DEPTH 3
+#define SQLITE_LIMIT_COMPOUND_SELECT 4
+#define SQLITE_LIMIT_VDBE_OP 5
+#define SQLITE_LIMIT_FUNCTION_ARG 6
+#define SQLITE_LIMIT_ATTACHED 7
+#define SQLITE_LIMIT_LIKE_PATTERN_LENGTH 8
+#define SQLITE_LIMIT_VARIABLE_NUMBER 9
+#define SQLITE_LIMIT_TRIGGER_DEPTH 10
+#define SQLITE_LIMIT_WORKER_THREADS 11
 
 /*
 ** CAPI3REF: Prepare Flags
@@ -4046,807 +4032,800 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
 ** any virtual tables.
 ** </dl>
 */
-#define SQLITE_PREPARE_PERSISTENT              0x01
-#define SQLITE_PREPARE_NORMALIZE               0x02
-#define SQLITE_PREPARE_NO_VTAB                 0x04
-
-/*
-** CAPI3REF: Compiling An SQL Statement
-** KEYWORDS: {SQL statement compiler}
-** METHOD: sqlite3
-** CONSTRUCTOR: sqlite3_stmt
-**
-** To execute an SQL statement, it must first be compiled into a byte-code
-** program using one of these routines.  Or, in other words, these routines
-** are constructors for the [prepared statement] object.
-**
-** The preferred routine to use is [sqlite3_prepare_v2()].  The
-** [sqlite3_prepare()] interface is legacy and should be avoided.
-** [sqlite3_prepare_v3()] has an extra "prepFlags" option that is used
-** for special purposes.
-**
-** The use of the UTF-8 interfaces is preferred, as SQLite currently
-** does all parsing using UTF-8.  The UTF-16 interfaces are provided
-** as a convenience.  The UTF-16 interfaces work by converting the
-** input text into UTF-8, then invoking the corresponding UTF-8 interface.
-**
-** The first argument, "db", is a [database connection] obtained from a
-** prior successful call to [sqlite3_open()], [sqlite3_open_v2()] or
-** [sqlite3_open16()].  The database connection must not have been closed.
-**
-** The second argument, "zSql", is the statement to be compiled, encoded
-** as either UTF-8 or UTF-16.  The sqlite3_prepare(), sqlite3_prepare_v2(),
-** and sqlite3_prepare_v3()
-** interfaces use UTF-8, and sqlite3_prepare16(), sqlite3_prepare16_v2(),
-** and sqlite3_prepare16_v3() use UTF-16.
-**
-** ^If the nByte argument is negative, then zSql is read up to the
-** first zero terminator. ^If nByte is positive, then it is the
-** number of bytes read from zSql.  ^If nByte is zero, then no prepared
-** statement is generated.
-** If the caller knows that the supplied string is nul-terminated, then
-** there is a small performance advantage to passing an nByte parameter that
-** is the number of bytes in the input string <i>including</i>
-** the nul-terminator.
-**
-** ^If pzTail is not NULL then *pzTail is made to point to the first byte
-** past the end of the first SQL statement in zSql.  These routines only
-** compile the first statement in zSql, so *pzTail is left pointing to
-** what remains uncompiled.
-**
-** ^*ppStmt is left pointing to a compiled [prepared statement] that can be
-** executed using [sqlite3_step()].  ^If there is an error, *ppStmt is set
-** to NULL.  ^If the input text contains no SQL (if the input is an empty
-** string or a comment) then *ppStmt is set to NULL.
-** The calling procedure is responsible for deleting the compiled
-** SQL statement using [sqlite3_finalize()] after it has finished with it.
-** ppStmt may not be NULL.
-**
-** ^On success, the sqlite3_prepare() family of routines return [SQLITE_OK];
-** otherwise an [error code] is returned.
-**
-** The sqlite3_prepare_v2(), sqlite3_prepare_v3(), sqlite3_prepare16_v2(),
-** and sqlite3_prepare16_v3() interfaces are recommended for all new programs.
-** The older interfaces (sqlite3_prepare() and sqlite3_prepare16())
-** are retained for backwards compatibility, but their use is discouraged.
-** ^In the "vX" interfaces, the prepared statement
-** that is returned (the [sqlite3_stmt] object) contains a copy of the
-** original SQL text. This causes the [sqlite3_step()] interface to
-** behave differently in three ways:
-**
-** <ol>
-** <li>
-** ^If the database schema changes, instead of returning [SQLITE_SCHEMA] as it
-** always used to do, [sqlite3_step()] will automatically recompile the SQL
-** statement and try to run it again. As many as [SQLITE_MAX_SCHEMA_RETRY]
-** retries will occur before sqlite3_step() gives up and returns an error.
-** </li>
-**
-** <li>
-** ^When an error occurs, [sqlite3_step()] will return one of the detailed
-** [error codes] or [extended error codes].  ^The legacy behavior was that
-** [sqlite3_step()] would only return a generic [SQLITE_ERROR] result code
-** and the application would have to make a second call to [sqlite3_reset()]
-** in order to find the underlying cause of the problem. With the "v2" prepare
-** interfaces, the underlying reason for the error is returned immediately.
-** </li>
-**
-** <li>
-** ^If the specific value bound to a [parameter | host parameter] in the
-** WHERE clause might influence the choice of query plan for a statement,
-** then the statement will be automatically recompiled, as if there had been
-** a schema change, on the first [sqlite3_step()] call following any change
-** to the [sqlite3_bind_text | bindings] of that [parameter].
-** ^The specific value of a WHERE-clause [parameter] might influence the
-** choice of query plan if the parameter is the left-hand side of a [LIKE]
-** or [GLOB] operator or if the parameter is compared to an indexed column
-** and the [SQLITE_ENABLE_STAT4] compile-time option is enabled.
-** </li>
-** </ol>
-**
-** <p>^sqlite3_prepare_v3() differs from sqlite3_prepare_v2() only in having
-** the extra prepFlags parameter, which is a bit array consisting of zero or
-** more of the [SQLITE_PREPARE_PERSISTENT|SQLITE_PREPARE_*] flags.  ^The
-** sqlite3_prepare_v2() interface works exactly the same as
-** sqlite3_prepare_v3() with a zero prepFlags parameter.
-*/
-SQLITE_API int sqlite3_prepare(
-  sqlite3 *db,            /* Database handle */
-  const char *zSql,       /* SQL statement, UTF-8 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int sqlite3_prepare_v2(
-  sqlite3 *db,            /* Database handle */
-  const char *zSql,       /* SQL statement, UTF-8 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int sqlite3_prepare_v3(
-  sqlite3 *db,            /* Database handle */
-  const char *zSql,       /* SQL statement, UTF-8 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const char **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int sqlite3_prepare16(
-  sqlite3 *db,            /* Database handle */
-  const void *zSql,       /* SQL statement, UTF-16 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int sqlite3_prepare16_v2(
-  sqlite3 *db,            /* Database handle */
-  const void *zSql,       /* SQL statement, UTF-16 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-SQLITE_API int sqlite3_prepare16_v3(
-  sqlite3 *db,            /* Database handle */
-  const void *zSql,       /* SQL statement, UTF-16 encoded */
-  int nByte,              /* Maximum length of zSql in bytes. */
-  unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
-  sqlite3_stmt **ppStmt,  /* OUT: Statement handle */
-  const void **pzTail     /* OUT: Pointer to unused portion of zSql */
-);
-
-/*
-** CAPI3REF: Retrieving Statement SQL
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_sql(P) interface returns a pointer to a copy of the UTF-8
-** SQL text used to create [prepared statement] P if P was
-** created by [sqlite3_prepare_v2()], [sqlite3_prepare_v3()],
-** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
-** ^The sqlite3_expanded_sql(P) interface returns a pointer to a UTF-8
-** string containing the SQL text of prepared statement P with
-** [bound parameters] expanded.
-** ^The sqlite3_normalized_sql(P) interface returns a pointer to a UTF-8
-** string containing the normalized SQL text of prepared statement P.  The
-** semantics used to normalize a SQL statement are unspecified and subject
-** to change.  At a minimum, literal values will be replaced with suitable
-** placeholders.
-**
-** ^(For example, if a prepared statement is created using the SQL
-** text "SELECT $abc,:xyz" and if parameter $abc is bound to integer 2345
-** and parameter :xyz is unbound, then sqlite3_sql() will return
-** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
-** will return "SELECT 2345,NULL".)^
-**
-** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
-** is available to hold the result, or if the result would exceed the
-** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
-**
-** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
-** bound parameter expansions.  ^The [SQLITE_OMIT_TRACE] compile-time
-** option causes sqlite3_expanded_sql() to always return NULL.
-**
-** ^The strings returned by sqlite3_sql(P) and sqlite3_normalized_sql(P)
-** are managed by SQLite and are automatically freed when the prepared
-** statement is finalized.
-** ^The string returned by sqlite3_expanded_sql(P), on the other hand,
-** is obtained from [sqlite3_malloc()] and must be freed by the application
-** by passing it to [sqlite3_free()].
-**
-** ^The sqlite3_normalized_sql() interface is only available if
-** the [SQLITE_ENABLE_NORMALIZE] compile-time option is defined.
-*/
-SQLITE_API const char *sqlite3_sql(sqlite3_stmt *pStmt);
-SQLITE_API char *sqlite3_expanded_sql(sqlite3_stmt *pStmt);
+#define SQLITE_PREPARE_PERSISTENT 0x01
+#define SQLITE_PREPARE_NORMALIZE 0x02
+#define SQLITE_PREPARE_NO_VTAB 0x04
+
+    /*
+    ** CAPI3REF: Compiling An SQL Statement
+    ** KEYWORDS: {SQL statement compiler}
+    ** METHOD: sqlite3
+    ** CONSTRUCTOR: sqlite3_stmt
+    **
+    ** To execute an SQL statement, it must first be compiled into a byte-code
+    ** program using one of these routines.  Or, in other words, these routines
+    ** are constructors for the [prepared statement] object.
+    **
+    ** The preferred routine to use is [sqlite3_prepare_v2()].  The
+    ** [sqlite3_prepare()] interface is legacy and should be avoided.
+    ** [sqlite3_prepare_v3()] has an extra "prepFlags" option that is used
+    ** for special purposes.
+    **
+    ** The use of the UTF-8 interfaces is preferred, as SQLite currently
+    ** does all parsing using UTF-8.  The UTF-16 interfaces are provided
+    ** as a convenience.  The UTF-16 interfaces work by converting the
+    ** input text into UTF-8, then invoking the corresponding UTF-8 interface.
+    **
+    ** The first argument, "db", is a [database connection] obtained from a
+    ** prior successful call to [sqlite3_open()], [sqlite3_open_v2()] or
+    ** [sqlite3_open16()].  The database connection must not have been closed.
+    **
+    ** The second argument, "zSql", is the statement to be compiled, encoded
+    ** as either UTF-8 or UTF-16.  The sqlite3_prepare(), sqlite3_prepare_v2(),
+    ** and sqlite3_prepare_v3()
+    ** interfaces use UTF-8, and sqlite3_prepare16(), sqlite3_prepare16_v2(),
+    ** and sqlite3_prepare16_v3() use UTF-16.
+    **
+    ** ^If the nByte argument is negative, then zSql is read up to the
+    ** first zero terminator. ^If nByte is positive, then it is the
+    ** number of bytes read from zSql.  ^If nByte is zero, then no prepared
+    ** statement is generated.
+    ** If the caller knows that the supplied string is nul-terminated, then
+    ** there is a small performance advantage to passing an nByte parameter that
+    ** is the number of bytes in the input string <i>including</i>
+    ** the nul-terminator.
+    **
+    ** ^If pzTail is not NULL then *pzTail is made to point to the first byte
+    ** past the end of the first SQL statement in zSql.  These routines only
+    ** compile the first statement in zSql, so *pzTail is left pointing to
+    ** what remains uncompiled.
+    **
+    ** ^*ppStmt is left pointing to a compiled [prepared statement] that can be
+    ** executed using [sqlite3_step()].  ^If there is an error, *ppStmt is set
+    ** to NULL.  ^If the input text contains no SQL (if the input is an empty
+    ** string or a comment) then *ppStmt is set to NULL.
+    ** The calling procedure is responsible for deleting the compiled
+    ** SQL statement using [sqlite3_finalize()] after it has finished with it.
+    ** ppStmt may not be NULL.
+    **
+    ** ^On success, the sqlite3_prepare() family of routines return [SQLITE_OK];
+    ** otherwise an [error code] is returned.
+    **
+    ** The sqlite3_prepare_v2(), sqlite3_prepare_v3(), sqlite3_prepare16_v2(),
+    ** and sqlite3_prepare16_v3() interfaces are recommended for all new programs.
+    ** The older interfaces (sqlite3_prepare() and sqlite3_prepare16())
+    ** are retained for backwards compatibility, but their use is discouraged.
+    ** ^In the "vX" interfaces, the prepared statement
+    ** that is returned (the [sqlite3_stmt] object) contains a copy of the
+    ** original SQL text. This causes the [sqlite3_step()] interface to
+    ** behave differently in three ways:
+    **
+    ** <ol>
+    ** <li>
+    ** ^If the database schema changes, instead of returning [SQLITE_SCHEMA] as it
+    ** always used to do, [sqlite3_step()] will automatically recompile the SQL
+    ** statement and try to run it again. As many as [SQLITE_MAX_SCHEMA_RETRY]
+    ** retries will occur before sqlite3_step() gives up and returns an error.
+    ** </li>
+    **
+    ** <li>
+    ** ^When an error occurs, [sqlite3_step()] will return one of the detailed
+    ** [error codes] or [extended error codes].  ^The legacy behavior was that
+    ** [sqlite3_step()] would only return a generic [SQLITE_ERROR] result code
+    ** and the application would have to make a second call to [sqlite3_reset()]
+    ** in order to find the underlying cause of the problem. With the "v2" prepare
+    ** interfaces, the underlying reason for the error is returned immediately.
+    ** </li>
+    **
+    ** <li>
+    ** ^If the specific value bound to a [parameter | host parameter] in the
+    ** WHERE clause might influence the choice of query plan for a statement,
+    ** then the statement will be automatically recompiled, as if there had been
+    ** a schema change, on the first [sqlite3_step()] call following any change
+    ** to the [sqlite3_bind_text | bindings] of that [parameter].
+    ** ^The specific value of a WHERE-clause [parameter] might influence the
+    ** choice of query plan if the parameter is the left-hand side of a [LIKE]
+    ** or [GLOB] operator or if the parameter is compared to an indexed column
+    ** and the [SQLITE_ENABLE_STAT4] compile-time option is enabled.
+    ** </li>
+    ** </ol>
+    **
+    ** <p>^sqlite3_prepare_v3() differs from sqlite3_prepare_v2() only in having
+    ** the extra prepFlags parameter, which is a bit array consisting of zero or
+    ** more of the [SQLITE_PREPARE_PERSISTENT|SQLITE_PREPARE_*] flags.  ^The
+    ** sqlite3_prepare_v2() interface works exactly the same as
+    ** sqlite3_prepare_v3() with a zero prepFlags parameter.
+    */
+    SQLITE_API int sqlite3_prepare(sqlite3* db,           /* Database handle */
+                                   const char* zSql,      /* SQL statement, UTF-8 encoded */
+                                   int nByte,             /* Maximum length of zSql in bytes. */
+                                   sqlite3_stmt** ppStmt, /* OUT: Statement handle */
+                                   const char** pzTail    /* OUT: Pointer to unused portion of zSql */
+    );
+    SQLITE_API int sqlite3_prepare_v2(sqlite3* db,           /* Database handle */
+                                      const char* zSql,      /* SQL statement, UTF-8 encoded */
+                                      int nByte,             /* Maximum length of zSql in bytes. */
+                                      sqlite3_stmt** ppStmt, /* OUT: Statement handle */
+                                      const char** pzTail    /* OUT: Pointer to unused portion of zSql */
+    );
+    SQLITE_API int sqlite3_prepare_v3(sqlite3* db,            /* Database handle */
+                                      const char* zSql,       /* SQL statement, UTF-8 encoded */
+                                      int nByte,              /* Maximum length of zSql in bytes. */
+                                      unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
+                                      sqlite3_stmt** ppStmt,  /* OUT: Statement handle */
+                                      const char** pzTail     /* OUT: Pointer to unused portion of zSql */
+    );
+    SQLITE_API int sqlite3_prepare16(sqlite3* db,           /* Database handle */
+                                     const void* zSql,      /* SQL statement, UTF-16 encoded */
+                                     int nByte,             /* Maximum length of zSql in bytes. */
+                                     sqlite3_stmt** ppStmt, /* OUT: Statement handle */
+                                     const void** pzTail    /* OUT: Pointer to unused portion of zSql */
+    );
+    SQLITE_API int sqlite3_prepare16_v2(sqlite3* db,           /* Database handle */
+                                        const void* zSql,      /* SQL statement, UTF-16 encoded */
+                                        int nByte,             /* Maximum length of zSql in bytes. */
+                                        sqlite3_stmt** ppStmt, /* OUT: Statement handle */
+                                        const void** pzTail    /* OUT: Pointer to unused portion of zSql */
+    );
+    SQLITE_API int sqlite3_prepare16_v3(sqlite3* db,            /* Database handle */
+                                        const void* zSql,       /* SQL statement, UTF-16 encoded */
+                                        int nByte,              /* Maximum length of zSql in bytes. */
+                                        unsigned int prepFlags, /* Zero or more SQLITE_PREPARE_ flags */
+                                        sqlite3_stmt** ppStmt,  /* OUT: Statement handle */
+                                        const void** pzTail     /* OUT: Pointer to unused portion of zSql */
+    );
+
+    /*
+    ** CAPI3REF: Retrieving Statement SQL
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_sql(P) interface returns a pointer to a copy of the UTF-8
+    ** SQL text used to create [prepared statement] P if P was
+    ** created by [sqlite3_prepare_v2()], [sqlite3_prepare_v3()],
+    ** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
+    ** ^The sqlite3_expanded_sql(P) interface returns a pointer to a UTF-8
+    ** string containing the SQL text of prepared statement P with
+    ** [bound parameters] expanded.
+    ** ^The sqlite3_normalized_sql(P) interface returns a pointer to a UTF-8
+    ** string containing the normalized SQL text of prepared statement P.  The
+    ** semantics used to normalize a SQL statement are unspecified and subject
+    ** to change.  At a minimum, literal values will be replaced with suitable
+    ** placeholders.
+    **
+    ** ^(For example, if a prepared statement is created using the SQL
+    ** text "SELECT $abc,:xyz" and if parameter $abc is bound to integer 2345
+    ** and parameter :xyz is unbound, then sqlite3_sql() will return
+    ** the original string, "SELECT $abc,:xyz" but sqlite3_expanded_sql()
+    ** will return "SELECT 2345,NULL".)^
+    **
+    ** ^The sqlite3_expanded_sql() interface returns NULL if insufficient memory
+    ** is available to hold the result, or if the result would exceed the
+    ** the maximum string length determined by the [SQLITE_LIMIT_LENGTH].
+    **
+    ** ^The [SQLITE_TRACE_SIZE_LIMIT] compile-time option limits the size of
+    ** bound parameter expansions.  ^The [SQLITE_OMIT_TRACE] compile-time
+    ** option causes sqlite3_expanded_sql() to always return NULL.
+    **
+    ** ^The strings returned by sqlite3_sql(P) and sqlite3_normalized_sql(P)
+    ** are managed by SQLite and are automatically freed when the prepared
+    ** statement is finalized.
+    ** ^The string returned by sqlite3_expanded_sql(P), on the other hand,
+    ** is obtained from [sqlite3_malloc()] and must be freed by the application
+    ** by passing it to [sqlite3_free()].
+    **
+    ** ^The sqlite3_normalized_sql() interface is only available if
+    ** the [SQLITE_ENABLE_NORMALIZE] compile-time option is defined.
+    */
+    SQLITE_API const char* sqlite3_sql(sqlite3_stmt* pStmt);
+    SQLITE_API char* sqlite3_expanded_sql(sqlite3_stmt* pStmt);
 #ifdef SQLITE_ENABLE_NORMALIZE
-SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);
+    SQLITE_API const char* sqlite3_normalized_sql(sqlite3_stmt* pStmt);
 #endif
 
-/*
-** CAPI3REF: Determine If An SQL Statement Writes The Database
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_stmt_readonly(X) interface returns true (non-zero) if
-** and only if the [prepared statement] X makes no direct changes to
-** the content of the database file.
-**
-** Note that [application-defined SQL functions] or
-** [virtual tables] might change the database indirectly as a side effect.
-** ^(For example, if an application defines a function "eval()" that
-** calls [sqlite3_exec()], then the following SQL statement would
-** change the database file through side-effects:
-**
-** <blockquote><pre>
-**    SELECT eval('DELETE FROM t1') FROM t2;
-** </pre></blockquote>
-**
-** But because the [SELECT] statement does not change the database file
-** directly, sqlite3_stmt_readonly() would still return true.)^
-**
-** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK],
-** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true,
-** since the statements themselves do not actually modify the database but
-** rather they control the timing of when other statements modify the
-** database.  ^The [ATTACH] and [DETACH] statements also cause
-** sqlite3_stmt_readonly() to return true since, while those statements
-** change the configuration of a database connection, they do not make
-** changes to the content of the database files on disk.
-** ^The sqlite3_stmt_readonly() interface returns true for [BEGIN] since
-** [BEGIN] merely sets internal flags, but the [BEGIN|BEGIN IMMEDIATE] and
-** [BEGIN|BEGIN EXCLUSIVE] commands do touch the database and so
-** sqlite3_stmt_readonly() returns false for those commands.
-**
-** ^This routine returns false if there is any possibility that the
-** statement might change the database file.  ^A false return does
-** not guarantee that the statement will change the database file.
-** ^For example, an UPDATE statement might have a WHERE clause that
-** makes it a no-op, but the sqlite3_stmt_readonly() result would still
-** be false.  ^Similarly, a CREATE TABLE IF NOT EXISTS statement is a
-** read-only no-op if the table already exists, but
-** sqlite3_stmt_readonly() still returns false for such a statement.
-**
-** ^If prepared statement X is an [EXPLAIN] or [EXPLAIN QUERY PLAN]
-** statement, then sqlite3_stmt_readonly(X) returns the same value as
-** if the EXPLAIN or EXPLAIN QUERY PLAN prefix were omitted.
-*/
-SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Query The EXPLAIN Setting For A Prepared Statement
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_stmt_isexplain(S) interface returns 1 if the
-** prepared statement S is an EXPLAIN statement, or 2 if the
-** statement S is an EXPLAIN QUERY PLAN.
-** ^The sqlite3_stmt_isexplain(S) interface returns 0 if S is
-** an ordinary statement or a NULL pointer.
-*/
-SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Determine If A Prepared Statement Has Been Reset
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the
-** [prepared statement] S has been stepped at least once using
-** [sqlite3_step(S)] but has neither run to completion (returned
-** [SQLITE_DONE] from [sqlite3_step(S)]) nor
-** been reset using [sqlite3_reset(S)].  ^The sqlite3_stmt_busy(S)
-** interface returns false if S is a NULL pointer.  If S is not a
-** NULL pointer and is not a pointer to a valid [prepared statement]
-** object, then the behavior is undefined and probably undesirable.
-**
-** This interface can be used in combination [sqlite3_next_stmt()]
-** to locate all prepared statements associated with a database
-** connection that are in need of being reset.  This can be used,
-** for example, in diagnostic routines to search for prepared
-** statements that are holding a transaction open.
-*/
-SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Dynamically Typed Value Object
-** KEYWORDS: {protected sqlite3_value} {unprotected sqlite3_value}
-**
-** SQLite uses the sqlite3_value object to represent all values
-** that can be stored in a database table. SQLite uses dynamic typing
-** for the values it stores.  ^Values stored in sqlite3_value objects
-** can be integers, floating point values, strings, BLOBs, or NULL.
-**
-** An sqlite3_value object may be either "protected" or "unprotected".
-** Some interfaces require a protected sqlite3_value.  Other interfaces
-** will accept either a protected or an unprotected sqlite3_value.
-** Every interface that accepts sqlite3_value arguments specifies
-** whether or not it requires a protected sqlite3_value.  The
-** [sqlite3_value_dup()] interface can be used to construct a new
-** protected sqlite3_value from an unprotected sqlite3_value.
-**
-** The terms "protected" and "unprotected" refer to whether or not
-** a mutex is held.  An internal mutex is held for a protected
-** sqlite3_value object but no mutex is held for an unprotected
-** sqlite3_value object.  If SQLite is compiled to be single-threaded
-** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0)
-** or if SQLite is run in one of reduced mutex modes
-** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD]
-** then there is no distinction between protected and unprotected
-** sqlite3_value objects and they can be used interchangeably.  However,
-** for maximum code portability it is recommended that applications
-** still make the distinction between protected and unprotected
-** sqlite3_value objects even when not strictly required.
-**
-** ^The sqlite3_value objects that are passed as parameters into the
-** implementation of [application-defined SQL functions] are protected.
-** ^The sqlite3_value objects returned by [sqlite3_vtab_rhs_value()]
-** are protected.
-** ^The sqlite3_value object returned by
-** [sqlite3_column_value()] is unprotected.
-** Unprotected sqlite3_value objects may only be used as arguments
-** to [sqlite3_result_value()], [sqlite3_bind_value()], and
-** [sqlite3_value_dup()].
-** The [sqlite3_value_blob | sqlite3_value_type()] family of
-** interfaces require protected sqlite3_value objects.
-*/
-typedef struct sqlite3_value sqlite3_value;
-
-/*
-** CAPI3REF: SQL Function Context Object
-**
-** The context in which an SQL function executes is stored in an
-** sqlite3_context object.  ^A pointer to an sqlite3_context object
-** is always first parameter to [application-defined SQL functions].
-** The application-defined SQL function implementation will pass this
-** pointer through into calls to [sqlite3_result_int | sqlite3_result()],
-** [sqlite3_aggregate_context()], [sqlite3_user_data()],
-** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
-** and/or [sqlite3_set_auxdata()].
-*/
-typedef struct sqlite3_context sqlite3_context;
-
-/*
-** CAPI3REF: Binding Values To Prepared Statements
-** KEYWORDS: {host parameter} {host parameters} {host parameter name}
-** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
-** METHOD: sqlite3_stmt
-**
-** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
-** literals may be replaced by a [parameter] that matches one of following
-** templates:
-**
-** <ul>
-** <li>  ?
-** <li>  ?NNN
-** <li>  :VVV
-** <li>  @VVV
-** <li>  $VVV
-** </ul>
-**
-** In the templates above, NNN represents an integer literal,
-** and VVV represents an alphanumeric identifier.)^  ^The values of these
-** parameters (also called "host parameter names" or "SQL parameters")
-** can be set using the sqlite3_bind_*() routines defined here.
-**
-** ^The first argument to the sqlite3_bind_*() routines is always
-** a pointer to the [sqlite3_stmt] object returned from
-** [sqlite3_prepare_v2()] or its variants.
-**
-** ^The second argument is the index of the SQL parameter to be set.
-** ^The leftmost SQL parameter has an index of 1.  ^When the same named
-** SQL parameter is used more than once, second and subsequent
-** occurrences have the same index as the first occurrence.
-** ^The index for named parameters can be looked up using the
-** [sqlite3_bind_parameter_index()] API if desired.  ^The index
-** for "?NNN" parameters is the value of NNN.
-** ^The NNN value must be between 1 and the [sqlite3_limit()]
-** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 32766).
-**
-** ^The third argument is the value to bind to the parameter.
-** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
-** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
-** is ignored and the end result is the same as sqlite3_bind_null().
-** ^If the third parameter to sqlite3_bind_text() is not NULL, then
-** it should be a pointer to well-formed UTF8 text.
-** ^If the third parameter to sqlite3_bind_text16() is not NULL, then
-** it should be a pointer to well-formed UTF16 text.
-** ^If the third parameter to sqlite3_bind_text64() is not NULL, then
-** it should be a pointer to a well-formed unicode string that is
-** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
-** otherwise.
-**
-** [[byte-order determination rules]] ^The byte-order of
-** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
-** found in first character, which is removed, or in the absence of a BOM
-** the byte order is the native byte order of the host
-** machine for sqlite3_bind_text16() or the byte order specified in
-** the 6th parameter for sqlite3_bind_text64().)^
-** ^If UTF16 input text contains invalid unicode
-** characters, then SQLite might change those invalid characters
-** into the unicode replacement character: U+FFFD.
-**
-** ^(In those routines that have a fourth argument, its value is the
-** number of bytes in the parameter.  To be clear: the value is the
-** number of <u>bytes</u> in the value, not the number of characters.)^
-** ^If the fourth parameter to sqlite3_bind_text() or sqlite3_bind_text16()
-** is negative, then the length of the string is
-** the number of bytes up to the first zero terminator.
-** If the fourth parameter to sqlite3_bind_blob() is negative, then
-** the behavior is undefined.
-** If a non-negative fourth parameter is provided to sqlite3_bind_text()
-** or sqlite3_bind_text16() or sqlite3_bind_text64() then
-** that parameter must be the byte offset
-** where the NUL terminator would occur assuming the string were NUL
-** terminated.  If any NUL characters occurs at byte offsets less than
-** the value of the fourth parameter then the resulting string value will
-** contain embedded NULs.  The result of expressions involving strings
-** with embedded NULs is undefined.
-**
-** ^The fifth argument to the BLOB and string binding interfaces controls
-** or indicates the lifetime of the object referenced by the third parameter.
-** These three options exist:
-** ^ (1) A destructor to dispose of the BLOB or string after SQLite has finished
-** with it may be passed. ^It is called to dispose of the BLOB or string even
-** if the call to the bind API fails, except the destructor is not called if
-** the third parameter is a NULL pointer or the fourth parameter is negative.
-** ^ (2) The special constant, [SQLITE_STATIC], may be passsed to indicate that
-** the application remains responsible for disposing of the object. ^In this
-** case, the object and the provided pointer to it must remain valid until
-** either the prepared statement is finalized or the same SQL parameter is
-** bound to something else, whichever occurs sooner.
-** ^ (3) The constant, [SQLITE_TRANSIENT], may be passed to indicate that the
-** object is to be copied prior to the return from sqlite3_bind_*(). ^The
-** object and pointer to it must remain valid until then. ^SQLite will then
-** manage the lifetime of its private copy.
-**
-** ^The sixth argument to sqlite3_bind_text64() must be one of
-** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
-** to specify the encoding of the text in the third parameter.  If
-** the sixth argument to sqlite3_bind_text64() is not one of the
-** allowed values shown above, or if the text encoding is different
-** from the encoding specified by the sixth parameter, then the behavior
-** is undefined.
-**
-** ^The sqlite3_bind_zeroblob() routine binds a BLOB of length N that
-** is filled with zeroes.  ^A zeroblob uses a fixed amount of memory
-** (just an integer to hold its size) while it is being processed.
-** Zeroblobs are intended to serve as placeholders for BLOBs whose
-** content is later written using
-** [sqlite3_blob_open | incremental BLOB I/O] routines.
-** ^A negative value for the zeroblob results in a zero-length BLOB.
-**
-** ^The sqlite3_bind_pointer(S,I,P,T,D) routine causes the I-th parameter in
-** [prepared statement] S to have an SQL value of NULL, but to also be
-** associated with the pointer P of type T.  ^D is either a NULL pointer or
-** a pointer to a destructor function for P. ^SQLite will invoke the
-** destructor D with a single argument of P when it is finished using
-** P.  The T parameter should be a static string, preferably a string
-** literal. The sqlite3_bind_pointer() routine is part of the
-** [pointer passing interface] added for SQLite 3.20.0.
-**
-** ^If any of the sqlite3_bind_*() routines are called with a NULL pointer
-** for the [prepared statement] or with a prepared statement for which
-** [sqlite3_step()] has been called more recently than [sqlite3_reset()],
-** then the call will return [SQLITE_MISUSE].  If any sqlite3_bind_()
-** routine is passed a [prepared statement] that has been finalized, the
-** result is undefined and probably harmful.
-**
-** ^Bindings are not cleared by the [sqlite3_reset()] routine.
-** ^Unbound parameters are interpreted as NULL.
-**
-** ^The sqlite3_bind_* routines return [SQLITE_OK] on success or an
-** [error code] if anything goes wrong.
-** ^[SQLITE_TOOBIG] might be returned if the size of a string or BLOB
-** exceeds limits imposed by [sqlite3_limit]([SQLITE_LIMIT_LENGTH]) or
-** [SQLITE_MAX_LENGTH].
-** ^[SQLITE_RANGE] is returned if the parameter
-** index is out of range.  ^[SQLITE_NOMEM] is returned if malloc() fails.
-**
-** See also: [sqlite3_bind_parameter_count()],
-** [sqlite3_bind_parameter_name()], and [sqlite3_bind_parameter_index()].
-*/
-SQLITE_API int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void(*)(void*));
-SQLITE_API int sqlite3_bind_blob64(sqlite3_stmt*, int, const void*, sqlite3_uint64,
-                        void(*)(void*));
-SQLITE_API int sqlite3_bind_double(sqlite3_stmt*, int, double);
-SQLITE_API int sqlite3_bind_int(sqlite3_stmt*, int, int);
-SQLITE_API int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
-SQLITE_API int sqlite3_bind_null(sqlite3_stmt*, int);
-SQLITE_API int sqlite3_bind_text(sqlite3_stmt*,int,const char*,int,void(*)(void*));
-SQLITE_API int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void(*)(void*));
-SQLITE_API int sqlite3_bind_text64(sqlite3_stmt*, int, const char*, sqlite3_uint64,
-                         void(*)(void*), unsigned char encoding);
-SQLITE_API int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
-SQLITE_API int sqlite3_bind_pointer(sqlite3_stmt*, int, void*, const char*,void(*)(void*));
-SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
-SQLITE_API int sqlite3_bind_zeroblob64(sqlite3_stmt*, int, sqlite3_uint64);
-
-/*
-** CAPI3REF: Number Of SQL Parameters
-** METHOD: sqlite3_stmt
-**
-** ^This routine can be used to find the number of [SQL parameters]
-** in a [prepared statement].  SQL parameters are tokens of the
-** form "?", "?NNN", ":AAA", "$AAA", or "@AAA" that serve as
-** placeholders for values that are [sqlite3_bind_blob | bound]
-** to the parameters at a later time.
-**
-** ^(This routine actually returns the index of the largest (rightmost)
-** parameter. For all forms except ?NNN, this will correspond to the
-** number of unique parameters.  If parameters of the ?NNN form are used,
-** there may be gaps in the list.)^
-**
-** See also: [sqlite3_bind_blob|sqlite3_bind()],
-** [sqlite3_bind_parameter_name()], and
-** [sqlite3_bind_parameter_index()].
-*/
-SQLITE_API int sqlite3_bind_parameter_count(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Name Of A Host Parameter
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_bind_parameter_name(P,N) interface returns
-** the name of the N-th [SQL parameter] in the [prepared statement] P.
-** ^(SQL parameters of the form "?NNN" or ":AAA" or "@AAA" or "$AAA"
-** have a name which is the string "?NNN" or ":AAA" or "@AAA" or "$AAA"
-** respectively.
-** In other words, the initial ":" or "$" or "@" or "?"
-** is included as part of the name.)^
-** ^Parameters of the form "?" without a following integer have no name
-** and are referred to as "nameless" or "anonymous parameters".
-**
-** ^The first host parameter has an index of 1, not 0.
-**
-** ^If the value N is out of range or if the N-th parameter is
-** nameless, then NULL is returned.  ^The returned string is
-** always in UTF-8 encoding even if the named parameter was
-** originally specified as UTF-16 in [sqlite3_prepare16()],
-** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
-**
-** See also: [sqlite3_bind_blob|sqlite3_bind()],
-** [sqlite3_bind_parameter_count()], and
-** [sqlite3_bind_parameter_index()].
-*/
-SQLITE_API const char *sqlite3_bind_parameter_name(sqlite3_stmt*, int);
-
-/*
-** CAPI3REF: Index Of A Parameter With A Given Name
-** METHOD: sqlite3_stmt
-**
-** ^Return the index of an SQL parameter given its name.  ^The
-** index value returned is suitable for use as the second
-** parameter to [sqlite3_bind_blob|sqlite3_bind()].  ^A zero
-** is returned if no matching parameter is found.  ^The parameter
-** name must be given in UTF-8 even if the original statement
-** was prepared from UTF-16 text using [sqlite3_prepare16_v2()] or
-** [sqlite3_prepare16_v3()].
-**
-** See also: [sqlite3_bind_blob|sqlite3_bind()],
-** [sqlite3_bind_parameter_count()], and
-** [sqlite3_bind_parameter_name()].
-*/
-SQLITE_API int sqlite3_bind_parameter_index(sqlite3_stmt*, const char *zName);
-
-/*
-** CAPI3REF: Reset All Bindings On A Prepared Statement
-** METHOD: sqlite3_stmt
-**
-** ^Contrary to the intuition of many, [sqlite3_reset()] does not reset
-** the [sqlite3_bind_blob | bindings] on a [prepared statement].
-** ^Use this routine to reset all host parameters to NULL.
-*/
-SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Number Of Columns In A Result Set
-** METHOD: sqlite3_stmt
-**
-** ^Return the number of columns in the result set returned by the
-** [prepared statement]. ^If this routine returns 0, that means the
-** [prepared statement] returns no data (for example an [UPDATE]).
-** ^However, just because this routine returns a positive number does not
-** mean that one or more rows of data will be returned.  ^A SELECT statement
-** will always have a positive sqlite3_column_count() but depending on the
-** WHERE clause constraints and the table content, it might return no rows.
-**
-** See also: [sqlite3_data_count()]
-*/
-SQLITE_API int sqlite3_column_count(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Column Names In A Result Set
-** METHOD: sqlite3_stmt
-**
-** ^These routines return the name assigned to a particular column
-** in the result set of a [SELECT] statement.  ^The sqlite3_column_name()
-** interface returns a pointer to a zero-terminated UTF-8 string
-** and sqlite3_column_name16() returns a pointer to a zero-terminated
-** UTF-16 string.  ^The first parameter is the [prepared statement]
-** that implements the [SELECT] statement. ^The second parameter is the
-** column number.  ^The leftmost column is number 0.
-**
-** ^The returned string pointer is valid until either the [prepared statement]
-** is destroyed by [sqlite3_finalize()] or until the statement is automatically
-** reprepared by the first call to [sqlite3_step()] for a particular run
-** or until the next call to
-** sqlite3_column_name() or sqlite3_column_name16() on the same column.
-**
-** ^If sqlite3_malloc() fails during the processing of either routine
-** (for example during a conversion from UTF-8 to UTF-16) then a
-** NULL pointer is returned.
-**
-** ^The name of a result column is the value of the "AS" clause for
-** that column, if there is an AS clause.  If there is no AS clause
-** then the name of the column is unspecified and may change from
-** one release of SQLite to the next.
-*/
-SQLITE_API const char *sqlite3_column_name(sqlite3_stmt*, int N);
-SQLITE_API const void *sqlite3_column_name16(sqlite3_stmt*, int N);
-
-/*
-** CAPI3REF: Source Of Data In A Query Result
-** METHOD: sqlite3_stmt
-**
-** ^These routines provide a means to determine the database, table, and
-** table column that is the origin of a particular result column in
-** [SELECT] statement.
-** ^The name of the database or table or column can be returned as
-** either a UTF-8 or UTF-16 string.  ^The _database_ routines return
-** the database name, the _table_ routines return the table name, and
-** the origin_ routines return the column name.
-** ^The returned string is valid until the [prepared statement] is destroyed
-** using [sqlite3_finalize()] or until the statement is automatically
-** reprepared by the first call to [sqlite3_step()] for a particular run
-** or until the same information is requested
-** again in a different encoding.
-**
-** ^The names returned are the original un-aliased names of the
-** database, table, and column.
-**
-** ^The first argument to these interfaces is a [prepared statement].
-** ^These functions return information about the Nth result column returned by
-** the statement, where N is the second function argument.
-** ^The left-most column is column 0 for these routines.
-**
-** ^If the Nth column returned by the statement is an expression or
-** subquery and is not a column value, then all of these functions return
-** NULL.  ^These routines might also return NULL if a memory allocation error
-** occurs.  ^Otherwise, they return the name of the attached database, table,
-** or column that query result column was extracted from.
-**
-** ^As with all other SQLite APIs, those whose names end with "16" return
-** UTF-16 encoded strings and the other functions return UTF-8.
-**
-** ^These APIs are only available if the library was compiled with the
-** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol.
-**
-** If two or more threads call one or more
-** [sqlite3_column_database_name | column metadata interfaces]
-** for the same [prepared statement] and result column
-** at the same time then the results are undefined.
-*/
-SQLITE_API const char *sqlite3_column_database_name(sqlite3_stmt*,int);
-SQLITE_API const void *sqlite3_column_database_name16(sqlite3_stmt*,int);
-SQLITE_API const char *sqlite3_column_table_name(sqlite3_stmt*,int);
-SQLITE_API const void *sqlite3_column_table_name16(sqlite3_stmt*,int);
-SQLITE_API const char *sqlite3_column_origin_name(sqlite3_stmt*,int);
-SQLITE_API const void *sqlite3_column_origin_name16(sqlite3_stmt*,int);
-
-/*
-** CAPI3REF: Declared Datatype Of A Query Result
-** METHOD: sqlite3_stmt
-**
-** ^(The first parameter is a [prepared statement].
-** If this statement is a [SELECT] statement and the Nth column of the
-** returned result set of that [SELECT] is a table column (not an
-** expression or subquery) then the declared type of the table
-** column is returned.)^  ^If the Nth column of the result set is an
-** expression or subquery, then a NULL pointer is returned.
-** ^The returned string is always UTF-8 encoded.
-**
-** ^(For example, given the database schema:
-**
-** CREATE TABLE t1(c1 VARIANT);
-**
-** and the following statement to be compiled:
-**
-** SELECT c1 + 1, c1 FROM t1;
-**
-** this routine would return the string "VARIANT" for the second result
-** column (i==1), and a NULL pointer for the first result column (i==0).)^
-**
-** ^SQLite uses dynamic run-time typing.  ^So just because a column
-** is declared to contain a particular type does not mean that the
-** data stored in that column is of the declared type.  SQLite is
-** strongly typed, but the typing is dynamic not static.  ^Type
-** is associated with individual values, not with the containers
-** used to hold those values.
-*/
-SQLITE_API const char *sqlite3_column_decltype(sqlite3_stmt*,int);
-SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
-
-/*
-** CAPI3REF: Evaluate An SQL Statement
-** METHOD: sqlite3_stmt
-**
-** After a [prepared statement] has been prepared using any of
-** [sqlite3_prepare_v2()], [sqlite3_prepare_v3()], [sqlite3_prepare16_v2()],
-** or [sqlite3_prepare16_v3()] or one of the legacy
-** interfaces [sqlite3_prepare()] or [sqlite3_prepare16()], this function
-** must be called one or more times to evaluate the statement.
-**
-** The details of the behavior of the sqlite3_step() interface depend
-** on whether the statement was prepared using the newer "vX" interfaces
-** [sqlite3_prepare_v3()], [sqlite3_prepare_v2()], [sqlite3_prepare16_v3()],
-** [sqlite3_prepare16_v2()] or the older legacy
-** interfaces [sqlite3_prepare()] and [sqlite3_prepare16()].  The use of the
-** new "vX" interface is recommended for new applications but the legacy
-** interface will continue to be supported.
-**
-** ^In the legacy interface, the return value will be either [SQLITE_BUSY],
-** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE].
-** ^With the "v2" interface, any of the other [result codes] or
-** [extended result codes] might be returned as well.
-**
-** ^[SQLITE_BUSY] means that the database engine was unable to acquire the
-** database locks it needs to do its job.  ^If the statement is a [COMMIT]
-** or occurs outside of an explicit transaction, then you can retry the
-** statement.  If the statement is not a [COMMIT] and occurs within an
-** explicit transaction then you should rollback the transaction before
-** continuing.
-**
-** ^[SQLITE_DONE] means that the statement has finished executing
-** successfully.  sqlite3_step() should not be called again on this virtual
-** machine without first calling [sqlite3_reset()] to reset the virtual
-** machine back to its initial state.
-**
-** ^If the SQL statement being executed returns any data, then [SQLITE_ROW]
-** is returned each time a new row of data is ready for processing by the
-** caller. The values may be accessed using the [column access functions].
-** sqlite3_step() is called again to retrieve the next row of data.
-**
-** ^[SQLITE_ERROR] means that a run-time error (such as a constraint
-** violation) has occurred.  sqlite3_step() should not be called again on
-** the VM. More information may be found by calling [sqlite3_errmsg()].
-** ^With the legacy interface, a more specific error code (for example,
-** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth)
-** can be obtained by calling [sqlite3_reset()] on the
-** [prepared statement].  ^In the "v2" interface,
-** the more specific error code is returned directly by sqlite3_step().
-**
-** [SQLITE_MISUSE] means that the this routine was called inappropriately.
-** Perhaps it was called on a [prepared statement] that has
-** already been [sqlite3_finalize | finalized] or on one that had
-** previously returned [SQLITE_ERROR] or [SQLITE_DONE].  Or it could
-** be the case that the same database connection is being used by two or
-** more threads at the same moment in time.
-**
-** For all versions of SQLite up to and including 3.6.23.1, a call to
-** [sqlite3_reset()] was required after sqlite3_step() returned anything
-** other than [SQLITE_ROW] before any subsequent invocation of
-** sqlite3_step().  Failure to reset the prepared statement using
-** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
-** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1],
-** sqlite3_step() began
-** calling [sqlite3_reset()] automatically in this circumstance rather
-** than returning [SQLITE_MISUSE].  This is not considered a compatibility
-** break because any application that ever receives an SQLITE_MISUSE error
-** is broken by definition.  The [SQLITE_OMIT_AUTORESET] compile-time option
-** can be used to restore the legacy behavior.
-**
-** <b>Goofy Interface Alert:</b> In the legacy interface, the sqlite3_step()
-** API always returns a generic error code, [SQLITE_ERROR], following any
-** error other than [SQLITE_BUSY] and [SQLITE_MISUSE].  You must call
-** [sqlite3_reset()] or [sqlite3_finalize()] in order to find one of the
-** specific [error codes] that better describes the error.
-** We admit that this is a goofy design.  The problem has been fixed
-** with the "v2" interface.  If you prepare all of your SQL statements
-** using [sqlite3_prepare_v3()] or [sqlite3_prepare_v2()]
-** or [sqlite3_prepare16_v2()] or [sqlite3_prepare16_v3()] instead
-** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()] interfaces,
-** then the more specific [error codes] are returned directly
-** by sqlite3_step().  The use of the "vX" interfaces is recommended.
-*/
-SQLITE_API int sqlite3_step(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Number of columns in a result set
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_data_count(P) interface returns the number of columns in the
-** current row of the result set of [prepared statement] P.
-** ^If prepared statement P does not have results ready to return
-** (via calls to the [sqlite3_column_int | sqlite3_column()] family of
-** interfaces) then sqlite3_data_count(P) returns 0.
-** ^The sqlite3_data_count(P) routine also returns 0 if P is a NULL pointer.
-** ^The sqlite3_data_count(P) routine returns 0 if the previous call to
-** [sqlite3_step](P) returned [SQLITE_DONE].  ^The sqlite3_data_count(P)
-** will return non-zero if previous call to [sqlite3_step](P) returned
-** [SQLITE_ROW], except in the case of the [PRAGMA incremental_vacuum]
-** where it always returns zero since each step of that multi-step
-** pragma returns 0 columns of data.
-**
-** See also: [sqlite3_column_count()]
-*/
-SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
+    /*
+    ** CAPI3REF: Determine If An SQL Statement Writes The Database
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_stmt_readonly(X) interface returns true (non-zero) if
+    ** and only if the [prepared statement] X makes no direct changes to
+    ** the content of the database file.
+    **
+    ** Note that [application-defined SQL functions] or
+    ** [virtual tables] might change the database indirectly as a side effect.
+    ** ^(For example, if an application defines a function "eval()" that
+    ** calls [sqlite3_exec()], then the following SQL statement would
+    ** change the database file through side-effects:
+    **
+    ** <blockquote><pre>
+    **    SELECT eval('DELETE FROM t1') FROM t2;
+    ** </pre></blockquote>
+    **
+    ** But because the [SELECT] statement does not change the database file
+    ** directly, sqlite3_stmt_readonly() would still return true.)^
+    **
+    ** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK],
+    ** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true,
+    ** since the statements themselves do not actually modify the database but
+    ** rather they control the timing of when other statements modify the
+    ** database.  ^The [ATTACH] and [DETACH] statements also cause
+    ** sqlite3_stmt_readonly() to return true since, while those statements
+    ** change the configuration of a database connection, they do not make
+    ** changes to the content of the database files on disk.
+    ** ^The sqlite3_stmt_readonly() interface returns true for [BEGIN] since
+    ** [BEGIN] merely sets internal flags, but the [BEGIN|BEGIN IMMEDIATE] and
+    ** [BEGIN|BEGIN EXCLUSIVE] commands do touch the database and so
+    ** sqlite3_stmt_readonly() returns false for those commands.
+    **
+    ** ^This routine returns false if there is any possibility that the
+    ** statement might change the database file.  ^A false return does
+    ** not guarantee that the statement will change the database file.
+    ** ^For example, an UPDATE statement might have a WHERE clause that
+    ** makes it a no-op, but the sqlite3_stmt_readonly() result would still
+    ** be false.  ^Similarly, a CREATE TABLE IF NOT EXISTS statement is a
+    ** read-only no-op if the table already exists, but
+    ** sqlite3_stmt_readonly() still returns false for such a statement.
+    **
+    ** ^If prepared statement X is an [EXPLAIN] or [EXPLAIN QUERY PLAN]
+    ** statement, then sqlite3_stmt_readonly(X) returns the same value as
+    ** if the EXPLAIN or EXPLAIN QUERY PLAN prefix were omitted.
+    */
+    SQLITE_API int sqlite3_stmt_readonly(sqlite3_stmt* pStmt);
+
+    /*
+    ** CAPI3REF: Query The EXPLAIN Setting For A Prepared Statement
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_stmt_isexplain(S) interface returns 1 if the
+    ** prepared statement S is an EXPLAIN statement, or 2 if the
+    ** statement S is an EXPLAIN QUERY PLAN.
+    ** ^The sqlite3_stmt_isexplain(S) interface returns 0 if S is
+    ** an ordinary statement or a NULL pointer.
+    */
+    SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt* pStmt);
+
+    /*
+    ** CAPI3REF: Determine If A Prepared Statement Has Been Reset
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the
+    ** [prepared statement] S has been stepped at least once using
+    ** [sqlite3_step(S)] but has neither run to completion (returned
+    ** [SQLITE_DONE] from [sqlite3_step(S)]) nor
+    ** been reset using [sqlite3_reset(S)].  ^The sqlite3_stmt_busy(S)
+    ** interface returns false if S is a NULL pointer.  If S is not a
+    ** NULL pointer and is not a pointer to a valid [prepared statement]
+    ** object, then the behavior is undefined and probably undesirable.
+    **
+    ** This interface can be used in combination [sqlite3_next_stmt()]
+    ** to locate all prepared statements associated with a database
+    ** connection that are in need of being reset.  This can be used,
+    ** for example, in diagnostic routines to search for prepared
+    ** statements that are holding a transaction open.
+    */
+    SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
+
+    /*
+    ** CAPI3REF: Dynamically Typed Value Object
+    ** KEYWORDS: {protected sqlite3_value} {unprotected sqlite3_value}
+    **
+    ** SQLite uses the sqlite3_value object to represent all values
+    ** that can be stored in a database table. SQLite uses dynamic typing
+    ** for the values it stores.  ^Values stored in sqlite3_value objects
+    ** can be integers, floating point values, strings, BLOBs, or NULL.
+    **
+    ** An sqlite3_value object may be either "protected" or "unprotected".
+    ** Some interfaces require a protected sqlite3_value.  Other interfaces
+    ** will accept either a protected or an unprotected sqlite3_value.
+    ** Every interface that accepts sqlite3_value arguments specifies
+    ** whether or not it requires a protected sqlite3_value.  The
+    ** [sqlite3_value_dup()] interface can be used to construct a new
+    ** protected sqlite3_value from an unprotected sqlite3_value.
+    **
+    ** The terms "protected" and "unprotected" refer to whether or not
+    ** a mutex is held.  An internal mutex is held for a protected
+    ** sqlite3_value object but no mutex is held for an unprotected
+    ** sqlite3_value object.  If SQLite is compiled to be single-threaded
+    ** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0)
+    ** or if SQLite is run in one of reduced mutex modes
+    ** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD]
+    ** then there is no distinction between protected and unprotected
+    ** sqlite3_value objects and they can be used interchangeably.  However,
+    ** for maximum code portability it is recommended that applications
+    ** still make the distinction between protected and unprotected
+    ** sqlite3_value objects even when not strictly required.
+    **
+    ** ^The sqlite3_value objects that are passed as parameters into the
+    ** implementation of [application-defined SQL functions] are protected.
+    ** ^The sqlite3_value objects returned by [sqlite3_vtab_rhs_value()]
+    ** are protected.
+    ** ^The sqlite3_value object returned by
+    ** [sqlite3_column_value()] is unprotected.
+    ** Unprotected sqlite3_value objects may only be used as arguments
+    ** to [sqlite3_result_value()], [sqlite3_bind_value()], and
+    ** [sqlite3_value_dup()].
+    ** The [sqlite3_value_blob | sqlite3_value_type()] family of
+    ** interfaces require protected sqlite3_value objects.
+    */
+    typedef struct sqlite3_value sqlite3_value;
+
+    /*
+    ** CAPI3REF: SQL Function Context Object
+    **
+    ** The context in which an SQL function executes is stored in an
+    ** sqlite3_context object.  ^A pointer to an sqlite3_context object
+    ** is always first parameter to [application-defined SQL functions].
+    ** The application-defined SQL function implementation will pass this
+    ** pointer through into calls to [sqlite3_result_int | sqlite3_result()],
+    ** [sqlite3_aggregate_context()], [sqlite3_user_data()],
+    ** [sqlite3_context_db_handle()], [sqlite3_get_auxdata()],
+    ** and/or [sqlite3_set_auxdata()].
+    */
+    typedef struct sqlite3_context sqlite3_context;
+
+    /*
+    ** CAPI3REF: Binding Values To Prepared Statements
+    ** KEYWORDS: {host parameter} {host parameters} {host parameter name}
+    ** KEYWORDS: {SQL parameter} {SQL parameters} {parameter binding}
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^(In the SQL statement text input to [sqlite3_prepare_v2()] and its variants,
+    ** literals may be replaced by a [parameter] that matches one of following
+    ** templates:
+    **
+    ** <ul>
+    ** <li>  ?
+    ** <li>  ?NNN
+    ** <li>  :VVV
+    ** <li>  @VVV
+    ** <li>  $VVV
+    ** </ul>
+    **
+    ** In the templates above, NNN represents an integer literal,
+    ** and VVV represents an alphanumeric identifier.)^  ^The values of these
+    ** parameters (also called "host parameter names" or "SQL parameters")
+    ** can be set using the sqlite3_bind_*() routines defined here.
+    **
+    ** ^The first argument to the sqlite3_bind_*() routines is always
+    ** a pointer to the [sqlite3_stmt] object returned from
+    ** [sqlite3_prepare_v2()] or its variants.
+    **
+    ** ^The second argument is the index of the SQL parameter to be set.
+    ** ^The leftmost SQL parameter has an index of 1.  ^When the same named
+    ** SQL parameter is used more than once, second and subsequent
+    ** occurrences have the same index as the first occurrence.
+    ** ^The index for named parameters can be looked up using the
+    ** [sqlite3_bind_parameter_index()] API if desired.  ^The index
+    ** for "?NNN" parameters is the value of NNN.
+    ** ^The NNN value must be between 1 and the [sqlite3_limit()]
+    ** parameter [SQLITE_LIMIT_VARIABLE_NUMBER] (default value: 32766).
+    **
+    ** ^The third argument is the value to bind to the parameter.
+    ** ^If the third parameter to sqlite3_bind_text() or sqlite3_bind_text16()
+    ** or sqlite3_bind_blob() is a NULL pointer then the fourth parameter
+    ** is ignored and the end result is the same as sqlite3_bind_null().
+    ** ^If the third parameter to sqlite3_bind_text() is not NULL, then
+    ** it should be a pointer to well-formed UTF8 text.
+    ** ^If the third parameter to sqlite3_bind_text16() is not NULL, then
+    ** it should be a pointer to well-formed UTF16 text.
+    ** ^If the third parameter to sqlite3_bind_text64() is not NULL, then
+    ** it should be a pointer to a well-formed unicode string that is
+    ** either UTF8 if the sixth parameter is SQLITE_UTF8, or UTF16
+    ** otherwise.
+    **
+    ** [[byte-order determination rules]] ^The byte-order of
+    ** UTF16 input text is determined by the byte-order mark (BOM, U+FEFF)
+    ** found in first character, which is removed, or in the absence of a BOM
+    ** the byte order is the native byte order of the host
+    ** machine for sqlite3_bind_text16() or the byte order specified in
+    ** the 6th parameter for sqlite3_bind_text64().)^
+    ** ^If UTF16 input text contains invalid unicode
+    ** characters, then SQLite might change those invalid characters
+    ** into the unicode replacement character: U+FFFD.
+    **
+    ** ^(In those routines that have a fourth argument, its value is the
+    ** number of bytes in the parameter.  To be clear: the value is the
+    ** number of <u>bytes</u> in the value, not the number of characters.)^
+    ** ^If the fourth parameter to sqlite3_bind_text() or sqlite3_bind_text16()
+    ** is negative, then the length of the string is
+    ** the number of bytes up to the first zero terminator.
+    ** If the fourth parameter to sqlite3_bind_blob() is negative, then
+    ** the behavior is undefined.
+    ** If a non-negative fourth parameter is provided to sqlite3_bind_text()
+    ** or sqlite3_bind_text16() or sqlite3_bind_text64() then
+    ** that parameter must be the byte offset
+    ** where the NUL terminator would occur assuming the string were NUL
+    ** terminated.  If any NUL characters occurs at byte offsets less than
+    ** the value of the fourth parameter then the resulting string value will
+    ** contain embedded NULs.  The result of expressions involving strings
+    ** with embedded NULs is undefined.
+    **
+    ** ^The fifth argument to the BLOB and string binding interfaces controls
+    ** or indicates the lifetime of the object referenced by the third parameter.
+    ** These three options exist:
+    ** ^ (1) A destructor to dispose of the BLOB or string after SQLite has finished
+    ** with it may be passed. ^It is called to dispose of the BLOB or string even
+    ** if the call to the bind API fails, except the destructor is not called if
+    ** the third parameter is a NULL pointer or the fourth parameter is negative.
+    ** ^ (2) The special constant, [SQLITE_STATIC], may be passsed to indicate that
+    ** the application remains responsible for disposing of the object. ^In this
+    ** case, the object and the provided pointer to it must remain valid until
+    ** either the prepared statement is finalized or the same SQL parameter is
+    ** bound to something else, whichever occurs sooner.
+    ** ^ (3) The constant, [SQLITE_TRANSIENT], may be passed to indicate that the
+    ** object is to be copied prior to the return from sqlite3_bind_*(). ^The
+    ** object and pointer to it must remain valid until then. ^SQLite will then
+    ** manage the lifetime of its private copy.
+    **
+    ** ^The sixth argument to sqlite3_bind_text64() must be one of
+    ** [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE]
+    ** to specify the encoding of the text in the third parameter.  If
+    ** the sixth argument to sqlite3_bind_text64() is not one of the
+    ** allowed values shown above, or if the text encoding is different
+    ** from the encoding specified by the sixth parameter, then the behavior
+    ** is undefined.
+    **
+    ** ^The sqlite3_bind_zeroblob() routine binds a BLOB of length N that
+    ** is filled with zeroes.  ^A zeroblob uses a fixed amount of memory
+    ** (just an integer to hold its size) while it is being processed.
+    ** Zeroblobs are intended to serve as placeholders for BLOBs whose
+    ** content is later written using
+    ** [sqlite3_blob_open | incremental BLOB I/O] routines.
+    ** ^A negative value for the zeroblob results in a zero-length BLOB.
+    **
+    ** ^The sqlite3_bind_pointer(S,I,P,T,D) routine causes the I-th parameter in
+    ** [prepared statement] S to have an SQL value of NULL, but to also be
+    ** associated with the pointer P of type T.  ^D is either a NULL pointer or
+    ** a pointer to a destructor function for P. ^SQLite will invoke the
+    ** destructor D with a single argument of P when it is finished using
+    ** P.  The T parameter should be a static string, preferably a string
+    ** literal. The sqlite3_bind_pointer() routine is part of the
+    ** [pointer passing interface] added for SQLite 3.20.0.
+    **
+    ** ^If any of the sqlite3_bind_*() routines are called with a NULL pointer
+    ** for the [prepared statement] or with a prepared statement for which
+    ** [sqlite3_step()] has been called more recently than [sqlite3_reset()],
+    ** then the call will return [SQLITE_MISUSE].  If any sqlite3_bind_()
+    ** routine is passed a [prepared statement] that has been finalized, the
+    ** result is undefined and probably harmful.
+    **
+    ** ^Bindings are not cleared by the [sqlite3_reset()] routine.
+    ** ^Unbound parameters are interpreted as NULL.
+    **
+    ** ^The sqlite3_bind_* routines return [SQLITE_OK] on success or an
+    ** [error code] if anything goes wrong.
+    ** ^[SQLITE_TOOBIG] might be returned if the size of a string or BLOB
+    ** exceeds limits imposed by [sqlite3_limit]([SQLITE_LIMIT_LENGTH]) or
+    ** [SQLITE_MAX_LENGTH].
+    ** ^[SQLITE_RANGE] is returned if the parameter
+    ** index is out of range.  ^[SQLITE_NOMEM] is returned if malloc() fails.
+    **
+    ** See also: [sqlite3_bind_parameter_count()],
+    ** [sqlite3_bind_parameter_name()], and [sqlite3_bind_parameter_index()].
+    */
+    SQLITE_API int sqlite3_bind_blob(sqlite3_stmt*, int, const void*, int n, void (*)(void*));
+    SQLITE_API int sqlite3_bind_blob64(sqlite3_stmt*, int, const void*, sqlite3_uint64, void (*)(void*));
+    SQLITE_API int sqlite3_bind_double(sqlite3_stmt*, int, double);
+    SQLITE_API int sqlite3_bind_int(sqlite3_stmt*, int, int);
+    SQLITE_API int sqlite3_bind_int64(sqlite3_stmt*, int, sqlite3_int64);
+    SQLITE_API int sqlite3_bind_null(sqlite3_stmt*, int);
+    SQLITE_API int sqlite3_bind_text(sqlite3_stmt*, int, const char*, int, void (*)(void*));
+    SQLITE_API int sqlite3_bind_text16(sqlite3_stmt*, int, const void*, int, void (*)(void*));
+    SQLITE_API int
+      sqlite3_bind_text64(sqlite3_stmt*, int, const char*, sqlite3_uint64, void (*)(void*), unsigned char encoding);
+    SQLITE_API int sqlite3_bind_value(sqlite3_stmt*, int, const sqlite3_value*);
+    SQLITE_API int sqlite3_bind_pointer(sqlite3_stmt*, int, void*, const char*, void (*)(void*));
+    SQLITE_API int sqlite3_bind_zeroblob(sqlite3_stmt*, int, int n);
+    SQLITE_API int sqlite3_bind_zeroblob64(sqlite3_stmt*, int, sqlite3_uint64);
+
+    /*
+    ** CAPI3REF: Number Of SQL Parameters
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^This routine can be used to find the number of [SQL parameters]
+    ** in a [prepared statement].  SQL parameters are tokens of the
+    ** form "?", "?NNN", ":AAA", "$AAA", or "@AAA" that serve as
+    ** placeholders for values that are [sqlite3_bind_blob | bound]
+    ** to the parameters at a later time.
+    **
+    ** ^(This routine actually returns the index of the largest (rightmost)
+    ** parameter. For all forms except ?NNN, this will correspond to the
+    ** number of unique parameters.  If parameters of the ?NNN form are used,
+    ** there may be gaps in the list.)^
+    **
+    ** See also: [sqlite3_bind_blob|sqlite3_bind()],
+    ** [sqlite3_bind_parameter_name()], and
+    ** [sqlite3_bind_parameter_index()].
+    */
+    SQLITE_API int sqlite3_bind_parameter_count(sqlite3_stmt*);
+
+    /*
+    ** CAPI3REF: Name Of A Host Parameter
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_bind_parameter_name(P,N) interface returns
+    ** the name of the N-th [SQL parameter] in the [prepared statement] P.
+    ** ^(SQL parameters of the form "?NNN" or ":AAA" or "@AAA" or "$AAA"
+    ** have a name which is the string "?NNN" or ":AAA" or "@AAA" or "$AAA"
+    ** respectively.
+    ** In other words, the initial ":" or "$" or "@" or "?"
+    ** is included as part of the name.)^
+    ** ^Parameters of the form "?" without a following integer have no name
+    ** and are referred to as "nameless" or "anonymous parameters".
+    **
+    ** ^The first host parameter has an index of 1, not 0.
+    **
+    ** ^If the value N is out of range or if the N-th parameter is
+    ** nameless, then NULL is returned.  ^The returned string is
+    ** always in UTF-8 encoding even if the named parameter was
+    ** originally specified as UTF-16 in [sqlite3_prepare16()],
+    ** [sqlite3_prepare16_v2()], or [sqlite3_prepare16_v3()].
+    **
+    ** See also: [sqlite3_bind_blob|sqlite3_bind()],
+    ** [sqlite3_bind_parameter_count()], and
+    ** [sqlite3_bind_parameter_index()].
+    */
+    SQLITE_API const char* sqlite3_bind_parameter_name(sqlite3_stmt*, int);
+
+    /*
+    ** CAPI3REF: Index Of A Parameter With A Given Name
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^Return the index of an SQL parameter given its name.  ^The
+    ** index value returned is suitable for use as the second
+    ** parameter to [sqlite3_bind_blob|sqlite3_bind()].  ^A zero
+    ** is returned if no matching parameter is found.  ^The parameter
+    ** name must be given in UTF-8 even if the original statement
+    ** was prepared from UTF-16 text using [sqlite3_prepare16_v2()] or
+    ** [sqlite3_prepare16_v3()].
+    **
+    ** See also: [sqlite3_bind_blob|sqlite3_bind()],
+    ** [sqlite3_bind_parameter_count()], and
+    ** [sqlite3_bind_parameter_name()].
+    */
+    SQLITE_API int sqlite3_bind_parameter_index(sqlite3_stmt*, const char* zName);
+
+    /*
+    ** CAPI3REF: Reset All Bindings On A Prepared Statement
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^Contrary to the intuition of many, [sqlite3_reset()] does not reset
+    ** the [sqlite3_bind_blob | bindings] on a [prepared statement].
+    ** ^Use this routine to reset all host parameters to NULL.
+    */
+    SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);
+
+    /*
+    ** CAPI3REF: Number Of Columns In A Result Set
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^Return the number of columns in the result set returned by the
+    ** [prepared statement]. ^If this routine returns 0, that means the
+    ** [prepared statement] returns no data (for example an [UPDATE]).
+    ** ^However, just because this routine returns a positive number does not
+    ** mean that one or more rows of data will be returned.  ^A SELECT statement
+    ** will always have a positive sqlite3_column_count() but depending on the
+    ** WHERE clause constraints and the table content, it might return no rows.
+    **
+    ** See also: [sqlite3_data_count()]
+    */
+    SQLITE_API int sqlite3_column_count(sqlite3_stmt* pStmt);
+
+    /*
+    ** CAPI3REF: Column Names In A Result Set
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^These routines return the name assigned to a particular column
+    ** in the result set of a [SELECT] statement.  ^The sqlite3_column_name()
+    ** interface returns a pointer to a zero-terminated UTF-8 string
+    ** and sqlite3_column_name16() returns a pointer to a zero-terminated
+    ** UTF-16 string.  ^The first parameter is the [prepared statement]
+    ** that implements the [SELECT] statement. ^The second parameter is the
+    ** column number.  ^The leftmost column is number 0.
+    **
+    ** ^The returned string pointer is valid until either the [prepared statement]
+    ** is destroyed by [sqlite3_finalize()] or until the statement is automatically
+    ** reprepared by the first call to [sqlite3_step()] for a particular run
+    ** or until the next call to
+    ** sqlite3_column_name() or sqlite3_column_name16() on the same column.
+    **
+    ** ^If sqlite3_malloc() fails during the processing of either routine
+    ** (for example during a conversion from UTF-8 to UTF-16) then a
+    ** NULL pointer is returned.
+    **
+    ** ^The name of a result column is the value of the "AS" clause for
+    ** that column, if there is an AS clause.  If there is no AS clause
+    ** then the name of the column is unspecified and may change from
+    ** one release of SQLite to the next.
+    */
+    SQLITE_API const char* sqlite3_column_name(sqlite3_stmt*, int N);
+    SQLITE_API const void* sqlite3_column_name16(sqlite3_stmt*, int N);
+
+    /*
+    ** CAPI3REF: Source Of Data In A Query Result
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^These routines provide a means to determine the database, table, and
+    ** table column that is the origin of a particular result column in
+    ** [SELECT] statement.
+    ** ^The name of the database or table or column can be returned as
+    ** either a UTF-8 or UTF-16 string.  ^The _database_ routines return
+    ** the database name, the _table_ routines return the table name, and
+    ** the origin_ routines return the column name.
+    ** ^The returned string is valid until the [prepared statement] is destroyed
+    ** using [sqlite3_finalize()] or until the statement is automatically
+    ** reprepared by the first call to [sqlite3_step()] for a particular run
+    ** or until the same information is requested
+    ** again in a different encoding.
+    **
+    ** ^The names returned are the original un-aliased names of the
+    ** database, table, and column.
+    **
+    ** ^The first argument to these interfaces is a [prepared statement].
+    ** ^These functions return information about the Nth result column returned by
+    ** the statement, where N is the second function argument.
+    ** ^The left-most column is column 0 for these routines.
+    **
+    ** ^If the Nth column returned by the statement is an expression or
+    ** subquery and is not a column value, then all of these functions return
+    ** NULL.  ^These routines might also return NULL if a memory allocation error
+    ** occurs.  ^Otherwise, they return the name of the attached database, table,
+    ** or column that query result column was extracted from.
+    **
+    ** ^As with all other SQLite APIs, those whose names end with "16" return
+    ** UTF-16 encoded strings and the other functions return UTF-8.
+    **
+    ** ^These APIs are only available if the library was compiled with the
+    ** [SQLITE_ENABLE_COLUMN_METADATA] C-preprocessor symbol.
+    **
+    ** If two or more threads call one or more
+    ** [sqlite3_column_database_name | column metadata interfaces]
+    ** for the same [prepared statement] and result column
+    ** at the same time then the results are undefined.
+    */
+    SQLITE_API const char* sqlite3_column_database_name(sqlite3_stmt*, int);
+    SQLITE_API const void* sqlite3_column_database_name16(sqlite3_stmt*, int);
+    SQLITE_API const char* sqlite3_column_table_name(sqlite3_stmt*, int);
+    SQLITE_API const void* sqlite3_column_table_name16(sqlite3_stmt*, int);
+    SQLITE_API const char* sqlite3_column_origin_name(sqlite3_stmt*, int);
+    SQLITE_API const void* sqlite3_column_origin_name16(sqlite3_stmt*, int);
+
+    /*
+    ** CAPI3REF: Declared Datatype Of A Query Result
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^(The first parameter is a [prepared statement].
+    ** If this statement is a [SELECT] statement and the Nth column of the
+    ** returned result set of that [SELECT] is a table column (not an
+    ** expression or subquery) then the declared type of the table
+    ** column is returned.)^  ^If the Nth column of the result set is an
+    ** expression or subquery, then a NULL pointer is returned.
+    ** ^The returned string is always UTF-8 encoded.
+    **
+    ** ^(For example, given the database schema:
+    **
+    ** CREATE TABLE t1(c1 VARIANT);
+    **
+    ** and the following statement to be compiled:
+    **
+    ** SELECT c1 + 1, c1 FROM t1;
+    **
+    ** this routine would return the string "VARIANT" for the second result
+    ** column (i==1), and a NULL pointer for the first result column (i==0).)^
+    **
+    ** ^SQLite uses dynamic run-time typing.  ^So just because a column
+    ** is declared to contain a particular type does not mean that the
+    ** data stored in that column is of the declared type.  SQLite is
+    ** strongly typed, but the typing is dynamic not static.  ^Type
+    ** is associated with individual values, not with the containers
+    ** used to hold those values.
+    */
+    SQLITE_API const char* sqlite3_column_decltype(sqlite3_stmt*, int);
+    SQLITE_API const void* sqlite3_column_decltype16(sqlite3_stmt*, int);
+
+    /*
+    ** CAPI3REF: Evaluate An SQL Statement
+    ** METHOD: sqlite3_stmt
+    **
+    ** After a [prepared statement] has been prepared using any of
+    ** [sqlite3_prepare_v2()], [sqlite3_prepare_v3()], [sqlite3_prepare16_v2()],
+    ** or [sqlite3_prepare16_v3()] or one of the legacy
+    ** interfaces [sqlite3_prepare()] or [sqlite3_prepare16()], this function
+    ** must be called one or more times to evaluate the statement.
+    **
+    ** The details of the behavior of the sqlite3_step() interface depend
+    ** on whether the statement was prepared using the newer "vX" interfaces
+    ** [sqlite3_prepare_v3()], [sqlite3_prepare_v2()], [sqlite3_prepare16_v3()],
+    ** [sqlite3_prepare16_v2()] or the older legacy
+    ** interfaces [sqlite3_prepare()] and [sqlite3_prepare16()].  The use of the
+    ** new "vX" interface is recommended for new applications but the legacy
+    ** interface will continue to be supported.
+    **
+    ** ^In the legacy interface, the return value will be either [SQLITE_BUSY],
+    ** [SQLITE_DONE], [SQLITE_ROW], [SQLITE_ERROR], or [SQLITE_MISUSE].
+    ** ^With the "v2" interface, any of the other [result codes] or
+    ** [extended result codes] might be returned as well.
+    **
+    ** ^[SQLITE_BUSY] means that the database engine was unable to acquire the
+    ** database locks it needs to do its job.  ^If the statement is a [COMMIT]
+    ** or occurs outside of an explicit transaction, then you can retry the
+    ** statement.  If the statement is not a [COMMIT] and occurs within an
+    ** explicit transaction then you should rollback the transaction before
+    ** continuing.
+    **
+    ** ^[SQLITE_DONE] means that the statement has finished executing
+    ** successfully.  sqlite3_step() should not be called again on this virtual
+    ** machine without first calling [sqlite3_reset()] to reset the virtual
+    ** machine back to its initial state.
+    **
+    ** ^If the SQL statement being executed returns any data, then [SQLITE_ROW]
+    ** is returned each time a new row of data is ready for processing by the
+    ** caller. The values may be accessed using the [column access functions].
+    ** sqlite3_step() is called again to retrieve the next row of data.
+    **
+    ** ^[SQLITE_ERROR] means that a run-time error (such as a constraint
+    ** violation) has occurred.  sqlite3_step() should not be called again on
+    ** the VM. More information may be found by calling [sqlite3_errmsg()].
+    ** ^With the legacy interface, a more specific error code (for example,
+    ** [SQLITE_INTERRUPT], [SQLITE_SCHEMA], [SQLITE_CORRUPT], and so forth)
+    ** can be obtained by calling [sqlite3_reset()] on the
+    ** [prepared statement].  ^In the "v2" interface,
+    ** the more specific error code is returned directly by sqlite3_step().
+    **
+    ** [SQLITE_MISUSE] means that the this routine was called inappropriately.
+    ** Perhaps it was called on a [prepared statement] that has
+    ** already been [sqlite3_finalize | finalized] or on one that had
+    ** previously returned [SQLITE_ERROR] or [SQLITE_DONE].  Or it could
+    ** be the case that the same database connection is being used by two or
+    ** more threads at the same moment in time.
+    **
+    ** For all versions of SQLite up to and including 3.6.23.1, a call to
+    ** [sqlite3_reset()] was required after sqlite3_step() returned anything
+    ** other than [SQLITE_ROW] before any subsequent invocation of
+    ** sqlite3_step().  Failure to reset the prepared statement using
+    ** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
+    ** sqlite3_step().  But after [version 3.6.23.1] ([dateof:3.6.23.1],
+    ** sqlite3_step() began
+    ** calling [sqlite3_reset()] automatically in this circumstance rather
+    ** than returning [SQLITE_MISUSE].  This is not considered a compatibility
+    ** break because any application that ever receives an SQLITE_MISUSE error
+    ** is broken by definition.  The [SQLITE_OMIT_AUTORESET] compile-time option
+    ** can be used to restore the legacy behavior.
+    **
+    ** <b>Goofy Interface Alert:</b> In the legacy interface, the sqlite3_step()
+    ** API always returns a generic error code, [SQLITE_ERROR], following any
+    ** error other than [SQLITE_BUSY] and [SQLITE_MISUSE].  You must call
+    ** [sqlite3_reset()] or [sqlite3_finalize()] in order to find one of the
+    ** specific [error codes] that better describes the error.
+    ** We admit that this is a goofy design.  The problem has been fixed
+    ** with the "v2" interface.  If you prepare all of your SQL statements
+    ** using [sqlite3_prepare_v3()] or [sqlite3_prepare_v2()]
+    ** or [sqlite3_prepare16_v2()] or [sqlite3_prepare16_v3()] instead
+    ** of the legacy [sqlite3_prepare()] and [sqlite3_prepare16()] interfaces,
+    ** then the more specific [error codes] are returned directly
+    ** by sqlite3_step().  The use of the "vX" interfaces is recommended.
+    */
+    SQLITE_API int sqlite3_step(sqlite3_stmt*);
+
+    /*
+    ** CAPI3REF: Number of columns in a result set
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_data_count(P) interface returns the number of columns in the
+    ** current row of the result set of [prepared statement] P.
+    ** ^If prepared statement P does not have results ready to return
+    ** (via calls to the [sqlite3_column_int | sqlite3_column()] family of
+    ** interfaces) then sqlite3_data_count(P) returns 0.
+    ** ^The sqlite3_data_count(P) routine also returns 0 if P is a NULL pointer.
+    ** ^The sqlite3_data_count(P) routine returns 0 if the previous call to
+    ** [sqlite3_step](P) returned [SQLITE_DONE].  ^The sqlite3_data_count(P)
+    ** will return non-zero if previous call to [sqlite3_step](P) returned
+    ** [SQLITE_ROW], except in the case of the [PRAGMA incremental_vacuum]
+    ** where it always returns zero since each step of that multi-step
+    ** pragma returns 0 columns of data.
+    **
+    ** See also: [sqlite3_column_count()]
+    */
+    SQLITE_API int sqlite3_data_count(sqlite3_stmt* pStmt);
 
 /*
 ** CAPI3REF: Fundamental Datatypes
@@ -4869,458 +4848,450 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
 ** SQLite version 2 and SQLite version 3 should use SQLITE3_TEXT, not
 ** SQLITE_TEXT.
 */
-#define SQLITE_INTEGER  1
-#define SQLITE_FLOAT    2
-#define SQLITE_BLOB     4
-#define SQLITE_NULL     5
+#define SQLITE_INTEGER 1
+#define SQLITE_FLOAT 2
+#define SQLITE_BLOB 4
+#define SQLITE_NULL 5
 #ifdef SQLITE_TEXT
-# undef SQLITE_TEXT
+#undef SQLITE_TEXT
 #else
-# define SQLITE_TEXT     3
+#define SQLITE_TEXT 3
 #endif
-#define SQLITE3_TEXT     3
-
-/*
-** CAPI3REF: Result Values From A Query
-** KEYWORDS: {column access functions}
-** METHOD: sqlite3_stmt
-**
-** <b>Summary:</b>
-** <blockquote><table border=0 cellpadding=0 cellspacing=0>
-** <tr><td><b>sqlite3_column_blob</b><td>&rarr;<td>BLOB result
-** <tr><td><b>sqlite3_column_double</b><td>&rarr;<td>REAL result
-** <tr><td><b>sqlite3_column_int</b><td>&rarr;<td>32-bit INTEGER result
-** <tr><td><b>sqlite3_column_int64</b><td>&rarr;<td>64-bit INTEGER result
-** <tr><td><b>sqlite3_column_text</b><td>&rarr;<td>UTF-8 TEXT result
-** <tr><td><b>sqlite3_column_text16</b><td>&rarr;<td>UTF-16 TEXT result
-** <tr><td><b>sqlite3_column_value</b><td>&rarr;<td>The result as an
-** [sqlite3_value|unprotected sqlite3_value] object.
-** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
-** <tr><td><b>sqlite3_column_bytes</b><td>&rarr;<td>Size of a BLOB
-** or a UTF-8 TEXT result in bytes
-** <tr><td><b>sqlite3_column_bytes16&nbsp;&nbsp;</b>
-** <td>&rarr;&nbsp;&nbsp;<td>Size of UTF-16
-** TEXT in bytes
-** <tr><td><b>sqlite3_column_type</b><td>&rarr;<td>Default
-** datatype of the result
-** </table></blockquote>
-**
-** <b>Details:</b>
-**
-** ^These routines return information about a single column of the current
-** result row of a query.  ^In every case the first argument is a pointer
-** to the [prepared statement] that is being evaluated (the [sqlite3_stmt*]
-** that was returned from [sqlite3_prepare_v2()] or one of its variants)
-** and the second argument is the index of the column for which information
-** should be returned. ^The leftmost column of the result set has the index 0.
-** ^The number of columns in the result can be determined using
-** [sqlite3_column_count()].
-**
-** If the SQL statement does not currently point to a valid row, or if the
-** column index is out of range, the result is undefined.
-** These routines may only be called when the most recent call to
-** [sqlite3_step()] has returned [SQLITE_ROW] and neither
-** [sqlite3_reset()] nor [sqlite3_finalize()] have been called subsequently.
-** If any of these routines are called after [sqlite3_reset()] or
-** [sqlite3_finalize()] or after [sqlite3_step()] has returned
-** something other than [SQLITE_ROW], the results are undefined.
-** If [sqlite3_step()] or [sqlite3_reset()] or [sqlite3_finalize()]
-** are called from a different thread while any of these routines
-** are pending, then the results are undefined.
-**
-** The first six interfaces (_blob, _double, _int, _int64, _text, and _text16)
-** each return the value of a result column in a specific data format.  If
-** the result column is not initially in the requested format (for example,
-** if the query returns an integer but the sqlite3_column_text() interface
-** is used to extract the value) then an automatic type conversion is performed.
-**
-** ^The sqlite3_column_type() routine returns the
-** [SQLITE_INTEGER | datatype code] for the initial data type
-** of the result column.  ^The returned value is one of [SQLITE_INTEGER],
-** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].
-** The return value of sqlite3_column_type() can be used to decide which
-** of the first six interface should be used to extract the column value.
-** The value returned by sqlite3_column_type() is only meaningful if no
-** automatic type conversions have occurred for the value in question.
-** After a type conversion, the result of calling sqlite3_column_type()
-** is undefined, though harmless.  Future
-** versions of SQLite may change the behavior of sqlite3_column_type()
-** following a type conversion.
-**
-** If the result is a BLOB or a TEXT string, then the sqlite3_column_bytes()
-** or sqlite3_column_bytes16() interfaces can be used to determine the size
-** of that BLOB or string.
-**
-** ^If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes()
-** routine returns the number of bytes in that BLOB or string.
-** ^If the result is a UTF-16 string, then sqlite3_column_bytes() converts
-** the string to UTF-8 and then returns the number of bytes.
-** ^If the result is a numeric value then sqlite3_column_bytes() uses
-** [sqlite3_snprintf()] to convert that value to a UTF-8 string and returns
-** the number of bytes in that string.
-** ^If the result is NULL, then sqlite3_column_bytes() returns zero.
-**
-** ^If the result is a BLOB or UTF-16 string then the sqlite3_column_bytes16()
-** routine returns the number of bytes in that BLOB or string.
-** ^If the result is a UTF-8 string, then sqlite3_column_bytes16() converts
-** the string to UTF-16 and then returns the number of bytes.
-** ^If the result is a numeric value then sqlite3_column_bytes16() uses
-** [sqlite3_snprintf()] to convert that value to a UTF-16 string and returns
-** the number of bytes in that string.
-** ^If the result is NULL, then sqlite3_column_bytes16() returns zero.
-**
-** ^The values returned by [sqlite3_column_bytes()] and
-** [sqlite3_column_bytes16()] do not include the zero terminators at the end
-** of the string.  ^For clarity: the values returned by
-** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
-** bytes in the string, not the number of characters.
-**
-** ^Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
-** even empty strings, are always zero-terminated.  ^The return
-** value from sqlite3_column_blob() for a zero-length BLOB is a NULL pointer.
-**
-** <b>Warning:</b> ^The object returned by [sqlite3_column_value()] is an
-** [unprotected sqlite3_value] object.  In a multithreaded environment,
-** an unprotected sqlite3_value object may only be used safely with
-** [sqlite3_bind_value()] and [sqlite3_result_value()].
-** If the [unprotected sqlite3_value] object returned by
-** [sqlite3_column_value()] is used in any other way, including calls
-** to routines like [sqlite3_value_int()], [sqlite3_value_text()],
-** or [sqlite3_value_bytes()], the behavior is not threadsafe.
-** Hence, the sqlite3_column_value() interface
-** is normally only useful within the implementation of
-** [application-defined SQL functions] or [virtual tables], not within
-** top-level application code.
-**
-** The these routines may attempt to convert the datatype of the result.
-** ^For example, if the internal representation is FLOAT and a text result
-** is requested, [sqlite3_snprintf()] is used internally to perform the
-** conversion automatically.  ^(The following table details the conversions
-** that are applied:
-**
-** <blockquote>
-** <table border="1">
-** <tr><th> Internal<br>Type <th> Requested<br>Type <th>  Conversion
-**
-** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
-** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
-** <tr><td>  NULL    <td>   TEXT    <td> Result is a NULL pointer
-** <tr><td>  NULL    <td>   BLOB    <td> Result is a NULL pointer
-** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
-** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
-** <tr><td> INTEGER  <td>   BLOB    <td> Same as INTEGER->TEXT
-** <tr><td>  FLOAT   <td> INTEGER   <td> [CAST] to INTEGER
-** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
-** <tr><td>  FLOAT   <td>   BLOB    <td> [CAST] to BLOB
-** <tr><td>  TEXT    <td> INTEGER   <td> [CAST] to INTEGER
-** <tr><td>  TEXT    <td>  FLOAT    <td> [CAST] to REAL
-** <tr><td>  TEXT    <td>   BLOB    <td> No change
-** <tr><td>  BLOB    <td> INTEGER   <td> [CAST] to INTEGER
-** <tr><td>  BLOB    <td>  FLOAT    <td> [CAST] to REAL
-** <tr><td>  BLOB    <td>   TEXT    <td> Add a zero terminator if needed
-** </table>
-** </blockquote>)^
-**
-** Note that when type conversions occur, pointers returned by prior
-** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
-** sqlite3_column_text16() may be invalidated.
-** Type conversions and pointer invalidations might occur
-** in the following cases:
-**
-** <ul>
-** <li> The initial content is a BLOB and sqlite3_column_text() or
-**      sqlite3_column_text16() is called.  A zero-terminator might
-**      need to be added to the string.</li>
-** <li> The initial content is UTF-8 text and sqlite3_column_bytes16() or
-**      sqlite3_column_text16() is called.  The content must be converted
-**      to UTF-16.</li>
-** <li> The initial content is UTF-16 text and sqlite3_column_bytes() or
-**      sqlite3_column_text() is called.  The content must be converted
-**      to UTF-8.</li>
-** </ul>
-**
-** ^Conversions between UTF-16be and UTF-16le are always done in place and do
-** not invalidate a prior pointer, though of course the content of the buffer
-** that the prior pointer references will have been modified.  Other kinds
-** of conversion are done in place when it is possible, but sometimes they
-** are not possible and in those cases prior pointers are invalidated.
-**
-** The safest policy is to invoke these routines
-** in one of the following ways:
-**
-** <ul>
-**  <li>sqlite3_column_text() followed by sqlite3_column_bytes()</li>
-**  <li>sqlite3_column_blob() followed by sqlite3_column_bytes()</li>
-**  <li>sqlite3_column_text16() followed by sqlite3_column_bytes16()</li>
-** </ul>
-**
-** In other words, you should call sqlite3_column_text(),
-** sqlite3_column_blob(), or sqlite3_column_text16() first to force the result
-** into the desired format, then invoke sqlite3_column_bytes() or
-** sqlite3_column_bytes16() to find the size of the result.  Do not mix calls
-** to sqlite3_column_text() or sqlite3_column_blob() with calls to
-** sqlite3_column_bytes16(), and do not mix calls to sqlite3_column_text16()
-** with calls to sqlite3_column_bytes().
-**
-** ^The pointers returned are valid until a type conversion occurs as
-** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
-** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
-** and BLOBs is freed automatically.  Do not pass the pointers returned
-** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
-** [sqlite3_free()].
-**
-** As long as the input parameters are correct, these routines will only
-** fail if an out-of-memory error occurs during a format conversion.
-** Only the following subset of interfaces are subject to out-of-memory
-** errors:
-**
-** <ul>
-** <li> sqlite3_column_blob()
-** <li> sqlite3_column_text()
-** <li> sqlite3_column_text16()
-** <li> sqlite3_column_bytes()
-** <li> sqlite3_column_bytes16()
-** </ul>
-**
-** If an out-of-memory error occurs, then the return value from these
-** routines is the same as if the column had contained an SQL NULL value.
-** Valid SQL NULL returns can be distinguished from out-of-memory errors
-** by invoking the [sqlite3_errcode()] immediately after the suspect
-** return value is obtained and before any
-** other SQLite interface is called on the same [database connection].
-*/
-SQLITE_API const void *sqlite3_column_blob(sqlite3_stmt*, int iCol);
-SQLITE_API double sqlite3_column_double(sqlite3_stmt*, int iCol);
-SQLITE_API int sqlite3_column_int(sqlite3_stmt*, int iCol);
-SQLITE_API sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
-SQLITE_API const unsigned char *sqlite3_column_text(sqlite3_stmt*, int iCol);
-SQLITE_API const void *sqlite3_column_text16(sqlite3_stmt*, int iCol);
-SQLITE_API sqlite3_value *sqlite3_column_value(sqlite3_stmt*, int iCol);
-SQLITE_API int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
-SQLITE_API int sqlite3_column_bytes16(sqlite3_stmt*, int iCol);
-SQLITE_API int sqlite3_column_type(sqlite3_stmt*, int iCol);
-
-/*
-** CAPI3REF: Destroy A Prepared Statement Object
-** DESTRUCTOR: sqlite3_stmt
-**
-** ^The sqlite3_finalize() function is called to delete a [prepared statement].
-** ^If the most recent evaluation of the statement encountered no errors
-** or if the statement is never been evaluated, then sqlite3_finalize() returns
-** SQLITE_OK.  ^If the most recent evaluation of statement S failed, then
-** sqlite3_finalize(S) returns the appropriate [error code] or
-** [extended error code].
-**
-** ^The sqlite3_finalize(S) routine can be called at any point during
-** the life cycle of [prepared statement] S:
-** before statement S is ever evaluated, after
-** one or more calls to [sqlite3_reset()], or after any call
-** to [sqlite3_step()] regardless of whether or not the statement has
-** completed execution.
-**
-** ^Invoking sqlite3_finalize() on a NULL pointer is a harmless no-op.
-**
-** The application must finalize every [prepared statement] in order to avoid
-** resource leaks.  It is a grievous error for the application to try to use
-** a prepared statement after it has been finalized.  Any use of a prepared
-** statement after it has been finalized can result in undefined and
-** undesirable behavior such as segfaults and heap corruption.
-*/
-SQLITE_API int sqlite3_finalize(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Reset A Prepared Statement Object
-** METHOD: sqlite3_stmt
-**
-** The sqlite3_reset() function is called to reset a [prepared statement]
-** object back to its initial state, ready to be re-executed.
-** ^Any SQL statement variables that had values bound to them using
-** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values.
-** Use [sqlite3_clear_bindings()] to reset the bindings.
-**
-** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S
-** back to the beginning of its program.
-**
-** ^If the most recent call to [sqlite3_step(S)] for the
-** [prepared statement] S returned [SQLITE_ROW] or [SQLITE_DONE],
-** or if [sqlite3_step(S)] has never before been called on S,
-** then [sqlite3_reset(S)] returns [SQLITE_OK].
-**
-** ^If the most recent call to [sqlite3_step(S)] for the
-** [prepared statement] S indicated an error, then
-** [sqlite3_reset(S)] returns an appropriate [error code].
-**
-** ^The [sqlite3_reset(S)] interface does not change the values
-** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S.
-*/
-SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
-
-/*
-** CAPI3REF: Create Or Redefine SQL Functions
-** KEYWORDS: {function creation routines}
-** METHOD: sqlite3
-**
-** ^These functions (collectively known as "function creation routines")
-** are used to add SQL functions or aggregates or to redefine the behavior
-** of existing SQL functions or aggregates. The only differences between
-** the three "sqlite3_create_function*" routines are the text encoding
-** expected for the second parameter (the name of the function being
-** created) and the presence or absence of a destructor callback for
-** the application data pointer. Function sqlite3_create_window_function()
-** is similar, but allows the user to supply the extra callback functions
-** needed by [aggregate window functions].
-**
-** ^The first parameter is the [database connection] to which the SQL
-** function is to be added.  ^If an application uses more than one database
-** connection then application-defined SQL functions must be added
-** to each database connection separately.
-**
-** ^The second parameter is the name of the SQL function to be created or
-** redefined.  ^The length of the name is limited to 255 bytes in a UTF-8
-** representation, exclusive of the zero-terminator.  ^Note that the name
-** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.
-** ^Any attempt to create a function with a longer name
-** will result in [SQLITE_MISUSE] being returned.
-**
-** ^The third parameter (nArg)
-** is the number of arguments that the SQL function or
-** aggregate takes. ^If this parameter is -1, then the SQL function or
-** aggregate may take any number of arguments between 0 and the limit
-** set by [sqlite3_limit]([SQLITE_LIMIT_FUNCTION_ARG]).  If the third
-** parameter is less than -1 or greater than 127 then the behavior is
-** undefined.
-**
-** ^The fourth parameter, eTextRep, specifies what
-** [SQLITE_UTF8 | text encoding] this SQL function prefers for
-** its parameters.  The application should set this parameter to
-** [SQLITE_UTF16LE] if the function implementation invokes
-** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
-** implementation invokes [sqlite3_value_text16be()] on an input, or
-** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
-** otherwise.  ^The same SQL function may be registered multiple times using
-** different preferred text encodings, with different implementations for
-** each encoding.
-** ^When multiple implementations of the same function are available, SQLite
-** will pick the one that involves the least amount of data conversion.
-**
-** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
-** to signal that the function will always return the same result given
-** the same inputs within a single SQL statement.  Most SQL functions are
-** deterministic.  The built-in [random()] SQL function is an example of a
-** function that is not deterministic.  The SQLite query planner is able to
-** perform additional optimizations on deterministic functions, so use
-** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
-**
-** ^The fourth parameter may also optionally include the [SQLITE_DIRECTONLY]
-** flag, which if present prevents the function from being invoked from
-** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
-** index expressions, or the WHERE clause of partial indexes.
-**
-** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
-** all application-defined SQL functions that do not need to be
-** used inside of triggers, view, CHECK constraints, or other elements of
-** the database schema.  This flags is especially recommended for SQL
-** functions that have side effects or reveal internal application state.
-** Without this flag, an attacker might be able to modify the schema of
-** a database file to include invocations of the function with parameters
-** chosen by the attacker, which the application will then execute when
-** the database file is opened and read.
-**
-** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
-** function can gain access to this pointer using [sqlite3_user_data()].)^
-**
-** ^The sixth, seventh and eighth parameters passed to the three
-** "sqlite3_create_function*" functions, xFunc, xStep and xFinal, are
-** pointers to C-language functions that implement the SQL function or
-** aggregate. ^A scalar SQL function requires an implementation of the xFunc
-** callback only; NULL pointers must be passed as the xStep and xFinal
-** parameters. ^An aggregate SQL function requires an implementation of xStep
-** and xFinal and NULL pointer must be passed for xFunc. ^To delete an existing
-** SQL function or aggregate, pass NULL pointers for all three function
-** callbacks.
-**
-** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue
-** and xInverse) passed to sqlite3_create_window_function are pointers to
-** C-language callbacks that implement the new function. xStep and xFinal
-** must both be non-NULL. xValue and xInverse may either both be NULL, in
-** which case a regular aggregate function is created, or must both be
-** non-NULL, in which case the new function may be used as either an aggregate
-** or aggregate window function. More details regarding the implementation
-** of aggregate window functions are
-** [user-defined window functions|available here].
-**
-** ^(If the final parameter to sqlite3_create_function_v2() or
-** sqlite3_create_window_function() is not NULL, then it is destructor for
-** the application data pointer. The destructor is invoked when the function
-** is deleted, either by being overloaded or when the database connection
-** closes.)^ ^The destructor is also invoked if the call to
-** sqlite3_create_function_v2() fails.  ^When the destructor callback is
-** invoked, it is passed a single argument which is a copy of the application
-** data pointer which was the fifth parameter to sqlite3_create_function_v2().
-**
-** ^It is permitted to register multiple implementations of the same
-** functions with the same name but with either differing numbers of
-** arguments or differing preferred text encodings.  ^SQLite will use
-** the implementation that most closely matches the way in which the
-** SQL function is used.  ^A function implementation with a non-negative
-** nArg parameter is a better match than a function implementation with
-** a negative nArg.  ^A function where the preferred text encoding
-** matches the database encoding is a better
-** match than a function where the encoding is different.
-** ^A function where the encoding difference is between UTF16le and UTF16be
-** is a closer match than a function where the encoding difference is
-** between UTF8 and UTF16.
-**
-** ^Built-in functions may be overloaded by new application-defined functions.
-**
-** ^An application-defined function is permitted to call other
-** SQLite interfaces.  However, such calls must not
-** close the database connection nor finalize or reset the prepared
-** statement in which the function is running.
-*/
-SQLITE_API int sqlite3_create_function(
-  sqlite3 *db,
-  const char *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*)
-);
-SQLITE_API int sqlite3_create_function16(
-  sqlite3 *db,
-  const void *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*)
-);
-SQLITE_API int sqlite3_create_function_v2(
-  sqlite3 *db,
-  const char *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xFunc)(sqlite3_context*,int,sqlite3_value**),
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*),
-  void(*xDestroy)(void*)
-);
-SQLITE_API int sqlite3_create_window_function(
-  sqlite3 *db,
-  const char *zFunctionName,
-  int nArg,
-  int eTextRep,
-  void *pApp,
-  void (*xStep)(sqlite3_context*,int,sqlite3_value**),
-  void (*xFinal)(sqlite3_context*),
-  void (*xValue)(sqlite3_context*),
-  void (*xInverse)(sqlite3_context*,int,sqlite3_value**),
-  void(*xDestroy)(void*)
-);
+#define SQLITE3_TEXT 3
+
+    /*
+    ** CAPI3REF: Result Values From A Query
+    ** KEYWORDS: {column access functions}
+    ** METHOD: sqlite3_stmt
+    **
+    ** <b>Summary:</b>
+    ** <blockquote><table border=0 cellpadding=0 cellspacing=0>
+    ** <tr><td><b>sqlite3_column_blob</b><td>&rarr;<td>BLOB result
+    ** <tr><td><b>sqlite3_column_double</b><td>&rarr;<td>REAL result
+    ** <tr><td><b>sqlite3_column_int</b><td>&rarr;<td>32-bit INTEGER result
+    ** <tr><td><b>sqlite3_column_int64</b><td>&rarr;<td>64-bit INTEGER result
+    ** <tr><td><b>sqlite3_column_text</b><td>&rarr;<td>UTF-8 TEXT result
+    ** <tr><td><b>sqlite3_column_text16</b><td>&rarr;<td>UTF-16 TEXT result
+    ** <tr><td><b>sqlite3_column_value</b><td>&rarr;<td>The result as an
+    ** [sqlite3_value|unprotected sqlite3_value] object.
+    ** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
+    ** <tr><td><b>sqlite3_column_bytes</b><td>&rarr;<td>Size of a BLOB
+    ** or a UTF-8 TEXT result in bytes
+    ** <tr><td><b>sqlite3_column_bytes16&nbsp;&nbsp;</b>
+    ** <td>&rarr;&nbsp;&nbsp;<td>Size of UTF-16
+    ** TEXT in bytes
+    ** <tr><td><b>sqlite3_column_type</b><td>&rarr;<td>Default
+    ** datatype of the result
+    ** </table></blockquote>
+    **
+    ** <b>Details:</b>
+    **
+    ** ^These routines return information about a single column of the current
+    ** result row of a query.  ^In every case the first argument is a pointer
+    ** to the [prepared statement] that is being evaluated (the [sqlite3_stmt*]
+    ** that was returned from [sqlite3_prepare_v2()] or one of its variants)
+    ** and the second argument is the index of the column for which information
+    ** should be returned. ^The leftmost column of the result set has the index 0.
+    ** ^The number of columns in the result can be determined using
+    ** [sqlite3_column_count()].
+    **
+    ** If the SQL statement does not currently point to a valid row, or if the
+    ** column index is out of range, the result is undefined.
+    ** These routines may only be called when the most recent call to
+    ** [sqlite3_step()] has returned [SQLITE_ROW] and neither
+    ** [sqlite3_reset()] nor [sqlite3_finalize()] have been called subsequently.
+    ** If any of these routines are called after [sqlite3_reset()] or
+    ** [sqlite3_finalize()] or after [sqlite3_step()] has returned
+    ** something other than [SQLITE_ROW], the results are undefined.
+    ** If [sqlite3_step()] or [sqlite3_reset()] or [sqlite3_finalize()]
+    ** are called from a different thread while any of these routines
+    ** are pending, then the results are undefined.
+    **
+    ** The first six interfaces (_blob, _double, _int, _int64, _text, and _text16)
+    ** each return the value of a result column in a specific data format.  If
+    ** the result column is not initially in the requested format (for example,
+    ** if the query returns an integer but the sqlite3_column_text() interface
+    ** is used to extract the value) then an automatic type conversion is performed.
+    **
+    ** ^The sqlite3_column_type() routine returns the
+    ** [SQLITE_INTEGER | datatype code] for the initial data type
+    ** of the result column.  ^The returned value is one of [SQLITE_INTEGER],
+    ** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].
+    ** The return value of sqlite3_column_type() can be used to decide which
+    ** of the first six interface should be used to extract the column value.
+    ** The value returned by sqlite3_column_type() is only meaningful if no
+    ** automatic type conversions have occurred for the value in question.
+    ** After a type conversion, the result of calling sqlite3_column_type()
+    ** is undefined, though harmless.  Future
+    ** versions of SQLite may change the behavior of sqlite3_column_type()
+    ** following a type conversion.
+    **
+    ** If the result is a BLOB or a TEXT string, then the sqlite3_column_bytes()
+    ** or sqlite3_column_bytes16() interfaces can be used to determine the size
+    ** of that BLOB or string.
+    **
+    ** ^If the result is a BLOB or UTF-8 string then the sqlite3_column_bytes()
+    ** routine returns the number of bytes in that BLOB or string.
+    ** ^If the result is a UTF-16 string, then sqlite3_column_bytes() converts
+    ** the string to UTF-8 and then returns the number of bytes.
+    ** ^If the result is a numeric value then sqlite3_column_bytes() uses
+    ** [sqlite3_snprintf()] to convert that value to a UTF-8 string and returns
+    ** the number of bytes in that string.
+    ** ^If the result is NULL, then sqlite3_column_bytes() returns zero.
+    **
+    ** ^If the result is a BLOB or UTF-16 string then the sqlite3_column_bytes16()
+    ** routine returns the number of bytes in that BLOB or string.
+    ** ^If the result is a UTF-8 string, then sqlite3_column_bytes16() converts
+    ** the string to UTF-16 and then returns the number of bytes.
+    ** ^If the result is a numeric value then sqlite3_column_bytes16() uses
+    ** [sqlite3_snprintf()] to convert that value to a UTF-16 string and returns
+    ** the number of bytes in that string.
+    ** ^If the result is NULL, then sqlite3_column_bytes16() returns zero.
+    **
+    ** ^The values returned by [sqlite3_column_bytes()] and
+    ** [sqlite3_column_bytes16()] do not include the zero terminators at the end
+    ** of the string.  ^For clarity: the values returned by
+    ** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
+    ** bytes in the string, not the number of characters.
+    **
+    ** ^Strings returned by sqlite3_column_text() and sqlite3_column_text16(),
+    ** even empty strings, are always zero-terminated.  ^The return
+    ** value from sqlite3_column_blob() for a zero-length BLOB is a NULL pointer.
+    **
+    ** <b>Warning:</b> ^The object returned by [sqlite3_column_value()] is an
+    ** [unprotected sqlite3_value] object.  In a multithreaded environment,
+    ** an unprotected sqlite3_value object may only be used safely with
+    ** [sqlite3_bind_value()] and [sqlite3_result_value()].
+    ** If the [unprotected sqlite3_value] object returned by
+    ** [sqlite3_column_value()] is used in any other way, including calls
+    ** to routines like [sqlite3_value_int()], [sqlite3_value_text()],
+    ** or [sqlite3_value_bytes()], the behavior is not threadsafe.
+    ** Hence, the sqlite3_column_value() interface
+    ** is normally only useful within the implementation of
+    ** [application-defined SQL functions] or [virtual tables], not within
+    ** top-level application code.
+    **
+    ** The these routines may attempt to convert the datatype of the result.
+    ** ^For example, if the internal representation is FLOAT and a text result
+    ** is requested, [sqlite3_snprintf()] is used internally to perform the
+    ** conversion automatically.  ^(The following table details the conversions
+    ** that are applied:
+    **
+    ** <blockquote>
+    ** <table border="1">
+    ** <tr><th> Internal<br>Type <th> Requested<br>Type <th>  Conversion
+    **
+    ** <tr><td>  NULL    <td> INTEGER   <td> Result is 0
+    ** <tr><td>  NULL    <td>  FLOAT    <td> Result is 0.0
+    ** <tr><td>  NULL    <td>   TEXT    <td> Result is a NULL pointer
+    ** <tr><td>  NULL    <td>   BLOB    <td> Result is a NULL pointer
+    ** <tr><td> INTEGER  <td>  FLOAT    <td> Convert from integer to float
+    ** <tr><td> INTEGER  <td>   TEXT    <td> ASCII rendering of the integer
+    ** <tr><td> INTEGER  <td>   BLOB    <td> Same as INTEGER->TEXT
+    ** <tr><td>  FLOAT   <td> INTEGER   <td> [CAST] to INTEGER
+    ** <tr><td>  FLOAT   <td>   TEXT    <td> ASCII rendering of the float
+    ** <tr><td>  FLOAT   <td>   BLOB    <td> [CAST] to BLOB
+    ** <tr><td>  TEXT    <td> INTEGER   <td> [CAST] to INTEGER
+    ** <tr><td>  TEXT    <td>  FLOAT    <td> [CAST] to REAL
+    ** <tr><td>  TEXT    <td>   BLOB    <td> No change
+    ** <tr><td>  BLOB    <td> INTEGER   <td> [CAST] to INTEGER
+    ** <tr><td>  BLOB    <td>  FLOAT    <td> [CAST] to REAL
+    ** <tr><td>  BLOB    <td>   TEXT    <td> Add a zero terminator if needed
+    ** </table>
+    ** </blockquote>)^
+    **
+    ** Note that when type conversions occur, pointers returned by prior
+    ** calls to sqlite3_column_blob(), sqlite3_column_text(), and/or
+    ** sqlite3_column_text16() may be invalidated.
+    ** Type conversions and pointer invalidations might occur
+    ** in the following cases:
+    **
+    ** <ul>
+    ** <li> The initial content is a BLOB and sqlite3_column_text() or
+    **      sqlite3_column_text16() is called.  A zero-terminator might
+    **      need to be added to the string.</li>
+    ** <li> The initial content is UTF-8 text and sqlite3_column_bytes16() or
+    **      sqlite3_column_text16() is called.  The content must be converted
+    **      to UTF-16.</li>
+    ** <li> The initial content is UTF-16 text and sqlite3_column_bytes() or
+    **      sqlite3_column_text() is called.  The content must be converted
+    **      to UTF-8.</li>
+    ** </ul>
+    **
+    ** ^Conversions between UTF-16be and UTF-16le are always done in place and do
+    ** not invalidate a prior pointer, though of course the content of the buffer
+    ** that the prior pointer references will have been modified.  Other kinds
+    ** of conversion are done in place when it is possible, but sometimes they
+    ** are not possible and in those cases prior pointers are invalidated.
+    **
+    ** The safest policy is to invoke these routines
+    ** in one of the following ways:
+    **
+    ** <ul>
+    **  <li>sqlite3_column_text() followed by sqlite3_column_bytes()</li>
+    **  <li>sqlite3_column_blob() followed by sqlite3_column_bytes()</li>
+    **  <li>sqlite3_column_text16() followed by sqlite3_column_bytes16()</li>
+    ** </ul>
+    **
+    ** In other words, you should call sqlite3_column_text(),
+    ** sqlite3_column_blob(), or sqlite3_column_text16() first to force the result
+    ** into the desired format, then invoke sqlite3_column_bytes() or
+    ** sqlite3_column_bytes16() to find the size of the result.  Do not mix calls
+    ** to sqlite3_column_text() or sqlite3_column_blob() with calls to
+    ** sqlite3_column_bytes16(), and do not mix calls to sqlite3_column_text16()
+    ** with calls to sqlite3_column_bytes().
+    **
+    ** ^The pointers returned are valid until a type conversion occurs as
+    ** described above, or until [sqlite3_step()] or [sqlite3_reset()] or
+    ** [sqlite3_finalize()] is called.  ^The memory space used to hold strings
+    ** and BLOBs is freed automatically.  Do not pass the pointers returned
+    ** from [sqlite3_column_blob()], [sqlite3_column_text()], etc. into
+    ** [sqlite3_free()].
+    **
+    ** As long as the input parameters are correct, these routines will only
+    ** fail if an out-of-memory error occurs during a format conversion.
+    ** Only the following subset of interfaces are subject to out-of-memory
+    ** errors:
+    **
+    ** <ul>
+    ** <li> sqlite3_column_blob()
+    ** <li> sqlite3_column_text()
+    ** <li> sqlite3_column_text16()
+    ** <li> sqlite3_column_bytes()
+    ** <li> sqlite3_column_bytes16()
+    ** </ul>
+    **
+    ** If an out-of-memory error occurs, then the return value from these
+    ** routines is the same as if the column had contained an SQL NULL value.
+    ** Valid SQL NULL returns can be distinguished from out-of-memory errors
+    ** by invoking the [sqlite3_errcode()] immediately after the suspect
+    ** return value is obtained and before any
+    ** other SQLite interface is called on the same [database connection].
+    */
+    SQLITE_API const void* sqlite3_column_blob(sqlite3_stmt*, int iCol);
+    SQLITE_API double sqlite3_column_double(sqlite3_stmt*, int iCol);
+    SQLITE_API int sqlite3_column_int(sqlite3_stmt*, int iCol);
+    SQLITE_API sqlite3_int64 sqlite3_column_int64(sqlite3_stmt*, int iCol);
+    SQLITE_API const unsigned char* sqlite3_column_text(sqlite3_stmt*, int iCol);
+    SQLITE_API const void* sqlite3_column_text16(sqlite3_stmt*, int iCol);
+    SQLITE_API sqlite3_value* sqlite3_column_value(sqlite3_stmt*, int iCol);
+    SQLITE_API int sqlite3_column_bytes(sqlite3_stmt*, int iCol);
+    SQLITE_API int sqlite3_column_bytes16(sqlite3_stmt*, int iCol);
+    SQLITE_API int sqlite3_column_type(sqlite3_stmt*, int iCol);
+
+    /*
+    ** CAPI3REF: Destroy A Prepared Statement Object
+    ** DESTRUCTOR: sqlite3_stmt
+    **
+    ** ^The sqlite3_finalize() function is called to delete a [prepared statement].
+    ** ^If the most recent evaluation of the statement encountered no errors
+    ** or if the statement is never been evaluated, then sqlite3_finalize() returns
+    ** SQLITE_OK.  ^If the most recent evaluation of statement S failed, then
+    ** sqlite3_finalize(S) returns the appropriate [error code] or
+    ** [extended error code].
+    **
+    ** ^The sqlite3_finalize(S) routine can be called at any point during
+    ** the life cycle of [prepared statement] S:
+    ** before statement S is ever evaluated, after
+    ** one or more calls to [sqlite3_reset()], or after any call
+    ** to [sqlite3_step()] regardless of whether or not the statement has
+    ** completed execution.
+    **
+    ** ^Invoking sqlite3_finalize() on a NULL pointer is a harmless no-op.
+    **
+    ** The application must finalize every [prepared statement] in order to avoid
+    ** resource leaks.  It is a grievous error for the application to try to use
+    ** a prepared statement after it has been finalized.  Any use of a prepared
+    ** statement after it has been finalized can result in undefined and
+    ** undesirable behavior such as segfaults and heap corruption.
+    */
+    SQLITE_API int sqlite3_finalize(sqlite3_stmt* pStmt);
+
+    /*
+    ** CAPI3REF: Reset A Prepared Statement Object
+    ** METHOD: sqlite3_stmt
+    **
+    ** The sqlite3_reset() function is called to reset a [prepared statement]
+    ** object back to its initial state, ready to be re-executed.
+    ** ^Any SQL statement variables that had values bound to them using
+    ** the [sqlite3_bind_blob | sqlite3_bind_*() API] retain their values.
+    ** Use [sqlite3_clear_bindings()] to reset the bindings.
+    **
+    ** ^The [sqlite3_reset(S)] interface resets the [prepared statement] S
+    ** back to the beginning of its program.
+    **
+    ** ^If the most recent call to [sqlite3_step(S)] for the
+    ** [prepared statement] S returned [SQLITE_ROW] or [SQLITE_DONE],
+    ** or if [sqlite3_step(S)] has never before been called on S,
+    ** then [sqlite3_reset(S)] returns [SQLITE_OK].
+    **
+    ** ^If the most recent call to [sqlite3_step(S)] for the
+    ** [prepared statement] S indicated an error, then
+    ** [sqlite3_reset(S)] returns an appropriate [error code].
+    **
+    ** ^The [sqlite3_reset(S)] interface does not change the values
+    ** of any [sqlite3_bind_blob|bindings] on the [prepared statement] S.
+    */
+    SQLITE_API int sqlite3_reset(sqlite3_stmt* pStmt);
+
+    /*
+    ** CAPI3REF: Create Or Redefine SQL Functions
+    ** KEYWORDS: {function creation routines}
+    ** METHOD: sqlite3
+    **
+    ** ^These functions (collectively known as "function creation routines")
+    ** are used to add SQL functions or aggregates or to redefine the behavior
+    ** of existing SQL functions or aggregates. The only differences between
+    ** the three "sqlite3_create_function*" routines are the text encoding
+    ** expected for the second parameter (the name of the function being
+    ** created) and the presence or absence of a destructor callback for
+    ** the application data pointer. Function sqlite3_create_window_function()
+    ** is similar, but allows the user to supply the extra callback functions
+    ** needed by [aggregate window functions].
+    **
+    ** ^The first parameter is the [database connection] to which the SQL
+    ** function is to be added.  ^If an application uses more than one database
+    ** connection then application-defined SQL functions must be added
+    ** to each database connection separately.
+    **
+    ** ^The second parameter is the name of the SQL function to be created or
+    ** redefined.  ^The length of the name is limited to 255 bytes in a UTF-8
+    ** representation, exclusive of the zero-terminator.  ^Note that the name
+    ** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.
+    ** ^Any attempt to create a function with a longer name
+    ** will result in [SQLITE_MISUSE] being returned.
+    **
+    ** ^The third parameter (nArg)
+    ** is the number of arguments that the SQL function or
+    ** aggregate takes. ^If this parameter is -1, then the SQL function or
+    ** aggregate may take any number of arguments between 0 and the limit
+    ** set by [sqlite3_limit]([SQLITE_LIMIT_FUNCTION_ARG]).  If the third
+    ** parameter is less than -1 or greater than 127 then the behavior is
+    ** undefined.
+    **
+    ** ^The fourth parameter, eTextRep, specifies what
+    ** [SQLITE_UTF8 | text encoding] this SQL function prefers for
+    ** its parameters.  The application should set this parameter to
+    ** [SQLITE_UTF16LE] if the function implementation invokes
+    ** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
+    ** implementation invokes [sqlite3_value_text16be()] on an input, or
+    ** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
+    ** otherwise.  ^The same SQL function may be registered multiple times using
+    ** different preferred text encodings, with different implementations for
+    ** each encoding.
+    ** ^When multiple implementations of the same function are available, SQLite
+    ** will pick the one that involves the least amount of data conversion.
+    **
+    ** ^The fourth parameter may optionally be ORed with [SQLITE_DETERMINISTIC]
+    ** to signal that the function will always return the same result given
+    ** the same inputs within a single SQL statement.  Most SQL functions are
+    ** deterministic.  The built-in [random()] SQL function is an example of a
+    ** function that is not deterministic.  The SQLite query planner is able to
+    ** perform additional optimizations on deterministic functions, so use
+    ** of the [SQLITE_DETERMINISTIC] flag is recommended where possible.
+    **
+    ** ^The fourth parameter may also optionally include the [SQLITE_DIRECTONLY]
+    ** flag, which if present prevents the function from being invoked from
+    ** within VIEWs, TRIGGERs, CHECK constraints, generated column expressions,
+    ** index expressions, or the WHERE clause of partial indexes.
+    **
+    ** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
+    ** all application-defined SQL functions that do not need to be
+    ** used inside of triggers, view, CHECK constraints, or other elements of
+    ** the database schema.  This flags is especially recommended for SQL
+    ** functions that have side effects or reveal internal application state.
+    ** Without this flag, an attacker might be able to modify the schema of
+    ** a database file to include invocations of the function with parameters
+    ** chosen by the attacker, which the application will then execute when
+    ** the database file is opened and read.
+    **
+    ** ^(The fifth parameter is an arbitrary pointer.  The implementation of the
+    ** function can gain access to this pointer using [sqlite3_user_data()].)^
+    **
+    ** ^The sixth, seventh and eighth parameters passed to the three
+    ** "sqlite3_create_function*" functions, xFunc, xStep and xFinal, are
+    ** pointers to C-language functions that implement the SQL function or
+    ** aggregate. ^A scalar SQL function requires an implementation of the xFunc
+    ** callback only; NULL pointers must be passed as the xStep and xFinal
+    ** parameters. ^An aggregate SQL function requires an implementation of xStep
+    ** and xFinal and NULL pointer must be passed for xFunc. ^To delete an existing
+    ** SQL function or aggregate, pass NULL pointers for all three function
+    ** callbacks.
+    **
+    ** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue
+    ** and xInverse) passed to sqlite3_create_window_function are pointers to
+    ** C-language callbacks that implement the new function. xStep and xFinal
+    ** must both be non-NULL. xValue and xInverse may either both be NULL, in
+    ** which case a regular aggregate function is created, or must both be
+    ** non-NULL, in which case the new function may be used as either an aggregate
+    ** or aggregate window function. More details regarding the implementation
+    ** of aggregate window functions are
+    ** [user-defined window functions|available here].
+    **
+    ** ^(If the final parameter to sqlite3_create_function_v2() or
+    ** sqlite3_create_window_function() is not NULL, then it is destructor for
+    ** the application data pointer. The destructor is invoked when the function
+    ** is deleted, either by being overloaded or when the database connection
+    ** closes.)^ ^The destructor is also invoked if the call to
+    ** sqlite3_create_function_v2() fails.  ^When the destructor callback is
+    ** invoked, it is passed a single argument which is a copy of the application
+    ** data pointer which was the fifth parameter to sqlite3_create_function_v2().
+    **
+    ** ^It is permitted to register multiple implementations of the same
+    ** functions with the same name but with either differing numbers of
+    ** arguments or differing preferred text encodings.  ^SQLite will use
+    ** the implementation that most closely matches the way in which the
+    ** SQL function is used.  ^A function implementation with a non-negative
+    ** nArg parameter is a better match than a function implementation with
+    ** a negative nArg.  ^A function where the preferred text encoding
+    ** matches the database encoding is a better
+    ** match than a function where the encoding is different.
+    ** ^A function where the encoding difference is between UTF16le and UTF16be
+    ** is a closer match than a function where the encoding difference is
+    ** between UTF8 and UTF16.
+    **
+    ** ^Built-in functions may be overloaded by new application-defined functions.
+    **
+    ** ^An application-defined function is permitted to call other
+    ** SQLite interfaces.  However, such calls must not
+    ** close the database connection nor finalize or reset the prepared
+    ** statement in which the function is running.
+    */
+    SQLITE_API int sqlite3_create_function(sqlite3* db,
+                                           const char* zFunctionName,
+                                           int nArg,
+                                           int eTextRep,
+                                           void* pApp,
+                                           void (*xFunc)(sqlite3_context*, int, sqlite3_value**),
+                                           void (*xStep)(sqlite3_context*, int, sqlite3_value**),
+                                           void (*xFinal)(sqlite3_context*));
+    SQLITE_API int sqlite3_create_function16(sqlite3* db,
+                                             const void* zFunctionName,
+                                             int nArg,
+                                             int eTextRep,
+                                             void* pApp,
+                                             void (*xFunc)(sqlite3_context*, int, sqlite3_value**),
+                                             void (*xStep)(sqlite3_context*, int, sqlite3_value**),
+                                             void (*xFinal)(sqlite3_context*));
+    SQLITE_API int sqlite3_create_function_v2(sqlite3* db,
+                                              const char* zFunctionName,
+                                              int nArg,
+                                              int eTextRep,
+                                              void* pApp,
+                                              void (*xFunc)(sqlite3_context*, int, sqlite3_value**),
+                                              void (*xStep)(sqlite3_context*, int, sqlite3_value**),
+                                              void (*xFinal)(sqlite3_context*),
+                                              void (*xDestroy)(void*));
+    SQLITE_API int sqlite3_create_window_function(sqlite3* db,
+                                                  const char* zFunctionName,
+                                                  int nArg,
+                                                  int eTextRep,
+                                                  void* pApp,
+                                                  void (*xStep)(sqlite3_context*, int, sqlite3_value**),
+                                                  void (*xFinal)(sqlite3_context*),
+                                                  void (*xValue)(sqlite3_context*),
+                                                  void (*xInverse)(sqlite3_context*, int, sqlite3_value**),
+                                                  void (*xDestroy)(void*));
 
 /*
 ** CAPI3REF: Text Encodings
@@ -5328,12 +5299,12 @@ SQLITE_API int sqlite3_create_window_function(
 ** These constant define integer codes that represent the various
 ** text encodings supported by SQLite.
 */
-#define SQLITE_UTF8           1    /* IMP: R-37514-35566 */
-#define SQLITE_UTF16LE        2    /* IMP: R-03371-37637 */
-#define SQLITE_UTF16BE        3    /* IMP: R-51971-34154 */
-#define SQLITE_UTF16          4    /* Use native byte order */
-#define SQLITE_ANY            5    /* Deprecated */
-#define SQLITE_UTF16_ALIGNED  8    /* sqlite3_create_collation only */
+#define SQLITE_UTF8 1          /* IMP: R-37514-35566 */
+#define SQLITE_UTF16LE 2       /* IMP: R-03371-37637 */
+#define SQLITE_UTF16BE 3       /* IMP: R-51971-34154 */
+#define SQLITE_UTF16 4         /* Use native byte order */
+#define SQLITE_ANY 5           /* Deprecated */
+#define SQLITE_UTF16_ALIGNED 8 /* sqlite3_create_collation only */
 
 /*
 ** CAPI3REF: Function Flags
@@ -5400,10 +5371,10 @@ SQLITE_API int sqlite3_create_window_function(
 ** </dd>
 ** </dl>
 */
-#define SQLITE_DETERMINISTIC    0x000000800
-#define SQLITE_DIRECTONLY       0x000080000
-#define SQLITE_SUBTYPE          0x000100000
-#define SQLITE_INNOCUOUS        0x000200000
+#define SQLITE_DETERMINISTIC 0x000000800
+#define SQLITE_DIRECTONLY 0x000080000
+#define SQLITE_SUBTYPE 0x000100000
+#define SQLITE_INNOCUOUS 0x000200000
 
 /*
 ** CAPI3REF: Deprecated Functions
@@ -5416,814 +5387,794 @@ SQLITE_API int sqlite3_create_window_function(
 ** these functions, we will not explain what they do.
 */
 #ifndef SQLITE_OMIT_DEPRECATED
-SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
-SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
-SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
-SQLITE_API SQLITE_DEPRECATED int sqlite3_global_recover(void);
-SQLITE_API SQLITE_DEPRECATED void sqlite3_thread_cleanup(void);
-SQLITE_API SQLITE_DEPRECATED int sqlite3_memory_alarm(void(*)(void*,sqlite3_int64,int),
-                      void*,sqlite3_int64);
+    SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
+    SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
+    SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt*, sqlite3_stmt*);
+    SQLITE_API SQLITE_DEPRECATED int sqlite3_global_recover(void);
+    SQLITE_API SQLITE_DEPRECATED void sqlite3_thread_cleanup(void);
+    SQLITE_API SQLITE_DEPRECATED int sqlite3_memory_alarm(void (*)(void*, sqlite3_int64, int), void*, sqlite3_int64);
 #endif
 
-/*
-** CAPI3REF: Obtaining SQL Values
-** METHOD: sqlite3_value
-**
-** <b>Summary:</b>
-** <blockquote><table border=0 cellpadding=0 cellspacing=0>
-** <tr><td><b>sqlite3_value_blob</b><td>&rarr;<td>BLOB value
-** <tr><td><b>sqlite3_value_double</b><td>&rarr;<td>REAL value
-** <tr><td><b>sqlite3_value_int</b><td>&rarr;<td>32-bit INTEGER value
-** <tr><td><b>sqlite3_value_int64</b><td>&rarr;<td>64-bit INTEGER value
-** <tr><td><b>sqlite3_value_pointer</b><td>&rarr;<td>Pointer value
-** <tr><td><b>sqlite3_value_text</b><td>&rarr;<td>UTF-8 TEXT value
-** <tr><td><b>sqlite3_value_text16</b><td>&rarr;<td>UTF-16 TEXT value in
-** the native byteorder
-** <tr><td><b>sqlite3_value_text16be</b><td>&rarr;<td>UTF-16be TEXT value
-** <tr><td><b>sqlite3_value_text16le</b><td>&rarr;<td>UTF-16le TEXT value
-** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
-** <tr><td><b>sqlite3_value_bytes</b><td>&rarr;<td>Size of a BLOB
-** or a UTF-8 TEXT in bytes
-** <tr><td><b>sqlite3_value_bytes16&nbsp;&nbsp;</b>
-** <td>&rarr;&nbsp;&nbsp;<td>Size of UTF-16
-** TEXT in bytes
-** <tr><td><b>sqlite3_value_type</b><td>&rarr;<td>Default
-** datatype of the value
-** <tr><td><b>sqlite3_value_numeric_type&nbsp;&nbsp;</b>
-** <td>&rarr;&nbsp;&nbsp;<td>Best numeric datatype of the value
-** <tr><td><b>sqlite3_value_nochange&nbsp;&nbsp;</b>
-** <td>&rarr;&nbsp;&nbsp;<td>True if the column is unchanged in an UPDATE
-** against a virtual table.
-** <tr><td><b>sqlite3_value_frombind&nbsp;&nbsp;</b>
-** <td>&rarr;&nbsp;&nbsp;<td>True if value originated from a [bound parameter]
-** </table></blockquote>
-**
-** <b>Details:</b>
-**
-** These routines extract type, size, and content information from
-** [protected sqlite3_value] objects.  Protected sqlite3_value objects
-** are used to pass parameter information into the functions that
-** implement [application-defined SQL functions] and [virtual tables].
-**
-** These routines work only with [protected sqlite3_value] objects.
-** Any attempt to use these routines on an [unprotected sqlite3_value]
-** is not threadsafe.
-**
-** ^These routines work just like the corresponding [column access functions]
-** except that these routines take a single [protected sqlite3_value] object
-** pointer instead of a [sqlite3_stmt*] pointer and an integer column number.
-**
-** ^The sqlite3_value_text16() interface extracts a UTF-16 string
-** in the native byte-order of the host machine.  ^The
-** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
-** extract UTF-16 strings as big-endian and little-endian respectively.
-**
-** ^If [sqlite3_value] object V was initialized
-** using [sqlite3_bind_pointer(S,I,P,X,D)] or [sqlite3_result_pointer(C,P,X,D)]
-** and if X and Y are strings that compare equal according to strcmp(X,Y),
-** then sqlite3_value_pointer(V,Y) will return the pointer P.  ^Otherwise,
-** sqlite3_value_pointer(V,Y) returns a NULL. The sqlite3_bind_pointer()
-** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
-**
-** ^(The sqlite3_value_type(V) interface returns the
-** [SQLITE_INTEGER | datatype code] for the initial datatype of the
-** [sqlite3_value] object V. The returned value is one of [SQLITE_INTEGER],
-** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].)^
-** Other interfaces might change the datatype for an sqlite3_value object.
-** For example, if the datatype is initially SQLITE_INTEGER and
-** sqlite3_value_text(V) is called to extract a text value for that
-** integer, then subsequent calls to sqlite3_value_type(V) might return
-** SQLITE_TEXT.  Whether or not a persistent internal datatype conversion
-** occurs is undefined and may change from one release of SQLite to the next.
-**
-** ^(The sqlite3_value_numeric_type() interface attempts to apply
-** numeric affinity to the value.  This means that an attempt is
-** made to convert the value to an integer or floating point.  If
-** such a conversion is possible without loss of information (in other
-** words, if the value is a string that looks like a number)
-** then the conversion is performed.  Otherwise no conversion occurs.
-** The [SQLITE_INTEGER | datatype] after conversion is returned.)^
-**
-** ^Within the [xUpdate] method of a [virtual table], the
-** sqlite3_value_nochange(X) interface returns true if and only if
-** the column corresponding to X is unchanged by the UPDATE operation
-** that the xUpdate method call was invoked to implement and if
-** and the prior [xColumn] method call that was invoked to extracted
-** the value for that column returned without setting a result (probably
-** because it queried [sqlite3_vtab_nochange()] and found that the column
-** was unchanging).  ^Within an [xUpdate] method, any value for which
-** sqlite3_value_nochange(X) is true will in all other respects appear
-** to be a NULL value.  If sqlite3_value_nochange(X) is invoked anywhere other
-** than within an [xUpdate] method call for an UPDATE statement, then
-** the return value is arbitrary and meaningless.
-**
-** ^The sqlite3_value_frombind(X) interface returns non-zero if the
-** value X originated from one of the [sqlite3_bind_int|sqlite3_bind()]
-** interfaces.  ^If X comes from an SQL literal value, or a table column,
-** or an expression, then sqlite3_value_frombind(X) returns zero.
-**
-** Please pay particular attention to the fact that the pointer returned
-** from [sqlite3_value_blob()], [sqlite3_value_text()], or
-** [sqlite3_value_text16()] can be invalidated by a subsequent call to
-** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite3_value_text()],
-** or [sqlite3_value_text16()].
-**
-** These routines must be called from the same thread as
-** the SQL function that supplied the [sqlite3_value*] parameters.
-**
-** As long as the input parameter is correct, these routines can only
-** fail if an out-of-memory error occurs during a format conversion.
-** Only the following subset of interfaces are subject to out-of-memory
-** errors:
-**
-** <ul>
-** <li> sqlite3_value_blob()
-** <li> sqlite3_value_text()
-** <li> sqlite3_value_text16()
-** <li> sqlite3_value_text16le()
-** <li> sqlite3_value_text16be()
-** <li> sqlite3_value_bytes()
-** <li> sqlite3_value_bytes16()
-** </ul>
-**
-** If an out-of-memory error occurs, then the return value from these
-** routines is the same as if the column had contained an SQL NULL value.
-** Valid SQL NULL returns can be distinguished from out-of-memory errors
-** by invoking the [sqlite3_errcode()] immediately after the suspect
-** return value is obtained and before any
-** other SQLite interface is called on the same [database connection].
-*/
-SQLITE_API const void *sqlite3_value_blob(sqlite3_value*);
-SQLITE_API double sqlite3_value_double(sqlite3_value*);
-SQLITE_API int sqlite3_value_int(sqlite3_value*);
-SQLITE_API sqlite3_int64 sqlite3_value_int64(sqlite3_value*);
-SQLITE_API void *sqlite3_value_pointer(sqlite3_value*, const char*);
-SQLITE_API const unsigned char *sqlite3_value_text(sqlite3_value*);
-SQLITE_API const void *sqlite3_value_text16(sqlite3_value*);
-SQLITE_API const void *sqlite3_value_text16le(sqlite3_value*);
-SQLITE_API const void *sqlite3_value_text16be(sqlite3_value*);
-SQLITE_API int sqlite3_value_bytes(sqlite3_value*);
-SQLITE_API int sqlite3_value_bytes16(sqlite3_value*);
-SQLITE_API int sqlite3_value_type(sqlite3_value*);
-SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
-SQLITE_API int sqlite3_value_nochange(sqlite3_value*);
-SQLITE_API int sqlite3_value_frombind(sqlite3_value*);
-
-/*
-** CAPI3REF: Finding The Subtype Of SQL Values
-** METHOD: sqlite3_value
-**
-** The sqlite3_value_subtype(V) function returns the subtype for
-** an [application-defined SQL function] argument V.  The subtype
-** information can be used to pass a limited amount of context from
-** one SQL function to another.  Use the [sqlite3_result_subtype()]
-** routine to set the subtype for the return value of an SQL function.
-*/
-SQLITE_API unsigned int sqlite3_value_subtype(sqlite3_value*);
-
-/*
-** CAPI3REF: Copy And Free SQL Values
-** METHOD: sqlite3_value
-**
-** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
-** object D and returns a pointer to that copy.  ^The [sqlite3_value] returned
-** is a [protected sqlite3_value] object even if the input is not.
-** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
-** memory allocation fails.
-**
-** ^The sqlite3_value_free(V) interface frees an [sqlite3_value] object
-** previously obtained from [sqlite3_value_dup()].  ^If V is a NULL pointer
-** then sqlite3_value_free(V) is a harmless no-op.
-*/
-SQLITE_API sqlite3_value *sqlite3_value_dup(const sqlite3_value*);
-SQLITE_API void sqlite3_value_free(sqlite3_value*);
-
-/*
-** CAPI3REF: Obtain Aggregate Function Context
-** METHOD: sqlite3_context
-**
-** Implementations of aggregate SQL functions use this
-** routine to allocate memory for storing their state.
-**
-** ^The first time the sqlite3_aggregate_context(C,N) routine is called
-** for a particular aggregate function, SQLite allocates
-** N bytes of memory, zeroes out that memory, and returns a pointer
-** to the new memory. ^On second and subsequent calls to
-** sqlite3_aggregate_context() for the same aggregate function instance,
-** the same buffer is returned.  Sqlite3_aggregate_context() is normally
-** called once for each invocation of the xStep callback and then one
-** last time when the xFinal callback is invoked.  ^(When no rows match
-** an aggregate query, the xStep() callback of the aggregate function
-** implementation is never called and xFinal() is called exactly once.
-** In those cases, sqlite3_aggregate_context() might be called for the
-** first time from within xFinal().)^
-**
-** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
-** when first called if N is less than or equal to zero or if a memory
-** allocate error occurs.
-**
-** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
-** determined by the N parameter on first successful call.  Changing the
-** value of N in any subsequent call to sqlite3_aggregate_context() within
-** the same aggregate function instance will not resize the memory
-** allocation.)^  Within the xFinal callback, it is customary to set
-** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
-** pointless memory allocations occur.
-**
-** ^SQLite automatically frees the memory allocated by
-** sqlite3_aggregate_context() when the aggregate query concludes.
-**
-** The first parameter must be a copy of the
-** [sqlite3_context | SQL function context] that is the first parameter
-** to the xStep or xFinal callback routine that implements the aggregate
-** function.
-**
-** This routine must be called from the same thread in which
-** the aggregate SQL function is running.
-*/
-SQLITE_API void *sqlite3_aggregate_context(sqlite3_context*, int nBytes);
-
-/*
-** CAPI3REF: User Data For Functions
-** METHOD: sqlite3_context
-**
-** ^The sqlite3_user_data() interface returns a copy of
-** the pointer that was the pUserData parameter (the 5th parameter)
-** of the [sqlite3_create_function()]
-** and [sqlite3_create_function16()] routines that originally
-** registered the application defined function.
-**
-** This routine must be called from the same thread in which
-** the application-defined function is running.
-*/
-SQLITE_API void *sqlite3_user_data(sqlite3_context*);
-
-/*
-** CAPI3REF: Database Connection For Functions
-** METHOD: sqlite3_context
-**
-** ^The sqlite3_context_db_handle() interface returns a copy of
-** the pointer to the [database connection] (the 1st parameter)
-** of the [sqlite3_create_function()]
-** and [sqlite3_create_function16()] routines that originally
-** registered the application defined function.
-*/
-SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
-
-/*
-** CAPI3REF: Function Auxiliary Data
-** METHOD: sqlite3_context
-**
-** These functions may be used by (non-aggregate) SQL functions to
-** associate metadata with argument values. If the same value is passed to
-** multiple invocations of the same SQL function during query execution, under
-** some circumstances the associated metadata may be preserved.  An example
-** of where this might be useful is in a regular-expression matching
-** function. The compiled version of the regular expression can be stored as
-** metadata associated with the pattern string.
-** Then as long as the pattern string remains the same,
-** the compiled regular expression can be reused on multiple
-** invocations of the same function.
-**
-** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata
-** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument
-** value to the application-defined function.  ^N is zero for the left-most
-** function argument.  ^If there is no metadata
-** associated with the function argument, the sqlite3_get_auxdata(C,N) interface
-** returns a NULL pointer.
-**
-** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
-** argument of the application-defined function.  ^Subsequent
-** calls to sqlite3_get_auxdata(C,N) return P from the most recent
-** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or
-** NULL if the metadata has been discarded.
-** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
-** SQLite will invoke the destructor function X with parameter P exactly
-** once, when the metadata is discarded.
-** SQLite is free to discard the metadata at any time, including: <ul>
-** <li> ^(when the corresponding function parameter changes)^, or
-** <li> ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
-**      SQL statement)^, or
-** <li> ^(when sqlite3_set_auxdata() is invoked again on the same
-**       parameter)^, or
-** <li> ^(during the original sqlite3_set_auxdata() call when a memory
-**      allocation error occurs.)^ </ul>
-**
-** Note the last bullet in particular.  The destructor X in
-** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
-** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
-** should be called near the end of the function implementation and the
-** function implementation should not make any use of P after
-** sqlite3_set_auxdata() has been called.
-**
-** ^(In practice, metadata is preserved between function calls for
-** function parameters that are compile-time constants, including literal
-** values and [parameters] and expressions composed from the same.)^
-**
-** The value of the N parameter to these interfaces should be non-negative.
-** Future enhancements may make use of negative N values to define new
-** kinds of function caching behavior.
-**
-** These routines must be called from the same thread in which
-** the SQL function is running.
-*/
-SQLITE_API void *sqlite3_get_auxdata(sqlite3_context*, int N);
-SQLITE_API void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
-
-
-/*
-** CAPI3REF: Constants Defining Special Destructor Behavior
-**
-** These are special values for the destructor that is passed in as the
-** final argument to routines like [sqlite3_result_blob()].  ^If the destructor
-** argument is SQLITE_STATIC, it means that the content pointer is constant
-** and will never change.  It does not need to be destroyed.  ^The
-** SQLITE_TRANSIENT value means that the content will likely change in
-** the near future and that SQLite should make its own private copy of
-** the content before returning.
-**
-** The typedef is necessary to work around problems in certain
-** C++ compilers.
-*/
-typedef void (*sqlite3_destructor_type)(void*);
-#define SQLITE_STATIC      ((sqlite3_destructor_type)0)
-#define SQLITE_TRANSIENT   ((sqlite3_destructor_type)-1)
-
-/*
-** CAPI3REF: Setting The Result Of An SQL Function
-** METHOD: sqlite3_context
-**
-** These routines are used by the xFunc or xFinal callbacks that
-** implement SQL functions and aggregates.  See
-** [sqlite3_create_function()] and [sqlite3_create_function16()]
-** for additional information.
-**
-** These functions work very much like the [parameter binding] family of
-** functions used to bind values to host parameters in prepared statements.
-** Refer to the [SQL parameter] documentation for additional information.
-**
-** ^The sqlite3_result_blob() interface sets the result from
-** an application-defined function to be the BLOB whose content is pointed
-** to by the second parameter and which is N bytes long where N is the
-** third parameter.
-**
-** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
-** interfaces set the result of the application-defined function to be
-** a BLOB containing all zero bytes and N bytes in size.
-**
-** ^The sqlite3_result_double() interface sets the result from
-** an application-defined function to be a floating point value specified
-** by its 2nd argument.
-**
-** ^The sqlite3_result_error() and sqlite3_result_error16() functions
-** cause the implemented SQL function to throw an exception.
-** ^SQLite uses the string pointed to by the
-** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
-** as the text of an error message.  ^SQLite interprets the error
-** message string from sqlite3_result_error() as UTF-8. ^SQLite
-** interprets the string from sqlite3_result_error16() as UTF-16 using
-** the same [byte-order determination rules] as [sqlite3_bind_text16()].
-** ^If the third parameter to sqlite3_result_error()
-** or sqlite3_result_error16() is negative then SQLite takes as the error
-** message all text up through the first zero character.
-** ^If the third parameter to sqlite3_result_error() or
-** sqlite3_result_error16() is non-negative then SQLite takes that many
-** bytes (not characters) from the 2nd parameter as the error message.
-** ^The sqlite3_result_error() and sqlite3_result_error16()
-** routines make a private copy of the error message text before
-** they return.  Hence, the calling function can deallocate or
-** modify the text after they return without harm.
-** ^The sqlite3_result_error_code() function changes the error code
-** returned by SQLite as a result of an error in a function.  ^By default,
-** the error code is SQLITE_ERROR.  ^A subsequent call to sqlite3_result_error()
-** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
-**
-** ^The sqlite3_result_error_toobig() interface causes SQLite to throw an
-** error indicating that a string or BLOB is too long to represent.
-**
-** ^The sqlite3_result_error_nomem() interface causes SQLite to throw an
-** error indicating that a memory allocation failed.
-**
-** ^The sqlite3_result_int() interface sets the return value
-** of the application-defined function to be the 32-bit signed integer
-** value given in the 2nd argument.
-** ^The sqlite3_result_int64() interface sets the return value
-** of the application-defined function to be the 64-bit signed integer
-** value given in the 2nd argument.
-**
-** ^The sqlite3_result_null() interface sets the return value
-** of the application-defined function to be NULL.
-**
-** ^The sqlite3_result_text(), sqlite3_result_text16(),
-** sqlite3_result_text16le(), and sqlite3_result_text16be() interfaces
-** set the return value of the application-defined function to be
-** a text string which is represented as UTF-8, UTF-16 native byte order,
-** UTF-16 little endian, or UTF-16 big endian, respectively.
-** ^The sqlite3_result_text64() interface sets the return value of an
-** application-defined function to be a text string in an encoding
-** specified by the fifth (and last) parameter, which must be one
-** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
-** ^SQLite takes the text result from the application from
-** the 2nd parameter of the sqlite3_result_text* interfaces.
-** ^If the 3rd parameter to the sqlite3_result_text* interfaces
-** is negative, then SQLite takes result text from the 2nd parameter
-** through the first zero character.
-** ^If the 3rd parameter to the sqlite3_result_text* interfaces
-** is non-negative, then as many bytes (not characters) of the text
-** pointed to by the 2nd parameter are taken as the application-defined
-** function result.  If the 3rd parameter is non-negative, then it
-** must be the byte offset into the string where the NUL terminator would
-** appear if the string where NUL terminated.  If any NUL characters occur
-** in the string at a byte offset that is less than the value of the 3rd
-** parameter, then the resulting string will contain embedded NULs and the
-** result of expressions operating on strings with embedded NULs is undefined.
-** ^If the 4th parameter to the sqlite3_result_text* interfaces
-** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
-** function as the destructor on the text or BLOB result when it has
-** finished using that result.
-** ^If the 4th parameter to the sqlite3_result_text* interfaces or to
-** sqlite3_result_blob is the special constant SQLITE_STATIC, then SQLite
-** assumes that the text or BLOB result is in constant space and does not
-** copy the content of the parameter nor call a destructor on the content
-** when it has finished using that result.
-** ^If the 4th parameter to the sqlite3_result_text* interfaces
-** or sqlite3_result_blob is the special constant SQLITE_TRANSIENT
-** then SQLite makes a copy of the result into space obtained
-** from [sqlite3_malloc()] before it returns.
-**
-** ^For the sqlite3_result_text16(), sqlite3_result_text16le(), and
-** sqlite3_result_text16be() routines, and for sqlite3_result_text64()
-** when the encoding is not UTF8, if the input UTF16 begins with a
-** byte-order mark (BOM, U+FEFF) then the BOM is removed from the
-** string and the rest of the string is interpreted according to the
-** byte-order specified by the BOM.  ^The byte-order specified by
-** the BOM at the beginning of the text overrides the byte-order
-** specified by the interface procedure.  ^So, for example, if
-** sqlite3_result_text16le() is invoked with text that begins
-** with bytes 0xfe, 0xff (a big-endian byte-order mark) then the
-** first two bytes of input are skipped and the remaining input
-** is interpreted as UTF16BE text.
-**
-** ^For UTF16 input text to the sqlite3_result_text16(),
-** sqlite3_result_text16be(), sqlite3_result_text16le(), and
-** sqlite3_result_text64() routines, if the text contains invalid
-** UTF16 characters, the invalid characters might be converted
-** into the unicode replacement character, U+FFFD.
-**
-** ^The sqlite3_result_value() interface sets the result of
-** the application-defined function to be a copy of the
-** [unprotected sqlite3_value] object specified by the 2nd parameter.  ^The
-** sqlite3_result_value() interface makes a copy of the [sqlite3_value]
-** so that the [sqlite3_value] specified in the parameter may change or
-** be deallocated after sqlite3_result_value() returns without harm.
-** ^A [protected sqlite3_value] object may always be used where an
-** [unprotected sqlite3_value] object is required, so either
-** kind of [sqlite3_value] object can be used with this interface.
-**
-** ^The sqlite3_result_pointer(C,P,T,D) interface sets the result to an
-** SQL NULL value, just like [sqlite3_result_null(C)], except that it
-** also associates the host-language pointer P or type T with that
-** NULL value such that the pointer can be retrieved within an
-** [application-defined SQL function] using [sqlite3_value_pointer()].
-** ^If the D parameter is not NULL, then it is a pointer to a destructor
-** for the P parameter.  ^SQLite invokes D with P as its only argument
-** when SQLite is finished with P.  The T parameter should be a static
-** string and preferably a string literal. The sqlite3_result_pointer()
-** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
-**
-** If these routines are called from within the different thread
-** than the one containing the application-defined function that received
-** the [sqlite3_context] pointer, the results are undefined.
-*/
-SQLITE_API void sqlite3_result_blob(sqlite3_context*, const void*, int, void(*)(void*));
-SQLITE_API void sqlite3_result_blob64(sqlite3_context*,const void*,
-                           sqlite3_uint64,void(*)(void*));
-SQLITE_API void sqlite3_result_double(sqlite3_context*, double);
-SQLITE_API void sqlite3_result_error(sqlite3_context*, const char*, int);
-SQLITE_API void sqlite3_result_error16(sqlite3_context*, const void*, int);
-SQLITE_API void sqlite3_result_error_toobig(sqlite3_context*);
-SQLITE_API void sqlite3_result_error_nomem(sqlite3_context*);
-SQLITE_API void sqlite3_result_error_code(sqlite3_context*, int);
-SQLITE_API void sqlite3_result_int(sqlite3_context*, int);
-SQLITE_API void sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
-SQLITE_API void sqlite3_result_null(sqlite3_context*);
-SQLITE_API void sqlite3_result_text(sqlite3_context*, const char*, int, void(*)(void*));
-SQLITE_API void sqlite3_result_text64(sqlite3_context*, const char*,sqlite3_uint64,
-                           void(*)(void*), unsigned char encoding);
-SQLITE_API void sqlite3_result_text16(sqlite3_context*, const void*, int, void(*)(void*));
-SQLITE_API void sqlite3_result_text16le(sqlite3_context*, const void*, int,void(*)(void*));
-SQLITE_API void sqlite3_result_text16be(sqlite3_context*, const void*, int,void(*)(void*));
-SQLITE_API void sqlite3_result_value(sqlite3_context*, sqlite3_value*);
-SQLITE_API void sqlite3_result_pointer(sqlite3_context*, void*,const char*,void(*)(void*));
-SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n);
-SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
-
-
-/*
-** CAPI3REF: Setting The Subtype Of An SQL Function
-** METHOD: sqlite3_context
-**
-** The sqlite3_result_subtype(C,T) function causes the subtype of
-** the result from the [application-defined SQL function] with
-** [sqlite3_context] C to be the value T.  Only the lower 8 bits
-** of the subtype T are preserved in current versions of SQLite;
-** higher order bits are discarded.
-** The number of subtype bytes preserved by SQLite might increase
-** in future releases of SQLite.
-*/
-SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);
-
-/*
-** CAPI3REF: Define New Collating Sequences
-** METHOD: sqlite3
-**
-** ^These functions add, remove, or modify a [collation] associated
-** with the [database connection] specified as the first argument.
-**
-** ^The name of the collation is a UTF-8 string
-** for sqlite3_create_collation() and sqlite3_create_collation_v2()
-** and a UTF-16 string in native byte order for sqlite3_create_collation16().
-** ^Collation names that compare equal according to [sqlite3_strnicmp()] are
-** considered to be the same name.
-**
-** ^(The third argument (eTextRep) must be one of the constants:
-** <ul>
-** <li> [SQLITE_UTF8],
-** <li> [SQLITE_UTF16LE],
-** <li> [SQLITE_UTF16BE],
-** <li> [SQLITE_UTF16], or
-** <li> [SQLITE_UTF16_ALIGNED].
-** </ul>)^
-** ^The eTextRep argument determines the encoding of strings passed
-** to the collating function callback, xCompare.
-** ^The [SQLITE_UTF16] and [SQLITE_UTF16_ALIGNED] values for eTextRep
-** force strings to be UTF16 with native byte order.
-** ^The [SQLITE_UTF16_ALIGNED] value for eTextRep forces strings to begin
-** on an even byte address.
-**
-** ^The fourth argument, pArg, is an application data pointer that is passed
-** through as the first argument to the collating function callback.
-**
-** ^The fifth argument, xCompare, is a pointer to the collating function.
-** ^Multiple collating functions can be registered using the same name but
-** with different eTextRep parameters and SQLite will use whichever
-** function requires the least amount of data transformation.
-** ^If the xCompare argument is NULL then the collating function is
-** deleted.  ^When all collating functions having the same name are deleted,
-** that collation is no longer usable.
-**
-** ^The collating function callback is invoked with a copy of the pArg
-** application data pointer and with two strings in the encoding specified
-** by the eTextRep argument.  The two integer parameters to the collating
-** function callback are the length of the two strings, in bytes. The collating
-** function must return an integer that is negative, zero, or positive
-** if the first string is less than, equal to, or greater than the second,
-** respectively.  A collating function must always return the same answer
-** given the same inputs.  If two or more collating functions are registered
-** to the same collation name (using different eTextRep values) then all
-** must give an equivalent answer when invoked with equivalent strings.
-** The collating function must obey the following properties for all
-** strings A, B, and C:
-**
-** <ol>
-** <li> If A==B then B==A.
-** <li> If A==B and B==C then A==C.
-** <li> If A&lt;B THEN B&gt;A.
-** <li> If A&lt;B and B&lt;C then A&lt;C.
-** </ol>
-**
-** If a collating function fails any of the above constraints and that
-** collating function is registered and used, then the behavior of SQLite
-** is undefined.
-**
-** ^The sqlite3_create_collation_v2() works like sqlite3_create_collation()
-** with the addition that the xDestroy callback is invoked on pArg when
-** the collating function is deleted.
-** ^Collating functions are deleted when they are overridden by later
-** calls to the collation creation functions or when the
-** [database connection] is closed using [sqlite3_close()].
-**
-** ^The xDestroy callback is <u>not</u> called if the
-** sqlite3_create_collation_v2() function fails.  Applications that invoke
-** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should
-** check the return code and dispose of the application data pointer
-** themselves rather than expecting SQLite to deal with it for them.
-** This is different from every other SQLite interface.  The inconsistency
-** is unfortunate but cannot be changed without breaking backwards
-** compatibility.
-**
-** See also:  [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
-*/
-SQLITE_API int sqlite3_create_collation(
-  sqlite3*,
-  const char *zName,
-  int eTextRep,
-  void *pArg,
-  int(*xCompare)(void*,int,const void*,int,const void*)
-);
-SQLITE_API int sqlite3_create_collation_v2(
-  sqlite3*,
-  const char *zName,
-  int eTextRep,
-  void *pArg,
-  int(*xCompare)(void*,int,const void*,int,const void*),
-  void(*xDestroy)(void*)
-);
-SQLITE_API int sqlite3_create_collation16(
-  sqlite3*,
-  const void *zName,
-  int eTextRep,
-  void *pArg,
-  int(*xCompare)(void*,int,const void*,int,const void*)
-);
-
-/*
-** CAPI3REF: Collation Needed Callbacks
-** METHOD: sqlite3
-**
-** ^To avoid having to register all collation sequences before a database
-** can be used, a single callback function may be registered with the
-** [database connection] to be invoked whenever an undefined collation
-** sequence is required.
-**
-** ^If the function is registered using the sqlite3_collation_needed() API,
-** then it is passed the names of undefined collation sequences as strings
-** encoded in UTF-8. ^If sqlite3_collation_needed16() is used,
-** the names are passed as UTF-16 in machine native byte order.
-** ^A call to either function replaces the existing collation-needed callback.
-**
-** ^(When the callback is invoked, the first argument passed is a copy
-** of the second argument to sqlite3_collation_needed() or
-** sqlite3_collation_needed16().  The second argument is the database
-** connection.  The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE],
-** or [SQLITE_UTF16LE], indicating the most desirable form of the collation
-** sequence function required.  The fourth parameter is the name of the
-** required collation sequence.)^
-**
-** The callback function should register the desired collation using
-** [sqlite3_create_collation()], [sqlite3_create_collation16()], or
-** [sqlite3_create_collation_v2()].
-*/
-SQLITE_API int sqlite3_collation_needed(
-  sqlite3*,
-  void*,
-  void(*)(void*,sqlite3*,int eTextRep,const char*)
-);
-SQLITE_API int sqlite3_collation_needed16(
-  sqlite3*,
-  void*,
-  void(*)(void*,sqlite3*,int eTextRep,const void*)
-);
+    /*
+    ** CAPI3REF: Obtaining SQL Values
+    ** METHOD: sqlite3_value
+    **
+    ** <b>Summary:</b>
+    ** <blockquote><table border=0 cellpadding=0 cellspacing=0>
+    ** <tr><td><b>sqlite3_value_blob</b><td>&rarr;<td>BLOB value
+    ** <tr><td><b>sqlite3_value_double</b><td>&rarr;<td>REAL value
+    ** <tr><td><b>sqlite3_value_int</b><td>&rarr;<td>32-bit INTEGER value
+    ** <tr><td><b>sqlite3_value_int64</b><td>&rarr;<td>64-bit INTEGER value
+    ** <tr><td><b>sqlite3_value_pointer</b><td>&rarr;<td>Pointer value
+    ** <tr><td><b>sqlite3_value_text</b><td>&rarr;<td>UTF-8 TEXT value
+    ** <tr><td><b>sqlite3_value_text16</b><td>&rarr;<td>UTF-16 TEXT value in
+    ** the native byteorder
+    ** <tr><td><b>sqlite3_value_text16be</b><td>&rarr;<td>UTF-16be TEXT value
+    ** <tr><td><b>sqlite3_value_text16le</b><td>&rarr;<td>UTF-16le TEXT value
+    ** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
+    ** <tr><td><b>sqlite3_value_bytes</b><td>&rarr;<td>Size of a BLOB
+    ** or a UTF-8 TEXT in bytes
+    ** <tr><td><b>sqlite3_value_bytes16&nbsp;&nbsp;</b>
+    ** <td>&rarr;&nbsp;&nbsp;<td>Size of UTF-16
+    ** TEXT in bytes
+    ** <tr><td><b>sqlite3_value_type</b><td>&rarr;<td>Default
+    ** datatype of the value
+    ** <tr><td><b>sqlite3_value_numeric_type&nbsp;&nbsp;</b>
+    ** <td>&rarr;&nbsp;&nbsp;<td>Best numeric datatype of the value
+    ** <tr><td><b>sqlite3_value_nochange&nbsp;&nbsp;</b>
+    ** <td>&rarr;&nbsp;&nbsp;<td>True if the column is unchanged in an UPDATE
+    ** against a virtual table.
+    ** <tr><td><b>sqlite3_value_frombind&nbsp;&nbsp;</b>
+    ** <td>&rarr;&nbsp;&nbsp;<td>True if value originated from a [bound parameter]
+    ** </table></blockquote>
+    **
+    ** <b>Details:</b>
+    **
+    ** These routines extract type, size, and content information from
+    ** [protected sqlite3_value] objects.  Protected sqlite3_value objects
+    ** are used to pass parameter information into the functions that
+    ** implement [application-defined SQL functions] and [virtual tables].
+    **
+    ** These routines work only with [protected sqlite3_value] objects.
+    ** Any attempt to use these routines on an [unprotected sqlite3_value]
+    ** is not threadsafe.
+    **
+    ** ^These routines work just like the corresponding [column access functions]
+    ** except that these routines take a single [protected sqlite3_value] object
+    ** pointer instead of a [sqlite3_stmt*] pointer and an integer column number.
+    **
+    ** ^The sqlite3_value_text16() interface extracts a UTF-16 string
+    ** in the native byte-order of the host machine.  ^The
+    ** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
+    ** extract UTF-16 strings as big-endian and little-endian respectively.
+    **
+    ** ^If [sqlite3_value] object V was initialized
+    ** using [sqlite3_bind_pointer(S,I,P,X,D)] or [sqlite3_result_pointer(C,P,X,D)]
+    ** and if X and Y are strings that compare equal according to strcmp(X,Y),
+    ** then sqlite3_value_pointer(V,Y) will return the pointer P.  ^Otherwise,
+    ** sqlite3_value_pointer(V,Y) returns a NULL. The sqlite3_bind_pointer()
+    ** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
+    **
+    ** ^(The sqlite3_value_type(V) interface returns the
+    ** [SQLITE_INTEGER | datatype code] for the initial datatype of the
+    ** [sqlite3_value] object V. The returned value is one of [SQLITE_INTEGER],
+    ** [SQLITE_FLOAT], [SQLITE_TEXT], [SQLITE_BLOB], or [SQLITE_NULL].)^
+    ** Other interfaces might change the datatype for an sqlite3_value object.
+    ** For example, if the datatype is initially SQLITE_INTEGER and
+    ** sqlite3_value_text(V) is called to extract a text value for that
+    ** integer, then subsequent calls to sqlite3_value_type(V) might return
+    ** SQLITE_TEXT.  Whether or not a persistent internal datatype conversion
+    ** occurs is undefined and may change from one release of SQLite to the next.
+    **
+    ** ^(The sqlite3_value_numeric_type() interface attempts to apply
+    ** numeric affinity to the value.  This means that an attempt is
+    ** made to convert the value to an integer or floating point.  If
+    ** such a conversion is possible without loss of information (in other
+    ** words, if the value is a string that looks like a number)
+    ** then the conversion is performed.  Otherwise no conversion occurs.
+    ** The [SQLITE_INTEGER | datatype] after conversion is returned.)^
+    **
+    ** ^Within the [xUpdate] method of a [virtual table], the
+    ** sqlite3_value_nochange(X) interface returns true if and only if
+    ** the column corresponding to X is unchanged by the UPDATE operation
+    ** that the xUpdate method call was invoked to implement and if
+    ** and the prior [xColumn] method call that was invoked to extracted
+    ** the value for that column returned without setting a result (probably
+    ** because it queried [sqlite3_vtab_nochange()] and found that the column
+    ** was unchanging).  ^Within an [xUpdate] method, any value for which
+    ** sqlite3_value_nochange(X) is true will in all other respects appear
+    ** to be a NULL value.  If sqlite3_value_nochange(X) is invoked anywhere other
+    ** than within an [xUpdate] method call for an UPDATE statement, then
+    ** the return value is arbitrary and meaningless.
+    **
+    ** ^The sqlite3_value_frombind(X) interface returns non-zero if the
+    ** value X originated from one of the [sqlite3_bind_int|sqlite3_bind()]
+    ** interfaces.  ^If X comes from an SQL literal value, or a table column,
+    ** or an expression, then sqlite3_value_frombind(X) returns zero.
+    **
+    ** Please pay particular attention to the fact that the pointer returned
+    ** from [sqlite3_value_blob()], [sqlite3_value_text()], or
+    ** [sqlite3_value_text16()] can be invalidated by a subsequent call to
+    ** [sqlite3_value_bytes()], [sqlite3_value_bytes16()], [sqlite3_value_text()],
+    ** or [sqlite3_value_text16()].
+    **
+    ** These routines must be called from the same thread as
+    ** the SQL function that supplied the [sqlite3_value*] parameters.
+    **
+    ** As long as the input parameter is correct, these routines can only
+    ** fail if an out-of-memory error occurs during a format conversion.
+    ** Only the following subset of interfaces are subject to out-of-memory
+    ** errors:
+    **
+    ** <ul>
+    ** <li> sqlite3_value_blob()
+    ** <li> sqlite3_value_text()
+    ** <li> sqlite3_value_text16()
+    ** <li> sqlite3_value_text16le()
+    ** <li> sqlite3_value_text16be()
+    ** <li> sqlite3_value_bytes()
+    ** <li> sqlite3_value_bytes16()
+    ** </ul>
+    **
+    ** If an out-of-memory error occurs, then the return value from these
+    ** routines is the same as if the column had contained an SQL NULL value.
+    ** Valid SQL NULL returns can be distinguished from out-of-memory errors
+    ** by invoking the [sqlite3_errcode()] immediately after the suspect
+    ** return value is obtained and before any
+    ** other SQLite interface is called on the same [database connection].
+    */
+    SQLITE_API const void* sqlite3_value_blob(sqlite3_value*);
+    SQLITE_API double sqlite3_value_double(sqlite3_value*);
+    SQLITE_API int sqlite3_value_int(sqlite3_value*);
+    SQLITE_API sqlite3_int64 sqlite3_value_int64(sqlite3_value*);
+    SQLITE_API void* sqlite3_value_pointer(sqlite3_value*, const char*);
+    SQLITE_API const unsigned char* sqlite3_value_text(sqlite3_value*);
+    SQLITE_API const void* sqlite3_value_text16(sqlite3_value*);
+    SQLITE_API const void* sqlite3_value_text16le(sqlite3_value*);
+    SQLITE_API const void* sqlite3_value_text16be(sqlite3_value*);
+    SQLITE_API int sqlite3_value_bytes(sqlite3_value*);
+    SQLITE_API int sqlite3_value_bytes16(sqlite3_value*);
+    SQLITE_API int sqlite3_value_type(sqlite3_value*);
+    SQLITE_API int sqlite3_value_numeric_type(sqlite3_value*);
+    SQLITE_API int sqlite3_value_nochange(sqlite3_value*);
+    SQLITE_API int sqlite3_value_frombind(sqlite3_value*);
+
+    /*
+    ** CAPI3REF: Finding The Subtype Of SQL Values
+    ** METHOD: sqlite3_value
+    **
+    ** The sqlite3_value_subtype(V) function returns the subtype for
+    ** an [application-defined SQL function] argument V.  The subtype
+    ** information can be used to pass a limited amount of context from
+    ** one SQL function to another.  Use the [sqlite3_result_subtype()]
+    ** routine to set the subtype for the return value of an SQL function.
+    */
+    SQLITE_API unsigned int sqlite3_value_subtype(sqlite3_value*);
+
+    /*
+    ** CAPI3REF: Copy And Free SQL Values
+    ** METHOD: sqlite3_value
+    **
+    ** ^The sqlite3_value_dup(V) interface makes a copy of the [sqlite3_value]
+    ** object D and returns a pointer to that copy.  ^The [sqlite3_value] returned
+    ** is a [protected sqlite3_value] object even if the input is not.
+    ** ^The sqlite3_value_dup(V) interface returns NULL if V is NULL or if a
+    ** memory allocation fails.
+    **
+    ** ^The sqlite3_value_free(V) interface frees an [sqlite3_value] object
+    ** previously obtained from [sqlite3_value_dup()].  ^If V is a NULL pointer
+    ** then sqlite3_value_free(V) is a harmless no-op.
+    */
+    SQLITE_API sqlite3_value* sqlite3_value_dup(const sqlite3_value*);
+    SQLITE_API void sqlite3_value_free(sqlite3_value*);
+
+    /*
+    ** CAPI3REF: Obtain Aggregate Function Context
+    ** METHOD: sqlite3_context
+    **
+    ** Implementations of aggregate SQL functions use this
+    ** routine to allocate memory for storing their state.
+    **
+    ** ^The first time the sqlite3_aggregate_context(C,N) routine is called
+    ** for a particular aggregate function, SQLite allocates
+    ** N bytes of memory, zeroes out that memory, and returns a pointer
+    ** to the new memory. ^On second and subsequent calls to
+    ** sqlite3_aggregate_context() for the same aggregate function instance,
+    ** the same buffer is returned.  Sqlite3_aggregate_context() is normally
+    ** called once for each invocation of the xStep callback and then one
+    ** last time when the xFinal callback is invoked.  ^(When no rows match
+    ** an aggregate query, the xStep() callback of the aggregate function
+    ** implementation is never called and xFinal() is called exactly once.
+    ** In those cases, sqlite3_aggregate_context() might be called for the
+    ** first time from within xFinal().)^
+    **
+    ** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
+    ** when first called if N is less than or equal to zero or if a memory
+    ** allocate error occurs.
+    **
+    ** ^(The amount of space allocated by sqlite3_aggregate_context(C,N) is
+    ** determined by the N parameter on first successful call.  Changing the
+    ** value of N in any subsequent call to sqlite3_aggregate_context() within
+    ** the same aggregate function instance will not resize the memory
+    ** allocation.)^  Within the xFinal callback, it is customary to set
+    ** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
+    ** pointless memory allocations occur.
+    **
+    ** ^SQLite automatically frees the memory allocated by
+    ** sqlite3_aggregate_context() when the aggregate query concludes.
+    **
+    ** The first parameter must be a copy of the
+    ** [sqlite3_context | SQL function context] that is the first parameter
+    ** to the xStep or xFinal callback routine that implements the aggregate
+    ** function.
+    **
+    ** This routine must be called from the same thread in which
+    ** the aggregate SQL function is running.
+    */
+    SQLITE_API void* sqlite3_aggregate_context(sqlite3_context*, int nBytes);
+
+    /*
+    ** CAPI3REF: User Data For Functions
+    ** METHOD: sqlite3_context
+    **
+    ** ^The sqlite3_user_data() interface returns a copy of
+    ** the pointer that was the pUserData parameter (the 5th parameter)
+    ** of the [sqlite3_create_function()]
+    ** and [sqlite3_create_function16()] routines that originally
+    ** registered the application defined function.
+    **
+    ** This routine must be called from the same thread in which
+    ** the application-defined function is running.
+    */
+    SQLITE_API void* sqlite3_user_data(sqlite3_context*);
+
+    /*
+    ** CAPI3REF: Database Connection For Functions
+    ** METHOD: sqlite3_context
+    **
+    ** ^The sqlite3_context_db_handle() interface returns a copy of
+    ** the pointer to the [database connection] (the 1st parameter)
+    ** of the [sqlite3_create_function()]
+    ** and [sqlite3_create_function16()] routines that originally
+    ** registered the application defined function.
+    */
+    SQLITE_API sqlite3* sqlite3_context_db_handle(sqlite3_context*);
+
+    /*
+    ** CAPI3REF: Function Auxiliary Data
+    ** METHOD: sqlite3_context
+    **
+    ** These functions may be used by (non-aggregate) SQL functions to
+    ** associate metadata with argument values. If the same value is passed to
+    ** multiple invocations of the same SQL function during query execution, under
+    ** some circumstances the associated metadata may be preserved.  An example
+    ** of where this might be useful is in a regular-expression matching
+    ** function. The compiled version of the regular expression can be stored as
+    ** metadata associated with the pattern string.
+    ** Then as long as the pattern string remains the same,
+    ** the compiled regular expression can be reused on multiple
+    ** invocations of the same function.
+    **
+    ** ^The sqlite3_get_auxdata(C,N) interface returns a pointer to the metadata
+    ** associated by the sqlite3_set_auxdata(C,N,P,X) function with the Nth argument
+    ** value to the application-defined function.  ^N is zero for the left-most
+    ** function argument.  ^If there is no metadata
+    ** associated with the function argument, the sqlite3_get_auxdata(C,N) interface
+    ** returns a NULL pointer.
+    **
+    ** ^The sqlite3_set_auxdata(C,N,P,X) interface saves P as metadata for the N-th
+    ** argument of the application-defined function.  ^Subsequent
+    ** calls to sqlite3_get_auxdata(C,N) return P from the most recent
+    ** sqlite3_set_auxdata(C,N,P,X) call if the metadata is still valid or
+    ** NULL if the metadata has been discarded.
+    ** ^After each call to sqlite3_set_auxdata(C,N,P,X) where X is not NULL,
+    ** SQLite will invoke the destructor function X with parameter P exactly
+    ** once, when the metadata is discarded.
+    ** SQLite is free to discard the metadata at any time, including: <ul>
+    ** <li> ^(when the corresponding function parameter changes)^, or
+    ** <li> ^(when [sqlite3_reset()] or [sqlite3_finalize()] is called for the
+    **      SQL statement)^, or
+    ** <li> ^(when sqlite3_set_auxdata() is invoked again on the same
+    **       parameter)^, or
+    ** <li> ^(during the original sqlite3_set_auxdata() call when a memory
+    **      allocation error occurs.)^ </ul>
+    **
+    ** Note the last bullet in particular.  The destructor X in
+    ** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
+    ** sqlite3_set_auxdata() interface even returns.  Hence sqlite3_set_auxdata()
+    ** should be called near the end of the function implementation and the
+    ** function implementation should not make any use of P after
+    ** sqlite3_set_auxdata() has been called.
+    **
+    ** ^(In practice, metadata is preserved between function calls for
+    ** function parameters that are compile-time constants, including literal
+    ** values and [parameters] and expressions composed from the same.)^
+    **
+    ** The value of the N parameter to these interfaces should be non-negative.
+    ** Future enhancements may make use of negative N values to define new
+    ** kinds of function caching behavior.
+    **
+    ** These routines must be called from the same thread in which
+    ** the SQL function is running.
+    */
+    SQLITE_API void* sqlite3_get_auxdata(sqlite3_context*, int N);
+    SQLITE_API void sqlite3_set_auxdata(sqlite3_context*, int N, void*, void (*)(void*));
+
+    /*
+    ** CAPI3REF: Constants Defining Special Destructor Behavior
+    **
+    ** These are special values for the destructor that is passed in as the
+    ** final argument to routines like [sqlite3_result_blob()].  ^If the destructor
+    ** argument is SQLITE_STATIC, it means that the content pointer is constant
+    ** and will never change.  It does not need to be destroyed.  ^The
+    ** SQLITE_TRANSIENT value means that the content will likely change in
+    ** the near future and that SQLite should make its own private copy of
+    ** the content before returning.
+    **
+    ** The typedef is necessary to work around problems in certain
+    ** C++ compilers.
+    */
+    typedef void (*sqlite3_destructor_type)(void*);
+#define SQLITE_STATIC ((sqlite3_destructor_type)0)
+#define SQLITE_TRANSIENT ((sqlite3_destructor_type)-1)
+
+    /*
+    ** CAPI3REF: Setting The Result Of An SQL Function
+    ** METHOD: sqlite3_context
+    **
+    ** These routines are used by the xFunc or xFinal callbacks that
+    ** implement SQL functions and aggregates.  See
+    ** [sqlite3_create_function()] and [sqlite3_create_function16()]
+    ** for additional information.
+    **
+    ** These functions work very much like the [parameter binding] family of
+    ** functions used to bind values to host parameters in prepared statements.
+    ** Refer to the [SQL parameter] documentation for additional information.
+    **
+    ** ^The sqlite3_result_blob() interface sets the result from
+    ** an application-defined function to be the BLOB whose content is pointed
+    ** to by the second parameter and which is N bytes long where N is the
+    ** third parameter.
+    **
+    ** ^The sqlite3_result_zeroblob(C,N) and sqlite3_result_zeroblob64(C,N)
+    ** interfaces set the result of the application-defined function to be
+    ** a BLOB containing all zero bytes and N bytes in size.
+    **
+    ** ^The sqlite3_result_double() interface sets the result from
+    ** an application-defined function to be a floating point value specified
+    ** by its 2nd argument.
+    **
+    ** ^The sqlite3_result_error() and sqlite3_result_error16() functions
+    ** cause the implemented SQL function to throw an exception.
+    ** ^SQLite uses the string pointed to by the
+    ** 2nd parameter of sqlite3_result_error() or sqlite3_result_error16()
+    ** as the text of an error message.  ^SQLite interprets the error
+    ** message string from sqlite3_result_error() as UTF-8. ^SQLite
+    ** interprets the string from sqlite3_result_error16() as UTF-16 using
+    ** the same [byte-order determination rules] as [sqlite3_bind_text16()].
+    ** ^If the third parameter to sqlite3_result_error()
+    ** or sqlite3_result_error16() is negative then SQLite takes as the error
+    ** message all text up through the first zero character.
+    ** ^If the third parameter to sqlite3_result_error() or
+    ** sqlite3_result_error16() is non-negative then SQLite takes that many
+    ** bytes (not characters) from the 2nd parameter as the error message.
+    ** ^The sqlite3_result_error() and sqlite3_result_error16()
+    ** routines make a private copy of the error message text before
+    ** they return.  Hence, the calling function can deallocate or
+    ** modify the text after they return without harm.
+    ** ^The sqlite3_result_error_code() function changes the error code
+    ** returned by SQLite as a result of an error in a function.  ^By default,
+    ** the error code is SQLITE_ERROR.  ^A subsequent call to sqlite3_result_error()
+    ** or sqlite3_result_error16() resets the error code to SQLITE_ERROR.
+    **
+    ** ^The sqlite3_result_error_toobig() interface causes SQLite to throw an
+    ** error indicating that a string or BLOB is too long to represent.
+    **
+    ** ^The sqlite3_result_error_nomem() interface causes SQLite to throw an
+    ** error indicating that a memory allocation failed.
+    **
+    ** ^The sqlite3_result_int() interface sets the return value
+    ** of the application-defined function to be the 32-bit signed integer
+    ** value given in the 2nd argument.
+    ** ^The sqlite3_result_int64() interface sets the return value
+    ** of the application-defined function to be the 64-bit signed integer
+    ** value given in the 2nd argument.
+    **
+    ** ^The sqlite3_result_null() interface sets the return value
+    ** of the application-defined function to be NULL.
+    **
+    ** ^The sqlite3_result_text(), sqlite3_result_text16(),
+    ** sqlite3_result_text16le(), and sqlite3_result_text16be() interfaces
+    ** set the return value of the application-defined function to be
+    ** a text string which is represented as UTF-8, UTF-16 native byte order,
+    ** UTF-16 little endian, or UTF-16 big endian, respectively.
+    ** ^The sqlite3_result_text64() interface sets the return value of an
+    ** application-defined function to be a text string in an encoding
+    ** specified by the fifth (and last) parameter, which must be one
+    ** of [SQLITE_UTF8], [SQLITE_UTF16], [SQLITE_UTF16BE], or [SQLITE_UTF16LE].
+    ** ^SQLite takes the text result from the application from
+    ** the 2nd parameter of the sqlite3_result_text* interfaces.
+    ** ^If the 3rd parameter to the sqlite3_result_text* interfaces
+    ** is negative, then SQLite takes result text from the 2nd parameter
+    ** through the first zero character.
+    ** ^If the 3rd parameter to the sqlite3_result_text* interfaces
+    ** is non-negative, then as many bytes (not characters) of the text
+    ** pointed to by the 2nd parameter are taken as the application-defined
+    ** function result.  If the 3rd parameter is non-negative, then it
+    ** must be the byte offset into the string where the NUL terminator would
+    ** appear if the string where NUL terminated.  If any NUL characters occur
+    ** in the string at a byte offset that is less than the value of the 3rd
+    ** parameter, then the resulting string will contain embedded NULs and the
+    ** result of expressions operating on strings with embedded NULs is undefined.
+    ** ^If the 4th parameter to the sqlite3_result_text* interfaces
+    ** or sqlite3_result_blob is a non-NULL pointer, then SQLite calls that
+    ** function as the destructor on the text or BLOB result when it has
+    ** finished using that result.
+    ** ^If the 4th parameter to the sqlite3_result_text* interfaces or to
+    ** sqlite3_result_blob is the special constant SQLITE_STATIC, then SQLite
+    ** assumes that the text or BLOB result is in constant space and does not
+    ** copy the content of the parameter nor call a destructor on the content
+    ** when it has finished using that result.
+    ** ^If the 4th parameter to the sqlite3_result_text* interfaces
+    ** or sqlite3_result_blob is the special constant SQLITE_TRANSIENT
+    ** then SQLite makes a copy of the result into space obtained
+    ** from [sqlite3_malloc()] before it returns.
+    **
+    ** ^For the sqlite3_result_text16(), sqlite3_result_text16le(), and
+    ** sqlite3_result_text16be() routines, and for sqlite3_result_text64()
+    ** when the encoding is not UTF8, if the input UTF16 begins with a
+    ** byte-order mark (BOM, U+FEFF) then the BOM is removed from the
+    ** string and the rest of the string is interpreted according to the
+    ** byte-order specified by the BOM.  ^The byte-order specified by
+    ** the BOM at the beginning of the text overrides the byte-order
+    ** specified by the interface procedure.  ^So, for example, if
+    ** sqlite3_result_text16le() is invoked with text that begins
+    ** with bytes 0xfe, 0xff (a big-endian byte-order mark) then the
+    ** first two bytes of input are skipped and the remaining input
+    ** is interpreted as UTF16BE text.
+    **
+    ** ^For UTF16 input text to the sqlite3_result_text16(),
+    ** sqlite3_result_text16be(), sqlite3_result_text16le(), and
+    ** sqlite3_result_text64() routines, if the text contains invalid
+    ** UTF16 characters, the invalid characters might be converted
+    ** into the unicode replacement character, U+FFFD.
+    **
+    ** ^The sqlite3_result_value() interface sets the result of
+    ** the application-defined function to be a copy of the
+    ** [unprotected sqlite3_value] object specified by the 2nd parameter.  ^The
+    ** sqlite3_result_value() interface makes a copy of the [sqlite3_value]
+    ** so that the [sqlite3_value] specified in the parameter may change or
+    ** be deallocated after sqlite3_result_value() returns without harm.
+    ** ^A [protected sqlite3_value] object may always be used where an
+    ** [unprotected sqlite3_value] object is required, so either
+    ** kind of [sqlite3_value] object can be used with this interface.
+    **
+    ** ^The sqlite3_result_pointer(C,P,T,D) interface sets the result to an
+    ** SQL NULL value, just like [sqlite3_result_null(C)], except that it
+    ** also associates the host-language pointer P or type T with that
+    ** NULL value such that the pointer can be retrieved within an
+    ** [application-defined SQL function] using [sqlite3_value_pointer()].
+    ** ^If the D parameter is not NULL, then it is a pointer to a destructor
+    ** for the P parameter.  ^SQLite invokes D with P as its only argument
+    ** when SQLite is finished with P.  The T parameter should be a static
+    ** string and preferably a string literal. The sqlite3_result_pointer()
+    ** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
+    **
+    ** If these routines are called from within the different thread
+    ** than the one containing the application-defined function that received
+    ** the [sqlite3_context] pointer, the results are undefined.
+    */
+    SQLITE_API void sqlite3_result_blob(sqlite3_context*, const void*, int, void (*)(void*));
+    SQLITE_API void sqlite3_result_blob64(sqlite3_context*, const void*, sqlite3_uint64, void (*)(void*));
+    SQLITE_API void sqlite3_result_double(sqlite3_context*, double);
+    SQLITE_API void sqlite3_result_error(sqlite3_context*, const char*, int);
+    SQLITE_API void sqlite3_result_error16(sqlite3_context*, const void*, int);
+    SQLITE_API void sqlite3_result_error_toobig(sqlite3_context*);
+    SQLITE_API void sqlite3_result_error_nomem(sqlite3_context*);
+    SQLITE_API void sqlite3_result_error_code(sqlite3_context*, int);
+    SQLITE_API void sqlite3_result_int(sqlite3_context*, int);
+    SQLITE_API void sqlite3_result_int64(sqlite3_context*, sqlite3_int64);
+    SQLITE_API void sqlite3_result_null(sqlite3_context*);
+    SQLITE_API void sqlite3_result_text(sqlite3_context*, const char*, int, void (*)(void*));
+    SQLITE_API void
+      sqlite3_result_text64(sqlite3_context*, const char*, sqlite3_uint64, void (*)(void*), unsigned char encoding);
+    SQLITE_API void sqlite3_result_text16(sqlite3_context*, const void*, int, void (*)(void*));
+    SQLITE_API void sqlite3_result_text16le(sqlite3_context*, const void*, int, void (*)(void*));
+    SQLITE_API void sqlite3_result_text16be(sqlite3_context*, const void*, int, void (*)(void*));
+    SQLITE_API void sqlite3_result_value(sqlite3_context*, sqlite3_value*);
+    SQLITE_API void sqlite3_result_pointer(sqlite3_context*, void*, const char*, void (*)(void*));
+    SQLITE_API void sqlite3_result_zeroblob(sqlite3_context*, int n);
+    SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
+
+    /*
+    ** CAPI3REF: Setting The Subtype Of An SQL Function
+    ** METHOD: sqlite3_context
+    **
+    ** The sqlite3_result_subtype(C,T) function causes the subtype of
+    ** the result from the [application-defined SQL function] with
+    ** [sqlite3_context] C to be the value T.  Only the lower 8 bits
+    ** of the subtype T are preserved in current versions of SQLite;
+    ** higher order bits are discarded.
+    ** The number of subtype bytes preserved by SQLite might increase
+    ** in future releases of SQLite.
+    */
+    SQLITE_API void sqlite3_result_subtype(sqlite3_context*, unsigned int);
+
+    /*
+    ** CAPI3REF: Define New Collating Sequences
+    ** METHOD: sqlite3
+    **
+    ** ^These functions add, remove, or modify a [collation] associated
+    ** with the [database connection] specified as the first argument.
+    **
+    ** ^The name of the collation is a UTF-8 string
+    ** for sqlite3_create_collation() and sqlite3_create_collation_v2()
+    ** and a UTF-16 string in native byte order for sqlite3_create_collation16().
+    ** ^Collation names that compare equal according to [sqlite3_strnicmp()] are
+    ** considered to be the same name.
+    **
+    ** ^(The third argument (eTextRep) must be one of the constants:
+    ** <ul>
+    ** <li> [SQLITE_UTF8],
+    ** <li> [SQLITE_UTF16LE],
+    ** <li> [SQLITE_UTF16BE],
+    ** <li> [SQLITE_UTF16], or
+    ** <li> [SQLITE_UTF16_ALIGNED].
+    ** </ul>)^
+    ** ^The eTextRep argument determines the encoding of strings passed
+    ** to the collating function callback, xCompare.
+    ** ^The [SQLITE_UTF16] and [SQLITE_UTF16_ALIGNED] values for eTextRep
+    ** force strings to be UTF16 with native byte order.
+    ** ^The [SQLITE_UTF16_ALIGNED] value for eTextRep forces strings to begin
+    ** on an even byte address.
+    **
+    ** ^The fourth argument, pArg, is an application data pointer that is passed
+    ** through as the first argument to the collating function callback.
+    **
+    ** ^The fifth argument, xCompare, is a pointer to the collating function.
+    ** ^Multiple collating functions can be registered using the same name but
+    ** with different eTextRep parameters and SQLite will use whichever
+    ** function requires the least amount of data transformation.
+    ** ^If the xCompare argument is NULL then the collating function is
+    ** deleted.  ^When all collating functions having the same name are deleted,
+    ** that collation is no longer usable.
+    **
+    ** ^The collating function callback is invoked with a copy of the pArg
+    ** application data pointer and with two strings in the encoding specified
+    ** by the eTextRep argument.  The two integer parameters to the collating
+    ** function callback are the length of the two strings, in bytes. The collating
+    ** function must return an integer that is negative, zero, or positive
+    ** if the first string is less than, equal to, or greater than the second,
+    ** respectively.  A collating function must always return the same answer
+    ** given the same inputs.  If two or more collating functions are registered
+    ** to the same collation name (using different eTextRep values) then all
+    ** must give an equivalent answer when invoked with equivalent strings.
+    ** The collating function must obey the following properties for all
+    ** strings A, B, and C:
+    **
+    ** <ol>
+    ** <li> If A==B then B==A.
+    ** <li> If A==B and B==C then A==C.
+    ** <li> If A&lt;B THEN B&gt;A.
+    ** <li> If A&lt;B and B&lt;C then A&lt;C.
+    ** </ol>
+    **
+    ** If a collating function fails any of the above constraints and that
+    ** collating function is registered and used, then the behavior of SQLite
+    ** is undefined.
+    **
+    ** ^The sqlite3_create_collation_v2() works like sqlite3_create_collation()
+    ** with the addition that the xDestroy callback is invoked on pArg when
+    ** the collating function is deleted.
+    ** ^Collating functions are deleted when they are overridden by later
+    ** calls to the collation creation functions or when the
+    ** [database connection] is closed using [sqlite3_close()].
+    **
+    ** ^The xDestroy callback is <u>not</u> called if the
+    ** sqlite3_create_collation_v2() function fails.  Applications that invoke
+    ** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should
+    ** check the return code and dispose of the application data pointer
+    ** themselves rather than expecting SQLite to deal with it for them.
+    ** This is different from every other SQLite interface.  The inconsistency
+    ** is unfortunate but cannot be changed without breaking backwards
+    ** compatibility.
+    **
+    ** See also:  [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
+    */
+    SQLITE_API int sqlite3_create_collation(sqlite3*,
+                                            const char* zName,
+                                            int eTextRep,
+                                            void* pArg,
+                                            int (*xCompare)(void*, int, const void*, int, const void*));
+    SQLITE_API int sqlite3_create_collation_v2(sqlite3*,
+                                               const char* zName,
+                                               int eTextRep,
+                                               void* pArg,
+                                               int (*xCompare)(void*, int, const void*, int, const void*),
+                                               void (*xDestroy)(void*));
+    SQLITE_API int sqlite3_create_collation16(sqlite3*,
+                                              const void* zName,
+                                              int eTextRep,
+                                              void* pArg,
+                                              int (*xCompare)(void*, int, const void*, int, const void*));
+
+    /*
+    ** CAPI3REF: Collation Needed Callbacks
+    ** METHOD: sqlite3
+    **
+    ** ^To avoid having to register all collation sequences before a database
+    ** can be used, a single callback function may be registered with the
+    ** [database connection] to be invoked whenever an undefined collation
+    ** sequence is required.
+    **
+    ** ^If the function is registered using the sqlite3_collation_needed() API,
+    ** then it is passed the names of undefined collation sequences as strings
+    ** encoded in UTF-8. ^If sqlite3_collation_needed16() is used,
+    ** the names are passed as UTF-16 in machine native byte order.
+    ** ^A call to either function replaces the existing collation-needed callback.
+    **
+    ** ^(When the callback is invoked, the first argument passed is a copy
+    ** of the second argument to sqlite3_collation_needed() or
+    ** sqlite3_collation_needed16().  The second argument is the database
+    ** connection.  The third argument is one of [SQLITE_UTF8], [SQLITE_UTF16BE],
+    ** or [SQLITE_UTF16LE], indicating the most desirable form of the collation
+    ** sequence function required.  The fourth parameter is the name of the
+    ** required collation sequence.)^
+    **
+    ** The callback function should register the desired collation using
+    ** [sqlite3_create_collation()], [sqlite3_create_collation16()], or
+    ** [sqlite3_create_collation_v2()].
+    */
+    SQLITE_API int sqlite3_collation_needed(sqlite3*, void*, void (*)(void*, sqlite3*, int eTextRep, const char*));
+    SQLITE_API int sqlite3_collation_needed16(sqlite3*, void*, void (*)(void*, sqlite3*, int eTextRep, const void*));
 
 #ifdef SQLITE_ENABLE_CEROD
-/*
-** Specify the activation key for a CEROD database.  Unless
-** activated, none of the CEROD routines will work.
-*/
-SQLITE_API void sqlite3_activate_cerod(
-  const char *zPassPhrase        /* Activation phrase */
-);
+    /*
+    ** Specify the activation key for a CEROD database.  Unless
+    ** activated, none of the CEROD routines will work.
+    */
+    SQLITE_API void sqlite3_activate_cerod(const char* zPassPhrase /* Activation phrase */
+    );
 #endif
 
-/*
-** CAPI3REF: Suspend Execution For A Short Time
-**
-** The sqlite3_sleep() function causes the current thread to suspend execution
-** for at least a number of milliseconds specified in its parameter.
-**
-** If the operating system does not support sleep requests with
-** millisecond time resolution, then the time will be rounded up to
-** the nearest second. The number of milliseconds of sleep actually
-** requested from the operating system is returned.
-**
-** ^SQLite implements this interface by calling the xSleep()
-** method of the default [sqlite3_vfs] object.  If the xSleep() method
-** of the default VFS is not implemented correctly, or not implemented at
-** all, then the behavior of sqlite3_sleep() may deviate from the description
-** in the previous paragraphs.
-*/
-SQLITE_API int sqlite3_sleep(int);
-
-/*
-** CAPI3REF: Name Of The Folder Holding Temporary Files
-**
-** ^(If this global variable is made to point to a string which is
-** the name of a folder (a.k.a. directory), then all temporary files
-** created by SQLite when using a built-in [sqlite3_vfs | VFS]
-** will be placed in that directory.)^  ^If this variable
-** is a NULL pointer, then SQLite performs a search for an appropriate
-** temporary file directory.
-**
-** Applications are strongly discouraged from using this global variable.
-** It is required to set a temporary folder on Windows Runtime (WinRT).
-** But for all other platforms, it is highly recommended that applications
-** neither read nor write this variable.  This global variable is a relic
-** that exists for backwards compatibility of legacy applications and should
-** be avoided in new projects.
-**
-** It is not safe to read or modify this variable in more than one
-** thread at a time.  It is not safe to read or modify this variable
-** if a [database connection] is being used at the same time in a separate
-** thread.
-** It is intended that this variable be set once
-** as part of process initialization and before any SQLite interface
-** routines have been called and that this variable remain unchanged
-** thereafter.
-**
-** ^The [temp_store_directory pragma] may modify this variable and cause
-** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
-** the [temp_store_directory pragma] always assumes that any string
-** that this variable points to is held in memory obtained from
-** [sqlite3_malloc] and the pragma may attempt to free that memory
-** using [sqlite3_free].
-** Hence, if this variable is modified directly, either it should be
-** made NULL or made to point to memory obtained from [sqlite3_malloc]
-** or else the use of the [temp_store_directory pragma] should be avoided.
-** Except when requested by the [temp_store_directory pragma], SQLite
-** does not free the memory that sqlite3_temp_directory points to.  If
-** the application wants that memory to be freed, it must do
-** so itself, taking care to only do so after all [database connection]
-** objects have been destroyed.
-**
-** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
-** prior to calling [sqlite3_open] or [sqlite3_open_v2].  Otherwise, various
-** features that require the use of temporary files may fail.  Here is an
-** example of how to do this using C++ with the Windows Runtime:
-**
-** <blockquote><pre>
-** LPCWSTR zPath = Windows::Storage::ApplicationData::Current->
-** &nbsp;     TemporaryFolder->Path->Data();
-** char zPathBuf&#91;MAX_PATH + 1&#93;;
-** memset(zPathBuf, 0, sizeof(zPathBuf));
-** WideCharToMultiByte(CP_UTF8, 0, zPath, -1, zPathBuf, sizeof(zPathBuf),
-** &nbsp;     NULL, NULL);
-** sqlite3_temp_directory = sqlite3_mprintf("%s", zPathBuf);
-** </pre></blockquote>
-*/
-SQLITE_API SQLITE_EXTERN char *sqlite3_temp_directory;
-
-/*
-** CAPI3REF: Name Of The Folder Holding Database Files
-**
-** ^(If this global variable is made to point to a string which is
-** the name of a folder (a.k.a. directory), then all database files
-** specified with a relative pathname and created or accessed by
-** SQLite when using a built-in windows [sqlite3_vfs | VFS] will be assumed
-** to be relative to that directory.)^ ^If this variable is a NULL
-** pointer, then SQLite assumes that all database files specified
-** with a relative pathname are relative to the current directory
-** for the process.  Only the windows VFS makes use of this global
-** variable; it is ignored by the unix VFS.
-**
-** Changing the value of this variable while a database connection is
-** open can result in a corrupt database.
-**
-** It is not safe to read or modify this variable in more than one
-** thread at a time.  It is not safe to read or modify this variable
-** if a [database connection] is being used at the same time in a separate
-** thread.
-** It is intended that this variable be set once
-** as part of process initialization and before any SQLite interface
-** routines have been called and that this variable remain unchanged
-** thereafter.
-**
-** ^The [data_store_directory pragma] may modify this variable and cause
-** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
-** the [data_store_directory pragma] always assumes that any string
-** that this variable points to is held in memory obtained from
-** [sqlite3_malloc] and the pragma may attempt to free that memory
-** using [sqlite3_free].
-** Hence, if this variable is modified directly, either it should be
-** made NULL or made to point to memory obtained from [sqlite3_malloc]
-** or else the use of the [data_store_directory pragma] should be avoided.
-*/
-SQLITE_API SQLITE_EXTERN char *sqlite3_data_directory;
-
-/*
-** CAPI3REF: Win32 Specific Interface
-**
-** These interfaces are available only on Windows.  The
-** [sqlite3_win32_set_directory] interface is used to set the value associated
-** with the [sqlite3_temp_directory] or [sqlite3_data_directory] variable, to
-** zValue, depending on the value of the type parameter.  The zValue parameter
-** should be NULL to cause the previous value to be freed via [sqlite3_free];
-** a non-NULL value will be copied into memory obtained from [sqlite3_malloc]
-** prior to being used.  The [sqlite3_win32_set_directory] interface returns
-** [SQLITE_OK] to indicate success, [SQLITE_ERROR] if the type is unsupported,
-** or [SQLITE_NOMEM] if memory could not be allocated.  The value of the
-** [sqlite3_data_directory] variable is intended to act as a replacement for
-** the current directory on the sub-platforms of Win32 where that concept is
-** not present, e.g. WinRT and UWP.  The [sqlite3_win32_set_directory8] and
-** [sqlite3_win32_set_directory16] interfaces behave exactly the same as the
-** sqlite3_win32_set_directory interface except the string parameter must be
-** UTF-8 or UTF-16, respectively.
-*/
-SQLITE_API int sqlite3_win32_set_directory(
-  unsigned long type, /* Identifier for directory being set or reset */
-  void *zValue        /* New value for directory being set or reset */
-);
-SQLITE_API int sqlite3_win32_set_directory8(unsigned long type, const char *zValue);
-SQLITE_API int sqlite3_win32_set_directory16(unsigned long type, const void *zValue);
+    /*
+    ** CAPI3REF: Suspend Execution For A Short Time
+    **
+    ** The sqlite3_sleep() function causes the current thread to suspend execution
+    ** for at least a number of milliseconds specified in its parameter.
+    **
+    ** If the operating system does not support sleep requests with
+    ** millisecond time resolution, then the time will be rounded up to
+    ** the nearest second. The number of milliseconds of sleep actually
+    ** requested from the operating system is returned.
+    **
+    ** ^SQLite implements this interface by calling the xSleep()
+    ** method of the default [sqlite3_vfs] object.  If the xSleep() method
+    ** of the default VFS is not implemented correctly, or not implemented at
+    ** all, then the behavior of sqlite3_sleep() may deviate from the description
+    ** in the previous paragraphs.
+    */
+    SQLITE_API int sqlite3_sleep(int);
+
+    /*
+    ** CAPI3REF: Name Of The Folder Holding Temporary Files
+    **
+    ** ^(If this global variable is made to point to a string which is
+    ** the name of a folder (a.k.a. directory), then all temporary files
+    ** created by SQLite when using a built-in [sqlite3_vfs | VFS]
+    ** will be placed in that directory.)^  ^If this variable
+    ** is a NULL pointer, then SQLite performs a search for an appropriate
+    ** temporary file directory.
+    **
+    ** Applications are strongly discouraged from using this global variable.
+    ** It is required to set a temporary folder on Windows Runtime (WinRT).
+    ** But for all other platforms, it is highly recommended that applications
+    ** neither read nor write this variable.  This global variable is a relic
+    ** that exists for backwards compatibility of legacy applications and should
+    ** be avoided in new projects.
+    **
+    ** It is not safe to read or modify this variable in more than one
+    ** thread at a time.  It is not safe to read or modify this variable
+    ** if a [database connection] is being used at the same time in a separate
+    ** thread.
+    ** It is intended that this variable be set once
+    ** as part of process initialization and before any SQLite interface
+    ** routines have been called and that this variable remain unchanged
+    ** thereafter.
+    **
+    ** ^The [temp_store_directory pragma] may modify this variable and cause
+    ** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
+    ** the [temp_store_directory pragma] always assumes that any string
+    ** that this variable points to is held in memory obtained from
+    ** [sqlite3_malloc] and the pragma may attempt to free that memory
+    ** using [sqlite3_free].
+    ** Hence, if this variable is modified directly, either it should be
+    ** made NULL or made to point to memory obtained from [sqlite3_malloc]
+    ** or else the use of the [temp_store_directory pragma] should be avoided.
+    ** Except when requested by the [temp_store_directory pragma], SQLite
+    ** does not free the memory that sqlite3_temp_directory points to.  If
+    ** the application wants that memory to be freed, it must do
+    ** so itself, taking care to only do so after all [database connection]
+    ** objects have been destroyed.
+    **
+    ** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
+    ** prior to calling [sqlite3_open] or [sqlite3_open_v2].  Otherwise, various
+    ** features that require the use of temporary files may fail.  Here is an
+    ** example of how to do this using C++ with the Windows Runtime:
+    **
+    ** <blockquote><pre>
+    ** LPCWSTR zPath = Windows::Storage::ApplicationData::Current->
+    ** &nbsp;     TemporaryFolder->Path->Data();
+    ** char zPathBuf&#91;MAX_PATH + 1&#93;;
+    ** memset(zPathBuf, 0, sizeof(zPathBuf));
+    ** WideCharToMultiByte(CP_UTF8, 0, zPath, -1, zPathBuf, sizeof(zPathBuf),
+    ** &nbsp;     NULL, NULL);
+    ** sqlite3_temp_directory = sqlite3_mprintf("%s", zPathBuf);
+    ** </pre></blockquote>
+    */
+    SQLITE_API SQLITE_EXTERN char* sqlite3_temp_directory;
+
+    /*
+    ** CAPI3REF: Name Of The Folder Holding Database Files
+    **
+    ** ^(If this global variable is made to point to a string which is
+    ** the name of a folder (a.k.a. directory), then all database files
+    ** specified with a relative pathname and created or accessed by
+    ** SQLite when using a built-in windows [sqlite3_vfs | VFS] will be assumed
+    ** to be relative to that directory.)^ ^If this variable is a NULL
+    ** pointer, then SQLite assumes that all database files specified
+    ** with a relative pathname are relative to the current directory
+    ** for the process.  Only the windows VFS makes use of this global
+    ** variable; it is ignored by the unix VFS.
+    **
+    ** Changing the value of this variable while a database connection is
+    ** open can result in a corrupt database.
+    **
+    ** It is not safe to read or modify this variable in more than one
+    ** thread at a time.  It is not safe to read or modify this variable
+    ** if a [database connection] is being used at the same time in a separate
+    ** thread.
+    ** It is intended that this variable be set once
+    ** as part of process initialization and before any SQLite interface
+    ** routines have been called and that this variable remain unchanged
+    ** thereafter.
+    **
+    ** ^The [data_store_directory pragma] may modify this variable and cause
+    ** it to point to memory obtained from [sqlite3_malloc].  ^Furthermore,
+    ** the [data_store_directory pragma] always assumes that any string
+    ** that this variable points to is held in memory obtained from
+    ** [sqlite3_malloc] and the pragma may attempt to free that memory
+    ** using [sqlite3_free].
+    ** Hence, if this variable is modified directly, either it should be
+    ** made NULL or made to point to memory obtained from [sqlite3_malloc]
+    ** or else the use of the [data_store_directory pragma] should be avoided.
+    */
+    SQLITE_API SQLITE_EXTERN char* sqlite3_data_directory;
+
+    /*
+    ** CAPI3REF: Win32 Specific Interface
+    **
+    ** These interfaces are available only on Windows.  The
+    ** [sqlite3_win32_set_directory] interface is used to set the value associated
+    ** with the [sqlite3_temp_directory] or [sqlite3_data_directory] variable, to
+    ** zValue, depending on the value of the type parameter.  The zValue parameter
+    ** should be NULL to cause the previous value to be freed via [sqlite3_free];
+    ** a non-NULL value will be copied into memory obtained from [sqlite3_malloc]
+    ** prior to being used.  The [sqlite3_win32_set_directory] interface returns
+    ** [SQLITE_OK] to indicate success, [SQLITE_ERROR] if the type is unsupported,
+    ** or [SQLITE_NOMEM] if memory could not be allocated.  The value of the
+    ** [sqlite3_data_directory] variable is intended to act as a replacement for
+    ** the current directory on the sub-platforms of Win32 where that concept is
+    ** not present, e.g. WinRT and UWP.  The [sqlite3_win32_set_directory8] and
+    ** [sqlite3_win32_set_directory16] interfaces behave exactly the same as the
+    ** sqlite3_win32_set_directory interface except the string parameter must be
+    ** UTF-8 or UTF-16, respectively.
+    */
+    SQLITE_API int sqlite3_win32_set_directory(unsigned long type, /* Identifier for directory being set or reset */
+                                               void* zValue        /* New value for directory being set or reset */
+    );
+    SQLITE_API int sqlite3_win32_set_directory8(unsigned long type, const char* zValue);
+    SQLITE_API int sqlite3_win32_set_directory16(unsigned long type, const void* zValue);
 
 /*
 ** CAPI3REF: Win32 Directory Types
@@ -6231,105 +6182,105 @@ SQLITE_API int sqlite3_win32_set_directory16(unsigned long type, const void *zVa
 ** These macros are only available on Windows.  They define the allowed values
 ** for the type argument to the [sqlite3_win32_set_directory] interface.
 */
-#define SQLITE_WIN32_DATA_DIRECTORY_TYPE  1
-#define SQLITE_WIN32_TEMP_DIRECTORY_TYPE  2
-
-/*
-** CAPI3REF: Test For Auto-Commit Mode
-** KEYWORDS: {autocommit mode}
-** METHOD: sqlite3
-**
-** ^The sqlite3_get_autocommit() interface returns non-zero or
-** zero if the given database connection is or is not in autocommit mode,
-** respectively.  ^Autocommit mode is on by default.
-** ^Autocommit mode is disabled by a [BEGIN] statement.
-** ^Autocommit mode is re-enabled by a [COMMIT] or [ROLLBACK].
-**
-** If certain kinds of errors occur on a statement within a multi-statement
-** transaction (errors including [SQLITE_FULL], [SQLITE_IOERR],
-** [SQLITE_NOMEM], [SQLITE_BUSY], and [SQLITE_INTERRUPT]) then the
-** transaction might be rolled back automatically.  The only way to
-** find out whether SQLite automatically rolled back the transaction after
-** an error is to use this function.
-**
-** If another thread changes the autocommit status of the database
-** connection while this routine is running, then the return value
-** is undefined.
-*/
-SQLITE_API int sqlite3_get_autocommit(sqlite3*);
-
-/*
-** CAPI3REF: Find The Database Handle Of A Prepared Statement
-** METHOD: sqlite3_stmt
-**
-** ^The sqlite3_db_handle interface returns the [database connection] handle
-** to which a [prepared statement] belongs.  ^The [database connection]
-** returned by sqlite3_db_handle is the same [database connection]
-** that was the first argument
-** to the [sqlite3_prepare_v2()] call (or its variants) that was used to
-** create the statement in the first place.
-*/
-SQLITE_API sqlite3 *sqlite3_db_handle(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Return The Filename For A Database Connection
-** METHOD: sqlite3
-**
-** ^The sqlite3_db_filename(D,N) interface returns a pointer to the filename
-** associated with database N of connection D.
-** ^If there is no attached database N on the database
-** connection D, or if database N is a temporary or in-memory database, then
-** this function will return either a NULL pointer or an empty string.
-**
-** ^The string value returned by this routine is owned and managed by
-** the database connection.  ^The value will be valid until the database N
-** is [DETACH]-ed or until the database connection closes.
-**
-** ^The filename returned by this function is the output of the
-** xFullPathname method of the [VFS].  ^In other words, the filename
-** will be an absolute pathname, even if the filename used
-** to open the database originally was a URI or relative pathname.
-**
-** If the filename pointer returned by this routine is not NULL, then it
-** can be used as the filename input parameter to these routines:
-** <ul>
-** <li> [sqlite3_uri_parameter()]
-** <li> [sqlite3_uri_boolean()]
-** <li> [sqlite3_uri_int64()]
-** <li> [sqlite3_filename_database()]
-** <li> [sqlite3_filename_journal()]
-** <li> [sqlite3_filename_wal()]
-** </ul>
-*/
-SQLITE_API const char *sqlite3_db_filename(sqlite3 *db, const char *zDbName);
-
-/*
-** CAPI3REF: Determine if a database is read-only
-** METHOD: sqlite3
-**
-** ^The sqlite3_db_readonly(D,N) interface returns 1 if the database N
-** of connection D is read-only, 0 if it is read/write, or -1 if N is not
-** the name of a database on connection D.
-*/
-SQLITE_API int sqlite3_db_readonly(sqlite3 *db, const char *zDbName);
-
-/*
-** CAPI3REF: Determine the transaction state of a database
-** METHOD: sqlite3
-**
-** ^The sqlite3_txn_state(D,S) interface returns the current
-** [transaction state] of schema S in database connection D.  ^If S is NULL,
-** then the highest transaction state of any schema on database connection D
-** is returned.  Transaction states are (in order of lowest to highest):
-** <ol>
-** <li value="0"> SQLITE_TXN_NONE
-** <li value="1"> SQLITE_TXN_READ
-** <li value="2"> SQLITE_TXN_WRITE
-** </ol>
-** ^If the S argument to sqlite3_txn_state(D,S) is not the name of
-** a valid schema, then -1 is returned.
-*/
-SQLITE_API int sqlite3_txn_state(sqlite3*,const char *zSchema);
+#define SQLITE_WIN32_DATA_DIRECTORY_TYPE 1
+#define SQLITE_WIN32_TEMP_DIRECTORY_TYPE 2
+
+    /*
+    ** CAPI3REF: Test For Auto-Commit Mode
+    ** KEYWORDS: {autocommit mode}
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_get_autocommit() interface returns non-zero or
+    ** zero if the given database connection is or is not in autocommit mode,
+    ** respectively.  ^Autocommit mode is on by default.
+    ** ^Autocommit mode is disabled by a [BEGIN] statement.
+    ** ^Autocommit mode is re-enabled by a [COMMIT] or [ROLLBACK].
+    **
+    ** If certain kinds of errors occur on a statement within a multi-statement
+    ** transaction (errors including [SQLITE_FULL], [SQLITE_IOERR],
+    ** [SQLITE_NOMEM], [SQLITE_BUSY], and [SQLITE_INTERRUPT]) then the
+    ** transaction might be rolled back automatically.  The only way to
+    ** find out whether SQLite automatically rolled back the transaction after
+    ** an error is to use this function.
+    **
+    ** If another thread changes the autocommit status of the database
+    ** connection while this routine is running, then the return value
+    ** is undefined.
+    */
+    SQLITE_API int sqlite3_get_autocommit(sqlite3*);
+
+    /*
+    ** CAPI3REF: Find The Database Handle Of A Prepared Statement
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^The sqlite3_db_handle interface returns the [database connection] handle
+    ** to which a [prepared statement] belongs.  ^The [database connection]
+    ** returned by sqlite3_db_handle is the same [database connection]
+    ** that was the first argument
+    ** to the [sqlite3_prepare_v2()] call (or its variants) that was used to
+    ** create the statement in the first place.
+    */
+    SQLITE_API sqlite3* sqlite3_db_handle(sqlite3_stmt*);
+
+    /*
+    ** CAPI3REF: Return The Filename For A Database Connection
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_db_filename(D,N) interface returns a pointer to the filename
+    ** associated with database N of connection D.
+    ** ^If there is no attached database N on the database
+    ** connection D, or if database N is a temporary or in-memory database, then
+    ** this function will return either a NULL pointer or an empty string.
+    **
+    ** ^The string value returned by this routine is owned and managed by
+    ** the database connection.  ^The value will be valid until the database N
+    ** is [DETACH]-ed or until the database connection closes.
+    **
+    ** ^The filename returned by this function is the output of the
+    ** xFullPathname method of the [VFS].  ^In other words, the filename
+    ** will be an absolute pathname, even if the filename used
+    ** to open the database originally was a URI or relative pathname.
+    **
+    ** If the filename pointer returned by this routine is not NULL, then it
+    ** can be used as the filename input parameter to these routines:
+    ** <ul>
+    ** <li> [sqlite3_uri_parameter()]
+    ** <li> [sqlite3_uri_boolean()]
+    ** <li> [sqlite3_uri_int64()]
+    ** <li> [sqlite3_filename_database()]
+    ** <li> [sqlite3_filename_journal()]
+    ** <li> [sqlite3_filename_wal()]
+    ** </ul>
+    */
+    SQLITE_API const char* sqlite3_db_filename(sqlite3* db, const char* zDbName);
+
+    /*
+    ** CAPI3REF: Determine if a database is read-only
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_db_readonly(D,N) interface returns 1 if the database N
+    ** of connection D is read-only, 0 if it is read/write, or -1 if N is not
+    ** the name of a database on connection D.
+    */
+    SQLITE_API int sqlite3_db_readonly(sqlite3* db, const char* zDbName);
+
+    /*
+    ** CAPI3REF: Determine the transaction state of a database
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_txn_state(D,S) interface returns the current
+    ** [transaction state] of schema S in database connection D.  ^If S is NULL,
+    ** then the highest transaction state of any schema on database connection D
+    ** is returned.  Transaction states are (in order of lowest to highest):
+    ** <ol>
+    ** <li value="0"> SQLITE_TXN_NONE
+    ** <li value="1"> SQLITE_TXN_READ
+    ** <li value="2"> SQLITE_TXN_WRITE
+    ** </ol>
+    ** ^If the S argument to sqlite3_txn_state(D,S) is not the name of
+    ** a valid schema, then -1 is returned.
+    */
+    SQLITE_API int sqlite3_txn_state(sqlite3*, const char* zSchema);
 
 /*
 ** CAPI3REF: Allowed return values from [sqlite3_txn_state()]
@@ -6360,1467 +6311,1458 @@ SQLITE_API int sqlite3_txn_state(sqlite3*,const char *zSchema);
 ** but has not yet committed.  The transaction state will change to
 ** to SQLITE_TXN_NONE at the next [ROLLBACK] or [COMMIT].</dd>
 */
-#define SQLITE_TXN_NONE  0
-#define SQLITE_TXN_READ  1
+#define SQLITE_TXN_NONE 0
+#define SQLITE_TXN_READ 1
 #define SQLITE_TXN_WRITE 2
 
-/*
-** CAPI3REF: Find the next prepared statement
-** METHOD: sqlite3
-**
-** ^This interface returns a pointer to the next [prepared statement] after
-** pStmt associated with the [database connection] pDb.  ^If pStmt is NULL
-** then this interface returns a pointer to the first prepared statement
-** associated with the database connection pDb.  ^If no prepared statement
-** satisfies the conditions of this routine, it returns NULL.
-**
-** The [database connection] pointer D in a call to
-** [sqlite3_next_stmt(D,S)] must refer to an open database
-** connection and in particular must not be a NULL pointer.
-*/
-SQLITE_API sqlite3_stmt *sqlite3_next_stmt(sqlite3 *pDb, sqlite3_stmt *pStmt);
+    /*
+    ** CAPI3REF: Find the next prepared statement
+    ** METHOD: sqlite3
+    **
+    ** ^This interface returns a pointer to the next [prepared statement] after
+    ** pStmt associated with the [database connection] pDb.  ^If pStmt is NULL
+    ** then this interface returns a pointer to the first prepared statement
+    ** associated with the database connection pDb.  ^If no prepared statement
+    ** satisfies the conditions of this routine, it returns NULL.
+    **
+    ** The [database connection] pointer D in a call to
+    ** [sqlite3_next_stmt(D,S)] must refer to an open database
+    ** connection and in particular must not be a NULL pointer.
+    */
+    SQLITE_API sqlite3_stmt* sqlite3_next_stmt(sqlite3* pDb, sqlite3_stmt* pStmt);
+
+    /*
+    ** CAPI3REF: Commit And Rollback Notification Callbacks
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_commit_hook() interface registers a callback
+    ** function to be invoked whenever a transaction is [COMMIT | committed].
+    ** ^Any callback set by a previous call to sqlite3_commit_hook()
+    ** for the same database connection is overridden.
+    ** ^The sqlite3_rollback_hook() interface registers a callback
+    ** function to be invoked whenever a transaction is [ROLLBACK | rolled back].
+    ** ^Any callback set by a previous call to sqlite3_rollback_hook()
+    ** for the same database connection is overridden.
+    ** ^The pArg argument is passed through to the callback.
+    ** ^If the callback on a commit hook function returns non-zero,
+    ** then the commit is converted into a rollback.
+    **
+    ** ^The sqlite3_commit_hook(D,C,P) and sqlite3_rollback_hook(D,C,P) functions
+    ** return the P argument from the previous call of the same function
+    ** on the same [database connection] D, or NULL for
+    ** the first call for each function on D.
+    **
+    ** The commit and rollback hook callbacks are not reentrant.
+    ** The callback implementation must not do anything that will modify
+    ** the database connection that invoked the callback.  Any actions
+    ** to modify the database connection must be deferred until after the
+    ** completion of the [sqlite3_step()] call that triggered the commit
+    ** or rollback hook in the first place.
+    ** Note that running any other SQL statements, including SELECT statements,
+    ** or merely calling [sqlite3_prepare_v2()] and [sqlite3_step()] will modify
+    ** the database connections for the meaning of "modify" in this paragraph.
+    **
+    ** ^Registering a NULL function disables the callback.
+    **
+    ** ^When the commit hook callback routine returns zero, the [COMMIT]
+    ** operation is allowed to continue normally.  ^If the commit hook
+    ** returns non-zero, then the [COMMIT] is converted into a [ROLLBACK].
+    ** ^The rollback hook is invoked on a rollback that results from a commit
+    ** hook returning non-zero, just as it would be with any other rollback.
+    **
+    ** ^For the purposes of this API, a transaction is said to have been
+    ** rolled back if an explicit "ROLLBACK" statement is executed, or
+    ** an error or constraint causes an implicit rollback to occur.
+    ** ^The rollback callback is not invoked if a transaction is
+    ** automatically rolled back because the database connection is closed.
+    **
+    ** See also the [sqlite3_update_hook()] interface.
+    */
+    SQLITE_API void* sqlite3_commit_hook(sqlite3*, int (*)(void*), void*);
+    SQLITE_API void* sqlite3_rollback_hook(sqlite3*, void (*)(void*), void*);
+
+    /*
+    ** CAPI3REF: Autovacuum Compaction Amount Callback
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_autovacuum_pages(D,C,P,X) interface registers a callback
+    ** function C that is invoked prior to each autovacuum of the database
+    ** file.  ^The callback is passed a copy of the generic data pointer (P),
+    ** the schema-name of the attached database that is being autovacuumed,
+    ** the the size of the database file in pages, the number of free pages,
+    ** and the number of bytes per page, respectively.  The callback should
+    ** return the number of free pages that should be removed by the
+    ** autovacuum.  ^If the callback returns zero, then no autovacuum happens.
+    ** ^If the value returned is greater than or equal to the number of
+    ** free pages, then a complete autovacuum happens.
+    **
+    ** <p>^If there are multiple ATTACH-ed database files that are being
+    ** modified as part of a transaction commit, then the autovacuum pages
+    ** callback is invoked separately for each file.
+    **
+    ** <p><b>The callback is not reentrant.</b> The callback function should
+    ** not attempt to invoke any other SQLite interface.  If it does, bad
+    ** things may happen, including segmentation faults and corrupt database
+    ** files.  The callback function should be a simple function that
+    ** does some arithmetic on its input parameters and returns a result.
+    **
+    ** ^The X parameter to sqlite3_autovacuum_pages(D,C,P,X) is an optional
+    ** destructor for the P parameter.  ^If X is not NULL, then X(P) is
+    ** invoked whenever the database connection closes or when the callback
+    ** is overwritten by another invocation of sqlite3_autovacuum_pages().
+    **
+    ** <p>^There is only one autovacuum pages callback per database connection.
+    ** ^Each call to the sqlite3_autovacuum_pages() interface overrides all
+    ** previous invocations for that database connection.  ^If the callback
+    ** argument (C) to sqlite3_autovacuum_pages(D,C,P,X) is a NULL pointer,
+    ** then the autovacuum steps callback is cancelled.  The return value
+    ** from sqlite3_autovacuum_pages() is normally SQLITE_OK, but might
+    ** be some other error code if something goes wrong.  The current
+    ** implementation will only return SQLITE_OK or SQLITE_MISUSE, but other
+    ** return codes might be added in future releases.
+    **
+    ** <p>If no autovacuum pages callback is specified (the usual case) or
+    ** a NULL pointer is provided for the callback,
+    ** then the default behavior is to vacuum all free pages.  So, in other
+    ** words, the default behavior is the same as if the callback function
+    ** were something like this:
+    **
+    ** <blockquote><pre>
+    ** &nbsp;   unsigned int demonstration_autovac_pages_callback(
+    ** &nbsp;     void *pClientData,
+    ** &nbsp;     const char *zSchema,
+    ** &nbsp;     unsigned int nDbPage,
+    ** &nbsp;     unsigned int nFreePage,
+    ** &nbsp;     unsigned int nBytePerPage
+    ** &nbsp;   ){
+    ** &nbsp;     return nFreePage;
+    ** &nbsp;   }
+    ** </pre></blockquote>
+    */
+    SQLITE_API int
+      sqlite3_autovacuum_pages(sqlite3* db,
+                               unsigned int (*)(void*, const char*, unsigned int, unsigned int, unsigned int),
+                               void*,
+                               void (*)(void*));
+
+    /*
+    ** CAPI3REF: Data Change Notification Callbacks
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_update_hook() interface registers a callback function
+    ** with the [database connection] identified by the first argument
+    ** to be invoked whenever a row is updated, inserted or deleted in
+    ** a [rowid table].
+    ** ^Any callback set by a previous call to this function
+    ** for the same database connection is overridden.
+    **
+    ** ^The second argument is a pointer to the function to invoke when a
+    ** row is updated, inserted or deleted in a rowid table.
+    ** ^The first argument to the callback is a copy of the third argument
+    ** to sqlite3_update_hook().
+    ** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
+    ** or [SQLITE_UPDATE], depending on the operation that caused the callback
+    ** to be invoked.
+    ** ^The third and fourth arguments to the callback contain pointers to the
+    ** database and table name containing the affected row.
+    ** ^The final callback parameter is the [rowid] of the row.
+    ** ^In the case of an update, this is the [rowid] after the update takes place.
+    **
+    ** ^(The update hook is not invoked when internal system tables are
+    ** modified (i.e. sqlite_sequence).)^
+    ** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
+    **
+    ** ^In the current implementation, the update hook
+    ** is not invoked when conflicting rows are deleted because of an
+    ** [ON CONFLICT | ON CONFLICT REPLACE] clause.  ^Nor is the update hook
+    ** invoked when rows are deleted using the [truncate optimization].
+    ** The exceptions defined in this paragraph might change in a future
+    ** release of SQLite.
+    **
+    ** The update hook implementation must not do anything that will modify
+    ** the database connection that invoked the update hook.  Any actions
+    ** to modify the database connection must be deferred until after the
+    ** completion of the [sqlite3_step()] call that triggered the update hook.
+    ** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
+    ** database connections for the meaning of "modify" in this paragraph.
+    **
+    ** ^The sqlite3_update_hook(D,C,P) function
+    ** returns the P argument from the previous call
+    ** on the same [database connection] D, or NULL for
+    ** the first call on D.
+    **
+    ** See also the [sqlite3_commit_hook()], [sqlite3_rollback_hook()],
+    ** and [sqlite3_preupdate_hook()] interfaces.
+    */
+    SQLITE_API void* sqlite3_update_hook(sqlite3*, void (*)(void*, int, char const*, char const*, sqlite3_int64), void*);
+
+    /*
+    ** CAPI3REF: Enable Or Disable Shared Pager Cache
+    **
+    ** ^(This routine enables or disables the sharing of the database cache
+    ** and schema data structures between [database connection | connections]
+    ** to the same database. Sharing is enabled if the argument is true
+    ** and disabled if the argument is false.)^
+    **
+    ** ^Cache sharing is enabled and disabled for an entire process.
+    ** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
+    ** In prior versions of SQLite,
+    ** sharing was enabled or disabled for each thread separately.
+    **
+    ** ^(The cache sharing mode set by this interface effects all subsequent
+    ** calls to [sqlite3_open()], [sqlite3_open_v2()], and [sqlite3_open16()].
+    ** Existing database connections continue to use the sharing mode
+    ** that was in effect at the time they were opened.)^
+    **
+    ** ^(This routine returns [SQLITE_OK] if shared cache was enabled or disabled
+    ** successfully.  An [error code] is returned otherwise.)^
+    **
+    ** ^Shared cache is disabled by default. It is recommended that it stay
+    ** that way.  In other words, do not use this routine.  This interface
+    ** continues to be provided for historical compatibility, but its use is
+    ** discouraged.  Any use of shared cache is discouraged.  If shared cache
+    ** must be used, it is recommended that shared cache only be enabled for
+    ** individual database connections using the [sqlite3_open_v2()] interface
+    ** with the [SQLITE_OPEN_SHAREDCACHE] flag.
+    **
+    ** Note: This method is disabled on MacOS X 10.7 and iOS version 5.0
+    ** and will always return SQLITE_MISUSE. On those systems,
+    ** shared cache mode should be enabled per-database connection via
+    ** [sqlite3_open_v2()] with [SQLITE_OPEN_SHAREDCACHE].
+    **
+    ** This interface is threadsafe on processors where writing a
+    ** 32-bit integer is atomic.
+    **
+    ** See Also:  [SQLite Shared-Cache Mode]
+    */
+    SQLITE_API int sqlite3_enable_shared_cache(int);
+
+    /*
+    ** CAPI3REF: Attempt To Free Heap Memory
+    **
+    ** ^The sqlite3_release_memory() interface attempts to free N bytes
+    ** of heap memory by deallocating non-essential memory allocations
+    ** held by the database library.   Memory used to cache database
+    ** pages to improve performance is an example of non-essential memory.
+    ** ^sqlite3_release_memory() returns the number of bytes actually freed,
+    ** which might be more or less than the amount requested.
+    ** ^The sqlite3_release_memory() routine is a no-op returning zero
+    ** if SQLite is not compiled with [SQLITE_ENABLE_MEMORY_MANAGEMENT].
+    **
+    ** See also: [sqlite3_db_release_memory()]
+    */
+    SQLITE_API int sqlite3_release_memory(int);
+
+    /*
+    ** CAPI3REF: Free Memory Used By A Database Connection
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
+    ** memory as possible from database connection D. Unlike the
+    ** [sqlite3_release_memory()] interface, this interface is in effect even
+    ** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
+    ** omitted.
+    **
+    ** See also: [sqlite3_release_memory()]
+    */
+    SQLITE_API int sqlite3_db_release_memory(sqlite3*);
+
+    /*
+    ** CAPI3REF: Impose A Limit On Heap Size
+    **
+    ** These interfaces impose limits on the amount of heap memory that will be
+    ** by all database connections within a single process.
+    **
+    ** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
+    ** soft limit on the amount of heap memory that may be allocated by SQLite.
+    ** ^SQLite strives to keep heap memory utilization below the soft heap
+    ** limit by reducing the number of pages held in the page cache
+    ** as heap memory usages approaches the limit.
+    ** ^The soft heap limit is "soft" because even though SQLite strives to stay
+    ** below the limit, it will exceed the limit rather than generate
+    ** an [SQLITE_NOMEM] error.  In other words, the soft heap limit
+    ** is advisory only.
+    **
+    ** ^The sqlite3_hard_heap_limit64(N) interface sets a hard upper bound of
+    ** N bytes on the amount of memory that will be allocated.  ^The
+    ** sqlite3_hard_heap_limit64(N) interface is similar to
+    ** sqlite3_soft_heap_limit64(N) except that memory allocations will fail
+    ** when the hard heap limit is reached.
+    **
+    ** ^The return value from both sqlite3_soft_heap_limit64() and
+    ** sqlite3_hard_heap_limit64() is the size of
+    ** the heap limit prior to the call, or negative in the case of an
+    ** error.  ^If the argument N is negative
+    ** then no change is made to the heap limit.  Hence, the current
+    ** size of heap limits can be determined by invoking
+    ** sqlite3_soft_heap_limit64(-1) or sqlite3_hard_heap_limit(-1).
+    **
+    ** ^Setting the heap limits to zero disables the heap limiter mechanism.
+    **
+    ** ^The soft heap limit may not be greater than the hard heap limit.
+    ** ^If the hard heap limit is enabled and if sqlite3_soft_heap_limit(N)
+    ** is invoked with a value of N that is greater than the hard heap limit,
+    ** the the soft heap limit is set to the value of the hard heap limit.
+    ** ^The soft heap limit is automatically enabled whenever the hard heap
+    ** limit is enabled. ^When sqlite3_hard_heap_limit64(N) is invoked and
+    ** the soft heap limit is outside the range of 1..N, then the soft heap
+    ** limit is set to N.  ^Invoking sqlite3_soft_heap_limit64(0) when the
+    ** hard heap limit is enabled makes the soft heap limit equal to the
+    ** hard heap limit.
+    **
+    ** The memory allocation limits can also be adjusted using
+    ** [PRAGMA soft_heap_limit] and [PRAGMA hard_heap_limit].
+    **
+    ** ^(The heap limits are not enforced in the current implementation
+    ** if one or more of following conditions are true:
+    **
+    ** <ul>
+    ** <li> The limit value is set to zero.
+    ** <li> Memory accounting is disabled using a combination of the
+    **      [sqlite3_config]([SQLITE_CONFIG_MEMSTATUS],...) start-time option and
+    **      the [SQLITE_DEFAULT_MEMSTATUS] compile-time option.
+    ** <li> An alternative page cache implementation is specified using
+    **      [sqlite3_config]([SQLITE_CONFIG_PCACHE2],...).
+    ** <li> The page cache allocates from its own memory pool supplied
+    **      by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
+    **      from the heap.
+    ** </ul>)^
+    **
+    ** The circumstances under which SQLite will enforce the heap limits may
+    ** changes in future releases of SQLite.
+    */
+    SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
+    SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
+
+    /*
+    ** CAPI3REF: Deprecated Soft Heap Limit Interface
+    ** DEPRECATED
+    **
+    ** This is a deprecated version of the [sqlite3_soft_heap_limit64()]
+    ** interface.  This routine is provided for historical compatibility
+    ** only.  All new applications should use the
+    ** [sqlite3_soft_heap_limit64()] interface rather than this one.
+    */
+    SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N);
+
+    /*
+    ** CAPI3REF: Extract Metadata About A Column Of A Table
+    ** METHOD: sqlite3
+    **
+    ** ^(The sqlite3_table_column_metadata(X,D,T,C,....) routine returns
+    ** information about column C of table T in database D
+    ** on [database connection] X.)^  ^The sqlite3_table_column_metadata()
+    ** interface returns SQLITE_OK and fills in the non-NULL pointers in
+    ** the final five arguments with appropriate values if the specified
+    ** column exists.  ^The sqlite3_table_column_metadata() interface returns
+    ** SQLITE_ERROR if the specified column does not exist.
+    ** ^If the column-name parameter to sqlite3_table_column_metadata() is a
+    ** NULL pointer, then this routine simply checks for the existence of the
+    ** table and returns SQLITE_OK if the table exists and SQLITE_ERROR if it
+    ** does not.  If the table name parameter T in a call to
+    ** sqlite3_table_column_metadata(X,D,T,C,...) is NULL then the result is
+    ** undefined behavior.
+    **
+    ** ^The column is identified by the second, third and fourth parameters to
+    ** this function. ^(The second parameter is either the name of the database
+    ** (i.e. "main", "temp", or an attached database) containing the specified
+    ** table or NULL.)^ ^If it is NULL, then all attached databases are searched
+    ** for the table using the same algorithm used by the database engine to
+    ** resolve unqualified table references.
+    **
+    ** ^The third and fourth parameters to this function are the table and column
+    ** name of the desired column, respectively.
+    **
+    ** ^Metadata is returned by writing to the memory locations passed as the 5th
+    ** and subsequent parameters to this function. ^Any of these arguments may be
+    ** NULL, in which case the corresponding element of metadata is omitted.
+    **
+    ** ^(<blockquote>
+    ** <table border="1">
+    ** <tr><th> Parameter <th> Output<br>Type <th>  Description
+    **
+    ** <tr><td> 5th <td> const char* <td> Data type
+    ** <tr><td> 6th <td> const char* <td> Name of default collation sequence
+    ** <tr><td> 7th <td> int         <td> True if column has a NOT NULL constraint
+    ** <tr><td> 8th <td> int         <td> True if column is part of the PRIMARY KEY
+    ** <tr><td> 9th <td> int         <td> True if column is [AUTOINCREMENT]
+    ** </table>
+    ** </blockquote>)^
+    **
+    ** ^The memory pointed to by the character pointers returned for the
+    ** declaration type and collation sequence is valid until the next
+    ** call to any SQLite API function.
+    **
+    ** ^If the specified table is actually a view, an [error code] is returned.
+    **
+    ** ^If the specified column is "rowid", "oid" or "_rowid_" and the table
+    ** is not a [WITHOUT ROWID] table and an
+    ** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output
+    ** parameters are set for the explicitly declared column. ^(If there is no
+    ** [INTEGER PRIMARY KEY] column, then the outputs
+    ** for the [rowid] are set as follows:
+    **
+    ** <pre>
+    **     data type: "INTEGER"
+    **     collation sequence: "BINARY"
+    **     not null: 0
+    **     primary key: 1
+    **     auto increment: 0
+    ** </pre>)^
+    **
+    ** ^This function causes all database schemas to be read from disk and
+    ** parsed, if that has not already been done, and returns an error if
+    ** any errors are encountered while loading the schema.
+    */
+    SQLITE_API int sqlite3_table_column_metadata(sqlite3* db,             /* Connection handle */
+                                                 const char* zDbName,     /* Database name or NULL */
+                                                 const char* zTableName,  /* Table name */
+                                                 const char* zColumnName, /* Column name */
+                                                 char const** pzDataType, /* OUTPUT: Declared data type */
+                                                 char const** pzCollSeq,  /* OUTPUT: Collation sequence name */
+                                                 int* pNotNull,    /* OUTPUT: True if NOT NULL constraint exists */
+                                                 int* pPrimaryKey, /* OUTPUT: True if column part of PK */
+                                                 int* pAutoinc     /* OUTPUT: True if column is auto-increment */
+    );
+
+    /*
+    ** CAPI3REF: Load An Extension
+    ** METHOD: sqlite3
+    **
+    ** ^This interface loads an SQLite extension library from the named file.
+    **
+    ** ^The sqlite3_load_extension() interface attempts to load an
+    ** [SQLite extension] library contained in the file zFile.  If
+    ** the file cannot be loaded directly, attempts are made to load
+    ** with various operating-system specific extensions added.
+    ** So for example, if "samplelib" cannot be loaded, then names like
+    ** "samplelib.so" or "samplelib.dylib" or "samplelib.dll" might
+    ** be tried also.
+    **
+    ** ^The entry point is zProc.
+    ** ^(zProc may be 0, in which case SQLite will try to come up with an
+    ** entry point name on its own.  It first tries "sqlite3_extension_init".
+    ** If that does not work, it constructs a name "sqlite3_X_init" where the
+    ** X is consists of the lower-case equivalent of all ASCII alphabetic
+    ** characters in the filename from the last "/" to the first following
+    ** "." and omitting any initial "lib".)^
+    ** ^The sqlite3_load_extension() interface returns
+    ** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
+    ** ^If an error occurs and pzErrMsg is not 0, then the
+    ** [sqlite3_load_extension()] interface shall attempt to
+    ** fill *pzErrMsg with error message text stored in memory
+    ** obtained from [sqlite3_malloc()]. The calling function
+    ** should free this memory by calling [sqlite3_free()].
+    **
+    ** ^Extension loading must be enabled using
+    ** [sqlite3_enable_load_extension()] or
+    ** [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],1,NULL)
+    ** prior to calling this API,
+    ** otherwise an error will be returned.
+    **
+    ** <b>Security warning:</b> It is recommended that the
+    ** [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method be used to enable only this
+    ** interface.  The use of the [sqlite3_enable_load_extension()] interface
+    ** should be avoided.  This will keep the SQL function [load_extension()]
+    ** disabled and prevent SQL injections from giving attackers
+    ** access to extension loading capabilities.
+    **
+    ** See also the [load_extension() SQL function].
+    */
+    SQLITE_API int sqlite3_load_extension(sqlite3* db,       /* Load the extension into this database connection */
+                                          const char* zFile, /* Name of the shared library containing extension */
+                                          const char* zProc, /* Entry point.  Derived from zFile if 0 */
+                                          char** pzErrMsg    /* Put error message here if not 0 */
+    );
+
+    /*
+    ** CAPI3REF: Enable Or Disable Extension Loading
+    ** METHOD: sqlite3
+    **
+    ** ^So as not to open security holes in older applications that are
+    ** unprepared to deal with [extension loading], and as a means of disabling
+    ** [extension loading] while evaluating user-entered SQL, the following API
+    ** is provided to turn the [sqlite3_load_extension()] mechanism on and off.
+    **
+    ** ^Extension loading is off by default.
+    ** ^Call the sqlite3_enable_load_extension() routine with onoff==1
+    ** to turn extension loading on and call it with onoff==0 to turn
+    ** it back off again.
+    **
+    ** ^This interface enables or disables both the C-API
+    ** [sqlite3_load_extension()] and the SQL function [load_extension()].
+    ** ^(Use [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],..)
+    ** to enable or disable only the C-API.)^
+    **
+    ** <b>Security warning:</b> It is recommended that extension loading
+    ** be enabled using the [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method
+    ** rather than this interface, so the [load_extension()] SQL function
+    ** remains disabled. This will prevent SQL injections from giving attackers
+    ** access to extension loading capabilities.
+    */
+    SQLITE_API int sqlite3_enable_load_extension(sqlite3* db, int onoff);
+
+    /*
+    ** CAPI3REF: Automatically Load Statically Linked Extensions
+    **
+    ** ^This interface causes the xEntryPoint() function to be invoked for
+    ** each new [database connection] that is created.  The idea here is that
+    ** xEntryPoint() is the entry point for a statically linked [SQLite extension]
+    ** that is to be automatically loaded into all new database connections.
+    **
+    ** ^(Even though the function prototype shows that xEntryPoint() takes
+    ** no arguments and returns void, SQLite invokes xEntryPoint() with three
+    ** arguments and expects an integer result as if the signature of the
+    ** entry point where as follows:
+    **
+    ** <blockquote><pre>
+    ** &nbsp;  int xEntryPoint(
+    ** &nbsp;    sqlite3 *db,
+    ** &nbsp;    const char **pzErrMsg,
+    ** &nbsp;    const struct sqlite3_api_routines *pThunk
+    ** &nbsp;  );
+    ** </pre></blockquote>)^
+    **
+    ** If the xEntryPoint routine encounters an error, it should make *pzErrMsg
+    ** point to an appropriate error message (obtained from [sqlite3_mprintf()])
+    ** and return an appropriate [error code].  ^SQLite ensures that *pzErrMsg
+    ** is NULL before calling the xEntryPoint().  ^SQLite will invoke
+    ** [sqlite3_free()] on *pzErrMsg after xEntryPoint() returns.  ^If any
+    ** xEntryPoint() returns an error, the [sqlite3_open()], [sqlite3_open16()],
+    ** or [sqlite3_open_v2()] call that provoked the xEntryPoint() will fail.
+    **
+    ** ^Calling sqlite3_auto_extension(X) with an entry point X that is already
+    ** on the list of automatic extensions is a harmless no-op. ^No entry point
+    ** will be called more than once for each database connection that is opened.
+    **
+    ** See also: [sqlite3_reset_auto_extension()]
+    ** and [sqlite3_cancel_auto_extension()]
+    */
+    SQLITE_API int sqlite3_auto_extension(void (*xEntryPoint)(void));
+
+    /*
+    ** CAPI3REF: Cancel Automatic Extension Loading
+    **
+    ** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
+    ** initialization routine X that was registered using a prior call to
+    ** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
+    ** routine returns 1 if initialization routine X was successfully
+    ** unregistered and it returns 0 if X was not on the list of initialization
+    ** routines.
+    */
+    SQLITE_API int sqlite3_cancel_auto_extension(void (*xEntryPoint)(void));
+
+    /*
+    ** CAPI3REF: Reset Automatic Extension Loading
+    **
+    ** ^This interface disables all automatic extensions previously
+    ** registered using [sqlite3_auto_extension()].
+    */
+    SQLITE_API void sqlite3_reset_auto_extension(void);
+
+    /*
+    ** The interface to the virtual-table mechanism is currently considered
+    ** to be experimental.  The interface might change in incompatible ways.
+    ** If this is a problem for you, do not use the interface at this time.
+    **
+    ** When the virtual-table mechanism stabilizes, we will declare the
+    ** interface fixed, support it indefinitely, and remove this comment.
+    */
+
+    /*
+    ** Structures used by the virtual table interface
+    */
+    typedef struct sqlite3_vtab sqlite3_vtab;
+    typedef struct sqlite3_index_info sqlite3_index_info;
+    typedef struct sqlite3_vtab_cursor sqlite3_vtab_cursor;
+    typedef struct sqlite3_module sqlite3_module;
+
+    /*
+    ** CAPI3REF: Virtual Table Object
+    ** KEYWORDS: sqlite3_module {virtual table module}
+    **
+    ** This structure, sometimes called a "virtual table module",
+    ** defines the implementation of a [virtual table].
+    ** This structure consists mostly of methods for the module.
+    **
+    ** ^A virtual table module is created by filling in a persistent
+    ** instance of this structure and passing a pointer to that instance
+    ** to [sqlite3_create_module()] or [sqlite3_create_module_v2()].
+    ** ^The registration remains valid until it is replaced by a different
+    ** module or until the [database connection] closes.  The content
+    ** of this structure must not change while it is registered with
+    ** any database connection.
+    */
+    struct sqlite3_module
+    {
+        int iVersion;
+        int (*xCreate)(sqlite3*, void* pAux, int argc, const char* const* argv, sqlite3_vtab** ppVTab, char**);
+        int (*xConnect)(sqlite3*, void* pAux, int argc, const char* const* argv, sqlite3_vtab** ppVTab, char**);
+        int (*xBestIndex)(sqlite3_vtab* pVTab, sqlite3_index_info*);
+        int (*xDisconnect)(sqlite3_vtab* pVTab);
+        int (*xDestroy)(sqlite3_vtab* pVTab);
+        int (*xOpen)(sqlite3_vtab* pVTab, sqlite3_vtab_cursor** ppCursor);
+        int (*xClose)(sqlite3_vtab_cursor*);
+        int (*xFilter)(sqlite3_vtab_cursor*, int idxNum, const char* idxStr, int argc, sqlite3_value** argv);
+        int (*xNext)(sqlite3_vtab_cursor*);
+        int (*xEof)(sqlite3_vtab_cursor*);
+        int (*xColumn)(sqlite3_vtab_cursor*, sqlite3_context*, int);
+        int (*xRowid)(sqlite3_vtab_cursor*, sqlite3_int64* pRowid);
+        int (*xUpdate)(sqlite3_vtab*, int, sqlite3_value**, sqlite3_int64*);
+        int (*xBegin)(sqlite3_vtab* pVTab);
+        int (*xSync)(sqlite3_vtab* pVTab);
+        int (*xCommit)(sqlite3_vtab* pVTab);
+        int (*xRollback)(sqlite3_vtab* pVTab);
+        int (*xFindFunction)(sqlite3_vtab* pVtab,
+                             int nArg,
+                             const char* zName,
+                             void (**pxFunc)(sqlite3_context*, int, sqlite3_value**),
+                             void** ppArg);
+        int (*xRename)(sqlite3_vtab* pVtab, const char* zNew);
+        /* The methods above are in version 1 of the sqlite_module object. Those
+        ** below are for version 2 and greater. */
+        int (*xSavepoint)(sqlite3_vtab* pVTab, int);
+        int (*xRelease)(sqlite3_vtab* pVTab, int);
+        int (*xRollbackTo)(sqlite3_vtab* pVTab, int);
+        /* The methods above are in versions 1 and 2 of the sqlite_module object.
+        ** Those below are for version 3 and greater. */
+        int (*xShadowName)(const char*);
+    };
+
+    /*
+    ** CAPI3REF: Virtual Table Indexing Information
+    ** KEYWORDS: sqlite3_index_info
+    **
+    ** The sqlite3_index_info structure and its substructures is used as part
+    ** of the [virtual table] interface to
+    ** pass information into and receive the reply from the [xBestIndex]
+    ** method of a [virtual table module].  The fields under **Inputs** are the
+    ** inputs to xBestIndex and are read-only.  xBestIndex inserts its
+    ** results into the **Outputs** fields.
+    **
+    ** ^(The aConstraint[] array records WHERE clause constraints of the form:
+    **
+    ** <blockquote>column OP expr</blockquote>
+    **
+    ** where OP is =, &lt;, &lt;=, &gt;, or &gt;=.)^  ^(The particular operator is
+    ** stored in aConstraint[].op using one of the
+    ** [SQLITE_INDEX_CONSTRAINT_EQ | SQLITE_INDEX_CONSTRAINT_ values].)^
+    ** ^(The index of the column is stored in
+    ** aConstraint[].iColumn.)^  ^(aConstraint[].usable is TRUE if the
+    ** expr on the right-hand side can be evaluated (and thus the constraint
+    ** is usable) and false if it cannot.)^
+    **
+    ** ^The optimizer automatically inverts terms of the form "expr OP column"
+    ** and makes other simplifications to the WHERE clause in an attempt to
+    ** get as many WHERE clause terms into the form shown above as possible.
+    ** ^The aConstraint[] array only reports WHERE clause terms that are
+    ** relevant to the particular virtual table being queried.
+    **
+    ** ^Information about the ORDER BY clause is stored in aOrderBy[].
+    ** ^Each term of aOrderBy records a column of the ORDER BY clause.
+    **
+    ** The colUsed field indicates which columns of the virtual table may be
+    ** required by the current scan. Virtual table columns are numbered from
+    ** zero in the order in which they appear within the CREATE TABLE statement
+    ** passed to sqlite3_declare_vtab(). For the first 63 columns (columns 0-62),
+    ** the corresponding bit is set within the colUsed mask if the column may be
+    ** required by SQLite. If the table has at least 64 columns and any column
+    ** to the right of the first 63 is required, then bit 63 of colUsed is also
+    ** set. In other words, column iCol may be required if the expression
+    ** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to
+    ** non-zero.
+    **
+    ** The [xBestIndex] method must fill aConstraintUsage[] with information
+    ** about what parameters to pass to xFilter.  ^If argvIndex>0 then
+    ** the right-hand side of the corresponding aConstraint[] is evaluated
+    ** and becomes the argvIndex-th entry in argv.  ^(If aConstraintUsage[].omit
+    ** is true, then the constraint is assumed to be fully handled by the
+    ** virtual table and might not be checked again by the byte code.)^ ^(The
+    ** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
+    ** is left in its default setting of false, the constraint will always be
+    ** checked separately in byte code.  If the omit flag is change to true, then
+    ** the constraint may or may not be checked in byte code.  In other words,
+    ** when the omit flag is true there is no guarantee that the constraint will
+    ** not be checked again using byte code.)^
+    **
+    ** ^The idxNum and idxPtr values are recorded and passed into the
+    ** [xFilter] method.
+    ** ^[sqlite3_free()] is used to free idxPtr if and only if
+    ** needToFreeIdxPtr is true.
+    **
+    ** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in
+    ** the correct order to satisfy the ORDER BY clause so that no separate
+    ** sorting step is required.
+    **
+    ** ^The estimatedCost value is an estimate of the cost of a particular
+    ** strategy. A cost of N indicates that the cost of the strategy is similar
+    ** to a linear scan of an SQLite table with N rows. A cost of log(N)
+    ** indicates that the expense of the operation is similar to that of a
+    ** binary search on a unique indexed field of an SQLite table with N rows.
+    **
+    ** ^The estimatedRows value is an estimate of the number of rows that
+    ** will be returned by the strategy.
+    **
+    ** The xBestIndex method may optionally populate the idxFlags field with a
+    ** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
+    ** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
+    ** assumes that the strategy may visit at most one row.
+    **
+    ** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
+    ** SQLite also assumes that if a call to the xUpdate() method is made as
+    ** part of the same statement to delete or update a virtual table row and the
+    ** implementation returns SQLITE_CONSTRAINT, then there is no need to rollback
+    ** any database changes. In other words, if the xUpdate() returns
+    ** SQLITE_CONSTRAINT, the database contents must be exactly as they were
+    ** before xUpdate was called. By contrast, if SQLITE_INDEX_SCAN_UNIQUE is not
+    ** set and xUpdate returns SQLITE_CONSTRAINT, any database changes made by
+    ** the xUpdate method are automatically rolled back by SQLite.
+    **
+    ** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
+    ** structure for SQLite [version 3.8.2] ([dateof:3.8.2]).
+    ** If a virtual table extension is
+    ** used with an SQLite version earlier than 3.8.2, the results of attempting
+    ** to read or write the estimatedRows field are undefined (but are likely
+    ** to include crashing the application). The estimatedRows field should
+    ** therefore only be used if [sqlite3_libversion_number()] returns a
+    ** value greater than or equal to 3008002. Similarly, the idxFlags field
+    ** was added for [version 3.9.0] ([dateof:3.9.0]).
+    ** It may therefore only be used if
+    ** sqlite3_libversion_number() returns a value greater than or equal to
+    ** 3009000.
+    */
+    struct sqlite3_index_info
+    {
+        /* Inputs */
+        int nConstraint; /* Number of entries in aConstraint */
+        struct sqlite3_index_constraint
+        {
+            int iColumn;          /* Column constrained.  -1 for ROWID */
+            unsigned char op;     /* Constraint operator */
+            unsigned char usable; /* True if this constraint is usable */
+            int iTermOffset;      /* Used internally - xBestIndex should ignore */
+        } * aConstraint;          /* Table of WHERE clause constraints */
+        int nOrderBy;             /* Number of terms in the ORDER BY clause */
+        struct sqlite3_index_orderby
+        {
+            int iColumn;        /* Column number */
+            unsigned char desc; /* True for DESC.  False for ASC. */
+        } * aOrderBy;           /* The ORDER BY clause */
+        /* Outputs */
+        struct sqlite3_index_constraint_usage
+        {
+            int argvIndex;      /* if >0, constraint is part of argv to xFilter */
+            unsigned char omit; /* Do not code a test for this constraint */
+        } * aConstraintUsage;
+        int idxNum;           /* Number used to identify the index */
+        char* idxStr;         /* String, possibly obtained from sqlite3_malloc */
+        int needToFreeIdxStr; /* Free idxStr using sqlite3_free() if true */
+        int orderByConsumed;  /* True if output is already ordered */
+        double estimatedCost; /* Estimated cost of using this index */
+        /* Fields below are only available in SQLite 3.8.2 and later */
+        sqlite3_int64 estimatedRows; /* Estimated number of rows returned */
+        /* Fields below are only available in SQLite 3.9.0 and later */
+        int idxFlags; /* Mask of SQLITE_INDEX_SCAN_* flags */
+        /* Fields below are only available in SQLite 3.10.0 and later */
+        sqlite3_uint64 colUsed; /* Input: Mask of columns used by statement */
+    };
 
 /*
-** CAPI3REF: Commit And Rollback Notification Callbacks
-** METHOD: sqlite3
+** CAPI3REF: Virtual Table Scan Flags
 **
-** ^The sqlite3_commit_hook() interface registers a callback
-** function to be invoked whenever a transaction is [COMMIT | committed].
-** ^Any callback set by a previous call to sqlite3_commit_hook()
-** for the same database connection is overridden.
-** ^The sqlite3_rollback_hook() interface registers a callback
-** function to be invoked whenever a transaction is [ROLLBACK | rolled back].
-** ^Any callback set by a previous call to sqlite3_rollback_hook()
-** for the same database connection is overridden.
-** ^The pArg argument is passed through to the callback.
-** ^If the callback on a commit hook function returns non-zero,
-** then the commit is converted into a rollback.
-**
-** ^The sqlite3_commit_hook(D,C,P) and sqlite3_rollback_hook(D,C,P) functions
-** return the P argument from the previous call of the same function
-** on the same [database connection] D, or NULL for
-** the first call for each function on D.
-**
-** The commit and rollback hook callbacks are not reentrant.
-** The callback implementation must not do anything that will modify
-** the database connection that invoked the callback.  Any actions
-** to modify the database connection must be deferred until after the
-** completion of the [sqlite3_step()] call that triggered the commit
-** or rollback hook in the first place.
-** Note that running any other SQL statements, including SELECT statements,
-** or merely calling [sqlite3_prepare_v2()] and [sqlite3_step()] will modify
-** the database connections for the meaning of "modify" in this paragraph.
-**
-** ^Registering a NULL function disables the callback.
-**
-** ^When the commit hook callback routine returns zero, the [COMMIT]
-** operation is allowed to continue normally.  ^If the commit hook
-** returns non-zero, then the [COMMIT] is converted into a [ROLLBACK].
-** ^The rollback hook is invoked on a rollback that results from a commit
-** hook returning non-zero, just as it would be with any other rollback.
-**
-** ^For the purposes of this API, a transaction is said to have been
-** rolled back if an explicit "ROLLBACK" statement is executed, or
-** an error or constraint causes an implicit rollback to occur.
-** ^The rollback callback is not invoked if a transaction is
-** automatically rolled back because the database connection is closed.
-**
-** See also the [sqlite3_update_hook()] interface.
+** Virtual table implementations are allowed to set the
+** [sqlite3_index_info].idxFlags field to some combination of
+** these bits.
 */
-SQLITE_API void *sqlite3_commit_hook(sqlite3*, int(*)(void*), void*);
-SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
+#define SQLITE_INDEX_SCAN_UNIQUE 1 /* Scan visits at most 1 row */
 
 /*
-** CAPI3REF: Autovacuum Compaction Amount Callback
-** METHOD: sqlite3
+** CAPI3REF: Virtual Table Constraint Operator Codes
 **
-** ^The sqlite3_autovacuum_pages(D,C,P,X) interface registers a callback
-** function C that is invoked prior to each autovacuum of the database
-** file.  ^The callback is passed a copy of the generic data pointer (P),
-** the schema-name of the attached database that is being autovacuumed,
-** the the size of the database file in pages, the number of free pages,
-** and the number of bytes per page, respectively.  The callback should
-** return the number of free pages that should be removed by the
-** autovacuum.  ^If the callback returns zero, then no autovacuum happens.
-** ^If the value returned is greater than or equal to the number of
-** free pages, then a complete autovacuum happens.
-**
-** <p>^If there are multiple ATTACH-ed database files that are being
-** modified as part of a transaction commit, then the autovacuum pages
-** callback is invoked separately for each file.
-**
-** <p><b>The callback is not reentrant.</b> The callback function should
-** not attempt to invoke any other SQLite interface.  If it does, bad
-** things may happen, including segmentation faults and corrupt database
-** files.  The callback function should be a simple function that
-** does some arithmetic on its input parameters and returns a result.
-**
-** ^The X parameter to sqlite3_autovacuum_pages(D,C,P,X) is an optional
-** destructor for the P parameter.  ^If X is not NULL, then X(P) is
-** invoked whenever the database connection closes or when the callback
-** is overwritten by another invocation of sqlite3_autovacuum_pages().
-**
-** <p>^There is only one autovacuum pages callback per database connection.
-** ^Each call to the sqlite3_autovacuum_pages() interface overrides all
-** previous invocations for that database connection.  ^If the callback
-** argument (C) to sqlite3_autovacuum_pages(D,C,P,X) is a NULL pointer,
-** then the autovacuum steps callback is cancelled.  The return value
-** from sqlite3_autovacuum_pages() is normally SQLITE_OK, but might
-** be some other error code if something goes wrong.  The current
-** implementation will only return SQLITE_OK or SQLITE_MISUSE, but other
-** return codes might be added in future releases.
-**
-** <p>If no autovacuum pages callback is specified (the usual case) or
-** a NULL pointer is provided for the callback,
-** then the default behavior is to vacuum all free pages.  So, in other
-** words, the default behavior is the same as if the callback function
-** were something like this:
-**
-** <blockquote><pre>
-** &nbsp;   unsigned int demonstration_autovac_pages_callback(
-** &nbsp;     void *pClientData,
-** &nbsp;     const char *zSchema,
-** &nbsp;     unsigned int nDbPage,
-** &nbsp;     unsigned int nFreePage,
-** &nbsp;     unsigned int nBytePerPage
-** &nbsp;   ){
-** &nbsp;     return nFreePage;
-** &nbsp;   }
-** </pre></blockquote>
-*/
-SQLITE_API int sqlite3_autovacuum_pages(
-  sqlite3 *db,
-  unsigned int(*)(void*,const char*,unsigned int,unsigned int,unsigned int),
-  void*,
-  void(*)(void*)
-);
-
-
-/*
-** CAPI3REF: Data Change Notification Callbacks
-** METHOD: sqlite3
+** These macros define the allowed values for the
+** [sqlite3_index_info].aConstraint[].op field.  Each value represents
+** an operator that is part of a constraint term in the WHERE clause of
+** a query that uses a [virtual table].
 **
-** ^The sqlite3_update_hook() interface registers a callback function
-** with the [database connection] identified by the first argument
-** to be invoked whenever a row is updated, inserted or deleted in
-** a [rowid table].
-** ^Any callback set by a previous call to this function
-** for the same database connection is overridden.
-**
-** ^The second argument is a pointer to the function to invoke when a
-** row is updated, inserted or deleted in a rowid table.
-** ^The first argument to the callback is a copy of the third argument
-** to sqlite3_update_hook().
-** ^The second callback argument is one of [SQLITE_INSERT], [SQLITE_DELETE],
-** or [SQLITE_UPDATE], depending on the operation that caused the callback
-** to be invoked.
-** ^The third and fourth arguments to the callback contain pointers to the
-** database and table name containing the affected row.
-** ^The final callback parameter is the [rowid] of the row.
-** ^In the case of an update, this is the [rowid] after the update takes place.
-**
-** ^(The update hook is not invoked when internal system tables are
-** modified (i.e. sqlite_sequence).)^
-** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
-**
-** ^In the current implementation, the update hook
-** is not invoked when conflicting rows are deleted because of an
-** [ON CONFLICT | ON CONFLICT REPLACE] clause.  ^Nor is the update hook
-** invoked when rows are deleted using the [truncate optimization].
-** The exceptions defined in this paragraph might change in a future
-** release of SQLite.
+** ^The left-hand operand of the operator is given by the corresponding
+** aConstraint[].iColumn field.  ^An iColumn of -1 indicates the left-hand
+** operand is the rowid.
+** The SQLITE_INDEX_CONSTRAINT_LIMIT and SQLITE_INDEX_CONSTRAINT_OFFSET
+** operators have no left-hand operand, and so for those operators the
+** corresponding aConstraint[].iColumn is meaningless and should not be
+** used.
 **
-** The update hook implementation must not do anything that will modify
-** the database connection that invoked the update hook.  Any actions
-** to modify the database connection must be deferred until after the
-** completion of the [sqlite3_step()] call that triggered the update hook.
-** Note that [sqlite3_prepare_v2()] and [sqlite3_step()] both modify their
-** database connections for the meaning of "modify" in this paragraph.
+** All operator values from SQLITE_INDEX_CONSTRAINT_FUNCTION through
+** value 255 are reserved to represent functions that are overloaded
+** by the [xFindFunction|xFindFunction method] of the virtual table
+** implementation.
 **
-** ^The sqlite3_update_hook(D,C,P) function
-** returns the P argument from the previous call
-** on the same [database connection] D, or NULL for
-** the first call on D.
+** The right-hand operands for each constraint might be accessible using
+** the [sqlite3_vtab_rhs_value()] interface.  Usually the right-hand
+** operand is only available if it appears as a single constant literal
+** in the input SQL.  If the right-hand operand is another column or an
+** expression (even a constant expression) or a parameter, then the
+** sqlite3_vtab_rhs_value() probably will not be able to extract it.
+** ^The SQLITE_INDEX_CONSTRAINT_ISNULL and
+** SQLITE_INDEX_CONSTRAINT_ISNOTNULL operators have no right-hand operand
+** and hence calls to sqlite3_vtab_rhs_value() for those operators will
+** always return SQLITE_NOTFOUND.
 **
-** See also the [sqlite3_commit_hook()], [sqlite3_rollback_hook()],
-** and [sqlite3_preupdate_hook()] interfaces.
-*/
-SQLITE_API void *sqlite3_update_hook(
-  sqlite3*,
-  void(*)(void *,int ,char const *,char const *,sqlite3_int64),
-  void*
-);
-
-/*
-** CAPI3REF: Enable Or Disable Shared Pager Cache
-**
-** ^(This routine enables or disables the sharing of the database cache
-** and schema data structures between [database connection | connections]
-** to the same database. Sharing is enabled if the argument is true
-** and disabled if the argument is false.)^
-**
-** ^Cache sharing is enabled and disabled for an entire process.
-** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
-** In prior versions of SQLite,
-** sharing was enabled or disabled for each thread separately.
-**
-** ^(The cache sharing mode set by this interface effects all subsequent
-** calls to [sqlite3_open()], [sqlite3_open_v2()], and [sqlite3_open16()].
-** Existing database connections continue to use the sharing mode
-** that was in effect at the time they were opened.)^
-**
-** ^(This routine returns [SQLITE_OK] if shared cache was enabled or disabled
-** successfully.  An [error code] is returned otherwise.)^
-**
-** ^Shared cache is disabled by default. It is recommended that it stay
-** that way.  In other words, do not use this routine.  This interface
-** continues to be provided for historical compatibility, but its use is
-** discouraged.  Any use of shared cache is discouraged.  If shared cache
-** must be used, it is recommended that shared cache only be enabled for
-** individual database connections using the [sqlite3_open_v2()] interface
-** with the [SQLITE_OPEN_SHAREDCACHE] flag.
-**
-** Note: This method is disabled on MacOS X 10.7 and iOS version 5.0
-** and will always return SQLITE_MISUSE. On those systems,
-** shared cache mode should be enabled per-database connection via
-** [sqlite3_open_v2()] with [SQLITE_OPEN_SHAREDCACHE].
-**
-** This interface is threadsafe on processors where writing a
-** 32-bit integer is atomic.
-**
-** See Also:  [SQLite Shared-Cache Mode]
-*/
-SQLITE_API int sqlite3_enable_shared_cache(int);
-
-/*
-** CAPI3REF: Attempt To Free Heap Memory
-**
-** ^The sqlite3_release_memory() interface attempts to free N bytes
-** of heap memory by deallocating non-essential memory allocations
-** held by the database library.   Memory used to cache database
-** pages to improve performance is an example of non-essential memory.
-** ^sqlite3_release_memory() returns the number of bytes actually freed,
-** which might be more or less than the amount requested.
-** ^The sqlite3_release_memory() routine is a no-op returning zero
-** if SQLite is not compiled with [SQLITE_ENABLE_MEMORY_MANAGEMENT].
-**
-** See also: [sqlite3_db_release_memory()]
+** The collating sequence to be used for comparison can be found using
+** the [sqlite3_vtab_collation()] interface.  For most real-world virtual
+** tables, the collating sequence of constraints does not matter (for example
+** because the constraints are numeric) and so the sqlite3_vtab_collation()
+** interface is no commonly needed.
 */
-SQLITE_API int sqlite3_release_memory(int);
+#define SQLITE_INDEX_CONSTRAINT_EQ 2
+#define SQLITE_INDEX_CONSTRAINT_GT 4
+#define SQLITE_INDEX_CONSTRAINT_LE 8
+#define SQLITE_INDEX_CONSTRAINT_LT 16
+#define SQLITE_INDEX_CONSTRAINT_GE 32
+#define SQLITE_INDEX_CONSTRAINT_MATCH 64
+#define SQLITE_INDEX_CONSTRAINT_LIKE 65
+#define SQLITE_INDEX_CONSTRAINT_GLOB 66
+#define SQLITE_INDEX_CONSTRAINT_REGEXP 67
+#define SQLITE_INDEX_CONSTRAINT_NE 68
+#define SQLITE_INDEX_CONSTRAINT_ISNOT 69
+#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL 70
+#define SQLITE_INDEX_CONSTRAINT_ISNULL 71
+#define SQLITE_INDEX_CONSTRAINT_IS 72
+#define SQLITE_INDEX_CONSTRAINT_LIMIT 73
+#define SQLITE_INDEX_CONSTRAINT_OFFSET 74
+#define SQLITE_INDEX_CONSTRAINT_FUNCTION 150
+
+    /*
+    ** CAPI3REF: Register A Virtual Table Implementation
+    ** METHOD: sqlite3
+    **
+    ** ^These routines are used to register a new [virtual table module] name.
+    ** ^Module names must be registered before
+    ** creating a new [virtual table] using the module and before using a
+    ** preexisting [virtual table] for the module.
+    **
+    ** ^The module name is registered on the [database connection] specified
+    ** by the first parameter.  ^The name of the module is given by the
+    ** second parameter.  ^The third parameter is a pointer to
+    ** the implementation of the [virtual table module].   ^The fourth
+    ** parameter is an arbitrary client data pointer that is passed through
+    ** into the [xCreate] and [xConnect] methods of the virtual table module
+    ** when a new virtual table is be being created or reinitialized.
+    **
+    ** ^The sqlite3_create_module_v2() interface has a fifth parameter which
+    ** is a pointer to a destructor for the pClientData.  ^SQLite will
+    ** invoke the destructor function (if it is not NULL) when SQLite
+    ** no longer needs the pClientData pointer.  ^The destructor will also
+    ** be invoked if the call to sqlite3_create_module_v2() fails.
+    ** ^The sqlite3_create_module()
+    ** interface is equivalent to sqlite3_create_module_v2() with a NULL
+    ** destructor.
+    **
+    ** ^If the third parameter (the pointer to the sqlite3_module object) is
+    ** NULL then no new module is created and any existing modules with the
+    ** same name are dropped.
+    **
+    ** See also: [sqlite3_drop_modules()]
+    */
+    SQLITE_API int sqlite3_create_module(sqlite3* db,             /* SQLite connection to register module with */
+                                         const char* zName,       /* Name of the module */
+                                         const sqlite3_module* p, /* Methods for the module */
+                                         void* pClientData        /* Client data for xCreate/xConnect */
+    );
+    SQLITE_API int sqlite3_create_module_v2(sqlite3* db,             /* SQLite connection to register module with */
+                                            const char* zName,       /* Name of the module */
+                                            const sqlite3_module* p, /* Methods for the module */
+                                            void* pClientData,       /* Client data for xCreate/xConnect */
+                                            void (*xDestroy)(void*)  /* Module destructor function */
+    );
+
+    /*
+    ** CAPI3REF: Remove Unnecessary Virtual Table Implementations
+    ** METHOD: sqlite3
+    **
+    ** ^The sqlite3_drop_modules(D,L) interface removes all virtual
+    ** table modules from database connection D except those named on list L.
+    ** The L parameter must be either NULL or a pointer to an array of pointers
+    ** to strings where the array is terminated by a single NULL pointer.
+    ** ^If the L parameter is NULL, then all virtual table modules are removed.
+    **
+    ** See also: [sqlite3_create_module()]
+    */
+    SQLITE_API int sqlite3_drop_modules(sqlite3* db,        /* Remove modules from this connection */
+                                        const char** azKeep /* Except, do not remove the ones named here */
+    );
+
+    /*
+    ** CAPI3REF: Virtual Table Instance Object
+    ** KEYWORDS: sqlite3_vtab
+    **
+    ** Every [virtual table module] implementation uses a subclass
+    ** of this object to describe a particular instance
+    ** of the [virtual table].  Each subclass will
+    ** be tailored to the specific needs of the module implementation.
+    ** The purpose of this superclass is to define certain fields that are
+    ** common to all module implementations.
+    **
+    ** ^Virtual tables methods can set an error message by assigning a
+    ** string obtained from [sqlite3_mprintf()] to zErrMsg.  The method should
+    ** take care that any prior string is freed by a call to [sqlite3_free()]
+    ** prior to assigning a new string to zErrMsg.  ^After the error message
+    ** is delivered up to the client application, the string will be automatically
+    ** freed by sqlite3_free() and the zErrMsg field will be zeroed.
+    */
+    struct sqlite3_vtab
+    {
+        const sqlite3_module* pModule; /* The module for this virtual table */
+        int nRef;                      /* Number of open cursors */
+        char* zErrMsg;                 /* Error message from sqlite3_mprintf() */
+                                       /* Virtual table implementations will typically add additional fields */
+    };
+
+    /*
+    ** CAPI3REF: Virtual Table Cursor Object
+    ** KEYWORDS: sqlite3_vtab_cursor {virtual table cursor}
+    **
+    ** Every [virtual table module] implementation uses a subclass of the
+    ** following structure to describe cursors that point into the
+    ** [virtual table] and are used
+    ** to loop through the virtual table.  Cursors are created using the
+    ** [sqlite3_module.xOpen | xOpen] method of the module and are destroyed
+    ** by the [sqlite3_module.xClose | xClose] method.  Cursors are used
+    ** by the [xFilter], [xNext], [xEof], [xColumn], and [xRowid] methods
+    ** of the module.  Each module implementation will define
+    ** the content of a cursor structure to suit its own needs.
+    **
+    ** This superclass exists in order to define fields of the cursor that
+    ** are common to all implementations.
+    */
+    struct sqlite3_vtab_cursor
+    {
+        sqlite3_vtab* pVtab; /* Virtual table of this cursor */
+                             /* Virtual table implementations will typically add additional fields */
+    };
+
+    /*
+    ** CAPI3REF: Declare The Schema Of A Virtual Table
+    **
+    ** ^The [xCreate] and [xConnect] methods of a
+    ** [virtual table module] call this interface
+    ** to declare the format (the names and datatypes of the columns) of
+    ** the virtual tables they implement.
+    */
+    SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char* zSQL);
+
+    /*
+    ** CAPI3REF: Overload A Function For A Virtual Table
+    ** METHOD: sqlite3
+    **
+    ** ^(Virtual tables can provide alternative implementations of functions
+    ** using the [xFindFunction] method of the [virtual table module].
+    ** But global versions of those functions
+    ** must exist in order to be overloaded.)^
+    **
+    ** ^(This API makes sure a global version of a function with a particular
+    ** name and number of parameters exists.  If no such function exists
+    ** before this API is called, a new function is created.)^  ^The implementation
+    ** of the new function always causes an exception to be thrown.  So
+    ** the new function is not good for anything by itself.  Its only
+    ** purpose is to be a placeholder function that can be overloaded
+    ** by a [virtual table].
+    */
+    SQLITE_API int sqlite3_overload_function(sqlite3*, const char* zFuncName, int nArg);
+
+    /*
+    ** The interface to the virtual-table mechanism defined above (back up
+    ** to a comment remarkably similar to this one) is currently considered
+    ** to be experimental.  The interface might change in incompatible ways.
+    ** If this is a problem for you, do not use the interface at this time.
+    **
+    ** When the virtual-table mechanism stabilizes, we will declare the
+    ** interface fixed, support it indefinitely, and remove this comment.
+    */
+
+    /*
+    ** CAPI3REF: A Handle To An Open BLOB
+    ** KEYWORDS: {BLOB handle} {BLOB handles}
+    **
+    ** An instance of this object represents an open BLOB on which
+    ** [sqlite3_blob_open | incremental BLOB I/O] can be performed.
+    ** ^Objects of this type are created by [sqlite3_blob_open()]
+    ** and destroyed by [sqlite3_blob_close()].
+    ** ^The [sqlite3_blob_read()] and [sqlite3_blob_write()] interfaces
+    ** can be used to read or write small subsections of the BLOB.
+    ** ^The [sqlite3_blob_bytes()] interface returns the size of the BLOB in bytes.
+    */
+    typedef struct sqlite3_blob sqlite3_blob;
+
+    /*
+    ** CAPI3REF: Open A BLOB For Incremental I/O
+    ** METHOD: sqlite3
+    ** CONSTRUCTOR: sqlite3_blob
+    **
+    ** ^(This interfaces opens a [BLOB handle | handle] to the BLOB located
+    ** in row iRow, column zColumn, table zTable in database zDb;
+    ** in other words, the same BLOB that would be selected by:
+    **
+    ** <pre>
+    **     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
+    ** </pre>)^
+    **
+    ** ^(Parameter zDb is not the filename that contains the database, but
+    ** rather the symbolic name of the database. For attached databases, this is
+    ** the name that appears after the AS keyword in the [ATTACH] statement.
+    ** For the main database file, the database name is "main". For TEMP
+    ** tables, the database name is "temp".)^
+    **
+    ** ^If the flags parameter is non-zero, then the BLOB is opened for read
+    ** and write access. ^If the flags parameter is zero, the BLOB is opened for
+    ** read-only access.
+    **
+    ** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
+    ** in *ppBlob. Otherwise an [error code] is returned and, unless the error
+    ** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
+    ** the API is not misused, it is always safe to call [sqlite3_blob_close()]
+    ** on *ppBlob after this function it returns.
+    **
+    ** This function fails with SQLITE_ERROR if any of the following are true:
+    ** <ul>
+    **   <li> ^(Database zDb does not exist)^,
+    **   <li> ^(Table zTable does not exist within database zDb)^,
+    **   <li> ^(Table zTable is a WITHOUT ROWID table)^,
+    **   <li> ^(Column zColumn does not exist)^,
+    **   <li> ^(Row iRow is not present in the table)^,
+    **   <li> ^(The specified column of row iRow contains a value that is not
+    **         a TEXT or BLOB value)^,
+    **   <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE
+    **         constraint and the blob is being opened for read/write access)^,
+    **   <li> ^([foreign key constraints | Foreign key constraints] are enabled,
+    **         column zColumn is part of a [child key] definition and the blob is
+    **         being opened for read/write access)^.
+    ** </ul>
+    **
+    ** ^Unless it returns SQLITE_MISUSE, this function sets the
+    ** [database connection] error code and message accessible via
+    ** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
+    **
+    ** A BLOB referenced by sqlite3_blob_open() may be read using the
+    ** [sqlite3_blob_read()] interface and modified by using
+    ** [sqlite3_blob_write()].  The [BLOB handle] can be moved to a
+    ** different row of the same table using the [sqlite3_blob_reopen()]
+    ** interface.  However, the column, table, or database of a [BLOB handle]
+    ** cannot be changed after the [BLOB handle] is opened.
+    **
+    ** ^(If the row that a BLOB handle points to is modified by an
+    ** [UPDATE], [DELETE], or by [ON CONFLICT] side-effects
+    ** then the BLOB handle is marked as "expired".
+    ** This is true if any column of the row is changed, even a column
+    ** other than the one the BLOB handle is open on.)^
+    ** ^Calls to [sqlite3_blob_read()] and [sqlite3_blob_write()] for
+    ** an expired BLOB handle fail with a return code of [SQLITE_ABORT].
+    ** ^(Changes written into a BLOB prior to the BLOB expiring are not
+    ** rolled back by the expiration of the BLOB.  Such changes will eventually
+    ** commit if the transaction continues to completion.)^
+    **
+    ** ^Use the [sqlite3_blob_bytes()] interface to determine the size of
+    ** the opened blob.  ^The size of a blob may not be changed by this
+    ** interface.  Use the [UPDATE] SQL command to change the size of a
+    ** blob.
+    **
+    ** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
+    ** and the built-in [zeroblob] SQL function may be used to create a
+    ** zero-filled blob to read or write using the incremental-blob interface.
+    **
+    ** To avoid a resource leak, every open [BLOB handle] should eventually
+    ** be released by a call to [sqlite3_blob_close()].
+    **
+    ** See also: [sqlite3_blob_close()],
+    ** [sqlite3_blob_reopen()], [sqlite3_blob_read()],
+    ** [sqlite3_blob_bytes()], [sqlite3_blob_write()].
+    */
+    SQLITE_API int sqlite3_blob_open(sqlite3*,
+                                     const char* zDb,
+                                     const char* zTable,
+                                     const char* zColumn,
+                                     sqlite3_int64 iRow,
+                                     int flags,
+                                     sqlite3_blob** ppBlob);
+
+    /*
+    ** CAPI3REF: Move a BLOB Handle to a New Row
+    ** METHOD: sqlite3_blob
+    **
+    ** ^This function is used to move an existing [BLOB handle] so that it points
+    ** to a different row of the same database table. ^The new row is identified
+    ** by the rowid value passed as the second argument. Only the row can be
+    ** changed. ^The database, table and column on which the blob handle is open
+    ** remain the same. Moving an existing [BLOB handle] to a new row is
+    ** faster than closing the existing handle and opening a new one.
+    **
+    ** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] -
+    ** it must exist and there must be either a blob or text value stored in
+    ** the nominated column.)^ ^If the new row is not present in the table, or if
+    ** it does not contain a blob or text value, or if another error occurs, an
+    ** SQLite error code is returned and the blob handle is considered aborted.
+    ** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or
+    ** [sqlite3_blob_reopen()] on an aborted blob handle immediately return
+    ** SQLITE_ABORT. ^Calling [sqlite3_blob_bytes()] on an aborted blob handle
+    ** always returns zero.
+    **
+    ** ^This function sets the database handle error code and message.
+    */
+    SQLITE_API int sqlite3_blob_reopen(sqlite3_blob*, sqlite3_int64);
+
+    /*
+    ** CAPI3REF: Close A BLOB Handle
+    ** DESTRUCTOR: sqlite3_blob
+    **
+    ** ^This function closes an open [BLOB handle]. ^(The BLOB handle is closed
+    ** unconditionally.  Even if this routine returns an error code, the
+    ** handle is still closed.)^
+    **
+    ** ^If the blob handle being closed was opened for read-write access, and if
+    ** the database is in auto-commit mode and there are no other open read-write
+    ** blob handles or active write statements, the current transaction is
+    ** committed. ^If an error occurs while committing the transaction, an error
+    ** code is returned and the transaction rolled back.
+    **
+    ** Calling this function with an argument that is not a NULL pointer or an
+    ** open blob handle results in undefined behaviour. ^Calling this routine
+    ** with a null pointer (such as would be returned by a failed call to
+    ** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
+    ** is passed a valid open blob handle, the values returned by the
+    ** sqlite3_errcode() and sqlite3_errmsg() functions are set before returning.
+    */
+    SQLITE_API int sqlite3_blob_close(sqlite3_blob*);
+
+    /*
+    ** CAPI3REF: Return The Size Of An Open BLOB
+    ** METHOD: sqlite3_blob
+    **
+    ** ^Returns the size in bytes of the BLOB accessible via the
+    ** successfully opened [BLOB handle] in its only argument.  ^The
+    ** incremental blob I/O routines can only read or overwriting existing
+    ** blob content; they cannot change the size of a blob.
+    **
+    ** This routine only works on a [BLOB handle] which has been created
+    ** by a prior successful call to [sqlite3_blob_open()] and which has not
+    ** been closed by [sqlite3_blob_close()].  Passing any other pointer in
+    ** to this routine results in undefined and probably undesirable behavior.
+    */
+    SQLITE_API int sqlite3_blob_bytes(sqlite3_blob*);
+
+    /*
+    ** CAPI3REF: Read Data From A BLOB Incrementally
+    ** METHOD: sqlite3_blob
+    **
+    ** ^(This function is used to read data from an open [BLOB handle] into a
+    ** caller-supplied buffer. N bytes of data are copied into buffer Z
+    ** from the open BLOB, starting at offset iOffset.)^
+    **
+    ** ^If offset iOffset is less than N bytes from the end of the BLOB,
+    ** [SQLITE_ERROR] is returned and no data is read.  ^If N or iOffset is
+    ** less than zero, [SQLITE_ERROR] is returned and no data is read.
+    ** ^The size of the blob (and hence the maximum value of N+iOffset)
+    ** can be determined using the [sqlite3_blob_bytes()] interface.
+    **
+    ** ^An attempt to read from an expired [BLOB handle] fails with an
+    ** error code of [SQLITE_ABORT].
+    **
+    ** ^(On success, sqlite3_blob_read() returns SQLITE_OK.
+    ** Otherwise, an [error code] or an [extended error code] is returned.)^
+    **
+    ** This routine only works on a [BLOB handle] which has been created
+    ** by a prior successful call to [sqlite3_blob_open()] and which has not
+    ** been closed by [sqlite3_blob_close()].  Passing any other pointer in
+    ** to this routine results in undefined and probably undesirable behavior.
+    **
+    ** See also: [sqlite3_blob_write()].
+    */
+    SQLITE_API int sqlite3_blob_read(sqlite3_blob*, void* Z, int N, int iOffset);
+
+    /*
+    ** CAPI3REF: Write Data Into A BLOB Incrementally
+    ** METHOD: sqlite3_blob
+    **
+    ** ^(This function is used to write data into an open [BLOB handle] from a
+    ** caller-supplied buffer. N bytes of data are copied from the buffer Z
+    ** into the open BLOB, starting at offset iOffset.)^
+    **
+    ** ^(On success, sqlite3_blob_write() returns SQLITE_OK.
+    ** Otherwise, an  [error code] or an [extended error code] is returned.)^
+    ** ^Unless SQLITE_MISUSE is returned, this function sets the
+    ** [database connection] error code and message accessible via
+    ** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
+    **
+    ** ^If the [BLOB handle] passed as the first argument was not opened for
+    ** writing (the flags parameter to [sqlite3_blob_open()] was zero),
+    ** this function returns [SQLITE_READONLY].
+    **
+    ** This function may only modify the contents of the BLOB; it is
+    ** not possible to increase the size of a BLOB using this API.
+    ** ^If offset iOffset is less than N bytes from the end of the BLOB,
+    ** [SQLITE_ERROR] is returned and no data is written. The size of the
+    ** BLOB (and hence the maximum value of N+iOffset) can be determined
+    ** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less
+    ** than zero [SQLITE_ERROR] is returned and no data is written.
+    **
+    ** ^An attempt to write to an expired [BLOB handle] fails with an
+    ** error code of [SQLITE_ABORT].  ^Writes to the BLOB that occurred
+    ** before the [BLOB handle] expired are not rolled back by the
+    ** expiration of the handle, though of course those changes might
+    ** have been overwritten by the statement that expired the BLOB handle
+    ** or by other independent statements.
+    **
+    ** This routine only works on a [BLOB handle] which has been created
+    ** by a prior successful call to [sqlite3_blob_open()] and which has not
+    ** been closed by [sqlite3_blob_close()].  Passing any other pointer in
+    ** to this routine results in undefined and probably undesirable behavior.
+    **
+    ** See also: [sqlite3_blob_read()].
+    */
+    SQLITE_API int sqlite3_blob_write(sqlite3_blob*, const void* z, int n, int iOffset);
+
+    /*
+    ** CAPI3REF: Virtual File System Objects
+    **
+    ** A virtual filesystem (VFS) is an [sqlite3_vfs] object
+    ** that SQLite uses to interact
+    ** with the underlying operating system.  Most SQLite builds come with a
+    ** single default VFS that is appropriate for the host computer.
+    ** New VFSes can be registered and existing VFSes can be unregistered.
+    ** The following interfaces are provided.
+    **
+    ** ^The sqlite3_vfs_find() interface returns a pointer to a VFS given its name.
+    ** ^Names are case sensitive.
+    ** ^Names are zero-terminated UTF-8 strings.
+    ** ^If there is no match, a NULL pointer is returned.
+    ** ^If zVfsName is NULL then the default VFS is returned.
+    **
+    ** ^New VFSes are registered with sqlite3_vfs_register().
+    ** ^Each new VFS becomes the default VFS if the makeDflt flag is set.
+    ** ^The same VFS can be registered multiple times without injury.
+    ** ^To make an existing VFS into the default VFS, register it again
+    ** with the makeDflt flag set.  If two different VFSes with the
+    ** same name are registered, the behavior is undefined.  If a
+    ** VFS is registered with a name that is NULL or an empty string,
+    ** then the behavior is undefined.
+    **
+    ** ^Unregister a VFS with the sqlite3_vfs_unregister() interface.
+    ** ^(If the default VFS is unregistered, another VFS is chosen as
+    ** the default.  The choice for the new VFS is arbitrary.)^
+    */
+    SQLITE_API sqlite3_vfs* sqlite3_vfs_find(const char* zVfsName);
+    SQLITE_API int sqlite3_vfs_register(sqlite3_vfs*, int makeDflt);
+    SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
+
+    /*
+    ** CAPI3REF: Mutexes
+    **
+    ** The SQLite core uses these routines for thread
+    ** synchronization. Though they are intended for internal
+    ** use by SQLite, code that links against SQLite is
+    ** permitted to use any of these routines.
+    **
+    ** The SQLite source code contains multiple implementations
+    ** of these mutex routines.  An appropriate implementation
+    ** is selected automatically at compile-time.  The following
+    ** implementations are available in the SQLite core:
+    **
+    ** <ul>
+    ** <li>   SQLITE_MUTEX_PTHREADS
+    ** <li>   SQLITE_MUTEX_W32
+    ** <li>   SQLITE_MUTEX_NOOP
+    ** </ul>
+    **
+    ** The SQLITE_MUTEX_NOOP implementation is a set of routines
+    ** that does no real locking and is appropriate for use in
+    ** a single-threaded application.  The SQLITE_MUTEX_PTHREADS and
+    ** SQLITE_MUTEX_W32 implementations are appropriate for use on Unix
+    ** and Windows.
+    **
+    ** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
+    ** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
+    ** implementation is included with the library. In this case the
+    ** application must supply a custom mutex implementation using the
+    ** [SQLITE_CONFIG_MUTEX] option of the sqlite3_config() function
+    ** before calling sqlite3_initialize() or any other public sqlite3_
+    ** function that calls sqlite3_initialize().
+    **
+    ** ^The sqlite3_mutex_alloc() routine allocates a new
+    ** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
+    ** routine returns NULL if it is unable to allocate the requested
+    ** mutex.  The argument to sqlite3_mutex_alloc() must one of these
+    ** integer constants:
+    **
+    ** <ul>
+    ** <li>  SQLITE_MUTEX_FAST
+    ** <li>  SQLITE_MUTEX_RECURSIVE
+    ** <li>  SQLITE_MUTEX_STATIC_MAIN
+    ** <li>  SQLITE_MUTEX_STATIC_MEM
+    ** <li>  SQLITE_MUTEX_STATIC_OPEN
+    ** <li>  SQLITE_MUTEX_STATIC_PRNG
+    ** <li>  SQLITE_MUTEX_STATIC_LRU
+    ** <li>  SQLITE_MUTEX_STATIC_PMEM
+    ** <li>  SQLITE_MUTEX_STATIC_APP1
+    ** <li>  SQLITE_MUTEX_STATIC_APP2
+    ** <li>  SQLITE_MUTEX_STATIC_APP3
+    ** <li>  SQLITE_MUTEX_STATIC_VFS1
+    ** <li>  SQLITE_MUTEX_STATIC_VFS2
+    ** <li>  SQLITE_MUTEX_STATIC_VFS3
+    ** </ul>
+    **
+    ** ^The first two constants (SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE)
+    ** cause sqlite3_mutex_alloc() to create
+    ** a new mutex.  ^The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
+    ** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
+    ** The mutex implementation does not need to make a distinction
+    ** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
+    ** not want to.  SQLite will only request a recursive mutex in
+    ** cases where it really needs one.  If a faster non-recursive mutex
+    ** implementation is available on the host platform, the mutex subsystem
+    ** might return such a mutex in response to SQLITE_MUTEX_FAST.
+    **
+    ** ^The other allowed parameters to sqlite3_mutex_alloc() (anything other
+    ** than SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE) each return
+    ** a pointer to a static preexisting mutex.  ^Nine static mutexes are
+    ** used by the current version of SQLite.  Future versions of SQLite
+    ** may add additional static mutexes.  Static mutexes are for internal
+    ** use by SQLite only.  Applications that use SQLite mutexes should
+    ** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
+    ** SQLITE_MUTEX_RECURSIVE.
+    **
+    ** ^Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
+    ** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
+    ** returns a different mutex on every call.  ^For the static
+    ** mutex types, the same mutex is returned on every call that has
+    ** the same type number.
+    **
+    ** ^The sqlite3_mutex_free() routine deallocates a previously
+    ** allocated dynamic mutex.  Attempting to deallocate a static
+    ** mutex results in undefined behavior.
+    **
+    ** ^The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
+    ** to enter a mutex.  ^If another thread is already within the mutex,
+    ** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
+    ** SQLITE_BUSY.  ^The sqlite3_mutex_try() interface returns [SQLITE_OK]
+    ** upon successful entry.  ^(Mutexes created using
+    ** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
+    ** In such cases, the
+    ** mutex must be exited an equal number of times before another thread
+    ** can enter.)^  If the same thread tries to enter any mutex other
+    ** than an SQLITE_MUTEX_RECURSIVE more than once, the behavior is undefined.
+    **
+    ** ^(Some systems (for example, Windows 95) do not support the operation
+    ** implemented by sqlite3_mutex_try().  On those systems, sqlite3_mutex_try()
+    ** will always return SQLITE_BUSY. The SQLite core only ever uses
+    ** sqlite3_mutex_try() as an optimization so this is acceptable
+    ** behavior.)^
+    **
+    ** ^The sqlite3_mutex_leave() routine exits a mutex that was
+    ** previously entered by the same thread.   The behavior
+    ** is undefined if the mutex is not currently entered by the
+    ** calling thread or is not currently allocated.
+    **
+    ** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(), or
+    ** sqlite3_mutex_leave() is a NULL pointer, then all three routines
+    ** behave as no-ops.
+    **
+    ** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
+    */
+    SQLITE_API sqlite3_mutex* sqlite3_mutex_alloc(int);
+    SQLITE_API void sqlite3_mutex_free(sqlite3_mutex*);
+    SQLITE_API void sqlite3_mutex_enter(sqlite3_mutex*);
+    SQLITE_API int sqlite3_mutex_try(sqlite3_mutex*);
+    SQLITE_API void sqlite3_mutex_leave(sqlite3_mutex*);
+
+    /*
+    ** CAPI3REF: Mutex Methods Object
+    **
+    ** An instance of this structure defines the low-level routines
+    ** used to allocate and use mutexes.
+    **
+    ** Usually, the default mutex implementations provided by SQLite are
+    ** sufficient, however the application has the option of substituting a custom
+    ** implementation for specialized deployments or systems for which SQLite
+    ** does not provide a suitable implementation. In this case, the application
+    ** creates and populates an instance of this structure to pass
+    ** to sqlite3_config() along with the [SQLITE_CONFIG_MUTEX] option.
+    ** Additionally, an instance of this structure can be used as an
+    ** output variable when querying the system for the current mutex
+    ** implementation, using the [SQLITE_CONFIG_GETMUTEX] option.
+    **
+    ** ^The xMutexInit method defined by this structure is invoked as
+    ** part of system initialization by the sqlite3_initialize() function.
+    ** ^The xMutexInit routine is called by SQLite exactly once for each
+    ** effective call to [sqlite3_initialize()].
+    **
+    ** ^The xMutexEnd method defined by this structure is invoked as
+    ** part of system shutdown by the sqlite3_shutdown() function. The
+    ** implementation of this method is expected to release all outstanding
+    ** resources obtained by the mutex methods implementation, especially
+    ** those obtained by the xMutexInit method.  ^The xMutexEnd()
+    ** interface is invoked exactly once for each call to [sqlite3_shutdown()].
+    **
+    ** ^(The remaining seven methods defined by this structure (xMutexAlloc,
+    ** xMutexFree, xMutexEnter, xMutexTry, xMutexLeave, xMutexHeld and
+    ** xMutexNotheld) implement the following interfaces (respectively):
+    **
+    ** <ul>
+    **   <li>  [sqlite3_mutex_alloc()] </li>
+    **   <li>  [sqlite3_mutex_free()] </li>
+    **   <li>  [sqlite3_mutex_enter()] </li>
+    **   <li>  [sqlite3_mutex_try()] </li>
+    **   <li>  [sqlite3_mutex_leave()] </li>
+    **   <li>  [sqlite3_mutex_held()] </li>
+    **   <li>  [sqlite3_mutex_notheld()] </li>
+    ** </ul>)^
+    **
+    ** The only difference is that the public sqlite3_XXX functions enumerated
+    ** above silently ignore any invocations that pass a NULL pointer instead
+    ** of a valid mutex handle. The implementations of the methods defined
+    ** by this structure are not required to handle this case. The results
+    ** of passing a NULL pointer instead of a valid mutex handle are undefined
+    ** (i.e. it is acceptable to provide an implementation that segfaults if
+    ** it is passed a NULL pointer).
+    **
+    ** The xMutexInit() method must be threadsafe.  It must be harmless to
+    ** invoke xMutexInit() multiple times within the same process and without
+    ** intervening calls to xMutexEnd().  Second and subsequent calls to
+    ** xMutexInit() must be no-ops.
+    **
+    ** xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
+    ** and its associates).  Similarly, xMutexAlloc() must not use SQLite memory
+    ** allocation for a static mutex.  ^However xMutexAlloc() may use SQLite
+    ** memory allocation for a fast or recursive mutex.
+    **
+    ** ^SQLite will invoke the xMutexEnd() method when [sqlite3_shutdown()] is
+    ** called, but only if the prior call to xMutexInit returned SQLITE_OK.
+    ** If xMutexInit fails in any way, it is expected to clean up after itself
+    ** prior to returning.
+    */
+    typedef struct sqlite3_mutex_methods sqlite3_mutex_methods;
+    struct sqlite3_mutex_methods
+    {
+        int (*xMutexInit)(void);
+        int (*xMutexEnd)(void);
+        sqlite3_mutex* (*xMutexAlloc)(int);
+        void (*xMutexFree)(sqlite3_mutex*);
+        void (*xMutexEnter)(sqlite3_mutex*);
+        int (*xMutexTry)(sqlite3_mutex*);
+        void (*xMutexLeave)(sqlite3_mutex*);
+        int (*xMutexHeld)(sqlite3_mutex*);
+        int (*xMutexNotheld)(sqlite3_mutex*);
+    };
 
 /*
-** CAPI3REF: Free Memory Used By A Database Connection
-** METHOD: sqlite3
+** CAPI3REF: Mutex Verification Routines
 **
-** ^The sqlite3_db_release_memory(D) interface attempts to free as much heap
-** memory as possible from database connection D. Unlike the
-** [sqlite3_release_memory()] interface, this interface is in effect even
-** when the [SQLITE_ENABLE_MEMORY_MANAGEMENT] compile-time option is
-** omitted.
-**
-** See also: [sqlite3_release_memory()]
-*/
-SQLITE_API int sqlite3_db_release_memory(sqlite3*);
-
-/*
-** CAPI3REF: Impose A Limit On Heap Size
-**
-** These interfaces impose limits on the amount of heap memory that will be
-** by all database connections within a single process.
-**
-** ^The sqlite3_soft_heap_limit64() interface sets and/or queries the
-** soft limit on the amount of heap memory that may be allocated by SQLite.
-** ^SQLite strives to keep heap memory utilization below the soft heap
-** limit by reducing the number of pages held in the page cache
-** as heap memory usages approaches the limit.
-** ^The soft heap limit is "soft" because even though SQLite strives to stay
-** below the limit, it will exceed the limit rather than generate
-** an [SQLITE_NOMEM] error.  In other words, the soft heap limit
-** is advisory only.
-**
-** ^The sqlite3_hard_heap_limit64(N) interface sets a hard upper bound of
-** N bytes on the amount of memory that will be allocated.  ^The
-** sqlite3_hard_heap_limit64(N) interface is similar to
-** sqlite3_soft_heap_limit64(N) except that memory allocations will fail
-** when the hard heap limit is reached.
-**
-** ^The return value from both sqlite3_soft_heap_limit64() and
-** sqlite3_hard_heap_limit64() is the size of
-** the heap limit prior to the call, or negative in the case of an
-** error.  ^If the argument N is negative
-** then no change is made to the heap limit.  Hence, the current
-** size of heap limits can be determined by invoking
-** sqlite3_soft_heap_limit64(-1) or sqlite3_hard_heap_limit(-1).
-**
-** ^Setting the heap limits to zero disables the heap limiter mechanism.
-**
-** ^The soft heap limit may not be greater than the hard heap limit.
-** ^If the hard heap limit is enabled and if sqlite3_soft_heap_limit(N)
-** is invoked with a value of N that is greater than the hard heap limit,
-** the the soft heap limit is set to the value of the hard heap limit.
-** ^The soft heap limit is automatically enabled whenever the hard heap
-** limit is enabled. ^When sqlite3_hard_heap_limit64(N) is invoked and
-** the soft heap limit is outside the range of 1..N, then the soft heap
-** limit is set to N.  ^Invoking sqlite3_soft_heap_limit64(0) when the
-** hard heap limit is enabled makes the soft heap limit equal to the
-** hard heap limit.
-**
-** The memory allocation limits can also be adjusted using
-** [PRAGMA soft_heap_limit] and [PRAGMA hard_heap_limit].
-**
-** ^(The heap limits are not enforced in the current implementation
-** if one or more of following conditions are true:
-**
-** <ul>
-** <li> The limit value is set to zero.
-** <li> Memory accounting is disabled using a combination of the
-**      [sqlite3_config]([SQLITE_CONFIG_MEMSTATUS],...) start-time option and
-**      the [SQLITE_DEFAULT_MEMSTATUS] compile-time option.
-** <li> An alternative page cache implementation is specified using
-**      [sqlite3_config]([SQLITE_CONFIG_PCACHE2],...).
-** <li> The page cache allocates from its own memory pool supplied
-**      by [sqlite3_config]([SQLITE_CONFIG_PAGECACHE],...) rather than
-**      from the heap.
-** </ul>)^
-**
-** The circumstances under which SQLite will enforce the heap limits may
-** changes in future releases of SQLite.
-*/
-SQLITE_API sqlite3_int64 sqlite3_soft_heap_limit64(sqlite3_int64 N);
-SQLITE_API sqlite3_int64 sqlite3_hard_heap_limit64(sqlite3_int64 N);
-
-/*
-** CAPI3REF: Deprecated Soft Heap Limit Interface
-** DEPRECATED
-**
-** This is a deprecated version of the [sqlite3_soft_heap_limit64()]
-** interface.  This routine is provided for historical compatibility
-** only.  All new applications should use the
-** [sqlite3_soft_heap_limit64()] interface rather than this one.
-*/
-SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N);
-
-
-/*
-** CAPI3REF: Extract Metadata About A Column Of A Table
-** METHOD: sqlite3
-**
-** ^(The sqlite3_table_column_metadata(X,D,T,C,....) routine returns
-** information about column C of table T in database D
-** on [database connection] X.)^  ^The sqlite3_table_column_metadata()
-** interface returns SQLITE_OK and fills in the non-NULL pointers in
-** the final five arguments with appropriate values if the specified
-** column exists.  ^The sqlite3_table_column_metadata() interface returns
-** SQLITE_ERROR if the specified column does not exist.
-** ^If the column-name parameter to sqlite3_table_column_metadata() is a
-** NULL pointer, then this routine simply checks for the existence of the
-** table and returns SQLITE_OK if the table exists and SQLITE_ERROR if it
-** does not.  If the table name parameter T in a call to
-** sqlite3_table_column_metadata(X,D,T,C,...) is NULL then the result is
-** undefined behavior.
-**
-** ^The column is identified by the second, third and fourth parameters to
-** this function. ^(The second parameter is either the name of the database
-** (i.e. "main", "temp", or an attached database) containing the specified
-** table or NULL.)^ ^If it is NULL, then all attached databases are searched
-** for the table using the same algorithm used by the database engine to
-** resolve unqualified table references.
-**
-** ^The third and fourth parameters to this function are the table and column
-** name of the desired column, respectively.
-**
-** ^Metadata is returned by writing to the memory locations passed as the 5th
-** and subsequent parameters to this function. ^Any of these arguments may be
-** NULL, in which case the corresponding element of metadata is omitted.
-**
-** ^(<blockquote>
-** <table border="1">
-** <tr><th> Parameter <th> Output<br>Type <th>  Description
-**
-** <tr><td> 5th <td> const char* <td> Data type
-** <tr><td> 6th <td> const char* <td> Name of default collation sequence
-** <tr><td> 7th <td> int         <td> True if column has a NOT NULL constraint
-** <tr><td> 8th <td> int         <td> True if column is part of the PRIMARY KEY
-** <tr><td> 9th <td> int         <td> True if column is [AUTOINCREMENT]
-** </table>
-** </blockquote>)^
-**
-** ^The memory pointed to by the character pointers returned for the
-** declaration type and collation sequence is valid until the next
-** call to any SQLite API function.
-**
-** ^If the specified table is actually a view, an [error code] is returned.
-**
-** ^If the specified column is "rowid", "oid" or "_rowid_" and the table
-** is not a [WITHOUT ROWID] table and an
-** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output
-** parameters are set for the explicitly declared column. ^(If there is no
-** [INTEGER PRIMARY KEY] column, then the outputs
-** for the [rowid] are set as follows:
-**
-** <pre>
-**     data type: "INTEGER"
-**     collation sequence: "BINARY"
-**     not null: 0
-**     primary key: 1
-**     auto increment: 0
-** </pre>)^
-**
-** ^This function causes all database schemas to be read from disk and
-** parsed, if that has not already been done, and returns an error if
-** any errors are encountered while loading the schema.
-*/
-SQLITE_API int sqlite3_table_column_metadata(
-  sqlite3 *db,                /* Connection handle */
-  const char *zDbName,        /* Database name or NULL */
-  const char *zTableName,     /* Table name */
-  const char *zColumnName,    /* Column name */
-  char const **pzDataType,    /* OUTPUT: Declared data type */
-  char const **pzCollSeq,     /* OUTPUT: Collation sequence name */
-  int *pNotNull,              /* OUTPUT: True if NOT NULL constraint exists */
-  int *pPrimaryKey,           /* OUTPUT: True if column part of PK */
-  int *pAutoinc               /* OUTPUT: True if column is auto-increment */
-);
-
-/*
-** CAPI3REF: Load An Extension
-** METHOD: sqlite3
-**
-** ^This interface loads an SQLite extension library from the named file.
-**
-** ^The sqlite3_load_extension() interface attempts to load an
-** [SQLite extension] library contained in the file zFile.  If
-** the file cannot be loaded directly, attempts are made to load
-** with various operating-system specific extensions added.
-** So for example, if "samplelib" cannot be loaded, then names like
-** "samplelib.so" or "samplelib.dylib" or "samplelib.dll" might
-** be tried also.
-**
-** ^The entry point is zProc.
-** ^(zProc may be 0, in which case SQLite will try to come up with an
-** entry point name on its own.  It first tries "sqlite3_extension_init".
-** If that does not work, it constructs a name "sqlite3_X_init" where the
-** X is consists of the lower-case equivalent of all ASCII alphabetic
-** characters in the filename from the last "/" to the first following
-** "." and omitting any initial "lib".)^
-** ^The sqlite3_load_extension() interface returns
-** [SQLITE_OK] on success and [SQLITE_ERROR] if something goes wrong.
-** ^If an error occurs and pzErrMsg is not 0, then the
-** [sqlite3_load_extension()] interface shall attempt to
-** fill *pzErrMsg with error message text stored in memory
-** obtained from [sqlite3_malloc()]. The calling function
-** should free this memory by calling [sqlite3_free()].
-**
-** ^Extension loading must be enabled using
-** [sqlite3_enable_load_extension()] or
-** [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],1,NULL)
-** prior to calling this API,
-** otherwise an error will be returned.
-**
-** <b>Security warning:</b> It is recommended that the
-** [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method be used to enable only this
-** interface.  The use of the [sqlite3_enable_load_extension()] interface
-** should be avoided.  This will keep the SQL function [load_extension()]
-** disabled and prevent SQL injections from giving attackers
-** access to extension loading capabilities.
-**
-** See also the [load_extension() SQL function].
-*/
-SQLITE_API int sqlite3_load_extension(
-  sqlite3 *db,          /* Load the extension into this database connection */
-  const char *zFile,    /* Name of the shared library containing extension */
-  const char *zProc,    /* Entry point.  Derived from zFile if 0 */
-  char **pzErrMsg       /* Put error message here if not 0 */
-);
-
-/*
-** CAPI3REF: Enable Or Disable Extension Loading
-** METHOD: sqlite3
-**
-** ^So as not to open security holes in older applications that are
-** unprepared to deal with [extension loading], and as a means of disabling
-** [extension loading] while evaluating user-entered SQL, the following API
-** is provided to turn the [sqlite3_load_extension()] mechanism on and off.
-**
-** ^Extension loading is off by default.
-** ^Call the sqlite3_enable_load_extension() routine with onoff==1
-** to turn extension loading on and call it with onoff==0 to turn
-** it back off again.
-**
-** ^This interface enables or disables both the C-API
-** [sqlite3_load_extension()] and the SQL function [load_extension()].
-** ^(Use [sqlite3_db_config](db,[SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION],..)
-** to enable or disable only the C-API.)^
-**
-** <b>Security warning:</b> It is recommended that extension loading
-** be enabled using the [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method
-** rather than this interface, so the [load_extension()] SQL function
-** remains disabled. This will prevent SQL injections from giving attackers
-** access to extension loading capabilities.
-*/
-SQLITE_API int sqlite3_enable_load_extension(sqlite3 *db, int onoff);
-
-/*
-** CAPI3REF: Automatically Load Statically Linked Extensions
-**
-** ^This interface causes the xEntryPoint() function to be invoked for
-** each new [database connection] that is created.  The idea here is that
-** xEntryPoint() is the entry point for a statically linked [SQLite extension]
-** that is to be automatically loaded into all new database connections.
-**
-** ^(Even though the function prototype shows that xEntryPoint() takes
-** no arguments and returns void, SQLite invokes xEntryPoint() with three
-** arguments and expects an integer result as if the signature of the
-** entry point where as follows:
-**
-** <blockquote><pre>
-** &nbsp;  int xEntryPoint(
-** &nbsp;    sqlite3 *db,
-** &nbsp;    const char **pzErrMsg,
-** &nbsp;    const struct sqlite3_api_routines *pThunk
-** &nbsp;  );
-** </pre></blockquote>)^
-**
-** If the xEntryPoint routine encounters an error, it should make *pzErrMsg
-** point to an appropriate error message (obtained from [sqlite3_mprintf()])
-** and return an appropriate [error code].  ^SQLite ensures that *pzErrMsg
-** is NULL before calling the xEntryPoint().  ^SQLite will invoke
-** [sqlite3_free()] on *pzErrMsg after xEntryPoint() returns.  ^If any
-** xEntryPoint() returns an error, the [sqlite3_open()], [sqlite3_open16()],
-** or [sqlite3_open_v2()] call that provoked the xEntryPoint() will fail.
-**
-** ^Calling sqlite3_auto_extension(X) with an entry point X that is already
-** on the list of automatic extensions is a harmless no-op. ^No entry point
-** will be called more than once for each database connection that is opened.
-**
-** See also: [sqlite3_reset_auto_extension()]
-** and [sqlite3_cancel_auto_extension()]
-*/
-SQLITE_API int sqlite3_auto_extension(void(*xEntryPoint)(void));
-
-/*
-** CAPI3REF: Cancel Automatic Extension Loading
-**
-** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
-** initialization routine X that was registered using a prior call to
-** [sqlite3_auto_extension(X)].  ^The [sqlite3_cancel_auto_extension(X)]
-** routine returns 1 if initialization routine X was successfully
-** unregistered and it returns 0 if X was not on the list of initialization
-** routines.
-*/
-SQLITE_API int sqlite3_cancel_auto_extension(void(*xEntryPoint)(void));
-
-/*
-** CAPI3REF: Reset Automatic Extension Loading
-**
-** ^This interface disables all automatic extensions previously
-** registered using [sqlite3_auto_extension()].
-*/
-SQLITE_API void sqlite3_reset_auto_extension(void);
-
-/*
-** The interface to the virtual-table mechanism is currently considered
-** to be experimental.  The interface might change in incompatible ways.
-** If this is a problem for you, do not use the interface at this time.
-**
-** When the virtual-table mechanism stabilizes, we will declare the
-** interface fixed, support it indefinitely, and remove this comment.
-*/
-
-/*
-** Structures used by the virtual table interface
-*/
-typedef struct sqlite3_vtab sqlite3_vtab;
-typedef struct sqlite3_index_info sqlite3_index_info;
-typedef struct sqlite3_vtab_cursor sqlite3_vtab_cursor;
-typedef struct sqlite3_module sqlite3_module;
-
-/*
-** CAPI3REF: Virtual Table Object
-** KEYWORDS: sqlite3_module {virtual table module}
-**
-** This structure, sometimes called a "virtual table module",
-** defines the implementation of a [virtual table].
-** This structure consists mostly of methods for the module.
-**
-** ^A virtual table module is created by filling in a persistent
-** instance of this structure and passing a pointer to that instance
-** to [sqlite3_create_module()] or [sqlite3_create_module_v2()].
-** ^The registration remains valid until it is replaced by a different
-** module or until the [database connection] closes.  The content
-** of this structure must not change while it is registered with
-** any database connection.
-*/
-struct sqlite3_module {
-  int iVersion;
-  int (*xCreate)(sqlite3*, void *pAux,
-               int argc, const char *const*argv,
-               sqlite3_vtab **ppVTab, char**);
-  int (*xConnect)(sqlite3*, void *pAux,
-               int argc, const char *const*argv,
-               sqlite3_vtab **ppVTab, char**);
-  int (*xBestIndex)(sqlite3_vtab *pVTab, sqlite3_index_info*);
-  int (*xDisconnect)(sqlite3_vtab *pVTab);
-  int (*xDestroy)(sqlite3_vtab *pVTab);
-  int (*xOpen)(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor);
-  int (*xClose)(sqlite3_vtab_cursor*);
-  int (*xFilter)(sqlite3_vtab_cursor*, int idxNum, const char *idxStr,
-                int argc, sqlite3_value **argv);
-  int (*xNext)(sqlite3_vtab_cursor*);
-  int (*xEof)(sqlite3_vtab_cursor*);
-  int (*xColumn)(sqlite3_vtab_cursor*, sqlite3_context*, int);
-  int (*xRowid)(sqlite3_vtab_cursor*, sqlite3_int64 *pRowid);
-  int (*xUpdate)(sqlite3_vtab *, int, sqlite3_value **, sqlite3_int64 *);
-  int (*xBegin)(sqlite3_vtab *pVTab);
-  int (*xSync)(sqlite3_vtab *pVTab);
-  int (*xCommit)(sqlite3_vtab *pVTab);
-  int (*xRollback)(sqlite3_vtab *pVTab);
-  int (*xFindFunction)(sqlite3_vtab *pVtab, int nArg, const char *zName,
-                       void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
-                       void **ppArg);
-  int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
-  /* The methods above are in version 1 of the sqlite_module object. Those
-  ** below are for version 2 and greater. */
-  int (*xSavepoint)(sqlite3_vtab *pVTab, int);
-  int (*xRelease)(sqlite3_vtab *pVTab, int);
-  int (*xRollbackTo)(sqlite3_vtab *pVTab, int);
-  /* The methods above are in versions 1 and 2 of the sqlite_module object.
-  ** Those below are for version 3 and greater. */
-  int (*xShadowName)(const char*);
-};
-
-/*
-** CAPI3REF: Virtual Table Indexing Information
-** KEYWORDS: sqlite3_index_info
-**
-** The sqlite3_index_info structure and its substructures is used as part
-** of the [virtual table] interface to
-** pass information into and receive the reply from the [xBestIndex]
-** method of a [virtual table module].  The fields under **Inputs** are the
-** inputs to xBestIndex and are read-only.  xBestIndex inserts its
-** results into the **Outputs** fields.
-**
-** ^(The aConstraint[] array records WHERE clause constraints of the form:
-**
-** <blockquote>column OP expr</blockquote>
-**
-** where OP is =, &lt;, &lt;=, &gt;, or &gt;=.)^  ^(The particular operator is
-** stored in aConstraint[].op using one of the
-** [SQLITE_INDEX_CONSTRAINT_EQ | SQLITE_INDEX_CONSTRAINT_ values].)^
-** ^(The index of the column is stored in
-** aConstraint[].iColumn.)^  ^(aConstraint[].usable is TRUE if the
-** expr on the right-hand side can be evaluated (and thus the constraint
-** is usable) and false if it cannot.)^
-**
-** ^The optimizer automatically inverts terms of the form "expr OP column"
-** and makes other simplifications to the WHERE clause in an attempt to
-** get as many WHERE clause terms into the form shown above as possible.
-** ^The aConstraint[] array only reports WHERE clause terms that are
-** relevant to the particular virtual table being queried.
-**
-** ^Information about the ORDER BY clause is stored in aOrderBy[].
-** ^Each term of aOrderBy records a column of the ORDER BY clause.
-**
-** The colUsed field indicates which columns of the virtual table may be
-** required by the current scan. Virtual table columns are numbered from
-** zero in the order in which they appear within the CREATE TABLE statement
-** passed to sqlite3_declare_vtab(). For the first 63 columns (columns 0-62),
-** the corresponding bit is set within the colUsed mask if the column may be
-** required by SQLite. If the table has at least 64 columns and any column
-** to the right of the first 63 is required, then bit 63 of colUsed is also
-** set. In other words, column iCol may be required if the expression
-** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to
-** non-zero.
-**
-** The [xBestIndex] method must fill aConstraintUsage[] with information
-** about what parameters to pass to xFilter.  ^If argvIndex>0 then
-** the right-hand side of the corresponding aConstraint[] is evaluated
-** and becomes the argvIndex-th entry in argv.  ^(If aConstraintUsage[].omit
-** is true, then the constraint is assumed to be fully handled by the
-** virtual table and might not be checked again by the byte code.)^ ^(The
-** aConstraintUsage[].omit flag is an optimization hint. When the omit flag
-** is left in its default setting of false, the constraint will always be
-** checked separately in byte code.  If the omit flag is change to true, then
-** the constraint may or may not be checked in byte code.  In other words,
-** when the omit flag is true there is no guarantee that the constraint will
-** not be checked again using byte code.)^
-**
-** ^The idxNum and idxPtr values are recorded and passed into the
-** [xFilter] method.
-** ^[sqlite3_free()] is used to free idxPtr if and only if
-** needToFreeIdxPtr is true.
-**
-** ^The orderByConsumed means that output from [xFilter]/[xNext] will occur in
-** the correct order to satisfy the ORDER BY clause so that no separate
-** sorting step is required.
-**
-** ^The estimatedCost value is an estimate of the cost of a particular
-** strategy. A cost of N indicates that the cost of the strategy is similar
-** to a linear scan of an SQLite table with N rows. A cost of log(N)
-** indicates that the expense of the operation is similar to that of a
-** binary search on a unique indexed field of an SQLite table with N rows.
-**
-** ^The estimatedRows value is an estimate of the number of rows that
-** will be returned by the strategy.
-**
-** The xBestIndex method may optionally populate the idxFlags field with a
-** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
-** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
-** assumes that the strategy may visit at most one row.
-**
-** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
-** SQLite also assumes that if a call to the xUpdate() method is made as
-** part of the same statement to delete or update a virtual table row and the
-** implementation returns SQLITE_CONSTRAINT, then there is no need to rollback
-** any database changes. In other words, if the xUpdate() returns
-** SQLITE_CONSTRAINT, the database contents must be exactly as they were
-** before xUpdate was called. By contrast, if SQLITE_INDEX_SCAN_UNIQUE is not
-** set and xUpdate returns SQLITE_CONSTRAINT, any database changes made by
-** the xUpdate method are automatically rolled back by SQLite.
-**
-** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
-** structure for SQLite [version 3.8.2] ([dateof:3.8.2]).
-** If a virtual table extension is
-** used with an SQLite version earlier than 3.8.2, the results of attempting
-** to read or write the estimatedRows field are undefined (but are likely
-** to include crashing the application). The estimatedRows field should
-** therefore only be used if [sqlite3_libversion_number()] returns a
-** value greater than or equal to 3008002. Similarly, the idxFlags field
-** was added for [version 3.9.0] ([dateof:3.9.0]).
-** It may therefore only be used if
-** sqlite3_libversion_number() returns a value greater than or equal to
-** 3009000.
-*/
-struct sqlite3_index_info {
-  /* Inputs */
-  int nConstraint;           /* Number of entries in aConstraint */
-  struct sqlite3_index_constraint {
-     int iColumn;              /* Column constrained.  -1 for ROWID */
-     unsigned char op;         /* Constraint operator */
-     unsigned char usable;     /* True if this constraint is usable */
-     int iTermOffset;          /* Used internally - xBestIndex should ignore */
-  } *aConstraint;            /* Table of WHERE clause constraints */
-  int nOrderBy;              /* Number of terms in the ORDER BY clause */
-  struct sqlite3_index_orderby {
-     int iColumn;              /* Column number */
-     unsigned char desc;       /* True for DESC.  False for ASC. */
-  } *aOrderBy;               /* The ORDER BY clause */
-  /* Outputs */
-  struct sqlite3_index_constraint_usage {
-    int argvIndex;           /* if >0, constraint is part of argv to xFilter */
-    unsigned char omit;      /* Do not code a test for this constraint */
-  } *aConstraintUsage;
-  int idxNum;                /* Number used to identify the index */
-  char *idxStr;              /* String, possibly obtained from sqlite3_malloc */
-  int needToFreeIdxStr;      /* Free idxStr using sqlite3_free() if true */
-  int orderByConsumed;       /* True if output is already ordered */
-  double estimatedCost;           /* Estimated cost of using this index */
-  /* Fields below are only available in SQLite 3.8.2 and later */
-  sqlite3_int64 estimatedRows;    /* Estimated number of rows returned */
-  /* Fields below are only available in SQLite 3.9.0 and later */
-  int idxFlags;              /* Mask of SQLITE_INDEX_SCAN_* flags */
-  /* Fields below are only available in SQLite 3.10.0 and later */
-  sqlite3_uint64 colUsed;    /* Input: Mask of columns used by statement */
-};
-
-/*
-** CAPI3REF: Virtual Table Scan Flags
-**
-** Virtual table implementations are allowed to set the
-** [sqlite3_index_info].idxFlags field to some combination of
-** these bits.
-*/
-#define SQLITE_INDEX_SCAN_UNIQUE      1     /* Scan visits at most 1 row */
-
-/*
-** CAPI3REF: Virtual Table Constraint Operator Codes
-**
-** These macros define the allowed values for the
-** [sqlite3_index_info].aConstraint[].op field.  Each value represents
-** an operator that is part of a constraint term in the WHERE clause of
-** a query that uses a [virtual table].
-**
-** ^The left-hand operand of the operator is given by the corresponding
-** aConstraint[].iColumn field.  ^An iColumn of -1 indicates the left-hand
-** operand is the rowid.
-** The SQLITE_INDEX_CONSTRAINT_LIMIT and SQLITE_INDEX_CONSTRAINT_OFFSET
-** operators have no left-hand operand, and so for those operators the
-** corresponding aConstraint[].iColumn is meaningless and should not be
-** used.
-**
-** All operator values from SQLITE_INDEX_CONSTRAINT_FUNCTION through
-** value 255 are reserved to represent functions that are overloaded
-** by the [xFindFunction|xFindFunction method] of the virtual table
-** implementation.
-**
-** The right-hand operands for each constraint might be accessible using
-** the [sqlite3_vtab_rhs_value()] interface.  Usually the right-hand
-** operand is only available if it appears as a single constant literal
-** in the input SQL.  If the right-hand operand is another column or an
-** expression (even a constant expression) or a parameter, then the
-** sqlite3_vtab_rhs_value() probably will not be able to extract it.
-** ^The SQLITE_INDEX_CONSTRAINT_ISNULL and
-** SQLITE_INDEX_CONSTRAINT_ISNOTNULL operators have no right-hand operand
-** and hence calls to sqlite3_vtab_rhs_value() for those operators will
-** always return SQLITE_NOTFOUND.
-**
-** The collating sequence to be used for comparison can be found using
-** the [sqlite3_vtab_collation()] interface.  For most real-world virtual
-** tables, the collating sequence of constraints does not matter (for example
-** because the constraints are numeric) and so the sqlite3_vtab_collation()
-** interface is no commonly needed.
-*/
-#define SQLITE_INDEX_CONSTRAINT_EQ          2
-#define SQLITE_INDEX_CONSTRAINT_GT          4
-#define SQLITE_INDEX_CONSTRAINT_LE          8
-#define SQLITE_INDEX_CONSTRAINT_LT         16
-#define SQLITE_INDEX_CONSTRAINT_GE         32
-#define SQLITE_INDEX_CONSTRAINT_MATCH      64
-#define SQLITE_INDEX_CONSTRAINT_LIKE       65
-#define SQLITE_INDEX_CONSTRAINT_GLOB       66
-#define SQLITE_INDEX_CONSTRAINT_REGEXP     67
-#define SQLITE_INDEX_CONSTRAINT_NE         68
-#define SQLITE_INDEX_CONSTRAINT_ISNOT      69
-#define SQLITE_INDEX_CONSTRAINT_ISNOTNULL  70
-#define SQLITE_INDEX_CONSTRAINT_ISNULL     71
-#define SQLITE_INDEX_CONSTRAINT_IS         72
-#define SQLITE_INDEX_CONSTRAINT_LIMIT      73
-#define SQLITE_INDEX_CONSTRAINT_OFFSET     74
-#define SQLITE_INDEX_CONSTRAINT_FUNCTION  150
-
-/*
-** CAPI3REF: Register A Virtual Table Implementation
-** METHOD: sqlite3
-**
-** ^These routines are used to register a new [virtual table module] name.
-** ^Module names must be registered before
-** creating a new [virtual table] using the module and before using a
-** preexisting [virtual table] for the module.
-**
-** ^The module name is registered on the [database connection] specified
-** by the first parameter.  ^The name of the module is given by the
-** second parameter.  ^The third parameter is a pointer to
-** the implementation of the [virtual table module].   ^The fourth
-** parameter is an arbitrary client data pointer that is passed through
-** into the [xCreate] and [xConnect] methods of the virtual table module
-** when a new virtual table is be being created or reinitialized.
-**
-** ^The sqlite3_create_module_v2() interface has a fifth parameter which
-** is a pointer to a destructor for the pClientData.  ^SQLite will
-** invoke the destructor function (if it is not NULL) when SQLite
-** no longer needs the pClientData pointer.  ^The destructor will also
-** be invoked if the call to sqlite3_create_module_v2() fails.
-** ^The sqlite3_create_module()
-** interface is equivalent to sqlite3_create_module_v2() with a NULL
-** destructor.
-**
-** ^If the third parameter (the pointer to the sqlite3_module object) is
-** NULL then no new module is created and any existing modules with the
-** same name are dropped.
-**
-** See also: [sqlite3_drop_modules()]
-*/
-SQLITE_API int sqlite3_create_module(
-  sqlite3 *db,               /* SQLite connection to register module with */
-  const char *zName,         /* Name of the module */
-  const sqlite3_module *p,   /* Methods for the module */
-  void *pClientData          /* Client data for xCreate/xConnect */
-);
-SQLITE_API int sqlite3_create_module_v2(
-  sqlite3 *db,               /* SQLite connection to register module with */
-  const char *zName,         /* Name of the module */
-  const sqlite3_module *p,   /* Methods for the module */
-  void *pClientData,         /* Client data for xCreate/xConnect */
-  void(*xDestroy)(void*)     /* Module destructor function */
-);
-
-/*
-** CAPI3REF: Remove Unnecessary Virtual Table Implementations
-** METHOD: sqlite3
-**
-** ^The sqlite3_drop_modules(D,L) interface removes all virtual
-** table modules from database connection D except those named on list L.
-** The L parameter must be either NULL or a pointer to an array of pointers
-** to strings where the array is terminated by a single NULL pointer.
-** ^If the L parameter is NULL, then all virtual table modules are removed.
-**
-** See also: [sqlite3_create_module()]
-*/
-SQLITE_API int sqlite3_drop_modules(
-  sqlite3 *db,                /* Remove modules from this connection */
-  const char **azKeep         /* Except, do not remove the ones named here */
-);
-
-/*
-** CAPI3REF: Virtual Table Instance Object
-** KEYWORDS: sqlite3_vtab
-**
-** Every [virtual table module] implementation uses a subclass
-** of this object to describe a particular instance
-** of the [virtual table].  Each subclass will
-** be tailored to the specific needs of the module implementation.
-** The purpose of this superclass is to define certain fields that are
-** common to all module implementations.
-**
-** ^Virtual tables methods can set an error message by assigning a
-** string obtained from [sqlite3_mprintf()] to zErrMsg.  The method should
-** take care that any prior string is freed by a call to [sqlite3_free()]
-** prior to assigning a new string to zErrMsg.  ^After the error message
-** is delivered up to the client application, the string will be automatically
-** freed by sqlite3_free() and the zErrMsg field will be zeroed.
-*/
-struct sqlite3_vtab {
-  const sqlite3_module *pModule;  /* The module for this virtual table */
-  int nRef;                       /* Number of open cursors */
-  char *zErrMsg;                  /* Error message from sqlite3_mprintf() */
-  /* Virtual table implementations will typically add additional fields */
-};
-
-/*
-** CAPI3REF: Virtual Table Cursor Object
-** KEYWORDS: sqlite3_vtab_cursor {virtual table cursor}
-**
-** Every [virtual table module] implementation uses a subclass of the
-** following structure to describe cursors that point into the
-** [virtual table] and are used
-** to loop through the virtual table.  Cursors are created using the
-** [sqlite3_module.xOpen | xOpen] method of the module and are destroyed
-** by the [sqlite3_module.xClose | xClose] method.  Cursors are used
-** by the [xFilter], [xNext], [xEof], [xColumn], and [xRowid] methods
-** of the module.  Each module implementation will define
-** the content of a cursor structure to suit its own needs.
-**
-** This superclass exists in order to define fields of the cursor that
-** are common to all implementations.
-*/
-struct sqlite3_vtab_cursor {
-  sqlite3_vtab *pVtab;      /* Virtual table of this cursor */
-  /* Virtual table implementations will typically add additional fields */
-};
-
-/*
-** CAPI3REF: Declare The Schema Of A Virtual Table
-**
-** ^The [xCreate] and [xConnect] methods of a
-** [virtual table module] call this interface
-** to declare the format (the names and datatypes of the columns) of
-** the virtual tables they implement.
-*/
-SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL);
-
-/*
-** CAPI3REF: Overload A Function For A Virtual Table
-** METHOD: sqlite3
-**
-** ^(Virtual tables can provide alternative implementations of functions
-** using the [xFindFunction] method of the [virtual table module].
-** But global versions of those functions
-** must exist in order to be overloaded.)^
-**
-** ^(This API makes sure a global version of a function with a particular
-** name and number of parameters exists.  If no such function exists
-** before this API is called, a new function is created.)^  ^The implementation
-** of the new function always causes an exception to be thrown.  So
-** the new function is not good for anything by itself.  Its only
-** purpose is to be a placeholder function that can be overloaded
-** by a [virtual table].
-*/
-SQLITE_API int sqlite3_overload_function(sqlite3*, const char *zFuncName, int nArg);
-
-/*
-** The interface to the virtual-table mechanism defined above (back up
-** to a comment remarkably similar to this one) is currently considered
-** to be experimental.  The interface might change in incompatible ways.
-** If this is a problem for you, do not use the interface at this time.
-**
-** When the virtual-table mechanism stabilizes, we will declare the
-** interface fixed, support it indefinitely, and remove this comment.
-*/
-
-/*
-** CAPI3REF: A Handle To An Open BLOB
-** KEYWORDS: {BLOB handle} {BLOB handles}
-**
-** An instance of this object represents an open BLOB on which
-** [sqlite3_blob_open | incremental BLOB I/O] can be performed.
-** ^Objects of this type are created by [sqlite3_blob_open()]
-** and destroyed by [sqlite3_blob_close()].
-** ^The [sqlite3_blob_read()] and [sqlite3_blob_write()] interfaces
-** can be used to read or write small subsections of the BLOB.
-** ^The [sqlite3_blob_bytes()] interface returns the size of the BLOB in bytes.
-*/
-typedef struct sqlite3_blob sqlite3_blob;
-
-/*
-** CAPI3REF: Open A BLOB For Incremental I/O
-** METHOD: sqlite3
-** CONSTRUCTOR: sqlite3_blob
-**
-** ^(This interfaces opens a [BLOB handle | handle] to the BLOB located
-** in row iRow, column zColumn, table zTable in database zDb;
-** in other words, the same BLOB that would be selected by:
-**
-** <pre>
-**     SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
-** </pre>)^
-**
-** ^(Parameter zDb is not the filename that contains the database, but
-** rather the symbolic name of the database. For attached databases, this is
-** the name that appears after the AS keyword in the [ATTACH] statement.
-** For the main database file, the database name is "main". For TEMP
-** tables, the database name is "temp".)^
-**
-** ^If the flags parameter is non-zero, then the BLOB is opened for read
-** and write access. ^If the flags parameter is zero, the BLOB is opened for
-** read-only access.
-**
-** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
-** in *ppBlob. Otherwise an [error code] is returned and, unless the error
-** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
-** the API is not misused, it is always safe to call [sqlite3_blob_close()]
-** on *ppBlob after this function it returns.
-**
-** This function fails with SQLITE_ERROR if any of the following are true:
-** <ul>
-**   <li> ^(Database zDb does not exist)^,
-**   <li> ^(Table zTable does not exist within database zDb)^,
-**   <li> ^(Table zTable is a WITHOUT ROWID table)^,
-**   <li> ^(Column zColumn does not exist)^,
-**   <li> ^(Row iRow is not present in the table)^,
-**   <li> ^(The specified column of row iRow contains a value that is not
-**         a TEXT or BLOB value)^,
-**   <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE
-**         constraint and the blob is being opened for read/write access)^,
-**   <li> ^([foreign key constraints | Foreign key constraints] are enabled,
-**         column zColumn is part of a [child key] definition and the blob is
-**         being opened for read/write access)^.
-** </ul>
-**
-** ^Unless it returns SQLITE_MISUSE, this function sets the
-** [database connection] error code and message accessible via
-** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
-**
-** A BLOB referenced by sqlite3_blob_open() may be read using the
-** [sqlite3_blob_read()] interface and modified by using
-** [sqlite3_blob_write()].  The [BLOB handle] can be moved to a
-** different row of the same table using the [sqlite3_blob_reopen()]
-** interface.  However, the column, table, or database of a [BLOB handle]
-** cannot be changed after the [BLOB handle] is opened.
-**
-** ^(If the row that a BLOB handle points to is modified by an
-** [UPDATE], [DELETE], or by [ON CONFLICT] side-effects
-** then the BLOB handle is marked as "expired".
-** This is true if any column of the row is changed, even a column
-** other than the one the BLOB handle is open on.)^
-** ^Calls to [sqlite3_blob_read()] and [sqlite3_blob_write()] for
-** an expired BLOB handle fail with a return code of [SQLITE_ABORT].
-** ^(Changes written into a BLOB prior to the BLOB expiring are not
-** rolled back by the expiration of the BLOB.  Such changes will eventually
-** commit if the transaction continues to completion.)^
-**
-** ^Use the [sqlite3_blob_bytes()] interface to determine the size of
-** the opened blob.  ^The size of a blob may not be changed by this
-** interface.  Use the [UPDATE] SQL command to change the size of a
-** blob.
-**
-** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
-** and the built-in [zeroblob] SQL function may be used to create a
-** zero-filled blob to read or write using the incremental-blob interface.
-**
-** To avoid a resource leak, every open [BLOB handle] should eventually
-** be released by a call to [sqlite3_blob_close()].
-**
-** See also: [sqlite3_blob_close()],
-** [sqlite3_blob_reopen()], [sqlite3_blob_read()],
-** [sqlite3_blob_bytes()], [sqlite3_blob_write()].
-*/
-SQLITE_API int sqlite3_blob_open(
-  sqlite3*,
-  const char *zDb,
-  const char *zTable,
-  const char *zColumn,
-  sqlite3_int64 iRow,
-  int flags,
-  sqlite3_blob **ppBlob
-);
-
-/*
-** CAPI3REF: Move a BLOB Handle to a New Row
-** METHOD: sqlite3_blob
-**
-** ^This function is used to move an existing [BLOB handle] so that it points
-** to a different row of the same database table. ^The new row is identified
-** by the rowid value passed as the second argument. Only the row can be
-** changed. ^The database, table and column on which the blob handle is open
-** remain the same. Moving an existing [BLOB handle] to a new row is
-** faster than closing the existing handle and opening a new one.
-**
-** ^(The new row must meet the same criteria as for [sqlite3_blob_open()] -
-** it must exist and there must be either a blob or text value stored in
-** the nominated column.)^ ^If the new row is not present in the table, or if
-** it does not contain a blob or text value, or if another error occurs, an
-** SQLite error code is returned and the blob handle is considered aborted.
-** ^All subsequent calls to [sqlite3_blob_read()], [sqlite3_blob_write()] or
-** [sqlite3_blob_reopen()] on an aborted blob handle immediately return
-** SQLITE_ABORT. ^Calling [sqlite3_blob_bytes()] on an aborted blob handle
-** always returns zero.
-**
-** ^This function sets the database handle error code and message.
-*/
-SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
-
-/*
-** CAPI3REF: Close A BLOB Handle
-** DESTRUCTOR: sqlite3_blob
-**
-** ^This function closes an open [BLOB handle]. ^(The BLOB handle is closed
-** unconditionally.  Even if this routine returns an error code, the
-** handle is still closed.)^
-**
-** ^If the blob handle being closed was opened for read-write access, and if
-** the database is in auto-commit mode and there are no other open read-write
-** blob handles or active write statements, the current transaction is
-** committed. ^If an error occurs while committing the transaction, an error
-** code is returned and the transaction rolled back.
-**
-** Calling this function with an argument that is not a NULL pointer or an
-** open blob handle results in undefined behaviour. ^Calling this routine
-** with a null pointer (such as would be returned by a failed call to
-** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
-** is passed a valid open blob handle, the values returned by the
-** sqlite3_errcode() and sqlite3_errmsg() functions are set before returning.
-*/
-SQLITE_API int sqlite3_blob_close(sqlite3_blob *);
-
-/*
-** CAPI3REF: Return The Size Of An Open BLOB
-** METHOD: sqlite3_blob
-**
-** ^Returns the size in bytes of the BLOB accessible via the
-** successfully opened [BLOB handle] in its only argument.  ^The
-** incremental blob I/O routines can only read or overwriting existing
-** blob content; they cannot change the size of a blob.
-**
-** This routine only works on a [BLOB handle] which has been created
-** by a prior successful call to [sqlite3_blob_open()] and which has not
-** been closed by [sqlite3_blob_close()].  Passing any other pointer in
-** to this routine results in undefined and probably undesirable behavior.
-*/
-SQLITE_API int sqlite3_blob_bytes(sqlite3_blob *);
-
-/*
-** CAPI3REF: Read Data From A BLOB Incrementally
-** METHOD: sqlite3_blob
-**
-** ^(This function is used to read data from an open [BLOB handle] into a
-** caller-supplied buffer. N bytes of data are copied into buffer Z
-** from the open BLOB, starting at offset iOffset.)^
-**
-** ^If offset iOffset is less than N bytes from the end of the BLOB,
-** [SQLITE_ERROR] is returned and no data is read.  ^If N or iOffset is
-** less than zero, [SQLITE_ERROR] is returned and no data is read.
-** ^The size of the blob (and hence the maximum value of N+iOffset)
-** can be determined using the [sqlite3_blob_bytes()] interface.
-**
-** ^An attempt to read from an expired [BLOB handle] fails with an
-** error code of [SQLITE_ABORT].
-**
-** ^(On success, sqlite3_blob_read() returns SQLITE_OK.
-** Otherwise, an [error code] or an [extended error code] is returned.)^
-**
-** This routine only works on a [BLOB handle] which has been created
-** by a prior successful call to [sqlite3_blob_open()] and which has not
-** been closed by [sqlite3_blob_close()].  Passing any other pointer in
-** to this routine results in undefined and probably undesirable behavior.
-**
-** See also: [sqlite3_blob_write()].
-*/
-SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
-
-/*
-** CAPI3REF: Write Data Into A BLOB Incrementally
-** METHOD: sqlite3_blob
-**
-** ^(This function is used to write data into an open [BLOB handle] from a
-** caller-supplied buffer. N bytes of data are copied from the buffer Z
-** into the open BLOB, starting at offset iOffset.)^
-**
-** ^(On success, sqlite3_blob_write() returns SQLITE_OK.
-** Otherwise, an  [error code] or an [extended error code] is returned.)^
-** ^Unless SQLITE_MISUSE is returned, this function sets the
-** [database connection] error code and message accessible via
-** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
-**
-** ^If the [BLOB handle] passed as the first argument was not opened for
-** writing (the flags parameter to [sqlite3_blob_open()] was zero),
-** this function returns [SQLITE_READONLY].
-**
-** This function may only modify the contents of the BLOB; it is
-** not possible to increase the size of a BLOB using this API.
-** ^If offset iOffset is less than N bytes from the end of the BLOB,
-** [SQLITE_ERROR] is returned and no data is written. The size of the
-** BLOB (and hence the maximum value of N+iOffset) can be determined
-** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less
-** than zero [SQLITE_ERROR] is returned and no data is written.
-**
-** ^An attempt to write to an expired [BLOB handle] fails with an
-** error code of [SQLITE_ABORT].  ^Writes to the BLOB that occurred
-** before the [BLOB handle] expired are not rolled back by the
-** expiration of the handle, though of course those changes might
-** have been overwritten by the statement that expired the BLOB handle
-** or by other independent statements.
-**
-** This routine only works on a [BLOB handle] which has been created
-** by a prior successful call to [sqlite3_blob_open()] and which has not
-** been closed by [sqlite3_blob_close()].  Passing any other pointer in
-** to this routine results in undefined and probably undesirable behavior.
-**
-** See also: [sqlite3_blob_read()].
-*/
-SQLITE_API int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
-
-/*
-** CAPI3REF: Virtual File System Objects
-**
-** A virtual filesystem (VFS) is an [sqlite3_vfs] object
-** that SQLite uses to interact
-** with the underlying operating system.  Most SQLite builds come with a
-** single default VFS that is appropriate for the host computer.
-** New VFSes can be registered and existing VFSes can be unregistered.
-** The following interfaces are provided.
-**
-** ^The sqlite3_vfs_find() interface returns a pointer to a VFS given its name.
-** ^Names are case sensitive.
-** ^Names are zero-terminated UTF-8 strings.
-** ^If there is no match, a NULL pointer is returned.
-** ^If zVfsName is NULL then the default VFS is returned.
-**
-** ^New VFSes are registered with sqlite3_vfs_register().
-** ^Each new VFS becomes the default VFS if the makeDflt flag is set.
-** ^The same VFS can be registered multiple times without injury.
-** ^To make an existing VFS into the default VFS, register it again
-** with the makeDflt flag set.  If two different VFSes with the
-** same name are registered, the behavior is undefined.  If a
-** VFS is registered with a name that is NULL or an empty string,
-** then the behavior is undefined.
-**
-** ^Unregister a VFS with the sqlite3_vfs_unregister() interface.
-** ^(If the default VFS is unregistered, another VFS is chosen as
-** the default.  The choice for the new VFS is arbitrary.)^
-*/
-SQLITE_API sqlite3_vfs *sqlite3_vfs_find(const char *zVfsName);
-SQLITE_API int sqlite3_vfs_register(sqlite3_vfs*, int makeDflt);
-SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
-
-/*
-** CAPI3REF: Mutexes
-**
-** The SQLite core uses these routines for thread
-** synchronization. Though they are intended for internal
-** use by SQLite, code that links against SQLite is
-** permitted to use any of these routines.
-**
-** The SQLite source code contains multiple implementations
-** of these mutex routines.  An appropriate implementation
-** is selected automatically at compile-time.  The following
-** implementations are available in the SQLite core:
-**
-** <ul>
-** <li>   SQLITE_MUTEX_PTHREADS
-** <li>   SQLITE_MUTEX_W32
-** <li>   SQLITE_MUTEX_NOOP
-** </ul>
-**
-** The SQLITE_MUTEX_NOOP implementation is a set of routines
-** that does no real locking and is appropriate for use in
-** a single-threaded application.  The SQLITE_MUTEX_PTHREADS and
-** SQLITE_MUTEX_W32 implementations are appropriate for use on Unix
-** and Windows.
-**
-** If SQLite is compiled with the SQLITE_MUTEX_APPDEF preprocessor
-** macro defined (with "-DSQLITE_MUTEX_APPDEF=1"), then no mutex
-** implementation is included with the library. In this case the
-** application must supply a custom mutex implementation using the
-** [SQLITE_CONFIG_MUTEX] option of the sqlite3_config() function
-** before calling sqlite3_initialize() or any other public sqlite3_
-** function that calls sqlite3_initialize().
-**
-** ^The sqlite3_mutex_alloc() routine allocates a new
-** mutex and returns a pointer to it. ^The sqlite3_mutex_alloc()
-** routine returns NULL if it is unable to allocate the requested
-** mutex.  The argument to sqlite3_mutex_alloc() must one of these
-** integer constants:
-**
-** <ul>
-** <li>  SQLITE_MUTEX_FAST
-** <li>  SQLITE_MUTEX_RECURSIVE
-** <li>  SQLITE_MUTEX_STATIC_MAIN
-** <li>  SQLITE_MUTEX_STATIC_MEM
-** <li>  SQLITE_MUTEX_STATIC_OPEN
-** <li>  SQLITE_MUTEX_STATIC_PRNG
-** <li>  SQLITE_MUTEX_STATIC_LRU
-** <li>  SQLITE_MUTEX_STATIC_PMEM
-** <li>  SQLITE_MUTEX_STATIC_APP1
-** <li>  SQLITE_MUTEX_STATIC_APP2
-** <li>  SQLITE_MUTEX_STATIC_APP3
-** <li>  SQLITE_MUTEX_STATIC_VFS1
-** <li>  SQLITE_MUTEX_STATIC_VFS2
-** <li>  SQLITE_MUTEX_STATIC_VFS3
-** </ul>
-**
-** ^The first two constants (SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE)
-** cause sqlite3_mutex_alloc() to create
-** a new mutex.  ^The new mutex is recursive when SQLITE_MUTEX_RECURSIVE
-** is used but not necessarily so when SQLITE_MUTEX_FAST is used.
-** The mutex implementation does not need to make a distinction
-** between SQLITE_MUTEX_RECURSIVE and SQLITE_MUTEX_FAST if it does
-** not want to.  SQLite will only request a recursive mutex in
-** cases where it really needs one.  If a faster non-recursive mutex
-** implementation is available on the host platform, the mutex subsystem
-** might return such a mutex in response to SQLITE_MUTEX_FAST.
-**
-** ^The other allowed parameters to sqlite3_mutex_alloc() (anything other
-** than SQLITE_MUTEX_FAST and SQLITE_MUTEX_RECURSIVE) each return
-** a pointer to a static preexisting mutex.  ^Nine static mutexes are
-** used by the current version of SQLite.  Future versions of SQLite
-** may add additional static mutexes.  Static mutexes are for internal
-** use by SQLite only.  Applications that use SQLite mutexes should
-** use only the dynamic mutexes returned by SQLITE_MUTEX_FAST or
-** SQLITE_MUTEX_RECURSIVE.
-**
-** ^Note that if one of the dynamic mutex parameters (SQLITE_MUTEX_FAST
-** or SQLITE_MUTEX_RECURSIVE) is used then sqlite3_mutex_alloc()
-** returns a different mutex on every call.  ^For the static
-** mutex types, the same mutex is returned on every call that has
-** the same type number.
-**
-** ^The sqlite3_mutex_free() routine deallocates a previously
-** allocated dynamic mutex.  Attempting to deallocate a static
-** mutex results in undefined behavior.
-**
-** ^The sqlite3_mutex_enter() and sqlite3_mutex_try() routines attempt
-** to enter a mutex.  ^If another thread is already within the mutex,
-** sqlite3_mutex_enter() will block and sqlite3_mutex_try() will return
-** SQLITE_BUSY.  ^The sqlite3_mutex_try() interface returns [SQLITE_OK]
-** upon successful entry.  ^(Mutexes created using
-** SQLITE_MUTEX_RECURSIVE can be entered multiple times by the same thread.
-** In such cases, the
-** mutex must be exited an equal number of times before another thread
-** can enter.)^  If the same thread tries to enter any mutex other
-** than an SQLITE_MUTEX_RECURSIVE more than once, the behavior is undefined.
-**
-** ^(Some systems (for example, Windows 95) do not support the operation
-** implemented by sqlite3_mutex_try().  On those systems, sqlite3_mutex_try()
-** will always return SQLITE_BUSY. The SQLite core only ever uses
-** sqlite3_mutex_try() as an optimization so this is acceptable
-** behavior.)^
-**
-** ^The sqlite3_mutex_leave() routine exits a mutex that was
-** previously entered by the same thread.   The behavior
-** is undefined if the mutex is not currently entered by the
-** calling thread or is not currently allocated.
-**
-** ^If the argument to sqlite3_mutex_enter(), sqlite3_mutex_try(), or
-** sqlite3_mutex_leave() is a NULL pointer, then all three routines
-** behave as no-ops.
-**
-** See also: [sqlite3_mutex_held()] and [sqlite3_mutex_notheld()].
-*/
-SQLITE_API sqlite3_mutex *sqlite3_mutex_alloc(int);
-SQLITE_API void sqlite3_mutex_free(sqlite3_mutex*);
-SQLITE_API void sqlite3_mutex_enter(sqlite3_mutex*);
-SQLITE_API int sqlite3_mutex_try(sqlite3_mutex*);
-SQLITE_API void sqlite3_mutex_leave(sqlite3_mutex*);
-
-/*
-** CAPI3REF: Mutex Methods Object
-**
-** An instance of this structure defines the low-level routines
-** used to allocate and use mutexes.
-**
-** Usually, the default mutex implementations provided by SQLite are
-** sufficient, however the application has the option of substituting a custom
-** implementation for specialized deployments or systems for which SQLite
-** does not provide a suitable implementation. In this case, the application
-** creates and populates an instance of this structure to pass
-** to sqlite3_config() along with the [SQLITE_CONFIG_MUTEX] option.
-** Additionally, an instance of this structure can be used as an
-** output variable when querying the system for the current mutex
-** implementation, using the [SQLITE_CONFIG_GETMUTEX] option.
-**
-** ^The xMutexInit method defined by this structure is invoked as
-** part of system initialization by the sqlite3_initialize() function.
-** ^The xMutexInit routine is called by SQLite exactly once for each
-** effective call to [sqlite3_initialize()].
-**
-** ^The xMutexEnd method defined by this structure is invoked as
-** part of system shutdown by the sqlite3_shutdown() function. The
-** implementation of this method is expected to release all outstanding
-** resources obtained by the mutex methods implementation, especially
-** those obtained by the xMutexInit method.  ^The xMutexEnd()
-** interface is invoked exactly once for each call to [sqlite3_shutdown()].
-**
-** ^(The remaining seven methods defined by this structure (xMutexAlloc,
-** xMutexFree, xMutexEnter, xMutexTry, xMutexLeave, xMutexHeld and
-** xMutexNotheld) implement the following interfaces (respectively):
-**
-** <ul>
-**   <li>  [sqlite3_mutex_alloc()] </li>
-**   <li>  [sqlite3_mutex_free()] </li>
-**   <li>  [sqlite3_mutex_enter()] </li>
-**   <li>  [sqlite3_mutex_try()] </li>
-**   <li>  [sqlite3_mutex_leave()] </li>
-**   <li>  [sqlite3_mutex_held()] </li>
-**   <li>  [sqlite3_mutex_notheld()] </li>
-** </ul>)^
-**
-** The only difference is that the public sqlite3_XXX functions enumerated
-** above silently ignore any invocations that pass a NULL pointer instead
-** of a valid mutex handle. The implementations of the methods defined
-** by this structure are not required to handle this case. The results
-** of passing a NULL pointer instead of a valid mutex handle are undefined
-** (i.e. it is acceptable to provide an implementation that segfaults if
-** it is passed a NULL pointer).
-**
-** The xMutexInit() method must be threadsafe.  It must be harmless to
-** invoke xMutexInit() multiple times within the same process and without
-** intervening calls to xMutexEnd().  Second and subsequent calls to
-** xMutexInit() must be no-ops.
-**
-** xMutexInit() must not use SQLite memory allocation ([sqlite3_malloc()]
-** and its associates).  Similarly, xMutexAlloc() must not use SQLite memory
-** allocation for a static mutex.  ^However xMutexAlloc() may use SQLite
-** memory allocation for a fast or recursive mutex.
-**
-** ^SQLite will invoke the xMutexEnd() method when [sqlite3_shutdown()] is
-** called, but only if the prior call to xMutexInit returned SQLITE_OK.
-** If xMutexInit fails in any way, it is expected to clean up after itself
-** prior to returning.
-*/
-typedef struct sqlite3_mutex_methods sqlite3_mutex_methods;
-struct sqlite3_mutex_methods {
-  int (*xMutexInit)(void);
-  int (*xMutexEnd)(void);
-  sqlite3_mutex *(*xMutexAlloc)(int);
-  void (*xMutexFree)(sqlite3_mutex *);
-  void (*xMutexEnter)(sqlite3_mutex *);
-  int (*xMutexTry)(sqlite3_mutex *);
-  void (*xMutexLeave)(sqlite3_mutex *);
-  int (*xMutexHeld)(sqlite3_mutex *);
-  int (*xMutexNotheld)(sqlite3_mutex *);
-};
-
-/*
-** CAPI3REF: Mutex Verification Routines
-**
-** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routines
-** are intended for use inside assert() statements.  The SQLite core
-** never uses these routines except inside an assert() and applications
-** are advised to follow the lead of the core.  The SQLite core only
-** provides implementations for these routines when it is compiled
-** with the SQLITE_DEBUG flag.  External mutex implementations
-** are only required to provide these routines if SQLITE_DEBUG is
-** defined and if NDEBUG is not defined.
+** The sqlite3_mutex_held() and sqlite3_mutex_notheld() routines
+** are intended for use inside assert() statements.  The SQLite core
+** never uses these routines except inside an assert() and applications
+** are advised to follow the lead of the core.  The SQLite core only
+** provides implementations for these routines when it is compiled
+** with the SQLITE_DEBUG flag.  External mutex implementations
+** are only required to provide these routines if SQLITE_DEBUG is
+** defined and if NDEBUG is not defined.
 **
 ** These routines should return true if the mutex in their argument
 ** is held or not held, respectively, by the calling thread.
@@ -7840,8 +7782,8 @@ struct sqlite3_mutex_methods {
 ** interface should also return 1 when given a NULL pointer.
 */
 #ifndef NDEBUG
-SQLITE_API int sqlite3_mutex_held(sqlite3_mutex*);
-SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
+    SQLITE_API int sqlite3_mutex_held(sqlite3_mutex*);
+    SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
 #endif
 
 /*
@@ -7854,100 +7796,99 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
 ** next.  Applications that override the built-in mutex logic must be
 ** prepared to accommodate additional static mutexes.
 */
-#define SQLITE_MUTEX_FAST             0
-#define SQLITE_MUTEX_RECURSIVE        1
-#define SQLITE_MUTEX_STATIC_MAIN      2
-#define SQLITE_MUTEX_STATIC_MEM       3  /* sqlite3_malloc() */
-#define SQLITE_MUTEX_STATIC_MEM2      4  /* NOT USED */
-#define SQLITE_MUTEX_STATIC_OPEN      4  /* sqlite3BtreeOpen() */
-#define SQLITE_MUTEX_STATIC_PRNG      5  /* sqlite3_randomness() */
-#define SQLITE_MUTEX_STATIC_LRU       6  /* lru page list */
-#define SQLITE_MUTEX_STATIC_LRU2      7  /* NOT USED */
-#define SQLITE_MUTEX_STATIC_PMEM      7  /* sqlite3PageMalloc() */
-#define SQLITE_MUTEX_STATIC_APP1      8  /* For use by application */
-#define SQLITE_MUTEX_STATIC_APP2      9  /* For use by application */
-#define SQLITE_MUTEX_STATIC_APP3     10  /* For use by application */
-#define SQLITE_MUTEX_STATIC_VFS1     11  /* For use by built-in VFS */
-#define SQLITE_MUTEX_STATIC_VFS2     12  /* For use by extension VFS */
-#define SQLITE_MUTEX_STATIC_VFS3     13  /* For use by application VFS */
+#define SQLITE_MUTEX_FAST 0
+#define SQLITE_MUTEX_RECURSIVE 1
+#define SQLITE_MUTEX_STATIC_MAIN 2
+#define SQLITE_MUTEX_STATIC_MEM 3   /* sqlite3_malloc() */
+#define SQLITE_MUTEX_STATIC_MEM2 4  /* NOT USED */
+#define SQLITE_MUTEX_STATIC_OPEN 4  /* sqlite3BtreeOpen() */
+#define SQLITE_MUTEX_STATIC_PRNG 5  /* sqlite3_randomness() */
+#define SQLITE_MUTEX_STATIC_LRU 6   /* lru page list */
+#define SQLITE_MUTEX_STATIC_LRU2 7  /* NOT USED */
+#define SQLITE_MUTEX_STATIC_PMEM 7  /* sqlite3PageMalloc() */
+#define SQLITE_MUTEX_STATIC_APP1 8  /* For use by application */
+#define SQLITE_MUTEX_STATIC_APP2 9  /* For use by application */
+#define SQLITE_MUTEX_STATIC_APP3 10 /* For use by application */
+#define SQLITE_MUTEX_STATIC_VFS1 11 /* For use by built-in VFS */
+#define SQLITE_MUTEX_STATIC_VFS2 12 /* For use by extension VFS */
+#define SQLITE_MUTEX_STATIC_VFS3 13 /* For use by application VFS */
 
 /* Legacy compatibility: */
-#define SQLITE_MUTEX_STATIC_MASTER    2
-
-
-/*
-** CAPI3REF: Retrieve the mutex for a database connection
-** METHOD: sqlite3
-**
-** ^This interface returns a pointer the [sqlite3_mutex] object that
-** serializes access to the [database connection] given in the argument
-** when the [threading mode] is Serialized.
-** ^If the [threading mode] is Single-thread or Multi-thread then this
-** routine returns a NULL pointer.
-*/
-SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);
-
-/*
-** CAPI3REF: Low-Level Control Of Database Files
-** METHOD: sqlite3
-** KEYWORDS: {file control}
-**
-** ^The [sqlite3_file_control()] interface makes a direct call to the
-** xFileControl method for the [sqlite3_io_methods] object associated
-** with a particular database identified by the second argument. ^The
-** name of the database is "main" for the main database or "temp" for the
-** TEMP database, or the name that appears after the AS keyword for
-** databases that are added using the [ATTACH] SQL command.
-** ^A NULL pointer can be used in place of "main" to refer to the
-** main database file.
-** ^The third and fourth parameters to this routine
-** are passed directly through to the second and third parameters of
-** the xFileControl method.  ^The return value of the xFileControl
-** method becomes the return value of this routine.
-**
-** A few opcodes for [sqlite3_file_control()] are handled directly
-** by the SQLite core and never invoke the
-** sqlite3_io_methods.xFileControl method.
-** ^The [SQLITE_FCNTL_FILE_POINTER] value for the op parameter causes
-** a pointer to the underlying [sqlite3_file] object to be written into
-** the space pointed to by the 4th parameter.  The
-** [SQLITE_FCNTL_JOURNAL_POINTER] works similarly except that it returns
-** the [sqlite3_file] object associated with the journal file instead of
-** the main database.  The [SQLITE_FCNTL_VFS_POINTER] opcode returns
-** a pointer to the underlying [sqlite3_vfs] object for the file.
-** The [SQLITE_FCNTL_DATA_VERSION] returns the data version counter
-** from the pager.
-**
-** ^If the second parameter (zDbName) does not match the name of any
-** open database file, then SQLITE_ERROR is returned.  ^This error
-** code is not remembered and will not be recalled by [sqlite3_errcode()]
-** or [sqlite3_errmsg()].  The underlying xFileControl method might
-** also return SQLITE_ERROR.  There is no way to distinguish between
-** an incorrect zDbName and an SQLITE_ERROR return from the underlying
-** xFileControl method.
-**
-** See also: [file control opcodes]
-*/
-SQLITE_API int sqlite3_file_control(sqlite3*, const char *zDbName, int op, void*);
-
-/*
-** CAPI3REF: Testing Interface
-**
-** ^The sqlite3_test_control() interface is used to read out internal
-** state of SQLite and to inject faults into SQLite for testing
-** purposes.  ^The first parameter is an operation code that determines
-** the number, meaning, and operation of all subsequent parameters.
-**
-** This interface is not for use by applications.  It exists solely
-** for verifying the correct operation of the SQLite library.  Depending
-** on how the SQLite library is compiled, this interface might not exist.
-**
-** The details of the operation codes, their meanings, the parameters
-** they take, and what they do are all subject to change without notice.
-** Unlike most of the SQLite API, this function is not guaranteed to
-** operate consistently from one release to the next.
-*/
-SQLITE_API int sqlite3_test_control(int op, ...);
+#define SQLITE_MUTEX_STATIC_MASTER 2
+
+    /*
+    ** CAPI3REF: Retrieve the mutex for a database connection
+    ** METHOD: sqlite3
+    **
+    ** ^This interface returns a pointer the [sqlite3_mutex] object that
+    ** serializes access to the [database connection] given in the argument
+    ** when the [threading mode] is Serialized.
+    ** ^If the [threading mode] is Single-thread or Multi-thread then this
+    ** routine returns a NULL pointer.
+    */
+    SQLITE_API sqlite3_mutex* sqlite3_db_mutex(sqlite3*);
+
+    /*
+    ** CAPI3REF: Low-Level Control Of Database Files
+    ** METHOD: sqlite3
+    ** KEYWORDS: {file control}
+    **
+    ** ^The [sqlite3_file_control()] interface makes a direct call to the
+    ** xFileControl method for the [sqlite3_io_methods] object associated
+    ** with a particular database identified by the second argument. ^The
+    ** name of the database is "main" for the main database or "temp" for the
+    ** TEMP database, or the name that appears after the AS keyword for
+    ** databases that are added using the [ATTACH] SQL command.
+    ** ^A NULL pointer can be used in place of "main" to refer to the
+    ** main database file.
+    ** ^The third and fourth parameters to this routine
+    ** are passed directly through to the second and third parameters of
+    ** the xFileControl method.  ^The return value of the xFileControl
+    ** method becomes the return value of this routine.
+    **
+    ** A few opcodes for [sqlite3_file_control()] are handled directly
+    ** by the SQLite core and never invoke the
+    ** sqlite3_io_methods.xFileControl method.
+    ** ^The [SQLITE_FCNTL_FILE_POINTER] value for the op parameter causes
+    ** a pointer to the underlying [sqlite3_file] object to be written into
+    ** the space pointed to by the 4th parameter.  The
+    ** [SQLITE_FCNTL_JOURNAL_POINTER] works similarly except that it returns
+    ** the [sqlite3_file] object associated with the journal file instead of
+    ** the main database.  The [SQLITE_FCNTL_VFS_POINTER] opcode returns
+    ** a pointer to the underlying [sqlite3_vfs] object for the file.
+    ** The [SQLITE_FCNTL_DATA_VERSION] returns the data version counter
+    ** from the pager.
+    **
+    ** ^If the second parameter (zDbName) does not match the name of any
+    ** open database file, then SQLITE_ERROR is returned.  ^This error
+    ** code is not remembered and will not be recalled by [sqlite3_errcode()]
+    ** or [sqlite3_errmsg()].  The underlying xFileControl method might
+    ** also return SQLITE_ERROR.  There is no way to distinguish between
+    ** an incorrect zDbName and an SQLITE_ERROR return from the underlying
+    ** xFileControl method.
+    **
+    ** See also: [file control opcodes]
+    */
+    SQLITE_API int sqlite3_file_control(sqlite3*, const char* zDbName, int op, void*);
+
+    /*
+    ** CAPI3REF: Testing Interface
+    **
+    ** ^The sqlite3_test_control() interface is used to read out internal
+    ** state of SQLite and to inject faults into SQLite for testing
+    ** purposes.  ^The first parameter is an operation code that determines
+    ** the number, meaning, and operation of all subsequent parameters.
+    **
+    ** This interface is not for use by applications.  It exists solely
+    ** for verifying the correct operation of the SQLite library.  Depending
+    ** on how the SQLite library is compiled, this interface might not exist.
+    **
+    ** The details of the operation codes, their meanings, the parameters
+    ** they take, and what they do are all subject to change without notice.
+    ** Unlike most of the SQLite API, this function is not guaranteed to
+    ** operate consistently from one release to the next.
+    */
+    SQLITE_API int sqlite3_test_control(int op, ...);
 
 /*
 ** CAPI3REF: Testing Interface Operation Codes
@@ -7960,257 +7901,251 @@ SQLITE_API int sqlite3_test_control(int op, ...);
 ** Applications should not use any of these parameters or the
 ** [sqlite3_test_control()] interface.
 */
-#define SQLITE_TESTCTRL_FIRST                    5
-#define SQLITE_TESTCTRL_PRNG_SAVE                5
-#define SQLITE_TESTCTRL_PRNG_RESTORE             6
-#define SQLITE_TESTCTRL_PRNG_RESET               7  /* NOT USED */
-#define SQLITE_TESTCTRL_BITVEC_TEST              8
-#define SQLITE_TESTCTRL_FAULT_INSTALL            9
-#define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS     10
-#define SQLITE_TESTCTRL_PENDING_BYTE            11
-#define SQLITE_TESTCTRL_ASSERT                  12
-#define SQLITE_TESTCTRL_ALWAYS                  13
-#define SQLITE_TESTCTRL_RESERVE                 14  /* NOT USED */
-#define SQLITE_TESTCTRL_OPTIMIZATIONS           15
-#define SQLITE_TESTCTRL_ISKEYWORD               16  /* NOT USED */
-#define SQLITE_TESTCTRL_SCRATCHMALLOC           17  /* NOT USED */
-#define SQLITE_TESTCTRL_INTERNAL_FUNCTIONS      17
-#define SQLITE_TESTCTRL_LOCALTIME_FAULT         18
-#define SQLITE_TESTCTRL_EXPLAIN_STMT            19  /* NOT USED */
-#define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD    19
-#define SQLITE_TESTCTRL_NEVER_CORRUPT           20
-#define SQLITE_TESTCTRL_VDBE_COVERAGE           21
-#define SQLITE_TESTCTRL_BYTEORDER               22
-#define SQLITE_TESTCTRL_ISINIT                  23
-#define SQLITE_TESTCTRL_SORTER_MMAP             24
-#define SQLITE_TESTCTRL_IMPOSTER                25
-#define SQLITE_TESTCTRL_PARSER_COVERAGE         26
-#define SQLITE_TESTCTRL_RESULT_INTREAL          27
-#define SQLITE_TESTCTRL_PRNG_SEED               28
-#define SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS     29
-#define SQLITE_TESTCTRL_SEEK_COUNT              30
-#define SQLITE_TESTCTRL_TRACEFLAGS              31
-#define SQLITE_TESTCTRL_TUNE                    32
-#define SQLITE_TESTCTRL_LOGEST                  33
-#define SQLITE_TESTCTRL_LAST                    33  /* Largest TESTCTRL */
-
-/*
-** CAPI3REF: SQL Keyword Checking
-**
-** These routines provide access to the set of SQL language keywords
-** recognized by SQLite.  Applications can uses these routines to determine
-** whether or not a specific identifier needs to be escaped (for example,
-** by enclosing in double-quotes) so as not to confuse the parser.
-**
-** The sqlite3_keyword_count() interface returns the number of distinct
-** keywords understood by SQLite.
-**
-** The sqlite3_keyword_name(N,Z,L) interface finds the N-th keyword and
-** makes *Z point to that keyword expressed as UTF8 and writes the number
-** of bytes in the keyword into *L.  The string that *Z points to is not
-** zero-terminated.  The sqlite3_keyword_name(N,Z,L) routine returns
-** SQLITE_OK if N is within bounds and SQLITE_ERROR if not. If either Z
-** or L are NULL or invalid pointers then calls to
-** sqlite3_keyword_name(N,Z,L) result in undefined behavior.
-**
-** The sqlite3_keyword_check(Z,L) interface checks to see whether or not
-** the L-byte UTF8 identifier that Z points to is a keyword, returning non-zero
-** if it is and zero if not.
-**
-** The parser used by SQLite is forgiving.  It is often possible to use
-** a keyword as an identifier as long as such use does not result in a
-** parsing ambiguity.  For example, the statement
-** "CREATE TABLE BEGIN(REPLACE,PRAGMA,END);" is accepted by SQLite, and
-** creates a new table named "BEGIN" with three columns named
-** "REPLACE", "PRAGMA", and "END".  Nevertheless, best practice is to avoid
-** using keywords as identifiers.  Common techniques used to avoid keyword
-** name collisions include:
-** <ul>
-** <li> Put all identifier names inside double-quotes.  This is the official
-**      SQL way to escape identifier names.
-** <li> Put identifier names inside &#91;...&#93;.  This is not standard SQL,
-**      but it is what SQL Server does and so lots of programmers use this
-**      technique.
-** <li> Begin every identifier with the letter "Z" as no SQL keywords start
-**      with "Z".
-** <li> Include a digit somewhere in every identifier name.
-** </ul>
-**
-** Note that the number of keywords understood by SQLite can depend on
-** compile-time options.  For example, "VACUUM" is not a keyword if
-** SQLite is compiled with the [-DSQLITE_OMIT_VACUUM] option.  Also,
-** new keywords may be added to future releases of SQLite.
-*/
-SQLITE_API int sqlite3_keyword_count(void);
-SQLITE_API int sqlite3_keyword_name(int,const char**,int*);
-SQLITE_API int sqlite3_keyword_check(const char*,int);
-
-/*
-** CAPI3REF: Dynamic String Object
-** KEYWORDS: {dynamic string}
-**
-** An instance of the sqlite3_str object contains a dynamically-sized
-** string under construction.
-**
-** The lifecycle of an sqlite3_str object is as follows:
-** <ol>
-** <li> ^The sqlite3_str object is created using [sqlite3_str_new()].
-** <li> ^Text is appended to the sqlite3_str object using various
-** methods, such as [sqlite3_str_appendf()].
-** <li> ^The sqlite3_str object is destroyed and the string it created
-** is returned using the [sqlite3_str_finish()] interface.
-** </ol>
-*/
-typedef struct sqlite3_str sqlite3_str;
-
-/*
-** CAPI3REF: Create A New Dynamic String Object
-** CONSTRUCTOR: sqlite3_str
-**
-** ^The [sqlite3_str_new(D)] interface allocates and initializes
-** a new [sqlite3_str] object.  To avoid memory leaks, the object returned by
-** [sqlite3_str_new()] must be freed by a subsequent call to
-** [sqlite3_str_finish(X)].
-**
-** ^The [sqlite3_str_new(D)] interface always returns a pointer to a
-** valid [sqlite3_str] object, though in the event of an out-of-memory
-** error the returned object might be a special singleton that will
-** silently reject new text, always return SQLITE_NOMEM from
-** [sqlite3_str_errcode()], always return 0 for
-** [sqlite3_str_length()], and always return NULL from
-** [sqlite3_str_finish(X)].  It is always safe to use the value
-** returned by [sqlite3_str_new(D)] as the sqlite3_str parameter
-** to any of the other [sqlite3_str] methods.
-**
-** The D parameter to [sqlite3_str_new(D)] may be NULL.  If the
-** D parameter in [sqlite3_str_new(D)] is not NULL, then the maximum
-** length of the string contained in the [sqlite3_str] object will be
-** the value set for [sqlite3_limit](D,[SQLITE_LIMIT_LENGTH]) instead
-** of [SQLITE_MAX_LENGTH].
-*/
-SQLITE_API sqlite3_str *sqlite3_str_new(sqlite3*);
-
-/*
-** CAPI3REF: Finalize A Dynamic String
-** DESTRUCTOR: sqlite3_str
-**
-** ^The [sqlite3_str_finish(X)] interface destroys the sqlite3_str object X
-** and returns a pointer to a memory buffer obtained from [sqlite3_malloc64()]
-** that contains the constructed string.  The calling application should
-** pass the returned value to [sqlite3_free()] to avoid a memory leak.
-** ^The [sqlite3_str_finish(X)] interface may return a NULL pointer if any
-** errors were encountered during construction of the string.  ^The
-** [sqlite3_str_finish(X)] interface will also return a NULL pointer if the
-** string in [sqlite3_str] object X is zero bytes long.
-*/
-SQLITE_API char *sqlite3_str_finish(sqlite3_str*);
-
-/*
-** CAPI3REF: Add Content To A Dynamic String
-** METHOD: sqlite3_str
-**
-** These interfaces add content to an sqlite3_str object previously obtained
-** from [sqlite3_str_new()].
-**
-** ^The [sqlite3_str_appendf(X,F,...)] and
-** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
-** functionality of SQLite to append formatted text onto the end of
-** [sqlite3_str] object X.
-**
-** ^The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
-** onto the end of the [sqlite3_str] object X.  N must be non-negative.
-** S must contain at least N non-zero bytes of content.  To append a
-** zero-terminated string in its entirety, use the [sqlite3_str_appendall()]
-** method instead.
-**
-** ^The [sqlite3_str_appendall(X,S)] method appends the complete content of
-** zero-terminated string S onto the end of [sqlite3_str] object X.
-**
-** ^The [sqlite3_str_appendchar(X,N,C)] method appends N copies of the
-** single-byte character C onto the end of [sqlite3_str] object X.
-** ^This method can be used, for example, to add whitespace indentation.
-**
-** ^The [sqlite3_str_reset(X)] method resets the string under construction
-** inside [sqlite3_str] object X back to zero bytes in length.
-**
-** These methods do not return a result code.  ^If an error occurs, that fact
-** is recorded in the [sqlite3_str] object and can be recovered by a
-** subsequent call to [sqlite3_str_errcode(X)].
-*/
-SQLITE_API void sqlite3_str_appendf(sqlite3_str*, const char *zFormat, ...);
-SQLITE_API void sqlite3_str_vappendf(sqlite3_str*, const char *zFormat, va_list);
-SQLITE_API void sqlite3_str_append(sqlite3_str*, const char *zIn, int N);
-SQLITE_API void sqlite3_str_appendall(sqlite3_str*, const char *zIn);
-SQLITE_API void sqlite3_str_appendchar(sqlite3_str*, int N, char C);
-SQLITE_API void sqlite3_str_reset(sqlite3_str*);
-
-/*
-** CAPI3REF: Status Of A Dynamic String
-** METHOD: sqlite3_str
-**
-** These interfaces return the current status of an [sqlite3_str] object.
-**
-** ^If any prior errors have occurred while constructing the dynamic string
-** in sqlite3_str X, then the [sqlite3_str_errcode(X)] method will return
-** an appropriate error code.  ^The [sqlite3_str_errcode(X)] method returns
-** [SQLITE_NOMEM] following any out-of-memory error, or
-** [SQLITE_TOOBIG] if the size of the dynamic string exceeds
-** [SQLITE_MAX_LENGTH], or [SQLITE_OK] if there have been no errors.
-**
-** ^The [sqlite3_str_length(X)] method returns the current length, in bytes,
-** of the dynamic string under construction in [sqlite3_str] object X.
-** ^The length returned by [sqlite3_str_length(X)] does not include the
-** zero-termination byte.
-**
-** ^The [sqlite3_str_value(X)] method returns a pointer to the current
-** content of the dynamic string under construction in X.  The value
-** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
-** and might be freed or altered by any subsequent method on the same
-** [sqlite3_str] object.  Applications must not used the pointer returned
-** [sqlite3_str_value(X)] after any subsequent method call on the same
-** object.  ^Applications may change the content of the string returned
-** by [sqlite3_str_value(X)] as long as they do not write into any bytes
-** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
-** write any byte after any subsequent sqlite3_str method call.
-*/
-SQLITE_API int sqlite3_str_errcode(sqlite3_str*);
-SQLITE_API int sqlite3_str_length(sqlite3_str*);
-SQLITE_API char *sqlite3_str_value(sqlite3_str*);
-
-/*
-** CAPI3REF: SQLite Runtime Status
-**
-** ^These interfaces are used to retrieve runtime status information
-** about the performance of SQLite, and optionally to reset various
-** highwater marks.  ^The first argument is an integer code for
-** the specific parameter to measure.  ^(Recognized integer codes
-** are of the form [status parameters | SQLITE_STATUS_...].)^
-** ^The current value of the parameter is returned into *pCurrent.
-** ^The highest recorded value is returned in *pHighwater.  ^If the
-** resetFlag is true, then the highest record value is reset after
-** *pHighwater is written.  ^(Some parameters do not record the highest
-** value.  For those parameters
-** nothing is written into *pHighwater and the resetFlag is ignored.)^
-** ^(Other parameters record only the highwater mark and not the current
-** value.  For these latter parameters nothing is written into *pCurrent.)^
-**
-** ^The sqlite3_status() and sqlite3_status64() routines return
-** SQLITE_OK on success and a non-zero [error code] on failure.
-**
-** If either the current value or the highwater mark is too large to
-** be represented by a 32-bit integer, then the values returned by
-** sqlite3_status() are undefined.
-**
-** See also: [sqlite3_db_status()]
-*/
-SQLITE_API int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag);
-SQLITE_API int sqlite3_status64(
-  int op,
-  sqlite3_int64 *pCurrent,
-  sqlite3_int64 *pHighwater,
-  int resetFlag
-);
-
+#define SQLITE_TESTCTRL_FIRST 5
+#define SQLITE_TESTCTRL_PRNG_SAVE 5
+#define SQLITE_TESTCTRL_PRNG_RESTORE 6
+#define SQLITE_TESTCTRL_PRNG_RESET 7 /* NOT USED */
+#define SQLITE_TESTCTRL_BITVEC_TEST 8
+#define SQLITE_TESTCTRL_FAULT_INSTALL 9
+#define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS 10
+#define SQLITE_TESTCTRL_PENDING_BYTE 11
+#define SQLITE_TESTCTRL_ASSERT 12
+#define SQLITE_TESTCTRL_ALWAYS 13
+#define SQLITE_TESTCTRL_RESERVE 14 /* NOT USED */
+#define SQLITE_TESTCTRL_OPTIMIZATIONS 15
+#define SQLITE_TESTCTRL_ISKEYWORD 16     /* NOT USED */
+#define SQLITE_TESTCTRL_SCRATCHMALLOC 17 /* NOT USED */
+#define SQLITE_TESTCTRL_INTERNAL_FUNCTIONS 17
+#define SQLITE_TESTCTRL_LOCALTIME_FAULT 18
+#define SQLITE_TESTCTRL_EXPLAIN_STMT 19 /* NOT USED */
+#define SQLITE_TESTCTRL_ONCE_RESET_THRESHOLD 19
+#define SQLITE_TESTCTRL_NEVER_CORRUPT 20
+#define SQLITE_TESTCTRL_VDBE_COVERAGE 21
+#define SQLITE_TESTCTRL_BYTEORDER 22
+#define SQLITE_TESTCTRL_ISINIT 23
+#define SQLITE_TESTCTRL_SORTER_MMAP 24
+#define SQLITE_TESTCTRL_IMPOSTER 25
+#define SQLITE_TESTCTRL_PARSER_COVERAGE 26
+#define SQLITE_TESTCTRL_RESULT_INTREAL 27
+#define SQLITE_TESTCTRL_PRNG_SEED 28
+#define SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS 29
+#define SQLITE_TESTCTRL_SEEK_COUNT 30
+#define SQLITE_TESTCTRL_TRACEFLAGS 31
+#define SQLITE_TESTCTRL_TUNE 32
+#define SQLITE_TESTCTRL_LOGEST 33
+#define SQLITE_TESTCTRL_LAST 33 /* Largest TESTCTRL */
+
+    /*
+    ** CAPI3REF: SQL Keyword Checking
+    **
+    ** These routines provide access to the set of SQL language keywords
+    ** recognized by SQLite.  Applications can uses these routines to determine
+    ** whether or not a specific identifier needs to be escaped (for example,
+    ** by enclosing in double-quotes) so as not to confuse the parser.
+    **
+    ** The sqlite3_keyword_count() interface returns the number of distinct
+    ** keywords understood by SQLite.
+    **
+    ** The sqlite3_keyword_name(N,Z,L) interface finds the N-th keyword and
+    ** makes *Z point to that keyword expressed as UTF8 and writes the number
+    ** of bytes in the keyword into *L.  The string that *Z points to is not
+    ** zero-terminated.  The sqlite3_keyword_name(N,Z,L) routine returns
+    ** SQLITE_OK if N is within bounds and SQLITE_ERROR if not. If either Z
+    ** or L are NULL or invalid pointers then calls to
+    ** sqlite3_keyword_name(N,Z,L) result in undefined behavior.
+    **
+    ** The sqlite3_keyword_check(Z,L) interface checks to see whether or not
+    ** the L-byte UTF8 identifier that Z points to is a keyword, returning non-zero
+    ** if it is and zero if not.
+    **
+    ** The parser used by SQLite is forgiving.  It is often possible to use
+    ** a keyword as an identifier as long as such use does not result in a
+    ** parsing ambiguity.  For example, the statement
+    ** "CREATE TABLE BEGIN(REPLACE,PRAGMA,END);" is accepted by SQLite, and
+    ** creates a new table named "BEGIN" with three columns named
+    ** "REPLACE", "PRAGMA", and "END".  Nevertheless, best practice is to avoid
+    ** using keywords as identifiers.  Common techniques used to avoid keyword
+    ** name collisions include:
+    ** <ul>
+    ** <li> Put all identifier names inside double-quotes.  This is the official
+    **      SQL way to escape identifier names.
+    ** <li> Put identifier names inside &#91;...&#93;.  This is not standard SQL,
+    **      but it is what SQL Server does and so lots of programmers use this
+    **      technique.
+    ** <li> Begin every identifier with the letter "Z" as no SQL keywords start
+    **      with "Z".
+    ** <li> Include a digit somewhere in every identifier name.
+    ** </ul>
+    **
+    ** Note that the number of keywords understood by SQLite can depend on
+    ** compile-time options.  For example, "VACUUM" is not a keyword if
+    ** SQLite is compiled with the [-DSQLITE_OMIT_VACUUM] option.  Also,
+    ** new keywords may be added to future releases of SQLite.
+    */
+    SQLITE_API int sqlite3_keyword_count(void);
+    SQLITE_API int sqlite3_keyword_name(int, const char**, int*);
+    SQLITE_API int sqlite3_keyword_check(const char*, int);
+
+    /*
+    ** CAPI3REF: Dynamic String Object
+    ** KEYWORDS: {dynamic string}
+    **
+    ** An instance of the sqlite3_str object contains a dynamically-sized
+    ** string under construction.
+    **
+    ** The lifecycle of an sqlite3_str object is as follows:
+    ** <ol>
+    ** <li> ^The sqlite3_str object is created using [sqlite3_str_new()].
+    ** <li> ^Text is appended to the sqlite3_str object using various
+    ** methods, such as [sqlite3_str_appendf()].
+    ** <li> ^The sqlite3_str object is destroyed and the string it created
+    ** is returned using the [sqlite3_str_finish()] interface.
+    ** </ol>
+    */
+    typedef struct sqlite3_str sqlite3_str;
+
+    /*
+    ** CAPI3REF: Create A New Dynamic String Object
+    ** CONSTRUCTOR: sqlite3_str
+    **
+    ** ^The [sqlite3_str_new(D)] interface allocates and initializes
+    ** a new [sqlite3_str] object.  To avoid memory leaks, the object returned by
+    ** [sqlite3_str_new()] must be freed by a subsequent call to
+    ** [sqlite3_str_finish(X)].
+    **
+    ** ^The [sqlite3_str_new(D)] interface always returns a pointer to a
+    ** valid [sqlite3_str] object, though in the event of an out-of-memory
+    ** error the returned object might be a special singleton that will
+    ** silently reject new text, always return SQLITE_NOMEM from
+    ** [sqlite3_str_errcode()], always return 0 for
+    ** [sqlite3_str_length()], and always return NULL from
+    ** [sqlite3_str_finish(X)].  It is always safe to use the value
+    ** returned by [sqlite3_str_new(D)] as the sqlite3_str parameter
+    ** to any of the other [sqlite3_str] methods.
+    **
+    ** The D parameter to [sqlite3_str_new(D)] may be NULL.  If the
+    ** D parameter in [sqlite3_str_new(D)] is not NULL, then the maximum
+    ** length of the string contained in the [sqlite3_str] object will be
+    ** the value set for [sqlite3_limit](D,[SQLITE_LIMIT_LENGTH]) instead
+    ** of [SQLITE_MAX_LENGTH].
+    */
+    SQLITE_API sqlite3_str* sqlite3_str_new(sqlite3*);
+
+    /*
+    ** CAPI3REF: Finalize A Dynamic String
+    ** DESTRUCTOR: sqlite3_str
+    **
+    ** ^The [sqlite3_str_finish(X)] interface destroys the sqlite3_str object X
+    ** and returns a pointer to a memory buffer obtained from [sqlite3_malloc64()]
+    ** that contains the constructed string.  The calling application should
+    ** pass the returned value to [sqlite3_free()] to avoid a memory leak.
+    ** ^The [sqlite3_str_finish(X)] interface may return a NULL pointer if any
+    ** errors were encountered during construction of the string.  ^The
+    ** [sqlite3_str_finish(X)] interface will also return a NULL pointer if the
+    ** string in [sqlite3_str] object X is zero bytes long.
+    */
+    SQLITE_API char* sqlite3_str_finish(sqlite3_str*);
+
+    /*
+    ** CAPI3REF: Add Content To A Dynamic String
+    ** METHOD: sqlite3_str
+    **
+    ** These interfaces add content to an sqlite3_str object previously obtained
+    ** from [sqlite3_str_new()].
+    **
+    ** ^The [sqlite3_str_appendf(X,F,...)] and
+    ** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
+    ** functionality of SQLite to append formatted text onto the end of
+    ** [sqlite3_str] object X.
+    **
+    ** ^The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
+    ** onto the end of the [sqlite3_str] object X.  N must be non-negative.
+    ** S must contain at least N non-zero bytes of content.  To append a
+    ** zero-terminated string in its entirety, use the [sqlite3_str_appendall()]
+    ** method instead.
+    **
+    ** ^The [sqlite3_str_appendall(X,S)] method appends the complete content of
+    ** zero-terminated string S onto the end of [sqlite3_str] object X.
+    **
+    ** ^The [sqlite3_str_appendchar(X,N,C)] method appends N copies of the
+    ** single-byte character C onto the end of [sqlite3_str] object X.
+    ** ^This method can be used, for example, to add whitespace indentation.
+    **
+    ** ^The [sqlite3_str_reset(X)] method resets the string under construction
+    ** inside [sqlite3_str] object X back to zero bytes in length.
+    **
+    ** These methods do not return a result code.  ^If an error occurs, that fact
+    ** is recorded in the [sqlite3_str] object and can be recovered by a
+    ** subsequent call to [sqlite3_str_errcode(X)].
+    */
+    SQLITE_API void sqlite3_str_appendf(sqlite3_str*, const char* zFormat, ...);
+    SQLITE_API void sqlite3_str_vappendf(sqlite3_str*, const char* zFormat, va_list);
+    SQLITE_API void sqlite3_str_append(sqlite3_str*, const char* zIn, int N);
+    SQLITE_API void sqlite3_str_appendall(sqlite3_str*, const char* zIn);
+    SQLITE_API void sqlite3_str_appendchar(sqlite3_str*, int N, char C);
+    SQLITE_API void sqlite3_str_reset(sqlite3_str*);
+
+    /*
+    ** CAPI3REF: Status Of A Dynamic String
+    ** METHOD: sqlite3_str
+    **
+    ** These interfaces return the current status of an [sqlite3_str] object.
+    **
+    ** ^If any prior errors have occurred while constructing the dynamic string
+    ** in sqlite3_str X, then the [sqlite3_str_errcode(X)] method will return
+    ** an appropriate error code.  ^The [sqlite3_str_errcode(X)] method returns
+    ** [SQLITE_NOMEM] following any out-of-memory error, or
+    ** [SQLITE_TOOBIG] if the size of the dynamic string exceeds
+    ** [SQLITE_MAX_LENGTH], or [SQLITE_OK] if there have been no errors.
+    **
+    ** ^The [sqlite3_str_length(X)] method returns the current length, in bytes,
+    ** of the dynamic string under construction in [sqlite3_str] object X.
+    ** ^The length returned by [sqlite3_str_length(X)] does not include the
+    ** zero-termination byte.
+    **
+    ** ^The [sqlite3_str_value(X)] method returns a pointer to the current
+    ** content of the dynamic string under construction in X.  The value
+    ** returned by [sqlite3_str_value(X)] is managed by the sqlite3_str object X
+    ** and might be freed or altered by any subsequent method on the same
+    ** [sqlite3_str] object.  Applications must not used the pointer returned
+    ** [sqlite3_str_value(X)] after any subsequent method call on the same
+    ** object.  ^Applications may change the content of the string returned
+    ** by [sqlite3_str_value(X)] as long as they do not write into any bytes
+    ** outside the range of 0 to [sqlite3_str_length(X)] and do not read or
+    ** write any byte after any subsequent sqlite3_str method call.
+    */
+    SQLITE_API int sqlite3_str_errcode(sqlite3_str*);
+    SQLITE_API int sqlite3_str_length(sqlite3_str*);
+    SQLITE_API char* sqlite3_str_value(sqlite3_str*);
+
+    /*
+    ** CAPI3REF: SQLite Runtime Status
+    **
+    ** ^These interfaces are used to retrieve runtime status information
+    ** about the performance of SQLite, and optionally to reset various
+    ** highwater marks.  ^The first argument is an integer code for
+    ** the specific parameter to measure.  ^(Recognized integer codes
+    ** are of the form [status parameters | SQLITE_STATUS_...].)^
+    ** ^The current value of the parameter is returned into *pCurrent.
+    ** ^The highest recorded value is returned in *pHighwater.  ^If the
+    ** resetFlag is true, then the highest record value is reset after
+    ** *pHighwater is written.  ^(Some parameters do not record the highest
+    ** value.  For those parameters
+    ** nothing is written into *pHighwater and the resetFlag is ignored.)^
+    ** ^(Other parameters record only the highwater mark and not the current
+    ** value.  For these latter parameters nothing is written into *pCurrent.)^
+    **
+    ** ^The sqlite3_status() and sqlite3_status64() routines return
+    ** SQLITE_OK on success and a non-zero [error code] on failure.
+    **
+    ** If either the current value or the highwater mark is too large to
+    ** be represented by a 32-bit integer, then the values returned by
+    ** sqlite3_status() are undefined.
+    **
+    ** See also: [sqlite3_db_status()]
+    */
+    SQLITE_API int sqlite3_status(int op, int* pCurrent, int* pHighwater, int resetFlag);
+    SQLITE_API int sqlite3_status64(int op, sqlite3_int64* pCurrent, sqlite3_int64* pHighwater, int resetFlag);
 
 /*
 ** CAPI3REF: Status Parameters
@@ -8279,48 +8214,48 @@ SQLITE_API int sqlite3_status64(
 **
 ** New status parameters may be added from time to time.
 */
-#define SQLITE_STATUS_MEMORY_USED          0
-#define SQLITE_STATUS_PAGECACHE_USED       1
-#define SQLITE_STATUS_PAGECACHE_OVERFLOW   2
-#define SQLITE_STATUS_SCRATCH_USED         3  /* NOT USED */
-#define SQLITE_STATUS_SCRATCH_OVERFLOW     4  /* NOT USED */
-#define SQLITE_STATUS_MALLOC_SIZE          5
-#define SQLITE_STATUS_PARSER_STACK         6
-#define SQLITE_STATUS_PAGECACHE_SIZE       7
-#define SQLITE_STATUS_SCRATCH_SIZE         8  /* NOT USED */
-#define SQLITE_STATUS_MALLOC_COUNT         9
+#define SQLITE_STATUS_MEMORY_USED 0
+#define SQLITE_STATUS_PAGECACHE_USED 1
+#define SQLITE_STATUS_PAGECACHE_OVERFLOW 2
+#define SQLITE_STATUS_SCRATCH_USED 3     /* NOT USED */
+#define SQLITE_STATUS_SCRATCH_OVERFLOW 4 /* NOT USED */
+#define SQLITE_STATUS_MALLOC_SIZE 5
+#define SQLITE_STATUS_PARSER_STACK 6
+#define SQLITE_STATUS_PAGECACHE_SIZE 7
+#define SQLITE_STATUS_SCRATCH_SIZE 8 /* NOT USED */
+#define SQLITE_STATUS_MALLOC_COUNT 9
+
+    /*
+    ** CAPI3REF: Database Connection Status
+    ** METHOD: sqlite3
+    **
+    ** ^This interface is used to retrieve runtime status information
+    ** about a single [database connection].  ^The first argument is the
+    ** database connection object to be interrogated.  ^The second argument
+    ** is an integer constant, taken from the set of
+    ** [SQLITE_DBSTATUS options], that
+    ** determines the parameter to interrogate.  The set of
+    ** [SQLITE_DBSTATUS options] is likely
+    ** to grow in future releases of SQLite.
+    **
+    ** ^The current value of the requested parameter is written into *pCur
+    ** and the highest instantaneous value is written into *pHiwtr.  ^If
+    ** the resetFlg is true, then the highest instantaneous value is
+    ** reset back down to the current value.
+    **
+    ** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
+    ** non-zero [error code] on failure.
+    **
+    ** See also: [sqlite3_status()] and [sqlite3_stmt_status()].
+    */
+    SQLITE_API int sqlite3_db_status(sqlite3*, int op, int* pCur, int* pHiwtr, int resetFlg);
 
 /*
-** CAPI3REF: Database Connection Status
-** METHOD: sqlite3
+** CAPI3REF: Status Parameters for database connections
+** KEYWORDS: {SQLITE_DBSTATUS options}
 **
-** ^This interface is used to retrieve runtime status information
-** about a single [database connection].  ^The first argument is the
-** database connection object to be interrogated.  ^The second argument
-** is an integer constant, taken from the set of
-** [SQLITE_DBSTATUS options], that
-** determines the parameter to interrogate.  The set of
-** [SQLITE_DBSTATUS options] is likely
-** to grow in future releases of SQLite.
-**
-** ^The current value of the requested parameter is written into *pCur
-** and the highest instantaneous value is written into *pHiwtr.  ^If
-** the resetFlg is true, then the highest instantaneous value is
-** reset back down to the current value.
-**
-** ^The sqlite3_db_status() routine returns SQLITE_OK on success and a
-** non-zero [error code] on failure.
-**
-** See also: [sqlite3_status()] and [sqlite3_stmt_status()].
-*/
-SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg);
-
-/*
-** CAPI3REF: Status Parameters for database connections
-** KEYWORDS: {SQLITE_DBSTATUS options}
-**
-** These constants are the available integer "verbs" that can be passed as
-** the second argument to the [sqlite3_db_status()] interface.
+** These constants are the available integer "verbs" that can be passed as
+** the second argument to the [sqlite3_db_status()] interface.
 **
 ** New verbs may be added in future releases of SQLite. Existing verbs
 ** might be discontinued. Applications should check the return code from
@@ -8426,47 +8361,46 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
 ** </dd>
 ** </dl>
 */
-#define SQLITE_DBSTATUS_LOOKASIDE_USED       0
-#define SQLITE_DBSTATUS_CACHE_USED           1
-#define SQLITE_DBSTATUS_SCHEMA_USED          2
-#define SQLITE_DBSTATUS_STMT_USED            3
-#define SQLITE_DBSTATUS_LOOKASIDE_HIT        4
-#define SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE  5
-#define SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL  6
-#define SQLITE_DBSTATUS_CACHE_HIT            7
-#define SQLITE_DBSTATUS_CACHE_MISS           8
-#define SQLITE_DBSTATUS_CACHE_WRITE          9
-#define SQLITE_DBSTATUS_DEFERRED_FKS        10
-#define SQLITE_DBSTATUS_CACHE_USED_SHARED   11
-#define SQLITE_DBSTATUS_CACHE_SPILL         12
-#define SQLITE_DBSTATUS_MAX                 12   /* Largest defined DBSTATUS */
-
-
-/*
-** CAPI3REF: Prepared Statement Status
-** METHOD: sqlite3_stmt
-**
-** ^(Each prepared statement maintains various
-** [SQLITE_STMTSTATUS counters] that measure the number
-** of times it has performed specific operations.)^  These counters can
-** be used to monitor the performance characteristics of the prepared
-** statements.  For example, if the number of table steps greatly exceeds
-** the number of table searches or result rows, that would tend to indicate
-** that the prepared statement is using a full table scan rather than
-** an index.
-**
-** ^(This interface is used to retrieve and reset counter values from
-** a [prepared statement].  The first argument is the prepared statement
-** object to be interrogated.  The second argument
-** is an integer code for a specific [SQLITE_STMTSTATUS counter]
-** to be interrogated.)^
-** ^The current value of the requested counter is returned.
-** ^If the resetFlg is true, then the counter is reset to zero after this
-** interface call returns.
-**
-** See also: [sqlite3_status()] and [sqlite3_db_status()].
-*/
-SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
+#define SQLITE_DBSTATUS_LOOKASIDE_USED 0
+#define SQLITE_DBSTATUS_CACHE_USED 1
+#define SQLITE_DBSTATUS_SCHEMA_USED 2
+#define SQLITE_DBSTATUS_STMT_USED 3
+#define SQLITE_DBSTATUS_LOOKASIDE_HIT 4
+#define SQLITE_DBSTATUS_LOOKASIDE_MISS_SIZE 5
+#define SQLITE_DBSTATUS_LOOKASIDE_MISS_FULL 6
+#define SQLITE_DBSTATUS_CACHE_HIT 7
+#define SQLITE_DBSTATUS_CACHE_MISS 8
+#define SQLITE_DBSTATUS_CACHE_WRITE 9
+#define SQLITE_DBSTATUS_DEFERRED_FKS 10
+#define SQLITE_DBSTATUS_CACHE_USED_SHARED 11
+#define SQLITE_DBSTATUS_CACHE_SPILL 12
+#define SQLITE_DBSTATUS_MAX 12 /* Largest defined DBSTATUS */
+
+    /*
+    ** CAPI3REF: Prepared Statement Status
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^(Each prepared statement maintains various
+    ** [SQLITE_STMTSTATUS counters] that measure the number
+    ** of times it has performed specific operations.)^  These counters can
+    ** be used to monitor the performance characteristics of the prepared
+    ** statements.  For example, if the number of table steps greatly exceeds
+    ** the number of table searches or result rows, that would tend to indicate
+    ** that the prepared statement is using a full table scan rather than
+    ** an index.
+    **
+    ** ^(This interface is used to retrieve and reset counter values from
+    ** a [prepared statement].  The first argument is the prepared statement
+    ** object to be interrogated.  The second argument
+    ** is an integer code for a specific [SQLITE_STMTSTATUS counter]
+    ** to be interrogated.)^
+    ** ^The current value of the requested counter is returned.
+    ** ^If the resetFlg is true, then the counter is reset to zero after this
+    ** interface call returns.
+    **
+    ** See also: [sqlite3_status()] and [sqlite3_db_status()].
+    */
+    SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op, int resetFlg);
 
 /*
 ** CAPI3REF: Status Parameters for prepared statements
@@ -8533,841 +8467,834 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
 ** </dd>
 ** </dl>
 */
-#define SQLITE_STMTSTATUS_FULLSCAN_STEP     1
-#define SQLITE_STMTSTATUS_SORT              2
-#define SQLITE_STMTSTATUS_AUTOINDEX         3
-#define SQLITE_STMTSTATUS_VM_STEP           4
-#define SQLITE_STMTSTATUS_REPREPARE         5
-#define SQLITE_STMTSTATUS_RUN               6
-#define SQLITE_STMTSTATUS_FILTER_MISS       7
-#define SQLITE_STMTSTATUS_FILTER_HIT        8
-#define SQLITE_STMTSTATUS_MEMUSED           99
-
-/*
-** CAPI3REF: Custom Page Cache Object
-**
-** The sqlite3_pcache type is opaque.  It is implemented by
-** the pluggable module.  The SQLite core has no knowledge of
-** its size or internal structure and never deals with the
-** sqlite3_pcache object except by holding and passing pointers
-** to the object.
-**
-** See [sqlite3_pcache_methods2] for additional information.
-*/
-typedef struct sqlite3_pcache sqlite3_pcache;
-
-/*
-** CAPI3REF: Custom Page Cache Object
-**
-** The sqlite3_pcache_page object represents a single page in the
-** page cache.  The page cache will allocate instances of this
-** object.  Various methods of the page cache use pointers to instances
-** of this object as parameters or as their return value.
-**
-** See [sqlite3_pcache_methods2] for additional information.
-*/
-typedef struct sqlite3_pcache_page sqlite3_pcache_page;
-struct sqlite3_pcache_page {
-  void *pBuf;        /* The content of the page */
-  void *pExtra;      /* Extra information associated with the page */
-};
-
-/*
-** CAPI3REF: Application Defined Page Cache.
-** KEYWORDS: {page cache}
-**
-** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can
-** register an alternative page cache implementation by passing in an
-** instance of the sqlite3_pcache_methods2 structure.)^
-** In many applications, most of the heap memory allocated by
-** SQLite is used for the page cache.
-** By implementing a
-** custom page cache using this API, an application can better control
-** the amount of memory consumed by SQLite, the way in which
-** that memory is allocated and released, and the policies used to
-** determine exactly which parts of a database file are cached and for
-** how long.
-**
-** The alternative page cache mechanism is an
-** extreme measure that is only needed by the most demanding applications.
-** The built-in page cache is recommended for most uses.
-**
-** ^(The contents of the sqlite3_pcache_methods2 structure are copied to an
-** internal buffer by SQLite within the call to [sqlite3_config].  Hence
-** the application may discard the parameter after the call to
-** [sqlite3_config()] returns.)^
-**
-** [[the xInit() page cache method]]
-** ^(The xInit() method is called once for each effective
-** call to [sqlite3_initialize()])^
-** (usually only once during the lifetime of the process). ^(The xInit()
-** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^
-** The intent of the xInit() method is to set up global data structures
-** required by the custom page cache implementation.
-** ^(If the xInit() method is NULL, then the
-** built-in default page cache is used instead of the application defined
-** page cache.)^
-**
-** [[the xShutdown() page cache method]]
-** ^The xShutdown() method is called by [sqlite3_shutdown()].
-** It can be used to clean up
-** any outstanding resources before process shutdown, if required.
-** ^The xShutdown() method may be NULL.
-**
-** ^SQLite automatically serializes calls to the xInit method,
-** so the xInit method need not be threadsafe.  ^The
-** xShutdown method is only called from [sqlite3_shutdown()] so it does
-** not need to be threadsafe either.  All other methods must be threadsafe
-** in multithreaded applications.
-**
-** ^SQLite will never invoke xInit() more than once without an intervening
-** call to xShutdown().
-**
-** [[the xCreate() page cache methods]]
-** ^SQLite invokes the xCreate() method to construct a new cache instance.
-** SQLite will typically create one cache instance for each open database file,
-** though this is not guaranteed. ^The
-** first parameter, szPage, is the size in bytes of the pages that must
-** be allocated by the cache.  ^szPage will always a power of two.  ^The
-** second parameter szExtra is a number of bytes of extra storage
-** associated with each page cache entry.  ^The szExtra parameter will
-** a number less than 250.  SQLite will use the
-** extra szExtra bytes on each page to store metadata about the underlying
-** database page on disk.  The value passed into szExtra depends
-** on the SQLite version, the target platform, and how SQLite was compiled.
-** ^The third argument to xCreate(), bPurgeable, is true if the cache being
-** created will be used to cache database pages of a file stored on disk, or
-** false if it is used for an in-memory database. The cache implementation
-** does not have to do anything special based with the value of bPurgeable;
-** it is purely advisory.  ^On a cache where bPurgeable is false, SQLite will
-** never invoke xUnpin() except to deliberately delete a page.
-** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
-** false will always have the "discard" flag set to true.
-** ^Hence, a cache created with bPurgeable false will
-** never contain any unpinned pages.
-**
-** [[the xCachesize() page cache method]]
-** ^(The xCachesize() method may be called at any time by SQLite to set the
-** suggested maximum cache-size (number of pages stored by) the cache
-** instance passed as the first argument. This is the value configured using
-** the SQLite "[PRAGMA cache_size]" command.)^  As with the bPurgeable
-** parameter, the implementation is not required to do anything with this
-** value; it is advisory only.
-**
-** [[the xPagecount() page cache methods]]
-** The xPagecount() method must return the number of pages currently
-** stored in the cache, both pinned and unpinned.
-**
-** [[the xFetch() page cache methods]]
-** The xFetch() method locates a page in the cache and returns a pointer to
-** an sqlite3_pcache_page object associated with that page, or a NULL pointer.
-** The pBuf element of the returned sqlite3_pcache_page object will be a
-** pointer to a buffer of szPage bytes used to store the content of a
-** single database page.  The pExtra element of sqlite3_pcache_page will be
-** a pointer to the szExtra bytes of extra storage that SQLite has requested
-** for each entry in the page cache.
-**
-** The page to be fetched is determined by the key. ^The minimum key value
-** is 1.  After it has been retrieved using xFetch, the page is considered
-** to be "pinned".
-**
-** If the requested page is already in the page cache, then the page cache
-** implementation must return a pointer to the page buffer with its content
-** intact.  If the requested page is not already in the cache, then the
-** cache implementation should use the value of the createFlag
-** parameter to help it determined what action to take:
-**
-** <table border=1 width=85% align=center>
-** <tr><th> createFlag <th> Behavior when page is not already in cache
-** <tr><td> 0 <td> Do not allocate a new page.  Return NULL.
-** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
-**                 Otherwise return NULL.
-** <tr><td> 2 <td> Make every effort to allocate a new page.  Only return
-**                 NULL if allocating a new page is effectively impossible.
-** </table>
-**
-** ^(SQLite will normally invoke xFetch() with a createFlag of 0 or 1.  SQLite
-** will only use a createFlag of 2 after a prior call with a createFlag of 1
-** failed.)^  In between the xFetch() calls, SQLite may
-** attempt to unpin one or more cache pages by spilling the content of
-** pinned pages to disk and synching the operating system disk cache.
-**
-** [[the xUnpin() page cache method]]
-** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
-** as its second argument.  If the third parameter, discard, is non-zero,
-** then the page must be evicted from the cache.
-** ^If the discard parameter is
-** zero, then the page may be discarded or retained at the discretion of
-** page cache implementation. ^The page cache implementation
-** may choose to evict unpinned pages at any time.
-**
-** The cache must not perform any reference counting. A single
-** call to xUnpin() unpins the page regardless of the number of prior calls
-** to xFetch().
-**
-** [[the xRekey() page cache methods]]
-** The xRekey() method is used to change the key value associated with the
-** page passed as the second argument. If the cache
-** previously contains an entry associated with newKey, it must be
-** discarded. ^Any prior cache entry associated with newKey is guaranteed not
-** to be pinned.
-**
-** When SQLite calls the xTruncate() method, the cache must discard all
-** existing cache entries with page numbers (keys) greater than or equal
-** to the value of the iLimit parameter passed to xTruncate(). If any
-** of these pages are pinned, they are implicitly unpinned, meaning that
-** they can be safely discarded.
-**
-** [[the xDestroy() page cache method]]
-** ^The xDestroy() method is used to delete a cache allocated by xCreate().
-** All resources associated with the specified cache should be freed. ^After
-** calling the xDestroy() method, SQLite considers the [sqlite3_pcache*]
-** handle invalid, and will not use it with any other sqlite3_pcache_methods2
-** functions.
-**
-** [[the xShrink() page cache method]]
-** ^SQLite invokes the xShrink() method when it wants the page cache to
-** free up as much of heap memory as possible.  The page cache implementation
-** is not obligated to free any memory, but well-behaved implementations should
-** do their best.
-*/
-typedef struct sqlite3_pcache_methods2 sqlite3_pcache_methods2;
-struct sqlite3_pcache_methods2 {
-  int iVersion;
-  void *pArg;
-  int (*xInit)(void*);
-  void (*xShutdown)(void*);
-  sqlite3_pcache *(*xCreate)(int szPage, int szExtra, int bPurgeable);
-  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
-  int (*xPagecount)(sqlite3_pcache*);
-  sqlite3_pcache_page *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
-  void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard);
-  void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*,
-      unsigned oldKey, unsigned newKey);
-  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
-  void (*xDestroy)(sqlite3_pcache*);
-  void (*xShrink)(sqlite3_pcache*);
-};
-
-/*
-** This is the obsolete pcache_methods object that has now been replaced
-** by sqlite3_pcache_methods2.  This object is not used by SQLite.  It is
-** retained in the header file for backwards compatibility only.
-*/
-typedef struct sqlite3_pcache_methods sqlite3_pcache_methods;
-struct sqlite3_pcache_methods {
-  void *pArg;
-  int (*xInit)(void*);
-  void (*xShutdown)(void*);
-  sqlite3_pcache *(*xCreate)(int szPage, int bPurgeable);
-  void (*xCachesize)(sqlite3_pcache*, int nCachesize);
-  int (*xPagecount)(sqlite3_pcache*);
-  void *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
-  void (*xUnpin)(sqlite3_pcache*, void*, int discard);
-  void (*xRekey)(sqlite3_pcache*, void*, unsigned oldKey, unsigned newKey);
-  void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
-  void (*xDestroy)(sqlite3_pcache*);
-};
-
-
-/*
-** CAPI3REF: Online Backup Object
-**
-** The sqlite3_backup object records state information about an ongoing
-** online backup operation.  ^The sqlite3_backup object is created by
-** a call to [sqlite3_backup_init()] and is destroyed by a call to
-** [sqlite3_backup_finish()].
-**
-** See Also: [Using the SQLite Online Backup API]
-*/
-typedef struct sqlite3_backup sqlite3_backup;
-
-/*
-** CAPI3REF: Online Backup API.
-**
-** The backup API copies the content of one database into another.
-** It is useful either for creating backups of databases or
-** for copying in-memory databases to or from persistent files.
-**
-** See Also: [Using the SQLite Online Backup API]
-**
-** ^SQLite holds a write transaction open on the destination database file
-** for the duration of the backup operation.
-** ^The source database is read-locked only while it is being read;
-** it is not locked continuously for the entire backup operation.
-** ^Thus, the backup may be performed on a live source database without
-** preventing other database connections from
-** reading or writing to the source database while the backup is underway.
-**
-** ^(To perform a backup operation:
-**   <ol>
-**     <li><b>sqlite3_backup_init()</b> is called once to initialize the
-**         backup,
-**     <li><b>sqlite3_backup_step()</b> is called one or more times to transfer
-**         the data between the two databases, and finally
-**     <li><b>sqlite3_backup_finish()</b> is called to release all resources
-**         associated with the backup operation.
-**   </ol>)^
-** There should be exactly one call to sqlite3_backup_finish() for each
-** successful call to sqlite3_backup_init().
-**
-** [[sqlite3_backup_init()]] <b>sqlite3_backup_init()</b>
-**
-** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the
-** [database connection] associated with the destination database
-** and the database name, respectively.
-** ^The database name is "main" for the main database, "temp" for the
-** temporary database, or the name specified after the AS keyword in
-** an [ATTACH] statement for an attached database.
-** ^The S and M arguments passed to
-** sqlite3_backup_init(D,N,S,M) identify the [database connection]
-** and database name of the source database, respectively.
-** ^The source and destination [database connections] (parameters S and D)
-** must be different or else sqlite3_backup_init(D,N,S,M) will fail with
-** an error.
-**
-** ^A call to sqlite3_backup_init() will fail, returning NULL, if
-** there is already a read or read-write transaction open on the
-** destination database.
-**
-** ^If an error occurs within sqlite3_backup_init(D,N,S,M), then NULL is
-** returned and an error code and error message are stored in the
-** destination [database connection] D.
-** ^The error code and message for the failed call to sqlite3_backup_init()
-** can be retrieved using the [sqlite3_errcode()], [sqlite3_errmsg()], and/or
-** [sqlite3_errmsg16()] functions.
-** ^A successful call to sqlite3_backup_init() returns a pointer to an
-** [sqlite3_backup] object.
-** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and
-** sqlite3_backup_finish() functions to perform the specified backup
-** operation.
-**
-** [[sqlite3_backup_step()]] <b>sqlite3_backup_step()</b>
-**
-** ^Function sqlite3_backup_step(B,N) will copy up to N pages between
-** the source and destination databases specified by [sqlite3_backup] object B.
-** ^If N is negative, all remaining source pages are copied.
-** ^If sqlite3_backup_step(B,N) successfully copies N pages and there
-** are still more pages to be copied, then the function returns [SQLITE_OK].
-** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages
-** from source to destination, then it returns [SQLITE_DONE].
-** ^If an error occurs while running sqlite3_backup_step(B,N),
-** then an [error code] is returned. ^As well as [SQLITE_OK] and
-** [SQLITE_DONE], a call to sqlite3_backup_step() may return [SQLITE_READONLY],
-** [SQLITE_NOMEM], [SQLITE_BUSY], [SQLITE_LOCKED], or an
-** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX] extended error code.
-**
-** ^(The sqlite3_backup_step() might return [SQLITE_READONLY] if
-** <ol>
-** <li> the destination database was opened read-only, or
-** <li> the destination database is using write-ahead-log journaling
-** and the destination and source page sizes differ, or
-** <li> the destination database is an in-memory database and the
-** destination and source page sizes differ.
-** </ol>)^
-**
-** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then
-** the [sqlite3_busy_handler | busy-handler function]
-** is invoked (if one is specified). ^If the
-** busy-handler returns non-zero before the lock is available, then
-** [SQLITE_BUSY] is returned to the caller. ^In this case the call to
-** sqlite3_backup_step() can be retried later. ^If the source
-** [database connection]
-** is being used to write to the source database when sqlite3_backup_step()
-** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this
-** case the call to sqlite3_backup_step() can be retried later on. ^(If
-** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or
-** [SQLITE_READONLY] is returned, then
-** there is no point in retrying the call to sqlite3_backup_step(). These
-** errors are considered fatal.)^  The application must accept
-** that the backup operation has failed and pass the backup operation handle
-** to the sqlite3_backup_finish() to release associated resources.
-**
-** ^The first call to sqlite3_backup_step() obtains an exclusive lock
-** on the destination file. ^The exclusive lock is not released until either
-** sqlite3_backup_finish() is called or the backup operation is complete
-** and sqlite3_backup_step() returns [SQLITE_DONE].  ^Every call to
-** sqlite3_backup_step() obtains a [shared lock] on the source database that
-** lasts for the duration of the sqlite3_backup_step() call.
-** ^Because the source database is not locked between calls to
-** sqlite3_backup_step(), the source database may be modified mid-way
-** through the backup process.  ^If the source database is modified by an
-** external process or via a database connection other than the one being
-** used by the backup operation, then the backup will be automatically
-** restarted by the next call to sqlite3_backup_step(). ^If the source
-** database is modified by the using the same database connection as is used
-** by the backup operation, then the backup database is automatically
-** updated at the same time.
-**
-** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
-**
-** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the
-** application wishes to abandon the backup operation, the application
-** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish().
-** ^The sqlite3_backup_finish() interfaces releases all
-** resources associated with the [sqlite3_backup] object.
-** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any
-** active write-transaction on the destination database is rolled back.
-** The [sqlite3_backup] object is invalid
-** and may not be used following a call to sqlite3_backup_finish().
-**
-** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
-** sqlite3_backup_step() errors occurred, regardless or whether or not
-** sqlite3_backup_step() completed.
-** ^If an out-of-memory condition or IO error occurred during any prior
-** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
-** sqlite3_backup_finish() returns the corresponding [error code].
-**
-** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
-** is not a permanent error and does not affect the return value of
-** sqlite3_backup_finish().
-**
-** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
-** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
-**
-** ^The sqlite3_backup_remaining() routine returns the number of pages still
-** to be backed up at the conclusion of the most recent sqlite3_backup_step().
-** ^The sqlite3_backup_pagecount() routine returns the total number of pages
-** in the source database at the conclusion of the most recent
-** sqlite3_backup_step().
-** ^(The values returned by these functions are only updated by
-** sqlite3_backup_step(). If the source database is modified in a way that
-** changes the size of the source database or the number of pages remaining,
-** those changes are not reflected in the output of sqlite3_backup_pagecount()
-** and sqlite3_backup_remaining() until after the next
-** sqlite3_backup_step().)^
-**
-** <b>Concurrent Usage of Database Handles</b>
-**
-** ^The source [database connection] may be used by the application for other
-** purposes while a backup operation is underway or being initialized.
-** ^If SQLite is compiled and configured to support threadsafe database
-** connections, then the source database connection may be used concurrently
-** from within other threads.
-**
-** However, the application must guarantee that the destination
-** [database connection] is not passed to any other API (by any thread) after
-** sqlite3_backup_init() is called and before the corresponding call to
-** sqlite3_backup_finish().  SQLite does not currently check to see
-** if the application incorrectly accesses the destination [database connection]
-** and so no error code is reported, but the operations may malfunction
-** nevertheless.  Use of the destination database connection while a
-** backup is in progress might also also cause a mutex deadlock.
-**
-** If running in [shared cache mode], the application must
-** guarantee that the shared cache used by the destination database
-** is not accessed while the backup is running. In practice this means
-** that the application must guarantee that the disk file being
-** backed up to is not accessed by any connection within the process,
-** not just the specific connection that was passed to sqlite3_backup_init().
-**
-** The [sqlite3_backup] object itself is partially threadsafe. Multiple
-** threads may safely make multiple concurrent calls to sqlite3_backup_step().
-** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount()
-** APIs are not strictly speaking threadsafe. If they are invoked at the
-** same time as another thread is invoking sqlite3_backup_step() it is
-** possible that they return invalid values.
-*/
-SQLITE_API sqlite3_backup *sqlite3_backup_init(
-  sqlite3 *pDest,                        /* Destination database handle */
-  const char *zDestName,                 /* Destination database name */
-  sqlite3 *pSource,                      /* Source database handle */
-  const char *zSourceName                /* Source database name */
-);
-SQLITE_API int sqlite3_backup_step(sqlite3_backup *p, int nPage);
-SQLITE_API int sqlite3_backup_finish(sqlite3_backup *p);
-SQLITE_API int sqlite3_backup_remaining(sqlite3_backup *p);
-SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
-
-/*
-** CAPI3REF: Unlock Notification
-** METHOD: sqlite3
-**
-** ^When running in shared-cache mode, a database operation may fail with
-** an [SQLITE_LOCKED] error if the required locks on the shared-cache or
-** individual tables within the shared-cache cannot be obtained. See
-** [SQLite Shared-Cache Mode] for a description of shared-cache locking.
-** ^This API may be used to register a callback that SQLite will invoke
-** when the connection currently holding the required lock relinquishes it.
-** ^This API is only available if the library was compiled with the
-** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined.
-**
-** See Also: [Using the SQLite Unlock Notification Feature].
-**
-** ^Shared-cache locks are released when a database connection concludes
-** its current transaction, either by committing it or rolling it back.
-**
-** ^When a connection (known as the blocked connection) fails to obtain a
-** shared-cache lock and SQLITE_LOCKED is returned to the caller, the
-** identity of the database connection (the blocking connection) that
-** has locked the required resource is stored internally. ^After an
-** application receives an SQLITE_LOCKED error, it may call the
-** sqlite3_unlock_notify() method with the blocked connection handle as
-** the first argument to register for a callback that will be invoked
-** when the blocking connections current transaction is concluded. ^The
-** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
-** call that concludes the blocking connection's transaction.
-**
-** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
-** there is a chance that the blocking connection will have already
-** concluded its transaction by the time sqlite3_unlock_notify() is invoked.
-** If this happens, then the specified callback is invoked immediately,
-** from within the call to sqlite3_unlock_notify().)^
-**
-** ^If the blocked connection is attempting to obtain a write-lock on a
-** shared-cache table, and more than one other connection currently holds
-** a read-lock on the same table, then SQLite arbitrarily selects one of
-** the other connections to use as the blocking connection.
-**
-** ^(There may be at most one unlock-notify callback registered by a
-** blocked connection. If sqlite3_unlock_notify() is called when the
-** blocked connection already has a registered unlock-notify callback,
-** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
-** called with a NULL pointer as its second argument, then any existing
-** unlock-notify callback is canceled. ^The blocked connections
-** unlock-notify callback may also be canceled by closing the blocked
-** connection using [sqlite3_close()].
-**
-** The unlock-notify callback is not reentrant. If an application invokes
-** any sqlite3_xxx API functions from within an unlock-notify callback, a
-** crash or deadlock may be the result.
-**
-** ^Unless deadlock is detected (see below), sqlite3_unlock_notify() always
-** returns SQLITE_OK.
-**
-** <b>Callback Invocation Details</b>
-**
-** When an unlock-notify callback is registered, the application provides a
-** single void* pointer that is passed to the callback when it is invoked.
-** However, the signature of the callback function allows SQLite to pass
-** it an array of void* context pointers. The first argument passed to
-** an unlock-notify callback is a pointer to an array of void* pointers,
-** and the second is the number of entries in the array.
-**
-** When a blocking connection's transaction is concluded, there may be
-** more than one blocked connection that has registered for an unlock-notify
-** callback. ^If two or more such blocked connections have specified the
-** same callback function, then instead of invoking the callback function
-** multiple times, it is invoked once with the set of void* context pointers
-** specified by the blocked connections bundled together into an array.
-** This gives the application an opportunity to prioritize any actions
-** related to the set of unblocked database connections.
-**
-** <b>Deadlock Detection</b>
-**
-** Assuming that after registering for an unlock-notify callback a
-** database waits for the callback to be issued before taking any further
-** action (a reasonable assumption), then using this API may cause the
-** application to deadlock. For example, if connection X is waiting for
-** connection Y's transaction to be concluded, and similarly connection
-** Y is waiting on connection X's transaction, then neither connection
-** will proceed and the system may remain deadlocked indefinitely.
-**
-** To avoid this scenario, the sqlite3_unlock_notify() performs deadlock
-** detection. ^If a given call to sqlite3_unlock_notify() would put the
-** system in a deadlocked state, then SQLITE_LOCKED is returned and no
-** unlock-notify callback is registered. The system is said to be in
-** a deadlocked state if connection A has registered for an unlock-notify
-** callback on the conclusion of connection B's transaction, and connection
-** B has itself registered for an unlock-notify callback when connection
-** A's transaction is concluded. ^Indirect deadlock is also detected, so
-** the system is also considered to be deadlocked if connection B has
-** registered for an unlock-notify callback on the conclusion of connection
-** C's transaction, where connection C is waiting on connection A. ^Any
-** number of levels of indirection are allowed.
-**
-** <b>The "DROP TABLE" Exception</b>
-**
-** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost
-** always appropriate to call sqlite3_unlock_notify(). There is however,
-** one exception. When executing a "DROP TABLE" or "DROP INDEX" statement,
-** SQLite checks if there are any currently executing SELECT statements
-** that belong to the same connection. If there are, SQLITE_LOCKED is
-** returned. In this case there is no "blocking connection", so invoking
-** sqlite3_unlock_notify() results in the unlock-notify callback being
-** invoked immediately. If the application then re-attempts the "DROP TABLE"
-** or "DROP INDEX" query, an infinite loop might be the result.
-**
-** One way around this problem is to check the extended error code returned
-** by an sqlite3_step() call. ^(If there is a blocking connection, then the
-** extended error code is set to SQLITE_LOCKED_SHAREDCACHE. Otherwise, in
-** the special "DROP TABLE/INDEX" case, the extended error code is just
-** SQLITE_LOCKED.)^
-*/
-SQLITE_API int sqlite3_unlock_notify(
-  sqlite3 *pBlocked,                          /* Waiting connection */
-  void (*xNotify)(void **apArg, int nArg),    /* Callback function to invoke */
-  void *pNotifyArg                            /* Argument to pass to xNotify */
-);
-
-
-/*
-** CAPI3REF: String Comparison
-**
-** ^The [sqlite3_stricmp()] and [sqlite3_strnicmp()] APIs allow applications
-** and extensions to compare the contents of two buffers containing UTF-8
-** strings in a case-independent fashion, using the same definition of "case
-** independence" that SQLite uses internally when comparing identifiers.
-*/
-SQLITE_API int sqlite3_stricmp(const char *, const char *);
-SQLITE_API int sqlite3_strnicmp(const char *, const char *, int);
-
-/*
-** CAPI3REF: String Globbing
-*
-** ^The [sqlite3_strglob(P,X)] interface returns zero if and only if
-** string X matches the [GLOB] pattern P.
-** ^The definition of [GLOB] pattern matching used in
-** [sqlite3_strglob(P,X)] is the same as for the "X GLOB P" operator in the
-** SQL dialect understood by SQLite.  ^The [sqlite3_strglob(P,X)] function
-** is case sensitive.
-**
-** Note that this routine returns zero on a match and non-zero if the strings
-** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
-**
-** See also: [sqlite3_strlike()].
-*/
-SQLITE_API int sqlite3_strglob(const char *zGlob, const char *zStr);
-
-/*
-** CAPI3REF: String LIKE Matching
-*
-** ^The [sqlite3_strlike(P,X,E)] interface returns zero if and only if
-** string X matches the [LIKE] pattern P with escape character E.
-** ^The definition of [LIKE] pattern matching used in
-** [sqlite3_strlike(P,X,E)] is the same as for the "X LIKE P ESCAPE E"
-** operator in the SQL dialect understood by SQLite.  ^For "X LIKE P" without
-** the ESCAPE clause, set the E parameter of [sqlite3_strlike(P,X,E)] to 0.
-** ^As with the LIKE operator, the [sqlite3_strlike(P,X,E)] function is case
-** insensitive - equivalent upper and lower case ASCII characters match
-** one another.
-**
-** ^The [sqlite3_strlike(P,X,E)] function matches Unicode characters, though
-** only ASCII characters are case folded.
-**
-** Note that this routine returns zero on a match and non-zero if the strings
-** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
-**
-** See also: [sqlite3_strglob()].
-*/
-SQLITE_API int sqlite3_strlike(const char *zGlob, const char *zStr, unsigned int cEsc);
-
-/*
-** CAPI3REF: Error Logging Interface
-**
-** ^The [sqlite3_log()] interface writes a message into the [error log]
-** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
-** ^If logging is enabled, the zFormat string and subsequent arguments are
-** used with [sqlite3_snprintf()] to generate the final output string.
-**
-** The sqlite3_log() interface is intended for use by extensions such as
-** virtual tables, collating functions, and SQL functions.  While there is
-** nothing to prevent an application from calling sqlite3_log(), doing so
-** is considered bad form.
-**
-** The zFormat string must not be NULL.
-**
-** To avoid deadlocks and other threading problems, the sqlite3_log() routine
-** will not use dynamically allocated memory.  The log message is stored in
-** a fixed-length buffer on the stack.  If the log message is longer than
-** a few hundred characters, it will be truncated to the length of the
-** buffer.
-*/
-SQLITE_API void sqlite3_log(int iErrCode, const char *zFormat, ...);
-
-/*
-** CAPI3REF: Write-Ahead Log Commit Hook
-** METHOD: sqlite3
-**
-** ^The [sqlite3_wal_hook()] function is used to register a callback that
-** is invoked each time data is committed to a database in wal mode.
-**
-** ^(The callback is invoked by SQLite after the commit has taken place and
-** the associated write-lock on the database released)^, so the implementation
-** may read, write or [checkpoint] the database as required.
-**
-** ^The first parameter passed to the callback function when it is invoked
-** is a copy of the third parameter passed to sqlite3_wal_hook() when
-** registering the callback. ^The second is a copy of the database handle.
-** ^The third parameter is the name of the database that was written to -
-** either "main" or the name of an [ATTACH]-ed database. ^The fourth parameter
-** is the number of pages currently in the write-ahead log file,
-** including those that were just committed.
-**
-** The callback function should normally return [SQLITE_OK].  ^If an error
-** code is returned, that error will propagate back up through the
-** SQLite code base to cause the statement that provoked the callback
-** to report an error, though the commit will have still occurred. If the
-** callback returns [SQLITE_ROW] or [SQLITE_DONE], or if it returns a value
-** that does not correspond to any valid SQLite error code, the results
-** are undefined.
-**
-** A single database handle may have at most a single write-ahead log callback
-** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any
-** previously registered write-ahead log callback. ^The return value is
-** a copy of the third parameter from the previous call, if any, or 0.
-** ^Note that the [sqlite3_wal_autocheckpoint()] interface and the
-** [wal_autocheckpoint pragma] both invoke [sqlite3_wal_hook()] and will
-** overwrite any prior [sqlite3_wal_hook()] settings.
-*/
-SQLITE_API void *sqlite3_wal_hook(
-  sqlite3*,
-  int(*)(void *,sqlite3*,const char*,int),
-  void*
-);
-
-/*
-** CAPI3REF: Configure an auto-checkpoint
-** METHOD: sqlite3
-**
-** ^The [sqlite3_wal_autocheckpoint(D,N)] is a wrapper around
-** [sqlite3_wal_hook()] that causes any database on [database connection] D
-** to automatically [checkpoint]
-** after committing a transaction if there are N or
-** more frames in the [write-ahead log] file.  ^Passing zero or
-** a negative value as the nFrame parameter disables automatic
-** checkpoints entirely.
-**
-** ^The callback registered by this function replaces any existing callback
-** registered using [sqlite3_wal_hook()].  ^Likewise, registering a callback
-** using [sqlite3_wal_hook()] disables the automatic checkpoint mechanism
-** configured by this function.
-**
-** ^The [wal_autocheckpoint pragma] can be used to invoke this interface
-** from SQL.
-**
-** ^Checkpoints initiated by this mechanism are
-** [sqlite3_wal_checkpoint_v2|PASSIVE].
-**
-** ^Every new [database connection] defaults to having the auto-checkpoint
-** enabled with a threshold of 1000 or [SQLITE_DEFAULT_WAL_AUTOCHECKPOINT]
-** pages.  The use of this interface
-** is only necessary if the default setting is found to be suboptimal
-** for a particular application.
-*/
-SQLITE_API int sqlite3_wal_autocheckpoint(sqlite3 *db, int N);
-
-/*
-** CAPI3REF: Checkpoint a database
-** METHOD: sqlite3
-**
-** ^(The sqlite3_wal_checkpoint(D,X) is equivalent to
-** [sqlite3_wal_checkpoint_v2](D,X,[SQLITE_CHECKPOINT_PASSIVE],0,0).)^
-**
-** In brief, sqlite3_wal_checkpoint(D,X) causes the content in the
-** [write-ahead log] for database X on [database connection] D to be
-** transferred into the database file and for the write-ahead log to
-** be reset.  See the [checkpointing] documentation for addition
-** information.
-**
-** This interface used to be the only way to cause a checkpoint to
-** occur.  But then the newer and more powerful [sqlite3_wal_checkpoint_v2()]
-** interface was added.  This interface is retained for backwards
-** compatibility and as a convenience for applications that need to manually
-** start a callback but which do not need the full power (and corresponding
-** complication) of [sqlite3_wal_checkpoint_v2()].
-*/
-SQLITE_API int sqlite3_wal_checkpoint(sqlite3 *db, const char *zDb);
-
-/*
-** CAPI3REF: Checkpoint a database
-** METHOD: sqlite3
-**
-** ^(The sqlite3_wal_checkpoint_v2(D,X,M,L,C) interface runs a checkpoint
-** operation on database X of [database connection] D in mode M.  Status
-** information is written back into integers pointed to by L and C.)^
-** ^(The M parameter must be a valid [checkpoint mode]:)^
-**
-** <dl>
-** <dt>SQLITE_CHECKPOINT_PASSIVE<dd>
-**   ^Checkpoint as many frames as possible without waiting for any database
-**   readers or writers to finish, then sync the database file if all frames
-**   in the log were checkpointed. ^The [busy-handler callback]
-**   is never invoked in the SQLITE_CHECKPOINT_PASSIVE mode.
-**   ^On the other hand, passive mode might leave the checkpoint unfinished
-**   if there are concurrent readers or writers.
-**
-** <dt>SQLITE_CHECKPOINT_FULL<dd>
-**   ^This mode blocks (it invokes the
-**   [sqlite3_busy_handler|busy-handler callback]) until there is no
-**   database writer and all readers are reading from the most recent database
-**   snapshot. ^It then checkpoints all frames in the log file and syncs the
-**   database file. ^This mode blocks new database writers while it is pending,
-**   but new database readers are allowed to continue unimpeded.
-**
-** <dt>SQLITE_CHECKPOINT_RESTART<dd>
-**   ^This mode works the same way as SQLITE_CHECKPOINT_FULL with the addition
-**   that after checkpointing the log file it blocks (calls the
-**   [busy-handler callback])
-**   until all readers are reading from the database file only. ^This ensures
-**   that the next writer will restart the log file from the beginning.
-**   ^Like SQLITE_CHECKPOINT_FULL, this mode blocks new
-**   database writer attempts while it is pending, but does not impede readers.
-**
-** <dt>SQLITE_CHECKPOINT_TRUNCATE<dd>
-**   ^This mode works the same way as SQLITE_CHECKPOINT_RESTART with the
-**   addition that it also truncates the log file to zero bytes just prior
-**   to a successful return.
-** </dl>
-**
-** ^If pnLog is not NULL, then *pnLog is set to the total number of frames in
-** the log file or to -1 if the checkpoint could not run because
-** of an error or because the database is not in [WAL mode]. ^If pnCkpt is not
-** NULL,then *pnCkpt is set to the total number of checkpointed frames in the
-** log file (including any that were already checkpointed before the function
-** was called) or to -1 if the checkpoint could not run due to an error or
-** because the database is not in WAL mode. ^Note that upon successful
-** completion of an SQLITE_CHECKPOINT_TRUNCATE, the log file will have been
-** truncated to zero bytes and so both *pnLog and *pnCkpt will be set to zero.
-**
-** ^All calls obtain an exclusive "checkpoint" lock on the database file. ^If
-** any other process is running a checkpoint operation at the same time, the
-** lock cannot be obtained and SQLITE_BUSY is returned. ^Even if there is a
-** busy-handler configured, it will not be invoked in this case.
-**
-** ^The SQLITE_CHECKPOINT_FULL, RESTART and TRUNCATE modes also obtain the
-** exclusive "writer" lock on the database file. ^If the writer lock cannot be
-** obtained immediately, and a busy-handler is configured, it is invoked and
-** the writer lock retried until either the busy-handler returns 0 or the lock
-** is successfully obtained. ^The busy-handler is also invoked while waiting for
-** database readers as described above. ^If the busy-handler returns 0 before
-** the writer lock is obtained or while waiting for database readers, the
-** checkpoint operation proceeds from that point in the same way as
-** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible
-** without blocking any further. ^SQLITE_BUSY is returned in this case.
-**
-** ^If parameter zDb is NULL or points to a zero length string, then the
-** specified operation is attempted on all WAL databases [attached] to
-** [database connection] db.  In this case the
-** values written to output parameters *pnLog and *pnCkpt are undefined. ^If
-** an SQLITE_BUSY error is encountered when processing one or more of the
-** attached WAL databases, the operation is still attempted on any remaining
-** attached databases and SQLITE_BUSY is returned at the end. ^If any other
-** error occurs while processing an attached database, processing is abandoned
-** and the error code is returned to the caller immediately. ^If no error
-** (SQLITE_BUSY or otherwise) is encountered while processing the attached
-** databases, SQLITE_OK is returned.
-**
-** ^If database zDb is the name of an attached database that is not in WAL
-** mode, SQLITE_OK is returned and both *pnLog and *pnCkpt set to -1. ^If
-** zDb is not NULL (or a zero length string) and is not the name of any
-** attached database, SQLITE_ERROR is returned to the caller.
-**
-** ^Unless it returns SQLITE_MISUSE,
-** the sqlite3_wal_checkpoint_v2() interface
-** sets the error information that is queried by
-** [sqlite3_errcode()] and [sqlite3_errmsg()].
-**
-** ^The [PRAGMA wal_checkpoint] command can be used to invoke this interface
-** from SQL.
-*/
-SQLITE_API int sqlite3_wal_checkpoint_v2(
-  sqlite3 *db,                    /* Database handle */
-  const char *zDb,                /* Name of attached database (or NULL) */
-  int eMode,                      /* SQLITE_CHECKPOINT_* value */
-  int *pnLog,                     /* OUT: Size of WAL log in frames */
-  int *pnCkpt                     /* OUT: Total number of frames checkpointed */
-);
+#define SQLITE_STMTSTATUS_FULLSCAN_STEP 1
+#define SQLITE_STMTSTATUS_SORT 2
+#define SQLITE_STMTSTATUS_AUTOINDEX 3
+#define SQLITE_STMTSTATUS_VM_STEP 4
+#define SQLITE_STMTSTATUS_REPREPARE 5
+#define SQLITE_STMTSTATUS_RUN 6
+#define SQLITE_STMTSTATUS_FILTER_MISS 7
+#define SQLITE_STMTSTATUS_FILTER_HIT 8
+#define SQLITE_STMTSTATUS_MEMUSED 99
+
+    /*
+    ** CAPI3REF: Custom Page Cache Object
+    **
+    ** The sqlite3_pcache type is opaque.  It is implemented by
+    ** the pluggable module.  The SQLite core has no knowledge of
+    ** its size or internal structure and never deals with the
+    ** sqlite3_pcache object except by holding and passing pointers
+    ** to the object.
+    **
+    ** See [sqlite3_pcache_methods2] for additional information.
+    */
+    typedef struct sqlite3_pcache sqlite3_pcache;
+
+    /*
+    ** CAPI3REF: Custom Page Cache Object
+    **
+    ** The sqlite3_pcache_page object represents a single page in the
+    ** page cache.  The page cache will allocate instances of this
+    ** object.  Various methods of the page cache use pointers to instances
+    ** of this object as parameters or as their return value.
+    **
+    ** See [sqlite3_pcache_methods2] for additional information.
+    */
+    typedef struct sqlite3_pcache_page sqlite3_pcache_page;
+    struct sqlite3_pcache_page
+    {
+        void* pBuf;   /* The content of the page */
+        void* pExtra; /* Extra information associated with the page */
+    };
+
+    /*
+    ** CAPI3REF: Application Defined Page Cache.
+    ** KEYWORDS: {page cache}
+    **
+    ** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can
+    ** register an alternative page cache implementation by passing in an
+    ** instance of the sqlite3_pcache_methods2 structure.)^
+    ** In many applications, most of the heap memory allocated by
+    ** SQLite is used for the page cache.
+    ** By implementing a
+    ** custom page cache using this API, an application can better control
+    ** the amount of memory consumed by SQLite, the way in which
+    ** that memory is allocated and released, and the policies used to
+    ** determine exactly which parts of a database file are cached and for
+    ** how long.
+    **
+    ** The alternative page cache mechanism is an
+    ** extreme measure that is only needed by the most demanding applications.
+    ** The built-in page cache is recommended for most uses.
+    **
+    ** ^(The contents of the sqlite3_pcache_methods2 structure are copied to an
+    ** internal buffer by SQLite within the call to [sqlite3_config].  Hence
+    ** the application may discard the parameter after the call to
+    ** [sqlite3_config()] returns.)^
+    **
+    ** [[the xInit() page cache method]]
+    ** ^(The xInit() method is called once for each effective
+    ** call to [sqlite3_initialize()])^
+    ** (usually only once during the lifetime of the process). ^(The xInit()
+    ** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^
+    ** The intent of the xInit() method is to set up global data structures
+    ** required by the custom page cache implementation.
+    ** ^(If the xInit() method is NULL, then the
+    ** built-in default page cache is used instead of the application defined
+    ** page cache.)^
+    **
+    ** [[the xShutdown() page cache method]]
+    ** ^The xShutdown() method is called by [sqlite3_shutdown()].
+    ** It can be used to clean up
+    ** any outstanding resources before process shutdown, if required.
+    ** ^The xShutdown() method may be NULL.
+    **
+    ** ^SQLite automatically serializes calls to the xInit method,
+    ** so the xInit method need not be threadsafe.  ^The
+    ** xShutdown method is only called from [sqlite3_shutdown()] so it does
+    ** not need to be threadsafe either.  All other methods must be threadsafe
+    ** in multithreaded applications.
+    **
+    ** ^SQLite will never invoke xInit() more than once without an intervening
+    ** call to xShutdown().
+    **
+    ** [[the xCreate() page cache methods]]
+    ** ^SQLite invokes the xCreate() method to construct a new cache instance.
+    ** SQLite will typically create one cache instance for each open database file,
+    ** though this is not guaranteed. ^The
+    ** first parameter, szPage, is the size in bytes of the pages that must
+    ** be allocated by the cache.  ^szPage will always a power of two.  ^The
+    ** second parameter szExtra is a number of bytes of extra storage
+    ** associated with each page cache entry.  ^The szExtra parameter will
+    ** a number less than 250.  SQLite will use the
+    ** extra szExtra bytes on each page to store metadata about the underlying
+    ** database page on disk.  The value passed into szExtra depends
+    ** on the SQLite version, the target platform, and how SQLite was compiled.
+    ** ^The third argument to xCreate(), bPurgeable, is true if the cache being
+    ** created will be used to cache database pages of a file stored on disk, or
+    ** false if it is used for an in-memory database. The cache implementation
+    ** does not have to do anything special based with the value of bPurgeable;
+    ** it is purely advisory.  ^On a cache where bPurgeable is false, SQLite will
+    ** never invoke xUnpin() except to deliberately delete a page.
+    ** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
+    ** false will always have the "discard" flag set to true.
+    ** ^Hence, a cache created with bPurgeable false will
+    ** never contain any unpinned pages.
+    **
+    ** [[the xCachesize() page cache method]]
+    ** ^(The xCachesize() method may be called at any time by SQLite to set the
+    ** suggested maximum cache-size (number of pages stored by) the cache
+    ** instance passed as the first argument. This is the value configured using
+    ** the SQLite "[PRAGMA cache_size]" command.)^  As with the bPurgeable
+    ** parameter, the implementation is not required to do anything with this
+    ** value; it is advisory only.
+    **
+    ** [[the xPagecount() page cache methods]]
+    ** The xPagecount() method must return the number of pages currently
+    ** stored in the cache, both pinned and unpinned.
+    **
+    ** [[the xFetch() page cache methods]]
+    ** The xFetch() method locates a page in the cache and returns a pointer to
+    ** an sqlite3_pcache_page object associated with that page, or a NULL pointer.
+    ** The pBuf element of the returned sqlite3_pcache_page object will be a
+    ** pointer to a buffer of szPage bytes used to store the content of a
+    ** single database page.  The pExtra element of sqlite3_pcache_page will be
+    ** a pointer to the szExtra bytes of extra storage that SQLite has requested
+    ** for each entry in the page cache.
+    **
+    ** The page to be fetched is determined by the key. ^The minimum key value
+    ** is 1.  After it has been retrieved using xFetch, the page is considered
+    ** to be "pinned".
+    **
+    ** If the requested page is already in the page cache, then the page cache
+    ** implementation must return a pointer to the page buffer with its content
+    ** intact.  If the requested page is not already in the cache, then the
+    ** cache implementation should use the value of the createFlag
+    ** parameter to help it determined what action to take:
+    **
+    ** <table border=1 width=85% align=center>
+    ** <tr><th> createFlag <th> Behavior when page is not already in cache
+    ** <tr><td> 0 <td> Do not allocate a new page.  Return NULL.
+    ** <tr><td> 1 <td> Allocate a new page if it easy and convenient to do so.
+    **                 Otherwise return NULL.
+    ** <tr><td> 2 <td> Make every effort to allocate a new page.  Only return
+    **                 NULL if allocating a new page is effectively impossible.
+    ** </table>
+    **
+    ** ^(SQLite will normally invoke xFetch() with a createFlag of 0 or 1.  SQLite
+    ** will only use a createFlag of 2 after a prior call with a createFlag of 1
+    ** failed.)^  In between the xFetch() calls, SQLite may
+    ** attempt to unpin one or more cache pages by spilling the content of
+    ** pinned pages to disk and synching the operating system disk cache.
+    **
+    ** [[the xUnpin() page cache method]]
+    ** ^xUnpin() is called by SQLite with a pointer to a currently pinned page
+    ** as its second argument.  If the third parameter, discard, is non-zero,
+    ** then the page must be evicted from the cache.
+    ** ^If the discard parameter is
+    ** zero, then the page may be discarded or retained at the discretion of
+    ** page cache implementation. ^The page cache implementation
+    ** may choose to evict unpinned pages at any time.
+    **
+    ** The cache must not perform any reference counting. A single
+    ** call to xUnpin() unpins the page regardless of the number of prior calls
+    ** to xFetch().
+    **
+    ** [[the xRekey() page cache methods]]
+    ** The xRekey() method is used to change the key value associated with the
+    ** page passed as the second argument. If the cache
+    ** previously contains an entry associated with newKey, it must be
+    ** discarded. ^Any prior cache entry associated with newKey is guaranteed not
+    ** to be pinned.
+    **
+    ** When SQLite calls the xTruncate() method, the cache must discard all
+    ** existing cache entries with page numbers (keys) greater than or equal
+    ** to the value of the iLimit parameter passed to xTruncate(). If any
+    ** of these pages are pinned, they are implicitly unpinned, meaning that
+    ** they can be safely discarded.
+    **
+    ** [[the xDestroy() page cache method]]
+    ** ^The xDestroy() method is used to delete a cache allocated by xCreate().
+    ** All resources associated with the specified cache should be freed. ^After
+    ** calling the xDestroy() method, SQLite considers the [sqlite3_pcache*]
+    ** handle invalid, and will not use it with any other sqlite3_pcache_methods2
+    ** functions.
+    **
+    ** [[the xShrink() page cache method]]
+    ** ^SQLite invokes the xShrink() method when it wants the page cache to
+    ** free up as much of heap memory as possible.  The page cache implementation
+    ** is not obligated to free any memory, but well-behaved implementations should
+    ** do their best.
+    */
+    typedef struct sqlite3_pcache_methods2 sqlite3_pcache_methods2;
+    struct sqlite3_pcache_methods2
+    {
+        int iVersion;
+        void* pArg;
+        int (*xInit)(void*);
+        void (*xShutdown)(void*);
+        sqlite3_pcache* (*xCreate)(int szPage, int szExtra, int bPurgeable);
+        void (*xCachesize)(sqlite3_pcache*, int nCachesize);
+        int (*xPagecount)(sqlite3_pcache*);
+        sqlite3_pcache_page* (*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
+        void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard);
+        void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*, unsigned oldKey, unsigned newKey);
+        void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
+        void (*xDestroy)(sqlite3_pcache*);
+        void (*xShrink)(sqlite3_pcache*);
+    };
+
+    /*
+    ** This is the obsolete pcache_methods object that has now been replaced
+    ** by sqlite3_pcache_methods2.  This object is not used by SQLite.  It is
+    ** retained in the header file for backwards compatibility only.
+    */
+    typedef struct sqlite3_pcache_methods sqlite3_pcache_methods;
+    struct sqlite3_pcache_methods
+    {
+        void* pArg;
+        int (*xInit)(void*);
+        void (*xShutdown)(void*);
+        sqlite3_pcache* (*xCreate)(int szPage, int bPurgeable);
+        void (*xCachesize)(sqlite3_pcache*, int nCachesize);
+        int (*xPagecount)(sqlite3_pcache*);
+        void* (*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
+        void (*xUnpin)(sqlite3_pcache*, void*, int discard);
+        void (*xRekey)(sqlite3_pcache*, void*, unsigned oldKey, unsigned newKey);
+        void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
+        void (*xDestroy)(sqlite3_pcache*);
+    };
+
+    /*
+    ** CAPI3REF: Online Backup Object
+    **
+    ** The sqlite3_backup object records state information about an ongoing
+    ** online backup operation.  ^The sqlite3_backup object is created by
+    ** a call to [sqlite3_backup_init()] and is destroyed by a call to
+    ** [sqlite3_backup_finish()].
+    **
+    ** See Also: [Using the SQLite Online Backup API]
+    */
+    typedef struct sqlite3_backup sqlite3_backup;
+
+    /*
+    ** CAPI3REF: Online Backup API.
+    **
+    ** The backup API copies the content of one database into another.
+    ** It is useful either for creating backups of databases or
+    ** for copying in-memory databases to or from persistent files.
+    **
+    ** See Also: [Using the SQLite Online Backup API]
+    **
+    ** ^SQLite holds a write transaction open on the destination database file
+    ** for the duration of the backup operation.
+    ** ^The source database is read-locked only while it is being read;
+    ** it is not locked continuously for the entire backup operation.
+    ** ^Thus, the backup may be performed on a live source database without
+    ** preventing other database connections from
+    ** reading or writing to the source database while the backup is underway.
+    **
+    ** ^(To perform a backup operation:
+    **   <ol>
+    **     <li><b>sqlite3_backup_init()</b> is called once to initialize the
+    **         backup,
+    **     <li><b>sqlite3_backup_step()</b> is called one or more times to transfer
+    **         the data between the two databases, and finally
+    **     <li><b>sqlite3_backup_finish()</b> is called to release all resources
+    **         associated with the backup operation.
+    **   </ol>)^
+    ** There should be exactly one call to sqlite3_backup_finish() for each
+    ** successful call to sqlite3_backup_init().
+    **
+    ** [[sqlite3_backup_init()]] <b>sqlite3_backup_init()</b>
+    **
+    ** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the
+    ** [database connection] associated with the destination database
+    ** and the database name, respectively.
+    ** ^The database name is "main" for the main database, "temp" for the
+    ** temporary database, or the name specified after the AS keyword in
+    ** an [ATTACH] statement for an attached database.
+    ** ^The S and M arguments passed to
+    ** sqlite3_backup_init(D,N,S,M) identify the [database connection]
+    ** and database name of the source database, respectively.
+    ** ^The source and destination [database connections] (parameters S and D)
+    ** must be different or else sqlite3_backup_init(D,N,S,M) will fail with
+    ** an error.
+    **
+    ** ^A call to sqlite3_backup_init() will fail, returning NULL, if
+    ** there is already a read or read-write transaction open on the
+    ** destination database.
+    **
+    ** ^If an error occurs within sqlite3_backup_init(D,N,S,M), then NULL is
+    ** returned and an error code and error message are stored in the
+    ** destination [database connection] D.
+    ** ^The error code and message for the failed call to sqlite3_backup_init()
+    ** can be retrieved using the [sqlite3_errcode()], [sqlite3_errmsg()], and/or
+    ** [sqlite3_errmsg16()] functions.
+    ** ^A successful call to sqlite3_backup_init() returns a pointer to an
+    ** [sqlite3_backup] object.
+    ** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and
+    ** sqlite3_backup_finish() functions to perform the specified backup
+    ** operation.
+    **
+    ** [[sqlite3_backup_step()]] <b>sqlite3_backup_step()</b>
+    **
+    ** ^Function sqlite3_backup_step(B,N) will copy up to N pages between
+    ** the source and destination databases specified by [sqlite3_backup] object B.
+    ** ^If N is negative, all remaining source pages are copied.
+    ** ^If sqlite3_backup_step(B,N) successfully copies N pages and there
+    ** are still more pages to be copied, then the function returns [SQLITE_OK].
+    ** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages
+    ** from source to destination, then it returns [SQLITE_DONE].
+    ** ^If an error occurs while running sqlite3_backup_step(B,N),
+    ** then an [error code] is returned. ^As well as [SQLITE_OK] and
+    ** [SQLITE_DONE], a call to sqlite3_backup_step() may return [SQLITE_READONLY],
+    ** [SQLITE_NOMEM], [SQLITE_BUSY], [SQLITE_LOCKED], or an
+    ** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX] extended error code.
+    **
+    ** ^(The sqlite3_backup_step() might return [SQLITE_READONLY] if
+    ** <ol>
+    ** <li> the destination database was opened read-only, or
+    ** <li> the destination database is using write-ahead-log journaling
+    ** and the destination and source page sizes differ, or
+    ** <li> the destination database is an in-memory database and the
+    ** destination and source page sizes differ.
+    ** </ol>)^
+    **
+    ** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then
+    ** the [sqlite3_busy_handler | busy-handler function]
+    ** is invoked (if one is specified). ^If the
+    ** busy-handler returns non-zero before the lock is available, then
+    ** [SQLITE_BUSY] is returned to the caller. ^In this case the call to
+    ** sqlite3_backup_step() can be retried later. ^If the source
+    ** [database connection]
+    ** is being used to write to the source database when sqlite3_backup_step()
+    ** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this
+    ** case the call to sqlite3_backup_step() can be retried later on. ^(If
+    ** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or
+    ** [SQLITE_READONLY] is returned, then
+    ** there is no point in retrying the call to sqlite3_backup_step(). These
+    ** errors are considered fatal.)^  The application must accept
+    ** that the backup operation has failed and pass the backup operation handle
+    ** to the sqlite3_backup_finish() to release associated resources.
+    **
+    ** ^The first call to sqlite3_backup_step() obtains an exclusive lock
+    ** on the destination file. ^The exclusive lock is not released until either
+    ** sqlite3_backup_finish() is called or the backup operation is complete
+    ** and sqlite3_backup_step() returns [SQLITE_DONE].  ^Every call to
+    ** sqlite3_backup_step() obtains a [shared lock] on the source database that
+    ** lasts for the duration of the sqlite3_backup_step() call.
+    ** ^Because the source database is not locked between calls to
+    ** sqlite3_backup_step(), the source database may be modified mid-way
+    ** through the backup process.  ^If the source database is modified by an
+    ** external process or via a database connection other than the one being
+    ** used by the backup operation, then the backup will be automatically
+    ** restarted by the next call to sqlite3_backup_step(). ^If the source
+    ** database is modified by the using the same database connection as is used
+    ** by the backup operation, then the backup database is automatically
+    ** updated at the same time.
+    **
+    ** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
+    **
+    ** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the
+    ** application wishes to abandon the backup operation, the application
+    ** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish().
+    ** ^The sqlite3_backup_finish() interfaces releases all
+    ** resources associated with the [sqlite3_backup] object.
+    ** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any
+    ** active write-transaction on the destination database is rolled back.
+    ** The [sqlite3_backup] object is invalid
+    ** and may not be used following a call to sqlite3_backup_finish().
+    **
+    ** ^The value returned by sqlite3_backup_finish is [SQLITE_OK] if no
+    ** sqlite3_backup_step() errors occurred, regardless or whether or not
+    ** sqlite3_backup_step() completed.
+    ** ^If an out-of-memory condition or IO error occurred during any prior
+    ** sqlite3_backup_step() call on the same [sqlite3_backup] object, then
+    ** sqlite3_backup_finish() returns the corresponding [error code].
+    **
+    ** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
+    ** is not a permanent error and does not affect the return value of
+    ** sqlite3_backup_finish().
+    **
+    ** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
+    ** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
+    **
+    ** ^The sqlite3_backup_remaining() routine returns the number of pages still
+    ** to be backed up at the conclusion of the most recent sqlite3_backup_step().
+    ** ^The sqlite3_backup_pagecount() routine returns the total number of pages
+    ** in the source database at the conclusion of the most recent
+    ** sqlite3_backup_step().
+    ** ^(The values returned by these functions are only updated by
+    ** sqlite3_backup_step(). If the source database is modified in a way that
+    ** changes the size of the source database or the number of pages remaining,
+    ** those changes are not reflected in the output of sqlite3_backup_pagecount()
+    ** and sqlite3_backup_remaining() until after the next
+    ** sqlite3_backup_step().)^
+    **
+    ** <b>Concurrent Usage of Database Handles</b>
+    **
+    ** ^The source [database connection] may be used by the application for other
+    ** purposes while a backup operation is underway or being initialized.
+    ** ^If SQLite is compiled and configured to support threadsafe database
+    ** connections, then the source database connection may be used concurrently
+    ** from within other threads.
+    **
+    ** However, the application must guarantee that the destination
+    ** [database connection] is not passed to any other API (by any thread) after
+    ** sqlite3_backup_init() is called and before the corresponding call to
+    ** sqlite3_backup_finish().  SQLite does not currently check to see
+    ** if the application incorrectly accesses the destination [database connection]
+    ** and so no error code is reported, but the operations may malfunction
+    ** nevertheless.  Use of the destination database connection while a
+    ** backup is in progress might also also cause a mutex deadlock.
+    **
+    ** If running in [shared cache mode], the application must
+    ** guarantee that the shared cache used by the destination database
+    ** is not accessed while the backup is running. In practice this means
+    ** that the application must guarantee that the disk file being
+    ** backed up to is not accessed by any connection within the process,
+    ** not just the specific connection that was passed to sqlite3_backup_init().
+    **
+    ** The [sqlite3_backup] object itself is partially threadsafe. Multiple
+    ** threads may safely make multiple concurrent calls to sqlite3_backup_step().
+    ** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount()
+    ** APIs are not strictly speaking threadsafe. If they are invoked at the
+    ** same time as another thread is invoking sqlite3_backup_step() it is
+    ** possible that they return invalid values.
+    */
+    SQLITE_API sqlite3_backup* sqlite3_backup_init(sqlite3* pDest,         /* Destination database handle */
+                                                   const char* zDestName,  /* Destination database name */
+                                                   sqlite3* pSource,       /* Source database handle */
+                                                   const char* zSourceName /* Source database name */
+    );
+    SQLITE_API int sqlite3_backup_step(sqlite3_backup* p, int nPage);
+    SQLITE_API int sqlite3_backup_finish(sqlite3_backup* p);
+    SQLITE_API int sqlite3_backup_remaining(sqlite3_backup* p);
+    SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup* p);
+
+    /*
+    ** CAPI3REF: Unlock Notification
+    ** METHOD: sqlite3
+    **
+    ** ^When running in shared-cache mode, a database operation may fail with
+    ** an [SQLITE_LOCKED] error if the required locks on the shared-cache or
+    ** individual tables within the shared-cache cannot be obtained. See
+    ** [SQLite Shared-Cache Mode] for a description of shared-cache locking.
+    ** ^This API may be used to register a callback that SQLite will invoke
+    ** when the connection currently holding the required lock relinquishes it.
+    ** ^This API is only available if the library was compiled with the
+    ** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined.
+    **
+    ** See Also: [Using the SQLite Unlock Notification Feature].
+    **
+    ** ^Shared-cache locks are released when a database connection concludes
+    ** its current transaction, either by committing it or rolling it back.
+    **
+    ** ^When a connection (known as the blocked connection) fails to obtain a
+    ** shared-cache lock and SQLITE_LOCKED is returned to the caller, the
+    ** identity of the database connection (the blocking connection) that
+    ** has locked the required resource is stored internally. ^After an
+    ** application receives an SQLITE_LOCKED error, it may call the
+    ** sqlite3_unlock_notify() method with the blocked connection handle as
+    ** the first argument to register for a callback that will be invoked
+    ** when the blocking connections current transaction is concluded. ^The
+    ** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
+    ** call that concludes the blocking connection's transaction.
+    **
+    ** ^(If sqlite3_unlock_notify() is called in a multi-threaded application,
+    ** there is a chance that the blocking connection will have already
+    ** concluded its transaction by the time sqlite3_unlock_notify() is invoked.
+    ** If this happens, then the specified callback is invoked immediately,
+    ** from within the call to sqlite3_unlock_notify().)^
+    **
+    ** ^If the blocked connection is attempting to obtain a write-lock on a
+    ** shared-cache table, and more than one other connection currently holds
+    ** a read-lock on the same table, then SQLite arbitrarily selects one of
+    ** the other connections to use as the blocking connection.
+    **
+    ** ^(There may be at most one unlock-notify callback registered by a
+    ** blocked connection. If sqlite3_unlock_notify() is called when the
+    ** blocked connection already has a registered unlock-notify callback,
+    ** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
+    ** called with a NULL pointer as its second argument, then any existing
+    ** unlock-notify callback is canceled. ^The blocked connections
+    ** unlock-notify callback may also be canceled by closing the blocked
+    ** connection using [sqlite3_close()].
+    **
+    ** The unlock-notify callback is not reentrant. If an application invokes
+    ** any sqlite3_xxx API functions from within an unlock-notify callback, a
+    ** crash or deadlock may be the result.
+    **
+    ** ^Unless deadlock is detected (see below), sqlite3_unlock_notify() always
+    ** returns SQLITE_OK.
+    **
+    ** <b>Callback Invocation Details</b>
+    **
+    ** When an unlock-notify callback is registered, the application provides a
+    ** single void* pointer that is passed to the callback when it is invoked.
+    ** However, the signature of the callback function allows SQLite to pass
+    ** it an array of void* context pointers. The first argument passed to
+    ** an unlock-notify callback is a pointer to an array of void* pointers,
+    ** and the second is the number of entries in the array.
+    **
+    ** When a blocking connection's transaction is concluded, there may be
+    ** more than one blocked connection that has registered for an unlock-notify
+    ** callback. ^If two or more such blocked connections have specified the
+    ** same callback function, then instead of invoking the callback function
+    ** multiple times, it is invoked once with the set of void* context pointers
+    ** specified by the blocked connections bundled together into an array.
+    ** This gives the application an opportunity to prioritize any actions
+    ** related to the set of unblocked database connections.
+    **
+    ** <b>Deadlock Detection</b>
+    **
+    ** Assuming that after registering for an unlock-notify callback a
+    ** database waits for the callback to be issued before taking any further
+    ** action (a reasonable assumption), then using this API may cause the
+    ** application to deadlock. For example, if connection X is waiting for
+    ** connection Y's transaction to be concluded, and similarly connection
+    ** Y is waiting on connection X's transaction, then neither connection
+    ** will proceed and the system may remain deadlocked indefinitely.
+    **
+    ** To avoid this scenario, the sqlite3_unlock_notify() performs deadlock
+    ** detection. ^If a given call to sqlite3_unlock_notify() would put the
+    ** system in a deadlocked state, then SQLITE_LOCKED is returned and no
+    ** unlock-notify callback is registered. The system is said to be in
+    ** a deadlocked state if connection A has registered for an unlock-notify
+    ** callback on the conclusion of connection B's transaction, and connection
+    ** B has itself registered for an unlock-notify callback when connection
+    ** A's transaction is concluded. ^Indirect deadlock is also detected, so
+    ** the system is also considered to be deadlocked if connection B has
+    ** registered for an unlock-notify callback on the conclusion of connection
+    ** C's transaction, where connection C is waiting on connection A. ^Any
+    ** number of levels of indirection are allowed.
+    **
+    ** <b>The "DROP TABLE" Exception</b>
+    **
+    ** When a call to [sqlite3_step()] returns SQLITE_LOCKED, it is almost
+    ** always appropriate to call sqlite3_unlock_notify(). There is however,
+    ** one exception. When executing a "DROP TABLE" or "DROP INDEX" statement,
+    ** SQLite checks if there are any currently executing SELECT statements
+    ** that belong to the same connection. If there are, SQLITE_LOCKED is
+    ** returned. In this case there is no "blocking connection", so invoking
+    ** sqlite3_unlock_notify() results in the unlock-notify callback being
+    ** invoked immediately. If the application then re-attempts the "DROP TABLE"
+    ** or "DROP INDEX" query, an infinite loop might be the result.
+    **
+    ** One way around this problem is to check the extended error code returned
+    ** by an sqlite3_step() call. ^(If there is a blocking connection, then the
+    ** extended error code is set to SQLITE_LOCKED_SHAREDCACHE. Otherwise, in
+    ** the special "DROP TABLE/INDEX" case, the extended error code is just
+    ** SQLITE_LOCKED.)^
+    */
+    SQLITE_API int sqlite3_unlock_notify(sqlite3* pBlocked,                       /* Waiting connection */
+                                         void (*xNotify)(void** apArg, int nArg), /* Callback function to invoke */
+                                         void* pNotifyArg                         /* Argument to pass to xNotify */
+    );
+
+    /*
+    ** CAPI3REF: String Comparison
+    **
+    ** ^The [sqlite3_stricmp()] and [sqlite3_strnicmp()] APIs allow applications
+    ** and extensions to compare the contents of two buffers containing UTF-8
+    ** strings in a case-independent fashion, using the same definition of "case
+    ** independence" that SQLite uses internally when comparing identifiers.
+    */
+    SQLITE_API int sqlite3_stricmp(const char*, const char*);
+    SQLITE_API int sqlite3_strnicmp(const char*, const char*, int);
+
+    /*
+    ** CAPI3REF: String Globbing
+    *
+    ** ^The [sqlite3_strglob(P,X)] interface returns zero if and only if
+    ** string X matches the [GLOB] pattern P.
+    ** ^The definition of [GLOB] pattern matching used in
+    ** [sqlite3_strglob(P,X)] is the same as for the "X GLOB P" operator in the
+    ** SQL dialect understood by SQLite.  ^The [sqlite3_strglob(P,X)] function
+    ** is case sensitive.
+    **
+    ** Note that this routine returns zero on a match and non-zero if the strings
+    ** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
+    **
+    ** See also: [sqlite3_strlike()].
+    */
+    SQLITE_API int sqlite3_strglob(const char* zGlob, const char* zStr);
+
+    /*
+    ** CAPI3REF: String LIKE Matching
+    *
+    ** ^The [sqlite3_strlike(P,X,E)] interface returns zero if and only if
+    ** string X matches the [LIKE] pattern P with escape character E.
+    ** ^The definition of [LIKE] pattern matching used in
+    ** [sqlite3_strlike(P,X,E)] is the same as for the "X LIKE P ESCAPE E"
+    ** operator in the SQL dialect understood by SQLite.  ^For "X LIKE P" without
+    ** the ESCAPE clause, set the E parameter of [sqlite3_strlike(P,X,E)] to 0.
+    ** ^As with the LIKE operator, the [sqlite3_strlike(P,X,E)] function is case
+    ** insensitive - equivalent upper and lower case ASCII characters match
+    ** one another.
+    **
+    ** ^The [sqlite3_strlike(P,X,E)] function matches Unicode characters, though
+    ** only ASCII characters are case folded.
+    **
+    ** Note that this routine returns zero on a match and non-zero if the strings
+    ** do not match, the same as [sqlite3_stricmp()] and [sqlite3_strnicmp()].
+    **
+    ** See also: [sqlite3_strglob()].
+    */
+    SQLITE_API int sqlite3_strlike(const char* zGlob, const char* zStr, unsigned int cEsc);
+
+    /*
+    ** CAPI3REF: Error Logging Interface
+    **
+    ** ^The [sqlite3_log()] interface writes a message into the [error log]
+    ** established by the [SQLITE_CONFIG_LOG] option to [sqlite3_config()].
+    ** ^If logging is enabled, the zFormat string and subsequent arguments are
+    ** used with [sqlite3_snprintf()] to generate the final output string.
+    **
+    ** The sqlite3_log() interface is intended for use by extensions such as
+    ** virtual tables, collating functions, and SQL functions.  While there is
+    ** nothing to prevent an application from calling sqlite3_log(), doing so
+    ** is considered bad form.
+    **
+    ** The zFormat string must not be NULL.
+    **
+    ** To avoid deadlocks and other threading problems, the sqlite3_log() routine
+    ** will not use dynamically allocated memory.  The log message is stored in
+    ** a fixed-length buffer on the stack.  If the log message is longer than
+    ** a few hundred characters, it will be truncated to the length of the
+    ** buffer.
+    */
+    SQLITE_API void sqlite3_log(int iErrCode, const char* zFormat, ...);
+
+    /*
+    ** CAPI3REF: Write-Ahead Log Commit Hook
+    ** METHOD: sqlite3
+    **
+    ** ^The [sqlite3_wal_hook()] function is used to register a callback that
+    ** is invoked each time data is committed to a database in wal mode.
+    **
+    ** ^(The callback is invoked by SQLite after the commit has taken place and
+    ** the associated write-lock on the database released)^, so the implementation
+    ** may read, write or [checkpoint] the database as required.
+    **
+    ** ^The first parameter passed to the callback function when it is invoked
+    ** is a copy of the third parameter passed to sqlite3_wal_hook() when
+    ** registering the callback. ^The second is a copy of the database handle.
+    ** ^The third parameter is the name of the database that was written to -
+    ** either "main" or the name of an [ATTACH]-ed database. ^The fourth parameter
+    ** is the number of pages currently in the write-ahead log file,
+    ** including those that were just committed.
+    **
+    ** The callback function should normally return [SQLITE_OK].  ^If an error
+    ** code is returned, that error will propagate back up through the
+    ** SQLite code base to cause the statement that provoked the callback
+    ** to report an error, though the commit will have still occurred. If the
+    ** callback returns [SQLITE_ROW] or [SQLITE_DONE], or if it returns a value
+    ** that does not correspond to any valid SQLite error code, the results
+    ** are undefined.
+    **
+    ** A single database handle may have at most a single write-ahead log callback
+    ** registered at one time. ^Calling [sqlite3_wal_hook()] replaces any
+    ** previously registered write-ahead log callback. ^The return value is
+    ** a copy of the third parameter from the previous call, if any, or 0.
+    ** ^Note that the [sqlite3_wal_autocheckpoint()] interface and the
+    ** [wal_autocheckpoint pragma] both invoke [sqlite3_wal_hook()] and will
+    ** overwrite any prior [sqlite3_wal_hook()] settings.
+    */
+    SQLITE_API void* sqlite3_wal_hook(sqlite3*, int (*)(void*, sqlite3*, const char*, int), void*);
+
+    /*
+    ** CAPI3REF: Configure an auto-checkpoint
+    ** METHOD: sqlite3
+    **
+    ** ^The [sqlite3_wal_autocheckpoint(D,N)] is a wrapper around
+    ** [sqlite3_wal_hook()] that causes any database on [database connection] D
+    ** to automatically [checkpoint]
+    ** after committing a transaction if there are N or
+    ** more frames in the [write-ahead log] file.  ^Passing zero or
+    ** a negative value as the nFrame parameter disables automatic
+    ** checkpoints entirely.
+    **
+    ** ^The callback registered by this function replaces any existing callback
+    ** registered using [sqlite3_wal_hook()].  ^Likewise, registering a callback
+    ** using [sqlite3_wal_hook()] disables the automatic checkpoint mechanism
+    ** configured by this function.
+    **
+    ** ^The [wal_autocheckpoint pragma] can be used to invoke this interface
+    ** from SQL.
+    **
+    ** ^Checkpoints initiated by this mechanism are
+    ** [sqlite3_wal_checkpoint_v2|PASSIVE].
+    **
+    ** ^Every new [database connection] defaults to having the auto-checkpoint
+    ** enabled with a threshold of 1000 or [SQLITE_DEFAULT_WAL_AUTOCHECKPOINT]
+    ** pages.  The use of this interface
+    ** is only necessary if the default setting is found to be suboptimal
+    ** for a particular application.
+    */
+    SQLITE_API int sqlite3_wal_autocheckpoint(sqlite3* db, int N);
+
+    /*
+    ** CAPI3REF: Checkpoint a database
+    ** METHOD: sqlite3
+    **
+    ** ^(The sqlite3_wal_checkpoint(D,X) is equivalent to
+    ** [sqlite3_wal_checkpoint_v2](D,X,[SQLITE_CHECKPOINT_PASSIVE],0,0).)^
+    **
+    ** In brief, sqlite3_wal_checkpoint(D,X) causes the content in the
+    ** [write-ahead log] for database X on [database connection] D to be
+    ** transferred into the database file and for the write-ahead log to
+    ** be reset.  See the [checkpointing] documentation for addition
+    ** information.
+    **
+    ** This interface used to be the only way to cause a checkpoint to
+    ** occur.  But then the newer and more powerful [sqlite3_wal_checkpoint_v2()]
+    ** interface was added.  This interface is retained for backwards
+    ** compatibility and as a convenience for applications that need to manually
+    ** start a callback but which do not need the full power (and corresponding
+    ** complication) of [sqlite3_wal_checkpoint_v2()].
+    */
+    SQLITE_API int sqlite3_wal_checkpoint(sqlite3* db, const char* zDb);
+
+    /*
+    ** CAPI3REF: Checkpoint a database
+    ** METHOD: sqlite3
+    **
+    ** ^(The sqlite3_wal_checkpoint_v2(D,X,M,L,C) interface runs a checkpoint
+    ** operation on database X of [database connection] D in mode M.  Status
+    ** information is written back into integers pointed to by L and C.)^
+    ** ^(The M parameter must be a valid [checkpoint mode]:)^
+    **
+    ** <dl>
+    ** <dt>SQLITE_CHECKPOINT_PASSIVE<dd>
+    **   ^Checkpoint as many frames as possible without waiting for any database
+    **   readers or writers to finish, then sync the database file if all frames
+    **   in the log were checkpointed. ^The [busy-handler callback]
+    **   is never invoked in the SQLITE_CHECKPOINT_PASSIVE mode.
+    **   ^On the other hand, passive mode might leave the checkpoint unfinished
+    **   if there are concurrent readers or writers.
+    **
+    ** <dt>SQLITE_CHECKPOINT_FULL<dd>
+    **   ^This mode blocks (it invokes the
+    **   [sqlite3_busy_handler|busy-handler callback]) until there is no
+    **   database writer and all readers are reading from the most recent database
+    **   snapshot. ^It then checkpoints all frames in the log file and syncs the
+    **   database file. ^This mode blocks new database writers while it is pending,
+    **   but new database readers are allowed to continue unimpeded.
+    **
+    ** <dt>SQLITE_CHECKPOINT_RESTART<dd>
+    **   ^This mode works the same way as SQLITE_CHECKPOINT_FULL with the addition
+    **   that after checkpointing the log file it blocks (calls the
+    **   [busy-handler callback])
+    **   until all readers are reading from the database file only. ^This ensures
+    **   that the next writer will restart the log file from the beginning.
+    **   ^Like SQLITE_CHECKPOINT_FULL, this mode blocks new
+    **   database writer attempts while it is pending, but does not impede readers.
+    **
+    ** <dt>SQLITE_CHECKPOINT_TRUNCATE<dd>
+    **   ^This mode works the same way as SQLITE_CHECKPOINT_RESTART with the
+    **   addition that it also truncates the log file to zero bytes just prior
+    **   to a successful return.
+    ** </dl>
+    **
+    ** ^If pnLog is not NULL, then *pnLog is set to the total number of frames in
+    ** the log file or to -1 if the checkpoint could not run because
+    ** of an error or because the database is not in [WAL mode]. ^If pnCkpt is not
+    ** NULL,then *pnCkpt is set to the total number of checkpointed frames in the
+    ** log file (including any that were already checkpointed before the function
+    ** was called) or to -1 if the checkpoint could not run due to an error or
+    ** because the database is not in WAL mode. ^Note that upon successful
+    ** completion of an SQLITE_CHECKPOINT_TRUNCATE, the log file will have been
+    ** truncated to zero bytes and so both *pnLog and *pnCkpt will be set to zero.
+    **
+    ** ^All calls obtain an exclusive "checkpoint" lock on the database file. ^If
+    ** any other process is running a checkpoint operation at the same time, the
+    ** lock cannot be obtained and SQLITE_BUSY is returned. ^Even if there is a
+    ** busy-handler configured, it will not be invoked in this case.
+    **
+    ** ^The SQLITE_CHECKPOINT_FULL, RESTART and TRUNCATE modes also obtain the
+    ** exclusive "writer" lock on the database file. ^If the writer lock cannot be
+    ** obtained immediately, and a busy-handler is configured, it is invoked and
+    ** the writer lock retried until either the busy-handler returns 0 or the lock
+    ** is successfully obtained. ^The busy-handler is also invoked while waiting for
+    ** database readers as described above. ^If the busy-handler returns 0 before
+    ** the writer lock is obtained or while waiting for database readers, the
+    ** checkpoint operation proceeds from that point in the same way as
+    ** SQLITE_CHECKPOINT_PASSIVE - checkpointing as many frames as possible
+    ** without blocking any further. ^SQLITE_BUSY is returned in this case.
+    **
+    ** ^If parameter zDb is NULL or points to a zero length string, then the
+    ** specified operation is attempted on all WAL databases [attached] to
+    ** [database connection] db.  In this case the
+    ** values written to output parameters *pnLog and *pnCkpt are undefined. ^If
+    ** an SQLITE_BUSY error is encountered when processing one or more of the
+    ** attached WAL databases, the operation is still attempted on any remaining
+    ** attached databases and SQLITE_BUSY is returned at the end. ^If any other
+    ** error occurs while processing an attached database, processing is abandoned
+    ** and the error code is returned to the caller immediately. ^If no error
+    ** (SQLITE_BUSY or otherwise) is encountered while processing the attached
+    ** databases, SQLITE_OK is returned.
+    **
+    ** ^If database zDb is the name of an attached database that is not in WAL
+    ** mode, SQLITE_OK is returned and both *pnLog and *pnCkpt set to -1. ^If
+    ** zDb is not NULL (or a zero length string) and is not the name of any
+    ** attached database, SQLITE_ERROR is returned to the caller.
+    **
+    ** ^Unless it returns SQLITE_MISUSE,
+    ** the sqlite3_wal_checkpoint_v2() interface
+    ** sets the error information that is queried by
+    ** [sqlite3_errcode()] and [sqlite3_errmsg()].
+    **
+    ** ^The [PRAGMA wal_checkpoint] command can be used to invoke this interface
+    ** from SQL.
+    */
+    SQLITE_API int sqlite3_wal_checkpoint_v2(sqlite3* db,     /* Database handle */
+                                             const char* zDb, /* Name of attached database (or NULL) */
+                                             int eMode,       /* SQLITE_CHECKPOINT_* value */
+                                             int* pnLog,      /* OUT: Size of WAL log in frames */
+                                             int* pnCkpt      /* OUT: Total number of frames checkpointed */
+    );
 
 /*
 ** CAPI3REF: Checkpoint Mode Values
@@ -9378,30 +9305,30 @@ SQLITE_API int sqlite3_wal_checkpoint_v2(
 ** See the [sqlite3_wal_checkpoint_v2()] documentation for details on the
 ** meaning of each of these checkpoint modes.
 */
-#define SQLITE_CHECKPOINT_PASSIVE  0  /* Do as much as possible w/o blocking */
-#define SQLITE_CHECKPOINT_FULL     1  /* Wait for writers, then checkpoint */
-#define SQLITE_CHECKPOINT_RESTART  2  /* Like FULL but wait for for readers */
-#define SQLITE_CHECKPOINT_TRUNCATE 3  /* Like RESTART but also truncate WAL */
-
-/*
-** CAPI3REF: Virtual Table Interface Configuration
-**
-** This function may be called by either the [xConnect] or [xCreate] method
-** of a [virtual table] implementation to configure
-** various facets of the virtual table interface.
-**
-** If this interface is invoked outside the context of an xConnect or
-** xCreate virtual table method then the behavior is undefined.
-**
-** In the call sqlite3_vtab_config(D,C,...) the D parameter is the
-** [database connection] in which the virtual table is being created and
-** which is passed in as the first argument to the [xConnect] or [xCreate]
-** method that is invoking sqlite3_vtab_config().  The C parameter is one
-** of the [virtual table configuration options].  The presence and meaning
-** of parameters after C depend on which [virtual table configuration option]
-** is used.
-*/
-SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
+#define SQLITE_CHECKPOINT_PASSIVE 0  /* Do as much as possible w/o blocking */
+#define SQLITE_CHECKPOINT_FULL 1     /* Wait for writers, then checkpoint */
+#define SQLITE_CHECKPOINT_RESTART 2  /* Like FULL but wait for for readers */
+#define SQLITE_CHECKPOINT_TRUNCATE 3 /* Like RESTART but also truncate WAL */
+
+    /*
+    ** CAPI3REF: Virtual Table Interface Configuration
+    **
+    ** This function may be called by either the [xConnect] or [xCreate] method
+    ** of a [virtual table] implementation to configure
+    ** various facets of the virtual table interface.
+    **
+    ** If this interface is invoked outside the context of an xConnect or
+    ** xCreate virtual table method then the behavior is undefined.
+    **
+    ** In the call sqlite3_vtab_config(D,C,...) the D parameter is the
+    ** [database connection] in which the virtual table is being created and
+    ** which is passed in as the first argument to the [xConnect] or [xCreate]
+    ** method that is invoking sqlite3_vtab_config().  The C parameter is one
+    ** of the [virtual table configuration options].  The presence and meaning
+    ** of parameters after C depend on which [virtual table configuration option]
+    ** is used.
+    */
+    SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
 
 /*
 ** CAPI3REF: Virtual Table Configuration Options
@@ -9466,311 +9393,311 @@ SQLITE_API int sqlite3_vtab_config(sqlite3*, int op, ...);
 ** </dl>
 */
 #define SQLITE_VTAB_CONSTRAINT_SUPPORT 1
-#define SQLITE_VTAB_INNOCUOUS          2
-#define SQLITE_VTAB_DIRECTONLY         3
-
-/*
-** CAPI3REF: Determine The Virtual Table Conflict Policy
-**
-** This function may only be called from within a call to the [xUpdate] method
-** of a [virtual table] implementation for an INSERT or UPDATE operation. ^The
-** value returned is one of [SQLITE_ROLLBACK], [SQLITE_IGNORE], [SQLITE_FAIL],
-** [SQLITE_ABORT], or [SQLITE_REPLACE], according to the [ON CONFLICT] mode
-** of the SQL statement that triggered the call to the [xUpdate] method of the
-** [virtual table].
-*/
-SQLITE_API int sqlite3_vtab_on_conflict(sqlite3 *);
-
-/*
-** CAPI3REF: Determine If Virtual Table Column Access Is For UPDATE
-**
-** If the sqlite3_vtab_nochange(X) routine is called within the [xColumn]
-** method of a [virtual table], then it might return true if the
-** column is being fetched as part of an UPDATE operation during which the
-** column value will not change.  The virtual table implementation can use
-** this hint as permission to substitute a return value that is less
-** expensive to compute and that the corresponding
-** [xUpdate] method understands as a "no-change" value.
-**
-** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
-** the column is not changed by the UPDATE statement, then the xColumn
-** method can optionally return without setting a result, without calling
-** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
-** In that case, [sqlite3_value_nochange(X)] will return true for the
-** same column in the [xUpdate] method.
-**
-** The sqlite3_vtab_nochange() routine is an optimization.  Virtual table
-** implementations should continue to give a correct answer even if the
-** sqlite3_vtab_nochange() interface were to always return false.  In the
-** current implementation, the sqlite3_vtab_nochange() interface does always
-** returns false for the enhanced [UPDATE FROM] statement.
-*/
-SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*);
-
-/*
-** CAPI3REF: Determine The Collation For a Virtual Table Constraint
-** METHOD: sqlite3_index_info
-**
-** This function may only be called from within a call to the [xBestIndex]
-** method of a [virtual table].  This function returns a pointer to a string
-** that is the name of the appropriate collation sequence to use for text
-** comparisons on the constraint identified by its arguments.
-**
-** The first argument must be the pointer to the [sqlite3_index_info] object
-** that is the first parameter to the xBestIndex() method. The second argument
-** must be an index into the aConstraint[] array belonging to the
-** sqlite3_index_info structure passed to xBestIndex.
-**
-** Important:
-** The first parameter must be the same pointer that is passed into the
-** xBestMethod() method.  The first parameter may not be a pointer to a
-** different [sqlite3_index_info] object, even an exact copy.
-**
-** The return value is computed as follows:
-**
-** <ol>
-** <li><p> If the constraint comes from a WHERE clause expression that contains
-**         a [COLLATE operator], then the name of the collation specified by
-**         that COLLATE operator is returned.
-** <li><p> If there is no COLLATE operator, but the column that is the subject
-**         of the constraint specifies an alternative collating sequence via
-**         a [COLLATE clause] on the column definition within the CREATE TABLE
-**         statement that was passed into [sqlite3_declare_vtab()], then the
-**         name of that alternative collating sequence is returned.
-** <li><p> Otherwise, "BINARY" is returned.
-** </ol>
-*/
-SQLITE_API SQLITE_EXPERIMENTAL const char *sqlite3_vtab_collation(sqlite3_index_info*,int);
-
-/*
-** CAPI3REF: Determine if a virtual table query is DISTINCT
-** METHOD: sqlite3_index_info
-**
-** This API may only be used from within an [xBestIndex|xBestIndex method]
-** of a [virtual table] implementation. The result of calling this
-** interface from outside of xBestIndex() is undefined and probably harmful.
-**
-** ^The sqlite3_vtab_distinct() interface returns an integer that is
-** either 0, 1, or 2.  The integer returned by sqlite3_vtab_distinct()
-** gives the virtual table additional information about how the query
-** planner wants the output to be ordered. As long as the virtual table
-** can meet the ordering requirements of the query planner, it may set
-** the "orderByConsumed" flag.
-**
-** <ol><li value="0"><p>
-** ^If the sqlite3_vtab_distinct() interface returns 0, that means
-** that the query planner needs the virtual table to return all rows in the
-** sort order defined by the "nOrderBy" and "aOrderBy" fields of the
-** [sqlite3_index_info] object.  This is the default expectation.  If the
-** virtual table outputs all rows in sorted order, then it is always safe for
-** the xBestIndex method to set the "orderByConsumed" flag, regardless of
-** the return value from sqlite3_vtab_distinct().
-** <li value="1"><p>
-** ^(If the sqlite3_vtab_distinct() interface returns 1, that means
-** that the query planner does not need the rows to be returned in sorted order
-** as long as all rows with the same values in all columns identified by the
-** "aOrderBy" field are adjacent.)^  This mode is used when the query planner
-** is doing a GROUP BY.
-** <li value="2"><p>
-** ^(If the sqlite3_vtab_distinct() interface returns 2, that means
-** that the query planner does not need the rows returned in any particular
-** order, as long as rows with the same values in all "aOrderBy" columns
-** are adjacent.)^  ^(Furthermore, only a single row for each particular
-** combination of values in the columns identified by the "aOrderBy" field
-** needs to be returned.)^  ^It is always ok for two or more rows with the same
-** values in all "aOrderBy" columns to be returned, as long as all such rows
-** are adjacent.  ^The virtual table may, if it chooses, omit extra rows
-** that have the same value for all columns identified by "aOrderBy".
-** ^However omitting the extra rows is optional.
-** This mode is used for a DISTINCT query.
-** </ol>
-**
-** ^For the purposes of comparing virtual table output values to see if the
-** values are same value for sorting purposes, two NULL values are considered
-** to be the same.  In other words, the comparison operator is "IS"
-** (or "IS NOT DISTINCT FROM") and not "==".
-**
-** If a virtual table implementation is unable to meet the requirements
-** specified above, then it must not set the "orderByConsumed" flag in the
-** [sqlite3_index_info] object or an incorrect answer may result.
-**
-** ^A virtual table implementation is always free to return rows in any order
-** it wants, as long as the "orderByConsumed" flag is not set.  ^When the
-** the "orderByConsumed" flag is unset, the query planner will add extra
-** [bytecode] to ensure that the final results returned by the SQL query are
-** ordered correctly.  The use of the "orderByConsumed" flag and the
-** sqlite3_vtab_distinct() interface is merely an optimization.  ^Careful
-** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
-** flag might help queries against a virtual table to run faster.  Being
-** overly aggressive and setting the "orderByConsumed" flag when it is not
-** valid to do so, on the other hand, might cause SQLite to return incorrect
-** results.
-*/
-SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info*);
-
-/*
-** CAPI3REF: Identify and handle IN constraints in xBestIndex
-**
-** This interface may only be used from within an
-** [xBestIndex|xBestIndex() method] of a [virtual table] implementation.
-** The result of invoking this interface from any other context is
-** undefined and probably harmful.
-**
-** ^(A constraint on a virtual table of the form
-** "[IN operator|column IN (...)]" is
-** communicated to the xBestIndex method as a
-** [SQLITE_INDEX_CONSTRAINT_EQ] constraint.)^  If xBestIndex wants to use
-** this constraint, it must set the corresponding
-** aConstraintUsage[].argvIndex to a postive integer.  ^(Then, under
-** the usual mode of handling IN operators, SQLite generates [bytecode]
-** that invokes the [xFilter|xFilter() method] once for each value
-** on the right-hand side of the IN operator.)^  Thus the virtual table
-** only sees a single value from the right-hand side of the IN operator
-** at a time.
-**
-** In some cases, however, it would be advantageous for the virtual
-** table to see all values on the right-hand of the IN operator all at
-** once.  The sqlite3_vtab_in() interfaces facilitates this in two ways:
-**
-** <ol>
-** <li><p>
-**   ^A call to sqlite3_vtab_in(P,N,-1) will return true (non-zero)
-**   if and only if the [sqlite3_index_info|P->aConstraint][N] constraint
-**   is an [IN operator] that can be processed all at once.  ^In other words,
-**   sqlite3_vtab_in() with -1 in the third argument is a mechanism
-**   by which the virtual table can ask SQLite if all-at-once processing
-**   of the IN operator is even possible.
-**
-** <li><p>
-**   ^A call to sqlite3_vtab_in(P,N,F) with F==1 or F==0 indicates
-**   to SQLite that the virtual table does or does not want to process
-**   the IN operator all-at-once, respectively.  ^Thus when the third
-**   parameter (F) is non-negative, this interface is the mechanism by
-**   which the virtual table tells SQLite how it wants to process the
-**   IN operator.
-** </ol>
-**
-** ^The sqlite3_vtab_in(P,N,F) interface can be invoked multiple times
-** within the same xBestIndex method call.  ^For any given P,N pair,
-** the return value from sqlite3_vtab_in(P,N,F) will always be the same
-** within the same xBestIndex call.  ^If the interface returns true
-** (non-zero), that means that the constraint is an IN operator
-** that can be processed all-at-once.  ^If the constraint is not an IN
-** operator or cannot be processed all-at-once, then the interface returns
-** false.
-**
-** ^(All-at-once processing of the IN operator is selected if both of the
-** following conditions are met:
-**
-** <ol>
-** <li><p> The P->aConstraintUsage[N].argvIndex value is set to a positive
-** integer.  This is how the virtual table tells SQLite that it wants to
-** use the N-th constraint.
-**
-** <li><p> The last call to sqlite3_vtab_in(P,N,F) for which F was
-** non-negative had F>=1.
-** </ol>)^
-**
-** ^If either or both of the conditions above are false, then SQLite uses
-** the traditional one-at-a-time processing strategy for the IN constraint.
-** ^If both conditions are true, then the argvIndex-th parameter to the
-** xFilter method will be an [sqlite3_value] that appears to be NULL,
-** but which can be passed to [sqlite3_vtab_in_first()] and
-** [sqlite3_vtab_in_next()] to find all values on the right-hand side
-** of the IN constraint.
-*/
-SQLITE_API int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle);
-
-/*
-** CAPI3REF: Find all elements on the right-hand side of an IN constraint.
-**
-** These interfaces are only useful from within the
-** [xFilter|xFilter() method] of a [virtual table] implementation.
-** The result of invoking these interfaces from any other context
-** is undefined and probably harmful.
-**
-** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
-** sqlite3_vtab_in_next(X,P) must be one of the parameters to the
-** xFilter method which invokes these routines, and specifically
-** a parameter that was previously selected for all-at-once IN constraint
-** processing use the [sqlite3_vtab_in()] interface in the
-** [xBestIndex|xBestIndex method].  ^(If the X parameter is not
-** an xFilter argument that was selected for all-at-once IN constraint
-** processing, then these routines return [SQLITE_MISUSE])^ or perhaps
-** exhibit some other undefined or harmful behavior.
-**
-** ^(Use these routines to access all values on the right-hand side
-** of the IN constraint using code like the following:
-**
-** <blockquote><pre>
-** &nbsp;  for(rc=sqlite3_vtab_in_first(pList, &pVal);
-** &nbsp;      rc==SQLITE_OK && pVal
-** &nbsp;      rc=sqlite3_vtab_in_next(pList, &pVal)
-** &nbsp;  ){
-** &nbsp;    // do something with pVal
-** &nbsp;  }
-** &nbsp;  if( rc!=SQLITE_OK ){
-** &nbsp;    // an error has occurred
-** &nbsp;  }
-** </pre></blockquote>)^
-**
-** ^On success, the sqlite3_vtab_in_first(X,P) and sqlite3_vtab_in_next(X,P)
-** routines return SQLITE_OK and set *P to point to the first or next value
-** on the RHS of the IN constraint.  ^If there are no more values on the
-** right hand side of the IN constraint, then *P is set to NULL and these
-** routines return [SQLITE_DONE].  ^The return value might be
-** some other value, such as SQLITE_NOMEM, in the event of a malfunction.
-**
-** The *ppOut values returned by these routines are only valid until the
-** next call to either of these routines or until the end of the xFilter
-** method from which these routines were called.  If the virtual table
-** implementation needs to retain the *ppOut values for longer, it must make
-** copies.  The *ppOut values are [protected sqlite3_value|protected].
-*/
-SQLITE_API int sqlite3_vtab_in_first(sqlite3_value *pVal, sqlite3_value **ppOut);
-SQLITE_API int sqlite3_vtab_in_next(sqlite3_value *pVal, sqlite3_value **ppOut);
-
-/*
-** CAPI3REF: Constraint values in xBestIndex()
-** METHOD: sqlite3_index_info
-**
-** This API may only be used from within the [xBestIndex|xBestIndex method]
-** of a [virtual table] implementation. The result of calling this interface
-** from outside of an xBestIndex method are undefined and probably harmful.
-**
-** ^When the sqlite3_vtab_rhs_value(P,J,V) interface is invoked from within
-** the [xBestIndex] method of a [virtual table] implementation, with P being
-** a copy of the [sqlite3_index_info] object pointer passed into xBestIndex and
-** J being a 0-based index into P->aConstraint[], then this routine
-** attempts to set *V to the value of the right-hand operand of
-** that constraint if the right-hand operand is known.  ^If the
-** right-hand operand is not known, then *V is set to a NULL pointer.
-** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
-** and only if *V is set to a value.  ^The sqlite3_vtab_rhs_value(P,J,V)
-** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
-** constraint is not available.  ^The sqlite3_vtab_rhs_value() interface
-** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
-** something goes wrong.
-**
-** The sqlite3_vtab_rhs_value() interface is usually only successful if
-** the right-hand operand of a constraint is a literal value in the original
-** SQL statement.  If the right-hand operand is an expression or a reference
-** to some other column or a [host parameter], then sqlite3_vtab_rhs_value()
-** will probably return [SQLITE_NOTFOUND].
-**
-** ^(Some constraints, such as [SQLITE_INDEX_CONSTRAINT_ISNULL] and
-** [SQLITE_INDEX_CONSTRAINT_ISNOTNULL], have no right-hand operand.  For such
-** constraints, sqlite3_vtab_rhs_value() always returns SQLITE_NOTFOUND.)^
-**
-** ^The [sqlite3_value] object returned in *V is a protected sqlite3_value
-** and remains valid for the duration of the xBestIndex method call.
-** ^When xBestIndex returns, the sqlite3_value object returned by
-** sqlite3_vtab_rhs_value() is automatically deallocated.
-**
-** The "_rhs_" in the name of this routine is an appreviation for
-** "Right-Hand Side".
-*/
-SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **ppVal);
+#define SQLITE_VTAB_INNOCUOUS 2
+#define SQLITE_VTAB_DIRECTONLY 3
+
+    /*
+    ** CAPI3REF: Determine The Virtual Table Conflict Policy
+    **
+    ** This function may only be called from within a call to the [xUpdate] method
+    ** of a [virtual table] implementation for an INSERT or UPDATE operation. ^The
+    ** value returned is one of [SQLITE_ROLLBACK], [SQLITE_IGNORE], [SQLITE_FAIL],
+    ** [SQLITE_ABORT], or [SQLITE_REPLACE], according to the [ON CONFLICT] mode
+    ** of the SQL statement that triggered the call to the [xUpdate] method of the
+    ** [virtual table].
+    */
+    SQLITE_API int sqlite3_vtab_on_conflict(sqlite3*);
+
+    /*
+    ** CAPI3REF: Determine If Virtual Table Column Access Is For UPDATE
+    **
+    ** If the sqlite3_vtab_nochange(X) routine is called within the [xColumn]
+    ** method of a [virtual table], then it might return true if the
+    ** column is being fetched as part of an UPDATE operation during which the
+    ** column value will not change.  The virtual table implementation can use
+    ** this hint as permission to substitute a return value that is less
+    ** expensive to compute and that the corresponding
+    ** [xUpdate] method understands as a "no-change" value.
+    **
+    ** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
+    ** the column is not changed by the UPDATE statement, then the xColumn
+    ** method can optionally return without setting a result, without calling
+    ** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
+    ** In that case, [sqlite3_value_nochange(X)] will return true for the
+    ** same column in the [xUpdate] method.
+    **
+    ** The sqlite3_vtab_nochange() routine is an optimization.  Virtual table
+    ** implementations should continue to give a correct answer even if the
+    ** sqlite3_vtab_nochange() interface were to always return false.  In the
+    ** current implementation, the sqlite3_vtab_nochange() interface does always
+    ** returns false for the enhanced [UPDATE FROM] statement.
+    */
+    SQLITE_API int sqlite3_vtab_nochange(sqlite3_context*);
+
+    /*
+    ** CAPI3REF: Determine The Collation For a Virtual Table Constraint
+    ** METHOD: sqlite3_index_info
+    **
+    ** This function may only be called from within a call to the [xBestIndex]
+    ** method of a [virtual table].  This function returns a pointer to a string
+    ** that is the name of the appropriate collation sequence to use for text
+    ** comparisons on the constraint identified by its arguments.
+    **
+    ** The first argument must be the pointer to the [sqlite3_index_info] object
+    ** that is the first parameter to the xBestIndex() method. The second argument
+    ** must be an index into the aConstraint[] array belonging to the
+    ** sqlite3_index_info structure passed to xBestIndex.
+    **
+    ** Important:
+    ** The first parameter must be the same pointer that is passed into the
+    ** xBestMethod() method.  The first parameter may not be a pointer to a
+    ** different [sqlite3_index_info] object, even an exact copy.
+    **
+    ** The return value is computed as follows:
+    **
+    ** <ol>
+    ** <li><p> If the constraint comes from a WHERE clause expression that contains
+    **         a [COLLATE operator], then the name of the collation specified by
+    **         that COLLATE operator is returned.
+    ** <li><p> If there is no COLLATE operator, but the column that is the subject
+    **         of the constraint specifies an alternative collating sequence via
+    **         a [COLLATE clause] on the column definition within the CREATE TABLE
+    **         statement that was passed into [sqlite3_declare_vtab()], then the
+    **         name of that alternative collating sequence is returned.
+    ** <li><p> Otherwise, "BINARY" is returned.
+    ** </ol>
+    */
+    SQLITE_API SQLITE_EXPERIMENTAL const char* sqlite3_vtab_collation(sqlite3_index_info*, int);
+
+    /*
+    ** CAPI3REF: Determine if a virtual table query is DISTINCT
+    ** METHOD: sqlite3_index_info
+    **
+    ** This API may only be used from within an [xBestIndex|xBestIndex method]
+    ** of a [virtual table] implementation. The result of calling this
+    ** interface from outside of xBestIndex() is undefined and probably harmful.
+    **
+    ** ^The sqlite3_vtab_distinct() interface returns an integer that is
+    ** either 0, 1, or 2.  The integer returned by sqlite3_vtab_distinct()
+    ** gives the virtual table additional information about how the query
+    ** planner wants the output to be ordered. As long as the virtual table
+    ** can meet the ordering requirements of the query planner, it may set
+    ** the "orderByConsumed" flag.
+    **
+    ** <ol><li value="0"><p>
+    ** ^If the sqlite3_vtab_distinct() interface returns 0, that means
+    ** that the query planner needs the virtual table to return all rows in the
+    ** sort order defined by the "nOrderBy" and "aOrderBy" fields of the
+    ** [sqlite3_index_info] object.  This is the default expectation.  If the
+    ** virtual table outputs all rows in sorted order, then it is always safe for
+    ** the xBestIndex method to set the "orderByConsumed" flag, regardless of
+    ** the return value from sqlite3_vtab_distinct().
+    ** <li value="1"><p>
+    ** ^(If the sqlite3_vtab_distinct() interface returns 1, that means
+    ** that the query planner does not need the rows to be returned in sorted order
+    ** as long as all rows with the same values in all columns identified by the
+    ** "aOrderBy" field are adjacent.)^  This mode is used when the query planner
+    ** is doing a GROUP BY.
+    ** <li value="2"><p>
+    ** ^(If the sqlite3_vtab_distinct() interface returns 2, that means
+    ** that the query planner does not need the rows returned in any particular
+    ** order, as long as rows with the same values in all "aOrderBy" columns
+    ** are adjacent.)^  ^(Furthermore, only a single row for each particular
+    ** combination of values in the columns identified by the "aOrderBy" field
+    ** needs to be returned.)^  ^It is always ok for two or more rows with the same
+    ** values in all "aOrderBy" columns to be returned, as long as all such rows
+    ** are adjacent.  ^The virtual table may, if it chooses, omit extra rows
+    ** that have the same value for all columns identified by "aOrderBy".
+    ** ^However omitting the extra rows is optional.
+    ** This mode is used for a DISTINCT query.
+    ** </ol>
+    **
+    ** ^For the purposes of comparing virtual table output values to see if the
+    ** values are same value for sorting purposes, two NULL values are considered
+    ** to be the same.  In other words, the comparison operator is "IS"
+    ** (or "IS NOT DISTINCT FROM") and not "==".
+    **
+    ** If a virtual table implementation is unable to meet the requirements
+    ** specified above, then it must not set the "orderByConsumed" flag in the
+    ** [sqlite3_index_info] object or an incorrect answer may result.
+    **
+    ** ^A virtual table implementation is always free to return rows in any order
+    ** it wants, as long as the "orderByConsumed" flag is not set.  ^When the
+    ** the "orderByConsumed" flag is unset, the query planner will add extra
+    ** [bytecode] to ensure that the final results returned by the SQL query are
+    ** ordered correctly.  The use of the "orderByConsumed" flag and the
+    ** sqlite3_vtab_distinct() interface is merely an optimization.  ^Careful
+    ** use of the sqlite3_vtab_distinct() interface and the "orderByConsumed"
+    ** flag might help queries against a virtual table to run faster.  Being
+    ** overly aggressive and setting the "orderByConsumed" flag when it is not
+    ** valid to do so, on the other hand, might cause SQLite to return incorrect
+    ** results.
+    */
+    SQLITE_API int sqlite3_vtab_distinct(sqlite3_index_info*);
+
+    /*
+    ** CAPI3REF: Identify and handle IN constraints in xBestIndex
+    **
+    ** This interface may only be used from within an
+    ** [xBestIndex|xBestIndex() method] of a [virtual table] implementation.
+    ** The result of invoking this interface from any other context is
+    ** undefined and probably harmful.
+    **
+    ** ^(A constraint on a virtual table of the form
+    ** "[IN operator|column IN (...)]" is
+    ** communicated to the xBestIndex method as a
+    ** [SQLITE_INDEX_CONSTRAINT_EQ] constraint.)^  If xBestIndex wants to use
+    ** this constraint, it must set the corresponding
+    ** aConstraintUsage[].argvIndex to a postive integer.  ^(Then, under
+    ** the usual mode of handling IN operators, SQLite generates [bytecode]
+    ** that invokes the [xFilter|xFilter() method] once for each value
+    ** on the right-hand side of the IN operator.)^  Thus the virtual table
+    ** only sees a single value from the right-hand side of the IN operator
+    ** at a time.
+    **
+    ** In some cases, however, it would be advantageous for the virtual
+    ** table to see all values on the right-hand of the IN operator all at
+    ** once.  The sqlite3_vtab_in() interfaces facilitates this in two ways:
+    **
+    ** <ol>
+    ** <li><p>
+    **   ^A call to sqlite3_vtab_in(P,N,-1) will return true (non-zero)
+    **   if and only if the [sqlite3_index_info|P->aConstraint][N] constraint
+    **   is an [IN operator] that can be processed all at once.  ^In other words,
+    **   sqlite3_vtab_in() with -1 in the third argument is a mechanism
+    **   by which the virtual table can ask SQLite if all-at-once processing
+    **   of the IN operator is even possible.
+    **
+    ** <li><p>
+    **   ^A call to sqlite3_vtab_in(P,N,F) with F==1 or F==0 indicates
+    **   to SQLite that the virtual table does or does not want to process
+    **   the IN operator all-at-once, respectively.  ^Thus when the third
+    **   parameter (F) is non-negative, this interface is the mechanism by
+    **   which the virtual table tells SQLite how it wants to process the
+    **   IN operator.
+    ** </ol>
+    **
+    ** ^The sqlite3_vtab_in(P,N,F) interface can be invoked multiple times
+    ** within the same xBestIndex method call.  ^For any given P,N pair,
+    ** the return value from sqlite3_vtab_in(P,N,F) will always be the same
+    ** within the same xBestIndex call.  ^If the interface returns true
+    ** (non-zero), that means that the constraint is an IN operator
+    ** that can be processed all-at-once.  ^If the constraint is not an IN
+    ** operator or cannot be processed all-at-once, then the interface returns
+    ** false.
+    **
+    ** ^(All-at-once processing of the IN operator is selected if both of the
+    ** following conditions are met:
+    **
+    ** <ol>
+    ** <li><p> The P->aConstraintUsage[N].argvIndex value is set to a positive
+    ** integer.  This is how the virtual table tells SQLite that it wants to
+    ** use the N-th constraint.
+    **
+    ** <li><p> The last call to sqlite3_vtab_in(P,N,F) for which F was
+    ** non-negative had F>=1.
+    ** </ol>)^
+    **
+    ** ^If either or both of the conditions above are false, then SQLite uses
+    ** the traditional one-at-a-time processing strategy for the IN constraint.
+    ** ^If both conditions are true, then the argvIndex-th parameter to the
+    ** xFilter method will be an [sqlite3_value] that appears to be NULL,
+    ** but which can be passed to [sqlite3_vtab_in_first()] and
+    ** [sqlite3_vtab_in_next()] to find all values on the right-hand side
+    ** of the IN constraint.
+    */
+    SQLITE_API int sqlite3_vtab_in(sqlite3_index_info*, int iCons, int bHandle);
+
+    /*
+    ** CAPI3REF: Find all elements on the right-hand side of an IN constraint.
+    **
+    ** These interfaces are only useful from within the
+    ** [xFilter|xFilter() method] of a [virtual table] implementation.
+    ** The result of invoking these interfaces from any other context
+    ** is undefined and probably harmful.
+    **
+    ** The X parameter in a call to sqlite3_vtab_in_first(X,P) or
+    ** sqlite3_vtab_in_next(X,P) must be one of the parameters to the
+    ** xFilter method which invokes these routines, and specifically
+    ** a parameter that was previously selected for all-at-once IN constraint
+    ** processing use the [sqlite3_vtab_in()] interface in the
+    ** [xBestIndex|xBestIndex method].  ^(If the X parameter is not
+    ** an xFilter argument that was selected for all-at-once IN constraint
+    ** processing, then these routines return [SQLITE_MISUSE])^ or perhaps
+    ** exhibit some other undefined or harmful behavior.
+    **
+    ** ^(Use these routines to access all values on the right-hand side
+    ** of the IN constraint using code like the following:
+    **
+    ** <blockquote><pre>
+    ** &nbsp;  for(rc=sqlite3_vtab_in_first(pList, &pVal);
+    ** &nbsp;      rc==SQLITE_OK && pVal
+    ** &nbsp;      rc=sqlite3_vtab_in_next(pList, &pVal)
+    ** &nbsp;  ){
+    ** &nbsp;    // do something with pVal
+    ** &nbsp;  }
+    ** &nbsp;  if( rc!=SQLITE_OK ){
+    ** &nbsp;    // an error has occurred
+    ** &nbsp;  }
+    ** </pre></blockquote>)^
+    **
+    ** ^On success, the sqlite3_vtab_in_first(X,P) and sqlite3_vtab_in_next(X,P)
+    ** routines return SQLITE_OK and set *P to point to the first or next value
+    ** on the RHS of the IN constraint.  ^If there are no more values on the
+    ** right hand side of the IN constraint, then *P is set to NULL and these
+    ** routines return [SQLITE_DONE].  ^The return value might be
+    ** some other value, such as SQLITE_NOMEM, in the event of a malfunction.
+    **
+    ** The *ppOut values returned by these routines are only valid until the
+    ** next call to either of these routines or until the end of the xFilter
+    ** method from which these routines were called.  If the virtual table
+    ** implementation needs to retain the *ppOut values for longer, it must make
+    ** copies.  The *ppOut values are [protected sqlite3_value|protected].
+    */
+    SQLITE_API int sqlite3_vtab_in_first(sqlite3_value* pVal, sqlite3_value** ppOut);
+    SQLITE_API int sqlite3_vtab_in_next(sqlite3_value* pVal, sqlite3_value** ppOut);
+
+    /*
+    ** CAPI3REF: Constraint values in xBestIndex()
+    ** METHOD: sqlite3_index_info
+    **
+    ** This API may only be used from within the [xBestIndex|xBestIndex method]
+    ** of a [virtual table] implementation. The result of calling this interface
+    ** from outside of an xBestIndex method are undefined and probably harmful.
+    **
+    ** ^When the sqlite3_vtab_rhs_value(P,J,V) interface is invoked from within
+    ** the [xBestIndex] method of a [virtual table] implementation, with P being
+    ** a copy of the [sqlite3_index_info] object pointer passed into xBestIndex and
+    ** J being a 0-based index into P->aConstraint[], then this routine
+    ** attempts to set *V to the value of the right-hand operand of
+    ** that constraint if the right-hand operand is known.  ^If the
+    ** right-hand operand is not known, then *V is set to a NULL pointer.
+    ** ^The sqlite3_vtab_rhs_value(P,J,V) interface returns SQLITE_OK if
+    ** and only if *V is set to a value.  ^The sqlite3_vtab_rhs_value(P,J,V)
+    ** inteface returns SQLITE_NOTFOUND if the right-hand side of the J-th
+    ** constraint is not available.  ^The sqlite3_vtab_rhs_value() interface
+    ** can return an result code other than SQLITE_OK or SQLITE_NOTFOUND if
+    ** something goes wrong.
+    **
+    ** The sqlite3_vtab_rhs_value() interface is usually only successful if
+    ** the right-hand operand of a constraint is a literal value in the original
+    ** SQL statement.  If the right-hand operand is an expression or a reference
+    ** to some other column or a [host parameter], then sqlite3_vtab_rhs_value()
+    ** will probably return [SQLITE_NOTFOUND].
+    **
+    ** ^(Some constraints, such as [SQLITE_INDEX_CONSTRAINT_ISNULL] and
+    ** [SQLITE_INDEX_CONSTRAINT_ISNOTNULL], have no right-hand operand.  For such
+    ** constraints, sqlite3_vtab_rhs_value() always returns SQLITE_NOTFOUND.)^
+    **
+    ** ^The [sqlite3_value] object returned in *V is a protected sqlite3_value
+    ** and remains valid for the duration of the xBestIndex method call.
+    ** ^When xBestIndex returns, the sqlite3_value object returned by
+    ** sqlite3_vtab_rhs_value() is automatically deallocated.
+    **
+    ** The "_rhs_" in the name of this routine is an appreviation for
+    ** "Right-Hand Side".
+    */
+    SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value** ppVal);
 
 /*
 ** CAPI3REF: Conflict resolution modes
@@ -9786,9 +9713,9 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
 */
 #define SQLITE_ROLLBACK 1
 /* #define SQLITE_IGNORE 2 // Also used by sqlite3_authorizer() callback */
-#define SQLITE_FAIL     3
+#define SQLITE_FAIL 3
 /* #define SQLITE_ABORT 4  // Also an error code */
-#define SQLITE_REPLACE  5
+#define SQLITE_REPLACE 5
 
 /*
 ** CAPI3REF: Prepared Statement Scan Status Opcodes
@@ -9837,94 +9764,93 @@ SQLITE_API int sqlite3_vtab_rhs_value(sqlite3_index_info*, int, sqlite3_value **
 ** of an [EXPLAIN QUERY PLAN] query.
 ** </dl>
 */
-#define SQLITE_SCANSTAT_NLOOP    0
-#define SQLITE_SCANSTAT_NVISIT   1
-#define SQLITE_SCANSTAT_EST      2
-#define SQLITE_SCANSTAT_NAME     3
-#define SQLITE_SCANSTAT_EXPLAIN  4
+#define SQLITE_SCANSTAT_NLOOP 0
+#define SQLITE_SCANSTAT_NVISIT 1
+#define SQLITE_SCANSTAT_EST 2
+#define SQLITE_SCANSTAT_NAME 3
+#define SQLITE_SCANSTAT_EXPLAIN 4
 #define SQLITE_SCANSTAT_SELECTID 5
 
-/*
-** CAPI3REF: Prepared Statement Scan Status
-** METHOD: sqlite3_stmt
-**
-** This interface returns information about the predicted and measured
-** performance for pStmt.  Advanced applications can use this
-** interface to compare the predicted and the measured performance and
-** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
-**
-** Since this interface is expected to be rarely used, it is only
-** available if SQLite is compiled using the [SQLITE_ENABLE_STMT_SCANSTATUS]
-** compile-time option.
-**
-** The "iScanStatusOp" parameter determines which status information to return.
-** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
-** of this interface is undefined.
-** ^The requested measurement is written into a variable pointed to by
-** the "pOut" parameter.
-** Parameter "idx" identifies the specific loop to retrieve statistics for.
-** Loops are numbered starting from zero. ^If idx is out of range - less than
-** zero or greater than or equal to the total number of loops used to implement
-** the statement - a non-zero value is returned and the variable that pOut
-** points to is unchanged.
-**
-** ^Statistics might not be available for all loops in all statements. ^In cases
-** where there exist loops with no available statistics, this function behaves
-** as if the loop did not exist - it returns non-zero and leave the variable
-** that pOut points to unchanged.
-**
-** See also: [sqlite3_stmt_scanstatus_reset()]
-*/
-SQLITE_API int sqlite3_stmt_scanstatus(
-  sqlite3_stmt *pStmt,      /* Prepared statement for which info desired */
-  int idx,                  /* Index of loop to report on */
-  int iScanStatusOp,        /* Information desired.  SQLITE_SCANSTAT_* */
-  void *pOut                /* Result written here */
-);
-
-/*
-** CAPI3REF: Zero Scan-Status Counters
-** METHOD: sqlite3_stmt
-**
-** ^Zero all [sqlite3_stmt_scanstatus()] related event counters.
-**
-** This API is only available if the library is built with pre-processor
-** symbol [SQLITE_ENABLE_STMT_SCANSTATUS] defined.
-*/
-SQLITE_API void sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);
-
-/*
-** CAPI3REF: Flush caches to disk mid-transaction
-** METHOD: sqlite3
-**
-** ^If a write-transaction is open on [database connection] D when the
-** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
-** pages in the pager-cache that are not currently in use are written out
-** to disk. A dirty page may be in use if a database cursor created by an
-** active SQL statement is reading from it, or if it is page 1 of a database
-** file (page 1 is always "in use").  ^The [sqlite3_db_cacheflush(D)]
-** interface flushes caches for all schemas - "main", "temp", and
-** any [attached] databases.
-**
-** ^If this function needs to obtain extra database locks before dirty pages
-** can be flushed to disk, it does so. ^If those locks cannot be obtained
-** immediately and there is a busy-handler callback configured, it is invoked
-** in the usual manner. ^If the required lock still cannot be obtained, then
-** the database is skipped and an attempt made to flush any dirty pages
-** belonging to the next (if any) database. ^If any databases are skipped
-** because locks cannot be obtained, but no other error occurs, this
-** function returns SQLITE_BUSY.
-**
-** ^If any other error occurs while flushing dirty pages to disk (for
-** example an IO error or out-of-memory condition), then processing is
-** abandoned and an SQLite [error code] is returned to the caller immediately.
-**
-** ^Otherwise, if no error occurs, [sqlite3_db_cacheflush()] returns SQLITE_OK.
-**
-** ^This function does not set the database handle error code or message
-** returned by the [sqlite3_errcode()] and [sqlite3_errmsg()] functions.
-*/
-SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
+    /*
+    ** CAPI3REF: Prepared Statement Scan Status
+    ** METHOD: sqlite3_stmt
+    **
+    ** This interface returns information about the predicted and measured
+    ** performance for pStmt.  Advanced applications can use this
+    ** interface to compare the predicted and the measured performance and
+    ** issue warnings and/or rerun [ANALYZE] if discrepancies are found.
+    **
+    ** Since this interface is expected to be rarely used, it is only
+    ** available if SQLite is compiled using the [SQLITE_ENABLE_STMT_SCANSTATUS]
+    ** compile-time option.
+    **
+    ** The "iScanStatusOp" parameter determines which status information to return.
+    ** The "iScanStatusOp" must be one of the [scanstatus options] or the behavior
+    ** of this interface is undefined.
+    ** ^The requested measurement is written into a variable pointed to by
+    ** the "pOut" parameter.
+    ** Parameter "idx" identifies the specific loop to retrieve statistics for.
+    ** Loops are numbered starting from zero. ^If idx is out of range - less than
+    ** zero or greater than or equal to the total number of loops used to implement
+    ** the statement - a non-zero value is returned and the variable that pOut
+    ** points to is unchanged.
+    **
+    ** ^Statistics might not be available for all loops in all statements. ^In cases
+    ** where there exist loops with no available statistics, this function behaves
+    ** as if the loop did not exist - it returns non-zero and leave the variable
+    ** that pOut points to unchanged.
+    **
+    ** See also: [sqlite3_stmt_scanstatus_reset()]
+    */
+    SQLITE_API int sqlite3_stmt_scanstatus(sqlite3_stmt* pStmt, /* Prepared statement for which info desired */
+                                           int idx,             /* Index of loop to report on */
+                                           int iScanStatusOp,   /* Information desired.  SQLITE_SCANSTAT_* */
+                                           void* pOut           /* Result written here */
+    );
+
+    /*
+    ** CAPI3REF: Zero Scan-Status Counters
+    ** METHOD: sqlite3_stmt
+    **
+    ** ^Zero all [sqlite3_stmt_scanstatus()] related event counters.
+    **
+    ** This API is only available if the library is built with pre-processor
+    ** symbol [SQLITE_ENABLE_STMT_SCANSTATUS] defined.
+    */
+    SQLITE_API void sqlite3_stmt_scanstatus_reset(sqlite3_stmt*);
+
+    /*
+    ** CAPI3REF: Flush caches to disk mid-transaction
+    ** METHOD: sqlite3
+    **
+    ** ^If a write-transaction is open on [database connection] D when the
+    ** [sqlite3_db_cacheflush(D)] interface invoked, any dirty
+    ** pages in the pager-cache that are not currently in use are written out
+    ** to disk. A dirty page may be in use if a database cursor created by an
+    ** active SQL statement is reading from it, or if it is page 1 of a database
+    ** file (page 1 is always "in use").  ^The [sqlite3_db_cacheflush(D)]
+    ** interface flushes caches for all schemas - "main", "temp", and
+    ** any [attached] databases.
+    **
+    ** ^If this function needs to obtain extra database locks before dirty pages
+    ** can be flushed to disk, it does so. ^If those locks cannot be obtained
+    ** immediately and there is a busy-handler callback configured, it is invoked
+    ** in the usual manner. ^If the required lock still cannot be obtained, then
+    ** the database is skipped and an attempt made to flush any dirty pages
+    ** belonging to the next (if any) database. ^If any databases are skipped
+    ** because locks cannot be obtained, but no other error occurs, this
+    ** function returns SQLITE_BUSY.
+    **
+    ** ^If any other error occurs while flushing dirty pages to disk (for
+    ** example an IO error or out-of-memory condition), then processing is
+    ** abandoned and an SQLite [error code] is returned to the caller immediately.
+    **
+    ** ^Otherwise, if no error occurs, [sqlite3_db_cacheflush()] returns SQLITE_OK.
+    **
+    ** ^This function does not set the database handle error code or message
+    ** returned by the [sqlite3_errcode()] and [sqlite3_errmsg()] functions.
+    */
+    SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
 
 /*
 ** CAPI3REF: The pre-update hook.
@@ -9999,1731 +9925,1689 @@ SQLITE_API int sqlite3_db_cacheflush(sqlite3*);
 ** undefined. This must only be used within SQLITE_INSERT and SQLITE_UPDATE
 ** preupdate callbacks; if it is used by an SQLITE_DELETE callback then the
 ** behavior is undefined.  The [sqlite3_value] that P points to
-** will be destroyed when the preupdate callback returns.
-**
-** ^The [sqlite3_preupdate_depth(D)] interface returns 0 if the preupdate
-** callback was invoked as a result of a direct insert, update, or delete
-** operation; or 1 for inserts, updates, or deletes invoked by top-level
-** triggers; or 2 for changes resulting from triggers called by top-level
-** triggers; and so forth.
-**
-** When the [sqlite3_blob_write()] API is used to update a blob column,
-** the pre-update hook is invoked with SQLITE_DELETE. This is because the
-** in this case the new values are not available. In this case, when a
-** callback made with op==SQLITE_DELETE is actuall a write using the
-** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
-** the index of the column being written. In other cases, where the
-** pre-update hook is being invoked for some other reason, including a
-** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
-**
-** See also:  [sqlite3_update_hook()]
-*/
-#if defined(SQLITE_ENABLE_PREUPDATE_HOOK)
-SQLITE_API void *sqlite3_preupdate_hook(
-  sqlite3 *db,
-  void(*xPreUpdate)(
-    void *pCtx,                   /* Copy of third arg to preupdate_hook() */
-    sqlite3 *db,                  /* Database handle */
-    int op,                       /* SQLITE_UPDATE, DELETE or INSERT */
-    char const *zDb,              /* Database name */
-    char const *zName,            /* Table name */
-    sqlite3_int64 iKey1,          /* Rowid of row about to be deleted/updated */
-    sqlite3_int64 iKey2           /* New rowid value (for a rowid UPDATE) */
-  ),
-  void*
-);
-SQLITE_API int sqlite3_preupdate_old(sqlite3 *, int, sqlite3_value **);
-SQLITE_API int sqlite3_preupdate_count(sqlite3 *);
-SQLITE_API int sqlite3_preupdate_depth(sqlite3 *);
-SQLITE_API int sqlite3_preupdate_new(sqlite3 *, int, sqlite3_value **);
-SQLITE_API int sqlite3_preupdate_blobwrite(sqlite3 *);
-#endif
-
-/*
-** CAPI3REF: Low-level system error code
-** METHOD: sqlite3
-**
-** ^Attempt to return the underlying operating system error code or error
-** number that caused the most recent I/O error or failure to open a file.
-** The return value is OS-dependent.  For example, on unix systems, after
-** [sqlite3_open_v2()] returns [SQLITE_CANTOPEN], this interface could be
-** called to get back the underlying "errno" that caused the problem, such
-** as ENOSPC, EAUTH, EISDIR, and so forth.
-*/
-SQLITE_API int sqlite3_system_errno(sqlite3*);
-
-/*
-** CAPI3REF: Database Snapshot
-** KEYWORDS: {snapshot} {sqlite3_snapshot}
-**
-** An instance of the snapshot object records the state of a [WAL mode]
-** database for some specific point in history.
-**
-** In [WAL mode], multiple [database connections] that are open on the
-** same database file can each be reading a different historical version
-** of the database file.  When a [database connection] begins a read
-** transaction, that connection sees an unchanging copy of the database
-** as it existed for the point in time when the transaction first started.
-** Subsequent changes to the database from other connections are not seen
-** by the reader until a new read transaction is started.
-**
-** The sqlite3_snapshot object records state information about an historical
-** version of the database file so that it is possible to later open a new read
-** transaction that sees that historical version of the database rather than
-** the most recent version.
-*/
-typedef struct sqlite3_snapshot {
-  unsigned char hidden[48];
-} sqlite3_snapshot;
-
-/*
-** CAPI3REF: Record A Database Snapshot
-** CONSTRUCTOR: sqlite3_snapshot
-**
-** ^The [sqlite3_snapshot_get(D,S,P)] interface attempts to make a
-** new [sqlite3_snapshot] object that records the current state of
-** schema S in database connection D.  ^On success, the
-** [sqlite3_snapshot_get(D,S,P)] interface writes a pointer to the newly
-** created [sqlite3_snapshot] object into *P and returns SQLITE_OK.
-** If there is not already a read-transaction open on schema S when
-** this function is called, one is opened automatically.
-**
-** The following must be true for this function to succeed. If any of
-** the following statements are false when sqlite3_snapshot_get() is
-** called, SQLITE_ERROR is returned. The final value of *P is undefined
-** in this case.
-**
-** <ul>
-**   <li> The database handle must not be in [autocommit mode].
-**
-**   <li> Schema S of [database connection] D must be a [WAL mode] database.
-**
-**   <li> There must not be a write transaction open on schema S of database
-**        connection D.
-**
-**   <li> One or more transactions must have been written to the current wal
-**        file since it was created on disk (by any connection). This means
-**        that a snapshot cannot be taken on a wal mode database with no wal
-**        file immediately after it is first opened. At least one transaction
-**        must be written to it first.
-** </ul>
-**
-** This function may also return SQLITE_NOMEM.  If it is called with the
-** database handle in autocommit mode but fails for some other reason,
-** whether or not a read transaction is opened on schema S is undefined.
-**
-** The [sqlite3_snapshot] object returned from a successful call to
-** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
-** to avoid a memory leak.
-**
-** The [sqlite3_snapshot_get()] interface is only available when the
-** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_get(
-  sqlite3 *db,
-  const char *zSchema,
-  sqlite3_snapshot **ppSnapshot
-);
-
-/*
-** CAPI3REF: Start a read transaction on an historical snapshot
-** METHOD: sqlite3_snapshot
-**
-** ^The [sqlite3_snapshot_open(D,S,P)] interface either starts a new read
-** transaction or upgrades an existing one for schema S of
-** [database connection] D such that the read transaction refers to
-** historical [snapshot] P, rather than the most recent change to the
-** database. ^The [sqlite3_snapshot_open()] interface returns SQLITE_OK
-** on success or an appropriate [error code] if it fails.
-**
-** ^In order to succeed, the database connection must not be in
-** [autocommit mode] when [sqlite3_snapshot_open(D,S,P)] is called. If there
-** is already a read transaction open on schema S, then the database handle
-** must have no active statements (SELECT statements that have been passed
-** to sqlite3_step() but not sqlite3_reset() or sqlite3_finalize()).
-** SQLITE_ERROR is returned if either of these conditions is violated, or
-** if schema S does not exist, or if the snapshot object is invalid.
-**
-** ^A call to sqlite3_snapshot_open() will fail to open if the specified
-** snapshot has been overwritten by a [checkpoint]. In this case
-** SQLITE_ERROR_SNAPSHOT is returned.
-**
-** If there is already a read transaction open when this function is
-** invoked, then the same read transaction remains open (on the same
-** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_ERROR_SNAPSHOT
-** is returned. If another error code - for example SQLITE_PROTOCOL or an
-** SQLITE_IOERR error code - is returned, then the final state of the
-** read transaction is undefined. If SQLITE_OK is returned, then the
-** read transaction is now open on database snapshot P.
-**
-** ^(A call to [sqlite3_snapshot_open(D,S,P)] will fail if the
-** database connection D does not know that the database file for
-** schema S is in [WAL mode].  A database connection might not know
-** that the database file is in [WAL mode] if there has been no prior
-** I/O on that database connection, or if the database entered [WAL mode]
-** after the most recent I/O on the database connection.)^
-** (Hint: Run "[PRAGMA application_id]" against a newly opened
-** database connection in order to make it ready to use snapshots.)
-**
-** The [sqlite3_snapshot_open()] interface is only available when the
-** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_open(
-  sqlite3 *db,
-  const char *zSchema,
-  sqlite3_snapshot *pSnapshot
-);
-
-/*
-** CAPI3REF: Destroy a snapshot
-** DESTRUCTOR: sqlite3_snapshot
-**
-** ^The [sqlite3_snapshot_free(P)] interface destroys [sqlite3_snapshot] P.
-** The application must eventually free every [sqlite3_snapshot] object
-** using this routine to avoid a memory leak.
-**
-** The [sqlite3_snapshot_free()] interface is only available when the
-** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL void sqlite3_snapshot_free(sqlite3_snapshot*);
-
-/*
-** CAPI3REF: Compare the ages of two snapshot handles.
-** METHOD: sqlite3_snapshot
-**
-** The sqlite3_snapshot_cmp(P1, P2) interface is used to compare the ages
-** of two valid snapshot handles.
-**
-** If the two snapshot handles are not associated with the same database
-** file, the result of the comparison is undefined.
-**
-** Additionally, the result of the comparison is only valid if both of the
-** snapshot handles were obtained by calling sqlite3_snapshot_get() since the
-** last time the wal file was deleted. The wal file is deleted when the
-** database is changed back to rollback mode or when the number of database
-** clients drops to zero. If either snapshot handle was obtained before the
-** wal file was last deleted, the value returned by this function
-** is undefined.
-**
-** Otherwise, this API returns a negative value if P1 refers to an older
-** snapshot than P2, zero if the two handles refer to the same database
-** snapshot, and a positive value if P1 is a newer snapshot than P2.
-**
-** This interface is only available if SQLite is compiled with the
-** [SQLITE_ENABLE_SNAPSHOT] option.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(
-  sqlite3_snapshot *p1,
-  sqlite3_snapshot *p2
-);
-
-/*
-** CAPI3REF: Recover snapshots from a wal file
-** METHOD: sqlite3_snapshot
-**
-** If a [WAL file] remains on disk after all database connections close
-** (either through the use of the [SQLITE_FCNTL_PERSIST_WAL] [file control]
-** or because the last process to have the database opened exited without
-** calling [sqlite3_close()]) and a new connection is subsequently opened
-** on that database and [WAL file], the [sqlite3_snapshot_open()] interface
-** will only be able to open the last transaction added to the WAL file
-** even though the WAL file contains other valid transactions.
-**
-** This function attempts to scan the WAL file associated with database zDb
-** of database handle db and make all valid snapshots available to
-** sqlite3_snapshot_open(). It is an error if there is already a read
-** transaction open on the database, or if the database is not a WAL mode
-** database.
-**
-** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
-**
-** This interface is only available if SQLite is compiled with the
-** [SQLITE_ENABLE_SNAPSHOT] option.
-*/
-SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3 *db, const char *zDb);
-
-/*
-** CAPI3REF: Serialize a database
-**
-** The sqlite3_serialize(D,S,P,F) interface returns a pointer to memory
-** that is a serialization of the S database on [database connection] D.
-** If P is not a NULL pointer, then the size of the database in bytes
-** is written into *P.
-**
-** For an ordinary on-disk database file, the serialization is just a
-** copy of the disk file.  For an in-memory database or a "TEMP" database,
-** the serialization is the same sequence of bytes which would be written
-** to disk if that database where backed up to disk.
-**
-** The usual case is that sqlite3_serialize() copies the serialization of
-** the database into memory obtained from [sqlite3_malloc64()] and returns
-** a pointer to that memory.  The caller is responsible for freeing the
-** returned value to avoid a memory leak.  However, if the F argument
-** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
-** are made, and the sqlite3_serialize() function will return a pointer
-** to the contiguous memory representation of the database that SQLite
-** is currently using for that database, or NULL if the no such contiguous
-** memory representation of the database exists.  A contiguous memory
-** representation of the database will usually only exist if there has
-** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
-** values of D and S.
-** The size of the database is written into *P even if the
-** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
-** of the database exists.
-**
-** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the
-** SQLITE_SERIALIZE_NOCOPY bit is omitted from argument F if a memory
-** allocation error occurs.
-**
-** This interface is omitted if SQLite is compiled with the
-** [SQLITE_OMIT_DESERIALIZE] option.
-*/
-SQLITE_API unsigned char *sqlite3_serialize(
-  sqlite3 *db,           /* The database connection */
-  const char *zSchema,   /* Which DB to serialize. ex: "main", "temp", ... */
-  sqlite3_int64 *piSize, /* Write size of the DB here, if not NULL */
-  unsigned int mFlags    /* Zero or more SQLITE_SERIALIZE_* flags */
-);
-
-/*
-** CAPI3REF: Flags for sqlite3_serialize
-**
-** Zero or more of the following constants can be OR-ed together for
-** the F argument to [sqlite3_serialize(D,S,P,F)].
-**
-** SQLITE_SERIALIZE_NOCOPY means that [sqlite3_serialize()] will return
-** a pointer to contiguous in-memory database that it is currently using,
-** without making a copy of the database.  If SQLite is not currently using
-** a contiguous in-memory database, then this option causes
-** [sqlite3_serialize()] to return a NULL pointer.  SQLite will only be
-** using a contiguous in-memory database if it has been initialized by a
-** prior call to [sqlite3_deserialize()].
-*/
-#define SQLITE_SERIALIZE_NOCOPY 0x001   /* Do no memory allocations */
-
-/*
-** CAPI3REF: Deserialize a database
-**
-** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the
-** [database connection] D to disconnect from database S and then
-** reopen S as an in-memory database based on the serialization contained
-** in P.  The serialized database P is N bytes in size.  M is the size of
-** the buffer P, which might be larger than N.  If M is larger than N, and
-** the SQLITE_DESERIALIZE_READONLY bit is not set in F, then SQLite is
-** permitted to add content to the in-memory database as long as the total
-** size does not exceed M bytes.
-**
-** If the SQLITE_DESERIALIZE_FREEONCLOSE bit is set in F, then SQLite will
-** invoke sqlite3_free() on the serialization buffer when the database
-** connection closes.  If the SQLITE_DESERIALIZE_RESIZEABLE bit is set, then
-** SQLite will try to increase the buffer size using sqlite3_realloc64()
-** if writes on the database cause it to grow larger than M bytes.
-**
-** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
-** database is currently in a read transaction or is involved in a backup
-** operation.
-**
-** It is not possible to deserialized into the TEMP database.  If the
-** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
-** function returns SQLITE_ERROR.
-**
-** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the
-** SQLITE_DESERIALIZE_FREEONCLOSE bit is set in argument F, then
-** [sqlite3_free()] is invoked on argument P prior to returning.
-**
-** This interface is omitted if SQLite is compiled with the
-** [SQLITE_OMIT_DESERIALIZE] option.
-*/
-SQLITE_API int sqlite3_deserialize(
-  sqlite3 *db,            /* The database connection */
-  const char *zSchema,    /* Which DB to reopen with the deserialization */
-  unsigned char *pData,   /* The serialized database content */
-  sqlite3_int64 szDb,     /* Number bytes in the deserialization */
-  sqlite3_int64 szBuf,    /* Total size of buffer pData[] */
-  unsigned mFlags         /* Zero or more SQLITE_DESERIALIZE_* flags */
-);
-
-/*
-** CAPI3REF: Flags for sqlite3_deserialize()
-**
-** The following are allowed values for 6th argument (the F argument) to
-** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
-**
-** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
-** in the P argument is held in memory obtained from [sqlite3_malloc64()]
-** and that SQLite should take ownership of this memory and automatically
-** free it when it has finished using it.  Without this flag, the caller
-** is responsible for freeing any dynamically allocated memory.
-**
-** The SQLITE_DESERIALIZE_RESIZEABLE flag means that SQLite is allowed to
-** grow the size of the database using calls to [sqlite3_realloc64()].  This
-** flag should only be used if SQLITE_DESERIALIZE_FREEONCLOSE is also used.
-** Without this flag, the deserialized database cannot increase in size beyond
-** the number of bytes specified by the M parameter.
-**
-** The SQLITE_DESERIALIZE_READONLY flag means that the deserialized database
-** should be treated as read-only.
-*/
-#define SQLITE_DESERIALIZE_FREEONCLOSE 1 /* Call sqlite3_free() on close */
-#define SQLITE_DESERIALIZE_RESIZEABLE  2 /* Resize using sqlite3_realloc64() */
-#define SQLITE_DESERIALIZE_READONLY    4 /* Database is read-only */
-
-/*
-** Undo the hack that converts floating point types to integer for
-** builds on processors without floating point support.
-*/
-#ifdef SQLITE_OMIT_FLOATING_POINT
-# undef double
-#endif
-
-#ifdef __cplusplus
-}  /* End of the 'extern "C"' block */
-#endif
-#endif /* SQLITE3_H */
-
-/******** Begin file sqlite3rtree.h *********/
-/*
-** 2010 August 30
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-*************************************************************************
-*/
-
-#ifndef _SQLITE3RTREE_H_
-#define _SQLITE3RTREE_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
-typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
-
-/* The double-precision datatype used by RTree depends on the
-** SQLITE_RTREE_INT_ONLY compile-time option.
-*/
-#ifdef SQLITE_RTREE_INT_ONLY
-  typedef sqlite3_int64 sqlite3_rtree_dbl;
-#else
-  typedef double sqlite3_rtree_dbl;
-#endif
-
-/*
-** Register a geometry callback named zGeom that can be used as part of an
-** R-Tree geometry query as follows:
-**
-**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zGeom(... params ...)
-*/
-SQLITE_API int sqlite3_rtree_geometry_callback(
-  sqlite3 *db,
-  const char *zGeom,
-  int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*,int*),
-  void *pContext
-);
-
-
-/*
-** A pointer to a structure of the following type is passed as the first
-** argument to callbacks registered using rtree_geometry_callback().
-*/
-struct sqlite3_rtree_geometry {
-  void *pContext;                 /* Copy of pContext passed to s_r_g_c() */
-  int nParam;                     /* Size of array aParam[] */
-  sqlite3_rtree_dbl *aParam;      /* Parameters passed to SQL geom function */
-  void *pUser;                    /* Callback implementation user data */
-  void (*xDelUser)(void *);       /* Called by SQLite to clean up pUser */
-};
-
-/*
-** Register a 2nd-generation geometry callback named zScore that can be
-** used as part of an R-Tree geometry query as follows:
-**
-**   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)
-*/
-SQLITE_API int sqlite3_rtree_query_callback(
-  sqlite3 *db,
-  const char *zQueryFunc,
-  int (*xQueryFunc)(sqlite3_rtree_query_info*),
-  void *pContext,
-  void (*xDestructor)(void*)
-);
-
-
-/*
-** A pointer to a structure of the following type is passed as the
-** argument to scored geometry callback registered using
-** sqlite3_rtree_query_callback().
-**
-** Note that the first 5 fields of this structure are identical to
-** sqlite3_rtree_geometry.  This structure is a subclass of
-** sqlite3_rtree_geometry.
-*/
-struct sqlite3_rtree_query_info {
-  void *pContext;                   /* pContext from when function registered */
-  int nParam;                       /* Number of function parameters */
-  sqlite3_rtree_dbl *aParam;        /* value of function parameters */
-  void *pUser;                      /* callback can use this, if desired */
-  void (*xDelUser)(void*);          /* function to free pUser */
-  sqlite3_rtree_dbl *aCoord;        /* Coordinates of node or entry to check */
-  unsigned int *anQueue;            /* Number of pending entries in the queue */
-  int nCoord;                       /* Number of coordinates */
-  int iLevel;                       /* Level of current node or entry */
-  int mxLevel;                      /* The largest iLevel value in the tree */
-  sqlite3_int64 iRowid;             /* Rowid for current entry */
-  sqlite3_rtree_dbl rParentScore;   /* Score of parent node */
-  int eParentWithin;                /* Visibility of parent node */
-  int eWithin;                      /* OUT: Visibility */
-  sqlite3_rtree_dbl rScore;         /* OUT: Write the score here */
-  /* The following fields are only available in 3.8.11 and later */
-  sqlite3_value **apSqlParam;       /* Original SQL values of parameters */
-};
-
-/*
-** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
-*/
-#define NOT_WITHIN       0   /* Object completely outside of query region */
-#define PARTLY_WITHIN    1   /* Object partially overlaps query region */
-#define FULLY_WITHIN     2   /* Object fully contained within query region */
-
-
-#ifdef __cplusplus
-}  /* end of the 'extern "C"' block */
-#endif
-
-#endif  /* ifndef _SQLITE3RTREE_H_ */
-
-/******** End of sqlite3rtree.h *********/
-/******** Begin file sqlite3session.h *********/
-
-#if !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION)
-#define __SQLITESESSION_H_ 1
-
-/*
-** Make sure we can call this stuff from C++.
-*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*
-** CAPI3REF: Session Object Handle
-**
-** An instance of this object is a [session] that can be used to
-** record changes to a database.
-*/
-typedef struct sqlite3_session sqlite3_session;
-
-/*
-** CAPI3REF: Changeset Iterator Handle
-**
-** An instance of this object acts as a cursor for iterating
-** over the elements of a [changeset] or [patchset].
-*/
-typedef struct sqlite3_changeset_iter sqlite3_changeset_iter;
-
-/*
-** CAPI3REF: Create A New Session Object
-** CONSTRUCTOR: sqlite3_session
-**
-** Create a new session object attached to database handle db. If successful,
-** a pointer to the new object is written to *ppSession and SQLITE_OK is
-** returned. If an error occurs, *ppSession is set to NULL and an SQLite
-** error code (e.g. SQLITE_NOMEM) is returned.
-**
-** It is possible to create multiple session objects attached to a single
-** database handle.
-**
-** Session objects created using this function should be deleted using the
-** [sqlite3session_delete()] function before the database handle that they
-** are attached to is itself closed. If the database handle is closed before
-** the session object is deleted, then the results of calling any session
-** module function, including [sqlite3session_delete()] on the session object
-** are undefined.
-**
-** Because the session module uses the [sqlite3_preupdate_hook()] API, it
-** is not possible for an application to register a pre-update hook on a
-** database handle that has one or more session objects attached. Nor is
-** it possible to create a session object attached to a database handle for
-** which a pre-update hook is already defined. The results of attempting
-** either of these things are undefined.
-**
-** The session object will be used to create changesets for tables in
-** database zDb, where zDb is either "main", or "temp", or the name of an
-** attached database. It is not an error if database zDb is not attached
-** to the database when the session object is created.
-*/
-SQLITE_API int sqlite3session_create(
-  sqlite3 *db,                    /* Database handle */
-  const char *zDb,                /* Name of db (e.g. "main") */
-  sqlite3_session **ppSession     /* OUT: New session object */
-);
-
-/*
-** CAPI3REF: Delete A Session Object
-** DESTRUCTOR: sqlite3_session
-**
-** Delete a session object previously allocated using
-** [sqlite3session_create()]. Once a session object has been deleted, the
-** results of attempting to use pSession with any other session module
-** function are undefined.
-**
-** Session objects must be deleted before the database handle to which they
-** are attached is closed. Refer to the documentation for
-** [sqlite3session_create()] for details.
-*/
-SQLITE_API void sqlite3session_delete(sqlite3_session *pSession);
-
-/*
-** CAPIREF: Conigure a Session Object
-** METHOD: sqlite3_session
-**
-** This method is used to configure a session object after it has been
-** created. At present the only valid value for the second parameter is
-** [SQLITE_SESSION_OBJCONFIG_SIZE].
-**
-** Arguments for sqlite3session_object_config()
-**
-** The following values may passed as the the 4th parameter to
-** sqlite3session_object_config().
-**
-** <dt>SQLITE_SESSION_OBJCONFIG_SIZE <dd>
-**   This option is used to set, clear or query the flag that enables
-**   the [sqlite3session_changeset_size()] API. Because it imposes some
-**   computational overhead, this API is disabled by default. Argument
-**   pArg must point to a value of type (int). If the value is initially
-**   0, then the sqlite3session_changeset_size() API is disabled. If it
-**   is greater than 0, then the same API is enabled. Or, if the initial
-**   value is less than zero, no change is made. In all cases the (int)
-**   variable is set to 1 if the sqlite3session_changeset_size() API is
-**   enabled following the current call, or 0 otherwise.
-**
-**   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
-**   the first table has been attached to the session object.
-*/
-SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void *pArg);
-
-/*
-*/
-#define SQLITE_SESSION_OBJCONFIG_SIZE 1
-
-/*
-** CAPI3REF: Enable Or Disable A Session Object
-** METHOD: sqlite3_session
-**
-** Enable or disable the recording of changes by a session object. When
-** enabled, a session object records changes made to the database. When
-** disabled - it does not. A newly created session object is enabled.
-** Refer to the documentation for [sqlite3session_changeset()] for further
-** details regarding how enabling and disabling a session object affects
-** the eventual changesets.
-**
-** Passing zero to this function disables the session. Passing a value
-** greater than zero enables it. Passing a value less than zero is a
-** no-op, and may be used to query the current state of the session.
-**
-** The return value indicates the final state of the session object: 0 if
-** the session is disabled, or 1 if it is enabled.
-*/
-SQLITE_API int sqlite3session_enable(sqlite3_session *pSession, int bEnable);
-
-/*
-** CAPI3REF: Set Or Clear the Indirect Change Flag
-** METHOD: sqlite3_session
-**
-** Each change recorded by a session object is marked as either direct or
-** indirect. A change is marked as indirect if either:
-**
-** <ul>
-**   <li> The session object "indirect" flag is set when the change is
-**        made, or
-**   <li> The change is made by an SQL trigger or foreign key action
-**        instead of directly as a result of a users SQL statement.
-** </ul>
-**
-** If a single row is affected by more than one operation within a session,
-** then the change is considered indirect if all operations meet the criteria
-** for an indirect change above, or direct otherwise.
-**
-** This function is used to set, clear or query the session object indirect
-** flag.  If the second argument passed to this function is zero, then the
-** indirect flag is cleared. If it is greater than zero, the indirect flag
-** is set. Passing a value less than zero does not modify the current value
-** of the indirect flag, and may be used to query the current state of the
-** indirect flag for the specified session object.
-**
-** The return value indicates the final state of the indirect flag: 0 if
-** it is clear, or 1 if it is set.
-*/
-SQLITE_API int sqlite3session_indirect(sqlite3_session *pSession, int bIndirect);
-
-/*
-** CAPI3REF: Attach A Table To A Session Object
-** METHOD: sqlite3_session
-**
-** If argument zTab is not NULL, then it is the name of a table to attach
-** to the session object passed as the first argument. All subsequent changes
-** made to the table while the session object is enabled will be recorded. See
-** documentation for [sqlite3session_changeset()] for further details.
-**
-** Or, if argument zTab is NULL, then changes are recorded for all tables
-** in the database. If additional tables are added to the database (by
-** executing "CREATE TABLE" statements) after this call is made, changes for
-** the new tables are also recorded.
-**
-** Changes can only be recorded for tables that have a PRIMARY KEY explicitly
-** defined as part of their CREATE TABLE statement. It does not matter if the
-** PRIMARY KEY is an "INTEGER PRIMARY KEY" (rowid alias) or not. The PRIMARY
-** KEY may consist of a single column, or may be a composite key.
-**
-** It is not an error if the named table does not exist in the database. Nor
-** is it an error if the named table does not have a PRIMARY KEY. However,
-** no changes will be recorded in either of these scenarios.
-**
-** Changes are not recorded for individual rows that have NULL values stored
-** in one or more of their PRIMARY KEY columns.
-**
-** SQLITE_OK is returned if the call completes without error. Or, if an error
-** occurs, an SQLite error code (e.g. SQLITE_NOMEM) is returned.
-**
-** <h3>Special sqlite_stat1 Handling</h3>
-**
-** As of SQLite version 3.22.0, the "sqlite_stat1" table is an exception to
-** some of the rules above. In SQLite, the schema of sqlite_stat1 is:
-**  <pre>
-**  &nbsp;     CREATE TABLE sqlite_stat1(tbl,idx,stat)
-**  </pre>
-**
-** Even though sqlite_stat1 does not have a PRIMARY KEY, changes are
-** recorded for it as if the PRIMARY KEY is (tbl,idx). Additionally, changes
-** are recorded for rows for which (idx IS NULL) is true. However, for such
-** rows a zero-length blob (SQL value X'') is stored in the changeset or
-** patchset instead of a NULL value. This allows such changesets to be
-** manipulated by legacy implementations of sqlite3changeset_invert(),
-** concat() and similar.
-**
-** The sqlite3changeset_apply() function automatically converts the
-** zero-length blob back to a NULL value when updating the sqlite_stat1
-** table. However, if the application calls sqlite3changeset_new(),
-** sqlite3changeset_old() or sqlite3changeset_conflict on a changeset
-** iterator directly (including on a changeset iterator passed to a
-** conflict-handler callback) then the X'' value is returned. The application
-** must translate X'' to NULL itself if required.
-**
-** Legacy (older than 3.22.0) versions of the sessions module cannot capture
-** changes made to the sqlite_stat1 table. Legacy versions of the
-** sqlite3changeset_apply() function silently ignore any modifications to the
-** sqlite_stat1 table that are part of a changeset or patchset.
-*/
-SQLITE_API int sqlite3session_attach(
-  sqlite3_session *pSession,      /* Session object */
-  const char *zTab                /* Table name */
-);
-
-/*
-** CAPI3REF: Set a table filter on a Session Object.
-** METHOD: sqlite3_session
-**
-** The second argument (xFilter) is the "filter callback". For changes to rows
-** in tables that are not attached to the Session object, the filter is called
-** to determine whether changes to the table's rows should be tracked or not.
-** If xFilter returns 0, changes are not tracked. Note that once a table is
-** attached, xFilter will not be called again.
-*/
-SQLITE_API void sqlite3session_table_filter(
-  sqlite3_session *pSession,      /* Session object */
-  int(*xFilter)(
-    void *pCtx,                   /* Copy of third arg to _filter_table() */
-    const char *zTab              /* Table name */
-  ),
-  void *pCtx                      /* First argument passed to xFilter */
-);
-
-/*
-** CAPI3REF: Generate A Changeset From A Session Object
-** METHOD: sqlite3_session
-**
-** Obtain a changeset containing changes to the tables attached to the
-** session object passed as the first argument. If successful,
-** set *ppChangeset to point to a buffer containing the changeset
-** and *pnChangeset to the size of the changeset in bytes before returning
-** SQLITE_OK. If an error occurs, set both *ppChangeset and *pnChangeset to
-** zero and return an SQLite error code.
-**
-** A changeset consists of zero or more INSERT, UPDATE and/or DELETE changes,
-** each representing a change to a single row of an attached table. An INSERT
-** change contains the values of each field of a new database row. A DELETE
-** contains the original values of each field of a deleted database row. An
-** UPDATE change contains the original values of each field of an updated
-** database row along with the updated values for each updated non-primary-key
-** column. It is not possible for an UPDATE change to represent a change that
-** modifies the values of primary key columns. If such a change is made, it
-** is represented in a changeset as a DELETE followed by an INSERT.
-**
-** Changes are not recorded for rows that have NULL values stored in one or
-** more of their PRIMARY KEY columns. If such a row is inserted or deleted,
-** no corresponding change is present in the changesets returned by this
-** function. If an existing row with one or more NULL values stored in
-** PRIMARY KEY columns is updated so that all PRIMARY KEY columns are non-NULL,
-** only an INSERT is appears in the changeset. Similarly, if an existing row
-** with non-NULL PRIMARY KEY values is updated so that one or more of its
-** PRIMARY KEY columns are set to NULL, the resulting changeset contains a
-** DELETE change only.
-**
-** The contents of a changeset may be traversed using an iterator created
-** using the [sqlite3changeset_start()] API. A changeset may be applied to
-** a database with a compatible schema using the [sqlite3changeset_apply()]
-** API.
-**
-** Within a changeset generated by this function, all changes related to a
-** single table are grouped together. In other words, when iterating through
-** a changeset or when applying a changeset to a database, all changes related
-** to a single table are processed before moving on to the next table. Tables
-** are sorted in the same order in which they were attached (or auto-attached)
-** to the sqlite3_session object. The order in which the changes related to
-** a single table are stored is undefined.
-**
-** Following a successful call to this function, it is the responsibility of
-** the caller to eventually free the buffer that *ppChangeset points to using
-** [sqlite3_free()].
-**
-** <h3>Changeset Generation</h3>
-**
-** Once a table has been attached to a session object, the session object
-** records the primary key values of all new rows inserted into the table.
-** It also records the original primary key and other column values of any
-** deleted or updated rows. For each unique primary key value, data is only
-** recorded once - the first time a row with said primary key is inserted,
-** updated or deleted in the lifetime of the session.
-**
-** There is one exception to the previous paragraph: when a row is inserted,
-** updated or deleted, if one or more of its primary key columns contain a
-** NULL value, no record of the change is made.
-**
-** The session object therefore accumulates two types of records - those
-** that consist of primary key values only (created when the user inserts
-** a new record) and those that consist of the primary key values and the
-** original values of other table columns (created when the users deletes
-** or updates a record).
-**
-** When this function is called, the requested changeset is created using
-** both the accumulated records and the current contents of the database
-** file. Specifically:
-**
-** <ul>
-**   <li> For each record generated by an insert, the database is queried
-**        for a row with a matching primary key. If one is found, an INSERT
-**        change is added to the changeset. If no such row is found, no change
-**        is added to the changeset.
-**
-**   <li> For each record generated by an update or delete, the database is
-**        queried for a row with a matching primary key. If such a row is
-**        found and one or more of the non-primary key fields have been
-**        modified from their original values, an UPDATE change is added to
-**        the changeset. Or, if no such row is found in the table, a DELETE
-**        change is added to the changeset. If there is a row with a matching
-**        primary key in the database, but all fields contain their original
-**        values, no change is added to the changeset.
-** </ul>
-**
-** This means, amongst other things, that if a row is inserted and then later
-** deleted while a session object is active, neither the insert nor the delete
-** will be present in the changeset. Or if a row is deleted and then later a
-** row with the same primary key values inserted while a session object is
-** active, the resulting changeset will contain an UPDATE change instead of
-** a DELETE and an INSERT.
-**
-** When a session object is disabled (see the [sqlite3session_enable()] API),
-** it does not accumulate records when rows are inserted, updated or deleted.
-** This may appear to have some counter-intuitive effects if a single row
-** is written to more than once during a session. For example, if a row
-** is inserted while a session object is enabled, then later deleted while
-** the same session object is disabled, no INSERT record will appear in the
-** changeset, even though the delete took place while the session was disabled.
-** Or, if one field of a row is updated while a session is disabled, and
-** another field of the same row is updated while the session is enabled, the
-** resulting changeset will contain an UPDATE change that updates both fields.
-*/
-SQLITE_API int sqlite3session_changeset(
-  sqlite3_session *pSession,      /* Session object */
-  int *pnChangeset,               /* OUT: Size of buffer at *ppChangeset */
-  void **ppChangeset              /* OUT: Buffer containing changeset */
-);
-
-/*
-** CAPI3REF: Return An Upper-limit For The Size Of The Changeset
-** METHOD: sqlite3_session
-**
-** By default, this function always returns 0. For it to return
-** a useful result, the sqlite3_session object must have been configured
-** to enable this API using sqlite3session_object_config() with the
-** SQLITE_SESSION_OBJCONFIG_SIZE verb.
-**
-** When enabled, this function returns an upper limit, in bytes, for the size
-** of the changeset that might be produced if sqlite3session_changeset() were
-** called. The final changeset size might be equal to or smaller than the
-** size in bytes returned by this function.
-*/
-SQLITE_API sqlite3_int64 sqlite3session_changeset_size(sqlite3_session *pSession);
-
-/*
-** CAPI3REF: Load The Difference Between Tables Into A Session
-** METHOD: sqlite3_session
-**
-** If it is not already attached to the session object passed as the first
-** argument, this function attaches table zTbl in the same manner as the
-** [sqlite3session_attach()] function. If zTbl does not exist, or if it
-** does not have a primary key, this function is a no-op (but does not return
-** an error).
-**
-** Argument zFromDb must be the name of a database ("main", "temp" etc.)
-** attached to the same database handle as the session object that contains
-** a table compatible with the table attached to the session by this function.
-** A table is considered compatible if it:
-**
-** <ul>
-**   <li> Has the same name,
-**   <li> Has the same set of columns declared in the same order, and
-**   <li> Has the same PRIMARY KEY definition.
-** </ul>
-**
-** If the tables are not compatible, SQLITE_SCHEMA is returned. If the tables
-** are compatible but do not have any PRIMARY KEY columns, it is not an error
-** but no changes are added to the session object. As with other session
-** APIs, tables without PRIMARY KEYs are simply ignored.
-**
-** This function adds a set of changes to the session object that could be
-** used to update the table in database zFrom (call this the "from-table")
-** so that its content is the same as the table attached to the session
-** object (call this the "to-table"). Specifically:
-**
-** <ul>
-**   <li> For each row (primary key) that exists in the to-table but not in
-**     the from-table, an INSERT record is added to the session object.
-**
-**   <li> For each row (primary key) that exists in the to-table but not in
-**     the from-table, a DELETE record is added to the session object.
-**
-**   <li> For each row (primary key) that exists in both tables, but features
-**     different non-PK values in each, an UPDATE record is added to the
-**     session.
-** </ul>
+** will be destroyed when the preupdate callback returns.
 **
-** To clarify, if this function is called and then a changeset constructed
-** using [sqlite3session_changeset()], then after applying that changeset to
-** database zFrom the contents of the two compatible tables would be
-** identical.
+** ^The [sqlite3_preupdate_depth(D)] interface returns 0 if the preupdate
+** callback was invoked as a result of a direct insert, update, or delete
+** operation; or 1 for inserts, updates, or deletes invoked by top-level
+** triggers; or 2 for changes resulting from triggers called by top-level
+** triggers; and so forth.
 **
-** It an error if database zFrom does not exist or does not contain the
-** required compatible table.
+** When the [sqlite3_blob_write()] API is used to update a blob column,
+** the pre-update hook is invoked with SQLITE_DELETE. This is because the
+** in this case the new values are not available. In this case, when a
+** callback made with op==SQLITE_DELETE is actuall a write using the
+** sqlite3_blob_write() API, the [sqlite3_preupdate_blobwrite()] returns
+** the index of the column being written. In other cases, where the
+** pre-update hook is being invoked for some other reason, including a
+** regular DELETE, sqlite3_preupdate_blobwrite() returns -1.
 **
-** If the operation is successful, SQLITE_OK is returned. Otherwise, an SQLite
-** error code. In this case, if argument pzErrMsg is not NULL, *pzErrMsg
-** may be set to point to a buffer containing an English language error
-** message. It is the responsibility of the caller to free this buffer using
-** sqlite3_free().
+** See also:  [sqlite3_update_hook()]
 */
-SQLITE_API int sqlite3session_diff(
-  sqlite3_session *pSession,
-  const char *zFromDb,
-  const char *zTbl,
-  char **pzErrMsg
-);
+#if defined(SQLITE_ENABLE_PREUPDATE_HOOK)
+    SQLITE_API void*
+      sqlite3_preupdate_hook(sqlite3* db,
+                             void (*xPreUpdate)(void* pCtx,          /* Copy of third arg to preupdate_hook() */
+                                                sqlite3* db,         /* Database handle */
+                                                int op,              /* SQLITE_UPDATE, DELETE or INSERT */
+                                                char const* zDb,     /* Database name */
+                                                char const* zName,   /* Table name */
+                                                sqlite3_int64 iKey1, /* Rowid of row about to be deleted/updated */
+                                                sqlite3_int64 iKey2  /* New rowid value (for a rowid UPDATE) */
+                                                ),
+                             void*);
+    SQLITE_API int sqlite3_preupdate_old(sqlite3*, int, sqlite3_value**);
+    SQLITE_API int sqlite3_preupdate_count(sqlite3*);
+    SQLITE_API int sqlite3_preupdate_depth(sqlite3*);
+    SQLITE_API int sqlite3_preupdate_new(sqlite3*, int, sqlite3_value**);
+    SQLITE_API int sqlite3_preupdate_blobwrite(sqlite3*);
+#endif
 
+    /*
+    ** CAPI3REF: Low-level system error code
+    ** METHOD: sqlite3
+    **
+    ** ^Attempt to return the underlying operating system error code or error
+    ** number that caused the most recent I/O error or failure to open a file.
+    ** The return value is OS-dependent.  For example, on unix systems, after
+    ** [sqlite3_open_v2()] returns [SQLITE_CANTOPEN], this interface could be
+    ** called to get back the underlying "errno" that caused the problem, such
+    ** as ENOSPC, EAUTH, EISDIR, and so forth.
+    */
+    SQLITE_API int sqlite3_system_errno(sqlite3*);
+
+    /*
+    ** CAPI3REF: Database Snapshot
+    ** KEYWORDS: {snapshot} {sqlite3_snapshot}
+    **
+    ** An instance of the snapshot object records the state of a [WAL mode]
+    ** database for some specific point in history.
+    **
+    ** In [WAL mode], multiple [database connections] that are open on the
+    ** same database file can each be reading a different historical version
+    ** of the database file.  When a [database connection] begins a read
+    ** transaction, that connection sees an unchanging copy of the database
+    ** as it existed for the point in time when the transaction first started.
+    ** Subsequent changes to the database from other connections are not seen
+    ** by the reader until a new read transaction is started.
+    **
+    ** The sqlite3_snapshot object records state information about an historical
+    ** version of the database file so that it is possible to later open a new read
+    ** transaction that sees that historical version of the database rather than
+    ** the most recent version.
+    */
+    typedef struct sqlite3_snapshot
+    {
+        unsigned char hidden[48];
+    } sqlite3_snapshot;
+
+    /*
+    ** CAPI3REF: Record A Database Snapshot
+    ** CONSTRUCTOR: sqlite3_snapshot
+    **
+    ** ^The [sqlite3_snapshot_get(D,S,P)] interface attempts to make a
+    ** new [sqlite3_snapshot] object that records the current state of
+    ** schema S in database connection D.  ^On success, the
+    ** [sqlite3_snapshot_get(D,S,P)] interface writes a pointer to the newly
+    ** created [sqlite3_snapshot] object into *P and returns SQLITE_OK.
+    ** If there is not already a read-transaction open on schema S when
+    ** this function is called, one is opened automatically.
+    **
+    ** The following must be true for this function to succeed. If any of
+    ** the following statements are false when sqlite3_snapshot_get() is
+    ** called, SQLITE_ERROR is returned. The final value of *P is undefined
+    ** in this case.
+    **
+    ** <ul>
+    **   <li> The database handle must not be in [autocommit mode].
+    **
+    **   <li> Schema S of [database connection] D must be a [WAL mode] database.
+    **
+    **   <li> There must not be a write transaction open on schema S of database
+    **        connection D.
+    **
+    **   <li> One or more transactions must have been written to the current wal
+    **        file since it was created on disk (by any connection). This means
+    **        that a snapshot cannot be taken on a wal mode database with no wal
+    **        file immediately after it is first opened. At least one transaction
+    **        must be written to it first.
+    ** </ul>
+    **
+    ** This function may also return SQLITE_NOMEM.  If it is called with the
+    ** database handle in autocommit mode but fails for some other reason,
+    ** whether or not a read transaction is opened on schema S is undefined.
+    **
+    ** The [sqlite3_snapshot] object returned from a successful call to
+    ** [sqlite3_snapshot_get()] must be freed using [sqlite3_snapshot_free()]
+    ** to avoid a memory leak.
+    **
+    ** The [sqlite3_snapshot_get()] interface is only available when the
+    ** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
+    */
+    SQLITE_API SQLITE_EXPERIMENTAL int
+      sqlite3_snapshot_get(sqlite3* db, const char* zSchema, sqlite3_snapshot** ppSnapshot);
+
+    /*
+    ** CAPI3REF: Start a read transaction on an historical snapshot
+    ** METHOD: sqlite3_snapshot
+    **
+    ** ^The [sqlite3_snapshot_open(D,S,P)] interface either starts a new read
+    ** transaction or upgrades an existing one for schema S of
+    ** [database connection] D such that the read transaction refers to
+    ** historical [snapshot] P, rather than the most recent change to the
+    ** database. ^The [sqlite3_snapshot_open()] interface returns SQLITE_OK
+    ** on success or an appropriate [error code] if it fails.
+    **
+    ** ^In order to succeed, the database connection must not be in
+    ** [autocommit mode] when [sqlite3_snapshot_open(D,S,P)] is called. If there
+    ** is already a read transaction open on schema S, then the database handle
+    ** must have no active statements (SELECT statements that have been passed
+    ** to sqlite3_step() but not sqlite3_reset() or sqlite3_finalize()).
+    ** SQLITE_ERROR is returned if either of these conditions is violated, or
+    ** if schema S does not exist, or if the snapshot object is invalid.
+    **
+    ** ^A call to sqlite3_snapshot_open() will fail to open if the specified
+    ** snapshot has been overwritten by a [checkpoint]. In this case
+    ** SQLITE_ERROR_SNAPSHOT is returned.
+    **
+    ** If there is already a read transaction open when this function is
+    ** invoked, then the same read transaction remains open (on the same
+    ** database snapshot) if SQLITE_ERROR, SQLITE_BUSY or SQLITE_ERROR_SNAPSHOT
+    ** is returned. If another error code - for example SQLITE_PROTOCOL or an
+    ** SQLITE_IOERR error code - is returned, then the final state of the
+    ** read transaction is undefined. If SQLITE_OK is returned, then the
+    ** read transaction is now open on database snapshot P.
+    **
+    ** ^(A call to [sqlite3_snapshot_open(D,S,P)] will fail if the
+    ** database connection D does not know that the database file for
+    ** schema S is in [WAL mode].  A database connection might not know
+    ** that the database file is in [WAL mode] if there has been no prior
+    ** I/O on that database connection, or if the database entered [WAL mode]
+    ** after the most recent I/O on the database connection.)^
+    ** (Hint: Run "[PRAGMA application_id]" against a newly opened
+    ** database connection in order to make it ready to use snapshots.)
+    **
+    ** The [sqlite3_snapshot_open()] interface is only available when the
+    ** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
+    */
+    SQLITE_API SQLITE_EXPERIMENTAL int
+      sqlite3_snapshot_open(sqlite3* db, const char* zSchema, sqlite3_snapshot* pSnapshot);
+
+    /*
+    ** CAPI3REF: Destroy a snapshot
+    ** DESTRUCTOR: sqlite3_snapshot
+    **
+    ** ^The [sqlite3_snapshot_free(P)] interface destroys [sqlite3_snapshot] P.
+    ** The application must eventually free every [sqlite3_snapshot] object
+    ** using this routine to avoid a memory leak.
+    **
+    ** The [sqlite3_snapshot_free()] interface is only available when the
+    ** [SQLITE_ENABLE_SNAPSHOT] compile-time option is used.
+    */
+    SQLITE_API SQLITE_EXPERIMENTAL void sqlite3_snapshot_free(sqlite3_snapshot*);
+
+    /*
+    ** CAPI3REF: Compare the ages of two snapshot handles.
+    ** METHOD: sqlite3_snapshot
+    **
+    ** The sqlite3_snapshot_cmp(P1, P2) interface is used to compare the ages
+    ** of two valid snapshot handles.
+    **
+    ** If the two snapshot handles are not associated with the same database
+    ** file, the result of the comparison is undefined.
+    **
+    ** Additionally, the result of the comparison is only valid if both of the
+    ** snapshot handles were obtained by calling sqlite3_snapshot_get() since the
+    ** last time the wal file was deleted. The wal file is deleted when the
+    ** database is changed back to rollback mode or when the number of database
+    ** clients drops to zero. If either snapshot handle was obtained before the
+    ** wal file was last deleted, the value returned by this function
+    ** is undefined.
+    **
+    ** Otherwise, this API returns a negative value if P1 refers to an older
+    ** snapshot than P2, zero if the two handles refer to the same database
+    ** snapshot, and a positive value if P1 is a newer snapshot than P2.
+    **
+    ** This interface is only available if SQLite is compiled with the
+    ** [SQLITE_ENABLE_SNAPSHOT] option.
+    */
+    SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_cmp(sqlite3_snapshot* p1, sqlite3_snapshot* p2);
+
+    /*
+    ** CAPI3REF: Recover snapshots from a wal file
+    ** METHOD: sqlite3_snapshot
+    **
+    ** If a [WAL file] remains on disk after all database connections close
+    ** (either through the use of the [SQLITE_FCNTL_PERSIST_WAL] [file control]
+    ** or because the last process to have the database opened exited without
+    ** calling [sqlite3_close()]) and a new connection is subsequently opened
+    ** on that database and [WAL file], the [sqlite3_snapshot_open()] interface
+    ** will only be able to open the last transaction added to the WAL file
+    ** even though the WAL file contains other valid transactions.
+    **
+    ** This function attempts to scan the WAL file associated with database zDb
+    ** of database handle db and make all valid snapshots available to
+    ** sqlite3_snapshot_open(). It is an error if there is already a read
+    ** transaction open on the database, or if the database is not a WAL mode
+    ** database.
+    **
+    ** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
+    **
+    ** This interface is only available if SQLite is compiled with the
+    ** [SQLITE_ENABLE_SNAPSHOT] option.
+    */
+    SQLITE_API SQLITE_EXPERIMENTAL int sqlite3_snapshot_recover(sqlite3* db, const char* zDb);
+
+    /*
+    ** CAPI3REF: Serialize a database
+    **
+    ** The sqlite3_serialize(D,S,P,F) interface returns a pointer to memory
+    ** that is a serialization of the S database on [database connection] D.
+    ** If P is not a NULL pointer, then the size of the database in bytes
+    ** is written into *P.
+    **
+    ** For an ordinary on-disk database file, the serialization is just a
+    ** copy of the disk file.  For an in-memory database or a "TEMP" database,
+    ** the serialization is the same sequence of bytes which would be written
+    ** to disk if that database where backed up to disk.
+    **
+    ** The usual case is that sqlite3_serialize() copies the serialization of
+    ** the database into memory obtained from [sqlite3_malloc64()] and returns
+    ** a pointer to that memory.  The caller is responsible for freeing the
+    ** returned value to avoid a memory leak.  However, if the F argument
+    ** contains the SQLITE_SERIALIZE_NOCOPY bit, then no memory allocations
+    ** are made, and the sqlite3_serialize() function will return a pointer
+    ** to the contiguous memory representation of the database that SQLite
+    ** is currently using for that database, or NULL if the no such contiguous
+    ** memory representation of the database exists.  A contiguous memory
+    ** representation of the database will usually only exist if there has
+    ** been a prior call to [sqlite3_deserialize(D,S,...)] with the same
+    ** values of D and S.
+    ** The size of the database is written into *P even if the
+    ** SQLITE_SERIALIZE_NOCOPY bit is set but no contiguous copy
+    ** of the database exists.
+    **
+    ** A call to sqlite3_serialize(D,S,P,F) might return NULL even if the
+    ** SQLITE_SERIALIZE_NOCOPY bit is omitted from argument F if a memory
+    ** allocation error occurs.
+    **
+    ** This interface is omitted if SQLite is compiled with the
+    ** [SQLITE_OMIT_DESERIALIZE] option.
+    */
+    SQLITE_API unsigned char* sqlite3_serialize(sqlite3* db,           /* The database connection */
+                                                const char* zSchema,   /* Which DB to serialize. ex: "main", "temp", ...
+                                                                        */
+                                                sqlite3_int64* piSize, /* Write size of the DB here, if not NULL */
+                                                unsigned int mFlags    /* Zero or more SQLITE_SERIALIZE_* flags */
+    );
 
 /*
-** CAPI3REF: Generate A Patchset From A Session Object
-** METHOD: sqlite3_session
-**
-** The differences between a patchset and a changeset are that:
-**
-** <ul>
-**   <li> DELETE records consist of the primary key fields only. The
-**        original values of other fields are omitted.
-**   <li> The original values of any modified fields are omitted from
-**        UPDATE records.
-** </ul>
+** CAPI3REF: Flags for sqlite3_serialize
 **
-** A patchset blob may be used with up to date versions of all
-** sqlite3changeset_xxx API functions except for sqlite3changeset_invert(),
-** which returns SQLITE_CORRUPT if it is passed a patchset. Similarly,
-** attempting to use a patchset blob with old versions of the
-** sqlite3changeset_xxx APIs also provokes an SQLITE_CORRUPT error.
-**
-** Because the non-primary key "old.*" fields are omitted, no
-** SQLITE_CHANGESET_DATA conflicts can be detected or reported if a patchset
-** is passed to the sqlite3changeset_apply() API. Other conflict types work
-** in the same way as for changesets.
-**
-** Changes within a patchset are ordered in the same way as for changesets
-** generated by the sqlite3session_changeset() function (i.e. all changes for
-** a single table are grouped together, tables appear in the order in which
-** they were attached to the session object).
-*/
-SQLITE_API int sqlite3session_patchset(
-  sqlite3_session *pSession,      /* Session object */
-  int *pnPatchset,                /* OUT: Size of buffer at *ppPatchset */
-  void **ppPatchset               /* OUT: Buffer containing patchset */
-);
-
-/*
-** CAPI3REF: Test if a changeset has recorded any changes.
-**
-** Return non-zero if no changes to attached tables have been recorded by
-** the session object passed as the first argument. Otherwise, if one or
-** more changes have been recorded, return zero.
-**
-** Even if this function returns zero, it is possible that calling
-** [sqlite3session_changeset()] on the session handle may still return a
-** changeset that contains no changes. This can happen when a row in
-** an attached table is modified and then later on the original values
-** are restored. However, if this function returns non-zero, then it is
-** guaranteed that a call to sqlite3session_changeset() will return a
-** changeset containing zero changes.
-*/
-SQLITE_API int sqlite3session_isempty(sqlite3_session *pSession);
-
-/*
-** CAPI3REF: Query for the amount of heap memory used by a session object.
+** Zero or more of the following constants can be OR-ed together for
+** the F argument to [sqlite3_serialize(D,S,P,F)].
 **
-** This API returns the total amount of heap memory in bytes currently
-** used by the session object passed as the only argument.
+** SQLITE_SERIALIZE_NOCOPY means that [sqlite3_serialize()] will return
+** a pointer to contiguous in-memory database that it is currently using,
+** without making a copy of the database.  If SQLite is not currently using
+** a contiguous in-memory database, then this option causes
+** [sqlite3_serialize()] to return a NULL pointer.  SQLite will only be
+** using a contiguous in-memory database if it has been initialized by a
+** prior call to [sqlite3_deserialize()].
 */
-SQLITE_API sqlite3_int64 sqlite3session_memory_used(sqlite3_session *pSession);
+#define SQLITE_SERIALIZE_NOCOPY 0x001 /* Do no memory allocations */
+
+    /*
+    ** CAPI3REF: Deserialize a database
+    **
+    ** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the
+    ** [database connection] D to disconnect from database S and then
+    ** reopen S as an in-memory database based on the serialization contained
+    ** in P.  The serialized database P is N bytes in size.  M is the size of
+    ** the buffer P, which might be larger than N.  If M is larger than N, and
+    ** the SQLITE_DESERIALIZE_READONLY bit is not set in F, then SQLite is
+    ** permitted to add content to the in-memory database as long as the total
+    ** size does not exceed M bytes.
+    **
+    ** If the SQLITE_DESERIALIZE_FREEONCLOSE bit is set in F, then SQLite will
+    ** invoke sqlite3_free() on the serialization buffer when the database
+    ** connection closes.  If the SQLITE_DESERIALIZE_RESIZEABLE bit is set, then
+    ** SQLite will try to increase the buffer size using sqlite3_realloc64()
+    ** if writes on the database cause it to grow larger than M bytes.
+    **
+    ** The sqlite3_deserialize() interface will fail with SQLITE_BUSY if the
+    ** database is currently in a read transaction or is involved in a backup
+    ** operation.
+    **
+    ** It is not possible to deserialized into the TEMP database.  If the
+    ** S argument to sqlite3_deserialize(D,S,P,N,M,F) is "temp" then the
+    ** function returns SQLITE_ERROR.
+    **
+    ** If sqlite3_deserialize(D,S,P,N,M,F) fails for any reason and if the
+    ** SQLITE_DESERIALIZE_FREEONCLOSE bit is set in argument F, then
+    ** [sqlite3_free()] is invoked on argument P prior to returning.
+    **
+    ** This interface is omitted if SQLite is compiled with the
+    ** [SQLITE_OMIT_DESERIALIZE] option.
+    */
+    SQLITE_API int sqlite3_deserialize(sqlite3* db,          /* The database connection */
+                                       const char* zSchema,  /* Which DB to reopen with the deserialization */
+                                       unsigned char* pData, /* The serialized database content */
+                                       sqlite3_int64 szDb,   /* Number bytes in the deserialization */
+                                       sqlite3_int64 szBuf,  /* Total size of buffer pData[] */
+                                       unsigned mFlags       /* Zero or more SQLITE_DESERIALIZE_* flags */
+    );
 
 /*
-** CAPI3REF: Create An Iterator To Traverse A Changeset
-** CONSTRUCTOR: sqlite3_changeset_iter
-**
-** Create an iterator used to iterate through the contents of a changeset.
-** If successful, *pp is set to point to the iterator handle and SQLITE_OK
-** is returned. Otherwise, if an error occurs, *pp is set to zero and an
-** SQLite error code is returned.
-**
-** The following functions can be used to advance and query a changeset
-** iterator created by this function:
+** CAPI3REF: Flags for sqlite3_deserialize()
 **
-** <ul>
-**   <li> [sqlite3changeset_next()]
-**   <li> [sqlite3changeset_op()]
-**   <li> [sqlite3changeset_new()]
-**   <li> [sqlite3changeset_old()]
-** </ul>
+** The following are allowed values for 6th argument (the F argument) to
+** the [sqlite3_deserialize(D,S,P,N,M,F)] interface.
 **
-** It is the responsibility of the caller to eventually destroy the iterator
-** by passing it to [sqlite3changeset_finalize()]. The buffer containing the
-** changeset (pChangeset) must remain valid until after the iterator is
-** destroyed.
-**
-** Assuming the changeset blob was created by one of the
-** [sqlite3session_changeset()], [sqlite3changeset_concat()] or
-** [sqlite3changeset_invert()] functions, all changes within the changeset
-** that apply to a single table are grouped together. This means that when
-** an application iterates through a changeset using an iterator created by
-** this function, all changes that relate to a single table are visited
-** consecutively. There is no chance that the iterator will visit a change
-** the applies to table X, then one for table Y, and then later on visit
-** another change for table X.
-**
-** The behavior of sqlite3changeset_start_v2() and its streaming equivalent
-** may be modified by passing a combination of
-** [SQLITE_CHANGESETSTART_INVERT | supported flags] as the 4th parameter.
-**
-** Note that the sqlite3changeset_start_v2() API is still <b>experimental</b>
-** and therefore subject to change.
-*/
-SQLITE_API int sqlite3changeset_start(
-  sqlite3_changeset_iter **pp,    /* OUT: New changeset iterator handle */
-  int nChangeset,                 /* Size of changeset blob in bytes */
-  void *pChangeset                /* Pointer to blob containing changeset */
-);
-SQLITE_API int sqlite3changeset_start_v2(
-  sqlite3_changeset_iter **pp,    /* OUT: New changeset iterator handle */
-  int nChangeset,                 /* Size of changeset blob in bytes */
-  void *pChangeset,               /* Pointer to blob containing changeset */
-  int flags                       /* SESSION_CHANGESETSTART_* flags */
-);
-
-/*
-** CAPI3REF: Flags for sqlite3changeset_start_v2
+** The SQLITE_DESERIALIZE_FREEONCLOSE means that the database serialization
+** in the P argument is held in memory obtained from [sqlite3_malloc64()]
+** and that SQLite should take ownership of this memory and automatically
+** free it when it has finished using it.  Without this flag, the caller
+** is responsible for freeing any dynamically allocated memory.
 **
-** The following flags may passed via the 4th parameter to
-** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
+** The SQLITE_DESERIALIZE_RESIZEABLE flag means that SQLite is allowed to
+** grow the size of the database using calls to [sqlite3_realloc64()].  This
+** flag should only be used if SQLITE_DESERIALIZE_FREEONCLOSE is also used.
+** Without this flag, the deserialized database cannot increase in size beyond
+** the number of bytes specified by the M parameter.
 **
-** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
-**   Invert the changeset while iterating through it. This is equivalent to
-**   inverting a changeset using sqlite3changeset_invert() before applying it.
-**   It is an error to specify this flag with a patchset.
+** The SQLITE_DESERIALIZE_READONLY flag means that the deserialized database
+** should be treated as read-only.
 */
-#define SQLITE_CHANGESETSTART_INVERT        0x0002
-
+#define SQLITE_DESERIALIZE_FREEONCLOSE 1 /* Call sqlite3_free() on close */
+#define SQLITE_DESERIALIZE_RESIZEABLE 2  /* Resize using sqlite3_realloc64() */
+#define SQLITE_DESERIALIZE_READONLY 4    /* Database is read-only */
 
 /*
-** CAPI3REF: Advance A Changeset Iterator
-** METHOD: sqlite3_changeset_iter
-**
-** This function may only be used with iterators created by the function
-** [sqlite3changeset_start()]. If it is called on an iterator passed to
-** a conflict-handler callback by [sqlite3changeset_apply()], SQLITE_MISUSE
-** is returned and the call has no effect.
-**
-** Immediately after an iterator is created by sqlite3changeset_start(), it
-** does not point to any change in the changeset. Assuming the changeset
-** is not empty, the first call to this function advances the iterator to
-** point to the first change in the changeset. Each subsequent call advances
-** the iterator to point to the next change in the changeset (if any). If
-** no error occurs and the iterator points to a valid change after a call
-** to sqlite3changeset_next() has advanced it, SQLITE_ROW is returned.
-** Otherwise, if all changes in the changeset have already been visited,
-** SQLITE_DONE is returned.
-**
-** If an error occurs, an SQLite error code is returned. Possible error
-** codes include SQLITE_CORRUPT (if the changeset buffer is corrupt) or
-** SQLITE_NOMEM.
+** Undo the hack that converts floating point types to integer for
+** builds on processors without floating point support.
 */
-SQLITE_API int sqlite3changeset_next(sqlite3_changeset_iter *pIter);
+#ifdef SQLITE_OMIT_FLOATING_POINT
+#undef double
+#endif
 
-/*
-** CAPI3REF: Obtain The Current Operation From A Changeset Iterator
-** METHOD: sqlite3_changeset_iter
-**
-** The pIter argument passed to this function may either be an iterator
-** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
-** created by [sqlite3changeset_start()]. In the latter case, the most recent
-** call to [sqlite3changeset_next()] must have returned [SQLITE_ROW]. If this
-** is not the case, this function returns [SQLITE_MISUSE].
-**
-** Arguments pOp, pnCol and pzTab may not be NULL. Upon return, three
-** outputs are set through these pointers:
-**
-** *pOp is set to one of [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE],
-** depending on the type of change that the iterator currently points to;
-**
-** *pnCol is set to the number of columns in the table affected by the change; and
-**
-** *pzTab is set to point to a nul-terminated utf-8 encoded string containing
-** the name of the table affected by the current change. The buffer remains
-** valid until either sqlite3changeset_next() is called on the iterator
-** or until the conflict-handler function returns.
-**
-** If pbIndirect is not NULL, then *pbIndirect is set to true (1) if the change
-** is an indirect change, or false (0) otherwise. See the documentation for
-** [sqlite3session_indirect()] for a description of direct and indirect
-** changes.
-**
-** If no error occurs, SQLITE_OK is returned. If an error does occur, an
-** SQLite error code is returned. The values of the output variables may not
-** be trusted in this case.
-*/
-SQLITE_API int sqlite3changeset_op(
-  sqlite3_changeset_iter *pIter,  /* Iterator object */
-  const char **pzTab,             /* OUT: Pointer to table name */
-  int *pnCol,                     /* OUT: Number of columns in table */
-  int *pOp,                       /* OUT: SQLITE_INSERT, DELETE or UPDATE */
-  int *pbIndirect                 /* OUT: True for an 'indirect' change */
-);
+#ifdef __cplusplus
+} /* End of the 'extern "C"' block */
+#endif
+#endif /* SQLITE3_H */
 
+/******** Begin file sqlite3rtree.h *********/
 /*
-** CAPI3REF: Obtain The Primary Key Definition Of A Table
-** METHOD: sqlite3_changeset_iter
-**
-** For each modified table, a changeset includes the following:
-**
-** <ul>
-**   <li> The number of columns in the table, and
-**   <li> Which of those columns make up the tables PRIMARY KEY.
-** </ul>
+** 2010 August 30
 **
-** This function is used to find which columns comprise the PRIMARY KEY of
-** the table modified by the change that iterator pIter currently points to.
-** If successful, *pabPK is set to point to an array of nCol entries, where
-** nCol is the number of columns in the table. Elements of *pabPK are set to
-** 0x01 if the corresponding column is part of the tables primary key, or
-** 0x00 if it is not.
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
 **
-** If argument pnCol is not NULL, then *pnCol is set to the number of columns
-** in the table.
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
 **
-** If this function is called when the iterator does not point to a valid
-** entry, SQLITE_MISUSE is returned and the output variables zeroed. Otherwise,
-** SQLITE_OK is returned and the output variables populated as described
-** above.
+*************************************************************************
 */
-SQLITE_API int sqlite3changeset_pk(
-  sqlite3_changeset_iter *pIter,  /* Iterator object */
-  unsigned char **pabPK,          /* OUT: Array of boolean - true for PK cols */
-  int *pnCol                      /* OUT: Number of entries in output array */
-);
 
-/*
-** CAPI3REF: Obtain old.* Values From A Changeset Iterator
-** METHOD: sqlite3_changeset_iter
-**
-** The pIter argument passed to this function may either be an iterator
-** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
-** created by [sqlite3changeset_start()]. In the latter case, the most recent
-** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
-** Furthermore, it may only be called if the type of change that the iterator
-** currently points to is either [SQLITE_DELETE] or [SQLITE_UPDATE]. Otherwise,
-** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
-**
-** Argument iVal must be greater than or equal to 0, and less than the number
-** of columns in the table affected by the current change. Otherwise,
-** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
-**
-** If successful, this function sets *ppValue to point to a protected
-** sqlite3_value object containing the iVal'th value from the vector of
-** original row values stored as part of the UPDATE or DELETE change and
-** returns SQLITE_OK. The name of the function comes from the fact that this
-** is similar to the "old.*" columns available to update or delete triggers.
-**
-** If some other error occurs (e.g. an OOM condition), an SQLite error code
-** is returned and *ppValue is set to NULL.
-*/
-SQLITE_API int sqlite3changeset_old(
-  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
-  int iVal,                       /* Column number */
-  sqlite3_value **ppValue         /* OUT: Old value (or NULL pointer) */
-);
+#ifndef _SQLITE3RTREE_H_
+#define _SQLITE3RTREE_H_
 
-/*
-** CAPI3REF: Obtain new.* Values From A Changeset Iterator
-** METHOD: sqlite3_changeset_iter
-**
-** The pIter argument passed to this function may either be an iterator
-** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
-** created by [sqlite3changeset_start()]. In the latter case, the most recent
-** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
-** Furthermore, it may only be called if the type of change that the iterator
-** currently points to is either [SQLITE_UPDATE] or [SQLITE_INSERT]. Otherwise,
-** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
-**
-** Argument iVal must be greater than or equal to 0, and less than the number
-** of columns in the table affected by the current change. Otherwise,
-** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
-**
-** If successful, this function sets *ppValue to point to a protected
-** sqlite3_value object containing the iVal'th value from the vector of
-** new row values stored as part of the UPDATE or INSERT change and
-** returns SQLITE_OK. If the change is an UPDATE and does not include
-** a new value for the requested column, *ppValue is set to NULL and
-** SQLITE_OK returned. The name of the function comes from the fact that
-** this is similar to the "new.*" columns available to update or delete
-** triggers.
-**
-** If some other error occurs (e.g. an OOM condition), an SQLite error code
-** is returned and *ppValue is set to NULL.
-*/
-SQLITE_API int sqlite3changeset_new(
-  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
-  int iVal,                       /* Column number */
-  sqlite3_value **ppValue         /* OUT: New value (or NULL pointer) */
-);
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
-/*
-** CAPI3REF: Obtain Conflicting Row Values From A Changeset Iterator
-** METHOD: sqlite3_changeset_iter
-**
-** This function should only be used with iterator objects passed to a
-** conflict-handler callback by [sqlite3changeset_apply()] with either
-** [SQLITE_CHANGESET_DATA] or [SQLITE_CHANGESET_CONFLICT]. If this function
-** is called on any other iterator, [SQLITE_MISUSE] is returned and *ppValue
-** is set to NULL.
-**
-** Argument iVal must be greater than or equal to 0, and less than the number
-** of columns in the table affected by the current change. Otherwise,
-** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
-**
-** If successful, this function sets *ppValue to point to a protected
-** sqlite3_value object containing the iVal'th value from the
-** "conflicting row" associated with the current conflict-handler callback
-** and returns SQLITE_OK.
-**
-** If some other error occurs (e.g. an OOM condition), an SQLite error code
-** is returned and *ppValue is set to NULL.
-*/
-SQLITE_API int sqlite3changeset_conflict(
-  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
-  int iVal,                       /* Column number */
-  sqlite3_value **ppValue         /* OUT: Value from conflicting row */
-);
+    typedef struct sqlite3_rtree_geometry sqlite3_rtree_geometry;
+    typedef struct sqlite3_rtree_query_info sqlite3_rtree_query_info;
 
-/*
-** CAPI3REF: Determine The Number Of Foreign Key Constraint Violations
-** METHOD: sqlite3_changeset_iter
-**
-** This function may only be called with an iterator passed to an
-** SQLITE_CHANGESET_FOREIGN_KEY conflict handler callback. In this case
-** it sets the output variable to the total number of known foreign key
-** violations in the destination database and returns SQLITE_OK.
-**
-** In all other cases this function returns SQLITE_MISUSE.
+/* The double-precision datatype used by RTree depends on the
+** SQLITE_RTREE_INT_ONLY compile-time option.
 */
-SQLITE_API int sqlite3changeset_fk_conflicts(
-  sqlite3_changeset_iter *pIter,  /* Changeset iterator */
-  int *pnOut                      /* OUT: Number of FK violations */
-);
-
+#ifdef SQLITE_RTREE_INT_ONLY
+    typedef sqlite3_int64 sqlite3_rtree_dbl;
+#else
+typedef double sqlite3_rtree_dbl;
+#endif
 
-/*
-** CAPI3REF: Finalize A Changeset Iterator
-** METHOD: sqlite3_changeset_iter
-**
-** This function is used to finalize an iterator allocated with
-** [sqlite3changeset_start()].
-**
-** This function should only be called on iterators created using the
-** [sqlite3changeset_start()] function. If an application calls this
-** function with an iterator passed to a conflict-handler by
-** [sqlite3changeset_apply()], [SQLITE_MISUSE] is immediately returned and the
-** call has no effect.
-**
-** If an error was encountered within a call to an sqlite3changeset_xxx()
-** function (for example an [SQLITE_CORRUPT] in [sqlite3changeset_next()] or an
-** [SQLITE_NOMEM] in [sqlite3changeset_new()]) then an error code corresponding
-** to that error is returned by this function. Otherwise, SQLITE_OK is
-** returned. This is to allow the following pattern (pseudo-code):
-**
-** <pre>
-**   sqlite3changeset_start();
-**   while( SQLITE_ROW==sqlite3changeset_next() ){
-**     // Do something with change.
-**   }
-**   rc = sqlite3changeset_finalize();
-**   if( rc!=SQLITE_OK ){
-**     // An error has occurred
-**   }
-** </pre>
-*/
-SQLITE_API int sqlite3changeset_finalize(sqlite3_changeset_iter *pIter);
+    /*
+    ** Register a geometry callback named zGeom that can be used as part of an
+    ** R-Tree geometry query as follows:
+    **
+    **   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zGeom(... params ...)
+    */
+    SQLITE_API int sqlite3_rtree_geometry_callback(sqlite3* db,
+                                                   const char* zGeom,
+                                                   int (*xGeom)(sqlite3_rtree_geometry*, int, sqlite3_rtree_dbl*, int*),
+                                                   void* pContext);
+
+    /*
+    ** A pointer to a structure of the following type is passed as the first
+    ** argument to callbacks registered using rtree_geometry_callback().
+    */
+    struct sqlite3_rtree_geometry
+    {
+        void* pContext;            /* Copy of pContext passed to s_r_g_c() */
+        int nParam;                /* Size of array aParam[] */
+        sqlite3_rtree_dbl* aParam; /* Parameters passed to SQL geom function */
+        void* pUser;               /* Callback implementation user data */
+        void (*xDelUser)(void*);   /* Called by SQLite to clean up pUser */
+    };
+
+    /*
+    ** Register a 2nd-generation geometry callback named zScore that can be
+    ** used as part of an R-Tree geometry query as follows:
+    **
+    **   SELECT ... FROM <rtree> WHERE <rtree col> MATCH $zQueryFunc(... params ...)
+    */
+    SQLITE_API int sqlite3_rtree_query_callback(sqlite3* db,
+                                                const char* zQueryFunc,
+                                                int (*xQueryFunc)(sqlite3_rtree_query_info*),
+                                                void* pContext,
+                                                void (*xDestructor)(void*));
+
+    /*
+    ** A pointer to a structure of the following type is passed as the
+    ** argument to scored geometry callback registered using
+    ** sqlite3_rtree_query_callback().
+    **
+    ** Note that the first 5 fields of this structure are identical to
+    ** sqlite3_rtree_geometry.  This structure is a subclass of
+    ** sqlite3_rtree_geometry.
+    */
+    struct sqlite3_rtree_query_info
+    {
+        void* pContext;                 /* pContext from when function registered */
+        int nParam;                     /* Number of function parameters */
+        sqlite3_rtree_dbl* aParam;      /* value of function parameters */
+        void* pUser;                    /* callback can use this, if desired */
+        void (*xDelUser)(void*);        /* function to free pUser */
+        sqlite3_rtree_dbl* aCoord;      /* Coordinates of node or entry to check */
+        unsigned int* anQueue;          /* Number of pending entries in the queue */
+        int nCoord;                     /* Number of coordinates */
+        int iLevel;                     /* Level of current node or entry */
+        int mxLevel;                    /* The largest iLevel value in the tree */
+        sqlite3_int64 iRowid;           /* Rowid for current entry */
+        sqlite3_rtree_dbl rParentScore; /* Score of parent node */
+        int eParentWithin;              /* Visibility of parent node */
+        int eWithin;                    /* OUT: Visibility */
+        sqlite3_rtree_dbl rScore;       /* OUT: Write the score here */
+        /* The following fields are only available in 3.8.11 and later */
+        sqlite3_value** apSqlParam; /* Original SQL values of parameters */
+    };
 
 /*
-** CAPI3REF: Invert A Changeset
-**
-** This function is used to "invert" a changeset object. Applying an inverted
-** changeset to a database reverses the effects of applying the uninverted
-** changeset. Specifically:
-**
-** <ul>
-**   <li> Each DELETE change is changed to an INSERT, and
-**   <li> Each INSERT change is changed to a DELETE, and
-**   <li> For each UPDATE change, the old.* and new.* values are exchanged.
-** </ul>
-**
-** This function does not change the order in which changes appear within
-** the changeset. It merely reverses the sense of each individual change.
-**
-** If successful, a pointer to a buffer containing the inverted changeset
-** is stored in *ppOut, the size of the same buffer is stored in *pnOut, and
-** SQLITE_OK is returned. If an error occurs, both *pnOut and *ppOut are
-** zeroed and an SQLite error code returned.
-**
-** It is the responsibility of the caller to eventually call sqlite3_free()
-** on the *ppOut pointer to free the buffer allocation following a successful
-** call to this function.
-**
-** WARNING/TODO: This function currently assumes that the input is a valid
-** changeset. If it is not, the results are undefined.
+** Allowed values for sqlite3_rtree_query.eWithin and .eParentWithin.
 */
-SQLITE_API int sqlite3changeset_invert(
-  int nIn, const void *pIn,       /* Input changeset */
-  int *pnOut, void **ppOut        /* OUT: Inverse of input */
-);
+#define NOT_WITHIN 0    /* Object completely outside of query region */
+#define PARTLY_WITHIN 1 /* Object partially overlaps query region */
+#define FULLY_WITHIN 2  /* Object fully contained within query region */
 
-/*
-** CAPI3REF: Concatenate Two Changeset Objects
-**
-** This function is used to concatenate two changesets, A and B, into a
-** single changeset. The result is a changeset equivalent to applying
-** changeset A followed by changeset B.
-**
-** This function combines the two input changesets using an
-** sqlite3_changegroup object. Calling it produces similar results as the
-** following code fragment:
-**
-** <pre>
-**   sqlite3_changegroup *pGrp;
-**   rc = sqlite3_changegroup_new(&pGrp);
-**   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nA, pA);
-**   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nB, pB);
-**   if( rc==SQLITE_OK ){
-**     rc = sqlite3changegroup_output(pGrp, pnOut, ppOut);
-**   }else{
-**     *ppOut = 0;
-**     *pnOut = 0;
-**   }
-** </pre>
-**
-** Refer to the sqlite3_changegroup documentation below for details.
-*/
-SQLITE_API int sqlite3changeset_concat(
-  int nA,                         /* Number of bytes in buffer pA */
-  void *pA,                       /* Pointer to buffer containing changeset A */
-  int nB,                         /* Number of bytes in buffer pB */
-  void *pB,                       /* Pointer to buffer containing changeset B */
-  int *pnOut,                     /* OUT: Number of bytes in output changeset */
-  void **ppOut                    /* OUT: Buffer containing output changeset */
-);
+#ifdef __cplusplus
+} /* end of the 'extern "C"' block */
+#endif
 
+#endif /* ifndef _SQLITE3RTREE_H_ */
 
-/*
-** CAPI3REF: Changegroup Handle
-**
-** A changegroup is an object used to combine two or more
-** [changesets] or [patchsets]
-*/
-typedef struct sqlite3_changegroup sqlite3_changegroup;
+/******** End of sqlite3rtree.h *********/
+/******** Begin file sqlite3session.h *********/
 
-/*
-** CAPI3REF: Create A New Changegroup Object
-** CONSTRUCTOR: sqlite3_changegroup
-**
-** An sqlite3_changegroup object is used to combine two or more changesets
-** (or patchsets) into a single changeset (or patchset). A single changegroup
-** object may combine changesets or patchsets, but not both. The output is
-** always in the same format as the input.
-**
-** If successful, this function returns SQLITE_OK and populates (*pp) with
-** a pointer to a new sqlite3_changegroup object before returning. The caller
-** should eventually free the returned object using a call to
-** sqlite3changegroup_delete(). If an error occurs, an SQLite error code
-** (i.e. SQLITE_NOMEM) is returned and *pp is set to NULL.
-**
-** The usual usage pattern for an sqlite3_changegroup object is as follows:
-**
-** <ul>
-**   <li> It is created using a call to sqlite3changegroup_new().
-**
-**   <li> Zero or more changesets (or patchsets) are added to the object
-**        by calling sqlite3changegroup_add().
-**
-**   <li> The result of combining all input changesets together is obtained
-**        by the application via a call to sqlite3changegroup_output().
-**
-**   <li> The object is deleted using a call to sqlite3changegroup_delete().
-** </ul>
-**
-** Any number of calls to add() and output() may be made between the calls to
-** new() and delete(), and in any order.
-**
-** As well as the regular sqlite3changegroup_add() and
-** sqlite3changegroup_output() functions, also available are the streaming
-** versions sqlite3changegroup_add_strm() and sqlite3changegroup_output_strm().
-*/
-SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup **pp);
+#if !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION)
+#define __SQLITESESSION_H_ 1
 
 /*
-** CAPI3REF: Add A Changeset To A Changegroup
-** METHOD: sqlite3_changegroup
-**
-** Add all changes within the changeset (or patchset) in buffer pData (size
-** nData bytes) to the changegroup.
-**
-** If the buffer contains a patchset, then all prior calls to this function
-** on the same changegroup object must also have specified patchsets. Or, if
-** the buffer contains a changeset, so must have the earlier calls to this
-** function. Otherwise, SQLITE_ERROR is returned and no changes are added
-** to the changegroup.
-**
-** Rows within the changeset and changegroup are identified by the values in
-** their PRIMARY KEY columns. A change in the changeset is considered to
-** apply to the same row as a change already present in the changegroup if
-** the two rows have the same primary key.
-**
-** Changes to rows that do not already appear in the changegroup are
-** simply copied into it. Or, if both the new changeset and the changegroup
-** contain changes that apply to a single row, the final contents of the
-** changegroup depends on the type of each change, as follows:
-**
-** <table border=1 style="margin-left:8ex;margin-right:8ex">
-**   <tr><th style="white-space:pre">Existing Change  </th>
-**       <th style="white-space:pre">New Change       </th>
-**       <th>Output Change
-**   <tr><td>INSERT <td>INSERT <td>
-**       The new change is ignored. This case does not occur if the new
-**       changeset was recorded immediately after the changesets already
-**       added to the changegroup.
-**   <tr><td>INSERT <td>UPDATE <td>
-**       The INSERT change remains in the changegroup. The values in the
-**       INSERT change are modified as if the row was inserted by the
-**       existing change and then updated according to the new change.
-**   <tr><td>INSERT <td>DELETE <td>
-**       The existing INSERT is removed from the changegroup. The DELETE is
-**       not added.
-**   <tr><td>UPDATE <td>INSERT <td>
-**       The new change is ignored. This case does not occur if the new
-**       changeset was recorded immediately after the changesets already
-**       added to the changegroup.
-**   <tr><td>UPDATE <td>UPDATE <td>
-**       The existing UPDATE remains within the changegroup. It is amended
-**       so that the accompanying values are as if the row was updated once
-**       by the existing change and then again by the new change.
-**   <tr><td>UPDATE <td>DELETE <td>
-**       The existing UPDATE is replaced by the new DELETE within the
-**       changegroup.
-**   <tr><td>DELETE <td>INSERT <td>
-**       If one or more of the column values in the row inserted by the
-**       new change differ from those in the row deleted by the existing
-**       change, the existing DELETE is replaced by an UPDATE within the
-**       changegroup. Otherwise, if the inserted row is exactly the same
-**       as the deleted row, the existing DELETE is simply discarded.
-**   <tr><td>DELETE <td>UPDATE <td>
-**       The new change is ignored. This case does not occur if the new
-**       changeset was recorded immediately after the changesets already
-**       added to the changegroup.
-**   <tr><td>DELETE <td>DELETE <td>
-**       The new change is ignored. This case does not occur if the new
-**       changeset was recorded immediately after the changesets already
-**       added to the changegroup.
-** </table>
-**
-** If the new changeset contains changes to a table that is already present
-** in the changegroup, then the number of columns and the position of the
-** primary key columns for the table must be consistent. If this is not the
-** case, this function fails with SQLITE_SCHEMA. If the input changeset
-** appears to be corrupt and the corruption is detected, SQLITE_CORRUPT is
-** returned. Or, if an out-of-memory condition occurs during processing, this
-** function returns SQLITE_NOMEM. In all cases, if an error occurs the state
-** of the final contents of the changegroup is undefined.
-**
-** If no error occurs, SQLITE_OK is returned.
+** Make sure we can call this stuff from C++.
 */
-SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void *pData);
+#ifdef __cplusplus
+extern "C"
+{
+#endif
 
-/*
-** CAPI3REF: Obtain A Composite Changeset From A Changegroup
-** METHOD: sqlite3_changegroup
-**
-** Obtain a buffer containing a changeset (or patchset) representing the
-** current contents of the changegroup. If the inputs to the changegroup
-** were themselves changesets, the output is a changeset. Or, if the
-** inputs were patchsets, the output is also a patchset.
-**
-** As with the output of the sqlite3session_changeset() and
-** sqlite3session_patchset() functions, all changes related to a single
-** table are grouped together in the output of this function. Tables appear
-** in the same order as for the very first changeset added to the changegroup.
-** If the second or subsequent changesets added to the changegroup contain
-** changes for tables that do not appear in the first changeset, they are
-** appended onto the end of the output changeset, again in the order in
-** which they are first encountered.
-**
-** If an error occurs, an SQLite error code is returned and the output
-** variables (*pnData) and (*ppData) are set to 0. Otherwise, SQLITE_OK
-** is returned and the output variables are set to the size of and a
-** pointer to the output buffer, respectively. In this case it is the
-** responsibility of the caller to eventually free the buffer using a
-** call to sqlite3_free().
-*/
-SQLITE_API int sqlite3changegroup_output(
-  sqlite3_changegroup*,
-  int *pnData,                    /* OUT: Size of output buffer in bytes */
-  void **ppData                   /* OUT: Pointer to output buffer */
-);
+    /*
+    ** CAPI3REF: Session Object Handle
+    **
+    ** An instance of this object is a [session] that can be used to
+    ** record changes to a database.
+    */
+    typedef struct sqlite3_session sqlite3_session;
+
+    /*
+    ** CAPI3REF: Changeset Iterator Handle
+    **
+    ** An instance of this object acts as a cursor for iterating
+    ** over the elements of a [changeset] or [patchset].
+    */
+    typedef struct sqlite3_changeset_iter sqlite3_changeset_iter;
+
+    /*
+    ** CAPI3REF: Create A New Session Object
+    ** CONSTRUCTOR: sqlite3_session
+    **
+    ** Create a new session object attached to database handle db. If successful,
+    ** a pointer to the new object is written to *ppSession and SQLITE_OK is
+    ** returned. If an error occurs, *ppSession is set to NULL and an SQLite
+    ** error code (e.g. SQLITE_NOMEM) is returned.
+    **
+    ** It is possible to create multiple session objects attached to a single
+    ** database handle.
+    **
+    ** Session objects created using this function should be deleted using the
+    ** [sqlite3session_delete()] function before the database handle that they
+    ** are attached to is itself closed. If the database handle is closed before
+    ** the session object is deleted, then the results of calling any session
+    ** module function, including [sqlite3session_delete()] on the session object
+    ** are undefined.
+    **
+    ** Because the session module uses the [sqlite3_preupdate_hook()] API, it
+    ** is not possible for an application to register a pre-update hook on a
+    ** database handle that has one or more session objects attached. Nor is
+    ** it possible to create a session object attached to a database handle for
+    ** which a pre-update hook is already defined. The results of attempting
+    ** either of these things are undefined.
+    **
+    ** The session object will be used to create changesets for tables in
+    ** database zDb, where zDb is either "main", or "temp", or the name of an
+    ** attached database. It is not an error if database zDb is not attached
+    ** to the database when the session object is created.
+    */
+    SQLITE_API int sqlite3session_create(sqlite3* db,                /* Database handle */
+                                         const char* zDb,            /* Name of db (e.g. "main") */
+                                         sqlite3_session** ppSession /* OUT: New session object */
+    );
+
+    /*
+    ** CAPI3REF: Delete A Session Object
+    ** DESTRUCTOR: sqlite3_session
+    **
+    ** Delete a session object previously allocated using
+    ** [sqlite3session_create()]. Once a session object has been deleted, the
+    ** results of attempting to use pSession with any other session module
+    ** function are undefined.
+    **
+    ** Session objects must be deleted before the database handle to which they
+    ** are attached is closed. Refer to the documentation for
+    ** [sqlite3session_create()] for details.
+    */
+    SQLITE_API void sqlite3session_delete(sqlite3_session* pSession);
+
+    /*
+    ** CAPIREF: Conigure a Session Object
+    ** METHOD: sqlite3_session
+    **
+    ** This method is used to configure a session object after it has been
+    ** created. At present the only valid value for the second parameter is
+    ** [SQLITE_SESSION_OBJCONFIG_SIZE].
+    **
+    ** Arguments for sqlite3session_object_config()
+    **
+    ** The following values may passed as the the 4th parameter to
+    ** sqlite3session_object_config().
+    **
+    ** <dt>SQLITE_SESSION_OBJCONFIG_SIZE <dd>
+    **   This option is used to set, clear or query the flag that enables
+    **   the [sqlite3session_changeset_size()] API. Because it imposes some
+    **   computational overhead, this API is disabled by default. Argument
+    **   pArg must point to a value of type (int). If the value is initially
+    **   0, then the sqlite3session_changeset_size() API is disabled. If it
+    **   is greater than 0, then the same API is enabled. Or, if the initial
+    **   value is less than zero, no change is made. In all cases the (int)
+    **   variable is set to 1 if the sqlite3session_changeset_size() API is
+    **   enabled following the current call, or 0 otherwise.
+    **
+    **   It is an error (SQLITE_MISUSE) to attempt to modify this setting after
+    **   the first table has been attached to the session object.
+    */
+    SQLITE_API int sqlite3session_object_config(sqlite3_session*, int op, void* pArg);
+
+/*
+ */
+#define SQLITE_SESSION_OBJCONFIG_SIZE 1
 
-/*
-** CAPI3REF: Delete A Changegroup Object
-** DESTRUCTOR: sqlite3_changegroup
-*/
-SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);
+    /*
+    ** CAPI3REF: Enable Or Disable A Session Object
+    ** METHOD: sqlite3_session
+    **
+    ** Enable or disable the recording of changes by a session object. When
+    ** enabled, a session object records changes made to the database. When
+    ** disabled - it does not. A newly created session object is enabled.
+    ** Refer to the documentation for [sqlite3session_changeset()] for further
+    ** details regarding how enabling and disabling a session object affects
+    ** the eventual changesets.
+    **
+    ** Passing zero to this function disables the session. Passing a value
+    ** greater than zero enables it. Passing a value less than zero is a
+    ** no-op, and may be used to query the current state of the session.
+    **
+    ** The return value indicates the final state of the session object: 0 if
+    ** the session is disabled, or 1 if it is enabled.
+    */
+    SQLITE_API int sqlite3session_enable(sqlite3_session* pSession, int bEnable);
+
+    /*
+    ** CAPI3REF: Set Or Clear the Indirect Change Flag
+    ** METHOD: sqlite3_session
+    **
+    ** Each change recorded by a session object is marked as either direct or
+    ** indirect. A change is marked as indirect if either:
+    **
+    ** <ul>
+    **   <li> The session object "indirect" flag is set when the change is
+    **        made, or
+    **   <li> The change is made by an SQL trigger or foreign key action
+    **        instead of directly as a result of a users SQL statement.
+    ** </ul>
+    **
+    ** If a single row is affected by more than one operation within a session,
+    ** then the change is considered indirect if all operations meet the criteria
+    ** for an indirect change above, or direct otherwise.
+    **
+    ** This function is used to set, clear or query the session object indirect
+    ** flag.  If the second argument passed to this function is zero, then the
+    ** indirect flag is cleared. If it is greater than zero, the indirect flag
+    ** is set. Passing a value less than zero does not modify the current value
+    ** of the indirect flag, and may be used to query the current state of the
+    ** indirect flag for the specified session object.
+    **
+    ** The return value indicates the final state of the indirect flag: 0 if
+    ** it is clear, or 1 if it is set.
+    */
+    SQLITE_API int sqlite3session_indirect(sqlite3_session* pSession, int bIndirect);
+
+    /*
+    ** CAPI3REF: Attach A Table To A Session Object
+    ** METHOD: sqlite3_session
+    **
+    ** If argument zTab is not NULL, then it is the name of a table to attach
+    ** to the session object passed as the first argument. All subsequent changes
+    ** made to the table while the session object is enabled will be recorded. See
+    ** documentation for [sqlite3session_changeset()] for further details.
+    **
+    ** Or, if argument zTab is NULL, then changes are recorded for all tables
+    ** in the database. If additional tables are added to the database (by
+    ** executing "CREATE TABLE" statements) after this call is made, changes for
+    ** the new tables are also recorded.
+    **
+    ** Changes can only be recorded for tables that have a PRIMARY KEY explicitly
+    ** defined as part of their CREATE TABLE statement. It does not matter if the
+    ** PRIMARY KEY is an "INTEGER PRIMARY KEY" (rowid alias) or not. The PRIMARY
+    ** KEY may consist of a single column, or may be a composite key.
+    **
+    ** It is not an error if the named table does not exist in the database. Nor
+    ** is it an error if the named table does not have a PRIMARY KEY. However,
+    ** no changes will be recorded in either of these scenarios.
+    **
+    ** Changes are not recorded for individual rows that have NULL values stored
+    ** in one or more of their PRIMARY KEY columns.
+    **
+    ** SQLITE_OK is returned if the call completes without error. Or, if an error
+    ** occurs, an SQLite error code (e.g. SQLITE_NOMEM) is returned.
+    **
+    ** <h3>Special sqlite_stat1 Handling</h3>
+    **
+    ** As of SQLite version 3.22.0, the "sqlite_stat1" table is an exception to
+    ** some of the rules above. In SQLite, the schema of sqlite_stat1 is:
+    **  <pre>
+    **  &nbsp;     CREATE TABLE sqlite_stat1(tbl,idx,stat)
+    **  </pre>
+    **
+    ** Even though sqlite_stat1 does not have a PRIMARY KEY, changes are
+    ** recorded for it as if the PRIMARY KEY is (tbl,idx). Additionally, changes
+    ** are recorded for rows for which (idx IS NULL) is true. However, for such
+    ** rows a zero-length blob (SQL value X'') is stored in the changeset or
+    ** patchset instead of a NULL value. This allows such changesets to be
+    ** manipulated by legacy implementations of sqlite3changeset_invert(),
+    ** concat() and similar.
+    **
+    ** The sqlite3changeset_apply() function automatically converts the
+    ** zero-length blob back to a NULL value when updating the sqlite_stat1
+    ** table. However, if the application calls sqlite3changeset_new(),
+    ** sqlite3changeset_old() or sqlite3changeset_conflict on a changeset
+    ** iterator directly (including on a changeset iterator passed to a
+    ** conflict-handler callback) then the X'' value is returned. The application
+    ** must translate X'' to NULL itself if required.
+    **
+    ** Legacy (older than 3.22.0) versions of the sessions module cannot capture
+    ** changes made to the sqlite_stat1 table. Legacy versions of the
+    ** sqlite3changeset_apply() function silently ignore any modifications to the
+    ** sqlite_stat1 table that are part of a changeset or patchset.
+    */
+    SQLITE_API int sqlite3session_attach(sqlite3_session* pSession, /* Session object */
+                                         const char* zTab           /* Table name */
+    );
+
+    /*
+    ** CAPI3REF: Set a table filter on a Session Object.
+    ** METHOD: sqlite3_session
+    **
+    ** The second argument (xFilter) is the "filter callback". For changes to rows
+    ** in tables that are not attached to the Session object, the filter is called
+    ** to determine whether changes to the table's rows should be tracked or not.
+    ** If xFilter returns 0, changes are not tracked. Note that once a table is
+    ** attached, xFilter will not be called again.
+    */
+    SQLITE_API void sqlite3session_table_filter(sqlite3_session* pSession, /* Session object */
+                                                int (*xFilter)(void* pCtx, /* Copy of third arg to _filter_table() */
+                                                               const char* zTab /* Table name */
+                                                               ),
+                                                void* pCtx /* First argument passed to xFilter */
+    );
+
+    /*
+    ** CAPI3REF: Generate A Changeset From A Session Object
+    ** METHOD: sqlite3_session
+    **
+    ** Obtain a changeset containing changes to the tables attached to the
+    ** session object passed as the first argument. If successful,
+    ** set *ppChangeset to point to a buffer containing the changeset
+    ** and *pnChangeset to the size of the changeset in bytes before returning
+    ** SQLITE_OK. If an error occurs, set both *ppChangeset and *pnChangeset to
+    ** zero and return an SQLite error code.
+    **
+    ** A changeset consists of zero or more INSERT, UPDATE and/or DELETE changes,
+    ** each representing a change to a single row of an attached table. An INSERT
+    ** change contains the values of each field of a new database row. A DELETE
+    ** contains the original values of each field of a deleted database row. An
+    ** UPDATE change contains the original values of each field of an updated
+    ** database row along with the updated values for each updated non-primary-key
+    ** column. It is not possible for an UPDATE change to represent a change that
+    ** modifies the values of primary key columns. If such a change is made, it
+    ** is represented in a changeset as a DELETE followed by an INSERT.
+    **
+    ** Changes are not recorded for rows that have NULL values stored in one or
+    ** more of their PRIMARY KEY columns. If such a row is inserted or deleted,
+    ** no corresponding change is present in the changesets returned by this
+    ** function. If an existing row with one or more NULL values stored in
+    ** PRIMARY KEY columns is updated so that all PRIMARY KEY columns are non-NULL,
+    ** only an INSERT is appears in the changeset. Similarly, if an existing row
+    ** with non-NULL PRIMARY KEY values is updated so that one or more of its
+    ** PRIMARY KEY columns are set to NULL, the resulting changeset contains a
+    ** DELETE change only.
+    **
+    ** The contents of a changeset may be traversed using an iterator created
+    ** using the [sqlite3changeset_start()] API. A changeset may be applied to
+    ** a database with a compatible schema using the [sqlite3changeset_apply()]
+    ** API.
+    **
+    ** Within a changeset generated by this function, all changes related to a
+    ** single table are grouped together. In other words, when iterating through
+    ** a changeset or when applying a changeset to a database, all changes related
+    ** to a single table are processed before moving on to the next table. Tables
+    ** are sorted in the same order in which they were attached (or auto-attached)
+    ** to the sqlite3_session object. The order in which the changes related to
+    ** a single table are stored is undefined.
+    **
+    ** Following a successful call to this function, it is the responsibility of
+    ** the caller to eventually free the buffer that *ppChangeset points to using
+    ** [sqlite3_free()].
+    **
+    ** <h3>Changeset Generation</h3>
+    **
+    ** Once a table has been attached to a session object, the session object
+    ** records the primary key values of all new rows inserted into the table.
+    ** It also records the original primary key and other column values of any
+    ** deleted or updated rows. For each unique primary key value, data is only
+    ** recorded once - the first time a row with said primary key is inserted,
+    ** updated or deleted in the lifetime of the session.
+    **
+    ** There is one exception to the previous paragraph: when a row is inserted,
+    ** updated or deleted, if one or more of its primary key columns contain a
+    ** NULL value, no record of the change is made.
+    **
+    ** The session object therefore accumulates two types of records - those
+    ** that consist of primary key values only (created when the user inserts
+    ** a new record) and those that consist of the primary key values and the
+    ** original values of other table columns (created when the users deletes
+    ** or updates a record).
+    **
+    ** When this function is called, the requested changeset is created using
+    ** both the accumulated records and the current contents of the database
+    ** file. Specifically:
+    **
+    ** <ul>
+    **   <li> For each record generated by an insert, the database is queried
+    **        for a row with a matching primary key. If one is found, an INSERT
+    **        change is added to the changeset. If no such row is found, no change
+    **        is added to the changeset.
+    **
+    **   <li> For each record generated by an update or delete, the database is
+    **        queried for a row with a matching primary key. If such a row is
+    **        found and one or more of the non-primary key fields have been
+    **        modified from their original values, an UPDATE change is added to
+    **        the changeset. Or, if no such row is found in the table, a DELETE
+    **        change is added to the changeset. If there is a row with a matching
+    **        primary key in the database, but all fields contain their original
+    **        values, no change is added to the changeset.
+    ** </ul>
+    **
+    ** This means, amongst other things, that if a row is inserted and then later
+    ** deleted while a session object is active, neither the insert nor the delete
+    ** will be present in the changeset. Or if a row is deleted and then later a
+    ** row with the same primary key values inserted while a session object is
+    ** active, the resulting changeset will contain an UPDATE change instead of
+    ** a DELETE and an INSERT.
+    **
+    ** When a session object is disabled (see the [sqlite3session_enable()] API),
+    ** it does not accumulate records when rows are inserted, updated or deleted.
+    ** This may appear to have some counter-intuitive effects if a single row
+    ** is written to more than once during a session. For example, if a row
+    ** is inserted while a session object is enabled, then later deleted while
+    ** the same session object is disabled, no INSERT record will appear in the
+    ** changeset, even though the delete took place while the session was disabled.
+    ** Or, if one field of a row is updated while a session is disabled, and
+    ** another field of the same row is updated while the session is enabled, the
+    ** resulting changeset will contain an UPDATE change that updates both fields.
+    */
+    SQLITE_API int sqlite3session_changeset(sqlite3_session* pSession, /* Session object */
+                                            int* pnChangeset,          /* OUT: Size of buffer at *ppChangeset */
+                                            void** ppChangeset         /* OUT: Buffer containing changeset */
+    );
+
+    /*
+    ** CAPI3REF: Return An Upper-limit For The Size Of The Changeset
+    ** METHOD: sqlite3_session
+    **
+    ** By default, this function always returns 0. For it to return
+    ** a useful result, the sqlite3_session object must have been configured
+    ** to enable this API using sqlite3session_object_config() with the
+    ** SQLITE_SESSION_OBJCONFIG_SIZE verb.
+    **
+    ** When enabled, this function returns an upper limit, in bytes, for the size
+    ** of the changeset that might be produced if sqlite3session_changeset() were
+    ** called. The final changeset size might be equal to or smaller than the
+    ** size in bytes returned by this function.
+    */
+    SQLITE_API sqlite3_int64 sqlite3session_changeset_size(sqlite3_session* pSession);
+
+    /*
+    ** CAPI3REF: Load The Difference Between Tables Into A Session
+    ** METHOD: sqlite3_session
+    **
+    ** If it is not already attached to the session object passed as the first
+    ** argument, this function attaches table zTbl in the same manner as the
+    ** [sqlite3session_attach()] function. If zTbl does not exist, or if it
+    ** does not have a primary key, this function is a no-op (but does not return
+    ** an error).
+    **
+    ** Argument zFromDb must be the name of a database ("main", "temp" etc.)
+    ** attached to the same database handle as the session object that contains
+    ** a table compatible with the table attached to the session by this function.
+    ** A table is considered compatible if it:
+    **
+    ** <ul>
+    **   <li> Has the same name,
+    **   <li> Has the same set of columns declared in the same order, and
+    **   <li> Has the same PRIMARY KEY definition.
+    ** </ul>
+    **
+    ** If the tables are not compatible, SQLITE_SCHEMA is returned. If the tables
+    ** are compatible but do not have any PRIMARY KEY columns, it is not an error
+    ** but no changes are added to the session object. As with other session
+    ** APIs, tables without PRIMARY KEYs are simply ignored.
+    **
+    ** This function adds a set of changes to the session object that could be
+    ** used to update the table in database zFrom (call this the "from-table")
+    ** so that its content is the same as the table attached to the session
+    ** object (call this the "to-table"). Specifically:
+    **
+    ** <ul>
+    **   <li> For each row (primary key) that exists in the to-table but not in
+    **     the from-table, an INSERT record is added to the session object.
+    **
+    **   <li> For each row (primary key) that exists in the to-table but not in
+    **     the from-table, a DELETE record is added to the session object.
+    **
+    **   <li> For each row (primary key) that exists in both tables, but features
+    **     different non-PK values in each, an UPDATE record is added to the
+    **     session.
+    ** </ul>
+    **
+    ** To clarify, if this function is called and then a changeset constructed
+    ** using [sqlite3session_changeset()], then after applying that changeset to
+    ** database zFrom the contents of the two compatible tables would be
+    ** identical.
+    **
+    ** It an error if database zFrom does not exist or does not contain the
+    ** required compatible table.
+    **
+    ** If the operation is successful, SQLITE_OK is returned. Otherwise, an SQLite
+    ** error code. In this case, if argument pzErrMsg is not NULL, *pzErrMsg
+    ** may be set to point to a buffer containing an English language error
+    ** message. It is the responsibility of the caller to free this buffer using
+    ** sqlite3_free().
+    */
+    SQLITE_API int
+      sqlite3session_diff(sqlite3_session* pSession, const char* zFromDb, const char* zTbl, char** pzErrMsg);
+
+    /*
+    ** CAPI3REF: Generate A Patchset From A Session Object
+    ** METHOD: sqlite3_session
+    **
+    ** The differences between a patchset and a changeset are that:
+    **
+    ** <ul>
+    **   <li> DELETE records consist of the primary key fields only. The
+    **        original values of other fields are omitted.
+    **   <li> The original values of any modified fields are omitted from
+    **        UPDATE records.
+    ** </ul>
+    **
+    ** A patchset blob may be used with up to date versions of all
+    ** sqlite3changeset_xxx API functions except for sqlite3changeset_invert(),
+    ** which returns SQLITE_CORRUPT if it is passed a patchset. Similarly,
+    ** attempting to use a patchset blob with old versions of the
+    ** sqlite3changeset_xxx APIs also provokes an SQLITE_CORRUPT error.
+    **
+    ** Because the non-primary key "old.*" fields are omitted, no
+    ** SQLITE_CHANGESET_DATA conflicts can be detected or reported if a patchset
+    ** is passed to the sqlite3changeset_apply() API. Other conflict types work
+    ** in the same way as for changesets.
+    **
+    ** Changes within a patchset are ordered in the same way as for changesets
+    ** generated by the sqlite3session_changeset() function (i.e. all changes for
+    ** a single table are grouped together, tables appear in the order in which
+    ** they were attached to the session object).
+    */
+    SQLITE_API int sqlite3session_patchset(sqlite3_session* pSession, /* Session object */
+                                           int* pnPatchset,           /* OUT: Size of buffer at *ppPatchset */
+                                           void** ppPatchset          /* OUT: Buffer containing patchset */
+    );
+
+    /*
+    ** CAPI3REF: Test if a changeset has recorded any changes.
+    **
+    ** Return non-zero if no changes to attached tables have been recorded by
+    ** the session object passed as the first argument. Otherwise, if one or
+    ** more changes have been recorded, return zero.
+    **
+    ** Even if this function returns zero, it is possible that calling
+    ** [sqlite3session_changeset()] on the session handle may still return a
+    ** changeset that contains no changes. This can happen when a row in
+    ** an attached table is modified and then later on the original values
+    ** are restored. However, if this function returns non-zero, then it is
+    ** guaranteed that a call to sqlite3session_changeset() will return a
+    ** changeset containing zero changes.
+    */
+    SQLITE_API int sqlite3session_isempty(sqlite3_session* pSession);
+
+    /*
+    ** CAPI3REF: Query for the amount of heap memory used by a session object.
+    **
+    ** This API returns the total amount of heap memory in bytes currently
+    ** used by the session object passed as the only argument.
+    */
+    SQLITE_API sqlite3_int64 sqlite3session_memory_used(sqlite3_session* pSession);
+
+    /*
+    ** CAPI3REF: Create An Iterator To Traverse A Changeset
+    ** CONSTRUCTOR: sqlite3_changeset_iter
+    **
+    ** Create an iterator used to iterate through the contents of a changeset.
+    ** If successful, *pp is set to point to the iterator handle and SQLITE_OK
+    ** is returned. Otherwise, if an error occurs, *pp is set to zero and an
+    ** SQLite error code is returned.
+    **
+    ** The following functions can be used to advance and query a changeset
+    ** iterator created by this function:
+    **
+    ** <ul>
+    **   <li> [sqlite3changeset_next()]
+    **   <li> [sqlite3changeset_op()]
+    **   <li> [sqlite3changeset_new()]
+    **   <li> [sqlite3changeset_old()]
+    ** </ul>
+    **
+    ** It is the responsibility of the caller to eventually destroy the iterator
+    ** by passing it to [sqlite3changeset_finalize()]. The buffer containing the
+    ** changeset (pChangeset) must remain valid until after the iterator is
+    ** destroyed.
+    **
+    ** Assuming the changeset blob was created by one of the
+    ** [sqlite3session_changeset()], [sqlite3changeset_concat()] or
+    ** [sqlite3changeset_invert()] functions, all changes within the changeset
+    ** that apply to a single table are grouped together. This means that when
+    ** an application iterates through a changeset using an iterator created by
+    ** this function, all changes that relate to a single table are visited
+    ** consecutively. There is no chance that the iterator will visit a change
+    ** the applies to table X, then one for table Y, and then later on visit
+    ** another change for table X.
+    **
+    ** The behavior of sqlite3changeset_start_v2() and its streaming equivalent
+    ** may be modified by passing a combination of
+    ** [SQLITE_CHANGESETSTART_INVERT | supported flags] as the 4th parameter.
+    **
+    ** Note that the sqlite3changeset_start_v2() API is still <b>experimental</b>
+    ** and therefore subject to change.
+    */
+    SQLITE_API int sqlite3changeset_start(sqlite3_changeset_iter** pp, /* OUT: New changeset iterator handle */
+                                          int nChangeset,              /* Size of changeset blob in bytes */
+                                          void* pChangeset             /* Pointer to blob containing changeset */
+    );
+    SQLITE_API int sqlite3changeset_start_v2(sqlite3_changeset_iter** pp, /* OUT: New changeset iterator handle */
+                                             int nChangeset,              /* Size of changeset blob in bytes */
+                                             void* pChangeset,            /* Pointer to blob containing changeset */
+                                             int flags                    /* SESSION_CHANGESETSTART_* flags */
+    );
 
 /*
-** CAPI3REF: Apply A Changeset To A Database
-**
-** Apply a changeset or patchset to a database. These functions attempt to
-** update the "main" database attached to handle db with the changes found in
-** the changeset passed via the second and third arguments.
-**
-** The fourth argument (xFilter) passed to these functions is the "filter
-** callback". If it is not NULL, then for each table affected by at least one
-** change in the changeset, the filter callback is invoked with
-** the table name as the second argument, and a copy of the context pointer
-** passed as the sixth argument as the first. If the "filter callback"
-** returns zero, then no attempt is made to apply any changes to the table.
-** Otherwise, if the return value is non-zero or the xFilter argument to
-** is NULL, all changes related to the table are attempted.
-**
-** For each table that is not excluded by the filter callback, this function
-** tests that the target database contains a compatible table. A table is
-** considered compatible if all of the following are true:
-**
-** <ul>
-**   <li> The table has the same name as the name recorded in the
-**        changeset, and
-**   <li> The table has at least as many columns as recorded in the
-**        changeset, and
-**   <li> The table has primary key columns in the same position as
-**        recorded in the changeset.
-** </ul>
-**
-** If there is no compatible table, it is not an error, but none of the
-** changes associated with the table are applied. A warning message is issued
-** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
-** one such warning is issued for each table in the changeset.
-**
-** For each change for which there is a compatible table, an attempt is made
-** to modify the table contents according to the UPDATE, INSERT or DELETE
-** change. If a change cannot be applied cleanly, the conflict handler
-** function passed as the fifth argument to sqlite3changeset_apply() may be
-** invoked. A description of exactly when the conflict handler is invoked for
-** each type of change is below.
-**
-** Unlike the xFilter argument, xConflict may not be passed NULL. The results
-** of passing anything other than a valid function pointer as the xConflict
-** argument are undefined.
-**
-** Each time the conflict handler function is invoked, it must return one
-** of [SQLITE_CHANGESET_OMIT], [SQLITE_CHANGESET_ABORT] or
-** [SQLITE_CHANGESET_REPLACE]. SQLITE_CHANGESET_REPLACE may only be returned
-** if the second argument passed to the conflict handler is either
-** SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If the conflict-handler
-** returns an illegal value, any changes already made are rolled back and
-** the call to sqlite3changeset_apply() returns SQLITE_MISUSE. Different
-** actions are taken by sqlite3changeset_apply() depending on the value
-** returned by each invocation of the conflict-handler function. Refer to
-** the documentation for the three
-** [SQLITE_CHANGESET_OMIT|available return values] for details.
+** CAPI3REF: Flags for sqlite3changeset_start_v2
 **
-** <dl>
-** <dt>DELETE Changes<dd>
-**   For each DELETE change, the function checks if the target database
-**   contains a row with the same primary key value (or values) as the
-**   original row values stored in the changeset. If it does, and the values
-**   stored in all non-primary key columns also match the values stored in
-**   the changeset the row is deleted from the target database.
-**
-**   If a row with matching primary key values is found, but one or more of
-**   the non-primary key fields contains a value different from the original
-**   row value stored in the changeset, the conflict-handler function is
-**   invoked with [SQLITE_CHANGESET_DATA] as the second argument. If the
-**   database table has more columns than are recorded in the changeset,
-**   only the values of those non-primary key fields are compared against
-**   the current database contents - any trailing database table columns
-**   are ignored.
-**
-**   If no row with matching primary key values is found in the database,
-**   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
-**   passed as the second argument.
-**
-**   If the DELETE operation is attempted, but SQLite returns SQLITE_CONSTRAINT
-**   (which can only happen if a foreign key constraint is violated), the
-**   conflict-handler function is invoked with [SQLITE_CHANGESET_CONSTRAINT]
-**   passed as the second argument. This includes the case where the DELETE
-**   operation is attempted because an earlier call to the conflict handler
-**   function returned [SQLITE_CHANGESET_REPLACE].
-**
-** <dt>INSERT Changes<dd>
-**   For each INSERT change, an attempt is made to insert the new row into
-**   the database. If the changeset row contains fewer fields than the
-**   database table, the trailing fields are populated with their default
-**   values.
-**
-**   If the attempt to insert the row fails because the database already
-**   contains a row with the same primary key values, the conflict handler
-**   function is invoked with the second argument set to
-**   [SQLITE_CHANGESET_CONFLICT].
-**
-**   If the attempt to insert the row fails because of some other constraint
-**   violation (e.g. NOT NULL or UNIQUE), the conflict handler function is
-**   invoked with the second argument set to [SQLITE_CHANGESET_CONSTRAINT].
-**   This includes the case where the INSERT operation is re-attempted because
-**   an earlier call to the conflict handler function returned
-**   [SQLITE_CHANGESET_REPLACE].
-**
-** <dt>UPDATE Changes<dd>
-**   For each UPDATE change, the function checks if the target database
-**   contains a row with the same primary key value (or values) as the
-**   original row values stored in the changeset. If it does, and the values
-**   stored in all modified non-primary key columns also match the values
-**   stored in the changeset the row is updated within the target database.
-**
-**   If a row with matching primary key values is found, but one or more of
-**   the modified non-primary key fields contains a value different from an
-**   original row value stored in the changeset, the conflict-handler function
-**   is invoked with [SQLITE_CHANGESET_DATA] as the second argument. Since
-**   UPDATE changes only contain values for non-primary key fields that are
-**   to be modified, only those fields need to match the original values to
-**   avoid the SQLITE_CHANGESET_DATA conflict-handler callback.
-**
-**   If no row with matching primary key values is found in the database,
-**   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
-**   passed as the second argument.
-**
-**   If the UPDATE operation is attempted, but SQLite returns
-**   SQLITE_CONSTRAINT, the conflict-handler function is invoked with
-**   [SQLITE_CHANGESET_CONSTRAINT] passed as the second argument.
-**   This includes the case where the UPDATE operation is attempted after
-**   an earlier call to the conflict handler function returned
-**   [SQLITE_CHANGESET_REPLACE].
-** </dl>
+** The following flags may passed via the 4th parameter to
+** [sqlite3changeset_start_v2] and [sqlite3changeset_start_v2_strm]:
 **
-** It is safe to execute SQL statements, including those that write to the
-** table that the callback related to, from within the xConflict callback.
-** This can be used to further customize the application's conflict
-** resolution strategy.
-**
-** All changes made by these functions are enclosed in a savepoint transaction.
-** If any other error (aside from a constraint failure when attempting to
-** write to the target database) occurs, then the savepoint transaction is
-** rolled back, restoring the target database to its original state, and an
-** SQLite error code returned.
-**
-** If the output parameters (ppRebase) and (pnRebase) are non-NULL and
-** the input is a changeset (not a patchset), then sqlite3changeset_apply_v2()
-** may set (*ppRebase) to point to a "rebase" that may be used with the
-** sqlite3_rebaser APIs buffer before returning. In this case (*pnRebase)
-** is set to the size of the buffer in bytes. It is the responsibility of the
-** caller to eventually free any such buffer using sqlite3_free(). The buffer
-** is only allocated and populated if one or more conflicts were encountered
-** while applying the patchset. See comments surrounding the sqlite3_rebaser
-** APIs for further details.
-**
-** The behavior of sqlite3changeset_apply_v2() and its streaming equivalent
-** may be modified by passing a combination of
-** [SQLITE_CHANGESETAPPLY_NOSAVEPOINT | supported flags] as the 9th parameter.
-**
-** Note that the sqlite3changeset_apply_v2() API is still <b>experimental</b>
-** and therefore subject to change.
+** <dt>SQLITE_CHANGESETAPPLY_INVERT <dd>
+**   Invert the changeset while iterating through it. This is equivalent to
+**   inverting a changeset using sqlite3changeset_invert() before applying it.
+**   It is an error to specify this flag with a patchset.
 */
-SQLITE_API int sqlite3changeset_apply(
-  sqlite3 *db,                    /* Apply change to "main" db of this handle */
-  int nChangeset,                 /* Size of changeset in bytes */
-  void *pChangeset,               /* Changeset blob */
-  int(*xFilter)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    const char *zTab              /* Table name */
-  ),
-  int(*xConflict)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
-    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
-  ),
-  void *pCtx                      /* First argument passed to xConflict */
-);
-SQLITE_API int sqlite3changeset_apply_v2(
-  sqlite3 *db,                    /* Apply change to "main" db of this handle */
-  int nChangeset,                 /* Size of changeset in bytes */
-  void *pChangeset,               /* Changeset blob */
-  int(*xFilter)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    const char *zTab              /* Table name */
-  ),
-  int(*xConflict)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
-    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
-  ),
-  void *pCtx,                     /* First argument passed to xConflict */
-  void **ppRebase, int *pnRebase, /* OUT: Rebase data */
-  int flags                       /* SESSION_CHANGESETAPPLY_* flags */
-);
+#define SQLITE_CHANGESETSTART_INVERT 0x0002
+
+    /*
+    ** CAPI3REF: Advance A Changeset Iterator
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** This function may only be used with iterators created by the function
+    ** [sqlite3changeset_start()]. If it is called on an iterator passed to
+    ** a conflict-handler callback by [sqlite3changeset_apply()], SQLITE_MISUSE
+    ** is returned and the call has no effect.
+    **
+    ** Immediately after an iterator is created by sqlite3changeset_start(), it
+    ** does not point to any change in the changeset. Assuming the changeset
+    ** is not empty, the first call to this function advances the iterator to
+    ** point to the first change in the changeset. Each subsequent call advances
+    ** the iterator to point to the next change in the changeset (if any). If
+    ** no error occurs and the iterator points to a valid change after a call
+    ** to sqlite3changeset_next() has advanced it, SQLITE_ROW is returned.
+    ** Otherwise, if all changes in the changeset have already been visited,
+    ** SQLITE_DONE is returned.
+    **
+    ** If an error occurs, an SQLite error code is returned. Possible error
+    ** codes include SQLITE_CORRUPT (if the changeset buffer is corrupt) or
+    ** SQLITE_NOMEM.
+    */
+    SQLITE_API int sqlite3changeset_next(sqlite3_changeset_iter* pIter);
+
+    /*
+    ** CAPI3REF: Obtain The Current Operation From A Changeset Iterator
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** The pIter argument passed to this function may either be an iterator
+    ** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
+    ** created by [sqlite3changeset_start()]. In the latter case, the most recent
+    ** call to [sqlite3changeset_next()] must have returned [SQLITE_ROW]. If this
+    ** is not the case, this function returns [SQLITE_MISUSE].
+    **
+    ** Arguments pOp, pnCol and pzTab may not be NULL. Upon return, three
+    ** outputs are set through these pointers:
+    **
+    ** *pOp is set to one of [SQLITE_INSERT], [SQLITE_DELETE] or [SQLITE_UPDATE],
+    ** depending on the type of change that the iterator currently points to;
+    **
+    ** *pnCol is set to the number of columns in the table affected by the change; and
+    **
+    ** *pzTab is set to point to a nul-terminated utf-8 encoded string containing
+    ** the name of the table affected by the current change. The buffer remains
+    ** valid until either sqlite3changeset_next() is called on the iterator
+    ** or until the conflict-handler function returns.
+    **
+    ** If pbIndirect is not NULL, then *pbIndirect is set to true (1) if the change
+    ** is an indirect change, or false (0) otherwise. See the documentation for
+    ** [sqlite3session_indirect()] for a description of direct and indirect
+    ** changes.
+    **
+    ** If no error occurs, SQLITE_OK is returned. If an error does occur, an
+    ** SQLite error code is returned. The values of the output variables may not
+    ** be trusted in this case.
+    */
+    SQLITE_API int sqlite3changeset_op(sqlite3_changeset_iter* pIter, /* Iterator object */
+                                       const char** pzTab,            /* OUT: Pointer to table name */
+                                       int* pnCol,                    /* OUT: Number of columns in table */
+                                       int* pOp,                      /* OUT: SQLITE_INSERT, DELETE or UPDATE */
+                                       int* pbIndirect                /* OUT: True for an 'indirect' change */
+    );
+
+    /*
+    ** CAPI3REF: Obtain The Primary Key Definition Of A Table
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** For each modified table, a changeset includes the following:
+    **
+    ** <ul>
+    **   <li> The number of columns in the table, and
+    **   <li> Which of those columns make up the tables PRIMARY KEY.
+    ** </ul>
+    **
+    ** This function is used to find which columns comprise the PRIMARY KEY of
+    ** the table modified by the change that iterator pIter currently points to.
+    ** If successful, *pabPK is set to point to an array of nCol entries, where
+    ** nCol is the number of columns in the table. Elements of *pabPK are set to
+    ** 0x01 if the corresponding column is part of the tables primary key, or
+    ** 0x00 if it is not.
+    **
+    ** If argument pnCol is not NULL, then *pnCol is set to the number of columns
+    ** in the table.
+    **
+    ** If this function is called when the iterator does not point to a valid
+    ** entry, SQLITE_MISUSE is returned and the output variables zeroed. Otherwise,
+    ** SQLITE_OK is returned and the output variables populated as described
+    ** above.
+    */
+    SQLITE_API int sqlite3changeset_pk(sqlite3_changeset_iter* pIter, /* Iterator object */
+                                       unsigned char** pabPK,         /* OUT: Array of boolean - true for PK cols */
+                                       int* pnCol                     /* OUT: Number of entries in output array */
+    );
+
+    /*
+    ** CAPI3REF: Obtain old.* Values From A Changeset Iterator
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** The pIter argument passed to this function may either be an iterator
+    ** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
+    ** created by [sqlite3changeset_start()]. In the latter case, the most recent
+    ** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
+    ** Furthermore, it may only be called if the type of change that the iterator
+    ** currently points to is either [SQLITE_DELETE] or [SQLITE_UPDATE]. Otherwise,
+    ** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
+    **
+    ** Argument iVal must be greater than or equal to 0, and less than the number
+    ** of columns in the table affected by the current change. Otherwise,
+    ** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
+    **
+    ** If successful, this function sets *ppValue to point to a protected
+    ** sqlite3_value object containing the iVal'th value from the vector of
+    ** original row values stored as part of the UPDATE or DELETE change and
+    ** returns SQLITE_OK. The name of the function comes from the fact that this
+    ** is similar to the "old.*" columns available to update or delete triggers.
+    **
+    ** If some other error occurs (e.g. an OOM condition), an SQLite error code
+    ** is returned and *ppValue is set to NULL.
+    */
+    SQLITE_API int sqlite3changeset_old(sqlite3_changeset_iter* pIter, /* Changeset iterator */
+                                        int iVal,                      /* Column number */
+                                        sqlite3_value** ppValue        /* OUT: Old value (or NULL pointer) */
+    );
+
+    /*
+    ** CAPI3REF: Obtain new.* Values From A Changeset Iterator
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** The pIter argument passed to this function may either be an iterator
+    ** passed to a conflict-handler by [sqlite3changeset_apply()], or an iterator
+    ** created by [sqlite3changeset_start()]. In the latter case, the most recent
+    ** call to [sqlite3changeset_next()] must have returned SQLITE_ROW.
+    ** Furthermore, it may only be called if the type of change that the iterator
+    ** currently points to is either [SQLITE_UPDATE] or [SQLITE_INSERT]. Otherwise,
+    ** this function returns [SQLITE_MISUSE] and sets *ppValue to NULL.
+    **
+    ** Argument iVal must be greater than or equal to 0, and less than the number
+    ** of columns in the table affected by the current change. Otherwise,
+    ** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
+    **
+    ** If successful, this function sets *ppValue to point to a protected
+    ** sqlite3_value object containing the iVal'th value from the vector of
+    ** new row values stored as part of the UPDATE or INSERT change and
+    ** returns SQLITE_OK. If the change is an UPDATE and does not include
+    ** a new value for the requested column, *ppValue is set to NULL and
+    ** SQLITE_OK returned. The name of the function comes from the fact that
+    ** this is similar to the "new.*" columns available to update or delete
+    ** triggers.
+    **
+    ** If some other error occurs (e.g. an OOM condition), an SQLite error code
+    ** is returned and *ppValue is set to NULL.
+    */
+    SQLITE_API int sqlite3changeset_new(sqlite3_changeset_iter* pIter, /* Changeset iterator */
+                                        int iVal,                      /* Column number */
+                                        sqlite3_value** ppValue        /* OUT: New value (or NULL pointer) */
+    );
+
+    /*
+    ** CAPI3REF: Obtain Conflicting Row Values From A Changeset Iterator
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** This function should only be used with iterator objects passed to a
+    ** conflict-handler callback by [sqlite3changeset_apply()] with either
+    ** [SQLITE_CHANGESET_DATA] or [SQLITE_CHANGESET_CONFLICT]. If this function
+    ** is called on any other iterator, [SQLITE_MISUSE] is returned and *ppValue
+    ** is set to NULL.
+    **
+    ** Argument iVal must be greater than or equal to 0, and less than the number
+    ** of columns in the table affected by the current change. Otherwise,
+    ** [SQLITE_RANGE] is returned and *ppValue is set to NULL.
+    **
+    ** If successful, this function sets *ppValue to point to a protected
+    ** sqlite3_value object containing the iVal'th value from the
+    ** "conflicting row" associated with the current conflict-handler callback
+    ** and returns SQLITE_OK.
+    **
+    ** If some other error occurs (e.g. an OOM condition), an SQLite error code
+    ** is returned and *ppValue is set to NULL.
+    */
+    SQLITE_API int sqlite3changeset_conflict(sqlite3_changeset_iter* pIter, /* Changeset iterator */
+                                             int iVal,                      /* Column number */
+                                             sqlite3_value** ppValue        /* OUT: Value from conflicting row */
+    );
+
+    /*
+    ** CAPI3REF: Determine The Number Of Foreign Key Constraint Violations
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** This function may only be called with an iterator passed to an
+    ** SQLITE_CHANGESET_FOREIGN_KEY conflict handler callback. In this case
+    ** it sets the output variable to the total number of known foreign key
+    ** violations in the destination database and returns SQLITE_OK.
+    **
+    ** In all other cases this function returns SQLITE_MISUSE.
+    */
+    SQLITE_API int sqlite3changeset_fk_conflicts(sqlite3_changeset_iter* pIter, /* Changeset iterator */
+                                                 int* pnOut                     /* OUT: Number of FK violations */
+    );
+
+    /*
+    ** CAPI3REF: Finalize A Changeset Iterator
+    ** METHOD: sqlite3_changeset_iter
+    **
+    ** This function is used to finalize an iterator allocated with
+    ** [sqlite3changeset_start()].
+    **
+    ** This function should only be called on iterators created using the
+    ** [sqlite3changeset_start()] function. If an application calls this
+    ** function with an iterator passed to a conflict-handler by
+    ** [sqlite3changeset_apply()], [SQLITE_MISUSE] is immediately returned and the
+    ** call has no effect.
+    **
+    ** If an error was encountered within a call to an sqlite3changeset_xxx()
+    ** function (for example an [SQLITE_CORRUPT] in [sqlite3changeset_next()] or an
+    ** [SQLITE_NOMEM] in [sqlite3changeset_new()]) then an error code corresponding
+    ** to that error is returned by this function. Otherwise, SQLITE_OK is
+    ** returned. This is to allow the following pattern (pseudo-code):
+    **
+    ** <pre>
+    **   sqlite3changeset_start();
+    **   while( SQLITE_ROW==sqlite3changeset_next() ){
+    **     // Do something with change.
+    **   }
+    **   rc = sqlite3changeset_finalize();
+    **   if( rc!=SQLITE_OK ){
+    **     // An error has occurred
+    **   }
+    ** </pre>
+    */
+    SQLITE_API int sqlite3changeset_finalize(sqlite3_changeset_iter* pIter);
+
+    /*
+    ** CAPI3REF: Invert A Changeset
+    **
+    ** This function is used to "invert" a changeset object. Applying an inverted
+    ** changeset to a database reverses the effects of applying the uninverted
+    ** changeset. Specifically:
+    **
+    ** <ul>
+    **   <li> Each DELETE change is changed to an INSERT, and
+    **   <li> Each INSERT change is changed to a DELETE, and
+    **   <li> For each UPDATE change, the old.* and new.* values are exchanged.
+    ** </ul>
+    **
+    ** This function does not change the order in which changes appear within
+    ** the changeset. It merely reverses the sense of each individual change.
+    **
+    ** If successful, a pointer to a buffer containing the inverted changeset
+    ** is stored in *ppOut, the size of the same buffer is stored in *pnOut, and
+    ** SQLITE_OK is returned. If an error occurs, both *pnOut and *ppOut are
+    ** zeroed and an SQLite error code returned.
+    **
+    ** It is the responsibility of the caller to eventually call sqlite3_free()
+    ** on the *ppOut pointer to free the buffer allocation following a successful
+    ** call to this function.
+    **
+    ** WARNING/TODO: This function currently assumes that the input is a valid
+    ** changeset. If it is not, the results are undefined.
+    */
+    SQLITE_API int sqlite3changeset_invert(int nIn,
+                                           const void* pIn, /* Input changeset */
+                                           int* pnOut,
+                                           void** ppOut /* OUT: Inverse of input */
+    );
+
+    /*
+    ** CAPI3REF: Concatenate Two Changeset Objects
+    **
+    ** This function is used to concatenate two changesets, A and B, into a
+    ** single changeset. The result is a changeset equivalent to applying
+    ** changeset A followed by changeset B.
+    **
+    ** This function combines the two input changesets using an
+    ** sqlite3_changegroup object. Calling it produces similar results as the
+    ** following code fragment:
+    **
+    ** <pre>
+    **   sqlite3_changegroup *pGrp;
+    **   rc = sqlite3_changegroup_new(&pGrp);
+    **   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nA, pA);
+    **   if( rc==SQLITE_OK ) rc = sqlite3changegroup_add(pGrp, nB, pB);
+    **   if( rc==SQLITE_OK ){
+    **     rc = sqlite3changegroup_output(pGrp, pnOut, ppOut);
+    **   }else{
+    **     *ppOut = 0;
+    **     *pnOut = 0;
+    **   }
+    ** </pre>
+    **
+    ** Refer to the sqlite3_changegroup documentation below for details.
+    */
+    SQLITE_API int sqlite3changeset_concat(int nA,      /* Number of bytes in buffer pA */
+                                           void* pA,    /* Pointer to buffer containing changeset A */
+                                           int nB,      /* Number of bytes in buffer pB */
+                                           void* pB,    /* Pointer to buffer containing changeset B */
+                                           int* pnOut,  /* OUT: Number of bytes in output changeset */
+                                           void** ppOut /* OUT: Buffer containing output changeset */
+    );
+
+    /*
+    ** CAPI3REF: Changegroup Handle
+    **
+    ** A changegroup is an object used to combine two or more
+    ** [changesets] or [patchsets]
+    */
+    typedef struct sqlite3_changegroup sqlite3_changegroup;
+
+    /*
+    ** CAPI3REF: Create A New Changegroup Object
+    ** CONSTRUCTOR: sqlite3_changegroup
+    **
+    ** An sqlite3_changegroup object is used to combine two or more changesets
+    ** (or patchsets) into a single changeset (or patchset). A single changegroup
+    ** object may combine changesets or patchsets, but not both. The output is
+    ** always in the same format as the input.
+    **
+    ** If successful, this function returns SQLITE_OK and populates (*pp) with
+    ** a pointer to a new sqlite3_changegroup object before returning. The caller
+    ** should eventually free the returned object using a call to
+    ** sqlite3changegroup_delete(). If an error occurs, an SQLite error code
+    ** (i.e. SQLITE_NOMEM) is returned and *pp is set to NULL.
+    **
+    ** The usual usage pattern for an sqlite3_changegroup object is as follows:
+    **
+    ** <ul>
+    **   <li> It is created using a call to sqlite3changegroup_new().
+    **
+    **   <li> Zero or more changesets (or patchsets) are added to the object
+    **        by calling sqlite3changegroup_add().
+    **
+    **   <li> The result of combining all input changesets together is obtained
+    **        by the application via a call to sqlite3changegroup_output().
+    **
+    **   <li> The object is deleted using a call to sqlite3changegroup_delete().
+    ** </ul>
+    **
+    ** Any number of calls to add() and output() may be made between the calls to
+    ** new() and delete(), and in any order.
+    **
+    ** As well as the regular sqlite3changegroup_add() and
+    ** sqlite3changegroup_output() functions, also available are the streaming
+    ** versions sqlite3changegroup_add_strm() and sqlite3changegroup_output_strm().
+    */
+    SQLITE_API int sqlite3changegroup_new(sqlite3_changegroup** pp);
+
+    /*
+    ** CAPI3REF: Add A Changeset To A Changegroup
+    ** METHOD: sqlite3_changegroup
+    **
+    ** Add all changes within the changeset (or patchset) in buffer pData (size
+    ** nData bytes) to the changegroup.
+    **
+    ** If the buffer contains a patchset, then all prior calls to this function
+    ** on the same changegroup object must also have specified patchsets. Or, if
+    ** the buffer contains a changeset, so must have the earlier calls to this
+    ** function. Otherwise, SQLITE_ERROR is returned and no changes are added
+    ** to the changegroup.
+    **
+    ** Rows within the changeset and changegroup are identified by the values in
+    ** their PRIMARY KEY columns. A change in the changeset is considered to
+    ** apply to the same row as a change already present in the changegroup if
+    ** the two rows have the same primary key.
+    **
+    ** Changes to rows that do not already appear in the changegroup are
+    ** simply copied into it. Or, if both the new changeset and the changegroup
+    ** contain changes that apply to a single row, the final contents of the
+    ** changegroup depends on the type of each change, as follows:
+    **
+    ** <table border=1 style="margin-left:8ex;margin-right:8ex">
+    **   <tr><th style="white-space:pre">Existing Change  </th>
+    **       <th style="white-space:pre">New Change       </th>
+    **       <th>Output Change
+    **   <tr><td>INSERT <td>INSERT <td>
+    **       The new change is ignored. This case does not occur if the new
+    **       changeset was recorded immediately after the changesets already
+    **       added to the changegroup.
+    **   <tr><td>INSERT <td>UPDATE <td>
+    **       The INSERT change remains in the changegroup. The values in the
+    **       INSERT change are modified as if the row was inserted by the
+    **       existing change and then updated according to the new change.
+    **   <tr><td>INSERT <td>DELETE <td>
+    **       The existing INSERT is removed from the changegroup. The DELETE is
+    **       not added.
+    **   <tr><td>UPDATE <td>INSERT <td>
+    **       The new change is ignored. This case does not occur if the new
+    **       changeset was recorded immediately after the changesets already
+    **       added to the changegroup.
+    **   <tr><td>UPDATE <td>UPDATE <td>
+    **       The existing UPDATE remains within the changegroup. It is amended
+    **       so that the accompanying values are as if the row was updated once
+    **       by the existing change and then again by the new change.
+    **   <tr><td>UPDATE <td>DELETE <td>
+    **       The existing UPDATE is replaced by the new DELETE within the
+    **       changegroup.
+    **   <tr><td>DELETE <td>INSERT <td>
+    **       If one or more of the column values in the row inserted by the
+    **       new change differ from those in the row deleted by the existing
+    **       change, the existing DELETE is replaced by an UPDATE within the
+    **       changegroup. Otherwise, if the inserted row is exactly the same
+    **       as the deleted row, the existing DELETE is simply discarded.
+    **   <tr><td>DELETE <td>UPDATE <td>
+    **       The new change is ignored. This case does not occur if the new
+    **       changeset was recorded immediately after the changesets already
+    **       added to the changegroup.
+    **   <tr><td>DELETE <td>DELETE <td>
+    **       The new change is ignored. This case does not occur if the new
+    **       changeset was recorded immediately after the changesets already
+    **       added to the changegroup.
+    ** </table>
+    **
+    ** If the new changeset contains changes to a table that is already present
+    ** in the changegroup, then the number of columns and the position of the
+    ** primary key columns for the table must be consistent. If this is not the
+    ** case, this function fails with SQLITE_SCHEMA. If the input changeset
+    ** appears to be corrupt and the corruption is detected, SQLITE_CORRUPT is
+    ** returned. Or, if an out-of-memory condition occurs during processing, this
+    ** function returns SQLITE_NOMEM. In all cases, if an error occurs the state
+    ** of the final contents of the changegroup is undefined.
+    **
+    ** If no error occurs, SQLITE_OK is returned.
+    */
+    SQLITE_API int sqlite3changegroup_add(sqlite3_changegroup*, int nData, void* pData);
+
+    /*
+    ** CAPI3REF: Obtain A Composite Changeset From A Changegroup
+    ** METHOD: sqlite3_changegroup
+    **
+    ** Obtain a buffer containing a changeset (or patchset) representing the
+    ** current contents of the changegroup. If the inputs to the changegroup
+    ** were themselves changesets, the output is a changeset. Or, if the
+    ** inputs were patchsets, the output is also a patchset.
+    **
+    ** As with the output of the sqlite3session_changeset() and
+    ** sqlite3session_patchset() functions, all changes related to a single
+    ** table are grouped together in the output of this function. Tables appear
+    ** in the same order as for the very first changeset added to the changegroup.
+    ** If the second or subsequent changesets added to the changegroup contain
+    ** changes for tables that do not appear in the first changeset, they are
+    ** appended onto the end of the output changeset, again in the order in
+    ** which they are first encountered.
+    **
+    ** If an error occurs, an SQLite error code is returned and the output
+    ** variables (*pnData) and (*ppData) are set to 0. Otherwise, SQLITE_OK
+    ** is returned and the output variables are set to the size of and a
+    ** pointer to the output buffer, respectively. In this case it is the
+    ** responsibility of the caller to eventually free the buffer using a
+    ** call to sqlite3_free().
+    */
+    SQLITE_API int sqlite3changegroup_output(sqlite3_changegroup*,
+                                             int* pnData,  /* OUT: Size of output buffer in bytes */
+                                             void** ppData /* OUT: Pointer to output buffer */
+    );
+
+    /*
+    ** CAPI3REF: Delete A Changegroup Object
+    ** DESTRUCTOR: sqlite3_changegroup
+    */
+    SQLITE_API void sqlite3changegroup_delete(sqlite3_changegroup*);
+
+    /*
+    ** CAPI3REF: Apply A Changeset To A Database
+    **
+    ** Apply a changeset or patchset to a database. These functions attempt to
+    ** update the "main" database attached to handle db with the changes found in
+    ** the changeset passed via the second and third arguments.
+    **
+    ** The fourth argument (xFilter) passed to these functions is the "filter
+    ** callback". If it is not NULL, then for each table affected by at least one
+    ** change in the changeset, the filter callback is invoked with
+    ** the table name as the second argument, and a copy of the context pointer
+    ** passed as the sixth argument as the first. If the "filter callback"
+    ** returns zero, then no attempt is made to apply any changes to the table.
+    ** Otherwise, if the return value is non-zero or the xFilter argument to
+    ** is NULL, all changes related to the table are attempted.
+    **
+    ** For each table that is not excluded by the filter callback, this function
+    ** tests that the target database contains a compatible table. A table is
+    ** considered compatible if all of the following are true:
+    **
+    ** <ul>
+    **   <li> The table has the same name as the name recorded in the
+    **        changeset, and
+    **   <li> The table has at least as many columns as recorded in the
+    **        changeset, and
+    **   <li> The table has primary key columns in the same position as
+    **        recorded in the changeset.
+    ** </ul>
+    **
+    ** If there is no compatible table, it is not an error, but none of the
+    ** changes associated with the table are applied. A warning message is issued
+    ** via the sqlite3_log() mechanism with the error code SQLITE_SCHEMA. At most
+    ** one such warning is issued for each table in the changeset.
+    **
+    ** For each change for which there is a compatible table, an attempt is made
+    ** to modify the table contents according to the UPDATE, INSERT or DELETE
+    ** change. If a change cannot be applied cleanly, the conflict handler
+    ** function passed as the fifth argument to sqlite3changeset_apply() may be
+    ** invoked. A description of exactly when the conflict handler is invoked for
+    ** each type of change is below.
+    **
+    ** Unlike the xFilter argument, xConflict may not be passed NULL. The results
+    ** of passing anything other than a valid function pointer as the xConflict
+    ** argument are undefined.
+    **
+    ** Each time the conflict handler function is invoked, it must return one
+    ** of [SQLITE_CHANGESET_OMIT], [SQLITE_CHANGESET_ABORT] or
+    ** [SQLITE_CHANGESET_REPLACE]. SQLITE_CHANGESET_REPLACE may only be returned
+    ** if the second argument passed to the conflict handler is either
+    ** SQLITE_CHANGESET_DATA or SQLITE_CHANGESET_CONFLICT. If the conflict-handler
+    ** returns an illegal value, any changes already made are rolled back and
+    ** the call to sqlite3changeset_apply() returns SQLITE_MISUSE. Different
+    ** actions are taken by sqlite3changeset_apply() depending on the value
+    ** returned by each invocation of the conflict-handler function. Refer to
+    ** the documentation for the three
+    ** [SQLITE_CHANGESET_OMIT|available return values] for details.
+    **
+    ** <dl>
+    ** <dt>DELETE Changes<dd>
+    **   For each DELETE change, the function checks if the target database
+    **   contains a row with the same primary key value (or values) as the
+    **   original row values stored in the changeset. If it does, and the values
+    **   stored in all non-primary key columns also match the values stored in
+    **   the changeset the row is deleted from the target database.
+    **
+    **   If a row with matching primary key values is found, but one or more of
+    **   the non-primary key fields contains a value different from the original
+    **   row value stored in the changeset, the conflict-handler function is
+    **   invoked with [SQLITE_CHANGESET_DATA] as the second argument. If the
+    **   database table has more columns than are recorded in the changeset,
+    **   only the values of those non-primary key fields are compared against
+    **   the current database contents - any trailing database table columns
+    **   are ignored.
+    **
+    **   If no row with matching primary key values is found in the database,
+    **   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
+    **   passed as the second argument.
+    **
+    **   If the DELETE operation is attempted, but SQLite returns SQLITE_CONSTRAINT
+    **   (which can only happen if a foreign key constraint is violated), the
+    **   conflict-handler function is invoked with [SQLITE_CHANGESET_CONSTRAINT]
+    **   passed as the second argument. This includes the case where the DELETE
+    **   operation is attempted because an earlier call to the conflict handler
+    **   function returned [SQLITE_CHANGESET_REPLACE].
+    **
+    ** <dt>INSERT Changes<dd>
+    **   For each INSERT change, an attempt is made to insert the new row into
+    **   the database. If the changeset row contains fewer fields than the
+    **   database table, the trailing fields are populated with their default
+    **   values.
+    **
+    **   If the attempt to insert the row fails because the database already
+    **   contains a row with the same primary key values, the conflict handler
+    **   function is invoked with the second argument set to
+    **   [SQLITE_CHANGESET_CONFLICT].
+    **
+    **   If the attempt to insert the row fails because of some other constraint
+    **   violation (e.g. NOT NULL or UNIQUE), the conflict handler function is
+    **   invoked with the second argument set to [SQLITE_CHANGESET_CONSTRAINT].
+    **   This includes the case where the INSERT operation is re-attempted because
+    **   an earlier call to the conflict handler function returned
+    **   [SQLITE_CHANGESET_REPLACE].
+    **
+    ** <dt>UPDATE Changes<dd>
+    **   For each UPDATE change, the function checks if the target database
+    **   contains a row with the same primary key value (or values) as the
+    **   original row values stored in the changeset. If it does, and the values
+    **   stored in all modified non-primary key columns also match the values
+    **   stored in the changeset the row is updated within the target database.
+    **
+    **   If a row with matching primary key values is found, but one or more of
+    **   the modified non-primary key fields contains a value different from an
+    **   original row value stored in the changeset, the conflict-handler function
+    **   is invoked with [SQLITE_CHANGESET_DATA] as the second argument. Since
+    **   UPDATE changes only contain values for non-primary key fields that are
+    **   to be modified, only those fields need to match the original values to
+    **   avoid the SQLITE_CHANGESET_DATA conflict-handler callback.
+    **
+    **   If no row with matching primary key values is found in the database,
+    **   the conflict-handler function is invoked with [SQLITE_CHANGESET_NOTFOUND]
+    **   passed as the second argument.
+    **
+    **   If the UPDATE operation is attempted, but SQLite returns
+    **   SQLITE_CONSTRAINT, the conflict-handler function is invoked with
+    **   [SQLITE_CHANGESET_CONSTRAINT] passed as the second argument.
+    **   This includes the case where the UPDATE operation is attempted after
+    **   an earlier call to the conflict handler function returned
+    **   [SQLITE_CHANGESET_REPLACE].
+    ** </dl>
+    **
+    ** It is safe to execute SQL statements, including those that write to the
+    ** table that the callback related to, from within the xConflict callback.
+    ** This can be used to further customize the application's conflict
+    ** resolution strategy.
+    **
+    ** All changes made by these functions are enclosed in a savepoint transaction.
+    ** If any other error (aside from a constraint failure when attempting to
+    ** write to the target database) occurs, then the savepoint transaction is
+    ** rolled back, restoring the target database to its original state, and an
+    ** SQLite error code returned.
+    **
+    ** If the output parameters (ppRebase) and (pnRebase) are non-NULL and
+    ** the input is a changeset (not a patchset), then sqlite3changeset_apply_v2()
+    ** may set (*ppRebase) to point to a "rebase" that may be used with the
+    ** sqlite3_rebaser APIs buffer before returning. In this case (*pnRebase)
+    ** is set to the size of the buffer in bytes. It is the responsibility of the
+    ** caller to eventually free any such buffer using sqlite3_free(). The buffer
+    ** is only allocated and populated if one or more conflicts were encountered
+    ** while applying the patchset. See comments surrounding the sqlite3_rebaser
+    ** APIs for further details.
+    **
+    ** The behavior of sqlite3changeset_apply_v2() and its streaming equivalent
+    ** may be modified by passing a combination of
+    ** [SQLITE_CHANGESETAPPLY_NOSAVEPOINT | supported flags] as the 9th parameter.
+    **
+    ** Note that the sqlite3changeset_apply_v2() API is still <b>experimental</b>
+    ** and therefore subject to change.
+    */
+    SQLITE_API int sqlite3changeset_apply(sqlite3* db,                    /* Apply change to "main" db of this handle */
+                                          int nChangeset,                 /* Size of changeset in bytes */
+                                          void* pChangeset,               /* Changeset blob */
+                                          int (*xFilter)(void* pCtx,      /* Copy of sixth arg to _apply() */
+                                                         const char* zTab /* Table name */
+                                                         ),
+                                          int (*xConflict)(void* pCtx,    /* Copy of sixth arg to _apply() */
+                                                           int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
+                                                           sqlite3_changeset_iter* p /* Handle describing change and
+                                                                                        conflict */
+                                                           ),
+                                          void* pCtx /* First argument passed to xConflict */
+    );
+    SQLITE_API int sqlite3changeset_apply_v2(sqlite3* db,               /* Apply change to "main" db of this handle */
+                                             int nChangeset,            /* Size of changeset in bytes */
+                                             void* pChangeset,          /* Changeset blob */
+                                             int (*xFilter)(void* pCtx, /* Copy of sixth arg to _apply() */
+                                                            const char* zTab /* Table name */
+                                                            ),
+                                             int (*xConflict)(void* pCtx,    /* Copy of sixth arg to _apply() */
+                                                              int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
+                                                              sqlite3_changeset_iter* p /* Handle describing change and
+                                                                                           conflict */
+                                                              ),
+                                             void* pCtx, /* First argument passed to xConflict */
+                                             void** ppRebase,
+                                             int* pnRebase, /* OUT: Rebase data */
+                                             int flags      /* SESSION_CHANGESETAPPLY_* flags */
+    );
 
 /*
 ** CAPI3REF: Flags for sqlite3changeset_apply_v2
@@ -11746,8 +11630,8 @@ SQLITE_API int sqlite3changeset_apply_v2(
 **   a changeset using sqlite3changeset_invert() before applying it. It is
 **   an error to specify this flag with a patchset.
 */
-#define SQLITE_CHANGESETAPPLY_NOSAVEPOINT   0x0001
-#define SQLITE_CHANGESETAPPLY_INVERT        0x0002
+#define SQLITE_CHANGESETAPPLY_NOSAVEPOINT 0x0001
+#define SQLITE_CHANGESETAPPLY_INVERT 0x0002
 
 /*
 ** CAPI3REF: Constants Passed To The Conflict Handler
@@ -11804,10 +11688,10 @@ SQLITE_API int sqlite3changeset_apply_v2(
 **
 ** </dl>
 */
-#define SQLITE_CHANGESET_DATA        1
-#define SQLITE_CHANGESET_NOTFOUND    2
-#define SQLITE_CHANGESET_CONFLICT    3
-#define SQLITE_CHANGESET_CONSTRAINT  4
+#define SQLITE_CHANGESET_DATA 1
+#define SQLITE_CHANGESET_NOTFOUND 2
+#define SQLITE_CHANGESET_CONFLICT 3
+#define SQLITE_CHANGESET_CONSTRAINT 4
 #define SQLITE_CHANGESET_FOREIGN_KEY 5
 
 /*
@@ -11841,372 +11725,345 @@ SQLITE_API int sqlite3changeset_apply_v2(
 **   and the call to sqlite3changeset_apply() returns SQLITE_ABORT.
 ** </dl>
 */
-#define SQLITE_CHANGESET_OMIT       0
-#define SQLITE_CHANGESET_REPLACE    1
-#define SQLITE_CHANGESET_ABORT      2
-
-/*
-** CAPI3REF: Rebasing changesets
-** EXPERIMENTAL
-**
-** Suppose there is a site hosting a database in state S0. And that
-** modifications are made that move that database to state S1 and a
-** changeset recorded (the "local" changeset). Then, a changeset based
-** on S0 is received from another site (the "remote" changeset) and
-** applied to the database. The database is then in state
-** (S1+"remote"), where the exact state depends on any conflict
-** resolution decisions (OMIT or REPLACE) made while applying "remote".
-** Rebasing a changeset is to update it to take those conflict
-** resolution decisions into account, so that the same conflicts
-** do not have to be resolved elsewhere in the network.
-**
-** For example, if both the local and remote changesets contain an
-** INSERT of the same key on "CREATE TABLE t1(a PRIMARY KEY, b)":
-**
-**   local:  INSERT INTO t1 VALUES(1, 'v1');
-**   remote: INSERT INTO t1 VALUES(1, 'v2');
-**
-** and the conflict resolution is REPLACE, then the INSERT change is
-** removed from the local changeset (it was overridden). Or, if the
-** conflict resolution was "OMIT", then the local changeset is modified
-** to instead contain:
-**
-**           UPDATE t1 SET b = 'v2' WHERE a=1;
-**
-** Changes within the local changeset are rebased as follows:
-**
-** <dl>
-** <dt>Local INSERT<dd>
-**   This may only conflict with a remote INSERT. If the conflict
-**   resolution was OMIT, then add an UPDATE change to the rebased
-**   changeset. Or, if the conflict resolution was REPLACE, add
-**   nothing to the rebased changeset.
-**
-** <dt>Local DELETE<dd>
-**   This may conflict with a remote UPDATE or DELETE. In both cases the
-**   only possible resolution is OMIT. If the remote operation was a
-**   DELETE, then add no change to the rebased changeset. If the remote
-**   operation was an UPDATE, then the old.* fields of change are updated
-**   to reflect the new.* values in the UPDATE.
-**
-** <dt>Local UPDATE<dd>
-**   This may conflict with a remote UPDATE or DELETE. If it conflicts
-**   with a DELETE, and the conflict resolution was OMIT, then the update
-**   is changed into an INSERT. Any undefined values in the new.* record
-**   from the update change are filled in using the old.* values from
-**   the conflicting DELETE. Or, if the conflict resolution was REPLACE,
-**   the UPDATE change is simply omitted from the rebased changeset.
-**
-**   If conflict is with a remote UPDATE and the resolution is OMIT, then
-**   the old.* values are rebased using the new.* values in the remote
-**   change. Or, if the resolution is REPLACE, then the change is copied
-**   into the rebased changeset with updates to columns also updated by
-**   the conflicting remote UPDATE removed. If this means no columns would
-**   be updated, the change is omitted.
-** </dl>
-**
-** A local change may be rebased against multiple remote changes
-** simultaneously. If a single key is modified by multiple remote
-** changesets, they are combined as follows before the local changeset
-** is rebased:
-**
-** <ul>
-**    <li> If there has been one or more REPLACE resolutions on a
-**         key, it is rebased according to a REPLACE.
-**
-**    <li> If there have been no REPLACE resolutions on a key, then
-**         the local changeset is rebased according to the most recent
-**         of the OMIT resolutions.
-** </ul>
-**
-** Note that conflict resolutions from multiple remote changesets are
-** combined on a per-field basis, not per-row. This means that in the
-** case of multiple remote UPDATE operations, some fields of a single
-** local change may be rebased for REPLACE while others are rebased for
-** OMIT.
-**
-** In order to rebase a local changeset, the remote changeset must first
-** be applied to the local database using sqlite3changeset_apply_v2() and
-** the buffer of rebase information captured. Then:
-**
-** <ol>
-**   <li> An sqlite3_rebaser object is created by calling
-**        sqlite3rebaser_create().
-**   <li> The new object is configured with the rebase buffer obtained from
-**        sqlite3changeset_apply_v2() by calling sqlite3rebaser_configure().
-**        If the local changeset is to be rebased against multiple remote
-**        changesets, then sqlite3rebaser_configure() should be called
-**        multiple times, in the same order that the multiple
-**        sqlite3changeset_apply_v2() calls were made.
-**   <li> Each local changeset is rebased by calling sqlite3rebaser_rebase().
-**   <li> The sqlite3_rebaser object is deleted by calling
-**        sqlite3rebaser_delete().
-** </ol>
-*/
-typedef struct sqlite3_rebaser sqlite3_rebaser;
-
-/*
-** CAPI3REF: Create a changeset rebaser object.
-** EXPERIMENTAL
-**
-** Allocate a new changeset rebaser object. If successful, set (*ppNew) to
-** point to the new object and return SQLITE_OK. Otherwise, if an error
-** occurs, return an SQLite error code (e.g. SQLITE_NOMEM) and set (*ppNew)
-** to NULL.
-*/
-SQLITE_API int sqlite3rebaser_create(sqlite3_rebaser **ppNew);
-
-/*
-** CAPI3REF: Configure a changeset rebaser object.
-** EXPERIMENTAL
-**
-** Configure the changeset rebaser object to rebase changesets according
-** to the conflict resolutions described by buffer pRebase (size nRebase
-** bytes), which must have been obtained from a previous call to
-** sqlite3changeset_apply_v2().
-*/
-SQLITE_API int sqlite3rebaser_configure(
-  sqlite3_rebaser*,
-  int nRebase, const void *pRebase
-);
-
-/*
-** CAPI3REF: Rebase a changeset
-** EXPERIMENTAL
-**
-** Argument pIn must point to a buffer containing a changeset nIn bytes
-** in size. This function allocates and populates a buffer with a copy
-** of the changeset rebased according to the configuration of the
-** rebaser object passed as the first argument. If successful, (*ppOut)
-** is set to point to the new buffer containing the rebased changeset and
-** (*pnOut) to its size in bytes and SQLITE_OK returned. It is the
-** responsibility of the caller to eventually free the new buffer using
-** sqlite3_free(). Otherwise, if an error occurs, (*ppOut) and (*pnOut)
-** are set to zero and an SQLite error code returned.
-*/
-SQLITE_API int sqlite3rebaser_rebase(
-  sqlite3_rebaser*,
-  int nIn, const void *pIn,
-  int *pnOut, void **ppOut
-);
-
-/*
-** CAPI3REF: Delete a changeset rebaser object.
-** EXPERIMENTAL
-**
-** Delete the changeset rebaser object and all associated resources. There
-** should be one call to this function for each successful invocation
-** of sqlite3rebaser_create().
-*/
-SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser *p);
-
-/*
-** CAPI3REF: Streaming Versions of API functions.
-**
-** The six streaming API xxx_strm() functions serve similar purposes to the
-** corresponding non-streaming API functions:
-**
-** <table border=1 style="margin-left:8ex;margin-right:8ex">
-**   <tr><th>Streaming function<th>Non-streaming equivalent</th>
-**   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]
-**   <tr><td>sqlite3changeset_apply_strm_v2<td>[sqlite3changeset_apply_v2]
-**   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]
-**   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]
-**   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]
-**   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]
-**   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]
-** </table>
-**
-** Non-streaming functions that accept changesets (or patchsets) as input
-** require that the entire changeset be stored in a single buffer in memory.
-** Similarly, those that return a changeset or patchset do so by returning
-** a pointer to a single large buffer allocated using sqlite3_malloc().
-** Normally this is convenient. However, if an application running in a
-** low-memory environment is required to handle very large changesets, the
-** large contiguous memory allocations required can become onerous.
-**
-** In order to avoid this problem, instead of a single large buffer, input
-** is passed to a streaming API functions by way of a callback function that
-** the sessions module invokes to incrementally request input data as it is
-** required. In all cases, a pair of API function parameters such as
-**
-**  <pre>
-**  &nbsp;     int nChangeset,
-**  &nbsp;     void *pChangeset,
-**  </pre>
-**
-** Is replaced by:
-**
-**  <pre>
-**  &nbsp;     int (*xInput)(void *pIn, void *pData, int *pnData),
-**  &nbsp;     void *pIn,
-**  </pre>
-**
-** Each time the xInput callback is invoked by the sessions module, the first
-** argument passed is a copy of the supplied pIn context pointer. The second
-** argument, pData, points to a buffer (*pnData) bytes in size. Assuming no
-** error occurs the xInput method should copy up to (*pnData) bytes of data
-** into the buffer and set (*pnData) to the actual number of bytes copied
-** before returning SQLITE_OK. If the input is completely exhausted, (*pnData)
-** should be set to zero to indicate this. Or, if an error occurs, an SQLite
-** error code should be returned. In all cases, if an xInput callback returns
-** an error, all processing is abandoned and the streaming API function
-** returns a copy of the error code to the caller.
-**
-** In the case of sqlite3changeset_start_strm(), the xInput callback may be
-** invoked by the sessions module at any point during the lifetime of the
-** iterator. If such an xInput callback returns an error, the iterator enters
-** an error state, whereby all subsequent calls to iterator functions
-** immediately fail with the same error code as returned by xInput.
-**
-** Similarly, streaming API functions that return changesets (or patchsets)
-** return them in chunks by way of a callback function instead of via a
-** pointer to a single large buffer. In this case, a pair of parameters such
-** as:
-**
-**  <pre>
-**  &nbsp;     int *pnChangeset,
-**  &nbsp;     void **ppChangeset,
-**  </pre>
-**
-** Is replaced by:
-**
-**  <pre>
-**  &nbsp;     int (*xOutput)(void *pOut, const void *pData, int nData),
-**  &nbsp;     void *pOut
-**  </pre>
-**
-** The xOutput callback is invoked zero or more times to return data to
-** the application. The first parameter passed to each call is a copy of the
-** pOut pointer supplied by the application. The second parameter, pData,
-** points to a buffer nData bytes in size containing the chunk of output
-** data being returned. If the xOutput callback successfully processes the
-** supplied data, it should return SQLITE_OK to indicate success. Otherwise,
-** it should return some other SQLite error code. In this case processing
-** is immediately abandoned and the streaming API function returns a copy
-** of the xOutput error code to the application.
-**
-** The sessions module never invokes an xOutput callback with the third
-** parameter set to a value less than or equal to zero. Other than this,
-** no guarantees are made as to the size of the chunks of data returned.
-*/
-SQLITE_API int sqlite3changeset_apply_strm(
-  sqlite3 *db,                    /* Apply change to "main" db of this handle */
-  int (*xInput)(void *pIn, void *pData, int *pnData), /* Input function */
-  void *pIn,                                          /* First arg for xInput */
-  int(*xFilter)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    const char *zTab              /* Table name */
-  ),
-  int(*xConflict)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
-    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
-  ),
-  void *pCtx                      /* First argument passed to xConflict */
-);
-SQLITE_API int sqlite3changeset_apply_v2_strm(
-  sqlite3 *db,                    /* Apply change to "main" db of this handle */
-  int (*xInput)(void *pIn, void *pData, int *pnData), /* Input function */
-  void *pIn,                                          /* First arg for xInput */
-  int(*xFilter)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    const char *zTab              /* Table name */
-  ),
-  int(*xConflict)(
-    void *pCtx,                   /* Copy of sixth arg to _apply() */
-    int eConflict,                /* DATA, MISSING, CONFLICT, CONSTRAINT */
-    sqlite3_changeset_iter *p     /* Handle describing change and conflict */
-  ),
-  void *pCtx,                     /* First argument passed to xConflict */
-  void **ppRebase, int *pnRebase,
-  int flags
-);
-SQLITE_API int sqlite3changeset_concat_strm(
-  int (*xInputA)(void *pIn, void *pData, int *pnData),
-  void *pInA,
-  int (*xInputB)(void *pIn, void *pData, int *pnData),
-  void *pInB,
-  int (*xOutput)(void *pOut, const void *pData, int nData),
-  void *pOut
-);
-SQLITE_API int sqlite3changeset_invert_strm(
-  int (*xInput)(void *pIn, void *pData, int *pnData),
-  void *pIn,
-  int (*xOutput)(void *pOut, const void *pData, int nData),
-  void *pOut
-);
-SQLITE_API int sqlite3changeset_start_strm(
-  sqlite3_changeset_iter **pp,
-  int (*xInput)(void *pIn, void *pData, int *pnData),
-  void *pIn
-);
-SQLITE_API int sqlite3changeset_start_v2_strm(
-  sqlite3_changeset_iter **pp,
-  int (*xInput)(void *pIn, void *pData, int *pnData),
-  void *pIn,
-  int flags
-);
-SQLITE_API int sqlite3session_changeset_strm(
-  sqlite3_session *pSession,
-  int (*xOutput)(void *pOut, const void *pData, int nData),
-  void *pOut
-);
-SQLITE_API int sqlite3session_patchset_strm(
-  sqlite3_session *pSession,
-  int (*xOutput)(void *pOut, const void *pData, int nData),
-  void *pOut
-);
-SQLITE_API int sqlite3changegroup_add_strm(sqlite3_changegroup*,
-    int (*xInput)(void *pIn, void *pData, int *pnData),
-    void *pIn
-);
-SQLITE_API int sqlite3changegroup_output_strm(sqlite3_changegroup*,
-    int (*xOutput)(void *pOut, const void *pData, int nData),
-    void *pOut
-);
-SQLITE_API int sqlite3rebaser_rebase_strm(
-  sqlite3_rebaser *pRebaser,
-  int (*xInput)(void *pIn, void *pData, int *pnData),
-  void *pIn,
-  int (*xOutput)(void *pOut, const void *pData, int nData),
-  void *pOut
-);
-
-/*
-** CAPI3REF: Configure global parameters
-**
-** The sqlite3session_config() interface is used to make global configuration
-** changes to the sessions module in order to tune it to the specific needs
-** of the application.
-**
-** The sqlite3session_config() interface is not threadsafe. If it is invoked
-** while any other thread is inside any other sessions method then the
-** results are undefined. Furthermore, if it is invoked after any sessions
-** related objects have been created, the results are also undefined.
-**
-** The first argument to the sqlite3session_config() function must be one
-** of the SQLITE_SESSION_CONFIG_XXX constants defined below. The
-** interpretation of the (void*) value passed as the second parameter and
-** the effect of calling this function depends on the value of the first
-** parameter.
-**
-** <dl>
-** <dt>SQLITE_SESSION_CONFIG_STRMSIZE<dd>
-**    By default, the sessions module streaming interfaces attempt to input
-**    and output data in approximately 1 KiB chunks. This operand may be used
-**    to set and query the value of this configuration setting. The pointer
-**    passed as the second argument must point to a value of type (int).
-**    If this value is greater than 0, it is used as the new streaming data
-**    chunk size for both input and output. Before returning, the (int) value
-**    pointed to by pArg is set to the final value of the streaming interface
-**    chunk size.
-** </dl>
-**
-** This function returns SQLITE_OK if successful, or an SQLite error code
-** otherwise.
-*/
-SQLITE_API int sqlite3session_config(int op, void *pArg);
+#define SQLITE_CHANGESET_OMIT 0
+#define SQLITE_CHANGESET_REPLACE 1
+#define SQLITE_CHANGESET_ABORT 2
+
+    /*
+    ** CAPI3REF: Rebasing changesets
+    ** EXPERIMENTAL
+    **
+    ** Suppose there is a site hosting a database in state S0. And that
+    ** modifications are made that move that database to state S1 and a
+    ** changeset recorded (the "local" changeset). Then, a changeset based
+    ** on S0 is received from another site (the "remote" changeset) and
+    ** applied to the database. The database is then in state
+    ** (S1+"remote"), where the exact state depends on any conflict
+    ** resolution decisions (OMIT or REPLACE) made while applying "remote".
+    ** Rebasing a changeset is to update it to take those conflict
+    ** resolution decisions into account, so that the same conflicts
+    ** do not have to be resolved elsewhere in the network.
+    **
+    ** For example, if both the local and remote changesets contain an
+    ** INSERT of the same key on "CREATE TABLE t1(a PRIMARY KEY, b)":
+    **
+    **   local:  INSERT INTO t1 VALUES(1, 'v1');
+    **   remote: INSERT INTO t1 VALUES(1, 'v2');
+    **
+    ** and the conflict resolution is REPLACE, then the INSERT change is
+    ** removed from the local changeset (it was overridden). Or, if the
+    ** conflict resolution was "OMIT", then the local changeset is modified
+    ** to instead contain:
+    **
+    **           UPDATE t1 SET b = 'v2' WHERE a=1;
+    **
+    ** Changes within the local changeset are rebased as follows:
+    **
+    ** <dl>
+    ** <dt>Local INSERT<dd>
+    **   This may only conflict with a remote INSERT. If the conflict
+    **   resolution was OMIT, then add an UPDATE change to the rebased
+    **   changeset. Or, if the conflict resolution was REPLACE, add
+    **   nothing to the rebased changeset.
+    **
+    ** <dt>Local DELETE<dd>
+    **   This may conflict with a remote UPDATE or DELETE. In both cases the
+    **   only possible resolution is OMIT. If the remote operation was a
+    **   DELETE, then add no change to the rebased changeset. If the remote
+    **   operation was an UPDATE, then the old.* fields of change are updated
+    **   to reflect the new.* values in the UPDATE.
+    **
+    ** <dt>Local UPDATE<dd>
+    **   This may conflict with a remote UPDATE or DELETE. If it conflicts
+    **   with a DELETE, and the conflict resolution was OMIT, then the update
+    **   is changed into an INSERT. Any undefined values in the new.* record
+    **   from the update change are filled in using the old.* values from
+    **   the conflicting DELETE. Or, if the conflict resolution was REPLACE,
+    **   the UPDATE change is simply omitted from the rebased changeset.
+    **
+    **   If conflict is with a remote UPDATE and the resolution is OMIT, then
+    **   the old.* values are rebased using the new.* values in the remote
+    **   change. Or, if the resolution is REPLACE, then the change is copied
+    **   into the rebased changeset with updates to columns also updated by
+    **   the conflicting remote UPDATE removed. If this means no columns would
+    **   be updated, the change is omitted.
+    ** </dl>
+    **
+    ** A local change may be rebased against multiple remote changes
+    ** simultaneously. If a single key is modified by multiple remote
+    ** changesets, they are combined as follows before the local changeset
+    ** is rebased:
+    **
+    ** <ul>
+    **    <li> If there has been one or more REPLACE resolutions on a
+    **         key, it is rebased according to a REPLACE.
+    **
+    **    <li> If there have been no REPLACE resolutions on a key, then
+    **         the local changeset is rebased according to the most recent
+    **         of the OMIT resolutions.
+    ** </ul>
+    **
+    ** Note that conflict resolutions from multiple remote changesets are
+    ** combined on a per-field basis, not per-row. This means that in the
+    ** case of multiple remote UPDATE operations, some fields of a single
+    ** local change may be rebased for REPLACE while others are rebased for
+    ** OMIT.
+    **
+    ** In order to rebase a local changeset, the remote changeset must first
+    ** be applied to the local database using sqlite3changeset_apply_v2() and
+    ** the buffer of rebase information captured. Then:
+    **
+    ** <ol>
+    **   <li> An sqlite3_rebaser object is created by calling
+    **        sqlite3rebaser_create().
+    **   <li> The new object is configured with the rebase buffer obtained from
+    **        sqlite3changeset_apply_v2() by calling sqlite3rebaser_configure().
+    **        If the local changeset is to be rebased against multiple remote
+    **        changesets, then sqlite3rebaser_configure() should be called
+    **        multiple times, in the same order that the multiple
+    **        sqlite3changeset_apply_v2() calls were made.
+    **   <li> Each local changeset is rebased by calling sqlite3rebaser_rebase().
+    **   <li> The sqlite3_rebaser object is deleted by calling
+    **        sqlite3rebaser_delete().
+    ** </ol>
+    */
+    typedef struct sqlite3_rebaser sqlite3_rebaser;
+
+    /*
+    ** CAPI3REF: Create a changeset rebaser object.
+    ** EXPERIMENTAL
+    **
+    ** Allocate a new changeset rebaser object. If successful, set (*ppNew) to
+    ** point to the new object and return SQLITE_OK. Otherwise, if an error
+    ** occurs, return an SQLite error code (e.g. SQLITE_NOMEM) and set (*ppNew)
+    ** to NULL.
+    */
+    SQLITE_API int sqlite3rebaser_create(sqlite3_rebaser** ppNew);
+
+    /*
+    ** CAPI3REF: Configure a changeset rebaser object.
+    ** EXPERIMENTAL
+    **
+    ** Configure the changeset rebaser object to rebase changesets according
+    ** to the conflict resolutions described by buffer pRebase (size nRebase
+    ** bytes), which must have been obtained from a previous call to
+    ** sqlite3changeset_apply_v2().
+    */
+    SQLITE_API int sqlite3rebaser_configure(sqlite3_rebaser*, int nRebase, const void* pRebase);
+
+    /*
+    ** CAPI3REF: Rebase a changeset
+    ** EXPERIMENTAL
+    **
+    ** Argument pIn must point to a buffer containing a changeset nIn bytes
+    ** in size. This function allocates and populates a buffer with a copy
+    ** of the changeset rebased according to the configuration of the
+    ** rebaser object passed as the first argument. If successful, (*ppOut)
+    ** is set to point to the new buffer containing the rebased changeset and
+    ** (*pnOut) to its size in bytes and SQLITE_OK returned. It is the
+    ** responsibility of the caller to eventually free the new buffer using
+    ** sqlite3_free(). Otherwise, if an error occurs, (*ppOut) and (*pnOut)
+    ** are set to zero and an SQLite error code returned.
+    */
+    SQLITE_API int sqlite3rebaser_rebase(sqlite3_rebaser*, int nIn, const void* pIn, int* pnOut, void** ppOut);
+
+    /*
+    ** CAPI3REF: Delete a changeset rebaser object.
+    ** EXPERIMENTAL
+    **
+    ** Delete the changeset rebaser object and all associated resources. There
+    ** should be one call to this function for each successful invocation
+    ** of sqlite3rebaser_create().
+    */
+    SQLITE_API void sqlite3rebaser_delete(sqlite3_rebaser* p);
+
+    /*
+    ** CAPI3REF: Streaming Versions of API functions.
+    **
+    ** The six streaming API xxx_strm() functions serve similar purposes to the
+    ** corresponding non-streaming API functions:
+    **
+    ** <table border=1 style="margin-left:8ex;margin-right:8ex">
+    **   <tr><th>Streaming function<th>Non-streaming equivalent</th>
+    **   <tr><td>sqlite3changeset_apply_strm<td>[sqlite3changeset_apply]
+    **   <tr><td>sqlite3changeset_apply_strm_v2<td>[sqlite3changeset_apply_v2]
+    **   <tr><td>sqlite3changeset_concat_strm<td>[sqlite3changeset_concat]
+    **   <tr><td>sqlite3changeset_invert_strm<td>[sqlite3changeset_invert]
+    **   <tr><td>sqlite3changeset_start_strm<td>[sqlite3changeset_start]
+    **   <tr><td>sqlite3session_changeset_strm<td>[sqlite3session_changeset]
+    **   <tr><td>sqlite3session_patchset_strm<td>[sqlite3session_patchset]
+    ** </table>
+    **
+    ** Non-streaming functions that accept changesets (or patchsets) as input
+    ** require that the entire changeset be stored in a single buffer in memory.
+    ** Similarly, those that return a changeset or patchset do so by returning
+    ** a pointer to a single large buffer allocated using sqlite3_malloc().
+    ** Normally this is convenient. However, if an application running in a
+    ** low-memory environment is required to handle very large changesets, the
+    ** large contiguous memory allocations required can become onerous.
+    **
+    ** In order to avoid this problem, instead of a single large buffer, input
+    ** is passed to a streaming API functions by way of a callback function that
+    ** the sessions module invokes to incrementally request input data as it is
+    ** required. In all cases, a pair of API function parameters such as
+    **
+    **  <pre>
+    **  &nbsp;     int nChangeset,
+    **  &nbsp;     void *pChangeset,
+    **  </pre>
+    **
+    ** Is replaced by:
+    **
+    **  <pre>
+    **  &nbsp;     int (*xInput)(void *pIn, void *pData, int *pnData),
+    **  &nbsp;     void *pIn,
+    **  </pre>
+    **
+    ** Each time the xInput callback is invoked by the sessions module, the first
+    ** argument passed is a copy of the supplied pIn context pointer. The second
+    ** argument, pData, points to a buffer (*pnData) bytes in size. Assuming no
+    ** error occurs the xInput method should copy up to (*pnData) bytes of data
+    ** into the buffer and set (*pnData) to the actual number of bytes copied
+    ** before returning SQLITE_OK. If the input is completely exhausted, (*pnData)
+    ** should be set to zero to indicate this. Or, if an error occurs, an SQLite
+    ** error code should be returned. In all cases, if an xInput callback returns
+    ** an error, all processing is abandoned and the streaming API function
+    ** returns a copy of the error code to the caller.
+    **
+    ** In the case of sqlite3changeset_start_strm(), the xInput callback may be
+    ** invoked by the sessions module at any point during the lifetime of the
+    ** iterator. If such an xInput callback returns an error, the iterator enters
+    ** an error state, whereby all subsequent calls to iterator functions
+    ** immediately fail with the same error code as returned by xInput.
+    **
+    ** Similarly, streaming API functions that return changesets (or patchsets)
+    ** return them in chunks by way of a callback function instead of via a
+    ** pointer to a single large buffer. In this case, a pair of parameters such
+    ** as:
+    **
+    **  <pre>
+    **  &nbsp;     int *pnChangeset,
+    **  &nbsp;     void **ppChangeset,
+    **  </pre>
+    **
+    ** Is replaced by:
+    **
+    **  <pre>
+    **  &nbsp;     int (*xOutput)(void *pOut, const void *pData, int nData),
+    **  &nbsp;     void *pOut
+    **  </pre>
+    **
+    ** The xOutput callback is invoked zero or more times to return data to
+    ** the application. The first parameter passed to each call is a copy of the
+    ** pOut pointer supplied by the application. The second parameter, pData,
+    ** points to a buffer nData bytes in size containing the chunk of output
+    ** data being returned. If the xOutput callback successfully processes the
+    ** supplied data, it should return SQLITE_OK to indicate success. Otherwise,
+    ** it should return some other SQLite error code. In this case processing
+    ** is immediately abandoned and the streaming API function returns a copy
+    ** of the xOutput error code to the application.
+    **
+    ** The sessions module never invokes an xOutput callback with the third
+    ** parameter set to a value less than or equal to zero. Other than this,
+    ** no guarantees are made as to the size of the chunks of data returned.
+    */
+    SQLITE_API int sqlite3changeset_apply_strm(sqlite3* db, /* Apply change to "main" db of this handle */
+                                               int (*xInput)(void* pIn, void* pData, int* pnData), /* Input function */
+                                               void* pIn,                      /* First arg for xInput */
+                                               int (*xFilter)(void* pCtx,      /* Copy of sixth arg to _apply() */
+                                                              const char* zTab /* Table name */
+                                                              ),
+                                               int (*xConflict)(void* pCtx,    /* Copy of sixth arg to _apply() */
+                                                                int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
+                                                                sqlite3_changeset_iter* p /* Handle describing change
+                                                                                             and conflict */
+                                                                ),
+                                               void* pCtx /* First argument passed to xConflict */
+    );
+    SQLITE_API int
+      sqlite3changeset_apply_v2_strm(sqlite3* db, /* Apply change to "main" db of this handle */
+                                     int (*xInput)(void* pIn, void* pData, int* pnData), /* Input function */
+                                     void* pIn,                                          /* First arg for xInput */
+                                     int (*xFilter)(void* pCtx,      /* Copy of sixth arg to _apply() */
+                                                    const char* zTab /* Table name */
+                                                    ),
+                                     int (*xConflict)(void* pCtx,    /* Copy of sixth arg to _apply() */
+                                                      int eConflict, /* DATA, MISSING, CONFLICT, CONSTRAINT */
+                                                      sqlite3_changeset_iter* p /* Handle describing change and conflict
+                                                                                 */
+                                                      ),
+                                     void* pCtx, /* First argument passed to xConflict */
+                                     void** ppRebase,
+                                     int* pnRebase,
+                                     int flags);
+    SQLITE_API int sqlite3changeset_concat_strm(int (*xInputA)(void* pIn, void* pData, int* pnData),
+                                                void* pInA,
+                                                int (*xInputB)(void* pIn, void* pData, int* pnData),
+                                                void* pInB,
+                                                int (*xOutput)(void* pOut, const void* pData, int nData),
+                                                void* pOut);
+    SQLITE_API int sqlite3changeset_invert_strm(int (*xInput)(void* pIn, void* pData, int* pnData),
+                                                void* pIn,
+                                                int (*xOutput)(void* pOut, const void* pData, int nData),
+                                                void* pOut);
+    SQLITE_API int sqlite3changeset_start_strm(sqlite3_changeset_iter** pp,
+                                               int (*xInput)(void* pIn, void* pData, int* pnData),
+                                               void* pIn);
+    SQLITE_API int sqlite3changeset_start_v2_strm(sqlite3_changeset_iter** pp,
+                                                  int (*xInput)(void* pIn, void* pData, int* pnData),
+                                                  void* pIn,
+                                                  int flags);
+    SQLITE_API int sqlite3session_changeset_strm(sqlite3_session* pSession,
+                                                 int (*xOutput)(void* pOut, const void* pData, int nData),
+                                                 void* pOut);
+    SQLITE_API int sqlite3session_patchset_strm(sqlite3_session* pSession,
+                                                int (*xOutput)(void* pOut, const void* pData, int nData),
+                                                void* pOut);
+    SQLITE_API int
+      sqlite3changegroup_add_strm(sqlite3_changegroup*, int (*xInput)(void* pIn, void* pData, int* pnData), void* pIn);
+    SQLITE_API int sqlite3changegroup_output_strm(sqlite3_changegroup*,
+                                                  int (*xOutput)(void* pOut, const void* pData, int nData),
+                                                  void* pOut);
+    SQLITE_API int sqlite3rebaser_rebase_strm(sqlite3_rebaser* pRebaser,
+                                              int (*xInput)(void* pIn, void* pData, int* pnData),
+                                              void* pIn,
+                                              int (*xOutput)(void* pOut, const void* pData, int nData),
+                                              void* pOut);
+
+    /*
+    ** CAPI3REF: Configure global parameters
+    **
+    ** The sqlite3session_config() interface is used to make global configuration
+    ** changes to the sessions module in order to tune it to the specific needs
+    ** of the application.
+    **
+    ** The sqlite3session_config() interface is not threadsafe. If it is invoked
+    ** while any other thread is inside any other sessions method then the
+    ** results are undefined. Furthermore, if it is invoked after any sessions
+    ** related objects have been created, the results are also undefined.
+    **
+    ** The first argument to the sqlite3session_config() function must be one
+    ** of the SQLITE_SESSION_CONFIG_XXX constants defined below. The
+    ** interpretation of the (void*) value passed as the second parameter and
+    ** the effect of calling this function depends on the value of the first
+    ** parameter.
+    **
+    ** <dl>
+    ** <dt>SQLITE_SESSION_CONFIG_STRMSIZE<dd>
+    **    By default, the sessions module streaming interfaces attempt to input
+    **    and output data in approximately 1 KiB chunks. This operand may be used
+    **    to set and query the value of this configuration setting. The pointer
+    **    passed as the second argument must point to a value of type (int).
+    **    If this value is greater than 0, it is used as the new streaming data
+    **    chunk size for both input and output. Before returning, the (int) value
+    **    pointed to by pArg is set to the final value of the streaming interface
+    **    chunk size.
+    ** </dl>
+    **
+    ** This function returns SQLITE_OK if successful, or an SQLite error code
+    ** otherwise.
+    */
+    SQLITE_API int sqlite3session_config(int op, void* pArg);
 
 /*
 ** CAPI3REF: Values for sqlite3session_config().
@@ -12220,7 +12077,7 @@ SQLITE_API int sqlite3session_config(int op, void *pArg);
 }
 #endif
 
-#endif  /* !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION) */
+#endif /* !defined(__SQLITESESSION_H_) && defined(SQLITE_ENABLE_SESSION) */
 
 /******** End of sqlite3session.h *********/
 /******** Begin file fts5.h *********/
@@ -12243,558 +12100,552 @@ SQLITE_API int sqlite3session_config(int op, void *pArg);
 **     * custom auxiliary functions.
 */
 
-
 #ifndef _FTS5_H
 #define _FTS5_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-/*************************************************************************
-** CUSTOM AUXILIARY FUNCTIONS
-**
-** Virtual table implementations may overload SQL functions by implementing
-** the sqlite3_module.xFindFunction() method.
-*/
-
-typedef struct Fts5ExtensionApi Fts5ExtensionApi;
-typedef struct Fts5Context Fts5Context;
-typedef struct Fts5PhraseIter Fts5PhraseIter;
-
-typedef void (*fts5_extension_function)(
-  const Fts5ExtensionApi *pApi,   /* API offered by current FTS version */
-  Fts5Context *pFts,              /* First arg to pass to pApi functions */
-  sqlite3_context *pCtx,          /* Context for returning result/error */
-  int nVal,                       /* Number of values in apVal[] array */
-  sqlite3_value **apVal           /* Array of trailing arguments */
-);
-
-struct Fts5PhraseIter {
-  const unsigned char *a;
-  const unsigned char *b;
-};
-
-/*
-** EXTENSION API FUNCTIONS
-**
-** xUserData(pFts):
-**   Return a copy of the context pointer the extension function was
-**   registered with.
-**
-** xColumnTotalSize(pFts, iCol, pnToken):
-**   If parameter iCol is less than zero, set output variable *pnToken
-**   to the total number of tokens in the FTS5 table. Or, if iCol is
-**   non-negative but less than the number of columns in the table, return
-**   the total number of tokens in column iCol, considering all rows in
-**   the FTS5 table.
-**
-**   If parameter iCol is greater than or equal to the number of columns
-**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
-**   an OOM condition or IO error), an appropriate SQLite error code is
-**   returned.
-**
-** xColumnCount(pFts):
-**   Return the number of columns in the table.
-**
-** xColumnSize(pFts, iCol, pnToken):
-**   If parameter iCol is less than zero, set output variable *pnToken
-**   to the total number of tokens in the current row. Or, if iCol is
-**   non-negative but less than the number of columns in the table, set
-**   *pnToken to the number of tokens in column iCol of the current row.
-**
-**   If parameter iCol is greater than or equal to the number of columns
-**   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
-**   an OOM condition or IO error), an appropriate SQLite error code is
-**   returned.
-**
-**   This function may be quite inefficient if used with an FTS5 table
-**   created with the "columnsize=0" option.
-**
-** xColumnText:
-**   This function attempts to retrieve the text of column iCol of the
-**   current document. If successful, (*pz) is set to point to a buffer
-**   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
-**   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
-**   if an error occurs, an SQLite error code is returned and the final values
-**   of (*pz) and (*pn) are undefined.
-**
-** xPhraseCount:
-**   Returns the number of phrases in the current query expression.
-**
-** xPhraseSize:
-**   Returns the number of tokens in phrase iPhrase of the query. Phrases
-**   are numbered starting from zero.
-**
-** xInstCount:
-**   Set *pnInst to the total number of occurrences of all phrases within
-**   the query within the current row. Return SQLITE_OK if successful, or
-**   an error code (i.e. SQLITE_NOMEM) if an error occurs.
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option. If the FTS5 table is created
-**   with either "detail=none" or "detail=column" and "content=" option
-**   (i.e. if it is a contentless table), then this API always returns 0.
-**
-** xInst:
-**   Query for the details of phrase match iIdx within the current row.
-**   Phrase matches are numbered starting from zero, so the iIdx argument
-**   should be greater than or equal to zero and smaller than the value
-**   output by xInstCount().
-**
-**   Usually, output parameter *piPhrase is set to the phrase number, *piCol
-**   to the column in which it occurs and *piOff the token offset of the
-**   first token of the phrase. Returns SQLITE_OK if successful, or an error
-**   code (i.e. SQLITE_NOMEM) if an error occurs.
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option.
-**
-** xRowid:
-**   Returns the rowid of the current row.
-**
-** xTokenize:
-**   Tokenize text using the tokenizer belonging to the FTS5 table.
-**
-** xQueryPhrase(pFts5, iPhrase, pUserData, xCallback):
-**   This API function is used to query the FTS table for phrase iPhrase
-**   of the current query. Specifically, a query equivalent to:
-**
-**       ... FROM ftstable WHERE ftstable MATCH $p ORDER BY rowid
-**
-**   with $p set to a phrase equivalent to the phrase iPhrase of the
-**   current query is executed. Any column filter that applies to
-**   phrase iPhrase of the current query is included in $p. For each
-**   row visited, the callback function passed as the fourth argument
-**   is invoked. The context and API objects passed to the callback
-**   function may be used to access the properties of each matched row.
-**   Invoking Api.xUserData() returns a copy of the pointer passed as
-**   the third argument to pUserData.
-**
-**   If the callback function returns any value other than SQLITE_OK, the
-**   query is abandoned and the xQueryPhrase function returns immediately.
-**   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
-**   Otherwise, the error code is propagated upwards.
-**
-**   If the query runs to completion without incident, SQLITE_OK is returned.
-**   Or, if some error occurs before the query completes or is aborted by
-**   the callback, an SQLite error code is returned.
-**
-**
-** xSetAuxdata(pFts5, pAux, xDelete)
-**
-**   Save the pointer passed as the second argument as the extension function's
-**   "auxiliary data". The pointer may then be retrieved by the current or any
-**   future invocation of the same fts5 extension function made as part of
-**   the same MATCH query using the xGetAuxdata() API.
-**
-**   Each extension function is allocated a single auxiliary data slot for
-**   each FTS query (MATCH expression). If the extension function is invoked
-**   more than once for a single FTS query, then all invocations share a
-**   single auxiliary data context.
-**
-**   If there is already an auxiliary data pointer when this function is
-**   invoked, then it is replaced by the new pointer. If an xDelete callback
-**   was specified along with the original pointer, it is invoked at this
-**   point.
-**
-**   The xDelete callback, if one is specified, is also invoked on the
-**   auxiliary data pointer after the FTS5 query has finished.
-**
-**   If an error (e.g. an OOM condition) occurs within this function,
-**   the auxiliary data is set to NULL and an error code returned. If the
-**   xDelete parameter was not NULL, it is invoked on the auxiliary data
-**   pointer before returning.
-**
-**
-** xGetAuxdata(pFts5, bClear)
-**
-**   Returns the current auxiliary data pointer for the fts5 extension
-**   function. See the xSetAuxdata() method for details.
-**
-**   If the bClear argument is non-zero, then the auxiliary data is cleared
-**   (set to NULL) before this function returns. In this case the xDelete,
-**   if any, is not invoked.
-**
-**
-** xRowCount(pFts5, pnRow)
-**
-**   This function is used to retrieve the total number of rows in the table.
-**   In other words, the same value that would be returned by:
-**
-**        SELECT count(*) FROM ftstable;
-**
-** xPhraseFirst()
-**   This function is used, along with type Fts5PhraseIter and the xPhraseNext
-**   method, to iterate through all instances of a single query phrase within
-**   the current row. This is the same information as is accessible via the
-**   xInstCount/xInst APIs. While the xInstCount/xInst APIs are more convenient
-**   to use, this API may be faster under some circumstances. To iterate
-**   through instances of phrase iPhrase, use the following code:
-**
-**       Fts5PhraseIter iter;
-**       int iCol, iOff;
-**       for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff);
-**           iCol>=0;
-**           pApi->xPhraseNext(pFts, &iter, &iCol, &iOff)
-**       ){
-**         // An instance of phrase iPhrase at offset iOff of column iCol
-**       }
-**
-**   The Fts5PhraseIter structure is defined above. Applications should not
-**   modify this structure directly - it should only be used as shown above
-**   with the xPhraseFirst() and xPhraseNext() API methods (and by
-**   xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below).
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option. If the FTS5 table is created
-**   with either "detail=none" or "detail=column" and "content=" option
-**   (i.e. if it is a contentless table), then this API always iterates
-**   through an empty set (all calls to xPhraseFirst() set iCol to -1).
-**
-** xPhraseNext()
-**   See xPhraseFirst above.
-**
-** xPhraseFirstColumn()
-**   This function and xPhraseNextColumn() are similar to the xPhraseFirst()
-**   and xPhraseNext() APIs described above. The difference is that instead
-**   of iterating through all instances of a phrase in the current row, these
-**   APIs are used to iterate through the set of columns in the current row
-**   that contain one or more instances of a specified phrase. For example:
-**
-**       Fts5PhraseIter iter;
-**       int iCol;
-**       for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol);
-**           iCol>=0;
-**           pApi->xPhraseNextColumn(pFts, &iter, &iCol)
-**       ){
-**         // Column iCol contains at least one instance of phrase iPhrase
-**       }
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" option. If the FTS5 table is created with either
-**   "detail=none" "content=" option (i.e. if it is a contentless table),
-**   then this API always iterates through an empty set (all calls to
-**   xPhraseFirstColumn() set iCol to -1).
-**
-**   The information accessed using this API and its companion
-**   xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext
-**   (or xInst/xInstCount). The chief advantage of this API is that it is
-**   significantly more efficient than those alternatives when used with
-**   "detail=column" tables.
-**
-** xPhraseNextColumn()
-**   See xPhraseFirstColumn above.
-*/
-struct Fts5ExtensionApi {
-  int iVersion;                   /* Currently always set to 3 */
-
-  void *(*xUserData)(Fts5Context*);
-
-  int (*xColumnCount)(Fts5Context*);
-  int (*xRowCount)(Fts5Context*, sqlite3_int64 *pnRow);
-  int (*xColumnTotalSize)(Fts5Context*, int iCol, sqlite3_int64 *pnToken);
-
-  int (*xTokenize)(Fts5Context*,
-    const char *pText, int nText, /* Text to tokenize */
-    void *pCtx,                   /* Context passed to xToken() */
-    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
-  );
-
-  int (*xPhraseCount)(Fts5Context*);
-  int (*xPhraseSize)(Fts5Context*, int iPhrase);
-
-  int (*xInstCount)(Fts5Context*, int *pnInst);
-  int (*xInst)(Fts5Context*, int iIdx, int *piPhrase, int *piCol, int *piOff);
-
-  sqlite3_int64 (*xRowid)(Fts5Context*);
-  int (*xColumnText)(Fts5Context*, int iCol, const char **pz, int *pn);
-  int (*xColumnSize)(Fts5Context*, int iCol, int *pnToken);
-
-  int (*xQueryPhrase)(Fts5Context*, int iPhrase, void *pUserData,
-    int(*)(const Fts5ExtensionApi*,Fts5Context*,void*)
-  );
-  int (*xSetAuxdata)(Fts5Context*, void *pAux, void(*xDelete)(void*));
-  void *(*xGetAuxdata)(Fts5Context*, int bClear);
-
-  int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*);
-  void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int *piCol, int *piOff);
-
-  int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
-  void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
-};
-
-/*
-** CUSTOM AUXILIARY FUNCTIONS
-*************************************************************************/
-
-/*************************************************************************
-** CUSTOM TOKENIZERS
-**
-** Applications may also register custom tokenizer types. A tokenizer
-** is registered by providing fts5 with a populated instance of the
-** following structure. All structure methods must be defined, setting
-** any member of the fts5_tokenizer struct to NULL leads to undefined
-** behaviour. The structure methods are expected to function as follows:
-**
-** xCreate:
-**   This function is used to allocate and initialize a tokenizer instance.
-**   A tokenizer instance is required to actually tokenize text.
-**
-**   The first argument passed to this function is a copy of the (void*)
-**   pointer provided by the application when the fts5_tokenizer object
-**   was registered with FTS5 (the third argument to xCreateTokenizer()).
-**   The second and third arguments are an array of nul-terminated strings
-**   containing the tokenizer arguments, if any, specified following the
-**   tokenizer name as part of the CREATE VIRTUAL TABLE statement used
-**   to create the FTS5 table.
-**
-**   The final argument is an output variable. If successful, (*ppOut)
-**   should be set to point to the new tokenizer handle and SQLITE_OK
-**   returned. If an error occurs, some value other than SQLITE_OK should
-**   be returned. In this case, fts5 assumes that the final value of *ppOut
-**   is undefined.
-**
-** xDelete:
-**   This function is invoked to delete a tokenizer handle previously
-**   allocated using xCreate(). Fts5 guarantees that this function will
-**   be invoked exactly once for each successful call to xCreate().
-**
-** xTokenize:
-**   This function is expected to tokenize the nText byte string indicated
-**   by argument pText. pText may or may not be nul-terminated. The first
-**   argument passed to this function is a pointer to an Fts5Tokenizer object
-**   returned by an earlier call to xCreate().
-**
-**   The second argument indicates the reason that FTS5 is requesting
-**   tokenization of the supplied text. This is always one of the following
-**   four values:
-**
-**   <ul><li> <b>FTS5_TOKENIZE_DOCUMENT</b> - A document is being inserted into
-**            or removed from the FTS table. The tokenizer is being invoked to
-**            determine the set of tokens to add to (or delete from) the
-**            FTS index.
-**
-**       <li> <b>FTS5_TOKENIZE_QUERY</b> - A MATCH query is being executed
-**            against the FTS index. The tokenizer is being called to tokenize
-**            a bareword or quoted string specified as part of the query.
-**
-**       <li> <b>(FTS5_TOKENIZE_QUERY | FTS5_TOKENIZE_PREFIX)</b> - Same as
-**            FTS5_TOKENIZE_QUERY, except that the bareword or quoted string is
-**            followed by a "*" character, indicating that the last token
-**            returned by the tokenizer will be treated as a token prefix.
-**
-**       <li> <b>FTS5_TOKENIZE_AUX</b> - The tokenizer is being invoked to
-**            satisfy an fts5_api.xTokenize() request made by an auxiliary
-**            function. Or an fts5_api.xColumnSize() request made by the same
-**            on a columnsize=0 database.
-**   </ul>
-**
-**   For each token in the input string, the supplied callback xToken() must
-**   be invoked. The first argument to it should be a copy of the pointer
-**   passed as the second argument to xTokenize(). The third and fourth
-**   arguments are a pointer to a buffer containing the token text, and the
-**   size of the token in bytes. The 4th and 5th arguments are the byte offsets
-**   of the first byte of and first byte immediately following the text from
-**   which the token is derived within the input.
-**
-**   The second argument passed to the xToken() callback ("tflags") should
-**   normally be set to 0. The exception is if the tokenizer supports
-**   synonyms. In this case see the discussion below for details.
-**
-**   FTS5 assumes the xToken() callback is invoked for each token in the
-**   order that they occur within the input text.
-**
-**   If an xToken() callback returns any value other than SQLITE_OK, then
-**   the tokenization should be abandoned and the xTokenize() method should
-**   immediately return a copy of the xToken() return value. Or, if the
-**   input buffer is exhausted, xTokenize() should return SQLITE_OK. Finally,
-**   if an error occurs with the xTokenize() implementation itself, it
-**   may abandon the tokenization and return any error code other than
-**   SQLITE_OK or SQLITE_DONE.
-**
-** SYNONYM SUPPORT
-**
-**   Custom tokenizers may also support synonyms. Consider a case in which a
-**   user wishes to query for a phrase such as "first place". Using the
-**   built-in tokenizers, the FTS5 query 'first + place' will match instances
-**   of "first place" within the document set, but not alternative forms
-**   such as "1st place". In some applications, it would be better to match
-**   all instances of "first place" or "1st place" regardless of which form
-**   the user specified in the MATCH query text.
-**
-**   There are several ways to approach this in FTS5:
-**
-**   <ol><li> By mapping all synonyms to a single token. In this case, using
-**            the above example, this means that the tokenizer returns the
-**            same token for inputs "first" and "1st". Say that token is in
-**            fact "first", so that when the user inserts the document "I won
-**            1st place" entries are added to the index for tokens "i", "won",
-**            "first" and "place". If the user then queries for '1st + place',
-**            the tokenizer substitutes "first" for "1st" and the query works
-**            as expected.
-**
-**       <li> By querying the index for all synonyms of each query term
-**            separately. In this case, when tokenizing query text, the
-**            tokenizer may provide multiple synonyms for a single term
-**            within the document. FTS5 then queries the index for each
-**            synonym individually. For example, faced with the query:
-**
-**   <codeblock>
-**     ... MATCH 'first place'</codeblock>
-**
-**            the tokenizer offers both "1st" and "first" as synonyms for the
-**            first token in the MATCH query and FTS5 effectively runs a query
-**            similar to:
-**
-**   <codeblock>
-**     ... MATCH '(first OR 1st) place'</codeblock>
-**
-**            except that, for the purposes of auxiliary functions, the query
-**            still appears to contain just two phrases - "(first OR 1st)"
-**            being treated as a single phrase.
-**
-**       <li> By adding multiple synonyms for a single term to the FTS index.
-**            Using this method, when tokenizing document text, the tokenizer
-**            provides multiple synonyms for each token. So that when a
-**            document such as "I won first place" is tokenized, entries are
-**            added to the FTS index for "i", "won", "first", "1st" and
-**            "place".
-**
-**            This way, even if the tokenizer does not provide synonyms
-**            when tokenizing query text (it should not - to do so would be
-**            inefficient), it doesn't matter if the user queries for
-**            'first + place' or '1st + place', as there are entries in the
-**            FTS index corresponding to both forms of the first token.
-**   </ol>
-**
-**   Whether it is parsing document or query text, any call to xToken that
-**   specifies a <i>tflags</i> argument with the FTS5_TOKEN_COLOCATED bit
-**   is considered to supply a synonym for the previous token. For example,
-**   when parsing the document "I won first place", a tokenizer that supports
-**   synonyms would call xToken() 5 times, as follows:
-**
-**   <codeblock>
-**       xToken(pCtx, 0, "i",                      1,  0,  1);
-**       xToken(pCtx, 0, "won",                    3,  2,  5);
-**       xToken(pCtx, 0, "first",                  5,  6, 11);
-**       xToken(pCtx, FTS5_TOKEN_COLOCATED, "1st", 3,  6, 11);
-**       xToken(pCtx, 0, "place",                  5, 12, 17);
-**</codeblock>
-**
-**   It is an error to specify the FTS5_TOKEN_COLOCATED flag the first time
-**   xToken() is called. Multiple synonyms may be specified for a single token
-**   by making multiple calls to xToken(FTS5_TOKEN_COLOCATED) in sequence.
-**   There is no limit to the number of synonyms that may be provided for a
-**   single token.
-**
-**   In many cases, method (1) above is the best approach. It does not add
-**   extra data to the FTS index or require FTS5 to query for multiple terms,
-**   so it is efficient in terms of disk space and query speed. However, it
-**   does not support prefix queries very well. If, as suggested above, the
-**   token "first" is substituted for "1st" by the tokenizer, then the query:
-**
-**   <codeblock>
-**     ... MATCH '1s*'</codeblock>
-**
-**   will not match documents that contain the token "1st" (as the tokenizer
-**   will probably not map "1s" to any prefix of "first").
-**
-**   For full prefix support, method (3) may be preferred. In this case,
-**   because the index contains entries for both "first" and "1st", prefix
-**   queries such as 'fi*' or '1s*' will match correctly. However, because
-**   extra entries are added to the FTS index, this method uses more space
-**   within the database.
-**
-**   Method (2) offers a midpoint between (1) and (3). Using this method,
-**   a query such as '1s*' will match documents that contain the literal
-**   token "1st", but not "first" (assuming the tokenizer is not able to
-**   provide synonyms for prefixes). However, a non-prefix query like '1st'
-**   will match against "1st" and "first". This method does not require
-**   extra disk space, as no extra entries are added to the FTS index.
-**   On the other hand, it may require more CPU cycles to run MATCH queries,
-**   as separate queries of the FTS index are required for each synonym.
-**
-**   When using methods (2) or (3), it is important that the tokenizer only
-**   provide synonyms when tokenizing document text (method (2)) or query
-**   text (method (3)), not both. Doing so will not cause any errors, but is
-**   inefficient.
-*/
-typedef struct Fts5Tokenizer Fts5Tokenizer;
-typedef struct fts5_tokenizer fts5_tokenizer;
-struct fts5_tokenizer {
-  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
-  void (*xDelete)(Fts5Tokenizer*);
-  int (*xTokenize)(Fts5Tokenizer*,
-      void *pCtx,
-      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
-      const char *pText, int nText,
-      int (*xToken)(
-        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
-        int tflags,         /* Mask of FTS5_TOKEN_* flags */
-        const char *pToken, /* Pointer to buffer containing token */
-        int nToken,         /* Size of token in bytes */
-        int iStart,         /* Byte offset of token within input text */
-        int iEnd            /* Byte offset of end of token within input text */
-      )
-  );
-};
+    /*************************************************************************
+    ** CUSTOM AUXILIARY FUNCTIONS
+    **
+    ** Virtual table implementations may overload SQL functions by implementing
+    ** the sqlite3_module.xFindFunction() method.
+    */
+
+    typedef struct Fts5ExtensionApi Fts5ExtensionApi;
+    typedef struct Fts5Context Fts5Context;
+    typedef struct Fts5PhraseIter Fts5PhraseIter;
+
+    typedef void (*fts5_extension_function)(const Fts5ExtensionApi* pApi, /* API offered by current FTS version */
+                                            Fts5Context* pFts,            /* First arg to pass to pApi functions */
+                                            sqlite3_context* pCtx,        /* Context for returning result/error */
+                                            int nVal,                     /* Number of values in apVal[] array */
+                                            sqlite3_value** apVal         /* Array of trailing arguments */
+    );
+
+    struct Fts5PhraseIter
+    {
+        const unsigned char* a;
+        const unsigned char* b;
+    };
+
+    /*
+    ** EXTENSION API FUNCTIONS
+    **
+    ** xUserData(pFts):
+    **   Return a copy of the context pointer the extension function was
+    **   registered with.
+    **
+    ** xColumnTotalSize(pFts, iCol, pnToken):
+    **   If parameter iCol is less than zero, set output variable *pnToken
+    **   to the total number of tokens in the FTS5 table. Or, if iCol is
+    **   non-negative but less than the number of columns in the table, return
+    **   the total number of tokens in column iCol, considering all rows in
+    **   the FTS5 table.
+    **
+    **   If parameter iCol is greater than or equal to the number of columns
+    **   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
+    **   an OOM condition or IO error), an appropriate SQLite error code is
+    **   returned.
+    **
+    ** xColumnCount(pFts):
+    **   Return the number of columns in the table.
+    **
+    ** xColumnSize(pFts, iCol, pnToken):
+    **   If parameter iCol is less than zero, set output variable *pnToken
+    **   to the total number of tokens in the current row. Or, if iCol is
+    **   non-negative but less than the number of columns in the table, set
+    **   *pnToken to the number of tokens in column iCol of the current row.
+    **
+    **   If parameter iCol is greater than or equal to the number of columns
+    **   in the table, SQLITE_RANGE is returned. Or, if an error occurs (e.g.
+    **   an OOM condition or IO error), an appropriate SQLite error code is
+    **   returned.
+    **
+    **   This function may be quite inefficient if used with an FTS5 table
+    **   created with the "columnsize=0" option.
+    **
+    ** xColumnText:
+    **   This function attempts to retrieve the text of column iCol of the
+    **   current document. If successful, (*pz) is set to point to a buffer
+    **   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
+    **   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
+    **   if an error occurs, an SQLite error code is returned and the final values
+    **   of (*pz) and (*pn) are undefined.
+    **
+    ** xPhraseCount:
+    **   Returns the number of phrases in the current query expression.
+    **
+    ** xPhraseSize:
+    **   Returns the number of tokens in phrase iPhrase of the query. Phrases
+    **   are numbered starting from zero.
+    **
+    ** xInstCount:
+    **   Set *pnInst to the total number of occurrences of all phrases within
+    **   the query within the current row. Return SQLITE_OK if successful, or
+    **   an error code (i.e. SQLITE_NOMEM) if an error occurs.
+    **
+    **   This API can be quite slow if used with an FTS5 table created with the
+    **   "detail=none" or "detail=column" option. If the FTS5 table is created
+    **   with either "detail=none" or "detail=column" and "content=" option
+    **   (i.e. if it is a contentless table), then this API always returns 0.
+    **
+    ** xInst:
+    **   Query for the details of phrase match iIdx within the current row.
+    **   Phrase matches are numbered starting from zero, so the iIdx argument
+    **   should be greater than or equal to zero and smaller than the value
+    **   output by xInstCount().
+    **
+    **   Usually, output parameter *piPhrase is set to the phrase number, *piCol
+    **   to the column in which it occurs and *piOff the token offset of the
+    **   first token of the phrase. Returns SQLITE_OK if successful, or an error
+    **   code (i.e. SQLITE_NOMEM) if an error occurs.
+    **
+    **   This API can be quite slow if used with an FTS5 table created with the
+    **   "detail=none" or "detail=column" option.
+    **
+    ** xRowid:
+    **   Returns the rowid of the current row.
+    **
+    ** xTokenize:
+    **   Tokenize text using the tokenizer belonging to the FTS5 table.
+    **
+    ** xQueryPhrase(pFts5, iPhrase, pUserData, xCallback):
+    **   This API function is used to query the FTS table for phrase iPhrase
+    **   of the current query. Specifically, a query equivalent to:
+    **
+    **       ... FROM ftstable WHERE ftstable MATCH $p ORDER BY rowid
+    **
+    **   with $p set to a phrase equivalent to the phrase iPhrase of the
+    **   current query is executed. Any column filter that applies to
+    **   phrase iPhrase of the current query is included in $p. For each
+    **   row visited, the callback function passed as the fourth argument
+    **   is invoked. The context and API objects passed to the callback
+    **   function may be used to access the properties of each matched row.
+    **   Invoking Api.xUserData() returns a copy of the pointer passed as
+    **   the third argument to pUserData.
+    **
+    **   If the callback function returns any value other than SQLITE_OK, the
+    **   query is abandoned and the xQueryPhrase function returns immediately.
+    **   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
+    **   Otherwise, the error code is propagated upwards.
+    **
+    **   If the query runs to completion without incident, SQLITE_OK is returned.
+    **   Or, if some error occurs before the query completes or is aborted by
+    **   the callback, an SQLite error code is returned.
+    **
+    **
+    ** xSetAuxdata(pFts5, pAux, xDelete)
+    **
+    **   Save the pointer passed as the second argument as the extension function's
+    **   "auxiliary data". The pointer may then be retrieved by the current or any
+    **   future invocation of the same fts5 extension function made as part of
+    **   the same MATCH query using the xGetAuxdata() API.
+    **
+    **   Each extension function is allocated a single auxiliary data slot for
+    **   each FTS query (MATCH expression). If the extension function is invoked
+    **   more than once for a single FTS query, then all invocations share a
+    **   single auxiliary data context.
+    **
+    **   If there is already an auxiliary data pointer when this function is
+    **   invoked, then it is replaced by the new pointer. If an xDelete callback
+    **   was specified along with the original pointer, it is invoked at this
+    **   point.
+    **
+    **   The xDelete callback, if one is specified, is also invoked on the
+    **   auxiliary data pointer after the FTS5 query has finished.
+    **
+    **   If an error (e.g. an OOM condition) occurs within this function,
+    **   the auxiliary data is set to NULL and an error code returned. If the
+    **   xDelete parameter was not NULL, it is invoked on the auxiliary data
+    **   pointer before returning.
+    **
+    **
+    ** xGetAuxdata(pFts5, bClear)
+    **
+    **   Returns the current auxiliary data pointer for the fts5 extension
+    **   function. See the xSetAuxdata() method for details.
+    **
+    **   If the bClear argument is non-zero, then the auxiliary data is cleared
+    **   (set to NULL) before this function returns. In this case the xDelete,
+    **   if any, is not invoked.
+    **
+    **
+    ** xRowCount(pFts5, pnRow)
+    **
+    **   This function is used to retrieve the total number of rows in the table.
+    **   In other words, the same value that would be returned by:
+    **
+    **        SELECT count(*) FROM ftstable;
+    **
+    ** xPhraseFirst()
+    **   This function is used, along with type Fts5PhraseIter and the xPhraseNext
+    **   method, to iterate through all instances of a single query phrase within
+    **   the current row. This is the same information as is accessible via the
+    **   xInstCount/xInst APIs. While the xInstCount/xInst APIs are more convenient
+    **   to use, this API may be faster under some circumstances. To iterate
+    **   through instances of phrase iPhrase, use the following code:
+    **
+    **       Fts5PhraseIter iter;
+    **       int iCol, iOff;
+    **       for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff);
+    **           iCol>=0;
+    **           pApi->xPhraseNext(pFts, &iter, &iCol, &iOff)
+    **       ){
+    **         // An instance of phrase iPhrase at offset iOff of column iCol
+    **       }
+    **
+    **   The Fts5PhraseIter structure is defined above. Applications should not
+    **   modify this structure directly - it should only be used as shown above
+    **   with the xPhraseFirst() and xPhraseNext() API methods (and by
+    **   xPhraseFirstColumn() and xPhraseNextColumn() as illustrated below).
+    **
+    **   This API can be quite slow if used with an FTS5 table created with the
+    **   "detail=none" or "detail=column" option. If the FTS5 table is created
+    **   with either "detail=none" or "detail=column" and "content=" option
+    **   (i.e. if it is a contentless table), then this API always iterates
+    **   through an empty set (all calls to xPhraseFirst() set iCol to -1).
+    **
+    ** xPhraseNext()
+    **   See xPhraseFirst above.
+    **
+    ** xPhraseFirstColumn()
+    **   This function and xPhraseNextColumn() are similar to the xPhraseFirst()
+    **   and xPhraseNext() APIs described above. The difference is that instead
+    **   of iterating through all instances of a phrase in the current row, these
+    **   APIs are used to iterate through the set of columns in the current row
+    **   that contain one or more instances of a specified phrase. For example:
+    **
+    **       Fts5PhraseIter iter;
+    **       int iCol;
+    **       for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol);
+    **           iCol>=0;
+    **           pApi->xPhraseNextColumn(pFts, &iter, &iCol)
+    **       ){
+    **         // Column iCol contains at least one instance of phrase iPhrase
+    **       }
+    **
+    **   This API can be quite slow if used with an FTS5 table created with the
+    **   "detail=none" option. If the FTS5 table is created with either
+    **   "detail=none" "content=" option (i.e. if it is a contentless table),
+    **   then this API always iterates through an empty set (all calls to
+    **   xPhraseFirstColumn() set iCol to -1).
+    **
+    **   The information accessed using this API and its companion
+    **   xPhraseFirstColumn() may also be obtained using xPhraseFirst/xPhraseNext
+    **   (or xInst/xInstCount). The chief advantage of this API is that it is
+    **   significantly more efficient than those alternatives when used with
+    **   "detail=column" tables.
+    **
+    ** xPhraseNextColumn()
+    **   See xPhraseFirstColumn above.
+    */
+    struct Fts5ExtensionApi
+    {
+        int iVersion; /* Currently always set to 3 */
+
+        void* (*xUserData)(Fts5Context*);
+
+        int (*xColumnCount)(Fts5Context*);
+        int (*xRowCount)(Fts5Context*, sqlite3_int64* pnRow);
+        int (*xColumnTotalSize)(Fts5Context*, int iCol, sqlite3_int64* pnToken);
+
+        int (*xTokenize)(Fts5Context*,
+                         const char* pText,
+                         int nText,                                            /* Text to tokenize */
+                         void* pCtx,                                           /* Context passed to xToken() */
+                         int (*xToken)(void*, int, const char*, int, int, int) /* Callback */
+        );
+
+        int (*xPhraseCount)(Fts5Context*);
+        int (*xPhraseSize)(Fts5Context*, int iPhrase);
+
+        int (*xInstCount)(Fts5Context*, int* pnInst);
+        int (*xInst)(Fts5Context*, int iIdx, int* piPhrase, int* piCol, int* piOff);
+
+        sqlite3_int64 (*xRowid)(Fts5Context*);
+        int (*xColumnText)(Fts5Context*, int iCol, const char** pz, int* pn);
+        int (*xColumnSize)(Fts5Context*, int iCol, int* pnToken);
+
+        int (*xQueryPhrase)(Fts5Context*,
+                            int iPhrase,
+                            void* pUserData,
+                            int (*)(const Fts5ExtensionApi*, Fts5Context*, void*));
+        int (*xSetAuxdata)(Fts5Context*, void* pAux, void (*xDelete)(void*));
+        void* (*xGetAuxdata)(Fts5Context*, int bClear);
+
+        int (*xPhraseFirst)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*, int*);
+        void (*xPhraseNext)(Fts5Context*, Fts5PhraseIter*, int* piCol, int* piOff);
+
+        int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
+        void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int* piCol);
+    };
+
+    /*
+    ** CUSTOM AUXILIARY FUNCTIONS
+    *************************************************************************/
+
+    /*************************************************************************
+    ** CUSTOM TOKENIZERS
+    **
+    ** Applications may also register custom tokenizer types. A tokenizer
+    ** is registered by providing fts5 with a populated instance of the
+    ** following structure. All structure methods must be defined, setting
+    ** any member of the fts5_tokenizer struct to NULL leads to undefined
+    ** behaviour. The structure methods are expected to function as follows:
+    **
+    ** xCreate:
+    **   This function is used to allocate and initialize a tokenizer instance.
+    **   A tokenizer instance is required to actually tokenize text.
+    **
+    **   The first argument passed to this function is a copy of the (void*)
+    **   pointer provided by the application when the fts5_tokenizer object
+    **   was registered with FTS5 (the third argument to xCreateTokenizer()).
+    **   The second and third arguments are an array of nul-terminated strings
+    **   containing the tokenizer arguments, if any, specified following the
+    **   tokenizer name as part of the CREATE VIRTUAL TABLE statement used
+    **   to create the FTS5 table.
+    **
+    **   The final argument is an output variable. If successful, (*ppOut)
+    **   should be set to point to the new tokenizer handle and SQLITE_OK
+    **   returned. If an error occurs, some value other than SQLITE_OK should
+    **   be returned. In this case, fts5 assumes that the final value of *ppOut
+    **   is undefined.
+    **
+    ** xDelete:
+    **   This function is invoked to delete a tokenizer handle previously
+    **   allocated using xCreate(). Fts5 guarantees that this function will
+    **   be invoked exactly once for each successful call to xCreate().
+    **
+    ** xTokenize:
+    **   This function is expected to tokenize the nText byte string indicated
+    **   by argument pText. pText may or may not be nul-terminated. The first
+    **   argument passed to this function is a pointer to an Fts5Tokenizer object
+    **   returned by an earlier call to xCreate().
+    **
+    **   The second argument indicates the reason that FTS5 is requesting
+    **   tokenization of the supplied text. This is always one of the following
+    **   four values:
+    **
+    **   <ul><li> <b>FTS5_TOKENIZE_DOCUMENT</b> - A document is being inserted into
+    **            or removed from the FTS table. The tokenizer is being invoked to
+    **            determine the set of tokens to add to (or delete from) the
+    **            FTS index.
+    **
+    **       <li> <b>FTS5_TOKENIZE_QUERY</b> - A MATCH query is being executed
+    **            against the FTS index. The tokenizer is being called to tokenize
+    **            a bareword or quoted string specified as part of the query.
+    **
+    **       <li> <b>(FTS5_TOKENIZE_QUERY | FTS5_TOKENIZE_PREFIX)</b> - Same as
+    **            FTS5_TOKENIZE_QUERY, except that the bareword or quoted string is
+    **            followed by a "*" character, indicating that the last token
+    **            returned by the tokenizer will be treated as a token prefix.
+    **
+    **       <li> <b>FTS5_TOKENIZE_AUX</b> - The tokenizer is being invoked to
+    **            satisfy an fts5_api.xTokenize() request made by an auxiliary
+    **            function. Or an fts5_api.xColumnSize() request made by the same
+    **            on a columnsize=0 database.
+    **   </ul>
+    **
+    **   For each token in the input string, the supplied callback xToken() must
+    **   be invoked. The first argument to it should be a copy of the pointer
+    **   passed as the second argument to xTokenize(). The third and fourth
+    **   arguments are a pointer to a buffer containing the token text, and the
+    **   size of the token in bytes. The 4th and 5th arguments are the byte offsets
+    **   of the first byte of and first byte immediately following the text from
+    **   which the token is derived within the input.
+    **
+    **   The second argument passed to the xToken() callback ("tflags") should
+    **   normally be set to 0. The exception is if the tokenizer supports
+    **   synonyms. In this case see the discussion below for details.
+    **
+    **   FTS5 assumes the xToken() callback is invoked for each token in the
+    **   order that they occur within the input text.
+    **
+    **   If an xToken() callback returns any value other than SQLITE_OK, then
+    **   the tokenization should be abandoned and the xTokenize() method should
+    **   immediately return a copy of the xToken() return value. Or, if the
+    **   input buffer is exhausted, xTokenize() should return SQLITE_OK. Finally,
+    **   if an error occurs with the xTokenize() implementation itself, it
+    **   may abandon the tokenization and return any error code other than
+    **   SQLITE_OK or SQLITE_DONE.
+    **
+    ** SYNONYM SUPPORT
+    **
+    **   Custom tokenizers may also support synonyms. Consider a case in which a
+    **   user wishes to query for a phrase such as "first place". Using the
+    **   built-in tokenizers, the FTS5 query 'first + place' will match instances
+    **   of "first place" within the document set, but not alternative forms
+    **   such as "1st place". In some applications, it would be better to match
+    **   all instances of "first place" or "1st place" regardless of which form
+    **   the user specified in the MATCH query text.
+    **
+    **   There are several ways to approach this in FTS5:
+    **
+    **   <ol><li> By mapping all synonyms to a single token. In this case, using
+    **            the above example, this means that the tokenizer returns the
+    **            same token for inputs "first" and "1st". Say that token is in
+    **            fact "first", so that when the user inserts the document "I won
+    **            1st place" entries are added to the index for tokens "i", "won",
+    **            "first" and "place". If the user then queries for '1st + place',
+    **            the tokenizer substitutes "first" for "1st" and the query works
+    **            as expected.
+    **
+    **       <li> By querying the index for all synonyms of each query term
+    **            separately. In this case, when tokenizing query text, the
+    **            tokenizer may provide multiple synonyms for a single term
+    **            within the document. FTS5 then queries the index for each
+    **            synonym individually. For example, faced with the query:
+    **
+    **   <codeblock>
+    **     ... MATCH 'first place'</codeblock>
+    **
+    **            the tokenizer offers both "1st" and "first" as synonyms for the
+    **            first token in the MATCH query and FTS5 effectively runs a query
+    **            similar to:
+    **
+    **   <codeblock>
+    **     ... MATCH '(first OR 1st) place'</codeblock>
+    **
+    **            except that, for the purposes of auxiliary functions, the query
+    **            still appears to contain just two phrases - "(first OR 1st)"
+    **            being treated as a single phrase.
+    **
+    **       <li> By adding multiple synonyms for a single term to the FTS index.
+    **            Using this method, when tokenizing document text, the tokenizer
+    **            provides multiple synonyms for each token. So that when a
+    **            document such as "I won first place" is tokenized, entries are
+    **            added to the FTS index for "i", "won", "first", "1st" and
+    **            "place".
+    **
+    **            This way, even if the tokenizer does not provide synonyms
+    **            when tokenizing query text (it should not - to do so would be
+    **            inefficient), it doesn't matter if the user queries for
+    **            'first + place' or '1st + place', as there are entries in the
+    **            FTS index corresponding to both forms of the first token.
+    **   </ol>
+    **
+    **   Whether it is parsing document or query text, any call to xToken that
+    **   specifies a <i>tflags</i> argument with the FTS5_TOKEN_COLOCATED bit
+    **   is considered to supply a synonym for the previous token. For example,
+    **   when parsing the document "I won first place", a tokenizer that supports
+    **   synonyms would call xToken() 5 times, as follows:
+    **
+    **   <codeblock>
+    **       xToken(pCtx, 0, "i",                      1,  0,  1);
+    **       xToken(pCtx, 0, "won",                    3,  2,  5);
+    **       xToken(pCtx, 0, "first",                  5,  6, 11);
+    **       xToken(pCtx, FTS5_TOKEN_COLOCATED, "1st", 3,  6, 11);
+    **       xToken(pCtx, 0, "place",                  5, 12, 17);
+    **</codeblock>
+    **
+    **   It is an error to specify the FTS5_TOKEN_COLOCATED flag the first time
+    **   xToken() is called. Multiple synonyms may be specified for a single token
+    **   by making multiple calls to xToken(FTS5_TOKEN_COLOCATED) in sequence.
+    **   There is no limit to the number of synonyms that may be provided for a
+    **   single token.
+    **
+    **   In many cases, method (1) above is the best approach. It does not add
+    **   extra data to the FTS index or require FTS5 to query for multiple terms,
+    **   so it is efficient in terms of disk space and query speed. However, it
+    **   does not support prefix queries very well. If, as suggested above, the
+    **   token "first" is substituted for "1st" by the tokenizer, then the query:
+    **
+    **   <codeblock>
+    **     ... MATCH '1s*'</codeblock>
+    **
+    **   will not match documents that contain the token "1st" (as the tokenizer
+    **   will probably not map "1s" to any prefix of "first").
+    **
+    **   For full prefix support, method (3) may be preferred. In this case,
+    **   because the index contains entries for both "first" and "1st", prefix
+    **   queries such as 'fi*' or '1s*' will match correctly. However, because
+    **   extra entries are added to the FTS index, this method uses more space
+    **   within the database.
+    **
+    **   Method (2) offers a midpoint between (1) and (3). Using this method,
+    **   a query such as '1s*' will match documents that contain the literal
+    **   token "1st", but not "first" (assuming the tokenizer is not able to
+    **   provide synonyms for prefixes). However, a non-prefix query like '1st'
+    **   will match against "1st" and "first". This method does not require
+    **   extra disk space, as no extra entries are added to the FTS index.
+    **   On the other hand, it may require more CPU cycles to run MATCH queries,
+    **   as separate queries of the FTS index are required for each synonym.
+    **
+    **   When using methods (2) or (3), it is important that the tokenizer only
+    **   provide synonyms when tokenizing document text (method (2)) or query
+    **   text (method (3)), not both. Doing so will not cause any errors, but is
+    **   inefficient.
+    */
+    typedef struct Fts5Tokenizer Fts5Tokenizer;
+    typedef struct fts5_tokenizer fts5_tokenizer;
+    struct fts5_tokenizer
+    {
+        int (*xCreate)(void*, const char** azArg, int nArg, Fts5Tokenizer** ppOut);
+        void (*xDelete)(Fts5Tokenizer*);
+        int (*xTokenize)(Fts5Tokenizer*,
+                         void* pCtx,
+                         int flags, /* Mask of FTS5_TOKENIZE_* flags */
+                         const char* pText,
+                         int nText,
+                         int (*xToken)(void* pCtx,         /* Copy of 2nd argument to xTokenize() */
+                                       int tflags,         /* Mask of FTS5_TOKEN_* flags */
+                                       const char* pToken, /* Pointer to buffer containing token */
+                                       int nToken,         /* Size of token in bytes */
+                                       int iStart,         /* Byte offset of token within input text */
+                                       int iEnd            /* Byte offset of end of token within input text */
+                                       ));
+    };
 
 /* Flags that may be passed as the third argument to xTokenize() */
-#define FTS5_TOKENIZE_QUERY     0x0001
-#define FTS5_TOKENIZE_PREFIX    0x0002
-#define FTS5_TOKENIZE_DOCUMENT  0x0004
-#define FTS5_TOKENIZE_AUX       0x0008
+#define FTS5_TOKENIZE_QUERY 0x0001
+#define FTS5_TOKENIZE_PREFIX 0x0002
+#define FTS5_TOKENIZE_DOCUMENT 0x0004
+#define FTS5_TOKENIZE_AUX 0x0008
 
 /* Flags that may be passed by the tokenizer implementation back to FTS5
 ** as the third argument to the supplied xToken callback. */
-#define FTS5_TOKEN_COLOCATED    0x0001      /* Same position as prev. token */
-
-/*
-** END OF CUSTOM TOKENIZERS
-*************************************************************************/
-
-/*************************************************************************
-** FTS5 EXTENSION REGISTRATION API
-*/
-typedef struct fts5_api fts5_api;
-struct fts5_api {
-  int iVersion;                   /* Currently always set to 2 */
-
-  /* Create a new tokenizer */
-  int (*xCreateTokenizer)(
-    fts5_api *pApi,
-    const char *zName,
-    void *pContext,
-    fts5_tokenizer *pTokenizer,
-    void (*xDestroy)(void*)
-  );
-
-  /* Find an existing tokenizer */
-  int (*xFindTokenizer)(
-    fts5_api *pApi,
-    const char *zName,
-    void **ppContext,
-    fts5_tokenizer *pTokenizer
-  );
-
-  /* Create a new auxiliary function */
-  int (*xCreateFunction)(
-    fts5_api *pApi,
-    const char *zName,
-    void *pContext,
-    fts5_extension_function xFunction,
-    void (*xDestroy)(void*)
-  );
-};
-
-/*
-** END OF REGISTRATION API
-*************************************************************************/
+#define FTS5_TOKEN_COLOCATED 0x0001 /* Same position as prev. token */
+
+    /*
+    ** END OF CUSTOM TOKENIZERS
+    *************************************************************************/
+
+    /*************************************************************************
+    ** FTS5 EXTENSION REGISTRATION API
+    */
+    typedef struct fts5_api fts5_api;
+    struct fts5_api
+    {
+        int iVersion; /* Currently always set to 2 */
+
+        /* Create a new tokenizer */
+        int (*xCreateTokenizer)(fts5_api* pApi,
+                                const char* zName,
+                                void* pContext,
+                                fts5_tokenizer* pTokenizer,
+                                void (*xDestroy)(void*));
+
+        /* Find an existing tokenizer */
+        int (*xFindTokenizer)(fts5_api* pApi, const char* zName, void** ppContext, fts5_tokenizer* pTokenizer);
+
+        /* Create a new auxiliary function */
+        int (*xCreateFunction)(fts5_api* pApi,
+                               const char* zName,
+                               void* pContext,
+                               fts5_extension_function xFunction,
+                               void (*xDestroy)(void*));
+    };
+
+    /*
+    ** END OF REGISTRATION API
+    *************************************************************************/
 
 #ifdef __cplusplus
-}  /* end of the 'extern "C"' block */
+} /* end of the 'extern "C"' block */
 #endif
 
 #endif /* _FTS5_H */
diff --git a/flint/cmd_line_parser.cpp b/flint/cmd_line_parser.cpp
index 7c3932a4..62bd9b37 100644
--- a/flint/cmd_line_parser.cpp
+++ b/flint/cmd_line_parser.cpp
@@ -45,31 +45,34 @@
 #include "mlxfwops/lib/flint_io.h"
 
 #ifndef FLINT_NAME
-    #ifdef __GNUC__
-        #define FLINT_NAME "flint"
-    #else
-        #define FLINT_NAME "flint"
-    #endif
+#ifdef __GNUC__
+#define FLINT_NAME "flint"
+#else
+#define FLINT_NAME "flint"
+#endif
 #endif
 
 using namespace std;
 
 /******************************
-* Data structures containing
-* Meta data about subcommands
-* and flags
-******************************/
-class SubCmdMetaData {
+ * Data structures containing
+ * Meta data about subcommands
+ * and flags
+ ******************************/
+class SubCmdMetaData
+{
 private:
-    class SubCmd {
-public:
-        SubCmd(string s, string l, sub_cmd_t n) :  shortf(s), longf(l), cmdNum(n) {}
-        ~SubCmd(){}
+    class SubCmd
+    {
+    public:
+        SubCmd(string s, string l, sub_cmd_t n) : shortf(s), longf(l), cmdNum(n) {}
+        ~SubCmd() {}
         string shortf;
         string longf;
         sub_cmd_t cmdNum;
     };
     vector<class SubCmd*> _sCmds;
+
 public:
     SubCmdMetaData();
     ~SubCmdMetaData();
@@ -127,33 +130,38 @@ SubCmdMetaData::SubCmdMetaData()
 
 SubCmdMetaData::~SubCmdMetaData()
 {
-    for (vector<class SubCmd*>::iterator it = _sCmds.begin(); it != _sCmds.end(); ++it) {
+    for (vector<class SubCmd*>::iterator it = _sCmds.begin(); it != _sCmds.end(); ++it)
+    {
         delete *it;
     }
 }
 
 sub_cmd_t SubCmdMetaData::getCmdNum(string flag)
 {
-    for (vector<class SubCmd*>::iterator it = _sCmds.begin(); it != _sCmds.end(); ++it) {
-        if (((*it)->shortf == flag) || ((*it)->longf == flag)) {
+    for (vector<class SubCmd*>::iterator it = _sCmds.begin(); it != _sCmds.end(); ++it)
+    {
+        if (((*it)->shortf == flag) || ((*it)->longf == flag))
+        {
             return (*it)->cmdNum;
         }
     }
     return SC_No_Cmd;
 }
 
-
-class FlagMetaData {
+class FlagMetaData
+{
 private:
-    class Flag {
-public:
-        Flag(string s, string l, int n) :  shortf(s), longf(l), argNum(n) {}
-        ~Flag(){}
+    class Flag
+    {
+    public:
+        Flag(string s, string l, int n) : shortf(s), longf(l), argNum(n) {}
+        ~Flag() {}
         string shortf;
         string longf;
         int argNum;
     };
     vector<class Flag*> _flags;
+
 public:
     FlagMetaData();
     ~FlagMetaData();
@@ -195,7 +203,8 @@ FlagMetaData::FlagMetaData()
     _flags.push_back(new Flag("", "striped_image", 0));
     _flags.push_back(new Flag("", "banks", 1));
     _flags.push_back(new Flag("", "log", 1));
-    _flags.push_back(new Flag("", "flash_params", 1)); //its actually 3 but separated by comma so we refer to them as one
+    _flags.push_back(new Flag("", "flash_params", 1)); // its actually 3 but separated by comma so we refer to them as
+                                                       // one
     _flags.push_back(new Flag("v", "version", 0));
     _flags.push_back(new Flag("", "no_devid_check", 0));
     _flags.push_back(new Flag("", "use_fw", 0));
@@ -228,10 +237,10 @@ FlagMetaData::FlagMetaData()
     _flags.push_back(new Flag("", "public_key_label", 1));
     _flags.push_back(new Flag("", "hsm", 0));
 #endif
-   _flags.push_back(new Flag("", "openssl_engine", 1));
-   _flags.push_back(new Flag("", "openssl_key_id", 1));
+    _flags.push_back(new Flag("", "openssl_engine", 1));
+    _flags.push_back(new Flag("", "openssl_key_id", 1));
 #ifdef __WIN__
-	_flags.push_back(new Flag("", "cpu_util", 1));
+    _flags.push_back(new Flag("", "cpu_util", 1));
 #endif
     _flags.push_back(new Flag("", "output_file", 1));
     _flags.push_back(new Flag("", "user_password", 1));
@@ -240,15 +249,18 @@ FlagMetaData::FlagMetaData()
 
 FlagMetaData::~FlagMetaData()
 {
-    for (vector<class Flag*>::iterator it = _flags.begin(); it != _flags.end(); ++it) {
+    for (vector<class Flag*>::iterator it = _flags.begin(); it != _flags.end(); ++it)
+    {
         delete *it;
     }
 }
 
 int FlagMetaData::getNumOfArgs(string flag)
 {
-    for (vector<class Flag*>::iterator it = _flags.begin(); it != _flags.end(); ++it) {
-        if (((*it)->shortf == flag) || ((*it)->longf == flag)) {
+    for (vector<class Flag*>::iterator it = _flags.begin(); it != _flags.end(); ++it)
+    {
+        if (((*it)->shortf == flag) || ((*it)->longf == flag))
+        {
             return (*it)->argNum;
         }
     }
@@ -260,16 +272,18 @@ int FlagMetaData::getNumOfArgs(string flag)
  *******************/
 
 // NOTE : number of parameters extracted in the container should be checked.
-static void splitByDelimiters(std::vector<string>& container, string str, const char *delimiters )
+static void splitByDelimiters(std::vector<string>& container, string str, const char* delimiters)
 {
-    if (str.size() == 0) {
+    if (str.size() == 0)
+    {
         return;
     }
-    char *cStr = strcpy(new char[str.size() + 1], str.c_str());
-    char *ptr;
+    char* cStr = strcpy(new char[str.size() + 1], str.c_str());
+    char* ptr;
     ptr = strtok(cStr, delimiters);
 
-    while (ptr != NULL) {
+    while (ptr != NULL)
+    {
         container.push_back(ptr);
         ptr = strtok(NULL, delimiters);
     }
@@ -277,16 +291,19 @@ static void splitByDelimiters(std::vector<string>& container, string str, const
     return;
 }
 
-char* stripFlag(char *flag)
+char* stripFlag(char* flag)
 {
-    char *strippedFlagStart = NULL;
-    if (flag[0] != '-') { // not a flag
+    char* strippedFlagStart = NULL;
+    if (flag[0] != '-')
+    { // not a flag
         return flag;
-    }
-    ;
-    if ((flag[0] == '-') && (flag[1] == '-')) {
+    };
+    if ((flag[0] == '-') && (flag[1] == '-'))
+    {
         strippedFlagStart = &flag[2];
-    } else {
+    }
+    else
+    {
         strippedFlagStart = &flag[1];
     }
     return strippedFlagStart;
@@ -294,12 +311,15 @@ char* stripFlag(char *flag)
 
 int countArgs(string args)
 {
-    if (args.size() == 0) {
+    if (args.size() == 0)
+    {
         return 0;
     }
     int count = 1;
-    for (string::iterator it = args.begin(); it < args.end(); ++it) {
-        if (*it == ',') {
+    for (string::iterator it = args.begin(); it < args.end(); ++it)
+    {
+        if (*it == ',')
+        {
             count++;
         }
     }
@@ -308,45 +328,56 @@ int countArgs(string args)
 
 bool verifyNumOfArgs(string name, string value)
 {
-    //HACK : we don't check device numOfArgs because image device format might contain ","
-    if ((name == "device") || (name == "d") ) {
+    // HACK : we don't check device numOfArgs because image device format might contain ","
+    if ((name == "device") || (name == "d"))
+    {
         return true;
     }
-    if ((name == "image") || (name == "i") ) {
+    if ((name == "image") || (name == "i"))
+    {
         return true;
     }
     // Hack : VSD can be empty or contain "," so we shouldnt count its args
-    if (name == "vsd") {
+    if (name == "vsd")
+    {
         return true;
     }
-    if (name == "output_file") {
+    if (name == "output_file")
+    {
         return true;
     }
 
     int expected = FlagMetaData().getNumOfArgs(name);
-    if (expected < 0) {
+    if (expected < 0)
+    {
         printf(FLINT_INVALID_FLAG_ERROR, name.c_str());
         return false;
     }
-    //HACK : flash_params is 3 argument but given with comma separated instead of spaces like the rest
+    // HACK : flash_params is 3 argument but given with comma separated instead of spaces like the rest
     // so flag_arg_num gives a wrong value
 
-    if (name == "flash_params") {
+    if (name == "flash_params")
+    {
         expected = 3;
     }
 
     int actual = countArgs(value);
-    if (name == "downstream_device_ids") {
-        if (actual < 1) {
+    if (name == "downstream_device_ids")
+    {
+        if (actual < 1)
+        {
             printf(FLINT_TOO_FEW_MINIMUM_ARGS_ERROR, 1, actual);
             return false;
         }
         return true;
     }
-    if (actual < expected) {
+    if (actual < expected)
+    {
         printf(FLINT_TOO_FEW_ARGS_ERROR, expected, actual);
         return false;
-    } else if (actual > expected) {
+    }
+    else if (actual > expected)
+    {
         printf(FLINT_TOO_MANY_ARGS_ERROR, expected, actual);
         return false;
     }
@@ -355,10 +386,11 @@ bool verifyNumOfArgs(string name, string value)
 
 bool strToInt(string str, int& num, int base = 0)
 {
-    char *endp;
-    char *numStr = strcpy(new char[str.size() + 1], str.c_str());
+    char* endp;
+    char* numStr = strcpy(new char[str.size() + 1], str.c_str());
     num = strtol(numStr, &endp, base);
-    if (*endp) {
+    if (*endp)
+    {
         delete[] numStr;
         return false;
     }
@@ -366,13 +398,13 @@ bool strToInt(string str, int& num, int base = 0)
     return true;
 }
 
-
 bool strToNum(string str, u_int64_t& num, int base = 0)
 {
-    char *endp;
-    char *numStr = strcpy(new char[str.size() + 1], str.c_str());
+    char* endp;
+    char* numStr = strcpy(new char[str.size() + 1], str.c_str());
     num = strtoul(numStr, &endp, base);
-    if (*endp) {
+    if (*endp)
+    {
         delete[] numStr;
         return false;
     }
@@ -380,16 +412,20 @@ bool strToNum(string str, u_int64_t& num, int base = 0)
     return true;
 }
 
-//this function is used in extracting both guids and macs from user
+// this function is used in extracting both guids and macs from user
 bool getGUIDFromStr(string str, guid_t& guid, string prefixErr = "")
 {
-    char *endp;
+    char* endp;
     u_int64_t g;
     g = strtoull(str.c_str(), &endp, 16);
-    if (*endp || (g == 0xffffffffffffffffULL && errno == ERANGE)) {
-        if (prefixErr.size() == 0) {
-            printf("-E- Invalid Guid/Mac/Uid syntax (%s) %s \n", str.c_str(), errno ? strerror(errno) : "" );
-        } else {
+    if (*endp || (g == 0xffffffffffffffffULL && errno == ERANGE))
+    {
+        if (prefixErr.size() == 0)
+        {
+            printf("-E- Invalid Guid/Mac/Uid syntax (%s) %s \n", str.c_str(), errno ? strerror(errno) : "");
+        }
+        else
+        {
             printf("%s\n", prefixErr.c_str());
         }
         return false;
@@ -401,37 +437,46 @@ bool getGUIDFromStr(string str, guid_t& guid, string prefixErr = "")
 
 bool isElementPresent(vector<string> strv, string str) //* should be renamed to isStrPresent, since it's not generic
 {
-    for (vector<string>::iterator it = strv.begin(); it < strv.end(); it++) {
-        if (*it == str) {
+    for (vector<string>::iterator it = strv.begin(); it < strv.end(); it++)
+    {
+        if (*it == str)
+        {
             return true;
         }
     }
     return false;
 }
 
-bool stringsCommaSplit(string str, std::vector<int> &deviceIds) //* Should be renamed to something like
+bool stringsCommaSplit(string str, std::vector<int>& deviceIds) //* Should be renamed to something like
 {                                                               //* getIntsFromCommaSplitString
     size_t pos;
     std::vector<string> strv;
     bool res = true;
-    while ((pos = str.find(',')) != string::npos) {
+    while ((pos = str.find(',')) != string::npos)
+    {
         string tmp = str.substr(0, pos);
-        if (!isElementPresent(strv, tmp)) { //* Can be changed to: std::find(strv.begin(), strv.end(), tmp) != strv.end()
-            strv.push_back((string)tmp);    //* So we can remove isElementPresent function
+        if (!isElementPresent(strv, tmp))
+        {                                //* Can be changed to: std::find(strv.begin(), strv.end(), tmp) != strv.end()
+            strv.push_back((string)tmp); //* So we can remove isElementPresent function
         }
         str = str.substr(pos + 1);
     }
-    if (str != "") {
-        if (!isElementPresent(strv, str)) { //* Same as above
+    if (str != "")
+    {
+        if (!isElementPresent(strv, str))
+        { //* Same as above
             strv.push_back((string)str);
         }
     }
-    for (std::vector<string>::iterator it = strv.begin(); it < strv.end(); it++) {
+    for (std::vector<string>::iterator it = strv.begin(); it < strv.end(); it++)
+    {
         int num;
-        if (false == strToInt((*it).c_str(), num)) {
+        if (false == strToInt((*it).c_str(), num))
+        {
             return false;
         }
-        if (num < 0 || num > 255) {
+        if (num < 0 || num > 255)
+        {
             printf("Index value should be between 0 and 255.\n");
             return false;
         }
@@ -440,7 +485,6 @@ bool stringsCommaSplit(string str, std::vector<int> &deviceIds) //* Should be re
     return res;
 }
 
-
 guid_t incrGuid(guid_t baseGuid, unsigned int incrVal)
 {
     u_int64_t g = baseGuid.h;
@@ -465,7 +509,8 @@ bool parseFlashParams(string params, flash_params_t& fp)
     // Step 1 split by ","
     std::vector<std::string> paramVec;
     splitByDelimiters(paramVec, params, ",");
-    if (paramVec.size() != 3) {
+    if (paramVec.size() != 3)
+    {
         return false;
     }
     // Step 2 extract params
@@ -474,11 +519,13 @@ bool parseFlashParams(string params, flash_params_t& fp)
     memset(fp.type_name, 0, MAX_FLASH_NAME);
     strncpy(fp.type_name, paramStr, length);
     u_int64_t tmp;
-    if (!strToNum(paramVec[1], tmp)) {
+    if (!strToNum(paramVec[1], tmp))
+    {
         return false;
     }
     fp.log2size = (int)tmp;
-    if (!strToNum(paramVec[2], tmp)) {
+    if (!strToNum(paramVec[2], tmp))
+    {
         return false;
     }
     fp.num_of_flashes = (int)tmp;
@@ -486,9 +533,9 @@ bool parseFlashParams(string params, flash_params_t& fp)
 }
 
 /************************************
-* Implementation of the Command line
-* Parsing part of the Flint class
-************************************/
+ * Implementation of the Command line
+ * Parsing part of the Flint class
+ ************************************/
 
 #define FLASH_LIST_SZ 256
 
@@ -513,25 +560,13 @@ void Flint::initCmdParser()
                "Binary image file.\n"
                "Commands affected: burn, verify");
 
-    AddOptions("latest_fw",
-        ' ',
-        "",
-        "Commands affected: burn");
+    AddOptions("latest_fw", ' ', "", "Commands affected: burn");
 
-    AddOptions("ir",
-        ' ',
-        "",
-        "Commands affected: burn");
+    AddOptions("ir", ' ', "", "Commands affected: burn");
 
-    AddOptions("help",
-               'h',
-               "",
-               "Prints this message and exits");
+    AddOptions("help", 'h', "", "Prints this message and exits");
 
-    AddOptions("hh",
-               ' ',
-               "",
-               "Prints extended command help");
+    AddOptions("hh", ' ', "", "Prints extended command help");
 
     AddOptions("yes",
                'y',
@@ -631,16 +666,12 @@ void Flint::initCmdParser()
                "When specified, only flashed fw version is fetched\n"
                "Commands affected: query");
 
-    AddOptions("nofs",
-               ' ',
-               "",
-               "Burn image in a non failsafe manner.");
+    AddOptions("nofs", ' ', "", "Burn image in a non failsafe manner.");
 
-    AddOptions("allow_psid_change",
-               ' ',
-               "",
+    AddOptions("allow_psid_change", ' ', "",
                "Allow burning a FW image with a different PSID (Parameter Set ID)than the one currently on flash. Note"
-               " that changing a PSID may cause the device to malfunction. Use only if you know what you are doing", isExternal);
+               " that changing a PSID may cause the device to malfunction. Use only if you know what you are doing",
+               isExternal);
 
     AddOptions("allow_rom_change",
                ' ',
@@ -656,15 +687,9 @@ void Flint::initCmdParser()
                "NOTE: This flag is intended for advanced users only.\n"
                "Running in this mode may cause the firmware to hang.\n");
 
-    AddOptions("no_flash_verify",
-               ' ',
-               "",
-               "Do not verify each write on the flash.");
+    AddOptions("no_flash_verify", ' ', "", "Do not verify each write on the flash.");
 
-    AddOptions("use_fw",
-               ' ',
-               "",
-               "Flash access will be done using FW (ConnectX-3/ConnectX-3Pro only).");
+    AddOptions("use_fw", ' ', "", "Flash access will be done using FW (ConnectX-3/ConnectX-3Pro only).");
 
     AddOptions("silent",
                's',
@@ -672,10 +697,7 @@ void Flint::initCmdParser()
                "Do not print burn progress flyer.\n"
                "Commands affected: burn");
 
-    AddOptions("vsd",
-               ' ',
-               "<string>",
-               "Write this string, of up to 208 characters, to VSD when burn.");
+    AddOptions("vsd", ' ', "<string>", "Write this string, of up to 208 characters, to VSD when burn.");
 
     AddOptions("use_image_ps",
                ' ',
@@ -708,28 +730,19 @@ void Flint::initCmdParser()
                " Only).\n"
                "Commands affected: burn");
 
-    AddOptions("no_fw_ctrl",
-               ' ',
-               "",
-               "Do not attempt to work with the FW Ctrl update commands");
+    AddOptions("no_fw_ctrl", ' ', "", "Do not attempt to work with the FW Ctrl update commands");
 
     AddOptions("use_dev_img_info",
                ' ',
                "",
                "preserve select image info fields from the device upon FW update (FS3 Only).\n"
                "Commands affected: burn",
-                true);
+               true);
 
-    AddOptions("ignore_crc_check",
-               ' ',
-               "",
-               "Prevents flint from failing due to CRC check",
+    AddOptions("ignore_crc_check", ' ', "", "Prevents flint from failing due to CRC check",
                true); // hidden
 
-    AddOptions("hexdump_format",
-               ' ',
-               "",
-               "Prints rb command output in hexdump format",
+    AddOptions("hexdump_format", ' ', "", "Prints rb command output in hexdump format",
                true); // hidden
 
     AddOptions("dual_image",
@@ -745,193 +758,128 @@ void Flint::initCmdParser()
                "Use this flag to indicate that the given image file is in a \"striped image\" format.\n"
                "Commands affected: query verify");
 
-    AddOptions("banks",
-               ' ',
-               "<bank>",
-               "Set the number of attached flash devices (banks)");
+    AddOptions("banks", ' ', "<bank>", "Set the number of attached flash devices (banks)");
 
-    AddOptions("log",
-               ' ',
-               "<log_file>",
-               "Print the burning status to the specified log file");
-    
-    
+    AddOptions("log", ' ', "<log_file>", "Print the burning status to the specified log file");
 
     char flashList[FLASH_LIST_SZ] = {0};
     char flashParDesc[FLASH_LIST_SZ * 2];
     Flash::get_flash_list(flashList, FLASH_LIST_SZ);
-    snprintf(flashParDesc, FLASH_LIST_SZ * 2, "Use the given parameters to access the flash instead of reading them from "
-             "the flash.\n" \
-             "Supported parameters:\n" \
-             "Type: The type of the flash, such as:%s.\n" \
-             "log2size: The log2 of the flash size." \
+    snprintf(flashParDesc, FLASH_LIST_SZ * 2,
+             "Use the given parameters to access the flash instead of reading them from "
+             "the flash.\n"
+             "Supported parameters:\n"
+             "Type: The type of the flash, such as:%s.\n"
+             "log2size: The log2 of the flash size."
              "num_of_flashes: the number of the flashes connected to the device.",
              flashList);
 
+    AddOptions("flash_params", ' ', "<type, log2size, num_of_flashes>", flashParDesc);
 
-    AddOptions("flash_params",
-               ' ',
-               "<type, log2size, num_of_flashes>", flashParDesc);
+    AddOptions("version", 'v', "", "Version info.");
 
-    AddOptions("version",
-               'v',
-               "",
-               "Version info.");
+    AddOptions("no_devid_check", ' ', "", "ignore device_id checks", true);
 
-    AddOptions("no_devid_check",
-               ' ',
-               "",
-               "ignore device_id checks",
-                true);
+    AddOptions("skip_ci_req", ' ', "", "skip sending cache image request to driver(windows)", true);
 
-    AddOptions("skip_ci_req",
-               ' ',
-               "",
-               "skip sending cache image request to driver(windows)",
-                true);
+    AddOptions("ocr", ' ', "", "another flag for override cache replacement", true);
 
-    AddOptions("ocr",
-               ' ',
-               "",
-               "another flag for override cache replacement",
-                true);
+    AddOptions("hsm", ' ', "", "flag for the sign command", true);
 
-    AddOptions("hsm",
-        ' ',
-        "",
-        "flag for the sign command",
-        true);
+    AddOptions("private_key", ' ', "<key_file>", "path to PEM formatted private key to be used by the sign command");
 
-    AddOptions("private_key",
-               ' ',
-               "<key_file>",
-               "path to PEM formatted private key to be used by the sign command");
-
-    AddOptions("public_key",
-        ' ',
-        "<key_file>",
-        "path to PEM formatted public key to be used by the sign command");
-    AddOptions("key_uuid",
-               ' ',
-               "<uuid_file>",
-               "UUID matching the given private key to be used by the sign command");
-    AddOptions("private_key2",
-               ' ',
-               "<key_file>",
-               "path to PEM formatted private key to be used by the sign command");
-    AddOptions("hmac_key",
-               ' ',
-               "<hmac_key>",
-               "path to file containing key (For FS4 image only).");
+    AddOptions("public_key", ' ', "<key_file>", "path to PEM formatted public key to be used by the sign command");
+    AddOptions("key_uuid", ' ', "<uuid_file>", "UUID matching the given private key to be used by the sign command");
+    AddOptions("private_key2", ' ', "<key_file>", "path to PEM formatted private key to be used by the sign command");
+    AddOptions("hmac_key", ' ', "<hmac_key>", "path to file containing key (For FS4 image only).");
 
-    AddOptions("key_uuid2",
-               ' ',
-               "<uuid_file>",
-               "UUID matching the given private key to be used by the sign command");
+    AddOptions("key_uuid2", ' ', "<uuid_file>", "UUID matching the given private key to be used by the sign command");
 
-    AddOptions("psid",
-        ' ',
-        "<PSID>",
-        "Use this PSID while burning livefish device using MFA2 archive");
+    AddOptions("psid", ' ', "<PSID>", "Use this PSID while burning livefish device using MFA2 archive");
 
-    AddOptions("cc",
-        ' ',
-        "<Congestion_Control>",
-        "Use this flag while burning to device a Congestion Control Component");
+    AddOptions("cc", ' ', "<Congestion_Control>",
+               "Use this flag while burning to device a Congestion Control Component");
 
-    AddOptions("linkx",
-        ' ',
-        "",
-        "Use this flag while burning to device a LinkX Component");
+    AddOptions("linkx", ' ', "", "Use this flag while burning to device a LinkX Component");
 
     AddOptions("downstream_device_id_start_index",
-        ' ',
-        "<downstream_device_id_start_index>",
-        "Use this flag while burning to device a LinkX Component. Begin from 0",
-        false,
-        false,
-        1);
+               ' ',
+               "<downstream_device_id_start_index>",
+               "Use this flag while burning to device a LinkX Component. Begin from 0",
+               false,
+               false,
+               1);
 
     AddOptions("num_of_downstream_devices",
-        ' ',
-        "<num_of_downstream_devices>",
-        "Use this flag while burning to device a LinkX Component to specify the number of devices to burn",
-        false,
-        false,
-        1);
-
-    AddOptions("linkx_auto_update",
-        ' ',
-        "",
-        "Use this flag while burning all cable devices connected to host.",
-        false,
-        false,
-        1);
-
-    AddOptions("activate",
-        ' ',
-        "",
-        "Use this flag to apply the activation of all cable devices connected to host. By default, the activation is not performed.",
-        false,
-        false,
-        1);
-
-    AddOptions("activate_delay_sec",
-        ' ',
-        "<timeout in seconds>",
-        "Use this flag to activate all cable devices connected to host with delay, acceptable values are between 0 and 255 (default - 1). Important: 'activate' flag must be set.  This flag is relevant only for cable components.",
-        false,
-        false,
-        1);
-
-    AddOptions("download_transfer",
-        ' ',
-        "",
-        "Use this flag to perform the download and transfer of all cable data for cables. By default, the download and transfer are not performed . This flag is relevant only for cable components.",
-        false,
-        false,
-        1);
-
-    AddOptions("downstream_device_ids",
-        ' ',
-        "<list of ports>",
-        "Use this flag to specify the LNKX ports to perform query. List must be only comma-separated numbers, without spaces.",
-        false,
-        false,
-        1);
+               ' ',
+               "<num_of_downstream_devices>",
+               "Use this flag while burning to device a LinkX Component to specify the number of devices to burn",
+               false,
+               false,
+               1);
+
+    AddOptions("linkx_auto_update", ' ', "", "Use this flag while burning all cable devices connected to host.", false,
+               false, 1);
+
+    AddOptions(
+      "activate",
+      ' ',
+      "",
+      "Use this flag to apply the activation of all cable devices connected to host. By default, the activation is not performed.",
+      false,
+      false,
+      1);
+
+    AddOptions(
+      "activate_delay_sec",
+      ' ',
+      "<timeout in seconds>",
+      "Use this flag to activate all cable devices connected to host with delay, acceptable values are between 0 and 255 (default - 1). Important: 'activate' flag must be set.  This flag is relevant only for cable components.",
+      false,
+      false,
+      1);
+
+    AddOptions(
+      "download_transfer",
+      ' ',
+      "",
+      "Use this flag to perform the download and transfer of all cable data for cables. By default, the download and transfer are not performed . This flag is relevant only for cable components.",
+      false,
+      false,
+      1);
+
+    AddOptions(
+      "downstream_device_ids",
+      ' ',
+      "<list of ports>",
+      "Use this flag to specify the LNKX ports to perform query. List must be only comma-separated numbers, without spaces.",
+      false,
+      false,
+      1);
 
 #ifndef __WIN__
-    AddOptions("public_key_label",
-        ' ',
-        "<string>",
-        "public key label to be used by the sign --hsm command");
-
-    AddOptions("private_key_label",
-        ' ',
-        "<string>",
-        "private key label to be used by the sign --hsm command");
+    AddOptions("public_key_label", ' ', "<string>", "public key label to be used by the sign --hsm command");
+
+    AddOptions("private_key_label", ' ', "<string>", "private key label to be used by the sign --hsm command");
 #endif
-   AddOptions("openssl_engine",
-        ' ',
-        "<string>",
-        "Name of the OpenSSL engine to used by the sign/rsa_sign commands to work with the HSM hardware via OpenSSL API");
-   AddOptions("openssl_key_id",
-        ' ',
-        "<string>",
-        "Key identification string to be used by the sign/rsa_sign commands to work with the HSM hardware via OpenSSL API");
-   AddOptions("output_file",
-        ' ',
-        "<string>",
-        "output file name for exporting the public key from PEM/BIN");
-    AddOptions("user_password",
-        ' ',
-        "<string>",
-        "the HSM user password string in order to work with HSM device");
+    AddOptions(
+      "openssl_engine",
+      ' ',
+      "<string>",
+      "Name of the OpenSSL engine to used by the sign/rsa_sign commands to work with the HSM hardware via OpenSSL API");
+    AddOptions(
+      "openssl_key_id",
+      ' ',
+      "<string>",
+      "Key identification string to be used by the sign/rsa_sign commands to work with the HSM hardware via OpenSSL API");
+    AddOptions("output_file", ' ', "<string>", "output file name for exporting the public key from PEM/BIN");
+    AddOptions("user_password", ' ', "<string>", "the HSM user password string in order to work with HSM device");
 #ifdef __WIN__
-	AddOptions("cpu_util",
-        ' ',
-		"<CPU_UTIL>",
-		"Use this flag to reduce CPU utilization while burning, Windows only. Legal values are from 1 (lowest CPU) to 5 (highest CPU)");
+    AddOptions(
+      "cpu_util",
+      ' ',
+      "<CPU_UTIL>",
+      "Use this flag to reduce CPU utilization while burning, Windows only. Legal values are from 1 (lowest CPU) to 5 (highest CPU)");
 #endif
     AddOptions(
       "cert_chain_index",
@@ -942,14 +890,15 @@ void Flint::initCmdParser()
       "section according to given index.\n"
       "This flag is relevant only for set_attestation_cert_chain command.");
 
-    for (map_sub_cmd_t_to_subcommand::iterator it = _subcommands.begin(); it != _subcommands.end(); it++) {
-        if (it->first == SC_ResetCfg) {
+    for (map_sub_cmd_t_to_subcommand::iterator it = _subcommands.begin(); it != _subcommands.end(); it++)
+    {
+        if (it->first == SC_ResetCfg)
+        {
             // hidden command so "forget" mentioning it
             continue;
         }
-        string str1 = it->second->getFlagL() + ((it->second->getFlagS() == "") ? ("  ") :
-                                                                                 ("|")) + it->second->getFlagS() \
-                      + " " + it->second->getParam();
+        string str1 = it->second->getFlagL() + ((it->second->getFlagS() == "") ? ("  ") : ("|")) +
+                      it->second->getFlagS() + " " + it->second->getParam();
         string str2 = it->second->getDesc();
 
         AddOptionalSectionData("COMMANDS SUMMARY", str1, str2);
@@ -957,307 +906,467 @@ void Flint::initCmdParser()
 
     AddOptionalSectionData("RETURN VALUES", "0", "Successful completion.");
     AddOptionalSectionData("RETURN VALUES", "1", "An error has occurred.");
-    AddOptionalSectionData("RETURN VALUES", "7", "For burn command - burning new firmware option was not chosen by the user when prompted, thus the firmware burning process was aborted.");
-
+    AddOptionalSectionData(
+      "RETURN VALUES", "7",
+      "For burn command - burning new firmware option was not chosen by the user when prompted, thus the firmware burning process was aborted.");
 
-    for (map_sub_cmd_t_to_subcommand::iterator it = _subcommands.begin(); it != _subcommands.end(); it++) {
-        if (it->first == SC_ResetCfg) {
+    for (map_sub_cmd_t_to_subcommand::iterator it = _subcommands.begin(); it != _subcommands.end(); it++)
+    {
+        if (it->first == SC_ResetCfg)
+        {
             // hidden command so "forget" mentioning it
             continue;
         }
-        string str =   "Name:\n"
-                     "\t" + it->second->getName() + "\n"
-                     + "Description:\n"
-                     "\t" + it->second->getExtDesc() + "\n"
-                     + "Command:\n"
-                     "\t" + it->second->getFlagL() +
-                     ((it->second->getFlagS() == "") ? ("  ") : ("|")) + it->second->getFlagS()
-                     + " " + it->second->getParam() + "\n"
-                     + "Parameters:\n"
-                     "\t" + it->second->getParamExp() + "\n"
-                     + "Examples:\n"
-                     "\t" + it->second->getExample() + "\n\n\n";
+        string str = "Name:\n"
+                     "\t" +
+                     it->second->getName() + "\n" +
+                     "Description:\n"
+                     "\t" +
+                     it->second->getExtDesc() + "\n" +
+                     "Command:\n"
+                     "\t" +
+                     it->second->getFlagL() + ((it->second->getFlagS() == "") ? ("  ") : ("|")) +
+                     it->second->getFlagS() + " " + it->second->getParam() + "\n" +
+                     "Parameters:\n"
+                     "\t" +
+                     it->second->getParamExp() + "\n" +
+                     "Examples:\n"
+                     "\t" +
+                     it->second->getExample() + "\n\n\n";
         AddOptionalSectionData("COMMANDS DESCRIPTION", str);
     }
 
-
     _cmdParser.AddRequester(this);
 }
 
 ParseStatus Flint::HandleOption(string name, string value)
 {
-    //TODO: consider verifying num of args inside each if statements that needs its arg num verified
+    // TODO: consider verifying num of args inside each if statements that needs its arg num verified
     //      thus we will be able to get rid of the hacks inside the function in the expense of a longer code.
-    if (!(verifyNumOfArgs(name, value))) {
+    if (!(verifyNumOfArgs(name, value)))
+    {
         return PARSE_ERROR;
     }
     int delta = 1;
-    if (name == "device" || name == "d") {
+    if (name == "device" || name == "d")
+    {
         _flintParams.device_specified = true;
         _flintParams.device = value;
-    } else if (name == "help" || name == "h") {
+    }
+    else if (name == "help" || name == "h")
+    {
         vector<string> excluded_sections;
         excluded_sections.push_back("COMMANDS DESCRIPTION");
         cout << _cmdParser.GetUsage(false, excluded_sections);
         return PARSE_OK_WITH_EXIT;
-    } else if (name == "version" || name == "v") {
+    }
+    else if (name == "version" || name == "v")
+    {
 #ifdef EXTERNAL
         print_version_string(FLINT_NAME, "");
 #else
         print_version_string(FLINT_NAME "(oem)", "");
 #endif
         return PARSE_OK_WITH_EXIT;
-    } else if (name == "hh") {
+    }
+    else if (name == "hh")
+    {
         cout << _cmdParser.GetUsage();
         return PARSE_OK_WITH_EXIT;
-    } else if (name == "no_devid_check") {
+    }
+    else if (name == "no_devid_check")
+    {
         _flintParams.no_devid_check = true;
-    } else if (name == "skip_ci_req") {
+    }
+    else if (name == "skip_ci_req")
+    {
         _flintParams.skip_ci_req = true;
-    } else if (name == "guid") {
+    }
+    else if (name == "guid")
+    {
         _flintParams.guid_specified = true;
         guid_t g;
-        if (!getGUIDFromStr(value, g)) {
+        if (!getGUIDFromStr(value, g))
+        {
             return PARSE_ERROR;
         }
-        for (int i = 0; i < GUIDS; i++) {
+        for (int i = 0; i < GUIDS; i++)
+        {
             _flintParams.user_guids.push_back(incrGuid(g, i));
         }
-        // for (std::vector<guid_t>::iterator it=_flintParams.user_guids.begin();it != _flintParams.user_guids.end(); it++){
+        // for (std::vector<guid_t>::iterator it=_flintParams.user_guids.begin();it != _flintParams.user_guids.end();
+        // it++){
         //     printf("%8.8x%8.8x\n",it->h,it->l);
         // }
-    } else if (name == "guids") {
+    }
+    else if (name == "guids")
+    {
         _flintParams.guids_specified = true;
         std::vector<std::string> strs;
         splitByDelimiters(strs, value, ",");
-        if (strs.size() != GUIDS) {
+        if (strs.size() != GUIDS)
+        {
             return PARSE_ERROR;
         }
-        for (int i = 0; i < GUIDS; i++) {
+        for (int i = 0; i < GUIDS; i++)
+        {
             guid_t g;
-            if (!getGUIDFromStr(strs[i], g)) {
+            if (!getGUIDFromStr(strs[i], g))
+            {
                 return PARSE_ERROR;
-            } else {
+            }
+            else
+            {
                 _flintParams.user_guids.push_back(g);
             }
         }
-    } else if (name == "mac") {
+    }
+    else if (name == "mac")
+    {
         _flintParams.mac_specified = true;
         guid_t m;
-        if (!getGUIDFromStr(value, m)) {
+        if (!getGUIDFromStr(value, m))
+        {
             return PARSE_ERROR;
         }
-        for (int i = 0; i < MACS; i++) {
+        for (int i = 0; i < MACS; i++)
+        {
             _flintParams.user_macs.push_back(incrGuid(m, i));
         }
-    } else if (name == "macs") {
+    }
+    else if (name == "macs")
+    {
         _flintParams.macs_specified = true;
         std::vector<std::string> strs;
         splitByDelimiters(strs, value, ",");
-        if (strs.size() != MACS) {
+        if (strs.size() != MACS)
+        {
             return PARSE_ERROR;
         }
-        for (int i = 0; i < MACS; i++) {
+        for (int i = 0; i < MACS; i++)
+        {
             guid_t m;
-            if (!getGUIDFromStr(strs[i], m)) {
+            if (!getGUIDFromStr(strs[i], m))
+            {
                 return PARSE_ERROR;
-            } else {
+            }
+            else
+            {
                 _flintParams.user_macs.push_back(m);
             }
         }
-    } else if (name == "uid") {
+    }
+    else if (name == "uid")
+    {
         _flintParams.uid_specified = true;
-        if (!getGUIDFromStr(value, _flintParams.baseUid)) {
+        if (!getGUIDFromStr(value, _flintParams.baseUid))
+        {
             return PARSE_ERROR;
         }
-    } else if (name == "blank_guids") {
+    }
+    else if (name == "blank_guids")
+    {
         _flintParams.blank_guids = true;
-    } else if (name == "clear_semaphore") {
+    }
+    else if (name == "clear_semaphore")
+    {
         _flintParams.clear_semaphore = true;
-    } else if (name == "image" || name == "i") {
+    }
+    else if (name == "image" || name == "i")
+    {
         _flintParams.image_specified = true;
         _flintParams.image = value;
-    } else if (name == "qq") {
+    }
+    else if (name == "qq")
+    {
         _flintParams.quick_query = true;
         _flintParams.skip_rom_query = true;
         delta = 2;
-    } else if (name == "low_cpu") {
+    }
+    else if (name == "low_cpu")
+    {
         _flintParams.low_cpu = true;
-    } else if (name == "next_boot_fw_ver" || name == "flashed_version") {
+    }
+    else if (name == "next_boot_fw_ver" || name == "flashed_version")
+    {
         _flintParams.next_boot_fw_ver = true;
-    } else if (name == "nofs") {
+    }
+    else if (name == "nofs")
+    {
         _flintParams.nofs = true;
-    } else if (name == "allow_psid_change") {
+    }
+    else if (name == "allow_psid_change")
+    {
         _flintParams.allow_psid_change = true;
-    } else if (name == "allow_rom_change") {
+    }
+    else if (name == "allow_rom_change")
+    {
         _flintParams.allow_rom_change = true;
-    } else if (name == "override_cache_replacement" || name == "ocr") {
+    }
+    else if (name == "override_cache_replacement" || name == "ocr")
+    {
         _flintParams.override_cache_replacement = true;
-    } else if (name == "use_fw") {
+    }
+    else if (name == "use_fw")
+    {
         _flintParams.use_fw = true;
-    } else if (name == "no_flash_verify") {
+    }
+    else if (name == "no_flash_verify")
+    {
         _flintParams.no_flash_verify = true;
-    } else if (name == "silent" || name == "s") {
+    }
+    else if (name == "silent" || name == "s")
+    {
         _flintParams.silent = true;
-    } else if (name == "yes" || name == "y") {
+    }
+    else if (name == "yes" || name == "y")
+    {
         _flintParams.yes = true;
-    } else if (name == "no") {
+    }
+    else if (name == "no")
+    {
         _flintParams.no = true;
-    } else if (name == "vsd") {
+    }
+    else if (name == "vsd")
+    {
         _flintParams.vsd_specified = true;
         _flintParams.vsd = value;
-    } else if (name == "use_image_ps") {
+    }
+    else if (name == "use_image_ps")
+    {
         _flintParams.use_image_ps = true;
-    } else if (name == "use_image_guids") {
+    }
+    else if (name == "use_image_guids")
+    {
         _flintParams.use_image_guids = true;
-    } else if (name == "use_image_rom") {
+    }
+    else if (name == "use_image_rom")
+    {
         _flintParams.use_image_rom = true;
-    } else if (name == "use_dev_rom") {
+    }
+    else if (name == "use_dev_rom")
+    {
         _flintParams.use_dev_rom = true;
-    } else if (name == "ignore_dev_data") {
+    }
+    else if (name == "ignore_dev_data")
+    {
         _flintParams.ignore_dev_data = true;
-    } else if (name == "no_fw_ctrl") {
+    }
+    else if (name == "no_fw_ctrl")
+    {
         _flintParams.no_fw_ctrl = true;
-    } else if (name == "dual_image") {
+    }
+    else if (name == "dual_image")
+    {
         _flintParams.dual_image = true;
-    } else if (name == "striped_image") {
+    }
+    else if (name == "striped_image")
+    {
         _flintParams.striped_image = true;
-    } else if (name == "use_dev_img_info") {
+    }
+    else if (name == "use_dev_img_info")
+    {
         _flintParams.use_dev_img_info = true;
-    } else if (name == "ignore_crc_check") {
+    }
+    else if (name == "ignore_crc_check")
+    {
         _flintParams.ignore_crc_check = true;
-    } else if (name == "hexdump_format") {
+    }
+    else if (name == "hexdump_format")
+    {
         _flintParams.hexdump_format = true;
-    } else if (name == "ir") {
+    }
+    else if (name == "ir")
+    {
         _flintParams.image_reactivation = true;
-    } else if (name == "banks") {
+    }
+    else if (name == "banks")
+    {
         _flintParams.banks_specified = true;
         u_int64_t banksNum;
-        if (!strToNum(value, banksNum)) {
+        if (!strToNum(value, banksNum))
+        {
             return PARSE_ERROR;
         }
         _flintParams.banks = (int)banksNum;
-    } else if (name == "log") {
+    }
+    else if (name == "log")
+    {
         _flintParams.log_specified = true;
         _flintParams.log = value;
-    } else if (name == "flash_params") {
+    }
+    else if (name == "flash_params")
+    {
         _flintParams.flash_params_specified = true;
-        if (!parseFlashParams(value, _flintParams.flash_params)) {
+        if (!parseFlashParams(value, _flintParams.flash_params))
+        {
             return PARSE_ERROR;
         }
-        //printf("-D- flashType=%s , log2size = %d , numOfBanks = %d\n", _flintParams.flash_params.type_name, _flintParams.flash_params.log2size, _flintParams.flash_params.num_of_flashes);
-    } else if (name == "private_key") {
+        // printf("-D- flashType=%s , log2size = %d , numOfBanks = %d\n", _flintParams.flash_params.type_name,
+        // _flintParams.flash_params.log2size, _flintParams.flash_params.num_of_flashes);
+    }
+    else if (name == "private_key")
+    {
         _flintParams.privkey_specified = true;
         _flintParams.privkey_file = value;
-    } else if (name == "public_key") {
+    }
+    else if (name == "public_key")
+    {
         _flintParams.pubkey_specified = true;
         _flintParams.pubkey_file = value;
-    } else if (name == "key_uuid") {
+    }
+    else if (name == "key_uuid")
+    {
         _flintParams.uuid_specified = true;
         _flintParams.privkey_uuid = value;
-    } else if (name == "hmac_key") {
+    }
+    else if (name == "hmac_key")
+    {
         _flintParams.key_specified = true;
         _flintParams.key = value;
-    } else if (name == "private_key2") {
+    }
+    else if (name == "private_key2")
+    {
         _flintParams.privkey2_specified = true;
         _flintParams.privkey2_file = value;
-    } else if (name == "key_uuid2") {
+    }
+    else if (name == "key_uuid2")
+    {
         _flintParams.uuid2_specified = true;
         _flintParams.privkey2_uuid = value;
-    } else if (name == "latest_fw") {
+    }
+    else if (name == "latest_fw")
+    {
         _flintParams.use_latest_fw_version = true;
-    } else if (name == "psid") {
+    }
+    else if (name == "psid")
+    {
         _flintParams.use_psid = true;
         _flintParams.psid = value;
     }
-    else if (name == "cc") {
+    else if (name == "cc")
+    {
         _flintParams.congestion_control = true;
         _flintParams.congestion_control_param = value;
     }
-    else if (name == "linkx") {
+    else if (name == "linkx")
+    {
         _flintParams.linkx_control = true;
     }
-    else if (name == "cpu_util") {
-		_flintParams.use_cpu_utilization = true;
-		u_int64_t cpu_percent = 0;
-		if (!strToNum(value, cpu_percent)) {
-			return PARSE_ERROR;
-		}
-		_flintParams.cpu_percent = (int)cpu_percent;
-    } else if (name == "hsm") {
+    else if (name == "cpu_util")
+    {
+        _flintParams.use_cpu_utilization = true;
+        u_int64_t cpu_percent = 0;
+        if (!strToNum(value, cpu_percent))
+        {
+            return PARSE_ERROR;
+        }
+        _flintParams.cpu_percent = (int)cpu_percent;
+    }
+    else if (name == "hsm")
+    {
         _flintParams.hsm_specified = true;
-    } else if (name == "openssl_engine") {
-       _flintParams.openssl_engine_usage_specified = true;
-       _flintParams.openssl_engine = value;
-    } else if (name == "openssl_key_id") {
-       _flintParams.openssl_engine_usage_specified = true;
-       _flintParams.openssl_key_id = value;
-    } else if (name == "private_key_label") {
+    }
+    else if (name == "openssl_engine")
+    {
+        _flintParams.openssl_engine_usage_specified = true;
+        _flintParams.openssl_engine = value;
+    }
+    else if (name == "openssl_key_id")
+    {
+        _flintParams.openssl_engine_usage_specified = true;
+        _flintParams.openssl_key_id = value;
+    }
+    else if (name == "private_key_label")
+    {
         _flintParams.private_key_label_specified = true;
         _flintParams.private_key_label = value;
-    } else if (name == "public_key_label") {
+    }
+    else if (name == "public_key_label")
+    {
         _flintParams.public_key_label_specified = true;
         _flintParams.public_key_label = value;
-    } else if (name == "output_file") {
+    }
+    else if (name == "output_file")
+    {
         _flintParams.output_file_specified = true;
         _flintParams.output_file = value;
-    } else if (name == "user_password") {
+    }
+    else if (name == "user_password")
+    {
         _flintParams.hsm_password_specified = true;
         _flintParams.hsm_password = value;
-    } else if (name == "downstream_device_id_start_index") {
+    }
+    else if (name == "downstream_device_id_start_index")
+    {
         _flintParams.cable_device_index_specified = true;
         int device_index = 0;
-        if (!strToInt(value, device_index)) {
+        if (!strToInt(value, device_index))
+        {
             return PARSE_ERROR;
         }
-        if (device_index < 0) {
+        if (device_index < 0)
+        {
             return PARSE_ERROR;
         }
         _flintParams.cableDeviceIndex = device_index;
-    } 
-    
-    else if (name == "activate") {
-    _flintParams.activate = true;
     }
 
-    else if (name == "activate_delay_sec") {
+    else if (name == "activate")
+    {
+        _flintParams.activate = true;
+    }
+
+    else if (name == "activate_delay_sec")
+    {
         u_int64_t activate_delay_sec = 0;
-        if (!strToNum(value, activate_delay_sec)) {
+        if (!strToNum(value, activate_delay_sec))
+        {
             return PARSE_ERROR;
         }
-        if (activate_delay_sec > 255) {
+        if (activate_delay_sec > 255)
+        {
             printf("Activation_delay_sec should be between 0 and 255.\n");
             return PARSE_ERROR;
         }
         _flintParams.activate_delay_sec = activate_delay_sec;
     }
-    else if (name == "linkx_auto_update") {
+    else if (name == "linkx_auto_update")
+    {
         _flintParams.linkx_auto_update = true;
-    } 
+    }
 
-    else if (name == "download_transfer") {
-    _flintParams.download_transfer = true;
+    else if (name == "download_transfer")
+    {
+        _flintParams.download_transfer = true;
     }
-    
-    else if (name == "downstream_device_ids") {
-        if (value == "all") {
+
+    else if (name == "downstream_device_ids")
+    {
+        if (value == "all")
+        {
             _flintParams.linkx_auto_update = true;
         }
-        else {
+        else
+        {
             _flintParams.downstream_device_ids_specified = true;
             std::vector<int> deviceIds;
-            if (!stringsCommaSplit(value, deviceIds)) {
+            if (!stringsCommaSplit(value, deviceIds))
+            {
                 return PARSE_ERROR;
             }
             _flintParams.downstream_device_ids = deviceIds;
         }
     }
-    else if (name == "num_of_downstream_devices") {
+    else if (name == "num_of_downstream_devices")
+    {
         int cableDeviceSize = 0;
-        if (!strToInt(value, cableDeviceSize)) {
+        if (!strToInt(value, cableDeviceSize))
+        {
             return PARSE_ERROR;
         }
-        if (cableDeviceSize <= 0 || cableDeviceSize > 255) {
+        if (cableDeviceSize <= 0 || cableDeviceSize > 255)
+        {
             printf("Cable size should be between 1 and 255.\n");
             return PARSE_ERROR;
         }
@@ -1278,7 +1387,8 @@ ParseStatus Flint::HandleOption(string name, string value)
         }
         _flintParams.cert_chain_index = cert_chain_index;
     }
-    else {
+    else
+    {
         cout << "Unknown Flag: " << name;
         cout << _cmdParser.GetSynopsis();
         return PARSE_ERROR;
@@ -1289,23 +1399,26 @@ ParseStatus Flint::HandleOption(string name, string value)
 
 #define IS_NUM(cha) (((cha) >= '0') && ((cha) <= '9'))
 
-ParseStatus Flint::parseCmdLine(int argc, char *argv[])
+ParseStatus Flint::parseCmdLine(int argc, char* argv[])
 {
-    //Step1 separate between option section and cmd section
+    // Step1 separate between option section and cmd section
     SubCmdMetaData subCmds;
     FlagMetaData flags;
-    char **argvCmd = NULL;
-    char **argvOpt = NULL;
+    char** argvCmd = NULL;
+    char** argvOpt = NULL;
     int argcCmd = 0, argcOpt = 0;
     bool foundOptionWhenLookingForCmd = false;
     ParseStatus rc;
-    char **newArgv = NULL;
+    char** newArgv = NULL;
     int newArgc = 0;
     int i = 1, j = 1, argStart = 1, argEnd = 1;
 
-    for (int k = (argc - 1); k > 0; k--) { // Parsing command line from end to start
-        if ((subCmds.getCmdNum(argv[k])) != SC_No_Cmd) { // i.e we found a subcommand
-            if (foundOptionWhenLookingForCmd) {
+    for (int k = (argc - 1); k > 0; k--)
+    { // Parsing command line from end to start
+        if ((subCmds.getCmdNum(argv[k])) != SC_No_Cmd)
+        { // i.e we found a subcommand
+            if (foundOptionWhenLookingForCmd)
+            {
                 cout << "Specifying options flags after command is not allowed.\n\n";
                 rc = PARSE_ERROR_SHOW_USAGE;
                 goto clean_up;
@@ -1314,45 +1427,56 @@ ParseStatus Flint::parseCmdLine(int argc, char *argv[])
             argvOpt = argv;
             argcCmd = argc - k;
             argvCmd = &argv[k];
-        } else if (argv[k][0] == '-' && !IS_NUM(argv[k][1])) {
+        }
+        else if (argv[k][0] == '-' && !IS_NUM(argv[k][1]))
+        {
             foundOptionWhenLookingForCmd = true;
         }
     }
-    if (argcCmd == 0) {
-        //no subcommand found
+    if (argcCmd == 0)
+    {
+        // no subcommand found
         argcOpt = argc;
         argvOpt = argv;
     }
-    //printf("-D- argcOpt:%d argvOpt:%s argcCmd:%d argvCmd:%s\n", argcOpt, argvOpt[0], argcCmd, argvCmd[0]);
+    // printf("-D- argcOpt:%d argvOpt:%s argcCmd:%d argvCmd:%s\n", argcOpt, argvOpt[0], argcCmd, argvCmd[0]);
     //_cmdparser should deal with the case of no arguments in argv except the program.
-    //Step2 unite with comma multiple args in the options section
+    // Step2 unite with comma multiple args in the options section
     newArgv = new char*[argcOpt];
-    //first arg is the flint command we can copy as is
+    // first arg is the flint command we can copy as is
     newArgv[0] = strcpy(new char[strlen(argvOpt[0]) + 1], argvOpt[0]);
-    while (i < argcOpt) {
-        if (argvOpt[i][0] == '-' && !IS_NUM(argvOpt[i][1])) { //its a flag (and not a number) so we copy to new_argv as is
-            newArgv[j] = strcpy(new char[strlen(argvOpt[i]) + 1],
-                                argvOpt[i]);
+    while (i < argcOpt)
+    {
+        if (argvOpt[i][0] == '-' && !IS_NUM(argvOpt[i][1]))
+        { // its a flag (and not a number) so we copy to new_argv as is
+            newArgv[j] = strcpy(new char[strlen(argvOpt[i]) + 1], argvOpt[i]);
             i++;
             j++;
-        } else { //its an argument
-            //find next flag if exsists
+        }
+        else
+        { // its an argument
+            // find next flag if exsists
             argStart = i;
             argEnd = i;
             int argsSize = 0;
-            while (argEnd < argcOpt && (argvOpt[argEnd][0] != '-' || IS_NUM(argvOpt[argEnd][1]))) {
-                argsSize += strlen(argvOpt[argEnd]) + 1; //for the comma
+            while (argEnd < argcOpt && (argvOpt[argEnd][0] != '-' || IS_NUM(argvOpt[argEnd][1])))
+            {
+                argsSize += strlen(argvOpt[argEnd]) + 1; // for the comma
                 argEnd++;
             }
             i = argEnd;
-            //concatenate all the args with comma between them to a single string
+            // concatenate all the args with comma between them to a single string
             newArgv[j] = new char[argsSize + 1];
             newArgv[j][0] = '\0';
-            while (argStart < argEnd) {
-                if (argStart == argEnd - 1) {
-                    //no need to add comma to the last arg
+            while (argStart < argEnd)
+            {
+                if (argStart == argEnd - 1)
+                {
+                    // no need to add comma to the last arg
                     strcat(newArgv[j], argvOpt[argStart]);
-                } else {
+                }
+                else
+                {
                     strcat(newArgv[j], argvOpt[argStart]);
                     strcat(newArgv[j], ",");
                 }
@@ -1363,44 +1487,55 @@ ParseStatus Flint::parseCmdLine(int argc, char *argv[])
     }
     newArgc = j;
 
-    //Step3 set the command and its args in the FlintParams struct if present
-    if (argcCmd > 0) {
+    // Step3 set the command and its args in the FlintParams struct if present
+    if (argcCmd > 0)
+    {
         this->_flintParams.cmd = subCmds.getCmdNum(argvCmd[0]);
-        for (int i = 1; i < argcCmd; ++i) {
+        for (int i = 1; i < argcCmd; ++i)
+        {
             this->_flintParams.cmd_params.push_back(string(argvCmd[i]));
         }
-    } else { //no command found deal with either missing/invalid command
-        //find last flag
+    }
+    else
+    { // no command found deal with either missing/invalid command
+        // find last flag
         int lastFlagPos;
-        char *strippedFlag;
-        for (lastFlagPos = argc - 1; lastFlagPos > 0; lastFlagPos--) {
-            if (argv[lastFlagPos][0] == '-' && !IS_NUM(argv[lastFlagPos][1])) {
+        char* strippedFlag;
+        for (lastFlagPos = argc - 1; lastFlagPos > 0; lastFlagPos--)
+        {
+            if (argv[lastFlagPos][0] == '-' && !IS_NUM(argv[lastFlagPos][1]))
+            {
                 break;
             }
         }
-        if (lastFlagPos == 0) {
+        if (lastFlagPos == 0)
+        {
             cout << FLINT_NO_OPTIONS_FOUND_ERROR << endl;
             rc = PARSE_ERROR;
             goto clean_up;
         }
         strippedFlag = stripFlag(argv[lastFlagPos]);
-        //check how many args it needs
+        // check how many args it needs
         int numOfArgs = flags.getNumOfArgs(strippedFlag);
-        //if too many args return arg in pos num_of_args+1 as the invalid command.
-        if ((argc - 1 - lastFlagPos) > numOfArgs) {
+        // if too many args return arg in pos num_of_args+1 as the invalid command.
+        if ((argc - 1 - lastFlagPos) > numOfArgs)
+        {
             printf(FLINT_INVALID_COMMAD_ERROR, argv[argc - 1]);
             rc = PARSE_ERROR_SHOW_USAGE;
             goto clean_up;
         }
     }
-    //Step5 parse option section using _cmdParser
+    // Step5 parse option section using _cmdParser
     rc = this->_cmdParser.ParseOptions(newArgc, newArgv);
     // Step 6 Delete allocated memory
-clean_up: for (int i = 0; i < newArgc; i++) {
+clean_up:
+    for (int i = 0; i < newArgc; i++)
+    {
         delete[] newArgv[i];
     }
     delete[] newArgv;
-    if (rc == PARSE_ERROR_SHOW_USAGE) {
+    if (rc == PARSE_ERROR_SHOW_USAGE)
+    {
         cout << _cmdParser.GetSynopsis();
     }
     return rc;
diff --git a/flint/err_msgs.h b/flint/err_msgs.h
index f5e92e33..f2555922 100644
--- a/flint/err_msgs.h
+++ b/flint/err_msgs.h
@@ -37,7 +37,6 @@
  *
  */
 
-
 #ifndef __ERR_MSGS_H__
 #define __ERR_MSGS_H__
 
@@ -45,7 +44,8 @@
  * Flint Status Code
  *********************/
 
-typedef enum {
+typedef enum
+{
     FLINT_SUCCESS = 0,
     FLINT_FAILED = 1,
     FLINT_QUERY_ERROR = 2,
@@ -56,142 +56,150 @@ typedef enum {
  * Flint Error Messages
  **********************/
 
-#define FLINT_CLEAR_SEM_CMD_ERROR             "No command is allowed when -clear_semaphore flag is given.\n"
-#define FLINT_COMMAND_FLAGS_ERROR             "For %s command, Please specify %s.\n"
-#define FLINT_COMMAND_INCORRECT_FLAGS_ERROR   "For %s command, %s.\n"
-#define FLINT_PARSE_MEM_ERROR                 "Failed to allocate memory for parsing.\n "
-#define FLINT_NO_OPTIONS_FOUND_ERROR          "No options found. "
-#define FLINT_INVALID_COMMAD_ERROR            "Invalid command: %s\n"
-#define FLINT_TOO_MANY_ARGS_ERROR             "Too many arguments. Expected: %d , Received: %d\n"
-#define FLINT_TOO_FEW_ARGS_ERROR              "Too few arguments. Expected: %d , Received: %d\n"
-#define FLINT_TOO_FEW_MINIMUM_ARGS_ERROR      "Too few arguments. Expected at least: %d , Received: %d\n"
-#define FLINT_NO_COMMAND_ERROR                "No command found."
-#define FLINT_OPEN_FWOPS_DEVICE_ERROR         "Cannot open Device: %s. %s\n"
-#define FLINT_OPEN_FWOPS_DEVICE_ERROR_1       "Cannot open Device: %s.\n"
-#define FLINT_OPEN_FWOPS_IMAGE_ERROR          "Cannot open Image: %s. %s\n"
-#define FLINT_DEVICE_AND_IMAGE_ERROR          "Please specify either Device or Image.\n"
-#define FLINT_NO_DEVICE_ERROR                 "Please specify Device.\n"
-#define FLINT_NO_IMAGE_ERROR                  "Please specify Image file.\n"
-#define FLINT_MISSED_ARG_ERROR                "Missed %s parameter after \"%s\" command.\n"
-#define FLINT_CMD_ARGS_ERROR                  "Command \"%s\" requires %d arguments, but %d arguments were given\n"
-#define FLINT_CMD_ARGS_ERROR2                 "Command \"%s\" requires at most %d arguments, but %d arguments were given\n"
-#define FLINT_CMD_ARGS_ERROR3                 "Command \"%s\" requires at least %d arguments, but %d arguments were given\n"
-#define FLINT_CMD_ARGS_ERROR4                 "Command \"%s\" requires %d or %d arguments, but %d arguments were given\n"
-#define FLINT_CMD_ARGS_ERROR5                 "Command \"%s\" does not require arguments\n"
-#define FLINT_INVALID_OPTION_ERROR            "Unknown option \"%s\" for the \"%s\" command. you can use %s.\n"
-#define FLINT_INVALID_FLAG_ERROR              "Invalid switch \"%s\" is specified.\n"
-#define FLINT_INVALID_FLAG_ERROR_5TH_GEN      "Invalid switch \"%s\" is specified for 5th gen device.\n"
-#define FLINT_INVALID_FLAG_WITH_FLAG_ERROR    "Cannot specify \"%s\" flag with \"%s\" flag.\n"
+#define FLINT_CLEAR_SEM_CMD_ERROR "No command is allowed when -clear_semaphore flag is given.\n"
+#define FLINT_COMMAND_FLAGS_ERROR "For %s command, Please specify %s.\n"
+#define FLINT_COMMAND_INCORRECT_FLAGS_ERROR "For %s command, %s.\n"
+#define FLINT_PARSE_MEM_ERROR "Failed to allocate memory for parsing.\n "
+#define FLINT_NO_OPTIONS_FOUND_ERROR "No options found. "
+#define FLINT_INVALID_COMMAD_ERROR "Invalid command: %s\n"
+#define FLINT_TOO_MANY_ARGS_ERROR "Too many arguments. Expected: %d , Received: %d\n"
+#define FLINT_TOO_FEW_ARGS_ERROR "Too few arguments. Expected: %d , Received: %d\n"
+#define FLINT_TOO_FEW_MINIMUM_ARGS_ERROR "Too few arguments. Expected at least: %d , Received: %d\n"
+#define FLINT_NO_COMMAND_ERROR "No command found."
+#define FLINT_OPEN_FWOPS_DEVICE_ERROR "Cannot open Device: %s. %s\n"
+#define FLINT_OPEN_FWOPS_DEVICE_ERROR_1 "Cannot open Device: %s.\n"
+#define FLINT_OPEN_FWOPS_IMAGE_ERROR "Cannot open Image: %s. %s\n"
+#define FLINT_DEVICE_AND_IMAGE_ERROR "Please specify either Device or Image.\n"
+#define FLINT_NO_DEVICE_ERROR "Please specify Device.\n"
+#define FLINT_NO_IMAGE_ERROR "Please specify Image file.\n"
+#define FLINT_MISSED_ARG_ERROR "Missed %s parameter after \"%s\" command.\n"
+#define FLINT_CMD_ARGS_ERROR "Command \"%s\" requires %d arguments, but %d arguments were given\n"
+#define FLINT_CMD_ARGS_ERROR2 "Command \"%s\" requires at most %d arguments, but %d arguments were given\n"
+#define FLINT_CMD_ARGS_ERROR3 "Command \"%s\" requires at least %d arguments, but %d arguments were given\n"
+#define FLINT_CMD_ARGS_ERROR4 "Command \"%s\" requires %d or %d arguments, but %d arguments were given\n"
+#define FLINT_CMD_ARGS_ERROR5 "Command \"%s\" does not require arguments\n"
+#define FLINT_INVALID_OPTION_ERROR "Unknown option \"%s\" for the \"%s\" command. you can use %s.\n"
+#define FLINT_INVALID_FLAG_ERROR "Invalid switch \"%s\" is specified.\n"
+#define FLINT_INVALID_FLAG_ERROR_5TH_GEN "Invalid switch \"%s\" is specified for 5th gen device.\n"
+#define FLINT_INVALID_FLAG_WITH_FLAG_ERROR "Cannot specify \"%s\" flag with \"%s\" flag.\n"
 #define FLINT_INVALID_FLAG_WITHOUT_FLAG_ERROR "\"%s\" flag must be specified with \"%s\" flag.\n"
-#define FLINT_INVALID_FLAG_WITH_CMD_ERROR     "Cannot specify flag: %s with Command: %s\n"
-#define FLINT_CMD_VERIFY_ERROR                "FW image verification failed: %s. AN HCA DEVICE CAN NOT BOOT FROM THIS IMAGE.\n"
-#define FLINT_CMD_VERIFY_ERROR_1              "FW image verification failed: No valid FS4 image found.Check the flash parameters, if specified..AN HCA DEVICE CAN NOT BOOT FROM THIS IMAGE"
-#define FLINT_FAILED_QUERY_ERROR              "Failed to query %s: %s. %s\n"
-#define FLINT_COMMAND_DEVICE_IMAGE_ERROR      "Command \"%s\" requires both image and device to be specified.\n"
-#define FLINT_COMMAND_DEVICE_ERROR            "Command \"%s\" requires device, but an image file was given.\n"
-#define FLINT_COMMAND_IMAGE_ERROR             "Command \"%s\" requires an image file, but device was given.\n"
-#define FLINT_COMMAND_DEVICE_ERROR2           "Command \"%s\" requires device, but both an image file and a device are given.\n"
-#define FLINT_COMMAND_IMAGE_ERROR2            "Command \"%s\" requires an image, but both an image file and a device are given.\n"
-#define FLINT_HW_SET_ARGS_ERROR               "bad argument of hw set command : %s, it should be in the format PARAM_NAME=VALUE\n"
-#define FLINT_HW_COMMAND_ERROR                "HW %s failed. %s\n"
-#define FLINT_SWRESET_ERROR                   "Software reset failed. %s\n"
-#define FLINT_ERASE_SEC_ERROR                 "Erase sector failed. %s\n"
-#define FLINT_INVALID_ADDR_ERROR              "Invalid address \"%s\"\n"
-#define FLINT_FLASH_READ_ERROR                "Flash read failed. %s\n"
-#define FLINT_FLASH_WRITE_ERROR               "Flash write failed. %s\n"
-#define FLINT_INVALID_DATA_ERROR              "Invalid data \"%s\"\n"
-#define FLINT_INVALID_SIZE_ERROR              "Invalid size \"%s\", Length should be 4-bytes aligned.\n"
-#define FLINT_INVALID_ARG_ERROR               "Invalid argument \"%s\"\n"
-#define FLINT_OPEN_FILE_ERROR                 "Cannot open %s: %s\n"
-#define FLINT_WRITE_FILE_ERROR                "Failed to write to %s: %s\n"
-#define FLINT_IO_OPEN_ERROR                   "Failed to open %s: %s\n"
-#define FLINT_IMAGE_READ_ERROR                "Failed to read image. %s\n"
-#define FLINT_READ_ERROR                      "Failed to read from %s. %s\n"
-#define FLINT_READ_FILE_ERROR                 "Failed to read from %s.\n"
-#define FLINT_WIN_NOT_SUPP_ERROR              "Command \"%s\" is not supported in windows.\n"
-#define FLINT_WIN_ONLY_SUPP_ERROR             "Command  \"%s\" is supported only in windows.\n"
-#define FLINT_GEN_COMMAND_ERROR               "Failed to execute command %s. %s\n"
-#define FLINT_FS3_BB_ERROR                    "bb command is not supported anymore in FS3/FS4 images, please use b for burning FS3/FS4 images.\n"
-#define FLINT_FSX_BURN_ERROR                  "Burning %s image failed: %s\n"
-#define FLINT_FS2_BURN_ERROR                  "Burning FS2 image failed: %s\n"
-#define FLINT_PSID_ERROR                      "PSID mismatch. The PSID on flash (%s) differs from the PSID in the given image (%s).\n"
-#define FLINT_FS2_STRIPED_ERROR               "The -striped_image cannot be used with the burn command\n"
-#define FLINT_IMG_DEV_COMPAT_ERROR            "The given device requires an %s image type, but the given image file does not contain an %s FW image\n"
-#define FLINT_UNKNOWN_FW_TYPE_ERROR           "Unknown Firmware Type.\n"
-#define FLINT_READ_ROM_ERROR                  "Read ROM failed. %s\n"
-#define FLINT_SG_GUID_ERROR                   "Cannot set GUIDs: %s\n"
-#define FLINT_SG_UID_ERROR                    "Failed to set UID: %s\n"
-#define FLINT_MFG_ERROR                       "Failed to set manufacture guids: %s\n"
-#define FLINT_VSD_ERROR                       "Failed to set the VSD: %s\n"
-#define FLINT_VPD_ERROR                       "Failed to set VPD: %s\n"
-#define FLINT_CERT_CHAIN_ERROR                "Failed to set attestation certificate chain: %s\n"
-#define FLINT_SET_KEY_ERROR                   "Failed to set the HW access key: %s\n"
-#define FLINT_RESET_CFG_ERROR                 "Failed to reset Configuration: %s\n"
-#define FLINT_FIX_IMG_ERROR                   "Failed to fix device image: %s\n"
-#define FLINT_DROM_ERROR                      "Remove ROM failed: %s\n"
-#define FLINT_BROM_ERROR                      "Burn ROM failed: %s\n"
-#define FLINT_DUMP_ERROR                      "Failed dumping %s : %s\n"
-#define FLINT_ROM_QUERY_ERROR                 "Image file rom (%s) query failed. %s\n"
-#define FLINT_WB_FILE_ERROR                   "failed to open file: %s. %s\n"
-#define FLINT_WB_ERROR                        "write Block Failed. %s\n"
-#define FLINT_NO_ZLIB_ERROR                   "Executable was compiled with \"dump files\" option disabled.\n"
-#define FLINT_FLAG_WITH_FLAG_ERROR            "\"%s\" flag must be specified with \"%s\" flag.\n"
-#define FLINT_INVALID_PASSWORD                "Invalid Password.\n"
-#define FLINT_NO_GUID_MAC_FLAGS_ERROR         "Can not set GUIDs/MACs: please run with -uid/-guid/-mac flag.\n"
-#define FLINT_NOT_SUPP_UID_FLAG_ERROR         "Can not set GUIDs/MACs: %s flag is not supported for this device.\nPlease run with -uid/-guid/-mac flag.\n"
-#define FLINT_NO_UID_FLAG_ERROR               "Can not set GUIDs/MACs: uid is not specified, please run with -uid flag.\n"
-#define FLINT_CHECKSUM_ERROR                  "Failed to calculate checksum on %s: %s\n"
-#define FLINT_CHECKSUM_MISMATCH_ERROR         "Given checksum: %s does not match the checksum calculated on device FW: %s.\n"
-#define FLINT_CHECKSUM_PARSE_ERROR            "Failed to parse given checksum.\n"
-#define FLINT_CHECKSUM_LEN_ERROR              "MD5 checksum should be exactly 16 bytes long.\n"
-#define FLINT_CHECKSUM_HEX_ERROR              "MD5 checksum should contain only hexadecimal digits.\n"
-#define FLINT_CACHE_IMAGE_ERROR               "Failed to issue image cache request to driver. %s. make sure Mellanox driver is loaded and working properly.\n"
-#define FLINT_SET_PUBLIC_KEYS_ERROR           "Failed to set the public keys: %s\n"
-#define FLINT_SET_FORBIDDEN_VERSIONS_ERROR    "Failed to set the forbidden versions: %s\n"
-#define FLINT_SIGN_ERROR                      "Failed to sign the image: %s\n"
-#define FLINT_HMAC_ERROR                      "Failed to add HMAC: %s\n"
+#define FLINT_INVALID_FLAG_WITH_CMD_ERROR "Cannot specify flag: %s with Command: %s\n"
+#define FLINT_CMD_VERIFY_ERROR "FW image verification failed: %s. AN HCA DEVICE CAN NOT BOOT FROM THIS IMAGE.\n"
+#define FLINT_CMD_VERIFY_ERROR_1 \
+    "FW image verification failed: No valid FS4 image found.Check the flash parameters, if specified..AN HCA DEVICE CAN NOT BOOT FROM THIS IMAGE"
+#define FLINT_FAILED_QUERY_ERROR "Failed to query %s: %s. %s\n"
+#define FLINT_COMMAND_DEVICE_IMAGE_ERROR "Command \"%s\" requires both image and device to be specified.\n"
+#define FLINT_COMMAND_DEVICE_ERROR "Command \"%s\" requires device, but an image file was given.\n"
+#define FLINT_COMMAND_IMAGE_ERROR "Command \"%s\" requires an image file, but device was given.\n"
+#define FLINT_COMMAND_DEVICE_ERROR2 "Command \"%s\" requires device, but both an image file and a device are given.\n"
+#define FLINT_COMMAND_IMAGE_ERROR2 "Command \"%s\" requires an image, but both an image file and a device are given.\n"
+#define FLINT_HW_SET_ARGS_ERROR "bad argument of hw set command : %s, it should be in the format PARAM_NAME=VALUE\n"
+#define FLINT_HW_COMMAND_ERROR "HW %s failed. %s\n"
+#define FLINT_SWRESET_ERROR "Software reset failed. %s\n"
+#define FLINT_ERASE_SEC_ERROR "Erase sector failed. %s\n"
+#define FLINT_INVALID_ADDR_ERROR "Invalid address \"%s\"\n"
+#define FLINT_FLASH_READ_ERROR "Flash read failed. %s\n"
+#define FLINT_FLASH_WRITE_ERROR "Flash write failed. %s\n"
+#define FLINT_INVALID_DATA_ERROR "Invalid data \"%s\"\n"
+#define FLINT_INVALID_SIZE_ERROR "Invalid size \"%s\", Length should be 4-bytes aligned.\n"
+#define FLINT_INVALID_ARG_ERROR "Invalid argument \"%s\"\n"
+#define FLINT_OPEN_FILE_ERROR "Cannot open %s: %s\n"
+#define FLINT_WRITE_FILE_ERROR "Failed to write to %s: %s\n"
+#define FLINT_IO_OPEN_ERROR "Failed to open %s: %s\n"
+#define FLINT_IMAGE_READ_ERROR "Failed to read image. %s\n"
+#define FLINT_READ_ERROR "Failed to read from %s. %s\n"
+#define FLINT_READ_FILE_ERROR "Failed to read from %s.\n"
+#define FLINT_WIN_NOT_SUPP_ERROR "Command \"%s\" is not supported in windows.\n"
+#define FLINT_WIN_ONLY_SUPP_ERROR "Command  \"%s\" is supported only in windows.\n"
+#define FLINT_GEN_COMMAND_ERROR "Failed to execute command %s. %s\n"
+#define FLINT_FS3_BB_ERROR \
+    "bb command is not supported anymore in FS3/FS4 images, please use b for burning FS3/FS4 images.\n"
+#define FLINT_FSX_BURN_ERROR "Burning %s image failed: %s\n"
+#define FLINT_FS2_BURN_ERROR "Burning FS2 image failed: %s\n"
+#define FLINT_PSID_ERROR "PSID mismatch. The PSID on flash (%s) differs from the PSID in the given image (%s).\n"
+#define FLINT_FS2_STRIPED_ERROR "The -striped_image cannot be used with the burn command\n"
+#define FLINT_IMG_DEV_COMPAT_ERROR \
+    "The given device requires an %s image type, but the given image file does not contain an %s FW image\n"
+#define FLINT_UNKNOWN_FW_TYPE_ERROR "Unknown Firmware Type.\n"
+#define FLINT_READ_ROM_ERROR "Read ROM failed. %s\n"
+#define FLINT_SG_GUID_ERROR "Cannot set GUIDs: %s\n"
+#define FLINT_SG_UID_ERROR "Failed to set UID: %s\n"
+#define FLINT_MFG_ERROR "Failed to set manufacture guids: %s\n"
+#define FLINT_VSD_ERROR "Failed to set the VSD: %s\n"
+#define FLINT_VPD_ERROR "Failed to set VPD: %s\n"
+#define FLINT_CERT_CHAIN_ERROR "Failed to set attestation certificate chain: %s\n"
+#define FLINT_SET_KEY_ERROR "Failed to set the HW access key: %s\n"
+#define FLINT_RESET_CFG_ERROR "Failed to reset Configuration: %s\n"
+#define FLINT_FIX_IMG_ERROR "Failed to fix device image: %s\n"
+#define FLINT_DROM_ERROR "Remove ROM failed: %s\n"
+#define FLINT_BROM_ERROR "Burn ROM failed: %s\n"
+#define FLINT_DUMP_ERROR "Failed dumping %s : %s\n"
+#define FLINT_ROM_QUERY_ERROR "Image file rom (%s) query failed. %s\n"
+#define FLINT_WB_FILE_ERROR "failed to open file: %s. %s\n"
+#define FLINT_WB_ERROR "write Block Failed. %s\n"
+#define FLINT_NO_ZLIB_ERROR "Executable was compiled with \"dump files\" option disabled.\n"
+#define FLINT_FLAG_WITH_FLAG_ERROR "\"%s\" flag must be specified with \"%s\" flag.\n"
+#define FLINT_INVALID_PASSWORD "Invalid Password.\n"
+#define FLINT_NO_GUID_MAC_FLAGS_ERROR "Can not set GUIDs/MACs: please run with -uid/-guid/-mac flag.\n"
+#define FLINT_NOT_SUPP_UID_FLAG_ERROR \
+    "Can not set GUIDs/MACs: %s flag is not supported for this device.\nPlease run with -uid/-guid/-mac flag.\n"
+#define FLINT_NO_UID_FLAG_ERROR "Can not set GUIDs/MACs: uid is not specified, please run with -uid flag.\n"
+#define FLINT_CHECKSUM_ERROR "Failed to calculate checksum on %s: %s\n"
+#define FLINT_CHECKSUM_MISMATCH_ERROR "Given checksum: %s does not match the checksum calculated on device FW: %s.\n"
+#define FLINT_CHECKSUM_PARSE_ERROR "Failed to parse given checksum.\n"
+#define FLINT_CHECKSUM_LEN_ERROR "MD5 checksum should be exactly 16 bytes long.\n"
+#define FLINT_CHECKSUM_HEX_ERROR "MD5 checksum should contain only hexadecimal digits.\n"
+#define FLINT_CACHE_IMAGE_ERROR \
+    "Failed to issue image cache request to driver. %s. make sure Mellanox driver is loaded and working properly.\n"
+#define FLINT_SET_PUBLIC_KEYS_ERROR "Failed to set the public keys: %s\n"
+#define FLINT_SET_FORBIDDEN_VERSIONS_ERROR "Failed to set the forbidden versions: %s\n"
+#define FLINT_SIGN_ERROR "Failed to sign the image: %s\n"
+#define FLINT_HMAC_ERROR "Failed to add HMAC: %s\n"
 #define FLINT_FAILED_IMAGE_REACTIVATION_ERROR "Failed to execute image reactivation on device %s. Error: %s.\n"
-#define FLINT_NO_MFA2                         "MFA2 funcionality is not supported"
-#define FLINT_NO_HSM                          "HSM funcionality is not supported"
-#define FLINT_ILLEGAL_CPU_VALUE               "Illegal value for CPU utilization. Values must be between 1 (low CPU) and 5 (high CPU).\n"
-#define FLINT_FILE_SIZE_ERROR                 "Can not get file size for \"%s\".\n"
-#define FAILED_TO_VERIFY_PARAMS               "Failed to verify params(internal error)."
-#define INVALID_GUID_SYNTAX                   "Invalid GUID syntax (%s) %s\n"
-#define FAILED_GET_CONSOLE_MODE               "Failed to get console mode.\n"
-#define USER_ABORT                            "Aborted by user\n"
-#define SECTION_NOT_FOUNT                     "%s section not found in the given image."
-#define UNCOMPRESSS_ERROR                     "Failed uncompressing FW configuration section. uncompress returns %d"
-#define OPEN_WRITE_FILE_ERROR                 "Can not open file %s for write: %s."
-#define IMAGE_SIGN_TYPE_ERROR                 "Image signing is applicable only for selected FW images. Please check your image type.\n"
-#define HSM_INIT_ERROR                        "HSM init has failed! Please check if the HSM card installed and configured properly.\n"
-#define HSM_PRIVATE_KEY_DUPLICATE             "Creating HSM signature has failed - the private key label is duplicated.\n"
-#define HSM_PUBLIC_KEY_DUPLICATE              "Creating HSM signature has failed - the public key label is duplicated.\n"
-#define HSM_SIGNATURE_CREATION_FAILED         "Creating HSM signature has failed\n"
-#define HSM_UUID_MISSING                      "To Sign the image with RSA you must provide UUID with HSM sign.\n"
-#define HSM_PRIVATE_KEY_LABEL_MISSING         "Must supply private key label for sign with HSM sign.\n"
-#define HSM_PASSWORD_MISSING                  "Must supply HSM user password for sign with HSM sign.\n"
-#define SIGN_PRIVATE_KEY_NOT_FOUND            "Can't find private key file %s \n"
-#define SIGN_PUBLIC_KEY_NOT_FOUND             "Can't find public key file %s \n"
-#define HSM_BOOT_SIGNATURE_CREATION_FAILED    "Creating HSM BOOT signature has failed\n"
+#define FLINT_NO_MFA2 "MFA2 funcionality is not supported"
+#define FLINT_NO_HSM "HSM funcionality is not supported"
+#define FLINT_ILLEGAL_CPU_VALUE \
+    "Illegal value for CPU utilization. Values must be between 1 (low CPU) and 5 (high CPU).\n"
+#define FLINT_FILE_SIZE_ERROR "Can not get file size for \"%s\".\n"
+#define FAILED_TO_VERIFY_PARAMS "Failed to verify params(internal error)."
+#define INVALID_GUID_SYNTAX "Invalid GUID syntax (%s) %s\n"
+#define FAILED_GET_CONSOLE_MODE "Failed to get console mode.\n"
+#define USER_ABORT "Aborted by user\n"
+#define SECTION_NOT_FOUNT "%s section not found in the given image."
+#define UNCOMPRESSS_ERROR "Failed uncompressing FW configuration section. uncompress returns %d"
+#define OPEN_WRITE_FILE_ERROR "Can not open file %s for write: %s."
+#define IMAGE_SIGN_TYPE_ERROR "Image signing is applicable only for selected FW images. Please check your image type.\n"
+#define HSM_INIT_ERROR "HSM init has failed! Please check if the HSM card installed and configured properly.\n"
+#define HSM_PRIVATE_KEY_DUPLICATE "Creating HSM signature has failed - the private key label is duplicated.\n"
+#define HSM_PUBLIC_KEY_DUPLICATE "Creating HSM signature has failed - the public key label is duplicated.\n"
+#define HSM_SIGNATURE_CREATION_FAILED "Creating HSM signature has failed\n"
+#define HSM_UUID_MISSING "To Sign the image with RSA you must provide UUID with HSM sign.\n"
+#define HSM_PRIVATE_KEY_LABEL_MISSING "Must supply private key label for sign with HSM sign.\n"
+#define HSM_PASSWORD_MISSING "Must supply HSM user password for sign with HSM sign.\n"
+#define SIGN_PRIVATE_KEY_NOT_FOUND "Can't find private key file %s \n"
+#define SIGN_PUBLIC_KEY_NOT_FOUND "Can't find public key file %s \n"
+#define HSM_BOOT_SIGNATURE_CREATION_FAILED "Creating HSM BOOT signature has failed\n"
 #define HSM_CRITICAL_SIGNATURE_CREATION_FAILED "Creating HSM critical signature has failed\n"
 #define HSM_NON_CRITICAL_SIGNATURE_CREATION_FAILED "Creating HSM non-critical signature has failed\n"
-#define HSM_SECURE_BOOT_SIGNATURE_FAILED      "Inserting secure BOOT signatures has failed : %s.\n"
-#define HSM_SECURE_FW_SIGNATURE_FAILED        "Creation secured FW signatures has failed.\n"
-#define LINKX_QUERY_DEVICE_NOT_SUPPORTED      "Linkx query for device %s is not supported.\n"
-#define LINKX_BURN_DEVICE_NOT_SUPPORTED       "Linkx burn for device %s is not supported.\n"
+#define HSM_SECURE_BOOT_SIGNATURE_FAILED "Inserting secure BOOT signatures has failed : %s.\n"
+#define HSM_SECURE_FW_SIGNATURE_FAILED "Creation secured FW signatures has failed.\n"
+#define LINKX_QUERY_DEVICE_NOT_SUPPORTED "Linkx query for device %s is not supported.\n"
+#define LINKX_BURN_DEVICE_NOT_SUPPORTED "Linkx burn for device %s is not supported.\n"
 /**************************
  * Flint Warning Messages
  *************************/
-#define FLINT_QQ_WARRNING               "-W- Running quick query - Skipping full image integrity checks.\n"
-#define FLINT_NOT_MLNX_FW_WARNING      "-W- Not a Mellanox FW image (vendor_id = 0x%04x). VSD and PSID are not displayed.\n"
-#define FLINT_BLANK_GUIDS_WARNING      "-W- GUIDs/MACs values and their CRC are not set.\n"
-#define FLINT_MULTI_BIT_WARNING        "Multicast bit (bit 40) is set."
-#define FLINT_MORE_48_BITS_WARNING     "More than 48 bits are used."
-#define FLINT_BAD_MAC_ADRESS_WARNING   "\n-W- Bad mac address ( %4.4x%8.8x ): %s\n"
-#define FLINT_MAC_ENTRIES_WARNING      "-W- Cannot get MAC address: Expecting %d entries in guid section, got %d. Probably an old FW image. Please update.\n"
-#define FLINT_INTERRUPT_WARRNING       "\n-W- An internal error occurred. This program cannot be interrupted.\n"
-#define FLINT_SET_GUIDS_WARRNING       "-W- GUIDs are already set, re-burning image with the new GUIDs ...\n"
-#define FLINT_OCR_WARRNING             "\n-W- Firmware flash cache access is enabled. Running in this mode may cause the firmware to hang.\n"
-#define FLINT_OPEN_LOG_FILE_WARNING    "-W- Failed to open log file \"%s\": %s. No logs will be saved\n"
+#define FLINT_QQ_WARRNING "-W- Running quick query - Skipping full image integrity checks.\n"
+#define FLINT_NOT_MLNX_FW_WARNING "-W- Not a Mellanox FW image (vendor_id = 0x%04x). VSD and PSID are not displayed.\n"
+#define FLINT_BLANK_GUIDS_WARNING "-W- GUIDs/MACs values and their CRC are not set.\n"
+#define FLINT_MULTI_BIT_WARNING "Multicast bit (bit 40) is set."
+#define FLINT_MORE_48_BITS_WARNING "More than 48 bits are used."
+#define FLINT_BAD_MAC_ADRESS_WARNING "\n-W- Bad mac address ( %4.4x%8.8x ): %s\n"
+#define FLINT_MAC_ENTRIES_WARNING \
+    "-W- Cannot get MAC address: Expecting %d entries in guid section, got %d. Probably an old FW image. Please update.\n"
+#define FLINT_INTERRUPT_WARRNING "\n-W- An internal error occurred. This program cannot be interrupted.\n"
+#define FLINT_SET_GUIDS_WARRNING "-W- GUIDs are already set, re-burning image with the new GUIDs ...\n"
+#define FLINT_OCR_WARRNING \
+    "\n-W- Firmware flash cache access is enabled. Running in this mode may cause the firmware to hang.\n"
+#define FLINT_OPEN_LOG_FILE_WARNING "-W- Failed to open log file \"%s\": %s. No logs will be saved\n"
 
 #endif
diff --git a/flint/flint.cpp b/flint/flint.cpp
index a4bffbe5..503c25be 100644
--- a/flint/flint.cpp
+++ b/flint/flint.cpp
@@ -42,10 +42,10 @@
 
 #include "flint.h"
 
-//Globals:
-Flint *gFlint = NULL;
-extern FILE *flint_log_fh;
-//signal handler section
+// Globals:
+Flint* gFlint = NULL;
+extern FILE* flint_log_fh;
+// signal handler section
 
 #define BURN_INTERRUPTED 0x1234
 
@@ -54,44 +54,45 @@ void TerminationHandler(int signum);
 #ifdef __WIN__
 #include <windows.h>
 
-static BOOL CtrlHandler( DWORD fdwCtrlType )
+static BOOL CtrlHandler(DWORD fdwCtrlType)
 {
     switch (fdwCtrlType)
     {
-    // Handle the CTRL-C signal.
-    case CTRL_C_EVENT:
-    // CTRL-CLOSE: confirm that the user wants to exit.
-    case CTRL_CLOSE_EVENT:
-    // Pass other signals to the next handler.
-    case CTRL_BREAK_EVENT:
-    case CTRL_LOGOFF_EVENT:
-    case CTRL_SHUTDOWN_EVENT:
-        TerminationHandler(SIGINT);
-        return TRUE;
+        // Handle the CTRL-C signal.
+        case CTRL_C_EVENT:
+        // CTRL-CLOSE: confirm that the user wants to exit.
+        case CTRL_CLOSE_EVENT:
+        // Pass other signals to the next handler.
+        case CTRL_BREAK_EVENT:
+        case CTRL_LOGOFF_EVENT:
+        case CTRL_SHUTDOWN_EVENT:
+            TerminationHandler(SIGINT);
+            return TRUE;
 
-    default:
-        return FALSE;
+        default:
+            return FALSE;
     }
 }
 
 #endif
 
-
 void TerminationHandler(int signum)
 {
     static volatile sig_atomic_t fatal_error_in_progress = 0;
 
-    if (fatal_error_in_progress) {
+    if (fatal_error_in_progress)
+    {
         raise(signum);
     }
     fatal_error_in_progress = 1;
 
     write_result_to_log(BURN_INTERRUPTED, "");
     close_log();
-    if (gFlint != NULL) {
+    if (gFlint != NULL)
+    {
         printf("\n Received signal %d. Cleaning up ...\n", signum);
         fflush(stdout);
-        //sleep(1); // Legacy from the Old Flint
+        // sleep(1); // Legacy from the Old Flint
         gFlint->GetSubCommands()[gFlint->GetFlintParams().cmd]->cleanInterruptedCommand();
         delete gFlint;
         gFlint = NULL;
@@ -111,30 +112,32 @@ static int signalList[SIGNAL_NUM] = {SIGINT, SIGTERM, SIGPIPE, SIGHUP};
 
 void initHandler()
 {
-
 #ifdef __WIN__
-    SetConsoleCtrlHandler( (PHANDLER_ROUTINE) CtrlHandler, true );
+    SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, true);
 #endif
 
-    //set the signal handler
-    for (int i = 0; i < SIGNAL_NUM; i++) {
+    // set the signal handler
+    for (int i = 0; i < SIGNAL_NUM; i++)
+    {
         void (*prevFunc)(int);
         prevFunc = signal(signalList[i], TerminationHandler);
-        if (prevFunc == SIG_ERR) {
+        if (prevFunc == SIG_ERR)
+        {
             printf("-E- failed to set signal Handler.");
             exit(FLINT_FAILED);
         }
     }
 }
 
-void ignoreSignals() {
-    for (int i = 0; i < SIGNAL_NUM; i++) {
+void ignoreSignals()
+{
+    for (int i = 0; i < SIGNAL_NUM; i++)
+    {
         signal(signalList[i], SIG_IGN);
     }
 }
 
-//End of signal handler section.
-
+// End of signal handler section.
 
 map_sub_cmd_t_to_subcommand Flint::initSubcommandMap()
 {
@@ -181,8 +184,8 @@ map_sub_cmd_t_to_subcommand Flint::initSubcommandMap()
     cmdMap[SC_Set_Forbidden_Versions] = new SetForbiddenVersionsSubCommand();
     cmdMap[SC_Image_Reactivation] = new ImageReactivationSubCommand();
     cmdMap[SC_RSA_Sign] = new SignRSASubCommand();
-    cmdMap[SC_Binary_Compare] = new  BinaryCompareSubCommand();
-    cmdMap[SC_Import_Hsm_Key] = new  ImportHsmKeySubCommand();
+    cmdMap[SC_Binary_Compare] = new BinaryCompareSubCommand();
+    cmdMap[SC_Import_Hsm_Key] = new ImportHsmKeySubCommand();
 #ifndef NO_OPEN_SSL
     cmdMap[SC_Export_Public_Key] = new ExportPublicSubCommand();
 #endif
@@ -195,7 +198,6 @@ void Flint::deInitSubcommandMap(map_sub_cmd_t_to_subcommand cmdMap)
         delete it->second;
 }
 
-
 Flint::Flint() :
     CommandLineRequester(FLINT_DISPLAY_NAME " [OPTIONS] <command> [Parameters]"),
     _flintParams(),
@@ -210,51 +212,64 @@ Flint::~Flint()
     deInitSubcommandMap(_subcommands);
 }
 
-FlintStatus Flint::run(int argc, char *argv[])
+FlintStatus Flint::run(int argc, char* argv[])
 {
-    //Step1 parse input
-    //There are some memory allocations parseCmdLine
+    // Step1 parse input
+    // There are some memory allocations parseCmdLine
     ParseStatus status;
-    try {
+    try
+    {
         status = this->parseCmdLine(argc, argv);
-    } catch (exception& e) {
+    }
+    catch (exception& e)
+    {
         cout << "-E- " << e.what() << endl;
         return FLINT_FAILED;
     }
-    if (status == PARSE_OK_WITH_EXIT) {
+    if (status == PARSE_OK_WITH_EXIT)
+    {
         return FLINT_SUCCESS;
-    } else if (status == PARSE_ERROR || status == PARSE_ERROR_SHOW_USAGE) {
-        if (string(_cmdParser.GetErrDesc()).length() > 0) {
+    }
+    else if (status == PARSE_ERROR || status == PARSE_ERROR_SHOW_USAGE)
+    {
+        if (string(_cmdParser.GetErrDesc()).length() > 0)
+        {
             cout << "-E- " << this->_cmdParser.GetErrDesc() << endl;
         }
         return FLINT_FAILED;
     }
 
-    if (_flintParams.cmd == SC_No_Cmd && !_flintParams.clear_semaphore) {
+    if (_flintParams.cmd == SC_No_Cmd && !_flintParams.clear_semaphore)
+    {
         cout << FLINT_NO_COMMAND_ERROR << endl;
         return FLINT_FAILED;
     }
-    if (_flintParams.clear_semaphore) {
-        if (_flintParams.cmd != SC_No_Cmd) {
+    if (_flintParams.clear_semaphore)
+    {
+        if (_flintParams.cmd != SC_No_Cmd)
+        {
             printf(FLINT_CLEAR_SEM_CMD_ERROR);
             return FLINT_FAILED;
         }
         _flintParams.cmd = SC_Clear_Sem;
     }
 
-    //TODO: adrianc: remove use_fw flag and this condition before MFT-4.1.0
-    if (_flintParams.use_fw && _flintParams.override_cache_replacement) {
+    // TODO: adrianc: remove use_fw flag and this condition before MFT-4.1.0
+    if (_flintParams.use_fw && _flintParams.override_cache_replacement)
+    {
         printf("-E- flags --use_fw and --override_cache_replacement/-ocr cannot be specified simultaneously");
         return FLINT_FAILED;
     }
 
     // Step 2 save argv as a single cmd string in flint params for the log functionality
-    for (int i = 0; i < argc; i++) {
+    for (int i = 0; i < argc; i++)
+    {
         _flintParams.fullCmd = _flintParams.fullCmd + argv[i] + " ";
     }
-    //TODO: Step 3 check flintParams for contradictions?
-    //Step 4 execute command from the correct subcommand class
-    if (_subcommands.count(_flintParams.cmd) == 0) {
+    // TODO: Step 3 check flintParams for contradictions?
+    // Step 4 execute command from the correct subcommand class
+    if (_subcommands.count(_flintParams.cmd) == 0)
+    {
         // should not be reached
         printf("-E- FATAL: command object not found.");
         return FLINT_FAILED;
@@ -263,15 +278,15 @@ FlintStatus Flint::run(int argc, char *argv[])
     return _subcommands[_flintParams.cmd]->executeCommand();
 }
 
-
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     initHandler();
     try
     {
         gFlint = new Flint();
         FlintStatus rc = gFlint->run(argc, argv);
-        if (gFlint) {
+        if (gFlint)
+        {
             ignoreSignals(); // clean-up should be signal free, prevent possible clean-up re-entry
             delete gFlint;
             gFlint = NULL;
diff --git a/flint/flint.h b/flint/flint.h
index cfd1fb0a..e77b682f 100644
--- a/flint/flint.h
+++ b/flint/flint.h
@@ -48,9 +48,9 @@
 
 using namespace std;
 
-typedef map <sub_cmd_t, SubCommand*> map_sub_cmd_t_to_subcommand;
-typedef map <string, string> map_string_to_string;
-typedef map <string, int> map_string_to_int;
+typedef map<sub_cmd_t, SubCommand*> map_sub_cmd_t_to_subcommand;
+typedef map<string, string> map_string_to_string;
+typedef map<string, int> map_string_to_int;
 
 map_string_to_string initShortToLongFlagMap();
 map_string_to_int initLongFlagToNumOfArgsMap();
@@ -64,7 +64,7 @@ class Flint : public CommandLineRequester
     CommandLineParser _cmdParser;
     map_sub_cmd_t_to_subcommand _subcommands;
 
-    //methods
+    // methods
     map_sub_cmd_t_to_subcommand initSubcommandMap();
     void deInitSubcommandMap(map_sub_cmd_t_to_subcommand cmdMap);
 
@@ -73,8 +73,8 @@ class Flint : public CommandLineRequester
     ~Flint();
     void initCmdParser();
     virtual ParseStatus HandleOption(string name, string value);
-    ParseStatus parseCmdLine(int argc, char *argv[]);
-    FlintStatus run(int argc, char *argv[]);
+    ParseStatus parseCmdLine(int argc, char* argv[]);
+    FlintStatus run(int argc, char* argv[]);
     FlintParams& GetFlintParams() { return _flintParams; }
     map_sub_cmd_t_to_subcommand& GetSubCommands() { return _subcommands; }
 };
diff --git a/flint/flint_params.cpp b/flint/flint_params.cpp
index 1d769313..5795eceb 100644
--- a/flint/flint_params.cpp
+++ b/flint/flint_params.cpp
@@ -53,7 +53,7 @@ FlintParams::FlintParams()
     device_specified = false;
     blank_guids = false;
     clear_semaphore = false;
-    quick_query = true;  //should now be true by default
+    quick_query = true; // should now be true by default
     next_boot_fw_ver = false;
     low_cpu = false;
     skip_rom_query = false;
@@ -118,11 +118,8 @@ FlintParams::FlintParams()
     downstream_device_ids_specified = false;
     download_transfer = false;
     // if no delay specified, use minimal delay to avoid disconnection in case of activating the connect port
-    activate_delay_sec = 1; 
+    activate_delay_sec = 1;
     openssl_engine_usage_specified = false;
 }
 
-FlintParams::~FlintParams()
-{
-
-}
+FlintParams::~FlintParams() {}
diff --git a/flint/flint_params.h b/flint/flint_params.h
index b28f237a..28ff3caa 100644
--- a/flint/flint_params.h
+++ b/flint/flint_params.h
@@ -47,7 +47,8 @@
 
 using namespace std;
 
-typedef enum {
+typedef enum
+{
     SC_No_Cmd = 0,
     SC_Burn,
     SC_Query,
@@ -94,9 +95,10 @@ typedef enum {
     SC_Export_Public_Key
 } sub_cmd_t;
 
-class FlintParams {
+class FlintParams
+{
 public:
-    //add more params
+    // add more params
     FlintParams();
     ~FlintParams();
     bool device_specified;
@@ -188,7 +190,7 @@ class FlintParams {
     bool hsm_password_specified;
     string hsm_password;
     bool linkx_control;
-    int  cableDeviceIndex;
+    int cableDeviceIndex;
     int cableDeviceSize;
     bool cable_device_index_specified;
     bool cable_device_size_specified;
@@ -196,7 +198,7 @@ class FlintParams {
     bool activate;
     bool download_downstream_specified;
     bool downstream_device_ids_specified;
-    std::vector<int>  downstream_device_ids;
+    std::vector<int> downstream_device_ids;
     bool download_transfer;
     u_int8_t activate_delay_sec;
     string openssl_engine;
diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
index 46399f61..8e52009a 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
@@ -84,14 +84,14 @@ using namespace mfa2;
  *  Log file writing implementation
  ************************************/
 
-//global log file header
-FILE *flint_log_fh = NULL;
+// global log file header
+FILE* flint_log_fh = NULL;
 
 #define BURN_INTERRUPTED 0x1234
 
 static int is_arm()
 {
-#if defined (MST_CPU_arm64)
+#if defined(MST_CPU_arm64)
     return 1;
 #else
     return 0;
@@ -100,37 +100,22 @@ static int is_arm()
 
 void close_log()
 {
-    if (flint_log_fh != NULL) {
+    if (flint_log_fh != NULL)
+    {
         fclose(flint_log_fh);
         flint_log_fh = NULL;
     }
     return;
 }
 
-static const char* life_cycle_strings[NUM_OF_LIFE_CYCLES] = {
-    "PRODUCTION",
-    "GA SECURED",
-    "GA NON SECURED",
-    "RMA"
-};
+static const char* life_cycle_strings[NUM_OF_LIFE_CYCLES] = {"PRODUCTION", "GA SECURED", "GA NON SECURED", "RMA"};
 
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
-const char*   month_2monstr(int month)
-{
-    static const char *month_2monstr_arr[] = {
-        "Jan",
-        "Feb",
-        "Mar",
-        "Apr",
-        "May",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Oct",
-        "Nov",
-        "Dec",
+const char* month_2monstr(int month)
+{
+    static const char* month_2monstr_arr[] = {
+      "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
     };
     int arr_size = (int)ARRAY_SIZE(month_2monstr_arr);
     return month < arr_size ? month_2monstr_arr[month] : "???";
@@ -139,14 +124,16 @@ const char*   month_2monstr(int month)
 void print_time_to_log()
 {
     time_t rawtime;
-    struct tm *timeinfo;
+    struct tm* timeinfo;
 
-    if (flint_log_fh == NULL) {
+    if (flint_log_fh == NULL)
+    {
         return;
     }
     time(&rawtime);
     timeinfo = localtime(&rawtime);
-    if (!timeinfo) {
+    if (!timeinfo)
+    {
         printf("localtime returned NULL. Can't print time.\n");
         return;
     }
@@ -156,10 +143,11 @@ void print_time_to_log()
     return;
 }
 
-int print_line_to_log(const char *format, ...)
+int print_line_to_log(const char* format, ...)
 {
     va_list args;
-    if (flint_log_fh == NULL) {
+    if (flint_log_fh == NULL)
+    {
         return 0;
     }
     print_time_to_log();
@@ -171,16 +159,21 @@ int print_line_to_log(const char *format, ...)
 
 int write_cmd_to_log(string fullCmd, sub_cmd_t cmd, bool write)
 {
-    if (!write) {
+    if (!write)
+    {
         return 0;
     }
     char pre_str[50];
-    if (flint_log_fh == NULL) {
+    if (flint_log_fh == NULL)
+    {
         return 0;
     }
-    if (cmd == SC_Brom) {
+    if (cmd == SC_Brom)
+    {
         snprintf(pre_str, 50, "ROM");
-    } else {
+    }
+    else
+    {
         snprintf(pre_str, 50, "FW");
     }
     print_time_to_log();
@@ -190,25 +183,36 @@ int write_cmd_to_log(string fullCmd, sub_cmd_t cmd, bool write)
     return 0;
 }
 
-int write_result_to_log(int is_failed, const char *err_msg, bool write)
+int write_result_to_log(int is_failed, const char* err_msg, bool write)
 {
-    if (!write) {
+    if (!write)
+    {
         return 0;
     }
-    char msg[MAX_ERR_STR_LEN + 1] = { 0 };
+    char msg[MAX_ERR_STR_LEN + 1] = {0};
     strncpy(msg, err_msg, MAX_ERR_STR_LEN);
-    if (is_failed == 0) {
+    if (is_failed == 0)
+    {
         print_line_to_log("Burn completed successfully\n");
-    } else if (is_failed == BURN_INTERRUPTED) {
+    }
+    else if (is_failed == BURN_INTERRUPTED)
+    {
         print_line_to_log("Burn interrupted by user\n");
-    } else {
+    }
+    else
+    {
         int msg_len = strlen(msg);
         // cleanup the msg
-        for (int i = 0; i < msg_len; i++) {
-            if (msg[i] == '\n') {
-                if (i == msg_len - 1) {
+        for (int i = 0; i < msg_len; i++)
+        {
+            if (msg[i] == '\n')
+            {
+                if (i == msg_len - 1)
+                {
                     msg[i] = '\0';
-                } else {
+                }
+                else
+                {
                     msg[i] = ' ';
                 }
             }
@@ -222,26 +226,30 @@ bool is_file_exists(const string filename)
 {
     /* Check for existence */
 #ifdef __WIN__
-    if (_access(filename.c_str(), F_OK) != -1) {
+    if (_access(filename.c_str(), F_OK) != -1)
+    {
         return true;
     }
 #else
-    if (access(filename.c_str(), F_OK) != -1) {
+    if (access(filename.c_str(), F_OK) != -1)
+    {
         return true;
     }
 #endif
     return false;
 }
 
-bool is_file_exists (const char *filename)
+bool is_file_exists(const char* filename)
 {
     /* Check for existence */
 #ifdef __WIN__
-    if(_access(filename, F_OK) != -1) {
+    if (_access(filename, F_OK) != -1)
+    {
         return true;
     }
 #else
-    if(access(filename, F_OK) != -1) {
+    if (access(filename, F_OK) != -1)
+    {
         return true;
     }
 #endif
@@ -252,16 +260,18 @@ bool is_file_exists (const char *filename)
  *  Static functions
  ******************/
 
-static bool str2Num(const char *str, u_int32_t& num)
+static bool str2Num(const char* str, u_int32_t& num)
 {
-    char *endp;
+    char* endp;
     u_int32_t tempNum;
 
-    if (!str) {
+    if (!str)
+    {
         return false;
     }
     tempNum = strtoul(str, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         return false;
     }
     num = tempNum;
@@ -272,7 +282,6 @@ static bool str2Num(const char *str, u_int32_t& num)
  * Class: Subcommand
  ******************/
 
-
 #define MAX_ERR_STR_LEN 1024
 #define PRE_ERR_MSG "-E-"
 
@@ -282,29 +291,32 @@ bool SubCommand::isCmdSupportLog()
     // A. it is either Burn, Burn Block or Burn ROM.
     // B. log flag was given in the cmd line.
 
-    switch (_cmdType) {
-    case SC_Burn:
-    case SC_Bb:
-    case SC_Brom:
-        return _flintParams.log_specified;
+    switch (_cmdType)
+    {
+        case SC_Burn:
+        case SC_Bb:
+        case SC_Brom:
+            return _flintParams.log_specified;
 
-    default:
-        return false;
+        default:
+            return false;
     }
     return false;
 }
 
-void SubCommand::reportErr(bool shouldPrint, const char *format, ...)
+void SubCommand::reportErr(bool shouldPrint, const char* format, ...)
 {
     va_list args;
 
     va_start(args, format);
 
-    if (vsnprintf(_errBuff, FLINT_ERR_LEN, format, args) >= FLINT_ERR_LEN) {
+    if (vsnprintf(_errBuff, FLINT_ERR_LEN, format, args) >= FLINT_ERR_LEN)
+    {
         strcpy(&_errBuff[FLINT_ERR_LEN - 5], "...\n");
     }
-    //print to the user and to the log if needed
-    if (shouldPrint) {
+    // print to the user and to the log if needed
+    if (shouldPrint)
+    {
         fprintf(stdout, PRE_ERR_MSG " %s", _errBuff);
     }
     write_result_to_log(FLINT_FAILED, _errBuff, isCmdSupportLog());
@@ -315,18 +327,21 @@ void SubCommand::reportErr(bool shouldPrint, const char *format, ...)
 
 bool SubCommand::getFileSize(const string& filePath, long& fileSize)
 {
-    FILE *fd = fopen(filePath.c_str(), "rb");
-    if (fd == NULL) {
+    FILE* fd = fopen(filePath.c_str(), "rb");
+    if (fd == NULL)
+    {
         reportErr(true, FLINT_OPEN_FILE_ERROR, filePath.c_str(), strerror(errno));
         return false;
     }
-    if (fseek(fd, 0, SEEK_END) < 0) {
+    if (fseek(fd, 0, SEEK_END) < 0)
+    {
         fclose(fd);
         reportErr(true, FLINT_FILE_SIZE_ERROR, filePath.c_str());
         return false;
     }
     long FileSize = ftell(fd);
-    if (FileSize < 0) {
+    if (FileSize < 0)
+    {
         fclose(fd);
         reportErr(true, FLINT_FILE_SIZE_ERROR, filePath.c_str());
         return false;
@@ -338,28 +353,32 @@ bool SubCommand::getFileSize(const string& filePath, long& fileSize)
 
 bool SubCommand::readFromFile(const string& filePath, std::vector<u_int8_t>& buff)
 {
-    FILE *fd = fopen(filePath.c_str(), "rb");
-    if (fd == NULL) {
+    FILE* fd = fopen(filePath.c_str(), "rb");
+    if (fd == NULL)
+    {
         reportErr(true, FLINT_OPEN_FILE_ERROR, filePath.c_str(), strerror(errno));
         return false;
     }
-    if (fseek(fd, 0, SEEK_END) < 0) {
+    if (fseek(fd, 0, SEEK_END) < 0)
+    {
         fclose(fd);
         reportErr(true, FLINT_FILE_SIZE_ERROR, filePath.c_str());
         return false;
     }
     long fileSize = ftell(fd);
-    if (fileSize < 0) {
+    if (fileSize < 0)
+    {
         fclose(fd);
         reportErr(true, FLINT_FILE_SIZE_ERROR, filePath.c_str());
         return false;
     }
     rewind(fd);
-    int currentSize = buff.size();//default 0
+    int currentSize = buff.size(); // default 0
     buff.resize(currentSize + fileSize, 0xff);
     // Read
     long read_res = (long)fread(&buff[currentSize], 1, fileSize, fd);
-    if (read_res < 0) {
+    if (read_res < 0)
+    {
         fclose(fd);
         reportErr(true, FLINT_READ_FILE_ERROR, filePath.c_str());
         return false;
@@ -369,13 +388,15 @@ bool SubCommand::readFromFile(const string& filePath, std::vector<u_int8_t>& buf
 }
 bool SubCommand::writeToFile(string filePath, const std::vector<u_int8_t>& buff)
 {
-    FILE *fh = fopen(filePath.c_str(), "wb");
-    if (fh == NULL) {
+    FILE* fh = fopen(filePath.c_str(), "wb");
+    if (fh == NULL)
+    {
         reportErr(true, FLINT_OPEN_FILE_ERROR, filePath.c_str(), strerror(errno));
         return false;
     }
     // Write
-    if (fwrite(&buff[0], 1, buff.size(), fh) != buff.size()) {
+    if (fwrite(&buff[0], 1, buff.size(), fh) != buff.size())
+    {
         fclose(fh);
         reportErr(true, FLINT_WRITE_FILE_ERROR, filePath.c_str(), strerror(errno));
         return false;
@@ -384,16 +405,18 @@ bool SubCommand::writeToFile(string filePath, const std::vector<u_int8_t>& buff)
     return true;
 }
 
-FlintStatus SubCommand::writeImageToFile(const char *file_name, u_int8_t *data, u_int32_t length)
+FlintStatus SubCommand::writeImageToFile(const char* file_name, u_int8_t* data, u_int32_t length)
 {
-    FILE *fh = fopen(file_name, "wb");
-    if (fh == NULL) {
+    FILE* fh = fopen(file_name, "wb");
+    if (fh == NULL)
+    {
         reportErr(true, FLINT_OPEN_FILE_ERROR, file_name, strerror(errno));
         return FLINT_FAILED;
     }
 
     // Write output
-    if (fwrite(data, 1, length, fh) != length) {
+    if (fwrite(data, 1, length, fh) != length)
+    {
         fclose(fh);
         reportErr(true, FLINT_WRITE_FILE_ERROR, file_name, strerror(errno));
         return FLINT_FAILED;
@@ -404,31 +427,37 @@ FlintStatus SubCommand::writeImageToFile(const char *file_name, u_int8_t *data,
 
 void SubCommand::openLog()
 {
-    if (isCmdSupportLog()) {
+    if (isCmdSupportLog())
+    {
         flint_log_fh = fopen(_flintParams.log.c_str(), "a+");
-        if (flint_log_fh == NULL) {
-            printf(FLINT_OPEN_LOG_FILE_WARNING, _flintParams.log.c_str()
-                , strerror(errno));
+        if (flint_log_fh == NULL)
+        {
+            printf(FLINT_OPEN_LOG_FILE_WARNING, _flintParams.log.c_str(), strerror(errno));
         }
         write_cmd_to_log(_flintParams.fullCmd, _flintParams.cmd, _flintParams.log_specified);
     }
 }
 
-int SubCommand::verifyCbFunc(char *str)
+int SubCommand::verifyCbFunc(char* str)
 {
     printf("%s", str);
     return 0;
 }
 
-
-int SubCommand::CbCommon(int completion, char *preStr, char *endStr)
+int SubCommand::CbCommon(int completion, char* preStr, char* endStr)
 {
-    if (completion < 100) {
+    if (completion < 100)
+    {
         printf("\r%s%3d%%", preStr, completion);
-    } else if (completion == 100) {
+    }
+    else if (completion == 100)
+    {
         printf("\r%sOK  \n", preStr);
-    } else {    // printing endStr
-        if (endStr) {
+    }
+    else
+    { // printing endStr
+        if (endStr)
+        {
             printf("\r%s\n", endStr);
         }
     }
@@ -440,34 +469,37 @@ int SubCommand::CbCommon(int completion, char *preStr, char *endStr)
 // output. thus in subcommands that use these callbacks you will see we manually call them at the end with the 101 arg
 int SubCommand::burnCbFs3Func(int completion)
 {
-    char *message = (char*)"Burning FW image without signatures - ";
-    char *endStr = (char*)"Restoring signature                     - OK";
+    char* message = (char*)"Burning FW image without signatures - ";
+    char* endStr = (char*)"Restoring signature                     - OK";
     return CbCommon(completion, message, endStr);
 }
 
-int SubCommand::advProgressFunc(int completion, const char *stage, prog_t type, int *unknownProgress)
+int SubCommand::advProgressFunc(int completion, const char* stage, prog_t type, int* unknownProgress)
 {
-    switch (type) {
-    case PROG_WITH_PRECENTAGE:
-        printf("\r%s - %3d%%", stage, completion);
-        break;
+    switch (type)
+    {
+        case PROG_WITH_PRECENTAGE:
+            printf("\r%s - %3d%%", stage, completion);
+            break;
 
-    case PROG_OK:
-        printf("\r%s -   OK\n", stage);
-        break;
+        case PROG_OK:
+            printf("\r%s -   OK\n", stage);
+            break;
 
-    case PROG_STRING_ONLY:
-        printf("%s\n", stage);
-        break;
+        case PROG_STRING_ONLY:
+            printf("%s\n", stage);
+            break;
 
-    case PROG_WITHOUT_PRECENTAGE:
-        if (unknownProgress) {
-            static const char *progStr[] = { "[.    ]", "[..   ]", "[...  ]", "[.... ]", "[.....]", "[ ....]", "[  ...]", "[   ..]", "[    .]", "[     ]" };
-            int size = sizeof(progStr) / sizeof(progStr[0]);
-            printf("\r%s - %s", stage, progStr[(*unknownProgress) % size]);
-            (*unknownProgress)++;
-        }
-        break;
+        case PROG_WITHOUT_PRECENTAGE:
+            if (unknownProgress)
+            {
+                static const char* progStr[] = {"[.    ]", "[..   ]", "[...  ]", "[.... ]", "[.....]",
+                                                "[ ....]", "[  ...]", "[   ..]", "[    .]", "[     ]"};
+                int size = sizeof(progStr) / sizeof(progStr[0]);
+                printf("\r%s - %s", stage, progStr[(*unknownProgress) % size]);
+                (*unknownProgress)++;
+            }
+            break;
     }
     fflush(stdout);
     return 0;
@@ -475,9 +507,10 @@ int SubCommand::advProgressFunc(int completion, const char *stage, prog_t type,
 
 int SubCommand::burnCbFs2Func(int completion)
 {
-    char *message = (char*)"Burning FS2 FW image without signatures - ";
-    char *endStr = (char*)"Restoring signature                     - OK";
-    if (completion == 102) {
+    char* message = (char*)"Burning FS2 FW image without signatures - ";
+    char* endStr = (char*)"Restoring signature                     - OK";
+    if (completion == 102)
+    {
         endStr = (char*)"Image was successfully cached by driver.";
     }
     return CbCommon(completion, message, endStr);
@@ -485,26 +518,25 @@ int SubCommand::burnCbFs2Func(int completion)
 
 int SubCommand::bromCbFunc(int completion)
 {
-    char *message = (char*)"Burning ROM image    - ";
-    char *endStr = (char*)"Restoring signature  - OK";
+    char* message = (char*)"Burning ROM image    - ";
+    char* endStr = (char*)"Restoring signature  - OK";
     return CbCommon(completion, message, endStr);
 }
 
 int SubCommand::dromCbFunc(int completion)
 {
-    char *message = (char*)"Removing ROM image    - ";
-    char *endStr = (char*)"Restoring signature  - OK";
+    char* message = (char*)"Removing ROM image    - ";
+    char* endStr = (char*)"Restoring signature  - OK";
     return CbCommon(completion, message, endStr);
 }
 
 int SubCommand::resetCfgCbFunc(int completion)
 {
-    char *message = (char*)"Resetting NV configuration - ";
-    char *endStr = (char*)"Restoring signature        - OK";
+    char* message = (char*)"Resetting NV configuration - ";
+    char* endStr = (char*)"Restoring signature        - OK";
     return CbCommon(completion, message, endStr);
 }
 
-
 int SubCommand::burnBCbFunc(int completion)
 {
     return CbCommon(completion, (char*)"");
@@ -512,27 +544,27 @@ int SubCommand::burnBCbFunc(int completion)
 
 int SubCommand::vsdCbFunc(int completion)
 {
-    char *message = (char*)"Setting the VSD      - ";
-    char *endStr = (char*)"Restoring signature  - OK";
+    char* message = (char*)"Setting the VSD      - ";
+    char* endStr = (char*)"Restoring signature  - OK";
     return CbCommon(completion, message, endStr);
 }
 
 int SubCommand::setKeyCbFunc(int completion)
 {
-    char *message = (char*)"Setting the HW Key   - ";
-    char *endStr = (char*)"Restoring signature  - OK";
+    char* message = (char*)"Setting the HW Key   - ";
+    char* endStr = (char*)"Restoring signature  - OK";
     return CbCommon(completion, message, endStr);
 }
 
 int SubCommand::wbCbFunc(int completion)
 {
-    char *message = (char*)"Writing Block:   - ";
+    char* message = (char*)"Writing Block:   - ";
     return CbCommon(completion, message, NULL);
 }
 
 #define ERR_BUFF_SIZE 1024
 
-void SubCommand::initDeviceFwParams(char *errBuff, FwOperations::fw_ops_params_t& fwParams)
+void SubCommand::initDeviceFwParams(char* errBuff, FwOperations::fw_ops_params_t& fwParams)
 {
     memset(&fwParams, 0, sizeof(FwOperations::fw_ops_params_t));
     fwParams.errBuff = errBuff;
@@ -554,12 +586,14 @@ void SubCommand::initDeviceFwParams(char *errBuff, FwOperations::fw_ops_params_t
 FlintStatus SubCommand::openOps(bool ignoreSecurityAttributes, bool ignoreDToc)
 {
     DPRINTF(("SubCommand::openOps\n"));
-    char errBuff[ERR_BUFF_SIZE] = { 0 };
-    if (_flintParams.device_specified) {
+    char errBuff[ERR_BUFF_SIZE] = {0};
+    if (_flintParams.device_specified)
+    {
         // fillup the fw_ops_params_t struct
         FwOperations::fw_ops_params_t fwParams;
         initDeviceFwParams(errBuff, fwParams);
-        if (_flintParams.image_specified) {
+        if (_flintParams.image_specified)
+        {
             FwOperations::fw_ops_params_t imgFwParams;
             memset(&imgFwParams, 0, sizeof(imgFwParams));
             imgFwParams.psid = NULL;
@@ -569,28 +603,37 @@ FlintStatus SubCommand::openOps(bool ignoreSecurityAttributes, bool ignoreDToc)
             imgFwParams.shortErrors = true;
             imgFwParams.fileHndl = (char*)_flintParams.image.c_str();
             imgFwParams.ignoreCrcCheck = _flintParams.ignore_crc_check;
-            if (!FwOperations::imageDevOperationsCreate(fwParams, imgFwParams, &_fwOps, &_imgOps, ignoreSecurityAttributes, ignoreDToc)) {
+            if (!FwOperations::imageDevOperationsCreate(fwParams, imgFwParams, &_fwOps, &_imgOps,
+                                                        ignoreSecurityAttributes, ignoreDToc))
+            {
                 /*
                  * Error are being handled after
                  */
             }
-        } else {
+        }
+        else
+        {
             _fwOps = FwOperations::FwOperationsCreate(fwParams);
         }
         delete[] fwParams.mstHndl;
     }
-    if (_flintParams.image_specified && !_flintParams.device_specified) {
-        _imgOps = FwOperations::FwOperationsCreate((void*)_flintParams.image.c_str(), NULL, NULL, \
-                                                   FHT_FW_FILE, errBuff, 1024);
+    if (_flintParams.image_specified && !_flintParams.device_specified)
+    {
+        _imgOps =
+          FwOperations::FwOperationsCreate((void*)_flintParams.image.c_str(), NULL, NULL, FHT_FW_FILE, errBuff, 1024);
     }
 
-    if (_flintParams.image_specified && _imgOps == NULL) {
+    if (_flintParams.image_specified && _imgOps == NULL)
+    {
         reportErr(true, FLINT_OPEN_FWOPS_IMAGE_ERROR, _flintParams.image.c_str(), strlen(errBuff) != 0 ? errBuff : "");
         return FLINT_FAILED;
     }
-    if (_flintParams.device_specified && _fwOps == NULL) {
-        if (_flintParams.silent == false) {
-            reportErr(true, FLINT_OPEN_FWOPS_DEVICE_ERROR, _flintParams.device.c_str(), strlen(errBuff) != 0 ? errBuff : "");
+    if (_flintParams.device_specified && _fwOps == NULL)
+    {
+        if (_flintParams.silent == false)
+        {
+            reportErr(true, FLINT_OPEN_FWOPS_DEVICE_ERROR, _flintParams.device.c_str(),
+                      strlen(errBuff) != 0 ? errBuff : "");
         }
         return FLINT_FAILED;
     }
@@ -599,20 +642,26 @@ FlintStatus SubCommand::openOps(bool ignoreSecurityAttributes, bool ignoreDToc)
 
 FlintStatus SubCommand::openIo()
 {
-    //TODO: consider adding a parameter for when image/device will be opened as "readOnly" in the open routine.
-    if (_flintParams.device_specified && _flintParams.image_specified) {
-        //should not arrive here as we verify params at each subcommand.
+    // TODO: consider adding a parameter for when image/device will be opened as "readOnly" in the open routine.
+    if (_flintParams.device_specified && _flintParams.image_specified)
+    {
+        // should not arrive here as we verify params at each subcommand.
         reportErr(true, FLINT_DEVICE_AND_IMAGE_ERROR);
         return FLINT_FAILED;
     }
-    if (_flintParams.device_specified) {
+    if (_flintParams.device_specified)
+    {
         _io = new Flash;
-        if (!((Flash*)_io)->open(_flintParams.device.c_str(), _flintParams.clear_semaphore, false, _flintParams.banks, \
-                                 _flintParams.flash_params_specified ? &_flintParams.flash_params : NULL, _flintParams.override_cache_replacement, true, _flintParams.use_fw)) {
+        if (!((Flash*)_io)
+               ->open(_flintParams.device.c_str(), _flintParams.clear_semaphore, false, _flintParams.banks,
+                      _flintParams.flash_params_specified ? &_flintParams.flash_params : NULL,
+                      _flintParams.override_cache_replacement, true, _flintParams.use_fw))
+        {
             // if we have Hw_Access command we dont fail straght away
             u_int8_t lockedCrSpace = ((Flash*)_io)->get_cr_space_locked();
-            if (lockedCrSpace && (_flintParams.cmd == SC_Hw_Access ||
-                                  (_flintParams.cmd == SC_Set_Key && ((Flash*)_io)->is_fifth_gen()))) {
+            if (lockedCrSpace &&
+                (_flintParams.cmd == SC_Hw_Access || (_flintParams.cmd == SC_Set_Key && ((Flash*)_io)->is_fifth_gen())))
+            {
                 return FLINT_SUCCESS;
             }
             reportErr(true, FLINT_IO_OPEN_ERROR, "Device", (_io)->err());
@@ -621,11 +670,14 @@ FlintStatus SubCommand::openIo()
             return FLINT_FAILED;
         }
         // we have successfully opened a Flash Obj
-        //set no flash verify if needed (default =false)
+        // set no flash verify if needed (default =false)
         ((Flash*)_io)->set_no_flash_verify(_flintParams.no_flash_verify);
-    } else if (_flintParams.image_specified) {
+    }
+    else if (_flintParams.image_specified)
+    {
         _io = new FImage;
-        if (!((FImage*)_io)->open(_flintParams.image.c_str())) {
+        if (!((FImage*)_io)->open(_flintParams.image.c_str()))
+        {
             reportErr(true, FLINT_IO_OPEN_ERROR, "Image", (_io)->err());
             delete _io;
             _io = NULL;
@@ -637,93 +689,115 @@ FlintStatus SubCommand::openIo()
 
 bool SubCommand::basicVerifyParams()
 {
-    if (!_flintParams.log_specified) {
-        char *logFile;
+    if (!_flintParams.log_specified)
+    {
+        char* logFile;
         logFile = getenv(FLINT_LOG_ENV);
-        if (logFile) {
+        if (logFile)
+        {
             _flintParams.log = logFile;
             _flintParams.log_specified = true;
         }
     }
-    //open log if needed
+    // open log if needed
     openLog();
 
-    if (_maxCmdParamNum == _minCmdParamNum && _maxCmdParamNum != -1 && (int)_flintParams.cmd_params.size() != _maxCmdParamNum) {
+    if (_maxCmdParamNum == _minCmdParamNum && _maxCmdParamNum != -1 &&
+        (int)_flintParams.cmd_params.size() != _maxCmdParamNum)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), _maxCmdParamNum, _flintParams.cmd_params.size());
         return false;
-    } else if (_maxCmdParamNum != -1 && (int)_flintParams.cmd_params.size() > _maxCmdParamNum) {
+    }
+    else if (_maxCmdParamNum != -1 && (int)_flintParams.cmd_params.size() > _maxCmdParamNum)
+    {
         // _maxCmdParamNum == -1 means ignore this check
-        if (_maxCmdParamNum) {
+        if (_maxCmdParamNum)
+        {
             reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), _maxCmdParamNum, (int)_flintParams.cmd_params.size());
-        } else {
+        }
+        else
+        {
             reportErr(true, FLINT_CMD_ARGS_ERROR5, _name.c_str());
         }
         return false;
-    } else if (_minCmdParamNum != -1 && (int)_flintParams.cmd_params.size() < _minCmdParamNum) {
+    }
+    else if (_minCmdParamNum != -1 && (int)_flintParams.cmd_params.size() < _minCmdParamNum)
+    {
         // _minCmdParamNum == -1 means ignore this check
         reportErr(true, FLINT_CMD_ARGS_ERROR3, _name.c_str(), _minCmdParamNum, _flintParams.cmd_params.size());
         return false;
     }
 
-    switch (_v) {
-    case Wtv_Img:
-        if (_flintParams.device_specified == true) {
-            _flintParams.image_specified ? reportErr(true, FLINT_COMMAND_IMAGE_ERROR2, _name.c_str()) :
-                reportErr(true, FLINT_COMMAND_IMAGE_ERROR, _name.c_str());
-            return false;
-        }
-        if (_flintParams.image_specified == false) {
-            reportErr(true, FLINT_NO_IMAGE_ERROR);
-            return false;
-        }
-        break;
-
-    case Wtv_Dev:
-        if (_flintParams.image_specified == true) {
-            _flintParams.device_specified ? reportErr(true, FLINT_COMMAND_DEVICE_ERROR2, _name.c_str()) :
-                reportErr(true, FLINT_COMMAND_DEVICE_ERROR, _name.c_str());
-            return false;
-        }
-        if (_flintParams.device_specified == false) {
-            reportErr(true, FLINT_NO_DEVICE_ERROR);
-            return false;
-        }
-        break;
+    switch (_v)
+    {
+        case Wtv_Img:
+            if (_flintParams.device_specified == true)
+            {
+                _flintParams.image_specified ? reportErr(true, FLINT_COMMAND_IMAGE_ERROR2, _name.c_str()) :
+                                               reportErr(true, FLINT_COMMAND_IMAGE_ERROR, _name.c_str());
+                return false;
+            }
+            if (_flintParams.image_specified == false)
+            {
+                reportErr(true, FLINT_NO_IMAGE_ERROR);
+                return false;
+            }
+            break;
 
-    case Wtv_Dev_And_Img:
-        if (_flintParams.linkx_control == false) {
-            if ((_flintParams.image_specified == false) || (_flintParams.device_specified == false)) {
-                reportErr(true, FLINT_COMMAND_DEVICE_IMAGE_ERROR, _name.c_str());
+        case Wtv_Dev:
+            if (_flintParams.image_specified == true)
+            {
+                _flintParams.device_specified ? reportErr(true, FLINT_COMMAND_DEVICE_ERROR2, _name.c_str()) :
+                                                reportErr(true, FLINT_COMMAND_DEVICE_ERROR, _name.c_str());
                 return false;
             }
-        }
-        break;
+            if (_flintParams.device_specified == false)
+            {
+                reportErr(true, FLINT_NO_DEVICE_ERROR);
+                return false;
+            }
+            break;
 
-    case Wtv_Dev_Or_Img:
-        if (_flintParams.image_specified == true && _flintParams.device_specified == true) {
-            reportErr(true, FLINT_DEVICE_AND_IMAGE_ERROR);
-            return false;
-        }
-        if (_flintParams.device_specified == false && _flintParams.image_specified == false) {
-            reportErr(true, FLINT_DEVICE_AND_IMAGE_ERROR);
-            return false;
-        }
-        break;
+        case Wtv_Dev_And_Img:
+            if (_flintParams.linkx_control == false)
+            {
+                if ((_flintParams.image_specified == false) || (_flintParams.device_specified == false))
+                {
+                    reportErr(true, FLINT_COMMAND_DEVICE_IMAGE_ERROR, _name.c_str());
+                    return false;
+                }
+            }
+            break;
 
-    case Wtv_Uninitilized:
+        case Wtv_Dev_Or_Img:
+            if (_flintParams.image_specified == true && _flintParams.device_specified == true)
+            {
+                reportErr(true, FLINT_DEVICE_AND_IMAGE_ERROR);
+                return false;
+            }
+            if (_flintParams.device_specified == false && _flintParams.image_specified == false)
+            {
+                reportErr(true, FLINT_DEVICE_AND_IMAGE_ERROR);
+                return false;
+            }
+            break;
 
-        return true;
-    default:
-        reportErr(true, FAILED_TO_VERIFY_PARAMS);
-        return false;
+        case Wtv_Uninitilized:
+
+            return true;
+        default:
+            reportErr(true, FAILED_TO_VERIFY_PARAMS);
+            return false;
     }
 
-    if (_flintParams.device_specified && _flintParams.striped_image) {
+    if (_flintParams.device_specified && _flintParams.striped_image)
+    {
         reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-device", "-striped_image");
         return false;
     }
 
-    if (_flintParams.override_cache_replacement) {
+    if (_flintParams.override_cache_replacement)
+    {
         printf(FLINT_OCR_WARRNING);
     }
     return true;
@@ -732,32 +806,39 @@ bool SubCommand::basicVerifyParams()
 FlintStatus SubCommand::preFwOps(bool ignoreSecurityAttributes, bool ignoreDToc)
 {
     DPRINTF(("SubCommand::preFwOps\n"));
-    if (!basicVerifyParams()) {
+    if (!basicVerifyParams())
+    {
         return FLINT_FAILED;
     }
-    if (_flintParams.linkx_control != true) {
-        if (!verifyParams()) {
+    if (_flintParams.linkx_control != true)
+    {
+        if (!verifyParams())
+        {
             return FLINT_FAILED;
         }
     }
-    if (_flintParams.mfa2_specified || _flintParams.congestion_control || _flintParams.linkx_control == true) {
+    if (_flintParams.mfa2_specified || _flintParams.congestion_control || _flintParams.linkx_control == true)
+    {
         bool saved_value = _flintParams.image_specified;
         _flintParams.image_specified = false;
         FlintStatus result = openOps(true);
         _flintParams.image_specified = saved_value;
         return result;
     }
-    else {
+    else
+    {
         return openOps(ignoreSecurityAttributes, ignoreDToc);
     }
 }
 
 FlintStatus SubCommand::preFwAccess()
 {
-    if (!basicVerifyParams()) {
+    if (!basicVerifyParams())
+    {
         return FLINT_FAILED;
     }
-    if (!verifyParams()) {
+    if (!verifyParams())
+    {
         return FLINT_FAILED;
     }
     return openIo();
@@ -765,29 +846,31 @@ FlintStatus SubCommand::preFwAccess()
 
 SubCommand::~SubCommand()
 {
-    if (_fwOps != NULL) {
+    if (_fwOps != NULL)
+    {
         _fwOps->FwCleanUp();
         delete _fwOps;
     }
-    if (_imgOps != NULL) {
+    if (_imgOps != NULL)
+    {
         _imgOps->FwCleanUp();
         delete _imgOps;
     }
-    if (_io != NULL) {
+    if (_io != NULL)
+    {
         _io->close();
         delete _io;
     }
-
-
 }
 
 // matanel - TODO: duplicated, use same function from fw_ops.cpp
-bool SubCommand::getRomsInfo(FBase *io, roms_info_t& romsInfo)
+bool SubCommand::getRomsInfo(FBase* io, roms_info_t& romsInfo)
 {
     std::vector<u_int8_t> romSector;
     romSector.clear();
     romSector.resize(io->get_effective_size());
-    if (!io->read(0, &romSector[0], io->get_effective_size())) {
+    if (!io->read(0, &romSector[0], io->get_effective_size()))
+    {
         reportErr(true, FLINT_READ_ERROR, _flintParams.image.c_str(), io->err());
         return false;
     }
@@ -799,13 +882,17 @@ bool SubCommand::getRomsInfo(FBase *io, roms_info_t& romsInfo)
 
 bool SubCommand::getGUIDFromStr(string str, guid_t& guid, string prefixErr)
 {
-    char *endp;
+    char* endp;
     u_int64_t g;
     g = strtoull(str.c_str(), &endp, 16);
-    if (*endp || (g == 0xffffffffffffffffULL && errno == ERANGE)) {
-        if (prefixErr.size() == 0) {
+    if (*endp || (g == 0xffffffffffffffffULL && errno == ERANGE))
+    {
+        if (prefixErr.size() == 0)
+        {
             reportErr(true, INVALID_GUID_SYNTAX, str.c_str(), errno ? strerror(errno) : "");
-        } else {
+        }
+        else
+        {
             reportErr(true, "%s\n", prefixErr.c_str());
         }
         return false;
@@ -815,7 +902,6 @@ bool SubCommand::getGUIDFromStr(string str, guid_t& guid, string prefixErr)
     return true;
 }
 
-
 #if !defined(__WIN__) && !defined(__DJGPP__) && !defined(UEFI_BUILD) && defined(HAVE_TERMIOS_H)
 static int mygetch(void)
 {
@@ -831,24 +917,27 @@ static int mygetch(void)
     return ch;
 }
 
-bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWORD_LEN + 1])
+bool SubCommand::getPasswordFromUser(const char* preStr, char buffer[MAX_PASSWORD_LEN + 1])
 {
     char c;
     int pos = 0;
 
     printf("%s: ", preStr);
-    do {
+    do
+    {
         c = mygetch();
 
-        if (((pos < MAX_PASSWORD_LEN)) && isprint(c)) {
+        if (((pos < MAX_PASSWORD_LEN)) && isprint(c))
+        {
             buffer[pos++] = c;
             printf("%c", '*');
-        } else if ((c == 8 || c == 127) && pos) {
+        }
+        else if ((c == 8 || c == 127) && pos)
+        {
             buffer[pos--] = '\0';
             printf("%s", "\b \b");
         }
 
-
     } while (c != '\n');
     printf("\n");
     buffer[pos] = '\0';
@@ -856,7 +945,7 @@ bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWOR
 }
 
 #else
-bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWORD_LEN + 1])
+bool SubCommand::getPasswordFromUser(const char* preStr, char buffer[MAX_PASSWORD_LEN + 1])
 {
     static HANDLE stdinHndl = NULL;
     DWORD numOfBytesRead = 0;
@@ -865,44 +954,54 @@ bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWOR
     char ch;
     int i;
 
-    if (!stdinHndl) {
+    if (!stdinHndl)
+    {
         // adrianc: this might be problematic if called and stdout was alreading overridden use CIN$ instead
         stdinHndl = GetStdHandle(STD_INPUT_HANDLE);
     }
     printf("%s:", preStr);
 
     // disable console echoing
-    if (!GetConsoleMode(stdinHndl, &oldConsoleMode)) {
+    if (!GetConsoleMode(stdinHndl, &oldConsoleMode))
+    {
         reportErr(true, FAILED_GET_CONSOLE_MODE);
         return false;
     }
 
     consoleMode = oldConsoleMode & ~(ENABLE_LINE_INPUT | ENABLE_ECHO_INPUT);
 
-    if (!SetConsoleMode(stdinHndl, consoleMode)) {
+    if (!SetConsoleMode(stdinHndl, consoleMode))
+    {
         reportErr(true, FAILED_GET_CONSOLE_MODE);
         return 1;
     }
     // read chars from stdin and print * to stdout using putchar
-    for (i = 0;;) {
+    for (i = 0;;)
+    {
         status = ReadFile(stdinHndl, &ch, sizeof(char), &numOfBytesRead, NULL);
-        if (!status || numOfBytesRead != sizeof(char) || ch == '\n' || ch == '\r' || i == (MAX_PASSWORD_LEN - 1)) {
+        if (!status || numOfBytesRead != sizeof(char) || ch == '\n' || ch == '\r' || i == (MAX_PASSWORD_LEN - 1))
+        {
             // user finished giving the pw
-            if (!SetConsoleMode(stdinHndl, oldConsoleMode)) {
+            if (!SetConsoleMode(stdinHndl, oldConsoleMode))
+            {
                 reportErr(true, FAILED_GET_CONSOLE_MODE);
                 return false;
             }
-            if (!status || numOfBytesRead != sizeof(char)) {
+            if (!status || numOfBytesRead != sizeof(char))
+            {
                 reportErr(true, FAILED_GET_CONSOLE_MODE);
                 return false;
             }
             break;
         }
-        if (isalpha(ch) || isdigit(ch)) {
+        if (isalpha(ch) || isdigit(ch))
+        {
             putchar('*');
             buffer[i++] = ch;
-        } else if (ch == '\b' && i) {
-            //delete last astrix and set correct position
+        }
+        else if (ch == '\b' && i)
+        {
+            // delete last astrix and set correct position
             printf("\b \b");
             i--;
         }
@@ -919,19 +1018,25 @@ bool SubCommand::getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWOR
 // Returns true if user chose Y, false if user chose N.
 //
 
-bool SubCommand::askUser(const char *question, bool printAbrtMsg)
+bool SubCommand::askUser(const char* question, bool printAbrtMsg)
 {
-    if (question == NULL) {
+    if (question == NULL)
+    {
         printf("\n Do you want to continue ? (y/n) [n] : ");
-    } else {
+    }
+    else
+    {
         printf("\n %s ? (y/n) [n] : ", question);
-
     }
 
-    if (_flintParams.yes) {
+    if (_flintParams.yes)
+    {
         printf("y\n");
-    } else {
-        if (_flintParams.no) {
+    }
+    else
+    {
+        if (_flintParams.no)
+        {
             printf("n\n");
             reportErr(false, "-no flag is set\n");
             return false;
@@ -940,15 +1045,15 @@ bool SubCommand::askUser(const char *question, bool printAbrtMsg)
         fflush(stdout);
         std::string answer;
         std::getline(std::cin, answer);
-        //fgets(ansbuff, 30, stdin);
-        //if (!fscanf(stdin, "%[^\n]30s", ansbuff)) {
+        // fgets(ansbuff, 30, stdin);
+        // if (!fscanf(stdin, "%[^\n]30s", ansbuff)) {
         //	return false;
         //}
 
-        if (strcasecmp(answer.c_str(), "y") &&
-            strcasecmp(answer.c_str(), "yes")) {
-
-            if (printAbrtMsg) {
+        if (strcasecmp(answer.c_str(), "y") && strcasecmp(answer.c_str(), "yes"))
+        {
+            if (printAbrtMsg)
+            {
                 reportErr(true, USER_ABORT);
             }
             return false;
@@ -961,49 +1066,50 @@ string SubCommand::getRomProtocolStr(u_int8_t proto)
 {
     string result;
 
-    switch (proto) {
-    case ER_IB:
-        result = "IB";
-        break;
+    switch (proto)
+    {
+        case ER_IB:
+            result = "IB";
+            break;
 
-    case ER_ETH:
-        result = "ETH";
-        break;
+        case ER_ETH:
+            result = "ETH";
+            break;
 
-    case ER_VPI:
-        result = "VPI";
-        break;
+        case ER_VPI:
+            result = "VPI";
+            break;
 
-    default:
-        result = "N/A";
+        default:
+            result = "N/A";
     }
     return result;
 }
 
-
 string SubCommand::getRomSuppCpuStr(u_int8_t suppCpu)
 {
     string result;
 
-    switch (suppCpu) {
-    case ERC_AMD64:
-        result = "AMD64";
-        break;
+    switch (suppCpu)
+    {
+        case ERC_AMD64:
+            result = "AMD64";
+            break;
 
-    case ERC_AARCH64:
-        result = "AARCH64";
-        break;
+        case ERC_AARCH64:
+            result = "AARCH64";
+            break;
 
-    case ERC_AMD64_AARCH64:
-        result = "AMD64,AARCH64";
-        break;
+        case ERC_AMD64_AARCH64:
+            result = "AMD64,AARCH64";
+            break;
 
-    case ERC_IA32:
-        result = "IA32";
-        break;
+        case ERC_IA32:
+            result = "IA32";
+            break;
 
-    default:
-        result = "N/A";
+        default:
+            result = "N/A";
     }
     return result;
 }
@@ -1011,10 +1117,13 @@ string SubCommand::getRomSuppCpuStr(u_int8_t suppCpu)
 string SubCommand::getExpRomVerStr(const rom_info_t& info)
 {
     stringstream verStream;
-    if (info.exp_rom_num_ver_fields) {
-        for (int i = 0; i < info.exp_rom_num_ver_fields; i++) {
+    if (info.exp_rom_num_ver_fields)
+    {
+        for (int i = 0; i < info.exp_rom_num_ver_fields; i++)
+        {
             verStream << info.exp_rom_ver[i];
-            if (i + 1 < info.exp_rom_num_ver_fields) {
+            if (i + 1 < info.exp_rom_num_ver_fields)
+            {
                 verStream << ".";
             }
         }
@@ -1024,28 +1133,38 @@ string SubCommand::getExpRomVerStr(const rom_info_t& info)
 
 void SubCommand::displayOneExpRomInfo(const rom_info_t& info)
 {
-    const char *typeStr = FwOperations::expRomType2Str(info.exp_rom_product_id);
-    if (info.exp_rom_product_id == 0xf) {
+    const char* typeStr = FwOperations::expRomType2Str(info.exp_rom_product_id);
+    if (info.exp_rom_product_id == 0xf)
+    {
         // version id in this case is the freeStr that was moved to exp_rom_ver[0] in mlxfwops
         printf("version_id=%s type=%s ", getExpRomVerStr(info).c_str(), typeStr);
-    } else {
-        if (typeStr) {
+    }
+    else
+    {
+        if (typeStr)
+        {
             printf("type=%s ", typeStr);
-        } else {
+        }
+        else
+        {
             printf("0x%x - Unknown ROM product ID\n", info.exp_rom_product_id);
             return;
         }
         printf("version=%s", getExpRomVerStr(info).c_str());
-        if (info.exp_rom_product_id >= 0x10) {
-            if (info.exp_rom_port) {
+        if (info.exp_rom_product_id >= 0x10)
+        {
+            if (info.exp_rom_port)
+            {
                 // Do not display if 0 - port independent
                 printf(" port=%d", info.exp_rom_port);
             }
-            if (info.exp_rom_product_id != 0x12 && info.exp_rom_proto != 0xff) {
+            if (info.exp_rom_product_id != 0x12 && info.exp_rom_proto != 0xff)
+            {
                 // on CLP(0x12) there is no meaning to protocol
                 printf(" proto=%s", getRomProtocolStr(info.exp_rom_proto).c_str());
             }
-            if (info.exp_rom_supp_cpu_arch) {
+            if (info.exp_rom_supp_cpu_arch)
+            {
                 printf(" cpu=%s", getRomSuppCpuStr(info.exp_rom_supp_cpu_arch).c_str());
             }
         }
@@ -1053,38 +1172,48 @@ void SubCommand::displayOneExpRomInfo(const rom_info_t& info)
     return;
 }
 
-
-void SubCommand::displayExpRomInfo(const roms_info_t& romsInfo, const char *preStr)
+void SubCommand::displayExpRomInfo(const roms_info_t& romsInfo, const char* preStr)
 {
     int i;
     int strLen = strlen(preStr);
 
-    if (romsInfo.num_of_exp_rom > 0) {
-        for (i = 0; i < romsInfo.num_of_exp_rom; i++) {
+    if (romsInfo.num_of_exp_rom > 0)
+    {
+        for (i = 0; i < romsInfo.num_of_exp_rom; i++)
+        {
             // Print the pre string or spaces
-            if (i == 0) {
+            if (i == 0)
+            {
                 printf("%s", preStr);
-            } else {
+            }
+            else
+            {
                 int j;
-                for (j = 0; j < strLen; j++) {
+                for (j = 0; j < strLen; j++)
+                {
                     printf("%s", " ");
                 }
             }
             // Display a ROM info
             displayOneExpRomInfo(romsInfo.rom_info[i]);
-            if (i != romsInfo.num_of_exp_rom - 1) {
+            if (i != romsInfo.num_of_exp_rom - 1)
+            {
                 // Don't print new line after the info of the last ROM
                 printf("\n");
             }
         }
-        if (romsInfo.exp_rom_warning) {
+        if (romsInfo.exp_rom_warning)
+        {
             printf(" (-W- %s)", romsInfo.exp_rom_warning_msg);
         }
         printf("\n");
-    } else {
+    }
+    else
+    {
         printf("%s", preStr);
         printf("N/A");
-        if (romsInfo.exp_rom_err_msg_valid) {
+        if (romsInfo.exp_rom_err_msg_valid)
+        {
             printf(" (-E- %s)", romsInfo.exp_rom_err_msg);
         }
         printf("\n");
@@ -1092,52 +1221,68 @@ void SubCommand::displayExpRomInfo(const roms_info_t& romsInfo, const char *preS
     return;
 }
 
-bool SubCommand::printGuidLine(guid_t *new_guids, guid_t *old_guids, int guid_index)
+bool SubCommand::printGuidLine(guid_t* new_guids, guid_t* old_guids, int guid_index)
 {
     printf(GUID_FORMAT GUID_SPACES, new_guids[guid_index].h, new_guids[guid_index].l);
-    if (old_guids != NULL) {
+    if (old_guids != NULL)
+    {
         printf(GUID_FORMAT, old_guids[guid_index].h, old_guids[guid_index].l);
-    } else {
+    }
+    else
+    {
         printf("      N/A");
     }
     printf("\n");
     return true;
 }
 
-bool SubCommand::printMacLine(guid_t *new_guids, guid_t *old_guids, int mac_index)
+bool SubCommand::printMacLine(guid_t* new_guids, guid_t* old_guids, int mac_index)
 {
     printf("    " MAC_FORMAT MAC_SPACES, new_guids[mac_index].h, new_guids[mac_index].l);
-    if (old_guids != NULL) {
+    if (old_guids != NULL)
+    {
         printf(MAC_FORMAT, old_guids[mac_index].h, old_guids[mac_index].l);
-    } else {
+    }
+    else
+    {
         printf("  N/A");
     }
     printf("\n");
     return true;
 }
 
-bool SubCommand::printGUIDsFunc(guid_t guids[GUIDS], guid_t macs[MACS], guid_t old_guids[GUIDS], \
-                                guid_t old_macs[MACS], bool print_guids, bool print_macs, int portNum, bool old_guid_fmt)
+bool SubCommand::printGUIDsFunc(guid_t guids[GUIDS],
+                                guid_t macs[MACS],
+                                guid_t old_guids[GUIDS],
+                                guid_t old_macs[MACS],
+                                bool print_guids,
+                                bool print_macs,
+                                int portNum,
+                                bool old_guid_fmt)
 {
-
-    if (print_guids) {
+    if (print_guids)
+    {
         printf("        Node  GUID:     ");
         printGuidLine(guids, old_guids, 0);
-        if (portNum > 0) {
+        if (portNum > 0)
+        {
             printf("        Port1 GUID:     ");
             printGuidLine(guids, old_guids, 1);
         }
-        if (portNum > 1) {
+        if (portNum > 1)
+        {
             printf("        Port2 GUID:     ");
             printGuidLine(guids, old_guids, 2);
         }
-        if (!old_guid_fmt) {
+        if (!old_guid_fmt)
+        {
             printf("        Sys.Image GUID: ");
             printGuidLine(guids, old_guids, 3);
         }
     }
 
-    if (print_macs) {
+    if (print_macs)
+    {
         printf("        Port1 MAC:      ");
         printMacLine(macs, old_macs, 0);
         printf("        Port2 MAC:      ");
@@ -1146,34 +1291,36 @@ bool SubCommand::printGUIDsFunc(guid_t guids[GUIDS], guid_t macs[MACS], guid_t o
     return true;
 }
 
-bool SubCommand::reportGuidChanges(guid_t *new_guids, guid_t *new_macs, \
-                                   guid_t *old_guids, guid_t *old_macs, bool printGuids, \
-                                   bool printMacs, int guidNum)
+bool SubCommand::reportGuidChanges(guid_t* new_guids,
+                                   guid_t* new_macs,
+                                   guid_t* old_guids,
+                                   guid_t* old_macs,
+                                   bool printGuids,
+                                   bool printMacs,
+                                   int guidNum)
 {
-    //should be used ONLY on FS2 in current implementation
-    printf("    You are about to change the Guids/Macs/Uids on the %s:\n\n", _flintParams.device_specified ? "device" : "image");
+    // should be used ONLY on FS2 in current implementation
+    printf("    You are about to change the Guids/Macs/Uids on the %s:\n\n",
+           _flintParams.device_specified ? "device" : "image");
     printf("                        New Values      " GUID_SPACES "Current Values\n");
-    printGUIDsFunc(new_guids, new_macs,
-                   old_guids, old_macs,
-                   printGuids,
-                   printMacs,
-                   guidNum,
-                   guidNum < GUIDS);
-
-    if (!askUser()) {
+    printGUIDsFunc(new_guids, new_macs, old_guids, old_macs, printGuids, printMacs, guidNum, guidNum < GUIDS);
+
+    if (!askUser())
+    {
         return false;
     }
 
     return true;
 }
 
-//used for dc and dh subcommands
+// used for dc and dh subcommands
 
-bool SubCommand::unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t> &newData, const char *sectionName)
+bool SubCommand::unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t>& newData, const char* sectionName)
 {
 #ifndef NO_ZLIB
     int rc;
-    if (data.empty()) {
+    if (data.empty())
+    {
         reportErr(true, SECTION_NOT_FOUNT, sectionName);
         return false;
     }
@@ -1185,17 +1332,19 @@ bool SubCommand::unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t>
     destLen *= 40; // Assuming this is the best compression ratio
     vector<u_int8_t> dest(destLen);
 
-    for (int i = 0; i < 32; i++) {
-        rc = uncompress((Bytef*)&(dest[0]), &destLen,
-                        (const Bytef*)&(data[0]), data.size());
-        if (rc != Z_BUF_ERROR) {
+    for (int i = 0; i < 32; i++)
+    {
+        rc = uncompress((Bytef*)&(dest[0]), &destLen, (const Bytef*)&(data[0]), data.size());
+        if (rc != Z_BUF_ERROR)
+        {
             break;
         }
         destLen *= 2;
         dest.resize(destLen);
     }
 
-    if (rc != Z_OK) {
+    if (rc != Z_OK)
+    {
         reportErr(true, UNCOMPRESSS_ERROR, rc);
         return false;
     }
@@ -1215,44 +1364,60 @@ bool SubCommand::unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t>
 #endif
 }
 
-bool SubCommand::dumpFile(const char *confFile, std::vector<u_int8_t>& data, const char *sectionName)
+bool SubCommand::dumpFile(const char* confFile, std::vector<u_int8_t>& data, const char* sectionName)
 {
-    FILE *out;
+    FILE* out;
     vector<u_int8_t> dest;
 
-    if (confFile == NULL) {
+    if (confFile == NULL)
+    {
         out = stdout;
-    } else {
+    }
+    else
+    {
         out = fopen(confFile, "w");
 
-        if (out == NULL) {
+        if (out == NULL)
+        {
             reportErr(true, OPEN_WRITE_FILE_ERROR, confFile, strerror(errno));
             return false;
         }
     }
-    if (unzipDataFile(data, dest, sectionName) == false) {
-        if (confFile != NULL) {
+    if (unzipDataFile(data, dest, sectionName) == false)
+    {
+        if (confFile != NULL)
+        {
             fclose(out);
         }
         return false;
     }
     fprintf(out, "%s", (char*)&(dest[0]));
 
-    if (confFile != NULL) {
+    if (confFile != NULL)
+    {
         fclose(out);
     }
     return true;
 }
 
-bool SubCommand::checkGuidsFlags(u_int16_t devType, u_int8_t fwType,
-                                 bool guidsSpecified, bool macsSpecified, bool uidSpecified, bool ibDev, bool ethDev)
+bool SubCommand::checkGuidsFlags(u_int16_t devType,
+                                 u_int8_t fwType,
+                                 bool guidsSpecified,
+                                 bool macsSpecified,
+                                 bool uidSpecified,
+                                 bool ibDev,
+                                 bool ethDev)
 {
     (void)ibDev;
-    if (guidsSpecified || macsSpecified || uidSpecified) {
-        if (uidSpecified && fwType != FIT_FS3 && fwType != FIT_FS4 && fwType != FIT_FSCTRL) {
+    if (guidsSpecified || macsSpecified || uidSpecified)
+    {
+        if (uidSpecified && fwType != FIT_FS3 && fwType != FIT_FS4 && fwType != FIT_FSCTRL)
+        {
             reportErr(true, "-uid flag is applicable only for FS3/FS4 FW Only.\n");
             return false;
-        } else if (fwType != FIT_FS2 && !ethDev && macsSpecified) {
+        }
+        else if (fwType != FIT_FS2 && !ethDev && macsSpecified)
+        {
             reportErr(true, "-mac(s) flag is not applicable for IB MT%d device.\n", devType);
             return false;
         }
@@ -1262,16 +1427,21 @@ bool SubCommand::checkGuidsFlags(u_int16_t devType, u_int8_t fwType,
 
 void SubCommand::printMissingGuidErr(bool ibDev, bool ethDev)
 {
-    const char *missingInfo;
-    const char *missingFlags;
+    const char* missingInfo;
+    const char* missingFlags;
 
-    if (ibDev && ethDev) {
+    if (ibDev && ethDev)
+    {
         missingInfo = "GUIDs / MACs";
         missingFlags = "-guid(s) / -mac(s)";
-    } else if (ibDev) {
+    }
+    else if (ibDev)
+    {
         missingInfo = "GUIDs";
         missingFlags = "-guid(s)";
-    } else {
+    }
+    else
+    {
         missingInfo = "MACs";
         missingFlags = "-mac(s)";
     }
@@ -1285,40 +1455,50 @@ bool SubCommand::extractValuesFromString(string valStr, u_int8_t values[2], stri
     // check if we need to extract 2 values or 1
     u_int32_t tempNum0 = 0, tempNum1 = 0;
     string tempNumStr;
-    if (valStr.find(',') != string::npos) {
+    if (valStr.find(',') != string::npos)
+    {
         std::stringstream ss((valStr.c_str()));
         // get first value
-        if (!std::getline(ss, tempNumStr, ',')) {
+        if (!std::getline(ss, tempNumStr, ','))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, origArg.c_str());
             return false;
         }
-        if (!str2Num(tempNumStr.c_str(), tempNum0)) {
+        if (!str2Num(tempNumStr.c_str(), tempNum0))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, origArg.c_str());
             return false;
         }
         // get second value
-        if (!std::getline(ss, tempNumStr, ',')) {
+        if (!std::getline(ss, tempNumStr, ','))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, origArg.c_str());
             return false;
         }
-        if (!str2Num(tempNumStr.c_str(), tempNum1)) {
+        if (!str2Num(tempNumStr.c_str(), tempNum1))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, origArg.c_str());
             return false;
         }
         // make sure no other tokens are present
-        if (!(!std::getline(ss, tempNumStr, ','))) {
+        if (!(!std::getline(ss, tempNumStr, ',')))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, origArg.c_str());
             return false;
         }
-    } else {
-        if (!str2Num(valStr.c_str(), tempNum0)) {
+    }
+    else
+    {
+        if (!str2Num(valStr.c_str(), tempNum0))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, origArg.c_str());
             return false;
         }
         tempNum1 = tempNum0;
     }
     // perform checks
-    if (tempNum0 >= 255 || tempNum1 >= 255) {
+    if (tempNum0 >= 255 || tempNum1 >= 255)
+    {
         reportErr(true, "Invalid argument values, values should be taken from the range [0..254]\n");
         return false;
     }
@@ -1329,34 +1509,45 @@ bool SubCommand::extractValuesFromString(string valStr, u_int8_t values[2], stri
 
 bool SubCommand::extractUIDArgs(std::vector<string>& cmdArgs, u_int8_t numOfGuids[2], u_int8_t stepSize[2])
 {
-    //extract num_of_guids and step_size from numGuidsStr, stepStr
+    // extract num_of_guids and step_size from numGuidsStr, stepStr
     string tag, valStr;
-    for (std::vector<string>::iterator it = cmdArgs.begin(); it != cmdArgs.end(); it++) {
+    for (std::vector<string>::iterator it = cmdArgs.begin(); it != cmdArgs.end(); it++)
+    {
         std::stringstream ss((it->c_str()));
         // get the tag
-        if (!std::getline(ss, tag, '=')) {
+        if (!std::getline(ss, tag, '='))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, it->c_str());
             return false;
         }
         // get the val
-        if (!std::getline(ss, valStr, '=')) {
+        if (!std::getline(ss, valStr, '='))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, it->c_str());
             return false;
         }
         // make sure no other tokens are present
-        if (!(!std::getline(ss, valStr, '='))) {
+        if (!(!std::getline(ss, valStr, '=')))
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, it->c_str());
             return false;
         }
-        if (tag == "guids_num") {
-            if (!extractValuesFromString(valStr, numOfGuids, *it)) {
+        if (tag == "guids_num")
+        {
+            if (!extractValuesFromString(valStr, numOfGuids, *it))
+            {
                 return false;
             }
-        } else if (tag == "step_size") {
-            if (!extractValuesFromString(valStr, stepSize, *it)) {
+        }
+        else if (tag == "step_size")
+        {
+            if (!extractValuesFromString(valStr, stepSize, *it))
+            {
                 return false;
             }
-        } else {
+        }
+        else
+        {
             reportErr(true, FLINT_INVALID_ARG_ERROR, it->c_str());
             return false;
         }
@@ -1366,26 +1557,27 @@ bool SubCommand::extractUIDArgs(std::vector<string>& cmdArgs, u_int8_t numOfGuid
 
 const char* SubCommand::fwImgTypeToStr(u_int8_t fwImgType)
 {
-    switch (fwImgType) {
-    case FIT_FS2:
-        return "FS2";
-        break;
+    switch (fwImgType)
+    {
+        case FIT_FS2:
+            return "FS2";
+            break;
 
-    case FIT_FS3:
-        return "FS3";
-        break;
+        case FIT_FS3:
+            return "FS3";
+            break;
 
-    case FIT_FS4:
-        return "FS4";
-        break;
+        case FIT_FS4:
+            return "FS4";
+            break;
 
-    case FIT_FSCTRL:
-        return "FSCTRL";
-        break;
+        case FIT_FSCTRL:
+            return "FSCTRL";
+            break;
 
-    default:
-        return "Unknown";
-        break;
+        default:
+            return "Unknown";
+            break;
     }
 }
 
@@ -1409,30 +1601,31 @@ Extract4MBImageSubCommand::Extract4MBImageSubCommand()
     _cmdType = SC_Extract_4MB_Image;
 }
 
-Extract4MBImageSubCommand::~Extract4MBImageSubCommand()
-{
-
-}
+Extract4MBImageSubCommand::~Extract4MBImageSubCommand() {}
 
 FlintStatus Extract4MBImageSubCommand::executeCommand()
 {
     vector<u_int8_t> img;
 
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
 
-    if (_imgOps->FwType() == FIT_FS2) {
+    if (_imgOps->FwType() == FIT_FS2)
+    {
         reportErr(true, "Extracting FW Data is applicable only for FS3/FS4 FW.\n");
         return FLINT_FAILED;
     }
 
-    if (!_imgOps->FwExtract4MBImage(img, true)) {
+    if (!_imgOps->FwExtract4MBImage(img, true))
+    {
         reportErr(true, "Extracting FW Data failed: %s.\n", _imgOps->err());
         return FLINT_FAILED;
     }
 
-    if (!writeToFile(_flintParams.cmd_params[0], img)) {
+    if (!writeToFile(_flintParams.cmd_params[0], img))
+    {
         return FLINT_FAILED;
     }
 
@@ -1456,22 +1649,22 @@ AddHmacSubCommand::AddHmacSubCommand()
     _cmdType = SC_Add_Hmac;
 }
 
-AddHmacSubCommand:: ~AddHmacSubCommand()
-{
-
-}
+AddHmacSubCommand::~AddHmacSubCommand() {}
 
 FlintStatus AddHmacSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (_imgOps->FwType() != FIT_FS4) {
+    if (_imgOps->FwType() != FIT_FS4)
+    {
         reportErr(true, "Signing with HMAC is applicable only for FS4 FW.\n");
         return FLINT_FAILED;
     }
 
-    if (!_imgOps->FwSignWithHmac(_flintParams.key.c_str())) {
+    if (!_imgOps->FwSignWithHmac(_flintParams.key.c_str()))
+    {
         reportErr(true, FLINT_HMAC_ERROR, _imgOps->err());
         return FLINT_FAILED;
     }
@@ -1480,22 +1673,23 @@ FlintStatus AddHmacSubCommand::executeCommand()
 
 bool AddHmacSubCommand::verifyParams()
 {
-    if (!_flintParams.key_specified) {
+    if (!_flintParams.key_specified)
+    {
         reportErr(true, "To sign with HMAC, you must provide a key \n");
         return false;
     }
 
-    if (_flintParams.cmd_params.size() > 0) {
-        reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1,
-                  (int)_flintParams.cmd_params.size());
+    if (_flintParams.cmd_params.size() > 0)
+    {
+        reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
     return true;
 }
 
 /***********************
-* Class: SignSubCommand
-***********************/
+ * Class: SignSubCommand
+ ***********************/
 SignSubCommand::SignSubCommand()
 {
     _name = "sign";
@@ -1504,55 +1698,60 @@ SignSubCommand::SignSubCommand()
     _flagLong = "sign";
     _flagShort = "";
     _paramExp = "None";
-    _example = FLINT_NAME " -i fw_image.bin [--private_key file.pem --key_uuid uuid_string] OR [--openssl_engine engine --openssl_key_id identifier --key_uuid uuid_string] sign";
+    _example = FLINT_NAME
+      " -i fw_image.bin [--private_key file.pem --key_uuid uuid_string] OR [--openssl_engine engine --openssl_key_id identifier --key_uuid uuid_string] sign";
     _v = Wtv_Img;
     _maxCmdParamNum = 0;
     _cmdType = SC_Sign;
 }
 
-SignSubCommand:: ~SignSubCommand()
-{
-
-}
+SignSubCommand::~SignSubCommand() {}
 
 FlintStatus SignSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (_imgOps->FwType() != FIT_FS3 && _imgOps->FwType() != FIT_FS4) {
+    if (_imgOps->FwType() != FIT_FS3 && _imgOps->FwType() != FIT_FS4)
+    {
         reportErr(true, IMAGE_SIGN_TYPE_ERROR);
         return FLINT_FAILED;
     }
-    if (_flintParams.openssl_engine_usage_specified) {
+    if (_flintParams.openssl_engine_usage_specified)
+    {
 #if !defined(NO_OPEN_SSL) && !defined(NO_DYNAMIC_ENGINE)
         MlxSign::OpensslEngineSigner engineSigner(_flintParams.openssl_engine, _flintParams.openssl_key_id);
         int rc = engineSigner.init();
-        if (rc) {
+        if (rc)
+        {
             reportErr(true, "Failed to initialize %s engine (rc = 0x%x)\n", _flintParams.openssl_engine.c_str(), rc);
             return FLINT_FAILED;
         }
 
-        //flint sign over openssl only allow for 4K key size
+        // flint sign over openssl only allow for 4K key size
         int keySize = engineSigner.getPrivateKeySize();
-        if( keySize != KEY_SIZE_512 ) {
+        if (keySize != KEY_SIZE_512)
+        {
             reportErr(true, "The HSM key has to be 4096 bit!\n");
             return FLINT_FAILED;
         }
         vector<u_int8_t> fourMbImage;
         vector<u_int8_t> signature;
         vector<u_int8_t> sha;
-        if (!_imgOps->FwCalcSHA(MlxSign::SHA512, sha, fourMbImage)) {
+        if (!_imgOps->FwCalcSHA(MlxSign::SHA512, sha, fourMbImage))
+        {
             reportErr(true, FLINT_IMAGE_READ_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
         rc = engineSigner.sign(fourMbImage, signature);
-        if (rc) {
+        if (rc)
+        {
             reportErr(true, "Failed to set private key from engine (rc = 0x%x)\n", rc);
             return FLINT_FAILED;
         }
-        if (!_imgOps->InsertSecureFWSignature(signature, _flintParams.privkey_uuid.c_str(),
-            &verifyCbFunc)) {
+        if (!_imgOps->InsertSecureFWSignature(signature, _flintParams.privkey_uuid.c_str(), &verifyCbFunc))
+        {
             reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
@@ -1562,34 +1761,42 @@ FlintStatus SignSubCommand::executeCommand()
         return FLINT_FAILED;
 #endif
     }
-    if (_flintParams.hsm_specified) {
+    if (_flintParams.hsm_specified)
+    {
         // Luna HSM not supported
         reportErr(true, FLINT_NO_HSM);
         return FLINT_FAILED;
     }
-    else {
-        if (_flintParams.privkey_specified && _flintParams.uuid_specified) {
-            if (_flintParams.privkey2_specified && _flintParams.uuid2_specified) {
+    else
+    {
+        if (_flintParams.privkey_specified && _flintParams.uuid_specified)
+        {
+            if (_flintParams.privkey2_specified && _flintParams.uuid2_specified)
+            {
                 if (!_imgOps->FwSignWithTwoRSAKeys(_flintParams.privkey_file.c_str(),
-                    _flintParams.privkey_uuid.c_str(),
-                    _flintParams.privkey2_file.c_str(),
-                    _flintParams.privkey2_uuid.c_str(),
-                    &verifyCbFunc)) {
+                                                   _flintParams.privkey_uuid.c_str(),
+                                                   _flintParams.privkey2_file.c_str(),
+                                                   _flintParams.privkey2_uuid.c_str(),
+                                                   &verifyCbFunc))
+                {
                     reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
                     return FLINT_FAILED;
                 }
             }
-            else {
-                if (!_imgOps->signForFwUpdate(_flintParams.privkey_file.c_str(),
-                    _flintParams.privkey_uuid.c_str(),
-                    &verifyCbFunc)) {
+            else
+            {
+                if (!_imgOps->signForFwUpdate(_flintParams.privkey_file.c_str(), _flintParams.privkey_uuid.c_str(),
+                                              &verifyCbFunc))
+                {
                     reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
                     return FLINT_FAILED;
                 }
             }
         }
-        else {
-            if (!_imgOps->FwInsertSHA256(&verifyCbFunc)) {
+        else
+        {
+            if (!_imgOps->FwInsertSHA256(&verifyCbFunc))
+            {
                 reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
                 return FLINT_FAILED;
             }
@@ -1600,59 +1807,74 @@ FlintStatus SignSubCommand::executeCommand()
 
 bool SignSubCommand::verifyParams()
 {
-    if (_flintParams.openssl_engine_usage_specified) {
-        if (_flintParams.privkey_uuid.empty()) {
+    if (_flintParams.openssl_engine_usage_specified)
+    {
+        if (_flintParams.privkey_uuid.empty())
+        {
             reportErr(true, "To Sign the image with OpenSSL you must provide UUID string.\n");
             return false;
         }
-        if (_flintParams.openssl_engine.empty() || _flintParams.openssl_key_id.empty()) {
+        if (_flintParams.openssl_engine.empty() || _flintParams.openssl_key_id.empty())
+        {
             reportErr(true, "To Sign the image with OpenSSL you must provide the engine and the key identifier.\n");
             return false;
         }
-        if (_flintParams.openssl_key_id.find("type=public", 0) != std::string::npos) {
+        if (_flintParams.openssl_key_id.find("type=public", 0) != std::string::npos)
+        {
             reportErr(true, "The Sign command with --openssl_key_id flag does not accept public keys\n");
-                return false;
+            return false;
         }
-        if (_flintParams.privkey_specified) {
-            reportErr(true, "The Sign command does not accept --private_key flag with the following flags: --openssl_engine, --openssl_key_id\n");
+        if (_flintParams.privkey_specified)
+        {
+            reportErr(
+              true,
+              "The Sign command does not accept --private_key flag with the following flags: --openssl_engine, --openssl_key_id\n");
             return false;
         }
     }
-    else if (_flintParams.hsm_specified) {
-        if (_flintParams.uuid_specified == false) {
+    else if (_flintParams.hsm_specified)
+    {
+        if (_flintParams.uuid_specified == false)
+        {
             reportErr(true, HSM_UUID_MISSING);
             return false;
         }
-        if (_flintParams.private_key_label_specified == false) {
+        if (_flintParams.private_key_label_specified == false)
+        {
             reportErr(true, HSM_PRIVATE_KEY_LABEL_MISSING);
             return false;
         }
-        if (_flintParams.hsm_password_specified == false) {
+        if (_flintParams.hsm_password_specified == false)
+        {
             reportErr(true, HSM_PASSWORD_MISSING);
             return false;
         }
     }
-    else {
-        if (_flintParams.privkey_specified ^ _flintParams.uuid_specified) {
+    else
+    {
+        if (_flintParams.privkey_specified ^ _flintParams.uuid_specified)
+        {
             reportErr(true, "To Sign the image with RSA you must provide "
-                "private key and uuid.\n");
+                            "private key and uuid.\n");
             return false;
         }
 
-        if (!_flintParams.privkey_specified && _flintParams.privkey2_specified) {
+        if (!_flintParams.privkey_specified && _flintParams.privkey2_specified)
+        {
             reportErr(true, "Use --private_key if you want to sign with only one key.\n");
             return false;
         }
 
-        if (_flintParams.privkey2_specified ^ _flintParams.uuid2_specified) {
+        if (_flintParams.privkey2_specified ^ _flintParams.uuid2_specified)
+        {
             reportErr(true, "To Sign the image with two RSA keys you must provide "
-                "two private keys and two uuid.\n");
+                            "two private keys and two uuid.\n");
             return false;
         }
 
-        if (_flintParams.cmd_params.size() > 0) {
-            reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1,
-                (int)_flintParams.cmd_params.size());
+        if (_flintParams.cmd_params.size() > 0)
+        {
+            reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
             return false;
         }
     }
@@ -1665,7 +1887,8 @@ bool SignSubCommand::verifyParams()
 BinaryCompareSubCommand::BinaryCompareSubCommand()
 {
     _name = "Binary compare";
-    _desc = "Binary compare between device firmware and given BIN file. If there is a silent mode, no progress is displayed.";
+    _desc =
+      "Binary compare between device firmware and given BIN file. If there is a silent mode, no progress is displayed.";
     _extendedDesc = _desc;
     _flagLong = "binary_compare";
     _flagShort = "bc";
@@ -1682,10 +1905,11 @@ BinaryCompareSubCommand::BinaryCompareSubCommand()
     _unknownProgress = 0;
 }
 
-BinaryCompareSubCommand:: ~BinaryCompareSubCommand()
+BinaryCompareSubCommand::~BinaryCompareSubCommand()
 {
 #ifndef NO_MSTARCHIVE
-    if (_mfa2Pkg != NULL) {
+    if (_mfa2Pkg != NULL)
+    {
         delete _mfa2Pkg;
     }
 #endif
@@ -1693,14 +1917,18 @@ BinaryCompareSubCommand:: ~BinaryCompareSubCommand()
 
 bool BinaryCompareSubCommand::verifyParams()
 {
-    if (_flintParams.num_of_args == 2) {
+    if (_flintParams.num_of_args == 2)
+    {
         return true;
     }
-    else if (_flintParams.num_of_args == 3 && _flintParams.silent == true) {
+    else if (_flintParams.num_of_args == 3 && _flintParams.silent == true)
+    {
         return true;
     }
-    else {
-        fprintf(stdout, "The binary comparison command doesn't accept any flags, except device, image and silent mode.\n");
+    else
+    {
+        fprintf(stdout,
+                "The binary comparison command doesn't accept any flags, except device, image and silent mode.\n");
         return false;
     }
 }
@@ -1708,50 +1936,60 @@ bool BinaryCompareSubCommand::verifyParams()
 FlintStatus BinaryCompareSubCommand::compareMFA2()
 {
 #ifndef NO_MSTARCHIVE
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    mfile *mf = _fwOps->getMfileObj();
+    mfile* mf = _fwOps->getMfileObj();
     int is_livefish_mode = dm_is_livefish_mode(mf);
-    if (is_livefish_mode == 1) {
+    if (is_livefish_mode == 1)
+    {
         _flintParams.override_cache_replacement = true;
     }
-    if (!_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false))) {
+    if (!_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false)))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(), _fwOps->err());
         return FLINT_FAILED;
     }
     vector<u_int8_t> componentBuffer;
-    map_string_to_component matchingComponentsMap = _mfa2Pkg->getMatchingComponents(
-        (char*)_devInfo.fw_info.psid, _devInfo.fw_info.fw_ver);
+    map_string_to_component matchingComponentsMap =
+      _mfa2Pkg->getMatchingComponents((char*)_devInfo.fw_info.psid, _devInfo.fw_info.fw_ver);
     u_int32_t matchingSize = matchingComponentsMap.size();
-    if (matchingSize == 0) {
-        printf("\33[2K\r");//clear the current line
+    if (matchingSize == 0)
+    {
+        printf("\33[2K\r"); // clear the current line
         reportErr(true, "CompareMFA2 : No matching component found for device.\n");
         return FLINT_FAILED;
     }
     std::vector<u_int8_t> imgBuffInFile;
-    if (!_fwOps->FwExtract4MBImage(imgBuffInFile, true, (_flintParams.silent == false), true)) {
+    if (!_fwOps->FwExtract4MBImage(imgBuffInFile, true, (_flintParams.silent == false), true))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
-    for (u_int32_t choice = 0; choice < matchingSize; choice++) {
-        if (_mfa2Pkg->unzipComponent(matchingComponentsMap, choice, componentBuffer) == false) {
+    for (u_int32_t choice = 0; choice < matchingSize; choice++)
+    {
+        if (_mfa2Pkg->unzipComponent(matchingComponentsMap, choice, componentBuffer) == false)
+        {
             reportErr(true, "CompareMFA2 : Error occurred while extracting MFA2\n");
             return FLINT_FAILED;
         }
         unsigned int i = 0;
-        for (; i < imgBuffInFile.size(); i++) {
-            if (componentBuffer[i] != imgBuffInFile[i]) {
+        for (; i < imgBuffInFile.size(); i++)
+        {
+            if (componentBuffer[i] != imgBuffInFile[i])
+            {
                 break;
             }
         }
-        if (i == imgBuffInFile.size()) {
-            printf("\33[2K\r");//clear the current line
+        if (i == imgBuffInFile.size())
+        {
+            printf("\33[2K\r"); // clear the current line
             printf("Binary comparison success.\n");
             return FLINT_SUCCESS;
         }
     }
-    printf("\33[2K\r");//clear the current line
+    printf("\33[2K\r"); // clear the current line
     reportErr(true, "Binary comparison failed.\n");
     return FLINT_FAILED;
 #else
@@ -1765,7 +2003,8 @@ FlintStatus BinaryCompareSubCommand::executeCommand()
 #ifndef NO_MSTARCHIVE
     string mfa2file = _flintParams.image;
     _mfa2Pkg = MFA2::LoadMFA2Package(mfa2file);
-    if (_mfa2Pkg != NULL) {
+    if (_mfa2Pkg != NULL)
+    {
         _flintParams.mfa2_specified = true;
         return compareMFA2();
     }
@@ -1776,83 +2015,95 @@ FlintStatus BinaryCompareSubCommand::executeCommand()
     vector<u_int8_t> image_critical;
     vector<u_int8_t> image_non_critical;
 
-    if (preFwOps() == FLINT_FAILED) {
-        if (_imgOps) {
+    if (preFwOps() == FLINT_FAILED)
+    {
+        if (_imgOps)
+        {
             const char* errMessage = _imgOps->err();
-            if (errMessage != NULL && strlen(errMessage) > 0) {
+            if (errMessage != NULL && strlen(errMessage) > 0)
+            {
                 reportErr(true, "Error occurred while executing flint initialization : %s\n", errMessage);
             }
         }
         return FLINT_FAILED;
     }
-    mfile *mf = _fwOps->getMfileObj();
+    mfile* mf = _fwOps->getMfileObj();
     int is_livefish_mode = dm_is_livefish_mode(mf);
-    if (is_livefish_mode == 1) {
+    if (is_livefish_mode == 1)
+    {
         _flintParams.override_cache_replacement = true;
     }
     _fwType = _fwOps->FwType();
     // query both image and device
-    if (!_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false))) {
+    if (!_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false)))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(), _fwOps->err());
         return FLINT_FAILED;
     }
 
-    if (!_imgOps->FwQuery(&_imgInfo)) {
+    if (!_imgOps->FwQuery(&_imgInfo))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Image", _flintParams.image.c_str(), _imgOps->err());
         return FLINT_FAILED;
     }
 
-    if (strcmp((char*)_imgInfo.fw_info.psid, (char*)_devInfo.fw_info.psid)) {
-        printf("\33[2K\r");//clear the current line
+    if (strcmp((char*)_imgInfo.fw_info.psid, (char*)_devInfo.fw_info.psid))
+    {
+        printf("\33[2K\r"); // clear the current line
         reportErr(true, "Binary comparison failed - PSID mismatch.\n");
         return FLINT_FAILED;
     }
     FwVersion img_version = FwOperations::createFwVersion(&_imgInfo.fw_info);
     FwVersion dev_version = FwOperations::createFwVersion(&_devInfo.fw_info);
-    if (img_version != dev_version) {
-        printf("\33[2K\r"); //clear the current line
+    if (img_version != dev_version)
+    {
+        printf("\33[2K\r"); // clear the current line
         reportErr(true, "Binary comparison failed - versions mismatch.\n");
         return FLINT_FAILED;
     }
 
     u_int32_t imgSize = 0;
-    //on first call we get the image size
-    if (!_fwOps->FwReadData(NULL, &imgSize)) {
+    // on first call we get the image size
+    if (!_fwOps->FwReadData(NULL, &imgSize))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
     std::vector<u_int8_t> imgBuffOnDevice(imgSize);
-    //on second call we fill it
-    if (!_fwOps->FwReadData((void*)(&imgBuffOnDevice[0]), &imgSize, _flintParams.silent == false)) {
+    // on second call we fill it
+    if (!_fwOps->FwReadData((void*)(&imgBuffOnDevice[0]), &imgSize, _flintParams.silent == false))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
 
     std::vector<u_int8_t> imgBuffInFile;
-    if (!_imgOps->FwExtract4MBImage(imgBuffInFile, false, (_flintParams.silent == false))) {
+    if (!_imgOps->FwExtract4MBImage(imgBuffInFile, false, (_flintParams.silent == false)))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, _imgOps->err());
         return FLINT_FAILED;
     }
     _imgOps->PrepItocSectionsForCompare(image_critical, image_non_critical);
     _fwOps->PrepItocSectionsForCompare(device_critical, device_non_critical);
 
-    if (image_critical != device_critical) {
+    if (image_critical != device_critical)
+    {
         reportErr(true, "Binary comparison failed - binary mismatch.\n");
         return FLINT_FAILED;
     }
-    if (image_non_critical != device_non_critical) {
+    if (image_non_critical != device_non_critical)
+    {
         reportErr(true, "Binary comparison failed - binary mismatch.\n");
         return FLINT_FAILED;
     }
-    printf("\33[2K\r");//clear the current line
+    printf("\33[2K\r"); // clear the current line
     printf("Binary comparison success.\n");
     return FLINT_SUCCESS;
 }
 
-
 /***********************
-* Class: SignRSASubCommand
-***********************/
+ * Class: SignRSASubCommand
+ ***********************/
 SignRSASubCommand::SignRSASubCommand()
 {
     _name = "rsa_sign";
@@ -1861,56 +2112,62 @@ SignRSASubCommand::SignRSASubCommand()
     _flagLong = "rsa_sign";
     _flagShort = "";
     _paramExp = "None";
-    _example = FLINT_NAME " -i fw_image.bin [--private_key file.pem] OR [--private_key_label <label> --user_password <password> --hsm] --public_key file.pub --key_uuid <uuid_string> rsa_sign";
+    _example = FLINT_NAME
+      " -i fw_image.bin [--private_key file.pem] OR [--private_key_label <label> --user_password <password> --hsm] --public_key file.pub --key_uuid <uuid_string> rsa_sign";
     _v = Wtv_Img;
     _maxCmdParamNum = 0;
     _cmdType = SC_RSA_Sign;
 }
 
-SignRSASubCommand:: ~SignRSASubCommand()
-{
-
-}
+SignRSASubCommand::~SignRSASubCommand() {}
 
 FlintStatus SignRSASubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (_imgOps->FwType() != FIT_FS4) {
+    if (_imgOps->FwType() != FIT_FS4)
+    {
         reportErr(true, IMAGE_SIGN_TYPE_ERROR);
         return FLINT_FAILED;
     }
 
-    if (_flintParams.openssl_engine_usage_specified) {
+    if (_flintParams.openssl_engine_usage_specified)
+    {
 #if !defined(NO_OPEN_SSL) && !defined(NO_DYNAMIC_ENGINE)
         //* Init openssl engine for signing
         MlxSign::OpensslEngineSigner engineSigner(_flintParams.openssl_engine, _flintParams.openssl_key_id);
         int rc = engineSigner.init();
-        if (rc) {
+        if (rc)
+        {
             reportErr(true, "Failed to initialize %s engine (rc = 0x%x)\n", _flintParams.openssl_engine.c_str(), rc);
             return FLINT_FAILED;
         }
         int keySize = engineSigner.getPrivateKeySize();
-        if( keySize != KEY_SIZE_512 ) {
+        if (keySize != KEY_SIZE_512)
+        {
             reportErr(true, "The HSM key has to be 4096 bit!\n");
             return FLINT_FAILED;
         }
 
         //* Sign for secure-boot
-        if (!_imgOps->signForSecureBootUsingHSM(_flintParams.pubkey_file.c_str(), _flintParams.privkey_uuid.c_str(), engineSigner)) {
+        if (!_imgOps->signForSecureBootUsingHSM(_flintParams.pubkey_file.c_str(), _flintParams.privkey_uuid.c_str(),
+                                                engineSigner))
+        {
             reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
 
         //* Sign for FW update
-        if (!_imgOps->signForFwUpdateUsingHSM(_flintParams.privkey_uuid.c_str(), engineSigner, &verifyCbFunc)) {
+        if (!_imgOps->signForFwUpdateUsingHSM(_flintParams.privkey_uuid.c_str(), engineSigner, &verifyCbFunc))
+        {
             reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
 
         //* Fill image_signature section with 0xff
-        vector <u_int8_t> signature256Data(CX4FW_IMAGE_SIGNATURE_256_SIZE, 0xff);
+        vector<u_int8_t> signature256Data(CX4FW_IMAGE_SIGNATURE_256_SIZE, 0xff);
         _imgOps->UpdateSection(signature256Data.data(), FS3_IMAGE_SIGNATURE_256, true, CMD_SET_SIGNATURE, NULL);
         return FLINT_SUCCESS;
 #else
@@ -1919,40 +2176,46 @@ FlintStatus SignRSASubCommand::executeCommand()
 #endif
     }
 
-    if (!_flintParams.hsm_specified) { //While working via HSM we don't need a private key, only public key
-        if (!is_file_exists(_flintParams.privkey_file.c_str())) {
+    if (!_flintParams.hsm_specified)
+    { // While working via HSM we don't need a private key, only public key
+        if (!is_file_exists(_flintParams.privkey_file.c_str()))
+        {
             reportErr(true, SIGN_PRIVATE_KEY_NOT_FOUND, _flintParams.privkey_file.c_str());
             return FLINT_FAILED;
         }
     }
-    if (!is_file_exists(_flintParams.pubkey_file.c_str())) { 
-        reportErr(true, SIGN_PUBLIC_KEY_NOT_FOUND , _flintParams.pubkey_file.c_str());
+    if (!is_file_exists(_flintParams.pubkey_file.c_str()))
+    {
+        reportErr(true, SIGN_PUBLIC_KEY_NOT_FOUND, _flintParams.pubkey_file.c_str());
         return FLINT_FAILED;
     }
 
-
-    if (_flintParams.hsm_specified) {
+    if (_flintParams.hsm_specified)
+    {
         // Luna HSM not supported
         reportErr(true, FLINT_NO_HSM);
         return FLINT_FAILED;
     }
-    else {
+    else
+    {
         //* Sign for secure-boot
-        if (!_imgOps->signForSecureBoot(_flintParams.privkey_file.c_str(), _flintParams.pubkey_file.c_str(), _flintParams.privkey_uuid.c_str())) {
+        if (!_imgOps->signForSecureBoot(_flintParams.privkey_file.c_str(), _flintParams.pubkey_file.c_str(),
+                                        _flintParams.privkey_uuid.c_str()))
+        {
             reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
 
         //* Sign for FW update
-        if (!_imgOps->signForFwUpdate(_flintParams.privkey_file.c_str(),
-            _flintParams.privkey_uuid.c_str(),
-            &verifyCbFunc)) {
+        if (!_imgOps->signForFwUpdate(_flintParams.privkey_file.c_str(), _flintParams.privkey_uuid.c_str(),
+                                      &verifyCbFunc))
+        {
             reportErr(true, FLINT_SIGN_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
 
         //* Fill image_signature section with 0xff
-        vector <u_int8_t> signature256Data(CX4FW_IMAGE_SIGNATURE_256_SIZE, 0xff);
+        vector<u_int8_t> signature256Data(CX4FW_IMAGE_SIGNATURE_256_SIZE, 0xff);
         _imgOps->UpdateSection(signature256Data.data(), FS3_IMAGE_SIGNATURE_256, true, CMD_SET_SIGNATURE, NULL);
         return FLINT_SUCCESS;
     }
@@ -1960,51 +2223,61 @@ FlintStatus SignRSASubCommand::executeCommand()
 
 bool SignRSASubCommand::verifyParams()
 {
-    if (_flintParams.openssl_engine_usage_specified) {
-        if (!_flintParams.pubkey_specified) {
+    if (_flintParams.openssl_engine_usage_specified)
+    {
+        if (!_flintParams.pubkey_specified)
+        {
             reportErr(true, "To create secure boot signature with OpenSSL you must provide public key.\n");
             return false;
         }
-        if (_flintParams.privkey_uuid.empty()) {
+        if (_flintParams.privkey_uuid.empty())
+        {
             reportErr(true, "To create secure boot signature with OpenSSL you must provide uuid string.\n");
             return false;
         }
-        if (_flintParams.openssl_engine.empty() || _flintParams.openssl_key_id.empty()) {
+        if (_flintParams.openssl_engine.empty() || _flintParams.openssl_key_id.empty())
+        {
             reportErr(true, "To Sign the image with OpenSSL you must provide the engine and the key identifier.\n");
             return false;
         }
-        if (_flintParams.openssl_key_id.find("type=public", 0) != std::string::npos) {
+        if (_flintParams.openssl_key_id.find("type=public", 0) != std::string::npos)
+        {
             reportErr(true, "The rsa_sign command with --openssl_key_id flag does not accept public keys\n");
-                return false;
+            return false;
         }
-        if (_flintParams.privkey_specified) {
-            reportErr(true, "The Sign command does not accept --private_key flag with the following flags: --openssl_engine, --openssl_key_id\n");
+        if (_flintParams.privkey_specified)
+        {
+            reportErr(
+              true,
+              "The Sign command does not accept --private_key flag with the following flags: --openssl_engine, --openssl_key_id\n");
             return false;
         }
         return true;
     }
-    if (!_flintParams.hsm_specified && !_flintParams.privkey_specified) {
+    if (!_flintParams.hsm_specified && !_flintParams.privkey_specified)
+    {
         reportErr(true, "To Sign the image with RSA you must provide private key.\n");
         return false;
     }
-    if (!_flintParams.pubkey_specified) {
+    if (!_flintParams.pubkey_specified)
+    {
         reportErr(true, "To Sign the image with RSA you must provide public key.\n");
         return false;
     }
-    if (!_flintParams.uuid_specified) {
+    if (!_flintParams.uuid_specified)
+    {
         reportErr(true, "To Sign the image with RSA you must provide uuid string.\n");
         return false;
     }
 
-    if (_flintParams.cmd_params.size() > 0) {
-        reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1,
-            (int)_flintParams.cmd_params.size());
+    if (_flintParams.cmd_params.size() > 0)
+    {
+        reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
     return true;
 }
 
-
 /***********************
  * Class: BurnSubCommand
  **********************/
@@ -2019,8 +2292,8 @@ BurnSubCommand::BurnSubCommand()
     _flagShort = "b";
     _param = "[-ir]";
     _paramExp = "If supplied, perform image reactivation before burning.";
-    _example = FLINT_NAME " -d " MST_DEV_EXAMPLE1 " -i image1.bin -ir burn\n"
-               FLINT_NAME " -d " MST_DEV_EXAMPLE2 " -guid 0x2c9000100d050 -i image1.bin b";
+    _example = FLINT_NAME " -d " MST_DEV_EXAMPLE1 " -i image1.bin -ir burn\n" FLINT_NAME " -d " MST_DEV_EXAMPLE2
+                          " -guid 0x2c9000100d050 -i image1.bin b";
     _v = Wtv_Dev_And_Img;
     _maxCmdParamNum = 1;
     _cmdType = SC_Burn;
@@ -2033,17 +2306,20 @@ BurnSubCommand::BurnSubCommand()
     fwCompsAccess = NULL;
 }
 
-BurnSubCommand:: ~BurnSubCommand()
+BurnSubCommand::~BurnSubCommand()
 {
     closeLog();
-    if (fwCompsAccess != NULL) {
+    if (fwCompsAccess != NULL)
+    {
         delete fwCompsAccess;
     }
-    if (_burnParams.userVsd != NULL) {
+    if (_burnParams.userVsd != NULL)
+    {
         delete[] _burnParams.userVsd;
     }
 #ifndef NO_MSTARCHIVE
-    if (_mfa2Pkg != NULL) {
+    if (_mfa2Pkg != NULL)
+    {
         delete _mfa2Pkg;
     }
 #endif
@@ -2051,27 +2327,34 @@ BurnSubCommand:: ~BurnSubCommand()
 
 bool BurnSubCommand::verifyMFA2Params(bool IsLiveFish)
 {
-    if (IsLiveFish) {
-        if (_flintParams.use_psid == false) {
+    if (IsLiveFish)
+    {
+        if (_flintParams.use_psid == false)
+        {
             reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2", "PSID must be supplied in livefish mode");
             return false;
         }
-        if (_flintParams.use_latest_fw_version == true && _flintParams.num_of_args != 4) {
+        if (_flintParams.use_latest_fw_version == true && _flintParams.num_of_args != 4)
+        {
             reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2", "incorrect flag combination is supplied");
             return false;
         }
-        if (_flintParams.use_latest_fw_version == false && _flintParams.num_of_args != 3) {
+        if (_flintParams.use_latest_fw_version == false && _flintParams.num_of_args != 3)
+        {
             reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2", "incorrect flag combination is supplied");
             return false;
         }
         return true;
     }
-    else {
-        if (_flintParams.use_latest_fw_version == true && _flintParams.num_of_args != 3) {
+    else
+    {
+        if (_flintParams.use_latest_fw_version == true && _flintParams.num_of_args != 3)
+        {
             reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2", "incorrect flag combination is supplied");
             return false;
         }
-        if (_flintParams.use_latest_fw_version == false && _flintParams.num_of_args != 2) {
+        if (_flintParams.use_latest_fw_version == false && _flintParams.num_of_args != 2)
+        {
             reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2", "incorrect flag combination is supplied");
             return false;
         }
@@ -2081,127 +2364,172 @@ bool BurnSubCommand::verifyMFA2Params(bool IsLiveFish)
 
 bool BurnSubCommand::verifyParams()
 {
-    if (_flintParams.mfa2_specified) {
-            return true;
+    if (_flintParams.mfa2_specified)
+    {
+        return true;
     }
-    else if (_flintParams.linkx_control == true) {
-        if (_flintParams.device_specified == false) {
+    else if (_flintParams.linkx_control == true)
+    {
+        if (_flintParams.device_specified == false)
+        {
             reportErr(true, "Must supply the device (and image, if not only activation required) for cables burn.\n");
             return false;
         }
-        if (_flintParams.activate == false && _flintParams.download_transfer == false) {
+        if (_flintParams.activate == false && _flintParams.download_transfer == false)
+        {
             reportErr(true, "Must supply the download_transfer and/or activation flags for cables burn.\n");
             return false;
         }
-        else if (_flintParams.activate == true && _flintParams.download_transfer == false) {
-            //the image is not necessary if only activation is required
-            if (_flintParams.linkx_auto_update == false) {
-                if (_flintParams.cable_device_index_specified == false || _flintParams.cable_device_size_specified == false) {
-                    reportErr(true, "Must supply the linkx <device index and size> or <autoupdate> for activate cables, but not both simultaneously!\n");
+        else if (_flintParams.activate == true && _flintParams.download_transfer == false)
+        {
+            // the image is not necessary if only activation is required
+            if (_flintParams.linkx_auto_update == false)
+            {
+                if (_flintParams.cable_device_index_specified == false ||
+                    _flintParams.cable_device_size_specified == false)
+                {
+                    reportErr(
+                      true,
+                      "Must supply the linkx <device index and size> or <autoupdate> for activate cables, but not both simultaneously!\n");
                     return false;
                 }
             }
-            else {
-                if (_flintParams.cable_device_index_specified == true || _flintParams.cable_device_size_specified == true) {
-                    reportErr(true, "Must supply the linkx <device index and size> or <autoupdate> for activate cables, bot not both simultaneously!\n");
+            else
+            {
+                if (_flintParams.cable_device_index_specified == true ||
+                    _flintParams.cable_device_size_specified == true)
+                {
+                    reportErr(
+                      true,
+                      "Must supply the linkx <device index and size> or <autoupdate> for activate cables, bot not both simultaneously!\n");
                     return false;
                 }
             }
             return true;
         }
-        else {
-            if (_flintParams.linkx_auto_update == false) {
-                if (_flintParams.cable_device_index_specified == false || _flintParams.cable_device_size_specified == false) {
+        else
+        {
+            if (_flintParams.linkx_auto_update == false)
+            {
+                if (_flintParams.cable_device_index_specified == false ||
+                    _flintParams.cable_device_size_specified == false)
+                {
                     reportErr(true, "Must supply the linkx device index and size / or autoupdate for burn cables!\n");
                     return false;
                 }
             }
-            else {
-                if (_flintParams.cable_device_index_specified == true || _flintParams.cable_device_size_specified == true) {
+            else
+            {
+                if (_flintParams.cable_device_index_specified == true ||
+                    _flintParams.cable_device_size_specified == true)
+                {
                     reportErr(true, "Must supply the linkx device index and size / or autoupdate for burn cables!\n");
                     return false;
                 }
             }
-            if (_flintParams.image_specified == false) {
+            if (_flintParams.image_specified == false)
+            {
                 reportErr(true, "Must supply the device and image for cables burn.\n");
                 return false;
             }
             string image = _flintParams.image;
-            if (!is_file_exists(image.c_str())) {
+            if (!is_file_exists(image.c_str()))
+            {
                 reportErr(true, "The supplied image for cables burn doesn't exist.\n");
                 return false;
             }
             long fileSize = 0;
-            if (getFileSize(image, fileSize) == false) {
+            if (getFileSize(image, fileSize) == false)
+            {
                 reportErr(true, "Can't get the file size from the supplied image for cables burn.\n");
                 return false;
             }
-            if (fileSize < 8) {
+            if (fileSize < 8)
+            {
                 reportErr(true, "The supplied image for cables is not valid.\n");
                 return false;
             }
         }
         return true;
     }
-    else {
-        if (_flintParams.cable_device_index_specified == true || _flintParams.cable_device_size_specified == true) {
-            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "Flags 'cable_device_size'/'cable_device_index' relevant only for cable components.");
+    else
+    {
+        if (_flintParams.cable_device_index_specified == true || _flintParams.cable_device_size_specified == true)
+        {
+            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                      "Flags 'cable_device_size'/'cable_device_index' relevant only for cable components.");
             return false;
         }
-        if (_flintParams.activate == true || _flintParams.download_transfer == true || _flintParams.activate_delay_sec != 1) {
-            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "Flags 'activate'/'download_transfer'/'activate_delay_sec' relevant only for cable components.");
+        if (_flintParams.activate == true || _flintParams.download_transfer == true ||
+            _flintParams.activate_delay_sec != 1)
+        {
+            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                      "Flags 'activate'/'download_transfer'/'activate_delay_sec' relevant only for cable components.");
             return false;
         }
-        if ((_flintParams.guid_specified || _flintParams.guids_specified) && (_flintParams.uid_specified)) {
-            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "either GUIDs / UID (using command line flags -guid(s) / -uid )");
+        if ((_flintParams.guid_specified || _flintParams.guids_specified) && (_flintParams.uid_specified))
+        {
+            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                      "either GUIDs / UID (using command line flags -guid(s) / -uid )");
             return false;
         }
-        if ((_flintParams.mac_specified || _flintParams.macs_specified) && (_flintParams.uid_specified)) {
-            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "either MACs / UID (using command line flags -mac(s) / -uid )");
+        if ((_flintParams.mac_specified || _flintParams.macs_specified) && (_flintParams.uid_specified))
+        {
+            reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                      "either MACs / UID (using command line flags -mac(s) / -uid )");
             return false;
         }
-        bool GuidsFromUser = _flintParams.guid_specified || _flintParams.guids_specified || \
-                             _flintParams.uid_specified || \
-                             _flintParams.mac_specified || _flintParams.macs_specified;
-        if (GuidsFromUser && _flintParams.use_image_guids) {
+        bool GuidsFromUser = _flintParams.guid_specified || _flintParams.guids_specified ||
+                             _flintParams.uid_specified || _flintParams.mac_specified || _flintParams.macs_specified;
+        if (GuidsFromUser && _flintParams.use_image_guids)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "GUIDs/UIDs/MACs", "-use_image_guids");
             return false;
         }
-        if ((GuidsFromUser || _flintParams.use_image_guids) && _flintParams.blank_guids) {
-            reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, _flintParams.use_image_guids ? \
-                      "-use_image_guids" : "GUIDs/UIDs/MACs", "-blank_guids");
+        if ((GuidsFromUser || _flintParams.use_image_guids) && _flintParams.blank_guids)
+        {
+            reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR,
+                      _flintParams.use_image_guids ? "-use_image_guids" : "GUIDs/UIDs/MACs", "-blank_guids");
             return false;
         }
-        if (_flintParams.guid_specified && _flintParams.guids_specified) {
+        if (_flintParams.guid_specified && _flintParams.guids_specified)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-guids", "-guid");
             return false;
         }
-        if (_flintParams.mac_specified && _flintParams.macs_specified) {
+        if (_flintParams.mac_specified && _flintParams.macs_specified)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-macs", "-mac");
             return false;
         }
-        if (_flintParams.use_image_ps && _flintParams.vsd_specified) {
+        if (_flintParams.use_image_ps && _flintParams.vsd_specified)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-use_image_ps", "-vsd");
             return false;
         }
-        if (_flintParams.ignore_dev_data && !_flintParams.nofs) {
+        if (_flintParams.ignore_dev_data && !_flintParams.nofs)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITHOUT_FLAG_ERROR, "-nofs", "-ignore_dev_data");
             return false;
         }
-        if (_flintParams.use_dev_rom && _flintParams.use_image_rom) {
+        if (_flintParams.use_dev_rom && _flintParams.use_image_rom)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "--use_dev_rom", "--use_image_rom");
             return false;
         }
-        if (_flintParams.nofs || _flintParams.allow_psid_change || _flintParams.use_dev_rom) {
+        if (_flintParams.nofs || _flintParams.allow_psid_change || _flintParams.use_dev_rom)
+        {
             // attempt to fallback to legacy flow (direct flash access via FW)
             _mccSupported = false;
         }
-        if (_flintParams.image_reactivation && _flintParams.no_fw_ctrl) {
+        if (_flintParams.image_reactivation && _flintParams.no_fw_ctrl)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-image_reactivation", "-no_fw_ctrl");
             return false;
         }
 
-        if (_flintParams.image_reactivation && _flintParams.override_cache_replacement) {
+        if (_flintParams.image_reactivation && _flintParams.override_cache_replacement)
+        {
             reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-image_reactivation", "-ocr");
             return false;
         }
@@ -2211,10 +2539,11 @@ bool BurnSubCommand::verifyParams()
 
 void BurnSubCommand::updateBurnParams()
 {
-    _burnParams.progressFunc = _flintParams.silent == true ? (ProgressCallBack)NULL : \
-                                                             _fwType == FIT_FS2 ? &burnCbFs2Func : &burnCbFs3Func;
+    _burnParams.progressFunc =
+      _flintParams.silent == true ? (ProgressCallBack)NULL : _fwType == FIT_FS2 ? &burnCbFs2Func : &burnCbFs3Func;
 
-    _burnParams.ProgressFuncAdv.func = _flintParams.silent == true ? (f_prog_func_adv)NULL : (f_prog_func_adv) & advProgressFunc;
+    _burnParams.ProgressFuncAdv.func =
+      _flintParams.silent == true ? (f_prog_func_adv)NULL : (f_prog_func_adv)&advProgressFunc;
     _burnParams.ProgressFuncAdv.opaque = &_unknownProgress;
 
     _burnParams.userGuidsSpecified = _flintParams.guids_specified || _flintParams.guid_specified;
@@ -2226,33 +2555,38 @@ void BurnSubCommand::updateBurnParams()
     _burnParams.allowPsidChange = _flintParams.allow_psid_change;
     _burnParams.useDevImgInfo = _flintParams.use_dev_img_info;
     _burnParams.useImagePs = _flintParams.use_image_ps;
-    _burnParams.burnRomOptions = _flintParams.use_image_rom ? FwOperations::ExtBurnParams::BRO_ONLY_FROM_IMG \
-                                 : FwOperations::ExtBurnParams::BRO_DEFAULT;
+    _burnParams.burnRomOptions = _flintParams.use_image_rom ? FwOperations::ExtBurnParams::BRO_ONLY_FROM_IMG :
+                                                              FwOperations::ExtBurnParams::BRO_DEFAULT;
     _burnParams.useImageGuids = _flintParams.use_image_guids;
     _burnParams.singleImageBurn = !_flintParams.dual_image;
     _burnParams.noDevidCheck = _flintParams.no_devid_check;
     _burnParams.skipCiReq = _flintParams.skip_ci_req;
     _burnParams.useImgDevData = _flintParams.ignore_dev_data;
-    if (_burnParams.userGuidsSpecified) {
+    if (_burnParams.userGuidsSpecified)
+    {
         _burnParams.userUids = _flintParams.user_guids;
     }
-    if (_burnParams.userUidSpecified) {
+    if (_burnParams.userUidSpecified)
+    {
         _burnParams.userUids.resize(0);
         _burnParams.userUids.push_back(_flintParams.baseUid);
     }
-    if (_burnParams.userMacsSpecified) {
-        if (!_burnParams.userGuidsSpecified) {
-            //we dont care about the first 4 values
+    if (_burnParams.userMacsSpecified)
+    {
+        if (!_burnParams.userGuidsSpecified)
+        {
+            // we dont care about the first 4 values
             _burnParams.userUids.resize(GUIDS);
         }
         _burnParams.userUids.push_back(_flintParams.user_macs[0]);
         _burnParams.userUids.push_back(_flintParams.user_macs[1]);
     }
-    if (_burnParams.vsdSpecified) {
+    if (_burnParams.vsdSpecified)
+    {
         _burnParams.userVsd = strcpy(new char[_flintParams.vsd.size() + 1], _flintParams.vsd.c_str());
     }
 
-    //make sure its of max size and fill the rest with 0xffff
+    // make sure its of max size and fill the rest with 0xffff
     guid_t tmpGuid;
     tmpGuid.h = 0xffffffff;
     tmpGuid.l = 0xffffffff;
@@ -2266,36 +2600,42 @@ bool BurnSubCommand::checkFwVersion(bool CreateFromImgInfo, u_int16_t fw_ver0, u
 {
     FwVersion current = FwOperations::createFwVersion(&_devInfo.fw_info);
     FwVersion new_version;
-    if (CreateFromImgInfo) {
+    if (CreateFromImgInfo)
+    {
         new_version = FwOperations::createFwVersion(&_imgInfo.fw_info);
     }
-    else {
+    else
+    {
         new_version = FwOperations::createFwVersion(fw_ver0, fw_ver1, fw_ver2);
     }
 
-    const string current_version_str = current.get_fw_version(
-        VERSION_FORMAT(_devInfo.fw_info.fw_ver[1]), false, "N/A");
+    const string current_version_str = current.get_fw_version(VERSION_FORMAT(_devInfo.fw_info.fw_ver[1]), false, "N/A");
     printf("\n    Current FW version on flash:  %s\n", current_version_str.c_str());
 
     const string next_version_str = new_version.get_fw_version(
-        VERSION_FORMAT((CreateFromImgInfo ? _imgInfo.fw_info.fw_ver[1] : fw_ver1)), false, "N/A");
+      VERSION_FORMAT((CreateFromImgInfo ? _imgInfo.fw_info.fw_ver[1] : fw_ver1)), false, "N/A");
     printf("    New FW version:               %s\n", next_version_str.c_str());
 
-    if (_flintParams.log_specified) {
-        print_line_to_log(
-                "Current FW version on flash: %s,  New FW version: %s\n",
-                current_version_str.c_str(), next_version_str.c_str());
+    if (_flintParams.log_specified)
+    {
+        print_line_to_log("Current FW version on flash: %s,  New FW version: %s\n", current_version_str.c_str(),
+                          next_version_str.c_str());
     }
 
-    if (current.is_set() && new_version.is_set()) {
-        if (!current.are_same_branch(new_version)) {
+    if (current.is_set() && new_version.is_set())
+    {
+        if (!current.are_same_branch(new_version))
+        {
             printf("\n    Note: The new FW version is on a different branch"
-                    " then the current FW version on flash.\n");
-        } else if (current >= new_version) {
+                   " then the current FW version on flash.\n");
+        }
+        else if (current >= new_version)
+        {
             printf("\n    Note: The new FW version is %s the current FW"
-                    " version on flash.\n",
-                    current == new_version ? "the same as" : "older than");
-            if (!askUser()) {
+                   " version on flash.\n",
+                   current == new_version ? "the same as" : "older than");
+            if (!askUser())
+            {
                 return false;
             }
         }
@@ -2309,15 +2649,20 @@ bool BurnSubCommand::checkFwVersion(bool CreateFromImgInfo, u_int16_t fw_ver0, u
 bool BurnSubCommand::checkPSID()
 {
     if (strlen(_imgInfo.fw_info.psid) != 0 && strlen(_devInfo.fw_info.psid) != 0 &&
-        strncmp(_imgInfo.fw_info.psid, _devInfo.fw_info.psid, PSID_LEN)) {
-        if (_flintParams.allow_psid_change) {
+        strncmp(_imgInfo.fw_info.psid, _devInfo.fw_info.psid, PSID_LEN))
+    {
+        if (_flintParams.allow_psid_change)
+        {
             printf("\n    You are about to replace current PSID on flash - \"%s\" with a different PSID - \"%s\".\n"
                    "    Note: It is highly recommended not to change the PSID.\n",
                    _devInfo.fw_info.psid, _imgInfo.fw_info.psid);
-            if (!askUser()) {
+            if (!askUser())
+            {
                 return false;
             }
-        } else {
+        }
+        else
+        {
             printf("\n");
             reportErr(true, FLINT_PSID_ERROR, _devInfo.fw_info.psid, _imgInfo.fw_info.psid);
             return false;
@@ -2326,26 +2671,31 @@ bool BurnSubCommand::checkPSID()
     return true;
 }
 
-
 FlintStatus BurnSubCommand::burnFs3()
 {
     bool printPreparing = false;
-    if (_devQueryRes) {
-        char errBuff[ERR_BUFF_SIZE] = { 0 };
+    if (_devQueryRes)
+    {
+        char errBuff[ERR_BUFF_SIZE] = {0};
         FwOperations::fw_ops_params_t fwParams;
         initDeviceFwParams(errBuff, fwParams);
         FsChecks fsChecks(_devInfo, _fwOps, _imgOps, _burnParams, fwParams);
-        if (fsChecks.ExecuteChecks(&_fwOps, _burnParams, _devInfo)) {
+        if (fsChecks.ExecuteChecks(&_fwOps, _burnParams, _devInfo))
+        {
             vector<string> questions;
             fsChecks.GetUserQuestions(questions, "    ");
             delete[] fwParams.mstHndl;
-            for (unsigned int i = 0; i < questions.size(); i++) {
+            for (unsigned int i = 0; i < questions.size(); i++)
+            {
                 printf("\n%s\n", questions[i].c_str());
-                if (!askUser()) {
+                if (!askUser())
+                {
                     return FLINT_FAILED;
                 }
             }
-        } else {
+        }
+        else
+        {
             delete[] fwParams.mstHndl;
             reportErr(true, "Fixes is needed for Flash layout, an error occurred while preparing the operation");
             return FLINT_FAILED;
@@ -2354,70 +2704,87 @@ FlintStatus BurnSubCommand::burnFs3()
     }
 
     // Here we want to burn FS3 device so we check if the image is indeed FS3 image
-    if (_imgInfo.fw_type != FIT_FS3 && _imgInfo.fw_type != FIT_FS4) {
+    if (_imgInfo.fw_type != FIT_FS3 && _imgInfo.fw_type != FIT_FS4)
+    {
         reportErr(true, FLINT_IMG_DEV_COMPAT_ERROR, "FS3", "FS3");
         return FLINT_FAILED;
     }
-    const char *imgTypeStr = fwImgTypeToStr(_imgInfo.fw_type);
+    const char* imgTypeStr = fwImgTypeToStr(_imgInfo.fw_type);
     // on FS3 burn we require query to pass
-    if (!_devQueryRes && _burnParams.burnFailsafe) {
+    if (!_devQueryRes && _burnParams.burnFailsafe)
+    {
         reportErr(true, FLINT_FSX_BURN_ERROR, imgTypeStr, _fwOps->err());
         return FLINT_FAILED;
     }
-    //check FwVersion
-    if (!checkFwVersion()) {
+    // check FwVersion
+    if (!checkFwVersion())
+    {
         return FLINT_BURN_ABORTED;
     }
     // check Psid
-    if (_devQueryRes && !checkPSID()) {
+    if (_devQueryRes && !checkPSID())
+    {
         return FLINT_FAILED;
     }
     // deal with rom
-    if (!dealWithExpRom()) {
+    if (!dealWithExpRom())
+    {
         return FLINT_FAILED;
     }
     bool getRomFromDev = (_burnParams.burnRomOptions == FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST);
-    if (!getRomFromDev && !checkMatchingExpRomDevId(_imgInfo)) {
-        printf("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", _imgInfo.fw_info.dev_type, \
+    if (!getRomFromDev && !checkMatchingExpRomDevId(_imgInfo))
+    {
+        printf("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", _imgInfo.fw_info.dev_type,
                _imgInfo.fw_info.roms_info.exp_rom_com_devid);
-        if (!askUser()) {
+        if (!askUser())
+        {
             return FLINT_FAILED;
         }
     }
-    if (!_burnParams.burnFailsafe) {
+    if (!_burnParams.burnFailsafe)
+    {
         printf("Burn process will not be failsafe. No checks will be performed.\n");
-        if (_burnParams.useImgDevData) {
+        if (_burnParams.useImgDevData)
+        {
             printf("ALL flash, including the device data sections will be overwritten.\n");
         }
         printf("If this process fails, computer may remain in an inoperable state.\n");
-        if (!askUser()) {
+        if (!askUser())
+        {
             return FLINT_FAILED;
         }
     }
 
-    if (printPreparing) {
+    if (printPreparing)
+    {
         printf(" Preparing...\n");
     }
 
     bool device_encrypted = false;
     bool image_encrypted = false;
-    if (!_fwOps->isEncrypted(device_encrypted)) {
+    if (!_fwOps->isEncrypted(device_encrypted))
+    {
         reportErr(true, "Failed to identify if device is encrypted.\n");
         return FLINT_FAILED;
     }
-    if (!_imgOps->isEncrypted(image_encrypted)) {
+    if (!_imgOps->isEncrypted(image_encrypted))
+    {
         reportErr(true, "Failed to identify if image is encrypted.\n");
         return FLINT_FAILED;
     }
 
-    if (device_encrypted && image_encrypted) {
-        if (!_fwOps->burnEncryptedImage(_imgOps, _burnParams)) {
+    if (device_encrypted && image_encrypted)
+    {
+        if (!_fwOps->burnEncryptedImage(_imgOps, _burnParams))
+        {
             reportErr(true, FLINT_FSX_BURN_ERROR, imgTypeStr, _fwOps->err());
             return FLINT_FAILED;
         }
     }
-    else {
-        if (!_fwOps->FwBurnAdvanced(_imgOps, _burnParams)) {
+    else
+    {
+        if (!_fwOps->FwBurnAdvanced(_imgOps, _burnParams))
+        {
             reportErr(true, FLINT_FSX_BURN_ERROR, imgTypeStr, _fwOps->err());
             return FLINT_FAILED;
         }
@@ -2425,8 +2792,9 @@ FlintStatus BurnSubCommand::burnFs3()
 
     PRINT_PROGRESS(_burnParams.progressFunc, 101);
     write_result_to_log(FLINT_SUCCESS, "", _flintParams.log_specified);
-    const char *resetRec = _fwOps->FwGetResetRecommandationStr();
-    if (resetRec) {
+    const char* resetRec = _fwOps->FwGetResetRecommandationStr();
+    if (resetRec)
+    {
         printf("-I- %s\n", resetRec);
     }
     return FLINT_SUCCESS;
@@ -2434,67 +2802,80 @@ FlintStatus BurnSubCommand::burnFs3()
 
 FlintStatus BurnSubCommand::burnFs2()
 {
-
-    if (_flintParams.striped_image) {
+    if (_flintParams.striped_image)
+    {
         reportErr(true, FLINT_FS2_STRIPED_ERROR);
         return FLINT_FAILED;
     }
-    if (_imgInfo.fw_type != FIT_FS2) {
+    if (_imgInfo.fw_type != FIT_FS2)
+    {
         reportErr(true, FLINT_IMG_DEV_COMPAT_ERROR, "FS2", "FS2");
         return FLINT_FAILED;
     }
-    if (_burnParams.use_cpu_utilization) {
-	    if (_burnParams.cpu_utilization < 1 || _burnParams.cpu_utilization > 5) {
+    if (_burnParams.use_cpu_utilization)
+    {
+        if (_burnParams.cpu_utilization < 1 || _burnParams.cpu_utilization > 5)
+        {
             reportErr(true, FLINT_ILLEGAL_CPU_VALUE);
             return FLINT_FAILED;
         }
     }
-    //CheckMatchingHwDevId is done in mlxfwops burn routine.
-    //CheckMatchingDevId is done in mlxfwops burn routine.
+    // CheckMatchingHwDevId is done in mlxfwops burn routine.
+    // CheckMatchingDevId is done in mlxfwops burn routine.
 
     (void)dealWithExpRom();
     bool getRomFromDev = _burnParams.burnRomOptions == FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST;
-    if (!getRomFromDev && !checkMatchingExpRomDevId(_imgInfo)) {
-        printf("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", _imgInfo.fw_info.dev_type, \
+    if (!getRomFromDev && !checkMatchingExpRomDevId(_imgInfo))
+    {
+        printf("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", _imgInfo.fw_info.dev_type,
                _imgInfo.fw_info.roms_info.exp_rom_com_devid);
-        if (!askUser()) {
+        if (!askUser())
+        {
             return FLINT_FAILED;
         }
     }
 
-    //deal with guids
-    if (!dealWithGuids()) {
+    // deal with guids
+    if (!dealWithGuids())
+    {
         return FLINT_FAILED;
     }
 
-    //deal with failsifity should be made in fwops as we dont know if image/device fw is failsafe
-    if (_burnParams.burnFailsafe & (!_imgInfo.fw_info.is_failsafe || !_devInfo.fw_info.is_failsafe)) {
-
-        if ((!_imgInfo.fw_info.is_failsafe && !_devInfo.fw_info.is_failsafe)) {
+    // deal with failsifity should be made in fwops as we dont know if image/device fw is failsafe
+    if (_burnParams.burnFailsafe & (!_imgInfo.fw_info.is_failsafe || !_devInfo.fw_info.is_failsafe))
+    {
+        if ((!_imgInfo.fw_info.is_failsafe && !_devInfo.fw_info.is_failsafe))
+        {
             // When both image and flash are non-failsafe, flint will burn in a non-failsafe mode
             _burnParams.burnFailsafe = false;
-        } else {
+        }
+        else
+        {
             // when only one of image and flash is non-failsafe, flint will fail with appropriate message
-            reportErr(true, "Failsafe burn failed: FW image in the %s is non failsafe.\n"
+            reportErr(true,
+                      "Failsafe burn failed: FW image in the %s is non failsafe.\n"
                       "    you cannot burn a%s failsafe image over a%s failsafe image in a failsafe mode.\n"
                       "    If you want to burn in non failsafe mode, use the \"-nofs\" switch.\n",
-                      _imgInfo.fw_info.is_failsafe ? "flash" : "given file", _imgInfo.fw_info.is_failsafe ? "" : " non", \
+                      _imgInfo.fw_info.is_failsafe ? "flash" : "given file", _imgInfo.fw_info.is_failsafe ? "" : " non",
                       _devInfo.fw_info.is_failsafe ? "" : " non");
             return FLINT_FAILED;
         }
     }
 
-    //deal with vsd
-    if (!dealWithVSD()) {
+    // deal with vsd
+    if (!dealWithVSD())
+    {
         return FLINT_FAILED;
     }
 
-    //check versions
-    if (!checkFwVersion()) {
+    // check versions
+    if (!checkFwVersion())
+    {
         return FLINT_BURN_ABORTED;
     }
-    //check Psid
-    if (_devQueryRes && !checkPSID()) {
+    // check Psid
+    if (_devQueryRes && !checkPSID())
+    {
         return FLINT_FAILED;
     }
 
@@ -2502,42 +2883,50 @@ FlintStatus BurnSubCommand::burnFs2()
     // The other way (new fw with config, old fw w/o config) is a normal update flow.
     // Update: all fw should now support config sectors, so we just check any mismatch in the config pads
 
-
     // Verify config offset. Should never be different between image and flash (unless changing PSID).
-    if (_imgInfo.fs2_info.config_pad != _devInfo.fs2_info.config_pad) {
+    if (_imgInfo.fs2_info.config_pad != _devInfo.fs2_info.config_pad)
+    {
         printf("\n");
         printf("-W- Configuration section offset on flash (%u sectors) differs from the"
                " Configuration section offset in the given image (%u sectors)."
                " Current device configuration (if exists) will be deleted.\n",
                _devInfo.fs2_info.config_pad,
                _imgInfo.fs2_info.config_pad);
-        if (_burnParams.allowPsidChange) {
-            if (!askUser()) {
+        if (_burnParams.allowPsidChange)
+        {
+            if (!askUser())
+            {
                 return FLINT_FAILED;
             }
-        } else {
+        }
+        else
+        {
             reportErr(true, "Use the '-allow_psid_change' flag to force this change.\n");
             return FLINT_FAILED;
         }
     }
 
-    if (!_burnParams.burnFailsafe) {
+    if (!_burnParams.burnFailsafe)
+    {
         printf("Burn process will not be failsafe. No checks will be performed.\n");
         printf("ALL flash, including the Invariant Sector will be overwritten.\n");
         printf("If this process fails, computer may remain in an inoperable state.\n");
-        if (!askUser()) {
+        if (!askUser())
+        {
             return FLINT_FAILED;
         }
     }
 
-    //Finally we can burn
-    if (!_fwOps->FwBurnAdvanced(_imgOps, _burnParams)) {
+    // Finally we can burn
+    if (!_fwOps->FwBurnAdvanced(_imgOps, _burnParams))
+    {
         reportErr(true, FLINT_FS2_BURN_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
     PRINT_PROGRESS(_burnParams.progressFunc, 101);
     write_result_to_log(FLINT_SUCCESS, "", _flintParams.log_specified);
-    if (_burnParams.burnStatus.imageCachedSuccessfully) {
+    if (_burnParams.burnStatus.imageCachedSuccessfully)
+    {
         PRINT_PROGRESS(_burnParams.progressFunc, 102);
     }
     return FLINT_SUCCESS;
@@ -2545,19 +2934,25 @@ FlintStatus BurnSubCommand::burnFs2()
 
 bool BurnSubCommand::dealWithVSD()
 {
-    if (!(_burnParams.vsdSpecified || _burnParams.useImagePs) && !((strlen(_devInfo.fw_info.psid) != 0 \
-                                                                    && _devInfo.fw_info.vsd_sect_found))) {
+    if (!(_burnParams.vsdSpecified || _burnParams.useImagePs) &&
+        !((strlen(_devInfo.fw_info.psid) != 0 && _devInfo.fw_info.vsd_sect_found)))
+    {
         printf("\n");
-        if (_burnParams.burnFailsafe) {
-            reportErr(true, "Can not extract VSD/PSID info from flash.\n"
-                      "    Can not burn in a failsafe mode. Please use \"-nofs\" flag to burn in a non failsafe mode.\n");
+        if (_burnParams.burnFailsafe)
+        {
+            reportErr(
+              true, "Can not extract VSD/PSID info from flash.\n"
+                    "    Can not burn in a failsafe mode. Please use \"-nofs\" flag to burn in a non failsafe mode.\n");
             return false;
-        } else {
+        }
+        else
+        {
             printf("-W- Can not extract VSD/PSID info from flash.\n\n"
                    "    To use a specific VSD, abort and re-burn specifying the\n"
                    "    needed info (using command line flags -vsd / -use_image_ps).\n"
                    "    You can also continue burn using blank VSD.\n");
-            if (!askUser()) {
+            if (!askUser())
+            {
                 return false;
             }
         }
@@ -2571,56 +2966,66 @@ bool BurnSubCommand::dealWithGuids()
     bool ib_dev;
     bool eth_dev;
     // Get the FW types
-    FwOperations::SetDevFlags(_imgInfo.fw_info.chip_type, _imgInfo.fw_info.dev_type, (fw_img_type)_imgInfo.fw_type, ib_dev, eth_dev);
-    //setDevFlags(_imgInfo, ib_dev, eth_dev);
+    FwOperations::SetDevFlags(_imgInfo.fw_info.chip_type, _imgInfo.fw_info.dev_type, (fw_img_type)_imgInfo.fw_type,
+                              ib_dev, eth_dev);
+    // setDevFlags(_imgInfo, ib_dev, eth_dev);
 
     // Check if there is a need to read guids
-    if (_burnParams.useImageGuids || _burnParams.blankGuids
-        || (_burnParams.userGuidsSpecified && ib_dev)
-        || (_burnParams.userMacsSpecified)) {
+    if (_burnParams.useImageGuids || _burnParams.blankGuids || (_burnParams.userGuidsSpecified && ib_dev) ||
+        (_burnParams.userMacsSpecified))
+    {
         read_guids = false;
     }
     // Check if the burnt FW is ok and readable in order to get the GUIDs later
-    if (read_guids && !_devQueryRes) {
-        //printMissingGuidErr(ib_dev, eth_dev);
-        if (_burnParams.burnFailsafe) {
+    if (read_guids && !_devQueryRes)
+    {
+        // printMissingGuidErr(ib_dev, eth_dev);
+        if (_burnParams.burnFailsafe)
+        {
             reportErr(true,
                       "Can not extract GUIDs/MACs info from flash, %s\n"
                       "    Can not burn in a failsafe mode.\n"
-                      "    If you want to burn in non failsafe mode, use the \"-nofs\" switch.\n", _fwOps->err());
-        } else {
+                      "    If you want to burn in non failsafe mode, use the \"-nofs\" switch.\n",
+                      _fwOps->err());
+        }
+        else
+        {
             reportErr(true, "Can not extract GUIDs/MACs info from flash, %s", _fwOps->err());
             printMissingGuidErr(ib_dev, eth_dev);
         }
         return false;
     }
     // Check guids flag to ensure correct patching of guids in mlxfwops
-    bool is_guids_specified = _burnParams.userGuidsSpecified
-                              || _burnParams.userMacsSpecified
-                              || _burnParams.userUidSpecified;
-    if (is_guids_specified) {
-        if (!checkGuidsFlags(_imgInfo.fw_info.dev_type, _fwType, \
-                             _burnParams.userGuidsSpecified, _burnParams.userMacsSpecified, _burnParams.userUidSpecified, ib_dev, eth_dev)) {
+    bool is_guids_specified =
+      _burnParams.userGuidsSpecified || _burnParams.userMacsSpecified || _burnParams.userUidSpecified;
+    if (is_guids_specified)
+    {
+        if (!checkGuidsFlags(_imgInfo.fw_info.dev_type, _fwType, _burnParams.userGuidsSpecified,
+                             _burnParams.userMacsSpecified, _burnParams.userUidSpecified, ib_dev, eth_dev))
+        {
             return false;
         }
     }
-    //report guid changes if needed. and update the user_guids vector in _burnParams
-    if (is_guids_specified || _flintParams.use_image_guids) {
-        guid_t *new_guids = (_burnParams.userGuidsSpecified || _burnParams.userUidSpecified) ? \
-                            &_burnParams.userUids[0] : _devInfo.fs2_info.guids;
-        guid_t *new_macs = _burnParams.userMacsSpecified != 0 ? &_burnParams.userUids[GUIDS] : &_devInfo.fs2_info.guids[GUIDS];
-        guid_t *old_guids = !_devQueryRes ? NULL : _devInfo.fs2_info.guids;
-        guid_t *old_macs = old_guids != NULL ? &old_guids[GUIDS] : NULL;
-        if (!is_guids_specified && _flintParams.use_image_guids) {
+    // report guid changes if needed. and update the user_guids vector in _burnParams
+    if (is_guids_specified || _flintParams.use_image_guids)
+    {
+        guid_t* new_guids = (_burnParams.userGuidsSpecified || _burnParams.userUidSpecified) ?
+                              &_burnParams.userUids[0] :
+                              _devInfo.fs2_info.guids;
+        guid_t* new_macs =
+          _burnParams.userMacsSpecified != 0 ? &_burnParams.userUids[GUIDS] : &_devInfo.fs2_info.guids[GUIDS];
+        guid_t* old_guids = !_devQueryRes ? NULL : _devInfo.fs2_info.guids;
+        guid_t* old_macs = old_guids != NULL ? &old_guids[GUIDS] : NULL;
+        if (!is_guids_specified && _flintParams.use_image_guids)
+        {
             new_guids = _imgInfo.fs2_info.guids;
             new_macs = &_imgInfo.fs2_info.guids[GUIDS];
         }
-        //printf("-D- l=%d, h=%d\n", new_macs->l, new_macs->h);
-        if (!reportGuidChanges(new_guids, new_macs, old_guids, old_macs, ib_dev, \
-                               eth_dev, _imgInfo.fs2_info.guid_num)) {
+        // printf("-D- l=%d, h=%d\n", new_macs->l, new_macs->h);
+        if (!reportGuidChanges(new_guids, new_macs, old_guids, old_macs, ib_dev, eth_dev, _imgInfo.fs2_info.guid_num))
+        {
             return false;
         }
-
     }
     return true;
 }
@@ -2632,34 +3037,46 @@ bool BurnSubCommand::dealWithExpRom()
     // Check exp rom:
     bool fs2Cond;
 
-    if (_fwType != FIT_FS2) {
-        _burnParams.burnRomOptions =
-            FwOperations::ExtBurnParams::BRO_ONLY_FROM_IMG;
+    if (_fwType != FIT_FS2)
+    {
+        _burnParams.burnRomOptions = FwOperations::ExtBurnParams::BRO_ONLY_FROM_IMG;
         bool cond = _devQueryRes && IS_HCA(_devInfo.fw_info.chip_type);
-        if (cond && _flintParams.use_dev_rom) {
-            if (_devInfo.fw_info.roms_info.num_of_exp_rom > 0) {
-                if (!strcmp(_devInfo.fw_info.product_ver, "") && !strcmp(_imgInfo.fw_info.product_ver, "")) {
-                    _burnParams.burnRomOptions =
-                        FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST;
-                } else if (_flintParams.allow_rom_change) {
-                    _burnParams.burnRomOptions =
-                        FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST;
-                } else {
-                    //error, please use allow_rom_change flag
+        if (cond && _flintParams.use_dev_rom)
+        {
+            if (_devInfo.fw_info.roms_info.num_of_exp_rom > 0)
+            {
+                if (!strcmp(_devInfo.fw_info.product_ver, "") && !strcmp(_imgInfo.fw_info.product_ver, ""))
+                {
+                    _burnParams.burnRomOptions = FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST;
+                }
+                else if (_flintParams.allow_rom_change)
+                {
+                    _burnParams.burnRomOptions = FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST;
+                }
+                else
+                {
+                    // error, please use allow_rom_change flag
                     reportErr(true, "The device FW contains common FW/ROM Product Version - "
-                              "The ROM cannot be updated separately.\n");
+                                    "The ROM cannot be updated separately.\n");
                     return false;
                 }
-            } else {
-                if (_imgInfo.fw_info.roms_info.num_of_exp_rom > 0) {
+            }
+            else
+            {
+                if (_imgInfo.fw_info.roms_info.num_of_exp_rom > 0)
+                {
                     if (!askUser("No Expansion ROM found in the device, "
                                  "Do you want to use the ROM from the image file",
-                                 false)) {
+                                 false))
+                    {
                         return false;
                     }
-                } else {
+                }
+                else
+                {
                     if (!askUser("No Expansion ROM found in the device"
-                                 ", Do you want to continue")) {
+                                 ", Do you want to continue"))
+                    {
                         return false;
                     }
                 }
@@ -2669,14 +3086,13 @@ bool BurnSubCommand::dealWithExpRom()
     }
 
     FwVersion dev_version = FwOperations::createFwVersion(&_devInfo.fw_info);
-    bool rom_condition = (FwOperations::IsFwSupportingRomModify(dev_version) || (_imgInfo.fw_info.roms_info.num_of_exp_rom > 0));
-    fs2Cond = (_devQueryRes && IS_HCA(_devInfo.fw_info.chip_type)
-            && rom_condition
-            && !_flintParams.use_image_rom
-            && !strcmp(_devInfo.fw_info.product_ver, "")
-            && !strcmp(_imgInfo.fw_info.product_ver, ""));
-
-    if (fs2Cond) {
+    bool rom_condition =
+      (FwOperations::IsFwSupportingRomModify(dev_version) || (_imgInfo.fw_info.roms_info.num_of_exp_rom > 0));
+    fs2Cond = (_devQueryRes && IS_HCA(_devInfo.fw_info.chip_type) && rom_condition && !_flintParams.use_image_rom &&
+               !strcmp(_devInfo.fw_info.product_ver, "") && !strcmp(_imgInfo.fw_info.product_ver, ""));
+
+    if (fs2Cond)
+    {
         // Enter here when:
         //                  The fw on the flash is OK (passed query, and it should pass verify in mlxfwops) &&
         //                  ( The device is connectx ||  connectib    )&&
@@ -2684,23 +3100,30 @@ bool BurnSubCommand::dealWithExpRom()
         //                  The user didn't ask to burn the image rom. &&
         //                  The  fw on the flash doesn't contain product version
 
-        if (_imgInfo.fw_info.roms_info.num_of_exp_rom > 0 && _devInfo.fw_info.roms_info.num_of_exp_rom > 0) {
+        if (_imgInfo.fw_info.roms_info.num_of_exp_rom > 0 && _devInfo.fw_info.roms_info.num_of_exp_rom > 0)
+        {
             printf("\n    Note: Both the image file and the flash contain a ROM image.\n"
                    "          Select \"yes\" to use the ROM from the given image file.\n"
                    "          Select \"no\" to keep the existing ROM in the flash\n");
 
             displayExpRomInfo(_devInfo.fw_info.roms_info, "    Current ROM info on flash: ");
             displayExpRomInfo(_imgInfo.fw_info.roms_info, "    ROM info from image file : ");
-            if (!askUser("Use the ROM from the image file", false)) {
+            if (!askUser("Use the ROM from the image file", false))
+            {
                 getRomFromDev = true;
-            } else {
+            }
+            else
+            {
                 getRomFromDev = false;
             }
-        } else if (!(_imgInfo.fw_info.roms_info.num_of_exp_rom > 0) && _devInfo.fw_info.roms_info.num_of_exp_rom > 0) {
+        }
+        else if (!(_imgInfo.fw_info.roms_info.num_of_exp_rom > 0) && _devInfo.fw_info.roms_info.num_of_exp_rom > 0)
+        {
             getRomFromDev = true;
         }
     }
-    if (getRomFromDev) {
+    if (getRomFromDev)
+    {
         _burnParams.burnRomOptions = FwOperations::ExtBurnParams::BRO_FROM_DEV_IF_EXIST;
     }
     return true;
@@ -2708,10 +3131,11 @@ bool BurnSubCommand::dealWithExpRom()
 
 bool BurnSubCommand::checkMatchingExpRomDevId(const fw_info_t& info)
 {
-    if ((info.fw_info.roms_info.num_of_exp_rom > 0) && (info.fw_info.dev_type)
-        && (info.fw_info.roms_info.exp_rom_com_devid != EXP_ROM_GEN_DEVID) \
-        && (info.fw_info.roms_info.exp_rom_com_devid != MISS_MATCH_DEV_ID)
-        && (info.fw_info.dev_type != info.fw_info.roms_info.exp_rom_com_devid)) {
+    if ((info.fw_info.roms_info.num_of_exp_rom > 0) && (info.fw_info.dev_type) &&
+        (info.fw_info.roms_info.exp_rom_com_devid != EXP_ROM_GEN_DEVID) &&
+        (info.fw_info.roms_info.exp_rom_com_devid != MISS_MATCH_DEV_ID) &&
+        (info.fw_info.dev_type != info.fw_info.roms_info.exp_rom_com_devid))
+    {
         return false;
     }
     return true;
@@ -2719,116 +3143,144 @@ bool BurnSubCommand::checkMatchingExpRomDevId(const fw_info_t& info)
 
 void BurnSubCommand::cleanInterruptedCommand()
 {
-    if (_flintParams.device_specified) {
+    if (_flintParams.device_specified)
+    {
         UnlockDevice(_fwOps);
     }
 }
 
 FlintStatus BurnSubCommand::executeCommand()
 {
-    if (_flintParams.linkx_control == true) {
-        if (!verifyParams()) {
+    if (_flintParams.linkx_control == true)
+    {
+        if (!verifyParams())
+        {
             return FLINT_FAILED;
         }
         int opaque = 0;
         ProgressCallBackAdvSt ProgressFuncAdv;
-        ProgressFuncAdv.func = (f_prog_func_adv)& advProgressFunc;
+        ProgressFuncAdv.func = (f_prog_func_adv)&advProgressFunc;
         ProgressFuncAdv.opaque = &opaque;
-        return BurnLinkX(_flintParams.device, _flintParams.cableDeviceIndex, _flintParams.cableDeviceSize, _flintParams.image, _flintParams.linkx_auto_update,
-            _flintParams.activate, _flintParams.download_transfer, _flintParams.activate_delay_sec, &ProgressFuncAdv);
+        return BurnLinkX(_flintParams.device, _flintParams.cableDeviceIndex, _flintParams.cableDeviceSize,
+                         _flintParams.image, _flintParams.linkx_auto_update, _flintParams.activate,
+                         _flintParams.download_transfer, _flintParams.activate_delay_sec, &ProgressFuncAdv);
     }
 #ifndef NO_MSTARCHIVE
     string mfa2file = _flintParams.image;
     _mfa2Pkg = MFA2::LoadMFA2Package(mfa2file);
-    if (_mfa2Pkg != NULL) {
+    if (_mfa2Pkg != NULL)
+    {
         _flintParams.mfa2_specified = true;
     }
 #endif
-    if (_flintParams.image_reactivation) {
-        if (preFwOps(true) == FLINT_FAILED) {
+    if (_flintParams.image_reactivation)
+    {
+        if (preFwOps(true) == FLINT_FAILED)
+        {
             return FLINT_FAILED;
         }
-        if (!_fwOps->FwReactivateImage()) {
+        if (!_fwOps->FwReactivateImage())
+        {
             reportErr(true, FLINT_FAILED_IMAGE_REACTIVATION_ERROR, _flintParams.device.c_str(), _fwOps->err());
             return FLINT_FAILED;
         }
         printf("\n-I- FW Image Reactivation succeeded.\n\n");
         _fwOps = _imgOps = NULL;
-        if (preFwOps() == FLINT_FAILED) {
+        if (preFwOps() == FLINT_FAILED)
+        {
             return FLINT_FAILED;
         }
     }
-    else if (_flintParams.mfa2_specified) {
+    else if (_flintParams.mfa2_specified)
+    {
         bool saved_value = _flintParams.silent;
         _flintParams.silent = true;
         FlintStatus res = preFwOps();
         _flintParams.silent = saved_value;
-        if (res == FLINT_FAILED) {
+        if (res == FLINT_FAILED)
+        {
             _flintParams.override_cache_replacement = true;
-            if (preFwOps() == FLINT_FAILED) {
+            if (preFwOps() == FLINT_FAILED)
+            {
                 return FLINT_FAILED;
             }
         }
-        mfile *mf = _fwOps->getMfileObj();
+        mfile* mf = _fwOps->getMfileObj();
         int is_livefish_mode = dm_is_livefish_mode(mf);
-        if (verifyMFA2Params(is_livefish_mode == 1) == false) {
+        if (verifyMFA2Params(is_livefish_mode == 1) == false)
+        {
             return FLINT_FAILED;
         }
-        //check if the device is in FW control mode ("mcc flow"). Other flow is unsupported.
-        if (is_livefish_mode) {
+        // check if the device is in FW control mode ("mcc flow"). Other flow is unsupported.
+        if (is_livefish_mode)
+        {
             /*reportErr(true, "Burning MFA2 is not supported in Livefish mode.\n");
             return FLINT_FAILED;*/
             dm_dev_id_t devid_t;
             u_int32_t devid;
             u_int32_t revid;
             int rc = dm_get_device_id(mf, &devid_t, &devid, &revid);
-            if (rc != 0) {
+            if (rc != 0)
+            {
                 reportErr(true, "Burning MFA2: can't get device Id");
                 return FLINT_FAILED;
             }
             return burnMFA2LiveFish(devid_t);
         }
         bool is_fw_ctrl = _fwOps->IsFsCtrlOperations();
-        if (!is_fw_ctrl) {
+        if (!is_fw_ctrl)
+        {
             reportErr(true, "Burning MFA2 is not supported without FW control.\n");
             return FLINT_FAILED;
         }
-        else {
+        else
+        {
             updateBurnParams();
-            if (_flintParams.use_psid == true) {
-                reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2", "incorrect flag combination is supplied");
+            if (_flintParams.use_psid == true)
+            {
+                reportErr(true, FLINT_COMMAND_INCORRECT_FLAGS_ERROR, "Burn MFA2",
+                          "incorrect flag combination is supplied");
                 return FLINT_FAILED;
             }
-            if (LockDevice(_fwOps) == FLINT_FAILED) {
+            if (LockDevice(_fwOps) == FLINT_FAILED)
+            {
                 return FLINT_FAILED;
             }
             FlintStatus burnResult = burnMFA2();
-            if (UnlockDevice(_fwOps) == FLINT_FAILED) {
+            if (UnlockDevice(_fwOps) == FLINT_FAILED)
+            {
                 return FLINT_FAILED;
             }
             return burnResult;
         }
     }
-    else if (_flintParams.congestion_control) {
+    else if (_flintParams.congestion_control)
+    {
         return burnCongestionControl();
     }
-    else {
-        if (preFwOps() == FLINT_FAILED) {
+    else
+    {
+        if (preFwOps() == FLINT_FAILED)
+        {
             return FLINT_FAILED;
         }
     }
-    if (LockDevice(_fwOps) == FLINT_FAILED) {
+    if (LockDevice(_fwOps) == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    //set fw type
+    // set fw type
     _fwType = _fwOps->FwType();
-    if (_fwOps->IsFsCtrlOperations() || _fwOps->IsFifthGen()) {
-        if (_flintParams.mac_specified || _flintParams.macs_specified) {
+    if (_fwOps->IsFsCtrlOperations() || _fwOps->IsFifthGen())
+    {
+        if (_flintParams.mac_specified || _flintParams.macs_specified)
+        {
             UnlockDevice(_fwOps);
             reportErr(true, FLINT_INVALID_FLAG_ERROR_5TH_GEN, _flintParams.macs_specified ? "-macs" : "-mac");
             return FLINT_FAILED;
         }
-        if (_flintParams.guid_specified || _flintParams.guids_specified) {
+        if (_flintParams.guid_specified || _flintParams.guids_specified)
+        {
             UnlockDevice(_fwOps);
             reportErr(true, FLINT_INVALID_FLAG_ERROR_5TH_GEN, _flintParams.guids_specified ? "-guids" : "-guid");
             return FLINT_FAILED;
@@ -2837,66 +3289,85 @@ FlintStatus BurnSubCommand::executeCommand()
 
     bool device_encrypted = false;
     bool image_encrypted = false;
-    if (!_fwOps->isEncrypted(device_encrypted)) {
+    if (!_fwOps->isEncrypted(device_encrypted))
+    {
         reportErr(true, "Failed to identify if device is encrypted.\n");
         return FLINT_FAILED;
     }
-    if (!_imgOps->isEncrypted(image_encrypted)) {
+    if (!_imgOps->isEncrypted(image_encrypted))
+    {
         reportErr(true, "Failed to identify if image is encrypted.\n");
         return FLINT_FAILED;
     }
 
-    if (device_encrypted != image_encrypted) {
+    if (device_encrypted != image_encrypted)
+    {
         reportErr(true, "Burning %sencrypted image on %sencrypted device is not allowed.\n",
-            image_encrypted ? "" : "non-", device_encrypted ? "" : "non-");
+                  image_encrypted ? "" : "non-", device_encrypted ? "" : "non-");
         return FLINT_FAILED;
     }
 
     // query both image and device (deviceQuery can fail but we save rc)
     _devQueryRes = _fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false));
-    if (!_imgOps->FwQuery(&_imgInfo)) {
+    if (!_imgOps->FwQuery(&_imgInfo))
+    {
         UnlockDevice(_fwOps);
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "image", _flintParams.image.c_str(), _imgOps->err());
         return FLINT_FAILED;
     }
 
     // Abort if the image is restricted according to the Security-Version
-    if (_fwOps->IsSecurityVersionViolated(_imgInfo.fs3_info.image_security_version)) {
+    if (_fwOps->IsSecurityVersionViolated(_imgInfo.fs3_info.image_security_version))
+    {
         reportErr(true, "The image you're trying to burn is restricted. Aborting ... \n");
-        return FLINT_FAILED; 
+        return FLINT_FAILED;
     }
 
-    //updateBurnParams with input given by user
+    // updateBurnParams with input given by user
     updateBurnParams();
 
-    if (_flintParams.use_image_guids && _fwType != FIT_FS2) {
+    if (_flintParams.use_image_guids && _fwType != FIT_FS2)
+    {
         UnlockDevice(_fwOps);
         reportErr(true, "The \"--use_image_guids\" flag is supported only for GEN4 devices.\n");
         return FLINT_FAILED;
     }
-    if (_fwType == FIT_FS3 || _fwType == FIT_FS4 || _fwType == FIT_FSCTRL) {
+    if (_fwType == FIT_FS3 || _fwType == FIT_FS4 || _fwType == FIT_FSCTRL)
+    {
         u_int32_t devid = 0;
-        mfile *mf = _fwOps->getMfileObj();
-        if (mf != NULL) {//Patch for BF1
+        mfile* mf = _fwOps->getMfileObj();
+        if (mf != NULL)
+        { // Patch for BF1
             int is_livefish_mode = dm_is_livefish_mode(mf);
-            if (is_livefish_mode == 1) {
-                if (mread4(mf, 0xf0014, &devid) != 4) {
+            if (is_livefish_mode == 1)
+            {
+                if (mread4(mf, 0xf0014, &devid) != 4)
+                {
                     devid = 0;
                 }
-                else {
+                else
+                {
                     devid &= 0xffff; // remove revid (BF1-rev1 is 0x00010211)
-                    if (devid == BF_HW_ID && is_arm()) {
-                        //for Bluefield need also check the life cycle, but only on ARM side!
+                    if (devid == BF_HW_ID && is_arm())
+                    {
+                        // for Bluefield need also check the life cycle, but only on ARM side!
                         string bf_lifecycle_file = "/sys/bus/platform/drivers/mlx-bootctl/lifecycle_state";
                         bool IsHmacAllowed = true;
-                        if (is_file_exists(bf_lifecycle_file)) {
+                        if (is_file_exists(bf_lifecycle_file))
+                        {
                             std::vector<u_int8_t> buff;
-                            if (readFromFile(bf_lifecycle_file, buff)) {
-                                if (buff.size() >= 10) {//LIFE_CYCLE should not be GA Secured
-                                    if (buff[0] == 'G' && buff[1] == 'A' && buff[2] == ' ' && buff[3] == 'S' && buff[4] == 'e' && buff[5] == 'c' && buff[6] == 'u' && buff[7] == 'r' && buff[8] == 'e' && buff[9] == 'd') {
+                            if (readFromFile(bf_lifecycle_file, buff))
+                            {
+                                if (buff.size() >= 10)
+                                { // LIFE_CYCLE should not be GA Secured
+                                    if (buff[0] == 'G' && buff[1] == 'A' && buff[2] == ' ' && buff[3] == 'S' &&
+                                        buff[4] == 'e' && buff[5] == 'c' && buff[6] == 'u' && buff[7] == 'r' &&
+                                        buff[8] == 'e' && buff[9] == 'd')
+                                    {
                                         IsHmacAllowed = false;
                                     }
-                                    if(IsHmacAllowed == true) {
+                                    if (IsHmacAllowed == true)
+                                    {
                                         _burnParams.use_chip_type = true;
                                         _burnParams.chip_type = FwOperations::getChipType(devid);
                                     }
@@ -2911,14 +3382,16 @@ FlintStatus BurnSubCommand::executeCommand()
         UnlockDevice(_fwOps);
         return res;
     }
-    else if (_fwType == FIT_FS2) {
+    else if (_fwType == FIT_FS2)
+    {
         FlintStatus res = burnFs2();
         UnlockDevice(_fwOps);
         return res;
     }
     // unknown fw type
     reportErr(true, FLINT_UNKNOWN_FW_TYPE_ERROR);
-    if (UnlockDevice(_fwOps) == FLINT_FAILED) {
+    if (UnlockDevice(_fwOps) == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
@@ -2927,20 +3400,25 @@ FlintStatus BurnSubCommand::executeCommand()
 u_int32_t SubCommand::getUserChoice(u_int32_t maximumValue)
 {
     u_int32_t choice = 0xffff;
-    while (true) {
+    while (true)
+    {
         int res = scanf("%d", &choice);
-        if (res != 1) {
-            while (getchar() != '\n');
+        if (res != 1)
+        {
+            while (getchar() != '\n')
+                ;
             printf("Invalid data entered, try again!\n");
             continue;
         }
-        if (choice > maximumValue) {
+        if (choice > maximumValue)
+        {
             printf("Please choose the version or 0 to exit:\n");
             continue;
         }
         break;
     }
-    if (choice == 0) {
+    if (choice == 0)
+    {
         exit(0);
     }
     return choice;
@@ -2950,31 +3428,39 @@ FlintStatus BurnSubCommand::burnMFA2LiveFish(dm_dev_id_t devid_t)
 {
 #ifndef NO_MSTARCHIVE
     int deviceMajorVer = 0;
-    if (DeviceConnectX4 == devid_t) {
+    if (DeviceConnectX4 == devid_t)
+    {
         deviceMajorVer = 12;
     }
-    else if (DeviceConnectX4LX == devid_t) {
+    else if (DeviceConnectX4LX == devid_t)
+    {
         deviceMajorVer = 14;
     }
-    else if (DeviceConnectX5 == devid_t) {
+    else if (DeviceConnectX5 == devid_t)
+    {
         deviceMajorVer = 16;
     }
-    else if (DeviceConnectX6 == devid_t) {
+    else if (DeviceConnectX6 == devid_t)
+    {
         deviceMajorVer = 20;
     }
-    else if (DeviceConnectX6DX == devid_t) {
+    else if (DeviceConnectX6DX == devid_t)
+    {
         deviceMajorVer = 22;
     }
-    else if (DeviceConnectX6LX == devid_t) {
+    else if (DeviceConnectX6LX == devid_t)
+    {
         deviceMajorVer = 26;
     }
-    else {
+    else
+    {
         reportErr(true, "The MFA2 burning is not supported in livefish for current device %d", (int)devid_t);
         return FLINT_FAILED;
     }
-    
+
     vector<u_int8_t> componentBuffer;
-    if (_flintParams.use_psid == false) {
+    if (_flintParams.use_psid == false)
+    {
         reportErr(true, "Must supply \"--psid\" flag while burning device in the livefish mode with MFA2\n");
         return FLINT_FAILED;
     }
@@ -2985,32 +3471,44 @@ FlintStatus BurnSubCommand::burnMFA2LiveFish(dm_dev_id_t devid_t)
     fw_ver[2] = 0xffff;
     map_string_to_component matchingComponentsMap = _mfa2Pkg->getMatchingComponents(psid, fw_ver);
     u_int32_t matchingSize = matchingComponentsMap.size();
-    if (matchingSize == 0) {
+    if (matchingSize == 0)
+    {
         reportErr(true, "No matching binaries found for device %s\n", _flintParams.device.c_str());
         return FLINT_FAILED;
     }
-    else {
-        if (matchingSize == 1) {
+    else
+    {
+        if (matchingSize == 1)
+        {
             _mfa2Pkg->unzipComponent(matchingComponentsMap, 0, componentBuffer);
         }
-        else {
-            if (_flintParams.use_latest_fw_version == true) {
-        if (_mfa2Pkg->unzipLatestVersionComponent(matchingComponentsMap, componentBuffer) == false) {
-            return FLINT_FAILED;
+        else
+        {
+            if (_flintParams.use_latest_fw_version == true)
+            {
+                if (_mfa2Pkg->unzipLatestVersionComponent(matchingComponentsMap, componentBuffer) == false)
+                {
+                    return FLINT_FAILED;
                 }
             }
-            else {
+            else
+            {
                 int i = 1;
                 printf("------FW Version Selection for %s------\n", _flintParams.device.c_str());
-                for (map_string_to_component::iterator it = matchingComponentsMap.begin(); it != matchingComponentsMap.end(); it++) {
+                for (map_string_to_component::iterator it = matchingComponentsMap.begin();
+                     it != matchingComponentsMap.end();
+                     it++)
+                {
                     printf("%d. %s\n", i++, it->first.c_str());
                 }
                 printf("-I- Please choose the version or 0 to exit:\n");
                 u_int32_t choice = getUserChoice(matchingSize) - 1;
-                if (_mfa2Pkg->unzipComponent(matchingComponentsMap, choice, componentBuffer) == false) {
+                if (_mfa2Pkg->unzipComponent(matchingComponentsMap, choice, componentBuffer) == false)
+                {
                     return FLINT_FAILED;
                 }
-                while (getchar() != '\n');//clean the stdin buffer
+                while (getchar() != '\n')
+                    ; // clean the stdin buffer
             }
         }
     }
@@ -3018,14 +3516,17 @@ FlintStatus BurnSubCommand::burnMFA2LiveFish(dm_dev_id_t devid_t)
     _flintParams.override_cache_replacement = true;
     _flintParams.image_specified = false;
 
-    if (openOps(true, true) == FLINT_FAILED) {
+    if (openOps(true, true) == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     struct cx4fw_uid_entry base_guid = {0, 0, 0};
     struct cx4fw_uid_entry base_mac = {0, 0, 0};
     bool NeedToSetMacManually = true;
-    if (_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false))) {
-        if (_devInfo.fs3_info.fs3_uids_info.valid_field == 1) {
+    if (_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false)))
+    {
+        if (_devInfo.fs3_info.fs3_uids_info.valid_field == 1)
+        {
             base_guid.num_allocated = _devInfo.fs3_info.fs3_uids_info.cx4_uids.base_guid.num_allocated;
             base_guid.step = _devInfo.fs3_info.fs3_uids_info.cx4_uids.base_guid.step;
             base_guid.uid = _devInfo.fs3_info.fs3_uids_info.cx4_uids.base_guid.uid;
@@ -3036,42 +3537,53 @@ FlintStatus BurnSubCommand::burnMFA2LiveFish(dm_dev_id_t devid_t)
         }
     }
 
-    u_int8_t fs4_image_signature[] = { 0x4D, 0x54, 0x46, 0x57, 0xAB, 0xCD, 0xEF, 0x00, 0xFA, 0xDE, 0x12, 0x34, 0x56, 0x78, 0xDE, 0xAD };
-    u_int8_t fs3_image_signature[] = { 0x4D, 0x54, 0x46, 0x57, 0x8C, 0xDF, 0xD0, 0x00, 0xDE, 0xAD, 0x92, 0x70, 0x41, 0x54, 0xBE, 0xEF };
+    u_int8_t fs4_image_signature[] = {0x4D, 0x54, 0x46, 0x57, 0xAB, 0xCD, 0xEF, 0x00,
+                                      0xFA, 0xDE, 0x12, 0x34, 0x56, 0x78, 0xDE, 0xAD};
+    u_int8_t fs3_image_signature[] = {0x4D, 0x54, 0x46, 0x57, 0x8C, 0xDF, 0xD0, 0x00,
+                                      0xDE, 0xAD, 0x92, 0x70, 0x41, 0x54, 0xBE, 0xEF};
     _fwType = _fwOps->FwType();
-    if (_fwType == FIT_FS4 || _fwType == FIT_FSCTRL) {
-        for (u_int8_t i = 0; i < sizeof(fs4_image_signature); i++) {
+    if (_fwType == FIT_FS4 || _fwType == FIT_FSCTRL)
+    {
+        for (u_int8_t i = 0; i < sizeof(fs4_image_signature); i++)
+        {
             componentBuffer[i] = fs4_image_signature[i];
         }
     }
-    else if (_fwType == FIT_FS3) {
-        for (u_int8_t i = 0; i < sizeof(fs3_image_signature); i++) {
+    else if (_fwType == FIT_FS3)
+    {
+        for (u_int8_t i = 0; i < sizeof(fs3_image_signature); i++)
+        {
             componentBuffer[i] = fs3_image_signature[i];
         }
     }
 
-    string fileName = "/tmp/temp.bin";  // Get temp name
+    string fileName = "/tmp/temp.bin"; // Get temp name
     writeImageToFile(fileName.c_str(), componentBuffer.data(), componentBuffer.size());
     _flintParams.image_specified = true;
     _flintParams.image = fileName;
 
-    if (openOps(true, true) == FLINT_FAILED) {
+    if (openOps(true, true) == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (_fwOps->RemoveWriteProtection() == false) {
+    if (_fwOps->RemoveWriteProtection() == false)
+    {
         reportErr(true, "Failed to disable flash write protection: %s", _fwOps->err());
         return FLINT_FAILED;
     }
-    
-    if (_imgOps->RestoreDevToc(componentBuffer, psid, devid_t, base_guid, base_mac) == false) {
+
+    if (_imgOps->RestoreDevToc(componentBuffer, psid, devid_t, base_guid, base_mac) == false)
+    {
         reportErr(true, "Failed to restore DTOCs for device %s: %s.\n", _flintParams.device.c_str(), _imgOps->err());
         return FLINT_FAILED;
     }
     writeImageToFile(fileName.c_str(), componentBuffer.data(), componentBuffer.size());
-    if (openOps(true, false) == FLINT_FAILED) {
+    if (openOps(true, false) == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (!_imgOps->FwQuery(&_imgInfo)) {
+    if (!_imgOps->FwQuery(&_imgInfo))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Image", _flintParams.image.c_str(), _imgOps->err());
         return FLINT_FAILED;
     }
@@ -3079,12 +3591,13 @@ FlintStatus BurnSubCommand::burnMFA2LiveFish(dm_dev_id_t devid_t)
     _flintParams.ignore_dev_data = true;
     _flintParams.override_cache_replacement = true;
     _flintParams.guid_specified = true;
-    if (NeedToSetMacManually) {
+    if (NeedToSetMacManually)
+    {
         printf("Warning: No valid GUID/MAC found on the device flash. You will need to set it manually.\n");
     }
     updateBurnParams();
     _burnParams.allowPsidChange = true;
-    
+
     return burnFs3();
 #else
     (void)devid_t;
@@ -3095,36 +3608,42 @@ FlintStatus BurnSubCommand::burnMFA2LiveFish(dm_dev_id_t devid_t)
 
 FlintStatus BurnSubCommand::burnCongestionControl()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (!_fwOps->FwQuery(&_devInfo)) {
+    if (!_fwOps->FwQuery(&_devInfo))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(), _fwOps->err());
         return FLINT_FAILED;
     }
     bool is_fw_ctrl = _fwOps->IsFsCtrlOperations();
-    if (!is_fw_ctrl) {
+    if (!is_fw_ctrl)
+    {
         reportErr(true, "Burning CongestionControl is not supported without FW control.\n");
         return FLINT_FAILED;
     }
 
     vector<u_int8_t> componentBuffer;
-    if (!readFromFile(_flintParams.image, componentBuffer)) {
+    if (!readFromFile(_flintParams.image, componentBuffer))
+    {
         return FLINT_FAILED;
     }
 
     int sig = FwOperations::getFileSignature(_flintParams.image.c_str());
-    if (sig != FwOperations::IMG_SIG_TYPE_CC) { //i.e we failed to check the magic pattern of the file
+    if (sig != FwOperations::IMG_SIG_TYPE_CC)
+    { // i.e we failed to check the magic pattern of the file
         reportErr(true, "Burning CC image failed: Wrong Image signature\n");
         return FLINT_FAILED;
     }
     updateBurnParams();
-    componentBuffer[0] = 0xff;//due the FW needs.
-    componentBuffer[1] = 0xff;//due the FW needs.
-    componentBuffer[2] = 0xff;//due the FW needs.
-    componentBuffer[3] = 0xff;//due the FW needs.
+    componentBuffer[0] = 0xff; // due the FW needs.
+    componentBuffer[1] = 0xff; // due the FW needs.
+    componentBuffer[2] = 0xff; // due the FW needs.
+    componentBuffer[3] = 0xff; // due the FW needs.
     bool res = _fwOps->FwBurnAdvanced(componentBuffer, _burnParams, FwComponent::COMPID_CONGESTION_CONTROL);
-    if (!res) {
+    if (!res)
+    {
         reportErr(true, "Burning CC image failed: %s, FW error\n", _fwOps->err());
         return FLINT_FAILED;
     }
@@ -3132,13 +3651,13 @@ FlintStatus BurnSubCommand::burnCongestionControl()
     return FLINT_SUCCESS;
 }
 
-
 FlintStatus BurnSubCommand::burnMFA2()
 {
 #ifndef NO_MSTARCHIVE
     vector<u_int8_t> componentBuffer;
     map_string_to_component matchingComponentsMap;
-    if (!_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false))) {
+    if (!_fwOps->FwQuery(&_devInfo, true, false, true, false, (_flintParams.silent == false)))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(), _fwOps->err());
         return FLINT_FAILED;
     }
@@ -3149,60 +3668,76 @@ FlintStatus BurnSubCommand::burnMFA2()
     fw_ver[2] = 0xffff;
     matchingComponentsMap = _mfa2Pkg->getMatchingComponents((char*)_devInfo.fw_info.psid, fw_ver);
     u_int32_t matchingSize = matchingComponentsMap.size();
-    if (matchingSize == 0) {
+    if (matchingSize == 0)
+    {
         reportErr(true, "No matching binaries found for device %s\n", _flintParams.device.c_str());
         return FLINT_FAILED;
     }
-    else {
-        //If there is only one matching FW binary, unzip it
-        if (matchingSize == 1) {
+    else
+    {
+        // If there is only one matching FW binary, unzip it
+        if (matchingSize == 1)
+        {
             _mfa2Pkg->unzipComponent(matchingComponentsMap, 0, componentBuffer);
         }
-        else {
-            //user wants the latest version automatically
-            if (_flintParams.use_latest_fw_version == true) {
-                if (_mfa2Pkg->unzipLatestVersionComponent(matchingComponentsMap, componentBuffer) == false) {
+        else
+        {
+            // user wants the latest version automatically
+            if (_flintParams.use_latest_fw_version == true)
+            {
+                if (_mfa2Pkg->unzipLatestVersionComponent(matchingComponentsMap, componentBuffer) == false)
+                {
                     return FLINT_FAILED;
                 }
             }
-            //otherwise, user must supply required version 
-            else {
+            // otherwise, user must supply required version
+            else
+            {
                 int i = 1;
                 printf("------FW Version Selection for %s------\n", _flintParams.device.c_str());
-                for (map_string_to_component::iterator it = matchingComponentsMap.begin(); it != matchingComponentsMap.end(); it++) {
+                for (map_string_to_component::iterator it = matchingComponentsMap.begin();
+                     it != matchingComponentsMap.end();
+                     it++)
+                {
                     printf("%d. %s\n", i++, it->first.c_str());
                 }
                 printf("-I- Please choose the version or 0 to exit:\n");
                 u_int32_t choice = getUserChoice(matchingSize) - 1;
-                if (_mfa2Pkg->unzipComponent(matchingComponentsMap, choice, componentBuffer) == false) {
+                if (_mfa2Pkg->unzipComponent(matchingComponentsMap, choice, componentBuffer) == false)
+                {
                     return FLINT_FAILED;
                 }
-                while (getchar() != '\n');//clean the stdin buffer
+                while (getchar() != '\n')
+                    ; // clean the stdin buffer
                 map_string_to_component::iterator itAtOffset = matchingComponentsMap.begin();
                 std::advance(itAtOffset, choice);
                 Component* requiredComponent = &itAtOffset->second;
                 VersionExtension version = requiredComponent->getComponentDescriptor().getVersionExtension();
-                //check FwVersion
+                // check FwVersion
                 u_int32_t fw_ver0 = version.getMajor();
                 u_int32_t fw_ver1 = version.getMinor();
                 u_int32_t fw_ver2 = version.getSubMinor();
-                if (!checkFwVersion(false, fw_ver0, fw_ver1, fw_ver2)) {
+                if (!checkFwVersion(false, fw_ver0, fw_ver1, fw_ver2))
+                {
                     return FLINT_BURN_ABORTED;
                 }
             }
         }
     }
-    const char *imgTypeStr = fwImgTypeToStr(_devInfo.fw_type);
+    const char* imgTypeStr = fwImgTypeToStr(_devInfo.fw_type);
     bool res = _fwOps->FwBurnAdvanced(componentBuffer, _burnParams);
-    if (!res) {
+    if (!res)
+    {
         reportErr(true, FLINT_FSX_BURN_ERROR, imgTypeStr, _fwOps->err());
         return FLINT_FAILED;
     }
-    else {
+    else
+    {
         PRINT_PROGRESS(_burnParams.progressFunc, 101);
         write_result_to_log(FLINT_SUCCESS, "", _flintParams.log_specified);
-        const char *resetRec = _fwOps->FwGetResetRecommandationStr();
-        if (resetRec) {
+        const char* resetRec = _fwOps->FwGetResetRecommandationStr();
+        if (resetRec)
+        {
             printf("-I- %s\n", resetRec);
         }
         return FLINT_SUCCESS;
@@ -3219,11 +3754,13 @@ FlintStatus BurnSubCommand::burnMFA2()
 
 bool QuerySubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() > 1) {
+    if (_flintParams.cmd_params.size() > 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
-    if ((_flintParams.cmd_params.size() == 1) && _flintParams.cmd_params[0] != "full") {
+    if ((_flintParams.cmd_params.size() == 1) && _flintParams.cmd_params[0] != "full")
+    {
         reportErr(true, FLINT_INVALID_OPTION_ERROR, _flintParams.cmd_params[0].c_str(), _name.c_str(), "full");
         return false;
     }
@@ -3232,13 +3769,14 @@ bool QuerySubCommand::verifyParams()
 
 bool QuerySubCommand::checkMac(u_int64_t mac, string& warrStr)
 {
-    if ((mac >> 40) & 0x1) {
-
+    if ((mac >> 40) & 0x1)
+    {
         warrStr = FLINT_MULTI_BIT_WARNING;
         return false;
     }
 
-    if (mac >> 48) {
+    if (mac >> 48)
+    {
         warrStr = FLINT_MORE_48_BITS_WARNING;
         return false;
     }
@@ -3248,67 +3786,88 @@ bool QuerySubCommand::checkMac(u_int64_t mac, string& warrStr)
 
 bool QuerySubCommand::displayFs2Uids(const fw_info_t& fwInfo)
 {
-    const char *mac_indent = "";
+    const char* mac_indent = "";
     bool ibDev;
     bool ethDev;
-    FwOperations::SetDevFlags(fwInfo.fw_info.chip_type, fwInfo.fw_info.dev_type, (fw_img_type)fwInfo.fw_type, ibDev, ethDev);
-    //setDevFlags(fwInfo, ibDev, ethDev);
+    FwOperations::SetDevFlags(fwInfo.fw_info.chip_type, fwInfo.fw_info.dev_type, (fw_img_type)fwInfo.fw_type, ibDev,
+                              ethDev);
+    // setDevFlags(fwInfo, ibDev, ethDev);
     int numPorts = 2;
-    if ((fwInfo.fw_info.chip_type == CT_IS4 || fwInfo.fw_info.chip_type == CT_SWITCHX)) {
+    if ((fwInfo.fw_info.chip_type == CT_IS4 || fwInfo.fw_info.chip_type == CT_SWITCHX))
+    {
         numPorts = 0;
     }
-    //we do not support cards with one port anymore.
+    // we do not support cards with one port anymore.
 
     // GUIDS:
-    if (ibDev) {
-        //report("GUID Des:        Node             Port1            ");
+    if (ibDev)
+    {
+        // report("GUID Des:        Node             Port1            ");
         printf("Description:           Node             ");
-        if (numPorts > 0) {
+        if (numPorts > 0)
+        {
             printf("Port1            ");
         }
-        if (numPorts > 1) {
+        if (numPorts > 1)
+        {
             printf("Port2            ");
         }
         printf("Sys image\n");
 
         printf("GUIDs:                 ");
-        for (u_int32_t i = 0; i < GUIDS; i++) {
-            if ((i == 1 && numPorts < 1) ||
-                (i == 2 && numPorts < 2)) {
+        for (u_int32_t i = 0; i < GUIDS; i++)
+        {
+            if ((i == 1 && numPorts < 1) || (i == 2 && numPorts < 2))
+            {
                 continue;
             }
             printf(GUID_FORMAT " ", fwInfo.fs2_info.guids[i].h, fwInfo.fs2_info.guids[i].l);
         }
-        if (numPorts > 0) {
+        if (numPorts > 0)
+        {
             mac_indent = "                 ";
         }
     }
     // MACS:
-    if (ethDev) {
-        if (fwInfo.fs2_info.guid_num == 6) {
-            if (!ibDev) {
+    if (ethDev)
+    {
+        if (fwInfo.fs2_info.guid_num == 6)
+        {
+            if (!ibDev)
+            {
                 printf("Description:  %s    Port1            Port2\n", mac_indent);
-            } else if (fwInfo.fw_info.chip_type == CT_SWITCHX) {
+            }
+            else if (fwInfo.fw_info.chip_type == CT_SWITCHX)
+            {
                 printf("\nDescription:           Base             Switch\n");
-            } else {
+            }
+            else
+            {
                 printf("\n");
             }
             printf("MACs:          %s       ", mac_indent);
-            for (u_int32_t i = GUIDS; i < 6; i++) {
+            for (u_int32_t i = GUIDS; i < 6; i++)
+            {
                 printf("     " MAC_FORMAT, fwInfo.fs2_info.guids[i].h, fwInfo.fs2_info.guids[i].l);
             }
 
-            for (u_int32_t i = GUIDS; i < 6; i++) {
+            for (u_int32_t i = GUIDS; i < 6; i++)
+            {
                 u_int64_t mac = (((u_int64_t)fwInfo.fs2_info.guids[i].h) << 32) | fwInfo.fs2_info.guids[i].l;
                 string warrStr;
-                if (!fwInfo.fs2_info.blank_guids && !checkMac(mac, warrStr)) {
-                    if (i == GUIDS) {
+                if (!fwInfo.fs2_info.blank_guids && !checkMac(mac, warrStr))
+                {
+                    if (i == GUIDS)
+                    {
                         printf("\n\n");
                     }
-                    printf(FLINT_BAD_MAC_ADRESS_WARNING, fwInfo.fs2_info.guids[i].h, fwInfo.fs2_info.guids[i].l, warrStr.c_str());
+                    printf(FLINT_BAD_MAC_ADRESS_WARNING, fwInfo.fs2_info.guids[i].h, fwInfo.fs2_info.guids[i].l,
+                           warrStr.c_str());
                 }
             }
-        } else {
+        }
+        else
+        {
             printf(FLINT_MAC_ENTRIES_WARNING, 6, fwInfo.fs2_info.guid_num);
         }
     }
@@ -3318,37 +3877,53 @@ bool QuerySubCommand::displayFs2Uids(const fw_info_t& fwInfo)
 }
 #define NA_STR "N/A"
 #define BASE_STR "Base"
-#define PRINT_FS3_OR_NEWER_UID(uid1, str, printStep, isGuid) \
-    if (uid1.uid) { \
-        if (isGuid) { \
-            printf("%-18s     %016" U64H_FMT_GEN, str, uid1.uid); \
-        } else { \
+#define PRINT_FS3_OR_NEWER_UID(uid1, str, printStep, isGuid)             \
+    if (uid1.uid)                                                        \
+    {                                                                    \
+        if (isGuid)                                                      \
+        {                                                                \
+            printf("%-18s     %016" U64H_FMT_GEN, str, uid1.uid);        \
+        }                                                                \
+        else                                                             \
+        {                                                                \
             printf("%-18s     %012" U64H_FMT_GEN "    ", str, uid1.uid); \
-        } \
-    } else { \
-        printf("%-18s     %-16s", str, NA_STR); \
-    } \
-    if (uid1.num_allocated) { \
-        printf("        %d", uid1.num_allocated); \
-    } else { \
-        printf("       %s", NA_STR); \
-    } \
-    if (printStep) { \
-        if (uid1.step) { \
-            printf("        %d", uid1.step); \
-        } else { \
-            printf("       %s", NA_STR); \
-        } \
-    } \
+        }                                                                \
+    }                                                                    \
+    else                                                                 \
+    {                                                                    \
+        printf("%-18s     %-16s", str, NA_STR);                          \
+    }                                                                    \
+    if (uid1.num_allocated)                                              \
+    {                                                                    \
+        printf("        %d", uid1.num_allocated);                        \
+    }                                                                    \
+    else                                                                 \
+    {                                                                    \
+        printf("       %s", NA_STR);                                     \
+    }                                                                    \
+    if (printStep)                                                       \
+    {                                                                    \
+        if (uid1.step)                                                   \
+        {                                                                \
+            printf("        %d", uid1.step);                             \
+        }                                                                \
+        else                                                             \
+        {                                                                \
+            printf("       %s", NA_STR);                                 \
+        }                                                                \
+    }                                                                    \
     printf("\n");
 
-static inline void printFs3OrNewerUids(struct fs3_uid_entry uid, struct fs3_uid_entry orig_uid, string guidMac, bool printStep)
+static inline void
+  printFs3OrNewerUids(struct fs3_uid_entry uid, struct fs3_uid_entry orig_uid, string guidMac, bool printStep)
 {
     string prefix = BASE_STR + string(" ") + guidMac + ":";
     bool isGuid = guidMac.find("GUID") != string::npos ? true : false;
 
     PRINT_FS3_OR_NEWER_UID(uid, prefix.c_str(), printStep, isGuid);
-    if (uid.uid != orig_uid.uid || uid.num_allocated != orig_uid.num_allocated || (printStep && uid.step != orig_uid.step)) {
+    if (uid.uid != orig_uid.uid || uid.num_allocated != orig_uid.num_allocated ||
+        (printStep && uid.step != orig_uid.step))
+    {
         // Print MFG UIDs as well
         prefix = "Orig " + prefix;
         PRINT_FS3_OR_NEWER_UID(orig_uid, prefix.c_str(), printStep, isGuid);
@@ -3357,23 +3932,34 @@ static inline void printFs3OrNewerUids(struct fs3_uid_entry uid, struct fs3_uid_
 
 bool QuerySubCommand::displayFs3Uids(const fw_info_t& fwInfo)
 {
-    if (fwInfo.fs3_info.fs3_uids_info.valid_field) {
+    if (fwInfo.fs3_info.fs3_uids_info.valid_field)
+    {
         // new GUIDs format
         printf("Description:           UID                GuidsNumber\n");
-        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cx4_uids.base_guid, fwInfo.fs3_info.orig_fs3_uids_info.cx4_uids.base_guid, "GUID", false);
-        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cx4_uids.base_mac, fwInfo.fs3_info.orig_fs3_uids_info.cx4_uids.base_mac, "MAC", false);
-    } else {
+        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cx4_uids.base_guid,
+                            fwInfo.fs3_info.orig_fs3_uids_info.cx4_uids.base_guid, "GUID", false);
+        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cx4_uids.base_mac,
+                            fwInfo.fs3_info.orig_fs3_uids_info.cx4_uids.base_mac, "MAC", false);
+    }
+    else
+    {
         printf("Description:           UID                GuidsNumber  Step\n");
         string firstGuid = (fwInfo.fw_info.chip_type != CT_SWITCH_IB) ? "GUID1" : "GUID";
         string firstMac = (fwInfo.fw_info.chip_type != CT_SWITCH_IB) ? "MAC1" : "MAC";
 
-        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.guids[0], fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.guids[0], firstGuid, true);
-        if (fwInfo.fw_info.chip_type != CT_SWITCH_IB) {
-            printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.guids[1], fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.guids[1], "GUID2", true);
+        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.guids[0],
+                            fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.guids[0], firstGuid, true);
+        if (fwInfo.fw_info.chip_type != CT_SWITCH_IB)
+        {
+            printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.guids[1],
+                                fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.guids[1], "GUID2", true);
         }
-        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.macs[0], fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.macs[0], firstMac, true);
-        if (fwInfo.fw_info.chip_type != CT_SWITCH_IB) {
-            printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.macs[1], fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.macs[1], "MAC2", true);
+        printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.macs[0],
+                            fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.macs[0], firstMac, true);
+        if (fwInfo.fw_info.chip_type != CT_SWITCH_IB)
+        {
+            printFs3OrNewerUids(fwInfo.fs3_info.fs3_uids_info.cib_uids.macs[1],
+                                fwInfo.fs3_info.orig_fs3_uids_info.cib_uids.macs[1], "MAC2", true);
         }
     }
     return true;
@@ -3382,33 +3968,45 @@ bool QuerySubCommand::displayFs3Uids(const fw_info_t& fwInfo)
 string QuerySubCommand::printSecurityAttrInfo(u_int32_t m)
 {
     string attr = "";
-    if (m & SMM_SECURE_FW) {
+    if (m & SMM_SECURE_FW)
+    {
         attr += "secure-fw";
-    } else if (m & SMM_SIGNED_FW) {
+    }
+    else if (m & SMM_SIGNED_FW)
+    {
         attr += "signed-fw";
-    } else {
+    }
+    else
+    {
         attr += NA_STR;
         return attr;
     }
-    if (m & SMM_DEBUG_FW) {
+    if (m & SMM_DEBUG_FW)
+    {
         attr += ", debug";
     }
-    if (m & SMM_DEV_FW) {
+    if (m & SMM_DEV_FW)
+    {
         attr += ", dev";
     }
-    if (m & SMM_CS_TOKEN) {
+    if (m & SMM_CS_TOKEN)
+    {
         attr += ", cs-token";
     }
-    if (m & SMM_DBG_TOKEN) {
+    if (m & SMM_DBG_TOKEN)
+    {
         attr += ", dbg-token";
     }
-    if (m & SMM_CRYTO_TO_COMMISSIONING) {
+    if (m & SMM_CRYTO_TO_COMMISSIONING)
+    {
         attr += ", crypto-to-commissioning";
     }
-    if (m & SMM_RMCS_TOKEN) {
+    if (m & SMM_RMCS_TOKEN)
+    {
         attr += ", rmcs-token";
     }
-    if (m & SMM_RMDT_TOKEN) {
+    if (m & SMM_RMDT_TOKEN)
+    {
         attr += ", rmdt-token";
     }
 
@@ -3420,62 +4018,75 @@ FlintStatus QuerySubCommand::printImageInfo(const fw_info_t& fwInfo)
     bool isFs4 = (fwInfo.fw_type == FIT_FS4) ? true : false;
     FwVersion image_version = FwOperations::createFwVersion(&fwInfo.fw_info);
     printf("Image type:            %s\n", fwImgTypeToStr(fwInfo.fw_type));
-    if (fwInfo.fw_info.isfu_major) {
+    if (fwInfo.fw_info.isfu_major)
+    {
         printf("FW ISSU Version:       %d\n", fwInfo.fw_info.isfu_major);
     }
 
-    if (image_version.is_set()) {
+    if (image_version.is_set())
+    {
         printf("FW Version:            %s\n",
-            image_version.get_fw_version(
-                VERSION_FORMAT(fwInfo.fw_info.fw_ver[1])).c_str());
+               image_version.get_fw_version(VERSION_FORMAT(fwInfo.fw_info.fw_ver[1])).c_str());
     }
 
-    if (fwInfo.fw_info.fw_rel_date[0] || fwInfo.fw_info.fw_rel_date[1] || fwInfo.fw_info.fw_rel_date[2]) {
-        printf("FW Release Date:       %x.%x.%x\n", fwInfo.fw_info.fw_rel_date[0], fwInfo.fw_info.fw_rel_date[1], \
-            fwInfo.fw_info.fw_rel_date[2]);
+    if (fwInfo.fw_info.fw_rel_date[0] || fwInfo.fw_info.fw_rel_date[1] || fwInfo.fw_info.fw_rel_date[2])
+    {
+        printf("FW Release Date:       %x.%x.%x\n", fwInfo.fw_info.fw_rel_date[0], fwInfo.fw_info.fw_rel_date[1],
+               fwInfo.fw_info.fw_rel_date[2]);
     }
-    if (fwInfo.fw_info.min_fit_ver[0] || fwInfo.fw_info.min_fit_ver[1] \
-        || fwInfo.fw_info.min_fit_ver[2] || fwInfo.fw_info.min_fit_ver[3]) {
-        printf("Min FIT Version:       %d.%d.%d.%d\n", fwInfo.fw_info.min_fit_ver[0], \
-            fwInfo.fw_info.min_fit_ver[1], fwInfo.fw_info.min_fit_ver[2], fwInfo.fw_info.min_fit_ver[3]);
+    if (fwInfo.fw_info.min_fit_ver[0] || fwInfo.fw_info.min_fit_ver[1] || fwInfo.fw_info.min_fit_ver[2] ||
+        fwInfo.fw_info.min_fit_ver[3])
+    {
+        printf("Min FIT Version:       %d.%d.%d.%d\n", fwInfo.fw_info.min_fit_ver[0], fwInfo.fw_info.min_fit_ver[1],
+               fwInfo.fw_info.min_fit_ver[2], fwInfo.fw_info.min_fit_ver[3]);
     }
-    if ((fwInfo.fw_info.mic_ver[0] || fwInfo.fw_info.mic_ver[1] || fwInfo.fw_info.mic_ver[2])) {
-        printf("MIC Version:           %d.%d.%d\n", fwInfo.fw_info.mic_ver[0], \
-            fwInfo.fw_info.mic_ver[1], fwInfo.fw_info.mic_ver[2]);
+    if ((fwInfo.fw_info.mic_ver[0] || fwInfo.fw_info.mic_ver[1] || fwInfo.fw_info.mic_ver[2]))
+    {
+        printf("MIC Version:           %d.%d.%d\n", fwInfo.fw_info.mic_ver[0], fwInfo.fw_info.mic_ver[1],
+               fwInfo.fw_info.mic_ver[2]);
     }
-    if (strlen(fwInfo.fw_info.product_ver)) {
+    if (strlen(fwInfo.fw_info.product_ver))
+    {
         printf("Product Version:       %s\n", fwInfo.fw_info.product_ver);
     }
-    if (fwInfo.fw_info.roms_info.exp_rom_found) {
+    if (fwInfo.fw_info.roms_info.exp_rom_found)
+    {
         displayExpRomInfo(fwInfo.fw_info.roms_info, "Rom Info:              ");
     }
     char* imageVSD = (char*)fwInfo.fs3_info.image_vsd;
     char* deviceVSD = NULL;
-    if (isFs4) {
+    if (isFs4)
+    {
         deviceVSD = (char*)fwInfo.fs3_info.deviceVsd;
     }
-    else {
+    else
+    {
         deviceVSD = (char*)fwInfo.fw_info.vsd;
     }
 
-    if (strlen(imageVSD) == 0) {
-        if (deviceVSD == NULL || strlen(deviceVSD) == 0) {
+    if (strlen(imageVSD) == 0)
+    {
+        if (deviceVSD == NULL || strlen(deviceVSD) == 0)
+        {
             imageVSD = (char*)NA_STR;
         }
-        else {
+        else
+        {
             imageVSD = deviceVSD;
         }
     }
     printf("Image VSD:             %s\n", imageVSD);
     printf("PSID:                  %s\n", fwInfo.fw_info.psid);
     printf("Security Attributes:   %s\n", printSecurityAttrInfo(fwInfo.fs3_info.security_mode).c_str());
-    
-    if (isFs4) { // Security Version is supported in Connectx-6dx and up
+
+    if (isFs4)
+    { // Security Version is supported in Connectx-6dx and up
         printf("Security Ver:          %d\n", fwInfo.fs3_info.image_security_version);
     }
 
     string updateMethod = "Legacy";
-    if (fwInfo.fs3_info.security_mode & SMM_MCC_EN) {
+    if (fwInfo.fs3_info.security_mode & SMM_MCC_EN)
+    {
         updateMethod = "fw_ctrl";
     }
     printf("Default Update Method: %s\n", updateMethod.c_str());
@@ -3484,232 +4095,304 @@ FlintStatus QuerySubCommand::printImageInfo(const fw_info_t& fwInfo)
 
 FlintStatus QuerySubCommand::printInfo(const fw_info_t& fwInfo, bool fullQuery)
 {
-    DPRINTF(("QuerySubCommand::printInfo fullQuery=%d\n",fullQuery));
+    DPRINTF(("QuerySubCommand::printInfo fullQuery=%d\n", fullQuery));
     bool isFs2 = (fwInfo.fw_type == FIT_FS2) ? true : false;
     bool isFs3 = (fwInfo.fw_type == FIT_FS3) ? true : false;
     bool isFs4 = (fwInfo.fw_type == FIT_FS4) ? true : false;
     bool isFsCtrl = (fwInfo.fw_type == FIT_FSCTRL) ? true : false;
-    FwOperations *ops = (_flintParams.device_specified) ? _fwOps : _imgOps;
+    FwOperations* ops = (_flintParams.device_specified) ? _fwOps : _imgOps;
     FwVersion image_version = FwOperations::createFwVersion(&fwInfo.fw_info);
     FwVersion running_version = FwOperations::createRunningFwVersion(&fwInfo.fw_info);
 
     printf("Image type:            %s\n", fwImgTypeToStr(fwInfo.fw_type));
-    if (fwInfo.fw_info.isfu_major) {
+    if (fwInfo.fw_info.isfu_major)
+    {
         printf("FW ISSU Version:       %d\n", fwInfo.fw_info.isfu_major);
     }
 
-    if (image_version.is_set()) {
+    if (image_version.is_set())
+    {
         printf("FW Version:            %s\n",
-                image_version.get_fw_version(
-                        VERSION_FORMAT(fwInfo.fw_info.fw_ver[1])).c_str());
-        if (nextBootFwVer) {
+               image_version.get_fw_version(VERSION_FORMAT(fwInfo.fw_info.fw_ver[1])).c_str());
+        if (nextBootFwVer)
+        {
             // if nextBootFwVer is true, no need to print all the other values.
             return FLINT_SUCCESS;
         }
-        if (image_version != running_version && running_version.is_set()) {
+        if (image_version != running_version && running_version.is_set())
+        {
             printf("FW Version(Running):   %s\n",
-                    running_version.get_fw_version(
-                            VERSION_FORMAT(fwInfo.fw_info.running_fw_ver[1])).c_str());
+                   running_version.get_fw_version(VERSION_FORMAT(fwInfo.fw_info.running_fw_ver[1])).c_str());
         }
-    } else if (nextBootFwVer) {
-        if (_flintParams.device_specified) {
+    }
+    else if (nextBootFwVer)
+    {
+        if (_flintParams.device_specified)
+        {
             mfile* mf = _fwOps->getMfileObj();
-            if (mf != NULL) {
-                if ((mf->flags & MDEVS_IB) == 0) {//not IB device
-                // if nextBootFwVer is true, and no next boot fw version, print running version (this version is next_boot_fw_ver as well)
-                printf("FW Version:            %s\n",
-                    running_version.get_fw_version(
-                        VERSION_FORMAT(fwInfo.fw_info.running_fw_ver[1])).c_str());
+            if (mf != NULL)
+            {
+                if ((mf->flags & MDEVS_IB) == 0)
+                { // not IB device
+                    // if nextBootFwVer is true, and no next boot fw version, print running version (this version is
+                    // next_boot_fw_ver as well)
+                    printf("FW Version:            %s\n",
+                           running_version.get_fw_version(VERSION_FORMAT(fwInfo.fw_info.running_fw_ver[1])).c_str());
                 }
             }
         }
         return FLINT_SUCCESS;
     }
 
-    if (fwInfo.fw_info.fw_rel_date[0] || fwInfo.fw_info.fw_rel_date[1] || fwInfo.fw_info.fw_rel_date[2]) {
-        printf("FW Release Date:       %x.%x.%x\n", fwInfo.fw_info.fw_rel_date[0], fwInfo.fw_info.fw_rel_date[1], \
+    if (fwInfo.fw_info.fw_rel_date[0] || fwInfo.fw_info.fw_rel_date[1] || fwInfo.fw_info.fw_rel_date[2])
+    {
+        printf("FW Release Date:       %x.%x.%x\n", fwInfo.fw_info.fw_rel_date[0], fwInfo.fw_info.fw_rel_date[1],
                fwInfo.fw_info.fw_rel_date[2]);
     }
-    if (fullQuery) {
+    if (fullQuery)
+    {
         // there is no full query atm just quick query
-        if (fwInfo.fw_info.min_fit_ver[0] || fwInfo.fw_info.min_fit_ver[1] \
-            || fwInfo.fw_info.min_fit_ver[2] || fwInfo.fw_info.min_fit_ver[3]) {
-            printf("Min FIT Version:       %d.%d.%d.%d\n", fwInfo.fw_info.min_fit_ver[0], \
-                   fwInfo.fw_info.min_fit_ver[1], fwInfo.fw_info.min_fit_ver[2], fwInfo.fw_info.min_fit_ver[3]);
-        }
-        if ((fwInfo.fw_info.mic_ver[0] || fwInfo.fw_info.mic_ver[1] || fwInfo.fw_info.mic_ver[2])) {
-            printf("MIC Version:           %d.%d.%d\n", fwInfo.fw_info.mic_ver[0], \
-                   fwInfo.fw_info.mic_ver[1], fwInfo.fw_info.mic_ver[2]);
-        }
-        if (isFs2) {
-            if (fwInfo.fs2_info.config_sectors) {
+        if (fwInfo.fw_info.min_fit_ver[0] || fwInfo.fw_info.min_fit_ver[1] || fwInfo.fw_info.min_fit_ver[2] ||
+            fwInfo.fw_info.min_fit_ver[3])
+        {
+            printf("Min FIT Version:       %d.%d.%d.%d\n", fwInfo.fw_info.min_fit_ver[0], fwInfo.fw_info.min_fit_ver[1],
+                   fwInfo.fw_info.min_fit_ver[2], fwInfo.fw_info.min_fit_ver[3]);
+        }
+        if ((fwInfo.fw_info.mic_ver[0] || fwInfo.fw_info.mic_ver[1] || fwInfo.fw_info.mic_ver[2]))
+        {
+            printf("MIC Version:           %d.%d.%d\n", fwInfo.fw_info.mic_ver[0], fwInfo.fw_info.mic_ver[1],
+                   fwInfo.fw_info.mic_ver[2]);
+        }
+        if (isFs2)
+        {
+            if (fwInfo.fs2_info.config_sectors)
+            {
                 printf("Config Sectors:        %d\n", fwInfo.fs2_info.config_sectors);
             }
-            if (fwInfo.fs2_info.config_pad) {
+            if (fwInfo.fs2_info.config_pad)
+            {
                 printf("Config Pad:            %d\n", fwInfo.fs2_info.config_pad);
             }
-            if (strlen(fwInfo.fs2_info.prs_name)) {
+            if (strlen(fwInfo.fs2_info.prs_name))
+            {
                 printf("PRS Name:              %s\n", fwInfo.fs2_info.prs_name);
             }
-        } else {
+        }
+        else
+        {
             // FS3
-            if (strlen(fwInfo.fs3_info.prs_name)) {
+            if (strlen(fwInfo.fs3_info.prs_name))
+            {
                 printf("PRS Name:              %s\n", fwInfo.fs3_info.prs_name);
             }
-            if (strlen(fwInfo.fs3_info.orig_prs_name)) {
+            if (strlen(fwInfo.fs3_info.orig_prs_name))
+            {
                 printf("Orig PRS Name:         %s\n", fwInfo.fs3_info.orig_prs_name);
             }
-            if (strlen(fwInfo.fs3_info.name)) {
+            if (strlen(fwInfo.fs3_info.name))
+            {
                 printf("Part Number:           %s\n", fwInfo.fs3_info.name);
             }
-            if (strlen(fwInfo.fs3_info.description)) {
+            if (strlen(fwInfo.fs3_info.description))
+            {
                 printf("Description:           %s\n", fwInfo.fs3_info.description);
             }
         }
     }
 
-    if (strlen(fwInfo.fw_info.product_ver)) {
+    if (strlen(fwInfo.fw_info.product_ver))
+    {
         printf("Product Version:       %s\n", fwInfo.fw_info.product_ver);
     }
-    if (fwInfo.fw_info.roms_info.exp_rom_found) {
+    if (fwInfo.fw_info.roms_info.exp_rom_found)
+    {
         displayExpRomInfo(fwInfo.fw_info.roms_info, "Rom Info:              ");
     }
-    else if (_flintParams.skip_rom_query) {
+    else if (_flintParams.skip_rom_query)
+    {
         printf("Rom Info:              type=UEFI version=skipped cpu=skipped\n");
         printf("                       type=PXE  version=skipped devid=skipped cpu=skipped\n");
         printf("                       type=NVMe version=skipped devid=skipped cpu=skipped\n");
     }
-    if (isFs2) {
+    if (isFs2)
+    {
         printf("Device ID:             %d\n", fwInfo.fw_info.dev_type);
     }
 
-    if (isFs2 && fwInfo.fs2_info.access_key_exists) {
+    if (isFs2 && fwInfo.fs2_info.access_key_exists)
+    {
         printf("HW Access Key:         ");
-        if (fwInfo.fs2_info.access_key_value.l || fwInfo.fs2_info.access_key_value.h) {
+        if (fwInfo.fs2_info.access_key_value.l || fwInfo.fs2_info.access_key_value.h)
+        {
             printf("Enabled\n");
-        } else {
+        }
+        else
+        {
             printf("Disabled\n");
         }
     }
 
-    if (!isFs2) {
+    if (!isFs2)
+    {
         /*i.e its fs3/fs4*/
-        if (!displayFs3Uids(fwInfo)) {
+        if (!displayFs3Uids(fwInfo))
+        {
             return FLINT_FAILED;
         }
-    } else {
-        if (!displayFs2Uids(fwInfo)) {
+    }
+    else
+    {
+        if (!displayFs2Uids(fwInfo))
+        {
             return FLINT_FAILED;
         }
     }
 
     // VSD, PSID
-    if (!fwInfo.fw_info.vsd_vendor_id || fwInfo.fw_info.vsd_vendor_id == MELLANOX_VENDOR_ID) {
-        if (!isFs2) {
-            char *imageVSD = (char*)fwInfo.fs3_info.image_vsd;
+    if (!fwInfo.fw_info.vsd_vendor_id || fwInfo.fw_info.vsd_vendor_id == MELLANOX_VENDOR_ID)
+    {
+        if (!isFs2)
+        {
+            char* imageVSD = (char*)fwInfo.fs3_info.image_vsd;
             char* deviceVSD = NULL;
 
-            if (_flintParams.device_specified == false && _flintParams.image_specified == true) {
-                //we're making query on BIN file only
+            if (_flintParams.device_specified == false && _flintParams.image_specified == true)
+            {
+                // we're making query on BIN file only
                 deviceVSD = (char*)fwInfo.fw_info.vsd;
             }
-            else if (isFs4 && !_flintParams.no_fw_ctrl && !_flintParams.override_cache_replacement) {
+            else if (isFs4 && !_flintParams.no_fw_ctrl && !_flintParams.override_cache_replacement)
+            {
                 deviceVSD = (char*)fwInfo.fs3_info.deviceVsd;
             }
-            else {
+            else
+            {
                 deviceVSD = (char*)fwInfo.fw_info.vsd;
             }
-            if (strlen(imageVSD) == 0) {
+            if (strlen(imageVSD) == 0)
+            {
                 imageVSD = (char*)NA_STR;
             }
-            if (strlen(deviceVSD) == 0) {
+            if (strlen(deviceVSD) == 0)
+            {
                 deviceVSD = (char*)NA_STR;
             }
             printf("Image VSD:             %s\n", imageVSD);
             printf("Device VSD:            %s\n", deviceVSD);
             printf("PSID:                  %s\n", fwInfo.fw_info.psid);
-            if (strncmp(fwInfo.fw_info.psid, fwInfo.fs3_info.orig_psid, 13) != 0) {
-                if (strlen(fwInfo.fs3_info.orig_psid)) {
+            if (strncmp(fwInfo.fw_info.psid, fwInfo.fs3_info.orig_psid, 13) != 0)
+            {
+                if (strlen(fwInfo.fs3_info.orig_psid))
+                {
                     printf("Orig PSID:             %s\n", fwInfo.fs3_info.orig_psid);
-                } else {
+                }
+                else
+                {
                     printf("Orig PSID:             %s\n", NA_STR);
                 }
             }
-        } else {
+        }
+        else
+        {
             printf("VSD:                   %s\n", fwInfo.fw_info.vsd);
             printf("PSID:                  %s\n", fwInfo.fw_info.psid);
         }
-    } else {
+    }
+    else
+    {
         printf(FLINT_NOT_MLNX_FW_WARNING, fwInfo.fw_info.vsd_vendor_id);
     }
 
-    if (isFs3 || isFs4 || isFsCtrl) {
-        printf("Security Attributes:   %s\n",
-               printSecurityAttrInfo(fwInfo.fs3_info.security_mode).c_str());
+    if (isFs3 || isFs4 || isFsCtrl)
+    {
+        printf("Security Attributes:   %s\n", printSecurityAttrInfo(fwInfo.fs3_info.security_mode).c_str());
     }
 
-    if (isFs4 && _flintParams.image_specified) { //Security Version is supported in Connectx-6dx and up
+    if (isFs4 && _flintParams.image_specified)
+    { // Security Version is supported in Connectx-6dx and up
         printf("Security Ver:          %d\n", fwInfo.fs3_info.image_security_version);
     }
 
-    if ((isFs3 || isFs4 || isFsCtrl) && fullQuery) {
+    if ((isFs3 || isFs4 || isFsCtrl) && fullQuery)
+    {
         string updateMethod = "Legacy";
-        if (fwInfo.fs3_info.security_mode & SMM_MCC_EN) {
+        if (fwInfo.fs3_info.security_mode & SMM_MCC_EN)
+        {
             updateMethod = "fw_ctrl";
         }
         printf("Default Update Method: %s\n", updateMethod.c_str());
     }
 
-    if (fullQuery && _flintParams.device_specified) {
-        if (ops->IsFsCtrlOperations()) { //working only on devices with FW control
-            if (ops->IsLifeCycleSupported()) { //from CX6 and above
+    if (fullQuery && _flintParams.device_specified)
+    {
+        if (ops->IsFsCtrlOperations())
+        { // working only on devices with FW control
+            if (ops->IsLifeCycleSupported())
+            { // from CX6 and above
                 unsigned int index = (unsigned int)fwInfo.fs3_info.life_cycle;
-                if (index >= NUM_OF_LIFE_CYCLES) {
+                if (index >= NUM_OF_LIFE_CYCLES)
+                {
                     reportErr(true, "The life cycle value is out of range: %u", index);
                 }
-                else {
+                else
+                {
                     printf("Life cycle:            %s\n", life_cycle_strings[index]);
                 }
             }
-            if (ops->IsSecureBootSupported()) { //from CX6DX and above
+            if (ops->IsSecureBootSupported())
+            { // from CX6DX and above
                 printf("Secure Boot Capable:   %s\n", fwInfo.fs3_info.sec_boot == 1 ? "Enabled" : "Disabled");
 
-                if (fwInfo.fs3_info.device_security_version_access_method == MFSV) {
+                if (fwInfo.fs3_info.device_security_version_access_method == MFSV)
+                {
                     printf("EFUSE Security Ver:    %d\n", fwInfo.fs3_info.device_security_version_mfsv.efuses_sec_ver);
                     printf("Image Security Ver:    %d\n", fwInfo.fs3_info.device_security_version_mfsv.img_sec_ver);
 
                     string efuses_programming_info;
-                    if (fwInfo.fs3_info.device_security_version_mfsv.efuses_prog_method == 0) {
-                        if (fwInfo.fs3_info.device_security_version_mfsv.efuses_prog_en == 0) {
+                    if (fwInfo.fs3_info.device_security_version_mfsv.efuses_prog_method == 0)
+                    {
+                        if (fwInfo.fs3_info.device_security_version_mfsv.efuses_prog_en == 0)
+                        {
                             efuses_programming_info = "Manually ; Disabled"; // disabled
-                        } else {
+                        }
+                        else
+                        {
                             efuses_programming_info = "Manually ; Enabled"; // next boot only
                         }
-                    } else {
-                        efuses_programming_info = "Automatically"; // every boot 
                     }
-                    printf("Security Ver Program:  %s\n", efuses_programming_info.c_str()); 
+                    else
+                    {
+                        efuses_programming_info = "Automatically"; // every boot
+                    }
+                    printf("Security Ver Program:  %s\n", efuses_programming_info.c_str());
                 }
-                
-                if (ops->IsEncryptionSupported()) {
+
+                if (ops->IsEncryptionSupported())
+                {
                     printf("Encryption:            %s\n", fwInfo.fs3_info.encryption == 1 ? "Enabled" : "Disabled");
                 }
-            }            
+            }
         }
-        else { // No fw control            
-            if (ops->IsSecureBootSupported()) { // CX6DX onwards
-                if (ops->IsLifeCycleAccessible(fwInfo.fw_info.chip_type)) {
+        else
+        { // No fw control
+            if (ops->IsSecureBootSupported())
+            { // CX6DX onwards
+                if (ops->IsLifeCycleAccessible(fwInfo.fw_info.chip_type))
+                {
+                    printf("Image Boot Status:     %d\n", fwInfo.fs3_info.global_image_status);
 
-                    printf("Image Boot Status:     %d\n", fwInfo.fs3_info.global_image_status);                    
-                    
                     unsigned int index = (unsigned int)fwInfo.fs3_info.life_cycle;
-                    if (index >= NUM_OF_LIFE_CYCLES) {
+                    if (index >= NUM_OF_LIFE_CYCLES)
+                    {
                         reportErr(true, "The life cycle value is out of range: %u", index);
                     }
-                    else {
+                    else
+                    {
                         printf("Life cycle:            %s\n", life_cycle_strings[index]);
                     }
-                    if (fwInfo.fs3_info.life_cycle == GA_SECURED && fwInfo.fs3_info.device_security_version_access_method == DIRECT_ACCESS) {
+                    if (fwInfo.fs3_info.life_cycle == GA_SECURED &&
+                        fwInfo.fs3_info.device_security_version_access_method == DIRECT_ACCESS)
+                    {
                         printf("EFUSE Security Ver:    %d\n", fwInfo.fs3_info.device_security_version_gw);
                     }
                 }
@@ -3717,8 +4400,9 @@ FlintStatus QuerySubCommand::printInfo(const fw_info_t& fwInfo, bool fullQuery)
         }
     }
 
-    if (isFs2 && fwInfo.fs2_info.blank_guids) {
-        //blankGuids only exsists in FS2 image type in mlxfwops why?
+    if (isFs2 && fwInfo.fs2_info.blank_guids)
+    {
+        // blankGuids only exsists in FS2 image type in mlxfwops why?
         printf(FLINT_BLANK_GUIDS_WARNING);
     }
     return FLINT_SUCCESS;
@@ -3741,15 +4425,13 @@ QuerySubCommand::QuerySubCommand()
     _mccSupported = true;
 }
 
-QuerySubCommand:: ~QuerySubCommand()
-{
-
-}
+QuerySubCommand::~QuerySubCommand() {}
 
 FlintStatus QuerySubCommand::queryMFA2()
 {
 #ifndef NO_MSTARCHIVE
-    if (_flintParams.use_psid == false) {
+    if (_flintParams.use_psid == false)
+    {
         reportErr(true, "Must supply \"--psid\" flag while querying MFA2 archive\n");
         return FLINT_FAILED;
     }
@@ -3760,44 +4442,56 @@ FlintStatus QuerySubCommand::queryMFA2()
     fw_ver[2] = 0xffff;
     map_string_to_component matchingComponentsMap = _mfa2Pkg->getMatchingComponents(psid, fw_ver);
     u_int32_t matchingSize = matchingComponentsMap.size();
-    if (matchingSize == 0) {
+    if (matchingSize == 0)
+    {
         reportErr(true, "No matching binaries found for MFA2 %s\n", _flintParams.image.c_str());
         return FLINT_FAILED;
     }
-    else {
+    else
+    {
         int i = 1;
-        u_int8_t fs4_image_signature[] = { 0x4D, 0x54, 0x46, 0x57, 0xAB, 0xCD, 0xEF, 0x00, 0xFA, 0xDE, 0x12, 0x34, 0x56, 0x78, 0xDE, 0xAD };
-        u_int8_t fs3_image_signature[] = { 0x4D, 0x54, 0x46, 0x57, 0x8C, 0xDF, 0xD0, 0x00, 0xDE, 0xAD, 0x92, 0x70, 0x41, 0x54, 0xBE, 0xEF };
+        u_int8_t fs4_image_signature[] = {0x4D, 0x54, 0x46, 0x57, 0xAB, 0xCD, 0xEF, 0x00,
+                                          0xFA, 0xDE, 0x12, 0x34, 0x56, 0x78, 0xDE, 0xAD};
+        u_int8_t fs3_image_signature[] = {0x4D, 0x54, 0x46, 0x57, 0x8C, 0xDF, 0xD0, 0x00,
+                                          0xDE, 0xAD, 0x92, 0x70, 0x41, 0x54, 0xBE, 0xEF};
         map_string_to_component::iterator it = matchingComponentsMap.begin();
         printf("\n*******************************\n");
-        for (u_int32_t index = 0; index < matchingSize && it != matchingComponentsMap.end(); index++, it++) {
-            const ComponentDescriptor & compDescr = it->second.getComponentDescriptor();
+        for (u_int32_t index = 0; index < matchingSize && it != matchingComponentsMap.end(); index++, it++)
+        {
+            const ComponentDescriptor& compDescr = it->second.getComponentDescriptor();
             u_int8_t deviceMajorVer = compDescr.getVersionExtension().getMajor();
             vector<u_int8_t> componentBuffer;
             _mfa2Pkg->unzipComponent(matchingComponentsMap, index, componentBuffer);
-            char errBuff[ERR_BUFF_SIZE] = { 0 };
-            string fileName = "/tmp/temp.bin";  // Get temp name
-            if (deviceMajorVer >= 16) {
-                for (u_int8_t i = 0; i < sizeof(fs4_image_signature); i++) {
+            char errBuff[ERR_BUFF_SIZE] = {0};
+            string fileName = "/tmp/temp.bin"; // Get temp name
+            if (deviceMajorVer >= 16)
+            {
+                for (u_int8_t i = 0; i < sizeof(fs4_image_signature); i++)
+                {
                     componentBuffer[i] = fs4_image_signature[i];
                 }
             }
-            else {
-                for (u_int8_t i = 0; i < sizeof(fs3_image_signature); i++) {
+            else
+            {
+                for (u_int8_t i = 0; i < sizeof(fs3_image_signature); i++)
+                {
                     componentBuffer[i] = fs3_image_signature[i];
                 }
             }
             writeImageToFile(fileName.c_str(), componentBuffer.data(), componentBuffer.size());
             _flintParams.image_specified = true;
             _flintParams.image = fileName;
-            _imgOps = FwOperations::FwOperationsCreate((void*)_flintParams.image.c_str(), NULL, NULL, FHT_FW_FILE, errBuff, ERR_BUFF_SIZE, _flintParams.ignore_crc_check);
+            _imgOps = FwOperations::FwOperationsCreate((void*)_flintParams.image.c_str(), NULL, NULL, FHT_FW_FILE,
+                                                       errBuff, ERR_BUFF_SIZE, _flintParams.ignore_crc_check);
             fw_info_t fwInfo;
-            if (!_imgOps->FwQuery(&fwInfo, true, false, true, true)) {
+            if (!_imgOps->FwQuery(&fwInfo, true, false, true, true))
+            {
                 reportErr(true, FLINT_FAILED_QUERY_ERROR, "image", _flintParams.image.c_str(), _imgOps->err());
                 return FLINT_FAILED;
             }
             printf("Component %d\n", i++);
-            if (printImageInfo(fwInfo) == FLINT_FAILED) {
+            if (printImageInfo(fwInfo) == FLINT_FAILED)
+            {
                 return FLINT_FAILED;
             }
             printf("*******************************\n");
@@ -3811,52 +4505,62 @@ FlintStatus QuerySubCommand::executeCommand()
 {
     DPRINTF(("QuerySubCommand::executeCommand\n"));
 
-    if (_flintParams.linkx_control == true) {
-        if (_flintParams.device_specified == false) {
+    if (_flintParams.linkx_control == true)
+    {
+        if (_flintParams.device_specified == false)
+        {
             reportErr(true, FLINT_NO_DEVICE_ERROR);
             return FLINT_FAILED;
         }
-        if (_flintParams.downstream_device_ids.size() == 0) {
+        if (_flintParams.downstream_device_ids.size() == 0)
+        {
             reportErr(true, "Flag \"--downstream_device_ids\" with values should be provided.\n");
             return FLINT_FAILED;
         }
         return QueryLinkX(_flintParams.device, _flintParams.output_file, _flintParams.downstream_device_ids);
     }
-    if (_flintParams.image_specified) {
+    if (_flintParams.image_specified)
+    {
 #ifndef NO_MSTARCHIVE
         string mfa2file = _flintParams.image;
         _mfa2Pkg = MFA2::LoadMFA2Package(mfa2file);
-        if (_mfa2Pkg != NULL) {
+        if (_mfa2Pkg != NULL)
+        {
             _flintParams.mfa2_specified = true;
             return queryMFA2();
         }
 #endif
     }
-    if (_flintParams.low_cpu) {
+    if (_flintParams.low_cpu)
+    {
         set_increase_poll_time(1);
     }
-    if (_flintParams.next_boot_fw_ver) {
+    if (_flintParams.next_boot_fw_ver)
+    {
         nextBootFwVer = true;
     }
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
 
     fw_info_t fwInfo;
-    FwOperations *ops;
+    FwOperations* ops;
     bool fullQuery = false;
-    //check on what we are working
+    // check on what we are working
     ops = (_flintParams.device_specified) ? _fwOps : _imgOps;
-    if (!ops->FwQuery(&fwInfo, !_flintParams.skip_rom_query, _flintParams.striped_image)) {
+    if (!ops->FwQuery(&fwInfo, !_flintParams.skip_rom_query, _flintParams.striped_image))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, _flintParams.device_specified ? "Device" : "image",
                   _flintParams.device_specified ? _flintParams.device.c_str() : _flintParams.image.c_str(), ops->err());
         return FLINT_FAILED;
     }
 
-    //print fw_info nicely to the user
+    // print fw_info nicely to the user
     // we actually dont use "regular" query , just quick
-    //ORENK - no use to display quick query message to the user if we dont do it in any other way
-    if (_flintParams.cmd_params.size() == 1) {
+    // ORENK - no use to display quick query message to the user if we dont do it in any other way
+    if (_flintParams.cmd_params.size() == 1)
+    {
         fullQuery = true;
     }
     FlintStatus queryResult = printInfo(fwInfo, fullQuery);
@@ -3864,8 +4568,8 @@ FlintStatus QuerySubCommand::executeCommand()
 }
 
 /***********************
-* Class: ImageReactivationSubCommand
-***********************/
+ * Class: ImageReactivationSubCommand
+ ***********************/
 ImageReactivationSubCommand::ImageReactivationSubCommand()
 {
     _name = "image_reactivation";
@@ -3882,16 +4586,19 @@ ImageReactivationSubCommand::ImageReactivationSubCommand()
 
 bool ImageReactivationSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() != 0) {
+    if (_flintParams.cmd_params.size() != 0)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 0, (int)_flintParams.cmd_params.size());
         return false;
     }
-    if (_flintParams.no_fw_ctrl) {
+    if (_flintParams.no_fw_ctrl)
+    {
         reportErr(true, FLINT_INVALID_FLAG_WITH_CMD_ERROR, "-no_fw_ctrl", "image_reactivation");
         return false;
     }
 
-    if (_flintParams.override_cache_replacement) {
+    if (_flintParams.override_cache_replacement)
+    {
         reportErr(true, FLINT_INVALID_FLAG_WITH_CMD_ERROR, "-ocr", "image_reactivation");
         return false;
     }
@@ -3899,24 +4606,23 @@ bool ImageReactivationSubCommand::verifyParams()
     return true;
 }
 
-ImageReactivationSubCommand::~ImageReactivationSubCommand() 
-{
-
-}
-
+ImageReactivationSubCommand::~ImageReactivationSubCommand() {}
 
 FlintStatus ImageReactivationSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     fw_info_t fwInfo;
     FwOperations* ops = _fwOps;
-    if (!ops->FwQuery(&fwInfo)) {
+    if (!ops->FwQuery(&fwInfo))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(), ops->err());
         return FLINT_FAILED;
     }
-    if (!_fwOps->FwReactivateImage()) {
+    if (!_fwOps->FwReactivateImage())
+    {
         reportErr(true, FLINT_FAILED_IMAGE_REACTIVATION_ERROR, _flintParams.device.c_str(), ops->err());
         return FLINT_FAILED;
     }
@@ -3924,8 +4630,8 @@ FlintStatus ImageReactivationSubCommand::executeCommand()
     return FLINT_SUCCESS;
 }
 /***********************
-* Class: VerifySubCommand
-***********************/
+ * Class: VerifySubCommand
+ ***********************/
 VerifySubCommand::VerifySubCommand()
 {
     _name = "verify";
@@ -3941,19 +4647,17 @@ VerifySubCommand::VerifySubCommand()
     _cmdType = SC_Verify;
 }
 
-VerifySubCommand:: ~VerifySubCommand()
-{
-
-}
+VerifySubCommand::~VerifySubCommand() {}
 
 bool VerifySubCommand::verifyParams()
 {
-
-    if (_flintParams.cmd_params.size() > 1) {
+    if (_flintParams.cmd_params.size() > 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 0, (int)_flintParams.cmd_params.size());
         return false;
     }
-    if ((_flintParams.cmd_params.size() == 1) && _flintParams.cmd_params[0] != "showitoc") {
+    if ((_flintParams.cmd_params.size() == 1) && _flintParams.cmd_params[0] != "showitoc")
+    {
         reportErr(true, FLINT_INVALID_OPTION_ERROR, _flintParams.cmd_params[0].c_str(), _name.c_str(), "showitoc");
         return false;
     }
@@ -3963,36 +4667,41 @@ bool VerifySubCommand::verifyParams()
 
 FlintStatus VerifySubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         reportErr(true, FLINT_CMD_VERIFY_ERROR_1);
         return FLINT_FAILED;
     }
 
-    FwOperations *ops;
+    FwOperations* ops;
     bool showItoc = (_flintParams.cmd_params.size() == 1) ? true : false;
-    //check on what we are wroking
+    // check on what we are wroking
     int opaque = 0;
     ProgressCallBackAdvSt advProgress;
-    advProgress.func = (f_prog_func_adv) & advProgressFunc;
+    advProgress.func = (f_prog_func_adv)&advProgressFunc;
     advProgress.opaque = &opaque;
     ops = (_flintParams.device_specified) ? _fwOps : _imgOps;
     FwOperations::ExtVerifyParams verifyParams(&verifyCbFunc);
     verifyParams.isStripedImage = _flintParams.striped_image;
     verifyParams.showItoc = showItoc;
     verifyParams.progressFuncAdv = &advProgress;
-    if (!ops->FwVerifyAdv(verifyParams)) {
+    if (!ops->FwVerifyAdv(verifyParams))
+    {
         reportErr(true, FLINT_CMD_VERIFY_ERROR, ops->err());
         return FLINT_FAILED;
     }
-    //get status of blank guids in fs2 only can either bring from FwVerify as another parameter. ask mohammad
-    if (ops->FwType() == FIT_FS2) {
+    // get status of blank guids in fs2 only can either bring from FwVerify as another parameter. ask mohammad
+    if (ops->FwType() == FIT_FS2)
+    {
         fw_info_t fwInfo;
-        if (!ops->FwQuery(&fwInfo, true, _flintParams.striped_image)) {
+        if (!ops->FwQuery(&fwInfo, true, _flintParams.striped_image))
+        {
             printf("\n\n");
             reportErr(true, "Failed to get Guids status. %s\n", ops->err());
             return FLINT_FAILED;
         }
-        if (fwInfo.fs2_info.blank_guids) {
+        if (fwInfo.fs2_info.blank_guids)
+        {
             printf("\n\n");
             reportErr(true, FLINT_CMD_VERIFY_ERROR, "BLANK GUIDS");
             return FLINT_FAILED;
@@ -4022,15 +4731,12 @@ SwResetSubCommand::SwResetSubCommand()
     _cmdType = SC_Swreset;
 }
 
-SwResetSubCommand:: ~SwResetSubCommand()
-{
-
-}
-
+SwResetSubCommand::~SwResetSubCommand() {}
 
 bool SwResetSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() != 0) {
+    if (_flintParams.cmd_params.size() != 0)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 0, (int)_flintParams.cmd_params.size());
         return false;
     }
@@ -4043,25 +4749,29 @@ FlintStatus SwResetSubCommand::executeCommand()
     dm_dev_id_t devid_type;
     u_int32_t devid, revid;
 
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
 
     mf = _fwOps->getMfileObj();
     int rc = dm_get_device_id(mf, &devid_type, &devid, &revid);
-    if (rc != 0) {
+    if (rc != 0)
+    {
         reportErr(true, "can't get device Id.\n");
         return FLINT_FAILED;
     }
     (void)devid;
     (void)revid;
 
-    if (!IsDeviceSupported(devid_type)) {
+    if (!IsDeviceSupported(devid_type))
+    {
         return FLINT_FAILED;
     }
 
     printf("-I- Sending reset command to device %s ...\n", _flintParams.device.c_str());
-    if (!_fwOps->FwSwReset()) {
+    if (!_fwOps->FwSwReset())
+    {
         reportErr(true, FLINT_SWRESET_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
@@ -4072,7 +4782,8 @@ FlintStatus SwResetSubCommand::executeCommand()
 
 bool SwResetSubCommand::IsDeviceSupported(dm_dev_id_t dev_id)
 {
-    switch (dev_id) {
+    switch (dev_id)
+    {
         case DeviceInfiniScaleIV:
         case DeviceSwitchX:
         case DeviceSwitchIB:
@@ -4131,7 +4842,7 @@ BromSubCommand::BromSubCommand()
     memset(&_romsInfo, 0, sizeof(_romsInfo));
 }
 
-BromSubCommand:: ~BromSubCommand()
+BromSubCommand::~BromSubCommand()
 {
     closeLog();
     _fRom.close();
@@ -4139,68 +4850,81 @@ BromSubCommand:: ~BromSubCommand()
 
 FlintStatus BromSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
+    FwOperations* ops = _flintParams.device_specified ? _fwOps : _imgOps;
     // query device
-    if (!ops->FwQuery(&_info)) {
-        reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(),
-                  ops->err());
+    if (!ops->FwQuery(&_info))
+    {
+        reportErr(true, FLINT_FAILED_QUERY_ERROR, "Device", _flintParams.device.c_str(), ops->err());
         return FLINT_FAILED;
     }
     // get roms info
-    if (!_fRom.open(_flintParams.cmd_params[0].c_str())) {
+    if (!_fRom.open(_flintParams.cmd_params[0].c_str()))
+    {
         reportErr(true, FLINT_BROM_ERROR, _fRom.err());
         return FLINT_FAILED;
     }
-    if (!getRomsInfo(&_fRom, _romsInfo)) {
+    if (!getRomsInfo(&_fRom, _romsInfo))
+    {
         return FLINT_FAILED;
     }
-    //check devids
-    if ((_romsInfo.num_of_exp_rom > 0) && (_info.fw_info.dev_type)
-        && (_romsInfo.exp_rom_com_devid != EXP_ROM_GEN_DEVID) \
-        && (_romsInfo.exp_rom_com_devid != MISS_MATCH_DEV_ID)
-        && (_info.fw_info.dev_type != _romsInfo.exp_rom_com_devid)) {
-        printf("-W- Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", \
-               _info.fw_info.dev_type, _romsInfo.exp_rom_com_devid);
-        if (!askUser()) {
+    // check devids
+    if ((_romsInfo.num_of_exp_rom > 0) && (_info.fw_info.dev_type) &&
+        (_romsInfo.exp_rom_com_devid != EXP_ROM_GEN_DEVID) && (_romsInfo.exp_rom_com_devid != MISS_MATCH_DEV_ID) &&
+        (_info.fw_info.dev_type != _romsInfo.exp_rom_com_devid))
+    {
+        printf("-W- Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", _info.fw_info.dev_type,
+               _romsInfo.exp_rom_com_devid);
+        if (!askUser())
+        {
             return FLINT_FAILED;
         }
     }
     char romVer1[50], romVer2[50];
     printf("\n");
-    const char *infoStr = "    Current ROM info on flash: ";
-    const char *infoStr2 = "    New ROM info:              ";
-    if (_info.fw_info.roms_info.num_of_exp_rom > 0) {
+    const char* infoStr = "    Current ROM info on flash: ";
+    const char* infoStr2 = "    New ROM info:              ";
+    if (_info.fw_info.roms_info.num_of_exp_rom > 0)
+    {
         displayExpRomInfo(_info.fw_info.roms_info, infoStr);
         sprintf(romVer1, "%s", getExpRomVerStr(_info.fw_info.roms_info.rom_info[0]).c_str());
-    } else {
+    }
+    else
+    {
         printf("%s", infoStr);
         snprintf(romVer1, 50, "N/A");
         printf("%s\n", romVer1);
     }
     displayExpRomInfo(_romsInfo, infoStr2);
     sprintf(romVer2, "%s", getExpRomVerStr(_romsInfo.rom_info[0]).c_str());
-    //add new line to space up before showing burn precentage
+    // add new line to space up before showing burn precentage
     printf("\n");
-    //print correct msg to log
-    if (_info.fw_info.roms_info.num_of_exp_rom != 0) {
-        print_line_to_log("Current ROM version on flash (1st ROM of %d): %s, New ROM version (1st ROM of %d): %s\n", \
+    // print correct msg to log
+    if (_info.fw_info.roms_info.num_of_exp_rom != 0)
+    {
+        print_line_to_log("Current ROM version on flash (1st ROM of %d): %s, New ROM version (1st ROM of %d): %s\n",
                           _info.fw_info.roms_info.num_of_exp_rom, romVer1, _romsInfo.num_of_exp_rom, romVer2);
-    } else {
-        print_line_to_log("Current ROM version on flash: %s, New ROM version(1st ROM of %d): %s\n", romVer1, _romsInfo.num_of_exp_rom, romVer2);
+    }
+    else
+    {
+        print_line_to_log("Current ROM version on flash: %s, New ROM version(1st ROM of %d): %s\n", romVer1,
+                          _romsInfo.num_of_exp_rom, romVer2);
     }
     // burn the rom
     printf("-I- Preparing to burn ROM ...\n");
-    if (!ops->FwBurnRom(&_fRom, _flintParams.allow_rom_change, true, bromCbFunc)) {
+    if (!ops->FwBurnRom(&_fRom, _flintParams.allow_rom_change, true, bromCbFunc))
+    {
         reportErr(true, FLINT_BROM_ERROR, ops->err());
         return FLINT_FAILED;
     }
     bromCbFunc(101);
     printf("\n");
-    const char *resignStr = ops->FwGetReSignMsgStr();
-    if (resignStr) {
+    const char* resignStr = ops->FwGetReSignMsgStr();
+    if (resignStr)
+    {
         printf("%s", resignStr);
     }
     write_result_to_log(FLINT_SUCCESS, "", _flintParams.log_specified);
@@ -4225,14 +4949,12 @@ DromSubCommand::DromSubCommand()
     _cmdType = SC_Drom;
 }
 
-DromSubCommand:: ~DromSubCommand()
-{
-
-}
+DromSubCommand::~DromSubCommand() {}
 
 bool DromSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() != 0) {
+    if (_flintParams.cmd_params.size() != 0)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 0, (int)_flintParams.cmd_params.size());
         return false;
     }
@@ -4241,20 +4963,23 @@ bool DromSubCommand::verifyParams()
 
 FlintStatus DromSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     // leave an empty line before printing from callback
-    FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
+    FwOperations* ops = _flintParams.device_specified ? _fwOps : _imgOps;
     printf("\n");
     printf("-I- Preparing to remove ROM ...\n");
-    if (!ops->FwDeleteRom(_flintParams.allow_rom_change, dromCbFunc)) {
+    if (!ops->FwDeleteRom(_flintParams.allow_rom_change, dromCbFunc))
+    {
         reportErr(true, FLINT_DROM_ERROR, ops->err());
         return FLINT_FAILED;
     }
     dromCbFunc(101);
-    const char *resignStr = ops->FwGetReSignMsgStr();
-    if (resignStr) {
+    const char* resignStr = ops->FwGetReSignMsgStr();
+    if (resignStr)
+    {
         printf("%s", resignStr);
     }
     return FLINT_SUCCESS;
@@ -4278,19 +5003,17 @@ RromSubCommand::RromSubCommand()
     _cmdType = SC_Rrom;
 }
 
-RromSubCommand:: ~RromSubCommand()
-{
-
-}
+RromSubCommand::~RromSubCommand() {}
 
 bool RromSubCommand::verifyParams()
 {
-    FILE *file;
-    if ((file = fopen(_flintParams.cmd_params[0].c_str(), "r")) != NULL) {
+    FILE* file;
+    if ((file = fopen(_flintParams.cmd_params[0].c_str(), "r")) != NULL)
+    {
         fclose(file);
-        printf(
-            "\n-W- The given ROM file is existing, you are going to overwrite it.\n");
-        if (!askUser()) {
+        printf("\n-W- The given ROM file is existing, you are going to overwrite it.\n");
+        if (!askUser())
+        {
             return false;
         }
     }
@@ -4299,18 +5022,21 @@ bool RromSubCommand::verifyParams()
 
 FlintStatus RromSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    //get the rom sector if present.
+    // get the rom sector if present.
     std::vector<u_int8_t> romSect;
-    FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
-    if (!ops->FwReadRom(romSect)) {
+    FwOperations* ops = _flintParams.device_specified ? _fwOps : _imgOps;
+    if (!ops->FwReadRom(romSect))
+    {
         reportErr(true, FLINT_READ_ROM_ERROR, ops->err());
         return FLINT_FAILED;
     }
-    //TOCPUn(&(romSect[0]), romSect.size()/4);
-    if (!writeToFile(_flintParams.cmd_params[0], romSect)) {
+    // TOCPUn(&(romSect[0]), romSect.size()/4);
+    if (!writeToFile(_flintParams.cmd_params[0], romSect))
+    {
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
@@ -4335,19 +5061,21 @@ BbSubCommand::BbSubCommand()
     _cmdType = SC_Bb;
 }
 
-BbSubCommand:: ~BbSubCommand()
+BbSubCommand::~BbSubCommand()
 {
     closeLog();
 }
 
 bool BbSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() != 0) {
+    if (_flintParams.cmd_params.size() != 0)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 0, (int)(_flintParams.cmd_params.size()));
         return false;
     }
     printf("\n    Note: This option is only recommended for advanced users. Press Yes to continue");
-    if (!askUser()) {
+    if (!askUser())
+    {
         return false;
     }
     return true;
@@ -4355,10 +5083,12 @@ bool BbSubCommand::verifyParams()
 
 FlintStatus BbSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (_fwOps->FwType() == FIT_FS3 || _fwOps->FwType() == FIT_FS4 || _fwOps->FwType() == FIT_FSCTRL) {
+    if (_fwOps->FwType() == FIT_FS3 || _fwOps->FwType() == FIT_FS4 || _fwOps->FwType() == FIT_FSCTRL)
+    {
         reportErr(true, FLINT_FS3_BB_ERROR);
         return FLINT_FAILED;
     }
@@ -4368,11 +5098,13 @@ FlintStatus BbSubCommand::executeCommand()
     printf("Burn process will not be failsafe. No checks will be performed.\n");
     printf("ALL flash, including the Invariant Sector will be overwritten.\n");
     printf("If this process fails, computer may remain in an inoperable state.\n");
-    if (!askUser()) {
+    if (!askUser())
+    {
         return FLINT_FAILED;
     }
     ProgressCallBack progressFunc = _flintParams.silent == true ? (ProgressCallBack)NULL : &burnBCbFunc;
-    if (!_fwOps->FwBurnBlock(_imgOps, progressFunc)) {
+    if (!_fwOps->FwBurnBlock(_imgOps, progressFunc))
+    {
         reportErr(true, "Non failsafe burn failed: %s\n", _fwOps->err());
         return FLINT_FAILED;
     }
@@ -4398,12 +5130,13 @@ SgSubCommand::SgSubCommand()
     _flagLong = "sg";
     _flagShort = "";
     _param = "[nocrc]";
-    _paramExp = "nocrc: (optional) When specified the flint would not update the full image crc after changing the guids\n"
-                "guids_num: (optional) number of GUIDs to be allocated per physical port (FS3 Only)\n"
-                "step_size: (optional) step size between GUIDs (FS3 Only)\n"
-                "Note: guids_num/step_size values can be specified per port or for both ports";
-    _example = FLINT_NAME " -d " MST_DEV_EXAMPLE1 " -guid 0x0002c9000100d050 sg" "\n"
-               FLINT_NAME " -d " MST_DEV_EXAMPLE4 " -guid 0x0002c9000100d050 -mac 0x0002c900d050 sg";
+    _paramExp =
+      "nocrc: (optional) When specified the flint would not update the full image crc after changing the guids\n"
+      "guids_num: (optional) number of GUIDs to be allocated per physical port (FS3 Only)\n"
+      "step_size: (optional) step size between GUIDs (FS3 Only)\n"
+      "Note: guids_num/step_size values can be specified per port or for both ports";
+    _example = FLINT_NAME " -d " MST_DEV_EXAMPLE1 " -guid 0x0002c9000100d050 sg"
+                          "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE4 " -guid 0x0002c9000100d050 -mac 0x0002c900d050 sg";
     _v = Wtv_Dev_Or_Img;
     _maxCmdParamNum = 2;
     _cmdType = SC_Sg;
@@ -4416,56 +5149,62 @@ SgSubCommand::SgSubCommand()
 
 void SubCommand::ClearGuidStruct(FwOperations::sg_params_t& sgParams)
 {
-    sgParams.updateCrc = false;     //default should be set to true
-    sgParams.stripedImage = false;     // default shuold be set to false unless working on striped image file
+    sgParams.updateCrc = false;    // default should be set to true
+    sgParams.stripedImage = false; // default shuold be set to false unless working on striped image file
     sgParams.macsSpecified = false;
     sgParams.guidsSpecified = false;
-    sgParams.uidSpecified = false;     // valid for ConnectIB only
+    sgParams.uidSpecified = false; // valid for ConnectIB only
     sgParams.userGuids.resize(0);
-    sgParams.numOfGUIDs = 0;     // number of GUIDs to allocate for each port. keep zero for default. (FS3 image Only)
-    sgParams.stepSize = 0;     // step size between GUIDs. keep zero for default. (FS3 Image Only)
-    sgParams.usePPAttr = false;     // if set, use the per prot attributes below (FS3 Image Only)
+    sgParams.numOfGUIDs = 0;    // number of GUIDs to allocate for each port. keep zero for default. (FS3 image Only)
+    sgParams.stepSize = 0;      // step size between GUIDs. keep zero for default. (FS3 Image Only)
+    sgParams.usePPAttr = false; // if set, use the per prot attributes below (FS3 Image Only)
     memset(&(sgParams.numOfGUIDsPP), 0xff, sizeof(sgParams.numOfGUIDsPP));
     memset(&(sgParams.stepSizePP), 0xff, sizeof(sgParams.stepSizePP));
 }
 
-SgSubCommand:: ~SgSubCommand()
-{
-
-}
+SgSubCommand::~SgSubCommand() {}
 
 bool SgSubCommand::verifyParams()
 {
-    if ((_flintParams.cmd_params.size() == 1 && _flintParams.cmd_params[0] != "nocrc") || \
-        (_flintParams.cmd_params.size() == 2 && \
-         !extractUIDArgs(_flintParams.cmd_params, _sgParams.numOfGUIDsPP, _sgParams.stepSizePP))) {
+    if ((_flintParams.cmd_params.size() == 1 && _flintParams.cmd_params[0] != "nocrc") ||
+        (_flintParams.cmd_params.size() == 2 &&
+         !extractUIDArgs(_flintParams.cmd_params, _sgParams.numOfGUIDsPP, _sgParams.stepSizePP)))
+    {
         reportErr(true, "The sg parameter should be \"nocrc\", \"guids_num=<num> step_size=<size>\" or nothing\n");
         return false;
     }
 
-    if (_flintParams.cmd_params.size() > 2) {
+    if (_flintParams.cmd_params.size() > 2)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
-    if (!(_flintParams.guid_specified || _flintParams.guids_specified || \
-          _flintParams.uid_specified || \
-          _flintParams.mac_specified || _flintParams.macs_specified)) {
-        reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "GUIDs / MACs / UID (using command line flags -guid(s) / -mac(s) / -uid)");
+    if (!(_flintParams.guid_specified || _flintParams.guids_specified || _flintParams.uid_specified ||
+          _flintParams.mac_specified || _flintParams.macs_specified))
+    {
+        reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                  "GUIDs / MACs / UID (using command line flags -guid(s) / -mac(s) / -uid)");
         return false;
     }
-    if ((_flintParams.guid_specified || _flintParams.guids_specified) && (_flintParams.uid_specified)) {
-        reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "either GUIDs / UIDs (using command line flags -guid(s) / -uid)");
+    if ((_flintParams.guid_specified || _flintParams.guids_specified) && (_flintParams.uid_specified))
+    {
+        reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                  "either GUIDs / UIDs (using command line flags -guid(s) / -uid)");
         return false;
     }
-    if ((_flintParams.mac_specified || _flintParams.macs_specified) && (_flintParams.uid_specified)) {
-        reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "either MACs / UIDs (using command line flags -mac(s) / -uid)");
+    if ((_flintParams.mac_specified || _flintParams.macs_specified) && (_flintParams.uid_specified))
+    {
+        reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(),
+                  "either MACs / UIDs (using command line flags -mac(s) / -uid)");
         return false;
     }
-    if (_flintParams.guid_specified && _flintParams.guids_specified) {
+    if (_flintParams.guid_specified && _flintParams.guids_specified)
+    {
         reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-guids", "-guid");
         return false;
     }
-    if (_flintParams.mac_specified && _flintParams.macs_specified) {
+    if (_flintParams.mac_specified && _flintParams.macs_specified)
+    {
         reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "-macs", "-mac");
         return false;
     }
@@ -4483,20 +5222,23 @@ void SgSubCommand::setUserGuidsAndMacs()
     // _sgParams.userGuids contains either guids and macs (or just guids) or just uids
     // we are required to specifiy to mlxfwops a guid vector of MAX_GUIDS size regardless if user gives only guids
     // or only macs or uids
-    if (_sgParams.guidsSpecified) {
-
+    if (_sgParams.guidsSpecified)
+    {
         _sgParams.userGuids = _flintParams.user_guids;
     }
-    if (_sgParams.macsSpecified) {
-        if (!_sgParams.guidsSpecified) {
-            //it inits the guids with zeroes but mlxfwops will set them to 0xffff
-            //can set default init if needed
+    if (_sgParams.macsSpecified)
+    {
+        if (!_sgParams.guidsSpecified)
+        {
+            // it inits the guids with zeroes but mlxfwops will set them to 0xffff
+            // can set default init if needed
             _sgParams.userGuids.resize(GUIDS);
         }
         _sgParams.userGuids.push_back(_flintParams.user_macs[0]);
         _sgParams.userGuids.push_back(_flintParams.user_macs[1]);
     }
-    if (_sgParams.uidSpecified) {
+    if (_sgParams.uidSpecified)
+    {
         _sgParams.userGuids.resize(0);
         _sgParams.userGuids.push_back(_flintParams.baseUid);
     }
@@ -4507,15 +5249,20 @@ bool SgSubCommand::CheckSetGuidsFlags()
 {
     bool ibDev;
     bool ethDev;
-    FwOperations::SetDevFlags(_info.fw_info.chip_type, _info.fw_info.dev_type, (fw_img_type)_info.fw_type, ibDev, ethDev);
-    //setDevFlags(_info, ibDev,ethDev);
-
-    if (_sgParams.macsSpecified || _sgParams.guidsSpecified || _sgParams.uidSpecified) {
-        if (!checkGuidsFlags(_info.fw_info.dev_type, _info.fw_type, \
-                             _sgParams.guidsSpecified, _sgParams.macsSpecified, _sgParams.uidSpecified, ibDev, ethDev)) {
+    FwOperations::SetDevFlags(_info.fw_info.chip_type, _info.fw_info.dev_type, (fw_img_type)_info.fw_type, ibDev,
+                              ethDev);
+    // setDevFlags(_info, ibDev,ethDev);
+
+    if (_sgParams.macsSpecified || _sgParams.guidsSpecified || _sgParams.uidSpecified)
+    {
+        if (!checkGuidsFlags(_info.fw_info.dev_type, _info.fw_type, _sgParams.guidsSpecified, _sgParams.macsSpecified,
+                             _sgParams.uidSpecified, ibDev, ethDev))
+        {
             return false;
         }
-    } else {
+    }
+    else
+    {
         printf("-E- ");
         printMissingGuidErr(ibDev, ethDev);
         printf("\n");
@@ -4527,37 +5274,45 @@ bool SgSubCommand::CheckSetGuidsFlags()
 
 FlintStatus SgSubCommand::sgFs2()
 {
-    //different behaviours for fs2 device with blank guids and fs2 device with guids or image
-    //different behaviour if isfailesafe or not
-    if (_flintParams.cmd_params.size() > 1) {
+    // different behaviours for fs2 device with blank guids and fs2 device with guids or image
+    // different behaviour if isfailesafe or not
+    if (_flintParams.cmd_params.size() > 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
     }
 
-    if (_flintParams.device_specified && !_info.fs2_info.blank_guids) {
+    if (_flintParams.device_specified && !_info.fs2_info.blank_guids)
+    {
         // 2- FS2 device with no blank Guids
         printf(FLINT_SET_GUIDS_WARRNING);
     }
 
-    if (!CheckSetGuidsFlags()) {
+    if (!CheckSetGuidsFlags())
+    {
         return FLINT_FAILED;
     }
 
-    if (_flintParams.image_specified || !_info.fs2_info.blank_guids) {
-        //report guid changes
+    if (_flintParams.image_specified || !_info.fs2_info.blank_guids)
+    {
+        // report guid changes
         bool ethDev;
         bool ibDev;
-        FwOperations::SetDevFlags(_info.fw_info.chip_type, _info.fw_info.dev_type, (fw_img_type)_info.fw_type, ibDev, ethDev);
-        //setDevFlags(_info, ibDev, ethDev);
-        //decide what are our new guids/macs
-        guid_t *new_guids = (_sgParams.guidsSpecified || _sgParams.uidSpecified) ? &_sgParams.userGuids[0] : &_info.fs2_info.guids[0];
-        guid_t *new_macs = _sgParams.macsSpecified ? &_sgParams.userGuids[GUIDS] : &_info.fs2_info.guids[GUIDS];
-
-        if (!reportGuidChanges(new_guids, new_macs, &_info.fs2_info.guids[0], &_info.fs2_info.guids[GUIDS], ibDev, \
-                               ethDev, _info.fs2_info.guid_num)) {
+        FwOperations::SetDevFlags(_info.fw_info.chip_type, _info.fw_info.dev_type, (fw_img_type)_info.fw_type, ibDev,
+                                  ethDev);
+        // setDevFlags(_info, ibDev, ethDev);
+        // decide what are our new guids/macs
+        guid_t* new_guids =
+          (_sgParams.guidsSpecified || _sgParams.uidSpecified) ? &_sgParams.userGuids[0] : &_info.fs2_info.guids[0];
+        guid_t* new_macs = _sgParams.macsSpecified ? &_sgParams.userGuids[GUIDS] : &_info.fs2_info.guids[GUIDS];
+
+        if (!reportGuidChanges(new_guids, new_macs, &_info.fs2_info.guids[0], &_info.fs2_info.guids[GUIDS], ibDev,
+                               ethDev, _info.fs2_info.guid_num))
+        {
             return FLINT_FAILED;
         }
     }
-    if (!_ops->FwSetGuids(_sgParams, &verifyCbFunc, &burnCbFs2Func)) {
+    if (!_ops->FwSetGuids(_sgParams, &verifyCbFunc, &burnCbFs2Func))
+    {
         reportErr(true, FLINT_SG_GUID_ERROR, _ops->err());
         return FLINT_FAILED;
     }
@@ -4569,33 +5324,43 @@ FlintStatus SgSubCommand::sgFs2()
 
 FlintStatus SgSubCommand::sgFs3()
 {
-    if (!CheckSetGuidsFlags()) {
+    if (!CheckSetGuidsFlags())
+    {
         return FLINT_FAILED;
     }
-    if (_flintParams.guids_specified || _flintParams.macs_specified) {
+    if (_flintParams.guids_specified || _flintParams.macs_specified)
+    {
         string flag = _flintParams.guids_specified ? "-guids" : "-macs";
         reportErr(true, FLINT_NOT_SUPP_UID_FLAG_ERROR, flag.c_str());
         return FLINT_FAILED;
     }
 
     // TODO: create method that checks the flags for FS3/FS2
-    if (_info.fw_info.chip_type == CT_CONNECT_IB || _info.fw_info.chip_type == CT_SWITCH_IB) {
-        if (!_flintParams.uid_specified) {
+    if (_info.fw_info.chip_type == CT_CONNECT_IB || _info.fw_info.chip_type == CT_SWITCH_IB)
+    {
+        if (!_flintParams.uid_specified)
+        {
             reportErr(true, FLINT_NO_UID_FLAG_ERROR);
             return FLINT_FAILED;
         }
         // for connectib we just need the base guid so we put it in the first location.
         _sgParams.userGuids.resize(1);
         _sgParams.userGuids[0] = _flintParams.baseUid;
-    } else {
-        if (!_flintParams.uid_specified && !_flintParams.guid_specified && !_flintParams.mac_specified) {
+    }
+    else
+    {
+        if (!_flintParams.uid_specified && !_flintParams.guid_specified && !_flintParams.mac_specified)
+        {
             reportErr(true, FLINT_NO_GUID_MAC_FLAGS_ERROR);
             return FLINT_FAILED;
         }
-        if (_flintParams.uid_specified) {
+        if (_flintParams.uid_specified)
+        {
             _sgParams.userGuids.resize(1);
             _sgParams.userGuids[0] = _flintParams.baseUid;
-        } else {
+        }
+        else
+        {
             // guids and/or macs were specified
             guid_t tmpGuid;
             tmpGuid.h = 0;
@@ -4606,11 +5371,13 @@ FlintStatus SgSubCommand::sgFs3()
         }
     }
 
-    if (!_ops->FwSetGuids(_sgParams, &verifyCbFunc)) {
+    if (!_ops->FwSetGuids(_sgParams, &verifyCbFunc))
+    {
         reportErr(true, FLINT_SG_UID_ERROR, _ops->err());
         return FLINT_FAILED;
     }
-    if (_flintParams.device_specified) {
+    if (_flintParams.device_specified)
+    {
         printf("-I- %s\n", FW_RESET_MSG);
     }
     return FLINT_SUCCESS;
@@ -4618,19 +5385,21 @@ FlintStatus SgSubCommand::sgFs3()
 
 FlintStatus SgSubCommand::executeCommand()
 {
-
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     // query device
     _ops = _flintParams.device_specified ? _fwOps : _imgOps;
     bool stripedImage = _flintParams.striped_image && _flintParams.image_specified;
-    if (!_ops->FwQuery(&_info, true, stripedImage)) {
+    if (!_ops->FwQuery(&_info, true, stripedImage))
+    {
         reportErr(true, FLINT_SG_GUID_ERROR, _ops->err());
         return FLINT_FAILED;
     }
     setUserGuidsAndMacs();
-    if (_info.fw_type == FIT_FS2) {
+    if (_info.fw_type == FIT_FS2)
+    {
         return sgFs2();
     }
     FlintStatus setGuidResult = sgFs3();
@@ -4638,8 +5407,8 @@ FlintStatus SgSubCommand::executeCommand()
 }
 
 /*****************************
-* Class: Set Manufacture GUIDs
-*****************************/
+ * Class: Set Manufacture GUIDs
+ *****************************/
 SmgSubCommand::SmgSubCommand()
 {
     _name = "smg";
@@ -4654,9 +5423,11 @@ SmgSubCommand::SmgSubCommand()
                 "Note: guids_num/step_size values can be specified per port or for both ports";
     _example = FLINT_NAME " -i fw_image.bin -uid 0x0002c9000100d050 smg"
 #ifndef __WIN__
-               "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3 " -uid 0x0002c9000100d050 smg (should be used when device is idle)"
+                          "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3
+                          " -uid 0x0002c9000100d050 smg (should be used when device is idle)"
 #endif
-               "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE4 " -guid 0x0002c9000100d050 -mac 0x0002c900d050 smg (should be used when device is idle)";
+                          "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE4
+                          " -guid 0x0002c9000100d050 -mac 0x0002c900d050 smg (should be used when device is idle)";
     _v = Wtv_Dev_Or_Img;
     _maxCmdParamNum = 2;
     _cmdType = SC_Smg;
@@ -4668,89 +5439,105 @@ SmgSubCommand::SmgSubCommand()
     _baseGuid.use_pp_attr = 1;
 }
 
-SmgSubCommand:: ~SmgSubCommand()
-{
-
-}
+SmgSubCommand::~SmgSubCommand() {}
 
 bool SmgSubCommand::verifyParams()
 {
-    if (!_flintParams.uid_specified && !_flintParams.guid_specified && !_flintParams.mac_specified) {
+    if (!_flintParams.uid_specified && !_flintParams.guid_specified && !_flintParams.mac_specified)
+    {
         reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "\"-uid or -guid/-mac\" flags");
         return false;
     }
-    if (_flintParams.guids_specified) {
+    if (_flintParams.guids_specified)
+    {
         reportErr(true, FLINT_INVALID_OPTION_ERROR, "\"-guids\"", _name.c_str(), "\"-guid\"");
         return false;
     }
-    if (_flintParams.macs_specified) {
+    if (_flintParams.macs_specified)
+    {
         reportErr(true, FLINT_INVALID_OPTION_ERROR, "\"-macs\"", _name.c_str(), "\"-mac\"");
         return false;
     }
-    if (_flintParams.uid_specified && (_flintParams.guid_specified || _flintParams.mac_specified)) {
+    if (_flintParams.uid_specified && (_flintParams.guid_specified || _flintParams.mac_specified))
+    {
         reportErr(true, FLINT_INVALID_FLAG_WITH_FLAG_ERROR, "\"-uid\"", "\"-guid\"/-mac\"");
         return false;
     }
 
-    if (_flintParams.cmd_params.size() != 0 && _flintParams.cmd_params.size() != 2) {
+    if (_flintParams.cmd_params.size() != 0 && _flintParams.cmd_params.size() != 2)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR4, _name.c_str(), 0, 2, (int)_flintParams.cmd_params.size());
         return false;
     }
 
-    if (_flintParams.cmd_params.size() == 2 && \
-        !extractUIDArgs(_flintParams.cmd_params, _baseGuid.num_of_guids_pp, _baseGuid.step_size_pp)) {
+    if (_flintParams.cmd_params.size() == 2 &&
+        !extractUIDArgs(_flintParams.cmd_params, _baseGuid.num_of_guids_pp, _baseGuid.step_size_pp))
+    {
         return false;
     }
 
-    if (_flintParams.uid_specified) {
+    if (_flintParams.uid_specified)
+    {
         _baseGuid.set_mac_from_guid = true;
     }
 
     _baseGuid.base_guid_specified = _flintParams.uid_specified || _flintParams.guid_specified;
-    if (_baseGuid.base_guid_specified) {
+    if (_baseGuid.base_guid_specified)
+    {
         _baseGuid.base_guid = _flintParams.uid_specified ? _flintParams.baseUid : _flintParams.user_guids[0];
     }
 
     _baseGuid.base_mac_specified = _flintParams.mac_specified;
-    if (_baseGuid.base_mac_specified) {
+    if (_baseGuid.base_mac_specified)
+    {
         _baseGuid.base_mac = _flintParams.user_macs[0];
     }
-    //printf("-D-"GUID_FORMAT"\n", _baseGuid.h, _baseGuid.l);
+    // printf("-D-"GUID_FORMAT"\n", _baseGuid.h, _baseGuid.l);
     return true;
 }
 
 FlintStatus SmgSubCommand::executeCommand()
 {
-    if (preFwOps()) {
+    if (preFwOps())
+    {
         return FLINT_FAILED;
     }
     _ops = _flintParams.device_specified ? _fwOps : _imgOps;
-    //TODO: dispaly MFG guid changes
+    // TODO: dispaly MFG guid changes
     bool stripedImage = _flintParams.striped_image && _flintParams.image_specified;
-    if (!_ops->FwQuery(&_info, true, stripedImage)) {
+    if (!_ops->FwQuery(&_info, true, stripedImage))
+    {
         reportErr(true, FLINT_MFG_ERROR, _ops->err());
         return FLINT_FAILED;
     }
 
-    if (_info.fw_info.chip_type == CT_CONNECT_IB || _info.fw_info.chip_type == CT_SWITCH_IB) {
-        if (!_flintParams.uid_specified) {
+    if (_info.fw_info.chip_type == CT_CONNECT_IB || _info.fw_info.chip_type == CT_SWITCH_IB)
+    {
+        if (!_flintParams.uid_specified)
+        {
             reportErr(true, "Can not set GUIDs/MACs: uid is not specified, please run with -uid flag.\n");
             return FLINT_FAILED;
         }
-    } else {
-        if (!_flintParams.uid_specified && !_flintParams.guid_specified && !_flintParams.mac_specified) {
-            reportErr(true, "Can not set GUIDs/MACs: GUIDs/MACs are not specified, please run with -uid/-guid/-mac flags.\n");
+    }
+    else
+    {
+        if (!_flintParams.uid_specified && !_flintParams.guid_specified && !_flintParams.mac_specified)
+        {
+            reportErr(true,
+                      "Can not set GUIDs/MACs: GUIDs/MACs are not specified, please run with -uid/-guid/-mac flags.\n");
             return FLINT_FAILED;
         }
     }
 
     bool ret;
     ret = _ops->FwSetMFG(_baseGuid, &verifyCbFunc);
-    if (!ret) {
+    if (!ret)
+    {
         reportErr(true, FLINT_MFG_ERROR, _ops->err());
         return FLINT_FAILED;
     }
-    if (_flintParams.device_specified && _info.fw_type != FIT_FS2) {
+    if (_flintParams.device_specified && _info.fw_type != FIT_FS2)
+    {
         printf("-I- %s\n", FW_RESET_MSG);
     }
     return FLINT_SUCCESS;
@@ -4763,16 +5550,19 @@ SetCertChainSubCommand::SetCertChainSubCommand()
 {
     _name = "set attestation certificate chain";
     _desc = "Set read-only attestation certificate chain (For FS4 image only).";
-    _extendedDesc = "Set Read-only attestation certificate chain, Set attestation certificate chain in the given FS4 image, intended for production use only.";
+    _extendedDesc =
+      "Set Read-only attestation certificate chain, Set attestation certificate chain in the given FS4 image, intended for production use only.";
     _flagLong = "set_attestation_cert_chain";
     _flagShort = "";
     _param = "<Certificate chain file>";
     _paramExp = "Certificate chain file: bin file containing the certificate chain data";
-    _example = FLINT_NAME " -i fw_image.bin set_attestation_cert_chain cert_chain.bin"
+    _example = FLINT_NAME
+      " -i fw_image.bin set_attestation_cert_chain cert_chain.bin"
 #ifndef __WIN__
-               "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3 " -override_cache_replacement set_attestation_cert_chain cert_chain.bin (should be used when device is idle)"
+      "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3
+      " -override_cache_replacement set_attestation_cert_chain cert_chain.bin (should be used when device is idle)"
 #endif
-        ;
+      ;
     _v = Wtv_Dev_Or_Img;
     _maxCmdParamNum = 1;
     _minCmdParamNum = 1;
@@ -4781,11 +5571,13 @@ SetCertChainSubCommand::SetCertChainSubCommand()
 
 FlintStatus SetCertChainSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
-    if (!ops->FwSetCertChain((char*)_flintParams.cmd_params[0].c_str(), _flintParams.cert_chain_index, &verifyCbFunc)) {
+    FwOperations* ops = _flintParams.device_specified ? _fwOps : _imgOps;
+    if (!ops->FwSetCertChain((char*)_flintParams.cmd_params[0].c_str(), _flintParams.cert_chain_index, &verifyCbFunc))
+    {
         reportErr(true, FLINT_CERT_CHAIN_ERROR, ops->err());
         return FLINT_FAILED;
     }
@@ -4806,9 +5598,10 @@ SetVpdSubCommand::SetVpdSubCommand()
     _paramExp = "vpd file: bin file containing the vpd data";
     _example = FLINT_NAME " -i fw_image.bin set_vpd vpd.bin"
 #ifndef __WIN__
-               "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3 " -override_cache_replacement set_vpd vpd.bin (should be used when device is idle)"
+                          "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3
+                          " -override_cache_replacement set_vpd vpd.bin (should be used when device is idle)"
 #endif
-        ;
+      ;
     _v = Wtv_Dev_Or_Img;
     _maxCmdParamNum = 1;
     _minCmdParamNum = 1;
@@ -4817,11 +5610,13 @@ SetVpdSubCommand::SetVpdSubCommand()
 
 FlintStatus SetVpdSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
-    if (!ops->FwSetVPD((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc)) {
+    FwOperations* ops = _flintParams.device_specified ? _fwOps : _imgOps;
+    if (!ops->FwSetVPD((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc))
+    {
         reportErr(true, FLINT_VPD_ERROR, ops->err());
         return FLINT_FAILED;
     }
@@ -4847,17 +5642,17 @@ SetPublicKeysSubCommand::SetPublicKeysSubCommand()
     _cmdType = SC_Set_Public_Keys;
 }
 
-SetPublicKeysSubCommand:: ~SetPublicKeysSubCommand()
-{
-}
+SetPublicKeysSubCommand::~SetPublicKeysSubCommand() {}
 
 FlintStatus SetPublicKeysSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _imgOps;
-    if (!ops->FwSetPublicKeys((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc)) {
+    FwOperations* ops = _imgOps;
+    if (!ops->FwSetPublicKeys((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc))
+    {
         reportErr(true, FLINT_SET_PUBLIC_KEYS_ERROR, ops->err());
         return FLINT_FAILED;
     }
@@ -4883,17 +5678,17 @@ SetForbiddenVersionsSubCommand::SetForbiddenVersionsSubCommand()
     _cmdType = SC_Set_Forbidden_Versions;
 }
 
-SetForbiddenVersionsSubCommand:: ~SetForbiddenVersionsSubCommand()
-{
-}
+SetForbiddenVersionsSubCommand::~SetForbiddenVersionsSubCommand() {}
 
 FlintStatus SetForbiddenVersionsSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _imgOps;
-    if (!ops->FwSetForbiddenVersions((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc)) {
+    FwOperations* ops = _imgOps;
+    if (!ops->FwSetForbiddenVersions((char*)_flintParams.cmd_params[0].c_str(), &verifyCbFunc))
+    {
         reportErr(true, FLINT_SET_FORBIDDEN_VERSIONS_ERROR, ops->err());
         return FLINT_FAILED;
     }
@@ -4915,22 +5710,21 @@ SvSubCommand::SvSubCommand()
     _paramExp = "None";
     _example = FLINT_NAME " -d " MST_DEV_EXAMPLE1 " -vsd VSD_STRING sv"
 #ifndef __WIN__
-               "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3 " -vsd VSD_STRING -override_cache_replacement sv (should be used when device is idle)\n"
+                          "\n" FLINT_NAME " -d " MST_DEV_EXAMPLE3
+                          " -vsd VSD_STRING -override_cache_replacement sv (should be used when device is idle)\n"
 #endif
-        ;
+      ;
     _v = Wtv_Dev_Or_Img;
     _maxCmdParamNum = 0;
     _cmdType = SC_Sv;
 }
 
-SvSubCommand:: ~SvSubCommand()
-{
-
-}
+SvSubCommand::~SvSubCommand() {}
 
 bool SvSubCommand::verifyParams()
 {
-    if (!_flintParams.vsd_specified) {
+    if (!_flintParams.vsd_specified)
+    {
         reportErr(true, FLINT_COMMAND_FLAGS_ERROR, _name.c_str(), "\"-vsd\"");
         return false;
     }
@@ -4941,24 +5735,25 @@ bool SvSubCommand::verifyParams()
 
 FlintStatus SvSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _flintParams.device_specified ? _fwOps : _imgOps;
-    if (!ops->FwSetVSD((char*)_flintParams.vsd.c_str(), &vsdCbFunc, &verifyCbFunc)) {
+    FwOperations* ops = _flintParams.device_specified ? _fwOps : _imgOps;
+    if (!ops->FwSetVSD((char*)_flintParams.vsd.c_str(), &vsdCbFunc, &verifyCbFunc))
+    {
         reportErr(true, FLINT_VSD_ERROR, ops->err());
         return FLINT_FAILED;
     }
 
-    if (ops->FwType() == FIT_FS2) {
+    if (ops->FwType() == FIT_FS2)
+    {
         // print "restoring signature" on FS2 to be consistent with FS3 output
         vsdCbFunc(101);
     }
     return FLINT_SUCCESS;
 }
 
-
-
 /*******************************
  * Class: Read Image SubCommand
  ******************************/
@@ -4976,37 +5771,41 @@ RiSubCommand::RiSubCommand()
     _maxCmdParamNum = 1;
     _minCmdParamNum = 1;
     _cmdType = SC_Ri;
-    _mccSupported = false; // Read image isn't supported by MCC flow since it can't read Device area (DTOC and its sections)
+    _mccSupported =
+      false; // Read image isn't supported by MCC flow since it can't read Device area (DTOC and its sections)
 }
 
-RiSubCommand:: ~RiSubCommand()
-{
-
-}
+RiSubCommand::~RiSubCommand() {}
 
 FlintStatus RiSubCommand::executeCommand()
 {
-    //init fw operation object
-    if (preFwOps() == FLINT_FAILED) {
+    // init fw operation object
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     // Check if we have permission to write to file
-    FILE *fh;
-    if ((fh = fopen(_flintParams.cmd_params[0].c_str(), "wb")) == NULL) {
+    FILE* fh;
+    if ((fh = fopen(_flintParams.cmd_params[0].c_str(), "wb")) == NULL)
+    {
         reportErr(true, "Can not open %s: %s\n", _flintParams.cmd_params[0].c_str(), strerror(errno));
         return FLINT_FAILED;
-    } else {
+    }
+    else
+    {
         fclose(fh);
     }
     u_int32_t imgSize;
-    //on first call we get the image size
-    if (!_fwOps->FwReadData(NULL, &imgSize)) {
+    // on first call we get the image size
+    if (!_fwOps->FwReadData(NULL, &imgSize))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
     std::vector<u_int8_t> imgBuff(imgSize);
-    //on second call we fill it
-    if (!_fwOps->FwReadData((void*)(&imgBuff[0]), &imgSize)) {
+    // on second call we fill it
+    if (!_fwOps->FwReadData((void*)(&imgBuff[0]), &imgSize))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
@@ -5021,9 +5820,10 @@ DcSubCommand::DcSubCommand()
 {
     _name = "dc";
     _desc = "Dump Configuration: print fw configuration file for the given image.";
-    _extendedDesc = "Print (to screen or to a file) the FW configuration text file used by the image generation process.\n"
-                    "This command would fail if the image does not contain a FW configuration section."
-                    " Existence of this section depends on the version of the image generation tool.";
+    _extendedDesc =
+      "Print (to screen or to a file) the FW configuration text file used by the image generation process.\n"
+      "This command would fail if the image does not contain a FW configuration section."
+      " Existence of this section depends on the version of the image generation tool.";
     _flagLong = "dc";
     _flagShort = "";
     _param = "<out-file>";
@@ -5035,14 +5835,12 @@ DcSubCommand::DcSubCommand()
     _cmdType = SC_Dc;
 }
 
-DcSubCommand:: ~DcSubCommand()
-{
-
-}
+DcSubCommand::~DcSubCommand() {}
 
 bool DcSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() > 1) {
+    if (_flintParams.cmd_params.size() > 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
@@ -5051,19 +5849,23 @@ bool DcSubCommand::verifyParams()
 
 FlintStatus DcSubCommand::executeCommand()
 {
-    FwOperations *ops;
-    //init fw operation object
-    if (preFwOps() == FLINT_FAILED) {
+    FwOperations* ops;
+    // init fw operation object
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    //check on what we are wroking
+    // check on what we are wroking
     ops = (_flintParams.device_specified) ? _fwOps : _imgOps;
-    const char *file = _flintParams.cmd_params.size() == 1 ? _flintParams.cmd_params[0].c_str() : (const char*)NULL;
-    if (!ops->FwGetSection((ops->FwType() == FIT_FS2) ? (int)H_FW_CONF : (int)FS3_DBG_FW_INI, _sect, _flintParams.striped_image)) {
+    const char* file = _flintParams.cmd_params.size() == 1 ? _flintParams.cmd_params[0].c_str() : (const char*)NULL;
+    if (!ops->FwGetSection((ops->FwType() == FIT_FS2) ? (int)H_FW_CONF : (int)FS3_DBG_FW_INI, _sect,
+                           _flintParams.striped_image))
+    {
         reportErr(true, FLINT_DUMP_ERROR, "Fw Configuration", ops->err());
         return FLINT_FAILED;
     }
-    if (!dumpFile(file, _sect, "Fw Configuration")) {
+    if (!dumpFile(file, _sect, "Fw Configuration"))
+    {
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
@@ -5089,14 +5891,12 @@ DhSubCommand::DhSubCommand()
     _cmdType = SC_Dh;
 }
 
-DhSubCommand:: ~DhSubCommand()
-{
-
-}
+DhSubCommand::~DhSubCommand() {}
 
 bool DhSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() > 1) {
+    if (_flintParams.cmd_params.size() > 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
@@ -5105,19 +5905,22 @@ bool DhSubCommand::verifyParams()
 
 FlintStatus DhSubCommand::executeCommand()
 {
-    FwOperations *ops;
-    //init fw operation object
-    if (preFwOps() == FLINT_FAILED) {
+    FwOperations* ops;
+    // init fw operation object
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    //check on what we are wroking
+    // check on what we are wroking
     ops = (_flintParams.device_specified) ? _fwOps : _imgOps;
-    const char *file = _flintParams.cmd_params.size() == 1 ? _flintParams.cmd_params[0].c_str() : (const char*)NULL;
-    if (!ops->FwGetSection(H_HASH_FILE, _sect, _flintParams.striped_image)) {
+    const char* file = _flintParams.cmd_params.size() == 1 ? _flintParams.cmd_params[0].c_str() : (const char*)NULL;
+    if (!ops->FwGetSection(H_HASH_FILE, _sect, _flintParams.striped_image))
+    {
         reportErr(true, FLINT_DUMP_ERROR, "Hash file", ops->err());
         return FLINT_FAILED;
     }
-    if (!dumpFile(file, _sect, "Fw Configuration")) {
+    if (!dumpFile(file, _sect, "Fw Configuration"))
+    {
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
@@ -5145,14 +5948,12 @@ SetKeySubCommand::SetKeySubCommand()
     memset(&_userKey, 0, sizeof(_userKey));
 }
 
-SetKeySubCommand:: ~SetKeySubCommand()
-{
-
-}
+SetKeySubCommand::~SetKeySubCommand() {}
 
 bool SetKeySubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() > 1) {
+    if (_flintParams.cmd_params.size() > 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
@@ -5162,25 +5963,29 @@ bool SetKeySubCommand::verifyParams()
 
 bool SetKeySubCommand::getKeyInteractively()
 {
-    char keyArr[MAX_PASSWORD_LEN + 1] = { 0 };
+    char keyArr[MAX_PASSWORD_LEN + 1] = {0};
     getPasswordFromUser("Enter Key ", keyArr);
-    if (strlen(keyArr) == 0) {
+    if (strlen(keyArr) == 0)
+    {
         reportErr(true, FLINT_INVALID_PASSWORD);
         return false;
     }
 
-    if (!getGUIDFromStr(keyArr, _userKey, \
-                        "Invalid Key syntax, it should contain only hexa numbers and of appropriate length.")) {
+    if (!getGUIDFromStr(keyArr, _userKey,
+                        "Invalid Key syntax, it should contain only hexa numbers and of appropriate length."))
+    {
         return false;
     }
     // verify key
     hw_key_t verKey;
     getPasswordFromUser("Verify Key ", keyArr);
-    if (!getGUIDFromStr(keyArr, verKey, \
-                        "Invalid Key syntax, it should contain only hexa numbers and of appropriate length.")) {
+    if (!getGUIDFromStr(keyArr, verKey,
+                        "Invalid Key syntax, it should contain only hexa numbers and of appropriate length."))
+    {
         return false;
     }
-    if (_userKey.h != verKey.h || _userKey.l != verKey.l) {
+    if (_userKey.h != verKey.h || _userKey.l != verKey.l)
+    {
         reportErr(true, FLINT_SET_KEY_ERROR, "The keys you entered did not match.");
         return false;
     }
@@ -5189,45 +5994,58 @@ bool SetKeySubCommand::getKeyInteractively()
 
 FlintStatus SetKeySubCommand::executeCommand()
 {
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
 
-    if (_getKeyInter) {
-        if (!getKeyInteractively()) {
+    if (_getKeyInter)
+    {
+        if (!getKeyInteractively())
+        {
             return FLINT_FAILED;
         }
-    } else {
-        if (!getGUIDFromStr(_flintParams.cmd_params[0], _userKey, \
-                            "Invalid Key syntax, it should contain only hexa numbers and of appropriate length.")) {
+    }
+    else
+    {
+        if (!getGUIDFromStr(_flintParams.cmd_params[0], _userKey,
+                            "Invalid Key syntax, it should contain only hexa numbers and of appropriate length."))
+        {
             return FLINT_FAILED;
         }
     }
-    if (((Flash*)_io)->is_fifth_gen()) {
-        if (((Flash*)_io)->get_cr_space_locked()) {
+    if (((Flash*)_io)->is_fifth_gen())
+    {
+        if (((Flash*)_io)->get_cr_space_locked())
+        {
             printf("-I- HW access already disabled\n");
             return FLINT_SUCCESS;
         }
         // In 5th gen treat set as disable hw access
         u_int64_t key = ((u_int64_t)_userKey.h << 32) | _userKey.l;
-        if (!((Flash*)_io)->disable_hw_access(key)) {
+        if (!((Flash*)_io)->disable_hw_access(key))
+        {
             reportErr(true, FLINT_GEN_COMMAND_ERROR, _name.c_str(), _io->err());
             return FLINT_FAILED;
         }
         printf("-I- Secure Host was enabled successfully on the device.\n");
-    } else {
+    }
+    else
+    {
         _io->close();
         delete _io;
         _io = NULL;
-        if (preFwOps() == FLINT_FAILED) {
+        if (preFwOps() == FLINT_FAILED)
+        {
             return FLINT_FAILED;
         }
-        if (!_fwOps->FwSetAccessKey(_userKey, &setKeyCbFunc)) {
+        if (!_fwOps->FwSetAccessKey(_userKey, &setKeyCbFunc))
+        {
             reportErr(true, FLINT_SET_KEY_ERROR, _fwOps->err());
             return FLINT_FAILED;
         }
         setKeyCbFunc(101);
-        printf("\n-I- New key was updated successfully in the flash. " \
+        printf("\n-I- New key was updated successfully in the flash. "
                "In order to activate the new key you should reboot or restart the driver.\n");
     }
 
@@ -5256,23 +6074,24 @@ HwAccessSubCommand::HwAccessSubCommand()
     _cmdType = SC_Hw_Access;
 }
 
-HwAccessSubCommand:: ~HwAccessSubCommand()
-{
-
-}
+HwAccessSubCommand::~HwAccessSubCommand() {}
 
 bool HwAccessSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params.size() == 0) {
+    if (_flintParams.cmd_params.size() == 0)
+    {
         reportErr(true, FLINT_MISSED_ARG_ERROR, "<disable/enable>", _name.c_str());
         return false;
     }
-    if (_flintParams.cmd_params.size() > 2) {
+    if (_flintParams.cmd_params.size() > 2)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 2, (int)_flintParams.cmd_params.size());
         return false;
     }
-    if (_flintParams.cmd_params[0] != "enable" && _flintParams.cmd_params[0] != "disable") {
-        reportErr(true, FLINT_INVALID_OPTION_ERROR, _flintParams.cmd_params[0].c_str(), _name.c_str(), "enable or disable");
+    if (_flintParams.cmd_params[0] != "enable" && _flintParams.cmd_params[0] != "disable")
+    {
+        reportErr(true, FLINT_INVALID_OPTION_ERROR, _flintParams.cmd_params[0].c_str(), _name.c_str(),
+                  "enable or disable");
         return false;
     }
     return true;
@@ -5280,54 +6099,69 @@ bool HwAccessSubCommand::verifyParams()
 
 FlintStatus HwAccessSubCommand::disableHwAccess()
 {
-    if (((Flash*)_io)->get_cr_space_locked()) {
+    if (((Flash*)_io)->get_cr_space_locked())
+    {
         printf("-I- HW access already disabled\n");
-    } else {
-        if (((Flash*)_io)->is_fifth_gen()) {
-            SubCommand *setKey = new SetKeySubCommand();
+    }
+    else
+    {
+        if (((Flash*)_io)->is_fifth_gen())
+        {
+            SubCommand* setKey = new SetKeySubCommand();
             _flintParams.cmd_params.erase(_flintParams.cmd_params.begin());
             setKey->setParams(_flintParams);
             FlintStatus rc = setKey->executeCommand();
             delete setKey;
             return rc;
-        } else {
-
-            if (!((Flash*)_io)->disable_hw_access()) {
+        }
+        else
+        {
+            if (!((Flash*)_io)->disable_hw_access())
+            {
                 printf(FLINT_GEN_COMMAND_ERROR, _name.c_str(), _io->err());
                 return FLINT_FAILED;
             }
         }
-
     }
     return FLINT_SUCCESS;
 }
 FlintStatus HwAccessSubCommand::enableHwAccess()
 {
     u_int64_t key;
-    if (((Flash*)_io)->get_cr_space_locked() == 0) {
+    if (((Flash*)_io)->get_cr_space_locked() == 0)
+    {
         printf("-I- HW access already enabled\n");
-    } else {
+    }
+    else
+    {
         hw_key_t keyStruct;
-        //now we need to get the key from the user (either given in the parameters or we get it during runtime)
-        if (_flintParams.cmd_params.size() == 2) {
-            if (!getGUIDFromStr(_flintParams.cmd_params[1], keyStruct, \
-                                "Invalid Key syntax, it should contain only hexa numbers and of appropriate length.")) {
+        // now we need to get the key from the user (either given in the parameters or we get it during runtime)
+        if (_flintParams.cmd_params.size() == 2)
+        {
+            if (!getGUIDFromStr(_flintParams.cmd_params[1], keyStruct,
+                                "Invalid Key syntax, it should contain only hexa numbers and of appropriate length."))
+            {
                 return FLINT_FAILED;
             }
-        } else {//we need to get the key from user during runtime
-            char keyArr[MAX_PASSWORD_LEN + 1] = { 0 };
+        }
+        else
+        { // we need to get the key from user during runtime
+            char keyArr[MAX_PASSWORD_LEN + 1] = {0};
             getPasswordFromUser("Enter Key ", keyArr);
-            if (strlen(keyArr) == 0) {
+            if (strlen(keyArr) == 0)
+            {
                 reportErr(true, FLINT_INVALID_PASSWORD);
                 return FLINT_FAILED;
             }
-            if (!getGUIDFromStr(keyArr, keyStruct, \
-                                "Invalid Key syntax, it should contain only hexa numbers and of appropriate length.")) {
+            if (!getGUIDFromStr(keyArr, keyStruct,
+                                "Invalid Key syntax, it should contain only hexa numbers and of appropriate length."))
+            {
                 return FLINT_FAILED;
             }
         }
         key = ((u_int64_t)keyStruct.h << 32) | keyStruct.l;
-        if (!((Flash*)_io)->enable_hw_access(key)) {
+        if (!((Flash*)_io)->enable_hw_access(key))
+        {
             reportErr(true, FLINT_GEN_COMMAND_ERROR, _name.c_str(), _io->err());
             return FLINT_FAILED;
         }
@@ -5338,13 +6172,15 @@ FlintStatus HwAccessSubCommand::enableHwAccess()
 
 FlintStatus HwAccessSubCommand::executeCommand()
 {
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    if (_flintParams.cmd_params[0] == "disable") {
+    if (_flintParams.cmd_params[0] == "disable")
+    {
         return disableHwAccess();
     }
-    //else its enable hw access
+    // else its enable hw access
     return enableHwAccess();
 }
 
@@ -5368,9 +6204,8 @@ HwSubCommand::HwSubCommand()
                 "    Flash[0|1|2|3].WriteProtected can be:\n"
                 "        <Top|Bottom>,<1|2|4|8|16|32|64>-<Sectors|SubSectors>"
                 "    DriverStrength: can be [25,50,75,100]\n";
-    _example = "flint -d " MST_DEV_EXAMPLE1 " hw query\n"
-               FLINT_NAME " -d " MST_DEV_EXAMPLE1 " hw set QuadEn=1\n"
-               FLINT_NAME " -d " MST_DEV_EXAMPLE1 " hw set Flash1.WriteProtected=Top,1-SubSectors";
+    _example = "flint -d " MST_DEV_EXAMPLE1 " hw query\n" FLINT_NAME " -d " MST_DEV_EXAMPLE1
+               " hw set QuadEn=1\n" FLINT_NAME " -d " MST_DEV_EXAMPLE1 " hw set Flash1.WriteProtected=Top,1-SubSectors";
 #else
     _name = "Hw";
     _desc = "Query HW info and flash attributes.";
@@ -5387,32 +6222,34 @@ HwSubCommand::HwSubCommand()
     _cmdType = SC_Hw;
 }
 
-HwSubCommand:: ~HwSubCommand()
-{
-
-}
+HwSubCommand::~HwSubCommand() {}
 
 bool HwSubCommand::verifyParams()
 {
 #ifdef EXTERNAL
-    if (_flintParams.cmd_params[0] != "query") {
+    if (_flintParams.cmd_params[0] != "query")
+    {
         reportErr(true, FLINT_INVALID_OPTION_ERROR, _flintParams.cmd_params[0].c_str(), _name.c_str(), "query");
         return false;
     }
-    if (_flintParams.cmd_params.size() != 1) {
+    if (_flintParams.cmd_params.size() != 1)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 1, (int)_flintParams.cmd_params.size());
         return false;
     }
 #else
-    if (_flintParams.cmd_params.size() > 2 || _flintParams.cmd_params.size() == 0) {
+    if (_flintParams.cmd_params.size() > 2 || _flintParams.cmd_params.size() == 0)
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR2, _name.c_str(), 2, (int)_flintParams.cmd_params.size());
         return false;
     }
-    if ((_flintParams.cmd_params[0] != "query") && (_flintParams.cmd_params[0] != "set")) {
+    if ((_flintParams.cmd_params[0] != "query") && (_flintParams.cmd_params[0] != "set"))
+    {
         reportErr(true, FLINT_INVALID_OPTION_ERROR, _flintParams.cmd_params[0].c_str(), _name.c_str(), "query or set");
         return false;
     }
-    if ((_flintParams.cmd_params[0] == "set") && (_flintParams.cmd_params.size() != 2)) {
+    if ((_flintParams.cmd_params[0] == "set") && (_flintParams.cmd_params.size() != 2))
+    {
         reportErr(true, FLINT_CMD_ARGS_ERROR, _name.c_str(), 2, (int)_flintParams.cmd_params.size());
         return false;
     }
@@ -5428,7 +6265,8 @@ FlintStatus HwSubCommand::printAttr(const ext_flash_attr_t& attr)
     printf("  HwRevId                 0x%x\n", attr.rev_id);
 
     printf("Flash Info:\n");
-    if (attr.type_str != NULL) {
+    if (attr.type_str != NULL)
+    {
         // we don't print the flash type in old devices
         printf("  Type                    %s\n", attr.type_str);
     }
@@ -5439,107 +6277,128 @@ FlintStatus HwSubCommand::printAttr(const ext_flash_attr_t& attr)
     printf("  CmdSet                  0x%x\n", attr.command_set);
 
     // Quad EN query
-    if (attr.quad_en_support) {
-        switch (attr.mf_get_quad_en_rc) {
-        case MFE_OK:
-            printf("  " QUAD_EN_PARAM "                  %d\n", attr.quad_en);
-            break;
+    if (attr.quad_en_support)
+    {
+        switch (attr.mf_get_quad_en_rc)
+        {
+            case MFE_OK:
+                printf("  " QUAD_EN_PARAM "                  %d\n", attr.quad_en);
+                break;
 
-        case MFE_MISMATCH_PARAM:
-            printf("-E- There is a mismatch in the " QUAD_EN_PARAM " attribute between the flashes attached to the device\n");
-            break;
+            case MFE_MISMATCH_PARAM:
+                printf("-E- There is a mismatch in the " QUAD_EN_PARAM
+                       " attribute between the flashes attached to the device\n");
+                break;
 
-        case MFE_NOT_SUPPORTED_OPERATION:
-            printf("Quad En not supported operation.\n");
-            break;
-        case MFE_NOT_IMPLEMENTED:
-            printf("Quad En not implemented.\n");
-            break;
-        default:
-            printf("Failed to get " QUAD_EN_PARAM " attribute: %s (%s)", \
-                   errno == 0 ? "" : strerror(errno), mf_err2str(attr.mf_get_quad_en_rc));
-            return FLINT_FAILED;
+            case MFE_NOT_SUPPORTED_OPERATION:
+                printf("Quad En not supported operation.\n");
+                break;
+            case MFE_NOT_IMPLEMENTED:
+                printf("Quad En not implemented.\n");
+                break;
+            default:
+                printf("Failed to get " QUAD_EN_PARAM " attribute: %s (%s)", errno == 0 ? "" : strerror(errno),
+                       mf_err2str(attr.mf_get_quad_en_rc));
+                return FLINT_FAILED;
         }
     }
     // Dummy Cycles query
-    if (attr.dummy_cycles_support) {
-        switch (attr.mf_get_dummy_cycles_rc) {
-        case MFE_OK:
-            printf("  " DUMMY_CYCLES_PARAM "             %d\n", attr.dummy_cycles);
-            break;
+    if (attr.dummy_cycles_support)
+    {
+        switch (attr.mf_get_dummy_cycles_rc)
+        {
+            case MFE_OK:
+                printf("  " DUMMY_CYCLES_PARAM "             %d\n", attr.dummy_cycles);
+                break;
 
-        case MFE_MISMATCH_PARAM:
-            printf("-E- There is a mismatch in the " DUMMY_CYCLES_PARAM " attribute between the flashes attached to the device\n");
-            break;
+            case MFE_MISMATCH_PARAM:
+                printf("-E- There is a mismatch in the " DUMMY_CYCLES_PARAM
+                       " attribute between the flashes attached to the device\n");
+                break;
 
-        case MFE_NOT_SUPPORTED_OPERATION:
-            break;
+            case MFE_NOT_SUPPORTED_OPERATION:
+                break;
 
-        default:
-            printf("Failed to get " DUMMY_CYCLES_PARAM " attribute: %s (%s)", \
-                   errno == 0 ? "" : strerror(errno), mf_err2str(attr.mf_get_dummy_cycles_rc));
-            return FLINT_FAILED;
+            default:
+                printf("Failed to get " DUMMY_CYCLES_PARAM " attribute: %s (%s)", errno == 0 ? "" : strerror(errno),
+                       mf_err2str(attr.mf_get_dummy_cycles_rc));
+                return FLINT_FAILED;
         }
     }
     // Flash write protected info query
-    if (attr.write_protect_support) {
+    if (attr.write_protect_support)
+    {
         int bank;
         int rc;
-        for (bank = 0; bank < attr.banks_num; bank++) {
+        for (bank = 0; bank < attr.banks_num; bank++)
+        {
             write_protect_info_t protect_info = attr.protect_info_array[bank];
             rc = attr.mf_get_write_protect_rc_array[bank];
-            if (rc == MFE_OK) {
+            if (rc == MFE_OK)
+            {
                 printf("  " FLASH_NAME "%d." WRITE_PROTECT "   ", bank);
-                if (protect_info.sectors_num != 0) {
+                if (protect_info.sectors_num != 0)
+                {
                     printf("%s,", (protect_info.is_bottom ? WP_BOTTOM_STR : WP_TOP_STR));
                     printf("%d-", protect_info.sectors_num);
                     printf("%s\n", (protect_info.is_subsector ? WP_SUBSEC_STR : WP_SEC_STR));
-                } else {
+                }
+                else
+                {
                     printf(WP_DISABLED_STR "\n");
                 }
-            } else {
-                if (rc != MFE_NOT_SUPPORTED_OPERATION) {
+            }
+            else
+            {
+                if (rc != MFE_NOT_SUPPORTED_OPERATION)
+                {
                     // We ignore the read when operation is not supported!
-                    printf("Failed to get write_protected info: %s (%s)", errno == 0 ? "" : strerror(errno), mf_err2str(rc));
+                    printf("Failed to get write_protected info: %s (%s)", errno == 0 ? "" : strerror(errno),
+                           mf_err2str(rc));
                     return FLINT_FAILED;
                 }
             }
         }
     }
     // Driver-strength query
-    if (attr.driver_strength_support) {
-        switch (attr.mf_get_driver_strength_rc) {
-        case MFE_OK:
-            printf("  " DRIVER_STRENGTH_PARAM "          %d\n", attr.driver_strength);
-            break;
+    if (attr.driver_strength_support)
+    {
+        switch (attr.mf_get_driver_strength_rc)
+        {
+            case MFE_OK:
+                printf("  " DRIVER_STRENGTH_PARAM "          %d\n", attr.driver_strength);
+                break;
 
-        case MFE_MISMATCH_PARAM:
-            printf("-E- There is a mismatch in the " DRIVER_STRENGTH_PARAM " attribute between the flashes attached to the device\n");
-            break;
+            case MFE_MISMATCH_PARAM:
+                printf("-E- There is a mismatch in the " DRIVER_STRENGTH_PARAM
+                       " attribute between the flashes attached to the device\n");
+                break;
 
-        case MFE_NOT_SUPPORTED_OPERATION:
-            printf("Driver-strength not supported operation.\n");
-            break;
-        case MFE_NOT_IMPLEMENTED:
-            printf("Driver-strength not implemented.\n");
-            break;
-        case MFE_REG_ACCESS_METHOD_NOT_SUPP:
-            printf("Driver-strength not supported by FW, retry with -ocr.\n");
-            break;
-        default:
-            printf("Failed to get " DRIVER_STRENGTH_PARAM " attribute: %s (%s)", \
-                errno == 0 ? "" : strerror(errno), mf_err2str(attr.mf_get_driver_strength_rc));
-            return FLINT_FAILED;
+            case MFE_NOT_SUPPORTED_OPERATION:
+                printf("Driver-strength not supported operation.\n");
+                break;
+            case MFE_NOT_IMPLEMENTED:
+                printf("Driver-strength not implemented.\n");
+                break;
+            case MFE_REG_ACCESS_METHOD_NOT_SUPP:
+                printf("Driver-strength not supported by FW, retry with -ocr.\n");
+                break;
+            default:
+                printf("Failed to get " DRIVER_STRENGTH_PARAM " attribute: %s (%s)", errno == 0 ? "" : strerror(errno),
+                       mf_err2str(attr.mf_get_driver_strength_rc));
+                return FLINT_FAILED;
         }
     }
-    printf("  JEDEC_ID                0x%06x\n", attr.jedec_id & 0xffffff); // JEDEC_ID is built from 3B, so we mask last byte
+    printf("  JEDEC_ID                0x%06x\n",
+           attr.jedec_id & 0xffffff); // JEDEC_ID is built from 3B, so we mask last byte
     return FLINT_SUCCESS;
 }
 
 FlintStatus HwSubCommand::executeCommand()
 {
-    //init fw operation object
-    if (preFwAccess() == FLINT_FAILED) {
+    // init fw operation object
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     dm_dev_id_t devid_t;
@@ -5549,48 +6408,56 @@ FlintStatus HwSubCommand::executeCommand()
     int rc = dm_get_device_id(mf, &devid_t, &devid, &revid);
     (void)devid;
     (void)revid;
-    if (rc != 0) {
+    if (rc != 0)
+    {
         reportErr(true, "HW command: can't get device Id");
         return FLINT_FAILED;
     }
-    if (_flintParams.cmd_params[0] == "set") {
-        char *cmdParam = strcpy(new char[_flintParams.cmd_params[1].size() + 1],
-                                _flintParams.cmd_params[1].c_str());
+    if (_flintParams.cmd_params[0] == "set")
+    {
+        char* cmdParam = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
         char *paramName, *paramValStr;
         paramName = strtok(cmdParam, "=");
         paramValStr = strtok(NULL, "=");
-        //printf("-D- param_name = %s, param_val_str=%s, cmdParam=%s\n", paramName, paramValStr, cmdParam);
-        if (paramName == NULL || paramValStr == NULL) {
+        // printf("-D- param_name = %s, param_val_str=%s, cmdParam=%s\n", paramName, paramValStr, cmdParam);
+        if (paramName == NULL || paramValStr == NULL)
+        {
             delete[] cmdParam;
             reportErr(true, FLINT_HW_SET_ARGS_ERROR, _flintParams.cmd_params[1].c_str());
             return FLINT_FAILED;
         }
-        if (!((Flash*)_io)->set_attr(paramName, paramValStr)) {
+        if (!((Flash*)_io)->set_attr(paramName, paramValStr))
+        {
             delete[] cmdParam;
             reportErr(true, FLINT_HW_COMMAND_ERROR, "set", _io->err());
             return FLINT_FAILED;
         }
         printf("-I- %s parameter was set successfully\n", paramName);
         delete[] cmdParam;
-    } else {
+    }
+    else
+    {
         ext_flash_attr_t attr;
         attr.type_str = (char*)NULL;
-        if (!((Flash*)_io)->get_attr(attr)) {
+        if (!((Flash*)_io)->get_attr(attr))
+        {
             reportErr(true, FLINT_HW_COMMAND_ERROR, "query", _io->err());
-            if (attr.type_str) {
+            if (attr.type_str)
+            {
                 delete[] attr.type_str;
             }
             return FLINT_FAILED;
         }
         FlintStatus rc = printAttr(attr);
-        //str is allocated in get_attr
-        if (attr.type_str) {
+        // str is allocated in get_attr
+        if (attr.type_str)
+        {
             delete[] attr.type_str;
         }
-        if (rc == FLINT_FAILED) {
+        if (rc == FLINT_FAILED)
+        {
             return FLINT_FAILED;
         }
-
     }
     return FLINT_SUCCESS;
 }
@@ -5614,29 +6481,29 @@ EraseSubCommand::EraseSubCommand()
     _cmdType = SC_Erase;
 }
 
-EraseSubCommand:: ~EraseSubCommand()
-{
-
-}
+EraseSubCommand::~EraseSubCommand() {}
 
 FlintStatus EraseSubCommand::executeCommand()
 {
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     u_int32_t addr;
-    char *addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
-    char    *endp;
+    char* addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
+    char* endp;
     // Address of sector to erase
     addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, _flintParams.cmd_params[0].c_str());
         delete[] addrStr;
         return FLINT_FAILED;
     }
     delete[] addrStr;
     // Erase
-    if (!((Flash*)_io)->erase_sector(addr)) {
+    if (!((Flash*)_io)->erase_sector(addr))
+    {
         reportErr(true, FLINT_ERASE_SEC_ERROR, _io->err());
         return FLINT_FAILED;
     }
@@ -5644,8 +6511,8 @@ FlintStatus EraseSubCommand::executeCommand()
 }
 
 /*****************************
-* Class: Read Dword SubCommand
-*****************************/
+ * Class: Read Dword SubCommand
+ *****************************/
 RwSubCommand::RwSubCommand()
 {
     _name = "rw";
@@ -5662,29 +6529,28 @@ RwSubCommand::RwSubCommand()
     _cmdType = SC_Rw;
 }
 
-RwSubCommand:: ~RwSubCommand()
-{
-
-}
+RwSubCommand::~RwSubCommand() {}
 
 FlintStatus RwSubCommand::executeCommand()
 {
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     u_int32_t addr;
     u_int32_t data;
-    char *addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
-    char *endp;
+    char* addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
+    char* endp;
     addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, _flintParams.cmd_params[0].c_str());
         delete[] addrStr;
         return FLINT_FAILED;
     }
     delete[] addrStr;
-    if (_flintParams.device_specified ? !((Flash*)_io)->read(addr, &data) \
-        : !((FImage*)_io)->read(addr, &data)) {
+    if (_flintParams.device_specified ? !((Flash*)_io)->read(addr, &data) : !((FImage*)_io)->read(addr, &data))
+    {
         reportErr(true, FLINT_FLASH_READ_ERROR, _io->err());
         return FLINT_FAILED;
     }
@@ -5693,8 +6559,8 @@ FlintStatus RwSubCommand::executeCommand()
 }
 
 /******************************
-* Class: Write Dword Subcommand
-******************************/
+ * Class: Write Dword Subcommand
+ ******************************/
 WwSubCommand::WwSubCommand()
 {
     _name = "ww";
@@ -5714,31 +6580,31 @@ WwSubCommand::WwSubCommand()
     _cmdType = SC_Ww;
 }
 
-WwSubCommand:: ~WwSubCommand()
-{
-
-}
+WwSubCommand::~WwSubCommand() {}
 
 FlintStatus WwSubCommand::executeCommand()
 {
-    //init fw operation object
-    if (preFwAccess() == FLINT_FAILED) {
+    // init fw operation object
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     u_int32_t addr;
     u_int32_t data;
-    char *addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
-    char *dataStr = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
-    char *endp;
+    char* addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
+    char* dataStr = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
+    char* endp;
     addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, _flintParams.cmd_params[0].c_str());
         delete[] addrStr;
         delete[] dataStr;
         return FLINT_FAILED;
     }
     data = strtoul(dataStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_DATA_ERROR, _flintParams.cmd_params[1].c_str());
         delete[] addrStr;
         delete[] dataStr;
@@ -5748,14 +6614,18 @@ FlintStatus WwSubCommand::executeCommand()
     delete[] dataStr;
     data = __cpu_to_be32(data);
     // TODO - align below write function for Flash and FImage classes
-    if (_io->is_flash()) {
-        if (!((Flash*)_io)->write(addr, data)) {
+    if (_io->is_flash())
+    {
+        if (!((Flash*)_io)->write(addr, data))
+        {
             reportErr(true, FLINT_FLASH_WRITE_ERROR, _io->err());
             return FLINT_FAILED;
         }
     }
-    else {
-        if (!_io->write(addr, &data, 0x4)) {
+    else
+    {
+        if (!_io->write(addr, &data, 0x4))
+        {
             reportErr(true, FLINT_FLASH_WRITE_ERROR, _io->err());
             return FLINT_FAILED;
         }
@@ -5763,8 +6633,8 @@ FlintStatus WwSubCommand::executeCommand()
     return FLINT_SUCCESS;
 }
 /***************************************
-* Class: Write Dword No Erase SubCommand
-***************************************/
+ * Class: Write Dword No Erase SubCommand
+ ***************************************/
 WwneSubCommand::WwneSubCommand()
 {
     _name = "wwne";
@@ -5785,31 +6655,31 @@ WwneSubCommand::WwneSubCommand()
     _cmdType = SC_Wwne;
 }
 
-WwneSubCommand:: ~WwneSubCommand()
-{
-
-}
+WwneSubCommand::~WwneSubCommand() {}
 
 FlintStatus WwneSubCommand::executeCommand()
 {
-    //init fw operation object
-    if (preFwAccess() == FLINT_FAILED) {
+    // init fw operation object
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     u_int32_t addr;
     u_int32_t data;
-    char *addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
-    char *dataStr = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
-    char *endp;
+    char* addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
+    char* dataStr = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
+    char* endp;
     addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, _flintParams.cmd_params[0].c_str());
         delete[] addrStr;
         delete[] dataStr;
         return FLINT_FAILED;
     }
     data = strtoul(dataStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_DATA_ERROR, _flintParams.cmd_params[1].c_str());
         delete[] addrStr;
         delete[] dataStr;
@@ -5818,7 +6688,8 @@ FlintStatus WwneSubCommand::executeCommand()
     delete[] addrStr;
     delete[] dataStr;
     data = __cpu_to_be32(data);
-    if (!((Flash*)_io)->write(addr, &data, 4, true)) {
+    if (!((Flash*)_io)->write(addr, &data, 4, true))
+    {
         reportErr(true, FLINT_FLASH_WRITE_ERROR, _io->err());
         return FLINT_FAILED;
     }
@@ -5826,8 +6697,8 @@ FlintStatus WwneSubCommand::executeCommand()
 }
 
 /**************************************
-* Class:Write Block  SubCommand
-**************************************/
+ * Class:Write Block  SubCommand
+ **************************************/
 WbSubCommand::WbSubCommand()
 {
     _name = "wb";
@@ -5846,18 +6717,16 @@ WbSubCommand::WbSubCommand()
     _cmdType = SC_Wb;
 }
 
-WbSubCommand:: ~WbSubCommand()
-{
-
-}
+WbSubCommand::~WbSubCommand() {}
 
-bool WbSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t *addr, std::vector<u_int8_t>& data)
+bool WbSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t* addr, std::vector<u_int8_t>& data)
 {
     // get address
-    char *endp;
-    char *addrStr = strcpy(new char[cmdParams[1].size() + 1], cmdParams[1].c_str());
+    char* endp;
+    char* addrStr = strcpy(new char[cmdParams[1].size() + 1], cmdParams[1].c_str());
     *addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, cmdParams[1].c_str());
         delete[] addrStr;
         return false;
@@ -5865,13 +6734,15 @@ bool WbSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t *
     delete[] addrStr;
     // get data
     FImage img;
-    if (!img.open(cmdParams[0].c_str())) {
+    if (!img.open(cmdParams[0].c_str()))
+    {
         reportErr(true, FLINT_WB_FILE_ERROR, cmdParams[0].c_str(), img.err());
         return false;
     }
-    //copy data to vector
+    // copy data to vector
     data.resize(img.getBufLength());
-    if (!img.getBuf()) {
+    if (!img.getBuf())
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, img.err());
         return false;
     }
@@ -5882,16 +6753,19 @@ bool WbSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t *
 
 FlintStatus WbSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     u_int32_t addr;
     std::vector<u_int8_t> data;
-    if (!extractData(_flintParams.cmd_params, &addr, data)) {
+    if (!extractData(_flintParams.cmd_params, &addr, data))
+    {
         return FLINT_FAILED;
     }
-    //printf("-D- writing to addr:0x%08x %lu bytes\n",addr , data.size());
-    if (!_fwOps->FwWriteBlock(addr, data, wbCbFunc)) {
+    // printf("-D- writing to addr:0x%08x %lu bytes\n",addr , data.size());
+    if (!_fwOps->FwWriteBlock(addr, data, wbCbFunc))
+    {
         reportErr(true, FLINT_WB_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
@@ -5900,8 +6774,8 @@ FlintStatus WbSubCommand::executeCommand()
 }
 
 /**************************************
-* Class:Write Block No Erase SubCommand
-**************************************/
+ * Class:Write Block No Erase SubCommand
+ **************************************/
 WbneSubCommand::WbneSubCommand()
 {
     _name = "wbne";
@@ -5919,50 +6793,53 @@ WbneSubCommand::WbneSubCommand()
     _cmdType = SC_Wbne;
 }
 
-WbneSubCommand:: ~WbneSubCommand()
-{
-
-}
+WbneSubCommand::~WbneSubCommand() {}
 
 bool WbneSubCommand::writeBlock(u_int32_t addr, std::vector<u_int32_t> dataVec)
 {
-    //we should work only on flash.
-    //check if flash is big enough
-    if (addr + (dataVec.size() * 4) > ((Flash*)_io)->get_effective_size()) {
+    // we should work only on flash.
+    // check if flash is big enough
+    if (addr + (dataVec.size() * 4) > ((Flash*)_io)->get_effective_size())
+    {
         reportErr(true, "Writing %#x bytes from address %#x is out of flash limits (%#x bytes)\n",
                   (unsigned int)(dataVec.size() * 4), (unsigned int)addr, (unsigned int)_io->get_effective_size());
         return false;
     }
-    if (!((Flash*)_io)->write(addr, &dataVec[0], (dataVec.size() * 4), true)) {
+    if (!((Flash*)_io)->write(addr, &dataVec[0], (dataVec.size() * 4), true))
+    {
         reportErr(true, FLINT_FLASH_WRITE_ERROR, _io->err());
         return false;
     }
     return true;
 }
 
-bool WbneSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t *addr, std::vector<u_int32_t>& data)
+bool WbneSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t* addr, std::vector<u_int32_t>& data)
 {
-    char *endp;
-    char *addrStr = strcpy(new char[cmdParams[0].size() + 1], cmdParams[0].c_str());
+    char* endp;
+    char* addrStr = strcpy(new char[cmdParams[0].size() + 1], cmdParams[0].c_str());
     *addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, cmdParams[0].c_str());
         delete[] addrStr;
         return false;
     }
     delete[] addrStr;
-    char *sizeStr = strcpy(new char[cmdParams[1].size() + 1], cmdParams[1].c_str());
+    char* sizeStr = strcpy(new char[cmdParams[1].size() + 1], cmdParams[1].c_str());
     u_int32_t size = strtoul(sizeStr, &endp, 0);
-    if (*endp || size % 4 || size / 4 != (cmdParams.size() - 2)) {
+    if (*endp || size % 4 || size / 4 != (cmdParams.size() - 2))
+    {
         reportErr(true, FLINT_INVALID_SIZE_ERROR, sizeStr);
         delete[] sizeStr;
         return false;
     }
     delete[] sizeStr;
-    for (u_int32_t i = 2; i < cmdParams.size(); i++) {
-        char *dataStr = strcpy(new char[cmdParams[i].size() + 1], cmdParams[i].c_str());
+    for (u_int32_t i = 2; i < cmdParams.size(); i++)
+    {
+        char* dataStr = strcpy(new char[cmdParams[i].size() + 1], cmdParams[i].c_str());
         data.push_back(__cpu_to_be32(strtoul(dataStr, &endp, 0)));
-        if (*endp) {
+        if (*endp)
+        {
             reportErr(true, FLINT_INVALID_DATA_ERROR, dataStr);
             delete[] dataStr;
             return false;
@@ -5974,16 +6851,19 @@ bool WbneSubCommand::extractData(const std::vector<string>& cmdParams, u_int32_t
 
 FlintStatus WbneSubCommand::executeCommand()
 {
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     u_int32_t addr;
     std::vector<u_int32_t> data;
-    if (!extractData(_flintParams.cmd_params, &addr, data)) {
+    if (!extractData(_flintParams.cmd_params, &addr, data))
+    {
         return FLINT_FAILED;
     }
-    //printf("-D- writing to addr:0x%08x %lu bytes\n",addr , data.size()*4);
-    if (!writeBlock(addr, data)) {
+    // printf("-D- writing to addr:0x%08x %lu bytes\n",addr , data.size()*4);
+    if (!writeBlock(addr, data))
+    {
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
@@ -6010,15 +6890,13 @@ RbSubCommand::RbSubCommand()
     _cmdType = SC_Rb;
 }
 
-RbSubCommand:: ~RbSubCommand()
-{
-
-}
+RbSubCommand::~RbSubCommand() {}
 
 bool RbSubCommand::readBlock(u_int32_t addr, std::vector<u_int8_t>& buff, bool isFlash)
 {
-    FwOperations *ops = isFlash ? _fwOps : _imgOps;
-    if (!ops->FwReadBlock(addr, buff.size(), buff)) {
+    FwOperations* ops = isFlash ? _fwOps : _imgOps;
+    if (!ops->FwReadBlock(addr, buff.size(), buff))
+    {
         reportErr(true, FLINT_IMAGE_READ_ERROR, ops->err());
         return false;
     }
@@ -6027,27 +6905,33 @@ bool RbSubCommand::readBlock(u_int32_t addr, std::vector<u_int8_t>& buff, bool i
 
 bool RbSubCommand::printToScreen(const std::vector<u_int8_t>& buff, bool hexdump_format)
 {
-    if (hexdump_format) {
-        for (u_int32_t i = 0; i < buff.size(); i += 16) {
-        
+    if (hexdump_format)
+    {
+        for (u_int32_t i = 0; i < buff.size(); i += 16)
+        {
             // Print addr
             printf("%08x  ", i);
             // Print bytes
-            for (u_int32_t j = 0; (j < 16) && (i + j < buff.size()); j++) {
+            for (u_int32_t j = 0; (j < 16) && (i + j < buff.size()); j++)
+            {
                 printf("%02x ", buff[i + j]);
-                if (j == 7) printf(" ");
+                if (j == 7)
+                    printf(" ");
             }
             // Print ASCII
             printf(" |");
-            for (u_int32_t j = 0; (j < 16) && (i + j < buff.size()); j++) {
+            for (u_int32_t j = 0; (j < 16) && (i + j < buff.size()); j++)
+            {
                 printf("%c", isprint(buff[i + j]) ? buff[i + j] : '.');
             }
             // Print new line
             printf("|\n");
         }
     }
-    else {
-        for (u_int32_t i = 0; i < buff.size(); i += 4) {
+    else
+    {
+        for (u_int32_t i = 0; i < buff.size(); i += 4)
+        {
             u_int32_t word = *((u_int32_t*)(&buff[0] + i));
             word = __be32_to_cpu(word);
             printf("0x%08x ", word);
@@ -6059,41 +6943,48 @@ bool RbSubCommand::printToScreen(const std::vector<u_int8_t>& buff, bool hexdump
 
 FlintStatus RbSubCommand::executeCommand()
 {
-    //init fw operation object
-    if (preFwOps() == FLINT_FAILED) {
+    // init fw operation object
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     bool wTF = _flintParams.cmd_params.size() == 3 ? true : false;
-    //extract address and size to read from cmdline
+    // extract address and size to read from cmdline
     u_int32_t addr;
     u_int32_t size;
-    char *endp;
-    char *addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
+    char* endp;
+    char* addrStr = strcpy(new char[_flintParams.cmd_params[0].size() + 1], _flintParams.cmd_params[0].c_str());
     addr = strtoul(addrStr, &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         reportErr(true, FLINT_INVALID_ADDR_ERROR, _flintParams.cmd_params[0].c_str());
         delete[] addrStr;
         return FLINT_FAILED;
     }
     delete[] addrStr;
-    char *sizeStr = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
+    char* sizeStr = strcpy(new char[_flintParams.cmd_params[1].size() + 1], _flintParams.cmd_params[1].c_str());
     size = strtoul(sizeStr, &endp, 0);
-    if (*endp || size % 4) {
+    if (*endp || size % 4)
+    {
         reportErr(true, FLINT_INVALID_SIZE_ERROR, sizeStr);
         delete[] sizeStr;
         return FLINT_FAILED;
     }
     delete[] sizeStr;
-    //init byte vector and fill it with data
+    // init byte vector and fill it with data
     std::vector<u_int8_t> data(size);
-    if (!readBlock(addr, data, _flintParams.device_specified)) {
+    if (!readBlock(addr, data, _flintParams.device_specified))
+    {
         return FLINT_FAILED;
     }
-    //print either to file or to screen
+    // print either to file or to screen
     FlintStatus rc;
-    if (wTF) {
+    if (wTF)
+    {
         rc = writeToFile(_flintParams.cmd_params[2], data) == true ? FLINT_SUCCESS : FLINT_FAILED;
-    } else {
+    }
+    else
+    {
         rc = printToScreen(data, _flintParams.hexdump_format) == true ? FLINT_SUCCESS : FLINT_FAILED;
     }
     return rc;
@@ -6117,10 +7008,7 @@ ClearSemSubCommand::ClearSemSubCommand()
     _cmdType = SC_Clear_Sem;
 }
 
-ClearSemSubCommand:: ~ClearSemSubCommand()
-{
-
-}
+ClearSemSubCommand::~ClearSemSubCommand() {}
 
 FlintStatus ClearSemSubCommand::executeCommand()
 {
@@ -6128,7 +7016,6 @@ FlintStatus ClearSemSubCommand::executeCommand()
     return preFwAccess();
 }
 
-
 /***********************
  * Class: RomQuery
  **********************/
@@ -6148,26 +7035,23 @@ RomQuerySubCommand::RomQuerySubCommand()
     memset(&_romsInfo, 0, sizeof(_romsInfo));
 }
 
-RomQuerySubCommand:: ~RomQuerySubCommand()
-{
-
-}
-
+RomQuerySubCommand::~RomQuerySubCommand() {}
 
 FlintStatus RomQuerySubCommand::executeCommand()
 {
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
 
     getRomsInfo(_io, _romsInfo);
-    if (_romsInfo.exp_rom_err_msg_valid != 0) {
+    if (_romsInfo.exp_rom_err_msg_valid != 0)
+    {
         reportErr(true, FLINT_ROM_QUERY_ERROR, _flintParams.image.c_str(), _romsInfo.exp_rom_err_msg);
         return FLINT_FAILED;
     }
     displayExpRomInfo(_romsInfo, "Rom Info: ");
     return FLINT_SUCCESS;
-
 }
 
 /***********************
@@ -6188,26 +7072,25 @@ ResetCfgSubCommand::ResetCfgSubCommand()
     _cmdType = SC_ResetCfg;
 }
 
-ResetCfgSubCommand:: ~ResetCfgSubCommand()
-{
-
-}
-
+ResetCfgSubCommand::~ResetCfgSubCommand() {}
 
 FlintStatus ResetCfgSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     printf("-W- Resetting device configuration using Flint should be done as a last resort.\n");
     printf("-W- Please attempt to reset configuration via mlxconfig tool if possible.\n");
     printf("-W- Only proceed if you know what you are doing.\n");
-    if (!askUser("reset non-volatile configuration")) {
+    if (!askUser("reset non-volatile configuration"))
+    {
         return FLINT_FAILED;
     }
 
     printf("Resetting...");
-    if (!_fwOps->FwResetNvData()) {
+    if (!_fwOps->FwResetNvData())
+    {
         printf(" Failed!\n");
         reportErr(true, FLINT_RESET_CFG_ERROR, _fwOps->err());
         return FLINT_FAILED;
@@ -6216,7 +7099,6 @@ FlintStatus ResetCfgSubCommand::executeCommand()
     printf("\n-I- Configuration were successfully reset. reboot or restart the driver is required.\n");
 
     return FLINT_SUCCESS;
-
 }
 
 /***********************
@@ -6237,29 +7119,27 @@ FiSubCommand::FiSubCommand()
     _cmdType = SC_Fix_Img;
 }
 
-FiSubCommand:: ~FiSubCommand()
-{
-
-}
-
+FiSubCommand::~FiSubCommand() {}
 
 FlintStatus FiSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
 
-    if (!askUser("Fix device fw?")) {
+    if (!askUser("Fix device fw?"))
+    {
         return FLINT_FAILED;
     }
 
-    if (!_fwOps->FwShiftDevData(&verifyCbFunc)) {
+    if (!_fwOps->FwShiftDevData(&verifyCbFunc))
+    {
         reportErr(true, FLINT_FIX_IMG_ERROR, _fwOps->err());
         return FLINT_FAILED;
     }
     printf("\n-I- Fw was successfully fixed. reboot or restart the driver is required.\n");
     return FLINT_SUCCESS;
-
 }
 
 /***********************
@@ -6281,37 +7161,40 @@ CheckSumSubCommand::CheckSumSubCommand()
     memset(_checkSum, 0, sizeof(_checkSum));
 }
 
-CheckSumSubCommand:: ~CheckSumSubCommand()
-{
-
-}
+CheckSumSubCommand::~CheckSumSubCommand() {}
 
 bool CheckSumSubCommand::extractChecksumFromStr(string str, u_int8_t checkSum[16])
 {
     char ptr[2];
     int i = 15;
-    if (str.size() < 2) {
+    if (str.size() < 2)
+    {
         reportErr(true, FLINT_CHECKSUM_LEN_ERROR);
         return false;
     }
-    if (!strncasecmp(str.c_str(), "0x", 2)) {
+    if (!strncasecmp(str.c_str(), "0x", 2))
+    {
         // str starts with 0x or 0X, remove prefix
         str = &(str.c_str()[2]);
     }
 
-    if (str.size() != 32) {
+    if (str.size() != 32)
+    {
         reportErr(true, FLINT_CHECKSUM_LEN_ERROR);
         return false;
     }
     stringstream ss(str);
-    while (i >= 0) {
+    while (i >= 0)
+    {
         ss.read(ptr, 2);
-        if (!isxdigit(ptr[0]) || !isxdigit(ptr[1])) {
+        if (!isxdigit(ptr[0]) || !isxdigit(ptr[1]))
+        {
             reportErr(true, FLINT_CHECKSUM_HEX_ERROR);
             return false;
         }
         checkSum[i] = (u_int8_t)strtoul(ptr, NULL, 16);
-        if (!checkSum[i] && strncmp(ptr, "00", 2)) {
+        if (!checkSum[i] && strncmp(ptr, "00", 2))
+        {
             reportErr(true, FLINT_CHECKSUM_PARSE_ERROR);
             return false;
         }
@@ -6323,7 +7206,8 @@ bool CheckSumSubCommand::extractChecksumFromStr(string str, u_int8_t checkSum[16
 string CheckSumSubCommand::checkSum2Str(u_int8_t chksm[16])
 {
     stringstream ss;
-    for (int i = 15; i >= 0; i--) {
+    for (int i = 15; i >= 0; i--)
+    {
         char chunk[3];
         snprintf(chunk, 3, "%02x", chksm[i]);
         ss << chunk;
@@ -6334,22 +7218,22 @@ string CheckSumSubCommand::checkSum2Str(u_int8_t chksm[16])
 
 FlintStatus CheckSumSubCommand::executeCommand()
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
-    FwOperations *ops = _fwOps ? _fwOps : _imgOps;
+    FwOperations* ops = _fwOps ? _fwOps : _imgOps;
     printf("-I- Calculating Checksum ...\n");
-    if (!ops->FwCalcMD5(_checkSum)) {
+    if (!ops->FwCalcMD5(_checkSum))
+    {
         reportErr(true, FLINT_CHECKSUM_ERROR, (_flintParams.device_specified ? "device" : "image"), ops->err());
         return FLINT_FAILED;
     }
     // just print it!
     printf("Checksum: %s\n", checkSum2Str(_checkSum).c_str());
     return FLINT_SUCCESS;
-
 }
 
-
 /***********************
  * Class: TimeStamp
  **********************/
@@ -6361,14 +7245,14 @@ TimeStampSubCommand::TimeStampSubCommand()
     _flagLong = "timestamp";
     _flagShort = "ts";
     _param = "[set/query/reset] ";
-    _paramExp = "set <timestamp> [FW version] : set the specified timestamp. if set on device FW version must be specified\n"
-                "timestamp should comply with ISO 8601 format and provided with UTC timezone: YYYY-MM-DDThh:mm:ssZ\n"
-                "query : query device/image to view the timestamp\n"
-                "reset : reset the timestamp, remove the timestamp from device/image.\n";
-    _example = FLINT_NAME " -d " MST_DEV_EXAMPLE4 " ts set 2015-12-24T14:52:33Z 14.12.1100\n"
-               FLINT_NAME " -d " MST_DEV_EXAMPLE4 " ts reset\n"
-               FLINT_NAME " -i ./fw4115.bin ts set\n"
-               FLINT_NAME " -i ./fw4115.bin ts query";
+    _paramExp =
+      "set <timestamp> [FW version] : set the specified timestamp. if set on device FW version must be specified\n"
+      "timestamp should comply with ISO 8601 format and provided with UTC timezone: YYYY-MM-DDThh:mm:ssZ\n"
+      "query : query device/image to view the timestamp\n"
+      "reset : reset the timestamp, remove the timestamp from device/image.\n";
+    _example =
+      FLINT_NAME " -d " MST_DEV_EXAMPLE4 " ts set 2015-12-24T14:52:33Z 14.12.1100\n" FLINT_NAME " -d " MST_DEV_EXAMPLE4
+                 " ts reset\n" FLINT_NAME " -i ./fw4115.bin ts set\n" FLINT_NAME " -i ./fw4115.bin ts query";
     _v = Wtv_Dev_Or_Img;
     _maxCmdParamNum = 3;
     _minCmdParamNum = 1;
@@ -6380,19 +7264,18 @@ TimeStampSubCommand::TimeStampSubCommand()
     _mccSupported = true;
 }
 
-TimeStampSubCommand:: ~TimeStampSubCommand()
-{
-
-}
+TimeStampSubCommand::~TimeStampSubCommand() {}
 bool TimeStampSubCommand::parseFwVersion(string verStr)
 {
     unsigned int major = 0;
     unsigned int minor = 0;
     unsigned int subminor = 0;
     int count = sscanf(verStr.c_str(), "%02d.%02d.%04d", &major, &minor, &subminor);
-    if (count != 3) {
+    if (count != 3)
+    {
         count = sscanf(verStr.c_str(), "%02d.%04d.%04d", &major, &minor, &subminor);
-        if (count != 3) {
+        if (count != 3)
+        {
             reportErr(true, "Failed to parse FW version. expected format: MM.mm.ssss\n");
             return false;
         }
@@ -6400,51 +7283,49 @@ bool TimeStampSubCommand::parseFwVersion(string verStr)
     _userFwVer.fw_ver_major = major;
     _userFwVer.fw_ver_minor = minor;
     _userFwVer.fw_ver_subminor = subminor;
-    //printf("-D- Fw version: %d.%d.%d\n", _userFwVer.fw_ver_major, _userFwVer.fw_ver_minor, _userFwVer.fw_ver_subminor);
+    // printf("-D- Fw version: %d.%d.%d\n", _userFwVer.fw_ver_major, _userFwVer.fw_ver_minor,
+    // _userFwVer.fw_ver_subminor);
     return true;
 }
 
-#define BCD2_TO_NUM(bcd) \
-    ((((bcd) >> 4 & 0xf) * 10) + ((bcd) & 0xf))
+#define BCD2_TO_NUM(bcd) ((((bcd) >> 4 & 0xf) * 10) + ((bcd)&0xf))
 
-#define BCD4_TO_NUM(bcd) \
-    ((BCD2_TO_NUM((bcd) >> 8 & 0xff) * 100) + (BCD2_TO_NUM((bcd) & 0xff)))
+#define BCD4_TO_NUM(bcd) ((BCD2_TO_NUM((bcd) >> 8 & 0xff) * 100) + (BCD2_TO_NUM((bcd)&0xff)))
 
-#define NUM2_TO_BCD(num) \
-    ((((num) / 10) * 16) + ((num) % 10))
+#define NUM2_TO_BCD(num) ((((num) / 10) * 16) + ((num) % 10))
 
-#define NUM4_TO_BCD(num) \
-    ((NUM2_TO_BCD((num) / 100) * 256) + NUM2_TO_BCD((num) % 100))
+#define NUM4_TO_BCD(num) ((NUM2_TO_BCD((num) / 100) * 256) + NUM2_TO_BCD((num) % 100))
 
 u_int8_t TimeStampSubCommand::getDaysInMonth(u_int16_t year, u_int8_t month)
 {
     u_int8_t days = 0;
-    bool isLeapYear = year % 4 == 0; // evenly divisible by 4
+    bool isLeapYear = year % 4 == 0;                      // evenly divisible by 4
     isLeapYear &= (year % 100 != 0) || (year % 400 == 0); // not evenly divided by 100 or  evenly divisible by 400
-    switch (month) {
-    case 2:
-        days = isLeapYear ? 29 : 28;
-        break;
+    switch (month)
+    {
+        case 2:
+            days = isLeapYear ? 29 : 28;
+            break;
 
-    case 4:
-    case 6:
-    case 9:
-    case 11:
-        days = 30;
-        break;
+        case 4:
+        case 6:
+        case 9:
+        case 11:
+            days = 30;
+            break;
 
-    case 1:
-    case 3:
-    case 5:
-    case 7:
-    case 8:
-    case 10:
-    case 12:
-        days = 31;
-        break;
+        case 1:
+        case 3:
+        case 5:
+        case 7:
+        case 8:
+        case 10:
+        case 12:
+            days = 31;
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
     return days;
 }
@@ -6452,10 +7333,11 @@ u_int8_t TimeStampSubCommand::getDaysInMonth(u_int16_t year, u_int8_t month)
 void TimeStampSubCommand::getMachineUTCTime()
 {
     time_t rawTime;
-    struct tm *timeInfo;
+    struct tm* timeInfo;
     time(&rawTime);
     timeInfo = gmtime(&rawTime);
-    if (!timeInfo) {
+    if (!timeInfo)
+    {
         reportErr(true, "gmtime returned NULL. Can't get machine's UTC time.");
         return;
     }
@@ -6467,8 +7349,9 @@ void TimeStampSubCommand::getMachineUTCTime()
     _userTsEntry.ts_minutes = NUM2_TO_BCD(timeInfo->tm_min);
     _userTsEntry.ts_seconds = NUM2_TO_BCD(timeInfo->tm_sec);
 
-    //printf("-D- timestamp: %04x-%02x-%02xT%02x:%02x:%02x\n", _userTsEntry.ts_year, _userTsEntry.ts_month,
-    //                                                        _userTsEntry.ts_day, _userTsEntry.ts_hour, _userTsEntry.ts_minutes, _userTsEntry.ts_seconds);
+    // printf("-D- timestamp: %04x-%02x-%02xT%02x:%02x:%02x\n", _userTsEntry.ts_year, _userTsEntry.ts_month,
+    //                                                        _userTsEntry.ts_day, _userTsEntry.ts_hour,
+    //                                                        _userTsEntry.ts_minutes, _userTsEntry.ts_seconds);
     return;
 }
 
@@ -6480,26 +7363,34 @@ bool TimeStampSubCommand::parseTimeStamp(string tsStr)
     unsigned int hour = 0;
     unsigned int minutes = 0;
     unsigned int seconds = 0;
-    if (*tsStr.rbegin() != 'Z') {
-        reportErr(true, "Failed to parse timestamp: Timestamp timezone must be UTC. format should be: YYYY-MM-DDThh:mm:ssZ\n");
+    if (*tsStr.rbegin() != 'Z')
+    {
+        reportErr(
+          true, "Failed to parse timestamp: Timestamp timezone must be UTC. format should be: YYYY-MM-DDThh:mm:ssZ\n");
         return false;
     }
     // scan and store
     int count = sscanf(tsStr.c_str(), "%04d-%02d-%02dT%02d:%02d:%02dZ", &year, &month, &day, &hour, &minutes, &seconds);
-    if (count != 6) {
-        reportErr(true, "Failed to parse timestamp: input should be compliant to the following ISO 8601 format: YYYY-MM-DDThh:mm:ssZ\n");
+    if (count != 6)
+    {
+        reportErr(
+          true,
+          "Failed to parse timestamp: input should be compliant to the following ISO 8601 format: YYYY-MM-DDThh:mm:ssZ\n");
         return false;
     }
     // check time args
-    if (month == 0 || month > 12) {
+    if (month == 0 || month > 12)
+    {
         reportErr(true, "Failed to parse timestamp: illegal month value (%d)\n", month);
         return false;
     }
-    if (day > getDaysInMonth(year, month)) {
+    if (day > getDaysInMonth(year, month))
+    {
         reportErr(true, "Failed to parse timestamp: illegal day value (%d)\n", day);
         return false;
     }
-    if (hour > 23 || minutes > 59 || seconds > 59) {
+    if (hour > 23 || minutes > 59 || seconds > 59)
+    {
         reportErr(true, "Failed to parse timestamp: illegal time value (%02d:%02d:%02d)\n", hour, minutes, seconds);
         return false;
     }
@@ -6511,55 +7402,74 @@ bool TimeStampSubCommand::parseTimeStamp(string tsStr)
     _userTsEntry.ts_minutes = NUM2_TO_BCD(minutes);
     _userTsEntry.ts_seconds = NUM2_TO_BCD(seconds);
 
-    //printf("-D- timestamp: %04x-%02x-%02xT%02x:%02x:%02x\n", _userTsEntry.ts_year, _userTsEntry.ts_month,
-    //                                                        _userTsEntry.ts_day, _userTsEntry.ts_hour, _userTsEntry.ts_minutes, _userTsEntry.ts_seconds);
+    // printf("-D- timestamp: %04x-%02x-%02xT%02x:%02x:%02x\n", _userTsEntry.ts_year, _userTsEntry.ts_month,
+    //                                                        _userTsEntry.ts_day, _userTsEntry.ts_hour,
+    //                                                        _userTsEntry.ts_minutes, _userTsEntry.ts_seconds);
     return true;
 }
 
 bool TimeStampSubCommand::verifyParams()
 {
-    if (_flintParams.cmd_params[0] == "query") {
-        if (_flintParams.cmd_params.size() > 1) {
+    if (_flintParams.cmd_params[0] == "query")
+    {
+        if (_flintParams.cmd_params.size() > 1)
+        {
             reportErr(true, "query operation requires no arguments.\n");
             return false;
         }
         _operation = TimeStampSubCommand::TS_Query;
-    } else if (_flintParams.cmd_params[0] == "set") {
-        if (_flintParams.image_specified && _flintParams.cmd_params.size() > 2) {
+    }
+    else if (_flintParams.cmd_params[0] == "set")
+    {
+        if (_flintParams.image_specified && _flintParams.cmd_params.size() > 2)
+        {
             reportErr(true, "too many arguments for set operation on image.\n");
             return false;
-        } else if (_flintParams.device_specified && _flintParams.cmd_params.size() != 3) {
+        }
+        else if (_flintParams.device_specified && _flintParams.cmd_params.size() != 3)
+        {
             reportErr(true, "set operation on device requires timestamp and FW version arguments.\n\n");
             return false;
         }
         _operation = TimeStampSubCommand::TS_Set;
         // attempt to parse timestamp and fw version
-        if (_flintParams.image_specified && _flintParams.cmd_params.size() == 1) {
+        if (_flintParams.image_specified && _flintParams.cmd_params.size() == 1)
+        {
             // take time from machine
             getMachineUTCTime();
-        } else if (!parseTimeStamp(_flintParams.cmd_params[1])) {
+        }
+        else if (!parseTimeStamp(_flintParams.cmd_params[1]))
+        {
             return false;
         }
-        if (_flintParams.device_specified && !parseFwVersion(_flintParams.cmd_params[2])) {
+        if (_flintParams.device_specified && !parseFwVersion(_flintParams.cmd_params[2]))
+        {
             return false;
         }
-    } else if (_flintParams.cmd_params[0] == "reset") {
-        if (_flintParams.cmd_params.size() > 1) {
+    }
+    else if (_flintParams.cmd_params[0] == "reset")
+    {
+        if (_flintParams.cmd_params.size() > 1)
+        {
             reportErr(true, "erase operation requires no arguments.\n");
             return false;
         }
         _operation = TimeStampSubCommand::TS_Reset;
-    } else {
+    }
+    else
+    {
         reportErr(true, "Unknown operation, allowed operations: query/set/reset.\n");
         return false;
     }
     return true;
 }
 
-void TimeStampSubCommand::printTsAndFwVer(string prefix, struct tools_open_ts_entry& tsEntry, struct tools_open_fw_version& fwVer)
+void TimeStampSubCommand::printTsAndFwVer(string prefix,
+                                          struct tools_open_ts_entry& tsEntry,
+                                          struct tools_open_fw_version& fwVer)
 {
-    printf("%-24s: %04x-%02x-%02xT%02x:%02x:%02xZ    %02d.%02d.%04d\n", prefix.c_str(), tsEntry.ts_year, tsEntry.ts_month, tsEntry.ts_day,
-           tsEntry.ts_hour, tsEntry.ts_minutes, tsEntry.ts_seconds,
+    printf("%-24s: %04x-%02x-%02xT%02x:%02x:%02xZ    %02d.%02d.%04d\n", prefix.c_str(), tsEntry.ts_year,
+           tsEntry.ts_month, tsEntry.ts_day, tsEntry.ts_hour, tsEntry.ts_minutes, tsEntry.ts_seconds,
            fwVer.fw_ver_major, fwVer.fw_ver_minor, fwVer.fw_ver_subminor);
 }
 
@@ -6570,17 +7480,24 @@ bool TimeStampSubCommand::queryTs()
     memset(&tsEntry, 0, sizeof(tsEntry));
     memset(&fwVer, 0, sizeof(fwVer));
     // get and Print Current Running FW TS in case of device
-    if (_flintParams.device_specified) {
-        if (!_ops->FwQueryTimeStamp(tsEntry, fwVer, true)) {
+    if (_flintParams.device_specified)
+    {
+        if (!_ops->FwQueryTimeStamp(tsEntry, fwVer, true))
+        {
             printf("%-24s: N/A. %s\n", "Current timestamp", _ops->err());
-        } else {
+        }
+        else
+        {
             printTsAndFwVer("Current timestamp", tsEntry, fwVer);
         }
     }
     // get and print next FW timestamp
-    if (!_ops->FwQueryTimeStamp(tsEntry, fwVer, false)) {
+    if (!_ops->FwQueryTimeStamp(tsEntry, fwVer, false))
+    {
         printf("%-24s: N/A. %s\n", "Next timestamp", _ops->err());
-    } else {
+    }
+    else
+    {
         printTsAndFwVer("Next timestamp", tsEntry, fwVer);
     }
     return true;
@@ -6588,7 +7505,8 @@ bool TimeStampSubCommand::queryTs()
 
 bool TimeStampSubCommand::setTs()
 {
-    if (!_ops->FwSetTimeStamp(_userTsEntry, _userFwVer)) {
+    if (!_ops->FwSetTimeStamp(_userTsEntry, _userFwVer))
+    {
         reportErr(false, "%s", _ops->err());
         return false;
     }
@@ -6597,7 +7515,8 @@ bool TimeStampSubCommand::setTs()
 
 bool TimeStampSubCommand::resetTs()
 {
-    if (!_ops->FwResetTimeStamp()) {
+    if (!_ops->FwResetTimeStamp())
+    {
         reportErr(false, "%s", _ops->err());
         return false;
     }
@@ -6607,58 +7526,69 @@ bool TimeStampSubCommand::resetTs()
 FlintStatus TimeStampSubCommand::executeCommand()
 {
     bool rc;
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     _ops = _flintParams.device_specified ? _fwOps : _imgOps;
     fw_info_t fwInfo;
-    if (!_ops->FwQuery(&fwInfo)) {
+    if (!_ops->FwQuery(&fwInfo))
+    {
         reportErr(true, FLINT_FAILED_QUERY_ERROR, _flintParams.device_specified ? "Device" : "Image",
-            _flintParams.device_specified ? _flintParams.device.c_str() : _flintParams.image.c_str(), _ops->err());
+                  _flintParams.device_specified ? _flintParams.device.c_str() : _flintParams.image.c_str(),
+                  _ops->err());
         return FLINT_FAILED;
     }
     chip_type_t chip = fwInfo.fw_info.chip_type;
     bool IsValidDevice = (chip == CT_CONNECTX4 || chip == CT_CONNECTX4_LX);
 
-    switch (_operation) {
-    case TimeStampSubCommand::TS_Set:
-        if (!IsValidDevice) {
-            reportErr(true, "Failed to perform timestamp set operation. Failed to set timestamp. Time stamping not supported by FW.\n");
-            return FLINT_FAILED;
-        }
-        rc = setTs();
-        break;
+    switch (_operation)
+    {
+        case TimeStampSubCommand::TS_Set:
+            if (!IsValidDevice)
+            {
+                reportErr(
+                  true,
+                  "Failed to perform timestamp set operation. Failed to set timestamp. Time stamping not supported by FW.\n");
+                return FLINT_FAILED;
+            }
+            rc = setTs();
+            break;
 
-    case TimeStampSubCommand::TS_Query:
-        if (!IsValidDevice) {
-            printf("Current timestamp : N/A. Failed to query timestamp. Time stamping not supported by FW.\n");
-            printf("Next timestamp :    N/A. Failed to query timestamp. Time stamping not supported by FW.\n");
-            return FLINT_FAILED;
-        }
-        rc = queryTs();
-        break;
+        case TimeStampSubCommand::TS_Query:
+            if (!IsValidDevice)
+            {
+                printf("Current timestamp : N/A. Failed to query timestamp. Time stamping not supported by FW.\n");
+                printf("Next timestamp :    N/A. Failed to query timestamp. Time stamping not supported by FW.\n");
+                return FLINT_FAILED;
+            }
+            rc = queryTs();
+            break;
 
-    case TimeStampSubCommand::TS_Reset:
-        if (!IsValidDevice) {
-            reportErr(true, "Failed to perform timestamp reset operation. Failed to reset timestamp. Time stamping not supported by FW.\n");
-            return FLINT_FAILED;
-        }
-        rc = resetTs();
-        break;
+        case TimeStampSubCommand::TS_Reset:
+            if (!IsValidDevice)
+            {
+                reportErr(
+                  true,
+                  "Failed to perform timestamp reset operation. Failed to reset timestamp. Time stamping not supported by FW.\n");
+                return FLINT_FAILED;
+            }
+            rc = resetTs();
+            break;
 
-    default:
-        // should not be reached
-        reportErr(true, "Failed to perform timestamp operation: Unknown Error\n");
-        return FLINT_FAILED;
+        default:
+            // should not be reached
+            reportErr(true, "Failed to perform timestamp operation: Unknown Error\n");
+            return FLINT_FAILED;
     }
-    if (!rc) {
+    if (!rc)
+    {
         printf("-E- Failed to perform timestamp %s operation. %s\n", _flintParams.cmd_params[0].c_str(), _errBuff);
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
 }
 
-
 /***********************
  * Class: CacheImage
  **********************/
@@ -6666,7 +7596,8 @@ CacheImageSubCommand::CacheImageSubCommand()
 {
     _name = "cache image";
     _desc = "cache FW image(Windows only).";
-    _extendedDesc = "cache the FW image using Mellanox driver to allow faster FW load time upon loading the driver(Windows only).";
+    _extendedDesc =
+      "cache the FW image using Mellanox driver to allow faster FW load time upon loading the driver(Windows only).";
     _flagLong = "cache_image";
     _flagShort = "ci";
     _param = "";
@@ -6678,21 +7609,20 @@ CacheImageSubCommand::CacheImageSubCommand()
     _cmdType = SC_Cache_Image;
 }
 
-CacheImageSubCommand:: ~CacheImageSubCommand()
-{
-
-}
+CacheImageSubCommand::~CacheImageSubCommand() {}
 
 FlintStatus CacheImageSubCommand::executeCommand()
 {
 #ifdef __WIN__
     int rc;
 
-    if (preFwAccess() == FLINT_FAILED) {
+    if (preFwAccess() == FLINT_FAILED)
+    {
         return FLINT_FAILED;
     }
     rc = wdcif_send_image_cache_request(((Flash*)_io)->getMfileObj());
-    if (rc) {
+    if (rc)
+    {
         reportErr(true, FLINT_CACHE_IMAGE_ERROR, wdcif_err_str(rc));
         return FLINT_FAILED;
     }
@@ -6704,14 +7634,17 @@ FlintStatus CacheImageSubCommand::executeCommand()
 #endif
 }
 
-FlintStatus SubCommand::LockDevice(FwOperations *fwOps)
+FlintStatus SubCommand::LockDevice(FwOperations* fwOps)
 {
 #ifdef __WIN__
-    //relevant only on devices
-    if (_flintParams.device_specified) {
-        if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL) {
+    // relevant only on devices
+    if (_flintParams.device_specified)
+    {
+        if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL)
+        {
             mfile* mFile = fwOps->getMfileObj();
-            if (m_ToolsSync.init(mFile) != TOOLS_SYNC_OK) {
+            if (m_ToolsSync.init(mFile) != TOOLS_SYNC_OK)
+            {
                 reportErr(true, "Flint can't continue - prevention issue. Please try again later.");
                 return FLINT_FAILED;
             }
@@ -6723,14 +7656,16 @@ FlintStatus SubCommand::LockDevice(FwOperations *fwOps)
     return FLINT_SUCCESS;
 }
 
-
-FlintStatus SubCommand::UnlockDevice(FwOperations *fwOps)
+FlintStatus SubCommand::UnlockDevice(FwOperations* fwOps)
 {
 #ifdef __WIN__
-    //relevant only on devices
-    if (_flintParams.device_specified) {
-        if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL) {
-            if (m_ToolsSync.close() != NAMED_SYNC_OK) {
+    // relevant only on devices
+    if (_flintParams.device_specified)
+    {
+        if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL)
+        {
+            if (m_ToolsSync.close() != NAMED_SYNC_OK)
+            {
                 reportErr(true, "Prevention cannot unlock device.");
                 return FLINT_FAILED;
             }
@@ -6742,12 +7677,9 @@ FlintStatus SubCommand::UnlockDevice(FwOperations *fwOps)
     return FLINT_SUCCESS;
 }
 
-
-
-
 /***********************
-* Class: SignSubCommand
-***********************/
+ * Class: SignSubCommand
+ ***********************/
 ImportHsmKeySubCommand::ImportHsmKeySubCommand()
 {
     _name = "import_hsm_key";
@@ -6756,16 +7688,14 @@ ImportHsmKeySubCommand::ImportHsmKeySubCommand()
     _flagLong = "import_hsm_key";
     _flagShort = "";
     _paramExp = "None";
-    _example = FLINT_NAME " --user_password <password> --private_key file.pem --private_key_label <label> --public_key_label <label> (optional)";
+    _example = FLINT_NAME
+      " --user_password <password> --private_key file.pem --private_key_label <label> --public_key_label <label> (optional)";
     _v = Wtv_Uninitilized;
     _maxCmdParamNum = 0;
     _cmdType = SC_Sign;
 }
 
-ImportHsmKeySubCommand:: ~ImportHsmKeySubCommand()
-{
-
-}
+ImportHsmKeySubCommand::~ImportHsmKeySubCommand() {}
 
 FlintStatus ImportHsmKeySubCommand::executeCommand()
 {
@@ -6775,15 +7705,18 @@ FlintStatus ImportHsmKeySubCommand::executeCommand()
 
 bool ImportHsmKeySubCommand::verifyParams()
 {
-    if (_flintParams.privkey_specified == false) {
+    if (_flintParams.privkey_specified == false)
+    {
         reportErr(true, "To import the key to the HSM device you must provide private key PEM file\n");
         return false;
     }
-    if (_flintParams.private_key_label_specified == false) {
+    if (_flintParams.private_key_label_specified == false)
+    {
         reportErr(true, "To import the key to the HSM device you must provide private key label\n");
         return false;
     }
-    if (_flintParams.hsm_password_specified == false) {
+    if (_flintParams.hsm_password_specified == false)
+    {
         reportErr(true, "To import the key to the HSM device you must HSM user password\n");
         return false;
     }
@@ -6792,8 +7725,8 @@ bool ImportHsmKeySubCommand::verifyParams()
 
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
 /***********************
-* Class: ExportPublicSubCommand
-***********************/
+ * Class: ExportPublicSubCommand
+ ***********************/
 ExportPublicSubCommand::ExportPublicSubCommand()
 {
     _name = "export_public_key";
@@ -6808,52 +7741,68 @@ ExportPublicSubCommand::ExportPublicSubCommand()
     _cmdType = SC_Sign;
 }
 
-ExportPublicSubCommand::~ExportPublicSubCommand()
-{
-
-}
+ExportPublicSubCommand::~ExportPublicSubCommand() {}
 
 bool ExportPublicSubCommand::verifyParams()
 {
-    if (_flintParams.privkey_specified == false && _flintParams.image_specified == false) {
-        reportErr(true, "Incorrect input. To export the public key you must provide private key PEM file OR BIN file.\n");
+    if (_flintParams.privkey_specified == false && _flintParams.image_specified == false)
+    {
+        reportErr(true,
+                  "Incorrect input. To export the public key you must provide private key PEM file OR BIN file.\n");
         return false;
     }
-    if (_flintParams.privkey_specified == true && _flintParams.image_specified == true) {
-        reportErr(true, "Incorrect input. To export the public key you must provide private key [PEM file AND UUID string] OR BIN file.\n");
+    if (_flintParams.privkey_specified == true && _flintParams.image_specified == true)
+    {
+        reportErr(
+          true,
+          "Incorrect input. To export the public key you must provide private key [PEM file AND UUID string] OR BIN file.\n");
         return false;
     }
-    if (_flintParams.output_file_specified == false) {
+    if (_flintParams.output_file_specified == false)
+    {
         reportErr(true, "Incorrect input. To export the public key you must provide output file name.\n");
         return false;
     }
-    if (_flintParams.privkey_specified == true) {
-        if (!is_file_exists(_flintParams.privkey_file.c_str())) {
+    if (_flintParams.privkey_specified == true)
+    {
+        if (!is_file_exists(_flintParams.privkey_file.c_str()))
+        {
             reportErr(true, "Incorrect input. Can't find private key file %s \n", _flintParams.privkey_file.c_str());
             return false;
         }
-        if (_flintParams.uuid_specified == false) {
-            reportErr(true, "Incorrect input. To export the public key you must provide [private key PEM file AND UUID string].UUID string is missing.\n");
+        if (_flintParams.uuid_specified == false)
+        {
+            reportErr(
+              true,
+              "Incorrect input. To export the public key you must provide [private key PEM file AND UUID string].UUID string is missing.\n");
             return false;
         }
-        for (string::const_iterator it = _flintParams.privkey_uuid.begin(); it != _flintParams.privkey_uuid.end(); ++it) {
-            if (!isxdigit(*it)) {
+        for (string::const_iterator it = _flintParams.privkey_uuid.begin(); it != _flintParams.privkey_uuid.end(); ++it)
+        {
+            if (!isxdigit(*it))
+            {
                 reportErr(true, "Bad UUID format. UUID string must contain hexadecimal digits only.\n");
                 return false;
             }
         }
-        if (_flintParams.privkey_uuid.size() != UUID_LEN * 2) {
+        if (_flintParams.privkey_uuid.size() != UUID_LEN * 2)
+        {
             reportErr(true, "Incorrect input. The size of UUID string must be exactly %u bytes.\n", UUID_LEN * 2);
             return false;
         }
     }
-    else if (_flintParams.image_specified == true) {
-        if (!is_file_exists(_flintParams.image.c_str())) {
+    else if (_flintParams.image_specified == true)
+    {
+        if (!is_file_exists(_flintParams.image.c_str()))
+        {
             reportErr(true, "Can't find BIN file %s \n", _flintParams.image.c_str());
             return false;
         }
-        if (_flintParams.uuid_specified == true) {
-            reportErr(true, "To export the public key from the BIN you should not provide [UUID string].UUID string is extracted from the BIN file.\n");
+        if (_flintParams.uuid_specified == true)
+        {
+            reportErr(
+              true,
+              "To export the public key from the BIN you should not provide [UUID string].UUID string is extracted from the BIN file.\n");
             return false;
         }
     }
@@ -6863,35 +7812,44 @@ bool ExportPublicSubCommand::verifyParams()
 FlintStatus ExportPublicSubCommand::executeCommand()
 {
     vector<unsigned char> resultBuffer;
-    if (_flintParams.privkey_specified == true) {//working with PEM file
-        if (!verifyParams()) {
+    if (_flintParams.privkey_specified == true)
+    { // working with PEM file
+        if (!verifyParams())
+        {
             return FLINT_FAILED;
         }
         vector<unsigned char> outputBuffer;
         bool IsPemFile8Format = false;
         u_int32_t keySize = 0;
         string PemFile = _flintParams.privkey_file;
-        if(!FwOperations::CheckPemKeySize(PemFile, keySize)) {
+        if (!FwOperations::CheckPemKeySize(PemFile, keySize))
+        {
             reportErr(true, "Cannot parse the PEM file!\n");
             return FLINT_FAILED;
         }
-        if(keySize != 512) {
+        if (keySize != 512)
+        {
             reportErr(true, "The PEM file has to be 4096 bit!\n");
             return FLINT_FAILED;
         }
         Hex64Manipulations hex64;
-        if (hex64.ParsePemFile(PemFile, outputBuffer, IsPemFile8Format) == false) {
+        if (hex64.ParsePemFile(PemFile, outputBuffer, IsPemFile8Format) == false)
+        {
             reportErr(true, "Cannot parse the PEM file!\n");
             return FLINT_FAILED;
         }
         resultBuffer.resize(TOTAL_PUBLIC_KEY_SIZE);
-        if (IsPemFile8Format) {
-            for (unsigned int i = MODULUS_OFFSET; i < MODULUS_OFFSET + MODULUS_SIZE; i++) {
+        if (IsPemFile8Format)
+        {
+            for (unsigned int i = MODULUS_OFFSET; i < MODULUS_OFFSET + MODULUS_SIZE; i++)
+            {
                 resultBuffer[i - MODULUS_OFFSET + 20] = outputBuffer[i];
             }
         }
-        else {
-            for (unsigned int i = 12; i < 524; i++) {
+        else
+        {
+            for (unsigned int i = 12; i < 524; i++)
+            {
                 resultBuffer[i + 8] = outputBuffer[i];
             }
         }
@@ -6900,34 +7858,43 @@ FlintStatus ExportPublicSubCommand::executeCommand()
         resultBuffer[2] = 0;
         resultBuffer[3] = 1;
         string strData = _flintParams.privkey_uuid;
-        for (size_t i = 0; i < UUID_LEN * 2; i += 2) {
-            char tmpBuf[3] = { 0 };
+        for (size_t i = 0; i < UUID_LEN * 2; i += 2)
+        {
+            char tmpBuf[3] = {0};
             tmpBuf[0] = strData[i];
-            tmpBuf[1] = strData[i+1];
+            tmpBuf[1] = strData[i + 1];
             unsigned int dwData = 0;
             sscanf(tmpBuf, "%x", &dwData);
-            resultBuffer[i/2+4] = (u_int8_t)dwData;
+            resultBuffer[i / 2 + 4] = (u_int8_t)dwData;
         }
     }
-    else {//working with the BIN file
-        if (preFwOps() == FLINT_FAILED) {
+    else
+    { // working with the BIN file
+        if (preFwOps() == FLINT_FAILED)
+        {
             return FLINT_FAILED;
         }
-        if (_imgOps->FwType() != FIT_FS4) {
+        if (_imgOps->FwType() != FIT_FS4)
+        {
             reportErr(true, "Extracting public key is applicable only for FS4 FW.\n");
             return FLINT_FAILED;
         }
-        if (!_imgOps->getExtendedHWAravaPtrs(NULL, _imgOps->GetIoAccess(), false, false)) {
+        if (!_imgOps->getExtendedHWAravaPtrs(NULL, _imgOps->GetIoAccess(), false, false))
+        {
             reportErr(true, "Extracting secure boot HW pointers failed: %s.\n", _imgOps->err());
             return FLINT_FAILED;
         }
         u_int32_t addr = _imgOps->GetPublicKeySecureBootPtr();
-        if(addr == 0) {
-            reportErr(true, "Extracting public key failed: please check that the image type supports the secure boot.\n", _imgOps->err());
+        if (addr == 0)
+        {
+            reportErr(true,
+                      "Extracting public key failed: please check that the image type supports the secure boot.\n",
+                      _imgOps->err());
             return FLINT_FAILED;
         }
         resultBuffer.resize(TOTAL_PUBLIC_KEY_SIZE);
-        if (!_imgOps->FwReadBlock(addr, TOTAL_PUBLIC_KEY_SIZE, resultBuffer)) {
+        if (!_imgOps->FwReadBlock(addr, TOTAL_PUBLIC_KEY_SIZE, resultBuffer))
+        {
             reportErr(true, FLINT_IMAGE_READ_ERROR, _imgOps->err());
             return FLINT_FAILED;
         }
diff --git a/flint/subcommands.h b/flint/subcommands.h
index bb0d6e6d..74e2cbc5 100644
--- a/flint/subcommands.h
+++ b/flint/subcommands.h
@@ -57,14 +57,15 @@ using namespace std;
 #include "mlxarchive/mlxarchive_mfa2_utils.h"
 using namespace mfa2;
 #endif
-//we might need to close the log from the main program in case of interrupt
+// we might need to close the log from the main program in case of interrupt
 void close_log();
 void print_time_to_log();
-int print_line_to_log(const char *format, ...);
-int write_cmd_to_log(char *av[], int ac, CommandType cmd, bool write = true);
-int write_result_to_log(int is_failed, const char *err_msg, bool write = true);
+int print_line_to_log(const char* format, ...);
+int write_cmd_to_log(char* av[], int ac, CommandType cmd, bool write = true);
+int write_result_to_log(int is_failed, const char* err_msg, bool write = true);
 
-typedef enum what_to_ver {
+typedef enum what_to_ver
+{
     Wtv_Img,
     Wtv_Dev,
     Wtv_Dev_And_Img,
@@ -73,23 +74,20 @@ typedef enum what_to_ver {
 } what_to_ver_t;
 /*Subcommand classes:*/
 
-
-
-
 #define FLINT_ERR_LEN 1024
 
 class SubCommand
 {
 protected:
-    FwOperations *_fwOps;
-    FwOperations *_imgOps;
-    FBase *_io;
+    FwOperations* _fwOps;
+    FwOperations* _imgOps;
+    FBase* _io;
 
     what_to_ver_t _v;
     int _maxCmdParamNum;
     int _minCmdParamNum;
     FlintParams _flintParams;
-    //info about the Subcommand
+    // info about the Subcommand
     string _name;
     string _desc;
     string _extendedDesc;
@@ -105,29 +103,29 @@ class SubCommand
 #ifndef NO_MSTARCHIVE
     MFA2* _mfa2Pkg;
 #endif
-    //Methods that are commonly used in the various subcommands:
-    //TODO: add middle classes and segregate as much of these common methods between these classes
+    // Methods that are commonly used in the various subcommands:
+    // TODO: add middle classes and segregate as much of these common methods between these classes
 
-    virtual bool verifyParams() {return true;};
+    virtual bool verifyParams() { return true; };
     bool basicVerifyParams();
-    void initDeviceFwParams(char *errBuff, FwOperations::fw_ops_params_t& fwParams);
+    void initDeviceFwParams(char* errBuff, FwOperations::fw_ops_params_t& fwParams);
     FlintStatus openOps(bool ignoreSecurityAttributes = false, bool ignoreDToc = false);
     FlintStatus openIo();
     virtual FlintStatus preFwOps(bool ignoreSecurityAttributes = false, bool ignoreDToc = false);
     virtual FlintStatus preFwAccess();
 
-    bool getRomsInfo(FBase *io, roms_info_t& romsInfo);
+    bool getRomsInfo(FBase* io, roms_info_t& romsInfo);
     void displayOneExpRomInfo(const rom_info_t& info);
-    void displayExpRomInfo(const roms_info_t& romsInfo, const char *preStr);
+    void displayExpRomInfo(const roms_info_t& romsInfo, const char* preStr);
     string getExpRomVerStr(const rom_info_t& info);
     string getRomProtocolStr(u_int8_t proto);
     string getRomSuppCpuStr(u_int8_t suppCpu);
     u_int32_t getUserChoice(u_int32_t maximumValue);
-    static int verifyCbFunc(char *str);
-    static int CbCommon(int completion, char *preStr, char *endStr = NULL);
+    static int verifyCbFunc(char* str);
+    static int CbCommon(int completion, char* preStr, char* endStr = NULL);
     static int burnCbFs2Func(int completion);
     static int burnCbFs3Func(int completion);
-    static int advProgressFunc(int completion, const char *stage, prog_t type, int *unknownProgress);
+    static int advProgressFunc(int completion, const char* stage, prog_t type, int* unknownProgress);
     static int burnBCbFunc(int completion);
     static int vsdCbFunc(int completion);
     static int setKeyCbFunc(int completion);
@@ -136,44 +134,69 @@ class SubCommand
     static int wbCbFunc(int completion);
     static int resetCfgCbFunc(int completion);
 
-    bool printGuidLine(guid_t *new_guids, guid_t *old_guids, int guid_index);
-    bool printMacLine(guid_t *new_guids, guid_t *old_guids, int mac_index);
-    bool printGUIDsFunc(guid_t guids[GUIDS], guid_t macs[MACS], guid_t old_guids[GUIDS], \
-                        guid_t old_macs[MACS], bool print_guids, bool print_macs, int portNum, bool old_guid_fmt);
-    bool reportGuidChanges(guid_t *new_guids, guid_t *new_macs, \
-                           guid_t *old_guids, guid_t *old_macs, bool printGuids, \
-                           bool printMacs, int guidNum);
-    bool checkGuidsFlags(u_int16_t devType, u_int8_t fwType,
-                         bool guidsSpecified, bool macsSpecified, bool uidSpecified, bool ibDev, bool ethDev);
+    bool printGuidLine(guid_t* new_guids, guid_t* old_guids, int guid_index);
+    bool printMacLine(guid_t* new_guids, guid_t* old_guids, int mac_index);
+    bool printGUIDsFunc(guid_t guids[GUIDS],
+                        guid_t macs[MACS],
+                        guid_t old_guids[GUIDS],
+                        guid_t old_macs[MACS],
+                        bool print_guids,
+                        bool print_macs,
+                        int portNum,
+                        bool old_guid_fmt);
+    bool reportGuidChanges(guid_t* new_guids,
+                           guid_t* new_macs,
+                           guid_t* old_guids,
+                           guid_t* old_macs,
+                           bool printGuids,
+                           bool printMacs,
+                           int guidNum);
+    bool checkGuidsFlags(u_int16_t devType,
+                         u_int8_t fwType,
+                         bool guidsSpecified,
+                         bool macsSpecified,
+                         bool uidSpecified,
+                         bool ibDev,
+                         bool ethDev);
     void printMissingGuidErr(bool ibDev, bool ethDev);
 
     bool extractUIDArgs(std::vector<string>& cmdArgs, u_int8_t numOfGuids[2], u_int8_t stepSize[2]);
     bool extractValuesFromString(string valStr, u_int8_t values[2], string origArg);
     bool getGUIDFromStr(string str, guid_t& guid, string prefixErr = "");
-    bool  getPasswordFromUser(const char *preStr, char buffer[MAX_PASSWORD_LEN + 1]);
-    bool askUser(const char *question = NULL, bool printAbrtMsg = true);
+    bool getPasswordFromUser(const char* preStr, char buffer[MAX_PASSWORD_LEN + 1]);
+    bool askUser(const char* question = NULL, bool printAbrtMsg = true);
 
     bool isCmdSupportLog();
     void openLog();
-    inline void closeLog() {close_log();}
-    //print errors to an err buff, log if needed and stdout
-    void reportErr(bool shouldPrint, const char *format, ...);
+    inline void closeLog() { close_log(); }
+    // print errors to an err buff, log if needed and stdout
+    void reportErr(bool shouldPrint, const char* format, ...);
     bool readFromFile(const string& filePath, std::vector<u_int8_t>& buff);
     bool getFileSize(const string& filePath, long& fileSize);
     bool writeToFile(string filePath, const std::vector<u_int8_t>& buff);
-    FlintStatus writeImageToFile(const char *file_name, u_int8_t *data, u_int32_t length);
+    FlintStatus writeImageToFile(const char* file_name, u_int8_t* data, u_int32_t length);
 
-    bool dumpFile(const char *confFile, std::vector<u_int8_t>& data, const char *sectionName);
-    bool unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t> &newData, const char *sectionName);
+    bool dumpFile(const char* confFile, std::vector<u_int8_t>& data, const char* sectionName);
+    bool unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t>& newData, const char* sectionName);
     const char* fwImgTypeToStr(u_int8_t fwImgType);
     FlintStatus UnlockDevice(FwOperations*);
     FlintStatus LockDevice(FwOperations*);
     void ClearGuidStruct(FwOperations::sg_params_t& sgParams);
-    bool stringsCommaSplit(string str, std::vector<u_int32_t> &deviceIds);
-public:
-    SubCommand() : _fwOps(NULL), _imgOps(NULL), _io(NULL), _v(Wtv_Uninitilized), _maxCmdParamNum(-1),  _minCmdParamNum(-1), _mccSupported(false), _imageReactivation(false)
-#ifndef NO_MSTARCHIVE        
-        , _mfa2Pkg(NULL)
+    bool stringsCommaSplit(string str, std::vector<u_int32_t>& deviceIds);
+
+public:
+    SubCommand() :
+        _fwOps(NULL),
+        _imgOps(NULL),
+        _io(NULL),
+        _v(Wtv_Uninitilized),
+        _maxCmdParamNum(-1),
+        _minCmdParamNum(-1),
+        _mccSupported(false),
+        _imageReactivation(false)
+#ifndef NO_MSTARCHIVE
+        ,
+        _mfa2Pkg(NULL)
 #endif
     {
         _cmdType = SC_No_Cmd;
@@ -181,16 +204,16 @@ class SubCommand
     }
     virtual ~SubCommand();
     virtual FlintStatus executeCommand() = 0;
-    virtual void cleanInterruptedCommand() {}//by default do nothing
-    inline void setParams(const FlintParams& flintParams) {_flintParams = flintParams;}
-    inline string& getName() {return this->_name;}
-    inline string& getDesc() {return this->_desc;}
-    inline string& getExtDesc() {return this->_extendedDesc;}
-    inline string& getFlagL() {return this->_flagLong;}
-    inline string& getFlagS() {return this->_flagShort;}
-    inline string& getParam() {return this->_param;}
-    inline string& getParamExp() {return this->_paramExp;}
-    inline string& getExample() {return this->_example;}
+    virtual void cleanInterruptedCommand() {} // by default do nothing
+    inline void setParams(const FlintParams& flintParams) { _flintParams = flintParams; }
+    inline string& getName() { return this->_name; }
+    inline string& getDesc() { return this->_desc; }
+    inline string& getExtDesc() { return this->_extendedDesc; }
+    inline string& getFlagL() { return this->_flagLong; }
+    inline string& getFlagS() { return this->_flagShort; }
+    inline string& getParam() { return this->_param; }
+    inline string& getParamExp() { return this->_paramExp; }
+    inline string& getExample() { return this->_example; }
 };
 
 class BurnSubCommand : public SubCommand
@@ -205,7 +228,10 @@ class BurnSubCommand : public SubCommand
     FwCompsMgr* fwCompsAccess;
     FlintStatus burnFs3();
     FlintStatus burnFs2();
-    bool checkFwVersion(bool CreateFromImgInfo = true, u_int16_t fw_ver0 = 0, u_int16_t fw_ver1 = 0, u_int16_t fw_ver2 = 0);
+    bool checkFwVersion(bool CreateFromImgInfo = true,
+                        u_int16_t fw_ver0 = 0,
+                        u_int16_t fw_ver1 = 0,
+                        u_int16_t fw_ver2 = 0);
     bool checkPSID();
     void updateBurnParams();
     bool dealWithExpRom();
@@ -216,8 +242,16 @@ class BurnSubCommand : public SubCommand
     FlintStatus burnMFA2LiveFish(dm_dev_id_t devid_t);
     FlintStatus burnCongestionControl();
     bool verifyMFA2Params(bool IsLiveFish);
-    FlintStatus BurnLinkX(string deviceName, int deviceIndex, int deviceSize, string binaryFileName, bool linkx_auto_update,
-        bool activationNeeded, bool downloadTransferNeeded, int activate_delay_sec, ProgressCallBackAdvSt* ProgressFuncAdv);
+    FlintStatus BurnLinkX(string deviceName,
+                          int deviceIndex,
+                          int deviceSize,
+                          string binaryFileName,
+                          bool linkx_auto_update,
+                          bool activationNeeded,
+                          bool downloadTransferNeeded,
+                          int activate_delay_sec,
+                          ProgressCallBackAdvSt* ProgressFuncAdv);
+
 public:
     BurnSubCommand();
     ~BurnSubCommand();
@@ -236,6 +270,7 @@ class BinaryCompareSubCommand : public SubCommand
     bool _devQueryRes;
     int _unknownProgress; // used to trace the progress of unknown progress.
     FlintStatus compareMFA2();
+
 public:
     BinaryCompareSubCommand();
     ~BinaryCompareSubCommand();
@@ -255,7 +290,13 @@ class QuerySubCommand : public SubCommand
     bool checkMac(u_int64_t mac, string& warrStr);
     FlintStatus queryMFA2();
     void AddTableHeaderForCSVFormat(string& outputString);
-    bool PrintLinkXQuery(string& outputString, const string& host, int deviceIndex, const comp_status_st& ComponentStatus, const component_linkx_st& linkx_data, char* delimeter, bool isCSV);
+    bool PrintLinkXQuery(string& outputString,
+                         const string& host,
+                         int deviceIndex,
+                         const comp_status_st& ComponentStatus,
+                         const component_linkx_st& linkx_data,
+                         char* delimeter,
+                         bool isCSV);
     FlintStatus QueryLinkX(string deviceName, string outputFile, std::vector<int> deviceIds);
 
 public:
@@ -342,7 +383,6 @@ class SetForbiddenVersionsSubCommand : public SubCommand
 class VerifySubCommand : public SubCommand
 {
 private:
-
 public:
     VerifySubCommand();
     ~VerifySubCommand();
@@ -363,6 +403,7 @@ class SwResetSubCommand : public SubCommand
 {
 private:
     bool IsDeviceSupported(dm_dev_id_t dev_id);
+
 public:
     SwResetSubCommand();
     ~SwResetSubCommand();
@@ -376,11 +417,12 @@ class BromSubCommand : public SubCommand
     fw_info_t _info;
     roms_info_t _romsInfo;
     FImage _fRom;
+
 public:
     BromSubCommand();
     ~BromSubCommand();
     inline FlintStatus executeCommand();
-    bool getExpRomStrVer(roms_info_t& roms_info, char *version);
+    bool getExpRomStrVer(roms_info_t& roms_info, char* version);
 };
 
 class DromSubCommand : public SubCommand
@@ -395,7 +437,6 @@ class DromSubCommand : public SubCommand
 class RromSubCommand : public SubCommand
 {
 private:
-
 public:
     RromSubCommand();
     ~RromSubCommand();
@@ -406,7 +447,6 @@ class RromSubCommand : public SubCommand
 class BbSubCommand : public SubCommand
 {
 private:
-
 public:
     BbSubCommand();
     ~BbSubCommand();
@@ -418,13 +458,14 @@ class SgSubCommand : public SubCommand
 {
 private:
     fw_info_t _info;
-    FwOperations *_ops;
+    FwOperations* _ops;
     FwOperations::sg_params_t _sgParams;
 
     FlintStatus sgFs2();
     FlintStatus sgFs3();
     void setUserGuidsAndMacs();
     bool CheckSetGuidsFlags();
+
 public:
     SgSubCommand();
     ~SgSubCommand();
@@ -437,7 +478,8 @@ class SmgSubCommand : public SubCommand
 private:
     fs3_uid_t _baseGuid;
     fw_info_t _info;
-    FwOperations *_ops;
+    FwOperations* _ops;
+
 public:
     SmgSubCommand();
     ~SmgSubCommand();
@@ -449,7 +491,7 @@ class SetCertChainSubCommand : public SubCommand
 {
 public:
     SetCertChainSubCommand();
-    ~SetCertChainSubCommand() {};
+    ~SetCertChainSubCommand(){};
     FlintStatus executeCommand();
 };
 
@@ -457,14 +499,13 @@ class SetVpdSubCommand : public SubCommand
 {
 public:
     SetVpdSubCommand();
-    ~SetVpdSubCommand() {};
+    ~SetVpdSubCommand(){};
     FlintStatus executeCommand();
 };
 
 class SvSubCommand : public SubCommand
 {
 private:
-
 public:
     SvSubCommand();
     ~SvSubCommand();
@@ -483,6 +524,7 @@ class DcSubCommand : public SubCommand
 {
 private:
     std::vector<u_int8_t> _sect;
+
 public:
     DcSubCommand();
     ~DcSubCommand();
@@ -493,6 +535,7 @@ class DhSubCommand : public SubCommand
 {
 private:
     std::vector<u_int8_t> _sect;
+
 public:
     DhSubCommand();
     ~DhSubCommand();
@@ -506,6 +549,7 @@ class SetKeySubCommand : public SubCommand
     hw_key_t _userKey;
     bool _getKeyInter;
     bool getKeyInteractively();
+
 public:
     SetKeySubCommand();
     ~SetKeySubCommand();
@@ -517,6 +561,7 @@ class HwAccessSubCommand : public SubCommand
 private:
     FlintStatus disableHwAccess();
     FlintStatus enableHwAccess();
+
 public:
     HwAccessSubCommand();
     ~HwAccessSubCommand();
@@ -528,6 +573,7 @@ class HwSubCommand : public SubCommand
 {
 private:
     FlintStatus printAttr(const ext_flash_attr_t& attr);
+
 public:
     HwSubCommand();
     ~HwSubCommand();
@@ -537,7 +583,6 @@ class HwSubCommand : public SubCommand
 class EraseSubCommand : public SubCommand
 {
 private:
-
 public:
     EraseSubCommand();
     ~EraseSubCommand();
@@ -546,7 +591,6 @@ class EraseSubCommand : public SubCommand
 class RwSubCommand : public SubCommand
 {
 private:
-
 public:
     RwSubCommand();
     ~RwSubCommand();
@@ -555,7 +599,6 @@ class RwSubCommand : public SubCommand
 class WwSubCommand : public SubCommand
 {
 private:
-
 public:
     WwSubCommand();
     ~WwSubCommand();
@@ -565,7 +608,6 @@ class WwSubCommand : public SubCommand
 class WwneSubCommand : public SubCommand
 {
 private:
-
 public:
     WwneSubCommand();
     ~WwneSubCommand();
@@ -575,19 +617,20 @@ class WwneSubCommand : public SubCommand
 class WbSubCommand : public SubCommand
 {
 private:
-    bool extractData(const std::vector<string>& cmdParams, u_int32_t *addr, std::vector<u_int8_t>& data);
+    bool extractData(const std::vector<string>& cmdParams, u_int32_t* addr, std::vector<u_int8_t>& data);
+
 public:
     WbSubCommand();
     ~WbSubCommand();
     FlintStatus executeCommand();
 };
 
-
 class WbneSubCommand : public SubCommand
 {
 private:
-    bool extractData(const std::vector<string>& cmdParams, u_int32_t *addr, std::vector<u_int32_t>& data);
+    bool extractData(const std::vector<string>& cmdParams, u_int32_t* addr, std::vector<u_int32_t>& data);
     bool writeBlock(u_int32_t addr, std::vector<u_int32_t> dataVec);
+
 public:
     WbneSubCommand();
     ~WbneSubCommand();
@@ -599,6 +642,7 @@ class RbSubCommand : public SubCommand
 private:
     bool printToScreen(const std::vector<u_int8_t>& buff, bool hexdump_format);
     bool readBlock(u_int32_t addr, std::vector<u_int8_t>& buff, bool isFlash);
+
 public:
     RbSubCommand();
     ~RbSubCommand();
@@ -608,7 +652,6 @@ class RbSubCommand : public SubCommand
 class ClearSemSubCommand : public SubCommand
 {
 private:
-
 public:
     ClearSemSubCommand();
     ~ClearSemSubCommand();
@@ -619,6 +662,7 @@ class RomQuerySubCommand : public SubCommand
 {
 private:
     roms_info_t _romsInfo;
+
 public:
     RomQuerySubCommand();
     ~RomQuerySubCommand();
@@ -647,6 +691,7 @@ class CheckSumSubCommand : public SubCommand
     CheckSumSubCommand();
     ~CheckSumSubCommand();
     FlintStatus executeCommand();
+
 private:
     bool extractChecksumFromStr(string str, u_int8_t checkSum[16]);
     string checkSum2Str(u_int8_t checkSum[16]);
@@ -659,8 +704,10 @@ class TimeStampSubCommand : public SubCommand
     TimeStampSubCommand();
     ~TimeStampSubCommand();
     FlintStatus executeCommand();
+
 private:
-    enum {
+    enum
+    {
         TS_No_Command,
         TS_Query,
         TS_Set,
@@ -678,7 +725,7 @@ class TimeStampSubCommand : public SubCommand
     bool resetTs();
 
     int _operation;
-    FwOperations *_ops;
+    FwOperations* _ops;
     struct tools_open_ts_entry _userTsEntry;
     struct tools_open_fw_version _userFwVer;
 };
diff --git a/flint/subcommands_linkx.cpp b/flint/subcommands_linkx.cpp
index 6c0f3c42..30d2148f 100644
--- a/flint/subcommands_linkx.cpp
+++ b/flint/subcommands_linkx.cpp
@@ -51,171 +51,166 @@
 
 using namespace std;
 const char* ImageAState[] = {
-"Image A is running",
-"Image A is committed, module boots from image A",
-"Image A is erased / empty",
-"Reserved",
-"Image B is running",
-"Image B is committed, module boots from image B",
-"Image B is erased / empty",
-"Reserved"
-}; 
+  "Image A is running", "Image A is committed, module boots from image A", "Image A is erased / empty", "Reserved",
+  "Image B is running", "Image B is committed, module boots from image B", "Image B is erased / empty", "Reserved"};
 
-const char* FwImageBitmap[] = {
-    "FW image A is present",
-    "FW image B is present",
-    "Factory/boot image is present",
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "Reserved"
-};
+const char* FwImageBitmap[] = {"FW image A is present",
+                               "FW image B is present",
+                               "Factory/boot image is present",
+                               "Reserved",
+                               "Reserved",
+                               "Reserved",
+                               "Reserved",
+                               "Reserved"};
 
 const char* SupportedProtocol[] = {
-    "Does not support either one of the FW update procedures",
-    "SFF-8636 management interface and pseudo-CMIS FW. Update is supported",
-    "CMIS 4.0 is implemented",
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "Reserved",
+  "Does not support either one of the FW update procedures",
+  "SFF-8636 management interface and pseudo-CMIS FW. Update is supported",
+  "CMIS 4.0 is implemented",
+  "Reserved",
+  "Reserved",
+  "Reserved",
+  "Reserved",
+  "Reserved",
 };
 
-const char* ActivationType[] = 
-{
-    "HW reset is required. Host should be prepared to power cycle a cable after sending a Run FW Image command.",
-    "Self-activation with HW reset contained in the Run FW Image command. No additional actions required from the host.",
-    "Self-activation with hitless reset contained in the Run FW Image command. No additional actions required from the host.",
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "Reserved"
-};
-
-const char* ComponentStatusName[16] = 
-{
-    "NOT_PRESENT",
-    "PRESENT",
-    "IN_USE",
-    "DOWNSTREAM_DEVICE_PRESENT",
-    "Reserved"
-};
+const char* ActivationType[] = {
+  "HW reset is required. Host should be prepared to power cycle a cable after sending a Run FW Image command.",
+  "Self-activation with HW reset contained in the Run FW Image command. No additional actions required from the host.",
+  "Self-activation with hitless reset contained in the Run FW Image command. No additional actions required from the host.",
+  "Reserved",
+  "Reserved",
+  "Reserved",
+  "Reserved",
+  "Reserved"};
 
-const char* ComponentUpdateStateName[16] =
-{
-    "IDLE",
-    "IN_PROGRESS",
-    "APPLIED",
-    "ACTIVE",
-    "ACTIVE_PENDING_RESET",
-    "FAILED",
-    "CANCELED",
-    "BUSY",
-    "RESERVED"
-};
+const char* ComponentStatusName[16] = {"NOT_PRESENT", "PRESENT", "IN_USE", "DOWNSTREAM_DEVICE_PRESENT", "Reserved"};
 
-void QuerySubCommand::AddTableHeaderForCSVFormat(string& outputString) {
+const char* ComponentUpdateStateName[16] = {"IDLE",   "IN_PROGRESS", "APPLIED", "ACTIVE",  "ACTIVE_PENDING_RESET",
+                                            "FAILED", "CANCELED",    "BUSY",    "RESERVED"};
 
+void QuerySubCommand::AddTableHeaderForCSVFormat(string& outputString)
+{
     outputString += "Host,Device index,Component Index,Component Status,Component Update State";
     outputString += ",Running state,Information block";
     outputString += ",FW A Version,FW B Version,FW Factory Version,SupportedProtocol,Activation type,Serial number\n";
 }
 
-bool QuerySubCommand::PrintLinkXQuery(string& outPutString, const string& host, int deviceIndex, const comp_status_st& ComponentStatus, const component_linkx_st& linkx_data, char* delimeter, bool isCSV) {
-
-    char buffer[4096] = { 0 };
-    sprintf(buffer, isCSV ? "%s%s%d%s%d%s%s%s%s%s" :
-        "Host : %s%s Device index %d%s Component Index %d%s Component Status %s%s Component Update State %s%s ", 
-        host.c_str(), delimeter,
-        deviceIndex, delimeter,
-        ComponentStatus.component_index, delimeter, ComponentStatusName[ComponentStatus.component_status], delimeter,
-        ComponentUpdateStateName[ComponentStatus.component_update_state], delimeter);
+bool QuerySubCommand::PrintLinkXQuery(string& outPutString,
+                                      const string& host,
+                                      int deviceIndex,
+                                      const comp_status_st& ComponentStatus,
+                                      const component_linkx_st& linkx_data,
+                                      char* delimeter,
+                                      bool isCSV)
+{
+    char buffer[4096] = {0};
+    sprintf(buffer,
+            isCSV ?
+              "%s%s%d%s%d%s%s%s%s%s" :
+              "Host : %s%s Device index %d%s Component Index %d%s Component Status %s%s Component Update State %s%s ",
+            host.c_str(), delimeter, deviceIndex, delimeter, ComponentStatus.component_index, delimeter,
+            ComponentStatusName[ComponentStatus.component_status], delimeter,
+            ComponentUpdateStateName[ComponentStatus.component_update_state], delimeter);
 
     outPutString += buffer;
-    if (linkx_data.fw_image_status_bitmap != 0) {
-        if (!isCSV) {
+    if (linkx_data.fw_image_status_bitmap != 0)
+    {
+        if (!isCSV)
+        {
             sprintf(buffer, "Running state is : ");
             outPutString += buffer;
         }
-        for (int i = 0; i < 8; i++) {
-            if (linkx_data.fw_image_status_bitmap & (1 << i)) {
+        for (int i = 0; i < 8; i++)
+        {
+            if (linkx_data.fw_image_status_bitmap & (1 << i))
+            {
                 sprintf(buffer, isCSV ? "%s" : " %s ", ImageAState[i]);
                 outPutString += buffer;
             }
         }
         outPutString += delimeter;
     }
-    else {
-        if (isCSV) {
+    else
+    {
+        if (isCSV)
+        {
             outPutString += delimeter;
         }
     }
 
-    if (linkx_data.fw_image_info_bitmap != 0) {
-        if (!isCSV) {
+    if (linkx_data.fw_image_info_bitmap != 0)
+    {
+        if (!isCSV)
+        {
             sprintf(buffer, "Information block is : ");
             outPutString += buffer;
         }
-        for (int i = 0; i < 8; i++) {
-            if (linkx_data.fw_image_info_bitmap & (1 << i)) {
+        for (int i = 0; i < 8; i++)
+        {
+            if (linkx_data.fw_image_info_bitmap & (1 << i))
+            {
                 sprintf(buffer, isCSV ? "%s" : " %s ", FwImageBitmap[i]);
                 outPutString += buffer;
             }
         }
         outPutString += delimeter;
     }
-    else {
-        if (isCSV) {
+    else
+    {
+        if (isCSV)
+        {
             outPutString += delimeter;
         }
     }
 
-    sprintf(buffer, isCSV ? "%02d.%02d.%04d%s" : "FW A Version : %02d.%02d.%04d%s", 
-        linkx_data.image_a_major, linkx_data.image_a_minor, linkx_data.image_a_subminor, delimeter);
+    sprintf(buffer, isCSV ? "%02d.%02d.%04d%s" : "FW A Version : %02d.%02d.%04d%s", linkx_data.image_a_major,
+            linkx_data.image_a_minor, linkx_data.image_a_subminor, delimeter);
     outPutString += buffer;
-    sprintf(buffer, isCSV ? "%02d.%02d.%04d%s" : "FW B Version : %02d.%02d.%04d%s", 
-        linkx_data.image_b_major, linkx_data.image_b_minor, linkx_data.image_b_subminor, delimeter);
+    sprintf(buffer, isCSV ? "%02d.%02d.%04d%s" : "FW B Version : %02d.%02d.%04d%s", linkx_data.image_b_major,
+            linkx_data.image_b_minor, linkx_data.image_b_subminor, delimeter);
     outPutString += buffer;
-    sprintf(buffer, isCSV ? "%02d.%02d.%04d%s" : "FW Factory Version : %02d.%02d.%04d%s", 
-        linkx_data.factory_image_major, linkx_data.factory_image_minor, linkx_data.factory_image_subminor, delimeter);
+    sprintf(buffer, isCSV ? "%02d.%02d.%04d%s" : "FW Factory Version : %02d.%02d.%04d%s",
+            linkx_data.factory_image_major, linkx_data.factory_image_minor, linkx_data.factory_image_subminor,
+            delimeter);
     outPutString += buffer;
-    sprintf(buffer, isCSV ? "%s%s" : "SupportedProtocol: %s%s", 
-        SupportedProtocol[linkx_data.management_interface_protocol], delimeter);
+    sprintf(buffer, isCSV ? "%s%s" : "SupportedProtocol: %s%s",
+            SupportedProtocol[linkx_data.management_interface_protocol], delimeter);
     outPutString += buffer;
-    sprintf(buffer, isCSV ? "%s%s" : "Activation type: %s%s", 
-        ActivationType[linkx_data.activation_type], delimeter);
+    sprintf(buffer, isCSV ? "%s%s" : "Activation type: %s%s", ActivationType[linkx_data.activation_type], delimeter);
     outPutString += buffer;
-    sprintf(buffer, isCSV ? "%d" : "Serial number is %d", 
-        linkx_data.vendor_sn);
+    sprintf(buffer, isCSV ? "%d" : "Serial number is %d", linkx_data.vendor_sn);
     outPutString += buffer;
     outPutString += "\n";
-    
+
     return true;
 }
 
 FlintStatus QuerySubCommand::QueryLinkX(string deviceName, string outputFile, std::vector<int> deviceIds)
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         reportErr(true, FLINT_OPEN_FWOPS_DEVICE_ERROR_1, deviceName.c_str());
         return FLINT_FAILED;
     }
-    if (_fwOps->IsCableQuerySupported() == false) {
+    if (_fwOps->IsCableQuerySupported() == false)
+    {
         reportErr(true, LINKX_QUERY_DEVICE_NOT_SUPPORTED, deviceName.c_str());
         return FLINT_FAILED;
     }
     FwComponent bootImageComponent;
     std::vector<FwComponent> compsToBurn;
-    for (unsigned int i = 0; i < deviceIds.size(); i++) {
-        if (deviceIds[i] < 0) {
+    for (unsigned int i = 0; i < deviceIds.size(); i++)
+    {
+        if (deviceIds[i] < 0)
+        {
             printf("-E- Downstream device id's must be non-negative integers.\n");
             return FLINT_FAILED;
         }
     }
-    mfile * mfile = mopen_adv((const char *)deviceName.c_str(), (MType)(MST_DEFAULT));
-    if (!mfile) {
+    mfile* mfile = mopen_adv((const char*)deviceName.c_str(), (MType)(MST_DEFAULT));
+    if (!mfile)
+    {
         reportErr(true, "-E- Failed to open device.\n");
         return FLINT_FAILED;
     }
@@ -224,7 +219,8 @@ FlintStatus QuerySubCommand::QueryLinkX(string deviceName, string outputFile, st
     bool isCSV = false;
     bool finalResult = true;
     char* delimeter = (char*)"\n";
-    if (outputFile.empty() == false) {
+    if (outputFile.empty() == false)
+    {
         isCSV = true;
         delimeter = (char*)",";
         AddTableHeaderForCSVFormat(outPutString);
@@ -236,65 +232,88 @@ FlintStatus QuerySubCommand::QueryLinkX(string deviceName, string outputFile, st
         int deviceIndex = deviceIds[i] + 1;
         fwCompsAccess.SetIndexAndSize(deviceIndex, 1);
         comp_status_st ComponentStatus;
-        if (!fwCompsAccess.RefreshComponentsStatus(&ComponentStatus)) {
+        if (!fwCompsAccess.RefreshComponentsStatus(&ComponentStatus))
+        {
             printf("-E- Refresh components failed, error is %s.\n", fwCompsAccess.getLastErrMsg());
             finalResult = false;
             continue;
         }
         component_linkx_st linkx_data;
-        if (!fwCompsAccess.GetComponentLinkxProperties(FwComponent::COMPID_LINKX, &linkx_data)) {
-            printf("-E- Cable query failed, the error is %s.\n", fwCompsAccess.getLastErrMsg());
-            finalResult = false;
-            continue;
+        if (!fwCompsAccess.GetComponentLinkxProperties(FwComponent::COMPID_LINKX, &linkx_data))
+        {
+            printf("-E- Cable query failed, the error is %s.\n", fwCompsAccess.getLastErrMsg());
+            finalResult = false;
+            continue;
         }
-        if (PrintLinkXQuery(outPutString, deviceName, deviceIndex - 1, ComponentStatus, linkx_data, delimeter, isCSV) == false) {
+        if (PrintLinkXQuery(outPutString, deviceName, deviceIndex - 1, ComponentStatus, linkx_data, delimeter, isCSV) ==
+            false)
+        {
             printf("-E- Query function failed.\n");
             finalResult = false;
         }
     }
-    if (outputFile.empty() == true) {
+    if (outputFile.empty() == true)
+    {
         printf("%s\n", outPutString.c_str());
     }
-    else {
+    else
+    {
         FILE* f = fopen(outputFile.c_str(), "w");
-        if (f == NULL) {
+        if (f == NULL)
+        {
             printf("-E- Can not open output file %s.\n", outputFile.c_str());
             return FLINT_FAILED;
         }
         fprintf(f, "%s", outPutString.c_str());
         fclose(f);
     }
-    if (finalResult == false) {
+    if (finalResult == false)
+    {
         return FLINT_FAILED;
     }
     return FLINT_SUCCESS;
 }
 
-FlintStatus BurnSubCommand::BurnLinkX(string deviceName, int deviceIndex, int deviceSize, string binaryFileName, bool linkx_auto_update,
-    bool activationNeeded, bool downloadTransferNeeded, int activate_delay_sec, ProgressCallBackAdvSt* funcAdv)
+FlintStatus BurnSubCommand::BurnLinkX(string deviceName,
+                                      int deviceIndex,
+                                      int deviceSize,
+                                      string binaryFileName,
+                                      bool linkx_auto_update,
+                                      bool activationNeeded,
+                                      bool downloadTransferNeeded,
+                                      int activate_delay_sec,
+                                      ProgressCallBackAdvSt* funcAdv)
 {
-    if (preFwOps() == FLINT_FAILED) {
+    if (preFwOps() == FLINT_FAILED)
+    {
         reportErr(true, FLINT_OPEN_FWOPS_DEVICE_ERROR_1, deviceName.c_str());
         return FLINT_FAILED;
     }
-    if (_fwOps->IsCableQuerySupported() == false) {
+    if (_fwOps->IsCableQuerySupported() == false)
+    {
         reportErr(true, LINKX_BURN_DEVICE_NOT_SUPPORTED, deviceName.c_str());
         return FLINT_FAILED;
     }
     vector<u_int8_t> binaryData(8, 0xff);
-    if (downloadTransferNeeded) {
-        if (!readFromFile(binaryFileName, binaryData)) {
+    if (downloadTransferNeeded)
+    {
+        if (!readFromFile(binaryFileName, binaryData))
+        {
             reportErr(true, "Cannot read data from file %s\n.", binaryFileName.c_str());
             return FLINT_FAILED;
         }
     }
-    mfile * mfile = mopen_adv((const char *)deviceName.c_str(), (MType)(MST_DEFAULT));
-    if (!mfile) {
+    mfile* mfile = mopen_adv((const char*)deviceName.c_str(), (MType)(MST_DEFAULT));
+    if (!mfile)
+    {
         reportErr(true, "Cannot open device %s\n.", deviceName.c_str());
         return FLINT_FAILED;
     }
-    if (linkx_auto_update && activationNeeded && activate_delay_sec == 0 && (mfile->flags & MDEVS_IB) != 0) {//IB device
-        if (!askUser("The autoupdate activation process may cause a disconnection from the InBand connection, do you want to continue?")) {
+    if (linkx_auto_update && activationNeeded && activate_delay_sec == 0 && (mfile->flags & MDEVS_IB) != 0)
+    { // IB device
+        if (!askUser(
+              "The autoupdate activation process may cause a disconnection from the InBand connection, do you want to continue?"))
+        {
             mclose(mfile);
             return FLINT_FAILED;
         }
@@ -303,38 +322,50 @@ FlintStatus BurnSubCommand::BurnLinkX(string deviceName, int deviceIndex, int de
     std::vector<FwComponent> compsToBurn;
     FwCompsMgr fwCompsAccess(mfile, FwCompsMgr::DEVICE_HCA_SWITCH, 0);
     fwCompsAccess.GenerateHandle();
-    fwCompsAccess.SetIndexAndSize(deviceIndex + 1, deviceSize, linkx_auto_update, activationNeeded, downloadTransferNeeded, activate_delay_sec);
-    if (!fwCompsAccess.RefreshComponentsStatus()) {
+    fwCompsAccess.SetIndexAndSize(deviceIndex + 1, deviceSize, linkx_auto_update, activationNeeded,
+                                  downloadTransferNeeded, activate_delay_sec);
+    if (!fwCompsAccess.RefreshComponentsStatus())
+    {
         printf("-E- Refresh components failed, error is %s.\n", fwCompsAccess.getLastErrMsg());
         return FLINT_FAILED;
     }
-    
+
     bootImageComponent.init(binaryData, binaryData.size(), FwComponent::COMPID_LINKX);
     compsToBurn.push_back(bootImageComponent);
-    if (downloadTransferNeeded) {
+    if (downloadTransferNeeded)
+    {
         printf("-I- Downloading FW ...\n");
-        if (fwCompsAccess.isMCDDSupported()) {
+        if (fwCompsAccess.isMCDDSupported())
+        {
             // Checking if BME is disabled to print indication to user
             bool isBmeSet = DMAComponentAccess::isBMESet(fwCompsAccess.getMfileObj());
-            if (!isBmeSet) {
+            if (!isBmeSet)
+            {
                 DPRINTF(("-W- DMA burning is not supported due to BME is unset (Bus Master Enable).\n"));
             }
         }
     }
-    if (!fwCompsAccess.burnComponents(compsToBurn, funcAdv)) {
+    if (!fwCompsAccess.burnComponents(compsToBurn, funcAdv))
+    {
         char* err_msg = (char*)fwCompsAccess.getLastErrMsg();
         bool IbError = (strcmp("Unknown MAD error", err_msg) == 0);
-        if (linkx_auto_update && activationNeeded && activate_delay_sec == 0 && ((mfile->flags & MDEVS_IB) != 0) && IbError) {//IB device
-            
-            printf("-W- The activation process caused a disconnection from the InBand connection for a few minutes, please wait for reconnection. The error is %s \n", fwCompsAccess.getLastErrMsg());
+        if (linkx_auto_update && activationNeeded && activate_delay_sec == 0 && ((mfile->flags & MDEVS_IB) != 0) &&
+            IbError)
+        { // IB device
+
+            printf(
+              "-W- The activation process caused a disconnection from the InBand connection for a few minutes, please wait for reconnection. The error is %s \n",
+              fwCompsAccess.getLastErrMsg());
             return FLINT_SUCCESS;
         }
-        else {
+        else
+        {
             printf("-E- Cable burn failed, error is %s.\n", fwCompsAccess.getLastErrMsg());
             return FLINT_FAILED;
         }
     }
-    else {
+    else
+    {
         printf("-I- Cable burn finished successfully.\n");
     }
     return FLINT_SUCCESS;
diff --git a/fw_comps_mgr/fw_comps_mgr.cpp b/fw_comps_mgr/fw_comps_mgr.cpp
index f541f7b2..54c9e84b 100644
--- a/fw_comps_mgr/fw_comps_mgr.cpp
+++ b/fw_comps_mgr/fw_comps_mgr.cpp
@@ -31,12 +31,12 @@
  * SOFTWARE.
  *
  */
- /*
-  * fw_comps_mgr.cpp
-  *
-  *  Created on: Jul 31, 2016
-  *      Author: adham
-  */
+/*
+ * fw_comps_mgr.cpp
+ *
+ *  Created on: Jul 31, 2016
+ *      Author: adham
+ */
 #include "fw_comps_mgr.h"
 #include "fw_comps_mgr_abstract_access.h"
 #include "fw_comps_mgr_dma_access.h"
@@ -57,18 +57,19 @@ static void mft_signal_set_handling(int isOn)
 #endif
 
 #include <errno.h>
- 
-static mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *dma_func, void *extra_data)
-{
 
-    if (fw_cmd_context == NULL || fw_cmd_func == NULL || extra_data == NULL) {
+static mfile* mopen_fw_ctx(void* fw_cmd_context, void* fw_cmd_func, void* dma_func, void* extra_data)
+{
+    if (fw_cmd_context == NULL || fw_cmd_func == NULL || extra_data == NULL)
+    {
         errno = EINVAL;
         return NULL;
     }
 
-    mfile *mf = (mfile *)malloc(sizeof(mfile));
+    mfile* mf = (mfile*)malloc(sizeof(mfile));
 
-    if (!mf) {
+    if (!mf)
+    {
         errno = ENOMEM;
         return NULL;
     }
@@ -83,525 +84,391 @@ static mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *dma_fu
     return mf;
 }
 
-const char*  StateNames[256] = {
-"FSMST_IDLE",
-"FSMST_LOCKED",
-"FSMST_INITIALIZE",
-"FSMST_DOWNLOAD",
-"FSMST_VERIFY",
-"FSMST_APPLY",
-"FSMST_ACTIVATE",
-"FSMST_UPLOAD",
-"FSMST_UPLOAD_PENDING",
-"FSMST_DOWNSTREAM_DEVICE_TRANSFER",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT",
-"FSMST_NOT_IMPORTANT"
-};
-
-
-const char* CommandsName[256] =  {
-    "QUERY",
-    "CMD_LOCK_UPDATE_HANDLE",
-    "CMD_RELEASE_UPDATE_HANDLE",
-    "CMD_UPDATE_COMPONENT",
-    "CMD_VERIFY_COMPONENT",
-    "CMD_ACTIVATE_COMPONENET",
-    "CMD_ACTIVATE_ALL",
-    "CMD_READ_COMPONENT",
-    "CMD_CANCEL",
-    "CMD_CHECK_UPDATE_HANDLE",
-    "CMD_FORCE_HANDLE_RELEASE",
-    "CMD_READ_PENDING_COMPONENT",
-    "CMD_DOWNSTREAM_DEVICE_TRANSFER",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND",
-    "NO_COMMAND"
-};
-
+const char* StateNames[256] = {"FSMST_IDLE",           "FSMST_LOCKED",
+                               "FSMST_INITIALIZE",     "FSMST_DOWNLOAD",
+                               "FSMST_VERIFY",         "FSMST_APPLY",
+                               "FSMST_ACTIVATE",       "FSMST_UPLOAD",
+                               "FSMST_UPLOAD_PENDING", "FSMST_DOWNSTREAM_DEVICE_TRANSFER",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT",
+                               "FSMST_NOT_IMPORTANT",  "FSMST_NOT_IMPORTANT"};
+
+const char* CommandsName[256] = {"QUERY",
+                                 "CMD_LOCK_UPDATE_HANDLE",
+                                 "CMD_RELEASE_UPDATE_HANDLE",
+                                 "CMD_UPDATE_COMPONENT",
+                                 "CMD_VERIFY_COMPONENT",
+                                 "CMD_ACTIVATE_COMPONENET",
+                                 "CMD_ACTIVATE_ALL",
+                                 "CMD_READ_COMPONENT",
+                                 "CMD_CANCEL",
+                                 "CMD_CHECK_UPDATE_HANDLE",
+                                 "CMD_FORCE_HANDLE_RELEASE",
+                                 "CMD_READ_PENDING_COMPONENT",
+                                 "CMD_DOWNSTREAM_DEVICE_TRANSFER",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND",
+                                 "NO_COMMAND"};
 
 #define DEFAULT_SIZE 64
 #define MAX_TOUT 3000
@@ -613,11 +480,9 @@ const char* CommandsName[256] =  {
 #define MTCR_IB_TIMEOUT_VAR "MTCR_IB_TIMEOUT"
 #define MTCR_IB_TIMEOUT_VAL "30000"
 
-#define NV_BASE_MAC_GUID_IDX     0x02
+#define NV_BASE_MAC_GUID_IDX 0x02
 #define NV_BASE_MAC_GUID_CAP_IDX 0x03
 
-
-
 /*
  * Wrapper to call the NVDA command
  */
@@ -632,12 +497,14 @@ bool FwCompsMgr::runNVDA(std::vector<u_int8_t>& buff,
     memset(&nvdaTlv, 0, sizeof(struct tools_open_nvda));
 
     nvdaTlv.nv_hdr.length = len;
-    if (queryDefault) {
+    if (queryDefault)
+    {
         nvdaTlv.nv_hdr.default_ = 1;
     }
     // tlvType should be in the correct endianess
     nvdaTlv.nv_hdr.type.tlv_type_dw.tlv_type_dw = tlvType;
-    if (method == REG_ACCESS_METHOD_SET) {
+    if (method == REG_ACCESS_METHOD_SET)
+    {
         memcpy(nvdaTlv.data, buff.data(), len);
     }
     MError rc;
@@ -645,12 +512,14 @@ bool FwCompsMgr::runNVDA(std::vector<u_int8_t>& buff,
     mft_signal_set_handling(1);
     rc = reg_access_nvda(_mf, method, &nvdaTlv);
     deal_with_signal();
-    if (rc) {
+    if (rc)
+    {
         _lastError = regErrTrans(rc);
         setLastRegisterAccessStatus(rc);
         return false;
     }
-    if (buff.size() < nvdaTlv.nv_hdr.length) {
+    if (buff.size() < nvdaTlv.nv_hdr.length)
+    {
         buff.resize(nvdaTlv.nv_hdr.length);
     }
     memcpy(buff.data(), nvdaTlv.data, nvdaTlv.nv_hdr.length);
@@ -658,29 +527,36 @@ bool FwCompsMgr::runNVDA(std::vector<u_int8_t>& buff,
 }
 
 bool FwCompsMgr::accessComponent(u_int32_t offset,
-    u_int32_t size,
-    u_int32_t data[],
-    access_type_t access,
-    ProgressCallBackAdvSt *progressFuncAdv,
-    control_fsm_args_t* lastFsmCommandArgs)
+                                 u_int32_t size,
+                                 u_int32_t data[],
+                                 access_type_t access,
+                                 ProgressCallBackAdvSt* progressFuncAdv,
+                                 control_fsm_args_t* lastFsmCommandArgs)
 {
-    bool bRes = _accessObj->accessComponent(_updateHandle, offset, size, data, access, _currComponentStr, progressFuncAdv);
-    if (!bRes && lastFsmCommandArgs != NULL && isDMAAccess()) {
+    bool bRes =
+      _accessObj->accessComponent(_updateHandle, offset, size, data, access, _currComponentStr, progressFuncAdv);
+    if (!bRes && lastFsmCommandArgs != NULL && isDMAAccess())
+    {
         printf("\nBurning with DMA has failed, switching to Register-Access burn.\n");
         bRes = fallbackToRegisterAccess();
 
-        if (bRes) {
-            if (!controlFsm(FSM_CMD_CANCEL, FSMST_LOCKED)) {
+        if (bRes)
+        {
+            if (!controlFsm(FSM_CMD_CANCEL, FSMST_LOCKED))
+            {
                 DPRINTF(("Cancel instruction to FW component has failed!\n"));
                 return false;
             }
             if (!controlFsm(lastFsmCommandArgs->command, lastFsmCommandArgs->expectedState, lastFsmCommandArgs->size,
-                            lastFsmCommandArgs->currentState, lastFsmCommandArgs->progressFuncAdv, lastFsmCommandArgs->reg_access_timeout)) {
+                            lastFsmCommandArgs->currentState, lastFsmCommandArgs->progressFuncAdv,
+                            lastFsmCommandArgs->reg_access_timeout))
+            {
                 DPRINTF(("FSM reinitialize for fallback has failed!\n"));
                 return false;
             }
 
-            bRes = _accessObj->accessComponent(_updateHandle, offset, size, data, access, _currComponentStr, progressFuncAdv);
+            bRes = _accessObj->accessComponent(_updateHandle, offset, size, data, access, _currComponentStr,
+                                               progressFuncAdv);
         }
     }
 
@@ -694,7 +570,7 @@ bool FwCompsMgr::isDMAAccess()
     return (dynamic_cast<DMAComponentAccess*>(_accessObj) != NULL);
 }
 
-bool FwCompsMgr::fallbackToRegisterAccess() 
+bool FwCompsMgr::fallbackToRegisterAccess()
 {
     bool bRes = false;
     AbstractComponentAccess* newAccessObj = NULL;
@@ -702,7 +578,8 @@ bool FwCompsMgr::fallbackToRegisterAccess()
     ComponentAccessFactory* factory = ComponentAccessFactory::GetInstance();
     newAccessObj = factory->createDataAccessObject(this, _mf, false);
 
-    if (newAccessObj != NULL) {
+    if (newAccessObj != NULL)
+    {
         delete _accessObj;
         _accessObj = newAccessObj;
         bRes = true;
@@ -713,58 +590,66 @@ bool FwCompsMgr::fallbackToRegisterAccess()
 
 const char* FwCompsMgr::stateToStr(fsm_state_t st)
 {
-    switch (st) {
-    case FSMST_INITIALIZE:
-        return "Initializing image partition";
-    case FSMST_DOWNSTREAM_DEVICE_TRANSFER:
-        return "Transferring data do LNKX device";
-    default:
-        return "Progress";
+    switch (st)
+    {
+        case FSMST_INITIALIZE:
+            return "Initializing image partition";
+        case FSMST_DOWNSTREAM_DEVICE_TRANSFER:
+            return "Transferring data do LNKX device";
+        default:
+            return "Progress";
     }
 }
 
 const char* FwCompsMgr::commandToStr(fsm_command_t cmd)
 {
-    switch (cmd) {
-    case FSM_CMD_VERIFY_COMPONENT:
-        return "Verifying component";
+    switch (cmd)
+    {
+        case FSM_CMD_VERIFY_COMPONENT:
+            return "Verifying component";
 
-    case FSM_CMD_UPDATE_COMPONENT:
-        return "Updating component";
+        case FSM_CMD_UPDATE_COMPONENT:
+            return "Updating component";
 
-    default:
-        return "Unknown Command";
+        default:
+            return "Unknown Command";
     }
 }
 
-
 bool FwCompsMgr::controlFsm(fsm_command_t command,
-    fsm_state_t expectedState,
-    u_int32_t size,
-    fsm_state_t currentState,
-    ProgressCallBackAdvSt *progressFuncAdv,
-    u_int32_t reg_access_timeout)
+                            fsm_state_t expectedState,
+                            u_int32_t size,
+                            fsm_state_t currentState,
+                            ProgressCallBackAdvSt* progressFuncAdv,
+                            u_int32_t reg_access_timeout)
 {
     reg_access_status_t rc = ME_OK;
     reg_access_method_t method = REG_ACCESS_METHOD_SET;
-    if (!reg_access_timeout) {
+    if (!reg_access_timeout)
+    {
         reg_access_timeout = MAX_TOUT;
     }
-    if (currentState != FSMST_NA || expectedState != FSMST_NA) {
-        DPRINTF(("controlFsm : command %s current state %s expected state %s\n", CommandsName[command], StateNames[currentState], StateNames[expectedState]));
+    if (currentState != FSMST_NA || expectedState != FSMST_NA)
+    {
+        DPRINTF(("controlFsm : command %s current state %s expected state %s\n", CommandsName[command],
+                 StateNames[currentState], StateNames[expectedState]));
     }
     unsigned int count = 0;
-    do {
+    do
+    {
         unsigned sleep_time = SLEEP_TIME;
         if ((currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER && expectedState == FSMST_LOCKED) ||
-            (_linkXFlow && currentState == FSMST_ACTIVATE)){
+            (_linkXFlow && currentState == FSMST_ACTIVATE))
+        {
             sleep_time = MAX_SLEEP_TIME;
         }
-        if (count) {
+        if (count)
+        {
             msleep(sleep_time);
         }
         method = REG_ACCESS_METHOD_SET;
-        if (command == FSM_QUERY) {
+        if (command == FSM_QUERY)
+        {
             method = REG_ACCESS_METHOD_GET;
         }
         mft_signal_set_handling(1);
@@ -775,36 +660,46 @@ bool FwCompsMgr::controlFsm(fsm_command_t command,
         _lastFsmCtrl.component_index = _componentIndex;
         _lastFsmCtrl.component_size = size;
         _lastFsmCtrl.update_handle = _updateHandle;
-        if(command == FSM_CMD_DOWNSTREAM_DEVICE_TRANSFER || (_linkXFlow && command == FSM_CMD_ACTIVATE_ALL)) {
-            _lastFsmCtrl.component_index = 0;// This the FW need - for downstream need to work with 0/device_id or auto_update
-            if (_autoUpdate) {
+        if (command == FSM_CMD_DOWNSTREAM_DEVICE_TRANSFER || (_linkXFlow && command == FSM_CMD_ACTIVATE_ALL))
+        {
+            _lastFsmCtrl.component_index =
+              0; // This the FW need - for downstream need to work with 0/device_id or auto_update
+            if (_autoUpdate)
+            {
                 _lastFsmCtrl.auto_update = 1;
                 _lastFsmCtrl.device_index_size = 0;
             }
-            else {
+            else
+            {
                 _lastFsmCtrl.auto_update = 0;
                 _lastFsmCtrl.device_index_size = _linkXDeviceSize;
                 _lastFsmCtrl.device_index = _linkXDeviceIndex;
             }
-            if (_linkXFlow && command == FSM_CMD_ACTIVATE_ALL) {
+            if (_linkXFlow && command == FSM_CMD_ACTIVATE_ALL)
+            {
                 _lastFsmCtrl.activation_delay_sec = _activation_delay_sec;
                 _isDelayedActivationCommandSent = _activation_delay_sec > 0;
             }
         }
         rc = reg_access_mcc(_mf, method, &_lastFsmCtrl);
-        //add here auto_update + device_index_size
+        // add here auto_update + device_index_size
         deal_with_signal();
-        
+
     } while (rc == ME_REG_ACCESS_RES_NOT_AVLBL && count++ < reg_access_timeout);
-    if (rc) {
-        if (_lastFsmCtrl.error_code) {
+    if (rc)
+    {
+        if (_lastFsmCtrl.error_code)
+        {
             _lastError = mccErrTrans(_lastFsmCtrl.error_code);
-            if ((currentState == FSMST_LOCKED && expectedState == FSMST_DOWNSTREAM_DEVICE_TRANSFER) || (_linkXFlow && currentState == FSMST_LOCKED && expectedState == FSMST_ACTIVATE)) {
+            if ((currentState == FSMST_LOCKED && expectedState == FSMST_DOWNSTREAM_DEVICE_TRANSFER) ||
+                (_linkXFlow && currentState == FSMST_LOCKED && expectedState == FSMST_ACTIVATE))
+            {
                 _rejectedIndex = _lastFsmCtrl.rejected_device_index;
                 DPRINTF(("\nGot _rejectedIndex = %d\n", _rejectedIndex));
             }
         }
-        else {
+        else
+        {
             _lastError = regErrTrans(rc);
             setLastRegisterAccessStatus(rc);
         }
@@ -812,45 +707,62 @@ bool FwCompsMgr::controlFsm(fsm_command_t command,
         _isDelayedActivationCommandSent = false;
         return false;
     }
-    if (expectedState == FSMST_NA && currentState == FSMST_NA) {
+    if (expectedState == FSMST_NA && currentState == FSMST_NA)
+    {
         return true;
     }
     count = 0;
     // initialization longer then other states
     unsigned sleep_time = SLEEP_TIME;
-    if (currentState == FSMST_INITIALIZE) {
+    if (currentState == FSMST_INITIALIZE)
+    {
         sleep_time = INIT_PARTITION_SLEEP_TIME;
     }
-    if ((currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER && expectedState == FSMST_LOCKED) || 
-        (_linkXFlow && currentState == FSMST_ACTIVATE)) {
+    if ((currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER && expectedState == FSMST_LOCKED) ||
+        (_linkXFlow && currentState == FSMST_ACTIVATE))
+    {
         sleep_time = MAX_SLEEP_TIME;
     }
-    while (currentState != FSMST_NA && _lastFsmCtrl.control_state == currentState && count < MAX_TOUT) {
-        if (count) {
+    while (currentState != FSMST_NA && _lastFsmCtrl.control_state == currentState && count < MAX_TOUT)
+    {
+        if (count)
+        {
             msleep(sleep_time);
         }
-        if (progressFuncAdv && progressFuncAdv->func) {
-            if (command == FSM_QUERY && currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER && expectedState == FSMST_LOCKED) {
-                if (progressFuncAdv->func(_lastFsmCtrl.control_progress, StateNames[currentState], PROG_WITH_PRECENTAGE, progressFuncAdv->opaque)) {
+        if (progressFuncAdv && progressFuncAdv->func)
+        {
+            if (command == FSM_QUERY && currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER &&
+                expectedState == FSMST_LOCKED)
+            {
+                if (progressFuncAdv->func(_lastFsmCtrl.control_progress, StateNames[currentState], PROG_WITH_PRECENTAGE,
+                                          progressFuncAdv->opaque))
+                {
                     _lastError = FWCOMPS_ABORTED;
                     return false;
                 }
             }
-            else {
-                if (progressFuncAdv->func(0, StateNames[currentState], PROG_WITHOUT_PRECENTAGE, progressFuncAdv->opaque)) {
+            else
+            {
+                if (progressFuncAdv->func(0, StateNames[currentState], PROG_WITHOUT_PRECENTAGE, progressFuncAdv->opaque))
+                {
                     _lastError = FWCOMPS_ABORTED;
                     return false;
                 }
             }
         }
-        if (!controlFsm(FSM_QUERY)) {
-            if (command == FSM_QUERY && currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER && expectedState == FSMST_LOCKED) {
-                //we are in the middle of downstream, but failed
+        if (!controlFsm(FSM_QUERY))
+        {
+            if (command == FSM_QUERY && currentState == FSMST_DOWNSTREAM_DEVICE_TRANSFER &&
+                expectedState == FSMST_LOCKED)
+            {
+                // we are in the middle of downstream, but failed
                 _rejectedIndex = _lastFsmCtrl.rejected_device_index;
                 DPRINTF(("\nGot _rejectedIndex = %d\n", _rejectedIndex));
             }
-            else if (_linkXFlow && command == FSM_QUERY && currentState == FSMST_ACTIVATE && expectedState == FSMST_LOCKED) {
-                //we are in the middle of activaation, but failed
+            else if (_linkXFlow && command == FSM_QUERY && currentState == FSMST_ACTIVATE &&
+                     expectedState == FSMST_LOCKED)
+            {
+                // we are in the middle of activaation, but failed
                 _rejectedIndex = _lastFsmCtrl.rejected_device_index;
                 DPRINTF(("\nGot _rejectedIndex = %d\n", _rejectedIndex));
             }
@@ -858,18 +770,23 @@ bool FwCompsMgr::controlFsm(fsm_command_t command,
         }
         count++;
     }
-    if (count >= MAX_TOUT) {
+    if (count >= MAX_TOUT)
+    {
         _lastError = FWCOMPS_MCC_TOUT;
         return false;
     }
-    if (expectedState != FSMST_NA && _lastFsmCtrl.control_state != expectedState) {
-        DPRINTF(("controlFsm : control_state FW %s expected %s\n", StateNames[_lastFsmCtrl.control_state], StateNames[expectedState]));
+    if (expectedState != FSMST_NA && _lastFsmCtrl.control_state != expectedState)
+    {
+        DPRINTF(("controlFsm : control_state FW %s expected %s\n", StateNames[_lastFsmCtrl.control_state],
+                 StateNames[expectedState]));
         _lastError = FWCOMPS_MCC_UNEXPECTED_STATE;
         return false;
     }
 
-    if (progressFuncAdv && progressFuncAdv->func && currentState != FSMST_NA) {
-        if (progressFuncAdv->func(100, StateNames[currentState], PROG_OK, progressFuncAdv->opaque)) {
+    if (progressFuncAdv && progressFuncAdv->func && currentState != FSMST_NA)
+    {
+        if (progressFuncAdv->func(100, StateNames[currentState], PROG_OK, progressFuncAdv->opaque))
+        {
             _lastError = FWCOMPS_ABORTED;
             return false;
         }
@@ -882,7 +799,7 @@ bool FwCompsMgr::runMCQI(u_int32_t componentIndex,
                          u_int32_t infoType,
                          u_int32_t dataSize,
                          u_int32_t offset,
-                         u_int32_t *data)
+                         u_int32_t* data)
 {
     bool ret = true;
     mft_signal_set_handling(1);
@@ -894,17 +811,21 @@ bool FwCompsMgr::runMCQI(u_int32_t componentIndex,
     _currCompInfo.component_index = componentIndex;
     _currCompInfo.device_index = _deviceIndex;
     _currCompInfo.device_type = _deviceType;
-    DPRINTF(("-D- MCQI: read_pending_component %u infoType %u offset %u dataSize %u, componentIndex %u _deviceIndex %u \n",
-        readPending, infoType, offset, dataSize, componentIndex, _deviceIndex));
+    DPRINTF(
+      ("-D- MCQI: read_pending_component %u infoType %u offset %u dataSize %u, componentIndex %u _deviceIndex %u \n",
+       readPending, infoType, offset, dataSize, componentIndex, _deviceIndex));
     reg_access_status_t rc = reg_access_mcqi(_mf, REG_ACCESS_METHOD_GET, &_currCompInfo);
     deal_with_signal();
-    if (rc) {
+    if (rc)
+    {
         _lastError = regErrTrans(rc);
         setLastRegisterAccessStatus(rc);
         ret = false;
     }
-    if (data && dataSize) {
-        if (!rc) {
+    if (data && dataSize)
+    {
+        if (!rc)
+        {
             memcpy(data, &_currCompInfo.data, _currCompInfo.info_size);
         }
     }
@@ -914,9 +835,10 @@ bool FwCompsMgr::runMCQI(u_int32_t componentIndex,
 bool FwCompsMgr::getDeviceHWInfo(FwCompsMgr::MQISDeviceDescriptionT op, vector<u_int8_t>& infoString)
 {
     mqisReg mqisRegister;
-    mfile *mf;
+    mfile* mf;
     mf = getMfileObj();
-    if (!mf) {
+    if (!mf)
+    {
         return false;
     }
     reg_access_status_t rc;
@@ -932,35 +854,38 @@ bool FwCompsMgr::getDeviceHWInfo(FwCompsMgr::MQISDeviceDescriptionT op, vector<u
 
     rc = reg_access_mqis(mf, REG_ACCESS_METHOD_GET, &mqisRegister);
     deal_with_signal();
-    if (rc) {
+    if (rc)
+    {
         return false;
     }
-    //reg_access_hca_mqis_reg_print(&mqisRegister, stdout, 4);
+    // reg_access_hca_mqis_reg_print(&mqisRegister, stdout, 4);
     int infoSize = mqisRegister.info_length;
-    if (infoSize == 0) {
+    if (infoSize == 0)
+    {
         return false;
     }
     infoString.resize(infoSize + 1, '\0');
 
     // copy the output
-    memcpy(infoString.data(), mqisRegister.info_string,
-            mqisRegister.read_length);
+    memcpy(infoString.data(), mqisRegister.info_string, mqisRegister.read_length);
 
-    if (infoSize > mqisRegister.read_length) {
+    if (infoSize > mqisRegister.read_length)
+    {
         int leftSize = infoSize - mqisRegister.read_length;
-        while (leftSize > 0) {
+        while (leftSize > 0)
+        {
             mqisRegister.read_offset = infoSize - leftSize;
             mqisRegister.read_length = leftSize > maxDataSize ? maxDataSize : leftSize;
             mft_signal_set_handling(1);
 
             rc = reg_access_mqis(mf, REG_ACCESS_METHOD_GET, &mqisRegister);
             deal_with_signal();
-            if (rc) {
+            if (rc)
+            {
                 return false;
             }
-            //reg_access_hca_mqis_reg_print(&mqisRegister, stdout, 4);
-            memcpy(infoString.data() + mqisRegister.read_offset,
-                   (mqisRegister.info_string), mqisRegister.read_length);
+            // reg_access_hca_mqis_reg_print(&mqisRegister, stdout, 4);
+            memcpy(infoString.data() + mqisRegister.read_offset, (mqisRegister.info_string), mqisRegister.read_length);
             leftSize -= mqisRegister.read_length;
         }
     }
@@ -971,26 +896,32 @@ bool FwCompsMgr::queryComponentInfo(u_int32_t componentIndex,
                                     u_int8_t readPending,
                                     u_int32_t infoType,
                                     u_int32_t dataSize,
-                                    u_int32_t *data)
+                                    u_int32_t* data)
 {
     u_int32_t maxDataSize = mget_max_reg_size(_mf, MACCESS_REG_METHOD_GET) - sizeof(_currCompInfo);
-    if (maxDataSize > MAX_REG_DATA) {
+    if (maxDataSize > MAX_REG_DATA)
+    {
         maxDataSize = MAX_REG_DATA;
     }
-    if (!runMCQI(componentIndex, readPending, infoType, maxDataSize, 0, data)) {
+    if (!runMCQI(componentIndex, readPending, infoType, maxDataSize, 0, data))
+    {
         return false;
     }
     u_int32_t compInfoSize = _currCompInfo.info_size;
     u_int32_t tOffset = maxDataSize;
-    if (tOffset >= compInfoSize) {
+    if (tOffset >= compInfoSize)
+    {
         return true;
     }
-    if (dataSize < compInfoSize) {
+    if (dataSize < compInfoSize)
+    {
         compInfoSize = dataSize;
     }
-    while (tOffset < compInfoSize) {
+    while (tOffset < compInfoSize)
+    {
         u_int32_t toRead = compInfoSize - tOffset > maxDataSize ? maxDataSize : compInfoSize - tOffset;
-        if (!runMCQI(componentIndex, readPending, infoType, toRead, tOffset, data + tOffset)) {
+        if (!runMCQI(componentIndex, readPending, infoType, toRead, tOffset, data + tOffset))
+        {
             return false;
         }
         tOffset += maxDataSize;
@@ -998,25 +929,29 @@ bool FwCompsMgr::queryComponentInfo(u_int32_t componentIndex,
     return true;
 }
 
-reg_access_status_t FwCompsMgr::getGI(mfile *mf, mgirReg *gi)
+reg_access_status_t FwCompsMgr::getGI(mfile* mf, mgirReg* gi)
 {
     reg_access_status_t rc = ME_REG_ACCESS_OK;
     u_int32_t tp = 0;
     mget_mdevs_type(mf, &tp);
     mft_signal_set_handling(1);
 #if !defined(UEFI_BUILD) && !defined(NO_INBAND)
-    if (tp == MST_IB) {
+    if (tp == MST_IB)
+    {
         rc = (reg_access_status_t)mad_ifc_general_info_hw(mf, &gi->hw_info);
-        if (rc) {
+        if (rc)
+        {
             goto cleanup;
         }
         rc = (reg_access_status_t)mad_ifc_general_info_fw(mf, &gi->fw_info);
-        if (rc) {
+        if (rc)
+        {
             goto cleanup;
         }
         rc = (reg_access_status_t)mad_ifc_general_info_sw(mf, &gi->sw_info);
     }
-    else {
+    else
+    {
         rc = reg_access_mgir(mf, REG_ACCESS_METHOD_GET, gi);
         goto cleanup;
     }
@@ -1027,15 +962,12 @@ reg_access_status_t FwCompsMgr::getGI(mfile *mf, mgirReg *gi)
 cleanup:
     deal_with_signal();
     return rc;
-
 }
 
-bool FwComponent::init(const std::vector<u_int8_t>&  buff,
-                       u_int32_t size,
-                       comps_ids_t type,
-                       u_int32_t idx)
+bool FwComponent::init(const std::vector<u_int8_t>& buff, u_int32_t size, comps_ids_t type, u_int32_t idx)
 {
-    if (_initialized) {
+    if (_initialized)
+    {
         return false;
     }
     _type = type;
@@ -1046,7 +978,7 @@ bool FwComponent::init(const std::vector<u_int8_t>&  buff,
     return true;
 }
 
-void FwCompsMgr::initialize(mfile *mf)
+void FwCompsMgr::initialize(mfile* mf)
 {
     _mf = mf;
     memset(&_lastFsmCtrl, 0, sizeof(fsm_control_st));
@@ -1054,7 +986,8 @@ void FwCompsMgr::initialize(mfile *mf)
     _componentIndex = 0;
     _lastRegAccessStatus = ME_OK;
     _updateHandle = 0;
-    if (getFwSupport()) {
+    if (getFwSupport())
+    {
         GenerateHandle();
     }
     ComponentAccessFactory* factory = ComponentAccessFactory::GetInstance();
@@ -1062,10 +995,15 @@ void FwCompsMgr::initialize(mfile *mf)
     _refreshed = false;
 }
 
-void FwCompsMgr::SetIndexAndSize(int deviceIndex, int deviceSize, bool autoUpdate, bool activationNeeded, bool downloadTransferNeeded, int activate_delay_sec)
+void FwCompsMgr::SetIndexAndSize(int deviceIndex,
+                                 int deviceSize,
+                                 bool autoUpdate,
+                                 bool activationNeeded,
+                                 bool downloadTransferNeeded,
+                                 int activate_delay_sec)
 {
     _linkXDeviceSize = deviceSize;
-    _linkXDeviceIndex = deviceIndex ;
+    _linkXDeviceIndex = deviceIndex;
     _autoUpdate = autoUpdate;
     _linkXFlow = true;
     _activationNeeded = activationNeeded;
@@ -1074,7 +1012,7 @@ void FwCompsMgr::SetIndexAndSize(int deviceIndex, int deviceSize, bool autoUpdat
     _rejectedIndex = -1;
 }
 
-FwCompsMgr::FwCompsMgr(mfile *mf, DeviceTypeT devType, int deviceIndex)
+FwCompsMgr::FwCompsMgr(mfile* mf, DeviceTypeT devType, int deviceIndex)
 {
     _clearSetEnv = false;
     _openedMfile = false;
@@ -1083,9 +1021,9 @@ FwCompsMgr::FwCompsMgr(mfile *mf, DeviceTypeT devType, int deviceIndex)
     _deviceIndex = deviceIndex;
     _accessObj = NULL;
     _mircCaps = false;
-#ifndef UEFI_BUILD    
+#ifndef UEFI_BUILD
     _trm = NULL;
-#endif    
+#endif
     _linkXDeviceSize = 0;
     _linkXDeviceIndex = 0;
     _autoUpdate = false;
@@ -1098,7 +1036,7 @@ FwCompsMgr::FwCompsMgr(mfile *mf, DeviceTypeT devType, int deviceIndex)
     initialize(mf);
 }
 
-FwCompsMgr::FwCompsMgr(const char *devname, DeviceTypeT devType, int deviceIndex)
+FwCompsMgr::FwCompsMgr(const char* devname, DeviceTypeT devType, int deviceIndex)
 {
     _mf = NULL;
     _openedMfile = false;
@@ -1116,7 +1054,8 @@ FwCompsMgr::FwCompsMgr(const char *devname, DeviceTypeT devType, int deviceIndex
     _rejectedIndex = -1;
     _isDelayedActivationCommandSent = false;
 #ifndef UEFI_BUILD
-    if (getenv(MTCR_IB_TIMEOUT_VAR) == NULL) {
+    if (getenv(MTCR_IB_TIMEOUT_VAR) == NULL)
+    {
         _clearSetEnv = true;
 #if defined(_WIN32) || defined(_WIN64) || defined(__MINGW64__) || defined(__MINGW32__)
         putenv(MTCR_IB_TIMEOUT_VAR "=" MTCR_IB_TIMEOUT_VAL);
@@ -1127,12 +1066,13 @@ FwCompsMgr::FwCompsMgr(const char *devname, DeviceTypeT devType, int deviceIndex
 #endif
     _hwDevId = 0;
     _mircCaps = false;
-#ifndef UEFI_BUILD    
+#ifndef UEFI_BUILD
     _trm = NULL;
 #endif
     _lastError = FWCOMPS_SUCCESS;
-    mfile *mf = mopen(devname);
-    if (!mf) {
+    mfile* mf = mopen(devname);
+    if (!mf)
+    {
         _lastError = FWCOMPS_BAD_PARAM;
         return;
     }
@@ -1140,16 +1080,17 @@ FwCompsMgr::FwCompsMgr(const char *devname, DeviceTypeT devType, int deviceIndex
     initialize(mf);
 }
 
-FwCompsMgr::FwCompsMgr(uefi_Dev_t *uefi_dev, uefi_dev_extra_t *uefi_extra)
+FwCompsMgr::FwCompsMgr(uefi_Dev_t* uefi_dev, uefi_dev_extra_t* uefi_extra)
 {
     _mf = NULL;
     _accessObj = NULL;
     _openedMfile = false;
     _clearSetEnv = false;
     _mircCaps = false;
-    mfile *mf = mopen_fw_ctx((void *)uefi_dev, (void *)uefi_extra->fw_cmd_func, \
-        (void *)uefi_extra->dma_func, (void *)&uefi_extra->dev_info);
-    if (!mf) {
+    mfile* mf = mopen_fw_ctx((void*)uefi_dev, (void*)uefi_extra->fw_cmd_func, (void*)uefi_extra->dma_func,
+                             (void*)&uefi_extra->dev_info);
+    if (!mf)
+    {
         _lastError = FWCOMPS_MEM_ALLOC_FAILED;
         return;
     }
@@ -1168,7 +1109,8 @@ FwCompsMgr::~FwCompsMgr()
 {
 #ifndef UEFI_BUILD
     unlock_flash_semaphore();
-    if (_clearSetEnv) {
+    if (_clearSetEnv)
+    {
 #if defined(_WIN32) || defined(_WIN64) || defined(__MINGW64__) || defined(__MINGW32__)
         putenv(MTCR_IB_TIMEOUT_VAR "=");
 #else
@@ -1176,20 +1118,26 @@ FwCompsMgr::~FwCompsMgr()
 #endif
     }
 #endif
-    if (_mf) {
-        if (!_isDelayedActivationCommandSent) {
-            if (_lastFsmCtrl.control_state != FSMST_IDLE) {
+    if (_mf)
+    {
+        if (!_isDelayedActivationCommandSent)
+        {
+            if (_lastFsmCtrl.control_state != FSMST_IDLE)
+            {
                 controlFsm(FSM_CMD_CANCEL, FSMST_LOCKED);
                 controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE, FSMST_IDLE);
             }
         }
     }
-    if (_openedMfile) {
-        if (_mf) {
+    if (_openedMfile)
+    {
+        if (_mf)
+        {
             mclose(_mf);
         }
     }
-    if (_accessObj != NULL) {
+    if (_accessObj != NULL)
+    {
         delete _accessObj;
         _accessObj = NULL;
     }
@@ -1202,57 +1150,56 @@ bool FwCompsMgr::forceRelease()
 
 void FwCompsMgr::GenerateHandle()
 {
-    if (!controlFsm(FSM_QUERY, FSMST_NA, 0, FSMST_NA, NULL, REG_ACCESS_TOUT)) {
+    if (!controlFsm(FSM_QUERY, FSMST_NA, 0, FSMST_NA, NULL, REG_ACCESS_TOUT))
+    {
         _updateHandle = 0;
         return;
     }
     _updateHandle = _lastFsmCtrl.update_handle & 0xffffff;
 }
 
-const char* CompNames[] = {
-    "NO_COMPONENT 1",
-    "COMPID_BOOT_IMG",
-    "COMPID_RUNTIME_IMG",
-    "COMPID_USER_NVCONFIG",
-    "COMPID_OEM_NVCONFIG",
-    "COMPID_MLNX_NVCONFIG",
-    "COMPID_CS_TOKEN",
-    "COMPID_DBG_TOKEN",
-    "COMPID_DEV_INFO",
-    "NO_COMPONENT 2",
-    "COMPID_GEARBOX",
-    "COMPID_CONGESTION_CONTROL",
-    "COMPID_LINKX_PROPERTIES",
-    "COMPID_CRYPTO_TO_COMMISSIONING",
-    "COMPID_RMCS_TOKEN",
-    "COMPID_RMDT_TOKEN"
-};
+const char* CompNames[] = {"NO_COMPONENT 1",          "COMPID_BOOT_IMG",
+                           "COMPID_RUNTIME_IMG",      "COMPID_USER_NVCONFIG",
+                           "COMPID_OEM_NVCONFIG",     "COMPID_MLNX_NVCONFIG",
+                           "COMPID_CS_TOKEN",         "COMPID_DBG_TOKEN",
+                           "COMPID_DEV_INFO",         "NO_COMPONENT 2",
+                           "COMPID_GEARBOX",          "COMPID_CONGESTION_CONTROL",
+                           "COMPID_LINKX_PROPERTIES", "COMPID_CRYPTO_TO_COMMISSIONING",
+                           "COMPID_RMCS_TOKEN",       "COMPID_RMDT_TOKEN"};
 
 bool FwCompsMgr::RefreshComponentsStatus(comp_status_st* ComponentStatus)
 {
     u_int16_t compIdx = 0;
     int last_index_flag = 0;
     comp_query_st compStatus;
-    if (_refreshed) {
+    if (_refreshed)
+    {
         return true;
     }
-    if (_compsQueryMap.size()) {
+    if (_compsQueryMap.size())
+    {
         _compsQueryMap.clear();
     }
     _compsQueryMap.resize((unsigned)(FwComponent::COMPID_UNKNOWN));
-    while (!last_index_flag) {
+    while (!last_index_flag)
+    {
         memset(&compStatus, 0, sizeof(comp_query_st));
-        if (queryComponentStatus(compIdx, &(compStatus.comp_status))) {
+        if (queryComponentStatus(compIdx, &(compStatus.comp_status)))
+        {
             compStatus.comp_status.component_index = compIdx;
-            if (ComponentStatus != NULL && compStatus.comp_status.identifier == FwComponent::COMPID_LINKX) {
+            if (ComponentStatus != NULL && compStatus.comp_status.identifier == FwComponent::COMPID_LINKX)
+            {
                 memcpy(ComponentStatus, &compStatus.comp_status, sizeof(compStatus.comp_status));
             }
             /* */
-            u_int32_t capSt[DEFAULT_SIZE] = { 0 };
-            if (queryComponentInfo(compIdx, 1, COMPINFO_CAPABILITIES, DEFAULT_SIZE, capSt) == false) {
-                if (queryComponentInfo(compIdx, 0, COMPINFO_CAPABILITIES, DEFAULT_SIZE, capSt) == false) {
+            u_int32_t capSt[DEFAULT_SIZE] = {0};
+            if (queryComponentInfo(compIdx, 1, COMPINFO_CAPABILITIES, DEFAULT_SIZE, capSt) == false)
+            {
+                if (queryComponentInfo(compIdx, 0, COMPINFO_CAPABILITIES, DEFAULT_SIZE, capSt) == false)
+                {
                     //_lastError = FWCOMPS_REG_FAILED;
-                    DPRINTF(("-D- Found component: %#x name %s MCQI failed \n", compStatus.comp_status.identifier, CompNames[compStatus.comp_status.identifier]));
+                    DPRINTF(("-D- Found component: %#x name %s MCQI failed \n", compStatus.comp_status.identifier,
+                             CompNames[compStatus.comp_status.identifier]));
                     return false;
                 }
             }
@@ -1269,14 +1216,14 @@ bool FwCompsMgr::RefreshComponentsStatus(comp_status_st* ComponentStatus)
             compStatus.comp_cap.signed_updates_only = _currCompInfo.data.mcqi_cap.signed_updates_only;
             compStatus.comp_cap.rd_en = _currCompInfo.data.mcqi_cap.rd_en;
             memcpy(&(_compsQueryMap[compStatus.comp_status.identifier]), &compStatus, sizeof(compStatus));
-            //reg_access_hca_mcqi_cap_print(&(compStatus.comp_cap), stdout, 3);
+            // reg_access_hca_mcqi_cap_print(&(compStatus.comp_cap), stdout, 3);
             last_index_flag = compStatus.comp_status.last_index_flag;
-            DPRINTF(("-D- Found component with identifier=%#x index=%u name=%s supported_info_bitmask=0x%x \n", \
-                compStatus.comp_status.identifier, compIdx, CompNames[compStatus.comp_status.identifier], 
-                compStatus.comp_cap.supported_info_bitmask));
-
+            DPRINTF(("-D- Found component with identifier=%#x index=%u name=%s supported_info_bitmask=0x%x \n",
+                     compStatus.comp_status.identifier, compIdx, CompNames[compStatus.comp_status.identifier],
+                     compStatus.comp_cap.supported_info_bitmask));
         }
-        else {
+        else
+        {
             DPRINTF(("-D- queryComponentStatus failed for component index %d !!\n", compIdx));
             return false;
         }
@@ -1286,24 +1233,30 @@ bool FwCompsMgr::RefreshComponentsStatus(comp_status_st* ComponentStatus)
     return true;
 }
 
-//TODO: Check all the rc ..
+// TODO: Check all the rc ..
 
-bool FwCompsMgr::readComponent(FwComponent::comps_ids_t compType, FwComponent& fwComp, bool readPending,
-                               ProgressCallBackAdvSt *progressFuncAdv)
+bool FwCompsMgr::readComponent(FwComponent::comps_ids_t compType,
+                               FwComponent& fwComp,
+                               bool readPending,
+                               ProgressCallBackAdvSt* progressFuncAdv)
 {
-    if (!RefreshComponentsStatus()) {
+    if (!RefreshComponentsStatus())
+    {
         return false;
     }
     _currCompQuery = &(_compsQueryMap[compType]);
     _componentIndex = _currCompQuery->comp_status.component_index;
     std::vector<u_int8_t> data;
     u_int32_t compSize = _currCompQuery->comp_cap.component_size;
-    if (_currCompQuery->comp_cap.rd_en) {
+    if (_currCompQuery->comp_cap.rd_en)
+    {
         data.resize(compSize);
-        if (!controlFsm(FSM_CMD_LOCK_UPDATE_HANDLE, FSMST_LOCKED)) {
+        if (!controlFsm(FSM_CMD_LOCK_UPDATE_HANDLE, FSMST_LOCKED))
+        {
             return false;
         }
-        if (!controlFsm(readPending ? FSM_CMD_READ_PENDING_COMPONENT : FSM_CMD_READ_COMPONENT, FSMST_UPLOAD)) {
+        if (!controlFsm(readPending ? FSM_CMD_READ_PENDING_COMPONENT : FSM_CMD_READ_COMPONENT, FSMST_UPLOAD))
+        {
             controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE);
             return false;
         }
@@ -1311,15 +1264,19 @@ bool FwCompsMgr::readComponent(FwComponent::comps_ids_t compType, FwComponent& f
         control_fsm_args_t fsmReadCommand;
         fsmReadCommand.command = readPending ? FSM_CMD_READ_PENDING_COMPONENT : FSM_CMD_READ_COMPONENT;
         fsmReadCommand.expectedState = FSMST_UPLOAD;
-        if (!accessComponent(0, compSize, (u_int32_t *)(data.data()), MCC_READ_COMP, progressFuncAdv, &fsmReadCommand)) {
+        if (!accessComponent(0, compSize, (u_int32_t*)(data.data()), MCC_READ_COMP, progressFuncAdv, &fsmReadCommand))
+        {
             return false;
         }
-        if (!controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE)) {
+        if (!controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE))
+        {
             return false;
         }
     }
-    else {
-        DPRINTF(("readComponent : RD EN is 0 for component index %u compId %s \n", _componentIndex, FwComponent::getCompIdStr(compType)));
+    else
+    {
+        DPRINTF(("readComponent : RD EN is 0 for component index %u compId %s \n", _componentIndex,
+                 FwComponent::getCompIdStr(compType)));
         _lastError = FWCOMPS_READ_COMP_NOT_SUPPORTED;
         return false;
     }
@@ -1333,32 +1290,33 @@ bool FwCompsMgr::readComponentInfo(FwComponent::comps_ids_t compType,
                                    std::vector<u_int32_t>& retData,
                                    bool readPending)
 {
-    if (!RefreshComponentsStatus()) {
+    if (!RefreshComponentsStatus())
+    {
         return false;
     }
     _currCompQuery = &(_compsQueryMap[compType]);
     _componentIndex = _currCompQuery->comp_status.component_index;
 
-
-    if (!queryComponentInfo(_componentIndex, readPending == true, infoType, 0, 0)) {
+    if (!queryComponentInfo(_componentIndex, readPending == true, infoType, 0, 0))
+    {
         return false;
     }
-    if (_currCompQuery->comp_cap.supported_info_bitmask & (1 << infoType)) 
+    if (_currCompQuery->comp_cap.supported_info_bitmask & (1 << infoType))
     {
         u_int32_t size = _currCompInfo.info_size;
         retData.resize(size);
-        queryComponentInfo(_componentIndex, readPending == true, infoType, size, (u_int32_t *)(retData.data()));
+        queryComponentInfo(_componentIndex, readPending == true, infoType, size, (u_int32_t*)(retData.data()));
         return true;
     }
-    else {
+    else
+    {
         _lastError = FWCOMPS_INFO_TYPE_NOT_SUPPORTED;
         return false;
     }
-    //return true;
+    // return true;
 }
 
-bool FwCompsMgr::queryComponentStatus(u_int32_t componentIndex,
-    comp_status_st *query)
+bool FwCompsMgr::queryComponentStatus(u_int32_t componentIndex, comp_status_st* query)
 {
     mft_signal_set_handling(1);
     query->component_index = componentIndex;
@@ -1366,7 +1324,8 @@ bool FwCompsMgr::queryComponentStatus(u_int32_t componentIndex,
     query->device_type = _deviceType;
     reg_access_status_t rc = reg_access_mcqs(_mf, REG_ACCESS_METHOD_GET, query);
     deal_with_signal();
-    if (rc) {
+    if (rc)
+    {
         _lastError = regErrTrans(rc);
         setLastRegisterAccessStatus(rc);
         return false;
@@ -1374,31 +1333,38 @@ bool FwCompsMgr::queryComponentStatus(u_int32_t componentIndex,
     return true;
 }
 
-bool FwCompsMgr::burnComponents(std::vector<FwComponent>& comps,
-                                ProgressCallBackAdvSt *progressFuncAdv)
+bool FwCompsMgr::burnComponents(std::vector<FwComponent>& comps, ProgressCallBackAdvSt* progressFuncAdv)
 {
     unsigned i = 0;
-    if (!RefreshComponentsStatus()) {
+    if (!RefreshComponentsStatus())
+    {
         return false;
     }
-    if (!controlFsm(FSM_CMD_LOCK_UPDATE_HANDLE, FSMST_LOCKED)) {
+    if (!controlFsm(FSM_CMD_LOCK_UPDATE_HANDLE, FSMST_LOCKED))
+    {
         DPRINTF(("Cannot lock the handle!\n"));
-        if (forceRelease() == false) {
+        if (forceRelease() == false)
+        {
             printf("FSM is locked.\n");
         }
         return false;
     }
-    if (_downloadTransferNeeded == true) {
-        for (i = 0; i < comps.size(); i++) {
+    if (_downloadTransferNeeded == true)
+    {
+        for (i = 0; i < comps.size(); i++)
+        {
             int component = comps[i].getType();
             _currCompQuery = &(_compsQueryMap[component]);
-            if (!_currCompQuery->valid) {
+            if (!_currCompQuery->valid)
+            {
                 _lastError = FWCOMPS_COMP_NOT_SUPPORTED;
                 DPRINTF(("MCC flow for component %d is not supported!\n", component));
                 return false;
             }
             _componentIndex = _currCompQuery->comp_status.component_index;
-            if (!controlFsm(FSM_CMD_UPDATE_COMPONENT, FSMST_DOWNLOAD, comps[i].getSize(), FSMST_INITIALIZE, progressFuncAdv)) {
+            if (!controlFsm(FSM_CMD_UPDATE_COMPONENT, FSMST_DOWNLOAD, comps[i].getSize(), FSMST_INITIALIZE,
+                            progressFuncAdv))
+            {
                 DPRINTF(("Initializing downloading FW component has failed!\n"));
                 return false;
             }
@@ -1409,53 +1375,69 @@ bool FwCompsMgr::burnComponents(std::vector<FwComponent>& comps,
             fsmUpdateCommand.size = comps[i].getSize();
             fsmUpdateCommand.currentState = FSMST_INITIALIZE;
             fsmUpdateCommand.progressFuncAdv = progressFuncAdv;
-            if (!accessComponent(0, comps[i].getSize(), (u_int32_t *)(comps[i].getData().data()), MCC_WRITE_COMP, progressFuncAdv, &fsmUpdateCommand)) {
+            if (!accessComponent(0, comps[i].getSize(), (u_int32_t*)(comps[i].getData().data()), MCC_WRITE_COMP,
+                                 progressFuncAdv, &fsmUpdateCommand))
+            {
                 DPRINTF(("Downloading FW component has failed!\n"));
                 return false;
             }
-            if (!controlFsm(FSM_CMD_VERIFY_COMPONENT, FSMST_LOCKED, 0, FSMST_NA, progressFuncAdv)) {
+            if (!controlFsm(FSM_CMD_VERIFY_COMPONENT, FSMST_LOCKED, 0, FSMST_NA, progressFuncAdv))
+            {
                 DPRINTF(("Verifying FW component has failed!\n"));
                 return false;
             }
-            if (comps[i].getType() == FwComponent::COMPID_LINKX) {
-                if (!controlFsm(FSM_CMD_DOWNSTREAM_DEVICE_TRANSFER, FSMST_DOWNSTREAM_DEVICE_TRANSFER, 0, FSMST_LOCKED, progressFuncAdv)) {
+            if (comps[i].getType() == FwComponent::COMPID_LINKX)
+            {
+                if (!controlFsm(FSM_CMD_DOWNSTREAM_DEVICE_TRANSFER, FSMST_DOWNSTREAM_DEVICE_TRANSFER, 0, FSMST_LOCKED,
+                                progressFuncAdv))
+                {
                     DPRINTF(("Downstream LinkX begin has failed!\n"));
                     return false;
                 }
-                if (!controlFsm(FSM_QUERY, FSMST_LOCKED, 0, FSMST_DOWNSTREAM_DEVICE_TRANSFER, progressFuncAdv)) {
+                if (!controlFsm(FSM_QUERY, FSMST_LOCKED, 0, FSMST_DOWNSTREAM_DEVICE_TRANSFER, progressFuncAdv))
+                {
                     DPRINTF(("Downstream LinkX ending has failed!\n"));
                     return false;
                 }
             }
         }
     }
-    if (_linkXFlow) {
-        if (_activationNeeded == true) { //by default
-            if (!controlFsm(FSM_CMD_ACTIVATE_ALL, FSMST_ACTIVATE, 0, FSMST_LOCKED, progressFuncAdv)) {
+    if (_linkXFlow)
+    {
+        if (_activationNeeded == true)
+        { // by default
+            if (!controlFsm(FSM_CMD_ACTIVATE_ALL, FSMST_ACTIVATE, 0, FSMST_LOCKED, progressFuncAdv))
+            {
                 DPRINTF(("Moving to ACTIVATE state has failed!\n"));
                 return false;
             }
 
             // In case of activation delay, FW will set FSM to LOCKED
-            if (!_isDelayedActivationCommandSent) {
+            if (!_isDelayedActivationCommandSent)
+            {
                 printf("Please wait while activating the transceiver(s) FW ...\n");
-                if (!controlFsm(FSM_QUERY, FSMST_LOCKED, 0, FSMST_ACTIVATE, progressFuncAdv)) {
+                if (!controlFsm(FSM_QUERY, FSMST_LOCKED, 0, FSMST_ACTIVATE, progressFuncAdv))
+                {
                     DPRINTF(("Moving from activate state to locked state has failed!\n"));
                     return false;
                 }
             }
         }
     }
-    else {
-        if (!controlFsm(FSM_CMD_ACTIVATE_ALL)) {
+    else
+    {
+        if (!controlFsm(FSM_CMD_ACTIVATE_ALL))
+        {
             DPRINTF(("Activating FW component has failed!\n"));
             return false;
         }
     }
 
     // In case of activation delay, FW will release the update handle
-    if (!_isDelayedActivationCommandSent) {
-        if (!controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE)) {
+    if (!_isDelayedActivationCommandSent)
+    {
+        if (!controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE))
+        {
             DPRINTF(("Release FW handle has failed!\n"));
             return false;
         }
@@ -1464,23 +1446,26 @@ bool FwCompsMgr::burnComponents(std::vector<FwComponent>& comps,
     return true;
 }
 
-
 bool FwCompsMgr::getFwComponents(std::vector<FwComponent>& compsMap, bool readEn)
 {
-    if (!RefreshComponentsStatus()) {
+    if (!RefreshComponentsStatus())
+    {
         return false;
     }
-    for (std::vector<comp_query_st>::iterator it = _compsQueryMap.begin();
-        it != _compsQueryMap.end(); it++) {
-        if (!it->valid) {
+    for (std::vector<comp_query_st>::iterator it = _compsQueryMap.begin(); it != _compsQueryMap.end(); it++)
+    {
+        if (!it->valid)
+        {
             continue;
         }
         FwComponent fwCmp((FwComponent::comps_ids_t)it->comp_status.identifier,
                           (FwComponent::comps_status_t)it->comp_status.component_status);
-        if (readEn && !readComponent((FwComponent::comps_ids_t)it->comp_status.identifier, fwCmp, 0)) {
+        if (readEn && !readComponent((FwComponent::comps_ids_t)it->comp_status.identifier, fwCmp, 0))
+        {
             return false;
         }
-        else {
+        else
+        {
             fwCmp.setSize(it->comp_cap.component_size);
         }
         compsMap.push_back(fwCmp);
@@ -1490,45 +1475,46 @@ bool FwCompsMgr::getFwComponents(std::vector<FwComponent>& compsMap, bool readEn
 
 const char* FwComponent::getCompIdStr(comps_ids_t compId)
 {
-    switch (compId) {
-    case COMPID_BOOT_IMG:
-        return "Boot image";
+    switch (compId)
+    {
+        case COMPID_BOOT_IMG:
+            return "Boot image";
 
-    case COMPID_RUNTIME_IMG:
-        return "RUNTIME_IMAGE";
+        case COMPID_RUNTIME_IMG:
+            return "RUNTIME_IMAGE";
 
-    case COMPID_CS_TOKEN:
-        return "CS_TOKEN";
+        case COMPID_CS_TOKEN:
+            return "CS_TOKEN";
 
-    case COMPID_MLNX_NVCONFIG:
-        return "MLNX_NVCONFIG";
+        case COMPID_MLNX_NVCONFIG:
+            return "MLNX_NVCONFIG";
 
-    case COMPID_OEM_NVCONFIG:
-        return "OEM_NVCONFIG";
+        case COMPID_OEM_NVCONFIG:
+            return "OEM_NVCONFIG";
 
-    case COMPID_DBG_TOKEN:
-        return "DBG_TOKEN";
+        case COMPID_DBG_TOKEN:
+            return "DBG_TOKEN";
 
-    case COMPID_GEARBOX:
-        return "GEARBOX";
+        case COMPID_GEARBOX:
+            return "GEARBOX";
 
-    case COMPID_CONGESTION_CONTROL:
+        case COMPID_CONGESTION_CONTROL:
             return "CONGESTION_CONTROL";
 
-    case COMPID_LINKX:
-        return "COMPID_LINKX";
+        case COMPID_LINKX:
+            return "COMPID_LINKX";
 
-    case COMPID_CRYPTO_TO_COMMISSIONING:
-        return "COMPID_CRYPTO_TO_COMMISSIONING";
+        case COMPID_CRYPTO_TO_COMMISSIONING:
+            return "COMPID_CRYPTO_TO_COMMISSIONING";
 
-    case COMPID_RMCS_TOKEN:
-        return "COMPID_RMCS_TOKEN";
+        case COMPID_RMCS_TOKEN:
+            return "COMPID_RMCS_TOKEN";
 
-    case COMPID_RMDT_TOKEN:
-        return "COMPID_RMDT_TOKEN";
+        case COMPID_RMDT_TOKEN:
+            return "COMPID_RMDT_TOKEN";
 
-    default:
-        return "UNKNOWN_COMPONENT";
+        default:
+            return "UNKNOWN_COMPONENT";
     }
 }
 
@@ -1537,10 +1523,12 @@ u_int32_t FwCompsMgr::getFwSupport()
     u_int32_t devid = 0;
     isDmaSupported = false;
 #ifndef UEFI_BUILD
-    if (getenv("FW_CTRL") != NULL) {
+    if (getenv("FW_CTRL") != NULL)
+    {
         return 1;
     }
-    if (mread4(_mf, 0xf0014, &devid) != 4) {
+    if (mread4(_mf, 0xf0014, &devid) != 4)
+    {
         /*
          * Best effort to check MCAM
          */
@@ -1553,13 +1541,9 @@ u_int32_t FwCompsMgr::getFwSupport()
     /*
      * If 4TH gen nic or switch with no MCAM reg return not supported
      */
-    if (devid == CX2_HW_ID ||
-        devid == CX3_HW_ID ||
-        devid == CX3_PRO_HW_ID ||
-        devid == SWITCHX_HW_ID ||
-        devid == IS4_HW_ID ||
-        devid == SWITCH_IB_HW_ID ||
-        devid == SWITCH_IB2_HW_ID) {
+    if (devid == CX2_HW_ID || devid == CX3_HW_ID || devid == CX3_PRO_HW_ID || devid == SWITCHX_HW_ID ||
+        devid == IS4_HW_ID || devid == SWITCH_IB_HW_ID || devid == SWITCH_IB2_HW_ID)
+    {
         _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
         return 0;
     }
@@ -1567,7 +1551,8 @@ u_int32_t FwCompsMgr::getFwSupport()
     tools_open_mcam mcam;
     memset(&mcam, 0, sizeof(mcam));
     reg_access_status_t rc = reg_access_mcam(_mf, REG_ACCESS_METHOD_GET, &mcam);
-    if (rc) {
+    if (rc)
+    {
         DPRINTF(("getFwSupport MCAM not supported! rc = %d\n", rc));
         _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
         return 0;
@@ -1579,23 +1564,26 @@ u_int32_t FwCompsMgr::getFwSupport()
      * The bytes are in reverse order
      */
     u_int8_t mcdaCaps = EXTRACT(mcam.mng_access_reg_cap_mask[3], 0, 5);
-    u_int8_t mcddCaps = EXTRACT(mcam.mng_access_reg_cap_mask[4], 4, 1);//##EDDY: need check ! register 5c
+    u_int8_t mcddCaps = EXTRACT(mcam.mng_access_reg_cap_mask[4], 4, 1); //##EDDY: need check ! register 5c
     u_int8_t mgirCaps = EXTRACT(mcam.mng_access_reg_cap_mask[11], 0, 1);
     if (mcddCaps == 1)
         isDmaSupported = true;
 
     memset(&mcam, 0, sizeof(mcam));
-    mcam.access_reg_group = 2;//for MIRC register
+    mcam.access_reg_group = 2; // for MIRC register
     rc = reg_access_mcam(_mf, REG_ACCESS_METHOD_GET, &mcam);
-    if (rc) {
+    if (rc)
+    {
         _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
         return 0;
     }
 
-    _mircCaps = EXTRACT(mcam.mng_access_reg_cap_mask[3], 2, 1);//MIRC is 0x9162
-    DPRINTF(("getFwSupport _mircCaps = %d mcdaCaps = %d mcddCaps = %d mgirCaps = %d\n", _mircCaps, mcdaCaps, mcddCaps, mgirCaps));
+    _mircCaps = EXTRACT(mcam.mng_access_reg_cap_mask[3], 2, 1); // MIRC is 0x9162
+    DPRINTF(("getFwSupport _mircCaps = %d mcdaCaps = %d mcddCaps = %d mgirCaps = %d\n", _mircCaps, mcdaCaps, mcddCaps,
+             mgirCaps));
 
-    if (mcdaCaps == 0x1f && mgirCaps) {
+    if (mcdaCaps == 0x1f && mgirCaps)
+    {
         return 1;
     }
     _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
@@ -1604,7 +1592,7 @@ u_int32_t FwCompsMgr::getFwSupport()
 
 #define UID_EXTRACT(INT64, INT32ARR) INT64 = ((u_int64_t)INT32ARR[0] << 32) | INT32ARR[1];
 
-bool FwCompsMgr::extractMacsGuids(fwInfoT *fwQuery)
+bool FwCompsMgr::extractMacsGuids(fwInfoT* fwQuery)
 {
     std::vector<u_int8_t> nvBaseMacGuidData;
     std::vector<u_int8_t> nvBaseMacGuidDataOrig;
@@ -1621,16 +1609,20 @@ bool FwCompsMgr::extractMacsGuids(fwInfoT *fwQuery)
     memset(&currMacGuidCap, 0, sizeof(currMacGuidCap));
     memset(&origMacGuidCap, 0, sizeof(origMacGuidCap));
 
-    if (!runNVDA(nvBaseMacGuidData, 64, NV_BASE_MAC_GUID_IDX, REG_ACCESS_METHOD_GET, false)) {
+    if (!runNVDA(nvBaseMacGuidData, 64, NV_BASE_MAC_GUID_IDX, REG_ACCESS_METHOD_GET, false))
+    {
         return false;
     }
-    if (!runNVDA(nvBaseMacGuidDataOrig, 64, NV_BASE_MAC_GUID_IDX, REG_ACCESS_METHOD_GET, true)) {
+    if (!runNVDA(nvBaseMacGuidDataOrig, 64, NV_BASE_MAC_GUID_IDX, REG_ACCESS_METHOD_GET, true))
+    {
         return false;
     }
-    if (!runNVDA(nvBaseMacGuidCap, 64, NV_BASE_MAC_GUID_CAP_IDX, REG_ACCESS_METHOD_GET, false)) {
+    if (!runNVDA(nvBaseMacGuidCap, 64, NV_BASE_MAC_GUID_CAP_IDX, REG_ACCESS_METHOD_GET, false))
+    {
         return false;
     }
-    if (!runNVDA(nvBaseMacGuidCapOrig, 64, NV_BASE_MAC_GUID_CAP_IDX, REG_ACCESS_METHOD_GET, true)) {
+    if (!runNVDA(nvBaseMacGuidCapOrig, 64, NV_BASE_MAC_GUID_CAP_IDX, REG_ACCESS_METHOD_GET, true))
+    {
         return false;
     }
     tools_open_nv_base_mac_guid_unpack(&currMacGuid, nvBaseMacGuidData.data());
@@ -1649,7 +1641,6 @@ bool FwCompsMgr::extractMacsGuids(fwInfoT *fwQuery)
     return true;
 }
 
-
 bool FwCompsMgr::setMacsGuids(mac_guid_t macGuid)
 {
     std::vector<u_int8_t> macsGuidsBuff(16, 0);
@@ -1668,61 +1659,67 @@ bool FwCompsMgr::setMacsGuids(mac_guid_t macGuid)
 
 u_int8_t transRomType(u_int8_t mgirRomType)
 {
-    switch (mgirRomType) {
-    case 0x1: //FLEXBOOT
-        return 0x10;
+    switch (mgirRomType)
+    {
+        case 0x1: // FLEXBOOT
+            return 0x10;
+
+        case 0x2: // UEFI
+            return 0x11;
 
-    case 0x2: //UEFI
-        return 0x11;
-         
-    case 0x3: //UEFI_CLP
-        return 0x12;
+        case 0x3: // UEFI_CLP
+            return 0x12;
 
-    case 0x4: //NVMe
-        return 0x13;
+        case 0x4: // NVMe
+            return 0x13;
 
-    case 0x5: //FCODE
-        return 0x21;
+        case 0x5: // FCODE
+            return 0x21;
 
-    case 0x6: // UEFI Virtio net
-        return 0x14;
+        case 0x6: // UEFI Virtio net
+            return 0x14;
 
-    case 0x7: //UEFI Virtio blk
-        return 0x15;
+        case 0x7: // UEFI Virtio blk
+            return 0x15;
 
-    case 0x8: //PXE Virtio net
-        return 0x16;
+        case 0x8: // PXE Virtio net
+            return 0x16;
 
-    default:
-        return mgirRomType;
+        default:
+            return mgirRomType;
     }
 }
 
-void FwCompsMgr::extractRomInfo(mgirReg *mgir, fwInfoT *fwQuery)
+void FwCompsMgr::extractRomInfo(mgirReg* mgir, fwInfoT* fwQuery)
 {
-    if (!fwQuery || !mgir) {
+    if (!fwQuery || !mgir)
+    {
         return;
     }
     fwQuery->nRoms = 0;
-    if (mgir->sw_info.rom3_type) {
+    if (mgir->sw_info.rom3_type)
+    {
         fwQuery->roms[fwQuery->nRoms].arch = mgir->sw_info.rom3_arch;
         fwQuery->roms[fwQuery->nRoms].type = transRomType(mgir->sw_info.rom3_type);
         fwQuery->roms[fwQuery->nRoms].version = mgir->sw_info.rom3_version;
         fwQuery->nRoms++;
     }
-    if (mgir->sw_info.rom2_type) {
+    if (mgir->sw_info.rom2_type)
+    {
         fwQuery->roms[fwQuery->nRoms].arch = mgir->sw_info.rom2_arch;
         fwQuery->roms[fwQuery->nRoms].type = transRomType(mgir->sw_info.rom2_type);
         fwQuery->roms[fwQuery->nRoms].version = mgir->sw_info.rom2_version;
         fwQuery->nRoms++;
     }
-    if (mgir->sw_info.rom1_type) {
+    if (mgir->sw_info.rom1_type)
+    {
         fwQuery->roms[fwQuery->nRoms].arch = mgir->sw_info.rom1_arch;
         fwQuery->roms[fwQuery->nRoms].type = transRomType(mgir->sw_info.rom1_type);
         fwQuery->roms[fwQuery->nRoms].version = mgir->sw_info.rom1_version;
         fwQuery->nRoms++;
     }
-    if (mgir->sw_info.rom0_type) {
+    if (mgir->sw_info.rom0_type)
+    {
         fwQuery->roms[fwQuery->nRoms].arch = mgir->sw_info.rom0_arch;
         fwQuery->roms[fwQuery->nRoms].type = transRomType(mgir->sw_info.rom0_type);
         fwQuery->roms[fwQuery->nRoms].version = mgir->sw_info.rom0_version;
@@ -1730,30 +1727,35 @@ void FwCompsMgr::extractRomInfo(mgirReg *mgir, fwInfoT *fwQuery)
     }
 }
 
-bool FwCompsMgr::queryFwInfo(fwInfoT *query, bool next_boot_fw_ver)
+bool FwCompsMgr::queryFwInfo(fwInfoT* query, bool next_boot_fw_ver)
 {
-    if (!query) {
+    if (!query)
+    {
         _lastError = FWCOMPS_BAD_PARAM;
         return false;
     }
     /*
-    * MGIR
-    */
+     * MGIR
+     */
     reg_access_status_t rc;
     mgirReg mgir;
     memset(&mgir, 0, sizeof(mgir));
     memset(query, 0, sizeof(fwInfoT));
 
-    if (getComponentVersion(FwComponent::COMPID_BOOT_IMG, true, &query->pending_fw_version)) {
+    if (getComponentVersion(FwComponent::COMPID_BOOT_IMG, true, &query->pending_fw_version))
+    {
         query->pending_fw_valid = 1;
     }
-    if (!getComponentVersion(FwComponent::COMPID_BOOT_IMG, false, &query->running_fw_version)) {
+    if (!getComponentVersion(FwComponent::COMPID_BOOT_IMG, false, &query->running_fw_version))
+    {
         return false;
     }
-    if (next_boot_fw_ver) {
+    if (next_boot_fw_ver)
+    {
         // query next_boot_fw_ver only. enough to query pending, running versions and device_id.
         rc = getGI(_mf, &mgir);
-        if (rc) {
+        if (rc)
+        {
             _lastError = FWCOMPS_QUERY_FAILED;
             return false;
         }
@@ -1764,16 +1766,18 @@ bool FwCompsMgr::queryFwInfo(fwInfoT *query, bool next_boot_fw_ver)
     }
 
     if (query->running_fw_version.version_string_length &&
-        query->running_fw_version.version_string_length <= PRODUCT_VER_LEN) {
-        strcpy(query->product_ver, (char *)_productVerStr.data());
+        query->running_fw_version.version_string_length <= PRODUCT_VER_LEN)
+    {
+        strcpy(query->product_ver, (char*)_productVerStr.data());
     }
 
     rc = getGI(_mf, &mgir);
-    if (rc) {
+    if (rc)
+    {
         _lastError = FWCOMPS_QUERY_FAILED;
         return false;
     }
-    //tools_open_mgir_print(&mgir, stdout, 1);
+    // tools_open_mgir_print(&mgir, stdout, 1);
     memcpy(query->psid, mgir.fw_info.psid, PSID_LEN);
     query->hw_dev_id = mgir.hw_info.hw_dev_id;
     query->dev_id = mgir.hw_info.device_id;
@@ -1790,18 +1794,23 @@ bool FwCompsMgr::queryFwInfo(fwInfoT *query, bool next_boot_fw_ver)
     // Since in switches MGIR 'dev' field is used to indicate dev-branch instead of the original purpose for dev-secure,
     // we now read from a new field called 'dev_sc' to determine if the switch is dev-secure
     dm_dev_id_t dm_device_id = DeviceUnknown;
-    if (dm_get_device_id_offline(query->hw_dev_id, query->rev_id, &dm_device_id) == ME_OK) {
-        if (dm_dev_is_switch(dm_device_id)) {
+    if (dm_get_device_id_offline(query->hw_dev_id, query->rev_id, &dm_device_id) == ME_OK)
+    {
+        if (dm_dev_is_switch(dm_device_id))
+        {
             query->security_type.dev_fw = mgir.fw_info.dev_sc;
         }
     }
-    else {
+    else
+    {
         _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
         return false;
     }
 
-    query->base_mac_orig.uid = ((u_int64_t)mgir.hw_info.manufacturing_base_mac_47_32 << 32 | mgir.hw_info.manufacturing_base_mac_31_0);
-    if (!extractMacsGuids(query)) {
+    query->base_mac_orig.uid =
+      ((u_int64_t)mgir.hw_info.manufacturing_base_mac_47_32 << 32 | mgir.hw_info.manufacturing_base_mac_31_0);
+    if (!extractMacsGuids(query))
+    {
         /*
          * We don't fail, it will show NA in the query
          */
@@ -1816,168 +1825,181 @@ bool FwCompsMgr::queryFwInfo(fwInfoT *query, bool next_boot_fw_ver)
     vector<u_int8_t> descriptionInfoString;
     vector<u_int8_t> imageVsd;
     vector<u_int8_t> deviceVsd;
-    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_DEVICE_NAME, nameInfoString)) {
-        strncpy(query->name, (char *)nameInfoString.data(), NAME_LEN - 1);
+    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_DEVICE_NAME, nameInfoString))
+    {
+        strncpy(query->name, (char*)nameInfoString.data(), NAME_LEN - 1);
     }
-    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_DEVICE_DESCRIPTION_INFO, descriptionInfoString)) {
-        strncpy(query->description, (char *)descriptionInfoString.data(), DESCRIPTION_LEN - 1);
+    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_DEVICE_DESCRIPTION_INFO, descriptionInfoString))
+    {
+        strncpy(query->description, (char*)descriptionInfoString.data(), DESCRIPTION_LEN - 1);
     }
-    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_IMAGE_VSD, imageVsd)) {
-        strncpy(query->imageVsd, (char *)imageVsd.data(), VSD_LEN);
+    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_IMAGE_VSD, imageVsd))
+    {
+        strncpy(query->imageVsd, (char*)imageVsd.data(), VSD_LEN);
     }
-    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_DEVICE_VSD, deviceVsd)) {
-        strncpy(query->deviceVsd, (char *)deviceVsd.data(), VSD_LEN);
+    if (getDeviceHWInfo(FwCompsMgr::MQIS_REGISTER_DEVICE_VSD, deviceVsd))
+    {
+        strncpy(query->deviceVsd, (char*)deviceVsd.data(), VSD_LEN);
     }
 
     return true;
 }
 
-unsigned char*  FwCompsMgr::getLastErrMsg()
+unsigned char* FwCompsMgr::getLastErrMsg()
 {
-    static unsigned char bufferErr[512] = { 0 };
+    static unsigned char bufferErr[512] = {0};
     memset(bufferErr, 0, sizeof(bufferErr));
-    switch (_lastError) {
-    case FWCOMPS_ABORTED:
-        return (unsigned char*)"Aborting ... received interrupt signal";
-
-    case FWCOMPS_MCC_ERR_ERROR:
-        return (unsigned char*)"MCC error";
+    switch (_lastError)
+    {
+        case FWCOMPS_ABORTED:
+            return (unsigned char*)"Aborting ... received interrupt signal";
 
-    case FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR:
-        return (unsigned char*)"The Digest in the signature is wrong";
+        case FWCOMPS_MCC_ERR_ERROR:
+            return (unsigned char*)"MCC error";
 
-    case FWCOMPS_MCC_ERR_REJECTED_UNSIGNED:
-        return (unsigned char*)"The component is not signed";
+        case FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR:
+            return (unsigned char*)"The Digest in the signature is wrong";
 
-    case FWCOMPS_MCC_ERR_BLOCKED_PENDING_RESET:
-        return (unsigned char*)"The firmware image was already updated on flash, pending reset.";
+        case FWCOMPS_MCC_ERR_REJECTED_UNSIGNED:
+            return (unsigned char*)"The component is not signed";
 
-    case FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE:
-        return (unsigned char*)"Component is not applicable";
+        case FWCOMPS_MCC_ERR_BLOCKED_PENDING_RESET:
+            return (unsigned char*)"The firmware image was already updated on flash, pending reset.";
 
-    case FWCOMPS_MCC_ERR_REJECTED_AUTH_FAILED:
-        return (unsigned char*)"Rejected authentication";
+        case FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE:
+            return (unsigned char*)"Component is not applicable";
 
-    case FWCOMPS_MCC_ERR_REJECTED_KEY_NOT_APPLICABLE:
-        return (unsigned char*)"The key is not applicable";
+        case FWCOMPS_MCC_ERR_REJECTED_AUTH_FAILED:
+            return (unsigned char*)"Rejected authentication";
 
-    case FWCOMPS_READ_COMP_NOT_SUPPORTED:
-        return (unsigned char*)"Reading component is not supported";
-        break;
+        case FWCOMPS_MCC_ERR_REJECTED_KEY_NOT_APPLICABLE:
+            return (unsigned char*)"The key is not applicable";
 
-    case FWCOMPS_COMP_NOT_SUPPORTED:
-        return (unsigned char*)"Component not supported";
+        case FWCOMPS_READ_COMP_NOT_SUPPORTED:
+            return (unsigned char*)"Reading component is not supported";
+            break;
 
-    case FWCOMPS_VERIFY_FAILED:
-        return (unsigned char*)"Firmware verifying failed!";
+        case FWCOMPS_COMP_NOT_SUPPORTED:
+            return (unsigned char*)"Component not supported";
 
-    case FWCOMPS_CR_ERR:
-        return (unsigned char*)"Failed to access CR-Space";
+        case FWCOMPS_VERIFY_FAILED:
+            return (unsigned char*)"Firmware verifying failed!";
 
-    case FWCOMPS_MCC_REJECTED_NOT_A_SECURED_FW:
-        return (unsigned char*)"The firmware image is not secured";
+        case FWCOMPS_CR_ERR:
+            return (unsigned char*)"Failed to access CR-Space";
 
-    case FWCOMPS_MCC_REJECTED_MFG_BASE_MAC_NOT_LISTED:
-        return (unsigned char*)"The manufacturing base MAC was not listed";
+        case FWCOMPS_MCC_REJECTED_NOT_A_SECURED_FW:
+            return (unsigned char*)"The firmware image is not secured";
 
-    case FWCOMPS_MCC_REJECTED_NO_DEBUG_TOKEN:
-        return (unsigned char*)"There is no Debug Token installed";
+        case FWCOMPS_MCC_REJECTED_MFG_BASE_MAC_NOT_LISTED:
+            return (unsigned char*)"The manufacturing base MAC was not listed";
 
-    case FWCOMPS_MCC_REJECTED_VERSION_NUM_MISMATCH:
-        return (unsigned char*)"Firmware version mismatch";
+        case FWCOMPS_MCC_REJECTED_NO_DEBUG_TOKEN:
+            return (unsigned char*)"There is no Debug Token installed";
 
-    case FWCOMPS_MCC_REJECTED_USER_TIMESTAMP_MISMATCH:
-        return (unsigned char*)"User timestamp mismatch";
+        case FWCOMPS_MCC_REJECTED_VERSION_NUM_MISMATCH:
+            return (unsigned char*)"Firmware version mismatch";
 
-    case FWCOMPS_MCC_REJECTED_FORBIDDEN_VERSION:
-        return (unsigned char*)"Forbidden version rejected";
+        case FWCOMPS_MCC_REJECTED_USER_TIMESTAMP_MISMATCH:
+            return (unsigned char*)"User timestamp mismatch";
 
-    case FWCOMPS_MCC_FLASH_ERASE_ERROR:
-        return (unsigned char*)"Error while erasing the flash";
+        case FWCOMPS_MCC_REJECTED_FORBIDDEN_VERSION:
+            return (unsigned char*)"Forbidden version rejected";
 
-    case FWCOMPS_MCC_UNEXPECTED_STATE:
-        return (unsigned char*)"Unexpected state";
+        case FWCOMPS_MCC_FLASH_ERASE_ERROR:
+            return (unsigned char*)"Error while erasing the flash";
 
-    case FWCOMPS_MCC_TOUT:
-        return (unsigned char*)"Time-out reached while waiting for the FSM to be updated";
+        case FWCOMPS_MCC_UNEXPECTED_STATE:
+            return (unsigned char*)"Unexpected state";
 
-    case FWCOMPS_MCC_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION:
-        return (unsigned char*)"Image cannot boot from partition.";
+        case FWCOMPS_MCC_TOUT:
+            return (unsigned char*)"Time-out reached while waiting for the FSM to be updated";
 
-    case FWCOMPS_MCC_REJECTED_LINKX_TYPE_NOT_SUPPORTED:
-    {
-        if (_rejectedIndex != -1) {
-            sprintf((char*)bufferErr, "LinkX type not supported for device index %d\n", _rejectedIndex);
-            return bufferErr;
-        }
-        else {
-            return (unsigned char*)"LinkX type not supported";
-        }
-    }
-    case FWCOMPS_MCC_REJECTED_HOST_STORAGE_IN_USE:
-        return (unsigned char*)"Host storage is in use";
+        case FWCOMPS_MCC_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION:
+            return (unsigned char*)"Image cannot boot from partition.";
 
-    case FWCOMPS_MCC_REJECTED_LINKX_TRANSFER:
-    {
-        if (_rejectedIndex != -1) {
-            sprintf((char*)bufferErr, "LinkX downstream transfer failed for device index %d\n", _rejectedIndex);
-            return bufferErr;
-        }
-        else {
-            return (unsigned char*)"LinkX downstream transfer failed";
+        case FWCOMPS_MCC_REJECTED_LINKX_TYPE_NOT_SUPPORTED:
+        {
+            if (_rejectedIndex != -1)
+            {
+                sprintf((char*)bufferErr, "LinkX type not supported for device index %d\n", _rejectedIndex);
+                return bufferErr;
+            }
+            else
+            {
+                return (unsigned char*)"LinkX type not supported";
+            }
         }
-    }
-    case FWCOMPS_MCC_REJECTED_LINKX_ACTIVATE: {
-        if (_rejectedIndex != -1) {
-            sprintf((char*)bufferErr, "LinkX activation failed for device index %d\n", _rejectedIndex);
-            return bufferErr;
+        case FWCOMPS_MCC_REJECTED_HOST_STORAGE_IN_USE:
+            return (unsigned char*)"Host storage is in use";
+
+        case FWCOMPS_MCC_REJECTED_LINKX_TRANSFER:
+        {
+            if (_rejectedIndex != -1)
+            {
+                sprintf((char*)bufferErr, "LinkX downstream transfer failed for device index %d\n", _rejectedIndex);
+                return bufferErr;
+            }
+            else
+            {
+                return (unsigned char*)"LinkX downstream transfer failed";
+            }
         }
-        else {
-            return (unsigned char*)"LinkX activation failed";
+        case FWCOMPS_MCC_REJECTED_LINKX_ACTIVATE:
+        {
+            if (_rejectedIndex != -1)
+            {
+                sprintf((char*)bufferErr, "LinkX activation failed for device index %d\n", _rejectedIndex);
+                return bufferErr;
+            }
+            else
+            {
+                return (unsigned char*)"LinkX activation failed";
+            }
         }
-    }
 
-    case FWCOMPS_MCC_REJECTED_INCOMPATIBLE_FLASH:
-        return (unsigned char*)"The image does not support the device's flash type";
-
-    case FWCOMPS_UNSUPPORTED_DEVICE:
-        return (unsigned char*)"Unsupported device";
-
-    case FWCOMPS_MTCR_OPEN_DEVICE_ERROR:
-        return (unsigned char*)"Failed to open device";
-
-    case FWCOMPS_FAIL_TO_LOCK_FLASH_SEMAPHORE:
-        return (unsigned char*)"Failed to lock flash semaphore";
-
-    case FWCOMPS_FAIL_TO_CREATE_TRM_CONTEXT:
-        return (unsigned char*)"Failed to create TRM context";
-
-    case FWCOMPS_REG_ACCESS_BAD_STATUS_ERR:
-    case FWCOMPS_REG_ACCESS_BAD_METHOD:
-    case FWCOMPS_REG_ACCESS_NOT_SUPPORTED:
-    case FWCOMPS_REG_ACCESS_DEV_BUSY:
-    case FWCOMPS_REG_ACCESS_VER_NOT_SUPP:
-    case FWCOMPS_REG_ACCESS_UNKNOWN_TLV:
-    case FWCOMPS_REG_ACCESS_REG_NOT_SUPP:
-    case FWCOMPS_REG_ACCESS_CLASS_NOT_SUPP:
-    case FWCOMPS_REG_ACCESS_METHOD_NOT_SUPP:
-    case FWCOMPS_REG_ACCESS_BAD_PARAM:
-    case FWCOMPS_REG_ACCESS_RES_NOT_AVLBL:
-    case FWCOMPS_REG_ACCESS_MSG_RECPT_ACK:
-    case FWCOMPS_REG_ACCESS_UNKNOWN_ERR:
-    case FWCOMPS_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
-    case FWCOMPS_REG_ACCESS_CONF_CORRUPT:
-    case FWCOMPS_REG_ACCESS_LEN_TOO_SMALL:
-    case FWCOMPS_REG_ACCESS_BAD_CONFIG:
-    case FWCOMPS_REG_ACCESS_ERASE_EXEEDED:
-    case FWCOMPS_REG_ACCESS_INTERNAL_ERROR:
-        return (unsigned char*)reg_access_err2str(_lastRegAccessStatus);
-
-    default:
-        if (_lastRegAccessStatus) {
+        case FWCOMPS_MCC_REJECTED_INCOMPATIBLE_FLASH:
+            return (unsigned char*)"The image does not support the device's flash type";
+
+        case FWCOMPS_UNSUPPORTED_DEVICE:
+            return (unsigned char*)"Unsupported device";
+
+        case FWCOMPS_MTCR_OPEN_DEVICE_ERROR:
+            return (unsigned char*)"Failed to open device";
+
+        case FWCOMPS_FAIL_TO_LOCK_FLASH_SEMAPHORE:
+            return (unsigned char*)"Failed to lock flash semaphore";
+
+        case FWCOMPS_FAIL_TO_CREATE_TRM_CONTEXT:
+            return (unsigned char*)"Failed to create TRM context";
+
+        case FWCOMPS_REG_ACCESS_BAD_STATUS_ERR:
+        case FWCOMPS_REG_ACCESS_BAD_METHOD:
+        case FWCOMPS_REG_ACCESS_NOT_SUPPORTED:
+        case FWCOMPS_REG_ACCESS_DEV_BUSY:
+        case FWCOMPS_REG_ACCESS_VER_NOT_SUPP:
+        case FWCOMPS_REG_ACCESS_UNKNOWN_TLV:
+        case FWCOMPS_REG_ACCESS_REG_NOT_SUPP:
+        case FWCOMPS_REG_ACCESS_CLASS_NOT_SUPP:
+        case FWCOMPS_REG_ACCESS_METHOD_NOT_SUPP:
+        case FWCOMPS_REG_ACCESS_BAD_PARAM:
+        case FWCOMPS_REG_ACCESS_RES_NOT_AVLBL:
+        case FWCOMPS_REG_ACCESS_MSG_RECPT_ACK:
+        case FWCOMPS_REG_ACCESS_UNKNOWN_ERR:
+        case FWCOMPS_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
+        case FWCOMPS_REG_ACCESS_CONF_CORRUPT:
+        case FWCOMPS_REG_ACCESS_LEN_TOO_SMALL:
+        case FWCOMPS_REG_ACCESS_BAD_CONFIG:
+        case FWCOMPS_REG_ACCESS_ERASE_EXEEDED:
+        case FWCOMPS_REG_ACCESS_INTERNAL_ERROR:
             return (unsigned char*)reg_access_err2str(_lastRegAccessStatus);
-        }
-        return (unsigned char*)"GENERAL ERROR";
+
+        default:
+            if (_lastRegAccessStatus)
+            {
+                return (unsigned char*)reg_access_err2str(_lastRegAccessStatus);
+            }
+            return (unsigned char*)"GENERAL ERROR";
     }
 }
 
@@ -1986,12 +2008,14 @@ bool FwCompsMgr::lock_flash_semaphore()
 #ifndef UEFI_BUILD
     int rc = 0;
     trm_sts trm_rc = trm_create(&_trm, _mf);
-    if (trm_rc) {
+    if (trm_rc)
+    {
         _lastError = FWCOMPS_FAIL_TO_CREATE_TRM_CONTEXT;
         return false;
     }
     rc = trm_lock(_trm, TRM_RES_FLASH_PROGRAMING, MAX_FLASH_PROG_SEM_RETRY_CNT);
-    if (rc && rc != TRM_STS_RES_NOT_SUPPORTED) {
+    if (rc && rc != TRM_STS_RES_NOT_SUPPORTED)
+    {
         _lastError = FWCOMPS_FAIL_TO_LOCK_FLASH_SEMAPHORE;
         return false;
     }
@@ -2002,7 +2026,8 @@ bool FwCompsMgr::lock_flash_semaphore()
 void FwCompsMgr::unlock_flash_semaphore()
 {
 #ifndef UEFI_BUILD
-    if (_trm != NULL) {
+    if (_trm != NULL)
+    {
         trm_unlock(_trm, TRM_RES_FLASH_PROGRAMING);
         trm_destroy(_trm);
         _trm = NULL;
@@ -2010,19 +2035,19 @@ void FwCompsMgr::unlock_flash_semaphore()
 #endif
 }
 
-
 void FwCompsMgr::deal_with_signal()
 {
 #ifndef UEFI_BUILD
     int sig;
     sig = mft_signal_is_fired();
-    if (sig) {
+    if (sig)
+    {
         unlock_flash_semaphore();
         // reset received signal
         mft_signal_set_fired(0);
         // retore prev handler
         mft_signal_set_handling(0);
-        //raise signal to let the previous handle deal with it.
+        // raise signal to let the previous handle deal with it.
         raise(sig);
     }
     mft_signal_set_handling(0);
@@ -2030,16 +2055,16 @@ void FwCompsMgr::deal_with_signal()
     return;
 }
 
-bool FwCompsMgr::getComponentVersion(FwComponent::comps_ids_t compType,
-                                     bool pending,
-                                     component_version_st *cmpVer)
+bool FwCompsMgr::getComponentVersion(FwComponent::comps_ids_t compType, bool pending, component_version_st* cmpVer)
 {
     std::vector<u_int32_t> imageInfoData;
-    if (!cmpVer) {
+    if (!cmpVer)
+    {
         _lastError = FWCOMPS_BAD_PARAM;
         return false;
     }
-    if (!readComponentInfo(compType, COMPINFO_VERSIONS, imageInfoData, pending)) {
+    if (!readComponentInfo(compType, COMPINFO_VERSIONS, imageInfoData, pending))
+    {
         return false;
     }
     memset(cmpVer, 0, sizeof(component_version_st));
@@ -2050,38 +2075,45 @@ bool FwCompsMgr::getComponentVersion(FwComponent::comps_ids_t compType,
     cmpVer->build_time = _currCompInfo.data.mcqi_version.build_time;
     cmpVer->user_defined_time = _currCompInfo.data.mcqi_version.user_defined_time;
     cmpVer->build_tool_version = _currCompInfo.data.mcqi_version.build_tool_version;
-    if (_currCompInfo.data.mcqi_version.version_string_length) {
-        memcpy(cmpVer->version_string, _currCompInfo.data.mcqi_version.version_string, _currCompInfo.data.mcqi_version.version_string_length);
+    if (_currCompInfo.data.mcqi_version.version_string_length)
+    {
+        memcpy(cmpVer->version_string, _currCompInfo.data.mcqi_version.version_string,
+               _currCompInfo.data.mcqi_version.version_string_length);
         _productVerStr.resize(_currCompInfo.data.mcqi_version.version_string_length);
-        memcpy(_productVerStr.data(), _currCompInfo.data.mcqi_version.version_string, _currCompInfo.data.mcqi_version.version_string_length);
+        memcpy(_productVerStr.data(), _currCompInfo.data.mcqi_version.version_string,
+               _currCompInfo.data.mcqi_version.version_string_length);
     }
     return true;
 }
 
-bool FwCompsMgr::GetComponentLinkxProperties(FwComponent::comps_ids_t compType, component_linkx_st *cmpLinkX)
+bool FwCompsMgr::GetComponentLinkxProperties(FwComponent::comps_ids_t compType, component_linkx_st* cmpLinkX)
 {
     std::vector<u_int32_t> imageInfoData;
-    if (!cmpLinkX) {
+    if (!cmpLinkX)
+    {
         _lastError = FWCOMPS_BAD_PARAM;
         return false;
     }
     _deviceIndex = _linkXDeviceIndex;
 
-    //make MCQS first of all to check if device is present
+    // make MCQS first of all to check if device is present
 
-    comp_query_st * currCompQuery = &(_compsQueryMap[compType]);
+    comp_query_st* currCompQuery = &(_compsQueryMap[compType]);
     u_int32_t componentIndex = currCompQuery->comp_status.component_index;
     comp_status_st query;
-    if (!queryComponentStatus(componentIndex, &query)) {
+    if (!queryComponentStatus(componentIndex, &query))
+    {
         return false;
     }
-    if (query.component_status == 0) {
+    if (query.component_status == 0)
+    {
         printf("Cable %d is not found, please check that cable connected.\n", _deviceIndex - 1);
         _lastError = FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE;
         return false;
     }
 
-    if (!readComponentInfo(compType, COMPINFO_LINKX_PROPERTIES, imageInfoData, false)) {
+    if (!readComponentInfo(compType, COMPINFO_LINKX_PROPERTIES, imageInfoData, false))
+    {
         return false;
     }
     memset(cmpLinkX, 0, sizeof(component_linkx_st));
@@ -2107,41 +2139,51 @@ bool FwCompsMgr::readBlockFromComponent(FwComponent::comps_ids_t compId,
                                         u_int32_t size,
                                         std::vector<u_int8_t>& data)
 {
-    if (!RefreshComponentsStatus()) {
+    if (!RefreshComponentsStatus())
+    {
         return false;
     }
     _currCompQuery = &(_compsQueryMap[compId]);
     _componentIndex = _currCompQuery->comp_status.component_index;
     u_int32_t compSize = _currCompQuery->comp_cap.component_size;
-    if (offset + size > compSize) {
+    if (offset + size > compSize)
+    {
         _lastError = FWCOMPS_READ_OUTSIDE_IMAGE_RANGE;
         return false;
     }
-    if (_currCompQuery->comp_cap.rd_en) {
+    if (_currCompQuery->comp_cap.rd_en)
+    {
         data.resize(size);
-        if (!controlFsm(FSM_CMD_LOCK_UPDATE_HANDLE, FSMST_LOCKED)) {
+        if (!controlFsm(FSM_CMD_LOCK_UPDATE_HANDLE, FSMST_LOCKED))
+        {
             return false;
         }
         control_fsm_args_t fsmReadCommand;
         fsmReadCommand.command = FSM_CMD_READ_PENDING_COMPONENT;
         fsmReadCommand.expectedState = FSMST_UPLOAD;
-        if (!controlFsm(FSM_CMD_READ_PENDING_COMPONENT, FSMST_UPLOAD)) {
+        if (!controlFsm(FSM_CMD_READ_PENDING_COMPONENT, FSMST_UPLOAD))
+        {
             fsmReadCommand.command = FSM_CMD_READ_COMPONENT;
-            if (!controlFsm(FSM_CMD_READ_COMPONENT, FSMST_UPLOAD)) {
+            if (!controlFsm(FSM_CMD_READ_COMPONENT, FSMST_UPLOAD))
+            {
                 _lastError = FWCOMPS_READ_COMP_FAILED;
                 return false;
             }
         }
-        if (!accessComponent(offset, size, (u_int32_t *)(data.data()), MCC_READ_COMP, NULL, &fsmReadCommand)) {
+        if (!accessComponent(offset, size, (u_int32_t*)(data.data()), MCC_READ_COMP, NULL, &fsmReadCommand))
+        {
             return false;
         }
-        if (!controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE)) {
+        if (!controlFsm(FSM_CMD_RELEASE_UPDATE_HANDLE))
+        {
             return false;
         }
     }
-    else {
+    else
+    {
         _lastError = FWCOMPS_READ_COMP_NOT_SUPPORTED;
-        DPRINTF(("readBlockFromComponent : RD EN is 0 for component index %u compId %s \n", _componentIndex, FwComponent::getCompIdStr(compId)));
+        DPRINTF(("readBlockFromComponent : RD EN is 0 for component index %u compId %s \n", _componentIndex,
+                 FwComponent::getCompIdStr(compId)));
         return false;
     }
     return true;
@@ -2153,19 +2195,21 @@ bool FwCompsMgr::fwReactivateImage()
     mirc.status_code = 0;
     int currentIteration = 0;
     int sleepTimeMs = 50;
-    int maxWaitingTime = 30000;//30 sec is enough time
-    int maxNumOfIterations = maxWaitingTime / sleepTimeMs;//600 iterations
+    int maxWaitingTime = 30000;                            // 30 sec is enough time
+    int maxNumOfIterations = maxWaitingTime / sleepTimeMs; // 600 iterations
 
-    if (_mircCaps == false) {
+    if (_mircCaps == false)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FW_NOT_SUPPORTED;
         setLastRegisterAccessStatus(ME_REG_ACCESS_NOT_SUPPORTED);
         return false;
     }
 
     reg_access_status_t rc;
-    rc = reg_access_mirc(_mf, REG_ACCESS_METHOD_SET, &mirc);//send trigger to FW
+    rc = reg_access_mirc(_mf, REG_ACCESS_METHOD_SET, &mirc); // send trigger to FW
     deal_with_signal();
-    if (rc) {
+    if (rc)
+    {
         DPRINTF(("1 reg_access_mirc failed rc = %d\n", rc));
         _lastError = regErrTrans(rc);
         setLastRegisterAccessStatus(rc);
@@ -2174,56 +2218,70 @@ bool FwCompsMgr::fwReactivateImage()
     memset(&mirc, 0, sizeof(mirc));
     msleep(sleepTimeMs);
     rc = reg_access_mirc(_mf, REG_ACCESS_METHOD_GET, &mirc);
-    if (rc) {
+    if (rc)
+    {
         DPRINTF(("2 reg_access_mirc failed rc = %d\n", rc));
         _lastError = regErrTrans(rc);
         return false;
     }
     DPRINTF(("1 mirc.status_code = %d\n", mirc.status_code));
-    while (mirc.status_code == IMAGE_REACTIVATION_BUSY) {
+    while (mirc.status_code == IMAGE_REACTIVATION_BUSY)
+    {
         msleep(sleepTimeMs);
         rc = reg_access_mirc(_mf, REG_ACCESS_METHOD_GET, &mirc);
         deal_with_signal();
-        if (rc) {
+        if (rc)
+        {
             _lastError = regErrTrans(rc);
             setLastRegisterAccessStatus(rc);
             DPRINTF(("3 reg_access_mirc failed rc = %d\n", rc));
             return false;
         }
         DPRINTF(("2 iteration %d mirc.status_code = %d\n", currentIteration++, mirc.status_code));
-        if (currentIteration >= maxNumOfIterations) {
+        if (currentIteration >= maxNumOfIterations)
+        {
             _lastError = FWCOMPS_IMAGE_REACTIVATION_WAITING_TIME_EXPIRED;
             return false;
         }
     }
-    if (mirc.status_code == IMAGE_REACTIVATION_SUCCESS) {
+    if (mirc.status_code == IMAGE_REACTIVATION_SUCCESS)
+    {
         return true;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_FIRST_PAGE_COPY_FAILED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_FIRST_PAGE_COPY_FAILED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_COPY_FAILED;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED;
     }
-    else if (mirc.status_code == IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED) {
+    else if (mirc.status_code == IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED)
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED;
     }
-    else {
+    else
+    {
         _lastError = FWCOMPS_IMAGE_REACTIVATION_UNKNOWN_ERROR;
     }
     return false;
@@ -2240,72 +2298,74 @@ void FwCompsMgr::setLastRegisterAccessStatus(reg_access_status_t err)
 
 fw_comps_error_t FwCompsMgr::regErrTrans(reg_access_status_t err)
 {
-    if (err != ME_REG_ACCESS_OK) {
-        DPRINTF(("%s error - %d\n",__FUNCTION__, err));
+    if (err != ME_REG_ACCESS_OK)
+    {
+        DPRINTF(("%s error - %d\n", __FUNCTION__, err));
     }
-    switch (err) {
-    case ME_REG_ACCESS_OK:
-        return FWCOMPS_REG_ACCESS_OK;
+    switch (err)
+    {
+        case ME_REG_ACCESS_OK:
+            return FWCOMPS_REG_ACCESS_OK;
 
-    case ME_REG_ACCESS_BAD_STATUS_ERR:
-        return FWCOMPS_REG_ACCESS_BAD_STATUS_ERR;
+        case ME_REG_ACCESS_BAD_STATUS_ERR:
+            return FWCOMPS_REG_ACCESS_BAD_STATUS_ERR;
 
-    case ME_REG_ACCESS_BAD_METHOD:
-        return FWCOMPS_REG_ACCESS_BAD_STATUS_ERR;
+        case ME_REG_ACCESS_BAD_METHOD:
+            return FWCOMPS_REG_ACCESS_BAD_STATUS_ERR;
 
-    case ME_REG_ACCESS_NOT_SUPPORTED:
-        return FWCOMPS_REG_ACCESS_NOT_SUPPORTED;
+        case ME_REG_ACCESS_NOT_SUPPORTED:
+            return FWCOMPS_REG_ACCESS_NOT_SUPPORTED;
 
-    case ME_REG_ACCESS_DEV_BUSY:
-        return FWCOMPS_REG_ACCESS_DEV_BUSY;
+        case ME_REG_ACCESS_DEV_BUSY:
+            return FWCOMPS_REG_ACCESS_DEV_BUSY;
 
-    case ME_REG_ACCESS_VER_NOT_SUPP:
-        return FWCOMPS_REG_ACCESS_VER_NOT_SUPP;
+        case ME_REG_ACCESS_VER_NOT_SUPP:
+            return FWCOMPS_REG_ACCESS_VER_NOT_SUPP;
 
-    case ME_REG_ACCESS_UNKNOWN_TLV:
-        return FWCOMPS_REG_ACCESS_UNKNOWN_TLV;
+        case ME_REG_ACCESS_UNKNOWN_TLV:
+            return FWCOMPS_REG_ACCESS_UNKNOWN_TLV;
 
-    case ME_REG_ACCESS_REG_NOT_SUPP:
-        return FWCOMPS_REG_ACCESS_REG_NOT_SUPP;
+        case ME_REG_ACCESS_REG_NOT_SUPP:
+            return FWCOMPS_REG_ACCESS_REG_NOT_SUPP;
 
-    case ME_REG_ACCESS_CLASS_NOT_SUPP:
-        return FWCOMPS_REG_ACCESS_CLASS_NOT_SUPP;
+        case ME_REG_ACCESS_CLASS_NOT_SUPP:
+            return FWCOMPS_REG_ACCESS_CLASS_NOT_SUPP;
 
-    case ME_REG_ACCESS_METHOD_NOT_SUPP:
-        return FWCOMPS_REG_ACCESS_METHOD_NOT_SUPP;
+        case ME_REG_ACCESS_METHOD_NOT_SUPP:
+            return FWCOMPS_REG_ACCESS_METHOD_NOT_SUPP;
 
-    case ME_REG_ACCESS_BAD_PARAM:
-        return FWCOMPS_REG_ACCESS_BAD_PARAM;
+        case ME_REG_ACCESS_BAD_PARAM:
+            return FWCOMPS_REG_ACCESS_BAD_PARAM;
 
-    case ME_REG_ACCESS_RES_NOT_AVLBL:
-        return FWCOMPS_REG_ACCESS_RES_NOT_AVLBL;
+        case ME_REG_ACCESS_RES_NOT_AVLBL:
+            return FWCOMPS_REG_ACCESS_RES_NOT_AVLBL;
 
-    case ME_REG_ACCESS_MSG_RECPT_ACK:
-        return FWCOMPS_REG_ACCESS_MSG_RECPT_ACK;
+        case ME_REG_ACCESS_MSG_RECPT_ACK:
+            return FWCOMPS_REG_ACCESS_MSG_RECPT_ACK;
 
-    case ME_REG_ACCESS_UNKNOWN_ERR:
-        return FWCOMPS_REG_ACCESS_UNKNOWN_ERR;
+        case ME_REG_ACCESS_UNKNOWN_ERR:
+            return FWCOMPS_REG_ACCESS_UNKNOWN_ERR;
 
-    case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
-        return FWCOMPS_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;
+        case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
+            return FWCOMPS_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;
 
-    case ME_REG_ACCESS_CONF_CORRUPT:
-        return FWCOMPS_REG_ACCESS_CONF_CORRUPT;
+        case ME_REG_ACCESS_CONF_CORRUPT:
+            return FWCOMPS_REG_ACCESS_CONF_CORRUPT;
 
-    case ME_REG_ACCESS_LEN_TOO_SMALL:
-        return FWCOMPS_REG_ACCESS_CONF_CORRUPT;
+        case ME_REG_ACCESS_LEN_TOO_SMALL:
+            return FWCOMPS_REG_ACCESS_CONF_CORRUPT;
 
-    case ME_REG_ACCESS_BAD_CONFIG:
-        return FWCOMPS_REG_ACCESS_BAD_CONFIG;
+        case ME_REG_ACCESS_BAD_CONFIG:
+            return FWCOMPS_REG_ACCESS_BAD_CONFIG;
 
-    case ME_REG_ACCESS_ERASE_EXEEDED:
-        return FWCOMPS_REG_ACCESS_ERASE_EXEEDED;
+        case ME_REG_ACCESS_ERASE_EXEEDED:
+            return FWCOMPS_REG_ACCESS_ERASE_EXEEDED;
 
-    case ME_REG_ACCESS_INTERNAL_ERROR:
-        return FWCOMPS_REG_ACCESS_INTERNAL_ERROR;
+        case ME_REG_ACCESS_INTERNAL_ERROR:
+            return FWCOMPS_REG_ACCESS_INTERNAL_ERROR;
 
-    default:
-        return FWCOMPS_GENERAL_ERR;
+        default:
+            return FWCOMPS_GENERAL_ERR;
     }
 }
 
@@ -2316,77 +2376,78 @@ fw_comps_error_t FwCompsMgr::mccErrTrans(u_int8_t err)
         DPRINTF(("\nMCC ERROR: %x\n", err));
     }
 
-    switch (err) {
-    case MCC_ERRCODE_OK:
-        return FWCOMPS_SUCCESS;
+    switch (err)
+    {
+        case MCC_ERRCODE_OK:
+            return FWCOMPS_SUCCESS;
 
-    case MCC_ERRCODE_ERROR:
-        return FWCOMPS_MCC_ERR_ERROR;
+        case MCC_ERRCODE_ERROR:
+            return FWCOMPS_MCC_ERR_ERROR;
 
-    case MCC_ERRCODE_REJECTED_DIGEST_ERR:
-        return FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR;
+        case MCC_ERRCODE_REJECTED_DIGEST_ERR:
+            return FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR;
 
-    case MCC_ERRCODE_REJECTED_NOT_APPLICABLE:
-        return FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE;
+        case MCC_ERRCODE_REJECTED_NOT_APPLICABLE:
+            return FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE;
 
-    case MCC_ERRCODE_REJECTED_UNKNOWN_KEY:
-        return FWCOMPS_MCC_ERR_REJECTED_UNKNOWN_KEY;
+        case MCC_ERRCODE_REJECTED_UNKNOWN_KEY:
+            return FWCOMPS_MCC_ERR_REJECTED_UNKNOWN_KEY;
 
-    case MCC_ERRCODE_REJECTED_AUTH_FAILED:
-        return FWCOMPS_MCC_ERR_REJECTED_AUTH_FAILED;
+        case MCC_ERRCODE_REJECTED_AUTH_FAILED:
+            return FWCOMPS_MCC_ERR_REJECTED_AUTH_FAILED;
 
-    case MCC_ERRCODE_REJECTED_UNSIGNED:
-        return FWCOMPS_MCC_ERR_REJECTED_UNSIGNED;
+        case MCC_ERRCODE_REJECTED_UNSIGNED:
+            return FWCOMPS_MCC_ERR_REJECTED_UNSIGNED;
 
-    case MCC_ERRCODE_REJECTED_KEY_NOT_APPLICABLE:
-        return FWCOMPS_MCC_ERR_REJECTED_KEY_NOT_APPLICABLE;
+        case MCC_ERRCODE_REJECTED_KEY_NOT_APPLICABLE:
+            return FWCOMPS_MCC_ERR_REJECTED_KEY_NOT_APPLICABLE;
 
-    case MCC_ERRCODE_REJECTED_BAD_FORMAT:
-        return FWCOMPS_MCC_ERR_REJECTED_BAD_FORMAT;
+        case MCC_ERRCODE_REJECTED_BAD_FORMAT:
+            return FWCOMPS_MCC_ERR_REJECTED_BAD_FORMAT;
 
-    case MCC_ERRCODE_BLOCKED_PENDING_RESET:
-        return FWCOMPS_MCC_ERR_BLOCKED_PENDING_RESET;
+        case MCC_ERRCODE_BLOCKED_PENDING_RESET:
+            return FWCOMPS_MCC_ERR_BLOCKED_PENDING_RESET;
 
-    case MCC_ERRCODE_REJECTED_NOT_A_SECURED_FW:
-        return FWCOMPS_MCC_REJECTED_NOT_A_SECURED_FW;
+        case MCC_ERRCODE_REJECTED_NOT_A_SECURED_FW:
+            return FWCOMPS_MCC_REJECTED_NOT_A_SECURED_FW;
 
-    case MCC_ERRCODE_REJECTED_MFG_BASE_MAC_NOT_LISTED:
-        return FWCOMPS_MCC_REJECTED_MFG_BASE_MAC_NOT_LISTED;
+        case MCC_ERRCODE_REJECTED_MFG_BASE_MAC_NOT_LISTED:
+            return FWCOMPS_MCC_REJECTED_MFG_BASE_MAC_NOT_LISTED;
 
-    case MCC_ERRCODE_REJECTED_NO_DEBUG_TOKEN:
-        return FWCOMPS_MCC_REJECTED_NO_DEBUG_TOKEN;
+        case MCC_ERRCODE_REJECTED_NO_DEBUG_TOKEN:
+            return FWCOMPS_MCC_REJECTED_NO_DEBUG_TOKEN;
 
-    case MCC_ERRCODE_REJECTED_VERSION_NUM_MISMATCH:
-        return FWCOMPS_MCC_REJECTED_VERSION_NUM_MISMATCH;
+        case MCC_ERRCODE_REJECTED_VERSION_NUM_MISMATCH:
+            return FWCOMPS_MCC_REJECTED_VERSION_NUM_MISMATCH;
 
-    case MCC_ERRCODE_REJECTED_USER_TIMESTAMP_MISMATCH:
-        return FWCOMPS_MCC_REJECTED_USER_TIMESTAMP_MISMATCH;
+        case MCC_ERRCODE_REJECTED_USER_TIMESTAMP_MISMATCH:
+            return FWCOMPS_MCC_REJECTED_USER_TIMESTAMP_MISMATCH;
 
-    case MCC_ERRCODE_REJECTED_FORBIDDEN_VERSION:
-        return FWCOMPS_MCC_REJECTED_FORBIDDEN_VERSION;
+        case MCC_ERRCODE_REJECTED_FORBIDDEN_VERSION:
+            return FWCOMPS_MCC_REJECTED_FORBIDDEN_VERSION;
 
-    case MCC_ERRCODE_FLASH_ERASE_ERROR:
-        return FWCOMPS_MCC_FLASH_ERASE_ERROR;
+        case MCC_ERRCODE_FLASH_ERASE_ERROR:
+            return FWCOMPS_MCC_FLASH_ERASE_ERROR;
 
-    case MCC_ERRCODE_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION:
-        return FWCOMPS_MCC_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION;
+        case MCC_ERRCODE_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION:
+            return FWCOMPS_MCC_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION;
 
-    case MCC_ERRCODE_REJECTED_LINKX_TYPE_NOT_SUPPORTED:
-        return FWCOMPS_MCC_REJECTED_LINKX_TYPE_NOT_SUPPORTED;
+        case MCC_ERRCODE_REJECTED_LINKX_TYPE_NOT_SUPPORTED:
+            return FWCOMPS_MCC_REJECTED_LINKX_TYPE_NOT_SUPPORTED;
 
-    case MCC_ERRCODE_REJECTED_HOST_STORAGE_IN_USE:
-        return FWCOMPS_MCC_REJECTED_HOST_STORAGE_IN_USE;
+        case MCC_ERRCODE_REJECTED_HOST_STORAGE_IN_USE:
+            return FWCOMPS_MCC_REJECTED_HOST_STORAGE_IN_USE;
 
-    case MCC_ERRCODE_REJECTED_LINKX_TRANSFER:
-        return FWCOMPS_MCC_REJECTED_LINKX_TRANSFER;
+        case MCC_ERRCODE_REJECTED_LINKX_TRANSFER:
+            return FWCOMPS_MCC_REJECTED_LINKX_TRANSFER;
 
-    case MCC_ERRCODE_REJECTED_LINKX_ACTIVATE:
-        return FWCOMPS_MCC_REJECTED_LINKX_ACTIVATE;
+        case MCC_ERRCODE_REJECTED_LINKX_ACTIVATE:
+            return FWCOMPS_MCC_REJECTED_LINKX_ACTIVATE;
 
-    case MCC_ERRCODE_REJECTED_INCOMPATIBLE_FLASH:
-        return FWCOMPS_MCC_REJECTED_INCOMPATIBLE_FLASH;
+        case MCC_ERRCODE_REJECTED_INCOMPATIBLE_FLASH:
+            return FWCOMPS_MCC_REJECTED_INCOMPATIBLE_FLASH;
 
-    default:
-        return FWCOMPS_GENERAL_ERR;
+        default:
+            return FWCOMPS_GENERAL_ERR;
     }
 }
diff --git a/fw_comps_mgr/fw_comps_mgr.h b/fw_comps_mgr/fw_comps_mgr.h
index 3c725184..65ca3a2a 100644
--- a/fw_comps_mgr/fw_comps_mgr.h
+++ b/fw_comps_mgr/fw_comps_mgr.h
@@ -31,13 +31,13 @@
  * SOFTWARE.
  *
  */
- /*
-  * fw_comps_mgr.h
-  *
-  *
-  *  Created on: Jul 31, 2016
-  *      Author: adham
-  */
+/*
+ * fw_comps_mgr.h
+ *
+ *
+ *  Created on: Jul 31, 2016
+ *      Author: adham
+ */
 #ifndef USER_MLXFWOPS_LIB_FW_COMPS_MGR_H_
 #define USER_MLXFWOPS_LIB_FW_COMPS_MGR_H_
 
@@ -58,9 +58,18 @@ using namespace std;
 #define MAX_REG_DATA 128
 
 #ifndef UEFI_BUILD
-#define DPRINTF(args)        do { char *reacDebug = getenv("FW_COMPS_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("%s:%d: ",__FILE__, __LINE__); printf args; fflush(stdout);} } while (0)
+#define DPRINTF(args)                               \
+    do                                              \
+    {                                               \
+        char* reacDebug = getenv("FW_COMPS_DEBUG"); \
+        if (reacDebug != NULL)                      \
+        {                                           \
+            printf("\33[2K\r");                     \
+            printf("%s:%d: ", __FILE__, __LINE__);  \
+            printf args;                            \
+            fflush(stdout);                         \
+        }                                           \
+    } while (0)
 #else
 #define DPRINTF(...)
 #endif
@@ -74,29 +83,33 @@ typedef struct reg_access_hca_mgir mgirReg;
 typedef struct reg_access_hca_mcqi_version component_version_st;
 typedef struct reg_access_hca_mcqi_linkx_properties component_linkx_st;
 
-typedef int(*ProgressFunc) (int completion);
+typedef int (*ProgressFunc)(int completion);
 
 typedef f_prog_func_adv_st ProgressCallBackAdvSt;
 
-struct uid_entry {
+struct uid_entry
+{
     u_int8_t num_allocated;
     u_int64_t uid;
 };
 
-typedef struct {
+typedef struct
+{
     u_int8_t type;
     u_int8_t arch;
     reg_access_hca_rom_version version;
 } mgirRomInfo;
 
-typedef struct {
+typedef struct
+{
     u_int8_t secure_fw;
     u_int8_t signed_fw;
     u_int8_t debug_fw;
     u_int8_t dev_fw;
 } security_fw_t;
 
-typedef struct {
+typedef struct
+{
     component_version_st pending_fw_version;
     component_version_st running_fw_version;
     component_linkx_st linkx_data;
@@ -124,23 +137,27 @@ typedef struct {
 
 } fwInfoT;
 
-typedef struct {
+typedef struct
+{
     comp_status_st comp_status;
     comp_cap_st comp_cap;
     int valid;
 } comp_query_st;
 
-typedef enum {
+typedef enum
+{
     MCC_READ_COMP = 0x0,
     MCC_WRITE_COMP
 } access_type_t;
 
-typedef struct mac_guid {
+typedef struct mac_guid
+{
     guid_t mac;
     guid_t guid;
 } mac_guid_t;
 
-typedef enum {
+typedef enum
+{
     COMPINFO_CAPABILITIES = 0,
     COMPINFO_VERSIONS = 1,
     COMPINFO_PUBLIC_KEYS = 2,
@@ -149,10 +166,11 @@ typedef enum {
     COMPINFO_LINKX_PROPERTIES = 6
 } comp_info_t;
 
-class FwComponent {
+class FwComponent
+{
 public:
-
-    typedef enum {
+    typedef enum
+    {
         COMPID_BOOT_IMG = 0x1,
         COMPID_RUNTIME_IMG = 0x2,
         COMPID_USER_NVCONFIG = 0x3,
@@ -170,48 +188,46 @@ class FwComponent {
         COMPID_UNKNOWN = 0xff,
     } comps_ids_t;
 
-    typedef enum {
-        COMPSTAT_NOT_PRESENT   = 0x0,
-        COMPSTAT_PRESENT       = 0x1,
-        COMPSTAT_IN_USE        = 0x2,
-        COMPSTAT_UNKNOWN       = 0xff
+    typedef enum
+    {
+        COMPSTAT_NOT_PRESENT = 0x0,
+        COMPSTAT_PRESENT = 0x1,
+        COMPSTAT_IN_USE = 0x2,
+        COMPSTAT_UNKNOWN = 0xff
     } comps_status_t;
 
-    FwComponent() : _size(0), _type(COMPID_UNKNOWN), _componentIndex(0xffffffff), _initialized(false),
-        _status(COMPSTAT_UNKNOWN) {};
-    FwComponent(comps_ids_t compId) : _size(0), _type(compId), _componentIndex(0xffffffff),
-        _initialized(false), _status(COMPSTAT_UNKNOWN) {};
-    FwComponent(comps_ids_t compId, comps_status_t compStat) : _size(0), _type(compId), _componentIndex(0xffffffff),
-        _initialized(false), _status(compStat) {};
-    ~FwComponent() {};
-
-    bool        init(const std::vector<u_int8_t>&  buff,
-                     u_int32_t size,
-                     comps_ids_t type,
-                     u_int32_t idx = 0xffffffff);
-    std::vector<u_int8_t>&   getData()   { return _data; };
-    u_int32_t                getSize()   { return _size; };
-    comps_ids_t              getType()   { return _type; };
-    comps_status_t           getStatus() { return _status; };
-
-    void                    setData(const std::vector<u_int8_t>&  buff) { _data = buff; };
-    void                    setSize(u_int32_t size) { _size = size; };
-    void                    setType(comps_ids_t compId) { _type = compId; };
-    void                    setStatus(comps_status_t compStat) { _status = compStat; };
-
-    static const char*       getCompIdStr(comps_ids_t compId);
+    FwComponent() :
+        _size(0), _type(COMPID_UNKNOWN), _componentIndex(0xffffffff), _initialized(false), _status(COMPSTAT_UNKNOWN){};
+    FwComponent(comps_ids_t compId) :
+        _size(0), _type(compId), _componentIndex(0xffffffff), _initialized(false), _status(COMPSTAT_UNKNOWN){};
+    FwComponent(comps_ids_t compId, comps_status_t compStat) :
+        _size(0), _type(compId), _componentIndex(0xffffffff), _initialized(false), _status(compStat){};
+    ~FwComponent(){};
+
+    bool init(const std::vector<u_int8_t>& buff, u_int32_t size, comps_ids_t type, u_int32_t idx = 0xffffffff);
+    std::vector<u_int8_t>& getData() { return _data; };
+    u_int32_t getSize() { return _size; };
+    comps_ids_t getType() { return _type; };
+    comps_status_t getStatus() { return _status; };
+
+    void setData(const std::vector<u_int8_t>& buff) { _data = buff; };
+    void setSize(u_int32_t size) { _size = size; };
+    void setType(comps_ids_t compId) { _type = compId; };
+    void setStatus(comps_status_t compStat) { _status = compStat; };
+
+    static const char* getCompIdStr(comps_ids_t compId);
 
 private:
-    std::vector<u_int8_t>   _data;
+    std::vector<u_int8_t> _data;
     u_int32_t _size;
     comps_ids_t _type;
     u_int32_t _componentIndex;
     bool _initialized;
     comps_status_t _status;
-
 };
 
-typedef enum {
+typedef enum
+{
     FWCOMPS_SUCCESS = 0x0,
     FWCOMPS_INFO_TYPE_NOT_SUPPORTED,
     FWCOMPS_COMP_NOT_SUPPORTED,
@@ -233,7 +249,7 @@ typedef enum {
     FWCOMPS_FAIL_TO_LOCK_FLASH_SEMAPHORE,
     FWCOMPS_VERIFY_FAILED,
 
-    //MCC Return codes
+    // MCC Return codes
     FWCOMPS_MCC_ERR_CODES = 0x100,
     FWCOMPS_MCC_ERR_ERROR = 0x101,
     FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR = 0x102,
@@ -296,22 +312,22 @@ typedef enum {
     FWCOMPS_IMAGE_REACTIVATION_WAITING_TIME_EXPIRED
 } fw_comps_error_t;
 
-
-typedef enum {
+typedef enum
+{
     FSM_QUERY = 0,
-    FSM_CMD_LOCK_UPDATE_HANDLE          = 0x1,
-    FSM_CMD_RELEASE_UPDATE_HANDLE       = 0x2,
-    FSM_CMD_UPDATE_COMPONENT            = 0x3,
-    FSM_CMD_VERIFY_COMPONENT            = 0x4,
-    FSM_CMD_ACTIVATE_COMPONENET         = 0x5,
-    FSM_CMD_ACTIVATE_ALL                = 0x6,
-    FSM_CMD_READ_COMPONENT              = 0x7,
-    FSM_CMD_CANCEL                      = 0x8,
-    FSM_CMD_CHECK_UPDATE_HANDLE         = 0x9,
-    FSM_CMD_FORCE_HANDLE_RELEASE        = 0xA,
-    FSM_CMD_READ_PENDING_COMPONENT      = 0xB,
-    FSM_CMD_DOWNSTREAM_DEVICE_TRANSFER  = 0xC,
-    FSM_CMD_UNDEFINED                   = 0xFF,
+    FSM_CMD_LOCK_UPDATE_HANDLE = 0x1,
+    FSM_CMD_RELEASE_UPDATE_HANDLE = 0x2,
+    FSM_CMD_UPDATE_COMPONENT = 0x3,
+    FSM_CMD_VERIFY_COMPONENT = 0x4,
+    FSM_CMD_ACTIVATE_COMPONENET = 0x5,
+    FSM_CMD_ACTIVATE_ALL = 0x6,
+    FSM_CMD_READ_COMPONENT = 0x7,
+    FSM_CMD_CANCEL = 0x8,
+    FSM_CMD_CHECK_UPDATE_HANDLE = 0x9,
+    FSM_CMD_FORCE_HANDLE_RELEASE = 0xA,
+    FSM_CMD_READ_PENDING_COMPONENT = 0xB,
+    FSM_CMD_DOWNSTREAM_DEVICE_TRANSFER = 0xC,
+    FSM_CMD_UNDEFINED = 0xFF,
 } fsm_command_t;
 
 typedef enum
@@ -320,7 +336,7 @@ typedef enum
     FMPT_SECOND_PAGE,
     FMPT_MAILBOX_PAGE,
     FMPT_ALLOCATED_LIST_LENGTH
-}fsm_memory_page_index_t;
+} fsm_memory_page_index_t;
 
 typedef enum
 {
@@ -328,13 +344,14 @@ typedef enum
     FFS_FW_BUSY = 1,
     FFS_FW_OK,
     FFS_FW_ERROR
-}fsm_fw_status_t;
+} fsm_fw_status_t;
 
 class AbstractComponentAccess;
-class FwCompsMgr {
+class FwCompsMgr
+{
 public:
-
-    typedef enum {
+    typedef enum
+    {
         MQIS_REGISTER_FIRST_VALUE = 1,
         MQIS_REGISTER_DEVICE_NAME = MQIS_REGISTER_FIRST_VALUE,
         MQIS_REGISTER_DEVICE_DESCRIPTION_INFO = 2,
@@ -344,77 +361,92 @@ class FwCompsMgr {
         MQIS_REGISTER_LAST_VALUE = MQIS_REGISTER_ROM_INFO
     } MQISDeviceDescriptionT;
 
-    typedef enum {
+    typedef enum
+    {
         DEVICE_HCA_SWITCH = 0,
         DEVICE_GEARBOX = 1
     } DeviceTypeT;
 
-    FwCompsMgr(const char *devname, DeviceTypeT devType = DEVICE_HCA_SWITCH, int deviceIndex = 0);
-    FwCompsMgr(mfile *mf, DeviceTypeT devType = DEVICE_HCA_SWITCH, int deviceIndex = 0);
-    FwCompsMgr(uefi_Dev_t *uefi_dev, uefi_dev_extra_t *uefi_extra);
+    FwCompsMgr(const char* devname, DeviceTypeT devType = DEVICE_HCA_SWITCH, int deviceIndex = 0);
+    FwCompsMgr(mfile* mf, DeviceTypeT devType = DEVICE_HCA_SWITCH, int deviceIndex = 0);
+    FwCompsMgr(uefi_Dev_t* uefi_dev, uefi_dev_extra_t* uefi_extra);
     virtual ~FwCompsMgr();
 
-    u_int32_t        getFwSupport();
-    mfile*           getMfileObj() { return _mf; };
-    bool    fwReactivateImage();
-    bool    burnComponents(std::vector<FwComponent>& comps,
-                           ProgressCallBackAdvSt *progressFuncAdv = (ProgressCallBackAdvSt *)NULL);
-    bool    getFwComponents(std::vector<FwComponent>& comps, bool readEn = false);
-    bool    readComponent(FwComponent::comps_ids_t compType,
-                          FwComponent& fwComp,
-                          bool readPending = false,
-                          ProgressCallBackAdvSt *progressFuncAdv = (ProgressCallBackAdvSt *)NULL);
-    bool    queryFwInfo(fwInfoT *query, bool next_boot_fw_ver = false);
-    bool    forceRelease();
+    u_int32_t getFwSupport();
+    mfile* getMfileObj() { return _mf; };
+    bool fwReactivateImage();
+    bool burnComponents(std::vector<FwComponent>& comps,
+                        ProgressCallBackAdvSt* progressFuncAdv = (ProgressCallBackAdvSt*)NULL);
+    bool getFwComponents(std::vector<FwComponent>& comps, bool readEn = false);
+    bool readComponent(FwComponent::comps_ids_t compType,
+                       FwComponent& fwComp,
+                       bool readPending = false,
+                       ProgressCallBackAdvSt* progressFuncAdv = (ProgressCallBackAdvSt*)NULL);
+    bool queryFwInfo(fwInfoT* query, bool next_boot_fw_ver = false);
+    bool forceRelease();
     fw_comps_error_t getLastError() { return _lastError; };
-    unsigned char*      getLastErrMsg();
-    bool    readBlockFromComponent(FwComponent::comps_ids_t compId,
-                                   u_int32_t offset,
-                                   u_int32_t size,
-                                   std::vector<u_int8_t>& data);
-    bool    setMacsGuids(mac_guid_t macGuid);
-    bool    getDeviceHWInfo(FwCompsMgr::MQISDeviceDescriptionT op,
-                            vector<u_int8_t>& infoString);
-    void    deal_with_signal();
-    void   setLastFirmwareError(fw_comps_error_t fw_error);
-    void   setLastRegisterAccessStatus(reg_access_status_t err);
+    unsigned char* getLastErrMsg();
+    bool readBlockFromComponent(FwComponent::comps_ids_t compId,
+                                u_int32_t offset,
+                                u_int32_t size,
+                                std::vector<u_int8_t>& data);
+    bool setMacsGuids(mac_guid_t macGuid);
+    bool getDeviceHWInfo(FwCompsMgr::MQISDeviceDescriptionT op, vector<u_int8_t>& infoString);
+    void deal_with_signal();
+    void setLastFirmwareError(fw_comps_error_t fw_error);
+    void setLastRegisterAccessStatus(reg_access_status_t err);
     fw_comps_error_t mccErrTrans(u_int8_t err);
     fw_comps_error_t regErrTrans(reg_access_status_t err);
     bool lock_flash_semaphore();
     void unlock_flash_semaphore();
-    void SetIndexAndSize(int deviceIndex, int deviceSize, bool autoUpdate = false, bool activationNeeded = true, bool downloadTransferNeeded = true, int activate_delay_sec = 0);
+    void SetIndexAndSize(int deviceIndex,
+                         int deviceSize,
+                         bool autoUpdate = false,
+                         bool activationNeeded = true,
+                         bool downloadTransferNeeded = true,
+                         int activate_delay_sec = 0);
     bool RefreshComponentsStatus(comp_status_st* ComponentStatus = NULL);
-    bool GetComponentLinkxProperties(FwComponent::comps_ids_t compType, component_linkx_st *cmpLinkX);
+    bool GetComponentLinkxProperties(FwComponent::comps_ids_t compType, component_linkx_st* cmpLinkX);
     void GenerateHandle();
     bool isMCDDSupported() { return isDmaSupported; };
-private:
 
-    typedef enum {
-        FSMST_IDLE                          = 0x0,
-        FSMST_LOCKED                        = 0x1,
-        FSMST_INITIALIZE                    = 0x2,
-        FSMST_DOWNLOAD                      = 0x3,
-        FSMST_VERIFY                        = 0x4,
-        FSMST_APPLY                         = 0x5,
-        FSMST_ACTIVATE                      = 0x6,
-        FSMST_UPLOAD                        = 0x7,
-        FSMST_UPLOAD_PENDING                = 0x8,
-        FSMST_DOWNSTREAM_DEVICE_TRANSFER    = 0x9,
-        FSMST_NA                            = 0xFF,
+private:
+    typedef enum
+    {
+        FSMST_IDLE = 0x0,
+        FSMST_LOCKED = 0x1,
+        FSMST_INITIALIZE = 0x2,
+        FSMST_DOWNLOAD = 0x3,
+        FSMST_VERIFY = 0x4,
+        FSMST_APPLY = 0x5,
+        FSMST_ACTIVATE = 0x6,
+        FSMST_UPLOAD = 0x7,
+        FSMST_UPLOAD_PENDING = 0x8,
+        FSMST_DOWNSTREAM_DEVICE_TRANSFER = 0x9,
+        FSMST_NA = 0xFF,
     } fsm_state_t;
 
-    typedef struct control_fsm_args {
-        control_fsm_args() : command(FSM_CMD_UNDEFINED), expectedState(FSMST_NA), size(0),
-            currentState(FSMST_NA), progressFuncAdv(NULL), reg_access_timeout(0) {}
+    typedef struct control_fsm_args
+    {
+        control_fsm_args() :
+            command(FSM_CMD_UNDEFINED),
+            expectedState(FSMST_NA),
+            size(0),
+            currentState(FSMST_NA),
+            progressFuncAdv(NULL),
+            reg_access_timeout(0)
+        {
+        }
         fsm_command_t command;
         fsm_state_t expectedState;
         u_int32_t size;
         fsm_state_t currentState;
-        ProgressCallBackAdvSt *progressFuncAdv;
+        ProgressCallBackAdvSt* progressFuncAdv;
         u_int32_t reg_access_timeout;
     } control_fsm_args_t;
 
-    typedef enum {
+    typedef enum
+    {
         MCC_ERRCODE_OK = 0x0,
         MCC_ERRCODE_ERROR = 0x1,
         MCC_ERRCODE_REJECTED_DIGEST_ERR = 0x2,
@@ -440,7 +472,8 @@ class FwCompsMgr {
         MCC_ERRCODE_REJECTED_INCOMPATIBLE_FLASH = 0x16
     } mcc_command_error_t;
 
-    typedef enum {
+    typedef enum
+    {
         IMAGE_REACTIVATION_SUCCESS = 0,
         IMAGE_REACTIVATION_BUSY = 1,
         IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR = 2,
@@ -451,74 +484,68 @@ class FwCompsMgr {
         IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED = 7,
         IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED = 8,
         IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED = 9
-    }image_reactivation_command_error_t;
+    } image_reactivation_command_error_t;
 
     const char* stateToStr(fsm_state_t);
     const char* commandToStr(fsm_command_t cmd);
 
-    void          initialize(mfile *mf);
-
-
-
-    bool          accessComponent(u_int32_t offset,
-                                  u_int32_t size,
-                                  u_int32_t data[],
-                                  access_type_t access,
-                                  ProgressCallBackAdvSt *progressFuncAdv = (ProgressCallBackAdvSt *)NULL,
-                                  control_fsm_args_t* lastFsmCommandArgs = NULL);
-
-    bool           queryComponentStatus(u_int32_t componentIndex,
-                                       comp_status_st *query);
-
-    bool    getComponentVersion(FwComponent::comps_ids_t compType,
-        bool pending,
-        component_version_st *cmpVer);
-    
-    bool           controlFsm(fsm_command_t command,
-                              fsm_state_t expectedState = FSMST_NA,
-                              u_int32_t size = 0,
-                              fsm_state_t currentState = FSMST_NA,
-                              ProgressCallBackAdvSt *progressFuncAdv = (ProgressCallBackAdvSt *)NULL,
-                              u_int32_t reg_access_timeout = 0);
-
-    bool           queryComponentInfo(u_int32_t componentIndex,
-                                      u_int8_t readPending,
-                                      u_int32_t infoType,
-                                      u_int32_t dataSize,
-                                      u_int32_t *data);
-
-    bool           runMCQI(u_int32_t componentIndex,
-                           u_int8_t readPending,
-                           u_int32_t infoType,
-                           u_int32_t dataSize,
-                           u_int32_t offset,
-                           u_int32_t *data);
-
-    bool          runNVDA(std::vector<u_int8_t>& buff,
-                          u_int16_t len,
-                          u_int32_t tlvType,
-                          reg_access_method_t method,
-                          bool queryDefault);
-
-    bool           readComponentInfo(FwComponent::comps_ids_t compType,
-                                     comp_info_t infoType,
-                                     std::vector<u_int32_t>& retData,
-                                     bool readPending = false);
-
-    void           getInfoAsVersion(std::vector<u_int32_t>& infoData,
-                                    component_version_st *cmpVer);
-
-    reg_access_status_t getGI(mfile *mf, mgirReg *gi);
-    bool           extractMacsGuids(fwInfoT *fwQuery);
-    void           extractRomInfo(mgirReg *mgir, fwInfoT *fwQuery);
-    bool           isDMAAccess();
-    bool           fallbackToRegisterAccess();
-    
+    void initialize(mfile* mf);
+
+    bool accessComponent(u_int32_t offset,
+                         u_int32_t size,
+                         u_int32_t data[],
+                         access_type_t access,
+                         ProgressCallBackAdvSt* progressFuncAdv = (ProgressCallBackAdvSt*)NULL,
+                         control_fsm_args_t* lastFsmCommandArgs = NULL);
+
+    bool queryComponentStatus(u_int32_t componentIndex, comp_status_st* query);
+
+    bool getComponentVersion(FwComponent::comps_ids_t compType, bool pending, component_version_st* cmpVer);
+
+    bool controlFsm(fsm_command_t command,
+                    fsm_state_t expectedState = FSMST_NA,
+                    u_int32_t size = 0,
+                    fsm_state_t currentState = FSMST_NA,
+                    ProgressCallBackAdvSt* progressFuncAdv = (ProgressCallBackAdvSt*)NULL,
+                    u_int32_t reg_access_timeout = 0);
+
+    bool queryComponentInfo(u_int32_t componentIndex,
+                            u_int8_t readPending,
+                            u_int32_t infoType,
+                            u_int32_t dataSize,
+                            u_int32_t* data);
+
+    bool runMCQI(u_int32_t componentIndex,
+                 u_int8_t readPending,
+                 u_int32_t infoType,
+                 u_int32_t dataSize,
+                 u_int32_t offset,
+                 u_int32_t* data);
+
+    bool runNVDA(std::vector<u_int8_t>& buff,
+                 u_int16_t len,
+                 u_int32_t tlvType,
+                 reg_access_method_t method,
+                 bool queryDefault);
+
+    bool readComponentInfo(FwComponent::comps_ids_t compType,
+                           comp_info_t infoType,
+                           std::vector<u_int32_t>& retData,
+                           bool readPending = false);
+
+    void getInfoAsVersion(std::vector<u_int32_t>& infoData, component_version_st* cmpVer);
+
+    reg_access_status_t getGI(mfile* mf, mgirReg* gi);
+    bool extractMacsGuids(fwInfoT* fwQuery);
+    void extractRomInfo(mgirReg* mgir, fwInfoT* fwQuery);
+    bool isDMAAccess();
+    bool fallbackToRegisterAccess();
+
     std::vector<comp_query_st> _compsQueryMap;
     bool _refreshed;
     bool _clearSetEnv;
     bool _openedMfile;
-    comp_query_st *_currCompQuery;
+    comp_query_st* _currCompQuery;
     comp_info_st _currCompInfo;
     u_int32_t _updateHandle;
     fsm_control_st _lastFsmCtrl;
@@ -529,8 +556,8 @@ class FwCompsMgr {
     fw_comps_error_t _lastError;
     reg_access_status_t _lastRegAccessStatus;
     u_int32_t _hwDevId;
-    mfile *_mf;
-    const char *_currComponentStr;
+    mfile* _mf;
+    const char* _currComponentStr;
     std::vector<u_int8_t> _productVerStr;
     bool isDmaSupported;
     AbstractComponentAccess* _accessObj;
diff --git a/fw_comps_mgr/fw_comps_mgr_abstract_access.cpp b/fw_comps_mgr/fw_comps_mgr_abstract_access.cpp
index fabcb373..8c344b67 100644
--- a/fw_comps_mgr/fw_comps_mgr_abstract_access.cpp
+++ b/fw_comps_mgr/fw_comps_mgr_abstract_access.cpp
@@ -31,31 +31,36 @@
  * SOFTWARE.
  *
  */
- 
+
 #include "fw_comps_mgr_abstract_access.h"
 #include "fw_comps_mgr_direct_access.h"
 #include "fw_comps_mgr_dma_access.h"
 
-AbstractComponentAccess* ComponentAccessFactory::createDataAccessObject(FwCompsMgr* manager, mfile *mf, bool isMCDDRegisterSupported)
+AbstractComponentAccess*
+  ComponentAccessFactory::createDataAccessObject(FwCompsMgr* manager, mfile* mf, bool isMCDDRegisterSupported)
 {
 #ifndef UEFI_BUILD
-    
-    if (getenv("DISABLE_DMA_ACCESS") != NULL) {
+
+    if (getenv("DISABLE_DMA_ACCESS") != NULL)
+    {
         return new DirectComponentAccess(manager, mf);
     }
 #endif
 
     // DMA is supported only when COMMAND[BME] is set in PCI configuration
     bool isBmeSet = false;
-    if (isMCDDRegisterSupported) {
+    if (isMCDDRegisterSupported)
+    {
         isBmeSet = DMAComponentAccess::isBMESet(mf);
     }
 
     AbstractComponentAccess* component_access = NULL;
-    if (isMCDDRegisterSupported && isBmeSet) {
+    if (isMCDDRegisterSupported && isBmeSet)
+    {
         component_access = new DMAComponentAccess(manager, mf);
     }
-    else {
+    else
+    {
         component_access = new DirectComponentAccess(manager, mf);
     }
 
diff --git a/fw_comps_mgr/fw_comps_mgr_abstract_access.h b/fw_comps_mgr/fw_comps_mgr_abstract_access.h
index e35bea84..c589fc8b 100644
--- a/fw_comps_mgr/fw_comps_mgr_abstract_access.h
+++ b/fw_comps_mgr/fw_comps_mgr_abstract_access.h
@@ -31,7 +31,7 @@
  * SOFTWARE.
  *
  */
- 
+
 #ifndef USER_MLXFWOPS_LIB_FW_ABSTRACT_COMP_ACCESS_H_
 #define USER_MLXFWOPS_LIB_FW_ABSTRACT_COMP_ACCESS_H_
 
@@ -40,17 +40,18 @@
 class AbstractComponentAccess
 {
 public:
-    virtual bool accessComponent(u_int32_t updateHandle, u_int32_t offset,
-        u_int32_t size,
-        u_int32_t data[],
-        access_type_t access,
-        const char* currComponentStr,
-        ProgressCallBackAdvSt *progressFuncAdv) = 0;
+    virtual bool accessComponent(u_int32_t updateHandle,
+                                 u_int32_t offset,
+                                 u_int32_t size,
+                                 u_int32_t data[],
+                                 access_type_t access,
+                                 const char* currComponentStr,
+                                 ProgressCallBackAdvSt* progressFuncAdv) = 0;
 
-    virtual fw_comps_error_t  getLastFirmwareError() = 0;
-    virtual reg_access_status_t  getLastRegisterAccessStatus() = 0;
+    virtual fw_comps_error_t getLastFirmwareError() = 0;
+    virtual reg_access_status_t getLastRegisterAccessStatus() = 0;
 
-    AbstractComponentAccess(FwCompsMgr* manager, mfile *mf)
+    AbstractComponentAccess(FwCompsMgr* manager, mfile* mf)
     {
         _mf = mf;
         _manager = manager;
@@ -59,7 +60,7 @@ class AbstractComponentAccess
     virtual ~AbstractComponentAccess() {}
 
 protected:
-    mfile *_mf;
+    mfile* _mf;
     FwCompsMgr* _manager;
     fw_comps_error_t _lastFwError;
     reg_access_status_t _lastRegisterAccessStatus;
@@ -68,12 +69,12 @@ class AbstractComponentAccess
 class ComponentAccessFactory
 {
 public:
-    AbstractComponentAccess* createDataAccessObject(FwCompsMgr* manager, mfile *mf, bool isMCDDRegisterSupported);
-    static ComponentAccessFactory* GetInstance() {
+    AbstractComponentAccess* createDataAccessObject(FwCompsMgr* manager, mfile* mf, bool isMCDDRegisterSupported);
+    static ComponentAccessFactory* GetInstance()
+    {
         static ComponentAccessFactory myObj;
         return &myObj;
     }
 };
 
-
 #endif
diff --git a/fw_comps_mgr/fw_comps_mgr_direct_access.cpp b/fw_comps_mgr/fw_comps_mgr_direct_access.cpp
index 3ede8411..a49ea20f 100644
--- a/fw_comps_mgr/fw_comps_mgr_direct_access.cpp
+++ b/fw_comps_mgr/fw_comps_mgr_direct_access.cpp
@@ -52,32 +52,38 @@ static void mft_signal_set_handling(int isOn)
 
 typedef struct reg_access_hca_mcda_reg mcdaReg;
 
-bool DirectComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t offset,
-    u_int32_t size,
-    u_int32_t* data,
-    access_type_t access,
-    const char* currComponentStr,
-    ProgressCallBackAdvSt *progressFuncAdv)
+bool DirectComponentAccess::accessComponent(u_int32_t updateHandle,
+                                            u_int32_t offset,
+                                            u_int32_t size,
+                                            u_int32_t* data,
+                                            access_type_t access,
+                                            const char* currComponentStr,
+                                            ProgressCallBackAdvSt* progressFuncAdv)
 {
-
     int leftSize = (int)size;
     u_int32_t i = 0;
     mcdaReg accessData;
-    char stage[MAX_MSG_SIZE] = { 0 };
+    char stage[MAX_MSG_SIZE] = {0};
     int progressPercentage = -1;
-    if (progressFuncAdv && progressFuncAdv->func) {
-        snprintf(stage, MAX_MSG_SIZE, "%s %s component", (access == MCC_READ_COMP) ? "Reading" : "Writing", currComponentStr);
+    if (progressFuncAdv && progressFuncAdv->func)
+    {
+        snprintf(stage, MAX_MSG_SIZE, "%s %s component", (access == MCC_READ_COMP) ? "Reading" : "Writing",
+                 currComponentStr);
     }
-    int maxDataSize = mget_max_reg_size(_mf, (access == MCC_READ_COMP) ? MACCESS_REG_METHOD_GET : MACCESS_REG_METHOD_SET)
-        - sizeof(accessData);
-    if (maxDataSize > MAX_REG_DATA) {
-            maxDataSize = MAX_REG_DATA;
+    int maxDataSize =
+      mget_max_reg_size(_mf, (access == MCC_READ_COMP) ? MACCESS_REG_METHOD_GET : MACCESS_REG_METHOD_SET) -
+      sizeof(accessData);
+    if (maxDataSize > MAX_REG_DATA)
+    {
+        maxDataSize = MAX_REG_DATA;
     }
-    if (_mf->flags & MDEVS_IB && _mf->tp == MST_IB && maxDataSize > INBAND_MAX_REG_SIZE) {
+    if (_mf->flags & MDEVS_IB && _mf->tp == MST_IB && maxDataSize > INBAND_MAX_REG_SIZE)
+    {
         maxDataSize = INBAND_MAX_REG_SIZE - MCDA_REG_HEADER;
     }
     std::vector<u_int32_t> dataToRW(maxDataSize, 0);
-    while (leftSize > 0) {
+    while (leftSize > 0)
+    {
         DPRINTF(("0x%x bytes left to %s\n", leftSize, access == MCC_READ_COMP ? "read" : "burn"));
         memset(&accessData, 0, sizeof(mcdaReg));
 
@@ -87,26 +93,32 @@ bool DirectComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t of
         accessData.size = leftSize > maxDataSize ? maxDataSize : leftSize;
         mft_signal_set_handling(1);
 
-        if (access == MCC_READ_COMP) {
+        if (access == MCC_READ_COMP)
+        {
             reg_access_status_t rc = reg_access_mcda(_mf, REG_ACCESS_METHOD_GET, &accessData);
             _manager->deal_with_signal();
-            if (rc) {
+            if (rc)
+            {
                 setLastFwError(_manager->regErrTrans(rc));
                 _lastRegisterAccessStatus = rc;
                 return false;
             }
-            for (i = 0; i < accessData.size / 4; i++) {
+            for (i = 0; i < accessData.size / 4; i++)
+            {
                 data[(size - leftSize) / 4 + i] = __le32_to_cpu(accessData.data[i]);
             }
-            //printf("data[%#02x]: %#08x\n", (i-1)*4, data[(size - leftSize)/4 + i-1]);
+            // printf("data[%#02x]: %#08x\n", (i-1)*4, data[(size - leftSize)/4 + i-1]);
         }
-        else {
-            for (i = 0; i < accessData.size / 4; i++) {
+        else
+        {
+            for (i = 0; i < accessData.size / 4; i++)
+            {
                 accessData.data[i] = __cpu_to_le32(data[(size - leftSize) / 4 + i]);
             }
             reg_access_status_t rc = reg_access_mcda(_mf, REG_ACCESS_METHOD_SET, &accessData);
             _manager->deal_with_signal();
-            if (rc) {
+            if (rc)
+            {
                 setLastFwError(_manager->regErrTrans(rc));
                 _lastRegisterAccessStatus = rc;
                 return false;
@@ -114,20 +126,21 @@ bool DirectComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t of
         }
         int newPercentage = (((size - leftSize) * 100) / size);
 #ifdef UEFI_BUILD
-        if (newPercentage > progressPercentage &&
-            progressFuncAdv && progressFuncAdv->uefi_func) {
-                progressPercentage = newPercentage;
-                if (progressFuncAdv->uefi_func((int)newPercentage)) {
-                     setLastFwError(FWCOMPS_ABORTED);
-                     return false;
-                }
+        if (newPercentage > progressPercentage && progressFuncAdv && progressFuncAdv->uefi_func)
+        {
+            progressPercentage = newPercentage;
+            if (progressFuncAdv->uefi_func((int)newPercentage))
+            {
+                setLastFwError(FWCOMPS_ABORTED);
+                return false;
+            }
         }
 #else
-        if (newPercentage > progressPercentage &&
-            progressFuncAdv && progressFuncAdv->func) {
+        if (newPercentage > progressPercentage && progressFuncAdv && progressFuncAdv->func)
+        {
             progressPercentage = newPercentage;
-            if (progressFuncAdv->func(progressPercentage, stage,
-                PROG_WITH_PRECENTAGE, progressFuncAdv->opaque)) {
+            if (progressFuncAdv->func(progressPercentage, stage, PROG_WITH_PRECENTAGE, progressFuncAdv->opaque))
+            {
                 setLastFwError(FWCOMPS_ABORTED);
                 return false;
             }
@@ -135,11 +148,12 @@ bool DirectComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t of
 #endif
         leftSize -= maxDataSize;
     }
-    if (progressFuncAdv && progressFuncAdv->func) {
-        if (progressFuncAdv->func(0, stage,
-            PROG_OK, progressFuncAdv->opaque)) {
-                setLastFwError(FWCOMPS_ABORTED);
-                return false;
+    if (progressFuncAdv && progressFuncAdv->func)
+    {
+        if (progressFuncAdv->func(0, stage, PROG_OK, progressFuncAdv->opaque))
+        {
+            setLastFwError(FWCOMPS_ABORTED);
+            return false;
         }
     }
     return true;
diff --git a/fw_comps_mgr/fw_comps_mgr_direct_access.h b/fw_comps_mgr/fw_comps_mgr_direct_access.h
index b28a26d5..42467a36 100644
--- a/fw_comps_mgr/fw_comps_mgr_direct_access.h
+++ b/fw_comps_mgr/fw_comps_mgr_direct_access.h
@@ -47,19 +47,20 @@
 class DirectComponentAccess : public AbstractComponentAccess
 {
 public:
-    DirectComponentAccess(FwCompsMgr* Manager, mfile * Mf) : AbstractComponentAccess(Manager, Mf) {}
+    DirectComponentAccess(FwCompsMgr* Manager, mfile* Mf) : AbstractComponentAccess(Manager, Mf) {}
     virtual ~DirectComponentAccess() {}
-    virtual bool accessComponent(u_int32_t updateHandle, u_int32_t offset,
-        u_int32_t size,
-        u_int32_t data[],
-        access_type_t access,
-        const char* currComponentStr,
-        ProgressCallBackAdvSt *progressFuncAdv);
+    virtual bool accessComponent(u_int32_t updateHandle,
+                                 u_int32_t offset,
+                                 u_int32_t size,
+                                 u_int32_t data[],
+                                 access_type_t access,
+                                 const char* currComponentStr,
+                                 ProgressCallBackAdvSt* progressFuncAdv);
 
-    virtual fw_comps_error_t  getLastFirmwareError() {return _lastFwError;}
-    virtual reg_access_status_t  getLastRegisterAccessStatus() { return _lastRegisterAccessStatus; }
+    virtual fw_comps_error_t getLastFirmwareError() { return _lastFwError; }
+    virtual reg_access_status_t getLastRegisterAccessStatus() { return _lastRegisterAccessStatus; }
 
-    private:
-        void setLastFwError(fw_comps_error_t error) {_lastFwError = error;}
+private:
+    void setLastFwError(fw_comps_error_t error) { _lastFwError = error; }
 };
 #endif
diff --git a/fw_comps_mgr/fw_comps_mgr_dma_access.cpp b/fw_comps_mgr/fw_comps_mgr_dma_access.cpp
index 6fdda19a..b6aa474d 100644
--- a/fw_comps_mgr/fw_comps_mgr_dma_access.cpp
+++ b/fw_comps_mgr/fw_comps_mgr_dma_access.cpp
@@ -54,13 +54,15 @@ static void mft_signal_set_handling(int isOn)
     return;
 }
 
-static int  allocate_uefi_dma_memory_page(mfile *mf, mtcr_alloc_page* user_alloc_page) {
+static int allocate_uefi_dma_memory_page(mfile* mf, mtcr_alloc_page* user_alloc_page)
+{
     u_int32_t rc = 0;
     u_int64_t pa;
     u_int64_t va;
 
     rc = ((f_dma_alloc)((mf->context).fw_cmd_dma))((uefi_Dev_t*)(mf->context.fw_cmd_context), &pa, &va);
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
     user_alloc_page->pa = pa;
@@ -72,22 +74,23 @@ static int  allocate_uefi_dma_memory_page(mfile *mf, mtcr_alloc_page* user_alloc
 #ifndef PAGE_SIZE
 #define PAGE_SIZE 0x1000
 #endif
-#define FLASH_WRITE_SPEED (640*1024) //640 kB/sec
+#define FLASH_WRITE_SPEED (640 * 1024) // 640 kB/sec
 
-#define TIMETOSLEEP (1000*PAGE_SIZE/FLASH_WRITE_SPEED) //6 msec
+#define TIMETOSLEEP (1000 * PAGE_SIZE / FLASH_WRITE_SPEED) // 6 msec
 #define MAXIMUM_SLEEP_TIME_MS 20000
 #define _MCDD_DEBUG_ 0
 
-
-#if _MCDD_DEBUG_ 
+#if _MCDD_DEBUG_
 void printData(u_int32_t* data, int data_size, int format)
 {
-    for (int i = 0; i < data_size/4; i ++)
+    for (int i = 0; i < data_size / 4; i++)
     {
-        if(format == 0) {
+        if (format == 0)
+        {
             DPRINTF("\n DWORD[%04x]: 0x%08x\n", (i), (data[i]));
         }
-        else {
+        else
+        {
             u_int32_t x1 = (data[i] & 0xff) << 24;
             u_int32_t x2 = (data[i] & 0xff00) >> 8;
             u_int32_t x3 = (data[i] & 0xff0000) >> 16;
@@ -99,9 +102,15 @@ void printData(u_int32_t* data, int data_size, int format)
 }
 #endif
 
-bool DMAComponentAccess::prepareParameters(u_int32_t updateHandle, mcddReg* accessData,
-    int offset, u_int32_t* data, int data_size, int access, int leftSize,
-     mtcr_page_addresses page,  mtcr_page_addresses mailbox_page)
+bool DMAComponentAccess::prepareParameters(u_int32_t updateHandle,
+                                           mcddReg* accessData,
+                                           int offset,
+                                           u_int32_t* data,
+                                           int data_size,
+                                           int access,
+                                           int leftSize,
+                                           mtcr_page_addresses page,
+                                           mtcr_page_addresses mailbox_page)
 {
     accessData->update_handle = updateHandle;
     accessData->offset = offset;
@@ -111,9 +120,11 @@ bool DMAComponentAccess::prepareParameters(u_int32_t updateHandle, mcddReg* acce
     accessData->mailbox_page_phys_addr_lsb = EXTRACT64(mailbox_page.dma_address, 0, 32);
     accessData->mailbox_page_phys_addr_msb = EXTRACT64(mailbox_page.dma_address, 32, 32);
     int currentOffset = data_size - leftSize;
-    if (access == MCC_WRITE_COMP) {
+    if (access == MCC_WRITE_COMP)
+    {
         u_int32_t* data_ptr = (u_int32_t*)page.virtual_address;
-        for (int i = 0; i < accessData->size / 4; i++) {
+        for (int i = 0; i < accessData->size / 4; i++)
+        {
             *data_ptr = ___my_swab32(data[(currentOffset) / 4 + i]);
             data_ptr++;
         }
@@ -126,27 +137,21 @@ bool DMAComponentAccess::allocateMemory()
     mtcr_page_info page_info;
 
 #ifndef UEFI_BUILD
-    if (get_dma_pages(_mf, &page_info,
-                      FMPT_ALLOCATED_LIST_LENGTH)) {
+    if (get_dma_pages(_mf, &page_info, FMPT_ALLOCATED_LIST_LENGTH))
+    {
         return false;
     }
 #else
     return false;
 #endif
 
-    for (int page_counter = 0;
-            page_counter < FMPT_ALLOCATED_LIST_LENGTH;
-            page_counter++) {
-
+    for (int page_counter = 0; page_counter < FMPT_ALLOCATED_LIST_LENGTH; page_counter++)
+    {
 #if _MCDD_DEBUG_
-        u_int32_t va_lsb =
-            EXTRACT64(page_info.page_addresses_array[page_counter]->virtual_address, 0, 32);
-        u_int32_t va_msb =
-            EXTRACT64(page_info.page_addresses_array[page_counter]->virtual_address, 32, 32);
-        u_int32_t pa_lsb = 
-            EXTRACT64(page_info.page_addresses_array[page_counter]->dma_address, 0, 32);
-        u_int32_t pa_msb = 
-            EXTRACT64(page_info.page_addresses_array[page_counter]->dma_address, 32, 32);
+        u_int32_t va_lsb = EXTRACT64(page_info.page_addresses_array[page_counter]->virtual_address, 0, 32);
+        u_int32_t va_msb = EXTRACT64(page_info.page_addresses_array[page_counter]->virtual_address, 32, 32);
+        u_int32_t pa_lsb = EXTRACT64(page_info.page_addresses_array[page_counter]->dma_address, 0, 32);
+        u_int32_t pa_msb = EXTRACT64(page_info.page_addresses_array[page_counter]->dma_address, 32, 32);
 
         DPRINTF(("Allocated for page %d data PA 0x%08x%08x VA 0x%08x%08x \r\n", i, pa_msb, pa_lsb, va_msb, va_lsb));
 #endif
@@ -155,58 +160,68 @@ bool DMAComponentAccess::allocateMemory()
     return true;
 }
 
-bool DMAComponentAccess::isBMESet(mfile* mf) {
+bool DMAComponentAccess::isBMESet(mfile* mf)
+{
     bool res = false;
 
-    #ifdef __WIN__
+#ifdef __WIN__
     (void)mf;
     res = true; // mst64 (system service that is loaded in mtcr::open()) will set the BME
-    #else
+#else
     int COMMAND_REG_OFFSET = 0x4;
     int BME_MASK = 0x00000004;
 
     u_int32_t bme_dword = 0;
     int rc = read_dword_from_conf_space(mf, COMMAND_REG_OFFSET, &bme_dword);
 
-    if ((rc == 0) && (bme_dword & BME_MASK)) {
+    if ((rc == 0) && (bme_dword & BME_MASK))
+    {
         res = true;
     }
-    #endif
+#endif
 
     DPRINTF(("DMAComponentAccess::isBMESet res = %s\n", res ? "TRUE" : "FALSE"));
     return res;
 }
 
-bool DMAComponentAccess::readFromDataPage(mcddReg* accessData,  mtcr_page_addresses page, u_int32_t* data, int data_size, int leftSize)
+bool DMAComponentAccess::readFromDataPage(mcddReg* accessData,
+                                          mtcr_page_addresses page,
+                                          u_int32_t* data,
+                                          int data_size,
+                                          int leftSize)
 {
     u_int32_t* data_ptr = (u_int32_t*)page.virtual_address;
     int currentOffset = (data_size - leftSize) / 4;
-    for (int i = 0; i < accessData->size / 4; i++) {
+    for (int i = 0; i < accessData->size / 4; i++)
+    {
         data[currentOffset + i] = ___my_swab32(*data_ptr);
         data_ptr++;
-#if _MCDD_DEBUG_ 
+#if _MCDD_DEBUG_
         if (i % 100 == 0)
-            DPRINTF(("\nReading data[%#02x]: %#08x\n", (i) * 4, data[(data_size - leftSize) / 4 + i]));
+            DPRINTF(("\nReading data[%#02x]: %#08x\n", (i)*4, data[(data_size - leftSize) / 4 + i]));
 #endif
     }
     return true;
 }
 
-bool DMAComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t offset,
-    u_int32_t data_size,
-    u_int32_t* data,
-    access_type_t access,
-    const char* currComponentStr,
-    ProgressCallBackAdvSt *progressFuncAdv)
+bool DMAComponentAccess::accessComponent(u_int32_t updateHandle,
+                                         u_int32_t offset,
+                                         u_int32_t data_size,
+                                         u_int32_t* data,
+                                         access_type_t access,
+                                         const char* currComponentStr,
+                                         ProgressCallBackAdvSt* progressFuncAdv)
 {
 #ifndef UEFI_BUILD
     try
     {
 #endif
         //* Allocating memory on first access only (lazy allocation)
-        if (_allocatedListVect.empty()) {
+        if (_allocatedListVect.empty())
+        {
             DPRINTF(("DMAComponentAccess::AccessComponent allocating memory for DMA\n"));
-            if (!allocateMemory()) {
+            if (!allocateMemory())
+            {
                 DPRINTF(("DMAComponentAccess::AccessComponent memory allocation for DMA failed\n"));
                 setLastError(FWCOMPS_MEM_ALLOC_FAILED);
                 return false; // this will trigger a fallback to direct_access instead of dma_access
@@ -214,71 +229,84 @@ bool DMAComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t offse
         }
         int leftSize = (int)data_size;
         int CurrentPage = FMPT_FIRST_PAGE;
-        char stage[MAX_MSG_SIZE] = { 0 };
+        char stage[MAX_MSG_SIZE] = {0};
         int progressPercentage = -1;
         int currentOffset = 0;
         int nMaximumSleepTime = 0;
         tools_open_mcdd_descriptor mailboxVirtPtr_1;
-        if (progressFuncAdv && progressFuncAdv->func) {
-            snprintf(stage, MAX_MSG_SIZE, "%s %s component", (access == MCC_READ_COMP) ? "Reading" : "Writing", currComponentStr);
+        if (progressFuncAdv && progressFuncAdv->func)
+        {
+            snprintf(stage, MAX_MSG_SIZE, "%s %s component", (access == MCC_READ_COMP) ? "Reading" : "Writing",
+                     currComponentStr);
         }
-        //updateHandle &= ~0xff000000;
-        DPRINTF(("DMAComponentAccess::AccessComponent BEGIN size %d access %s\n", data_size, (access == MCC_READ_COMP) ? "READ" : "WRITE"));
+        // updateHandle &= ~0xff000000;
+        DPRINTF(("DMAComponentAccess::AccessComponent BEGIN size %d access %s\n", data_size,
+                 (access == MCC_READ_COMP) ? "READ" : "WRITE"));
         mcddReg accessData;
         mtcr_page_addresses page = _allocatedListVect[CurrentPage];
         mtcr_page_addresses mailboxPage = _allocatedListVect[FMPT_MAILBOX_PAGE];
-        //tools_open_mcdd_descriptor* mailboxVirtPtr = (tools_open_mcdd_descriptor*)mailboxPage.va;
+        // tools_open_mcdd_descriptor* mailboxVirtPtr = (tools_open_mcdd_descriptor*)mailboxPage.va;
         int maxDataSize = data_size > PAGE_SIZE ? PAGE_SIZE : data_size;
         memset(&accessData, 0, TOOLS_OPEN_MCDD_REG_SIZE);
 
-        if (access == MCC_READ_COMP) {
-            memset(data , 0, data_size);
+        if (access == MCC_READ_COMP)
+        {
+            memset(data, 0, data_size);
         }
-        prepareParameters(updateHandle, &accessData, offset + (data_size - leftSize), data, data_size, access, leftSize, page, mailboxPage);
+        prepareParameters(updateHandle, &accessData, offset + (data_size - leftSize), data, data_size, access, leftSize,
+                          page, mailboxPage);
         int nIteration = 0;
-        while (leftSize > 0) {
+        while (leftSize > 0)
+        {
             DPRINTF(("0x%x bytes left to %s\n", leftSize, access == MCC_READ_COMP ? "read" : "burn"));
             memset((u_int8_t*)mailboxPage.virtual_address, 0, TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE);
-            memset(&mailboxVirtPtr_1, 0, TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE);//set zero before each transaction
+            memset(&mailboxVirtPtr_1, 0, TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE); // set zero before each transaction
             maxDataSize = leftSize > PAGE_SIZE ? PAGE_SIZE : leftSize;
             mft_signal_set_handling(1);
 
-            reg_access_status_t rc = reg_access_mcdd(_mf, (access == MCC_READ_COMP) ? REG_ACCESS_METHOD_GET : REG_ACCESS_METHOD_SET, &accessData);
+            reg_access_status_t rc = reg_access_mcdd(
+              _mf, (access == MCC_READ_COMP) ? REG_ACCESS_METHOD_GET : REG_ACCESS_METHOD_SET, &accessData);
             _manager->deal_with_signal();
-            if (rc) {
+            if (rc)
+            {
                 DPRINTF(("CRITICAL : DMAComponentAccess::AccessComponent reg_access_mcdd ERROR: %#x\n", rc));
                 setLastError(_manager->regErrTrans(rc));
                 _lastRegisterAccessStatus = rc;
                 return false;
             }
 
-            //if we write a data, meawhile use a time for prepare next data page
-            if (access == MCC_WRITE_COMP) {
+            // if we write a data, meawhile use a time for prepare next data page
+            if (access == MCC_WRITE_COMP)
+            {
                 leftSize -= maxDataSize;
                 if (leftSize > 0)
                 {
-                    if(FMPT_FIRST_PAGE == CurrentPage)
+                    if (FMPT_FIRST_PAGE == CurrentPage)
                         CurrentPage = FMPT_SECOND_PAGE;
                     else
                         CurrentPage = FMPT_FIRST_PAGE;
 
                     page = _allocatedListVect[CurrentPage];
                     currentOffset = offset + (data_size - leftSize);
-                    prepareParameters(updateHandle, &accessData, currentOffset, data, data_size, access, leftSize, page, mailboxPage);
+                    prepareParameters(updateHandle, &accessData, currentOffset, data, data_size, access, leftSize, page,
+                                      mailboxPage);
                 }
             }
 
-            // This is because the FW will change the status from 0 to BUSY, when it starts the reading/writing operation.
-            // meanwhile, the SW has to wait until FW is really starting.
-            // It's possible, though, that we will not enter to this loop at all or only sometimes.
+            // This is because the FW will change the status from 0 to BUSY, when it starts the reading/writing
+            // operation. meanwhile, the SW has to wait until FW is really starting. It's possible, though, that we will
+            // not enter to this loop at all or only sometimes.
             tools_open_mcdd_descriptor_unpack(&mailboxVirtPtr_1, (const u_int8_t*)mailboxPage.virtual_address);
-            DPRINTF(("AccessComponent1 status %d err %d reserved3 %d\n", mailboxVirtPtr_1.status, mailboxVirtPtr_1.error, mailboxVirtPtr_1.reserved3));
+            DPRINTF(("AccessComponent1 status %d err %d reserved3 %d\n", mailboxVirtPtr_1.status,
+                     mailboxVirtPtr_1.error, mailboxVirtPtr_1.reserved3));
             nMaximumSleepTime = 0;
-            while (mailboxVirtPtr_1.status == FFS_FW_UNKNOWN) {
+            while (mailboxVirtPtr_1.status == FFS_FW_UNKNOWN)
+            {
                 msleep(TIMETOSLEEP);
                 tools_open_mcdd_descriptor_unpack(&mailboxVirtPtr_1, (const u_int8_t*)mailboxPage.virtual_address);
                 nMaximumSleepTime += TIMETOSLEEP;
-                if(nMaximumSleepTime >= MAXIMUM_SLEEP_TIME_MS) {
+                if (nMaximumSleepTime >= MAXIMUM_SLEEP_TIME_MS)
+                {
                     setLastError(FWCOMPS_ABORTED);
                     return false;
                 }
@@ -287,67 +315,80 @@ bool DMAComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t offse
             // here the FW started to work
             msleep(TIMETOSLEEP);
             tools_open_mcdd_descriptor_unpack(&mailboxVirtPtr_1, (const u_int8_t*)mailboxPage.virtual_address);
-            DPRINTF(("AccessComponent2 status %d err %d reserved3 %d\n", mailboxVirtPtr_1.status, mailboxVirtPtr_1.error, mailboxVirtPtr_1.reserved3));
+            DPRINTF(("AccessComponent2 status %d err %d reserved3 %d\n", mailboxVirtPtr_1.status,
+                     mailboxVirtPtr_1.error, mailboxVirtPtr_1.reserved3));
 
             nMaximumSleepTime = 0;
-            while (mailboxVirtPtr_1.status == FFS_FW_BUSY) {
+            while (mailboxVirtPtr_1.status == FFS_FW_BUSY)
+            {
                 msleep(TIMETOSLEEP);
                 tools_open_mcdd_descriptor_unpack(&mailboxVirtPtr_1, (const u_int8_t*)mailboxPage.virtual_address);
                 nMaximumSleepTime += TIMETOSLEEP;
-                if(nMaximumSleepTime >= MAXIMUM_SLEEP_TIME_MS) {
+                if (nMaximumSleepTime >= MAXIMUM_SLEEP_TIME_MS)
+                {
                     setLastError(FWCOMPS_ABORTED);
                     return false;
                 }
             }
             tools_open_mcdd_descriptor_unpack(&mailboxVirtPtr_1, (const u_int8_t*)mailboxPage.virtual_address);
-            DPRINTF(("AccessComponent3 status %d err %d reserved3 %d\n", mailboxVirtPtr_1.status, mailboxVirtPtr_1.error, mailboxVirtPtr_1.reserved3));
+            DPRINTF(("AccessComponent3 status %d err %d reserved3 %d\n", mailboxVirtPtr_1.status,
+                     mailboxVirtPtr_1.error, mailboxVirtPtr_1.reserved3));
 
-            if (mailboxVirtPtr_1.status == FFS_FW_ERROR) {
-                fw_comps_error_t fw_err = (fw_comps_error_t)(mailboxVirtPtr_1.error + FWCOMPS_MCC_ERR_CODES);//return error to high level app. Errors are defined as MCC errors
+            if (mailboxVirtPtr_1.status == FFS_FW_ERROR)
+            {
+                fw_comps_error_t fw_err = (fw_comps_error_t)(mailboxVirtPtr_1.error +
+                                                             FWCOMPS_MCC_ERR_CODES); // return error to high level app.
+                                                                                     // Errors are defined as MCC errors
                 setLastError(fw_err);
-                DPRINTF(("CRITICAL : DMAComponentAccess::AccessComponent status %d err %d FW ERROR: %#x\n", mailboxVirtPtr_1.status, mailboxVirtPtr_1.error, fw_err));
+                DPRINTF(("CRITICAL : DMAComponentAccess::AccessComponent status %d err %d FW ERROR: %#x\n",
+                         mailboxVirtPtr_1.status, mailboxVirtPtr_1.error, fw_err));
                 return false;
             }
 
             // read the data from FW (from page.virtual_address -> to 'data' array)
-            if (access == MCC_READ_COMP) {
+            if (access == MCC_READ_COMP)
+            {
                 DPRINTF(("READ mailboxVirtPtr->status = %d\r\n", mailboxVirtPtr_1.status));
                 readFromDataPage(&accessData, page, data, data_size, leftSize);
                 leftSize -= maxDataSize;
-                if (leftSize > 0) {
+                if (leftSize > 0)
+                {
                     CurrentPage == FMPT_FIRST_PAGE ? CurrentPage = FMPT_SECOND_PAGE : CurrentPage = FMPT_FIRST_PAGE;
-                    page = _allocatedListVect[CurrentPage];//change the page
-                    prepareParameters(updateHandle, &accessData, offset + (data_size - leftSize), data, data_size, access, leftSize, page, mailboxPage);
-                    //prepare auxilary data for next iteration
+                    page = _allocatedListVect[CurrentPage]; // change the page
+                    prepareParameters(updateHandle, &accessData, offset + (data_size - leftSize), data, data_size,
+                                      access, leftSize, page, mailboxPage);
+                    // prepare auxilary data for next iteration
                 }
             }
             nIteration++;
             int newPercentage = (((data_size - leftSize) * 100) / data_size);
 #ifdef UEFI_BUILD
-            if (newPercentage > progressPercentage &&
-                progressFuncAdv && progressFuncAdv->uefi_func) {
+            if (newPercentage > progressPercentage && progressFuncAdv && progressFuncAdv->uefi_func)
+            {
                 progressPercentage = newPercentage;
-                if (progressFuncAdv->uefi_func((int)newPercentage)) {
+                if (progressFuncAdv->uefi_func((int)newPercentage))
+                {
                     setLastError(FWCOMPS_ABORTED);
                     return false;
                 }
             }
 #else
-            if (newPercentage > progressPercentage &&
-                progressFuncAdv && progressFuncAdv->func) {
-                progressPercentage = newPercentage;
-                if (progressFuncAdv->func(progressPercentage, stage,
-                    PROG_WITH_PRECENTAGE, progressFuncAdv->opaque)) {
-                    setLastError(FWCOMPS_ABORTED);
-                    return false;
-                }
+        if (newPercentage > progressPercentage && progressFuncAdv && progressFuncAdv->func)
+        {
+            progressPercentage = newPercentage;
+            if (progressFuncAdv->func(progressPercentage, stage, PROG_WITH_PRECENTAGE, progressFuncAdv->opaque))
+            {
+                setLastError(FWCOMPS_ABORTED);
+                return false;
             }
+        }
 #endif
         }
 
-        if (progressFuncAdv && progressFuncAdv->func) {
-            if (progressFuncAdv->func(0, stage,
-                PROG_OK, progressFuncAdv->opaque)) {
+        if (progressFuncAdv && progressFuncAdv->func)
+        {
+            if (progressFuncAdv->func(0, stage, PROG_OK, progressFuncAdv->opaque))
+            {
                 setLastError(FWCOMPS_ABORTED);
                 return false;
             }
@@ -356,7 +397,8 @@ bool DMAComponentAccess::accessComponent(u_int32_t updateHandle, u_int32_t offse
         return true;
 #ifndef UEFI_BUILD
     }
-    catch (std::exception &e) {
+    catch (std::exception& e)
+    {
         DPRINTF(("DMAComponentAccess::Exception occured %s\n", e.what()));
         return false;
     }
diff --git a/fw_comps_mgr/fw_comps_mgr_dma_access.h b/fw_comps_mgr/fw_comps_mgr_dma_access.h
index d4f899f7..6ad46ab2 100644
--- a/fw_comps_mgr/fw_comps_mgr_dma_access.h
+++ b/fw_comps_mgr/fw_comps_mgr_dma_access.h
@@ -49,27 +49,34 @@ typedef struct tools_open_mcdd_reg mcddReg;
 class DMAComponentAccess : public AbstractComponentAccess
 {
 public:
-    DMAComponentAccess(FwCompsMgr* Manager, mfile * Mf) : AbstractComponentAccess(Manager, Mf) {}
+    DMAComponentAccess(FwCompsMgr* Manager, mfile* Mf) : AbstractComponentAccess(Manager, Mf) {}
     virtual ~DMAComponentAccess() {}
-    virtual bool accessComponent(u_int32_t updateHandle, u_int32_t offset,
-        u_int32_t size,
-        u_int32_t* data,
-        access_type_t access,
-        const char* currComponentStr,
-        ProgressCallBackAdvSt *progressFuncAdv);
+    virtual bool accessComponent(u_int32_t updateHandle,
+                                 u_int32_t offset,
+                                 u_int32_t size,
+                                 u_int32_t* data,
+                                 access_type_t access,
+                                 const char* currComponentStr,
+                                 ProgressCallBackAdvSt* progressFuncAdv);
     bool allocateMemory();
     static bool isBMESet(mfile* mf);
     virtual fw_comps_error_t getLastFirmwareError() { return _lastFwError; }
-    virtual reg_access_status_t  getLastRegisterAccessStatus() {return _lastRegisterAccessStatus;}
+    virtual reg_access_status_t getLastRegisterAccessStatus() { return _lastRegisterAccessStatus; }
 
 private:
-    bool prepareParameters(u_int32_t _updateHandle, mcddReg* accessData,
-        int offset, u_int32_t* data, int data_size, int access, int leftSize,
-        mtcr_page_addresses page, mtcr_page_addresses mailbox_page);
+    bool prepareParameters(u_int32_t _updateHandle,
+                           mcddReg* accessData,
+                           int offset,
+                           u_int32_t* data,
+                           int data_size,
+                           int access,
+                           int leftSize,
+                           mtcr_page_addresses page,
+                           mtcr_page_addresses mailbox_page);
     bool readFromDataPage(mcddReg* accessData, mtcr_page_addresses page, u_int32_t* data, int data_size, int leftSize);
-    std::vector <mtcr_page_addresses> _allocatedListVect;
+    std::vector<mtcr_page_addresses> _allocatedListVect;
     fw_comps_error_t _lastFwError;
     reg_access_status_t _lastRegisterAccessStatus;
-    void setLastError(fw_comps_error_t error) {_lastFwError = error;}
+    void setLastError(fw_comps_error_t error) { _lastFwError = error; }
 };
 #endif
diff --git a/include/mtcr_ul/mtcr.h b/include/mtcr_ul/mtcr.h
index a6b47fe5..1477cae7 100644
--- a/include/mtcr_ul/mtcr.h
+++ b/include/mtcr_ul/mtcr.h
@@ -34,9 +34,9 @@
 #ifndef MTCR_H
 #define MTCR_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <sys/types.h>
@@ -49,143 +49,151 @@ extern "C" {
 
 #define SLV_ADDRS_NUM 128
 
-typedef enum mtcr_access_method {
-    MTCR_ACCESS_ERROR  = MST_ERROR,
-    MTCR_ACCESS_MEMORY = MST_PCI,
-    MTCR_ACCESS_CONFIG = MST_PCICONF,
-    MTCR_ACCESS_INBAND = MST_IB
-} mtcr_access_method_t;
-/*
- * Read 4 bytes, return number of succ. read bytes or -1 on failure
- */
-int mread4(mfile *mf, unsigned int offset, u_int32_t *value);
+    typedef enum mtcr_access_method
+    {
+        MTCR_ACCESS_ERROR = MST_ERROR,
+        MTCR_ACCESS_MEMORY = MST_PCI,
+        MTCR_ACCESS_CONFIG = MST_PCICONF,
+        MTCR_ACCESS_INBAND = MST_IB
+    } mtcr_access_method_t;
+    /*
+     * Read 4 bytes, return number of succ. read bytes or -1 on failure
+     */
+    int mread4(mfile* mf, unsigned int offset, u_int32_t* value);
+
+    /*
+     * Write 4 bytes, return number of succ. written bytes or -1 on failure
+     */
+    int mwrite4(mfile* mf, unsigned int offset, u_int32_t value);
+
+    int mread4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len);
+    int mwrite4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len);
+
+    int msw_reset(mfile* mf);
+    int mhca_reset(mfile* mf);
+
+    /*
+     * Get list of MST (Mellanox Software Tools) devices.
+     * Put all device names as null-terminated strings to buf.
+     *
+     * Return number of devices found or -1 if buf overflow
+     */
+    int mdevices(char* buf, int len, int mask);
 
-/*
- * Write 4 bytes, return number of succ. written bytes or -1 on failure
- */
-int mwrite4(mfile *mf, unsigned int offset, u_int32_t value);
+    /*
+     * Get list of MST (Mellanox Software Tools) devices info records.
+     * Return a dynamic allocated array of dev_info records.
+     * len will be updated to hold the array length
+     *
+     */
+    dev_info* mdevices_info(int mask, int* len);
 
+    /*
+     *  * Get list of MST (Mellanox Software Tools) devices info records.
+     *  * Return a dynamic allocated array of dev_info records.
+     *  * len will be updated to hold the array length
+     *  * Verbosity will decide whether to get all the Physical functions or not.
+     */
 
-int mread4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len);
-int mwrite4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len);
+    dev_info* mdevices_info_v(int mask, int* len, int verbosity);
 
-int msw_reset(mfile *mf);
-int mhca_reset(mfile *mf);
+    void mdevice_info_destroy(dev_info* dev_info, int len);
+    void mdevices_info_destroy(dev_info* dev_info, int len);
 
-/*
- * Get list of MST (Mellanox Software Tools) devices.
- * Put all device names as null-terminated strings to buf.
- *
- * Return number of devices found or -1 if buf overflow
- */
-int mdevices(char *buf, int len, int mask);
+    int mget_mdevs_type(mfile* mf, u_int32_t* mtype);
 
+    /*
+     * Open Mellanox Software tools (mst) driver. Device type==INFINIHOST
+     * Return valid mfile ptr or 0 on failure
+     */
+    mfile* mopen(const char* name);
 
-/*
- * Get list of MST (Mellanox Software Tools) devices info records.
- * Return a dynamic allocated array of dev_info records.
- * len will be updated to hold the array length
- *
- */
-dev_info* mdevices_info(int mask, int *len);
+    mfile* mopend(const char* name, DType dtype);
 
-/*
- *  * Get list of MST (Mellanox Software Tools) devices info records.
- *  * Return a dynamic allocated array of dev_info records.
- *  * len will be updated to hold the array length
- *  * Verbosity will decide whether to get all the Physical functions or not.
- */
-
-dev_info* mdevices_info_v(int mask, int *len, int verbosity);
-
-void mdevice_info_destroy(dev_info *dev_info, int len);
-void mdevices_info_destroy(dev_info *dev_info, int len);
-
-int mget_mdevs_type(mfile *mf, u_int32_t *mtype);
-
-/*
- * Open Mellanox Software tools (mst) driver. Device type==INFINIHOST
- * Return valid mfile ptr or 0 on failure
- */
-mfile* mopen(const char *name);
-
-mfile* mopend(const char *name, DType dtype);
-
-//mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *extra_data);
-
-mfile* mopen_adv(const char *name, MType mtype);
-
-/*
- * Close Mellanox driver
- * req. descriptor
- */
-int mclose(mfile *mf);
+    // mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *extra_data);
 
-unsigned char mset_i2c_slave(mfile *mf, unsigned char new_i2c_slave);
+    mfile* mopen_adv(const char* name, MType mtype);
 
-int mget_mdevs_flags(mfile *mf, u_int32_t *devs_flags);
+    /*
+     * Close Mellanox driver
+     * req. descriptor
+     */
+    int mclose(mfile* mf);
 
-int maccess_reg_mad(mfile *mf, u_int8_t *data);
+    unsigned char mset_i2c_slave(mfile* mf, unsigned char new_i2c_slave);
 
-int mos_reg_access(mfile *mf, int reg_access, void *reg_data, u_int32_t cmd_type);
+    int mget_mdevs_flags(mfile* mf, u_int32_t* devs_flags);
 
-int maccess_reg_cmdif(mfile *mf, reg_access_t reg_access, void *reg_data, u_int32_t cmd_type);
+    int maccess_reg_mad(mfile* mf, u_int8_t* data);
 
-int maccess_reg(mfile     *mf,
-                u_int16_t reg_id,
-                maccess_reg_method_t reg_method,
-                void *reg_data,
-                u_int32_t reg_size,
-                u_int32_t r_size_reg,   // used when sending via icmd interface (how much data should be read back to the user)
-                u_int32_t w_size_reg,   // used when sending via icmd interface (how much data should be written to the scratchpad)
-                                        // if you dont know what you are doing then r_size_reg = w_size_reg = your_register_size
-                int       *reg_status);
+    int mos_reg_access(mfile* mf, int reg_access, void* reg_data, u_int32_t cmd_type);
 
-int icmd_send_command(mfile *mf, int opcode, void *data, int data_size, int skip_write);
+    int maccess_reg_cmdif(mfile* mf, reg_access_t reg_access, void* reg_data, u_int32_t cmd_type);
 
-int icmd_clear_semaphore(mfile *mf);
+    int maccess_reg(mfile* mf,
+                    u_int16_t reg_id,
+                    maccess_reg_method_t reg_method,
+                    void* reg_data,
+                    u_int32_t reg_size,
+                    u_int32_t r_size_reg, // used when sending via icmd interface (how much data should be read back to
+                                          // the user)
+                    u_int32_t w_size_reg, // used when sending via icmd interface (how much data should be written to
+                                          // the scratchpad) if you dont know what you are doing then r_size_reg =
+                                          // w_size_reg = your_register_size
+                    int* reg_status);
 
+    int icmd_send_command(mfile* mf, int opcode, void* data, int data_size, int skip_write);
 
-int tools_cmdif_send_inline_cmd(mfile *mf, u_int64_t in_param, u_int64_t *out_param,
-                                u_int32_t input_modifier, u_int16_t opcode, u_int8_t opcode_modifier);
+    int icmd_clear_semaphore(mfile* mf);
 
-int tools_cmdif_send_mbox_command(mfile *mf, u_int32_t input_modifier, u_int16_t opcode, u_int8_t opcode_modifier,
-                                  int data_offs_in_mbox, void *data, int data_size, int skip_write);
+    int tools_cmdif_send_inline_cmd(mfile* mf,
+                                    u_int64_t in_param,
+                                    u_int64_t* out_param,
+                                    u_int32_t input_modifier,
+                                    u_int16_t opcode,
+                                    u_int8_t opcode_modifier);
 
-int tools_cmdif_unlock_semaphore(mfile *mf);
+    int tools_cmdif_send_mbox_command(mfile* mf,
+                                      u_int32_t input_modifier,
+                                      u_int16_t opcode,
+                                      u_int8_t opcode_modifier,
+                                      int data_offs_in_mbox,
+                                      void* data,
+                                      int data_size,
+                                      int skip_write);
 
+    int tools_cmdif_unlock_semaphore(mfile* mf);
 
-int mget_max_reg_size(mfile *mf, maccess_reg_method_t reg_method);
-int supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method);
+    int mget_max_reg_size(mfile* mf, maccess_reg_method_t reg_method);
+    int supports_reg_access_gmp(mfile* mf, maccess_reg_method_t reg_method);
 
-const char* m_err2str(MError status);
+    const char* m_err2str(MError status);
 
-int mread_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len);
-int mwrite_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len);
+    int mread_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len);
+    int mwrite_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len);
 
-int mget_vsec_supp(mfile *mf);
+    int mget_vsec_supp(mfile* mf);
 
-int mget_addr_space(mfile *mf);
-int mset_addr_space(mfile *mf, int space);
+    int mget_addr_space(mfile* mf);
+    int mset_addr_space(mfile* mf, int space);
 
-int mclear_pci_semaphore(const char *name);
+    int mclear_pci_semaphore(const char* name);
 
-int mvpd_read4(mfile *mf, unsigned int offset, u_int8_t value[4]);
+    int mvpd_read4(mfile* mf, unsigned int offset, u_int8_t value[4]);
 
-int mvpd_write4(mfile *mf, unsigned int offset, u_int8_t value[4]);
+    int mvpd_write4(mfile* mf, unsigned int offset, u_int8_t value[4]);
 
-MTCR_API int MWRITE4_SEMAPHORE(mfile* mf, int offset, int value);
+    MTCR_API int MWRITE4_SEMAPHORE(mfile* mf, int offset, int value);
 
-MTCR_API int MREAD4_SEMAPHORE(mfile* mf, int offset, u_int32_t* ptr);
+    MTCR_API int MREAD4_SEMAPHORE(mfile* mf, int offset, u_int32_t* ptr);
 
-void set_increase_poll_time(int new_value);
+    void set_increase_poll_time(int new_value);
 
-int get_dma_pages(mfile *mf, struct mtcr_page_info* page_info,
-                  int page_amount);
+    int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info, int page_amount);
 
-int release_dma_pages(mfile *mf, int page_amount);
+    int release_dma_pages(mfile* mf, int page_amount);
 
-int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data);
+    int read_dword_from_conf_space(mfile* mf, u_int32_t offset, u_int32_t* data);
 
 #ifdef __cplusplus
 }
diff --git a/include/mtcr_ul/mtcr_com_defs.h b/include/mtcr_ul/mtcr_com_defs.h
index fc2b365a..c33fad18 100644
--- a/include/mtcr_ul/mtcr_com_defs.h
+++ b/include/mtcr_ul/mtcr_com_defs.h
@@ -51,7 +51,7 @@
 #endif
 
 #if defined(_MSC_VER) || defined(__MINGW32__) || defined(__MINGW64__)
-    #include <stdint.h>
+#include <stdint.h>
 #else
 typedef __int8 int8_t;
 typedef __int16 int16_t;
@@ -85,7 +85,7 @@ typedef long long int64_t;
 #define bswap_32(x) ntohl(x)
 #define MTCR_API
 
-#else  /* UNIX */
+#else /* UNIX */
 
 #include <sys/types.h>
 #define MTCR_API
@@ -107,27 +107,30 @@ typedef long long int64_t;
 #define MST_META_DATA_MINOR 0
 #define MTCR_SUPP_MST_API_MAJOR_VERSION 1
 
-
-//Service name.
+// Service name.
 #define MST_PREFIX_64_BIT "mst64_"
 #define MST_PREFIX_32_BIT "mst32_"
 #define MST_SUFFIX_MAXLEN 11
-#define MST_SERVICE_NAME_SIZE (sizeof(MST_PREFIX_64_BIT) + sizeof(MFT_VERSION_STR) + MST_SUFFIX_MAXLEN + 9)  // 9 is just in case reserve
+#define MST_SERVICE_NAME_SIZE \
+    (sizeof(MST_PREFIX_64_BIT) + sizeof(MFT_VERSION_STR) + MST_SUFFIX_MAXLEN + 9) // 9 is just in case reserve
 
 //#ifndef USE_IB_MGT
-typedef struct mib_private_t {
+typedef struct mib_private_t
+{
     int dummy;
 } MIB_Private;
 //#else
 //#include "mtcr_ib_private.h"
 //#endif
 
-typedef enum {
+typedef enum
+{
     SEM_LOCK_GET = 0x0,
     SEM_LOCK_SET = 0x1
 } sem_lock_method_t;
 
-typedef enum MError {
+typedef enum MError
+{
     ME_OK = 0,
     ME_ERROR,
     ME_BAD_PARAMS,
@@ -174,7 +177,7 @@ typedef enum MError {
     ME_REG_ACCESS_INTERNAL_ERROR,
 
     // errors regarding ICMD
-    ME_ICMD_STATUS_CR_FAIL = 0x200,       // cr-space access failure
+    ME_ICMD_STATUS_CR_FAIL = 0x200, // cr-space access failure
     ME_ICMD_INVALID_OPCODE,
     ME_ICMD_INVALID_CMD,
     ME_ICMD_OPERATIONAL_ERROR,
@@ -182,8 +185,8 @@ typedef enum MError {
     ME_ICMD_BUSY,
     ME_ICMD_INIT_FAILED,
     ME_ICMD_NOT_SUPPORTED,
-    ME_ICMD_STATUS_SEMAPHORE_TO,          // timed out while trying to take semaphore
-    ME_ICMD_STATUS_EXECUTE_TO,            // timed out while waiting for command to execute
+    ME_ICMD_STATUS_SEMAPHORE_TO, // timed out while trying to take semaphore
+    ME_ICMD_STATUS_EXECUTE_TO,   // timed out while waiting for command to execute
     ME_ICMD_STATUS_IFC_BUSY,
     ME_ICMD_STATUS_ICMD_NOT_READY,
     ME_ICMD_UNSUPPORTED_ICMD_VERSION,
@@ -192,7 +195,7 @@ typedef enum MError {
     ME_ICMD_WRITE_PROTECT,
     ME_ICMD_SIZE_EXCEEDS_LIMIT,
 
-    //errors regarding Tools CMDIF
+    // errors regarding Tools CMDIF
     ME_CMDIF_BUSY = 0x300,
     ME_CMDIF_TOUT,
     ME_CMDIF_BAD_STATUS,
@@ -203,7 +206,7 @@ typedef enum MError {
     ME_CMDIF_RES_STATE,
     ME_CMDIF_UNKN_STATUS,
 
-    //errors regarding MAD IF
+    // errors regarding MAD IF
     ME_MAD_BUSY = 0x400,
     ME_MAD_REDIRECT,
     ME_MAD_BAD_VER,
@@ -212,7 +215,7 @@ typedef enum MError {
     ME_MAD_BAD_DATA,
     ME_MAD_GENERAL_ERR,
 
-    //errors regarding gearbox icmd new interface gateway
+    // errors regarding gearbox icmd new interface gateway
     ME_GB_ICMD_OK = 0x500,
     ME_GB_ICMD_FAILED,
     ME_GB_ICMD_FAILED_ACCESS,
@@ -228,9 +231,10 @@ typedef enum MError {
 #ifdef UEFI_BUILD
 #include <mft_uefi_common.h>
 #endif
-typedef enum MType_t {
+typedef enum MType_t
+{
     MST_ERROR = 0x0,
-    MST_FPGA = 0x1,     // Unsupported
+    MST_FPGA = 0x1, // Unsupported
     MST_MLNXOS = 0x2,
     MST_LPC = 0x4,
     MST_PCI = 0x8,
@@ -259,42 +263,50 @@ typedef enum MType_t {
     MST_DEFAULT = 0xffffffff & ~MST_CABLE & ~MST_FPGA & ~MST_FPGA_ICMD & ~MST_FPGA_DRIVER & ~MST_LINKX_CHIP
 } MType;
 
-typedef enum DType_t {
-    MST_GAMLA, MST_TAVOR, MST_DIMM, MST_NOADDR
+typedef enum DType_t
+{
+    MST_GAMLA,
+    MST_TAVOR,
+    MST_DIMM,
+    MST_NOADDR
 } DType;
 #define MST_ANAFA2 MST_TAVOR
 #define MST_EEPROM MST_GAMLA
-typedef enum Mdevs_t {
-    MDEVS_GAMLA = 0x01, /*  Each device that actually is a Gamla */
-    MDEVS_I2CM = 0x02, /*  Each device that can work as I2C master */
-    MDEVS_MEM = 0x04, /*  Each device that is a memory driver (vtop) */
-    MDEVS_TAVOR_DDR = 0x08, /*  Each device that maps to DDR */
-    MDEVS_TAVOR_UAR = 0x10, /*  Each device that maps to UAR */
-    MDEVS_TAVOR_CR = 0x20, /*  Each device that maps to CR */
-    MDEVS_IF = 0x40, /*  Standard device  interface */
-    MDEVS_REM = 0x80, /*  Remote devices */
-    MDEVS_PPC = 0x100, /*  PPC devices */
-    MDEVS_DEV_I2C = 0x200, /* Generic linux kernel i2c device */
-    MDEVS_IB = 0x400, /* Cr access over IB Mads */
-    MDEVS_MLNX_OS = 0x800, /* access by CmdIf in MlnxOS */
-    MDEVS_FWCTX = 0x900, /* access by func/context (like UEFI) */
-    MDEVS_LPC = 0x1000,/* Access LPC region */
-    MDEVS_FPGA = 0x2000,/* Access LPC region */
-    MDEVS_FPGA_NEWTON = 0x4000,/* Access LPC region */
+typedef enum Mdevs_t
+{
+    MDEVS_GAMLA = 0x01,         /*  Each device that actually is a Gamla */
+    MDEVS_I2CM = 0x02,          /*  Each device that can work as I2C master */
+    MDEVS_MEM = 0x04,           /*  Each device that is a memory driver (vtop) */
+    MDEVS_TAVOR_DDR = 0x08,     /*  Each device that maps to DDR */
+    MDEVS_TAVOR_UAR = 0x10,     /*  Each device that maps to UAR */
+    MDEVS_TAVOR_CR = 0x20,      /*  Each device that maps to CR */
+    MDEVS_IF = 0x40,            /*  Standard device  interface */
+    MDEVS_REM = 0x80,           /*  Remote devices */
+    MDEVS_PPC = 0x100,          /*  PPC devices */
+    MDEVS_DEV_I2C = 0x200,      /* Generic linux kernel i2c device */
+    MDEVS_IB = 0x400,           /* Cr access over IB Mads */
+    MDEVS_MLNX_OS = 0x800,      /* access by CmdIf in MlnxOS */
+    MDEVS_FWCTX = 0x900,        /* access by func/context (like UEFI) */
+    MDEVS_LPC = 0x1000,         /* Access LPC region */
+    MDEVS_FPGA = 0x2000,        /* Access LPC region */
+    MDEVS_FPGA_NEWTON = 0x4000, /* Access LPC region */
     MDEVS_CABLE = 0x8000,
     MDEVS_SOFTWARE = 0x10000, /* Software system char dev */
     MDEVS_LINKX_CHIP = 0x200000,
     MDEVS_GBOX = 0x400000,
-    MDEVS_TAVOR = (MDEVS_TAVOR_DDR | MDEVS_TAVOR_UAR | MDEVS_TAVOR_CR), MDEVS_ALL = 0xffffffff
+    MDEVS_TAVOR = (MDEVS_TAVOR_DDR | MDEVS_TAVOR_UAR | MDEVS_TAVOR_CR),
+    MDEVS_ALL = 0xffffffff
 } Mdevs;
 
-typedef enum {
+typedef enum
+{
     MACCESS_REG_METHOD_GET = 1,
     MACCESS_REG_METHOD_SET = 2,
     MACCESS_LAST_REG_METHOD = 3
 } maccess_reg_method_t;
 
-typedef enum {
+typedef enum
+{
     VCC_INITIALIZED = 0x0,
     VCC_ICMD_EXT_SPACE_SUPPORTED = 0x1,
     VCC_CRSPACE_SPACE_SUPPORTED = 0x2,
@@ -307,7 +319,8 @@ typedef enum {
     VCC_MAC_SPACE_SUPPORTED = 0x9,
 } VSCCapCom;
 
-typedef enum {
+typedef enum
+{
     AS_ICMD_EXT = 0x1,
     AS_CR_SPACE = 0x2,
     AS_ICMD = 0x3,
@@ -320,24 +333,27 @@ typedef enum {
     AS_END
 } address_space_t;
 
-
-typedef struct vf_info_t {
+typedef struct vf_info_t
+{
     char dev_name[512];
     u_int16_t domain;
     u_int8_t bus;
     u_int8_t dev;
     u_int8_t func;
-    char **net_devs;      // Null terminated array
-    char **ib_devs;       // Null terminated array
+    char** net_devs; // Null terminated array
+    char** ib_devs;  // Null terminated array
 } vf_info;
 
-typedef struct dev_info_t {
+typedef struct dev_info_t
+{
     Mdevs type;
     char dev_name[512];
     int ul_mode;
 
-    union {
-        struct {
+    union
+    {
+        struct
+        {
             u_int16_t domain;
             u_int8_t bus;
             u_int8_t dev;
@@ -351,49 +367,55 @@ typedef struct dev_info_t {
 
             char cr_dev[512];
             char conf_dev[512];
-            char **net_devs;                  // Null terminated array
-            char **ib_devs;                   // Null terminated array
-            char numa_node[4096];                 //
-            vf_info *virtfn_arr;
+            char** net_devs;      // Null terminated array
+            char** ib_devs;       // Null terminated array
+            char numa_node[4096]; //
+            vf_info* virtfn_arr;
             u_int16_t virtfn_count;
         } pci;
 
-        struct {
+        struct
+        {
             u_int32_t mtusb_serial;
             u_int32_t TBD;
         } usb;
 
-        struct {
+        struct
+        {
             u_int32_t TBD;
         } ib;
 
-        struct {
+        struct
+        {
             char remote_device_name[512];
         } remote;
     };
 } dev_info;
 
-
-typedef enum {
+typedef enum
+{
     RA_MFPA = 0x9010,
     RA_MFBA = 0x9011,
     RA_MFBE = 0x9012,
 } reg_access_t;
 typedef struct dma_lib_hdl_t dma_lib_hdl;
 
-typedef enum {
-    GEARBPX_OVER_MTUSB          = 1,
-    GEARBPX_OVER_I2C            = 2,
-    GEARBPX_OVER_SWITCH         = 3,
+typedef enum
+{
+    GEARBPX_OVER_MTUSB = 1,
+    GEARBPX_OVER_I2C = 2,
+    GEARBPX_OVER_SWITCH = 3,
     GEARBPXO_UNKNOWN_CONNECTION = 0
 } gearbox_connection_t;
-typedef enum {
+typedef enum
+{
     MTCR_STATUS_UNKNOWN,
     MTCR_STATUS_TRUE,
     MTCR_STATUS_FALSE,
 } mtcr_status_e;
 
-typedef struct icmd_params_t {
+typedef struct icmd_params_t
+{
     int icmd_opened;
     int took_semaphore;
     int ctrl_addr;
@@ -410,75 +432,83 @@ typedef struct icmd_params_t {
     mtcr_status_e icmd_ready;
 } icmd_params;
 
-typedef struct ctx_params_t {
-    void *fw_cmd_context;
-    void *fw_cmd_func;
-    void *fw_cmd_dma;
+typedef struct ctx_params_t
+{
+    void* fw_cmd_context;
+    void* fw_cmd_func;
+    void* fw_cmd_dma;
 } ctx_params;
 
-typedef struct io_region_t {
+typedef struct io_region_t
+{
     unsigned int start;
     unsigned int end;
 } io_region;
 
-typedef struct tools_hcr_params_t {
-    int supp_cr_mbox;     // 1: mbox supported , -1: mbox not supported
+typedef struct tools_hcr_params_t
+{
+    int supp_cr_mbox; // 1: mbox supported , -1: mbox not supported
 } tools_hcr_params;
 
 // max_reg_size depends on the desired method operated on the register.
 // max_reg_size[<method_enum_value>] will give the relevant max_reg_size.
 // For example max_reg_size[MACCESS_REG_METHOD_GET] will give max_reg_size for Get() method.
-typedef struct access_reg_params_t {
+typedef struct access_reg_params_t
+{
     int max_reg_size[MACCESS_LAST_REG_METHOD];
 } access_reg_params;
 
 typedef struct mfile_t mfile;
 
-struct mtcr_page_addresses {
+struct mtcr_page_addresses
+{
     u_int64_t dma_address;
     u_int64_t virtual_address;
 };
 
-
-struct page_list {
+struct page_list
+{
     // User space buffer page aligned.
     char* page_list;
     int page_amount;
 };
 
-struct mtcr_page_info {
+struct mtcr_page_info
+{
     unsigned int page_amount;
-    unsigned long page_pointer_start;    
+    unsigned long page_pointer_start;
     struct mtcr_page_addresses page_addresses_array[MAX_PAGES_SIZE];
 };
 
-
-struct mtcr_read_dword_from_config_space {
+struct mtcr_read_dword_from_config_space
+{
     unsigned int offset;
     unsigned int data;
 };
 
-typedef void (*f_mpci_change)        (mfile *mf);
+typedef void (*f_mpci_change)(mfile* mf);
 
 #define GEARBOX_ADDR_WIDTH 4
 #define GEARBOX_SLAVE_ADDR 0x48
 #define GB_MNGR_SLAVE_ADDR 0x33
 
-typedef enum {
+typedef enum
+{
     GB_UNKNOWN = 0,
     GB_AMOS,
     GB_ABIR
 } gearbox_type;
 
-typedef struct gearbox_info_t {
+typedef struct gearbox_info_t
+{
     gearbox_type gb_type;
     u_int8_t is_gearbox;
     u_int8_t is_gb_mngr;
     int gearbox_index;
     int ilne_card_id;
     gearbox_connection_t gb_conn_type;
-    char gb_mngr_full_name[DEV_NAME_SZ];     
-    char gearbox_full_name[DEV_NAME_SZ];  
+    char gb_mngr_full_name[DEV_NAME_SZ];
+    char gearbox_full_name[DEV_NAME_SZ];
     unsigned char i2c_slave;
     u_int8_t addr_width;
     char device_orig_name[DEV_NAME_SZ];
@@ -487,14 +517,15 @@ typedef struct gearbox_info_t {
     u_int32_t data_res_addr;
 } gearbox_info;
 
-typedef struct cables_info_t {
+typedef struct cables_info_t
+{
     int slave_addr_additional_offset;
 } cables_info;
 
-#define VSEC_MIN_SUPPORT_UL(mf) (((mf)->vsec_cap_mask & (1 << VCC_INITIALIZED)) && \
-                                 ((mf)->vsec_cap_mask & (1 << VCC_CRSPACE_SPACE_SUPPORTED)) && \
-                                 ((mf)->vsec_cap_mask & (1 << VCC_ICMD_EXT_SPACE_SUPPORTED)) && \
-                                 ((mf)->vsec_cap_mask & (1 << VCC_SEMAPHORE_SPACE_SUPPORTED)))
+#define VSEC_MIN_SUPPORT_UL(mf)                                                                                      \
+    (((mf)->vsec_cap_mask & (1 << VCC_INITIALIZED)) && ((mf)->vsec_cap_mask & (1 << VCC_CRSPACE_SPACE_SUPPORTED)) && \
+     ((mf)->vsec_cap_mask & (1 << VCC_ICMD_EXT_SPACE_SUPPORTED)) &&                                                  \
+     ((mf)->vsec_cap_mask & (1 << VCC_SEMAPHORE_SPACE_SUPPORTED)))
 
 // VSEC supported macro
 #define VSEC_SUPPORTED_UL(mf) ((mf)->vsec_supp && VSEC_MIN_SUPPORT_UL(mf))
diff --git a/include/mtcr_ul/mtcr_mf.h b/include/mtcr_ul/mtcr_mf.h
index d162c54a..d7cb7c32 100644
--- a/include/mtcr_ul/mtcr_mf.h
+++ b/include/mtcr_ul/mtcr_mf.h
@@ -38,17 +38,17 @@
 #ifdef __FreeBSD__
 #include <sys/pciio.h>
 #endif
- 
 
-struct mft_core_wrapper {
+struct mft_core_wrapper
+{
     void* config_space_access;
     void* reg_access;
     void* reset_access;
 };
 
-
 #ifdef __FreeBSD__
-struct page_list_fbsd {
+struct page_list_fbsd
+{
     // User space buffer page aligned.
     char* page_list[MAX_PAGES_SIZE];
     int page_amount;
@@ -58,42 +58,44 @@ struct page_list_fbsd {
 /*  All fields in follow structure are not supposed to be used */
 /*  or modified by user programs. Except i2c_slave that may be */
 /*  modified before each access to target I2C slave address */
-struct mfile_t {
-    MType tp;     /*  type of driver */
+struct mfile_t
+{
+    MType tp; /*  type of driver */
     MType orig_tp;
-    MType res_tp;     /*  Will be used with HCR if need */
-    DType dtype;     /*  target device to access to */
-    DType itype;     /*  interface device to access via */
-    int is_i2cm;     /*  use device as I2C master */
-    int is_vm;     /*  if the machine is VM    */
-    int cr_access;     /* If cr access is allowed in MLNXOS devices */
+    MType res_tp;         /*  Will be used with HCR if need */
+    DType dtype;          /*  target device to access to */
+    DType itype;          /*  interface device to access via */
+    int is_i2cm;          /*  use device as I2C master */
+    int is_vm;            /*  if the machine is VM    */
+    int cr_access;        /* If cr access is allowed in MLNXOS devices */
     cables_info ext_info; /*keeps info for calculate the correct slave address (0x50 + offset) */
     unsigned char i2c_slave;
     int gpio_en;
-    io_region *iorw_regions;     /* For LPC devices */
+    io_region* iorw_regions; /* For LPC devices */
     int regions_num;
-    char *dev_name;
+    char* dev_name;
     int fd;
-    int res_fd;     /*  Will be used with HCR if need*/
-    int sock;     /*  in not -1 - remote interface */
-    int is_mtserver_req;    // request came from mtServer - means came from remote client 
-    void *bar_virtual_addr;
+    int res_fd;          /*  Will be used with HCR if need*/
+    int sock;            /*  in not -1 - remote interface */
+    int is_mtserver_req; // request came from mtServer - means came from remote client
+    void* bar_virtual_addr;
     unsigned int map_size;
-    unsigned int bar0_gw_offset;//for MST_BAR0_GW_PCI devices, offset from BAR0 - gateway - for R/W operations
-    int file_lock_descriptor;//file descriptor to the lock file aka semaphore in order to protect parallel read/write GW operations
+    unsigned int bar0_gw_offset; // for MST_BAR0_GW_PCI devices, offset from BAR0 - gateway - for R/W operations
+    int file_lock_descriptor; // file descriptor to the lock file aka semaphore in order to protect parallel read/write
+                              // GW operations
     unsigned long long start_idx;
     /************************ FPGA DDR3 *********************************/
-    void *ddr3_ptr;
+    void* ddr3_ptr;
     unsigned long long ddr3_start_idx;
     unsigned int ddr3_map_size;
     /********************************************************************/
-    MIB_Private mib;     /*  Data for IB interface (if relevant) */
-    void *ctx;
+    MIB_Private mib; /*  Data for IB interface (if relevant) */
+    void* ctx;
     void* fallback_mf;
-    unsigned int i2c_RESERVED;     /*  Reserved for internal usage (i2c internal) */
+    unsigned int i2c_RESERVED; /*  Reserved for internal usage (i2c internal) */
     int i2c_smbus;
     enum Mdevs_t flags;
-    u_int32_t connectx_wa_slot;     /* apply connectx cr write workaround */
+    u_int32_t connectx_wa_slot; /* apply connectx cr write workaround */
     int connectx_wa_last_op_write;
     u_int32_t connectx_wa_stat;
     u_int64_t connectx_wa_max_retries;
@@ -102,9 +104,9 @@ struct mfile_t {
     int server_ver_major;
     int server_ver_minor;
     unsigned int proto_type;
-    dev_info *dinfo;
+    dev_info* dinfo;
 
-    //for ICMD access
+    // for ICMD access
     icmd_params icmd;
     // for UEFI
     ctx_params context;
@@ -123,14 +125,14 @@ struct mfile_t {
     // for sending access registers
     access_reg_params acc_reg_params;
     // UL
-    void *ul_ctx;
+    void* ul_ctx;
     // Dynamic libs Ctx
-    void *dl_context;
+    void* dl_context;
     // Cables CTX
     int is_cable;
-    void *cable_ctx;
-	unsigned int linkx_chip_devid;
-    void *cable_chip_ctx; // TODO change the name
+    void* cable_ctx;
+    unsigned int linkx_chip_devid;
+    void* cable_chip_ctx; // TODO change the name
     f_mpci_change mpci_change;
     // Amos gear-box
     gearbox_info gb_info;
@@ -141,7 +143,7 @@ struct mfile_t {
     int connectx_flush;
     int fdlock;
     struct page_list_fbsd user_page_list;
-    void *ptr;
+    void* ptr;
 #else
     struct page_list user_page_list;
 #endif
diff --git a/kernel/mst.h b/kernel/mst.h
index 083d79ab..757d2849 100644
--- a/kernel/mst.h
+++ b/kernel/mst.h
@@ -8,37 +8,36 @@
 
 #include <linux/ioctl.h>
 
-
 /****************************************************/
-#define MST_MEMORY_SIZE				(1024*1024)
-#define MST_BLOCK_SIZE				64
-
-#define MST_PARAMS_MAGIC			0xD0
-#define MST_BYTE_ACCESS_MAGIC		0xD1
-#define MST_BLOCK_ACCESS_MAGIC		0xD2
-#define MST_PCICONF_MAGIC			0xD3
-#define MST_PCIMEM_MAGIC			0xD4
-#define MST_CONNECTX_WA_MAGIC		0xD5
-#define MST_VPD_MAGIC				0xD6
-
-
-#define PCICONF_MAX_BUFFER_SIZE     256
-#define PCICONF_MAX_PAGES_SIZE      32
+#define MST_MEMORY_SIZE (1024 * 1024)
+#define MST_BLOCK_SIZE 64
+
+#define MST_PARAMS_MAGIC 0xD0
+#define MST_BYTE_ACCESS_MAGIC 0xD1
+#define MST_BLOCK_ACCESS_MAGIC 0xD2
+#define MST_PCICONF_MAGIC 0xD3
+#define MST_PCIMEM_MAGIC 0xD4
+#define MST_CONNECTX_WA_MAGIC 0xD5
+#define MST_VPD_MAGIC 0xD6
+
+#define PCICONF_MAX_BUFFER_SIZE 256
+#define PCICONF_MAX_PAGES_SIZE 32
 /****************************************************/
 /* GET PARAMS */
 #define MST_PARAMS _IOR(MST_PARAMS_MAGIC, 1, struct mst_params)
 
-struct mst_params {
-	unsigned int domain;
-	unsigned int bus;
-	unsigned int slot;
-	unsigned int func;
-	unsigned int bar;
-	unsigned int device;
-	unsigned int vendor;
-	unsigned int subsystem_device;
-	unsigned int subsystem_vendor;
-	unsigned int vendor_specific_cap;
+struct mst_params
+{
+    unsigned int domain;
+    unsigned int bus;
+    unsigned int slot;
+    unsigned int func;
+    unsigned int bar;
+    unsigned int device;
+    unsigned int vendor;
+    unsigned int subsystem_device;
+    unsigned int subsystem_vendor;
+    unsigned int vendor_specific_cap;
 };
 
 typedef uint32_t u32;
@@ -47,66 +46,67 @@ typedef uint32_t u32;
 /* BYTE ACCESS */
 #define MST_READ4 _IOR(MST_BYTE_ACCESS_MAGIC, 1, struct mst_read4_st)
 
-struct mst_read4_st {
-	unsigned int address_space;
-	unsigned int offset;
-	unsigned int data; /*OUT*/
+struct mst_read4_st
+{
+    unsigned int address_space;
+    unsigned int offset;
+    unsigned int data; /*OUT*/
 };
 
-
 #define MST_WRITE4 _IOW(MST_BYTE_ACCESS_MAGIC, 2, struct mst_write4_st)
 
-struct mst_write4_st {
-	unsigned int address_space;
-	unsigned int offset;
-	unsigned int data;
+struct mst_write4_st
+{
+    unsigned int address_space;
+    unsigned int offset;
+    unsigned int data;
 };
 
-
-#define PCICONF_READ4	MST_READ4
-#define PCICONF_WRITE4	MST_WRITE4
-#define PCIMEM_READ4	MST_READ4
-#define PCIMEM_WRITE4	MST_WRITE4
-
+#define PCICONF_READ4 MST_READ4
+#define PCICONF_WRITE4 MST_WRITE4
+#define PCIMEM_READ4 MST_READ4
+#define PCIMEM_WRITE4 MST_WRITE4
 
 /****************************************************/
 /* BLOCK ACCESS */
 #define PCIMEM_READ_BLOCK _IOR(MST_BLOCK_ACCESS_MAGIC, 1, struct mst_read_block_st)
 
-struct mst_read_block_st {
-	unsigned int offset;
-	unsigned int size;			/* in bytes */
-	u32 data[MST_BLOCK_SIZE];		/* OUT */
+struct mst_read_block_st
+{
+    unsigned int offset;
+    unsigned int size;        /* in bytes */
+    u32 data[MST_BLOCK_SIZE]; /* OUT */
 };
 
-
 #define PCIMEM_WRITE_BLOCK _IOW(MST_BLOCK_ACCESS_MAGIC, 2, struct mst_write_block_st)
 
-struct mst_write_block_st {
-	unsigned int offset;
-	unsigned int size;			/* in bytes */
-	u32 data[MST_BLOCK_SIZE];
+struct mst_write_block_st
+{
+    unsigned int offset;
+    unsigned int size; /* in bytes */
+    u32 data[MST_BLOCK_SIZE];
 };
 
-
-#define PCICONF_READ4_BUFFER  _IOR(MST_BLOCK_ACCESS_MAGIC, 3, struct mst_read4_buffer_st)
-#define PCICONF_READ4_BUFFER_EX  _IOR(MST_BLOCK_ACCESS_MAGIC, 3, struct mst_read4_buffer_st)
+#define PCICONF_READ4_BUFFER _IOR(MST_BLOCK_ACCESS_MAGIC, 3, struct mst_read4_buffer_st)
+#define PCICONF_READ4_BUFFER_EX _IOR(MST_BLOCK_ACCESS_MAGIC, 3, struct mst_read4_buffer_st)
 // We support backward compatibility.
 // There is a known bug with PCICONF_READ4_BUFFER ioctl and data may be corrupted.
-#define PCICONF_READ4_BUFFER_BC  _IOR(MST_BLOCK_ACCESS_MAGIC, 3, struct mst_read4_st)
-struct mst_read4_buffer_st {
-	unsigned int address_space;
-	unsigned int offset;
-	int size;
-	unsigned int data[PCICONF_MAX_BUFFER_SIZE/4]; /*OUT*/
+#define PCICONF_READ4_BUFFER_BC _IOR(MST_BLOCK_ACCESS_MAGIC, 3, struct mst_read4_st)
+struct mst_read4_buffer_st
+{
+    unsigned int address_space;
+    unsigned int offset;
+    int size;
+    unsigned int data[PCICONF_MAX_BUFFER_SIZE / 4]; /*OUT*/
 };
 
 #define PCICONF_WRITE4_BUFFER _IOW(MST_BLOCK_ACCESS_MAGIC, 4, struct mst_write4_buffer_st)
-struct mst_write4_buffer_st {
-	unsigned int address_space;
-	unsigned int offset;
-	int size;
-	unsigned int data[PCICONF_MAX_BUFFER_SIZE/4]; /*IN*/
+struct mst_write4_buffer_st
+{
+    unsigned int address_space;
+    unsigned int offset;
+    int size;
+    unsigned int data[PCICONF_MAX_BUFFER_SIZE / 4]; /*IN*/
 };
 /****************************************************/
 /*
@@ -114,84 +114,84 @@ struct mst_write4_buffer_st {
  * Used to change conf registers on the fly,
  * by default we set the conf register to default values
  */
-#define PCICONF_INIT _IOC(_IOC_NONE, MST_PCICONF_MAGIC, 1, \
-			  sizeof(struct mst_pciconf_init_st))
-
-struct mst_pciconf_init_st {
-	unsigned int domain;
-	unsigned int bus;
-	unsigned int devfn;
-	/* Byte offsets in configuration space */
-	unsigned int addr_reg;
-	unsigned int data_reg;
+#define PCICONF_INIT _IOC(_IOC_NONE, MST_PCICONF_MAGIC, 1, sizeof(struct mst_pciconf_init_st))
+
+struct mst_pciconf_init_st
+{
+    unsigned int domain;
+    unsigned int bus;
+    unsigned int devfn;
+    /* Byte offsets in configuration space */
+    unsigned int addr_reg;
+    unsigned int data_reg;
 };
 
-
 #define PCICONF_STOP _IOC(_IOC_NONE, MST_PCICONF_MAGIC, 2, 0)
 
-
 /****************************************************/
 /*
  * INIT / STOP Memory Access
  * Used to change bar number and map the new bar on the fly,
  * by default we set and map bar to default bar number per device
  */
-#define PCIMEM_INIT _IOC(_IOC_NONE, MST_PCIMEM_MAGIC, 1, \
-			 sizeof(struct mst_mem_init_st))
+#define PCIMEM_INIT _IOC(_IOC_NONE, MST_PCIMEM_MAGIC, 1, sizeof(struct mst_mem_init_st))
 
-struct mst_mem_init_st {
-	unsigned int bar;
+struct mst_mem_init_st
+{
+    unsigned int bar;
 };
 
-
 #define PCIMEM_STOP _IOC(_IOC_NONE, MST_PCIMEM_MAGIC, 2, 0)
 
-
 /****************************************************/
 /* CONNECTX ORDERING WA */
-#define CONNECTX_WA_BASE 0xf0384	/* SEM BASE ADDR. SEM 0xf0380 is reserved for external tools usage. */
-#define CONNECTX_WA_SIZE 3			/* Size in entries */
+#define CONNECTX_WA_BASE 0xf0384 /* SEM BASE ADDR. SEM 0xf0380 is reserved for external tools usage. */
+#define CONNECTX_WA_SIZE 3       /* Size in entries */
 
 #define PCI_CONNECTX_WA _IOR(MST_CONNECTX_WA_MAGIC, 1, u_int32_t)
 
-struct mst_connectx_wa {
-	u32 connectx_wa_slot_p1;	/* connectx used slot plus 1. zero means unused */
+struct mst_connectx_wa
+{
+    u32 connectx_wa_slot_p1; /* connectx used slot plus 1. zero means unused */
 };
 
-
 /****************************************************/
 /* VPD ACCESS */
 #define PCICONF_VPD_READ4 _IOR(MST_VPD_MAGIC, 1, struct mst_vpd_read4_st)
-struct mst_vpd_read4_st {
-	unsigned int offset;	/* IN - must be aligned to DWORD */
-	unsigned int timeout;	/* IN - timeout in milliseconds or zero for default timeout */
-	u32 data;				/* OUT */
-
+struct mst_vpd_read4_st
+{
+    unsigned int offset;  /* IN - must be aligned to DWORD */
+    unsigned int timeout; /* IN - timeout in milliseconds or zero for default timeout */
+    u32 data;             /* OUT */
 };
 
 #define PCICONF_VPD_WRITE4 _IOW(MST_VPD_MAGIC, 2, struct mst_vpd_write4_st)
-struct mst_vpd_write4_st {
-	unsigned int offset;	/* IN - must be aligned to DWORD */
-	unsigned int timeout;	/* IN - timeout in milliseconds or zero for default timeout */
-	u32 data;				/* IN */
+struct mst_vpd_write4_st
+{
+    unsigned int offset;  /* IN - must be aligned to DWORD */
+    unsigned int timeout; /* IN - timeout in milliseconds or zero for default timeout */
+    u32 data;             /* IN */
 };
 
-#define PCICONF_GET_DMA_PAGES       _IOR (MST_PCICONF_MAGIC, 13, struct page_info_st)
-#define PCICONF_RELEASE_DMA_PAGES   _IOR (MST_PCICONF_MAGIC, 14, struct page_info_st)
+#define PCICONF_GET_DMA_PAGES _IOR(MST_PCICONF_MAGIC, 13, struct page_info_st)
+#define PCICONF_RELEASE_DMA_PAGES _IOR(MST_PCICONF_MAGIC, 14, struct page_info_st)
 
-struct page_address_st {
+struct page_address_st
+{
     u_int64_t dma_address;
     u_int64_t virtual_address;
 };
 
-struct page_info_st {
+struct page_info_st
+{
     unsigned int page_amount;
     unsigned long page_pointer_start;
     struct page_address_st page_address_array[PCICONF_MAX_PAGES_SIZE];
 };
 
-#define PCICONF_READ_DWORD_FROM_CONFIG_SPACE    _IOR (MST_PCICONF_MAGIC, 15, struct read_dword_from_config_space)
-struct read_dword_from_config_space {
+#define PCICONF_READ_DWORD_FROM_CONFIG_SPACE _IOR(MST_PCICONF_MAGIC, 15, struct read_dword_from_config_space)
+struct read_dword_from_config_space
+{
     unsigned int offset;
     unsigned int data;
 };
diff --git a/kernel/mst_kernel.h b/kernel/mst_kernel.h
index ab374b0c..e35e233f 100644
--- a/kernel/mst_kernel.h
+++ b/kernel/mst_kernel.h
@@ -6,7 +6,6 @@
 #ifndef _MST_KERNEL_H_
 #define _MST_KERNEL_H_
 
-
 /****************************************************/
 #include <linux/kernel.h>
 #include <linux/pci.h>
@@ -17,95 +16,85 @@
 #include <linux/mutex.h>
 #include <linux/io.h>
 #include <linux/byteorder/generic.h>
-#include<linux/cdev.h>
+#include <linux/cdev.h>
 
 #include "mst.h"
 
-
 /****************************************************/
-#define DRV_VERSION		"2.0.0"
-#define DRV_RELDATE		"Nov-27-2012"
-
+#define DRV_VERSION "2.0.0"
+#define DRV_RELDATE "Nov-27-2012"
 
 /****************************************************/
 /* defines */
-#define MST_NAME_SIZE				30
-#define MST_PREFIX					"  MST::  "
-
-#define MST_DEVICE_PREFIX		"mt"
-#define MST_PCICONF_DEVICE_NAME     "_mstconf"
-#define MST_PCIMEM_DEVICE_NAME      "_mstcr"
-
-#define MST_MELLANOX_PCI_VENDOR		0x15b3
+#define MST_NAME_SIZE 30
+#define MST_PREFIX "  MST::  "
 
-#define MST_CONF_ADDR_REG			88
-#define MST_CONF_DATA_REG			92
+#define MST_DEVICE_PREFIX "mt"
+#define MST_PCICONF_DEVICE_NAME "_mstconf"
+#define MST_PCIMEM_DEVICE_NAME "_mstcr"
 
-#define MST_VPD_DEFAULT_TOUT		2000	/* milli seconds */
+#define MST_MELLANOX_PCI_VENDOR 0x15b3
 
-#define mst_err(format, arg...)	\
-	pr_err("%s: %s %d: " format, MST_PREFIX, __func__, __LINE__, ## arg)
-#define mst_info(format, arg...)	\
-	pr_info("%s: %s %d: " format, MST_PREFIX, __func__, __LINE__, ## arg)
+#define MST_CONF_ADDR_REG 88
+#define MST_CONF_DATA_REG 92
 
-#define capability_support_info_message(dev, capability) \
-    mst_info("Device 0x%x (%x:%x:%x.%x) doesn't support %s capability.\n", \
-        dev->pci_dev->device,pci_domain_nr(dev->pci_dev->bus), \
-        dev->pci_dev->bus->number, PCI_SLOT(dev->pci_dev->devfn), \
-        PCI_FUNC(dev->pci_dev->devfn), #capability);
+#define MST_VPD_DEFAULT_TOUT 2000 /* milli seconds */
 
+#define mst_err(format, arg...) pr_err("%s: %s %d: " format, MST_PREFIX, __func__, __LINE__, ##arg)
+#define mst_info(format, arg...) pr_info("%s: %s %d: " format, MST_PREFIX, __func__, __LINE__, ##arg)
 
+#define capability_support_info_message(dev, capability)                                                 \
+    mst_info("Device 0x%x (%x:%x:%x.%x) doesn't support %s capability.\n", dev->pci_dev->device,         \
+             pci_domain_nr(dev->pci_dev->bus), dev->pci_dev->bus->number, PCI_SLOT(dev->pci_dev->devfn), \
+             PCI_FUNC(dev->pci_dev->devfn), #capability);
 
 /****************************************************/
 /* new types */
-enum dev_type {
-	PCICONF,
-	PCIMEM
+enum dev_type
+{
+    PCICONF,
+    PCIMEM
 };
 
-struct dma_page {
+struct dma_page
+{
     struct page** page_list;
     dma_addr_t dma_addr[PCICONF_MAX_PAGES_SIZE];
 };
 
-struct mst_dev_data {
-	int					addr_reg;				/* PCICONF address register */
-	int					data_reg;				/* PCICONF data register */
-	int                 wo_addr;
-	unsigned int		bar;					/* PCIMEM bar */
-	void				*hw_addr;				/* PCIMEM memory start */
-	char				name[MST_NAME_SIZE];	/* name of character device */
-	enum dev_type		type;					/* type of device */
-	struct pci_dev      *pci_dev;				/* device pci struct in kernel */
-	struct list_head	list;					/* list of mst_devices */
-	struct mutex		lock;					/* device lock */
-	int					vpd_cap_addr;			/* addr VPD capability */
-	int					major;					/* device major number */
-	int					initialized;			/* indicate if init done */
-
-	dev_t               my_dev;
-	struct cdev         mcdev;
-	struct class        *cl;
-
-	unsigned char		connectx_wa_slots;		/* wa for pci bug */
-    /* Vendor specific capability address */
-	int vendor_specific_cap;
+struct mst_dev_data
+{
+    int addr_reg; /* PCICONF address register */
+    int data_reg; /* PCICONF data register */
+    int wo_addr;
+    unsigned int bar;         /* PCIMEM bar */
+    void* hw_addr;            /* PCIMEM memory start */
+    char name[MST_NAME_SIZE]; /* name of character device */
+    enum dev_type type;       /* type of device */
+    struct pci_dev* pci_dev;  /* device pci struct in kernel */
+    struct list_head list;    /* list of mst_devices */
+    struct mutex lock;        /* device lock */
+    int vpd_cap_addr;         /* addr VPD capability */
+    int major;                /* device major number */
+    int initialized;          /* indicate if init done */
+
+    dev_t my_dev;
+    struct cdev mcdev;
+    struct class* cl;
+
+    unsigned char connectx_wa_slots; /* wa for pci bug */
+                                     /* Vendor specific capability address */
+    int vendor_specific_cap;
     /* status on VSEC supported spaces*/
-	int spaces_support_status;
-    
+    int spaces_support_status;
+
     // Allocated pages for the user space.
     struct dma_page dma_page;
 };
 
-
 /****************************************************/
-int pci_read4_vpd(struct mst_dev_data *dev, unsigned int timeout,
-		unsigned int offset, u32 *buf);
-
-int pci_write4_vpd(struct mst_dev_data *dev, unsigned int timeout,
-		unsigned int offset, u32 buf);
-
-
-#endif	/* _MST_KERNEL_H_ */
+int pci_read4_vpd(struct mst_dev_data* dev, unsigned int timeout, unsigned int offset, u32* buf);
 
+int pci_write4_vpd(struct mst_dev_data* dev, unsigned int timeout, unsigned int offset, u32 buf);
 
+#endif /* _MST_KERNEL_H_ */
diff --git a/kernel/mst_main.c b/kernel/mst_main.c
index eff1f024..3f01f2af 100644
--- a/kernel/mst_main.c
+++ b/kernel/mst_main.c
@@ -50,549 +50,571 @@
 MODULE_AUTHOR("Mahmoud Hasan");
 MODULE_DESCRIPTION("MST Module");
 MODULE_LICENSE("Dual BSD/GPL");
-MODULE_VERSION(DRV_VERSION " ("DRV_RELDATE")");
+MODULE_VERSION(DRV_VERSION " (" DRV_RELDATE ")");
 
 /****************************************************/
 /* globals variables */
 static const char mst_driver_version[] = DRV_VERSION;
-static const char mst_driver_string[] =
-		"Mellanox Technologies Software Tools Driver";
+static const char mst_driver_string[] = "Mellanox Technologies Software Tools Driver";
 
 LIST_HEAD(mst_devices);
 
 static struct pci_device_id mst_livefish_pci_table[] = {
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x01f6) }, /* MT27500 Family [ConnectX-3 Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x01f8) }, /* MT27520 Family [ConnectX-3 Pro Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x01ff) }, /* MT27600 Family [Connect-IB Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0209) }, /* MT27700 Family [ConnectX-4 Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x020b) }, /* MT27710 Family [ConnectX-4 Lx Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x020d) }, /* MT28800 Family [ConnectX-5 Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x020f) }, /* MT28908A0 Family [ConnectX-6 Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0210) }, /* MT28908A0 Family [ConnectX-6 Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0211) }, /* MT416842 Family [BlueField SoC Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0212) }, /* MT2892 Family [ConnectX-6 Dx Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0213) }, /* MT2892 Family [ConnectX-6 Dx Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0214) }, /* MT42822 Family [BlueField-2 SoC Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0215) }, /* MT42822 Family [BlueField-2 Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0216) }, /* MT2894 Family [ConnectX-6 Lx Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0217) }, /* MT2894 Family [ConnectX-6 Lx Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0218) }, /* MT2910 Family [ConnectX-7 Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0219) }, /* MT2910 Family [ConnectX-7 Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021a) }, /* MT43162 Family [BlueField-3 Lx SoC Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021b) }, /* MT43162 Family [BlueField-3 Lx Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021c) }, /* MT43244 Family [BlueField-3 SoC Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021d) }, /* MT43244 Family [BlueField-3 Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021e) }, /* CX8 Family [ConnectX-8 Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021e) }, /* CX8 Family [ConnectX-8 Secure Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0220) }, /* BF4 Family Flash Recovery [BlueField-4 SoC Flash Recovery] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021e) }, /* BF4 Family Secure Flash Recovery [BlueField-4 Secure Flash Recovery] */
-		{ 0, }
-	}; 
-
-static struct pci_device_id mst_bar_pci_table[] = { 
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4099) }, /* MT 27600 [ConnectX-3] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4103) }, /* MT27600 [ConnectX-3Pro] */
-		{ 0, }
-	};
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x01f6)}, /* MT27500 Family [ConnectX-3 Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x01f8)}, /* MT27520 Family [ConnectX-3 Pro Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x01ff)}, /* MT27600 Family [Connect-IB Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0209)}, /* MT27700 Family [ConnectX-4 Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x020b)}, /* MT27710 Family [ConnectX-4 Lx Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x020d)}, /* MT28800 Family [ConnectX-5 Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x020f)}, /* MT28908A0 Family [ConnectX-6 Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0210)}, /* MT28908A0 Family [ConnectX-6 Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0211)}, /* MT416842 Family [BlueField SoC Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0212)}, /* MT2892 Family [ConnectX-6 Dx Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0213)}, /* MT2892 Family [ConnectX-6 Dx Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0214)}, /* MT42822 Family [BlueField-2 SoC Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0215)}, /* MT42822 Family [BlueField-2 Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0216)}, /* MT2894 Family [ConnectX-6 Lx Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0217)}, /* MT2894 Family [ConnectX-6 Lx Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0218)}, /* MT2910 Family [ConnectX-7 Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0219)}, /* MT2910 Family [ConnectX-7 Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021a)}, /* MT43162 Family [BlueField-3 Lx SoC Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021b)}, /* MT43162 Family [BlueField-3 Lx Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021c)}, /* MT43244 Family [BlueField-3 SoC Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021d)}, /* MT43244 Family [BlueField-3 Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021e)}, /* CX8 Family [ConnectX-8 Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021e)}, /* CX8 Family [ConnectX-8 Secure Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x0220)}, /* BF4 Family Flash Recovery [BlueField-4 SoC Flash Recovery] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 0x021e)}, /* BF4 Family Secure Flash Recovery [BlueField-4 Secure Flash Recovery]
+                                                  */
+  {
+    0,
+  }};
+
+static struct pci_device_id mst_bar_pci_table[] = {
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4099)}, /* MT 27600 [ConnectX-3] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4103)}, /* MT27600 [ConnectX-3Pro] */
+  {
+    0,
+  }};
 
 static struct pci_device_id supported_pci_devices[] = {
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4099) }, /* MT27500 Family [ConnectX-3] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4103) }, /* MT27520 Family [ConnectX-3Pro] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4113) }, /* MT27600 Family [ConnectX-IB] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4115) }, /* MT27620 Family [ConnectX-4] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4117) }, /* MT2763.00.l0 Family [ConnectX-4Lx] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4119) }, /* MT27800 Family [ConnectX-5] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4121) }, /* MT28800 Family [ConnectX-5EX] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4123) }, /* MT28908 Family [ConnectX-6] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4125) }, /* MT2892 Family [ConnectX-6DX] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4127) }, /* MT2894 Family [ConnectX-6LX] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4129) }, /* MT2910 Family [ConnectX-7] */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41682) }, /* MT416842 Family BlueField integrated ConnectX-5 network controller */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41686) }, /* MT42822 Family BlueField2 integrated ConnectX-6 DX network controller */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41692) }, /* MT43244 Family BlueField3 integrated ConnectX-7 network controller */
-		{ PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41694) }, /* BF4 Family integrated network controller */
-		{ 0, }
-	};
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4099)},  /* MT27500 Family [ConnectX-3] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4103)},  /* MT27520 Family [ConnectX-3Pro] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4113)},  /* MT27600 Family [ConnectX-IB] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4115)},  /* MT27620 Family [ConnectX-4] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4117)},  /* MT2763.00.l0 Family [ConnectX-4Lx] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4119)},  /* MT27800 Family [ConnectX-5] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4121)},  /* MT28800 Family [ConnectX-5EX] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4123)},  /* MT28908 Family [ConnectX-6] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4125)},  /* MT2892 Family [ConnectX-6DX] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4127)},  /* MT2894 Family [ConnectX-6LX] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 4129)},  /* MT2910 Family [ConnectX-7] */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41682)}, /* MT416842 Family BlueField integrated ConnectX-5 network controller */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41686)}, /* MT42822 Family BlueField2 integrated ConnectX-6 DX network controller
+                                                 */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41692)}, /* MT43244 Family BlueField3 integrated ConnectX-7 network controller */
+  {PCI_DEVICE(MST_MELLANOX_PCI_VENDOR, 41694)}, /* BF4 Family integrated network controller */
+  {
+    0,
+  }};
 
 /****************** VSEC SUPPORT ********************/
 
 // BIT Slicing macros
-#define ONES32(size)                    ((size)?(0xffffffff>>(32-(size))):0)
-#define MASK32(offset, size)             (ONES32(size)<<(offset))
+#define ONES32(size) ((size) ? (0xffffffff >> (32 - (size))) : 0)
+#define MASK32(offset, size) (ONES32(size) << (offset))
 
-#define EXTRACT_C(source, offset, size)   ((((unsigned int)(source))>>(offset)) & ONES32(size))
-#define EXTRACT(src, start, len)          (((len) == 32)?(src):EXTRACT_C(src, start, len))
+#define EXTRACT_C(source, offset, size) ((((unsigned int)(source)) >> (offset)) & ONES32(size))
+#define EXTRACT(src, start, len) (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
 
-#define MERGE_C(rsrc1, rsrc2, start, len)  ((((rsrc2)<<(start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
-#define MERGE(rsrc1, rsrc2, start, len)    (((len) == 32)?(rsrc2):MERGE_C(rsrc1, rsrc2, start, len))
+#define MERGE_C(rsrc1, rsrc2, start, len) \
+    ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
+#define MERGE(rsrc1, rsrc2, start, len) (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
 
 /* Allow minor numbers 0-255 */
 #define MAXMINOR 256
 #define BUFFER_SIZE 256
 #define MLNX_VENDOR_SPECIFIC_CAP_ID 0x9
 #define CRSPACE_DOMAIN 0x2
-#define AS_ICMD      0x3
-#define AS_CR_SPACE  0x2
+#define AS_ICMD 0x3
+#define AS_CR_SPACE 0x2
 #define AS_SEMAPHORE 0xa
 
 /* PCI address space related enum*/
-enum {
-	PCI_CAP_PTR = 0x34, PCI_HDR_SIZE = 0x40, PCI_EXT_SPACE_ADDR = 0xff,
+enum
+{
+    PCI_CAP_PTR = 0x34,
+    PCI_HDR_SIZE = 0x40,
+    PCI_EXT_SPACE_ADDR = 0xff,
 
-	PCI_CTRL_OFFSET = 0x4, // for space / semaphore / auto-increment bit
-	PCI_COUNTER_OFFSET = 0x8,
-	PCI_SEMAPHORE_OFFSET = 0xc,
-	PCI_ADDR_OFFSET = 0x10,
-	PCI_DATA_OFFSET = 0x14,
+    PCI_CTRL_OFFSET = 0x4, // for space / semaphore / auto-increment bit
+    PCI_COUNTER_OFFSET = 0x8,
+    PCI_SEMAPHORE_OFFSET = 0xc,
+    PCI_ADDR_OFFSET = 0x10,
+    PCI_DATA_OFFSET = 0x14,
 
-	PCI_FLAG_BIT_OFFS = 31,
+    PCI_FLAG_BIT_OFFS = 31,
 
-	PCI_SPACE_BIT_OFFS = 0,
-	PCI_SPACE_BIT_LEN = 16,
+    PCI_SPACE_BIT_OFFS = 0,
+    PCI_SPACE_BIT_LEN = 16,
 
-	PCI_STATUS_BIT_OFFS = 29,
-	PCI_STATUS_BIT_LEN = 3,
+    PCI_STATUS_BIT_OFFS = 29,
+    PCI_STATUS_BIT_LEN = 3,
 };
 
 /* Mellanox vendor specific enum */
-enum {
-	CAP_ID = 0x9, IFC_MAX_RETRIES = 0x10000, SEM_MAX_RETRIES = 0x1000
+enum
+{
+    CAP_ID = 0x9,
+    IFC_MAX_RETRIES = 0x10000,
+    SEM_MAX_RETRIES = 0x1000
 };
 
 /* PCI operation enum(read or write)*/
-enum {
-	READ_OP = 0, WRITE_OP = 1,
+enum
+{
+    READ_OP = 0,
+    WRITE_OP = 1,
 };
 
 /* VSEC space status enum*/
-enum {
-	SS_UNINITIALIZED = 0,
-	SS_ALL_SPACES_SUPPORTED = 1,
-	SS_NOT_ALL_SPACES_SUPPORTED = 2
+enum
+{
+    SS_UNINITIALIZED = 0,
+    SS_ALL_SPACES_SUPPORTED = 1,
+    SS_NOT_ALL_SPACES_SUPPORTED = 2
 };
 
 // VSEC supported macro
-#define VSEC_FULLY_SUPPORTED(dev) (((dev)->vendor_specific_cap) && ((dev)->spaces_support_status == SS_ALL_SPACES_SUPPORTED))
+#define VSEC_FULLY_SUPPORTED(dev) \
+    (((dev)->vendor_specific_cap) && ((dev)->spaces_support_status == SS_ALL_SPACES_SUPPORTED))
 
-static int _vendor_specific_sem(struct mst_dev_data *dev, int state)
+static int _vendor_specific_sem(struct mst_dev_data* dev, int state)
 {
-	u32 lock_val;
-	u32 counter = 0;
-	int retries = 0;
-	int ret;
-
-	if (!state) { // unlock
-		ret = pci_write_config_dword(dev->pci_dev,
-				dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, 0);
-		if (ret)
-			return ret;
-	} else { // lock
-		do {
-			if (retries > SEM_MAX_RETRIES)
-				return -1;
-			// read semaphore untill 0x0
-			ret = pci_read_config_dword(dev->pci_dev,
-					dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, &lock_val);
-			if (ret)
-				return ret;
-
-			if (lock_val) { //semaphore is taken
-				retries++;
-				udelay(1000); // wait for current op to end
-				continue;
-			}
-			//read ticket
-			ret = pci_read_config_dword(dev->pci_dev,
-					dev->vendor_specific_cap + PCI_COUNTER_OFFSET, &counter);
-			if (ret)
-				return ret;
-			//write ticket to semaphore dword
-			ret = pci_write_config_dword(dev->pci_dev,
-					dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, counter);
-			if (ret)
-				return ret;
-			// read back semaphore make sure ticket == semaphore else repeat
-			ret = pci_read_config_dword(dev->pci_dev,
-					dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, &lock_val);
-			if (ret)
-				return ret;
-			retries++;
-		} while (counter != lock_val);
-	}
-	return 0;
+    u32 lock_val;
+    u32 counter = 0;
+    int retries = 0;
+    int ret;
+
+    if (!state)
+    { // unlock
+        ret = pci_write_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, 0);
+        if (ret)
+            return ret;
+    }
+    else
+    { // lock
+        do
+        {
+            if (retries > SEM_MAX_RETRIES)
+                return -1;
+            // read semaphore untill 0x0
+            ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, &lock_val);
+            if (ret)
+                return ret;
+
+            if (lock_val)
+            { // semaphore is taken
+                retries++;
+                udelay(1000); // wait for current op to end
+                continue;
+            }
+            // read ticket
+            ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_COUNTER_OFFSET, &counter);
+            if (ret)
+                return ret;
+            // write ticket to semaphore dword
+            ret = pci_write_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, counter);
+            if (ret)
+                return ret;
+            // read back semaphore make sure ticket == semaphore else repeat
+            ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_SEMAPHORE_OFFSET, &lock_val);
+            if (ret)
+                return ret;
+            retries++;
+        } while (counter != lock_val);
+    }
+    return 0;
 }
 
-static int _wait_on_flag(struct mst_dev_data *dev, u8 expected_val)
+static int _wait_on_flag(struct mst_dev_data* dev, u8 expected_val)
 {
-	int retries = 0;
-	int ret;
-	u32 flag;
-
-	do {
-		if (retries > IFC_MAX_RETRIES)
-			return -1;
-
-		ret = pci_read_config_dword(dev->pci_dev,
-				dev->vendor_specific_cap + PCI_ADDR_OFFSET, &flag);
-		if (ret)
-			return ret;
-
-		flag = EXTRACT(flag, PCI_FLAG_BIT_OFFS, 1);
-		retries++;
-		if ((retries & 0xf) == 0) { // dont sleep always
-			//usleep_range(1,5);
-		}
-	} while (flag != expected_val);
-	return 0;
+    int retries = 0;
+    int ret;
+    u32 flag;
+
+    do
+    {
+        if (retries > IFC_MAX_RETRIES)
+            return -1;
+
+        ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_ADDR_OFFSET, &flag);
+        if (ret)
+            return ret;
+
+        flag = EXTRACT(flag, PCI_FLAG_BIT_OFFS, 1);
+        retries++;
+        if ((retries & 0xf) == 0)
+        { // dont sleep always
+          // usleep_range(1,5);
+        }
+    } while (flag != expected_val);
+    return 0;
 }
 
-static int _set_addr_space(struct mst_dev_data *dev, u16 space)
+static int _set_addr_space(struct mst_dev_data* dev, u16 space)
 {
-	// read modify write
-	u32 val;
-	int ret;
-
-	ret = pci_read_config_dword(dev->pci_dev,
-			dev->vendor_specific_cap + PCI_CTRL_OFFSET, &val);
-	if (ret)
-		return ret;
-	val = MERGE(val, space, PCI_SPACE_BIT_OFFS, PCI_SPACE_BIT_LEN);
-	ret = pci_write_config_dword(dev->pci_dev,
-			dev->vendor_specific_cap + PCI_CTRL_OFFSET, val);
-	if (ret)
-		return ret;
-	// read status and make sure space is supported
-	ret = pci_read_config_dword(dev->pci_dev,
-			dev->vendor_specific_cap + PCI_CTRL_OFFSET, &val);
-	if (ret)
-		return ret;
-
-	if (EXTRACT(val, PCI_STATUS_BIT_OFFS, PCI_STATUS_BIT_LEN) == 0) {
-		//      mst_err("CRSPACE %d is not supported !\n", space);
-		return -1;
-	}
-	//  mst_err("CRSPACE %d is supported !\n", space);
-	return 0;
+    // read modify write
+    u32 val;
+    int ret;
+
+    ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_CTRL_OFFSET, &val);
+    if (ret)
+        return ret;
+    val = MERGE(val, space, PCI_SPACE_BIT_OFFS, PCI_SPACE_BIT_LEN);
+    ret = pci_write_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_CTRL_OFFSET, val);
+    if (ret)
+        return ret;
+    // read status and make sure space is supported
+    ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_CTRL_OFFSET, &val);
+    if (ret)
+        return ret;
+
+    if (EXTRACT(val, PCI_STATUS_BIT_OFFS, PCI_STATUS_BIT_LEN) == 0)
+    {
+        //      mst_err("CRSPACE %d is not supported !\n", space);
+        return -1;
+    }
+    //  mst_err("CRSPACE %d is supported !\n", space);
+    return 0;
 }
 
-static int _pciconf_rw(struct mst_dev_data *dev, unsigned int offset, u32 *data,
-		int rw)
+static int _pciconf_rw(struct mst_dev_data* dev, unsigned int offset, u32* data, int rw)
 {
-	int ret = 0;
-	u32 address = offset;
-
-	//last 2 bits must be zero as we only allow 30 bits addresses
-	if (EXTRACT(address, 30, 2))
-		return -1;
-
-	address = MERGE(address, (rw ? 1 : 0), PCI_FLAG_BIT_OFFS, 1);
-	if (rw == WRITE_OP) {
-		// write data
-		ret = pci_write_config_dword(dev->pci_dev,
-				dev->vendor_specific_cap + PCI_DATA_OFFSET, *data);
-		if (ret)
-			return ret;
-		// write address
-		ret = pci_write_config_dword(dev->pci_dev,
-				dev->vendor_specific_cap + PCI_ADDR_OFFSET, address);
-		if (ret)
-			return ret;
-		// wait on flag
-		ret = _wait_on_flag(dev, 0);
-	} else {
-		// write address
-		ret = pci_write_config_dword(dev->pci_dev,
-				dev->vendor_specific_cap + PCI_ADDR_OFFSET, address);
-		if (ret)
-			return ret;
-		// wait on flag
-		ret = _wait_on_flag(dev, 1);
-		// read data
-		ret = pci_read_config_dword(dev->pci_dev,
-				dev->vendor_specific_cap + PCI_DATA_OFFSET, data);
-		if (ret)
-			return ret;
-	}
-	return ret;
+    int ret = 0;
+    u32 address = offset;
+
+    // last 2 bits must be zero as we only allow 30 bits addresses
+    if (EXTRACT(address, 30, 2))
+        return -1;
+
+    address = MERGE(address, (rw ? 1 : 0), PCI_FLAG_BIT_OFFS, 1);
+    if (rw == WRITE_OP)
+    {
+        // write data
+        ret = pci_write_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_DATA_OFFSET, *data);
+        if (ret)
+            return ret;
+        // write address
+        ret = pci_write_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_ADDR_OFFSET, address);
+        if (ret)
+            return ret;
+        // wait on flag
+        ret = _wait_on_flag(dev, 0);
+    }
+    else
+    {
+        // write address
+        ret = pci_write_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_ADDR_OFFSET, address);
+        if (ret)
+            return ret;
+        // wait on flag
+        ret = _wait_on_flag(dev, 1);
+        // read data
+        ret = pci_read_config_dword(dev->pci_dev, dev->vendor_specific_cap + PCI_DATA_OFFSET, data);
+        if (ret)
+            return ret;
+    }
+    return ret;
 }
 
-static int _send_pci_cmd_int(struct mst_dev_data *dev, int space,
-		unsigned int offset, u32 *data, int rw)
+static int _send_pci_cmd_int(struct mst_dev_data* dev, int space, unsigned int offset, u32* data, int rw)
 {
-	int ret = 0;
-
-	// take semaphore
-	ret = _vendor_specific_sem(dev, 1);
-	if (ret)
-		return ret;
-	// set address space
-	ret = _set_addr_space(dev, space);
-	if (ret)
-		goto cleanup;
-	// read/write the data
-	ret = _pciconf_rw(dev, offset, data, rw);
+    int ret = 0;
+
+    // take semaphore
+    ret = _vendor_specific_sem(dev, 1);
+    if (ret)
+        return ret;
+    // set address space
+    ret = _set_addr_space(dev, space);
+    if (ret)
+        goto cleanup;
+    // read/write the data
+    ret = _pciconf_rw(dev, offset, data, rw);
 cleanup:
-	// clear semaphore
-	_vendor_specific_sem(dev, 0);
-	return ret;
+    // clear semaphore
+    _vendor_specific_sem(dev, 0);
+    return ret;
 }
 
-static int _block_op(struct mst_dev_data *dev, int space, unsigned int offset,
-		int size, u32 *data, int rw)
+static int _block_op(struct mst_dev_data* dev, int space, unsigned int offset, int size, u32* data, int rw)
 {
-	int i;
-	int ret = 0;
-	int wrote_or_read = size;
-
-	if (size % 4)
-		return -1;
-	// lock semaphore and set address space
-	ret = _vendor_specific_sem(dev, 1);
-	if (ret)
-		return -1;
-	// set address space
-	ret = _set_addr_space(dev, space);
-	if (ret) {
-		wrote_or_read = -1;
-		goto cleanup;
-	}
-
-	for (i = 0; i < size; i += 4) {
-		if (_pciconf_rw(dev, offset + i, &(data[(i >> 2)]), rw)) {
-			wrote_or_read = i;
-			goto cleanup;
-		}
-	}
+    int i;
+    int ret = 0;
+    int wrote_or_read = size;
+
+    if (size % 4)
+        return -1;
+    // lock semaphore and set address space
+    ret = _vendor_specific_sem(dev, 1);
+    if (ret)
+        return -1;
+    // set address space
+    ret = _set_addr_space(dev, space);
+    if (ret)
+    {
+        wrote_or_read = -1;
+        goto cleanup;
+    }
+
+    for (i = 0; i < size; i += 4)
+    {
+        if (_pciconf_rw(dev, offset + i, &(data[(i >> 2)]), rw))
+        {
+            wrote_or_read = i;
+            goto cleanup;
+        }
+    }
 cleanup:
-	_vendor_specific_sem(dev, 0);
-	return wrote_or_read;
+    _vendor_specific_sem(dev, 0);
+    return wrote_or_read;
 }
 
-static int write4_vsec(struct mst_dev_data *dev, int addresss_domain,
-		unsigned int offset, unsigned int data)
+static int write4_vsec(struct mst_dev_data* dev, int addresss_domain, unsigned int offset, unsigned int data)
 {
-	int ret;
+    int ret;
 
-	ret = _send_pci_cmd_int(dev, addresss_domain, offset, &data, WRITE_OP);
-	if (ret)
-		return -1;
-	return 0;
+    ret = _send_pci_cmd_int(dev, addresss_domain, offset, &data, WRITE_OP);
+    if (ret)
+        return -1;
+    return 0;
 }
 
-static int read4_vsec(struct mst_dev_data *dev, int address_space,
-		unsigned int offset, unsigned int *data)
+static int read4_vsec(struct mst_dev_data* dev, int address_space, unsigned int offset, unsigned int* data)
 {
-	int ret;
-	//mst_info("Read from VSEC: offset: %#x\n", offset);
-	ret = _send_pci_cmd_int(dev, address_space, offset, data, READ_OP);
-	if (ret)
-		return -1;
-	return 0;
+    int ret;
+    // mst_info("Read from VSEC: offset: %#x\n", offset);
+    ret = _send_pci_cmd_int(dev, address_space, offset, data, READ_OP);
+    if (ret)
+        return -1;
+    return 0;
 }
 
-int pciconf_read4_legacy(struct mst_dev_data *dev, unsigned int offset,
-		unsigned int *data)
+int pciconf_read4_legacy(struct mst_dev_data* dev, unsigned int offset, unsigned int* data)
 {
-	int res = 0;
-	unsigned int new_offset = offset;
-	//mst_info("pciconf_read4_legacy: offset: %#x\n", offset);
-	if (dev->type != PCICONF)
-		return -1;
-	if (dev->wo_addr)
-		new_offset |= 0x1;
-	/* write the wanted address to addr register */
-	res = pci_write_config_dword(dev->pci_dev, dev->addr_reg, new_offset);
-	if (res) {
-		mst_err("pci_write_config_dword failed\n");
-		return res;
-	}
-
-	/* read the result from data register */
-	res = pci_read_config_dword(dev->pci_dev, dev->data_reg, data);
-	if (res) {
-		mst_err("pci_read_config_dword failed\n");
-		return res;
-	}
-	return 0;
+    int res = 0;
+    unsigned int new_offset = offset;
+    // mst_info("pciconf_read4_legacy: offset: %#x\n", offset);
+    if (dev->type != PCICONF)
+        return -1;
+    if (dev->wo_addr)
+        new_offset |= 0x1;
+    /* write the wanted address to addr register */
+    res = pci_write_config_dword(dev->pci_dev, dev->addr_reg, new_offset);
+    if (res)
+    {
+        mst_err("pci_write_config_dword failed\n");
+        return res;
+    }
+
+    /* read the result from data register */
+    res = pci_read_config_dword(dev->pci_dev, dev->data_reg, data);
+    if (res)
+    {
+        mst_err("pci_read_config_dword failed\n");
+        return res;
+    }
+    return 0;
 }
 
-int pciconf_write4_legacy(struct mst_dev_data *dev, unsigned int offset,
-		unsigned int data)
+int pciconf_write4_legacy(struct mst_dev_data* dev, unsigned int offset, unsigned int data)
 {
-	int res = 0;
-
-	if (dev->type != PCICONF)
-		return -1;
-	if (dev->wo_addr) {
-		/*
-		 * Write operation with new WO GW
-		 * 1. Write data
-		 * 2. Write address
-		 */
-
-		/* write the data to data register */
-		res = pci_write_config_dword(dev->pci_dev, dev->data_reg, data);
-		if (res) {
-			mst_err("pci_write_config_dword failed\n");
-			return res;
-		}
-		/* write the destination address to addr register */
-		res = pci_write_config_dword(dev->pci_dev, dev->addr_reg, offset);
-		if (res) {
-			mst_err("pci_write_config_dword failed\n");
-			return res;
-		}
-
-	} else {
-		/* write the destination address to addr register */
-		res = pci_write_config_dword(dev->pci_dev, dev->addr_reg, offset);
-		if (res) {
-			mst_err("pci_write_conflig_dword failed\n");
-			return res;
-		}
-
-		/* write the data to data register */
-		res = pci_write_config_dword(dev->pci_dev, dev->data_reg, data);
-		if (res) {
-			mst_err("pci_write_config_dword failed\n");
-			return res;
-		}
-	}
-	return 0;
+    int res = 0;
+
+    if (dev->type != PCICONF)
+        return -1;
+    if (dev->wo_addr)
+    {
+        /*
+         * Write operation with new WO GW
+         * 1. Write data
+         * 2. Write address
+         */
+
+        /* write the data to data register */
+        res = pci_write_config_dword(dev->pci_dev, dev->data_reg, data);
+        if (res)
+        {
+            mst_err("pci_write_config_dword failed\n");
+            return res;
+        }
+        /* write the destination address to addr register */
+        res = pci_write_config_dword(dev->pci_dev, dev->addr_reg, offset);
+        if (res)
+        {
+            mst_err("pci_write_config_dword failed\n");
+            return res;
+        }
+    }
+    else
+    {
+        /* write the destination address to addr register */
+        res = pci_write_config_dword(dev->pci_dev, dev->addr_reg, offset);
+        if (res)
+        {
+            mst_err("pci_write_conflig_dword failed\n");
+            return res;
+        }
+
+        /* write the data to data register */
+        res = pci_write_config_dword(dev->pci_dev, dev->data_reg, data);
+        if (res)
+        {
+            mst_err("pci_write_config_dword failed\n");
+            return res;
+        }
+    }
+    return 0;
 }
 
-static int write4_block_vsec(struct mst_dev_data *dev, int address_space,
-		unsigned int offset, int size, u32 *data)
+static int write4_block_vsec(struct mst_dev_data* dev, int address_space, unsigned int offset, int size, u32* data)
 {
-	//    mst_info("HERE %#x %#x %#x\n", address_space, offset, *data);
-	return _block_op(dev, address_space, offset, size, data, WRITE_OP);
+    //    mst_info("HERE %#x %#x %#x\n", address_space, offset, *data);
+    return _block_op(dev, address_space, offset, size, data, WRITE_OP);
 }
 
-static int read4_block_vsec(struct mst_dev_data *dev, int address_space,
-		unsigned int offset, int size, u32 *data)
+static int read4_block_vsec(struct mst_dev_data* dev, int address_space, unsigned int offset, int size, u32* data)
 {
-	//    mst_info("HERE %#x %#x %#x\n", address_space, offset, *data);
-	return _block_op(dev, address_space, offset, size, data, READ_OP);
+    //    mst_info("HERE %#x %#x %#x\n", address_space, offset, *data);
+    return _block_op(dev, address_space, offset, size, data, READ_OP);
 }
 
-static int get_space_support_status(struct mst_dev_data *dev)
+static int get_space_support_status(struct mst_dev_data* dev)
 {
-	int ret;
-	//    printk("[MST] Checking if the Vendor CAP %d supports the SPACES in devices\n", vend_cap);
-	if ((!dev->vendor_specific_cap) || (!dev->pci_dev))
-		return 0;
-	if (dev->spaces_support_status != SS_UNINITIALIZED)
-		return 0;
-	// take semaphore
-	ret = _vendor_specific_sem(dev, 1);
-	if (ret) {
-		mst_err("Failed to lock VSEC semaphore\n");
-		return 1;
-	}
-
-    if (_set_addr_space(dev, AS_CR_SPACE)) {
+    int ret;
+    //    printk("[MST] Checking if the Vendor CAP %d supports the SPACES in devices\n", vend_cap);
+    if ((!dev->vendor_specific_cap) || (!dev->pci_dev))
+        return 0;
+    if (dev->spaces_support_status != SS_UNINITIALIZED)
+        return 0;
+    // take semaphore
+    ret = _vendor_specific_sem(dev, 1);
+    if (ret)
+    {
+        mst_err("Failed to lock VSEC semaphore\n");
+        return 1;
+    }
+
+    if (_set_addr_space(dev, AS_CR_SPACE))
+    {
         capability_support_info_message(dev, CR_SPACE);
         dev->spaces_support_status = SS_NOT_ALL_SPACES_SUPPORTED;
     }
-    else if (_set_addr_space(dev, AS_ICMD)) {
+    else if (_set_addr_space(dev, AS_ICMD))
+    {
         capability_support_info_message(dev, ICMD);
         dev->spaces_support_status = SS_NOT_ALL_SPACES_SUPPORTED;
-	}
-    else if (_set_addr_space(dev, AS_SEMAPHORE)) {
+    }
+    else if (_set_addr_space(dev, AS_SEMAPHORE))
+    {
         capability_support_info_message(dev, SEMAPHORE);
-		dev->spaces_support_status = SS_NOT_ALL_SPACES_SUPPORTED;
-	} else {
-		dev->spaces_support_status = SS_ALL_SPACES_SUPPORTED;
-	}
-
-	// clear semaphore
-	_vendor_specific_sem(dev, 0);
-	return 0;
+        dev->spaces_support_status = SS_NOT_ALL_SPACES_SUPPORTED;
+    }
+    else
+    {
+        dev->spaces_support_status = SS_ALL_SPACES_SUPPORTED;
+    }
+
+    // clear semaphore
+    _vendor_specific_sem(dev, 0);
+    return 0;
 }
 
 /********** WO GW ************/
 
 #define WO_REG_ADDR_DATA 0xbadacce5
-#define DEVID_OFFSET     0xf0014
-int is_wo_gw(struct pci_dev *pcidev, unsigned int addr_reg)
+#define DEVID_OFFSET 0xf0014
+int is_wo_gw(struct pci_dev* pcidev, unsigned int addr_reg)
 {
-	int ret;
-	unsigned int data = 0;
-
-	ret = pci_write_config_dword(pcidev, addr_reg, DEVID_OFFSET);
-	if (ret)
-		return 0;
-	ret = pci_read_config_dword(pcidev, addr_reg, &data);
-	if (ret)
-		return 0;
-	if (data == WO_REG_ADDR_DATA)
-		return 1;
-	return 0;
+    int ret;
+    unsigned int data = 0;
+
+    ret = pci_write_config_dword(pcidev, addr_reg, DEVID_OFFSET);
+    if (ret)
+        return 0;
+    ret = pci_read_config_dword(pcidev, addr_reg, &data);
+    if (ret)
+        return 0;
+    if (data == WO_REG_ADDR_DATA)
+        return 1;
+    return 0;
 }
 
 /****************************************************/
-static int mst_open(struct inode *inode, struct file *file)
+static int mst_open(struct inode* inode, struct file* file)
 {
-	struct mst_file_data *md = NULL;
+    struct mst_file_data* md = NULL;
 
-	md = kmalloc(sizeof(struct mst_connectx_wa), GFP_KERNEL);
-	if (!md)
-		return -ERESTARTSYS;
+    md = kmalloc(sizeof(struct mst_connectx_wa), GFP_KERNEL);
+    if (!md)
+        return -ERESTARTSYS;
 
-	memset(md, 0, sizeof(struct mst_connectx_wa));
+    memset(md, 0, sizeof(struct mst_connectx_wa));
 
-	file->private_data = md;
+    file->private_data = md;
 
-	return 0;
+    return 0;
 }
 
 /****************************************************/
-static int mst_release(struct inode *inode, struct file *file)
+static int mst_release(struct inode* inode, struct file* file)
 {
-	int res = 0;
-	struct mst_dev_data *dev = NULL;
-	struct mst_dev_data *cur = NULL;
-	unsigned int slot_mask;
-	struct mst_connectx_wa *md = file->private_data;
-
-	/*
-	 * make sure the device is available since it
-	 * could be removed by hotplug event
-	 * if available grab its lock
-	 */
-	list_for_each_entry(cur, &mst_devices, list) {
-		if (cur->major == imajor(inode)) {
-			dev = cur;
-			mutex_lock(&dev->lock);
-			break;
-		}
-	}
-
-	if (!dev) {
-		mst_err("failed to find device with major=%d\n",
-				imajor(inode));
-		res = -ENODEV;
-		goto out;
-	}
-
-	slot_mask = ~(1 << (md->connectx_wa_slot_p1 - 1));
-	dev->connectx_wa_slots &= slot_mask;
-
-	/*
-	 * mst_info("CONNECTX_WA: Released slot %u. Current slots: %02x\n",
-	 *			md->connectx_wa_slot_p1 - 1, dev->connectx_wa_slots);
-	 */
-	md->connectx_wa_slot_p1 = 0;
-	mutex_unlock(&dev->lock);
-
-	kfree(file->private_data);
-	file->private_data = NULL;
+    int res = 0;
+    struct mst_dev_data* dev = NULL;
+    struct mst_dev_data* cur = NULL;
+    unsigned int slot_mask;
+    struct mst_connectx_wa* md = file->private_data;
+
+    /*
+     * make sure the device is available since it
+     * could be removed by hotplug event
+     * if available grab its lock
+     */
+    list_for_each_entry(cur, &mst_devices, list)
+    {
+        if (cur->major == imajor(inode))
+        {
+            dev = cur;
+            mutex_lock(&dev->lock);
+            break;
+        }
+    }
+
+    if (!dev)
+    {
+        mst_err("failed to find device with major=%d\n", imajor(inode));
+        res = -ENODEV;
+        goto out;
+    }
+
+    slot_mask = ~(1 << (md->connectx_wa_slot_p1 - 1));
+    dev->connectx_wa_slots &= slot_mask;
+
+    /*
+     * mst_info("CONNECTX_WA: Released slot %u. Current slots: %02x\n",
+     *			md->connectx_wa_slot_p1 - 1, dev->connectx_wa_slots);
+     */
+    md->connectx_wa_slot_p1 = 0;
+    mutex_unlock(&dev->lock);
+
+    kfree(file->private_data);
+    file->private_data = NULL;
 
 out:
-	return res;
+    return res;
 }
 
-
 static int page_pin(struct mst_dev_data* dev, struct page_info_st* page_info)
 {
     unsigned long page_pointer_start = page_info->page_pointer_start;
@@ -600,31 +622,33 @@ static int page_pin(struct mst_dev_data* dev, struct page_info_st* page_info)
     unsigned int pages_size = page_amount * PAGE_SIZE;
     unsigned long end_of_buffer = page_pointer_start + pages_size;
     unsigned int gup_flags = FOLL_WRITE;
-    int page_mapped_counter= 0;
+    int page_mapped_counter = 0;
     int page_counter = 0;
     int total_pinned = 0;
 
     // If the combination of the addr and size requested for this memory
     // region causes an integer overflow, return error.
-    if (((end_of_buffer) < page_pointer_start) ||
-            PAGE_ALIGN(end_of_buffer) < (end_of_buffer) ||
-            page_amount < 1) {
+    if (((end_of_buffer) < page_pointer_start) || PAGE_ALIGN(end_of_buffer) < (end_of_buffer) || page_amount < 1)
+    {
         return -EINVAL;
     }
 
     // Check if we allow locking memory.
-    if (!can_do_mlock()) {
+    if (!can_do_mlock())
+    {
         return -EPERM;
     }
 
     // Allocate the page list.
-    dev->dma_page.page_list = kcalloc(page_amount, sizeof(struct page *), GFP_KERNEL);
-    if (!dev->dma_page.page_list) {
+    dev->dma_page.page_list = kcalloc(page_amount, sizeof(struct page*), GFP_KERNEL);
+    if (!dev->dma_page.page_list)
+    {
         return -ENOMEM;
     }
 
     // Go over the user memory buffer and pin user pages in memory.
-    while (total_pinned < page_amount) {
+    while (total_pinned < page_amount)
+    {
         // Save the current number of pages to pin
         int num_pages = page_amount - total_pinned;
 
@@ -637,8 +661,7 @@ static int page_pin(struct mst_dev_data* dev, struct page_info_st* page_info)
         // Attempt to pin user pages in memory.
         // Returns number of pages pinned - this may be fewer than the number requested
         //   or -errno in case of error.
-        int pinned_pages = get_user_pages_fast(current_ptr, num_pages,
-                                               gup_flags, current_pages);
+        int pinned_pages = get_user_pages_fast(current_ptr, num_pages, gup_flags, current_pages);
         if (pinned_pages < 1)
         {
             kfree(dev->dma_page.page_list);
@@ -647,23 +670,21 @@ static int page_pin(struct mst_dev_data* dev, struct page_info_st* page_info)
 
         // When the parameter 'inter_iommu' is on, we need to set up
         // a mapping on a pages in order to access the physical address
-        while(page_mapped_counter < pinned_pages)
+        while (page_mapped_counter < pinned_pages)
         {
             int current_page = total_pinned + page_mapped_counter;
 
             // Get the dma address.
             dev->dma_page.dma_addr[current_page] =
-                dma_map_page(&dev->pci_dev->dev, current_pages[current_page],
-                             0, PAGE_SIZE,
-                             DMA_BIDIRECTIONAL);
+              dma_map_page(&dev->pci_dev->dev, current_pages[current_page], 0, PAGE_SIZE, DMA_BIDIRECTIONAL);
             // Do we get a valid dma address ?
-            if (dma_mapping_error(&dev->pci_dev->dev, dev->dma_page.dma_addr[current_page])) {
+            if (dma_mapping_error(&dev->pci_dev->dev, dev->dma_page.dma_addr[current_page]))
+            {
                 printk(KERN_ERR "Failed to get DMA addresses\n");
                 return -EINVAL;
             }
 
-            page_info->page_address_array[current_page].dma_address =
-                dev->dma_page.dma_addr[current_page];
+            page_info->page_address_array[current_page].dma_address = dev->dma_page.dma_addr[current_page];
 
             page_mapped_counter++;
         }
@@ -673,40 +694,37 @@ static int page_pin(struct mst_dev_data* dev, struct page_info_st* page_info)
     }
 
     // There is a page that not pinned in the kernel space ?
-    if (total_pinned != page_amount) {
+    if (total_pinned != page_amount)
+    {
         return -EFAULT;
     }
 
     // Print the pages to the dmesg.
-    for (page_counter = 0;
-            page_counter < page_amount;
-            page_counter++) {
-        printk(KERN_INFO "Page address structure number: %d, device: %04x:%02x:%02x.%0x\n",
-               page_counter, pci_domain_nr(dev->pci_dev->bus),
-               dev->pci_dev->bus->number, PCI_SLOT(dev->pci_dev->devfn),
+    for (page_counter = 0; page_counter < page_amount; page_counter++)
+    {
+        printk(KERN_INFO "Page address structure number: %d, device: %04x:%02x:%02x.%0x\n", page_counter,
+               pci_domain_nr(dev->pci_dev->bus), dev->pci_dev->bus->number, PCI_SLOT(dev->pci_dev->devfn),
                PCI_FUNC(dev->pci_dev->devfn));
     }
 
     return 0;
 }
 
-
 static int page_unpin(struct mst_dev_data* dev, struct page_info_st* page_info)
 {
     int page_counter;
 
     // Check if the page list is allocated.
-    if (!dev || !dev->dma_page.page_list) {
+    if (!dev || !dev->dma_page.page_list)
+    {
         return -EINVAL;
     }
 
     // Deallocate the pages.
-    for (page_counter = 0;
-            page_counter < page_info->page_amount;
-            page_counter++) {
+    for (page_counter = 0; page_counter < page_info->page_amount; page_counter++)
+    {
         // DMA activity is finished.
-        dma_unmap_page(&dev->pci_dev->dev, dev->dma_page.dma_addr[page_counter],
-                       PAGE_SIZE, DMA_BIDIRECTIONAL);
+        dma_unmap_page(&dev->pci_dev->dev, dev->dma_page.dma_addr[page_counter], PAGE_SIZE, DMA_BIDIRECTIONAL);
 
         // Release the page list.
         set_page_dirty(dev->dma_page.page_list[page_counter]);
@@ -714,9 +732,8 @@ static int page_unpin(struct mst_dev_data* dev, struct page_info_st* page_info)
         dev->dma_page.page_list[page_counter] = NULL;
         dev->dma_page.dma_addr[page_counter] = 0;
 
-        printk(KERN_INFO "Page structure number: %d was released. device:%04x:%02x:%02x.%0x\n",
-               page_counter, pci_domain_nr(dev->pci_dev->bus),
-               dev->pci_dev->bus->number, PCI_SLOT(dev->pci_dev->devfn),
+        printk(KERN_INFO "Page structure number: %d was released. device:%04x:%02x:%02x.%0x\n", page_counter,
+               pci_domain_nr(dev->pci_dev->bus), dev->pci_dev->bus->number, PCI_SLOT(dev->pci_dev->devfn),
                PCI_FUNC(dev->pci_dev->devfn));
     }
 
@@ -726,20 +743,21 @@ static int page_unpin(struct mst_dev_data* dev, struct page_info_st* page_info)
     return 0;
 }
 
-
 static int read_dword_from_config_space(struct mst_dev_data* dev, struct read_dword_from_config_space* read_from_cspace)
 {
     int ret = 0;
 
     // take semaphore
     ret = _vendor_specific_sem(dev, 1);
-    if (ret) {
+    if (ret)
+    {
         return ret;
     }
 
     // Read dword from config space
     ret = pci_read_config_dword(dev->pci_dev, read_from_cspace->offset, &read_from_cspace->data);
-    if (ret) {
+    if (ret)
+    {
         goto cleanup;
     }
 
@@ -749,46 +767,43 @@ static int read_dword_from_config_space(struct mst_dev_data* dev, struct read_dw
     return ret;
 }
 
-
 /****************************************************/
-static ssize_t mst_read(struct file *file, char *buf, size_t count,
-		loff_t *f_pos)
+static ssize_t mst_read(struct file* file, char* buf, size_t count, loff_t* f_pos)
 {
-	mst_err("not implemented\n");
-	return 0;
+    mst_err("not implemented\n");
+    return 0;
 }
 
 /****************************************************/
-static ssize_t mst_write(struct file *file, const char *buf, size_t count,
-		loff_t *f_pos)
+static ssize_t mst_write(struct file* file, const char* buf, size_t count, loff_t* f_pos)
 {
-	mst_err("not implemented\n");
-	return 0;
+    mst_err("not implemented\n");
+    return 0;
 }
 
 /****************************************************/
 static inline void print_opcode(void)
 {
-	mst_info("MST_PARAMS=%lx\n", MST_PARAMS);
+    mst_info("MST_PARAMS=%lx\n", MST_PARAMS);
 
-	mst_info("PCICONF_READ4=%lx\n", PCICONF_READ4);
-	mst_info("PCICONF_WRITE4=%lx\n", PCICONF_WRITE4);
-	mst_info("PCIMEM_READ4=%lx\n", PCIMEM_READ4);
-	mst_info("PCIMEM_WRITE4=%lx\n", PCIMEM_WRITE4);
+    mst_info("PCICONF_READ4=%lx\n", PCICONF_READ4);
+    mst_info("PCICONF_WRITE4=%lx\n", PCICONF_WRITE4);
+    mst_info("PCIMEM_READ4=%lx\n", PCIMEM_READ4);
+    mst_info("PCIMEM_WRITE4=%lx\n", PCIMEM_WRITE4);
 
-	mst_info("PCIMEM_READ_BLOCK=%lx\n", PCIMEM_READ_BLOCK);
-	mst_info("PCIMEM_WRITE_BLOCK=%lx\n", PCIMEM_WRITE_BLOCK);
+    mst_info("PCIMEM_READ_BLOCK=%lx\n", PCIMEM_READ_BLOCK);
+    mst_info("PCIMEM_WRITE_BLOCK=%lx\n", PCIMEM_WRITE_BLOCK);
 
-	mst_info("PCICONF_INIT=%lx\n", PCICONF_INIT);
-	mst_info("PCICONF_STOP=%x\n", PCICONF_STOP);
+    mst_info("PCICONF_INIT=%lx\n", PCICONF_INIT);
+    mst_info("PCICONF_STOP=%x\n", PCICONF_STOP);
 
-	mst_info("PCIMEM_INIT=%lx\n", PCIMEM_INIT);
-	mst_info("PCIMEM_STOP=%x\n", PCIMEM_STOP);
+    mst_info("PCIMEM_INIT=%lx\n", PCIMEM_INIT);
+    mst_info("PCIMEM_STOP=%x\n", PCIMEM_STOP);
 
-	mst_info("PCI_CONNECTX_WA=%lx\n", PCI_CONNECTX_WA);
+    mst_info("PCI_CONNECTX_WA=%lx\n", PCI_CONNECTX_WA);
 
-	mst_info("PCICONF_VPD_READ4=%lx\n", PCICONF_VPD_READ4);
-	mst_info("PCICONF_VPD_WRITE4=%lx\n", PCICONF_VPD_WRITE4);
+    mst_info("PCICONF_VPD_READ4=%lx\n", PCICONF_VPD_READ4);
+    mst_info("PCICONF_VPD_WRITE4=%lx\n", PCICONF_VPD_WRITE4);
 }
 
 /****************************************************/
@@ -825,840 +840,921 @@ static inline void print_opcode(void)
  *   -EFAULT if there was a problem with hardware operation
  *
  */
-static int mst_ioctl(struct inode *inode, struct file *file,
-		unsigned int opcode, unsigned long input)
+static int mst_ioctl(struct inode* inode, struct file* file, unsigned int opcode, unsigned long input)
 {
+    int res = 0;
+    struct mst_dev_data* dev = NULL;
+    struct mst_dev_data* cur = NULL;
+    void* user_buf = (void*)input;
+
+    /*
+     * In MEM mapped data flow there is no need to lock the semaphore.
+     * Since the HW handles the requests in PCI level thus no need
+     * for serializing (HW is capable of handling parallel requests)
+     */
+#define IS_LOCK_NEEDED(dev) (!(dev->type == PCIMEM && (opcode == MST_READ4 || opcode == MST_WRITE4)))
+
+    /*
+     * make sure the device is available since it
+     * could be removed by hotplug event
+     * if available grab its lock
+     */
+    list_for_each_entry(cur, &mst_devices, list)
+    {
+        if (cur->major == imajor(inode))
+        {
+            dev = cur;
+            if (IS_LOCK_NEEDED(dev))
+                mutex_lock(&dev->lock);
+            break;
+        }
+    }
 
-	int res = 0;
-	struct mst_dev_data *dev = NULL;
-	struct mst_dev_data *cur = NULL;
-	void *user_buf = (void *) input;
-
-	/*
-	 * In MEM mapped data flow there is no need to lock the semaphore.
-	 * Since the HW handles the requests in PCI level thus no need
-	 * for serializing (HW is capable of handling parallel requests)
-	 */
-#define IS_LOCK_NEEDED(dev) \
-		(!(dev->type == PCIMEM && \
-				(opcode == MST_READ4 || opcode == MST_WRITE4)))
-
-	/*
-	 * make sure the device is available since it
-	 * could be removed by hotplug event
-	 * if available grab its lock
-	 */
-	list_for_each_entry(cur, &mst_devices, list) {
-		if (cur->major == imajor(inode)) {
-			dev = cur;
-			if (IS_LOCK_NEEDED(dev))
-				mutex_lock(&dev->lock);
-			break;
-		}
-	}
-
-	if (!dev) {
-		mst_err("failed to find device with major=%d\n",
-				imajor(inode));
-		res = -ENODEV;
-		goto fin_err;
-	}
-
-	switch (opcode) {
-	case MST_PARAMS: {
-		struct mst_params paramst;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-		// best effort : try to get space spport status if we fail assume we got vsec support.
-		get_space_support_status(dev);
-		paramst.domain = pci_domain_nr(dev->pci_dev->bus);
-		paramst.bus = dev->pci_dev->bus->number;
-		paramst.slot = PCI_SLOT(dev->pci_dev->devfn);
-		paramst.func = PCI_FUNC(dev->pci_dev->devfn);
-		paramst.bar = dev->bar;
-		paramst.device = dev->pci_dev->device;
-		paramst.vendor = dev->pci_dev->vendor;
-		paramst.subsystem_device = dev->pci_dev->subsystem_device;
-		paramst.subsystem_vendor = dev->pci_dev->subsystem_vendor;
-		if (dev->vendor_specific_cap &&
-				(dev->spaces_support_status == SS_ALL_SPACES_SUPPORTED ||
-						dev->spaces_support_status == SS_UNINITIALIZED)) {
-			// assume supported if SS_UNINITIALIZED (since semaphore is locked)
-			paramst.vendor_specific_cap = dev->vendor_specific_cap;
-		} else {
-			paramst.vendor_specific_cap = 0;
-		}
-		if (copy_to_user(user_buf, &paramst, sizeof(struct mst_params))) {
-			res = -EFAULT;
-			goto fin;
-		}
-		break;
-	}
-
-	case MST_READ4: {
-		u32 out;
-		u32 *dataout = NULL;
-		struct mst_read4_st readst;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (copy_from_user(&readst, user_buf, sizeof(struct mst_read4_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		switch (dev->type) {
-		case PCICONF:
-			if (get_space_support_status(dev)) {
-				res = -EBUSY;
-				goto fin;
-			}
-
-			if (VSEC_FULLY_SUPPORTED(dev))
-				res = read4_vsec(dev, readst.address_space, readst.offset, &out);
-			else
-				res = pciconf_read4_legacy(dev, readst.offset, &out);
-			if (res)
-				goto fin;
-			break;
-
-		case PCIMEM:
-			if ((readst.offset + sizeof(u32)) > MST_MEMORY_SIZE) {
-				mst_err("accessing invalid address\n");
-				res = -EINVAL;
-				goto fin;
-			}
-
-			/* read from hardware */
-			out = ioread32(dev->hw_addr + readst.offset);
-
-			/* endianness conversion - we noticed that we need to swap always */
-			be32_to_cpus(&out);
-			out = cpu_to_le32(out);
-			break;
-		}
-
-		/* retrieve to user */
-		dataout = &((struct mst_read4_st *)user_buf)->data;
-		if (copy_to_user(dataout, &out, sizeof(u32))) {
-			res = -EFAULT;
-			goto fin;
-		}
-		break;
-	}
-
-	case MST_WRITE4: {
-		struct mst_write4_st writest;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (copy_from_user(&writest, user_buf, sizeof(struct mst_write4_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		switch (dev->type) {
-		case PCICONF:
-			if (get_space_support_status(dev)) {
-				res = -EBUSY;
-				goto fin;
-			}
-			if (VSEC_FULLY_SUPPORTED(dev))
-				res = write4_vsec(dev, writest.address_space, writest.offset, writest.data);
-			else
-				res = pciconf_write4_legacy(dev, writest.offset, writest.data);
-			break;
-
-		case PCIMEM:
-			if ((writest.offset + sizeof(u32)) > MST_MEMORY_SIZE) {
-				mst_err("Accesing invalid address\n");
-				res = -EINVAL;
-				goto fin;
-			}
-
-			/* endianness conversion - we noticed that we need to swap always */
-			cpu_to_be32s(&(writest.data));
-			writest.data = cpu_to_le32(writest.data);
-
-			/* write to hardware */
-			iowrite32(writest.data, dev->hw_addr + writest.offset);
-			break;
-		}
-
-		break;
-	}
-
-	case PCIMEM_READ_BLOCK: {
-		int i = 0;
-		u32 *data = NULL;
-		u32 *dataout = NULL;
-		struct mst_read_block_st readst;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCIMEM) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (copy_from_user(&readst, user_buf, sizeof(struct mst_read_block_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		if (readst.size % sizeof(u32)) {
-			mst_err("invalid size. size should be in bytes and divide sizeof(u32)\n");
-			res = -EINVAL;
-			goto fin;
-		}
-
-		if ((readst.offset + readst.size) > MST_MEMORY_SIZE) {
-			mst_err("accessing invalid address\n");
-			res = -EINVAL;
-			goto fin;
-		}
-
-		data = kzalloc(readst.size, GFP_KERNEL);
-		if (!data) {
-			res = -ENOMEM;
-			goto fin;
-		}
-
-		/* read from hardware */
-		memcpy_fromio(data, dev->hw_addr + readst.offset, readst.size);
-
-		/* endianness conversion */
-		for (i = 0; i < (readst.size / sizeof(u32)); ++i)
-			be32_to_cpus(&(data[i]));
-
-		/* retrieve to user */
-		dataout = ((struct mst_read_block_st *)user_buf)->data;
-		if (copy_to_user(dataout, data, readst.size)) {
-			res = -EFAULT;
-			kfree(data);
-			goto fin;
-		}
-
-		kfree(data);
-		break;
-	}
-
-	case PCIMEM_WRITE_BLOCK: {
-		int i = 0;
-		struct mst_write_block_st writest;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCIMEM) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (copy_from_user(&writest, user_buf, sizeof(struct mst_write_block_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		if (writest.size % sizeof(u32)) {
-			mst_err("invalid size. size should be in bytes and divide sizeof(u32)\n");
-			res = -EINVAL;
-			goto fin;
-		}
-
-		if ((writest.offset + writest.size) > MST_MEMORY_SIZE) {
-			mst_err("accessing invalid address\n");
-			res = -EINVAL;
-			goto fin;
-		}
-
-		/* endianness conversion */
-		for (i = 0; i < (writest.size / sizeof(u32)); ++i)
-			cpu_to_be32s(&(writest.data[i]));
-
-		/* write to hardware */
-		memcpy_toio(dev->hw_addr + writest.offset, writest.data, writest.size);
-
-		break;
-	}
-
-	case PCICONF_READ4_BUFFER:
-	{
-		struct mst_read4_buffer_st read4_buf;
-		struct mst_read4_buffer_st *rb_udata = (struct mst_read4_buffer_st *)user_buf;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCICONF) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (get_space_support_status(dev)) {
-			res = -EBUSY;
-			goto fin;
-		}
-
-		if (dev->spaces_support_status != SS_ALL_SPACES_SUPPORTED) {
-			res = -EOPNOTSUPP;
-			goto fin;
-		}
-
-		if (copy_from_user(&read4_buf, user_buf, sizeof(read4_buf))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		res = read4_block_vsec(dev, read4_buf.address_space, read4_buf.offset, read4_buf.size, read4_buf.data);
-		if (res != read4_buf.size)
-			goto fin;
-
-		res = copy_to_user(rb_udata, &read4_buf, sizeof(read4_buf)) ? -EFAULT : read4_buf.size;
-		goto fin;
-	}
-	case PCICONF_WRITE4_BUFFER:
-	{
-		struct mst_write4_buffer_st write4_buf;
-		struct mst_write4_buffer_st *wb_udata = (struct mst_write4_buffer_st *)user_buf;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCICONF) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (get_space_support_status(dev)) {
-			res = -EBUSY;
-			goto fin;
-		}
-
-		if (dev->spaces_support_status != SS_ALL_SPACES_SUPPORTED) {
-			res = -EOPNOTSUPP;
-			goto fin;
-		}
-
-		if (copy_from_user(&write4_buf, user_buf, sizeof(write4_buf))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		res = write4_block_vsec(dev, write4_buf.address_space, write4_buf.offset, write4_buf.size, write4_buf.data);
-		if (res != write4_buf.size)
-			goto fin;
-
-		res = copy_to_user(wb_udata, &write4_buf, sizeof(write4_buf)) ? -EFAULT : write4_buf.size;
-		goto fin;
-	}
-	case PCICONF_INIT: {
-		struct mst_pciconf_init_st initst;
-
-		if (dev->initialized) {
-			mst_err("device already initialized\n");
-			res = ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCICONF) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (copy_from_user(&initst, user_buf, sizeof(struct mst_pciconf_init_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		dev->addr_reg = initst.addr_reg;
-		dev->data_reg = initst.data_reg;
-
-		dev->wo_addr = is_wo_gw(dev->pci_dev, initst.addr_reg);
-		dev->vendor_specific_cap = pci_find_capability(dev->pci_dev,
-				MLNX_VENDOR_SPECIFIC_CAP_ID);
-		//mst_info("VSEC SUPP: %#x\n", dev->vendor_specific_cap);
-		dev->spaces_support_status = SS_UNINITIALIZED; // init on first op
-
-		dev->initialized = 1;
-		break;
-	}
-
-	case PCICONF_STOP: {
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCICONF) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		dev->initialized = 0;
-		break;
-	}
-
-	case PCIMEM_INIT: {
-		struct mst_mem_init_st initst;
-		unsigned long resource_start;
-
-		if (dev->initialized) {
-			mst_err("device already initialized\n");
-			res = ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCIMEM) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (copy_from_user(&initst, user_buf, sizeof(struct mst_mem_init_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		/* unmap previously mapped device if it was not stopped properly */
-		if (dev->hw_addr) {
-			iounmap(cur->hw_addr);
-			dev->hw_addr = NULL;
-		}
-
-		dev->bar = initst.bar;
-		resource_start = pci_resource_start(dev->pci_dev, dev->bar);
-
-		dev->hw_addr = ioremap(resource_start, MST_MEMORY_SIZE);
-
-		if (dev->hw_addr <= 0) {
-			mst_err("could not map device memory\n");
-			res = -EFAULT;
-			goto fin;
-		}
-
-		dev->initialized = 1;
-		break;
-	}
-
-	case PCIMEM_STOP: {
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCIMEM) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (cur->hw_addr)
-			iounmap(cur->hw_addr);
-
-		cur->hw_addr = NULL;
-		dev->initialized = 0;
-		break;
-	}
-
-	case PCI_CONNECTX_WA: {
-		struct mst_connectx_wa *md = file->private_data;
-		unsigned int slot_mask;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = -ENODEV;
-			goto fin;
-		}
-
-		/* slot exists */
-		if (md->connectx_wa_slot_p1) {
-			mst_err("slot exits for file %s, slot:0x%x\n",
-					dev->name, md->connectx_wa_slot_p1);
-			res = -EPERM;
-			goto fin;
-		}
-
-		/* find first un(set) bit. and remember the slot */
-		md->connectx_wa_slot_p1 = ffs(~dev->connectx_wa_slots);
-		if (md->connectx_wa_slot_p1 == 0 || md->connectx_wa_slot_p1 > CONNECTX_WA_SIZE) {
-			res = -ENOLCK;
-			goto fin;
-		}
-
-		slot_mask = 1 << (md->connectx_wa_slot_p1 - 1);
-		/* set the slot as taken */
-		dev->connectx_wa_slots |= slot_mask;
-
-		/*
-		 * mst_info("CONNECTX_WA: Took slot %u. Current slots: %02x\n",
-		 *			md->connectx_wa_slot_p1 - 1, dev->connectx_wa_slots);
-		 */
-		if (copy_to_user(user_buf, md, sizeof(struct mst_connectx_wa))) {
-			res = -EFAULT;
-			goto fin;
-		}
-		break;
-	}
-
-	case PCICONF_VPD_READ4: {
-		u32 out;
-		u32 *dataout = NULL;
-		struct mst_vpd_read4_st readst;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCICONF) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (copy_from_user(&readst, user_buf, sizeof(struct mst_vpd_read4_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-
-		res = pci_read4_vpd(dev, readst.timeout, readst.offset, &out);
-		if (res)
-			goto fin;
-
-		/* retrieve to user - we noticed that we need to swap always */
-		dataout = &((struct mst_vpd_read4_st *)user_buf)->data;
-		out = le32_to_cpu(out);
-		if (copy_to_user(dataout, &out, sizeof(u32))) {
-			res = -EFAULT;
-			goto fin;
-		}
-		break;
-	}
-
-	case PCICONF_VPD_WRITE4: {
-		struct mst_vpd_write4_st writest;
-
-		if (!dev->initialized) {
-			mst_err("device is not initialized\n");
-			res = ENODEV;
-			goto fin;
-		}
-
-		if (dev->type != PCICONF) {
-			mst_err("wrong type for device\n");
-			res = -EPERM;
-			goto fin;
-		}
-
-		if (copy_from_user(&writest, user_buf, sizeof(struct mst_vpd_write4_st))) {
-			res = -EFAULT;
-			goto fin;
-		}
-		writest.data = le32_to_cpu(writest.data);
-		res = pci_write4_vpd(dev, writest.timeout, writest.offset, writest.data);
-		if (res)
-			goto fin;
-		break;
-	}
-    case PCICONF_GET_DMA_PAGES:
-    case PCICONF_RELEASE_DMA_PAGES:
+    if (!dev)
     {
-        struct page_info_st page_info;
-        
-        // Device validation.
-        if (!dev->initialized || !dev->pci_dev) {
-            res = -ENOTTY;
-            goto fin;
+        mst_err("failed to find device with major=%d\n", imajor(inode));
+        res = -ENODEV;
+        goto fin_err;
+    }
+
+    switch (opcode)
+    {
+        case MST_PARAMS:
+        {
+            struct mst_params paramst;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+            // best effort : try to get space spport status if we fail assume we got vsec support.
+            get_space_support_status(dev);
+            paramst.domain = pci_domain_nr(dev->pci_dev->bus);
+            paramst.bus = dev->pci_dev->bus->number;
+            paramst.slot = PCI_SLOT(dev->pci_dev->devfn);
+            paramst.func = PCI_FUNC(dev->pci_dev->devfn);
+            paramst.bar = dev->bar;
+            paramst.device = dev->pci_dev->device;
+            paramst.vendor = dev->pci_dev->vendor;
+            paramst.subsystem_device = dev->pci_dev->subsystem_device;
+            paramst.subsystem_vendor = dev->pci_dev->subsystem_vendor;
+            if (dev->vendor_specific_cap && (dev->spaces_support_status == SS_ALL_SPACES_SUPPORTED ||
+                                             dev->spaces_support_status == SS_UNINITIALIZED))
+            {
+                // assume supported if SS_UNINITIALIZED (since semaphore is locked)
+                paramst.vendor_specific_cap = dev->vendor_specific_cap;
+            }
+            else
+            {
+                paramst.vendor_specific_cap = 0;
+            }
+            if (copy_to_user(user_buf, &paramst, sizeof(struct mst_params)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+            break;
         }
 
-        // Copy the page info structure from the user space.
-        if (copy_from_user(&page_info, user_buf, sizeof(struct page_info_st))) {
-            res = -EFAULT;
-            goto fin;
+        case MST_READ4:
+        {
+            u32 out;
+            u32* dataout = NULL;
+            struct mst_read4_st readst;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            if (copy_from_user(&readst, user_buf, sizeof(struct mst_read4_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            switch (dev->type)
+            {
+                case PCICONF:
+                    if (get_space_support_status(dev))
+                    {
+                        res = -EBUSY;
+                        goto fin;
+                    }
+
+                    if (VSEC_FULLY_SUPPORTED(dev))
+                        res = read4_vsec(dev, readst.address_space, readst.offset, &out);
+                    else
+                        res = pciconf_read4_legacy(dev, readst.offset, &out);
+                    if (res)
+                        goto fin;
+                    break;
+
+                case PCIMEM:
+                    if ((readst.offset + sizeof(u32)) > MST_MEMORY_SIZE)
+                    {
+                        mst_err("accessing invalid address\n");
+                        res = -EINVAL;
+                        goto fin;
+                    }
+
+                    /* read from hardware */
+                    out = ioread32(dev->hw_addr + readst.offset);
+
+                    /* endianness conversion - we noticed that we need to swap always */
+                    be32_to_cpus(&out);
+                    out = cpu_to_le32(out);
+                    break;
+            }
+
+            /* retrieve to user */
+            dataout = &((struct mst_read4_st*)user_buf)->data;
+            if (copy_to_user(dataout, &out, sizeof(u32)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+            break;
         }
 
-        if (opcode == PCICONF_GET_DMA_PAGES) {
-            res = page_pin(dev, &page_info);
-            if (res) {
+        case MST_WRITE4:
+        {
+            struct mst_write4_st writest;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
                 goto fin;
             }
-            
-            // Return the physical address to the user. 
-            if (copy_to_user(user_buf, &page_info, sizeof(struct page_info_st)) != 0) {
+
+            if (copy_from_user(&writest, user_buf, sizeof(struct mst_write4_st)))
+            {
                 res = -EFAULT;
                 goto fin;
             }
-        } else {
-            res = page_unpin(dev, &page_info);
+
+            switch (dev->type)
+            {
+                case PCICONF:
+                    if (get_space_support_status(dev))
+                    {
+                        res = -EBUSY;
+                        goto fin;
+                    }
+                    if (VSEC_FULLY_SUPPORTED(dev))
+                        res = write4_vsec(dev, writest.address_space, writest.offset, writest.data);
+                    else
+                        res = pciconf_write4_legacy(dev, writest.offset, writest.data);
+                    break;
+
+                case PCIMEM:
+                    if ((writest.offset + sizeof(u32)) > MST_MEMORY_SIZE)
+                    {
+                        mst_err("Accesing invalid address\n");
+                        res = -EINVAL;
+                        goto fin;
+                    }
+
+                    /* endianness conversion - we noticed that we need to swap always */
+                    cpu_to_be32s(&(writest.data));
+                    writest.data = cpu_to_le32(writest.data);
+
+                    /* write to hardware */
+                    iowrite32(writest.data, dev->hw_addr + writest.offset);
+                    break;
+            }
+
+            break;
         }
 
-        break;
-    }
-    case PCICONF_READ_DWORD_FROM_CONFIG_SPACE:
-    {
-        struct read_dword_from_config_space read_from_cspace;
+        case PCIMEM_READ_BLOCK:
+        {
+            int i = 0;
+            u32* data = NULL;
+            u32* dataout = NULL;
+            struct mst_read_block_st readst;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
 
-        // Device validation.
-        if (!dev->initialized || !dev->pci_dev) {
-            res =- ENOTTY;
-            goto fin;
+            if (dev->type != PCIMEM)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (copy_from_user(&readst, user_buf, sizeof(struct mst_read_block_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            if (readst.size % sizeof(u32))
+            {
+                mst_err("invalid size. size should be in bytes and divide sizeof(u32)\n");
+                res = -EINVAL;
+                goto fin;
+            }
+
+            if ((readst.offset + readst.size) > MST_MEMORY_SIZE)
+            {
+                mst_err("accessing invalid address\n");
+                res = -EINVAL;
+                goto fin;
+            }
+
+            data = kzalloc(readst.size, GFP_KERNEL);
+            if (!data)
+            {
+                res = -ENOMEM;
+                goto fin;
+            }
+
+            /* read from hardware */
+            memcpy_fromio(data, dev->hw_addr + readst.offset, readst.size);
+
+            /* endianness conversion */
+            for (i = 0; i < (readst.size / sizeof(u32)); ++i)
+                be32_to_cpus(&(data[i]));
+
+            /* retrieve to user */
+            dataout = ((struct mst_read_block_st*)user_buf)->data;
+            if (copy_to_user(dataout, data, readst.size))
+            {
+                res = -EFAULT;
+                kfree(data);
+                goto fin;
+            }
+
+            kfree(data);
+            break;
         }
 
-        // Copy the page info structure from the user space.
-        if (copy_from_user(&read_from_cspace, user_buf, sizeof(struct read_dword_from_config_space))) {
-            res = -EFAULT;
-            goto fin;
+        case PCIMEM_WRITE_BLOCK:
+        {
+            int i = 0;
+            struct mst_write_block_st writest;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCIMEM)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (copy_from_user(&writest, user_buf, sizeof(struct mst_write_block_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            if (writest.size % sizeof(u32))
+            {
+                mst_err("invalid size. size should be in bytes and divide sizeof(u32)\n");
+                res = -EINVAL;
+                goto fin;
+            }
+
+            if ((writest.offset + writest.size) > MST_MEMORY_SIZE)
+            {
+                mst_err("accessing invalid address\n");
+                res = -EINVAL;
+                goto fin;
+            }
+
+            /* endianness conversion */
+            for (i = 0; i < (writest.size / sizeof(u32)); ++i)
+                cpu_to_be32s(&(writest.data[i]));
+
+            /* write to hardware */
+            memcpy_toio(dev->hw_addr + writest.offset, writest.data, writest.size);
+
+            break;
         }
 
-        res = read_dword_from_config_space(dev, &read_from_cspace);
-        if (res) {
+        case PCICONF_READ4_BUFFER:
+        {
+            struct mst_read4_buffer_st read4_buf;
+            struct mst_read4_buffer_st* rb_udata = (struct mst_read4_buffer_st*)user_buf;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCICONF)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (get_space_support_status(dev))
+            {
+                res = -EBUSY;
+                goto fin;
+            }
+
+            if (dev->spaces_support_status != SS_ALL_SPACES_SUPPORTED)
+            {
+                res = -EOPNOTSUPP;
+                goto fin;
+            }
+
+            if (copy_from_user(&read4_buf, user_buf, sizeof(read4_buf)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            res = read4_block_vsec(dev, read4_buf.address_space, read4_buf.offset, read4_buf.size, read4_buf.data);
+            if (res != read4_buf.size)
+                goto fin;
+
+            res = copy_to_user(rb_udata, &read4_buf, sizeof(read4_buf)) ? -EFAULT : read4_buf.size;
             goto fin;
         }
-        // Return the physical address to the user. 
-        if (copy_to_user(user_buf, &read_from_cspace, sizeof(struct read_dword_from_config_space)) != 0) {
-            res = -EFAULT;
+        case PCICONF_WRITE4_BUFFER:
+        {
+            struct mst_write4_buffer_st write4_buf;
+            struct mst_write4_buffer_st* wb_udata = (struct mst_write4_buffer_st*)user_buf;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCICONF)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (get_space_support_status(dev))
+            {
+                res = -EBUSY;
+                goto fin;
+            }
+
+            if (dev->spaces_support_status != SS_ALL_SPACES_SUPPORTED)
+            {
+                res = -EOPNOTSUPP;
+                goto fin;
+            }
+
+            if (copy_from_user(&write4_buf, user_buf, sizeof(write4_buf)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            res = write4_block_vsec(dev, write4_buf.address_space, write4_buf.offset, write4_buf.size, write4_buf.data);
+            if (res != write4_buf.size)
+                goto fin;
+
+            res = copy_to_user(wb_udata, &write4_buf, sizeof(write4_buf)) ? -EFAULT : write4_buf.size;
             goto fin;
         }
+        case PCICONF_INIT:
+        {
+            struct mst_pciconf_init_st initst;
 
-        break;
-    }
+            if (dev->initialized)
+            {
+                mst_err("device already initialized\n");
+                res = ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCICONF)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (copy_from_user(&initst, user_buf, sizeof(struct mst_pciconf_init_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            dev->addr_reg = initst.addr_reg;
+            dev->data_reg = initst.data_reg;
+
+            dev->wo_addr = is_wo_gw(dev->pci_dev, initst.addr_reg);
+            dev->vendor_specific_cap = pci_find_capability(dev->pci_dev, MLNX_VENDOR_SPECIFIC_CAP_ID);
+            // mst_info("VSEC SUPP: %#x\n", dev->vendor_specific_cap);
+            dev->spaces_support_status = SS_UNINITIALIZED; // init on first op
+
+            dev->initialized = 1;
+            break;
+        }
+
+        case PCICONF_STOP:
+        {
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCICONF)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            dev->initialized = 0;
+            break;
+        }
+
+        case PCIMEM_INIT:
+        {
+            struct mst_mem_init_st initst;
+            unsigned long resource_start;
+
+            if (dev->initialized)
+            {
+                mst_err("device already initialized\n");
+                res = ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCIMEM)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (copy_from_user(&initst, user_buf, sizeof(struct mst_mem_init_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            /* unmap previously mapped device if it was not stopped properly */
+            if (dev->hw_addr)
+            {
+                iounmap(cur->hw_addr);
+                dev->hw_addr = NULL;
+            }
+
+            dev->bar = initst.bar;
+            resource_start = pci_resource_start(dev->pci_dev, dev->bar);
+
+            dev->hw_addr = ioremap(resource_start, MST_MEMORY_SIZE);
+
+            if (dev->hw_addr <= 0)
+            {
+                mst_err("could not map device memory\n");
+                res = -EFAULT;
+                goto fin;
+            }
+
+            dev->initialized = 1;
+            break;
+        }
+
+        case PCIMEM_STOP:
+        {
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCIMEM)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (cur->hw_addr)
+                iounmap(cur->hw_addr);
+
+            cur->hw_addr = NULL;
+            dev->initialized = 0;
+            break;
+        }
+
+        case PCI_CONNECTX_WA:
+        {
+            struct mst_connectx_wa* md = file->private_data;
+            unsigned int slot_mask;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = -ENODEV;
+                goto fin;
+            }
+
+            /* slot exists */
+            if (md->connectx_wa_slot_p1)
+            {
+                mst_err("slot exits for file %s, slot:0x%x\n", dev->name, md->connectx_wa_slot_p1);
+                res = -EPERM;
+                goto fin;
+            }
+
+            /* find first un(set) bit. and remember the slot */
+            md->connectx_wa_slot_p1 = ffs(~dev->connectx_wa_slots);
+            if (md->connectx_wa_slot_p1 == 0 || md->connectx_wa_slot_p1 > CONNECTX_WA_SIZE)
+            {
+                res = -ENOLCK;
+                goto fin;
+            }
 
-	default: {
-		mst_err("incorrect opcode = %x available opcodes:\n", opcode);
-		print_opcode();
-		res = -EINVAL;
-		break;
-	}
-	}
+            slot_mask = 1 << (md->connectx_wa_slot_p1 - 1);
+            /* set the slot as taken */
+            dev->connectx_wa_slots |= slot_mask;
+
+            /*
+             * mst_info("CONNECTX_WA: Took slot %u. Current slots: %02x\n",
+             *			md->connectx_wa_slot_p1 - 1, dev->connectx_wa_slots);
+             */
+            if (copy_to_user(user_buf, md, sizeof(struct mst_connectx_wa)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+            break;
+        }
+
+        case PCICONF_VPD_READ4:
+        {
+            u32 out;
+            u32* dataout = NULL;
+            struct mst_vpd_read4_st readst;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCICONF)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (copy_from_user(&readst, user_buf, sizeof(struct mst_vpd_read4_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            res = pci_read4_vpd(dev, readst.timeout, readst.offset, &out);
+            if (res)
+                goto fin;
+
+            /* retrieve to user - we noticed that we need to swap always */
+            dataout = &((struct mst_vpd_read4_st*)user_buf)->data;
+            out = le32_to_cpu(out);
+            if (copy_to_user(dataout, &out, sizeof(u32)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+            break;
+        }
+
+        case PCICONF_VPD_WRITE4:
+        {
+            struct mst_vpd_write4_st writest;
+
+            if (!dev->initialized)
+            {
+                mst_err("device is not initialized\n");
+                res = ENODEV;
+                goto fin;
+            }
+
+            if (dev->type != PCICONF)
+            {
+                mst_err("wrong type for device\n");
+                res = -EPERM;
+                goto fin;
+            }
+
+            if (copy_from_user(&writest, user_buf, sizeof(struct mst_vpd_write4_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+            writest.data = le32_to_cpu(writest.data);
+            res = pci_write4_vpd(dev, writest.timeout, writest.offset, writest.data);
+            if (res)
+                goto fin;
+            break;
+        }
+        case PCICONF_GET_DMA_PAGES:
+        case PCICONF_RELEASE_DMA_PAGES:
+        {
+            struct page_info_st page_info;
+
+            // Device validation.
+            if (!dev->initialized || !dev->pci_dev)
+            {
+                res = -ENOTTY;
+                goto fin;
+            }
+
+            // Copy the page info structure from the user space.
+            if (copy_from_user(&page_info, user_buf, sizeof(struct page_info_st)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            if (opcode == PCICONF_GET_DMA_PAGES)
+            {
+                res = page_pin(dev, &page_info);
+                if (res)
+                {
+                    goto fin;
+                }
+
+                // Return the physical address to the user.
+                if (copy_to_user(user_buf, &page_info, sizeof(struct page_info_st)) != 0)
+                {
+                    res = -EFAULT;
+                    goto fin;
+                }
+            }
+            else
+            {
+                res = page_unpin(dev, &page_info);
+            }
+
+            break;
+        }
+        case PCICONF_READ_DWORD_FROM_CONFIG_SPACE:
+        {
+            struct read_dword_from_config_space read_from_cspace;
+
+            // Device validation.
+            if (!dev->initialized || !dev->pci_dev)
+            {
+                res = -ENOTTY;
+                goto fin;
+            }
+
+            // Copy the page info structure from the user space.
+            if (copy_from_user(&read_from_cspace, user_buf, sizeof(struct read_dword_from_config_space)))
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            res = read_dword_from_config_space(dev, &read_from_cspace);
+            if (res)
+            {
+                goto fin;
+            }
+            // Return the physical address to the user.
+            if (copy_to_user(user_buf, &read_from_cspace, sizeof(struct read_dword_from_config_space)) != 0)
+            {
+                res = -EFAULT;
+                goto fin;
+            }
+
+            break;
+        }
+
+        default:
+        {
+            mst_err("incorrect opcode = %x available opcodes:\n", opcode);
+            print_opcode();
+            res = -EINVAL;
+            break;
+        }
+    }
 
 fin:
-	if (IS_LOCK_NEEDED(dev))
-		mutex_unlock(&dev->lock);
+    if (IS_LOCK_NEEDED(dev))
+        mutex_unlock(&dev->lock);
 fin_err:
-	return res;
+    return res;
 }
 
-
-static long unlocked_ioctl(struct file *f, unsigned int o, unsigned long d)
+static long unlocked_ioctl(struct file* f, unsigned int o, unsigned long d)
 {
 #if KERNEL_VERSION(3, 18, 0) > LINUX_VERSION_CODE
-	struct inode *n = f->f_dentry->d_inode;
+    struct inode* n = f->f_dentry->d_inode;
 #else
-	struct inode *n = f->f_path.dentry->d_inode;
+    struct inode* n = f->f_path.dentry->d_inode;
 #endif
 
-	return mst_ioctl(n, f, o, d);
+    return mst_ioctl(n, f, o, d);
 }
 
 /****************************************************/
-static inline const char *dev_type_to_str(enum dev_type type)
+static inline const char* dev_type_to_str(enum dev_type type)
 {
-	switch (type) {
-	case PCICONF:
-		return "PCICONF";
-	case PCIMEM:
-		return "PCIMEM";
-	default:
-		return "UNKNOWN";
-	}
+    switch (type)
+    {
+        case PCICONF:
+            return "PCICONF";
+        case PCIMEM:
+            return "PCIMEM";
+        default:
+            return "UNKNOWN";
+    }
 }
 
 /****************************************************/
 static const struct file_operations mst_fops = {
-        .read = mst_read,
-        .write = mst_write,
-		.unlocked_ioctl = unlocked_ioctl,
-		.open = mst_open,
-        .release = mst_release,
-        .owner = THIS_MODULE, };
-
-static struct mst_dev_data *mst_device_create(enum dev_type type,
-		struct pci_dev *pdev)
+  .read = mst_read,
+  .write = mst_write,
+  .unlocked_ioctl = unlocked_ioctl,
+  .open = mst_open,
+  .release = mst_release,
+  .owner = THIS_MODULE,
+};
+
+static struct mst_dev_data* mst_device_create(enum dev_type type, struct pci_dev* pdev)
 {
-	struct mst_dev_data *dev = NULL;
-	char dbdf[20];
-
-	dev = kzalloc(sizeof(struct mst_dev_data), GFP_KERNEL);
-	if (!dev)
-		return NULL;
-
-	sprintf(dbdf, "%4.4x:%2.2x:%2.2x.%1.1x", pci_domain_nr(pdev->bus),
-			pdev->bus->number, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn));
-	switch (type) {
-	case PCICONF:
-		dev->addr_reg = MST_CONF_ADDR_REG;
-		dev->data_reg = MST_CONF_DATA_REG;
-		dev->bar = 0; /* invalid */
-		dev->hw_addr = NULL; /* invalid */
-		snprintf(dev->name,
-				MST_NAME_SIZE, "%s" MST_PCICONF_DEVICE_NAME, dbdf);
-
-		break;
-	case PCIMEM:
-		dev->addr_reg = 0; /* invalid */
-		dev->data_reg = 0; /* invalid */
-		dev->bar = 0;
-		dev->hw_addr = ioremap(pci_resource_start(pdev, dev->bar),
-				MST_MEMORY_SIZE);
-		if (dev->hw_addr <= 0) {
-			mst_err("could not map device memory, BAR: %x\n", dev->bar);
-			goto out;
-		}
-
-		snprintf(dev->name,
-				MST_NAME_SIZE, "%s" MST_PCIMEM_DEVICE_NAME, dbdf);
-		break;
-	default:
-		mst_err("failed to %s, unknown device type 0x%x\n",
-				__func__, dev->type);
-		goto out;
-	}
-
-	dev->type = type;
-	dev->pci_dev = pdev;
-	mutex_init(&dev->lock);
-
-	dev->vpd_cap_addr = pci_find_capability(pdev, PCI_CAP_ID_VPD);
-
-	if (alloc_chrdev_region(&dev->my_dev, 0, 1, dev->name))
-		mst_err("failed to allocate chrdev_region\n");
-	dev->cl = class_create(THIS_MODULE, dev->name);
-	if (dev->cl == NULL) {
-		pr_alert("Class creation failed\n");
-		unregister_chrdev_region(dev->my_dev, 1);
-		goto out;
-	}
-
-	if (device_create(dev->cl, NULL, dev->my_dev, NULL, dev->name) == NULL) {
-		pr_alert("Device creation failed\n");
-		class_destroy(dev->cl);
-		unregister_chrdev_region(dev->my_dev, 1);
-		goto out;
-	}
-
-	dev->major = MAJOR(dev->my_dev);
-	cdev_init(&dev->mcdev, &mst_fops);
-	cdev_add(&dev->mcdev, dev->my_dev, 1); //TODO check if cdev_add fails
-
-	if (type == PCICONF) {
-		/*
-		 * Initialize 5th Gen attributes
-		 */
-		dev->wo_addr = is_wo_gw(dev->pci_dev, MST_CONF_ADDR_REG);
-		dev->vendor_specific_cap = pci_find_capability(dev->pci_dev,
-				MLNX_VENDOR_SPECIFIC_CAP_ID);
-		//mst_info("VSEC SUPP: %#x\n", dev->vendor_specific_cap);
-		dev->spaces_support_status = SS_UNINITIALIZED; // init on first op
-	}
-	dev->initialized = 1;
-	list_add_tail(&dev->list, &mst_devices);
-
-	return dev;
+    struct mst_dev_data* dev = NULL;
+    char dbdf[20];
+
+    dev = kzalloc(sizeof(struct mst_dev_data), GFP_KERNEL);
+    if (!dev)
+        return NULL;
+
+    sprintf(dbdf, "%4.4x:%2.2x:%2.2x.%1.1x", pci_domain_nr(pdev->bus), pdev->bus->number, PCI_SLOT(pdev->devfn),
+            PCI_FUNC(pdev->devfn));
+    switch (type)
+    {
+        case PCICONF:
+            dev->addr_reg = MST_CONF_ADDR_REG;
+            dev->data_reg = MST_CONF_DATA_REG;
+            dev->bar = 0;        /* invalid */
+            dev->hw_addr = NULL; /* invalid */
+            snprintf(dev->name, MST_NAME_SIZE, "%s" MST_PCICONF_DEVICE_NAME, dbdf);
+
+            break;
+        case PCIMEM:
+            dev->addr_reg = 0; /* invalid */
+            dev->data_reg = 0; /* invalid */
+            dev->bar = 0;
+            dev->hw_addr = ioremap(pci_resource_start(pdev, dev->bar), MST_MEMORY_SIZE);
+            if (dev->hw_addr <= 0)
+            {
+                mst_err("could not map device memory, BAR: %x\n", dev->bar);
+                goto out;
+            }
+
+            snprintf(dev->name, MST_NAME_SIZE, "%s" MST_PCIMEM_DEVICE_NAME, dbdf);
+            break;
+        default:
+            mst_err("failed to %s, unknown device type 0x%x\n", __func__, dev->type);
+            goto out;
+    }
+
+    dev->type = type;
+    dev->pci_dev = pdev;
+    mutex_init(&dev->lock);
+
+    dev->vpd_cap_addr = pci_find_capability(pdev, PCI_CAP_ID_VPD);
+
+    if (alloc_chrdev_region(&dev->my_dev, 0, 1, dev->name))
+        mst_err("failed to allocate chrdev_region\n");
+    dev->cl = class_create(THIS_MODULE, dev->name);
+    if (dev->cl == NULL)
+    {
+        pr_alert("Class creation failed\n");
+        unregister_chrdev_region(dev->my_dev, 1);
+        goto out;
+    }
+
+    if (device_create(dev->cl, NULL, dev->my_dev, NULL, dev->name) == NULL)
+    {
+        pr_alert("Device creation failed\n");
+        class_destroy(dev->cl);
+        unregister_chrdev_region(dev->my_dev, 1);
+        goto out;
+    }
+
+    dev->major = MAJOR(dev->my_dev);
+    cdev_init(&dev->mcdev, &mst_fops);
+    cdev_add(&dev->mcdev, dev->my_dev, 1); // TODO check if cdev_add fails
+
+    if (type == PCICONF)
+    {
+        /*
+         * Initialize 5th Gen attributes
+         */
+        dev->wo_addr = is_wo_gw(dev->pci_dev, MST_CONF_ADDR_REG);
+        dev->vendor_specific_cap = pci_find_capability(dev->pci_dev, MLNX_VENDOR_SPECIFIC_CAP_ID);
+        // mst_info("VSEC SUPP: %#x\n", dev->vendor_specific_cap);
+        dev->spaces_support_status = SS_UNINITIALIZED; // init on first op
+    }
+    dev->initialized = 1;
+    list_add_tail(&dev->list, &mst_devices);
+
+    return dev;
 out:
-	kfree(dev);
-	return NULL;
+    kfree(dev);
+    return NULL;
 }
 
-static void mst_device_destroy(struct mst_dev_data *dev)
+static void mst_device_destroy(struct mst_dev_data* dev)
 {
-	if (dev->hw_addr)
-		iounmap(dev->hw_addr);
-
-	cdev_del(&dev->mcdev);
-	device_destroy(dev->cl, dev->my_dev);
-	class_destroy(dev->cl);
-	unregister_chrdev_region(dev->my_dev, 1);
-	list_del(&dev->list);
-	kfree(dev);
+    if (dev->hw_addr)
+        iounmap(dev->hw_addr);
+
+    cdev_del(&dev->mcdev);
+    device_destroy(dev->cl, dev->my_dev);
+    class_destroy(dev->cl);
+    unregister_chrdev_region(dev->my_dev, 1);
+    list_del(&dev->list);
+    kfree(dev);
 }
 
 /****************************************************/
 static int __init mst_init(void)
 {
-	struct pci_dev  *pdev		= NULL;
-	struct mst_dev_data *dev	= NULL;
-
-	mst_info("%s - version %s\n", mst_driver_string, mst_driver_version);
-
-	while ((pdev = pci_get_device(MST_MELLANOX_PCI_VENDOR, PCI_ANY_ID, pdev)) != NULL) {
-		if (!pci_match_id(supported_pci_devices, pdev) && !pci_match_id(mst_livefish_pci_table, pdev))
-			continue;
-    
-		if (pdev->is_virtfn)
-		    continue;
-
-		/* found new device */
-		mst_info(
-				"found device - domain=0x%x, bus=0x%x, slot=0x%x, func=0x%x, vendor=0x%x, device=0x%x\n",
-				pci_domain_nr(pdev->bus), pdev->bus->number, PCI_SLOT(pdev->devfn),
-				PCI_FUNC(pdev->devfn), pdev->vendor, pdev->device);
-
-		/* create PCICONF for this device */
-		dev = mst_device_create(PCICONF, pdev);
-		if (!dev)
-			mst_err("failed to mst_device_create\n"); continue; /* PCICONF creation failed, no point creating a PCIMEM device */
-
-		/*
-		 * for livefish devices we only allocate PCICONF
-		 * for non livefish both PCICONF and PCIMEM
-		 */
-		if (!pci_match_id(mst_livefish_pci_table, pdev) && pci_match_id(mst_bar_pci_table, pdev)) {
-			/* create new mst_device for PCIMEM */
-			dev = mst_device_create(PCIMEM, pdev);
-			if (!dev) {
-				mst_err(
-						"failed to mst_device_create\n");
-				continue;
-			}
-		}
-	}
-
-	return 0;
+    struct pci_dev* pdev = NULL;
+    struct mst_dev_data* dev = NULL;
+
+    mst_info("%s - version %s\n", mst_driver_string, mst_driver_version);
+
+    while ((pdev = pci_get_device(MST_MELLANOX_PCI_VENDOR, PCI_ANY_ID, pdev)) != NULL)
+    {
+        if (!pci_match_id(supported_pci_devices, pdev) && !pci_match_id(mst_livefish_pci_table, pdev))
+            continue;
+
+        if (pdev->is_virtfn)
+            continue;
+
+        /* found new device */
+        mst_info("found device - domain=0x%x, bus=0x%x, slot=0x%x, func=0x%x, vendor=0x%x, device=0x%x\n",
+                 pci_domain_nr(pdev->bus), pdev->bus->number, PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
+                 pdev->vendor, pdev->device);
+
+        /* create PCICONF for this device */
+        dev = mst_device_create(PCICONF, pdev);
+        if (!dev)
+            mst_err("failed to mst_device_create\n");
+        continue; /* PCICONF creation failed, no point creating a PCIMEM device */
+
+        /*
+         * for livefish devices we only allocate PCICONF
+         * for non livefish both PCICONF and PCIMEM
+         */
+        if (!pci_match_id(mst_livefish_pci_table, pdev) && pci_match_id(mst_bar_pci_table, pdev))
+        {
+            /* create new mst_device for PCIMEM */
+            dev = mst_device_create(PCIMEM, pdev);
+            if (!dev)
+            {
+                mst_err("failed to mst_device_create\n");
+                continue;
+            }
+        }
+    }
+
+    return 0;
 }
 
 static void __exit mst_cleanup(void)
 {
-	struct mst_dev_data *cur, *temp;
+    struct mst_dev_data *cur, *temp;
 
-	/* free all mst_devices */
-	list_for_each_entry_safe(cur, temp, &mst_devices, list) {
-		mst_device_destroy(cur);
-	}
+    /* free all mst_devices */
+    list_for_each_entry_safe(cur, temp, &mst_devices, list) { mst_device_destroy(cur); }
 }
 
 /****************************************************/
diff --git a/kernel/mst_vpd.c b/kernel/mst_vpd.c
index 2881de06..8e3903a4 100644
--- a/kernel/mst_vpd.c
+++ b/kernel/mst_vpd.c
@@ -36,124 +36,131 @@
 #include <linux/sched.h>
 #include "mst_kernel.h"
 
-
 /****************************************************/
-int pci_read4_vpd(struct mst_dev_data *dev, unsigned int timeout,
-		unsigned int offset, u32 *buf)
+int pci_read4_vpd(struct mst_dev_data* dev, unsigned int timeout, unsigned int offset, u32* buf)
 {
-	struct pci_dev *pci_dev = dev->pci_dev;
-	int vpd_cap = dev->vpd_cap_addr;
-	unsigned long end;
-	uint16_t addr;
-	int done, res = 0;
-
-
-	if (!vpd_cap) {
-		mst_err("device %s not support Vital Product Data\n", dev->name);
-		return -ENODEV;
-	}
-
-	if (!timeout)
-		timeout = MST_VPD_DEFAULT_TOUT;
-
-	/* sets F bit to zero and write VPD addr */
-	addr = (0x7fff & offset);
-	res = pci_write_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, addr);
-	if (res) {
-		mst_err("pci_write_config_dword failed\n");
-		return res;
-	}
-
-	/* wait for data until F bit is set with one */
-	addr = 0x0;
-	done = 0;
-
-	end = msecs_to_jiffies(timeout) + jiffies;
-	while (time_before(jiffies, end)) {
-		res = pci_read_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, &addr);
-		if (res) {
-			mst_err("pci_read_config_word failed\n");
-			return res;
-		}
-
-		if (addr & 0x8000) {
-			done = 1;
-			break;
-		}
-
-		cond_resched();
-	}
-
-	if (!done)
-		return -ETIMEDOUT;
-
-	/* read data */
-	res = pci_read_config_dword(pci_dev, vpd_cap + PCI_VPD_DATA, buf);
-	if (res) {
-		mst_err("pci_read_config_word failed\n");
-		return res;
-	}
-
-	return res;
+    struct pci_dev* pci_dev = dev->pci_dev;
+    int vpd_cap = dev->vpd_cap_addr;
+    unsigned long end;
+    uint16_t addr;
+    int done, res = 0;
+
+    if (!vpd_cap)
+    {
+        mst_err("device %s not support Vital Product Data\n", dev->name);
+        return -ENODEV;
+    }
+
+    if (!timeout)
+        timeout = MST_VPD_DEFAULT_TOUT;
+
+    /* sets F bit to zero and write VPD addr */
+    addr = (0x7fff & offset);
+    res = pci_write_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, addr);
+    if (res)
+    {
+        mst_err("pci_write_config_dword failed\n");
+        return res;
+    }
+
+    /* wait for data until F bit is set with one */
+    addr = 0x0;
+    done = 0;
+
+    end = msecs_to_jiffies(timeout) + jiffies;
+    while (time_before(jiffies, end))
+    {
+        res = pci_read_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, &addr);
+        if (res)
+        {
+            mst_err("pci_read_config_word failed\n");
+            return res;
+        }
+
+        if (addr & 0x8000)
+        {
+            done = 1;
+            break;
+        }
+
+        cond_resched();
+    }
+
+    if (!done)
+        return -ETIMEDOUT;
+
+    /* read data */
+    res = pci_read_config_dword(pci_dev, vpd_cap + PCI_VPD_DATA, buf);
+    if (res)
+    {
+        mst_err("pci_read_config_word failed\n");
+        return res;
+    }
+
+    return res;
 }
 EXPORT_SYMBOL(pci_read4_vpd);
 
-int pci_write4_vpd(struct mst_dev_data *dev, unsigned int timeout,
-		unsigned int offset, u32 buf)
+int pci_write4_vpd(struct mst_dev_data* dev, unsigned int timeout, unsigned int offset, u32 buf)
 {
-	struct pci_dev *pci_dev = dev->pci_dev;
-	int vpd_cap = dev->vpd_cap_addr;
-	unsigned long end;
-	uint16_t addr;
-	int done, res = 0;
-
-
-	if (!vpd_cap) {
-		mst_err("device %s not support Vital Product Data\n", dev->name);
-		return -ENODEV;
-	}
-
-	if (!timeout)
-		timeout = MST_VPD_DEFAULT_TOUT;
-
-	/* write data */
-	res = pci_write_config_dword(pci_dev, vpd_cap + PCI_VPD_DATA, buf);
-	if (res) {
-		mst_err("pci_read_config_word failed\n");
-		return res;
-	}
-
-	/* sets F bit to one and write VPD addr */
-	addr = 0x8000 | (0x7ffff & offset);
-	res = pci_write_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, addr);
-	if (res) {
-		mst_err("pci_write_config_dword failed\n");
-		return res;
-	}
-
-	/* wait for data until F bit is set with zero */
-	addr = 0x0;
-	done = 0;
-
-	end = msecs_to_jiffies(timeout) + jiffies;
-	while (time_before(jiffies, end)) {
-		res = pci_read_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, &addr);
-		if (res) {
-			mst_err("pci_read_config_word failed\n");
-			return res;
-		}
-
-		if (!(addr & 0x8000)) {
-			done = 1;
-			break;
-		}
-
-		cond_resched();
-	}
-
-	if (!done)
-		return -ETIMEDOUT;
-
-	return res;
+    struct pci_dev* pci_dev = dev->pci_dev;
+    int vpd_cap = dev->vpd_cap_addr;
+    unsigned long end;
+    uint16_t addr;
+    int done, res = 0;
+
+    if (!vpd_cap)
+    {
+        mst_err("device %s not support Vital Product Data\n", dev->name);
+        return -ENODEV;
+    }
+
+    if (!timeout)
+        timeout = MST_VPD_DEFAULT_TOUT;
+
+    /* write data */
+    res = pci_write_config_dword(pci_dev, vpd_cap + PCI_VPD_DATA, buf);
+    if (res)
+    {
+        mst_err("pci_read_config_word failed\n");
+        return res;
+    }
+
+    /* sets F bit to one and write VPD addr */
+    addr = 0x8000 | (0x7ffff & offset);
+    res = pci_write_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, addr);
+    if (res)
+    {
+        mst_err("pci_write_config_dword failed\n");
+        return res;
+    }
+
+    /* wait for data until F bit is set with zero */
+    addr = 0x0;
+    done = 0;
+
+    end = msecs_to_jiffies(timeout) + jiffies;
+    while (time_before(jiffies, end))
+    {
+        res = pci_read_config_word(pci_dev, vpd_cap + PCI_VPD_ADDR, &addr);
+        if (res)
+        {
+            mst_err("pci_read_config_word failed\n");
+            return res;
+        }
+
+        if (!(addr & 0x8000))
+        {
+            done = 1;
+            break;
+        }
+
+        cond_resched();
+    }
+
+    if (!done)
+        return -ETIMEDOUT;
+
+    return res;
 }
 EXPORT_SYMBOL(pci_write4_vpd);
diff --git a/libmfa/mfa.c b/libmfa/mfa.c
index 4622e7cc..f90d12b8 100644
--- a/libmfa/mfa.c
+++ b/libmfa/mfa.c
@@ -43,66 +43,82 @@
 
 //                                         0x(major)(minor)
 //                           0x00000001;  #0x(0000)(0001)
-#define MLXA_VERSION         0x00000001
-#define MFA_HDR_SZ           16
-#define MAP_SECTION_OFFSET   MFA_HDR_SZ
-
-#define CHECK_PTR(p) do { if (p == NULL) {return _ERR(MFA_ERR_MEM_ALLOC);}} while (0)
-#define CHECK_RC(rc) do { if (rc < 0) {return rc;}} while (0)
+#define MLXA_VERSION 0x00000001
+#define MFA_HDR_SZ 16
+#define MAP_SECTION_OFFSET MFA_HDR_SZ
+
+#define CHECK_PTR(p)                        \
+    do                                      \
+    {                                       \
+        if (p == NULL)                      \
+        {                                   \
+            return _ERR(MFA_ERR_MEM_ALLOC); \
+        }                                   \
+    } while (0)
+#define CHECK_RC(rc)   \
+    do                 \
+    {                  \
+        if (rc < 0)    \
+        {              \
+            return rc; \
+        }              \
+    } while (0)
 #define _ERR(errcode) (-errcode)
 #define _ERR_STR(des, errcode, ...) (sprintf((des->err_str), __VA_ARGS__), -errcode)
 
-
-struct mfa_desc {
+struct mfa_desc
+{
     int bufsz;
-    u_int8_t *buffer;
-    u_int8_t *map;
-    u_int8_t *toc;
-    u_int8_t *data_ptr;
+    u_int8_t* buffer;
+    u_int8_t* map;
+    u_int8_t* toc;
+    u_int8_t* data_ptr;
     int open_method;
     char err_str[256];
 };
 
-
-enum mfa_open_methods {
+enum mfa_open_methods
+{
     MFA_OPEN_BUF,
     MFA_OPEN_FILE
 };
 
-
-enum header_types {
+enum header_types
+{
     IMAGES_HEADER,
     PSID_HEADER
 };
 
+int mfa_verify_archive(u_int8_t* buf, long sz);
+int mfa_read_map(mfa_desc* mfa_d);
+int parse_section_header(char* buf, int len, int* header_type, int* nrecs);
+int mfa_read_toc(struct mfa_desc* mfa_d);
 
-int mfa_verify_archive(u_int8_t *buf, long sz);
-int mfa_read_map(mfa_desc *mfa_d);
-int parse_section_header(char *buf, int len, int *header_type, int *nrecs);
-int mfa_read_toc(struct mfa_desc *mfa_d);
-
-
-static int _mfa_open_buf(mfa_desc **mfa_d, u_int8_t *arbuf, int size)
+static int _mfa_open_buf(mfa_desc** mfa_d, u_int8_t* arbuf, int size)
 {
     int res = 0;
 
     *mfa_d = (mfa_desc*)malloc(sizeof(mfa_desc));
-    if (!(*mfa_d)) {
+    if (!(*mfa_d))
+    {
         return _ERR(MFA_ERR_MEM_ALLOC);
     }
     memset(*mfa_d, 0, sizeof(mfa_desc));
 
-    if ((res = mfa_verify_archive(arbuf, size))) {
+    if ((res = mfa_verify_archive(arbuf, size)))
+    {
         goto clean_up;
     }
 
     (*mfa_d)->buffer = arbuf;
     (*mfa_d)->bufsz = size;
 
-    if ((res = mfa_read_map(*mfa_d)) < 0) {
+    if ((res = mfa_read_map(*mfa_d)) < 0)
+    {
         goto clean_up;
     }
-    if ((res = mfa_read_toc(*mfa_d)) < 0) {
+    if ((res = mfa_read_toc(*mfa_d)) < 0)
+    {
         goto clean_up_map;
     }
 
@@ -120,43 +136,46 @@ void mfa_init()
     mfasec_init();
 }
 
-
-int mfa_open_buf(mfa_desc **mfa_d, u_int8_t *arbuf, int size)
+int mfa_open_buf(mfa_desc** mfa_d, u_int8_t* arbuf, int size)
 {
     int res;
 
     res = _mfa_open_buf(mfa_d, arbuf, size);
-    if (res == MFA_OK) {
+    if (res == MFA_OK)
+    {
         (*mfa_d)->open_method = MFA_OPEN_BUF;
     }
     return res;
 }
 
-
-int mfa_open_file(mfa_desc **mfa_d, char *fname)
+int mfa_open_file(mfa_desc** mfa_d, char* fname)
 {
     int res = MFA_OK;
-    FILE *fp;
+    FILE* fp;
     u_int8_t *buf = NULL, *tmp_buf;
     long int fsize;
     long int sz;
 
-    if ((fp = fopen(fname, "rb")) == NULL) {
+    if ((fp = fopen(fname, "rb")) == NULL)
+    {
         return _ERR(MFA_ERR_FILE_OPEN);
     }
 
-    if (fseek(fp, 0L, SEEK_END)) {
+    if (fseek(fp, 0L, SEEK_END))
+    {
         res = _ERR(MFA_ERR_FSEEK);
         goto err_clean_up;
     }
-    if ((fsize = ftell(fp)) <= 0) {
+    if ((fsize = ftell(fp)) <= 0)
+    {
         res = _ERR(MFA_ERR_FTELL);
         goto err_clean_up;
     }
     rewind(fp);
 
     buf = (u_int8_t*)malloc(fsize * sizeof(u_int8_t));
-    if (buf == NULL) {
+    if (buf == NULL)
+    {
         res = _ERR(MFA_ERR_MEM_ALLOC);
         goto err_clean_up;
     }
@@ -164,12 +183,14 @@ int mfa_open_file(mfa_desc **mfa_d, char *fname)
     tmp_buf = buf;
     sz = fread(tmp_buf, 1, fsize, fp);
 
-    if (sz != fsize || sz <= 0 || tmp_buf == NULL) {
+    if (sz != fsize || sz <= 0 || tmp_buf == NULL)
+    {
         res = _ERR(MFA_ERR_FILE_READ);
         goto err_clean_up;
     }
 
-    if ((res = _mfa_open_buf(mfa_d, buf, fsize)) != MFA_OK) {
+    if ((res = _mfa_open_buf(mfa_d, buf, fsize)) != MFA_OK)
+    {
         goto err_clean_up;
     }
 
@@ -180,24 +201,27 @@ int mfa_open_file(mfa_desc **mfa_d, char *fname)
 
 err_clean_up:
     fclose(fp);
-    if (buf != NULL) {
+    if (buf != NULL)
+    {
         free(buf);
     }
     return res;
 }
 
-
-int mfa_close(struct mfa_desc *mfa_d)
+int mfa_close(struct mfa_desc* mfa_d)
 {
-    if (mfa_d->map != NULL) {
+    if (mfa_d->map != NULL)
+    {
         free(mfa_d->map);
         mfa_d->map = NULL;
     }
-    if (mfa_d->open_method == MFA_OPEN_FILE) {
+    if (mfa_d->open_method == MFA_OPEN_FILE)
+    {
         free(mfa_d->buffer);
         mfa_d->buffer = NULL;
     }
-    if (mfa_d->toc != NULL) {
+    if (mfa_d->toc != NULL)
+    {
         free(mfa_d->toc);
         mfa_d->toc = NULL;
     }
@@ -205,8 +229,7 @@ int mfa_close(struct mfa_desc *mfa_d)
     return MFA_OK;
 }
 
-
-int mfa_verify_archive(u_int8_t *buf, long sz)
+int mfa_verify_archive(u_int8_t* buf, long sz)
 {
     int i;
     u_int32_t crc;
@@ -214,47 +237,51 @@ int mfa_verify_archive(u_int8_t *buf, long sz)
     u_int32_t ver;
     u_int32_t major;
     u_int32_t minor;
-    u_int32_t mlx_major = (MLXA_VERSION & 0xFFFF0000 ) >> 16;
-    u_int32_t mlx_minor = (MLXA_VERSION & 0x0000FFFF );
+    u_int32_t mlx_major = (MLXA_VERSION & 0xFFFF0000) >> 16;
+    u_int32_t mlx_minor = (MLXA_VERSION & 0x0000FFFF);
     char signature[] = {'M', 'F', 'A', 'R'};
 
-    if (sz < 16) {
+    if (sz < 16)
+    {
         return _ERR(MFA_ERR_ARCHV_FORMAT);
     }
 
-    //Check signature
-    for (i = 0; i < 4; i++) {
-        if (signature[i] != buf[i]) {
+    // Check signature
+    for (i = 0; i < 4; i++)
+    {
+        if (signature[i] != buf[i])
+        {
             return _ERR(MFA_ERR_ARCHV_SIGNATURE);
         }
     }
 
-    //Check version
-    ver   = *((u_int32_t*)&buf[4]);
-    ver   = __be32_to_cpu(ver);
-    major = (ver & 0xFFFF0000 ) >> 16;
-    minor = (ver & 0x0000FFFF );
-    (void) mlx_minor;
-    (void) minor;
-    if (major > mlx_major) {
+    // Check version
+    ver = *((u_int32_t*)&buf[4]);
+    ver = __be32_to_cpu(ver);
+    major = (ver & 0xFFFF0000) >> 16;
+    minor = (ver & 0x0000FFFF);
+    (void)mlx_minor;
+    (void)minor;
+    if (major > mlx_major)
+    {
         return _ERR(MFA_ERR_ARCHV_VER_UNSUPP);
     }
 
-    //Archive CRC
+    // Archive CRC
     ar_crc = *((u_int32_t*)&buf[sz - 4]);
     ar_crc = __be32_to_cpu(ar_crc);
 
     crc = mfasec_crc32(buf, sz - 4, 0);
-    if (crc != ar_crc) {
-        //printf("CRC32 = %08x expected = %08x\n", crc, ar_crc);
+    if (crc != ar_crc)
+    {
+        // printf("CRC32 = %08x expected = %08x\n", crc, ar_crc);
         return _ERR(MFA_ERR_ARCHV_CRC);
     }
 
     return MFA_OK;
 }
 
-
-int mfa_get_crc32(u_int8_t *arbuf, long sz, u_int32_t *ar_crc, u_int32_t *calc_crc)
+int mfa_get_crc32(u_int8_t* arbuf, long sz, u_int32_t* ar_crc, u_int32_t* calc_crc)
 {
     *ar_crc = *((u_int32_t*)&arbuf[sz - 4]);
     *ar_crc = __be32_to_cpu(*ar_crc);
@@ -264,16 +291,16 @@ int mfa_get_crc32(u_int8_t *arbuf, long sz, u_int32_t *ar_crc, u_int32_t *calc_c
     return MFA_OK;
 }
 
-
-int mfa_read_map(struct mfa_desc *mfa_d)
+int mfa_read_map(struct mfa_desc* mfa_d)
 {
-    u_int8_t *buf;
+    u_int8_t* buf;
     int res;
 
-    section_hdr *map_hdr = (section_hdr*) &mfa_d->buffer[MAP_SECTION_OFFSET];
+    section_hdr* map_hdr = (section_hdr*)&mfa_d->buffer[MAP_SECTION_OFFSET];
 
     res = mfasec_get_map(&mfa_d->buffer[MAP_SECTION_OFFSET], __be32_to_cpu(map_hdr->size) + sizeof(section_hdr), &buf);
-    if (res < 0) {
+    if (res < 0)
+    {
         goto clean_up;
     }
 
@@ -283,18 +310,20 @@ int mfa_read_map(struct mfa_desc *mfa_d)
     return res;
 }
 
-
-int mfa_read_toc(struct mfa_desc *mfa_d)
+int mfa_read_toc(struct mfa_desc* mfa_d)
 {
-    u_int8_t *buf;
+    u_int8_t* buf;
     int res;
 
-    section_hdr *map_hdr = (section_hdr*) &mfa_d->buffer[MAP_SECTION_OFFSET];
-    section_hdr *toc_hdr = (section_hdr*) &mfa_d->buffer[MAP_SECTION_OFFSET + __be32_to_cpu(map_hdr->size) + sizeof(section_hdr)];
-    mfa_d->data_ptr = &mfa_d->buffer[MAP_SECTION_OFFSET + __be32_to_cpu(map_hdr->size) + 2 * sizeof(section_hdr) + __be32_to_cpu(toc_hdr->size)];
+    section_hdr* map_hdr = (section_hdr*)&mfa_d->buffer[MAP_SECTION_OFFSET];
+    section_hdr* toc_hdr =
+      (section_hdr*)&mfa_d->buffer[MAP_SECTION_OFFSET + __be32_to_cpu(map_hdr->size) + sizeof(section_hdr)];
+    mfa_d->data_ptr = &mfa_d->buffer[MAP_SECTION_OFFSET + __be32_to_cpu(map_hdr->size) + 2 * sizeof(section_hdr) +
+                                     __be32_to_cpu(toc_hdr->size)];
 
     res = mfasec_get_toc((u_int8_t*)toc_hdr, __be32_to_cpu(toc_hdr->size) + sizeof(section_hdr), &buf);
-    if (res < 0) {
+    if (res < 0)
+    {
         goto clean_up;
     }
 
@@ -304,57 +333,56 @@ int mfa_read_toc(struct mfa_desc *mfa_d)
     return res;
 }
 
-
-int mfa_map_get_num_images(map_entry_hdr *me)
+int mfa_map_get_num_images(map_entry_hdr* me)
 {
     return me->nimages;
 }
 
-
-const char* mfa_map_get_metadata(map_entry_hdr *me)
+const char* mfa_map_get_metadata(map_entry_hdr* me)
 {
-    if (me->metadata_size == 0) {
+    if (me->metadata_size == 0)
+    {
         return "";
     }
-    char *ptr = (char*)me;
+    char* ptr = (char*)me;
     ptr += sizeof(map_entry_hdr);
     return ptr;
 }
 
-
-map_image_entry* mfa_get_map_image(map_entry_hdr *me, int image_index)
+map_image_entry* mfa_get_map_image(map_entry_hdr* me, int image_index)
 {
-    u_int8_t *ptr = (u_int8_t*) me;
-    if (image_index >= me->nimages) {
+    u_int8_t* ptr = (u_int8_t*)me;
+    if (image_index >= me->nimages)
+    {
         return NULL;
     }
     ptr += sizeof(map_entry_hdr);
     ptr += me->metadata_size;
-    map_image_entry *img_e = (map_image_entry*)ptr;
-    return (map_image_entry*) &img_e[image_index];
+    map_image_entry* img_e = (map_image_entry*)ptr;
+    return (map_image_entry*)&img_e[image_index];
 }
 
-
-toc_entry* mfa_get_image_toc(mfa_desc *mfa_d, map_image_entry *img_e)
+toc_entry* mfa_get_image_toc(mfa_desc* mfa_d, map_image_entry* img_e)
 {
-    toc_entry *toc_e = (toc_entry*) &mfa_d->toc[img_e->toc_offset + sizeof(section_hdr)];
-    return (toc_entry*) toc_e;
+    toc_entry* toc_e = (toc_entry*)&mfa_d->toc[img_e->toc_offset + sizeof(section_hdr)];
+    return (toc_entry*)toc_e;
 }
 
-
-map_entry_hdr* mfa_get_map_entry(mfa_desc *mfa_d, char *board_type_id)
+map_entry_hdr* mfa_get_map_entry(mfa_desc* mfa_d, char* board_type_id)
 {
-    u_int8_t *map = mfa_d->map;
-    section_hdr *map_hdr = (section_hdr*) map;
+    u_int8_t* map = mfa_d->map;
+    section_hdr* map_hdr = (section_hdr*)map;
     ssize_t pos = sizeof(section_hdr);
     ssize_t total = sizeof(section_hdr) + map_hdr->size;
 
-    while (pos < total) {
-        map_entry_hdr *map_entry = (map_entry_hdr*)&map[pos];
+    while (pos < total)
+    {
+        map_entry_hdr* map_entry = (map_entry_hdr*)&map[pos];
         int n = map_entry->nimages;
-        if (strcmp(map_entry->board_type_id, board_type_id) != 0) {
+        if (strcmp(map_entry->board_type_id, board_type_id) != 0)
+        {
             pos += sizeof(map_entry_hdr);
-            pos += map_entry->metadata_size; //metadata length
+            pos += map_entry->metadata_size; // metadata length
             pos += n * sizeof(map_image_entry);
             continue;
         }
@@ -364,68 +392,73 @@ map_entry_hdr* mfa_get_map_entry(mfa_desc *mfa_d, char *board_type_id)
     return NULL;
 }
 
-
-map_entry_hdr* mfa_get_next_mentry(mfa_desc *mfa_d, map_entry_hdr *curr_me)
+map_entry_hdr* mfa_get_next_mentry(mfa_desc* mfa_d, map_entry_hdr* curr_me)
 {
     ssize_t pos;
     ssize_t total;
     int n;
-    map_entry_hdr *next_me = NULL;
-    u_int8_t *map = mfa_d->map;
-    section_hdr *map_hdr = (section_hdr*) map;
+    map_entry_hdr* next_me = NULL;
+    u_int8_t* map = mfa_d->map;
+    section_hdr* map_hdr = (section_hdr*)map;
 
     total = sizeof(section_hdr) + map_hdr->size;
 
-    if (curr_me == NULL) {
+    if (curr_me == NULL)
+    {
         pos = sizeof(section_hdr);
         next_me = (map_entry_hdr*)&map[pos];
         return next_me;
     }
 
-    pos = (ssize_t) (((u_int8_t*)curr_me) - map);
+    pos = (ssize_t)(((u_int8_t*)curr_me) - map);
 
     n = curr_me->nimages;
     pos += sizeof(map_entry_hdr);
-    pos += curr_me->metadata_size; //metadata length
+    pos += curr_me->metadata_size; // metadata length
     pos += n * sizeof(map_image_entry);
 
-    if (pos < total) {
+    if (pos < total)
+    {
         next_me = (map_entry_hdr*)&map[pos];
     }
 
     return next_me;
 }
 
-
-char* mfa_get_map_entry_metadata(map_entry_hdr *map_entry, char *key)
+char* mfa_get_map_entry_metadata(map_entry_hdr* map_entry, char* key)
 {
     u_int16_t count;
     u_int16_t i;
-    char *ptr;
-    metadata_hdr *md_hdr;
-    char *val;
+    char* ptr;
+    metadata_hdr* md_hdr;
+    char* val;
 
     ptr = (char*)map_entry;
     ptr += sizeof(map_entry_hdr);
 
-    //ptr points at beginning of metadata section
+    // ptr points at beginning of metadata section
     md_hdr = (metadata_hdr*)ptr;
     ptr += sizeof(metadata_hdr);
 
-    if (map_entry->metadata_size == 0) {
+    if (map_entry->metadata_size == 0)
+    {
         return NULL;
     }
-    if (md_hdr->type != MDT_KEY_VALUE_PAIR) {
+    if (md_hdr->type != MDT_KEY_VALUE_PAIR)
+    {
         return NULL;
     }
 
     count = md_hdr->modifier;
 
-    for (i = 0; i < count; i++) {
-        if (strcmp(ptr, key) == 0) {
+    for (i = 0; i < count; i++)
+    {
+        if (strcmp(ptr, key) == 0)
+        {
             break;
         }
-        if (i == (count - 1)) {
+        if (i == (count - 1))
+        {
             return NULL;
         }
         ptr += strlen(ptr) + 1;
@@ -438,26 +471,26 @@ char* mfa_get_map_entry_metadata(map_entry_hdr *map_entry, char *key)
     return val;
 }
 
-
-char* mfa_get_board_metadata(mfa_desc *mfa_d, char *board_type_id, char *key)
+char* mfa_get_board_metadata(mfa_desc* mfa_d, char* board_type_id, char* key)
 {
-    map_entry_hdr *map_entry = mfa_get_map_entry(mfa_d, board_type_id);
-    if (map_entry == NULL) {
+    map_entry_hdr* map_entry = mfa_get_map_entry(mfa_d, board_type_id);
+    if (map_entry == NULL)
+    {
         return NULL;
     }
     return mfa_get_map_entry_metadata(map_entry, key);
 }
 
-
-ssize_t mfa_get_image(mfa_desc *mfa_d, char *board_type_id, u_int8_t type, char *selector_tag, u_int8_t **buffer)
+ssize_t mfa_get_image(mfa_desc* mfa_d, char* board_type_id, u_int8_t type, char* selector_tag, u_int8_t** buffer)
 {
     int i;
     ssize_t res;
     ssize_t accum_size;
     int last_group_id = -1;
-    map_image_entry *map_img;
-    map_entry_hdr *map_entry = mfa_get_map_entry(mfa_d, board_type_id);
-    if (map_entry == NULL) {
+    map_image_entry* map_img;
+    map_entry_hdr* map_entry = mfa_get_map_entry(mfa_d, board_type_id);
+    if (map_entry == NULL)
+    {
         return _ERR_STR(mfa_d, MFA_ERR_NO_ENTRY, "Entry not found for Board Type ID = %s", board_type_id);
     }
 
@@ -465,58 +498,77 @@ ssize_t mfa_get_image(mfa_desc *mfa_d, char *board_type_id, u_int8_t type, char
     int n = mfa_map_get_num_images(map_entry);
     ssize_t total_size = 0;
 
-    toc_entry **toce_ar;
+    toc_entry** toce_ar;
     int toce_num = 0;
-    if (n > 0) {
-        toce_ar = (toc_entry**) malloc(sizeof(toc_entry*) * n);
-        if (toce_ar == NULL) {
-            return _ERR_STR(mfa_d, MFA_ERR_MEM_ALLOC, "Failed to allocate %u bytes of memory", (unsigned)(sizeof(toc_entry) * n));
+    if (n > 0)
+    {
+        toce_ar = (toc_entry**)malloc(sizeof(toc_entry*) * n);
+        if (toce_ar == NULL)
+        {
+            return _ERR_STR(mfa_d, MFA_ERR_MEM_ALLOC, "Failed to allocate %u bytes of memory",
+                            (unsigned)(sizeof(toc_entry) * n));
         }
-    } else {
+    }
+    else
+    {
         return _ERR_STR(mfa_d, MFA_ERR_ARCHV_FORMAT, "Didn't expect zero images for board type ID=%s", board_type_id);
     }
 
-    for (i = 0; i < n; i++) {
+    for (i = 0; i < n; i++)
+    {
         map_img = mfa_get_map_image(map_entry, i);
-        if (map_img->image_type == type) {
-            if (map_img->select_tag[0] != 0) {
-                if (selector_tag == NULL) {
+        if (map_img->image_type == type)
+        {
+            if (map_img->select_tag[0] != 0)
+            {
+                if (selector_tag == NULL)
+                {
                     continue;
                 }
-                if (strncmp(map_img->select_tag, selector_tag, 32) != 0) {
+                if (strncmp(map_img->select_tag, selector_tag, 32) != 0)
+                {
                     continue;
                 }
             }
-            if (last_group_id == map_img->group_id) {
+            if (last_group_id == map_img->group_id)
+            {
                 continue;
             }
             last_group_id = map_img->group_id;
-            toc_entry *toc_e = mfa_get_image_toc(mfa_d, map_img);
+            toc_entry* toc_e = mfa_get_image_toc(mfa_d, map_img);
             toce_ar[toce_num] = toc_e;
             toce_num++;
             total_size += toc_e->data_size;
         }
     }
 
-    if (toce_num == 0) {
-        res = _ERR_STR(mfa_d, MFA_ERR_NO_ENTRY, "Image not found for board type ID=%s with type=%d and selector_tag=%s", board_type_id, type, selector_tag);
+    if (toce_num == 0)
+    {
+        res = _ERR_STR(mfa_d, MFA_ERR_NO_ENTRY, "Image not found for board type ID=%s with type=%d and selector_tag=%s",
+                       board_type_id, type, selector_tag);
         goto img_alloc_clean_up;
-    } else {
-        *buffer = (u_int8_t*) malloc(total_size);
-        if (*buffer == NULL) {
+    }
+    else
+    {
+        *buffer = (u_int8_t*)malloc(total_size);
+        if (*buffer == NULL)
+        {
             res = _ERR_STR(mfa_d, MFA_ERR_MEM_ALLOC, "Failed to allocate %u memory", (unsigned)total_size);
             goto clean_up;
         }
     }
 
     accum_size = 0;
-    for (i = 0; i < toce_num; i++) {
-        if (toce_ar[i]->data_size == 0) {
+    for (i = 0; i < toce_num; i++)
+    {
+        if (toce_ar[i]->data_size == 0)
+        {
             continue;
         }
-        int rc = mfasec_get_data_chunk(mfa_d->data_ptr, (mfa_d->buffer + mfa_d->bufsz) - mfa_d->data_ptr, toce_ar[i]->data_offset,
-                                       toce_ar[i]->data_size, &((*buffer)[accum_size]));
-        if (rc < 0) {
+        int rc = mfasec_get_data_chunk(mfa_d->data_ptr, (mfa_d->buffer + mfa_d->bufsz) - mfa_d->data_ptr,
+                                       toce_ar[i]->data_offset, toce_ar[i]->data_size, &((*buffer)[accum_size]));
+        if (rc < 0)
+        {
             res = _ERR_STR(mfa_d, -rc, "Failed to get image");
             goto img_alloc_clean_up;
         }
@@ -535,15 +587,12 @@ ssize_t mfa_get_image(mfa_desc *mfa_d, char *board_type_id, u_int8_t type, char
     return res;
 }
 
-
-void mfa_release_image(u_int8_t *buffer)
+void mfa_release_image(u_int8_t* buffer)
 {
     free(buffer);
 }
 
-
-const char* mfa_get_last_error(mfa_desc *mfa_d)
+const char* mfa_get_last_error(mfa_desc* mfa_d)
 {
     return mfa_d->err_str;
 }
-
diff --git a/libmfa/mfa.h b/libmfa/mfa.h
index cf52caa9..dd2d5241 100644
--- a/libmfa/mfa.h
+++ b/libmfa/mfa.h
@@ -36,37 +36,37 @@
 #include <sys/types.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "mfa_section.h"
 
-enum mfa_image_types {
-    MFA_NO_IMAGE     = 0,
-    MFA_FW_IMAGE     = 1,
-    MFA_EXPROM_IMAGE = 2
-};
+    enum mfa_image_types
+    {
+        MFA_NO_IMAGE = 0,
+        MFA_FW_IMAGE = 1,
+        MFA_EXPROM_IMAGE = 2
+    };
 
+    typedef struct mfa_desc mfa_desc;
 
-typedef struct mfa_desc mfa_desc;
-
-void        mfa_init(); //Must be called before any MFA function to perform one time initializations
-int         mfa_open_buf(mfa_desc**, u_int8_t *arbuf, int size);
-int         mfa_open_file(mfa_desc**, char *fname);
-int         mfa_close(mfa_desc *mfa_d);
-ssize_t     mfa_get_image(mfa_desc *mfa_d, char *board_type_id, u_int8_t type, char *selector_tag, u_int8_t **buffer);
-char*       mfa_get_board_metadata(mfa_desc *mfa_d, char *board_type_id, char *key);
-void        mfa_release_image(u_int8_t *buffer);
-const char* mfa_get_last_error(mfa_desc *mfa_d);
-int         mfa_get_crc32(u_int8_t *arbuf, long sz, u_int32_t *ar_crc, u_int32_t *calc_crc);
-char*       mfa_get_map_entry_metadata(map_entry_hdr *map_entry, char *key);
-map_entry_hdr*   mfa_get_next_mentry(mfa_desc *mfa_d, map_entry_hdr *curr_me);
-map_image_entry* mfa_get_map_image(map_entry_hdr *me, int image_index);
-toc_entry*       mfa_get_image_toc(mfa_desc *mfa_d, map_image_entry *img_e);
+    void mfa_init(); // Must be called before any MFA function to perform one time initializations
+    int mfa_open_buf(mfa_desc**, u_int8_t* arbuf, int size);
+    int mfa_open_file(mfa_desc**, char* fname);
+    int mfa_close(mfa_desc* mfa_d);
+    ssize_t mfa_get_image(mfa_desc* mfa_d, char* board_type_id, u_int8_t type, char* selector_tag, u_int8_t** buffer);
+    char* mfa_get_board_metadata(mfa_desc* mfa_d, char* board_type_id, char* key);
+    void mfa_release_image(u_int8_t* buffer);
+    const char* mfa_get_last_error(mfa_desc* mfa_d);
+    int mfa_get_crc32(u_int8_t* arbuf, long sz, u_int32_t* ar_crc, u_int32_t* calc_crc);
+    char* mfa_get_map_entry_metadata(map_entry_hdr* map_entry, char* key);
+    map_entry_hdr* mfa_get_next_mentry(mfa_desc* mfa_d, map_entry_hdr* curr_me);
+    map_image_entry* mfa_get_map_image(map_entry_hdr* me, int image_index);
+    toc_entry* mfa_get_image_toc(mfa_desc* mfa_d, map_image_entry* img_e);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/libmfa/mfa_section.c b/libmfa/mfa_section.c
index 65d229d7..dee474d0 100644
--- a/libmfa/mfa_section.c
+++ b/libmfa/mfa_section.c
@@ -44,43 +44,43 @@
 
 #define _ERR(errcode) (-errcode)
 
-
-
 void mfasec_init()
 {
     xz_init();
 }
 
-
-u_int32_t mfasec_crc32(const u_int8_t *buf, size_t size, u_int32_t crc)
+u_int32_t mfasec_crc32(const u_int8_t* buf, size_t size, u_int32_t crc)
 {
     return xz_io_crc32(buf, size, crc);
 }
 
-
-ssize_t  mfasec_get_section(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
+ssize_t mfasec_get_section(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf)
 {
     int res = 0;
     int rc;
-    xzhandle_t *xzh;
-    u_int8_t *buf;
+    xzhandle_t* xzh;
+    u_int8_t* buf;
 
-    section_hdr *hdr = (section_hdr*) inbuf;
-    if (hdr->flags & SFLAG_XZ_COMPRESSED) {
+    section_hdr* hdr = (section_hdr*)inbuf;
+    if (hdr->flags & SFLAG_XZ_COMPRESSED)
+    {
         ssize_t sz;
         sz = xz_stream_len(&inbuf[sizeof(section_hdr)], __be32_to_cpu(hdr->size));
-        if (sz <= 0) {
+        if (sz <= 0)
+        {
             return _ERR(MFA_ERR_DECOMPRESSION);
         }
         ssize_t msize = sz + sizeof(section_hdr);
         buf = (u_int8_t*)malloc(msize);
-        if (buf == NULL) {
+        if (buf == NULL)
+        {
             return _ERR(MFA_ERR_MEM_ALLOC);
         }
         memcpy(buf, inbuf, sizeof(section_hdr));
-        //Read section into buffer
+        // Read section into buffer
         xzh = xz_open_buf(&inbuf[sizeof(section_hdr)], inbufsz - sizeof(section_hdr));
-        if (xzh == NULL) {
+        if (xzh == NULL)
+        {
             res = _ERR(MFA_ERR_DECOMPRESSION);
             goto clean_up;
         }
@@ -88,18 +88,21 @@ ssize_t  mfasec_get_section(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
         rc = xz_read(xzh, &buf[sizeof(section_hdr)], sz);
         xz_close(xzh);
 
-        if (rc != sz) {
+        if (rc != sz)
+        {
             res = _ERR(MFA_ERR_ARCHV_FORMAT);
             goto clean_up;
         }
-        section_hdr *hdr = (section_hdr*)buf;
+        section_hdr* hdr = (section_hdr*)buf;
         hdr->flags &= (u_int8_t)(~SFLAG_XZ_COMPRESSED);
         hdr->size = __cpu_to_be32(((u_int32_t)sz));
     }
-    else {
+    else
+    {
         ssize_t msize = __be32_to_cpu(hdr->size) + sizeof(section_hdr);
         buf = (u_int8_t*)malloc(msize);
-        if (buf == NULL) {
+        if (buf == NULL)
+        {
             return _ERR(MFA_ERR_MEM_ALLOC);
         }
         memcpy(buf, inbuf, __be32_to_cpu(hdr->size) + sizeof(section_hdr));
@@ -112,46 +115,52 @@ ssize_t  mfasec_get_section(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
     res = hdr->size + sizeof(section_hdr);
 
 clean_up:
-    if (res < 0) {
+    if (res < 0)
+    {
         free(buf);
     }
     return res;
 }
 
-
-ssize_t  mfasec_get_map(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
+ssize_t mfasec_get_map(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf)
 {
     int res = 0;
     int j;
     res = mfasec_get_section(inbuf, inbufsz, outbuf);
-    if (res < 0) {
+    if (res < 0)
+    {
         return res;
     }
     ssize_t pos = sizeof(section_hdr);
     ssize_t total = res;
 
-    while (pos < total) {
-        map_entry_hdr *map_entry = (map_entry_hdr*)&((*outbuf)[pos]);
+    while (pos < total)
+    {
+        map_entry_hdr* map_entry = (map_entry_hdr*)&((*outbuf)[pos]);
         int n = map_entry->nimages;
         map_entry->metadata_size = __be16_to_cpu(map_entry->metadata_size);
-        //printf("%s %d\n", map_entry->board_type_id, n);
+        // printf("%s %d\n", map_entry->board_type_id, n);
         pos += sizeof(map_entry_hdr);
-        if (pos >= total) {
+        if (pos >= total)
+        {
             break;
         }
-        if (map_entry->metadata_size > 0) {
-            metadata_hdr *md_hdr = (metadata_hdr*)&((*outbuf)[pos]);
+        if (map_entry->metadata_size > 0)
+        {
+            metadata_hdr* md_hdr = (metadata_hdr*)&((*outbuf)[pos]);
             md_hdr->modifier = __be16_to_cpu(md_hdr->modifier);
         }
         pos += map_entry->metadata_size;
-        if (pos >= total) {
+        if (pos >= total)
+        {
             break;
         }
-        for (j = 0; j < n; j++) {
-            map_image_entry *img_entry = (map_image_entry*)&((*outbuf)[pos]);
+        for (j = 0; j < n; j++)
+        {
+            map_image_entry* img_entry = (map_image_entry*)&((*outbuf)[pos]);
             img_entry->toc_offset = __be32_to_cpu(img_entry->toc_offset);
             img_entry->image_type = __be16_to_cpu(img_entry->image_type);
-            //printf("Image #%d Offset: %08x\n", j, img_entry->toc_offset);
+            // printf("Image #%d Offset: %08x\n", j, img_entry->toc_offset);
             pos += sizeof(map_image_entry);
         }
     }
@@ -159,28 +168,31 @@ ssize_t  mfasec_get_map(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
     return res;
 }
 
-
-ssize_t  mfasec_get_toc(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
+ssize_t mfasec_get_toc(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf)
 {
     int res = 0;
     int i;
 
     res = mfasec_get_section(inbuf, inbufsz, outbuf);
-    if (res < 0) {
+    if (res < 0)
+    {
         return res;
     }
     ssize_t pos = sizeof(section_hdr);
     ssize_t total = res;
-    if (((total - pos) % sizeof(toc_entry)) != 0) {
+    if (((total - pos) % sizeof(toc_entry)) != 0)
+    {
         printf("Error while parsing MFA file. Total %d entry %d\n", (int)total, (int)sizeof(toc_entry));
         return -1;
     }
-    while (pos < total) {
-        toc_entry *toc_e = (toc_entry*)&((*outbuf)[pos]);
+    while (pos < total)
+    {
+        toc_entry* toc_e = (toc_entry*)&((*outbuf)[pos]);
         toc_e->data_offset = __be32_to_cpu(toc_e->data_offset);
         toc_e->data_size = __be32_to_cpu(toc_e->data_size);
         toc_e->subimage_type = __be16_to_cpu(toc_e->subimage_type);
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < 4; i++)
+        {
             toc_e->version[i] = __be16_to_cpu(toc_e->version[i]);
         }
         toc_e->metadata_size = __be16_to_cpu(toc_e->metadata_size);
@@ -193,52 +205,64 @@ ssize_t  mfasec_get_toc(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf)
 
 #define BUF_SIZE 1024
 
-enum read_states {
+enum read_states
+{
     SEEK,
     COPY
 };
 
-int mfasec_get_data_chunk(u_int8_t *data_sec_ptr, size_t data_sec_len, size_t chunk_offset, size_t length, u_int8_t *outbuf)
+int mfasec_get_data_chunk(u_int8_t* data_sec_ptr,
+                          size_t data_sec_len,
+                          size_t chunk_offset,
+                          size_t length,
+                          u_int8_t* outbuf)
 {
     int res = 0;
     int rc;
-    xzhandle_t *xzh;
-    u_int8_t *buf = NULL;
+    xzhandle_t* xzh;
+    u_int8_t* buf = NULL;
     size_t src_sz;
 
-    u_int8_t *ptr = data_sec_ptr;
-    if (data_sec_len < sizeof(section_hdr)) {
+    u_int8_t* ptr = data_sec_ptr;
+    if (data_sec_len < sizeof(section_hdr))
+    {
         return _ERR(MFA_ERR_BUFF_SIZE);
     }
     ptr += sizeof(section_hdr);
     data_sec_len -= sizeof(section_hdr);
 
-    section_hdr *hdr = (section_hdr*) data_sec_ptr;
+    section_hdr* hdr = (section_hdr*)data_sec_ptr;
     src_sz = __be32_to_cpu(hdr->size);
 
-    if (hdr->flags & SFLAG_XZ_COMPRESSED) {
+    if (hdr->flags & SFLAG_XZ_COMPRESSED)
+    {
         size_t sz;
         buf = (u_int8_t*)malloc(BUF_SIZE);
-        if (buf == NULL) {
+        if (buf == NULL)
+        {
             return _ERR(MFA_ERR_MEM_ALLOC);
         }
-        if (data_sec_len < src_sz) {
+        if (data_sec_len < src_sz)
+        {
             res = _ERR(MFA_ERR_BUFF_SIZE);
             goto clean_up;
         }
         sz = xz_stream_len(ptr, src_sz);
-        if (sz <= 0) {
+        if (sz <= 0)
+        {
             res = _ERR(MFA_ERR_DECOMPRESSION);
             goto clean_up;
         }
-        if (sz < (chunk_offset + length)) {
+        if (sz < (chunk_offset + length))
+        {
             res = _ERR(MFA_ERR_DECOMPRESSION);
             goto clean_up;
         }
 
-        //Read section into buffer
+        // Read section into buffer
         xzh = xz_open_buf(ptr, src_sz);
-        if (xzh == NULL) {
+        if (xzh == NULL)
+        {
             res = _ERR(MFA_ERR_DECOMPRESSION);
             goto clean_up;
         }
@@ -246,84 +270,98 @@ int mfasec_get_data_chunk(u_int8_t *data_sec_ptr, size_t data_sec_len, size_t ch
         size_t index = 0;
         size_t rlen = 0;
         int state = SEEK;
-        do {
+        do
+        {
             rc = xz_read(xzh, buf, BUF_SIZE);
-            if (rc > 0) {
+            if (rc > 0)
+            {
                 index += rc;
-            } else {
+            }
+            else
+            {
                 break;
             }
 
-            if (state == SEEK) {
-                if (index > chunk_offset) {
+            if (state == SEEK)
+            {
+                if (index > chunk_offset)
+                {
                     rlen += index - chunk_offset;
                     memcpy(outbuf, &buf[rc - (rlen)], rlen);
                     state = COPY;
                 }
-            } else if (state == COPY) {
+            }
+            else if (state == COPY)
+            {
                 size_t delta = rc;
-                if ((rlen + rc) > length) {
+                if ((rlen + rc) > length)
+                {
                     delta = length - rlen;
                 }
                 memcpy(&outbuf[rlen], buf, delta);
                 rlen += delta;
             }
-            if (rlen == length) {
+            if (rlen == length)
+            {
                 break;
             }
         } while (rc == BUF_SIZE);
 
         xz_close(xzh);
 
-        if (rlen != length) {
+        if (rlen != length)
+        {
             res = _ERR(MFA_ERR_DECOMPRESSION);
             goto clean_up;
         }
-    } else {
+    }
+    else
+    {
         ptr += chunk_offset;
         memcpy(outbuf, ptr, length);
     }
 
 clean_up:
-    if (buf != NULL) {
+    if (buf != NULL)
+    {
         free(buf);
     }
     return res;
 }
 
-
 char* mfasec_get_sub_image_type_str(int t)
 {
-    char *tstr;
+    char* tstr;
 
-    switch (t) {
-    case SIT_PADDING:
-        tstr = "";
-        break;
+    switch (t)
+    {
+        case SIT_PADDING:
+            tstr = "";
+            break;
 
-    case SIT_FW:
-        tstr = "FW";
-        break;
+        case SIT_FW:
+            tstr = "FW";
+            break;
 
-    case SIT_CLP:
-        tstr = "CLP";
-        break;
+        case SIT_CLP:
+            tstr = "CLP";
+            break;
 
-    case SIT_PXE:
-        tstr = "PXE";
-        break;
+        case SIT_PXE:
+            tstr = "PXE";
+            break;
 
-    case SIT_UEFI:
-        tstr = "UEFI";
-        break;
+        case SIT_UEFI:
+            tstr = "UEFI";
+            break;
 
-    case SIT_FCODE:
-        tstr = "FCODE";
-        break;
+        case SIT_FCODE:
+            tstr = "FCODE";
+            break;
 
-    default:
-        tstr = NULL;
-        break;
+        default:
+            tstr = NULL;
+            break;
     }
     return tstr;
 }
diff --git a/libmfa/mfa_section.h b/libmfa/mfa_section.h
index 4dcf585a..256fa6a0 100644
--- a/libmfa/mfa_section.h
+++ b/libmfa/mfa_section.h
@@ -37,8 +37,8 @@
 #include <compatibility.h>
 #include "xz_io_ops.h"
 
-
-enum {
+enum
+{
     MFA_SEC_OK = 0,
     MFA_SEC_ERR_GENERIC = 1,
     MFA_SEC_ERR_MEM_ALLOC,
@@ -49,22 +49,22 @@ enum {
     MFA_SEC_ERR_EXTRACT_FILE
 };
 
-
-enum mfa_section_types {
-    MFA_MAP_SECTION =  1,
-    MFA_TOC_SECTION =  2,
+enum mfa_section_types
+{
+    MFA_MAP_SECTION = 1,
+    MFA_TOC_SECTION = 2,
     MFA_DATA_SECTION = 3,
     MFA_NUM_SECTIONS
 };
 
-
-enum image_types {
+enum image_types
+{
     IT_FW_IMAGE = 1,
     IT_N_IMAGE_TYPES
 };
 
-
-enum subimage_types {
+enum subimage_types
+{
     SIT_PADDING = 0,
     SIT_FW = 1,
 
@@ -74,21 +74,21 @@ enum subimage_types {
     SIT_FCODE = 0x121
 };
 
-
-enum section_flags {
+enum section_flags
+{
     SFLAG_XZ_COMPRESSED = 1
 };
 
-
-typedef struct section_hdr {
+typedef struct section_hdr
+{
     u_int8_t type;
     u_int8_t reserved[2];
     u_int8_t flags;
     u_int32_t size;
 } section_hdr;
 
-
-typedef struct map_entry_hdr {
+typedef struct map_entry_hdr
+{
     char board_type_id[32];
     u_int8_t nimages;
     u_int8_t reserved;
@@ -96,8 +96,8 @@ typedef struct map_entry_hdr {
 } map_entry_hdr;
 // This struct is followed by the metadata unless metadata_size is zero
 
-
-typedef struct map_image_entry {
+typedef struct map_image_entry
+{
     u_int32_t toc_offset;
     u_int16_t image_type;
     u_int8_t reserved;
@@ -105,8 +105,8 @@ typedef struct map_image_entry {
     char select_tag[32];
 } map_image_entry;
 
-
-typedef struct toc_entry {
+typedef struct toc_entry
+{
     u_int32_t data_offset;
     u_int32_t data_size;
     u_int16_t subimage_type;
@@ -117,25 +117,28 @@ typedef struct toc_entry {
     u_int16_t metadata_size;
 } toc_entry;
 
-
-enum metadata_type {
+enum metadata_type
+{
     MDT_RAW = 0,
     MDT_KEY_VALUE_PAIR = 1
 };
 
-//MDT_KEY_VALUE_PAIR => modifier is number of pairs
-typedef struct metadata_hdr {
+// MDT_KEY_VALUE_PAIR => modifier is number of pairs
+typedef struct metadata_hdr
+{
     u_int8_t type;
     u_int8_t reserved;
     u_int16_t modifier;
 } metadata_hdr;
 
-
-void      mfasec_init();
-u_int32_t mfasec_crc32(const u_int8_t *buf, size_t size, u_int32_t crc);
-ssize_t   mfasec_get_map(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf);
-ssize_t   mfasec_get_toc(u_int8_t *inbuf, size_t inbufsz, u_int8_t **outbuf);
-int       mfasec_get_data_chunk(u_int8_t *data_sec_ptr, size_t data_sec_len, size_t chunk_offset, size_t length, u_int8_t *outbuf);
-char*     mfasec_get_sub_image_type_str(int t);
+void mfasec_init();
+u_int32_t mfasec_crc32(const u_int8_t* buf, size_t size, u_int32_t crc);
+ssize_t mfasec_get_map(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf);
+ssize_t mfasec_get_toc(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf);
+int mfasec_get_data_chunk(u_int8_t* data_sec_ptr,
+                          size_t data_sec_len,
+                          size_t chunk_offset,
+                          size_t length,
+                          u_int8_t* outbuf);
+char* mfasec_get_sub_image_type_str(int t);
 #endif
-
diff --git a/libmfa/mfaerr.h b/libmfa/mfaerr.h
index 4c6a04e6..2926d1bd 100644
--- a/libmfa/mfaerr.h
+++ b/libmfa/mfaerr.h
@@ -34,8 +34,9 @@
 #ifndef _MFA_ERR_H_
 #define _MFA_ERR_H_
 
-enum {
-    MFA_OK =  0,
+enum
+{
+    MFA_OK = 0,
     MFA_ERR_GENERIC,
     MFA_ERR_MEM_ALLOC,
     MFA_ERR_ARCHV_SIGNATURE,
diff --git a/libmfa/test.c b/libmfa/test.c
index 3ad28d5b..31ab115b 100644
--- a/libmfa/test.c
+++ b/libmfa/test.c
@@ -34,26 +34,30 @@
 #include <stdio.h>
 #include "mfa.h"
 
-
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-    mfa_desc *md;
-    u_int8_t *buf = NULL;
+    mfa_desc* md;
+    u_int8_t* buf = NULL;
 
     mfa_init();
     int rc = mfa_open_file(&md, argv[1]);
-    if (rc) {
+    if (rc)
+    {
         printf("Error!\n");
     }
     ssize_t res = mfa_get_image(md, argv[2], 1, "", &buf);
     printf("RES=%d\n", res);
-    if (res < 0) {
+    if (res < 0)
+    {
         printf("ERR = %s\n", mfa_get_last_error(md));
-    } else {
+    }
+    else
+    {
         printf("DATA: %s\n", buf);
     }
 
-    if (res > 0) {
+    if (res > 0)
+    {
         free(buf);
     }
     mfa_close(md);
diff --git a/libmfa/xz_io_ops.c b/libmfa/xz_io_ops.c
index 670b5908..78099e06 100644
--- a/libmfa/xz_io_ops.c
+++ b/libmfa/xz_io_ops.c
@@ -49,53 +49,55 @@
 #define MXZ_ERR_MEM_ALLOC 1
 #define MXZ_ERR_DECODER_INIT 2
 
-typedef struct {
-    struct xz_dec *s;
+typedef struct
+{
+    struct xz_dec* s;
     struct xz_buf b;
 } xz_env;
 
 static uint8_t xz_has_init = 0;
 
-struct xzhandle_t {
-    const u_int8_t *buf;
+struct xzhandle_t
+{
+    const u_int8_t* buf;
     ssize_t size;
     ssize_t pos;
-    xz_env *envptr;
+    xz_env* envptr;
 };
 
-
 void xz_init()
 {
-    if (xz_has_init) {
+    if (xz_has_init)
+    {
         return;
     }
     xz_crc32_init();
     xz_has_init = 1;
 }
 
-
-uint32_t xz_io_crc32(const uint8_t *buf, size_t size, uint32_t crc)
+uint32_t xz_io_crc32(const uint8_t* buf, size_t size, uint32_t crc)
 {
     xz_init();
     return xz_crc32(buf, size, crc);
 }
 
-
-static xz_env* xz_decoder_init(int *status_code)
+static xz_env* xz_decoder_init(int* status_code)
 {
-    xz_env *env;
-    struct xz_dec *s;
+    xz_env* env;
+    struct xz_dec* s;
     *status_code = 0;
     struct xz_buf b;
 
-    env = (xz_env*) malloc(sizeof(xz_env));
-    if (env == NULL) {
+    env = (xz_env*)malloc(sizeof(xz_env));
+    if (env == NULL)
+    {
         *status_code = _ERR(MXZ_ERR_MEM_ALLOC);
         return NULL;
     }
 
     s = xz_dec_init(XZ_DYNALLOC, (uint32_t)-1);
-    if (s == NULL) {
+    if (s == NULL)
+    {
         *status_code = _ERR(MXZ_ERR_DECODER_INIT);
         goto err_clean_up;
     }
@@ -117,22 +119,25 @@ static xz_env* xz_decoder_init(int *status_code)
     return NULL;
 }
 
-
-static size_t decode_xz_num(const u_int8_t buf[], size_t size_max, u_int64_t *num)
+static size_t decode_xz_num(const u_int8_t buf[], size_t size_max, u_int64_t* num)
 {
-    if (size_max == 0) {
+    if (size_max == 0)
+    {
         return 0;
     }
 
-    if (size_max > 9) {
+    if (size_max > 9)
+    {
         size_max = 9;
     }
 
     *num = buf[0] & 0x7F;
     size_t i = 0;
 
-    while (buf[i++] & 0x80) {
-        if (i >= size_max || buf[i] == 0x00) {
+    while (buf[i++] & 0x80)
+    {
+        if (i >= size_max || buf[i] == 0x00)
+        {
             return 0;
         }
 
@@ -142,71 +147,75 @@ static size_t decode_xz_num(const u_int8_t buf[], size_t size_max, u_int64_t *nu
     return i;
 }
 
-
-ssize_t xz_stream_len(u_int8_t *buffer, ssize_t len)
+ssize_t xz_stream_len(u_int8_t* buffer, ssize_t len)
 {
-    //long sz = 0;
+    // long sz = 0;
     ssize_t pos = len - 1;
     unsigned i;
 
-    while (buffer[pos] == 0) {
+    while (buffer[pos] == 0)
+    {
         pos--;
     }
 
-    if ((buffer[pos] != 'Z') || (buffer[pos - 1] != 'Y')) {
+    if ((buffer[pos] != 'Z') || (buffer[pos - 1] != 'Y'))
+    {
         return -1;
     }
 
     pos -= 7;
-    u_int32_t backward_size = *((u_int32_t*) &buffer[pos]);//TODO: Must use le2cpu function here
+    u_int32_t backward_size = *((u_int32_t*)&buffer[pos]); // TODO: Must use le2cpu function here
     backward_size = __le32_to_cpu(backward_size);
     backward_size = (backward_size + 1) * 4;
-    pos -= 4; //CRC32
-    pos -= backward_size - 1; //pos will point at number of records field inside Index
+    pos -= 4;                 // CRC32
+    pos -= backward_size - 1; // pos will point at number of records field inside Index
 
     u_int64_t num_blocks = 0;
     int idx = decode_xz_num(&buffer[pos], len - pos, &num_blocks);
-    //printf("idx: %d\n", idx);
-    //sz = num_blocks;
+    // printf("idx: %d\n", idx);
+    // sz = num_blocks;
     pos += idx;
 
     ssize_t total_unpadded = 0;
     ssize_t total_uncompressed = 0;
 
-    for (i = 0; i < num_blocks; i++) {
+    for (i = 0; i < num_blocks; i++)
+    {
         u_int64_t unpadded = 0;
         u_int64_t uncompressed = 0;
         idx = decode_xz_num(&buffer[pos], len - pos, &unpadded);
         pos += idx;
         idx = decode_xz_num(&buffer[pos], len - pos, &uncompressed);
         pos += idx;
-        //printf("Block #%3d: Unpadded: %8u  Uncompressed: %8u\n", i, unpadded, uncompressed);
+        // printf("Block #%3d: Unpadded: %8u  Uncompressed: %8u\n", i, unpadded, uncompressed);
         total_unpadded += unpadded;
         total_uncompressed += uncompressed;
     }
-    (void)total_unpadded; 
+    (void)total_unpadded;
     (void)total_uncompressed;
-    //printf("Totals:     Unpadded: %8u  Uncompressed: %8u\n", total_unpadded, total_uncompressed);
+    // printf("Totals:     Unpadded: %8u  Uncompressed: %8u\n", total_unpadded, total_uncompressed);
 
     return total_uncompressed;
 }
 
-
-xzhandle_t* xz_open_buf(const u_int8_t *buf, size_t size)
+xzhandle_t* xz_open_buf(const u_int8_t* buf, size_t size)
 {
-    xzhandle_t *xzh;
+    xzhandle_t* xzh;
     int res;
 
-    xz_env *env = xz_decoder_init(&res);
-    if (env == NULL) {
+    xz_env* env = xz_decoder_init(&res);
+    if (env == NULL)
+    {
         return NULL;
     }
-    if (res) {
+    if (res)
+    {
         return NULL;
     }
 
-    xzh = (xzhandle_t*) malloc(sizeof(xzhandle_t));
-    if (xzh == NULL) {
+    xzh = (xzhandle_t*)malloc(sizeof(xzhandle_t));
+    if (xzh == NULL)
+    {
         xz_dec_end(env->s);
         free(env);
         return NULL;
@@ -219,23 +228,22 @@ xzhandle_t* xz_open_buf(const u_int8_t *buf, size_t size)
     return xzh;
 }
 
-
-void xz_close(xzhandle_t *xzh)
+void xz_close(xzhandle_t* xzh)
 {
-    xz_env *e = xzh->envptr;
+    xz_env* e = xzh->envptr;
     xz_dec_end(e->s);
     free(e);
     free(xzh);
 }
 
-
-int xz_read(xzhandle_t *xzh, u_int8_t *buf, size_t len)
+int xz_read(xzhandle_t* xzh, u_int8_t* buf, size_t len)
 {
-    xz_env *e;
+    xz_env* e;
     enum xz_ret ret;
 
     e = xzh->envptr;
-    if (e->b.in == NULL) {
+    if (e->b.in == NULL)
+    {
         e->b.in = (uint8_t*)&xzh->buf[xzh->pos];
         e->b.in_size = xzh->size;
         e->b.in_pos = 0;
@@ -244,43 +252,46 @@ int xz_read(xzhandle_t *xzh, u_int8_t *buf, size_t len)
     e->b.out = buf;
     e->b.out_size = len;
     e->b.out_pos = 0;
-    do {
+    do
+    {
         ret = xz_dec_run(e->s, &e->b);
 
-        if (e->b.out_pos == e->b.out_size) {
+        if (e->b.out_pos == e->b.out_size)
+        {
             return e->b.out_pos;
-        } else if (ret == XZ_STREAM_END) {
+        }
+        else if (ret == XZ_STREAM_END)
+        {
             break;
         }
     } while (ret == XZ_OK);
 
-    switch (ret) {
-    case XZ_STREAM_END:
-        return e->b.out_pos;
+    switch (ret)
+    {
+        case XZ_STREAM_END:
+            return e->b.out_pos;
 
-    case XZ_MEM_ERROR:
-        //This can occur only in multi-call mode. XZ decompressor ran out of memory
-        break;
+        case XZ_MEM_ERROR:
+            // This can occur only in multi-call mode. XZ decompressor ran out of memory
+            break;
 
-    case XZ_FORMAT_ERROR:
-        //Input is not in the XZ format (wrong magic bytes)
-        break;
+        case XZ_FORMAT_ERROR:
+            // Input is not in the XZ format (wrong magic bytes)
+            break;
 
-    case XZ_OPTIONS_ERROR:
-        //Input was encoded with settings that are not supported by this XZ decoder
-        break;
+        case XZ_OPTIONS_ERROR:
+            // Input was encoded with settings that are not supported by this XZ decoder
+            break;
 
-    case XZ_DATA_ERROR:
-    case XZ_BUF_ERROR:
-        //XZ-compressed data is corrupt;
-        break;
+        case XZ_DATA_ERROR:
+        case XZ_BUF_ERROR:
+            // XZ-compressed data is corrupt;
+            break;
 
-    default:
-        //Bug in the XZ decompressor;
-        break;
+        default:
+            // Bug in the XZ decompressor;
+            break;
     }
 
     return -1;
 }
-
-
diff --git a/libmfa/xz_io_ops.h b/libmfa/xz_io_ops.h
index 5461d3e7..0609702a 100644
--- a/libmfa/xz_io_ops.h
+++ b/libmfa/xz_io_ops.h
@@ -38,13 +38,12 @@
 
 typedef struct xzhandle_t xzhandle_t;
 
-void        xz_init();
-u_int32_t   xz_io_crc32(const u_int8_t *buf, size_t size, u_int32_t crc);
-ssize_t     xz_stream_len(u_int8_t *buffer, ssize_t len);
+void xz_init();
+u_int32_t xz_io_crc32(const u_int8_t* buf, size_t size, u_int32_t crc);
+ssize_t xz_stream_len(u_int8_t* buffer, ssize_t len);
 
-xzhandle_t* xz_open_buf(const u_int8_t *buf, size_t size);
-void        xz_close(xzhandle_t *xzh);
-int         xz_read(xzhandle_t *xzh, u_int8_t *buf, size_t len);
+xzhandle_t* xz_open_buf(const u_int8_t* buf, size_t size);
+void xz_close(xzhandle_t* xzh);
+int xz_read(xzhandle_t* xzh, u_int8_t* buf, size_t len);
 
 #endif
-
diff --git a/libmfa/xz_io_ops_llzma.c b/libmfa/xz_io_ops_llzma.c
index 3e0e80c9..7c938c9d 100644
--- a/libmfa/xz_io_ops_llzma.c
+++ b/libmfa/xz_io_ops_llzma.c
@@ -44,38 +44,34 @@
 
 #include <lzma.h>
 
+tbuf_t* xzopen_frontend(char* pathname, int oflags, int mode);
+int xzread(tbuf_t* tbuf, void* buf, size_t len);
+int xzwrite(tbuf_t* tbuf, const void* buf, size_t len);
 
-tbuf_t* xzopen_frontend(char *pathname, int oflags, int mode);
-int     xzread(tbuf_t *tbuf, void *buf, size_t len);
-int     xzwrite(tbuf_t *tbuf, const void *buf, size_t len);
+void xz_init() {}
 
-
-void xz_init()
-{
-}
-
-
-uint32_t xz_io_crc32(const uint8_t *buf, size_t size, uint32_t crc)
+uint32_t xz_io_crc32(const uint8_t* buf, size_t size, uint32_t crc)
 {
     return lzma_crc32(buf, size, crc);
 }
 
-
-void* xz_decoder_init(int *status_code)
+void* xz_decoder_init(int* status_code)
 {
-    lzma_stream *strm;
+    lzma_stream* strm;
     lzma_stream tmp = LZMA_STREAM_INIT;
     *status_code = 0;
 
-    strm = (lzma_stream*) malloc(sizeof(lzma_stream));
-    if (strm == NULL) {
+    strm = (lzma_stream*)malloc(sizeof(lzma_stream));
+    if (strm == NULL)
+    {
         *status_code = _ERR(TXZ_ERR_MEM_ALLOC);
         return NULL;
     }
 
     *strm = tmp;
 
-    if (init_decoder(strm)) {
+    if (init_decoder(strm))
+    {
         // Decoder initialization failed. There's no point
         // to retry it so we need to exit.
         *status_code = _ERR(TXZ_ERR_DECODER_INIT);
@@ -90,59 +86,58 @@ void* xz_decoder_init(int *status_code)
     return NULL;
 }
 
-
-void xz_close(void *strm)
+void xz_close(void* strm)
 {
     lzma_end((lzma_stream*)strm);
 }
 
-
-int init_decoder(lzma_stream *strm)
+int init_decoder(lzma_stream* strm)
 {
-    lzma_ret ret = lzma_stream_decoder(
-        strm, UINT64_MAX, LZMA_CONCATENATED);
+    lzma_ret ret = lzma_stream_decoder(strm, UINT64_MAX, LZMA_CONCATENATED);
 
-    if (ret == LZMA_OK) {
+    if (ret == LZMA_OK)
+    {
         return 0;
     }
 
-    const char *msg;
-    switch (ret) {
-    case LZMA_MEM_ERROR:
-        msg = "Memory allocation failed";
-        break;
+    const char* msg;
+    switch (ret)
+    {
+        case LZMA_MEM_ERROR:
+            msg = "Memory allocation failed";
+            break;
 
-    case LZMA_OPTIONS_ERROR:
-        msg = "Unsupported decompressor flags";
-        break;
+        case LZMA_OPTIONS_ERROR:
+            msg = "Unsupported decompressor flags";
+            break;
 
-    default:
-        msg = "Unknown error, possibly a bug";
-        break;
+        default:
+            msg = "Unknown error, possibly a bug";
+            break;
     }
 
-    printf( "Error initializing the decoder: %s (error code %u)\n",
-            msg, ret);
+    printf("Error initializing the decoder: %s (error code %u)\n", msg, ret);
     return -1;
 }
 
-
 int lzma_code_ret(lzma_ret ret);
 
-
-int xzread(tbuf_t *tbuf, void *buf, size_t len)
+int xzread(tbuf_t* tbuf, void* buf, size_t len)
 {
-    lzma_stream *strm;
+    lzma_stream* strm;
     lzma_action action = LZMA_RUN;
 
     strm = (lzma_stream*)tbuf->envptr;
     strm->next_out = (uint8_t*)buf;
     strm->avail_out = len;
 
-    while (1) {
-        if (strm->avail_in == 0 && action != LZMA_FINISH) {
+    while (1)
+    {
+        if (strm->avail_in == 0 && action != LZMA_FINISH)
+        {
             int chunksz = tbuf->size - tbuf->pos;
-            if (chunksz > BUFSIZ) {
+            if (chunksz > BUFSIZ)
+            {
                 chunksz = BUFSIZ;
             }
 
@@ -156,56 +151,58 @@ int xzread(tbuf_t *tbuf, void *buf, size_t len)
             // will be coming. As said before, this isn't required
             // if the LZMA_CONATENATED flag isn't used when
             // initializing the decoder.
-            if (!strm->avail_in) {
+            if (!strm->avail_in)
+            {
                 action = LZMA_FINISH;
             }
         }
 
         lzma_ret ret = lzma_code(strm, action);
-        if (lzma_code_ret(ret)) {
+        if (lzma_code_ret(ret))
+        {
             return -1;
         }
 
-        if (strm->avail_out == 0 || ret == LZMA_STREAM_END) {
+        if (strm->avail_out == 0 || ret == LZMA_STREAM_END)
+        {
             size_t write_size = len - strm->avail_out;
             return write_size;
         }
-
     }
     return 0;
 }
 
-
-tbuf_t* xzopen_frontend(char *pathname, int oflags, int mode)
+tbuf_t* xzopen_frontend(char* pathname, int oflags, int mode)
 {
-    if (pathname || oflags || mode) { //omits compiler warnings
+    if (pathname || oflags || mode)
+    { // omits compiler warnings
         return NULL;
     }
     return NULL;
 }
 
-
-int xzclose(tbuf_t *tbuf)
+int xzclose(tbuf_t* tbuf)
 {
-    if (tbuf) { //omits compiler warnings
+    if (tbuf)
+    { // omits compiler warnings
         return 0;
     }
     return 0;
 }
 
-
-int xzwrite(tbuf_t *tbuf, const void *buf, size_t len)
+int xzwrite(tbuf_t* tbuf, const void* buf, size_t len)
 {
-    if (tbuf || buf || len) { //omits compiler warnings
+    if (tbuf || buf || len)
+    { // omits compiler warnings
         return 0;
     }
     return 0;
 }
 
-
 int lzma_code_ret(lzma_ret ret)
 {
-    if (ret != LZMA_OK) {
+    if (ret != LZMA_OK)
+    {
         // Once everything has been decoded successfully, the
         // return value of lzma_code() will be LZMA_STREAM_END.
         //
@@ -214,7 +211,8 @@ int lzma_code_ret(lzma_ret ret)
         // everything has gone well or that when you aren't
         // getting more output it must have successfully
         // decoded everything.
-        if (ret == LZMA_STREAM_END) {
+        if (ret == LZMA_STREAM_END)
+        {
             return 0;
         }
 
@@ -227,59 +225,60 @@ int lzma_code_ret(lzma_ret ret)
         // enumeration aren't possible in this example, but
         // can be made possible by enabling memory usage limit
         // or adding flags to the decoder initialization.
-        const char *msg;
-        switch (ret) {
-        case LZMA_MEM_ERROR:
-            msg = "Memory allocation failed";
-            break;
-
-        case LZMA_FORMAT_ERROR:
-            // .xz magic bytes weren't found.
-            msg = "The input is not in the .xz format";
-            break;
-
-        case LZMA_OPTIONS_ERROR:
-            // For example, the headers specify a filter
-            // that isn't supported by this liblzma
-            // version (or it hasn't been enabled when
-            // building liblzma, but no-one sane does
-            // that unless building liblzma for an
-            // embedded system). Upgrading to a newer
-            // liblzma might help.
-            //
-            // Note that it is unlikely that the file has
-            // accidentally became corrupt if you get this
-            // error. The integrity of the .xz headers is
-            // always verified with a CRC32, so
-            // unintentionally corrupt files can be
-            // distinguished from unsupported files.
-            msg = "Unsupported compression options";
-            break;
-
-        case LZMA_DATA_ERROR:
-            msg = "Compressed file is corrupt";
-            break;
-
-        case LZMA_BUF_ERROR:
-            // Typically this error means that a valid
-            // file has got truncated, but it might also
-            // be a damaged part in the file that makes
-            // the decoder think the file is truncated.
-            // If you prefer, you can use the same error
-            // message for this as for LZMA_DATA_ERROR.
-            msg = "Compressed file is truncated or "
-                  "otherwise corrupt";
-            break;
-
-        default:
-            // This is most likely LZMA_PROG_ERROR.
-            msg = "Unknown error, possibly a bug";
-            break;
+        const char* msg;
+        switch (ret)
+        {
+            case LZMA_MEM_ERROR:
+                msg = "Memory allocation failed";
+                break;
+
+            case LZMA_FORMAT_ERROR:
+                // .xz magic bytes weren't found.
+                msg = "The input is not in the .xz format";
+                break;
+
+            case LZMA_OPTIONS_ERROR:
+                // For example, the headers specify a filter
+                // that isn't supported by this liblzma
+                // version (or it hasn't been enabled when
+                // building liblzma, but no-one sane does
+                // that unless building liblzma for an
+                // embedded system). Upgrading to a newer
+                // liblzma might help.
+                //
+                // Note that it is unlikely that the file has
+                // accidentally became corrupt if you get this
+                // error. The integrity of the .xz headers is
+                // always verified with a CRC32, so
+                // unintentionally corrupt files can be
+                // distinguished from unsupported files.
+                msg = "Unsupported compression options";
+                break;
+
+            case LZMA_DATA_ERROR:
+                msg = "Compressed file is corrupt";
+                break;
+
+            case LZMA_BUF_ERROR:
+                // Typically this error means that a valid
+                // file has got truncated, but it might also
+                // be a damaged part in the file that makes
+                // the decoder think the file is truncated.
+                // If you prefer, you can use the same error
+                // message for this as for LZMA_DATA_ERROR.
+                msg = "Compressed file is truncated or "
+                      "otherwise corrupt";
+                break;
+
+            default:
+                // This is most likely LZMA_PROG_ERROR.
+                msg = "Unknown error, possibly a bug";
+                break;
         }
 
-        printf( "Decoder error: "
-                "%s (error code %u)\n",
-                msg, ret);
+        printf("Decoder error: "
+               "%s (error code %u)\n",
+               msg, ret);
         return -1;
     }
     return 0;
diff --git a/mad_ifc/mad_ifc.c b/mad_ifc/mad_ifc.c
index 170e02a0..477061f8 100644
--- a/mad_ifc/mad_ifc.c
+++ b/mad_ifc/mad_ifc.c
@@ -31,126 +31,135 @@
  * SOFTWARE.
  */
 
-
 #include "mad_ifc.h"
 
-#define MAD_ATTR_PORT_INFO          0x15
-#define MAD_ATTR_NODE_INFO          0x11
-#define MAD_ATTR_GENERAL_INFO_SMP   0xff17
+#define MAD_ATTR_PORT_INFO 0x15
+#define MAD_ATTR_NODE_INFO 0x11
+#define MAD_ATTR_GENERAL_INFO_SMP 0xff17
 
-#define MAX_DATA_SIZE               64
+#define MAX_DATA_SIZE 64
 
 // for debug:
 // #define _ENABLE_DEBUG_
 #ifdef _ENABLE_DEBUG_
-# define DEBUG_PRINT_SEND(data_struct, struct_name, method) \
+#define DEBUG_PRINT_SEND(data_struct, struct_name, method)                                 \
     printf("-I- Data Sent (Method: %s):\n", method == MAD_IFC_METHOD_SET ? "SET" : "GET"); \
     tools_open_##struct_name##_print(data_struct, stdout, 1)
-# define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method) \
+#define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method)                                  \
     printf("-I- Data Received (Mehtod: %s):\n", method == MAD_IFC_METHOD_SET ? "SET" : "GET"); \
     tools_open_##struct_name##_print(data_struct, stdout, 1)
 #else
-# define DEBUG_PRINT_SEND(data_struct, struct_name, method)
-# define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method)
+#define DEBUG_PRINT_SEND(data_struct, struct_name, method)
+#define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method)
 #endif
 
 /***************************************************/
 #if !defined(DISABLE_OFED) && !defined(NO_INBAND)
-    // register access for variable size registers (like mfba)
-    #define MAD_IFC_ACCESS(mf, method, attr_id, attr_mod, data_struct, struct_name, prefix) \
-        int status = 0; \
-        u_int8_t data[MAX_DATA_SIZE] = {0}; \
-        prefix##_##struct_name##_pack(data_struct, data); \
-        if (method != MAD_IFC_METHOD_GET && method != MAD_IFC_METHOD_SET) { \
-            return ME_ERROR; \
-        } \
-        DEBUG_PRINT_SEND(data_struct, struct_name, method); \
-        if (method == MAD_IFC_METHOD_GET) { \
-            status = mib_smp_get(mf, data, attr_id, attr_mod); \
-        } else { \
-            status = mib_smp_set(mf, data, attr_id, attr_mod); \
-        } \
-        prefix##_##struct_name##_unpack(data_struct, data); \
-        DEBUG_PRINT_RECEIVE(data_struct, struct_name, method); \
-        if (status) { \
-            return (mad_ifc_status_t)status; \
-        } \
-        return ME_OK
+// register access for variable size registers (like mfba)
+#define MAD_IFC_ACCESS(mf, method, attr_id, attr_mod, data_struct, struct_name, prefix) \
+    int status = 0;                                                                     \
+    u_int8_t data[MAX_DATA_SIZE] = {0};                                                 \
+    prefix##_##struct_name##_pack(data_struct, data);                                   \
+    if (method != MAD_IFC_METHOD_GET && method != MAD_IFC_METHOD_SET)                   \
+    {                                                                                   \
+        return ME_ERROR;                                                                \
+    }                                                                                   \
+    DEBUG_PRINT_SEND(data_struct, struct_name, method);                                 \
+    if (method == MAD_IFC_METHOD_GET)                                                   \
+    {                                                                                   \
+        status = mib_smp_get(mf, data, attr_id, attr_mod);                              \
+    }                                                                                   \
+    else                                                                                \
+    {                                                                                   \
+        status = mib_smp_set(mf, data, attr_id, attr_mod);                              \
+    }                                                                                   \
+    prefix##_##struct_name##_unpack(data_struct, data);                                 \
+    DEBUG_PRINT_RECEIVE(data_struct, struct_name, method);                              \
+    if (status)                                                                         \
+    {                                                                                   \
+        return (mad_ifc_status_t)status;                                                \
+    }                                                                                   \
+    return ME_OK
 #else
-    #define MAD_IFC_ACCESS(mf, method, attr_id, attr_mod, data_struct, struct_name, prefix) \
-        (void) mf; \
-        (void) method; \
-        (void) attr_id; \
-        (void) attr_mod; \
-        (void) data_struct; \
-        return ME_NOT_IMPLEMENTED
+#define MAD_IFC_ACCESS(mf, method, attr_id, attr_mod, data_struct, struct_name, prefix) \
+    (void)mf;                                                                           \
+    (void)method;                                                                       \
+    (void)attr_id;                                                                      \
+    (void)attr_mod;                                                                     \
+    (void)data_struct;                                                                  \
+    return ME_NOT_IMPLEMENTED
 #endif
 
 /************************************
-* Function: mad_ifc_port_info
-************************************/
-mad_ifc_status_t mad_ifc_port_info(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_ib_port_info *ib_port_info)
+ * Function: mad_ifc_port_info
+ ************************************/
+mad_ifc_status_t mad_ifc_port_info(mfile* mf,
+                                   mad_ifc_method_t method,
+                                   u_int16_t attr_mod,
+                                   struct tools_open_ib_port_info* ib_port_info)
 {
-    MAD_IFC_ACCESS(mf, method, MAD_ATTR_PORT_INFO, attr_mod, ib_port_info,
-            ib_port_info, tools_open);
+    MAD_IFC_ACCESS(mf, method, MAD_ATTR_PORT_INFO, attr_mod, ib_port_info, ib_port_info, tools_open);
 }
 
 /************************************
-* Function: mad_ifc_node_info
-************************************/
-mad_ifc_status_t mad_ifc_node_info(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_node_info *node_info)
+ * Function: mad_ifc_node_info
+ ************************************/
+mad_ifc_status_t
+  mad_ifc_node_info(mfile* mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_node_info* node_info)
 {
-    MAD_IFC_ACCESS(mf, method, MAD_ATTR_NODE_INFO, attr_mod, node_info,
-            node_info, tools_open);
+    MAD_IFC_ACCESS(mf, method, MAD_ATTR_NODE_INFO, attr_mod, node_info, node_info, tools_open);
 }
 
 /************************************
-* Function: mad_ifc_extended_port_info
-************************************/
-mad_ifc_status_t mad_ifc_extended_port_info(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_extended_ib_port_info *extended_ib_port_info)
+ * Function: mad_ifc_extended_port_info
+ ************************************/
+mad_ifc_status_t mad_ifc_extended_port_info(mfile* mf,
+                                            mad_ifc_method_t method,
+                                            u_int16_t attr_mod,
+                                            struct tools_open_extended_ib_port_info* extended_ib_port_info)
 {
-    MAD_IFC_ACCESS(mf, method, MAD_ATTR_NODE_INFO, attr_mod, extended_ib_port_info,
-            extended_ib_port_info, tools_open);
+    MAD_IFC_ACCESS(mf, method, MAD_ATTR_NODE_INFO, attr_mod, extended_ib_port_info, extended_ib_port_info, tools_open);
 }
 
 /************************************
-* Function: mad_ifc_general_info_smp
-************************************/
-mad_ifc_status_t mad_ifc_general_info_smp(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, union tools_open_smp_vsp_general_info *smp_vsp_general_info)
+ * Function: mad_ifc_general_info_smp
+ ************************************/
+mad_ifc_status_t mad_ifc_general_info_smp(mfile* mf,
+                                          mad_ifc_method_t method,
+                                          u_int16_t attr_mod,
+                                          union tools_open_smp_vsp_general_info* smp_vsp_general_info)
 {
-    MAD_IFC_ACCESS(mf, method, MAD_ATTR_GENERAL_INFO_SMP, attr_mod,
-            smp_vsp_general_info, smp_vsp_general_info, tools_open);
+    MAD_IFC_ACCESS(mf, method, MAD_ATTR_GENERAL_INFO_SMP, attr_mod, smp_vsp_general_info, smp_vsp_general_info,
+                   tools_open);
 }
 
 /************************************
-* Function: mad_ifc_general_info_hw
-************************************/
-mad_ifc_status_t mad_ifc_general_info_hw(mfile *mf,
-        struct reg_access_hca_mgir_hardware_info *mgir_hardware_info) {
-    MAD_IFC_ACCESS(mf, MAD_IFC_METHOD_GET, MAD_ATTR_GENERAL_INFO_SMP, 0, mgir_hardware_info,
-            mgir_hardware_info, reg_access_hca);
+ * Function: mad_ifc_general_info_hw
+ ************************************/
+mad_ifc_status_t mad_ifc_general_info_hw(mfile* mf, struct reg_access_hca_mgir_hardware_info* mgir_hardware_info)
+{
+    MAD_IFC_ACCESS(mf, MAD_IFC_METHOD_GET, MAD_ATTR_GENERAL_INFO_SMP, 0, mgir_hardware_info, mgir_hardware_info,
+                   reg_access_hca);
 }
 
 /************************************
-* Function: mad_ifc_general_info_fw
-************************************/
-mad_ifc_status_t mad_ifc_general_info_fw(mfile *mf,
-        struct reg_access_hca_mgir_fw_info *mgir_fw_info) {
-    MAD_IFC_ACCESS(mf, MAD_IFC_METHOD_GET, MAD_ATTR_GENERAL_INFO_SMP, 1, mgir_fw_info,
-            mgir_fw_info, reg_access_hca);
+ * Function: mad_ifc_general_info_fw
+ ************************************/
+mad_ifc_status_t mad_ifc_general_info_fw(mfile* mf, struct reg_access_hca_mgir_fw_info* mgir_fw_info)
+{
+    MAD_IFC_ACCESS(mf, MAD_IFC_METHOD_GET, MAD_ATTR_GENERAL_INFO_SMP, 1, mgir_fw_info, mgir_fw_info, reg_access_hca);
 }
 
 /************************************
-* Function: mad_ifc_general_info_sw
-************************************/
-mad_ifc_status_t mad_ifc_general_info_sw(mfile *mf,
-        struct reg_access_hca_mgir_sw_info *mgir_sw_info) {
-    MAD_IFC_ACCESS(mf, MAD_IFC_METHOD_GET, MAD_ATTR_GENERAL_INFO_SMP, 2, mgir_sw_info,
-            mgir_sw_info, reg_access_hca);
+ * Function: mad_ifc_general_info_sw
+ ************************************/
+mad_ifc_status_t mad_ifc_general_info_sw(mfile* mf, struct reg_access_hca_mgir_sw_info* mgir_sw_info)
+{
+    MAD_IFC_ACCESS(mf, MAD_IFC_METHOD_GET, MAD_ATTR_GENERAL_INFO_SMP, 2, mgir_sw_info, mgir_sw_info, reg_access_hca);
 }
 /************************************
-* Function: mad_ifc_err2str
-************************************/
+ * Function: mad_ifc_err2str
+ ************************************/
 
 const char* mad_ifc_err2str(mad_ifc_status_t status)
 {
diff --git a/mad_ifc/mad_ifc.h b/mad_ifc/mad_ifc.h
index 81d0a951..d9d4bf70 100644
--- a/mad_ifc/mad_ifc.h
+++ b/mad_ifc/mad_ifc.h
@@ -34,7 +34,8 @@
 #ifndef MAD_IFC_H
 #define MAD_IFC_H
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <mtcr.h>
@@ -44,25 +45,33 @@ extern "C" {
 #include <tools_layouts/tools_open_layouts.h>
 #include <tools_layouts/reg_access_hca_layouts.h>
 
-typedef enum {
-    MAD_IFC_METHOD_GET = MACCESS_REG_METHOD_GET,
-    MAD_IFC_METHOD_SET = MACCESS_REG_METHOD_SET
-} mad_ifc_method_t;
+    typedef enum
+    {
+        MAD_IFC_METHOD_GET = MACCESS_REG_METHOD_GET,
+        MAD_IFC_METHOD_SET = MACCESS_REG_METHOD_SET
+    } mad_ifc_method_t;
 
-// we use the same error messages as mtcr
-typedef MError mad_ifc_status_t;
+    // we use the same error messages as mtcr
+    typedef MError mad_ifc_status_t;
 
-const char* mad_ifc_err2str(mad_ifc_status_t status);
-mad_ifc_status_t mad_ifc_port_info(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_ib_port_info *port_info);
-mad_ifc_status_t mad_ifc_node_info(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_node_info *node_info);
-mad_ifc_status_t mad_ifc_extended_port_info(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_extended_ib_port_info *ext_port_info);
-mad_ifc_status_t mad_ifc_general_info_smp(mfile *mf, mad_ifc_method_t method, u_int16_t attr_mod, union tools_open_smp_vsp_general_info *general_info);
-mad_ifc_status_t mad_ifc_general_info_hw(mfile *mf,
-        struct reg_access_hca_mgir_hardware_info *hw_info);
-mad_ifc_status_t mad_ifc_general_info_fw(mfile *mf,
-        struct reg_access_hca_mgir_fw_info *fw_info);
-mad_ifc_status_t mad_ifc_general_info_sw(mfile *mf,
-        struct reg_access_hca_mgir_sw_info *sw_info);
+    const char* mad_ifc_err2str(mad_ifc_status_t status);
+    mad_ifc_status_t mad_ifc_port_info(mfile* mf,
+                                       mad_ifc_method_t method,
+                                       u_int16_t attr_mod,
+                                       struct tools_open_ib_port_info* port_info);
+    mad_ifc_status_t
+      mad_ifc_node_info(mfile* mf, mad_ifc_method_t method, u_int16_t attr_mod, struct tools_open_node_info* node_info);
+    mad_ifc_status_t mad_ifc_extended_port_info(mfile* mf,
+                                                mad_ifc_method_t method,
+                                                u_int16_t attr_mod,
+                                                struct tools_open_extended_ib_port_info* ext_port_info);
+    mad_ifc_status_t mad_ifc_general_info_smp(mfile* mf,
+                                              mad_ifc_method_t method,
+                                              u_int16_t attr_mod,
+                                              union tools_open_smp_vsp_general_info* general_info);
+    mad_ifc_status_t mad_ifc_general_info_hw(mfile* mf, struct reg_access_hca_mgir_hardware_info* hw_info);
+    mad_ifc_status_t mad_ifc_general_info_fw(mfile* mf, struct reg_access_hca_mgir_fw_info* fw_info);
+    mad_ifc_status_t mad_ifc_general_info_sw(mfile* mf, struct reg_access_hca_mgir_sw_info* sw_info);
 #ifdef __cplusplus
 }
 #endif
diff --git a/mflash/flash_int_defs.h b/mflash/flash_int_defs.h
index 08eef1af..e69fd09e 100644
--- a/mflash/flash_int_defs.h
+++ b/mflash/flash_int_defs.h
@@ -34,23 +34,24 @@
 #ifndef USER_MFLASH_FLASH_INT_DEFS_H_
 #define USER_MFLASH_FLASH_INT_DEFS_H_
 
-#define SST_FLASH_NAME   "SST25VFxx"
-#define WINBOND_NAME     "W25QxxBV"
-#define WINBOND_W25X     "W25Xxx"
-#define WINBOND_3V_NAME  "W25Qxxx"
-#define ATMEL_NAME       "AT25DFxxx"
-#define S25FLXXXP_NAME   "S25FLXXXP"
-#define S25FL116K_NAME   "S25FL11xx"
-#define MACRONIX_NAME    "MX25L16xxx"
+#define SST_FLASH_NAME "SST25VFxx"
+#define WINBOND_NAME "W25QxxBV"
+#define WINBOND_W25X "W25Xxx"
+#define WINBOND_3V_NAME "W25Qxxx"
+#define ATMEL_NAME "AT25DFxxx"
+#define S25FLXXXP_NAME "S25FLXXXP"
+#define S25FL116K_NAME "S25FL11xx"
+#define MACRONIX_NAME "MX25L16xxx"
 #define MACRONIX_3V_NAME "MX25Lxxx"
-#define CYPRESS_3V_NAME  "S25FLxxx"
-#define ISSI_3V_NAME     "IS25LPxxx"
-#define MICRON_3V_NAME   "MT25QLxxx"
+#define CYPRESS_3V_NAME "S25FLxxx"
+#define ISSI_3V_NAME "IS25LPxxx"
+#define MICRON_3V_NAME "MT25QLxxx"
 #define MACRONIX_1V8_NAME "MX25Uxxx"
-#define GIGA_3V_NAME      "GD25LBxxx"
-#define ISSI_HUAWEY_NAME  "IS25WPxxx"
+#define GIGA_3V_NAME "GD25LBxxx"
+#define ISSI_HUAWEY_NAME "IS25WPxxx"
 
-typedef enum flash_vendor {
+typedef enum flash_vendor
+{
     FV_ST = 0x20,
     FV_SST = 0xbf,
     FV_WINBOND = 0xef,
@@ -62,7 +63,8 @@ typedef enum flash_vendor {
 
 } flash_vendor_t;
 
-typedef enum flash_memory_type {
+typedef enum flash_memory_type
+{
     FMT_ST_M25P = 0x20,
     FMT_MX25K16XXX = 0x20,
     FMT_ST_M25PX = 0x71,
@@ -81,8 +83,15 @@ typedef enum flash_memory_type {
 
 } flash_memory_type_t;
 
-typedef enum flash_densities {
-    FD_8 = 0x14, FD_16 = 0x15, FD_32 = 0x16, FD_64 = 0x17, FD_128 = 0x18, FD_256 = 0x19, FD_512 = 0x1a
+typedef enum flash_densities
+{
+    FD_8 = 0x14,
+    FD_16 = 0x15,
+    FD_32 = 0x16,
+    FD_64 = 0x17,
+    FD_128 = 0x18,
+    FD_256 = 0x19,
+    FD_512 = 0x1a
 } flash_densities_t;
 
 #endif /* USER_MFLASH_FLASH_INT_DEFS_H_ */
diff --git a/mflash/mflash.c b/mflash/mflash.c
index d1d03ea1..1d07fef7 100644
--- a/mflash/mflash.c
+++ b/mflash/mflash.c
@@ -58,7 +58,7 @@
 #include "mflash_common_structs.h"
 #include "mflash_gw.h"
 #include "mflash_new_gw.h"
-#define ICMD_MAX_BLOCK_WRITE   128
+#define ICMD_MAX_BLOCK_WRITE 128
 #define INBAND_MAX_BLOCK_WRITE 32
 
 #define ARR_SIZE(arr) sizeof(arr) / sizeof(arr[0])
@@ -100,101 +100,105 @@
 #define TIMER_CHECK(...)
 #else
 #include <windows.h>
-#define TIMER_INIT() \
-    SYSTEMTIME _start, _end; \
+#define TIMER_INIT()               \
+    SYSTEMTIME _start, _end;       \
     int _diff_in_sec, _diff_in_ms; \
-    (void)_diff_in_sec; \
+    (void)_diff_in_sec;            \
     (void)_diff_in_ms
-#define TIMER_START() \
-    GetSystemTime(&_start)
-#define TIMER_STOP() \
-    GetSystemTime(&_end)
-#define TIMER_PRINT(...) \
-    _diff_in_sec = _end.wSecond - _start.wSecond; \
+#define TIMER_START() GetSystemTime(&_start)
+#define TIMER_STOP() GetSystemTime(&_end)
+#define TIMER_PRINT(...)                                      \
+    _diff_in_sec = _end.wSecond - _start.wSecond;             \
     _diff_in_ms = (_end.wMilliseconds - _start.wMilliseconds; \
                    printf(__VA_ARGS__); \
                    printf("it took %d sec %d and ms to run.\n", _diff_in_sec, _diff_in_ms)
-#define TIMER_GET_DIFF(diff_in_sec, diff_in_ms) \
+#define TIMER_GET_DIFF(diff_in_sec, diff_in_ms)  \
     diff_in_sec = _end.wSecond - _start.wSecond; \
     diff_in_ms = _end.wMilliseconds - _start.wMilliseconds
 #define TIMER_INIT_AND_START() \
-    TIMER_INIT(); \
+    TIMER_INIT();              \
     TIMER_START()
 #define TIMER_STOP_GET_DIFF(diff_in_sec, diff_in_ms) \
-    TIMER_STOP(); \
+    TIMER_STOP();                                    \
     TIMER_GET_DIFF(diff_in_sec, diff_in_ms)
-#define TIMER_CHECK(max_sec, max_ms, action_on_tout) \
-    TIMER_STOP(); \
-    _diff_in_sec = _end.wSecond - _start.wSecond; \
+#define TIMER_CHECK(max_sec, max_ms, action_on_tout)         \
+    TIMER_STOP();                                            \
+    _diff_in_sec = _end.wSecond - _start.wSecond;            \
     _diff_in_ms = _end.wMilliseconds - _start.wMilliseconds; \
-    if (_diff_in_sec >= max_sec && _diff_in_ms > max_ms) { \
-        action_on_tout; \
+    if (_diff_in_sec >= max_sec && _diff_in_ms > max_ms)     \
+    {                                                        \
+        action_on_tout;                                      \
     }
 #endif
 /* Flash Functions: */
 // This is an interface function when running in IRISC
-int mf_open_fw(mflash *mfl, flash_params_t *flash_params, int num_of_banks);
-int cntx_flash_init(mflash *mfl, flash_params_t *flash_params);
-int cntx_flash_init_direct_access(mflash *mfl, flash_params_t *flash_params);
+int mf_open_fw(mflash* mfl, flash_params_t* flash_params, int num_of_banks);
+int cntx_flash_init(mflash* mfl, flash_params_t* flash_params);
+int cntx_flash_init_direct_access(mflash* mfl, flash_params_t* flash_params);
 int spi_get_num_of_flashes(int prev_num_of_flashes);
-int cntx_spi_get_type(mflash *mfl, u_int8_t op_type, u_int8_t *vendor, u_int8_t *type, u_int8_t *density);
+int cntx_spi_get_type(mflash* mfl, u_int8_t op_type, u_int8_t* vendor, u_int8_t* type, u_int8_t* density);
 // forward decl:
-int icmd_init(mflash *mfl);
-int flash_init_fw_access(mflash *mfl, flash_params_t *flash_params);
-int mf_get_secure_host(mflash *mfl, int *mode);
-int mf_secure_host_op(mflash *mfl, u_int64_t key, int op);
-int cntx_sst_get_log2size(u_int8_t density, int *log2spi_size);
+int icmd_init(mflash* mfl);
+int flash_init_fw_access(mflash* mfl, flash_params_t* flash_params);
+int mf_get_secure_host(mflash* mfl, int* mode);
+int mf_secure_host_op(mflash* mfl, u_int64_t key, int op);
+int cntx_sst_get_log2size(u_int8_t density, int* log2spi_size);
 // NOTE: This macro returns ... not nice.
-#define CHECK_RC(rc) do {if (rc) {return rc;}} while (0)
-
+#define CHECK_RC(rc)   \
+    do                 \
+    {                  \
+        if (rc)        \
+        {              \
+            return rc; \
+        }              \
+    } while (0)
 
 #define ARRSIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
-
 // Constants:
 
 // General:
-#define GPIO_DIR_L       0xf008c
-#define GPIO_POL_L       0xf0094
-#define GPIO_MOD_L       0xf009c
-#define GPIO_DAT_L       0xf0084
+#define GPIO_DIR_L 0xf008c
+#define GPIO_POL_L 0xf0094
+#define GPIO_MOD_L 0xf009c
+#define GPIO_DAT_L 0xf0084
 #define GPIO_DATACLEAR_L 0xf00d4
-#define GPIO_DATASET_L   0xf00dc
+#define GPIO_DATASET_L 0xf00dc
 
-#define SEMAP63          0xf03fc
+#define SEMAP63 0xf03fc
 
 // InfiniHost specific
-#define IDLE           0
-#define READ4          (1 << 29)
-#define WRITE1         (2 << 29)
+#define IDLE 0
+#define READ4 (1 << 29)
+#define WRITE1 (2 << 29)
 
-#define CR_FLASH       0xf01a4
-#define ADDR_MSK       0x7ffffUL
-#define CMD_MASK       0xe0000000UL
+#define CR_FLASH 0xf01a4
+#define ADDR_MSK 0x7ffffUL
+#define CMD_MASK 0xe0000000UL
 
-#define SST_STATUS_REG_VAL   0x80
+#define SST_STATUS_REG_VAL 0x80
 #define ATMEL_STATUS_REG_VAL 0x0
 
 #define MAX_FLASH_PROG_SEM_RETRY_CNT 40
 
-#define CPUMODE_MSK    0xc0000000UL
-#define CPUMODE_SHIFT  30
-#define CPUMODE        0xf0150
-
+#define CPUMODE_MSK 0xc0000000UL
+#define CPUMODE_SHIFT 30
+#define CPUMODE 0xf0150
 
 #define COMMAND_MASK 0x00ff0000
 
-static mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *dma_func, void *extra_data)
+static mfile* mopen_fw_ctx(void* fw_cmd_context, void* fw_cmd_func, void* dma_func, void* extra_data)
 {
-
-    if (fw_cmd_context == NULL || fw_cmd_func == NULL || extra_data == NULL) {
+    if (fw_cmd_context == NULL || fw_cmd_func == NULL || extra_data == NULL)
+    {
         errno = EINVAL;
         return NULL;
     }
 
-    mfile *mf = malloc(sizeof(mfile));
+    mfile* mf = malloc(sizeof(mfile));
 
-    if (!mf) {
+    if (!mf)
+    {
         errno = ENOMEM;
         return NULL;
     }
@@ -214,14 +218,14 @@ static mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *dma_fu
 // The below delays improve CPU utilization when doing long operations by
 // sleeping instead of full throtle polling.
 // Their values are set so they will not lenghen burn time (at least not by a meaningfull duration)
-// and will save cpu. The delays are divided to an initial_delay, and then retry num_of_retries times waiting retry_delay.
-// The initial delay is set according to the fastest flash we currently support (W25QxxBV).
-// The retry_delay*num_of_retries is set according to the slowest flash maximum AC timing.
+// and will save cpu. The delays are divided to an initial_delay, and then retry num_of_retries times waiting
+// retry_delay. The initial delay is set according to the fastest flash we currently support (W25QxxBV). The
+// retry_delay*num_of_retries is set according to the slowest flash maximum AC timing.
 //
 // To test there's no performance degradation by these delay: set DELAYS to 0 and RETRIES to infinity, and compare perf.
 
-
-enum IntelFlashCommand {
+enum IntelFlashCommand
+{
     FC_ReadID = 0x90,
     FC_Read = 0xFF,
     FC_Erase = 0x20,
@@ -239,56 +243,64 @@ enum IntelFlashCommand {
     FC_SCSWrite = 0xE8
 };
 
-enum IntelFlashStatus {
-    FS_Ready = 0x80, FS_Suspended = 0x40, FS_Error = 0x3E, FS_BlockError = 0x3F
+enum IntelFlashStatus
+{
+    FS_Ready = 0x80,
+    FS_Suspended = 0x40,
+    FS_Error = 0x3E,
+    FS_BlockError = 0x3F
 };
 
 #ifndef UEFI_BUILD
 static int trm2mfe_err(trm_sts rc);
 #endif
 
-int my_memset(void *dst, u_int8_t data, u_int32_t len)
+int my_memset(void* dst, u_int8_t data, u_int32_t len)
 {
     u_int32_t i = 0;
-    u_int8_t *bytes = (u_int8_t*) dst;
+    u_int8_t* bytes = (u_int8_t*)dst;
 
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < len; i++)
+    {
         bytes[i] = data;
     }
 
     return 0;
 }
 
-int my_memcpy(void *dst, void *src, u_int32_t len)
+int my_memcpy(void* dst, void* src, u_int32_t len)
 {
     u_int32_t i = 0;
-    u_int8_t *dbytes = (u_int8_t*) dst;
-    u_int8_t *sbytes = (u_int8_t*) src;
+    u_int8_t* dbytes = (u_int8_t*)dst;
+    u_int8_t* sbytes = (u_int8_t*)src;
 
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < len; i++)
+    {
         dbytes[i] = sbytes[i];
     }
 
     return 0;
 }
 
-int write_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
+int write_chunks(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data)
 {
     int rc = 0;
-    u_int8_t *p = (u_int8_t*) data;
+    u_int8_t* p = (u_int8_t*)data;
 
     int all_ffs = 0;
 
     // TODO - Check MAX_WRITE_BUFFER_SIZE against block_size in open (or here)
     u_int8_t tmp_buff[MAX_WRITE_BUFFER_SIZE];
 
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
 
-    //printf("-D- write_chunks(addr=%x, size=%x)\n", addr, len);
+    // printf("-D- write_chunks(addr=%x, size=%x)\n", addr, len);
 
-    while (len) {
+    while (len)
+    {
         u_int32_t i = 0;
         u_int32_t prefix_pad_size = 0;
         u_int32_t suffix_pad_size = 0;
@@ -299,7 +311,7 @@ int write_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
         u_int32_t block_addr = addr & block_mask;
         u_int32_t data_size = block_size;
 
-        u_int8_t *block_data = p;
+        u_int8_t* block_data = p;
 
         //
         // To keep things simple, we always write full blocks.
@@ -313,11 +325,13 @@ int write_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
 
         prefix_pad_size = addr - block_addr;
 
-        if ((addr & block_mask) == ((addr + len) & block_mask)) {
+        if ((addr & block_mask) == ((addr + len) & block_mask))
+        {
             suffix_pad_size = block_size - ((addr + len) % block_size);
         }
 
-        if (suffix_pad_size || prefix_pad_size) {
+        if (suffix_pad_size || prefix_pad_size)
+        {
             my_memset(tmp_buff, 0xff, block_size);
 
             data_size -= prefix_pad_size;
@@ -326,15 +340,20 @@ int write_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
             my_memcpy(tmp_buff + prefix_pad_size, p, data_size);
 
             block_data = tmp_buff;
-        } else if (mfl->attr.page_write) {
+        }
+        else if (mfl->attr.page_write)
+        {
             // current write is aligned to block size,
             // write data to next page, or to last full block (if we're in the last block in a page)
             u_int32_t page_mask = ~(mfl->attr.page_write - 1);
             u_int32_t next_page_addr = (addr + mfl->attr.page_write + 1) & page_mask;
             u_int32_t size_to_page_boundary = next_page_addr - addr;
-            if (len > size_to_page_boundary) {
+            if (len > size_to_page_boundary)
+            {
                 block_size = size_to_page_boundary;
-            } else {
+            }
+            else
+            {
                 block_size = len & block_mask;
             }
             data_size = block_size;
@@ -344,30 +363,36 @@ int write_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
         // Check to see if there's something to do
         //
         all_ffs = 1;
-        for (i = 0; i < block_size; i++) {
-            if (block_data[i] != 0xff) {
+        for (i = 0; i < block_size; i++)
+        {
+            if (block_data[i] != 0xff)
+            {
                 all_ffs = 0;
                 break;
             }
         }
 
-        if (!all_ffs) {
+        if (!all_ffs)
+        {
             rc = mfl->f_write_blk(mfl, block_addr, block_size, block_data);
             CHECK_RC(rc);
 
-            if (mfl->opts[MFO_NO_VERIFY] == 0) {
+            if (mfl->opts[MFO_NO_VERIFY] == 0)
+            {
                 u_int8_t verify_buffer[MAX_WRITE_BUFFER_SIZE];
                 rc = mfl->f_reset(mfl);
                 CHECK_RC(rc);
                 rc = mfl->f_read(mfl, addr, data_size, verify_buffer, false);
                 CHECK_RC(rc);
                 // Verify data
-                for (i = 0; i < data_size; i++) {
-                    if (verify_buffer[i] != block_data[i + prefix_pad_size]) {
+                for (i = 0; i < data_size; i++)
+                {
+                    if (verify_buffer[i] != block_data[i + prefix_pad_size])
+                    {
                         FLASH_DPRINTF(("Write verification failed. Address 0x%08x - expected:0x%02x actual: 0x%02x\n",
-                               addr + i,
-                               block_data[i + prefix_pad_size] ,
-                               verify_buffer[i]));
+                                       addr + i,
+                                       block_data[i + prefix_pad_size],
+                                       verify_buffer[i]));
                         return MFE_VERIFY_ERROR;
                     }
                 }
@@ -391,74 +416,79 @@ int write_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
 
 #define FD_LEGACY (1 << FD_8) | (1 << FD_16) | (1 << FD_32) | (1 << FD_64) | (1 << FD_128)
 
-flash_info_t g_flash_info_arr[] = { {"M25PXxx", FV_ST, FMT_ST_M25PX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 0, 0, 0, 0, 0},
-                                    {"M25Pxx", FV_ST, FMT_ST_M25P, FD_LEGACY, MCS_STSPI, SFC_SE, FSS_64KB, 0, 0, 0, 0, 0, 0},
-                                    {"N25Q0XX", FV_ST, FMT_N25QXXX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 0, 1, 0},
-                                    //{MICRON_3V_NAME, FV_ST, FMT_N25QXXX, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 1, 0},
-                                    {SST_FLASH_NAME, FV_SST, FMT_SST_25, FD_LEGACY, MCS_SSTSPI, SFC_SE, FSS_64KB, 0, 0, 0, 0, 0, 0},
-                                    {WINBOND_NAME, FV_WINBOND, FMT_WINBOND, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 0},
-                                    {WINBOND_W25X, FV_WINBOND, FMT_WINBOND_W25X, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 0, 0, 0, 0, 0, 0},
-                                    {WINBOND_3V_NAME, FV_WINBOND, FMT_WINBOND_3V, 1 << FD_128, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 1},
-                                    {WINBOND_3V_NAME, FV_WINBOND, FMT_WINBOND_3V, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB,  1, 1, 1, 0, 0, 1},
-                                    {ATMEL_NAME, FV_ATMEL, FMT_ATMEL, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 0, 0, 0, 0, 0, 0},
-                                    {S25FLXXXP_NAME, FV_S25FLXXXX, FMT_S25FLXXXP, FD_LEGACY, MCS_STSPI, SFC_SE, FSS_64KB, 0, 0, 0, 0, 0, 0},
-                                    {S25FL116K_NAME, FV_S25FLXXXX, FMT_S25FL116K, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 0},
-                                    {MACRONIX_NAME, FV_MX25K16XXX, FMT_MX25K16XXX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
-                                    {MACRONIX_3V_NAME, FV_MX25K16XXX, FMT_MX25K16XXX, (1 << FD_256), MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
-                                    {CYPRESS_3V_NAME, FV_S25FLXXXX, FMT_S25FLXXXL, 1 << FD_128, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 0},
-                                    //{CYPRESS_3V_NAME, FV_S25FLXXXX, FMT_S25FLXXXL, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB,  1, 1, 1, 0, 0, 0},
-                                    {ISSI_3V_NAME, FV_IS25LPXXX, FMT_IS25LPXXX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
-                                    {MACRONIX_1V8_NAME, FV_MX25K16XXX, FMT_SST_25, (1 << FD_256), MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
-                                    //added by edwardg 06/09/2020
-                                    {ISSI_HUAWEY_NAME, FV_IS25LPXXX, FMT_IS25LPXXX, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 1, 1, 0},
-                                    {GIGA_3V_NAME,     FV_GD25QXXX,  FVT_GD25QXXX,  1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 1, 1, 0},
-                                    {GIGA_3V_NAME,     FV_GD25QXXX,  FVT_GD25QXXX,  1 << FD_128, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 1, 0}
-};
-
-int cntx_sst_get_log2size(u_int8_t density, int *log2spi_size)
-{
-    switch (density) {
-    case 0x41:
-        *log2spi_size = 0x15;
-        break;
+flash_info_t g_flash_info_arr[] = {
+  {"M25PXxx", FV_ST, FMT_ST_M25PX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 0, 0, 0, 0, 0},
+  {"M25Pxx", FV_ST, FMT_ST_M25P, FD_LEGACY, MCS_STSPI, SFC_SE, FSS_64KB, 0, 0, 0, 0, 0, 0},
+  {"N25Q0XX", FV_ST, FMT_N25QXXX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 0, 1, 0},
+  //{MICRON_3V_NAME, FV_ST, FMT_N25QXXX, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 1, 0},
+  {SST_FLASH_NAME, FV_SST, FMT_SST_25, FD_LEGACY, MCS_SSTSPI, SFC_SE, FSS_64KB, 0, 0, 0, 0, 0, 0},
+  {WINBOND_NAME, FV_WINBOND, FMT_WINBOND, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 0},
+  {WINBOND_W25X, FV_WINBOND, FMT_WINBOND_W25X, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 0, 0, 0, 0, 0, 0},
+  {WINBOND_3V_NAME, FV_WINBOND, FMT_WINBOND_3V, 1 << FD_128, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 1},
+  {WINBOND_3V_NAME, FV_WINBOND, FMT_WINBOND_3V, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 0, 1},
+  {ATMEL_NAME, FV_ATMEL, FMT_ATMEL, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 0, 0, 0, 0, 0, 0},
+  {S25FLXXXP_NAME, FV_S25FLXXXX, FMT_S25FLXXXP, FD_LEGACY, MCS_STSPI, SFC_SE, FSS_64KB, 0, 0, 0, 0, 0, 0},
+  {S25FL116K_NAME, FV_S25FLXXXX, FMT_S25FL116K, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 0},
+  {MACRONIX_NAME, FV_MX25K16XXX, FMT_MX25K16XXX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
+  {MACRONIX_3V_NAME, FV_MX25K16XXX, FMT_MX25K16XXX, (1 << FD_256), MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
+  {CYPRESS_3V_NAME, FV_S25FLXXXX, FMT_S25FLXXXL, 1 << FD_128, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 0, 0},
+  //{CYPRESS_3V_NAME, FV_S25FLXXXX, FMT_S25FLXXXL, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB,  1, 1, 1, 0, 0, 0},
+  {ISSI_3V_NAME, FV_IS25LPXXX, FMT_IS25LPXXX, FD_LEGACY, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
+  {MACRONIX_1V8_NAME, FV_MX25K16XXX, FMT_SST_25, (1 << FD_256), MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 0, 0, 0},
+  // added by edwardg 06/09/2020
+  {ISSI_HUAWEY_NAME, FV_IS25LPXXX, FMT_IS25LPXXX, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 1, 1, 0},
+  {GIGA_3V_NAME, FV_GD25QXXX, FVT_GD25QXXX, 1 << FD_256, MCS_STSPI, SFC_4SSE, FSS_4KB, 1, 1, 1, 1, 1, 0},
+  {GIGA_3V_NAME, FV_GD25QXXX, FVT_GD25QXXX, 1 << FD_128, MCS_STSPI, SFC_SSE, FSS_4KB, 1, 1, 1, 1, 1, 0}};
+
+int cntx_sst_get_log2size(u_int8_t density, int* log2spi_size)
+{
+    switch (density)
+    {
+        case 0x41:
+            *log2spi_size = 0x15;
+            break;
 
-    case 0x4A:
-        *log2spi_size = 0x16;
-        break;
+        case 0x4A:
+            *log2spi_size = 0x16;
+            break;
 
-    case 0x8D:
-        *log2spi_size = 0x13;
-        break;
+        case 0x8D:
+            *log2spi_size = 0x13;
+            break;
 
-    case 0x8E:
-        *log2spi_size = 0x14;
-        break;
+        case 0x8E:
+            *log2spi_size = 0x14;
+            break;
 
-    default:
-        return MFE_UNSUPPORTED_FLASH_TOPOLOGY;
+        default:
+            return MFE_UNSUPPORTED_FLASH_TOPOLOGY;
     }
     return 0;
 }
 
-int get_log2size_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, int *log2size)
+int get_log2size_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, int* log2size)
 {
-
-    if (type == FMT_SST_25 && vendor == FV_SST) {
+    if (type == FMT_SST_25 && vendor == FV_SST)
+    {
         return cntx_sst_get_log2size(density, log2size);
-    } else {
+    }
+    else
+    {
         *log2size = density;
     }
     return MFE_OK;
 }
 
-int get_type_index_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, unsigned *type_index)
+int get_type_index_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, unsigned* type_index)
 {
     unsigned i = 0, arr_size = 0;
     arr_size = ARR_SIZE(g_flash_info_arr);
 
-    for (i = 0; i < arr_size; i++) {
-        flash_info_t *flash_info = &g_flash_info_arr[i];
-        if (flash_info->vendor == vendor && flash_info->type == type && ((flash_info->densities & (1 << density)) != 0)) {
+    for (i = 0; i < arr_size; i++)
+    {
+        flash_info_t* flash_info = &g_flash_info_arr[i];
+        if (flash_info->vendor == vendor && flash_info->type == type && ((flash_info->densities & (1 << density)) != 0))
+        {
             *type_index = i;
             return MFE_OK;
         }
@@ -466,27 +496,31 @@ int get_type_index_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8
     return MFE_UNSUPPORTED_FLASH_TYPE;
 }
 
-void mf_flash_list(char *flash_arr, int flash_arr_size)
+void mf_flash_list(char* flash_arr, int flash_arr_size)
 {
     int i = 0;
     int arr_index = 0;
     int arr_size = ARR_SIZE(g_flash_info_arr);
 
-    if (!flash_arr || flash_arr_size < 1) {
+    if (!flash_arr || flash_arr_size < 1)
+    {
         return;
     }
 
-    for (i = 0; i < arr_size; i++) {
-        flash_info_t *flash_info = &g_flash_info_arr[i];
+    for (i = 0; i < arr_size; i++)
+    {
+        flash_info_t* flash_info = &g_flash_info_arr[i];
         int name_len = strlen(flash_info->name);
-        if (flash_arr_size - name_len <= 2) {
+        if (flash_arr_size - name_len <= 2)
+        {
             // Out of space, append \0 and return
             break;
         }
         strcpy(&flash_arr[arr_index], flash_info->name);
         arr_index += name_len;
         flash_arr_size -= name_len;
-        if (i != arr_size - 1) {
+        if (i != arr_size - 1)
+        {
             flash_arr[arr_index++] = ',';
             flash_arr[arr_index++] = ' ';
             flash_arr_size -= 2;
@@ -496,13 +530,15 @@ void mf_flash_list(char *flash_arr, int flash_arr_size)
     return;
 }
 
-int get_type_index_by_name(const char *type_name, unsigned *type_index)
+int get_type_index_by_name(const char* type_name, unsigned* type_index)
 {
     unsigned i = 0, arr_size = 0;
     arr_size = ARR_SIZE(g_flash_info_arr);
-    for (i = 0; i < arr_size; i++) {
-        flash_info_t *flash_info = &g_flash_info_arr[i];
-        if (!strcmp(type_name, flash_info->name)) {
+    for (i = 0; i < arr_size; i++)
+    {
+        flash_info_t* flash_info = &g_flash_info_arr[i];
+        if (!strcmp(type_name, flash_info->name))
+        {
             *type_index = i;
             return MFE_OK;
         }
@@ -513,13 +549,14 @@ int get_type_index_by_name(const char *type_name, unsigned *type_index)
 
 int is_no_flash_detected(u_int8_t type, u_int8_t vendor, u_int8_t capacity)
 {
-    if ((type == 0xff && vendor == 0xff && capacity == 0xff) || (type == 0x0 && vendor == 0x0 && capacity == 0x0)) {
+    if ((type == 0xff && vendor == 0xff && capacity == 0xff) || (type == 0x0 && vendor == 0x0 && capacity == 0x0))
+    {
         return 1;
     }
     return 0;
 }
 
-int get_flash_info_by_res(mflash *mfl, unsigned *type_index, int *log2size, u_int8_t *no_flash, unsigned char *es_p)
+int get_flash_info_by_res(mflash* mfl, unsigned* type_index, int* log2size, u_int8_t* no_flash, unsigned char* es_p)
 {
     int rc = 0;
 
@@ -528,20 +565,25 @@ int get_flash_info_by_res(mflash *mfl, unsigned *type_index, int *log2size, u_in
     rc = mfl->f_spi_status(mfl, SFC_RES, es_p);
     CHECK_RC(rc);
     FLASH_DPRINTF(("get_flash_info_by_res: es = %#x\n", *es_p));
-    if ((*es_p >= 0x10 && *es_p < 0x17)) {
+    if ((*es_p >= 0x10 && *es_p < 0x17))
+    {
         *log2size = *es_p + 1;
         // This should return the same result for any FD value from [FD_8..FD_128].
         // This is just to catch the FD_LEGACY bitmask.
         return get_type_index_by_vendor_type_density(FV_ST, FMT_ST_M25P, *log2size, type_index);
-    } else if (*es_p == 0xff || *es_p == 0x0) {
+    }
+    else if (*es_p == 0xff || *es_p == 0x0)
+    {
         *no_flash = 1;
-    } else {
+    }
+    else
+    {
         return MFE_UNSUPPORTED_FLASH_TYPE;
     }
     return MFE_OK;
 }
 
-int cntx_get_flash_info(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8_t *no_flash)
+int cntx_get_flash_info(mflash* mfl, flash_info_t* f_info, int* log2size, u_int8_t* no_flash)
 {
     int rc = 0;
     u_int8_t type = 0, capacity = 0, vendor = 0, no_flash_res = 0, no_flash_rdid = 0;
@@ -556,7 +598,8 @@ int cntx_get_flash_info(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8
     FLASH_DPRINTF(("cntx_spi_get_type: rc: %#x, vendor=%#x, type=%#x, capacity=%#x\n", rc, vendor, type, capacity));
     FLASH_DPRINTF(("rc = %d, no_flash_rdid = %d\n", rc, no_flash_rdid));
 
-    if (no_flash_rdid) {
+    if (no_flash_rdid)
+    {
         FLASH_DPRINTF(("no support for rdid\n"));
         // RDID Failed due to:
         // 1- RDID is not supported but RES is - Old flashes.
@@ -565,28 +608,38 @@ int cntx_get_flash_info(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8
 
         // Trying RES
         rc = get_flash_info_by_res(mfl, &type_index, log2size, &no_flash_res, &es);
-        if (rc == 0 && no_flash_res == 1) {
+        if (rc == 0 && no_flash_res == 1)
+        {
             // RES Succeeded due to: no flash, unsupported flash or old flash.
             *no_flash = 1;
             // when no_flash_rdid == 0 then "1- RDID is not supported but RES is - Old flashes."
         }
-    } else {
+    }
+    else
+    {
         //  RDID Succeded.
         rc = MFE_OK;
-        if ( get_log2size_by_vendor_type_density(vendor, type, capacity, log2size) != MFE_OK ) {
-            printf("-E- SST SPI flash #%d (vendor: %#x, type: %#x, capacity:%#x) is not supported.\n", get_bank_int(mfl), vendor, type, capacity);
+        if (get_log2size_by_vendor_type_density(vendor, type, capacity, log2size) != MFE_OK)
+        {
+            printf("-E- SST SPI flash #%d (vendor: %#x, type: %#x, capacity:%#x) is not supported.\n",
+                   get_bank_int(mfl), vendor, type, capacity);
             rc = MFE_UNSUPPORTED_FLASH_TOPOLOGY;
-        } else if (get_type_index_by_vendor_type_density(vendor, type, *log2size, &type_index) != MFE_OK) {
+        }
+        else if (get_type_index_by_vendor_type_density(vendor, type, *log2size, &type_index) != MFE_OK)
+        {
             rc = MFE_UNSUPPORTED_FLASH_TYPE;
         }
         // found supported flash if rc == MFE_OK at this point.
     }
 
-    if (rc == MFE_UNSUPPORTED_FLASH_TYPE) {
-        printf("-E- SPI flash #%d (vendor: %#x, memory type: %#x, es: %#x) is not supported.\n", get_bank_int(mfl), vendor, type, es);
+    if (rc == MFE_UNSUPPORTED_FLASH_TYPE)
+    {
+        printf("-E- SPI flash #%d (vendor: %#x, memory type: %#x, es: %#x) is not supported.\n", get_bank_int(mfl),
+               vendor, type, es);
     }
     FLASH_DPRINTF(("rc = %d, no_flash_res = %d, type_index = %d.\n", rc, no_flash_res, type_index));
-    if (rc == MFE_OK && *no_flash == 0) {
+    if (rc == MFE_OK && *no_flash == 0)
+    {
         memcpy(f_info, &g_flash_info_arr[type_index], sizeof(flash_info_t));
     }
 
@@ -594,15 +647,16 @@ int cntx_get_flash_info(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8
     // These devices support 16MB flash types only, meaning they work in 3-bytes addr mode.
     // So in that case we override the erase command matching 4-bytes addr (32MB) to
     // erase command of 3-bytes addr
-    if ((mfl->dm_dev_id == DeviceConnectX4LX || mfl->dm_dev_id == DeviceConnectX5) &&
-        f_info->vendor == FV_GD25QXXX) {
-            f_info->erase_command = SFC_SSE;
+    if ((mfl->dm_dev_id == DeviceConnectX4LX || mfl->dm_dev_id == DeviceConnectX5) && f_info->vendor == FV_GD25QXXX)
+    {
+        f_info->erase_command = SFC_SSE;
     }
 
     return rc;
 }
 
-int cntx_get_jedec_id_direct_access(mflash *mfl, u_int32_t *jedec_id_p) {
+int cntx_get_jedec_id_direct_access(mflash* mfl, u_int32_t* jedec_id_p)
+{
     int rc = 0;
     rc = mfl->f_int_spi_get_status_data(mfl, SFC_JEDEC, jedec_id_p, 4);
     *jedec_id_p = ___my_swab32(*jedec_id_p);
@@ -611,23 +665,26 @@ int cntx_get_jedec_id_direct_access(mflash *mfl, u_int32_t *jedec_id_p) {
     return rc;
 }
 
-int compare_flash_params(flash_params_t *flash_params, int bank_num, const char *type_name, int log2size)
+int compare_flash_params(flash_params_t* flash_params, int bank_num, const char* type_name, int log2size)
 {
-    if (strcmp(flash_params->type_name, type_name) != 0) {
+    if (strcmp(flash_params->type_name, type_name) != 0)
+    {
         printf("-E- SPI flash #%d (type: %s)differs in type from SPI flash #%d(type: %s). "
-               "All flash devices must be of the same type.\n", bank_num, type_name, bank_num - 1, flash_params->type_name);
+               "All flash devices must be of the same type.\n",
+               bank_num, type_name, bank_num - 1, flash_params->type_name);
         return MFE_UNSUPPORTED_FLASH_TOPOLOGY;
     }
-    if (flash_params->log2size != log2size) {
+    if (flash_params->log2size != log2size)
+    {
         printf("-E- SPI flash #%d (log2size: %#x) differs in size from SPI flash #%d (log2size: %#x). "
-               "All flash devices must be of the same size.\n", bank_num, log2size, bank_num - 1, flash_params->log2size);
+               "All flash devices must be of the same size.\n",
+               bank_num, log2size, bank_num - 1, flash_params->log2size);
         return MFE_UNSUPPORTED_FLASH_TOPOLOGY;
-
     }
     return MFE_OK;
 }
 
-int cntx_st_spi_get_status(mflash *mfl, u_int8_t op_type, u_int8_t *status)
+int cntx_st_spi_get_status(mflash* mfl, u_int8_t op_type, u_int8_t* status)
 {
     u_int32_t flash_data = 0;
     int rc = 0;
@@ -638,16 +695,18 @@ int cntx_st_spi_get_status(mflash *mfl, u_int8_t op_type, u_int8_t *status)
     return MFE_OK;
 }
 
-int get_num_of_banks_int(mflash *mfl)
+int get_num_of_banks_int(mflash* mfl)
 {
     int num = 0;
-    if ((mfl->opts[MFO_USER_BANKS_NUM] == 0) && (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_NO) && ((num = get_num_of_banks(mfl->mf)) != -1)) {
+    if ((mfl->opts[MFO_USER_BANKS_NUM] == 0) && (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_NO) &&
+        ((num = get_num_of_banks(mfl->mf)) != -1))
+    {
         return num; // if mfpa register is supported get the exact number of flash banks
     }
     return mfl->opts[MFO_NUM_OF_BANKS];
 }
 
-int get_flash_params(mflash *mfl, flash_params_t *flash_params, flash_info_t *flash_info)
+int get_flash_params(mflash* mfl, flash_params_t* flash_params, flash_info_t* flash_info)
 {
     int num_of_flashes = get_num_of_banks_int(mfl);
     int spi_sel = 0, rc = 0;
@@ -658,48 +717,60 @@ int get_flash_params(mflash *mfl, flash_params_t *flash_params, flash_info_t *fl
     memset(&tmp_flash_info, 0, sizeof(flash_info_t));
 
     // if number of flash banks is zero exit with error
-    if (num_of_flashes == 0) {
+    if (num_of_flashes == 0)
+    {
         return MFE_NO_FLASH_DETECTED;
     }
 
-    for (spi_sel = 0; spi_sel < num_of_flashes; spi_sel++) {
+    for (spi_sel = 0; spi_sel < num_of_flashes; spi_sel++)
+    {
         int log2size;
         u_int8_t no_flash = 0;
-        const char *type_name;
+        const char* type_name;
         rc = set_bank(mfl, spi_sel);
         CHECK_RC(rc);
         rc = mfl->f_get_info(mfl, &tmp_flash_info, &log2size, &no_flash);
         CHECK_RC(rc);
 
-        FLASH_DPRINTF(("spi_sel = %d, num_of_flashes = %d, rc = %d, no_flash = %d\n", spi_sel, num_of_flashes, rc, no_flash));
-        if (no_flash == 1) {
+        FLASH_DPRINTF(
+          ("spi_sel = %d, num_of_flashes = %d, rc = %d, no_flash = %d\n", spi_sel, num_of_flashes, rc, no_flash));
+        if (no_flash == 1)
+        {
             // This bank is empty and also the following banks will be empty.
-            if (flash_params->num_of_flashes == 0) {
+            if (flash_params->num_of_flashes == 0)
+            {
                 // if we haven't detected any 'supported' flash, return an error.
                 return MFE_NO_FLASH_DETECTED;
             }
-            rc = set_bank(mfl, spi_sel-1); // set the last flash (flash_params->num_of_flashes >= 1)
+            rc = set_bank(mfl, spi_sel - 1); // set the last flash (flash_params->num_of_flashes >= 1)
             CHECK_RC(rc);
             break;
         }
 
         type_name = tmp_flash_info.name;
-        if (params_were_set == 0) {
+        if (params_were_set == 0)
+        {
             memset(flash_params->type_name, 0, MAX_FLASH_NAME);
             strncpy(flash_params->type_name, type_name, MAX_FLASH_NAME - 1);
             flash_params->log2size = log2size;
             memcpy(flash_info, &tmp_flash_info, sizeof(flash_info_t));
             params_were_set = 1;
-        } else {
+        }
+        else
+        {
             rc = compare_flash_params(flash_params, spi_sel, type_name, log2size);
             CHECK_RC(rc);
         }
         // Init SST flash.
-        if (mfl->access_type == MFAT_MFILE) {
-            if (flash_info->vendor == FV_SST && flash_info->type == FMT_SST_25) {
+        if (mfl->access_type == MFAT_MFILE)
+        {
+            if (flash_info->vendor == FV_SST && flash_info->type == FMT_SST_25)
+            {
                 rc = mfl->f_spi_write_status_reg(mfl, SST_STATUS_REG_VAL, SFC_WRSR, 1);
                 CHECK_RC(rc);
-            } else if (flash_info->vendor == FV_ATMEL && flash_info->type == FMT_ATMEL) {
+            }
+            else if (flash_info->vendor == FV_ATMEL && flash_info->type == FMT_ATMEL)
+            {
                 rc = mfl->f_spi_write_status_reg(mfl, ATMEL_STATUS_REG_VAL, SFC_WRSR, 1);
                 CHECK_RC(rc);
             }
@@ -737,26 +808,27 @@ flash_access_commands_t gen_3byte_address_access_commands()
 // @input: mfl
 // @output: access_commands
 // @return: MfError status
-MfError gen_access_commands(mflash *mfl, flash_access_commands_t *access_commands)
+MfError gen_access_commands(mflash* mfl, flash_access_commands_t* access_commands)
 {
     MfError status;
 
-    if (!mfl || !access_commands) {
+    if (!mfl || !access_commands)
+    {
         return MFE_BAD_PARAMS;
     }
     memset(access_commands, 0, sizeof(*access_commands));
     int four_byte_address_needed = is_four_byte_address_needed(mfl, &status);
-    if (status != MFE_OK) {
+    if (status != MFE_OK)
+    {
         return status;
     }
-    *access_commands = ((mfl->attr.log2_bank_size >= FD_256 && four_byte_address_needed) ?
-            gen_4byte_address_access_commands() : gen_3byte_address_access_commands());
+    *access_commands =
+      ((mfl->attr.log2_bank_size >= FD_256 && four_byte_address_needed) ? gen_4byte_address_access_commands() :
+                                                                          gen_3byte_address_access_commands());
     return MFE_OK;
 }
 
-
-
-int spi_fill_attr_from_params(mflash *mfl, flash_params_t *flash_params, flash_info_t *flash_info)
+int spi_fill_attr_from_params(mflash* mfl, flash_params_t* flash_params, flash_info_t* flash_info)
 {
     mfl->attr.log2_bank_size = flash_params->log2size;
     flash_access_commands_t access_commands;
@@ -786,28 +858,32 @@ int spi_fill_attr_from_params(mflash *mfl, flash_params_t *flash_params, flash_i
 }
 
 #define GET_FLASH_RETRY 2
-int st_spi_fill_attr(mflash *mfl, flash_params_t *flash_params)
+int st_spi_fill_attr(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
-    flash_params_t *cur_flash_params;
+    flash_params_t* cur_flash_params;
     flash_params_t tmp_flash_params;
     flash_info_t flash_info;
     unsigned type_index = 0;
-    if (flash_params == NULL) {
+    if (flash_params == NULL)
+    {
         int i = 0;
         // Get flash params from the flash itself
         cur_flash_params = &tmp_flash_params;
 
-        while (i < GET_FLASH_RETRY) {
+        while (i < GET_FLASH_RETRY)
+        {
             rc = get_flash_params(mfl, cur_flash_params, &flash_info);
-            if (rc != MFE_NO_FLASH_DETECTED) {
+            if (rc != MFE_NO_FLASH_DETECTED)
+            {
                 break;
             }
             i++;
         }
         CHECK_RC(rc);
-
-    } else {
+    }
+    else
+    {
         // Get the flash params from the user.
         rc = get_type_index_by_name(flash_params->type_name, &type_index);
         CHECK_RC(rc);
@@ -817,20 +893,18 @@ int st_spi_fill_attr(mflash *mfl, flash_params_t *flash_params)
     // Init the flash attr according to the flash parameters (which was wither given by the user or read from the flash)
     rc = spi_fill_attr_from_params(mfl, cur_flash_params, &flash_info);
     CHECK_RC(rc);
-    FLASH_DPRINTF(("spi_size = %#x,  log2spi_size = %#x, bank_size = %#x, flashes_num = %d\n", mfl->attr.size, mfl->attr.log2_bank_size,
-    mfl->attr.bank_size, cur_flash_params->num_of_flashes));
+    FLASH_DPRINTF(("spi_size = %#x,  log2spi_size = %#x, bank_size = %#x, flashes_num = %d\n", mfl->attr.size,
+                   mfl->attr.log2_bank_size, mfl->attr.bank_size, cur_flash_params->num_of_flashes));
     return MFE_OK;
 }
 
-
-
-int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool verbose)
+int read_chunks(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data, bool verbose)
 {
-
     int rc = 0;
-    u_int8_t *p = (u_int8_t*) data;
+    u_int8_t* p = (u_int8_t*)data;
 
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
     u_int32_t original_len = len;
@@ -846,10 +920,12 @@ int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool
 
     block_mask = ~(block_size - 1);
     u_int32_t perc = 0xffffffff;
-    if (verbose) {
-        printf("\33[2K\r");//clear the current line
+    if (verbose)
+    {
+        printf("\33[2K\r"); // clear the current line
     }
-    while (len) {
+    while (len)
+    {
         u_int32_t i = 0;
         u_int32_t prefix_pad_size = 0;
         u_int32_t suffix_pad_size = 0;
@@ -857,7 +933,7 @@ int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool
         u_int32_t block_addr = addr & block_mask;
         u_int32_t data_size = block_size;
 
-        u_int8_t *block_data = p;
+        u_int8_t* block_data = p;
 
         //
         // First and last cycles (can be the same one) may not be block aligned.
@@ -868,11 +944,13 @@ int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool
 
         prefix_pad_size = addr - block_addr;
 
-        if ((addr & block_mask) == ((addr + len) & block_mask)) {
+        if ((addr & block_mask) == ((addr + len) & block_mask))
+        {
             suffix_pad_size = block_size - ((addr + len) % block_size);
         }
 
-        if (suffix_pad_size || prefix_pad_size) {
+        if (suffix_pad_size || prefix_pad_size)
+        {
             // block exceeds given buffer - read to a temp bufer and
             // copy the required data to user's bufer.
             data_size -= suffix_pad_size;
@@ -882,8 +960,10 @@ int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool
         rc = mfl->f_read_blk(mfl, block_addr, block_size, block_data, false);
         CHECK_RC(rc);
 
-        if (suffix_pad_size || prefix_pad_size) {
-            for (i = 0; i < data_size; i++) {
+        if (suffix_pad_size || prefix_pad_size)
+        {
+            for (i = 0; i < data_size; i++)
+            {
                 p[i] = tmp_buff[prefix_pad_size + i];
             }
         }
@@ -896,9 +976,11 @@ int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool
         p += data_size;
         len -= data_size;
 
-        if (verbose) {
-            u_int32_t new_perc = 100 - 100*(1.0*len/original_len);
-            if (new_perc != perc) {
+        if (verbose)
+        {
+            u_int32_t new_perc = 100 - 100 * (1.0 * len / original_len);
+            if (new_perc != perc)
+            {
                 printf("\r%s%d%c", "Reading flash section: ", new_perc, '%');
                 fflush(stdout);
                 perc = new_perc;
@@ -915,16 +997,17 @@ int read_chunks(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool
 //
 ////////////////////////////////////////
 
-
-int gw_wait_ready(mflash *mfl, const char *msg)
+int gw_wait_ready(mflash* mfl, const char* msg)
 {
     u_int32_t gw_cmd = 0;
     u_int32_t cnt = 0;
-    (void) msg; // NOT USED FOR NOW
-    do {
+    (void)msg; // NOT USED FOR NOW
+    do
+    {
         // Timeout checks
-        if (++cnt > FLASH_CMD_CNT) {
-            //return errmsg("Flash gateway timeout: %s.", msg);
+        if (++cnt > FLASH_CMD_CNT)
+        {
+            // return errmsg("Flash gateway timeout: %s.", msg);
             return MFE_TIMEOUT;
         }
 
@@ -935,9 +1018,9 @@ int gw_wait_ready(mflash *mfl, const char *msg)
     return MFE_OK;
 }
 
-int empty_reset(mflash *mfl)
+int empty_reset(mflash* mfl)
 {
-    (void) mfl; /* avoid compiler warning */
+    (void)mfl; /* avoid compiler warning */
     return MFE_OK;
 }
 
@@ -947,20 +1030,20 @@ int empty_reset(mflash *mfl)
 //
 //////////////////////////////////////////
 
-int empty_set_bank(mflash *mfl, u_int32_t bank)
+int empty_set_bank(mflash* mfl, u_int32_t bank)
 {
     // NULL function - No actual work here - in ConnectX the curr_bank is written in the command word.
-    (void) mfl; // Avoid Compiler warning
-    (void) bank;   // Avoid Compiler warning
+    (void)mfl;  // Avoid Compiler warning
+    (void)bank; // Avoid Compiler warning
     return MFE_OK;
 }
 
-
 /*
  * Consts needed to extract the needed data for the jedec ID
  *  from various flash types.
  */
-enum {
+enum
+{
     JEDEC_ATMEL_CAPACITY_BITOFF = 16,
     JEDEC_ATMEL_CAPACITY_BITLEN = 5,
     JEDEC_ATMEL_TYPE_BITOFF = 21,
@@ -976,44 +1059,47 @@ enum {
     JEDEC_TYPE_BITLEN = 8
 };
 
-int get_flash_info_for_atmel(u_int32_t jedec_id, u_int8_t *type, u_int8_t *density)
+int get_flash_info_for_atmel(u_int32_t jedec_id, u_int8_t* type, u_int8_t* density)
 {
     u_int8_t tmp_cap = 0;
 
     tmp_cap = EXTRACT(jedec_id, JEDEC_ATMEL_CAPACITY_BITOFF, JEDEC_ATMEL_CAPACITY_BITLEN);
     *type = EXTRACT(jedec_id, JEDEC_ATMEL_TYPE_BITOFF, JEDEC_ATMEL_TYPE_BITLEN);
-    switch (tmp_cap) {
-    case 0x4:
-        *density = 0x13;
-        break;
+    switch (tmp_cap)
+    {
+        case 0x4:
+            *density = 0x13;
+            break;
 
-    case 0x5:
-        *density = 0x14;
-        break;
+        case 0x5:
+            *density = 0x14;
+            break;
 
-    case 0x6:
-        *density = 0x15;
-        break;
+        case 0x6:
+            *density = 0x15;
+            break;
 
-    case 0x7:
-        *density = 0x16;
-        break;
+        case 0x7:
+            *density = 0x16;
+            break;
 
-    default:
-        return MFE_UNSUPPORTED_FLASH_TOPOLOGY;
+        default:
+            return MFE_UNSUPPORTED_FLASH_TOPOLOGY;
     }
 
     return MFE_OK;
-
 }
-int get_info_from_jededc_id(u_int32_t jedec_id, u_int8_t *vendor, u_int8_t *type, u_int8_t *density)
+int get_info_from_jededc_id(u_int32_t jedec_id, u_int8_t* vendor, u_int8_t* type, u_int8_t* density)
 {
     int rc = 0;
     *vendor = EXTRACT(jedec_id, JEDEC_VENDOR_ID_BITOFF, JEDEC_VENDOR_ID_BITLEN);
-    if (*vendor == FV_ATMEL) {
+    if (*vendor == FV_ATMEL)
+    {
         rc = get_flash_info_for_atmel(jedec_id, type, density);
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         *type = EXTRACT(jedec_id, JEDEC_TYPE_BITOFF, JEDEC_TYPE_BITLEN);
         *density = EXTRACT(jedec_id, JEDEC_CAPACITY_BITOFF, JEDEC_CAPACITY_BITLEN);
     }
@@ -1025,21 +1111,23 @@ int mf_check_spi_channel(mfile* mf)
 {
     int retVal = 1;
     u_int32_t value = 0;
-    if (mread4(mf, 0x21e4, &value) != sizeof(u_int32_t)) {
+    if (mread4(mf, 0x21e4, &value) != sizeof(u_int32_t))
+    {
         printf("-E- Cannot get SPI value.\n");
         retVal = 0;
     }
-    else {
+    else
+    {
         value = (value >> 8) & 3;
-        if (value != 0x1 && value != 2) {
+        if (value != 0x1 && value != 2)
+        {
             retVal = 0;
         }
     }
     printf("-D- Get SPI channel value %u.\n", value);
     return retVal;
 }
-int cntx_spi_get_type(mflash *mfl, u_int8_t op_type, u_int8_t *vendor, u_int8_t *type,
-                      u_int8_t *density)
+int cntx_spi_get_type(mflash* mfl, u_int8_t op_type, u_int8_t* vendor, u_int8_t* type, u_int8_t* density)
 {
     u_int32_t flash_data = 0;
     int rc = 0;
@@ -1057,15 +1145,17 @@ int cntx_spi_get_type(mflash *mfl, u_int8_t op_type, u_int8_t *vendor, u_int8_t
 
 int spi_get_num_of_flashes(int prev_num_of_flashes)
 {
-    char *mflash_env;
+    char* mflash_env;
     int num = 0;
 
-    if (prev_num_of_flashes != -1) {
+    if (prev_num_of_flashes != -1)
+    {
         return prev_num_of_flashes;
     }
 
     mflash_env = getenv(MFLASH_ENV);
-    if (mflash_env) {
+    if (mflash_env)
+    {
         num = atol(mflash_env);
         // make sure the value makes sense
         num = (num > 16 || num <= 0) ? -1 : num;
@@ -1075,25 +1165,32 @@ int spi_get_num_of_flashes(int prev_num_of_flashes)
     return -1;
 }
 
-int spi_update_num_of_banks(mflash *mfl, int prev_num_of_flashes)
+int spi_update_num_of_banks(mflash* mfl, int prev_num_of_flashes)
 {
     int num_of_banks = 0;
 
     num_of_banks = spi_get_num_of_flashes(prev_num_of_flashes);
-    if (num_of_banks == -1) {
-        if (IS_SX(mfl->attr.hw_dev_id) || IS_SIB(mfl->attr.hw_dev_id) || IS_SEN(mfl->attr.hw_dev_id) || IS_SIB2(mfl->attr.hw_dev_id)) {
+    if (num_of_banks == -1)
+    {
+        if (IS_SX(mfl->attr.hw_dev_id) || IS_SIB(mfl->attr.hw_dev_id) || IS_SEN(mfl->attr.hw_dev_id) ||
+            IS_SIB2(mfl->attr.hw_dev_id))
+        {
             mfl->opts[MFO_NUM_OF_BANKS] = 2;
-        } else {
+        }
+        else
+        {
             mfl->opts[MFO_NUM_OF_BANKS] = 1;
         }
         mfl->opts[MFO_USER_BANKS_NUM] = 0;
-    } else {
+    }
+    else
+    {
         mfl->opts[MFO_NUM_OF_BANKS] = num_of_banks;
         mfl->opts[MFO_USER_BANKS_NUM] = 1;
     }
     return MFE_OK;
 }
-int cntx_st_spi_page_read(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data, bool verbose)
+int cntx_st_spi_page_read(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t* data, bool verbose)
 {
     (void)verbose;
     int rc = 0;
@@ -1102,23 +1199,27 @@ int cntx_st_spi_page_read(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t
     u_int32_t last_addr = 0;
     u_int8_t is_first = 1;
     u_int8_t is_last = 0;
-    u_int8_t *p = data;
+    u_int8_t* p = data;
 
-    if (addr & ((u_int32_t) mfl->attr.block_write - 1)) {
+    if (addr & ((u_int32_t)mfl->attr.block_write - 1))
+    {
         return MFE_BAD_ALIGN;
     }
 
-    if (size & ((u_int32_t) mfl->attr.block_write - 1)) {
+    if (size & ((u_int32_t)mfl->attr.block_write - 1))
+    {
         return MFE_BAD_ALIGN;
     }
 
-    //printf("-D- cntx_st_spi_page_read(addr=%05x, u_int32_t size=%03x)\n", addr, size);
+    // printf("-D- cntx_st_spi_page_read(addr=%05x, u_int32_t size=%03x)\n", addr, size);
 
     last_addr = addr + size;
     last_blk_addr = last_addr - mfl->attr.block_write;
 
-    while (addr < last_addr) {
-        if (addr == last_blk_addr) {
+    while (addr < last_addr)
+    {
+        if (addr == last_blk_addr)
+        {
             is_last = 1;
         }
 
@@ -1133,14 +1234,12 @@ int cntx_st_spi_page_read(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t
     return MFE_OK;
 }
 
-
-
-int cntx_st_spi_block_read(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, bool verbose)
+int cntx_st_spi_block_read(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data, bool verbose)
 {
     (void)verbose;
     return mfl->f_st_spi_block_read_ex(mfl, blk_addr, blk_size, data, 1, 1, false);
 }
-int cntx_st_spi_page_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data)
+int cntx_st_spi_page_write(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t* data)
 {
     int rc = 0;
 
@@ -1148,15 +1247,17 @@ int cntx_st_spi_page_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t
     u_int32_t last_addr = 0;
     u_int8_t is_first = 1;
     u_int8_t is_last = 0;
-    u_int8_t *p = data;
+    u_int8_t* p = data;
 
     WRITE_CHECK_ALIGN(addr, mfl->attr.block_write, size);
 
     last_addr = addr + size;
     last_blk_addr = last_addr - mfl->attr.block_write;
 
-    while (addr < last_addr) {
-        if (addr == last_blk_addr) {
+    while (addr < last_addr)
+    {
+        if (addr == last_blk_addr)
+        {
             is_last = 1;
         }
         rc = mfl->f_st_spi_block_write_ex(mfl, addr, mfl->attr.block_write, p, is_first, is_last, size);
@@ -1165,24 +1266,24 @@ int cntx_st_spi_page_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t
         is_first = 0;
         addr += mfl->attr.block_write;
         p += mfl->attr.block_write;
-
     }
 
     return MFE_OK;
 }
 
-int cntx_sst_spi_byte_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data)
+int cntx_sst_spi_byte_write(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t* data)
 {
     int rc = 0;
 
     u_int32_t last_addr = 0;
-    u_int8_t *p = data;
+    u_int8_t* p = data;
 
     WRITE_CHECK_ALIGN(addr, mfl->attr.block_write, size);
 
     last_addr = addr + size;
 
-    while (addr < last_addr) {
+    while (addr < last_addr)
+    {
         rc = mfl->f_sst_spi_block_write_ex(mfl, addr, mfl->attr.block_write, p);
         CHECK_RC(rc);
         addr++;
@@ -1192,46 +1293,53 @@ int cntx_sst_spi_byte_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_
     return MFE_OK;
 }
 
-
-int cntx_st_spi_block_write(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data)
+int cntx_st_spi_block_write(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data)
 {
     return mfl->f_st_spi_block_write_ex(mfl, blk_addr, blk_size, data, 1, 1, blk_size);
 }
 
-
 f_mf_write get_write_blk_func(int command_set)
 {
-    if (command_set == MCS_STSPI) {
+    if (command_set == MCS_STSPI)
+    {
         return cntx_st_spi_page_write;
     }
     return cntx_sst_spi_byte_write;
 }
 
-int old_flash_lock(mflash *mfl, int lock_state)
+int old_flash_lock(mflash* mfl, int lock_state)
 {
-
     // Obtain GPIO Semaphore
     static u_int32_t cnt;
     u_int32_t word = 0;
 #if !defined(UEFI_BUILD)
-    if (IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id) && mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_NO) {
+    if (IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id) && mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_NO)
+    {
         int rc = 0;
-        if (lock_state) {
-            if (!mfl->flash_prog_locked) {
+        if (lock_state)
+        {
+            if (!mfl->flash_prog_locked)
+            {
                 rc = trm_lock(mfl->trm, TRM_RES_HCR_FLASH_PROGRAMING, MAX_FLASH_PROG_SEM_RETRY_CNT);
-                if (!rc) {
+                if (!rc)
+                {
                     mfl->flash_prog_locked = 1;
                 }
             }
-        } else {
-            if (mfl->unlock_flash_prog_allowed) {
+        }
+        else
+        {
+            if (mfl->unlock_flash_prog_allowed)
+            {
                 rc = trm_unlock(mfl->trm, TRM_RES_HCR_FLASH_PROGRAMING);
-                if (!rc) {
+                if (!rc)
+                {
                     mfl->flash_prog_locked = 0;
                 }
             }
         }
-        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED) {
+        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED)
+        {
             return MFE_SEM_LOCKED;
         }
     }
@@ -1239,25 +1347,33 @@ int old_flash_lock(mflash *mfl, int lock_state)
     // timeout at 5 seconds
     TIMER_INIT_AND_START();
 
-    if (lock_state) {
-        if (mfl->is_locked) {
+    if (lock_state)
+    {
+        if (mfl->is_locked)
+        {
             return MFE_OK;
         }
-        do {
-            if (++cnt > GPIO_SEM_TRIES) {
+        do
+        {
+            if (++cnt > GPIO_SEM_TRIES)
+            {
                 cnt = 0;
                 printf("-E- Can not obtain Flash semaphore");
                 return MFE_SEM_LOCKED;
             }
             MREAD4(SEMAP63, &word);
-            if (word) {
+            if (word)
+            {
                 msleep(1);
             }
             TIMER_CHECK(5, 0, cnt = 0; return MFE_SEM_LOCKED);
         } while (word);
-    } else {
+    }
+    else
+    {
         MWRITE4(SEMAP63, 0);
-        if (cnt > 1) {
+        if (cnt > 1)
+        {
             // we are not alone...
             msleep(1);
         }
@@ -1267,7 +1383,7 @@ int old_flash_lock(mflash *mfl, int lock_state)
     return MFE_OK;
 }
 
-int cntx_flash_init_direct_access(mflash *mfl, flash_params_t *flash_params)
+int cntx_flash_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     u_int32_t tmp = 0;
@@ -1277,13 +1393,13 @@ int cntx_flash_init_direct_access(mflash *mfl, flash_params_t *flash_params)
     // When the ConnectX boots up without a valid FW , the PCIE link may be unstable.
     // In that case, turn off the auto reset on link down, so we'll be able to burn the device.
     MREAD4(0x41270, &tmp);
-    if (tmp > 0xfff00000) {
-        //we are in livefish.
+    if (tmp > 0xfff00000)
+    {
+        // we are in livefish.
         u_int32_t tmp1 = 0;
         MREAD4(0xf3834, &tmp1);
         tmp1 = MERGE(tmp1, 2, 27, 2);
         MWRITE4(0xf3834, tmp1);
-
     }
     mfl->f_read = read_chunks;
     mfl->f_read_blk = cntx_st_spi_block_read;
@@ -1303,14 +1419,17 @@ int cntx_flash_init_direct_access(mflash *mfl, flash_params_t *flash_params)
     rc = st_spi_fill_attr(mfl, flash_params);
     CHECK_RC(rc);
 
-    if (mfl->attr.command_set == MCS_STSPI || mfl->attr.command_set == MCS_SSTSPI) {
+    if (mfl->attr.command_set == MCS_STSPI || mfl->attr.command_set == MCS_SSTSPI)
+    {
         mfl->f_reset = empty_reset; // Null func
         mfl->f_write_blk = get_write_blk_func(mfl->attr.command_set);
 
         mfl->attr.page_write = 256;
         mfl->f_write = write_chunks;
         mfl->f_erase_sect = cntx_st_spi_erase_sect;
-    } else {
+    }
+    else
+    {
         return MFE_UNSUPPORTED_FLASH_TYPE;
     }
 
@@ -1324,21 +1443,19 @@ int cntx_flash_init_direct_access(mflash *mfl, flash_params_t *flash_params)
     mfl->f_get_write_protect = mf_get_write_protect_direct_access;
     mfl->f_set_write_protect = mf_set_write_protect_direct_access;
 
-
- 
     rc = mfl->f_reset(mfl);
     return MFE_OK;
 }
 
 // InfiniScale 4 (IS4) functions:
 
-int is4_init_gpios(mflash *mfl)
+int is4_init_gpios(mflash* mfl)
 {
-    (void) mfl;
+    (void)mfl;
     return MFE_NOT_IMPLEMENTED;
 }
 
-int is4_flash_lock(mflash *mfl, int lock_state)
+int is4_flash_lock(mflash* mfl, int lock_state)
 {
     // Obtain GPIO Semaphore
     static u_int32_t cnt;
@@ -1348,23 +1465,30 @@ int is4_flash_lock(mflash *mfl, int lock_state)
     // timeout at 5 seconds
     TIMER_INIT_AND_START();
 
-    if (lock_state) {
-        do {
-            if (++cnt > GPIO_SEM_TRIES) {
+    if (lock_state)
+    {
+        do
+        {
+            if (++cnt > GPIO_SEM_TRIES)
+            {
                 cnt = 0;
                 printf("-E- Can not obtain Flash semaphore");
                 return MFE_SEM_LOCKED;
             }
             MREAD4(mfl->gw_cmd, &word);
             lock_status = EXTRACT(word, HBO_LOCK, 1);
-            if (lock_status) {
+            if (lock_status)
+            {
                 msleep(1);
             }
             TIMER_CHECK(5, 0, cnt = 0; return MFE_SEM_LOCKED);
         } while (lock_status);
-    } else {
+    }
+    else
+    {
         MWRITE4(mfl->gw_cmd, 0);
-        if (cnt > 1) {
+        if (cnt > 1)
+        {
             // we are not alone
             msleep(1);
         }
@@ -1375,7 +1499,7 @@ int is4_flash_lock(mflash *mfl, int lock_state)
     return MFE_OK;
 }
 
-int disable_gcm(mflash *mfl)
+int disable_gcm(mflash* mfl)
 {
     u_int32_t data = 0;
     MREAD4(mfl->gcm_en_addr, &data);
@@ -1385,7 +1509,7 @@ int disable_gcm(mflash *mfl)
     return 0;
 }
 
-int disable_cache_replacement(mflash *mfl)
+int disable_cache_replacement(mflash* mfl)
 {
     u_int32_t data = 0;
     MREAD4(mfl->cache_repacement_en_addr, &data);
@@ -1395,7 +1519,7 @@ int disable_cache_replacement(mflash *mfl)
     return 0;
 }
 
-int restore_cache_replacemnt(mflash *mfl)
+int restore_cache_replacemnt(mflash* mfl)
 {
     u_int32_t data = 0;
     MREAD4(mfl->cache_repacement_en_addr, &data);
@@ -1404,10 +1528,11 @@ int restore_cache_replacemnt(mflash *mfl)
     return MFE_OK;
 }
 
-int sixth_gen_flash_lock(mflash *mfl, int lock_state)
+int sixth_gen_flash_lock(mflash* mfl, int lock_state)
 {
     int rc = 0;
-    if (lock_state == 1) { // lock the flash
+    if (lock_state == 1)
+    { // lock the flash
         rc = is4_flash_lock(mfl, lock_state);
         CHECK_RC(rc);
         rc = disable_gcm(mfl);
@@ -1416,7 +1541,9 @@ int sixth_gen_flash_lock(mflash *mfl, int lock_state)
         CHECK_RC(rc);
         rc = gw_wait_ready(mfl, "WAIT TO BUSY");
         CHECK_RC(rc);
-    } else { // unlock the flash
+    }
+    else
+    { // unlock the flash
         rc = restore_cache_replacemnt(mfl);
         CHECK_RC(rc);
         rc = is4_flash_lock(mfl, lock_state);
@@ -1425,17 +1552,20 @@ int sixth_gen_flash_lock(mflash *mfl, int lock_state)
     return MFE_OK;
 }
 
-int connectib_flash_lock(mflash *mfl, int lock_state)
+int connectib_flash_lock(mflash* mfl, int lock_state)
 {
     int rc = 0;
-    if (lock_state == 1) { // lock the flash
+    if (lock_state == 1)
+    { // lock the flash
         rc = is4_flash_lock(mfl, lock_state);
         CHECK_RC(rc);
         rc = disable_cache_replacement(mfl);
         CHECK_RC(rc);
         rc = gw_wait_ready(mfl, "WAIT TO BUSY");
         CHECK_RC(rc);
-    } else { // unlock the flash
+    }
+    else
+    { // unlock the flash
         rc = restore_cache_replacemnt(mfl);
         CHECK_RC(rc);
         rc = is4_flash_lock(mfl, lock_state);
@@ -1446,12 +1576,14 @@ int connectib_flash_lock(mflash *mfl, int lock_state)
 
 #define SX_CS_SUPPORT_ADDR 0xF0420
 
-int sx_init_cs_support(mflash *mfl)
+int sx_init_cs_support(mflash* mfl)
 {
-    if (IS_SX(mfl->attr.hw_dev_id)) {
+    if (IS_SX(mfl->attr.hw_dev_id))
+    {
         u_int8_t cs_support_mask = 0;
         u_int32_t data = 0;
-        if (mfl->opts[MFO_USER_BANKS_NUM] == 0) {
+        if (mfl->opts[MFO_USER_BANKS_NUM] == 0)
+        {
             // We assume we have only 2 flashes on SX
             mfl->opts[MFO_NUM_OF_BANKS] = 2;
         }
@@ -1466,21 +1598,22 @@ int sx_init_cs_support(mflash *mfl)
     return 0;
 }
 
-#define HW_DEV_ID      0xf0014
+#define HW_DEV_ID 0xf0014
 #define CX5_EFUSE_ADDR 0xf0c0c
 
-#define CACHE_REP_OFF_RAVEN     0xf0440
-#define CACHE_REP_CMD_RAVEN     0xf0448
+#define CACHE_REP_OFF_RAVEN 0xf0440
+#define CACHE_REP_CMD_RAVEN 0xf0448
 #define CACHE_REP_OFF_NEW_GW_ADDR 0xf0484
 #define CACHE_REP_CMD_NEW_GW_ADDR 0xf0488
-int check_cache_replacement_guard(mflash *mfl, u_int8_t *needs_cache_replacement)
+int check_cache_replacement_guard(mflash* mfl, u_int8_t* needs_cache_replacement)
 {
-
     *needs_cache_replacement = 0;
 
     // When we access via command interface, we assume there is a cache replacement!
-    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_MLNXOS_CMDIF) {
-        if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD]) {
+    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_MLNXOS_CMDIF)
+    {
+        if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD])
+        {
             // dont allow overidding cache replacement in mellanox OS env
             return MFE_OCR_NOT_SUPPORTED;
         }
@@ -1488,31 +1621,36 @@ int check_cache_replacement_guard(mflash *mfl, u_int8_t *needs_cache_replacement
         return MFE_OK;
     }
 
-    if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0) {
+    if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0)
+    {
         u_int32_t off = 0, cmd = 0, data = 0;
         dm_dev_id_t devid_t = DeviceUnknown;
         u_int32_t devid = 0;
         u_int32_t revid = 0;
 
         int rc = dm_get_device_id(mfl->mf, &devid_t, &devid, &revid);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
 
         // Read the Cache replacement offset and cmd fields
-        if (devid_t == DeviceQuantum2 || devid_t == DeviceSpectrum4 || devid_t == DeviceConnectX7) {
+        if (devid_t == DeviceQuantum2 || devid_t == DeviceSpectrum4 || devid_t == DeviceConnectX7)
+        {
             MREAD4(CACHE_REP_OFF_NEW_GW_ADDR, &data);
             off = data;
             MREAD4(CACHE_REP_CMD_NEW_GW_ADDR, &data);
             cmd = EXTRACT(data, 24, 8);
         }
-        else if (!dm_dev_is_raven_family_switch(devid_t)) {
+        else if (!dm_dev_is_raven_family_switch(devid_t))
+        {
             MREAD4(mfl->cache_rep_offset, &data);
             off = EXTRACT(data, 0, 26);
             MREAD4(mfl->cache_rep_cmd, &data);
             cmd = EXTRACT(data, 16, 8);
         }
-        else { // switches
+        else
+        { // switches
             MREAD4(CACHE_REP_OFF_RAVEN, &data);
             off = EXTRACT(data, 0, 26);
             MREAD4(CACHE_REP_CMD_RAVEN, &data);
@@ -1521,10 +1659,13 @@ int check_cache_replacement_guard(mflash *mfl, u_int8_t *needs_cache_replacement
         FLASH_ACCESS_DPRINTF(("check_cache_replacement_guard(): off=%d, cmd=%d\n", off, cmd));
 
         // Check if the offset and cmd are zero in order to continue burning.
-        if (cmd != 0 || off != 0) {
+        if (cmd != 0 || off != 0)
+        {
             *needs_cache_replacement = 1;
         }
-    } else {
+    }
+    else
+    {
         // Here we ignore the cache replacement check
         // We need to execute a write in order to do any needed cache replacement
         // Reset the HW ID which is read only register.
@@ -1534,49 +1675,55 @@ int check_cache_replacement_guard(mflash *mfl, u_int8_t *needs_cache_replacement
     return MFE_OK;
 }
 
-int mfl_com_lock(mflash *mfl)
+int mfl_com_lock(mflash* mfl)
 {
     int rc = 0;
     // if we already locked the semaphore we dont want to re-lock it
-    if (mfl->is_locked && (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_INBAND || mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 1)) { // on inband w/o ocr we need to extend the lock
+    if (mfl->is_locked &&
+        (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_INBAND || mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 1))
+    { // on inband w/o ocr we need to extend the lock
         return MFE_OK;
     }
     rc = mfl->f_lock(mfl, 1);
-    if (!mfl->opts[MFO_IGNORE_SEM_LOCK]) {
+    if (!mfl->opts[MFO_IGNORE_SEM_LOCK])
+    {
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         mfl->is_locked = 1;
         mfl->unlock_flash_prog_allowed = 1;
     }
     return MFE_OK;
 }
 
-int mf_release_semaphore(mflash *mfl)
+int mf_release_semaphore(mflash* mfl)
 {
     mfl->unlock_flash_prog_allowed = 1;
     return release_semaphore(mfl, 1);
 }
 
-int release_semaphore(mflash *mfl, int ignore_writer_lock)
+int release_semaphore(mflash* mfl, int ignore_writer_lock)
 {
     int rc = 0;
-    if ((mfl->is_locked || mfl->flash_prog_locked) && mfl->f_lock && (!mfl->writer_lock || ignore_writer_lock)) {
+    if ((mfl->is_locked || mfl->flash_prog_locked) && mfl->f_lock && (!mfl->writer_lock || ignore_writer_lock))
+    {
         rc = mfl->f_lock(mfl, 0);
         CHECK_RC(rc);
     }
     return MFE_OK;
 }
 
-int gen6_flash_init_com(mflash *mfl, flash_params_t *flash_params)
+int gen6_flash_init_com(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     FLASH_ACCESS_DPRINTF(("gen6_flash_init_com(): Flash init to use direct-access\n"));
 
-    //TODO: Enable page_read (slightly better perf)
+    // TODO: Enable page_read (slightly better perf)
     mfl->f_read = read_chunks;
-    mfl->f_read_blk = cntx_st_spi_block_read;//need fix
+    mfl->f_read_blk = cntx_st_spi_block_read; // need fix
     mfl->f_set_bank = empty_set_bank;
-    mfl->f_get_info = cntx_get_flash_info;//need fix
+    mfl->f_get_info = cntx_get_flash_info; // need fix
     mfl->f_get_jedec_id = cntx_get_jedec_id_direct_access;
     mfl->f_get_quad_en = mf_get_quad_en_direct_access;
     mfl->f_set_quad_en = mf_set_quad_en_direct_access;
@@ -1594,27 +1741,26 @@ int gen6_flash_init_com(mflash *mfl, flash_params_t *flash_params)
     mfl->f_st_spi_block_read_ex = new_gw_st_spi_block_read_ex;
     mfl->f_spi_write_status_reg = new_gw_spi_write_status_reg;
 
-    mfl->f_spi_status = cntx_st_spi_get_status;//need fix
+    mfl->f_spi_status = cntx_st_spi_get_status; // need fix
     mfl->supp_sr_mod = 1;
     rc = st_spi_fill_attr(mfl, flash_params);
     CHECK_RC(rc);
 
-    if (mfl->attr.command_set == MCS_STSPI || mfl->attr.command_set == MCS_SSTSPI) {
+    if (mfl->attr.command_set == MCS_STSPI || mfl->attr.command_set == MCS_SSTSPI)
+    {
         mfl->f_reset = empty_reset; // Null func
         mfl->f_write_blk = get_write_blk_func(mfl->attr.command_set);
         mfl->attr.page_write = 256;
         mfl->f_write = write_chunks;
         mfl->f_erase_sect = new_gw_st_spi_erase_sect;
     }
-    else {
+    else
+    {
         return MFE_UNSUPPORTED_FLASH_TYPE;
     }
 
     // flash parameter access methods:
 
-
-
-
     rc = mfl->f_reset(mfl);
     return MFE_OK;
 }
@@ -1623,14 +1769,13 @@ int gen6_flash_init_com(mflash *mfl, flash_params_t *flash_params)
 //
 // TODO: Unify fith ConnectX inif function
 
-int gen4_flash_init_com(mflash *mfl, flash_params_t *flash_params, u_int8_t init_cs_support)
+int gen4_flash_init_com(mflash* mfl, flash_params_t* flash_params, u_int8_t init_cs_support)
 {
-
     int rc = 0;
     FLASH_ACCESS_DPRINTF(("gen4_flash_init_com(): Flash init to use direct-access\n"));
 
-    //TODO: Enable page_read (slightly better perf)
-    //mfl->f_read           = cntx_st_spi_page_read;
+    // TODO: Enable page_read (slightly better perf)
+    // mfl->f_read           = cntx_st_spi_page_read;
     mfl->f_read = read_chunks;
     mfl->f_read_blk = cntx_st_spi_block_read;
     mfl->f_set_bank = empty_set_bank;
@@ -1643,7 +1788,8 @@ int gen4_flash_init_com(mflash *mfl, flash_params_t *flash_params, u_int8_t init
     mfl->f_st_spi_block_read_ex = cntx_st_spi_block_read_ex;
     mfl->f_spi_write_status_reg = cntx_spi_write_status_reg;
 
-    if (init_cs_support) {
+    if (init_cs_support)
+    {
         // Update the chip_select_support according to the banks number of cs.
         rc = sx_init_cs_support(mfl);
         CHECK_RC(rc);
@@ -1654,16 +1800,19 @@ int gen4_flash_init_com(mflash *mfl, flash_params_t *flash_params, u_int8_t init
     rc = st_spi_fill_attr(mfl, flash_params);
     CHECK_RC(rc);
 
-    if (mfl->attr.command_set == MCS_STSPI || mfl->attr.command_set == MCS_SSTSPI) {
+    if (mfl->attr.command_set == MCS_STSPI || mfl->attr.command_set == MCS_SSTSPI)
+    {
         mfl->f_reset = empty_reset; // Null func
-        //mfl->f_write_blk  = cntx_st_spi_block_write;
+        // mfl->f_write_blk  = cntx_st_spi_block_write;
 
         mfl->f_write_blk = get_write_blk_func(mfl->attr.command_set);
 
         mfl->attr.page_write = 256;
         mfl->f_write = write_chunks;
         mfl->f_erase_sect = cntx_st_spi_erase_sect;
-    } else {
+    }
+    else
+    {
         return MFE_UNSUPPORTED_FLASH_TYPE;
     }
 
@@ -1681,14 +1830,14 @@ int gen4_flash_init_com(mflash *mfl, flash_params_t *flash_params, u_int8_t init
     return MFE_OK;
 }
 
-int is4_flash_init(mflash *mfl, flash_params_t *flash_params)
+int is4_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_NO;
     mfl->f_lock = is4_flash_lock;
     return gen4_flash_init_com(mfl, flash_params, 0);
 }
 
-static void flash_update_amos_gearbox_gw(mflash *mfl)
+static void flash_update_amos_gearbox_gw(mflash* mfl)
 {
     FLASH_ACCESS_DPRINTF(("flash_update_amos_gearbox_gw()\n"));
     mfl->gw_data = HCR_FLASH_GEARBOX_DATA;
@@ -1699,13 +1848,13 @@ static void flash_update_amos_gearbox_gw(mflash *mfl)
     mfl->cache_rep_offset = HCR_FLASH_GEARBOX_CACHE_REPLACEMENT_OFFSET;
 }
 
-int sx_flash_init_direct_access(mflash *mfl, flash_params_t *flash_params)
+int sx_flash_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->f_lock = is4_flash_lock;
     return gen4_flash_init_com(mfl, flash_params, 1);
 }
 
-int sixth_gen_init_direct_access(mflash *mfl, flash_params_t *flash_params)
+int sixth_gen_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->cache_repacement_en_addr = HCR_NEW_GW_CACHE_REPLACEMNT_EN_ADDR;
     mfl->gcm_en_addr = HCR_NEW_GW_GCM_EN_ADDR;
@@ -1714,13 +1863,13 @@ int sixth_gen_init_direct_access(mflash *mfl, flash_params_t *flash_params)
     return gen6_flash_init_com(mfl, flash_params);
 }
 
-int fifth_gen_init_direct_access(mflash *mfl, flash_params_t *flash_params)
+int fifth_gen_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->f_lock = connectib_flash_lock;
     return gen4_flash_init_com(mfl, flash_params, 0);
 }
 
-int sx_get_flash_info(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8_t *no_flash)
+int sx_get_flash_info(mflash* mfl, flash_info_t* f_info, int* log2size, u_int8_t* no_flash)
 {
     int rc = 0;
     int sem_rc = 0;
@@ -1732,7 +1881,8 @@ int sx_get_flash_info(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8_t
     return rc;
 }
 
-int sx_get_jedec_id(mflash *mfl, u_int32_t *jedec_id_p) {
+int sx_get_jedec_id(mflash* mfl, u_int32_t* jedec_id_p)
+{
     int rc = 0;
     mfpa_command_args mfpa_args;
     memset(&mfpa_args, 0, sizeof(mfpa_args));
@@ -1749,7 +1899,7 @@ int sx_get_jedec_id(mflash *mfl, u_int32_t *jedec_id_p) {
     return rc;
 }
 
-int sx_block_read(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, bool verbose)
+int sx_block_read(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data, bool verbose)
 {
     (void)verbose;
     int rc = 0;
@@ -1762,7 +1912,7 @@ int sx_block_read(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t
     return rc;
 }
 
-int sx_block_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data)
+int sx_block_write(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t* data)
 {
     int rc = 0;
     int sem_rc = 0;
@@ -1774,12 +1924,12 @@ int sx_block_write(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data)
     return rc;
 }
 
-int sx_flash_lock(mflash *mfl, int lock_state)
+int sx_flash_lock(mflash* mfl, int lock_state)
 {
     return sx_flash_lock_by_type(mfl, lock_state);
 }
 
-int sx_erase_sect(mflash *mfl, u_int32_t addr)
+int sx_erase_sect(mflash* mfl, u_int32_t addr)
 {
     int rc = 0;
     int sem_rc = 0;
@@ -1791,12 +1941,12 @@ int sx_erase_sect(mflash *mfl, u_int32_t addr)
     return rc;
 }
 
-int empty_get_status(mflash *mfl, u_int8_t op_type, u_int8_t *status)
+int empty_get_status(mflash* mfl, u_int8_t op_type, u_int8_t* status)
 {
     // Avoid warnings
-    (void) mfl;
-    (void) op_type;
-    (void) status;
+    (void)mfl;
+    (void)op_type;
+    (void)status;
 
     return MFE_NOT_SUPPORTED_OPERATION;
 }
@@ -1804,20 +1954,22 @@ int empty_get_status(mflash *mfl, u_int8_t op_type, u_int8_t *status)
 #define MAX_BLOCK_SIZE(hw_dev_id) \
     (((hw_dev_id) == CX3_HW_ID || hw_dev_id == CX3_PRO_HW_ID) ? MAX_WRITE_BUFFER_SIZE : 128)
 
-static int get_the_max_reg_size(mfile *mf, maccess_reg_method_t reg_method)
+static int get_the_max_reg_size(mfile* mf, maccess_reg_method_t reg_method)
 {
     u_int32_t max_reg_size = mget_max_reg_size(mf, reg_method);
-    if (mf->flags & MDEVS_IB && reg_method == MACCESS_REG_METHOD_SET && max_reg_size > INBAND_MAX_REG_SIZE) {
+    if (mf->flags & MDEVS_IB && reg_method == MACCESS_REG_METHOD_SET && max_reg_size > INBAND_MAX_REG_SIZE)
+    {
         max_reg_size = INBAND_MAX_REG_SIZE;
     }
     return max_reg_size;
 }
 
-static int update_max_write_size(mflash *mfl)
+static int update_max_write_size(mflash* mfl)
 {
     u_int32_t max_reg_size = get_the_max_reg_size(mfl->mf, MACCESS_REG_METHOD_SET);
     u_int32_t max_block_size = MAX_BLOCK_SIZE(mfl->attr.hw_dev_id);
-    if (!max_reg_size) {
+    if (!max_reg_size)
+    {
         return MFE_BAD_PARAMS;
     }
     max_reg_size = NEAREST_POW2(max_reg_size);
@@ -1829,7 +1981,7 @@ static int update_max_write_size(mflash *mfl)
 }
 
 // access flash via FW using Flash Access Registers (either by INBAND/ICMD/TOOLS_HCR)
-int flash_init_inband_access(mflash *mfl, flash_params_t *flash_params)
+int flash_init_inband_access(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     FLASH_ACCESS_DPRINTF(("flash_init_inband_access(): Flash init to use MFBA\n"));
@@ -1873,7 +2025,7 @@ int flash_init_inband_access(mflash *mfl, flash_params_t *flash_params)
     return MFE_OK;
 }
 
-int uefi_flash_init(mflash *mfl, flash_params_t *flash_params)
+int uefi_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     FLASH_ACCESS_DPRINTF(("uefi_flash_init(): Flash init to use MFBA\n"));
@@ -1918,26 +2070,30 @@ int uefi_flash_init(mflash *mfl, flash_params_t *flash_params)
     return MFE_OK;
 }
 
-int flash_init_fw_access(mflash *mfl, flash_params_t *flash_params)
+int flash_init_fw_access(mflash* mfl, flash_params_t* flash_params)
 {
     // This function checks the access type in order to select the access functions
 
     int rc = 0;
-    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_NO) {
+    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_NO)
+    {
         rc = flash_init_inband_access(mfl, flash_params);
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         return MFE_DIRECT_FW_ACCESS_DISABLED;
     }
 
-    if (mfl->opts[MFO_IGNORE_SEM_LOCK]) {
+    if (mfl->opts[MFO_IGNORE_SEM_LOCK])
+    {
         rc = mfl->f_lock(mfl, 0);
         CHECK_RC(rc);
     }
     return MFE_OK;
 }
 
-int sx_flash_init(mflash *mfl, flash_params_t *flash_params)
+int sx_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     u_int8_t needs_cache_replacement = 0;
@@ -1945,39 +2101,46 @@ int sx_flash_init(mflash *mfl, flash_params_t *flash_params)
     rc = check_cache_replacement_guard(mfl, &needs_cache_replacement);
     CHECK_RC(rc);
 
-    if (needs_cache_replacement) {
+    if (needs_cache_replacement)
+    {
         rc = flash_init_fw_access(mfl, flash_params);
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         rc = sx_flash_init_direct_access(mfl, flash_params);
         CHECK_RC(rc);
     }
     return MFE_OK;
 }
 
-int icmd_init(mflash *mfl)
+int icmd_init(mflash* mfl)
 {
     // Clear  semaphore when asked to by flint or any tool using mflash
-    if (mfl->opts[MFO_IGNORE_SEM_LOCK]) {
-        if (icmd_clear_semaphore(mfl->mf) != ME_OK) {
+    if (mfl->opts[MFO_IGNORE_SEM_LOCK])
+    {
+        if (icmd_clear_semaphore(mfl->mf) != ME_OK)
+        {
             return MFE_CR_ERROR;
         }
     }
     return MFE_OK;
 }
 
-int tools_cmdif_init(mflash *mfl)
+int tools_cmdif_init(mflash* mfl)
 {
     // Clear  semaphore when asked to by flint or any tool using mflash
-    if (mfl->opts[MFO_IGNORE_SEM_LOCK]) {
-        if (tools_cmdif_unlock_semaphore(mfl->mf) != ME_OK) {
+    if (mfl->opts[MFO_IGNORE_SEM_LOCK])
+    {
+        if (tools_cmdif_unlock_semaphore(mfl->mf) != ME_OK)
+        {
             return MFE_CR_ERROR;
         }
     }
     return MFE_OK;
 }
 
-int six_gen_flash_init(mflash *mfl, flash_params_t *flash_params)
+int six_gen_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     u_int8_t needs_cache_replacement = 0;
@@ -1985,26 +2148,30 @@ int six_gen_flash_init(mflash *mfl, flash_params_t *flash_params)
     rc = check_cache_replacement_guard(mfl, &needs_cache_replacement);
     CHECK_RC(rc);
 
-    if (needs_cache_replacement) {
-        if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD) {
+    if (needs_cache_replacement)
+    {
+        if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD)
+        {
             rc = icmd_init(mfl);
             CHECK_RC(rc);
         }
         rc = flash_init_fw_access(mfl, flash_params);
         CHECK_RC(rc);
     }
-    else {
+    else
+    {
         rc = sixth_gen_init_direct_access(mfl, flash_params);
         CHECK_RC(rc);
     }
     return MFE_OK;
 }
 
-int fifth_gen_flash_init(mflash *mfl, flash_params_t *flash_params)
+int fifth_gen_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     u_int8_t needs_cache_replacement = 0;
-    if (mfl->mf->gb_info.is_gb_mngr) {
+    if (mfl->mf->gb_info.is_gb_mngr)
+    {
         // need to update GW offsets before calling to the check_cache_replacement_guard
         flash_update_amos_gearbox_gw(mfl);
     }
@@ -2015,25 +2182,31 @@ int fifth_gen_flash_init(mflash *mfl, flash_params_t *flash_params)
     rc = check_cache_replacement_guard(mfl, &needs_cache_replacement);
     CHECK_RC(rc);
 
-    if (needs_cache_replacement) {
-        if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD) {
+    if (needs_cache_replacement)
+    {
+        if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD)
+        {
             rc = icmd_init(mfl);
             CHECK_RC(rc);
         }
         rc = flash_init_fw_access(mfl, flash_params);
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         rc = fifth_gen_init_direct_access(mfl, flash_params);
         CHECK_RC(rc);
     }
     return MFE_OK;
 }
 
-int cntx_flash_init(mflash *mfl, flash_params_t *flash_params)
+int cntx_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
 
-    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_TOOLS_CMDIF && mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0 && mfl->opts[MFO_CX3_FW_ACCESS_EN]) {
+    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_TOOLS_CMDIF && mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0 &&
+        mfl->opts[MFO_CX3_FW_ACCESS_EN])
+    {
 #ifdef UEFI_BUILD
         // tools CMDIF not supported in UEFI
         rc = ME_NOT_IMPLEMENTED;
@@ -2041,18 +2214,22 @@ int cntx_flash_init(mflash *mfl, flash_params_t *flash_params)
         rc = tcif_cr_mbox_supported(mfl->mf);
 #endif
         // init with direct access if not supported
-        if (rc == ME_NOT_IMPLEMENTED || rc == ME_CMDIF_NOT_SUPP) {
+        if (rc == ME_NOT_IMPLEMENTED || rc == ME_CMDIF_NOT_SUPP)
+        {
             mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_NO;
             return cntx_flash_init_direct_access(mfl, flash_params);
         }
-        if (rc == ME_SEM_LOCKED && !mfl->opts[MFO_IGNORE_SEM_LOCK]) {
+        if (rc == ME_SEM_LOCKED && !mfl->opts[MFO_IGNORE_SEM_LOCK])
+        {
             return MFE_SEM_LOCKED;
         }
         rc = tools_cmdif_init(mfl);
         CHECK_RC(rc);
         rc = flash_init_fw_access(mfl, flash_params);
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_NO;
         rc = cntx_flash_init_direct_access(mfl, flash_params);
         CHECK_RC(rc);
@@ -2064,31 +2241,31 @@ int cntx_flash_init(mflash *mfl, flash_params_t *flash_params)
 // Interface functions:
 //
 
-#define CHECK_OUT_OF_RANGE(addr, len, size) { \
-        if (addr > size || addr + len > size) { \
-            return MFE_OUT_OF_RANGE; \
-        } \
-}
+#define CHECK_OUT_OF_RANGE(addr, len, size)   \
+    {                                         \
+        if (addr > size || addr + len > size) \
+        {                                     \
+            return MFE_OUT_OF_RANGE;          \
+        }                                     \
+    }
 
-int mf_read(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool verbose)
+int mf_read(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data, bool verbose)
 {
     u_int32_t size = mfl->attr.size;
-    if ((mfl->dm_dev_id == DeviceConnectX4LX || mfl->dm_dev_id == DeviceConnectX5) &&
-        mfl->attr.vendor == FV_GD25QXXX)
+    if ((mfl->dm_dev_id == DeviceConnectX4LX || mfl->dm_dev_id == DeviceConnectX5) && mfl->attr.vendor == FV_GD25QXXX)
     {
         size = 1 << FD_128; // 16MB
     }
     // printf("size = %#x, addr = %#x, len = %d\n", size, addr, len);
     CHECK_OUT_OF_RANGE(addr, len, size);
-    //printf("-D- mf_read:  addr: %#x, len: %d\n", addr, len);
+    // printf("-D- mf_read:  addr: %#x, len: %d\n", addr, len);
     return mfl->f_read(mfl, addr, len, data, verbose);
 }
 
-int mf_write(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
+int mf_write(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data)
 {
     u_int32_t size = mfl->attr.size;
-    if ((mfl->dm_dev_id == DeviceConnectX4LX || mfl->dm_dev_id == DeviceConnectX5) &&
-        mfl->attr.vendor == FV_GD25QXXX)
+    if ((mfl->dm_dev_id == DeviceConnectX4LX || mfl->dm_dev_id == DeviceConnectX5) && mfl->attr.vendor == FV_GD25QXXX)
     {
         size = 1 << FD_128; // 16MB
     }
@@ -2099,18 +2276,19 @@ int mf_write(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data)
     mfl->writer_lock = 1;
     return mfl->f_write(mfl, addr, len, data);
 }
-void mf_set_cpu_utilization(mflash *mfl, int cpuPercent)
+void mf_set_cpu_utilization(mflash* mfl, int cpuPercent)
 {
     mfl->cputUtilizationApplied = 1;
     mfl->cpuPercent = cpuPercent;
 }
 
-static int erase_com(mflash *mfl, u_int32_t addr, unsigned int sector_size, int erase_cmd)
+static int erase_com(mflash* mfl, u_int32_t addr, unsigned int sector_size, int erase_cmd)
 {
     int rc = 0;
     u_int32_t backup_sector_size = 0;
     int backup_erase_command = 0;
-    if (addr >= mfl->attr.size) {
+    if (addr >= mfl->attr.size)
+    {
         return MFE_OUT_OF_RANGE;
     }
     // Locking semaphore for the entire existence of the mflash obj for write and erase only.
@@ -2127,31 +2305,33 @@ static int erase_com(mflash *mfl, u_int32_t addr, unsigned int sector_size, int
     return rc;
 }
 
-int mf_erase(mflash *mfl, u_int32_t addr)
+int mf_erase(mflash* mfl, u_int32_t addr)
 {
     return erase_com(mfl, addr, mfl->attr.sector_size, mfl->attr.erase_command);
 }
 
-int mf_erase_64k_sector(mflash *mfl, u_int32_t addr)
+int mf_erase_64k_sector(mflash* mfl, u_int32_t addr)
 {
-    if (!mfl->attr.support_sub_and_sector) {
+    if (!mfl->attr.support_sub_and_sector)
+    {
         return MFE_UNSUPPORTED_ERASE_OPERATION;
     }
     return erase_com(mfl, addr, FSS_64KB, mfl->attr.access_commands.sfc_sector_erase);
 }
 
-int mf_erase_4k_sector(mflash *mfl, u_int32_t addr)
+int mf_erase_4k_sector(mflash* mfl, u_int32_t addr)
 {
-    if (!mfl->attr.support_sub_and_sector) {
+    if (!mfl->attr.support_sub_and_sector)
+    {
         return MFE_UNSUPPORTED_ERASE_OPERATION;
     }
     return erase_com(mfl, addr, FSS_4KB, mfl->attr.access_commands.sfc_subsector_erase);
 }
 
-int mf_open_ignore_lock(mflash *mfl)
+int mf_open_ignore_lock(mflash* mfl)
 {
     mfl->opts[MFO_IGNORE_SEM_LOCK] = 1;
-    return mf_open_fw(mfl, (flash_params_t*) NULL, -1);
+    return mf_open_fw(mfl, (flash_params_t*)NULL, -1);
 }
 
 #define CR_LOCK_HW_ID 0xbad0cafe
@@ -2162,15 +2342,20 @@ int mf_open_ignore_lock(mflash *mfl)
 #define IS_PCI_DEV(access_type) (access_type == MTCR_ACCESS_CONFIG || access_type == MTCR_ACCESS_MEMORY)
 #endif
 
-BinIdT get_bin_id(mflash *mfl, u_int32_t hw_dev_id)
+BinIdT get_bin_id(mflash* mfl, u_int32_t hw_dev_id)
 {
     u_int32_t dword = 0;
-    if (hw_dev_id == CX5_HW_ID) {
-        if (mread4(mfl->mf, CX5_EFUSE_ADDR, &dword) == 4) {
+    if (hw_dev_id == CX5_HW_ID)
+    {
+        if (mread4(mfl->mf, CX5_EFUSE_ADDR, &dword) == 4)
+        {
             u_int8_t bin_speed = EXTRACT(dword, 30, 2);
-            if (bin_speed == 0) {
+            if (bin_speed == 0)
+            {
                 return CX5_LOW_BIN;
-            } else if (bin_speed == 1) {
+            }
+            else if (bin_speed == 1)
+            {
                 return CX5_HIGH_BIN;
             }
         }
@@ -2178,7 +2363,7 @@ BinIdT get_bin_id(mflash *mfl, u_int32_t hw_dev_id)
     return UNKNOWN_BIN;
 }
 
-int get_dev_info(mflash *mfl)
+int get_dev_info(mflash* mfl)
 {
     u_int32_t dev_flags = 0;
     u_int32_t access_type = 0;
@@ -2193,33 +2378,42 @@ int get_dev_info(mflash *mfl)
 
     MfError status;
     int icmdif_supported = is_icmdif_supported(mfl, &status, &is7NmSuppported);
-    if (status != MFE_OK) {
+    if (status != MFE_OK)
+    {
         return status;
     }
 
     mfl->attr.bin_id = UNKNOWN_BIN;
     // get hw id
     // Special case for MLNX OS getting dev_id using REG MGIR
-    if (dev_flags & MDEVS_MLNX_OS) {
+    if (dev_flags & MDEVS_MLNX_OS)
+    {
 #ifndef UEFI_BUILD
         reg_access_status_t rc;
         struct reg_access_hca_mgir mgir;
         memset(&mgir, 0, sizeof(mgir));
         rc = reg_access_mgir(mfl->mf, REG_ACCESS_METHOD_GET, &mgir);
-        //printf("-D- RC[%s] -- REVID: %d -- DEVID: %d hw_dev_id: %d\n", m_err2str(rc), mgir.HWInfo.REVID, mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
-        if (rc) {
+        // printf("-D- RC[%s] -- REVID: %d -- DEVID: %d hw_dev_id: %d\n", m_err2str(rc), mgir.HWInfo.REVID,
+        // mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
+        if (rc)
+        {
             dev_id = SWITCHX_HW_ID;
             mfl->attr.rev_id = 0;
             mfl->attr.hw_dev_id = SWITCHX_HW_ID;
-        } else {
+        }
+        else
+        {
             dev_id = mgir.hw_info.hw_dev_id;
-            if (dev_id == 0) {
+            if (dev_id == 0)
+            {
                 dev_id = SWITCHX_HW_ID;
                 mfl->attr.hw_dev_id = SWITCHX_HW_ID;
                 mfl->attr.rev_id = mgir.hw_info.device_hw_revision & 0xf;
-            } else {
+            }
+            else
+            {
                 mfl->attr.hw_dev_id = dev_id;
-                mfl->attr.rev_id = 0; //WA: MGIR should have also hw_rev_id and then we can use it.
+                mfl->attr.rev_id = 0; // WA: MGIR should have also hw_rev_id and then we can use it.
             }
         }
 #else
@@ -2227,43 +2421,58 @@ int get_dev_info(mflash *mfl)
         // we should never reach here
         return MFE_UNKOWN_ACCESS_TYPE;
 #endif
-    } else {
+    }
+    else
+    {
         MREAD4(HW_DEV_ID, &dev_id);
-        if (dev_id == CR_LOCK_HW_ID) {
+        if (dev_id == CR_LOCK_HW_ID)
+        {
             return MFE_LOCKED_CRSPACE;
         }
         mfl->attr.rev_id = (dev_id & 0xff0000) >> 16;
         mfl->attr.hw_dev_id = dev_id & 0xffff;
         mfl->attr.bin_id = get_bin_id(mfl, mfl->attr.hw_dev_id);
 
-        if (icmdif_supported) {
+        if (icmdif_supported)
+        {
             int mode = 0;
-            if (!mf_get_secure_host(mfl, &mode) && mode) {
+            if (!mf_get_secure_host(mfl, &mode) && mode)
+            {
                 return MFE_LOCKED_CRSPACE;
             }
         }
     }
 
-    if (dev_flags & MDEVS_MLNX_OS) {
+    if (dev_flags & MDEVS_MLNX_OS)
+    {
         mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_MLNXOS_CMDIF;
-    } else if (dev_flags & MDEVS_IB) {
+    }
+    else if (dev_flags & MDEVS_IB)
+    {
         mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_INBAND;
-    } else { // not mlnxOS or IB device - check HW ID to determine Access type
-        if (icmdif_supported) {
-            if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0) {
+    }
+    else
+    { // not mlnxOS or IB device - check HW ID to determine Access type
+        if (icmdif_supported)
+        {
+            if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0)
+            {
                 mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_ICMD;
             }
-        } else if (HAS_TOOLS_CMDIF(mfl->attr.hw_dev_id) && (IS_PCI_DEV(access_type))) {
-            if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0) {
+        }
+        else if (HAS_TOOLS_CMDIF(mfl->attr.hw_dev_id) && (IS_PCI_DEV(access_type)))
+        {
+            if (mfl->opts[MFO_IGNORE_CASHE_REP_GUARD] == 0)
+            {
                 mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_TOOLS_CMDIF;
             }
         }
     }
     return MFE_OK;
-
 }
 
-void set_gpio_toggle_conf_cx6(gpio_toggle_conf_cx6* conf) {
+void set_gpio_toggle_conf_cx6(gpio_toggle_conf_cx6* conf)
+{
     conf->lock_addr = 0xf1004;
     conf->functional_enable0_addr = 0xfc028;
     conf->functional_enable1_addr = 0xfc024;
@@ -2272,7 +2481,8 @@ void set_gpio_toggle_conf_cx6(gpio_toggle_conf_cx6* conf) {
     conf->dataset_addr = 0xfc014;
 }
 
-void set_gpio_toggle_conf_bf2(gpio_toggle_conf_cx6* conf) {
+void set_gpio_toggle_conf_bf2(gpio_toggle_conf_cx6* conf)
+{
     conf->lock_addr = 0xf1084;
     conf->functional_enable0_addr = 0xfa028;
     conf->functional_enable1_addr = 0xfa024;
@@ -2281,7 +2491,8 @@ void set_gpio_toggle_conf_bf2(gpio_toggle_conf_cx6* conf) {
     conf->dataset_addr = 0xfa014;
 }
 
-void set_gpio_toggle_conf_cx7(gpio_toggle_conf_cx7* conf) {
+void set_gpio_toggle_conf_cx7(gpio_toggle_conf_cx7* conf)
+{
     conf->select_synced_data_out_addr = 0xf1078;
     conf->fw_control_set_addr = 0xf1100;
     conf->hw_data_in_addr = 0xf1078;
@@ -2289,10 +2500,12 @@ void set_gpio_toggle_conf_cx7(gpio_toggle_conf_cx7* conf) {
     conf->fw_data_out_set_addr = 0xf1108;
 }
 
-bool toggle_flash_io3_gpio_cx6(mfile* mf, gpio_toggle_conf_cx6 conf) {
+bool toggle_flash_io3_gpio_cx6(mfile* mf, gpio_toggle_conf_cx6 conf)
+{
     FLASH_DPRINTF(("toggle_flash_io3_gpio_cx6\n"));
     // Enable lock
-    if (mwrite4(mf, conf.lock_addr, 0xd42f) != 4) {
+    if (mwrite4(mf, conf.lock_addr, 0xd42f) != 4)
+    {
         printf("-E- failed to enable GPIO lock\n");
         return MFE_CR_ERROR;
     }
@@ -2300,35 +2513,41 @@ bool toggle_flash_io3_gpio_cx6(mfile* mf, gpio_toggle_conf_cx6 conf) {
     //* Make sure GPIO 29 is controlled by FW (for our usage) instead of HW
     // Enable functional_enable0
     u_int32_t functional_enable0 = 0;
-    if (mread4(mf, conf.functional_enable0_addr, &functional_enable0) != 4) {
+    if (mread4(mf, conf.functional_enable0_addr, &functional_enable0) != 4)
+    {
         printf("-E- failed to read functional_enable0\n");
         return MFE_CR_ERROR;
     }
     functional_enable0 = functional_enable0 & 0xdfffffff;
-    if (mwrite4(mf, conf.functional_enable0_addr, functional_enable0) != 4) {
+    if (mwrite4(mf, conf.functional_enable0_addr, functional_enable0) != 4)
+    {
         printf("-E- failed to enable GPIO functional_enable0\n");
         return MFE_CR_ERROR;
     }
     // Enable functional_enable1
     u_int32_t functional_enable1 = 0;
-    if (mread4(mf, conf.functional_enable1_addr, &functional_enable1) != 4) {
+    if (mread4(mf, conf.functional_enable1_addr, &functional_enable1) != 4)
+    {
         printf("-E- failed to read functional_enable1\n");
         return MFE_CR_ERROR;
     }
     functional_enable1 = functional_enable1 & 0xdfffffff;
-    if (mwrite4(mf, conf.functional_enable1_addr, functional_enable1) != 4) {
+    if (mwrite4(mf, conf.functional_enable1_addr, functional_enable1) != 4)
+    {
         printf("-E- failed to enable GPIO functional_enable1\n");
         return MFE_CR_ERROR;
     }
 
     // Write to mode1_set
     u_int32_t mode1_set = 0;
-    if (mread4(mf, conf.mode1_set_addr, &mode1_set) != 4) {
+    if (mread4(mf, conf.mode1_set_addr, &mode1_set) != 4)
+    {
         printf("-E- failed to read mode1_set\n");
         return MFE_CR_ERROR;
     }
     mode1_set = mode1_set | 0x20000000;
-    if (mwrite4(mf, conf.mode1_set_addr, mode1_set) != 4) {
+    if (mwrite4(mf, conf.mode1_set_addr, mode1_set) != 4)
+    {
         printf("-E- failed to write to mode1_set\n");
         return MFE_CR_ERROR;
     }
@@ -2336,18 +2555,21 @@ bool toggle_flash_io3_gpio_cx6(mfile* mf, gpio_toggle_conf_cx6 conf) {
     //* Write to GPIO 29
     // Write to mode0_set
     u_int32_t mode0_set = 0;
-    if (mread4(mf, conf.mode0_set_addr, &mode0_set) != 4) {
+    if (mread4(mf, conf.mode0_set_addr, &mode0_set) != 4)
+    {
         printf("-E- failed to read mode0_set\n");
         return MFE_CR_ERROR;
     }
     mode0_set = mode0_set | 0x20000000;
-    if (mwrite4(mf, conf.mode0_set_addr, mode0_set) != 4) {
+    if (mwrite4(mf, conf.mode0_set_addr, mode0_set) != 4)
+    {
         printf("-E- failed to write to mode0_set\n");
         return MFE_CR_ERROR;
     }
 
     // Write to dataset
-    if (mwrite4(mf, conf.dataset_addr, 0x20000000) != 4) {
+    if (mwrite4(mf, conf.dataset_addr, 0x20000000) != 4)
+    {
         printf("-E- failed to write to dataset\n");
         return MFE_CR_ERROR;
     }
@@ -2355,64 +2577,75 @@ bool toggle_flash_io3_gpio_cx6(mfile* mf, gpio_toggle_conf_cx6 conf) {
     return true;
 }
 
-bool toggle_flash_io3_gpio_cx7(mfile* mf, gpio_toggle_conf_cx7 conf) {
+bool toggle_flash_io3_gpio_cx7(mfile* mf, gpio_toggle_conf_cx7 conf)
+{
     FLASH_DPRINTF(("toggle_flash_io3_gpio_cx7\n"));
     // write 0x0 to select_synced_data_out.16:1
     u_int32_t select_synced_data_out = 0;
-    if (mread4(mf, conf.select_synced_data_out_addr, &select_synced_data_out) != 4) {
+    if (mread4(mf, conf.select_synced_data_out_addr, &select_synced_data_out) != 4)
+    {
         printf("-E- failed to read select_synced_data_out\n");
         return MFE_CR_ERROR;
     }
     select_synced_data_out = select_synced_data_out & 0xfffeffff;
-    if (mwrite4(mf, conf.select_synced_data_out_addr, select_synced_data_out) != 4) {
+    if (mwrite4(mf, conf.select_synced_data_out_addr, select_synced_data_out) != 4)
+    {
         printf("-E- failed to write 0x0 to select_synced_data_out.16:1\n");
         return MFE_CR_ERROR;
     }
 
     // write 0x3 to fw_control_set.28:2
     u_int32_t fw_control_set = 0;
-    if (mread4(mf, conf.fw_control_set_addr, &fw_control_set) != 4) {
+    if (mread4(mf, conf.fw_control_set_addr, &fw_control_set) != 4)
+    {
         printf("-E- failed to read fw_control_set\n");
         return MFE_CR_ERROR;
     }
     fw_control_set = fw_control_set | 0x30000000;
-    if (mwrite4(mf, conf.fw_control_set_addr, fw_control_set) != 4) {
+    if (mwrite4(mf, conf.fw_control_set_addr, fw_control_set) != 4)
+    {
         printf("-E- failed to write 0x3 to fw_control_set.28:2\n");
         return MFE_CR_ERROR;
     }
 
     // write 0x3 to hw_data_in.4:2
     u_int32_t hw_data_in = 0;
-    if (mread4(mf, conf.hw_data_in_addr, &hw_data_in) != 4) {
+    if (mread4(mf, conf.hw_data_in_addr, &hw_data_in) != 4)
+    {
         printf("-E- failed to read hw_data_in\n");
         return MFE_CR_ERROR;
     }
     hw_data_in = hw_data_in | 0x00000030;
-    if (mwrite4(mf, conf.hw_data_in_addr, hw_data_in) != 4) {
+    if (mwrite4(mf, conf.hw_data_in_addr, hw_data_in) != 4)
+    {
         printf("-E- failed to write 0x3 to hw_data_in.4:2\n");
         return MFE_CR_ERROR;
     }
 
     // write 0x3 to fw_output_enable_set.28:2
     u_int32_t fw_output_enable_set = 0;
-    if (mread4(mf, conf.fw_output_enable_set_addr, &fw_output_enable_set) != 4) {
+    if (mread4(mf, conf.fw_output_enable_set_addr, &fw_output_enable_set) != 4)
+    {
         printf("-E- failed to read fw_output_enable_set\n");
         return MFE_CR_ERROR;
     }
     fw_output_enable_set = fw_output_enable_set | 0x30000000;
-    if (mwrite4(mf, conf.fw_output_enable_set_addr, fw_output_enable_set) != 4) {
+    if (mwrite4(mf, conf.fw_output_enable_set_addr, fw_output_enable_set) != 4)
+    {
         printf("-E- failed to write 0x3 to fw_output_enable_set.28:2\n");
         return MFE_CR_ERROR;
     }
 
     // write 0x3 to fw_data_out_set.28:2
     u_int32_t fw_data_out_set = 0;
-    if (mread4(mf, conf.fw_data_out_set_addr, &fw_data_out_set) != 4) {
+    if (mread4(mf, conf.fw_data_out_set_addr, &fw_data_out_set) != 4)
+    {
         printf("-E- failed to read fw_data_out_set\n");
         return MFE_CR_ERROR;
     }
     fw_data_out_set = fw_data_out_set | 0x30000000;
-    if (mwrite4(mf, conf.fw_data_out_set_addr, fw_data_out_set) != 4) {
+    if (mwrite4(mf, conf.fw_data_out_set_addr, fw_data_out_set) != 4)
+    {
         printf("-E- failed to write 0x3 to fw_data_out_set.28:2\n");
         return MFE_CR_ERROR;
     }
@@ -2420,24 +2653,30 @@ bool toggle_flash_io3_gpio_cx7(mfile* mf, gpio_toggle_conf_cx7 conf) {
     return true;
 }
 
-bool force_flash_out_of_hold_state(mflash *mfl) {
+bool force_flash_out_of_hold_state(mflash* mfl)
+{
     bool res = true;
-    if (getenv("FORCE_GPIO_TOGGLE") != NULL || dm_is_livefish_mode(mfl->mf)) {
-        switch (mfl->dm_dev_id) {
+    if (getenv("FORCE_GPIO_TOGGLE") != NULL || dm_is_livefish_mode(mfl->mf))
+    {
+        switch (mfl->dm_dev_id)
+        {
             case DeviceConnectX6:
-            case DeviceConnectX6DX: {
+            case DeviceConnectX6DX:
+            {
                 gpio_toggle_conf_cx6 gpio_toggle_conf;
                 set_gpio_toggle_conf_cx6(&gpio_toggle_conf);
                 res = toggle_flash_io3_gpio_cx6(mfl->mf, gpio_toggle_conf);
                 break;
             }
-            case DeviceBlueField2: {
+            case DeviceBlueField2:
+            {
                 gpio_toggle_conf_cx6 gpio_toggle_conf;
                 set_gpio_toggle_conf_bf2(&gpio_toggle_conf);
                 res = toggle_flash_io3_gpio_cx6(mfl->mf, gpio_toggle_conf);
                 break;
             }
-            case DeviceConnectX7: {
+            case DeviceConnectX7:
+            {
                 gpio_toggle_conf_cx7 gpio_toggle_conf;
                 set_gpio_toggle_conf_cx7(&gpio_toggle_conf);
                 res = toggle_flash_io3_gpio_cx7(mfl->mf, gpio_toggle_conf);
@@ -2451,11 +2690,12 @@ bool force_flash_out_of_hold_state(mflash *mfl) {
     return res;
 }
 
-//Caller must zero the mflash struct before calling this func.
-int mf_open_fw(mflash *mfl, flash_params_t *flash_params, int num_of_banks)
+// Caller must zero the mflash struct before calling this func.
+int mf_open_fw(mflash* mfl, flash_params_t* flash_params, int num_of_banks)
 {
     int rc = 0;
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
     rc = set_bank_int(mfl, -1);
@@ -2467,14 +2707,16 @@ int mf_open_fw(mflash *mfl, flash_params_t *flash_params, int num_of_banks)
     mfl->gcm_en_addr = 0xffffffff; // Relevant to devices with new flash GW only
     mfl->cache_rep_offset = HCR_FLASH_CACHE_REPLACEMENT_OFFSET;
     mfl->cache_rep_cmd = HCR_FLASH_CACHE_REPLACEMENT_CMD;
-    if (mfl->access_type == MFAT_MFILE) {
+    if (mfl->access_type == MFAT_MFILE)
+    {
         rc = get_dev_info(mfl);
         CHECK_RC(rc);
 
 #ifndef UEFI_BUILD
         trm_sts trm_rc;
         trm_rc = trm_create(&(mfl->trm), mfl->mf);
-        if (trm_rc) {
+        if (trm_rc)
+        {
             return trm2mfe_err(trm_rc);
         }
 #endif
@@ -2490,45 +2732,71 @@ int mf_open_fw(mflash *mfl, flash_params_t *flash_params, int num_of_banks)
         int is7NmSuppported = 0;
         MfError status;
         int icmdif_supported = is_icmdif_supported(mfl, &status, &is7NmSuppported);
-        if (status != MFE_OK) {
+        if (status != MFE_OK)
+        {
             return status;
         }
-        if (IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id)) {
+        if (IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id))
+        {
             rc = cntx_flash_init(mfl, flash_params);
-        } else if (IS_IS4_FAMILY(mfl->attr.hw_dev_id)) {
+        }
+        else if (IS_IS4_FAMILY(mfl->attr.hw_dev_id))
+        {
             rc = is4_flash_init(mfl, flash_params);
-        } else if (IS_SX(mfl->attr.hw_dev_id)) {
+        }
+        else if (IS_SX(mfl->attr.hw_dev_id))
+        {
             rc = sx_flash_init(mfl, flash_params);
-        } else if (icmdif_supported) {
-            if (!is7NmSuppported) {
+        }
+        else if (icmdif_supported)
+        {
+            if (!is7NmSuppported)
+            {
                 rc = fifth_gen_flash_init(mfl, flash_params);
             }
-            else {
+            else
+            {
                 rc = six_gen_flash_init(mfl, flash_params);
             }
-        } else if (mfl->attr.hw_dev_id == 0xffff) {
+        }
+        else if (mfl->attr.hw_dev_id == 0xffff)
+        {
             rc = MFE_HW_DEVID_ERROR;
-        } else {
+        }
+        else
+        {
             rc = MFE_UNSUPPORTED_DEVICE;
         }
         CHECK_RC(rc);
-    } else if (mfl->access_type == MFAT_UEFI) {
-        mfl->opts[MFO_NUM_OF_BANKS] = 1; // We have only one flash in ConnectIB and ConnectX-3 - Need to specify it better!
+    }
+    else if (mfl->access_type == MFAT_UEFI)
+    {
+        mfl->opts[MFO_NUM_OF_BANKS] =
+          1; // We have only one flash in ConnectIB and ConnectX-3 - Need to specify it better!
         rc = uefi_flash_init(mfl, flash_params);
         CHECK_RC(rc);
-    } else {
+    }
+    else
+    {
         return MFE_UNKOWN_ACCESS_TYPE;
     }
     mfl->f_set_bank(mfl, 0);
     return MFE_OK;
 }
 
-int mf_opend_int(mflash **pmfl, void *access_dev, int num_of_banks, flash_params_t *flash_params,
-                 int ignore_cache_rep_guard, u_int8_t access_type, void *dev_extra, int cx3_fw_access)
+int mf_opend_int(mflash** pmfl,
+                 void* access_dev,
+                 int num_of_banks,
+                 flash_params_t* flash_params,
+                 int ignore_cache_rep_guard,
+                 u_int8_t access_type,
+                 void* dev_extra,
+                 int cx3_fw_access)
 {
     int rc = 0;
-    *pmfl = (mflash*) malloc(sizeof(mflash));
-    if (!*pmfl) {
+    *pmfl = (mflash*)malloc(sizeof(mflash));
+    if (!*pmfl)
+    {
         return MFE_NOMEM;
     }
 
@@ -2537,21 +2805,26 @@ int mf_opend_int(mflash **pmfl, void *access_dev, int num_of_banks, flash_params
     (*pmfl)->opts[MFO_IGNORE_CASHE_REP_GUARD] = ignore_cache_rep_guard;
     (*pmfl)->opts[MFO_CX3_FW_ACCESS_EN] = cx3_fw_access;
     (*pmfl)->access_type = access_type;
-    if (access_type == MFAT_MFILE) {
-        (*pmfl)->mf = (mfile*) access_dev;
+    if (access_type == MFAT_MFILE)
+    {
+        (*pmfl)->mf = (mfile*)access_dev;
         u_int32_t dev_id;
         u_int32_t chip_rev;
         rc = dm_get_device_id((*pmfl)->mf, &((*pmfl)->dm_dev_id), &dev_id, &chip_rev);
         CHECK_RC(rc);
     }
-    else if (access_type == MFAT_UEFI) {
+    else if (access_type == MFAT_UEFI)
+    {
         // open mfile as uefi
-        if (!((*pmfl)->mf = mopen_fw_ctx(access_dev, ((uefi_dev_extra_t*)dev_extra)->fw_cmd_func, ((uefi_dev_extra_t*)dev_extra)->dma_func, &((uefi_dev_extra_t*)dev_extra)->dev_info))) {
+        if (!((*pmfl)->mf =
+                mopen_fw_ctx(access_dev, ((uefi_dev_extra_t*)dev_extra)->fw_cmd_func,
+                             ((uefi_dev_extra_t*)dev_extra)->dma_func, &((uefi_dev_extra_t*)dev_extra)->dev_info)))
+        {
             return MFE_NOMEM;
         }
         // fill some device information
-        (*pmfl)->attr.hw_dev_id = ((uefi_dev_extra_t*) dev_extra)->dev_info.hw_dev_id;
-        (*pmfl)->attr.rev_id = ((uefi_dev_extra_t*) dev_extra)->dev_info.rev_id;
+        (*pmfl)->attr.hw_dev_id = ((uefi_dev_extra_t*)dev_extra)->dev_info.hw_dev_id;
+        (*pmfl)->attr.rev_id = ((uefi_dev_extra_t*)dev_extra)->dev_info.rev_id;
         rc = dm_get_device_id_offline((*pmfl)->attr.hw_dev_id, (*pmfl)->attr.rev_id, &((*pmfl)->dm_dev_id));
         CHECK_RC(rc);
     }
@@ -2559,30 +2832,37 @@ int mf_opend_int(mflash **pmfl, void *access_dev, int num_of_banks, flash_params
     return rc;
 }
 
-int mf_open_uefi(mflash **pmfl, uefi_Dev_t *uefi_dev, uefi_dev_extra_t *uefi_dev_extra)
+int mf_open_uefi(mflash** pmfl, uefi_Dev_t* uefi_dev, uefi_dev_extra_t* uefi_dev_extra)
 {
-
-    return mf_opend_int(pmfl, (void*)uefi_dev, 4, (flash_params_t*) NULL, 0, MFAT_UEFI, (void*)uefi_dev_extra, 0);
+    return mf_opend_int(pmfl, (void*)uefi_dev, 4, (flash_params_t*)NULL, 0, MFAT_UEFI, (void*)uefi_dev_extra, 0);
 }
 
-int mf_open_int(mflash **pmfl, const char *dev, int num_of_banks, flash_params_t *flash_params,
-                int ignore_cache_rep_guard, int cx3_fw_access)
+int mf_open_int(mflash** pmfl,
+                const char* dev,
+                int num_of_banks,
+                flash_params_t* flash_params,
+                int ignore_cache_rep_guard,
+                int cx3_fw_access)
 {
-    mfile *mf;
+    mfile* mf;
 
     int rc = 0;
 
-    if (!dev) {
+    if (!dev)
+    {
         return MFE_BAD_PARAMS;
     }
 
     mf = mopen(dev);
 
-    if (!mf) {
+    if (!mf)
+    {
         return MFE_CR_ERROR;
     }
-    if (ignore_cache_rep_guard) {//relevant only if working with -ocr flag
-        if (mf->gb_info.is_gb_mngr == 1) {
+    if (ignore_cache_rep_guard)
+    { // relevant only if working with -ocr flag
+        if (mf->gb_info.is_gb_mngr == 1)
+        {
             if (mf_check_spi_channel(mf) != 1)
             {
                 printf("-E- Can not continue - SPI channel is not OK.\n");
@@ -2590,57 +2870,67 @@ int mf_open_int(mflash **pmfl, const char *dev, int num_of_banks, flash_params_t
             }
         }
     }
-    rc = mf_opend_int(pmfl, (struct mfile_t*) mf, num_of_banks, flash_params, ignore_cache_rep_guard, MFAT_MFILE, NULL, cx3_fw_access);
-    if ((*pmfl)) {
+    rc = mf_opend_int(pmfl, (struct mfile_t*)mf, num_of_banks, flash_params, ignore_cache_rep_guard, MFAT_MFILE, NULL,
+                      cx3_fw_access);
+    if ((*pmfl))
+    {
         (*pmfl)->opts[MFO_CLOSE_MF_ON_EXIT] = 1;
     }
     CHECK_RC(rc);
     return MFE_OK;
 }
 
-int mf_open_adv(mflash **pmfl, const char *dev, int num_of_banks, flash_params_t *flash_params,
-                int ignore_cache_rep_guard, int cx3_fw_access)
+int mf_open_adv(mflash** pmfl,
+                const char* dev,
+                int num_of_banks,
+                flash_params_t* flash_params,
+                int ignore_cache_rep_guard,
+                int cx3_fw_access)
 {
     return mf_open_int(pmfl, dev, num_of_banks, flash_params, ignore_cache_rep_guard, cx3_fw_access);
 }
 
-int mf_open(mflash **pmfl, const char *dev, int num_of_banks, flash_params_t *flash_params,
-            int ignore_cache_rep_guard)
+int mf_open(mflash** pmfl, const char* dev, int num_of_banks, flash_params_t* flash_params, int ignore_cache_rep_guard)
 {
     return mf_open_int(pmfl, dev, num_of_banks, flash_params, ignore_cache_rep_guard, 0);
 }
 
-void mf_close(mflash *mfl)
+void mf_close(mflash* mfl)
 {
-    if (!mfl) {
+    if (!mfl)
+    {
         return;
     }
 
-    if (mfl->f_reset) {
+    if (mfl->f_reset)
+    {
         mfl->f_reset(mfl);
     }
 
-    if (mfl->f_set_bank) {
-        (void) set_bank(mfl, 0);
+    if (mfl->f_set_bank)
+    {
+        (void)set_bank(mfl, 0);
     }
     mfl->unlock_flash_prog_allowed = 1;
     // we release if we have writer_lock or not doesnt matter on close ...
     release_semaphore(mfl, 1);
 
-    if (mfl->mf && (mfl)->opts[MFO_CLOSE_MF_ON_EXIT]) {
+    if (mfl->mf && (mfl)->opts[MFO_CLOSE_MF_ON_EXIT])
+    {
         mclose(mfl->mf);
     }
 #ifndef UEFI_BUILD
-    if (mfl->trm) {
+    if (mfl->trm)
+    {
         trm_destroy(mfl->trm);
-        mfl->trm = (trm_ctx) NULL;
+        mfl->trm = (trm_ctx)NULL;
     }
 #endif
     free(mfl);
     return;
 }
 
-int mf_get_attr(mflash *mfl, flash_attr *attr)
+int mf_get_attr(mflash* mfl, flash_attr* attr)
 {
     *attr = mfl->attr;
     return MFE_OK;
@@ -2648,389 +2938,405 @@ int mf_get_attr(mflash *mfl, flash_attr *attr)
 
 const char* mf_err2str(int err_code)
 {
+    switch (err_code)
+    {
+        case MFE_OK:
+            return "MFE_OK";
 
-    switch (err_code) {
-    case MFE_OK:
-        return "MFE_OK";
-
-    case MFE_ERROR:
-        return "MFE_GENERAL_ERROR";
+        case MFE_ERROR:
+            return "MFE_GENERAL_ERROR";
 
-    case MFE_BAD_PARAMS:
-        return "MFE_BAD_PARAMS";
+        case MFE_BAD_PARAMS:
+            return "MFE_BAD_PARAMS";
 
-    case MFE_CR_ERROR:
-        return "MFE_CR_ERROR";
+        case MFE_CR_ERROR:
+            return "MFE_CR_ERROR";
 
-    case MFE_HW_DEVID_ERROR:
-        return "Read a corrupted device id (0xffff). Probably HW/PCI access problem.";
+        case MFE_HW_DEVID_ERROR:
+            return "Read a corrupted device id (0xffff). Probably HW/PCI access problem.";
 
-    case MFE_INVAL:
-        return "MFE_INVAL";
+        case MFE_INVAL:
+            return "MFE_INVAL";
 
-    case MFE_NOT_IMPLEMENTED:
-        return "MFE_NOT_IMPLEMENTED";
+        case MFE_NOT_IMPLEMENTED:
+            return "MFE_NOT_IMPLEMENTED";
 
-    case MFE_UNSUPPORTED_FLASH_TOPOLOGY:
-        return "MFE_UNSUPPORTED_FLASH_TOPOLOGY";
+        case MFE_UNSUPPORTED_FLASH_TOPOLOGY:
+            return "MFE_UNSUPPORTED_FLASH_TOPOLOGY";
 
-    case MFE_UNSUPPORTED_FLASH_TYPE:
-        return "MFE_UNSUPPORTED_FLASH_TYPE";
+        case MFE_UNSUPPORTED_FLASH_TYPE:
+            return "MFE_UNSUPPORTED_FLASH_TYPE";
 
-    case MFE_CFI_FAILED:
-        return "MFE_CFI_FAILED";
+        case MFE_CFI_FAILED:
+            return "MFE_CFI_FAILED";
 
-    case MFE_TIMEOUT:
-        return "MFE_TIMEOUT";
+        case MFE_TIMEOUT:
+            return "MFE_TIMEOUT";
 
-    case MFE_ERASE_TIMEOUT:
-        return "MFE_ERASE_TIMEOUT";
+        case MFE_ERASE_TIMEOUT:
+            return "MFE_ERASE_TIMEOUT";
 
-    case MFE_WRITE_TIMEOUT:
-        return "MFE_WRITE_TIMEOUT";
+        case MFE_WRITE_TIMEOUT:
+            return "MFE_WRITE_TIMEOUT";
 
-    case MFE_ERASE_ERROR:
-        return "MFE_ERASE_ERROR";
+        case MFE_ERASE_ERROR:
+            return "MFE_ERASE_ERROR";
 
-    case MFE_WRITE_ERROR:
-        return "MFE_WRITE_ERROR";
+        case MFE_WRITE_ERROR:
+            return "MFE_WRITE_ERROR";
 
-    case MFE_BAD_ALIGN:
-        return "MFE_BAD_ALIGN";
+        case MFE_BAD_ALIGN:
+            return "MFE_BAD_ALIGN";
 
-    case MFE_SEM_LOCKED:
-        return "MFE_SEM_LOCKED";
+        case MFE_SEM_LOCKED:
+            return "MFE_SEM_LOCKED";
 
-    case MFE_VERIFY_ERROR:
-        return "MFE_VERIFY_ERROR";
+        case MFE_VERIFY_ERROR:
+            return "MFE_VERIFY_ERROR";
 
-    case MFE_NOMEM:
-        return "MFE_NOMEM";
+        case MFE_NOMEM:
+            return "MFE_NOMEM";
 
-    case MFE_OUT_OF_RANGE:
-        return "MFE_OUT_OF_RANGE";
+        case MFE_OUT_OF_RANGE:
+            return "MFE_OUT_OF_RANGE";
 
-    case MFE_CMD_SUPPORTED_INBAND_ONLY:
-        return "Command supported over IB interface only.";
+        case MFE_CMD_SUPPORTED_INBAND_ONLY:
+            return "Command supported over IB interface only.";
 
-    case MFE_NO_FLASH_DETECTED:
-        return "MFE_NO_FLASH_DETECTED";
+        case MFE_NO_FLASH_DETECTED:
+            return "MFE_NO_FLASH_DETECTED";
 
-    case MFE_LOCKED_CRSPACE:
-        return "MFE_HW_ACCESS_DISABLED";
+        case MFE_LOCKED_CRSPACE:
+            return "MFE_HW_ACCESS_DISABLED";
 
-    case MFE_CMDIF_BAD_STATUS_ERR:
-        return "MFE_CMDIF_BAD_STATUS_ERR";
+        case MFE_CMDIF_BAD_STATUS_ERR:
+            return "MFE_CMDIF_BAD_STATUS_ERR";
 
-    case MFE_CMDIF_TIMEOUT_ERR:
-        return "MFE_CMDIF_TIMEOUT_ERR";
+        case MFE_CMDIF_TIMEOUT_ERR:
+            return "MFE_CMDIF_TIMEOUT_ERR";
 
-    case MFE_CMDIF_NOT_READY:
-        return "MFE_CMDIF_NOT_READY";
+        case MFE_CMDIF_NOT_READY:
+            return "MFE_CMDIF_NOT_READY";
 
-    case MFE_CMDIF_BAD_OP:
-        return "MFE_CMDIF_BAD_OP";
+        case MFE_CMDIF_BAD_OP:
+            return "MFE_CMDIF_BAD_OP";
 
-    case MFE_MISSING_KEY:
-        return "No key was set";
+        case MFE_MISSING_KEY:
+            return "No key was set";
 
-    case MFE_MISMATCH_KEY:
-        return "The given key is incorrect";
+        case MFE_MISMATCH_KEY:
+            return "The given key is incorrect";
 
-    case MFE_UNKNOWN_REG:
-        return "MFE_UNKNOWN_REG";
+        case MFE_UNKNOWN_REG:
+            return "MFE_UNKNOWN_REG";
 
-    case MFE_DIRECT_FW_ACCESS_DISABLED:
-        return "MFE_DIRECT_FW_ACCESS_DISABLED";
+        case MFE_DIRECT_FW_ACCESS_DISABLED:
+            return "MFE_DIRECT_FW_ACCESS_DISABLED";
 
-    case MFE_MANAGED_SWITCH_NOT_SUPPORTED:
-        return "MFE_MANAGED_SWITCH_NOT_SUPPORTED";
+        case MFE_MANAGED_SWITCH_NOT_SUPPORTED:
+            return "MFE_MANAGED_SWITCH_NOT_SUPPORTED";
 
-    case MFE_NOT_SUPPORTED_OPERATION:
-        return "MFE_NOT_SUPPORTED_OPERATION";
+        case MFE_NOT_SUPPORTED_OPERATION:
+            return "MFE_NOT_SUPPORTED_OPERATION";
 
-    case MFE_FLASH_NOT_EXIST:
-        return "MFE_FLASH_NOT_EXIST";
+        case MFE_FLASH_NOT_EXIST:
+            return "MFE_FLASH_NOT_EXIST";
 
-    case MFE_MISMATCH_PARAM:
-        return "MFE_MISMATCH_PARAM";
+        case MFE_MISMATCH_PARAM:
+            return "MFE_MISMATCH_PARAM";
 
-    case MFE_EXCEED_SUBSECTORS_MAX_NUM:
-        return "MFE_EXCEED_SUBSECTORS_MAX_NUM";
+        case MFE_EXCEED_SUBSECTORS_MAX_NUM:
+            return "MFE_EXCEED_SUBSECTORS_MAX_NUM";
 
-    case MFE_EXCEED_SECTORS_MAX_NUM:
-        return "MFE_EXCEED_SECTORS_MAX_NUM";
+        case MFE_EXCEED_SECTORS_MAX_NUM:
+            return "MFE_EXCEED_SECTORS_MAX_NUM";
 
-    case MFE_SECTORS_NUM_NOT_POWER_OF_TWO:
-        return "MFE_SECTORS_NUM_NOT_POWER_OF_TWO";
+        case MFE_SECTORS_NUM_NOT_POWER_OF_TWO:
+            return "MFE_SECTORS_NUM_NOT_POWER_OF_TWO";
 
-    case MFE_SECTORS_NUM_MORE_THEN_0_LESS_THEN_4:
-        return "Can not protect 1 or 2 blocks in this flash. Minimum is 4.";
+        case MFE_SECTORS_NUM_MORE_THEN_0_LESS_THEN_4:
+            return "Can not protect 1 or 2 blocks in this flash. Minimum is 4.";
 
-    case MFE_UNKOWN_ACCESS_TYPE:
-        return "MFE_UNKOWN_ACCESS_TYPE";
+        case MFE_UNKOWN_ACCESS_TYPE:
+            return "MFE_UNKOWN_ACCESS_TYPE";
 
-    case MFE_UNSUPPORTED_DEVICE:
-        return "MFE_UNSUPPORTED_DEVICE";
+        case MFE_UNSUPPORTED_DEVICE:
+            return "MFE_UNSUPPORTED_DEVICE";
 
-    case MFE_UNSUPPORTED_ERASE_OPERATION:
-        return "MFE_UNSUPPORTED_ERASE_OPERATION";
+        case MFE_UNSUPPORTED_ERASE_OPERATION:
+            return "MFE_UNSUPPORTED_ERASE_OPERATION";
 
-    case MFE_OLD_DEVICE_TYPE:
-        return "MFE_OLD_DEVICE_TYPE";
+        case MFE_OLD_DEVICE_TYPE:
+            return "MFE_OLD_DEVICE_TYPE";
 
-    case MFE_ICMD_INIT_FAILED:
-        return "MFE_ICMD_INIT_FAILED";
+        case MFE_ICMD_INIT_FAILED:
+            return "MFE_ICMD_INIT_FAILED";
 
-    case MFE_ICMD_NOT_SUPPORTED:
-        return "MFE_ICMD_NOT_SUPPORTED";
+        case MFE_ICMD_NOT_SUPPORTED:
+            return "MFE_ICMD_NOT_SUPPORTED";
 
-    case MFE_HW_ACCESS_NOT_SUPP:
-        return "Secure host mode is not enabled in this FW.";
+        case MFE_HW_ACCESS_NOT_SUPP:
+            return "Secure host mode is not enabled in this FW.";
 
-    case MFE_MAD_SEND_ERR:
-        return "MFE_MAD_SEND_ERR";
+        case MFE_MAD_SEND_ERR:
+            return "MFE_MAD_SEND_ERR";
 
-    case MFE_ICMD_BAD_PARAM:
-        return "MFE_ICMD_BAD_PARAM";
+        case MFE_ICMD_BAD_PARAM:
+            return "MFE_ICMD_BAD_PARAM";
 
-    case MFE_ICMD_INVALID_OPCODE:
-        return "MFE_ICMD_INVALID_OPCODE";
+        case MFE_ICMD_INVALID_OPCODE:
+            return "MFE_ICMD_INVALID_OPCODE";
 
-    case MFE_ICMD_INVALID_CMD:
-        return "MFE_ICMD_INVALID_CMD";
+        case MFE_ICMD_INVALID_CMD:
+            return "MFE_ICMD_INVALID_CMD";
 
-    case MFE_ICMD_OPERATIONAL_ERROR:
-        return "MFE_ICMD_OPERATIONAL_ERROR";
+        case MFE_ICMD_OPERATIONAL_ERROR:
+            return "MFE_ICMD_OPERATIONAL_ERROR";
 
-    case MFE_DATA_IS_OTP:
-        return "The data you are trying to write is OTP and have already been programmed.";
+        case MFE_DATA_IS_OTP:
+            return "The data you are trying to write is OTP and have already been programmed.";
 
-    case MFE_REG_ACCESS_BAD_METHOD:
-        return "MFE_REG_ACCESS_BAD_METHOD";
+        case MFE_REG_ACCESS_BAD_METHOD:
+            return "MFE_REG_ACCESS_BAD_METHOD";
 
-    case MFE_REG_ACCESS_NOT_SUPPORTED:
-        return "MFE_REG_ACCESS_NOT_SUPPORTED";
+        case MFE_REG_ACCESS_NOT_SUPPORTED:
+            return "MFE_REG_ACCESS_NOT_SUPPORTED";
 
-    case MFE_REG_ACCESS_DEV_BUSY:
-        return "MFE_REG_ACCESS_DEV_BUSY";
+        case MFE_REG_ACCESS_DEV_BUSY:
+            return "MFE_REG_ACCESS_DEV_BUSY";
 
-    case MFE_REG_ACCESS_VER_NOT_SUPP:
-        return "MFE_REG_ACCESS_VER_NOT_SUPP";
+        case MFE_REG_ACCESS_VER_NOT_SUPP:
+            return "MFE_REG_ACCESS_VER_NOT_SUPP";
 
-    case MFE_REG_ACCESS_UNKNOWN_TLV:
-        return "MFE_REG_ACCESS_UNKNOWN_TLV";
+        case MFE_REG_ACCESS_UNKNOWN_TLV:
+            return "MFE_REG_ACCESS_UNKNOWN_TLV";
 
-    case MFE_REG_ACCESS_REG_NOT_SUPP:
-        return "MFE_REG_ACCESS_REG_NOT_SUPP";
+        case MFE_REG_ACCESS_REG_NOT_SUPP:
+            return "MFE_REG_ACCESS_REG_NOT_SUPP";
 
-    case MFE_REG_ACCESS_CLASS_NOT_SUPP:
-        return "MFE_REG_ACCESS_CLASS_NOT_SUPP";
+        case MFE_REG_ACCESS_CLASS_NOT_SUPP:
+            return "MFE_REG_ACCESS_CLASS_NOT_SUPP";
 
-    case MFE_REG_ACCESS_METHOD_NOT_SUPP:
-        return "MFE_REG_ACCESS_METHOD_NOT_SUPP";
+        case MFE_REG_ACCESS_METHOD_NOT_SUPP:
+            return "MFE_REG_ACCESS_METHOD_NOT_SUPP";
 
-    case MFE_REG_ACCESS_BAD_PARAM:
-        return "MFE_REG_ACCESS_BAD_PARAM";
+        case MFE_REG_ACCESS_BAD_PARAM:
+            return "MFE_REG_ACCESS_BAD_PARAM";
 
-    case MFE_REG_ACCESS_RES_NOT_AVLBL:
-        return "MFE_REG_ACCESS_RESOURCE_NOT_AVAILABLE";
+        case MFE_REG_ACCESS_RES_NOT_AVLBL:
+            return "MFE_REG_ACCESS_RESOURCE_NOT_AVAILABLE";
 
-    case MFE_REG_ACCESS_MSG_RECPT_ACK:
-        return "MFE_REG_ACCESS_MSG_RECPT_ACK";
+        case MFE_REG_ACCESS_MSG_RECPT_ACK:
+            return "MFE_REG_ACCESS_MSG_RECPT_ACK";
 
-    case MFE_REG_ACCESS_UNKNOWN_ERR:
-        return "MFE_REG_ACCESS_UNKNOWN_ERR";
+        case MFE_REG_ACCESS_UNKNOWN_ERR:
+            return "MFE_REG_ACCESS_UNKNOWN_ERR";
 
-    case MFE_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
-        return "MFE_REG_ACCESS_SIZE_EXCCEEDS_LIMIT";
+        case MFE_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
+            return "MFE_REG_ACCESS_SIZE_EXCCEEDS_LIMIT";
 
-    case MFE_PCICONF:
-        return "Access to device should be through configuration cycles.";
+        case MFE_PCICONF:
+            return "Access to device should be through configuration cycles.";
 
-    case MFE_ILLEGAL_BANK_NUM:
-        return "MFE_ILLEGAL_BANK_NUM";
+        case MFE_ILLEGAL_BANK_NUM:
+            return "MFE_ILLEGAL_BANK_NUM";
 
-    case MFE_OCR_NOT_SUPPORTED:
-        return "Direct flash access is not supported.";
+        case MFE_OCR_NOT_SUPPORTED:
+            return "Direct flash access is not supported.";
 
-    default:
-        return "Unknown error";
+        default:
+            return "Unknown error";
     }
 }
 
 #ifndef UEFI_BUILD
 int trm2mfe_err(trm_sts rc)
 {
-    switch (rc) {
-    case TRM_STS_DEV_NOT_SUPPORTED:
-        return MFE_UNSUPPORTED_DEVICE;
+    switch (rc)
+    {
+        case TRM_STS_DEV_NOT_SUPPORTED:
+            return MFE_UNSUPPORTED_DEVICE;
 
-    case TRM_STS_CR_ACCESS_ERR:
-        return MFE_CR_ERROR;
+        case TRM_STS_CR_ACCESS_ERR:
+            return MFE_CR_ERROR;
 
-    case TRM_STS_MEM_ERROR:
-        return MFE_NOMEM;
+        case TRM_STS_MEM_ERROR:
+            return MFE_NOMEM;
 
-    default:
-        return MFE_ERROR;
+        default:
+            return MFE_ERROR;
     }
 }
 #endif
 
-int mf_set_opt(mflash *mfl, MfOpt opt, int val)
+int mf_set_opt(mflash* mfl, MfOpt opt, int val)
 {
-    if ((int) opt < 0 || opt >= MFO_LAST) {
+    if ((int)opt < 0 || opt >= MFO_LAST)
+    {
         return MFE_BAD_PARAMS;
     }
     mfl->opts[opt] = val;
     return MFE_OK;
 }
 
-int mf_get_opt(mflash *mfl, MfOpt opt, int *val)
+int mf_get_opt(mflash* mfl, MfOpt opt, int* val)
 {
-    if ((int) opt < 0 || opt >= MFO_LAST) {
+    if ((int)opt < 0 || opt >= MFO_LAST)
+    {
         return MFE_BAD_PARAMS;
     }
     *val = mfl->opts[opt];
     return MFE_OK;
 }
 
-int mf_cr_read(mflash *mfl, u_int32_t cr_addr, u_int32_t *data)
+int mf_cr_read(mflash* mfl, u_int32_t cr_addr, u_int32_t* data)
 {
-    if (mread4(mfl->mf, cr_addr, data) != 4) {
+    if (mread4(mfl->mf, cr_addr, data) != 4)
+    {
         return MFE_CR_ERROR;
     }
     return MFE_OK;
 }
 
-int mf_cr_write(mflash *mfl, u_int32_t cr_addr, u_int32_t data)
+int mf_cr_write(mflash* mfl, u_int32_t cr_addr, u_int32_t data)
 {
-    if (mwrite4(mfl->mf, cr_addr, data) != 4) {
+    if (mwrite4(mfl->mf, cr_addr, data) != 4)
+    {
         return MFE_CR_ERROR;
     }
     return MFE_OK;
 }
 
-int mf_set_reset_flash_on_warm_reboot(mflash *mfl)
+int mf_set_reset_flash_on_warm_reboot(mflash* mfl)
 {
     int rc;
     u_int32_t set_reset_bit_dword_addr;
     int set_reset_bit_offset;
     u_int32_t set_reset_bit_dword;
-    switch (mfl->dm_dev_id) {
-    case DeviceConnectX2:
-    case DeviceSwitchX:
-    case DeviceConnectX3:
-    case DeviceConnectX3Pro:
-    case DeviceConnectIB:
-    case DeviceSwitchIB:
-    case DeviceSwitchIB2:
-    case DeviceQuantum:
-    case DeviceQuantum2:
-    case DeviceConnectX7:
-    case DeviceBlueField3:
-    case DeviceSpectrum4:
-    case DeviceAbirGearBox:
-        return MFE_OK;
-    case DeviceSpectrum:
-    case DeviceConnectX4:
-    case DeviceConnectX4LX:
-    case DeviceConnectX5:
-    case DeviceBlueField:
-        set_reset_bit_dword_addr = 0xf0204;
-        set_reset_bit_offset = 1;
-        break;
-    case DeviceConnectX6:
-    case DeviceConnectX6DX:
-    case DeviceConnectX6LX:
-    case DeviceBlueField2:
-    case DeviceSpectrum2:
-    case DeviceSpectrum3:
-    case DeviceGearBox:
-    case DeviceGearBoxManager:
-        set_reset_bit_dword_addr = 0xf0c28;
-        set_reset_bit_offset = 2;
-        break;
-    default:
-        return MFE_UNSUPPORTED_DEVICE;
-    }
-    FLASH_DPRINTF(("mflash::mf_set_reset_flash_on_warm_reboot setting power_boot_partial_reset at addr 0x%x.%d\n", set_reset_bit_dword_addr, set_reset_bit_offset));
+    switch (mfl->dm_dev_id)
+    {
+        case DeviceConnectX2:
+        case DeviceSwitchX:
+        case DeviceConnectX3:
+        case DeviceConnectX3Pro:
+        case DeviceConnectIB:
+        case DeviceSwitchIB:
+        case DeviceSwitchIB2:
+        case DeviceQuantum:
+        case DeviceQuantum2:
+        case DeviceConnectX7:
+        case DeviceBlueField3:
+        case DeviceSpectrum4:
+        case DeviceAbirGearBox:
+            return MFE_OK;
+        case DeviceSpectrum:
+        case DeviceConnectX4:
+        case DeviceConnectX4LX:
+        case DeviceConnectX5:
+        case DeviceBlueField:
+            set_reset_bit_dword_addr = 0xf0204;
+            set_reset_bit_offset = 1;
+            break;
+        case DeviceConnectX6:
+        case DeviceConnectX6DX:
+        case DeviceConnectX6LX:
+        case DeviceBlueField2:
+        case DeviceSpectrum2:
+        case DeviceSpectrum3:
+        case DeviceGearBox:
+        case DeviceGearBoxManager:
+            set_reset_bit_dword_addr = 0xf0c28;
+            set_reset_bit_offset = 2;
+            break;
+        default:
+            return MFE_UNSUPPORTED_DEVICE;
+    }
+    FLASH_DPRINTF(("mflash::mf_set_reset_flash_on_warm_reboot setting power_boot_partial_reset at addr 0x%x.%d\n",
+                   set_reset_bit_dword_addr, set_reset_bit_offset));
     rc = mf_cr_read(mfl, set_reset_bit_dword_addr, &set_reset_bit_dword);
     CHECK_RC(rc);
     set_reset_bit_dword = MERGE(set_reset_bit_dword, 1, set_reset_bit_offset, 1);
     return mf_cr_write(mfl, set_reset_bit_dword_addr, set_reset_bit_dword);
 }
 
-int mf_update_boot_addr(mflash *mfl, u_int32_t boot_addr)
+int mf_update_boot_addr(mflash* mfl, u_int32_t boot_addr)
 {
     int rc;
     u_int32_t boot_cr_space_address;
     int offset_in_address;
 
-    switch (mfl->dm_dev_id) {
-    case DeviceConnectX2:
-    case DeviceSwitchX:
-    case DeviceConnectX3:
-    case DeviceConnectX3Pro:
-    case DeviceConnectIB:
-    case DeviceSwitchIB:
-    case DeviceSpectrum:
-    case DeviceConnectX4:
-    case DeviceConnectX4LX:
-    case DeviceSwitchIB2:
-        boot_cr_space_address = 0xf0000;
-        offset_in_address = 8;
-        break;
-    case DeviceConnectX5:
-    case DeviceBlueField:
-        boot_cr_space_address = 0xf00c0;
-        offset_in_address = 0;
-        break;
-    case DeviceConnectX6:
-    case DeviceConnectX6DX:
-    case DeviceConnectX6LX:
-    case DeviceQuantum:
-    case DeviceBlueField2:
-    case DeviceSpectrum2:
-    case DeviceSpectrum3:
-    case DeviceGearBox:
-    case DeviceGearBoxManager:
-        boot_cr_space_address = 0xf0080;
-        offset_in_address = 0;
-        break;
-    case DeviceAbirGearBox:
-        boot_cr_space_address = 0xf1400;
-        offset_in_address = 0;
-        break;
-    case DeviceSpectrum4:
-    case DeviceQuantum2:
-        boot_cr_space_address = 0xf1000;
-        offset_in_address = 0;
-        break;
-    case DeviceConnectX7:
-    case DeviceBlueField3:
-        boot_cr_space_address = 0xf2000;
-        offset_in_address = 0;
-        break;
-    default:
-        return MFE_UNSUPPORTED_DEVICE;
-    }
-
-    if (mfl->access_type != MFAT_UEFI && mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_MLNXOS_CMDIF) {
+    switch (mfl->dm_dev_id)
+    {
+        case DeviceConnectX2:
+        case DeviceSwitchX:
+        case DeviceConnectX3:
+        case DeviceConnectX3Pro:
+        case DeviceConnectIB:
+        case DeviceSwitchIB:
+        case DeviceSpectrum:
+        case DeviceConnectX4:
+        case DeviceConnectX4LX:
+        case DeviceSwitchIB2:
+            boot_cr_space_address = 0xf0000;
+            offset_in_address = 8;
+            break;
+        case DeviceConnectX5:
+        case DeviceBlueField:
+            boot_cr_space_address = 0xf00c0;
+            offset_in_address = 0;
+            break;
+        case DeviceConnectX6:
+        case DeviceConnectX6DX:
+        case DeviceConnectX6LX:
+        case DeviceQuantum:
+        case DeviceBlueField2:
+        case DeviceSpectrum2:
+        case DeviceSpectrum3:
+        case DeviceGearBox:
+        case DeviceGearBoxManager:
+            boot_cr_space_address = 0xf0080;
+            offset_in_address = 0;
+            break;
+        case DeviceAbirGearBox:
+            boot_cr_space_address = 0xf1400;
+            offset_in_address = 0;
+            break;
+        case DeviceSpectrum4:
+        case DeviceQuantum2:
+            boot_cr_space_address = 0xf1000;
+            offset_in_address = 0;
+            break;
+        case DeviceConnectX7:
+        case DeviceBlueField3:
+            boot_cr_space_address = 0xf2000;
+            offset_in_address = 0;
+            break;
+        default:
+            return MFE_UNSUPPORTED_DEVICE;
+    }
+
+    if (mfl->access_type != MFAT_UEFI && mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] != ATBM_MLNXOS_CMDIF)
+    {
         // the boot addr will be updated directly via cr-space
-        FLASH_DPRINTF(("mflash::mf_update_boot_addr setting boot_start_address at addr 0x%x to 0x%x\n", boot_cr_space_address, boot_addr << offset_in_address));
+        FLASH_DPRINTF(("mflash::mf_update_boot_addr setting boot_start_address at addr 0x%x to 0x%x\n",
+                       boot_cr_space_address, boot_addr << offset_in_address));
         rc = mf_cr_write(mfl, boot_cr_space_address, boot_addr << offset_in_address);
         CHECK_RC(rc);
         return mf_set_reset_flash_on_warm_reboot(mfl);
-    } else {
+    }
+    else
+    {
         // the boot addr will be updated via reg
         return mf_update_boot_addr_by_type(mfl, boot_addr);
     }
 }
 
-int mf_read_modify_status_winbond(mflash *mfl, u_int8_t bank_num, u_int8_t is_first_status_reg,
-                                  u_int8_t param, u_int8_t offset, u_int8_t size)
+int mf_read_modify_status_winbond(mflash* mfl,
+                                  u_int8_t bank_num,
+                                  u_int8_t is_first_status_reg,
+                                  u_int8_t param,
+                                  u_int8_t offset,
+                                  u_int8_t size)
 {
     u_int8_t status1 = 0, status2 = 0, use_rdsr2 = 0;
     u_int32_t status = 0;
@@ -3039,11 +3345,10 @@ int mf_read_modify_status_winbond(mflash *mfl, u_int8_t bank_num, u_int8_t is_fi
 
     rc = set_bank_int(mfl, bank_num);
     CHECK_RC(rc);
-    if (
-        (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND) || 
-        (mfl->attr.vendor == FV_S25FLXXXX && 
-        (mfl->attr.type == FMT_S25FL116K || mfl->attr.type == FMT_S25FLXXXL)) || 
-        (mfl->attr.vendor == FV_MX25K16XXX && mfl->attr.type == FMT_MX25K16XXX)) {
+    if ((mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND) ||
+        (mfl->attr.vendor == FV_S25FLXXXX && (mfl->attr.type == FMT_S25FL116K || mfl->attr.type == FMT_S25FLXXXL)) ||
+        (mfl->attr.vendor == FV_MX25K16XXX && mfl->attr.type == FMT_MX25K16XXX))
+    {
         /*
          * if we have 2 status registers, winbond are allowing us to write both of them
          * in a single command WRSR  status_reg1 located in MSB, status_reg2 after status_reg1
@@ -3054,11 +3359,15 @@ int mf_read_modify_status_winbond(mflash *mfl, u_int8_t bank_num, u_int8_t is_fi
     // Read register status
     rc = mfl->f_spi_status(mfl, SFC_RDSR, &status1);
     CHECK_RC(rc);
-    if (use_rdsr2) {
-        if (mfl->attr.vendor == FV_MX25K16XXX) {
+    if (use_rdsr2)
+    {
+        if (mfl->attr.vendor == FV_MX25K16XXX)
+        {
             rc = mfl->f_spi_status(mfl, SFC_RDCR, &status2);
             CHECK_RC(rc);
-        } else {
+        }
+        else
+        {
             rc = mfl->f_spi_status(mfl, SFC_RDSR2, &status2);
             CHECK_RC(rc);
         }
@@ -3070,17 +3379,20 @@ int mf_read_modify_status_winbond(mflash *mfl, u_int8_t bank_num, u_int8_t is_fi
     // Modify the status according to the function arguments
     status = MERGE(status, param, offset + is_first_status_reg * 8, size);
     // fix status register in case we dont need to write status register 2
-    if (bytes_to_write == 1) {
+    if (bytes_to_write == 1)
+    {
         status = status >> 8;
     }
     // Write register status
-    if (mfl->attr.vendor == FV_GD25QXXX) {
+    if (mfl->attr.vendor == FV_GD25QXXX)
+    {
         rc = mfl->f_spi_write_status_reg(mfl, status, SFC_WRSR_GIGA, bytes_to_write);
     }
-    else {
+    else
+    {
         rc = mfl->f_spi_write_status_reg(mfl, status, SFC_WRSR, bytes_to_write);
     }
-    
+
     CHECK_RC(rc);
     return MFE_OK;
 }
@@ -3090,8 +3402,14 @@ int mf_read_modify_status_winbond(mflash *mfl, u_int8_t bank_num, u_int8_t is_fi
 // offset - destination bit offset
 // size - bit length
 // bytes_num - status register size in bytes
-int mf_read_modify_status_new(mflash *mfl, u_int8_t bank_num, u_int8_t read_cmd, u_int8_t write_cmd,
-                              u_int8_t val, u_int8_t offset, u_int8_t size, u_int8_t bytes_num)
+int mf_read_modify_status_new(mflash* mfl,
+                              u_int8_t bank_num,
+                              u_int8_t read_cmd,
+                              u_int8_t write_cmd,
+                              u_int8_t val,
+                              u_int8_t offset,
+                              u_int8_t size,
+                              u_int8_t bytes_num)
 {
     int rc = 0;
     u_int32_t status = 0;
@@ -3106,12 +3424,18 @@ int mf_read_modify_status_new(mflash *mfl, u_int8_t bank_num, u_int8_t read_cmd,
     return MFE_OK;
 }
 
-int mf_get_param_int(mflash *mfl, u_int8_t *param_p, u_int8_t cmd, u_int8_t offset, u_int8_t bit_size,
-                     u_int8_t bytes_num, u_int8_t enabled_val)
+int mf_get_param_int(mflash* mfl,
+                     u_int8_t* param_p,
+                     u_int8_t cmd,
+                     u_int8_t offset,
+                     u_int8_t bit_size,
+                     u_int8_t bytes_num,
+                     u_int8_t enabled_val)
 {
     u_int32_t status = 0, is_first = 1, bank = 0;
     int rc = 0;
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
         u_int8_t curr_val;
         rc = set_bank_int(mfl, bank);
         CHECK_RC(rc);
@@ -3119,15 +3443,20 @@ int mf_get_param_int(mflash *mfl, u_int8_t *param_p, u_int8_t cmd, u_int8_t offs
         CHECK_RC(rc);
 
         curr_val = EXTRACT(status, offset, bit_size);
-        if (bit_size == 1) {
+        if (bit_size == 1)
+        {
             curr_val = (curr_val == enabled_val);
         }
 
-        if (is_first) {
+        if (is_first)
+        {
             *param_p = curr_val;
             is_first = 0;
-        } else {
-            if (*param_p != curr_val) {
+        }
+        else
+        {
+            if (*param_p != curr_val)
+            {
                 return MFE_MISMATCH_PARAM;
             }
         }
@@ -3135,141 +3464,179 @@ int mf_get_param_int(mflash *mfl, u_int8_t *param_p, u_int8_t cmd, u_int8_t offs
     return MFE_OK;
 }
 
-int mf_set_dummy_cycles_direct_access(mflash *mfl, u_int8_t num_of_cycles)
+int mf_set_dummy_cycles_direct_access(mflash* mfl, u_int8_t num_of_cycles)
 {
-    if (!mfl || num_of_cycles < 1 || num_of_cycles > 15) {
+    if (!mfl || num_of_cycles < 1 || num_of_cycles > 15)
+    {
         return MFE_BAD_PARAMS;
     }
     int bank = 0, rc = 0;
-    if (!(mfl->attr.dummy_cycles_support && mfl->supp_sr_mod)) {
+    if (!(mfl->attr.dummy_cycles_support && mfl->supp_sr_mod))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
         rc = mf_read_modify_status_new(mfl, bank, SFC_RDNVR, SFC_WRNVR, num_of_cycles, DUMMY_CYCLES_OFFSET_ST, 4, 2);
         CHECK_RC(rc);
     }
     return MFE_OK;
 }
 
-int mf_get_dummy_cycles_direct_access(mflash *mfl, u_int8_t *dummy_cycles_p)
+int mf_get_dummy_cycles_direct_access(mflash* mfl, u_int8_t* dummy_cycles_p)
 {
-    if (!mfl || !dummy_cycles_p) {
+    if (!mfl || !dummy_cycles_p)
+    {
         return MFE_BAD_PARAMS;
     }
-    if (!(mfl->attr.dummy_cycles_support && mfl->supp_sr_mod)) {
+    if (!(mfl->attr.dummy_cycles_support && mfl->supp_sr_mod))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
     return mf_get_param_int(mfl, dummy_cycles_p, SFC_RDNVR, DUMMY_CYCLES_OFFSET_ST, 4, 2, 0);
     return MFE_OK;
 }
 
-int mf_set_driver_strength_direct_access(mflash *mfl, u_int8_t driver_strength) {
-    if (!mfl) {
+int mf_set_driver_strength_direct_access(mflash* mfl, u_int8_t driver_strength)
+{
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
-    if (driver_strength != DRIVER_STRENGTH_VAL_25_WINBOND &&
-        driver_strength != DRIVER_STRENGTH_VAL_50_WINBOND &&
-        driver_strength != DRIVER_STRENGTH_VAL_75_WINBOND &&
-        driver_strength != DRIVER_STRENGTH_VAL_100_WINBOND) {
+    if (driver_strength != DRIVER_STRENGTH_VAL_25_WINBOND && driver_strength != DRIVER_STRENGTH_VAL_50_WINBOND &&
+        driver_strength != DRIVER_STRENGTH_VAL_75_WINBOND && driver_strength != DRIVER_STRENGTH_VAL_100_WINBOND)
+    {
         return MFE_BAD_PARAMS;
     }
-    if (!(mfl->attr.driver_strength_support && mfl->supp_sr_mod)) {
+    if (!(mfl->attr.driver_strength_support && mfl->supp_sr_mod))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
     int bank = 0, rc = MFE_OK;
-    for (; bank < mfl->attr.banks_num; bank++) {
-        if (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V) {
-            rc = mf_read_modify_status_new(mfl, bank, SFC_RDSR3_WINBOND,            // mflash, bank num, status-register-3 read cmd
-                                            SFC_WRSR3_WINBOND, driver_strength,     // status-register-3 write cmd, driver-strength new val
-                                            DRIVER_STRENGTH_OFFSET_WINBOND,         // driver-strength bit offset
-                                            DRIVER_STRENGTH_BIT_LEN_WINBOND, 1);    // driver-strength bit length, status-register byte len
+    for (; bank < mfl->attr.banks_num; bank++)
+    {
+        if (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V)
+        {
+            rc = mf_read_modify_status_new(
+              mfl, bank, SFC_RDSR3_WINBOND,        // mflash, bank num, status-register-3 read cmd
+              SFC_WRSR3_WINBOND, driver_strength,  // status-register-3 write cmd, driver-strength new val
+              DRIVER_STRENGTH_OFFSET_WINBOND,      // driver-strength bit offset
+              DRIVER_STRENGTH_BIT_LEN_WINBOND, 1); // driver-strength bit length, status-register byte len
             CHECK_RC(rc);
         }
-        else {
+        else
+        {
             return MFE_NOT_IMPLEMENTED;
         }
     }
     return MFE_OK;
 }
 
-int mf_get_driver_strength_direct_access(mflash *mfl, u_int8_t *driver_strength_p) {
-    if (!mfl || !driver_strength_p) {
+int mf_get_driver_strength_direct_access(mflash* mfl, u_int8_t* driver_strength_p)
+{
+    if (!mfl || !driver_strength_p)
+    {
         return MFE_BAD_PARAMS;
     }
-    if (!(mfl->attr.driver_strength_support && mfl->supp_sr_mod)) {
+    if (!(mfl->attr.driver_strength_support && mfl->supp_sr_mod))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
     int rc = MFE_OK;
-    if (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V) {
-        rc = mf_get_param_int(mfl, driver_strength_p, SFC_RDSR3_WINBOND,        // mflash, output pointer, status-register-3 read cmd
-                                DRIVER_STRENGTH_OFFSET_WINBOND,                 // driver-strength bit offset
-                                DRIVER_STRENGTH_BIT_LEN_WINBOND,                // driver-strength bit length
-                                1, 0);                                          // status-register byte len, don't-care
+    if (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V)
+    {
+        rc = mf_get_param_int(mfl, driver_strength_p,
+                              SFC_RDSR3_WINBOND,               // mflash, output pointer, status-register-3 read cmd
+                              DRIVER_STRENGTH_OFFSET_WINBOND,  // driver-strength bit offset
+                              DRIVER_STRENGTH_BIT_LEN_WINBOND, // driver-strength bit length
+                              1, 0);                           // status-register byte len, don't-care
     }
-    else {
+    else
+    {
         rc = MFE_NOT_SUPPORTED_OPERATION;
     }
 
     return rc;
 }
 
-
-int mf_set_quad_en_direct_access(mflash *mfl, u_int8_t quad_en)
+int mf_set_quad_en_direct_access(mflash* mfl, u_int8_t quad_en)
 {
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
     int bank = 0, rc = 0;
-    if (!(mfl->attr.quad_en_support && mfl->supp_sr_mod)) {
+    if (!(mfl->attr.quad_en_support && mfl->supp_sr_mod))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
-        if (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V) {
-            rc = mf_read_modify_status_new(mfl, bank, SFC_RDSR2, SFC_WRSR2, quad_en, QUAD_EN_OFFSET_WINBOND_CYPRESS, 1, 1);
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
+        if (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V)
+        {
+            rc =
+              mf_read_modify_status_new(mfl, bank, SFC_RDSR2, SFC_WRSR2, quad_en, QUAD_EN_OFFSET_WINBOND_CYPRESS, 1, 1);
             CHECK_RC(rc);
-        } else if (mfl->attr.vendor == FV_WINBOND || mfl->attr.vendor == FV_S25FLXXXX) {
+        }
+        else if (mfl->attr.vendor == FV_WINBOND || mfl->attr.vendor == FV_S25FLXXXX)
+        {
             rc = mf_read_modify_status_winbond(mfl, bank, 0, quad_en, QUAD_EN_OFFSET_WINBOND_CYPRESS, 1);
             CHECK_RC(rc);
-        } else if (mfl->attr.vendor == FV_ST) {
+        }
+        else if (mfl->attr.vendor == FV_ST)
+        {
             rc = mf_read_modify_status_new(mfl, bank, SFC_RDNVR, SFC_WRNVR, !quad_en, QUAD_EN_OFFSET_MICRON, 1, 2);
             CHECK_RC(rc);
-        } else if (mfl->attr.vendor == FV_IS25LPXXX || mfl->attr.vendor == FV_MX25K16XXX) {
+        }
+        else if (mfl->attr.vendor == FV_IS25LPXXX || mfl->attr.vendor == FV_MX25K16XXX)
+        {
             rc = mf_read_modify_status_winbond(mfl, bank, 1, quad_en, QUAD_EN_OFFSET_ISSI_MACRONIX, 1);
             CHECK_RC(rc);
-        } else if (mfl->attr.vendor == FV_GD25QXXX) {
+        }
+        else if (mfl->attr.vendor == FV_GD25QXXX)
+        {
             rc = mf_read_modify_status_winbond(mfl, bank, 1, quad_en, QUAD_EN_OFFSET_GIGABYTE, 1);
             CHECK_RC(rc);
         }
-        else {
+        else
+        {
             return MFE_NOT_IMPLEMENTED;
         }
     }
     return MFE_OK;
 }
 
-int mf_get_quad_en_direct_access(mflash *mfl, u_int8_t *quad_en_p)
+int mf_get_quad_en_direct_access(mflash* mfl, u_int8_t* quad_en_p)
 {
-    if (!mfl || !quad_en_p) {
+    if (!mfl || !quad_en_p)
+    {
         return MFE_BAD_PARAMS;
     }
-    if (!(mfl->attr.quad_en_support && mfl->supp_sr_mod)) {
+    if (!(mfl->attr.quad_en_support && mfl->supp_sr_mod))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
-    if (mfl->attr.vendor == FV_WINBOND || mfl->attr.vendor == FV_S25FLXXXX) {
+    if (mfl->attr.vendor == FV_WINBOND || mfl->attr.vendor == FV_S25FLXXXX)
+    {
         return mf_get_param_int(mfl, quad_en_p, SFC_RDSR2, QUAD_EN_OFFSET_WINBOND_CYPRESS, 1, 1, 1);
-    } else if (mfl->attr.vendor == FV_ST) {
+    }
+    else if (mfl->attr.vendor == FV_ST)
+    {
         return mf_get_param_int(mfl, quad_en_p, SFC_RDNVR, QUAD_EN_OFFSET_MICRON, 1, 2, 0);
-    } else if (mfl->attr.vendor == FV_IS25LPXXX || mfl->attr.vendor == FV_MX25K16XXX) {
+    }
+    else if (mfl->attr.vendor == FV_IS25LPXXX || mfl->attr.vendor == FV_MX25K16XXX)
+    {
         return mf_get_param_int(mfl, quad_en_p, SFC_RDSR, QUAD_EN_OFFSET_ISSI_MACRONIX, 1, 1, 1);
-    } else if (mfl->attr.vendor == FV_GD25QXXX) {
+    }
+    else if (mfl->attr.vendor == FV_GD25QXXX)
+    {
         return mf_get_param_int(mfl, quad_en_p, SFC_RDSR2, QUAD_EN_OFFSET_GIGABYTE, 1, 2, 1);
     }
     return MFE_NOT_SUPPORTED_OPERATION;
 }
 
-int mf_set_write_protect_direct_access(mflash *mfl, u_int8_t bank_num,
-                                       write_protect_info_t *protect_info)
+int mf_set_write_protect_direct_access(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info)
 {
     u_int32_t protect_mask = 0, log2_sect_num;
     u_int32_t sectors_num = protect_info->sectors_num;
@@ -3277,71 +3644,106 @@ int mf_set_write_protect_direct_access(mflash *mfl, u_int8_t bank_num,
     write_protect_info_t cur_protect_info;
     memset(&cur_protect_info, 0x0, sizeof(cur_protect_info));
 
-    //printf("-D- mf_set_write_protect: bank_num = %#x, subsec: %#x, bottom: %#x, sectors_num=%#x\n", bank_num,
+    // printf("-D- mf_set_write_protect: bank_num = %#x, subsec: %#x, bottom: %#x, sectors_num=%#x\n", bank_num,
     //       protect_info->is_subsector, protect_info->is_bottom, protect_info->sectors_num);
 
     WRITE_PROTECT_CHECKS(mfl, bank_num);
-    if (((protect_info->sectors_num - 1) & protect_info->sectors_num) != 0) {
+    if (((protect_info->sectors_num - 1) & protect_info->sectors_num) != 0)
+    {
         return MFE_SECTORS_NUM_NOT_POWER_OF_TWO;
     }
-    if (protect_info->sectors_num > MAX_SECTORS_NUM) {
+    if (protect_info->sectors_num > MAX_SECTORS_NUM)
+    {
         return MFE_EXCEED_SECTORS_MAX_NUM;
     }
-    if ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_128) || (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_128)) {
-        if (!protect_info->is_subsector && (protect_info->sectors_num == 1 || protect_info->sectors_num == 2)) {
+    if ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_128) ||
+        (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_128))
+    {
+        if (!protect_info->is_subsector && (protect_info->sectors_num == 1 || protect_info->sectors_num == 2))
+        {
             return MFE_SECTORS_NUM_MORE_THEN_0_LESS_THEN_4;
         }
     }
-    if (protect_info->is_subsector && !mfl->attr.protect_sub_and_sector) {
+    if (protect_info->is_subsector && !mfl->attr.protect_sub_and_sector)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
-    if (mfl->attr.protect_sub_and_sector && protect_info->is_subsector) {
-        if (protect_info->sectors_num > MAX_SUBSECTOR_NUM) {
+    if (mfl->attr.protect_sub_and_sector && protect_info->is_subsector)
+    {
+        if (protect_info->sectors_num > MAX_SUBSECTOR_NUM)
+        {
             return MFE_EXCEED_SUBSECTORS_MAX_NUM;
         }
     }
-    if (mfl->attr.vendor == FV_MX25K16XXX || mfl->attr.vendor == FV_IS25LPXXX) {
+    if (mfl->attr.vendor == FV_MX25K16XXX || mfl->attr.vendor == FV_IS25LPXXX)
+    {
         rc = mf_get_write_protect(mfl, bank_num, &cur_protect_info);
         CHECK_RC(rc);
-        if (cur_protect_info.is_bottom && !protect_info->is_bottom) {
-            if (protect_info->sectors_num) {
+        if (cur_protect_info.is_bottom && !protect_info->is_bottom)
+        {
+            if (protect_info->sectors_num)
+            {
                 return MFE_DATA_IS_OTP;
-            } else {
-                protect_info->is_bottom = cur_protect_info.is_bottom; // write protect is disabled, so we don't really care about top/bottom bit.
+            }
+            else
+            {
+                protect_info->is_bottom = cur_protect_info.is_bottom; // write protect is disabled, so we don't really
+                                                                      // care about top/bottom bit.
             }
         }
     }
 
-    for (log2_sect_num = 0; log2_sect_num < 8; log2_sect_num++) {
-        if (sectors_num == 0) {
+    for (log2_sect_num = 0; log2_sect_num < 8; log2_sect_num++)
+    {
+        if (sectors_num == 0)
+        {
             break;
         }
         sectors_num >>= 1;
     }
-    // adrianc: at this point log2_sect_num is actually  bigger by 1(if sectors_num!=0) to fit the BP bit values in the flash spec
+    // adrianc: at this point log2_sect_num is actually  bigger by 1(if sectors_num!=0) to fit the BP bit values in the
+    // flash spec
 
-    if (log2_sect_num != 0 && !protect_info->is_subsector && ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_128) || (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_128))) {
+    if (log2_sect_num != 0 && !protect_info->is_subsector &&
+        ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_128) ||
+         (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_128)))
+    {
         log2_sect_num -= 2; // spec alignment
     }
 
-    if (mfl->attr.vendor == FV_ST && mfl->attr.type == FMT_N25QXXX) {
+    if (mfl->attr.vendor == FV_ST && mfl->attr.type == FMT_N25QXXX)
+    {
         protect_mask = MERGE(protect_mask, log2_sect_num & 0x7, 0, BP_SIZE);
         protect_mask = MERGE(protect_mask, protect_info->is_bottom, BP_SIZE, 1);
         protect_mask = MERGE(protect_mask, (log2_sect_num & 0x8) >> 3, BP_SIZE + 1, 1);
         return mf_read_modify_status_winbond(mfl, bank_num, 1, protect_mask, BP_OFFSET, PROTECT_BITS_SIZE);
-    } else if (mfl->attr.vendor == FV_MX25K16XXX || mfl->attr.vendor == FV_IS25LPXXX || (mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_256) || (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_256)) {
-        if (mfl->attr.vendor == FV_MX25K16XXX) {
+    }
+    else if (mfl->attr.vendor == FV_MX25K16XXX || mfl->attr.vendor == FV_IS25LPXXX ||
+             (mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL &&
+              mfl->attr.log2_bank_size == FD_256) ||
+             (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_256))
+    {
+        if (mfl->attr.vendor == FV_MX25K16XXX)
+        {
             rc = mf_read_modify_status_winbond(mfl, bank_num, 0, protect_info->is_bottom, TB_OFFSET_MACRONIX, 1);
             CHECK_RC(rc);
-        } else if (mfl->attr.vendor == FV_IS25LPXXX) {
-            rc = mf_read_modify_status_new(mfl, bank_num, SFC_RDFR, SFC_WRFR, protect_info->is_bottom, TB_OFFSET_ISSI, 1, 1);
+        }
+        else if (mfl->attr.vendor == FV_IS25LPXXX)
+        {
+            rc = mf_read_modify_status_new(mfl, bank_num, SFC_RDFR, SFC_WRFR, protect_info->is_bottom, TB_OFFSET_ISSI,
+                                           1, 1);
             CHECK_RC(rc);
-        } else { // vendor == FV_S25FLXXXX or vendor == FV_WINBOND
-            rc = mf_read_modify_status_winbond(mfl, bank_num, 1, protect_info->is_bottom, TB_OFFSET_CYPRESS_WINBOND_256, 1);
+        }
+        else
+        { // vendor == FV_S25FLXXXX or vendor == FV_WINBOND
+            rc = mf_read_modify_status_winbond(mfl, bank_num, 1, protect_info->is_bottom, TB_OFFSET_CYPRESS_WINBOND_256,
+                                               1);
             CHECK_RC(rc);
         }
         return mf_read_modify_status_winbond(mfl, bank_num, 1, log2_sect_num, BP_OFFSET, 4);
-    } else {
+    }
+    else
+    {
         u_int8_t modify_size = 0;
 
         protect_mask = MERGE(protect_mask, log2_sect_num, 0, BP_SIZE);
@@ -3349,7 +3751,8 @@ int mf_set_write_protect_direct_access(mflash *mfl, u_int8_t bank_num,
 
         protect_mask = MERGE(protect_mask, protect_info->is_bottom, BP_SIZE, 1);
         modify_size += 1;
-        if (mfl->attr.protect_sub_and_sector) {
+        if (mfl->attr.protect_sub_and_sector)
+        {
             protect_mask = MERGE(protect_mask, protect_info->is_subsector, BP_SIZE + 1, 1);
             modify_size += 1;
         }
@@ -3357,8 +3760,7 @@ int mf_set_write_protect_direct_access(mflash *mfl, u_int8_t bank_num,
     }
 }
 
-int mf_get_write_protect_direct_access(mflash *mfl, u_int8_t bank_num,
-                                       write_protect_info_t *protect_info)
+int mf_get_write_protect_direct_access(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info)
 {
     int rc = 0;
     u_int8_t status = 0;
@@ -3369,63 +3771,84 @@ int mf_get_write_protect_direct_access(mflash *mfl, u_int8_t bank_num,
     rc = set_bank_int(mfl, bank_num);
     CHECK_RC(rc);
     protect_info->is_subsector = 0; // Defaultly no support for subsector protection
-    if (mfl->attr.vendor == FV_MX25K16XXX) {
+    if (mfl->attr.vendor == FV_MX25K16XXX)
+    {
         rc = mfl->f_spi_status(mfl, SFC_RDCR, &status);
         CHECK_RC(rc);
         protect_info->is_bottom = EXTRACT(status, TB_OFFSET_MACRONIX, 1);
-    } else if (mfl->attr.vendor == FV_IS25LPXXX) {
+    }
+    else if (mfl->attr.vendor == FV_IS25LPXXX)
+    {
         rc = mfl->f_spi_status(mfl, SFC_RDFR, &status);
         CHECK_RC(rc);
         protect_info->is_bottom = EXTRACT(status, TB_OFFSET_ISSI, 1);
-    } else {
-        if ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_256) || (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_256)) {
+    }
+    else
+    {
+        if ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL &&
+             mfl->attr.log2_bank_size == FD_256) ||
+            (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_256))
+        {
             tb_offset = TB_OFFSET_CYPRESS_WINBOND_256;
         }
         rc = mfl->f_spi_status(mfl, SFC_RDSR, &status);
         CHECK_RC(rc);
         protect_info->is_bottom = EXTRACT(status, tb_offset, 1);
-        if (mfl->attr.protect_sub_and_sector) {
+        if (mfl->attr.protect_sub_and_sector)
+        {
             protect_info->is_subsector = EXTRACT(status, SEC_OFFSET, 1);
-        } else {
+        }
+        else
+        {
             protect_info->is_subsector = 0;
         }
     }
     rc = mfl->f_spi_status(mfl, SFC_RDSR, &status);
     CHECK_RC(rc);
-    if (EXTRACT(status, BP_OFFSET, BP_SIZE) == 0) {
+    if (EXTRACT(status, BP_OFFSET, BP_SIZE) == 0)
+    {
         protect_info->sectors_num = 0;
-    } else {
+    }
+    else
+    {
         spec_alignment_factor =
-            ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_128) || (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_128)) && !protect_info->is_subsector ?
-            1 : -1;
+          ((mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL && mfl->attr.log2_bank_size == FD_128) ||
+           (mfl->attr.vendor == FV_WINBOND && mfl->attr.type == FMT_WINBOND_3V && mfl->attr.log2_bank_size == FD_128)) &&
+              !protect_info->is_subsector ?
+            1 :
+            -1;
         protect_info->sectors_num = 1 << (EXTRACT(status, BP_OFFSET, BP_SIZE) + spec_alignment_factor);
     }
 
     return MFE_OK;
 }
 
-int mf_is_fifth_gen(mflash *mfl)
+int mf_is_fifth_gen(mflash* mfl)
 {
     MfError status;
     int is7NmSuppported = 0;
     int icmdif_supported = is_icmdif_supported(mfl, &status, &is7NmSuppported);
-    if (status != MFE_OK) {
+    if (status != MFE_OK)
+    {
         return status;
     }
     return icmdif_supported;
 }
 
-int mf_enable_hw_access(mflash *mfl, u_int64_t key)
+int mf_enable_hw_access(mflash* mfl, u_int64_t key)
 {
 #ifndef UEFI_BUILD
     int rc = 0;
-    if (mf_is_fifth_gen(mfl)) {
+    if (mf_is_fifth_gen(mfl))
+    {
         return mf_secure_host_op(mfl, key, 0);
-    } else {
+    }
+    else
+    {
         rc = tcif_hw_access(mfl->mf, key, 0 /* Unlock */);
-        return (rc == ME_CMDIF_UNKN_TLV) ? MFE_MISMATCH_KEY : MError2MfError((MError) rc);
+        return (rc == ME_CMDIF_UNKN_TLV) ? MFE_MISMATCH_KEY : MError2MfError((MError)rc);
     }
-    #else
+#else
     (void)mfl;
     (void)key;
     return MFE_NOT_SUPPORTED_OPERATION;
@@ -3436,44 +3859,48 @@ int mf_enable_hw_access(mflash *mfl, u_int64_t key)
  * 0 - disable
  * 1 - enable
  */
-int mf_secure_host_op(mflash *mfl, u_int64_t key, int op)
+int mf_secure_host_op(mflash* mfl, u_int64_t key, int op)
 {
     struct tools_open_mlock mlock;
     memset(&mlock, 0, sizeof(mlock));
     mlock.operation = op;
     mlock.key = key;
     int rc = ME_OK;
-    if (IS_CONNECT_IB(mfl->attr.hw_dev_id)) {
+    if (IS_CONNECT_IB(mfl->attr.hw_dev_id))
+    {
         rc = ME_REG_ACCESS_REG_NOT_SUPP;
-    } else {
-        rc = (int) reg_access_secure_host(mfl->mf, REG_ACCESS_METHOD_SET, &mlock);
     }
-    switch (rc) {
-    case ME_REG_ACCESS_REG_NOT_SUPP:
-        rc = MFE_NOT_SUPPORTED_OPERATION;
-        break;
+    else
+    {
+        rc = (int)reg_access_secure_host(mfl->mf, REG_ACCESS_METHOD_SET, &mlock);
+    }
+    switch (rc)
+    {
+        case ME_REG_ACCESS_REG_NOT_SUPP:
+            rc = MFE_NOT_SUPPORTED_OPERATION;
+            break;
 
-    case ME_REG_ACCESS_BAD_PARAM:
-        rc = MFE_MISMATCH_KEY;
-        break;
+        case ME_REG_ACCESS_BAD_PARAM:
+            rc = MFE_MISMATCH_KEY;
+            break;
 
-    default:
-        rc = MError2MfError((MError) rc);
-        break;
+        default:
+            rc = MError2MfError((MError)rc);
+            break;
     }
     return rc;
 }
 
-int mf_get_secure_host(mflash *mfl, int *mode)
+int mf_get_secure_host(mflash* mfl, int* mode)
 {
     struct tools_open_mlock mlock;
     memset(&mlock, 0, sizeof(mlock));
-    int rc = (int) reg_access_secure_host(mfl->mf, REG_ACCESS_METHOD_GET, &mlock);
+    int rc = (int)reg_access_secure_host(mfl->mf, REG_ACCESS_METHOD_GET, &mlock);
     *mode = mlock.operation;
     return rc;
 }
 
-int mf_disable_hw_access(mflash *mfl)
+int mf_disable_hw_access(mflash* mfl)
 {
 #ifndef UEFI_BUILD
     int rc = 0;
@@ -3484,18 +3911,19 @@ int mf_disable_hw_access(mflash *mfl)
 
     rc = tcif_hw_access(mfl->mf, 0, 1 /* Lock */);
     // translate to operation specific errors
-    switch (rc) {
-    case ME_CMDIF_UNKN_TLV:
-        rc = MFE_MISMATCH_KEY;
-        break;
+    switch (rc)
+    {
+        case ME_CMDIF_UNKN_TLV:
+            rc = MFE_MISMATCH_KEY;
+            break;
 
-    case ME_CMDIF_BAD_OP:
-        rc = MFE_MISSING_KEY;
-        break;
+        case ME_CMDIF_BAD_OP:
+            rc = MFE_MISSING_KEY;
+            break;
 
-    default:
-        rc = MError2MfError((MError) rc);
-        break;
+        default:
+            rc = MError2MfError((MError)rc);
+            break;
     }
     return rc;
 #else
@@ -3504,43 +3932,43 @@ int mf_disable_hw_access(mflash *mfl)
 #endif
 }
 
-int mf_disable_hw_access_with_key(mflash *mfl, u_int64_t key)
+int mf_disable_hw_access_with_key(mflash* mfl, u_int64_t key)
 {
-
-    if (!mf_is_fifth_gen(mfl)) {
+    if (!mf_is_fifth_gen(mfl))
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
     return mf_secure_host_op(mfl, key, 1);
 }
 
-mfile* mf_get_mfile(mflash *mfl)
+mfile* mf_get_mfile(mflash* mfl)
 {
     return mfl->mf;
 }
 
-dm_dev_id_t mf_get_dm_dev_id(mflash *mfl)
+dm_dev_id_t mf_get_dm_dev_id(mflash* mfl)
 {
     return mfl->dm_dev_id;
 }
 
-int mf_get_jedec_id(mflash *mfl, u_int32_t *jedec_id)
+int mf_get_jedec_id(mflash* mfl, u_int32_t* jedec_id)
 {
     return mfl->f_get_jedec_id(mfl, jedec_id);
 }
 
-int mf_set_quad_en(mflash *mfl, u_int8_t quad_en)
+int mf_set_quad_en(mflash* mfl, u_int8_t quad_en)
 {
     return mfl->f_set_quad_en(mfl, quad_en);
 }
 
-int mf_get_quad_en(mflash *mfl, u_int8_t *quad_en)
+int mf_get_quad_en(mflash* mfl, u_int8_t* quad_en)
 {
     return mfl->f_get_quad_en(mfl, quad_en);
 }
 
-int mf_set_driver_strength(mflash *mfl, u_int8_t driver_strength)
+int mf_set_driver_strength(mflash* mfl, u_int8_t driver_strength)
 {
-    switch(driver_strength)
+    switch (driver_strength)
     {
         case 25:
             driver_strength = DRIVER_STRENGTH_VAL_25_WINBOND;
@@ -3560,10 +3988,10 @@ int mf_set_driver_strength(mflash *mfl, u_int8_t driver_strength)
     return mfl->f_set_driver_strength(mfl, driver_strength);
 }
 
-int mf_get_driver_strength(mflash *mfl, u_int8_t *driver_strength)
+int mf_get_driver_strength(mflash* mfl, u_int8_t* driver_strength)
 {
     int rc = mfl->f_get_driver_strength(mfl, driver_strength);
-    switch(*driver_strength)
+    switch (*driver_strength)
     {
         case DRIVER_STRENGTH_VAL_25_WINBOND:
             *driver_strength = 25;
@@ -3583,23 +4011,22 @@ int mf_get_driver_strength(mflash *mfl, u_int8_t *driver_strength)
     return rc;
 }
 
-int mf_set_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info)
+int mf_set_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info)
 {
     return mfl->f_set_write_protect(mfl, bank_num, protect_info);
 }
 
-int mf_get_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info)
+int mf_get_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info)
 {
     return mfl->f_get_write_protect(mfl, bank_num, protect_info);
 }
 
-int mf_set_dummy_cycles(mflash *mfl, u_int8_t num_of_cycles)
+int mf_set_dummy_cycles(mflash* mfl, u_int8_t num_of_cycles)
 {
     return mfl->f_set_dummy_cycles(mfl, num_of_cycles);
 }
 
-int mf_get_dummy_cycles(mflash *mfl, u_int8_t *num_of_cycles)
+int mf_get_dummy_cycles(mflash* mfl, u_int8_t* num_of_cycles)
 {
     return mfl->f_get_dummy_cycles(mfl, num_of_cycles);
 }
-
diff --git a/mflash/mflash.h b/mflash/mflash.h
index cf94dec7..d86457ce 100644
--- a/mflash/mflash.h
+++ b/mflash/mflash.h
@@ -49,7 +49,7 @@
 #include "mflash_common_structs.h"
 
 #include <mlxfwops/uefi_c/mft_uefi_common.h>
- // Timer definitions (needed when polling flash semaphore in windows)
+// Timer definitions (needed when polling flash semaphore in windows)
 #ifndef __WIN__
 #define TIMER_INIT(...)
 #define TIMER_STOP(...)
@@ -60,41 +60,42 @@
 #define TIMER_CHECK(...)
 #else
 #include <windows.h>
-#define TIMER_INIT() \
-    SYSTEMTIME _start, _end; \
+#define TIMER_INIT()               \
+    SYSTEMTIME _start, _end;       \
     int _diff_in_sec, _diff_in_ms; \
-    (void)_diff_in_sec; \
+    (void)_diff_in_sec;            \
     (void)_diff_in_ms
-#define TIMER_START() \
-    GetSystemTime(&_start)
-#define TIMER_STOP() \
-    GetSystemTime(&_end)
-#define TIMER_PRINT(...) \
-    _diff_in_sec = _end.wSecond - _start.wSecond; \
+#define TIMER_START() GetSystemTime(&_start)
+#define TIMER_STOP() GetSystemTime(&_end)
+#define TIMER_PRINT(...)                                      \
+    _diff_in_sec = _end.wSecond - _start.wSecond;             \
     _diff_in_ms = (_end.wMilliseconds - _start.wMilliseconds; \
                    printf(__VA_ARGS__); \
                    printf("it took %d sec %d and ms to run.\n", _diff_in_sec, _diff_in_ms)
-#define TIMER_GET_DIFF(diff_in_sec, diff_in_ms) \
+#define TIMER_GET_DIFF(diff_in_sec, diff_in_ms)  \
     diff_in_sec = _end.wSecond - _start.wSecond; \
     diff_in_ms = _end.wMilliseconds - _start.wMilliseconds
 #define TIMER_INIT_AND_START() \
-    TIMER_INIT(); \
+    TIMER_INIT();              \
     TIMER_START()
 #define TIMER_STOP_GET_DIFF(diff_in_sec, diff_in_ms) \
-    TIMER_STOP(); \
+    TIMER_STOP();                                    \
     TIMER_GET_DIFF(diff_in_sec, diff_in_ms)
-#define TIMER_CHECK(max_sec, max_ms, action_on_tout) \
-    TIMER_STOP(); \
-    _diff_in_sec = _end.wSecond - _start.wSecond; \
+#define TIMER_CHECK(max_sec, max_ms, action_on_tout)         \
+    TIMER_STOP();                                            \
+    _diff_in_sec = _end.wSecond - _start.wSecond;            \
     _diff_in_ms = _end.wMilliseconds - _start.wMilliseconds; \
-    if (_diff_in_sec >= max_sec && _diff_in_ms > max_ms) { \
-        action_on_tout; \
+    if (_diff_in_sec >= max_sec && _diff_in_ms > max_ms)     \
+    {                                                        \
+        action_on_tout;                                      \
     }
 #endif
 
 #ifdef __cplusplus
-#define EXTERN_C_START extern "C" {
-#define EXTERN_C_END   }
+#define EXTERN_C_START \
+    extern "C"         \
+    {
+#define EXTERN_C_END }
 #else
 #define EXTERN_C_START
 #define EXTERN_C_END
@@ -103,14 +104,24 @@
 EXTERN_C_START
 
 #ifndef UEFI_BUILD
-#define FLASH_ACCESS_DPRINTF(args)        do { char *reacDebug = getenv("FLASH_ACCESS_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("[FLASH_ACCESS_DEBUG]: -D- "); printf args; fflush(stdout);} } while (0)
+#define FLASH_ACCESS_DPRINTF(args)                      \
+    do                                                  \
+    {                                                   \
+        char* reacDebug = getenv("FLASH_ACCESS_DEBUG"); \
+        if (reacDebug != NULL)                          \
+        {                                               \
+            printf("\33[2K\r");                         \
+            printf("[FLASH_ACCESS_DEBUG]: -D- ");       \
+            printf args;                                \
+            fflush(stdout);                             \
+        }                                               \
+    } while (0)
 #else
 #define FLASH_ACCESS_DPRINTF(...)
 #endif
 
-typedef struct gpio_toggle_conf_cx6 {
+typedef struct gpio_toggle_conf_cx6
+{
     u_int32_t lock_addr;
     u_int32_t lock_val;
     u_int32_t functional_enable0_addr;
@@ -120,7 +131,8 @@ typedef struct gpio_toggle_conf_cx6 {
     u_int32_t dataset_addr;
 } gpio_toggle_conf_cx6;
 
-typedef struct gpio_toggle_conf_cx7 {
+typedef struct gpio_toggle_conf_cx7
+{
     u_int32_t select_synced_data_out_addr;
     u_int32_t fw_control_set_addr;
     u_int32_t hw_data_in_addr;
@@ -128,11 +140,12 @@ typedef struct gpio_toggle_conf_cx7 {
     u_int32_t fw_data_out_set_addr;
 } gpio_toggle_conf_cx7;
 
-typedef enum MfCommandSet {
-    CS_INTEL   = 1,
-    CS_AMD     = 2,
+typedef enum MfCommandSet
+{
+    CS_INTEL = 1,
+    CS_AMD = 2,
 
-    MCS_STSPI  = 0x80,  // This is not a "real" CFI command set - it's used as a "Meta" command set number.
+    MCS_STSPI = 0x80, // This is not a "real" CFI command set - it's used as a "Meta" command set number.
     MCS_SSTSPI = 0x81
 } MfCommandSet;
 
@@ -147,7 +160,6 @@ typedef enum MfCommandSet {
 
 struct mfile_t;
 
-
 //
 // open/close functions:
 // This lib is used pretty much like a C file: open it, use and close when done.
@@ -168,93 +180,95 @@ struct mfile_t;
 // mf_close() : Deallocates mflash resources.
 //   Note: User should call mf_close() even if mf_open failed (and the returning mfl is not NULL)
 //
-int     mf_open(mflash **pmfl, const char *dev, int num_of_banks, flash_params_t *flash_params,
-                int ignore_cache_rep_guard);
-//int     mf_opend(mflash **pmfl, struct mfile_t *mf, int num_of_banks,  flash_params_t *flash_params,
-  //               int ignore_cache_rep_guard);
-int     mf_open_adv(mflash **pmfl, const char *dev, int num_of_banks, flash_params_t *flash_params,
-                    int ignore_cache_rep_guard, int cx3_fw_access);
+int mf_open(mflash** pmfl, const char* dev, int num_of_banks, flash_params_t* flash_params, int ignore_cache_rep_guard);
+// int     mf_opend(mflash **pmfl, struct mfile_t *mf, int num_of_banks,  flash_params_t *flash_params,
+//               int ignore_cache_rep_guard);
+int mf_open_adv(mflash** pmfl,
+                const char* dev,
+                int num_of_banks,
+                flash_params_t* flash_params,
+                int ignore_cache_rep_guard,
+                int cx3_fw_access);
 
-int     mf_open_uefi(mflash **pmfl, uefi_Dev_t *uefi_dev, uefi_dev_extra_t *dev_extra);
+int mf_open_uefi(mflash** pmfl, uefi_Dev_t* uefi_dev, uefi_dev_extra_t* dev_extra);
 
-int     mf_open_ignore_lock(mflash *mfl);
-void     mf_close(mflash *mfl);
+int mf_open_ignore_lock(mflash* mfl);
+void mf_close(mflash* mfl);
 
 //
 // Flash access functions:
 // The data buffer should be pre-allocated by caller. The rest is quite self explanatory. .
 //
-int     mf_read(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool verbose);
-int     mf_write(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data);
-void    mf_set_cpu_utilization(mflash *mfl, int cpuPercent);
+int mf_read(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data, bool verbose);
+int mf_write(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data);
+void mf_set_cpu_utilization(mflash* mfl, int cpuPercent);
 // mf_erase performs an erase on the smallest block
-int     mf_erase(mflash *mfl, u_int32_t addr);
+int mf_erase(mflash* mfl, u_int32_t addr);
 // adv erasing
-int     mf_erase_64k_sector(mflash *mfl, u_int32_t addr);
-int     mf_erase_4k_sector(mflash *mfl, u_int32_t addr);
+int mf_erase_64k_sector(mflash* mfl, u_int32_t addr);
+int mf_erase_4k_sector(mflash* mfl, u_int32_t addr);
 
 // swap between erasing 4KB or 64KB chunks (performance optimization)
 
-
 //
 // Crspace access through mflash:
 //
-int     mf_cr_read(mflash *mfl, u_int32_t cr_addr, u_int32_t *data);
-int     mf_cr_write(mflash *mfl, u_int32_t cr_addr, u_int32_t data);
+int mf_cr_read(mflash* mfl, u_int32_t cr_addr, u_int32_t* data);
+int mf_cr_write(mflash* mfl, u_int32_t cr_addr, u_int32_t data);
 
-int     mf_update_boot_addr(mflash *mfl, u_int32_t boot_addr);
+int mf_update_boot_addr(mflash* mfl, u_int32_t boot_addr);
 
 //
 // mf_get_attr(): Returns the flash_attr struct
 //
-int     mf_get_attr(mflash *mfl, flash_attr *attr);
+int mf_get_attr(mflash* mfl, flash_attr* attr);
 
-int     mf_get_jedec_id(mflash *mfl, u_int32_t *jedec_id);
+int mf_get_jedec_id(mflash* mfl, u_int32_t* jedec_id);
 
-int     mf_set_quad_en(mflash *mfl, u_int8_t quad_en);
-int     mf_get_quad_en(mflash *mfl, u_int8_t *quad_en);
+int mf_set_quad_en(mflash* mfl, u_int8_t quad_en);
+int mf_get_quad_en(mflash* mfl, u_int8_t* quad_en);
 
-int     mf_set_driver_strength(mflash *mfl, u_int8_t driver_strength);
-int     mf_get_driver_strength(mflash *mfl, u_int8_t *driver_strength);
+int mf_set_driver_strength(mflash* mfl, u_int8_t driver_strength);
+int mf_get_driver_strength(mflash* mfl, u_int8_t* driver_strength);
 
-int     mf_set_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-int     mf_get_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
+int mf_set_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+int mf_get_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
 
-int     mf_set_dummy_cycles(mflash *mfl, u_int8_t num_of_cycles);
-int     mf_get_dummy_cycles(mflash *mfl, u_int8_t *num_of_cycles);
+int mf_set_dummy_cycles(mflash* mfl, u_int8_t num_of_cycles);
+int mf_get_dummy_cycles(mflash* mfl, u_int8_t* num_of_cycles);
 
 //
 // Set/Get for some options.
 //
-int     mf_set_opt(mflash *mfl, MfOpt opt, int val);
-int     mf_get_opt(mflash *mfl, MfOpt opt, int *val);
+int mf_set_opt(mflash* mfl, MfOpt opt, int val);
+int mf_get_opt(mflash* mfl, MfOpt opt, int* val);
 
-int     mf_is_fifth_gen(mflash *mfl);
+int mf_is_fifth_gen(mflash* mfl);
 
-int     mf_enable_hw_access(mflash *mfl, u_int64_t key);
-int     mf_disable_hw_access_with_key(mflash *mfl, u_int64_t key);
-int     mf_disable_hw_access(mflash *mfl);
-int     mf_release_semaphore(mflash *mfl);
+int mf_enable_hw_access(mflash* mfl, u_int64_t key);
+int mf_disable_hw_access_with_key(mflash* mfl, u_int64_t key);
+int mf_disable_hw_access(mflash* mfl);
+int mf_release_semaphore(mflash* mfl);
 
 // get mfile object
-mfile* mf_get_mfile(mflash *mfl);
+mfile* mf_get_mfile(mflash* mfl);
 
-dm_dev_id_t mf_get_dm_dev_id(mflash *mfl);
+dm_dev_id_t mf_get_dm_dev_id(mflash* mfl);
 
 //
 // err code to string translation for printing.
 //
 const char* mf_err2str(int err_code);
 
-void mf_flash_list(char *flash_list, int flash_arr_size);
-int mf_get_write_protect_direct_access(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-int mf_set_write_protect_direct_access(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-int mf_get_quad_en_direct_access(mflash *mfl, u_int8_t *quad_en_p);
-int mf_set_quad_en_direct_access(mflash *mfl, u_int8_t quad_en);
-int mf_get_driver_strength_direct_access(mflash *mfl, u_int8_t *driver_strength_p);
-int mf_set_driver_strength_direct_access(mflash *mfl, u_int8_t driver_strength);
-int mf_get_dummy_cycles_direct_access(mflash *mfl, u_int8_t *dummy_cycles_p);
-int mf_set_dummy_cycles_direct_access(mflash *mfl, u_int8_t num_of_cycles);
+void mf_flash_list(char* flash_list, int flash_arr_size);
+int mf_get_write_protect_direct_access(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+int mf_set_write_protect_direct_access(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+int mf_get_quad_en_direct_access(mflash* mfl, u_int8_t* quad_en_p);
+int mf_set_quad_en_direct_access(mflash* mfl, u_int8_t quad_en);
+int mf_get_driver_strength_direct_access(mflash* mfl, u_int8_t* driver_strength_p);
+int mf_set_driver_strength_direct_access(mflash* mfl, u_int8_t driver_strength);
+int mf_get_dummy_cycles_direct_access(mflash* mfl, u_int8_t* dummy_cycles_p);
+int mf_set_dummy_cycles_direct_access(mflash* mfl, u_int8_t num_of_cycles);
 EXTERN_C_END
 
 #endif // MFLASH_H
diff --git a/mflash/mflash_access_layer.c b/mflash/mflash_access_layer.c
index c730b603..cc8b2ffa 100644
--- a/mflash/mflash_access_layer.c
+++ b/mflash/mflash_access_layer.c
@@ -35,7 +35,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
 #include <mtcr.h>
 #include <reg_access.h>
 
@@ -46,39 +45,44 @@
 extern flash_info_t g_flash_info_arr[];
 
 #define CX3_PRO_HW_ID 0x1F7
-#define CX3_HW_ID     0x1F5
-#define HAS_TOOLS_CMDIF(dev_id) \
-    ((((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID)))
+#define CX3_HW_ID 0x1F5
+#define HAS_TOOLS_CMDIF(dev_id) ((((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID)))
 
 // On windows we don't support cmdIf access!
-int check_access_type(mflash *mfl)
-//TODO: re-write in a more elegant way.
+int check_access_type(mflash* mfl)
+// TODO: re-write in a more elegant way.
 {
-    if (mfl->access_type == MFAT_MFILE) {
-        switch (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE]) {
-        case ATBM_INBAND:
+    if (mfl->access_type == MFAT_MFILE)
+    {
+        switch (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE])
+        {
+            case ATBM_INBAND:
 #ifdef NO_INBAND_ACCESS
-            return MFE_NOT_SUPPORTED_OPERATION;
+                return MFE_NOT_SUPPORTED_OPERATION;
 
 #endif
 #ifndef _WIN_
-        case ATBM_MLNXOS_CMDIF:
+            case ATBM_MLNXOS_CMDIF:
 #endif
-        case ATBM_ICMD:
-        case ATBM_TOOLS_CMDIF:
-            break;
+            case ATBM_ICMD:
+            case ATBM_TOOLS_CMDIF:
+                break;
 
-        default:
-            return MFE_UNKOWN_ACCESS_TYPE;
+            default:
+                return MFE_UNKOWN_ACCESS_TYPE;
         }
-    } else if (mfl->access_type == MFAT_UEFI) {
-    } else {
+    }
+    else if (mfl->access_type == MFAT_UEFI)
+    {
+    }
+    else
+    {
         return MFE_UNKOWN_ACCESS_TYPE;
     }
     return MFE_OK;
 }
 
-int sx_get_flash_info_by_type(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8_t *no_flash)
+int sx_get_flash_info_by_type(mflash* mfl, flash_info_t* f_info, int* log2size, u_int8_t* no_flash)
 {
     int rc = 0;
     u_int8_t vendor = 0, type = 0, density = 0;
@@ -92,11 +96,12 @@ int sx_get_flash_info_by_type(mflash *mfl, flash_info_t *f_info, int *log2size,
     CHECK_RC(rc);
     rc = com_get_jedec(mfl->mf, &mfpa_args);
     CHECK_RC(rc);
-    //printf("-D- jedec_id = %#x\n", jedec_id);
+    // printf("-D- jedec_id = %#x\n", jedec_id);
     rc = get_info_from_jededc_id(mfpa_args.jedec_id, &vendor, &type, &density);
     CHECK_RC(rc);
     // Return there is no flash when all the params are 0xff
-    if (vendor == 0xff && type == 0xff && density == 0xff) {
+    if (vendor == 0xff && type == 0xff && density == 0xff)
+    {
         *no_flash = 1;
         return MFE_OK;
     }
@@ -114,18 +119,20 @@ int sx_get_flash_info_by_type(mflash *mfl, flash_info_t *f_info, int *log2size,
     f_info->quad_en_support = mfpa_args.supp_quad_en;
 
     // HACK: Use fw_sector size as the sector size only in CX3 family devices for now
-    if (HAS_TOOLS_CMDIF(mfl->attr.hw_dev_id)) {
+    if (HAS_TOOLS_CMDIF(mfl->attr.hw_dev_id))
+    {
         f_info->sector_size = mfpa_args.fw_flash_sector_sz ? mfpa_args.fw_flash_sector_sz : f_info->sector_size;
     }
     return MFE_OK;
 }
 
-int sx_block_read_by_type(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data)
+int sx_block_read_by_type(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data)
 {
     int rc = 0, bank = 0;
     u_int32_t flash_offset = 0;
 
-    if (blk_size > (u_int32_t) mfl->attr.block_write || blk_size < 4) {
+    if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4)
+    {
         return MFE_BAD_PARAMS;
     }
     rc = mfl_get_bank_info(mfl, blk_addr, &flash_offset, &bank);
@@ -140,7 +147,7 @@ int sx_block_read_by_type(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u
     return MFE_OK;
 }
 
-int sx_block_write_by_type(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data)
+int sx_block_write_by_type(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t* data)
 {
     int rc = 0, bank = 0;
     u_int32_t flash_offset = 0;
@@ -158,19 +165,23 @@ int sx_block_write_by_type(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t
     return MFE_OK;
 }
 
-
-static int lock_flash_programing_sem(mflash *mfl)
+static int lock_flash_programing_sem(mflash* mfl)
 {
 #ifndef UEFI_BUILD
     int rc = 0;
-    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD || mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_INBAND) {
+    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD || mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_INBAND)
+    {
         rc = trm_lock(mfl->trm, TRM_RES_FLASH_PROGRAMING, MAX_FLASH_PROG_SEM_RETRY_CNT);
-        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED) {
+        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED)
+        {
             return MFE_SEM_LOCKED;
         }
-    } else if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_TOOLS_CMDIF) {
+    }
+    else if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_TOOLS_CMDIF)
+    {
         rc = trm_lock(mfl->trm, TRM_RES_HCR_FLASH_PROGRAMING, MAX_FLASH_PROG_SEM_RETRY_CNT);
-        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED) {
+        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED)
+        {
             return MFE_SEM_LOCKED;
         }
     }
@@ -178,18 +189,23 @@ static int lock_flash_programing_sem(mflash *mfl)
     return MFE_OK;
 }
 
-static int unlock_flash_programing_sem(mflash *mfl)
+static int unlock_flash_programing_sem(mflash* mfl)
 {
 #ifndef UEFI_BUILD
     int rc = 0;
-    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD || mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_INBAND) {
+    if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_ICMD || mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_INBAND)
+    {
         rc = trm_unlock(mfl->trm, TRM_RES_FLASH_PROGRAMING);
-        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED) {
+        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED)
+        {
             return MFE_SEM_LOCKED;
         }
-    } else if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_TOOLS_CMDIF) {
+    }
+    else if (mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_TOOLS_CMDIF)
+    {
         rc = trm_unlock(mfl->trm, TRM_RES_HCR_FLASH_PROGRAMING);
-        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED) {
+        if (rc && rc != TRM_STS_RES_NOT_SUPPORTED)
+        {
             return MFE_SEM_LOCKED;
         }
     }
@@ -197,22 +213,26 @@ static int unlock_flash_programing_sem(mflash *mfl)
     return MFE_OK;
 }
 
-int sx_flash_lock_by_type(mflash *mfl, int lock_state)
+int sx_flash_lock_by_type(mflash* mfl, int lock_state)
 {
     // burning through some FW interface , lock flash programing semaphore if possible
     int rc = 0;
-    if (lock_state) {
+    if (lock_state)
+    {
         rc = lock_flash_programing_sem(mfl);
-    } else {
+    }
+    else
+    {
         rc = unlock_flash_programing_sem(mfl);
     }
-    if (rc == MFE_OK) {
+    if (rc == MFE_OK)
+    {
         mfl->is_locked = (lock_state != 0);
     }
     return rc;
 }
 
-int sx_erase_sect_by_type(mflash *mfl, u_int32_t addr, u_int32_t erase_size)
+int sx_erase_sect_by_type(mflash* mfl, u_int32_t addr, u_int32_t erase_size)
 {
     int rc = 0, bank = 0;
     u_int32_t flash_addr = 0;
@@ -226,10 +246,11 @@ int sx_erase_sect_by_type(mflash *mfl, u_int32_t addr, u_int32_t erase_size)
     return MFE_OK;
 }
 
-int mf_update_boot_addr_by_type(mflash *mfl, u_int32_t boot_addr)
+int mf_update_boot_addr_by_type(mflash* mfl, u_int32_t boot_addr)
 {
     int rc = 0;
-    if (mfl->access_type == MFAT_UEFI || mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_MLNXOS_CMDIF) {
+    if (mfl->access_type == MFAT_UEFI || mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] == ATBM_MLNXOS_CMDIF)
+    {
         // No CR-Space access - use mfpa register
         mfpa_command_args mfpa_args;
         memset(&mfpa_args, 0, sizeof(mfpa_args));
@@ -241,35 +262,40 @@ int mf_update_boot_addr_by_type(mflash *mfl, u_int32_t boot_addr)
     return MFE_OK;
 }
 
-int sx_set_driver_strength(mflash *mfl, u_int8_t driver_strength) {
+int sx_set_driver_strength(mflash* mfl, u_int8_t driver_strength)
+{
     // driver-strength configuration isn't supported by FW (MFMC register)
-    (void) mfl;
-    (void) driver_strength;
+    (void)mfl;
+    (void)driver_strength;
     return MFE_REG_ACCESS_METHOD_NOT_SUPP;
 }
 
-int sx_get_driver_strength(mflash *mfl, u_int8_t *driver_strength) {
+int sx_get_driver_strength(mflash* mfl, u_int8_t* driver_strength)
+{
     // driver-strength configuration isn't supported by FW (MFMC register)
-    (void) mfl;
-    (void) driver_strength;
+    (void)mfl;
+    (void)driver_strength;
     return MFE_REG_ACCESS_METHOD_NOT_SUPP;
 }
 
-int sx_set_quad_en(mflash *mfl, u_int8_t quad_en)
+int sx_set_quad_en(mflash* mfl, u_int8_t quad_en)
 {
     int bank = 0;
     int rc = 0;
     struct tools_open_mfmc mfmc;
 
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
 
-    if (!mfl->attr.quad_en_support) {
+    if (!mfl->attr.quad_en_support)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
         rc = set_bank_int(mfl, bank);
         CHECK_RC(rc);
         memset(&mfmc, 0, sizeof(mfmc));
@@ -283,33 +309,40 @@ int sx_set_quad_en(mflash *mfl, u_int8_t quad_en)
     return MFE_OK;
 }
 
-int sx_get_quad_en(mflash *mfl, u_int8_t *quad_en)
+int sx_get_quad_en(mflash* mfl, u_int8_t* quad_en)
 {
     int bank = 0;
     int rc = MFE_OK;
     struct tools_open_mfmc mfmc;
     int is_first_val = 1;
 
-    if (!mfl || !quad_en) {
+    if (!mfl || !quad_en)
+    {
         return MFE_BAD_PARAMS;
     }
 
-    if (!mfl->attr.quad_en_support) {
+    if (!mfl->attr.quad_en_support)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
         rc = set_bank_int(mfl, bank);
         CHECK_RC(rc);
         memset(&mfmc, 0, sizeof(mfmc));
         mfmc.fs = bank;
         rc = MError2MfError(reg_access_mfmc(mfl->mf, REG_ACCESS_METHOD_GET, &mfmc));
         CHECK_RC(rc);
-        if (is_first_val) {
+        if (is_first_val)
+        {
             *quad_en = mfmc.quad_en;
             is_first_val = 0;
-        } else {
-            if (mfmc.quad_en != *quad_en) {
+        }
+        else
+        {
+            if (mfmc.quad_en != *quad_en)
+            {
                 rc = MFE_MISMATCH_PARAM;
                 break;
             }
@@ -318,36 +351,43 @@ int sx_get_quad_en(mflash *mfl, u_int8_t *quad_en)
     return rc;
 }
 
-int sx_set_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info)
+int sx_set_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info)
 {
     u_int8_t log2_sect_num = 0;
     u_int8_t sectors_num = 0;
     struct tools_open_mfmc mfmc;
     int rc = 0;
 
-    if (!mfl || !protect_info) {
+    if (!mfl || !protect_info)
+    {
         return MFE_BAD_PARAMS;
     }
 
     sectors_num = protect_info->sectors_num;
     WRITE_PROTECT_CHECKS(mfl, bank_num);
-    if (((protect_info->sectors_num - 1) & protect_info->sectors_num) != 0) {
+    if (((protect_info->sectors_num - 1) & protect_info->sectors_num) != 0)
+    {
         return MFE_SECTORS_NUM_NOT_POWER_OF_TWO;
     }
-    if (protect_info->sectors_num > MAX_SECTORS_NUM) {
+    if (protect_info->sectors_num > MAX_SECTORS_NUM)
+    {
         return MFE_EXCEED_SECTORS_MAX_NUM;
     }
 
-    if (protect_info->is_subsector && !mfl->attr.protect_sub_and_sector) {
+    if (protect_info->is_subsector && !mfl->attr.protect_sub_and_sector)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
-    if (protect_info->is_bottom) {
+    if (protect_info->is_bottom)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
-    if (mfl->attr.protect_sub_and_sector && protect_info->is_subsector) {
-        if (protect_info->sectors_num > MAX_SUBSECTOR_NUM) {
+    if (mfl->attr.protect_sub_and_sector && protect_info->is_subsector)
+    {
+        if (protect_info->sectors_num > MAX_SUBSECTOR_NUM)
+        {
             return MFE_EXCEED_SUBSECTORS_MAX_NUM;
         }
     }
@@ -355,9 +395,11 @@ int sx_set_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *p
     rc = set_bank_int(mfl, bank_num);
     CHECK_RC(rc);
 
-    for (log2_sect_num = 0; log2_sect_num < 8; log2_sect_num++) {
+    for (log2_sect_num = 0; log2_sect_num < 8; log2_sect_num++)
+    {
         sectors_num >>= 1;
-        if (sectors_num == 0) {
+        if (sectors_num == 0)
+        {
             break;
         }
     }
@@ -367,24 +409,26 @@ int sx_set_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *p
     CHECK_RC(rc);
     mfmc.fs = bank_num;
     mfmc.wrp_en = protect_info->sectors_num != 0;
-    if (mfmc.wrp_en) {
+    if (mfmc.wrp_en)
+    {
         mfmc.block_size = protect_info->is_subsector ? 0 : 1;
         mfmc.wrp_block_count = log2_sect_num;
     }
     rc = MError2MfError(reg_access_mfmc(mfl->mf, REG_ACCESS_METHOD_SET, &mfmc));
     CHECK_RC(rc);
 
-    //printf("-D- mf_set_write_protect: bank_num = %#x, subsec: %#x, bottom: %#x, sectors_num=%#x\n", bank_num,
+    // printf("-D- mf_set_write_protect: bank_num = %#x, subsec: %#x, bottom: %#x, sectors_num=%#x\n", bank_num,
     //       protect_info->is_subsector, protect_info->is_bottom, protect_info->sectors_num);
     return MFE_OK;
 }
 
-int sx_get_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info)
+int sx_get_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info)
 {
     int rc = 0;
     struct tools_open_mfmc mfmc;
 
-    if (!mfl || !protect_info) {
+    if (!mfl || !protect_info)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -403,21 +447,24 @@ int sx_get_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *p
     return MFE_OK;
 }
 
-int sx_set_dummy_cycles(mflash *mfl, u_int8_t num_of_cycles)
+int sx_set_dummy_cycles(mflash* mfl, u_int8_t num_of_cycles)
 {
     int bank = 0;
     int rc = 0;
     struct tools_open_mfmc mfmc;
 
-    if (!mfl || num_of_cycles < 1 || num_of_cycles > 15) {
+    if (!mfl || num_of_cycles < 1 || num_of_cycles > 15)
+    {
         return MFE_BAD_PARAMS;
     }
 
-    if (!mfl->attr.dummy_cycles_support) {
+    if (!mfl->attr.dummy_cycles_support)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
         rc = set_bank_int(mfl, bank);
         CHECK_RC(rc);
         memset(&mfmc, 0, sizeof(mfmc));
@@ -430,33 +477,40 @@ int sx_set_dummy_cycles(mflash *mfl, u_int8_t num_of_cycles)
     }
     return MFE_OK;
 }
-int sx_get_dummy_cycles(mflash *mfl, u_int8_t *num_of_cycles)
+int sx_get_dummy_cycles(mflash* mfl, u_int8_t* num_of_cycles)
 {
     int bank = 0;
     int rc = MFE_OK;
     struct tools_open_mfmc mfmc;
     int is_first_val = 1;
 
-    if (!mfl || !num_of_cycles) {
+    if (!mfl || !num_of_cycles)
+    {
         return MFE_BAD_PARAMS;
     }
 
-    if (!mfl->attr.dummy_cycles_support) {
+    if (!mfl->attr.dummy_cycles_support)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
 
-    for (bank = 0; bank < mfl->attr.banks_num; bank++) {
+    for (bank = 0; bank < mfl->attr.banks_num; bank++)
+    {
         rc = set_bank_int(mfl, bank);
         CHECK_RC(rc);
         memset(&mfmc, 0, sizeof(mfmc));
         mfmc.fs = bank;
         rc = MError2MfError(reg_access_mfmc(mfl->mf, REG_ACCESS_METHOD_GET, &mfmc));
         CHECK_RC(rc);
-        if (is_first_val) {
+        if (is_first_val)
+        {
             *num_of_cycles = mfmc.dummy_clock_cycles;
             is_first_val = 0;
-        } else {
-            if (mfmc.dummy_clock_cycles != *num_of_cycles) {
+        }
+        else
+        {
+            if (mfmc.dummy_clock_cycles != *num_of_cycles)
+            {
                 rc = MFE_MISMATCH_PARAM;
                 break;
             }
diff --git a/mflash/mflash_access_layer.h b/mflash/mflash_access_layer.h
index 2cc4ff2b..fa7c0c52 100644
--- a/mflash/mflash_access_layer.h
+++ b/mflash/mflash_access_layer.h
@@ -41,28 +41,48 @@
 #ifndef MFLASH_ACCESS_LAYER_H_
 #define MFLASH_ACCESS_LAYER_H_
 
-
 #include <compatibility.h>
 
 #include "mflash_common_structs.h"
 #define MAX_FLASH_PROG_SEM_RETRY_CNT 40
 
 #ifdef ESS
-#define MREAD4(offs, val)  do {*val = READ_WORD(offs);} while (0)
-#define MWRITE4(offs, val) do {WRITE_WORD(offs, val);} while (0)
+#define MREAD4(offs, val)       \
+    do                          \
+    {                           \
+        *val = READ_WORD(offs); \
+    } while (0)
+#define MWRITE4(offs, val)     \
+    do                         \
+    {                          \
+        WRITE_WORD(offs, val); \
+    } while (0)
 #else
-#define MREAD4(offs, val)  do { if (mread4(mfl->mf, offs, val) != 4) { \
-/*fprintf(stderr, "-E- Cr read (0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), strerror(errno), (u_int32_t)errno);*/ \
-                                    return 2; } /*printf("-D- %s:%d mread4: offs = %#x, val = %#x\n", __FUNCTION__, __LINE__, offs, val);*/ \
-} while (0)
-
-#define MWRITE4(offs, val) do { if (mwrite4(mfl->mf, offs, val) != 4) { \
-/*fprintf(stderr, "-E- Cr write (0x%08x, 0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), (u_int32_t)(val), strerror(errno), (u_int32_t)errno);*/ \
-                                    return 2; } /*printf("-D- %s:%d mwrite4: offs = %#x, val = %#x\n",   __FUNCTION__, __LINE__, offs, val);*/ \
-} while (0)
+#define MREAD4(offs, val)                                                                                  \
+    do                                                                                                     \
+    {                                                                                                      \
+        if (mread4(mfl->mf, offs, val) != 4)                                                               \
+        {                                                                                                  \
+            /*fprintf(stderr, "-E- Cr read (0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), strerror(errno), \
+             * (u_int32_t)errno);*/                                                                        \
+            return 2;                                                                                      \
+        } /*printf("-D- %s:%d mread4: offs = %#x, val = %#x\n", __FUNCTION__, __LINE__, offs, val);*/      \
+    } while (0)
+
+#define MWRITE4(offs, val)                                                                                           \
+    do                                                                                                               \
+    {                                                                                                                \
+        if (mwrite4(mfl->mf, offs, val) != 4)                                                                        \
+        {                                                                                                            \
+            /*fprintf(stderr, "-E- Cr write (0x%08x, 0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), (u_int32_t)(val), \
+             * strerror(errno), (u_int32_t)errno);*/                                                                 \
+            return 2;                                                                                                \
+        } /*printf("-D- %s:%d mwrite4: offs = %#x, val = %#x\n",   __FUNCTION__, __LINE__, offs, val);*/             \
+    } while (0)
 #endif
 
-enum FlashConstant {
+enum FlashConstant
+{
     // All time values are in usecs
     WRITE_BLOCK_INIT_DELAY = 10,
     WRITE_ADDITIONAL_BYTE_DELAY = 1,
@@ -73,9 +93,9 @@ enum FlashConstant {
     ERASE_SUBSECTOR_RETRY_DELAY = 300,
     ERASE_SUBSECTOR_RETRIES = 10000,
 
-    FLASH_CMD_CNT = 5000,      // Number of reads till flash cmd is zeroed
+    FLASH_CMD_CNT = 5000, // Number of reads till flash cmd is zeroed
 
-    GPIO_SEM_TRIES = 1024,     // Number of tries to obtain a GPIO sem.
+    GPIO_SEM_TRIES = 1024, // Number of tries to obtain a GPIO sem.
 
     MAX_WRITE_BUFFER_SIZE = 256, // Max buffer size for buffer write devices
 
@@ -109,9 +129,10 @@ enum FlashConstant {
 // Relevant CR addresses, Bit offset and bit size
 //
 
-enum CrConstans {
+enum CrConstans
+{
     CR_FLASH_ADDR_7NM = 0xf0420,
-    //CR_FLASH_DATA = 0xf0408,
+    // CR_FLASH_DATA = 0xf0408,
     CR_FLASH_CS = 0xf0418,
     CR_GPIO_LOCK = 0xf00ec,
     BO_READ_OP = 0,
@@ -131,25 +152,25 @@ enum CrConstans {
     BS_SPI_GPIO = 4
 };
 
-int check_access_type(mflash *mfl);
-int sx_get_flash_info_by_type(mflash *mfl, flash_info_t *type_index, int *log2size, u_int8_t *no_flash);
-int sx_block_read_by_type(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data);
-int sx_block_write_by_type(mflash *mfl, u_int32_t addr, u_int32_t size, u_int8_t *data);
-int sx_flash_lock_by_type(mflash *mfl, int lock_state);
-int sx_erase_sect_by_type(mflash *mfl, u_int32_t addr, u_int32_t erase_size);
-int mf_update_boot_addr_by_type(mflash *mfl, u_int32_t boot_addr);
-int mfl_com_lock(mflash *mfl);
+int check_access_type(mflash* mfl);
+int sx_get_flash_info_by_type(mflash* mfl, flash_info_t* type_index, int* log2size, u_int8_t* no_flash);
+int sx_block_read_by_type(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data);
+int sx_block_write_by_type(mflash* mfl, u_int32_t addr, u_int32_t size, u_int8_t* data);
+int sx_flash_lock_by_type(mflash* mfl, int lock_state);
+int sx_erase_sect_by_type(mflash* mfl, u_int32_t addr, u_int32_t erase_size);
+int mf_update_boot_addr_by_type(mflash* mfl, u_int32_t boot_addr);
+int mfl_com_lock(mflash* mfl);
 flash_access_commands_t gen_4byte_address_access_commands();
 flash_access_commands_t gen_3byte_address_access_commands();
-int release_semaphore(mflash *mfl, int ignore_writer_lock);
-int     sx_set_quad_en(mflash *mfl, u_int8_t quad_en);
-int     sx_get_quad_en(mflash *mfl, u_int8_t *quad_en);
-int     sx_set_driver_strength(mflash *mfl, u_int8_t driver_strength);
-int     sx_get_driver_strength(mflash *mfl, u_int8_t *driver_strength);
-int     sx_set_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-int     sx_get_write_protect(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-int     sx_set_dummy_cycles(mflash *mfl, u_int8_t num_of_cycles);
-int     sx_get_dummy_cycles(mflash *mfl, u_int8_t *num_of_cycles);
-int     gw_wait_ready(mflash *mfl, const char *msg);
+int release_semaphore(mflash* mfl, int ignore_writer_lock);
+int sx_set_quad_en(mflash* mfl, u_int8_t quad_en);
+int sx_get_quad_en(mflash* mfl, u_int8_t* quad_en);
+int sx_set_driver_strength(mflash* mfl, u_int8_t driver_strength);
+int sx_get_driver_strength(mflash* mfl, u_int8_t* driver_strength);
+int sx_set_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+int sx_get_write_protect(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+int sx_set_dummy_cycles(mflash* mfl, u_int8_t num_of_cycles);
+int sx_get_dummy_cycles(mflash* mfl, u_int8_t* num_of_cycles);
+int gw_wait_ready(mflash* mfl, const char* msg);
 
 #endif /* MFLASH_ACCESS_LAYER_H_ */
diff --git a/mflash/mflash_common_structs.h b/mflash/mflash_common_structs.h
index a5a91f08..5bc64c6d 100644
--- a/mflash/mflash_common_structs.h
+++ b/mflash/mflash_common_structs.h
@@ -39,7 +39,8 @@
 typedef struct mflash mflash;
 #define MAX_FLASH_NAME 256
 
-typedef enum MfOpt {
+typedef enum MfOpt
+{
     MFO_NO_VERIFY = 0,
     MFO_AMD_UNLOCK_BYPASS,
     MFO_AMD_BYTE_MODE,
@@ -55,25 +56,32 @@ typedef enum MfOpt {
     MFO_LAST
 } MfOpt;
 
-enum MfAccessType {
-    MFAT_MFILE = 0, MFAT_UEFI,
+enum MfAccessType
+{
+    MFAT_MFILE = 0,
+    MFAT_UEFI,
 };
 
-typedef enum {
-    UNKNOWN_BIN = 0x0, CX5_LOW_BIN = 0x1, CX5_HIGH_BIN = 0x2,
+typedef enum
+{
+    UNKNOWN_BIN = 0x0,
+    CX5_LOW_BIN = 0x1,
+    CX5_HIGH_BIN = 0x2,
 
 } BinIdT;
 
-typedef struct flash_params {
+typedef struct flash_params
+{
     char type_name[MAX_FLASH_NAME];
     int log2size;
     int num_of_flashes;
 } flash_params_t;
 
-typedef struct write_protect_info {
+typedef struct write_protect_info
+{
     u_int8_t is_subsector;
     u_int8_t is_bottom;
-    u_int8_t sectors_num;  // if zero: is_subsector and is_bottom are invalid.
+    u_int8_t sectors_num; // if zero: is_subsector and is_bottom are invalid.
 } write_protect_info_t;
 
 ////////////////////////////////////////
@@ -81,35 +89,37 @@ typedef struct write_protect_info {
 // ST SPI functions - common for InfiniHostIIILx and ConnectX
 //
 ////////////////////////////////////////
-typedef enum StFlashCommand {
-    SFC_SE = 0xD8,              // Sector erase
-    SFC_4SE = 0xDC,             // Sector erase 4B addr
-    SFC_SSE = 0x20,             // Subsector erase
-    SFC_4SSE = 0x21,            // Subsector erase 4B addr
-    SFC_PP = 0x02,              // Page program
-    SFC_4PP = 0x12,             // Page program 4B addr
-    SFC_READ = 0x03,            // Read data
-    SFC_4READ = 0x13,           // Read data 4B addr
-    SFC_FAST_READ = 0x3B,       // Fast read dual output
-    SFC_4FAST_READ = 0x3C,      // Fast read dual output 4B addr
-    SFC_RES = 0xAB,             // Release power-down
-    SFC_JEDEC = 0x9F,           // Read JEDEC ID
-    SFC_RDSR = 0x05,            // Read status register
-    SFC_WRSR2 = 0x31,           // Write status register 2
-    SFC_RDSR2 = 0x35,           // Read status register 2
-    SFC_WRSR3_WINBOND = 0x11,   // Write status register 3 (WINBOND)
-    SFC_RDSR3_WINBOND = 0x15,   // Read status register 3 (WINBOND)
-    SFC_WREN = 0x06,            // Write enable
+typedef enum StFlashCommand
+{
+    SFC_SE = 0xD8,            // Sector erase
+    SFC_4SE = 0xDC,           // Sector erase 4B addr
+    SFC_SSE = 0x20,           // Subsector erase
+    SFC_4SSE = 0x21,          // Subsector erase 4B addr
+    SFC_PP = 0x02,            // Page program
+    SFC_4PP = 0x12,           // Page program 4B addr
+    SFC_READ = 0x03,          // Read data
+    SFC_4READ = 0x13,         // Read data 4B addr
+    SFC_FAST_READ = 0x3B,     // Fast read dual output
+    SFC_4FAST_READ = 0x3C,    // Fast read dual output 4B addr
+    SFC_RES = 0xAB,           // Release power-down
+    SFC_JEDEC = 0x9F,         // Read JEDEC ID
+    SFC_RDSR = 0x05,          // Read status register
+    SFC_WRSR2 = 0x31,         // Write status register 2
+    SFC_RDSR2 = 0x35,         // Read status register 2
+    SFC_WRSR3_WINBOND = 0x11, // Write status register 3 (WINBOND)
+    SFC_RDSR3_WINBOND = 0x15, // Read status register 3 (WINBOND)
+    SFC_WREN = 0x06,          // Write enable
     SFC_RDNVR = 0xB5,
-    SFC_RDCR = 0x15,            // Read configuration register
+    SFC_RDCR = 0x15, // Read configuration register
     SFC_WRNVR = 0xB1,
-    SFC_WRSR = 0x01,            // Write status register
-    SFC_WRSR_GIGA = 0x31,       // Write status register (GIGA)
+    SFC_WRSR = 0x01,      // Write status register
+    SFC_WRSR_GIGA = 0x31, // Write status register (GIGA)
     SFC_RDFR = 0x48,
     SFC_WRFR = 0x42
 } StFlashCommand_t;
 
-typedef struct access_commands {
+typedef struct access_commands
+{
     StFlashCommand_t sfc_sector_erase;
     StFlashCommand_t sfc_subsector_erase;
     StFlashCommand_t sfc_page_program;
@@ -122,8 +132,9 @@ typedef struct access_commands {
 // Flash attributes struct
 //
 /////////////////////////////////////////////
-typedef struct flash_attr {
-    const char *type_str;
+typedef struct flash_attr
+{
+    const char* type_str;
     //
     // hw_dev_id    hw dev id of the HCA.
     //
@@ -143,7 +154,7 @@ typedef struct flash_attr {
     //
     u_int32_t sector_size;
 
-    int num_erase_blocks;         // Number of sector defs.
+    int num_erase_blocks; // Number of sector defs.
 
     //
     // bank_size:   Different bank means a different chip sellect or gpio settings is needed when crossing
@@ -191,8 +202,9 @@ typedef struct flash_attr {
 // Support for density X is represented by setting the log(X) bit of flash_info.densities.
 // That is, a flash related to flash_info supports density X iff ((flash_info.densities & (1 << FD_X)) != 0).
 // FD_X is the density value as it appears in the flash JEDEC ID. For example, FD_128 == 0x18 (128Mb flash).
-typedef struct flash_info {
-    const char *name;
+typedef struct flash_info
+{
+    const char* name;
     u_int8_t vendor;
     u_int8_t type;
     u_int32_t densities;
@@ -210,16 +222,18 @@ typedef struct flash_info {
 /*
  * Common Macros:
  */
-#define WRITE_PROTECT_CHECKS(mfl, bank_num) { \
-        if (!mfl->attr.write_protect_support) { \
+#define WRITE_PROTECT_CHECKS(mfl, bank_num)     \
+    {                                           \
+        if (!mfl->attr.write_protect_support)   \
+        {                                       \
             return MFE_NOT_SUPPORTED_OPERATION; \
-        } \
-        if (bank_num >= mfl->attr.banks_num) { \
-            return MFE_FLASH_NOT_EXIST; \
-        } \
-}
+        }                                       \
+        if (bank_num >= mfl->attr.banks_num)    \
+        {                                       \
+            return MFE_FLASH_NOT_EXIST;         \
+        }                                       \
+    }
 #define MAX_SUBSECTOR_NUM 8
-#define MAX_SECTORS_NUM   64
+#define MAX_SECTORS_NUM 64
 
 #endif // MFLASH_COMMON_STRUCTS_H
-
diff --git a/mflash/mflash_dev_capability.c b/mflash/mflash_dev_capability.c
index 18fe515f..c3491e45 100644
--- a/mflash/mflash_dev_capability.c
+++ b/mflash/mflash_dev_capability.c
@@ -30,7 +30,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
-*/
+ */
 
 /*
  * mflash_dev_capabillity.c
@@ -41,134 +41,137 @@
 
 #include "mflash_dev_capability.h"
 
-//When (*status != MFE_OK) return value is undefined
-int is_four_byte_address_needed(mflash *mfl, MfError *status)
+// When (*status != MFE_OK) return value is undefined
+int is_four_byte_address_needed(mflash* mfl, MfError* status)
 {
     *status = MFE_OK;
 
-    switch (mfl->dm_dev_id) {
-    case DeviceConnectX2:
-    case DeviceInfiniScaleIV:
-    case DeviceSwitchX:
-    case DeviceConnectX3:
-    case DeviceConnectX3Pro:
-    case DeviceConnectIB:
-    case DeviceSwitchIB:
-    case DeviceSpectrum:
-    case DeviceConnectX4:
-    case DeviceConnectX4LX:
-    case DeviceSwitchIB2:
-    case DeviceConnectX5:
-    case DeviceBlueField:
-    case DeviceSecureHost:
-        return 0;
-    case DeviceQuantum:
-    case DeviceConnectX6:
-    case DeviceConnectX7:
-    case DeviceConnectX6DX:
-    case DeviceConnectX6LX:
-    case DeviceSpectrum2:
-    case DeviceSpectrum3:
-    case DeviceQuantum2:
-    case DeviceSpectrum4:
-    case DeviceBlueField2:
-    case DeviceBlueField3:
-    case DeviceGearBox:
-    case DeviceGearBoxManager:
-    case DeviceAbirGearBox:
-        return 1;
-    default:
-        *status = MFE_UNSUPPORTED_DEVICE;
-        fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
-        return 1;
+    switch (mfl->dm_dev_id)
+    {
+        case DeviceConnectX2:
+        case DeviceInfiniScaleIV:
+        case DeviceSwitchX:
+        case DeviceConnectX3:
+        case DeviceConnectX3Pro:
+        case DeviceConnectIB:
+        case DeviceSwitchIB:
+        case DeviceSpectrum:
+        case DeviceConnectX4:
+        case DeviceConnectX4LX:
+        case DeviceSwitchIB2:
+        case DeviceConnectX5:
+        case DeviceBlueField:
+        case DeviceSecureHost:
+            return 0;
+        case DeviceQuantum:
+        case DeviceConnectX6:
+        case DeviceConnectX7:
+        case DeviceConnectX6DX:
+        case DeviceConnectX6LX:
+        case DeviceSpectrum2:
+        case DeviceSpectrum3:
+        case DeviceQuantum2:
+        case DeviceSpectrum4:
+        case DeviceBlueField2:
+        case DeviceBlueField3:
+        case DeviceGearBox:
+        case DeviceGearBoxManager:
+        case DeviceAbirGearBox:
+            return 1;
+        default:
+            *status = MFE_UNSUPPORTED_DEVICE;
+            fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
+            return 1;
     }
 }
 
-//When (*status != MFE_OK) return value is undefined
-int is_flash_enable_needed(mflash *mfl, MfError *status)
+// When (*status != MFE_OK) return value is undefined
+int is_flash_enable_needed(mflash* mfl, MfError* status)
 {
     *status = MFE_OK;
 
-    switch (mfl->dm_dev_id) {
-    case DeviceConnectX2:
-    case DeviceInfiniScaleIV:
-    case DeviceConnectX3:
-    case DeviceConnectX3Pro:
-    case DeviceSwitchX:
-        return 1;
-    case DeviceConnectIB:
-    case DeviceSwitchIB:
-    case DeviceSwitchIB2:
-    case DeviceSpectrum:
-    case DeviceConnectX4:
-    case DeviceConnectX4LX:
-    case DeviceConnectX5:
-    case DeviceBlueField:
-    case DeviceBlueField2:
-    case DeviceBlueField3:
-    case DeviceQuantum:
-    case DeviceConnectX6:
-    case DeviceConnectX7:
-    case DeviceConnectX6DX:
-    case DeviceConnectX6LX:
-    case DeviceSpectrum2:
-    case DeviceSpectrum3:
-    case DeviceQuantum2:
-    case DeviceSpectrum4:
-    case DeviceSecureHost:
-    case DeviceGearBox:
-    case DeviceGearBoxManager:
-    case DeviceAbirGearBox:
-        return 0;
-    default:
-        *status = MFE_UNSUPPORTED_DEVICE;
-        fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
-        return 0;
+    switch (mfl->dm_dev_id)
+    {
+        case DeviceConnectX2:
+        case DeviceInfiniScaleIV:
+        case DeviceConnectX3:
+        case DeviceConnectX3Pro:
+        case DeviceSwitchX:
+            return 1;
+        case DeviceConnectIB:
+        case DeviceSwitchIB:
+        case DeviceSwitchIB2:
+        case DeviceSpectrum:
+        case DeviceConnectX4:
+        case DeviceConnectX4LX:
+        case DeviceConnectX5:
+        case DeviceBlueField:
+        case DeviceBlueField2:
+        case DeviceBlueField3:
+        case DeviceQuantum:
+        case DeviceConnectX6:
+        case DeviceConnectX7:
+        case DeviceConnectX6DX:
+        case DeviceConnectX6LX:
+        case DeviceSpectrum2:
+        case DeviceSpectrum3:
+        case DeviceQuantum2:
+        case DeviceSpectrum4:
+        case DeviceSecureHost:
+        case DeviceGearBox:
+        case DeviceGearBoxManager:
+        case DeviceAbirGearBox:
+            return 0;
+        default:
+            *status = MFE_UNSUPPORTED_DEVICE;
+            fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
+            return 0;
     }
 }
 
-//When (*status != MFE_OK) return value is undefined
-int is_icmdif_supported(mflash *mfl, MfError *status, int *is7NmSuppported)
+// When (*status != MFE_OK) return value is undefined
+int is_icmdif_supported(mflash* mfl, MfError* status, int* is7NmSuppported)
 {
     *status = MFE_OK;
 
-    switch (mfl->dm_dev_id) {
-    case DeviceConnectX2:
-    case DeviceInfiniScaleIV:
-    case DeviceConnectX3:
-    case DeviceConnectX3Pro:
-    case DeviceSwitchX:
-    case DeviceSecureHost:
-        return 0;
-    case DeviceConnectIB:
-    case DeviceSwitchIB:
-    case DeviceConnectX4:
-    case DeviceConnectX4LX:
-    case DeviceSpectrum:
-    case DeviceSwitchIB2:
-    case DeviceConnectX5:
-    case DeviceBlueField:
-    case DeviceBlueField2:
-    case DeviceQuantum:
-    case DeviceSpectrum2:
-    case DeviceSpectrum3:
-    case DeviceConnectX6:
-    case DeviceConnectX6DX:
-    case DeviceConnectX6LX:
-    case DeviceGearBox:
-    case DeviceGearBoxManager:
-        *is7NmSuppported = 0;
-        return 1;
-    case DeviceQuantum2:
-    case DeviceSpectrum4:
-    case DeviceConnectX7:
-    case DeviceBlueField3:
-    case DeviceAbirGearBox:
-        *is7NmSuppported = 1;
-        return 1;
-    default:
-        *status = MFE_UNSUPPORTED_DEVICE;
-        fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
-        return 1;
+    switch (mfl->dm_dev_id)
+    {
+        case DeviceConnectX2:
+        case DeviceInfiniScaleIV:
+        case DeviceConnectX3:
+        case DeviceConnectX3Pro:
+        case DeviceSwitchX:
+        case DeviceSecureHost:
+            return 0;
+        case DeviceConnectIB:
+        case DeviceSwitchIB:
+        case DeviceConnectX4:
+        case DeviceConnectX4LX:
+        case DeviceSpectrum:
+        case DeviceSwitchIB2:
+        case DeviceConnectX5:
+        case DeviceBlueField:
+        case DeviceBlueField2:
+        case DeviceQuantum:
+        case DeviceSpectrum2:
+        case DeviceSpectrum3:
+        case DeviceConnectX6:
+        case DeviceConnectX6DX:
+        case DeviceConnectX6LX:
+        case DeviceGearBox:
+        case DeviceGearBoxManager:
+            *is7NmSuppported = 0;
+            return 1;
+        case DeviceQuantum2:
+        case DeviceSpectrum4:
+        case DeviceConnectX7:
+        case DeviceBlueField3:
+        case DeviceAbirGearBox:
+            *is7NmSuppported = 1;
+            return 1;
+        default:
+            *status = MFE_UNSUPPORTED_DEVICE;
+            fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
+            return 1;
     }
 }
diff --git a/mflash/mflash_dev_capability.h b/mflash/mflash_dev_capability.h
index a9ff4f31..dbdc31ef 100644
--- a/mflash/mflash_dev_capability.h
+++ b/mflash/mflash_dev_capability.h
@@ -30,7 +30,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
-*/
+ */
 
 /*
  * mflash_dev_capabillity.h
@@ -45,18 +45,25 @@
 #include "mflash_pack_layer.h"
 
 #ifndef UEFI_BUILD
-#define FLASH_DPRINTF(args)        do { char *reacDebug = getenv("MFT_FLASH_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("[MFT_FLASH_DEBUG]: -D- "); printf args; fflush(stdout);} } while (0)
+#define FLASH_DPRINTF(args)                          \
+    do                                               \
+    {                                                \
+        char* reacDebug = getenv("MFT_FLASH_DEBUG"); \
+        if (reacDebug != NULL)                       \
+        {                                            \
+            printf("\33[2K\r");                      \
+            printf("[MFT_FLASH_DEBUG]: -D- ");       \
+            printf args;                             \
+            fflush(stdout);                          \
+        }                                            \
+    } while (0)
 #else
 #define FLASH_DPRINTF(...)
 #endif
 
-
-//When (*status != MFE_OK) return value is undefined
-int is_four_byte_address_needed(mflash *mfl, MfError *status);
-int is_flash_enable_needed(mflash *mfl, MfError *status);
-int is_icmdif_supported(mflash *mfl, MfError *status, int* is7NmSuppported);
-
+// When (*status != MFE_OK) return value is undefined
+int is_four_byte_address_needed(mflash* mfl, MfError* status);
+int is_flash_enable_needed(mflash* mfl, MfError* status);
+int is_icmdif_supported(mflash* mfl, MfError* status, int* is7NmSuppported);
 
 #endif /* USER_MFLASH_MFLASH_DEV_CAPABILITY_H_ */
diff --git a/mflash/mflash_gw.c b/mflash/mflash_gw.c
index f805fba4..d8d5207a 100644
--- a/mflash/mflash_gw.c
+++ b/mflash/mflash_gw.c
@@ -30,7 +30,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
-*/
+ */
 
 /*
  * mflash_gw.c
@@ -44,37 +44,56 @@
 #include "flash_int_defs.h"
 
 #ifdef __WIN__
- //
- // Windows (Under DDK)
- //
-#define OP_NOT_SUPPORTED EINVAL
-#define usleep(x) Sleep(((x + 999) / 1000))
-
-#endif // __WIN_
-#define CHECK_RC_REL_SEM(mfl, rc) do {if (rc) {release_semaphore(mfl, 0); return rc;}} while (0)
+//
+// Windows (Under DDK)
+//
+#define OP_NOT_SUPPORTED EINVAL
+#define usleep(x) Sleep(((x + 999) / 1000))
 
-#define DPRINTF(args)        do { char *reacDebug = getenv("FLASH_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("[FLASH_DEBUG]: -D- "); printf args; fflush(stdout);} } while (0)
-static int st_spi_wait_wip(mflash *mfl, u_int32_t init_delay_us, u_int32_t retry_delay_us,
-    u_int32_t num_of_retries)
+#endif // __WIN_
+#define CHECK_RC_REL_SEM(mfl, rc)      \
+    do                                 \
+    {                                  \
+        if (rc)                        \
+        {                              \
+            release_semaphore(mfl, 0); \
+            return rc;                 \
+        }                              \
+    } while (0)
+
+#define DPRINTF(args)                            \
+    do                                           \
+    {                                            \
+        char* reacDebug = getenv("FLASH_DEBUG"); \
+        if (reacDebug != NULL)                   \
+        {                                        \
+            printf("\33[2K\r");                  \
+            printf("[FLASH_DEBUG]: -D- ");       \
+            printf args;                         \
+            fflush(stdout);                      \
+        }                                        \
+    } while (0)
+static int st_spi_wait_wip(mflash* mfl, u_int32_t init_delay_us, u_int32_t retry_delay_us, u_int32_t num_of_retries)
 {
-
     int rc = 0;
     u_int8_t status = 0;
     u_int32_t i = 0;
 
     usleep(init_delay_us);
 
-    for (i = 0; i < num_of_retries; ++i) {
+    for (i = 0; i < num_of_retries; ++i)
+    {
         rc = mfl->f_spi_status(mfl, SFC_RDSR, &status);
         CHECK_RC(rc);
-        if ((status & 1) == 0) {
+        if ((status & 1) == 0)
+        {
             return MFE_OK;
         }
         usleep(retry_delay_us);
-        if (mfl->cputUtilizationApplied) {
-            if ((i % mfl->cpuPercent) == 0) {
+        if (mfl->cputUtilizationApplied)
+        {
+            if ((i % mfl->cpuPercent) == 0)
+            {
                 msleep(1);
             }
         }
@@ -85,36 +104,48 @@ static int st_spi_wait_wip(mflash *mfl, u_int32_t init_delay_us, u_int32_t retry
 static u_int32_t log2up(u_int32_t in)
 {
     u_int32_t i = 0;
-    for (i = 0; i < 32; i++) {
-        if (in <= (u_int32_t)(1 << i)) {
+    for (i = 0; i < 32; i++)
+    {
+        if (in <= (u_int32_t)(1 << i))
+        {
             break;
         }
     }
     return i;
 }
-static bool is_x_byte_address_access_commands(mflash *mfl, int x)
+static bool is_x_byte_address_access_commands(mflash* mfl, int x)
 {
-    if (x != 3 && x != 4) {
+    if (x != 3 && x != 4)
+    {
         return false;
     }
 
-    flash_access_commands_t compared_to_access_commands = (x == 4) ? gen_4byte_address_access_commands() : gen_3byte_address_access_commands();
+    flash_access_commands_t compared_to_access_commands =
+      (x == 4) ? gen_4byte_address_access_commands() : gen_3byte_address_access_commands();
     flash_access_commands_t cur = mfl->attr.access_commands;
 
-    return (compared_to_access_commands.sfc_sector_erase == cur.sfc_sector_erase && compared_to_access_commands.sfc_subsector_erase == cur.sfc_subsector_erase && compared_to_access_commands.sfc_page_program == cur.sfc_page_program && compared_to_access_commands.sfc_read == cur.sfc_read && compared_to_access_commands.sfc_fast_read == cur.sfc_fast_read);
+    return (compared_to_access_commands.sfc_sector_erase == cur.sfc_sector_erase &&
+            compared_to_access_commands.sfc_subsector_erase == cur.sfc_subsector_erase &&
+            compared_to_access_commands.sfc_page_program == cur.sfc_page_program &&
+            compared_to_access_commands.sfc_read == cur.sfc_read &&
+            compared_to_access_commands.sfc_fast_read == cur.sfc_fast_read);
 }
-static int cntx_exec_cmd(mflash *mfl, u_int32_t gw_cmd, char *msg)
+static int cntx_exec_cmd(mflash* mfl, u_int32_t gw_cmd, char* msg)
 {
-    if (!IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id)) {
+    if (!IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id))
+    {
         // for old devices lock bit is separate from the flash HW ifc
-        //for new devices need to make sure this bit remains locked when writing the dword
+        // for new devices need to make sure this bit remains locked when writing the dword
         gw_cmd = MERGE(gw_cmd, 1, 31, 1);
     }
-    if ((gw_cmd & (1 << HBO_ADDR_PHASE)) != 0) { // This is an access command
-        if (is_x_byte_address_access_commands(mfl, 4)) {
+    if ((gw_cmd & (1 << HBO_ADDR_PHASE)) != 0)
+    { // This is an access command
+        if (is_x_byte_address_access_commands(mfl, 4))
+        {
             gw_cmd = MERGE(gw_cmd, 1, HBO_ADDR_SIZE, 1);
         }
-        else if (!is_x_byte_address_access_commands(mfl, 3)) {
+        else if (!is_x_byte_address_access_commands(mfl, 3))
+        {
             return MFE_ACCESS_COMMANDS_NOT_INITIALIZED;
         }
     }
@@ -122,11 +153,13 @@ static int cntx_exec_cmd(mflash *mfl, u_int32_t gw_cmd, char *msg)
 
     MfError status;
     int flash_enable_needed = is_flash_enable_needed(mfl, &status);
-    //for new devices this value is always 0
-    if (status != MFE_OK) {
+    // for new devices this value is always 0
+    if (status != MFE_OK)
+    {
         return status;
     }
-    if (flash_enable_needed) {
+    if (flash_enable_needed)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_FLASH_ENABLE, 1);
     }
 
@@ -144,15 +177,16 @@ static int cntx_exec_cmd(mflash *mfl, u_int32_t gw_cmd, char *msg)
  * buff - pointer to a buffer where the output data from the flash GW will be written to
  * buff_dword_sz - size for buff in dwords
  * addr - if != NULL *addr will be written to the addr bits of the flash GW. (for commands that read from flash)
- * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put usefull
- *        data for future dubugabillity.
- * return : MFE_OK (0) upon success or a value != 0 upon error accroding to mlfash error code.
+ * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put
+ * usefull data for future dubugabillity. return : MFE_OK (0) upon success or a value != 0 upon error accroding to
+ * mlfash error code.
  */
-static int cntx_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int buff_dword_sz,
-    u_int32_t *addr, char *msg)
+static int
+  cntx_exec_cmd_get(mflash* mfl, u_int32_t gw_cmd, u_int32_t* buff, int buff_dword_sz, u_int32_t* addr, char* msg)
 {
     int rc = 0;
-    if (!mfl || !buff || !buff_dword_sz) {
+    if (!mfl || !buff || !buff_dword_sz)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -160,8 +194,10 @@ static int cntx_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int
     CHECK_RC(rc);
 
     // write GW addr if needed
-    if (addr) {
-        if (mwrite4(mfl->mf, mfl->gw_addr, *addr) != 4) {
+    if (addr)
+    {
+        if (mwrite4(mfl->mf, mfl->gw_addr, *addr) != 4)
+        {
             release_semaphore(mfl, 0);
             return MFE_CR_ERROR;
         }
@@ -170,11 +206,12 @@ static int cntx_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int
     rc = cntx_exec_cmd(mfl, gw_cmd, msg);
     CHECK_RC_REL_SEM(mfl, rc);
     // copy data from CR-space to buff
-    if (mread4_block(mfl->mf, mfl->gw_data, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2)) {
+    if (mread4_block(mfl->mf, mfl->gw_data, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2))
+    {
         release_semaphore(mfl, 0);
         return MFE_CR_ERROR;
     }
-    //release semaphore
+    // release semaphore
     release_semaphore(mfl, 0);
     return MFE_OK;
 }
@@ -187,15 +224,16 @@ static int cntx_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int
  * buff - if != NULL pointer to a buffer to the input data for the flash GW.
  * buff_dword_sz - size for buff in dwords
  * addr - if != NULL *addr will be written to the addr bits of the flash GW. (for commands that write from flash)
- * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put usefull
- *        data for future dubugabillity.
- * return : MFE_OK (0) upon success or a value != 0 upon error accroding to mlfash error code.
+ * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put
+ * usefull data for future dubugabillity. return : MFE_OK (0) upon success or a value != 0 upon error accroding to
+ * mlfash error code.
  */
-static int cntx_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int buff_dword_sz,
-    u_int32_t *addr, char *msg)
+static int
+  cntx_exec_cmd_set(mflash* mfl, u_int32_t gw_cmd, u_int32_t* buff, int buff_dword_sz, u_int32_t* addr, char* msg)
 {
     int rc = 0;
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -203,8 +241,10 @@ static int cntx_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int
     CHECK_RC(rc);
 
     // write data from buff to CR-space
-    if (buff && buff_dword_sz) {
-        if (mwrite4_block(mfl->mf, mfl->gw_data, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2)) {
+    if (buff && buff_dword_sz)
+    {
+        if (mwrite4_block(mfl->mf, mfl->gw_data, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2))
+        {
             release_semaphore(mfl, 0);
             return MFE_CR_ERROR;
         }
@@ -212,8 +252,10 @@ static int cntx_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int
     }
 
     // write GW addr if needed
-    if (addr) {
-        if (mwrite4(mfl->mf, mfl->gw_addr, *addr) != 4) {
+    if (addr)
+    {
+        if (mwrite4(mfl->mf, mfl->gw_addr, *addr) != 4)
+        {
             release_semaphore(mfl, 0);
             return MFE_CR_ERROR;
         }
@@ -223,18 +265,18 @@ static int cntx_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int
     rc = cntx_exec_cmd(mfl, gw_cmd, msg);
     CHECK_RC_REL_SEM(mfl, rc);
 
-    //release semaphore
+    // release semaphore
     release_semaphore(mfl, 0);
     return MFE_OK;
 }
 
-int cntx_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *status, u_int8_t bytes_num)
+int cntx_int_spi_get_status_data(mflash* mfl, u_int8_t op_type, u_int32_t* status, u_int8_t bytes_num)
 {
     int rc = 0;
 
     u_int32_t gw_cmd = 0;
     u_int32_t flash_data = 0;
-    //TODO: adrianc: update msize from log2(bytes_num)
+    // TODO: adrianc: update msize from log2(bytes_num)
     gw_cmd = MERGE(gw_cmd, 1, HBO_READ_OP, 1);
     gw_cmd = MERGE(gw_cmd, 1, HBO_CMD_PHASE, 1);
     gw_cmd = MERGE(gw_cmd, 1, HBO_DATA_PHASE, 1);
@@ -242,7 +284,8 @@ int cntx_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *statu
 
     gw_cmd = MERGE(gw_cmd, op_type, HBO_CMD, HBS_CMD);
 
-    if (bytes_num > 4) {
+    if (bytes_num > 4)
+    {
         return MFE_BAD_PARAMS;
     }
     rc = cntx_exec_cmd_get(mfl, gw_cmd, &flash_data, 1, (u_int32_t*)NULL, "Read id");
@@ -251,7 +294,7 @@ int cntx_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *statu
     *status = (flash_data >> 8 * (4 - bytes_num));
     return MFE_OK;
 }
-int cntx_st_spi_write_enable(mflash *mfl)
+int cntx_st_spi_write_enable(mflash* mfl)
 {
     u_int32_t gw_cmd = 0;
     int rc = 0;
@@ -263,7 +306,7 @@ int cntx_st_spi_write_enable(mflash *mfl)
     CHECK_RC(rc);
     return MFE_OK;
 }
-int cntx_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num)
+int cntx_spi_write_status_reg(mflash* mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num)
 {
     int rc = 0;
     u_int32_t gw_cmd = 0;
@@ -275,28 +318,33 @@ int cntx_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t write_
 
     gw_cmd = MERGE(gw_cmd, write_cmd, HBO_CMD, HBS_CMD);
 
-    if (bytes_num != 1 && bytes_num != 2) {
+    if (bytes_num != 1 && bytes_num != 2)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
     // push status reg to upper bytes
     status_reg = status_reg << ((bytes_num == 2) ? 16 : 24);
-    if (bytes_num == 2) {
+    if (bytes_num == 2)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_MSIZE, 1);
     }
     rc = cntx_exec_cmd_set(mfl, gw_cmd, &status_reg, 1, (u_int32_t*)NULL, "Write-Status-Register");
     // wait for flash to write the register
-    if (mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL) { // New CYPRESS
+    if (mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL)
+    { // New CYPRESS
         msleep(WRITE_STATUS_REGISTER_DELAY_CYPRESS);
     }
-    else if (mfl->attr.vendor == FV_ST && mfl->attr.type == FMT_N25QXXX) { // New MICRON
+    else if (mfl->attr.vendor == FV_ST && mfl->attr.type == FMT_N25QXXX)
+    { // New MICRON
         msleep(WRITE_STATUS_REGISTER_DELAY_MICRON);
     }
-    else {
+    else
+    {
         msleep(WRITE_STATUS_REGISTER_DELAY_MIN); // Some can sleep only 30 or even 15. We should consider optimize this.
     }
     return rc;
 }
-int cntx_st_spi_erase_sect(mflash *mfl, u_int32_t addr)
+int cntx_st_spi_erase_sect(mflash* mfl, u_int32_t addr)
 {
     int rc = 0;
 
@@ -325,8 +373,13 @@ int cntx_st_spi_erase_sect(mflash *mfl, u_int32_t addr)
     CHECK_RC(rc);
     return MFE_OK;
 }
-int cntx_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data,
-    u_int8_t is_first, u_int8_t is_last, u_int32_t total_size)
+int cntx_st_spi_block_write_ex(mflash* mfl,
+                               u_int32_t blk_addr,
+                               u_int32_t blk_size,
+                               u_int8_t* data,
+                               u_int8_t is_first,
+                               u_int8_t is_last,
+                               u_int32_t total_size)
 {
     int rc = 0;
     u_int32_t offs = 0;
@@ -334,12 +387,14 @@ int cntx_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_si
     u_int32_t gw_addr = 0;
     u_int32_t buff[4];
 
-    if (blk_addr & ((u_int32_t)mfl->attr.block_write - 1)) {
+    if (blk_addr & ((u_int32_t)mfl->attr.block_write - 1))
+    {
         return MFE_BAD_ALIGN;
     }
 
     // sanity check ??? remove ???
-    if (blk_size != (u_int32_t)mfl->attr.block_write) {
+    if (blk_size != (u_int32_t)mfl->attr.block_write)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -349,7 +404,8 @@ int cntx_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_si
     gw_cmd = MERGE(gw_cmd, 1, HBO_DATA_PHASE, 1);
     gw_cmd = MERGE(gw_cmd, log2up(blk_size), HBO_MSIZE, HBS_MSIZE);
 
-    if (is_first) {
+    if (is_first)
+    {
         rc = cntx_st_spi_write_enable(mfl);
         CHECK_RC(rc);
 
@@ -361,19 +417,21 @@ int cntx_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_si
         DPRINTF(("flash_addr = %#x, blk_addr = %#x\n", gw_addr, blk_addr));
     }
 
-    if (!is_last) {
+    if (!is_last)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_CS_HOLD, 1);
     }
 
     // Data:
-    for (offs = 0; offs < blk_size; offs += 4) {
+    for (offs = 0; offs < blk_size; offs += 4)
+    {
         u_int32_t word = 0;
 
         word = MERGE(word, data[offs + 0], 24, 8);
         word = MERGE(word, data[offs + 1], 16, 8);
         word = MERGE(word, data[offs + 2], 8, 8);
         word = MERGE(word, data[offs + 3], 0, 8);
-        //MWRITE4(HCR_FLASH_DATA + offs, word );
+        // MWRITE4(HCR_FLASH_DATA + offs, word );
         buff[offs / 4] = word;
     }
     DPRINTF(("Data to write = %#x, %#x, %#x, %#x\n", buff[0], buff[1], buff[2], buff[3]));
@@ -384,15 +442,17 @@ int cntx_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_si
     // Wait for end of write in flash (WriteInProgress = 0):
     //
 
-    if (is_last) {
-        rc = st_spi_wait_wip(mfl, WRITE_BLOCK_INIT_DELAY + WRITE_ADDITIONAL_BYTE_DELAY * total_size, WRITE_BLOCK_RETRY_DELAY, WRITE_BLOCK_RETRIES);
+    if (is_last)
+    {
+        rc = st_spi_wait_wip(mfl, WRITE_BLOCK_INIT_DELAY + WRITE_ADDITIONAL_BYTE_DELAY * total_size,
+                             WRITE_BLOCK_RETRY_DELAY, WRITE_BLOCK_RETRIES);
         CHECK_RC(rc);
     }
 
     return MFE_OK;
 }
 
-int cntx_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data)
+int cntx_sst_spi_block_write_ex(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data)
 {
     int rc = 0;
     u_int32_t gw_cmd = 0;
@@ -400,7 +460,8 @@ int cntx_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_s
     u_int32_t word = 0;
 
     // sanity check ??? remove ???
-    if (blk_size != (u_int32_t)mfl->attr.block_write) {
+    if (blk_size != (u_int32_t)mfl->attr.block_write)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -420,7 +481,7 @@ int cntx_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_s
 
     gw_addr = blk_addr & ONES32(mfl->attr.log2_bank_size);
 
-    //gw_cmd = MERGE(gw_cmd, 1               , HBO_CS_HOLD,    1);
+    // gw_cmd = MERGE(gw_cmd, 1               , HBO_CS_HOLD,    1);
 
     word = MERGE(word, data[0], 24, 8);
 
@@ -434,8 +495,13 @@ int cntx_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_s
 
     return MFE_OK;
 }
-int cntx_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data,
-    u_int8_t is_first, u_int8_t is_last, bool verbose)
+int cntx_st_spi_block_read_ex(mflash* mfl,
+                              u_int32_t blk_addr,
+                              u_int32_t blk_size,
+                              u_int8_t* data,
+                              u_int8_t is_first,
+                              u_int8_t is_last,
+                              bool verbose)
 {
     (void)verbose;
     int rc = 0;
@@ -443,17 +509,20 @@ int cntx_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_siz
     u_int32_t gw_cmd = 0;
     u_int32_t gw_addr = 0;
 
-    DPRINTF(("cntx_st_spi_block_read_ex(addr=%05x, u_int32_t size=%03x, first=%d, last=%d)\n", blk_addr, blk_size, (u_int32_t) is_first, (u_int32_t) is_last));
+    DPRINTF(("cntx_st_spi_block_read_ex(addr=%05x, u_int32_t size=%03x, first=%d, last=%d)\n", blk_addr, blk_size,
+             (u_int32_t)is_first, (u_int32_t)is_last));
     COM_CHECK_ALIGN(blk_addr, blk_size);
 
-    if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4) {
+    if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4)
+    {
         return MFE_BAD_PARAMS;
     }
 
     rc = set_bank(mfl, blk_addr);
     CHECK_RC(rc);
 
-    if (is_first) {
+    if (is_first)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_CMD_PHASE, 1);
         gw_cmd = MERGE(gw_cmd, 1, HBO_ADDR_PHASE, 1);
         gw_cmd = MERGE(gw_cmd, mfl->attr.access_commands.sfc_read, HBO_CMD, HBS_CMD);
@@ -461,8 +530,10 @@ int cntx_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_siz
         rc = get_flash_offset(blk_addr, mfl->attr.log2_bank_size, &gw_addr);
         CHECK_RC(rc);
     }
-    DPRINTF(("Flash_addr = %#x, gw_cmd = %#x, blk_addr = %#x, mfl->attr.log2_bank_size = %#x\n", gw_addr, gw_cmd, blk_addr, mfl->attr.log2_bank_size));
-    if (!is_last) {
+    DPRINTF(("Flash_addr = %#x, gw_cmd = %#x, blk_addr = %#x, mfl->attr.log2_bank_size = %#x\n", gw_addr, gw_cmd,
+             blk_addr, mfl->attr.log2_bank_size));
+    if (!is_last)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_CS_HOLD, 1);
     }
 
@@ -473,7 +544,8 @@ int cntx_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_siz
 
     rc = cntx_exec_cmd_get(mfl, gw_cmd, (u_int32_t*)data, (blk_size >> 2), &gw_addr, "Read");
     CHECK_RC(rc);
-    for (i = 0; i < blk_size; i += 4) {
+    for (i = 0; i < blk_size; i += 4)
+    {
         *(u_int32_t*)(data + i) = __be32_to_cpu(*(u_int32_t*)(data + i));
     }
     return MFE_OK;
diff --git a/mflash/mflash_gw.h b/mflash/mflash_gw.h
index 6376c886..4e974465 100644
--- a/mflash/mflash_gw.h
+++ b/mflash/mflash_gw.h
@@ -30,7 +30,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
-*/
+ */
 
 /*
  * mflash_gw.h
@@ -39,15 +39,26 @@
  *      Author: edwardg
  */
 
-
 #ifndef _MFLASH_GW_H_
 #define _MFLASH_GW_H_
 #include "mflash_pack_layer.h"
 // ConnectX SPI interface:
-int cntx_st_spi_erase_sect(mflash *mfl, u_int32_t addr);
-int cntx_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *status, u_int8_t data_num);
-int cntx_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, u_int8_t is_first, u_int8_t is_last, u_int32_t total_size);
-int cntx_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data);
-int cntx_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, u_int8_t is_first, u_int8_t is_last, bool verbose);
-int cntx_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num);
+int cntx_st_spi_erase_sect(mflash* mfl, u_int32_t addr);
+int cntx_int_spi_get_status_data(mflash* mfl, u_int8_t op_type, u_int32_t* status, u_int8_t data_num);
+int cntx_st_spi_block_write_ex(mflash* mfl,
+                               u_int32_t blk_addr,
+                               u_int32_t blk_size,
+                               u_int8_t* data,
+                               u_int8_t is_first,
+                               u_int8_t is_last,
+                               u_int32_t total_size);
+int cntx_sst_spi_block_write_ex(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data);
+int cntx_st_spi_block_read_ex(mflash* mfl,
+                              u_int32_t blk_addr,
+                              u_int32_t blk_size,
+                              u_int8_t* data,
+                              u_int8_t is_first,
+                              u_int8_t is_last,
+                              bool verbose);
+int cntx_spi_write_status_reg(mflash* mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num);
 #endif
diff --git a/mflash/mflash_new_gw.c b/mflash/mflash_new_gw.c
index 8fde9873..3bd044ea 100644
--- a/mflash/mflash_new_gw.c
+++ b/mflash/mflash_new_gw.c
@@ -30,7 +30,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
-*/
+ */
 
 /*
  * mflash_new_gw.c
@@ -42,38 +42,57 @@
 #include "mflash_dev_capability.h"
 #include "mflash_access_layer.h"
 #include "flash_int_defs.h"
-#define DPRINTF(args)        do { char *reacDebug = getenv("FLASH_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("[FLASH_DEBUG]: -D- "); printf args; fflush(stdout);} } while (0)
+#define DPRINTF(args)                            \
+    do                                           \
+    {                                            \
+        char* reacDebug = getenv("FLASH_DEBUG"); \
+        if (reacDebug != NULL)                   \
+        {                                        \
+            printf("\33[2K\r");                  \
+            printf("[FLASH_DEBUG]: -D- ");       \
+            printf args;                         \
+            fflush(stdout);                      \
+        }                                        \
+    } while (0)
 #ifdef __WIN__
- //
- // Windows (Under DDK)
- //
+//
+// Windows (Under DDK)
+//
 #define OP_NOT_SUPPORTED EINVAL
 #define usleep(x) Sleep(((x + 999) / 1000))
 
 #endif // __WIN_
-#define CHECK_RC_REL_SEM(mfl, rc) do {if (rc) {release_semaphore(mfl, 0); return rc;}} while (0)
-
-static int st_spi_wait_wip(mflash *mfl, u_int32_t init_delay_us, u_int32_t retry_delay_us,
-    u_int32_t num_of_retries)
+#define CHECK_RC_REL_SEM(mfl, rc)      \
+    do                                 \
+    {                                  \
+        if (rc)                        \
+        {                              \
+            release_semaphore(mfl, 0); \
+            return rc;                 \
+        }                              \
+    } while (0)
+
+static int st_spi_wait_wip(mflash* mfl, u_int32_t init_delay_us, u_int32_t retry_delay_us, u_int32_t num_of_retries)
 {
-
     int rc = 0;
     u_int8_t status = 0;
     u_int32_t i = 0;
 
     usleep(init_delay_us);
 
-    for (i = 0; i < num_of_retries; ++i) {
+    for (i = 0; i < num_of_retries; ++i)
+    {
         rc = mfl->f_spi_status(mfl, SFC_RDSR, &status);
         CHECK_RC(rc);
-        if ((status & 1) == 0) {
+        if ((status & 1) == 0)
+        {
             return MFE_OK;
         }
         usleep(retry_delay_us);
-        if (mfl->cputUtilizationApplied) {
-            if ((i % mfl->cpuPercent) == 0) {
+        if (mfl->cputUtilizationApplied)
+        {
+            if ((i % mfl->cpuPercent) == 0)
+            {
                 msleep(1);
             }
         }
@@ -82,29 +101,39 @@ static int st_spi_wait_wip(mflash *mfl, u_int32_t init_delay_us, u_int32_t retry
     return MFE_WRITE_TIMEOUT;
 }
 
-static bool is_x_byte_address_access_commands(mflash *mfl, int x)
+static bool is_x_byte_address_access_commands(mflash* mfl, int x)
 {
-    if (x != 3 && x != 4) {
+    if (x != 3 && x != 4)
+    {
         return false;
     }
 
-    flash_access_commands_t compared_to_access_commands = (x == 4) ? gen_4byte_address_access_commands() : gen_3byte_address_access_commands();
+    flash_access_commands_t compared_to_access_commands =
+      (x == 4) ? gen_4byte_address_access_commands() : gen_3byte_address_access_commands();
     flash_access_commands_t cur = mfl->attr.access_commands;
 
-    return (compared_to_access_commands.sfc_sector_erase == cur.sfc_sector_erase && compared_to_access_commands.sfc_subsector_erase == cur.sfc_subsector_erase && compared_to_access_commands.sfc_page_program == cur.sfc_page_program && compared_to_access_commands.sfc_read == cur.sfc_read && compared_to_access_commands.sfc_fast_read == cur.sfc_fast_read);
+    return (compared_to_access_commands.sfc_sector_erase == cur.sfc_sector_erase &&
+            compared_to_access_commands.sfc_subsector_erase == cur.sfc_subsector_erase &&
+            compared_to_access_commands.sfc_page_program == cur.sfc_page_program &&
+            compared_to_access_commands.sfc_read == cur.sfc_read &&
+            compared_to_access_commands.sfc_fast_read == cur.sfc_fast_read);
 }
-static int new_gw_exec_cmd(mflash *mfl, u_int32_t gw_cmd, char *msg)
+static int new_gw_exec_cmd(mflash* mfl, u_int32_t gw_cmd, char* msg)
 {
-    if (!IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id)) {
+    if (!IS_CONNECTX_4TH_GEN_FAMILY(mfl->attr.hw_dev_id))
+    {
         // for old devices lock bit is separate from the flash HW ifc
-        //for new devices need to make sure this bit remains locked when writing the dword
+        // for new devices need to make sure this bit remains locked when writing the dword
         gw_cmd = MERGE(gw_cmd, 1, 31, 1);
     }
-    if ((gw_cmd & (1 << HBO_ADDR_PHASE)) != 0) { // This is an access command
-        if (is_x_byte_address_access_commands(mfl, 4)) {
+    if ((gw_cmd & (1 << HBO_ADDR_PHASE)) != 0)
+    { // This is an access command
+        if (is_x_byte_address_access_commands(mfl, 4))
+        {
             gw_cmd = MERGE(gw_cmd, 1, HBO_NEW_GW_ADDR_SIZE, 1);
         }
-        else if (!is_x_byte_address_access_commands(mfl, 3)) {
+        else if (!is_x_byte_address_access_commands(mfl, 3))
+        {
             return MFE_ACCESS_COMMANDS_NOT_INITIALIZED;
         }
     }
@@ -112,11 +141,13 @@ static int new_gw_exec_cmd(mflash *mfl, u_int32_t gw_cmd, char *msg)
 
     MfError status;
     int flash_enable_needed = is_flash_enable_needed(mfl, &status);
-    //for new devices this value is always 0
-    if (status != MFE_OK) {
+    // for new devices this value is always 0
+    if (status != MFE_OK)
+    {
         return status;
     }
-    if (flash_enable_needed) {
+    if (flash_enable_needed)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_FLASH_ENABLE, 1);
     }
 
@@ -134,15 +165,16 @@ static int new_gw_exec_cmd(mflash *mfl, u_int32_t gw_cmd, char *msg)
  * buff - pointer to a buffer where the output data from the flash GW will be written to
  * buff_dword_sz - size for buff in dwords
  * addr - if != NULL *addr will be written to the addr bits of the flash GW. (for commands that read from flash)
- * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put usefull
- *        data for future dubugabillity.
- * return : MFE_OK (0) upon success or a value != 0 upon error accroding to mlfash error code.
+ * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put
+ * usefull data for future dubugabillity. return : MFE_OK (0) upon success or a value != 0 upon error accroding to
+ * mlfash error code.
  */
-static int new_gw_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int buff_dword_sz,
-    u_int32_t *addr, char *msg)
+static int
+  new_gw_exec_cmd_get(mflash* mfl, u_int32_t gw_cmd, u_int32_t* buff, int buff_dword_sz, u_int32_t* addr, char* msg)
 {
     int rc = 0;
-    if (!mfl || !buff || !buff_dword_sz) {
+    if (!mfl || !buff || !buff_dword_sz)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -150,8 +182,10 @@ static int new_gw_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, i
     CHECK_RC(rc);
 
     // write GW addr if needed
-    if (addr) {
-        if (mwrite4(mfl->mf, HCR_FLASH_NEW_GW_ADDR, *addr) != 4) {
+    if (addr)
+    {
+        if (mwrite4(mfl->mf, HCR_FLASH_NEW_GW_ADDR, *addr) != 4)
+        {
             release_semaphore(mfl, 0);
             return MFE_CR_ERROR;
         }
@@ -160,11 +194,12 @@ static int new_gw_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, i
     rc = new_gw_exec_cmd(mfl, gw_cmd, msg);
     CHECK_RC_REL_SEM(mfl, rc);
     // copy data from CR-space to buff
-    if (mread4_block(mfl->mf, HCR_FLASH_DATA, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2)) {
+    if (mread4_block(mfl->mf, HCR_FLASH_DATA, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2))
+    {
         release_semaphore(mfl, 0);
         return MFE_CR_ERROR;
     }
-    //release semaphore
+    // release semaphore
     release_semaphore(mfl, 0);
     return MFE_OK;
 }
@@ -177,15 +212,16 @@ static int new_gw_exec_cmd_get(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, i
  * buff - if != NULL pointer to a buffer to the input data for the flash GW.
  * buff_dword_sz - size for buff in dwords
  * addr - if != NULL *addr will be written to the addr bits of the flash GW. (for commands that write from flash)
- * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put usefull
- *        data for future debugability.
- * return : MFE_OK (0) upon success or a value != 0 upon error accroding to mlfash error code.
+ * msg - optional string that describes the action for debug purposes, not used ATM however its recommended to put
+ * usefull data for future debugability. return : MFE_OK (0) upon success or a value != 0 upon error accroding to mlfash
+ * error code.
  */
-static int new_gw_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, int buff_dword_sz,
-    u_int32_t *addr, char *msg)
+static int
+  new_gw_exec_cmd_set(mflash* mfl, u_int32_t gw_cmd, u_int32_t* buff, int buff_dword_sz, u_int32_t* addr, char* msg)
 {
     int rc = 0;
-    if (!mfl) {
+    if (!mfl)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -193,16 +229,20 @@ static int new_gw_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, i
     CHECK_RC(rc);
 
     // write data from buff to CR-space
-    if (buff && buff_dword_sz) {
-        if (mwrite4_block(mfl->mf, HCR_FLASH_DATA, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2)) {
+    if (buff && buff_dword_sz)
+    {
+        if (mwrite4_block(mfl->mf, HCR_FLASH_DATA, buff, (buff_dword_sz << 2)) != (buff_dword_sz << 2))
+        {
             release_semaphore(mfl, 0);
             return MFE_CR_ERROR;
         }
     }
 
     // write GW addr if needed
-    if (addr) {
-        if (mwrite4(mfl->mf, HCR_FLASH_NEW_GW_ADDR, *addr) != 4) {
+    if (addr)
+    {
+        if (mwrite4(mfl->mf, HCR_FLASH_NEW_GW_ADDR, *addr) != 4)
+        {
             release_semaphore(mfl, 0);
             return MFE_CR_ERROR;
         }
@@ -211,18 +251,18 @@ static int new_gw_exec_cmd_set(mflash *mfl, u_int32_t gw_cmd, u_int32_t *buff, i
     rc = new_gw_exec_cmd(mfl, gw_cmd, msg);
     CHECK_RC_REL_SEM(mfl, rc);
 
-    //release semaphore
+    // release semaphore
     release_semaphore(mfl, 0);
     return MFE_OK;
 }
 
-int new_gw_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *status, u_int8_t bytes_num)
+int new_gw_int_spi_get_status_data(mflash* mfl, u_int8_t op_type, u_int32_t* status, u_int8_t bytes_num)
 {
     int rc = 0;
 
     u_int32_t gw_cmd = 0;
     u_int32_t flash_data = 0;
-    //TODO: adrianc: update msize from log2(bytes_num)
+    // TODO: adrianc: update msize from log2(bytes_num)
     gw_cmd = MERGE(gw_cmd, 1, HBO_READ_OP, 1);
     gw_cmd = MERGE(gw_cmd, 1, HBO_CMD_PHASE, 1);
     gw_cmd = MERGE(gw_cmd, 1, HBO_DATA_PHASE, 1);
@@ -230,7 +270,8 @@ int new_gw_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *sta
 
     gw_cmd = MERGE(gw_cmd, op_type, HBO_CMD, HBS_CMD);
     DPRINTF(("NEW gateway CMD gw_cmd=%08x\n", gw_cmd));
-    if (bytes_num > 4) {
+    if (bytes_num > 4)
+    {
         return MFE_BAD_PARAMS;
     }
     rc = new_gw_exec_cmd_get(mfl, gw_cmd, &flash_data, 1, (u_int32_t*)NULL, "Read id");
@@ -239,7 +280,7 @@ int new_gw_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *sta
     *status = (flash_data >> 8 * (4 - bytes_num));
     return MFE_OK;
 }
-int new_gw_st_spi_write_enable(mflash *mfl)
+int new_gw_st_spi_write_enable(mflash* mfl)
 {
     u_int32_t gw_cmd = 0;
     int rc = 0;
@@ -251,7 +292,7 @@ int new_gw_st_spi_write_enable(mflash *mfl)
     CHECK_RC(rc);
     return MFE_OK;
 }
-int new_gw_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num)
+int new_gw_spi_write_status_reg(mflash* mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num)
 {
     int rc = 0;
     u_int32_t gw_cmd = 0;
@@ -263,7 +304,8 @@ int new_gw_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t writ
 
     gw_cmd = MERGE(gw_cmd, write_cmd, HBO_CMD, HBS_CMD);
 
-    if (bytes_num != 1 && bytes_num != 2) {
+    if (bytes_num != 1 && bytes_num != 2)
+    {
         return MFE_NOT_SUPPORTED_OPERATION;
     }
     // push status reg to upper bytes
@@ -272,18 +314,21 @@ int new_gw_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t writ
     DPRINTF(("new_gw_spi_write_status_reg: gw_cmd=%08x status_reg=%08x\n", gw_cmd, status_reg));
     rc = new_gw_exec_cmd_set(mfl, gw_cmd, &status_reg, 1, (u_int32_t*)NULL, "Write-Status-Register");
     // wait for flash to write the register
-    if (mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL) { // New CYPRESS
+    if (mfl->attr.vendor == FV_S25FLXXXX && mfl->attr.type == FMT_S25FLXXXL)
+    { // New CYPRESS
         msleep(WRITE_STATUS_REGISTER_DELAY_CYPRESS);
     }
-    else if (mfl->attr.vendor == FV_ST && mfl->attr.type == FMT_N25QXXX) { // New MICRON
+    else if (mfl->attr.vendor == FV_ST && mfl->attr.type == FMT_N25QXXX)
+    { // New MICRON
         msleep(WRITE_STATUS_REGISTER_DELAY_MICRON);
     }
-    else {
+    else
+    {
         msleep(WRITE_STATUS_REGISTER_DELAY_MIN); // Some can sleep only 30 or even 15. We should consider optimize this.
     }
     return rc;
 }
-int new_gw_st_spi_erase_sect(mflash *mfl, u_int32_t addr)
+int new_gw_st_spi_erase_sect(mflash* mfl, u_int32_t addr)
 {
     int rc = 0;
 
@@ -312,8 +357,13 @@ int new_gw_st_spi_erase_sect(mflash *mfl, u_int32_t addr)
     CHECK_RC(rc);
     return MFE_OK;
 }
-int new_gw_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data,
-    u_int8_t is_first, u_int8_t is_last, u_int32_t total_size)
+int new_gw_st_spi_block_write_ex(mflash* mfl,
+                                 u_int32_t blk_addr,
+                                 u_int32_t blk_size,
+                                 u_int8_t* data,
+                                 u_int8_t is_first,
+                                 u_int8_t is_last,
+                                 u_int32_t total_size)
 {
     int rc = 0;
     u_int32_t offs = 0;
@@ -321,14 +371,17 @@ int new_gw_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_
     u_int32_t gw_addr = 0;
     u_int32_t buff[4];
 
-    DPRINTF(("new_gw_st_spi_block_write_ex(addr=%05x, u_int32_t size=%05x, first=%d, last=%d)\n", blk_addr, blk_size, (u_int32_t) is_first, (u_int32_t) is_last));
+    DPRINTF(("new_gw_st_spi_block_write_ex(addr=%05x, u_int32_t size=%05x, first=%d, last=%d)\n", blk_addr, blk_size,
+             (u_int32_t)is_first, (u_int32_t)is_last));
 
-    if (blk_addr & ((u_int32_t)mfl->attr.block_write - 1)) {
+    if (blk_addr & ((u_int32_t)mfl->attr.block_write - 1))
+    {
         return MFE_BAD_ALIGN;
     }
 
     // sanity check ??? remove ???
-    if (blk_size != (u_int32_t)mfl->attr.block_write) {
+    if (blk_size != (u_int32_t)mfl->attr.block_write)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -338,7 +391,8 @@ int new_gw_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_
     gw_cmd = MERGE(gw_cmd, 1, HBO_DATA_PHASE, 1);
     gw_cmd = MERGE(gw_cmd, blk_size, HBO_MSIZE, HBS_NEW_GW_MSIZE);
 
-    if (is_first) {
+    if (is_first)
+    {
         rc = new_gw_st_spi_write_enable(mfl);
         CHECK_RC(rc);
 
@@ -350,19 +404,21 @@ int new_gw_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_
         DPRINTF(("-D- gw_addr = %#x, blk_addr = %#x\n", gw_addr, blk_addr));
     }
 
-    if (!is_last) {
+    if (!is_last)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_CS_HOLD, 1);
     }
 
     // Data:
-    for (offs = 0; offs < blk_size; offs += 4) {
+    for (offs = 0; offs < blk_size; offs += 4)
+    {
         u_int32_t word = 0;
 
         word = MERGE(word, data[offs + 0], 24, 8);
         word = MERGE(word, data[offs + 1], 16, 8);
         word = MERGE(word, data[offs + 2], 8, 8);
         word = MERGE(word, data[offs + 3], 0, 8);
-        //MWRITE4(HCR_FLASH_DATA + offs, word );
+        // MWRITE4(HCR_FLASH_DATA + offs, word );
         buff[offs / 4] = word;
         DPRINTF(("-D- word = 0x%08x, %d\n", word, HBS_CMD));
     }
@@ -374,15 +430,17 @@ int new_gw_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_
     // Wait for end of write in flash (WriteInProgress = 0):
     //
 
-    if (is_last) {
-        rc = st_spi_wait_wip(mfl, WRITE_BLOCK_INIT_DELAY + WRITE_ADDITIONAL_BYTE_DELAY * total_size, WRITE_BLOCK_RETRY_DELAY, WRITE_BLOCK_RETRIES);
+    if (is_last)
+    {
+        rc = st_spi_wait_wip(mfl, WRITE_BLOCK_INIT_DELAY + WRITE_ADDITIONAL_BYTE_DELAY * total_size,
+                             WRITE_BLOCK_RETRY_DELAY, WRITE_BLOCK_RETRIES);
         CHECK_RC(rc);
     }
 
     return MFE_OK;
 }
 
-int new_gw_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data)
+int new_gw_sst_spi_block_write_ex(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data)
 {
     int rc = 0;
     u_int32_t gw_cmd = 0;
@@ -390,7 +448,8 @@ int new_gw_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk
     u_int32_t word = 0;
 
     // sanity check ??? remove ???
-    if (blk_size != (u_int32_t)mfl->attr.block_write) {
+    if (blk_size != (u_int32_t)mfl->attr.block_write)
+    {
         return MFE_BAD_PARAMS;
     }
 
@@ -410,7 +469,7 @@ int new_gw_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk
 
     gw_addr = blk_addr & ONES32(mfl->attr.log2_bank_size);
 
-    //gw_cmd = MERGE(gw_cmd, 1               , HBO_NEW_GW_CS_HOLD,    1);
+    // gw_cmd = MERGE(gw_cmd, 1               , HBO_NEW_GW_CS_HOLD,    1);
 
     word = MERGE(word, data[0], 24, 8);
 
@@ -424,8 +483,13 @@ int new_gw_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk
 
     return MFE_OK;
 }
-int new_gw_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data,
-    u_int8_t is_first, u_int8_t is_last, bool verbose)
+int new_gw_st_spi_block_read_ex(mflash* mfl,
+                                u_int32_t blk_addr,
+                                u_int32_t blk_size,
+                                u_int8_t* data,
+                                u_int8_t is_first,
+                                u_int8_t is_last,
+                                bool verbose)
 {
     (void)verbose;
     int rc = 0;
@@ -433,25 +497,30 @@ int new_gw_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_s
     u_int32_t gw_cmd = 0;
     u_int32_t gw_addr = 0;
 
-    DPRINTF(("-D- new_gw_st_spi_block_read_ex(addr=%05x, u_int32_t size=%05x, first=%d, last=%d)\n", blk_addr, blk_size, (u_int32_t) is_first, (u_int32_t) is_last));
+    DPRINTF(("-D- new_gw_st_spi_block_read_ex(addr=%05x, u_int32_t size=%05x, first=%d, last=%d)\n", blk_addr, blk_size,
+             (u_int32_t)is_first, (u_int32_t)is_last));
     COM_CHECK_ALIGN(blk_addr, blk_size);
 
-    if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4) {
+    if (blk_size > (u_int32_t)mfl->attr.block_write || blk_size < 4)
+    {
         return MFE_BAD_PARAMS;
     }
 
     rc = set_bank(mfl, blk_addr);
     CHECK_RC(rc);
 
-    if (is_first) {
+    if (is_first)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_CMD_PHASE, 1);
         gw_cmd = MERGE(gw_cmd, 1, HBO_ADDR_PHASE, 1);
         gw_cmd = MERGE(gw_cmd, mfl->attr.access_commands.sfc_read, HBO_CMD, HBS_CMD);
         rc = get_flash_offset(blk_addr, mfl->attr.log2_bank_size, &gw_addr);
         CHECK_RC(rc);
     }
-    DPRINTF(("-D- gw_addr = %#x, gw_cmd = %#x, blk_addr = %#x, mfl->attr.log2_bank_size = %#x\n", gw_addr, gw_cmd, blk_addr, mfl->attr.log2_bank_size));
-    if (!is_last) {
+    DPRINTF(("-D- gw_addr = %#x, gw_cmd = %#x, blk_addr = %#x, mfl->attr.log2_bank_size = %#x\n", gw_addr, gw_cmd,
+             blk_addr, mfl->attr.log2_bank_size));
+    if (!is_last)
+    {
         gw_cmd = MERGE(gw_cmd, 1, HBO_CS_HOLD, 1);
     }
 
@@ -462,7 +531,8 @@ int new_gw_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_s
 
     rc = new_gw_exec_cmd_get(mfl, gw_cmd, (u_int32_t*)data, (blk_size >> 2), &gw_addr, "Read");
     CHECK_RC(rc);
-    for (i = 0; i < blk_size; i += 4) {
+    for (i = 0; i < blk_size; i += 4)
+    {
         *(u_int32_t*)(data + i) = __be32_to_cpu(*(u_int32_t*)(data + i));
     }
     return MFE_OK;
diff --git a/mflash/mflash_new_gw.h b/mflash/mflash_new_gw.h
index 58f620ce..c86d582e 100644
--- a/mflash/mflash_new_gw.h
+++ b/mflash/mflash_new_gw.h
@@ -30,7 +30,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
-*/
+ */
 
 /*
  * mflash_gw.h
@@ -39,15 +39,26 @@
  *      Author: edwardg
  */
 
-
 #ifndef _MFLASH_NEW_GW_H_
 #define _MFLASH_NEW_GW_H_
 #include "mflash_pack_layer.h"
 // ConnectX SPI interface:
-int new_gw_st_spi_erase_sect(mflash *mfl, u_int32_t addr);
-int new_gw_int_spi_get_status_data(mflash *mfl, u_int8_t op_type, u_int32_t *status, u_int8_t data_num);
-int new_gw_st_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, u_int8_t is_first, u_int8_t is_last, u_int32_t total_size);
-int new_gw_sst_spi_block_write_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data);
-int new_gw_st_spi_block_read_ex(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, u_int8_t is_first, u_int8_t is_last, bool verbose);
-int new_gw_spi_write_status_reg(mflash *mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num);
+int new_gw_st_spi_erase_sect(mflash* mfl, u_int32_t addr);
+int new_gw_int_spi_get_status_data(mflash* mfl, u_int8_t op_type, u_int32_t* status, u_int8_t data_num);
+int new_gw_st_spi_block_write_ex(mflash* mfl,
+                                 u_int32_t blk_addr,
+                                 u_int32_t blk_size,
+                                 u_int8_t* data,
+                                 u_int8_t is_first,
+                                 u_int8_t is_last,
+                                 u_int32_t total_size);
+int new_gw_sst_spi_block_write_ex(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data);
+int new_gw_st_spi_block_read_ex(mflash* mfl,
+                                u_int32_t blk_addr,
+                                u_int32_t blk_size,
+                                u_int8_t* data,
+                                u_int8_t is_first,
+                                u_int8_t is_last,
+                                bool verbose);
+int new_gw_spi_write_status_reg(mflash* mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num);
 #endif
diff --git a/mflash/mflash_pack_layer.c b/mflash/mflash_pack_layer.c
index 5e0a41d8..ac00db7f 100644
--- a/mflash/mflash_pack_layer.c
+++ b/mflash/mflash_pack_layer.c
@@ -42,64 +42,76 @@
 #include "mflash_types.h"
 #include "mflash_pack_layer.h"
 
-int sx_st_block_access(mfile *mf, u_int32_t flash_addr, u_int8_t bank, u_int32_t size, u_int8_t *data,
-        reg_access_method_t method)
+int sx_st_block_access(mfile* mf,
+                       u_int32_t flash_addr,
+                       u_int8_t bank,
+                       u_int32_t size,
+                       u_int8_t* data,
+                       reg_access_method_t method)
 {
     struct register_access_mfba mfba;
     int rc;
     int max_size = mget_max_reg_size(mf, (maccess_reg_method_t)method);
-    if (!max_size) {
+    if (!max_size)
+    {
         return MFE_BAD_PARAMS;
     }
     // when writing max size is limited to the nearest power of 2 of the max_size
     // while limiting it to 256 bytes
     max_size = NEAREST_POW2(max_size);
 
-    if (size > (u_int32_t)max_size) {
+    if (size > (u_int32_t)max_size)
+    {
         return MFE_BAD_PARAMS;
     }
 
     // Init mfba
     memset(&mfba, 0, sizeof(mfba));
     mfba.address = flash_addr;
-    mfba.fs      = bank;
-    mfba.size    = size;
+    mfba.fs = bank;
+    mfba.size = size;
 
-    if (method == REG_ACCESS_METHOD_SET) {
+    if (method == REG_ACCESS_METHOD_SET)
+    {
         u_int32_t i;
-        for (i = 0; i < size / 4; i++) {
+        for (i = 0; i < size / 4; i++)
+        {
             mfba.data[i] = __le32_to_cpu(*((u_int32_t*)&(data[4 * i])));
         }
     }
-    rc = reg_access_mfba(mf, method, &mfba); CHECK_RC(MError2MfError((MError)rc));
+    rc = reg_access_mfba(mf, method, &mfba);
+    CHECK_RC(MError2MfError((MError)rc));
 
     // Get data from mfba
-    if (method == REG_ACCESS_METHOD_GET) {
+    if (method == REG_ACCESS_METHOD_GET)
+    {
         u_int32_t i;
-        for (i = 0; i < size / 4; i++) {
+        for (i = 0; i < size / 4; i++)
+        {
             *((u_int32_t*)&(data[i * 4])) = __cpu_to_le32(mfba.data[i]);
         }
     }
     return MFE_OK;
 }
 
-
-int common_erase_sector(mfile *mf, u_int32_t addr, u_int8_t flash_bank, u_int32_t erase_size)
+int common_erase_sector(mfile* mf, u_int32_t addr, u_int8_t flash_bank, u_int32_t erase_size)
 {
     struct register_access_mfbe mfbe;
-    if (addr & (erase_size - 1)) {
+    if (addr & (erase_size - 1))
+    {
         return MFE_ERASE_ERROR;
     }
     memset(&mfbe, 0, sizeof(mfbe));
     mfbe.address = addr;
-    mfbe.fs      = flash_bank;
-    if (erase_size == FSS_64KB) {
+    mfbe.fs = flash_bank;
+    if (erase_size == FSS_64KB)
+    {
         mfbe.bulk_64kb_erase = 1;
     }
     return MError2MfError(reg_access_mfbe(mf, REG_ACCESS_METHOD_SET, &mfbe));
 }
 
-int run_mfpa_command(mfile *mf, u_int8_t access_cmd, mfpa_command_args *mfpa_args)
+int run_mfpa_command(mfile* mf, u_int8_t access_cmd, mfpa_command_args* mfpa_args)
 {
     struct tools_open_mfpa mfpa;
     int rc;
@@ -107,57 +119,67 @@ int run_mfpa_command(mfile *mf, u_int8_t access_cmd, mfpa_command_args *mfpa_arg
     memset(&mfpa, 0, sizeof(mfpa));
     mfpa.fs = mfpa_args->flash_bank;
 
-    if (access_cmd == REG_ACCESS_METHOD_SET) {
+    if (access_cmd == REG_ACCESS_METHOD_SET)
+    {
         mfpa.boot_address = mfpa_args->boot_address;
     }
     rc = MError2MfError(reg_access_mfpa_new(mf, (reg_access_method_t)access_cmd, &mfpa));
 
-    if (rc && rc != MFE_REG_ACCESS_BAD_PARAM) {
+    if (rc && rc != MFE_REG_ACCESS_BAD_PARAM)
+    {
         // if rc is REG_ACCESS_BAD_PARAM it means we dont have that flash bank connected (no need to fail)
         return rc;
     }
 
-    if (access_cmd == REG_ACCESS_METHOD_GET) {
+    if (access_cmd == REG_ACCESS_METHOD_GET)
+    {
         // swap bytes as they are inverted
         mfpa_args->jedec_id = ___my_swab32(mfpa.jedec_id);
-        // HACK: FW had a bug and returned the same jedec-ID even there was no flash, so when flash doesn't exist jedec will be modified to 0xffffffff
-        if (mfpa_args->flash_bank >= mfpa.flash_num || rc == MFE_REG_ACCESS_BAD_PARAM) {
+        // HACK: FW had a bug and returned the same jedec-ID even there was no flash, so when flash doesn't exist jedec
+        // will be modified to 0xffffffff
+        if (mfpa_args->flash_bank >= mfpa.flash_num || rc == MFE_REG_ACCESS_BAD_PARAM)
+        {
             mfpa_args->jedec_id = 0xffffffff;
         }
 
-
         mfpa_args->num_of_banks = mfpa.flash_num;
 
-        if (mfpa.sector_size) {
+        if (mfpa.sector_size)
+        {
             mfpa_args->fw_flash_sector_sz = 1 << mfpa.sector_size; // 2^log2_sector_size_in_KB
             // Hack: some CX3 FW has this number in KB, possible values : 4 or 64
-            if (mfpa_args->fw_flash_sector_sz == 4 || mfpa_args->fw_flash_sector_sz == 64) {
+            if (mfpa_args->fw_flash_sector_sz == 4 || mfpa_args->fw_flash_sector_sz == 64)
+            {
                 mfpa_args->fw_flash_sector_sz *= 1024;
             }
-        } else {
+        }
+        else
+        {
             mfpa_args->fw_flash_sector_sz = 0;
         }
         mfpa_args->supp_sub_and_sector_erase = mfpa.bulk_64kb_erase_en;
-        mfpa_args->supp_dummy_cycles =  EXTRACT(mfpa.capability_mask, 18, 1) & 0; // adrianc: no support from FW so i am not enabling this
-        mfpa_args->supp_quad_en =  EXTRACT(mfpa.capability_mask, 17, 1);
+        mfpa_args->supp_dummy_cycles =
+          EXTRACT(mfpa.capability_mask, 18, 1) & 0; // adrianc: no support from FW so i am not enabling this
+        mfpa_args->supp_quad_en = EXTRACT(mfpa.capability_mask, 17, 1);
         mfpa_args->supp_sector_write_prot = EXTRACT(mfpa.capability_mask, 16, 1) & mfpa.sector_wrp_en;
         mfpa_args->supp_sub_sector_write_prot = EXTRACT(mfpa.capability_mask, 16, 1) & mfpa.sub_sector_wrp_en;
     }
     return MFE_OK;
 }
 
-int get_num_of_banks(mfile *mf)
+int get_num_of_banks(mfile* mf)
 {
     mfpa_command_args mfpa_args;
     memset(&mfpa_args, 0, sizeof(mfpa_args));
     int rc = run_mfpa_command(mf, REG_ACCESS_METHOD_GET, &mfpa_args);
-    if (rc) {
+    if (rc)
+    {
         return -1;
     }
     return mfpa_args.num_of_banks;
 }
 
-int com_get_jedec(mfile *mf, mfpa_command_args *mfpa_args)
+int com_get_jedec(mfile* mf, mfpa_command_args* mfpa_args)
 {
     return run_mfpa_command(mf, REG_ACCESS_METHOD_GET, mfpa_args);
 }
@@ -169,21 +191,25 @@ int com_get_jedec(mfile *mf, mfpa_command_args *mfpa_args)
  * (bug where accessing gpio of flash bank 4 caused system reboot)
  */
 #define MFLASH_BANK_DEBUG "MFLASH_BANK_DEBUG"
-int set_bank_int(mflash *mfl, int bank_num)
+int set_bank_int(mflash* mfl, int bank_num)
 {
-    const char *mflash_env;
+    const char* mflash_env;
     int max_bank;
 
     // dont update curr_bank if not needed
-    if (mfl->curr_bank == bank_num) {
+    if (mfl->curr_bank == bank_num)
+    {
         return ME_OK;
     }
 
     mflash_env = getenv(MFLASH_BANK_DEBUG);
-    if (mflash_env) {
-        max_bank =  atol(mflash_env);
-        if (bank_num > max_bank) {
-            printf("-E- there was an attempt to set the flash bank to: %d. max allowed value: %d\n", bank_num, max_bank);
+    if (mflash_env)
+    {
+        max_bank = atol(mflash_env);
+        if (bank_num > max_bank)
+        {
+            printf("-E- there was an attempt to set the flash bank to: %d. max allowed value: %d\n", bank_num,
+                   max_bank);
             return MFE_ILLEGAL_BANK_NUM;
         }
     }
@@ -191,157 +217,162 @@ int set_bank_int(mflash *mfl, int bank_num)
     return ME_OK;
 }
 
-int get_bank_int(mflash *mfl)
+int get_bank_int(mflash* mfl)
 {
     return mfl->curr_bank;
 }
 
-int set_bank(mflash *mfl, u_int32_t addr)
+int set_bank(mflash* mfl, u_int32_t addr)
 {
     int bank = addr >> mfl->attr.log2_bank_size;
     int rc;
 
-    if (get_bank_int(mfl) != bank) {
-        rc = set_bank_int(mfl, bank); CHECK_RC(rc);
+    if (get_bank_int(mfl) != bank)
+    {
+        rc = set_bank_int(mfl, bank);
+        CHECK_RC(rc);
         return mfl->f_set_bank(mfl, bank);
     }
 
     return MFE_OK;
 }
 
-int get_flash_offset(u_int32_t addr, int log2_bank_size, u_int32_t *flash_addr_p)
+int get_flash_offset(u_int32_t addr, int log2_bank_size, u_int32_t* flash_addr_p)
 {
     *flash_addr_p = addr & ONES32(log2_bank_size);
     return MFE_OK;
 }
 
-int mfl_get_bank_info(mflash *mfl, u_int32_t addr, u_int32_t *flash_off_p, int *bank_p)
+int mfl_get_bank_info(mflash* mfl, u_int32_t addr, u_int32_t* flash_off_p, int* bank_p)
 {
     int rc;
     // Get the bank number
-    rc = set_bank(mfl, addr);                                           CHECK_RC(rc);
+    rc = set_bank(mfl, addr);
+    CHECK_RC(rc);
     *bank_p = get_bank_int(mfl);
     // Get the offset in the flash
-    rc = get_flash_offset(addr, mfl->attr.log2_bank_size, flash_off_p); CHECK_RC(rc);
+    rc = get_flash_offset(addr, mfl->attr.log2_bank_size, flash_off_p);
+    CHECK_RC(rc);
     return MFE_OK;
 }
 
 MfError MError2MfError(MError rc)
 {
-    switch (rc) {
-    case ME_OK:
-        return MFE_OK;
+    switch (rc)
+    {
+        case ME_OK:
+            return MFE_OK;
 
-    case ME_ERROR:
-        return MFE_ERROR;
+        case ME_ERROR:
+            return MFE_ERROR;
 
-    case ME_BAD_PARAMS:
-        return MFE_BAD_PARAMS;
+        case ME_BAD_PARAMS:
+            return MFE_BAD_PARAMS;
 
-    case ME_CR_ERROR:
-        return MFE_CR_ERROR;
+        case ME_CR_ERROR:
+            return MFE_CR_ERROR;
 
-    case ME_NOT_IMPLEMENTED:
-        return MFE_NOT_IMPLEMENTED;
+        case ME_NOT_IMPLEMENTED:
+            return MFE_NOT_IMPLEMENTED;
 
-    case ME_SEM_LOCKED:
-        return MFE_SEM_LOCKED;
+        case ME_SEM_LOCKED:
+            return MFE_SEM_LOCKED;
 
-    case ME_MEM_ERROR:
-        return MFE_NOMEM;
+        case ME_MEM_ERROR:
+            return MFE_NOMEM;
 
-    case ME_MAD_SEND_FAILED:
-        return MFE_MAD_SEND_ERR;
+        case ME_MAD_SEND_FAILED:
+            return MFE_MAD_SEND_ERR;
 
-    case ME_UNKOWN_ACCESS_TYPE:
-        return MFE_UNKOWN_ACCESS_TYPE;
+        case ME_UNKOWN_ACCESS_TYPE:
+            return MFE_UNKOWN_ACCESS_TYPE;
 
-    case ME_UNSUPPORTED_DEVICE:
-        return MFE_UNSUPPORTED_DEVICE;
+        case ME_UNSUPPORTED_DEVICE:
+            return MFE_UNSUPPORTED_DEVICE;
 
-    case ME_ICMD_STATUS_CR_FAIL:
-        return MFE_CR_ERROR;
+        case ME_ICMD_STATUS_CR_FAIL:
+            return MFE_CR_ERROR;
 
-    case ME_ICMD_STATUS_SEMAPHORE_TO:
-        return MFE_SEM_LOCKED;
+        case ME_ICMD_STATUS_SEMAPHORE_TO:
+            return MFE_SEM_LOCKED;
 
-    case ME_ICMD_STATUS_EXECUTE_TO:
-        return MFE_CMDIF_TIMEOUT_ERR;
+        case ME_ICMD_STATUS_EXECUTE_TO:
+            return MFE_CMDIF_TIMEOUT_ERR;
 
-    case ME_ICMD_STATUS_IFC_BUSY:
-        return MFE_CMDIF_TIMEOUT_ERR;
+        case ME_ICMD_STATUS_IFC_BUSY:
+            return MFE_CMDIF_TIMEOUT_ERR;
 
-    case ME_ICMD_STATUS_ICMD_NOT_READY:
-        return MFE_CMDIF_NOT_READY;
+        case ME_ICMD_STATUS_ICMD_NOT_READY:
+            return MFE_CMDIF_NOT_READY;
 
-    case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
-        return MFE_ICMD_NOT_SUPPORTED;
+        case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
+            return MFE_ICMD_NOT_SUPPORTED;
 
-    case ME_ICMD_NOT_SUPPORTED:
-        return MFE_ICMD_NOT_SUPPORTED;
+        case ME_ICMD_NOT_SUPPORTED:
+            return MFE_ICMD_NOT_SUPPORTED;
 
-    case ME_ICMD_INVALID_OPCODE:
-        return MFE_ICMD_INVALID_OPCODE;
+        case ME_ICMD_INVALID_OPCODE:
+            return MFE_ICMD_INVALID_OPCODE;
 
-    case ME_ICMD_INVALID_CMD:
-        return MFE_ICMD_INVALID_CMD;
+        case ME_ICMD_INVALID_CMD:
+            return MFE_ICMD_INVALID_CMD;
 
-    case ME_ICMD_OPERATIONAL_ERROR:
-        return MFE_ICMD_OPERATIONAL_ERROR;
+        case ME_ICMD_OPERATIONAL_ERROR:
+            return MFE_ICMD_OPERATIONAL_ERROR;
 
-    case ME_ICMD_BAD_PARAM:
-        return MFE_ICMD_BAD_PARAM;
+        case ME_ICMD_BAD_PARAM:
+            return MFE_ICMD_BAD_PARAM;
 
-    case ME_ICMD_BUSY:
-        return MFE_CMDIF_TIMEOUT_ERR;
+        case ME_ICMD_BUSY:
+            return MFE_CMDIF_TIMEOUT_ERR;
 
-    case ME_REG_ACCESS_BAD_METHOD:
-        return MFE_REG_ACCESS_BAD_METHOD;
+        case ME_REG_ACCESS_BAD_METHOD:
+            return MFE_REG_ACCESS_BAD_METHOD;
 
-    case ME_REG_ACCESS_NOT_SUPPORTED:
-        return MFE_REG_ACCESS_NOT_SUPPORTED;
+        case ME_REG_ACCESS_NOT_SUPPORTED:
+            return MFE_REG_ACCESS_NOT_SUPPORTED;
 
-    case ME_REG_ACCESS_DEV_BUSY:
-        return MFE_REG_ACCESS_DEV_BUSY;
+        case ME_REG_ACCESS_DEV_BUSY:
+            return MFE_REG_ACCESS_DEV_BUSY;
 
-    case ME_REG_ACCESS_VER_NOT_SUPP:
-        return MFE_REG_ACCESS_VER_NOT_SUPP;
+        case ME_REG_ACCESS_VER_NOT_SUPP:
+            return MFE_REG_ACCESS_VER_NOT_SUPP;
 
-    case ME_REG_ACCESS_UNKNOWN_TLV:
-        return MFE_REG_ACCESS_UNKNOWN_TLV;
+        case ME_REG_ACCESS_UNKNOWN_TLV:
+            return MFE_REG_ACCESS_UNKNOWN_TLV;
 
-    case ME_REG_ACCESS_REG_NOT_SUPP:
-        return MFE_REG_ACCESS_REG_NOT_SUPP;
+        case ME_REG_ACCESS_REG_NOT_SUPP:
+            return MFE_REG_ACCESS_REG_NOT_SUPP;
 
-    case ME_REG_ACCESS_CLASS_NOT_SUPP:
-        return MFE_REG_ACCESS_CLASS_NOT_SUPP;
+        case ME_REG_ACCESS_CLASS_NOT_SUPP:
+            return MFE_REG_ACCESS_CLASS_NOT_SUPP;
 
-    case ME_REG_ACCESS_METHOD_NOT_SUPP:
-        return MFE_REG_ACCESS_METHOD_NOT_SUPP;
+        case ME_REG_ACCESS_METHOD_NOT_SUPP:
+            return MFE_REG_ACCESS_METHOD_NOT_SUPP;
 
-    case ME_REG_ACCESS_BAD_PARAM:
-        return MFE_REG_ACCESS_BAD_PARAM;
+        case ME_REG_ACCESS_BAD_PARAM:
+            return MFE_REG_ACCESS_BAD_PARAM;
 
-    case ME_REG_ACCESS_RES_NOT_AVLBL:
-        return MFE_REG_ACCESS_RES_NOT_AVLBL;
+        case ME_REG_ACCESS_RES_NOT_AVLBL:
+            return MFE_REG_ACCESS_RES_NOT_AVLBL;
 
-    case ME_REG_ACCESS_MSG_RECPT_ACK:
-        return MFE_REG_ACCESS_MSG_RECPT_ACK;
+        case ME_REG_ACCESS_MSG_RECPT_ACK:
+            return MFE_REG_ACCESS_MSG_RECPT_ACK;
 
-    case ME_REG_ACCESS_UNKNOWN_ERR:
-        return MFE_REG_ACCESS_UNKNOWN_ERR;
+        case ME_REG_ACCESS_UNKNOWN_ERR:
+            return MFE_REG_ACCESS_UNKNOWN_ERR;
 
-    case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
-        return MFE_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;
+        case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
+            return MFE_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;
 
-    case ME_CMDIF_UNKN_TLV:
-        return MFE_CMDIF_UNKN_TLV;
+        case ME_CMDIF_UNKN_TLV:
+            return MFE_CMDIF_UNKN_TLV;
 
-    case ME_CMDIF_BAD_OP:
-        return MFE_CMDIF_BAD_OP;
+        case ME_CMDIF_BAD_OP:
+            return MFE_CMDIF_BAD_OP;
 
-    default:
-        break;
+        default:
+            break;
     }
     return MFE_INVAL;
 }
diff --git a/mflash/mflash_pack_layer.h b/mflash/mflash_pack_layer.h
index 55014b37..d0f7cacd 100644
--- a/mflash/mflash_pack_layer.h
+++ b/mflash/mflash_pack_layer.h
@@ -50,15 +50,26 @@
 #ifndef UEFI_BUILD
 #include <tools_res_mgmt.h>
 #else
-typedef void*trm_ctx;
+typedef void* trm_ctx;
 #endif
 
 // TODO: use: (int)log2((float)num)
-#define NEAREST_POW2(num) \
-    (num) < (256) ? ((num) < (128) ? ((num) < (64) ? ((num) < (32) ? ((num) < (16) ? ((num) < (8) ? (4) : (8)) : (16)) : (32)) : (64)) : (128)) : (256)
+#define NEAREST_POW2(num)                                                                                    \
+    (num) < (256) ?                                                                                          \
+      ((num) < (128) ?                                                                                       \
+         ((num) < (64) ? ((num) < (32) ? ((num) < (16) ? ((num) < (8) ? (4) : (8)) : (16)) : (32)) : (64)) : \
+         (128)) :                                                                                            \
+      (256)
 
 #ifndef CHECK_RC
-#define CHECK_RC(rc) do {if (rc) {return rc;}} while (0)
+#define CHECK_RC(rc)   \
+    do                 \
+    {                  \
+        if (rc)        \
+        {              \
+            return rc; \
+        }              \
+    } while (0)
 #endif
 
 #ifndef ARR_SIZE
@@ -68,32 +79,32 @@ typedef void*trm_ctx;
 #ifndef IRISC
 #define MFLASH_ERR_STR_SIZE 1024
 #else
-#define MFLASH_ERR_STR_SIZE    4
+#define MFLASH_ERR_STR_SIZE 4
 #endif
 
-#define IS4_HW_ID        0x1b3
-#define SWITCHX_HW_ID    0x245
-#define CONNECTX_HW_ID   0x190
-#define CX3_PRO_HW_ID    0x1F7
-#define CX3_HW_ID        0x1F5
-#define CX4_HW_ID        0x209
-#define CX4LX_HW_ID      0x20b
-#define CX5_HW_ID        0x20d
-#define CX6_HW_ID        0x20f
-#define CX7_HW_ID        0x218
-#define CX6DX_HW_ID      0x212
-#define CX6LX_HW_ID      0x216
-#define BLUEFIELD_HW_ID  0x211
+#define IS4_HW_ID 0x1b3
+#define SWITCHX_HW_ID 0x245
+#define CONNECTX_HW_ID 0x190
+#define CX3_PRO_HW_ID 0x1F7
+#define CX3_HW_ID 0x1F5
+#define CX4_HW_ID 0x209
+#define CX4LX_HW_ID 0x20b
+#define CX5_HW_ID 0x20d
+#define CX6_HW_ID 0x20f
+#define CX7_HW_ID 0x218
+#define CX6DX_HW_ID 0x212
+#define CX6LX_HW_ID 0x216
+#define BLUEFIELD_HW_ID 0x211
 #define BLUEFIELD2_HW_ID 0x214
 #define CONNECT_IB_HW_ID 0x1FF
-#define SWITCH_IB_HW_ID  0x247
-#define SPECTRUM_HW_ID   0x249
+#define SWITCH_IB_HW_ID 0x247
+#define SPECTRUM_HW_ID 0x249
 #define SWITCH_IB2_HW_ID 0x24b
-#define QUANTUM_HW_ID    0x24d
-#define SPECTRUM2_HW_ID  0x24e
-#define SPECTRUM3_HW_ID  0x250
-#define QUANTUM2_HW_ID   0x257
-#define SPECTRUM4_HW_ID  0x254
+#define QUANTUM_HW_ID 0x24d
+#define SPECTRUM2_HW_ID 0x24e
+#define SPECTRUM3_HW_ID 0x250
+#define QUANTUM2_HW_ID 0x257
+#define SPECTRUM4_HW_ID 0x254
 #define INBAND_MAX_REG_SIZE 44
 
 /*
@@ -101,96 +112,86 @@ typedef void*trm_ctx;
  */
 #define IS_CONNECTX_4TH_GEN_FAMILY(dev_id) \
     (((dev_id) == CONNECTX_HW_ID) || ((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID))
-#define IS_IS4_FAMILY(dev_id) \
-    (((dev_id) == IS4_HW_ID))
-#define IS_SX(dev_id) \
-    ((dev_id) == SWITCHX_HW_ID)
-#define IS_SIB(dev_id) \
-    ((dev_id) == SWITCH_IB_HW_ID)
-#define IS_SIB2(dev_id) \
-    ((dev_id) == SWITCH_IB2_HW_ID)
-#define IS_SEN(dev_id) \
-    ((dev_id) == SPECTRUM_HW_ID)
-#define IS_SPECTRUM2(dev_id) \
-    ((dev_id) == SPECTRUM2_HW_ID)
-#define IS_CONNECT_IB(dev_id) \
-    ((dev_id) == CONNECT_IB_HW_ID)
-#define IS_CONNECTX4(dev_id) \
-    ((dev_id) == CX4_HW_ID)
-#define IS_CONNECTX4LX(dev_id) \
-    ((dev_id) == CX4LX_HW_ID)
-#define IS_CONNECTX5(dev_id) \
-    ((dev_id) == CX5_HW_ID)
-#define IS_CONNECTX7(dev_id) \
-    ((dev_id) == CX7_HW_ID)
-#define IS_CONNECTX6(dev_id) \
-    ((dev_id) == CX6_HW_ID)
-#define IS_CONNECTX6DX(dev_id) \
-    ((dev_id) == CX6DX_HW_ID)
-#define IS_CONNECTX6LX(dev_id) \
-    ((dev_id) == CX6LX_HW_ID)
-#define IS_BLUEFIELD(dev_id) \
-    ((dev_id) == BLUEFIELD_HW_ID)
-#define IS_QUANTUM(dev_id) \
-    ((dev_id) == QUANTUM_HW_ID)
-#define IS_SPECTRUM(dev_id) \
-    ((dev_id) == SPECTRUM_HW_ID)
-#define IS_BLUEFEILD(dev_id) \
-    ((dev_id) == BLUEFIELD_HW_ID)
-#define IS_BLUEFEILD2(dev_id) \
-    ((dev_id) == BLUEFIELD2_HW_ID)
-#define IS_BLUEFEILD3(dev_id) \
-    ((dev_id) == BLUEFIELD3_HW_ID)
-#define IS_QUANTUM2(dev_id) \
-    ((dev_id) == QUANTUM2_HW_ID)
-#define IS_SPECTRUM4(dev_id) \
-    ((dev_id) == SPECTRUM4_HW_ID)
-
-#define HAS_TOOLS_CMDIF(dev_id) \
-    ((((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID)))
-
-typedef int (*f_mf_lock)(mflash *mfl, int lock_state);
-
-typedef int (*f_mf_set_bank)(mflash *mfl, u_int32_t bank);
-typedef int (*f_mf_read)(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data, bool verbose);
-typedef int (*f_mf_write)(mflash *mfl, u_int32_t addr, u_int32_t len, u_int8_t *data);
-typedef int (*f_mf_erase_sect)(mflash *mfl, u_int32_t addr);
-typedef int (*f_mf_reset)(mflash *mfl);
-
-typedef int (*f_st_spi_status)(mflash *mfl, u_int8_t op_type, u_int8_t *status);
-typedef int (*f_mf_get_info)(mflash *mfl, flash_info_t *f_info, int *log2size, u_int8_t *no_flash);
-typedef int (*f_mf_get_jedec_id)(mflash *mfl, u_int32_t *jedec_id);
+#define IS_IS4_FAMILY(dev_id) (((dev_id) == IS4_HW_ID))
+#define IS_SX(dev_id) ((dev_id) == SWITCHX_HW_ID)
+#define IS_SIB(dev_id) ((dev_id) == SWITCH_IB_HW_ID)
+#define IS_SIB2(dev_id) ((dev_id) == SWITCH_IB2_HW_ID)
+#define IS_SEN(dev_id) ((dev_id) == SPECTRUM_HW_ID)
+#define IS_SPECTRUM2(dev_id) ((dev_id) == SPECTRUM2_HW_ID)
+#define IS_CONNECT_IB(dev_id) ((dev_id) == CONNECT_IB_HW_ID)
+#define IS_CONNECTX4(dev_id) ((dev_id) == CX4_HW_ID)
+#define IS_CONNECTX4LX(dev_id) ((dev_id) == CX4LX_HW_ID)
+#define IS_CONNECTX5(dev_id) ((dev_id) == CX5_HW_ID)
+#define IS_CONNECTX7(dev_id) ((dev_id) == CX7_HW_ID)
+#define IS_CONNECTX6(dev_id) ((dev_id) == CX6_HW_ID)
+#define IS_CONNECTX6DX(dev_id) ((dev_id) == CX6DX_HW_ID)
+#define IS_CONNECTX6LX(dev_id) ((dev_id) == CX6LX_HW_ID)
+#define IS_BLUEFIELD(dev_id) ((dev_id) == BLUEFIELD_HW_ID)
+#define IS_QUANTUM(dev_id) ((dev_id) == QUANTUM_HW_ID)
+#define IS_SPECTRUM(dev_id) ((dev_id) == SPECTRUM_HW_ID)
+#define IS_BLUEFEILD(dev_id) ((dev_id) == BLUEFIELD_HW_ID)
+#define IS_BLUEFEILD2(dev_id) ((dev_id) == BLUEFIELD2_HW_ID)
+#define IS_BLUEFEILD3(dev_id) ((dev_id) == BLUEFIELD3_HW_ID)
+#define IS_QUANTUM2(dev_id) ((dev_id) == QUANTUM2_HW_ID)
+#define IS_SPECTRUM4(dev_id) ((dev_id) == SPECTRUM4_HW_ID)
+
+#define HAS_TOOLS_CMDIF(dev_id) ((((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID)))
+
+typedef int (*f_mf_lock)(mflash* mfl, int lock_state);
+
+typedef int (*f_mf_set_bank)(mflash* mfl, u_int32_t bank);
+typedef int (*f_mf_read)(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data, bool verbose);
+typedef int (*f_mf_write)(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data);
+typedef int (*f_mf_erase_sect)(mflash* mfl, u_int32_t addr);
+typedef int (*f_mf_reset)(mflash* mfl);
+
+typedef int (*f_st_spi_status)(mflash* mfl, u_int8_t op_type, u_int8_t* status);
+typedef int (*f_mf_get_info)(mflash* mfl, flash_info_t* f_info, int* log2size, u_int8_t* no_flash);
+typedef int (*f_mf_get_jedec_id)(mflash* mfl, u_int32_t* jedec_id);
 
 /*
  * flash parameters methods get/set
  */
-typedef int (*f_mf_get_quad_en)(mflash *mfl, u_int8_t *quad_en);
-typedef int (*f_mf_set_quad_en)(mflash *mfl, u_int8_t quad_en);
-
-typedef int (*f_mf_get_driver_strength)(mflash *mfl, u_int8_t *driver_strength);
-typedef int (*f_mf_set_driver_strength)(mflash *mfl, u_int8_t driver_strength);
-
-typedef int (*f_mf_get_write_protect)(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-typedef int (*f_mf_set_write_protect)(mflash *mfl, u_int8_t bank_num, write_protect_info_t *protect_info);
-
-typedef int (*f_mf_get_dummy_cycles)(mflash *mfl, u_int8_t *num_of_cycles);
-typedef int (*f_mf_set_dummy_cycles)(mflash *mfl, u_int8_t num_of_cycles);
-
-typedef int (*f_cntx_st_spi_erase_sect)(mflash *mfl, u_int32_t addr);
-typedef int (*f_cntx_int_spi_get_status_data)(mflash *mfl, u_int8_t op_type, u_int32_t *status, u_int8_t data_num);
-typedef int (*f_cntx_st_spi_block_write_ex)(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, u_int8_t is_first, u_int8_t is_last, u_int32_t total_size);
-typedef int (*f_cntx_sst_spi_block_write_ex)(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data);
-typedef int (*f_cntx_st_spi_block_read_ex)(mflash *mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t *data, u_int8_t is_first, u_int8_t is_last, bool verbose);
-typedef int (*f_cntx_spi_write_status_reg)(mflash *mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num);
+typedef int (*f_mf_get_quad_en)(mflash* mfl, u_int8_t* quad_en);
+typedef int (*f_mf_set_quad_en)(mflash* mfl, u_int8_t quad_en);
+
+typedef int (*f_mf_get_driver_strength)(mflash* mfl, u_int8_t* driver_strength);
+typedef int (*f_mf_set_driver_strength)(mflash* mfl, u_int8_t driver_strength);
+
+typedef int (*f_mf_get_write_protect)(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+typedef int (*f_mf_set_write_protect)(mflash* mfl, u_int8_t bank_num, write_protect_info_t* protect_info);
+
+typedef int (*f_mf_get_dummy_cycles)(mflash* mfl, u_int8_t* num_of_cycles);
+typedef int (*f_mf_set_dummy_cycles)(mflash* mfl, u_int8_t num_of_cycles);
+
+typedef int (*f_cntx_st_spi_erase_sect)(mflash* mfl, u_int32_t addr);
+typedef int (*f_cntx_int_spi_get_status_data)(mflash* mfl, u_int8_t op_type, u_int32_t* status, u_int8_t data_num);
+typedef int (*f_cntx_st_spi_block_write_ex)(mflash* mfl,
+                                            u_int32_t blk_addr,
+                                            u_int32_t blk_size,
+                                            u_int8_t* data,
+                                            u_int8_t is_first,
+                                            u_int8_t is_last,
+                                            u_int32_t total_size);
+typedef int (*f_cntx_sst_spi_block_write_ex)(mflash* mfl, u_int32_t blk_addr, u_int32_t blk_size, u_int8_t* data);
+typedef int (*f_cntx_st_spi_block_read_ex)(mflash* mfl,
+                                           u_int32_t blk_addr,
+                                           u_int32_t blk_size,
+                                           u_int8_t* data,
+                                           u_int8_t is_first,
+                                           u_int8_t is_last,
+                                           bool verbose);
+typedef int (*f_cntx_spi_write_status_reg)(mflash* mfl, u_int32_t status_reg, u_int8_t write_cmd, u_int8_t bytes_num);
 
 /////////////////////////////////////////////
 //
 // MFlash struct
 //
 /////////////////////////////////////////////
-struct mflash {
+struct mflash
+{
 #ifndef IRISC
-    mfile *mf;
+    mfile* mf;
 #endif
 
     // Functions:
@@ -202,8 +203,8 @@ struct mflash {
 
     f_mf_read f_read;
     f_mf_write f_write;
-    f_mf_write f_write_blk;   // write and write_block have the same signateure, but theyr'e not the same func !
-    f_mf_read f_read_blk;    // read  and read_block have the same signateure, but theyr'e not the same func !
+    f_mf_write f_write_blk; // write and write_block have the same signateure, but theyr'e not the same func !
+    f_mf_read f_read_blk;   // read  and read_block have the same signateure, but theyr'e not the same func !
     f_mf_erase_sect f_erase_sect;
     f_mf_reset f_reset;
 
@@ -241,7 +242,7 @@ struct mflash {
     int opts[MFO_LAST];
     char last_err_str[MFLASH_ERR_STR_SIZE];
 
-    u_int8_t access_type; //0 = mfile , 1 = uefi
+    u_int8_t access_type; // 0 = mfile , 1 = uefi
     trm_ctx trm;
     dm_dev_id_t dm_dev_id;
     int cputUtilizationApplied;
@@ -255,24 +256,31 @@ struct mflash {
     u_int32_t cache_rep_cmd;
 };
 
-typedef struct mfpa_command_args {
-    u_int8_t flash_bank;                                // IN
-    u_int32_t boot_address;                           // IN/OUT
-    int num_of_banks;                                // OUT
-    u_int32_t jedec_id;                                 // OUT
-    u_int32_t fw_flash_sector_sz;               //OUT
-    u_int8_t supp_sub_and_sector_erase; // OUT
-    u_int8_t supp_sector_write_prot;         // OUT
+typedef struct mfpa_command_args
+{
+    u_int8_t flash_bank;                 // IN
+    u_int32_t boot_address;              // IN/OUT
+    int num_of_banks;                    // OUT
+    u_int32_t jedec_id;                  // OUT
+    u_int32_t fw_flash_sector_sz;        // OUT
+    u_int8_t supp_sub_and_sector_erase;  // OUT
+    u_int8_t supp_sector_write_prot;     // OUT
     u_int8_t supp_sub_sector_write_prot; // OUT
-    u_int8_t supp_quad_en;                      // OUT
-    u_int8_t supp_dummy_cycles;             //OUT
+    u_int8_t supp_quad_en;               // OUT
+    u_int8_t supp_dummy_cycles;          // OUT
 } mfpa_command_args;
 
-enum AccessTypeByMfile {
-    ATBM_NO = 0, ATBM_INBAND, ATBM_MLNXOS_CMDIF, ATBM_ICMD, ATBM_TOOLS_CMDIF,
+enum AccessTypeByMfile
+{
+    ATBM_NO = 0,
+    ATBM_INBAND,
+    ATBM_MLNXOS_CMDIF,
+    ATBM_ICMD,
+    ATBM_TOOLS_CMDIF,
 };
 
-enum CntxCrConstants {
+enum CntxCrConstants
+{
     HCR_FLASH_CMD = 0xf0400,
     HCR_FLASH_ADDR = 0xf0404,
     HCR_FLASH_NEW_GW_ADDR = 0xf0420,
@@ -289,7 +297,6 @@ enum CntxCrConstants {
     HCR_FLASH_GEARBOX_CACHE_REPLACEMENT_CMD = 0x200c,
     HCR_FLASH_GEARBOX_CACHE_REPLACEMENT_EN_ADDR = 0x2020,
 
-
     HBO_READ_OP = 0,
     HBO_CMD_PHASE = 2,
     HBS_CHIP_SELECT = 1,
@@ -301,7 +308,7 @@ enum CntxCrConstants {
     HBO_CS_HOLD = 5,
     HBO_CHIP_SELECT = 11,
     HBO_NEW_GW_CHIP_SELECT = 13,
-    HBO_FLASH_ENABLE = 13, //In old devices
+    HBO_FLASH_ENABLE = 13, // In old devices
     HBO_ADDR_SIZE = 14,
     HBO_NEW_GW_ADDR_SIZE = 15,
     HBO_CMD = 16,
@@ -321,45 +328,55 @@ enum CntxCrConstants {
     HBS_GPIO_CS = 4
 };
 
-#define WRITE_CHECK_ALIGN(addr, block_write, size) { \
-        if (addr & ((u_int32_t)block_write - 1)) { \
-            return MFE_BAD_ALIGN; \
-        } \
-        if (size & ((u_int32_t)block_write - 1)) { \
-            return MFE_BAD_ALIGN; \
-        } \
-}
-
-#define COM_CHECK_ALIGN(flash_addr, size) { \
-        if (flash_addr & (size - 1 )) { \
-            return MFE_BAD_ALIGN; \
-        } \
-}
+#define WRITE_CHECK_ALIGN(addr, block_write, size) \
+    {                                              \
+        if (addr & ((u_int32_t)block_write - 1))   \
+        {                                          \
+            return MFE_BAD_ALIGN;                  \
+        }                                          \
+        if (size & ((u_int32_t)block_write - 1))   \
+        {                                          \
+            return MFE_BAD_ALIGN;                  \
+        }                                          \
+    }
+
+#define COM_CHECK_ALIGN(flash_addr, size) \
+    {                                     \
+        if (flash_addr & (size - 1))      \
+        {                                 \
+            return MFE_BAD_ALIGN;         \
+        }                                 \
+    }
 
 //////////////////////////////////// SX FLASH functions ////////////////////////////////////
 
-typedef u_int32_t (*f_reg_pack)(void *data_to_pack, u_int8_t *packed_buffer);
-typedef void (*f_reg_unpack)(void *unpacked_data, u_int8_t *buffer_to_unpack);
-typedef void (*f_reg_dump)(void *data_to_print, FILE *out_port);
-
-int sx_st_block_access(mfile *mf, u_int32_t flash_addr, u_int8_t bank, u_int32_t size, u_int8_t *data, reg_access_method_t method);
-
-int common_erase_sector(mfile *mf, u_int32_t addr, u_int8_t flash_bank, u_int32_t erase_size);
-
-int run_mfpa_command(mfile *mf, u_int8_t access_cmd, mfpa_command_args *mfpa_args);
-
-int com_get_jedec(mfile *mf, mfpa_command_args *mfpa_args);
-int get_num_of_banks(mfile *mf);
-int get_info_from_jededc_id(u_int32_t jededc_id, u_int8_t *vendor, u_int8_t *type, u_int8_t *capacity);
-int get_type_index_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, unsigned *type_index);
-int get_log2size_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t capacity, int *log2size);
-int get_max_reg_size(mfile *mf);
-
-int set_bank(mflash *mfl, u_int32_t addr);
-int set_bank_int(mflash *mfl, int bank_num);
-int get_bank_int(mflash *mfl);
-int get_flash_offset(u_int32_t addr, int log2_bank_size, u_int32_t *flash_addr_p);
-int mfl_get_bank_info(mflash *mfl, u_int32_t addr, u_int32_t *flash_off_p, int *bank_p);
+typedef u_int32_t (*f_reg_pack)(void* data_to_pack, u_int8_t* packed_buffer);
+typedef void (*f_reg_unpack)(void* unpacked_data, u_int8_t* buffer_to_unpack);
+typedef void (*f_reg_dump)(void* data_to_print, FILE* out_port);
+
+int sx_st_block_access(mfile* mf,
+                       u_int32_t flash_addr,
+                       u_int8_t bank,
+                       u_int32_t size,
+                       u_int8_t* data,
+                       reg_access_method_t method);
+
+int common_erase_sector(mfile* mf, u_int32_t addr, u_int8_t flash_bank, u_int32_t erase_size);
+
+int run_mfpa_command(mfile* mf, u_int8_t access_cmd, mfpa_command_args* mfpa_args);
+
+int com_get_jedec(mfile* mf, mfpa_command_args* mfpa_args);
+int get_num_of_banks(mfile* mf);
+int get_info_from_jededc_id(u_int32_t jededc_id, u_int8_t* vendor, u_int8_t* type, u_int8_t* capacity);
+int get_type_index_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t density, unsigned* type_index);
+int get_log2size_by_vendor_type_density(u_int8_t vendor, u_int8_t type, u_int8_t capacity, int* log2size);
+int get_max_reg_size(mfile* mf);
+
+int set_bank(mflash* mfl, u_int32_t addr);
+int set_bank_int(mflash* mfl, int bank_num);
+int get_bank_int(mflash* mfl);
+int get_flash_offset(u_int32_t addr, int log2_bank_size, u_int32_t* flash_addr_p);
+int mfl_get_bank_info(mflash* mfl, u_int32_t addr, u_int32_t* flash_off_p, int* bank_p);
 MfError MError2MfError(MError rc);
 
 #endif /* MFLASH_COMMON_H_ */
diff --git a/mflash/mflash_types.h b/mflash/mflash_types.h
old mode 100755
new mode 100644
index d09fc03a..a7d7591a
--- a/mflash/mflash_types.h
+++ b/mflash/mflash_types.h
@@ -34,11 +34,14 @@
 #ifndef MFLASH_TYPES_H
 #define MFLASH_TYPES_H
 
-typedef enum {
-    FSS_4KB = 0x1000, FSS_64KB = 0x10000
+typedef enum
+{
+    FSS_4KB = 0x1000,
+    FSS_64KB = 0x10000
 } Flash_Sector_Size_t;
 
-typedef enum MfError {
+typedef enum MfError
+{
     MFE_OK = 0,
     MFE_ERROR,
     MFE_BAD_PARAMS,
@@ -115,4 +118,3 @@ typedef enum MfError {
 } MfError;
 
 #endif // MFLASH_TYPES_H
-
diff --git a/mft_utils/calc_hw_crc.c b/mft_utils/calc_hw_crc.c
index 2a98acd7..0028454d 100644
--- a/mft_utils/calc_hw_crc.c
+++ b/mft_utils/calc_hw_crc.c
@@ -37,55 +37,41 @@
 #include "calc_hw_crc.h"
 
 u_int16_t crc16table2[256] = {
-    0x0000, 0x1BA1, 0x3742, 0x2CE3, 0x6E84, 0x7525, 0x59C6, 0x4267,
-    0xDD08, 0xC6A9, 0xEA4A, 0xF1EB, 0xB38C, 0xA82D, 0x84CE, 0x9F6F,
-    0x1A01, 0x01A0, 0x2D43, 0x36E2, 0x7485, 0x6F24, 0x43C7, 0x5866,
-    0xC709, 0xDCA8, 0xF04B, 0xEBEA, 0xA98D, 0xB22C, 0x9ECF, 0x856E,
-    0x3402, 0x2FA3, 0x0340, 0x18E1, 0x5A86, 0x4127, 0x6DC4, 0x7665,
-    0xE90A, 0xF2AB, 0xDE48, 0xC5E9, 0x878E, 0x9C2F, 0xB0CC, 0xAB6D,
-    0x2E03, 0x35A2, 0x1941, 0x02E0, 0x4087, 0x5B26, 0x77C5, 0x6C64,
-    0xF30B, 0xE8AA, 0xC449, 0xDFE8, 0x9D8F, 0x862E, 0xAACD, 0xB16C,
-    0x6804, 0x73A5, 0x5F46, 0x44E7, 0x0680, 0x1D21, 0x31C2, 0x2A63,
-    0xB50C, 0xAEAD, 0x824E, 0x99EF, 0xDB88, 0xC029, 0xECCA, 0xF76B,
-    0x7205, 0x69A4, 0x4547, 0x5EE6, 0x1C81, 0x0720, 0x2BC3, 0x3062,
-    0xAF0D, 0xB4AC, 0x984F, 0x83EE, 0xC189, 0xDA28, 0xF6CB, 0xED6A,
-    0x5C06, 0x47A7, 0x6B44, 0x70E5, 0x3282, 0x2923, 0x05C0, 0x1E61,
-    0x810E, 0x9AAF, 0xB64C, 0xADED, 0xEF8A, 0xF42B, 0xD8C8, 0xC369,
-    0x4607, 0x5DA6, 0x7145, 0x6AE4, 0x2883, 0x3322, 0x1FC1, 0x0460,
-    0x9B0F, 0x80AE, 0xAC4D, 0xB7EC, 0xF58B, 0xEE2A, 0xC2C9, 0xD968,
-    0xD008, 0xCBA9, 0xE74A, 0xFCEB, 0xBE8C, 0xA52D, 0x89CE, 0x926F,
-    0x0D00, 0x16A1, 0x3A42, 0x21E3, 0x6384, 0x7825, 0x54C6, 0x4F67,
-    0xCA09, 0xD1A8, 0xFD4B, 0xE6EA, 0xA48D, 0xBF2C, 0x93CF, 0x886E,
-    0x1701, 0x0CA0, 0x2043, 0x3BE2, 0x7985, 0x6224, 0x4EC7, 0x5566,
-    0xE40A, 0xFFAB, 0xD348, 0xC8E9, 0x8A8E, 0x912F, 0xBDCC, 0xA66D,
-    0x3902, 0x22A3, 0x0E40, 0x15E1, 0x5786, 0x4C27, 0x60C4, 0x7B65,
-    0xFE0B, 0xE5AA, 0xC949, 0xD2E8, 0x908F, 0x8B2E, 0xA7CD, 0xBC6C,
-    0x2303, 0x38A2, 0x1441, 0x0FE0, 0x4D87, 0x5626, 0x7AC5, 0x6164,
-    0xB80C, 0xA3AD, 0x8F4E, 0x94EF, 0xD688, 0xCD29, 0xE1CA, 0xFA6B,
-    0x6504, 0x7EA5, 0x5246, 0x49E7, 0x0B80, 0x1021, 0x3CC2, 0x2763,
-    0xA20D, 0xB9AC, 0x954F, 0x8EEE, 0xCC89, 0xD728, 0xFBCB, 0xE06A,
-    0x7F05, 0x64A4, 0x4847, 0x53E6, 0x1181, 0x0A20, 0x26C3, 0x3D62,
-    0x8C0E, 0x97AF, 0xBB4C, 0xA0ED, 0xE28A, 0xF92B, 0xD5C8, 0xCE69,
-    0x5106, 0x4AA7, 0x6644, 0x7DE5, 0x3F82, 0x2423, 0x08C0, 0x1361,
-    0x960F, 0x8DAE, 0xA14D, 0xBAEC, 0xF88B, 0xE32A, 0xCFC9, 0xD468,
-    0x4B07, 0x50A6, 0x7C45, 0x67E4, 0x2583, 0x3E22, 0x12C1, 0x0960
-};
+  0x0000, 0x1BA1, 0x3742, 0x2CE3, 0x6E84, 0x7525, 0x59C6, 0x4267, 0xDD08, 0xC6A9, 0xEA4A, 0xF1EB, 0xB38C, 0xA82D,
+  0x84CE, 0x9F6F, 0x1A01, 0x01A0, 0x2D43, 0x36E2, 0x7485, 0x6F24, 0x43C7, 0x5866, 0xC709, 0xDCA8, 0xF04B, 0xEBEA,
+  0xA98D, 0xB22C, 0x9ECF, 0x856E, 0x3402, 0x2FA3, 0x0340, 0x18E1, 0x5A86, 0x4127, 0x6DC4, 0x7665, 0xE90A, 0xF2AB,
+  0xDE48, 0xC5E9, 0x878E, 0x9C2F, 0xB0CC, 0xAB6D, 0x2E03, 0x35A2, 0x1941, 0x02E0, 0x4087, 0x5B26, 0x77C5, 0x6C64,
+  0xF30B, 0xE8AA, 0xC449, 0xDFE8, 0x9D8F, 0x862E, 0xAACD, 0xB16C, 0x6804, 0x73A5, 0x5F46, 0x44E7, 0x0680, 0x1D21,
+  0x31C2, 0x2A63, 0xB50C, 0xAEAD, 0x824E, 0x99EF, 0xDB88, 0xC029, 0xECCA, 0xF76B, 0x7205, 0x69A4, 0x4547, 0x5EE6,
+  0x1C81, 0x0720, 0x2BC3, 0x3062, 0xAF0D, 0xB4AC, 0x984F, 0x83EE, 0xC189, 0xDA28, 0xF6CB, 0xED6A, 0x5C06, 0x47A7,
+  0x6B44, 0x70E5, 0x3282, 0x2923, 0x05C0, 0x1E61, 0x810E, 0x9AAF, 0xB64C, 0xADED, 0xEF8A, 0xF42B, 0xD8C8, 0xC369,
+  0x4607, 0x5DA6, 0x7145, 0x6AE4, 0x2883, 0x3322, 0x1FC1, 0x0460, 0x9B0F, 0x80AE, 0xAC4D, 0xB7EC, 0xF58B, 0xEE2A,
+  0xC2C9, 0xD968, 0xD008, 0xCBA9, 0xE74A, 0xFCEB, 0xBE8C, 0xA52D, 0x89CE, 0x926F, 0x0D00, 0x16A1, 0x3A42, 0x21E3,
+  0x6384, 0x7825, 0x54C6, 0x4F67, 0xCA09, 0xD1A8, 0xFD4B, 0xE6EA, 0xA48D, 0xBF2C, 0x93CF, 0x886E, 0x1701, 0x0CA0,
+  0x2043, 0x3BE2, 0x7985, 0x6224, 0x4EC7, 0x5566, 0xE40A, 0xFFAB, 0xD348, 0xC8E9, 0x8A8E, 0x912F, 0xBDCC, 0xA66D,
+  0x3902, 0x22A3, 0x0E40, 0x15E1, 0x5786, 0x4C27, 0x60C4, 0x7B65, 0xFE0B, 0xE5AA, 0xC949, 0xD2E8, 0x908F, 0x8B2E,
+  0xA7CD, 0xBC6C, 0x2303, 0x38A2, 0x1441, 0x0FE0, 0x4D87, 0x5626, 0x7AC5, 0x6164, 0xB80C, 0xA3AD, 0x8F4E, 0x94EF,
+  0xD688, 0xCD29, 0xE1CA, 0xFA6B, 0x6504, 0x7EA5, 0x5246, 0x49E7, 0x0B80, 0x1021, 0x3CC2, 0x2763, 0xA20D, 0xB9AC,
+  0x954F, 0x8EEE, 0xCC89, 0xD728, 0xFBCB, 0xE06A, 0x7F05, 0x64A4, 0x4847, 0x53E6, 0x1181, 0x0A20, 0x26C3, 0x3D62,
+  0x8C0E, 0x97AF, 0xBB4C, 0xA0ED, 0xE28A, 0xF92B, 0xD5C8, 0xCE69, 0x5106, 0x4AA7, 0x6644, 0x7DE5, 0x3F82, 0x2423,
+  0x08C0, 0x1361, 0x960F, 0x8DAE, 0xA14D, 0xBAEC, 0xF88B, 0xE32A, 0xCFC9, 0xD468, 0x4B07, 0x50A6, 0x7C45, 0x67E4,
+  0x2583, 0x3E22, 0x12C1, 0x0960};
 
-u_int16_t calc_hw_crc(u_int8_t *d, int size)
+u_int16_t calc_hw_crc(u_int8_t* d, int size)
 {
     int i;
-    u_int8_t *data = (u_int8_t*) malloc(sizeof(u_int8_t) * size);
+    u_int8_t* data = (u_int8_t*)malloc(sizeof(u_int8_t) * size);
 
     memcpy(data, d, size);
     data[0] = ~data[0];
     data[1] = ~data[1];
 
     unsigned crc = 0xffff;
-    for (i = 0; i < size; i++) {
+    for (i = 0; i < size; i++)
+    {
         int table_index = ((crc ^ data[i]) & 0xff);
         crc = ((crc >> 8) ^ crc16table2[table_index]);
-    }
-    ;
+    };
     crc = ((crc << 8) & 0xff00) | ((crc >> 8) & 0xff);
 
     free(data);
diff --git a/mft_utils/calc_hw_crc.h b/mft_utils/calc_hw_crc.h
index bdc916ee..cc66834e 100644
--- a/mft_utils/calc_hw_crc.h
+++ b/mft_utils/calc_hw_crc.h
@@ -36,10 +36,11 @@
 #include <tools_utils.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-u_int16_t calc_hw_crc(u_int8_t *data, int size);
+    u_int16_t calc_hw_crc(u_int8_t* data, int size);
 
 #ifdef __cplusplus
 }
diff --git a/mft_utils/errmsg.cpp b/mft_utils/errmsg.cpp
index 52a66b51..a8f7cd93 100644
--- a/mft_utils/errmsg.cpp
+++ b/mft_utils/errmsg.cpp
@@ -42,7 +42,8 @@
 
 #include "errmsg.h"
 
-enum {
+enum
+{
     SUCCESS = 0,
     FAILURE = 1
 };
@@ -69,12 +70,12 @@ ErrMsg::~ErrMsg()
     err_clear();
 }
 
-const char* ErrMsg::getFormatErr(const char *prefix, ...)
+const char* ErrMsg::getFormatErr(const char* prefix, ...)
 {
     va_list args;
-    char *prevFormatErr = _formatErr;
+    char* prevFormatErr = _formatErr;
     va_start(args, prefix);
-    char *preStr = vprint(prefix, args);
+    char* preStr = vprint(prefix, args);
     int formatErrSz = strlen(_err) + strlen(preStr) + 10;
     _formatErr = new char[formatErrSz];
     snprintf(_formatErr, formatErrSz, "-E- %s. %s", preStr, _err);
@@ -87,35 +88,38 @@ const char* ErrMsg::getFormatErr(const char *prefix, ...)
 const char* ErrMsg::err2Str(int errCode) const
 {
     std::map<int, std::string>::const_iterator it;
-    if ( (it = _errMap.find(errCode)) == _errMap.end()) {
+    if ((it = _errMap.find(errCode)) == _errMap.end())
+    {
         return "Unknown Error Code";
     }
     return it->second.c_str();
 }
 
-char* ErrMsg::vprint(const char *format, va_list args)
+char* ErrMsg::vprint(const char* format, va_list args)
 {
     const int INIT_VAL = 1024;
     int max_str, max_buf = INIT_VAL;
-    char      *out_buf;
+    char* out_buf;
 
-    while (1) {
+    while (1)
+    {
         out_buf = new char[max_buf];
         max_str = max_buf - 1;
 
-        if (vsnprintf(out_buf, max_str, format, args) < max_str) {
+        if (vsnprintf(out_buf, max_str, format, args) < max_str)
+        {
             return out_buf;
         }
-        delete [] out_buf;
+        delete[] out_buf;
         max_buf *= 2;
     }
 }
 
-int ErrMsg::errmsg(const char *format, ...)
+int ErrMsg::errmsg(const char* format, ...)
 {
     va_list args;
 
-    char *prev_err = _err;
+    char* prev_err = _err;
 
     va_start(args, format);
     _err = vprint(format, args);
@@ -126,10 +130,10 @@ int ErrMsg::errmsg(const char *format, ...)
     return FAILURE;
 }
 
-int ErrMsg::errmsg(int errCode, const char *format, ...)
+int ErrMsg::errmsg(int errCode, const char* format, ...)
 {
     va_list args;
-    char *prev_err = _err;
+    char* prev_err = _err;
 
     va_start(args, format);
     _err = vprint(format, args);
@@ -142,28 +146,33 @@ int ErrMsg::errmsg(int errCode, const char *format, ...)
 
 int ErrMsg::errmsg(int errCode)
 {
-    char *prevErr = _err;
+    char* prevErr = _err;
     int errSz = strlen(err2Str(errCode)) + 1;
-    char *newError = new char[errSz];
+    char* newError = new char[errSz];
     snprintf(newError, errSz, "%s", err2Str(errCode));
     _err = newError;
     delete[] prevErr;
     _lastErrCode = errCode;
     return errCode;
-
 }
-void ErrMsg::errmsgConcatCom(const char *format, va_list args, const char *suffix)
+void ErrMsg::errmsgConcatCom(const char* format, va_list args, const char* suffix)
 {
-    char *prevErr = _err;
-    char *currError = vprint(format, args);
+    char* prevErr = _err;
+    char* currError = vprint(format, args);
     int errSz = strlen(currError) + strlen(suffix) + 10;
-    char *newError = new char[errSz];
-    if (strlen(currError) == 0) {
+    char* newError = new char[errSz];
+    if (strlen(currError) == 0)
+    {
         snprintf(newError, errSz, "%s", suffix);
-    } else {
-        if (strlen(suffix) == 0) {
+    }
+    else
+    {
+        if (strlen(suffix) == 0)
+        {
             snprintf(newError, errSz, "%s", currError);
-        } else {
+        }
+        else
+        {
             snprintf(newError, errSz, "%s. %s", currError, suffix);
         }
     }
@@ -173,7 +182,7 @@ void ErrMsg::errmsgConcatCom(const char *format, va_list args, const char *suffi
     delete[] currError;
 }
 
-int ErrMsg::errmsgConcatMsg(int errCode, const ErrMsg& errMsgObj, const char *format, ...)
+int ErrMsg::errmsgConcatMsg(int errCode, const ErrMsg& errMsgObj, const char* format, ...)
 {
     va_list args;
     va_start(args, format);
@@ -183,7 +192,7 @@ int ErrMsg::errmsgConcatMsg(int errCode, const ErrMsg& errMsgObj, const char *fo
     return errCode;
 }
 
-int ErrMsg::errmsgConcatMsg(const ErrMsg& errMsgObj, const char *format, ...)
+int ErrMsg::errmsgConcatMsg(const ErrMsg& errMsgObj, const char* format, ...)
 {
     va_list args;
     va_start(args, format);
@@ -203,7 +212,7 @@ int ErrMsg::errmsgConcatMsg(const ErrMsg& errMsgObj)
     return errmsg("%s", errMsgObj.err());
 }
 
-int ErrMsg::errmsgConcatErrCd(int errCode, const ErrMsg& errMsgObj, const char *format, ...)
+int ErrMsg::errmsgConcatErrCd(int errCode, const ErrMsg& errMsgObj, const char* format, ...)
 {
     va_list args;
     va_start(args, format);
@@ -226,10 +235,8 @@ int ErrMsg::errmsgConcatErrCd(const ErrMsg& errMsgObj)
 
 void ErrMsg::err_clear()
 {
-    delete [] _err;
-    delete [] _formatErr;
+    delete[] _err;
+    delete[] _formatErr;
     _err = NULL;
     _formatErr = NULL;
 }
-
-
diff --git a/mft_utils/errmsg.h b/mft_utils/errmsg.h
index 10cbb61f..ffa043a6 100644
--- a/mft_utils/errmsg.h
+++ b/mft_utils/errmsg.h
@@ -48,79 +48,82 @@
  *  ErrMsg Class Provides API for returning both error codes and error messages to the user app.
  */
 
-class ErrMsg {
+class ErrMsg
+{
 public:
     ErrMsg();
     ErrMsg(std::map<int, std::string>& errCodeMap);
 
     virtual ~ErrMsg();
 
-    const char* err() const { return _err;}
-    void updateErrCodes(std::map<int, std::string>& errCodeMap) {_errMap = errCodeMap; return;}
+    const char* err() const { return _err; }
+    void updateErrCodes(std::map<int, std::string>& errCodeMap)
+    {
+        _errMap = errCodeMap;
+        return;
+    }
 
-    const char* getFormatErr(const char *prefix, ...)
+    const char* getFormatErr(const char* prefix, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 2, 3)))
+      __attribute__((format(printf, 2, 3)))
 #endif
-    ;
+      ;
 
     void err_clear();
 
-    int getLastErrCode() const {return _lastErrCode;}
+    int getLastErrCode() const { return _lastErrCode; }
 
     const char* err2Str(int errCode) const;
 
 protected:
-    char* vprint(const char *format, va_list args);
+    char* vprint(const char* format, va_list args);
 
-    int errmsg(const char *format, ...)
+    int errmsg(const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 2, 3)))
+      __attribute__((format(printf, 2, 3)))
 #endif
-    ;
+      ;
 
-    int errmsg(int errCode, const char *format, ...)
+    int errmsg(int errCode, const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 3, 4)))
+      __attribute__((format(printf, 3, 4)))
 #endif
-    ;
+      ;
 
     int errmsg(int errCode);
 
-
-    int errmsgConcatMsg(int errCode, const ErrMsg& errMsgObj, const char *format, ...)
+    int errmsgConcatMsg(int errCode, const ErrMsg& errMsgObj, const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 4, 5)))
+      __attribute__((format(printf, 4, 5)))
 #endif
-    ;
+      ;
 
-    int errmsgConcatMsg(const ErrMsg& errMsgObj, const char *format, ...)
+    int errmsgConcatMsg(const ErrMsg& errMsgObj, const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 3, 4)))
+      __attribute__((format(printf, 3, 4)))
 #endif
-    ;
+      ;
 
     int errmsgConcatMsg(int errCode, const ErrMsg& errMsgObj);
 
     int errmsgConcatMsg(const ErrMsg& errMsgObj);
 
-
-    int errmsgConcatErrCd(int errCode, const ErrMsg& errMsgObj, const char *format, ...)
+    int errmsgConcatErrCd(int errCode, const ErrMsg& errMsgObj, const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 4, 5)))
+      __attribute__((format(printf, 4, 5)))
 #endif
-    ;
+      ;
 
     int errmsgConcatErrCd(int errCode, const ErrMsg& errMsgObj);
 
     int errmsgConcatErrCd(const ErrMsg& errMsgObj);
 
 private:
-    void errmsgConcatCom(const char *format, va_list args, const char *suffix);
+    void errmsgConcatCom(const char* format, va_list args, const char* suffix);
 
     std::map<int, std::string> _errMap;
-    char *_err;
-    char *_formatErr;
+    char* _err;
+    char* _formatErr;
     int _lastErrCode;
 };
 
diff --git a/mft_utils/hsmclient/inc/cryptoki_v2.h b/mft_utils/hsmclient/inc/cryptoki_v2.h
index ac678a73..f48dded0 100644
--- a/mft_utils/hsmclient/inc/cryptoki_v2.h
+++ b/mft_utils/hsmclient/inc/cryptoki_v2.h
@@ -34,7 +34,8 @@
 #define _CRYPTOKI_H_
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /****************************************************************************\
@@ -43,658 +44,649 @@ extern "C" {
 *                                                                            *
 \****************************************************************************/
 #if defined(VXD)
-   #define CK_ENTRY
-   #define CK_POINTER         *
-   #pragma pack(push, 1)
+#define CK_ENTRY
+#define CK_POINTER *
+#pragma pack(push, 1)
 #elif defined(OS_WIN32)
-   #define CK_ENTRY           __declspec( dllexport )
-   #define CK_POINTER         *
+#define CK_ENTRY __declspec(dllexport)
+#define CK_POINTER *
 
-   #define CK_DEFINE_FUNCTION(returnType, name) \
-	returnType __declspec(dllexport) name
+#define CK_DEFINE_FUNCTION(returnType, name) returnType __declspec(dllexport) name
 
-   #define CK_DECLARE_FUNCTION(returnType, name) \
-	returnType __declspec(dllexport) name
+#define CK_DECLARE_FUNCTION(returnType, name) returnType __declspec(dllexport) name
 
-   #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
-	returnType __declspec(dllexport) (* name)
+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType __declspec(dllexport)(*name)
 
-   #define CK_CALLBACK_FUNCTION(returnType, name) \
-	returnType (* name)
+#define CK_CALLBACK_FUNCTION(returnType, name) returnType(*name)
 
-   #pragma pack(push, cryptoki, 1)
+#pragma pack(push, cryptoki, 1)
 
 #elif defined(OS_UNIX) || defined(OS_LINUX)
-   #define CK_ENTRY
-   #define CK_POINTER         *
+#define CK_ENTRY
+#define CK_POINTER *
 
-   #define CK_DEFINE_FUNCTION(returnType, name) \
-	returnType name
+#define CK_DEFINE_FUNCTION(returnType, name) returnType name
 
-   #define CK_DECLARE_FUNCTION(returnType, name) \
-	returnType name
+#define CK_DECLARE_FUNCTION(returnType, name) returnType name
 
-   #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
-	returnType (* name)
+#define CK_DECLARE_FUNCTION_POINTER(returnType, name) returnType(*name)
 
-   #define CK_CALLBACK_FUNCTION(returnType, name) \
-	returnType (* name)
+#define CK_CALLBACK_FUNCTION(returnType, name) returnType(*name)
 
 //   #pragma pack(1)
 #else
-   #error "Unknown platform!"
+#error "Unknown platform!"
 #endif
 
-#define ulMaxSessionCount              usMaxSessionCount
-#define ulSessionCount                 usSessionCount
-#define ulMaxRwSessionCount            usMaxRwSessionCount
-#define ulRwSessionCount               usRwSessionCount
-#define ulMaxPinLen                    usMaxPinLen
-#define ulMinPinLen                    usMinPinLen
-#define ulDeviceError                  usDeviceError
-#define ulValueLen                     usValueLen
-#define ulParameterLen                 usParameterLen
-#define ulEffectiveBits                usEffectiveBits
-#define ulPasswordLen                  usPasswordLen
-#define sLen                           ulSaltLen
-#define ulSaltLen                      usSaltLen
-#define ulIteration                    usIteration
-
-
-
-#define NULL_PTR           0
+#define ulMaxSessionCount usMaxSessionCount
+#define ulSessionCount usSessionCount
+#define ulMaxRwSessionCount usMaxRwSessionCount
+#define ulRwSessionCount usRwSessionCount
+#define ulMaxPinLen usMaxPinLen
+#define ulMinPinLen usMinPinLen
+#define ulDeviceError usDeviceError
+#define ulValueLen usValueLen
+#define ulParameterLen usParameterLen
+#define ulEffectiveBits usEffectiveBits
+#define ulPasswordLen usPasswordLen
+#define sLen ulSaltLen
+#define ulSaltLen usSaltLen
+#define ulIteration usIteration
+
+#define NULL_PTR 0
 
 #define CK_PTR *
 
 #include "pkcs11.h"
 
-//Define same as ulong
+// Define same as ulong
 #ifdef __GNUC__
-typedef unsigned long int               CK_USHORT;
-typedef CK_USHORT CK_PTR                CK_USHORT_PTR;
+    typedef unsigned long int CK_USHORT;
+    typedef CK_USHORT CK_PTR CK_USHORT_PTR;
 #else
-typedef unsigned long int				CK_USHORT;
-typedef CK_USHORT CK_PTR				CK_USHORT_PTR;
+typedef unsigned long int CK_USHORT;
+typedef CK_USHORT CK_PTR CK_USHORT_PTR;
 #endif
 
 #ifndef CK_MAKE_C_VERSION
-#define CK_MAKE_C_VERSION(_major, _minor)  ( ((_major) << 8) + (_minor) )
+#define CK_MAKE_C_VERSION(_major, _minor) (((_major) << 8) + (_minor))
 #endif
 
-#define C_VERSION          CK_MAKE_C_VERSION(CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR) /* v2.20 decimal */
+#define C_VERSION CK_MAKE_C_VERSION(CRYPTOKI_VERSION_MAJOR, CRYPTOKI_VERSION_MINOR) /* v2.20 decimal */
 
 /* Serial number size is fixed, but not using a #define. Must match sizeof(CK_TOKEN_INFO.serialNumber).
  * NOTE: Assume all serial numbers are space padded and there is no trailing 0. */
-#define CK_TOKEN_SERIAL_NUMBER_SIZE    16
+#define CK_TOKEN_SERIAL_NUMBER_SIZE 16
 
 /* some special values for certain CK_ULONG variables */
 #define CK_UNAVAILABLE_INFORMATION (~0UL)
-#define CK_EFFECTIVELY_INFINITE    0
+#define CK_EFFECTIVELY_INFINITE 0
 
 #define CKU_CRYPTO_OFFICER CKU_USER
 #define CKU_LIMITED_USER 0x80000001
 #define CKU_LIMITED_USER_OLD 0x8000001
 #define CKU_CRYPTO_USER CKU_LIMITED_USER
-#define CKU_AUDIT        0x80000002
+#define CKU_AUDIT 0x80000002
 #define CKU_INVALID_USER_TYPE 0xffffffff
 
-#define CKU_VENDOR_DEFINED    0x80000000
-
-
+#define CKU_VENDOR_DEFINED 0x80000000
 
-#define CKF_EXCLUSIVE_SESSION       0x0001
-#define CKF_EXCLUSIVE_EXISTS        0x0010
-#define CKF_SO_SESSION              0x8000
-#define CKF_AUDIT_SESSION           0x10000
+#define CKF_EXCLUSIVE_SESSION 0x0001
+#define CKF_EXCLUSIVE_EXISTS 0x0010
+#define CKF_SO_SESSION 0x8000
+#define CKF_AUDIT_SESSION 0x10000
 
 /* For internal use only */
-#define CKF_VENDER_DEFINED           0x10000000
-#define CKF_IGNORE_HAONLY           (CKF_VENDER_DEFINED <<3)
-#define CKF_USE_APPID               (CKF_VENDER_DEFINED <<2)
+#define CKF_VENDER_DEFINED 0x10000000
+#define CKF_IGNORE_HAONLY (CKF_VENDER_DEFINED << 3)
+#define CKF_USE_APPID (CKF_VENDER_DEFINED << 2)
 
 /* Reset Flags */
-#define CKF_RESET_LONG_BOOT         0x1
+#define CKF_RESET_LONG_BOOT 0x1
 
 /* From ProtectServer */
-#define CKF_ADMIN_TOKEN             0x10000000
+#define CKF_ADMIN_TOKEN 0x10000000
 
 /* ProtectServer Security Mode flags */
-#define CKF_ENTRUST_READY			0x00000001
-#define CKF_NO_CLEAR_PINS			0x00000002
-#define CKF_AUTH_PROTECTION			0x00000004
-#define CKF_NO_PUBLIC_CRYPTO		0x00000008
-#define CKF_TAMPER_BEFORE_UPGRADE	0x00000010
-#define CKF_INCREASED_SECURITY		0x00000020
-#define CKF_FIPS_ALGORITHMS			0x00000040
-#define CKF_FULL_SMS_ENC			0x00000080
-#define CKF_FULL_SMS_SIGN			0x00000100
-#define CKF_PURE_P11                0x00000200
+#define CKF_ENTRUST_READY 0x00000001
+#define CKF_NO_CLEAR_PINS 0x00000002
+#define CKF_AUTH_PROTECTION 0x00000004
+#define CKF_NO_PUBLIC_CRYPTO 0x00000008
+#define CKF_TAMPER_BEFORE_UPGRADE 0x00000010
+#define CKF_INCREASED_SECURITY 0x00000020
+#define CKF_FIPS_ALGORITHMS 0x00000040
+#define CKF_FULL_SMS_ENC 0x00000080
+#define CKF_FULL_SMS_SIGN 0x00000100
+#define CKF_PURE_P11 0x00000200
 #define CKF_DES_EVEN_PARITY_ALLOWED 0x00000400
-#define CKF_USER_ECC_DP_ALLOWED     0x00000800
-#define CKF_MODE_LOCKED				0x10000000
+#define CKF_USER_ECC_DP_ALLOWED 0x00000800
+#define CKF_MODE_LOCKED 0x10000000
 
 /* CKA_HSM_FEATURES flags */
-#define CKF_SUPPORTS_FMS  			0x00000001  // HSM is FM Capable and enabled
-#define CKF_FM_HOK_AVAIL  			0x00000002  // FM HOK Data installed
-#define CKF_NO_FM_FUNCTS  			0x00000004  // FW does not support FM commands
-#define CKF_STD_HOK_AVAIL  			0x00000008  // Standard HOK avail
-#define CKF_FM_SMFS_ACTIV  			0x00000010  // SMFS Activated
-#define CKF_STM_MODE    			0x00000100  // Secure Transport Mode
-#define CKF_TAMP_MODE    			0x00000200  // Tampered
-
-#define CKA_START_DATE_OLD_XXX     0x0083 // Kept temporarily for backward compatibility with Beta version. Use CKA_START_DATE
-#define CKA_END_DATE_OLD_XXX       0x0084 // Kept temporarily for backward compatibility with Beta version. Use CKA_END_DATE
-
-#define CKD_SHA224_KDF                 0x00000005
-#define CKD_SHA224_KDF_OLD             0x80000003
-#define CKD_SHA256_KDF                 0x00000006
-#define CKD_SHA256_KDF_OLD             0x80000004
-#define CKD_SHA384_KDF                 0x00000007
-#define CKD_SHA384_KDF_OLD             0x80000005
-#define CKD_SHA512_KDF                 0x00000008
-#define CKD_SHA512_KDF_OLD             0x80000006
-#define CKD_RIPEMD160_KDF              0x80000007
-
-#define CKD_SHA1_NIST_KDF              0x00000012
-#define CKD_SHA224_NIST_KDF            0x80000013
-#define CKD_SHA256_NIST_KDF            0x80000014
-#define CKD_SHA384_NIST_KDF            0x80000015
-#define CKD_SHA512_NIST_KDF            0x80000016
-#define CKD_RIPEMD160_NIST_KDF         0x80000017
-
-#define CKD_SHA1_SES_KDF               0x82000000
-#define CKD_SHA224_SES_KDF             0x83000000
-#define CKD_SHA256_SES_KDF             0x84000000
-#define CKD_SHA384_SES_KDF             0x85000000
-#define CKD_SHA512_SES_KDF             0x86000000
-#define CKD_RIPEMD160_SES_KDF          0x87000000
-#define CKD_SES_ENC_CTR                0x00000001
-#define CKD_SES_AUTH_CTR               0x00000002
-#define CKD_SES_ALT_ENC_CTR            0x00000003
-#define CKD_SES_ALT_AUTH_CTR           0x00000004
+#define CKF_SUPPORTS_FMS 0x00000001  // HSM is FM Capable and enabled
+#define CKF_FM_HOK_AVAIL 0x00000002  // FM HOK Data installed
+#define CKF_NO_FM_FUNCTS 0x00000004  // FW does not support FM commands
+#define CKF_STD_HOK_AVAIL 0x00000008 // Standard HOK avail
+#define CKF_FM_SMFS_ACTIV 0x00000010 // SMFS Activated
+#define CKF_STM_MODE 0x00000100      // Secure Transport Mode
+#define CKF_TAMP_MODE 0x00000200     // Tampered
+
+#define CKA_START_DATE_OLD_XXX \
+    0x0083                          // Kept temporarily for backward compatibility with Beta version. Use CKA_START_DATE
+#define CKA_END_DATE_OLD_XXX 0x0084 // Kept temporarily for backward compatibility with Beta version. Use CKA_END_DATE
+
+#define CKD_SHA224_KDF 0x00000005
+#define CKD_SHA224_KDF_OLD 0x80000003
+#define CKD_SHA256_KDF 0x00000006
+#define CKD_SHA256_KDF_OLD 0x80000004
+#define CKD_SHA384_KDF 0x00000007
+#define CKD_SHA384_KDF_OLD 0x80000005
+#define CKD_SHA512_KDF 0x00000008
+#define CKD_SHA512_KDF_OLD 0x80000006
+#define CKD_RIPEMD160_KDF 0x80000007
+
+#define CKD_SHA1_NIST_KDF 0x00000012
+#define CKD_SHA224_NIST_KDF 0x80000013
+#define CKD_SHA256_NIST_KDF 0x80000014
+#define CKD_SHA384_NIST_KDF 0x80000015
+#define CKD_SHA512_NIST_KDF 0x80000016
+#define CKD_RIPEMD160_NIST_KDF 0x80000017
+
+#define CKD_SHA1_SES_KDF 0x82000000
+#define CKD_SHA224_SES_KDF 0x83000000
+#define CKD_SHA256_SES_KDF 0x84000000
+#define CKD_SHA384_SES_KDF 0x85000000
+#define CKD_SHA512_SES_KDF 0x86000000
+#define CKD_RIPEMD160_SES_KDF 0x87000000
+#define CKD_SES_ENC_CTR 0x00000001
+#define CKD_SES_AUTH_CTR 0x00000002
+#define CKD_SES_ALT_ENC_CTR 0x00000003
+#define CKD_SES_ALT_AUTH_CTR 0x00000004
 
 /* X9.42 Diffie-Hellman Key Derivation Functions */
-#define CKD_SHA1_KDF_ASN1              0x00000003  // not supported
-#define CKD_SHA1_KDF_CONCATENATE       0x00000004
+#define CKD_SHA1_KDF_ASN1 0x00000003 // not supported
+#define CKD_SHA1_KDF_CONCATENATE 0x00000004
 
 #define CKD_SHA1_KDF_CONCATENATE_X9_42 CKD_SHA1_KDF_CONCATENATE
-#define CKD_SHA1_KDF_CONCATENATE_NIST  0x80000001
-
-#define CKD_SHA1_KDF_ASN1_X9_42        CKD_SHA1_KDF_ASN1  // not supported
-#define CKD_SHA1_KDF_ASN1_NIST         0x80000002  // not supported
-
-/* AES GCM as per PKCS11 v2.20 Ammendment 5 draft 1
-   Superceded by v2.30 draft CK_GCM_PARAMS - see pkcs11t.h */
-typedef struct CK_AES_GCM_PARAMS {
-  CK_BYTE_PTR pIv;
-  CK_ULONG ulIvLen;
-  CK_ULONG ulIvBits;
-  CK_BYTE_PTR pAAD;
-  CK_ULONG ulAADLen;
-  CK_ULONG ulTagBits;
-} CK_AES_GCM_PARAMS;
-
-typedef CK_AES_GCM_PARAMS CK_PTR CK_AES_GCM_PARAMS_PTR;
-
-// XOR data with KDF of base key and shared data encryption mechanism parameters
-typedef struct CK_XOR_BASE_DATA_KDF_PARAMS {
-  CK_EC_KDF_TYPE kdf;        //KDF to use
-  CK_ULONG ulSharedDataLen;  //optional shared data to add to base key data
-  CK_BYTE_PTR pSharedData;
-} CK_XOR_BASE_DATA_KDF_PARAMS;
-
-typedef CK_XOR_BASE_DATA_KDF_PARAMS CK_PTR CK_XOR_BASE_DATA_KDF_PARAMS_PTR;
-
-typedef struct CK_AES_XTS_PARAMS {
-   CK_OBJECT_HANDLE hTweakKey;
-   CK_BYTE cb[16];
-} CK_AES_XTS_PARAMS;
-
-typedef CK_AES_XTS_PARAMS CK_PTR CK_AES_XTS_PARAMS_PTR;
-
-//CKK_VENDOR_DEFINED
-#define CKK_KCDSA                (CKK_VENDOR_DEFINED + 0x10)
-#define CKK_SEED                 (CKK_VENDOR_DEFINED + 0x11)
-#define CKK_EC_EDWARDS           (CKK_VENDOR_DEFINED + 0x12)
-#define CKK_EC_MONTGOMERY        (CKK_VENDOR_DEFINED + 0x13)
-#define CKK_BIP32                (CKK_VENDOR_DEFINED + 0x14)
-
-//CKA_VENDOR_DEFINED
-#define CKA_CCM_PRIVATE          (CKA_VENDOR_DEFINED | 0x0001)
-#define CKA_FINGERPRINT_SHA1     (CKA_VENDOR_DEFINED | 0x0002)
-#define CKA_PKC_TCTRUST          (CKA_VENDOR_DEFINED | 0x0003)
-#define CKA_PKC_CITS             (CKA_VENDOR_DEFINED | 0x0004)
-#define CKA_OUID                 (CKA_VENDOR_DEFINED | 0x0005)
-#define CKA_X9_31_GENERATED      (CKA_VENDOR_DEFINED | 0x0006)
-#define CKA_PKC_ECC              (CKA_VENDOR_DEFINED | 0x0007)
-#define CKA_EKM_UID              (CKA_VENDOR_DEFINED | 0x0008)
-
-#define CKA_CHECK_VALUE_PTK      (CKA_VENDOR_DEFINED | 0x0103)
-
-#define CKA_TOKEN_ROLE_POLICIES  (CKA_VENDOR_DEFINED | 0x0010)
-#define CKA_ROLE_DESCRIPTORS     (CKA_VENDOR_DEFINED | 0x0011)
-#define CKA_USER_VALUE           (CKA_VENDOR_DEFINED | 0x0012)
-#define CKA_INITIALIZER          (CKA_VENDOR_DEFINED | 0x0013)
-#define CKA_POLICY               (CKA_VENDOR_DEFINED | 0x0014)
-#define CKA_ACTIVE               (CKA_VENDOR_DEFINED | 0x0015)
+#define CKD_SHA1_KDF_CONCATENATE_NIST 0x80000001
+
+#define CKD_SHA1_KDF_ASN1_X9_42 CKD_SHA1_KDF_ASN1 // not supported
+#define CKD_SHA1_KDF_ASN1_NIST 0x80000002         // not supported
+
+    /* AES GCM as per PKCS11 v2.20 Ammendment 5 draft 1
+       Superceded by v2.30 draft CK_GCM_PARAMS - see pkcs11t.h */
+    typedef struct CK_AES_GCM_PARAMS
+    {
+        CK_BYTE_PTR pIv;
+        CK_ULONG ulIvLen;
+        CK_ULONG ulIvBits;
+        CK_BYTE_PTR pAAD;
+        CK_ULONG ulAADLen;
+        CK_ULONG ulTagBits;
+    } CK_AES_GCM_PARAMS;
+
+    typedef CK_AES_GCM_PARAMS CK_PTR CK_AES_GCM_PARAMS_PTR;
+
+    // XOR data with KDF of base key and shared data encryption mechanism parameters
+    typedef struct CK_XOR_BASE_DATA_KDF_PARAMS
+    {
+        CK_EC_KDF_TYPE kdf;       // KDF to use
+        CK_ULONG ulSharedDataLen; // optional shared data to add to base key data
+        CK_BYTE_PTR pSharedData;
+    } CK_XOR_BASE_DATA_KDF_PARAMS;
+
+    typedef CK_XOR_BASE_DATA_KDF_PARAMS CK_PTR CK_XOR_BASE_DATA_KDF_PARAMS_PTR;
+
+    typedef struct CK_AES_XTS_PARAMS
+    {
+        CK_OBJECT_HANDLE hTweakKey;
+        CK_BYTE cb[16];
+    } CK_AES_XTS_PARAMS;
+
+    typedef CK_AES_XTS_PARAMS CK_PTR CK_AES_XTS_PARAMS_PTR;
+
+// CKK_VENDOR_DEFINED
+#define CKK_KCDSA (CKK_VENDOR_DEFINED + 0x10)
+#define CKK_SEED (CKK_VENDOR_DEFINED + 0x11)
+#define CKK_EC_EDWARDS (CKK_VENDOR_DEFINED + 0x12)
+#define CKK_EC_MONTGOMERY (CKK_VENDOR_DEFINED + 0x13)
+#define CKK_BIP32 (CKK_VENDOR_DEFINED + 0x14)
+
+// CKA_VENDOR_DEFINED
+#define CKA_CCM_PRIVATE (CKA_VENDOR_DEFINED | 0x0001)
+#define CKA_FINGERPRINT_SHA1 (CKA_VENDOR_DEFINED | 0x0002)
+#define CKA_PKC_TCTRUST (CKA_VENDOR_DEFINED | 0x0003)
+#define CKA_PKC_CITS (CKA_VENDOR_DEFINED | 0x0004)
+#define CKA_OUID (CKA_VENDOR_DEFINED | 0x0005)
+#define CKA_X9_31_GENERATED (CKA_VENDOR_DEFINED | 0x0006)
+#define CKA_PKC_ECC (CKA_VENDOR_DEFINED | 0x0007)
+#define CKA_EKM_UID (CKA_VENDOR_DEFINED | 0x0008)
+
+#define CKA_CHECK_VALUE_PTK (CKA_VENDOR_DEFINED | 0x0103)
+
+#define CKA_TOKEN_ROLE_POLICIES (CKA_VENDOR_DEFINED | 0x0010)
+#define CKA_ROLE_DESCRIPTORS (CKA_VENDOR_DEFINED | 0x0011)
+#define CKA_USER_VALUE (CKA_VENDOR_DEFINED | 0x0012)
+#define CKA_INITIALIZER (CKA_VENDOR_DEFINED | 0x0013)
+#define CKA_POLICY (CKA_VENDOR_DEFINED | 0x0014)
+#define CKA_ACTIVE (CKA_VENDOR_DEFINED | 0x0015)
 
 // Initially defined for role states.
-#define CKA_INITIALIZED          (CKA_VENDOR_DEFINED | 0x0016)
-#define CKA_PIN_TO_BE_CHANGED    (CKA_VENDOR_DEFINED | 0x0017)
-#define CKA_LOCKED_OUT           (CKA_VENDOR_DEFINED | 0x0018)
-#define CKA_ACTIVATED            (CKA_VENDOR_DEFINED | 0x0019)
-#define CKA_HAS_DOMAIN           (CKA_VENDOR_DEFINED | 0x001A)
-#define CKA_LOGIN_ATTEMPTS_LEFT  (CKA_VENDOR_DEFINED | 0x001B)
-#define CKA_PRIMARY_AUTH_METHOD  (CKA_VENDOR_DEFINED | 0x001C)
+#define CKA_INITIALIZED (CKA_VENDOR_DEFINED | 0x0016)
+#define CKA_PIN_TO_BE_CHANGED (CKA_VENDOR_DEFINED | 0x0017)
+#define CKA_LOCKED_OUT (CKA_VENDOR_DEFINED | 0x0018)
+#define CKA_ACTIVATED (CKA_VENDOR_DEFINED | 0x0019)
+#define CKA_HAS_DOMAIN (CKA_VENDOR_DEFINED | 0x001A)
+#define CKA_LOGIN_ATTEMPTS_LEFT (CKA_VENDOR_DEFINED | 0x001B)
+#define CKA_PRIMARY_AUTH_METHOD (CKA_VENDOR_DEFINED | 0x001C)
 #define CKA_SECONDARY_AUTH_METHOD (CKA_VENDOR_DEFINED | 0x001D)
-#define CKA_ROLE_SHORT_NAME       (CKA_VENDOR_DEFINED | 0x001E)
+#define CKA_ROLE_SHORT_NAME (CKA_VENDOR_DEFINED | 0x001E)
 // Generic CK_ULONG version field for any objects that need to report a version
-#define CKA_VERSION              (CKA_VENDOR_DEFINED | 0x001F)
+#define CKA_VERSION (CKA_VENDOR_DEFINED | 0x001F)
 
 // These match the ones already defined for PTK
-#define CKA_USAGE_COUNT          (CKA_VENDOR_DEFINED + 0x0101)
-#define CKA_SLOT_ID              (CKA_VENDOR_DEFINED + 0x0151)
-#define CKA_MAX_SESSIONS         (CKA_VENDOR_DEFINED | 0x0155)
-#define CKA_MIN_PIN_LEN          (CKA_VENDOR_DEFINED | 0x0156)
-#define CKA_FLAGS                (CKA_VENDOR_DEFINED | 0x0159)
-#define CKA_USAGE_LIMIT          (CKA_VENDOR_DEFINED + 0x0200)
-
-#define CKA_SECURITY_MODE        (CKA_VENDOR_DEFINED + 0x0140)
-#define CKA_TRANSPORT_MODE       (CKA_VENDOR_DEFINED + 0x0141)
-#define CKA_BATCH                (CKA_VENDOR_DEFINED + 0x0142)
-#define CKA_HW_STATUS            (CKA_VENDOR_DEFINED + 0x0143)
-#define CKA_FREE_MEM             (CKA_VENDOR_DEFINED + 0x0144)
-#define CKA_TAMPER_CMD           (CKA_VENDOR_DEFINED + 0x0145)
-#define CKA_DATE_OF_MANUFACTURE  (CKA_VENDOR_DEFINED + 0x0146)
-#define CKA_HALT_CMD             (CKA_VENDOR_DEFINED + 0x0147)
-#define CKA_APPLICATION_COUNT    (CKA_VENDOR_DEFINED + 0x0148)
-#define CKA_FW_VERSION           (CKA_VENDOR_DEFINED + 0x0149)
+#define CKA_USAGE_COUNT (CKA_VENDOR_DEFINED + 0x0101)
+#define CKA_SLOT_ID (CKA_VENDOR_DEFINED + 0x0151)
+#define CKA_MAX_SESSIONS (CKA_VENDOR_DEFINED | 0x0155)
+#define CKA_MIN_PIN_LEN (CKA_VENDOR_DEFINED | 0x0156)
+#define CKA_FLAGS (CKA_VENDOR_DEFINED | 0x0159)
+#define CKA_USAGE_LIMIT (CKA_VENDOR_DEFINED + 0x0200)
+
+#define CKA_SECURITY_MODE (CKA_VENDOR_DEFINED + 0x0140)
+#define CKA_TRANSPORT_MODE (CKA_VENDOR_DEFINED + 0x0141)
+#define CKA_BATCH (CKA_VENDOR_DEFINED + 0x0142)
+#define CKA_HW_STATUS (CKA_VENDOR_DEFINED + 0x0143)
+#define CKA_FREE_MEM (CKA_VENDOR_DEFINED + 0x0144)
+#define CKA_TAMPER_CMD (CKA_VENDOR_DEFINED + 0x0145)
+#define CKA_DATE_OF_MANUFACTURE (CKA_VENDOR_DEFINED + 0x0146)
+#define CKA_HALT_CMD (CKA_VENDOR_DEFINED + 0x0147)
+#define CKA_APPLICATION_COUNT (CKA_VENDOR_DEFINED + 0x0148)
+#define CKA_FW_VERSION (CKA_VENDOR_DEFINED + 0x0149)
 #define CKA_RESCAN_PERIPHERALS_CMD (CKA_VENDOR_DEFINED + 0x014A)
-#define CKA_RTC_AAC_ENABLED        (CKA_VENDOR_DEFINED + 0x014B)
-#define CKA_RTC_AAC_GUARD_SECONDS  (CKA_VENDOR_DEFINED + 0x014C)
-#define CKA_RTC_AAC_GUARD_COUNT    (CKA_VENDOR_DEFINED + 0x014D)
+#define CKA_RTC_AAC_ENABLED (CKA_VENDOR_DEFINED + 0x014B)
+#define CKA_RTC_AAC_GUARD_SECONDS (CKA_VENDOR_DEFINED + 0x014C)
+#define CKA_RTC_AAC_GUARD_COUNT (CKA_VENDOR_DEFINED + 0x014D)
 #define CKA_RTC_AAC_GUARD_DURATION (CKA_VENDOR_DEFINED + 0x014E)
-#define CKA_HW_EXT_INFO_STR        (CKA_VENDOR_DEFINED + 0x014F)
-
-#define CKA_TEMPERATURE_STR        (CKA_VENDOR_DEFINED + 0x0150)
-#define CKA_HSM_FEATURES           (CKA_VENDOR_DEFINED + 0x0152)
-
-#define CKA_FM_VERSION			(CKA_VENDOR_DEFINED + 0x0181)
-#define CKA_MANUFACTURER		(CKA_VENDOR_DEFINED + 0x0182)
-#define CKA_BUILD_DATE			(CKA_VENDOR_DEFINED + 0x0183)
-#define CKA_FINGERPRINT			(CKA_VENDOR_DEFINED + 0x0184)
-#define CKA_ROM_SPACE			(CKA_VENDOR_DEFINED + 0x0185)
-#define CKA_RAM_SPACE			(CKA_VENDOR_DEFINED + 0x0186) /* not used */
-#define CKA_FM_STATUS			(CKA_VENDOR_DEFINED + 0x0187)
-#define CKA_DELETE_FM			(CKA_VENDOR_DEFINED + 0x0188)
-#define CKA_FM_STARTUP_STATUS	(CKA_VENDOR_DEFINED + 0x0189)
-#define CKA_FM_ID               (CKA_VENDOR_DEFINED + 0x018a)
-
-#define CKA_GENERIC_1            (CKA_VENDOR_DEFINED + 0x1000)
-#define CKA_GENERIC_2            (CKA_VENDOR_DEFINED + 0x1001)
-#define CKA_GENERIC_3            (CKA_VENDOR_DEFINED + 0x1002)
-#define CKA_FINGERPRINT_SHA256   (CKA_VENDOR_DEFINED + 0x1003)
-#define CKA_WARNING_THRESHOLD    (CKA_VENDOR_DEFINED + 0x1004)
-
-#define CKA_PARTITION_ATTRIBUTE  0x40000000
-#define CKA_KEK_GROUP_ID         (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1005)
-#define CKA_KEK_MAX_LIFETIME     (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1006)
-#define CKA_KEK_ACTUAL_LIFETIME  (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1007)
+#define CKA_HW_EXT_INFO_STR (CKA_VENDOR_DEFINED + 0x014F)
+
+#define CKA_TEMPERATURE_STR (CKA_VENDOR_DEFINED + 0x0150)
+#define CKA_HSM_FEATURES (CKA_VENDOR_DEFINED + 0x0152)
+
+#define CKA_FM_VERSION (CKA_VENDOR_DEFINED + 0x0181)
+#define CKA_MANUFACTURER (CKA_VENDOR_DEFINED + 0x0182)
+#define CKA_BUILD_DATE (CKA_VENDOR_DEFINED + 0x0183)
+#define CKA_FINGERPRINT (CKA_VENDOR_DEFINED + 0x0184)
+#define CKA_ROM_SPACE (CKA_VENDOR_DEFINED + 0x0185)
+#define CKA_RAM_SPACE (CKA_VENDOR_DEFINED + 0x0186) /* not used */
+#define CKA_FM_STATUS (CKA_VENDOR_DEFINED + 0x0187)
+#define CKA_DELETE_FM (CKA_VENDOR_DEFINED + 0x0188)
+#define CKA_FM_STARTUP_STATUS (CKA_VENDOR_DEFINED + 0x0189)
+#define CKA_FM_ID (CKA_VENDOR_DEFINED + 0x018a)
+
+#define CKA_GENERIC_1 (CKA_VENDOR_DEFINED + 0x1000)
+#define CKA_GENERIC_2 (CKA_VENDOR_DEFINED + 0x1001)
+#define CKA_GENERIC_3 (CKA_VENDOR_DEFINED + 0x1002)
+#define CKA_FINGERPRINT_SHA256 (CKA_VENDOR_DEFINED + 0x1003)
+#define CKA_WARNING_THRESHOLD (CKA_VENDOR_DEFINED + 0x1004)
+
+#define CKA_PARTITION_ATTRIBUTE 0x40000000
+#define CKA_KEK_GROUP_ID (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1005)
+#define CKA_KEK_MAX_LIFETIME (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1006)
+#define CKA_KEK_ACTUAL_LIFETIME (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1007)
 #define CKA_KEK_MANAGEMENT_FLAGS (CKA_VENDOR_DEFINED + CKA_PARTITION_ATTRIBUTE + 0x1008)
 
 // BIP32 attributes
-#define CKA_BIP32_CHAIN_CODE         (CKA_VENDOR_DEFINED | 0x1100)
-#define CKA_BIP32_VERSION_BYTES      (CKA_VENDOR_DEFINED | 0x1101)
-#define CKA_BIP32_CHILD_INDEX        (CKA_VENDOR_DEFINED | 0x1102)
-#define CKA_BIP32_CHILD_DEPTH        (CKA_VENDOR_DEFINED | 0x1103)
-#define CKA_BIP32_ID                 (CKA_VENDOR_DEFINED | 0x1104)
-#define CKA_BIP32_FINGERPRINT        (CKA_VENDOR_DEFINED | 0x1105)
+#define CKA_BIP32_CHAIN_CODE (CKA_VENDOR_DEFINED | 0x1100)
+#define CKA_BIP32_VERSION_BYTES (CKA_VENDOR_DEFINED | 0x1101)
+#define CKA_BIP32_CHILD_INDEX (CKA_VENDOR_DEFINED | 0x1102)
+#define CKA_BIP32_CHILD_DEPTH (CKA_VENDOR_DEFINED | 0x1103)
+#define CKA_BIP32_ID (CKA_VENDOR_DEFINED | 0x1104)
+#define CKA_BIP32_FINGERPRINT (CKA_VENDOR_DEFINED | 0x1105)
 #define CKA_BIP32_PARENT_FINGERPRINT (CKA_VENDOR_DEFINED | 0x1106)
 
-
 // Vendor defined HW Feature objects (HW Objeects)
-#define CKH_TEMPERATURE          (CKH_VENDOR_DEFINED | 0x00000001)
-#define CKH_BATTERY              (CKH_VENDOR_DEFINED | 0x00000002)
-#define CKH_FAN                  (CKH_VENDOR_DEFINED | 0x00000003)
-
-#define CKM_VENDOR_DEFINED_OLD_XXX     0x00008000
-#define CKM_CAST_KEY_GEN_OLD_XXX       CKM_VENDOR_DEFINED_OLD_XXX + 0        // Entrust added capabilities
-#define CKM_CAST_ECB_OLD_XXX           CKM_VENDOR_DEFINED_OLD_XXX + 1        // Entrust added capabilities
-#define CKM_CAST_CBC_OLD_XXX           CKM_VENDOR_DEFINED_OLD_XXX + 2        // Entrust added capabilities
-#define CKM_CAST_MAC_OLD_XXX           CKM_VENDOR_DEFINED_OLD_XXX + 3        // Entrust added capabilities
-#define CKM_CAST3_KEY_GEN_OLD_XXX      CKM_VENDOR_DEFINED_OLD_XXX + 4        // Entrust added capabilities
-#define CKM_CAST3_ECB_OLD_XXX          CKM_VENDOR_DEFINED_OLD_XXX + 5        // Entrust added capabilities
-#define CKM_CAST3_CBC_OLD_XXX          CKM_VENDOR_DEFINED_OLD_XXX + 6        // Entrust added capabilities
-#define CKM_CAST3_MAC_OLD_XXX          CKM_VENDOR_DEFINED_OLD_XXX + 7        // Entrust added capabilities
-#define CKM_PBE_MD2_DES_CBC_OLD_XXX    CKM_VENDOR_DEFINED_OLD_XXX + 8        // Password based encryption
-#define CKM_PBE_MD5_DES_CBC_OLD_XXX    CKM_VENDOR_DEFINED_OLD_XXX + 9        // Password based encryption
-#define CKM_PBE_MD5_CAST_CBC_OLD_XXX   CKM_VENDOR_DEFINED_OLD_XXX + 10       // Password based encryption
-#define CKM_PBE_MD5_CAST3_CBC_OLD_XXX  CKM_VENDOR_DEFINED_OLD_XXX + 11       // Password based encryption
-#define CKM_CONCATENATE_BASE_AND_KEY_OLD_XXX   CKM_VENDOR_DEFINED_OLD_XXX + 12       // SPKM & SLL added capabilities
-#define CKM_CONCATENATE_KEY_AND_BASE_OLD_XXX   CKM_VENDOR_DEFINED_OLD_XXX + 13       // SPKM & SLL added capabilities
-#define CKM_CONCATENATE_BASE_AND_DATA_OLD_XXX  CKM_VENDOR_DEFINED_OLD_XXX + 14       // SPKM & SLL added capabilities
-#define CKM_CONCATENATE_DATA_AND_BASE_OLD_XXX  CKM_VENDOR_DEFINED_OLD_XXX + 15       // SPKM & SLL added capabilities
-#define CKM_XOR_BASE_AND_DATA_OLD_XXX          CKM_VENDOR_DEFINED_OLD_XXX + 16       // SPKM & SLL added capabilities
-#define CKM_EXTRACT_KEY_FROM_KEY_OLD_XXX       CKM_VENDOR_DEFINED_OLD_XXX + 17       // SPKM & SLL added capabilities
-#define CKM_MD5_KEY_DERIVATION_OLD_XXX         CKM_VENDOR_DEFINED_OLD_XXX + 18       // SPKM & SLL added capabilities
-#define CKM_MD2_KEY_DERIVATION_OLD_XXX         CKM_VENDOR_DEFINED_OLD_XXX + 19       // SPKM & SLL added capabilities
-#define CKM_SHA1_KEY_DERIVATION_OLD_XXX        CKM_VENDOR_DEFINED_OLD_XXX + 20       // SPKM & SLL added capabilities
-#define CKM_GENERIC_SECRET_KEY_GEN_OLD_XXX     CKM_VENDOR_DEFINED_OLD_XXX + 21       // Generation of secret keys
-#define CKM_CAST5_KEY_GEN_OLD_XXX              CKM_VENDOR_DEFINED_OLD_XXX + 22       // Entrust added capabilities
-#define CKM_CAST5_ECB_OLD_XXX                  CKM_VENDOR_DEFINED_OLD_XXX + 23       // Entrust added capabilities
-#define CKM_CAST5_CBC_OLD_XXX                  CKM_VENDOR_DEFINED_OLD_XXX + 24       // Entrust added capabilities
-#define CKM_CAST5_MAC_OLD_XXX                  CKM_VENDOR_DEFINED_OLD_XXX + 25       // Entrust added capabilities
-#define CKM_PBE_SHA1_CAST5_CBC_OLD_XXX         CKM_VENDOR_DEFINED_OLD_XXX + 26       // Entrust added capabilities
-#define CKM_KEY_TRANSLATION                    CKM_VENDOR_DEFINED_OLD_XXX + 27       // Entrust added capabilities
-#define CKM_XOR_BASE_AND_KEY                   CKM_VENDOR_DEFINED + 27
-
-#define CKM_2DES_KEY_DERIVATION                CKM_VENDOR_DEFINED_OLD_XXX + 28       // Custom Gemplus Capabilities
-
-#define CKM_INDIRECT_LOGIN_REENCRYPT           CKM_VENDOR_DEFINED_OLD_XXX + 29       // Used for indirect login
+#define CKH_TEMPERATURE (CKH_VENDOR_DEFINED | 0x00000001)
+#define CKH_BATTERY (CKH_VENDOR_DEFINED | 0x00000002)
+#define CKH_FAN (CKH_VENDOR_DEFINED | 0x00000003)
+
+#define CKM_VENDOR_DEFINED_OLD_XXX 0x00008000
+#define CKM_CAST_KEY_GEN_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 0               // Entrust added capabilities
+#define CKM_CAST_ECB_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 1                   // Entrust added capabilities
+#define CKM_CAST_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 2                   // Entrust added capabilities
+#define CKM_CAST_MAC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 3                   // Entrust added capabilities
+#define CKM_CAST3_KEY_GEN_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 4              // Entrust added capabilities
+#define CKM_CAST3_ECB_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 5                  // Entrust added capabilities
+#define CKM_CAST3_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 6                  // Entrust added capabilities
+#define CKM_CAST3_MAC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 7                  // Entrust added capabilities
+#define CKM_PBE_MD2_DES_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 8            // Password based encryption
+#define CKM_PBE_MD5_DES_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 9            // Password based encryption
+#define CKM_PBE_MD5_CAST_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 10          // Password based encryption
+#define CKM_PBE_MD5_CAST3_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 11         // Password based encryption
+#define CKM_CONCATENATE_BASE_AND_KEY_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 12  // SPKM & SLL added capabilities
+#define CKM_CONCATENATE_KEY_AND_BASE_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 13  // SPKM & SLL added capabilities
+#define CKM_CONCATENATE_BASE_AND_DATA_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 14 // SPKM & SLL added capabilities
+#define CKM_CONCATENATE_DATA_AND_BASE_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 15 // SPKM & SLL added capabilities
+#define CKM_XOR_BASE_AND_DATA_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 16         // SPKM & SLL added capabilities
+#define CKM_EXTRACT_KEY_FROM_KEY_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 17      // SPKM & SLL added capabilities
+#define CKM_MD5_KEY_DERIVATION_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 18        // SPKM & SLL added capabilities
+#define CKM_MD2_KEY_DERIVATION_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 19        // SPKM & SLL added capabilities
+#define CKM_SHA1_KEY_DERIVATION_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 20       // SPKM & SLL added capabilities
+#define CKM_GENERIC_SECRET_KEY_GEN_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 21    // Generation of secret keys
+#define CKM_CAST5_KEY_GEN_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 22             // Entrust added capabilities
+#define CKM_CAST5_ECB_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 23                 // Entrust added capabilities
+#define CKM_CAST5_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 24                 // Entrust added capabilities
+#define CKM_CAST5_MAC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 25                 // Entrust added capabilities
+#define CKM_PBE_SHA1_CAST5_CBC_OLD_XXX CKM_VENDOR_DEFINED_OLD_XXX + 26        // Entrust added capabilities
+#define CKM_KEY_TRANSLATION CKM_VENDOR_DEFINED_OLD_XXX + 27                   // Entrust added capabilities
+#define CKM_XOR_BASE_AND_KEY CKM_VENDOR_DEFINED + 27
+
+#define CKM_2DES_KEY_DERIVATION CKM_VENDOR_DEFINED_OLD_XXX + 28 // Custom Gemplus Capabilities
+
+#define CKM_INDIRECT_LOGIN_REENCRYPT CKM_VENDOR_DEFINED_OLD_XXX + 29 // Used for indirect login
 
 // Old DES PBE Mechanism
-#define CKM_PBE_SHA1_DES3_EDE_CBC_OLD          CKM_VENDOR_DEFINED_OLD_XXX + 30
-#define CKM_PBE_SHA1_DES2_EDE_CBC_OLD          CKM_VENDOR_DEFINED_OLD_XXX + 31
+#define CKM_PBE_SHA1_DES3_EDE_CBC_OLD CKM_VENDOR_DEFINED_OLD_XXX + 30
+#define CKM_PBE_SHA1_DES2_EDE_CBC_OLD CKM_VENDOR_DEFINED_OLD_XXX + 31
 
 // Korean algorithms
-#define CKM_HAS160                             (CKM_VENDOR_DEFINED + 0x100)
-#define CKM_KCDSA_KEY_PAIR_GEN                 (CKM_VENDOR_DEFINED + 0x101)
-#define CKM_KCDSA_HAS160                       (CKM_VENDOR_DEFINED + 0x102)
-#define CKM_SEED_KEY_GEN                       (CKM_VENDOR_DEFINED + 0x103)
-#define CKM_SEED_ECB                           (CKM_VENDOR_DEFINED + 0x104)
-#define CKM_SEED_CBC                           (CKM_VENDOR_DEFINED + 0x105)
-#define CKM_SEED_CBC_PAD                       (CKM_VENDOR_DEFINED + 0x106)
-#define CKM_SEED_MAC                           (CKM_VENDOR_DEFINED + 0x107)
-#define CKM_SEED_MAC_GENERAL                   (CKM_VENDOR_DEFINED + 0x108)
-#define CKM_KCDSA_SHA1                         (CKM_VENDOR_DEFINED + 0x109)
-#define CKM_KCDSA_SHA224                       (CKM_VENDOR_DEFINED + 0x10A)
-#define CKM_KCDSA_SHA256                       (CKM_VENDOR_DEFINED + 0x10B)
-#define CKM_KCDSA_SHA384                       (CKM_VENDOR_DEFINED + 0x10C)
-#define CKM_KCDSA_SHA512                       (CKM_VENDOR_DEFINED + 0x10D)
-#define CKM_KCDSA_PARAMETER_GEN                (CKM_VENDOR_DEFINED + 0x10F)
+#define CKM_HAS160 (CKM_VENDOR_DEFINED + 0x100)
+#define CKM_KCDSA_KEY_PAIR_GEN (CKM_VENDOR_DEFINED + 0x101)
+#define CKM_KCDSA_HAS160 (CKM_VENDOR_DEFINED + 0x102)
+#define CKM_SEED_KEY_GEN (CKM_VENDOR_DEFINED + 0x103)
+#define CKM_SEED_ECB (CKM_VENDOR_DEFINED + 0x104)
+#define CKM_SEED_CBC (CKM_VENDOR_DEFINED + 0x105)
+#define CKM_SEED_CBC_PAD (CKM_VENDOR_DEFINED + 0x106)
+#define CKM_SEED_MAC (CKM_VENDOR_DEFINED + 0x107)
+#define CKM_SEED_MAC_GENERAL (CKM_VENDOR_DEFINED + 0x108)
+#define CKM_KCDSA_SHA1 (CKM_VENDOR_DEFINED + 0x109)
+#define CKM_KCDSA_SHA224 (CKM_VENDOR_DEFINED + 0x10A)
+#define CKM_KCDSA_SHA256 (CKM_VENDOR_DEFINED + 0x10B)
+#define CKM_KCDSA_SHA384 (CKM_VENDOR_DEFINED + 0x10C)
+#define CKM_KCDSA_SHA512 (CKM_VENDOR_DEFINED + 0x10D)
+#define CKM_KCDSA_PARAMETER_GEN (CKM_VENDOR_DEFINED + 0x10F)
 
 // Defined prior PKCS#11. Must be redefined when PKCS#11 is updated
 // Defined prior PKCS#11 and renamed to CKM_SHA224_xxx_OLD after PKCS#11 was updated
-#define CKM_SHA224_RSA_PKCS_OLD                 (CKM_VENDOR_DEFINED + 0x110)
-#define CKM_SHA224_RSA_PKCS_PSS_OLD             (CKM_VENDOR_DEFINED + 0x111)
-#define CKM_SHA224_OLD                          (CKM_VENDOR_DEFINED + 0x112)
-#define CKM_SHA224_HMAC_OLD                     (CKM_VENDOR_DEFINED + 0x113)
-#define CKM_SHA224_HMAC_GENERAL_OLD             (CKM_VENDOR_DEFINED + 0x114)
-#define CKM_SHA224_KEY_DERIVATION_OLD           (CKM_VENDOR_DEFINED + 0x115)
-
-#define CKM_DES3_CTR                             (CKM_VENDOR_DEFINED + 0x116)
-#define CKM_AES_CFB8                            (CKM_VENDOR_DEFINED + 0x118)
-#define CKM_AES_CFB128                          (CKM_VENDOR_DEFINED + 0x119)
-#define CKM_AES_OFB                             (CKM_VENDOR_DEFINED + 0x11a)
+#define CKM_SHA224_RSA_PKCS_OLD (CKM_VENDOR_DEFINED + 0x110)
+#define CKM_SHA224_RSA_PKCS_PSS_OLD (CKM_VENDOR_DEFINED + 0x111)
+#define CKM_SHA224_OLD (CKM_VENDOR_DEFINED + 0x112)
+#define CKM_SHA224_HMAC_OLD (CKM_VENDOR_DEFINED + 0x113)
+#define CKM_SHA224_HMAC_GENERAL_OLD (CKM_VENDOR_DEFINED + 0x114)
+#define CKM_SHA224_KEY_DERIVATION_OLD (CKM_VENDOR_DEFINED + 0x115)
+
+#define CKM_DES3_CTR (CKM_VENDOR_DEFINED + 0x116)
+#define CKM_AES_CFB8 (CKM_VENDOR_DEFINED + 0x118)
+#define CKM_AES_CFB128 (CKM_VENDOR_DEFINED + 0x119)
+#define CKM_AES_OFB (CKM_VENDOR_DEFINED + 0x11a)
 //#define CKM_AES_CTR                             (CKM_VENDOR_DEFINED + 0x11b)
 // Legacy vendor defined per P11 v2.20 ammendment 5 draft 1 - adopting
 // standard definition as per v2.30 - see pkcs11t.h
-#define CKM_AES_GCM_2_20a5d1                    (CKM_VENDOR_DEFINED + 0x11c)
-#define CKM_ARIA_CFB8                           (CKM_VENDOR_DEFINED + 0x11d)
-#define CKM_ARIA_CFB128                         (CKM_VENDOR_DEFINED + 0x11e)
-#define CKM_ARIA_OFB                            (CKM_VENDOR_DEFINED + 0x11f)
-#define CKM_ARIA_CTR                            (CKM_VENDOR_DEFINED + 0x120)
-#define CKM_ARIA_GCM                            (CKM_VENDOR_DEFINED + 0x121)
-
-#define CKM_ECDSA_SHA224                        (CKM_VENDOR_DEFINED + 0x122)
-#define CKM_ECDSA_SHA256                        (CKM_VENDOR_DEFINED + 0x123)
-#define CKM_ECDSA_SHA384                        (CKM_VENDOR_DEFINED + 0x124)
-#define CKM_ECDSA_SHA512                        (CKM_VENDOR_DEFINED + 0x125)
-#define CKM_AES_GMAC                            (CKM_VENDOR_DEFINED + 0x126)
-
-#define CKM_ARIA_CMAC                           (CKM_VENDOR_DEFINED + 0x128)
-#define CKM_ARIA_CMAC_GENERAL                   (CKM_VENDOR_DEFINED + 0x129)
-#define CKM_SEED_CMAC                           (CKM_VENDOR_DEFINED + 0x12c)
-#define CKM_SEED_CMAC_GENERAL                   (CKM_VENDOR_DEFINED + 0x12d)
-
-#define CKM_DES3_CBC_PAD_IPSEC_OLD              0x00000137
-#define CKM_DES3_CBC_PAD_IPSEC                  (CKM_VENDOR_DEFINED + 0x12e)
-#define CKM_AES_CBC_PAD_IPSEC_OLD               0x00001089
-#define CKM_AES_CBC_PAD_IPSEC                   (CKM_VENDOR_DEFINED + 0x12f)
-
-#define CKM_ARIA_L_ECB                          (CKM_VENDOR_DEFINED + 0x130)
-#define CKM_ARIA_L_CBC                          (CKM_VENDOR_DEFINED + 0x131)
-#define CKM_ARIA_L_CBC_PAD                      (CKM_VENDOR_DEFINED + 0x132)
-#define CKM_ARIA_L_MAC                          (CKM_VENDOR_DEFINED + 0x133)
-#define CKM_ARIA_L_MAC_GENERAL                  (CKM_VENDOR_DEFINED + 0x134)
-
-#define CKM_SHA224_RSA_X9_31                    (CKM_VENDOR_DEFINED + 0x135)
-#define CKM_SHA256_RSA_X9_31                    (CKM_VENDOR_DEFINED + 0x136)
-#define CKM_SHA384_RSA_X9_31                    (CKM_VENDOR_DEFINED + 0x137)
-#define CKM_SHA512_RSA_X9_31                    (CKM_VENDOR_DEFINED + 0x138)
-
-#define CKM_SHA1_RSA_X9_31_NON_FIPS             (CKM_VENDOR_DEFINED + 0x139)
-#define CKM_SHA224_RSA_X9_31_NON_FIPS           (CKM_VENDOR_DEFINED + 0x13a)
-#define CKM_SHA256_RSA_X9_31_NON_FIPS           (CKM_VENDOR_DEFINED + 0x13b)
-#define CKM_SHA384_RSA_X9_31_NON_FIPS           (CKM_VENDOR_DEFINED + 0x13c)
-#define CKM_SHA512_RSA_X9_31_NON_FIPS           (CKM_VENDOR_DEFINED + 0x13d)
-#define CKM_RSA_X9_31_NON_FIPS                  (CKM_VENDOR_DEFINED + 0x13e)
-
-#define CKM_DSA_SHA224                          (CKM_VENDOR_DEFINED + 0x140)  //DH -moved here to keep ECDSA SHA 2 same as FW4
-#define CKM_DSA_SHA256                          (CKM_VENDOR_DEFINED + 0x141)
-
-#define CKM_RSA_FIPS_186_3_AUX_PRIME_KEY_PAIR_GEN     (CKM_VENDOR_DEFINED + 0x142)
-#define CKM_RSA_FIPS_186_3_PRIME_KEY_PAIR_GEN         (CKM_VENDOR_DEFINED + 0x143)
+#define CKM_AES_GCM_2_20a5d1 (CKM_VENDOR_DEFINED + 0x11c)
+#define CKM_ARIA_CFB8 (CKM_VENDOR_DEFINED + 0x11d)
+#define CKM_ARIA_CFB128 (CKM_VENDOR_DEFINED + 0x11e)
+#define CKM_ARIA_OFB (CKM_VENDOR_DEFINED + 0x11f)
+#define CKM_ARIA_CTR (CKM_VENDOR_DEFINED + 0x120)
+#define CKM_ARIA_GCM (CKM_VENDOR_DEFINED + 0x121)
+
+#define CKM_ECDSA_SHA224 (CKM_VENDOR_DEFINED + 0x122)
+#define CKM_ECDSA_SHA256 (CKM_VENDOR_DEFINED + 0x123)
+#define CKM_ECDSA_SHA384 (CKM_VENDOR_DEFINED + 0x124)
+#define CKM_ECDSA_SHA512 (CKM_VENDOR_DEFINED + 0x125)
+#define CKM_AES_GMAC (CKM_VENDOR_DEFINED + 0x126)
+
+#define CKM_ARIA_CMAC (CKM_VENDOR_DEFINED + 0x128)
+#define CKM_ARIA_CMAC_GENERAL (CKM_VENDOR_DEFINED + 0x129)
+#define CKM_SEED_CMAC (CKM_VENDOR_DEFINED + 0x12c)
+#define CKM_SEED_CMAC_GENERAL (CKM_VENDOR_DEFINED + 0x12d)
+
+#define CKM_DES3_CBC_PAD_IPSEC_OLD 0x00000137
+#define CKM_DES3_CBC_PAD_IPSEC (CKM_VENDOR_DEFINED + 0x12e)
+#define CKM_AES_CBC_PAD_IPSEC_OLD 0x00001089
+#define CKM_AES_CBC_PAD_IPSEC (CKM_VENDOR_DEFINED + 0x12f)
+
+#define CKM_ARIA_L_ECB (CKM_VENDOR_DEFINED + 0x130)
+#define CKM_ARIA_L_CBC (CKM_VENDOR_DEFINED + 0x131)
+#define CKM_ARIA_L_CBC_PAD (CKM_VENDOR_DEFINED + 0x132)
+#define CKM_ARIA_L_MAC (CKM_VENDOR_DEFINED + 0x133)
+#define CKM_ARIA_L_MAC_GENERAL (CKM_VENDOR_DEFINED + 0x134)
+
+#define CKM_SHA224_RSA_X9_31 (CKM_VENDOR_DEFINED + 0x135)
+#define CKM_SHA256_RSA_X9_31 (CKM_VENDOR_DEFINED + 0x136)
+#define CKM_SHA384_RSA_X9_31 (CKM_VENDOR_DEFINED + 0x137)
+#define CKM_SHA512_RSA_X9_31 (CKM_VENDOR_DEFINED + 0x138)
+
+#define CKM_SHA1_RSA_X9_31_NON_FIPS (CKM_VENDOR_DEFINED + 0x139)
+#define CKM_SHA224_RSA_X9_31_NON_FIPS (CKM_VENDOR_DEFINED + 0x13a)
+#define CKM_SHA256_RSA_X9_31_NON_FIPS (CKM_VENDOR_DEFINED + 0x13b)
+#define CKM_SHA384_RSA_X9_31_NON_FIPS (CKM_VENDOR_DEFINED + 0x13c)
+#define CKM_SHA512_RSA_X9_31_NON_FIPS (CKM_VENDOR_DEFINED + 0x13d)
+#define CKM_RSA_X9_31_NON_FIPS (CKM_VENDOR_DEFINED + 0x13e)
+
+#define CKM_DSA_SHA224 (CKM_VENDOR_DEFINED + 0x140) // DH -moved here to keep ECDSA SHA 2 same as FW4
+#define CKM_DSA_SHA256 (CKM_VENDOR_DEFINED + 0x141)
+
+#define CKM_RSA_FIPS_186_3_AUX_PRIME_KEY_PAIR_GEN (CKM_VENDOR_DEFINED + 0x142)
+#define CKM_RSA_FIPS_186_3_PRIME_KEY_PAIR_GEN (CKM_VENDOR_DEFINED + 0x143)
 // Korean algorithms
-#define CKM_SEED_CTR                            (CKM_VENDOR_DEFINED + 0x144)
-#define CKM_KCDSA_HAS160_NO_PAD                 (CKM_VENDOR_DEFINED + 0x145)
-#define CKM_KCDSA_SHA1_NO_PAD                   (CKM_VENDOR_DEFINED + 0x146)
-#define CKM_KCDSA_SHA224_NO_PAD                 (CKM_VENDOR_DEFINED + 0x147)
-#define CKM_KCDSA_SHA256_NO_PAD                 (CKM_VENDOR_DEFINED + 0x148)
-#define CKM_KCDSA_SHA384_NO_PAD                 (CKM_VENDOR_DEFINED + 0x149)
-#define CKM_KCDSA_SHA512_NO_PAD                 (CKM_VENDOR_DEFINED + 0x151)
+#define CKM_SEED_CTR (CKM_VENDOR_DEFINED + 0x144)
+#define CKM_KCDSA_HAS160_NO_PAD (CKM_VENDOR_DEFINED + 0x145)
+#define CKM_KCDSA_SHA1_NO_PAD (CKM_VENDOR_DEFINED + 0x146)
+#define CKM_KCDSA_SHA224_NO_PAD (CKM_VENDOR_DEFINED + 0x147)
+#define CKM_KCDSA_SHA256_NO_PAD (CKM_VENDOR_DEFINED + 0x148)
+#define CKM_KCDSA_SHA384_NO_PAD (CKM_VENDOR_DEFINED + 0x149)
+#define CKM_KCDSA_SHA512_NO_PAD (CKM_VENDOR_DEFINED + 0x151)
 
-#define CKM_DES3_X919_MAC                       (CKM_VENDOR_DEFINED + 0x150)
+#define CKM_DES3_X919_MAC (CKM_VENDOR_DEFINED + 0x150)
 
-#define CKM_ECDSA_KEY_PAIR_GEN_W_EXTRA_BITS     (CKM_VENDOR_DEFINED + 0x160)
-#define CKM_ECDSA_GBCS_SHA256                   (CKM_VENDOR_DEFINED + 0x161)
+#define CKM_ECDSA_KEY_PAIR_GEN_W_EXTRA_BITS (CKM_VENDOR_DEFINED + 0x160)
+#define CKM_ECDSA_GBCS_SHA256 (CKM_VENDOR_DEFINED + 0x161)
 
 // Vendor specific key wrapping mechanisms
-#define CKM_AES_KW                              (CKM_VENDOR_DEFINED + 0x170)
-#define CKM_AES_KWP                             (CKM_VENDOR_DEFINED + 0x171)
-#define CKM_TDEA_KW                             (CKM_VENDOR_DEFINED + 0x172)
-#define CKM_TDEA_KWP                            (CKM_VENDOR_DEFINED + 0x173)
+#define CKM_AES_KW (CKM_VENDOR_DEFINED + 0x170)
+#define CKM_AES_KWP (CKM_VENDOR_DEFINED + 0x171)
+#define CKM_TDEA_KW (CKM_VENDOR_DEFINED + 0x172)
+#define CKM_TDEA_KWP (CKM_VENDOR_DEFINED + 0x173)
 
 // SIM3 mechanisms
-#define CKM_AES_CBC_PAD_EXTRACT                (CKM_VENDOR_DEFINED + 0x200)
-#define CKM_AES_CBC_PAD_INSERT                 (CKM_VENDOR_DEFINED + 0x201)
-#define CKM_AES_CBC_PAD_EXTRACT_FLATTENED      (CKM_VENDOR_DEFINED + 0x202)
-#define CKM_AES_CBC_PAD_INSERT_FLATTENED       (CKM_VENDOR_DEFINED + 0x203)
+#define CKM_AES_CBC_PAD_EXTRACT (CKM_VENDOR_DEFINED + 0x200)
+#define CKM_AES_CBC_PAD_INSERT (CKM_VENDOR_DEFINED + 0x201)
+#define CKM_AES_CBC_PAD_EXTRACT_FLATTENED (CKM_VENDOR_DEFINED + 0x202)
+#define CKM_AES_CBC_PAD_INSERT_FLATTENED (CKM_VENDOR_DEFINED + 0x203)
 
 // Etoken mechanisms
-#define CKM_AES_CBC_PAD_EXTRACT_DOMAIN_CTRL    (CKM_VENDOR_DEFINED + 0x204)
-#define CKM_AES_CBC_PAD_INSERT_DOMAIN_CTRL     (CKM_VENDOR_DEFINED + 0x205)
+#define CKM_AES_CBC_PAD_EXTRACT_DOMAIN_CTRL (CKM_VENDOR_DEFINED + 0x204)
+#define CKM_AES_CBC_PAD_INSERT_DOMAIN_CTRL (CKM_VENDOR_DEFINED + 0x205)
 
-//defined as CKM_DES3_DERIVE_ECB in Eracom PTKC
+// defined as CKM_DES3_DERIVE_ECB in Eracom PTKC
 #define CKM_PLACE_HOLDER_FOR_ERACOME_DEF_IN_SHIM (CKM_VENDOR_DEFINED + 0x502)
 
-#define CKM_DES2_DUKPT_PIN                     (CKM_VENDOR_DEFINED + 0x611)
-#define CKM_DES2_DUKPT_MAC                     (CKM_VENDOR_DEFINED + 0x612)
-#define CKM_DES2_DUKPT_MAC_RESP                (CKM_VENDOR_DEFINED + 0x613)
-#define CKM_DES2_DUKPT_DATA                    (CKM_VENDOR_DEFINED + 0x614)
-#define CKM_DES2_DUKPT_DATA_RESP               (CKM_VENDOR_DEFINED + 0x615)
+#define CKM_DES2_DUKPT_PIN (CKM_VENDOR_DEFINED + 0x611)
+#define CKM_DES2_DUKPT_MAC (CKM_VENDOR_DEFINED + 0x612)
+#define CKM_DES2_DUKPT_MAC_RESP (CKM_VENDOR_DEFINED + 0x613)
+#define CKM_DES2_DUKPT_DATA (CKM_VENDOR_DEFINED + 0x614)
+#define CKM_DES2_DUKPT_DATA_RESP (CKM_VENDOR_DEFINED + 0x615)
 
 /*** EC IES mechanism (X9.63) */
-#define CKM_ECIES                              (CKM_VENDOR_DEFINED + 0xA00)
-#define CKM_XOR_BASE_AND_DATA_W_KDF            (CKM_VENDOR_DEFINED + 0xA01)
+#define CKM_ECIES (CKM_VENDOR_DEFINED + 0xA00)
+#define CKM_XOR_BASE_AND_DATA_W_KDF (CKM_VENDOR_DEFINED + 0xA01)
 
-#define CKM_NIST_PRF_KDF                       (CKM_VENDOR_DEFINED + 0xA02)
-#define CKM_PRF_KDF                            (CKM_VENDOR_DEFINED + 0xA03)
-#define CKM_AES_XTS                            (CKM_VENDOR_DEFINED + 0xA04)
+#define CKM_NIST_PRF_KDF (CKM_VENDOR_DEFINED + 0xA02)
+#define CKM_PRF_KDF (CKM_VENDOR_DEFINED + 0xA03)
+#define CKM_AES_XTS (CKM_VENDOR_DEFINED + 0xA04)
 
 // SM2/SM3/SM4 mechs
-#define CKM_SM3                                (CKM_VENDOR_DEFINED + 0xB01)
-#define CKM_SM3_HMAC                           (CKM_VENDOR_DEFINED + 0xB02)
-#define CKM_SM3_HMAC_GENERAL                   (CKM_VENDOR_DEFINED + 0xB03)
-#define CKM_SM3_KEY_DERIVATION                 (CKM_VENDOR_DEFINED + 0xB04)
-
-#define CKM_EC_EDWARDS_KEY_PAIR_GEN            (CKM_VENDOR_DEFINED + 0xC01)
-#define CKM_EDDSA_NACL                         (CKM_VENDOR_DEFINED + 0xC02) // ed25519 sign/verify - NaCl compatible
-#define CKM_EDDSA                              (CKM_VENDOR_DEFINED + 0xC03) // ed25519 sign/verify
-#define CKM_SHA1_EDDSA_NACL                    (CKM_VENDOR_DEFINED + 0xC04)
-#define CKM_SHA224_EDDSA_NACL                  (CKM_VENDOR_DEFINED + 0xC05)
-#define CKM_SHA256_EDDSA_NACL                  (CKM_VENDOR_DEFINED + 0xC06)
-#define CKM_SHA384_EDDSA_NACL                  (CKM_VENDOR_DEFINED + 0xC07)
-#define CKM_SHA512_EDDSA_NACL                  (CKM_VENDOR_DEFINED + 0xC08)
-#define CKM_SHA1_EDDSA                         (CKM_VENDOR_DEFINED + 0xC09)
-#define CKM_SHA224_EDDSA                       (CKM_VENDOR_DEFINED + 0xC0A)
-#define CKM_SHA256_EDDSA                       (CKM_VENDOR_DEFINED + 0xC0B)
-#define CKM_SHA384_EDDSA                       (CKM_VENDOR_DEFINED + 0xC0C)
-#define CKM_SHA512_EDDSA                       (CKM_VENDOR_DEFINED + 0xC0D)
-
-#define CKM_EC_MONTGOMERY_KEY_PAIR_GEN         (CKM_VENDOR_DEFINED + 0xD01)
+#define CKM_SM3 (CKM_VENDOR_DEFINED + 0xB01)
+#define CKM_SM3_HMAC (CKM_VENDOR_DEFINED + 0xB02)
+#define CKM_SM3_HMAC_GENERAL (CKM_VENDOR_DEFINED + 0xB03)
+#define CKM_SM3_KEY_DERIVATION (CKM_VENDOR_DEFINED + 0xB04)
+
+#define CKM_EC_EDWARDS_KEY_PAIR_GEN (CKM_VENDOR_DEFINED + 0xC01)
+#define CKM_EDDSA_NACL (CKM_VENDOR_DEFINED + 0xC02) // ed25519 sign/verify - NaCl compatible
+#define CKM_EDDSA (CKM_VENDOR_DEFINED + 0xC03)      // ed25519 sign/verify
+#define CKM_SHA1_EDDSA_NACL (CKM_VENDOR_DEFINED + 0xC04)
+#define CKM_SHA224_EDDSA_NACL (CKM_VENDOR_DEFINED + 0xC05)
+#define CKM_SHA256_EDDSA_NACL (CKM_VENDOR_DEFINED + 0xC06)
+#define CKM_SHA384_EDDSA_NACL (CKM_VENDOR_DEFINED + 0xC07)
+#define CKM_SHA512_EDDSA_NACL (CKM_VENDOR_DEFINED + 0xC08)
+#define CKM_SHA1_EDDSA (CKM_VENDOR_DEFINED + 0xC09)
+#define CKM_SHA224_EDDSA (CKM_VENDOR_DEFINED + 0xC0A)
+#define CKM_SHA256_EDDSA (CKM_VENDOR_DEFINED + 0xC0B)
+#define CKM_SHA384_EDDSA (CKM_VENDOR_DEFINED + 0xC0C)
+#define CKM_SHA512_EDDSA (CKM_VENDOR_DEFINED + 0xC0D)
+
+#define CKM_EC_MONTGOMERY_KEY_PAIR_GEN (CKM_VENDOR_DEFINED + 0xD01)
 
 // SM2/SM3/SM4 mechs
-#define CKM_SM3                                (CKM_VENDOR_DEFINED + 0xB01)
-#define CKM_SM3_HMAC                           (CKM_VENDOR_DEFINED + 0xB02)
-#define CKM_SM3_HMAC_GENERAL                   (CKM_VENDOR_DEFINED + 0xB03)
-#define CKM_SM3_KEY_DERIVATION                 (CKM_VENDOR_DEFINED + 0xB04)
+#define CKM_SM3 (CKM_VENDOR_DEFINED + 0xB01)
+#define CKM_SM3_HMAC (CKM_VENDOR_DEFINED + 0xB02)
+#define CKM_SM3_HMAC_GENERAL (CKM_VENDOR_DEFINED + 0xB03)
+#define CKM_SM3_KEY_DERIVATION (CKM_VENDOR_DEFINED + 0xB04)
 
 // BIP32 mechs
-#define CKM_BIP32_MASTER_DERIVE                (CKM_VENDOR_DEFINED + 0xE00)
-#define CKM_BIP32_CHILD_DERIVE                 (CKM_VENDOR_DEFINED + 0xE01)
+#define CKM_BIP32_MASTER_DERIVE (CKM_VENDOR_DEFINED + 0xE00)
+#define CKM_BIP32_CHILD_DERIVE (CKM_VENDOR_DEFINED + 0xE01)
 
-/**
- * Mechanism parameters for CKM_ECIES.
- */
-/** EC Diffie-Hellman (DH) primitive to use for shared secret derivation */
-typedef CK_ULONG CK_EC_DH_PRIMITIVE;
+    /**
+     * Mechanism parameters for CKM_ECIES.
+     */
+    /** EC Diffie-Hellman (DH) primitive to use for shared secret derivation */
+    typedef CK_ULONG CK_EC_DH_PRIMITIVE;
 
 /** EC DH primitives */
-#define CKDHP_STANDARD        0x00000001
-#define CKDHP_ECDH1_COFACTOR  0x00000001
-#define CKDHP_MODIFIED        0x00000002 /* Not implemented */
-#define CKDHP_ECDH1           0x00000003
+#define CKDHP_STANDARD 0x00000001
+#define CKDHP_ECDH1_COFACTOR 0x00000001
+#define CKDHP_MODIFIED 0x00000002 /* Not implemented */
+#define CKDHP_ECDH1 0x00000003
 
-/** Inner encryption scheme to use for ECIES */
-typedef CK_ULONG CK_EC_ENC_SCHEME;
+    /** Inner encryption scheme to use for ECIES */
+    typedef CK_ULONG CK_EC_ENC_SCHEME;
 
 /** Inner encryption schemes */
-#define CKES_XOR        0x00000001
-#define CKES_DES3_CBC_PAD  0x00000002
-#define CKES_AES_CBC_PAD   0x00000003
-#define CKES_DES3_CBC      0x00000004
-#define CKES_AES_CBC       0x00000005
+#define CKES_XOR 0x00000001
+#define CKES_DES3_CBC_PAD 0x00000002
+#define CKES_AES_CBC_PAD 0x00000003
+#define CKES_DES3_CBC 0x00000004
+#define CKES_AES_CBC 0x00000005
 
-/** Message Authentication Code (MAC) scheme to use for ECIES */
-typedef CK_ULONG CK_EC_MAC_SCHEME;
+    /** Message Authentication Code (MAC) scheme to use for ECIES */
+    typedef CK_ULONG CK_EC_MAC_SCHEME;
 
 /** MAC schemes */
-#define CKMS_HMAC_SHA1        0x00000001
-#define CKMS_SHA1             0x00000002
-#define CKMS_HMAC_SHA224      0x00000003
-#define CKMS_SHA224           0x00000004
-#define CKMS_HMAC_SHA256      0x00000005
-#define CKMS_SHA256           0x00000006
-#define CKMS_HMAC_SHA384      0x00000007
-#define CKMS_SHA384           0x00000008
-#define CKMS_HMAC_SHA512      0x00000009
-#define CKMS_SHA512           0x0000000a
-#define CKMS_HMAC_RIPEMD160   0x0000000b
-#define CKMS_RIPEMD160        0x0000000c
-
-/** Mechanism parameter structure for ECIES */
-typedef struct CK_ECIES_PARAMS
-{
-   /** Diffie-Hellman primitive used to derive the shared secret value */
-    CK_EC_DH_PRIMITIVE dhPrimitive;
+#define CKMS_HMAC_SHA1 0x00000001
+#define CKMS_SHA1 0x00000002
+#define CKMS_HMAC_SHA224 0x00000003
+#define CKMS_SHA224 0x00000004
+#define CKMS_HMAC_SHA256 0x00000005
+#define CKMS_SHA256 0x00000006
+#define CKMS_HMAC_SHA384 0x00000007
+#define CKMS_SHA384 0x00000008
+#define CKMS_HMAC_SHA512 0x00000009
+#define CKMS_SHA512 0x0000000a
+#define CKMS_HMAC_RIPEMD160 0x0000000b
+#define CKMS_RIPEMD160 0x0000000c
 
-   /**   key derivation function used on the shared secret value */
-    CK_EC_KDF_TYPE kdf;
+    /** Mechanism parameter structure for ECIES */
+    typedef struct CK_ECIES_PARAMS
+    {
+        /** Diffie-Hellman primitive used to derive the shared secret value */
+        CK_EC_DH_PRIMITIVE dhPrimitive;
 
-   /** the length in bytes of the key derivation shared data */
-    CK_ULONG ulSharedDataLen1;
+        /**   key derivation function used on the shared secret value */
+        CK_EC_KDF_TYPE kdf;
 
-   /** the key derivation padding data shared between the two parties */
-    CK_BYTE_PTR pSharedData1;
+        /** the length in bytes of the key derivation shared data */
+        CK_ULONG ulSharedDataLen1;
 
-   /** the encryption scheme used to transform the input data */
-    CK_EC_ENC_SCHEME encScheme;
+        /** the key derivation padding data shared between the two parties */
+        CK_BYTE_PTR pSharedData1;
 
-   /** the bit length of the key to use for the encryption scheme */
-    CK_ULONG ulEncKeyLenInBits;
+        /** the encryption scheme used to transform the input data */
+        CK_EC_ENC_SCHEME encScheme;
 
-   /** the MAC scheme used for MAC generation or validation */
-    CK_EC_MAC_SCHEME macScheme;
+        /** the bit length of the key to use for the encryption scheme */
+        CK_ULONG ulEncKeyLenInBits;
 
-   /** the bit length of the key to use for the MAC scheme */
-    CK_ULONG ulMacKeyLenInBits;
+        /** the MAC scheme used for MAC generation or validation */
+        CK_EC_MAC_SCHEME macScheme;
 
-   /** the bit length of the MAC scheme output */
-    CK_ULONG ulMacLenInBits;
+        /** the bit length of the key to use for the MAC scheme */
+        CK_ULONG ulMacKeyLenInBits;
 
-   /** the length in bytes of the MAC shared data */
-    CK_ULONG ulSharedDataLen2;
+        /** the bit length of the MAC scheme output */
+        CK_ULONG ulMacLenInBits;
 
-   /** the MAC padding data shared between the two parties */
-    CK_BYTE_PTR pSharedData2;
-} CK_ECIES_PARAMS;
+        /** the length in bytes of the MAC shared data */
+        CK_ULONG ulSharedDataLen2;
 
-typedef CK_ECIES_PARAMS CK_PTR CK_ECIES_PARAMS_PTR;
+        /** the MAC padding data shared between the two parties */
+        CK_BYTE_PTR pSharedData2;
+    } CK_ECIES_PARAMS;
 
+    typedef CK_ECIES_PARAMS CK_PTR CK_ECIES_PARAMS_PTR;
 
+    /* Parameter and values used with CKM_PRF_KDF and
+     * CKM_NIST_PRF_KDF. */
 
-/* Parameter and values used with CKM_PRF_KDF and
- * CKM_NIST_PRF_KDF. */
-
-typedef CK_ULONG CK_KDF_PRF_TYPE;
-typedef CK_ULONG CK_KDF_PRF_ENCODING_SCHEME;
+    typedef CK_ULONG CK_KDF_PRF_TYPE;
+    typedef CK_ULONG CK_KDF_PRF_ENCODING_SCHEME;
 
 /** PRF KDF schemes */
-#define CK_NIST_PRF_KDF_DES3_CMAC      0x00000001
-#define CK_NIST_PRF_KDF_AES_CMAC       0x00000002
-#define CK_PRF_KDF_ARIA_CMAC           0x00000003
-#define CK_PRF_KDF_SEED_CMAC           0x00000004
-#define CK_NIST_PRF_KDF_HMAC_SHA1      0x00000005
-#define CK_NIST_PRF_KDF_HMAC_SHA224    0x00000006
-#define CK_NIST_PRF_KDF_HMAC_SHA256    0x00000007
-#define CK_NIST_PRF_KDF_HMAC_SHA384    0x00000008
-#define CK_NIST_PRF_KDF_HMAC_SHA512    0x00000009
-#define CK_PRF_KDF_HMAC_RIPEMD160      0x0000000A
+#define CK_NIST_PRF_KDF_DES3_CMAC 0x00000001
+#define CK_NIST_PRF_KDF_AES_CMAC 0x00000002
+#define CK_PRF_KDF_ARIA_CMAC 0x00000003
+#define CK_PRF_KDF_SEED_CMAC 0x00000004
+#define CK_NIST_PRF_KDF_HMAC_SHA1 0x00000005
+#define CK_NIST_PRF_KDF_HMAC_SHA224 0x00000006
+#define CK_NIST_PRF_KDF_HMAC_SHA256 0x00000007
+#define CK_NIST_PRF_KDF_HMAC_SHA384 0x00000008
+#define CK_NIST_PRF_KDF_HMAC_SHA512 0x00000009
+#define CK_PRF_KDF_HMAC_RIPEMD160 0x0000000A
 
 /*
  * Affects the format of the fixed data passed to the PRF.
  * Scheme #3 is the one described in NIST SP 800-108.
  */
-#define LUNA_PRF_KDF_ENCODING_SCHEME_1     0x00000000 // Context || 0x00 || Label || Length
-#define LUNA_PRF_KDF_ENCODING_SCHEME_2     0x00000001 // Context || Label
-#define LUNA_PRF_KDF_ENCODING_SCHEME_3     0x00000002 // Label || 0x00 || Context || Length
-#define LUNA_PRF_KDF_ENCODING_SCHEME_4     0x00000003 // Label || Context
+#define LUNA_PRF_KDF_ENCODING_SCHEME_1 0x00000000 // Context || 0x00 || Label || Length
+#define LUNA_PRF_KDF_ENCODING_SCHEME_2 0x00000001 // Context || Label
+#define LUNA_PRF_KDF_ENCODING_SCHEME_3 0x00000002 // Label || 0x00 || Context || Length
+#define LUNA_PRF_KDF_ENCODING_SCHEME_4 0x00000003 // Label || Context
 #define LUNA_PRF_KDF_ENCODING_SCHEME_SCP03 0x00000004
 #define LUNA_PRF_KDF_ENCODING_SCHEME_HID_KD 0x00000005
 
-typedef struct CK_KDF_PRF_PARAMS {
-   CK_KDF_PRF_TYPE            prfType;
-   CK_BYTE_PTR                pLabel;
-   CK_ULONG                   ulLabelLen;
-   CK_BYTE_PTR                pContext;
-   CK_ULONG                   ulContextLen;
-   CK_ULONG                   ulCounter;
-   CK_KDF_PRF_ENCODING_SCHEME ulEncodingScheme;
-} CK_PRF_KDF_PARAMS;
+    typedef struct CK_KDF_PRF_PARAMS
+    {
+        CK_KDF_PRF_TYPE prfType;
+        CK_BYTE_PTR pLabel;
+        CK_ULONG ulLabelLen;
+        CK_BYTE_PTR pContext;
+        CK_ULONG ulContextLen;
+        CK_ULONG ulCounter;
+        CK_KDF_PRF_ENCODING_SCHEME ulEncodingScheme;
+    } CK_PRF_KDF_PARAMS;
 
-typedef CK_PRF_KDF_PARAMS CK_PTR CK_KDF_PRF_PARAMS_PTR;
+    typedef CK_PRF_KDF_PARAMS CK_PTR CK_KDF_PRF_PARAMS_PTR;
 
 /*
 Additional CTR parameter structures based on CK_AES_CTR_PARAMS
 PKCS has not defined these yet.
 */
 #ifndef CK_SEED_CTR_PARAMS
-typedef CK_AES_CTR_PARAMS CK_SEED_CTR_PARAMS;
-typedef CK_SEED_CTR_PARAMS CK_PTR CK_SEED_CTR_PARAMS_PTR;
+    typedef CK_AES_CTR_PARAMS CK_SEED_CTR_PARAMS;
+    typedef CK_SEED_CTR_PARAMS CK_PTR CK_SEED_CTR_PARAMS_PTR;
 #endif
 
 #ifndef CK_SEED_CTR_PARAMS
-typedef CK_AES_CTR_PARAMS CK_ARIA_CTR_PARAMS;
-typedef CK_ARIA_CTR_PARAMS CK_PTR CK_ARIA_CTR_PARAMS_PTR;
+    typedef CK_AES_CTR_PARAMS CK_ARIA_CTR_PARAMS;
+    typedef CK_ARIA_CTR_PARAMS CK_PTR CK_ARIA_CTR_PARAMS_PTR;
 #endif
 
 #ifndef CK_DES_CTR_PARAMS
-typedef struct CK_DES_CTR_PARAMS {
-    CK_ULONG ulCounterBits;
-    CK_BYTE cb[8];
-} CK_DES_CTR_PARAMS;
-typedef CK_DES_CTR_PARAMS CK_PTR CK_DES_CTR_PARAMS_PTR;
+    typedef struct CK_DES_CTR_PARAMS
+    {
+        CK_ULONG ulCounterBits;
+        CK_BYTE cb[8];
+    } CK_DES_CTR_PARAMS;
+    typedef CK_DES_CTR_PARAMS CK_PTR CK_DES_CTR_PARAMS_PTR;
 #endif
 
 /*
@@ -702,309 +694,304 @@ Additional GMAC parameter structures based on CK_AES_GCM_PARAMS
 PKCS has not defined these yet.
 */
 #ifndef CK_AES_GMAC_PARAMS
-typedef CK_AES_GCM_PARAMS CK_AES_GMAC_PARAMS;
-typedef CK_AES_GMAC_PARAMS CK_PTR CK_AES_GMAC_PARAMS_PTR;
+    typedef CK_AES_GCM_PARAMS CK_AES_GMAC_PARAMS;
+    typedef CK_AES_GMAC_PARAMS CK_PTR CK_AES_GMAC_PARAMS_PTR;
 #endif
 
-// Get statistcs from HSM.
-// The high and low values will need to be put together
-// into a 64-bit by the caller.
-typedef struct {
-   CK_ULONG ulId;         // stats parameter id
-   CK_ULONG ulHighValue;  // stats parameter high 32-bit value
-   CK_ULONG ulLowValue;   // stats parameter low 32-bit value
-} HSM_STATS_PARAMS;
-
+    // Get statistcs from HSM.
+    // The high and low values will need to be put together
+    // into a 64-bit by the caller.
+    typedef struct
+    {
+        CK_ULONG ulId;        // stats parameter id
+        CK_ULONG ulHighValue; // stats parameter high 32-bit value
+        CK_ULONG ulLowValue;  // stats parameter low 32-bit value
+    } HSM_STATS_PARAMS;
 
-//CKR_VENDOR_DEFINED
+    // CKR_VENDOR_DEFINED
 
 #define CKR_INSERTION_CALLBACK_NOT_SUPPORTED 0x00000141
-#define CKR_FUNCTION_PARALLEL                0x0052
-#define CKR_SESSION_EXCLUSIVE_EXISTS         0x00B2
+#define CKR_FUNCTION_PARALLEL 0x0052
+#define CKR_SESSION_EXCLUSIVE_EXISTS 0x00B2
 
-#define CKR_RC_ERROR                         (CKR_VENDOR_DEFINED + 0x04)
-#define CKR_CONTAINER_HANDLE_INVALID         (CKR_VENDOR_DEFINED + 0x05)
-#define CKR_TOO_MANY_CONTAINERS              (CKR_VENDOR_DEFINED + 0x06)
-#define CKR_USER_LOCKED_OUT                  (CKR_VENDOR_DEFINED + 0x07)
+#define CKR_RC_ERROR (CKR_VENDOR_DEFINED + 0x04)
+#define CKR_CONTAINER_HANDLE_INVALID (CKR_VENDOR_DEFINED + 0x05)
+#define CKR_TOO_MANY_CONTAINERS (CKR_VENDOR_DEFINED + 0x06)
+#define CKR_USER_LOCKED_OUT (CKR_VENDOR_DEFINED + 0x07)
 #define CKR_CLONING_PARAMETER_ALREADY_EXISTS (CKR_VENDOR_DEFINED + 0x08)
-#define CKR_CLONING_PARAMETER_MISSING        (CKR_VENDOR_DEFINED + 0x09)
-#define CKR_CERTIFICATE_DATA_MISSING         (CKR_VENDOR_DEFINED + 0x0a)
-#define CKR_CERTIFICATE_DATA_INVALID         (CKR_VENDOR_DEFINED + 0x0b)
-#define CKR_ACCEL_DEVICE_ERROR               (CKR_VENDOR_DEFINED + 0x0c)
-#define CKR_WRAPPING_ERROR                   (CKR_VENDOR_DEFINED + 0x0d)
-#define CKR_UNWRAPPING_ERROR                 (CKR_VENDOR_DEFINED + 0x0e)
-#define CKR_MAC_MISSING                      (CKR_VENDOR_DEFINED + 0x0f)
-#define CKR_DAC_POLICY_PID_MISMATCH          (CKR_VENDOR_DEFINED + 0x10)
-#define CKR_DAC_MISSING                      (CKR_VENDOR_DEFINED + 0x11)
-#define CKR_BAD_DAC                          (CKR_VENDOR_DEFINED + 0x12)
-#define CKR_SSK_MISSING                      (CKR_VENDOR_DEFINED + 0x13)
-#define CKR_BAD_MAC                          (CKR_VENDOR_DEFINED + 0x14)
-#define CKR_DAK_MISSING                      (CKR_VENDOR_DEFINED + 0x15)
-#define CKR_BAD_DAK                          (CKR_VENDOR_DEFINED + 0x16)
-#define CKR_SIM_AUTHORIZATION_FAILED         (CKR_VENDOR_DEFINED + 0x17)
-#define CKR_SIM_VERSION_UNSUPPORTED          (CKR_VENDOR_DEFINED + 0x18)
-#define CKR_SIM_CORRUPT_DATA                 (CKR_VENDOR_DEFINED + 0x19)
-#define CKR_USER_NOT_AUTHORIZED              (CKR_VENDOR_DEFINED + 0x1a)
-#define CKR_MAX_OBJECT_COUNT_EXCEEDED        (CKR_VENDOR_DEFINED + 0x1b)
-#define CKR_SO_LOGIN_FAILURE_THRESHOLD       (CKR_VENDOR_DEFINED + 0x1c)
-#define CKR_SIM_AUTHFORM_INVALID             (CKR_VENDOR_DEFINED + 0x1d)
-#define CKR_CITS_DAK_MISSING                 (CKR_VENDOR_DEFINED + 0x1e)
-#define CKR_UNABLE_TO_CONNECT                (CKR_VENDOR_DEFINED + 0x1f)
-#define CKR_PARTITION_DISABLED               (CKR_VENDOR_DEFINED + 0x20)
-#define CKR_CALLBACK_ERROR                   (CKR_VENDOR_DEFINED + 0x21)
-#define CKR_SECURITY_PARAMETER_MISSING       (CKR_VENDOR_DEFINED + 0x22)
-#define CKR_SP_TIMEOUT                       (CKR_VENDOR_DEFINED + 0x23)
-#define CKR_TIMEOUT                          (CKR_VENDOR_DEFINED + 0x24)
-#define CKR_ECC_UNKNOWN_CURVE                (CKR_VENDOR_DEFINED + 0x25)
-#define CKR_MTK_ZEROIZED                     (CKR_VENDOR_DEFINED + 0x26)
-#define CKR_MTK_STATE_INVALID                (CKR_VENDOR_DEFINED + 0x27)
-#define CKR_INVALID_ENTRY_TYPE               (CKR_VENDOR_DEFINED + 0x28)
-#define CKR_MTK_SPLIT_INVALID                (CKR_VENDOR_DEFINED + 0x29)
-#define CKR_HSM_STORAGE_FULL                 (CKR_VENDOR_DEFINED + 0x2a)
-#define CKR_DEVICE_TIMEOUT                   (CKR_VENDOR_DEFINED + 0x2b)
-#define CKR_CONTAINER_OBJECT_STORAGE_FULL    (CKR_VENDOR_DEFINED + 0x2C)
-#define CKR_PED_CLIENT_NOT_RUNNING           (CKR_VENDOR_DEFINED + 0x2D)
-#define CKR_PED_UNPLUGGED                    (CKR_VENDOR_DEFINED + 0x2E)
-#define CKR_ECC_POINT_INVALID                (CKR_VENDOR_DEFINED + 0x2F)
-#define CKR_OPERATION_NOT_ALLOWED            (CKR_VENDOR_DEFINED + 0x30)
-#define CKR_LICENSE_CAPACITY_EXCEEDED        (CKR_VENDOR_DEFINED + 0x31)
-#define CKR_LOG_FILE_NOT_OPEN                (CKR_VENDOR_DEFINED + 0x32)
-#define CKR_LOG_FILE_WRITE_ERROR             (CKR_VENDOR_DEFINED + 0x33)
-#define CKR_LOG_BAD_FILE_NAME                (CKR_VENDOR_DEFINED + 0x34)
-#define CKR_LOG_FULL                         (CKR_VENDOR_DEFINED + 0x35)
-#define CKR_LOG_NO_KCV                       (CKR_VENDOR_DEFINED + 0x36)
-#define CKR_LOG_BAD_RECORD_HMAC              (CKR_VENDOR_DEFINED + 0x37)
-#define CKR_LOG_BAD_TIME                     (CKR_VENDOR_DEFINED + 0x38)
-#define CKR_LOG_AUDIT_NOT_INITIALIZED        (CKR_VENDOR_DEFINED + 0x39)
-#define CKR_LOG_RESYNC_NEEDED                (CKR_VENDOR_DEFINED + 0x3A)
-#define CKR_AUDIT_LOGIN_TIMEOUT_IN_PROGRESS  (CKR_VENDOR_DEFINED + 0x3B)
-#define CKR_AUDIT_LOGIN_FAILURE_THRESHOLD    (CKR_VENDOR_DEFINED + 0x3C)
-#define CKR_INVALID_FUF_TARGET               (CKR_VENDOR_DEFINED + 0x3D)
-#define CKR_INVALID_FUF_HEADER               (CKR_VENDOR_DEFINED + 0x3E)
-#define CKR_INVALID_FUF_VERSION              (CKR_VENDOR_DEFINED + 0x3F)
-#define CKR_ECC_ECC_RESULT_AT_INF            (CKR_VENDOR_DEFINED + 0x40)
-#define CKR_AGAIN                            (CKR_VENDOR_DEFINED + 0x41)
-#define CKR_TOKEN_COPIED                     (CKR_VENDOR_DEFINED + 0x42)
-#define CKR_SLOT_NOT_EMPTY                   (CKR_VENDOR_DEFINED + 0x43)
-#define CKR_USER_ALREADY_ACTIVATED           (CKR_VENDOR_DEFINED + 0x44)
-
-#define CKR_STC_NO_CONTEXT                        (CKR_VENDOR_DEFINED + 0x45)
-#define CKR_STC_CLIENT_IDENTITY_NOT_CONFIGURED    (CKR_VENDOR_DEFINED + 0x46)
+#define CKR_CLONING_PARAMETER_MISSING (CKR_VENDOR_DEFINED + 0x09)
+#define CKR_CERTIFICATE_DATA_MISSING (CKR_VENDOR_DEFINED + 0x0a)
+#define CKR_CERTIFICATE_DATA_INVALID (CKR_VENDOR_DEFINED + 0x0b)
+#define CKR_ACCEL_DEVICE_ERROR (CKR_VENDOR_DEFINED + 0x0c)
+#define CKR_WRAPPING_ERROR (CKR_VENDOR_DEFINED + 0x0d)
+#define CKR_UNWRAPPING_ERROR (CKR_VENDOR_DEFINED + 0x0e)
+#define CKR_MAC_MISSING (CKR_VENDOR_DEFINED + 0x0f)
+#define CKR_DAC_POLICY_PID_MISMATCH (CKR_VENDOR_DEFINED + 0x10)
+#define CKR_DAC_MISSING (CKR_VENDOR_DEFINED + 0x11)
+#define CKR_BAD_DAC (CKR_VENDOR_DEFINED + 0x12)
+#define CKR_SSK_MISSING (CKR_VENDOR_DEFINED + 0x13)
+#define CKR_BAD_MAC (CKR_VENDOR_DEFINED + 0x14)
+#define CKR_DAK_MISSING (CKR_VENDOR_DEFINED + 0x15)
+#define CKR_BAD_DAK (CKR_VENDOR_DEFINED + 0x16)
+#define CKR_SIM_AUTHORIZATION_FAILED (CKR_VENDOR_DEFINED + 0x17)
+#define CKR_SIM_VERSION_UNSUPPORTED (CKR_VENDOR_DEFINED + 0x18)
+#define CKR_SIM_CORRUPT_DATA (CKR_VENDOR_DEFINED + 0x19)
+#define CKR_USER_NOT_AUTHORIZED (CKR_VENDOR_DEFINED + 0x1a)
+#define CKR_MAX_OBJECT_COUNT_EXCEEDED (CKR_VENDOR_DEFINED + 0x1b)
+#define CKR_SO_LOGIN_FAILURE_THRESHOLD (CKR_VENDOR_DEFINED + 0x1c)
+#define CKR_SIM_AUTHFORM_INVALID (CKR_VENDOR_DEFINED + 0x1d)
+#define CKR_CITS_DAK_MISSING (CKR_VENDOR_DEFINED + 0x1e)
+#define CKR_UNABLE_TO_CONNECT (CKR_VENDOR_DEFINED + 0x1f)
+#define CKR_PARTITION_DISABLED (CKR_VENDOR_DEFINED + 0x20)
+#define CKR_CALLBACK_ERROR (CKR_VENDOR_DEFINED + 0x21)
+#define CKR_SECURITY_PARAMETER_MISSING (CKR_VENDOR_DEFINED + 0x22)
+#define CKR_SP_TIMEOUT (CKR_VENDOR_DEFINED + 0x23)
+#define CKR_TIMEOUT (CKR_VENDOR_DEFINED + 0x24)
+#define CKR_ECC_UNKNOWN_CURVE (CKR_VENDOR_DEFINED + 0x25)
+#define CKR_MTK_ZEROIZED (CKR_VENDOR_DEFINED + 0x26)
+#define CKR_MTK_STATE_INVALID (CKR_VENDOR_DEFINED + 0x27)
+#define CKR_INVALID_ENTRY_TYPE (CKR_VENDOR_DEFINED + 0x28)
+#define CKR_MTK_SPLIT_INVALID (CKR_VENDOR_DEFINED + 0x29)
+#define CKR_HSM_STORAGE_FULL (CKR_VENDOR_DEFINED + 0x2a)
+#define CKR_DEVICE_TIMEOUT (CKR_VENDOR_DEFINED + 0x2b)
+#define CKR_CONTAINER_OBJECT_STORAGE_FULL (CKR_VENDOR_DEFINED + 0x2C)
+#define CKR_PED_CLIENT_NOT_RUNNING (CKR_VENDOR_DEFINED + 0x2D)
+#define CKR_PED_UNPLUGGED (CKR_VENDOR_DEFINED + 0x2E)
+#define CKR_ECC_POINT_INVALID (CKR_VENDOR_DEFINED + 0x2F)
+#define CKR_OPERATION_NOT_ALLOWED (CKR_VENDOR_DEFINED + 0x30)
+#define CKR_LICENSE_CAPACITY_EXCEEDED (CKR_VENDOR_DEFINED + 0x31)
+#define CKR_LOG_FILE_NOT_OPEN (CKR_VENDOR_DEFINED + 0x32)
+#define CKR_LOG_FILE_WRITE_ERROR (CKR_VENDOR_DEFINED + 0x33)
+#define CKR_LOG_BAD_FILE_NAME (CKR_VENDOR_DEFINED + 0x34)
+#define CKR_LOG_FULL (CKR_VENDOR_DEFINED + 0x35)
+#define CKR_LOG_NO_KCV (CKR_VENDOR_DEFINED + 0x36)
+#define CKR_LOG_BAD_RECORD_HMAC (CKR_VENDOR_DEFINED + 0x37)
+#define CKR_LOG_BAD_TIME (CKR_VENDOR_DEFINED + 0x38)
+#define CKR_LOG_AUDIT_NOT_INITIALIZED (CKR_VENDOR_DEFINED + 0x39)
+#define CKR_LOG_RESYNC_NEEDED (CKR_VENDOR_DEFINED + 0x3A)
+#define CKR_AUDIT_LOGIN_TIMEOUT_IN_PROGRESS (CKR_VENDOR_DEFINED + 0x3B)
+#define CKR_AUDIT_LOGIN_FAILURE_THRESHOLD (CKR_VENDOR_DEFINED + 0x3C)
+#define CKR_INVALID_FUF_TARGET (CKR_VENDOR_DEFINED + 0x3D)
+#define CKR_INVALID_FUF_HEADER (CKR_VENDOR_DEFINED + 0x3E)
+#define CKR_INVALID_FUF_VERSION (CKR_VENDOR_DEFINED + 0x3F)
+#define CKR_ECC_ECC_RESULT_AT_INF (CKR_VENDOR_DEFINED + 0x40)
+#define CKR_AGAIN (CKR_VENDOR_DEFINED + 0x41)
+#define CKR_TOKEN_COPIED (CKR_VENDOR_DEFINED + 0x42)
+#define CKR_SLOT_NOT_EMPTY (CKR_VENDOR_DEFINED + 0x43)
+#define CKR_USER_ALREADY_ACTIVATED (CKR_VENDOR_DEFINED + 0x44)
+
+#define CKR_STC_NO_CONTEXT (CKR_VENDOR_DEFINED + 0x45)
+#define CKR_STC_CLIENT_IDENTITY_NOT_CONFIGURED (CKR_VENDOR_DEFINED + 0x46)
 #define CKR_STC_PARTITION_IDENTITY_NOT_CONFIGURED (CKR_VENDOR_DEFINED + 0x47)
-#define CKR_STC_DH_KEYGEN_ERROR                   (CKR_VENDOR_DEFINED + 0x48)
-#define CKR_STC_CIPHER_SUITE_REJECTED             (CKR_VENDOR_DEFINED + 0x49)
-#define CKR_STC_DH_KEY_NOT_FROM_SAME_GROUP        (CKR_VENDOR_DEFINED + 0x4a)
-#define CKR_STC_COMPUTE_DH_KEY_ERROR              (CKR_VENDOR_DEFINED + 0x4b)
-#define CKR_STC_FIRST_PHASE_KDF_ERROR             (CKR_VENDOR_DEFINED + 0x4c)
-#define CKR_STC_SECOND_PHASE_KDF_ERROR            (CKR_VENDOR_DEFINED + 0x4d)
-#define CKR_STC_KEY_CONFIRMATION_FAILED           (CKR_VENDOR_DEFINED + 0x4e)
-#define CKR_STC_NO_SESSION_KEY                    (CKR_VENDOR_DEFINED + 0x4f)
-#define CKR_STC_RESPONSE_BAD_MAC                  (CKR_VENDOR_DEFINED + 0x50)
-#define CKR_STC_NOT_ENABLED                       (CKR_VENDOR_DEFINED + 0x51)
-#define CKR_STC_CLIENT_HANDLE_INVALID             (CKR_VENDOR_DEFINED + 0x52)
-#define CKR_STC_SESSION_INVALID                   (CKR_VENDOR_DEFINED + 0x53)
-#define CKR_STC_CONTAINER_INVALID                 (CKR_VENDOR_DEFINED + 0x54)
-#define CKR_STC_SEQUENCE_NUM_INVALID              (CKR_VENDOR_DEFINED + 0x55)
-#define CKR_STC_NO_CHANNEL                        (CKR_VENDOR_DEFINED + 0x56)
-#define CKR_STC_RESPONSE_DECRYPT_ERROR            (CKR_VENDOR_DEFINED + 0x57)
-#define CKR_STC_RESPONSE_REPLAYED                 (CKR_VENDOR_DEFINED + 0X58)
-#define CKR_STC_REKEY_CHANNEL_MISMATCH            (CKR_VENDOR_DEFINED + 0X59)
-#define CKR_STC_RSA_ENCRYPT_ERROR                 (CKR_VENDOR_DEFINED + 0X5a)
-#define CKR_STC_RSA_SIGN_ERROR                    (CKR_VENDOR_DEFINED + 0X5b)
-#define CKR_STC_RSA_DECRYPT_ERROR                 (CKR_VENDOR_DEFINED + 0X5c)
-#define CKR_STC_RESPONSE_UNEXPECTED_KEY           (CKR_VENDOR_DEFINED + 0X5d)
-#define CKR_STC_UNEXPECTED_NONCE_PAYLOAD_SIZE     (CKR_VENDOR_DEFINED + 0X5e)
-#define CKR_STC_UNEXPECTED_DH_DATA_SIZE           (CKR_VENDOR_DEFINED + 0X5f)
-#define CKR_STC_OPEN_CIPHER_MISMATCH              (CKR_VENDOR_DEFINED + 0X60)
-#define CKR_STC_OPEN_DHNIST_PUBKEY_ERROR          (CKR_VENDOR_DEFINED + 0X61)
-#define CKR_STC_OPEN_KEY_MATERIAL_GEN_FAIL        (CKR_VENDOR_DEFINED + 0X62)
-#define CKR_STC_OPEN_RESP_GEN_FAIL                (CKR_VENDOR_DEFINED + 0X63)
-#define CKR_STC_ACTIVATE_MACTAG_U_VERIFY_FAIL     (CKR_VENDOR_DEFINED + 0X64)
-#define CKR_STC_ACTIVATE_MACTAG_V_GEN_FAIL        (CKR_VENDOR_DEFINED + 0X65)
-#define CKR_STC_ACTIVATE_RESP_GEN_FAIL            (CKR_VENDOR_DEFINED + 0X66)
-#define CKR_CHALLENGE_INCORRECT                   (CKR_VENDOR_DEFINED + 0X67)
-#define CKR_ACCESS_ID_INVALID                     (CKR_VENDOR_DEFINED + 0X68)
-#define CKR_ACCESS_ID_ALREADY_EXISTS              (CKR_VENDOR_DEFINED + 0X69)
-#define CKR_KEY_NOT_KEKABLE                       (CKR_VENDOR_DEFINED + 0x6a)
-#define CKR_MECHANISM_INVALID_FOR_FP              (CKR_VENDOR_DEFINED + 0x6b)
-#define CKR_OPERATION_INVALID_FOR_FP              (CKR_VENDOR_DEFINED + 0x6c)
-#define CKR_SESSION_HANDLE_INVALID_FOR_FP         (CKR_VENDOR_DEFINED + 0x6d)
-#define CKR_CMD_NOT_ALLOWED_HSM_IN_TRANSPORT      (CKR_VENDOR_DEFINED + 0x6e)
-#define CKR_OBJECT_ALREADY_EXISTS                 (CKR_VENDOR_DEFINED + 0X6f)
-#define CKR_PARTITION_ROLE_DESC_VERSION_INVALID   (CKR_VENDOR_DEFINED + 0X70)
+#define CKR_STC_DH_KEYGEN_ERROR (CKR_VENDOR_DEFINED + 0x48)
+#define CKR_STC_CIPHER_SUITE_REJECTED (CKR_VENDOR_DEFINED + 0x49)
+#define CKR_STC_DH_KEY_NOT_FROM_SAME_GROUP (CKR_VENDOR_DEFINED + 0x4a)
+#define CKR_STC_COMPUTE_DH_KEY_ERROR (CKR_VENDOR_DEFINED + 0x4b)
+#define CKR_STC_FIRST_PHASE_KDF_ERROR (CKR_VENDOR_DEFINED + 0x4c)
+#define CKR_STC_SECOND_PHASE_KDF_ERROR (CKR_VENDOR_DEFINED + 0x4d)
+#define CKR_STC_KEY_CONFIRMATION_FAILED (CKR_VENDOR_DEFINED + 0x4e)
+#define CKR_STC_NO_SESSION_KEY (CKR_VENDOR_DEFINED + 0x4f)
+#define CKR_STC_RESPONSE_BAD_MAC (CKR_VENDOR_DEFINED + 0x50)
+#define CKR_STC_NOT_ENABLED (CKR_VENDOR_DEFINED + 0x51)
+#define CKR_STC_CLIENT_HANDLE_INVALID (CKR_VENDOR_DEFINED + 0x52)
+#define CKR_STC_SESSION_INVALID (CKR_VENDOR_DEFINED + 0x53)
+#define CKR_STC_CONTAINER_INVALID (CKR_VENDOR_DEFINED + 0x54)
+#define CKR_STC_SEQUENCE_NUM_INVALID (CKR_VENDOR_DEFINED + 0x55)
+#define CKR_STC_NO_CHANNEL (CKR_VENDOR_DEFINED + 0x56)
+#define CKR_STC_RESPONSE_DECRYPT_ERROR (CKR_VENDOR_DEFINED + 0x57)
+#define CKR_STC_RESPONSE_REPLAYED (CKR_VENDOR_DEFINED + 0X58)
+#define CKR_STC_REKEY_CHANNEL_MISMATCH (CKR_VENDOR_DEFINED + 0X59)
+#define CKR_STC_RSA_ENCRYPT_ERROR (CKR_VENDOR_DEFINED + 0X5a)
+#define CKR_STC_RSA_SIGN_ERROR (CKR_VENDOR_DEFINED + 0X5b)
+#define CKR_STC_RSA_DECRYPT_ERROR (CKR_VENDOR_DEFINED + 0X5c)
+#define CKR_STC_RESPONSE_UNEXPECTED_KEY (CKR_VENDOR_DEFINED + 0X5d)
+#define CKR_STC_UNEXPECTED_NONCE_PAYLOAD_SIZE (CKR_VENDOR_DEFINED + 0X5e)
+#define CKR_STC_UNEXPECTED_DH_DATA_SIZE (CKR_VENDOR_DEFINED + 0X5f)
+#define CKR_STC_OPEN_CIPHER_MISMATCH (CKR_VENDOR_DEFINED + 0X60)
+#define CKR_STC_OPEN_DHNIST_PUBKEY_ERROR (CKR_VENDOR_DEFINED + 0X61)
+#define CKR_STC_OPEN_KEY_MATERIAL_GEN_FAIL (CKR_VENDOR_DEFINED + 0X62)
+#define CKR_STC_OPEN_RESP_GEN_FAIL (CKR_VENDOR_DEFINED + 0X63)
+#define CKR_STC_ACTIVATE_MACTAG_U_VERIFY_FAIL (CKR_VENDOR_DEFINED + 0X64)
+#define CKR_STC_ACTIVATE_MACTAG_V_GEN_FAIL (CKR_VENDOR_DEFINED + 0X65)
+#define CKR_STC_ACTIVATE_RESP_GEN_FAIL (CKR_VENDOR_DEFINED + 0X66)
+#define CKR_CHALLENGE_INCORRECT (CKR_VENDOR_DEFINED + 0X67)
+#define CKR_ACCESS_ID_INVALID (CKR_VENDOR_DEFINED + 0X68)
+#define CKR_ACCESS_ID_ALREADY_EXISTS (CKR_VENDOR_DEFINED + 0X69)
+#define CKR_KEY_NOT_KEKABLE (CKR_VENDOR_DEFINED + 0x6a)
+#define CKR_MECHANISM_INVALID_FOR_FP (CKR_VENDOR_DEFINED + 0x6b)
+#define CKR_OPERATION_INVALID_FOR_FP (CKR_VENDOR_DEFINED + 0x6c)
+#define CKR_SESSION_HANDLE_INVALID_FOR_FP (CKR_VENDOR_DEFINED + 0x6d)
+#define CKR_CMD_NOT_ALLOWED_HSM_IN_TRANSPORT (CKR_VENDOR_DEFINED + 0x6e)
+#define CKR_OBJECT_ALREADY_EXISTS (CKR_VENDOR_DEFINED + 0X6f)
+#define CKR_PARTITION_ROLE_DESC_VERSION_INVALID (CKR_VENDOR_DEFINED + 0X70)
 #define CKR_PARTITION_ROLE_POLICY_VERSION_INVALID (CKR_VENDOR_DEFINED + 0X71)
 #define CKR_PARTITION_ROLE_POLICY_SET_VERSION_INVALID (CKR_VENDOR_DEFINED + 0X72)
-#define CKR_REKEK_KEY                             (CKR_VENDOR_DEFINED + 0X73)
-#define CKR_KEK_RETRY_FAILURE                     (CKR_VENDOR_DEFINED + 0X74)
-#define CKR_RNG_RESEED_TOO_EARLY                  (CKR_VENDOR_DEFINED + 0X75)
-#define CKR_HSM_TAMPERED                          (CKR_VENDOR_DEFINED + 0X76)
-#define CKR_CONFIG_CHANGE_ILLEGAL                 (CKR_VENDOR_DEFINED + 0x77)
-#define CKR_SESSION_CONTEXT_NOT_ALLOCATED         (CKR_VENDOR_DEFINED + 0x78)
-#define CKR_SESSION_CONTEXT_ALREADY_ALLOCATED     (CKR_VENDOR_DEFINED + 0x79)
-#define CKR_INVALID_BL_ITB_AUTH_HEADER            (CKR_VENDOR_DEFINED + 0x7A)
-#define CKR_POLICY_ID_INVALID                     (CKR_VENDOR_DEFINED + 0x7B)
-#define CKR_CONFIG_ILLEGAL                        (CKR_VENDOR_DEFINED + 0x7C)
-#define CKR_CONFIG_FAILS_DEPENDENCIES             (CKR_VENDOR_DEFINED + 0x7D)
-#define CKR_CERTIFICATE_TYPE_INVALID              (CKR_VENDOR_DEFINED + 0x7E)
-
-//utilization metrics
-#define CKR_INVALID_UTILIZATION_METRICS           (CKR_VENDOR_DEFINED + 0x7F)
-#define CKR_UTILIZATION_BIN_ID_INVALID            (CKR_VENDOR_DEFINED + 0x80)
-#define CKR_UTILIZATION_COUNTER_ID_INVALID        (CKR_VENDOR_DEFINED + 0x81)
-#define CKR_INVALID_SERIAL_NUM                    (CKR_VENDOR_DEFINED + 0x82)
+#define CKR_REKEK_KEY (CKR_VENDOR_DEFINED + 0X73)
+#define CKR_KEK_RETRY_FAILURE (CKR_VENDOR_DEFINED + 0X74)
+#define CKR_RNG_RESEED_TOO_EARLY (CKR_VENDOR_DEFINED + 0X75)
+#define CKR_HSM_TAMPERED (CKR_VENDOR_DEFINED + 0X76)
+#define CKR_CONFIG_CHANGE_ILLEGAL (CKR_VENDOR_DEFINED + 0x77)
+#define CKR_SESSION_CONTEXT_NOT_ALLOCATED (CKR_VENDOR_DEFINED + 0x78)
+#define CKR_SESSION_CONTEXT_ALREADY_ALLOCATED (CKR_VENDOR_DEFINED + 0x79)
+#define CKR_INVALID_BL_ITB_AUTH_HEADER (CKR_VENDOR_DEFINED + 0x7A)
+#define CKR_POLICY_ID_INVALID (CKR_VENDOR_DEFINED + 0x7B)
+#define CKR_CONFIG_ILLEGAL (CKR_VENDOR_DEFINED + 0x7C)
+#define CKR_CONFIG_FAILS_DEPENDENCIES (CKR_VENDOR_DEFINED + 0x7D)
+#define CKR_CERTIFICATE_TYPE_INVALID (CKR_VENDOR_DEFINED + 0x7E)
+
+// utilization metrics
+#define CKR_INVALID_UTILIZATION_METRICS (CKR_VENDOR_DEFINED + 0x7F)
+#define CKR_UTILIZATION_BIN_ID_INVALID (CKR_VENDOR_DEFINED + 0x80)
+#define CKR_UTILIZATION_COUNTER_ID_INVALID (CKR_VENDOR_DEFINED + 0x81)
+#define CKR_INVALID_SERIAL_NUM (CKR_VENDOR_DEFINED + 0x82)
 
 // BIP32 errors
-#define CKR_BIP32_CHILD_INDEX_INVALID             (CKR_VENDOR_DEFINED | 0x83)
-#define CKR_BIP32_INVALID_HARDENED_DERIVATION     (CKR_VENDOR_DEFINED | 0x84)
-#define CKR_BIP32_MASTER_SEED_LEN_INVALID         (CKR_VENDOR_DEFINED | 0x85)
-#define CKR_BIP32_MASTER_SEED_INVALID             (CKR_VENDOR_DEFINED | 0x86)
-#define CKR_BIP32_INVALID_KEY_PATH_LEN            (CKR_VENDOR_DEFINED | 0x87)
-
-#define CKR_FM_ID_INVALID                         (CKR_VENDOR_DEFINED + 0x88)
-#define CKR_FM_NOT_SUPPORTED                      (CKR_VENDOR_DEFINED + 0x89)
-#define CKR_FM_NEVER_ENABLED                      (CKR_VENDOR_DEFINED + 0x8a)
-#define CKR_FM_DISABLED                           (CKR_VENDOR_DEFINED + 0x8b)
-#define CKR_FM_SMFS_INACTIVE                      (CKR_VENDOR_DEFINED + 0x8c)
+#define CKR_BIP32_CHILD_INDEX_INVALID (CKR_VENDOR_DEFINED | 0x83)
+#define CKR_BIP32_INVALID_HARDENED_DERIVATION (CKR_VENDOR_DEFINED | 0x84)
+#define CKR_BIP32_MASTER_SEED_LEN_INVALID (CKR_VENDOR_DEFINED | 0x85)
+#define CKR_BIP32_MASTER_SEED_INVALID (CKR_VENDOR_DEFINED | 0x86)
+#define CKR_BIP32_INVALID_KEY_PATH_LEN (CKR_VENDOR_DEFINED | 0x87)
+
+#define CKR_FM_ID_INVALID (CKR_VENDOR_DEFINED + 0x88)
+#define CKR_FM_NOT_SUPPORTED (CKR_VENDOR_DEFINED + 0x89)
+#define CKR_FM_NEVER_ENABLED (CKR_VENDOR_DEFINED + 0x8a)
+#define CKR_FM_DISABLED (CKR_VENDOR_DEFINED + 0x8b)
+#define CKR_FM_SMFS_INACTIVE (CKR_VENDOR_DEFINED + 0x8c)
 
 // HSM restart required before the operation can be performed.
-#define CKR_HSM_RESTART_REQUIRED                  (CKR_VENDOR_DEFINED + 0x8d)
+#define CKR_HSM_RESTART_REQUIRED (CKR_VENDOR_DEFINED + 0x8d)
 
-#define CKR_FM_CFG_ALLOWEDFLAG_DISABLED           (CKR_VENDOR_DEFINED + 0x8e)
+#define CKR_FM_CFG_ALLOWEDFLAG_DISABLED (CKR_VENDOR_DEFINED + 0x8e)
 
 // These match the ones already defined for PTK
-#define CKR_OBJECT_READ_ONLY                 (CKR_VENDOR_DEFINED + 0x114)
-#define CKR_KEY_NOT_ACTIVE                   (CKR_VENDOR_DEFINED + 0x136)
+#define CKR_OBJECT_READ_ONLY (CKR_VENDOR_DEFINED + 0x114)
+#define CKR_KEY_NOT_ACTIVE (CKR_VENDOR_DEFINED + 0x136)
 
-// CKO_VENDOR_DEFINED
+    // CKO_VENDOR_DEFINED
 
-#define CKO_TOKEN_ROLE_POLICY_SET            (CKO_VENDOR_DEFINED + 0x0001)
-#define CKO_TOKEN_ROLE_POLICY                (CKO_VENDOR_DEFINED + 0x0002)
-#define CKO_TOKEN_ROLE_DESCRIPTOR            (CKO_VENDOR_DEFINED + 0x0003)
-#define CKO_TOKEN_ROLE_STATE                 (CKO_VENDOR_DEFINED + 0x0004)
+#define CKO_TOKEN_ROLE_POLICY_SET (CKO_VENDOR_DEFINED + 0x0001)
+#define CKO_TOKEN_ROLE_POLICY (CKO_VENDOR_DEFINED + 0x0002)
+#define CKO_TOKEN_ROLE_DESCRIPTOR (CKO_VENDOR_DEFINED + 0x0003)
+#define CKO_TOKEN_ROLE_STATE (CKO_VENDOR_DEFINED + 0x0004)
 
 // Vendor defined objects ported from PTK.
-#define CKO_CERTIFICATE_REQUEST     (CKO_VENDOR_DEFINED + 0x0201)
-#define CKO_CRL                     (CKO_VENDOR_DEFINED + 0x0202)
-#define CKO_ADAPTER                 (CKO_VENDOR_DEFINED + 0x020A)
-#define CKO_SLOT                    (CKO_VENDOR_DEFINED + 0x020B)
-#define CKO_FM                      (CKO_VENDOR_DEFINED + 0x020C)
-
+#define CKO_CERTIFICATE_REQUEST (CKO_VENDOR_DEFINED + 0x0201)
+#define CKO_CRL (CKO_VENDOR_DEFINED + 0x0202)
+#define CKO_ADAPTER (CKO_VENDOR_DEFINED + 0x020A)
+#define CKO_SLOT (CKO_VENDOR_DEFINED + 0x020B)
+#define CKO_FM (CKO_VENDOR_DEFINED + 0x020C)
 
 // CKS_VENDOR_DEFINED: NOTE: PKCS #11 does not define vendor extensions for states.
-#define CKS_RO_SO_FUNCTIONS                   5 /* still in PKCS #11 space */
-#define CKS_RO_VENDOR_DEFINED                 0x80000000
-#define CKS_RW_VENDOR_DEFINED                 0x90000000
-#define CKS_RW_AUDIT_FUNCTIONS                (CKS_RW_VENDOR_DEFINED + 0x001)
-
-
-/****************************************************************************\
-*
-* FASTPATH configuration flags
-*
-\****************************************************************************/
-
-#define CKF_FP_NONE                                         0x00
-#define CKF_FP_KEK_REPLACEMENT_ON_SESSION_KEY_DELETION      0x01
-#define CKF_FP_KEK_REPLACEMENT_ON_TOKEN_KEY_DELETION        0x02
-#define CKF_FP_KEK_REPLACEMENT_ON_ATTRIBUTE_CHANGE          0x04
-#define CKF_FP_KEK_FLAG_ALLOW_MIXED_MODE_KEYS               0x08
+#define CKS_RO_SO_FUNCTIONS 5 /* still in PKCS #11 space */
+#define CKS_RO_VENDOR_DEFINED 0x80000000
+#define CKS_RW_VENDOR_DEFINED 0x90000000
+#define CKS_RW_AUDIT_FUNCTIONS (CKS_RW_VENDOR_DEFINED + 0x001)
+
+    /****************************************************************************\
+    *
+    * FASTPATH configuration flags
+    *
+    \****************************************************************************/
+
+#define CKF_FP_NONE 0x00
+#define CKF_FP_KEK_REPLACEMENT_ON_SESSION_KEY_DELETION 0x01
+#define CKF_FP_KEK_REPLACEMENT_ON_TOKEN_KEY_DELETION 0x02
+#define CKF_FP_KEK_REPLACEMENT_ON_ATTRIBUTE_CHANGE 0x04
+#define CKF_FP_KEK_FLAG_ALLOW_MIXED_MODE_KEYS 0x08
 
 /*****************************************************************************
-*
-* Role state
-*
-*****************************************************************************/
+ *
+ * Role state
+ *
+ *****************************************************************************/
 
 /* NOTE: These match the flag values out of the HSM. */
-#define CAF_ROLE_STATE_INITIALIZED      0x01
-#define CAF_ROLE_STATE_LOCKED_OUT       0x02
-#define CAF_ROLE_STATE_ACTIVATED        0x04
-#define CAF_ROLE_STATE_HAS_RDK          0x08
-#define CAF_ROLE_STATE_PIN_CHANGE       0x10
+#define CAF_ROLE_STATE_INITIALIZED 0x01
+#define CAF_ROLE_STATE_LOCKED_OUT 0x02
+#define CAF_ROLE_STATE_ACTIVATED 0x04
+#define CAF_ROLE_STATE_HAS_RDK 0x08
+#define CAF_ROLE_STATE_PIN_CHANGE 0x10
 #define CAF_ROLE_STATE_CHALLENGE_CHANGE 0x20
 
 /* These do not; they need to be translated from values in luna2if.h. */
-#define CKA_ROLE_AUTH_NONE              0x00
-#define CKA_ROLE_AUTH_PASSWORD          0x01
-#define CKA_ROLE_AUTH_PED               0x02
-#define CKA_ROLE_AUTH_INVALID           0xFF
-
-typedef struct {
-   CK_BYTE   flags;             /* see CAF_ROLE_STATE_* values */
-   CK_BYTE   loginAttemptsLeft; /* before being locked out */
-   CK_BYTE   primaryAuthMech;   /* use CKA_ROLE_* values */
-   CK_BYTE   secondaryAuthMech; /* CKA_ROLE_AUTH_NONE if not set. */
-} CA_ROLE_STATE;
-
-#define CA_MAX_ROLE_NAME_LEN           24
-#define CA_MAX_ROLE_SHORT_NAME_LEN     4
-
-#define CA_MAX_PRP_LABEL_LEN           24
-#define CA_MAX_ROLES_PER_PARTITION     4
-
-#define CA_MAX_PRP_PER_SET             3
-
-/****************************************************************************\
-*
-* M of N
-*
-\****************************************************************************/
-typedef struct {
-   CK_ULONG    ulWeight;
-   CK_BYTE_PTR pVector;
-   CK_ULONG    ulVectorLen;
-   } CA_MOFN_GENERATION;
-typedef CA_MOFN_GENERATION * CA_MOFN_GENERATION_PTR;
-
-typedef struct {
-   CK_BYTE_PTR pVector;
-   CK_ULONG    ulVectorLen;
-   } CA_MOFN_ACTIVATION;
-typedef CA_MOFN_ACTIVATION * CA_MOFN_ACTIVATION_PTR;
-
-typedef struct CA_M_OF_N_STATUS {
-   CK_ULONG ulID;
-   CK_ULONG ulM;
-   CK_ULONG ulN;
-   CK_ULONG ulSecretSize;
-   CK_ULONG ulFlag;         //contains 3 bits: bActive, bGenerated, and bRequired, bMofNCloneable
-   } CA_MOFN_STATUS;
-typedef CA_MOFN_STATUS * CA_MOFN_STATUS_PTR;
-
-
-#define CAF_M_OF_N_REQUIRED                  0x00000001
-#define CAF_M_OF_N_ACTIVATED                 0x00000002
-#define CAF_M_OF_N_GENERATED                 0x00000004
-#define CAF_M_OF_N_CLONEABLE                 0x00000008
-
-
-
-/****************************************************************************\
-*
-* Custom module loading and management
-*
-\****************************************************************************/
-typedef CK_ULONG                    CKCA_MODULE_ID;
-typedef CKCA_MODULE_ID CK_POINTER   CKCA_MODULE_ID_PTR;
-
-typedef struct CKCA_MODULE_INFO
-{
-   CK_ULONG   ulModuleSize;
-   CK_CHAR    developerName[32];
-   CK_CHAR    moduleDescription[32];
-   CK_VERSION moduleVersion;
-} CKCA_MODULE_INFO;
-typedef CKCA_MODULE_INFO CK_POINTER   CKCA_MODULE_INFO_PTR;
-
-
+#define CKA_ROLE_AUTH_NONE 0x00
+#define CKA_ROLE_AUTH_PASSWORD 0x01
+#define CKA_ROLE_AUTH_PED 0x02
+#define CKA_ROLE_AUTH_INVALID 0xFF
+
+    typedef struct
+    {
+        CK_BYTE flags;             /* see CAF_ROLE_STATE_* values */
+        CK_BYTE loginAttemptsLeft; /* before being locked out */
+        CK_BYTE primaryAuthMech;   /* use CKA_ROLE_* values */
+        CK_BYTE secondaryAuthMech; /* CKA_ROLE_AUTH_NONE if not set. */
+    } CA_ROLE_STATE;
+
+#define CA_MAX_ROLE_NAME_LEN 24
+#define CA_MAX_ROLE_SHORT_NAME_LEN 4
+
+#define CA_MAX_PRP_LABEL_LEN 24
+#define CA_MAX_ROLES_PER_PARTITION 4
+
+#define CA_MAX_PRP_PER_SET 3
+
+    /****************************************************************************\
+    *
+    * M of N
+    *
+    \****************************************************************************/
+    typedef struct
+    {
+        CK_ULONG ulWeight;
+        CK_BYTE_PTR pVector;
+        CK_ULONG ulVectorLen;
+    } CA_MOFN_GENERATION;
+    typedef CA_MOFN_GENERATION* CA_MOFN_GENERATION_PTR;
+
+    typedef struct
+    {
+        CK_BYTE_PTR pVector;
+        CK_ULONG ulVectorLen;
+    } CA_MOFN_ACTIVATION;
+    typedef CA_MOFN_ACTIVATION* CA_MOFN_ACTIVATION_PTR;
+
+    typedef struct CA_M_OF_N_STATUS
+    {
+        CK_ULONG ulID;
+        CK_ULONG ulM;
+        CK_ULONG ulN;
+        CK_ULONG ulSecretSize;
+        CK_ULONG ulFlag; // contains 3 bits: bActive, bGenerated, and bRequired, bMofNCloneable
+    } CA_MOFN_STATUS;
+    typedef CA_MOFN_STATUS* CA_MOFN_STATUS_PTR;
+
+#define CAF_M_OF_N_REQUIRED 0x00000001
+#define CAF_M_OF_N_ACTIVATED 0x00000002
+#define CAF_M_OF_N_GENERATED 0x00000004
+#define CAF_M_OF_N_CLONEABLE 0x00000008
+
+    /****************************************************************************\
+    *
+    * Custom module loading and management
+    *
+    \****************************************************************************/
+    typedef CK_ULONG CKCA_MODULE_ID;
+    typedef CKCA_MODULE_ID CK_POINTER CKCA_MODULE_ID_PTR;
+
+    typedef struct CKCA_MODULE_INFO
+    {
+        CK_ULONG ulModuleSize;
+        CK_CHAR developerName[32];
+        CK_CHAR moduleDescription[32];
+        CK_VERSION moduleVersion;
+    } CKCA_MODULE_INFO;
+    typedef CKCA_MODULE_INFO CK_POINTER CKCA_MODULE_INFO_PTR;
 
 #define CKCAO_Encrypt 0
 #define CKCAO_Decrypt 1
-#define CKCAO_Sign    2
-#define CKCAO_Verify  3
-#define CKCAO_Digest  4
-
-
+#define CKCAO_Sign 2
+#define CKCAO_Verify 3
+#define CKCAO_Digest 4
 
 /****************************************************************************\
 *
@@ -1012,164 +999,163 @@ typedef CKCA_MODULE_INFO CK_POINTER   CKCA_MODULE_INFO_PTR;
 *
 \****************************************************************************/
 // assume a client doesn't look at more than 32 Vipers
-#define CK_HA_MAX_MEMBERS       32
-
-typedef struct CK_HA_MEMBER{
-   CK_CHAR     memberSerial[CK_TOKEN_SERIAL_NUMBER_SIZE + 4];
-   CK_RV       memberStatus;
-}CK_HA_MEMBER;
+#define CK_HA_MAX_MEMBERS 32
 
-typedef struct CK_HA_STATUS{
-   CK_CHAR       groupSerial[CK_TOKEN_SERIAL_NUMBER_SIZE + 4];
-   CK_HA_MEMBER   memberList[CK_HA_MAX_MEMBERS];
-   CK_ULONG      listSize;
-}CK_HA_STATUS;
+    typedef struct CK_HA_MEMBER
+    {
+        CK_CHAR memberSerial[CK_TOKEN_SERIAL_NUMBER_SIZE + 4];
+        CK_RV memberStatus;
+    } CK_HA_MEMBER;
 
-typedef CK_HA_MEMBER CK_POINTER CK_HA_MEMBER_PTR;
+    typedef struct CK_HA_STATUS
+    {
+        CK_CHAR groupSerial[CK_TOKEN_SERIAL_NUMBER_SIZE + 4];
+        CK_HA_MEMBER memberList[CK_HA_MAX_MEMBERS];
+        CK_ULONG listSize;
+    } CK_HA_STATUS;
 
-typedef CK_HA_STATUS  CK_POINTER CK_HA_STATE_PTR;
+    typedef CK_HA_MEMBER CK_POINTER CK_HA_MEMBER_PTR;
 
+    typedef CK_HA_STATUS CK_POINTER CK_HA_STATE_PTR;
 
+    /****************************************************************************\
+    *
+    * SafeNet Hardware Secured Certificate functions
+    *
+    \****************************************************************************/
 
-/****************************************************************************\
-*
-* SafeNet Hardware Secured Certificate functions
-*
-\****************************************************************************/
-
-#define CKHSC_CERT_TYPE_TCTRUST_MAC         0x00000001
-#define CKHSC_CERT_TYPE_TCTRUST_DAC         0x00000002
-#define CKHSC_CERT_TYPE_CITS_ROOT           0x00000003
-#define CKHSC_CERT_TYPE_CITS_MICHOC         0x00000004
-#define CKHSC_CERT_TYPE_CITS_DAC            0x00000005
+#define CKHSC_CERT_TYPE_TCTRUST_MAC 0x00000001
+#define CKHSC_CERT_TYPE_TCTRUST_DAC 0x00000002
+#define CKHSC_CERT_TYPE_CITS_ROOT 0x00000003
+#define CKHSC_CERT_TYPE_CITS_MICHOC 0x00000004
+#define CKHSC_CERT_TYPE_CITS_DAC 0x00000005
 
-#define CKHSC_CERT_TYPE_ECC_MIC             0x00000006
-#define CKHSC_CERT_TYPE_ECC_HOC             0x00000007
-#define CKHSC_CERT_TYPE_ECC_DAC             0x00000008
+#define CKHSC_CERT_TYPE_ECC_MIC 0x00000006
+#define CKHSC_CERT_TYPE_ECC_HOC 0x00000007
+#define CKHSC_CERT_TYPE_ECC_DAC 0x00000008
 
-#define CKHSC_CERT_TYPE_TWC                 0x00000009
-#define CKHSC_CERT_TYPE_TWC2                0x0000000A
-#define CKHSC_CERT_TYPE_TWC3                0x0000000B
+#define CKHSC_CERT_TYPE_TWC 0x00000009
+#define CKHSC_CERT_TYPE_TWC2 0x0000000A
+#define CKHSC_CERT_TYPE_TWC3 0x0000000B
 
-#define CKHSC_CERT_TYPE_PEC                 0x00000010
+#define CKHSC_CERT_TYPE_PEC 0x00000010
 
 // FM Certs
-#define CKHSC_CERT_TYPE_CITS_MICHOC_FM      0x00000011
-#define CKHSC_CERT_TYPE_TWC3_FM             0x00000012
-#define CKHSC_CERT_TYPE_ECC_HOC_FM          0x00000013
+#define CKHSC_CERT_TYPE_CITS_MICHOC_FM 0x00000011
+#define CKHSC_CERT_TYPE_TWC3_FM 0x00000012
+#define CKHSC_CERT_TYPE_ECC_HOC_FM 0x00000013
 
-typedef CK_ULONG CKA_SIM_AUTH_FORM;
+    typedef CK_ULONG CKA_SIM_AUTH_FORM;
 
-#define CKA_SIM_NO_AUTHORIZATION 0  // no authorization needed
-#define CKA_SIM_PASSWORD         1  // plain-text passwords
-#define CKA_SIM_CHALLENGE        2  // challenge secrets emitted through the secure port
-#define CKA_SIM_SECURE_PORT      3  // PED keys
+#define CKA_SIM_NO_AUTHORIZATION 0 // no authorization needed
+#define CKA_SIM_PASSWORD 1         // plain-text passwords
+#define CKA_SIM_CHALLENGE 2        // challenge secrets emitted through the secure port
+#define CKA_SIM_SECURE_PORT 3      // PED keys
 
 // Portable SIM
-#define CKA_SIM_PORTABLE_NO_AUTHORIZATION 4  // no authorization needed, portable
-#define CKA_SIM_PORTABLE_PASSWORD         5  // plain-text passwords, portable
-#define CKA_SIM_PORTABLE_CHALLENGE        6  // challenge secrets emitted through the secure port, portable
-#define CKA_SIM_PORTABLE_SECURE_PORT      7  // PED keys, portable
-
+#define CKA_SIM_PORTABLE_NO_AUTHORIZATION 4 // no authorization needed, portable
+#define CKA_SIM_PORTABLE_PASSWORD 5         // plain-text passwords, portable
+#define CKA_SIM_PORTABLE_CHALLENGE 6        // challenge secrets emitted through the secure port, portable
+#define CKA_SIM_PORTABLE_SECURE_PORT 7      // PED keys, portable
 
 #ifndef _TOKEN_HNDLE_DEFINED
-typedef struct CT_Token *CT_TokenHndle;
+    typedef struct CT_Token* CT_TokenHndle;
 #define _TOKEN_HNDLE_DEFINED /* avoid multiple definitions */
 #endif
 
-//////////////////////////////////////////////////////////////////////
-// SIM3 Mechanisms
-//
-// Note: These are defined in the standard cryptoki mechanism list,
-//       elsewhere in this file, they're copied here to ease their use
-//////////////////////////////////////////////////////////////////////.
-
-// CKM_AES_CBC_PAD_EXTRACT                (CKM_VENDOR_DEFINED + 0x200)
-// CKM_AES_CBC_PAD_INSERT                 (CKM_VENDOR_DEFINED + 0x201)
-// CKM_AES_CBC_PAD_EXTRACT_FLATTENED      (CKM_VENDOR_DEFINED + 0x202)
-// CKM_AES_CBC_PAD_INSERT_FLATTENED       (CKM_VENDOR_DEFINED + 0x203)
-
-//////////////////////////////////////////////////////////////////////
-// SIM3 Element types
-//////////////////////////////////////////////////////////////////////
-
-#define CK_NULL_ELEMENT                 (-1)
-#define CK_CRYPTOKI_ELEMENT             0x00000000
-#define CK_PARAM_ELEMENT                0x00000001
+    //////////////////////////////////////////////////////////////////////
+    // SIM3 Mechanisms
+    //
+    // Note: These are defined in the standard cryptoki mechanism list,
+    //       elsewhere in this file, they're copied here to ease their use
+    //////////////////////////////////////////////////////////////////////.
+
+    // CKM_AES_CBC_PAD_EXTRACT                (CKM_VENDOR_DEFINED + 0x200)
+    // CKM_AES_CBC_PAD_INSERT                 (CKM_VENDOR_DEFINED + 0x201)
+    // CKM_AES_CBC_PAD_EXTRACT_FLATTENED      (CKM_VENDOR_DEFINED + 0x202)
+    // CKM_AES_CBC_PAD_INSERT_FLATTENED       (CKM_VENDOR_DEFINED + 0x203)
+
+    //////////////////////////////////////////////////////////////////////
+    // SIM3 Element types
+    //////////////////////////////////////////////////////////////////////
+
+#define CK_NULL_ELEMENT (-1)
+#define CK_CRYPTOKI_ELEMENT 0x00000000
+#define CK_PARAM_ELEMENT 0x00000001
 #define CK_CONTAINER_ACTIVATION_ELEMENT 0x00000002
-#define CK_MOFN_ACTIVATION_ELEMENT      0x00000003
-#define CK_CONTAINER_ELEMENT            0x00000004
+#define CK_MOFN_ACTIVATION_ELEMENT 0x00000003
+#define CK_CONTAINER_ELEMENT 0x00000004
 
 //////////////////////////////////////////////////////////////////////
 // Various Cloning size definitions
 //////////////////////////////////////////////////////////////////////
-#define CK_CLONING_PART1_OVERHEAD   8192
-#define CK_CLONING_PART2_OVERHEAD   76
-#define CK_FLATTENED_OBJECT_OVERHEAD    3264
-
-//////////////////////////////////////////////////////////////////////
-// SIM3 Mechanism parameters
-//////////////////////////////////////////////////////////////////////
-
-typedef struct CK_AES_CBC_PAD_EXTRACT_PARAMS {
-    CK_ULONG     ulType;                     // in
-    CK_ULONG     ulHandle;                   // in
-    CK_ULONG     ulDeleteAfterExtract;       // in
-    CK_BYTE_PTR  pBuffer;                    // out
-    CK_ULONG_PTR pulBufferLen;               // out
-    //      Additional PED CF related parameters:
-    CK_ULONG     ulStorage;  // in: place of HSM object storage: HSM_T, HSM_PED_T, etc. See luna2if.h .
-    CK_ULONG     pedId ;     // in: PED ID: 0 (local), 1, 2,...
-    CK_BYTE_PTR  pbFileName; // in: name of the file at ulStorage, where the object stored.
-    // Secure backup additional parameter
-    CK_ULONG     ctxID; //in: parameter specifying secure backup context handle
-} CK_AES_CBC_PAD_EXTRACT_PARAMS;
-
-typedef CK_AES_CBC_PAD_EXTRACT_PARAMS CK_POINTER CK_AES_CBC_PAD_EXTRACT_PARAMS_PTR;
-
-typedef struct CK_AES_CBC_PAD_INSERT_PARAMS {
-    CK_ULONG                        ulStorageType;              // in
-    CK_ULONG                        ulContainerState;           // in
-    CK_BYTE_PTR                     pBuffer;                    // in
-    CK_ULONG                        ulBufferLen;                // in
-    CK_ULONG_PTR                    pulType;                    // out
-    CK_ULONG_PTR                    pulHandle;                  // out
-    //      Additional PED CF related parameters:
-    CK_ULONG     ulStorage;  // in: place of HSM object storage: HSM_T, HSM_PED_T, etc. See luna2if.h .
-    CK_ULONG     pedId ;     // in: PED ID: 0 (local), 1, 2,...
-    CK_BYTE_PTR  pbFileName; // in: name of the file at ulStorage, where the object stored.
-    // Secure backup additional parameter
-    CK_ULONG     ctxID; //in: parameter specifying secure backup context handle
-} CK_AES_CBC_PAD_INSERT_PARAMS;
-
-typedef CK_AES_CBC_PAD_INSERT_PARAMS CK_POINTER CK_AES_CBC_PAD_INSERT_PARAMS_PTR;
-
-
+#define CK_CLONING_PART1_OVERHEAD 8192
+#define CK_CLONING_PART2_OVERHEAD 76
+#define CK_FLATTENED_OBJECT_OVERHEAD 3264
+
+    //////////////////////////////////////////////////////////////////////
+    // SIM3 Mechanism parameters
+    //////////////////////////////////////////////////////////////////////
+
+    typedef struct CK_AES_CBC_PAD_EXTRACT_PARAMS
+    {
+        CK_ULONG ulType;               // in
+        CK_ULONG ulHandle;             // in
+        CK_ULONG ulDeleteAfterExtract; // in
+        CK_BYTE_PTR pBuffer;           // out
+        CK_ULONG_PTR pulBufferLen;     // out
+        //      Additional PED CF related parameters:
+        CK_ULONG ulStorage;     // in: place of HSM object storage: HSM_T, HSM_PED_T, etc. See luna2if.h .
+        CK_ULONG pedId;         // in: PED ID: 0 (local), 1, 2,...
+        CK_BYTE_PTR pbFileName; // in: name of the file at ulStorage, where the object stored.
+        // Secure backup additional parameter
+        CK_ULONG ctxID; // in: parameter specifying secure backup context handle
+    } CK_AES_CBC_PAD_EXTRACT_PARAMS;
+
+    typedef CK_AES_CBC_PAD_EXTRACT_PARAMS CK_POINTER CK_AES_CBC_PAD_EXTRACT_PARAMS_PTR;
+
+    typedef struct CK_AES_CBC_PAD_INSERT_PARAMS
+    {
+        CK_ULONG ulStorageType;    // in
+        CK_ULONG ulContainerState; // in
+        CK_BYTE_PTR pBuffer;       // in
+        CK_ULONG ulBufferLen;      // in
+        CK_ULONG_PTR pulType;      // out
+        CK_ULONG_PTR pulHandle;    // out
+        //      Additional PED CF related parameters:
+        CK_ULONG ulStorage;     // in: place of HSM object storage: HSM_T, HSM_PED_T, etc. See luna2if.h .
+        CK_ULONG pedId;         // in: PED ID: 0 (local), 1, 2,...
+        CK_BYTE_PTR pbFileName; // in: name of the file at ulStorage, where the object stored.
+        // Secure backup additional parameter
+        CK_ULONG ctxID; // in: parameter specifying secure backup context handle
+    } CK_AES_CBC_PAD_INSERT_PARAMS;
+
+    typedef CK_AES_CBC_PAD_INSERT_PARAMS CK_POINTER CK_AES_CBC_PAD_INSERT_PARAMS_PTR;
 
 //////////////////////////////////////////////////////////////////////////////
 // SIM3:
 // List of available storage location (tokens) for keeping extracted objects.
 //////////////////////////////////////////////////////////////////////////////
-#define CK_STORAGE_HOST               0x00000000
-#define CK_STORAGE_PED_USB_MEMORY     0x00000001
-#define CK_STORAGE_HSM_USB_MEMORY     0x00000002
+#define CK_STORAGE_HOST 0x00000000
+#define CK_STORAGE_PED_USB_MEMORY 0x00000001
+#define CK_STORAGE_HSM_USB_MEMORY 0x00000002
 
 /****************************************************************************\
 *                                                                            *
 * MTK management                                                             *
 *                                                                            *
 \****************************************************************************/
-#define CK_MTK_STATE_FLAG_RESPLIT_ABORTED    0x00000001
-#define CK_MTK_STATE_FLAG_HARD_ZEROIZE       0x00000002
-#define CK_MTK_STATE_FLAG_SOFT_ZEROIZE       0x00000004
-#define CK_MTK_STATE_FLAG_LOCKED             0x00000008
+#define CK_MTK_STATE_FLAG_RESPLIT_ABORTED 0x00000001
+#define CK_MTK_STATE_FLAG_HARD_ZEROIZE 0x00000002
+#define CK_MTK_STATE_FLAG_SOFT_ZEROIZE 0x00000004
+#define CK_MTK_STATE_FLAG_LOCKED 0x00000008
 
 /****************************************************************************\
 *                                                                            *
 * STM management                                                             *
 *                                                                            *
 \****************************************************************************/
-#define CK_STM_STATE_FLAG_STM_TURNED_ON      0x00000004
+#define CK_STM_STATE_FLAG_STM_TURNED_ON 0x00000004
 
 /****************************************************************************\
 *                                                                            *
@@ -1177,34 +1163,31 @@ typedef CK_AES_CBC_PAD_INSERT_PARAMS CK_POINTER CK_AES_CBC_PAD_INSERT_PARAMS_PTR
 *                                                                            *
 \****************************************************************************/
 //[...] Expose these as necessary and make sure they match LUNA ones
-#define CK_GT_TSN                            0x00000003
-#define CK_GT_HSM_SN                         0x0000002B
-#define CK_GT_TAMPER_INFO                    0x00000054
-#define CK_GT_LIVE_TAMPER_INFO               0x00000057
-#define CK_GT_HW_ORIGIN_CERT_FM              0x00000059  // retrieves HOC-FM+MIC
-#define CK_GT_ECC_HOC_FM                     0x0000005B
+#define CK_GT_TSN 0x00000003
+#define CK_GT_HSM_SN 0x0000002B
+#define CK_GT_TAMPER_INFO 0x00000054
+#define CK_GT_LIVE_TAMPER_INFO 0x00000057
+#define CK_GT_HW_ORIGIN_CERT_FM 0x00000059 // retrieves HOC-FM+MIC
+#define CK_GT_ECC_HOC_FM 0x0000005B
 //[...]
 
-
 /****************************************************************************************/
 
-
-
 /****************************************************************************\
 *
 * SafeNet Cluster functions
 *
 \****************************************************************************/
 #ifndef CK_MAX_CLUSTER_MEMBERS
-#define     CK_MAX_CLUSTER_MEMBERS     8
-
-typedef struct CK_CLUSTER_STATE {
-    CK_BYTE          bMembers[CK_MAX_CLUSTER_MEMBERS][32];
-    CK_ULONG         ulMemberStatus[CK_MAX_CLUSTER_MEMBERS];
-} CK_CLUSTER_STATE;
+#define CK_MAX_CLUSTER_MEMBERS 8
 
-typedef CK_CLUSTER_STATE CK_POINTER CK_CLUSTER_STATE_PTR;
+    typedef struct CK_CLUSTER_STATE
+    {
+        CK_BYTE bMembers[CK_MAX_CLUSTER_MEMBERS][32];
+        CK_ULONG ulMemberStatus[CK_MAX_CLUSTER_MEMBERS];
+    } CK_CLUSTER_STATE;
 
+    typedef CK_CLUSTER_STATE CK_POINTER CK_CLUSTER_STATE_PTR;
 
 #endif
 
@@ -1213,17 +1196,17 @@ typedef CK_CLUSTER_STATE CK_POINTER CK_CLUSTER_STATE_PTR;
 * SafeNet PED ID constants
 *
 \****************************************************************************/
-#define CK_PED_ID_LOCAL                 0x0000
+#define CK_PED_ID_LOCAL 0x0000
 
-#define CK_PED_ID_MAX                   0xFFFE
+#define CK_PED_ID_MAX 0xFFFE
 
 /****************************************************************************\
 *
 * SafeNet Usage Counter definitions and functions
 *
 \****************************************************************************/
-#define CK_MODIFY_USAGE_COUNT_COMMAND_TYPE_INCREMENT  0x00000001
-#define CK_MODIFY_USAGE_COUNT_COMMAND_TYPE_SET        0x00000002
+#define CK_MODIFY_USAGE_COUNT_COMMAND_TYPE_INCREMENT 0x00000001
+#define CK_MODIFY_USAGE_COUNT_COMMAND_TYPE_SET 0x00000002
 
 /****************************************************************************\
 *
@@ -1240,76 +1223,79 @@ typedef CK_CLUSTER_STATE CK_POINTER CK_CLUSTER_STATE_PTR;
 
 #define CK_UTILIZATION_COUNTER_REQUESTS 0
 #define LUNA_UTILIZATION_COUNTER_MAX 1
-#define CK_LABLE_LENGTH_MAX (64 + 2) //2 bytes for UTF-8 terminator \0\0
-
-typedef unsigned long long CK_ULONGLONG;
-
-typedef CK_ULONGLONG CK_PTR CK_ULONGLONG_PTR;
-
-
-typedef CK_ULONGLONG CK_UTILIZATION_COUNT;
-typedef CK_UTILIZATION_COUNT CK_PTR CK_UTILIZATION_COUNT_PTR;
-
-typedef struct CK_UTILIZATION_COUNTER {
-   CK_ULONGLONG serNum;
-   CK_CHAR  label[CK_LABLE_LENGTH_MAX];
-   CK_ULONG ulBinId;
-   CK_ULONG ulCounterId;
-   CK_UTILIZATION_COUNT count;
-} CK_UTILIZATION_COUNTER;
-
-typedef CK_UTILIZATION_COUNTER CK_PTR CK_UTILIZATION_COUNTER_PTR;
-
-/****************************************************************************\
-*
-* BIP32 structures and definitions
-*
-\****************************************************************************/
-typedef struct CK_BIP32_MASTER_DERIVE_PARAMS {
-   CK_ATTRIBUTE_PTR pPublicKeyTemplate;
-   CK_ULONG         ulPublicKeyAttributeCount;
-   CK_ATTRIBUTE_PTR pPrivateKeyTemplate;
-   CK_ULONG         ulPrivateKeyAttributeCount;
-   CK_OBJECT_HANDLE hPublicKey; // output parameter
-   CK_OBJECT_HANDLE hPrivateKey; // output parameter
-} CK_BIP32_MASTER_DERIVE_PARAMS;
-typedef CK_BIP32_MASTER_DERIVE_PARAMS CK_PTR CK_BIP32_MASTER_DERIVE_PARAMS_PTR;
-
-typedef struct CK_BIP32_CHILD_DERIVE_PARAMS {
-   CK_ATTRIBUTE_PTR pPublicKeyTemplate;
-   CK_ULONG         ulPublicKeyAttributeCount;
-   CK_ATTRIBUTE_PTR pPrivateKeyTemplate;
-   CK_ULONG         ulPrivateKeyAttributeCount;
-   CK_ULONG_PTR     pulPath;
-   CK_ULONG         ulPathLen;
-   CK_OBJECT_HANDLE hPublicKey; // output parameter
-   CK_OBJECT_HANDLE hPrivateKey; // output parameter
-   CK_ULONG         ulPathErrorIndex; // output parameter
-} CK_BIP32_CHILD_DERIVE_PARAMS;
-typedef CK_BIP32_CHILD_DERIVE_PARAMS CK_PTR CK_BIP32_CHILD_DERIVE_PARAMS_PTR;
+#define CK_LABLE_LENGTH_MAX (64 + 2) // 2 bytes for UTF-8 terminator \0\0
+
+    typedef unsigned long long CK_ULONGLONG;
+
+    typedef CK_ULONGLONG CK_PTR CK_ULONGLONG_PTR;
+
+    typedef CK_ULONGLONG CK_UTILIZATION_COUNT;
+    typedef CK_UTILIZATION_COUNT CK_PTR CK_UTILIZATION_COUNT_PTR;
+
+    typedef struct CK_UTILIZATION_COUNTER
+    {
+        CK_ULONGLONG serNum;
+        CK_CHAR label[CK_LABLE_LENGTH_MAX];
+        CK_ULONG ulBinId;
+        CK_ULONG ulCounterId;
+        CK_UTILIZATION_COUNT count;
+    } CK_UTILIZATION_COUNTER;
+
+    typedef CK_UTILIZATION_COUNTER CK_PTR CK_UTILIZATION_COUNTER_PTR;
+
+    /****************************************************************************\
+    *
+    * BIP32 structures and definitions
+    *
+    \****************************************************************************/
+    typedef struct CK_BIP32_MASTER_DERIVE_PARAMS
+    {
+        CK_ATTRIBUTE_PTR pPublicKeyTemplate;
+        CK_ULONG ulPublicKeyAttributeCount;
+        CK_ATTRIBUTE_PTR pPrivateKeyTemplate;
+        CK_ULONG ulPrivateKeyAttributeCount;
+        CK_OBJECT_HANDLE hPublicKey;  // output parameter
+        CK_OBJECT_HANDLE hPrivateKey; // output parameter
+    } CK_BIP32_MASTER_DERIVE_PARAMS;
+    typedef CK_BIP32_MASTER_DERIVE_PARAMS CK_PTR CK_BIP32_MASTER_DERIVE_PARAMS_PTR;
+
+    typedef struct CK_BIP32_CHILD_DERIVE_PARAMS
+    {
+        CK_ATTRIBUTE_PTR pPublicKeyTemplate;
+        CK_ULONG ulPublicKeyAttributeCount;
+        CK_ATTRIBUTE_PTR pPrivateKeyTemplate;
+        CK_ULONG ulPrivateKeyAttributeCount;
+        CK_ULONG_PTR pulPath;
+        CK_ULONG ulPathLen;
+        CK_OBJECT_HANDLE hPublicKey;  // output parameter
+        CK_OBJECT_HANDLE hPrivateKey; // output parameter
+        CK_ULONG ulPathErrorIndex;    // output parameter
+    } CK_BIP32_CHILD_DERIVE_PARAMS;
+    typedef CK_BIP32_CHILD_DERIVE_PARAMS CK_PTR CK_BIP32_CHILD_DERIVE_PARAMS_PTR;
 
 // BIP32 defines
-#define CKG_BIP32_VERSION_MAINNET_PUB   (0x0488B21E)
-#define CKG_BIP32_VERSION_MAINNET_PRIV  (0x0488ADE4)
-#define CKG_BIP32_VERSION_TESTNET_PUB   (0x043587CF)
-#define CKG_BIP32_VERSION_TESTNET_PRIV  (0x04358394)
-#define CKG_BIP44_PURPOSE               (0x0000002C)
-#define CKG_BIP44_COIN_TYPE_BTC         (0x00000000)
+#define CKG_BIP32_VERSION_MAINNET_PUB (0x0488B21E)
+#define CKG_BIP32_VERSION_MAINNET_PRIV (0x0488ADE4)
+#define CKG_BIP32_VERSION_TESTNET_PUB (0x043587CF)
+#define CKG_BIP32_VERSION_TESTNET_PRIV (0x04358394)
+#define CKG_BIP44_PURPOSE (0x0000002C)
+#define CKG_BIP44_COIN_TYPE_BTC (0x00000000)
 #define CKG_BIP44_COIN_TYPE_BTC_TESTNET (0x00000001)
-#define CKG_BIP32_EXTERNAL_CHAIN        (0x00000000)
-#define CKG_BIP32_INTERNAL_CHAIN        (0x00000001)
-#define CKG_BIP32_MAX_SERIALIZED_LEN    (112)
-#define CKG_BIP32_MAX_PATH_LEN          (255)
-#define CKF_BIP32_HARDENED              (0x80000000)
-
-// EDDSA Parameters
-typedef struct CK_EDDSA_PARAMS {
-    CK_BBOOL     phFlag;
-    CK_ULONG     ulContextDataLen;
-    CK_BYTE_PTR  pContextData;
-} CK_EDDSA_PARAMS;
-
-typedef CK_EDDSA_PARAMS CK_PTR CK_EDDSA_PARAMS_PTR;
+#define CKG_BIP32_EXTERNAL_CHAIN (0x00000000)
+#define CKG_BIP32_INTERNAL_CHAIN (0x00000001)
+#define CKG_BIP32_MAX_SERIALIZED_LEN (112)
+#define CKG_BIP32_MAX_PATH_LEN (255)
+#define CKF_BIP32_HARDENED (0x80000000)
+
+    // EDDSA Parameters
+    typedef struct CK_EDDSA_PARAMS
+    {
+        CK_BBOOL phFlag;
+        CK_ULONG ulContextDataLen;
+        CK_BYTE_PTR pContextData;
+    } CK_EDDSA_PARAMS;
+
+    typedef CK_EDDSA_PARAMS CK_PTR CK_EDDSA_PARAMS_PTR;
 
 /****************************************************************************\
 *                                                                            *
@@ -1317,69 +1303,67 @@ typedef CK_EDDSA_PARAMS CK_PTR CK_EDDSA_PARAMS_PTR;
 *                                                                            *
 \****************************************************************************/
 /*#define CKP_PKCS5_PBKD2_HMAC_SHA1            0x00000001*/
-#define CKP_PKCS5_PBKD2_HMAC_SM3             0x80000B01
+#define CKP_PKCS5_PBKD2_HMAC_SM3 0x80000B01
 
+    typedef struct _CK_POLICY_INFO
+    {
+        CK_ULONG ulID;
+        CK_ULONG ulValue;
+        CK_ULONG ulOffToOnDestructive;
+        CK_ULONG ulOnToOffDestructive;
+    } CK_POLICY_INFO;
 
-typedef struct _CK_POLICY_INFO
-{
-   CK_ULONG ulID;
-   CK_ULONG ulValue;
-   CK_ULONG ulOffToOnDestructive;
-   CK_ULONG ulOnToOffDestructive;
-} CK_POLICY_INFO;
+    typedef CK_POLICY_INFO CK_POINTER CK_POLICY_INFO_PTR;
 
-typedef CK_POLICY_INFO CK_POINTER CK_POLICY_INFO_PTR;
+    typedef CK_RV CK_POINTER CK_RV_PTR;
 
-typedef CK_RV CK_POINTER CK_RV_PTR;
-
-/****************************************************************************\
-*
-* SafeNet function list for CA_ function pointers
-*
-\****************************************************************************/
+    /****************************************************************************\
+    *
+    * SafeNet function list for CA_ function pointers
+    *
+    \****************************************************************************/
 
 #ifndef DISABLE_CA_EXT
 
-/* CK_SFNT_CA_FUNCTION_LIST is a structure holding a Cryptoki spec
- * version and pointers of appropriate types to all the
- * Cryptoki functions */
-typedef struct CK_SFNT_CA_FUNCTION_LIST CK_SFNT_CA_FUNCTION_LIST;
+    /* CK_SFNT_CA_FUNCTION_LIST is a structure holding a Cryptoki spec
+     * version and pointers of appropriate types to all the
+     * Cryptoki functions */
+    typedef struct CK_SFNT_CA_FUNCTION_LIST CK_SFNT_CA_FUNCTION_LIST;
 
-typedef CK_SFNT_CA_FUNCTION_LIST CK_PTR CK_SFNT_CA_FUNCTION_LIST_PTR;
+    typedef CK_SFNT_CA_FUNCTION_LIST CK_PTR CK_SFNT_CA_FUNCTION_LIST_PTR;
 
-typedef CK_SFNT_CA_FUNCTION_LIST_PTR CK_PTR CK_SFNT_CA_FUNCTION_LIST_PTR_PTR;
+    typedef CK_SFNT_CA_FUNCTION_LIST_PTR CK_PTR CK_SFNT_CA_FUNCTION_LIST_PTR_PTR;
 
 #include "sfnt_extensions.h"
 /* the typedefs are in a generated file. */
 #include "sfnt_ext_typedef_members.h"
 
-struct CK_SFNT_CA_FUNCTION_LIST {
+    struct CK_SFNT_CA_FUNCTION_LIST
+    {
+        CK_VERSION version; /* Cryptoki version */
 
-  CK_VERSION    version;  /* Cryptoki version */
-
-  /* The remainder are taken from a generated file. */
+        /* The remainder are taken from a generated file. */
 #include "sfnt_ext_list_members.h"
-
-};
+    };
 
 #endif // DISABLE_CA_EXT
 
 #if defined(VXD)
-   #pragma pack(pop)
+#pragma pack(pop)
 #elif defined(OS_WIN32)
-   #pragma pack(pop, cryptoki)
+#pragma pack(pop, cryptoki)
 #elif defined(OS_UNIX) || defined(OS_LINUX)
 //   #pragma pack
 #else
-   #error "Unknown platform!"
+#error "Unknown platform!"
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#if ! ( defined(OS_LINUX) || defined(OS_HPUX) || defined(OS_AIX) || defined(OS_SOLARIS) )
-#pragma deprecated( CK_USHORT, CK_USHORT_PTR )
+#if !(defined(OS_LINUX) || defined(OS_HPUX) || defined(OS_AIX) || defined(OS_SOLARIS))
+#pragma deprecated(CK_USHORT, CK_USHORT_PTR)
 #endif // not LINUX or HPUX or AIX or Solaris (Solaris gives "unrecognized #pragma....")
 
-#endif                /* CRYPTOKI_H_ */
+#endif /* CRYPTOKI_H_ */
diff --git a/mft_utils/hsmclient/inc/hex64.h b/mft_utils/hsmclient/inc/hex64.h
index 66859ca6..d1c82593 100644
--- a/mft_utils/hsmclient/inc/hex64.h
+++ b/mft_utils/hsmclient/inc/hex64.h
@@ -33,7 +33,6 @@
 #ifndef HEX_64
 #define HEX_64
 
-
 #include <iostream>
 #include <string>
 #include <sstream>
@@ -50,7 +49,11 @@ class Hex64Manipulations
     bool PrintHexData(const std::string& data);
     std::string base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len);
     std::size_t pos_of_char(const unsigned char chr);
-    bool ReadInputPemFile(const char* fileName, std::vector<unsigned char> &outputBuffer, unsigned int& inputSize, bool& IsPem8Format);
+    bool ReadInputPemFile(const char* fileName,
+                          std::vector<unsigned char>& outputBuffer,
+                          unsigned int& inputSize,
+                          bool& IsPem8Format);
+
 public:
     Hex64Manipulations() {}
     virtual ~Hex64Manipulations() {}
diff --git a/mft_utils/hsmclient/inc/hsmlunaclient.h b/mft_utils/hsmclient/inc/hsmlunaclient.h
index 51992459..114506d7 100644
--- a/mft_utils/hsmclient/inc/hsmlunaclient.h
+++ b/mft_utils/hsmclient/inc/hsmlunaclient.h
@@ -54,37 +54,33 @@
 #define BIG_REQUEST 1048576
 #define AES_BLOCK_SIZE 2048
 #define MAX_NUM_OF_HANDLES 100
-#define DIM(a)                   (sizeof(a)/sizeof(a[0]))
+#define DIM(a) (sizeof(a) / sizeof(a[0]))
 //#define PRIVATE_DATA_SIZE 2350
 #define MODULUS_SIZE 512
 typedef struct
 {
     CK_INFO info;
     char reserved[100]; // This is in case the library that we are
-}
-protectedInfo_T;
-
-
+} protectedInfo_T;
 
 class HSMLunaClient
 {
-    private:
-
-    #ifdef OS_WIN32
-        HINSTANCE                       LibHandle;
-    #else
-    #ifdef OS_HPUX
-        shl_t                           LibHandle;
-    #else
-        void*                           LibHandle;
-    #endif
-    #endif
+private:
+#ifdef OS_WIN32
+    HINSTANCE LibHandle;
+#else
+#ifdef OS_HPUX
+    shl_t LibHandle;
+#else
+    void* LibHandle;
+#endif
+#endif
 
-    CK_FUNCTION_LIST*               P11Functions;
-    CK_SFNT_CA_FUNCTION_LIST*       SfntFunctions;
+    CK_FUNCTION_LIST* P11Functions;
+    CK_SFNT_CA_FUNCTION_LIST* SfntFunctions;
     CK_SESSION_HANDLE m_hSession;
-    CK_OBJECT_HANDLE                hSymKey;
-    CK_BYTE                         PlainText[PLAIN_SZ];
+    CK_OBJECT_HANDLE hSymKey;
+    CK_BYTE PlainText[PLAIN_SZ];
     CK_SLOT_ID m_ckSlot;
     CK_BYTE bPassword[64];
     CK_BBOOL GetLibrary(std::string libPath = std::string());
@@ -97,25 +93,36 @@ class HSMLunaClient
     unsigned int ModulusSize;
     const std::string pLibraryPath;
     const std::string pLibraryName;
+
 public:
-    HSMLunaClient() : LibHandle(NULL), P11Functions(NULL), SfntFunctions(NULL), hSymKey(0), m_ckSlot(0xffff),
-        pLibraryPath("/usr/safenet/lunaclient/lib"), pLibraryName("libcklog2.so")
+    HSMLunaClient() :
+        LibHandle(NULL),
+        P11Functions(NULL),
+        SfntFunctions(NULL),
+        hSymKey(0),
+        m_ckSlot(0xffff),
+        pLibraryPath("/usr/safenet/lunaclient/lib"),
+        pLibraryName("libcklog2.so")
     {
         memset(PlainText, 65, sizeof(PlainText));
         strcpy((char*)bPassword, "edwardg");
-        //PrivateKeyDataSize = PRIVATE_DATA_SIZE;
+        // PrivateKeyDataSize = PRIVATE_DATA_SIZE;
         ModulusSize = MODULUS_SIZE;
     }
     CK_BBOOL Init(std::string password = std::string(), std::string libPath = std::string());
     CK_RV TestAESEncryption();
     CK_RV AES_DecryptData();
     CK_RV AES_EncryptData();
-    CK_RV BurnPrivateKey(std::string privateKeyLabel, std::string publicKeyLabel, std::vector<unsigned char> PrivateKeyData);
+    CK_RV BurnPrivateKey(std::string privateKeyLabel,
+                         std::string publicKeyLabel,
+                         std::vector<unsigned char> PrivateKeyData);
     CK_RV FindFirstSlot(CK_SLOT_ID& pckSlot);
     void CleanUp();
     CK_RV RSA_EncryptDataTest(std::string privateKeyLabel, std::string publicKeyLebel);
-    CK_RV RSA_CreateSignature(std::vector <CK_BYTE> data, std::string privateKeyLabel, 
-        std::string publicKeyLabel, std::vector<u_int8_t>& signature);
+    CK_RV RSA_CreateSignature(std::vector<CK_BYTE> data,
+                              std::string privateKeyLabel,
+                              std::string publicKeyLabel,
+                              std::vector<u_int8_t>& signature);
     CK_RV CreatePublicKey(std::string publicKeyLabel, unsigned char* PublicModulus, unsigned int PublicModulusSize);
     CK_RV CheckExistingLabel(std::string label, CK_ULONG& numOfLabels);
 };
diff --git a/mft_utils/hsmclient/inc/rsa/pkcs11.h b/mft_utils/hsmclient/inc/rsa/pkcs11.h
index b231f817..11194f3e 100644
--- a/mft_utils/hsmclient/inc/rsa/pkcs11.h
+++ b/mft_utils/hsmclient/inc/rsa/pkcs11.h
@@ -33,12 +33,11 @@
 #ifndef _PKCS11_H_
 #define _PKCS11_H_ 1
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-
 /* Before including this file (pkcs11.h) (or pkcs11t.h by
  * itself), 6 platform-specific macros must be defined.  These
  * macros are described below, and typical definitions for them
@@ -236,22 +235,19 @@ extern "C" {
  * #endif
  */
 
-
 /* All the various Cryptoki types and #define'd values are in the
  * file pkcs11t.h. */
 #include "pkcs11t.h"
 
-#define __PASTE(x,y)      x##y
+#define __PASTE(x, y) x##y
 
+    /* ==============================================================
+     * Define the "extern" form of all the entry points.
+     * ==============================================================
+     */
 
-/* ==============================================================
- * Define the "extern" form of all the entry points.
- * ==============================================================
- */
-
-#define CK_NEED_ARG_LIST  1
-#define CK_PKCS11_FUNCTION_INFO(name) \
-  extern CK_DECLARE_FUNCTION(CK_RV, name)
+#define CK_NEED_ARG_LIST 1
+#define CK_PKCS11_FUNCTION_INFO(name) extern CK_DECLARE_FUNCTION(CK_RV, name)
 
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes. */
@@ -260,17 +256,15 @@ extern "C" {
 #undef CK_NEED_ARG_LIST
 #undef CK_PKCS11_FUNCTION_INFO
 
+    /* ==============================================================
+     * Define the typedef form of all the entry points.  That is, for
+     * each Cryptoki function C_XXX, define a type CK_C_XXX which is
+     * a pointer to that kind of function.
+     * ==============================================================
+     */
 
-/* ==============================================================
- * Define the typedef form of all the entry points.  That is, for
- * each Cryptoki function C_XXX, define a type CK_C_XXX which is
- * a pointer to that kind of function.
- * ==============================================================
- */
-
-#define CK_NEED_ARG_LIST  1
-#define CK_PKCS11_FUNCTION_INFO(name) \
-  typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_,name))
+#define CK_NEED_ARG_LIST 1
+#define CK_PKCS11_FUNCTION_INFO(name) typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_, name))
 
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes. */
@@ -279,40 +273,33 @@ extern "C" {
 #undef CK_NEED_ARG_LIST
 #undef CK_PKCS11_FUNCTION_INFO
 
+    /* ==============================================================
+     * Define structed vector of entry points.  A CK_FUNCTION_LIST
+     * contains a CK_VERSION indicating a library's Cryptoki version
+     * and then a whole slew of function pointers to the routines in
+     * the library.  This type was declared, but not defined, in
+     * pkcs11t.h.
+     * ==============================================================
+     */
 
-/* ==============================================================
- * Define structed vector of entry points.  A CK_FUNCTION_LIST
- * contains a CK_VERSION indicating a library's Cryptoki version
- * and then a whole slew of function pointers to the routines in
- * the library.  This type was declared, but not defined, in
- * pkcs11t.h.
- * ==============================================================
- */
-
-#define CK_PKCS11_FUNCTION_INFO(name) \
-  __PASTE(CK_,name) name;
-  
-struct CK_FUNCTION_LIST {
+#define CK_PKCS11_FUNCTION_INFO(name) __PASTE(CK_, name) name;
 
-  CK_VERSION    version;  /* Cryptoki version */
+    struct CK_FUNCTION_LIST
+    {
+        CK_VERSION version; /* Cryptoki version */
 
 /* Pile all the function pointers into the CK_FUNCTION_LIST. */
 /* pkcs11f.h has all the information about the Cryptoki
  * function prototypes. */
 #include "pkcs11f.h"
-
-};
+    };
 
 #undef CK_PKCS11_FUNCTION_INFO
 
-
 #undef __PASTE
 
-
 #ifdef __cplusplus
 }
 #endif
 
-
 #endif
-
diff --git a/mft_utils/hsmclient/inc/rsa/pkcs11f.h b/mft_utils/hsmclient/inc/rsa/pkcs11f.h
index 33ced55a..cd1e2a3a 100644
--- a/mft_utils/hsmclient/inc/rsa/pkcs11f.h
+++ b/mft_utils/hsmclient/inc/rsa/pkcs11f.h
@@ -35,511 +35,421 @@
 /* C_Initialize initializes the Cryptoki library. */
 CK_PKCS11_FUNCTION_INFO(C_Initialize)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_VOID_PTR   pInitArgs  /* if this is not NULL_PTR, it gets
-                            * cast to CK_C_INITIALIZE_ARGS_PTR
-                            * and dereferenced */
+(CK_VOID_PTR pInitArgs /* if this is not NULL_PTR, it gets
+                        * cast to CK_C_INITIALIZE_ARGS_PTR
+                        * and dereferenced */
 );
 #endif
 
-
 /* C_Finalize indicates that an application is done with the
  * Cryptoki library. */
 CK_PKCS11_FUNCTION_INFO(C_Finalize)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_VOID_PTR   pReserved  /* reserved.  Should be NULL_PTR */
+(CK_VOID_PTR pReserved /* reserved.  Should be NULL_PTR */
 );
 #endif
 
-
 /* C_GetInfo returns general information about Cryptoki. */
 CK_PKCS11_FUNCTION_INFO(C_GetInfo)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_INFO_PTR   pInfo  /* location that receives information */
+(CK_INFO_PTR pInfo /* location that receives information */
 );
 #endif
 
-
 /* C_GetFunctionList returns the function list. */
 CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_FUNCTION_LIST_PTR_PTR ppFunctionList  /* receives pointer to
-                                            * function list */
+(CK_FUNCTION_LIST_PTR_PTR ppFunctionList /* receives pointer to
+                                          * function list */
 );
 #endif
 
-
-
 /* Slot and token management */
 
 /* C_GetSlotList obtains a list of slots in the system. */
 CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_BBOOL       tokenPresent,  /* only slots with tokens? */
-  CK_SLOT_ID_PTR pSlotList,     /* receives array of slot IDs */
-  CK_ULONG_PTR   pulCount       /* receives number of slots */
+(CK_BBOOL tokenPresent,    /* only slots with tokens? */
+ CK_SLOT_ID_PTR pSlotList, /* receives array of slot IDs */
+ CK_ULONG_PTR pulCount     /* receives number of slots */
 );
 #endif
 
-
 /* C_GetSlotInfo obtains information about a particular slot in
  * the system. */
 CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID       slotID,  /* the ID of the slot */
-  CK_SLOT_INFO_PTR pInfo    /* receives the slot information */
+(CK_SLOT_ID slotID,     /* the ID of the slot */
+ CK_SLOT_INFO_PTR pInfo /* receives the slot information */
 );
 #endif
 
-
 /* C_GetTokenInfo obtains information about a particular token
  * in the system. */
 CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID        slotID,  /* ID of the token's slot */
-  CK_TOKEN_INFO_PTR pInfo    /* receives the token information */
+(CK_SLOT_ID slotID,      /* ID of the token's slot */
+ CK_TOKEN_INFO_PTR pInfo /* receives the token information */
 );
 #endif
 
-
 /* C_GetMechanismList obtains a list of mechanism types
  * supported by a token. */
 CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID            slotID,          /* ID of token's slot */
-  CK_MECHANISM_TYPE_PTR pMechanismList,  /* gets mech. array */
-  CK_ULONG_PTR          pulCount         /* gets # of mechs. */
+(CK_SLOT_ID slotID,                    /* ID of token's slot */
+ CK_MECHANISM_TYPE_PTR pMechanismList, /* gets mech. array */
+ CK_ULONG_PTR pulCount                 /* gets # of mechs. */
 );
 #endif
 
-
 /* C_GetMechanismInfo obtains information about a particular
  * mechanism possibly supported by a token. */
 CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID            slotID,  /* ID of the token's slot */
-  CK_MECHANISM_TYPE     type,    /* type of mechanism */
-  CK_MECHANISM_INFO_PTR pInfo    /* receives mechanism info */
+(CK_SLOT_ID slotID,          /* ID of the token's slot */
+ CK_MECHANISM_TYPE type,     /* type of mechanism */
+ CK_MECHANISM_INFO_PTR pInfo /* receives mechanism info */
 );
 #endif
 
-
 /* C_InitToken initializes a token. */
 CK_PKCS11_FUNCTION_INFO(C_InitToken)
 #ifdef CK_NEED_ARG_LIST
 /* pLabel changed from CK_CHAR_PTR to CK_UTF8CHAR_PTR for v2.10 */
-(
-  CK_SLOT_ID      slotID,    /* ID of the token's slot */
-  CK_UTF8CHAR_PTR pPin,      /* the SO's initial PIN */
-  CK_ULONG        ulPinLen,  /* length in bytes of the PIN */
-  CK_UTF8CHAR_PTR pLabel     /* 32-byte token label (blank padded) */
+(CK_SLOT_ID slotID,     /* ID of the token's slot */
+ CK_UTF8CHAR_PTR pPin,  /* the SO's initial PIN */
+ CK_ULONG ulPinLen,     /* length in bytes of the PIN */
+ CK_UTF8CHAR_PTR pLabel /* 32-byte token label (blank padded) */
 );
 #endif
 
-
 /* C_InitPIN initializes the normal user's PIN. */
 CK_PKCS11_FUNCTION_INFO(C_InitPIN)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_UTF8CHAR_PTR   pPin,      /* the normal user's PIN */
-  CK_ULONG          ulPinLen   /* length in bytes of the PIN */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_UTF8CHAR_PTR pPin,       /* the normal user's PIN */
+ CK_ULONG ulPinLen           /* length in bytes of the PIN */
 );
 #endif
 
-
 /* C_SetPIN modifies the PIN of the user who is logged in. */
 CK_PKCS11_FUNCTION_INFO(C_SetPIN)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_UTF8CHAR_PTR   pOldPin,   /* the old PIN */
-  CK_ULONG          ulOldLen,  /* length of the old PIN */
-  CK_UTF8CHAR_PTR   pNewPin,   /* the new PIN */
-  CK_ULONG          ulNewLen   /* length of the new PIN */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_UTF8CHAR_PTR pOldPin,    /* the old PIN */
+ CK_ULONG ulOldLen,          /* length of the old PIN */
+ CK_UTF8CHAR_PTR pNewPin,    /* the new PIN */
+ CK_ULONG ulNewLen           /* length of the new PIN */
 );
 #endif
 
-
-
 /* Session management */
 
 /* C_OpenSession opens a session between an application and a
  * token. */
 CK_PKCS11_FUNCTION_INFO(C_OpenSession)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID            slotID,        /* the slot's ID */
-  CK_FLAGS              flags,         /* from CK_SESSION_INFO */
-  CK_VOID_PTR           pApplication,  /* passed to callback */
-  CK_NOTIFY             Notify,        /* callback function */
-  CK_SESSION_HANDLE_PTR phSession      /* gets session handle */
+(CK_SLOT_ID slotID,              /* the slot's ID */
+ CK_FLAGS flags,                 /* from CK_SESSION_INFO */
+ CK_VOID_PTR pApplication,       /* passed to callback */
+ CK_NOTIFY Notify,               /* callback function */
+ CK_SESSION_HANDLE_PTR phSession /* gets session handle */
 );
 #endif
 
-
 /* C_CloseSession closes a session between an application and a
  * token. */
 CK_PKCS11_FUNCTION_INFO(C_CloseSession)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
+(CK_SESSION_HANDLE hSession /* the session's handle */
 );
 #endif
 
-
 /* C_CloseAllSessions closes all sessions with a token. */
 CK_PKCS11_FUNCTION_INFO(C_CloseAllSessions)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SLOT_ID     slotID  /* the token's slot */
+(CK_SLOT_ID slotID /* the token's slot */
 );
 #endif
 
-
 /* C_GetSessionInfo obtains information about the session. */
 CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE   hSession,  /* the session's handle */
-  CK_SESSION_INFO_PTR pInfo      /* receives session info */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_SESSION_INFO_PTR pInfo   /* receives session info */
 );
 #endif
 
-
 /* C_GetOperationState obtains the state of the cryptographic operation
  * in a session. */
 CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,             /* session's handle */
-  CK_BYTE_PTR       pOperationState,      /* gets state */
-  CK_ULONG_PTR      pulOperationStateLen  /* gets state length */
+(CK_SESSION_HANDLE hSession,       /* session's handle */
+ CK_BYTE_PTR pOperationState,      /* gets state */
+ CK_ULONG_PTR pulOperationStateLen /* gets state length */
 );
 #endif
 
-
 /* C_SetOperationState restores the state of the cryptographic
  * operation in a session. */
 CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR      pOperationState,      /* holds state */
-  CK_ULONG         ulOperationStateLen,  /* holds state length */
-  CK_OBJECT_HANDLE hEncryptionKey,       /* en/decryption key */
-  CK_OBJECT_HANDLE hAuthenticationKey    /* sign/verify key */
+(CK_SESSION_HANDLE hSession,         /* session's handle */
+ CK_BYTE_PTR pOperationState,        /* holds state */
+ CK_ULONG ulOperationStateLen,       /* holds state length */
+ CK_OBJECT_HANDLE hEncryptionKey,    /* en/decryption key */
+ CK_OBJECT_HANDLE hAuthenticationKey /* sign/verify key */
 );
 #endif
 
-
 /* C_Login logs a user into a token. */
 CK_PKCS11_FUNCTION_INFO(C_Login)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_USER_TYPE      userType,  /* the user type */
-  CK_UTF8CHAR_PTR   pPin,      /* the user's PIN */
-  CK_ULONG          ulPinLen   /* the length of the PIN */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_USER_TYPE userType,      /* the user type */
+ CK_UTF8CHAR_PTR pPin,       /* the user's PIN */
+ CK_ULONG ulPinLen           /* the length of the PIN */
 );
 #endif
 
-
 /* C_Logout logs a user out from a token. */
 CK_PKCS11_FUNCTION_INFO(C_Logout)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
+(CK_SESSION_HANDLE hSession /* the session's handle */
 );
 #endif
 
-
-
 /* Object management */
 
 /* C_CreateObject creates a new object. */
 CK_PKCS11_FUNCTION_INFO(C_CreateObject)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,   /* the object's template */
-  CK_ULONG          ulCount,     /* attributes in template */
-  CK_OBJECT_HANDLE_PTR phObject  /* gets new object's handle. */
+(CK_SESSION_HANDLE hSession,   /* the session's handle */
+ CK_ATTRIBUTE_PTR pTemplate,   /* the object's template */
+ CK_ULONG ulCount,             /* attributes in template */
+ CK_OBJECT_HANDLE_PTR phObject /* gets new object's handle. */
 );
 #endif
 
-
 /* C_CopyObject copies an object, creating a new object for the
  * copy. */
 CK_PKCS11_FUNCTION_INFO(C_CopyObject)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,    /* the session's handle */
-  CK_OBJECT_HANDLE     hObject,     /* the object's handle */
-  CK_ATTRIBUTE_PTR     pTemplate,   /* template for new object */
-  CK_ULONG             ulCount,     /* attributes in template */
-  CK_OBJECT_HANDLE_PTR phNewObject  /* receives handle of copy */
+(CK_SESSION_HANDLE hSession,      /* the session's handle */
+ CK_OBJECT_HANDLE hObject,        /* the object's handle */
+ CK_ATTRIBUTE_PTR pTemplate,      /* template for new object */
+ CK_ULONG ulCount,                /* attributes in template */
+ CK_OBJECT_HANDLE_PTR phNewObject /* receives handle of copy */
 );
 #endif
 
-
 /* C_DestroyObject destroys an object. */
 CK_PKCS11_FUNCTION_INFO(C_DestroyObject)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_OBJECT_HANDLE  hObject    /* the object's handle */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_OBJECT_HANDLE hObject    /* the object's handle */
 );
 #endif
 
-
 /* C_GetObjectSize gets the size of an object in bytes. */
 CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_OBJECT_HANDLE  hObject,   /* the object's handle */
-  CK_ULONG_PTR      pulSize    /* receives size of object */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_OBJECT_HANDLE hObject,   /* the object's handle */
+ CK_ULONG_PTR pulSize        /* receives size of object */
 );
 #endif
 
-
 /* C_GetAttributeValue obtains the value of one or more object
  * attributes. */
 CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_OBJECT_HANDLE  hObject,    /* the object's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs; gets vals */
-  CK_ULONG          ulCount     /* attributes in template */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_OBJECT_HANDLE hObject,   /* the object's handle */
+ CK_ATTRIBUTE_PTR pTemplate, /* specifies attrs; gets vals */
+ CK_ULONG ulCount            /* attributes in template */
 );
 #endif
 
-
 /* C_SetAttributeValue modifies the value of one or more object
  * attributes */
 CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_OBJECT_HANDLE  hObject,    /* the object's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs and values */
-  CK_ULONG          ulCount     /* attributes in template */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_OBJECT_HANDLE hObject,   /* the object's handle */
+ CK_ATTRIBUTE_PTR pTemplate, /* specifies attrs and values */
+ CK_ULONG ulCount            /* attributes in template */
 );
 #endif
 
-
 /* C_FindObjectsInit initializes a search for token and session
  * objects that match a template. */
 CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_ATTRIBUTE_PTR  pTemplate,  /* attribute values to match */
-  CK_ULONG          ulCount     /* attrs in search template */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_ATTRIBUTE_PTR pTemplate, /* attribute values to match */
+ CK_ULONG ulCount            /* attrs in search template */
 );
 #endif
 
-
 /* C_FindObjects continues a search for token and session
  * objects that match a template, obtaining additional object
  * handles. */
 CK_PKCS11_FUNCTION_INFO(C_FindObjects)
 #ifdef CK_NEED_ARG_LIST
-(
- CK_SESSION_HANDLE    hSession,          /* session's handle */
- CK_OBJECT_HANDLE_PTR phObject,          /* gets obj. handles */
- CK_ULONG             ulMaxObjectCount,  /* max handles to get */
- CK_ULONG_PTR         pulObjectCount     /* actual # returned */
+(CK_SESSION_HANDLE hSession,    /* session's handle */
+ CK_OBJECT_HANDLE_PTR phObject, /* gets obj. handles */
+ CK_ULONG ulMaxObjectCount,     /* max handles to get */
+ CK_ULONG_PTR pulObjectCount    /* actual # returned */
 );
 #endif
 
-
 /* C_FindObjectsFinal finishes a search for token and session
  * objects. */
 CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
+(CK_SESSION_HANDLE hSession /* the session's handle */
 );
 #endif
 
-
-
 /* Encryption and decryption */
 
 /* C_EncryptInit initializes an encryption operation. */
 CK_PKCS11_FUNCTION_INFO(C_EncryptInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the encryption mechanism */
-  CK_OBJECT_HANDLE  hKey         /* handle of encryption key */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* the encryption mechanism */
+ CK_OBJECT_HANDLE hKey        /* handle of encryption key */
 );
 #endif
 
-
 /* C_Encrypt encrypts single-part data. */
 CK_PKCS11_FUNCTION_INFO(C_Encrypt)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pData,               /* the plaintext data */
-  CK_ULONG          ulDataLen,           /* bytes of plaintext */
-  CK_BYTE_PTR       pEncryptedData,      /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedDataLen  /* gets c-text size */
+(CK_SESSION_HANDLE hSession,      /* session's handle */
+ CK_BYTE_PTR pData,               /* the plaintext data */
+ CK_ULONG ulDataLen,              /* bytes of plaintext */
+ CK_BYTE_PTR pEncryptedData,      /* gets ciphertext */
+ CK_ULONG_PTR pulEncryptedDataLen /* gets c-text size */
 );
 #endif
 
-
 /* C_EncryptUpdate continues a multiple-part encryption
  * operation. */
 CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,           /* session's handle */
-  CK_BYTE_PTR       pPart,              /* the plaintext data */
-  CK_ULONG          ulPartLen,          /* plaintext data len */
-  CK_BYTE_PTR       pEncryptedPart,     /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedPartLen /* gets c-text size */
+(CK_SESSION_HANDLE hSession,      /* session's handle */
+ CK_BYTE_PTR pPart,               /* the plaintext data */
+ CK_ULONG ulPartLen,              /* plaintext data len */
+ CK_BYTE_PTR pEncryptedPart,      /* gets ciphertext */
+ CK_ULONG_PTR pulEncryptedPartLen /* gets c-text size */
 );
 #endif
 
-
 /* C_EncryptFinal finishes a multiple-part encryption
  * operation. */
 CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,                /* session handle */
-  CK_BYTE_PTR       pLastEncryptedPart,      /* last c-text */
-  CK_ULONG_PTR      pulLastEncryptedPartLen  /* gets last size */
+(CK_SESSION_HANDLE hSession,          /* session handle */
+ CK_BYTE_PTR pLastEncryptedPart,      /* last c-text */
+ CK_ULONG_PTR pulLastEncryptedPartLen /* gets last size */
 );
 #endif
 
-
 /* C_DecryptInit initializes a decryption operation. */
 CK_PKCS11_FUNCTION_INFO(C_DecryptInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the decryption mechanism */
-  CK_OBJECT_HANDLE  hKey         /* handle of decryption key */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* the decryption mechanism */
+ CK_OBJECT_HANDLE hKey        /* handle of decryption key */
 );
 #endif
 
-
 /* C_Decrypt decrypts encrypted data in a single part. */
 CK_PKCS11_FUNCTION_INFO(C_Decrypt)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,           /* session's handle */
-  CK_BYTE_PTR       pEncryptedData,     /* ciphertext */
-  CK_ULONG          ulEncryptedDataLen, /* ciphertext length */
-  CK_BYTE_PTR       pData,              /* gets plaintext */
-  CK_ULONG_PTR      pulDataLen          /* gets p-text size */
+(CK_SESSION_HANDLE hSession,  /* session's handle */
+ CK_BYTE_PTR pEncryptedData,  /* ciphertext */
+ CK_ULONG ulEncryptedDataLen, /* ciphertext length */
+ CK_BYTE_PTR pData,           /* gets plaintext */
+ CK_ULONG_PTR pulDataLen      /* gets p-text size */
 );
 #endif
 
-
 /* C_DecryptUpdate continues a multiple-part decryption
  * operation. */
 CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pEncryptedPart,      /* encrypted data */
-  CK_ULONG          ulEncryptedPartLen,  /* input length */
-  CK_BYTE_PTR       pPart,               /* gets plaintext */
-  CK_ULONG_PTR      pulPartLen           /* p-text size */
+(CK_SESSION_HANDLE hSession,  /* session's handle */
+ CK_BYTE_PTR pEncryptedPart,  /* encrypted data */
+ CK_ULONG ulEncryptedPartLen, /* input length */
+ CK_BYTE_PTR pPart,           /* gets plaintext */
+ CK_ULONG_PTR pulPartLen      /* p-text size */
 );
 #endif
 
-
 /* C_DecryptFinal finishes a multiple-part decryption
  * operation. */
 CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,       /* the session's handle */
-  CK_BYTE_PTR       pLastPart,      /* gets plaintext */
-  CK_ULONG_PTR      pulLastPartLen  /* p-text size */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pLastPart,      /* gets plaintext */
+ CK_ULONG_PTR pulLastPartLen /* p-text size */
 );
 #endif
 
-
-
 /* Message digesting */
 
 /* C_DigestInit initializes a message-digesting operation. */
 CK_PKCS11_FUNCTION_INFO(C_DigestInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism  /* the digesting mechanism */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_MECHANISM_PTR pMechanism /* the digesting mechanism */
 );
 #endif
 
-
 /* C_Digest digests data in a single part. */
 CK_PKCS11_FUNCTION_INFO(C_Digest)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,     /* the session's handle */
-  CK_BYTE_PTR       pData,        /* data to be digested */
-  CK_ULONG          ulDataLen,    /* bytes of data to digest */
-  CK_BYTE_PTR       pDigest,      /* gets the message digest */
-  CK_ULONG_PTR      pulDigestLen  /* gets digest length */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pData,          /* data to be digested */
+ CK_ULONG ulDataLen,         /* bytes of data to digest */
+ CK_BYTE_PTR pDigest,        /* gets the message digest */
+ CK_ULONG_PTR pulDigestLen   /* gets digest length */
 );
 #endif
 
-
 /* C_DigestUpdate continues a multiple-part message-digesting
  * operation. */
 CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pPart,     /* data to be digested */
-  CK_ULONG          ulPartLen  /* bytes of data to be digested */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pPart,          /* data to be digested */
+ CK_ULONG ulPartLen          /* bytes of data to be digested */
 );
 #endif
 
-
 /* C_DigestKey continues a multi-part message-digesting
  * operation, by digesting the value of a secret key as part of
  * the data already digested. */
 CK_PKCS11_FUNCTION_INFO(C_DigestKey)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_OBJECT_HANDLE  hKey       /* secret key to digest */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_OBJECT_HANDLE hKey       /* secret key to digest */
 );
 #endif
 
-
 /* C_DigestFinal finishes a multiple-part message-digesting
  * operation. */
 CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,     /* the session's handle */
-  CK_BYTE_PTR       pDigest,      /* gets the message digest */
-  CK_ULONG_PTR      pulDigestLen  /* gets byte count of digest */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pDigest,        /* gets the message digest */
+ CK_ULONG_PTR pulDigestLen   /* gets byte count of digest */
 );
 #endif
 
-
-
 /* Signing and MACing */
 
 /* C_SignInit initializes a signature (private key encryption)
@@ -548,81 +458,68 @@ CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
  *signature. */
 CK_PKCS11_FUNCTION_INFO(C_SignInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the signature mechanism */
-  CK_OBJECT_HANDLE  hKey         /* handle of signature key */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* the signature mechanism */
+ CK_OBJECT_HANDLE hKey        /* handle of signature key */
 );
 #endif
 
-
 /* C_Sign signs (encrypts with private key) data in a single
  * part, where the signature is (will be) an appendix to the
  * data, and plaintext cannot be recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_Sign)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pData,           /* the data to sign */
-  CK_ULONG          ulDataLen,       /* count of bytes to sign */
-  CK_BYTE_PTR       pSignature,      /* gets the signature */
-  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_BYTE_PTR pData,           /* the data to sign */
+ CK_ULONG ulDataLen,          /* count of bytes to sign */
+ CK_BYTE_PTR pSignature,      /* gets the signature */
+ CK_ULONG_PTR pulSignatureLen /* gets signature length */
 );
 #endif
 
-
 /* C_SignUpdate continues a multiple-part signature operation,
- * where the signature is (will be) an appendix to the data, 
+ * where the signature is (will be) an appendix to the data,
  * and plaintext cannot be recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pPart,     /* the data to sign */
-  CK_ULONG          ulPartLen  /* count of bytes to sign */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pPart,          /* the data to sign */
+ CK_ULONG ulPartLen          /* count of bytes to sign */
 );
 #endif
 
-
-/* C_SignFinal finishes a multiple-part signature operation, 
+/* C_SignFinal finishes a multiple-part signature operation,
  * returning the signature. */
 CK_PKCS11_FUNCTION_INFO(C_SignFinal)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pSignature,      /* gets the signature */
-  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_BYTE_PTR pSignature,      /* gets the signature */
+ CK_ULONG_PTR pulSignatureLen /* gets signature length */
 );
 #endif
 
-
 /* C_SignRecoverInit initializes a signature operation, where
  * the data can be recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,   /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism, /* the signature mechanism */
-  CK_OBJECT_HANDLE  hKey        /* handle of the signature key */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* the signature mechanism */
+ CK_OBJECT_HANDLE hKey        /* handle of the signature key */
 );
 #endif
 
-
 /* C_SignRecover signs data in a single operation, where the
  * data can be recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_SignRecover)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pData,           /* the data to sign */
-  CK_ULONG          ulDataLen,       /* count of bytes to sign */
-  CK_BYTE_PTR       pSignature,      /* gets the signature */
-  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_BYTE_PTR pData,           /* the data to sign */
+ CK_ULONG ulDataLen,          /* count of bytes to sign */
+ CK_BYTE_PTR pSignature,      /* gets the signature */
+ CK_ULONG_PTR pulSignatureLen /* gets signature length */
 );
 #endif
 
-
-
 /* Verifying signatures and MACs */
 
 /* C_VerifyInit initializes a verification operation, where the
@@ -630,258 +527,220 @@ CK_PKCS11_FUNCTION_INFO(C_SignRecover)
  *  cannot be recovered from the signature (e.g. DSA). */
 CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
-  CK_OBJECT_HANDLE  hKey         /* verification key */ 
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
+ CK_OBJECT_HANDLE hKey        /* verification key */
 );
 #endif
 
-
-/* C_Verify verifies a signature in a single-part operation, 
+/* C_Verify verifies a signature in a single-part operation,
  * where the signature is an appendix to the data, and plaintext
  * cannot be recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_Verify)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,       /* the session's handle */
-  CK_BYTE_PTR       pData,          /* signed data */
-  CK_ULONG          ulDataLen,      /* length of signed data */
-  CK_BYTE_PTR       pSignature,     /* signature */
-  CK_ULONG          ulSignatureLen  /* signature length*/
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pData,          /* signed data */
+ CK_ULONG ulDataLen,         /* length of signed data */
+ CK_BYTE_PTR pSignature,     /* signature */
+ CK_ULONG ulSignatureLen     /* signature length*/
 );
 #endif
 
-
 /* C_VerifyUpdate continues a multiple-part verification
- * operation, where the signature is an appendix to the data, 
+ * operation, where the signature is an appendix to the data,
  * and plaintext cannot be recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pPart,     /* signed data */
-  CK_ULONG          ulPartLen  /* length of signed data */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pPart,          /* signed data */
+ CK_ULONG ulPartLen          /* length of signed data */
 );
 #endif
 
-
 /* C_VerifyFinal finishes a multiple-part verification
  * operation, checking the signature. */
 CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,       /* the session's handle */
-  CK_BYTE_PTR       pSignature,     /* signature to verify */
-  CK_ULONG          ulSignatureLen  /* signature length */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pSignature,     /* signature to verify */
+ CK_ULONG ulSignatureLen     /* signature length */
 );
 #endif
 
-
 /* C_VerifyRecoverInit initializes a signature verification
  * operation, where the data is recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
-  CK_OBJECT_HANDLE  hKey         /* verification key */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* the verification mechanism */
+ CK_OBJECT_HANDLE hKey        /* verification key */
 );
 #endif
 
-
 /* C_VerifyRecover verifies a signature in a single-part
  * operation, where the data is recovered from the signature. */
 CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_BYTE_PTR       pSignature,      /* signature to verify */
-  CK_ULONG          ulSignatureLen,  /* signature length */
-  CK_BYTE_PTR       pData,           /* gets signed data */
-  CK_ULONG_PTR      pulDataLen       /* gets signed data len */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pSignature,     /* signature to verify */
+ CK_ULONG ulSignatureLen,    /* signature length */
+ CK_BYTE_PTR pData,          /* gets signed data */
+ CK_ULONG_PTR pulDataLen     /* gets signed data len */
 );
 #endif
 
-
-
 /* Dual-function cryptographic operations */
 
 /* C_DigestEncryptUpdate continues a multiple-part digesting
  * and encryption operation. */
 CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pPart,               /* the plaintext data */
-  CK_ULONG          ulPartLen,           /* plaintext length */
-  CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
+(CK_SESSION_HANDLE hSession,      /* session's handle */
+ CK_BYTE_PTR pPart,               /* the plaintext data */
+ CK_ULONG ulPartLen,              /* plaintext length */
+ CK_BYTE_PTR pEncryptedPart,      /* gets ciphertext */
+ CK_ULONG_PTR pulEncryptedPartLen /* gets c-text length */
 );
 #endif
 
-
 /* C_DecryptDigestUpdate continues a multiple-part decryption and
  * digesting operation. */
 CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
-  CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
-  CK_BYTE_PTR       pPart,               /* gets plaintext */
-  CK_ULONG_PTR      pulPartLen           /* gets plaintext len */
+(CK_SESSION_HANDLE hSession,  /* session's handle */
+ CK_BYTE_PTR pEncryptedPart,  /* ciphertext */
+ CK_ULONG ulEncryptedPartLen, /* ciphertext length */
+ CK_BYTE_PTR pPart,           /* gets plaintext */
+ CK_ULONG_PTR pulPartLen      /* gets plaintext len */
 );
 #endif
 
-
 /* C_SignEncryptUpdate continues a multiple-part signing and
  * encryption operation. */
 CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pPart,               /* the plaintext data */
-  CK_ULONG          ulPartLen,           /* plaintext length */
-  CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
-  CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
+(CK_SESSION_HANDLE hSession,      /* session's handle */
+ CK_BYTE_PTR pPart,               /* the plaintext data */
+ CK_ULONG ulPartLen,              /* plaintext length */
+ CK_BYTE_PTR pEncryptedPart,      /* gets ciphertext */
+ CK_ULONG_PTR pulEncryptedPartLen /* gets c-text length */
 );
 #endif
 
-
 /* C_DecryptVerifyUpdate continues a multiple-part decryption and
  * verify operation. */
 CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,            /* session's handle */
-  CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
-  CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
-  CK_BYTE_PTR       pPart,               /* gets plaintext */
-  CK_ULONG_PTR      pulPartLen           /* gets p-text length */
+(CK_SESSION_HANDLE hSession,  /* session's handle */
+ CK_BYTE_PTR pEncryptedPart,  /* ciphertext */
+ CK_ULONG ulEncryptedPartLen, /* ciphertext length */
+ CK_BYTE_PTR pPart,           /* gets plaintext */
+ CK_ULONG_PTR pulPartLen      /* gets p-text length */
 );
 #endif
 
-
-
 /* Key management */
 
 /* C_GenerateKey generates a secret key, creating a new key
  * object. */
 CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,    /* the session's handle */
-  CK_MECHANISM_PTR     pMechanism,  /* key generation mech. */
-  CK_ATTRIBUTE_PTR     pTemplate,   /* template for new key */
-  CK_ULONG             ulCount,     /* # of attrs in template */
-  CK_OBJECT_HANDLE_PTR phKey        /* gets handle of new key */
+(CK_SESSION_HANDLE hSession,  /* the session's handle */
+ CK_MECHANISM_PTR pMechanism, /* key generation mech. */
+ CK_ATTRIBUTE_PTR pTemplate,  /* template for new key */
+ CK_ULONG ulCount,            /* # of attrs in template */
+ CK_OBJECT_HANDLE_PTR phKey   /* gets handle of new key */
 );
 #endif
 
-
-/* C_GenerateKeyPair generates a public-key/private-key pair, 
+/* C_GenerateKeyPair generates a public-key/private-key pair,
  * creating new key objects. */
 CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,                    /* session
-                                                     * handle */
-  CK_MECHANISM_PTR     pMechanism,                  /* key-gen
-                                                     * mech. */
-  CK_ATTRIBUTE_PTR     pPublicKeyTemplate,          /* template
-                                                     * for pub.
-                                                     * key */
-  CK_ULONG             ulPublicKeyAttributeCount,   /* # pub.
-                                                     * attrs. */
-  CK_ATTRIBUTE_PTR     pPrivateKeyTemplate,         /* template
-                                                     * for priv.
-                                                     * key */
-  CK_ULONG             ulPrivateKeyAttributeCount,  /* # priv.
-                                                     * attrs. */
-  CK_OBJECT_HANDLE_PTR phPublicKey,                 /* gets pub.
-                                                     * key
-                                                     * handle */
-  CK_OBJECT_HANDLE_PTR phPrivateKey                 /* gets
-                                                     * priv. key
-                                                     * handle */
+(CK_SESSION_HANDLE hSession,           /* session
+                                        * handle */
+ CK_MECHANISM_PTR pMechanism,          /* key-gen
+                                        * mech. */
+ CK_ATTRIBUTE_PTR pPublicKeyTemplate,  /* template
+                                        * for pub.
+                                        * key */
+ CK_ULONG ulPublicKeyAttributeCount,   /* # pub.
+                                        * attrs. */
+ CK_ATTRIBUTE_PTR pPrivateKeyTemplate, /* template
+                                        * for priv.
+                                        * key */
+ CK_ULONG ulPrivateKeyAttributeCount,  /* # priv.
+                                        * attrs. */
+ CK_OBJECT_HANDLE_PTR phPublicKey,     /* gets pub.
+                                        * key
+                                        * handle */
+ CK_OBJECT_HANDLE_PTR phPrivateKey     /* gets
+                                        * priv. key
+                                        * handle */
 );
 #endif
 
-
 /* C_WrapKey wraps (i.e., encrypts) a key. */
 CK_PKCS11_FUNCTION_INFO(C_WrapKey)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,        /* the session's handle */
-  CK_MECHANISM_PTR  pMechanism,      /* the wrapping mechanism */
-  CK_OBJECT_HANDLE  hWrappingKey,    /* wrapping key */
-  CK_OBJECT_HANDLE  hKey,            /* key to be wrapped */
-  CK_BYTE_PTR       pWrappedKey,     /* gets wrapped key */
-  CK_ULONG_PTR      pulWrappedKeyLen /* gets wrapped key size */
+(CK_SESSION_HANDLE hSession,    /* the session's handle */
+ CK_MECHANISM_PTR pMechanism,   /* the wrapping mechanism */
+ CK_OBJECT_HANDLE hWrappingKey, /* wrapping key */
+ CK_OBJECT_HANDLE hKey,         /* key to be wrapped */
+ CK_BYTE_PTR pWrappedKey,       /* gets wrapped key */
+ CK_ULONG_PTR pulWrappedKeyLen  /* gets wrapped key size */
 );
 #endif
 
-
 /* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
  * key object. */
 CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,          /* session's handle */
-  CK_MECHANISM_PTR     pMechanism,        /* unwrapping mech. */
-  CK_OBJECT_HANDLE     hUnwrappingKey,    /* unwrapping key */
-  CK_BYTE_PTR          pWrappedKey,       /* the wrapped key */
-  CK_ULONG             ulWrappedKeyLen,   /* wrapped key len */
-  CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
-  CK_ULONG             ulAttributeCount,  /* template length */
-  CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
+(CK_SESSION_HANDLE hSession,      /* session's handle */
+ CK_MECHANISM_PTR pMechanism,     /* unwrapping mech. */
+ CK_OBJECT_HANDLE hUnwrappingKey, /* unwrapping key */
+ CK_BYTE_PTR pWrappedKey,         /* the wrapped key */
+ CK_ULONG ulWrappedKeyLen,        /* wrapped key len */
+ CK_ATTRIBUTE_PTR pTemplate,      /* new key template */
+ CK_ULONG ulAttributeCount,       /* template length */
+ CK_OBJECT_HANDLE_PTR phKey       /* gets new handle */
 );
 #endif
 
-
 /* C_DeriveKey derives a key from a base key, creating a new key
  * object. */
 CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE    hSession,          /* session's handle */
-  CK_MECHANISM_PTR     pMechanism,        /* key deriv. mech. */
-  CK_OBJECT_HANDLE     hBaseKey,          /* base key */
-  CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
-  CK_ULONG             ulAttributeCount,  /* template length */
-  CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
+(CK_SESSION_HANDLE hSession,  /* session's handle */
+ CK_MECHANISM_PTR pMechanism, /* key deriv. mech. */
+ CK_OBJECT_HANDLE hBaseKey,   /* base key */
+ CK_ATTRIBUTE_PTR pTemplate,  /* new key template */
+ CK_ULONG ulAttributeCount,   /* template length */
+ CK_OBJECT_HANDLE_PTR phKey   /* gets new handle */
 );
 #endif
 
-
-
 /* Random number generation */
 
 /* C_SeedRandom mixes additional seed material into the token's
  * random number generator. */
 CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,  /* the session's handle */
-  CK_BYTE_PTR       pSeed,     /* the seed material */
-  CK_ULONG          ulSeedLen  /* length of seed material */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR pSeed,          /* the seed material */
+ CK_ULONG ulSeedLen          /* length of seed material */
 );
 #endif
 
-
 /* C_GenerateRandom generates random data. */
 CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession,    /* the session's handle */
-  CK_BYTE_PTR       RandomData,  /* receives the random data */
-  CK_ULONG          ulRandomLen  /* # of bytes to generate */
+(CK_SESSION_HANDLE hSession, /* the session's handle */
+ CK_BYTE_PTR RandomData,     /* receives the random data */
+ CK_ULONG ulRandomLen        /* # of bytes to generate */
 );
 #endif
 
-
-
 /* Parallel function management */
 
 /* C_GetFunctionStatus is a legacy function; it obtains an
@@ -889,33 +748,26 @@ CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
  * application. */
 CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
+(CK_SESSION_HANDLE hSession /* the session's handle */
 );
 #endif
 
-
 /* C_CancelFunction is a legacy function; it cancels a function
  * running in parallel. */
 CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_SESSION_HANDLE hSession  /* the session's handle */
+(CK_SESSION_HANDLE hSession /* the session's handle */
 );
 #endif
 
-
-
 /* Functions added in for Cryptoki Version 2.01 or later */
 
 /* C_WaitForSlotEvent waits for a slot event (token insertion,
  * removal, etc.) to occur. */
 CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
 #ifdef CK_NEED_ARG_LIST
-(
-  CK_FLAGS flags,        /* blocking/nonblocking flag */
-  CK_SLOT_ID_PTR pSlot,  /* location that receives the slot ID */
-  CK_VOID_PTR pRserved   /* reserved.  Should be NULL_PTR */
+(CK_FLAGS flags,       /* blocking/nonblocking flag */
+ CK_SLOT_ID_PTR pSlot, /* location that receives the slot ID */
+ CK_VOID_PTR pRserved  /* reserved.  Should be NULL_PTR */
 );
 #endif
-
diff --git a/mft_utils/hsmclient/inc/rsa/pkcs11t.h b/mft_utils/hsmclient/inc/rsa/pkcs11t.h
index a1998cb6..5bbda1cf 100644
--- a/mft_utils/hsmclient/inc/rsa/pkcs11t.h
+++ b/mft_utils/hsmclient/inc/rsa/pkcs11t.h
@@ -51,164 +51,163 @@
 #endif
 
 /* an unsigned 8-bit value */
-typedef unsigned char     CK_BYTE;
+typedef unsigned char CK_BYTE;
 
 /* an unsigned 8-bit character */
-typedef CK_BYTE           CK_CHAR;
+typedef CK_BYTE CK_CHAR;
 
 /* an 8-bit UTF-8 character */
-typedef CK_BYTE           CK_UTF8CHAR;
+typedef CK_BYTE CK_UTF8CHAR;
 
 /* a BYTE-sized Boolean flag */
-typedef CK_BYTE           CK_BBOOL;
+typedef CK_BYTE CK_BBOOL;
 
 /* an unsigned value, at least 32 bits long */
 typedef unsigned long int CK_ULONG;
 
 /* a signed value, the same size as a CK_ULONG */
 /* CK_LONG is new for v2.0 */
-typedef long int          CK_LONG;
+typedef long int CK_LONG;
 
 /* at least 32 bits; each bit is a Boolean flag */
-typedef CK_ULONG          CK_FLAGS;
-
+typedef CK_ULONG CK_FLAGS;
 
 /* some special values for certain CK_ULONG variables */
 #define CK_UNAVAILABLE_INFORMATION (~0UL)
-#define CK_EFFECTIVELY_INFINITE    0
-
+#define CK_EFFECTIVELY_INFINITE 0
 
-typedef CK_BYTE     CK_PTR   CK_BYTE_PTR;
-typedef CK_CHAR     CK_PTR   CK_CHAR_PTR;
-typedef CK_UTF8CHAR CK_PTR   CK_UTF8CHAR_PTR;
-typedef CK_ULONG    CK_PTR   CK_ULONG_PTR;
-typedef void        CK_PTR   CK_VOID_PTR;
+typedef CK_BYTE CK_PTR CK_BYTE_PTR;
+typedef CK_CHAR CK_PTR CK_CHAR_PTR;
+typedef CK_UTF8CHAR CK_PTR CK_UTF8CHAR_PTR;
+typedef CK_ULONG CK_PTR CK_ULONG_PTR;
+typedef void CK_PTR CK_VOID_PTR;
 
 /* Pointer to a CK_VOID_PTR-- i.e., pointer to pointer to void */
 typedef CK_VOID_PTR CK_PTR CK_VOID_PTR_PTR;
 
-
 /* The following value is always invalid if used as a session */
 /* handle or object handle */
 #define CK_INVALID_HANDLE 0
 
-
-typedef struct CK_VERSION {
-  CK_BYTE       major;  /* integer portion of version number */
-  CK_BYTE       minor;  /* 1/100ths portion of version number */
+typedef struct CK_VERSION
+{
+    CK_BYTE major; /* integer portion of version number */
+    CK_BYTE minor; /* 1/100ths portion of version number */
 } CK_VERSION;
 
 typedef CK_VERSION CK_PTR CK_VERSION_PTR;
 
-
-typedef struct CK_INFO {
-  /* manufacturerID and libraryDecription have been changed from
-   * CK_CHAR to CK_UTF8CHAR for v2.10 */
-  CK_VERSION    cryptokiVersion;     /* Cryptoki interface ver */
-  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
-  CK_FLAGS      flags;               /* must be zero */
-
-  /* libraryDescription and libraryVersion are new for v2.0 */
-  CK_UTF8CHAR   libraryDescription[32];  /* blank padded */
-  CK_VERSION    libraryVersion;          /* version of library */
+typedef struct CK_INFO
+{
+    /* manufacturerID and libraryDecription have been changed from
+     * CK_CHAR to CK_UTF8CHAR for v2.10 */
+    CK_VERSION cryptokiVersion;     /* Cryptoki interface ver */
+    CK_UTF8CHAR manufacturerID[32]; /* blank padded */
+    CK_FLAGS flags;                 /* must be zero */
+
+    /* libraryDescription and libraryVersion are new for v2.0 */
+    CK_UTF8CHAR libraryDescription[32]; /* blank padded */
+    CK_VERSION libraryVersion;          /* version of library */
 } CK_INFO;
 
-typedef CK_INFO CK_PTR    CK_INFO_PTR;
-
+typedef CK_INFO CK_PTR CK_INFO_PTR;
 
 /* CK_NOTIFICATION enumerates the types of notifications that
  * Cryptoki provides to an application */
 /* CK_NOTIFICATION has been changed from an enum to a CK_ULONG
  * for v2.0 */
 typedef CK_ULONG CK_NOTIFICATION;
-#define CKN_SURRENDER       0
+#define CKN_SURRENDER 0
 
 /* The following notification is new for PKCS #11 v2.20 amendment 3 */
-#define CKN_OTP_CHANGED     1
+#define CKN_OTP_CHANGED 1
 
-
-typedef CK_ULONG          CK_SLOT_ID;
+typedef CK_ULONG CK_SLOT_ID;
 
 typedef CK_SLOT_ID CK_PTR CK_SLOT_ID_PTR;
 
-
 /* CK_SLOT_INFO provides information about a slot */
-typedef struct CK_SLOT_INFO {
-  /* slotDescription and manufacturerID have been changed from
-   * CK_CHAR to CK_UTF8CHAR for v2.10 */
-  CK_UTF8CHAR   slotDescription[64];  /* blank padded */
-  CK_UTF8CHAR   manufacturerID[32];   /* blank padded */
-  CK_FLAGS      flags;
-
-  /* hardwareVersion and firmwareVersion are new for v2.0 */
-  CK_VERSION    hardwareVersion;  /* version of hardware */
-  CK_VERSION    firmwareVersion;  /* version of firmware */
+typedef struct CK_SLOT_INFO
+{
+    /* slotDescription and manufacturerID have been changed from
+     * CK_CHAR to CK_UTF8CHAR for v2.10 */
+    CK_UTF8CHAR slotDescription[64]; /* blank padded */
+    CK_UTF8CHAR manufacturerID[32];  /* blank padded */
+    CK_FLAGS flags;
+
+    /* hardwareVersion and firmwareVersion are new for v2.0 */
+    CK_VERSION hardwareVersion; /* version of hardware */
+    CK_VERSION firmwareVersion; /* version of firmware */
 } CK_SLOT_INFO;
 
 /* flags: bit flags that provide capabilities of the slot
  *      Bit Flag              Mask        Meaning
  */
-#define CKF_TOKEN_PRESENT     0x00000001  /* a token is there */
-#define CKF_REMOVABLE_DEVICE  0x00000002  /* removable devices*/
-#define CKF_HW_SLOT           0x00000004  /* hardware slot */
+#define CKF_TOKEN_PRESENT 0x00000001    /* a token is there */
+#define CKF_REMOVABLE_DEVICE 0x00000002 /* removable devices*/
+#define CKF_HW_SLOT 0x00000004          /* hardware slot */
 
 typedef CK_SLOT_INFO CK_PTR CK_SLOT_INFO_PTR;
 
-
 /* CK_TOKEN_INFO provides information about a token */
-typedef struct CK_TOKEN_INFO {
-  /* label, manufacturerID, and model have been changed from
-   * CK_CHAR to CK_UTF8CHAR for v2.10 */
-  CK_UTF8CHAR   label[32];           /* blank padded */
-  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
-  CK_UTF8CHAR   model[16];           /* blank padded */
-  CK_CHAR       serialNumber[16];    /* blank padded */
-  CK_FLAGS      flags;               /* see below */
-
-  /* ulMaxSessionCount, ulSessionCount, ulMaxRwSessionCount,
-   * ulRwSessionCount, ulMaxPinLen, and ulMinPinLen have all been
-   * changed from CK_USHORT to CK_ULONG for v2.0 */
-  CK_ULONG      ulMaxSessionCount;     /* max open sessions */
-  CK_ULONG      ulSessionCount;        /* sess. now open */
-  CK_ULONG      ulMaxRwSessionCount;   /* max R/W sessions */
-  CK_ULONG      ulRwSessionCount;      /* R/W sess. now open */
-  CK_ULONG      ulMaxPinLen;           /* in bytes */
-  CK_ULONG      ulMinPinLen;           /* in bytes */
-  CK_ULONG      ulTotalPublicMemory;   /* in bytes */
-  CK_ULONG      ulFreePublicMemory;    /* in bytes */
-  CK_ULONG      ulTotalPrivateMemory;  /* in bytes */
-  CK_ULONG      ulFreePrivateMemory;   /* in bytes */
-
-  /* hardwareVersion, firmwareVersion, and time are new for
-   * v2.0 */
-  CK_VERSION    hardwareVersion;       /* version of hardware */
-  CK_VERSION    firmwareVersion;       /* version of firmware */
-  CK_CHAR       utcTime[16];           /* time */
+typedef struct CK_TOKEN_INFO
+{
+    /* label, manufacturerID, and model have been changed from
+     * CK_CHAR to CK_UTF8CHAR for v2.10 */
+    CK_UTF8CHAR label[32];          /* blank padded */
+    CK_UTF8CHAR manufacturerID[32]; /* blank padded */
+    CK_UTF8CHAR model[16];          /* blank padded */
+    CK_CHAR serialNumber[16];       /* blank padded */
+    CK_FLAGS flags;                 /* see below */
+
+    /* ulMaxSessionCount, ulSessionCount, ulMaxRwSessionCount,
+     * ulRwSessionCount, ulMaxPinLen, and ulMinPinLen have all been
+     * changed from CK_USHORT to CK_ULONG for v2.0 */
+    CK_ULONG ulMaxSessionCount;    /* max open sessions */
+    CK_ULONG ulSessionCount;       /* sess. now open */
+    CK_ULONG ulMaxRwSessionCount;  /* max R/W sessions */
+    CK_ULONG ulRwSessionCount;     /* R/W sess. now open */
+    CK_ULONG ulMaxPinLen;          /* in bytes */
+    CK_ULONG ulMinPinLen;          /* in bytes */
+    CK_ULONG ulTotalPublicMemory;  /* in bytes */
+    CK_ULONG ulFreePublicMemory;   /* in bytes */
+    CK_ULONG ulTotalPrivateMemory; /* in bytes */
+    CK_ULONG ulFreePrivateMemory;  /* in bytes */
+
+    /* hardwareVersion, firmwareVersion, and time are new for
+     * v2.0 */
+    CK_VERSION hardwareVersion; /* version of hardware */
+    CK_VERSION firmwareVersion; /* version of firmware */
+    CK_CHAR utcTime[16];        /* time */
 } CK_TOKEN_INFO;
 
 /* The flags parameter is defined as follows:
  *      Bit Flag                    Mask        Meaning
  */
-#define CKF_RNG                     0x00000001  /* has random #
-                                                 * generator */
-#define CKF_WRITE_PROTECTED         0x00000002  /* token is
-                                                 * write-
-                                                 * protected */
-#define CKF_LOGIN_REQUIRED          0x00000004  /* user must
-                                                 * login */
-#define CKF_USER_PIN_INITIALIZED    0x00000008  /* normal user's
-                                                 * PIN is set */
+#define CKF_RNG                \
+    0x00000001 /* has random # \
+                * generator */
+#define CKF_WRITE_PROTECTED \
+    0x00000002 /* token is  \
+                * write-    \
+                * protected */
+#define CKF_LOGIN_REQUIRED  \
+    0x00000004 /* user must \
+                * login */
+#define CKF_USER_PIN_INITIALIZED \
+    0x00000008 /* normal user's  \
+                * PIN is set */
 
 /* CKF_RESTORE_KEY_NOT_NEEDED is new for v2.0.  If it is set,
  * that means that *every* time the state of cryptographic
  * operations of a session is successfully saved, all keys
  * needed to continue those operations are stored in the state */
-#define CKF_RESTORE_KEY_NOT_NEEDED  0x00000020
+#define CKF_RESTORE_KEY_NOT_NEEDED 0x00000020
 
 /* CKF_CLOCK_ON_TOKEN is new for v2.0.  If it is set, that means
  * that the token has some sort of clock.  The time on that
  * clock is returned in the token info structure */
-#define CKF_CLOCK_ON_TOKEN          0x00000040
+#define CKF_CLOCK_ON_TOKEN 0x00000040
 
 /* CKF_PROTECTED_AUTHENTICATION_PATH is new for v2.0.  If it is
  * set, that means that there is some way for the user to login
@@ -220,1014 +219,1001 @@ typedef struct CK_TOKEN_INFO {
  * dual simultaneous cryptographic operations (digest and
  * encrypt; decrypt and digest; sign and encrypt; and decrypt
  * and sign) */
-#define CKF_DUAL_CRYPTO_OPERATIONS  0x00000200
+#define CKF_DUAL_CRYPTO_OPERATIONS 0x00000200
 
 /* CKF_TOKEN_INITIALIZED if new for v2.10. If it is true, the
  * token has been initialized using C_InitializeToken or an
  * equivalent mechanism outside the scope of PKCS #11.
  * Calling C_InitializeToken when this flag is set will cause
  * the token to be reinitialized. */
-#define CKF_TOKEN_INITIALIZED       0x00000400
+#define CKF_TOKEN_INITIALIZED 0x00000400
 
 /* CKF_SECONDARY_AUTHENTICATION if new for v2.10. If it is
  * true, the token supports secondary authentication for
  * private key objects. This flag is deprecated in v2.11 and
    onwards. */
-#define CKF_SECONDARY_AUTHENTICATION  0x00000800
+#define CKF_SECONDARY_AUTHENTICATION 0x00000800
 
 /* CKF_USER_PIN_COUNT_LOW if new for v2.10. If it is true, an
  * incorrect user login PIN has been entered at least once
  * since the last successful authentication. */
-#define CKF_USER_PIN_COUNT_LOW       0x00010000
+#define CKF_USER_PIN_COUNT_LOW 0x00010000
 
 /* CKF_USER_PIN_FINAL_TRY if new for v2.10. If it is true,
  * supplying an incorrect user PIN will it to become locked. */
-#define CKF_USER_PIN_FINAL_TRY       0x00020000
+#define CKF_USER_PIN_FINAL_TRY 0x00020000
 
 /* CKF_USER_PIN_LOCKED if new for v2.10. If it is true, the
  * user PIN has been locked. User login to the token is not
  * possible. */
-#define CKF_USER_PIN_LOCKED          0x00040000
+#define CKF_USER_PIN_LOCKED 0x00040000
 
 /* CKF_USER_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
  * the user PIN value is the default value set by token
  * initialization or manufacturing, or the PIN has been
  * expired by the card. */
-#define CKF_USER_PIN_TO_BE_CHANGED   0x00080000
+#define CKF_USER_PIN_TO_BE_CHANGED 0x00080000
 
 /* CKF_SO_PIN_COUNT_LOW if new for v2.10. If it is true, an
  * incorrect SO login PIN has been entered at least once since
  * the last successful authentication. */
-#define CKF_SO_PIN_COUNT_LOW         0x00100000
+#define CKF_SO_PIN_COUNT_LOW 0x00100000
 
 /* CKF_SO_PIN_FINAL_TRY if new for v2.10. If it is true,
  * supplying an incorrect SO PIN will it to become locked. */
-#define CKF_SO_PIN_FINAL_TRY         0x00200000
+#define CKF_SO_PIN_FINAL_TRY 0x00200000
 
 /* CKF_SO_PIN_LOCKED if new for v2.10. If it is true, the SO
  * PIN has been locked. SO login to the token is not possible.
  */
-#define CKF_SO_PIN_LOCKED            0x00400000
+#define CKF_SO_PIN_LOCKED 0x00400000
 
 /* CKF_SO_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
  * the SO PIN value is the default value set by token
  * initialization or manufacturing, or the PIN has been
  * expired by the card. */
-#define CKF_SO_PIN_TO_BE_CHANGED     0x00800000
+#define CKF_SO_PIN_TO_BE_CHANGED 0x00800000
 
 typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR;
 
-
 /* CK_SESSION_HANDLE is a Cryptoki-assigned value that
  * identifies a session */
-typedef CK_ULONG          CK_SESSION_HANDLE;
+typedef CK_ULONG CK_SESSION_HANDLE;
 
 typedef CK_SESSION_HANDLE CK_PTR CK_SESSION_HANDLE_PTR;
 
-
 /* CK_USER_TYPE enumerates the types of Cryptoki users */
 /* CK_USER_TYPE has been changed from an enum to a CK_ULONG for
  * v2.0 */
-typedef CK_ULONG          CK_USER_TYPE;
+typedef CK_ULONG CK_USER_TYPE;
 /* Security Officer */
-#define CKU_SO    0
+#define CKU_SO 0
 /* Normal user */
-#define CKU_USER  1
+#define CKU_USER 1
 /* Context specific (added in v2.20) */
-#define CKU_CONTEXT_SPECIFIC   2
+#define CKU_CONTEXT_SPECIFIC 2
 
 /* CK_STATE enumerates the session states */
 /* CK_STATE has been changed from an enum to a CK_ULONG for
  * v2.0 */
-typedef CK_ULONG          CK_STATE;
-#define CKS_RO_PUBLIC_SESSION  0
-#define CKS_RO_USER_FUNCTIONS  1
-#define CKS_RW_PUBLIC_SESSION  2
-#define CKS_RW_USER_FUNCTIONS  3
-#define CKS_RW_SO_FUNCTIONS    4
-
+typedef CK_ULONG CK_STATE;
+#define CKS_RO_PUBLIC_SESSION 0
+#define CKS_RO_USER_FUNCTIONS 1
+#define CKS_RW_PUBLIC_SESSION 2
+#define CKS_RW_USER_FUNCTIONS 3
+#define CKS_RW_SO_FUNCTIONS 4
 
 /* CK_SESSION_INFO provides information about a session */
-typedef struct CK_SESSION_INFO {
-  CK_SLOT_ID    slotID;
-  CK_STATE      state;
-  CK_FLAGS      flags;          /* see below */
-
-  /* ulDeviceError was changed from CK_USHORT to CK_ULONG for
-   * v2.0 */
-  CK_ULONG      ulDeviceError;  /* device-dependent error code */
+typedef struct CK_SESSION_INFO
+{
+    CK_SLOT_ID slotID;
+    CK_STATE state;
+    CK_FLAGS flags; /* see below */
+
+    /* ulDeviceError was changed from CK_USHORT to CK_ULONG for
+     * v2.0 */
+    CK_ULONG ulDeviceError; /* device-dependent error code */
 } CK_SESSION_INFO;
 
 /* The flags are defined in the following table:
  *      Bit Flag                Mask        Meaning
  */
-#define CKF_RW_SESSION          0x00000002  /* session is r/w */
-#define CKF_SERIAL_SESSION      0x00000004  /* no parallel */
+#define CKF_RW_SESSION 0x00000002     /* session is r/w */
+#define CKF_SERIAL_SESSION 0x00000004 /* no parallel */
 
 typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR;
 
-
 /* CK_OBJECT_HANDLE is a token-specific identifier for an
  * object  */
-typedef CK_ULONG          CK_OBJECT_HANDLE;
+typedef CK_ULONG CK_OBJECT_HANDLE;
 
 typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR;
 
-
 /* CK_OBJECT_CLASS is a value that identifies the classes (or
  * types) of objects that Cryptoki recognizes.  It is defined
  * as follows: */
 /* CK_OBJECT_CLASS was changed from CK_USHORT to CK_ULONG for
  * v2.0 */
-typedef CK_ULONG          CK_OBJECT_CLASS;
+typedef CK_ULONG CK_OBJECT_CLASS;
 
 /* The following classes of objects are defined: */
 /* CKO_HW_FEATURE is new for v2.10 */
 /* CKO_DOMAIN_PARAMETERS is new for v2.11 */
 /* CKO_MECHANISM is new for v2.20 */
-#define CKO_DATA              0x00000000
-#define CKO_CERTIFICATE       0x00000001
-#define CKO_PUBLIC_KEY        0x00000002
-#define CKO_PRIVATE_KEY       0x00000003
-#define CKO_SECRET_KEY        0x00000004
-#define CKO_HW_FEATURE        0x00000005
+#define CKO_DATA 0x00000000
+#define CKO_CERTIFICATE 0x00000001
+#define CKO_PUBLIC_KEY 0x00000002
+#define CKO_PRIVATE_KEY 0x00000003
+#define CKO_SECRET_KEY 0x00000004
+#define CKO_HW_FEATURE 0x00000005
 #define CKO_DOMAIN_PARAMETERS 0x00000006
-#define CKO_MECHANISM         0x00000007
+#define CKO_MECHANISM 0x00000007
 
 /* CKO_OTP_KEY is new for PKCS #11 v2.20 amendment 1 */
-#define CKO_OTP_KEY           0x00000008
+#define CKO_OTP_KEY 0x00000008
 
-#define CKO_VENDOR_DEFINED    0x80000000
+#define CKO_VENDOR_DEFINED 0x80000000
 
 typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
 
 /* CK_HW_FEATURE_TYPE is new for v2.10. CK_HW_FEATURE_TYPE is a
  * value that identifies the hardware feature type of an object
  * with CK_OBJECT_CLASS equal to CKO_HW_FEATURE. */
-typedef CK_ULONG          CK_HW_FEATURE_TYPE;
+typedef CK_ULONG CK_HW_FEATURE_TYPE;
 
 /* The following hardware feature types are defined */
 /* CKH_USER_INTERFACE is new for v2.20 */
-#define CKH_MONOTONIC_COUNTER  0x00000001
-#define CKH_CLOCK           0x00000002
-#define CKH_USER_INTERFACE  0x00000003
-#define CKH_VENDOR_DEFINED  0x80000000
+#define CKH_MONOTONIC_COUNTER 0x00000001
+#define CKH_CLOCK 0x00000002
+#define CKH_USER_INTERFACE 0x00000003
+#define CKH_VENDOR_DEFINED 0x80000000
 
 /* CK_KEY_TYPE is a value that identifies a key type */
 /* CK_KEY_TYPE was changed from CK_USHORT to CK_ULONG for v2.0 */
-typedef CK_ULONG          CK_KEY_TYPE;
+typedef CK_ULONG CK_KEY_TYPE;
 
 /* the following key types are defined: */
-#define CKK_RSA             0x00000000
-#define CKK_DSA             0x00000001
-#define CKK_DH              0x00000002
+#define CKK_RSA 0x00000000
+#define CKK_DSA 0x00000001
+#define CKK_DH 0x00000002
 
 /* CKK_ECDSA and CKK_KEA are new for v2.0 */
 /* CKK_ECDSA is deprecated in v2.11, CKK_EC is preferred. */
-#define CKK_ECDSA           0x00000003
-#define CKK_EC              0x00000003
-#define CKK_X9_42_DH        0x00000004
-#define CKK_KEA             0x00000005
-
-#define CKK_GENERIC_SECRET  0x00000010
-#define CKK_RC2             0x00000011
-#define CKK_RC4             0x00000012
-#define CKK_DES             0x00000013
-#define CKK_DES2            0x00000014
-#define CKK_DES3            0x00000015
+#define CKK_ECDSA 0x00000003
+#define CKK_EC 0x00000003
+#define CKK_X9_42_DH 0x00000004
+#define CKK_KEA 0x00000005
+
+#define CKK_GENERIC_SECRET 0x00000010
+#define CKK_RC2 0x00000011
+#define CKK_RC4 0x00000012
+#define CKK_DES 0x00000013
+#define CKK_DES2 0x00000014
+#define CKK_DES3 0x00000015
 
 /* all these key types are new for v2.0 */
-#define CKK_CAST            0x00000016
-#define CKK_CAST3           0x00000017
+#define CKK_CAST 0x00000016
+#define CKK_CAST3 0x00000017
 /* CKK_CAST5 is deprecated in v2.11, CKK_CAST128 is preferred. */
-#define CKK_CAST5           0x00000018
-#define CKK_CAST128         0x00000018
-#define CKK_RC5             0x00000019
-#define CKK_IDEA            0x0000001A
-#define CKK_SKIPJACK        0x0000001B
-#define CKK_BATON           0x0000001C
-#define CKK_JUNIPER         0x0000001D
-#define CKK_CDMF            0x0000001E
-#define CKK_AES             0x0000001F
+#define CKK_CAST5 0x00000018
+#define CKK_CAST128 0x00000018
+#define CKK_RC5 0x00000019
+#define CKK_IDEA 0x0000001A
+#define CKK_SKIPJACK 0x0000001B
+#define CKK_BATON 0x0000001C
+#define CKK_JUNIPER 0x0000001D
+#define CKK_CDMF 0x0000001E
+#define CKK_AES 0x0000001F
 
 /* BlowFish and TwoFish are new for v2.20 */
-#define CKK_BLOWFISH        0x00000020
-#define CKK_TWOFISH         0x00000021
+#define CKK_BLOWFISH 0x00000020
+#define CKK_TWOFISH 0x00000021
 
 /* SecurID, HOTP, and ACTI are new for PKCS #11 v2.20 amendment 1 */
-#define CKK_SECURID         0x00000022
-#define CKK_HOTP            0x00000023
-#define CKK_ACTI            0x00000024
+#define CKK_SECURID 0x00000022
+#define CKK_HOTP 0x00000023
+#define CKK_ACTI 0x00000024
 
 /* Camellia is new for PKCS #11 v2.20 amendment 3 */
-#define CKK_CAMELLIA                   0x00000025
+#define CKK_CAMELLIA 0x00000025
 /* ARIA is new for PKCS #11 v2.20 amendment 3 */
-#define CKK_ARIA                       0x00000026
-
-
-#define CKK_VENDOR_DEFINED  0x80000000
+#define CKK_ARIA 0x00000026
 
+#define CKK_VENDOR_DEFINED 0x80000000
 
 /* CK_CERTIFICATE_TYPE is a value that identifies a certificate
  * type */
 /* CK_CERTIFICATE_TYPE was changed from CK_USHORT to CK_ULONG
  * for v2.0 */
-typedef CK_ULONG          CK_CERTIFICATE_TYPE;
+typedef CK_ULONG CK_CERTIFICATE_TYPE;
 
 /* The following certificate types are defined: */
 /* CKC_X_509_ATTR_CERT is new for v2.10 */
 /* CKC_WTLS is new for v2.20 */
-#define CKC_X_509           0x00000000
+#define CKC_X_509 0x00000000
 #define CKC_X_509_ATTR_CERT 0x00000001
-#define CKC_WTLS            0x00000002
-#define CKC_VENDOR_DEFINED  0x80000000
-
+#define CKC_WTLS 0x00000002
+#define CKC_VENDOR_DEFINED 0x80000000
 
 /* CK_ATTRIBUTE_TYPE is a value that identifies an attribute
  * type */
 /* CK_ATTRIBUTE_TYPE was changed from CK_USHORT to CK_ULONG for
  * v2.0 */
-typedef CK_ULONG          CK_ATTRIBUTE_TYPE;
+typedef CK_ULONG CK_ATTRIBUTE_TYPE;
 
 /* The CKF_ARRAY_ATTRIBUTE flag identifies an attribute which
    consists of an array of values. */
-#define CKF_ARRAY_ATTRIBUTE    0x40000000
+#define CKF_ARRAY_ATTRIBUTE 0x40000000
 
 /* The following OTP-related defines are new for PKCS #11 v2.20 amendment 1
    and relates to the CKA_OTP_FORMAT attribute */
-#define CK_OTP_FORMAT_DECIMAL      0
-#define CK_OTP_FORMAT_HEXADECIMAL  1
+#define CK_OTP_FORMAT_DECIMAL 0
+#define CK_OTP_FORMAT_HEXADECIMAL 1
 #define CK_OTP_FORMAT_ALPHANUMERIC 2
-#define CK_OTP_FORMAT_BINARY       3
+#define CK_OTP_FORMAT_BINARY 3
 
 /* The following OTP-related defines are new for PKCS #11 v2.20 amendment 1
    and relates to the CKA_OTP_..._REQUIREMENT attributes */
-#define CK_OTP_PARAM_IGNORED       0
-#define CK_OTP_PARAM_OPTIONAL      1
-#define CK_OTP_PARAM_MANDATORY     2
+#define CK_OTP_PARAM_IGNORED 0
+#define CK_OTP_PARAM_OPTIONAL 1
+#define CK_OTP_PARAM_MANDATORY 2
 
 /* The following attribute types are defined: */
-#define CKA_CLASS              0x00000000
-#define CKA_TOKEN              0x00000001
-#define CKA_PRIVATE            0x00000002
-#define CKA_LABEL              0x00000003
-#define CKA_APPLICATION        0x00000010
-#define CKA_VALUE              0x00000011
+#define CKA_CLASS 0x00000000
+#define CKA_TOKEN 0x00000001
+#define CKA_PRIVATE 0x00000002
+#define CKA_LABEL 0x00000003
+#define CKA_APPLICATION 0x00000010
+#define CKA_VALUE 0x00000011
 
 /* CKA_OBJECT_ID is new for v2.10 */
-#define CKA_OBJECT_ID          0x00000012
+#define CKA_OBJECT_ID 0x00000012
 
-#define CKA_CERTIFICATE_TYPE   0x00000080
-#define CKA_ISSUER             0x00000081
-#define CKA_SERIAL_NUMBER      0x00000082
+#define CKA_CERTIFICATE_TYPE 0x00000080
+#define CKA_ISSUER 0x00000081
+#define CKA_SERIAL_NUMBER 0x00000082
 
 /* CKA_AC_ISSUER, CKA_OWNER, and CKA_ATTR_TYPES are new
  * for v2.10 */
-#define CKA_AC_ISSUER          0x00000083
-#define CKA_OWNER              0x00000084
-#define CKA_ATTR_TYPES         0x00000085
+#define CKA_AC_ISSUER 0x00000083
+#define CKA_OWNER 0x00000084
+#define CKA_ATTR_TYPES 0x00000085
 
 /* CKA_TRUSTED is new for v2.11 */
-#define CKA_TRUSTED            0x00000086
+#define CKA_TRUSTED 0x00000086
 
 /* CKA_CERTIFICATE_CATEGORY ...
  * CKA_CHECK_VALUE are new for v2.20 */
-#define CKA_CERTIFICATE_CATEGORY        0x00000087
-#define CKA_JAVA_MIDP_SECURITY_DOMAIN   0x00000088
-#define CKA_URL                         0x00000089
-#define CKA_HASH_OF_SUBJECT_PUBLIC_KEY  0x0000008A
-#define CKA_HASH_OF_ISSUER_PUBLIC_KEY   0x0000008B
-#define CKA_CHECK_VALUE                 0x00000090
-
-#define CKA_KEY_TYPE           0x00000100
-#define CKA_SUBJECT            0x00000101
-#define CKA_ID                 0x00000102
-#define CKA_SENSITIVE          0x00000103
-#define CKA_ENCRYPT            0x00000104
-#define CKA_DECRYPT            0x00000105
-#define CKA_WRAP               0x00000106
-#define CKA_UNWRAP             0x00000107
-#define CKA_SIGN               0x00000108
-#define CKA_SIGN_RECOVER       0x00000109
-#define CKA_VERIFY             0x0000010A
-#define CKA_VERIFY_RECOVER     0x0000010B
-#define CKA_DERIVE             0x0000010C
-#define CKA_START_DATE         0x00000110
-#define CKA_END_DATE           0x00000111
-#define CKA_MODULUS            0x00000120
-#define CKA_MODULUS_BITS       0x00000121
-#define CKA_PUBLIC_EXPONENT    0x00000122
-#define CKA_PRIVATE_EXPONENT   0x00000123
-#define CKA_PRIME_1            0x00000124
-#define CKA_PRIME_2            0x00000125
-#define CKA_EXPONENT_1         0x00000126
-#define CKA_EXPONENT_2         0x00000127
-#define CKA_COEFFICIENT        0x00000128
-#define CKA_PRIME              0x00000130
-#define CKA_SUBPRIME           0x00000131
-#define CKA_BASE               0x00000132
+#define CKA_CERTIFICATE_CATEGORY 0x00000087
+#define CKA_JAVA_MIDP_SECURITY_DOMAIN 0x00000088
+#define CKA_URL 0x00000089
+#define CKA_HASH_OF_SUBJECT_PUBLIC_KEY 0x0000008A
+#define CKA_HASH_OF_ISSUER_PUBLIC_KEY 0x0000008B
+#define CKA_CHECK_VALUE 0x00000090
+
+#define CKA_KEY_TYPE 0x00000100
+#define CKA_SUBJECT 0x00000101
+#define CKA_ID 0x00000102
+#define CKA_SENSITIVE 0x00000103
+#define CKA_ENCRYPT 0x00000104
+#define CKA_DECRYPT 0x00000105
+#define CKA_WRAP 0x00000106
+#define CKA_UNWRAP 0x00000107
+#define CKA_SIGN 0x00000108
+#define CKA_SIGN_RECOVER 0x00000109
+#define CKA_VERIFY 0x0000010A
+#define CKA_VERIFY_RECOVER 0x0000010B
+#define CKA_DERIVE 0x0000010C
+#define CKA_START_DATE 0x00000110
+#define CKA_END_DATE 0x00000111
+#define CKA_MODULUS 0x00000120
+#define CKA_MODULUS_BITS 0x00000121
+#define CKA_PUBLIC_EXPONENT 0x00000122
+#define CKA_PRIVATE_EXPONENT 0x00000123
+#define CKA_PRIME_1 0x00000124
+#define CKA_PRIME_2 0x00000125
+#define CKA_EXPONENT_1 0x00000126
+#define CKA_EXPONENT_2 0x00000127
+#define CKA_COEFFICIENT 0x00000128
+#define CKA_PRIME 0x00000130
+#define CKA_SUBPRIME 0x00000131
+#define CKA_BASE 0x00000132
 
 /* CKA_PRIME_BITS and CKA_SUB_PRIME_BITS are new for v2.11 */
-#define CKA_PRIME_BITS         0x00000133
-#define CKA_SUBPRIME_BITS      0x00000134
-#define CKA_SUB_PRIME_BITS     CKA_SUBPRIME_BITS
+#define CKA_PRIME_BITS 0x00000133
+#define CKA_SUBPRIME_BITS 0x00000134
+#define CKA_SUB_PRIME_BITS CKA_SUBPRIME_BITS
 /* (To retain backwards-compatibility) */
 
-#define CKA_VALUE_BITS         0x00000160
-#define CKA_VALUE_LEN          0x00000161
+#define CKA_VALUE_BITS 0x00000160
+#define CKA_VALUE_LEN 0x00000161
 
 /* CKA_EXTRACTABLE, CKA_LOCAL, CKA_NEVER_EXTRACTABLE,
  * CKA_ALWAYS_SENSITIVE, CKA_MODIFIABLE, CKA_ECDSA_PARAMS,
  * and CKA_EC_POINT are new for v2.0 */
-#define CKA_EXTRACTABLE        0x00000162
-#define CKA_LOCAL              0x00000163
-#define CKA_NEVER_EXTRACTABLE  0x00000164
-#define CKA_ALWAYS_SENSITIVE   0x00000165
+#define CKA_EXTRACTABLE 0x00000162
+#define CKA_LOCAL 0x00000163
+#define CKA_NEVER_EXTRACTABLE 0x00000164
+#define CKA_ALWAYS_SENSITIVE 0x00000165
 
 /* CKA_KEY_GEN_MECHANISM is new for v2.11 */
-#define CKA_KEY_GEN_MECHANISM  0x00000166
+#define CKA_KEY_GEN_MECHANISM 0x00000166
 
-#define CKA_MODIFIABLE         0x00000170
+#define CKA_MODIFIABLE 0x00000170
 
 /* CKA_ECDSA_PARAMS is deprecated in v2.11,
  * CKA_EC_PARAMS is preferred. */
-#define CKA_ECDSA_PARAMS       0x00000180
-#define CKA_EC_PARAMS          0x00000180
+#define CKA_ECDSA_PARAMS 0x00000180
+#define CKA_EC_PARAMS 0x00000180
 
-#define CKA_EC_POINT           0x00000181
+#define CKA_EC_POINT 0x00000181
 
 /* CKA_SECONDARY_AUTH, CKA_AUTH_PIN_FLAGS,
  * are new for v2.10. Deprecated in v2.11 and onwards. */
-#define CKA_SECONDARY_AUTH     0x00000200
-#define CKA_AUTH_PIN_FLAGS     0x00000201
+#define CKA_SECONDARY_AUTH 0x00000200
+#define CKA_AUTH_PIN_FLAGS 0x00000201
 
 /* CKA_ALWAYS_AUTHENTICATE ...
  * CKA_UNWRAP_TEMPLATE are new for v2.20 */
-#define CKA_ALWAYS_AUTHENTICATE  0x00000202
+#define CKA_ALWAYS_AUTHENTICATE 0x00000202
 
-#define CKA_WRAP_WITH_TRUSTED    0x00000210
-#define CKA_WRAP_TEMPLATE        (CKF_ARRAY_ATTRIBUTE|0x00000211)
-#define CKA_UNWRAP_TEMPLATE      (CKF_ARRAY_ATTRIBUTE|0x00000212)
-#define CKA_DERIVE_TEMPLATE      (CKF_ARRAY_ATTRIBUTE|0x00000213)
+#define CKA_WRAP_WITH_TRUSTED 0x00000210
+#define CKA_WRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x00000211)
+#define CKA_UNWRAP_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x00000212)
+#define CKA_DERIVE_TEMPLATE (CKF_ARRAY_ATTRIBUTE | 0x00000213)
 
 /* CKA_OTP... atttributes are new for PKCS #11 v2.20 amendment 3. */
-#define CKA_OTP_FORMAT                0x00000220
-#define CKA_OTP_LENGTH                0x00000221
-#define CKA_OTP_TIME_INTERVAL         0x00000222
-#define CKA_OTP_USER_FRIENDLY_MODE    0x00000223
+#define CKA_OTP_FORMAT 0x00000220
+#define CKA_OTP_LENGTH 0x00000221
+#define CKA_OTP_TIME_INTERVAL 0x00000222
+#define CKA_OTP_USER_FRIENDLY_MODE 0x00000223
 #define CKA_OTP_CHALLENGE_REQUIREMENT 0x00000224
-#define CKA_OTP_TIME_REQUIREMENT      0x00000225
-#define CKA_OTP_COUNTER_REQUIREMENT   0x00000226
-#define CKA_OTP_PIN_REQUIREMENT       0x00000227
-#define CKA_OTP_COUNTER               0x0000022E
-#define CKA_OTP_TIME                  0x0000022F
-#define CKA_OTP_USER_IDENTIFIER       0x0000022A
-#define CKA_OTP_SERVICE_IDENTIFIER    0x0000022B
-#define CKA_OTP_SERVICE_LOGO          0x0000022C
-#define CKA_OTP_SERVICE_LOGO_TYPE     0x0000022D
-
+#define CKA_OTP_TIME_REQUIREMENT 0x00000225
+#define CKA_OTP_COUNTER_REQUIREMENT 0x00000226
+#define CKA_OTP_PIN_REQUIREMENT 0x00000227
+#define CKA_OTP_COUNTER 0x0000022E
+#define CKA_OTP_TIME 0x0000022F
+#define CKA_OTP_USER_IDENTIFIER 0x0000022A
+#define CKA_OTP_SERVICE_IDENTIFIER 0x0000022B
+#define CKA_OTP_SERVICE_LOGO 0x0000022C
+#define CKA_OTP_SERVICE_LOGO_TYPE 0x0000022D
 
 /* CKA_HW_FEATURE_TYPE, CKA_RESET_ON_INIT, and CKA_HAS_RESET
  * are new for v2.10 */
-#define CKA_HW_FEATURE_TYPE    0x00000300
-#define CKA_RESET_ON_INIT      0x00000301
-#define CKA_HAS_RESET          0x00000302
+#define CKA_HW_FEATURE_TYPE 0x00000300
+#define CKA_RESET_ON_INIT 0x00000301
+#define CKA_HAS_RESET 0x00000302
 
 /* The following attributes are new for v2.20 */
-#define CKA_PIXEL_X                     0x00000400
-#define CKA_PIXEL_Y                     0x00000401
-#define CKA_RESOLUTION                  0x00000402
-#define CKA_CHAR_ROWS                   0x00000403
-#define CKA_CHAR_COLUMNS                0x00000404
-#define CKA_COLOR                       0x00000405
-#define CKA_BITS_PER_PIXEL              0x00000406
-#define CKA_CHAR_SETS                   0x00000480
-#define CKA_ENCODING_METHODS            0x00000481
-#define CKA_MIME_TYPES                  0x00000482
-#define CKA_MECHANISM_TYPE              0x00000500
-#define CKA_REQUIRED_CMS_ATTRIBUTES     0x00000501
-#define CKA_DEFAULT_CMS_ATTRIBUTES      0x00000502
-#define CKA_SUPPORTED_CMS_ATTRIBUTES    0x00000503
-#define CKA_ALLOWED_MECHANISMS          (CKF_ARRAY_ATTRIBUTE|0x00000600)
-
-#define CKA_VENDOR_DEFINED     0x80000000
+#define CKA_PIXEL_X 0x00000400
+#define CKA_PIXEL_Y 0x00000401
+#define CKA_RESOLUTION 0x00000402
+#define CKA_CHAR_ROWS 0x00000403
+#define CKA_CHAR_COLUMNS 0x00000404
+#define CKA_COLOR 0x00000405
+#define CKA_BITS_PER_PIXEL 0x00000406
+#define CKA_CHAR_SETS 0x00000480
+#define CKA_ENCODING_METHODS 0x00000481
+#define CKA_MIME_TYPES 0x00000482
+#define CKA_MECHANISM_TYPE 0x00000500
+#define CKA_REQUIRED_CMS_ATTRIBUTES 0x00000501
+#define CKA_DEFAULT_CMS_ATTRIBUTES 0x00000502
+#define CKA_SUPPORTED_CMS_ATTRIBUTES 0x00000503
+#define CKA_ALLOWED_MECHANISMS (CKF_ARRAY_ATTRIBUTE | 0x00000600)
+
+#define CKA_VENDOR_DEFINED 0x80000000
 
 /* CK_ATTRIBUTE is a structure that includes the type, length
  * and value of an attribute */
-typedef struct CK_ATTRIBUTE {
-  CK_ATTRIBUTE_TYPE type;
-  CK_VOID_PTR       pValue;
+typedef struct CK_ATTRIBUTE
+{
+    CK_ATTRIBUTE_TYPE type;
+    CK_VOID_PTR pValue;
 
-  /* ulValueLen went from CK_USHORT to CK_ULONG for v2.0 */
-  CK_ULONG          ulValueLen;  /* in bytes */
+    /* ulValueLen went from CK_USHORT to CK_ULONG for v2.0 */
+    CK_ULONG ulValueLen; /* in bytes */
 } CK_ATTRIBUTE;
 
 typedef CK_ATTRIBUTE CK_PTR CK_ATTRIBUTE_PTR;
 
-
 /* CK_DATE is a structure that defines a date */
-typedef struct CK_DATE{
-  CK_CHAR       year[4];   /* the year ("1900" - "9999") */
-  CK_CHAR       month[2];  /* the month ("01" - "12") */
-  CK_CHAR       day[2];    /* the day   ("01" - "31") */
+typedef struct CK_DATE
+{
+    CK_CHAR year[4];  /* the year ("1900" - "9999") */
+    CK_CHAR month[2]; /* the month ("01" - "12") */
+    CK_CHAR day[2];   /* the day   ("01" - "31") */
 } CK_DATE;
 
-
 /* CK_MECHANISM_TYPE is a value that identifies a mechanism
  * type */
 /* CK_MECHANISM_TYPE was changed from CK_USHORT to CK_ULONG for
  * v2.0 */
-typedef CK_ULONG          CK_MECHANISM_TYPE;
+typedef CK_ULONG CK_MECHANISM_TYPE;
 
 /* the following mechanism types are defined: */
-#define CKM_RSA_PKCS_KEY_PAIR_GEN      0x00000000
-#define CKM_RSA_PKCS                   0x00000001
-#define CKM_RSA_9796                   0x00000002
-#define CKM_RSA_X_509                  0x00000003
+#define CKM_RSA_PKCS_KEY_PAIR_GEN 0x00000000
+#define CKM_RSA_PKCS 0x00000001
+#define CKM_RSA_9796 0x00000002
+#define CKM_RSA_X_509 0x00000003
 
 /* CKM_MD2_RSA_PKCS, CKM_MD5_RSA_PKCS, and CKM_SHA1_RSA_PKCS
  * are new for v2.0.  They are mechanisms which hash and sign */
-#define CKM_MD2_RSA_PKCS               0x00000004
-#define CKM_MD5_RSA_PKCS               0x00000005
-#define CKM_SHA1_RSA_PKCS              0x00000006
+#define CKM_MD2_RSA_PKCS 0x00000004
+#define CKM_MD5_RSA_PKCS 0x00000005
+#define CKM_SHA1_RSA_PKCS 0x00000006
 
 /* CKM_RIPEMD128_RSA_PKCS, CKM_RIPEMD160_RSA_PKCS, and
  * CKM_RSA_PKCS_OAEP are new for v2.10 */
-#define CKM_RIPEMD128_RSA_PKCS         0x00000007
-#define CKM_RIPEMD160_RSA_PKCS         0x00000008
-#define CKM_RSA_PKCS_OAEP              0x00000009
+#define CKM_RIPEMD128_RSA_PKCS 0x00000007
+#define CKM_RIPEMD160_RSA_PKCS 0x00000008
+#define CKM_RSA_PKCS_OAEP 0x00000009
 
 /* CKM_RSA_X9_31_KEY_PAIR_GEN, CKM_RSA_X9_31, CKM_SHA1_RSA_X9_31,
  * CKM_RSA_PKCS_PSS, and CKM_SHA1_RSA_PKCS_PSS are new for v2.11 */
-#define CKM_RSA_X9_31_KEY_PAIR_GEN     0x0000000A
-#define CKM_RSA_X9_31                  0x0000000B
-#define CKM_SHA1_RSA_X9_31             0x0000000C
-#define CKM_RSA_PKCS_PSS               0x0000000D
-#define CKM_SHA1_RSA_PKCS_PSS          0x0000000E
-
-#define CKM_DSA_KEY_PAIR_GEN           0x00000010
-#define CKM_DSA                        0x00000011
-#define CKM_DSA_SHA1                   0x00000012
-#define CKM_DH_PKCS_KEY_PAIR_GEN       0x00000020
-#define CKM_DH_PKCS_DERIVE             0x00000021
+#define CKM_RSA_X9_31_KEY_PAIR_GEN 0x0000000A
+#define CKM_RSA_X9_31 0x0000000B
+#define CKM_SHA1_RSA_X9_31 0x0000000C
+#define CKM_RSA_PKCS_PSS 0x0000000D
+#define CKM_SHA1_RSA_PKCS_PSS 0x0000000E
+
+#define CKM_DSA_KEY_PAIR_GEN 0x00000010
+#define CKM_DSA 0x00000011
+#define CKM_DSA_SHA1 0x00000012
+#define CKM_DH_PKCS_KEY_PAIR_GEN 0x00000020
+#define CKM_DH_PKCS_DERIVE 0x00000021
 
 /* CKM_X9_42_DH_KEY_PAIR_GEN, CKM_X9_42_DH_DERIVE,
  * CKM_X9_42_DH_HYBRID_DERIVE, and CKM_X9_42_MQV_DERIVE are new for
  * v2.11 */
-#define CKM_X9_42_DH_KEY_PAIR_GEN      0x00000030
-#define CKM_X9_42_DH_DERIVE            0x00000031
-#define CKM_X9_42_DH_HYBRID_DERIVE     0x00000032
-#define CKM_X9_42_MQV_DERIVE           0x00000033
+#define CKM_X9_42_DH_KEY_PAIR_GEN 0x00000030
+#define CKM_X9_42_DH_DERIVE 0x00000031
+#define CKM_X9_42_DH_HYBRID_DERIVE 0x00000032
+#define CKM_X9_42_MQV_DERIVE 0x00000033
 
 /* CKM_SHA256/384/512 are new for v2.20 */
-#define CKM_SHA256_RSA_PKCS            0x00000040
-#define CKM_SHA384_RSA_PKCS            0x00000041
-#define CKM_SHA512_RSA_PKCS            0x00000042
-#define CKM_SHA256_RSA_PKCS_PSS        0x00000043
-#define CKM_SHA384_RSA_PKCS_PSS        0x00000044
-#define CKM_SHA512_RSA_PKCS_PSS        0x00000045
+#define CKM_SHA256_RSA_PKCS 0x00000040
+#define CKM_SHA384_RSA_PKCS 0x00000041
+#define CKM_SHA512_RSA_PKCS 0x00000042
+#define CKM_SHA256_RSA_PKCS_PSS 0x00000043
+#define CKM_SHA384_RSA_PKCS_PSS 0x00000044
+#define CKM_SHA512_RSA_PKCS_PSS 0x00000045
 
 /* SHA-224 RSA mechanisms are new for PKCS #11 v2.20 amendment 3 */
-#define CKM_SHA224_RSA_PKCS            0x00000046
-#define CKM_SHA224_RSA_PKCS_PSS        0x00000047
+#define CKM_SHA224_RSA_PKCS 0x00000046
+#define CKM_SHA224_RSA_PKCS_PSS 0x00000047
 
-#define CKM_RC2_KEY_GEN                0x00000100
-#define CKM_RC2_ECB                    0x00000101
-#define CKM_RC2_CBC                    0x00000102
-#define CKM_RC2_MAC                    0x00000103
+#define CKM_RC2_KEY_GEN 0x00000100
+#define CKM_RC2_ECB 0x00000101
+#define CKM_RC2_CBC 0x00000102
+#define CKM_RC2_MAC 0x00000103
 
 /* CKM_RC2_MAC_GENERAL and CKM_RC2_CBC_PAD are new for v2.0 */
-#define CKM_RC2_MAC_GENERAL            0x00000104
-#define CKM_RC2_CBC_PAD                0x00000105
+#define CKM_RC2_MAC_GENERAL 0x00000104
+#define CKM_RC2_CBC_PAD 0x00000105
 
-#define CKM_RC4_KEY_GEN                0x00000110
-#define CKM_RC4                        0x00000111
-#define CKM_DES_KEY_GEN                0x00000120
-#define CKM_DES_ECB                    0x00000121
-#define CKM_DES_CBC                    0x00000122
-#define CKM_DES_MAC                    0x00000123
+#define CKM_RC4_KEY_GEN 0x00000110
+#define CKM_RC4 0x00000111
+#define CKM_DES_KEY_GEN 0x00000120
+#define CKM_DES_ECB 0x00000121
+#define CKM_DES_CBC 0x00000122
+#define CKM_DES_MAC 0x00000123
 
 /* CKM_DES_MAC_GENERAL and CKM_DES_CBC_PAD are new for v2.0 */
-#define CKM_DES_MAC_GENERAL            0x00000124
-#define CKM_DES_CBC_PAD                0x00000125
+#define CKM_DES_MAC_GENERAL 0x00000124
+#define CKM_DES_CBC_PAD 0x00000125
 
-#define CKM_DES2_KEY_GEN               0x00000130
-#define CKM_DES3_KEY_GEN               0x00000131
-#define CKM_DES3_ECB                   0x00000132
-#define CKM_DES3_CBC                   0x00000133
-#define CKM_DES3_MAC                   0x00000134
+#define CKM_DES2_KEY_GEN 0x00000130
+#define CKM_DES3_KEY_GEN 0x00000131
+#define CKM_DES3_ECB 0x00000132
+#define CKM_DES3_CBC 0x00000133
+#define CKM_DES3_MAC 0x00000134
 
 /* CKM_DES3_MAC_GENERAL, CKM_DES3_CBC_PAD, CKM_CDMF_KEY_GEN,
  * CKM_CDMF_ECB, CKM_CDMF_CBC, CKM_CDMF_MAC,
  * CKM_CDMF_MAC_GENERAL, and CKM_CDMF_CBC_PAD are new for v2.0 */
-#define CKM_DES3_MAC_GENERAL           0x00000135
-#define CKM_DES3_CBC_PAD               0x00000136
-#define CKM_DES3_CMAC_GENERAL          0x00000137
-#define CKM_DES3_CMAC                  0x00000138
-#define CKM_CDMF_KEY_GEN               0x00000140
-#define CKM_CDMF_ECB                   0x00000141
-#define CKM_CDMF_CBC                   0x00000142
-#define CKM_CDMF_MAC                   0x00000143
-#define CKM_CDMF_MAC_GENERAL           0x00000144
-#define CKM_CDMF_CBC_PAD               0x00000145
+#define CKM_DES3_MAC_GENERAL 0x00000135
+#define CKM_DES3_CBC_PAD 0x00000136
+#define CKM_DES3_CMAC_GENERAL 0x00000137
+#define CKM_DES3_CMAC 0x00000138
+#define CKM_CDMF_KEY_GEN 0x00000140
+#define CKM_CDMF_ECB 0x00000141
+#define CKM_CDMF_CBC 0x00000142
+#define CKM_CDMF_MAC 0x00000143
+#define CKM_CDMF_MAC_GENERAL 0x00000144
+#define CKM_CDMF_CBC_PAD 0x00000145
 
 /* the following four DES mechanisms are new for v2.20 */
-#define CKM_DES_OFB64                  0x00000150
-#define CKM_DES_OFB8                   0x00000151
-#define CKM_DES_CFB64                  0x00000152
-#define CKM_DES_CFB8                   0x00000153
+#define CKM_DES_OFB64 0x00000150
+#define CKM_DES_OFB8 0x00000151
+#define CKM_DES_CFB64 0x00000152
+#define CKM_DES_CFB8 0x00000153
 
-#define CKM_MD2                        0x00000200
+#define CKM_MD2 0x00000200
 
 /* CKM_MD2_HMAC and CKM_MD2_HMAC_GENERAL are new for v2.0 */
-#define CKM_MD2_HMAC                   0x00000201
-#define CKM_MD2_HMAC_GENERAL           0x00000202
+#define CKM_MD2_HMAC 0x00000201
+#define CKM_MD2_HMAC_GENERAL 0x00000202
 
-#define CKM_MD5                        0x00000210
+#define CKM_MD5 0x00000210
 
 /* CKM_MD5_HMAC and CKM_MD5_HMAC_GENERAL are new for v2.0 */
-#define CKM_MD5_HMAC                   0x00000211
-#define CKM_MD5_HMAC_GENERAL           0x00000212
+#define CKM_MD5_HMAC 0x00000211
+#define CKM_MD5_HMAC_GENERAL 0x00000212
 
-#define CKM_SHA_1                      0x00000220
+#define CKM_SHA_1 0x00000220
 
 /* CKM_SHA_1_HMAC and CKM_SHA_1_HMAC_GENERAL are new for v2.0 */
-#define CKM_SHA_1_HMAC                 0x00000221
-#define CKM_SHA_1_HMAC_GENERAL         0x00000222
+#define CKM_SHA_1_HMAC 0x00000221
+#define CKM_SHA_1_HMAC_GENERAL 0x00000222
 
 /* CKM_RIPEMD128, CKM_RIPEMD128_HMAC,
  * CKM_RIPEMD128_HMAC_GENERAL, CKM_RIPEMD160, CKM_RIPEMD160_HMAC,
  * and CKM_RIPEMD160_HMAC_GENERAL are new for v2.10 */
-#define CKM_RIPEMD128                  0x00000230
-#define CKM_RIPEMD128_HMAC             0x00000231
-#define CKM_RIPEMD128_HMAC_GENERAL     0x00000232
-#define CKM_RIPEMD160                  0x00000240
-#define CKM_RIPEMD160_HMAC             0x00000241
-#define CKM_RIPEMD160_HMAC_GENERAL     0x00000242
+#define CKM_RIPEMD128 0x00000230
+#define CKM_RIPEMD128_HMAC 0x00000231
+#define CKM_RIPEMD128_HMAC_GENERAL 0x00000232
+#define CKM_RIPEMD160 0x00000240
+#define CKM_RIPEMD160_HMAC 0x00000241
+#define CKM_RIPEMD160_HMAC_GENERAL 0x00000242
 
 /* CKM_SHA256/384/512 are new for v2.20 */
-#define CKM_SHA256                     0x00000250
-#define CKM_SHA256_HMAC                0x00000251
-#define CKM_SHA256_HMAC_GENERAL        0x00000252
+#define CKM_SHA256 0x00000250
+#define CKM_SHA256_HMAC 0x00000251
+#define CKM_SHA256_HMAC_GENERAL 0x00000252
 
 /* SHA-224 is new for PKCS #11 v2.20 amendment 3 */
-#define CKM_SHA224                     0x00000255
-#define CKM_SHA224_HMAC                0x00000256
-#define CKM_SHA224_HMAC_GENERAL        0x00000257
+#define CKM_SHA224 0x00000255
+#define CKM_SHA224_HMAC 0x00000256
+#define CKM_SHA224_HMAC_GENERAL 0x00000257
 
-#define CKM_SHA384                     0x00000260
-#define CKM_SHA384_HMAC                0x00000261
-#define CKM_SHA384_HMAC_GENERAL        0x00000262
-#define CKM_SHA512                     0x00000270
-#define CKM_SHA512_HMAC                0x00000271
-#define CKM_SHA512_HMAC_GENERAL        0x00000272
+#define CKM_SHA384 0x00000260
+#define CKM_SHA384_HMAC 0x00000261
+#define CKM_SHA384_HMAC_GENERAL 0x00000262
+#define CKM_SHA512 0x00000270
+#define CKM_SHA512_HMAC 0x00000271
+#define CKM_SHA512_HMAC_GENERAL 0x00000272
 
 /* SecurID is new for PKCS #11 v2.20 amendment 1 */
-#define CKM_SECURID_KEY_GEN            0x00000280
-#define CKM_SECURID                    0x00000282
+#define CKM_SECURID_KEY_GEN 0x00000280
+#define CKM_SECURID 0x00000282
 
 /* HOTP is new for PKCS #11 v2.20 amendment 1 */
-#define CKM_HOTP_KEY_GEN    0x00000290
-#define CKM_HOTP            0x00000291
+#define CKM_HOTP_KEY_GEN 0x00000290
+#define CKM_HOTP 0x00000291
 
 /* ACTI is new for PKCS #11 v2.20 amendment 1 */
-#define CKM_ACTI            0x000002A0
-#define CKM_ACTI_KEY_GEN    0x000002A1
+#define CKM_ACTI 0x000002A0
+#define CKM_ACTI_KEY_GEN 0x000002A1
 
 /* All of the following mechanisms are new for v2.0 */
 /* Note that CAST128 and CAST5 are the same algorithm */
-#define CKM_CAST_KEY_GEN               0x00000300
-#define CKM_CAST_ECB                   0x00000301
-#define CKM_CAST_CBC                   0x00000302
-#define CKM_CAST_MAC                   0x00000303
-#define CKM_CAST_MAC_GENERAL           0x00000304
-#define CKM_CAST_CBC_PAD               0x00000305
-#define CKM_CAST3_KEY_GEN              0x00000310
-#define CKM_CAST3_ECB                  0x00000311
-#define CKM_CAST3_CBC                  0x00000312
-#define CKM_CAST3_MAC                  0x00000313
-#define CKM_CAST3_MAC_GENERAL          0x00000314
-#define CKM_CAST3_CBC_PAD              0x00000315
-#define CKM_CAST5_KEY_GEN              0x00000320
-#define CKM_CAST128_KEY_GEN            0x00000320
-#define CKM_CAST5_ECB                  0x00000321
-#define CKM_CAST128_ECB                0x00000321
-#define CKM_CAST5_CBC                  0x00000322
-#define CKM_CAST128_CBC                0x00000322
-#define CKM_CAST5_MAC                  0x00000323
-#define CKM_CAST128_MAC                0x00000323
-#define CKM_CAST5_MAC_GENERAL          0x00000324
-#define CKM_CAST128_MAC_GENERAL        0x00000324
-#define CKM_CAST5_CBC_PAD              0x00000325
-#define CKM_CAST128_CBC_PAD            0x00000325
-#define CKM_RC5_KEY_GEN                0x00000330
-#define CKM_RC5_ECB                    0x00000331
-#define CKM_RC5_CBC                    0x00000332
-#define CKM_RC5_MAC                    0x00000333
-#define CKM_RC5_MAC_GENERAL            0x00000334
-#define CKM_RC5_CBC_PAD                0x00000335
-#define CKM_IDEA_KEY_GEN               0x00000340
-#define CKM_IDEA_ECB                   0x00000341
-#define CKM_IDEA_CBC                   0x00000342
-#define CKM_IDEA_MAC                   0x00000343
-#define CKM_IDEA_MAC_GENERAL           0x00000344
-#define CKM_IDEA_CBC_PAD               0x00000345
-#define CKM_GENERIC_SECRET_KEY_GEN     0x00000350
-#define CKM_CONCATENATE_BASE_AND_KEY   0x00000360
-#define CKM_CONCATENATE_BASE_AND_DATA  0x00000362
-#define CKM_CONCATENATE_DATA_AND_BASE  0x00000363
-#define CKM_XOR_BASE_AND_DATA          0x00000364
-#define CKM_EXTRACT_KEY_FROM_KEY       0x00000365
-#define CKM_SSL3_PRE_MASTER_KEY_GEN    0x00000370
-#define CKM_SSL3_MASTER_KEY_DERIVE     0x00000371
-#define CKM_SSL3_KEY_AND_MAC_DERIVE    0x00000372
+#define CKM_CAST_KEY_GEN 0x00000300
+#define CKM_CAST_ECB 0x00000301
+#define CKM_CAST_CBC 0x00000302
+#define CKM_CAST_MAC 0x00000303
+#define CKM_CAST_MAC_GENERAL 0x00000304
+#define CKM_CAST_CBC_PAD 0x00000305
+#define CKM_CAST3_KEY_GEN 0x00000310
+#define CKM_CAST3_ECB 0x00000311
+#define CKM_CAST3_CBC 0x00000312
+#define CKM_CAST3_MAC 0x00000313
+#define CKM_CAST3_MAC_GENERAL 0x00000314
+#define CKM_CAST3_CBC_PAD 0x00000315
+#define CKM_CAST5_KEY_GEN 0x00000320
+#define CKM_CAST128_KEY_GEN 0x00000320
+#define CKM_CAST5_ECB 0x00000321
+#define CKM_CAST128_ECB 0x00000321
+#define CKM_CAST5_CBC 0x00000322
+#define CKM_CAST128_CBC 0x00000322
+#define CKM_CAST5_MAC 0x00000323
+#define CKM_CAST128_MAC 0x00000323
+#define CKM_CAST5_MAC_GENERAL 0x00000324
+#define CKM_CAST128_MAC_GENERAL 0x00000324
+#define CKM_CAST5_CBC_PAD 0x00000325
+#define CKM_CAST128_CBC_PAD 0x00000325
+#define CKM_RC5_KEY_GEN 0x00000330
+#define CKM_RC5_ECB 0x00000331
+#define CKM_RC5_CBC 0x00000332
+#define CKM_RC5_MAC 0x00000333
+#define CKM_RC5_MAC_GENERAL 0x00000334
+#define CKM_RC5_CBC_PAD 0x00000335
+#define CKM_IDEA_KEY_GEN 0x00000340
+#define CKM_IDEA_ECB 0x00000341
+#define CKM_IDEA_CBC 0x00000342
+#define CKM_IDEA_MAC 0x00000343
+#define CKM_IDEA_MAC_GENERAL 0x00000344
+#define CKM_IDEA_CBC_PAD 0x00000345
+#define CKM_GENERIC_SECRET_KEY_GEN 0x00000350
+#define CKM_CONCATENATE_BASE_AND_KEY 0x00000360
+#define CKM_CONCATENATE_BASE_AND_DATA 0x00000362
+#define CKM_CONCATENATE_DATA_AND_BASE 0x00000363
+#define CKM_XOR_BASE_AND_DATA 0x00000364
+#define CKM_EXTRACT_KEY_FROM_KEY 0x00000365
+#define CKM_SSL3_PRE_MASTER_KEY_GEN 0x00000370
+#define CKM_SSL3_MASTER_KEY_DERIVE 0x00000371
+#define CKM_SSL3_KEY_AND_MAC_DERIVE 0x00000372
 
 /* CKM_SSL3_MASTER_KEY_DERIVE_DH, CKM_TLS_PRE_MASTER_KEY_GEN,
  * CKM_TLS_MASTER_KEY_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE, and
  * CKM_TLS_MASTER_KEY_DERIVE_DH are new for v2.11 */
-#define CKM_SSL3_MASTER_KEY_DERIVE_DH  0x00000373
-#define CKM_TLS_PRE_MASTER_KEY_GEN     0x00000374
-#define CKM_TLS_MASTER_KEY_DERIVE      0x00000375
-#define CKM_TLS_KEY_AND_MAC_DERIVE     0x00000376
-#define CKM_TLS_MASTER_KEY_DERIVE_DH   0x00000377
+#define CKM_SSL3_MASTER_KEY_DERIVE_DH 0x00000373
+#define CKM_TLS_PRE_MASTER_KEY_GEN 0x00000374
+#define CKM_TLS_MASTER_KEY_DERIVE 0x00000375
+#define CKM_TLS_KEY_AND_MAC_DERIVE 0x00000376
+#define CKM_TLS_MASTER_KEY_DERIVE_DH 0x00000377
 
 /* CKM_TLS_PRF is new for v2.20 */
-#define CKM_TLS_PRF                    0x00000378
+#define CKM_TLS_PRF 0x00000378
 
-#define CKM_SSL3_MD5_MAC               0x00000380
-#define CKM_SSL3_SHA1_MAC              0x00000381
-#define CKM_MD5_KEY_DERIVATION         0x00000390
-#define CKM_MD2_KEY_DERIVATION         0x00000391
-#define CKM_SHA1_KEY_DERIVATION        0x00000392
+#define CKM_SSL3_MD5_MAC 0x00000380
+#define CKM_SSL3_SHA1_MAC 0x00000381
+#define CKM_MD5_KEY_DERIVATION 0x00000390
+#define CKM_MD2_KEY_DERIVATION 0x00000391
+#define CKM_SHA1_KEY_DERIVATION 0x00000392
 
 /* CKM_SHA256/384/512 are new for v2.20 */
-#define CKM_SHA256_KEY_DERIVATION      0x00000393
-#define CKM_SHA384_KEY_DERIVATION      0x00000394
-#define CKM_SHA512_KEY_DERIVATION      0x00000395
+#define CKM_SHA256_KEY_DERIVATION 0x00000393
+#define CKM_SHA384_KEY_DERIVATION 0x00000394
+#define CKM_SHA512_KEY_DERIVATION 0x00000395
 
 /* SHA-224 key derivation is new for PKCS #11 v2.20 amendment 3 */
-#define CKM_SHA224_KEY_DERIVATION      0x00000396
-
-#define CKM_PBE_MD2_DES_CBC            0x000003A0
-#define CKM_PBE_MD5_DES_CBC            0x000003A1
-#define CKM_PBE_MD5_CAST_CBC           0x000003A2
-#define CKM_PBE_MD5_CAST3_CBC          0x000003A3
-#define CKM_PBE_MD5_CAST5_CBC          0x000003A4
-#define CKM_PBE_MD5_CAST128_CBC        0x000003A4
-#define CKM_PBE_SHA1_CAST5_CBC         0x000003A5
-#define CKM_PBE_SHA1_CAST128_CBC       0x000003A5
-#define CKM_PBE_SHA1_RC4_128           0x000003A6
-#define CKM_PBE_SHA1_RC4_40            0x000003A7
-#define CKM_PBE_SHA1_DES3_EDE_CBC      0x000003A8
-#define CKM_PBE_SHA1_DES2_EDE_CBC      0x000003A9
-#define CKM_PBE_SHA1_RC2_128_CBC       0x000003AA
-#define CKM_PBE_SHA1_RC2_40_CBC        0x000003AB
+#define CKM_SHA224_KEY_DERIVATION 0x00000396
+
+#define CKM_PBE_MD2_DES_CBC 0x000003A0
+#define CKM_PBE_MD5_DES_CBC 0x000003A1
+#define CKM_PBE_MD5_CAST_CBC 0x000003A2
+#define CKM_PBE_MD5_CAST3_CBC 0x000003A3
+#define CKM_PBE_MD5_CAST5_CBC 0x000003A4
+#define CKM_PBE_MD5_CAST128_CBC 0x000003A4
+#define CKM_PBE_SHA1_CAST5_CBC 0x000003A5
+#define CKM_PBE_SHA1_CAST128_CBC 0x000003A5
+#define CKM_PBE_SHA1_RC4_128 0x000003A6
+#define CKM_PBE_SHA1_RC4_40 0x000003A7
+#define CKM_PBE_SHA1_DES3_EDE_CBC 0x000003A8
+#define CKM_PBE_SHA1_DES2_EDE_CBC 0x000003A9
+#define CKM_PBE_SHA1_RC2_128_CBC 0x000003AA
+#define CKM_PBE_SHA1_RC2_40_CBC 0x000003AB
 
 /* CKM_PKCS5_PBKD2 is new for v2.10 */
-#define CKM_PKCS5_PBKD2                0x000003B0
+#define CKM_PKCS5_PBKD2 0x000003B0
 
-#define CKM_PBA_SHA1_WITH_SHA1_HMAC    0x000003C0
+#define CKM_PBA_SHA1_WITH_SHA1_HMAC 0x000003C0
 
 /* WTLS mechanisms are new for v2.20 */
-#define CKM_WTLS_PRE_MASTER_KEY_GEN         0x000003D0
-#define CKM_WTLS_MASTER_KEY_DERIVE          0x000003D1
-#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC   0x000003D2
-#define CKM_WTLS_PRF                        0x000003D3
-#define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE  0x000003D4
-#define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE  0x000003D5
+#define CKM_WTLS_PRE_MASTER_KEY_GEN 0x000003D0
+#define CKM_WTLS_MASTER_KEY_DERIVE 0x000003D1
+#define CKM_WTLS_MASTER_KEY_DERIVE_DH_ECC 0x000003D2
+#define CKM_WTLS_PRF 0x000003D3
+#define CKM_WTLS_SERVER_KEY_AND_MAC_DERIVE 0x000003D4
+#define CKM_WTLS_CLIENT_KEY_AND_MAC_DERIVE 0x000003D5
 
-#define CKM_KEY_WRAP_LYNKS             0x00000400
-#define CKM_KEY_WRAP_SET_OAEP          0x00000401
+#define CKM_KEY_WRAP_LYNKS 0x00000400
+#define CKM_KEY_WRAP_SET_OAEP 0x00000401
 
 /* CKM_CMS_SIG is new for v2.20 */
-#define CKM_CMS_SIG                    0x00000500
+#define CKM_CMS_SIG 0x00000500
 
 /* CKM_KIP mechanisms are new for PKCS #11 v2.20 amendment 2 */
-#define CKM_KIP_DERIVE	               0x00000510
-#define CKM_KIP_WRAP	               0x00000511
-#define CKM_KIP_MAC	               0x00000512
+#define CKM_KIP_DERIVE 0x00000510
+#define CKM_KIP_WRAP 0x00000511
+#define CKM_KIP_MAC 0x00000512
 
 /* Camellia is new for PKCS #11 v2.20 amendment 3 */
-#define CKM_CAMELLIA_KEY_GEN           0x00000550
-#define CKM_CAMELLIA_ECB               0x00000551
-#define CKM_CAMELLIA_CBC               0x00000552
-#define CKM_CAMELLIA_MAC               0x00000553
-#define CKM_CAMELLIA_MAC_GENERAL       0x00000554
-#define CKM_CAMELLIA_CBC_PAD           0x00000555
-#define CKM_CAMELLIA_ECB_ENCRYPT_DATA  0x00000556
-#define CKM_CAMELLIA_CBC_ENCRYPT_DATA  0x00000557
-#define CKM_CAMELLIA_CTR               0x00000558
+#define CKM_CAMELLIA_KEY_GEN 0x00000550
+#define CKM_CAMELLIA_ECB 0x00000551
+#define CKM_CAMELLIA_CBC 0x00000552
+#define CKM_CAMELLIA_MAC 0x00000553
+#define CKM_CAMELLIA_MAC_GENERAL 0x00000554
+#define CKM_CAMELLIA_CBC_PAD 0x00000555
+#define CKM_CAMELLIA_ECB_ENCRYPT_DATA 0x00000556
+#define CKM_CAMELLIA_CBC_ENCRYPT_DATA 0x00000557
+#define CKM_CAMELLIA_CTR 0x00000558
 
 /* ARIA is new for PKCS #11 v2.20 amendment 3 */
-#define CKM_ARIA_KEY_GEN               0x00000560
-#define CKM_ARIA_ECB                   0x00000561
-#define CKM_ARIA_CBC                   0x00000562
-#define CKM_ARIA_MAC                   0x00000563
-#define CKM_ARIA_MAC_GENERAL           0x00000564
-#define CKM_ARIA_CBC_PAD               0x00000565
-#define CKM_ARIA_ECB_ENCRYPT_DATA      0x00000566
-#define CKM_ARIA_CBC_ENCRYPT_DATA      0x00000567
+#define CKM_ARIA_KEY_GEN 0x00000560
+#define CKM_ARIA_ECB 0x00000561
+#define CKM_ARIA_CBC 0x00000562
+#define CKM_ARIA_MAC 0x00000563
+#define CKM_ARIA_MAC_GENERAL 0x00000564
+#define CKM_ARIA_CBC_PAD 0x00000565
+#define CKM_ARIA_ECB_ENCRYPT_DATA 0x00000566
+#define CKM_ARIA_CBC_ENCRYPT_DATA 0x00000567
 
 /* Fortezza mechanisms */
-#define CKM_SKIPJACK_KEY_GEN           0x00001000
-#define CKM_SKIPJACK_ECB64             0x00001001
-#define CKM_SKIPJACK_CBC64             0x00001002
-#define CKM_SKIPJACK_OFB64             0x00001003
-#define CKM_SKIPJACK_CFB64             0x00001004
-#define CKM_SKIPJACK_CFB32             0x00001005
-#define CKM_SKIPJACK_CFB16             0x00001006
-#define CKM_SKIPJACK_CFB8              0x00001007
-#define CKM_SKIPJACK_WRAP              0x00001008
-#define CKM_SKIPJACK_PRIVATE_WRAP      0x00001009
-#define CKM_SKIPJACK_RELAYX            0x0000100a
-#define CKM_KEA_KEY_PAIR_GEN           0x00001010
-#define CKM_KEA_KEY_DERIVE             0x00001011
-#define CKM_FORTEZZA_TIMESTAMP         0x00001020
-#define CKM_BATON_KEY_GEN              0x00001030
-#define CKM_BATON_ECB128               0x00001031
-#define CKM_BATON_ECB96                0x00001032
-#define CKM_BATON_CBC128               0x00001033
-#define CKM_BATON_COUNTER              0x00001034
-#define CKM_BATON_SHUFFLE              0x00001035
-#define CKM_BATON_WRAP                 0x00001036
+#define CKM_SKIPJACK_KEY_GEN 0x00001000
+#define CKM_SKIPJACK_ECB64 0x00001001
+#define CKM_SKIPJACK_CBC64 0x00001002
+#define CKM_SKIPJACK_OFB64 0x00001003
+#define CKM_SKIPJACK_CFB64 0x00001004
+#define CKM_SKIPJACK_CFB32 0x00001005
+#define CKM_SKIPJACK_CFB16 0x00001006
+#define CKM_SKIPJACK_CFB8 0x00001007
+#define CKM_SKIPJACK_WRAP 0x00001008
+#define CKM_SKIPJACK_PRIVATE_WRAP 0x00001009
+#define CKM_SKIPJACK_RELAYX 0x0000100a
+#define CKM_KEA_KEY_PAIR_GEN 0x00001010
+#define CKM_KEA_KEY_DERIVE 0x00001011
+#define CKM_FORTEZZA_TIMESTAMP 0x00001020
+#define CKM_BATON_KEY_GEN 0x00001030
+#define CKM_BATON_ECB128 0x00001031
+#define CKM_BATON_ECB96 0x00001032
+#define CKM_BATON_CBC128 0x00001033
+#define CKM_BATON_COUNTER 0x00001034
+#define CKM_BATON_SHUFFLE 0x00001035
+#define CKM_BATON_WRAP 0x00001036
 
 /* CKM_ECDSA_KEY_PAIR_GEN is deprecated in v2.11,
  * CKM_EC_KEY_PAIR_GEN is preferred */
-#define CKM_ECDSA_KEY_PAIR_GEN         0x00001040
-#define CKM_EC_KEY_PAIR_GEN            0x00001040
+#define CKM_ECDSA_KEY_PAIR_GEN 0x00001040
+#define CKM_EC_KEY_PAIR_GEN 0x00001040
 
-#define CKM_ECDSA                      0x00001041
-#define CKM_ECDSA_SHA1                 0x00001042
+#define CKM_ECDSA 0x00001041
+#define CKM_ECDSA_SHA1 0x00001042
 
 /* CKM_ECDH1_DERIVE, CKM_ECDH1_COFACTOR_DERIVE, and CKM_ECMQV_DERIVE
  * are new for v2.11 */
-#define CKM_ECDH1_DERIVE               0x00001050
-#define CKM_ECDH1_COFACTOR_DERIVE      0x00001051
-#define CKM_ECMQV_DERIVE               0x00001052
-
-#define CKM_JUNIPER_KEY_GEN            0x00001060
-#define CKM_JUNIPER_ECB128             0x00001061
-#define CKM_JUNIPER_CBC128             0x00001062
-#define CKM_JUNIPER_COUNTER            0x00001063
-#define CKM_JUNIPER_SHUFFLE            0x00001064
-#define CKM_JUNIPER_WRAP               0x00001065
-#define CKM_FASTHASH                   0x00001070
+#define CKM_ECDH1_DERIVE 0x00001050
+#define CKM_ECDH1_COFACTOR_DERIVE 0x00001051
+#define CKM_ECMQV_DERIVE 0x00001052
+
+#define CKM_JUNIPER_KEY_GEN 0x00001060
+#define CKM_JUNIPER_ECB128 0x00001061
+#define CKM_JUNIPER_CBC128 0x00001062
+#define CKM_JUNIPER_COUNTER 0x00001063
+#define CKM_JUNIPER_SHUFFLE 0x00001064
+#define CKM_JUNIPER_WRAP 0x00001065
+#define CKM_FASTHASH 0x00001070
 
 /* CKM_AES_KEY_GEN, CKM_AES_ECB, CKM_AES_CBC, CKM_AES_MAC,
  * CKM_AES_MAC_GENERAL, CKM_AES_CBC_PAD, CKM_DSA_PARAMETER_GEN,
  * CKM_DH_PKCS_PARAMETER_GEN, and CKM_X9_42_DH_PARAMETER_GEN are
  * new for v2.11 */
-#define CKM_AES_KEY_GEN                0x00001080
-#define CKM_AES_ECB                    0x00001081
-#define CKM_AES_CBC                    0x00001082
-#define CKM_AES_MAC                    0x00001083
-#define CKM_AES_MAC_GENERAL            0x00001084
-#define CKM_AES_CBC_PAD                0x00001085
+#define CKM_AES_KEY_GEN 0x00001080
+#define CKM_AES_ECB 0x00001081
+#define CKM_AES_CBC 0x00001082
+#define CKM_AES_MAC 0x00001083
+#define CKM_AES_MAC_GENERAL 0x00001084
+#define CKM_AES_CBC_PAD 0x00001085
 
 /* AES counter mode is new for PKCS #11 v2.20 amendment 3 */
-#define CKM_AES_CTR                    0x00001086
+#define CKM_AES_CTR 0x00001086
 /* AES GCM mode as defined in PKCS11 v2.30 draft */
-#define CKM_AES_GCM                    0x00001087
-#define CKM_AES_CMAC_GENERAL           0x00001089 
-#define CKM_AES_CMAC                   0x0000108A
+#define CKM_AES_GCM 0x00001087
+#define CKM_AES_CMAC_GENERAL 0x00001089
+#define CKM_AES_CMAC 0x0000108A
 
 /* BlowFish and TwoFish are new for v2.20 */
-#define CKM_BLOWFISH_KEY_GEN           0x00001090
-#define CKM_BLOWFISH_CBC               0x00001091
-#define CKM_TWOFISH_KEY_GEN            0x00001092
-#define CKM_TWOFISH_CBC                0x00001093
-
+#define CKM_BLOWFISH_KEY_GEN 0x00001090
+#define CKM_BLOWFISH_CBC 0x00001091
+#define CKM_TWOFISH_KEY_GEN 0x00001092
+#define CKM_TWOFISH_CBC 0x00001093
 
 /* CKM_xxx_ENCRYPT_DATA mechanisms are new for v2.20 */
-#define CKM_DES_ECB_ENCRYPT_DATA       0x00001100
-#define CKM_DES_CBC_ENCRYPT_DATA       0x00001101
-#define CKM_DES3_ECB_ENCRYPT_DATA      0x00001102
-#define CKM_DES3_CBC_ENCRYPT_DATA      0x00001103
-#define CKM_AES_ECB_ENCRYPT_DATA       0x00001104
-#define CKM_AES_CBC_ENCRYPT_DATA       0x00001105
+#define CKM_DES_ECB_ENCRYPT_DATA 0x00001100
+#define CKM_DES_CBC_ENCRYPT_DATA 0x00001101
+#define CKM_DES3_ECB_ENCRYPT_DATA 0x00001102
+#define CKM_DES3_CBC_ENCRYPT_DATA 0x00001103
+#define CKM_AES_ECB_ENCRYPT_DATA 0x00001104
+#define CKM_AES_CBC_ENCRYPT_DATA 0x00001105
 
-#define CKM_DSA_PARAMETER_GEN          0x00002000
-#define CKM_DH_PKCS_PARAMETER_GEN      0x00002001
-#define CKM_X9_42_DH_PARAMETER_GEN     0x00002002
+#define CKM_DSA_PARAMETER_GEN 0x00002000
+#define CKM_DH_PKCS_PARAMETER_GEN 0x00002001
+#define CKM_X9_42_DH_PARAMETER_GEN 0x00002002
 
-#define CKM_AES_KEY_WRAP               0x00002109
-#define CKM_AES_KEY_WRAP_PAD           0x0000210A
+#define CKM_AES_KEY_WRAP 0x00002109
+#define CKM_AES_KEY_WRAP_PAD 0x0000210A
 
-#define CKM_VENDOR_DEFINED             0x80000000
+#define CKM_VENDOR_DEFINED 0x80000000
 
 typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR;
 
-
 /* CK_MECHANISM is a structure that specifies a particular
  * mechanism  */
-typedef struct CK_MECHANISM {
-  CK_MECHANISM_TYPE mechanism;
-  CK_VOID_PTR       pParameter;
-
-  /* ulParameterLen was changed from CK_USHORT to CK_ULONG for
-   * v2.0 */
-  CK_ULONG          ulParameterLen;  /* in bytes */
+typedef struct CK_MECHANISM
+{
+    CK_MECHANISM_TYPE mechanism;
+    CK_VOID_PTR pParameter;
+
+    /* ulParameterLen was changed from CK_USHORT to CK_ULONG for
+     * v2.0 */
+    CK_ULONG ulParameterLen; /* in bytes */
 } CK_MECHANISM;
 
 typedef CK_MECHANISM CK_PTR CK_MECHANISM_PTR;
 
-
 /* CK_MECHANISM_INFO provides information about a particular
  * mechanism */
-typedef struct CK_MECHANISM_INFO {
-    CK_ULONG    ulMinKeySize;
-    CK_ULONG    ulMaxKeySize;
-    CK_FLAGS    flags;
+typedef struct CK_MECHANISM_INFO
+{
+    CK_ULONG ulMinKeySize;
+    CK_ULONG ulMaxKeySize;
+    CK_FLAGS flags;
 } CK_MECHANISM_INFO;
 
 /* The flags are defined as follows:
  *      Bit Flag               Mask        Meaning */
-#define CKF_HW                 0x00000001  /* performed by HW */
+#define CKF_HW 0x00000001 /* performed by HW */
 
 /* The flags CKF_ENCRYPT, CKF_DECRYPT, CKF_DIGEST, CKF_SIGN,
  * CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER,
  * CKF_GENERATE, CKF_GENERATE_KEY_PAIR, CKF_WRAP, CKF_UNWRAP,
  * and CKF_DERIVE are new for v2.0.  They specify whether or not
  * a mechanism can be used for a particular task */
-#define CKF_ENCRYPT            0x00000100
-#define CKF_DECRYPT            0x00000200
-#define CKF_DIGEST             0x00000400
-#define CKF_SIGN               0x00000800
-#define CKF_SIGN_RECOVER       0x00001000
-#define CKF_VERIFY             0x00002000
-#define CKF_VERIFY_RECOVER     0x00004000
-#define CKF_GENERATE           0x00008000
-#define CKF_GENERATE_KEY_PAIR  0x00010000
-#define CKF_WRAP               0x00020000
-#define CKF_UNWRAP             0x00040000
-#define CKF_DERIVE             0x00080000
+#define CKF_ENCRYPT 0x00000100
+#define CKF_DECRYPT 0x00000200
+#define CKF_DIGEST 0x00000400
+#define CKF_SIGN 0x00000800
+#define CKF_SIGN_RECOVER 0x00001000
+#define CKF_VERIFY 0x00002000
+#define CKF_VERIFY_RECOVER 0x00004000
+#define CKF_GENERATE 0x00008000
+#define CKF_GENERATE_KEY_PAIR 0x00010000
+#define CKF_WRAP 0x00020000
+#define CKF_UNWRAP 0x00040000
+#define CKF_DERIVE 0x00080000
 
 /* CKF_EC_F_P, CKF_EC_F_2M, CKF_EC_ECPARAMETERS, CKF_EC_NAMEDCURVE,
  * CKF_EC_UNCOMPRESS, and CKF_EC_COMPRESS are new for v2.11. They
  * describe a token's EC capabilities not available in mechanism
  * information. */
-#define CKF_EC_F_P             0x00100000
-#define CKF_EC_F_2M            0x00200000
-#define CKF_EC_ECPARAMETERS    0x00400000
-#define CKF_EC_NAMEDCURVE      0x00800000
-#define CKF_EC_UNCOMPRESS      0x01000000
-#define CKF_EC_COMPRESS        0x02000000
+#define CKF_EC_F_P 0x00100000
+#define CKF_EC_F_2M 0x00200000
+#define CKF_EC_ECPARAMETERS 0x00400000
+#define CKF_EC_NAMEDCURVE 0x00800000
+#define CKF_EC_UNCOMPRESS 0x01000000
+#define CKF_EC_COMPRESS 0x02000000
 
-#define CKF_EXTENSION          0x80000000 /* FALSE for this version */
+#define CKF_EXTENSION 0x80000000 /* FALSE for this version */
 
 typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR;
 
-
 /* CK_RV is a value that identifies the return value of a
  * Cryptoki function */
 /* CK_RV was changed from CK_USHORT to CK_ULONG for v2.0 */
-typedef CK_ULONG          CK_RV;
+typedef CK_ULONG CK_RV;
 
-#define CKR_OK                                0x00000000
-#define CKR_CANCEL                            0x00000001
-#define CKR_HOST_MEMORY                       0x00000002
-#define CKR_SLOT_ID_INVALID                   0x00000003
+#define CKR_OK 0x00000000
+#define CKR_CANCEL 0x00000001
+#define CKR_HOST_MEMORY 0x00000002
+#define CKR_SLOT_ID_INVALID 0x00000003
 
 /* CKR_FLAGS_INVALID was removed for v2.0 */
 
 /* CKR_GENERAL_ERROR and CKR_FUNCTION_FAILED are new for v2.0 */
-#define CKR_GENERAL_ERROR                     0x00000005
-#define CKR_FUNCTION_FAILED                   0x00000006
+#define CKR_GENERAL_ERROR 0x00000005
+#define CKR_FUNCTION_FAILED 0x00000006
 
 /* CKR_ARGUMENTS_BAD, CKR_NO_EVENT, CKR_NEED_TO_CREATE_THREADS,
  * and CKR_CANT_LOCK are new for v2.01 */
-#define CKR_ARGUMENTS_BAD                     0x00000007
-#define CKR_NO_EVENT                          0x00000008
-#define CKR_NEED_TO_CREATE_THREADS            0x00000009
-#define CKR_CANT_LOCK                         0x0000000A
-
-#define CKR_ATTRIBUTE_READ_ONLY               0x00000010
-#define CKR_ATTRIBUTE_SENSITIVE               0x00000011
-#define CKR_ATTRIBUTE_TYPE_INVALID            0x00000012
-#define CKR_ATTRIBUTE_VALUE_INVALID           0x00000013
-#define CKR_DATA_INVALID                      0x00000020
-#define CKR_DATA_LEN_RANGE                    0x00000021
-#define CKR_DEVICE_ERROR                      0x00000030
-#define CKR_DEVICE_MEMORY                     0x00000031
-#define CKR_DEVICE_REMOVED                    0x00000032
-#define CKR_ENCRYPTED_DATA_INVALID            0x00000040
-#define CKR_ENCRYPTED_DATA_LEN_RANGE          0x00000041
-#define CKR_FUNCTION_CANCELED                 0x00000050
-#define CKR_FUNCTION_NOT_PARALLEL             0x00000051
+#define CKR_ARGUMENTS_BAD 0x00000007
+#define CKR_NO_EVENT 0x00000008
+#define CKR_NEED_TO_CREATE_THREADS 0x00000009
+#define CKR_CANT_LOCK 0x0000000A
+
+#define CKR_ATTRIBUTE_READ_ONLY 0x00000010
+#define CKR_ATTRIBUTE_SENSITIVE 0x00000011
+#define CKR_ATTRIBUTE_TYPE_INVALID 0x00000012
+#define CKR_ATTRIBUTE_VALUE_INVALID 0x00000013
+#define CKR_DATA_INVALID 0x00000020
+#define CKR_DATA_LEN_RANGE 0x00000021
+#define CKR_DEVICE_ERROR 0x00000030
+#define CKR_DEVICE_MEMORY 0x00000031
+#define CKR_DEVICE_REMOVED 0x00000032
+#define CKR_ENCRYPTED_DATA_INVALID 0x00000040
+#define CKR_ENCRYPTED_DATA_LEN_RANGE 0x00000041
+#define CKR_FUNCTION_CANCELED 0x00000050
+#define CKR_FUNCTION_NOT_PARALLEL 0x00000051
 
 /* CKR_FUNCTION_NOT_SUPPORTED is new for v2.0 */
-#define CKR_FUNCTION_NOT_SUPPORTED            0x00000054
+#define CKR_FUNCTION_NOT_SUPPORTED 0x00000054
 
-#define CKR_KEY_HANDLE_INVALID                0x00000060
+#define CKR_KEY_HANDLE_INVALID 0x00000060
 
 /* CKR_KEY_SENSITIVE was removed for v2.0 */
 
-#define CKR_KEY_SIZE_RANGE                    0x00000062
-#define CKR_KEY_TYPE_INCONSISTENT             0x00000063
+#define CKR_KEY_SIZE_RANGE 0x00000062
+#define CKR_KEY_TYPE_INCONSISTENT 0x00000063
 
 /* CKR_KEY_NOT_NEEDED, CKR_KEY_CHANGED, CKR_KEY_NEEDED,
  * CKR_KEY_INDIGESTIBLE, CKR_KEY_FUNCTION_NOT_PERMITTED,
  * CKR_KEY_NOT_WRAPPABLE, and CKR_KEY_UNEXTRACTABLE are new for
  * v2.0 */
-#define CKR_KEY_NOT_NEEDED                    0x00000064
-#define CKR_KEY_CHANGED                       0x00000065
-#define CKR_KEY_NEEDED                        0x00000066
-#define CKR_KEY_INDIGESTIBLE                  0x00000067
-#define CKR_KEY_FUNCTION_NOT_PERMITTED        0x00000068
-#define CKR_KEY_NOT_WRAPPABLE                 0x00000069
-#define CKR_KEY_UNEXTRACTABLE                 0x0000006A
+#define CKR_KEY_NOT_NEEDED 0x00000064
+#define CKR_KEY_CHANGED 0x00000065
+#define CKR_KEY_NEEDED 0x00000066
+#define CKR_KEY_INDIGESTIBLE 0x00000067
+#define CKR_KEY_FUNCTION_NOT_PERMITTED 0x00000068
+#define CKR_KEY_NOT_WRAPPABLE 0x00000069
+#define CKR_KEY_UNEXTRACTABLE 0x0000006A
 
-#define CKR_MECHANISM_INVALID                 0x00000070
-#define CKR_MECHANISM_PARAM_INVALID           0x00000071
+#define CKR_MECHANISM_INVALID 0x00000070
+#define CKR_MECHANISM_PARAM_INVALID 0x00000071
 
 /* CKR_OBJECT_CLASS_INCONSISTENT and CKR_OBJECT_CLASS_INVALID
  * were removed for v2.0 */
-#define CKR_OBJECT_HANDLE_INVALID             0x00000082
-#define CKR_OPERATION_ACTIVE                  0x00000090
-#define CKR_OPERATION_NOT_INITIALIZED         0x00000091
-#define CKR_PIN_INCORRECT                     0x000000A0
-#define CKR_PIN_INVALID                       0x000000A1
-#define CKR_PIN_LEN_RANGE                     0x000000A2
+#define CKR_OBJECT_HANDLE_INVALID 0x00000082
+#define CKR_OPERATION_ACTIVE 0x00000090
+#define CKR_OPERATION_NOT_INITIALIZED 0x00000091
+#define CKR_PIN_INCORRECT 0x000000A0
+#define CKR_PIN_INVALID 0x000000A1
+#define CKR_PIN_LEN_RANGE 0x000000A2
 
 /* CKR_PIN_EXPIRED and CKR_PIN_LOCKED are new for v2.0 */
-#define CKR_PIN_EXPIRED                       0x000000A3
-#define CKR_PIN_LOCKED                        0x000000A4
+#define CKR_PIN_EXPIRED 0x000000A3
+#define CKR_PIN_LOCKED 0x000000A4
 
-#define CKR_SESSION_CLOSED                    0x000000B0
-#define CKR_SESSION_COUNT                     0x000000B1
-#define CKR_SESSION_HANDLE_INVALID            0x000000B3
-#define CKR_SESSION_PARALLEL_NOT_SUPPORTED    0x000000B4
-#define CKR_SESSION_READ_ONLY                 0x000000B5
-#define CKR_SESSION_EXISTS                    0x000000B6
+#define CKR_SESSION_CLOSED 0x000000B0
+#define CKR_SESSION_COUNT 0x000000B1
+#define CKR_SESSION_HANDLE_INVALID 0x000000B3
+#define CKR_SESSION_PARALLEL_NOT_SUPPORTED 0x000000B4
+#define CKR_SESSION_READ_ONLY 0x000000B5
+#define CKR_SESSION_EXISTS 0x000000B6
 
 /* CKR_SESSION_READ_ONLY_EXISTS and
  * CKR_SESSION_READ_WRITE_SO_EXISTS are new for v2.0 */
-#define CKR_SESSION_READ_ONLY_EXISTS          0x000000B7
-#define CKR_SESSION_READ_WRITE_SO_EXISTS      0x000000B8
-
-#define CKR_SIGNATURE_INVALID                 0x000000C0
-#define CKR_SIGNATURE_LEN_RANGE               0x000000C1
-#define CKR_TEMPLATE_INCOMPLETE               0x000000D0
-#define CKR_TEMPLATE_INCONSISTENT             0x000000D1
-#define CKR_TOKEN_NOT_PRESENT                 0x000000E0
-#define CKR_TOKEN_NOT_RECOGNIZED              0x000000E1
-#define CKR_TOKEN_WRITE_PROTECTED             0x000000E2
-#define CKR_UNWRAPPING_KEY_HANDLE_INVALID     0x000000F0
-#define CKR_UNWRAPPING_KEY_SIZE_RANGE         0x000000F1
-#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT  0x000000F2
-#define CKR_USER_ALREADY_LOGGED_IN            0x00000100
-#define CKR_USER_NOT_LOGGED_IN                0x00000101
-#define CKR_USER_PIN_NOT_INITIALIZED          0x00000102
-#define CKR_USER_TYPE_INVALID                 0x00000103
+#define CKR_SESSION_READ_ONLY_EXISTS 0x000000B7
+#define CKR_SESSION_READ_WRITE_SO_EXISTS 0x000000B8
+
+#define CKR_SIGNATURE_INVALID 0x000000C0
+#define CKR_SIGNATURE_LEN_RANGE 0x000000C1
+#define CKR_TEMPLATE_INCOMPLETE 0x000000D0
+#define CKR_TEMPLATE_INCONSISTENT 0x000000D1
+#define CKR_TOKEN_NOT_PRESENT 0x000000E0
+#define CKR_TOKEN_NOT_RECOGNIZED 0x000000E1
+#define CKR_TOKEN_WRITE_PROTECTED 0x000000E2
+#define CKR_UNWRAPPING_KEY_HANDLE_INVALID 0x000000F0
+#define CKR_UNWRAPPING_KEY_SIZE_RANGE 0x000000F1
+#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT 0x000000F2
+#define CKR_USER_ALREADY_LOGGED_IN 0x00000100
+#define CKR_USER_NOT_LOGGED_IN 0x00000101
+#define CKR_USER_PIN_NOT_INITIALIZED 0x00000102
+#define CKR_USER_TYPE_INVALID 0x00000103
 
 /* CKR_USER_ANOTHER_ALREADY_LOGGED_IN and CKR_USER_TOO_MANY_TYPES
  * are new to v2.01 */
-#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN    0x00000104
-#define CKR_USER_TOO_MANY_TYPES               0x00000105
+#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN 0x00000104
+#define CKR_USER_TOO_MANY_TYPES 0x00000105
 
-#define CKR_WRAPPED_KEY_INVALID               0x00000110
-#define CKR_WRAPPED_KEY_LEN_RANGE             0x00000112
-#define CKR_WRAPPING_KEY_HANDLE_INVALID       0x00000113
-#define CKR_WRAPPING_KEY_SIZE_RANGE           0x00000114
-#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT    0x00000115
-#define CKR_RANDOM_SEED_NOT_SUPPORTED         0x00000120
+#define CKR_WRAPPED_KEY_INVALID 0x00000110
+#define CKR_WRAPPED_KEY_LEN_RANGE 0x00000112
+#define CKR_WRAPPING_KEY_HANDLE_INVALID 0x00000113
+#define CKR_WRAPPING_KEY_SIZE_RANGE 0x00000114
+#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT 0x00000115
+#define CKR_RANDOM_SEED_NOT_SUPPORTED 0x00000120
 
 /* These are new to v2.0 */
-#define CKR_RANDOM_NO_RNG                     0x00000121
+#define CKR_RANDOM_NO_RNG 0x00000121
 
 /* These are new to v2.11 */
-#define CKR_DOMAIN_PARAMS_INVALID             0x00000130
+#define CKR_DOMAIN_PARAMS_INVALID 0x00000130
 
 /* These are new to v2.0 */
-#define CKR_BUFFER_TOO_SMALL                  0x00000150
-#define CKR_SAVED_STATE_INVALID               0x00000160
-#define CKR_INFORMATION_SENSITIVE             0x00000170
-#define CKR_STATE_UNSAVEABLE                  0x00000180
+#define CKR_BUFFER_TOO_SMALL 0x00000150
+#define CKR_SAVED_STATE_INVALID 0x00000160
+#define CKR_INFORMATION_SENSITIVE 0x00000170
+#define CKR_STATE_UNSAVEABLE 0x00000180
 
 /* These are new to v2.01 */
-#define CKR_CRYPTOKI_NOT_INITIALIZED          0x00000190
-#define CKR_CRYPTOKI_ALREADY_INITIALIZED      0x00000191
-#define CKR_MUTEX_BAD                         0x000001A0
-#define CKR_MUTEX_NOT_LOCKED                  0x000001A1
+#define CKR_CRYPTOKI_NOT_INITIALIZED 0x00000190
+#define CKR_CRYPTOKI_ALREADY_INITIALIZED 0x00000191
+#define CKR_MUTEX_BAD 0x000001A0
+#define CKR_MUTEX_NOT_LOCKED 0x000001A1
 
 /* The following return values are new for PKCS #11 v2.20 amendment 3 */
-#define CKR_NEW_PIN_MODE                      0x000001B0
-#define CKR_NEXT_OTP                          0x000001B1
+#define CKR_NEW_PIN_MODE 0x000001B0
+#define CKR_NEXT_OTP 0x000001B1
 
 /* This is new to v2.20 */
-#define CKR_FUNCTION_REJECTED                 0x00000200
-
-#define CKR_VENDOR_DEFINED                    0x80000000
+#define CKR_FUNCTION_REJECTED 0x00000200
 
+#define CKR_VENDOR_DEFINED 0x80000000
 
 /* CK_NOTIFY is an application callback that processes events */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_NOTIFY)(
-  CK_SESSION_HANDLE hSession,     /* the session's handle */
-  CK_NOTIFICATION   event,
-  CK_VOID_PTR       pApplication  /* passed to C_OpenSession */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_NOTIFY)(CK_SESSION_HANDLE hSession, /* the session's handle */
+                                               CK_NOTIFICATION event,
+                                               CK_VOID_PTR pApplication /* passed to C_OpenSession */
 );
 
-
 /* CK_FUNCTION_LIST is a structure holding a Cryptoki spec
  * version and pointers of appropriate types to all the
  * Cryptoki functions */
@@ -1238,58 +1224,49 @@ typedef CK_FUNCTION_LIST CK_PTR CK_FUNCTION_LIST_PTR;
 
 typedef CK_FUNCTION_LIST_PTR CK_PTR CK_FUNCTION_LIST_PTR_PTR;
 
-
 /* CK_CREATEMUTEX is an application callback for creating a
  * mutex object */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_CREATEMUTEX)(
-  CK_VOID_PTR_PTR ppMutex  /* location to receive ptr to mutex */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_CREATEMUTEX)(CK_VOID_PTR_PTR ppMutex /* location to receive ptr to mutex */
 );
 
-
 /* CK_DESTROYMUTEX is an application callback for destroying a
  * mutex object */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_DESTROYMUTEX)(
-  CK_VOID_PTR pMutex  /* pointer to mutex */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_DESTROYMUTEX)(CK_VOID_PTR pMutex /* pointer to mutex */
 );
 
-
 /* CK_LOCKMUTEX is an application callback for locking a mutex */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_LOCKMUTEX)(
-  CK_VOID_PTR pMutex  /* pointer to mutex */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_LOCKMUTEX)(CK_VOID_PTR pMutex /* pointer to mutex */
 );
 
-
 /* CK_UNLOCKMUTEX is an application callback for unlocking a
  * mutex */
-typedef CK_CALLBACK_FUNCTION(CK_RV, CK_UNLOCKMUTEX)(
-  CK_VOID_PTR pMutex  /* pointer to mutex */
+typedef CK_CALLBACK_FUNCTION(CK_RV, CK_UNLOCKMUTEX)(CK_VOID_PTR pMutex /* pointer to mutex */
 );
 
-
 /* CK_C_INITIALIZE_ARGS provides the optional arguments to
  * C_Initialize */
-typedef struct CK_C_INITIALIZE_ARGS {
-  CK_CREATEMUTEX CreateMutex;
-  CK_DESTROYMUTEX DestroyMutex;
-  CK_LOCKMUTEX LockMutex;
-  CK_UNLOCKMUTEX UnlockMutex;
-  CK_FLAGS flags;
-  CK_VOID_PTR pReserved;
+typedef struct CK_C_INITIALIZE_ARGS
+{
+    CK_CREATEMUTEX CreateMutex;
+    CK_DESTROYMUTEX DestroyMutex;
+    CK_LOCKMUTEX LockMutex;
+    CK_UNLOCKMUTEX UnlockMutex;
+    CK_FLAGS flags;
+    CK_VOID_PTR pReserved;
 } CK_C_INITIALIZE_ARGS;
 
 /* flags: bit flags that provide capabilities of the slot
  *      Bit Flag                           Mask       Meaning
  */
 #define CKF_LIBRARY_CANT_CREATE_OS_THREADS 0x00000001
-#define CKF_OS_LOCKING_OK                  0x00000002
+#define CKF_OS_LOCKING_OK 0x00000002
 
 typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR;
 
-
 /* additional flags for parameters to functions */
 
 /* CKF_DONT_BLOCK is for the function C_WaitForSlotEvent */
-#define CKF_DONT_BLOCK     1
+#define CKF_DONT_BLOCK 1
 
 /* CK_RSA_PKCS_OAEP_MGF_TYPE is new for v2.10.
  * CK_RSA_PKCS_OAEP_MGF_TYPE  is used to indicate the Message
@@ -1303,12 +1280,12 @@ typedef CK_RSA_PKCS_MGF_TYPE CK_PTR CK_RSA_PKCS_MGF_TYPE_PTR;
 /* The following MGFs are defined */
 /* CKG_MGF1_SHA256, CKG_MGF1_SHA384, and CKG_MGF1_SHA512
  * are new for v2.20 */
-#define CKG_MGF1_SHA1         0x00000001
-#define CKG_MGF1_SHA256       0x00000002
-#define CKG_MGF1_SHA384       0x00000003
-#define CKG_MGF1_SHA512       0x00000004
+#define CKG_MGF1_SHA1 0x00000001
+#define CKG_MGF1_SHA256 0x00000002
+#define CKG_MGF1_SHA384 0x00000003
+#define CKG_MGF1_SHA512 0x00000004
 /* SHA-224 is new for PKCS #11 v2.20 amendment 3 */
-#define CKG_MGF1_SHA224       0x00000005
+#define CKG_MGF1_SHA224 0x00000005
 
 /* CK_RSA_PKCS_OAEP_SOURCE_TYPE is new for v2.10.
  * CK_RSA_PKCS_OAEP_SOURCE_TYPE  is used to indicate the source
@@ -1319,17 +1296,18 @@ typedef CK_ULONG CK_RSA_PKCS_OAEP_SOURCE_TYPE;
 typedef CK_RSA_PKCS_OAEP_SOURCE_TYPE CK_PTR CK_RSA_PKCS_OAEP_SOURCE_TYPE_PTR;
 
 /* The following encoding parameter sources are defined */
-#define CKZ_DATA_SPECIFIED    0x00000001
+#define CKZ_DATA_SPECIFIED 0x00000001
 
 /* CK_RSA_PKCS_OAEP_PARAMS is new for v2.10.
  * CK_RSA_PKCS_OAEP_PARAMS provides the parameters to the
  * CKM_RSA_PKCS_OAEP mechanism. */
-typedef struct CK_RSA_PKCS_OAEP_PARAMS {
-        CK_MECHANISM_TYPE hashAlg;
-        CK_RSA_PKCS_MGF_TYPE mgf;
-        CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
-        CK_VOID_PTR pSourceData;
-        CK_ULONG ulSourceDataLen;
+typedef struct CK_RSA_PKCS_OAEP_PARAMS
+{
+    CK_MECHANISM_TYPE hashAlg;
+    CK_RSA_PKCS_MGF_TYPE mgf;
+    CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
+    CK_VOID_PTR pSourceData;
+    CK_ULONG ulSourceDataLen;
 } CK_RSA_PKCS_OAEP_PARAMS;
 
 typedef CK_RSA_PKCS_OAEP_PARAMS CK_PTR CK_RSA_PKCS_OAEP_PARAMS_PTR;
@@ -1337,10 +1315,11 @@ typedef CK_RSA_PKCS_OAEP_PARAMS CK_PTR CK_RSA_PKCS_OAEP_PARAMS_PTR;
 /* CK_RSA_PKCS_PSS_PARAMS is new for v2.11.
  * CK_RSA_PKCS_PSS_PARAMS provides the parameters to the
  * CKM_RSA_PKCS_PSS mechanism(s). */
-typedef struct CK_RSA_PKCS_PSS_PARAMS {
-        CK_MECHANISM_TYPE    hashAlg;
-        CK_RSA_PKCS_MGF_TYPE mgf;
-        CK_ULONG             sLen;
+typedef struct CK_RSA_PKCS_PSS_PARAMS
+{
+    CK_MECHANISM_TYPE hashAlg;
+    CK_RSA_PKCS_MGF_TYPE mgf;
+    CK_ULONG sLen;
 } CK_RSA_PKCS_PSS_PARAMS;
 
 typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR;
@@ -1349,64 +1328,66 @@ typedef CK_RSA_PKCS_PSS_PARAMS CK_PTR CK_RSA_PKCS_PSS_PARAMS_PTR;
 typedef CK_ULONG CK_EC_KDF_TYPE;
 
 /* The following EC Key Derivation Functions are defined */
-#define CKD_NULL                 0x00000001
-#define CKD_SHA1_KDF             0x00000002
-
-typedef struct CK_GCM_PARAMS {
-  CK_BYTE_PTR pIv;
-  CK_ULONG ulIvLen;
-  CK_BYTE_PTR pAAD;
-  CK_ULONG ulAADLen;
-  CK_ULONG ulTagBits;
+#define CKD_NULL 0x00000001
+#define CKD_SHA1_KDF 0x00000002
+
+typedef struct CK_GCM_PARAMS
+{
+    CK_BYTE_PTR pIv;
+    CK_ULONG ulIvLen;
+    CK_BYTE_PTR pAAD;
+    CK_ULONG ulAADLen;
+    CK_ULONG ulTagBits;
 } CK_GCM_PARAMS;
 
 typedef CK_GCM_PARAMS CK_GCM_PARAMS_PTR;
 
-
 /* CK_ECDH1_DERIVE_PARAMS is new for v2.11.
  * CK_ECDH1_DERIVE_PARAMS provides the parameters to the
  * CKM_ECDH1_DERIVE and CKM_ECDH1_COFACTOR_DERIVE mechanisms,
  * where each party contributes one key pair.
  */
-typedef struct CK_ECDH1_DERIVE_PARAMS {
-  CK_EC_KDF_TYPE kdf;
-  CK_ULONG ulSharedDataLen;
-  CK_BYTE_PTR pSharedData;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
+typedef struct CK_ECDH1_DERIVE_PARAMS
+{
+    CK_EC_KDF_TYPE kdf;
+    CK_ULONG ulSharedDataLen;
+    CK_BYTE_PTR pSharedData;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
 } CK_ECDH1_DERIVE_PARAMS;
 
 typedef CK_ECDH1_DERIVE_PARAMS CK_PTR CK_ECDH1_DERIVE_PARAMS_PTR;
 
-
 /* CK_ECDH2_DERIVE_PARAMS is new for v2.11.
  * CK_ECDH2_DERIVE_PARAMS provides the parameters to the
  * CKM_ECMQV_DERIVE mechanism, where each party contributes two key pairs. */
-typedef struct CK_ECDH2_DERIVE_PARAMS {
-  CK_EC_KDF_TYPE kdf;
-  CK_ULONG ulSharedDataLen;
-  CK_BYTE_PTR pSharedData;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
+typedef struct CK_ECDH2_DERIVE_PARAMS
+{
+    CK_EC_KDF_TYPE kdf;
+    CK_ULONG ulSharedDataLen;
+    CK_BYTE_PTR pSharedData;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
+    CK_ULONG ulPrivateDataLen;
+    CK_OBJECT_HANDLE hPrivateData;
+    CK_ULONG ulPublicDataLen2;
+    CK_BYTE_PTR pPublicData2;
 } CK_ECDH2_DERIVE_PARAMS;
 
 typedef CK_ECDH2_DERIVE_PARAMS CK_PTR CK_ECDH2_DERIVE_PARAMS_PTR;
 
-typedef struct CK_ECMQV_DERIVE_PARAMS {
-  CK_EC_KDF_TYPE kdf;
-  CK_ULONG ulSharedDataLen;
-  CK_BYTE_PTR pSharedData;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
-  CK_OBJECT_HANDLE publicKey;
+typedef struct CK_ECMQV_DERIVE_PARAMS
+{
+    CK_EC_KDF_TYPE kdf;
+    CK_ULONG ulSharedDataLen;
+    CK_BYTE_PTR pSharedData;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
+    CK_ULONG ulPrivateDataLen;
+    CK_OBJECT_HANDLE hPrivateData;
+    CK_ULONG ulPublicDataLen2;
+    CK_BYTE_PTR pPublicData2;
+    CK_OBJECT_HANDLE publicKey;
 } CK_ECMQV_DERIVE_PARAMS;
 
 typedef CK_ECMQV_DERIVE_PARAMS CK_PTR CK_ECMQV_DERIVE_PARAMS_PTR;
@@ -1418,19 +1399,20 @@ typedef CK_X9_42_DH_KDF_TYPE CK_PTR CK_X9_42_DH_KDF_TYPE_PTR;
 
 /* The following X9.42 DH key derivation functions are defined
    (besides CKD_NULL already defined : */
-#define CKD_SHA1_KDF_ASN1        0x00000003
+#define CKD_SHA1_KDF_ASN1 0x00000003
 #define CKD_SHA1_KDF_CONCATENATE 0x00000004
 
 /* CK_X9_42_DH1_DERIVE_PARAMS is new for v2.11.
  * CK_X9_42_DH1_DERIVE_PARAMS provides the parameters to the
  * CKM_X9_42_DH_DERIVE key derivation mechanism, where each party
  * contributes one key pair */
-typedef struct CK_X9_42_DH1_DERIVE_PARAMS {
-  CK_X9_42_DH_KDF_TYPE kdf;
-  CK_ULONG ulOtherInfoLen;
-  CK_BYTE_PTR pOtherInfo;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
+typedef struct CK_X9_42_DH1_DERIVE_PARAMS
+{
+    CK_X9_42_DH_KDF_TYPE kdf;
+    CK_ULONG ulOtherInfoLen;
+    CK_BYTE_PTR pOtherInfo;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
 } CK_X9_42_DH1_DERIVE_PARAMS;
 
 typedef struct CK_X9_42_DH1_DERIVE_PARAMS CK_PTR CK_X9_42_DH1_DERIVE_PARAMS_PTR;
@@ -1439,31 +1421,33 @@ typedef struct CK_X9_42_DH1_DERIVE_PARAMS CK_PTR CK_X9_42_DH1_DERIVE_PARAMS_PTR;
  * CK_X9_42_DH2_DERIVE_PARAMS provides the parameters to the
  * CKM_X9_42_DH_HYBRID_DERIVE and CKM_X9_42_MQV_DERIVE key derivation
  * mechanisms, where each party contributes two key pairs */
-typedef struct CK_X9_42_DH2_DERIVE_PARAMS {
-  CK_X9_42_DH_KDF_TYPE kdf;
-  CK_ULONG ulOtherInfoLen;
-  CK_BYTE_PTR pOtherInfo;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
+typedef struct CK_X9_42_DH2_DERIVE_PARAMS
+{
+    CK_X9_42_DH_KDF_TYPE kdf;
+    CK_ULONG ulOtherInfoLen;
+    CK_BYTE_PTR pOtherInfo;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
+    CK_ULONG ulPrivateDataLen;
+    CK_OBJECT_HANDLE hPrivateData;
+    CK_ULONG ulPublicDataLen2;
+    CK_BYTE_PTR pPublicData2;
 } CK_X9_42_DH2_DERIVE_PARAMS;
 
 typedef CK_X9_42_DH2_DERIVE_PARAMS CK_PTR CK_X9_42_DH2_DERIVE_PARAMS_PTR;
 
-typedef struct CK_X9_42_MQV_DERIVE_PARAMS {
-  CK_X9_42_DH_KDF_TYPE kdf;
-  CK_ULONG ulOtherInfoLen;
-  CK_BYTE_PTR pOtherInfo;
-  CK_ULONG ulPublicDataLen;
-  CK_BYTE_PTR pPublicData;
-  CK_ULONG ulPrivateDataLen;
-  CK_OBJECT_HANDLE hPrivateData;
-  CK_ULONG ulPublicDataLen2;
-  CK_BYTE_PTR pPublicData2;
-  CK_OBJECT_HANDLE publicKey;
+typedef struct CK_X9_42_MQV_DERIVE_PARAMS
+{
+    CK_X9_42_DH_KDF_TYPE kdf;
+    CK_ULONG ulOtherInfoLen;
+    CK_BYTE_PTR pOtherInfo;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
+    CK_ULONG ulPrivateDataLen;
+    CK_OBJECT_HANDLE hPrivateData;
+    CK_ULONG ulPublicDataLen2;
+    CK_BYTE_PTR pPublicData2;
+    CK_OBJECT_HANDLE publicKey;
 } CK_X9_42_MQV_DERIVE_PARAMS;
 
 typedef CK_X9_42_MQV_DERIVE_PARAMS CK_PTR CK_X9_42_MQV_DERIVE_PARAMS_PTR;
@@ -1471,109 +1455,108 @@ typedef CK_X9_42_MQV_DERIVE_PARAMS CK_PTR CK_X9_42_MQV_DERIVE_PARAMS_PTR;
 /* CK_KEA_DERIVE_PARAMS provides the parameters to the
  * CKM_KEA_DERIVE mechanism */
 /* CK_KEA_DERIVE_PARAMS is new for v2.0 */
-typedef struct CK_KEA_DERIVE_PARAMS {
-  CK_BBOOL      isSender;
-  CK_ULONG      ulRandomLen;
-  CK_BYTE_PTR   pRandomA;
-  CK_BYTE_PTR   pRandomB;
-  CK_ULONG      ulPublicDataLen;
-  CK_BYTE_PTR   pPublicData;
+typedef struct CK_KEA_DERIVE_PARAMS
+{
+    CK_BBOOL isSender;
+    CK_ULONG ulRandomLen;
+    CK_BYTE_PTR pRandomA;
+    CK_BYTE_PTR pRandomB;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
 } CK_KEA_DERIVE_PARAMS;
 
 typedef CK_KEA_DERIVE_PARAMS CK_PTR CK_KEA_DERIVE_PARAMS_PTR;
 
-
 /* CK_RC2_PARAMS provides the parameters to the CKM_RC2_ECB and
  * CKM_RC2_MAC mechanisms.  An instance of CK_RC2_PARAMS just
  * holds the effective keysize */
-typedef CK_ULONG          CK_RC2_PARAMS;
+typedef CK_ULONG CK_RC2_PARAMS;
 
 typedef CK_RC2_PARAMS CK_PTR CK_RC2_PARAMS_PTR;
 
-
 /* CK_RC2_CBC_PARAMS provides the parameters to the CKM_RC2_CBC
  * mechanism */
-typedef struct CK_RC2_CBC_PARAMS {
-  /* ulEffectiveBits was changed from CK_USHORT to CK_ULONG for
-   * v2.0 */
-  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
+typedef struct CK_RC2_CBC_PARAMS
+{
+    /* ulEffectiveBits was changed from CK_USHORT to CK_ULONG for
+     * v2.0 */
+    CK_ULONG ulEffectiveBits; /* effective bits (1-1024) */
 
-  CK_BYTE       iv[8];            /* IV for CBC mode */
+    CK_BYTE iv[8]; /* IV for CBC mode */
 } CK_RC2_CBC_PARAMS;
 
 typedef CK_RC2_CBC_PARAMS CK_PTR CK_RC2_CBC_PARAMS_PTR;
 
-
 /* CK_RC2_MAC_GENERAL_PARAMS provides the parameters for the
  * CKM_RC2_MAC_GENERAL mechanism */
 /* CK_RC2_MAC_GENERAL_PARAMS is new for v2.0 */
-typedef struct CK_RC2_MAC_GENERAL_PARAMS {
-  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
-  CK_ULONG      ulMacLength;      /* Length of MAC in bytes */
+typedef struct CK_RC2_MAC_GENERAL_PARAMS
+{
+    CK_ULONG ulEffectiveBits; /* effective bits (1-1024) */
+    CK_ULONG ulMacLength;     /* Length of MAC in bytes */
 } CK_RC2_MAC_GENERAL_PARAMS;
 
-typedef CK_RC2_MAC_GENERAL_PARAMS CK_PTR \
-  CK_RC2_MAC_GENERAL_PARAMS_PTR;
-
+typedef CK_RC2_MAC_GENERAL_PARAMS CK_PTR CK_RC2_MAC_GENERAL_PARAMS_PTR;
 
 /* CK_RC5_PARAMS provides the parameters to the CKM_RC5_ECB and
  * CKM_RC5_MAC mechanisms */
 /* CK_RC5_PARAMS is new for v2.0 */
-typedef struct CK_RC5_PARAMS {
-  CK_ULONG      ulWordsize;  /* wordsize in bits */
-  CK_ULONG      ulRounds;    /* number of rounds */
+typedef struct CK_RC5_PARAMS
+{
+    CK_ULONG ulWordsize; /* wordsize in bits */
+    CK_ULONG ulRounds;   /* number of rounds */
 } CK_RC5_PARAMS;
 
 typedef CK_RC5_PARAMS CK_PTR CK_RC5_PARAMS_PTR;
 
-
 /* CK_RC5_CBC_PARAMS provides the parameters to the CKM_RC5_CBC
  * mechanism */
 /* CK_RC5_CBC_PARAMS is new for v2.0 */
-typedef struct CK_RC5_CBC_PARAMS {
-  CK_ULONG      ulWordsize;  /* wordsize in bits */
-  CK_ULONG      ulRounds;    /* number of rounds */
-  CK_BYTE_PTR   pIv;         /* pointer to IV */
-  CK_ULONG      ulIvLen;     /* length of IV in bytes */
+typedef struct CK_RC5_CBC_PARAMS
+{
+    CK_ULONG ulWordsize; /* wordsize in bits */
+    CK_ULONG ulRounds;   /* number of rounds */
+    CK_BYTE_PTR pIv;     /* pointer to IV */
+    CK_ULONG ulIvLen;    /* length of IV in bytes */
 } CK_RC5_CBC_PARAMS;
 
 typedef CK_RC5_CBC_PARAMS CK_PTR CK_RC5_CBC_PARAMS_PTR;
 
-
 /* CK_RC5_MAC_GENERAL_PARAMS provides the parameters for the
  * CKM_RC5_MAC_GENERAL mechanism */
 /* CK_RC5_MAC_GENERAL_PARAMS is new for v2.0 */
-typedef struct CK_RC5_MAC_GENERAL_PARAMS {
-  CK_ULONG      ulWordsize;   /* wordsize in bits */
-  CK_ULONG      ulRounds;     /* number of rounds */
-  CK_ULONG      ulMacLength;  /* Length of MAC in bytes */
+typedef struct CK_RC5_MAC_GENERAL_PARAMS
+{
+    CK_ULONG ulWordsize;  /* wordsize in bits */
+    CK_ULONG ulRounds;    /* number of rounds */
+    CK_ULONG ulMacLength; /* Length of MAC in bytes */
 } CK_RC5_MAC_GENERAL_PARAMS;
 
-typedef CK_RC5_MAC_GENERAL_PARAMS CK_PTR \
-  CK_RC5_MAC_GENERAL_PARAMS_PTR;
-
+typedef CK_RC5_MAC_GENERAL_PARAMS CK_PTR CK_RC5_MAC_GENERAL_PARAMS_PTR;
 
 /* CK_MAC_GENERAL_PARAMS provides the parameters to most block
  * ciphers' MAC_GENERAL mechanisms.  Its value is the length of
  * the MAC */
 /* CK_MAC_GENERAL_PARAMS is new for v2.0 */
-typedef CK_ULONG          CK_MAC_GENERAL_PARAMS;
+typedef CK_ULONG CK_MAC_GENERAL_PARAMS;
 
 typedef CK_MAC_GENERAL_PARAMS CK_PTR CK_MAC_GENERAL_PARAMS_PTR;
 
 /* CK_DES/AES_ECB/CBC_ENCRYPT_DATA_PARAMS are new for v2.20 */
-typedef struct CK_DES_CBC_ENCRYPT_DATA_PARAMS {
-  CK_BYTE      iv[8];
-  CK_BYTE_PTR  pData;
-  CK_ULONG     length;
+typedef struct CK_DES_CBC_ENCRYPT_DATA_PARAMS
+{
+    CK_BYTE iv[8];
+    CK_BYTE_PTR pData;
+    CK_ULONG length;
 } CK_DES_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_DES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_DES_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
-typedef struct CK_AES_CBC_ENCRYPT_DATA_PARAMS {
-  CK_BYTE      iv[16];
-  CK_BYTE_PTR  pData;
-  CK_ULONG     length;
+typedef struct CK_AES_CBC_ENCRYPT_DATA_PARAMS
+{
+    CK_BYTE iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG length;
 } CK_AES_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR;
@@ -1581,199 +1564,201 @@ typedef CK_AES_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_AES_CBC_ENCRYPT_DATA_PARAMS_PTR
 /* CK_SKIPJACK_PRIVATE_WRAP_PARAMS provides the parameters to the
  * CKM_SKIPJACK_PRIVATE_WRAP mechanism */
 /* CK_SKIPJACK_PRIVATE_WRAP_PARAMS is new for v2.0 */
-typedef struct CK_SKIPJACK_PRIVATE_WRAP_PARAMS {
-  CK_ULONG      ulPasswordLen;
-  CK_BYTE_PTR   pPassword;
-  CK_ULONG      ulPublicDataLen;
-  CK_BYTE_PTR   pPublicData;
-  CK_ULONG      ulPAndGLen;
-  CK_ULONG      ulQLen;
-  CK_ULONG      ulRandomLen;
-  CK_BYTE_PTR   pRandomA;
-  CK_BYTE_PTR   pPrimeP;
-  CK_BYTE_PTR   pBaseG;
-  CK_BYTE_PTR   pSubprimeQ;
+typedef struct CK_SKIPJACK_PRIVATE_WRAP_PARAMS
+{
+    CK_ULONG ulPasswordLen;
+    CK_BYTE_PTR pPassword;
+    CK_ULONG ulPublicDataLen;
+    CK_BYTE_PTR pPublicData;
+    CK_ULONG ulPAndGLen;
+    CK_ULONG ulQLen;
+    CK_ULONG ulRandomLen;
+    CK_BYTE_PTR pRandomA;
+    CK_BYTE_PTR pPrimeP;
+    CK_BYTE_PTR pBaseG;
+    CK_BYTE_PTR pSubprimeQ;
 } CK_SKIPJACK_PRIVATE_WRAP_PARAMS;
 
-typedef CK_SKIPJACK_PRIVATE_WRAP_PARAMS CK_PTR \
-  CK_SKIPJACK_PRIVATE_WRAP_PTR;
-
+typedef CK_SKIPJACK_PRIVATE_WRAP_PARAMS CK_PTR CK_SKIPJACK_PRIVATE_WRAP_PTR;
 
 /* CK_SKIPJACK_RELAYX_PARAMS provides the parameters to the
  * CKM_SKIPJACK_RELAYX mechanism */
 /* CK_SKIPJACK_RELAYX_PARAMS is new for v2.0 */
-typedef struct CK_SKIPJACK_RELAYX_PARAMS {
-  CK_ULONG      ulOldWrappedXLen;
-  CK_BYTE_PTR   pOldWrappedX;
-  CK_ULONG      ulOldPasswordLen;
-  CK_BYTE_PTR   pOldPassword;
-  CK_ULONG      ulOldPublicDataLen;
-  CK_BYTE_PTR   pOldPublicData;
-  CK_ULONG      ulOldRandomLen;
-  CK_BYTE_PTR   pOldRandomA;
-  CK_ULONG      ulNewPasswordLen;
-  CK_BYTE_PTR   pNewPassword;
-  CK_ULONG      ulNewPublicDataLen;
-  CK_BYTE_PTR   pNewPublicData;
-  CK_ULONG      ulNewRandomLen;
-  CK_BYTE_PTR   pNewRandomA;
+typedef struct CK_SKIPJACK_RELAYX_PARAMS
+{
+    CK_ULONG ulOldWrappedXLen;
+    CK_BYTE_PTR pOldWrappedX;
+    CK_ULONG ulOldPasswordLen;
+    CK_BYTE_PTR pOldPassword;
+    CK_ULONG ulOldPublicDataLen;
+    CK_BYTE_PTR pOldPublicData;
+    CK_ULONG ulOldRandomLen;
+    CK_BYTE_PTR pOldRandomA;
+    CK_ULONG ulNewPasswordLen;
+    CK_BYTE_PTR pNewPassword;
+    CK_ULONG ulNewPublicDataLen;
+    CK_BYTE_PTR pNewPublicData;
+    CK_ULONG ulNewRandomLen;
+    CK_BYTE_PTR pNewRandomA;
 } CK_SKIPJACK_RELAYX_PARAMS;
 
-typedef CK_SKIPJACK_RELAYX_PARAMS CK_PTR \
-  CK_SKIPJACK_RELAYX_PARAMS_PTR;
+typedef CK_SKIPJACK_RELAYX_PARAMS CK_PTR CK_SKIPJACK_RELAYX_PARAMS_PTR;
 
-
-typedef struct CK_PBE_PARAMS {
-  CK_BYTE_PTR      pInitVector;
-  CK_UTF8CHAR_PTR  pPassword;
-  CK_ULONG         ulPasswordLen;
-  CK_BYTE_PTR      pSalt;
-  CK_ULONG         ulSaltLen;
-  CK_ULONG         ulIteration;
+typedef struct CK_PBE_PARAMS
+{
+    CK_BYTE_PTR pInitVector;
+    CK_UTF8CHAR_PTR pPassword;
+    CK_ULONG ulPasswordLen;
+    CK_BYTE_PTR pSalt;
+    CK_ULONG ulSaltLen;
+    CK_ULONG ulIteration;
 } CK_PBE_PARAMS;
 
 typedef CK_PBE_PARAMS CK_PTR CK_PBE_PARAMS_PTR;
 
-
 /* CK_KEY_WRAP_SET_OAEP_PARAMS provides the parameters to the
  * CKM_KEY_WRAP_SET_OAEP mechanism */
 /* CK_KEY_WRAP_SET_OAEP_PARAMS is new for v2.0 */
-typedef struct CK_KEY_WRAP_SET_OAEP_PARAMS {
-  CK_BYTE       bBC;     /* block contents byte */
-  CK_BYTE_PTR   pX;      /* extra data */
-  CK_ULONG      ulXLen;  /* length of extra data in bytes */
+typedef struct CK_KEY_WRAP_SET_OAEP_PARAMS
+{
+    CK_BYTE bBC;     /* block contents byte */
+    CK_BYTE_PTR pX;  /* extra data */
+    CK_ULONG ulXLen; /* length of extra data in bytes */
 } CK_KEY_WRAP_SET_OAEP_PARAMS;
 
-typedef CK_KEY_WRAP_SET_OAEP_PARAMS CK_PTR \
-  CK_KEY_WRAP_SET_OAEP_PARAMS_PTR;
-
+typedef CK_KEY_WRAP_SET_OAEP_PARAMS CK_PTR CK_KEY_WRAP_SET_OAEP_PARAMS_PTR;
 
-typedef struct CK_SSL3_RANDOM_DATA {
-  CK_BYTE_PTR  pClientRandom;
-  CK_ULONG     ulClientRandomLen;
-  CK_BYTE_PTR  pServerRandom;
-  CK_ULONG     ulServerRandomLen;
+typedef struct CK_SSL3_RANDOM_DATA
+{
+    CK_BYTE_PTR pClientRandom;
+    CK_ULONG ulClientRandomLen;
+    CK_BYTE_PTR pServerRandom;
+    CK_ULONG ulServerRandomLen;
 } CK_SSL3_RANDOM_DATA;
 
-
-typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS {
-  CK_SSL3_RANDOM_DATA RandomInfo;
-  CK_VERSION_PTR pVersion;
+typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS
+{
+    CK_SSL3_RANDOM_DATA RandomInfo;
+    CK_VERSION_PTR pVersion;
 } CK_SSL3_MASTER_KEY_DERIVE_PARAMS;
 
-typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS CK_PTR \
-  CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
-
+typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS CK_PTR CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
 
-typedef struct CK_SSL3_KEY_MAT_OUT {
-  CK_OBJECT_HANDLE hClientMacSecret;
-  CK_OBJECT_HANDLE hServerMacSecret;
-  CK_OBJECT_HANDLE hClientKey;
-  CK_OBJECT_HANDLE hServerKey;
-  CK_BYTE_PTR      pIVClient;
-  CK_BYTE_PTR      pIVServer;
+typedef struct CK_SSL3_KEY_MAT_OUT
+{
+    CK_OBJECT_HANDLE hClientMacSecret;
+    CK_OBJECT_HANDLE hServerMacSecret;
+    CK_OBJECT_HANDLE hClientKey;
+    CK_OBJECT_HANDLE hServerKey;
+    CK_BYTE_PTR pIVClient;
+    CK_BYTE_PTR pIVServer;
 } CK_SSL3_KEY_MAT_OUT;
 
 typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR;
 
-
-typedef struct CK_SSL3_KEY_MAT_PARAMS {
-  CK_ULONG                ulMacSizeInBits;
-  CK_ULONG                ulKeySizeInBits;
-  CK_ULONG                ulIVSizeInBits;
-  CK_BBOOL                bIsExport;
-  CK_SSL3_RANDOM_DATA     RandomInfo;
-  CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+typedef struct CK_SSL3_KEY_MAT_PARAMS
+{
+    CK_ULONG ulMacSizeInBits;
+    CK_ULONG ulKeySizeInBits;
+    CK_ULONG ulIVSizeInBits;
+    CK_BBOOL bIsExport;
+    CK_SSL3_RANDOM_DATA RandomInfo;
+    CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
 } CK_SSL3_KEY_MAT_PARAMS;
 
 typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR;
 
 /* CK_TLS_PRF_PARAMS is new for version 2.20 */
-typedef struct CK_TLS_PRF_PARAMS {
-  CK_BYTE_PTR  pSeed;
-  CK_ULONG     ulSeedLen;
-  CK_BYTE_PTR  pLabel;
-  CK_ULONG     ulLabelLen;
-  CK_BYTE_PTR  pOutput;
-  CK_ULONG_PTR pulOutputLen;
+typedef struct CK_TLS_PRF_PARAMS
+{
+    CK_BYTE_PTR pSeed;
+    CK_ULONG ulSeedLen;
+    CK_BYTE_PTR pLabel;
+    CK_ULONG ulLabelLen;
+    CK_BYTE_PTR pOutput;
+    CK_ULONG_PTR pulOutputLen;
 } CK_TLS_PRF_PARAMS;
 
 typedef CK_TLS_PRF_PARAMS CK_PTR CK_TLS_PRF_PARAMS_PTR;
 
 /* WTLS is new for version 2.20 */
-typedef struct CK_WTLS_RANDOM_DATA {
-  CK_BYTE_PTR pClientRandom;
-  CK_ULONG    ulClientRandomLen;
-  CK_BYTE_PTR pServerRandom;
-  CK_ULONG    ulServerRandomLen;
+typedef struct CK_WTLS_RANDOM_DATA
+{
+    CK_BYTE_PTR pClientRandom;
+    CK_ULONG ulClientRandomLen;
+    CK_BYTE_PTR pServerRandom;
+    CK_ULONG ulServerRandomLen;
 } CK_WTLS_RANDOM_DATA;
 
 typedef CK_WTLS_RANDOM_DATA CK_PTR CK_WTLS_RANDOM_DATA_PTR;
 
-typedef struct CK_WTLS_MASTER_KEY_DERIVE_PARAMS {
-  CK_MECHANISM_TYPE   DigestMechanism;
-  CK_WTLS_RANDOM_DATA RandomInfo;
-  CK_BYTE_PTR         pVersion;
+typedef struct CK_WTLS_MASTER_KEY_DERIVE_PARAMS
+{
+    CK_MECHANISM_TYPE DigestMechanism;
+    CK_WTLS_RANDOM_DATA RandomInfo;
+    CK_BYTE_PTR pVersion;
 } CK_WTLS_MASTER_KEY_DERIVE_PARAMS;
 
-typedef CK_WTLS_MASTER_KEY_DERIVE_PARAMS CK_PTR \
-  CK_WTLS_MASTER_KEY_DERIVE_PARAMS_PTR;
-
-typedef struct CK_WTLS_PRF_PARAMS {
-  CK_MECHANISM_TYPE DigestMechanism;
-  CK_BYTE_PTR       pSeed;
-  CK_ULONG          ulSeedLen;
-  CK_BYTE_PTR       pLabel;
-  CK_ULONG          ulLabelLen;
-  CK_BYTE_PTR       pOutput;
-  CK_ULONG_PTR      pulOutputLen;
+typedef CK_WTLS_MASTER_KEY_DERIVE_PARAMS CK_PTR CK_WTLS_MASTER_KEY_DERIVE_PARAMS_PTR;
+
+typedef struct CK_WTLS_PRF_PARAMS
+{
+    CK_MECHANISM_TYPE DigestMechanism;
+    CK_BYTE_PTR pSeed;
+    CK_ULONG ulSeedLen;
+    CK_BYTE_PTR pLabel;
+    CK_ULONG ulLabelLen;
+    CK_BYTE_PTR pOutput;
+    CK_ULONG_PTR pulOutputLen;
 } CK_WTLS_PRF_PARAMS;
 
 typedef CK_WTLS_PRF_PARAMS CK_PTR CK_WTLS_PRF_PARAMS_PTR;
 
-typedef struct CK_WTLS_KEY_MAT_OUT {
-  CK_OBJECT_HANDLE hMacSecret;
-  CK_OBJECT_HANDLE hKey;
-  CK_BYTE_PTR      pIV;
+typedef struct CK_WTLS_KEY_MAT_OUT
+{
+    CK_OBJECT_HANDLE hMacSecret;
+    CK_OBJECT_HANDLE hKey;
+    CK_BYTE_PTR pIV;
 } CK_WTLS_KEY_MAT_OUT;
 
 typedef CK_WTLS_KEY_MAT_OUT CK_PTR CK_WTLS_KEY_MAT_OUT_PTR;
 
-typedef struct CK_WTLS_KEY_MAT_PARAMS {
-  CK_MECHANISM_TYPE       DigestMechanism;
-  CK_ULONG                ulMacSizeInBits;
-  CK_ULONG                ulKeySizeInBits;
-  CK_ULONG                ulIVSizeInBits;
-  CK_ULONG                ulSequenceNumber;
-  CK_BBOOL                bIsExport;
-  CK_WTLS_RANDOM_DATA     RandomInfo;
-  CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
+typedef struct CK_WTLS_KEY_MAT_PARAMS
+{
+    CK_MECHANISM_TYPE DigestMechanism;
+    CK_ULONG ulMacSizeInBits;
+    CK_ULONG ulKeySizeInBits;
+    CK_ULONG ulIVSizeInBits;
+    CK_ULONG ulSequenceNumber;
+    CK_BBOOL bIsExport;
+    CK_WTLS_RANDOM_DATA RandomInfo;
+    CK_WTLS_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
 } CK_WTLS_KEY_MAT_PARAMS;
 
 typedef CK_WTLS_KEY_MAT_PARAMS CK_PTR CK_WTLS_KEY_MAT_PARAMS_PTR;
 
 /* CMS is new for version 2.20 */
-typedef struct CK_CMS_SIG_PARAMS {
-  CK_OBJECT_HANDLE      certificateHandle;
-  CK_MECHANISM_PTR      pSigningMechanism;
-  CK_MECHANISM_PTR      pDigestMechanism;
-  CK_UTF8CHAR_PTR       pContentType;
-  CK_BYTE_PTR           pRequestedAttributes;
-  CK_ULONG              ulRequestedAttributesLen;
-  CK_BYTE_PTR           pRequiredAttributes;
-  CK_ULONG              ulRequiredAttributesLen;
+typedef struct CK_CMS_SIG_PARAMS
+{
+    CK_OBJECT_HANDLE certificateHandle;
+    CK_MECHANISM_PTR pSigningMechanism;
+    CK_MECHANISM_PTR pDigestMechanism;
+    CK_UTF8CHAR_PTR pContentType;
+    CK_BYTE_PTR pRequestedAttributes;
+    CK_ULONG ulRequestedAttributesLen;
+    CK_BYTE_PTR pRequiredAttributes;
+    CK_ULONG ulRequiredAttributesLen;
 } CK_CMS_SIG_PARAMS;
 
 typedef CK_CMS_SIG_PARAMS CK_PTR CK_CMS_SIG_PARAMS_PTR;
 
-typedef struct CK_KEY_DERIVATION_STRING_DATA {
-  CK_BYTE_PTR pData;
-  CK_ULONG    ulLen;
+typedef struct CK_KEY_DERIVATION_STRING_DATA
+{
+    CK_BYTE_PTR pData;
+    CK_ULONG ulLen;
 } CK_KEY_DERIVATION_STRING_DATA;
 
-typedef CK_KEY_DERIVATION_STRING_DATA CK_PTR \
-  CK_KEY_DERIVATION_STRING_DATA_PTR;
-
+typedef CK_KEY_DERIVATION_STRING_DATA CK_PTR CK_KEY_DERIVATION_STRING_DATA_PTR;
 
 /* The CK_EXTRACT_PARAMS is used for the
  * CKM_EXTRACT_KEY_FROM_KEY mechanism.  It specifies which bit
@@ -1795,7 +1780,6 @@ typedef CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE CK_PTR CK_PKCS5_PBKD2_PSEUDO_
 /* The following PRFs are defined in PKCS #5 v2.0. */
 #define CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
 
-
 /* CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is new for v2.10.
  * CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is used to indicate the
  * source of the salt value when deriving a key using PKCS #5
@@ -1805,22 +1789,23 @@ typedef CK_ULONG CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE;
 typedef CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE CK_PTR CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE_PTR;
 
 /* The following salt value sources are defined in PKCS #5 v2.0. */
-#define CKZ_SALT_SPECIFIED        0x00000001
+#define CKZ_SALT_SPECIFIED 0x00000001
 
 /* CK_PKCS5_PBKD2_PARAMS is new for v2.10.
  * CK_PKCS5_PBKD2_PARAMS is a structure that provides the
  * parameters to the CKM_PKCS5_PBKD2 mechanism. */
-typedef struct CK_PKCS5_PBKD2_PARAMS {
-        CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE           saltSource;
-        CK_VOID_PTR                                pSaltSourceData;
-        CK_ULONG                                   ulSaltSourceDataLen;
-        CK_ULONG                                   iterations;
-        CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
-        CK_VOID_PTR                                pPrfData;
-        CK_ULONG                                   ulPrfDataLen;
-        CK_UTF8CHAR_PTR                            pPassword;
-        //CK_ULONG_PTR                               ulPasswordLen;
-		CK_ULONG	                               ulPasswordLen;
+typedef struct CK_PKCS5_PBKD2_PARAMS
+{
+    CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE saltSource;
+    CK_VOID_PTR pSaltSourceData;
+    CK_ULONG ulSaltSourceDataLen;
+    CK_ULONG iterations;
+    CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
+    CK_VOID_PTR pPrfData;
+    CK_ULONG ulPrfDataLen;
+    CK_UTF8CHAR_PTR pPassword;
+    // CK_ULONG_PTR                               ulPasswordLen;
+    CK_ULONG ulPasswordLen;
 } CK_PKCS5_PBKD2_PARAMS;
 
 typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
@@ -1830,7 +1815,8 @@ typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
 typedef CK_ULONG CK_OTP_PARAM_TYPE;
 typedef CK_OTP_PARAM_TYPE CK_PARAM_TYPE; /* B/w compatibility */
 
-typedef struct CK_OTP_PARAM {
+typedef struct CK_OTP_PARAM
+{
     CK_OTP_PARAM_TYPE type;
     CK_VOID_PTR pValue;
     CK_ULONG ulValueLen;
@@ -1838,14 +1824,16 @@ typedef struct CK_OTP_PARAM {
 
 typedef CK_OTP_PARAM CK_PTR CK_OTP_PARAM_PTR;
 
-typedef struct CK_OTP_PARAMS {
+typedef struct CK_OTP_PARAMS
+{
     CK_OTP_PARAM_PTR pParams;
     CK_ULONG ulCount;
 } CK_OTP_PARAMS;
 
 typedef CK_OTP_PARAMS CK_PTR CK_OTP_PARAMS_PTR;
 
-typedef struct CK_OTP_SIGNATURE_INFO {
+typedef struct CK_OTP_SIGNATURE_INFO
+{
     CK_OTP_PARAM_PTR pParams;
     CK_ULONG ulCount;
 } CK_OTP_SIGNATURE_INFO;
@@ -1853,35 +1841,37 @@ typedef struct CK_OTP_SIGNATURE_INFO {
 typedef CK_OTP_SIGNATURE_INFO CK_PTR CK_OTP_SIGNATURE_INFO_PTR;
 
 /* The following OTP-related defines are new for PKCS #11 v2.20 amendment 1 */
-#define CK_OTP_VALUE          0
-#define CK_OTP_PIN            1
-#define CK_OTP_CHALLENGE      2
-#define CK_OTP_TIME           3
-#define CK_OTP_COUNTER        4
-#define CK_OTP_FLAGS          5
-#define CK_OTP_OUTPUT_LENGTH  6
-#define CK_OTP_OUTPUT_FORMAT  7
+#define CK_OTP_VALUE 0
+#define CK_OTP_PIN 1
+#define CK_OTP_CHALLENGE 2
+#define CK_OTP_TIME 3
+#define CK_OTP_COUNTER 4
+#define CK_OTP_FLAGS 5
+#define CK_OTP_OUTPUT_LENGTH 6
+#define CK_OTP_OUTPUT_FORMAT 7
 
 /* The following OTP-related defines are new for PKCS #11 v2.20 amendment 1 */
-#define CKF_NEXT_OTP          0x00000001
-#define CKF_EXCLUDE_TIME      0x00000002
-#define CKF_EXCLUDE_COUNTER   0x00000004
+#define CKF_NEXT_OTP 0x00000001
+#define CKF_EXCLUDE_TIME 0x00000002
+#define CKF_EXCLUDE_COUNTER 0x00000004
 #define CKF_EXCLUDE_CHALLENGE 0x00000008
-#define CKF_EXCLUDE_PIN       0x00000010
+#define CKF_EXCLUDE_PIN 0x00000010
 #define CKF_USER_FRIENDLY_OTP 0x00000020
 
 /* CK_KIP_PARAMS is new for PKCS #11 v2.20 amendment 2 */
-typedef struct CK_KIP_PARAMS {
-    CK_MECHANISM_PTR  pMechanism;
-    CK_OBJECT_HANDLE  hKey;
-    CK_BYTE_PTR       pSeed;
-    CK_ULONG          ulSeedLen;
+typedef struct CK_KIP_PARAMS
+{
+    CK_MECHANISM_PTR pMechanism;
+    CK_OBJECT_HANDLE hKey;
+    CK_BYTE_PTR pSeed;
+    CK_ULONG ulSeedLen;
 } CK_KIP_PARAMS;
 
 typedef CK_KIP_PARAMS CK_PTR CK_KIP_PARAMS_PTR;
 
 /* CK_AES_CTR_PARAMS is new for PKCS #11 v2.20 amendment 3 */
-typedef struct CK_AES_CTR_PARAMS {
+typedef struct CK_AES_CTR_PARAMS
+{
     CK_ULONG ulCounterBits;
     CK_BYTE cb[16];
 } CK_AES_CTR_PARAMS;
@@ -1889,7 +1879,8 @@ typedef struct CK_AES_CTR_PARAMS {
 typedef CK_AES_CTR_PARAMS CK_PTR CK_AES_CTR_PARAMS_PTR;
 
 /* CK_CAMELLIA_CTR_PARAMS is new for PKCS #11 v2.20 amendment 3 */
-typedef struct CK_CAMELLIA_CTR_PARAMS {
+typedef struct CK_CAMELLIA_CTR_PARAMS
+{
     CK_ULONG ulCounterBits;
     CK_BYTE cb[16];
 } CK_CAMELLIA_CTR_PARAMS;
@@ -1897,22 +1888,23 @@ typedef struct CK_CAMELLIA_CTR_PARAMS {
 typedef CK_CAMELLIA_CTR_PARAMS CK_PTR CK_CAMELLIA_CTR_PARAMS_PTR;
 
 /* CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS is new for PKCS #11 v2.20 amendment 3 */
-typedef struct CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE      iv[16];
-    CK_BYTE_PTR  pData;
-    CK_ULONG     length;
+typedef struct CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS
+{
+    CK_BYTE iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG length;
 } CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_CAMELLIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
 /* CK_ARIA_CBC_ENCRYPT_DATA_PARAMS is new for PKCS #11 v2.20 amendment 3 */
-typedef struct CK_ARIA_CBC_ENCRYPT_DATA_PARAMS {
-    CK_BYTE      iv[16];
-    CK_BYTE_PTR  pData;
-    CK_ULONG     length;
+typedef struct CK_ARIA_CBC_ENCRYPT_DATA_PARAMS
+{
+    CK_BYTE iv[16];
+    CK_BYTE_PTR pData;
+    CK_ULONG length;
 } CK_ARIA_CBC_ENCRYPT_DATA_PARAMS;
 
 typedef CK_ARIA_CBC_ENCRYPT_DATA_PARAMS CK_PTR CK_ARIA_CBC_ENCRYPT_DATA_PARAMS_PTR;
 
 #endif
-
diff --git a/mft_utils/hsmclient/inc/sfnt_ext_typedef_members.h b/mft_utils/hsmclient/inc/sfnt_ext_typedef_members.h
index c2a0a975..c86b103a 100644
--- a/mft_utils/hsmclient/inc/sfnt_ext_typedef_members.h
+++ b/mft_utils/hsmclient/inc/sfnt_ext_typedef_members.h
@@ -31,259 +31,903 @@
  */
 
 /* WARNING: This is a generated file. Do not edit.*/
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_WaitForSlotEvent)(CK_FLAGS flags,CK_ULONG * history,CK_SLOT_ID_PTR pSlot,CK_VOID_PTR pReserved);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitIndirectToken)(CK_SLOT_ID slotID,CK_CHAR_PTR pPin,CK_ULONG usPinLen,CK_CHAR_PTR pLabel,CK_SESSION_HANDLE hPrimarySession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitIndirectPIN)(CK_SESSION_HANDLE hSession,CK_CHAR_PTR pPin,CK_ULONG usPinLen,CK_SESSION_HANDLE hPrimarySession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ResetPIN)(CK_SESSION_HANDLE hSession,CK_CHAR_PTR pPin,CK_ULONG usPinLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitRolePIN)(CK_SESSION_HANDLE hSession,CK_USER_TYPE userType,CK_CHAR_PTR pPin,CK_ULONG usPinLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitSlotRolePIN)(CK_SESSION_HANDLE hSession,CK_SLOT_ID slotID,CK_USER_TYPE userType,CK_CHAR_PTR pPin,CK_ULONG usPinLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_RoleStateGet)(CK_SLOT_ID slotID,CK_USER_TYPE userType,CA_ROLE_STATE * pRoleState);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CreateLoginChallenge)(CK_SESSION_HANDLE hSession,CK_USER_TYPE userType,CK_ULONG ulChallengeDataSize,CK_CHAR_PTR pChallengeData,CK_ULONG_PTR ulOutputDataSize,CK_CHAR_PTR pOutputData);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CreateContainerLoginChallenge)(CK_SESSION_HANDLE hSession,CK_SLOT_ID targetSlotID,CK_USER_TYPE userType,CK_ULONG ulChallengeDataSize,CK_CHAR_PTR pChallengeData,CK_ULONG_PTR ulOutputDataSize,CK_CHAR_PTR pOutputData);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Deactivate)(CK_SLOT_ID slotId,CK_USER_TYPE userType);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FindAdminSlotForSlot)(CK_SLOT_ID inputSlot,CK_SLOT_ID* pSlotId,CK_SLOT_ID* pPrevSlotId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TokenInsert)(CK_SESSION_HANDLE hSession,const CT_TokenHndle token,CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TokenInsertNoAuth)(const CT_TokenHndle token,CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TokenZeroize)(CK_SESSION_HANDLE hSession,CK_SLOT_ID slotID,CK_FLAGS flags);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TokenDelete)(CK_SESSION_HANDLE hSession,CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetFirmwareVersion)(CK_SLOT_ID slotID,CK_ULONG_PTR fwMajor,CK_ULONG_PTR fwMinor,CK_ULONG_PTR fwSubminor);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_OpenSession)(CK_SLOT_ID slotID,CK_ULONG ulContainerNumber,CK_FLAGS flags,CK_VOID_PTR pApplication,CK_NOTIFY Notify,CK_SESSION_HANDLE_PTR phSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_OpenSessionWithAppID)(CK_SLOT_ID slotID,CK_FLAGS flags,CK_ULONG ulHigh,CK_ULONG ulLow,CK_VOID_PTR pApplication,CK_NOTIFY Notify,CK_SESSION_HANDLE_PTR phSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_IndirectLogin)(CK_SESSION_HANDLE hSession,CK_USER_TYPE userType,CK_SESSION_HANDLE hPrimarySession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitializeRemotePEDVector)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DeleteRemotePEDVector)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetRemotePEDVectorStatus)(CK_SLOT_ID slotID,CK_ULONG_PTR pulStatus);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ConfigureRemotePED)(CK_SLOT_ID slotId,CK_CHAR_PTR pHostName,CK_ULONG ulPort,CK_ULONG_PTR pulPedId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DismantleRemotePED)(CK_SLOT_ID slotId,CK_ULONG ulPedId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Restart)(CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_RestartForContainer)(CK_SLOT_ID slotID,CK_ULONG ulContainerNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloseApplicationID)(CK_SLOT_ID slotID,CK_ULONG ulHigh,CK_ULONG ulLow);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloseApplicationIDForContainer)(CK_SLOT_ID slotID,CK_ULONG ulHigh,CK_ULONG ulLow,CK_ULONG ulContainerNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_OpenApplicationID)(CK_SLOT_ID slotID,CK_ULONG ulHigh,CK_ULONG ulLow);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_OpenApplicationIDForContainer)(CK_SLOT_ID slotID,CK_ULONG ulHigh,CK_ULONG ulLow,CK_ULONG ulContainerNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetApplicationID)(CK_ULONG ulHigh,CK_ULONG ulLow);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ManualKCV)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetLKCV)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pLegacyCloningDomainString,CK_ULONG ulLegacyCloningDomainStringLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetKCV)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pCloningDomainString,CK_ULONG ulCloningDomainStringLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetRDK)(CK_SESSION_HANDLE hSession,const CK_BYTE * pCloningDomainString,CK_ULONG ulCloningDomainStringLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetCloningDomain)(CK_BYTE_PTR pCloningDomainString,CK_ULONG ulCloningDomainStringLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ClonePrivateKey)(CK_SESSION_HANDLE hTargetSession,CK_SESSION_HANDLE hSourceSession,CK_OBJECT_HANDLE hObjectToCloneHandle,CK_OBJECT_HANDLE_PTR phClonedKey);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneObject)(CK_SESSION_HANDLE hTargetSession,CK_SESSION_HANDLE hSourceSession,CK_ULONG ulObjectType,CK_OBJECT_HANDLE hObjectHandle,CK_OBJECT_HANDLE_PTR phClonedObject);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GenerateCloningKEV)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pKEV,CK_ULONG_PTR pulKEVSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneAsTargetInit)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pTWC,CK_ULONG ulTWCSize,CK_BYTE_PTR pKEV,CK_ULONG ulKEVSize,CK_BBOOL bReplicate,CK_BYTE_PTR pPart1,CK_ULONG_PTR pulPart1Size);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneAsSource)(CK_SESSION_HANDLE hSession,CK_ULONG hType,CK_ULONG hHandle,CK_BYTE_PTR pPart1,CK_ULONG ulPart1Size,CK_BBOOL bReplicate,CK_BYTE_PTR pPart2,CK_ULONG_PTR pulPart2Size);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneAsTarget)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pKEV,CK_ULONG ulKEVSize,CK_BYTE_PTR pPart2,CK_ULONG ulPart2Size,CK_ULONG hType,CK_ULONG hHandle,CK_BBOOL bReplicate,CK_OBJECT_HANDLE_PTR phClonedHandle);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetMofN)(CK_BBOOL bFlag);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GenerateMofN)(CK_SESSION_HANDLE hSession,CK_ULONG ulM,CA_MOFN_GENERATION_PTR pVectors,CK_ULONG ulVectorCount,CK_ULONG isSecurePortUsed,CK_VOID_PTR pReserved);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GenerateCloneableMofN)(CK_SESSION_HANDLE hSession,CK_ULONG ulM,CA_MOFN_GENERATION_PTR pVectors,CK_ULONG ulVectorCount,CK_ULONG isSecurePortUsed,CK_VOID_PTR pReserved);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ModifyMofN)(CK_SESSION_HANDLE hSession,CK_ULONG ulM,CA_MOFN_GENERATION_PTR pVectors,CK_ULONG ulVectorCount,CK_ULONG isSecurePortUsed,CK_VOID_PTR pReserved);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneMofN)(CK_SESSION_HANDLE hSession,CK_SESSION_HANDLE hPrimarySession,CK_VOID_PTR pReserved);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneModifyMofN)(CK_SESSION_HANDLE hSession,CK_SESSION_HANDLE hPrimarySession,CK_VOID_PTR pReserved);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ActivateMofN)(CK_SESSION_HANDLE hSession,CA_MOFN_ACTIVATION_PTR pVectors,CK_ULONG ulVectorCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DeactivateMofN)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetMofNStatus)(CK_SLOT_ID slotID,CA_MOFN_STATUS_PTR pMofNStatus);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DuplicateMofN)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_IsMofNEnabled)(CK_SLOT_ID slotID,CK_ULONG_PTR enabled);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_IsMofNRequired)(CK_SLOT_ID slotID,CK_ULONG_PTR required);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GenerateTokenKeys)(CK_SESSION_HANDLE hSession,CK_ATTRIBUTE_PTR pTemplate,CK_ULONG usTemplateLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GenerateTWK)(CK_SLOT_ID slotID,CK_SESSION_HANDLE hSession,CK_ULONG ulKeyType,CK_ULONG ulExpSize,CK_BYTE_PTR pExponent,CK_ULONG ulModulusBitSize,CK_ULONG_PTR pulModSize,CK_BYTE_PTR pModulus);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenCertificateInfo)(CK_SLOT_ID slotID,CK_ULONG ulAccessLevel,CK_BYTE_PTR pCertificate,CK_ULONG_PTR pulCertificateLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetTokenCertificateSignature)(CK_SESSION_HANDLE hSession,CK_ULONG ulAccessLevel,CK_ULONG ulCustomerId,CK_ATTRIBUTE_PTR pPublicTemplate,CK_ULONG usPublicTemplateLen,CK_BYTE_PTR pSignature,CK_ULONG ulSignatureLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetModuleList)(CK_SLOT_ID slotId,CKCA_MODULE_ID_PTR pList,CK_ULONG ulListLen,CK_ULONG_PTR pulReturnedSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetModuleInfo)(CK_SLOT_ID slotId,CKCA_MODULE_ID moduleId,CKCA_MODULE_INFO_PTR pInfo);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LoadModule)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pModuleCode,CK_ULONG ulModuleCodeSize,CK_BYTE_PTR pModuleSignature,CK_ULONG ulModuleSignatureSize,CK_BYTE_PTR pCertificate,CK_ULONG ulCertificateSize,CK_BYTE_PTR pControlData,CK_ULONG ulControlDataSize,CKCA_MODULE_ID_PTR pModuleId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LoadEncryptedModule)(CK_SESSION_HANDLE hSession,CK_OBJECT_HANDLE hKey,CK_BYTE_PTR pIv,CK_ULONG ulIvLen,CK_BYTE_PTR pModuleCode,CK_ULONG ulModuleCodeSize,CK_BYTE_PTR pModuleSignature,CK_ULONG ulModuleSignatureSize,CK_BYTE_PTR pCertificate,CK_ULONG ulCertificateSize,CKCA_MODULE_ID_PTR pModuleId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_UnloadModule)(CK_SESSION_HANDLE hSession,CKCA_MODULE_ID moduleId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_PerformModuleCall)(CK_SESSION_HANDLE hSession,CKCA_MODULE_ID moduleId,CK_BYTE_PTR pRequest,CK_ULONG ulRequestSize,CK_BYTE_PTR pAnswer,CK_ULONG ulAnswerSize,CK_ULONG_PTR pulAnswerAvailable);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FirmwareUpdate)(CK_SESSION_HANDLE hSession,CK_ULONG ulTargetHardwarePlatform,CK_ULONG ulAuthCodeLen,CK_BYTE_PTR pAuthCode,CK_ULONG ulManifestLen,CK_BYTE_PTR pManifest,CK_ULONG ulFirmwareLen,CK_BYTE_PTR pFirmware);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FirmwareRollback)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CapabilityUpdate)(CK_SESSION_HANDLE hSession,CK_ULONG ulManifestLen,CK_BYTE_PTR pManifest,CK_ULONG ulAuthcodeLen,CK_BYTE_PTR pAuthcode);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetUserContainerNumber)(CK_SLOT_ID slotID,CK_ULONG_PTR pulContainerNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetUserContainerName)(CK_SLOT_ID slotID,CK_BYTE_PTR pName,CK_ULONG_PTR pulNameLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetUserContainerName)(CK_SLOT_ID slotID,CK_BYTE_PTR pName,CK_ULONG ulNameLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenInsertionCount)(CK_SLOT_ID slotID,CK_ULONG_PTR pulCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetRollbackFirmwareVersion)(CK_SLOT_ID slotID,CK_ULONG_PTR pulVersion);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetFPV)(CK_SLOT_ID slotID,CK_ULONG_PTR pulFpv);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTPV)(CK_SLOT_ID slotID,CK_ULONG_PTR pulTpv);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetExtendedTPV)(CK_SLOT_ID slotID,CK_ULONG_PTR pulTpv,CK_ULONG_PTR pulTpvExt);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetConfigurationElementDescription)(CK_SLOT_ID slotID,CK_ULONG ulIsContainerElement,CK_ULONG ulIsCapabilityElement,CK_ULONG ulElementId,CK_ULONG_PTR pulElementBitLength,CK_ULONG_PTR pulElementDestructive,CK_ULONG_PTR pulElementWriteRestricted,CK_CHAR_PTR pDescription,CK_ULONG_PTR pDesBufSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHSMCapabilitySet)(CK_SLOT_ID uPhysicalSlot,CK_ULONG_PTR pulCapIdArray,CK_ULONG_PTR pulCapIdSize,CK_ULONG_PTR pulCapValArray,CK_ULONG_PTR pulCapValSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHSMCapabilitySetting)(CK_SLOT_ID slotID,CK_ULONG ulPolicyId,CK_ULONG_PTR pulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHSMPolicySet)(CK_SLOT_ID uPhysicalSlot,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyIdSize,CK_ULONG_PTR pulPolicyValArray,CK_ULONG_PTR pulPolicyValSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHSMPolicySetting)(CK_SLOT_ID slotID,CK_ULONG ulPolicyId,CK_ULONG_PTR pulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerCapabilitySet)(CK_SLOT_ID uPhysicalSlot,CK_ULONG ulContainerNumber,CK_ULONG_PTR pulCapIdArray,CK_ULONG_PTR pulCapIdSize,CK_ULONG_PTR pulCapValArray,CK_ULONG_PTR pulCapValSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerCapabilitySetting)(CK_SLOT_ID slotID,CK_ULONG ulContainerNumber,CK_ULONG ulPolicyId,CK_ULONG_PTR pulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerPolicySet)(CK_SLOT_ID uPhysicalSlot,CK_ULONG ulContainerNumber,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyIdSize,CK_ULONG_PTR pulPolicyValArray,CK_ULONG_PTR pulPolicyValSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerPolicySetting)(CK_SLOT_ID uPhysicalSlot,CK_ULONG ulContainerNumber,CK_ULONG ulPolicyId,CK_ULONG_PTR pulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetPartitionPolicyTemplate)(CK_SLOT_ID uPhysicalSlot,CK_ULONG_PTR pulVersion,CK_ULONG_PTR pulBufSize,CK_BYTE_PTR pbBuf);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetTPV)(CK_SESSION_HANDLE hSession,CK_ULONG ulTpv);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetExtendedTPV)(CK_SESSION_HANDLE hSession,CK_ULONG ulTpv,CK_ULONG ulTpvExt);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetHSMPolicy)(CK_SESSION_HANDLE hSession,CK_ULONG ulPolicyId,CK_ULONG ulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetHSMPolicies)(CK_SESSION_HANDLE hSession,CK_ULONG ulPolicyCount,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyValueArray);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetDestructiveHSMPolicy)(CK_SESSION_HANDLE hSession,CK_ULONG ulPolicyId,CK_ULONG ulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetDestructiveHSMPolicies)(CK_SESSION_HANDLE hSession,CK_ULONG ulPolicyCount,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyValueArray);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetContainerPolicy)(CK_SESSION_HANDLE hSession,CK_ULONG ulContainer,CK_ULONG ulPolicyId,CK_ULONG ulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetContainerPolicies)(CK_SESSION_HANDLE hSession,CK_ULONG ulContainer,CK_ULONG ulPolicyCount,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyValueArray);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenCapabilities)(CK_SLOT_ID ulSlotID,CK_ULONG_PTR pulCapIdArray,CK_ULONG_PTR pulCapIdSize,CK_ULONG_PTR pulCapValArray,CK_ULONG_PTR pulCapValSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetTokenPolicies)(CK_SESSION_HANDLE hSession,CK_SLOT_ID ulSlotID,CK_ULONG ulPolicyCount,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyValueArray);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenPolicies)(CK_SLOT_ID ulSlotID,CK_ULONG_PTR pulPolicyIdArray,CK_ULONG_PTR pulPolicyIdSize,CK_ULONG_PTR pulPolicyValArray,CK_ULONG_PTR pulPolicyValSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_RetrieveLicenseList)(CK_SLOT_ID slotID,CK_ULONG_PTR pulidArraySize,CK_ULONG_PTR pulidArray);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_QueryLicense)(CK_SLOT_ID slotID,CK_ULONG licenseIdLow,CK_ULONG licenseIdHigh,CK_ULONG_PTR pulLicenseType,CK_ULONG_PTR pulDescVersion,CK_ULONG_PTR pulDescSize,CK_BYTE_PTR pbDescBuffer);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerStatus)(CK_SLOT_ID slotID,CK_ULONG ulContainerNumber,CK_ULONG_PTR pulContainerStatusFlags,CK_ULONG_PTR pulFailedSOLogins,CK_ULONG_PTR pulFailedUserLogins,CK_ULONG_PTR pulFailedLimitedUserLogins);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenStatus)(CK_SLOT_ID slotID,CK_ULONG_PTR pulStatusFlags,CK_ULONG_PTR pulCurSessionCnt,CK_ULONG_PTR pulCurRdWrSessionCnt);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetSessionInfo)(CK_SESSION_HANDLE hSession,CK_ULONG_PTR pulAidHigh,CK_ULONG_PTR pulAidLow,CK_ULONG_PTR pulContainerNumber,CK_ULONG_PTR pulAuthenticationLevel);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ReadCommonStore)(CK_ULONG index,CK_BYTE_PTR pBuffer,CK_ULONG_PTR pulBufferSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_WriteCommonStore)(CK_ULONG index,CK_BYTE_PTR pBuffer,CK_ULONG ulBufferSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetPrimarySlot)(CK_SESSION_HANDLE hSession,CK_SLOT_ID_PTR slotId_p);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetSecondarySlot)(CK_SESSION_HANDLE hSession,CK_SLOT_ID_PTR slotId_p);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SwitchSecondarySlot)(CK_SESSION_HANDLE hSession,CK_SLOT_ID slotID,CK_ULONG slotInstance);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloseSecondarySession)(CK_SESSION_HANDLE hSession,CK_SLOT_ID slotID,CK_ULONG slotInstance);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloseAllSecondarySessions)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ChoosePrimarySlot)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ChooseSecondarySlot)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneObjectToAllSessions)(CK_SESSION_HANDLE hSession,CK_OBJECT_HANDLE hObject);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloneAllObjectsToSession)(CK_SESSION_HANDLE hSession,CK_SLOT_ID slotId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ResetDevice)(CK_SLOT_ID slotId,CK_FLAGS flags);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Zeroize)(CK_SLOT_ID slotId,CK_FLAGS flags);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FactoryReset)(CK_SLOT_ID slotId,CK_FLAGS flags);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetPedId)(CK_SLOT_ID slotId,CK_ULONG usPedId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetPedId)(CK_SLOT_ID slotId,CK_ULONG * usPedId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SpRawRead)(CK_SLOT_ID slotId,CK_ULONG_PTR data);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SpRawWrite)(CK_SLOT_ID slotId,CK_ULONG_PTR data);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CheckOperationState)(CK_SESSION_HANDLE hSession,CK_ULONG operation,CK_BBOOL * pactive);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DestroyMultipleObjects)(CK_SESSION_HANDLE hSession,CK_ULONG ulHandleCount,CK_OBJECT_HANDLE_PTR pHandleList,CK_ULONG_PTR pulIndex);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_OpenSecureToken)(CK_SESSION_HANDLE hSession,CK_ULONG storagePath,CK_ULONG devID,CK_ULONG mode,CK_ULONG pedId,CK_ULONG_PTR numberOfElems,CK_ULONG_PTR phID,CK_ULONG ParNameLength,CK_CHAR_PTR pPartitionName);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CloseSecureToken)(CK_SESSION_HANDLE hSession,CK_ULONG hID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ListSecureTokenInit)(CK_SESSION_HANDLE hSession,CK_ULONG hID,CK_ULONG PartNameSize,CK_ULONG_PTR numElements,CK_ULONG_PTR filenameLen,CK_BYTE_PTR pPartName);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ListSecureTokenUpdate)(CK_SESSION_HANDLE hSession,CK_ULONG hID,CK_ULONG index,CK_BYTE_PTR pData,CK_ULONG dataLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetSecureElementMeta)(CK_SESSION_HANDLE hSession,CK_ULONG hID,CK_MECHANISM_PTR pMechanism,CK_ULONG_PTR pObjClass,CK_ULONG_PTR pKeyType,CK_BYTE_PTR pLabel,CK_ULONG ulLabelLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Bip32ExportPublicKey)(CK_SESSION_HANDLE hSession,CK_ULONG ulObjectHandle,CK_BYTE_PTR pPublicSerialData,CK_ULONG_PTR pulPublicSerialLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Bip32ImportPublicKey)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pBase58Key,CK_ULONG usKeyLen,CK_ATTRIBUTE_PTR pTemplate,CK_ULONG usCount,CK_OBJECT_HANDLE_PTR phImportedObject);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HAInit)(CK_SESSION_HANDLE hSession,CK_OBJECT_HANDLE hLoginPrivateKey);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HAGetMasterPublic)(CK_SLOT_ID slotId,CK_BYTE_PTR pCertificate,CK_ULONG_PTR pulCertificate);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HAGetLoginChallenge)(CK_SESSION_HANDLE hSession,CK_USER_TYPE userType,CK_BYTE_PTR pCertificate,CK_ULONG ulCertificateLen,CK_BYTE_PTR pChallengeBlob,CK_ULONG_PTR pulChallengeBlobLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HAAnswerLoginChallenge)(CK_SESSION_HANDLE hSession,CK_OBJECT_HANDLE hLoginPrivateKey,CK_BYTE_PTR pChallengeBlob,CK_ULONG ulChallengeBlobLen,CK_BYTE_PTR pEncryptedPin,CK_ULONG_PTR pulEncryptedPinLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HALogin)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pEncryptedPin,CK_ULONG ulEncryptedPinLen,CK_BYTE_PTR pMofNBlob,CK_ULONG_PTR pulMofNBlobLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HAAnswerMofNChallenge)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pMofNBlob,CK_ULONG ulMofNBlobLen,CK_BYTE_PTR pMofNSecretBlob,CK_ULONG_PTR pulMofNSecretBlobLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_HAActivateMofN)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pMofNSecretBlob,CK_ULONG ulMofNSecretBlobLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHAState)(CK_SLOT_ID slotId,CK_HA_STATE_PTR pState);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenCertificates)(CK_SLOT_ID slotID,CK_ULONG ulCertType,CK_BYTE_PTR pCertificate,CK_ULONG_PTR pulCertificateLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ExtractMaskedObject)(CK_SESSION_HANDLE hSession,CK_ULONG ulObjectHandle,CK_BYTE_PTR pMaskedKey,CK_ULONG_PTR pusMaskedKeyLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InsertMaskedObject)(CK_SESSION_HANDLE hSession,CK_ULONG_PTR pulObjectHandle,CK_BYTE_PTR pMaskedKey,CK_ULONG usMaskedKeyLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MultisignValue)(CK_SESSION_HANDLE hSession,CK_MECHANISM_PTR pMechanism,CK_ULONG ulMaskedKeyLen,CK_BYTE_PTR pMaskedKey,CK_ULONG_PTR pulBlobCount,CK_ULONG_PTR pulBlobLens,CK_BYTE_PTR CK_PTR ppBlobs,CK_ULONG_PTR pulSignatureLens,CK_BYTE_PTR CK_PTR ppSignatures);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SIMExtract)(CK_SESSION_HANDLE hSession,CK_ULONG ulHandleCount,CK_OBJECT_HANDLE_PTR pHandleList,CK_ULONG ulAuthSecretCount,CK_ULONG ulAuthSubsetCount,CKA_SIM_AUTH_FORM authForm,CK_ULONG_PTR pulAuthSecretSizes,CK_BYTE_PTR * ppbAuthSecretList,CK_BBOOL deleteAfterExtract,CK_ULONG_PTR pulBlobSize,CK_BYTE_PTR pBlob);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SIMInsert)(CK_SESSION_HANDLE hSession,CK_ULONG ulAuthSecretCount,CKA_SIM_AUTH_FORM authForm,CK_ULONG_PTR pulAuthSecretSizes,CK_BYTE_PTR * ppbAuthSecretList,CK_ULONG ulBlobSize,CK_BYTE_PTR pBlob,CK_ULONG_PTR pulHandleCount,CK_OBJECT_HANDLE_PTR pHandleList);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SIMMultiSign)(CK_SESSION_HANDLE hSession,CK_MECHANISM_PTR pMechanism,CK_ULONG ulAuthSecretCount,CKA_SIM_AUTH_FORM authForm,CK_ULONG_PTR pulAuthSecretSizes,CK_BYTE_PTR * ppbAuthSecretList,CK_ULONG ulBlobSize,CK_BYTE_PTR pBlob,CK_ULONG ulInputDataCount,CK_ULONG_PTR pulInputDataLengths,CK_BYTE_PTR * ppbInputDataList,CK_ULONG_PTR pulSignatureLengths,CK_BYTE_PTR * ppbSignatureList);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Extract)(CK_SESSION_HANDLE hSession,CK_MECHANISM_PTR pMechanism);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Insert)(CK_SESSION_HANDLE hSession,CK_MECHANISM_PTR pMechanism);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenObjectUID)(CK_SLOT_ID slotID,CK_ULONG ulObjectType,CK_ULONG ulObjectHandle,CK_BYTE * ouid);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenObjectHandle)(CK_SLOT_ID slotID,CK_BYTE * ouid,CK_ULONG_PTR pulObjectType,CK_ULONG_PTR pulObjectHandle);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetObjectUID)(CK_SLOT_ID slotID,CK_ULONG ulContainerNum,CK_ULONG ulObjectType,CK_ULONG ulObjectHandle,CK_BYTE * ouid);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetObjectHandle)(CK_SLOT_ID slotID,CK_ULONG ulContainerNum,CK_BYTE * ouid,CK_ULONG_PTR pulObjectType,CK_ULONG_PTR pulObjectHandle);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DeleteContainer)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MTKSetStorage)(CK_SESSION_HANDLE ulSessionNumber,CK_ULONG ulStorageSetting);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MTKRestore)(CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MTKResplit)(CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MTKZeroize)(CK_SLOT_ID slotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MTKGetState)(CK_SLOT_ID slotID,CK_ULONG_PTR state);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TamperClear)(CK_SESSION_HANDLE ulSessionNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STMToggle)(CK_SESSION_HANDLE ulSessionNumber,CK_ULONG ulValue,CK_ULONG ulInputDataSize,CK_CHAR_PTR pInputData,CK_ULONG_PTR pulOutputDataSize,CK_CHAR_PTR pOutputData);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STMGetState)(CK_SLOT_ID slotID,CK_ULONG_PTR state);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTSV)(CK_SLOT_ID slotID,CK_ULONG_PTR pTSV);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InvokeServiceInit)(CK_SESSION_HANDLE hSession,CK_ULONG ulPortNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InvokeService)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pBufferIn,CK_ULONG ulBufferInLength,CK_ULONG_PTR pulBufferOutLength);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InvokeServiceFinal)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pBufferOut,CK_ULONG_PTR pulBufferOutLength);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InvokeServiceAsynch)(CK_SESSION_HANDLE hSession,CK_ULONG ulPortNumber,CK_BYTE_PTR pBufferIn,CK_ULONG ulBufferInLength);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InvokeServiceSinglePart)(CK_SESSION_HANDLE hSession,CK_ULONG ulPortNumber,CK_BYTE_PTR pBufferIn,CK_ULONG ulBufferInLength,CK_BYTE_PTR pBufferOut,CK_ULONG_PTR pulBufferOutLength);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_EncodeECPrimeParams)(CK_BYTE_PTR DerECParams,CK_ULONG_PTR DerECParamsLen,CK_BYTE_PTR prime,CK_ULONG primelen,CK_BYTE_PTR a,CK_ULONG alen,CK_BYTE_PTR b,CK_ULONG blen,CK_BYTE_PTR seed,CK_ULONG seedlen,CK_BYTE_PTR x,CK_ULONG xlen,CK_BYTE_PTR y,CK_ULONG ylen,CK_BYTE_PTR order,CK_ULONG orderlen,CK_BYTE_PTR cofactor,CK_ULONG cofactorlen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_EncodeECChar2Params)(CK_BYTE_PTR DerECParams,CK_ULONG_PTR DerECParamsLen,CK_ULONG m,CK_ULONG k1,CK_ULONG k2,CK_ULONG k3,CK_BYTE_PTR a,CK_ULONG alen,CK_BYTE_PTR b,CK_ULONG blen,CK_BYTE_PTR seed,CK_ULONG seedlen,CK_BYTE_PTR x,CK_ULONG xlen,CK_BYTE_PTR y,CK_ULONG ylen,CK_BYTE_PTR order,CK_ULONG orderlen,CK_BYTE_PTR cofactor,CK_ULONG cofactorlen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_EncodeECParamsFromFile)(CK_BYTE_PTR DerECParams,CK_ULONG_PTR DerECParamsLen,CK_BYTE_PTR paramsFile);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHSMStats)(CK_SLOT_ID slotID,CK_ULONG ulStatsIdsCount,CK_ULONG_PTR pStatsIds,HSM_STATS_PARAMS * pStatsParams);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetHSMStorageInformation)(CK_SLOT_ID slotID,CK_ULONG_PTR pulContainerOverhead,CK_ULONG_PTR pulTotal,CK_ULONG_PTR pulUsed,CK_ULONG_PTR pulFree);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTokenStorageInformation)(CK_SLOT_ID slotID,CK_ULONG_PTR pulContainerOverhead,CK_ULONG_PTR pulTotal,CK_ULONG_PTR pulUsed,CK_ULONG_PTR pulFree,CK_ULONG_PTR pulObjectCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerStorageInformation)(CK_SLOT_ID slotID,CK_ULONG ulContainerNumber,CK_ULONG_PTR pulContainerOverhead,CK_ULONG_PTR pulTotal,CK_ULONG_PTR pulUsed,CK_ULONG_PTR pulFree,CK_ULONG_PTR pulObjectCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_SetContainerSize)(CK_SESSION_HANDLE hSession,CK_ULONG ulContainerNumber,CK_ULONG ulSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CreateContainerWithPolicy)(CK_SESSION_HANDLE hSession,CK_ULONG ulUSV,CK_CHAR_PTR pContainerName,CK_ULONG usContainerNameLen,CK_CHAR_PTR pPin,CK_ULONG usPinLen,CK_ULONG ulIDHigh,CK_ULONG ulIDLow,CK_ULONG ulOwnerHandle,CK_ULONG ulStorageFlags,CK_ULONG ulContainerSize,CK_ULONG_PTR pulContainerNumber,CK_ULONG policyVersion,CK_ULONG policySize,CK_BYTE_PTR pPolicyBuf);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_CreateContainer)(CK_SESSION_HANDLE hSession,CK_ULONG ulUSV,CK_CHAR_PTR pContainerName,CK_ULONG usContainerNameLen,CK_CHAR_PTR pPin,CK_ULONG usPinLen,CK_ULONG ulIDHigh,CK_ULONG ulIDLow,CK_ULONG ulOwnerHandle,CK_ULONG ulStorageFlags,CK_ULONG ulContainerSize,CK_ULONG_PTR pulContainerNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitAudit)(CK_SLOT_ID slotID,CK_CHAR_PTR pPin,CK_ULONG usPinLen,CK_CHAR_PTR pLabel);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogVerify)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pLogMsgs,CK_ULONG ulMsgCount,CK_ULONG bChainToHSM,CK_ULONG_PTR pulNumVerified);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogVerifyFile)(CK_SESSION_HANDLE hSession,CK_CHAR_PTR pFileName,CK_ULONG_PTR ulNumVerified);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogExternal)(CK_SLOT_ID slotID,CK_SESSION_HANDLE hSession,const CK_CHAR * pStr,CK_ULONG ulLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogImportSecret)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pStr,CK_ULONG strSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogExportSecret)(CK_SESSION_HANDLE hSession,CK_BYTE_PTR pStr,CK_ULONG_PTR pStrSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TimeSync)(CK_SESSION_HANDLE hSession,CK_ULONG ulTime);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTime)(CK_SESSION_HANDLE hSession,CK_ULONG_PTR pulTime);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogSetConfig)(CK_SESSION_HANDLE hSession,CK_ULONG mask,CK_ULONG logRotateOffset,CK_ULONG logRotateInterval,CK_ULONG maxLogSize,CK_BYTE_PTR pLogPath);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogGetConfig)(CK_SESSION_HANDLE hSession,CK_ULONG * mask,CK_ULONG * logRotateOffset,CK_ULONG * logRotateInterval,CK_ULONG * maxLogSize,CK_BYTE_PTR pLogPath);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ReplaceFastPathKEK)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LogGetStatus)(CK_SLOT_ID slotId,CK_ULONG * auditInitStatus,CK_ULONG * lastPollResult,CK_ULONG * lastSetConfigResult,CK_ULONG * isConfigInParamArea,CK_ULONG * numRecordsInFlash);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DeleteContainerWithHandle)(CK_SESSION_HANDLE hSession,CK_ULONG ulContainerNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerList)(CK_SLOT_ID slotID,CK_ULONG ulGroupHandle,CK_ULONG ulContainerType,CK_ULONG_PTR pulContainerHandles,CK_ULONG_PTR pulNumberOfHandles);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetContainerName)(CK_SLOT_ID slotID,CK_ULONG ulContainerHandle,CK_BYTE_PTR pContainerName,CK_ULONG_PTR pulContainerNameLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetNumberOfAllowedContainers)(CK_SLOT_ID slot,CK_ULONG_PTR pulAllowedContainers);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetTunnelSlotNumber)(CK_SLOT_ID slotID,CK_SLOT_ID_PTR pTunnelSlotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetClusterState)(CK_SLOT_ID slotId,CK_CLUSTER_STATE_PTR pState);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_LockClusteredSlot)(CK_SLOT_ID slotId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_UnlockClusteredSlot)(CK_SLOT_ID slotId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ModifyUsageCount)(CK_SESSION_HANDLE hSession,CK_OBJECT_HANDLE hObject,CK_ULONG ulCommandType,CK_ULONG ulValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_EnableUnauthTokenInsertion)(CK_SESSION_HANDLE hSession,CK_ULONG ulMaxUsageCount,CK_ULONG_PTR ulContextHandle);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetUnauthTokenInsertionStatus)(CK_SESSION_HANDLE hSession,CK_ULONG ulContextHandle,CK_ULONG * pulMaxUsageCount,CK_ULONG * pulCurUsageCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DisableUnauthTokenInsertion)(CK_SESSION_HANDLE hSession,CK_ULONG ulContextHandle);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCRegister)(CK_SESSION_HANDLE hSession,CK_SLOT_ID TargetSlotID,const CK_CHAR * username,CK_ULONG access,const CK_CHAR * pmod,CK_ULONG mod_len,const CK_CHAR * pexp,CK_ULONG exp_len);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCDeregister)(CK_SESSION_HANDLE hSession,CK_SLOT_ID TargetslotID,const CK_CHAR * username);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetPubKey)(CK_SESSION_HANDLE hSession,CK_SLOT_ID TargetSlotID,const CK_CHAR * username,CK_CHAR * pmod,CK_ULONG_PTR mod_len,CK_CHAR * pexp,CK_ULONG_PTR exp_len);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetClientsList)(CK_SESSION_HANDLE hSession,CK_SLOT_ID TargetSlotID,CK_ULONG_PTR pulCIDArray,CK_ULONG_PTR pulCIDArraySize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetClientInfo)(CK_SESSION_HANDLE hSession,CK_SLOT_ID TargetSlotID,CK_ULONG ulHandke,CK_CHAR * username,CK_ULONG_PTR name_len,CK_ULONG_PTR access,CK_CHAR * mod,CK_ULONG_PTR mod_len,CK_CHAR * exp,CK_ULONG_PTR exp_len);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetPartPubKey)(CK_SESSION_HANDLE hSession,CK_SLOT_ID TargetSlotID,CK_CHAR * mod,CK_ULONG_PTR modSize,CK_CHAR * exp,CK_ULONG_PTR expSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetAdminPubKey)(CK_SLOT_ID slotId,CK_CHAR * mod,CK_ULONG_PTR modSize,CK_CHAR * exp,CK_ULONG_PTR expSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCSetCipherAlgorithm)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG CipherID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetCipherAlgorithm)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_BYTE_PTR pIDCount,CK_ULONG_PTR pIDs);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCClearCipherAlgorithm)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG CipherID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCSetDigestAlgorithm)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG DigestID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetDigestAlgorithm)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_BYTE_PTR pIDCount,CK_ULONG_PTR pIDs);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCClearDigestAlgorithm)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG DigestID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCSetKeyLifeTime)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG lifeTime);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetKeyLifeTime)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG_PTR plifeTime);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCSetKeyActivationTimeOut)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG timeOut);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetKeyActivationTimeOut)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG_PTR ptimeOut);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCSetMaxSessions)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG maxSessions);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetMaxSessions)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG_PTR pmaxSessions);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCSetSequenceWindowSize)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG windowSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetSequenceWindowSize)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG_PTR pwindowSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCIsEnabled)(CK_ULONG TargetSlotID,CK_BYTE_PTR pbenabled);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetState)(CK_ULONG TargetSlotID,CK_CHAR * str,CK_BYTE bbufferSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetCurrentKeyLife)(CK_SESSION_HANDLE hSession,CK_ULONG TargetSlotID,CK_ULONG_PTR pcurKeyLife);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetSlotIdForPhysicalSlot)(CK_ULONG physicalSlot,CK_SLOT_ID_PTR pSlotId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetSlotIdForContainer)(CK_ULONG slotID,CK_ULONG ulContainerNumber,CK_SLOT_ID_PTR pSlotID);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetChannelID)(CK_SLOT_ID slotId,CK_ULONG_PTR ulChannelId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetCipherID)(CK_SLOT_ID slotId,CK_ULONG_PTR ulCipherId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetDigestID)(CK_SLOT_ID slotId,CK_ULONG_PTR ulDigestId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetCipherIDs)(CK_SLOT_ID slotID,CK_ULONG_PTR pulArray,CK_BYTE_PTR pbArraySize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetCipherNameByID)(CK_SLOT_ID slotID,CK_ULONG ulCipherID,CK_CHAR_PTR pszName,CK_BYTE bNameBufSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetDigestIDs)(CK_SLOT_ID slotID,CK_ULONG_PTR pulArray,CK_BYTE_PTR pbArraySize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_STCGetDigestNameByID)(CK_SLOT_ID slotID,CK_ULONG ulDigestID,CK_CHAR_PTR pszName,CK_BYTE bNameBufSize);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetServerInstanceBySlotID)(CK_SLOT_ID slotID,CK_ULONG_PTR pulInstanceNumber);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetSlotListFromServerInstance)(CK_ULONG instanceNumber,CK_SLOT_ID_PTR slotList,CK_ULONG_PTR pulCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ChangeLabel)(CK_SESSION_HANDLE hSession,CK_SLOT_ID ulSlotID,CK_CHAR_PTR pulLabel,CK_ULONG ulLabelLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_PerformSelfTest)(CK_SLOT_ID slotID,CK_ULONG typeOfTest,CK_BYTE_PTR inputData,CK_ULONG sizeOfInputData,CK_BYTE_PTR outputData,CK_ULONG_PTR sizeOfOutputData);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FMDownload)(CK_SESSION_HANDLE hTokenSession,CK_OBJECT_HANDLE hObject,CK_ULONG ulParamLen,CK_BYTE_PTR pParam,CK_ULONG ulImageLen,CK_BYTE_PTR pImage,CK_ULONG ulSignatureLen,CK_BYTE_PTR pSignature);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FMDelete)(CK_SESSION_HANDLE hTokenSession,CK_ULONG fmid);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_FMActivateSMFS)(CK_SESSION_HANDLE hTokenSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetActualSlotList)(CK_SLOT_ID slotId,CK_ULONG_PTR phsmidx,CK_SLOT_ID_PTR pActualslotID,CK_ULONG_PTR pulCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DeriveKeyAndWrap)(CK_SESSION_HANDLE hSession,CK_MECHANISM_PTR pMechanismDerive,CK_OBJECT_HANDLE hBaseKey,CK_ATTRIBUTE_PTR pTemplate,CK_ULONG ulAttributeCount,CK_MECHANISM_PTR pMechanismWrap,CK_OBJECT_HANDLE hWrappingKey,CK_BYTE_PTR pWrappedKey,CK_ULONG_PTR pulWrappedKeyLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_MdPriv_Initialize)(void * pMdPrivIf,unsigned int len,void * pLogIf);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Get)(CK_SLOT_ID slotID,CK_ULONG ulItem,CK_BYTE_PTR pBuffer,CK_ULONG_PTR pulBufferLen);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_Put)(CK_SLOT_ID slotID,CK_SESSION_HANDLE hSession,CK_ULONG ulParamId,CK_ULONG ulParamSize,CK_BYTE_PTR pParamBuffer);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetDefaultPartitionPolicyValue)(CK_SLOT_ID slotID,CK_ULONG ulPolicyId,CK_ULONG_PTR pulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetDefaultHSMPolicyValue)(CK_SLOT_ID slotID,CK_ULONG ulPolicyId,CK_ULONG_PTR pulPolicyValue);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ValidateHSMPolicySet)(CK_SLOT_ID slotId,CK_POLICY_INFO_PTR policyInfo,CK_ULONG policyCount,CK_RV_PTR policyResults);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ValidateContainerPolicySet)(CK_SLOT_ID slotId,CK_ULONG ulContainerNumber,CK_POLICY_INFO_PTR policyInfo,CK_ULONG policyCount,CK_RV_PTR policyResults);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ZeroizeContainer)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_InitToken)(CK_SLOT_ID slotID,CK_CHAR_PTR pPin,CK_ULONG usPinLen,CK_CHAR_PTR pLabel,CK_BYTE_PTR pDomain,CK_ULONG ulDomainLen,CK_ULONG ulPolicyCount,CK_POLICY_INFO_PTR pPolicyData,CK_ULONG ulHSMPolicyCount,CK_POLICY_INFO_PTR pHSMPolicyData);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ReadUtilizationMetrics)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ReadAndResetUtilizationMetrics)(CK_SESSION_HANDLE hSession);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ReadAllUtilizationCounters)(CK_SESSION_HANDLE hSession,CK_UTILIZATION_COUNTER_PTR buff,CK_ULONG_PTR length);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_ReadUtilizationCount)(CK_SESSION_HANDLE hSession,CK_ULONGLONG serialNum,CK_ULONG ulBinId,CK_ULONG ulCounterId,CK_UTILIZATION_COUNT_PTR pCount);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DescribeUtilizationBinId)(CK_ULONG ulBinId,CK_CHAR_PTR CK_PTR describe);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_DescribeUtilizationCounterId)(CK_ULONG ulCounterId,CK_CHAR_PTR CK_PTR describe);
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_TestTrace)(CK_SLOT_ID slotID,CK_ULONG ulTypeOfTrace,CK_BYTE_PTR pInData,CK_ULONG ulInDataLength,CK_BYTE_PTR pOutData,CK_ULONG_PTR pulOutDataLength);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_WaitForSlotEvent)(CK_FLAGS flags,
+                                                      CK_ULONG* history,
+                                                      CK_SLOT_ID_PTR pSlot,
+                                                      CK_VOID_PTR pReserved);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InitIndirectToken)(CK_SLOT_ID slotID,
+                                                       CK_CHAR_PTR pPin,
+                                                       CK_ULONG usPinLen,
+                                                       CK_CHAR_PTR pLabel,
+                                                       CK_SESSION_HANDLE hPrimarySession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InitIndirectPIN)(CK_SESSION_HANDLE hSession,
+                                                     CK_CHAR_PTR pPin,
+                                                     CK_ULONG usPinLen,
+                                                     CK_SESSION_HANDLE hPrimarySession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ResetPIN)(CK_SESSION_HANDLE hSession, CK_CHAR_PTR pPin, CK_ULONG usPinLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InitRolePIN)(CK_SESSION_HANDLE hSession,
+                                                 CK_USER_TYPE userType,
+                                                 CK_CHAR_PTR pPin,
+                                                 CK_ULONG usPinLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InitSlotRolePIN)(CK_SESSION_HANDLE hSession,
+                                                     CK_SLOT_ID slotID,
+                                                     CK_USER_TYPE userType,
+                                                     CK_CHAR_PTR pPin,
+                                                     CK_ULONG usPinLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_RoleStateGet)(CK_SLOT_ID slotID, CK_USER_TYPE userType, CA_ROLE_STATE* pRoleState);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CreateLoginChallenge)(CK_SESSION_HANDLE hSession,
+                                                          CK_USER_TYPE userType,
+                                                          CK_ULONG ulChallengeDataSize,
+                                                          CK_CHAR_PTR pChallengeData,
+                                                          CK_ULONG_PTR ulOutputDataSize,
+                                                          CK_CHAR_PTR pOutputData);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CreateContainerLoginChallenge)(CK_SESSION_HANDLE hSession,
+                                                                   CK_SLOT_ID targetSlotID,
+                                                                   CK_USER_TYPE userType,
+                                                                   CK_ULONG ulChallengeDataSize,
+                                                                   CK_CHAR_PTR pChallengeData,
+                                                                   CK_ULONG_PTR ulOutputDataSize,
+                                                                   CK_CHAR_PTR pOutputData);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Deactivate)(CK_SLOT_ID slotId, CK_USER_TYPE userType);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_FindAdminSlotForSlot)(CK_SLOT_ID inputSlot, CK_SLOT_ID* pSlotId, CK_SLOT_ID* pPrevSlotId);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_TokenInsert)(CK_SESSION_HANDLE hSession, const CT_TokenHndle token, CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_TokenInsertNoAuth)(const CT_TokenHndle token, CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_TokenZeroize)(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotID, CK_FLAGS flags);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_TokenDelete)(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetFirmwareVersion)(CK_SLOT_ID slotID,
+                                                        CK_ULONG_PTR fwMajor,
+                                                        CK_ULONG_PTR fwMinor,
+                                                        CK_ULONG_PTR fwSubminor);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_OpenSession)(CK_SLOT_ID slotID,
+                                                 CK_ULONG ulContainerNumber,
+                                                 CK_FLAGS flags,
+                                                 CK_VOID_PTR pApplication,
+                                                 CK_NOTIFY Notify,
+                                                 CK_SESSION_HANDLE_PTR phSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_OpenSessionWithAppID)(CK_SLOT_ID slotID,
+                                                          CK_FLAGS flags,
+                                                          CK_ULONG ulHigh,
+                                                          CK_ULONG ulLow,
+                                                          CK_VOID_PTR pApplication,
+                                                          CK_NOTIFY Notify,
+                                                          CK_SESSION_HANDLE_PTR phSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_IndirectLogin)(CK_SESSION_HANDLE hSession,
+                                                   CK_USER_TYPE userType,
+                                                   CK_SESSION_HANDLE hPrimarySession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InitializeRemotePEDVector)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DeleteRemotePEDVector)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetRemotePEDVectorStatus)(CK_SLOT_ID slotID, CK_ULONG_PTR pulStatus);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ConfigureRemotePED)(CK_SLOT_ID slotId,
+                                                        CK_CHAR_PTR pHostName,
+                                                        CK_ULONG ulPort,
+                                                        CK_ULONG_PTR pulPedId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DismantleRemotePED)(CK_SLOT_ID slotId, CK_ULONG ulPedId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Restart)(CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_RestartForContainer)(CK_SLOT_ID slotID, CK_ULONG ulContainerNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloseApplicationID)(CK_SLOT_ID slotID, CK_ULONG ulHigh, CK_ULONG ulLow);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloseApplicationIDForContainer)(CK_SLOT_ID slotID,
+                                                                    CK_ULONG ulHigh,
+                                                                    CK_ULONG ulLow,
+                                                                    CK_ULONG ulContainerNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_OpenApplicationID)(CK_SLOT_ID slotID, CK_ULONG ulHigh, CK_ULONG ulLow);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_OpenApplicationIDForContainer)(CK_SLOT_ID slotID,
+                                                                   CK_ULONG ulHigh,
+                                                                   CK_ULONG ulLow,
+                                                                   CK_ULONG ulContainerNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetApplicationID)(CK_ULONG ulHigh, CK_ULONG ulLow);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ManualKCV)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetLKCV)(CK_SESSION_HANDLE hSession,
+                                             CK_BYTE_PTR pLegacyCloningDomainString,
+                                             CK_ULONG ulLegacyCloningDomainStringLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetKCV)(CK_SESSION_HANDLE hSession,
+                                            CK_BYTE_PTR pCloningDomainString,
+                                            CK_ULONG ulCloningDomainStringLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetRDK)(CK_SESSION_HANDLE hSession,
+                                            const CK_BYTE* pCloningDomainString,
+                                            CK_ULONG ulCloningDomainStringLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetCloningDomain)(CK_BYTE_PTR pCloningDomainString,
+                                                      CK_ULONG ulCloningDomainStringLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ClonePrivateKey)(CK_SESSION_HANDLE hTargetSession,
+                                                     CK_SESSION_HANDLE hSourceSession,
+                                                     CK_OBJECT_HANDLE hObjectToCloneHandle,
+                                                     CK_OBJECT_HANDLE_PTR phClonedKey);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneObject)(CK_SESSION_HANDLE hTargetSession,
+                                                 CK_SESSION_HANDLE hSourceSession,
+                                                 CK_ULONG ulObjectType,
+                                                 CK_OBJECT_HANDLE hObjectHandle,
+                                                 CK_OBJECT_HANDLE_PTR phClonedObject);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_GenerateCloningKEV)(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pKEV, CK_ULONG_PTR pulKEVSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneAsTargetInit)(CK_SESSION_HANDLE hSession,
+                                                       CK_BYTE_PTR pTWC,
+                                                       CK_ULONG ulTWCSize,
+                                                       CK_BYTE_PTR pKEV,
+                                                       CK_ULONG ulKEVSize,
+                                                       CK_BBOOL bReplicate,
+                                                       CK_BYTE_PTR pPart1,
+                                                       CK_ULONG_PTR pulPart1Size);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneAsSource)(CK_SESSION_HANDLE hSession,
+                                                   CK_ULONG hType,
+                                                   CK_ULONG hHandle,
+                                                   CK_BYTE_PTR pPart1,
+                                                   CK_ULONG ulPart1Size,
+                                                   CK_BBOOL bReplicate,
+                                                   CK_BYTE_PTR pPart2,
+                                                   CK_ULONG_PTR pulPart2Size);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneAsTarget)(CK_SESSION_HANDLE hSession,
+                                                   CK_BYTE_PTR pKEV,
+                                                   CK_ULONG ulKEVSize,
+                                                   CK_BYTE_PTR pPart2,
+                                                   CK_ULONG ulPart2Size,
+                                                   CK_ULONG hType,
+                                                   CK_ULONG hHandle,
+                                                   CK_BBOOL bReplicate,
+                                                   CK_OBJECT_HANDLE_PTR phClonedHandle);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetMofN)(CK_BBOOL bFlag);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GenerateMofN)(CK_SESSION_HANDLE hSession,
+                                                  CK_ULONG ulM,
+                                                  CA_MOFN_GENERATION_PTR pVectors,
+                                                  CK_ULONG ulVectorCount,
+                                                  CK_ULONG isSecurePortUsed,
+                                                  CK_VOID_PTR pReserved);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GenerateCloneableMofN)(CK_SESSION_HANDLE hSession,
+                                                           CK_ULONG ulM,
+                                                           CA_MOFN_GENERATION_PTR pVectors,
+                                                           CK_ULONG ulVectorCount,
+                                                           CK_ULONG isSecurePortUsed,
+                                                           CK_VOID_PTR pReserved);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ModifyMofN)(CK_SESSION_HANDLE hSession,
+                                                CK_ULONG ulM,
+                                                CA_MOFN_GENERATION_PTR pVectors,
+                                                CK_ULONG ulVectorCount,
+                                                CK_ULONG isSecurePortUsed,
+                                                CK_VOID_PTR pReserved);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneMofN)(CK_SESSION_HANDLE hSession,
+                                               CK_SESSION_HANDLE hPrimarySession,
+                                               CK_VOID_PTR pReserved);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneModifyMofN)(CK_SESSION_HANDLE hSession,
+                                                     CK_SESSION_HANDLE hPrimarySession,
+                                                     CK_VOID_PTR pReserved);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ActivateMofN)(CK_SESSION_HANDLE hSession,
+                                                  CA_MOFN_ACTIVATION_PTR pVectors,
+                                                  CK_ULONG ulVectorCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DeactivateMofN)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetMofNStatus)(CK_SLOT_ID slotID, CA_MOFN_STATUS_PTR pMofNStatus);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DuplicateMofN)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_IsMofNEnabled)(CK_SLOT_ID slotID, CK_ULONG_PTR enabled);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_IsMofNRequired)(CK_SLOT_ID slotID, CK_ULONG_PTR required);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GenerateTokenKeys)(CK_SESSION_HANDLE hSession,
+                                                       CK_ATTRIBUTE_PTR pTemplate,
+                                                       CK_ULONG usTemplateLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GenerateTWK)(CK_SLOT_ID slotID,
+                                                 CK_SESSION_HANDLE hSession,
+                                                 CK_ULONG ulKeyType,
+                                                 CK_ULONG ulExpSize,
+                                                 CK_BYTE_PTR pExponent,
+                                                 CK_ULONG ulModulusBitSize,
+                                                 CK_ULONG_PTR pulModSize,
+                                                 CK_BYTE_PTR pModulus);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenCertificateInfo)(CK_SLOT_ID slotID,
+                                                             CK_ULONG ulAccessLevel,
+                                                             CK_BYTE_PTR pCertificate,
+                                                             CK_ULONG_PTR pulCertificateLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetTokenCertificateSignature)(CK_SESSION_HANDLE hSession,
+                                                                  CK_ULONG ulAccessLevel,
+                                                                  CK_ULONG ulCustomerId,
+                                                                  CK_ATTRIBUTE_PTR pPublicTemplate,
+                                                                  CK_ULONG usPublicTemplateLen,
+                                                                  CK_BYTE_PTR pSignature,
+                                                                  CK_ULONG ulSignatureLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetModuleList)(CK_SLOT_ID slotId,
+                                                   CKCA_MODULE_ID_PTR pList,
+                                                   CK_ULONG ulListLen,
+                                                   CK_ULONG_PTR pulReturnedSize);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_GetModuleInfo)(CK_SLOT_ID slotId, CKCA_MODULE_ID moduleId, CKCA_MODULE_INFO_PTR pInfo);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LoadModule)(CK_SESSION_HANDLE hSession,
+                                                CK_BYTE_PTR pModuleCode,
+                                                CK_ULONG ulModuleCodeSize,
+                                                CK_BYTE_PTR pModuleSignature,
+                                                CK_ULONG ulModuleSignatureSize,
+                                                CK_BYTE_PTR pCertificate,
+                                                CK_ULONG ulCertificateSize,
+                                                CK_BYTE_PTR pControlData,
+                                                CK_ULONG ulControlDataSize,
+                                                CKCA_MODULE_ID_PTR pModuleId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LoadEncryptedModule)(CK_SESSION_HANDLE hSession,
+                                                         CK_OBJECT_HANDLE hKey,
+                                                         CK_BYTE_PTR pIv,
+                                                         CK_ULONG ulIvLen,
+                                                         CK_BYTE_PTR pModuleCode,
+                                                         CK_ULONG ulModuleCodeSize,
+                                                         CK_BYTE_PTR pModuleSignature,
+                                                         CK_ULONG ulModuleSignatureSize,
+                                                         CK_BYTE_PTR pCertificate,
+                                                         CK_ULONG ulCertificateSize,
+                                                         CKCA_MODULE_ID_PTR pModuleId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_UnloadModule)(CK_SESSION_HANDLE hSession, CKCA_MODULE_ID moduleId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_PerformModuleCall)(CK_SESSION_HANDLE hSession,
+                                                       CKCA_MODULE_ID moduleId,
+                                                       CK_BYTE_PTR pRequest,
+                                                       CK_ULONG ulRequestSize,
+                                                       CK_BYTE_PTR pAnswer,
+                                                       CK_ULONG ulAnswerSize,
+                                                       CK_ULONG_PTR pulAnswerAvailable);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_FirmwareUpdate)(CK_SESSION_HANDLE hSession,
+                                                    CK_ULONG ulTargetHardwarePlatform,
+                                                    CK_ULONG ulAuthCodeLen,
+                                                    CK_BYTE_PTR pAuthCode,
+                                                    CK_ULONG ulManifestLen,
+                                                    CK_BYTE_PTR pManifest,
+                                                    CK_ULONG ulFirmwareLen,
+                                                    CK_BYTE_PTR pFirmware);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_FirmwareRollback)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CapabilityUpdate)(CK_SESSION_HANDLE hSession,
+                                                      CK_ULONG ulManifestLen,
+                                                      CK_BYTE_PTR pManifest,
+                                                      CK_ULONG ulAuthcodeLen,
+                                                      CK_BYTE_PTR pAuthcode);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetUserContainerNumber)(CK_SLOT_ID slotID, CK_ULONG_PTR pulContainerNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetUserContainerName)(CK_SLOT_ID slotID, CK_BYTE_PTR pName, CK_ULONG_PTR pulNameLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetUserContainerName)(CK_SLOT_ID slotID, CK_BYTE_PTR pName, CK_ULONG ulNameLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenInsertionCount)(CK_SLOT_ID slotID, CK_ULONG_PTR pulCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetRollbackFirmwareVersion)(CK_SLOT_ID slotID, CK_ULONG_PTR pulVersion);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetFPV)(CK_SLOT_ID slotID, CK_ULONG_PTR pulFpv);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTPV)(CK_SLOT_ID slotID, CK_ULONG_PTR pulTpv);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetExtendedTPV)(CK_SLOT_ID slotID, CK_ULONG_PTR pulTpv, CK_ULONG_PTR pulTpvExt);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetConfigurationElementDescription)(CK_SLOT_ID slotID,
+                                                                        CK_ULONG ulIsContainerElement,
+                                                                        CK_ULONG ulIsCapabilityElement,
+                                                                        CK_ULONG ulElementId,
+                                                                        CK_ULONG_PTR pulElementBitLength,
+                                                                        CK_ULONG_PTR pulElementDestructive,
+                                                                        CK_ULONG_PTR pulElementWriteRestricted,
+                                                                        CK_CHAR_PTR pDescription,
+                                                                        CK_ULONG_PTR pDesBufSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetHSMCapabilitySet)(CK_SLOT_ID uPhysicalSlot,
+                                                         CK_ULONG_PTR pulCapIdArray,
+                                                         CK_ULONG_PTR pulCapIdSize,
+                                                         CK_ULONG_PTR pulCapValArray,
+                                                         CK_ULONG_PTR pulCapValSize);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_GetHSMCapabilitySetting)(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetHSMPolicySet)(CK_SLOT_ID uPhysicalSlot,
+                                                     CK_ULONG_PTR pulPolicyIdArray,
+                                                     CK_ULONG_PTR pulPolicyIdSize,
+                                                     CK_ULONG_PTR pulPolicyValArray,
+                                                     CK_ULONG_PTR pulPolicyValSize);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_GetHSMPolicySetting)(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerCapabilitySet)(CK_SLOT_ID uPhysicalSlot,
+                                                               CK_ULONG ulContainerNumber,
+                                                               CK_ULONG_PTR pulCapIdArray,
+                                                               CK_ULONG_PTR pulCapIdSize,
+                                                               CK_ULONG_PTR pulCapValArray,
+                                                               CK_ULONG_PTR pulCapValSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerCapabilitySetting)(CK_SLOT_ID slotID,
+                                                                   CK_ULONG ulContainerNumber,
+                                                                   CK_ULONG ulPolicyId,
+                                                                   CK_ULONG_PTR pulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerPolicySet)(CK_SLOT_ID uPhysicalSlot,
+                                                           CK_ULONG ulContainerNumber,
+                                                           CK_ULONG_PTR pulPolicyIdArray,
+                                                           CK_ULONG_PTR pulPolicyIdSize,
+                                                           CK_ULONG_PTR pulPolicyValArray,
+                                                           CK_ULONG_PTR pulPolicyValSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerPolicySetting)(CK_SLOT_ID uPhysicalSlot,
+                                                               CK_ULONG ulContainerNumber,
+                                                               CK_ULONG ulPolicyId,
+                                                               CK_ULONG_PTR pulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetPartitionPolicyTemplate)(CK_SLOT_ID uPhysicalSlot,
+                                                                CK_ULONG_PTR pulVersion,
+                                                                CK_ULONG_PTR pulBufSize,
+                                                                CK_BYTE_PTR pbBuf);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetTPV)(CK_SESSION_HANDLE hSession, CK_ULONG ulTpv);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetExtendedTPV)(CK_SESSION_HANDLE hSession, CK_ULONG ulTpv, CK_ULONG ulTpvExt);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_SetHSMPolicy)(CK_SESSION_HANDLE hSession, CK_ULONG ulPolicyId, CK_ULONG ulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetHSMPolicies)(CK_SESSION_HANDLE hSession,
+                                                    CK_ULONG ulPolicyCount,
+                                                    CK_ULONG_PTR pulPolicyIdArray,
+                                                    CK_ULONG_PTR pulPolicyValueArray);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetDestructiveHSMPolicy)(CK_SESSION_HANDLE hSession,
+                                                             CK_ULONG ulPolicyId,
+                                                             CK_ULONG ulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetDestructiveHSMPolicies)(CK_SESSION_HANDLE hSession,
+                                                               CK_ULONG ulPolicyCount,
+                                                               CK_ULONG_PTR pulPolicyIdArray,
+                                                               CK_ULONG_PTR pulPolicyValueArray);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetContainerPolicy)(CK_SESSION_HANDLE hSession,
+                                                        CK_ULONG ulContainer,
+                                                        CK_ULONG ulPolicyId,
+                                                        CK_ULONG ulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetContainerPolicies)(CK_SESSION_HANDLE hSession,
+                                                          CK_ULONG ulContainer,
+                                                          CK_ULONG ulPolicyCount,
+                                                          CK_ULONG_PTR pulPolicyIdArray,
+                                                          CK_ULONG_PTR pulPolicyValueArray);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenCapabilities)(CK_SLOT_ID ulSlotID,
+                                                          CK_ULONG_PTR pulCapIdArray,
+                                                          CK_ULONG_PTR pulCapIdSize,
+                                                          CK_ULONG_PTR pulCapValArray,
+                                                          CK_ULONG_PTR pulCapValSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetTokenPolicies)(CK_SESSION_HANDLE hSession,
+                                                      CK_SLOT_ID ulSlotID,
+                                                      CK_ULONG ulPolicyCount,
+                                                      CK_ULONG_PTR pulPolicyIdArray,
+                                                      CK_ULONG_PTR pulPolicyValueArray);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenPolicies)(CK_SLOT_ID ulSlotID,
+                                                      CK_ULONG_PTR pulPolicyIdArray,
+                                                      CK_ULONG_PTR pulPolicyIdSize,
+                                                      CK_ULONG_PTR pulPolicyValArray,
+                                                      CK_ULONG_PTR pulPolicyValSize);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_RetrieveLicenseList)(CK_SLOT_ID slotID, CK_ULONG_PTR pulidArraySize, CK_ULONG_PTR pulidArray);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_QueryLicense)(CK_SLOT_ID slotID,
+                                                  CK_ULONG licenseIdLow,
+                                                  CK_ULONG licenseIdHigh,
+                                                  CK_ULONG_PTR pulLicenseType,
+                                                  CK_ULONG_PTR pulDescVersion,
+                                                  CK_ULONG_PTR pulDescSize,
+                                                  CK_BYTE_PTR pbDescBuffer);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerStatus)(CK_SLOT_ID slotID,
+                                                        CK_ULONG ulContainerNumber,
+                                                        CK_ULONG_PTR pulContainerStatusFlags,
+                                                        CK_ULONG_PTR pulFailedSOLogins,
+                                                        CK_ULONG_PTR pulFailedUserLogins,
+                                                        CK_ULONG_PTR pulFailedLimitedUserLogins);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenStatus)(CK_SLOT_ID slotID,
+                                                    CK_ULONG_PTR pulStatusFlags,
+                                                    CK_ULONG_PTR pulCurSessionCnt,
+                                                    CK_ULONG_PTR pulCurRdWrSessionCnt);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetSessionInfo)(CK_SESSION_HANDLE hSession,
+                                                    CK_ULONG_PTR pulAidHigh,
+                                                    CK_ULONG_PTR pulAidLow,
+                                                    CK_ULONG_PTR pulContainerNumber,
+                                                    CK_ULONG_PTR pulAuthenticationLevel);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ReadCommonStore)(CK_ULONG index, CK_BYTE_PTR pBuffer, CK_ULONG_PTR pulBufferSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_WriteCommonStore)(CK_ULONG index, CK_BYTE_PTR pBuffer, CK_ULONG ulBufferSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetPrimarySlot)(CK_SESSION_HANDLE hSession, CK_SLOT_ID_PTR slotId_p);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetSecondarySlot)(CK_SESSION_HANDLE hSession, CK_SLOT_ID_PTR slotId_p);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_SwitchSecondarySlot)(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotID, CK_ULONG slotInstance);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_CloseSecondarySession)(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotID, CK_ULONG slotInstance);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloseAllSecondarySessions)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ChoosePrimarySlot)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ChooseSecondarySlot)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneObjectToAllSessions)(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloneAllObjectsToSession)(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ResetDevice)(CK_SLOT_ID slotId, CK_FLAGS flags);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Zeroize)(CK_SLOT_ID slotId, CK_FLAGS flags);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_FactoryReset)(CK_SLOT_ID slotId, CK_FLAGS flags);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SetPedId)(CK_SLOT_ID slotId, CK_ULONG usPedId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetPedId)(CK_SLOT_ID slotId, CK_ULONG* usPedId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SpRawRead)(CK_SLOT_ID slotId, CK_ULONG_PTR data);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SpRawWrite)(CK_SLOT_ID slotId, CK_ULONG_PTR data);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_CheckOperationState)(CK_SESSION_HANDLE hSession, CK_ULONG operation, CK_BBOOL* pactive);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DestroyMultipleObjects)(CK_SESSION_HANDLE hSession,
+                                                            CK_ULONG ulHandleCount,
+                                                            CK_OBJECT_HANDLE_PTR pHandleList,
+                                                            CK_ULONG_PTR pulIndex);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_OpenSecureToken)(CK_SESSION_HANDLE hSession,
+                                                     CK_ULONG storagePath,
+                                                     CK_ULONG devID,
+                                                     CK_ULONG mode,
+                                                     CK_ULONG pedId,
+                                                     CK_ULONG_PTR numberOfElems,
+                                                     CK_ULONG_PTR phID,
+                                                     CK_ULONG ParNameLength,
+                                                     CK_CHAR_PTR pPartitionName);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CloseSecureToken)(CK_SESSION_HANDLE hSession, CK_ULONG hID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ListSecureTokenInit)(CK_SESSION_HANDLE hSession,
+                                                         CK_ULONG hID,
+                                                         CK_ULONG PartNameSize,
+                                                         CK_ULONG_PTR numElements,
+                                                         CK_ULONG_PTR filenameLen,
+                                                         CK_BYTE_PTR pPartName);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ListSecureTokenUpdate)(CK_SESSION_HANDLE hSession,
+                                                           CK_ULONG hID,
+                                                           CK_ULONG index,
+                                                           CK_BYTE_PTR pData,
+                                                           CK_ULONG dataLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetSecureElementMeta)(CK_SESSION_HANDLE hSession,
+                                                          CK_ULONG hID,
+                                                          CK_MECHANISM_PTR pMechanism,
+                                                          CK_ULONG_PTR pObjClass,
+                                                          CK_ULONG_PTR pKeyType,
+                                                          CK_BYTE_PTR pLabel,
+                                                          CK_ULONG ulLabelLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Bip32ExportPublicKey)(CK_SESSION_HANDLE hSession,
+                                                          CK_ULONG ulObjectHandle,
+                                                          CK_BYTE_PTR pPublicSerialData,
+                                                          CK_ULONG_PTR pulPublicSerialLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Bip32ImportPublicKey)(CK_SESSION_HANDLE hSession,
+                                                          CK_BYTE_PTR pBase58Key,
+                                                          CK_ULONG usKeyLen,
+                                                          CK_ATTRIBUTE_PTR pTemplate,
+                                                          CK_ULONG usCount,
+                                                          CK_OBJECT_HANDLE_PTR phImportedObject);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_HAInit)(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hLoginPrivateKey);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_HAGetMasterPublic)(CK_SLOT_ID slotId, CK_BYTE_PTR pCertificate, CK_ULONG_PTR pulCertificate);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_HAGetLoginChallenge)(CK_SESSION_HANDLE hSession,
+                                                         CK_USER_TYPE userType,
+                                                         CK_BYTE_PTR pCertificate,
+                                                         CK_ULONG ulCertificateLen,
+                                                         CK_BYTE_PTR pChallengeBlob,
+                                                         CK_ULONG_PTR pulChallengeBlobLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_HAAnswerLoginChallenge)(CK_SESSION_HANDLE hSession,
+                                                            CK_OBJECT_HANDLE hLoginPrivateKey,
+                                                            CK_BYTE_PTR pChallengeBlob,
+                                                            CK_ULONG ulChallengeBlobLen,
+                                                            CK_BYTE_PTR pEncryptedPin,
+                                                            CK_ULONG_PTR pulEncryptedPinLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_HALogin)(CK_SESSION_HANDLE hSession,
+                                             CK_BYTE_PTR pEncryptedPin,
+                                             CK_ULONG ulEncryptedPinLen,
+                                             CK_BYTE_PTR pMofNBlob,
+                                             CK_ULONG_PTR pulMofNBlobLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_HAAnswerMofNChallenge)(CK_SESSION_HANDLE hSession,
+                                                           CK_BYTE_PTR pMofNBlob,
+                                                           CK_ULONG ulMofNBlobLen,
+                                                           CK_BYTE_PTR pMofNSecretBlob,
+                                                           CK_ULONG_PTR pulMofNSecretBlobLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_HAActivateMofN)(CK_SESSION_HANDLE hSession,
+                                                    CK_BYTE_PTR pMofNSecretBlob,
+                                                    CK_ULONG ulMofNSecretBlobLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetHAState)(CK_SLOT_ID slotId, CK_HA_STATE_PTR pState);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenCertificates)(CK_SLOT_ID slotID,
+                                                          CK_ULONG ulCertType,
+                                                          CK_BYTE_PTR pCertificate,
+                                                          CK_ULONG_PTR pulCertificateLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ExtractMaskedObject)(CK_SESSION_HANDLE hSession,
+                                                         CK_ULONG ulObjectHandle,
+                                                         CK_BYTE_PTR pMaskedKey,
+                                                         CK_ULONG_PTR pusMaskedKeyLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InsertMaskedObject)(CK_SESSION_HANDLE hSession,
+                                                        CK_ULONG_PTR pulObjectHandle,
+                                                        CK_BYTE_PTR pMaskedKey,
+                                                        CK_ULONG usMaskedKeyLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MultisignValue)(CK_SESSION_HANDLE hSession,
+                                                    CK_MECHANISM_PTR pMechanism,
+                                                    CK_ULONG ulMaskedKeyLen,
+                                                    CK_BYTE_PTR pMaskedKey,
+                                                    CK_ULONG_PTR pulBlobCount,
+                                                    CK_ULONG_PTR pulBlobLens,
+                                                    CK_BYTE_PTR CK_PTR ppBlobs,
+                                                    CK_ULONG_PTR pulSignatureLens,
+                                                    CK_BYTE_PTR CK_PTR ppSignatures);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SIMExtract)(CK_SESSION_HANDLE hSession,
+                                                CK_ULONG ulHandleCount,
+                                                CK_OBJECT_HANDLE_PTR pHandleList,
+                                                CK_ULONG ulAuthSecretCount,
+                                                CK_ULONG ulAuthSubsetCount,
+                                                CKA_SIM_AUTH_FORM authForm,
+                                                CK_ULONG_PTR pulAuthSecretSizes,
+                                                CK_BYTE_PTR* ppbAuthSecretList,
+                                                CK_BBOOL deleteAfterExtract,
+                                                CK_ULONG_PTR pulBlobSize,
+                                                CK_BYTE_PTR pBlob);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SIMInsert)(CK_SESSION_HANDLE hSession,
+                                               CK_ULONG ulAuthSecretCount,
+                                               CKA_SIM_AUTH_FORM authForm,
+                                               CK_ULONG_PTR pulAuthSecretSizes,
+                                               CK_BYTE_PTR* ppbAuthSecretList,
+                                               CK_ULONG ulBlobSize,
+                                               CK_BYTE_PTR pBlob,
+                                               CK_ULONG_PTR pulHandleCount,
+                                               CK_OBJECT_HANDLE_PTR pHandleList);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_SIMMultiSign)(CK_SESSION_HANDLE hSession,
+                                                  CK_MECHANISM_PTR pMechanism,
+                                                  CK_ULONG ulAuthSecretCount,
+                                                  CKA_SIM_AUTH_FORM authForm,
+                                                  CK_ULONG_PTR pulAuthSecretSizes,
+                                                  CK_BYTE_PTR* ppbAuthSecretList,
+                                                  CK_ULONG ulBlobSize,
+                                                  CK_BYTE_PTR pBlob,
+                                                  CK_ULONG ulInputDataCount,
+                                                  CK_ULONG_PTR pulInputDataLengths,
+                                                  CK_BYTE_PTR* ppbInputDataList,
+                                                  CK_ULONG_PTR pulSignatureLengths,
+                                                  CK_BYTE_PTR* ppbSignatureList);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Extract)(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Insert)(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenObjectUID)(CK_SLOT_ID slotID,
+                                                       CK_ULONG ulObjectType,
+                                                       CK_ULONG ulObjectHandle,
+                                                       CK_BYTE* ouid);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenObjectHandle)(CK_SLOT_ID slotID,
+                                                          CK_BYTE* ouid,
+                                                          CK_ULONG_PTR pulObjectType,
+                                                          CK_ULONG_PTR pulObjectHandle);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetObjectUID)(CK_SLOT_ID slotID,
+                                                  CK_ULONG ulContainerNum,
+                                                  CK_ULONG ulObjectType,
+                                                  CK_ULONG ulObjectHandle,
+                                                  CK_BYTE* ouid);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetObjectHandle)(CK_SLOT_ID slotID,
+                                                     CK_ULONG ulContainerNum,
+                                                     CK_BYTE* ouid,
+                                                     CK_ULONG_PTR pulObjectType,
+                                                     CK_ULONG_PTR pulObjectHandle);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DeleteContainer)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MTKSetStorage)(CK_SESSION_HANDLE ulSessionNumber, CK_ULONG ulStorageSetting);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MTKRestore)(CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MTKResplit)(CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MTKZeroize)(CK_SLOT_ID slotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MTKGetState)(CK_SLOT_ID slotID, CK_ULONG_PTR state);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_TamperClear)(CK_SESSION_HANDLE ulSessionNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STMToggle)(CK_SESSION_HANDLE ulSessionNumber,
+                                               CK_ULONG ulValue,
+                                               CK_ULONG ulInputDataSize,
+                                               CK_CHAR_PTR pInputData,
+                                               CK_ULONG_PTR pulOutputDataSize,
+                                               CK_CHAR_PTR pOutputData);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STMGetState)(CK_SLOT_ID slotID, CK_ULONG_PTR state);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTSV)(CK_SLOT_ID slotID, CK_ULONG_PTR pTSV);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InvokeServiceInit)(CK_SESSION_HANDLE hSession, CK_ULONG ulPortNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InvokeService)(CK_SESSION_HANDLE hSession,
+                                                   CK_BYTE_PTR pBufferIn,
+                                                   CK_ULONG ulBufferInLength,
+                                                   CK_ULONG_PTR pulBufferOutLength);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InvokeServiceFinal)(CK_SESSION_HANDLE hSession,
+                                                        CK_BYTE_PTR pBufferOut,
+                                                        CK_ULONG_PTR pulBufferOutLength);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InvokeServiceAsynch)(CK_SESSION_HANDLE hSession,
+                                                         CK_ULONG ulPortNumber,
+                                                         CK_BYTE_PTR pBufferIn,
+                                                         CK_ULONG ulBufferInLength);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InvokeServiceSinglePart)(CK_SESSION_HANDLE hSession,
+                                                             CK_ULONG ulPortNumber,
+                                                             CK_BYTE_PTR pBufferIn,
+                                                             CK_ULONG ulBufferInLength,
+                                                             CK_BYTE_PTR pBufferOut,
+                                                             CK_ULONG_PTR pulBufferOutLength);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_EncodeECPrimeParams)(CK_BYTE_PTR DerECParams,
+                                                         CK_ULONG_PTR DerECParamsLen,
+                                                         CK_BYTE_PTR prime,
+                                                         CK_ULONG primelen,
+                                                         CK_BYTE_PTR a,
+                                                         CK_ULONG alen,
+                                                         CK_BYTE_PTR b,
+                                                         CK_ULONG blen,
+                                                         CK_BYTE_PTR seed,
+                                                         CK_ULONG seedlen,
+                                                         CK_BYTE_PTR x,
+                                                         CK_ULONG xlen,
+                                                         CK_BYTE_PTR y,
+                                                         CK_ULONG ylen,
+                                                         CK_BYTE_PTR order,
+                                                         CK_ULONG orderlen,
+                                                         CK_BYTE_PTR cofactor,
+                                                         CK_ULONG cofactorlen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_EncodeECChar2Params)(CK_BYTE_PTR DerECParams,
+                                                         CK_ULONG_PTR DerECParamsLen,
+                                                         CK_ULONG m,
+                                                         CK_ULONG k1,
+                                                         CK_ULONG k2,
+                                                         CK_ULONG k3,
+                                                         CK_BYTE_PTR a,
+                                                         CK_ULONG alen,
+                                                         CK_BYTE_PTR b,
+                                                         CK_ULONG blen,
+                                                         CK_BYTE_PTR seed,
+                                                         CK_ULONG seedlen,
+                                                         CK_BYTE_PTR x,
+                                                         CK_ULONG xlen,
+                                                         CK_BYTE_PTR y,
+                                                         CK_ULONG ylen,
+                                                         CK_BYTE_PTR order,
+                                                         CK_ULONG orderlen,
+                                                         CK_BYTE_PTR cofactor,
+                                                         CK_ULONG cofactorlen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_EncodeECParamsFromFile)(CK_BYTE_PTR DerECParams,
+                                                            CK_ULONG_PTR DerECParamsLen,
+                                                            CK_BYTE_PTR paramsFile);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetHSMStats)(CK_SLOT_ID slotID,
+                                                 CK_ULONG ulStatsIdsCount,
+                                                 CK_ULONG_PTR pStatsIds,
+                                                 HSM_STATS_PARAMS* pStatsParams);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetHSMStorageInformation)(CK_SLOT_ID slotID,
+                                                              CK_ULONG_PTR pulContainerOverhead,
+                                                              CK_ULONG_PTR pulTotal,
+                                                              CK_ULONG_PTR pulUsed,
+                                                              CK_ULONG_PTR pulFree);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTokenStorageInformation)(CK_SLOT_ID slotID,
+                                                                CK_ULONG_PTR pulContainerOverhead,
+                                                                CK_ULONG_PTR pulTotal,
+                                                                CK_ULONG_PTR pulUsed,
+                                                                CK_ULONG_PTR pulFree,
+                                                                CK_ULONG_PTR pulObjectCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerStorageInformation)(CK_SLOT_ID slotID,
+                                                                    CK_ULONG ulContainerNumber,
+                                                                    CK_ULONG_PTR pulContainerOverhead,
+                                                                    CK_ULONG_PTR pulTotal,
+                                                                    CK_ULONG_PTR pulUsed,
+                                                                    CK_ULONG_PTR pulFree,
+                                                                    CK_ULONG_PTR pulObjectCount);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_SetContainerSize)(CK_SESSION_HANDLE hSession, CK_ULONG ulContainerNumber, CK_ULONG ulSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CreateContainerWithPolicy)(CK_SESSION_HANDLE hSession,
+                                                               CK_ULONG ulUSV,
+                                                               CK_CHAR_PTR pContainerName,
+                                                               CK_ULONG usContainerNameLen,
+                                                               CK_CHAR_PTR pPin,
+                                                               CK_ULONG usPinLen,
+                                                               CK_ULONG ulIDHigh,
+                                                               CK_ULONG ulIDLow,
+                                                               CK_ULONG ulOwnerHandle,
+                                                               CK_ULONG ulStorageFlags,
+                                                               CK_ULONG ulContainerSize,
+                                                               CK_ULONG_PTR pulContainerNumber,
+                                                               CK_ULONG policyVersion,
+                                                               CK_ULONG policySize,
+                                                               CK_BYTE_PTR pPolicyBuf);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_CreateContainer)(CK_SESSION_HANDLE hSession,
+                                                     CK_ULONG ulUSV,
+                                                     CK_CHAR_PTR pContainerName,
+                                                     CK_ULONG usContainerNameLen,
+                                                     CK_CHAR_PTR pPin,
+                                                     CK_ULONG usPinLen,
+                                                     CK_ULONG ulIDHigh,
+                                                     CK_ULONG ulIDLow,
+                                                     CK_ULONG ulOwnerHandle,
+                                                     CK_ULONG ulStorageFlags,
+                                                     CK_ULONG ulContainerSize,
+                                                     CK_ULONG_PTR pulContainerNumber);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_InitAudit)(CK_SLOT_ID slotID, CK_CHAR_PTR pPin, CK_ULONG usPinLen, CK_CHAR_PTR pLabel);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LogVerify)(CK_SESSION_HANDLE hSession,
+                                               CK_BYTE_PTR pLogMsgs,
+                                               CK_ULONG ulMsgCount,
+                                               CK_ULONG bChainToHSM,
+                                               CK_ULONG_PTR pulNumVerified);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_LogVerifyFile)(CK_SESSION_HANDLE hSession, CK_CHAR_PTR pFileName, CK_ULONG_PTR ulNumVerified);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LogExternal)(CK_SLOT_ID slotID,
+                                                 CK_SESSION_HANDLE hSession,
+                                                 const CK_CHAR* pStr,
+                                                 CK_ULONG ulLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LogImportSecret)(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pStr, CK_ULONG strSize);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_LogExportSecret)(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pStr, CK_ULONG_PTR pStrSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_TimeSync)(CK_SESSION_HANDLE hSession, CK_ULONG ulTime);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTime)(CK_SESSION_HANDLE hSession, CK_ULONG_PTR pulTime);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LogSetConfig)(CK_SESSION_HANDLE hSession,
+                                                  CK_ULONG mask,
+                                                  CK_ULONG logRotateOffset,
+                                                  CK_ULONG logRotateInterval,
+                                                  CK_ULONG maxLogSize,
+                                                  CK_BYTE_PTR pLogPath);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LogGetConfig)(CK_SESSION_HANDLE hSession,
+                                                  CK_ULONG* mask,
+                                                  CK_ULONG* logRotateOffset,
+                                                  CK_ULONG* logRotateInterval,
+                                                  CK_ULONG* maxLogSize,
+                                                  CK_BYTE_PTR pLogPath);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ReplaceFastPathKEK)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LogGetStatus)(CK_SLOT_ID slotId,
+                                                  CK_ULONG* auditInitStatus,
+                                                  CK_ULONG* lastPollResult,
+                                                  CK_ULONG* lastSetConfigResult,
+                                                  CK_ULONG* isConfigInParamArea,
+                                                  CK_ULONG* numRecordsInFlash);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DeleteContainerWithHandle)(CK_SESSION_HANDLE hSession, CK_ULONG ulContainerNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerList)(CK_SLOT_ID slotID,
+                                                      CK_ULONG ulGroupHandle,
+                                                      CK_ULONG ulContainerType,
+                                                      CK_ULONG_PTR pulContainerHandles,
+                                                      CK_ULONG_PTR pulNumberOfHandles);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetContainerName)(CK_SLOT_ID slotID,
+                                                      CK_ULONG ulContainerHandle,
+                                                      CK_BYTE_PTR pContainerName,
+                                                      CK_ULONG_PTR pulContainerNameLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetNumberOfAllowedContainers)(CK_SLOT_ID slot, CK_ULONG_PTR pulAllowedContainers);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetTunnelSlotNumber)(CK_SLOT_ID slotID, CK_SLOT_ID_PTR pTunnelSlotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetClusterState)(CK_SLOT_ID slotId, CK_CLUSTER_STATE_PTR pState);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_LockClusteredSlot)(CK_SLOT_ID slotId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_UnlockClusteredSlot)(CK_SLOT_ID slotId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ModifyUsageCount)(CK_SESSION_HANDLE hSession,
+                                                      CK_OBJECT_HANDLE hObject,
+                                                      CK_ULONG ulCommandType,
+                                                      CK_ULONG ulValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_EnableUnauthTokenInsertion)(CK_SESSION_HANDLE hSession,
+                                                                CK_ULONG ulMaxUsageCount,
+                                                                CK_ULONG_PTR ulContextHandle);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetUnauthTokenInsertionStatus)(CK_SESSION_HANDLE hSession,
+                                                                   CK_ULONG ulContextHandle,
+                                                                   CK_ULONG* pulMaxUsageCount,
+                                                                   CK_ULONG* pulCurUsageCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DisableUnauthTokenInsertion)(CK_SESSION_HANDLE hSession, CK_ULONG ulContextHandle);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCRegister)(CK_SESSION_HANDLE hSession,
+                                                 CK_SLOT_ID TargetSlotID,
+                                                 const CK_CHAR* username,
+                                                 CK_ULONG access,
+                                                 const CK_CHAR* pmod,
+                                                 CK_ULONG mod_len,
+                                                 const CK_CHAR* pexp,
+                                                 CK_ULONG exp_len);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCDeregister)(CK_SESSION_HANDLE hSession, CK_SLOT_ID TargetslotID, const CK_CHAR* username);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetPubKey)(CK_SESSION_HANDLE hSession,
+                                                  CK_SLOT_ID TargetSlotID,
+                                                  const CK_CHAR* username,
+                                                  CK_CHAR* pmod,
+                                                  CK_ULONG_PTR mod_len,
+                                                  CK_CHAR* pexp,
+                                                  CK_ULONG_PTR exp_len);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetClientsList)(CK_SESSION_HANDLE hSession,
+                                                       CK_SLOT_ID TargetSlotID,
+                                                       CK_ULONG_PTR pulCIDArray,
+                                                       CK_ULONG_PTR pulCIDArraySize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetClientInfo)(CK_SESSION_HANDLE hSession,
+                                                      CK_SLOT_ID TargetSlotID,
+                                                      CK_ULONG ulHandke,
+                                                      CK_CHAR* username,
+                                                      CK_ULONG_PTR name_len,
+                                                      CK_ULONG_PTR access,
+                                                      CK_CHAR* mod,
+                                                      CK_ULONG_PTR mod_len,
+                                                      CK_CHAR* exp,
+                                                      CK_ULONG_PTR exp_len);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetPartPubKey)(CK_SESSION_HANDLE hSession,
+                                                      CK_SLOT_ID TargetSlotID,
+                                                      CK_CHAR* mod,
+                                                      CK_ULONG_PTR modSize,
+                                                      CK_CHAR* exp,
+                                                      CK_ULONG_PTR expSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetAdminPubKey)(CK_SLOT_ID slotId,
+                                                       CK_CHAR* mod,
+                                                       CK_ULONG_PTR modSize,
+                                                       CK_CHAR* exp,
+                                                       CK_ULONG_PTR expSize);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCSetCipherAlgorithm)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG CipherID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetCipherAlgorithm)(CK_SESSION_HANDLE hSession,
+                                                           CK_ULONG TargetSlotID,
+                                                           CK_BYTE_PTR pIDCount,
+                                                           CK_ULONG_PTR pIDs);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCClearCipherAlgorithm)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG CipherID);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCSetDigestAlgorithm)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG DigestID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetDigestAlgorithm)(CK_SESSION_HANDLE hSession,
+                                                           CK_ULONG TargetSlotID,
+                                                           CK_BYTE_PTR pIDCount,
+                                                           CK_ULONG_PTR pIDs);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCClearDigestAlgorithm)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG DigestID);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCSetKeyLifeTime)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG lifeTime);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCGetKeyLifeTime)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG_PTR plifeTime);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCSetKeyActivationTimeOut)(CK_SESSION_HANDLE hSession,
+                                                                CK_ULONG TargetSlotID,
+                                                                CK_ULONG timeOut);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetKeyActivationTimeOut)(CK_SESSION_HANDLE hSession,
+                                                                CK_ULONG TargetSlotID,
+                                                                CK_ULONG_PTR ptimeOut);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_STCSetMaxSessions)(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG maxSessions);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetMaxSessions)(CK_SESSION_HANDLE hSession,
+                                                       CK_ULONG TargetSlotID,
+                                                       CK_ULONG_PTR pmaxSessions);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCSetSequenceWindowSize)(CK_SESSION_HANDLE hSession,
+                                                              CK_ULONG TargetSlotID,
+                                                              CK_ULONG windowSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetSequenceWindowSize)(CK_SESSION_HANDLE hSession,
+                                                              CK_ULONG TargetSlotID,
+                                                              CK_ULONG_PTR pwindowSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCIsEnabled)(CK_ULONG TargetSlotID, CK_BYTE_PTR pbenabled);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetState)(CK_ULONG TargetSlotID, CK_CHAR* str, CK_BYTE bbufferSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetCurrentKeyLife)(CK_SESSION_HANDLE hSession,
+                                                          CK_ULONG TargetSlotID,
+                                                          CK_ULONG_PTR pcurKeyLife);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetSlotIdForPhysicalSlot)(CK_ULONG physicalSlot, CK_SLOT_ID_PTR pSlotId);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_GetSlotIdForContainer)(CK_ULONG slotID, CK_ULONG ulContainerNumber, CK_SLOT_ID_PTR pSlotID);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetChannelID)(CK_SLOT_ID slotId, CK_ULONG_PTR ulChannelId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetCipherID)(CK_SLOT_ID slotId, CK_ULONG_PTR ulCipherId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetDigestID)(CK_SLOT_ID slotId, CK_ULONG_PTR ulDigestId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetCipherIDs)(CK_SLOT_ID slotID, CK_ULONG_PTR pulArray, CK_BYTE_PTR pbArraySize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetCipherNameByID)(CK_SLOT_ID slotID,
+                                                          CK_ULONG ulCipherID,
+                                                          CK_CHAR_PTR pszName,
+                                                          CK_BYTE bNameBufSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetDigestIDs)(CK_SLOT_ID slotID, CK_ULONG_PTR pulArray, CK_BYTE_PTR pbArraySize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_STCGetDigestNameByID)(CK_SLOT_ID slotID,
+                                                          CK_ULONG ulDigestID,
+                                                          CK_CHAR_PTR pszName,
+                                                          CK_BYTE bNameBufSize);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetServerInstanceBySlotID)(CK_SLOT_ID slotID, CK_ULONG_PTR pulInstanceNumber);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetSlotListFromServerInstance)(CK_ULONG instanceNumber,
+                                                                   CK_SLOT_ID_PTR slotList,
+                                                                   CK_ULONG_PTR pulCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ChangeLabel)(CK_SESSION_HANDLE hSession,
+                                                 CK_SLOT_ID ulSlotID,
+                                                 CK_CHAR_PTR pulLabel,
+                                                 CK_ULONG ulLabelLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_PerformSelfTest)(CK_SLOT_ID slotID,
+                                                     CK_ULONG typeOfTest,
+                                                     CK_BYTE_PTR inputData,
+                                                     CK_ULONG sizeOfInputData,
+                                                     CK_BYTE_PTR outputData,
+                                                     CK_ULONG_PTR sizeOfOutputData);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_FMDownload)(CK_SESSION_HANDLE hTokenSession,
+                                                CK_OBJECT_HANDLE hObject,
+                                                CK_ULONG ulParamLen,
+                                                CK_BYTE_PTR pParam,
+                                                CK_ULONG ulImageLen,
+                                                CK_BYTE_PTR pImage,
+                                                CK_ULONG ulSignatureLen,
+                                                CK_BYTE_PTR pSignature);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_FMDelete)(CK_SESSION_HANDLE hTokenSession, CK_ULONG fmid);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_FMActivateSMFS)(CK_SESSION_HANDLE hTokenSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetActualSlotList)(CK_SLOT_ID slotId,
+                                                       CK_ULONG_PTR phsmidx,
+                                                       CK_SLOT_ID_PTR pActualslotID,
+                                                       CK_ULONG_PTR pulCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DeriveKeyAndWrap)(CK_SESSION_HANDLE hSession,
+                                                      CK_MECHANISM_PTR pMechanismDerive,
+                                                      CK_OBJECT_HANDLE hBaseKey,
+                                                      CK_ATTRIBUTE_PTR pTemplate,
+                                                      CK_ULONG ulAttributeCount,
+                                                      CK_MECHANISM_PTR pMechanismWrap,
+                                                      CK_OBJECT_HANDLE hWrappingKey,
+                                                      CK_BYTE_PTR pWrappedKey,
+                                                      CK_ULONG_PTR pulWrappedKeyLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_MdPriv_Initialize)(void* pMdPrivIf, unsigned int len, void* pLogIf);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_Get)(CK_SLOT_ID slotID, CK_ULONG ulItem, CK_BYTE_PTR pBuffer, CK_ULONG_PTR pulBufferLen);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_Put)(CK_SLOT_ID slotID,
+                                         CK_SESSION_HANDLE hSession,
+                                         CK_ULONG ulParamId,
+                                         CK_ULONG ulParamSize,
+                                         CK_BYTE_PTR pParamBuffer);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetDefaultPartitionPolicyValue)(CK_SLOT_ID slotID,
+                                                                    CK_ULONG ulPolicyId,
+                                                                    CK_ULONG_PTR pulPolicyValue);
+typedef CK_RV
+  CK_ENTRY(CK_PTR CK_CA_GetDefaultHSMPolicyValue)(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ValidateHSMPolicySet)(CK_SLOT_ID slotId,
+                                                          CK_POLICY_INFO_PTR policyInfo,
+                                                          CK_ULONG policyCount,
+                                                          CK_RV_PTR policyResults);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ValidateContainerPolicySet)(CK_SLOT_ID slotId,
+                                                                CK_ULONG ulContainerNumber,
+                                                                CK_POLICY_INFO_PTR policyInfo,
+                                                                CK_ULONG policyCount,
+                                                                CK_RV_PTR policyResults);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ZeroizeContainer)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_InitToken)(CK_SLOT_ID slotID,
+                                               CK_CHAR_PTR pPin,
+                                               CK_ULONG usPinLen,
+                                               CK_CHAR_PTR pLabel,
+                                               CK_BYTE_PTR pDomain,
+                                               CK_ULONG ulDomainLen,
+                                               CK_ULONG ulPolicyCount,
+                                               CK_POLICY_INFO_PTR pPolicyData,
+                                               CK_ULONG ulHSMPolicyCount,
+                                               CK_POLICY_INFO_PTR pHSMPolicyData);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ReadUtilizationMetrics)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ReadAndResetUtilizationMetrics)(CK_SESSION_HANDLE hSession);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ReadAllUtilizationCounters)(CK_SESSION_HANDLE hSession,
+                                                                CK_UTILIZATION_COUNTER_PTR buff,
+                                                                CK_ULONG_PTR length);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_ReadUtilizationCount)(CK_SESSION_HANDLE hSession,
+                                                          CK_ULONGLONG serialNum,
+                                                          CK_ULONG ulBinId,
+                                                          CK_ULONG ulCounterId,
+                                                          CK_UTILIZATION_COUNT_PTR pCount);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DescribeUtilizationBinId)(CK_ULONG ulBinId, CK_CHAR_PTR CK_PTR describe);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_DescribeUtilizationCounterId)(CK_ULONG ulCounterId, CK_CHAR_PTR CK_PTR describe);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_TestTrace)(CK_SLOT_ID slotID,
+                                               CK_ULONG ulTypeOfTrace,
+                                               CK_BYTE_PTR pInData,
+                                               CK_ULONG ulInDataLength,
+                                               CK_BYTE_PTR pOutData,
+                                               CK_ULONG_PTR pulOutDataLength);
diff --git a/mft_utils/hsmclient/inc/sfnt_extensions.h b/mft_utils/hsmclient/inc/sfnt_extensions.h
index 1f99a6ba..0ed71d94 100644
--- a/mft_utils/hsmclient/inc/sfnt_extensions.h
+++ b/mft_utils/hsmclient/inc/sfnt_extensions.h
@@ -48,28 +48,20 @@ CK_RV CK_ENTRY CA_GetFunctionList(CK_SFNT_CA_FUNCTION_LIST_PTR_PTR ppSfntFunctio
 
 CK_RV CK_ENTRY CA_WaitForSlotEvent(CK_FLAGS flags, CK_ULONG history[2], CK_SLOT_ID_PTR pSlot, CK_VOID_PTR pReserved);
 
-
 CK_RV CK_ENTRY CA_InitIndirectToken(CK_SLOT_ID slotID,
                                     CK_CHAR_PTR pPin,
                                     CK_ULONG usPinLen,
                                     CK_CHAR_PTR pLabel,
                                     CK_SESSION_HANDLE hPrimarySession);
 
-
 CK_RV CK_ENTRY CA_InitIndirectPIN(CK_SESSION_HANDLE hSession,
                                   CK_CHAR_PTR pPin,
                                   CK_ULONG usPinLen,
                                   CK_SESSION_HANDLE hPrimarySession);
 
+CK_RV CK_ENTRY CA_ResetPIN(CK_SESSION_HANDLE hSession, CK_CHAR_PTR pPin, CK_ULONG usPinLen);
 
-CK_RV CK_ENTRY CA_ResetPIN(CK_SESSION_HANDLE    hSession,
-                           CK_CHAR_PTR          pPin,
-                           CK_ULONG            usPinLen);
-
-CK_RV CK_ENTRY CA_InitRolePIN(CK_SESSION_HANDLE hSession,
-                              CK_USER_TYPE      userType,
-                              CK_CHAR_PTR       pPin,
-                              CK_ULONG          usPinLen);
+CK_RV CK_ENTRY CA_InitRolePIN(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_CHAR_PTR pPin, CK_ULONG usPinLen);
 
 CK_RV CK_ENTRY CA_InitSlotRolePIN(CK_SESSION_HANDLE hSession,
                                   CK_SLOT_ID slotID,
@@ -77,42 +69,32 @@ CK_RV CK_ENTRY CA_InitSlotRolePIN(CK_SESSION_HANDLE hSession,
                                   CK_CHAR_PTR pPin,
                                   CK_ULONG usPinLen);
 
-CK_RV CK_ENTRY CA_RoleStateGet(CK_SLOT_ID slotID,
-                               CK_USER_TYPE userType,
-                               CA_ROLE_STATE *pRoleState);
+CK_RV CK_ENTRY CA_RoleStateGet(CK_SLOT_ID slotID, CK_USER_TYPE userType, CA_ROLE_STATE* pRoleState);
 
 CK_RV CK_ENTRY CA_CreateLoginChallenge(CK_SESSION_HANDLE hSession,
-                                       CK_USER_TYPE      userType,
-                                       CK_ULONG          ulChallengeDataSize,
-                                       CK_CHAR_PTR       pChallengeData,
-                                       CK_ULONG_PTR      ulOutputDataSize,
-                                       CK_CHAR_PTR       pOutputData);
+                                       CK_USER_TYPE userType,
+                                       CK_ULONG ulChallengeDataSize,
+                                       CK_CHAR_PTR pChallengeData,
+                                       CK_ULONG_PTR ulOutputDataSize,
+                                       CK_CHAR_PTR pOutputData);
 
 CK_RV CK_ENTRY CA_CreateContainerLoginChallenge(CK_SESSION_HANDLE hSession,
-                                                CK_SLOT_ID        targetSlotID,
-                                                CK_USER_TYPE      userType,
-                                                CK_ULONG          ulChallengeDataSize,
-                                                CK_CHAR_PTR       pChallengeData,
-                                                CK_ULONG_PTR      ulOutputDataSize,
-                                                CK_CHAR_PTR       pOutputData);
-
+                                                CK_SLOT_ID targetSlotID,
+                                                CK_USER_TYPE userType,
+                                                CK_ULONG ulChallengeDataSize,
+                                                CK_CHAR_PTR pChallengeData,
+                                                CK_ULONG_PTR ulOutputDataSize,
+                                                CK_CHAR_PTR pOutputData);
 
 CK_RV CK_ENTRY CA_Deactivate(CK_SLOT_ID slotId, CK_USER_TYPE userType);
 
-CK_RV CK_ENTRY CA_FindAdminSlotForSlot(CK_SLOT_ID inputSlot,
-                                       CK_SLOT_ID* pSlotId,
-                                       CK_SLOT_ID* pPrevSlotId);
+CK_RV CK_ENTRY CA_FindAdminSlotForSlot(CK_SLOT_ID inputSlot, CK_SLOT_ID* pSlotId, CK_SLOT_ID* pPrevSlotId);
 
-CK_RV CK_ENTRY CA_TokenInsert(CK_SESSION_HANDLE hSession,
-                              const CT_TokenHndle token,
-                              CK_SLOT_ID slotID);
+CK_RV CK_ENTRY CA_TokenInsert(CK_SESSION_HANDLE hSession, const CT_TokenHndle token, CK_SLOT_ID slotID);
 
-CK_RV CK_ENTRY CA_TokenInsertNoAuth(const CT_TokenHndle token,
-                                    CK_SLOT_ID slotID);
+CK_RV CK_ENTRY CA_TokenInsertNoAuth(const CT_TokenHndle token, CK_SLOT_ID slotID);
 
-CK_RV CK_ENTRY CA_TokenZeroize(CK_SESSION_HANDLE hSession,
-                               CK_SLOT_ID slotID,
-                               CK_FLAGS flags);
+CK_RV CK_ENTRY CA_TokenZeroize(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotID, CK_FLAGS flags);
 
 CK_RV CK_ENTRY CA_TokenDelete(CK_SESSION_HANDLE hSession, CK_SLOT_ID slotID);
 
@@ -124,14 +106,12 @@ CK_RV CK_ENTRY CA_GetFirmwareVersion(CK_SLOT_ID slotID,
                                      CK_ULONG_PTR fwMinor,
                                      CK_ULONG_PTR fwSubminor);
 
-
 /****************************************************************************\
 *                                                                            *
 * Session management                                                         *
 *                                                                            *
 \****************************************************************************/
 
-
 CK_RV CK_ENTRY CA_OpenSession(CK_SLOT_ID slotID,
                               CK_ULONG ulContainerNumber,
                               CK_FLAGS flags,
@@ -139,7 +119,6 @@ CK_RV CK_ENTRY CA_OpenSession(CK_SLOT_ID slotID,
                               CK_NOTIFY Notify,
                               CK_SESSION_HANDLE_PTR phSession);
 
-
 CK_RV CK_ENTRY CA_OpenSessionWithAppID(CK_SLOT_ID slotID,
                                        CK_FLAGS flags,
                                        CK_ULONG ulHigh,
@@ -148,11 +127,7 @@ CK_RV CK_ENTRY CA_OpenSessionWithAppID(CK_SLOT_ID slotID,
                                        CK_NOTIFY Notify,
                                        CK_SESSION_HANDLE_PTR phSession);
 
-
-CK_RV CK_ENTRY CA_IndirectLogin(CK_SESSION_HANDLE hSession,
-                                CK_USER_TYPE userType,
-                                CK_SESSION_HANDLE hPrimarySession);
-
+CK_RV CK_ENTRY CA_IndirectLogin(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_SESSION_HANDLE hPrimarySession);
 
 /****************************************************************************\
 *                                                                            *
@@ -165,14 +140,10 @@ CK_RV CK_ENTRY CA_DeleteRemotePEDVector(CK_SESSION_HANDLE hSession);
 
 CK_RV CK_ENTRY CA_GetRemotePEDVectorStatus(CK_SLOT_ID slotID, CK_ULONG_PTR pulStatus);
 
-CK_RV CK_ENTRY CA_ConfigureRemotePED(CK_SLOT_ID slotId,
-                                     CK_CHAR_PTR pHostName,
-                                     CK_ULONG ulPort,
-                                     CK_ULONG_PTR pulPedId);
+CK_RV CK_ENTRY CA_ConfigureRemotePED(CK_SLOT_ID slotId, CK_CHAR_PTR pHostName, CK_ULONG ulPort, CK_ULONG_PTR pulPedId);
 
 CK_RV CK_ENTRY CA_DismantleRemotePED(CK_SLOT_ID slotId, CK_ULONG ulPedId);
 
-
 /****************************************************************************\
 *                                                                            *
 * Application access management                                              *
@@ -180,25 +151,19 @@ CK_RV CK_ENTRY CA_DismantleRemotePED(CK_SLOT_ID slotId, CK_ULONG ulPedId);
 \****************************************************************************/
 CK_RV CK_ENTRY CA_Restart(CK_SLOT_ID slotID);
 CK_RV CK_ENTRY CA_RestartForContainer(CK_SLOT_ID slotID, CK_ULONG ulContainerNumber);
-CK_RV CK_ENTRY CA_CloseApplicationID(CK_SLOT_ID slotID,
-                                     CK_ULONG ulHigh,
-                                     CK_ULONG ulLow);
+CK_RV CK_ENTRY CA_CloseApplicationID(CK_SLOT_ID slotID, CK_ULONG ulHigh, CK_ULONG ulLow);
 CK_RV CK_ENTRY CA_CloseApplicationIDForContainer(CK_SLOT_ID slotID,
-                                     CK_ULONG ulHigh,
-                                     CK_ULONG ulLow,
-                                     CK_ULONG ulContainerNumber);
+                                                 CK_ULONG ulHigh,
+                                                 CK_ULONG ulLow,
+                                                 CK_ULONG ulContainerNumber);
 
-CK_RV CK_ENTRY CA_OpenApplicationID(CK_SLOT_ID slotID,
-                                     CK_ULONG ulHigh,
-                                     CK_ULONG ulLow);
+CK_RV CK_ENTRY CA_OpenApplicationID(CK_SLOT_ID slotID, CK_ULONG ulHigh, CK_ULONG ulLow);
 CK_RV CK_ENTRY CA_OpenApplicationIDForContainer(CK_SLOT_ID slotID,
-                                     CK_ULONG ulHigh,
-                                     CK_ULONG ulLow,
-                                     CK_ULONG ulContainerNumber);
-
-CK_RV CK_ENTRY CA_SetApplicationID(CK_ULONG ulHigh,
-                                   CK_ULONG ulLow);
+                                                CK_ULONG ulHigh,
+                                                CK_ULONG ulLow,
+                                                CK_ULONG ulContainerNumber);
 
+CK_RV CK_ENTRY CA_SetApplicationID(CK_ULONG ulHigh, CK_ULONG ulLow);
 
 /****************************************************************************\
 *                                                                            *
@@ -214,31 +179,28 @@ CK_RV CK_ENTRY CA_SetApplicationID(CK_ULONG ulHigh,
 * Certificate Authority
 *
 \****************************************************************************/
-CK_RV CK_ENTRY CA_ManualKCV( CK_SESSION_HANDLE hSession );
-CK_RV CK_ENTRY CA_SetLKCV( CK_SESSION_HANDLE hSession,
-                           CK_BYTE_PTR pLegacyCloningDomainString,
-                           CK_ULONG ulLegacyCloningDomainStringLen);
-CK_RV CK_ENTRY CA_SetKCV( CK_SESSION_HANDLE hSession,
-                           CK_BYTE_PTR pCloningDomainString,
-                           CK_ULONG ulCloningDomainStringLen);
-CK_RV CK_ENTRY CA_SetRDK( CK_SESSION_HANDLE hSession,
-                           const CK_BYTE *pCloningDomainString,
-                           CK_ULONG ulCloningDomainStringLen);
-CK_RV CK_ENTRY CA_SetCloningDomain( CK_BYTE_PTR pCloningDomainString,
-                                    CK_ULONG ulCloningDomainStringLen );
-CK_RV CK_ENTRY CA_ClonePrivateKey( CK_SESSION_HANDLE hTargetSession,
-                                   CK_SESSION_HANDLE hSourceSession,
-                                   CK_OBJECT_HANDLE hObjectToCloneHandle,
-                                   CK_OBJECT_HANDLE_PTR phClonedKey );
-CK_RV CK_ENTRY CA_CloneObject( CK_SESSION_HANDLE hTargetSession,
-                               CK_SESSION_HANDLE hSourceSession,
-                               CK_ULONG ulObjectType,
-                               CK_OBJECT_HANDLE hObjectHandle,
-                               CK_OBJECT_HANDLE_PTR phClonedObject );
-
-CK_RV CK_ENTRY CA_GenerateCloningKEV(CK_SESSION_HANDLE hSession,
-                        CK_BYTE_PTR pKEV,
-                        CK_ULONG_PTR pulKEVSize);
+CK_RV CK_ENTRY CA_ManualKCV(CK_SESSION_HANDLE hSession);
+CK_RV CK_ENTRY CA_SetLKCV(CK_SESSION_HANDLE hSession,
+                          CK_BYTE_PTR pLegacyCloningDomainString,
+                          CK_ULONG ulLegacyCloningDomainStringLen);
+CK_RV CK_ENTRY CA_SetKCV(CK_SESSION_HANDLE hSession,
+                         CK_BYTE_PTR pCloningDomainString,
+                         CK_ULONG ulCloningDomainStringLen);
+CK_RV CK_ENTRY CA_SetRDK(CK_SESSION_HANDLE hSession,
+                         const CK_BYTE* pCloningDomainString,
+                         CK_ULONG ulCloningDomainStringLen);
+CK_RV CK_ENTRY CA_SetCloningDomain(CK_BYTE_PTR pCloningDomainString, CK_ULONG ulCloningDomainStringLen);
+CK_RV CK_ENTRY CA_ClonePrivateKey(CK_SESSION_HANDLE hTargetSession,
+                                  CK_SESSION_HANDLE hSourceSession,
+                                  CK_OBJECT_HANDLE hObjectToCloneHandle,
+                                  CK_OBJECT_HANDLE_PTR phClonedKey);
+CK_RV CK_ENTRY CA_CloneObject(CK_SESSION_HANDLE hTargetSession,
+                              CK_SESSION_HANDLE hSourceSession,
+                              CK_ULONG ulObjectType,
+                              CK_OBJECT_HANDLE hObjectHandle,
+                              CK_OBJECT_HANDLE_PTR phClonedObject);
+
+CK_RV CK_ENTRY CA_GenerateCloningKEV(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pKEV, CK_ULONG_PTR pulKEVSize);
 
 CK_RV CK_ENTRY CA_CloneAsTargetInit(CK_SESSION_HANDLE hSession,
                                     CK_BYTE_PTR pTWC,
@@ -249,161 +211,145 @@ CK_RV CK_ENTRY CA_CloneAsTargetInit(CK_SESSION_HANDLE hSession,
                                     CK_BYTE_PTR pPart1,
                                     CK_ULONG_PTR pulPart1Size);
 
-CK_RV CK_ENTRY CA_CloneAsSource( CK_SESSION_HANDLE hSession,
-                              CK_ULONG hType,
-                              CK_ULONG hHandle,
-                              CK_BYTE_PTR pPart1,
-                              CK_ULONG ulPart1Size,
-                              CK_BBOOL bReplicate,
-                              CK_BYTE_PTR pPart2,
-                              CK_ULONG_PTR pulPart2Size);
+CK_RV CK_ENTRY CA_CloneAsSource(CK_SESSION_HANDLE hSession,
+                                CK_ULONG hType,
+                                CK_ULONG hHandle,
+                                CK_BYTE_PTR pPart1,
+                                CK_ULONG ulPart1Size,
+                                CK_BBOOL bReplicate,
+                                CK_BYTE_PTR pPart2,
+                                CK_ULONG_PTR pulPart2Size);
 
 CK_RV CK_ENTRY CA_CloneAsTarget(CK_SESSION_HANDLE hSession,
-                              CK_BYTE_PTR pKEV,
-                              CK_ULONG ulKEVSize,
-                              CK_BYTE_PTR pPart2,
-                              CK_ULONG ulPart2Size,
-                              CK_ULONG hType,
-                              CK_ULONG hHandle,
-                              CK_BBOOL bReplicate,
-                              CK_OBJECT_HANDLE_PTR phClonedHandle);
-
+                                CK_BYTE_PTR pKEV,
+                                CK_ULONG ulKEVSize,
+                                CK_BYTE_PTR pPart2,
+                                CK_ULONG ulPart2Size,
+                                CK_ULONG hType,
+                                CK_ULONG hHandle,
+                                CK_BBOOL bReplicate,
+                                CK_OBJECT_HANDLE_PTR phClonedHandle);
 
 CK_RV CK_ENTRY CA_SetMofN(CK_BBOOL bFlag);
-CK_RV CK_ENTRY CA_GenerateMofN( CK_SESSION_HANDLE hSession,
-                                CK_ULONG ulM,
-                                CA_MOFN_GENERATION_PTR pVectors,
-                                CK_ULONG ulVectorCount,
-                                CK_ULONG isSecurePortUsed,
-                                CK_VOID_PTR pReserved );
-CK_RV CK_ENTRY CA_GenerateCloneableMofN( CK_SESSION_HANDLE hSession,
-                                         CK_ULONG ulM,
-                                         CA_MOFN_GENERATION_PTR pVectors,
-                                         CK_ULONG ulVectorCount,
-                                         CK_ULONG isSecurePortUsed,
-                                         CK_VOID_PTR pReserved );
-CK_RV CK_ENTRY CA_ModifyMofN( CK_SESSION_HANDLE hSession,
-                              CK_ULONG ulM,
-                              CA_MOFN_GENERATION_PTR pVectors,
-                              CK_ULONG ulVectorCount,
-                              CK_ULONG isSecurePortUsed,
-                              CK_VOID_PTR pReserved );
-CK_RV CK_ENTRY CA_CloneMofN( CK_SESSION_HANDLE hSession,
-                             CK_SESSION_HANDLE hPrimarySession,
-                             CK_VOID_PTR pReserved );
-CK_RV CK_ENTRY CA_CloneModifyMofN( CK_SESSION_HANDLE hSession,
-                                   CK_SESSION_HANDLE hPrimarySession,
-                                   CK_VOID_PTR pReserved );
-CK_RV CK_ENTRY CA_ActivateMofN( CK_SESSION_HANDLE hSession,
-                                CA_MOFN_ACTIVATION_PTR pVectors,
-                                CK_ULONG ulVectorCount );
-CK_RV CK_ENTRY CA_DeactivateMofN( CK_SESSION_HANDLE hSession );
-
-CK_RV CK_ENTRY CA_GetMofNStatus( CK_SLOT_ID slotID,
-                                 CA_MOFN_STATUS_PTR pMofNStatus );
-
-CK_RV CK_ENTRY CA_DuplicateMofN( CK_SESSION_HANDLE hSession );
-
-
-CK_RV CK_ENTRY CA_IsMofNEnabled (   CK_SLOT_ID          slotID,
-                                    CK_ULONG_PTR        enabled);
-
-CK_RV CK_ENTRY CA_IsMofNRequired(   CK_SLOT_ID          slotID,
-                                    CK_ULONG_PTR        required);
-
+CK_RV CK_ENTRY CA_GenerateMofN(CK_SESSION_HANDLE hSession,
+                               CK_ULONG ulM,
+                               CA_MOFN_GENERATION_PTR pVectors,
+                               CK_ULONG ulVectorCount,
+                               CK_ULONG isSecurePortUsed,
+                               CK_VOID_PTR pReserved);
+CK_RV CK_ENTRY CA_GenerateCloneableMofN(CK_SESSION_HANDLE hSession,
+                                        CK_ULONG ulM,
+                                        CA_MOFN_GENERATION_PTR pVectors,
+                                        CK_ULONG ulVectorCount,
+                                        CK_ULONG isSecurePortUsed,
+                                        CK_VOID_PTR pReserved);
+CK_RV CK_ENTRY CA_ModifyMofN(CK_SESSION_HANDLE hSession,
+                             CK_ULONG ulM,
+                             CA_MOFN_GENERATION_PTR pVectors,
+                             CK_ULONG ulVectorCount,
+                             CK_ULONG isSecurePortUsed,
+                             CK_VOID_PTR pReserved);
+CK_RV CK_ENTRY CA_CloneMofN(CK_SESSION_HANDLE hSession, CK_SESSION_HANDLE hPrimarySession, CK_VOID_PTR pReserved);
+CK_RV CK_ENTRY CA_CloneModifyMofN(CK_SESSION_HANDLE hSession, CK_SESSION_HANDLE hPrimarySession, CK_VOID_PTR pReserved);
+CK_RV CK_ENTRY CA_ActivateMofN(CK_SESSION_HANDLE hSession, CA_MOFN_ACTIVATION_PTR pVectors, CK_ULONG ulVectorCount);
+CK_RV CK_ENTRY CA_DeactivateMofN(CK_SESSION_HANDLE hSession);
+
+CK_RV CK_ENTRY CA_GetMofNStatus(CK_SLOT_ID slotID, CA_MOFN_STATUS_PTR pMofNStatus);
+
+CK_RV CK_ENTRY CA_DuplicateMofN(CK_SESSION_HANDLE hSession);
+
+CK_RV CK_ENTRY CA_IsMofNEnabled(CK_SLOT_ID slotID, CK_ULONG_PTR enabled);
+
+CK_RV CK_ENTRY CA_IsMofNRequired(CK_SLOT_ID slotID, CK_ULONG_PTR required);
 
 /****************************************************************************\
 *
 * Token Certificate Management
 *
 \****************************************************************************/
-CK_RV CK_ENTRY CA_GenerateTokenKeys( CK_SESSION_HANDLE hSession,
-                                     CK_ATTRIBUTE_PTR pTemplate,
-                                     CK_ULONG usTemplateLen );
-CK_RV CK_ENTRY CA_GenerateTWK( CK_SLOT_ID slotID,
-                               CK_SESSION_HANDLE hSession,
-                               CK_ULONG    ulKeyType,
-                               CK_ULONG    ulExpSize,
-                               CK_BYTE_PTR pExponent,
-                               CK_ULONG    ulModulusBitSize,
-                               CK_ULONG_PTR pulModSize,
-                               CK_BYTE_PTR pModulus);
-
-CK_RV CK_ENTRY CA_GetTokenCertificateInfo( CK_SLOT_ID slotID,
-                                           CK_ULONG ulAccessLevel,
-                                           CK_BYTE_PTR pCertificate,
-                                           CK_ULONG_PTR pulCertificateLen );
-CK_RV CK_ENTRY CA_SetTokenCertificateSignature(
-                                        CK_SESSION_HANDLE hSession,
-                                        CK_ULONG ulAccessLevel,
-                                        CK_ULONG ulCustomerId,
-                                        CK_ATTRIBUTE_PTR pPublicTemplate,
-                                        CK_ULONG usPublicTemplateLen,
-                                        CK_BYTE_PTR pSignature,
-                                        CK_ULONG ulSignatureLen );
-
-CK_RV CK_ENTRY CA_GetModuleList( CK_SLOT_ID slotId,
-         CKCA_MODULE_ID_PTR pList,
-         CK_ULONG ulListLen,
-         CK_ULONG_PTR pulReturnedSize );
-
-CK_RV CK_ENTRY CA_GetModuleInfo( CK_SLOT_ID slotId,
-         CKCA_MODULE_ID moduleId,
-         CKCA_MODULE_INFO_PTR pInfo );
-
-CK_RV CK_ENTRY CA_LoadModule(
-         CK_SESSION_HANDLE hSession,
-         CK_BYTE_PTR pModuleCode, CK_ULONG ulModuleCodeSize,
-         CK_BYTE_PTR pModuleSignature, CK_ULONG ulModuleSignatureSize,
-         CK_BYTE_PTR pCertificate, CK_ULONG ulCertificateSize,
-         CK_BYTE_PTR pControlData, CK_ULONG ulControlDataSize,
-         CKCA_MODULE_ID_PTR pModuleId  );
-
-CK_RV CK_ENTRY CA_LoadEncryptedModule(
-         CK_SESSION_HANDLE hSession,
-         CK_OBJECT_HANDLE  hKey,
-         CK_BYTE_PTR pIv, CK_ULONG ulIvLen,
-         CK_BYTE_PTR pModuleCode, CK_ULONG ulModuleCodeSize,
-         CK_BYTE_PTR pModuleSignature, CK_ULONG ulModuleSignatureSize,
-         CK_BYTE_PTR pCertificate, CK_ULONG ulCertificateSize,
-         CKCA_MODULE_ID_PTR pModuleId  );
-
-CK_RV CK_ENTRY CA_UnloadModule(
-         CK_SESSION_HANDLE hSession,
-         CKCA_MODULE_ID moduleId  );
-
-CK_RV CK_ENTRY CA_PerformModuleCall(
-         CK_SESSION_HANDLE hSession,
-         CKCA_MODULE_ID moduleId,
-         CK_BYTE_PTR pRequest, CK_ULONG ulRequestSize,
-         CK_BYTE_PTR pAnswer, CK_ULONG ulAnswerSize,
-         CK_ULONG_PTR pulAnswerAvailable );
-
+CK_RV CK_ENTRY CA_GenerateTokenKeys(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemplate, CK_ULONG usTemplateLen);
+CK_RV CK_ENTRY CA_GenerateTWK(CK_SLOT_ID slotID,
+                              CK_SESSION_HANDLE hSession,
+                              CK_ULONG ulKeyType,
+                              CK_ULONG ulExpSize,
+                              CK_BYTE_PTR pExponent,
+                              CK_ULONG ulModulusBitSize,
+                              CK_ULONG_PTR pulModSize,
+                              CK_BYTE_PTR pModulus);
+
+CK_RV CK_ENTRY CA_GetTokenCertificateInfo(CK_SLOT_ID slotID,
+                                          CK_ULONG ulAccessLevel,
+                                          CK_BYTE_PTR pCertificate,
+                                          CK_ULONG_PTR pulCertificateLen);
+CK_RV CK_ENTRY CA_SetTokenCertificateSignature(CK_SESSION_HANDLE hSession,
+                                               CK_ULONG ulAccessLevel,
+                                               CK_ULONG ulCustomerId,
+                                               CK_ATTRIBUTE_PTR pPublicTemplate,
+                                               CK_ULONG usPublicTemplateLen,
+                                               CK_BYTE_PTR pSignature,
+                                               CK_ULONG ulSignatureLen);
+
+CK_RV CK_ENTRY CA_GetModuleList(CK_SLOT_ID slotId,
+                                CKCA_MODULE_ID_PTR pList,
+                                CK_ULONG ulListLen,
+                                CK_ULONG_PTR pulReturnedSize);
+
+CK_RV CK_ENTRY CA_GetModuleInfo(CK_SLOT_ID slotId, CKCA_MODULE_ID moduleId, CKCA_MODULE_INFO_PTR pInfo);
+
+CK_RV CK_ENTRY CA_LoadModule(CK_SESSION_HANDLE hSession,
+                             CK_BYTE_PTR pModuleCode,
+                             CK_ULONG ulModuleCodeSize,
+                             CK_BYTE_PTR pModuleSignature,
+                             CK_ULONG ulModuleSignatureSize,
+                             CK_BYTE_PTR pCertificate,
+                             CK_ULONG ulCertificateSize,
+                             CK_BYTE_PTR pControlData,
+                             CK_ULONG ulControlDataSize,
+                             CKCA_MODULE_ID_PTR pModuleId);
+
+CK_RV CK_ENTRY CA_LoadEncryptedModule(CK_SESSION_HANDLE hSession,
+                                      CK_OBJECT_HANDLE hKey,
+                                      CK_BYTE_PTR pIv,
+                                      CK_ULONG ulIvLen,
+                                      CK_BYTE_PTR pModuleCode,
+                                      CK_ULONG ulModuleCodeSize,
+                                      CK_BYTE_PTR pModuleSignature,
+                                      CK_ULONG ulModuleSignatureSize,
+                                      CK_BYTE_PTR pCertificate,
+                                      CK_ULONG ulCertificateSize,
+                                      CKCA_MODULE_ID_PTR pModuleId);
+
+CK_RV CK_ENTRY CA_UnloadModule(CK_SESSION_HANDLE hSession, CKCA_MODULE_ID moduleId);
+
+CK_RV CK_ENTRY CA_PerformModuleCall(CK_SESSION_HANDLE hSession,
+                                    CKCA_MODULE_ID moduleId,
+                                    CK_BYTE_PTR pRequest,
+                                    CK_ULONG ulRequestSize,
+                                    CK_BYTE_PTR pAnswer,
+                                    CK_ULONG ulAnswerSize,
+                                    CK_ULONG_PTR pulAnswerAvailable);
 
 /****************************************************************************\
 *
 * HSM Update
 *
 \****************************************************************************/
-CK_RV CK_ENTRY CA_FirmwareUpdate(
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulTargetHardwarePlatform,
-         CK_ULONG            ulAuthCodeLen,
-         CK_BYTE_PTR         pAuthCode,
-         CK_ULONG            ulManifestLen,
-         CK_BYTE_PTR         pManifest,
-         CK_ULONG            ulFirmwareLen,
-         CK_BYTE_PTR         pFirmware);
-
-CK_RV CK_ENTRY CA_FirmwareRollback(CK_SESSION_HANDLE   hSession);
-
-CK_RV CK_ENTRY CA_CapabilityUpdate(
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulManifestLen,
-         CK_BYTE_PTR         pManifest,
-         CK_ULONG            ulAuthcodeLen,
-         CK_BYTE_PTR         pAuthcode);
-
+CK_RV CK_ENTRY CA_FirmwareUpdate(CK_SESSION_HANDLE hSession,
+                                 CK_ULONG ulTargetHardwarePlatform,
+                                 CK_ULONG ulAuthCodeLen,
+                                 CK_BYTE_PTR pAuthCode,
+                                 CK_ULONG ulManifestLen,
+                                 CK_BYTE_PTR pManifest,
+                                 CK_ULONG ulFirmwareLen,
+                                 CK_BYTE_PTR pFirmware);
+
+CK_RV CK_ENTRY CA_FirmwareRollback(CK_SESSION_HANDLE hSession);
+
+CK_RV CK_ENTRY CA_CapabilityUpdate(CK_SESSION_HANDLE hSession,
+                                   CK_ULONG ulManifestLen,
+                                   CK_BYTE_PTR pManifest,
+                                   CK_ULONG ulAuthcodeLen,
+                                   CK_BYTE_PTR pAuthcode);
 
 /****************************************************************************\
 *
@@ -411,174 +357,123 @@ CK_RV CK_ENTRY CA_CapabilityUpdate(
 *
 \****************************************************************************/
 
-CK_RV CK_ENTRY CA_GetUserContainerNumber(
-        CK_SLOT_ID          slotID,
-        CK_ULONG_PTR        pulContainerNumber);
-
-CK_RV CK_ENTRY CA_GetUserContainerName(
-        CK_SLOT_ID          slotID,
-        CK_BYTE_PTR         pName,
-        CK_ULONG_PTR        pulNameLen);
-
-CK_RV CK_ENTRY CA_SetUserContainerName(
-        CK_SLOT_ID          slotID,
-        CK_BYTE_PTR         pName,
-        CK_ULONG            ulNameLen);
-
-CK_RV CK_ENTRY CA_GetTokenInsertionCount (
-        CK_SLOT_ID          slotID,
-        CK_ULONG_PTR        pulCount );
-
-CK_RV CK_ENTRY CA_GetRollbackFirmwareVersion (
-        CK_SLOT_ID          slotID,
-        CK_ULONG_PTR        pulVersion );
-
-CK_RV CK_ENTRY CA_GetFPV (
-        CK_SLOT_ID          slotID,
-        CK_ULONG_PTR        pulFpv );
-
-CK_RV CK_ENTRY CA_GetTPV (
-        CK_SLOT_ID          slotID,
-        CK_ULONG_PTR        pulTpv );
-
-CK_RV CK_ENTRY CA_GetExtendedTPV (
-        CK_SLOT_ID          slotID,
-        CK_ULONG_PTR        pulTpv,
-        CK_ULONG_PTR        pulTpvExt );
-
-CK_RV CK_ENTRY CA_GetConfigurationElementDescription(
-         CK_SLOT_ID          slotID,
-         CK_ULONG            ulIsContainerElement,
-         CK_ULONG            ulIsCapabilityElement,
-         CK_ULONG            ulElementId,
-         CK_ULONG_PTR        pulElementBitLength,
-         CK_ULONG_PTR        pulElementDestructive,
-         CK_ULONG_PTR        pulElementWriteRestricted,
-         CK_CHAR_PTR         pDescription,
-         CK_ULONG_PTR        pDesBufSize);
-
-CK_RV CK_ENTRY CA_GetHSMCapabilitySet(
-         CK_SLOT_ID          uPhysicalSlot,
-         CK_ULONG_PTR        pulCapIdArray,
-         CK_ULONG_PTR        pulCapIdSize,
-         CK_ULONG_PTR        pulCapValArray,
-         CK_ULONG_PTR        pulCapValSize );
-
-CK_RV CK_ENTRY CA_GetHSMCapabilitySetting (
-         CK_SLOT_ID          slotID,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG_PTR        pulPolicyValue);
-
-CK_RV CK_ENTRY CA_GetHSMPolicySet(
-         CK_SLOT_ID          uPhysicalSlot,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyIdSize,
-         CK_ULONG_PTR        pulPolicyValArray,
-         CK_ULONG_PTR        pulPolicyValSize );
-
-CK_RV CK_ENTRY CA_GetHSMPolicySetting (
-         CK_SLOT_ID          slotID,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG_PTR        pulPolicyValue);
-
-CK_RV CK_ENTRY CA_GetContainerCapabilitySet(
-         CK_SLOT_ID          uPhysicalSlot,
-         CK_ULONG            ulContainerNumber,
-         CK_ULONG_PTR        pulCapIdArray,
-         CK_ULONG_PTR        pulCapIdSize,
-         CK_ULONG_PTR        pulCapValArray,
-         CK_ULONG_PTR        pulCapValSize );
-
-CK_RV CK_ENTRY CA_GetContainerCapabilitySetting (
-         CK_SLOT_ID          slotID,
-         CK_ULONG            ulContainerNumber,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG_PTR        pulPolicyValue);
-
-CK_RV CK_ENTRY CA_GetContainerPolicySet(
-         CK_SLOT_ID          uPhysicalSlot,
-         CK_ULONG            ulContainerNumber,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyIdSize,
-         CK_ULONG_PTR        pulPolicyValArray,
-         CK_ULONG_PTR        pulPolicyValSize );
-
-CK_RV CK_ENTRY CA_GetContainerPolicySetting(
-         CK_SLOT_ID          uPhysicalSlot,
-         CK_ULONG            ulContainerNumber,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG_PTR        pulPolicyValue);
-
-CK_RV CK_ENTRY CA_GetPartitionPolicyTemplate(
-         CK_SLOT_ID          uPhysicalSlot,
-         CK_ULONG_PTR     pulVersion,
-         CK_ULONG_PTR     pulBufSize,
-         CK_BYTE_PTR         pbBuf);
-
-CK_RV CK_ENTRY CA_SetTPV (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulTpv );
-
-CK_RV CK_ENTRY CA_SetExtendedTPV (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulTpv,
-         CK_ULONG            ulTpvExt );
-
-CK_RV CK_ENTRY CA_SetHSMPolicy (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG            ulPolicyValue);
-
-CK_RV CK_ENTRY CA_SetHSMPolicies (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulPolicyCount,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyValueArray);
-
-CK_RV CK_ENTRY CA_SetDestructiveHSMPolicy (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG            ulPolicyValue);
-
-CK_RV CK_ENTRY CA_SetDestructiveHSMPolicies (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulPolicyCount,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyValueArray);
-
-CK_RV CK_ENTRY CA_SetContainerPolicy (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulContainer,
-         CK_ULONG            ulPolicyId,
-         CK_ULONG            ulPolicyValue);
-
-CK_RV CK_ENTRY CA_SetContainerPolicies (
-         CK_SESSION_HANDLE   hSession,
-         CK_ULONG            ulContainer,
-         CK_ULONG            ulPolicyCount,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyValueArray);
-
-CK_RV CK_ENTRY CA_GetTokenCapabilities(
-         CK_SLOT_ID          ulSlotID,
-         CK_ULONG_PTR        pulCapIdArray,
-         CK_ULONG_PTR        pulCapIdSize,
-         CK_ULONG_PTR        pulCapValArray,
-         CK_ULONG_PTR        pulCapValSize);
-
-CK_RV CK_ENTRY CA_SetTokenPolicies(
-         CK_SESSION_HANDLE   hSession,
-         CK_SLOT_ID          ulSlotID,
-         CK_ULONG            ulPolicyCount,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyValueArray);
-
-CK_RV CK_ENTRY CA_GetTokenPolicies(
-         CK_SLOT_ID          ulSlotID,
-         CK_ULONG_PTR        pulPolicyIdArray,
-         CK_ULONG_PTR        pulPolicyIdSize,
-         CK_ULONG_PTR        pulPolicyValArray,
-         CK_ULONG_PTR        pulPolicyValSize);
+CK_RV CK_ENTRY CA_GetUserContainerNumber(CK_SLOT_ID slotID, CK_ULONG_PTR pulContainerNumber);
+
+CK_RV CK_ENTRY CA_GetUserContainerName(CK_SLOT_ID slotID, CK_BYTE_PTR pName, CK_ULONG_PTR pulNameLen);
+
+CK_RV CK_ENTRY CA_SetUserContainerName(CK_SLOT_ID slotID, CK_BYTE_PTR pName, CK_ULONG ulNameLen);
+
+CK_RV CK_ENTRY CA_GetTokenInsertionCount(CK_SLOT_ID slotID, CK_ULONG_PTR pulCount);
+
+CK_RV CK_ENTRY CA_GetRollbackFirmwareVersion(CK_SLOT_ID slotID, CK_ULONG_PTR pulVersion);
+
+CK_RV CK_ENTRY CA_GetFPV(CK_SLOT_ID slotID, CK_ULONG_PTR pulFpv);
+
+CK_RV CK_ENTRY CA_GetTPV(CK_SLOT_ID slotID, CK_ULONG_PTR pulTpv);
+
+CK_RV CK_ENTRY CA_GetExtendedTPV(CK_SLOT_ID slotID, CK_ULONG_PTR pulTpv, CK_ULONG_PTR pulTpvExt);
+
+CK_RV CK_ENTRY CA_GetConfigurationElementDescription(CK_SLOT_ID slotID,
+                                                     CK_ULONG ulIsContainerElement,
+                                                     CK_ULONG ulIsCapabilityElement,
+                                                     CK_ULONG ulElementId,
+                                                     CK_ULONG_PTR pulElementBitLength,
+                                                     CK_ULONG_PTR pulElementDestructive,
+                                                     CK_ULONG_PTR pulElementWriteRestricted,
+                                                     CK_CHAR_PTR pDescription,
+                                                     CK_ULONG_PTR pDesBufSize);
+
+CK_RV CK_ENTRY CA_GetHSMCapabilitySet(CK_SLOT_ID uPhysicalSlot,
+                                      CK_ULONG_PTR pulCapIdArray,
+                                      CK_ULONG_PTR pulCapIdSize,
+                                      CK_ULONG_PTR pulCapValArray,
+                                      CK_ULONG_PTR pulCapValSize);
+
+CK_RV CK_ENTRY CA_GetHSMCapabilitySetting(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
+
+CK_RV CK_ENTRY CA_GetHSMPolicySet(CK_SLOT_ID uPhysicalSlot,
+                                  CK_ULONG_PTR pulPolicyIdArray,
+                                  CK_ULONG_PTR pulPolicyIdSize,
+                                  CK_ULONG_PTR pulPolicyValArray,
+                                  CK_ULONG_PTR pulPolicyValSize);
+
+CK_RV CK_ENTRY CA_GetHSMPolicySetting(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
+
+CK_RV CK_ENTRY CA_GetContainerCapabilitySet(CK_SLOT_ID uPhysicalSlot,
+                                            CK_ULONG ulContainerNumber,
+                                            CK_ULONG_PTR pulCapIdArray,
+                                            CK_ULONG_PTR pulCapIdSize,
+                                            CK_ULONG_PTR pulCapValArray,
+                                            CK_ULONG_PTR pulCapValSize);
+
+CK_RV CK_ENTRY CA_GetContainerCapabilitySetting(CK_SLOT_ID slotID,
+                                                CK_ULONG ulContainerNumber,
+                                                CK_ULONG ulPolicyId,
+                                                CK_ULONG_PTR pulPolicyValue);
+
+CK_RV CK_ENTRY CA_GetContainerPolicySet(CK_SLOT_ID uPhysicalSlot,
+                                        CK_ULONG ulContainerNumber,
+                                        CK_ULONG_PTR pulPolicyIdArray,
+                                        CK_ULONG_PTR pulPolicyIdSize,
+                                        CK_ULONG_PTR pulPolicyValArray,
+                                        CK_ULONG_PTR pulPolicyValSize);
+
+CK_RV CK_ENTRY CA_GetContainerPolicySetting(CK_SLOT_ID uPhysicalSlot,
+                                            CK_ULONG ulContainerNumber,
+                                            CK_ULONG ulPolicyId,
+                                            CK_ULONG_PTR pulPolicyValue);
+
+CK_RV CK_ENTRY CA_GetPartitionPolicyTemplate(CK_SLOT_ID uPhysicalSlot,
+                                             CK_ULONG_PTR pulVersion,
+                                             CK_ULONG_PTR pulBufSize,
+                                             CK_BYTE_PTR pbBuf);
+
+CK_RV CK_ENTRY CA_SetTPV(CK_SESSION_HANDLE hSession, CK_ULONG ulTpv);
+
+CK_RV CK_ENTRY CA_SetExtendedTPV(CK_SESSION_HANDLE hSession, CK_ULONG ulTpv, CK_ULONG ulTpvExt);
+
+CK_RV CK_ENTRY CA_SetHSMPolicy(CK_SESSION_HANDLE hSession, CK_ULONG ulPolicyId, CK_ULONG ulPolicyValue);
+
+CK_RV CK_ENTRY CA_SetHSMPolicies(CK_SESSION_HANDLE hSession,
+                                 CK_ULONG ulPolicyCount,
+                                 CK_ULONG_PTR pulPolicyIdArray,
+                                 CK_ULONG_PTR pulPolicyValueArray);
+
+CK_RV CK_ENTRY CA_SetDestructiveHSMPolicy(CK_SESSION_HANDLE hSession, CK_ULONG ulPolicyId, CK_ULONG ulPolicyValue);
+
+CK_RV CK_ENTRY CA_SetDestructiveHSMPolicies(CK_SESSION_HANDLE hSession,
+                                            CK_ULONG ulPolicyCount,
+                                            CK_ULONG_PTR pulPolicyIdArray,
+                                            CK_ULONG_PTR pulPolicyValueArray);
+
+CK_RV CK_ENTRY CA_SetContainerPolicy(CK_SESSION_HANDLE hSession,
+                                     CK_ULONG ulContainer,
+                                     CK_ULONG ulPolicyId,
+                                     CK_ULONG ulPolicyValue);
+
+CK_RV CK_ENTRY CA_SetContainerPolicies(CK_SESSION_HANDLE hSession,
+                                       CK_ULONG ulContainer,
+                                       CK_ULONG ulPolicyCount,
+                                       CK_ULONG_PTR pulPolicyIdArray,
+                                       CK_ULONG_PTR pulPolicyValueArray);
+
+CK_RV CK_ENTRY CA_GetTokenCapabilities(CK_SLOT_ID ulSlotID,
+                                       CK_ULONG_PTR pulCapIdArray,
+                                       CK_ULONG_PTR pulCapIdSize,
+                                       CK_ULONG_PTR pulCapValArray,
+                                       CK_ULONG_PTR pulCapValSize);
+
+CK_RV CK_ENTRY CA_SetTokenPolicies(CK_SESSION_HANDLE hSession,
+                                   CK_SLOT_ID ulSlotID,
+                                   CK_ULONG ulPolicyCount,
+                                   CK_ULONG_PTR pulPolicyIdArray,
+                                   CK_ULONG_PTR pulPolicyValueArray);
+
+CK_RV CK_ENTRY CA_GetTokenPolicies(CK_SLOT_ID ulSlotID,
+                                   CK_ULONG_PTR pulPolicyIdArray,
+                                   CK_ULONG_PTR pulPolicyIdSize,
+                                   CK_ULONG_PTR pulPolicyValArray,
+                                   CK_ULONG_PTR pulPolicyValSize);
 
 /****************************************************************************\
 *
@@ -588,56 +483,58 @@ CK_RV CK_ENTRY CA_GetTokenPolicies(
 * should not be used by Toolkit customers
 *
 \****************************************************************************/
-CK_RV CK_ENTRY CA_RetrieveLicenseList(CK_SLOT_ID slotID, CK_ULONG_PTR pulidArraySize,CK_ULONG_PTR pulidArray);
-CK_RV CK_ENTRY CA_QueryLicense(CK_SLOT_ID slotID, CK_ULONG licenseIdLow, CK_ULONG licenseIdHigh,
-                        CK_ULONG_PTR pulLicenseType, CK_ULONG_PTR pulDescVersion,
-                        CK_ULONG_PTR pulDescSize, CK_BYTE_PTR pbDescBuffer);
+CK_RV CK_ENTRY CA_RetrieveLicenseList(CK_SLOT_ID slotID, CK_ULONG_PTR pulidArraySize, CK_ULONG_PTR pulidArray);
+CK_RV CK_ENTRY CA_QueryLicense(CK_SLOT_ID slotID,
+                               CK_ULONG licenseIdLow,
+                               CK_ULONG licenseIdHigh,
+                               CK_ULONG_PTR pulLicenseType,
+                               CK_ULONG_PTR pulDescVersion,
+                               CK_ULONG_PTR pulDescSize,
+                               CK_BYTE_PTR pbDescBuffer);
 
 // Duplicated from luna2if.h. Can appear in the status flags
 // value for CA_GetContainerStatus() and CA_GetTokenStatus().
-#define LUNA_CF_CONTAINER_ENABLED                  0x01000000
-#define LUNA_CF_KCV_CREATED                        0x02000000
-#define LUNA_CF_LKCV_CREATED                       0x04000000
-#define LUNA_CF_HA_INITIALIZED                     0x08000000
+#define LUNA_CF_CONTAINER_ENABLED 0x01000000
+#define LUNA_CF_KCV_CREATED 0x02000000
+#define LUNA_CF_LKCV_CREATED 0x04000000
+#define LUNA_CF_HA_INITIALIZED 0x08000000
 // To be mapped to PKCS #11's CKF_TOKEN_INITIALIZED
-#define LUNA_CF_PARTITION_INITIALIZED              0x00000400
+#define LUNA_CF_PARTITION_INITIALIZED 0x00000400
 /**
  * These flags are not emitted by firmware after (version TBD: 9.1.1).
  * They need to remain available to software only for backwards compatibility.
  * Note that future firmware versions may re-use these values again.
  */
-#define LUNA_CF_CONTAINER_ACTIVATED                0x00000001
-#define LUNA_CF_CONTAINER_LUSR_ACTIVATED           0x00000002
-#define LUNA_CF_SO_PIN_LOCKED                      0x00010000
-#define LUNA_CF_SO_PIN_TO_BE_CHANGED               0x00020000
-#define LUNA_CF_USER_PIN_LOCKED                    0x00040000
-#define LUNA_CF_LIMITED_USER_PIN_LOCKED            0x00080000
-#define LUNA_CF_LIMITED_USER_CREATED               0x00200000
-#define LUNA_CF_USER_PIN_TO_BE_CHANGED             0x00400000
-#define LUNA_CF_LIMITED_USER_PIN_TO_BE_CHANGED     0x00800000
+#define LUNA_CF_CONTAINER_ACTIVATED 0x00000001
+#define LUNA_CF_CONTAINER_LUSR_ACTIVATED 0x00000002
+#define LUNA_CF_SO_PIN_LOCKED 0x00010000
+#define LUNA_CF_SO_PIN_TO_BE_CHANGED 0x00020000
+#define LUNA_CF_USER_PIN_LOCKED 0x00040000
+#define LUNA_CF_LIMITED_USER_PIN_LOCKED 0x00080000
+#define LUNA_CF_LIMITED_USER_CREATED 0x00200000
+#define LUNA_CF_USER_PIN_TO_BE_CHANGED 0x00400000
+#define LUNA_CF_LIMITED_USER_PIN_TO_BE_CHANGED 0x00800000
 
 CK_RV CK_ENTRY CA_GetContainerStatus(CK_SLOT_ID slotID,
-                             CK_ULONG ulContainerNumber,
-                             CK_ULONG_PTR pulContainerStatusFlags,
-                             CK_ULONG_PTR pulFailedSOLogins,
-                             CK_ULONG_PTR pulFailedUserLogins,
-                             CK_ULONG_PTR pulFailedLimitedUserLogins);
+                                     CK_ULONG ulContainerNumber,
+                                     CK_ULONG_PTR pulContainerStatusFlags,
+                                     CK_ULONG_PTR pulFailedSOLogins,
+                                     CK_ULONG_PTR pulFailedUserLogins,
+                                     CK_ULONG_PTR pulFailedLimitedUserLogins);
 
 CK_RV CK_ENTRY CA_GetTokenStatus(CK_SLOT_ID slotID,
-                             CK_ULONG_PTR pulStatusFlags,
-                             CK_ULONG_PTR pulCurSessionCnt,
-                             CK_ULONG_PTR pulCurRdWrSessionCnt);
+                                 CK_ULONG_PTR pulStatusFlags,
+                                 CK_ULONG_PTR pulCurSessionCnt,
+                                 CK_ULONG_PTR pulCurRdWrSessionCnt);
 
 CK_RV CK_ENTRY CA_GetSessionInfo(CK_SESSION_HANDLE hSession,
-                                   CK_ULONG_PTR pulAidHigh,
-                                   CK_ULONG_PTR pulAidLow,
-                                   CK_ULONG_PTR pulContainerNumber,
-                                   CK_ULONG_PTR pulAuthenticationLevel);
+                                 CK_ULONG_PTR pulAidHigh,
+                                 CK_ULONG_PTR pulAidLow,
+                                 CK_ULONG_PTR pulContainerNumber,
+                                 CK_ULONG_PTR pulAuthenticationLevel);
 
-
-
-CK_RV CK_ENTRY CA_ReadCommonStore( CK_ULONG index,  CK_BYTE_PTR pBuffer, CK_ULONG_PTR pulBufferSize );
-CK_RV CK_ENTRY CA_WriteCommonStore( CK_ULONG index,  CK_BYTE_PTR pBuffer, CK_ULONG ulBufferSize );
+CK_RV CK_ENTRY CA_ReadCommonStore(CK_ULONG index, CK_BYTE_PTR pBuffer, CK_ULONG_PTR pulBufferSize);
+CK_RV CK_ENTRY CA_WriteCommonStore(CK_ULONG index, CK_BYTE_PTR pBuffer, CK_ULONG ulBufferSize);
 
 CK_RV CK_ENTRY CA_GetPrimarySlot(CK_SESSION_HANDLE hSession, CK_SLOT_ID_PTR slotId_p);
 CK_RV CK_ENTRY CA_GetSecondarySlot(CK_SESSION_HANDLE hSession, CK_SLOT_ID_PTR slotId_p);
@@ -658,18 +555,18 @@ CK_RV CK_ENTRY CA_FactoryReset(CK_SLOT_ID slotId, CK_FLAGS flags);
 
 CK_RV CK_ENTRY CA_SetPedId(CK_SLOT_ID slotId, CK_ULONG usPedId);
 
-CK_RV CK_ENTRY CA_GetPedId(CK_SLOT_ID slotId, CK_ULONG *usPedId);
+CK_RV CK_ENTRY CA_GetPedId(CK_SLOT_ID slotId, CK_ULONG* usPedId);
 
 CK_RV CK_ENTRY CA_SpRawRead(CK_SLOT_ID slotId, CK_ULONG_PTR data);
 
 CK_RV CK_ENTRY CA_SpRawWrite(CK_SLOT_ID slotId, CK_ULONG_PTR data);
 
-CK_RV CK_ENTRY CA_CheckOperationState(CK_SESSION_HANDLE hSession, CK_ULONG operation, CK_BBOOL *pactive);
+CK_RV CK_ENTRY CA_CheckOperationState(CK_SESSION_HANDLE hSession, CK_ULONG operation, CK_BBOOL* pactive);
 
-CK_RV CK_ENTRY CA_DestroyMultipleObjects(CK_SESSION_HANDLE     hSession,
-                                         CK_ULONG              ulHandleCount,
-                                         CK_OBJECT_HANDLE_PTR  pHandleList,
-                                         CK_ULONG_PTR          pulIndex);
+CK_RV CK_ENTRY CA_DestroyMultipleObjects(CK_SESSION_HANDLE hSession,
+                                         CK_ULONG ulHandleCount,
+                                         CK_OBJECT_HANDLE_PTR pHandleList,
+                                         CK_ULONG_PTR pulIndex);
 
 CK_RV CK_ENTRY CA_OpenSecureToken(CK_SESSION_HANDLE hSession,
                                   CK_ULONG storagePath,
@@ -697,75 +594,68 @@ CK_RV CK_ENTRY CA_ListSecureTokenUpdate(CK_SESSION_HANDLE hSession,
                                         CK_ULONG dataLen);
 
 CK_RV CK_ENTRY CA_GetSecureElementMeta(CK_SESSION_HANDLE hSession,
-                              CK_ULONG hID,
-                              CK_MECHANISM_PTR pMechanism,
-                              CK_ULONG_PTR pObjClass,
-                              CK_ULONG_PTR pKeyType,
-                              CK_BYTE_PTR pLabel,
-                              CK_ULONG ulLabelLen);
+                                       CK_ULONG hID,
+                                       CK_MECHANISM_PTR pMechanism,
+                                       CK_ULONG_PTR pObjClass,
+                                       CK_ULONG_PTR pKeyType,
+                                       CK_BYTE_PTR pLabel,
+                                       CK_ULONG ulLabelLen);
 
 CK_RV CK_ENTRY CA_Bip32ExportPublicKey(CK_SESSION_HANDLE hSession,
-                              CK_ULONG    ulObjectHandle,
-                              CK_BYTE_PTR pPublicSerialData,
-                              CK_ULONG_PTR pulPublicSerialLen ); //in: max.buffer size, out: returned size
+                                       CK_ULONG ulObjectHandle,
+                                       CK_BYTE_PTR pPublicSerialData,
+                                       CK_ULONG_PTR pulPublicSerialLen); // in: max.buffer size, out: returned size
 
-CK_RV CK_ENTRY CA_Bip32ImportPublicKey(
-                              CK_SESSION_HANDLE hSession,
-                              CK_BYTE_PTR      pBase58Key, //Base58 encoded data src.
-                              CK_ULONG         usKeyLen,   //encoded data size
-                              CK_ATTRIBUTE_PTR pTemplate,
-                              CK_ULONG         usCount,
-                              CK_OBJECT_HANDLE_PTR phImportedObject);
+CK_RV CK_ENTRY CA_Bip32ImportPublicKey(CK_SESSION_HANDLE hSession,
+                                       CK_BYTE_PTR pBase58Key, // Base58 encoded data src.
+                                       CK_ULONG usKeyLen,      // encoded data size
+                                       CK_ATTRIBUTE_PTR pTemplate,
+                                       CK_ULONG usCount,
+                                       CK_OBJECT_HANDLE_PTR phImportedObject);
 
 /****************************************************************************\
 *
 * SafeNet High Availability Recovery functions
 *
 \****************************************************************************/
-CK_RV CK_ENTRY CA_HAInit(CK_SESSION_HANDLE hSession,
-                   CK_OBJECT_HANDLE hLoginPrivateKey );
+CK_RV CK_ENTRY CA_HAInit(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hLoginPrivateKey);
 
-CK_RV CK_ENTRY CA_HAGetMasterPublic(CK_SLOT_ID slotId,
-                           CK_BYTE_PTR pCertificate,
-                           CK_ULONG_PTR pulCertificate);
+CK_RV CK_ENTRY CA_HAGetMasterPublic(CK_SLOT_ID slotId, CK_BYTE_PTR pCertificate, CK_ULONG_PTR pulCertificate);
 
 CK_RV CK_ENTRY CA_HAGetLoginChallenge(CK_SESSION_HANDLE hSession,
-                             CK_USER_TYPE userType,
-                             CK_BYTE_PTR pCertificate,
-                             CK_ULONG ulCertificateLen,
-                             CK_BYTE_PTR pChallengeBlob,
-                             CK_ULONG_PTR pulChallengeBlobLen);
+                                      CK_USER_TYPE userType,
+                                      CK_BYTE_PTR pCertificate,
+                                      CK_ULONG ulCertificateLen,
+                                      CK_BYTE_PTR pChallengeBlob,
+                                      CK_ULONG_PTR pulChallengeBlobLen);
 
 CK_RV CK_ENTRY CA_HAAnswerLoginChallenge(CK_SESSION_HANDLE hSession,
-                               CK_OBJECT_HANDLE hLoginPrivateKey,
-                               CK_BYTE_PTR pChallengeBlob,
-                               CK_ULONG ulChallengeBlobLen,
-                               CK_BYTE_PTR pEncryptedPin,
-                               CK_ULONG_PTR pulEncryptedPinLen);
+                                         CK_OBJECT_HANDLE hLoginPrivateKey,
+                                         CK_BYTE_PTR pChallengeBlob,
+                                         CK_ULONG ulChallengeBlobLen,
+                                         CK_BYTE_PTR pEncryptedPin,
+                                         CK_ULONG_PTR pulEncryptedPinLen);
 
 CK_RV CK_ENTRY CA_HALogin(CK_SESSION_HANDLE hSession,
-                    CK_BYTE_PTR pEncryptedPin,
-                    CK_ULONG ulEncryptedPinLen,
-                    CK_BYTE_PTR pMofNBlob,
-                    CK_ULONG_PTR pulMofNBlobLen);
+                          CK_BYTE_PTR pEncryptedPin,
+                          CK_ULONG ulEncryptedPinLen,
+                          CK_BYTE_PTR pMofNBlob,
+                          CK_ULONG_PTR pulMofNBlobLen);
 
 CK_RV CK_ENTRY CA_HAAnswerMofNChallenge(CK_SESSION_HANDLE hSession,
-                              CK_BYTE_PTR pMofNBlob,
-                              CK_ULONG ulMofNBlobLen,
-                              CK_BYTE_PTR pMofNSecretBlob,
-                              CK_ULONG_PTR pulMofNSecretBlobLen);
+                                        CK_BYTE_PTR pMofNBlob,
+                                        CK_ULONG ulMofNBlobLen,
+                                        CK_BYTE_PTR pMofNSecretBlob,
+                                        CK_ULONG_PTR pulMofNSecretBlobLen);
 
-CK_RV CK_ENTRY CA_HAActivateMofN(CK_SESSION_HANDLE hSession,
-                         CK_BYTE_PTR pMofNSecretBlob,
-                         CK_ULONG ulMofNSecretBlobLen);
+CK_RV CK_ENTRY CA_HAActivateMofN(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pMofNSecretBlob, CK_ULONG ulMofNSecretBlobLen);
 
+CK_RV CK_ENTRY CA_GetHAState(CK_SLOT_ID slotId, CK_HA_STATE_PTR pState);
 
-CK_RV CK_ENTRY CA_GetHAState( CK_SLOT_ID slotId, CK_HA_STATE_PTR pState );
-
-CK_RV CK_ENTRY CA_GetTokenCertificates( CK_SLOT_ID slotID,
-                                        CK_ULONG ulCertType,
-                                        CK_BYTE_PTR pCertificate,
-                                        CK_ULONG_PTR pulCertificateLen );
+CK_RV CK_ENTRY CA_GetTokenCertificates(CK_SLOT_ID slotID,
+                                       CK_ULONG ulCertType,
+                                       CK_BYTE_PTR pCertificate,
+                                       CK_ULONG_PTR pulCertificateLen);
 
 /****************************************************************************\
 *
@@ -773,25 +663,25 @@ CK_RV CK_ENTRY CA_GetTokenCertificates( CK_SLOT_ID slotID,
 *
 \****************************************************************************/
 
-CK_RV CK_ENTRY CA_ExtractMaskedObject( CK_SESSION_HANDLE hSession,
-                                       CK_ULONG ulObjectHandle,
-                                       CK_BYTE_PTR pMaskedKey,
-                                       CK_ULONG_PTR pusMaskedKeyLen);
-
-CK_RV CK_ENTRY CA_InsertMaskedObject( CK_SESSION_HANDLE hSession,
-                                      CK_ULONG_PTR pulObjectHandle,
+CK_RV CK_ENTRY CA_ExtractMaskedObject(CK_SESSION_HANDLE hSession,
+                                      CK_ULONG ulObjectHandle,
                                       CK_BYTE_PTR pMaskedKey,
-                                      CK_ULONG usMaskedKeyLen);
-
-CK_RV CK_ENTRY CA_MultisignValue( CK_SESSION_HANDLE hSession,
-                                  CK_MECHANISM_PTR pMechanism,
-                                  CK_ULONG ulMaskedKeyLen,
-                                  CK_BYTE_PTR pMaskedKey,
-                                  CK_ULONG_PTR pulBlobCount,
-                                  CK_ULONG_PTR pulBlobLens,
-                                  CK_BYTE_PTR CK_PTR ppBlobs,
-                                  CK_ULONG_PTR pulSignatureLens,
-                                  CK_BYTE_PTR CK_PTR ppSignatures);
+                                      CK_ULONG_PTR pusMaskedKeyLen);
+
+CK_RV CK_ENTRY CA_InsertMaskedObject(CK_SESSION_HANDLE hSession,
+                                     CK_ULONG_PTR pulObjectHandle,
+                                     CK_BYTE_PTR pMaskedKey,
+                                     CK_ULONG usMaskedKeyLen);
+
+CK_RV CK_ENTRY CA_MultisignValue(CK_SESSION_HANDLE hSession,
+                                 CK_MECHANISM_PTR pMechanism,
+                                 CK_ULONG ulMaskedKeyLen,
+                                 CK_BYTE_PTR pMaskedKey,
+                                 CK_ULONG_PTR pulBlobCount,
+                                 CK_ULONG_PTR pulBlobLens,
+                                 CK_BYTE_PTR CK_PTR ppBlobs,
+                                 CK_ULONG_PTR pulSignatureLens,
+                                 CK_BYTE_PTR CK_PTR ppSignatures);
 
 //////////////////////////////////////////////////////////////////////
 //
@@ -832,18 +722,17 @@ CK_RV CK_ENTRY CA_MultisignValue( CK_SESSION_HANDLE hSession,
 //     point could result in lost data.
 //
 //////////////////////////////////////////////////////////////////////
-CK_RV CK_ENTRY CA_SIMExtract( CK_SESSION_HANDLE     hSession,
-                              CK_ULONG              ulHandleCount,
-                              CK_OBJECT_HANDLE_PTR  pHandleList,
-                              CK_ULONG              ulAuthSecretCount,   // N value
-                              CK_ULONG              ulAuthSubsetCount,   // M value
-                              CKA_SIM_AUTH_FORM     authForm,
-                              CK_ULONG_PTR          pulAuthSecretSizes,
-                              CK_BYTE_PTR           *ppbAuthSecretList,
-                              CK_BBOOL              deleteAfterExtract,
-                              CK_ULONG_PTR          pulBlobSize,
-                              CK_BYTE_PTR           pBlob );
-
+CK_RV CK_ENTRY CA_SIMExtract(CK_SESSION_HANDLE hSession,
+                             CK_ULONG ulHandleCount,
+                             CK_OBJECT_HANDLE_PTR pHandleList,
+                             CK_ULONG ulAuthSecretCount, // N value
+                             CK_ULONG ulAuthSubsetCount, // M value
+                             CKA_SIM_AUTH_FORM authForm,
+                             CK_ULONG_PTR pulAuthSecretSizes,
+                             CK_BYTE_PTR* ppbAuthSecretList,
+                             CK_BBOOL deleteAfterExtract,
+                             CK_ULONG_PTR pulBlobSize,
+                             CK_BYTE_PTR pBlob);
 
 //////////////////////////////////////////////////////////////////////
 //
@@ -871,16 +760,15 @@ CK_RV CK_ENTRY CA_SIMExtract( CK_SESSION_HANDLE     hSession,
 //      returns.
 //
 //////////////////////////////////////////////////////////////////////
-CK_RV CK_ENTRY CA_SIMInsert( CK_SESSION_HANDLE     hSession,
-                             CK_ULONG              ulAuthSecretCount,   // M value
-                             CKA_SIM_AUTH_FORM     authForm,
-                             CK_ULONG_PTR          pulAuthSecretSizes,
-                             CK_BYTE_PTR           *ppbAuthSecretList,
-                             CK_ULONG              ulBlobSize,
-                             CK_BYTE_PTR           pBlob,
-                             CK_ULONG_PTR          pulHandleCount,
-                             CK_OBJECT_HANDLE_PTR  pHandleList );
-
+CK_RV CK_ENTRY CA_SIMInsert(CK_SESSION_HANDLE hSession,
+                            CK_ULONG ulAuthSecretCount, // M value
+                            CKA_SIM_AUTH_FORM authForm,
+                            CK_ULONG_PTR pulAuthSecretSizes,
+                            CK_BYTE_PTR* ppbAuthSecretList,
+                            CK_ULONG ulBlobSize,
+                            CK_BYTE_PTR pBlob,
+                            CK_ULONG_PTR pulHandleCount,
+                            CK_OBJECT_HANDLE_PTR pHandleList);
 
 //////////////////////////////////////////////////////////////////////
 //
@@ -904,68 +792,65 @@ CK_RV CK_ENTRY CA_SIMInsert( CK_SESSION_HANDLE     hSession,
 //      buffers must be large enough to accept the given signature.
 //
 //////////////////////////////////////////////////////////////////////
-CK_RV CK_ENTRY CA_SIMMultiSign( CK_SESSION_HANDLE       hSession,
-                                CK_MECHANISM_PTR        pMechanism,
-                                CK_ULONG                ulAuthSecretCount,   // M value
-                                CKA_SIM_AUTH_FORM       authForm,
-                                CK_ULONG_PTR            pulAuthSecretSizes,
-                                CK_BYTE_PTR             *ppbAuthSecretList,
-                                CK_ULONG                ulBlobSize,
-                                CK_BYTE_PTR             pBlob,
-                                CK_ULONG                ulInputDataCount,
-                                CK_ULONG_PTR            pulInputDataLengths,
-                                CK_BYTE_PTR             *ppbInputDataList,
-                                CK_ULONG_PTR            pulSignatureLengths,
-                                CK_BYTE_PTR             *ppbSignatureList );
+CK_RV CK_ENTRY CA_SIMMultiSign(CK_SESSION_HANDLE hSession,
+                               CK_MECHANISM_PTR pMechanism,
+                               CK_ULONG ulAuthSecretCount, // M value
+                               CKA_SIM_AUTH_FORM authForm,
+                               CK_ULONG_PTR pulAuthSecretSizes,
+                               CK_BYTE_PTR* ppbAuthSecretList,
+                               CK_ULONG ulBlobSize,
+                               CK_BYTE_PTR pBlob,
+                               CK_ULONG ulInputDataCount,
+                               CK_ULONG_PTR pulInputDataLengths,
+                               CK_BYTE_PTR* ppbInputDataList,
+                               CK_ULONG_PTR pulSignatureLengths,
+                               CK_BYTE_PTR* ppbSignatureList);
 
 //////////////////////////////////////////////////////////////////////
 // SIM3 Functions
 //////////////////////////////////////////////////////////////////////
-CK_RV CK_ENTRY CA_Extract( CK_SESSION_HANDLE hSession,
-                           CK_MECHANISM_PTR pMechanism );
-
-CK_RV CK_ENTRY CA_Insert( CK_SESSION_HANDLE hSession,
-                          CK_MECHANISM_PTR pMechanism );
+CK_RV CK_ENTRY CA_Extract(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism);
 
-CK_RV CK_ENTRY CA_GetTokenObjectUID( CK_SLOT_ID slotID,
-                                     CK_ULONG ulObjectType,
-                                     CK_ULONG ulObjectHandle,
-                                     CK_BYTE ouid[12]);
+CK_RV CK_ENTRY CA_Insert(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism);
 
-CK_RV CK_ENTRY CA_GetTokenObjectHandle( CK_SLOT_ID slotID,
-                                        CK_BYTE ouid[12],
-                                        CK_ULONG_PTR pulObjectType,
-                                        CK_ULONG_PTR pulObjectHandle);
+CK_RV CK_ENTRY CA_GetTokenObjectUID(CK_SLOT_ID slotID, CK_ULONG ulObjectType, CK_ULONG ulObjectHandle, CK_BYTE ouid[12]);
 
-CK_RV CK_ENTRY CA_GetObjectUID( CK_SLOT_ID slotID,
-                                CK_ULONG ulContainerNum,
-                                CK_ULONG ulObjectType,
-                                CK_ULONG ulObjectHandle,
-                                CK_BYTE ouid[12]);
+CK_RV CK_ENTRY CA_GetTokenObjectHandle(CK_SLOT_ID slotID,
+                                       CK_BYTE ouid[12],
+                                       CK_ULONG_PTR pulObjectType,
+                                       CK_ULONG_PTR pulObjectHandle);
 
-CK_RV CK_ENTRY CA_GetObjectHandle( CK_SLOT_ID slotID,
-                                CK_ULONG ulContainerNum,
-                                CK_BYTE ouid[12],
-                                CK_ULONG_PTR pulObjectType,
-                                CK_ULONG_PTR pulObjectHandle);
+CK_RV CK_ENTRY CA_GetObjectUID(CK_SLOT_ID slotID,
+                               CK_ULONG ulContainerNum,
+                               CK_ULONG ulObjectType,
+                               CK_ULONG ulObjectHandle,
+                               CK_BYTE ouid[12]);
 
-CK_RV CK_ENTRY CA_DeleteContainer( CK_SESSION_HANDLE hSession);
+CK_RV CK_ENTRY CA_GetObjectHandle(CK_SLOT_ID slotID,
+                                  CK_ULONG ulContainerNum,
+                                  CK_BYTE ouid[12],
+                                  CK_ULONG_PTR pulObjectType,
+                                  CK_ULONG_PTR pulObjectHandle);
 
+CK_RV CK_ENTRY CA_DeleteContainer(CK_SESSION_HANDLE hSession);
 
 CK_RV CK_ENTRY CA_MTKSetStorage(CK_SESSION_HANDLE ulSessionNumber, CK_ULONG ulStorageSetting);
-CK_RV CK_ENTRY CA_MTKRestore (CK_SLOT_ID slotID);
-CK_RV CK_ENTRY CA_MTKResplit (CK_SLOT_ID slotID);
-CK_RV CK_ENTRY CA_MTKZeroize (CK_SLOT_ID slotID);
-CK_RV CK_ENTRY CA_MTKGetState (CK_SLOT_ID slotID, CK_ULONG_PTR state);
+CK_RV CK_ENTRY CA_MTKRestore(CK_SLOT_ID slotID);
+CK_RV CK_ENTRY CA_MTKResplit(CK_SLOT_ID slotID);
+CK_RV CK_ENTRY CA_MTKZeroize(CK_SLOT_ID slotID);
+CK_RV CK_ENTRY CA_MTKGetState(CK_SLOT_ID slotID, CK_ULONG_PTR state);
 
 CK_RV CK_ENTRY CA_TamperClear(CK_SESSION_HANDLE ulSessionNumber);
 
-CK_RV CK_ENTRY CA_STMToggle(CK_SESSION_HANDLE ulSessionNumber, CK_ULONG ulValue,
-                            CK_ULONG ulInputDataSize, CK_CHAR_PTR pInputData,
-                            CK_ULONG_PTR pulOutputDataSize, CK_CHAR_PTR pOutputData);
-CK_RV CK_ENTRY CA_STMGetState (CK_SLOT_ID slotID, CK_ULONG_PTR state);
+CK_RV CK_ENTRY CA_STMToggle(CK_SESSION_HANDLE ulSessionNumber,
+                            CK_ULONG ulValue,
+                            CK_ULONG ulInputDataSize,
+                            CK_CHAR_PTR pInputData,
+                            CK_ULONG_PTR pulOutputDataSize,
+                            CK_CHAR_PTR pOutputData);
+CK_RV CK_ENTRY CA_STMGetState(CK_SLOT_ID slotID, CK_ULONG_PTR state);
 
-CK_RV CK_ENTRY CA_GetTSV (CK_SLOT_ID slotID, CK_ULONG_PTR pTSV);
+CK_RV CK_ENTRY CA_GetTSV(CK_SLOT_ID slotID, CK_ULONG_PTR pTSV);
 
 //
 /****************************************************************************\
@@ -974,84 +859,80 @@ CK_RV CK_ENTRY CA_GetTSV (CK_SLOT_ID slotID, CK_ULONG_PTR pTSV);
 *
 \****************************************************************************/
 
-CK_RV CK_ENTRY CA_InvokeServiceInit( CK_SESSION_HANDLE hSession,
-                                     CK_ULONG ulPortNumber );
-
-CK_RV CK_ENTRY CA_InvokeService( CK_SESSION_HANDLE hSession,
-             CK_BYTE_PTR pBufferIn,
-             CK_ULONG ulBufferInLength,
-             CK_ULONG_PTR pulBufferOutLength );
-
-CK_RV CK_ENTRY CA_InvokeServiceFinal( CK_SESSION_HANDLE hSession,
-             CK_BYTE_PTR pBufferOut,
-             CK_ULONG_PTR pulBufferOutLength );
-
-CK_RV CK_ENTRY CA_InvokeServiceAsynch( CK_SESSION_HANDLE hSession,
-                   CK_ULONG ulPortNumber,
-                   CK_BYTE_PTR pBufferIn,
-                   CK_ULONG ulBufferInLength );
-
-CK_RV CK_ENTRY CA_InvokeServiceSinglePart( CK_SESSION_HANDLE hSession,
-                       CK_ULONG ulPortNumber,
-                       CK_BYTE_PTR pBufferIn,
-                       CK_ULONG ulBufferInLength,
-                  CK_BYTE_PTR pBufferOut,
-                  CK_ULONG_PTR pulBufferOutLength );
-
-CK_RV CK_ENTRY CA_EncodeECPrimeParams( CK_BYTE_PTR DerECParams,
-                           CK_ULONG_PTR DerECParamsLen,
-                           CK_BYTE_PTR prime,
-                           CK_ULONG   primelen,
-                           CK_BYTE_PTR a,
-                           CK_ULONG   alen,
-                           CK_BYTE_PTR b,
-                           CK_ULONG   blen,
-                           CK_BYTE_PTR seed, // Can be NULL
-                           CK_ULONG   seedlen,
-                           CK_BYTE_PTR x,
-                           CK_ULONG   xlen,
-                           CK_BYTE_PTR y,
-                           CK_ULONG   ylen,
-                           CK_BYTE_PTR order,
-                           CK_ULONG   orderlen,
-                           CK_BYTE_PTR cofactor, // Can be NULL
-                           CK_ULONG   cofactorlen );
-CK_RV CK_ENTRY CA_EncodeECChar2Params(
-                           CK_BYTE_PTR DerECParams,
-                           CK_ULONG_PTR DerECParamsLen,
-                           CK_ULONG   m,
-                           CK_ULONG   k1,
-                           CK_ULONG   k2,
-                           CK_ULONG   k3,
-                           CK_BYTE_PTR a,
-                           CK_ULONG   alen,
-                           CK_BYTE_PTR b,
-                           CK_ULONG   blen,
-                           CK_BYTE_PTR seed, // Can be NULL
-                           CK_ULONG   seedlen,
-                           CK_BYTE_PTR x,
-                           CK_ULONG   xlen,
-                           CK_BYTE_PTR y,
-                           CK_ULONG   ylen,
-                           CK_BYTE_PTR order,
-                           CK_ULONG   orderlen,
-                           CK_BYTE_PTR cofactor, // Can be NULL
-                           CK_ULONG   cofactorlen );
-
-CK_RV CK_ENTRY CA_EncodeECParamsFromFile( CK_BYTE_PTR DerECParams,
-                           CK_ULONG_PTR DerECParamsLen,
-                           CK_BYTE_PTR paramsFile );
+CK_RV CK_ENTRY CA_InvokeServiceInit(CK_SESSION_HANDLE hSession, CK_ULONG ulPortNumber);
+
+CK_RV CK_ENTRY CA_InvokeService(CK_SESSION_HANDLE hSession,
+                                CK_BYTE_PTR pBufferIn,
+                                CK_ULONG ulBufferInLength,
+                                CK_ULONG_PTR pulBufferOutLength);
+
+CK_RV CK_ENTRY CA_InvokeServiceFinal(CK_SESSION_HANDLE hSession,
+                                     CK_BYTE_PTR pBufferOut,
+                                     CK_ULONG_PTR pulBufferOutLength);
+
+CK_RV CK_ENTRY CA_InvokeServiceAsynch(CK_SESSION_HANDLE hSession,
+                                      CK_ULONG ulPortNumber,
+                                      CK_BYTE_PTR pBufferIn,
+                                      CK_ULONG ulBufferInLength);
+
+CK_RV CK_ENTRY CA_InvokeServiceSinglePart(CK_SESSION_HANDLE hSession,
+                                          CK_ULONG ulPortNumber,
+                                          CK_BYTE_PTR pBufferIn,
+                                          CK_ULONG ulBufferInLength,
+                                          CK_BYTE_PTR pBufferOut,
+                                          CK_ULONG_PTR pulBufferOutLength);
+
+CK_RV CK_ENTRY CA_EncodeECPrimeParams(CK_BYTE_PTR DerECParams,
+                                      CK_ULONG_PTR DerECParamsLen,
+                                      CK_BYTE_PTR prime,
+                                      CK_ULONG primelen,
+                                      CK_BYTE_PTR a,
+                                      CK_ULONG alen,
+                                      CK_BYTE_PTR b,
+                                      CK_ULONG blen,
+                                      CK_BYTE_PTR seed, // Can be NULL
+                                      CK_ULONG seedlen,
+                                      CK_BYTE_PTR x,
+                                      CK_ULONG xlen,
+                                      CK_BYTE_PTR y,
+                                      CK_ULONG ylen,
+                                      CK_BYTE_PTR order,
+                                      CK_ULONG orderlen,
+                                      CK_BYTE_PTR cofactor, // Can be NULL
+                                      CK_ULONG cofactorlen);
+CK_RV CK_ENTRY CA_EncodeECChar2Params(CK_BYTE_PTR DerECParams,
+                                      CK_ULONG_PTR DerECParamsLen,
+                                      CK_ULONG m,
+                                      CK_ULONG k1,
+                                      CK_ULONG k2,
+                                      CK_ULONG k3,
+                                      CK_BYTE_PTR a,
+                                      CK_ULONG alen,
+                                      CK_BYTE_PTR b,
+                                      CK_ULONG blen,
+                                      CK_BYTE_PTR seed, // Can be NULL
+                                      CK_ULONG seedlen,
+                                      CK_BYTE_PTR x,
+                                      CK_ULONG xlen,
+                                      CK_BYTE_PTR y,
+                                      CK_ULONG ylen,
+                                      CK_BYTE_PTR order,
+                                      CK_ULONG orderlen,
+                                      CK_BYTE_PTR cofactor, // Can be NULL
+                                      CK_ULONG cofactorlen);
+
+CK_RV CK_ENTRY CA_EncodeECParamsFromFile(CK_BYTE_PTR DerECParams, CK_ULONG_PTR DerECParamsLen, CK_BYTE_PTR paramsFile);
 
 CK_RV CK_ENTRY CA_GetHSMStats(CK_SLOT_ID slotID,
                               CK_ULONG ulStatsIdsCount,
                               CK_ULONG_PTR pStatsIds,
-                              HSM_STATS_PARAMS *pStatsParams);
+                              HSM_STATS_PARAMS* pStatsParams);
 
 CK_RV CK_ENTRY CA_GetHSMStorageInformation(CK_SLOT_ID slotID,
-                                          CK_ULONG_PTR pulContainerOverhead,
-                                          CK_ULONG_PTR pulTotal,
-                                          CK_ULONG_PTR pulUsed,
-                                          CK_ULONG_PTR pulFree);
+                                           CK_ULONG_PTR pulContainerOverhead,
+                                           CK_ULONG_PTR pulTotal,
+                                           CK_ULONG_PTR pulUsed,
+                                           CK_ULONG_PTR pulFree);
 
 CK_RV CK_ENTRY CA_GetTokenStorageInformation(CK_SLOT_ID slotID,
                                              CK_ULONG_PTR pulContainerOverhead,
@@ -1061,50 +942,45 @@ CK_RV CK_ENTRY CA_GetTokenStorageInformation(CK_SLOT_ID slotID,
                                              CK_ULONG_PTR pulObjectCount);
 
 CK_RV CK_ENTRY CA_GetContainerStorageInformation(CK_SLOT_ID slotID,
-                                                CK_ULONG ulContainerNumber,
-                                                CK_ULONG_PTR pulContainerOverhead,
-                                                CK_ULONG_PTR pulTotal,
-                                                CK_ULONG_PTR pulUsed,
-                                                CK_ULONG_PTR pulFree,
-                                                CK_ULONG_PTR pulObjectCount);
+                                                 CK_ULONG ulContainerNumber,
+                                                 CK_ULONG_PTR pulContainerOverhead,
+                                                 CK_ULONG_PTR pulTotal,
+                                                 CK_ULONG_PTR pulUsed,
+                                                 CK_ULONG_PTR pulFree,
+                                                 CK_ULONG_PTR pulObjectCount);
 
-CK_RV CK_ENTRY CA_SetContainerSize(CK_SESSION_HANDLE hSession,
-                                 CK_ULONG ulContainerNumber,
-                                 CK_ULONG ulSize);
+CK_RV CK_ENTRY CA_SetContainerSize(CK_SESSION_HANDLE hSession, CK_ULONG ulContainerNumber, CK_ULONG ulSize);
 
 CK_RV CK_ENTRY CA_CreateContainerWithPolicy(CK_SESSION_HANDLE hSession,
-                                    CK_ULONG ulUSV,
-                                    CK_CHAR_PTR pContainerName,
-                                    CK_ULONG usContainerNameLen,
-                                    CK_CHAR_PTR pPin,
-                                    CK_ULONG usPinLen,
-                                    CK_ULONG ulIDHigh,
-                                    CK_ULONG ulIDLow,
-                                    CK_ULONG ulOwnerHandle,
-                                    CK_ULONG ulStorageFlags,
-                                    CK_ULONG ulContainerSize,
-                                    CK_ULONG_PTR pulContainerNumber,
-                                    CK_ULONG policyVersion,
-                                    CK_ULONG policySize,
-                                    CK_BYTE_PTR pPolicyBuf);
-
-CK_RV CK_ENTRY CA_CreateContainer(  CK_SESSION_HANDLE hSession,
-                                    CK_ULONG ulUSV,
-                                    CK_CHAR_PTR pContainerName,
-                                    CK_ULONG usContainerNameLen,
-                                    CK_CHAR_PTR pPin,
-                                    CK_ULONG usPinLen,
-                                    CK_ULONG ulIDHigh,
-                                    CK_ULONG ulIDLow,
-                                    CK_ULONG ulOwnerHandle,
-                                    CK_ULONG ulStorageFlags,
-                                    CK_ULONG ulContainerSize,
-                                    CK_ULONG_PTR pulContainerNumber);
-
-CK_RV CK_ENTRY CA_InitAudit(CK_SLOT_ID slotID,
-                           CK_CHAR_PTR pPin,
-                           CK_ULONG usPinLen,
-                           CK_CHAR_PTR pLabel);
+                                            CK_ULONG ulUSV,
+                                            CK_CHAR_PTR pContainerName,
+                                            CK_ULONG usContainerNameLen,
+                                            CK_CHAR_PTR pPin,
+                                            CK_ULONG usPinLen,
+                                            CK_ULONG ulIDHigh,
+                                            CK_ULONG ulIDLow,
+                                            CK_ULONG ulOwnerHandle,
+                                            CK_ULONG ulStorageFlags,
+                                            CK_ULONG ulContainerSize,
+                                            CK_ULONG_PTR pulContainerNumber,
+                                            CK_ULONG policyVersion,
+                                            CK_ULONG policySize,
+                                            CK_BYTE_PTR pPolicyBuf);
+
+CK_RV CK_ENTRY CA_CreateContainer(CK_SESSION_HANDLE hSession,
+                                  CK_ULONG ulUSV,
+                                  CK_CHAR_PTR pContainerName,
+                                  CK_ULONG usContainerNameLen,
+                                  CK_CHAR_PTR pPin,
+                                  CK_ULONG usPinLen,
+                                  CK_ULONG ulIDHigh,
+                                  CK_ULONG ulIDLow,
+                                  CK_ULONG ulOwnerHandle,
+                                  CK_ULONG ulStorageFlags,
+                                  CK_ULONG ulContainerSize,
+                                  CK_ULONG_PTR pulContainerNumber);
+
+CK_RV CK_ENTRY CA_InitAudit(CK_SLOT_ID slotID, CK_CHAR_PTR pPin, CK_ULONG usPinLen, CK_CHAR_PTR pLabel);
 
 CK_RV CK_ENTRY CA_LogVerify(CK_SESSION_HANDLE hSession,
                             CK_BYTE_PTR pLogMsgs,
@@ -1112,21 +988,17 @@ CK_RV CK_ENTRY CA_LogVerify(CK_SESSION_HANDLE hSession,
                             CK_ULONG bChainToHSM,
                             CK_ULONG_PTR pulNumVerified);
 
-CK_RV CK_ENTRY CA_LogVerifyFile(CK_SESSION_HANDLE hSession,
-                            CK_CHAR_PTR pFileName,
-                            CK_ULONG_PTR ulNumVerified);
+CK_RV CK_ENTRY CA_LogVerifyFile(CK_SESSION_HANDLE hSession, CK_CHAR_PTR pFileName, CK_ULONG_PTR ulNumVerified);
 
-CK_RV CK_ENTRY CA_LogExternal(CK_SLOT_ID slotID, CK_SESSION_HANDLE hSession, const CK_CHAR *pStr, CK_ULONG ulLen);
+CK_RV CK_ENTRY CA_LogExternal(CK_SLOT_ID slotID, CK_SESSION_HANDLE hSession, const CK_CHAR* pStr, CK_ULONG ulLen);
 
 CK_RV CK_ENTRY CA_LogImportSecret(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pStr, CK_ULONG strSize);
 
 CK_RV CK_ENTRY CA_LogExportSecret(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pStr, CK_ULONG_PTR pStrSize);
 
-CK_RV CK_ENTRY CA_TimeSync(CK_SESSION_HANDLE hSession,
-                           CK_ULONG ulTime);
+CK_RV CK_ENTRY CA_TimeSync(CK_SESSION_HANDLE hSession, CK_ULONG ulTime);
 
-CK_RV CK_ENTRY CA_GetTime(CK_SESSION_HANDLE hSession,
-                          CK_ULONG_PTR pulTime);
+CK_RV CK_ENTRY CA_GetTime(CK_SESSION_HANDLE hSession, CK_ULONG_PTR pulTime);
 
 CK_RV CK_ENTRY CA_LogSetConfig(CK_SESSION_HANDLE hSession,
                                CK_ULONG mask,
@@ -1136,44 +1008,41 @@ CK_RV CK_ENTRY CA_LogSetConfig(CK_SESSION_HANDLE hSession,
                                CK_BYTE_PTR pLogPath);
 
 CK_RV CK_ENTRY CA_LogGetConfig(CK_SESSION_HANDLE hSession,
-                               CK_ULONG *mask,
-                               CK_ULONG *logRotateOffset,
-                               CK_ULONG *logRotateInterval,
-                               CK_ULONG *maxLogSize,
+                               CK_ULONG* mask,
+                               CK_ULONG* logRotateOffset,
+                               CK_ULONG* logRotateInterval,
+                               CK_ULONG* maxLogSize,
                                CK_BYTE_PTR pLogPath);
 
 CK_RV CK_ENTRY CA_ReplaceFastPathKEK(CK_SESSION_HANDLE hSession);
 
-CK_RV CK_ENTRY CA_LogGetStatus (CK_SLOT_ID slotId,
-                                CK_ULONG *auditInitStatus,
-                                CK_ULONG *lastPollResult,
-                                CK_ULONG *lastSetConfigResult,
-                                CK_ULONG *isConfigInParamArea,
-                                CK_ULONG *numRecordsInFlash);
+CK_RV CK_ENTRY CA_LogGetStatus(CK_SLOT_ID slotId,
+                               CK_ULONG* auditInitStatus,
+                               CK_ULONG* lastPollResult,
+                               CK_ULONG* lastSetConfigResult,
+                               CK_ULONG* isConfigInParamArea,
+                               CK_ULONG* numRecordsInFlash);
 
-CK_RV CK_ENTRY CA_DeleteContainerWithHandle( CK_SESSION_HANDLE hSession,
-                                             CK_ULONG ulContainerNumber);
+CK_RV CK_ENTRY CA_DeleteContainerWithHandle(CK_SESSION_HANDLE hSession, CK_ULONG ulContainerNumber);
 
-CK_RV CK_ENTRY CA_GetContainerList( CK_SLOT_ID slotID,
-                                    CK_ULONG ulGroupHandle,
-                                    CK_ULONG ulContainerType,
-                                    CK_ULONG_PTR pulContainerHandles,
-                                    CK_ULONG_PTR pulNumberOfHandles);
+CK_RV CK_ENTRY CA_GetContainerList(CK_SLOT_ID slotID,
+                                   CK_ULONG ulGroupHandle,
+                                   CK_ULONG ulContainerType,
+                                   CK_ULONG_PTR pulContainerHandles,
+                                   CK_ULONG_PTR pulNumberOfHandles);
 
-CK_RV CK_ENTRY CA_GetContainerName( CK_SLOT_ID slotID,
-                                    CK_ULONG ulContainerHandle,
-                                    CK_BYTE_PTR pContainerName,
-                                    CK_ULONG_PTR pulContainerNameLen);
+CK_RV CK_ENTRY CA_GetContainerName(CK_SLOT_ID slotID,
+                                   CK_ULONG ulContainerHandle,
+                                   CK_BYTE_PTR pContainerName,
+                                   CK_ULONG_PTR pulContainerNameLen);
 
-CK_RV CK_ENTRY CA_GetNumberOfAllowedContainers(CK_SLOT_ID slot,
-                                               CK_ULONG_PTR pulAllowedContainers);
+CK_RV CK_ENTRY CA_GetNumberOfAllowedContainers(CK_SLOT_ID slot, CK_ULONG_PTR pulAllowedContainers);
 
 CK_RV CK_ENTRY CA_GetTunnelSlotNumber(CK_SLOT_ID slotID, CK_SLOT_ID_PTR pTunnelSlotID);
 
-CK_RV CK_ENTRY CA_GetClusterState( CK_SLOT_ID slotId,
-                                   CK_CLUSTER_STATE_PTR pState );
-CK_RV CK_ENTRY CA_LockClusteredSlot( CK_SLOT_ID slotId );
-CK_RV CK_ENTRY CA_UnlockClusteredSlot( CK_SLOT_ID slotId );
+CK_RV CK_ENTRY CA_GetClusterState(CK_SLOT_ID slotId, CK_CLUSTER_STATE_PTR pState);
+CK_RV CK_ENTRY CA_LockClusteredSlot(CK_SLOT_ID slotId);
+CK_RV CK_ENTRY CA_UnlockClusteredSlot(CK_SLOT_ID slotId);
 
 CK_RV CK_ENTRY CA_ModifyUsageCount(CK_SESSION_HANDLE hSession,
                                    CK_OBJECT_HANDLE hObject,
@@ -1186,31 +1055,28 @@ CK_RV CK_ENTRY CA_EnableUnauthTokenInsertion(CK_SESSION_HANDLE hSession,
 
 CK_RV CK_ENTRY CA_GetUnauthTokenInsertionStatus(CK_SESSION_HANDLE hSession,
                                                 CK_ULONG ulContextHandle,
-                                                CK_ULONG *pulMaxUsageCount,
-                                                CK_ULONG *pulCurUsageCount);
+                                                CK_ULONG* pulMaxUsageCount,
+                                                CK_ULONG* pulCurUsageCount);
 
-CK_RV CK_ENTRY CA_DisableUnauthTokenInsertion(CK_SESSION_HANDLE hSession,
-                                              CK_ULONG ulContextHandle);
+CK_RV CK_ENTRY CA_DisableUnauthTokenInsertion(CK_SESSION_HANDLE hSession, CK_ULONG ulContextHandle);
 
 CK_RV CK_ENTRY CA_STCRegister(CK_SESSION_HANDLE hSession,
                               CK_SLOT_ID TargetSlotID,
-                              const CK_CHAR *username,
+                              const CK_CHAR* username,
                               CK_ULONG access,
-                              const CK_CHAR *pmod,
+                              const CK_CHAR* pmod,
                               CK_ULONG mod_len,
-                              const CK_CHAR *pexp,
+                              const CK_CHAR* pexp,
                               CK_ULONG exp_len);
 
-CK_RV CK_ENTRY CA_STCDeregister(CK_SESSION_HANDLE hSession,
-                                CK_SLOT_ID TargetslotID,
-                                const CK_CHAR *username);
+CK_RV CK_ENTRY CA_STCDeregister(CK_SESSION_HANDLE hSession, CK_SLOT_ID TargetslotID, const CK_CHAR* username);
 
 CK_RV CK_ENTRY CA_STCGetPubKey(CK_SESSION_HANDLE hSession,
                                CK_SLOT_ID TargetSlotID,
-                               const CK_CHAR * username,
-                               CK_CHAR *pmod,
+                               const CK_CHAR* username,
+                               CK_CHAR* pmod,
                                CK_ULONG_PTR mod_len,
-                               CK_CHAR *pexp,
+                               CK_CHAR* pexp,
                                CK_ULONG_PTR exp_len);
 
 CK_RV CK_ENTRY CA_STCGetClientsList(CK_SESSION_HANDLE hSession,
@@ -1221,208 +1087,160 @@ CK_RV CK_ENTRY CA_STCGetClientsList(CK_SESSION_HANDLE hSession,
 CK_RV CK_ENTRY CA_STCGetClientInfo(CK_SESSION_HANDLE hSession,
                                    CK_SLOT_ID TargetSlotID,
                                    CK_ULONG ulHandke,
-                                   CK_CHAR * username,
+                                   CK_CHAR* username,
                                    CK_ULONG_PTR name_len,
                                    CK_ULONG_PTR access,
-                                   CK_CHAR * mod,
+                                   CK_CHAR* mod,
                                    CK_ULONG_PTR mod_len,
-                                   CK_CHAR * exp,
+                                   CK_CHAR* exp,
                                    CK_ULONG_PTR exp_len);
 
 CK_RV CK_ENTRY CA_STCGetPartPubKey(CK_SESSION_HANDLE hSession,
                                    CK_SLOT_ID TargetSlotID,
-                                   CK_CHAR * mod,
+                                   CK_CHAR* mod,
                                    CK_ULONG_PTR modSize,
-                                   CK_CHAR * exp,
+                                   CK_CHAR* exp,
                                    CK_ULONG_PTR expSize);
 
-CK_RV CK_ENTRY CA_STCGetAdminPubKey(CK_SLOT_ID slotId,
-                                    CK_CHAR * mod,
-                                    CK_ULONG_PTR modSize,
-                                    CK_CHAR * exp,
-                                    CK_ULONG_PTR expSize);
+CK_RV CK_ENTRY
+  CA_STCGetAdminPubKey(CK_SLOT_ID slotId, CK_CHAR* mod, CK_ULONG_PTR modSize, CK_CHAR* exp, CK_ULONG_PTR expSize);
 
-CK_RV CK_ENTRY CA_STCSetCipherAlgorithm(CK_SESSION_HANDLE hSession,
-                                        CK_ULONG TargetSlotID,
-                                        CK_ULONG CipherID);
+CK_RV CK_ENTRY CA_STCSetCipherAlgorithm(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG CipherID);
 
 CK_RV CK_ENTRY CA_STCGetCipherAlgorithm(CK_SESSION_HANDLE hSession,
                                         CK_ULONG TargetSlotID,
                                         CK_BYTE_PTR pIDCount,
                                         CK_ULONG_PTR pIDs);
 
-CK_RV CK_ENTRY CA_STCClearCipherAlgorithm(CK_SESSION_HANDLE hSession,
-                                          CK_ULONG TargetSlotID,
-                                          CK_ULONG CipherID);
+CK_RV CK_ENTRY CA_STCClearCipherAlgorithm(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG CipherID);
 
-CK_RV CK_ENTRY CA_STCSetDigestAlgorithm(CK_SESSION_HANDLE hSession,
-                                        CK_ULONG TargetSlotID,
-                                        CK_ULONG DigestID);
+CK_RV CK_ENTRY CA_STCSetDigestAlgorithm(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG DigestID);
 
 CK_RV CK_ENTRY CA_STCGetDigestAlgorithm(CK_SESSION_HANDLE hSession,
                                         CK_ULONG TargetSlotID,
                                         CK_BYTE_PTR pIDCount,
                                         CK_ULONG_PTR pIDs);
 
-CK_RV CK_ENTRY CA_STCClearDigestAlgorithm(CK_SESSION_HANDLE hSession,
-                                          CK_ULONG TargetSlotID,
-                                          CK_ULONG DigestID);
+CK_RV CK_ENTRY CA_STCClearDigestAlgorithm(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG DigestID);
 
-CK_RV CK_ENTRY CA_STCSetKeyLifeTime(CK_SESSION_HANDLE hSession,
-                                    CK_ULONG TargetSlotID,
-                                    CK_ULONG lifeTime);
+CK_RV CK_ENTRY CA_STCSetKeyLifeTime(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG lifeTime);
 
-CK_RV CK_ENTRY CA_STCGetKeyLifeTime(CK_SESSION_HANDLE hSession,
-                                    CK_ULONG TargetSlotID,
-                                    CK_ULONG_PTR plifeTime);
+CK_RV CK_ENTRY CA_STCGetKeyLifeTime(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG_PTR plifeTime);
 
-CK_RV CK_ENTRY CA_STCSetKeyActivationTimeOut(CK_SESSION_HANDLE hSession,
-                                             CK_ULONG TargetSlotID,
-                                             CK_ULONG timeOut);
+CK_RV CK_ENTRY CA_STCSetKeyActivationTimeOut(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG timeOut);
 
-CK_RV CK_ENTRY CA_STCGetKeyActivationTimeOut(CK_SESSION_HANDLE hSession,
-                                             CK_ULONG TargetSlotID,
-                                             CK_ULONG_PTR ptimeOut);
+CK_RV CK_ENTRY CA_STCGetKeyActivationTimeOut(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG_PTR ptimeOut);
 
-CK_RV CK_ENTRY CA_STCSetMaxSessions(CK_SESSION_HANDLE hSession,
-                                    CK_ULONG TargetSlotID,
-                                    CK_ULONG maxSessions);
+CK_RV CK_ENTRY CA_STCSetMaxSessions(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG maxSessions);
 
-CK_RV CK_ENTRY CA_STCGetMaxSessions(CK_SESSION_HANDLE hSession,
-                                    CK_ULONG TargetSlotID,
-                                    CK_ULONG_PTR pmaxSessions);
+CK_RV CK_ENTRY CA_STCGetMaxSessions(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG_PTR pmaxSessions);
 
-CK_RV CK_ENTRY CA_STCSetSequenceWindowSize(CK_SESSION_HANDLE hSession,
-                                           CK_ULONG TargetSlotID,
-                                           CK_ULONG windowSize);
+CK_RV CK_ENTRY CA_STCSetSequenceWindowSize(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG windowSize);
 
-CK_RV CK_ENTRY CA_STCGetSequenceWindowSize(CK_SESSION_HANDLE hSession,
-                                           CK_ULONG TargetSlotID,
-                                           CK_ULONG_PTR pwindowSize);
+CK_RV CK_ENTRY CA_STCGetSequenceWindowSize(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG_PTR pwindowSize);
 
-CK_RV CK_ENTRY CA_STCIsEnabled(CK_ULONG TargetSlotID,
-                               CK_BYTE_PTR pbenabled);
+CK_RV CK_ENTRY CA_STCIsEnabled(CK_ULONG TargetSlotID, CK_BYTE_PTR pbenabled);
 
-CK_RV CK_ENTRY CA_STCGetState(CK_ULONG TargetSlotID,
-                              CK_CHAR * str,
-                              CK_BYTE bbufferSize);
+CK_RV CK_ENTRY CA_STCGetState(CK_ULONG TargetSlotID, CK_CHAR* str, CK_BYTE bbufferSize);
 
-CK_RV CK_ENTRY CA_STCGetCurrentKeyLife(CK_SESSION_HANDLE hSession,
-                                       CK_ULONG TargetSlotID,
-                                       CK_ULONG_PTR pcurKeyLife);
+CK_RV CK_ENTRY CA_STCGetCurrentKeyLife(CK_SESSION_HANDLE hSession, CK_ULONG TargetSlotID, CK_ULONG_PTR pcurKeyLife);
 
-CK_RV CK_ENTRY CA_GetSlotIdForPhysicalSlot(CK_ULONG physicalSlot,
-                                           CK_SLOT_ID_PTR pSlotId);
+CK_RV CK_ENTRY CA_GetSlotIdForPhysicalSlot(CK_ULONG physicalSlot, CK_SLOT_ID_PTR pSlotId);
 
-CK_RV CK_ENTRY CA_GetSlotIdForContainer(CK_ULONG slotID,
-                                        CK_ULONG ulContainerNumber,
-                                        CK_SLOT_ID_PTR pSlotID);
+CK_RV CK_ENTRY CA_GetSlotIdForContainer(CK_ULONG slotID, CK_ULONG ulContainerNumber, CK_SLOT_ID_PTR pSlotID);
 
-CK_RV CK_ENTRY CA_STCGetChannelID(CK_SLOT_ID slotId,
-                                  CK_ULONG_PTR ulChannelId);
+CK_RV CK_ENTRY CA_STCGetChannelID(CK_SLOT_ID slotId, CK_ULONG_PTR ulChannelId);
 
-CK_RV CK_ENTRY CA_STCGetCipherID(CK_SLOT_ID slotId,
-                                 CK_ULONG_PTR ulCipherId);
+CK_RV CK_ENTRY CA_STCGetCipherID(CK_SLOT_ID slotId, CK_ULONG_PTR ulCipherId);
 
-CK_RV CK_ENTRY CA_STCGetDigestID(CK_SLOT_ID slotId,
-                                 CK_ULONG_PTR ulDigestId);
+CK_RV CK_ENTRY CA_STCGetDigestID(CK_SLOT_ID slotId, CK_ULONG_PTR ulDigestId);
 
-CK_RV CK_ENTRY CA_STCGetCipherIDs(CK_SLOT_ID slotID,
-                                  CK_ULONG_PTR pulArray,
-                                  CK_BYTE_PTR pbArraySize);
+CK_RV CK_ENTRY CA_STCGetCipherIDs(CK_SLOT_ID slotID, CK_ULONG_PTR pulArray, CK_BYTE_PTR pbArraySize);
 
 CK_RV CK_ENTRY CA_STCGetCipherNameByID(CK_SLOT_ID slotID,
                                        CK_ULONG ulCipherID,
                                        CK_CHAR_PTR pszName,
                                        CK_BYTE bNameBufSize);
 
-CK_RV CK_ENTRY CA_STCGetDigestIDs(CK_SLOT_ID slotID,
-                                  CK_ULONG_PTR pulArray,
-                                  CK_BYTE_PTR pbArraySize);
+CK_RV CK_ENTRY CA_STCGetDigestIDs(CK_SLOT_ID slotID, CK_ULONG_PTR pulArray, CK_BYTE_PTR pbArraySize);
 
 CK_RV CK_ENTRY CA_STCGetDigestNameByID(CK_SLOT_ID slotID,
                                        CK_ULONG ulDigestID,
                                        CK_CHAR_PTR pszName,
                                        CK_BYTE bNameBufSize);
 
-CK_RV CK_ENTRY CA_GetServerInstanceBySlotID(CK_SLOT_ID slotID,
-                                            CK_ULONG_PTR pulInstanceNumber);
+CK_RV CK_ENTRY CA_GetServerInstanceBySlotID(CK_SLOT_ID slotID, CK_ULONG_PTR pulInstanceNumber);
 
-CK_RV CK_ENTRY CA_GetSlotListFromServerInstance(CK_ULONG instanceNumber,
-                                                CK_SLOT_ID_PTR slotList,
-                                                CK_ULONG_PTR pulCount);
+CK_RV CK_ENTRY CA_GetSlotListFromServerInstance(CK_ULONG instanceNumber, CK_SLOT_ID_PTR slotList, CK_ULONG_PTR pulCount);
 
-CK_RV CK_ENTRY CA_ChangeLabel(CK_SESSION_HANDLE   hSession,
-                              CK_SLOT_ID          ulSlotID,
-                              CK_CHAR_PTR         pulLabel,
-                              CK_ULONG            ulLabelLen);
+CK_RV CK_ENTRY CA_ChangeLabel(CK_SESSION_HANDLE hSession,
+                              CK_SLOT_ID ulSlotID,
+                              CK_CHAR_PTR pulLabel,
+                              CK_ULONG ulLabelLen);
 
-CK_RV CK_ENTRY CA_PerformSelfTest(
-        CK_SLOT_ID slotID,
-        CK_ULONG typeOfTest,
-        CK_BYTE_PTR inputData,
-        CK_ULONG sizeOfInputData,
-        CK_BYTE_PTR outputData,
-        CK_ULONG_PTR sizeOfOutputData );
+CK_RV CK_ENTRY CA_PerformSelfTest(CK_SLOT_ID slotID,
+                                  CK_ULONG typeOfTest,
+                                  CK_BYTE_PTR inputData,
+                                  CK_ULONG sizeOfInputData,
+                                  CK_BYTE_PTR outputData,
+                                  CK_ULONG_PTR sizeOfOutputData);
 
 //
 // Support from FMs
 //
-CK_RV CK_ENTRY CA_FMDownload( CK_SESSION_HANDLE hTokenSession,
-                         CK_OBJECT_HANDLE hObject,
-                         CK_ULONG ulParamLen,
-                         CK_BYTE_PTR pParam,
-                         CK_ULONG ulImageLen,
-                         CK_BYTE_PTR pImage,
-                         CK_ULONG ulSignatureLen,
-                         CK_BYTE_PTR pSignature );
-
-CK_RV CK_ENTRY CA_FMDelete( CK_SESSION_HANDLE hTokenSession,
-                         CK_ULONG fmid);
-
-CK_RV CK_ENTRY CA_FMActivateSMFS( CK_SESSION_HANDLE hTokenSession );
-
-CK_RV CK_ENTRY CA_GetActualSlotList( CK_SLOT_ID slotId,
-                         CK_ULONG_PTR phsmidx,          // index of HSM
-                         CK_SLOT_ID_PTR pActualslotID,  // 'collected' slot ID
-                         CK_ULONG_PTR pulCount);
-
-CK_RV CK_ENTRY CA_DeriveKeyAndWrap(
-                                   CK_SESSION_HANDLE hSession,
-                                   CK_MECHANISM_PTR  pMechanismDerive,
-                                   CK_OBJECT_HANDLE  hBaseKey,
-                                   CK_ATTRIBUTE_PTR  pTemplate,
-                                   CK_ULONG          ulAttributeCount,
-                                   CK_MECHANISM_PTR  pMechanismWrap,
-                                   CK_OBJECT_HANDLE  hWrappingKey,
-                                   CK_BYTE_PTR       pWrappedKey,
-                                   CK_ULONG_PTR      pulWrappedKeyLen);
+CK_RV CK_ENTRY CA_FMDownload(CK_SESSION_HANDLE hTokenSession,
+                             CK_OBJECT_HANDLE hObject,
+                             CK_ULONG ulParamLen,
+                             CK_BYTE_PTR pParam,
+                             CK_ULONG ulImageLen,
+                             CK_BYTE_PTR pImage,
+                             CK_ULONG ulSignatureLen,
+                             CK_BYTE_PTR pSignature);
+
+CK_RV CK_ENTRY CA_FMDelete(CK_SESSION_HANDLE hTokenSession, CK_ULONG fmid);
+
+CK_RV CK_ENTRY CA_FMActivateSMFS(CK_SESSION_HANDLE hTokenSession);
+
+CK_RV CK_ENTRY CA_GetActualSlotList(CK_SLOT_ID slotId,
+                                    CK_ULONG_PTR phsmidx,         // index of HSM
+                                    CK_SLOT_ID_PTR pActualslotID, // 'collected' slot ID
+                                    CK_ULONG_PTR pulCount);
+
+CK_RV CK_ENTRY CA_DeriveKeyAndWrap(CK_SESSION_HANDLE hSession,
+                                   CK_MECHANISM_PTR pMechanismDerive,
+                                   CK_OBJECT_HANDLE hBaseKey,
+                                   CK_ATTRIBUTE_PTR pTemplate,
+                                   CK_ULONG ulAttributeCount,
+                                   CK_MECHANISM_PTR pMechanismWrap,
+                                   CK_OBJECT_HANDLE hWrappingKey,
+                                   CK_BYTE_PTR pWrappedKey,
+                                   CK_ULONG_PTR pulWrappedKeyLen);
 
 /* This function called by ethsm library to get access to the HSMs */
-CK_RV CK_ENTRY CA_MdPriv_Initialize(void *pMdPrivIf, unsigned int len, void *pLogIf);
+CK_RV CK_ENTRY CA_MdPriv_Initialize(void* pMdPrivIf, unsigned int len, void* pLogIf);
 
-CK_RV CK_ENTRY CA_Get( CK_SLOT_ID slotID,
-                       CK_ULONG ulItem,
-                       CK_BYTE_PTR pBuffer,
-                       CK_ULONG_PTR pulBufferLen );
+CK_RV CK_ENTRY CA_Get(CK_SLOT_ID slotID, CK_ULONG ulItem, CK_BYTE_PTR pBuffer, CK_ULONG_PTR pulBufferLen);
 
-CK_RV CK_ENTRY CA_Put( CK_SLOT_ID slotID,
-                       CK_SESSION_HANDLE hSession,
-                       CK_ULONG ulParamId,
-                       CK_ULONG ulParamSize,
-                       CK_BYTE_PTR pParamBuffer );
+CK_RV CK_ENTRY CA_Put(CK_SLOT_ID slotID,
+                      CK_SESSION_HANDLE hSession,
+                      CK_ULONG ulParamId,
+                      CK_ULONG ulParamSize,
+                      CK_BYTE_PTR pParamBuffer);
 
-CK_RV CK_ENTRY CA_GetDefaultPartitionPolicyValue(CK_SLOT_ID slotID,
-                                                 CK_ULONG ulPolicyId,
-                                                 CK_ULONG_PTR pulPolicyValue);
+CK_RV CK_ENTRY CA_GetDefaultPartitionPolicyValue(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
 
-CK_RV CK_ENTRY CA_GetDefaultHSMPolicyValue(CK_SLOT_ID slotID,
-                                           CK_ULONG ulPolicyId,
-                                           CK_ULONG_PTR pulPolicyValue);
+CK_RV CK_ENTRY CA_GetDefaultHSMPolicyValue(CK_SLOT_ID slotID, CK_ULONG ulPolicyId, CK_ULONG_PTR pulPolicyValue);
 
-CK_RV CK_ENTRY CA_ValidateHSMPolicySet(CK_SLOT_ID slotId, CK_POLICY_INFO_PTR policyInfo, CK_ULONG policyCount, CK_RV_PTR policyResults);
+CK_RV CK_ENTRY CA_ValidateHSMPolicySet(CK_SLOT_ID slotId,
+                                       CK_POLICY_INFO_PTR policyInfo,
+                                       CK_ULONG policyCount,
+                                       CK_RV_PTR policyResults);
 
-CK_RV CK_ENTRY CA_ValidateContainerPolicySet(CK_SLOT_ID slotId, CK_ULONG ulContainerNumber, CK_POLICY_INFO_PTR policyInfo, CK_ULONG policyCount, CK_RV_PTR policyResults);
+CK_RV CK_ENTRY CA_ValidateContainerPolicySet(CK_SLOT_ID slotId,
+                                             CK_ULONG ulContainerNumber,
+                                             CK_POLICY_INFO_PTR policyInfo,
+                                             CK_ULONG policyCount,
+                                             CK_RV_PTR policyResults);
 
 CK_RV CK_ENTRY CA_ZeroizeContainer(CK_SESSION_HANDLE hSession);
 
@@ -1447,22 +1265,22 @@ CK_RV CK_ENTRY CA_ReadUtilizationMetrics(CK_SESSION_HANDLE hSession);
 
 CK_RV CK_ENTRY CA_ReadAndResetUtilizationMetrics(CK_SESSION_HANDLE hSession);
 
-CK_RV CK_ENTRY CA_ReadAllUtilizationCounters( CK_SESSION_HANDLE           hSession,
-                                              CK_UTILIZATION_COUNTER_PTR  buff,
-                                              CK_ULONG_PTR                length);
+CK_RV CK_ENTRY CA_ReadAllUtilizationCounters(CK_SESSION_HANDLE hSession,
+                                             CK_UTILIZATION_COUNTER_PTR buff,
+                                             CK_ULONG_PTR length);
 
-CK_RV CK_ENTRY CA_ReadUtilizationCount(CK_SESSION_HANDLE        hSession,
-                                       CK_ULONGLONG             serialNum,
-                                       CK_ULONG                 ulBinId,
-                                       CK_ULONG                 ulCounterId,
+CK_RV CK_ENTRY CA_ReadUtilizationCount(CK_SESSION_HANDLE hSession,
+                                       CK_ULONGLONG serialNum,
+                                       CK_ULONG ulBinId,
+                                       CK_ULONG ulCounterId,
                                        CK_UTILIZATION_COUNT_PTR pCount);
 
 CK_RV CK_ENTRY CA_DescribeUtilizationBinId(CK_ULONG ulBinId, CK_CHAR_PTR CK_PTR describe);
 CK_RV CK_ENTRY CA_DescribeUtilizationCounterId(CK_ULONG ulCounterId, CK_CHAR_PTR CK_PTR describe);
 
-// This typedef is needed externally. Others are not. The script used to generate extension typedefs 
+// This typedef is needed externally. Others are not. The script used to generate extension typedefs
 // omits this typedef to prevent a redefinition error
-typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetFunctionList)(CK_SFNT_CA_FUNCTION_LIST_PTR_PTR ppSfntFunctionList);
+typedef CK_RV CK_ENTRY(CK_PTR CK_CA_GetFunctionList)(CK_SFNT_CA_FUNCTION_LIST_PTR_PTR ppSfntFunctionList);
 
 /***
  * The following items break the rules in some way, so are explicitly ignored
@@ -1470,11 +1288,11 @@ typedef CK_RV CK_ENTRY (CK_PTR CK_CA_GetFunctionList)(CK_SFNT_CA_FUNCTION_LIST_P
  */
 
 // These two don't start with CA_.
-CK_RV CK_ENTRY GetTotalOperations( CK_SLOT_ID slotId, int *operations);
-typedef CK_RV CK_ENTRY (CK_PTR CK_GetTotalOperations)( CK_SLOT_ID slotId, int *operations);
+CK_RV CK_ENTRY GetTotalOperations(CK_SLOT_ID slotId, int* operations);
+typedef CK_RV CK_ENTRY(CK_PTR CK_GetTotalOperations)(CK_SLOT_ID slotId, int* operations);
 
-CK_RV CK_ENTRY ResetTotalOperations( CK_SLOT_ID slotId);
-typedef CK_RV CK_ENTRY (CK_PTR CK_ResetTotalOperations)( CK_SLOT_ID slotId);
+CK_RV CK_ENTRY ResetTotalOperations(CK_SLOT_ID slotId);
+typedef CK_RV CK_ENTRY(CK_PTR CK_ResetTotalOperations)(CK_SLOT_ID slotId);
 
 CK_RV CK_ENTRY CA_TestTrace(CK_SLOT_ID slotID,
                             CK_ULONG ulTypeOfTrace,
@@ -1482,5 +1300,3 @@ CK_RV CK_ENTRY CA_TestTrace(CK_SLOT_ID slotID,
                             CK_ULONG ulInDataLength,
                             CK_BYTE_PTR pOutData,
                             CK_ULONG_PTR pulOutDataLength);
-
-
diff --git a/mft_utils/hsmclient/src/burnprivatekey.cpp b/mft_utils/hsmclient/src/burnprivatekey.cpp
index 899002ae..e7ef57fb 100644
--- a/mft_utils/hsmclient/src/burnprivatekey.cpp
+++ b/mft_utils/hsmclient/src/burnprivatekey.cpp
@@ -33,41 +33,39 @@
 #include "hsmlunaclient.h"
 #include <string>
 using namespace std;
-static unsigned char PublicExponent[] = { 0x01, 0x00, 0x01 };
+static unsigned char PublicExponent[] = {0x01, 0x00, 0x01};
 
-CK_RV HSMLunaClient::CreatePublicKey(string publicKeyLabel, unsigned char* PublicModulus, 
-    unsigned int PublicModulusSize)
+CK_RV HSMLunaClient::CreatePublicKey(string publicKeyLabel, unsigned char* PublicModulus, unsigned int PublicModulusSize)
 {
     CK_OBJECT_CLASS publicKey = CKO_PUBLIC_KEY;
     CK_KEY_TYPE rsaType = CKK_RSA;
     CK_BBOOL bTrue = 1;
     CK_BBOOL bSign = bTrue, bToken = bTrue, bPrivate = bTrue, bDecrypt = bTrue, bWrap = bTrue;
-    //CK_BBOOL bToken = bTrue, bDecrypt = bTrue, bSign = bTrue, bWrap = bTrue;
+    // CK_BBOOL bToken = bTrue, bDecrypt = bTrue, bSign = bTrue, bWrap = bTrue;
     CK_OBJECT_HANDLE hPublicRSAKey;
     CK_RV rv = CKR_TOKEN_NOT_PRESENT;
-    unsigned int publicLabelSize = publicKeyLabel.size()+1;
+    unsigned int publicLabelSize = publicKeyLabel.size() + 1;
     CK_BYTE* pLabelPub = new CK_BYTE[publicLabelSize];
     memset(pLabelPub, 0, publicLabelSize);
 
-    for (unsigned int i = 0; i < publicKeyLabel.size(); i++) {
+    for (unsigned int i = 0; i < publicKeyLabel.size(); i++)
+    {
         pLabelPub[i] = publicKeyLabel[i];
     }
-    CK_ATTRIBUTE pPublicRSAKeyTemplate[] =
-    {
-        {CKA_CLASS, &publicKey, sizeof(publicKey) },
-        {CKA_KEY_TYPE, &rsaType, sizeof(rsaType)},
-        {CKA_TOKEN, &bToken, sizeof(bToken)},
-        {CKA_PRIVATE, &bPrivate,   sizeof(bPrivate)},
-        {CKA_ENCRYPT, &bDecrypt,   sizeof(bDecrypt)},
-        {CKA_VERIFY, &bSign, sizeof(bSign)},
-        {CKA_WRAP, &bWrap, sizeof(bWrap)},
-        {CKA_MODULUS, PublicModulus, PublicModulusSize},
-        {CKA_PUBLIC_EXPONENT, PublicExponent, sizeof(PublicExponent)},
-        {CKA_LABEL, pLabelPub, publicLabelSize}
-    };
+    CK_ATTRIBUTE pPublicRSAKeyTemplate[] = {{CKA_CLASS, &publicKey, sizeof(publicKey)},
+                                            {CKA_KEY_TYPE, &rsaType, sizeof(rsaType)},
+                                            {CKA_TOKEN, &bToken, sizeof(bToken)},
+                                            {CKA_PRIVATE, &bPrivate, sizeof(bPrivate)},
+                                            {CKA_ENCRYPT, &bDecrypt, sizeof(bDecrypt)},
+                                            {CKA_VERIFY, &bSign, sizeof(bSign)},
+                                            {CKA_WRAP, &bWrap, sizeof(bWrap)},
+                                            {CKA_MODULUS, PublicModulus, PublicModulusSize},
+                                            {CKA_PUBLIC_EXPONENT, PublicExponent, sizeof(PublicExponent)},
+                                            {CKA_LABEL, pLabelPub, publicLabelSize}};
     unsigned int usTemplateSize = DIM(pPublicRSAKeyTemplate);
     rv = P11Functions->C_CreateObject(m_hSession, pPublicRSAKeyTemplate, usTemplateSize, &hPublicRSAKey);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         cout << "C_Create public Object FAILED...rv = " << hex << rv << endl;
         return -1;
     }
@@ -82,77 +80,81 @@ CK_RV HSMLunaClient::CheckExistingLabel(string label, CK_ULONG& numOfLabels)
     unsigned int LabelSize = label.size() + 1;
     CK_BYTE* pLabel = new CK_BYTE[LabelSize];
     memset(pLabel, 0, LabelSize);
-    for (unsigned int i = 0; i < label.size(); i++) {
+    for (unsigned int i = 0; i < label.size(); i++)
+    {
         pLabel[i] = label[i];
     }
-    CK_ATTRIBUTE Template[] =
-    {
-        {CKA_LABEL, pLabel, LabelSize}
-    };
+    CK_ATTRIBUTE Template[] = {{CKA_LABEL, pLabel, LabelSize}};
 
     CK_ULONG numHandles = 0;
-    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = { 0 };
+    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = {0};
     rv = P11Functions->C_FindObjectsInit(m_hSession, Template, 1);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         delete[] pLabel;
         return rv;
     }
     rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         delete[] pLabel;
         return rv;
     }
     numOfLabels = numHandles;
-    if (numHandles != 0) {
+    if (numHandles != 0)
+    {
         delete[] pLabel;
         return CKR_GENERAL_ERROR;
     }
-    if (numHandles == 0) {
+    if (numHandles == 0)
+    {
         Template[0].ulValueLen--;
         rv = P11Functions->C_FindObjectsInit(m_hSession, Template, 1);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             delete[] pLabel;
             return rv;
         }
         rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             delete[] pLabel;
             return rv;
         }
     }
     numOfLabels = numHandles;
     delete[] pLabel;
-    if (numHandles != 0) {
+    if (numHandles != 0)
+    {
         return CKR_GENERAL_ERROR;
     }
     return CKR_OK;
 }
 
-CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabel
-    , vector<unsigned char> PrivateKeyData)
+CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabel, vector<unsigned char> PrivateKeyData)
 {
     protectedInfo_T protectedInfo;
     CK_RV rv = CKR_TOKEN_NOT_PRESENT;
     CK_OBJECT_HANDLE hPrivateRSAKey;
     char* pbWrappedKey;
-    unsigned long    ulWrappedKeySize;
+    unsigned long ulWrappedKeySize;
     CK_OBJECT_CLASS privateKey = CKO_PRIVATE_KEY;
-    
+
     CK_USHORT usOutDataLen = 0;
-    char *pPlainData = 0;
+    char* pPlainData = 0;
     unsigned long ulPlainDataLength;
-    char *pEncryptedData = 0;
+    char* pEncryptedData = 0;
     unsigned long ulEncryptedDataLength = 0;
 
     CK_MECHANISM mech;
-    
-    
-    //CK_BYTE pLabel[] = "Super New RSA private Key222";
+
+    // CK_BYTE pLabel[] = "Super New RSA private Key222";
     CK_KEY_TYPE rsaType = CKK_RSA;
     CK_ULONG usTemplateSize;
 
     rv = P11Functions->C_GetInfo(&protectedInfo.info);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         cout << "C_GetInfo FAILED..." << endl;
         return -1;
     }
@@ -163,55 +165,55 @@ CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabe
     CK_BBOOL bEncrypt = bTrue;
     CK_BBOOL bSign = bTrue;
     CK_BBOOL bWrap = bTrue;
-    
+
     CK_BBOOL bSensitive = bTrue;
-    unsigned int privateLabelSize = privateKeyLabel.size()+1;
+    unsigned int privateLabelSize = privateKeyLabel.size() + 1;
     CK_BYTE* pLabel = new CK_BYTE[privateLabelSize];
     memset(pLabel, 0, privateLabelSize);
 
-    unsigned int publicLabelSize = publicKeyLabel.size()+1;
+    unsigned int publicLabelSize = publicKeyLabel.size() + 1;
     CK_BYTE* pLabelPub = new CK_BYTE[publicLabelSize];
     memset(pLabelPub, 0, publicLabelSize);
 
-    for (unsigned int i = 0; i < privateKeyLabel.size(); i++) {
+    for (unsigned int i = 0; i < privateKeyLabel.size(); i++)
+    {
         pLabel[i] = privateKeyLabel[i];
     }
-    for (unsigned int i = 0; i < publicKeyLabel.size(); i++) {
+    for (unsigned int i = 0; i < publicKeyLabel.size(); i++)
+    {
         pLabelPub[i] = publicKeyLabel[i];
     }
 
-    
-
-    CK_ATTRIBUTE pPrivateKeyTemplate[] =
-    {
-        {CKA_CLASS, &privateKey, sizeof(privateKey) },
-        {CKA_KEY_TYPE, &rsaType,    sizeof(rsaType)},
-        {CKA_TOKEN, &bToken, sizeof(bToken)},
-        {CKA_SENSITIVE, &bSensitive, sizeof(bSensitive) },
-        {CKA_PRIVATE, &bPrivate, sizeof(bPrivate)},
-        {CKA_DECRYPT, &bEncrypt, sizeof(bEncrypt)},
-        {CKA_SIGN, &bSign, sizeof(bSign)},
-        {CKA_SIGN_RECOVER, &bTrue, sizeof(bTrue)},//here may be remark!
-        {CKA_UNWRAP, &bWrap, sizeof(bWrap)},
-        {CKA_EXTRACTABLE, &bFalse, sizeof(bFalse)},
-        {CKA_LABEL, pLabel, privateLabelSize}
-    };
+    CK_ATTRIBUTE pPrivateKeyTemplate[] = {{CKA_CLASS, &privateKey, sizeof(privateKey)},
+                                          {CKA_KEY_TYPE, &rsaType, sizeof(rsaType)},
+                                          {CKA_TOKEN, &bToken, sizeof(bToken)},
+                                          {CKA_SENSITIVE, &bSensitive, sizeof(bSensitive)},
+                                          {CKA_PRIVATE, &bPrivate, sizeof(bPrivate)},
+                                          {CKA_DECRYPT, &bEncrypt, sizeof(bEncrypt)},
+                                          {CKA_SIGN, &bSign, sizeof(bSign)},
+                                          {CKA_SIGN_RECOVER, &bTrue, sizeof(bTrue)}, // here may be remark!
+                                          {CKA_UNWRAP, &bWrap, sizeof(bWrap)},
+                                          {CKA_EXTRACTABLE, &bFalse, sizeof(bFalse)},
+                                          {CKA_LABEL, pLabel, privateLabelSize}};
 
     rv = Generate3DESKey();
-    if (rv != CKR_OK) {
-        cout << "\n" "Error 0x" << hex << rv;
+    if (rv != CKR_OK)
+    {
+        cout << "\n"
+                "Error 0x"
+             << hex << rv;
         cout << " generating the DES3 Key.\n";
         return -11;
     }
 
-    //Encrypt the RSA Key
-    unsigned char iv[8] = { '1', '2', '3', '4', '5', '6', '7', '8' };
+    // Encrypt the RSA Key
+    unsigned char iv[8] = {'1', '2', '3', '4', '5', '6', '7', '8'};
     mech.mechanism = CKM_DES3_CBC;
     mech.pParameter = iv;
     mech.usParameterLen = sizeof(iv);
-    unsigned char* _PrivateKeyData  = &PrivateKeyData[0];
+    unsigned char* _PrivateKeyData = &PrivateKeyData[0];
     PrivateKeyDataSize = PrivateKeyData.size();
-    pPlainData = (char *)(_PrivateKeyData);
+    pPlainData = (char*)(_PrivateKeyData);
     ulPlainDataLength = PrivateKeyDataSize;
     pEncryptedData = new char[ulPlainDataLength + 2048];
     rv = P11Functions->C_EncryptInit(m_hSession, &mech, hSymKey);
@@ -220,22 +222,29 @@ CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabe
     CK_ULONG ulBytesRemaining = ulPlainDataLength;
     char* pPlainTextPointer = pPlainData;
     char* pEncryptedDataPointer = pEncryptedData;
-    while (ulBytesRemaining > 0) {
-        if (ulBytesRemaining > 0xfff0) {
+    while (ulBytesRemaining > 0)
+    {
+        if (ulBytesRemaining > 0xfff0)
+        {
             usInDataLen = 0xfff0;
             ulBytesRemaining -= usInDataLen;
         }
-        else {
+        else
+        {
             usInDataLen = (CK_USHORT)ulBytesRemaining;
             ulBytesRemaining -= usInDataLen;
         }
         rv = P11Functions->C_EncryptUpdate(m_hSession, (CK_BYTE_PTR)pPlainTextPointer, usInDataLen,
-            (CK_BYTE_PTR)pEncryptedDataPointer, &usOutDataLen);
-        if (rv == CKR_OK) {
+                                           (CK_BYTE_PTR)pEncryptedDataPointer, &usOutDataLen);
+        if (rv == CKR_OK)
+        {
             cout << "Encrypting key..." << endl;
         }
-        else {
-            cout << "\n" "Error 0x" << hex << rv;
+        else
+        {
+            cout << "\n"
+                    "Error 0x"
+                 << hex << rv;
             cout << " while encrypting the RSA key.\n";
             return -1;
         }
@@ -248,62 +257,63 @@ CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabe
     CK_BYTE_PTR pOutData = (CK_BYTE_PTR)pEncryptedData;
     pOutData += ulEncryptedDataLength;
     rv = P11Functions->C_EncryptFinal(m_hSession, pOutData, &usOutDataLen);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         cout << "C_EncryptFinal FAILED..." << endl;
         return -1;
     }
     ulEncryptedDataLength += usOutDataLen;
 
     mech.mechanism = CKM_DES3_CBC;
-    mech.pParameter = (void*) "12345678"; // 8 byte IV
+    mech.pParameter = (void*)"12345678"; // 8 byte IV
     mech.usParameterLen = 8;
-    
+
     usTemplateSize = DIM(pPrivateKeyTemplate);
     pbWrappedKey = pEncryptedData;
     ulWrappedKeySize = ulEncryptedDataLength;
-    rv = P11Functions->C_UnwrapKey(m_hSession, &mech, hSymKey, (CK_BYTE_PTR)pbWrappedKey,
-        (CK_USHORT)ulWrappedKeySize, pPrivateKeyTemplate, usTemplateSize, &hPrivateRSAKey);
-    if (rv != CKR_OK) {
+    rv = P11Functions->C_UnwrapKey(m_hSession, &mech, hSymKey, (CK_BYTE_PTR)pbWrappedKey, (CK_USHORT)ulWrappedKeySize,
+                                   pPrivateKeyTemplate, usTemplateSize, &hPrivateRSAKey);
+    if (rv != CKR_OK)
+    {
         cout << "C_UnwrapKey FAILED...rv = " << hex << rv << endl;
         return -1;
     }
-    else {
+    else
+    {
         cout << "Unwrapped Private key is " << hex << hPrivateRSAKey << endl;
     }
-    if (pEncryptedData) {
+    if (pEncryptedData)
+    {
         delete[] pEncryptedData;
     }
-    /*rv = P11Functions->C_CreateObject(m_hSession, pPrivateKeyTemplate, 
+    /*rv = P11Functions->C_CreateObject(m_hSession, pPrivateKeyTemplate,
         usTemplateSize, &hPrivateRSAKey);
     if (rv != CKR_OK) {
         cout << "C_Create private Object FAILED...rv = " << hex << rv << endl;
         return -1;
     }*/
-    CK_ATTRIBUTE RSAFindPriTemplate[] =
-    {
-        {CKA_LABEL, pLabel, privateLabelSize}
-    };
+    CK_ATTRIBUTE RSAFindPriTemplate[] = {{CKA_LABEL, pLabel, privateLabelSize}};
 
     CK_ULONG numHandles = 0;
-    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = { 0 };
-    CK_OBJECT_HANDLE handles1[MAX_NUM_OF_HANDLES] = { 0 };
+    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = {0};
+    CK_OBJECT_HANDLE handles1[MAX_NUM_OF_HANDLES] = {0};
     rv = P11Functions->C_FindObjectsInit(m_hSession, RSAFindPriTemplate, 1);
     rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-    if (numHandles == 0) {
+    if (numHandles == 0)
+    {
         cout << "Private key was not created " << endl;
         return CKR_CANCEL;
     }
-    for (unsigned int i = 0; i < numHandles; i++) {
+    for (unsigned int i = 0; i < numHandles; i++)
+    {
         cout << "Private key is " << handles[i] << endl;
     }
     numHandles = 0;
-    CK_ATTRIBUTE RSAFindPubTemplate[] =
-    {
-        {CKA_LABEL, (CK_VOID_PTR)pLabelPub, publicLabelSize}
-    };
+    CK_ATTRIBUTE RSAFindPubTemplate[] = {{CKA_LABEL, (CK_VOID_PTR)pLabelPub, publicLabelSize}};
     rv = P11Functions->C_FindObjectsInit(m_hSession, RSAFindPubTemplate, 1);
     rv = P11Functions->C_FindObjects(m_hSession, handles1, MAX_NUM_OF_HANDLES, &numHandles);
-    for (unsigned int i = 0; i < numHandles; i++) {
+    for (unsigned int i = 0; i < numHandles; i++)
+    {
         cout << "Public key is " << handles1[i] << endl;
     }
     return rv;
diff --git a/mft_utils/hsmclient/src/hex64.cpp b/mft_utils/hsmclient/src/hex64.cpp
index 1f0f7b18..0606ba36 100644
--- a/mft_utils/hsmclient/src/hex64.cpp
+++ b/mft_utils/hsmclient/src/hex64.cpp
@@ -30,58 +30,71 @@
  * SOFTWARE.
  */
 
-
-
 #include "hex64.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 using namespace std;
-static const char* base64_chars[2] = {
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-             "abcdefghijklmnopqrstuvwxyz"
-             "0123456789"
-             "+/",
+static const char* base64_chars[2] = {"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                      "abcdefghijklmnopqrstuvwxyz"
+                                      "0123456789"
+                                      "+/",
 
-             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-             "abcdefghijklmnopqrstuvwxyz"
-             "0123456789"
-             "-_" };
+                                      "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                      "abcdefghijklmnopqrstuvwxyz"
+                                      "0123456789"
+                                      "-_"};
 
 #ifndef UEFI_BUILD
-#define DPRINTF(args)        do { char *reacDebug = getenv("HEX64_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("[HEX64_DEBUG]: -D- "); printf args; fflush(stdout);} } while (0)
+#define DPRINTF(args)                            \
+    do                                           \
+    {                                            \
+        char* reacDebug = getenv("HEX64_DEBUG"); \
+        if (reacDebug != NULL)                   \
+        {                                        \
+            printf("\33[2K\r");                  \
+            printf("[HEX64_DEBUG]: -D- ");       \
+            printf args;                         \
+            fflush(stdout);                      \
+        }                                        \
+    } while (0)
 #else
 #define DPRINTF(...)
 #endif
 
-
-
-size_t Hex64Manipulations::pos_of_char(const unsigned char chr) {
+size_t Hex64Manipulations::pos_of_char(const unsigned char chr)
+{
     //
     // Return the position of chr within base64_encode()
     //
 
-    if (chr >= 'A' && chr <= 'Z') return chr - 'A';
-    else if (chr >= 'a' && chr <= 'z') return chr - 'a' + ('Z' - 'A') + 1;
-    else if (chr >= '0' && chr <= '9') return chr - '0' + ('Z' - 'A') + ('z' - 'a') + 2;
-    else if (chr == '+' || chr == '-') return 62; // Be liberal with input and accept both url ('-') and non-url ('+') base 64 characters (
-    else if (chr == '/' || chr == '_') return 63; // Ditto for '/' and '_'
+    if (chr >= 'A' && chr <= 'Z')
+        return chr - 'A';
+    else if (chr >= 'a' && chr <= 'z')
+        return chr - 'a' + ('Z' - 'A') + 1;
+    else if (chr >= '0' && chr <= '9')
+        return chr - '0' + ('Z' - 'A') + ('z' - 'a') + 2;
+    else if (chr == '+' || chr == '-')
+        return 62; // Be liberal with input and accept both url ('-') and non-url ('+') base 64 characters (
+    else if (chr == '/' || chr == '_')
+        return 63; // Ditto for '/' and '_'
 
     return 0xffff;
 }
 
-string Hex64Manipulations::base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len) {
+string Hex64Manipulations::base64_encode(unsigned char const* bytes_to_encode, unsigned int in_len)
+{
     string ret;
     int i = 0;
     int j = 0;
     unsigned char char_array_3[3];
     unsigned char char_array_4[4];
 
-    while (in_len--) {
+    while (in_len--)
+    {
         char_array_3[i++] = *(bytes_to_encode++);
-        if (i == 3) {
+        if (i == 3)
+        {
             char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
             char_array_4[1] = ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
             char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
@@ -108,7 +121,6 @@ string Hex64Manipulations::base64_encode(unsigned char const* bytes_to_encode, u
 
         while ((i++ < 3))
             ret += '=';
-
     }
     return ret;
 }
@@ -118,11 +130,13 @@ bool Hex64Manipulations::PrintHexData(const string& data)
     unsigned int input_length = data.size();
     int j = 1;
 
-    for (size_t i = 0; i < input_length; i++) {
+    for (size_t i = 0; i < input_length; i++)
+    {
         unsigned char scanResult = 0;
         scanResult = (unsigned char)data[i];
         DPRINTF(("0x%02x, ", scanResult));
-        if ((j % 16) == 0) {
+        if ((j % 16) == 0)
+        {
             DPRINTF(("\n"));
         }
         j++;
@@ -132,12 +146,14 @@ bool Hex64Manipulations::PrintHexData(const string& data)
 
 bool writeToFile(const std::vector<unsigned char>& buff, string filePath)
 {
-    FILE *fh = fopen(filePath.c_str(), "wb");
-    if (fh == NULL) {
+    FILE* fh = fopen(filePath.c_str(), "wb");
+    if (fh == NULL)
+    {
         return false;
     }
     // Write
-    if (fwrite(&buff[0], 1, buff.size(), fh) != buff.size()) {
+    if (fwrite(&buff[0], 1, buff.size(), fh) != buff.size())
+    {
         fclose(fh);
         return false;
     }
@@ -152,47 +168,57 @@ bool Hex64Manipulations::ParsePemFile(string inputFile, vector<unsigned char>& o
     vector<unsigned char> finalBuffer;
     bool IsPem8Format = false;
     IsPemFile8Format = false;
-    if (ReadInputPemFile(inputFile.c_str(), inputBuffer, inputSize, IsPem8Format) == false) {
+    if (ReadInputPemFile(inputFile.c_str(), inputBuffer, inputSize, IsPem8Format) == false)
+    {
         return false;
     }
     string inputStr(inputBuffer.begin(), inputBuffer.end());
     string copy(inputStr);
     size_t pos = 0;
-    while ((pos = copy.find("\n", pos)) != string::npos) {
+    while ((pos = copy.find("\n", pos)) != string::npos)
+    {
         copy.erase(pos, 1);
     }
     string decoded_array = base64_decode(copy);
-    if (decoded_array.empty()) {
+    if (decoded_array.empty())
+    {
         return false;
     }
     finalBuffer.resize(decoded_array.size());
-    for (unsigned int i = 0; i < decoded_array.size(); i++) {
+    for (unsigned int i = 0; i < decoded_array.size(); i++)
+    {
         finalBuffer[i] = decoded_array[i];
     }
-    if (IsPem8Format) {
+    if (IsPem8Format)
+    {
         IsPemFile8Format = true;
-        if (finalBuffer.size() < 2376) {
+        if (finalBuffer.size() < 2376)
+        {
             // details here  http://lapo.it/asn1js/
             unsigned int NumPlacesToFix = 2376 - finalBuffer.size();
-            //actually the decoded file is absolutely legal from TLV point of view, but we must pad it to required size
-            //important that we will not "fix" more then required!
-            //it's actually zero's padding, but simple padding at the end of file doesn't work
+            // actually the decoded file is absolutely legal from TLV point of view, but we must pad it to required size
+            // important that we will not "fix" more then required!
+            // it's actually zero's padding, but simple padding at the end of file doesn't work
             DPRINTF(("-D- PEM buffer size is %u places to fix %u\n", (unsigned int)finalBuffer.size(), NumPlacesToFix));
             vector<unsigned char> outputFixedBuffer(2376, 0);
             unsigned int corruptedIndex = 0;
             unsigned int fixedIndex = 0;
-            while (fixedIndex != 2376) {
+            while (fixedIndex != 2376)
+            {
                 outputFixedBuffer[fixedIndex] = finalBuffer[corruptedIndex];
-                if (NumPlacesToFix > 0) {
-                    if (corruptedIndex >= 3) {
+                if (NumPlacesToFix > 0)
+                {
+                    if (corruptedIndex >= 3)
+                    {
                         if (finalBuffer[corruptedIndex - 3] == 0x02 && finalBuffer[corruptedIndex - 2] == 0x82 &&
                             (finalBuffer[corruptedIndex - 1] == 0x02 || finalBuffer[corruptedIndex - 1] == 0x01) &&
-                            finalBuffer[corruptedIndex] == 0) {//"CORRUPTED" TLV
-                            outputFixedBuffer[3] = outputFixedBuffer[3] + 1;//change the main TLV size
-                            outputFixedBuffer[25] = outputFixedBuffer[25] + 1;//change the secondary TLV size
-                            outputFixedBuffer[29] = outputFixedBuffer[29] + 1;//the same
-                            outputFixedBuffer[fixedIndex] = 1;//increase current TLV by 1
-                            fixedIndex++;//don't need to put 0, it's there already
+                            finalBuffer[corruptedIndex] == 0)
+                        {                                                      //"CORRUPTED" TLV
+                            outputFixedBuffer[3] = outputFixedBuffer[3] + 1;   // change the main TLV size
+                            outputFixedBuffer[25] = outputFixedBuffer[25] + 1; // change the secondary TLV size
+                            outputFixedBuffer[29] = outputFixedBuffer[29] + 1; // the same
+                            outputFixedBuffer[fixedIndex] = 1;                 // increase current TLV by 1
+                            fixedIndex++; // don't need to put 0, it's there already
                             DPRINTF(("-D- PEM buffer fixed at index %u to index %u\n", corruptedIndex, fixedIndex));
                             NumPlacesToFix--;
                         }
@@ -203,19 +229,23 @@ bool Hex64Manipulations::ParsePemFile(string inputFile, vector<unsigned char>& o
             }
             finalBuffer = outputFixedBuffer;
         }
-        else {
+        else
+        {
             DPRINTF(("-D- size of decoded buffer is illegal %u\n", (unsigned int)finalBuffer.size()));
             return false;
         }
         outputBuffer.resize(finalBuffer.size());
-        for (unsigned int i = 0; i < finalBuffer.size(); i++) {
+        for (unsigned int i = 0; i < finalBuffer.size(); i++)
+        {
             outputBuffer[i] = finalBuffer[i];
         }
         return true;
     }
-    else {//NOT IsPem8Format, just copy the result to output buffer
+    else
+    { // NOT IsPem8Format, just copy the result to output buffer
         outputBuffer.resize(finalBuffer.size());
-        for (unsigned int i = 0; i < finalBuffer.size(); i++) {
+        for (unsigned int i = 0; i < finalBuffer.size(); i++)
+        {
             outputBuffer[i] = finalBuffer[i];
         }
         DPRINTF(("-D- PEM outputBuffer buffer size is %u\n", (unsigned int)outputBuffer.size()));
@@ -226,7 +256,8 @@ bool Hex64Manipulations::ParsePemFile(string inputFile, vector<unsigned char>& o
 string Hex64Manipulations::base64_decode(string encoded_string)
 {
     int length_of_string = encoded_string.length();
-    if (!length_of_string) {
+    if (!length_of_string)
+    {
         return string("");
     }
 
@@ -236,16 +267,20 @@ string Hex64Manipulations::base64_decode(string encoded_string)
     string ret;
     ret.reserve(approx_length_of_decoded_string);
 
-    while (pos < in_len) {
+    while (pos < in_len)
+    {
         unsigned int pos_of_char_1 = pos_of_char(encoded_string[pos + 1]);
-        if (pos_of_char_1 == 0xffff) {
+        if (pos_of_char_1 == 0xffff)
+        {
             return string();
         }
         ret.push_back(((pos_of_char(encoded_string[pos + 0])) << 2) + ((pos_of_char_1 & 0x30) >> 4));
-        if (encoded_string[pos + 2] != '=' && encoded_string[pos + 2] != '.') { // accept URL-safe base 64 strings, too, so check for '.' also.
+        if (encoded_string[pos + 2] != '=' && encoded_string[pos + 2] != '.')
+        { // accept URL-safe base 64 strings, too, so check for '.' also.
             unsigned int pos_of_char_2 = pos_of_char(encoded_string[pos + 2]);
             ret.push_back(((pos_of_char_1 & 0x0f) << 4) + ((pos_of_char_2 & 0x3c) >> 2));
-            if (encoded_string[pos + 3] != '=' && encoded_string[pos + 3] != '.') {
+            if (encoded_string[pos + 3] != '=' && encoded_string[pos + 3] != '.')
+            {
                 ret.push_back(((pos_of_char_2 & 0x03) << 6) + pos_of_char(encoded_string[pos + 3]));
             }
         }
@@ -254,18 +289,22 @@ string Hex64Manipulations::base64_decode(string encoded_string)
     return ret;
 }
 
-
-bool Hex64Manipulations::ReadInputPemFile(const char* fileName, vector<unsigned char> &outputBuffer, unsigned int& inputSize, bool& IsPem8Format)
+bool Hex64Manipulations::ReadInputPemFile(const char* fileName,
+                                          vector<unsigned char>& outputBuffer,
+                                          unsigned int& inputSize,
+                                          bool& IsPem8Format)
 {
     bool IsPem1File = false;
     bool IsPem8File = false;
     IsPem8Format = false;
     vector<unsigned char> tempBuffer;
-    FILE *fd = fopen(fileName, "rb");
-    if (fd == NULL) {
+    FILE* fd = fopen(fileName, "rb");
+    if (fd == NULL)
+    {
         return false;
     }
-    if (fseek(fd, 0, SEEK_END) < 0) {
+    if (fseek(fd, 0, SEEK_END) < 0)
+    {
         fclose(fd);
         return false;
     }
@@ -273,46 +312,52 @@ bool Hex64Manipulations::ReadInputPemFile(const char* fileName, vector<unsigned
     rewind(fd);
     tempBuffer.resize(fileSize);
     // Read
-    if (fread(&tempBuffer[0], 1, fileSize, fd) != fileSize) {
+    if (fread(&tempBuffer[0], 1, fileSize, fd) != fileSize)
+    {
         fclose(fd);
         return false;
     }
-    if (memcmp(&tempBuffer[0], PEM_1_PREFIX, PEM_1_PREFIX_LENGTH) == 0) {
+    if (memcmp(&tempBuffer[0], PEM_1_PREFIX, PEM_1_PREFIX_LENGTH) == 0)
+    {
         IsPem1File = true;
     }
-    else if (memcmp(&tempBuffer[0], PEM_8_PREFIX, PEM_8_PREFIX_LENGTH) == 0) {
+    else if (memcmp(&tempBuffer[0], PEM_8_PREFIX, PEM_8_PREFIX_LENGTH) == 0)
+    {
         IsPem8File = true;
     }
-    else {
+    else
+    {
         fclose(fd);
         return false;
     }
 
     /* If PEM8, Skip first 28 bytes */
-    if (IsPem8File) {
+    if (IsPem8File)
+    {
         fseek(fd, PEM_8_PREFIX_LENGTH + 1, SEEK_SET);
-        inputSize = fileSize - 55;//suffix is 27 bytes
+        inputSize = fileSize - 55; // suffix is 27 bytes
         outputBuffer.resize(inputSize);
         // Read
-        if (fread(&outputBuffer[0], 1, inputSize, fd) != inputSize) {
+        if (fread(&outputBuffer[0], 1, inputSize, fd) != inputSize)
+        {
             fclose(fd);
             return false;
         }
         IsPem8Format = true;
     }
-    else if (IsPem1File) {
+    else if (IsPem1File)
+    {
         /* If PEM1, Skip first 32 bytes */
         fseek(fd, PEM_1_PREFIX_LENGTH + 1, SEEK_SET);
-        inputSize = fileSize - 63;//suffix is 31 bytes
+        inputSize = fileSize - 63; // suffix is 31 bytes
         outputBuffer.resize(inputSize);
         // Read
-        if (fread(&outputBuffer[0], 1, inputSize, fd) != inputSize) {
+        if (fread(&outputBuffer[0], 1, inputSize, fd) != inputSize)
+        {
             fclose(fd);
             return false;
         }
-
     }
     fclose(fd);
     return true;
 }
-
diff --git a/mft_utils/hsmclient/src/hsmaesencryption.cpp b/mft_utils/hsmclient/src/hsmaesencryption.cpp
index dc4228af..b879e739 100644
--- a/mft_utils/hsmclient/src/hsmaesencryption.cpp
+++ b/mft_utils/hsmclient/src/hsmaesencryption.cpp
@@ -33,10 +33,10 @@
 #ifndef __WIN__
 
 #include "hsmlunaclient.h"
-CK_BYTE*                        P_DecText = NULL;
-CK_BYTE*                        P_EncText = NULL;
-CK_ULONG                        EncSz = 0;
-CK_ULONG                        PlainSz = 0;
+CK_BYTE* P_DecText = NULL;
+CK_BYTE* P_EncText = NULL;
+CK_ULONG EncSz = 0;
+CK_ULONG PlainSz = 0;
 
 /*
     FUNCTION:        CK_RV Generate3DESKey( CK_SESSION_HANDLE hSession )
@@ -49,22 +49,19 @@ CK_RV HSMLunaClient::Generate3DESKey()
     CK_KEY_TYPE keyType = CKK_DES3;
     CK_CHAR pDESKeyLabel[] = "DES3 Encryption Key";
     CK_BBOOL yes = CK_TRUE;
-    //CK_BBOOL no = CK_FALSE;
+    // CK_BBOOL no = CK_FALSE;
     CK_ULONG templateSz;
 
-    CK_ATTRIBUTE   pDESKeyAttributes[] =
-    {
-        {CKA_CLASS,             &obClass,          sizeof(CK_OBJECT_CLASS)        },
-        {CKA_KEY_TYPE,          &keyType,          sizeof(CK_KEY_TYPE)            },
-        {CKA_LABEL,             pDESKeyLabel,      sizeof(pDESKeyLabel) - 1       },
-        {CKA_PRIVATE,           &yes,              sizeof(CK_BBOOL)               },
-        {CKA_SENSITIVE,         &yes,              sizeof(CK_BBOOL)               },
-        {CKA_ENCRYPT,           &yes,              sizeof(CK_BBOOL)               },
-        {CKA_DECRYPT,           &yes,              sizeof(CK_BBOOL)               },
-        {CKA_WRAP,              &yes,              sizeof(CK_BBOOL)               },
-        {CKA_UNWRAP,            &yes,              sizeof(CK_BBOOL)               },
-        {CKA_EXTRACTABLE,       &yes,              sizeof(CK_BBOOL)               }
-    };
+    CK_ATTRIBUTE pDESKeyAttributes[] = {{CKA_CLASS, &obClass, sizeof(CK_OBJECT_CLASS)},
+                                        {CKA_KEY_TYPE, &keyType, sizeof(CK_KEY_TYPE)},
+                                        {CKA_LABEL, pDESKeyLabel, sizeof(pDESKeyLabel) - 1},
+                                        {CKA_PRIVATE, &yes, sizeof(CK_BBOOL)},
+                                        {CKA_SENSITIVE, &yes, sizeof(CK_BBOOL)},
+                                        {CKA_ENCRYPT, &yes, sizeof(CK_BBOOL)},
+                                        {CKA_DECRYPT, &yes, sizeof(CK_BBOOL)},
+                                        {CKA_WRAP, &yes, sizeof(CK_BBOOL)},
+                                        {CKA_UNWRAP, &yes, sizeof(CK_BBOOL)},
+                                        {CKA_EXTRACTABLE, &yes, sizeof(CK_BBOOL)}};
 
     // Build mechanism
     mech.mechanism = CKM_DES3_KEY_GEN;
@@ -72,40 +69,39 @@ CK_RV HSMLunaClient::Generate3DESKey()
     mech.ulParameterLen = 0;
 
     templateSz = sizeof(pDESKeyAttributes) / sizeof(*pDESKeyAttributes);
-    retCode = P11Functions->C_GenerateKey(m_hSession,
-        &mech,
-        pDESKeyAttributes,
-        templateSz,
-        &hSymKey);
+    retCode = P11Functions->C_GenerateKey(m_hSession, &mech, pDESKeyAttributes, templateSz, &hSymKey);
 
     return retCode;
 }
 
-
 CK_RV HSMLunaClient::AES_EncryptData()
 {
     CK_MECHANISM mech;
     CK_RV rv = CKR_OK;
 
     mech.mechanism = CKM_DES3_CBC;
-    mech.pParameter = (void*) "12345678"; // 8 byte IV
+    mech.pParameter = (void*)"12345678"; // 8 byte IV
     mech.ulParameterLen = 8;
     rv = P11Functions->C_EncryptInit(m_hSession, &mech, hSymKey);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
     rv = P11Functions->C_Encrypt(m_hSession, PlainText, sizeof(PlainText), NULL, &EncSz);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
     P_EncText = (CK_BYTE*)new CK_BYTE[EncSz];
-    if (P_EncText == NULL) {
+    if (P_EncText == NULL)
+    {
         return CKR_GENERAL_ERROR;
     }
 
     rv = P11Functions->C_Encrypt(m_hSession, PlainText, sizeof(PlainText), P_EncText, &EncSz);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
@@ -118,26 +114,30 @@ CK_RV HSMLunaClient::AES_DecryptData()
     CK_RV rv = CKR_OK;
 
     mech.mechanism = CKM_DES3_CBC;
-    mech.pParameter = (void*) "12345678"; // 8 byte IV
+    mech.pParameter = (void*)"12345678"; // 8 byte IV
     mech.ulParameterLen = 8;
 
     rv = P11Functions->C_DecryptInit(m_hSession, &mech, hSymKey);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
     rv = P11Functions->C_Decrypt(m_hSession, P_EncText, EncSz, NULL, &PlainSz);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
     P_DecText = (CK_BYTE*)new CK_BYTE[PlainSz];
-    if (P_DecText == NULL) {
+    if (P_DecText == NULL)
+    {
         return rv;
     }
 
     rv = P11Functions->C_Decrypt(m_hSession, P_EncText, EncSz, P_DecText, &PlainSz);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
@@ -147,32 +147,39 @@ CK_RV HSMLunaClient::AES_DecryptData()
 CK_RV HSMLunaClient::TestAESEncryption()
 {
     CK_RV rv = Generate3DESKey();
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
     rv = AES_EncryptData();
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
     rv = AES_DecryptData();
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return rv;
     }
 
-    if (P_DecText && (memcmp(PlainText, P_DecText, sizeof(PlainText)) == 0)) {
+    if (P_DecText && (memcmp(PlainText, P_DecText, sizeof(PlainText)) == 0))
+    {
         printf("AES encryption is OKAY!\n");
         rv = 0;
     }
-    else {
+    else
+    {
         printf("TestAESEncryption NOT OKAY! rv = 0x%x\n", (unsigned int)rv);
         rv = -1;
     }
-    if (P_DecText) {
+    if (P_DecText)
+    {
         delete[](P_DecText);
     }
-    if (P_EncText) {
+    if (P_EncText)
+    {
         delete[](P_EncText);
     }
     return rv;
diff --git a/mft_utils/hsmclient/src/hsmcreatersasignature.cpp b/mft_utils/hsmclient/src/hsmcreatersasignature.cpp
index d6f7ad54..885c400a 100644
--- a/mft_utils/hsmclient/src/hsmcreatersasignature.cpp
+++ b/mft_utils/hsmclient/src/hsmcreatersasignature.cpp
@@ -37,44 +37,49 @@
 #include <vector>
 using namespace std;
 
-CK_RV HSMLunaClient::RSA_CreateSignature(vector <CK_BYTE> data, string privateKeyLabel, 
-    string publicKeyLabel, vector<u_int8_t>& result_signature)
+CK_RV HSMLunaClient::RSA_CreateSignature(vector<CK_BYTE> data,
+                                         string privateKeyLabel,
+                                         string publicKeyLabel,
+                                         vector<u_int8_t>& result_signature)
 {
     CK_ULONG dataLength = data.size();
-    unsigned int labelSize = privateKeyLabel.size() + 1 ;
+    unsigned int labelSize = privateKeyLabel.size() + 1;
     CK_BYTE* pLabel = new CK_BYTE[labelSize];
     memset(pLabel, 0, labelSize);
-    
-    for (unsigned int i = 0; i < privateKeyLabel.size(); i++) {
+
+    for (unsigned int i = 0; i < privateKeyLabel.size(); i++)
+    {
         pLabel[i] = privateKeyLabel[i];
     }
-    CK_ATTRIBUTE RSAFindPriTemplate =
-    {
-        CKA_LABEL, pLabel, labelSize
-    };
+    CK_ATTRIBUTE RSAFindPriTemplate = {CKA_LABEL, pLabel, labelSize};
     CK_OBJECT_HANDLE priv_key;
     CK_ULONG numHandles = 0;
-    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = { 0 };
+    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = {0};
     CK_RV rv = P11Functions->C_FindObjectsInit(m_hSession, &RSAFindPriTemplate, 1);
     rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         delete[] pLabel;
         return rv;
     }
-    if (numHandles == 0) {
+    if (numHandles == 0)
+    {
         RSAFindPriTemplate.ulValueLen--;
         rv = P11Functions->C_FindObjectsInit(m_hSession, &RSAFindPriTemplate, 1);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             delete[] pLabel;
             return rv;
         }
         rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             delete[] pLabel;
             return rv;
         }
     }
-    if (numHandles == 0) {
+    if (numHandles == 0)
+    {
         cout << "Private key not found!" << endl;
         delete[] pLabel;
         return CKR_FUNCTION_FAILED;
@@ -82,72 +87,78 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector <CK_BYTE> data, string privateKe
     priv_key = handles[0];
     cout << " The private key is " << hex << priv_key << endl;
 
-    CK_MECHANISM mechanism = {
-        CKM_SHA512_RSA_PKCS, NULL_PTR, 0
-    };
+    CK_MECHANISM mechanism = {CKM_SHA512_RSA_PKCS, NULL_PTR, 0};
     CK_BYTE* signature = NULL;
 
     CK_ULONG signatureLength = 0;
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         delete[] pLabel;
         return rv;
     }
-    
+
     rv = P11Functions->C_SignInit(m_hSession, &mechanism, priv_key);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         cout << " C_SignInit has failed rv = " << hex << rv << endl;
         delete[] pLabel;
         return rv;
     }
     rv = P11Functions->C_Sign(m_hSession, &data[0], dataLength, NULL, &signatureLength);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         cout << " C_Sign1 has failed rv = " << hex << rv << endl;
         delete[] pLabel;
         return rv;
     }
     signature = new CK_BYTE[signatureLength];
     rv = P11Functions->C_Sign(m_hSession, &data[0], dataLength, signature, &signatureLength);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         cout << " C_Sign2 has failed rv = " << hex << rv << endl;
         delete[] signature;
         delete[] pLabel;
         return rv;
     }
     printf("Signature length is %lu bytes \n", (unsigned long)signatureLength);
-    for (unsigned int i = 0; i < signatureLength; i++) {
+    for (unsigned int i = 0; i < signatureLength; i++)
+    {
         printf("0x%02x ", signature[i]);
     }
     cout << endl;
-    
-    if (publicKeyLabel.empty() == false) {
+
+    if (publicKeyLabel.empty() == false)
+    {
         unsigned int publicLabelSize = publicKeyLabel.size() + 1;
         CK_BYTE* pPublicLabel = new CK_BYTE[publicLabelSize];
         memset(pPublicLabel, 0, publicLabelSize);
-        for (unsigned int i = 0; i < publicKeyLabel.size(); i++) {
+        for (unsigned int i = 0; i < publicKeyLabel.size(); i++)
+        {
             pPublicLabel[i] = publicKeyLabel[i];
         }
-        CK_ATTRIBUTE RSAFindPubTemplate =
-        {
-            CKA_LABEL, pPublicLabel, publicLabelSize
-        };
+        CK_ATTRIBUTE RSAFindPubTemplate = {CKA_LABEL, pPublicLabel, publicLabelSize};
         CK_OBJECT_HANDLE pub_key;
         numHandles = 0;
         rv = P11Functions->C_FindObjectsInit(m_hSession, &RSAFindPubTemplate, 1);
         rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-        if (numHandles == 0) {
+        if (numHandles == 0)
+        {
             RSAFindPubTemplate.ulValueLen--;
             rv = P11Functions->C_FindObjectsInit(m_hSession, &RSAFindPubTemplate, 1);
-            if (rv != CKR_OK) {
+            if (rv != CKR_OK)
+            {
                 delete[] pPublicLabel;
                 return rv;
             }
             rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
-            if (rv != CKR_OK) {
+            if (rv != CKR_OK)
+            {
                 delete[] pPublicLabel;
                 return rv;
             }
         }
-        if (numHandles == 0) {
+        if (numHandles == 0)
+        {
             cout << "Public key not found!" << endl;
             return CKR_FUNCTION_FAILED;
         }
@@ -155,20 +166,23 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector <CK_BYTE> data, string privateKe
         cout << " The public key is " << hex << pub_key << endl;
         /* Verify the known hash using the public key. */
         rv = P11Functions->C_VerifyInit(m_hSession, &mechanism, pub_key);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "Signature C_VerifyInit failed. Error is " << hex << rv << endl;
             return rv;
         }
         rv = P11Functions->C_Verify(m_hSession, &data[0], dataLength, signature, signatureLength);
 
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "Signature verifying failed. Error is " << hex << rv << endl;
             return CKR_GENERAL_ERROR;
         }
         cout << " RSA_CreateSignature is verified!" << endl;
     }
     result_signature.resize(signatureLength);
-    for (unsigned int i = 0; i < signatureLength; i++) {
+    for (unsigned int i = 0; i < signatureLength; i++)
+    {
         result_signature[i] = signature[i];
     }
     delete[] signature;
@@ -176,15 +190,14 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector <CK_BYTE> data, string privateKe
     return rv;
 }
 
-
 CK_RV HSMLunaClient::RSA_EncryptDataTest(string privateKeyLabel, string publicKeyLebel)
 {
     CK_MECHANISM mech2;
     CK_OBJECT_HANDLE publ_key, priv_key;
     /** generate data **/
-    CK_BYTE cipher[1024 * 4] = { 0 };
+    CK_BYTE cipher[1024 * 4] = {0};
     unsigned int orig_len = 256;
-    CK_BYTE original[256] = { 0 };
+    CK_BYTE original[256] = {0};
     CK_ULONG cipher_len, decipher_len;
     for (unsigned int i = 0; i < orig_len; i++)
         original[i] = i % 255;
@@ -194,23 +207,17 @@ CK_RV HSMLunaClient::RSA_EncryptDataTest(string privateKeyLabel, string publicKe
     mech2.ulParameterLen = 0;
     mech2.pParameter = NULL;
 
-    CK_ATTRIBUTE RSAFindPriTemplate[] =
-    {
-        {CKA_LABEL, (void*)privateKeyLabel.c_str(), privateKeyLabel.size()}
-    };
+    CK_ATTRIBUTE RSAFindPriTemplate[] = {{CKA_LABEL, (void*)privateKeyLabel.c_str(), privateKeyLabel.size()}};
     CK_ULONG numHandles = 0;
-    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = { 0 };
-    CK_OBJECT_HANDLE handles1[MAX_NUM_OF_HANDLES] = { 0 };
+    CK_OBJECT_HANDLE handles[MAX_NUM_OF_HANDLES] = {0};
+    CK_OBJECT_HANDLE handles1[MAX_NUM_OF_HANDLES] = {0};
 
     CK_RV rv = P11Functions->C_FindObjectsInit(m_hSession, RSAFindPriTemplate, 1);
     rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
 
     priv_key = handles[0];
     numHandles = 0;
-    CK_ATTRIBUTE RSAFindPubTemplate[] =
-    {
-        {CKA_LABEL, (void*)publicKeyLebel.c_str(), publicKeyLebel.size()}
-    };
+    CK_ATTRIBUTE RSAFindPubTemplate[] = {{CKA_LABEL, (void*)publicKeyLebel.c_str(), publicKeyLebel.size()}};
     rv = P11Functions->C_FindObjectsInit(m_hSession, RSAFindPubTemplate, 1);
     rv = P11Functions->C_FindObjects(m_hSession, handles1, MAX_NUM_OF_HANDLES, &numHandles);
     publ_key = handles1[0];
@@ -219,55 +226,62 @@ CK_RV HSMLunaClient::RSA_EncryptDataTest(string privateKeyLabel, string publicKe
     {
         /** initialize RSA encryption (with private key) **/
         rv = P11Functions->C_EncryptInit(m_hSession, &mech2, publ_key);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "C_EncryptInit " << hex << rv << endl;
-            //testcase_error("C_EncryptInit rc=%s", p11_get_ckr(rc));
+            // testcase_error("C_EncryptInit rc=%s", p11_get_ckr(rc));
             return rv;
         }
-        cipher_len = sizeof(cipher);        // set cipher buffer size
+        cipher_len = sizeof(cipher); // set cipher buffer size
         /** do RSA decryption (with public key) **/
-        rv = P11Functions->C_Encrypt(m_hSession,
-            original, orig_len, cipher, (CK_ULONG_PTR)&cipher_len);
+        rv = P11Functions->C_Encrypt(m_hSession, original, orig_len, cipher, (CK_ULONG_PTR)&cipher_len);
         if (rv != CKR_OK)
         {
             cout << "C_Encrypt " << hex << rv << endl;
             return rv;
         }
         rv = P11Functions->C_DecryptInit(m_hSession, &mech2, priv_key);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "C_DecryptInit " << hex << rv << endl;
             return rv;
         }
         // do (private key) decryption
         decipher_len = 0;
         rv = P11Functions->C_Decrypt(m_hSession, cipher, cipher_len, NULL, &decipher_len);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "C_Decrypt " << hex << rv << endl;
             cout << "Error in decryption process 1 !" << endl;
             return rv;
         }
-        CK_BYTE *decipher = new CK_BYTE[decipher_len];
+        CK_BYTE* decipher = new CK_BYTE[decipher_len];
         rv = P11Functions->C_Decrypt(m_hSession, cipher, cipher_len, decipher, &decipher_len);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "Error in decryption process 2 !" << hex << rv << endl;
             return rv;
         }
         rv = P11Functions->C_DestroyObject(m_hSession, publ_key);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "C_DestroyObject public " << hex << rv << endl;
             return rv;
         }
 
         rv = P11Functions->C_DestroyObject(m_hSession, priv_key);
-        if (rv != CKR_OK) {
+        if (rv != CKR_OK)
+        {
             cout << "C_DestroyObject private " << hex << rv << endl;
             return rv;
         }
-        if (orig_len == decipher_len) {
+        if (orig_len == decipher_len)
+        {
             unsigned int i = 0;
             for (i = 0; i < orig_len; i++)
             {
-                if (original[i] != decipher[i]) {
+                if (original[i] != decipher[i])
+                {
                     cout << "Error in decrypted data - data mismath !" << endl;
                     delete[] decipher;
                     return -1;
@@ -280,7 +294,7 @@ CK_RV HSMLunaClient::RSA_EncryptDataTest(string privateKeyLabel, string publicKe
         cout << "Error in decryption process - size mismatch !" << endl;
         delete[] decipher;
         return -1;
-        //compare original and decipher
+        // compare original and decipher
     }
     return rv;
 }
diff --git a/mft_utils/hsmclient/src/hsmlunaclient.cpp b/mft_utils/hsmclient/src/hsmlunaclient.cpp
index 805f1bba..43114673 100644
--- a/mft_utils/hsmclient/src/hsmlunaclient.cpp
+++ b/mft_utils/hsmclient/src/hsmlunaclient.cpp
@@ -37,320 +37,246 @@
 using namespace std;
 unsigned char HSMLunaClient::Modulus[MODULUS_SIZE] = {
 #if 1
-0xd2, 0xd9, 0xc8, 0x96, 0x04, 0xd5, 0xeb, 0xfc, 0x5d, 0x45, 0x34, 0xc5, 0xdb, 0x02,
-0x65, 0xc7, 0x4c, 0x15, 0xcf, 0xde, 0xee, 0x10, 0x93, 0x15, 0x1a, 0xb7, 0xb2, 0xcc, 0x70,
-0x0b, 0x8c, 0xdb, 0x3a, 0xa7, 0x23, 0xc5, 0x59, 0xf6, 0xc0, 0x88, 0xfb, 0x50, 0x74, 0x33,
-0xb3, 0x58, 0xd2, 0x5f, 0x21, 0xcf, 0x3d, 0x8c, 0x52, 0xb1, 0x5a, 0x25, 0xd3, 0x68, 0x76,
-0x25, 0xda, 0x08, 0xc7, 0x4d, 0x80, 0x39, 0xfa, 0x7c, 0xd7, 0xfe, 0xea, 0x35, 0xe8, 0x49,
-0x9d, 0xd8, 0xe2, 0x43, 0x85, 0xcc, 0xb2, 0xa6, 0x40, 0xe4, 0x0e, 0x63, 0xf8, 0x2b, 0x72,
-0xa9, 0xf8, 0xfe, 0x7d, 0x47, 0x59, 0x71, 0x03, 0x20, 0x0e, 0x6e, 0x27, 0xf6, 0x2d, 0xba,
-0xf5, 0x75, 0xc1, 0xb4, 0x9f, 0xd4, 0x67, 0xb3, 0x3c, 0xea, 0x16, 0xe8, 0x9b, 0xe5, 0xd2,
-0xd4, 0xf9, 0xfe, 0xdc, 0x6c, 0x42, 0xe6, 0x33, 0x0e, 0xd5, 0x21, 0x09, 0x22, 0xc3, 0x14,
-0x2c, 0x49, 0xad, 0xe8, 0xb4, 0xb8, 0x65, 0x9e, 0xa9, 0x5d, 0x6f, 0x95, 0x0e, 0x02, 0x39,
-0x63, 0x0a, 0xa8, 0xe8, 0x51, 0x82, 0x1c, 0xa3, 0x8f, 0x20, 0xbf, 0x3e, 0x72, 0xee, 0x58,
-0x24, 0x97, 0xe6, 0xc1, 0x84, 0x84, 0x6d, 0x32, 0x21, 0xe8, 0x4c, 0xd5, 0x98, 0xcf, 0xb5,
-0x60, 0x85, 0xef, 0x3d, 0x99, 0x76, 0x55, 0x10, 0x46, 0x34, 0x05, 0x22, 0xc6, 0xf2, 0x06,
-0x79, 0xaf, 0x33, 0x3f, 0x36, 0x08, 0xcb, 0xcd, 0xa4, 0xa5, 0xd5, 0xd7, 0xc8, 0x70, 0x4b,
-0xe0, 0x78, 0x00, 0x6c, 0x67, 0xf6, 0x7d, 0xda, 0x0d, 0x7c, 0x5f, 0x09, 0x83, 0xc1, 0x6e,
-0x0c, 0x51, 0x25, 0x1e, 0x2d, 0x4c, 0xee, 0xf7, 0xa9, 0xb6, 0x91, 0x1a, 0x38, 0xb7, 0x7c,
-0xbd, 0x1c, 0x17, 0x4e, 0xb6, 0xc6, 0x23, 0x03, 0x39, 0x39, 0xa7, 0xee, 0x4e, 0x4d, 0x3a,
-0x5f, 0xf5, 0x2e, 0xd0, 0x0c, 0x87, 0xea, 0xab, 0x4b, 0xbf, 0x5d, 0x1d, 0x4d, 0x27, 0x1e,
-0x70, 0x3f, 0x2e, 0xf7, 0xf8, 0xa4, 0x2b, 0x45, 0xcb, 0x09, 0x6f, 0x5a, 0xcd, 0x08, 0xdc,
-0x08, 0x17, 0xb0, 0x59, 0x53, 0xad, 0xb6, 0xbd, 0x8d, 0xb6, 0xa6, 0xb3, 0x13, 0xab, 0x00,
-0xfe, 0x5e, 0x5b, 0xa7, 0xbd, 0xfa, 0xc4, 0x89, 0xb0, 0xcc, 0x88, 0x5c, 0xc4, 0xec, 0xc4,
-0x73, 0x2c, 0x23, 0x14, 0x6c, 0x08, 0xe7, 0x8b, 0x9c, 0x83, 0x8c, 0xa8, 0xe6, 0x14, 0x37,
-0x0d, 0xa0, 0xf9, 0x8b, 0xa9, 0x04, 0x1c, 0xfe, 0x2d, 0x08, 0x98, 0x5b, 0x16, 0x20, 0xf2,
-0x20, 0xe0, 0x07, 0x58, 0xde, 0x7d, 0xa9, 0xda, 0x78, 0x02, 0x74, 0x92, 0x4b, 0xa3, 0x26,
-0x2f, 0x27, 0xb3, 0xa0, 0xe1, 0x0c, 0x2e, 0xb1, 0x25, 0x34, 0x6f, 0xec, 0x02, 0xb5, 0xbd,
-0x43, 0xf1, 0x8f, 0x81, 0xc8, 0xf0, 0x58, 0x8d, 0x61, 0x62, 0x37, 0x8d, 0x58, 0x1e, 0xe0,
-0xed, 0x52, 0x15, 0x18, 0xd7, 0x99, 0x72, 0x8e, 0x85, 0x1b, 0xe8, 0x50, 0x67, 0x67, 0x77,
-0xc5, 0x91, 0x54, 0xa4, 0x5a, 0x61, 0x72, 0x27, 0x09, 0x95, 0xa2, 0x73, 0x0d, 0xf9, 0x86,
-0x6d, 0x7f, 0xb7, 0xad, 0x87, 0x5d, 0xd0, 0x6e, 0x3d, 0xeb, 0x0e, 0xab, 0xe9, 0x02, 0x26,
-0x78, 0x22, 0x32, 0xb8, 0x3d, 0x70, 0x74, 0x5d, 0x86, 0x4b, 0xac, 0x6a, 0x43, 0xe5, 0x08,
-0x60, 0x95, 0xc4, 0xcc, 0x74, 0xb4, 0x86, 0x06, 0x55, 0xa1, 0xbc, 0xfb, 0xc2, 0x28, 0x85,
-0xc0, 0x62, 0x8d, 0xef, 0x47, 0x95, 0xa8, 0x4b, 0x53, 0x0a, 0x7f, 0xfe, 0x11, 0x49, 0xb7,
-0xf2, 0xab, 0x38, 0xb5, 0x10, 0x32, 0xd9, 0xe5, 0x16, 0x78, 0xe2, 0xeb, 0xf7, 0xa9, 0xe9,
-0x4b, 0xca, 0x41, 0xa4, 0x6f, 0x5f, 0x8c, 0x7a, 0x11, 0x3d, 0xfc, 0x3a, 0x7e, 0xa2, 0xc0,
-0x0f, 0xd5, 0xd1
+  0xd2, 0xd9, 0xc8, 0x96, 0x04, 0xd5, 0xeb, 0xfc, 0x5d, 0x45, 0x34, 0xc5, 0xdb, 0x02, 0x65, 0xc7, 0x4c, 0x15, 0xcf,
+  0xde, 0xee, 0x10, 0x93, 0x15, 0x1a, 0xb7, 0xb2, 0xcc, 0x70, 0x0b, 0x8c, 0xdb, 0x3a, 0xa7, 0x23, 0xc5, 0x59, 0xf6,
+  0xc0, 0x88, 0xfb, 0x50, 0x74, 0x33, 0xb3, 0x58, 0xd2, 0x5f, 0x21, 0xcf, 0x3d, 0x8c, 0x52, 0xb1, 0x5a, 0x25, 0xd3,
+  0x68, 0x76, 0x25, 0xda, 0x08, 0xc7, 0x4d, 0x80, 0x39, 0xfa, 0x7c, 0xd7, 0xfe, 0xea, 0x35, 0xe8, 0x49, 0x9d, 0xd8,
+  0xe2, 0x43, 0x85, 0xcc, 0xb2, 0xa6, 0x40, 0xe4, 0x0e, 0x63, 0xf8, 0x2b, 0x72, 0xa9, 0xf8, 0xfe, 0x7d, 0x47, 0x59,
+  0x71, 0x03, 0x20, 0x0e, 0x6e, 0x27, 0xf6, 0x2d, 0xba, 0xf5, 0x75, 0xc1, 0xb4, 0x9f, 0xd4, 0x67, 0xb3, 0x3c, 0xea,
+  0x16, 0xe8, 0x9b, 0xe5, 0xd2, 0xd4, 0xf9, 0xfe, 0xdc, 0x6c, 0x42, 0xe6, 0x33, 0x0e, 0xd5, 0x21, 0x09, 0x22, 0xc3,
+  0x14, 0x2c, 0x49, 0xad, 0xe8, 0xb4, 0xb8, 0x65, 0x9e, 0xa9, 0x5d, 0x6f, 0x95, 0x0e, 0x02, 0x39, 0x63, 0x0a, 0xa8,
+  0xe8, 0x51, 0x82, 0x1c, 0xa3, 0x8f, 0x20, 0xbf, 0x3e, 0x72, 0xee, 0x58, 0x24, 0x97, 0xe6, 0xc1, 0x84, 0x84, 0x6d,
+  0x32, 0x21, 0xe8, 0x4c, 0xd5, 0x98, 0xcf, 0xb5, 0x60, 0x85, 0xef, 0x3d, 0x99, 0x76, 0x55, 0x10, 0x46, 0x34, 0x05,
+  0x22, 0xc6, 0xf2, 0x06, 0x79, 0xaf, 0x33, 0x3f, 0x36, 0x08, 0xcb, 0xcd, 0xa4, 0xa5, 0xd5, 0xd7, 0xc8, 0x70, 0x4b,
+  0xe0, 0x78, 0x00, 0x6c, 0x67, 0xf6, 0x7d, 0xda, 0x0d, 0x7c, 0x5f, 0x09, 0x83, 0xc1, 0x6e, 0x0c, 0x51, 0x25, 0x1e,
+  0x2d, 0x4c, 0xee, 0xf7, 0xa9, 0xb6, 0x91, 0x1a, 0x38, 0xb7, 0x7c, 0xbd, 0x1c, 0x17, 0x4e, 0xb6, 0xc6, 0x23, 0x03,
+  0x39, 0x39, 0xa7, 0xee, 0x4e, 0x4d, 0x3a, 0x5f, 0xf5, 0x2e, 0xd0, 0x0c, 0x87, 0xea, 0xab, 0x4b, 0xbf, 0x5d, 0x1d,
+  0x4d, 0x27, 0x1e, 0x70, 0x3f, 0x2e, 0xf7, 0xf8, 0xa4, 0x2b, 0x45, 0xcb, 0x09, 0x6f, 0x5a, 0xcd, 0x08, 0xdc, 0x08,
+  0x17, 0xb0, 0x59, 0x53, 0xad, 0xb6, 0xbd, 0x8d, 0xb6, 0xa6, 0xb3, 0x13, 0xab, 0x00, 0xfe, 0x5e, 0x5b, 0xa7, 0xbd,
+  0xfa, 0xc4, 0x89, 0xb0, 0xcc, 0x88, 0x5c, 0xc4, 0xec, 0xc4, 0x73, 0x2c, 0x23, 0x14, 0x6c, 0x08, 0xe7, 0x8b, 0x9c,
+  0x83, 0x8c, 0xa8, 0xe6, 0x14, 0x37, 0x0d, 0xa0, 0xf9, 0x8b, 0xa9, 0x04, 0x1c, 0xfe, 0x2d, 0x08, 0x98, 0x5b, 0x16,
+  0x20, 0xf2, 0x20, 0xe0, 0x07, 0x58, 0xde, 0x7d, 0xa9, 0xda, 0x78, 0x02, 0x74, 0x92, 0x4b, 0xa3, 0x26, 0x2f, 0x27,
+  0xb3, 0xa0, 0xe1, 0x0c, 0x2e, 0xb1, 0x25, 0x34, 0x6f, 0xec, 0x02, 0xb5, 0xbd, 0x43, 0xf1, 0x8f, 0x81, 0xc8, 0xf0,
+  0x58, 0x8d, 0x61, 0x62, 0x37, 0x8d, 0x58, 0x1e, 0xe0, 0xed, 0x52, 0x15, 0x18, 0xd7, 0x99, 0x72, 0x8e, 0x85, 0x1b,
+  0xe8, 0x50, 0x67, 0x67, 0x77, 0xc5, 0x91, 0x54, 0xa4, 0x5a, 0x61, 0x72, 0x27, 0x09, 0x95, 0xa2, 0x73, 0x0d, 0xf9,
+  0x86, 0x6d, 0x7f, 0xb7, 0xad, 0x87, 0x5d, 0xd0, 0x6e, 0x3d, 0xeb, 0x0e, 0xab, 0xe9, 0x02, 0x26, 0x78, 0x22, 0x32,
+  0xb8, 0x3d, 0x70, 0x74, 0x5d, 0x86, 0x4b, 0xac, 0x6a, 0x43, 0xe5, 0x08, 0x60, 0x95, 0xc4, 0xcc, 0x74, 0xb4, 0x86,
+  0x06, 0x55, 0xa1, 0xbc, 0xfb, 0xc2, 0x28, 0x85, 0xc0, 0x62, 0x8d, 0xef, 0x47, 0x95, 0xa8, 0x4b, 0x53, 0x0a, 0x7f,
+  0xfe, 0x11, 0x49, 0xb7, 0xf2, 0xab, 0x38, 0xb5, 0x10, 0x32, 0xd9, 0xe5, 0x16, 0x78, 0xe2, 0xeb, 0xf7, 0xa9, 0xe9,
+  0x4b, 0xca, 0x41, 0xa4, 0x6f, 0x5f, 0x8c, 0x7a, 0x11, 0x3d, 0xfc, 0x3a, 0x7e, 0xa2, 0xc0, 0x0f, 0xd5, 0xd1
 #else
-0xb8, 0xb5, 0x0f, 0x49, 0x46, 0xb5, 0x5d, 0x58, 0x04, 0x8e,
-0x52, 0x59, 0x39, 0xdf, 0xd6,0x29,0x45, 0x6b, 0x6c, 0x96, 0xbb, 0xab, 0xa5, 0x6f, 0x72, 0x1b,
- 0x16, 0x96, 0x74, 0xd5, 0xf9,0xb4,0x41, 0xa3, 0x7c, 0xe1, 0x94, 0x73, 0x4b, 0xa7, 0x23, 0xff,
- 0x61, 0xeb, 0xce, 0x5a, 0xe7,0x7f,0xe3, 0x74, 0xe8, 0x52, 0x5b, 0xd6, 0x5d, 0x5c, 0xdc, 0x98,
- 0x49, 0xfe, 0x51, 0xc2, 0x7e,0x8f,0x3b, 0x37, 0x5c, 0xb3, 0x11, 0xed, 0x85, 0x91, 0x15, 0x92,
- 0x24, 0xd8, 0xf1, 0x7b, 0x3d,0x2f,0x8b, 0xcd, 0x1b, 0x30, 0x14, 0xa3, 0x6b, 0x1b, 0x4d, 0x27,
- 0xff, 0x6a, 0x58, 0x84, 0x9e,0x79,0x94, 0xca, 0x78, 0x64, 0x01, 0x33, 0xc3, 0x58, 0xfc, 0xd3,
- 0x83, 0xeb, 0x2f, 0xab, 0x6f,0x85,0x5a, 0x38, 0x41, 0x3d, 0x73, 0x20, 0x1b, 0x82, 0xbc, 0x7e,
- 0x76, 0xde, 0x5c, 0xfe, 0x42,0xd6,0x7b, 0x86, 0x4f, 0x79, 0x78, 0x29, 0x82, 0x87, 0xa6, 0x24,
- 0x43, 0x39, 0x74, 0xfe, 0xf2,0x0c,0x08, 0xbe, 0xfa, 0x1e, 0x0a, 0x48, 0x6f, 0x14, 0x86, 0xc5,
- 0xcd, 0x9a, 0x98, 0x09, 0x2d,0xf3,0xf3, 0x5a, 0x7a, 0xa4, 0xe6, 0x8a, 0x2e, 0x49, 0x8a, 0xde,
- 0x73, 0xe9, 0x37, 0xa0, 0x5b,0xef,0xd0, 0xe0, 0x13, 0xac, 0x88, 0x5f, 0x59, 0x47, 0x96, 0x7f,
- 0x78, 0x18, 0x0e, 0x44, 0x6a,0x5d,0xec, 0x6e, 0xed, 0x4f, 0xf6, 0x6a, 0x7a, 0x58, 0x6b, 0xfe,
- 0x6c, 0x5a, 0xb9, 0xd2, 0x22,0x3a,0x1f, 0xdf, 0xc3, 0x09, 0x3f, 0x6b, 0x2e, 0xf1, 0x6d, 0xc3,
- 0xfb, 0x4e, 0xd4, 0xf2, 0xa3,0x94,0x13, 0xb0, 0xbf, 0x1e, 0x06, 0x2e, 0x29, 0x55, 0x00, 0xaa,
- 0x98, 0xd9, 0xe8, 0x77, 0x84,0x8b,0x3f, 0x5f, 0x5e, 0xf7, 0xf8, 0xa7, 0xe6, 0x02, 0xd2, 0x18,
- 0xb0, 0x52, 0xd0, 0x37, 0x2e,0x53
+  0xb8, 0xb5, 0x0f, 0x49, 0x46, 0xb5, 0x5d, 0x58, 0x04, 0x8e, 0x52, 0x59, 0x39, 0xdf, 0xd6, 0x29, 0x45, 0x6b, 0x6c,
+  0x96, 0xbb, 0xab, 0xa5, 0x6f, 0x72, 0x1b, 0x16, 0x96, 0x74, 0xd5, 0xf9, 0xb4, 0x41, 0xa3, 0x7c, 0xe1, 0x94, 0x73,
+  0x4b, 0xa7, 0x23, 0xff, 0x61, 0xeb, 0xce, 0x5a, 0xe7, 0x7f, 0xe3, 0x74, 0xe8, 0x52, 0x5b, 0xd6, 0x5d, 0x5c, 0xdc,
+  0x98, 0x49, 0xfe, 0x51, 0xc2, 0x7e, 0x8f, 0x3b, 0x37, 0x5c, 0xb3, 0x11, 0xed, 0x85, 0x91, 0x15, 0x92, 0x24, 0xd8,
+  0xf1, 0x7b, 0x3d, 0x2f, 0x8b, 0xcd, 0x1b, 0x30, 0x14, 0xa3, 0x6b, 0x1b, 0x4d, 0x27, 0xff, 0x6a, 0x58, 0x84, 0x9e,
+  0x79, 0x94, 0xca, 0x78, 0x64, 0x01, 0x33, 0xc3, 0x58, 0xfc, 0xd3, 0x83, 0xeb, 0x2f, 0xab, 0x6f, 0x85, 0x5a, 0x38,
+  0x41, 0x3d, 0x73, 0x20, 0x1b, 0x82, 0xbc, 0x7e, 0x76, 0xde, 0x5c, 0xfe, 0x42, 0xd6, 0x7b, 0x86, 0x4f, 0x79, 0x78,
+  0x29, 0x82, 0x87, 0xa6, 0x24, 0x43, 0x39, 0x74, 0xfe, 0xf2, 0x0c, 0x08, 0xbe, 0xfa, 0x1e, 0x0a, 0x48, 0x6f, 0x14,
+  0x86, 0xc5, 0xcd, 0x9a, 0x98, 0x09, 0x2d, 0xf3, 0xf3, 0x5a, 0x7a, 0xa4, 0xe6, 0x8a, 0x2e, 0x49, 0x8a, 0xde, 0x73,
+  0xe9, 0x37, 0xa0, 0x5b, 0xef, 0xd0, 0xe0, 0x13, 0xac, 0x88, 0x5f, 0x59, 0x47, 0x96, 0x7f, 0x78, 0x18, 0x0e, 0x44,
+  0x6a, 0x5d, 0xec, 0x6e, 0xed, 0x4f, 0xf6, 0x6a, 0x7a, 0x58, 0x6b, 0xfe, 0x6c, 0x5a, 0xb9, 0xd2, 0x22, 0x3a, 0x1f,
+  0xdf, 0xc3, 0x09, 0x3f, 0x6b, 0x2e, 0xf1, 0x6d, 0xc3, 0xfb, 0x4e, 0xd4, 0xf2, 0xa3, 0x94, 0x13, 0xb0, 0xbf, 0x1e,
+  0x06, 0x2e, 0x29, 0x55, 0x00, 0xaa, 0x98, 0xd9, 0xe8, 0x77, 0x84, 0x8b, 0x3f, 0x5f, 0x5e, 0xf7, 0xf8, 0xa7, 0xe6,
+  0x02, 0xd2, 0x18, 0xb0, 0x52, 0xd0, 0x37, 0x2e, 0x53
 #endif
 };
 
 unsigned char HSMLunaClient::PrivateKeyData[PRIVATE_DATA_SIZE] = {
 #if 1
-0x30, 0x82, 0x09, 0x44, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
-0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 0x09, 0x2e, 0x30, 0x82, 0x09, 0x2a, 0x02, 0x01,
-0x00, 0x02, 0x82, 0x02, 0x01, 0x00, 0xd2, 0xd9, 0xc8, 0x96, 0x04, 0xd5, 0xeb, 0xfc, 0x5d, 0x45,
-0x34, 0xc5, 0xdb, 0x02, 0x65, 0xc7, 0x4c, 0x15, 0xcf, 0xde, 0xee, 0x10, 0x93, 0x15, 0x1a, 0xb7,
-0xb2, 0xcc, 0x70, 0x0b, 0x8c, 0xdb, 0x3a, 0xa7, 0x23, 0xc5, 0x59, 0xf6, 0xc0, 0x88, 0xfb, 0x50,
-0x74, 0x33, 0xb3, 0x58, 0xd2, 0x5f, 0x21, 0xcf, 0x3d, 0x8c, 0x52, 0xb1, 0x5a, 0x25, 0xd3, 0x68,
-0x76, 0x25, 0xda, 0x08, 0xc7, 0x4d, 0x80, 0x39, 0xfa, 0x7c, 0xd7, 0xfe, 0xea, 0x35, 0xe8, 0x49,
-0x9d, 0xd8, 0xe2, 0x43, 0x85, 0xcc, 0xb2, 0xa6, 0x40, 0xe4, 0x0e, 0x63, 0xf8, 0x2b, 0x72, 0xa9,
-0xf8, 0xfe, 0x7d, 0x47, 0x59, 0x71, 0x03, 0x20, 0x0e, 0x6e, 0x27, 0xf6, 0x2d, 0xba, 0xf5, 0x75,
-0xc1, 0xb4, 0x9f, 0xd4, 0x67, 0xb3, 0x3c, 0xea, 0x16, 0xe8, 0x9b, 0xe5, 0xd2, 0xd4, 0xf9, 0xfe,
-0xdc, 0x6c, 0x42, 0xe6, 0x33, 0x0e, 0xd5, 0x21, 0x09, 0x22, 0xc3, 0x14, 0x2c, 0x49, 0xad, 0xe8,
-0xb4, 0xb8, 0x65, 0x9e, 0xa9, 0x5d, 0x6f, 0x95, 0x0e, 0x02, 0x39, 0x63, 0x0a, 0xa8, 0xe8, 0x51,
-0x82, 0x1c, 0xa3, 0x8f, 0x20, 0xbf, 0x3e, 0x72, 0xee, 0x58, 0x24, 0x97, 0xe6, 0xc1, 0x84, 0x84,
-0x6d, 0x32, 0x21, 0xe8, 0x4c, 0xd5, 0x98, 0xcf, 0xb5, 0x60, 0x85, 0xef, 0x3d, 0x99, 0x76, 0x55,
-0x10, 0x46, 0x34, 0x05, 0x22, 0xc6, 0xf2, 0x06, 0x79, 0xaf, 0x33, 0x3f, 0x36, 0x08, 0xcb, 0xcd,
-0xa4, 0xa5, 0xd5, 0xd7, 0xc8, 0x70, 0x4b, 0xe0, 0x78, 0x00, 0x6c, 0x67, 0xf6, 0x7d, 0xda, 0x0d,
-0x7c, 0x5f, 0x09, 0x83, 0xc1, 0x6e, 0x0c, 0x51, 0x25, 0x1e, 0x2d, 0x4c, 0xee, 0xf7, 0xa9, 0xb6,
-0x91, 0x1a, 0x38, 0xb7, 0x7c, 0xbd, 0x1c, 0x17, 0x4e, 0xb6, 0xc6, 0x23, 0x03, 0x39, 0x39, 0xa7,
-0xee, 0x4e, 0x4d, 0x3a, 0x5f, 0xf5, 0x2e, 0xd0, 0x0c, 0x87, 0xea, 0xab, 0x4b, 0xbf, 0x5d, 0x1d,
-0x4d, 0x27, 0x1e, 0x70, 0x3f, 0x2e, 0xf7, 0xf8, 0xa4, 0x2b, 0x45, 0xcb, 0x09, 0x6f, 0x5a, 0xcd,
-0x08, 0xdc, 0x08, 0x17, 0xb0, 0x59, 0x53, 0xad, 0xb6, 0xbd, 0x8d, 0xb6, 0xa6, 0xb3, 0x13, 0xab,
-0x00, 0xfe, 0x5e, 0x5b, 0xa7, 0xbd, 0xfa, 0xc4, 0x89, 0xb0, 0xcc, 0x88, 0x5c, 0xc4, 0xec, 0xc4,
-0x73, 0x2c, 0x23, 0x14, 0x6c, 0x08, 0xe7, 0x8b, 0x9c, 0x83, 0x8c, 0xa8, 0xe6, 0x14, 0x37, 0x0d,
-0xa0, 0xf9, 0x8b, 0xa9, 0x04, 0x1c, 0xfe, 0x2d, 0x08, 0x98, 0x5b, 0x16, 0x20, 0xf2, 0x20, 0xe0,
-0x07, 0x58, 0xde, 0x7d, 0xa9, 0xda, 0x78, 0x02, 0x74, 0x92, 0x4b, 0xa3, 0x26, 0x2f, 0x27, 0xb3,
-0xa0, 0xe1, 0x0c, 0x2e, 0xb1, 0x25, 0x34, 0x6f, 0xec, 0x02, 0xb5, 0xbd, 0x43, 0xf1, 0x8f, 0x81,
-0xc8, 0xf0, 0x58, 0x8d, 0x61, 0x62, 0x37, 0x8d, 0x58, 0x1e, 0xe0, 0xed, 0x52, 0x15, 0x18, 0xd7,
-0x99, 0x72, 0x8e, 0x85, 0x1b, 0xe8, 0x50, 0x67, 0x67, 0x77, 0xc5, 0x91, 0x54, 0xa4, 0x5a, 0x61,
-0x72, 0x27, 0x09, 0x95, 0xa2, 0x73, 0x0d, 0xf9, 0x86, 0x6d, 0x7f, 0xb7, 0xad, 0x87, 0x5d, 0xd0,
-0x6e, 0x3d, 0xeb, 0x0e, 0xab, 0xe9, 0x02, 0x26, 0x78, 0x22, 0x32, 0xb8, 0x3d, 0x70, 0x74, 0x5d,
-0x86, 0x4b, 0xac, 0x6a, 0x43, 0xe5, 0x08, 0x60, 0x95, 0xc4, 0xcc, 0x74, 0xb4, 0x86, 0x06, 0x55,
-0xa1, 0xbc, 0xfb, 0xc2, 0x28, 0x85, 0xc0, 0x62, 0x8d, 0xef, 0x47, 0x95, 0xa8, 0x4b, 0x53, 0x0a,
-0x7f, 0xfe, 0x11, 0x49, 0xb7, 0xf2, 0xab, 0x38, 0xb5, 0x10, 0x32, 0xd9, 0xe5, 0x16, 0x78, 0xe2,
-0xeb, 0xf7, 0xa9, 0xe9, 0x4b, 0xca, 0x41, 0xa4, 0x6f, 0x5f, 0x8c, 0x7a, 0x11, 0x3d, 0xfc, 0x3a,
-0x7e, 0xa2, 0xc0, 0x0f, 0xd5, 0xd1, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x02, 0x01, 0x00,
-0xc1, 0xc1, 0xdf, 0xd1, 0xfc, 0x1f, 0x98, 0xfc, 0x0f, 0xb9, 0xc9, 0x05, 0x08, 0x7c, 0xeb, 0x8a,
-0x79, 0x20, 0x92, 0x25, 0x0a, 0x1f, 0xb1, 0x09, 0x73, 0xc3, 0xdb, 0x4a, 0x82, 0xac, 0x1a, 0x84,
-0x5b, 0x21, 0xbc, 0x7d, 0x5e, 0x6e, 0xa1, 0xff, 0x3e, 0xf2, 0x6f, 0xd6, 0x12, 0xb9, 0x4c, 0x98,
-0x9f, 0x39, 0x12, 0x16, 0x20, 0xe7, 0x59, 0x2f, 0xe9, 0x55, 0xd5, 0x3c, 0x73, 0x60, 0x1d, 0xc5,
-0xda, 0x4f, 0x6d, 0x1f, 0xcc, 0x5d, 0x34, 0x5c, 0xd5, 0x58, 0xd0, 0xf4, 0xbc, 0xf7, 0xcf, 0xbc,
-0x8b, 0x6e, 0xbb, 0xb2, 0xd6, 0x86, 0x87, 0x47, 0x65, 0xd7, 0x4c, 0x38, 0x90, 0x67, 0x40, 0x89,
-0xd9, 0x95, 0x5b, 0xad, 0x5e, 0x8b, 0x9a, 0xfa, 0x73, 0x16, 0x03, 0x2b, 0x38, 0xb4, 0xb7, 0x96,
-0xbe, 0x23, 0x5f, 0x69, 0xe1, 0xd9, 0x10, 0x25, 0x26, 0x96, 0x4d, 0x78, 0x2f, 0x01, 0xdb, 0x69,
-0x85, 0xf1, 0x15, 0xb4, 0x1c, 0x10, 0x2d, 0xa2, 0x87, 0x6d, 0x90, 0xa4, 0xe2, 0xbd, 0x2a, 0x65,
-0xf2, 0x63, 0xc6, 0xbb, 0xc4, 0x80, 0x7f, 0x0b, 0x38, 0x71, 0xae, 0x5f, 0x22, 0xee, 0x23, 0xe9,
-0x9a, 0x39, 0x83, 0x4c, 0xfc, 0x53, 0x9a, 0x79, 0xba, 0x8c, 0xf6, 0xcb, 0x5a, 0xdd, 0x5d, 0xbd,
-0xea, 0xee, 0xf4, 0x7d, 0xfe, 0x96, 0x1a, 0xc5, 0x2b, 0x38, 0x7f, 0xfc, 0x03, 0x51, 0xb4, 0xe3,
-0x9d, 0x04, 0xd6, 0x4d, 0x69, 0x8a, 0x6c, 0xdd, 0x28, 0x6b, 0x91, 0x21, 0xd3, 0xa0, 0xb7, 0x50,
-0x7a, 0x69, 0x8b, 0xdc, 0xd7, 0xc1, 0xb1, 0x81, 0x75, 0x1f, 0x6f, 0x6a, 0xe6, 0x13, 0x6d, 0x6c,
-0xf3, 0x64, 0x9d, 0xf7, 0x5d, 0x29, 0x95, 0x6f, 0x81, 0x45, 0x83, 0x91, 0xd5, 0x0c, 0xc8, 0x53,
-0xff, 0xbc, 0x6b, 0x59, 0x0a, 0x3a, 0xa2, 0x7b, 0xb3, 0xbf, 0xdd, 0xfd, 0x96, 0x7a, 0x4e, 0x32,
-0x15, 0x98, 0x88, 0xa7, 0xf8, 0x5a, 0x1c, 0x7b, 0x5c, 0xd5, 0xab, 0x63, 0xa8, 0xfa, 0x65, 0xcd,
-0x02, 0x49, 0xc3, 0x86, 0x3b, 0x52, 0x50, 0x76, 0x0b, 0x65, 0x74, 0xfc, 0x1b, 0xa8, 0x08, 0xef,
-0x50, 0xb6, 0xa8, 0x42, 0xc3, 0x4d, 0x50, 0x66, 0x19, 0x44, 0x9f, 0x03, 0xa7, 0x69, 0x10, 0x1e,
-0x41, 0xac, 0x15, 0x66, 0xf8, 0x29, 0x22, 0xfd, 0x8d, 0x9a, 0xdb, 0x6c, 0x1a, 0x7f, 0x18, 0x48,
-0x16, 0xed, 0xef, 0x48, 0x60, 0xf7, 0x40, 0xce, 0xb3, 0x98, 0xde, 0xac, 0x71, 0x07, 0x8a, 0x47,
-0x8e, 0x6e, 0x08, 0xc0, 0x22, 0x55, 0x85, 0x26, 0xfd, 0xd4, 0x91, 0x98, 0x69, 0xe0, 0x89, 0x52,
-0xc9, 0xe5, 0x4b, 0xdd, 0x44, 0xa8, 0x14, 0x07, 0x44, 0xcf, 0x4f, 0x0e, 0xf2, 0x92, 0x0d, 0xf7,
-0x41, 0x67, 0xab, 0x0e, 0xda, 0x81, 0x2b, 0x09, 0xcb, 0xea, 0x40, 0x38, 0xe1, 0xc2, 0x04, 0x07,
-0x94, 0xa8, 0x7b, 0xb7, 0x7a, 0x52, 0x97, 0x1d, 0xcb, 0x67, 0x4e, 0x67, 0xbb, 0xa9, 0xde, 0x5f,
-0xf9, 0xc4, 0xdb, 0x90, 0x7e, 0xaa, 0xa9, 0x36, 0xeb, 0x05, 0x0d, 0x4d, 0x69, 0x6b, 0x81, 0x40,
-0x76, 0xf9, 0x8a, 0x31, 0x75, 0xbe, 0x66, 0xdf, 0xf1, 0x97, 0xd9, 0x7f, 0x8a, 0xbf, 0xae, 0xec,
-0x51, 0xfc, 0x1d, 0x62, 0x27, 0x8d, 0xe4, 0x84, 0xc4, 0x62, 0xf4, 0x1f, 0x4a, 0xf6, 0x41, 0x7f,
-0x4f, 0xd3, 0x8d, 0xda, 0x0b, 0x04, 0x85, 0xde, 0xbf, 0xba, 0x2b, 0x70, 0x3a, 0xb7, 0x6c, 0xb7,
-0x84, 0xca, 0xe6, 0x6a, 0x54, 0xf6, 0xdd, 0x99, 0xdf, 0xbb, 0x45, 0xa1, 0xa9, 0x81, 0x4c, 0x18,
-0x4a, 0x03, 0xfc, 0x9b, 0xf7, 0x75, 0x1f, 0x5e, 0x4b, 0xc1, 0x0d, 0x0a, 0xd5, 0x5e, 0xb5, 0x11,
-0x0b, 0xef, 0x54, 0x20, 0xdc, 0x68, 0x04, 0x25, 0x31, 0x58, 0x1b, 0xb7, 0xd9, 0x09, 0x80, 0x01,
-0x02, 0x82, 0x01, 0x01, 0x00, 0xf3, 0x94, 0xdf, 0x22, 0xe1, 0x32, 0x89, 0x47, 0xbb, 0x42, 0x47,
-0x54, 0x55, 0xa0, 0x3a, 0x21, 0x35, 0xb4, 0xea, 0x15, 0x17, 0xe9, 0x66, 0xd3, 0x0c, 0x8c, 0xac,
-0xef, 0xd8, 0xc2, 0xff, 0x38, 0xdc, 0x0e, 0xc9, 0x3e, 0x0a, 0x6e, 0x86, 0x59, 0xa5, 0x38, 0x23,
-0x6d, 0x7a, 0xd6, 0xdb, 0x38, 0xd0, 0x14, 0xa3, 0x91, 0x1b, 0xd2, 0xbb, 0x3e, 0x30, 0xad, 0x3d,
-0x15, 0xb1, 0x95, 0xb4, 0x53, 0x00, 0xb3, 0x6e, 0x99, 0xd1, 0x90, 0x5a, 0x4b, 0x2b, 0x0d, 0x99,
-0xf2, 0x2a, 0x2b, 0x72, 0x69, 0x2f, 0xe6, 0x2a, 0xfe, 0x3e, 0x7f, 0xcd, 0xb3, 0x2d, 0xc2, 0x5b,
-0xff, 0x88, 0xed, 0x62, 0xc9, 0xf7, 0xf6, 0xfc, 0xb6, 0x80, 0xbd, 0x78, 0x80, 0xd4, 0x70, 0xdf,
-0x89, 0x13, 0xc2, 0x43, 0x15, 0x10, 0x00, 0xc3, 0xe3, 0x47, 0xff, 0xd2, 0xf2, 0x71, 0xd4, 0x34,
-0x22, 0xf5, 0xc4, 0xec, 0x8d, 0x35, 0x94, 0x0e, 0x8b, 0xdf, 0xf1, 0x48, 0xd6, 0xb1, 0xc5, 0x77,
-0xee, 0xd4, 0x81, 0x37, 0x53, 0xdb, 0xe1, 0xe8, 0x32, 0xd0, 0x48, 0x97, 0xf8, 0xf6, 0x2f, 0x28,
-0x4c, 0xa1, 0xdf, 0xcf, 0x5e, 0xd9, 0x5e, 0xc3, 0x34, 0x39, 0xf0, 0xb5, 0xe9, 0x44, 0x6f, 0x8d,
-0x1b, 0x44, 0x4c, 0xfe, 0xe3, 0xcf, 0x9c, 0x8d, 0xca, 0xb7, 0x9b, 0x85, 0xb2, 0xa9, 0x13, 0x0a,
-0x29, 0x12, 0xde, 0xb5, 0xf6, 0x80, 0xc4, 0x7b, 0x8f, 0x84, 0xe0, 0xbe, 0x2e, 0x09, 0x3f, 0xe3,
-0x8b, 0x51, 0x32, 0x66, 0x1c, 0x5d, 0xfa, 0xf8, 0xc1, 0x21, 0x7d, 0x41, 0xcf, 0xbc, 0x7b, 0xd4,
-0x26, 0xe7, 0xd2, 0xda, 0x52, 0xdf, 0xf9, 0x6e, 0x26, 0x52, 0xb7, 0x97, 0x67, 0x02, 0xee, 0xda,
-0x18, 0x28, 0xfd, 0x05, 0x37, 0xbe, 0x90, 0x3d, 0x7f, 0x8a, 0xbd, 0x28, 0xa7, 0xef, 0x76, 0x7e,
-0xf7, 0xe7, 0xd2, 0xca, 0xf1, 0x02, 0x82, 0x01, 0x01, 0x00, 0xdd, 0x99, 0xb8, 0xf4, 0x67, 0x52,
-0x0a, 0x32, 0x8f, 0x48, 0x9f, 0xd5, 0x25, 0x74, 0x46, 0x96, 0x28, 0x75, 0x7c, 0xce, 0xa2, 0x7c,
-0xa7, 0x78, 0xd2, 0x14, 0x49, 0x02, 0x26, 0x78, 0xb8, 0x19, 0xd4, 0x3a, 0x92, 0x1d, 0xee, 0xf2,
-0x13, 0x12, 0x85, 0x64, 0x35, 0x21, 0x97, 0xb2, 0xcf, 0xc0, 0xf1, 0x3d, 0x8a, 0x16, 0xed, 0x4e,
-0xf3, 0xcb, 0x15, 0xc3, 0x84, 0x68, 0xa5, 0x45, 0xea, 0x48, 0x10, 0x82, 0xba, 0x9a, 0xc4, 0x58,
-0xe0, 0xe9, 0x78, 0x61, 0x58, 0x13, 0xd4, 0x13, 0x37, 0x96, 0xdd, 0x03, 0x06, 0xc1, 0xeb, 0x86,
-0xa6, 0x82, 0x22, 0x33, 0x18, 0x85, 0xb2, 0xa2, 0x8f, 0x36, 0x3b, 0xcb, 0x2b, 0xf2, 0x07, 0xd0,
-0x5a, 0x81, 0x0f, 0x26, 0xeb, 0xed, 0x51, 0xc9, 0xbd, 0xbc, 0x03, 0x62, 0x74, 0x10, 0xb6, 0xda,
-0x86, 0xfc, 0x6f, 0x12, 0x75, 0xe9, 0x43, 0x3f, 0x2e, 0x9a, 0x23, 0xc6, 0x9d, 0xc6, 0x31, 0x18,
-0x41, 0x5a, 0x46, 0xf2, 0x76, 0x9a, 0x43, 0x99, 0x23, 0x61, 0xc0, 0x44, 0x62, 0xe2, 0xa2, 0xdf,
-0x8e, 0x47, 0x30, 0xcb, 0xc2, 0x05, 0x6d, 0xb9, 0xb9, 0x51, 0xb8, 0xd8, 0xc9, 0x06, 0xab, 0xdd,
-0x6d, 0x03, 0xbe, 0x01, 0x12, 0x01, 0x4e, 0x9d, 0x85, 0x1d, 0x22, 0x50, 0xda, 0xfa, 0x6b, 0x21,
-0x04, 0xec, 0xaf, 0x5f, 0x76, 0xf4, 0xe6, 0x2c, 0x02, 0xf5, 0x41, 0xe2, 0x6f, 0xfb, 0x7f, 0xc3,
-0x3a, 0x34, 0xde, 0xc8, 0x06, 0x61, 0x1c, 0xed, 0x2d, 0x66, 0x74, 0x13, 0xe1, 0x20, 0xd6, 0x83,
-0xea, 0xe6, 0x83, 0xf7, 0xcb, 0xd1, 0xca, 0xe9, 0xfc, 0xcd, 0x21, 0xe9, 0x47, 0xdd, 0xaf, 0x17,
-0x98, 0xb0, 0x5d, 0x9b, 0x8c, 0x3e, 0xd8, 0xe4, 0x11, 0xdd, 0x0c, 0xbc, 0x2f, 0xa1, 0x3a, 0x8f,
-0x10, 0xcb, 0x24, 0xfd, 0x58, 0x8f, 0x6a, 0x52, 0xf8, 0xe1, 0x02, 0x82, 0x01, 0x00, 0x02, 0x50,
-0xc4, 0xfa, 0x40, 0xe7, 0xc9, 0x14, 0x4c, 0x7c, 0x69, 0xcf, 0x2c, 0x6d, 0x34, 0x80, 0x42, 0x51,
-0x70, 0xf4, 0x38, 0x60, 0xf8, 0xa0, 0x42, 0xfb, 0x47, 0x5d, 0x94, 0x52, 0xee, 0x38, 0x2d, 0x27,
-0x5a, 0xd4, 0x63, 0x26, 0xff, 0xd1, 0xf4, 0x57, 0x1f, 0x47, 0x18, 0x26, 0xd8, 0xb8, 0xa6, 0x89,
-0xbb, 0xb0, 0x52, 0x72, 0x63, 0x63, 0x48, 0xf5, 0x2c, 0xa2, 0x7b, 0x28, 0xb0, 0x29, 0x25, 0xd5,
-0x8e, 0xd4, 0x99, 0x80, 0x64, 0xcb, 0x58, 0x22, 0x6d, 0xf7, 0x36, 0x5d, 0x69, 0x5e, 0x04, 0x9d,
-0x8c, 0x85, 0x14, 0x35, 0x04, 0xd0, 0x92, 0x3b, 0xc9, 0xc2, 0x19, 0x1c, 0x20, 0x97, 0x48, 0xeb,
-0x29, 0x25, 0xd6, 0xfd, 0x76, 0x1a, 0xcb, 0x6a, 0x33, 0x45, 0xcb, 0x51, 0x4a, 0x6f, 0xf5, 0xd1,
-0xfc, 0x0a, 0xba, 0x11, 0x7d, 0x80, 0xde, 0x82, 0x24, 0xe8, 0xbc, 0x2b, 0x5e, 0x10, 0x4d, 0x95,
-0x15, 0xba, 0x50, 0xab, 0xab, 0x84, 0x96, 0xf6, 0x08, 0x98, 0xd5, 0x9e, 0x50, 0xd7, 0x54, 0x3c,
-0xc6, 0x87, 0x4d, 0x21, 0x93, 0x88, 0x43, 0x56, 0xd9, 0x6c, 0x39, 0x11, 0xb6, 0x97, 0xf1, 0x3b,
-0x0c, 0x61, 0xff, 0xb7, 0x01, 0x13, 0xb1, 0x99, 0xd9, 0xde, 0x8b, 0x7c, 0xab, 0xe3, 0xa0, 0x82,
-0x9d, 0x7a, 0x72, 0xda, 0x60, 0x9f, 0xfd, 0x29, 0x78, 0x2c, 0x41, 0xc8, 0xaa, 0x34, 0x28, 0xaf,
-0x35, 0x79, 0x7c, 0xca, 0xe2, 0x23, 0xef, 0xe4, 0x92, 0x96, 0x2d, 0x74, 0x6c, 0x32, 0x12, 0xd6,
-0xa2, 0xec, 0xbb, 0x13, 0xc4, 0xbf, 0x63, 0xcc, 0x4d, 0x8c, 0xfd, 0x21, 0x2d, 0x00, 0x22, 0xae,
-0xed, 0x54, 0x21, 0xef, 0x2a, 0xda, 0x48, 0xd5, 0xda, 0x6e, 0xe6, 0x5c, 0xd9, 0x62, 0xd9, 0x45,
-0xe7, 0xbf, 0xc1, 0xa2, 0xe0, 0xb3, 0x0f, 0xfc, 0xb1, 0x62, 0x4b, 0xea, 0xde, 0x11, 0x02, 0x82,
-0x01, 0x01, 0x00, 0xa4, 0x5c, 0x9d, 0x4b, 0x61, 0xca, 0xfe, 0xd7, 0x4b, 0x61, 0x41, 0x73, 0x95,
-0x89, 0x2d, 0xc5, 0xb8, 0x12, 0x94, 0x54, 0xab, 0x3e, 0x2b, 0xf5, 0x38, 0x54, 0x65, 0x66, 0x5b,
-0xe4, 0x94, 0x20, 0x4c, 0x42, 0x79, 0x18, 0x0c, 0x9f, 0xae, 0x37, 0xc1, 0x8a, 0x76, 0xc2, 0x08,
-0xc3, 0x4e, 0xc6, 0xbb, 0xe7, 0xba, 0x21, 0x91, 0x38, 0x4b, 0x28, 0xe9, 0x66, 0x90, 0x32, 0x11,
-0xcb, 0xce, 0x9e, 0x4e, 0xe8, 0xb7, 0xc1, 0x8d, 0x3a, 0xa2, 0xef, 0x68, 0x23, 0x43, 0x71, 0xc9,
-0x8d, 0xcb, 0x60, 0x71, 0x63, 0x0a, 0x43, 0x11, 0x0f, 0x59, 0x37, 0x12, 0x68, 0xb5, 0x9a, 0x8c,
-0xc9, 0x77, 0xd1, 0x70, 0xfe, 0x1c, 0x05, 0x33, 0x78, 0x7d, 0x78, 0x56, 0x25, 0xb7, 0x3d, 0xd9,
-0xb8, 0xf9, 0xaa, 0x97, 0x14, 0x12, 0x24, 0x47, 0x8b, 0xc4, 0x2d, 0x3d, 0xb1, 0x02, 0x95, 0xd6,
-0x13, 0xe9, 0xdb, 0xd8, 0x07, 0x3c, 0x04, 0xc1, 0x6b, 0x4d, 0x25, 0xc9, 0x93, 0x93, 0x16, 0x8e,
-0x66, 0xea, 0x50, 0x59, 0x8c, 0x1f, 0x90, 0x1b, 0xe0, 0x16, 0xa6, 0x84, 0xf1, 0xcc, 0x61, 0xbc,
-0x65, 0xd1, 0xa7, 0x64, 0xa4, 0x1e, 0x4e, 0x7d, 0x71, 0x09, 0xa7, 0x89, 0xe9, 0x3f, 0x52, 0x8a,
-0xdd, 0xd8, 0xda, 0xa8, 0x16, 0x32, 0xa5, 0x24, 0x8a, 0x64, 0x1d, 0xad, 0x61, 0xf0, 0x58, 0x6a,
-0xd4, 0x60, 0x09, 0x4b, 0x29, 0xc9, 0x87, 0x4f, 0xd7, 0x1c, 0xb8, 0x14, 0x39, 0x66, 0x49, 0xe7,
-0x6b, 0x9f, 0x8d, 0xeb, 0x30, 0xc7, 0x7d, 0x54, 0xbe, 0x99, 0x9f, 0x0a, 0x68, 0xe3, 0xdb, 0x22,
-0x56, 0xf4, 0xf3, 0xad, 0x60, 0x5a, 0xb6, 0x79, 0x64, 0xd6, 0x12, 0x92, 0x0b, 0x8a, 0x35, 0x1f,
-0x27, 0xe2, 0x7c, 0x03, 0x33, 0x1d, 0x5c, 0xc7, 0x93, 0x4f, 0x90, 0x6d, 0x4a, 0x1f, 0xc2, 0x97,
-0xc9, 0x1c, 0xe1, 0x02, 0x82, 0x01, 0x01, 0x00, 0xbd, 0xce, 0xd4, 0x72, 0xa0, 0xe6, 0x7c, 0x12,
-0xee, 0x9e, 0x81, 0x18, 0x25, 0x07, 0x9e, 0x43, 0xb5, 0x98, 0x08, 0xa8, 0x8d, 0x82, 0x8c, 0x2b,
-0x43, 0xa1, 0x85, 0xe1, 0xf5, 0x03, 0x56, 0xd6, 0x9c, 0xbe, 0x3a, 0xc5, 0x04, 0x18, 0x78, 0x32,
-0xd3, 0xbf, 0xdf, 0xfb, 0x03, 0xf4, 0x2d, 0x21, 0xd3, 0xef, 0x84, 0xfe, 0xa5, 0xeb, 0xe6, 0xa2,
-0x37, 0x2c, 0xf6, 0xdb, 0x09, 0xaf, 0x51, 0x44, 0x05, 0x10, 0xa7, 0xaa, 0x41, 0xcb, 0x87, 0x95,
-0xd1, 0x5a, 0xcc, 0x61, 0x0c, 0x66, 0x95, 0x65, 0x4c, 0x11, 0x61, 0x80, 0x9b, 0x73, 0xb2, 0x9d,
-0x8e, 0xbe, 0xaf, 0x20, 0xb7, 0x6a, 0x2a, 0x46, 0x1b, 0x3f, 0xdc, 0x87, 0x1e, 0x9d, 0xbd, 0xa7,
-0x07, 0x22, 0xab, 0xc4, 0xd0, 0x91, 0x9c, 0xc8, 0x02, 0x24, 0x1c, 0x68, 0xe3, 0x20, 0xc7, 0x03,
-0x59, 0x12, 0xee, 0xe2, 0x88, 0xc8, 0x6c, 0xc7, 0x60, 0x19, 0xea, 0x5f, 0x56, 0x31, 0xca, 0x73,
-0x1c, 0xee, 0x97, 0x2e, 0xbb, 0x3c, 0x44, 0x16, 0x47, 0xb6, 0x6d, 0x39, 0x06, 0xad, 0x1a, 0x27,
-0x7a, 0x35, 0x70, 0x8c, 0x8f, 0x4b, 0x5e, 0x97, 0xf0, 0x82, 0x9a, 0xe0, 0x4b, 0x7e, 0x89, 0xb2,
-0x4f, 0x61, 0xa6, 0x45, 0x25, 0x61, 0x06, 0xdd, 0x65, 0x1b, 0x7f, 0x9a, 0x50, 0xdc, 0xbd, 0x05,
-0xf7, 0xd1, 0x4d, 0x84, 0x5a, 0x30, 0xcf, 0xcd, 0x63, 0x9e, 0x4a, 0x06, 0x03, 0x30, 0x1a, 0xea,
-0x43, 0x2a, 0x35, 0xd9, 0xf4, 0xfe, 0x34, 0xec, 0xc5, 0x04, 0x15, 0x07, 0x7c, 0x1e, 0xa4, 0xcd,
-0x2c, 0x76, 0x69, 0x96, 0x2a, 0xf8, 0xf2, 0x70, 0x55, 0x18, 0x66, 0xbe, 0x42, 0x28, 0xf8, 0x12,
-0x51, 0x2a, 0xc8, 0xcc, 0x78, 0xce, 0x31, 0x0d, 0xb2, 0xb6, 0x2e, 0x9c, 0xf3, 0x48, 0xd9, 0x74,
-0x2b, 0x53, 0xb3, 0x57, 0x57, 0x38, 0x83, 0x00 };
+  0x30, 0x82, 0x09, 0x44, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+  0x01, 0x05, 0x00, 0x04, 0x82, 0x09, 0x2e, 0x30, 0x82, 0x09, 0x2a, 0x02, 0x01, 0x00, 0x02, 0x82, 0x02, 0x01, 0x00,
+  0xd2, 0xd9, 0xc8, 0x96, 0x04, 0xd5, 0xeb, 0xfc, 0x5d, 0x45, 0x34, 0xc5, 0xdb, 0x02, 0x65, 0xc7, 0x4c, 0x15, 0xcf,
+  0xde, 0xee, 0x10, 0x93, 0x15, 0x1a, 0xb7, 0xb2, 0xcc, 0x70, 0x0b, 0x8c, 0xdb, 0x3a, 0xa7, 0x23, 0xc5, 0x59, 0xf6,
+  0xc0, 0x88, 0xfb, 0x50, 0x74, 0x33, 0xb3, 0x58, 0xd2, 0x5f, 0x21, 0xcf, 0x3d, 0x8c, 0x52, 0xb1, 0x5a, 0x25, 0xd3,
+  0x68, 0x76, 0x25, 0xda, 0x08, 0xc7, 0x4d, 0x80, 0x39, 0xfa, 0x7c, 0xd7, 0xfe, 0xea, 0x35, 0xe8, 0x49, 0x9d, 0xd8,
+  0xe2, 0x43, 0x85, 0xcc, 0xb2, 0xa6, 0x40, 0xe4, 0x0e, 0x63, 0xf8, 0x2b, 0x72, 0xa9, 0xf8, 0xfe, 0x7d, 0x47, 0x59,
+  0x71, 0x03, 0x20, 0x0e, 0x6e, 0x27, 0xf6, 0x2d, 0xba, 0xf5, 0x75, 0xc1, 0xb4, 0x9f, 0xd4, 0x67, 0xb3, 0x3c, 0xea,
+  0x16, 0xe8, 0x9b, 0xe5, 0xd2, 0xd4, 0xf9, 0xfe, 0xdc, 0x6c, 0x42, 0xe6, 0x33, 0x0e, 0xd5, 0x21, 0x09, 0x22, 0xc3,
+  0x14, 0x2c, 0x49, 0xad, 0xe8, 0xb4, 0xb8, 0x65, 0x9e, 0xa9, 0x5d, 0x6f, 0x95, 0x0e, 0x02, 0x39, 0x63, 0x0a, 0xa8,
+  0xe8, 0x51, 0x82, 0x1c, 0xa3, 0x8f, 0x20, 0xbf, 0x3e, 0x72, 0xee, 0x58, 0x24, 0x97, 0xe6, 0xc1, 0x84, 0x84, 0x6d,
+  0x32, 0x21, 0xe8, 0x4c, 0xd5, 0x98, 0xcf, 0xb5, 0x60, 0x85, 0xef, 0x3d, 0x99, 0x76, 0x55, 0x10, 0x46, 0x34, 0x05,
+  0x22, 0xc6, 0xf2, 0x06, 0x79, 0xaf, 0x33, 0x3f, 0x36, 0x08, 0xcb, 0xcd, 0xa4, 0xa5, 0xd5, 0xd7, 0xc8, 0x70, 0x4b,
+  0xe0, 0x78, 0x00, 0x6c, 0x67, 0xf6, 0x7d, 0xda, 0x0d, 0x7c, 0x5f, 0x09, 0x83, 0xc1, 0x6e, 0x0c, 0x51, 0x25, 0x1e,
+  0x2d, 0x4c, 0xee, 0xf7, 0xa9, 0xb6, 0x91, 0x1a, 0x38, 0xb7, 0x7c, 0xbd, 0x1c, 0x17, 0x4e, 0xb6, 0xc6, 0x23, 0x03,
+  0x39, 0x39, 0xa7, 0xee, 0x4e, 0x4d, 0x3a, 0x5f, 0xf5, 0x2e, 0xd0, 0x0c, 0x87, 0xea, 0xab, 0x4b, 0xbf, 0x5d, 0x1d,
+  0x4d, 0x27, 0x1e, 0x70, 0x3f, 0x2e, 0xf7, 0xf8, 0xa4, 0x2b, 0x45, 0xcb, 0x09, 0x6f, 0x5a, 0xcd, 0x08, 0xdc, 0x08,
+  0x17, 0xb0, 0x59, 0x53, 0xad, 0xb6, 0xbd, 0x8d, 0xb6, 0xa6, 0xb3, 0x13, 0xab, 0x00, 0xfe, 0x5e, 0x5b, 0xa7, 0xbd,
+  0xfa, 0xc4, 0x89, 0xb0, 0xcc, 0x88, 0x5c, 0xc4, 0xec, 0xc4, 0x73, 0x2c, 0x23, 0x14, 0x6c, 0x08, 0xe7, 0x8b, 0x9c,
+  0x83, 0x8c, 0xa8, 0xe6, 0x14, 0x37, 0x0d, 0xa0, 0xf9, 0x8b, 0xa9, 0x04, 0x1c, 0xfe, 0x2d, 0x08, 0x98, 0x5b, 0x16,
+  0x20, 0xf2, 0x20, 0xe0, 0x07, 0x58, 0xde, 0x7d, 0xa9, 0xda, 0x78, 0x02, 0x74, 0x92, 0x4b, 0xa3, 0x26, 0x2f, 0x27,
+  0xb3, 0xa0, 0xe1, 0x0c, 0x2e, 0xb1, 0x25, 0x34, 0x6f, 0xec, 0x02, 0xb5, 0xbd, 0x43, 0xf1, 0x8f, 0x81, 0xc8, 0xf0,
+  0x58, 0x8d, 0x61, 0x62, 0x37, 0x8d, 0x58, 0x1e, 0xe0, 0xed, 0x52, 0x15, 0x18, 0xd7, 0x99, 0x72, 0x8e, 0x85, 0x1b,
+  0xe8, 0x50, 0x67, 0x67, 0x77, 0xc5, 0x91, 0x54, 0xa4, 0x5a, 0x61, 0x72, 0x27, 0x09, 0x95, 0xa2, 0x73, 0x0d, 0xf9,
+  0x86, 0x6d, 0x7f, 0xb7, 0xad, 0x87, 0x5d, 0xd0, 0x6e, 0x3d, 0xeb, 0x0e, 0xab, 0xe9, 0x02, 0x26, 0x78, 0x22, 0x32,
+  0xb8, 0x3d, 0x70, 0x74, 0x5d, 0x86, 0x4b, 0xac, 0x6a, 0x43, 0xe5, 0x08, 0x60, 0x95, 0xc4, 0xcc, 0x74, 0xb4, 0x86,
+  0x06, 0x55, 0xa1, 0xbc, 0xfb, 0xc2, 0x28, 0x85, 0xc0, 0x62, 0x8d, 0xef, 0x47, 0x95, 0xa8, 0x4b, 0x53, 0x0a, 0x7f,
+  0xfe, 0x11, 0x49, 0xb7, 0xf2, 0xab, 0x38, 0xb5, 0x10, 0x32, 0xd9, 0xe5, 0x16, 0x78, 0xe2, 0xeb, 0xf7, 0xa9, 0xe9,
+  0x4b, 0xca, 0x41, 0xa4, 0x6f, 0x5f, 0x8c, 0x7a, 0x11, 0x3d, 0xfc, 0x3a, 0x7e, 0xa2, 0xc0, 0x0f, 0xd5, 0xd1, 0x02,
+  0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x02, 0x01, 0x00, 0xc1, 0xc1, 0xdf, 0xd1, 0xfc, 0x1f, 0x98, 0xfc, 0x0f, 0xb9,
+  0xc9, 0x05, 0x08, 0x7c, 0xeb, 0x8a, 0x79, 0x20, 0x92, 0x25, 0x0a, 0x1f, 0xb1, 0x09, 0x73, 0xc3, 0xdb, 0x4a, 0x82,
+  0xac, 0x1a, 0x84, 0x5b, 0x21, 0xbc, 0x7d, 0x5e, 0x6e, 0xa1, 0xff, 0x3e, 0xf2, 0x6f, 0xd6, 0x12, 0xb9, 0x4c, 0x98,
+  0x9f, 0x39, 0x12, 0x16, 0x20, 0xe7, 0x59, 0x2f, 0xe9, 0x55, 0xd5, 0x3c, 0x73, 0x60, 0x1d, 0xc5, 0xda, 0x4f, 0x6d,
+  0x1f, 0xcc, 0x5d, 0x34, 0x5c, 0xd5, 0x58, 0xd0, 0xf4, 0xbc, 0xf7, 0xcf, 0xbc, 0x8b, 0x6e, 0xbb, 0xb2, 0xd6, 0x86,
+  0x87, 0x47, 0x65, 0xd7, 0x4c, 0x38, 0x90, 0x67, 0x40, 0x89, 0xd9, 0x95, 0x5b, 0xad, 0x5e, 0x8b, 0x9a, 0xfa, 0x73,
+  0x16, 0x03, 0x2b, 0x38, 0xb4, 0xb7, 0x96, 0xbe, 0x23, 0x5f, 0x69, 0xe1, 0xd9, 0x10, 0x25, 0x26, 0x96, 0x4d, 0x78,
+  0x2f, 0x01, 0xdb, 0x69, 0x85, 0xf1, 0x15, 0xb4, 0x1c, 0x10, 0x2d, 0xa2, 0x87, 0x6d, 0x90, 0xa4, 0xe2, 0xbd, 0x2a,
+  0x65, 0xf2, 0x63, 0xc6, 0xbb, 0xc4, 0x80, 0x7f, 0x0b, 0x38, 0x71, 0xae, 0x5f, 0x22, 0xee, 0x23, 0xe9, 0x9a, 0x39,
+  0x83, 0x4c, 0xfc, 0x53, 0x9a, 0x79, 0xba, 0x8c, 0xf6, 0xcb, 0x5a, 0xdd, 0x5d, 0xbd, 0xea, 0xee, 0xf4, 0x7d, 0xfe,
+  0x96, 0x1a, 0xc5, 0x2b, 0x38, 0x7f, 0xfc, 0x03, 0x51, 0xb4, 0xe3, 0x9d, 0x04, 0xd6, 0x4d, 0x69, 0x8a, 0x6c, 0xdd,
+  0x28, 0x6b, 0x91, 0x21, 0xd3, 0xa0, 0xb7, 0x50, 0x7a, 0x69, 0x8b, 0xdc, 0xd7, 0xc1, 0xb1, 0x81, 0x75, 0x1f, 0x6f,
+  0x6a, 0xe6, 0x13, 0x6d, 0x6c, 0xf3, 0x64, 0x9d, 0xf7, 0x5d, 0x29, 0x95, 0x6f, 0x81, 0x45, 0x83, 0x91, 0xd5, 0x0c,
+  0xc8, 0x53, 0xff, 0xbc, 0x6b, 0x59, 0x0a, 0x3a, 0xa2, 0x7b, 0xb3, 0xbf, 0xdd, 0xfd, 0x96, 0x7a, 0x4e, 0x32, 0x15,
+  0x98, 0x88, 0xa7, 0xf8, 0x5a, 0x1c, 0x7b, 0x5c, 0xd5, 0xab, 0x63, 0xa8, 0xfa, 0x65, 0xcd, 0x02, 0x49, 0xc3, 0x86,
+  0x3b, 0x52, 0x50, 0x76, 0x0b, 0x65, 0x74, 0xfc, 0x1b, 0xa8, 0x08, 0xef, 0x50, 0xb6, 0xa8, 0x42, 0xc3, 0x4d, 0x50,
+  0x66, 0x19, 0x44, 0x9f, 0x03, 0xa7, 0x69, 0x10, 0x1e, 0x41, 0xac, 0x15, 0x66, 0xf8, 0x29, 0x22, 0xfd, 0x8d, 0x9a,
+  0xdb, 0x6c, 0x1a, 0x7f, 0x18, 0x48, 0x16, 0xed, 0xef, 0x48, 0x60, 0xf7, 0x40, 0xce, 0xb3, 0x98, 0xde, 0xac, 0x71,
+  0x07, 0x8a, 0x47, 0x8e, 0x6e, 0x08, 0xc0, 0x22, 0x55, 0x85, 0x26, 0xfd, 0xd4, 0x91, 0x98, 0x69, 0xe0, 0x89, 0x52,
+  0xc9, 0xe5, 0x4b, 0xdd, 0x44, 0xa8, 0x14, 0x07, 0x44, 0xcf, 0x4f, 0x0e, 0xf2, 0x92, 0x0d, 0xf7, 0x41, 0x67, 0xab,
+  0x0e, 0xda, 0x81, 0x2b, 0x09, 0xcb, 0xea, 0x40, 0x38, 0xe1, 0xc2, 0x04, 0x07, 0x94, 0xa8, 0x7b, 0xb7, 0x7a, 0x52,
+  0x97, 0x1d, 0xcb, 0x67, 0x4e, 0x67, 0xbb, 0xa9, 0xde, 0x5f, 0xf9, 0xc4, 0xdb, 0x90, 0x7e, 0xaa, 0xa9, 0x36, 0xeb,
+  0x05, 0x0d, 0x4d, 0x69, 0x6b, 0x81, 0x40, 0x76, 0xf9, 0x8a, 0x31, 0x75, 0xbe, 0x66, 0xdf, 0xf1, 0x97, 0xd9, 0x7f,
+  0x8a, 0xbf, 0xae, 0xec, 0x51, 0xfc, 0x1d, 0x62, 0x27, 0x8d, 0xe4, 0x84, 0xc4, 0x62, 0xf4, 0x1f, 0x4a, 0xf6, 0x41,
+  0x7f, 0x4f, 0xd3, 0x8d, 0xda, 0x0b, 0x04, 0x85, 0xde, 0xbf, 0xba, 0x2b, 0x70, 0x3a, 0xb7, 0x6c, 0xb7, 0x84, 0xca,
+  0xe6, 0x6a, 0x54, 0xf6, 0xdd, 0x99, 0xdf, 0xbb, 0x45, 0xa1, 0xa9, 0x81, 0x4c, 0x18, 0x4a, 0x03, 0xfc, 0x9b, 0xf7,
+  0x75, 0x1f, 0x5e, 0x4b, 0xc1, 0x0d, 0x0a, 0xd5, 0x5e, 0xb5, 0x11, 0x0b, 0xef, 0x54, 0x20, 0xdc, 0x68, 0x04, 0x25,
+  0x31, 0x58, 0x1b, 0xb7, 0xd9, 0x09, 0x80, 0x01, 0x02, 0x82, 0x01, 0x01, 0x00, 0xf3, 0x94, 0xdf, 0x22, 0xe1, 0x32,
+  0x89, 0x47, 0xbb, 0x42, 0x47, 0x54, 0x55, 0xa0, 0x3a, 0x21, 0x35, 0xb4, 0xea, 0x15, 0x17, 0xe9, 0x66, 0xd3, 0x0c,
+  0x8c, 0xac, 0xef, 0xd8, 0xc2, 0xff, 0x38, 0xdc, 0x0e, 0xc9, 0x3e, 0x0a, 0x6e, 0x86, 0x59, 0xa5, 0x38, 0x23, 0x6d,
+  0x7a, 0xd6, 0xdb, 0x38, 0xd0, 0x14, 0xa3, 0x91, 0x1b, 0xd2, 0xbb, 0x3e, 0x30, 0xad, 0x3d, 0x15, 0xb1, 0x95, 0xb4,
+  0x53, 0x00, 0xb3, 0x6e, 0x99, 0xd1, 0x90, 0x5a, 0x4b, 0x2b, 0x0d, 0x99, 0xf2, 0x2a, 0x2b, 0x72, 0x69, 0x2f, 0xe6,
+  0x2a, 0xfe, 0x3e, 0x7f, 0xcd, 0xb3, 0x2d, 0xc2, 0x5b, 0xff, 0x88, 0xed, 0x62, 0xc9, 0xf7, 0xf6, 0xfc, 0xb6, 0x80,
+  0xbd, 0x78, 0x80, 0xd4, 0x70, 0xdf, 0x89, 0x13, 0xc2, 0x43, 0x15, 0x10, 0x00, 0xc3, 0xe3, 0x47, 0xff, 0xd2, 0xf2,
+  0x71, 0xd4, 0x34, 0x22, 0xf5, 0xc4, 0xec, 0x8d, 0x35, 0x94, 0x0e, 0x8b, 0xdf, 0xf1, 0x48, 0xd6, 0xb1, 0xc5, 0x77,
+  0xee, 0xd4, 0x81, 0x37, 0x53, 0xdb, 0xe1, 0xe8, 0x32, 0xd0, 0x48, 0x97, 0xf8, 0xf6, 0x2f, 0x28, 0x4c, 0xa1, 0xdf,
+  0xcf, 0x5e, 0xd9, 0x5e, 0xc3, 0x34, 0x39, 0xf0, 0xb5, 0xe9, 0x44, 0x6f, 0x8d, 0x1b, 0x44, 0x4c, 0xfe, 0xe3, 0xcf,
+  0x9c, 0x8d, 0xca, 0xb7, 0x9b, 0x85, 0xb2, 0xa9, 0x13, 0x0a, 0x29, 0x12, 0xde, 0xb5, 0xf6, 0x80, 0xc4, 0x7b, 0x8f,
+  0x84, 0xe0, 0xbe, 0x2e, 0x09, 0x3f, 0xe3, 0x8b, 0x51, 0x32, 0x66, 0x1c, 0x5d, 0xfa, 0xf8, 0xc1, 0x21, 0x7d, 0x41,
+  0xcf, 0xbc, 0x7b, 0xd4, 0x26, 0xe7, 0xd2, 0xda, 0x52, 0xdf, 0xf9, 0x6e, 0x26, 0x52, 0xb7, 0x97, 0x67, 0x02, 0xee,
+  0xda, 0x18, 0x28, 0xfd, 0x05, 0x37, 0xbe, 0x90, 0x3d, 0x7f, 0x8a, 0xbd, 0x28, 0xa7, 0xef, 0x76, 0x7e, 0xf7, 0xe7,
+  0xd2, 0xca, 0xf1, 0x02, 0x82, 0x01, 0x01, 0x00, 0xdd, 0x99, 0xb8, 0xf4, 0x67, 0x52, 0x0a, 0x32, 0x8f, 0x48, 0x9f,
+  0xd5, 0x25, 0x74, 0x46, 0x96, 0x28, 0x75, 0x7c, 0xce, 0xa2, 0x7c, 0xa7, 0x78, 0xd2, 0x14, 0x49, 0x02, 0x26, 0x78,
+  0xb8, 0x19, 0xd4, 0x3a, 0x92, 0x1d, 0xee, 0xf2, 0x13, 0x12, 0x85, 0x64, 0x35, 0x21, 0x97, 0xb2, 0xcf, 0xc0, 0xf1,
+  0x3d, 0x8a, 0x16, 0xed, 0x4e, 0xf3, 0xcb, 0x15, 0xc3, 0x84, 0x68, 0xa5, 0x45, 0xea, 0x48, 0x10, 0x82, 0xba, 0x9a,
+  0xc4, 0x58, 0xe0, 0xe9, 0x78, 0x61, 0x58, 0x13, 0xd4, 0x13, 0x37, 0x96, 0xdd, 0x03, 0x06, 0xc1, 0xeb, 0x86, 0xa6,
+  0x82, 0x22, 0x33, 0x18, 0x85, 0xb2, 0xa2, 0x8f, 0x36, 0x3b, 0xcb, 0x2b, 0xf2, 0x07, 0xd0, 0x5a, 0x81, 0x0f, 0x26,
+  0xeb, 0xed, 0x51, 0xc9, 0xbd, 0xbc, 0x03, 0x62, 0x74, 0x10, 0xb6, 0xda, 0x86, 0xfc, 0x6f, 0x12, 0x75, 0xe9, 0x43,
+  0x3f, 0x2e, 0x9a, 0x23, 0xc6, 0x9d, 0xc6, 0x31, 0x18, 0x41, 0x5a, 0x46, 0xf2, 0x76, 0x9a, 0x43, 0x99, 0x23, 0x61,
+  0xc0, 0x44, 0x62, 0xe2, 0xa2, 0xdf, 0x8e, 0x47, 0x30, 0xcb, 0xc2, 0x05, 0x6d, 0xb9, 0xb9, 0x51, 0xb8, 0xd8, 0xc9,
+  0x06, 0xab, 0xdd, 0x6d, 0x03, 0xbe, 0x01, 0x12, 0x01, 0x4e, 0x9d, 0x85, 0x1d, 0x22, 0x50, 0xda, 0xfa, 0x6b, 0x21,
+  0x04, 0xec, 0xaf, 0x5f, 0x76, 0xf4, 0xe6, 0x2c, 0x02, 0xf5, 0x41, 0xe2, 0x6f, 0xfb, 0x7f, 0xc3, 0x3a, 0x34, 0xde,
+  0xc8, 0x06, 0x61, 0x1c, 0xed, 0x2d, 0x66, 0x74, 0x13, 0xe1, 0x20, 0xd6, 0x83, 0xea, 0xe6, 0x83, 0xf7, 0xcb, 0xd1,
+  0xca, 0xe9, 0xfc, 0xcd, 0x21, 0xe9, 0x47, 0xdd, 0xaf, 0x17, 0x98, 0xb0, 0x5d, 0x9b, 0x8c, 0x3e, 0xd8, 0xe4, 0x11,
+  0xdd, 0x0c, 0xbc, 0x2f, 0xa1, 0x3a, 0x8f, 0x10, 0xcb, 0x24, 0xfd, 0x58, 0x8f, 0x6a, 0x52, 0xf8, 0xe1, 0x02, 0x82,
+  0x01, 0x00, 0x02, 0x50, 0xc4, 0xfa, 0x40, 0xe7, 0xc9, 0x14, 0x4c, 0x7c, 0x69, 0xcf, 0x2c, 0x6d, 0x34, 0x80, 0x42,
+  0x51, 0x70, 0xf4, 0x38, 0x60, 0xf8, 0xa0, 0x42, 0xfb, 0x47, 0x5d, 0x94, 0x52, 0xee, 0x38, 0x2d, 0x27, 0x5a, 0xd4,
+  0x63, 0x26, 0xff, 0xd1, 0xf4, 0x57, 0x1f, 0x47, 0x18, 0x26, 0xd8, 0xb8, 0xa6, 0x89, 0xbb, 0xb0, 0x52, 0x72, 0x63,
+  0x63, 0x48, 0xf5, 0x2c, 0xa2, 0x7b, 0x28, 0xb0, 0x29, 0x25, 0xd5, 0x8e, 0xd4, 0x99, 0x80, 0x64, 0xcb, 0x58, 0x22,
+  0x6d, 0xf7, 0x36, 0x5d, 0x69, 0x5e, 0x04, 0x9d, 0x8c, 0x85, 0x14, 0x35, 0x04, 0xd0, 0x92, 0x3b, 0xc9, 0xc2, 0x19,
+  0x1c, 0x20, 0x97, 0x48, 0xeb, 0x29, 0x25, 0xd6, 0xfd, 0x76, 0x1a, 0xcb, 0x6a, 0x33, 0x45, 0xcb, 0x51, 0x4a, 0x6f,
+  0xf5, 0xd1, 0xfc, 0x0a, 0xba, 0x11, 0x7d, 0x80, 0xde, 0x82, 0x24, 0xe8, 0xbc, 0x2b, 0x5e, 0x10, 0x4d, 0x95, 0x15,
+  0xba, 0x50, 0xab, 0xab, 0x84, 0x96, 0xf6, 0x08, 0x98, 0xd5, 0x9e, 0x50, 0xd7, 0x54, 0x3c, 0xc6, 0x87, 0x4d, 0x21,
+  0x93, 0x88, 0x43, 0x56, 0xd9, 0x6c, 0x39, 0x11, 0xb6, 0x97, 0xf1, 0x3b, 0x0c, 0x61, 0xff, 0xb7, 0x01, 0x13, 0xb1,
+  0x99, 0xd9, 0xde, 0x8b, 0x7c, 0xab, 0xe3, 0xa0, 0x82, 0x9d, 0x7a, 0x72, 0xda, 0x60, 0x9f, 0xfd, 0x29, 0x78, 0x2c,
+  0x41, 0xc8, 0xaa, 0x34, 0x28, 0xaf, 0x35, 0x79, 0x7c, 0xca, 0xe2, 0x23, 0xef, 0xe4, 0x92, 0x96, 0x2d, 0x74, 0x6c,
+  0x32, 0x12, 0xd6, 0xa2, 0xec, 0xbb, 0x13, 0xc4, 0xbf, 0x63, 0xcc, 0x4d, 0x8c, 0xfd, 0x21, 0x2d, 0x00, 0x22, 0xae,
+  0xed, 0x54, 0x21, 0xef, 0x2a, 0xda, 0x48, 0xd5, 0xda, 0x6e, 0xe6, 0x5c, 0xd9, 0x62, 0xd9, 0x45, 0xe7, 0xbf, 0xc1,
+  0xa2, 0xe0, 0xb3, 0x0f, 0xfc, 0xb1, 0x62, 0x4b, 0xea, 0xde, 0x11, 0x02, 0x82, 0x01, 0x01, 0x00, 0xa4, 0x5c, 0x9d,
+  0x4b, 0x61, 0xca, 0xfe, 0xd7, 0x4b, 0x61, 0x41, 0x73, 0x95, 0x89, 0x2d, 0xc5, 0xb8, 0x12, 0x94, 0x54, 0xab, 0x3e,
+  0x2b, 0xf5, 0x38, 0x54, 0x65, 0x66, 0x5b, 0xe4, 0x94, 0x20, 0x4c, 0x42, 0x79, 0x18, 0x0c, 0x9f, 0xae, 0x37, 0xc1,
+  0x8a, 0x76, 0xc2, 0x08, 0xc3, 0x4e, 0xc6, 0xbb, 0xe7, 0xba, 0x21, 0x91, 0x38, 0x4b, 0x28, 0xe9, 0x66, 0x90, 0x32,
+  0x11, 0xcb, 0xce, 0x9e, 0x4e, 0xe8, 0xb7, 0xc1, 0x8d, 0x3a, 0xa2, 0xef, 0x68, 0x23, 0x43, 0x71, 0xc9, 0x8d, 0xcb,
+  0x60, 0x71, 0x63, 0x0a, 0x43, 0x11, 0x0f, 0x59, 0x37, 0x12, 0x68, 0xb5, 0x9a, 0x8c, 0xc9, 0x77, 0xd1, 0x70, 0xfe,
+  0x1c, 0x05, 0x33, 0x78, 0x7d, 0x78, 0x56, 0x25, 0xb7, 0x3d, 0xd9, 0xb8, 0xf9, 0xaa, 0x97, 0x14, 0x12, 0x24, 0x47,
+  0x8b, 0xc4, 0x2d, 0x3d, 0xb1, 0x02, 0x95, 0xd6, 0x13, 0xe9, 0xdb, 0xd8, 0x07, 0x3c, 0x04, 0xc1, 0x6b, 0x4d, 0x25,
+  0xc9, 0x93, 0x93, 0x16, 0x8e, 0x66, 0xea, 0x50, 0x59, 0x8c, 0x1f, 0x90, 0x1b, 0xe0, 0x16, 0xa6, 0x84, 0xf1, 0xcc,
+  0x61, 0xbc, 0x65, 0xd1, 0xa7, 0x64, 0xa4, 0x1e, 0x4e, 0x7d, 0x71, 0x09, 0xa7, 0x89, 0xe9, 0x3f, 0x52, 0x8a, 0xdd,
+  0xd8, 0xda, 0xa8, 0x16, 0x32, 0xa5, 0x24, 0x8a, 0x64, 0x1d, 0xad, 0x61, 0xf0, 0x58, 0x6a, 0xd4, 0x60, 0x09, 0x4b,
+  0x29, 0xc9, 0x87, 0x4f, 0xd7, 0x1c, 0xb8, 0x14, 0x39, 0x66, 0x49, 0xe7, 0x6b, 0x9f, 0x8d, 0xeb, 0x30, 0xc7, 0x7d,
+  0x54, 0xbe, 0x99, 0x9f, 0x0a, 0x68, 0xe3, 0xdb, 0x22, 0x56, 0xf4, 0xf3, 0xad, 0x60, 0x5a, 0xb6, 0x79, 0x64, 0xd6,
+  0x12, 0x92, 0x0b, 0x8a, 0x35, 0x1f, 0x27, 0xe2, 0x7c, 0x03, 0x33, 0x1d, 0x5c, 0xc7, 0x93, 0x4f, 0x90, 0x6d, 0x4a,
+  0x1f, 0xc2, 0x97, 0xc9, 0x1c, 0xe1, 0x02, 0x82, 0x01, 0x01, 0x00, 0xbd, 0xce, 0xd4, 0x72, 0xa0, 0xe6, 0x7c, 0x12,
+  0xee, 0x9e, 0x81, 0x18, 0x25, 0x07, 0x9e, 0x43, 0xb5, 0x98, 0x08, 0xa8, 0x8d, 0x82, 0x8c, 0x2b, 0x43, 0xa1, 0x85,
+  0xe1, 0xf5, 0x03, 0x56, 0xd6, 0x9c, 0xbe, 0x3a, 0xc5, 0x04, 0x18, 0x78, 0x32, 0xd3, 0xbf, 0xdf, 0xfb, 0x03, 0xf4,
+  0x2d, 0x21, 0xd3, 0xef, 0x84, 0xfe, 0xa5, 0xeb, 0xe6, 0xa2, 0x37, 0x2c, 0xf6, 0xdb, 0x09, 0xaf, 0x51, 0x44, 0x05,
+  0x10, 0xa7, 0xaa, 0x41, 0xcb, 0x87, 0x95, 0xd1, 0x5a, 0xcc, 0x61, 0x0c, 0x66, 0x95, 0x65, 0x4c, 0x11, 0x61, 0x80,
+  0x9b, 0x73, 0xb2, 0x9d, 0x8e, 0xbe, 0xaf, 0x20, 0xb7, 0x6a, 0x2a, 0x46, 0x1b, 0x3f, 0xdc, 0x87, 0x1e, 0x9d, 0xbd,
+  0xa7, 0x07, 0x22, 0xab, 0xc4, 0xd0, 0x91, 0x9c, 0xc8, 0x02, 0x24, 0x1c, 0x68, 0xe3, 0x20, 0xc7, 0x03, 0x59, 0x12,
+  0xee, 0xe2, 0x88, 0xc8, 0x6c, 0xc7, 0x60, 0x19, 0xea, 0x5f, 0x56, 0x31, 0xca, 0x73, 0x1c, 0xee, 0x97, 0x2e, 0xbb,
+  0x3c, 0x44, 0x16, 0x47, 0xb6, 0x6d, 0x39, 0x06, 0xad, 0x1a, 0x27, 0x7a, 0x35, 0x70, 0x8c, 0x8f, 0x4b, 0x5e, 0x97,
+  0xf0, 0x82, 0x9a, 0xe0, 0x4b, 0x7e, 0x89, 0xb2, 0x4f, 0x61, 0xa6, 0x45, 0x25, 0x61, 0x06, 0xdd, 0x65, 0x1b, 0x7f,
+  0x9a, 0x50, 0xdc, 0xbd, 0x05, 0xf7, 0xd1, 0x4d, 0x84, 0x5a, 0x30, 0xcf, 0xcd, 0x63, 0x9e, 0x4a, 0x06, 0x03, 0x30,
+  0x1a, 0xea, 0x43, 0x2a, 0x35, 0xd9, 0xf4, 0xfe, 0x34, 0xec, 0xc5, 0x04, 0x15, 0x07, 0x7c, 0x1e, 0xa4, 0xcd, 0x2c,
+  0x76, 0x69, 0x96, 0x2a, 0xf8, 0xf2, 0x70, 0x55, 0x18, 0x66, 0xbe, 0x42, 0x28, 0xf8, 0x12, 0x51, 0x2a, 0xc8, 0xcc,
+  0x78, 0xce, 0x31, 0x0d, 0xb2, 0xb6, 0x2e, 0x9c, 0xf3, 0x48, 0xd9, 0x74, 0x2b, 0x53, 0xb3, 0x57, 0x57, 0x38, 0x83,
+  0x00};
 #else
-    0x30, 0x82, 0x04, 0xbc, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
-    0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x04, 0x82, 0x04,
-    0xa6, 0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01,
-    0x00, 0xb8, 0xb5, 0x0f, 0x49, 0x46, 0xb5, 0x5d, 0x58, 0x04, 0x8e, 0x52,
-    0x59, 0x39, 0xdf, 0xd6, 0x29, 0x45, 0x6b, 0x6c, 0x96, 0xbb, 0xab, 0xa5,
-    0x6f, 0x72, 0x1b, 0x16, 0x96, 0x74, 0xd5, 0xf9, 0xb4, 0x41, 0xa3, 0x7c,
-    0xe1, 0x94, 0x73, 0x4b, 0xa7, 0x23, 0xff, 0x61, 0xeb, 0xce, 0x5a, 0xe7,
-    0x7f, 0xe3, 0x74, 0xe8, 0x52, 0x5b, 0xd6, 0x5d, 0x5c, 0xdc, 0x98, 0x49,
-    0xfe, 0x51, 0xc2, 0x7e, 0x8f, 0x3b, 0x37, 0x5c, 0xb3, 0x11, 0xed, 0x85,
-    0x91, 0x15, 0x92, 0x24, 0xd8, 0xf1, 0x7b, 0x3d, 0x2f, 0x8b, 0xcd, 0x1b,
-    0x30, 0x14, 0xa3, 0x6b, 0x1b, 0x4d, 0x27, 0xff, 0x6a, 0x58, 0x84, 0x9e,
-    0x79, 0x94, 0xca, 0x78, 0x64, 0x01, 0x33, 0xc3, 0x58, 0xfc, 0xd3, 0x83,
-    0xeb, 0x2f, 0xab, 0x6f, 0x85, 0x5a, 0x38, 0x41, 0x3d, 0x73, 0x20, 0x1b,
-    0x82, 0xbc, 0x7e, 0x76, 0xde, 0x5c, 0xfe, 0x42, 0xd6, 0x7b, 0x86, 0x4f,
-    0x79, 0x78, 0x29, 0x82, 0x87, 0xa6, 0x24, 0x43, 0x39, 0x74, 0xfe, 0xf2,
-    0x0c, 0x08, 0xbe, 0xfa, 0x1e, 0x0a, 0x48, 0x6f, 0x14, 0x86, 0xc5, 0xcd,
-    0x9a, 0x98, 0x09, 0x2d, 0xf3, 0xf3, 0x5a, 0x7a, 0xa4, 0xe6, 0x8a, 0x2e,
-    0x49, 0x8a, 0xde,
-    0x73, 0xe9, 0x37, 0xa0, 0x5b, 0xef, 0xd0, 0xe0, 0x13, 0xac, 0x88, 0x5f,
-    0x59, 0x47, 0x96, 0x7f, 0x78, 0x18, 0x0e, 0x44, 0x6a, 0x5d, 0xec,
-    0x6e, 0xed, 0x4f, 0xf6, 0x6a, 0x7a, 0x58, 0x6b, 0xfe, 0x6c, 0x5a, 0xb9,
-    0xd2, 0x22, 0x3a, 0x1f, 0xdf, 0xc3, 0x09, 0x3f, 0x6b, 0x2e, 0xf1, 0x6d,
-    0xc3, 0xfb, 0x4e, 0xd4, 0xf2, 0xa3, 0x94, 0x13, 0xb0, 0xbf, 0x1e, 0x06,
-    0x2e, 0x29, 0x55, 0x00, 0xaa, 0x98, 0xd9, 0xe8, 0x77, 0x84, 0x8b, 0x3f,
-    0x5f, 0x5e, 0xf7, 0xf8, 0xa7, 0xe6, 0x02, 0xd2, 0x18, 0xb0, 0x52, 0xd0,
-    0x37, 0x2e, 0x53, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00,
-    0x0c, 0xdf, 0xd1, 0xe8, 0xf1, 0x9c, 0xc2, 0x9c, 0xd7, 0xf4, 0x73, 0x98,
-    0xf4, 0x87, 0xbd, 0x8d, 0xb2, 0xe1, 0x01, 0xf8, 0x9f, 0xac, 0x1f, 0x23,
-    0xdd, 0x78, 0x35, 0xe2, 0xd6, 0xd1, 0xf3, 0x4d, 0xb5, 0x25, 0x88, 0x16,
-    0xd1, 0x1a, 0x18, 0x33, 0xd6, 0x36, 0x7e, 0xc4, 0xc8, 0xe5, 0x5d, 0x2d,
-    0x74, 0xd5, 0x39, 0x3c, 0x44, 0x5a, 0x74, 0xb7, 0x7c, 0x48, 0xc1, 0x1f,
-    0x90, 0xe3, 0x55, 0x9e, 0xf6, 0x29, 0xad, 0xb4, 0x6d, 0x93, 0x78, 0xb3,
-    0xdc, 0x25, 0x0b, 0x9c, 0x73, 0x78, 0x7b, 0x93, 0x4c, 0xd3, 0x47, 0x09,
-    0xda, 0xe6, 0x69, 0x18, 0xc6, 0x0f, 0xfb, 0xa5, 0x95, 0xf5, 0xe8, 0x75,
-    0xe1, 0x01, 0x1b, 0xd3, 0x1c, 0xa2, 0x57, 0x03, 0x64, 0xdb, 0xf9, 0x5d,
-    0xf3, 0x3c, 0xa7, 0xd1, 0x4b, 0xb0, 0x90, 0x1b, 0x90, 0x62, 0xb4, 0x88,
-    0x30, 0x4b, 0x40, 0x4d, 0xcf, 0x7d, 0x89, 0x7a, 0xfb, 0x29, 0xc9, 0x64,
-    0x34, 0x0a, 0x52, 0xf6, 0x70, 0x7c, 0x76, 0x5a, 0x2e, 0x8f, 0x50, 0xd4,
-    0x92, 0x15, 0x97, 0xed, 0x4c, 0x2e, 0xf2, 0x3a, 0xd0, 0x58, 0x7e, 0xdb,
-    0xf1, 0xf4, 0xdd, 0x07, 0x76, 0x04, 0xf0, 0x55, 0x8b, 0x72, 0x2b, 0xa7,
-    0xa8, 0x78, 0x78, 0x67, 0xe6, 0xd8, 0xa5, 0xde, 0xe7, 0xc9, 0x1f, 0x5a,
-    0xa0, 0x89, 0xc7, 0x24, 0xa2, 0x71, 0xb6, 0x7b, 0x3b, 0xe6, 0x92, 0x69,
-    0x22, 0xaa, 0xe2, 0x47, 0x4b, 0x80, 0x3f, 0x6a, 0xab, 0xce, 0x4e, 0xcd,
-    0xe8, 0x94, 0x6c, 0xf7, 0x84, 0x73, 0x85, 0xfd, 0x85, 0x1d, 0xae, 0x81,
-    0xf7, 0xec, 0x12, 0x31, 0x7d, 0xc1, 0x99, 0xc0, 0x3c, 0x51, 0xb0, 0xdc,
-    0xb0, 0xba, 0x9c, 0x84, 0xb8, 0x70, 0xc2, 0x09, 0x7f, 0x96, 0x3d, 0xa1,
-    0xe2, 0x64, 0x27, 0x7a, 0x22, 0xb8, 0x75, 0xb9, 0xd1, 0x5f, 0xa5, 0x23,
-    0xf9, 0x62, 0xe0, 0x41, 0x02, 0x81, 0x81, 0x00, 0xf4, 0xf3, 0x08, 0xcf,
-    0x83, 0xb0, 0xab, 0xf2, 0x0f, 0x1a, 0x08, 0xaf, 0xc2, 0x42, 0x29, 0xa7,
-    0x9c, 0x5e, 0x52, 0x19, 0x69, 0x8d, 0x5b, 0x52, 0x29, 0x9c, 0x06, 0x6a,
-    0x5a, 0x32, 0x8f, 0x08, 0x45, 0x6c, 0x43, 0xb5, 0xac, 0xc3, 0xbb, 0x90,
-    0x7b, 0xec, 0xbb, 0x5d, 0x71, 0x25, 0x82, 0xf8, 0x40, 0xbf, 0x38, 0x00,
-    0x20, 0xf3, 0x8a, 0x38, 0x43, 0xde, 0x04, 0x41, 0x19, 0x5f, 0xeb, 0xb0,
-    0x50, 0x59, 0x10, 0xe1, 0x54, 0x62, 0x5c, 0x93, 0xd9, 0xdc, 0x63, 0x24,
-    0xd0, 0x17, 0x00, 0xc0, 0x44, 0x3e, 0xfc, 0xd1, 0xda, 0x4b, 0x24, 0xf7,
-    0xcb, 0x16, 0x35, 0xe6, 0x9f, 0x67, 0x96, 0x5f, 0xb0, 0x94, 0xde, 0xfa,
-    0xa1, 0xfd, 0x8c, 0x8a, 0xd1, 0x5c, 0x02, 0x8d, 0xe0, 0xa0, 0xa0, 0x02,
-    0x1d, 0x56, 0xaf, 0x13, 0x3a, 0x65, 0x5e, 0x8e, 0xde, 0xd1, 0xa8, 0x28,
-    0x8b, 0x71, 0xc9, 0x65, 0x02, 0x81, 0x81, 0x00, 0xc1, 0x0a, 0x47,
-    0x39, 0x91, 0x06, 0x1e, 0xb9, 0x43, 0x7c, 0x9e, 0x97, 0xc5, 0x09, 0x08,
-    0xbc, 0x22, 0x47, 0xe2, 0x96, 0x8e, 0x1c, 0x74, 0x80, 0x50, 0x6c, 0x9f,
-    0xef, 0x2f, 0xe5, 0x06, 0x3e, 0x73, 0x66, 0x76, 0x02, 0xbd, 0x9a, 0x1c,
-    0xfc, 0xf9, 0x6a, 0xb8, 0xf9, 0x36, 0x15, 0xb5, 0x20, 0x0b, 0x6b, 0x54,
-    0x83, 0x9c, 0x86, 0xba, 0x13, 0xb7, 0x99, 0x54, 0xa0, 0x93, 0x0d, 0xd6,
-    0x1e, 0xc1, 0x12, 0x72, 0x0d, 0xea, 0xb0, 0x14, 0x30, 0x70, 0x73, 0xef,
-    0x6b, 0x4c, 0xae, 0xb6, 0xff, 0xd4, 0xbb, 0x89, 0xa1, 0xec, 0xca, 0xa6,
-    0xe9, 0x95, 0x56, 0xac, 0xe2, 0x9b, 0x97, 0x2f, 0x2c, 0xdf, 0xa3, 0x6e,
-    0x59, 0xff, 0xcd, 0x3c, 0x6f, 0x57, 0xcc, 0x6e, 0x44, 0xc4, 0x27, 0xbf,
-    0xc3, 0xdd, 0x19, 0x9e, 0x81, 0x16, 0xe2, 0x8f, 0x65, 0x34, 0xa7, 0x0f,
-    0x22, 0xba, 0xbf, 0x79, 0x57, 0x02, 0x81, 0x80, 0x2e, 0x21, 0x0e, 0xc9,
-    0xb5, 0xad, 0x31, 0xd4, 0x76, 0x0f, 0x9b, 0x0f, 0x2e, 0x70, 0x33, 0x54,
-    0x03, 0x58, 0xa7, 0xf1, 0x6d, 0x35, 0x57, 0xbb, 0x53, 0x66, 0xb4, 0xb6,
-    0x96, 0xa1, 0xea, 0xd9, 0xcd, 0xe9, 0x23, 0x9f, 0x35, 0x17, 0xef, 0x5c,
-    0xb8, 0x59, 0xce, 0xb7, 0x3c, 0x35, 0xaa, 0x42, 0x82, 0x3f, 0x00, 0x96,
-    0xd5, 0x9d, 0xc7, 0xab, 0xec, 0xec, 0x04, 0xb5, 0x15, 0xc8, 0x40, 0xa4,
-    0x85, 0x9d, 0x20, 0x56, 0xaf, 0x03, 0x8f, 0x17, 0xb0, 0xf1, 0x96, 0x22,
-    0x3a, 0xa5, 0xfa, 0x58, 0x3b, 0x01, 0xf9, 0xae, 0xb3, 0x83, 0x6f, 0x44,
-    0xd3, 0x14, 0x2d, 0xb6, 0x6e, 0xd2, 0x9d, 0x39, 0x0c, 0x12, 0x1d, 0x23,
-    0xea, 0x19, 0xcb, 0xbb, 0xe0, 0xcd, 0x89, 0x15, 0x9a, 0xf5, 0xe4, 0xec,
-    0x41, 0x06, 0x30, 0x16, 0x58, 0xea, 0xfa, 0x31, 0xc1, 0xb8, 0x8e, 0x08,
-    0x84, 0xaa, 0x3b, 0x19, 0x02, 0x81, 0x80, 0x70, 0x4c, 0xf8, 0x6e, 0x86,
-    0xed, 0xd6, 0x85, 0xd4, 0xba, 0xf4, 0xd0, 0x3a, 0x32, 0x2d, 0x40, 0xb5,
-    0x78, 0xb8, 0x5a, 0xf9, 0xc5, 0x98, 0x08, 0xe5, 0xc0, 0xab, 0xb2, 0x4c,
-    0x5c, 0xa2, 0x2b, 0x46, 0x9b, 0x3e, 0xe0, 0x0d, 0x49, 0x50, 0xbf, 0xe2,
-    0xa1, 0xb1, 0x86, 0x59, 0x6e, 0x7b, 0x76, 0x6e, 0xee, 0x3b, 0xb6, 0x6d,
-    0x22, 0xfb, 0xb1, 0x68, 0xc7, 0xec, 0xb1, 0x95, 0x9b, 0x21, 0x0b, 0xb7,
-    0x2a, 0x71, 0xeb, 0xa2, 0xb2, 0x58, 0xac, 0x6d, 0x5f, 0x24, 0xd3, 0x79,
-    0x42, 0xd2, 0xf7, 0x35, 0xdc, 0xfc, 0x0e, 0x95, 0x60, 0xb7, 0x85, 0x7f,
-    0xf9, 0x72, 0x8e, 0x4a, 0x11, 0xc3, 0xc2, 0x09, 0x40, 0x5c, 0x7c, 0x43,
-    0x12, 0x34, 0xac, 0x59, 0x99, 0x76, 0x34, 0xcf,
-    0x20, 0x88, 0xb0, 0xfb, 0x39, 0x62, 0x3a, 0x9b, 0x03, 0xa6, 0x84, 0x2c,
-    0x03, 0x5c, 0x0c, 0xca, 0x33, 0x85, 0xf5, 0x02, 0x81, 0x80, 0x56,
-    0x99, 0xe9, 0x17, 0xdc, 0x33, 0xe1, 0x33, 0x8d, 0x5c, 0xba, 0x17, 0x32,
-    0xb7, 0x8c, 0xbd, 0x4b, 0x7f, 0x42, 0x3a, 0x79, 0x90, 0xe3, 0x70,
-    0xe3, 0x27, 0xce, 0x22, 0x59, 0x02, 0xc0, 0xb1, 0x0e, 0x57, 0xf5, 0xdf,
-    0x07, 0xbf, 0xf8, 0x4e, 0x10, 0xef, 0x2a, 0x62, 0x30, 0x03, 0xd4,
-    0x80, 0xcf, 0x20, 0x84, 0x25, 0x66, 0x3f, 0xc7, 0x4f, 0x56, 0x8c, 0x1e,
-    0xe1, 0x18, 0x91, 0xc1, 0xfd, 0x71, 0x5f, 0x65, 0x9b, 0xe4, 0x4f,
-    0xe0, 0x1a, 0x3a, 0xf8, 0xc1, 0x69, 0xdb, 0xd3, 0xbb, 0x8d, 0x91, 0xd1,
-    0x11, 0x4f, 0x7e, 0x91, 0x1b, 0xb4, 0x27, 0xa5, 0xab, 0x7c, 0x7b,
-    0x76, 0xd4, 0x78, 0xfe, 0x63, 0x44, 0x63, 0x7e, 0xe3, 0xa6, 0x60, 0x4f,
-    0xb9, 0x55, 0x28, 0xba, 0xba, 0x83, 0x1a, 0x2d, 0x43, 0xd5, 0xf7,
-    0x2e, 0xe0, 0xfc, 0xa8, 0x14, 0x9b, 0x91, 0x2a, 0x36, 0xbf, 0xc7, 0x14 };
+  0x30, 0x82, 0x04, 0xbc, 0x02, 0x01, 0x00, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
+  0x01, 0x05, 0x00, 0x04, 0x82, 0x04, 0xa6, 0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, 0x00, 0x02, 0x82, 0x01, 0x01, 0x00,
+  0xb8, 0xb5, 0x0f, 0x49, 0x46, 0xb5, 0x5d, 0x58, 0x04, 0x8e, 0x52, 0x59, 0x39, 0xdf, 0xd6, 0x29, 0x45, 0x6b, 0x6c,
+  0x96, 0xbb, 0xab, 0xa5, 0x6f, 0x72, 0x1b, 0x16, 0x96, 0x74, 0xd5, 0xf9, 0xb4, 0x41, 0xa3, 0x7c, 0xe1, 0x94, 0x73,
+  0x4b, 0xa7, 0x23, 0xff, 0x61, 0xeb, 0xce, 0x5a, 0xe7, 0x7f, 0xe3, 0x74, 0xe8, 0x52, 0x5b, 0xd6, 0x5d, 0x5c, 0xdc,
+  0x98, 0x49, 0xfe, 0x51, 0xc2, 0x7e, 0x8f, 0x3b, 0x37, 0x5c, 0xb3, 0x11, 0xed, 0x85, 0x91, 0x15, 0x92, 0x24, 0xd8,
+  0xf1, 0x7b, 0x3d, 0x2f, 0x8b, 0xcd, 0x1b, 0x30, 0x14, 0xa3, 0x6b, 0x1b, 0x4d, 0x27, 0xff, 0x6a, 0x58, 0x84, 0x9e,
+  0x79, 0x94, 0xca, 0x78, 0x64, 0x01, 0x33, 0xc3, 0x58, 0xfc, 0xd3, 0x83, 0xeb, 0x2f, 0xab, 0x6f, 0x85, 0x5a, 0x38,
+  0x41, 0x3d, 0x73, 0x20, 0x1b, 0x82, 0xbc, 0x7e, 0x76, 0xde, 0x5c, 0xfe, 0x42, 0xd6, 0x7b, 0x86, 0x4f, 0x79, 0x78,
+  0x29, 0x82, 0x87, 0xa6, 0x24, 0x43, 0x39, 0x74, 0xfe, 0xf2, 0x0c, 0x08, 0xbe, 0xfa, 0x1e, 0x0a, 0x48, 0x6f, 0x14,
+  0x86, 0xc5, 0xcd, 0x9a, 0x98, 0x09, 0x2d, 0xf3, 0xf3, 0x5a, 0x7a, 0xa4, 0xe6, 0x8a, 0x2e, 0x49, 0x8a, 0xde, 0x73,
+  0xe9, 0x37, 0xa0, 0x5b, 0xef, 0xd0, 0xe0, 0x13, 0xac, 0x88, 0x5f, 0x59, 0x47, 0x96, 0x7f, 0x78, 0x18, 0x0e, 0x44,
+  0x6a, 0x5d, 0xec, 0x6e, 0xed, 0x4f, 0xf6, 0x6a, 0x7a, 0x58, 0x6b, 0xfe, 0x6c, 0x5a, 0xb9, 0xd2, 0x22, 0x3a, 0x1f,
+  0xdf, 0xc3, 0x09, 0x3f, 0x6b, 0x2e, 0xf1, 0x6d, 0xc3, 0xfb, 0x4e, 0xd4, 0xf2, 0xa3, 0x94, 0x13, 0xb0, 0xbf, 0x1e,
+  0x06, 0x2e, 0x29, 0x55, 0x00, 0xaa, 0x98, 0xd9, 0xe8, 0x77, 0x84, 0x8b, 0x3f, 0x5f, 0x5e, 0xf7, 0xf8, 0xa7, 0xe6,
+  0x02, 0xd2, 0x18, 0xb0, 0x52, 0xd0, 0x37, 0x2e, 0x53, 0x02, 0x03, 0x01, 0x00, 0x01, 0x02, 0x82, 0x01, 0x00, 0x0c,
+  0xdf, 0xd1, 0xe8, 0xf1, 0x9c, 0xc2, 0x9c, 0xd7, 0xf4, 0x73, 0x98, 0xf4, 0x87, 0xbd, 0x8d, 0xb2, 0xe1, 0x01, 0xf8,
+  0x9f, 0xac, 0x1f, 0x23, 0xdd, 0x78, 0x35, 0xe2, 0xd6, 0xd1, 0xf3, 0x4d, 0xb5, 0x25, 0x88, 0x16, 0xd1, 0x1a, 0x18,
+  0x33, 0xd6, 0x36, 0x7e, 0xc4, 0xc8, 0xe5, 0x5d, 0x2d, 0x74, 0xd5, 0x39, 0x3c, 0x44, 0x5a, 0x74, 0xb7, 0x7c, 0x48,
+  0xc1, 0x1f, 0x90, 0xe3, 0x55, 0x9e, 0xf6, 0x29, 0xad, 0xb4, 0x6d, 0x93, 0x78, 0xb3, 0xdc, 0x25, 0x0b, 0x9c, 0x73,
+  0x78, 0x7b, 0x93, 0x4c, 0xd3, 0x47, 0x09, 0xda, 0xe6, 0x69, 0x18, 0xc6, 0x0f, 0xfb, 0xa5, 0x95, 0xf5, 0xe8, 0x75,
+  0xe1, 0x01, 0x1b, 0xd3, 0x1c, 0xa2, 0x57, 0x03, 0x64, 0xdb, 0xf9, 0x5d, 0xf3, 0x3c, 0xa7, 0xd1, 0x4b, 0xb0, 0x90,
+  0x1b, 0x90, 0x62, 0xb4, 0x88, 0x30, 0x4b, 0x40, 0x4d, 0xcf, 0x7d, 0x89, 0x7a, 0xfb, 0x29, 0xc9, 0x64, 0x34, 0x0a,
+  0x52, 0xf6, 0x70, 0x7c, 0x76, 0x5a, 0x2e, 0x8f, 0x50, 0xd4, 0x92, 0x15, 0x97, 0xed, 0x4c, 0x2e, 0xf2, 0x3a, 0xd0,
+  0x58, 0x7e, 0xdb, 0xf1, 0xf4, 0xdd, 0x07, 0x76, 0x04, 0xf0, 0x55, 0x8b, 0x72, 0x2b, 0xa7, 0xa8, 0x78, 0x78, 0x67,
+  0xe6, 0xd8, 0xa5, 0xde, 0xe7, 0xc9, 0x1f, 0x5a, 0xa0, 0x89, 0xc7, 0x24, 0xa2, 0x71, 0xb6, 0x7b, 0x3b, 0xe6, 0x92,
+  0x69, 0x22, 0xaa, 0xe2, 0x47, 0x4b, 0x80, 0x3f, 0x6a, 0xab, 0xce, 0x4e, 0xcd, 0xe8, 0x94, 0x6c, 0xf7, 0x84, 0x73,
+  0x85, 0xfd, 0x85, 0x1d, 0xae, 0x81, 0xf7, 0xec, 0x12, 0x31, 0x7d, 0xc1, 0x99, 0xc0, 0x3c, 0x51, 0xb0, 0xdc, 0xb0,
+  0xba, 0x9c, 0x84, 0xb8, 0x70, 0xc2, 0x09, 0x7f, 0x96, 0x3d, 0xa1, 0xe2, 0x64, 0x27, 0x7a, 0x22, 0xb8, 0x75, 0xb9,
+  0xd1, 0x5f, 0xa5, 0x23, 0xf9, 0x62, 0xe0, 0x41, 0x02, 0x81, 0x81, 0x00, 0xf4, 0xf3, 0x08, 0xcf, 0x83, 0xb0, 0xab,
+  0xf2, 0x0f, 0x1a, 0x08, 0xaf, 0xc2, 0x42, 0x29, 0xa7, 0x9c, 0x5e, 0x52, 0x19, 0x69, 0x8d, 0x5b, 0x52, 0x29, 0x9c,
+  0x06, 0x6a, 0x5a, 0x32, 0x8f, 0x08, 0x45, 0x6c, 0x43, 0xb5, 0xac, 0xc3, 0xbb, 0x90, 0x7b, 0xec, 0xbb, 0x5d, 0x71,
+  0x25, 0x82, 0xf8, 0x40, 0xbf, 0x38, 0x00, 0x20, 0xf3, 0x8a, 0x38, 0x43, 0xde, 0x04, 0x41, 0x19, 0x5f, 0xeb, 0xb0,
+  0x50, 0x59, 0x10, 0xe1, 0x54, 0x62, 0x5c, 0x93, 0xd9, 0xdc, 0x63, 0x24, 0xd0, 0x17, 0x00, 0xc0, 0x44, 0x3e, 0xfc,
+  0xd1, 0xda, 0x4b, 0x24, 0xf7, 0xcb, 0x16, 0x35, 0xe6, 0x9f, 0x67, 0x96, 0x5f, 0xb0, 0x94, 0xde, 0xfa, 0xa1, 0xfd,
+  0x8c, 0x8a, 0xd1, 0x5c, 0x02, 0x8d, 0xe0, 0xa0, 0xa0, 0x02, 0x1d, 0x56, 0xaf, 0x13, 0x3a, 0x65, 0x5e, 0x8e, 0xde,
+  0xd1, 0xa8, 0x28, 0x8b, 0x71, 0xc9, 0x65, 0x02, 0x81, 0x81, 0x00, 0xc1, 0x0a, 0x47, 0x39, 0x91, 0x06, 0x1e, 0xb9,
+  0x43, 0x7c, 0x9e, 0x97, 0xc5, 0x09, 0x08, 0xbc, 0x22, 0x47, 0xe2, 0x96, 0x8e, 0x1c, 0x74, 0x80, 0x50, 0x6c, 0x9f,
+  0xef, 0x2f, 0xe5, 0x06, 0x3e, 0x73, 0x66, 0x76, 0x02, 0xbd, 0x9a, 0x1c, 0xfc, 0xf9, 0x6a, 0xb8, 0xf9, 0x36, 0x15,
+  0xb5, 0x20, 0x0b, 0x6b, 0x54, 0x83, 0x9c, 0x86, 0xba, 0x13, 0xb7, 0x99, 0x54, 0xa0, 0x93, 0x0d, 0xd6, 0x1e, 0xc1,
+  0x12, 0x72, 0x0d, 0xea, 0xb0, 0x14, 0x30, 0x70, 0x73, 0xef, 0x6b, 0x4c, 0xae, 0xb6, 0xff, 0xd4, 0xbb, 0x89, 0xa1,
+  0xec, 0xca, 0xa6, 0xe9, 0x95, 0x56, 0xac, 0xe2, 0x9b, 0x97, 0x2f, 0x2c, 0xdf, 0xa3, 0x6e, 0x59, 0xff, 0xcd, 0x3c,
+  0x6f, 0x57, 0xcc, 0x6e, 0x44, 0xc4, 0x27, 0xbf, 0xc3, 0xdd, 0x19, 0x9e, 0x81, 0x16, 0xe2, 0x8f, 0x65, 0x34, 0xa7,
+  0x0f, 0x22, 0xba, 0xbf, 0x79, 0x57, 0x02, 0x81, 0x80, 0x2e, 0x21, 0x0e, 0xc9, 0xb5, 0xad, 0x31, 0xd4, 0x76, 0x0f,
+  0x9b, 0x0f, 0x2e, 0x70, 0x33, 0x54, 0x03, 0x58, 0xa7, 0xf1, 0x6d, 0x35, 0x57, 0xbb, 0x53, 0x66, 0xb4, 0xb6, 0x96,
+  0xa1, 0xea, 0xd9, 0xcd, 0xe9, 0x23, 0x9f, 0x35, 0x17, 0xef, 0x5c, 0xb8, 0x59, 0xce, 0xb7, 0x3c, 0x35, 0xaa, 0x42,
+  0x82, 0x3f, 0x00, 0x96, 0xd5, 0x9d, 0xc7, 0xab, 0xec, 0xec, 0x04, 0xb5, 0x15, 0xc8, 0x40, 0xa4, 0x85, 0x9d, 0x20,
+  0x56, 0xaf, 0x03, 0x8f, 0x17, 0xb0, 0xf1, 0x96, 0x22, 0x3a, 0xa5, 0xfa, 0x58, 0x3b, 0x01, 0xf9, 0xae, 0xb3, 0x83,
+  0x6f, 0x44, 0xd3, 0x14, 0x2d, 0xb6, 0x6e, 0xd2, 0x9d, 0x39, 0x0c, 0x12, 0x1d, 0x23, 0xea, 0x19, 0xcb, 0xbb, 0xe0,
+  0xcd, 0x89, 0x15, 0x9a, 0xf5, 0xe4, 0xec, 0x41, 0x06, 0x30, 0x16, 0x58, 0xea, 0xfa, 0x31, 0xc1, 0xb8, 0x8e, 0x08,
+  0x84, 0xaa, 0x3b, 0x19, 0x02, 0x81, 0x80, 0x70, 0x4c, 0xf8, 0x6e, 0x86, 0xed, 0xd6, 0x85, 0xd4, 0xba, 0xf4, 0xd0,
+  0x3a, 0x32, 0x2d, 0x40, 0xb5, 0x78, 0xb8, 0x5a, 0xf9, 0xc5, 0x98, 0x08, 0xe5, 0xc0, 0xab, 0xb2, 0x4c, 0x5c, 0xa2,
+  0x2b, 0x46, 0x9b, 0x3e, 0xe0, 0x0d, 0x49, 0x50, 0xbf, 0xe2, 0xa1, 0xb1, 0x86, 0x59, 0x6e, 0x7b, 0x76, 0x6e, 0xee,
+  0x3b, 0xb6, 0x6d, 0x22, 0xfb, 0xb1, 0x68, 0xc7, 0xec, 0xb1, 0x95, 0x9b, 0x21, 0x0b, 0xb7, 0x2a, 0x71, 0xeb, 0xa2,
+  0xb2, 0x58, 0xac, 0x6d, 0x5f, 0x24, 0xd3, 0x79, 0x42, 0xd2, 0xf7, 0x35, 0xdc, 0xfc, 0x0e, 0x95, 0x60, 0xb7, 0x85,
+  0x7f, 0xf9, 0x72, 0x8e, 0x4a, 0x11, 0xc3, 0xc2, 0x09, 0x40, 0x5c, 0x7c, 0x43, 0x12, 0x34, 0xac, 0x59, 0x99, 0x76,
+  0x34, 0xcf, 0x20, 0x88, 0xb0, 0xfb, 0x39, 0x62, 0x3a, 0x9b, 0x03, 0xa6, 0x84, 0x2c, 0x03, 0x5c, 0x0c, 0xca, 0x33,
+  0x85, 0xf5, 0x02, 0x81, 0x80, 0x56, 0x99, 0xe9, 0x17, 0xdc, 0x33, 0xe1, 0x33, 0x8d, 0x5c, 0xba, 0x17, 0x32, 0xb7,
+  0x8c, 0xbd, 0x4b, 0x7f, 0x42, 0x3a, 0x79, 0x90, 0xe3, 0x70, 0xe3, 0x27, 0xce, 0x22, 0x59, 0x02, 0xc0, 0xb1, 0x0e,
+  0x57, 0xf5, 0xdf, 0x07, 0xbf, 0xf8, 0x4e, 0x10, 0xef, 0x2a, 0x62, 0x30, 0x03, 0xd4, 0x80, 0xcf, 0x20, 0x84, 0x25,
+  0x66, 0x3f, 0xc7, 0x4f, 0x56, 0x8c, 0x1e, 0xe1, 0x18, 0x91, 0xc1, 0xfd, 0x71, 0x5f, 0x65, 0x9b, 0xe4, 0x4f, 0xe0,
+  0x1a, 0x3a, 0xf8, 0xc1, 0x69, 0xdb, 0xd3, 0xbb, 0x8d, 0x91, 0xd1, 0x11, 0x4f, 0x7e, 0x91, 0x1b, 0xb4, 0x27, 0xa5,
+  0xab, 0x7c, 0x7b, 0x76, 0xd4, 0x78, 0xfe, 0x63, 0x44, 0x63, 0x7e, 0xe3, 0xa6, 0x60, 0x4f, 0xb9, 0x55, 0x28, 0xba,
+  0xba, 0x83, 0x1a, 0x2d, 0x43, 0xd5, 0xf7, 0x2e, 0xe0, 0xfc, 0xa8, 0x14, 0x9b, 0x91, 0x2a, 0x36, 0xbf, 0xc7, 0x14};
 #endif
 
-
 #define BURN_TEST 1
 #define SIGN_TEST 1
 #define PEM_TEST 1
@@ -361,12 +287,14 @@ unsigned char HSMLunaClient::PrivateKeyData[PRIVATE_DATA_SIZE] = {
 int HsmTest(int argc, char* argv[])
 {
     HSMLunaClient m_HSMLunaClient;
-    if (m_HSMLunaClient.Init() == CK_FALSE) {
+    if (m_HSMLunaClient.Init() == CK_FALSE)
+    {
         cout << "Initialization  error" << endl;
         return -1;
     }
 #ifdef PEM_TEST
-    if (argc == 2) {
+    if (argc == 2)
+    {
         vector<unsigned char> outputBuffer;
         Hex64Manipulations hex64;
         hex64.ParsePemFile(argv[1], outputBuffer);
@@ -378,8 +306,9 @@ int HsmTest(int argc, char* argv[])
     m_HSMLunaClient.BurnPrivateKey(pPrivateKeyLabel, pbPublicKeyLabel);
 #endif
 #ifdef SIGN_TEST
-    vector<CK_BYTE> data(64,0);
-    for (int i = 0; i < 64; i++) {
+    vector<CK_BYTE> data(64, 0);
+    for (int i = 0; i < 64; i++)
+    {
         data[i] = i + 1;
     }
 
diff --git a/mft_utils/hsmclient/src/hsmlunaclientinit.cpp b/mft_utils/hsmclient/src/hsmlunaclientinit.cpp
index a53409ea..58c8e7e1 100644
--- a/mft_utils/hsmclient/src/hsmlunaclientinit.cpp
+++ b/mft_utils/hsmclient/src/hsmlunaclientinit.cpp
@@ -34,7 +34,7 @@
 #include "hsmlunaclient.h"
 #include <string>
 using namespace std;
-static char  EnvLib[4096] = { 0 };
+static char EnvLib[4096] = {0};
 /*
     FUNCTION:        CK_BBOOL GetLibrary()
 */
@@ -47,12 +47,14 @@ CK_BBOOL HSMLunaClient::GetLibrary(string libPath)
 #ifdef OS_HPUX
     snprintf(EnvLib, sizeof(EnvLib) - 1, "%s/libCryptoki2.sl", pPath);
 #else
-    if (libPath.empty()) {
+    if (libPath.empty())
+    {
         const char* pLibraryPath = this->pLibraryPath.c_str();
         const char* pLibraryName = this->pLibraryName.c_str();
         sprintf(EnvLib, "%s/%s", pLibraryPath, pLibraryName);
     }
-    else{
+    else
+    {
         strncpy(EnvLib, (char*)libPath.c_str(), libPath.size());
     }
 #endif
@@ -68,31 +70,36 @@ CK_BBOOL HSMLunaClient::LoadP11Functions(string libPath)
     CK_C_GetFunctionList C_GetFunctionList = NULL;
     CK_RV rv = CKR_TOKEN_NOT_PRESENT;
 
-    if (GetLibrary(libPath) == CK_FALSE) {
+    if (GetLibrary(libPath) == CK_FALSE)
+    {
         return CK_FALSE;
     }
 
     int flag = RTLD_LAZY;
     LibHandle = dlopen((char*)EnvLib, flag);
 
-    if (LibHandle == NULL) {
+    if (LibHandle == NULL)
+    {
         char* error = dlerror();
         printf("Shared object loading error %s, EnvLib is %s\n", error, (char*)EnvLib);
         return CK_FALSE;
     }
 
     C_GetFunctionList = (CK_C_GetFunctionList)dlsym(LibHandle, "C_GetFunctionList");
-    if (C_GetFunctionList == NULL) {
+    if (C_GetFunctionList == NULL)
+    {
         printf("C_GetFunctionList is NULL\n");
         return CK_FALSE;
     }
     rv = C_GetFunctionList(&P11Functions);
-    if (rv != CKR_OK || P11Functions == NULL) {
+    if (rv != CKR_OK || P11Functions == NULL)
+    {
         printf("P11Functions is NULL or return code is not OK %d\n", (int)rv);
         return rv;
     }
     rv = P11Functions->C_Initialize(NULL_PTR);
-    if (rv == CKR_OK || rv == CKR_CRYPTOKI_ALREADY_INITIALIZED) {
+    if (rv == CKR_OK || rv == CKR_CRYPTOKI_ALREADY_INITIALIZED)
+    {
         return CK_TRUE;
     }
     return CK_FALSE;
@@ -106,12 +113,14 @@ CK_BBOOL HSMLunaClient::LoadSfntExtensionFunctions()
     CK_CA_GetFunctionList CA_GetFunctionList = NULL;
     CK_RV rv = CKR_TOKEN_NOT_PRESENT;
     CA_GetFunctionList = (CK_CA_GetFunctionList)dlsym(LibHandle, "CA_GetFunctionList");
-    if (CA_GetFunctionList == NULL) {
+    if (CA_GetFunctionList == NULL)
+    {
         printf("CA_GetFunctionList failed\n");
         return CK_FALSE;
     }
     rv = CA_GetFunctionList(&SfntFunctions);
-    if (rv != CKR_OK || SfntFunctions == NULL) {
+    if (rv != CKR_OK || SfntFunctions == NULL)
+    {
         printf("CA_GetFunctionList SfntFunctions failed or return code is not OK : %d\n", (int)rv);
         return rv;
     }
@@ -128,62 +137,73 @@ CK_RV HSMLunaClient::FindFirstSlot(CK_SLOT_ID& pckSlot)
     CK_RV retCode = CKR_OK;
 
     retCode = P11Functions->C_GetSlotList(CK_TRUE, NULL, &ulCount);
-    if (retCode != CKR_OK) {
+    if (retCode != CKR_OK)
+    {
         printf("C_GetSlotList Failed.\n");
         return retCode;
     }
-    else {
-        if (ulCount == 0) {
+    else
+    {
+        if (ulCount == 0)
+        {
             printf("C_GetSlotList returns 0 slots.\n");
             return retCode;
         }
     }
-    pSlotList = (CK_SLOT_ID_PTR)new CK_SLOT_ID[ulCount*sizeof(CK_SLOT_ID)];
-    if (pSlotList == NULL) {
+    pSlotList = (CK_SLOT_ID_PTR) new CK_SLOT_ID[ulCount * sizeof(CK_SLOT_ID)];
+    if (pSlotList == NULL)
+    {
         printf("Memory allocation error. ulCount = %u\n", (unsigned int)ulCount);
         return retCode;
     }
 
     retCode = P11Functions->C_GetSlotList(CK_TRUE, pSlotList, &ulCount);
-    if (retCode != CKR_OK) {
+    if (retCode != CKR_OK)
+    {
         return retCode;
     }
     pckSlot = pSlotList[0];
-    if (pSlotList) {
+    if (pSlotList)
+    {
         delete[] pSlotList;
     }
     cout << "Working with slot " << pckSlot << endl;
     return retCode;
 }
 
-
 CK_BBOOL HSMLunaClient::Init(string password, string libPath)
 {
-    if (LoadP11Functions(libPath) == CK_FALSE) {
+    if (LoadP11Functions(libPath) == CK_FALSE)
+    {
         printf("Failed to load PKCS11 library!\n");
         return CK_FALSE;
     }
 
-    if (LoadSfntExtensionFunctions() == CK_FALSE) {
+    if (LoadSfntExtensionFunctions() == CK_FALSE)
+    {
         printf("Failed to load SafeNet extension functions!\n");
         return CK_FALSE;
     }
     CK_RV rv = FindFirstSlot(m_ckSlot);
-    if ((rv != CKR_OK)) {
+    if ((rv != CKR_OK))
+    {
         return CK_FALSE;
     }
 
     rv = P11Functions->C_OpenSession(m_ckSlot, CKF_RW_SESSION | CKF_SERIAL_SESSION, NULL, NULL, &m_hSession);
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return CK_FALSE;
     }
 
-    if (!password.empty()) {
+    if (!password.empty())
+    {
         memset(bPassword, 0, sizeof(bPassword));
         memcpy(bPassword, password.c_str(), password.size());
     }
     rv = P11Functions->C_Login(m_hSession, CKU_USER, bPassword, (CK_ULONG)strlen((char*)bPassword));
-    if (rv != CKR_OK) {
+    if (rv != CKR_OK)
+    {
         return CK_FALSE;
     }
     return CK_TRUE;
@@ -192,7 +212,8 @@ void HSMLunaClient::CleanUp()
 {
     if (P11Functions)
     {
-        if (m_hSession) {
+        if (m_hSession)
+        {
             P11Functions->C_CloseSession(m_hSession);
         }
         P11Functions->C_Finalize(NULL_PTR);
diff --git a/mft_utils/hsmclient/src/hsmlunatest.cpp b/mft_utils/hsmclient/src/hsmlunatest.cpp
index a4c5f50a..38f9d5d7 100644
--- a/mft_utils/hsmclient/src/hsmlunatest.cpp
+++ b/mft_utils/hsmclient/src/hsmlunatest.cpp
@@ -48,12 +48,14 @@ int HsmTest(int argc, char* argv[])
     (void)argc;
     (void)argv;
     HSMLunaClient m_HSMLunaClient;
-    if (m_HSMLunaClient.Init() == CK_FALSE) {
+    if (m_HSMLunaClient.Init() == CK_FALSE)
+    {
         cout << "Initialization  error" << endl;
         return -1;
     }
 #if PEM_TEST
-    if (argc == 2) {
+    if (argc == 2)
+    {
         vector<unsigned char> outputBuffer;
         Hex64Manipulations hex64;
         hex64.ParsePemFile(argv[1], outputBuffer);
@@ -65,8 +67,9 @@ int HsmTest(int argc, char* argv[])
     m_HSMLunaClient.BurnPrivateKey(pPrivateKeyLabel, pbPublicKeyLabel);
 #endif
 #if SIGN_TEST
-    vector<CK_BYTE> data(64,0);
-    for (int i = 0; i < 64; i++) {
+    vector<CK_BYTE> data(64, 0);
+    for (int i = 0; i < 64; i++)
+    {
         data[i] = i + 1;
     }
 
diff --git a/mft_utils/mft_sig_handler.c b/mft_utils/mft_sig_handler.c
index c99967ea..ec72dbaa 100644
--- a/mft_utils/mft_sig_handler.c
+++ b/mft_utils/mft_sig_handler.c
@@ -36,76 +36,81 @@
 #include <tools_utils.h>
 
 static int s_is_fired = 0;
-static char *s_interrupt_message = NULL;
+static char* s_interrupt_message = NULL;
 
-//siganls to handle
+// siganls to handle
 #ifdef __WIN__
-static int signals_array[] =
-{SIGINT};
+static int signals_array[] = {SIGINT};
 #else
 static int signals_array[] = {SIGINT, SIGQUIT, SIGTERM, SIGUSR1};
 #endif
 
-static void (*prev_handlers[sizeof(signals_array) / sizeof (signals_array[0])])(int sig);
+static void (*prev_handlers[sizeof(signals_array) / sizeof(signals_array[0])])(int sig);
 
-
-
-             static void my_termination_handler(int sig)
+static void my_termination_handler(int sig)
 {
     s_is_fired = sig; // assuming signals received are always different then zero
-    if (s_interrupt_message) {
+    if (s_interrupt_message)
+    {
         fprintf(stderr, "%s", s_interrupt_message);
     }
 }
 
 #ifdef __WIN__
-             static BOOL CtrlHandler( DWORD fdwCtrlType )
+static BOOL CtrlHandler(DWORD fdwCtrlType)
 {
     switch (fdwCtrlType)
     {
-    // Handle the CTRL-C signal.
-    case CTRL_C_EVENT:
-    // CTRL-CLOSE: confirm that the user wants to exit.
-    case CTRL_CLOSE_EVENT:
-    // Pass other signals to the next handler.
-    case CTRL_BREAK_EVENT:
-    case CTRL_LOGOFF_EVENT:
-    case CTRL_SHUTDOWN_EVENT:
-        my_termination_handler(SIGINT);
-        return TRUE;
-
-    default:
-        return FALSE;
+        // Handle the CTRL-C signal.
+        case CTRL_C_EVENT:
+        // CTRL-CLOSE: confirm that the user wants to exit.
+        case CTRL_CLOSE_EVENT:
+        // Pass other signals to the next handler.
+        case CTRL_BREAK_EVENT:
+        case CTRL_LOGOFF_EVENT:
+        case CTRL_SHUTDOWN_EVENT:
+            my_termination_handler(SIGINT);
+            return TRUE;
+
+        default:
+            return FALSE;
     }
 }
 #endif
 
-             int  mft_signal_set_handling(int is_on)
+int mft_signal_set_handling(int is_on)
 {
     unsigned int i;
 
 #ifdef __WIN__
-    SetConsoleCtrlHandler( (PHANDLER_ROUTINE) CtrlHandler, is_on );
+    SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, is_on);
 #endif
     static int first_on = 0;
     static int is_on_counter = 0;
 
-    if (is_on_counter == 0 && is_on == 0) {
-        //if we reach here it means previous handler is already set so there is no need to restore it once more.
+    if (is_on_counter == 0 && is_on == 0)
+    {
+        // if we reach here it means previous handler is already set so there is no need to restore it once more.
         return 0;
     }
     // incr/decr counter
-    if (is_on) {
+    if (is_on)
+    {
         is_on_counter += 1;
-    } else {
+    }
+    else
+    {
         is_on_counter = is_on_counter > 0 ? is_on_counter - 1 : is_on_counter;
     }
 
-    if (is_on == 1 && first_on == 0) {
+    if (is_on == 1 && first_on == 0)
+    {
         /* first time we turned thin handler on so we save previous handlers in prev_handlers array */
-        for (i = 0; i < sizeof(signals_array) / sizeof(signals_array[0]); i++) {
+        for (i = 0; i < sizeof(signals_array) / sizeof(signals_array[0]); i++)
+        {
             prev_handlers[i] = signal(signals_array[i], my_termination_handler);
-            if (prev_handlers[i] == SIG_ERR) {
+            if (prev_handlers[i] == SIG_ERR)
+            {
                 return -1;
             }
         }
@@ -114,10 +119,14 @@ static void (*prev_handlers[sizeof(signals_array) / sizeof (signals_array[0])])(
     }
     /* not the first time we turned on the signals */
     /* register term/kill signal handler */
-    /* we need to call signal routine only when is_on_counter == 0 or 1 (more precisely when it goes from zero to one or visa versa )*/
-    if ((is_on_counter == 0 && is_on == 0) || (is_on_counter == 1 && is_on == 1 )) {
-        for (i = 0; i < sizeof(signals_array) / sizeof(signals_array[0]); i++) {
-            if (signal(signals_array[i], is_on_counter > 0 ? my_termination_handler : prev_handlers[i]) == SIG_ERR) {
+    /* we need to call signal routine only when is_on_counter == 0 or 1 (more precisely when it goes from zero to one or
+     * visa versa )*/
+    if ((is_on_counter == 0 && is_on == 0) || (is_on_counter == 1 && is_on == 1))
+    {
+        for (i = 0; i < sizeof(signals_array) / sizeof(signals_array[0]); i++)
+        {
+            if (signal(signals_array[i], is_on_counter > 0 ? my_termination_handler : prev_handlers[i]) == SIG_ERR)
+            {
                 return -1;
             }
         }
@@ -126,31 +135,32 @@ static void (*prev_handlers[sizeof(signals_array) / sizeof (signals_array[0])])(
     return 0;
 }
 
-             int  mft_signal_is_fired()
+int mft_signal_is_fired()
 {
     return s_is_fired;
 }
 
-             void mft_signal_set_fired(int is_fired)
+void mft_signal_set_fired(int is_fired)
 {
     s_is_fired = is_fired;
 }
 
-             void mft_signal_set_msg(char *msg)
+void mft_signal_set_msg(char* msg)
 {
     s_interrupt_message = msg;
 }
 
-             void mft_restore_and_raise()
+void mft_restore_and_raise()
 {
     int sig;
     sig = mft_signal_is_fired();
-    if (sig) {
+    if (sig)
+    {
         // reset received signal
         mft_signal_set_fired(0);
         // retore prev handler
         mft_signal_set_handling(0);
-        //raise signal to let the previous handle deal with it.
+        // raise signal to let the previous handle deal with it.
         raise(sig);
     }
     mft_signal_set_handling(0);
diff --git a/mft_utils/mft_sig_handler.h b/mft_utils/mft_sig_handler.h
index dfa8333c..89580c2e 100644
--- a/mft_utils/mft_sig_handler.h
+++ b/mft_utils/mft_sig_handler.h
@@ -34,61 +34,60 @@
 #define MFT_SIG_HANDLER
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
+    /** @file
+     *  mft_sig_hanndler - Generic signal handling API
+     *  Re place the default sig handlers for user interrupts with a
+     *  'thin' handler that sets a flag and prints message to user
+     *  (to stderr), and returns.
+     *
+     *  This allows application to place this handler in the main
+     *  loop and do a propper exit with cleanup on signal.
+     *
+     *  NOTE: mft_sig_handler saves on first call to
+     *  mft_signal_set_handling(1), the current handlers
+     *  and restores them each time we turn the thin handler off
+     *  thus the main program should not change its default signal
+     *  handlers after their initial initilization.
+     */
 
-/** @file
- *  mft_sig_hanndler - Generic signal handling API
- *  Re place the default sig handlers for user interrupts with a
- *  'thin' handler that sets a flag and prints message to user
- *  (to stderr), and returns.
- *
- *  This allows application to place this handler in the main
- *  loop and do a propper exit with cleanup on signal.
- *
- *  NOTE: mft_sig_handler saves on first call to
- *  mft_signal_set_handling(1), the current handlers
- *  and restores them each time we turn the thin handler off
- *  thus the main program should not change its default signal
- *  handlers after their initial initilization.
- */
-
-/**
- * @brief Start/Stop the thin handler
- * @param [in] is_on: 1 - enable thin handler. 0 - restore
- *       previous handlers
- * @return 0 on success, 1 otherwise.
- */
-int  mft_signal_set_handling(int is_on);
+    /**
+     * @brief Start/Stop the thin handler
+     * @param [in] is_on: 1 - enable thin handler. 0 - restore
+     *       previous handlers
+     * @return 0 on success, 1 otherwise.
+     */
+    int mft_signal_set_handling(int is_on);
 
-/**
- * @brief signal accepted indication
- * @return N - signal N was accepted. 0 otherwise...
- */
-int  mft_signal_is_fired();
+    /**
+     * @brief signal accepted indication
+     * @return N - signal N was accepted. 0 otherwise...
+     */
+    int mft_signal_is_fired();
 
-/**
- * @brief set value for signal accepted indication.
- *        Can be used to clear signal
- * @param [in] is_fired
- */
-void mft_signal_set_fired(int is_fired);
+    /**
+     * @brief set value for signal accepted indication.
+     *        Can be used to clear signal
+     * @param [in] is_fired
+     */
+    void mft_signal_set_fired(int is_fired);
 
-/**
- * @brief Set teh message to be printed on signal
- * @param [in] msg - the mesage or NULL if no message is to be
- *        printed.
- */
-void mft_signal_set_msg(char *msg);
+    /**
+     * @brief Set teh message to be printed on signal
+     * @param [in] msg - the mesage or NULL if no message is to be
+     *        printed.
+     */
+    void mft_signal_set_msg(char* msg);
 
-/**
- * @brief Deal with signals, if got signal - raise, otherwise restore it
- */
-void mft_restore_and_raise();
+    /**
+     * @brief Deal with signals, if got signal - raise, otherwise restore it
+     */
+    void mft_restore_and_raise();
 #ifdef __cplusplus
 }
 #endif
 
 #endif
-
diff --git a/mft_utils/mft_utils.cpp b/mft_utils/mft_utils.cpp
index 681ab30a..e24fef3f 100644
--- a/mft_utils/mft_utils.cpp
+++ b/mft_utils/mft_utils.cpp
@@ -50,7 +50,6 @@ using namespace std;
 
 namespace mft_utils
 {
-
 string numToStr(u_int32_t num)
 {
     stringstream ss;
@@ -60,30 +59,34 @@ string numToStr(u_int32_t num)
 
 bool strToNum(const string& str, u_int32_t& num, int base)
 {
-    char *endp;
-    char *numStr = strcpy(new char[str.size() + 1], str.c_str());
+    char* endp;
+    char* numStr = strcpy(new char[str.size() + 1], str.c_str());
     num = strtoul(numStr, &endp, base);
-    if (*endp) {
+    if (*endp)
+    {
         delete[] numStr;
         return false;
     }
     delete[] numStr;
     // check errno
-    if (errno == ERANGE) {
+    if (errno == ERANGE)
+    {
         return false;
     }
     return true;
 }
 
-void splitCommaSperatedString(string str, vector<string> &strv)
+void splitCommaSperatedString(string str, vector<string>& strv)
 {
     size_t pos;
-    while ((pos = str.find(',')) != string::npos) {
+    while ((pos = str.find(',')) != string::npos)
+    {
         string tmp = str.substr(0, pos);
         strv.push_back((string)tmp);
         str = str.substr(pos + 1);
     }
-    if (str != "") {
+    if (str != "")
+    {
         strv.push_back((string)str);
     }
 }
@@ -92,12 +95,12 @@ void ltrim(string& str, const string& chars)
 {
     str.erase(0, str.find_first_not_of(chars));
 }
- 
+
 void rtrim(string& str, const string& chars)
 {
     str.erase(str.find_last_not_of(chars) + 1);
 }
- 
+
 void trim(string& str, const string& chars)
 {
     rtrim(str, chars);
@@ -109,13 +112,13 @@ string ltrim_copy(string str, const string& chars)
     ltrim(str, chars);
     return str;
 }
- 
+
 string rtrim_copy(string str, const string& chars)
 {
     rtrim(str, chars);
     return str;
 }
- 
+
 string trim_copy(string str, const string& chars)
 {
     trim(str, chars);
@@ -124,14 +127,16 @@ string trim_copy(string str, const string& chars)
 
 void to_lowercase(string& str)
 {
-    for (string::size_type i=0; i < str.length(); ++i) {
+    for (string::size_type i = 0; i < str.length(); ++i)
+    {
         str[i] = std::tolower(str[i]);
     }
 }
 
 void to_uppercase(string& str)
 {
-    for (string::size_type i=0; i < str.length(); ++i) {
+    for (string::size_type i = 0; i < str.length(); ++i)
+    {
         str[i] = std::toupper(str[i]);
     }
 }
@@ -150,7 +155,8 @@ string to_uppercase_copy(string str)
 
 u_int32_t greatest_common_divisor(u_int32_t a, u_int32_t b)
 {
-    if (b == 0) return a;
+    if (b == 0)
+        return a;
     return greatest_common_divisor(b, a % b);
 }
 
@@ -159,4 +165,4 @@ u_int32_t least_common_multiple(u_int32_t a, u_int32_t b)
     return (a * b) / greatest_common_divisor(a, b);
 }
 
-}
+} // namespace mft_utils
diff --git a/mft_utils/mft_utils.h b/mft_utils/mft_utils.h
index 91df6559..14f13037 100644
--- a/mft_utils/mft_utils.h
+++ b/mft_utils/mft_utils.h
@@ -47,15 +47,13 @@ using namespace std;
 
 namespace mft_utils
 {
-
 string numToStr(u_int32_t num);
 
 bool strToNum(const string& str, u_int32_t& num, int base);
 
-void splitCommaSperatedString(string str, vector<string> &strv);
-
+void splitCommaSperatedString(string str, vector<string>& strv);
 
-void ltrim(string& str, const string& chars = "\t\n\v\f\r "); 
+void ltrim(string& str, const string& chars = "\t\n\v\f\r ");
 void rtrim(string& str, const string& chars = "\t\n\v\f\r ");
 void trim(string& str, const string& chars = "\t\n\v\f\r ");
 string ltrim_copy(string str, const string& chars = "\t\n\v\f\r ");
@@ -70,5 +68,5 @@ string to_uppercase_copy(string str);
 u_int32_t greatest_common_divisor(u_int32_t a, u_int32_t b);
 u_int32_t least_common_multiple(u_int32_t a, u_int32_t b);
 
-}
+} // namespace mft_utils
 #endif /* MFT_UTILS_H_ */
diff --git a/mft_utils/mlarge_buffer.cpp b/mft_utils/mlarge_buffer.cpp
index 66aa0712..1c264691 100644
--- a/mft_utils/mlarge_buffer.cpp
+++ b/mft_utils/mlarge_buffer.cpp
@@ -40,7 +40,6 @@
 
 #include "mlarge_buffer.h"
 
-
 #define MFT_MIN(x, y) ((x) < (y) ? (x) : (y))
 #define MFT_MAX(x, y) ((x) > (y) ? (x) : (y))
 
@@ -50,9 +49,10 @@
 #define DBG_PRINTF(...)
 #endif
 
-MBufferUnit& operator <<(MBufferUnit& a, MBufferUnit& b)
+MBufferUnit& operator<<(MBufferUnit& a, MBufferUnit& b)
 {
-    if (!a.intersects(b) ) {
+    if (!a.intersects(b))
+    {
         return a;
     }
     u_int32_t newSize = MFT_MAX(a.offset() + a.size(), b.offset() + b.size()) - MFT_MIN(a.offset(), b.offset());
@@ -70,16 +70,18 @@ MBufferUnit& operator <<(MBufferUnit& a, MBufferUnit& b)
 
 MBufferUnit& MBufferUnit::operator=(const MBufferUnit& other)
 {
-    if (this != &other) {
+    if (this != &other)
+    {
         this->_data = other._data;
         this->_offset = other._offset;
     }
     return *this;
 }
 
-bool MBufferUnit::intersects( const MBufferUnit& other) const
+bool MBufferUnit::intersects(const MBufferUnit& other) const
 {
-    if (this->offset() > (other.offset() + other.size()) || (this->offset() + this->size()) < other.offset() ) {
+    if (this->offset() > (other.offset() + other.size()) || (this->offset() + this->size()) < other.offset())
+    {
         return false;
     }
     return true;
@@ -87,32 +89,43 @@ bool MBufferUnit::intersects( const MBufferUnit& other) const
 
 void MlargeBuffer::add(const std::vector<u_int8_t>& data, u_int32_t offset)
 {
-    if (data.size() == 0) {
+    if (data.size() == 0)
+    {
         return;
     }
-    DBG_PRINTF("-D- adding chunk: 0x%08x - 0x%08x (0x%08x)\n", offset, (unsigned)data.size() + offset, (unsigned)data.size());
+    DBG_PRINTF("-D- adding chunk: 0x%08x - 0x%08x (0x%08x)\n", offset, (unsigned)data.size() + offset,
+               (unsigned)data.size());
     // create MBufferUnit
     MBufferUnit bufferUnit(data, offset);
     bool unitInserted = false;
     bool unitIntersects = false;
     unsigned intersecIdx = 0;
     unsigned bSize = _bData.size();
-    for (unsigned idx = 0; idx < bSize; idx++) {
-        if (unitIntersects) {
-            if (_bData[idx].intersects(_bData[intersecIdx])) {
+    for (unsigned idx = 0; idx < bSize; idx++)
+    {
+        if (unitIntersects)
+        {
+            if (_bData[idx].intersects(_bData[intersecIdx]))
+            {
                 // merge element in intersecIdx onto it
                 _bData[idx] << _bData[intersecIdx];
                 _bData.erase(_bData.begin() + intersecIdx);
                 intersecIdx = --idx;
                 bSize--;
-            } else {
+            }
+            else
+            {
                 break; // done :)
             }
-        } else if (bufferUnit.offset() + bufferUnit.size() < _bData[idx].offset()) {  // check if we can insert before
+        }
+        else if (bufferUnit.offset() + bufferUnit.size() < _bData[idx].offset())
+        { // check if we can insert before
             _bData.insert(_bData.begin() + idx, bufferUnit);
             unitInserted = true;
             break;
-        } else if (bufferUnit.intersects(_bData[idx])) {
+        }
+        else if (bufferUnit.intersects(_bData[idx]))
+        {
             unitIntersects = true;
             unitInserted = true;
             _bData[idx] << bufferUnit;
@@ -121,19 +134,21 @@ void MlargeBuffer::add(const std::vector<u_int8_t>& data, u_int32_t offset)
         }
     }
 
-    if (!unitInserted) {
+    if (!unitInserted)
+    {
         _bData.push_back(bufferUnit);
     }
     DBG_PRINTF("-D- bData size: %d\n", (int)_bData.size());
 
 #ifdef _DEBUG_MODE
     std::vector<MBufferUnit>::iterator it = _bData.begin();
-    for (; it != _bData.end(); it++) {
+    for (; it != _bData.end(); it++)
+    {
         DBG_PRINTF("-D- chunk : 0x%08x - 0x%08x (0x%08x)\n", it->offset(), it->size() + it->offset(), it->size());
     }
 #endif
 }
-void MlargeBuffer::add(const u_int8_t *data, u_int32_t offset, u_int32_t size)
+void MlargeBuffer::add(const u_int8_t* data, u_int32_t offset, u_int32_t size)
 {
     std::vector<u_int8_t> dataVec(data, data + size);
     return add(dataVec, offset);
@@ -147,28 +162,33 @@ u_int8_t MlargeBuffer::operator[](const u_int32_t offset)
 }
 void MlargeBuffer::get(std::vector<u_int8_t>& data, u_int32_t offset, u_int32_t size)
 {
-    if (data.size() < size) {
+    if (data.size() < size)
+    {
         data.resize(size);
     }
     return get(&data[0], offset, size);
 }
 
-void MlargeBuffer::get(u_int8_t *data, u_int32_t offset, u_int32_t size)
+void MlargeBuffer::get(u_int8_t* data, u_int32_t offset, u_int32_t size)
 {
     DBG_PRINTF("-D- get request on offset: 0x%08x with size 0x%x\n", offset, size);
-    if (!data || size == 0) {
+    if (!data || size == 0)
+    {
         return;
     }
     memset(data, _defaultValue, size);
-    u_int8_t *ptr = data;
-    for (std::vector<MBufferUnit>::iterator it = _bData.begin(); it != _bData.end(); it++) {
-        if (offset < (it->offset() + it->size()) && (offset + size) > it->offset()) {
+    u_int8_t* ptr = data;
+    for (std::vector<MBufferUnit>::iterator it = _bData.begin(); it != _bData.end(); it++)
+    {
+        if (offset < (it->offset() + it->size()) && (offset + size) > it->offset())
+        {
             // intersects with current MBufferUnit
-            u_int32_t offsetInBuffer = ((long int)it->offset() - (long int)offset) < 0 ? 0 :  it->offset() - offset;
-            u_int32_t copySize = MFT_MIN(offset + size,  it->offset() + it->size()) - MFT_MAX(offset, it->offset());
+            u_int32_t offsetInBuffer = ((long int)it->offset() - (long int)offset) < 0 ? 0 : it->offset() - offset;
+            u_int32_t copySize = MFT_MIN(offset + size, it->offset() + it->size()) - MFT_MAX(offset, it->offset());
             u_int32_t offsetInData = ((long int)offset - (long int)it->offset()) < 0 ? 0 : offset - it->offset();
-            DBG_PRINTF("-D- getting from chunk at offset 0x%08x , size: 0x%x\n",  it->offset(), (unsigned)it->size() );
-            DBG_PRINTF("-D- integrating at buffer offset : 0x%08x size: 0x%x, offset in data: 0x%08x\n", offsetInBuffer, copySize, offsetInData);
+            DBG_PRINTF("-D- getting from chunk at offset 0x%08x , size: 0x%x\n", it->offset(), (unsigned)it->size());
+            DBG_PRINTF("-D- integrating at buffer offset : 0x%08x size: 0x%x, offset in data: 0x%08x\n", offsetInBuffer,
+                       copySize, offsetInData);
             memcpy(ptr + offsetInBuffer, &(it->data())[0] + offsetInData, copySize);
         }
     }
diff --git a/mft_utils/mlarge_buffer.h b/mft_utils/mlarge_buffer.h
index c765daf8..cbf14029 100644
--- a/mft_utils/mlarge_buffer.h
+++ b/mft_utils/mlarge_buffer.h
@@ -43,16 +43,18 @@
 
 #include <compatibility.h>
 
-class MBufferUnit {
+class MBufferUnit
+{
 public:
     MBufferUnit(const std::vector<u_int8_t>& data, u_int32_t offset) : _data(data), _offset(offset) {}
-    u_int32_t size() const {return (u_int32_t)_data.size();}
-    u_int32_t offset() const {return _offset;}
+    u_int32_t size() const { return (u_int32_t)_data.size(); }
+    u_int32_t offset() const { return _offset; }
     std::vector<u_int8_t>& data() { return _data; }
     u_int8_t& operator[](const u_int32_t idx) { return _data[idx]; }
     MBufferUnit& operator=(const MBufferUnit& other);
-    bool intersects( const MBufferUnit& other) const;
+    bool intersects(const MBufferUnit& other) const;
     ~MBufferUnit() = default;
+
 private:
     std::vector<u_int8_t> _data;
     u_int32_t _offset;
@@ -63,17 +65,19 @@ MBufferUnit& operator<<(MBufferUnit& a, MBufferUnit& b);
 /*
  * Large buffer with minimal memory footprint
  */
-class MlargeBuffer {
+class MlargeBuffer
+{
 public:
-    MlargeBuffer(u_int8_t defaultVal = 0x0) : _defaultValue(defaultVal){}
+    MlargeBuffer(u_int8_t defaultVal = 0x0) : _defaultValue(defaultVal) {}
     void add(const std::vector<u_int8_t>& data, u_int32_t offset);
-    void add(const u_int8_t *data, u_int32_t offset, u_int32_t size);
-    u_int8_t operator[](const u_int32_t offset);  // for read only
+    void add(const u_int8_t* data, u_int32_t offset, u_int32_t size);
+    u_int8_t operator[](const u_int32_t offset); // for read only
     void get(std::vector<u_int8_t>& data, u_int32_t offset, u_int32_t size);
-    void get(std::vector<u_int8_t>& data, u_int32_t size) {return get(data, 0, size);}
-    void get(u_int8_t *data, u_int32_t offset, u_int32_t size);
-    void get(u_int8_t *data, u_int32_t size) {return get(data, 0, size);}
-    void clear() {_bData.clear();}
+    void get(std::vector<u_int8_t>& data, u_int32_t size) { return get(data, 0, size); }
+    void get(u_int8_t* data, u_int32_t offset, u_int32_t size);
+    void get(u_int8_t* data, u_int32_t size) { return get(data, 0, size); }
+    void clear() { _bData.clear(); }
+
 private:
     u_int8_t _defaultValue;
     std::vector<MBufferUnit> _bData;
diff --git a/mlxarchive/mfa2_buff.cpp b/mlxarchive/mfa2_buff.cpp
old mode 100755
new mode 100644
index 321f94aa..cca290e3
--- a/mlxarchive/mfa2_buff.cpp
+++ b/mlxarchive/mfa2_buff.cpp
@@ -42,13 +42,13 @@
 
 #include "mfa2_buff.h"
 
+Mfa2Buffer::Mfa2Buffer() : m_buff(NULL), m_pos(0), m_size(0) {}
 
-Mfa2Buffer::Mfa2Buffer(): m_buff(NULL), m_pos(0), m_size(0) {
-}
-
-Mfa2Buffer::~Mfa2Buffer() {
-    if (m_buff) {
-        delete [] m_buff;
+Mfa2Buffer::~Mfa2Buffer()
+{
+    if (m_buff)
+    {
+        delete[] m_buff;
         m_buff = NULL;
     }
 }
@@ -56,93 +56,106 @@ Mfa2Buffer::~Mfa2Buffer() {
 bool Mfa2Buffer::loadFile(const std::string& fname)
 {
     // open the file:
-    FILE * fp;
+    FILE* fp;
 
     fp = fopen(fname.c_str(), "rb");
-    if (!fp) {
+    if (!fp)
+    {
         return false;
     }
 
-    //Get file length
+    // Get file length
     fseek(fp, 0, SEEK_END);
-    m_size=ftell(fp);
+    m_size = ftell(fp);
     fseek(fp, 0, SEEK_SET);
 
-    //Allocate memory
-    if (m_buff) {
-        delete [] m_buff;
+    // Allocate memory
+    if (m_buff)
+    {
+        delete[] m_buff;
         m_buff = NULL;
     }
 
-    m_buff= new u_int8_t[m_size+1];
+    m_buff = new u_int8_t[m_size + 1];
     if (!m_buff)
     {
         return false;
     }
 
-    //Read file contents into buffer
-    if (fread(m_buff, m_size, 1, fp)) {} // TODO: temporary fix - handle the return value!
+    // Read file contents into buffer
+    if (fread(m_buff, m_size, 1, fp))
+    {
+    } // TODO: temporary fix - handle the return value!
     fclose(fp);
 
     return true;
 }
 
-
-void Mfa2Buffer::read(u_int8_t & val) {
+void Mfa2Buffer::read(u_int8_t& val)
+{
     val = *(m_buff + m_pos);
     m_pos += sizeof(u_int8_t);
 }
 
-void Mfa2Buffer::read(u_int16_t & val) {
-    val = *(u_int16_t *)(m_buff + m_pos);
+void Mfa2Buffer::read(u_int16_t& val)
+{
+    val = *(u_int16_t*)(m_buff + m_pos);
     m_pos += sizeof(u_int16_t);
     val = __le16_to_cpu(val);
 }
 
-void Mfa2Buffer::read(u_int32_t & val) {
-    val = *(u_int32_t *)(m_buff + m_pos);
+void Mfa2Buffer::read(u_int32_t& val)
+{
+    val = *(u_int32_t*)(m_buff + m_pos);
     m_pos += sizeof(u_int32_t);
     val = __le32_to_cpu(val);
 }
 
-void Mfa2Buffer::read(std::string& str, size_t str_size) {
-    u_int8_t *arr = new u_int8_t[str_size];
+void Mfa2Buffer::read(std::string& str, size_t str_size)
+{
+    u_int8_t* arr = new u_int8_t[str_size];
     read(arr, str_size);
-    str = std::string(reinterpret_cast<char const *>(arr), str_size);
-    delete [] arr;
+    str = std::string(reinterpret_cast<char const*>(arr), str_size);
+    delete[] arr;
 }
 
-void Mfa2Buffer::read(u_int8_t *arr, size_t arr_size) {
+void Mfa2Buffer::read(u_int8_t* arr, size_t arr_size)
+{
     memcpy(arr, m_buff + m_pos, arr_size);
     m_pos += arr_size;
 }
 
-int Mfa2Buffer::seek(long offset, int whence) {
+int Mfa2Buffer::seek(long offset, int whence)
+{
     long new_pos = -1;
 
-    switch(whence) {
-    case SEEK_SET:
-        new_pos = offset;
-        break;
-    case SEEK_CUR:
-        new_pos = m_pos + offset;
-        break;
-    case SEEK_END:
-        new_pos = m_size + offset;
-        break;
+    switch (whence)
+    {
+        case SEEK_SET:
+            new_pos = offset;
+            break;
+        case SEEK_CUR:
+            new_pos = m_pos + offset;
+            break;
+        case SEEK_END:
+            new_pos = m_size + offset;
+            break;
     }
 
-    if(new_pos < 0 || new_pos > m_size) {
+    if (new_pos < 0 || new_pos > m_size)
+    {
         return -1;
     }
     m_pos = new_pos;
     return 0;
 }
 
-long Mfa2Buffer::tell() {
+long Mfa2Buffer::tell()
+{
     return m_pos;
 }
 
-void Mfa2Buffer::rewind() {
+void Mfa2Buffer::rewind()
+{
     m_pos = 0;
 }
diff --git a/mlxarchive/mfa2_buff.h b/mlxarchive/mfa2_buff.h
index 6bbe36a0..043d38c1 100644
--- a/mlxarchive/mfa2_buff.h
+++ b/mlxarchive/mfa2_buff.h
@@ -40,35 +40,31 @@
 #include <string>
 #include "common/compatibility.h"
 
-class Mfa2Buffer {
+class Mfa2Buffer
+{
 public:
     Mfa2Buffer();
     virtual ~Mfa2Buffer();
 
     bool loadFile(const std::string& fname);
 
-    void read(u_int8_t & val);
-    void read(u_int16_t & val);
-    void read(u_int32_t & val);
+    void read(u_int8_t& val);
+    void read(u_int16_t& val);
+    void read(u_int32_t& val);
     void read(std::string& str, size_t str_size);
-    void read(u_int8_t *arr, size_t arr_size);
+    void read(u_int8_t* arr, size_t arr_size);
 
     int seek(long offset, int whence);
     long tell();
     void rewind();
-    u_int8_t* getBuffer() const {
-        return m_buff;
-    }
+    u_int8_t* getBuffer() const { return m_buff; }
 
-    long getSize() const {
-        return m_size;
-    }
+    long getSize() const { return m_size; }
 
 private:
-    u_int8_t * m_buff;
+    u_int8_t* m_buff;
     long m_pos;
     long m_size;
 };
 
 #endif /* _MFA2_BUFF_H_ */
-
diff --git a/mlxarchive/mlxarchive.cpp b/mlxarchive/mlxarchive.cpp
index 65cd6263..a8341d1d 100644
--- a/mlxarchive/mlxarchive.cpp
+++ b/mlxarchive/mlxarchive.cpp
@@ -53,31 +53,31 @@ using namespace boost;
 #include <cmdparser/cmdparser.h>
 #include "mlxarchive.h"
 
-#define IDENT            "    "
-#define IDENT2           IDENT IDENT
-#define IDENT3           "\t\t"
+#define IDENT "    "
+#define IDENT2 IDENT IDENT
+#define IDENT3 "\t\t"
 
 #ifdef MST_UL
-#define MLXARCHIVE_EXEC  "mstarchive"
+#define MLXARCHIVE_EXEC "mstarchive"
 #else
-#define MLXARCHIVE_EXEC  "mlxarchive"
+#define MLXARCHIVE_EXEC "mlxarchive"
 #endif
 
 /************************************
  * * FLAGS Constants
  * ************************************/
-#define HELP_FLAG                   "help"
-#define HELP_FLAG_SHORT             'h'
-#define BINS_DIR_FLAG               "bins-dir"
-#define BINS_DIR_FLAG_SHORT         'b'
-#define OUT_FILE_FLAG               "out-file"
-#define OUT_FILE_FLAG_SHORT         'o'
-#define DATE_FLAG                   "date"
-#define DATE_FLAG_SHORT             'd'
-#define VERSION_FLAG                "version"
-#define VERSION_FLAG_SHORT          'v'
-#define MFA2_FILE_FLAG              "mfa2-file"
-#define MFA2_FILE_FLAG_SHORT        'm'
+#define HELP_FLAG "help"
+#define HELP_FLAG_SHORT 'h'
+#define BINS_DIR_FLAG "bins-dir"
+#define BINS_DIR_FLAG_SHORT 'b'
+#define OUT_FILE_FLAG "out-file"
+#define OUT_FILE_FLAG_SHORT 'o'
+#define DATE_FLAG "date"
+#define DATE_FLAG_SHORT 'd'
+#define VERSION_FLAG "version"
+#define VERSION_FLAG_SHORT 'v'
+#define MFA2_FILE_FLAG "mfa2-file"
+#define MFA2_FILE_FLAG_SHORT 'm'
 
 using namespace mlxarchive;
 bool writeToFile(const string&, const vector<u_int8_t>&);
@@ -85,14 +85,12 @@ bool writeToFile(const string&, const vector<u_int8_t>&);
 /************************************
  * * Function: Mlxarchive
  * ************************************/
-Mlxarchive::Mlxarchive() :
-    CommandLineRequester(MLXARCHIVE_EXEC " OPTIONS"),
-    _cmdParser(MLXARCHIVE_EXEC)
+Mlxarchive::Mlxarchive() : CommandLineRequester(MLXARCHIVE_EXEC " OPTIONS"), _cmdParser(MLXARCHIVE_EXEC)
 {
     initCmdParser();
-    _binsDir  = "";
-    _outFile  = "";
-    _version  = "";
+    _binsDir = "";
+    _outFile = "";
+    _version = "";
     _mfa2file = "";
     _printMiniDump = false;
 }
@@ -103,12 +101,16 @@ Mlxarchive::Mlxarchive() :
 void Mlxarchive::initCmdParser()
 {
     AddDescription("Allows the user to create a file with the MFA2 extension. The new file contains several "
-                    "binary files of a given firmware for different adapter cards.");
-    AddOptions(HELP_FLAG,         HELP_FLAG_SHORT,     "", "Show help message and exit");
-    AddOptions(VERSION_FLAG,      VERSION_FLAG_SHORT,  "version", "MFA2 version in the following format: x.x.x, if creating MFA2 file or existing MFA2 file for print its version");
-    AddOptions(OUT_FILE_FLAG,     OUT_FILE_FLAG_SHORT, "out_file", "Output file");
-    AddOptions(BINS_DIR_FLAG,     BINS_DIR_FLAG_SHORT, "bins_dir", "Directory with the binaries files");
-    AddOptions(MFA2_FILE_FLAG,    MFA2_FILE_FLAG_SHORT, "mfa2_file", "Mfa2 file to parse");
+                   "binary files of a given firmware for different adapter cards.");
+    AddOptions(HELP_FLAG, HELP_FLAG_SHORT, "", "Show help message and exit");
+    AddOptions(
+      VERSION_FLAG,
+      VERSION_FLAG_SHORT,
+      "version",
+      "MFA2 version in the following format: x.x.x, if creating MFA2 file or existing MFA2 file for print its version");
+    AddOptions(OUT_FILE_FLAG, OUT_FILE_FLAG_SHORT, "out_file", "Output file");
+    AddOptions(BINS_DIR_FLAG, BINS_DIR_FLAG_SHORT, "bins_dir", "Directory with the binaries files");
+    AddOptions(MFA2_FILE_FLAG, MFA2_FILE_FLAG_SHORT, "mfa2_file", "Mfa2 file to parse");
     _cmdParser.AddRequester(this);
 }
 
@@ -120,118 +122,154 @@ void Mlxarchive::paramValidate()
     smatch match;
     bool status_match;
     bool success = true;
-    if(!_mfa2file.empty()) {
-        if(!(_binsDir.empty() && _outFile.empty() && _version.empty())) {
+    if (!_mfa2file.empty())
+    {
+        if (!(_binsDir.empty() && _outFile.empty() && _version.empty()))
+        {
             fprintf(stderr, "Cannot use any parameter when using mfa2_file parameter!\n");
             exit(1);
         }
         return;
     }
 
-    if (_binsDir.empty() && _outFile.empty()) {
-        if (!_version.empty()) {
+    if (_binsDir.empty() && _outFile.empty())
+    {
+        if (!_version.empty())
+        {
             _printMiniDump = true;
             _mfa2file = _version;
             _version.clear();
         }
-        else {//all three options are empty!
+        else
+        { // all three options are empty!
             fprintf(stderr, big_err.c_str(), "bins_dir", "out_file", "version");
             success = false;
         }
     }
-    else {
-        if (_binsDir.empty()) {
+    else
+    {
+        if (_binsDir.empty())
+        {
             fprintf(stderr, err.c_str(), "bins_dir");
             success = false;
         }
-        if (_outFile.empty()) {
+        if (_outFile.empty())
+        {
             fprintf(stderr, err.c_str(), "out_file");
             success = false;
         }
-        else {
-            if (fexists(_outFile)) {
-                if (!isFile(_outFile)) {
+        else
+        {
+            if (fexists(_outFile))
+            {
+                if (!isFile(_outFile))
+                {
                     fprintf(stderr, "Output file: %s is expected to be a file\n", _outFile.c_str());
                 }
-                else {
+                else
+                {
                     fprintf(stderr, "Output file: %s already exists\n", _outFile.c_str());
                 }
                 success = false;
             }
         }
-        if (_version.empty()) {
+        if (_version.empty())
+        {
             fprintf(stderr, err.c_str(), "version");
             success = false;
         }
-        else {
+        else
+        {
             regex version_expression("^[0-9].[0-9].[0-9]$");
             status_match = regex_match(_version, match, version_expression);
-            if (!status_match) {
+            if (!status_match)
+            {
                 fprintf(stderr, err_regex.c_str(), "version", _version.c_str(), "x.x.x");
                 success = false;
             }
         }
     }
-    if(!success) {
+    if (!success)
+    {
         exit(1);
     }
 }
 
 ParseStatus Mlxarchive::HandleOption(string name, string value)
 {
-    if (name == HELP_FLAG) {
+    if (name == HELP_FLAG)
+    {
         cout << _cmdParser.GetUsage();
         return PARSE_OK_WITH_EXIT;
-    } else if (name == VERSION_FLAG) {
-        if (_version.empty() == false) {
+    }
+    else if (name == VERSION_FLAG)
+    {
+        if (_version.empty() == false)
+        {
             cout << "Version flag cannot be specified more than once" << endl;
             return PARSE_ERROR;
         }
         _version = value;
         return PARSE_OK;
-    } else if (name == OUT_FILE_FLAG) {
-        if (_outFile.empty() == false) {
+    }
+    else if (name == OUT_FILE_FLAG)
+    {
+        if (_outFile.empty() == false)
+        {
             cout << "Output file flag cannot be specified more than once" << endl;
             return PARSE_ERROR;
         }
         _outFile = value;
         return PARSE_OK;
-    } else if (name == BINS_DIR_FLAG) {
-        if (_binsDir.empty() == false) {
+    }
+    else if (name == BINS_DIR_FLAG)
+    {
+        if (_binsDir.empty() == false)
+        {
             cout << "Binary directory flag cannot be specified more than once" << endl;
             return PARSE_ERROR;
         }
         _binsDir = value;
         return PARSE_OK;
-    } else if (name == MFA2_FILE_FLAG) {
-        if (_mfa2file.empty() == false) {
+    }
+    else if (name == MFA2_FILE_FLAG)
+    {
+        if (_mfa2file.empty() == false)
+        {
             cout << "MFA2 file flag cannot be specified more than once" << endl;
             return PARSE_ERROR;
         }
         _mfa2file = value;
         return PARSE_OK;
     }
-    else{
+    else
+    {
         cout << "Unknown flag specified" << endl;
         return PARSE_ERROR;
     }
- return PARSE_ERROR;
+    return PARSE_ERROR;
 }
 
-int Mlxarchive::run(int argc, char **argv)
+int Mlxarchive::run(int argc, char** argv)
 {
     ParseStatus rc = _cmdParser.ParseOptions(argc, argv);
-    if (rc == PARSE_OK_WITH_EXIT) {
+    if (rc == PARSE_OK_WITH_EXIT)
+    {
         return 0;
-    } else if (rc == PARSE_ERROR) {
-        cerr << "Failed to parse arguments: " <<  _cmdParser.GetErrDesc() << endl;
+    }
+    else if (rc == PARSE_ERROR)
+    {
+        cerr << "Failed to parse arguments: " << _cmdParser.GetErrDesc() << endl;
         return 1;
-    } else if (rc == PARSE_ERROR_SHOW_USAGE) {
+    }
+    else if (rc == PARSE_ERROR_SHOW_USAGE)
+    {
         cerr << "Failed to parse arguments: " << _cmdParser.GetErrDesc() << endl;
         return 1;
     }
     paramValidate();
-    if(_mfa2file.empty()) {
+    if (_mfa2file.empty())
+    {
         string outputFile = _outFile;
         string content = "";
         vector<u_int8_t> buff;
@@ -241,21 +279,27 @@ int Mlxarchive::run(int argc, char **argv)
 
         buff.clear();
         mfa2PackageGen.generateBinFromFWDirectory(dir, version, buff);
-        //Save output to a file
-        if (!writeToFile(outputFile, buff)) {
-            fprintf(stderr, "-E- Cannot write to the file %s\n",   outputFile.c_str());
+        // Save output to a file
+        if (!writeToFile(outputFile, buff))
+        {
+            fprintf(stderr, "-E- Cannot write to the file %s\n", outputFile.c_str());
             exit(1);
         }
-    } else {
-        MFA2 * mfa2Pkg = MFA2::LoadMFA2Package(_mfa2file);
-        if(!mfa2Pkg) {
+    }
+    else
+    {
+        MFA2* mfa2Pkg = MFA2::LoadMFA2Package(_mfa2file);
+        if (!mfa2Pkg)
+        {
             fprintf(stderr, "-E- Failed to parse mfa2 file %s\n", _mfa2file.c_str());
             exit(1);
         }
-        if (_printMiniDump) {
+        if (_printMiniDump)
+        {
             mfa2Pkg->minidump();
         }
-        else {
+        else
+        {
             mfa2Pkg->dump();
         }
         delete mfa2Pkg;
@@ -264,18 +308,20 @@ int Mlxarchive::run(int argc, char **argv)
     return 0;
 }
 
-Mlxarchive::~Mlxarchive() {};
+Mlxarchive::~Mlxarchive(){};
 
 bool writeToFile(const string& fname, const vector<u_int8_t>& data)
 {
     FILE* fh;
 
-    if ((fh = fopen(fname.c_str(), "wb")) == NULL) {
+    if ((fh = fopen(fname.c_str(), "wb")) == NULL)
+    {
         return false;
     }
 
     // Write output
-    if (fwrite(data.data(), 1, data.size(), fh) != data.size()) {
+    if (fwrite(data.data(), 1, data.size(), fh) != data.size())
+    {
         fclose(fh);
         return false;
     }
diff --git a/mlxarchive/mlxarchive.h b/mlxarchive/mlxarchive.h
index 0fd841f0..96ad9f10 100644
--- a/mlxarchive/mlxarchive.h
+++ b/mlxarchive/mlxarchive.h
@@ -32,29 +32,29 @@
  * SOFTWARE.
  */
 
-
 #include <iostream>
 #include <cmdparser/cmdparser.h>
 
-namespace mlxarchive {
-    class Mlxarchive : public CommandLineRequester
-    {
-    public:
-        Mlxarchive();
-        ~Mlxarchive();
-        ParseStatus HandleOption(string name, string value);
-        int run(int agc, char **argv);
+namespace mlxarchive
+{
+class Mlxarchive : public CommandLineRequester
+{
+public:
+    Mlxarchive();
+    ~Mlxarchive();
+    ParseStatus HandleOption(string name, string value);
+    int run(int agc, char** argv);
 
-    private:
-        void initCmdParser();
-        void printHelp();
-        void paramValidate();
-        CommandLineParser _cmdParser;
-        std::string _binsDir;
-        std::string _outFile;
-        std::string _date;
-        std::string _version;
-        std::string _mfa2file;
-        bool _printMiniDump;
-    };
-}
+private:
+    void initCmdParser();
+    void printHelp();
+    void paramValidate();
+    CommandLineParser _cmdParser;
+    std::string _binsDir;
+    std::string _outFile;
+    std::string _date;
+    std::string _version;
+    std::string _mfa2file;
+    bool _printMiniDump;
+};
+} // namespace mlxarchive
diff --git a/mlxarchive/mlxarchive_mfa2.cpp b/mlxarchive/mlxarchive_mfa2.cpp
index 27ae9af0..c582e338 100644
--- a/mlxarchive/mlxarchive_mfa2.cpp
+++ b/mlxarchive/mlxarchive_mfa2.cpp
@@ -70,58 +70,48 @@ void MFA2::packDescriptors(vector<u_int8_t>& buff) const
 {
     _fingerPrint.pack(buff);
     _packageDescriptor.pack(buff);
-    CONST_VECTOR_ITERATOR(DeviceDescriptor, _deviceDescriptors, it) {
-        (*it).pack(buff);
-    }
-    CONST_VECTOR_ITERATOR(Component, _components, it) {
-        (*it).packDescriptor(buff);
-    }
+    CONST_VECTOR_ITERATOR(DeviceDescriptor, _deviceDescriptors, it) { (*it).pack(buff); }
+    CONST_VECTOR_ITERATOR(Component, _components, it) { (*it).packDescriptor(buff); }
 }
 
 void MFA2::pack(vector<u_int8_t>& buff)
 {
-    //find size of components block:
+    // find size of components block:
     u_int64_t componentsBlockSize = 0;
-    CONST_VECTOR_ITERATOR(Component, _components, it) {
-        componentsBlockSize += (*it).getComponentBinarySize();
-    }
+    CONST_VECTOR_ITERATOR(Component, _components, it) { componentsBlockSize += (*it).getComponentBinarySize(); }
     _packageDescriptor.setComponentsBlockSize(componentsBlockSize);
 
     _fingerPrint.pack(buff);
 
     _packageDescriptor.pack(buff);
 
-    CONST_VECTOR_ITERATOR(DeviceDescriptor, _deviceDescriptors, it) {
-        (*it).pack(buff);
-    }
+    CONST_VECTOR_ITERATOR(DeviceDescriptor, _deviceDescriptors, it) { (*it).pack(buff); }
 
-    CONST_VECTOR_ITERATOR(Component, _components, it) {
-        (*it).packDescriptor(buff);
-    }
+    CONST_VECTOR_ITERATOR(Component, _components, it) { (*it).packDescriptor(buff); }
 
     _packageDescriptor.setComponentsBlockOffset(buff.size());
 
-    //compress components block
+    // compress components block
     vector<u_int8_t> componentsBlockBuff;
-    VECTOR_ITERATOR(Component, _components, it) {
+    VECTOR_ITERATOR(Component, _components, it)
+    {
         (*it).setComponentBinaryOffset(componentsBlockBuff.size());
         (*it).packData(componentsBlockBuff);
     }
     u_int32_t zippedSize = componentsBlockBuff.size();
-    zippedSize = xz_compress_crc32(8, componentsBlockBuff.data(),
-            componentsBlockBuff.size(), NULL, 0);
+    zippedSize = xz_compress_crc32(8, componentsBlockBuff.data(), componentsBlockBuff.size(), NULL, 0);
     if (zippedSize <= 0)
     {
-        //TODO throw exception
+        // TODO throw exception
         printf("-E- Error while compressing\n");
         exit(1);
     }
     _packageDescriptor.setComponentsBlockArchiveSize(zippedSize);
     vector<u_int8_t> zippedComponentBlockBuff(zippedSize);
-    xz_compress_crc32(9, componentsBlockBuff.data(), componentsBlockBuff.size(),
-            zippedComponentBlockBuff.data(), zippedSize);
+    xz_compress_crc32(9, componentsBlockBuff.data(), componentsBlockBuff.size(), zippedComponentBlockBuff.data(),
+                      zippedSize);
 
-    //compute descriptors SHA256
+    // compute descriptors SHA256
     vector<u_int8_t> descriptorsBuff;
     packDescriptors(descriptorsBuff);
     vector<u_int8_t> digest;
@@ -130,14 +120,13 @@ void MFA2::pack(vector<u_int8_t>& buff)
     mlxSignSHA256.getDigest(digest);
     _packageDescriptor.setDescriptorsSHA256(digest);
 
-    //append the zipped components block
+    // append the zipped components block
     packBytesArray(zippedComponentBlockBuff.data(), zippedComponentBlockBuff.size(), buff);
 
-    //compute SHA256
+    // compute SHA256
     mlxSignSHA256 << zippedComponentBlockBuff;
     mlxSignSHA256.getDigest(digest);
     _packageDescriptor.setSHA256(digest);
-
 }
 
 /*void MFA2::update(vector<u_int8_t>& buff)
@@ -152,46 +141,51 @@ void MFA2::generateBinary(vector<u_int8_t>& buff)
 {
     vector<u_int8_t> tmpBuff;
 
-    //do first pass
+    // do first pass
     pack(tmpBuff);
 
-    //do second pass
+    // do second pass
     pack(buff);
 
-    //compute SHA256
-
+    // compute SHA256
 }
 
-MFA2 * MFA2::LoadMFA2Package(const string & file_name) {
+MFA2* MFA2::LoadMFA2Package(const string& file_name)
+{
     Mfa2Buffer mfa2buff;
-    if(!mfa2buff.loadFile(file_name)) {
+    if (!mfa2buff.loadFile(file_name))
+    {
         fprintf(stderr, "Failed to load mfa2 package: %s\n", file_name.c_str());
         return NULL;
     }
     FingerPrint finger_print("");
     VersionExtension version("");
-    PackageDescriptor        packageDescriptor(0, 0, version);
+    PackageDescriptor packageDescriptor(0, 0, version);
     vector<DeviceDescriptor> deviceDescriptors;
-    vector<Component>        components;
-    MFA2 * mfa2pkg = new MFA2(packageDescriptor, deviceDescriptors, components);
-    if(!mfa2pkg->unpack(mfa2buff)) {
+    vector<Component> components;
+    MFA2* mfa2pkg = new MFA2(packageDescriptor, deviceDescriptors, components);
+    if (!mfa2pkg->unpack(mfa2buff))
+    {
         delete mfa2pkg;
-        mfa2pkg =  NULL;
+        mfa2pkg = NULL;
         return NULL;
     }
     mfa2pkg->setBufferAndZipOffset(mfa2buff.getBuffer(), mfa2buff.getSize(), mfa2buff.tell());
     return mfa2pkg;
 }
 
-bool MFA2::unpack(Mfa2Buffer & buff) {
-    if (!_fingerPrint.unpack(buff)) {
+bool MFA2::unpack(Mfa2Buffer& buff)
+{
+    if (!_fingerPrint.unpack(buff))
+    {
         return false;
     }
     _packageDescriptor.unpack(buff);
     u_int16_t devCount = _packageDescriptor.getDeviceDescriptorsCount();
     u_int16_t compCount = _packageDescriptor.getComponentsCount();
 
-    for(u_int16_t devIdx=0; devIdx<devCount; devIdx++) {
+    for (u_int16_t devIdx = 0; devIdx < devCount; devIdx++)
+    {
         vector<ComponentPointerExtension> componentPointers;
         PSIDExtension psidExt("");
         DeviceDescriptor devDescriptor(componentPointers, psidExt);
@@ -199,7 +193,8 @@ bool MFA2::unpack(Mfa2Buffer & buff) {
         _deviceDescriptors.push_back(devDescriptor);
     }
 
-    for(u_int16_t compIdx=0; compIdx<compCount; compIdx++) {
+    for (u_int16_t compIdx = 0; compIdx < compCount; compIdx++)
+    {
         VersionExtension version("");
         ComponentDescriptor compDescriptor(version, "");
         compDescriptor.unpack(buff);
@@ -210,36 +205,39 @@ bool MFA2::unpack(Mfa2Buffer & buff) {
     return true;
 }
 
-void MFA2::minidump() {
+void MFA2::minidump()
+{
     printf("Package Version : %s\n", _packageDescriptor.getVersionExtension().getVersion(false).c_str());
 }
 
-void MFA2::dump() {
-    //printf("Finger print    : %s\n", _fingerPrint.toString().c_str());
+void MFA2::dump()
+{
+    // printf("Finger print    : %s\n", _fingerPrint.toString().c_str());
     u_int16_t devCount = _packageDescriptor.getDeviceDescriptorsCount();
-    //u_int16_t compCount = _packageDescriptor.getComponentsCount();
+    // u_int16_t compCount = _packageDescriptor.getComponentsCount();
     printf("Package Version : %s\n", _packageDescriptor.getVersionExtension().getVersion(false).c_str());
     printf("Creation Time   : %s\n", _packageDescriptor.getVersionExtension().getDateAndTime().c_str());
-    //printf("Extensions      : %u\n", _packageDescriptor.getExtensionsCount());
+    // printf("Extensions      : %u\n", _packageDescriptor.getExtensionsCount());
     printf("Devices         : %u\n", devCount);
-    for(u_int16_t index=0; index < devCount; index++) {
-        DeviceDescriptor & devDescriptor = _deviceDescriptors[index];
+    for (u_int16_t index = 0; index < devCount; index++)
+    {
+        DeviceDescriptor& devDescriptor = _deviceDescriptors[index];
         string psid = devDescriptor.getPSIDExtension().getString();
         u_int8_t compPtrCount = devDescriptor.getComponentPointerExtensionsCount();
         printf("    PSID       : %s\n", psid.c_str());
         printf("    Num of Images : %u\n", compPtrCount);
-        for(u_int8_t comp=0; comp < compPtrCount; comp++) {
-            const ComponentPointerExtension & compPtr = devDescriptor.getComponentPointerExtension(comp);
+        for (u_int8_t comp = 0; comp < compPtrCount; comp++)
+        {
+            const ComponentPointerExtension& compPtr = devDescriptor.getComponentPointerExtension(comp);
             u_int16_t compIndex = compPtr.getComponentIndex();
             Component compObj = _components[compIndex];
-            const ComponentDescriptor & compDescr = compObj.getComponentDescriptor();
+            const ComponentDescriptor& compDescr = compObj.getComponentDescriptor();
             printf("        Index   : %u\n", compIndex);
             printf("        Version : %s\n", compDescr.getVersionExtension().getVersion(true).c_str());
-            char buffer[32] = { 0 };
+            char buffer[32] = {0};
             compDescr.getVersionExtension().getDateAndTime(buffer);
             printf("        Date    : %s\n", buffer);
         }
-
     }
 }
 
@@ -253,16 +251,21 @@ bool MFA2::extractComponent(Component* requiredComponent, vector<u_int8_t>& fwBi
     unzippedBlockBuff.resize(totalSize);
     vector<u_int8_t> zippedBuff = getBuffer();
     u_int8_t* zippedData = (u_int8_t*)zippedBuff.data() + zipOffset;
-    int32_t retVal = xz_decompress_crc32(zippedData, zippedBuff.size() - zipOffset, unzippedBlockBuff.data(), totalSize);
-    if (retVal != (int32_t)totalSize) {
+    int32_t retVal =
+      xz_decompress_crc32(zippedData, zippedBuff.size() - zipOffset, unzippedBlockBuff.data(), totalSize);
+    if (retVal != (int32_t)totalSize)
+    {
         printf("Decompress error occurred %s\n", xz_get_error(retVal));
         return false;
     }
     u_int32_t requiredOffset = requiredComponent->getBinaryComponentOffset();
     u_int32_t componentBinarySize = requiredComponent->getComponentBinarySize() - strlen(FINGERPRINT_MFA2);
     fwBinaryData.resize(componentBinarySize);
-    for (unsigned int index = 0; index < componentBinarySize; index++) {
-        fwBinaryData[index] = unzippedBlockBuff[requiredOffset + index + strlen(FINGERPRINT_MFA2)];//skip 16 bytes from decompressed file !
+    for (unsigned int index = 0; index < componentBinarySize; index++)
+    {
+        fwBinaryData[index] =
+          unzippedBlockBuff[requiredOffset + index + strlen(FINGERPRINT_MFA2)]; // skip 16 bytes from decompressed file
+                                                                                // !
     }
     return true;
 }
@@ -270,16 +273,20 @@ bool MFA2::extractComponent(Component* requiredComponent, vector<u_int8_t>& fwBi
 bool MFA2::unzipLatestVersionComponent(map_string_to_component& matchingComponentsMap, vector<u_int8_t>& fwBinaryData)
 {
     map_string_to_component::iterator itAtKey = matchingComponentsMap.find(_latestComponentKey);
-    if (itAtKey == matchingComponentsMap.end()) {
+    if (itAtKey == matchingComponentsMap.end())
+    {
         return false;
     }
     Component* requiredComponent = &itAtKey->second;
     return extractComponent(requiredComponent, fwBinaryData);
 }
 
-bool MFA2::unzipComponent(map_string_to_component& matchingComponentsMap, u_int32_t choice, vector<u_int8_t>& fwBinaryData)
+bool MFA2::unzipComponent(map_string_to_component& matchingComponentsMap,
+                          u_int32_t choice,
+                          vector<u_int8_t>& fwBinaryData)
 {
-    if (choice >= matchingComponentsMap.size()) {
+    if (choice >= matchingComponentsMap.size())
+    {
         return false;
     }
     map_string_to_component::iterator itAtOffset = matchingComponentsMap.begin();
@@ -297,47 +304,58 @@ map_string_to_component MFA2::getMatchingComponents(char* device_psid, u_int16_t
     u_int8_t deviceMajorVer = (u_int8_t)fw_ver[0];
     u_int8_t deviceMinorVer = (u_int8_t)fw_ver[1];
     u_int16_t deviceSubMinorVer = fw_ver[2];
-    for (u_int16_t index = 0; index < devCount; index++) {
+    for (u_int16_t index = 0; index < devCount; index++)
+    {
         DeviceDescriptor devDescriptor = getDeviceDescriptor(index);
         string psid = devDescriptor.getPSIDExtension().getString();
-        if (device_psid != NULL) {
-            if (strcmp((char*)psid.c_str(), device_psid)) {
+        if (device_psid != NULL)
+        {
+            if (strcmp((char*)psid.c_str(), device_psid))
+            {
                 continue;
             }
         }
         u_int8_t compPtrCount = devDescriptor.getComponentPointerExtensionsCount();
-        for (u_int8_t comp = 0; comp < compPtrCount; comp++) {
+        for (u_int8_t comp = 0; comp < compPtrCount; comp++)
+        {
             const ComponentPointerExtension& compPtr = devDescriptor.getComponentPointerExtension(comp);
             u_int16_t compIndex = compPtr.getComponentIndex();
             Component compObj = getComponentObject(compIndex);
-            const ComponentDescriptor & compDescr = compObj.getComponentDescriptor();
+            const ComponentDescriptor& compDescr = compObj.getComponentDescriptor();
             u_int8_t majorVer = compDescr.getVersionExtension().getMajor();
             u_int8_t minorVer = compDescr.getVersionExtension().getMinor();
             u_int16_t subMinorVer = compDescr.getVersionExtension().getSubMinor();
-            if (deviceMajorVer != 0xff) {
-                if (deviceMajorVer != majorVer) {
+            if (deviceMajorVer != 0xff)
+            {
+                if (deviceMajorVer != majorVer)
+                {
                     continue;
                 }
             }
-            if (deviceMinorVer != 0xff) {
-                if (minorVer != deviceMinorVer) {
+            if (deviceMinorVer != 0xff)
+            {
+                if (minorVer != deviceMinorVer)
+                {
                     continue;
                 }
             }
-            if (deviceSubMinorVer != 0xffff) {
-                if (subMinorVer != deviceSubMinorVer) {
+            if (deviceSubMinorVer != 0xffff)
+            {
+                if (subMinorVer != deviceSubMinorVer)
+                {
                     continue;
                 }
             }
-            char dateTimeBuffer[32] = { 0 };
+            char dateTimeBuffer[32] = {0};
             compDescr.getVersionExtension().getDateAndTime(dateTimeBuffer);
             VersionExtension currentVersion = compDescr.getVersionExtension();
             string currentVersionString = currentVersion.getVersion(true);
             string mapKey = currentVersionString + "  " + dateTimeBuffer;
             matchingComponentsMap.insert(std::pair<string, Component>(mapKey, compObj));
             Version version(currentVersionString);
-            //find the latest matching FW version
-            if (version > currentLatestVersion) {
+            // find the latest matching FW version
+            if (version > currentLatestVersion)
+            {
                 currentLatestVersion = version;
                 _latestComponentKey = mapKey;
             }
@@ -345,4 +363,3 @@ map_string_to_component MFA2::getMatchingComponents(char* device_psid, u_int16_t
     }
     return matchingComponentsMap;
 }
-
diff --git a/mlxarchive/mlxarchive_mfa2.h b/mlxarchive/mlxarchive_mfa2.h
index 1493e152..95c95b00 100644
--- a/mlxarchive/mlxarchive_mfa2.h
+++ b/mlxarchive/mlxarchive_mfa2.h
@@ -54,66 +54,59 @@
 
 using namespace std;
 
+namespace mfa2
+{
+typedef map<string, Component> map_string_to_component;
+class MFA2
+{
+private:
+    FingerPrint _fingerPrint;
+    PackageDescriptor _packageDescriptor;
+    vector<DeviceDescriptor> _deviceDescriptors;
+    vector<Component> _components;
+    string _latestComponentKey;
+    long _zipOffset;
+    // void updateSHA256();
+    vector<u_int8_t> mfa2Buffer;
+    void pack(vector<u_int8_t>& buff);
+    void packDescriptors(vector<u_int8_t>& buff) const;
+    bool unpack(Mfa2Buffer& buff);
+    bool extractComponent(Component* requiredComponent, vector<u_int8_t>& fwBinaryData);
 
+public:
+    MFA2(PackageDescriptor packageDescriptor, vector<DeviceDescriptor> deviceDescriptors, vector<Component> components) :
+        _fingerPrint(MFA2_FINGER_PRINT),
+        _packageDescriptor(packageDescriptor),
+        _deviceDescriptors(deviceDescriptors),
+        _components(components),
+        _zipOffset(0){};
 
-namespace mfa2 {
-    typedef map <string, Component> map_string_to_component;
-    class MFA2 {
-    private:
+    virtual ~MFA2() {}
+    static MFA2* LoadMFA2Package(const string& file_name);
+    void generateBinary(vector<u_int8_t>& buff);
+    void dump();
+    void minidump();
+    PackageDescriptor getPackageDescriptor() const { return _packageDescriptor; }
 
-        FingerPrint              _fingerPrint;
-        PackageDescriptor        _packageDescriptor;
-        vector<DeviceDescriptor> _deviceDescriptors;
-        vector<Component>        _components;
-        string                   _latestComponentKey;
-        long _zipOffset;
-        //void updateSHA256();
-        vector<u_int8_t> mfa2Buffer;
-        void pack(vector<u_int8_t>& buff);
-        void packDescriptors(vector<u_int8_t>& buff) const;
-        bool unpack(Mfa2Buffer & buff);
-        bool extractComponent(Component* requiredComponent, vector<u_int8_t>& fwBinaryData);
-    public:
-        MFA2(PackageDescriptor packageDescriptor,
-            vector<DeviceDescriptor> deviceDescriptors,
-            vector<Component> components) :
-            _fingerPrint(MFA2_FINGER_PRINT),
-            _packageDescriptor(packageDescriptor),
-            _deviceDescriptors(deviceDescriptors),
-            _components(components), _zipOffset(0){};
+    DeviceDescriptor getDeviceDescriptor(int index) const { return _deviceDescriptors[index]; }
 
-        virtual ~MFA2() {}
-        static MFA2 * LoadMFA2Package(const string & file_name);
-        void generateBinary(vector<u_int8_t>& buff);
-        void dump();
-        void minidump();
-        PackageDescriptor getPackageDescriptor() const {
-            return _packageDescriptor;
-        }
-
-        DeviceDescriptor getDeviceDescriptor(int index) const {
-            return _deviceDescriptors[index];
-        }
+    Component getComponentObject(int compIndex) const { return _components[compIndex]; }
 
-        Component getComponentObject(int compIndex) const {
-            return _components[compIndex];
-        }
-
-        void setBufferAndZipOffset(u_int8_t* buffer, long length, long zipOffset)
+    void setBufferAndZipOffset(u_int8_t* buffer, long length, long zipOffset)
+    {
+        mfa2Buffer.resize(length);
+        for (int i = 0; i < length; i++)
         {
-            mfa2Buffer.resize(length);
-            for (int i = 0; i < length; i++) {
-                mfa2Buffer[i] = buffer[i];
-            }
-            _zipOffset = zipOffset;
+            mfa2Buffer[i] = buffer[i];
         }
+        _zipOffset = zipOffset;
+    }
 
-        vector<u_int8_t> getBuffer() {
-            return mfa2Buffer;
-        }
-        map_string_to_component getMatchingComponents(char* psid, u_int16_t fw_ver[3]);
-        bool unzipComponent(map_string_to_component& matchingComponentsMap, u_int32_t choice, vector<u_int8_t>& fwBinaryData);
-        bool unzipLatestVersionComponent(map_string_to_component& matchingComponentsMap, vector<u_int8_t>& fwBinaryData);
-    };
-}
+    vector<u_int8_t> getBuffer() { return mfa2Buffer; }
+    map_string_to_component getMatchingComponents(char* psid, u_int16_t fw_ver[3]);
+    bool
+      unzipComponent(map_string_to_component& matchingComponentsMap, u_int32_t choice, vector<u_int8_t>& fwBinaryData);
+    bool unzipLatestVersionComponent(map_string_to_component& matchingComponentsMap, vector<u_int8_t>& fwBinaryData);
+};
+} // namespace mfa2
 #endif
diff --git a/mlxarchive/mlxarchive_mfa2_builder.cpp b/mlxarchive/mlxarchive_mfa2_builder.cpp
index 609a570e..2266cf8a 100644
--- a/mlxarchive/mlxarchive_mfa2_builder.cpp
+++ b/mlxarchive/mlxarchive_mfa2_builder.cpp
@@ -48,18 +48,18 @@
 
 using namespace mfa2;
 
-#define VERSION_STR             "Version"
-#define CREATION_TIME_STR       "Creation Time"
-#define COMMENT_STR             "Comment"
-#define DEVICEDESCRIPTORS_STR   "Device Descriptors"
-#define COMPONENTS_STR          "Components"
-#define PSID_STR                "PSID"
-#define SOURCE_STR              "Source"
+#define VERSION_STR "Version"
+#define CREATION_TIME_STR "Creation Time"
+#define COMMENT_STR "Comment"
+#define DEVICEDESCRIPTORS_STR "Device Descriptors"
+#define COMPONENTS_STR "Components"
+#define PSID_STR "PSID"
+#define SOURCE_STR "Source"
 
 /* Class FWDirectoryBuilder */
 
 FWDirectoryBuilder::FWDirectoryBuilder(const string& version, string directory) :
-                _version(VersionExtension(version)), _directory(directory)
+    _version(VersionExtension(version)), _directory(directory)
 {
     string fileExtension = ".bin";
     vector<string> files;
@@ -68,60 +68,66 @@ FWDirectoryBuilder::FWDirectoryBuilder(const string& version, string directory)
     {
         listDir(directory.c_str(), files);
     }
-    catch(std::exception& e)
+    catch (std::exception& e)
     {
         std::string err_str = "locale::facet::_S_create_c_locale name not valid";
-        if(!err_str.compare(e.what()))
+        if (!err_str.compare(e.what()))
         {
-            fprintf(stderr, "Exception: '%s' was catched.\nPlease try to add the following line into your /etc/profile file and retry:\nexport LC_ALL=C; unset LANGUAGE\n"
-            "Please note, you need to reload the .profile file, after editing. \nsource /etc/profile might help.\n", e.what());
+            fprintf(
+              stderr,
+              "Exception: '%s' was catched.\nPlease try to add the following line into your /etc/profile file and retry:\nexport LC_ALL=C; unset LANGUAGE\n"
+              "Please note, you need to reload the .profile file, after editing. \nsource /etc/profile might help.\n",
+              e.what());
             exit(1);
         }
         throw e;
     }
-    VECTOR_ITERATOR(string, files, file) {
-      if ((*file).rfind(fileExtension) == ((*file).size() - fileExtension.size())) {
-        string fullPath = directory + "/" + (*file);
-        //_files.push_back(fullPath);
-
-        //Query FW Image retrieve version, date, psid info
-        char errBuff[1024];
-        FwOperations* ops = FwOperations::FwOperationsCreate(
-                (void*)fullPath.c_str(), NULL, NULL, FHT_FW_FILE, errBuff,
-                1024);
-        if (!ops) {
-            printf("Can't handle the FW image file %s\n", fullPath.c_str());
-            exit(1);
-        }
-        fw_info_t fwQueryResult;
-        if (!ops->FwQuery(&fwQueryResult, true, false)) {
-            //throw exception
-            printf("Can't query FW image file %s:%s\n", fullPath.c_str(), ops->err());
-            exit(1);
-        }
-        /*FWInfo fwInfo;
-        memcpy(fwInfo.version, fwQueryResult.fw_info.fw_ver, sizeof(fwInfo.version));
-        memcpy(fwInfo.date, fwQueryResult.fw_info.fw_rel_date, sizeof(fwInfo.date));
-        fwInfo.psid = fwQueryResult.fw_info.psid;
-        _fwInfo[fullPath] = fwInfo;*/
-        //_imgsFwOps[fullPath] = ops;
-        vector<ComponentPointerExtension> componentPointers;
-        PSIDExtension PSID(fwQueryResult.fw_info.psid);
-        ComponentPointerExtension componentPointer(index++);
-        componentPointers.push_back(componentPointer);
-        DeviceDescriptor deviceDescriptor(componentPointers, PSID);
-        _deviceDescriptors.push_back(deviceDescriptor);
-        VersionExtension version(fwQueryResult.fw_info.fw_ver, fwQueryResult.fw_info.fw_rel_date);
-        vector<u_int8_t> data;
-        if (!ops->FwExtract4MBImage(data, true)) {
-            printf("Can't Extract FW data from the image file %s:%s\n",
-                   fullPath.c_str(), ops->err());
-            exit(1);
+    VECTOR_ITERATOR(string, files, file)
+    {
+        if ((*file).rfind(fileExtension) == ((*file).size() - fileExtension.size()))
+        {
+            string fullPath = directory + "/" + (*file);
+            //_files.push_back(fullPath);
+
+            // Query FW Image retrieve version, date, psid info
+            char errBuff[1024];
+            FwOperations* ops =
+              FwOperations::FwOperationsCreate((void*)fullPath.c_str(), NULL, NULL, FHT_FW_FILE, errBuff, 1024);
+            if (!ops)
+            {
+                printf("Can't handle the FW image file %s\n", fullPath.c_str());
+                exit(1);
+            }
+            fw_info_t fwQueryResult;
+            if (!ops->FwQuery(&fwQueryResult, true, false))
+            {
+                // throw exception
+                printf("Can't query FW image file %s:%s\n", fullPath.c_str(), ops->err());
+                exit(1);
+            }
+            /*FWInfo fwInfo;
+            memcpy(fwInfo.version, fwQueryResult.fw_info.fw_ver, sizeof(fwInfo.version));
+            memcpy(fwInfo.date, fwQueryResult.fw_info.fw_rel_date, sizeof(fwInfo.date));
+            fwInfo.psid = fwQueryResult.fw_info.psid;
+            _fwInfo[fullPath] = fwInfo;*/
+            //_imgsFwOps[fullPath] = ops;
+            vector<ComponentPointerExtension> componentPointers;
+            PSIDExtension PSID(fwQueryResult.fw_info.psid);
+            ComponentPointerExtension componentPointer(index++);
+            componentPointers.push_back(componentPointer);
+            DeviceDescriptor deviceDescriptor(componentPointers, PSID);
+            _deviceDescriptors.push_back(deviceDescriptor);
+            VersionExtension version(fwQueryResult.fw_info.fw_ver, fwQueryResult.fw_info.fw_rel_date);
+            vector<u_int8_t> data;
+            if (!ops->FwExtract4MBImage(data, true))
+            {
+                printf("Can't Extract FW data from the image file %s:%s\n", fullPath.c_str(), ops->err());
+                exit(1);
+            }
+            ComponentDescriptor componentDescriptor(version, data);
+            Component component(componentDescriptor);
+            _components.push_back(component);
         }
-        ComponentDescriptor componentDescriptor(version, data);
-        Component component(componentDescriptor);
-        _components.push_back(component);
-      }
     }
 };
 
diff --git a/mlxarchive/mlxarchive_mfa2_builder.h b/mlxarchive/mlxarchive_mfa2_builder.h
index 04024032..7b79f39b 100644
--- a/mlxarchive/mlxarchive_mfa2_builder.h
+++ b/mlxarchive/mlxarchive_mfa2_builder.h
@@ -56,28 +56,29 @@
 
 using namespace std;
 
-namespace mfa2 {
-
-class MFA2Builder {
-
+namespace mfa2
+{
+class MFA2Builder
+{
 public:
-    MFA2Builder()   {};
-    
-    virtual PackageDescriptor           getPackageDescriptor()  const = 0;
-    virtual vector<DeviceDescriptor>    getDeviceDescriptors()  const = 0;
-    virtual vector<Component>           getComponents()         const = 0;
+    MFA2Builder(){};
+
+    virtual PackageDescriptor getPackageDescriptor() const = 0;
+    virtual vector<DeviceDescriptor> getDeviceDescriptors() const = 0;
+    virtual vector<Component> getComponents() const = 0;
 
-    virtual ~MFA2Builder()  {};
+    virtual ~MFA2Builder(){};
 };
 
-class FWDirectoryBuilder : MFA2Builder {
+class FWDirectoryBuilder : MFA2Builder
+{
 private:
-    VersionExtension            _version;
-    string                      _directory;
-    vector<string>              _files;
-    //vector<FwOperations*>   _imgsFwOps;
-    vector<DeviceDescriptor>    _deviceDescriptors;
-    vector<Component>           _components;
+    VersionExtension _version;
+    string _directory;
+    vector<string> _files;
+    // vector<FwOperations*>   _imgsFwOps;
+    vector<DeviceDescriptor> _deviceDescriptors;
+    vector<Component> _components;
     /*struct FWInfo {
         string      psid;
         u_int16_t   version[3];
@@ -86,10 +87,10 @@ class FWDirectoryBuilder : MFA2Builder {
     map<string, FwOperations*> _imgsFwOps;*/
 public:
     FWDirectoryBuilder(const string& version, string directory);
-    PackageDescriptor           getPackageDescriptor()  const;
-    vector<DeviceDescriptor>    getDeviceDescriptors()  const;
-    vector<Component>           getComponents()         const;
+    PackageDescriptor getPackageDescriptor() const;
+    vector<DeviceDescriptor> getDeviceDescriptors() const;
+    vector<Component> getComponents() const;
 };
 
-}
+} // namespace mfa2
 #endif
diff --git a/mlxarchive/mlxarchive_mfa2_common_header.cpp b/mlxarchive/mlxarchive_mfa2_common_header.cpp
index 6806a066..cde2728f 100644
--- a/mlxarchive/mlxarchive_mfa2_common_header.cpp
+++ b/mlxarchive/mlxarchive_mfa2_common_header.cpp
@@ -45,17 +45,16 @@
 using namespace mfa2;
 
 CommonHeader::CommonHeader(u_int8_t version, MFA2Type type, u_int16_t length) :
-    _version(version), _type(type), _length(length)
-{
-};
+    _version(version), _type(type), _length(length){};
 
 void CommonHeader::pack(vector<u_int8_t>& buff) const
 {
     vector<u_int8_t> tmpBuff;
     struct tools_open_common_header commonHeader;
 
-    //padding buff if it is not DW aligned:
-    for (unsigned int i = 0; i < (buff.size() % 4); i++) {
+    // padding buff if it is not DW aligned:
+    for (unsigned int i = 0; i < (buff.size() % 4); i++)
+    {
         buff.push_back(0x0);
     }
     /*switch () {
@@ -73,22 +72,24 @@ void CommonHeader::pack(vector<u_int8_t>& buff) const
     tmpBuff.resize(tools_open_common_header_size(), 0x0);
 
     memset(&commonHeader, 0x0, sizeof(commonHeader));
-    commonHeader.version    = _version;
-    commonHeader.type       = (u_int8_t) _type;
-    commonHeader.length     = _length;
+    commonHeader.version = _version;
+    commonHeader.type = (u_int8_t)_type;
+    commonHeader.length = _length;
 
     tools_open_common_header_pack(&commonHeader, tmpBuff.data());
     packBytesArray(tmpBuff.data(), tmpBuff.size(), buff);
 }
 
-bool CommonHeader::unpack(Mfa2Buffer & buff) {
-    //align header
+bool CommonHeader::unpack(Mfa2Buffer& buff)
+{
+    // align header
     long pos = buff.tell();
-    if(pos % 4 != 0) {
-        buff.seek(4-(pos%4), SEEK_CUR);
+    if (pos % 4 != 0)
+    {
+        buff.seek(4 - (pos % 4), SEEK_CUR);
     }
     int arr_size = tools_open_common_header_size();
-    u_int8_t * arr = new u_int8_t[arr_size];
+    u_int8_t* arr = new u_int8_t[arr_size];
     buff.read(arr, arr_size);
     struct tools_open_common_header commonHeader;
     memset(&commonHeader, 0x0, sizeof(commonHeader));
diff --git a/mlxarchive/mlxarchive_mfa2_common_header.h b/mlxarchive/mlxarchive_mfa2_common_header.h
index bb6477a2..2a5354f6 100644
--- a/mlxarchive/mlxarchive_mfa2_common_header.h
+++ b/mlxarchive/mlxarchive_mfa2_common_header.h
@@ -52,23 +52,23 @@
 
 using namespace std;
 
-namespace mfa2 {
-
-class CommonHeader {
-
+namespace mfa2
+{
+class CommonHeader
+{
 private:
-    u_int8_t    _version;
-    MFA2Type    _type;
-    u_int16_t   _length;
+    u_int8_t _version;
+    MFA2Type _type;
+    u_int16_t _length;
 
 public:
     CommonHeader(u_int8_t version, MFA2Type type, u_int16_t length);
 
-    //inline void setLength(u_int16_t length) { _length = length; }
+    // inline void setLength(u_int16_t length) { _length = length; }
     void pack(vector<u_int8_t>& buff) const;
-    bool unpack(Mfa2Buffer & buff);
-    const u_int16_t & getLength() const {return _length;}
+    bool unpack(Mfa2Buffer& buff);
+    const u_int16_t& getLength() const { return _length; }
 };
 
-}
+} // namespace mfa2
 #endif
diff --git a/mlxarchive/mlxarchive_mfa2_component.h b/mlxarchive/mlxarchive_mfa2_component.h
index 2d5c1407..2df2fff7 100644
--- a/mlxarchive/mlxarchive_mfa2_component.h
+++ b/mlxarchive/mlxarchive_mfa2_component.h
@@ -52,43 +52,43 @@
 using namespace std;
 #define FINGERPRINT_MFA2 "#BIN.COMPONENT!#"
 
-
-namespace mfa2 {
-
-class Component {
-
+namespace mfa2
+{
+class Component
+{
 private:
-    FingerPrint         _fingerPrint;
+    FingerPrint _fingerPrint;
     ComponentDescriptor _descriptor;
 
 public:
-
-    explicit Component(ComponentDescriptor descriptor) :
-        _fingerPrint(FINGERPRINT_MFA2),
-        _descriptor(descriptor) {};
+    explicit Component(ComponentDescriptor descriptor) : _fingerPrint(FINGERPRINT_MFA2), _descriptor(descriptor){};
 
     void packDescriptor(vector<u_int8_t>& buff) const { _descriptor.pack(buff); };
-    void packData(vector<u_int8_t>& buff) {
+    void packData(vector<u_int8_t>& buff)
+    {
         _fingerPrint.pack(buff);
         _descriptor.packData(buff);
     };
     u_int32_t getComponentBinarySize() const;
     u_int64_t getBinaryComponentOffset();
     void setComponentBinaryOffset(u_int64_t offset);
-    const ComponentDescriptor & getComponentDescriptor() const { return _descriptor;}
+    const ComponentDescriptor& getComponentDescriptor() const { return _descriptor; }
 };
 
-inline u_int32_t Component::getComponentBinarySize() const {
+inline u_int32_t Component::getComponentBinarySize() const
+{
     return _fingerPrint.getSize() + _descriptor.getBinarySize();
 }
 
-inline void Component::setComponentBinaryOffset(u_int64_t offset) {
+inline void Component::setComponentBinaryOffset(u_int64_t offset)
+{
     _descriptor.setComponentBinaryOffset(offset);
 }
 
-inline u_int64_t Component::getBinaryComponentOffset() {
+inline u_int64_t Component::getBinaryComponentOffset()
+{
     return _descriptor.getComponentBinaryOffset();
 }
 
-}
+} // namespace mfa2
 #endif
diff --git a/mlxarchive/mlxarchive_mfa2_descriptor.cpp b/mlxarchive/mlxarchive_mfa2_descriptor.cpp
index 9a648e52..54d4a83b 100644
--- a/mlxarchive/mlxarchive_mfa2_descriptor.cpp
+++ b/mlxarchive/mlxarchive_mfa2_descriptor.cpp
@@ -39,7 +39,6 @@
  *      Author: Ahmad Soboh
  */
 
-
 #include "mlxarchive_mfa2_descriptor.h"
 
 using namespace mfa2;
@@ -47,7 +46,8 @@ using namespace mfa2;
 /* Class Descriptor */
 MFA2Type Descriptor::descriptorTypeToMFA2Type(DescriptorType type)
 {
-    switch (type) {
+    switch (type)
+    {
         case PackageDescriptorType:
             return MFA2Type_PACKAGE_DESCRIPTOR;
         case DeviceDescriptorType:
@@ -55,43 +55,41 @@ MFA2Type Descriptor::descriptorTypeToMFA2Type(DescriptorType type)
         case ComponentDescriptorType:
             return MFA2Type_COMPONENT_DESCRIPTOR;
         default:
-            //TODO throw exception
+            // TODO throw exception
             return MFA2Type_COMPONENT_DESCRIPTOR;
     }
 }
 
-Descriptor::Descriptor(u_int8_t version, DescriptorType type, u_int32_t length)
-    : Element(version, descriptorTypeToMFA2Type(type), length)
+Descriptor::Descriptor(u_int8_t version, DescriptorType type, u_int32_t length) :
+    Element(version, descriptorTypeToMFA2Type(type), length)
 {
 }
 
-void Descriptor::packMultiPart(u_int8_t extensionsCount, u_int16_t totalLength,
-        vector<u_int8_t>& buff) const
+void Descriptor::packMultiPart(u_int8_t extensionsCount, u_int16_t totalLength, vector<u_int8_t>& buff) const
 {
     struct tools_open_multi_part multiPart;
     vector<u_int8_t> tmpBuff(tools_open_multi_part_size(), 0x0);
 
-    CommonHeader commonHeader(0x0, MFA2Type_MULTI_PART,
-            tools_open_multi_part_size());
+    CommonHeader commonHeader(0x0, MFA2Type_MULTI_PART, tools_open_multi_part_size());
     commonHeader.pack(buff);
 
     memset(&multiPart, 0x0, sizeof(multiPart));
 
     multiPart.number_of_extensions = extensionsCount;
-    multiPart.total_length = totalLength +
-            ((extensionsCount + 1) * tools_open_common_header_size());
+    multiPart.total_length = totalLength + ((extensionsCount + 1) * tools_open_common_header_size());
 
     tools_open_multi_part_pack(&multiPart, tmpBuff.data());
 
     packBytesArray(tmpBuff.data(), tmpBuff.size(), buff);
 }
 
-bool Descriptor::unpackMultiPart(u_int8_t &extensionsCount, u_int16_t &totalLength, Mfa2Buffer & buff) {
+bool Descriptor::unpackMultiPart(u_int8_t& extensionsCount, u_int16_t& totalLength, Mfa2Buffer& buff)
+{
     CommonHeader commonHeader(0x0, MFA2Type_MULTI_PART, 0x0);
     commonHeader.unpack(buff);
     struct tools_open_multi_part multiPart;
     int arr_size = tools_open_multi_part_size();
-    u_int8_t * arr = new u_int8_t[arr_size];
+    u_int8_t* arr = new u_int8_t[arr_size];
     buff.read(arr, arr_size);
     memset(&multiPart, 0x0, arr_size);
     tools_open_multi_part_unpack(&multiPart, arr);
@@ -102,28 +100,23 @@ bool Descriptor::unpackMultiPart(u_int8_t &extensionsCount, u_int16_t &totalLeng
     return true;
 }
 
-Descriptor::~Descriptor()
-{
-    VECTOR_ITERATOR(Extension*, _extensions, it) {
-        delete (*it);
-    }
-};
+Descriptor::~Descriptor(){VECTOR_ITERATOR(Extension*, _extensions, it){delete (*it);
+}
+}
+;
 
 /* Class PackageDescriptor */
 PackageDescriptor::PackageDescriptor(u_int16_t deviceDescriptorsCount,
-                      u_int16_t componentsCount,
-                      VersionExtension version) :
-                          Descriptor(ELEMENT_VERSION,
-                                  Descriptor::PackageDescriptorType,
-                                  LENGTH),
-                          _deviceDescriptorsCount(deviceDescriptorsCount),
-                          _componentsCount(componentsCount),
-                          _version(version),
-                          _componentsBlockArchiveSize(0x0),
-                          _componentsBlockSize(0x0),
-                          _SHA256Extension(SHA256Extension::SHA256Scope_All),
-                          _descriptorsSHA256Extension(
-                                  SHA256Extension::SHA256Scope_Descriptors)
+                                     u_int16_t componentsCount,
+                                     VersionExtension version) :
+    Descriptor(ELEMENT_VERSION, Descriptor::PackageDescriptorType, LENGTH),
+    _deviceDescriptorsCount(deviceDescriptorsCount),
+    _componentsCount(componentsCount),
+    _version(version),
+    _componentsBlockArchiveSize(0x0),
+    _componentsBlockSize(0x0),
+    _SHA256Extension(SHA256Extension::SHA256Scope_All),
+    _descriptorsSHA256Extension(SHA256Extension::SHA256Scope_Descriptors)
 {
 }
 
@@ -132,61 +125,57 @@ void PackageDescriptor::pack(vector<u_int8_t>& buff) const
     vector<u_int8_t> tmpBuff;
     struct tools_open_package_descriptor packageDescriptor;
 
-    //TODO: pack the multipart, it comes before the desc' itself
-    packMultiPart(_extensions.size() + 3,
-            LENGTH + VersionExtension::LENGTH + 2 * SHA256Extension::LENGTH,
-            buff);
+    // TODO: pack the multipart, it comes before the desc' itself
+    packMultiPart(_extensions.size() + 3, LENGTH + VersionExtension::LENGTH + 2 * SHA256Extension::LENGTH, buff);
 
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
-    //pack the packageDescriptor struct
+    // pack the packageDescriptor struct
     memset(&packageDescriptor, 0x0, sizeof(packageDescriptor));
 
     packageDescriptor.num_of_devices = _deviceDescriptorsCount;
     packageDescriptor.num_of_components = _componentsCount;
     packageDescriptor.cb_offset = _componentsBlockOffset;
     packageDescriptor.cb_archive_size = _componentsBlockArchiveSize;
-    packageDescriptor.cb_size_l = (u_int32_t) _componentsBlockSize;
+    packageDescriptor.cb_size_l = (u_int32_t)_componentsBlockSize;
     packageDescriptor.cb_size_h = _componentsBlockSize >> 32;
-    //printf("cb_size_l=0x%x cb_size_h=0x%x\n",
+    // printf("cb_size_l=0x%x cb_size_h=0x%x\n",
     //        packageDescriptor.cb_size_l, packageDescriptor.cb_size_h);
-    packageDescriptor.cb_compression = 0x1; //TODO use enums
-    packageDescriptor.user_data_offset = 0x0; //TODO
+    packageDescriptor.cb_compression = 0x1;   // TODO use enums
+    packageDescriptor.user_data_offset = 0x0; // TODO
 
     tmpBuff.resize(tools_open_package_descriptor_size(), 0x0);
     tools_open_package_descriptor_pack(&packageDescriptor, tmpBuff.data());
 
     packBytesArray(tmpBuff.data(), tmpBuff.size(), buff);
 
-    //pack Version Extension
+    // pack Version Extension
     _version.pack(buff);
 
-    //pack SHA256 Extension
+    // pack SHA256 Extension
     _SHA256Extension.pack(buff);
 
-    //pack DescriptorSHA256 Extension
+    // pack DescriptorSHA256 Extension
     _descriptorsSHA256Extension.pack(buff);
 
-    //pack optional extensions
-    CONST_VECTOR_ITERATOR(Extension*, _extensions, it) {
-        (*it)->pack(buff);
-    }
-
+    // pack optional extensions
+    CONST_VECTOR_ITERATOR(Extension*, _extensions, it) { (*it)->pack(buff); }
 }
 
-bool PackageDescriptor::unpack(Mfa2Buffer & buff) {
+bool PackageDescriptor::unpack(Mfa2Buffer& buff)
+{
     u_int8_t extensionsCount;
     u_int16_t totalLength;
     unpackMultiPart(extensionsCount, totalLength, buff);
 
-    //pack common header
+    // pack common header
     _commonHeader.unpack(buff);
 
-    //unpack descriptor
+    // unpack descriptor
     struct tools_open_package_descriptor packageDescriptor;
     int arr_size = tools_open_package_descriptor_size();
-    u_int8_t * arr = new u_int8_t[arr_size];
+    u_int8_t* arr = new u_int8_t[arr_size];
     buff.read(arr, arr_size);
     memset(&packageDescriptor, 0x0, arr_size);
     tools_open_package_descriptor_unpack(&packageDescriptor, arr);
@@ -197,24 +186,25 @@ bool PackageDescriptor::unpack(Mfa2Buffer & buff) {
     _componentsCount = packageDescriptor.num_of_components;
     _componentsBlockOffset = packageDescriptor.cb_offset;
     _componentsBlockArchiveSize = packageDescriptor.cb_archive_size;
-    _componentsBlockSize = (u_int64_t)(
-            packageDescriptor.cb_size_l | (u_int64_t)packageDescriptor.cb_size_h << 32);
+    _componentsBlockSize = (u_int64_t)(packageDescriptor.cb_size_l | (u_int64_t)packageDescriptor.cb_size_h << 32);
 
     u_int8_t extIdx = 0;
-    //pack Version Extension
+    // pack Version Extension
     _version.unpack(buff);
     extIdx++;
 
-    //pack SHA256 Extension
+    // pack SHA256 Extension
     _SHA256Extension.unpack(buff);
     extIdx++;
 
-    //pack DescriptorSHA256 Extension
+    // pack DescriptorSHA256 Extension
     _descriptorsSHA256Extension.unpack(buff);
-    extIdx++;;
+    extIdx++;
+    ;
 
-    //pack optional extensions
-    for(; extIdx < extensionsCount; extIdx++) {
+    // pack optional extensions
+    for (; extIdx < extensionsCount; extIdx++)
+    {
         CommentExtension* extension = new CommentExtension("");
         extension->unpack(buff);
         addExtension(extension);
@@ -234,41 +224,36 @@ void PackageDescriptor::setSHA256(const vector<u_int8_t>& digest)
 }
 
 /* Class DeviceDescriptor */
-DeviceDescriptor::DeviceDescriptor(
-        vector<ComponentPointerExtension> componentPointers, PSIDExtension PSID)
-    : Descriptor(ELEMENT_VERSION, Descriptor::DeviceDescriptorType, LENGTH),
-      _componentPointers(componentPointers), _PSID(PSID)
-{
-};
+DeviceDescriptor::DeviceDescriptor(vector<ComponentPointerExtension> componentPointers, PSIDExtension PSID) :
+    Descriptor(ELEMENT_VERSION, Descriptor::DeviceDescriptorType, LENGTH),
+    _componentPointers(componentPointers),
+    _PSID(PSID){};
 
 void DeviceDescriptor::pack(vector<u_int8_t>& buff) const
 {
-    //TODO: pack the multipart, it comes before the desc' itself
-    packMultiPart(_extensions.size() + 2,
-            DeviceDescriptor::LENGTH + _PSID.length() +
-            ComponentPointerExtension::LENGTH,
-            buff);
+    // TODO: pack the multipart, it comes before the desc' itself
+    packMultiPart(
+      _extensions.size() + 2, DeviceDescriptor::LENGTH + _PSID.length() + ComponentPointerExtension::LENGTH, buff);
 
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
-    //pack PSID
+    // pack PSID
     _PSID.pack(buff);
 
-    //pack component pointers
-    CONST_VECTOR_ITERATOR(ComponentPointerExtension, _componentPointers, it) {
-        (*it).pack(buff);
-    }
+    // pack component pointers
+    CONST_VECTOR_ITERATOR(ComponentPointerExtension, _componentPointers, it) { (*it).pack(buff); }
 }
 
-bool DeviceDescriptor::unpack(Mfa2Buffer & buff) {
-    //unpack extensions
+bool DeviceDescriptor::unpack(Mfa2Buffer& buff)
+{
+    // unpack extensions
     u_int8_t extensionsCount;
     u_int16_t totalLength;
     unpackMultiPart(extensionsCount, totalLength, buff);
     _commonHeader.unpack(buff);
 
-    //pack PSID
+    // pack PSID
     _PSID.unpack(buff);
 
     ComponentPointerExtension compExt(0);
@@ -279,41 +264,40 @@ bool DeviceDescriptor::unpack(Mfa2Buffer & buff) {
 
 /* Class ComponentDescriptor */
 ComponentDescriptor::ComponentDescriptor(VersionExtension version, string source) :
-      Descriptor(ELEMENT_VERSION, Descriptor::ComponentDescriptorType, LENGTH),
-      _version(version)/*, _source(source)*/,
-      _componentBlockOffset(0x0), _binarySize(getFileSize(source))
+    Descriptor(ELEMENT_VERSION, Descriptor::ComponentDescriptorType, LENGTH),
+    _version(version) /*, _source(source)*/,
+    _componentBlockOffset(0x0),
+    _binarySize(getFileSize(source))
 {
     packBinFile(source, _data);
 };
 
-ComponentDescriptor::ComponentDescriptor(VersionExtension version,
-        vector<u_int8_t> data) :
-      Descriptor(ELEMENT_VERSION, Descriptor::ComponentDescriptorType, LENGTH),
-      _version(version), _componentBlockOffset(0x0), _binarySize(data.size()),
-      _data(data)
-{
-    //printf("_data.size()=%d\n", (int)_data.size());
-};
+ComponentDescriptor::ComponentDescriptor(VersionExtension version, vector<u_int8_t> data) :
+    Descriptor(ELEMENT_VERSION, Descriptor::ComponentDescriptorType, LENGTH),
+    _version(version),
+    _componentBlockOffset(0x0),
+    _binarySize(data.size()),
+    _data(data){
+      // printf("_data.size()=%d\n", (int)_data.size());
+    };
 
 void ComponentDescriptor::pack(vector<u_int8_t>& buff) const
 {
-    //TODO: pack the multipart, it comes before the desc' itself
+    // TODO: pack the multipart, it comes before the desc' itself
     /*memset(&multi_part, 0x0, sizeof(multi_part));
     multi_part.number_of_extensions = _extensions.size() +*/
-    packMultiPart(_extensions.size() + 1,
-            ComponentDescriptor::LENGTH + VersionExtension::LENGTH,
-            buff);
+    packMultiPart(_extensions.size() + 1, ComponentDescriptor::LENGTH + VersionExtension::LENGTH, buff);
 
     vector<u_int8_t> tmpBuff;
     struct tools_open_component_desciptor componentDescriptor;
 
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
-    //pack the packageDescriptor struct
+    // pack the packageDescriptor struct
     memset(&componentDescriptor, 0x0, sizeof(componentDescriptor));
-    componentDescriptor.identifier = 0x0; //TODO
-    componentDescriptor.pldm_classification = 0x0; //TODO
+    componentDescriptor.identifier = 0x0;          // TODO
+    componentDescriptor.pldm_classification = 0x0; // TODO
     componentDescriptor.cb_offset_h = _componentBlockOffset >> 32;
     componentDescriptor.cb_offset_l = (u_int32_t)_componentBlockOffset;
     componentDescriptor.size = _binarySize;
@@ -323,32 +307,32 @@ void ComponentDescriptor::pack(vector<u_int8_t>& buff) const
     packBytesArray(tmpBuff.data(), tmpBuff.size(), buff);
 
     _version.pack(buff);
-
 }
 
-bool ComponentDescriptor::unpack(Mfa2Buffer & buff) {
-    //unpack extensions
+bool ComponentDescriptor::unpack(Mfa2Buffer& buff)
+{
+    // unpack extensions
     u_int8_t extensionsCount;
     u_int16_t totalLength;
     unpackMultiPart(extensionsCount, totalLength, buff);
 
-    //unpack common header
+    // unpack common header
     _commonHeader.unpack(buff);
 
-    //unpack descriptor
+    // unpack descriptor
     struct tools_open_component_desciptor componentDescriptor;
     int arr_size = tools_open_component_desciptor_size();
-    u_int8_t * arr = new u_int8_t[arr_size];
+    u_int8_t* arr = new u_int8_t[arr_size];
     buff.read(arr, arr_size);
     memset(&componentDescriptor, 0x0, arr_size);
     tools_open_component_desciptor_unpack(&componentDescriptor, arr);
     delete[] arr;
     arr = NULL;
     _binarySize = componentDescriptor.size;
-    _componentBlockOffset = (u_int64_t)(
-            componentDescriptor.cb_offset_l | (u_int64_t)componentDescriptor.cb_offset_h << 32);
+    _componentBlockOffset =
+      (u_int64_t)(componentDescriptor.cb_offset_l | (u_int64_t)componentDescriptor.cb_offset_h << 32);
 
-    //unpack version
+    // unpack version
     _version.unpack(buff);
 
     return true;
diff --git a/mlxarchive/mlxarchive_mfa2_descriptor.h b/mlxarchive/mlxarchive_mfa2_descriptor.h
index ab281d4b..30170e71 100644
--- a/mlxarchive/mlxarchive_mfa2_descriptor.h
+++ b/mlxarchive/mlxarchive_mfa2_descriptor.h
@@ -55,26 +55,28 @@
 
 using namespace std;
 
-namespace mfa2 {
-
-class Descriptor : protected Element {
+namespace mfa2
+{
+class Descriptor : protected Element
+{
 protected:
-    enum DescriptorType {
+    enum DescriptorType
+    {
         PackageDescriptorType,
         DeviceDescriptorType,
         ComponentDescriptorType
     };
     MFA2Type descriptorTypeToMFA2Type(DescriptorType type);
-    vector<Extension*>  _extensions;
+    vector<Extension*> _extensions;
+
 public:
     Descriptor(u_int8_t vesrion, DescriptorType type, u_int32_t length);
     virtual ~Descriptor();
     void addExtension(Extension* extension);
-    void packMultiPart(u_int8_t extensionsCount, u_int16_t totalLength,
-            vector<u_int8_t>& buff) const;
-    bool unpackMultiPart(u_int8_t &extensionsCount, u_int16_t &totalLength, Mfa2Buffer & buff);
+    void packMultiPart(u_int8_t extensionsCount, u_int16_t totalLength, vector<u_int8_t>& buff) const;
+    bool unpackMultiPart(u_int8_t& extensionsCount, u_int16_t& totalLength, Mfa2Buffer& buff);
     virtual void pack(vector<u_int8_t>& buff) const = 0;
-    virtual bool unpack(Mfa2Buffer & buff) = 0;
+    virtual bool unpack(Mfa2Buffer& buff) = 0;
 };
 
 inline void Descriptor::addExtension(Extension* extension)
@@ -82,23 +84,23 @@ inline void Descriptor::addExtension(Extension* extension)
     _extensions.push_back(extension);
 }
 
-class PackageDescriptor : public Descriptor {
+class PackageDescriptor : public Descriptor
+{
 private:
-    u_int16_t                   _deviceDescriptorsCount;
-    u_int16_t                   _componentsCount;
-    VersionExtension            _version;
-    u_int32_t                   _componentsBlockOffset;
-    u_int32_t                   _componentsBlockArchiveSize;
-    u_int64_t                   _componentsBlockSize;
-    SHA256Extension             _SHA256Extension;
-    SHA256Extension             _descriptorsSHA256Extension;
+    u_int16_t _deviceDescriptorsCount;
+    u_int16_t _componentsCount;
+    VersionExtension _version;
+    u_int32_t _componentsBlockOffset;
+    u_int32_t _componentsBlockArchiveSize;
+    u_int64_t _componentsBlockSize;
+    SHA256Extension _SHA256Extension;
+    SHA256Extension _descriptorsSHA256Extension;
+
 public:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
-    const static u_int32_t LENGTH  = TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+    const static u_int32_t LENGTH = TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE;
 
-    PackageDescriptor(u_int16_t deviceDescriptorsCount,
-                      u_int16_t componentsCount,
-                      VersionExtension version);
+    PackageDescriptor(u_int16_t deviceDescriptorsCount, u_int16_t componentsCount, VersionExtension version);
 
     void setComponentsBlockOffset(u_int64_t offset);
     void setComponentsBlockArchiveSize(u_int32_t size);
@@ -106,12 +108,12 @@ class PackageDescriptor : public Descriptor {
     void setDescriptorsSHA256(const vector<u_int8_t>& digest);
     void setSHA256(const vector<u_int8_t>& digest);
     void pack(vector<u_int8_t>& buff) const;
-    virtual bool unpack(Mfa2Buffer & buff);
-    u_int16_t getDeviceDescriptorsCount() const { return _deviceDescriptorsCount;}
-    u_int16_t getComponentsCount() const { return _componentsCount;}
-    const VersionExtension & getVersionExtension() const {return _version;}
-    u_int64_t getComponentsBlockSize  ();
-    u_int32_t getComponentsBlockOffset  ();
+    virtual bool unpack(Mfa2Buffer& buff);
+    u_int16_t getDeviceDescriptorsCount() const { return _deviceDescriptorsCount; }
+    u_int16_t getComponentsCount() const { return _componentsCount; }
+    const VersionExtension& getVersionExtension() const { return _version; }
+    u_int64_t getComponentsBlockSize();
+    u_int32_t getComponentsBlockOffset();
 };
 
 inline void PackageDescriptor::setComponentsBlockOffset(u_int64_t offset)
@@ -133,60 +135,63 @@ inline void PackageDescriptor::setComponentsBlockSize(u_int64_t size)
 {
     _componentsBlockSize = size;
 }
-inline u_int64_t PackageDescriptor::getComponentsBlockSize() 
+inline u_int64_t PackageDescriptor::getComponentsBlockSize()
 {
     return _componentsBlockSize;
 }
 
-class DeviceDescriptor : public Descriptor {
+class DeviceDescriptor : public Descriptor
+{
 private:
-    vector<ComponentPointerExtension>   _componentPointers;
-    PSIDExtension                       _PSID;
+    vector<ComponentPointerExtension> _componentPointers;
+    PSIDExtension _PSID;
+
 public:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
-    const static u_int32_t LENGTH  = 0x0;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+    const static u_int32_t LENGTH = 0x0;
 
-    DeviceDescriptor(vector<ComponentPointerExtension> componentPointers,
-            PSIDExtension PSID);
+    DeviceDescriptor(vector<ComponentPointerExtension> componentPointers, PSIDExtension PSID);
     void pack(vector<u_int8_t>& buff) const;
-    virtual bool unpack(Mfa2Buffer & buff);
+    virtual bool unpack(Mfa2Buffer& buff);
 
-    const PSIDExtension & getPSIDExtension() const { return _PSID;}
+    const PSIDExtension& getPSIDExtension() const { return _PSID; }
     u_int8_t getComponentPointerExtensionsCount() const { return _componentPointers.size(); }
-    const ComponentPointerExtension & getComponentPointerExtension(int index) { return _componentPointers[index]; }
+    const ComponentPointerExtension& getComponentPointerExtension(int index) { return _componentPointers[index]; }
 };
 
-
-class ComponentDescriptor : public Descriptor {
+class ComponentDescriptor : public Descriptor
+{
 private:
-    VersionExtension    _version;
-    //string              _source;
-    u_int64_t           _componentBlockOffset;
-    u_int64_t           _binarySize;
-    vector<u_int8_t>    _data;
+    VersionExtension _version;
+    // string              _source;
+    u_int64_t _componentBlockOffset;
+    u_int64_t _binarySize;
+    vector<u_int8_t> _data;
+
 public:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
-    const static u_int32_t LENGTH  = TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+    const static u_int32_t LENGTH = TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE;
     ComponentDescriptor(VersionExtension version, string source);
     ComponentDescriptor(VersionExtension version, vector<u_int8_t> data);
 
-    virtual bool unpack(Mfa2Buffer & buff);
-    const VersionExtension & getVersionExtension() const {return _version;}
+    virtual bool unpack(Mfa2Buffer& buff);
+    const VersionExtension& getVersionExtension() const { return _version; }
 
-    //string      getSource               ()                          const;
-    void        setComponentBinaryOffset(u_int64_t offset);
-    u_int64_t   getComponentBinaryOffset() const; 
-    void        pack                    (vector<u_int8_t>& buff)    const;
-    u_int32_t   getBinarySize           ()                          const;
-    void        packData                (vector<u_int8_t>& buff)    const;
-    void        unpackData(vector<u_int8_t>& buff);
+    // string      getSource               ()                          const;
+    void setComponentBinaryOffset(u_int64_t offset);
+    u_int64_t getComponentBinaryOffset() const;
+    void pack(vector<u_int8_t>& buff) const;
+    u_int32_t getBinarySize() const;
+    void packData(vector<u_int8_t>& buff) const;
+    void unpackData(vector<u_int8_t>& buff);
 };
 
 /*inline string ComponentDescriptor::getSource() const
 {
     return _source;
 };*/
-inline u_int64_t ComponentDescriptor::getComponentBinaryOffset() const{
+inline u_int64_t ComponentDescriptor::getComponentBinaryOffset() const
+{
     return _componentBlockOffset;
 }
 
@@ -209,5 +214,5 @@ inline void ComponentDescriptor::packData(vector<u_int8_t>& buff) const
     packBytesArray(_data.data(), _data.size(), buff);
 }
 
-}
+} // namespace mfa2
 #endif
diff --git a/mlxarchive/mlxarchive_mfa2_element.cpp b/mlxarchive/mlxarchive_mfa2_element.cpp
index e67140bb..63f6caed 100644
--- a/mlxarchive/mlxarchive_mfa2_element.cpp
+++ b/mlxarchive/mlxarchive_mfa2_element.cpp
@@ -43,16 +43,13 @@
 
 using namespace mfa2;
 
-CommonHeader Element::buildCommonHeader(u_int8_t version, MFA2Type type,
-        u_int32_t length)
+CommonHeader Element::buildCommonHeader(u_int8_t version, MFA2Type type, u_int32_t length)
 {
     CommonHeader commonHeader(version, type, length);
     return commonHeader;
 }
 
 Element::Element(u_int8_t version, MFA2Type type, u_int32_t length) :
-        _commonHeader(buildCommonHeader(version, type, length))
+    _commonHeader(buildCommonHeader(version, type, length))
 {
-
 }
-
diff --git a/mlxarchive/mlxarchive_mfa2_element.h b/mlxarchive/mlxarchive_mfa2_element.h
index 24eb1bde..309cc892 100644
--- a/mlxarchive/mlxarchive_mfa2_element.h
+++ b/mlxarchive/mlxarchive_mfa2_element.h
@@ -44,16 +44,20 @@
 
 #include "mlxarchive_mfa2_common_header.h"
 
-namespace mfa2 {
-class Element {
+namespace mfa2
+{
+class Element
+{
 private:
     CommonHeader buildCommonHeader(u_int8_t version, MFA2Type type, u_int32_t length);
+
 protected:
     CommonHeader _commonHeader;
+
 public:
     Element(u_int8_t version, MFA2Type type, u_int32_t length);
-    //virtual void pack(vector<u_int8_t>& buff) const = 0;
-    ~Element() {};
+    // virtual void pack(vector<u_int8_t>& buff) const = 0;
+    ~Element(){};
 };
-}
+} // namespace mfa2
 #endif
diff --git a/mlxarchive/mlxarchive_mfa2_extension.cpp b/mlxarchive/mlxarchive_mfa2_extension.cpp
index 120976b8..16864ab9 100644
--- a/mlxarchive/mlxarchive_mfa2_extension.cpp
+++ b/mlxarchive/mlxarchive_mfa2_extension.cpp
@@ -60,7 +60,8 @@ void VersionExtension::fillTimeAndDate()
 
 MFA2Type Extension::extensionTypeToMFA2Type(ExtensionType type)
 {
-    switch(type) {
+    switch (type)
+    {
         case VersionExtensionType:
             return MFA2Type_VERSION;
         case SecurityInfoExtensionType:
@@ -74,17 +75,16 @@ MFA2Type Extension::extensionTypeToMFA2Type(ExtensionType type)
         case SourceFileNameExtensionType:
             return MFA2Type_SOURCE_FILENAME;
         default:
-            //TODO throw exception
+            // TODO throw exception
             return MFA2Type_SOURCE_FILENAME;
     }
 }
 Extension::Extension(u_int8_t version, ExtensionType type, u_int32_t length) :
-        Element(version, extensionTypeToMFA2Type(type), length)
+    Element(version, extensionTypeToMFA2Type(type), length)
 {
 }
 
-VersionExtension::VersionExtension(const string& version) :
-        Extension(ELEMENT_VERSION, VersionExtensionType, LENGTH)
+VersionExtension::VersionExtension(const string& version) : Extension(ELEMENT_VERSION, VersionExtensionType, LENGTH)
 {
     int a, b, c;
     sscanf(version.c_str(), "%d.%d.%d", &a, &b, &c);
@@ -94,7 +94,7 @@ VersionExtension::VersionExtension(const string& version) :
     fillTimeAndDate();
 }
 
-VersionExtension::VersionExtension(const u_int16_t* version, const u_int16_t* fw_rel_date):
+VersionExtension::VersionExtension(const u_int16_t* version, const u_int16_t* fw_rel_date) :
     Extension(ELEMENT_VERSION, VersionExtensionType, LENGTH)
 {
     _major = version[0];
@@ -113,10 +113,10 @@ void VersionExtension::pack(vector<u_int8_t>& buff) const
     vector<u_int8_t> tmpBuff;
     struct tools_open_version version;
 
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
-    //pack version info
+    // pack version info
     tmpBuff.resize(tools_open_version_size());
     memset(&version, 0x0, sizeof(version));
     version.version_major = _major;
@@ -128,25 +128,25 @@ void VersionExtension::pack(vector<u_int8_t>& buff) const
     version.seconds = _seconds;
     version.minutes = _minutes;
     version.hour = _hours;
- 
+
     tools_open_version_pack(&version, tmpBuff.data());
     buff.insert(buff.end(), tmpBuff.begin(), tmpBuff.end());
 }
 
-bool VersionExtension::unpack(Mfa2Buffer & buff)
+bool VersionExtension::unpack(Mfa2Buffer& buff)
 {
-    //unpack common header
+    // unpack common header
     _commonHeader.unpack(buff);
 
     struct tools_open_version version;
     int arr_size = tools_open_version_size();
-    u_int8_t * arr = new u_int8_t[arr_size];
+    u_int8_t* arr = new u_int8_t[arr_size];
     buff.read(arr, arr_size);
     memset(&version, 0x0, arr_size);
     tools_open_version_unpack(&version, arr);
     delete[] arr;
     arr = NULL;
-    //unpack version info
+    // unpack version info
     _major = version.version_major;
     _subMinor = version.version_sub_minor;
     _minor = version.version_minor;
@@ -159,23 +159,28 @@ bool VersionExtension::unpack(Mfa2Buffer & buff)
     return true;
 }
 
-string VersionExtension::getVersion(bool pad_sub_minor) const {
+string VersionExtension::getVersion(bool pad_sub_minor) const
+{
     stringstream ss;
     string res;
-    if (pad_sub_minor){
+    if (pad_sub_minor)
+    {
         char _sub_minor_str[5] = {0};
-        snprintf(_sub_minor_str, sizeof(_sub_minor_str), "%04d", (int)_subMinor % 10000);   // "% 10000" since subminor can be represented by 4 digits
-        ss << (int)_major << '.' << (int)_minor << '.' << _sub_minor_str;                   // and it helps the compiler to understand there are only 4 characters
-        }                                                                                   // so it can fit into _sub_minor_str variable
-    else{
+        snprintf(_sub_minor_str, sizeof(_sub_minor_str), "%04d",
+                 (int)_subMinor % 10000); // "% 10000" since subminor can be represented by 4 digits
+        ss << (int)_major << '.' << (int)_minor << '.'
+           << _sub_minor_str; // and it helps the compiler to understand there are only 4 characters
+    }                         // so it can fit into _sub_minor_str variable
+    else
+    {
         ss << (int)_major << '.' << (int)_minor << '.' << (int)_subMinor;
     }
-    ss>>res;
+    ss >> res;
     return res;
 }
 
-
-string VersionExtension::getDateAndTime() const {
+string VersionExtension::getDateAndTime() const
+{
     tm tm_obj;
     tm_obj.tm_sec = _seconds;
     tm_obj.tm_min = _minutes;
@@ -183,12 +188,13 @@ string VersionExtension::getDateAndTime() const {
     tm_obj.tm_mday = _day;
     tm_obj.tm_mon = _month;
     tm_obj.tm_year = _year - 1900;
-    char buffer [64];
-    strftime(buffer,64,"%Y-%m-%d %H:%M:%S", &tm_obj);
+    char buffer[64];
+    strftime(buffer, 64, "%Y-%m-%d %H:%M:%S", &tm_obj);
     return string(buffer);
 }
 
-void VersionExtension::getDateAndTime(char* buffer) const {
+void VersionExtension::getDateAndTime(char* buffer) const
+{
     sprintf(buffer, "%x.%x.%x", _day, _month, _year);
 }
 
@@ -197,7 +203,7 @@ void ComponentPointerExtension::pack(vector<u_int8_t>& buff) const
     vector<u_int8_t> tmpBuff;
     struct tools_open_component_ptr componentPointer;
 
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
     tmpBuff.resize(tools_open_component_ptr_size());
@@ -207,23 +213,22 @@ void ComponentPointerExtension::pack(vector<u_int8_t>& buff) const
     componentPointer.storage_address = _storageAddress;
     tools_open_component_ptr_pack(&componentPointer, tmpBuff.data());
     buff.insert(buff.end(), tmpBuff.begin(), tmpBuff.end());
-
 }
 
-bool ComponentPointerExtension::unpack(Mfa2Buffer & buff)
+bool ComponentPointerExtension::unpack(Mfa2Buffer& buff)
 {
-    //unpack common header
+    // unpack common header
     _commonHeader.unpack(buff);
 
     struct tools_open_component_ptr componentPointer;
     int arr_size = tools_open_component_ptr_size();
-    u_int8_t * arr = new u_int8_t[arr_size];
+    u_int8_t* arr = new u_int8_t[arr_size];
     buff.read(arr, arr_size);
     memset(&componentPointer, 0x0, arr_size);
     tools_open_component_ptr_unpack(&componentPointer, arr);
     delete[] arr;
     arr = NULL;
-    //unpack version info
+    // unpack version info
     _componentIndex = componentPointer.component_index;
     _storageId = componentPointer.storage_id;
     _storageAddress = componentPointer.storage_address;
@@ -231,21 +236,22 @@ bool ComponentPointerExtension::unpack(Mfa2Buffer & buff)
 }
 
 SHA256Extension::SHA256Extension(enum SHA256Scope scope) :
-        Extension(ELEMENT_VERSION, scopeToExtensionType(scope), LENGTH)
+    Extension(ELEMENT_VERSION, scopeToExtensionType(scope), LENGTH)
 {
     _digest.resize(LENGTH);
 };
 
 Extension::ExtensionType SHA256Extension::scopeToExtensionType(enum SHA256Scope scope)
 {
-    switch(scope) {
-    case SHA256Scope_Descriptors:
-        return DescriptorsSHA256ExtensionType;
-    case SHA256Scope_All:
-        return SHA256ExtensionType;
-    default:
-        //throw exception TODO
-        return SHA256ExtensionType;
+    switch (scope)
+    {
+        case SHA256Scope_Descriptors:
+            return DescriptorsSHA256ExtensionType;
+        case SHA256Scope_All:
+            return SHA256ExtensionType;
+        default:
+            // throw exception TODO
+            return SHA256ExtensionType;
     }
 }
 
@@ -256,22 +262,23 @@ void SHA256Extension::setDigest(vector<u_int8_t> digest)
 
 void SHA256Extension::pack(vector<u_int8_t>& buff) const
 {
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
     packBytesArray(_digest.data(), _digest.size(), buff);
 }
 
-bool SHA256Extension::unpack(Mfa2Buffer & buff)
+bool SHA256Extension::unpack(Mfa2Buffer& buff)
 {
-    //unpack common header
+    // unpack common header
     _commonHeader.unpack(buff);
 
     u_int16_t length = _commonHeader.getLength();
-    u_int8_t * arr = new u_int8_t[length];
+    u_int8_t* arr = new u_int8_t[length];
     buff.read(arr, length);
     _digest.resize(length);
-    for(u_int16_t i = 0; i < length; i++) {
+    for (u_int16_t i = 0; i < length; i++)
+    {
         _digest.push_back(arr[i]);
     }
     delete[] arr;
@@ -292,15 +299,15 @@ bool SHA256Extension::unpack(Mfa2Buffer & buff)
 
 void StringExtension::pack(vector<u_int8_t>& buff) const
 {
-    //pack common header
+    // pack common header
     _commonHeader.pack(buff);
 
     packString(_str, buff);
 }
 
-bool StringExtension::unpack(Mfa2Buffer & buff)
+bool StringExtension::unpack(Mfa2Buffer& buff)
 {
-    //unpack common header
+    // unpack common header
     _commonHeader.unpack(buff);
 
     u_int16_t length = _commonHeader.getLength();
diff --git a/mlxarchive/mlxarchive_mfa2_extension.h b/mlxarchive/mlxarchive_mfa2_extension.h
index 84e2e50b..c6fed55e 100644
--- a/mlxarchive/mlxarchive_mfa2_extension.h
+++ b/mlxarchive/mlxarchive_mfa2_extension.h
@@ -53,32 +53,27 @@
 
 using namespace std;
 
-namespace mfa2 {
-
+namespace mfa2
+{
 class Version
 {
-
 public:
-    Version() 
+    Version()
     {
         major = -1;
         minor = -1;
         subminor = -1;
     }
 
-
-    Version(std::string version)
-    {
-        sscanf(version.c_str(), "%d.%d.%d", &major, &minor, &subminor);
-    }
+    Version(std::string version) { sscanf(version.c_str(), "%d.%d.%d", &major, &minor, &subminor); }
 
 private:
-    int major; 
+    int major;
     int minor;
     int subminor;
 
 public:
-     bool operator > (const Version& other)
+    bool operator>(const Version& other)
     {
         if (major > other.major)
             return true;
@@ -88,7 +83,7 @@ class Version
             return true;
         return false;
     }
-    friend std::ostream& operator << (std::ostream& stream, const Version& ver)
+    friend std::ostream& operator<<(std::ostream& stream, const Version& ver)
     {
         stream << ver.major;
         stream << '.';
@@ -99,9 +94,11 @@ class Version
     }
 };
 
-class Extension : protected Element{
+class Extension : protected Element
+{
 protected:
-    enum ExtensionType {
+    enum ExtensionType
+    {
         VersionExtensionType,
         SecurityInfoExtensionType,
         ComponentPointerExtensionType,
@@ -119,12 +116,13 @@ class Extension : protected Element{
     Extension(u_int8_t vesrion, ExtensionType type, u_int32_t length);
 
     virtual void pack(vector<u_int8_t>& buff) const = 0;
-    virtual bool unpack(Mfa2Buffer & buff) = 0;
+    virtual bool unpack(Mfa2Buffer& buff) = 0;
 
-    virtual ~Extension  () {};
+    virtual ~Extension(){};
 };
 
-class VersionExtension : Extension {
+class VersionExtension : Extension
+{
 private:
     u_int8_t _major;
     u_int16_t _subMinor;
@@ -135,61 +133,61 @@ class VersionExtension : Extension {
     u_int8_t _day;
     u_int8_t _month;
     u_int16_t _year;
+
 public:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
-    const static u_int32_t LENGTH  = TOOLS_OPEN_VERSION_SIZE;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+    const static u_int32_t LENGTH = TOOLS_OPEN_VERSION_SIZE;
     void fillTimeAndDate();
     VersionExtension(const string& version);
     VersionExtension(const u_int16_t* version, const u_int16_t* fw_rel_date);
     void pack(vector<u_int8_t>& buff) const;
-    bool unpack(Mfa2Buffer & buff);
+    bool unpack(Mfa2Buffer& buff);
     string getVersion(bool pad_sub_minor) const;
     string getDateAndTime() const;
-    void   getDateAndTime(char* buffer) const;
-    u_int8_t getMajor() const {
-        return _major;
-    }
-    u_int8_t getMinor() const {
-        return _minor;
-    }
-    u_int16_t getSubMinor() const {
-        return _subMinor;
-    }
+    void getDateAndTime(char* buffer) const;
+    u_int8_t getMajor() const { return _major; }
+    u_int8_t getMinor() const { return _minor; }
+    u_int16_t getSubMinor() const { return _subMinor; }
 };
 
-class ComponentPointerExtension : Extension {
+class ComponentPointerExtension : Extension
+{
 private:
     u_int16_t _componentIndex;
-    u_int8_t  _storageId; //TODO: use enums
+    u_int8_t _storageId; // TODO: use enums
     u_int32_t _storageAddress;
+
 public:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
-    const static u_int32_t LENGTH  = TOOLS_OPEN_COMPONENT_PTR_SIZE;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+    const static u_int32_t LENGTH = TOOLS_OPEN_COMPONENT_PTR_SIZE;
 
     explicit ComponentPointerExtension(u_int16_t componentIndex) :
-                Extension(ELEMENT_VERSION, ComponentPointerExtensionType, LENGTH),
-                _componentIndex(componentIndex),
-                _storageId(0x1),
-                _storageAddress(0x0){};
+        Extension(ELEMENT_VERSION, ComponentPointerExtensionType, LENGTH),
+        _componentIndex(componentIndex),
+        _storageId(0x1),
+        _storageAddress(0x0){};
 
     void pack(vector<u_int8_t>& buff) const;
-    bool unpack(Mfa2Buffer & buff);
-    u_int16_t getComponentIndex() const { return _componentIndex;}
+    bool unpack(Mfa2Buffer& buff);
+    u_int16_t getComponentIndex() const { return _componentIndex; }
 };
 
-class SHA256Extension : Extension {
+class SHA256Extension : Extension
+{
 public:
-    enum SHA256Scope {
+    enum SHA256Scope
+    {
         SHA256Scope_Descriptors,
         SHA256Scope_All
     };
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
-    const static u_int32_t LENGTH  = 0x20;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+    const static u_int32_t LENGTH = 0x20;
 
     explicit SHA256Extension(enum SHA256Scope scope);
     void setDigest(vector<u_int8_t> digest);
     void pack(vector<u_int8_t>& buff) const;
-    bool unpack(Mfa2Buffer & buff);
+    bool unpack(Mfa2Buffer& buff);
+
 private:
     vector<u_int8_t> _digest;
 
@@ -206,18 +204,19 @@ class SHA256Extension : Extension {
     void pack(vector<u_int8_t>& buff) const;
 };*/
 
-class StringExtension : public Extension {
+class StringExtension : public Extension
+{
 private:
     string _str;
+
 public:
     StringExtension(u_int8_t vesrion, ExtensionType type, string str) :
-        Extension(vesrion, type, str.length()),
-        _str(str) {};
+        Extension(vesrion, type, str.length()), _str(str){};
     u_int32_t length() const;
     void pack(vector<u_int8_t>& buff) const;
-    bool unpack(Mfa2Buffer & buff);
+    bool unpack(Mfa2Buffer& buff);
 
-    const string & getString() const { return _str;}
+    const string& getString() const { return _str; }
 };
 
 inline u_int32_t StringExtension::length() const
@@ -225,21 +224,22 @@ inline u_int32_t StringExtension::length() const
     return _str.length();
 }
 
-class CommentExtension : public StringExtension {
+class CommentExtension : public StringExtension
+{
 private:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+
 public:
-    explicit CommentExtension(string comment) :
-        StringExtension(ELEMENT_VERSION, CommentExtensionType, comment) {};
+    explicit CommentExtension(string comment) : StringExtension(ELEMENT_VERSION, CommentExtensionType, comment){};
 };
 
-class PSIDExtension : public StringExtension {
+class PSIDExtension : public StringExtension
+{
 private:
-    const static u_int8_t  ELEMENT_VERSION = 0x0;
+    const static u_int8_t ELEMENT_VERSION = 0x0;
+
 public:
-    explicit PSIDExtension(string psid) :
-        StringExtension(ELEMENT_VERSION, PSIDExtensionType, psid) {};
+    explicit PSIDExtension(string psid) : StringExtension(ELEMENT_VERSION, PSIDExtensionType, psid){};
 };
-}
+} // namespace mfa2
 #endif
-
diff --git a/mlxarchive/mlxarchive_mfa2_package_gen.cpp b/mlxarchive/mlxarchive_mfa2_package_gen.cpp
index 54f3f975..4b6f8699 100644
--- a/mlxarchive/mlxarchive_mfa2_package_gen.cpp
+++ b/mlxarchive/mlxarchive_mfa2_package_gen.cpp
@@ -39,16 +39,14 @@
  *      Author: Ahmad Soboh
  */
 
-
 #include "mlxarchive_mfa2_package_gen.h"
 #include "mlxarchive_mfa2_builder.h"
 
-void MFA2PackageGen::generateBinFromFWDirectory(const string& directory, const string& version,
-        vector<u_int8_t>& buff) const
+void MFA2PackageGen::generateBinFromFWDirectory(const string& directory,
+                                                const string& version,
+                                                vector<u_int8_t>& buff) const
 {
     FWDirectoryBuilder builder(version, directory);
-    MFA2 mfa2(builder.getPackageDescriptor(),
-            builder.getDeviceDescriptors(),
-            builder.getComponents());
+    MFA2 mfa2(builder.getPackageDescriptor(), builder.getDeviceDescriptors(), builder.getComponents());
     mfa2.generateBinary(buff);
 }
diff --git a/mlxarchive/mlxarchive_mfa2_package_gen.h b/mlxarchive/mlxarchive_mfa2_package_gen.h
index e3e8469f..515bc615 100644
--- a/mlxarchive/mlxarchive_mfa2_package_gen.h
+++ b/mlxarchive/mlxarchive_mfa2_package_gen.h
@@ -52,12 +52,11 @@
 using namespace std;
 using namespace mfa2;
 
-class MFA2PackageGen {
-
+class MFA2PackageGen
+{
 private:
-
 public:
-    MFA2PackageGen() {};
+    MFA2PackageGen(){};
     void generateBinFromFWDirectory(const string& directory, const string& version, vector<u_int8_t>& buff) const;
 };
 
diff --git a/mlxarchive/mlxarchive_mfa2_utils.cpp b/mlxarchive/mlxarchive_mfa2_utils.cpp
index f4920d6a..21c272ef 100644
--- a/mlxarchive/mlxarchive_mfa2_utils.cpp
+++ b/mlxarchive/mlxarchive_mfa2_utils.cpp
@@ -50,21 +50,24 @@
 
 void packString(const string& str, vector<u_int8_t>& buff)
 {
-    for(unsigned int i = 0; i < str.length(); i++) {
+    for (unsigned int i = 0; i < str.length(); i++)
+    {
         buff.push_back((u_int8_t)str[i]);
     }
 }
 
 void packBytesArray(const u_int8_t* arr, unsigned int len, vector<u_int8_t>& buff)
 {
-    for(unsigned int i = 0; i < len; i++) {
+    for (unsigned int i = 0; i < len; i++)
+    {
         buff.push_back(arr[i]);
     }
 }
 
 void unpackBytesArray(u_int8_t* arr, unsigned int len, vector<u_int8_t>& buff)
 {
-    for (unsigned int i = 0; i < len; i++) {
+    for (unsigned int i = 0; i < len; i++)
+    {
         arr[i] = buff[i];
     }
 }
@@ -73,10 +76,11 @@ void packBinFile(const string& file, vector<u_int8_t>& buff)
     vector<u_int8_t> fileBuff;
     streampos size;
 
-    std::ifstream ifs(file.c_str(), ios::in|ios::binary|ios::ate);
+    std::ifstream ifs(file.c_str(), ios::in | ios::binary | ios::ate);
 
-    if (ifs.fail()) {
-        //TODO throw PLDMException("Failed to open file: %s", file.c_str());
+    if (ifs.fail())
+    {
+        // TODO throw PLDMException("Failed to open file: %s", file.c_str());
         return;
     }
     size = ifs.tellg();
@@ -94,18 +98,19 @@ unsigned int getFileSize(const string& file)
 
     int rc = stat(file.c_str(), &stat_buf);
 
-    if (!rc) {
-        //printf("stat_buf.st_size=%d\n", stat_buf.st_size);
+    if (!rc)
+    {
+        // printf("stat_buf.st_size=%d\n", stat_buf.st_size);
         return stat_buf.st_size;
     }
 
-    return 0; //TODO throw exception
+    return 0; // TODO throw exception
 }
 
 bool fexists(const std::string& filename)
 {
     struct stat buffer;
-    return (stat (filename.c_str(), &buffer) == 0);
+    return (stat(filename.c_str(), &buffer) == 0);
 }
 
 // check if filename points to regular file:
@@ -113,7 +118,7 @@ bool isFile(const std::string& filename)
 {
     struct stat buffer;
     stat(filename.c_str(), &buffer);
-    return S_ISREG(buffer.st_mode); 
+    return S_ISREG(buffer.st_mode);
 }
 
 bool endsWith(const std::string& str, const std::string& suffix)
@@ -121,27 +126,33 @@ bool endsWith(const std::string& str, const std::string& suffix)
     return (str.size() >= suffix.size()) && (str.compare(str.size() - suffix.size(), suffix.size(), suffix) == 0);
 }
 
-void listDir(const char *path, vector<string>& files)
+void listDir(const char* path, vector<string>& files)
 {
-    struct dirent *entry;
-    DIR *dir = opendir(path);
-    if (dir == NULL) {
+    struct dirent* entry;
+    DIR* dir = opendir(path);
+    if (dir == NULL)
+    {
         fprintf(stderr, "Failed to open directory: %s\n", path);
         exit(1);
     }
 
-    while ((entry = readdir(dir)) != NULL) {
-        if(endsWith(entry->d_name, ".bin")) {
+    while ((entry = readdir(dir)) != NULL)
+    {
+        if (endsWith(entry->d_name, ".bin"))
+        {
             files.push_back(entry->d_name);
         }
-        else {
+        else
+        {
             // skipping hidden files
-            if(entry->d_name[0] != '.') {
+            if (entry->d_name[0] != '.')
+            {
                 fprintf(stderr, "Skipping file: %s, not a binary...\n", entry->d_name);
             }
         }
     }
-    if(files.empty()) {
+    if (files.empty())
+    {
         fprintf(stderr, "No binray files found in the given directory: %s\n", path);
         exit(1);
     }
diff --git a/mlxarchive/mlxarchive_mfa2_utils.h b/mlxarchive/mlxarchive_mfa2_utils.h
index bcadde2d..18bda79f 100644
--- a/mlxarchive/mlxarchive_mfa2_utils.h
+++ b/mlxarchive/mlxarchive_mfa2_utils.h
@@ -53,13 +53,12 @@
 
 using namespace std;
 
-#define VECTOR_ITERATOR(t, v, i) \
-    for(vector<t>::iterator i = v.begin() ; i != v.end(); ++i)
+#define VECTOR_ITERATOR(t, v, i) for (vector<t>::iterator i = v.begin(); i != v.end(); ++i)
 
-#define CONST_VECTOR_ITERATOR(t, v, i) \
-    for(vector<t>::const_iterator i = v.begin() ; i != v.end(); ++i)
+#define CONST_VECTOR_ITERATOR(t, v, i) for (vector<t>::const_iterator i = v.begin(); i != v.end(); ++i)
 
-enum MFA2Type {
+enum MFA2Type
+{
     MFA2Type_MULTI_PART = 0x1,
     MFA2Type_PACKAGE_DESCRIPTOR = 0x2,
     MFA2Type_DEVICE_DESCRIPTOR = 0x3,
@@ -72,7 +71,7 @@ enum MFA2Type {
     MFA2Type_PRODUCT_NAME = 0x24,
     MFA2Type_PRODUCT_DESC = 0x25,
     MFA2Type_PACKAGE_CREATOR_URL = 0x26,
-    MFA2Type_SOURCE_FILENAME  = 0x27,
+    MFA2Type_SOURCE_FILENAME = 0x27,
     MFA2Type_FILENAME = 0x28,
     MFA2Type_SECURITY_INFO = 0x29,
     MFA2Type_PSID = 0x2A,
@@ -82,7 +81,7 @@ enum MFA2Type {
     MFA2Type_USER_TIMESTAMP = 0x2E,
     MFA2Type_SHA256 = 0x2F,
     MFA2Type_DESCRIPTORSSHA256 = 0x30,
-    MFA2Type_PADDING  = 0x31
+    MFA2Type_PADDING = 0x31
 };
 
 void packString(const string& str, vector<u_int8_t>& buff);
@@ -98,18 +97,22 @@ unsigned int getFileSize(const string& file);
 bool fexists(const string& filename);
 bool isFile(const string& filename);
 
-void listDir(const char *path, vector<string>& files);
+void listDir(const char* path, vector<string>& files);
 
-class FingerPrint {
+class FingerPrint
+{
 private:
     string _fingerPrint;
+
 public:
-    FingerPrint(string fingerPrint) : _fingerPrint(fingerPrint) {};
+    FingerPrint(string fingerPrint) : _fingerPrint(fingerPrint){};
     void pack(vector<u_int8_t>& buff) const { packString(_fingerPrint, buff); };
-    inline u_int32_t getSize() const {return _fingerPrint.length();}
-    bool unpack(Mfa2Buffer & buff) {
-        buff.read(_fingerPrint, FINGER_PRINT_SIZE); 
-        if (_fingerPrint != MFA2_FINGER_PRINT) {
+    inline u_int32_t getSize() const { return _fingerPrint.length(); }
+    bool unpack(Mfa2Buffer& buff)
+    {
+        buff.read(_fingerPrint, FINGER_PRINT_SIZE);
+        if (_fingerPrint != MFA2_FINGER_PRINT)
+        {
             return false;
         }
         return true;
diff --git a/mlxconfig/mlxcfg_db_manager.h b/mlxconfig/mlxcfg_db_manager.h
index 4a7f8f8a..c1bd24cf 100644
--- a/mlxconfig/mlxcfg_db_manager.h
+++ b/mlxconfig/mlxcfg_db_manager.h
@@ -83,7 +83,7 @@ class MlxcfgDBManager
     TLVConf* getTLVByNameAux(std::string tlvName, u_int32_t port, int32_t module);
     TLVConf* getAndSetTLVByNameAuxNotInitialized(string tlv_name, u_int32_t port, int32_t module);
     TLVConf* getTLVByIndexAndClassAux(u_int32_t id, TLVClass c);
-      TLVConf* getTLVByName(std::string tlvName, u_int32_t port, int32_t module);
+    TLVConf* getTLVByName(std::string tlvName, u_int32_t port, int32_t module);
     TLVConf* getAndCreateTLVByName(std::string tlvName, u_int32_t port, int32_t module);
     TLVConf* getTLVByParamMlxconfigName(std::string mlxconfigName, u_int32_t index, mfile* mf);
     TLVConf* findTLVInExisting(std::string mlxconfigName,
diff --git a/mlxconfig/mlxcfg_generic_commander.cpp b/mlxconfig/mlxcfg_generic_commander.cpp
index d8dd1c2b..b1edec14 100644
--- a/mlxconfig/mlxcfg_generic_commander.cpp
+++ b/mlxconfig/mlxcfg_generic_commander.cpp
@@ -919,7 +919,7 @@ const char* GenericCommander::loadConfigurationGetStr()
     u_int32_t hwDevId, hwRevId;
     struct reg_access_hca_mfrl_reg_ext mfrl;
 
-    if (dm_get_device_id(_mf, &deviceId, &hwDevId, &hwRevId) )
+    if (dm_get_device_id(_mf, &deviceId, &hwDevId, &hwRevId))
     {
         throw MlxcfgException("Failed to identify the device");
     }
@@ -1646,8 +1646,6 @@ void GenericCommander::sign(vector<u_int32_t>& buff,
 #endif
 }
 
-
-
 void GenericCommander::checkConfTlvs(const vector<TLVConf*>& tlvs, FwComponent::comps_ids_t& compsId)
 {
     bool dbgCompFound = false;
@@ -1815,7 +1813,6 @@ void GenericCommander::apply(const vector<u_int8_t>& buff)
     {
         throw MlxcfgException("Error applying the component: %s", fwCompsAccess.getLastErrMsg());
     }
-
 }
 
 void GenericCommander::raw2XML(const vector<string>& lines, string& xmlTemplate)
diff --git a/mlxconfig/mlxcfg_parser.cpp b/mlxconfig/mlxcfg_parser.cpp
index 9f701f4c..4e3a3432 100644
--- a/mlxconfig/mlxcfg_parser.cpp
+++ b/mlxconfig/mlxcfg_parser.cpp
@@ -449,8 +449,7 @@ mlxCfgStatus MlxCfg::parseArgs(int argc, char* argv[])
             Device_Type dType = getDeviceTypeFromString(argv[i]);
             if (dType == Device_Type::UNSUPPORTED_DEVICE)
             {
-                return err(
-                  true, "Unsupported device name given, please specify \"switch\" or \"hca\"device type");
+                return err(true, "Unsupported device name given, please specify \"switch\" or \"hca\"device type");
             }
             _mlxParams.deviceType = dType;
         }
@@ -615,8 +614,8 @@ mlxCfgStatus MlxCfg::parseArgs(int argc, char* argv[])
     }
 
     if ((_mlxParams.cmd == Mc_Set || _mlxParams.cmd == Mc_Clr_Sem || _mlxParams.cmd == Mc_Set_Raw ||
-         _mlxParams.cmd == Mc_Backup || _mlxParams.cmd == Mc_ShowConfs || _mlxParams.cmd == Mc_Apply)
-         && _mlxParams.device.length() == 0)
+         _mlxParams.cmd == Mc_Backup || _mlxParams.cmd == Mc_ShowConfs || _mlxParams.cmd == Mc_Apply) &&
+        _mlxParams.device.length() == 0)
     {
         return err(true, "%s command expects device to be specified.",
                    _mlxParams.cmd == Mc_Set ?
@@ -627,10 +626,7 @@ mlxCfgStatus MlxCfg::parseArgs(int argc, char* argv[])
                      "get_raw" :
                      _mlxParams.cmd == Mc_Clr_Sem ?
                      "clear_semaphore" :
-                     _mlxParams.cmd == Mc_Backup ?
-                     "backup" :
-                     _mlxParams.cmd == Mc_Apply ?
-                     "apply" : "show_confs");
+                     _mlxParams.cmd == Mc_Backup ? "backup" : _mlxParams.cmd == Mc_Apply ? "apply" : "show_confs");
     }
     if (((_mlxParams.cmd == Mc_Set_Raw || _mlxParams.cmd == Mc_Get_Raw) && _mlxParams.rawTlvFile.size() == 0))
     {
@@ -665,22 +661,20 @@ mlxCfgStatus MlxCfg::parseArgs(int argc, char* argv[])
 
     if (_mlxParams.cmd == Mc_CreateConf)
     {
-        if (!_mlxParams.privPemFile.empty() &&
-            (!_mlxParams.opensslEngine.empty() || !_mlxParams.opensslKeyId.empty()))
+        if (!_mlxParams.privPemFile.empty() && (!_mlxParams.opensslEngine.empty() || !_mlxParams.opensslKeyId.empty()))
         {
             return err(true,
-                        "Please provide either private pem file or OpenSSL engine and key identifier "
-                        "but not both of them");
+                       "Please provide either private pem file or OpenSSL engine and key identifier "
+                       "but not both of them");
         }
 
-        if (!_mlxParams.keyPairUUID.empty() ^
-            (!_mlxParams.privPemFile.empty() ||
-                (!_mlxParams.opensslEngine.empty() && !_mlxParams.opensslKeyId.empty())))
+        if (!_mlxParams.keyPairUUID.empty() ^ (!_mlxParams.privPemFile.empty() ||
+                                               (!_mlxParams.opensslEngine.empty() && !_mlxParams.opensslKeyId.empty())))
         {
             return err(true,
-                        "if you want to sign the configuration file you have to "
-                        "provide key pair UUID file with either private pem file "
-                        "or OpenSSL engine and key identifier");
+                       "if you want to sign the configuration file you have to "
+                       "provide key pair UUID file with either private pem file "
+                       "or OpenSSL engine and key identifier");
         }
     }
 
diff --git a/mlxconfig/mlxcfg_ui.cpp b/mlxconfig/mlxcfg_ui.cpp
index 5b7df11b..d32353c0 100644
--- a/mlxconfig/mlxcfg_ui.cpp
+++ b/mlxconfig/mlxcfg_ui.cpp
@@ -1470,7 +1470,7 @@ mlxCfgStatus MlxCfg::createConf()
             commander.sign(buff, _mlxParams.privPemFile, _mlxParams.keyPairUUID, "", "");
         }
         else if (!_mlxParams.opensslEngine.empty() && !_mlxParams.opensslKeyId.empty() &&
-                    !_mlxParams.keyPairUUID.empty())
+                 !_mlxParams.keyPairUUID.empty())
         {
             commander.sign(buff, "", _mlxParams.keyPairUUID, _mlxParams.opensslEngine, _mlxParams.opensslKeyId);
         }
@@ -1478,7 +1478,6 @@ mlxCfgStatus MlxCfg::createConf()
         {
             commander.sign(buff);
         }
-
     }
     catch (MlxcfgException& e)
     {
diff --git a/mlxconfig/mlxcfg_utils.cpp b/mlxconfig/mlxcfg_utils.cpp
index 7c1f77ed..d8ecb96b 100644
--- a/mlxconfig/mlxcfg_utils.cpp
+++ b/mlxconfig/mlxcfg_utils.cpp
@@ -52,7 +52,6 @@
 #include "mlxcfg_utils.h"
 #include <regex>
 
-
 using namespace std;
 
 typedef struct reg_access_hca_mqis_reg mqisReg;
diff --git a/mlxfwops/lib/aux_tlv_ops.cpp b/mlxfwops/lib/aux_tlv_ops.cpp
index 4bf78eb6..b448e371 100644
--- a/mlxfwops/lib/aux_tlv_ops.cpp
+++ b/mlxfwops/lib/aux_tlv_ops.cpp
@@ -40,7 +40,6 @@
  * ImageTlvOps class implementation
  */
 
-
 #define AUX_DATA_SIG_SIZE 0x10
 #define SIG3 0x080d1522
 #define SIG2 0x01020305
@@ -50,11 +49,14 @@
 bool ImageTlvOps::test()
 {
     printf("-I- ImageTlvOps Class test");
-    u_int32_t data0[] = {0x12345678, 0xabcdef01, 0xab0dab10, 0xcafaba1a, 0x0cafee1e1, 0x12345678, 0x23456789, 0x3456789a};
-    u_int32_t data1[] = {0x12345678, 0xabcdef01, 0xab0dab1, 0xcafaba1a, 0x0cafee1e1, 0x12345678, 0x23456789, 0x3456789a};
-    u_int8_t data2[] =  {1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa};
+    u_int32_t data0[] = {0x12345678,  0xabcdef01, 0xab0dab10, 0xcafaba1a,
+                         0x0cafee1e1, 0x12345678, 0x23456789, 0x3456789a};
+    u_int32_t data1[] = {0x12345678,  0xabcdef01, 0xab0dab1,  0xcafaba1a,
+                         0x0cafee1e1, 0x12345678, 0x23456789, 0x3456789a};
+    u_int8_t data2[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa};
     // run init
-    if (!init(true)) {
+    if (!init(true))
+    {
         printf("-E- failed on init");
     }
     // add all tlvs and update file
@@ -81,14 +83,16 @@ bool ImageTlvOps::test()
     memcpy(&tlv.data[0], data2, tlv.hdr.length);
     addTLV(tlv);
 
-    if (!updateFile()) {
+    if (!updateFile())
+    {
         printf("-E- failed to update file\n");
     }
     removeTlv(3, 0);
     removeTlv(0, 0);
     removeTlv(0, 1);
 
-    if (!updateFile()) {
+    if (!updateFile())
+    {
         printf("-E- failed to update file\n");
     }
     printf("-I- Done Successfully");
@@ -96,15 +100,17 @@ bool ImageTlvOps::test()
     return true;
 }
 
-Tlv_Status_t ImageTlvOps::getFileSize(FILE *fd, long int& fileSize)
+Tlv_Status_t ImageTlvOps::getFileSize(FILE* fd, long int& fileSize)
 {
     // Get the file size:
-    if (fseek(fd, 0, SEEK_END) < 0) {
+    if (fseek(fd, 0, SEEK_END) < 0)
+    {
         fclose(fd);
         return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_OPEN_FILE, "Can not get file size for \"%s\"", _fname);
     }
     fileSize = ftell(fd);
-    if (fileSize < 0) {
+    if (fileSize < 0)
+    {
         fclose(fd);
         return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_OPEN_FILE, "Can not get file size for \"%s\"", _fname);
     }
@@ -114,7 +120,8 @@ Tlv_Status_t ImageTlvOps::getFileSize(FILE *fd, long int& fileSize)
 
 Tlv_Status_t ImageTlvOps::init(u_int32_t startPos, bool force)
 {
-    if (!force && _initialized) {
+    if (!force && _initialized)
+    {
         return TS_OK;
     }
     long int fsize;
@@ -122,54 +129,66 @@ Tlv_Status_t ImageTlvOps::init(u_int32_t startPos, bool force)
     _tlvSectionFilePos = 0;
     _tlvVec.resize(0);
 
-    if (_fname) {
+    if (_fname)
+    {
         _rawFileBuff.resize(0);
-        FILE *fd = fopen(_fname, "rb");
-        if (!fd) {
+        FILE* fd = fopen(_fname, "rb");
+        if (!fd)
+        {
             return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_OPEN_FILE, "Failed to open file of reading");
         }
         // get file size
-        if (getFileSize(fd, fsize)) {
+        if (getFileSize(fd, fsize))
+        {
             return TS_FAILED_TO_OPEN_FILE;
         }
         // read the file
         long int readCnt;
         _rawFileBuff.resize(fsize);
-        if ((readCnt = fread(&_rawFileBuff[0], 1, fsize, fd)) != fsize) {
+        if ((readCnt = fread(&_rawFileBuff[0], 1, fsize, fd)) != fsize)
+        {
             fclose(fd);
-            if (readCnt < 0) {
+            if (readCnt < 0)
+            {
                 return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_READ_FILE, "Read error on file \"%s\"", _fname);
-            } else {
-                return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_READ_FILE, "Read error on file \"%s\" - read only %ld bytes (from %ld)",
-                                                 _fname, readCnt, (unsigned long)fsize);
+            }
+            else
+            {
+                return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_READ_FILE,
+                                                 "Read error on file \"%s\" - read only %ld bytes (from %ld)", _fname,
+                                                 readCnt, (unsigned long)fsize);
             }
         }
         fclose(fd);
     }
     fsize = _rawFileBuff.size();
-    for (long int i = startPos; i < fsize; i += 4) {
-        if ((i + 16) > fsize) {
+    for (long int i = startPos; i < fsize; i += 4)
+    {
+        if ((i + 16) > fsize)
+        {
             break; // reached EOF
         }
         std::vector<u_int8_t> possibleSig(_rawFileBuff.begin() + i, _rawFileBuff.begin() + i + 16);
         TOCPUn(&possibleSig[0], 4);
-        if (checkSig(possibleSig)) {
+        if (checkSig(possibleSig))
+        {
             _tlvSectionFound = true;
             _tlvSectionFilePos = i;
         }
     }
-    if (_tlvSectionFound) {
+    if (_tlvSectionFound)
+    {
         // parse TLVs
         return parseTlvs();
     }
     _initialized = true;
     return TS_OK;
-
 }
 
 Tlv_Status_t ImageTlvOps::resetTlvSection()
 {
-    if (_tlvSectionFound) {
+    if (_tlvSectionFound)
+    {
         _tlvVec.resize(0);
         return updateFile();
     }
@@ -188,8 +207,10 @@ void ImageTlvOps::addTLV(aux_tlv& tlv)
 
 Tlv_Status_t ImageTlvOps::removeTlv(u_int16_t tlvType, u_int8_t headerType)
 {
-    for (std::vector<aux_tlv>::iterator it = _tlvVec.begin(); it != _tlvVec.end(); it++) {
-        if (it->hdr.header_type == headerType && it->hdr.type == tlvType) {
+    for (std::vector<aux_tlv>::iterator it = _tlvVec.begin(); it != _tlvVec.end(); it++)
+    {
+        if (it->hdr.header_type == headerType && it->hdr.type == tlvType)
+        {
             _tlvVec.erase(it);
             return TS_OK;
         }
@@ -199,8 +220,10 @@ Tlv_Status_t ImageTlvOps::removeTlv(u_int16_t tlvType, u_int8_t headerType)
 
 Tlv_Status_t ImageTlvOps::queryTlv(u_int16_t tlvType, u_int8_t headerType, aux_tlv& tlv)
 {
-    for (std::vector<aux_tlv>::iterator it = _tlvVec.begin(); it != _tlvVec.end(); it++) {
-        if (it->hdr.header_type == headerType && it->hdr.type == tlvType) {
+    for (std::vector<aux_tlv>::iterator it = _tlvVec.begin(); it != _tlvVec.end(); it++)
+    {
+        if (it->hdr.header_type == headerType && it->hdr.type == tlvType)
+        {
             tlv = *it;
             return TS_OK;
         }
@@ -215,11 +238,8 @@ std::vector<aux_tlv> ImageTlvOps::queryTlvs()
 
 bool ImageTlvOps::checkSig(std::vector<u_int8_t>& signature)
 {
-    u_int32_t *sigPtr = (u_int32_t*)&signature[0];
-    return *(sigPtr + 3)  == SIG3 && \
-           *(sigPtr + 2) == SIG2 && \
-           *(sigPtr + 1) == SIG1 && \
-           *(sigPtr) == SIG0;
+    u_int32_t* sigPtr = (u_int32_t*)&signature[0];
+    return *(sigPtr + 3) == SIG3 && *(sigPtr + 2) == SIG2 && *(sigPtr + 1) == SIG1 && *(sigPtr) == SIG0;
 }
 
 Tlv_Status_t ImageTlvOps::updateFile()
@@ -230,27 +250,36 @@ Tlv_Status_t ImageTlvOps::updateFile()
     signature[1] = SIG1;
     signature[0] = SIG0;
 
-    if (_readOnly) {
+    if (_readOnly)
+    {
         return (Tlv_Status_t)errmsgWCode(TS_READ_ONLY_MODE, "Image TLV object is read only.");
     }
-    if (!_tlvSectionFound && _tlvVec.size() == 0) { // no tlv section and no tlvs
+    if (!_tlvSectionFound && _tlvVec.size() == 0)
+    { // no tlv section and no tlvs
         // nothing to do
         return TS_OK;
-    } else if (_tlvSectionFound && _tlvVec.size() == 0) { // tlv section without tlvs
+    }
+    else if (_tlvSectionFound && _tlvVec.size() == 0)
+    { // tlv section without tlvs
         // remove signature from file
         _rawFileBuff.resize(_tlvSectionFilePos);
         _tlvSectionFilePos = 0;
         _tlvSectionFound = false;
-    } else if (!_tlvSectionFound && _tlvVec.size() != 0) { // no tlv section with tlvs
+    }
+    else if (!_tlvSectionFound && _tlvVec.size() != 0)
+    { // no tlv section with tlvs
         // add signature and TLVs
         TOCPUn(&signature[0], 4);
         _tlvSectionFound = true;
         _tlvSectionFilePos = _rawFileBuff.size();
-        for (unsigned int i = 0; i < signature.size() << 2; i++) {
+        for (unsigned int i = 0; i < signature.size() << 2; i++)
+        {
             _rawFileBuff.push_back(*(((u_int8_t*)&signature[0]) + i));
         }
         pushTlvsToRawBuffer();
-    } else {
+    }
+    else
+    {
         _rawFileBuff.resize(_tlvSectionFilePos + AUX_DATA_SIG_SIZE);
         pushTlvsToRawBuffer();
     }
@@ -259,19 +288,22 @@ Tlv_Status_t ImageTlvOps::updateFile()
 
 Tlv_Status_t ImageTlvOps::writeBufferAsFile()
 {
-    if (_tlvVec.size()) {
+    if (_tlvVec.size())
+    {
         // push end marker
         std::vector<u_int8_t> endMarker(TOOLS_OPEN_AUX_TLV_HEADER_SIZE, 0xff);
         _rawFileBuff.insert(_rawFileBuff.end(), endMarker.begin(), endMarker.end());
     }
     // TODO: check the need to : write the file under a different name then delete original and rename
-    FILE *fd = fopen(_fname, "wb");
-    if (!fd) {
+    FILE* fd = fopen(_fname, "wb");
+    if (!fd)
+    {
         return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_OPEN_FILE, "Failed to open file for writing: %s", _fname);
     }
     int cnt = fwrite(&_rawFileBuff[0], 1, _rawFileBuff.size(), fd);
     fclose(fd);
-    if (cnt != (int)_rawFileBuff.size()) {
+    if (cnt != (int)_rawFileBuff.size())
+    {
         return (Tlv_Status_t)errmsgWCode(TS_FAILED_TO_WRITE_FILE, "Failed to re-write file: %s", _fname);
     }
     return TS_OK;
@@ -280,10 +312,12 @@ Tlv_Status_t ImageTlvOps::writeBufferAsFile()
 void ImageTlvOps::pushTlvsToRawBuffer()
 {
     // called from updateFile. assuming raw data already contains signature.
-    if (_tlvVec.size() != 0) {
+    if (_tlvVec.size() != 0)
+    {
         std::vector<u_int8_t> tlvBuffer;
         tlvBuffer.resize(0);
-        for (std::vector<aux_tlv>::iterator it = _tlvVec.begin(); it != _tlvVec.end(); it++) {
+        for (std::vector<aux_tlv>::iterator it = _tlvVec.begin(); it != _tlvVec.end(); it++)
+        {
             // push header
             std::vector<u_int8_t> hdrBuf(TOOLS_OPEN_AUX_TLV_HEADER_SIZE, 0x0);
             tools_open_aux_tlv_header_pack(&(it->hdr), &hdrBuf[0]);
@@ -291,7 +325,8 @@ void ImageTlvOps::pushTlvsToRawBuffer()
             // push data
             tlvBuffer.insert(tlvBuffer.end(), it->data.begin(), it->data.end());
             // pad to DW aligned address with 0x0 if needed
-            if (it->data.size() & 3) {
+            if (it->data.size() & 3)
+            {
                 std::vector<u_int8_t> padding(4 - (it->data.size() & 3), 0x0);
                 tlvBuffer.insert(tlvBuffer.end(), padding.begin(), padding.end());
             }
@@ -304,46 +339,59 @@ void ImageTlvOps::pushTlvsToRawBuffer()
 
 Tlv_Status_t ImageTlvOps::parseTlvs()
 {
-    if (!_tlvSectionFound) {
+    if (!_tlvSectionFound)
+    {
         // nothing to parse
         return TS_OK;
     }
 
-    if (!_tlvSectionFilePos) {
+    if (!_tlvSectionFilePos)
+    {
         return (Tlv_Status_t)errmsgWCode(TS_GENERAL_ERROR, "Internal Error. unexpected file position.");
     }
 
     // while not end TLV or EOF
     u_int32_t nextTlvOffs = _tlvSectionFilePos + AUX_DATA_SIG_SIZE;
     u_int32_t bufferSize = (u_int32_t)_rawFileBuff.size();
-    do {
+    do
+    {
         aux_tlv tlv;
         // read next TLV header
-        if (nextTlvOffs == bufferSize) {
-            return (Tlv_Status_t)errmsgWCode(TS_TLV_PARSE_ERROR, "failed to parse TLVs : expected to find End marker before end of file");
+        if (nextTlvOffs == bufferSize)
+        {
+            return (Tlv_Status_t)errmsgWCode(TS_TLV_PARSE_ERROR,
+                                             "failed to parse TLVs : expected to find End marker before end of file");
         }
-        if (nextTlvOffs + TOOLS_OPEN_AUX_TLV_HEADER_SIZE > bufferSize) {
-            return (Tlv_Status_t)errmsgWCode(TS_TLV_PARSE_ERROR, "failed to parse TLVs : unexpected End of extended data section");
+        if (nextTlvOffs + TOOLS_OPEN_AUX_TLV_HEADER_SIZE > bufferSize)
+        {
+            return (Tlv_Status_t)errmsgWCode(TS_TLV_PARSE_ERROR,
+                                             "failed to parse TLVs : unexpected End of extended data section");
         }
         u_int8_t hdrBuf[TOOLS_OPEN_AUX_TLV_HEADER_SIZE] = {0};
         memcpy(hdrBuf, &_rawFileBuff[nextTlvOffs], TOOLS_OPEN_AUX_TLV_HEADER_SIZE);
         tools_open_aux_tlv_header_unpack(&tlv.hdr, hdrBuf);
         // check for END TLV
-        if (tlv.hdr.header_type == 0xf && tlv.hdr.type == 0xff) {
+        if (tlv.hdr.header_type == 0xf && tlv.hdr.type == 0xff)
+        {
             break;
         }
         // read next TLV data
-        if (nextTlvOffs + TOOLS_OPEN_AUX_TLV_HEADER_SIZE + tlv.hdr.length  > bufferSize) {
-            return (Tlv_Status_t)errmsgWCode(TS_TLV_PARSE_ERROR, "failed to parse TLVs : unexpected End of extended data section");
+        if (nextTlvOffs + TOOLS_OPEN_AUX_TLV_HEADER_SIZE + tlv.hdr.length > bufferSize)
+        {
+            return (Tlv_Status_t)errmsgWCode(TS_TLV_PARSE_ERROR,
+                                             "failed to parse TLVs : unexpected End of extended data section");
         }
         u_int32_t vecSizeDwAligned = ((tlv.hdr.length + 3) / 4) * 4;
         tlv.data.resize(tlv.hdr.length);
         memset(&tlv.data[0], 0x0, tlv.data.size());
         memcpy(&tlv.data[0], &_rawFileBuff[nextTlvOffs + TOOLS_OPEN_AUX_TLV_HEADER_SIZE], tlv.hdr.length);
-        if (tlv.hdr.header_type == 0x0) { // only know how to deal with header of type 0x0
+        if (tlv.hdr.header_type == 0x0)
+        { // only know how to deal with header of type 0x0
             // check CRC and store
-            if (tlv.hdr.crc != calcTlvCrc(tlv)) {
-                return (Tlv_Status_t)errmsgWCode(TS_TLV_CRC_MISMATCH, "Failed to parse TLVs, CRC mismatch for TLV type 0x%x", tlv.hdr.type);
+            if (tlv.hdr.crc != calcTlvCrc(tlv))
+            {
+                return (Tlv_Status_t)errmsgWCode(TS_TLV_CRC_MISMATCH,
+                                                 "Failed to parse TLVs, CRC mismatch for TLV type 0x%x", tlv.hdr.type);
             }
             // store it
             _tlvVec.push_back(tlv);
@@ -372,7 +420,8 @@ u_int16_t ImageTlvOps::calcTlvCrc(aux_tlv& tlv)
     CRCn(crc, &tlv.data[0], dataSize >> 2);
     // we might have missed the last DW as it need not be DW aligned
     u_int32_t remaining = dataSize & 3;
-    if (remaining) {
+    if (remaining)
+    {
         u_int32_t lastDw = 0x0;
         memcpy(&lastDw, &tlv.data[dataSize - remaining], remaining);
         crc << lastDw;
@@ -382,28 +431,25 @@ u_int16_t ImageTlvOps::calcTlvCrc(aux_tlv& tlv)
     return crc.get();
 }
 
-
 /*
  * TimeStampIFC class implementation
  */
 
-
-TimeStampIFC* TimeStampIFC::getIFC(mfile *mf)
+TimeStampIFC* TimeStampIFC::getIFC(mfile* mf)
 {
     return new DeviceTimeStamp(mf);
 }
 
-TimeStampIFC* TimeStampIFC::getIFC(const char *fname, u_int32_t lastFwAddr)
+TimeStampIFC* TimeStampIFC::getIFC(const char* fname, u_int32_t lastFwAddr)
 {
     return new ImageTimeStamp(fname, lastFwAddr);
 }
 
-TimeStampIFC* TimeStampIFC::getIFC(u_int8_t *buff, unsigned int size, u_int32_t lastFwAddr)
+TimeStampIFC* TimeStampIFC::getIFC(u_int8_t* buff, unsigned int size, u_int32_t lastFwAddr)
 {
     return new ImageTimeStamp(buff, size, lastFwAddr);
 }
 
-
 /*
  * ImageTimeStamp class implementation
  */
@@ -429,24 +475,30 @@ Tlv_Status_t ImageTimeStamp::setTimeStamp(struct tools_open_ts_entry& timestamp,
     tools_open_timestamp_pack(&tsData, &tsTlv.data[0]);
     _imgTlvOps.addTLV(tsTlv);
     bool rc = _imgTlvOps.updateFile();
-    if (!rc) {
+    if (!rc)
+    {
         return (Tlv_Status_t)errmsgWCode(rc, "%s", _imgTlvOps.err());
     }
     return TS_OK;
 }
 
-Tlv_Status_t ImageTimeStamp::queryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning)
+Tlv_Status_t ImageTimeStamp::queryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                            struct tools_open_fw_version& fwVer,
+                                            bool queryRunning)
 {
     (void)queryRunning;
     aux_tlv tsTlv;
     struct tools_open_timestamp tsData;
     memset(&(tsTlv.hdr), 0, sizeof(tsTlv.hdr));
     Tlv_Status_t rc = _imgTlvOps.queryTlv(ImageTimeStamp::TS_Tlv_Type, ImageTimeStamp::TS_Header_Type, tsTlv);
-    if (rc) {
+    if (rc)
+    {
         return (Tlv_Status_t)errmsgWCode(rc, "Failed to query timestamp, Data not found in image");
     }
-    if (tsTlv.hdr.major_version != 0) {
-        return (Tlv_Status_t)errmsgWCode(TS_UNKNOWN_TLV_VERSION, "Failed to query timestamp, Unknown timestamp TLV version");
+    if (tsTlv.hdr.major_version != 0)
+    {
+        return (Tlv_Status_t)errmsgWCode(TS_UNKNOWN_TLV_VERSION,
+                                         "Failed to query timestamp, Unknown timestamp TLV version");
     }
     tools_open_timestamp_unpack(&tsData, &tsTlv.data[0]);
     timestamp = tsData.ts_entry;
@@ -456,9 +508,11 @@ Tlv_Status_t ImageTimeStamp::queryTimeStamp(struct tools_open_ts_entry& timestam
 Tlv_Status_t ImageTimeStamp::resetTimeStamp()
 {
     Tlv_Status_t rc = _imgTlvOps.removeTlv(ImageTimeStamp::TS_Tlv_Type, ImageTimeStamp::TS_Header_Type);
-    if (rc == TS_OK) {
+    if (rc == TS_OK)
+    {
         Tlv_Status_t rc = _imgTlvOps.updateFile();
-        if (!rc) {
+        if (!rc)
+        {
             return (Tlv_Status_t)errmsgWCode(rc, "Failed to reset Timestamp on image, %s", _imgTlvOps.err());
         }
     }
@@ -477,13 +531,13 @@ Tlv_Status_t DeviceTimeStamp::init()
     memset(&mvts, 0, sizeof(mvts));
     mvts.running_flag = 1;
     rc = reg_access_mvts(_mf, REG_ACCESS_METHOD_GET, &mvts);
-    if (rc == ME_OK || rc == ME_REG_ACCESS_BAD_CONFIG) {
+    if (rc == ME_OK || rc == ME_REG_ACCESS_BAD_CONFIG)
+    {
         return TS_OK;
     }
     return (Tlv_Status_t)errmsgWCode(TS_TIMESTAMPING_NOT_SUPPORTED, "Time stamping not supported by FW");
 }
 
-
 Tlv_Status_t DeviceTimeStamp::setTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer)
 {
     struct tools_open_mvts mvts;
@@ -492,28 +546,35 @@ Tlv_Status_t DeviceTimeStamp::setTimeStamp(struct tools_open_ts_entry& timestamp
     mvts.timestamp.ts_entry = timestamp;
     int rc = reg_access_mvts(_mf, REG_ACCESS_METHOD_SET, &mvts);
     rc = (int)convertRc((MError)rc, REG_ACCESS_METHOD_SET);
-    if (rc) {
+    if (rc)
+    {
         return (Tlv_Status_t)errmsgWCode(rc, "Failed to set timestamp on device, %s", err());
     }
     return TS_OK;
 }
 
-
-Tlv_Status_t DeviceTimeStamp::queryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning)
+Tlv_Status_t DeviceTimeStamp::queryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                             struct tools_open_fw_version& fwVer,
+                                             bool queryRunning)
 {
     struct tools_open_mvts mvts;
     memset(&mvts, 0, sizeof(mvts));
     mvts.running_flag = queryRunning;
     int rc = reg_access_mvts(_mf, REG_ACCESS_METHOD_GET, &mvts);
     rc = (int)convertRc((MError)rc, REG_ACCESS_METHOD_GET);
-    if (rc) {
-        return (Tlv_Status_t)errmsgWCode(rc, "Failed to query %s timestamp on device, %s\n", queryRunning ? "current" : "next", err());
+    if (rc)
+    {
+        return (Tlv_Status_t)errmsgWCode(rc, "Failed to query %s timestamp on device, %s\n",
+                                         queryRunning ? "current" : "next", err());
     }
     // if timestamp and fw ver are zero entry is invalid
     struct tools_open_timestamp timestampZeroes;
     memset(&timestampZeroes, 0x0, sizeof(timestampZeroes));
-    if (!memcmp(&(mvts.timestamp), &timestampZeroes, sizeof(mvts.timestamp))) {
-        return (Tlv_Status_t)errmsgWCode(TS_NO_VALID_TIMESTAMP, "Failed to query %s timestamp, No valid timestamp found", queryRunning ? "current" : "next");
+    if (!memcmp(&(mvts.timestamp), &timestampZeroes, sizeof(mvts.timestamp)))
+    {
+        return (Tlv_Status_t)errmsgWCode(TS_NO_VALID_TIMESTAMP,
+                                         "Failed to query %s timestamp, No valid timestamp found",
+                                         queryRunning ? "current" : "next");
     }
     fwVer = mvts.timestamp.fw_version;
     timestamp = mvts.timestamp.ts_entry;
@@ -527,23 +588,33 @@ Tlv_Status_t DeviceTimeStamp::resetTimeStamp()
     mvts.clear_all_ts_flag = 1;
     int rc = reg_access_mvts(_mf, REG_ACCESS_METHOD_SET, &mvts);
     rc = (int)convertRc((MError)rc, REG_ACCESS_METHOD_SET);
-    if (rc) { // bad params means command not supported
-        return (Tlv_Status_t)errmsgWCode(rc, "Failed to reset timestamp on device, %s", rc == ME_REG_ACCESS_BAD_CONFIG ? "Bad configuration" : err());
+    if (rc)
+    { // bad params means command not supported
+        return (Tlv_Status_t)errmsgWCode(rc, "Failed to reset timestamp on device, %s",
+                                         rc == ME_REG_ACCESS_BAD_CONFIG ? "Bad configuration" : err());
     }
     return TS_OK;
 }
 
 inline Tlv_Status_t DeviceTimeStamp::convertRc(MError rc, int regMethod)
 {
-    if (rc == ME_OK) {
+    if (rc == ME_OK)
+    {
         return TS_OK;
     }
-    if (rc == ME_REG_ACCESS_BAD_PARAM || rc == ME_ICMD_OPERATIONAL_ERROR) {
+    if (rc == ME_REG_ACCESS_BAD_PARAM || rc == ME_ICMD_OPERATIONAL_ERROR)
+    {
         return (Tlv_Status_t)errmsgWCode(TS_TIMESTAMPING_NOT_SUPPORTED, "Time stamping not supported by FW");
-    } else if (rc == ME_REG_ACCESS_BAD_CONFIG) {
-        return (Tlv_Status_t)errmsgWCode(TS_NO_VALID_TIMESTAMP, regMethod == REG_ACCESS_METHOD_GET ? "No valid timestamp found" : "Timestamp is too old");
-    } else if (rc == ME_ICMD_UNSUPPORTED_ICMD_VERSION) {
+    }
+    else if (rc == ME_REG_ACCESS_BAD_CONFIG)
+    {
+        return (Tlv_Status_t)errmsgWCode(TS_NO_VALID_TIMESTAMP, regMethod == REG_ACCESS_METHOD_GET ?
+                                                                  "No valid timestamp found" :
+                                                                  "Timestamp is too old");
+    }
+    else if (rc == ME_ICMD_UNSUPPORTED_ICMD_VERSION)
+    {
         return (Tlv_Status_t)errmsgWCode(TS_UNSUPPORTED_ICMD_VERSION, "Unsupported ICMD version");
     }
-    return (Tlv_Status_t)errmsgWCode(TS_GENERAL_ERROR, "%s",  reg_access_err2str((MError)rc));
+    return (Tlv_Status_t)errmsgWCode(TS_GENERAL_ERROR, "%s", reg_access_err2str((MError)rc));
 }
diff --git a/mlxfwops/lib/aux_tlv_ops.h b/mlxfwops/lib/aux_tlv_ops.h
index 7cf6e3fb..a4c6f80f 100644
--- a/mlxfwops/lib/aux_tlv_ops.h
+++ b/mlxfwops/lib/aux_tlv_ops.h
@@ -38,7 +38,8 @@
 #include <tools_layouts/tools_open_layouts.h>
 #include <tools_layouts/register_access_open_layouts.h>
 
-typedef enum {
+typedef enum
+{
     TS_OK = 0,
     TS_GENERAL_ERROR,
     // device related errors
@@ -59,26 +60,39 @@ typedef enum {
     TS_UNKNOWN_TLV_VERSION,
 } Tlv_Status_t;
 
-typedef struct aux_tlv {
+typedef struct aux_tlv
+{
     struct tools_open_aux_tlv_header hdr;
-    std::vector<u_int8_t> data;  // data in big endian
+    std::vector<u_int8_t> data; // data in big endian
 } aux_tlv_t;
 
-
 class ImageTlvOps : public FlintErrMsg
 {
 public:
-    ImageTlvOps(const char *fname, bool readOnly = false) : FlintErrMsg(), _fname(fname), _tlvSectionFound(false),
-        _tlvSectionFilePos(0), _initialized(false),
-        _readOnly(readOnly){}
-    ImageTlvOps(u_int8_t *buf, unsigned int size) : FlintErrMsg(), _fname((const char*)NULL),
-        _tlvSectionFound(false), _tlvSectionFilePos(0),
-        _initialized(false), _readOnly(true)
+    ImageTlvOps(const char* fname, bool readOnly = false) :
+        FlintErrMsg(),
+        _fname(fname),
+        _tlvSectionFound(false),
+        _tlvSectionFilePos(0),
+        _initialized(false),
+        _readOnly(readOnly)
     {
-        if (!buf) {
+    }
+    ImageTlvOps(u_int8_t* buf, unsigned int size) :
+        FlintErrMsg(),
+        _fname((const char*)NULL),
+        _tlvSectionFound(false),
+        _tlvSectionFilePos(0),
+        _initialized(false),
+        _readOnly(true)
+    {
+        if (!buf)
+        {
             // Adrianc: should not be reached, consider using exceptions
             _rawFileBuff.resize(0);
-        } else {
+        }
+        else
+        {
             _rawFileBuff.resize(size);
             memcpy(&_rawFileBuff[0], buf, size);
         }
@@ -95,13 +109,13 @@ class ImageTlvOps : public FlintErrMsg
     bool test(); // test method
 private:
     void pushTlvsToRawBuffer();
-    Tlv_Status_t getFileSize(FILE *fd, long int& fileSize);
+    Tlv_Status_t getFileSize(FILE* fd, long int& fileSize);
     Tlv_Status_t writeBufferAsFile();
     Tlv_Status_t parseTlvs();
     u_int16_t calcTlvCrc(aux_tlv& tlv);
     bool checkSig(std::vector<u_int8_t>& signature);
 
-    const char *_fname;
+    const char* _fname;
     bool _tlvSectionFound;
     u_int32_t _tlvSectionFilePos;
     bool _initialized;
@@ -110,35 +124,41 @@ class ImageTlvOps : public FlintErrMsg
     std::vector<u_int8_t> _rawFileBuff;
 };
 
-
 class TimeStampIFC : public FlintErrMsg
 {
 public:
-    TimeStampIFC() : FlintErrMsg() {};
+    TimeStampIFC() : FlintErrMsg(){};
     virtual ~TimeStampIFC(){};
-    static TimeStampIFC* getIFC(mfile *mf);
-    static TimeStampIFC* getIFC(const char *fname, u_int32_t lastFWAddr = 0);
-    static TimeStampIFC* getIFC(u_int8_t *buff, unsigned int size, u_int32_t lastFwAddr = 0);
-    virtual Tlv_Status_t init() {return TS_OK;};
+    static TimeStampIFC* getIFC(mfile* mf);
+    static TimeStampIFC* getIFC(const char* fname, u_int32_t lastFWAddr = 0);
+    static TimeStampIFC* getIFC(u_int8_t* buff, unsigned int size, u_int32_t lastFwAddr = 0);
+    virtual Tlv_Status_t init() { return TS_OK; };
     virtual Tlv_Status_t setTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer) = 0;
-    virtual Tlv_Status_t queryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning = false) = 0;
+    virtual Tlv_Status_t queryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                        struct tools_open_fw_version& fwVer,
+                                        bool queryRunning = false) = 0;
     virtual Tlv_Status_t resetTimeStamp() = 0;
 };
 
-
 class ImageTimeStamp : public TimeStampIFC
 {
 public:
-    ImageTimeStamp(const char *fname, u_int32_t lastFwAddr) : TimeStampIFC(), _lastFwAddr(lastFwAddr), _imgTlvOps(fname) {};
-    ImageTimeStamp(u_int8_t *buf, unsigned int size, u_int32_t lastFwAddr) : TimeStampIFC(), _lastFwAddr(lastFwAddr), _imgTlvOps(buf, size) {};
-    ~ImageTimeStamp() {};
+    ImageTimeStamp(const char* fname, u_int32_t lastFwAddr) :
+        TimeStampIFC(), _lastFwAddr(lastFwAddr), _imgTlvOps(fname){};
+    ImageTimeStamp(u_int8_t* buf, unsigned int size, u_int32_t lastFwAddr) :
+        TimeStampIFC(), _lastFwAddr(lastFwAddr), _imgTlvOps(buf, size){};
+    ~ImageTimeStamp(){};
     virtual Tlv_Status_t init();
 
     virtual Tlv_Status_t setTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer);
-    virtual Tlv_Status_t queryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning = false);
+    virtual Tlv_Status_t queryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                        struct tools_open_fw_version& fwVer,
+                                        bool queryRunning = false);
     virtual Tlv_Status_t resetTimeStamp();
+
 private:
-    enum {
+    enum
+    {
         TS_Header_Type = 0x0,
         TS_Tlv_Type = 0x1,
     };
@@ -146,21 +166,22 @@ class ImageTimeStamp : public TimeStampIFC
     ImageTlvOps _imgTlvOps;
 };
 
-
 class DeviceTimeStamp : public TimeStampIFC
 {
 public:
-    DeviceTimeStamp(mfile *mf) : TimeStampIFC(), _mf(mf) {};
-    ~DeviceTimeStamp() {};
+    DeviceTimeStamp(mfile* mf) : TimeStampIFC(), _mf(mf){};
+    ~DeviceTimeStamp(){};
     virtual Tlv_Status_t init();
 
     virtual Tlv_Status_t setTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer);
-    virtual Tlv_Status_t queryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning = false);
+    virtual Tlv_Status_t queryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                        struct tools_open_fw_version& fwVer,
+                                        bool queryRunning = false);
     virtual Tlv_Status_t resetTimeStamp();
+
 private:
-    inline Tlv_Status_t convertRc(MError rc, int regMethod );
-    mfile *_mf;
+    inline Tlv_Status_t convertRc(MError rc, int regMethod);
+    mfile* _mf;
 };
 
-
 #endif
diff --git a/mlxfwops/lib/bluefiled_signature_manager.cpp b/mlxfwops/lib/bluefiled_signature_manager.cpp
index 5a1f1b7c..00095d4c 100644
--- a/mlxfwops/lib/bluefiled_signature_manager.cpp
+++ b/mlxfwops/lib/bluefiled_signature_manager.cpp
@@ -42,39 +42,47 @@
 
 using namespace std;
 
-
-bool BluefieldFwOperationsSignatureManager::AddSignature(mfile* mf, Fs3Operations* imageOps, Flash *f, u_int32_t imageOffset)
+bool BluefieldFwOperationsSignatureManager::AddSignature(mfile* mf,
+                                                         Fs3Operations* imageOps,
+                                                         Flash* f,
+                                                         u_int32_t imageOffset)
 {
-(void)imageOffset;
+    (void)imageOffset;
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
-    if (mf->tp == MST_SOFTWARE) {
+    if (mf->tp == MST_SOFTWARE)
+    {
         const unsigned int KEYLENGTH = 64;
         vector<u_int8_t> key;
         vector<u_int8_t> digest;
 
-        //read the on-chip EFUSE value of MDK, MDK 512 bits are located at 0x1c1640-0x1c167c
+        // read the on-chip EFUSE value of MDK, MDK 512 bits are located at 0x1c1640-0x1c167c
         key.resize(KEYLENGTH);
-        if (mread4_block(mf, 0x1c1640, (u_int32_t*)key.data(), KEYLENGTH) != (int)KEYLENGTH) {
+        if (mread4_block(mf, 0x1c1640, (u_int32_t*)key.data(), KEYLENGTH) != (int)KEYLENGTH)
+        {
             return errmsg("Failed to read MDK from CR");
         }
 
-        if (!imageOps->CalcHMAC(key, digest)) {
+        if (!imageOps->CalcHMAC(key, digest))
+        {
             return false;
         }
 
         // burn the HMAC digest
         u_int32_t sectionSize = 0x0;
         u_int32_t sectionOffset = 0x0;
-        if (!imageOps->GetSectionSizeAndOffset(FS3_HMAC_DIGEST, sectionSize, sectionOffset)) {
+        if (!imageOps->GetSectionSizeAndOffset(FS3_HMAC_DIGEST, sectionSize, sectionOffset))
+        {
             return errmsg("Could not retrieve HMAC section size and offset");
         }
 
         size_t digestSizeInDW = digest.size() >> 2;
         u_int32_t* digestDWP = (u_int32_t*)digest.data();
-        for (unsigned int i = 0; i < digestSizeInDW; i++) {
+        for (unsigned int i = 0; i < digestSizeInDW; i++)
+        {
             digestDWP[i] = CPU_TO_BE32(digestDWP[i]);
         }
-        if (!f->write(sectionOffset, digest.data(), sectionSize, true)) {
+        if (!f->write(sectionOffset, digest.data(), sectionSize, true))
+        {
             return errmsg(MLXFW_FLASH_WRITE_ERR, "Failed to burn HMAC digest: %s", f->err());
         }
     }
@@ -82,7 +90,7 @@ bool BluefieldFwOperationsSignatureManager::AddSignature(mfile* mf, Fs3Operation
     (void)imageOps;
     (void)f;
     (void)mf;
-    //ignore for UEFI
+    // ignore for UEFI
 #endif
     return true;
 };
diff --git a/mlxfwops/lib/connectx6_signature_manager.cpp b/mlxfwops/lib/connectx6_signature_manager.cpp
index ce1c8436..10b8c08f 100644
--- a/mlxfwops/lib/connectx6_signature_manager.cpp
+++ b/mlxfwops/lib/connectx6_signature_manager.cpp
@@ -39,18 +39,22 @@
 #include "fs3_ops.h"
 using namespace std;
 
-bool ConnectX6FwOperationsSignatureManager::AddSignature(mfile* mf, Fs3Operations* imageOps, Flash *f, u_int32_t imageOffset)
+bool ConnectX6FwOperationsSignatureManager::AddSignature(mfile* mf,
+                                                         Fs3Operations* imageOps,
+                                                         Flash* f,
+                                                         u_int32_t imageOffset)
 {
-(void)mf;
+    (void)mf;
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     int signature_size = 3 * HMAC_SIGNATURE_LENGTH;
-    uint8_t signature_data[3 * HMAC_SIGNATURE_LENGTH] = { 0 };
-    //FOR BOOT, CRITICAL, NON-CRITICAL
+    uint8_t signature_data[3 * HMAC_SIGNATURE_LENGTH] = {0};
+    // FOR BOOT, CRITICAL, NON-CRITICAL
     imageOps->GetImageCache().get(signature_data, imageOffset, signature_size);
-    if (!f->write(imageOffset, signature_data, signature_size)) {
+    if (!f->write(imageOffset, signature_data, signature_size))
+    {
         return errmsg(MLXFW_FLASH_WRITE_ERR, "Failed to burn HMAC digest: %s", f->err());
     }
-#else  
+#else
     (void)imageOps;
     (void)f;
     (void)imageOffset;
diff --git a/mlxfwops/lib/flint_base.cpp b/mlxfwops/lib/flint_base.cpp
index 2b954ab5..9e12217f 100644
--- a/mlxfwops/lib/flint_base.cpp
+++ b/mlxfwops/lib/flint_base.cpp
@@ -40,50 +40,56 @@
 #include <stdarg.h>
 #include "flint_base.h"
 
-#define DPRINTF(args)        do { char *reacDebug = getenv("MLXFWOPS_ERRMSG_DEBUG"); \
-                                  if (reacDebug != NULL) {  printf("\33[2K\r"); \
-                                      printf("%s:%d: ",__FILE__, __LINE__); printf args; fflush(stdout);} } while (0)
+#define DPRINTF(args)                                      \
+    do                                                     \
+    {                                                      \
+        char* reacDebug = getenv("MLXFWOPS_ERRMSG_DEBUG"); \
+        if (reacDebug != NULL)                             \
+        {                                                  \
+            printf("\33[2K\r");                            \
+            printf("%s:%d: ", __FILE__, __LINE__);         \
+            printf args;                                   \
+            fflush(stdout);                                \
+        }                                                  \
+    } while (0)
 
 void FlintErrMsg::err_clear()
 {
-    delete [] _err;
+    delete[] _err;
     _err = 0;
 }
 
+bool _print_crc = false;
+bool _silent = false;
+bool _assume_yes = false;
+bool _assume_no = false;
 
-bool _print_crc     = false;
-bool _silent        = false;
-bool _assume_yes    = false;
-bool _assume_no     = false;
-
-bool _no_erase      = false;
-bool _no_burn       = false;
+bool _no_erase = false;
+bool _no_burn = false;
 
 bool _unlock_bypass = false;
-bool _byte_write    = false;
-
-const char *g_sectNames[] = {
-    "UNKNOWN (0 - Reserved)",
-    "DDR",
-    "Configuration",
-    "Jump addresses",
-    "EMT Service",
-    "ROM",
-    "GUID",
-    "BOARD ID",
-    "User Data",
-    "FW Configuration",
-    "Image Info",
-    "DDRZ",
-    "Hash File"
-};
-
-void report(const char *format, ...)
+bool _byte_write = false;
+
+const char* g_sectNames[] = {"UNKNOWN (0 - Reserved)",
+                             "DDR",
+                             "Configuration",
+                             "Jump addresses",
+                             "EMT Service",
+                             "ROM",
+                             "GUID",
+                             "BOARD ID",
+                             "User Data",
+                             "FW Configuration",
+                             "Image Info",
+                             "DDRZ",
+                             "Hash File"};
+
+void report(const char* format, ...)
 #ifdef __GNUC__
-__attribute__ ((format(printf, 1, 2)))
+  __attribute__((format(printf, 1, 2)))
 #endif
-;
-void report(const char *format, ...)
+  ;
+void report(const char* format, ...)
 {
     va_list args;
     va_start(args, format);
@@ -92,7 +98,7 @@ void report(const char *format, ...)
 } // report
 
 #define MAX_STRING_LEN 512
-void report_callback(f_prog_func_str func_str, const char *format, ...)
+void report_callback(f_prog_func_str func_str, const char* format, ...)
 {
     va_list args;
     char buff[MAX_STRING_LEN];
@@ -101,13 +107,13 @@ void report_callback(f_prog_func_str func_str, const char *format, ...)
     vsnprintf(buff, MAX_STRING_LEN, format, args);
     va_end(args);
     // printf("%s\n", buff);
-    if (func_str != NULL) {
+    if (func_str != NULL)
+    {
         func_str(buff);
     }
 
 } // report
 
-
 /*
    void report_erase(const char *format, ...)
    {
@@ -128,20 +134,21 @@ void report_callback(f_prog_func_str func_str, const char *format, ...)
         printf("\b");
    } // report_erase
  */
-void report_repair_msg(const char *common_msg)
+void report_repair_msg(const char* common_msg)
 {
     printf("\r%s OK         ", common_msg);
 }
 
 #define MAX_ERR_STR_LEN 1024
 #define PRE_ERR_MSG "-E-"
-void report_err(char err_buff[MAX_ERR_STR_LEN], const char *format, ...)
+void report_err(char err_buff[MAX_ERR_STR_LEN], const char* format, ...)
 {
     va_list args;
 
     va_start(args, format);
 
-    if (vsnprintf(err_buff, MAX_ERR_STR_LEN, format, args) >= MAX_ERR_STR_LEN) {
+    if (vsnprintf(err_buff, MAX_ERR_STR_LEN, format, args) >= MAX_ERR_STR_LEN)
+    {
         strcpy(&err_buff[MAX_ERR_STR_LEN - 5], "...\n");
     }
     fprintf(stderr, PRE_ERR_MSG " %s", err_buff);
@@ -151,7 +158,7 @@ void report_err(char err_buff[MAX_ERR_STR_LEN], const char *format, ...)
     return;
 }
 
-void report_warn(const char *format, ...)
+void report_warn(const char* format, ...)
 {
 #ifndef UEFI_BUILD
     va_list args;
@@ -163,11 +170,11 @@ void report_warn(const char *format, ...)
 #endif
 }
 
-bool FlintErrMsg::errmsg(const char *format, ...)
+bool FlintErrMsg::errmsg(const char* format, ...)
 {
     va_list args;
 
-    char *prev_err = _err;
+    char* prev_err = _err;
 
     va_start(args, format);
     _err = vprint(format, args);
@@ -179,11 +186,11 @@ bool FlintErrMsg::errmsg(const char *format, ...)
     return false;
 }
 
-bool FlintErrMsg::errmsg(int errorCode, const char *format, ...)
+bool FlintErrMsg::errmsg(int errorCode, const char* format, ...)
 {
     va_list args;
 
-    char *prev_err = _err;
+    char* prev_err = _err;
 
     va_start(args, format);
     _err = vprint(format, args);
@@ -195,22 +202,25 @@ bool FlintErrMsg::errmsg(int errorCode, const char *format, ...)
     return false;
 }
 
-bool FlintErrMsg::errmsgAdv(bool showAdv, const char *normalFmt, const char *AdvFmt, ...)
+bool FlintErrMsg::errmsgAdv(bool showAdv, const char* normalFmt, const char* AdvFmt, ...)
 {
     // args should only apply to advanced format (i.e normalFmt does not contain %<char>)
     va_list args;
     char errFmt[1024];
 
-    char *prev_err = _err;
+    char* prev_err = _err;
 
     va_start(args, AdvFmt);
 
-    if (showAdv) {
+    if (showAdv)
+    {
         snprintf(errFmt, 1024, "%s %s", normalFmt, AdvFmt);
         _err = vprint(errFmt, args);
-    } else {
-        //For functions where the arguments are not available to be checked (such as vprintf),
-        //specify the third parameter as zero. In this case the compiler only checks the format string for consistency
+    }
+    else
+    {
+        // For functions where the arguments are not available to be checked (such as vprintf),
+        // specify the third parameter as zero. In this case the compiler only checks the format string for consistency
         errmsg(normalFmt, 0);
     }
     va_end(args);
@@ -220,11 +230,11 @@ bool FlintErrMsg::errmsgAdv(bool showAdv, const char *normalFmt, const char *Adv
     return false;
 }
 
-int FlintErrMsg::errmsgWCode(int errorCode, const char *format, ...)
+int FlintErrMsg::errmsgWCode(int errorCode, const char* format, ...)
 {
     va_list args;
 
-    char *prev_err = _err;
+    char* prev_err = _err;
 
     va_start(args, format);
     _err = vprint(format, args);
@@ -238,27 +248,35 @@ int FlintErrMsg::errmsgWCode(int errorCode, const char *format, ...)
 ////////////////////////////////////////////////////////////////////////
 void Crc16::add(u_int32_t o)
 {
-    if (_debug) {
+    if (_debug)
+    {
         printf("Crc16::add(%08x)\n", o);
     }
-    for (int i = 0; i < 32; i++) {
-        if (_crc & 0x8000) {
-            _crc = (u_int16_t) ((((_crc << 1) | (o >> 31)) ^  0x100b) & 0xffff);
-        } else {
-            _crc = (u_int16_t) (((_crc << 1) | (o >> 31)) & 0xffff);
+    for (int i = 0; i < 32; i++)
+    {
+        if (_crc & 0x8000)
+        {
+            _crc = (u_int16_t)((((_crc << 1) | (o >> 31)) ^ 0x100b) & 0xffff);
+        }
+        else
+        {
+            _crc = (u_int16_t)(((_crc << 1) | (o >> 31)) & 0xffff);
         }
         o = (o << 1) & 0xffffffff;
     }
 } // Crc16::add
 
-
 ////////////////////////////////////////////////////////////////////////
 void Crc16::finish()
 {
-    for (int i = 0; i < 16; i++) {
-        if (_crc & 0x8000) {
-            _crc = ((_crc << 1)  ^  0x100b) & 0xffff;
-        } else {
+    for (int i = 0; i < 16; i++)
+    {
+        if (_crc & 0x8000)
+        {
+            _crc = ((_crc << 1) ^ 0x100b) & 0xffff;
+        }
+        else
+        {
             _crc = (_crc << 1) & 0xffff;
         }
     }
@@ -268,36 +286,35 @@ void Crc16::finish()
 
 } // Crc16::finish
 
-
 #ifdef UEFI_BUILD
 
 void* operator new(size_t size)
 {
-    void *p;
-    p =  malloc(size);
+    void* p;
+    p = malloc(size);
     return p;
 }
 
 void* operator new[](size_t size)
 {
-    void *p;
-    p =  malloc(size);
+    void* p;
+    p = malloc(size);
     return p;
 }
 
 // delete operator overloaded
-void operator delete(void *p)
+void operator delete(void* p)
 {
     free(p);
 }
 
-void operator delete[](void *p)
+void operator delete[](void* p)
 {
     free(p);
 }
 
-
-namespace std {
+namespace std
+{
 void __throw_bad_alloc(void)
 {
     // TODO: Check what happens when there is no mem or replace this exit with goto
@@ -321,7 +338,7 @@ void __throw_out_of_range(const char*)
 hell:
     goto hell;
 }
-}
+} // namespace std
 
 int goto_function()
 {
@@ -329,7 +346,6 @@ int goto_function()
 hell:
     return 0;
 }
-extern "C" void __cxa_pure_virtual(void) {};
+extern "C" void __cxa_pure_virtual(void){};
 
 #endif
-
diff --git a/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h
index 0f7ab498..0d418bde 100644
--- a/mlxfwops/lib/flint_base.h
+++ b/mlxfwops/lib/flint_base.h
@@ -39,17 +39,16 @@
 #ifndef FLINT_BASE_H
 #define FLINT_BASE_H
 
-
 #ifndef UEFI_BUILD
-    #ifndef __FreeBSD__
-    #include <malloc.h>
-    #endif
+#ifndef __FreeBSD__
+#include <malloc.h>
+#endif
 #else
-    #include "uefi_c.h"
+#include "uefi_c.h"
 #endif
 
 #if defined __FreeBSD__
-    #include <stdarg.h>
+#include <stdarg.h>
 #endif
 
 #include <signal.h>
@@ -61,271 +60,353 @@
 // GCC Compiler
 //
 
-
-    #if defined __DJGPP__
+#if defined __DJGPP__
 //
 // DJGPP - GCC PORT TO MS DOS
 //
 
-        #include <mtcr.h> // This contains the u_* types definitions
+#include <mtcr.h> // This contains the u_* types definitions
 
-        #include <netinet/in.h>
-        #include <unistd.h>
+#include <netinet/in.h>
+#include <unistd.h>
 
-        #define bswap_32(x) ntohl(x)
+#define bswap_32(x) ntohl(x)
 
 // djgpp stdio does not define vsnprintf. I simply call vsprintf (and pray ...)
-        #define vsnprintf(buf, len, format, args) (vsprintf(buf, format, args))
-        #define snprintf(buf, len, format, args ...) (sprintf(buf, format, args))
-    #endif // __DJGPP__
+#define vsnprintf(buf, len, format, args) (vsprintf(buf, format, args))
+#define snprintf(buf, len, format, args...) (sprintf(buf, format, args))
+#endif // __DJGPP__
 
 #else // __WIN__
 
 //
 // Windows (Under DDK)
 //
-    #include <mtcr.h>
+#include <mtcr.h>
 // Sleep adaptor
-    #define usleep(x) Sleep((x) / 1000)
-    #define sleep(x)  Sleep((x) * 1000)
+#define usleep(x) Sleep((x) / 1000)
+#define sleep(x) Sleep((x)*1000)
 
-    #define vsnprintf      _vsnprintf
-    #define isatty         _isatty
+#define vsnprintf _vsnprintf
+#define isatty _isatty
 
 // MINGW
-    #if defined(__MINGW32__) || (__MINGW64__)
-        #define _UNISTD_H // Zlib includes unistd.h which causes some compilation errors.
-    #else
-        #define strtoull       _strtoui64
-    #endif
+#if defined(__MINGW32__) || (__MINGW64__)
+#define _UNISTD_H // Zlib includes unistd.h which causes some compilation errors.
+#else
+#define strtoull _strtoui64
+#endif
 #endif // __WIN__
 
-
 #include <vector>
 #include <compatibility.h>
 #include "mlxfwops_com.h"
 
-static inline void be_guid_to_cpu(guid_t *to, guid_t *from)
+static inline void be_guid_to_cpu(guid_t* to, guid_t* from)
 {
     to->h = __be32_to_cpu(from->h);
     to->l = __be32_to_cpu(from->l);
 }
-namespace std {}; using namespace std;
+namespace std
+{
+};
+using namespace std;
 
 #define TOCPU1(s) s = __be32_to_cpu((u_int32_t)(s));
 #define CPUTO1(s) s = __cpu_to_be32((u_int32_t)(s));
-#define TOCPU(s) do {                                              \
-        u_int32_t *p = (u_int32_t*)(s);                               \
+#define TOCPU(s)                                                               \
+    do                                                                         \
+    {                                                                          \
+        u_int32_t* p = (u_int32_t*)(s);                                        \
         for (u_int32_t ii = 0; ii < sizeof(*s) / sizeof(u_int32_t); ii++, p++) \
-            *p = __be32_to_cpu(*p);                                    \
-} while (0)
-#define TOCPUn(s, n) do {                                          \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (u_int32_t ii = 0; ii < (n); ii++, p++)                         \
-            *p = __be32_to_cpu(*p);                                    \
-} while (0)
-
-#define CPUTOn(s, n) do {                                          \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (u_int32_t ii = 0; ii < (n); ii++, p++)                         \
-            *p = __cpu_to_be32(*p);                                    \
-} while (0)
-
-#define TOCPUBY(s) do {                                            \
-        u_int32_t *p = (u_int32_t*)(&s);                              \
+            *p = __be32_to_cpu(*p);                                            \
+    } while (0)
+#define TOCPUn(s, n)                                \
+    do                                              \
+    {                                               \
+        u_int32_t* p = (u_int32_t*)(s);             \
+        for (u_int32_t ii = 0; ii < (n); ii++, p++) \
+            *p = __be32_to_cpu(*p);                 \
+    } while (0)
+
+#define CPUTOn(s, n)                                \
+    do                                              \
+    {                                               \
+        u_int32_t* p = (u_int32_t*)(s);             \
+        for (u_int32_t ii = 0; ii < (n); ii++, p++) \
+            *p = __cpu_to_be32(*p);                 \
+    } while (0)
+
+#define TOCPUBY(s)                                                            \
+    do                                                                        \
+    {                                                                         \
+        u_int32_t* p = (u_int32_t*)(&s);                                      \
         for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t); ii++, p++) \
-            *p = __be32_to_cpu(*p);                                    \
-} while (0)
-#define CPUTOBY(s) do {                                            \
-        u_int32_t *p = (u_int32_t*)(&s);                              \
+            *p = __be32_to_cpu(*p);                                           \
+    } while (0)
+#define CPUTOBY(s)                                                            \
+    do                                                                        \
+    {                                                                         \
+        u_int32_t* p = (u_int32_t*)(&s);                                      \
         for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t); ii++, p++) \
-            *p = __cpu_to_be32(*p);                                    \
-} while (0)
-#define TOCPUBY64(s) do {                                          \
-        guid_t *p = s;                              \
-        for (unsigned ii = 0; ii < sizeof(s) / sizeof(guid_t); ii++, p++)     \
-            be_guid_to_cpu(p, p);                                       \
-} while (0)
-#define CRC(c, s) do {                                             \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t); ii++)     \
-            c << *p++;                                                 \
-} while (0)
-#define CRCn(c, s, n) do {                                         \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (u_int32_t ii = 0; ii < (n); ii++)                             \
-            c << *p++;                                                 \
-} while (0)
-#define CRCBY(c, s) do {                                           \
-        u_int32_t *p = (u_int32_t*)(&s);                              \
-        for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t); ii++)     \
-            c << *p++;                                                 \
-} while (0)
-#define CRC1(c, s) do {                                            \
-        u_int32_t *p = (u_int32_t*)(s);                               \
+            *p = __cpu_to_be32(*p);                                           \
+    } while (0)
+#define TOCPUBY64(s)                                                      \
+    do                                                                    \
+    {                                                                     \
+        guid_t* p = s;                                                    \
+        for (unsigned ii = 0; ii < sizeof(s) / sizeof(guid_t); ii++, p++) \
+            be_guid_to_cpu(p, p);                                         \
+    } while (0)
+#define CRC(c, s)                                                        \
+    do                                                                   \
+    {                                                                    \
+        u_int32_t* p = (u_int32_t*)(s);                                  \
+        for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t); ii++) \
+            c << *p++;                                                   \
+    } while (0)
+#define CRCn(c, s, n)                          \
+    do                                         \
+    {                                          \
+        u_int32_t* p = (u_int32_t*)(s);        \
+        for (u_int32_t ii = 0; ii < (n); ii++) \
+            c << *p++;                         \
+    } while (0)
+#define CRCBY(c, s)                                                      \
+    do                                                                   \
+    {                                                                    \
+        u_int32_t* p = (u_int32_t*)(&s);                                 \
+        for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t); ii++) \
+            c << *p++;                                                   \
+    } while (0)
+#define CRC1(c, s)                                                           \
+    do                                                                       \
+    {                                                                        \
+        u_int32_t* p = (u_int32_t*)(s);                                      \
         for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t) - 1; ii++) \
-            c << *p++;                                                 \
-} while (0)
-#define CRC1n(c, s, n) do {                                        \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (u_int32_t ii = 0; ii < (n) - 1; ii++)                         \
-            c << *p++;                                                 \
-} while (0)
-#define CRC1BY(c, s) do {                                          \
-        u_int32_t *p = (u_int32_t*)(&s);                              \
+            c << *p++;                                                       \
+    } while (0)
+#define CRC1n(c, s, n)                           \
+    do                                           \
+    {                                            \
+        u_int32_t* p = (u_int32_t*)(s);          \
+        for (u_int32_t ii = 0; ii < (n)-1; ii++) \
+            c << *p++;                           \
+    } while (0)
+#define CRC1BY(c, s)                                                         \
+    do                                                                       \
+    {                                                                        \
+        u_int32_t* p = (u_int32_t*)(&s);                                     \
         for (u_int32_t ii = 0; ii < sizeof(s) / sizeof(u_int32_t) - 1; ii++) \
-            c << *p++;                                                 \
-} while (0)
-
-
-#define CHECKB2(b, o, n, f, p, fp) do { if (!checkBoot2(b, o, n, f, p, fp)) {return false;}} while (0)
-#define FS3_CHECKB2(b, o, f, p, i) {u_int32_t n; if (!checkBoot2(b, o, n, f, p, i)) {return false;}}
-
-#define CHECKGN(b, o, n, p, fp) do { if (!checkGen(b, o, n, p, fp)) {return false;}} while (0)
-#define CHECKLS(o, s, p) do { if (!checkList(o, s, p)) {return false;}} while (0)
-#define READ4(f, o, d, p) do { if (!f.read(o, d)) {  \
-                                   return errmsg("%s - read error (%s)\n", p, f.err()); }} while (0)
-#define READ4_NOERRMSG(f, o, d) do { if (!f.read(o, d)) {  \
-                                         return false; }} while (0)
-#define READBUF(f, o, d, l, p) do { if (!f.read(o, d, l)) { \
-                                        return errmsg("%s - read error (%s)\n", p, f.err()); }} while (0)
-#define READALLOCBUF(f, o, d, l, p) do { \
-        d = (u_int8_t*) malloc(sizeof(u_int8_t) * l); \
-        if (!f.read(o, d, l)) { \
-            free(d); \
+            c << *p++;                                                       \
+    } while (0)
+
+#define CHECKB2(b, o, n, f, p, fp)          \
+    do                                      \
+    {                                       \
+        if (!checkBoot2(b, o, n, f, p, fp)) \
+        {                                   \
+            return false;                   \
+        }                                   \
+    } while (0)
+#define FS3_CHECKB2(b, o, f, p, i)         \
+    {                                      \
+        u_int32_t n;                       \
+        if (!checkBoot2(b, o, n, f, p, i)) \
+        {                                  \
+            return false;                  \
+        }                                  \
+    }
+
+#define CHECKGN(b, o, n, p, fp)        \
+    do                                 \
+    {                                  \
+        if (!checkGen(b, o, n, p, fp)) \
+        {                              \
+            return false;              \
+        }                              \
+    } while (0)
+#define CHECKLS(o, s, p)         \
+    do                           \
+    {                            \
+        if (!checkList(o, s, p)) \
+        {                        \
+            return false;        \
+        }                        \
+    } while (0)
+#define READ4(f, o, d, p)                                        \
+    do                                                           \
+    {                                                            \
+        if (!f.read(o, d))                                       \
+        {                                                        \
             return errmsg("%s - read error (%s)\n", p, f.err()); \
-        } \
-} while (0)
+        }                                                        \
+    } while (0)
+#define READ4_NOERRMSG(f, o, d) \
+    do                          \
+    {                           \
+        if (!f.read(o, d))      \
+        {                       \
+            return false;       \
+        }                       \
+    } while (0)
+#define READBUF(f, o, d, l, p)                                   \
+    do                                                           \
+    {                                                            \
+        if (!f.read(o, d, l))                                    \
+        {                                                        \
+            return errmsg("%s - read error (%s)\n", p, f.err()); \
+        }                                                        \
+    } while (0)
+#define READALLOCBUF(f, o, d, l, p)                              \
+    do                                                           \
+    {                                                            \
+        d = (u_int8_t*)malloc(sizeof(u_int8_t) * l);             \
+        if (!f.read(o, d, l))                                    \
+        {                                                        \
+            free(d);                                             \
+            return errmsg("%s - read error (%s)\n", p, f.err()); \
+        }                                                        \
+    } while (0)
 
-#define FS2_BOOT_START   0x38
-#define FS_DATA_OFF      0x28
+#define FS2_BOOT_START 0x38
+#define FS_DATA_OFF 0x28
 
-#define CONNECT_IB_SW_ID  4113
+#define CONNECT_IB_SW_ID 4113
 
 // FS3 defines
-#define FS3_BOOT_START        FS2_BOOT_START
-#define FS3_BOOT_START_IN_DW  FS3_BOOT_START / 4
+#define FS3_BOOT_START FS2_BOOT_START
+#define FS3_BOOT_START_IN_DW FS3_BOOT_START / 4
 
 // FS4 defines
-#define FS4_HW_PTR_START       0x18
+#define FS4_HW_PTR_START 0x18
 
 #define CRC_CHECK_OLD "%s /0x%08x-0x%08x (0x%06x)/ (%s"
 
 #define MAX_NUM_SUPP_HW_IDS 200
 #define MAX_NUM_SUPP_HW_LIST_STR (MAX_NUM_SUPP_HW_IDS * 40)
-#define MAC_SPACES  "            "
+#define MAC_SPACES "            "
 #define GUID_SPACES "        "
 #define GUID_FORMAT "%8.8x%8.8x"
-#define MAC_FORMAT  "%4.4x%8.8x"
-
+#define MAC_FORMAT "%4.4x%8.8x"
 
-#define FLINT_LOG_ENV    "FLINT_LOG_FILE"
-#define IMG_CRC_OFF      0x20
-#define MAX_ERR_STR_LEN  1024
+#define FLINT_LOG_ENV "FLINT_LOG_FILE"
+#define IMG_CRC_OFF 0x20
+#define MAX_ERR_STR_LEN 1024
 
-#define MLXCONFIG_CMD    "config"
-enum {
-    SIGNATURE          = 0x5a445a44,
+#define MLXCONFIG_CMD "config"
+enum
+{
+    SIGNATURE = 0x5a445a44,
     MELLANOX_VENDOR_ID = 0x15b3
 };
 
-enum SectionType {
-    H_FIRST     =  1,
-    H_DDR       =  1,
-    H_CNF       =  2,
-    H_JMP       =  3,
-    H_EMT       =  4,
-    H_ROM       =  5,
-    H_GUID      =  6,
-    H_BOARD_ID  =  7,
-    H_USER_DATA =  8,
-    H_FW_CONF   =  9,
-    H_IMG_INFO  = 10,
-    H_DDRZ      = 11,
+enum SectionType
+{
+    H_FIRST = 1,
+    H_DDR = 1,
+    H_CNF = 2,
+    H_JMP = 3,
+    H_EMT = 4,
+    H_ROM = 5,
+    H_GUID = 6,
+    H_BOARD_ID = 7,
+    H_USER_DATA = 8,
+    H_FW_CONF = 9,
+    H_IMG_INFO = 10,
+    H_DDRZ = 11,
     H_HASH_FILE = 12,
     H_LAST
 };
 
-/* Description - Section ID Section Type DESCRIPTION\;0x1 BOOT_CODE FW loader code\;0x2 PCI_CODE Code that is required to raise PCIe link.\;
- * 0x3 MAIN_CODE All non-PCIe FW code\;0x8 HW_BOOT_CFG Initial values for the PCI related registers\;0x9 HW_MAIN_CFG Initial values for all
- * other registers \;0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash Programming
- *  Application Note\;0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as number of physical functions\
- *  ;(optional)\;0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related settings.\;(optional)\;0x18 ROM_CODE PXE/Boot over IB code.
+/* Description - Section ID Section Type DESCRIPTION\;0x1 BOOT_CODE FW loader code\;0x2 PCI_CODE Code that is required
+ * to raise PCIe link.\; 0x3 MAIN_CODE All non-PCIe FW code\;0x8 HW_BOOT_CFG Initial values for the PCI related
+ * registers\;0x9 HW_MAIN_CFG Initial values for all other registers \;0x10 IMAGE_INFO Management data for the burning
+ * tool. See 'Image Info Section' chapter in the Mellanox Flash Programming
+ *  Application Note\;0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as
+ * number of physical functions\
+ *  ;(optional)\;0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related
+ * settings.\;(optional)\;0x18 ROM_CODE PXE/Boot over IB code.
  *   \;0x30 DBG_LOG_MAP FW logger 'index to string' map. The map is in ASCI text. Format is TBD.\;
- *   PARAM0 in the iTOC specifies the compression method of this sector:\;                                          0. Uncompressed\;
- *    1. Zlib compress2()\;                                          2. LZMA\;                                          Others - Reserved \;0x31 DBG_FW_INI
- *    The Ini file used in the image generation. The PARAM0 applies the same as in  DBG_LOG_MAP section type.\;0x32 DBG_FW_PARAMS FW settable parameters.
- *    ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP section type.\;0xff END_MARKER A type of 0xff marks the end of the iTOC entries
- *     array. It is recommended to leave the unused part of the iTOC section blank (that is, 0xff in all unused bytes)\;All other values Reserved \; */
-
-typedef enum fs3_section {
-    FS3_BOOT_CODE           = 0x1,
-    FS3_PCI_CODE            = 0x2,
-    FS3_MAIN_CODE           = 0x3,
-    FS3_PCIE_LINK_CODE      = 0x4,
-    FS3_IRON_PREP_CODE      = 0x5,
+ *   PARAM0 in the iTOC specifies the compression method of this sector:\;                                          0.
+ * Uncompressed\;
+ *    1. Zlib compress2()\;                                          2. LZMA\; Others - Reserved \;0x31 DBG_FW_INI The
+ * Ini file used in the image generation. The PARAM0 applies the same as in  DBG_LOG_MAP section type.\;0x32
+ * DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP
+ * section type.\;0xff END_MARKER A type of 0xff marks the end of the iTOC entries
+ *     array. It is recommended to leave the unused part of the iTOC section blank (that is, 0xff in all unused
+ * bytes)\;All other values Reserved \; */
+
+typedef enum fs3_section
+{
+    FS3_BOOT_CODE = 0x1,
+    FS3_PCI_CODE = 0x2,
+    FS3_MAIN_CODE = 0x3,
+    FS3_PCIE_LINK_CODE = 0x4,
+    FS3_IRON_PREP_CODE = 0x5,
     FS3_POST_IRON_BOOT_CODE = 0x6,
-    FS3_UPGRADE_CODE        = 0x7,
-    FS3_HW_BOOT_CFG         = 0x8,
-    FS3_HW_MAIN_CFG         = 0x9,
-    FS3_PHY_UC_CODE         = 0xa,
-    FS3_PHY_UC_CONSTS       = 0xb,
-    FS3_PCIE_PHY_UC_CODE    = 0xc,
-    FS3_CCIR_INFRA_CODE     = 0xd,
-    FS3_CCIR_ALGO_CODE      = 0xe,
-    FS4_BOOT3_CODE          = 0xf,
-    FS3_IMAGE_INFO          = 0x10,
-    FS3_FW_BOOT_CFG         = 0x11,
-    FS3_FW_MAIN_CFG         = 0x12,
-    FS3_APU_KERNEL          = 0x14,
-    FS3_APU_APPS            = 0x15,
-    FS3_ROM_CODE            = 0x18,
-    FS3_RESET_INFO          = 0x20,
-    FS3_DBG_FW_INI          = 0x30,
-    FS3_DBG_FW_PARAMS       = 0x32,
-    FS3_FW_ADB              = 0x33,
-    FS4_GB_FW_CODE          = 0x34,
-    FS4_TILE_FW_CODE        = 0x35,
-    FS4_FW_TILE_INI         = 0x36,
-    FS4_HW_TILE_INI         = 0x37,
+    FS3_UPGRADE_CODE = 0x7,
+    FS3_HW_BOOT_CFG = 0x8,
+    FS3_HW_MAIN_CFG = 0x9,
+    FS3_PHY_UC_CODE = 0xa,
+    FS3_PHY_UC_CONSTS = 0xb,
+    FS3_PCIE_PHY_UC_CODE = 0xc,
+    FS3_CCIR_INFRA_CODE = 0xd,
+    FS3_CCIR_ALGO_CODE = 0xe,
+    FS4_BOOT3_CODE = 0xf,
+    FS3_IMAGE_INFO = 0x10,
+    FS3_FW_BOOT_CFG = 0x11,
+    FS3_FW_MAIN_CFG = 0x12,
+    FS3_APU_KERNEL = 0x14,
+    FS3_APU_APPS = 0x15,
+    FS3_ROM_CODE = 0x18,
+    FS3_RESET_INFO = 0x20,
+    FS3_DBG_FW_INI = 0x30,
+    FS3_DBG_FW_PARAMS = 0x32,
+    FS3_FW_ADB = 0x33,
+    FS4_GB_FW_CODE = 0x34,
+    FS4_TILE_FW_CODE = 0x35,
+    FS4_FW_TILE_INI = 0x36,
+    FS4_HW_TILE_INI = 0x37,
     FS3_IMAGE_SIGNATURE_256 = 0xa0,
-    FS3_PUBLIC_KEYS_2048    = 0xa1,
-    FS3_FORBIDDEN_VERSIONS  = 0xa2,
+    FS3_PUBLIC_KEYS_2048 = 0xa1,
+    FS3_FORBIDDEN_VERSIONS = 0xa2,
     FS3_IMAGE_SIGNATURE_512 = 0xa3,
-    FS3_PUBLIC_KEYS_4096    = 0xa4,
-    FS3_HMAC_DIGEST         = 0xa5,
-    FS4_RSA_PUBLIC_KEY      = 0xa6,
+    FS3_PUBLIC_KEYS_4096 = 0xa4,
+    FS3_HMAC_DIGEST = 0xa5,
+    FS4_RSA_PUBLIC_KEY = 0xa6,
     FS4_RSA_4096_SIGNATURES = 0xa7,
-    FS4_EXCLKSYNC_INFO      = 0xb0,
-    FS3_MFG_INFO            = 0xe0,
-    FS3_DEV_INFO            = 0xe1,
-    FS3_NV_DATA1            = 0xe2,
-    FS3_VPD_R0              = 0xe3,
-    FS3_NV_DATA2            = 0xe4,
-    FS3_FW_NV_LOG           = 0xe5,
-    FS3_NV_DATA0            = 0xe6, // replaces FS3_NV_DATA1
-    FS4_DEV_INFO1           = 0xe7,
-    FS4_DEV_INFO2           = 0xe8,
-    FS3_CRDUMP_MASK_DATA    = 0xe9,
-    FS4_FW_INTERNAL_USAGE   = 0xea,
+    FS4_EXCLKSYNC_INFO = 0xb0,
+    FS3_MFG_INFO = 0xe0,
+    FS3_DEV_INFO = 0xe1,
+    FS3_NV_DATA1 = 0xe2,
+    FS3_VPD_R0 = 0xe3,
+    FS3_NV_DATA2 = 0xe4,
+    FS3_FW_NV_LOG = 0xe5,
+    FS3_NV_DATA0 = 0xe6, // replaces FS3_NV_DATA1
+    FS4_DEV_INFO1 = 0xe7,
+    FS4_DEV_INFO2 = 0xe8,
+    FS3_CRDUMP_MASK_DATA = 0xe9,
+    FS4_FW_INTERNAL_USAGE = 0xea,
     FS4_PROGRAMMABLE_HW_FW1 = 0xeb,
     FS4_PROGRAMMABLE_HW_FW2 = 0xec,
-    FS4_DIGITAL_CERT_PTR    = 0xed,
-    FS4_DIGITAL_CERT_RW     = 0xee,
-    FS4_LC_INI1_TABLE       = 0xef,
-    FS4_LC_INI2_TABLE       = 0xf0,
-    FS4_LC_INI_NV_DATA      = 0xf1,
-    FS4_CERT_CHAIN_0        = 0xf2,
-    FS4_DIGITAL_CACERT_RW   = 0xf3,
-    FS4_HASHES_TABLE        = 0xfa,
-    FS4_HW_PTR              = 0xfb,
-    FS4_TOOLS_AREA          = 0xfc,
-    FS3_ITOC                = 0xfd,
-    FS3_DTOC                = 0xfe,
-    FS3_END                 = 0xff,
+    FS4_DIGITAL_CERT_PTR = 0xed,
+    FS4_DIGITAL_CERT_RW = 0xee,
+    FS4_LC_INI1_TABLE = 0xef,
+    FS4_LC_INI2_TABLE = 0xf0,
+    FS4_LC_INI_NV_DATA = 0xf1,
+    FS4_CERT_CHAIN_0 = 0xf2,
+    FS4_DIGITAL_CACERT_RW = 0xf3,
+    FS4_HASHES_TABLE = 0xfa,
+    FS4_HW_PTR = 0xfb,
+    FS4_TOOLS_AREA = 0xfc,
+    FS3_ITOC = 0xfd,
+    FS3_DTOC = 0xfe,
+    FS3_END = 0xff,
 } fs3_section_t;
 
-enum CommandType {
+enum CommandType
+{
     CMD_UNKNOWN,
     CMD_BURN,
     CMD_SET_GUIDS,
@@ -366,8 +447,8 @@ enum CommandType {
     CMD_SET_PUBLIC_4096_RSA_KEY
 };
 
-
-struct GPH {
+struct GPH
+{
     u_int32_t type;
     u_int32_t size;
     u_int32_t param;
@@ -383,80 +464,76 @@ struct GPH {
 #define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine."
 #endif
 
-void report(const char *format, ...);
-void report_callback(f_prog_func_str func_str, const char *format, ...);
-void report_err(char err_buff[MAX_ERR_STR_LEN], const char *format, ...);
-void report_warn(const char *format, ...);
-void report_repair_msg(const char *common_msg);
-
-
-
+void report(const char* format, ...);
+void report_callback(f_prog_func_str func_str, const char* format, ...);
+void report_err(char err_buff[MAX_ERR_STR_LEN], const char* format, ...);
+void report_warn(const char* format, ...);
+void report_repair_msg(const char* common_msg);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //                  BASE CLASSES
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-class MLXFWOP_API FlintErrMsg {
+class MLXFWOP_API FlintErrMsg
+{
 public:
-    FlintErrMsg() : _err(0), _errCode(0){}
-    ~FlintErrMsg()                { err_clear();}
-    const char* err() const { return _err;}
+    FlintErrMsg() : _err(0), _errCode(0) {}
+    ~FlintErrMsg() { err_clear(); }
+    const char* err() const { return _err; }
     void err_clear();
-    int getErrorCode() {return _errCode;}
+    int getErrorCode() { return _errCode; }
 
 protected:
-
-    char* vprint(const char *format, va_list args)
+    char* vprint(const char* format, va_list args)
     {
         const int INIT_VAL = 1024;
         int max_str, max_buf = INIT_VAL;
-        char      *out_buf;
+        char* out_buf;
 
-        while (1) {
+        while (1)
+        {
             out_buf = new char[max_buf];
             max_str = max_buf - 1;
 
-            if (vsnprintf(out_buf, max_str, format, args) < max_str) {
+            if (vsnprintf(out_buf, max_str, format, args) < max_str)
+            {
                 return out_buf;
             }
-            delete [] out_buf;
+            delete[] out_buf;
             max_buf *= 2;
         }
     }
 
-
-    bool errmsg(const char *format, ...)
+    bool errmsg(const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 2, 3)))
+      __attribute__((format(printf, 2, 3)))
 #endif
-    ;
+      ;
 
-    bool errmsg(int errorCode, const char *format, ...)
+    bool errmsg(int errorCode, const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 3, 4)))
+      __attribute__((format(printf, 3, 4)))
 #endif
-    ;
+      ;
 
     // this is abit ugly as there are no checks on the normalFmt string
-    bool errmsgAdv(bool showAdv, const char *normalFmt, const char *AdvFmt, ...)
+    bool errmsgAdv(bool showAdv, const char* normalFmt, const char* AdvFmt, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 4, 5)))
+      __attribute__((format(printf, 4, 5)))
 #endif
-    ;
+      ;
 
-    int errmsgWCode(int errorCode, const char *format, ...)
+    int errmsgWCode(int errorCode, const char* format, ...)
 #ifdef __GNUC__
-    __attribute__ ((format(printf, 3, 4)))
+      __attribute__((format(printf, 3, 4)))
 #endif
-    ;
+      ;
 
 private:
-
-    char       *_err;
+    char* _err;
     int _errCode;
 };
 
-
 ////////////////////////////////////////////////////////////////////////
 //                                                                    //
 // ****************************************************************** //
@@ -464,44 +541,44 @@ class MLXFWOP_API FlintErrMsg {
 // ****************************************************************** //
 //                                                                    //
 ////////////////////////////////////////////////////////////////////////
-class Crc16 {
+class Crc16
+{
 public:
-    Crc16(bool d = false) : _debug(d) { clear();}
-    u_int16_t      get()              { return _crc;}
-    void           clear()            { _crc = 0xffff;}
-    void operator<<(u_int32_t val) { add(val);}
-    void           add(u_int32_t val);
-    void           finish();
+    Crc16(bool d = false) : _debug(d) { clear(); }
+    u_int16_t get() { return _crc; }
+    void clear() { _crc = 0xffff; }
+    void operator<<(u_int32_t val) { add(val); }
+    void add(u_int32_t val);
+    void finish();
+
 private:
     u_int16_t _crc;
     bool _debug;
 };
 
-
-class u_int32_ba {
+class u_int32_ba
+{
 public:
-    u_int32_ba(u_int32_t i = 0) :
-        _bits(i),
-        _rbits(_bits),
-        _sptr1(0),
-        _eptr(31)    {}
+    u_int32_ba(u_int32_t i = 0) : _bits(i), _rbits(_bits), _sptr1(0), _eptr(31) {}
 
-    u_int32_ba operator[](u_int32_t idx) {return range((u_int8_t)idx, (u_int8_t)idx);}
-    u_int32_ba& operator=(u_int32_t i)   {_rbits = ((i << _sptr1) & mask()) | (_rbits & ~mask()); return *this;}
-    u_int32_t*  operator&()              {return &_bits;}
-    operator    u_int32_t()              {return((mask() & _rbits) >> _sptr1);}
+    u_int32_ba operator[](u_int32_t idx) { return range((u_int8_t)idx, (u_int8_t)idx); }
+    u_int32_ba& operator=(u_int32_t i)
+    {
+        _rbits = ((i << _sptr1) & mask()) | (_rbits & ~mask());
+        return *this;
+    }
+    u_int32_t* operator&() { return &_bits; }
+    operator u_int32_t() { return ((mask() & _rbits) >> _sptr1); }
 
-    u_int32_ba  range(u_int8_t eptr,
-                      u_int8_t sptr) {return u_int32_ba(*this, eptr, sptr);}
+    u_int32_ba range(u_int8_t eptr, u_int8_t sptr) { return u_int32_ba(*this, eptr, sptr); }
 
 private:
     u_int32_ba(u_int32_ba& other, u_int8_t eptr, u_int8_t sptr) :
-        _bits(other._bits),
-        _rbits(other._bits),
-        _sptr1(sptr),
-        _eptr(eptr) {}
+        _bits(other._bits), _rbits(other._bits), _sptr1(sptr), _eptr(eptr)
+    {
+    }
 
-    u_int32_t  mask()
+    u_int32_t mask()
     {
         u_int32_t s_msk = (u_int32_t)-1; // start mask
         u_int32_t e_msk = (u_int32_t)-1; // end mask
@@ -509,7 +586,7 @@ class u_int32_ba {
         s_msk = (s_msk << _sptr1);
         e_msk = (_eptr >= (sizeof(_bits) * 8 - 1)) ? e_msk : ~(e_msk << (_eptr + 1));
 
-        return(s_msk & e_msk);
+        return (s_msk & e_msk);
     };
 
     u_int32_t _bits;
@@ -529,7 +606,8 @@ class u_int32_ba {
 //
 //////////////////////////////////////////////////////////////////////
 
-class Aligner {
+class Aligner
+{
 public:
     Aligner(u_int32_t log2_alignment_size) :
         _curr_addr(0),
@@ -538,10 +616,11 @@ class Aligner {
         _alignment_size(1 << log2_alignment_size),
         _alignment_mask(_alignment_size - 1)
     {
-        if (_log2_alignment_size == 0) {
+        if (_log2_alignment_size == 0)
+        {
             _log2_alignment_size = 31;
-            _alignment_size      = 1 << _log2_alignment_size;
-            _alignment_mask      = _alignment_size - 1;
+            _alignment_size = 1 << _log2_alignment_size;
+            _alignment_mask = _alignment_size - 1;
         }
     }
 
@@ -553,17 +632,20 @@ class Aligner {
 
     bool GetNextChunk(u_int32_t& chunk_addr, u_int32_t& chunk_size)
     {
-        if (_curr_size == 0) {
+        if (_curr_size == 0)
+        {
             return false;
         }
 
         chunk_addr = _curr_addr;
 
-        if ( (_curr_addr               >> _log2_alignment_size) !=
-             ((_curr_addr + _curr_size) >> _log2_alignment_size)) {
+        if ((_curr_addr >> _log2_alignment_size) != ((_curr_addr + _curr_size) >> _log2_alignment_size))
+        {
             // Next chunk crosses alignment boundary
             chunk_size = _alignment_size - (_curr_addr & _alignment_mask);
-        } else {
+        }
+        else
+        {
             chunk_size = _curr_size;
         }
 
@@ -582,4 +664,3 @@ class Aligner {
 };
 
 #endif
-
diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
index 35cac6d6..69764280 100644
--- a/mlxfwops/lib/flint_io.cpp
+++ b/mlxfwops/lib/flint_io.cpp
@@ -41,11 +41,10 @@
 #include <tools_dev_types.h>
 #include "flint_io.h"
 
-
 extern bool _no_erase;
 extern bool _no_burn;
 
-extern const char *g_sectNames[];
+extern const char* g_sectNames[];
 
 #ifdef UEFI_BUILD
 // no signal handling.
@@ -61,37 +60,40 @@ void mft_signal_set_handling(int isOn)
 //
 ////////////////////////////////////////////////////////////////////////
 
-bool FImage::open(const char *fname, bool read_only, bool advErr)
+bool FImage::open(const char* fname, bool read_only, bool advErr)
 {
-
 #ifndef UEFI_BUILD
     int fsize;
-    FILE              *fh;
+    FILE* fh;
 
-    (void)read_only;  // FImage can be opened only for read so we ignore compiler warnings
+    (void)read_only; // FImage can be opened only for read so we ignore compiler warnings
     _advErrors = advErr;
 
     fh = fopen(fname, "rb");
 
-    if (!fh) {
+    if (!fh)
+    {
         return errmsg("Can not open file \"%s\" - %s", fname, strerror(errno));
     }
 
     // Get the file size:
-    if (fseek(fh, 0, SEEK_END) < 0) {
+    if (fseek(fh, 0, SEEK_END) < 0)
+    {
         fclose(fh);
         return errmsg("Can not get file size for \"%s\" - %s", fname, strerror(errno));
     }
 
     fsize = ftell(fh);
-    if (fsize < 0) {
+    if (fsize < 0)
+    {
         fclose(fh);
         return errmsg("Can not get file size for \"%s\" - %s", fname, strerror(errno));
     }
     rewind(fh);
 
-    //printf("-D- %s size is %d\n", fname, fsize);
-    if (fsize & 0x3) {
+    // printf("-D- %s size is %d\n", fname, fsize);
+    if (fsize & 0x3)
+    {
         fclose(fh);
         return errmsg("Image size should be 4-bytes aligned. Make sure file %s is in the right format (binary image)",
                       fname);
@@ -107,7 +109,7 @@ bool FImage::open(const char *fname, bool read_only, bool advErr)
 #endif
 } // FImage::open
 
-bool FImage::open(u_int32_t *buf, u_int32_t len, bool advErr)
+bool FImage::open(u_int32_t* buf, u_int32_t len, bool advErr)
 {
     _buf.resize(len);
     memcpy(_buf.data(), buf, len);
@@ -127,59 +129,69 @@ void FImage::close()
 /////////////////////////////////////////////////////////////////////////
 u_int32_t* FImage::getBuf()
 {
-    if (_isFile) {
+    if (_isFile)
+    {
         // Read the entire file on demand
-        FILE *fh = fopen(_fname, "rb");
+        FILE* fh = fopen(_fname, "rb");
         int r_cnt;
-        u_int32_t *retBuf;
-        if (!fh) {
+        u_int32_t* retBuf;
+        if (!fh)
+        {
             errmsg("Can not open file \"%s\" - %s", _fname, strerror(errno));
             return (u_int32_t*)NULL;
         }
         _buf.resize(_len);
-        if ((r_cnt = fread(_buf.data(), 1, _len, fh)) != (int)_len) {
-            if (r_cnt < 0) {
+        if ((r_cnt = fread(_buf.data(), 1, _len, fh)) != (int)_len)
+        {
+            if (r_cnt < 0)
+            {
                 errmsg("Read error on file \"%s\" - %s", _fname, strerror(errno));
                 retBuf = (u_int32_t*)NULL;
                 goto cleanup;
-            } else {
-                errmsg("Read error on file \"%s\" - read only %d bytes (from %ld)",
-                       _fname, r_cnt, (unsigned long)_len);
+            }
+            else
+            {
+                errmsg("Read error on file \"%s\" - read only %d bytes (from %ld)", _fname, r_cnt, (unsigned long)_len);
                 retBuf = (u_int32_t*)NULL;
                 goto cleanup;
             }
         }
         _isFile = false;
         retBuf = (u_int32_t*)_buf.data();
-cleanup:
+    cleanup:
         fclose(fh);
         return retBuf;
-    } else {
+    }
+    else
+    {
         return (u_int32_t*)_buf.data();
     }
 }
 
 ////////////////////////////////////////////////////////////////////////
-bool FImage::read(u_int32_t addr, u_int32_t *data)
+bool FImage::read(u_int32_t addr, u_int32_t* data)
 {
     return read(addr, data, 4);
 } // FImage::read
 
 ////////////////////////////////////////////////////////////////////////
-bool FImage::read(u_int32_t addr, void *data, int len, bool verbose, const char *message)
+bool FImage::read(u_int32_t addr, void* data, int len, bool verbose, const char* message)
 {
     (void)verbose;
-    (void) message;
+    (void)message;
 
-    if (!readWriteCommCheck(addr, len)) {
+    if (!readWriteCommCheck(addr, len))
+    {
         return false;
     }
 
-    if (!_isFile && _buf.size() == 0) {
+    if (!_isFile && _buf.size() == 0)
+    {
         return errmsg("read() when not opened");
     }
 
-    if (cont2phys(addr + len) > _len) {
+    if (cont2phys(addr + len) > _len)
+    {
         return errmsg("Reading 0x%x bytes from %s address 0x%x is out of image limits (0x%x bytes)",
                       len,
                       _log2_chunk_size ? "physical " : "",
@@ -191,26 +203,31 @@ bool FImage::read(u_int32_t addr, void *data, int len, bool verbose, const char
     u_int32_t chunk_size;
     Aligner align(_log2_chunk_size);
     align.Init(addr, len);
-    while (align.GetNextChunk(chunk_addr, chunk_size)) {
+    while (align.GetNextChunk(chunk_addr, chunk_size))
+    {
         u_int32_t phys_addr = cont2phys(chunk_addr);
-        if (_isFile) {
-            FILE *fh = fopen(_fname, "rb");
-            if (!fh) {
+        if (_isFile)
+        {
+            FILE* fh = fopen(_fname, "rb");
+            if (!fh)
+            {
                 return errmsg("Can not open file \"%s\" - %s", _fname, strerror(errno));
             }
-            if (fseek(fh, phys_addr, SEEK_SET) != 0) {
+            if (fseek(fh, phys_addr, SEEK_SET) != 0)
+            {
                 fclose(fh);
                 return errmsg("Failed to read from FW file, offset: %#x - %s", phys_addr, strerror(errno));
             }
-            if (fread((u_int8_t*)data + (chunk_addr - addr), chunk_size, 1, fh) != 1) {
+            if (fread((u_int8_t*)data + (chunk_addr - addr), chunk_size, 1, fh) != 1)
+            {
                 fclose(fh);
                 return errmsg("Failed to read from FW file, offset: %#x - %s", phys_addr, strerror(errno));
             }
             fclose(fh);
-        } else {
-            memcpy((u_int8_t*)data + (chunk_addr - addr),
-                   _buf.data() +  phys_addr,
-                   chunk_size);
+        }
+        else
+        {
+            memcpy((u_int8_t*)data + (chunk_addr - addr), _buf.data() + phys_addr, chunk_size);
         }
     }
 
@@ -226,7 +243,8 @@ u_int32_t FImage::get_sector_size()
 
     read(0x24, &signature);
     TOCPU1(signature);
-    if (signature == SIGNATURE) {
+    if (signature == SIGNATURE)
+    {
         // full image:
         read(0x14, &log2_sector_sz_ptr);
         TOCPU1(log2_sector_sz_ptr);
@@ -236,9 +254,10 @@ u_int32_t FImage::get_sector_size()
         TOCPU1(log2_sector_sz);
         log2_sector_sz &= 0xffff;
 
-        return(1 << log2_sector_sz);
-
-    } else {
+        return (1 << log2_sector_sz);
+    }
+    else
+    {
         return 0;
     }
 }
@@ -246,17 +265,20 @@ u_int32_t FImage::get_sector_size()
 bool FImage::readFileGetBuffer(std::vector<u_int8_t>& dataBuf)
 {
     int fileSize;
-    FILE *fh;
+    FILE* fh;
 
-    if (!getFileSize(fileSize)) {
+    if (!getFileSize(fileSize))
+    {
         return false;
     }
     dataBuf.resize(fileSize);
-    if ((fh = fopen(_fname, "rb")) == NULL) {
+    if ((fh = fopen(_fname, "rb")) == NULL)
+    {
         return errmsg("Can not open %s: %s\n", _fname, strerror(errno));
     }
 
-    if (fread(dataBuf.data(), 1, fileSize, fh) != (size_t)fileSize) {
+    if (fread(dataBuf.data(), 1, fileSize, fh) != (size_t)fileSize)
+    {
         dataBuf.resize(0);
         fclose(fh);
         return errmsg("Failed to read entire file %s: %s\n", _fname, strerror(errno));
@@ -266,12 +288,14 @@ bool FImage::readFileGetBuffer(std::vector<u_int8_t>& dataBuf)
 }
 bool FImage::writeEntireFile(std::vector<u_int8_t>& fileContent)
 {
-    FILE *fh;
-    if ((fh = fopen(_fname, "wb")) == (FILE*)NULL) {
+    FILE* fh;
+    if ((fh = fopen(_fname, "wb")) == (FILE*)NULL)
+    {
         return errmsg("Can not open %s: %s\n", _fname, strerror(errno));
     }
 
-    if (fwrite(fileContent.data(), 1, fileContent.size(), fh) != fileContent.size()) {
+    if (fwrite(fileContent.data(), 1, fileContent.size(), fh) != fileContent.size())
+    {
         fclose(fh);
         return errmsg("Failed to write entire file %s: %s\n", _fname, strerror(errno));
     }
@@ -281,27 +305,32 @@ bool FImage::writeEntireFile(std::vector<u_int8_t>& fileContent)
 
 bool FImage::getFileSize(int& fileSize)
 {
-    FILE *fh;
-    if ((fh = fopen(_fname, "rb")) == NULL) {
+    FILE* fh;
+    if ((fh = fopen(_fname, "rb")) == NULL)
+    {
         return errmsg("Can not open %s: %s\n", _fname, strerror(errno));
     }
 
-    if (fseek(fh, 0, SEEK_END) < 0) {
+    if (fseek(fh, 0, SEEK_END) < 0)
+    {
         fclose(fh);
         return errmsg("Failed to get size of the file \"%s\": %s\n", _fname, strerror(errno));
     }
     fileSize = ftell(fh);
     fclose(fh);
-    if (fileSize < 0) {
+    if (fileSize < 0)
+    {
         return errmsg("Failed to get size of the file \"%s\": %s\n", _fname, strerror(errno));
     }
     return true;
 }
 
-bool FImage::write(u_int32_t addr, void *data, int cnt)
+bool FImage::write(u_int32_t addr, void* data, int cnt)
 {
-    if (!_isFile) {
-        if (_buf.size() < addr + cnt) {
+    if (!_isFile)
+    {
+        if (_buf.size() < addr + cnt)
+        {
             _buf.resize(addr + cnt);
         }
 
@@ -309,21 +338,25 @@ bool FImage::write(u_int32_t addr, void *data, int cnt)
         return true;
     }
 
-    if (!readWriteCommCheck(addr, 0)) {
+    if (!readWriteCommCheck(addr, 0))
+    {
         return false;
     }
     // read entire file
     std::vector<u_int8_t> dataVec;
-    if (!readFileGetBuffer(dataVec)) {
+    if (!readFileGetBuffer(dataVec))
+    {
         return false;
     }
     // modify content (extend if needed)
-    if ((dataVec.size() < addr + cnt) ) {
+    if ((dataVec.size() < addr + cnt))
+    {
         dataVec.resize(addr + cnt);
     }
     memcpy(&dataVec[addr], data, cnt);
     // re-write the file
-    if (!writeEntireFile(dataVec)) {
+    if (!writeEntireFile(dataVec))
+    {
         return false;
     }
     _len = dataVec.size();
@@ -337,46 +370,63 @@ bool FImage::write(u_int32_t addr, void *data, int cnt)
 ////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////
-bool Flash::open_com_checks(const char *device, int rc, bool force_lock)
+bool Flash::open_com_checks(const char* device, int rc, bool force_lock)
 {
-    if ((rc == MFE_SEM_LOCKED) && force_lock) {
+    if ((rc == MFE_SEM_LOCKED) && force_lock)
+    {
         report("Warning: Taking flash lock even though semaphore is set.\n");
         rc = mf_open_ignore_lock(_mfl);
     }
 
-    if (rc != MFE_OK) {
-        if (rc == MFE_SEM_LOCKED) {
-            return errmsgAdv(_advErrors, "Can not obtain Flash semaphore.", "You can run \"flint -clear_semaphore -d <device>\" to force semaphore unlock. See help for details.");
+    if (rc != MFE_OK)
+    {
+        if (rc == MFE_SEM_LOCKED)
+        {
+            return errmsgAdv(
+              _advErrors, "Can not obtain Flash semaphore.",
+              "You can run \"flint -clear_semaphore -d <device>\" to force semaphore unlock. See help for details.");
         }
-        if (rc == MFE_LOCKED_CRSPACE) {
+        if (rc == MFE_LOCKED_CRSPACE)
+        {
             _cr_space_locked = 1;
-            return errmsgAdv(_advErrors, "HW access is disabled on the device.", "\n-E- Run \"flint -d %s hw_access enable [key]\" in order to enable HW access.", device);
+            return errmsgAdv(_advErrors, "HW access is disabled on the device.",
+                             "\n-E- Run \"flint -d %s hw_access enable [key]\" in order to enable HW access.", device);
         }
-        if (rc == MFE_REG_ACCESS_NOT_SUPPORTED) {
-            return errmsgAdv(_advErrors, "The target device FW does not support flash access commands.", "\n-E- Please use the -override_cache_replacement option in order to access the flash directly.");
+        if (rc == MFE_REG_ACCESS_NOT_SUPPORTED)
+        {
+            return errmsgAdv(
+              _advErrors, "The target device FW does not support flash access commands.",
+              "\n-E- Please use the -override_cache_replacement option in order to access the flash directly.");
         }
-        if (rc == MFE_DIRECT_FW_ACCESS_DISABLED) {
-            return errmsgAdv(_advErrors, "Flash cache replacement is active.", "\n-E- Please use the -override_cache_replacement option in order to access the flash directly.");
+        if (rc == MFE_DIRECT_FW_ACCESS_DISABLED)
+        {
+            return errmsgAdv(
+              _advErrors, "Flash cache replacement is active.",
+              "\n-E- Please use the -override_cache_replacement option in order to access the flash directly.");
         }
 
-        return errmsg("%s%s%s", errno == 0 ? "" : strerror(errno),  errno == 0 ? "" : ". ", mf_err2str(rc));
+        return errmsg("%s%s%s", errno == 0 ? "" : strerror(errno), errno == 0 ? "" : ". ", mf_err2str(rc));
     }
 
     rc = mf_get_attr(_mfl, &_attr);
-    if (rc != MFE_OK) {
-        return errmsg("Failed getting flash attributes for device %s: %s", device,  mf_err2str(rc));
+    if (rc != MFE_OK)
+    {
+        return errmsg("Failed getting flash attributes for device %s: %s", device, mf_err2str(rc));
     }
     _curr_sector_size = _attr.sector_size;
 
     rc = mf_set_opt(_mfl, MFO_NO_VERIFY, _no_flash_verify ? 1 : 0);
-    if (rc != MFE_OK) {
+    if (rc != MFE_OK)
+    {
         return errmsg("Failed setting no flash verify on device: %s", mf_err2str(rc));
     }
 
-
-    if (_attr.hw_dev_id == IS4_HW_ID || _attr.hw_dev_id == SWITCHX_HW_ID) {
+    if (_attr.hw_dev_id == IS4_HW_ID || _attr.hw_dev_id == SWITCHX_HW_ID)
+    {
         _port_num = 0;
-    } else {
+    }
+    else
+    {
         _port_num = 2;
     }
     return true;
@@ -385,9 +435,11 @@ bool Flash::open_com_checks(const char *device, int rc, bool force_lock)
 bool Flash::set_no_flash_verify(bool val)
 {
     int rc;
-    if (_mfl) {
+    if (_mfl)
+    {
         rc = mf_set_opt(_mfl, MFO_NO_VERIFY, val ? 1 : 0);
-        if (rc != MFE_OK) {
+        if (rc != MFE_OK)
+        {
             return errmsg("Failed setting no flash verify on device: %s", mf_err2str(rc));
         }
     }
@@ -397,10 +449,15 @@ bool Flash::set_no_flash_verify(bool val)
 
 // Flash::open
 
-
 ////////////////////////////////////////////////////////////////////////
-bool Flash::open(const char *device, bool force_lock, bool read_only, int num_of_banks, flash_params_t *flash_params,
-                 int ignore_cashe_replacement, bool advErr, int cx3_fw_access)
+bool Flash::open(const char* device,
+                 bool force_lock,
+                 bool read_only,
+                 int num_of_banks,
+                 flash_params_t* flash_params,
+                 int ignore_cashe_replacement,
+                 bool advErr,
+                 int cx3_fw_access)
 {
     // Open device
     int rc;
@@ -408,13 +465,15 @@ bool Flash::open(const char *device, bool force_lock, bool read_only, int num_of
     _ignore_cache_replacement = ignore_cashe_replacement ? true : false;
     (void)read_only; // not used , avoid compiler warnings TODO: remove this var from function def
     rc = mf_open_adv(&_mfl, device, num_of_banks, flash_params, ignore_cashe_replacement, cx3_fw_access);
-    //printf("device: %s , forceLock: %s , read only: %s, num of banks: %d, flash params is null: %s, ocr: %d, rc: %d\n",
-    //		device, force_lock? "true":"false", read_only?"true":"false", num_of_banks, flash_params? "no":"yes", ignore_cashe_replacement, rc);
+    // printf("device: %s , forceLock: %s , read only: %s, num of banks: %d, flash params is null: %s, ocr: %d, rc:
+    // %d\n", 		device, force_lock? "true":"false", read_only?"true":"false", num_of_banks, flash_params?
+    // "no":"yes",
+    // ignore_cashe_replacement, rc);
     return open_com_checks(device, rc, force_lock);
 }
 
 ////////////////////////////////////////////////////////////////////////
-bool Flash::open(uefi_Dev_t *uefi_dev, uefi_dev_extra_t *uefi_extra, bool force_lock, bool advErr)
+bool Flash::open(uefi_Dev_t* uefi_dev, uefi_dev_extra_t* uefi_extra, bool force_lock, bool advErr)
 {
     int rc;
     _advErrors = advErr;
@@ -422,11 +481,11 @@ bool Flash::open(uefi_Dev_t *uefi_dev, uefi_dev_extra_t *uefi_extra, bool force_
     return open_com_checks("uefi", rc, force_lock);
 }
 
-
 ////////////////////////////////////////////////////////////////////////
 void Flash::close()
 {
-    if (!_mfl) {
+    if (!_mfl)
+    {
         return;
     }
 
@@ -434,8 +493,7 @@ void Flash::close()
     _mfl = 0;
 } // Flash::close
 
-bool Flash::read(u_int32_t addr,
-                 u_int32_t *data)
+bool Flash::read(u_int32_t addr, u_int32_t* data)
 {
     int rc;
 
@@ -445,10 +503,9 @@ bool Flash::read(u_int32_t addr,
     mft_signal_set_handling(1);
     rc = mf_read(_mfl, phys_addr, 4, (u_int8_t*)data, false);
     deal_with_signal();
-    if (rc != MFE_OK) {
-        return errmsg("Flash read failed at address %s0x%x : %s",
-                      _log2_chunk_size ? "physical " : "",
-                      addr,
+    if (rc != MFE_OK)
+    {
+        return errmsg("Flash read failed at address %s0x%x : %s", _log2_chunk_size ? "physical " : "", addr,
                       mf_err2str(rc));
     }
 
@@ -456,53 +513,63 @@ bool Flash::read(u_int32_t addr,
 }
 
 ////////////////////////////////////////////////////////////////////////
-bool Flash::read(u_int32_t addr, void *data, int len, bool verbose, const char *message)
+bool Flash::read(u_int32_t addr, void* data, int len, bool verbose, const char* message)
 {
     int rc;
-    if (!readWriteCommCheck(addr, len)) {
+    if (!readWriteCommCheck(addr, len))
+    {
         return false;
     }
-    if (verbose) {
-        printf("\33[2K\r");//clear the current line
+    if (verbose)
+    {
+        printf("\33[2K\r"); // clear the current line
     }
     // Much better perf for read in a single chunk. need to work on progress report though.
     bool read_in_single_chunk = true;
 
-    if (read_in_single_chunk) {
+    if (read_in_single_chunk)
+    {
         u_int32_t chunk_addr;
         u_int32_t chunk_size;
 
         Aligner align(_log2_chunk_size);
         align.Init(addr, len);
-        while (align.GetNextChunk(chunk_addr, chunk_size)) {
+        while (align.GetNextChunk(chunk_addr, chunk_size))
+        {
             u_int32_t phys_addr = cont2phys(chunk_addr);
             // printf("-D- write: addr = %#x, phys_addr = %#x\n", chunk_addr, phys_addr);
             mft_signal_set_handling(1);
             rc = mf_read(_mfl, phys_addr, chunk_size, ((u_int8_t*)data) + chunk_addr - addr, verbose);
             deal_with_signal();
-            if (rc != MFE_OK) {
+            if (rc != MFE_OK)
+            {
                 return errmsg("Flash read failed at address %s0x%x : %s",
                               _log2_chunk_size ? "physical " : "",
                               chunk_addr,
                               mf_err2str(rc));
             }
         }
-
-    } else {
+    }
+    else
+    {
         u_int32_t perc = 0xffffffff;
-        u_int32_t *p = (u_int32_t*)data;
-        for (int i = 0; i < len / 4; i++) {
-            if (!read(addr, p++)) {
+        u_int32_t* p = (u_int32_t*)data;
+        for (int i = 0; i < len / 4; i++)
+        {
+            if (!read(addr, p++))
+            {
                 return false;
             }
 
             addr += 4;
 
             // Report
-            if (verbose) {
+            if (verbose)
+            {
                 u_int32_t new_perc = (i * 100) / len;
-                if (new_perc != perc) {
-                    printf("\33[2K\r");//clear the current line
+                if (new_perc != perc)
+                {
+                    printf("\33[2K\r"); // clear the current line
                     printf("\r%s%d%c", message, new_perc, '%');
                     fflush(stdout);
                     perc = new_perc;
@@ -512,34 +579,37 @@ bool Flash::read(u_int32_t addr, void *data, int len, bool verbose, const char *
     }
 
     // Report
-    if (verbose) {
-        printf("\33[2K\r");//clear the current line
+    if (verbose)
+    {
+        printf("\33[2K\r"); // clear the current line
         printf("Done.");
         fflush(stdout);
     }
 
     return true;
 } // Flash::read
-#define DISABLE_CONVERTOR(log2_chunk_size_bak, is_image_in_odd_chunks_bak) { \
-        log2_chunk_size_bak = _log2_chunk_size; \
-        is_image_in_odd_chunks_bak = _is_image_in_odd_chunks; \
-        set_address_convertor(0, 0); \
-}
-
-#define NATIVE_PHY_ADDR_FUNC(func, arg) { \
-        bool ret = true; \
-        u_int32_t log2_chunk_size_bak, is_image_in_odd_chunks_bak; \
-        DISABLE_CONVERTOR(log2_chunk_size_bak, is_image_in_odd_chunks_bak); \
-        ret = func arg; \
+#define DISABLE_CONVERTOR(log2_chunk_size_bak, is_image_in_odd_chunks_bak) \
+    {                                                                      \
+        log2_chunk_size_bak = _log2_chunk_size;                            \
+        is_image_in_odd_chunks_bak = _is_image_in_odd_chunks;              \
+        set_address_convertor(0, 0);                                       \
+    }
+
+#define NATIVE_PHY_ADDR_FUNC(func, arg)                                         \
+    {                                                                           \
+        bool ret = true;                                                        \
+        u_int32_t log2_chunk_size_bak, is_image_in_odd_chunks_bak;              \
+        DISABLE_CONVERTOR(log2_chunk_size_bak, is_image_in_odd_chunks_bak);     \
+        ret = func arg;                                                         \
         set_address_convertor(log2_chunk_size_bak, is_image_in_odd_chunks_bak); \
-        return ret; \
-}
-bool FBase::read_phy(u_int32_t phy_addr, u_int32_t *data)
+        return ret;                                                             \
+    }
+bool FBase::read_phy(u_int32_t phy_addr, u_int32_t* data)
 {
     NATIVE_PHY_ADDR_FUNC(read, (phy_addr, data));
 }
 
-bool FBase::read_phy(u_int32_t phy_addr, void *data, int len)
+bool FBase::read_phy(u_int32_t phy_addr, void* data, int len)
 {
     NATIVE_PHY_ADDR_FUNC(read, (phy_addr, data, len));
 }
@@ -549,21 +619,21 @@ bool Flash::write_phy(u_int32_t phy_addr, u_int32_t data)
     NATIVE_PHY_ADDR_FUNC(write, (phy_addr, data));
 }
 
-bool Flash::write_phy(u_int32_t phy_addr, void *data, int cnt, bool noerase)
+bool Flash::write_phy(u_int32_t phy_addr, void* data, int cnt, bool noerase)
 {
     // Avoid warning
     (void)noerase;
     NATIVE_PHY_ADDR_FUNC(write, (phy_addr, data, cnt));
 }
 
-bool Flash::read_modify_write_phy(u_int32_t phy_addr, void *data, int cnt, bool noerase)
+bool Flash::read_modify_write_phy(u_int32_t phy_addr, void* data, int cnt, bool noerase)
 {
     // Avoid warning
     (void)noerase;
     NATIVE_PHY_ADDR_FUNC(write_with_erase, (phy_addr, data, cnt));
 }
 
-bool Flash::read_modify_write(u_int32_t phy_addr, void *data, int cnt, bool noerase)
+bool Flash::read_modify_write(u_int32_t phy_addr, void* data, int cnt, bool noerase)
 {
     // Avoid warning
     (void)noerase;
@@ -575,33 +645,31 @@ bool Flash::erase_sector_phy(u_int32_t phy_addr)
     NATIVE_PHY_ADDR_FUNC(erase_sector, (phy_addr));
 }
 
-
 ////////////////////////////////////////////////////////////////////////
-bool Flash::write(u_int32_t addr,
-                  void *data,
-                  int cnt,
-                  bool noerase)
+bool Flash::write(u_int32_t addr, void* data, int cnt, bool noerase)
 {
     // FIX:
     noerase = _no_erase || noerase;
 
-    if (!_mfl) {
+    if (!_mfl)
+    {
         return errmsg("Not opened");
     }
-    if (addr & 0x3) {
+    if (addr & 0x3)
+    {
         return errmsg("Address should be 4-bytes aligned.");
     }
 
-
-    if (cont2phys(addr + cnt) > get_effective_size()) {
+    if (cont2phys(addr + cnt) > get_effective_size())
+    {
         return errmsg(
-            "Trying to write %d bytes to address 0x%x, which exceeds max image size (0x%x - half of total flash size).",
-            cnt,
-            addr,
-            get_effective_size() / 2);
+          "Trying to write %d bytes to address 0x%x, which exceeds max image size (0x%x - half of total flash size).",
+          cnt,
+          addr,
+          get_effective_size() / 2);
     }
 
-    u_int8_t         *p = (u_int8_t*)data;
+    u_int8_t* p = (u_int8_t*)data;
     u_int32_t sect_size = get_current_sector_size();
 
     u_int32_t chunk_addr;
@@ -613,22 +681,26 @@ bool Flash::write(u_int32_t addr,
 
     Aligner align(first_set);
     align.Init(addr, cnt);
-    while (align.GetNextChunk(chunk_addr, chunk_size)) {
+    while (align.GetNextChunk(chunk_addr, chunk_size))
+    {
         // Write / Erase in sector_size aligned chunks
         int rc;
 
-        if (!noerase) {
+        if (!noerase)
+        {
             u_int32_t sector = (chunk_addr / sect_size) * sect_size;
-            if (sector != _curr_sector) {
+            if (sector != _curr_sector)
+            {
                 _curr_sector = sector;
-                if (!erase_sector(_curr_sector)) {
+                if (!erase_sector(_curr_sector))
+                {
                     return false;
                 }
-
             }
         }
 
-        if (_no_burn) {
+        if (_no_burn)
+        {
             continue;
         }
 
@@ -636,23 +708,28 @@ bool Flash::write(u_int32_t addr,
         u_int32_t phys_addr = cont2phys(chunk_addr);
         // printf("-D- write: addr = %#x, phys_addr = %#x\n", chunk_addr, phys_addr);
         mft_signal_set_handling(1);
-        if (_cputUtilizationApplied) {
+        if (_cputUtilizationApplied)
+        {
             mf_set_cpu_utilization(_mfl, _cpuPercent);
         }
         rc = mf_write(_mfl, phys_addr, chunk_size, p);
         deal_with_signal();
 
-        if (rc != MFE_OK) {
-            if (rc == MFE_ICMD_BAD_PARAM || rc == MFE_REG_ACCESS_BAD_PARAM) {
-                return errmsg("Flash write of %d bytes to address %s0x%x failed: %s\n"
-                              "    This may indicate that a FW image was already updated on flash, but not loaded by the device.\n"
-                              "    Please load FW on the device (reset device or reboot machine) before burning a new FW.",
-                              chunk_size,
-                              _log2_chunk_size ? "physical " : "",
-                              chunk_addr,
-                              mf_err2str(rc));
-
-            } else {
+        if (rc != MFE_OK)
+        {
+            if (rc == MFE_ICMD_BAD_PARAM || rc == MFE_REG_ACCESS_BAD_PARAM)
+            {
+                return errmsg(
+                  "Flash write of %d bytes to address %s0x%x failed: %s\n"
+                  "    This may indicate that a FW image was already updated on flash, but not loaded by the device.\n"
+                  "    Please load FW on the device (reset device or reboot machine) before burning a new FW.",
+                  chunk_size,
+                  _log2_chunk_size ? "physical " : "",
+                  chunk_addr,
+                  mf_err2str(rc));
+            }
+            else
+            {
                 return errmsg("Flash write of %d bytes to address %s0x%x failed: %s",
                               chunk_size,
                               _log2_chunk_size ? "physical " : "",
@@ -662,34 +739,37 @@ bool Flash::write(u_int32_t addr,
         }
 
         // Loop advance
-        p    += chunk_size;
+        p += chunk_size;
     }
 
     return true;
 }
 
-
 ////////////////////////////////////////////////////////////////////////
 bool Flash::write(u_int32_t addr, u_int32_t data)
 {
     u_int32_t word;
 
-    if (!_mfl) {
+    if (!_mfl)
+    {
         return errmsg("Not opened");
     }
-    if (addr & 0x3) {
+    if (addr & 0x3)
+    {
         return errmsg("Address should be 4-bytes aligned.");
     }
-    if (!read(addr, &word)) {
+    if (!read(addr, &word))
+    {
         return false;
     }
-    if (word == data) {
-        return true;   // already there
+    if (word == data)
+    {
+        return true; // already there
     }
     return write_sector_with_erase(addr, &data, 4);
 }
 
-bool Flash::write_sector_with_erase(u_int32_t addr, void *data, int cnt)
+bool Flash::write_sector_with_erase(u_int32_t addr, void* data, int cnt)
 {
     u_int32_t sector_size = get_current_sector_size();
     u_int32_t sector_mask = ~(sector_size - 1);
@@ -698,15 +778,18 @@ bool Flash::write_sector_with_erase(u_int32_t addr, void *data, int cnt)
     u_int32_t offest_in_bytes = (addr & ~sector_mask);
     u_int32_t word_in_sector = offest_in_bytes / sizeof(u_int32_t);
 
-    if (offest_in_bytes + cnt > sector_size) {
+    if (offest_in_bytes + cnt > sector_size)
+    {
         return errmsg("data exceeds current sector");
     }
 
     vector<u_int32_t> buff(sector_size / sizeof(u_int32_t));
-    if (!read(sector, &buff[0], sector_size)) {
+    if (!read(sector, &buff[0], sector_size))
+    {
         return false;
     }
-    if (!erase_sector(sector)) {
+    if (!erase_sector(sector))
+    {
         return false;
     }
 
@@ -716,7 +799,7 @@ bool Flash::write_sector_with_erase(u_int32_t addr, void *data, int cnt)
     return write(sector, &buff[0], sector_size, true);
 }
 
-bool Flash::write_with_erase(u_int32_t addr, void *data, int cnt)
+bool Flash::write_with_erase(u_int32_t addr, void* data, int cnt)
 {
     u_int32_t towrite = (u_int32_t)cnt;
     u_int32_t currSize;
@@ -724,10 +807,12 @@ bool Flash::write_with_erase(u_int32_t addr, void *data, int cnt)
     u_int32_t alreadyWritten = 0;
     u_int32_t sizeUntillEndOfSector = 0;
     u_int32_t sector_size = get_current_sector_size();
-    while (towrite > 0) {
+    while (towrite > 0)
+    {
         sizeUntillEndOfSector = sector_size - (currAddr & (sector_size - 1));
-        currSize = towrite >  sizeUntillEndOfSector ? sizeUntillEndOfSector : towrite;
-        if (!write_sector_with_erase(currAddr, ((u_int8_t*)data + alreadyWritten), currSize)) {
+        currSize = towrite > sizeUntillEndOfSector ? sizeUntillEndOfSector : towrite;
+        if (!write_sector_with_erase(currAddr, ((u_int8_t*)data + alreadyWritten), currSize))
+        {
             return false;
         }
         towrite -= currSize;
@@ -742,25 +827,33 @@ bool Flash::erase_sector(u_int32_t addr)
     int rc;
     u_int32_t phys_addr = cont2phys(addr);
     mft_signal_set_handling(1);
-    if (_flash_working_mode == Flash::Fwm_4KB) {
+    if (_flash_working_mode == Flash::Fwm_4KB)
+    {
         rc = mf_erase_4k_sector(_mfl, phys_addr);
-    } else if (_flash_working_mode == Flash::Fwm_64KB) {
+    }
+    else if (_flash_working_mode == Flash::Fwm_64KB)
+    {
         rc = mf_erase_64k_sector(_mfl, phys_addr);
-    } else {
+    }
+    else
+    {
         rc = mf_erase(_mfl, phys_addr);
     }
     deal_with_signal();
-    if (rc != MFE_OK) {
-        if (rc == MFE_REG_ACCESS_RES_NOT_AVLBL || rc == MFE_REG_ACCESS_BAD_PARAM) {
-            return errmsg("Flash erase of address 0x%x failed: %s\n"
-                          "    This may indicate that a FW image was already updated on flash, but not loaded by the device.\n"
-                          "    Please load FW on the device (reset device or restart driver) before burning a new FW.",
-                          phys_addr,
-                          mf_err2str(rc));
-        } else {
-            return errmsg("Flash erase of address 0x%x failed: %s",
-                          phys_addr,
-                          mf_err2str(rc));
+    if (rc != MFE_OK)
+    {
+        if (rc == MFE_REG_ACCESS_RES_NOT_AVLBL || rc == MFE_REG_ACCESS_BAD_PARAM)
+        {
+            return errmsg(
+              "Flash erase of address 0x%x failed: %s\n"
+              "    This may indicate that a FW image was already updated on flash, but not loaded by the device.\n"
+              "    Please load FW on the device (reset device or restart driver) before burning a new FW.",
+              phys_addr,
+              mf_err2str(rc));
+        }
+        else
+        {
+            return errmsg("Flash erase of address 0x%x failed: %s", phys_addr, mf_err2str(rc));
         }
     }
 
@@ -772,13 +865,13 @@ bool Flash::enable_hw_access(u_int64_t key)
     int rc;
     rc = mf_enable_hw_access(_mfl, key);
 
-    if (rc != MFE_OK) {
+    if (rc != MFE_OK)
+    {
         return errmsg("Enable HW access failed: %s", mf_err2str(rc));
     }
     return true;
 }
 
-
 bool Flash::is_fifth_gen()
 {
     return mf_is_fifth_gen(_mfl);
@@ -789,11 +882,11 @@ bool Flash::disable_hw_access(void)
     int rc;
     rc = mf_disable_hw_access(_mfl);
 
-    if (rc != MFE_OK) {
+    if (rc != MFE_OK)
+    {
         return errmsg("Disable HW access failed: %s", mf_err2str(rc));
     }
     return true;
-
 }
 
 bool Flash::disable_hw_access(u_int64_t key)
@@ -801,25 +894,26 @@ bool Flash::disable_hw_access(u_int64_t key)
     int rc;
     rc = mf_disable_hw_access_with_key(_mfl, key);
 
-    if (rc != MFE_OK) {
+    if (rc != MFE_OK)
+    {
         return errmsg("Disable HW access failed: %s", mf_err2str(rc));
     }
     return true;
-
 }
 
-
 bool Flash::get_attr(ext_flash_attr_t& attr)
 {
     int rc = 0;
     rc = (MfError)mf_get_jedec_id(_mfl, &attr.jedec_id);
-    if (rc != MFE_OK) {
+    if (rc != MFE_OK)
+    {
         return errmsg("%s (%s)", errno == 0 ? "" : strerror(errno), mf_err2str(rc));
     }
     attr.banks_num = _attr.banks_num;
     attr.hw_dev_id = _attr.hw_dev_id;
     attr.rev_id = _attr.rev_id;
-    if (_attr.type_str != NULL) {
+    if (_attr.type_str != NULL)
+    {
         // we don't print the flash type in old devices
         int type_str_len = strlen(_attr.type_str);
         attr.type_str = strncpy(new char[type_str_len + 1], _attr.type_str, type_str_len);
@@ -833,24 +927,30 @@ bool Flash::get_attr(ext_flash_attr_t& attr)
     attr.driver_strength_support = _attr.driver_strength_support;
     attr.dummy_cycles_support = _attr.dummy_cycles_support;
     // Quad EN query
-    if (_attr.quad_en_support) {
+    if (_attr.quad_en_support)
+    {
         attr.mf_get_quad_en_rc = (MfError)mf_get_quad_en(_mfl, &attr.quad_en);
     }
     // Drive-strength query
-    if (_attr.driver_strength_support) {
+    if (_attr.driver_strength_support)
+    {
         attr.mf_get_driver_strength_rc = (MfError)mf_get_driver_strength(_mfl, &attr.driver_strength);
     }
     // Dummy Cycles query
-    if (_attr.dummy_cycles_support) {
+    if (_attr.dummy_cycles_support)
+    {
         attr.mf_get_dummy_cycles_rc = (MfError)mf_get_dummy_cycles(_mfl, &attr.dummy_cycles);
     }
 
     // Flash write protected info query
     attr.write_protect_support = _attr.write_protect_support;
-    if (_attr.write_protect_support) {
+    if (_attr.write_protect_support)
+    {
         int bank;
-        for (bank = 0; bank < _attr.banks_num; bank++) {
-            attr.mf_get_write_protect_rc_array[bank] = (MfError)mf_get_write_protect(_mfl, bank, &attr.protect_info_array[bank]);
+        for (bank = 0; bank < _attr.banks_num; bank++)
+        {
+            attr.mf_get_write_protect_rc_array[bank] =
+              (MfError)mf_get_write_protect(_mfl, bank, &attr.protect_info_array[bank]);
         }
     }
     return true;
@@ -858,106 +958,137 @@ bool Flash::get_attr(ext_flash_attr_t& attr)
 
 const char* Flash::getFlashType()
 {
-    if (_attr.type_str != NULL) {
+    if (_attr.type_str != NULL)
+    {
         return _attr.type_str;
     }
     return (const char*)NULL;
 }
 
-#define GET_IN_PARAM(param_in, out, first_op, second_op) { \
-        if (!strcmp(param_in, first_op)) { \
-            out = 1; \
-        } else if (!strcmp(param_in, second_op)) { \
-            out = 0; \
-        } else { \
+#define GET_IN_PARAM(param_in, out, first_op, second_op)                                          \
+    {                                                                                             \
+        if (!strcmp(param_in, first_op))                                                          \
+        {                                                                                         \
+            out = 1;                                                                              \
+        }                                                                                         \
+        else if (!strcmp(param_in, second_op))                                                    \
+        {                                                                                         \
+            out = 0;                                                                              \
+        }                                                                                         \
+        else                                                                                      \
+        {                                                                                         \
             return errmsg("bad argument (%s) it can be " first_op " or " second_op "", param_in); \
-        } \
-}
+        }                                                                                         \
+    }
 
-bool Flash::set_attr(char *param_name, char *param_val_str)
+bool Flash::set_attr(char* param_name, char* param_val_str)
 {
     int rc;
-    //TODO: make generic function that sets params
-    if (!strcmp(param_name, QUAD_EN_PARAM)) {
-        char *endp;
+    // TODO: make generic function that sets params
+    if (!strcmp(param_name, QUAD_EN_PARAM))
+    {
+        char* endp;
         u_int8_t quad_en_val;
         quad_en_val = strtoul(param_val_str, &endp, 0);
-        if (*endp != '\0' || quad_en_val > 1) {
+        if (*endp != '\0' || quad_en_val > 1)
+        {
             return errmsg("Bad " QUAD_EN_PARAM " value (%s), it can be 0 or 1\n", param_val_str);
         }
         rc = mf_set_quad_en(_mfl, quad_en_val);
-        if (rc != MFE_OK) {
+        if (rc != MFE_OK)
+        {
             return errmsg("Setting " QUAD_EN_PARAM " failed: (%s)", mf_err2str(rc));
         }
-    } else if (!strcmp(param_name, DUMMY_CYCLES_PARAM)) {
-        char *endp;
+    }
+    else if (!strcmp(param_name, DUMMY_CYCLES_PARAM))
+    {
+        char* endp;
         u_int8_t dummy_cycles_val;
         dummy_cycles_val = strtoul(param_val_str, &endp, 0);
-        if (*endp != '\0' || dummy_cycles_val < 1 || dummy_cycles_val > 15) {
-            // value is actually [0.15] but val=0 and val=15 indicate default state (thus they are the same so no need for both values to be accepted)
+        if (*endp != '\0' || dummy_cycles_val < 1 || dummy_cycles_val > 15)
+        {
+            // value is actually [0.15] but val=0 and val=15 indicate default state (thus they are the same so no need
+            // for both values to be accepted)
             return errmsg("Bad " DUMMY_CYCLES_PARAM " value (%s), it can be [1..15]\n", param_val_str);
         }
         rc = mf_set_dummy_cycles(_mfl, dummy_cycles_val);
-        if (rc != MFE_OK) {
+        if (rc != MFE_OK)
+        {
             return errmsg("Setting " DUMMY_CYCLES_PARAM " failed: (%s)", mf_err2str(rc));
         }
-    } else if (strstr(param_name, FLASH_NAME) == param_name) {
+    }
+    else if (strstr(param_name, FLASH_NAME) == param_name)
+    {
         char *flash_param, *param_str, *endp, *bank_num_str;
         u_int8_t bank_num;
         flash_param = strtok(param_name, ".");
-        param_str   = strtok((char*)NULL, ".");
+        param_str = strtok((char*)NULL, ".");
         bank_num_str = flash_param + strlen(FLASH_NAME);
         bank_num = strtoul(bank_num_str, &endp, 0);
-        if (*endp != '\0') {
+        if (*endp != '\0')
+        {
             return errmsg("bad number of flash bank (%s), it should be integer!.", bank_num_str);
         }
-        if (!strcmp(param_str, WRITE_PROTECT)) {
+        if (!strcmp(param_str, WRITE_PROTECT))
+        {
             write_protect_info_t protect_info;
             char *tb, *num_str, *sec;
-            if (!strcmp(param_val_str, WP_DISABLED_STR)) {
+            if (!strcmp(param_val_str, WP_DISABLED_STR))
+            {
                 memset(&protect_info, 0, sizeof(protect_info));
-            } else {
+            }
+            else
+            {
                 tb = strtok(param_val_str, ",");
                 num_str = strtok((char*)NULL, "-");
                 sec = strtok((char*)NULL, "");
-                if (tb == NULL || num_str == NULL || sec == NULL) {
-                    return errmsg("missing parameters for setting the " WRITE_PROTECT " attribute, see help for more info.");
+                if (tb == NULL || num_str == NULL || sec == NULL)
+                {
+                    return errmsg("missing parameters for setting the " WRITE_PROTECT
+                                  " attribute, see help for more info.");
                 }
                 GET_IN_PARAM(tb, protect_info.is_bottom, WP_BOTTOM_STR, WP_TOP_STR);
                 GET_IN_PARAM(sec, protect_info.is_subsector, WP_SUBSEC_STR, WP_SEC_STR);
 
                 protect_info.sectors_num = strtoul(num_str, &endp, 0);
-                if (*endp != '\0') {
+                if (*endp != '\0')
+                {
                     return errmsg("bad argument (%s), only integer value is allowed.", num_str);
                 }
-                if (!protect_info.sectors_num) {
+                if (!protect_info.sectors_num)
+                {
                     return errmsg("Invalid sectors number, Use \"Disabled\" instead.");
                 }
             }
             rc = mf_set_write_protect(_mfl, bank_num, &protect_info);
-            if (rc != MFE_OK) {
+            if (rc != MFE_OK)
+            {
                 return errmsg("Setting " WRITE_PROTECT " failed: (%s)", mf_err2str(rc));
             }
-        } else {
+        }
+        else
+        {
             return errmsg("Unknown attribute %s.%s", flash_param, param_str);
         }
-
-    } else if (!strcmp(param_name, DRIVER_STRENGTH_PARAM)) {
-        char *endp;
+    }
+    else if (!strcmp(param_name, DRIVER_STRENGTH_PARAM))
+    {
+        char* endp;
         u_int8_t driver_strength_val;
         driver_strength_val = strtoul(param_val_str, &endp, 0);
-        if (*endp != '\0' || 
-            (driver_strength_val != 25 &&
-            driver_strength_val != 50 &&
-            driver_strength_val != 75 &&
-            driver_strength_val != 100)) {
+        if (*endp != '\0' || (driver_strength_val != 25 && driver_strength_val != 50 && driver_strength_val != 75 &&
+                              driver_strength_val != 100))
+        {
             return errmsg("Bad " DRIVER_STRENGTH_PARAM " value (%s), it can be [25,50,75,100]\n", param_val_str);
         }
         rc = mf_set_driver_strength(_mfl, driver_strength_val);
-        if (rc != MFE_OK) {
+        if (rc != MFE_OK)
+        {
             return errmsg("Setting " DRIVER_STRENGTH_PARAM " failed: (%s)", mf_err2str(rc));
         }
-    } else {
+    }
+    else
+    {
         return errmsg("Unknown attribute %s", param_name);
     }
     return true;
@@ -970,13 +1101,19 @@ bool Flash::is_flash_write_protected()
     write_protect_info_t protect_info;
 
     memset(&protect_info, 0x0, sizeof(protect_info));
-    if (_attr.write_protect_support) {
-        for (bank = 0; bank < _attr.banks_num; bank++) {
+    if (_attr.write_protect_support)
+    {
+        for (bank = 0; bank < _attr.banks_num; bank++)
+        {
             rc = mf_get_write_protect(_mfl, bank, &protect_info);
-            if (rc == MFE_OK && protect_info.sectors_num != 0) {
+            if (rc == MFE_OK && protect_info.sectors_num != 0)
+            {
                 return true;
-            } else {
-                if (rc && rc != MFE_NOT_SUPPORTED_OPERATION) { // We ignore when operation is not supported
+            }
+            else
+            {
+                if (rc && rc != MFE_NOT_SUPPORTED_OPERATION)
+                { // We ignore when operation is not supported
                     return true;
                 }
             }
@@ -990,12 +1127,13 @@ void Flash::deal_with_signal()
 #ifndef UEFI_BUILD
     int sig;
     sig = mft_signal_is_fired();
-    if (sig) {
+    if (sig)
+    {
         // reset received signal
         mft_signal_set_fired(0);
         // retore prev handler
         mft_signal_set_handling(0);
-        //raise signal to let the previous handle deal with it.
+        // raise signal to let the previous handle deal with it.
         raise(sig);
     }
     mft_signal_set_handling(0);
@@ -1006,15 +1144,19 @@ void Flash::deal_with_signal()
 #define FLINT_ERASE_SIZE_HOOK "FLINT_ERASE_SIZE"
 bool Flash::set_flash_working_mode(int mode)
 {
-    if (!_attr.support_sub_and_sector && mode != Flash::Fwm_Default) {
+    if (!_attr.support_sub_and_sector && mode != Flash::Fwm_Default)
+    {
         return errmsg("Changing Flash IO working mode not supported.");
     }
     // Verification Hook
-    if (_attr.support_sub_and_sector) {
-        char *flint_io_env = getenv(FLINT_ERASE_SIZE_HOOK);
-        if (flint_io_env) {
-            int num =  strtoul(flint_io_env, (char**)NULL, 0);
-            if (num == 0x1000 || num == 0x10000) {
+    if (_attr.support_sub_and_sector)
+    {
+        char* flint_io_env = getenv(FLINT_ERASE_SIZE_HOOK);
+        if (flint_io_env)
+        {
+            int num = strtoul(flint_io_env, (char**)NULL, 0);
+            if (num == 0x1000 || num == 0x10000)
+            {
                 _curr_sector_size = (u_int32_t)num;
                 _flash_working_mode = _curr_sector_size == 0x1000 ? Flash::Fwm_4KB : Flash::Fwm_64KB;
                 _curr_sector = _curr_sector & ~(_curr_sector_size - 1);
@@ -1024,16 +1166,23 @@ bool Flash::set_flash_working_mode(int mode)
     }
     // Verification Hook end
 
-    if (mode == Flash::Fwm_Default) {
+    if (mode == Flash::Fwm_Default)
+    {
         _curr_sector_size = _attr.sector_size;
         _flash_working_mode = Flash::Fwm_Default;
-    } else if (mode == Flash::Fwm_4KB) {
+    }
+    else if (mode == Flash::Fwm_4KB)
+    {
         _curr_sector_size = 0x1000;
         _flash_working_mode = Flash::Fwm_4KB;
-    } else if (mode == Flash::Fwm_64KB) {
+    }
+    else if (mode == Flash::Fwm_64KB)
+    {
         _curr_sector_size = 0x10000;
         _flash_working_mode = Flash::Fwm_64KB;
-    } else {
+    }
+    else
+    {
         return errmsg("Unknown Flash IO working mode: 0x%x", mode);
     }
     _curr_sector = _curr_sector & ~(_curr_sector_size - 1);
@@ -1051,8 +1200,7 @@ u_int32_t Flash::get_effective_size()
     u_int32_t effective_size = get_size();
 
     dm_dev_id_t dm_dev_id = mf_get_dm_dev_id(_mfl);
-    if ((dm_dev_id == DeviceConnectX4LX || dm_dev_id == DeviceConnectX5) &&
-        _attr.vendor == FV_GD25QXXX)
+    if ((dm_dev_id == DeviceConnectX4LX || dm_dev_id == DeviceConnectX5) && _attr.vendor == FV_GD25QXXX)
     {
         effective_size = 1 << FD_128; // 16MB
     }
diff --git a/mlxfwops/lib/flint_io.h b/mlxfwops/lib/flint_io.h
index 3fb26ae5..82a49060 100644
--- a/mlxfwops/lib/flint_io.h
+++ b/mlxfwops/lib/flint_io.h
@@ -62,11 +62,12 @@
 
 #define IO_MAX_BANKS_NUM 4
 
-typedef struct ext_flash_attr {
+typedef struct ext_flash_attr
+{
     u_int8_t banks_num;
     u_int32_t hw_dev_id;
     u_int32_t rev_id;
-    char *type_str;   // NULL if not available
+    char* type_str; // NULL if not available
     u_int32_t jedec_id;
     u_int32_t size;
     u_int32_t sector_size; // minimal sec
@@ -92,51 +93,39 @@ typedef struct ext_flash_attr {
 
 } ext_flash_attr_t;
 
-
-
 // Common base class for Flash and for FImage
-class MLXFWOP_API FBase : public FlintErrMsg {
+class MLXFWOP_API FBase : public FlintErrMsg
+{
 public:
-
-    enum {
+    enum
+    {
         Fwm_Default = 0,
         Fwm_4KB = 1,
         Fwm_64KB = 2
     };
 
-
-    FBase(bool is_flash) :
-        _is_image_in_odd_chunks(false),
-        _log2_chunk_size(0),
-        _is_flash(is_flash),
-        _advErrors(true) {}
+    FBase(bool is_flash) : _is_image_in_odd_chunks(false), _log2_chunk_size(0), _is_flash(is_flash), _advErrors(true) {}
     virtual ~FBase() {}
 
-    virtual bool open(uefi_Dev_t *uefi_dev,
-        uefi_dev_extra_t *uefi_extra,
-        bool force_lock = false,
-        bool advErr = true) = 0;
+    virtual bool
+      open(uefi_Dev_t* uefi_dev, uefi_dev_extra_t* uefi_extra, bool force_lock = false, bool advErr = true) = 0;
 
     virtual bool open(const char*, bool, bool) = 0;
 
-    virtual bool open(const char *device, bool, bool, int, flash_params_t*, int, bool, int) = 0;
+    virtual bool open(const char* device, bool, bool, int, flash_params_t*, int, bool, int) = 0;
 
     virtual bool is_fifth_gen() = 0;
     virtual void close() = 0;
-    virtual bool read(u_int32_t addr, u_int32_t *data) = 0;
-    virtual bool read(u_int32_t addr, void *data, int len,
-                      bool verbose = false,
-                      const char *message = "") = 0;
-    virtual bool read_modify_write(u_int32_t phy_addr, void *data, int cnt, bool noerase = false) = 0;
+    virtual bool read(u_int32_t addr, u_int32_t* data) = 0;
+    virtual bool read(u_int32_t addr, void* data, int len, bool verbose = false, const char* message = "") = 0;
+    virtual bool read_modify_write(u_int32_t phy_addr, void* data, int cnt, bool noerase = false) = 0;
 
-    virtual bool read_modify_write_phy(u_int32_t phy_addr, void *data, int cnt, bool noerase = false) = 0;
+    virtual bool read_modify_write_phy(u_int32_t phy_addr, void* data, int cnt, bool noerase = false) = 0;
 
-    virtual bool write(u_int32_t addr, void *data, int cnt) {
-        return write(addr, data, cnt, false);
-    }
-    virtual bool write(u_int32_t addr, void *data, int cnt, bool noerase) = 0;
+    virtual bool write(u_int32_t addr, void* data, int cnt) { return write(addr, data, cnt, false); }
+    virtual bool write(u_int32_t addr, void* data, int cnt, bool noerase) = 0;
 
-    virtual bool write_phy(u_int32_t phy_addr, void *data, int cnt, bool noerase = false) = 0;
+    virtual bool write_phy(u_int32_t phy_addr, void* data, int cnt, bool noerase = false) = 0;
 
     virtual bool write(u_int32_t addr, u_int32_t data) = 0;
     virtual bool set_flash_working_mode(int mode = FBase::Fwm_Default) = 0;
@@ -155,12 +144,12 @@ class MLXFWOP_API FBase : public FlintErrMsg {
     virtual mfile* getMfileObj() = 0;
     virtual mflash* getMflashObj() = 0;
     virtual bool erase_sector(u_int32_t addr) = 0;
-    virtual BinIdT    get_bin_id() { return UNKNOWN_BIN; };
-    Crc16&            get_image_crc() { return _image_crc; };
-    bool              is_flash() { return _is_flash; };
+    virtual BinIdT get_bin_id() { return UNKNOWN_BIN; };
+    Crc16& get_image_crc() { return _image_crc; };
+    bool is_flash() { return _is_flash; };
 
-    bool read_phy(u_int32_t phy_addr, void *data, int len);
-    bool read_phy(u_int32_t phy_addr, u_int32_t *data);
+    bool read_phy(u_int32_t phy_addr, void* data, int len);
+    bool read_phy(u_int32_t phy_addr, u_int32_t* data);
 
     virtual void set_address_convertor(u_int32_t log2_chunk_size, bool is_image_in_odd_chunks)
     {
@@ -179,15 +168,15 @@ class MLXFWOP_API FBase : public FlintErrMsg {
         return phys_addr;
     }
 
-    u_int32_t   get_log2_chunk_size() { return _log2_chunk_size; }
-    bool        get_is_image_in_odd_chunks() { return _is_image_in_odd_chunks; }
+    u_int32_t get_log2_chunk_size() { return _log2_chunk_size; }
+    bool get_is_image_in_odd_chunks() { return _is_image_in_odd_chunks; }
 
-    enum {
+    enum
+    {
         MAX_FLASH = 4 * 1048576
     };
 
 protected:
-
     // Address translation functions for ConnectX.
     // Translate between contiguous "logical" addresses
 
@@ -201,12 +190,14 @@ class MLXFWOP_API FBase : public FlintErrMsg {
     u_int32_t cont2phys(u_int32_t cont_addr)
     {
         u_int32_t result;
-        if (_log2_chunk_size) {
-            result = (cont_addr       & (0xffffffff >> (32 - _log2_chunk_size))) |
+        if (_log2_chunk_size)
+        {
+            result = (cont_addr & (0xffffffff >> (32 - _log2_chunk_size))) |
                      (_is_image_in_odd_chunks << _log2_chunk_size) |
                      ((cont_addr << 1) & (0xffffffff << (_log2_chunk_size + 1)));
         }
-        else {
+        else
+        {
             result = cont_addr;
         }
         return result;
@@ -215,11 +206,13 @@ class MLXFWOP_API FBase : public FlintErrMsg {
     u_int32_t phys2cont(u_int32_t phys_addr)
     {
         u_int32_t result;
-        if (_log2_chunk_size) {
-            result = (phys_addr       & (0xffffffff >> (32 - _log2_chunk_size))) |
-                ((phys_addr >> 1) & (0xffffffff << (_log2_chunk_size)));
+        if (_log2_chunk_size)
+        {
+            result = (phys_addr & (0xffffffff >> (32 - _log2_chunk_size))) |
+                     ((phys_addr >> 1) & (0xffffffff << (_log2_chunk_size)));
         }
-        else {
+        else
+        {
             result = phys_addr;
         }
         return result;
@@ -227,10 +220,12 @@ class MLXFWOP_API FBase : public FlintErrMsg {
 
     bool readWriteCommCheck(u_int32_t addr, int len)
     {
-        if (addr & 0x3) {
+        if (addr & 0x3)
+        {
             return errmsg("Address should be 4-bytes aligned.");
         }
-        if (len & 0x3) {
+        if (len & 0x3)
+        {
             return errmsg("Length should be 4-bytes aligned.");
         }
         return true;
@@ -251,33 +246,25 @@ class MLXFWOP_API FBase : public FlintErrMsg {
     const bool _is_flash;
     // show advanced error msgs
     bool _advErrors;
-
 };
 
-
-
-
 // Flash image (R/W)
-class MLXFWOP_API FImage : public FBase {
+class MLXFWOP_API FImage : public FBase
+{
 public:
-    FImage() :
-        FBase(false),
-        _fname(0),
-        _buf(),
-        _isFile(false),
-        _len(0) {}
+    FImage() : FBase(false), _fname(0), _buf(), _isFile(false), _len(0) {}
     virtual ~FImage() { close(); }
 
     u_int32_t* getBuf();
-    u_int32_t    getBufLength() { return _len; }
-    virtual bool open(const char *fname, bool read_only = false, bool advErr = true);
+    u_int32_t getBufLength() { return _len; }
+    virtual bool open(const char* fname, bool read_only = false, bool advErr = true);
     using FBase::open;
-    bool open(u_int32_t *buf, u_int32_t len, bool advErr = true);
+    bool open(u_int32_t* buf, u_int32_t len, bool advErr = true);
     virtual void close();
-    virtual bool read(u_int32_t addr, u_int32_t *data);
-    virtual bool read(u_int32_t addr, void *data, int len, bool verbose = false, const char *message = "");
-    virtual bool write(u_int32_t addr, void *data, int cnt);
-    virtual bool write(u_int32_t, void *, int, bool)
+    virtual bool read(u_int32_t addr, u_int32_t* data);
+    virtual bool read(u_int32_t addr, void* data, int len, bool verbose = false, const char* message = "");
+    virtual bool write(u_int32_t addr, void* data, int cnt);
+    virtual bool write(u_int32_t, void*, int, bool)
     {
         check_uefi_build();
         return false;
@@ -292,21 +279,22 @@ class MLXFWOP_API FImage : public FBase {
         check_uefi_build();
         return false;
     }
-    virtual bool open(uefi_Dev_t *, uefi_dev_extra_t *, bool, bool)
+    virtual bool open(uefi_Dev_t*, uefi_dev_extra_t*, bool, bool)
     {
         check_uefi_build();
         return false;
     }
-    virtual bool open(const char*, bool, bool, int, flash_params_t*, int, bool, int) {
+    virtual bool open(const char*, bool, bool, int, flash_params_t*, int, bool, int)
+    {
         check_uefi_build();
         return false;
     }
-    virtual bool read_modify_write_phy(u_int32_t, void *, int, bool)
+    virtual bool read_modify_write_phy(u_int32_t, void*, int, bool)
     {
         check_uefi_build();
         return false;
     }
-    virtual bool read_modify_write(u_int32_t, void *, int, bool = false)
+    virtual bool read_modify_write(u_int32_t, void*, int, bool = false)
     {
         check_uefi_build();
         return false;
@@ -352,23 +340,23 @@ class MLXFWOP_API FImage : public FBase {
         return (mflash*)NULL;
     }
     virtual bool is_fifth_gen() { return false; }
+
 private:
     bool readFileGetBuffer(std::vector<u_int8_t>& dataBuf);
     bool writeEntireFile(std::vector<u_int8_t>& fileContent);
     bool getFileSize(int& fileSize);
-    const char *_fname;
+    const char* _fname;
     std::vector<u_int8_t> _buf;
     bool _isFile;
     u_int32_t _len;
 };
 
-
 //
 // Flash access (R/W)
 //
 
-
-class MLXFWOP_API Flash : public FBase {
+class MLXFWOP_API Flash : public FBase
+{
 public:
     Flash() :
         FBase(true),
@@ -390,21 +378,17 @@ class MLXFWOP_API Flash : public FBase {
 
     // FBase Interface
 
-    virtual bool open(const char *device,
+    virtual bool open(const char* device,
                       bool force_lock = false,
                       bool read_only = false,
                       int num_of_banks = 4,
-                      flash_params_t *flash_params = (flash_params_t*)NULL,
+                      flash_params_t* flash_params = (flash_params_t*)NULL,
                       int ignoe_cache_replacement = 0,
                       bool advErr = true,
                       int cx3_fw_access = 0);
     using FBase::open;
 
-    virtual bool open(uefi_Dev_t *uefi_dev,
-                      uefi_dev_extra_t *uefi_extra,
-                      bool force_lock = false,
-                      bool advErr = true);
-
+    virtual bool open(uefi_Dev_t* uefi_dev, uefi_dev_extra_t* uefi_extra, bool force_lock = false, bool advErr = true);
 
     virtual bool open(const char*, bool, bool)
     {
@@ -417,23 +401,16 @@ class MLXFWOP_API Flash : public FBase {
 
     virtual void close();
 
-    virtual bool read(u_int32_t addr,
-                      u_int32_t *data);
+    virtual bool read(u_int32_t addr, u_int32_t* data);
 
-    virtual bool read(u_int32_t addr,
-                      void *data,
-                      int len,
-                      bool verbose = false,
-                      const char *message = "");
-    virtual bool write_phy(u_int32_t phy_addr, void *data, int cnt, bool noerase = false); // read modify write
-    virtual bool read_modify_write_phy(u_int32_t phy_addr, void *data, int cnt, bool noerase = false); // read modify write
+    virtual bool read(u_int32_t addr, void* data, int len, bool verbose = false, const char* message = "");
+    virtual bool write_phy(u_int32_t phy_addr, void* data, int cnt, bool noerase = false); // read modify write
+    virtual bool read_modify_write_phy(u_int32_t phy_addr, void* data, int cnt, bool noerase = false); // read modify
+                                                                                                       // write
     bool write_phy(u_int32_t phy_addr, u_int32_t data); // read modify write
     bool erase_sector_phy(u_int32_t phy_addr);
 
-    bool         update_boot_addr(u_int32_t boot_addr)
-    {
-        return mf_update_boot_addr(_mfl, boot_addr) == MFE_OK;
-    }
+    bool update_boot_addr(u_int32_t boot_addr) { return mf_update_boot_addr(_mfl, boot_addr) == MFE_OK; }
     //
     // Flash Interface
     //
@@ -445,62 +422,54 @@ class MLXFWOP_API Flash : public FBase {
 
     virtual u_int32_t get_dev_id() { return _attr.hw_dev_id; }
     u_int32_t get_rev_id() { return _attr.rev_id; }
-    BinIdT    get_bin_id() { return _attr.bin_id; };
+    BinIdT get_bin_id() { return _attr.bin_id; };
     u_int32_t get_port_num() { return _port_num; }
-    u_int8_t  get_cr_space_locked() { return _cr_space_locked; }
-    bool  get_ignore_cache_replacment() { return _ignore_cache_replacement; }
+    u_int8_t get_cr_space_locked() { return _cr_space_locked; }
+    bool get_ignore_cache_replacment() { return _ignore_cache_replacement; }
 
     virtual bool set_no_flash_verify(bool val);
-    static void get_flash_list(char *flash_list, int buffer_size) { return mf_flash_list(flash_list, buffer_size); }
+    static void get_flash_list(char* flash_list, int buffer_size) { return mf_flash_list(flash_list, buffer_size); }
 
     // Write and Erase functions are performed by the Command Set
 
     virtual bool erase_sector(u_int32_t addr);
 
-    virtual bool write(u_int32_t addr,
-                       void *data,
-                       int cnt,
-                       bool noerase = false);
+    virtual bool write(u_int32_t addr, void* data, int cnt, bool noerase = false);
 
-    virtual bool read_modify_write(u_int32_t phy_addr, void *data, int cnt, bool noerase = false);
+    virtual bool read_modify_write(u_int32_t phy_addr, void* data, int cnt, bool noerase = false);
 
-    virtual bool write(u_int32_t addr,
-                       u_int32_t data);
+    virtual bool write(u_int32_t addr, u_int32_t data);
 
     virtual bool enable_hw_access(u_int64_t key);
 
     virtual bool disable_hw_access();
 
-    bool         disable_hw_access(u_int64_t key);
-    virtual bool         is_fifth_gen();
+    bool disable_hw_access(u_int64_t key);
+    virtual bool is_fifth_gen();
     const char* getFlashType();
 
-    bool         get_attr(ext_flash_attr_t& attr);
+    bool get_attr(ext_flash_attr_t& attr);
 
-    bool         set_attr(char *param_name,
-                          char *param_val_str);
+    bool set_attr(char* param_name, char* param_val_str);
 
     bool flash_working_mode_supported() { return _attr.support_sub_and_sector; }
     virtual int get_flash_working_mode() { return _flash_working_mode; }
     virtual bool set_flash_working_mode(int mode = FBase::Fwm_Default);
     virtual bool set_flash_utilization(bool, int);
     bool is_flash_write_protected();
-    static void  deal_with_signal();
+    static void deal_with_signal();
 
     mfile* getMfileObj() { return mf_get_mfile(_mfl); }
     mflash* getMflashObj() { return _mfl; }
 
-    enum {
+    enum
+    {
         TRANS = 4096
     };
 
+    bool open_com_checks(const char* device, int rc, bool force_lock);
 
-
-    bool open_com_checks(const char *device,
-                         int rc,
-                         bool force_lock);
-
-//needed for printing flash status in flint hw query cmd
+// needed for printing flash status in flint hw query cmd
 #define QUAD_EN_PARAM "QuadEn"
 #define DRIVER_STRENGTH_PARAM "DriverStrength"
 #define DUMMY_CYCLES_PARAM "DummyCycles"
@@ -513,17 +482,16 @@ class MLXFWOP_API Flash : public FBase {
 #define WP_DISABLED_STR "Disabled"
 
 protected:
-    bool write_sector_with_erase(u_int32_t addr, void *data, int cnt);
-    bool write_with_erase(u_int32_t addr, void *data, int cnt);
-
+    bool write_sector_with_erase(u_int32_t addr, void* data, int cnt);
+    bool write_with_erase(u_int32_t addr, void* data, int cnt);
 
-    mflash *_mfl;
+    mflash* _mfl;
     flash_attr _attr;
     bool _no_flash_verify;
     bool _ignore_cache_replacement; // for FS3 devices flash access.
 
     u_int32_t _curr_sector;
-    u_int32_t _curr_sector_size;  // can work with both 4KB and 64KB sectors
+    u_int32_t _curr_sector_size; // can work with both 4KB and 64KB sectors
     u_int32_t _port_num;
     u_int8_t _cr_space_locked;
     int _flash_working_mode;
diff --git a/mlxfwops/lib/fs2_ops.cpp b/mlxfwops/lib/fs2_ops.cpp
index bc923ba3..7c351492 100644
--- a/mlxfwops/lib/fs2_ops.cpp
+++ b/mlxfwops/lib/fs2_ops.cpp
@@ -31,8 +31,6 @@
  * SOFTWARE.
  */
 
-
-
 #if !defined(UEFI_BUILD) && !defined(NO_CS_CMD)
 #include <tools_crypto/tools_md5.h>
 #endif
@@ -43,200 +41,218 @@
 #include <win_driver_cif.h>
 #endif
 
-#define PRE_CRC_OUTPUT   "    "
-#define CRC_CHECK_OUTPUT  CRC_CHECK_OLD ")"
-
+#define PRE_CRC_OUTPUT "    "
+#define CRC_CHECK_OUTPUT CRC_CHECK_OLD ")"
 
 static int part_cnt;
-extern const char *g_sectNames[];
+extern const char* g_sectNames[];
 
 bool Fs2Operations::FwInit()
 {
     FwInitCom();
-    //memset(&_fs2ImgInfo, 0, sizeof(_fs2ImgInfo)); init is done as part of the struct constructor
+    // memset(&_fs2ImgInfo, 0, sizeof(_fs2ImgInfo)); init is done as part of the struct constructor
     _fwImgInfo.fwType = FIT_FS2;
     return true;
 }
 
-
 bool Fs2Operations::CntxGetFsData(u_int32_t fs_info_word, bool& fs_en, u_int32_t& log2chunk_size)
 {
     u_int8_t checksum;
-    //printf("-D- fs_info_word=%08x\n", fs_info_word);
+    // printf("-D- fs_info_word=%08x\n", fs_info_word);
 
-    checksum = ((fs_info_word      ) & 0xff) +
-               ((fs_info_word >>  8) & 0xff) +
-               ((fs_info_word >> 16) & 0xff) +
+    checksum = ((fs_info_word)&0xff) + ((fs_info_word >> 8) & 0xff) + ((fs_info_word >> 16) & 0xff) +
                ((fs_info_word >> 24) & 0xff);
 
-    if (checksum != 0) {
+    if (checksum != 0)
+    {
         return errmsg("Corrupted chunk size checksum");
     }
 
     fs_en = (fs_info_word & 0x8) != 0;
 
-    if (fs_en) {
+    if (fs_en)
+    {
         log2chunk_size = (fs_info_word & 0x7) + 16;
-    } else {
+    }
+    else
+    {
         log2chunk_size = 0;
     }
     return true;
 }
 
-bool Fs2Operations::ParseInfoSect(u_int8_t *buff, u_int32_t byteSize)
+bool Fs2Operations::ParseInfoSect(u_int8_t* buff, u_int32_t byteSize)
 {
-
-
-    u_int32_t *p = (u_int32_t*)buff;
+    u_int32_t* p = (u_int32_t*)buff;
     u_int32_t offs = 0;
     u_int32_t tagNum = 0;
     bool endFound = false;
 
     // TODO: Add new flag on the info which indicates that the ParseInfoSect was already called.
 
-    while (!endFound && offs < byteSize) {
+    while (!endFound && offs < byteSize)
+    {
         u_int32_t tagSize = __be32_to_cpu(*p) & 0xffffff;
-        u_int32_t tagId   = __be32_to_cpu(*p) >> 24;
+        u_int32_t tagId = __be32_to_cpu(*p) >> 24;
 
-        if (offs + tagSize > byteSize) {
-            return errmsg(MLXFW_SECTION_TOO_LARGE_ERR, "Info section corrupted: Tag %d (TagId %d, size %d) exceeds Info section size (%d bytes) ",
+        if (offs + tagSize > byteSize)
+        {
+            return errmsg(MLXFW_SECTION_TOO_LARGE_ERR,
+                          "Info section corrupted: Tag %d (TagId %d, size %d) exceeds Info section size (%d bytes) ",
                           tagNum, tagId, tagSize, byteSize);
         }
         // printf("-D- tagId = (%#x), tagSize = (%#x), offs = %#x\n", tagId, tagSize, offs);
         u_int32_t tmp;
-        const char *str;
+        const char* str;
         int size;
-        switch (tagId) {
-        case II_FwVersion:
-            _fwImgInfo.ext_info.fw_ver[0] = u_int16_t(__be32_to_cpu(*(p + 1)) >> 16);
-            tmp = __be32_to_cpu(*(p + 2));
-            _fwImgInfo.ext_info.fw_ver[1] = tmp >> 16;
-            _fwImgInfo.ext_info.fw_ver[2] = tmp & 0xffff;
-            break;
-
-        case II_FwBuildTime:
-            tmp = __be32_to_cpu(*(p + 2));
-            _fwImgInfo.ext_info.fw_rel_date[0] = (u_int16_t)(tmp & 0xff);
-            _fwImgInfo.ext_info.fw_rel_date[1] = (u_int16_t)((tmp >> 8) & 0xff);
-            _fwImgInfo.ext_info.fw_rel_date[2] = (u_int16_t)((tmp >> 16) & 0xffff);
-            break;
-
-        case II_MinFitVersion:
-            tmp = __be32_to_cpu(*(p + 1));
-            _fwImgInfo.ext_info.min_fit_ver[0] = tmp >> 16;
-            _fwImgInfo.ext_info.min_fit_ver[1] = tmp & 0xffff;
-            tmp = __be32_to_cpu(*(p + 2));
-            _fwImgInfo.ext_info.min_fit_ver[2] = tmp >> 16;
-            _fwImgInfo.ext_info.min_fit_ver[3] = tmp & 0xffff;
-            break;
-
-        case II_MicVersion:
-            tmp = __be32_to_cpu(*(p + 1));
-            _fwImgInfo.ext_info.mic_ver[0] = tmp >> 16;
-            //_fwImgInfo.ext_info.minFitVer[1] = tmp & 0xffff;
-            tmp = __be32_to_cpu(*(p + 2));
-            _fwImgInfo.ext_info.mic_ver[1] = tmp >> 16;
-            _fwImgInfo.ext_info.mic_ver[2] = tmp & 0xffff;
-            break;
-
-        case II_DeviceType:
-            tmp = __be32_to_cpu(*(p + 1));
-            _fwImgInfo.ext_info.dev_type = tmp & 0xffff;
-            //info->devRev  = (tmp >> 16) & 0xff;
-            break;
-
-        case II_VsdVendorId:
-            tmp = __be32_to_cpu(*(p + 1));
-            _fwImgInfo.ext_info.vsd_vendor_id    = tmp & 0xffff;
-            break;
-
-        case II_IsGa:
-            tmp = __be32_to_cpu(*(p + 1));
-            _fwImgInfo.isGa = tmp ? true : false;;
-            break;
-
-        case II_PSID:
-            // set psid only if not previosly found in PS
-            str = (const char*)p;
-            str += 4;
-
-            for (int i = 0; i < PSID_LEN; i++) {
-                _fwImgInfo.ext_info.psid[i] = str[i];
-            }
-            _fwImgInfo.ext_info.psid[PSID_LEN] = '\0';
-            break;
-
-        case II_PSInfo:
-            str = (const char*)p;
-            str += 4;
-            size = strlen(str) + 1; // include '\0'
-            if (size > PRS_NAME_LEN) {
-                // ensure '\0' at the end
-                size = PRS_NAME_LEN - 1;
-            }
-            memcpy(_fs2ImgInfo.ext_info.prs_name, str, size);
-            break;
+        switch (tagId)
+        {
+            case II_FwVersion:
+                _fwImgInfo.ext_info.fw_ver[0] = u_int16_t(__be32_to_cpu(*(p + 1)) >> 16);
+                tmp = __be32_to_cpu(*(p + 2));
+                _fwImgInfo.ext_info.fw_ver[1] = tmp >> 16;
+                _fwImgInfo.ext_info.fw_ver[2] = tmp & 0xffff;
+                break;
+
+            case II_FwBuildTime:
+                tmp = __be32_to_cpu(*(p + 2));
+                _fwImgInfo.ext_info.fw_rel_date[0] = (u_int16_t)(tmp & 0xff);
+                _fwImgInfo.ext_info.fw_rel_date[1] = (u_int16_t)((tmp >> 8) & 0xff);
+                _fwImgInfo.ext_info.fw_rel_date[2] = (u_int16_t)((tmp >> 16) & 0xffff);
+                break;
+
+            case II_MinFitVersion:
+                tmp = __be32_to_cpu(*(p + 1));
+                _fwImgInfo.ext_info.min_fit_ver[0] = tmp >> 16;
+                _fwImgInfo.ext_info.min_fit_ver[1] = tmp & 0xffff;
+                tmp = __be32_to_cpu(*(p + 2));
+                _fwImgInfo.ext_info.min_fit_ver[2] = tmp >> 16;
+                _fwImgInfo.ext_info.min_fit_ver[3] = tmp & 0xffff;
+                break;
+
+            case II_MicVersion:
+                tmp = __be32_to_cpu(*(p + 1));
+                _fwImgInfo.ext_info.mic_ver[0] = tmp >> 16;
+                //_fwImgInfo.ext_info.minFitVer[1] = tmp & 0xffff;
+                tmp = __be32_to_cpu(*(p + 2));
+                _fwImgInfo.ext_info.mic_ver[1] = tmp >> 16;
+                _fwImgInfo.ext_info.mic_ver[2] = tmp & 0xffff;
+                break;
+
+            case II_DeviceType:
+                tmp = __be32_to_cpu(*(p + 1));
+                _fwImgInfo.ext_info.dev_type = tmp & 0xffff;
+                // info->devRev  = (tmp >> 16) & 0xff;
+                break;
+
+            case II_VsdVendorId:
+                tmp = __be32_to_cpu(*(p + 1));
+                _fwImgInfo.ext_info.vsd_vendor_id = tmp & 0xffff;
+                break;
+
+            case II_IsGa:
+                tmp = __be32_to_cpu(*(p + 1));
+                _fwImgInfo.isGa = tmp ? true : false;
+                ;
+                break;
+
+            case II_PSID:
+                // set psid only if not previosly found in PS
+                str = (const char*)p;
+                str += 4;
+
+                for (int i = 0; i < PSID_LEN; i++)
+                {
+                    _fwImgInfo.ext_info.psid[i] = str[i];
+                }
+                _fwImgInfo.ext_info.psid[PSID_LEN] = '\0';
+                break;
+
+            case II_PSInfo:
+                str = (const char*)p;
+                str += 4;
+                size = strlen(str) + 1; // include '\0'
+                if (size > PRS_NAME_LEN)
+                {
+                    // ensure '\0' at the end
+                    size = PRS_NAME_LEN - 1;
+                }
+                memcpy(_fs2ImgInfo.ext_info.prs_name, str, size);
+                break;
 
-        case II_VSD:
-            // set psid only if not previosly found in PS
-            str = (const char*)p;
-            str += 4;
+            case II_VSD:
+                // set psid only if not previosly found in PS
+                str = (const char*)p;
+                str += 4;
 
-            for (int i = 0; i < VSD_LEN; i++) {
-                _fwImgInfo.ext_info.vsd[i] = str[i];
-            }
-            _fwImgInfo.ext_info.vsd[VSD_LEN] = '\0';
-            _fwImgInfo.ext_info.vsd_sect_found = true;
-            break;
+                for (int i = 0; i < VSD_LEN; i++)
+                {
+                    _fwImgInfo.ext_info.vsd[i] = str[i];
+                }
+                _fwImgInfo.ext_info.vsd[VSD_LEN] = '\0';
+                _fwImgInfo.ext_info.vsd_sect_found = true;
+                break;
 
-        case II_ProductVer:
+            case II_ProductVer:
 
-            str = (const char*)p;
-            str += 4;
-            for (int i = 0; i < PRODUCT_VER_LEN; i++) {
-                _fwImgInfo.ext_info.product_ver[i] = str[i];
-            }
-            _fwImgInfo.ext_info.product_ver[PRODUCT_VER_LEN] = '\0';
-            break;
-
-        case II_HwDevsId:
-            for (u_int32_t i = 1; i <= (tagSize / 4); i++) {
-                _fwImgInfo.supportedHwId[i - 1] = __be32_to_cpu(*(p + i));
-            }
-            _fwImgInfo.supportedHwIdNum = tagSize / 4;
-            break;
+                str = (const char*)p;
+                str += 4;
+                for (int i = 0; i < PRODUCT_VER_LEN; i++)
+                {
+                    _fwImgInfo.ext_info.product_ver[i] = str[i];
+                }
+                _fwImgInfo.ext_info.product_ver[PRODUCT_VER_LEN] = '\0';
+                break;
 
-        case II_HwAccessKey: {
-                _fs2ImgInfo.ext_info.access_key_value.h = __be32_to_cpu(*(p + 1));;
-                _fs2ImgInfo.ext_info.access_key_value.l = __be32_to_cpu(*(p + 2));;
+            case II_HwDevsId:
+                for (u_int32_t i = 1; i <= (tagSize / 4); i++)
+                {
+                    _fwImgInfo.supportedHwId[i - 1] = __be32_to_cpu(*(p + i));
+                }
+                _fwImgInfo.supportedHwIdNum = tagSize / 4;
+                break;
+
+            case II_HwAccessKey:
+            {
+                _fs2ImgInfo.ext_info.access_key_value.h = __be32_to_cpu(*(p + 1));
+                ;
+                _fs2ImgInfo.ext_info.access_key_value.l = __be32_to_cpu(*(p + 2));
+                ;
                 _fs2ImgInfo.ext_info.access_key_exists = 1;
             }
             break;
 
-        case II_PROFILES_LIST: {
+            case II_PROFILES_LIST:
+            {
                 GetSectData(_fs2ImgInfo.profListSectZipped, p + 1, tagSize);
             }
             break;
 
-        case II_TLVS_FORMAT: {
+            case II_TLVS_FORMAT:
+            {
                 GetSectData(_fs2ImgInfo.TlvFormatSectZipped, p + 1, tagSize);
             }
             break;
 
-        case II_TRACER_HASH: {
+            case II_TRACER_HASH:
+            {
                 GetSectData(_fs2ImgInfo.TracerHashSectZipped, p + 1, tagSize);
             }
             break;
 
-        case II_CONFIG_INFO: {
+            case II_CONFIG_INFO:
+            {
                 // printf("-D- configExists\n");
                 _fs2ImgInfo.isConfigurable = true;
-                _fs2ImgInfo.defPorfile   = __be32_to_cpu(*(p + 1));;
+                _fs2ImgInfo.defPorfile = __be32_to_cpu(*(p + 1));
+                ;
             }
             break;
 
-        case II_SUPPORTED_PROFS: {
-                for (u_int32_t i = 1; i <= (tagSize / 4); i++) {
+            case II_SUPPORTED_PROFS:
+            {
+                for (u_int32_t i = 1; i <= (tagSize / 4); i++)
+                {
                     u_int32_t id;
                     id = __be32_to_cpu(*(p + i));
                     _fs2ImgInfo.supportedProfList.push_back(id);
@@ -244,71 +260,92 @@ bool Fs2Operations::ParseInfoSect(u_int8_t *buff, u_int32_t byteSize)
             }
             break;
 
-        case II_ConfigArea: {
+            case II_ConfigArea:
+            {
                 // configuration area should always exsist
                 _fs2ImgInfo.ext_info.config_sectors = __be32_to_cpu(*(p + 1));
                 _fs2ImgInfo.ext_info.config_pad = __be32_to_cpu(*(p + 2));
-                if (tagSize > 0x8) {//fw_log_sector_size is also found
-                    _fs2ImgInfo.fw_sector_size = (1 << __be32_to_cpu(*(p + 3))) * 1024;// the base value is 1kb i.e 1024
+                if (tagSize > 0x8)
+                { // fw_log_sector_size is also found
+                    _fs2ImgInfo.fw_sector_size =
+                      (1 << __be32_to_cpu(*(p + 3))) * 1024; // the base value is 1kb i.e 1024
                 }
             }
             break;
 
-        case II_End:
-            endFound = true;
-            break;
+            case II_End:
+                endFound = true;
+                break;
 
-            //default:
-            //printf("-D- Found tag ID %d of size %d - ignoring.\n", tagId, tagSize);
+                // default:
+                // printf("-D- Found tag ID %d of size %d - ignoring.\n", tagId, tagSize);
         }
 
-        if (tagId < II_Last) {
+        if (tagId < II_Last)
+        {
             _fs2ImgInfo.infoOffs[tagId] = offs + 4;
         }
 
-        p    += tagSize / 4 + 1;
+        p += tagSize / 4 + 1;
         offs += tagSize + 4;
         tagNum++;
     }
 
-    if (offs != byteSize) {
-        if (endFound) {
-            return errmsg(MLXFW_SECTION_CORRUPTED_ERR, "Info section corrupted: Section data size is 0x%x bytes, "
-                          "but end tag found after 0x%x bytes.", byteSize, offs);
-        } else {
-            return errmsg(MLXFW_SECTION_CORRUPTED_ERR, "Info section corrupted: Section data size is 0x%x bytes, "
-                          "but end tag not found before section end.", byteSize);
+    if (offs != byteSize)
+    {
+        if (endFound)
+        {
+            return errmsg(MLXFW_SECTION_CORRUPTED_ERR,
+                          "Info section corrupted: Section data size is 0x%x bytes, "
+                          "but end tag found after 0x%x bytes.",
+                          byteSize, offs);
+        }
+        else
+        {
+            return errmsg(MLXFW_SECTION_CORRUPTED_ERR,
+                          "Info section corrupted: Section data size is 0x%x bytes, "
+                          "but end tag not found before section end.",
+                          byteSize);
         }
     }
     return true;
 }
 
-
 void Fs2Operations::initSectToRead(int imp_index)
 {
-    for (int i = 0; i < H_LAST; i++) {
-        if (imp_index == FULL_VERIFY || i == imp_index) {
+    for (int i = 0; i < H_LAST; i++)
+    {
+        if (imp_index == FULL_VERIFY || i == imp_index)
+        {
             _sectionsToRead[i] = 1;
-        } else {
+        }
+        else
+        {
             _sectionsToRead[i] = 0;
         }
     }
-    if (imp_index == FULL_VERIFY) {
+    if (imp_index == FULL_VERIFY)
+    {
         _isFullVerify = true;
-    } else {
+    }
+    else
+    {
         _isFullVerify = false;
     }
 
     return;
 }
 
-bool Fs2Operations::checkGen(u_int32_t beg, u_int32_t offs, u_int32_t& next, const char *pref,
+bool Fs2Operations::checkGen(u_int32_t beg,
+                             u_int32_t offs,
+                             u_int32_t& next,
+                             const char* pref,
                              VerifyCallBack verifyCallBackFunc)
 {
-    char *pr = new char[strlen(pref) + 100];
+    char* pr = new char[strlen(pref) + 100];
 
     char unknown_sect_name[128];
-    const char *sect_name;
+    const char* sect_name;
 
     u_int32_t size = 0;
     GPH gph;
@@ -322,8 +359,10 @@ bool Fs2Operations::checkGen(u_int32_t beg, u_int32_t offs, u_int32_t& next, con
     part_cnt++;
 
     // May be BOOT3?
-    if (gph.type < H_FIRST  ||  gph.type >= H_LAST) {
-        if (part_cnt <= 2) {
+    if (gph.type < H_FIRST || gph.type >= H_LAST)
+    {
+        if (part_cnt <= 2)
+        {
             delete[] pr;
             return checkBoot2(beg, offs, next, _isFullVerify, pref, verifyCallBackFunc);
         }
@@ -332,7 +371,8 @@ bool Fs2Operations::checkGen(u_int32_t beg, u_int32_t offs, u_int32_t& next, con
     // All partitions here
     offs += beg;
 
-    if (gph.type < H_FIRST  ||  gph.type >= H_LAST) {
+    if (gph.type < H_FIRST || gph.type >= H_LAST)
+    {
         // For forward compatibility, try analyzing even if section type is unknown
         // Assuming the size is in DW, like all other sections (except emt service).
         // If this assumption is wrong, CRC calc would fail - no harm done.
@@ -340,38 +380,44 @@ bool Fs2Operations::checkGen(u_int32_t beg, u_int32_t offs, u_int32_t& next, con
         sect_name = unknown_sect_name;
         size = gph.size * 4;
         is_sect_to_read = true;
-
-    } else {
-        if (gph.type == H_EMT) {
+    }
+    else
+    {
+        if (gph.type == H_EMT)
+        {
             size = (gph.size + 3) / 4 * 4;
-        } else {
+        }
+        else
+        {
             size = gph.size * 4;
         }
         sect_name = g_sectNames[gph.type];
         // We verify part of the image only when we verify an image burnt on a device
-        if (_ioAccess->is_flash()) {
-            is_sect_to_read =  _sectionsToRead[gph.type];
-        } else {
+        if (_ioAccess->is_flash())
+        {
+            is_sect_to_read = _sectionsToRead[gph.type];
+        }
+        else
+        {
             is_sect_to_read = true;
         }
-
     }
 
-    sprintf(pr, CRC_CHECK_OUTPUT,
-            pref, offs, offs + size + (u_int32_t)sizeof(gph) + 3,
+    sprintf(pr, CRC_CHECK_OUTPUT, pref, offs, offs + size + (u_int32_t)sizeof(gph) + 3,
             size + (u_int32_t)sizeof(gph) + 4, sect_name);
 
-    if (size > MAX_SECTION_SIZE) {
-        report_callback(verifyCallBackFunc, "%s - size too big (0x%x)\n",
-                        pr, size);
+    if (size > MAX_SECTION_SIZE)
+    {
+        report_callback(verifyCallBackFunc, "%s - size too big (0x%x)\n", pr, size);
         delete[] pr;
         return false;
     }
-    if (is_sect_to_read) {
+    if (is_sect_to_read)
+    {
         // CRC
         Crc16 crc;
         std::vector<u_int8_t> buffv(size);
-        u_int32_t *buff = (u_int32_t *)(buffv.size() ? (&(buffv[0])) : NULL);
+        u_int32_t* buff = (u_int32_t*)(buffv.size() ? (&(buffv[0])) : NULL);
 
         readBufAux((*_ioAccess), offs + sizeof(gph), buff, size, pr);
 
@@ -388,75 +434,86 @@ bool Fs2Operations::checkGen(u_int32_t beg, u_int32_t offs, u_int32_t& next, con
         TOCPU1(crc_act);
         bool blank_crc = false;
 
-        if (gph.type == H_GUID && crc_act == 0xffff) {
+        if (gph.type == H_GUID && crc_act == 0xffff)
+        {
             // in case we get 0xffff as crc BUT the section is not empty (i.e not ffffs)
-            //check the 64 bits of the NGUID (node guid) located at offs + sizeof(gph)
+            // check the 64 bits of the NGUID (node guid) located at offs + sizeof(gph)
             u_int64_t nguid;
             READBUF((*_ioAccess), offs + sizeof(gph), (u_int8_t*)&nguid, 8, pr);
-            if (nguid == 0xffffffffffffffffULL) {
+            if (nguid == 0xffffffffffffffffULL)
+            {
                 blank_crc = true;
                 _fs2ImgInfo.ext_info.blank_guids = true;
             }
         }
 
-        if (!CheckAndPrintCrcRes(pr, blank_crc, offs, crc_act, crc.get(), false, verifyCallBackFunc)) {
+        if (!CheckAndPrintCrcRes(pr, blank_crc, offs, crc_act, crc.get(), false, verifyCallBackFunc))
+        {
             delete[] pr;
             return false;
         }
         delete[] pr;
-        pr = (char*) NULL;
+        pr = (char*)NULL;
         _ioAccess->get_image_crc() << crc.get();
         // The image info may be null, please check that before using it.
-        if (gph.type == H_FW_CONF) {
+        if (gph.type == H_FW_CONF)
+        {
             GetSectData(_fwConfSect, buff, size);
         }
-        if (gph.type == H_HASH_FILE) {
+        if (gph.type == H_HASH_FILE)
+        {
             GetSectData(_hashFileSect, buff, size);
         }
 
-        if (gph.type == H_IMG_INFO) {
+        if (gph.type == H_IMG_INFO)
+        {
             CPUTOn(buff, size / 4);
-            if (!ParseInfoSect((u_int8_t*)buff, size)) {
+            if (!ParseInfoSect((u_int8_t*)buff, size))
+            {
                 return errmsg("Failed to read the info sector: %s\n", err());
             }
-
         }
 
-        if (gph.type == H_ROM && _romSect.empty()) {
+        if (gph.type == H_ROM && _romSect.empty())
+        {
             TOCPUn(buff, size / 4);
             GetSectData(_romSect, buff, size);
         }
     }
 
-
     // mark last read addr
-    _fwImgInfo.lastImageAddr = offs + size + sizeof(gph) + 4;  // the 4 is for the trailing crc
+    _fwImgInfo.lastImageAddr = offs + size + sizeof(gph) + 4; // the 4 is for the trailing crc
     next = gph.next;
 
-    if (pr) {
+    if (pr)
+    {
         delete[] pr;
     }
     return true;
 } // checkGen
 
-
 ////////////////////////////////////////////////////////////////////////
-bool Fs2Operations::checkList(u_int32_t offs, u_int32_t fw_start, const char *pref, VerifyCallBack verifyCallBackFunc)
+bool Fs2Operations::checkList(u_int32_t offs, u_int32_t fw_start, const char* pref, VerifyCallBack verifyCallBackFunc)
 
 {
-    //is initilized in CHECKB2
+    // is initilized in CHECKB2
     u_int32_t next_ptr = 0;
 
     CHECKB2(offs, fw_start, next_ptr, _isFullVerify, pref, verifyCallBackFunc);
     part_cnt = 1;
-    while (next_ptr && next_ptr != 0xff000000) {
+    while (next_ptr && next_ptr != 0xff000000)
+    {
         CHECKGN(offs, next_ptr, next_ptr, pref, verifyCallBackFunc);
     }
 
     return true;
 } // checkList
 
-bool Fs2Operations::Fs2Verify(VerifyCallBack verifyCallBackFunc, bool is_striped_image, bool both_images, bool only_get_start, bool ignore_full_image_crc,
+bool Fs2Operations::Fs2Verify(VerifyCallBack verifyCallBackFunc,
+                              bool is_striped_image,
+                              bool both_images,
+                              bool only_get_start,
+                              bool ignore_full_image_crc,
                               bool force_no_striped_image)
 {
     u_int32_t cntx_image_start[CNTX_START_POS_SIZE] = {0};
@@ -469,24 +526,28 @@ bool Fs2Operations::Fs2Verify(VerifyCallBack verifyCallBackFunc, bool is_striped
     // printf("-D- VerifyFs2 = ok\n");
     // Look for image in "physical addresses
     FindAllImageStart(_ioAccess, cntx_image_start, &cntx_image_num, _cntx_magic_pattern);
-    if (cntx_image_num == 0) {
+    if (cntx_image_num == 0)
+    {
         return errmsg(MLXFW_NO_VALID_IMAGE_ERR, "No valid image found");
-    } else if (cntx_image_num > 2) {
+    }
+    else if (cntx_image_num > 2)
+    {
         // This check may be redundant - Maybe ignore if more than 2 images found
-        return errmsg(MLXFW_MULTIPLE_VALID_IMAGES_ERR, "More than 2 image start locations found at addresses 0x%x, 0x%x and 0x%x. Image may be corrupted.",
-                      cntx_image_start[0],
-                      cntx_image_start[1],
-                      cntx_image_start[2]);
+        return errmsg(
+          MLXFW_MULTIPLE_VALID_IMAGES_ERR,
+          "More than 2 image start locations found at addresses 0x%x, 0x%x and 0x%x. Image may be corrupted.",
+          cntx_image_start[0], cntx_image_start[1], cntx_image_start[2]);
     }
 
-    if (!both_images) {
+    if (!both_images)
+    {
         // Check only the first image. This is enough to ensure that the device is bootable.
         cntx_image_num = 1;
     }
 
-
     // Verify the images:
-    for (u_int32_t i = 0; i < cntx_image_num; i++) {
+    for (u_int32_t i = 0; i < cntx_image_num; i++)
+    {
         bool fs_en = false;
         u_int32_t log2chunk_size = 0;
         u_int32_t buff[FS2_BOOT_START / 4];
@@ -500,52 +561,62 @@ bool Fs2Operations::Fs2Verify(VerifyCallBack verifyCallBackFunc, bool is_striped
         TOCPUn(buff, FS2_BOOT_START / 4);
 
         u_int32_ba crc_dw = buff[IMG_CRC_OFF / 4];
-        act_crc           = u_int32_t(crc_dw.range(15, 0));
+        act_crc = u_int32_t(crc_dw.range(15, 0));
         crc_dw.range(15, 0) = 0xffff;
         buff[IMG_CRC_OFF / 4] |= crc_dw;
 
         CRCn(_ioAccess->get_image_crc(), buff, FS2_BOOT_START / 4);
-        //printf("-D- CRC is %#x\n", _ioAccess->get_image_crc().get());
-        if (!CntxGetFsData(buff[FS_DATA_OFF / 4], fs_en, log2chunk_size)) {
+        // printf("-D- CRC is %#x\n", _ioAccess->get_image_crc().get());
+        if (!CntxGetFsData(buff[FS_DATA_OFF / 4], fs_en, log2chunk_size))
+        {
             report_callback(verifyCallBackFunc, "\n    Can not read failsafe info word: %s\n", err());
-            return(i > 0);
+            return (i > 0);
         }
 
         // If fw not enabled, image must start at addr 0
-        if (!fs_en && cntx_image_start[i] != 0) {
+        if (!fs_en && cntx_image_start[i] != 0)
+        {
             return errmsg("FS2 Non Failsafe image must start at address 0. Found non-fs image at address 0x%x",
                           cntx_image_start[i]);
         }
 
-        if (fs_en) {
-            report_callback(verifyCallBackFunc, "\n     FS2 failsafe image. Start address: 0x%x. Chunk size 0x%x:\n\n", cntx_image_start[i], 1 << log2chunk_size);
-            report_callback(verifyCallBackFunc, "     NOTE: The addresses below are contiguous logical addresses. Physical addresses on\n"
+        if (fs_en)
+        {
+            report_callback(verifyCallBackFunc, "\n     FS2 failsafe image. Start address: 0x%x. Chunk size 0x%x:\n\n",
+                            cntx_image_start[i], 1 << log2chunk_size);
+            report_callback(verifyCallBackFunc,
+                            "     NOTE: The addresses below are contiguous logical addresses. Physical addresses on\n"
                             "           flash may be different, based on the image start address and chunk size\n\n");
-        } else {
+        }
+        else
+        {
             report_callback(verifyCallBackFunc, "\n     FS2 non failsafe image:\n\n");
         }
 
-        if (fs_en && cntx_image_start[i] != 0 && cntx_image_start[i] != (u_int32_t)(1 << log2chunk_size)) {
-            return errmsg("FS2 Failsafe image must start at address 0 or at chunk size. Found a failsafe image at address 0x%x",
-                          cntx_image_start[i]);
+        if (fs_en && cntx_image_start[i] != 0 && cntx_image_start[i] != (u_int32_t)(1 << log2chunk_size))
+        {
+            return errmsg(
+              "FS2 Failsafe image must start at address 0 or at chunk size. Found a failsafe image at address 0x%x",
+              cntx_image_start[i]);
         }
 
-        _fwImgInfo.imgStart          = cntx_image_start[i];
-        _fwImgInfo.ext_info.is_failsafe        = fs_en;
-        _fwImgInfo.actuallyFailsafe  = true;
+        _fwImgInfo.imgStart = cntx_image_start[i];
+        _fwImgInfo.ext_info.is_failsafe = fs_en;
+        _fwImgInfo.actuallyFailsafe = true;
         _fwImgInfo.cntxLog2ChunkSize = log2chunk_size;
 
-
-
-        if (_ioAccess->is_flash()) {
+        if (_ioAccess->is_flash())
+        {
             // In flash, image layout must match the FS Data
-            _fwImgInfo.actuallyFailsafe    = true;
+            _fwImgInfo.actuallyFailsafe = true;
 
-
-            if (fs_en) {
+            if (fs_en)
+            {
                 _ioAccess->set_address_convertor(log2chunk_size, cntx_image_start[i] != 0);
             }
-        } else {
+        }
+        else
+        {
             // In an image file there are 2 cases:
             // 1. Image generated by mlxburn
             //    The image in the file is contiguous (though it is marked as FS) - no need to set address convertion.
@@ -560,33 +631,40 @@ bool Fs2Operations::Fs2Verify(VerifyCallBack verifyCallBackFunc, bool is_striped
             //
             // For now, get the "striped" indication from user.
 
-            if (!force_no_striped_image && is_striped_image) {
+            if (!force_no_striped_image && is_striped_image)
+            {
                 _ioAccess->set_address_convertor(log2chunk_size, cntx_image_start[i] != 0);
-            } else {
-                _ioAccess->set_address_convertor(0, 0);  //disable conversion
             }
-            _fwImgInfo.actuallyFailsafe    = is_striped_image;
+            else
+            {
+                _ioAccess->set_address_convertor(0, 0); // disable conversion
+            }
+            _fwImgInfo.actuallyFailsafe = is_striped_image;
         }
 
         bool imgStat = true;
         // TODO: check what only_get_start means.
-        if (!only_get_start) {
+        if (!only_get_start)
+        {
             imgStat = checkList(0, FS2_BOOT_START, PRE_CRC_OUTPUT, verifyCallBackFunc);
         }
         _ioAccess->get_image_crc().finish();
 
         u_int32_t full_crc = _ioAccess->get_image_crc().get();
 
-        if (!ignore_full_image_crc && _fs2ImgInfo.infoOffs[II_MicVersion]) {  // For now we check only that the Mic version existing .
+        if (!ignore_full_image_crc && _fs2ImgInfo.infoOffs[II_MicVersion])
+        { // For now we check only that the Mic version existing .
             check_full_crc = true;
         }
-        if (imgStat && _isFullVerify && check_full_crc && !only_get_start) {
+        if (imgStat && _isFullVerify && check_full_crc && !only_get_start)
+        {
             char pr[256];
             sprintf(pr, CRC_CHECK_OUTPUT, PRE_CRC_OUTPUT, 0, _fwImgInfo.lastImageAddr - 1, _fwImgInfo.lastImageAddr,
                     "Full Image");
             CheckAndPrintCrcRes(pr, _fs2ImgInfo.ext_info.blank_guids, 0, act_crc, full_crc, false, verifyCallBackFunc);
         }
-        if (i == 0) {
+        if (i == 0)
+        {
             ret = ret && imgStat;
         }
     }
@@ -599,7 +677,8 @@ bool Fs2Operations::FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedIm
     (void)ignoreDToc;
 
     initSectToRead(FULL_VERIFY);
-    if (!Fs2Verify(verifyCallBackFunc, isStripedImage)) {
+    if (!Fs2Verify(verifyCallBackFunc, isStripedImage))
+    {
         // empty the initSectToRead
         initSectToRead(H_LAST);
         return false;
@@ -615,15 +694,18 @@ u_int8_t Fs2Operations::FwType()
     return FIT_FS2;
 }
 
-bool Fs2Operations::FwReadData(void *image, u_int32_t *image_size, bool verbose)
+bool Fs2Operations::FwReadData(void* image, u_int32_t* image_size, bool verbose)
 {
     (void)verbose;
-    if (!Fs2Verify((VerifyCallBack)NULL)) {
+    if (!Fs2Verify((VerifyCallBack)NULL))
+    {
         return false;
     }
     *image_size = _fwImgInfo.lastImageAddr;
-    if (image != NULL) {
-        if (!_ioAccess->read(0, (u_int32_t*)image, *image_size)) {
+    if (image != NULL)
+    {
+        if (!_ioAccess->read(0, (u_int32_t*)image, *image_size))
+        {
             return errmsg("Failed to read Image: %s", _ioAccess->err());
         }
     }
@@ -632,7 +714,6 @@ bool Fs2Operations::FwReadData(void *image, u_int32_t *image_size, bool verbose)
 
 bool Fs2Operations::Fs2Query()
 {
-
     u_int32_t guid_ptr, nguids;
     guid_t guids[MAX_GUIDS];
     /*
@@ -646,9 +727,12 @@ bool Fs2Operations::Fs2Query()
     u_int32_t fw_size;
     u_int32_t im_start = _fwImgInfo.imgStart;
 
-    if (_fwImgInfo.ext_info.is_failsafe && _fwImgInfo.actuallyFailsafe) {
+    if (_fwImgInfo.ext_info.is_failsafe && _fwImgInfo.actuallyFailsafe)
+    {
         _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, im_start != 0);
-    } else {
+    }
+    else
+    {
         _ioAccess->set_address_convertor(0, 0);
     }
 
@@ -663,22 +747,24 @@ bool Fs2Operations::Fs2Query()
     TOCPU1(fw_size);
     _fwImgInfo.ext_info.image_size = fw_size;
 
-    _fwImgInfo.ext_info.dev_rev  = fw_id >> 24;
+    _fwImgInfo.ext_info.dev_rev = fw_id >> 24;
     // Read GUIDs
     READ4((*_ioAccess), im_start + fw_id_offs + 0x14, &guid_ptr, "GUID PTR");
     TOCPU1(guid_ptr);
     _fs2ImgInfo.guidPtr = guid_ptr;
 
     guid_ptr += im_start;
-    if (guid_ptr >= _ioAccess->get_size()) {
+    if (guid_ptr >= _ioAccess->get_size())
+    {
         return errmsg("Failed to read GUIDs - Illegal GUID pointer (%08x). Probably image is corrupted", guid_ptr);
     }
     READ4((*_ioAccess), guid_ptr - 3 * sizeof(u_int32_t), &nguids, "Number of GUIDs");
     TOCPU1(nguids);
     nguids /= 2;
-    if (nguids > MAX_GUIDS) {
+    if (nguids > MAX_GUIDS)
+    {
         return errmsg("Failed to read GUIDs - Illegal Number of GUIDs (%d)", nguids);
-        //return false;
+        // return false;
     }
     READBUF((*_ioAccess), guid_ptr, guids, nguids * sizeof(u_int64_t), "GUIDS");
     TOCPUBY64(guids);
@@ -688,14 +774,17 @@ bool Fs2Operations::Fs2Query()
     guids_crc = __be32_to_cpu(guids_crc);
 
     _fs2ImgInfo.ext_info.blank_guids = true;
-    if ((guids_crc & 0xffff) != 0xffff) {
+    if ((guids_crc & 0xffff) != 0xffff)
+    {
         _fs2ImgInfo.ext_info.blank_guids = false;
     }
 
     _fs2ImgInfo.ext_info.guid_num = nguids;
-    for (u_int32_t i = 0; i < nguids; i++) {
+    for (u_int32_t i = 0; i < nguids; i++)
+    {
         _fs2ImgInfo.ext_info.guids[i] = guids[i];
-        if (guids[i].h != 0xffffffff || guids[i].l != 0xffffffff) {
+        if (guids[i].h != 0xffffffff || guids[i].l != 0xffffffff)
+        {
             _fs2ImgInfo.ext_info.blank_guids = false;
         }
     }
@@ -716,21 +805,31 @@ bool Fs2Operations::Fs2Query()
 
     // Verify info_ptr checksum (should be 0)
     info_ptr_ba = info_ptr;
-    for (u_int32_t i = 0; i < 4; i++) {
+    for (u_int32_t i = 0; i < 4; i++)
+    {
         info_ptr_cs += (u_int8_t)info_ptr_ba.range(i * 8 + 7, i * 8);
     }
 
-    if (info_ptr_cs) {
-        return errmsg(MLXFW_BAD_CHECKSUM_ERR, "Failed to read Info Section - Bad checksum for Info section pointer (%08x). Probably the image is corrupted.", info_ptr);
+    if (info_ptr_cs)
+    {
+        return errmsg(
+          MLXFW_BAD_CHECKSUM_ERR,
+          "Failed to read Info Section - Bad checksum for Info section pointer (%08x). Probably the image is corrupted.",
+          info_ptr);
     }
 
     info_ptr = info_ptr_ba.range(23, 0);
-    if (info_ptr_cs == 0 && info_ptr != 0) {
+    if (info_ptr_cs == 0 && info_ptr != 0)
+    {
         _fs2ImgInfo.infoSectPtr = info_ptr;
 
         info_ptr += im_start;
-        if (info_ptr >= _ioAccess->get_size()) {
-            return errmsg(MLXFW_SECTION_TOO_LARGE_ERR, "Failed to read Info Section - Info section pointer (%08x) too large. Probably the image is corrupted.", info_ptr);
+        if (info_ptr >= _ioAccess->get_size())
+        {
+            return errmsg(
+              MLXFW_SECTION_TOO_LARGE_ERR,
+              "Failed to read Info Section - Info section pointer (%08x) too large. Probably the image is corrupted.",
+              info_ptr);
         }
         READ4((*_ioAccess), info_ptr - 3 * sizeof(u_int32_t), &info_size, "Info section size");
         TOCPU1(info_size);
@@ -740,11 +839,13 @@ bool Fs2Operations::Fs2Query()
 
         std::vector<u_int8_t> info_buff(info_size);
         bool rc = readBufAux((*_ioAccess), info_ptr, static_cast<u_int8_t*>(&info_buff[0]), info_size, "Info Section");
-        if (!rc) {
+        if (!rc)
+        {
             return false;
         }
 
-        if (!ParseInfoSect(static_cast<u_int8_t*>(&info_buff[0]), info_size)) {
+        if (!ParseInfoSect(static_cast<u_int8_t*>(&info_buff[0]), info_size))
+        {
             return false;
         }
     }
@@ -756,39 +857,51 @@ bool Fs2Operations::Fs2Query()
 
 bool Fs2Operations::Fs2IntQuery(bool readRom, bool isStripedImage)
 {
-    if (readRom) {
+    if (readRom)
+    {
         initSectToRead(H_ROM);
-    } else {
+    }
+    else
+    {
         initSectToRead(H_LAST);
     }
-    if (!Fs2Verify((VerifyCallBack)NULL, isStripedImage)) {
+    if (!Fs2Verify((VerifyCallBack)NULL, isStripedImage))
+    {
         initSectToRead(H_LAST);
         return false;
     }
     initSectToRead(H_LAST);
-    if (!Fs2Query()) {
+    if (!Fs2Query())
+    {
         return false;
     }
     _fwImgInfo.ext_info.chip_type = getChipType();
 
     // get running FW version
-    if (_ioAccess->is_flash() && _fwImgInfo.ext_info.chip_type != CT_UNKNOWN) {
+    if (_ioAccess->is_flash() && _fwImgInfo.ext_info.chip_type != CT_UNKNOWN)
+    {
         getRunningFwVer();
     }
     return true;
 }
 
-bool Fs2Operations::FwQuery(fw_info_t *fwInfo, bool readRom, bool isStripedImage, bool quickQuery, bool ignoreDToc, bool verbose)
+bool Fs2Operations::FwQuery(fw_info_t* fwInfo,
+                            bool readRom,
+                            bool isStripedImage,
+                            bool quickQuery,
+                            bool ignoreDToc,
+                            bool verbose)
 {
     (void)quickQuery;
     (void)ignoreDToc;
     (void)verbose;
-    if (!Fs2IntQuery(readRom, isStripedImage)) {
+    if (!Fs2IntQuery(readRom, isStripedImage))
+    {
         return false;
     }
-    memcpy(&(fwInfo->fw_info),  &(_fwImgInfo.ext_info),  sizeof(fw_info_com_t));
+    memcpy(&(fwInfo->fw_info), &(_fwImgInfo.ext_info), sizeof(fw_info_com_t));
     memcpy(&(fwInfo->fs2_info), &(_fs2ImgInfo.ext_info), sizeof(fs2_info_t));
-    //set the chipType in fwInfo
+    // set the chipType in fwInfo
     fwInfo->fw_type = FIT_FS2;
     fwInfo->fw_info.chip_type = CT_CONNECTX3;
     return true;
@@ -806,26 +919,30 @@ bool Fs2Operations::getRunningFwVer()
     u_int8_t buff[CIBFW_FW_VERSION_SIZE] = {0};
     memset(&fwVer, 0, sizeof(fwVer));
     // make sure its not mellanox OS
-    if (mget_mdevs_flags(_ioAccess->getMfileObj(), &mflags)) {
+    if (mget_mdevs_flags(_ioAccess->getMfileObj(), &mflags))
+    {
         return errmsg("Failed to get device access type");
     }
-    if (mflags & MDEVS_MLNX_OS) {
+    if (mflags & MDEVS_MLNX_OS)
+    {
         return true;
     }
-    switch (_fwImgInfo.ext_info.chip_type) {
-    case CT_CONNECTX:
-        fwVerBaseAddr = CX3_FW_VER_CR_ADDR;
-        break;
+    switch (_fwImgInfo.ext_info.chip_type)
+    {
+        case CT_CONNECTX:
+            fwVerBaseAddr = CX3_FW_VER_CR_ADDR;
+            break;
 
-    case CT_SWITCHX:
-        fwVerBaseAddr = SX_FW_VER_CR_ADDR;
-        break;
+        case CT_SWITCHX:
+            fwVerBaseAddr = SX_FW_VER_CR_ADDR;
+            break;
 
-    default:
-        return errmsg("Unsupported chip type.");
+        default:
+            return errmsg("Unsupported chip type.");
     }
 
-    if (mread_buffer(_ioAccess->getMfileObj(), fwVerBaseAddr, buff, CIBFW_FW_VERSION_SIZE) != CIBFW_FW_VERSION_SIZE) {
+    if (mread_buffer(_ioAccess->getMfileObj(), fwVerBaseAddr, buff, CIBFW_FW_VERSION_SIZE) != CIBFW_FW_VERSION_SIZE)
+    {
         return errmsg("Failed to extract FW version from device. CR_ERROR\n");
     }
     cibfw_FW_VERSION_unpack(&fwVer, buff);
@@ -844,26 +961,30 @@ bool Fs2Operations::getRunningFwVer()
 u_int32_t Fs2Operations::getDefaultSectorSz()
 {
     // for ConnectX family  default sector size is 64kb else 4kb
-    // all of this mess is because the sector_size written in the INI doesnt always correspond to the actual flash sector_size
-    // and as for the calculation of the maximal image size we want to be synced with the FW or take worst case scenario.
-    // we need this method as we only started collecting the fw_sector_size from MFT-3.6.0 so if the image was generated with
-    // an older mlxburn the fw_sector_size wount be available
+    // all of this mess is because the sector_size written in the INI doesnt always correspond to the actual flash
+    // sector_size and as for the calculation of the maximal image size we want to be synced with the FW or take worst
+    // case scenario. we need this method as we only started collecting the fw_sector_size from MFT-3.6.0 so if the
+    // image was generated with an older mlxburn the fw_sector_size wount be available
     u_int32_t devid = _ioAccess->get_dev_id();
-    switch (devid) {
-    case CX2_HW_ID:
-    case CX3_HW_ID:
-    case CX3_PRO_HW_ID:
-        return CX_DFLT_SECTOR_SIZE;
+    switch (devid)
+    {
+        case CX2_HW_ID:
+        case CX3_HW_ID:
+        case CX3_PRO_HW_ID:
+            return CX_DFLT_SECTOR_SIZE;
 
-    default:
-        return SX_DFLT_SECTOR_SIZE;
+        default:
+            return SX_DFLT_SECTOR_SIZE;
     }
     // we shouldnt reach here
     return 0;
 }
 
-bool Fs2Operations::GetMaxImageSize(u_int32_t flash_size, bool image_is_fs, u_int32_t imgConfigSectors, u_int32_t imgFwSectorSz, \
-                                    u_int32_t &max_image_size)
+bool Fs2Operations::GetMaxImageSize(u_int32_t flash_size,
+                                    bool image_is_fs,
+                                    u_int32_t imgConfigSectors,
+                                    u_int32_t imgFwSectorSz,
+                                    u_int32_t& max_image_size)
 {
     /*
         u_int32_t sector_size = _ioAccess->get_sector_size();
@@ -877,41 +998,47 @@ bool Fs2Operations::GetMaxImageSize(u_int32_t flash_size, bool image_is_fs, u_in
      */
     /* new methodology:
      * a.  for CX2/CX3/PRO: in case fw_sector_size is present  reserve : num_of_config_sectors * fw_sector_size
-     * b.  for CX2/CX3/PRO: in case sector_size isnt present assume sector size is 64kb and reserve: num_of_config_sectors * 64k
-     * c.  for SwitchX: in case fw_sector_size is present reserve : ( num_of_config_sectors + config_padd) * fw_sector_size
-     * d.  for SwitchX: in case sector_size isnt present assume sector size is 4kb and reserve: ( num_of_config_sectors + config_padd) *4k
+     * b.  for CX2/CX3/PRO: in case sector_size isnt present assume sector size is 64kb and reserve:
+     * num_of_config_sectors * 64k c.  for SwitchX: in case fw_sector_size is present reserve : ( num_of_config_sectors
+     * + config_padd) * fw_sector_size d.  for SwitchX: in case sector_size isnt present assume sector size is 4kb and
+     * reserve: ( num_of_config_sectors + config_padd) *4k
      *   ** on ALL cases we will impose the limitation of reserving at most 64kb to the NV configuration.
      *   ** config_pad might be != 0 on SwitchX only.
      *   ** To Orenks knowledge there arent any SwitchX with flashes that dont support 4kb.
      */
-    u_int32_t sector_size = (imgFwSectorSz != 0 || _fs2ImgInfo.fw_sector_size != 0) ? \
-                            MY_MAX(imgFwSectorSz, _fs2ImgInfo.fw_sector_size) : getDefaultSectorSz();
+    u_int32_t sector_size = (imgFwSectorSz != 0 || _fs2ImgInfo.fw_sector_size != 0) ?
+                              MY_MAX(imgFwSectorSz, _fs2ImgInfo.fw_sector_size) :
+                              getDefaultSectorSz();
     u_int32_t config_sectors = MY_MAX(imgConfigSectors, _fs2ImgInfo.ext_info.config_sectors);
     u_int32_t areaToReserve = config_sectors * sector_size;
     // we dont want to exceed 64kb of reserved space
     areaToReserve = areaToReserve > MAX_CONFIG_AREA_SIZE ? MAX_CONFIG_AREA_SIZE : areaToReserve;
-    //printf("-D- sector_size: 0x%x, config_sectors: %d, areaToReserve: 0x%x, config_pad: %d\n"
+    // printf("-D- sector_size: 0x%x, config_sectors: %d, areaToReserve: 0x%x, config_pad: %d\n"
     //, sector_size, config_sectors, areaToReserve, _fs2ImgInfo.ext_info.config_pad);
-    if (image_is_fs) {
-        // why do we take config padding of the image info of the device and not the image to be burnt or the maximum between them??
+    if (image_is_fs)
+    {
+        // why do we take config padding of the image info of the device and not the image to be burnt or the maximum
+        // between them??
         max_image_size = (flash_size / 2) - (areaToReserve + (_fs2ImgInfo.ext_info.config_pad * sector_size));
-    } else {
+    }
+    else
+    {
         // For non FS image, there's an optional offset + 2 consecutive config areas
         max_image_size = flash_size - (areaToReserve * 2 + _fs2ImgInfo.ext_info.config_pad * sector_size);
     }
     return true;
 }
 
-bool Fs2Operations::UpdateFullImageCRC(u_int32_t *buff, u_int32_t size, bool blank_guids)
+bool Fs2Operations::UpdateFullImageCRC(u_int32_t* buff, u_int32_t size, bool blank_guids)
 {
     // Writing 0xffff on the CRC field.
     u_int32_ba crc_dw = TOCPU1(buff[IMG_CRC_OFF / 4]);
-    crc_dw.range(15, 0)  = 0xffff;
-
+    crc_dw.range(15, 0) = 0xffff;
 
     buff[IMG_CRC_OFF / 4] = CPUTO1(crc_dw);
 
-    if (blank_guids) {
+    if (blank_guids)
+    {
         return true;
     }
 
@@ -920,105 +1047,121 @@ bool Fs2Operations::UpdateFullImageCRC(u_int32_t *buff, u_int32_t size, bool bla
 
     // Update the CRC.
     TOCPU1(crc_dw);
-    crc_dw.range(15, 0)   = new_crc;
+    crc_dw.range(15, 0) = new_crc;
     buff[IMG_CRC_OFF / 4] = CPUTO1(crc_dw);
 
     return true;
 }
 #define ERASE_MESSAGE "    Please erase them by using the command: \"" MLXCONFIG_CMD " " ERASE_CMD "\" and then re-burn"
 
-bool Fs2Operations::Fs2FailSafeBurn(Fs2Operations &imageOps,
-                                    ExtBurnParams& burnParams)
+bool Fs2Operations::Fs2FailSafeBurn(Fs2Operations& imageOps, ExtBurnParams& burnParams)
 {
     bool allow_nofs = !burnParams.burnFailsafe;
     ProgressCallBack progressFunc = burnParams.progressFunc;
     ProgressCallBackEx progressFuncEx = burnParams.progressFuncEx;
-    void *progressUserData = burnParams.progressUserData;
+    void* progressUserData = burnParams.progressUserData;
     bool isCpuUtilization = burnParams.use_cpu_utilization;
     int cpuPercent = burnParams.cpu_utilization;
-    Flash  *f = (Flash*)(this->_ioAccess);
-    FImage *fim = (FImage*)(imageOps._ioAccess);
-
+    Flash* f = (Flash*)(this->_ioAccess);
+    FImage* fim = (FImage*)(imageOps._ioAccess);
 
     // TODO: See getBuf effect on zebra image.
-    u_int8_t  *data8      = (u_int8_t*) fim->getBuf();
+    u_int8_t* data8 = (u_int8_t*)fim->getBuf();
     int image_size = fim->getBufLength();
-    u_int32_t zeroes     = 0;
+    u_int32_t zeroes = 0;
     bool is_curr_image_in_odd_chunks;
 
     // Update CRC.
     // TODO: No support for blank guids
-    bool isBlankGuids = ( _burnBlankGuids || imageOps._fs2ImgInfo.ext_info.blank_guids );
-    if (fim->getBuf() == NULL) {
+    bool isBlankGuids = (_burnBlankGuids || imageOps._fs2ImgInfo.ext_info.blank_guids);
+    if (fim->getBuf() == NULL)
+    {
         return errmsg(MLXFW_ERR, "Bad FW image buffer.");
     }
     UpdateFullImageCRC(fim->getBuf(), image_size / 4, isBlankGuids); // size in dwords
 
     // TODO: Do we need the verify ORENK
-    if (!allow_nofs) {
-        if (!imageOps._fwImgInfo.ext_info.is_failsafe) {
+    if (!allow_nofs)
+    {
+        if (!imageOps._fwImgInfo.ext_info.is_failsafe)
+        {
             return errmsg(MLXFW_IMAGE_NOT_FS_ERR, "The given image is not a failsafe image");
         }
 
-        if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize) {
-            return errmsg(MLXFW_FS_INFO_MISMATCH_ERR, "Failsafe chunk sizes in flash (0x%x) and in image (0x%x) are not the same.",
-                          1 << _fwImgInfo.cntxLog2ChunkSize,
-                          1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
+        if (_fwImgInfo.cntxLog2ChunkSize != imageOps._fwImgInfo.cntxLog2ChunkSize)
+        {
+            return errmsg(MLXFW_FS_INFO_MISMATCH_ERR,
+                          "Failsafe chunk sizes in flash (0x%x) and in image (0x%x) are not the same.",
+                          1 << _fwImgInfo.cntxLog2ChunkSize, 1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
         }
     }
 
     u_int32_t max_image_size;
-    if (!GetMaxImageSize(f->get_size(), imageOps._fwImgInfo.ext_info.is_failsafe, \
-                         imageOps._fs2ImgInfo.ext_info.config_sectors, imageOps._fs2ImgInfo.fw_sector_size, max_image_size)) {
+    if (!GetMaxImageSize(f->get_size(), imageOps._fwImgInfo.ext_info.is_failsafe,
+                         imageOps._fs2ImgInfo.ext_info.config_sectors, imageOps._fs2ImgInfo.fw_sector_size,
+                         max_image_size))
+    {
         return false;
     }
-    //printf("-D- max image size : %d, image_size : %d\n",max_image_size, imageOps._fwImgInfo.ext_info.image_size);
+    // printf("-D- max image size : %d, image_size : %d\n",max_image_size, imageOps._fwImgInfo.ext_info.image_size);
     // Check if size of image is OK
-    if (imageOps._fwImgInfo.ext_info.image_size > max_image_size) {
-        const char *image_type = (imageOps._fwImgInfo.ext_info.is_failsafe) ? "failsafe" : "non-failsafe";
-        const char *note_str   = (imageOps._fwImgInfo.ext_info.is_failsafe) ? " - half of total flash size" : " - total flash size";
+    if (imageOps._fwImgInfo.ext_info.image_size > max_image_size)
+    {
+        const char* image_type = (imageOps._fwImgInfo.ext_info.is_failsafe) ? "failsafe" : "non-failsafe";
+        const char* note_str =
+          (imageOps._fwImgInfo.ext_info.is_failsafe) ? " - half of total flash size" : " - total flash size";
 
         return errmsg(MLXFW_IMAGE_TOO_LARGE_ERR, "Size of %s image (0x%x) is greater than max %s image size (0x%x%s)",
                       image_type, imageOps._fwImgInfo.ext_info.image_size, image_type, max_image_size, note_str);
-
     }
 
     u_int32_t new_image_start;
 
-    if (_fwImgInfo.imgStart != 0) {
+    if (_fwImgInfo.imgStart != 0)
+    {
         is_curr_image_in_odd_chunks = 1;
         new_image_start = 0;
-    } else {
+    }
+    else
+    {
         is_curr_image_in_odd_chunks = 0;
         new_image_start = (1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
     }
 
-
-    if (imageOps._fwImgInfo.ext_info.is_failsafe) {
+    if (imageOps._fwImgInfo.ext_info.is_failsafe)
+    {
         f->set_address_convertor(imageOps._fwImgInfo.cntxLog2ChunkSize, !is_curr_image_in_odd_chunks);
-    } else {
+    }
+    else
+    {
         f->set_address_convertor(0, 0);
         new_image_start = 0;
     }
 
     // Go ahead and burn!
-    //const char* image_name = new_image_start == 0 ? "first" : "second";
-    if (!writeImageEx(progressFuncEx, progressUserData, progressFunc, 16, data8 + 16, image_size - 16, false, false, -1, 0, isCpuUtilization, cpuPercent)) {
+    // const char* image_name = new_image_start == 0 ? "first" : "second";
+    if (!writeImageEx(progressFuncEx, progressUserData, progressFunc, 16, data8 + 16, image_size - 16, false, false, -1,
+                      0, isCpuUtilization, cpuPercent))
+    {
         return false;
     }
     // Write new signature
-    if (!f->write(0, data8, 16, true)) {
-        //return false;
+    if (!f->write(0, data8, 16, true))
+    {
+        // return false;
         return errmsg(MLXFW_FLASH_WRITE_ERR, "Flash write failed. %s", f->err());
     }
     bool boot_address_was_updated = true;
     // Write new image start address to crspace (for SW reset)
-    if (!f->update_boot_addr(new_image_start)) {
+    if (!f->update_boot_addr(new_image_start))
+    {
         boot_address_was_updated = false;
     }
 
-    if (imageOps._fwImgInfo.ext_info.is_failsafe) {
-        if (allow_nofs) {
+    if (imageOps._fwImgInfo.ext_info.is_failsafe)
+    {
+        if (allow_nofs)
+        {
             // When burning in nofs, remnant of older image with different chunk size
             // may reside on the flash -
             // Invalidate all images marking on flash except the one we've just burnt
@@ -1028,76 +1171,89 @@ bool Fs2Operations::Fs2FailSafeBurn(Fs2Operations &imageOps,
 
             FindAllImageStart(_ioAccess, cntx_image_start, &cntx_image_num, _cntx_magic_pattern);
             // Address convertor is disabled now - use phys addresses
-            for (u_int32_t i = 0; i < cntx_image_num; i++) {
-                if (cntx_image_start[i] != new_image_start) {
-                    if (!f->write(cntx_image_start[i], &zeroes, sizeof(zeroes), true)) {
-                        //return false;
+            for (u_int32_t i = 0; i < cntx_image_num; i++)
+            {
+                if (cntx_image_start[i] != new_image_start)
+                {
+                    if (!f->write(cntx_image_start[i], &zeroes, sizeof(zeroes), true))
+                    {
+                        // return false;
                         return errmsg(MLXFW_FLASH_WRITE_ERR, "Flash write failed. %s", f->err());
                     }
                 }
             }
-        } else {
+        }
+        else
+        {
             // invalidate previous signature
             f->set_address_convertor(imageOps._fwImgInfo.cntxLog2ChunkSize, is_curr_image_in_odd_chunks);
-            if (!f->write(0, &zeroes, sizeof(zeroes), true)) {
-                //return false;
+            if (!f->write(0, &zeroes, sizeof(zeroes), true))
+            {
+                // return false;
                 return errmsg(MLXFW_FLASH_WRITE_ERR, "Flash write failed. %s", f->err());
             }
         }
     }
-    if (boot_address_was_updated == false) {
+    if (boot_address_was_updated == false)
+    {
         report_warn("Failed to update FW boot address. Power cycle the device in order to load the new FW.\n");
     }
     // on windows send caching command to driver (best effort)
 #ifdef __WIN__
-    if (!burnParams.skipCiReq) {
+    if (!burnParams.skipCiReq)
+    {
         int rc;
         mf_release_semaphore(_ioAccess->getMflashObj());
         rc = wdcif_send_image_cache_request(_ioAccess->getMfileObj());
-        switch (rc) {
-        case WDCIF_STATUS_SUCCESS:
-            burnParams.burnStatus.imageCachedSuccessfully = true;
-            break;
-
-        case WDCIF_STATUS_OPERATION_NOT_SUPPORTED_BY_DRIVER:
-        case WDCIF_STATUS_OPERATION_NOT_SUPPORTED_BY_DEVICE:
-        case WDCIF_STATUS_UNSUPPORTED_DEVICE:
-        case WDCIF_STATUS_UNSUPPORTED_ACCESS_TYPE:
-        case WDCIF_STATUS_FAILED_TO_RETRIEVE_DRIVER_HANDLE:
-            break;
-
-        default:
-            report_warn("Failed to Issue cache request to driver. next driver load may take more time.\n");
+        switch (rc)
+        {
+            case WDCIF_STATUS_SUCCESS:
+                burnParams.burnStatus.imageCachedSuccessfully = true;
+                break;
+
+            case WDCIF_STATUS_OPERATION_NOT_SUPPORTED_BY_DRIVER:
+            case WDCIF_STATUS_OPERATION_NOT_SUPPORTED_BY_DEVICE:
+            case WDCIF_STATUS_UNSUPPORTED_DEVICE:
+            case WDCIF_STATUS_UNSUPPORTED_ACCESS_TYPE:
+            case WDCIF_STATUS_FAILED_TO_RETRIEVE_DRIVER_HANDLE:
+                break;
+
+            default:
+                report_warn("Failed to Issue cache request to driver. next driver load may take more time.\n");
         }
     }
 #endif
     return true;
 }
 
-
 bool Fs2Operations::preFS2PatchGUIDs(bool patch_macs,
                                      bool user_guids,
                                      bool user_macs,
                                      guid_t new_guids[MAX_GUIDS],
                                      guid_t old_guids[MAX_GUIDS],
-                                     guid_t    **used_guids_p,
+                                     guid_t** used_guids_p,
                                      u_int32_t num_of_old_guids)
 {
-    guid_t *used_guids;
+    guid_t* used_guids;
     *used_guids_p = old_guids ? old_guids : new_guids;
 
-    if (new_guids) {
+    if (new_guids)
+    {
         // if only guids or only macs are specified by user, keep the other
         // as currently set of flash. This is in order to simplify transitions between
         // burning IB and ETH FW.
-        if (old_guids && !user_guids) {
-            for (int i = 0; i < GUIDS; i++) {
+        if (old_guids && !user_guids)
+        {
+            for (int i = 0; i < GUIDS; i++)
+            {
                 new_guids[i] = old_guids[i];
             }
         }
 
-        if (old_guids && !user_macs) {
-            for (int i = GUIDS; i < MAX_GUIDS; i++) {
+        if (old_guids && !user_macs)
+        {
+            for (int i = GUIDS; i < MAX_GUIDS; i++)
+            {
                 new_guids[i] = old_guids[i];
             }
         }
@@ -1105,76 +1261,80 @@ bool Fs2Operations::preFS2PatchGUIDs(bool patch_macs,
     }
     used_guids = *used_guids_p;
 
-    if (patch_macs) {
-
+    if (patch_macs)
+    {
         // To ease upgrade from 4 GUIDS format to 4+2 format, or to move from IB to ETH,
         // if macs are not
         // explicitly set in flash, they are derived from the GUIDs according to
         // Mellanox methodology - 48 bit MAC == 64 bit GUID without the middle 16 bits.
 
-        if (old_guids && ((num_of_old_guids == 4) ||
-                          (num_of_old_guids == 6 &&
-                           (old_guids[GUIDS  ].h & 0xffff)     == 0xffff     &&
-                           (old_guids[GUIDS  ].l & 0xffffffff) == 0xffffffff &&
-                           (old_guids[GUIDS + 1].h & 0xffff)     == 0xffff     &&
-                           (old_guids[GUIDS + 1].l & 0xffffffff) == 0xffffffff))) {
-            for (int i = 0; i < MACS; i++) {
-                u_int64_t mac  =  old_guids[i + 1].h >> 8;
+        if (old_guids &&
+            ((num_of_old_guids == 4) ||
+             (num_of_old_guids == 6 && (old_guids[GUIDS].h & 0xffff) == 0xffff &&
+              (old_guids[GUIDS].l & 0xffffffff) == 0xffffffff && (old_guids[GUIDS + 1].h & 0xffff) == 0xffff &&
+              (old_guids[GUIDS + 1].l & 0xffffffff) == 0xffffffff)))
+        {
+            for (int i = 0; i < MACS; i++)
+            {
+                u_int64_t mac = old_guids[i + 1].h >> 8;
                 mac <<= 24;
                 mac |= (old_guids[i + 1].l & 0xffffff);
 
                 old_guids[GUIDS + i].h = u_int32_t(mac >> 32);
-                old_guids[GUIDS + i].l = u_int32_t(mac  & 0xffffffff);
+                old_guids[GUIDS + i].l = u_int32_t(mac & 0xffffffff);
 
-                // printf("-D- Guid " GUID_FORMAT " to MAC "MAC_FORMAT"\n", old_guids[i+1].h, old_guids[i+1].l, old_guids[i+GUIDS].h,old_guids[i+GUIDS].l  );
+                // printf("-D- Guid " GUID_FORMAT " to MAC "MAC_FORMAT"\n", old_guids[i+1].h, old_guids[i+1].l,
+                // old_guids[i+GUIDS].h,old_guids[i+GUIDS].l  );
             }
         }
 
-        guid_t *macs = &used_guids[4];
+        guid_t* macs = &used_guids[4];
 
-        for (int i = 0; i < MACS; i++) {
+        for (int i = 0; i < MACS; i++)
+        {
             u_int64_t mac = (((u_int64_t)macs[i].h) << 32) | macs[i].l;
-            if (!_burnBlankGuids && !CheckMac(mac)) {
-                return errmsg("Bad mac (" MAC_FORMAT ") %s: %s. Please re-burn with a valid -mac flag value.", macs[i].h,
-                              macs[i].l,
-                              user_macs ? "given" : "found on flash", err());
+            if (!_burnBlankGuids && !CheckMac(mac))
+            {
+                return errmsg("Bad mac (" MAC_FORMAT ") %s: %s. Please re-burn with a valid -mac flag value.",
+                              macs[i].h, macs[i].l, user_macs ? "given" : "found on flash", err());
             }
-
         }
     }
 
     return true;
 }
 
-
-void Fs2Operations::patchGUIDsSection(u_int32_t *buf, u_int32_t ind, guid_t guids[MAX_GUIDS], int nguids)
+void Fs2Operations::patchGUIDsSection(u_int32_t* buf, u_int32_t ind, guid_t guids[MAX_GUIDS], int nguids)
 {
     u_int32_t new_buf[MAX_GUIDS * 2] = {0};
 
     // Form new GUID section
-    for (u_int32_t i = 0; i < (u_int32_t)nguids; i++) {
+    for (u_int32_t i = 0; i < (u_int32_t)nguids; i++)
+    {
         new_buf[i * 2] = guids[i].h;
         new_buf[i * 2 + 1] = guids[i].l;
     }
 
     // Patch GUIDs
-    for (u_int32_t i = 0; i < sizeof(new_buf) / sizeof(u_int32_t); ++i) {
+    for (u_int32_t i = 0; i < sizeof(new_buf) / sizeof(u_int32_t); ++i)
+    {
         new_buf[i] = _burnBlankGuids ? 0xffffffff : __cpu_to_be32(new_buf[i]);
     }
     memcpy(&buf[ind / 4], &new_buf[0], nguids * 2 * sizeof(u_int32_t));
 
     // Insert new CRC
-    if (_burnBlankGuids) {
-        buf[ind / 4 + nguids * 2] =  __cpu_to_be32(0xffff);
-    } else {
+    if (_burnBlankGuids)
+    {
+        buf[ind / 4 + nguids * 2] = __cpu_to_be32(0xffff);
+    }
+    else
+    {
         recalcSectionCrc((u_int8_t*)buf + ind - sizeof(GPH), sizeof(GPH) + nguids * 8);
     }
 
 } // patchGUIDsSection
 
-
-
-bool Fs2Operations::patchGUIDs(Fs2Operations&   imageOps,
+bool Fs2Operations::patchGUIDs(Fs2Operations& imageOps,
                                bool patch_macs,
                                bool user_guids,
                                bool user_macs,
@@ -1182,75 +1342,79 @@ bool Fs2Operations::patchGUIDs(Fs2Operations&   imageOps,
                                guid_t old_guids[MAX_GUIDS],
                                u_int32_t num_of_old_guids)
 {
-    guid_t *used_guids = (guid_t*)NULL;
-    u_int32_t       *buf = ((FImage*)imageOps._ioAccess)->getBuf();
+    guid_t* used_guids = (guid_t*)NULL;
+    u_int32_t* buf = ((FImage*)imageOps._ioAccess)->getBuf();
 
     // Call common function
-    if (!preFS2PatchGUIDs(patch_macs, user_guids, user_macs, new_guids, old_guids, &used_guids, num_of_old_guids)) {
+    if (!preFS2PatchGUIDs(patch_macs, user_guids, user_macs, new_guids, old_guids, &used_guids, num_of_old_guids))
+    {
         return false;
     }
     // Path GUIDs section
-    if (imageOps._fs2ImgInfo.guidPtr) {
-        patchGUIDsSection(buf, imageOps._fwImgInfo.imgStart + imageOps._fs2ImgInfo.guidPtr, used_guids, imageOps._fs2ImgInfo.ext_info.guid_num);
+    if (imageOps._fs2ImgInfo.guidPtr)
+    {
+        patchGUIDsSection(buf, imageOps._fwImgInfo.imgStart + imageOps._fs2ImgInfo.guidPtr, used_guids,
+                          imageOps._fs2ImgInfo.ext_info.guid_num);
     }
     return true;
 }
 
-void Fs2Operations::PatchInfoSect(u_int8_t *rawSect, u_int32_t vsdOffs, const char *vsd)
+void Fs2Operations::PatchInfoSect(u_int8_t* rawSect, u_int32_t vsdOffs, const char* vsd)
 {
-
-    u_int32_t vsdSize  = __be32_to_cpu(*((u_int32_t*)(rawSect + sizeof(GPH) + vsdOffs - 4))) & 0xffffff;
+    u_int32_t vsdSize = __be32_to_cpu(*((u_int32_t*)(rawSect + sizeof(GPH) + vsdOffs - 4))) & 0xffffff;
     u_int32_t infoSize = __be32_to_cpu(*((u_int32_t*)(rawSect + 4)));
 
     // byte size;
     infoSize *= 4;
 
-    if (vsd) {
+    if (vsd)
+    {
         u_int32_t len = strlen(vsd);
 
-        if (len > vsdSize) {
+        if (len > vsdSize)
+        {
             report_warn("The given VSD length is too large (%d chars). Truncating to %d chars.\n", len, vsdSize);
             len = vsdSize;
         }
 
-        memset(rawSect + sizeof(GPH) + vsdOffs,  0,   vsdSize );
-        memcpy(rawSect + sizeof(GPH) + vsdOffs,  vsd, len);
+        memset(rawSect + sizeof(GPH) + vsdOffs, 0, vsdSize);
+        memcpy(rawSect + sizeof(GPH) + vsdOffs, vsd, len);
     }
 
     recalcSectionCrc(rawSect, sizeof(GPH) + infoSize);
 }
 
-
-bool Fs2Operations::patchImageVsd(Fs2Operations &imgFwOps, const char *userVsd)
+bool Fs2Operations::patchImageVsd(Fs2Operations& imgFwOps, const char* userVsd)
 {
-    u_int32_t *imgBuf = ((FImage*)(imgFwOps._ioAccess))->getBuf();
-    u_int8_t *imgInfoSect = (u_int8_t*)imgBuf + imgFwOps._fs2ImgInfo.infoSectPtr - sizeof(GPH);
-    const char *vsdToUse = (userVsd && ( strlen(userVsd) <= VSD_LEN )) ? userVsd : (const char*)(this->_fwImgInfo.ext_info.vsd);
+    u_int32_t* imgBuf = ((FImage*)(imgFwOps._ioAccess))->getBuf();
+    u_int8_t* imgInfoSect = (u_int8_t*)imgBuf + imgFwOps._fs2ImgInfo.infoSectPtr - sizeof(GPH);
+    const char* vsdToUse =
+      (userVsd && (strlen(userVsd) <= VSD_LEN)) ? userVsd : (const char*)(this->_fwImgInfo.ext_info.vsd);
     PatchInfoSect(imgInfoSect, imgFwOps._fs2ImgInfo.infoOffs[II_VSD], vsdToUse);
     return true;
 }
 
 /*********************************************************/
 
-
-#define GUID_PTR_OFF    0x34
-#define IMAGE_INFO_PTR  0x2c
-#define IMAGE_SIZE_OFF  0x30
+#define GUID_PTR_OFF 0x34
+#define IMAGE_INFO_PTR 0x2c
+#define IMAGE_SIZE_OFF 0x30
 #define IMAGE_ROM_INDEX 2
 #define CRC_SECT_SIZE 4
 #define TOTAL_SEC_SIZE(data_size) (data_size + sizeof(GPH) + CRC_SECT_SIZE)
-#define COPY_DW(dest, dword) { \
-        CPUTO1(dword); \
+#define COPY_DW(dest, dword)     \
+    {                            \
+        CPUTO1(dword);           \
         memcpy(dest, &dword, 4); \
-}
+    }
 
-#define READ_DW(dw, data) { \
+#define READ_DW(dw, data)             \
+    {                                 \
         dw = (*((u_int32_t*)(data))); \
-        TOCPU1(dw); \
-}
-
+        TOCPU1(dw);                   \
+    }
 
-bool Fs2Operations::CopyData(u_int8_t* &new_image, u_int8_t* &old_image, int copy_size)
+bool Fs2Operations::CopyData(u_int8_t*& new_image, u_int8_t*& old_image, int copy_size)
 {
     memcpy(new_image, old_image, copy_size);
 
@@ -1260,9 +1424,7 @@ bool Fs2Operations::CopyData(u_int8_t* &new_image, u_int8_t* &old_image, int cop
     return true;
 }
 
-
-
-bool Fs2Operations::CopyBoot2(u_int8_t* &new_image_p, u_int8_t* &old_image_p)
+bool Fs2Operations::CopyBoot2(u_int8_t*& new_image_p, u_int8_t*& old_image_p)
 {
     u_int32_t size;
     READ_DW(size, old_image_p + 4);
@@ -1271,12 +1433,11 @@ bool Fs2Operations::CopyBoot2(u_int8_t* &new_image_p, u_int8_t* &old_image_p)
     return true;
 }
 
-bool Fs2Operations::AddNewSect(u_int8_t* &new_image_p, u_int8_t *data, GPH gph, u_int32_t *last_next)
+bool Fs2Operations::AddNewSect(u_int8_t*& new_image_p, u_int8_t* data, GPH gph, u_int32_t* last_next)
 {
-
     int size = gph.size * 4;
 
-    *last_next =  gph.next + sizeof(GPH);
+    *last_next = gph.next + sizeof(GPH);
 
     CPUTOBY(gph);
 
@@ -1292,8 +1453,11 @@ bool Fs2Operations::AddNewSect(u_int8_t* &new_image_p, u_int8_t *data, GPH gph,
     new_image_p = new_image_p + TOTAL_SEC_SIZE(size);
     return true;
 }
-bool Fs2Operations::UpdateRomInImage(u_int8_t *new_image, u_int8_t *old_image, u_int8_t *rom_data, int rom_size,
-                                     int *new_image_size)
+bool Fs2Operations::UpdateRomInImage(u_int8_t* new_image,
+                                     u_int8_t* old_image,
+                                     u_int8_t* rom_data,
+                                     int rom_size,
+                                     int* new_image_size)
 {
     GPH gph;
     u_int32_t header;
@@ -1311,63 +1475,74 @@ bool Fs2Operations::UpdateRomInImage(u_int8_t *new_image, u_int8_t *old_image, u
 
     READ_DW(header, old_image_p);
 
-    if (header < H_FIRST  ||  header >= H_LAST) {
+    if (header < H_FIRST || header >= H_LAST)
+    {
         CopyBoot2(new_image_p, old_image_p);
     }
     next_ptr = old_image_p - old_image;
 
-    last_next =  next_ptr + sizeof(GPH);
+    last_next = next_ptr + sizeof(GPH);
     int sect_index = 0, rom_inserted = 0;
 
     // In this case we need to remove the ROM.
-    if (rom_data == NULL) {
+    if (rom_data == NULL)
+    {
         rom_inserted = 1;
     }
 
-    while (next_ptr && next_ptr != 0xff000000) {
-        u_int8_t *old_section = old_image + next_ptr;
+    while (next_ptr && next_ptr != 0xff000000)
+    {
+        u_int8_t* old_section = old_image + next_ptr;
         gph = (*(GPH*)(old_section));
         TOCPUBY(gph);
         u_int32_t new_image_index = (new_image_p - new_image);
         sect_index++;
-        //printf("-D- new_image_index = %#x,  next_ptr = %#x\n",  new_image_index, next_ptr);
+        // printf("-D- new_image_index = %#x,  next_ptr = %#x\n",  new_image_index, next_ptr);
         next_ptr = gph.next;
-        u_int8_t *data;
+        u_int8_t* data;
 
-        //printf("-D- Before GPH: type = %#x, size = %#x, next = %#x, param = %#x\n", gph.type, gph.size, gph.next, gph.param);
+        // printf("-D- Before GPH: type = %#x, size = %#x, next = %#x, param = %#x\n", gph.type, gph.size, gph.next,
+        // gph.param);
 
-        if (!rom_inserted && (sect_index == IMAGE_ROM_INDEX || gph.type == H_ROM)) {
+        if (!rom_inserted && (sect_index == IMAGE_ROM_INDEX || gph.type == H_ROM))
+        {
             // prepare new ROM.
             GPH new_gph;
-            int rom_whole_size =  TOTAL_SEC_SIZE(rom_size);
+            int rom_whole_size = TOTAL_SEC_SIZE(rom_size);
 
-            data      = rom_data;
-            new_gph.size  = rom_size / 4;
-            new_gph.next  = new_image_index + rom_whole_size;
+            data = rom_data;
+            new_gph.size = rom_size / 4;
+            new_gph.next = new_image_index + rom_whole_size;
             new_gph.param = 0;
-            new_gph.type  = H_ROM;
+            new_gph.type = H_ROM;
 
             AddNewSect(new_image_p, data, new_gph, &last_next);
 
             rom_inserted = 1;
         }
         // If this section is ROM section we will ignore it.
-        if (gph.type == H_ROM) {
+        if (gph.type == H_ROM)
+        {
             continue;
         }
 
         new_image_index = (new_image_p - new_image);
         data = old_section + sizeof(GPH);
-        if (gph.next != 0xff000000) {
+        if (gph.next != 0xff000000)
+        {
             gph.next = new_image_index + TOTAL_SEC_SIZE(gph.size * 4);
         }
 
-        if (gph.type == H_GUID) {
+        if (gph.type == H_GUID)
+        {
             COPY_DW(new_image + GUID_PTR_OFF, last_next);
-        } else if (gph.type == H_IMG_INFO) {
+        }
+        else if (gph.type == H_IMG_INFO)
+        {
             u_int32_ba a = last_next;
             u_int32_t check_sum = 0;
-            for (int i = 0; i < 3; i++) {
+            for (int i = 0; i < 3; i++)
+            {
                 check_sum += a.range(i * 8 + 7, i * 8);
             }
             check_sum = 0x100 - (check_sum % 0x100);
@@ -1379,10 +1554,12 @@ bool Fs2Operations::UpdateRomInImage(u_int8_t *new_image, u_int8_t *old_image, u
     }
     // Update image size.
     u_int32_t size = new_image_p - new_image;
-    /* TODO: reivew this, also deal with if fw is failsafe we should compare with get_size()/2 if not compare with the entire flash size
+    /* TODO: reivew this, also deal with if fw is failsafe we should compare with get_size()/2 if not compare with the
+       entire flash size
        //check if size is bigger than flash
        if (size >=  _fwImgInfo.actuallyFailsafe ? (_ioAccess->get_size()/2) : (_ioAccess->get_size())) {
-        return errmsg("Rom is too big to be integrated with the FW image.(img: %d, flash: %d)", (int)size, (int)_ioAccess->get_size() );
+        return errmsg("Rom is too big to be integrated with the FW image.(img: %d, flash: %d)", (int)size,
+       (int)_ioAccess->get_size() );
        }*/
 
     *new_image_size = size;
@@ -1398,26 +1575,27 @@ bool Fs2Operations::UpdateRomInImage(u_int8_t *new_image, u_int8_t *old_image, u
     return true;
 }
 
-
-
-bool Fs2Operations::IntegrateDevRomInImage(Fs2Operations &imageOps)
+bool Fs2Operations::IntegrateDevRomInImage(Fs2Operations& imageOps)
 {
     u_int32_t rom_size = _romSect.size();
-    FImage *fim = (FImage*)(imageOps._ioAccess);
+    FImage* fim = (FImage*)(imageOps._ioAccess);
     u_int32_t new_image_size = fim->getBufLength() + TOTAL_SEC_SIZE(rom_size);
     vector<u_int8_t> new_data(new_image_size);
     int actual_image_size;
-    //vector<u_int8_t> romWithEndian<>
-    //TOCPUn((u_int8_t*)(&_romSect[0]), rom_size/4);
+    // vector<u_int8_t> romWithEndian<>
+    // TOCPUn((u_int8_t*)(&_romSect[0]), rom_size/4);
 
-    if (fim->getBuf() == NULL) {
+    if (fim->getBuf() == NULL)
+    {
         return errmsg("Bad FW image buffer\n");
     }
 
-    if (!_romSect.empty()) {
+    if (!_romSect.empty())
+    {
         // Compine the image and the rom into new daa
-        if (!UpdateRomInImage((u_int8_t*)(&new_data[0]), (u_int8_t*)(fim->getBuf()),
-                              (u_int8_t*)(&_romSect[0]), rom_size, &actual_image_size)) {
+        if (!UpdateRomInImage((u_int8_t*)(&new_data[0]), (u_int8_t*)(fim->getBuf()), (u_int8_t*)(&_romSect[0]),
+                              rom_size, &actual_image_size))
+        {
             return errmsg("%s", err());
         }
 
@@ -1425,11 +1603,13 @@ bool Fs2Operations::IntegrateDevRomInImage(Fs2Operations &imageOps)
         ((FImage*)(imageOps._ioAccess))->close();
         ((FImage*)(imageOps._ioAccess))->open((u_int32_t*)(&new_data[0]), actual_image_size);
 
-        if (!imageOps.FwVerify((VerifyCallBack)NULL) || !imageOps.Fs2IntQuery()) {
+        if (!imageOps.FwVerify((VerifyCallBack)NULL) || !imageOps.Fs2IntQuery())
+        {
             return errmsg("Internal error: verify/query of image after integrating ROM failed\n");
         }
     }
-    else {
+    else
+    {
         printf("-W- Skipping ROM section handling (ROM section is empty)\n");
     }
 
@@ -1437,76 +1617,97 @@ bool Fs2Operations::IntegrateDevRomInImage(Fs2Operations &imageOps)
 }
 /********************************************************************/
 
-bool Fs2Operations::Fs2Burn(Fs2Operations &imageOps, ExtBurnParams& burnParams)
+bool Fs2Operations::Fs2Burn(Fs2Operations& imageOps, ExtBurnParams& burnParams)
 {
-    if (imageOps.FwType() != FIT_FS2) {
+    if (imageOps.FwType() != FIT_FS2)
+    {
         return errmsg(MLXFW_IMAGE_FORMAT_ERR, "FW image type is not compatible with device (FS2)");
     }
 
-    if (!imageOps.Fs2IntQuery()) {
+    if (!imageOps.Fs2IntQuery())
+    {
         return false;
     }
 
     bool devIntQueryRes = Fs2IntQuery();
 
-    if (!devIntQueryRes && burnParams.burnFailsafe) {
+    if (!devIntQueryRes && burnParams.burnFailsafe)
+    {
         return errmsg("%s, burn cannot be failsafe.", err());
     }
 
     // Check Matching device ID
-    if (!burnParams.noDevidCheck) {
-        if (imageOps._fs2ImgInfo.infoOffs[II_HwDevsId]) {
+    if (!burnParams.noDevidCheck)
+    {
+        if (imageOps._fs2ImgInfo.infoOffs[II_HwDevsId])
+        {
             if (!CheckMatchingHwDevId(_ioAccess->get_dev_id(),
                                       _ioAccess->get_rev_id(),
                                       imageOps._fwImgInfo.supportedHwId,
-                                      imageOps._fwImgInfo.supportedHwIdNum)) {
-                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n", this->err( ));
+                                      imageOps._fwImgInfo.supportedHwIdNum))
+            {
+                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n", this->err());
             }
-        } else if (imageOps._fs2ImgInfo.infoOffs[II_DeviceType]) {
-            if (!CheckMatchingDevId(_ioAccess->get_dev_id(), imageOps._fwImgInfo.ext_info.dev_type)) {
+        }
+        else if (imageOps._fs2ImgInfo.infoOffs[II_DeviceType])
+        {
+            if (!CheckMatchingDevId(_ioAccess->get_dev_id(), imageOps._fwImgInfo.ext_info.dev_type))
+            {
                 return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n", this->err());
             }
         }
-
     }
 
     // Check PSID
-    if (devIntQueryRes && !CheckPSID(imageOps, burnParams.allowPsidChange)) {
+    if (devIntQueryRes && !CheckPSID(imageOps, burnParams.allowPsidChange))
+    {
         return false;
     }
 
     // Check if the burnt FW version is OK
-    if (!CheckFwVersion(imageOps, burnParams.ignoreVersionCheck)) {
+    if (!CheckFwVersion(imageOps, burnParams.ignoreVersionCheck))
+    {
         return false;
     }
 
     // ROM patchs
-    if (((burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST) && (_fwImgInfo.ext_info.roms_info.exp_rom_found)) || // There is ROM in device and user choses ir
-        ((burnParams.burnRomOptions == ExtBurnParams::BRO_DEFAULT) && (!imageOps._fwImgInfo.ext_info.roms_info.exp_rom_found))) {     // No ROM in image
-        if (!IntegrateDevRomInImage(imageOps)) {
+    if (((burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST) &&
+         (_fwImgInfo.ext_info.roms_info.exp_rom_found)) || // There is ROM in device and user choses ir
+        ((burnParams.burnRomOptions == ExtBurnParams::BRO_DEFAULT) &&
+         (!imageOps._fwImgInfo.ext_info.roms_info.exp_rom_found)))
+    { // No ROM in image
+        if (!IntegrateDevRomInImage(imageOps))
+        {
             return false;
         }
     }
 
     // Guids patch
     _burnBlankGuids = burnParams.blankGuids;
-    bool isGuidsSpecified  =  burnParams.userMacsSpecified || burnParams.userGuidsSpecified;
-    if (isGuidsSpecified) {
+    bool isGuidsSpecified = burnParams.userMacsSpecified || burnParams.userGuidsSpecified;
+    if (isGuidsSpecified)
+    {
         // Get the GUIDS/MACsUIDs from the user input
         if (!patchGUIDs(imageOps, true, burnParams.userGuidsSpecified, burnParams.userMacsSpecified,
-                        (guid_t*)(&(burnParams.userUids[0])), _fs2ImgInfo.ext_info.guids, _fs2ImgInfo.ext_info.guid_num)) {
+                        (guid_t*)(&(burnParams.userUids[0])), _fs2ImgInfo.ext_info.guids, _fs2ImgInfo.ext_info.guid_num))
+        {
             return false;
         }
-    } else if (!burnParams.useImageGuids) {
+    }
+    else if (!burnParams.useImageGuids)
+    {
         // Get the GUIDS/MACsUIDs from the device
-        if (!patchGUIDs(imageOps, true, false, false, (guid_t*)NULL,
-                        _fs2ImgInfo.ext_info.guids, _fs2ImgInfo.ext_info.guid_num)) {
+        if (!patchGUIDs(imageOps, true, false, false, (guid_t*)NULL, _fs2ImgInfo.ext_info.guids,
+                        _fs2ImgInfo.ext_info.guid_num))
+        {
             return false;
         }
     }
     // Patch the image VSD file
-    if (burnParams.vsdSpecified || !burnParams.useImagePs) {
-        if (!patchImageVsd(imageOps, burnParams.userVsd)) {
+    if (burnParams.vsdSpecified || !burnParams.useImagePs)
+    {
+        if (!patchImageVsd(imageOps, burnParams.userVsd))
+        {
             return false;
         }
     }
@@ -1515,16 +1716,17 @@ bool Fs2Operations::Fs2Burn(Fs2Operations &imageOps, ExtBurnParams& burnParams)
 
 bool Fs2Operations::Fs2IsMacAvailable()
 {
-
-    if (_fwImgInfo.ext_info.chip_type == CT_IS4) {
+    if (_fwImgInfo.ext_info.chip_type == CT_IS4)
+    {
         return false;
     }
     return true;
 }
 
-bool Fs2Operations::FwBurn(FwOperations *imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
+bool Fs2Operations::FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurn\n");
     }
     ExtBurnParams burnParams = ExtBurnParams();
@@ -1532,34 +1734,36 @@ bool Fs2Operations::FwBurn(FwOperations *imageOps, u_int8_t forceVersion, Progre
     burnParams.progressFunc = progressFunc;
 
     return Fs2Burn((*(Fs2Operations*)imageOps), burnParams);
-
 }
 
-bool Fs2Operations::FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams& burnParams)
+bool Fs2Operations::FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurnAdvanced\n");
     }
     return Fs2Burn((*(Fs2Operations*)imageOps), burnParams);
-
 }
 
-bool Fs2Operations::FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc)
+bool Fs2Operations::FwBurnBlock(FwOperations* imageOps, ProgressCallBack progressFunc)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurnBlock\n");
     }
 
-    FImage *fim = (FImage*)((Fs2Operations*)imageOps)->_ioAccess;
+    FImage* fim = (FImage*)((Fs2Operations*)imageOps)->_ioAccess;
     return writeImage(progressFunc, 0, fim->getBuf(), fim->getBufLength());
 }
 
 bool Fs2Operations::FwReadRom(std::vector<u_int8_t>& romSect)
 {
-    if (!Fs2IntQuery()) {
+    if (!Fs2IntQuery())
+    {
         return false;
     }
-    if (_romSect.empty()) {
+    if (_romSect.empty())
+    {
         return errmsg("The FW does not contain a ROM section");
     }
     romSect = _romSect;
@@ -1584,70 +1788,83 @@ bool Fs2Operations::FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc)
 
 bool Fs2Operations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage)
 {
-    if (sectType != H_FW_CONF && sectType != H_HASH_FILE) {
+    if (sectType != H_FW_CONF && sectType != H_HASH_FILE)
+    {
         return errmsg("Unsupported section type.");
     }
     initSectToRead(sectType);
-    if (!Fs2Verify((VerifyCallBack)NULL, stripedImage)) {
+    if (!Fs2Verify((VerifyCallBack)NULL, stripedImage))
+    {
         return false;
     }
-    if (sectType == H_FW_CONF) {
+    if (sectType == H_FW_CONF)
+    {
         sectInfo = _fwConfSect;
-    } else {
+    }
+    else
+    {
         sectInfo = _hashFileSect;
     }
-    if (sectInfo.empty()) {
+    if (sectInfo.empty())
+    {
         return errmsg("FW section not found in the given image.");
     }
     return true;
 }
 
-bool Fs2Operations::ModifyVSDSection(const char *vsd, ProgressCallBack callBackFunc)
+bool Fs2Operations::ModifyVSDSection(const char* vsd, ProgressCallBack callBackFunc)
 {
     (void)callBackFunc; /* avoid compiler warning*/
     u_int32_t length = _fwImgInfo.lastImageAddr;
     vector<u_int8_t> data(length);
 
     // Read the image.
-    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length)) {
+    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length))
+    {
         return errmsg("Flash/Image read failed. %s", _ioAccess->err());
     }
     // Change the VSD
-    PatchInfoSect((u_int8_t*)(&data[0]) + _fs2ImgInfo.infoSectPtr - sizeof(GPH),
-                  _fs2ImgInfo.infoOffs[II_VSD],
-                  vsd);
+    PatchInfoSect((u_int8_t*)(&data[0]) + _fs2ImgInfo.infoSectPtr - sizeof(GPH), _fs2ImgInfo.infoOffs[II_VSD], vsd);
     // Re-burn the new Image after modifying the VSD
     return ReburnNewImage((u_int8_t*)(&data[0]), "VSD", callBackFunc);
 }
 
-bool Fs2Operations::ReburnNewImage(u_int8_t *data, const char *feature_name, ProgressCallBack callBackFunc)
+bool Fs2Operations::ReburnNewImage(u_int8_t* data, const char* feature_name, ProgressCallBack callBackFunc)
 {
     ExtBurnParams burnParams;
     burnParams.progressFunc = callBackFunc;
     burnParams.burnFailsafe = false;
 
-    u_int32_t length        = _fwImgInfo.lastImageAddr;
-    //char burn_str[100];
+    u_int32_t length = _fwImgInfo.lastImageAddr;
+    // char burn_str[100];
     bool is_image = (_fname != NULL);
     bool needs_repack = (is_image && _fwImgInfo.actuallyFailsafe);
 
     // Burn the Image after modifying the VSD.
 
     // Create a fwOperations object of the modified image
-    FwOperations *newOps = FwOperationsCreate((void*)data, (void*)&length, (char*)NULL, FHT_FW_BUFF, NULL, 0, _fwParams.ignoreCrcCheck);
+    FwOperations* newOps =
+      FwOperationsCreate((void*)data, (void*)&length, (char*)NULL, FHT_FW_BUFF, NULL, 0, _fwParams.ignoreCrcCheck);
 
     // Verify the new image and exit if it's not VALID.
-    if (!((Fs2Operations*)newOps)->Fs2IntQuery()) {
-        return errmsg(MLXFW_IMAGE_CORRUPTED_ERR, "Internal error: The prepared image After modifying the %s is corrupted: %s\n", feature_name, newOps->err());
-    }
-    if (!is_image) {
+    if (!((Fs2Operations*)newOps)->Fs2IntQuery())
+    {
+        return errmsg(MLXFW_IMAGE_CORRUPTED_ERR,
+                      "Internal error: The prepared image After modifying the %s is corrupted: %s\n", feature_name,
+                      newOps->err());
+    }
+    if (!is_image)
+    {
         // Modify the flash
-        if (!Fs2FailSafeBurn(*((Fs2Operations*)newOps), burnParams)) {
+        if (!Fs2FailSafeBurn(*((Fs2Operations*)newOps), burnParams))
+        {
             delete newOps;
             return false;
         }
-    } else {
-        u_int8_t *striped_data = new u_int8_t[length * 2];
+    }
+    else
+    {
+        u_int8_t* striped_data = new u_int8_t[length * 2];
         u_int32_t striped_length;
 
         // Modify the image.
@@ -1659,7 +1876,8 @@ bool Fs2Operations::ReburnNewImage(u_int8_t *data, const char *feature_name, Pro
         packStripedImageData(striped_data, data, length, striped_length, needs_repack, _fwImgInfo.cntxLog2ChunkSize);
 
         // Re-write the image to the file.
-        if (!((FImage*)_ioAccess)->write(0, striped_data, striped_length)) {
+        if (!((FImage*)_ioAccess)->write(0, striped_data, striped_length))
+        {
             delete[] striped_data;
             delete newOps;
             return false;
@@ -1670,81 +1888,89 @@ bool Fs2Operations::ReburnNewImage(u_int8_t *data, const char *feature_name, Pro
     return true;
 }
 
-bool Fs2Operations::packStripedImageData(u_int8_t *striped_data, u_int8_t *normal_data, u_int32_t length, u_int32_t &striped_length,
-                                         bool needs_repack, u_int32_t cntxLog2ChunkSize)
+bool Fs2Operations::packStripedImageData(u_int8_t* striped_data,
+                                         u_int8_t* normal_data,
+                                         u_int32_t length,
+                                         u_int32_t& striped_length,
+                                         bool needs_repack,
+                                         u_int32_t cntxLog2ChunkSize)
 {
-    if (needs_repack) {
+    if (needs_repack)
+    {
         u_int32_t chunk_size = 1 << cntxLog2ChunkSize;
         u_int32_t chunk_num = (length / chunk_size) + 1;
         striped_length = 0;
 
         // Loop which runs over the chunks
-        for (u_int32_t i = 0; i < chunk_num; i++) {
-            u_int32_t normal_index  = i * chunk_size;
+        for (u_int32_t i = 0; i < chunk_num; i++)
+        {
+            u_int32_t normal_index = i * chunk_size;
             u_int32_t striped_index = normal_index * 2;
 
             u_int32_t size = (length - normal_index);
-            u_int8_t *striped_ptr = striped_data + striped_index;
+            u_int8_t* striped_ptr = striped_data + striped_index;
 
             size = (size <= chunk_size) ? size : chunk_size;
             memcpy(striped_ptr, normal_data + normal_index, size);
             striped_length += size;
 
-            if (i != (chunk_num - 1)) {
+            if (i != (chunk_num - 1))
+            {
                 // Add blank chunk after all the chunks instead the last one.
                 memset(striped_ptr + chunk_size, 0xff, chunk_size);
                 striped_length += chunk_size;
             }
         }
-    } else {
+    }
+    else
+    {
         striped_length = length;
         memcpy(striped_data, normal_data, length);
     }
     return true;
-
 }
 
 bool Fs2Operations::ModifyKeySection(guid_t access_key, ProgressCallBack callBackFunc)
 {
-
     u_int32_t length = _fwImgInfo.lastImageAddr;
     vector<u_int8_t> data(length);
 
     // Read the image.
-    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length)) {
+    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length))
+    {
         return errmsg("Flash/Image read failed. %s\n", _ioAccess->err());
     }
 
     // Change the VSD
-    PatchKeySect((u_int32_t*)(&data[0] + _fs2ImgInfo.infoSectPtr - sizeof(GPH)),
-                 _fs2ImgInfo.infoOffs[II_HwAccessKey],
+    PatchKeySect((u_int32_t*)(&data[0] + _fs2ImgInfo.infoSectPtr - sizeof(GPH)), _fs2ImgInfo.infoOffs[II_HwAccessKey],
                  access_key);
     // Re-burn the new Image after modifying the VSD
     return ReburnNewImage((u_int8_t*)(&data[0]), "HW Key", callBackFunc);
 }
 
-void Fs2Operations::PatchKeySect(u_int32_t *buff, u_int32_t keyOff, guid_t hw_key)
+void Fs2Operations::PatchKeySect(u_int32_t* buff, u_int32_t keyOff, guid_t hw_key)
 {
     u_int32_t infoSize = __be32_to_cpu(*(buff + 1));
     u_int32_t sectSize = sizeof(GPH) + infoSize * 4;
 
-    u_int32_t realKeyoff = (keyOff  +  sizeof(GPH)) / 4;
+    u_int32_t realKeyoff = (keyOff + sizeof(GPH)) / 4;
 
     // Update the key in the buffer which is supposed to be burnt into the flash
-    buff[realKeyoff]     = __cpu_to_be32(hw_key.h);
+    buff[realKeyoff] = __cpu_to_be32(hw_key.h);
     buff[realKeyoff + 1] = __cpu_to_be32(hw_key.l);
 
     recalcSectionCrc((u_int8_t*)buff, sectSize);
     return;
 }
 
-bool Fs2Operations::ModifyGuidSection(guid_t *user_guids, ProgressCallBack progressFunc)
+bool Fs2Operations::ModifyGuidSection(guid_t* user_guids, ProgressCallBack progressFunc)
 {
     u_int32_t length = _fwImgInfo.lastImageAddr;
     vector<u_int8_t> data(length);
 
     // Read the image.
-    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length)) {
+    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length))
+    {
         return errmsg("Flash/Image read failed: %s\n", _ioAccess->err());
     }
     // Change the GUIDs section according to the user given GUIDs
@@ -1757,50 +1983,58 @@ bool Fs2Operations::Fs2SetGuidsForBlank(sg_params_t& sgParam)
 {
     // There is blank GUIDs on the device (not image)
     u_int32_t guid_sect_addr[2] = {0};
-    u_int32_t length  = _fwImgInfo.ext_info.image_size;
-    if (!_ioAccess->is_flash()) {
+    u_int32_t length = _fwImgInfo.ext_info.image_size;
+    if (!_ioAccess->is_flash())
+    {
         return errmsg("Image file is not supported.");
     }
 
-
     guid_sect_addr[0] = _fs2ImgInfo.guidPtr;
 
-    for (int i = 0; i < 2 && guid_sect_addr[i]; i++) {
+    for (int i = 0; i < 2 && guid_sect_addr[i]; i++)
+    {
         u_int32_t guid_sect[MAX_GUIDS * 2 + 5]; // Save room for header + crc
 
-        if (!_ioAccess->read(guid_sect_addr[i] - 16, guid_sect, 16)) {
+        if (!_ioAccess->read(guid_sect_addr[i] - 16, guid_sect, 16))
+        {
             return errmsg("Failed to read guids section - flash read error (%s)\n", _ioAccess->err());
         }
         // we have blank guids so make sure we have ffff in sgParams.userGuids in the correct pos
-        if (!sgParam.guidsSpecified) {
+        if (!sgParam.guidsSpecified)
+        {
             memset(&sgParam.userGuids[0], 0xff, (sizeof(guid_t)) * GUIDS);
         }
-        if (!sgParam.macsSpecified) {
+        if (!sgParam.macsSpecified)
+        {
             memset(&sgParam.userGuids[GUIDS], 0xff, (sizeof(guid_t)) * MACS);
         }
         //  patchGUIDsSection(u_int32_t *buf, u_int32_t ind, guid_t guids[MAX_GUIDS], int nguids)
         patchGUIDsSection(guid_sect, 16, &sgParam.userGuids[0], _fs2ImgInfo.ext_info.guid_num);
 
-        if (!_ioAccess->write(guid_sect_addr[i], guid_sect + 4, _fs2ImgInfo.ext_info.guid_num * 8 + 4, true)) {
+        if (!_ioAccess->write(guid_sect_addr[i], guid_sect + 4, _fs2ImgInfo.ext_info.guid_num * 8 + 4, true))
+        {
             return errmsg("flash write error (%s)\n", _ioAccess->err());
         }
     }
-    if (sgParam.updateCrc) {
+    if (sgParam.updateCrc)
+    {
         // Read the image.
         vector<u_int8_t> data(length);
 
-        if (!_ioAccess->read(0, (u_int32_t*)(&data[0]), length)) {
+        if (!_ioAccess->read(0, (u_int32_t*)(&data[0]), length))
+        {
             return errmsg("Flash read failed: %s\n", _ioAccess->err());
         }
         // TODO: Do we need to update the CRC existing ORENK
         // Calc & Update CRC.
-        u_int32_t *new_data =  (u_int32_t*)(&data[0]);
+        u_int32_t* new_data = (u_int32_t*)(&data[0]);
         u_int32_t crc = CalcImageCRC(new_data, length / 4);
         u_int32_ba old_dw = __be32_to_cpu(new_data[IMG_CRC_OFF / 4]);
-        old_dw.range(15, 0) =  crc;
+        old_dw.range(15, 0) = crc;
         u_int32_t new_crc_dw = CPUTO1(old_dw);
 
-        if (!_ioAccess->write(IMG_CRC_OFF, &new_crc_dw, 4, true)) {
+        if (!_ioAccess->write(IMG_CRC_OFF, &new_crc_dw, 4, true))
+        {
             return errmsg(MLXFW_FLASH_WRITE_ERR, "flash write error (%s).", _ioAccess->err());
         }
     }
@@ -1815,109 +2049,124 @@ bool Fs2Operations::Fs2SetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc
     bool ib_dev, eth_dev;
     // Get the FW types
     SetDevFlags(_fwImgInfo.ext_info.chip_type, _fwImgInfo.ext_info.dev_type, FIT_FS2, ib_dev, eth_dev);
-    guid_t *old_guids = _fwImgInfo.imageOk ? _fs2ImgInfo.ext_info.guids : (guid_t*)NULL;
-    guid_t *used_guids = (guid_t*)NULL;
+    guid_t* old_guids = _fwImgInfo.imageOk ? _fs2ImgInfo.ext_info.guids : (guid_t*)NULL;
+    guid_t* used_guids = (guid_t*)NULL;
 
     // Patch the GUIDs and prints any needed warnings
 
-    //resize our user guids vector to MAX_GUIDS
+    // resize our user guids vector to MAX_GUIDS
     sgParam.userGuids.resize(MAX_GUIDS);
 
-    if (!preFS2PatchGUIDs(eth_dev, sgParam.guidsSpecified, sgParam.macsSpecified, &sgParam.userGuids[0],
-                          old_guids, &used_guids, _fs2ImgInfo.ext_info.guid_num)) {
+    if (!preFS2PatchGUIDs(eth_dev, sgParam.guidsSpecified, sgParam.macsSpecified, &sgParam.userGuids[0], old_guids,
+                          &used_guids, _fs2ImgInfo.ext_info.guid_num))
+    {
         return false;
     }
 
     // Modify the guids in the burnt image and re-burn it
-    if (!ModifyGuidSection(used_guids, progressFunc)) {
+    if (!ModifyGuidSection(used_guids, progressFunc))
+    {
         return false;
     }
     return true;
 }
 
-bool Fs2Operations::FwSetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc,
-                               ProgressCallBack progressFunc)
+bool Fs2Operations::FwSetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc, ProgressCallBack progressFunc)
 {
     /* avoid annoying mingw warnings*/
     (void)callBackFunc;
     (void)progressFunc;
 
-    if (!Fs2IntQuery(true, sgParam.stripedImage)) {
+    if (!Fs2IntQuery(true, sgParam.stripedImage))
+    {
         return false;
     }
-    if (sgParam.userGuids.size() != MAX_GUIDS) {
+    if (sgParam.userGuids.size() != MAX_GUIDS)
+    {
         return errmsg("invalid userGuid vector size given in sgParams.");
     }
-    if (_fs2ImgInfo.ext_info.blank_guids) {
+    if (_fs2ImgInfo.ext_info.blank_guids)
+    {
         return Fs2SetGuidsForBlank(sgParam);
     }
     return Fs2SetGuids(sgParam, callBackFunc, progressFunc);
 }
 
-
-bool Fs2Operations::FwBurnRom(FImage *romImg, bool ignoreProdIdCheck, bool ignoreDevidCheck, ProgressCallBack progressFunc)
+bool Fs2Operations::FwBurnRom(FImage* romImg,
+                              bool ignoreProdIdCheck,
+                              bool ignoreDevidCheck,
+                              ProgressCallBack progressFunc)
 {
     ExtBurnParams burnParams;
     burnParams.progressFunc = progressFunc;
     burnParams.burnFailsafe = false;
 
     // we dont support adding rom to an image just yet
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         return errmsg("Burn ROM not supported for FS2 image.");
     }
-    //make sure we dont get fwImage instead of rom file
+    // make sure we dont get fwImage instead of rom file
 
     u_int32_t cntx_image_start[CNTX_START_POS_SIZE];
     u_int32_t cntx_image_num;
     FindAllImageStart(romImg, cntx_image_start, &cntx_image_num, _cntx_magic_pattern);
-    if (cntx_image_num != 0) {
+    if (cntx_image_num != 0)
+    {
         return errmsg("Expecting an expansion ROM image, received Mellanox FW image.");
     }
 
-    if (!Fs2IntQuery()) {
+    if (!Fs2IntQuery())
+    {
         return false;
     }
 
-    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX) {
+    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX)
+    {
         // TODO: Indicate the device name.
         return errmsg("Unsupported device type %d", _fwImgInfo.ext_info.dev_type);
     }
 
-    if (_romSect.empty()
-            && !IsFwSupportingRomModify(
-                    FwVersion(createFwVersion(&_fwImgInfo.ext_info)))) {
-        return errmsg("It is not allowed to burn ROM on device which has fw: %d.%d.%d that doesn't contain ROM.", _fwImgInfo.ext_info.fw_ver[0],
-                      _fwImgInfo.ext_info.fw_ver[1], _fwImgInfo.ext_info.fw_ver[2]);
+    if (_romSect.empty() && !IsFwSupportingRomModify(FwVersion(createFwVersion(&_fwImgInfo.ext_info))))
+    {
+        return errmsg("It is not allowed to burn ROM on device which has fw: %d.%d.%d that doesn't contain ROM.",
+                      _fwImgInfo.ext_info.fw_ver[0], _fwImgInfo.ext_info.fw_ver[1], _fwImgInfo.ext_info.fw_ver[2]);
     }
 
-    if (!ignoreProdIdCheck && _fs2ImgInfo.infoOffs[II_ProductVer]) {
+    if (!ignoreProdIdCheck && _fs2ImgInfo.infoOffs[II_ProductVer])
+    {
         return errmsg("The device FW contains common FW/ROM Product Version - The ROM cannot be updated separately.");
     }
-    u_int32_t length        = _fwImgInfo.lastImageAddr;
+    u_int32_t length = _fwImgInfo.lastImageAddr;
     u_int32_t new_data_size = length + TOTAL_SEC_SIZE(romImg->getBufLength());
     vector<u_int8_t> data(length);
     vector<u_int8_t> new_data(new_data_size);
 
     // Read the image.
-    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length)) {
+    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length))
+    {
         return errmsg("Flash read failed: %s", _ioAccess->err());
     }
 
     u_int32_t new_image_size;
 
     // Insert the rom to the image.
-    if (!UpdateRomInImage((u_int8_t*)(&new_data[0]), (u_int8_t*)(&data[0]),
-                          (u_int8_t*)romImg->getBuf(), romImg->getBufLength(),
-                          (int*)&new_image_size)) {
+    if (!UpdateRomInImage((u_int8_t*)(&new_data[0]), (u_int8_t*)(&data[0]), (u_int8_t*)romImg->getBuf(),
+                          romImg->getBufLength(), (int*)&new_image_size))
+    {
         return false;
     }
     // open the image
-    FwOperations *newOps = FwOperationsCreate((void*)&new_data[0], (void*)&new_image_size, (char*)NULL, FHT_FW_BUFF, NULL, 0, _fwParams.ignoreCrcCheck);
-    if (!newOps) {
+    FwOperations* newOps = FwOperationsCreate((void*)&new_data[0], (void*)&new_image_size, (char*)NULL, FHT_FW_BUFF,
+                                              NULL, 0, _fwParams.ignoreCrcCheck);
+    if (!newOps)
+    {
         return errmsg("Internal error: The prepared image is corrupted.");
     }
 
-    if (!((Fs2Operations*)newOps)->Fs2Verify((VerifyCallBack)NULL, false, false, false, true) || !((Fs2Operations*)newOps)->Fs2Query()) {
+    if (!((Fs2Operations*)newOps)->Fs2Verify((VerifyCallBack)NULL, false, false, false, true) ||
+        !((Fs2Operations*)newOps)->Fs2Query())
+    {
         errmsg("Internal error: The prepared image is corrupted: %s", newOps->err());
         newOps->FwCleanUp();
         delete newOps;
@@ -1927,10 +2176,12 @@ bool Fs2Operations::FwBurnRom(FImage *romImg, bool ignoreProdIdCheck, bool ignor
     fw_info_t info;
     info.fw_type = FIT_FS2;
     info.fw_info = ((Fs2Operations*)newOps)->_fwImgInfo.ext_info;
-    //no need to init the fs2_info part of fw_info_t as the function doesnt use it.
+    // no need to init the fs2_info part of fw_info_t as the function doesnt use it.
 
-    if (!ignoreDevidCheck && !FwOperations::checkMatchingExpRomDevId(info)) {
-        errmsg("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", ((Fs2Operations*)newOps)->_fwImgInfo.ext_info.dev_type, \
+    if (!ignoreDevidCheck && !FwOperations::checkMatchingExpRomDevId(info))
+    {
+        errmsg("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n",
+               ((Fs2Operations*)newOps)->_fwImgInfo.ext_info.dev_type,
                ((Fs2Operations*)newOps)->_fwImgInfo.ext_info.roms_info.exp_rom_com_devid);
         newOps->FwCleanUp();
         delete newOps;
@@ -1950,53 +2201,64 @@ bool Fs2Operations::FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progres
     burnParams.burnFailsafe = false;
 
     // we dont support delete rom in FS2 image yet
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         return errmsg("Delete ROM not supported for FS2 image.");
     }
     // Verify to get some parameters
-    if (!Fs2IntQuery()) {
+    if (!Fs2IntQuery())
+    {
         return false;
     }
 
-    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX) {
+    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX)
+    {
         // TODO: Indicate the device name.
         return errmsg("Unsupported device type %d", _fwImgInfo.ext_info.dev_type);
     }
-    if (_romSect.empty()) {
+    if (_romSect.empty())
+    {
         return errmsg("The FW does not contain a ROM section.");
     }
 
-    if (!IsFwSupportingRomModify(FwVersion(createFwVersion(&_fwImgInfo.ext_info)))) {
+    if (!IsFwSupportingRomModify(FwVersion(createFwVersion(&_fwImgInfo.ext_info))))
+    {
         return errmsg("Unsupported Fw version (%d.%d.%d).", _fwImgInfo.ext_info.fw_ver[0],
                       _fwImgInfo.ext_info.fw_ver[1], _fwImgInfo.ext_info.fw_ver[2]);
     }
 
-    if (!ignoreProdIdCheck && _fs2ImgInfo.infoOffs[II_ProductVer]) {
+    if (!ignoreProdIdCheck && _fs2ImgInfo.infoOffs[II_ProductVer])
+    {
         return errmsg("The device FW contains common FW/ROM Product Version - The ROM cannot be removed separately.\n");
     }
 
-    u_int32_t length        = _fwImgInfo.lastImageAddr;
+    u_int32_t length = _fwImgInfo.lastImageAddr;
     vector<u_int8_t> data(length);
     vector<u_int8_t> new_data(length);
 
     // Read the image.
-    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length)) {
+    if (!_ioAccess->read(0, (u_int8_t*)(&data[0]), length))
+    {
         return errmsg("Flash read failed: %s\n", _ioAccess->err());
     }
     int new_image_size;
-    if (!UpdateRomInImage((u_int8_t*)(&new_data[0]), (u_int8_t*)(&data[0]),
-                          (u_int8_t*)NULL, 0, &new_image_size)) {
+    if (!UpdateRomInImage((u_int8_t*)(&new_data[0]), (u_int8_t*)(&data[0]), (u_int8_t*)NULL, 0, &new_image_size))
+    {
         return errmsg("%s", _ioAccess->err());
     }
 
     // Burn the Image after the ROM was removed.
-    FwOperations *newOps = FwOperationsCreate((void*)&new_data[0], (void*)&new_image_size, (char*)NULL, FHT_FW_BUFF, NULL, 0, _fwParams.ignoreCrcCheck);
-    if (!newOps) {
+    FwOperations* newOps = FwOperationsCreate((void*)&new_data[0], (void*)&new_image_size, (char*)NULL, FHT_FW_BUFF,
+                                              NULL, 0, _fwParams.ignoreCrcCheck);
+    if (!newOps)
+    {
         return errmsg("Internal error: The prepared image after removing the ROM is corrupted.");
     }
 
     // To verify the new image and exit if it's not VALID.
-    if (!((Fs2Operations*)newOps)->Fs2Verify((VerifyCallBack)NULL, false, false, false, true) || !((Fs2Operations*)newOps)->Fs2Query()) {
+    if (!((Fs2Operations*)newOps)->Fs2Verify((VerifyCallBack)NULL, false, false, false, true) ||
+        !((Fs2Operations*)newOps)->Fs2Query())
+    {
         errmsg("Internal error: The prepared image after removing the ROM is corrupted: %s", newOps->err());
         newOps->FwCleanUp();
         delete newOps;
@@ -2008,34 +2270,39 @@ bool Fs2Operations::FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progres
     return rc;
 }
 
-bool Fs2Operations::FwSetVSD(char *vsdStr, ProgressCallBack progressFunc, PrintCallBack printFunc)
+bool Fs2Operations::FwSetVSD(char* vsdStr, ProgressCallBack progressFunc, PrintCallBack printFunc)
 {
     // avoid compiler warrnings
     (void)printFunc;
     //
-    if (!Fs2IntQuery()) {
+    if (!Fs2IntQuery())
+    {
         return false;
     }
-    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX) {
+    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX)
+    {
         // TODO: Indicate the device name.
         return errmsg("Unsupported device type %d", _fwImgInfo.ext_info.dev_type);
     }
 
-    if (!_fs2ImgInfo.infoOffs[II_VSD]) {
+    if (!_fs2ImgInfo.infoOffs[II_VSD])
+    {
         return errmsg("No info section on the image.");
     }
 
-    if (strlen(vsdStr) > VSD_LEN) {
+    if (strlen(vsdStr) > VSD_LEN)
+    {
         return errmsg("VSD string is too long(%d), max allowed length: %d", (int)strlen(vsdStr), VSD_LEN);
     }
 
-    if (!ModifyVSDSection(vsdStr, progressFunc)) {
+    if (!ModifyVSDSection(vsdStr, progressFunc))
+    {
         return false;
     }
     return true;
 }
 
-bool Fs2Operations::FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc)
+bool Fs2Operations::FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc)
 {
     // avoid compiler warrnings
     (void)vpdFileStr;
@@ -2047,42 +2314,49 @@ bool Fs2Operations::FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFu
 {
     /*avoid compiler warning*/
     (void)progressFunc;
-    if (!Fs2IntQuery()) {
+    if (!Fs2IntQuery())
+    {
         return false;
     }
-    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX) {
+    if (_fwImgInfo.ext_info.chip_type != CT_CONNECTX)
+    {
         // TODO: Indicate the device name.
         return errmsg("Unsupported device type %d", _fwImgInfo.ext_info.dev_type);
     }
 
-    if (!_fs2ImgInfo.infoOffs[II_HwAccessKey]) {
+    if (!_fs2ImgInfo.infoOffs[II_HwAccessKey])
+    {
         return errmsg("The image does not support this operation.");
     }
 
-    if (!ModifyKeySection(userKey, progressFunc)) {
+    if (!ModifyKeySection(userKey, progressFunc))
+    {
         return false;
     }
     return true;
-
 }
 
 bool Fs2Operations::FwResetNvData()
 {
-
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         return errmsg("Cannot perform operation on Image");
     }
 
-    if (!Fs2IntQuery()) {
+    if (!Fs2IntQuery())
+    {
         return false;
     }
     u_int32_t devId = _ioAccess->get_dev_id();
-    if (devId != CX3_HW_ID && devId != CX3_PRO_HW_ID) {
+    if (devId != CX3_HW_ID && devId != CX3_PRO_HW_ID)
+    {
         // TODO: Indicate the device name.
-        return errmsg("Unsupported device type(%d). Can only perform operation on CX3/CX3-PRO ", _fwImgInfo.ext_info.dev_type);
+        return errmsg("Unsupported device type(%d). Can only perform operation on CX3/CX3-PRO ",
+                      _fwImgInfo.ext_info.dev_type);
     }
 
-    if (_fs2ImgInfo.fw_sector_size == 0) {// if fw was generated with old mft i.e without the fw_sector_size than we dont allow this operation
+    if (_fs2ImgInfo.fw_sector_size == 0)
+    { // if fw was generated with old mft i.e without the fw_sector_size than we dont allow this operation
         return errmsg("Firmware was generated with old MFT, please use MFT-3.6.0 or above");
     }
 
@@ -2093,28 +2367,36 @@ bool Fs2Operations::FwResetNvData()
     u_int32_t reservedArea = _fs2ImgInfo.ext_info.config_sectors * fwSectorSz;
     reservedArea = reservedArea > MAX_CONFIG_AREA_SIZE ? MAX_CONFIG_AREA_SIZE : reservedArea;
     u_int32_t configBaseAddr;
-    if (_fwImgInfo.actuallyFailsafe) {
-        configBaseAddr = availFlashSize  - (reservedArea + _fs2ImgInfo.ext_info.config_pad * fwSectorSz);
-    } else {
+    if (_fwImgInfo.actuallyFailsafe)
+    {
+        configBaseAddr = availFlashSize - (reservedArea + _fs2ImgInfo.ext_info.config_pad * fwSectorSz);
+    }
+    else
+    {
         // For non FS image, there's an optional offset + 2 consecutive config areas
         configBaseAddr = availFlashSize - (reservedArea * 2 + (_fs2ImgInfo.ext_info.config_pad * fwSectorSz));
     }
 
-    //printf("-D- config_sectors:0x%x config_pads: 0x%x , sector_size:0x%x, configBaseAddr:0x%x, flashSize:0x%x\n",
+    // printf("-D- config_sectors:0x%x config_pads: 0x%x , sector_size:0x%x, configBaseAddr:0x%x, flashSize:0x%x\n",
     //_fs2ImgInfo.ext_info.config_sectors, _fs2ImgInfo.ext_info.config_pad, fwSectorSz,configBaseAddr, availFlashSize);
 
-    //erase addresses : [configBaseAddr..AvailFlashSize]
+    // erase addresses : [configBaseAddr..AvailFlashSize]
     _ioAccess->set_flash_working_mode(Flash::Fwm_Default);
     u_int32_t sectorSize = _ioAccess->get_sector_size();
     u_int32_t configEndAddr = availFlashSize - (_fs2ImgInfo.ext_info.config_pad * fwSectorSz);
-    for (u_int32_t eraseAddr = configBaseAddr; eraseAddr < configEndAddr; eraseAddr += sectorSize) {
-        if (!_ioAccess->erase_sector(eraseAddr)) {
+    for (u_int32_t eraseAddr = configBaseAddr; eraseAddr < configEndAddr; eraseAddr += sectorSize)
+    {
+        if (!_ioAccess->erase_sector(eraseAddr))
+        {
             return errmsg("failed to erase configuration address: 0x%x. %s", eraseAddr, _ioAccess->err());
         }
-        if (_fwImgInfo.actuallyFailsafe) { // erase config sectors on the other half aswell
+        if (_fwImgInfo.actuallyFailsafe)
+        { // erase config sectors on the other half aswell
             _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, !(_fwImgInfo.imgStart != 0));
-            if (!_ioAccess->erase_sector(eraseAddr)) {
-                _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, (_fwImgInfo.imgStart != 0));;
+            if (!_ioAccess->erase_sector(eraseAddr))
+            {
+                _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, (_fwImgInfo.imgStart != 0));
+                ;
                 return errmsg("failed to erase configuration address: 0x%x. %s", eraseAddr, _ioAccess->err());
             }
             // restore address converter
@@ -2122,7 +2404,6 @@ bool Fs2Operations::FwResetNvData()
         }
     }
     return true;
-
 }
 
 bool Fs2Operations::FwShiftDevData(PrintCallBack progressFunc)
@@ -2144,12 +2425,16 @@ bool Fs2Operations::FwCalcMD5(u_int8_t md5sum[16])
     return errmsg("Operation not supported");
 #else
     // no support for striped image ATM
-    if (!Fs2IntQuery(true, false)) {
+    if (!Fs2IntQuery(true, false))
+    {
         return false;
     }
-    if (_fwImgInfo.ext_info.is_failsafe && _fwImgInfo.actuallyFailsafe) {
+    if (_fwImgInfo.ext_info.is_failsafe && _fwImgInfo.actuallyFailsafe)
+    {
         _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
-    } else {
+    }
+    else
+    {
         _ioAccess->set_address_convertor(0, 0);
     }
     // read entire flash
diff --git a/mlxfwops/lib/fs2_ops.h b/mlxfwops/lib/fs2_ops.h
old mode 100755
new mode 100644
index 099361ea..bd4a9e8d
--- a/mlxfwops/lib/fs2_ops.h
+++ b/mlxfwops/lib/fs2_ops.h
@@ -31,84 +31,97 @@
  * SOFTWARE.
  */
 
-
 #ifndef FS2_OPS_
 #define FS2_OPS_
 
 #include "fw_ops.h"
-#define FULL_VERIFY         0xff
-
+#define FULL_VERIFY 0xff
 
-class Fs2Operations : public FwOperations {
+class Fs2Operations : public FwOperations
+{
 public:
-    Fs2Operations(FBase *ioAccess) :
-        FwOperations(ioAccess), _burnBlankGuids(false), _isFullVerify(false){};
-
-    virtual ~Fs2Operations()  {};
-    //virtual void print_type() {};
-    virtual bool FwQuery(fw_info_t *fwInfo, bool readRom = true, bool isStripedImage = false, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
-    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage = false, bool showItoc = false, bool ignoreDToc = false);
-
-    virtual bool FwBurn(FwOperations *imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
-    virtual bool FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams& burnParams);
-    virtual bool FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc);
-
-    virtual bool FwBurnRom(FImage *romImg, bool ignoreProdIdCheck = false, bool ignoreDevidCheck = false,
+    Fs2Operations(FBase* ioAccess) : FwOperations(ioAccess), _burnBlankGuids(false), _isFullVerify(false){};
+
+    virtual ~Fs2Operations(){};
+    // virtual void print_type() {};
+    virtual bool FwQuery(fw_info_t* fwInfo,
+                         bool readRom = true,
+                         bool isStripedImage = false,
+                         bool quickQuery = true,
+                         bool ignoreDToc = false,
+                         bool verbose = false);
+    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc,
+                          bool isStripedImage = false,
+                          bool showItoc = false,
+                          bool ignoreDToc = false);
+
+    virtual bool
+      FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    virtual bool FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams);
+    virtual bool FwBurnBlock(FwOperations* imageOps, ProgressCallBack progressFunc);
+
+    virtual bool FwBurnRom(FImage* romImg,
+                           bool ignoreProdIdCheck = false,
+                           bool ignoreDevidCheck = false,
                            ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     virtual bool FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
 
-    // virtual bool FwSetGuids(std::vector<guid_t>& userGuids, std::vector<guid_t>& userMacs, bool updateCrc=true, PrintCallBack callBackFunc=(PrintCallBack)NULL);
-    virtual bool FwSetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc = (PrintCallBack)NULL, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    // virtual bool FwSetGuids(std::vector<guid_t>& userGuids, std::vector<guid_t>& userMacs, bool updateCrc=true,
+    // PrintCallBack callBackFunc=(PrintCallBack)NULL);
+    virtual bool FwSetGuids(sg_params_t& sgParam,
+                            PrintCallBack callBackFunc = (PrintCallBack)NULL,
+                            ProgressCallBack progressFunc = (ProgressCallBack)NULL);
 
     virtual bool FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL);
-    virtual bool FwSetVSD(char *vsdStr, ProgressCallBack progressFunc = (ProgressCallBack)NULL, PrintCallBack printFunc = (PrintCallBack)NULL);
-    virtual bool FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetVSD(char* vsdStr,
+                          ProgressCallBack progressFunc = (ProgressCallBack)NULL,
+                          PrintCallBack printFunc = (PrintCallBack)NULL);
+    virtual bool FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     virtual bool FwShiftDevData(PrintCallBack progressFunc = (PrintCallBack)NULL);
     virtual bool FwResetNvData();
-    virtual const char*  FwGetResetRecommandationStr();
+    virtual const char* FwGetResetRecommandationStr();
 
     virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false);
 
-
-
     virtual u_int8_t FwType();
     virtual bool FwInit();
-    virtual bool FwReadData(void *image, u_int32_t *image_size, bool verbose = false);
+    virtual bool FwReadData(void* image, u_int32_t* image_size, bool verbose = false);
     virtual bool FwReadRom(std::vector<u_int8_t>& romSect);
     virtual bool FwCalcMD5(u_int8_t md5sum[16]);
 
-    bool FwCheckIfWeCanBurnWithFwControl(FwOperations*) {return false;}
+    bool FwCheckIfWeCanBurnWithFwControl(FwOperations*) { return false; }
 
 private:
-
-    enum Fs2ImageInfoTags {
-        II_IiFormatRevision   = 0,
-        II_FwVersion          = 1,
-        II_FwBuildTime        = 2,
-        II_DeviceType         = 3,
-        II_PSID               = 4,
-        II_VSD                = 5,
-        II_SuppurtedPsids     = 6,
-        II_ProductVer         = 7,
-        II_VsdVendorId        = 8,
-        II_IsGa               = 9,
-        II_HwDevsId           = 10,
-        II_MicVersion         = 11,
-        II_MinFitVersion      = 12,
-        II_HwAccessKey        = 13,
-        II_PROFILES_LIST      = 14,
-        II_SUPPORTED_PROFS    = 15,
-        II_CONFIG_INFO        = 16,
-        II_TLVS_FORMAT        = 17,
-        II_TRACER_HASH        = 18,
-        II_ConfigArea         = 19,
-        II_PSInfo             = 20,
-        II_Last,              // Mark the end of used tag ids
-        II_End                = 0xff
+    enum Fs2ImageInfoTags
+    {
+        II_IiFormatRevision = 0,
+        II_FwVersion = 1,
+        II_FwBuildTime = 2,
+        II_DeviceType = 3,
+        II_PSID = 4,
+        II_VSD = 5,
+        II_SuppurtedPsids = 6,
+        II_ProductVer = 7,
+        II_VsdVendorId = 8,
+        II_IsGa = 9,
+        II_HwDevsId = 10,
+        II_MicVersion = 11,
+        II_MinFitVersion = 12,
+        II_HwAccessKey = 13,
+        II_PROFILES_LIST = 14,
+        II_SUPPORTED_PROFS = 15,
+        II_CONFIG_INFO = 16,
+        II_TLVS_FORMAT = 17,
+        II_TRACER_HASH = 18,
+        II_ConfigArea = 19,
+        II_PSInfo = 20,
+        II_Last, // Mark the end of used tag ids
+        II_End = 0xff
     };
-    struct Fs2ImgInfo {
+    struct Fs2ImgInfo
+    {
         // Constructor for accurate initialization
         // Since this struct includes vectors it raises a warning when using memset on it
         Fs2ImgInfo() :
@@ -141,55 +154,83 @@ class Fs2Operations : public FwOperations {
         u_int32_t infoSectPtr;
         u_int32_t guidPtr;
         u_int32_t fw_sector_size;
-
     };
 
-
-    bool Fs2Verify(VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL, bool is_striped_image = false, bool both_images = false,
-                   bool only_get_start = false, bool ignore_full_image_crc = false, bool force_no_striped_image = false);
+    bool Fs2Verify(VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL,
+                   bool is_striped_image = false,
+                   bool both_images = false,
+                   bool only_get_start = false,
+                   bool ignore_full_image_crc = false,
+                   bool force_no_striped_image = false);
     bool Fs2Query();
-    bool Fs2Burn(Fs2Operations &imageOps, ExtBurnParams& burnParams);
-
+    bool Fs2Burn(Fs2Operations& imageOps, ExtBurnParams& burnParams);
 
     bool CntxGetFsData(u_int32_t fs_info_word, bool& fs_en, u_int32_t& log2chunk_size);
-    bool checkList(u_int32_t offs, u_int32_t fw_start, const char *pref, VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
-    bool checkGen(u_int32_t beg, u_int32_t offs, u_int32_t& next, const char *pref, VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
-    bool ParseInfoSect(u_int8_t *buff, u_int32_t byteSize);
+    bool checkList(u_int32_t offs,
+                   u_int32_t fw_start,
+                   const char* pref,
+                   VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
+    bool checkGen(u_int32_t beg,
+                  u_int32_t offs,
+                  u_int32_t& next,
+                  const char* pref,
+                  VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
+    bool ParseInfoSect(u_int8_t* buff, u_int32_t byteSize);
     bool Fs2IntQuery(bool readRom = true, bool isStripedImage = false);
     u_int32_t getDefaultSectorSz();
-    bool GetMaxImageSize(u_int32_t flash_size, bool image_is_fs, u_int32_t imgConfigSectors, u_int32_t imgFwSectorSz, u_int32_t &max_image_size);
-    bool UpdateFullImageCRC(u_int32_t *buff, u_int32_t size, bool blank_guids);
-    bool Fs2FailSafeBurn(Fs2Operations &imageOps,  ExtBurnParams& burnParams);
-    bool ModifyGuidSection(guid_t *user_guids, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
-    bool preFS2PatchGUIDs(bool patch_macs, bool user_guids, bool user_macs,
-                          guid_t new_guids[MAX_GUIDS], guid_t old_guids[MAX_GUIDS], guid_t **used_guids_p, u_int32_t num_of_old_guids);
-    bool patchGUIDs(Fs2Operations& imageOps, bool patch_macs, bool user_guids, bool user_macs,
-                    guid_t new_guids[MAX_GUIDS], guid_t old_guids[MAX_GUIDS], u_int32_t num_of_old_guids);
-    void patchGUIDsSection(u_int32_t *buf, u_int32_t ind, guid_t guids[MAX_GUIDS], int nguids);
-    bool patchImageVsd(Fs2Operations &imgFwOps, const char *userVsd = (char*)NULL);
-    void PatchInfoSect(u_int8_t *rawSect, u_int32_t vsdOffs, const char *vsd);
+    bool GetMaxImageSize(u_int32_t flash_size,
+                         bool image_is_fs,
+                         u_int32_t imgConfigSectors,
+                         u_int32_t imgFwSectorSz,
+                         u_int32_t& max_image_size);
+    bool UpdateFullImageCRC(u_int32_t* buff, u_int32_t size, bool blank_guids);
+    bool Fs2FailSafeBurn(Fs2Operations& imageOps, ExtBurnParams& burnParams);
+    bool ModifyGuidSection(guid_t* user_guids, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    bool preFS2PatchGUIDs(bool patch_macs,
+                          bool user_guids,
+                          bool user_macs,
+                          guid_t new_guids[MAX_GUIDS],
+                          guid_t old_guids[MAX_GUIDS],
+                          guid_t** used_guids_p,
+                          u_int32_t num_of_old_guids);
+    bool patchGUIDs(Fs2Operations& imageOps,
+                    bool patch_macs,
+                    bool user_guids,
+                    bool user_macs,
+                    guid_t new_guids[MAX_GUIDS],
+                    guid_t old_guids[MAX_GUIDS],
+                    u_int32_t num_of_old_guids);
+    void patchGUIDsSection(u_int32_t* buf, u_int32_t ind, guid_t guids[MAX_GUIDS], int nguids);
+    bool patchImageVsd(Fs2Operations& imgFwOps, const char* userVsd = (char*)NULL);
+    void PatchInfoSect(u_int8_t* rawSect, u_int32_t vsdOffs, const char* vsd);
     void initSectToRead(int imp_index);
-    //needed for fs2burn
-    bool IntegrateDevRomInImage(Fs2Operations &imgFwOps);
-    bool UpdateRomInImage(u_int8_t *new_image, u_int8_t *old_image, u_int8_t *rom_data, int rom_size,
-                          int *new_image_size);
-    bool AddNewSect(u_int8_t* &new_image_p, u_int8_t *data, GPH gph, u_int32_t *last_next);
-    bool CopyBoot2(u_int8_t* &new_image_p, u_int8_t* &old_image_p);
-    bool CopyData(u_int8_t* &new_image, u_int8_t* &old_image, int copy_size);
+    // needed for fs2burn
+    bool IntegrateDevRomInImage(Fs2Operations& imgFwOps);
+    bool
+      UpdateRomInImage(u_int8_t* new_image, u_int8_t* old_image, u_int8_t* rom_data, int rom_size, int* new_image_size);
+    bool AddNewSect(u_int8_t*& new_image_p, u_int8_t* data, GPH gph, u_int32_t* last_next);
+    bool CopyBoot2(u_int8_t*& new_image_p, u_int8_t*& old_image_p);
+    bool CopyData(u_int8_t*& new_image, u_int8_t*& old_image, int copy_size);
 
     bool ModifyKeySection(guid_t access_key, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
-    void PatchKeySect(u_int32_t *buff, u_int32_t keyOff, guid_t hw_key);
+    void PatchKeySect(u_int32_t* buff, u_int32_t keyOff, guid_t hw_key);
     bool Fs2IsMacAvailable();
 
-    bool ModifyVSDSection(const char *vsd, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
-    bool ReburnNewImage(u_int8_t *data, const char *feature_name, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
-    bool packStripedImageData(u_int8_t *striped_data, u_int8_t *normal_data, u_int32_t length, u_int32_t &striped_length,
-                              bool needs_repack, u_int32_t cntxLog2ChunkSize);
-    bool Fs2SetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc = (PrintCallBack)NULL, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    bool ModifyVSDSection(const char* vsd, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
+    bool
+      ReburnNewImage(u_int8_t* data, const char* feature_name, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
+    bool packStripedImageData(u_int8_t* striped_data,
+                              u_int8_t* normal_data,
+                              u_int32_t length,
+                              u_int32_t& striped_length,
+                              bool needs_repack,
+                              u_int32_t cntxLog2ChunkSize);
+    bool Fs2SetGuids(sg_params_t& sgParam,
+                     PrintCallBack callBackFunc = (PrintCallBack)NULL,
+                     ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     bool Fs2SetGuidsForBlank(sg_params_t& sgParam);
     bool getRunningFwVer();
 
-
     Fs2ImgInfo _fs2ImgInfo;
     bool _burnBlankGuids;
     bool _isFullVerify;
diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
index dbef1c46..6c5a5f71 100644
--- a/mlxfwops/lib/fs3_ops.cpp
+++ b/mlxfwops/lib/fs3_ops.cpp
@@ -31,8 +31,6 @@
  * SOFTWARE.
  */
 
-
-
 #include <stdlib.h>
 
 #include <algorithm>
@@ -52,21 +50,21 @@
 #endif
 
 #if !defined(UEFI_BUILD)
-    #include "mad_ifc/mad_ifc.h"
-    #include <ctype.h>
-    #include <sstream>
-    #if !defined(NO_OPEN_SSL)
-        #include <mlxsign_lib/mlxsign_lib.h>
-        #include <tools_crypto/tools_md5.h>
-        #include <tools_dev_types.h>
-    #endif
-    #if !defined(NO_CS_CMD)
-        #include <tools_crypto/tools_md5.h>
-    #endif
+#include "mad_ifc/mad_ifc.h"
+#include <ctype.h>
+#include <sstream>
+#if !defined(NO_OPEN_SSL)
+#include <mlxsign_lib/mlxsign_lib.h>
+#include <tools_crypto/tools_md5.h>
+#include <tools_dev_types.h>
+#endif
+#if !defined(NO_CS_CMD)
+#include <tools_crypto/tools_md5.h>
+#endif
 #endif
 
 #ifndef CONNECTX4LX_NV_DATA_SIZE
-    #define CONNECTX4LX_NV_DATA_SIZE    (0x10000)
+#define CONNECTX4LX_NV_DATA_SIZE (0x10000)
 #endif
 #include "fs3_ops.h"
 #define FS3_LOG_CHUNK_SIZE 21
@@ -74,102 +72,100 @@
 #define DEFAULT_GUID_NUM 0xff
 #define DEFAULT_STEP DEFAULT_GUID_NUM
 
-//fs4 use the same itoc signatures, please double check
-const u_int32_t Fs3Operations::_itocSignature[4] = {
-    ITOC_ASCII,       // Ascii of "MTFW"
-    TOC_RAND1,       // Random data
-    TOC_RAND2,
-    TOC_RAND3
-};
+// fs4 use the same itoc signatures, please double check
+const u_int32_t Fs3Operations::_itocSignature[4] = {ITOC_ASCII, // Ascii of "MTFW"
+                                                    TOC_RAND1,  // Random data
+                                                    TOC_RAND2, TOC_RAND3};
 
 const Fs3Operations::SectionInfo Fs3Operations::_fs3SectionsInfoArr[] = {
-    {FS3_END,                           "END"},
-    {FS3_ITOC,                          "ITOC_HEADER"},
-    {FS3_BOOT_CODE,                     "BOOT_CODE"},
-    {FS3_PCI_CODE,                      "PCI_CODE"},
-    {FS3_MAIN_CODE,                     "MAIN_CODE"},
-    {FS3_PCIE_LINK_CODE,                "PCIE_LINK_CODE"},
-    {FS3_IRON_PREP_CODE,                "IRON_PREP_CODE"},
-    {FS3_POST_IRON_BOOT_CODE,           "POST_IRON_BOOT_CODE"},
-    {FS3_UPGRADE_CODE,                  "UPGRADE_CODE"},
-    {FS3_HW_BOOT_CFG,                   "HW_BOOT_CFG"},
-    {FS3_HW_MAIN_CFG,                   "HW_MAIN_CFG"},
-    {FS3_PHY_UC_CODE,                   "PHY_UC_CODE"},
-    {FS3_PHY_UC_CONSTS,                 "PHY_UC_CONSTS"},
-    {FS3_PCIE_PHY_UC_CODE,              "PCIE_PHY_UC_CODE"},
-    {FS3_CCIR_INFRA_CODE,               "CCIR_INFRA_CODE"},
-    {FS3_CCIR_ALGO_CODE,                "CCIR_ALGO_CODE"},
-    {FS4_BOOT3_CODE,                    "BOOT3_CODE"},
-    {FS3_IMAGE_INFO,                    "IMAGE_INFO"},
-    {FS3_FW_BOOT_CFG,                   "FW_BOOT_CFG"},
-    {FS3_FW_MAIN_CFG,                   "FW_MAIN_CFG"},
-    {FS3_APU_KERNEL,                    "APU_KERNEL"},
-    {FS3_APU_APPS,                      "APU_APPS"},
-    {FS3_ROM_CODE,                      "ROM_CODE"},
-    {FS3_RESET_INFO,                    "RESET_INFO"},
-    {FS3_DBG_FW_INI,                    "DBG_FW_INI"},
-    {FS3_DBG_FW_PARAMS,                 "DBG_FW_PARAMS"},
-    {FS3_FW_ADB,                        "FW_ADB"},
-    {FS4_GB_FW_CODE,                    "GB_FW_CODE"},
-    {FS4_TILE_FW_CODE,                  "TILE_FW_CODE"},
-    {FS4_FW_TILE_INI,                   "FW_TILE_INI"},
-    {FS4_HW_TILE_INI,                   "HW_TILE_INI"},
-    {FS3_IMAGE_SIGNATURE_256,           "IMAGE_SIGNATURE_256"},
-    {FS3_PUBLIC_KEYS_2048,              "PUBLIC_KEYS_2048"},
-    {FS3_PUBLIC_KEYS_4096,              "PUBLIC_KEYS_4096"},
-    {FS3_FORBIDDEN_VERSIONS,            "FORBIDDEN_VERSIONS"},
-    {FS3_IMAGE_SIGNATURE_512,           "IMAGE_SIGNATURE_512"},
-    {FS3_CRDUMP_MASK_DATA,              "CRDUMP_MASK_DATA"},
-    {FS3_HMAC_DIGEST,                   "HMAC_DIGEST"},
-    {FS3_MFG_INFO,                      MFG_INFO},
-    {FS3_DEV_INFO,                      DEV_INFO},
-    {FS3_NV_DATA1,                      "NV_DATA"},
-    {FS3_VPD_R0,                        "VPD_R0"},
-    {FS3_NV_DATA2,                      "NV_DATA"},
-    {FS3_FW_NV_LOG,                     "FW_NV_LOG"},
-    {FS3_NV_DATA0,                      "NV_DATA"},
-    {FS4_DEV_INFO1,                     "DEV_INFO1"},
-    {FS4_DEV_INFO2,                     "DEV_INFO2"},
-    {FS4_FW_INTERNAL_USAGE,             "FW_INTERNAL_USAGE"},
-    {FS4_PROGRAMMABLE_HW_FW1,           "PROGRAMMABLE_HW_FW"},
-    {FS4_PROGRAMMABLE_HW_FW2,           "PROGRAMMABLE_HW_FW"},
-    {FS4_DIGITAL_CERT_PTR,              "DIGITAL_CERT_PTR"},
-    {FS4_DIGITAL_CERT_RW,               "DIGITAL_CERT_RW"},
-    {FS4_LC_INI1_TABLE,                 "LC_INI1_TABLE"},
-    {FS4_LC_INI2_TABLE,                 "LC_INI2_TABLE"},
-    {FS4_LC_INI_NV_DATA,                "LC_INI_NV_DATA"},
-    {FS4_CERT_CHAIN_0,                  "CERT_CHAIN_0"},
-    {FS4_DIGITAL_CACERT_RW,             "DIGITAL_CACERT_RW"},
-    {FS3_DTOC,                          "DTOC_HEADER"},
-    {FS4_HW_PTR,                        "HW_POINTERS"},
-    {FS4_TOOLS_AREA,                    "TOOLS_AREA"},
-    {FS4_RSA_PUBLIC_KEY,                "RSA_PUBLIC_KEY"},
-    {FS4_RSA_4096_SIGNATURES,           "RSA_4096_SIGNATURES"},
-    {FS4_EXCLKSYNC_INFO,                "EXCLKSYNC_INFO"},
-    {FS4_HASHES_TABLE,                  "HASHES_TABLE"}
-};
-
-bool Fs3Operations::Fs3UpdateImgCache(u_int8_t *buff, u_int32_t addr, u_int32_t size)
+  {FS3_END, "END"},
+  {FS3_ITOC, "ITOC_HEADER"},
+  {FS3_BOOT_CODE, "BOOT_CODE"},
+  {FS3_PCI_CODE, "PCI_CODE"},
+  {FS3_MAIN_CODE, "MAIN_CODE"},
+  {FS3_PCIE_LINK_CODE, "PCIE_LINK_CODE"},
+  {FS3_IRON_PREP_CODE, "IRON_PREP_CODE"},
+  {FS3_POST_IRON_BOOT_CODE, "POST_IRON_BOOT_CODE"},
+  {FS3_UPGRADE_CODE, "UPGRADE_CODE"},
+  {FS3_HW_BOOT_CFG, "HW_BOOT_CFG"},
+  {FS3_HW_MAIN_CFG, "HW_MAIN_CFG"},
+  {FS3_PHY_UC_CODE, "PHY_UC_CODE"},
+  {FS3_PHY_UC_CONSTS, "PHY_UC_CONSTS"},
+  {FS3_PCIE_PHY_UC_CODE, "PCIE_PHY_UC_CODE"},
+  {FS3_CCIR_INFRA_CODE, "CCIR_INFRA_CODE"},
+  {FS3_CCIR_ALGO_CODE, "CCIR_ALGO_CODE"},
+  {FS4_BOOT3_CODE, "BOOT3_CODE"},
+  {FS3_IMAGE_INFO, "IMAGE_INFO"},
+  {FS3_FW_BOOT_CFG, "FW_BOOT_CFG"},
+  {FS3_FW_MAIN_CFG, "FW_MAIN_CFG"},
+  {FS3_APU_KERNEL, "APU_KERNEL"},
+  {FS3_APU_APPS, "APU_APPS"},
+  {FS3_ROM_CODE, "ROM_CODE"},
+  {FS3_RESET_INFO, "RESET_INFO"},
+  {FS3_DBG_FW_INI, "DBG_FW_INI"},
+  {FS3_DBG_FW_PARAMS, "DBG_FW_PARAMS"},
+  {FS3_FW_ADB, "FW_ADB"},
+  {FS4_GB_FW_CODE, "GB_FW_CODE"},
+  {FS4_TILE_FW_CODE, "TILE_FW_CODE"},
+  {FS4_FW_TILE_INI, "FW_TILE_INI"},
+  {FS4_HW_TILE_INI, "HW_TILE_INI"},
+  {FS3_IMAGE_SIGNATURE_256, "IMAGE_SIGNATURE_256"},
+  {FS3_PUBLIC_KEYS_2048, "PUBLIC_KEYS_2048"},
+  {FS3_PUBLIC_KEYS_4096, "PUBLIC_KEYS_4096"},
+  {FS3_FORBIDDEN_VERSIONS, "FORBIDDEN_VERSIONS"},
+  {FS3_IMAGE_SIGNATURE_512, "IMAGE_SIGNATURE_512"},
+  {FS3_CRDUMP_MASK_DATA, "CRDUMP_MASK_DATA"},
+  {FS3_HMAC_DIGEST, "HMAC_DIGEST"},
+  {FS3_MFG_INFO, MFG_INFO},
+  {FS3_DEV_INFO, DEV_INFO},
+  {FS3_NV_DATA1, "NV_DATA"},
+  {FS3_VPD_R0, "VPD_R0"},
+  {FS3_NV_DATA2, "NV_DATA"},
+  {FS3_FW_NV_LOG, "FW_NV_LOG"},
+  {FS3_NV_DATA0, "NV_DATA"},
+  {FS4_DEV_INFO1, "DEV_INFO1"},
+  {FS4_DEV_INFO2, "DEV_INFO2"},
+  {FS4_FW_INTERNAL_USAGE, "FW_INTERNAL_USAGE"},
+  {FS4_PROGRAMMABLE_HW_FW1, "PROGRAMMABLE_HW_FW"},
+  {FS4_PROGRAMMABLE_HW_FW2, "PROGRAMMABLE_HW_FW"},
+  {FS4_DIGITAL_CERT_PTR, "DIGITAL_CERT_PTR"},
+  {FS4_DIGITAL_CERT_RW, "DIGITAL_CERT_RW"},
+  {FS4_LC_INI1_TABLE, "LC_INI1_TABLE"},
+  {FS4_LC_INI2_TABLE, "LC_INI2_TABLE"},
+  {FS4_LC_INI_NV_DATA, "LC_INI_NV_DATA"},
+  {FS4_CERT_CHAIN_0, "CERT_CHAIN_0"},
+  {FS4_DIGITAL_CACERT_RW, "DIGITAL_CACERT_RW"},
+  {FS3_DTOC, "DTOC_HEADER"},
+  {FS4_HW_PTR, "HW_POINTERS"},
+  {FS4_TOOLS_AREA, "TOOLS_AREA"},
+  {FS4_RSA_PUBLIC_KEY, "RSA_PUBLIC_KEY"},
+  {FS4_RSA_4096_SIGNATURES, "RSA_4096_SIGNATURES"},
+  {FS4_EXCLKSYNC_INFO, "EXCLKSYNC_INFO"},
+  {FS4_HASHES_TABLE, "HASHES_TABLE"}};
+
+bool Fs3Operations::Fs3UpdateImgCache(u_int8_t* buff, u_int32_t addr, u_int32_t size)
 {
     DPRINTF(("Fs3Operations::Fs3UpdateImgCache\n"));
-    if (size == 0) {
+    if (size == 0)
+    {
         return true;
     }
     _imageCache.add(buff, addr, size);
     return true;
 }
 
-bool Fs3Operations::UpdateImgCache(u_int8_t *buff, u_int32_t addr, u_int32_t size)
+bool Fs3Operations::UpdateImgCache(u_int8_t* buff, u_int32_t addr, u_int32_t size)
 {
     return Fs3UpdateImgCache(buff, addr, size);
 }
 
 const char* Fs3Operations::GetSectionNameByType(u_int8_t section_type)
 {
-
-    for (u_int32_t i = 0; i < ARR_SIZE(_fs3SectionsInfoArr); i++) {
-        const SectionInfo *sect_info = &_fs3SectionsInfoArr[i];
-        if (sect_info->type == section_type) {
+    for (u_int32_t i = 0; i < ARR_SIZE(_fs3SectionsInfoArr); i++)
+    {
+        const SectionInfo* sect_info = &_fs3SectionsInfoArr[i];
+        if (sect_info->type == section_type)
+        {
             return sect_info->name;
         }
     }
@@ -178,9 +174,11 @@ const char* Fs3Operations::GetSectionNameByType(u_int8_t section_type)
 
 bool Fs3Operations::GetSectionSizeAndOffset(fs3_section_t sectType, u_int32_t& size, u_int32_t& offset)
 {
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-        struct cibfw_itoc_entry *tocEntry = &_fs3ImgInfo.tocArr[i].toc_entry;
-        if (tocEntry->type == sectType) {
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        struct cibfw_itoc_entry* tocEntry = &_fs3ImgInfo.tocArr[i].toc_entry;
+        if (tocEntry->type == sectType)
+        {
             size = tocEntry->size << 2;
             offset = tocEntry->flash_addr << 2;
             return true;
@@ -189,44 +187,48 @@ bool Fs3Operations::GetSectionSizeAndOffset(fs3_section_t sectType, u_int32_t& s
     return false;
 }
 
-bool Fs3Operations::DumpFs3CRCCheck(u_int8_t sect_type, u_int32_t sect_addr, u_int32_t sect_size, u_int32_t crc_act,
-                                    u_int32_t crc_exp, bool ignore_crc, VerifyCallBack verifyCallBackFunc)
+bool Fs3Operations::DumpFs3CRCCheck(u_int8_t sect_type,
+                                    u_int32_t sect_addr,
+                                    u_int32_t sect_size,
+                                    u_int32_t crc_act,
+                                    u_int32_t crc_exp,
+                                    bool ignore_crc,
+                                    VerifyCallBack verifyCallBackFunc)
 {
     char pr[256];
-    const char *sect_type_str = GetSectionNameByType(sect_type);
-    sprintf(pr, CRC_CHECK_OLD, PRE_CRC_OUTPUT, sect_addr, sect_addr + sect_size - 1, sect_size,
-            sect_type_str);
-    if (!strcmp(sect_type_str, UNKNOWN_SECTION)) {
+    const char* sect_type_str = GetSectionNameByType(sect_type);
+    sprintf(pr, CRC_CHECK_OLD, PRE_CRC_OUTPUT, sect_addr, sect_addr + sect_size - 1, sect_size, sect_type_str);
+    if (!strcmp(sect_type_str, UNKNOWN_SECTION))
+    {
         sprintf(pr + strlen(pr), ":0x%x", sect_type);
     }
     sprintf(pr + strlen(pr), ")");
     return CheckAndPrintCrcRes(pr, 0, sect_addr, crc_exp, crc_act, ignore_crc, verifyCallBackFunc);
-
 }
 
-bool Fs3Operations::CheckTocSignature(struct cibfw_itoc_header *itoc_header, u_int32_t first_signature)
+bool Fs3Operations::CheckTocSignature(struct cibfw_itoc_header* itoc_header, u_int32_t first_signature)
 {
-    if (itoc_header->signature0 != first_signature  ||
-        itoc_header->signature1 !=  TOC_RAND1       ||
-        itoc_header->signature2 !=  TOC_RAND2       ||
-        itoc_header->signature3 !=  TOC_RAND3) {
+    if (itoc_header->signature0 != first_signature || itoc_header->signature1 != TOC_RAND1 ||
+        itoc_header->signature2 != TOC_RAND2 || itoc_header->signature3 != TOC_RAND3)
+    {
         return false;
     }
     return true;
 }
 
-#define CHECK_UID_STRUCTS_SIZE(uids_context, cibfw_guids_context) { \
-        if (sizeof(uids_context) != sizeof(cibfw_guids_context)) { \
-            return errmsg("Internal error: Size of uids_t (%d) is not equal to size of  struct cibfw_guids guids (%d)\n", \
-                          (int)sizeof(uids_context), (int)sizeof(cibfw_guids_context)); \
-        } \
-}
+#define CHECK_UID_STRUCTS_SIZE(uids_context, cibfw_guids_context)                                             \
+    {                                                                                                         \
+        if (sizeof(uids_context) != sizeof(cibfw_guids_context))                                              \
+        {                                                                                                     \
+            return errmsg(                                                                                    \
+              "Internal error: Size of uids_t (%d) is not equal to size of  struct cibfw_guids guids (%d)\n", \
+              (int)sizeof(uids_context), (int)sizeof(cibfw_guids_context));                                   \
+        }                                                                                                     \
+    }
 
-#define CHECK_MFG_NEW_FORMAT(mfg_st) \
-    (mfg_st.major_version == 1)
-#define CHECK_MFG_OLD_FORMAT(mfg_st) \
-    (mfg_st.major_version == 0)
-bool Fs3Operations::GetMfgInfo(u_int8_t *buff)
+#define CHECK_MFG_NEW_FORMAT(mfg_st) (mfg_st.major_version == 1)
+#define CHECK_MFG_OLD_FORMAT(mfg_st) (mfg_st.major_version == 0)
+bool Fs3Operations::GetMfgInfo(u_int8_t* buff)
 {
     // structs of the same size we can unpack either way
     struct cibfw_mfg_info cib_mfg_info;
@@ -234,59 +236,72 @@ bool Fs3Operations::GetMfgInfo(u_int8_t *buff)
 
     cibfw_mfg_info_unpack(&cib_mfg_info, buff);
     // cibfw_mfg_info_dump(&mfg_info, stdout);
-    if (CHECK_MFG_NEW_FORMAT(cib_mfg_info)) {
+    if (CHECK_MFG_NEW_FORMAT(cib_mfg_info))
+    {
         cx4fw_mfg_info_unpack(&cx4_mfg_info, buff);
         CHECK_UID_STRUCTS_SIZE(_fs3ImgInfo.ext_info.orig_fs3_uids_info.cx4_uids, cx4_mfg_info.guids);
         memcpy(&_fs3ImgInfo.ext_info.orig_fs3_uids_info.cx4_uids, &cx4_mfg_info.guids, sizeof(cx4_mfg_info.guids));
         strcpy(_fs3ImgInfo.ext_info.orig_psid, cx4_mfg_info.psid);
         _fs3ImgInfo.ext_info.guids_override_en = cx4_mfg_info.guids_override_en;
         _fs3ImgInfo.ext_info.orig_fs3_uids_info.valid_field = 1;
-    } else if (CHECK_MFG_OLD_FORMAT(cib_mfg_info)) {
+    }
+    else if (CHECK_MFG_OLD_FORMAT(cib_mfg_info))
+    {
         CHECK_UID_STRUCTS_SIZE(_fs3ImgInfo.ext_info.orig_fs3_uids_info.cib_uids, cib_mfg_info.guids);
         memcpy(&_fs3ImgInfo.ext_info.orig_fs3_uids_info.cib_uids, &cib_mfg_info.guids, sizeof(cib_mfg_info.guids));
         strcpy(_fs3ImgInfo.ext_info.orig_psid, cib_mfg_info.psid);
         _fs3ImgInfo.ext_info.guids_override_en = cib_mfg_info.guids_override_en;
         _fs3ImgInfo.ext_info.orig_fs3_uids_info.valid_field = 0;
-    } else {
-        return errmsg(MLXFW_UNKNOWN_SECT_VER_ERR, "Unknown MFG_INFO format version (%d.%d).", cib_mfg_info.major_version, cib_mfg_info.minor_version);
+    }
+    else
+    {
+        return errmsg(MLXFW_UNKNOWN_SECT_VER_ERR, "Unknown MFG_INFO format version (%d.%d).",
+                      cib_mfg_info.major_version, cib_mfg_info.minor_version);
     }
 
-    if (cib_mfg_info.minor_version == 1) {
-        //get orig_prs name
+    if (cib_mfg_info.minor_version == 1)
+    {
+        // get orig_prs name
         struct tools_open_mfg_info tools_mfg_info;
         memset(&tools_mfg_info, 0, sizeof(tools_mfg_info));
         tools_open_mfg_info_unpack(&tools_mfg_info, buff);
         strncpy(_fs3ImgInfo.ext_info.orig_prs_name, tools_mfg_info.orig_prs_name, FS3_PRS_NAME_LEN);
     }
     return true;
-
 }
 
-
 #define RESIGN_MSG "-W- The image requires to be signed by a valid key, run sign command before applying.\n"
 
-#define INSERT_SHA_IF_NEEDS(callBackF) do { \
-        if (!_ioAccess->is_flash()) { \
-            if (!(_fs3ImgInfo.ext_info.security_mode & SMM_SIGNED_FW)) { \
-                PRINT_PROGRESS(callBackF, (char *)"-I- Updating image digest.\n"); \
-                if (!FwInsertSHA256((PrintCallBack)NULL)) { \
-                    return false; \
-                } \
-            } else { \
-                PRINT_PROGRESS(callBackF, (char *)RESIGN_MSG); \
-            } \
-        } \
-} while (0)
-
-
-bool Fs3Operations::GetImageInfo(u_int8_t *buff)
+#define INSERT_SHA_IF_NEEDS(callBackF)                                            \
+    do                                                                            \
+    {                                                                             \
+        if (!_ioAccess->is_flash())                                               \
+        {                                                                         \
+            if (!(_fs3ImgInfo.ext_info.security_mode & SMM_SIGNED_FW))            \
+            {                                                                     \
+                PRINT_PROGRESS(callBackF, (char*)"-I- Updating image digest.\n"); \
+                if (!FwInsertSHA256((PrintCallBack)NULL))                         \
+                {                                                                 \
+                    return false;                                                 \
+                }                                                                 \
+            }                                                                     \
+            else                                                                  \
+            {                                                                     \
+                PRINT_PROGRESS(callBackF, (char*)RESIGN_MSG);                     \
+            }                                                                     \
+        }                                                                         \
+    } while (0)
+
+bool Fs3Operations::GetImageInfo(u_int8_t* buff)
 {
     DPRINTF(("Fs3Operations::GetImageInfo\n"));
     struct image_layout_image_info image_info;
     image_layout_image_info_unpack(&image_info, buff);
     // image_layout_image_info_dump(&image_info, stdout);
-    if (image_info.major_version != 0) {
-        return errmsg(MLXFW_UNKNOWN_SECT_VER_ERR, "Unknown IMAGE_INFO format version (%d.%d).", image_info.major_version, image_info.minor_version);
+    if (image_info.major_version != 0)
+    {
+        return errmsg(MLXFW_UNKNOWN_SECT_VER_ERR, "Unknown IMAGE_INFO format version (%d.%d).",
+                      image_info.major_version, image_info.minor_version);
     }
 
     _fwImgInfo.ext_info.image_info_minor_version = image_info.minor_version;
@@ -323,7 +338,8 @@ bool Fs3Operations::GetImageInfo(u_int8_t *buff)
     strcpy(_fwImgInfo.ext_info.product_ver, image_info.prod_ver);
 
     // get name, prs name and description
-    if (image_info.minor_version == 2) {
+    if (image_info.minor_version == 2)
+    {
         struct tools_open_image_info tools_image_info;
         memset(&tools_image_info, 0, sizeof(tools_image_info));
         tools_open_image_info_unpack(&tools_image_info, buff);
@@ -331,28 +347,31 @@ bool Fs3Operations::GetImageInfo(u_int8_t *buff)
         strncpy(_fs3ImgInfo.ext_info.description, tools_image_info.description, DESCRIPTION_LEN);
         strncpy(_fs3ImgInfo.ext_info.prs_name, tools_image_info.prs_name, FS3_PRS_NAME_LEN);
     }
-    else if (image_info.minor_version == 3) {
+    else if (image_info.minor_version == 3)
+    {
         strncpy(_fs3ImgInfo.ext_info.name, image_info.name, NAME_LEN);
         strncpy(_fs3ImgInfo.ext_info.description, image_info.description, DESCRIPTION_LEN);
         strncpy(_fs3ImgInfo.ext_info.prs_name, image_info.prs_name, FS3_PRS_NAME_LEN);
     }
 
     _fs3ImgInfo.ext_info.mcc_en = image_info.mcc_en;
-    _fs3ImgInfo.ext_info.security_mode = (_fs3ImgInfo.ext_info.security_mode          |
-                                          ((image_info.mcc_en    == 1) ? SMM_MCC_EN    : 0) |
-                                          ((image_info.debug_fw  == 1) ? SMM_DEBUG_FW  : 0) |
-                                          ((image_info.signed_fw == 1) ? SMM_SIGNED_FW : 0) |
-                                          ((image_info.secure_fw == 1) ? SMM_SECURE_FW : 0));
+    _fs3ImgInfo.ext_info.security_mode =
+      (_fs3ImgInfo.ext_info.security_mode | ((image_info.mcc_en == 1) ? SMM_MCC_EN : 0) |
+       ((image_info.debug_fw == 1) ? SMM_DEBUG_FW : 0) | ((image_info.signed_fw == 1) ? SMM_SIGNED_FW : 0) |
+       ((image_info.secure_fw == 1) ? SMM_SECURE_FW : 0));
 
     _fs3ImgInfo.runFromAny = image_info.image_size.run_from_any;
-    const u_int32_t *swId = (u_int32_t*)NULL;
+    const u_int32_t* swId = (u_int32_t*)NULL;
     DPRINTF(("Fs3Operations::GetImageInfo _fwImgInfo.supportedHwId[0]=0x%x\n", _fwImgInfo.supportedHwId[0]));
-    if (!getInfoFromHwDevid(_fwImgInfo.supportedHwId[0], _fwImgInfo.ext_info.chip_type, &swId)) {
+    if (!getInfoFromHwDevid(_fwImgInfo.supportedHwId[0], _fwImgInfo.ext_info.chip_type, &swId))
+    {
         return false;
     }
-    //copy the vsd to the branch ver only for switches. Not valid for NICs.
-    if (!IS_HCA(_fwImgInfo.ext_info.chip_type)) {
-        if (VerifyBranchFormat(image_info.vsd)) {
+    // copy the vsd to the branch ver only for switches. Not valid for NICs.
+    if (!IS_HCA(_fwImgInfo.ext_info.chip_type))
+    {
+        if (VerifyBranchFormat(image_info.vsd))
+        {
             (strncpy(_fwImgInfo.ext_info.branch_ver, image_info.vsd, BRANCH_LEN));
         }
     }
@@ -361,66 +380,71 @@ bool Fs3Operations::GetImageInfo(u_int8_t *buff)
     return true;
 }
 
-bool Fs3Operations::GetImgSigInfo(u_int32_t keypair_uuid[4]) {
+bool Fs3Operations::GetImgSigInfo(u_int32_t keypair_uuid[4])
+{
     _signatureExists = 1;
-    if ((keypair_uuid[0] != 0 || keypair_uuid[1] != 0
-         || keypair_uuid[2] != 0) &&
-        keypair_uuid[3] == 0 && (EXTRACT(keypair_uuid[2], 0, 16)) == 0) {
-            _fs3ImgInfo.ext_info.security_mode = (_fs3ImgInfo.ext_info.security_mode | SMM_DEV_FW);
+    if ((keypair_uuid[0] != 0 || keypair_uuid[1] != 0 || keypair_uuid[2] != 0) && keypair_uuid[3] == 0 &&
+        (EXTRACT(keypair_uuid[2], 0, 16)) == 0)
+    {
+        _fs3ImgInfo.ext_info.security_mode = (_fs3ImgInfo.ext_info.security_mode | SMM_DEV_FW);
     }
     return true;
 }
 
-bool Fs3Operations::GetImgSigInfo256(u_int8_t *buff)
+bool Fs3Operations::GetImgSigInfo256(u_int8_t* buff)
 {
     struct cx4fw_image_signature_256 fwSignature;
     cx4fw_image_signature_256_unpack(&fwSignature, buff);
-    //cx4fw_image_signature_dump(&fwSignature, stdout);
+    // cx4fw_image_signature_dump(&fwSignature, stdout);
     return GetImgSigInfo(fwSignature.keypair_uuid);
 }
 
-bool Fs3Operations::GetImgSigInfo512(u_int8_t *buff)
+bool Fs3Operations::GetImgSigInfo512(u_int8_t* buff)
 {
     struct cx4fw_image_signature_512 fwSignature;
     cx4fw_image_signature_512_unpack(&fwSignature, buff);
     return GetImgSigInfo(fwSignature.keypair_uuid);
 }
 
-#define CHECK_DEV_INFO_NEW_FORMAT(info_st) \
-    (info_st.major_version == 2)
-#define CHECK_DEV_INFO_OLD_FORMAT(info_st) \
-    (info_st.major_version == 1)
-bool Fs3Operations::GetDevInfo(u_int8_t *buff)
+#define CHECK_DEV_INFO_NEW_FORMAT(info_st) (info_st.major_version == 2)
+#define CHECK_DEV_INFO_OLD_FORMAT(info_st) (info_st.major_version == 1)
+bool Fs3Operations::GetDevInfo(u_int8_t* buff)
 {
     struct cibfw_device_info cib_dev_info;
     struct cx4fw_device_info cx4_dev_info;
     // same size, we can unpack to check version
     cibfw_device_info_unpack(&cib_dev_info, buff);
     // cibfw_device_info_dump(&dev_info, stdout);
-    if (CHECK_DEV_INFO_NEW_FORMAT(cib_dev_info)) {
+    if (CHECK_DEV_INFO_NEW_FORMAT(cib_dev_info))
+    {
         cx4fw_device_info_unpack(&cx4_dev_info, buff);
         CHECK_UID_STRUCTS_SIZE(_fs3ImgInfo.ext_info.fs3_uids_info.cx4_uids, cx4_dev_info.guids);
         memcpy(&_fs3ImgInfo.ext_info.fs3_uids_info.cx4_uids, &cx4_dev_info.guids, sizeof(cx4_dev_info.guids));
         strcpy(_fwImgInfo.ext_info.vsd, cx4_dev_info.vsd);
         _fs3ImgInfo.ext_info.fs3_uids_info.valid_field = 1;
         _fwImgInfo.ext_info.vsd_sect_found = true;
-    } else if (CHECK_DEV_INFO_OLD_FORMAT(cib_dev_info)) {
+    }
+    else if (CHECK_DEV_INFO_OLD_FORMAT(cib_dev_info))
+    {
         CHECK_UID_STRUCTS_SIZE(_fs3ImgInfo.ext_info.fs3_uids_info.cib_uids, cib_dev_info.guids);
         memcpy(&_fs3ImgInfo.ext_info.fs3_uids_info.cib_uids, &cib_dev_info.guids, sizeof(cib_dev_info.guids));
         strcpy(_fwImgInfo.ext_info.vsd, cib_dev_info.vsd);
         _fs3ImgInfo.ext_info.fs3_uids_info.valid_field = 0;
         _fwImgInfo.ext_info.vsd_sect_found = true;
-    } else {
-        return errmsg(MLXFW_UNKNOWN_SECT_VER_ERR, "Unknown DEV_INFO format version (%d.%d).", cib_dev_info.major_version, cib_dev_info.minor_version);
+    }
+    else
+    {
+        return errmsg(MLXFW_UNKNOWN_SECT_VER_ERR, "Unknown DEV_INFO format version (%d.%d).",
+                      cib_dev_info.major_version, cib_dev_info.minor_version);
     }
     return true;
 }
 
-bool Fs3Operations::GetRomInfo(u_int8_t *buff, u_int32_t size)
+bool Fs3Operations::GetRomInfo(u_int8_t* buff, u_int32_t size)
 {
     TOCPUn(buff, size / 4);
     // update _romSect buff
-    GetSectData(_romSect, (u_int32_t *)buff, size);
+    GetSectData(_romSect, (u_int32_t*)buff, size);
     // parse rom Info and fill rom_info struct
     RomInfo rInfo(_romSect);
     rInfo.ParseInfo();
@@ -428,67 +452,82 @@ bool Fs3Operations::GetRomInfo(u_int8_t *buff, u_int32_t size)
     return true;
 }
 
-bool Fs3Operations::GetImageInfoFromSection(u_int8_t *buff, u_int8_t sect_type, u_int32_t sect_size, u_int8_t check_support_only)
+bool Fs3Operations::GetImageInfoFromSection(u_int8_t* buff,
+                                            u_int8_t sect_type,
+                                            u_int32_t sect_size,
+                                            u_int8_t check_support_only)
 {
-    DPRINTF(("Fs3Operations::GetImageInfoFromSection sect_type (%s:0x%x)\n", GetSectionNameByType(sect_type), sect_type));
-    #define EXEC_GET_INFO_OR_GET_SUPPORT(get_info_func, buff, check_support_only) (check_support_only) ? true : get_info_func(buff);
+    DPRINTF(
+      ("Fs3Operations::GetImageInfoFromSection sect_type (%s:0x%x)\n", GetSectionNameByType(sect_type), sect_type));
+#define EXEC_GET_INFO_OR_GET_SUPPORT(get_info_func, buff, check_support_only) \
+    (check_support_only) ? true : get_info_func(buff);
 
-    switch (sect_type) {
-    case FS3_MFG_INFO:
-        return EXEC_GET_INFO_OR_GET_SUPPORT(GetMfgInfo, buff, check_support_only);
+    switch (sect_type)
+    {
+        case FS3_MFG_INFO:
+            return EXEC_GET_INFO_OR_GET_SUPPORT(GetMfgInfo, buff, check_support_only);
 
-    case FS3_IMAGE_INFO:
-        return EXEC_GET_INFO_OR_GET_SUPPORT(GetImageInfo, buff, check_support_only);
+        case FS3_IMAGE_INFO:
+            return EXEC_GET_INFO_OR_GET_SUPPORT(GetImageInfo, buff, check_support_only);
 
-    case FS3_DEV_INFO:
-        return EXEC_GET_INFO_OR_GET_SUPPORT(GetDevInfo, buff, check_support_only);
+        case FS3_DEV_INFO:
+            return EXEC_GET_INFO_OR_GET_SUPPORT(GetDevInfo, buff, check_support_only);
 
-    case FS3_IMAGE_SIGNATURE_256:
-        return EXEC_GET_INFO_OR_GET_SUPPORT(GetImgSigInfo256, buff, check_support_only);
+        case FS3_IMAGE_SIGNATURE_256:
+            return EXEC_GET_INFO_OR_GET_SUPPORT(GetImgSigInfo256, buff, check_support_only);
 
-    case FS3_IMAGE_SIGNATURE_512:
-        return EXEC_GET_INFO_OR_GET_SUPPORT(GetImgSigInfo512, buff, check_support_only);
+        case FS3_IMAGE_SIGNATURE_512:
+            return EXEC_GET_INFO_OR_GET_SUPPORT(GetImgSigInfo512, buff, check_support_only);
 
-    case FS3_ROM_CODE:
-        return check_support_only ? true : GetRomInfo(buff, sect_size);
+        case FS3_ROM_CODE:
+            return check_support_only ? true : GetRomInfo(buff, sect_size);
 
-    case FS3_PUBLIC_KEYS_2048:
-    case FS3_PUBLIC_KEYS_4096:
-        _publicKeysExists = 1;
-        break;
+        case FS3_PUBLIC_KEYS_2048:
+        case FS3_PUBLIC_KEYS_4096:
+            _publicKeysExists = 1;
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
 
-    if (check_support_only) {
+    if (check_support_only)
+    {
         return false;
     }
-    return errmsg("Getting info from section type (%s:%d) is not supported\n", GetSectionNameByType(sect_type), sect_type);
+    return errmsg("Getting info from section type (%s:%d) is not supported\n", GetSectionNameByType(sect_type),
+                  sect_type);
 }
 
 bool Fs3Operations::IsGetInfoSupported(u_int8_t sect_type)
 {
-    return GetImageInfoFromSection((u_int8_t *)NULL, sect_type, 0, 1);
+    return GetImageInfoFromSection((u_int8_t*)NULL, sect_type, 0, 1);
 }
 
 bool Fs3Operations::IsFs3SectionReadable(u_int8_t type, QueryOptions queryOptions)
 {
-    //printf("-D- readSectList.size %d\n", (int) _readSectList.size());
-    if (_readSectList.size()) {
-        for (u_int32_t i = 0; i < _readSectList.size(); i++) {
-            if (_readSectList.at(i) == type) {
+    // printf("-D- readSectList.size %d\n", (int) _readSectList.size());
+    if (_readSectList.size())
+    {
+        for (u_int32_t i = 0; i < _readSectList.size(); i++)
+        {
+            if (_readSectList.at(i) == type)
+            {
                 return true;
             }
         }
         return false;
-
-    } else {
-        if (!queryOptions.readRom && type == FS3_ROM_CODE) {
+    }
+    else
+    {
+        if (!queryOptions.readRom && type == FS3_ROM_CODE)
+        {
             return false;
         }
-        if (queryOptions.quickQuery) {
-            if (IsGetInfoSupported(type)) {
+        if (queryOptions.quickQuery)
+        {
+            if (IsGetInfoSupported(type))
+            {
                 return true;
             }
             return false;
@@ -497,8 +536,13 @@ bool Fs3Operations::IsFs3SectionReadable(u_int8_t type, QueryOptions queryOption
     return true;
 }
 
-bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr, bool &bad_signature, VerifyCallBack verifyCallBackFunc, bool show_itoc,
-                              struct QueryOptions queryOptions, bool ignoreDToc, bool verbose)
+bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr,
+                              bool& bad_signature,
+                              VerifyCallBack verifyCallBackFunc,
+                              bool show_itoc,
+                              struct QueryOptions queryOptions,
+                              bool ignoreDToc,
+                              bool verbose)
 {
     DPRINTF(("Fs3Operations::VerifyTOC\n"));
     u_int8_t buffer[TOC_HEADER_SIZE], entry_buffer[TOC_ENTRY_SIZE];
@@ -513,14 +557,17 @@ bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr, bool &bad_signature, VerifyCa
     cibfw_itoc_header_unpack(&itoc_header, buffer);
     memcpy(_fs3ImgInfo.itocHeader, buffer, CIBFW_ITOC_HEADER_SIZE);
     // cibfw_itoc_header_dump(&itoc_header, stdout);
-    u_int32_t first_signature =  ITOC_ASCII;
-    if (!CheckTocSignature(&itoc_header, first_signature)) {
+    u_int32_t first_signature = ITOC_ASCII;
+    if (!CheckTocSignature(&itoc_header, first_signature))
+    {
         bad_signature = true;
         return false;
     }
-    u_int32_t toc_crc = CalcImageCRC((u_int32_t *)buffer, (TOC_HEADER_SIZE / 4) - 1);
+    u_int32_t toc_crc = CalcImageCRC((u_int32_t*)buffer, (TOC_HEADER_SIZE / 4) - 1);
     phys_addr = _ioAccess->get_phys_from_cont(dtoc_addr, _fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
-    if (!DumpFs3CRCCheck(FS3_ITOC, phys_addr, TOC_HEADER_SIZE, toc_crc, itoc_header.itoc_entry_crc, false, verifyCallBackFunc)) {
+    if (!DumpFs3CRCCheck(FS3_ITOC, phys_addr, TOC_HEADER_SIZE, toc_crc, itoc_header.itoc_entry_crc, false,
+                         verifyCallBackFunc))
+    {
         ret_val = false;
     }
     _fs3ImgInfo.itocAddr = dtoc_addr;
@@ -528,97 +575,136 @@ bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr, bool &bad_signature, VerifyCa
     int section_index = 0;
     struct cibfw_itoc_entry toc_entry;
 
-    do {
+    do
+    {
         // Uopdate the cont address
         _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
-        u_int32_t entry_addr = dtoc_addr + TOC_HEADER_SIZE + section_index *  TOC_ENTRY_SIZE;
+        u_int32_t entry_addr = dtoc_addr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
         READBUF((*_ioAccess), entry_addr, entry_buffer, TOC_ENTRY_SIZE, "TOC Entry");
         Fs3UpdateImgCache(entry_buffer, entry_addr, TOC_ENTRY_SIZE);
 
         cibfw_itoc_entry_unpack(&toc_entry, entry_buffer);
-        if (toc_entry.type == FS3_MFG_INFO) {
+        if (toc_entry.type == FS3_MFG_INFO)
+        {
             mfg_exists = true;
         }
         // printf("-D- toc = %#x, toc_entry.type  = %#x\n", section_index, toc_entry.type);
-        if (toc_entry.type != FS3_END) {
-            if (section_index + 1 >= MAX_TOCS_NUM) {
-                return errmsg("Internal error: number of ITOCs %d is greater than allowed %d", section_index + 1, MAX_TOCS_NUM);
+        if (toc_entry.type != FS3_END)
+        {
+            if (section_index + 1 >= MAX_TOCS_NUM)
+            {
+                return errmsg("Internal error: number of ITOCs %d is greater than allowed %d", section_index + 1,
+                              MAX_TOCS_NUM);
             }
 
-            u_int32_t entry_crc = CalcImageCRC((u_int32_t *)entry_buffer, (TOC_ENTRY_SIZE / 4) - 1);
+            u_int32_t entry_crc = CalcImageCRC((u_int32_t*)entry_buffer, (TOC_ENTRY_SIZE / 4) - 1);
             u_int32_t entry_size_in_bytes = toc_entry.size * 4;
-            //printf("-D- entry_crc = %#x, toc_entry.itoc_entry_crc = %#x\n", entry_crc, toc_entry.itoc_entry_crc);
+            // printf("-D- entry_crc = %#x, toc_entry.itoc_entry_crc = %#x\n", entry_crc, toc_entry.itoc_entry_crc);
 
-            if (toc_entry.itoc_entry_crc == entry_crc) {
+            if (toc_entry.itoc_entry_crc == entry_crc)
+            {
                 // Update last image address
                 u_int32_t section_last_addr;
                 u_int32_t flash_addr = toc_entry.flash_addr << 2;
-                if (!toc_entry.relative_addr) {
+                if (!toc_entry.relative_addr)
+                {
                     _ioAccess->set_address_convertor(0, 0);
                     phys_addr = flash_addr;
-                    _fs3ImgInfo.smallestAbsAddr = (_fs3ImgInfo.smallestAbsAddr < flash_addr && _fs3ImgInfo.smallestAbsAddr > 0)
-                                                  ? _fs3ImgInfo.smallestAbsAddr : flash_addr;
-                } else {
-                    phys_addr = _ioAccess->get_phys_from_cont(flash_addr, _fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
+                    _fs3ImgInfo.smallestAbsAddr =
+                      (_fs3ImgInfo.smallestAbsAddr < flash_addr && _fs3ImgInfo.smallestAbsAddr > 0) ?
+                        _fs3ImgInfo.smallestAbsAddr :
+                        flash_addr;
+                }
+                else
+                {
+                    phys_addr =
+                      _ioAccess->get_phys_from_cont(flash_addr, _fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
                     u_int32_t currSizeOfImgdata = phys_addr + entry_size_in_bytes;
-                    _fs3ImgInfo.sizeOfImgData = (_fs3ImgInfo.sizeOfImgData > currSizeOfImgdata) ? _fs3ImgInfo.sizeOfImgData : currSizeOfImgdata;
+                    _fs3ImgInfo.sizeOfImgData =
+                      (_fs3ImgInfo.sizeOfImgData > currSizeOfImgdata) ? _fs3ImgInfo.sizeOfImgData : currSizeOfImgdata;
                 }
                 section_last_addr = phys_addr + entry_size_in_bytes;
-                _fwImgInfo.lastImageAddr = (_fwImgInfo.lastImageAddr >= section_last_addr) ? _fwImgInfo.lastImageAddr : section_last_addr;
-
-                if (IsFs3SectionReadable(toc_entry.type, queryOptions)) {
+                _fwImgInfo.lastImageAddr =
+                  (_fwImgInfo.lastImageAddr >= section_last_addr) ? _fwImgInfo.lastImageAddr : section_last_addr;
 
-                    if (ignoreDToc && toc_entry.device_data) {
+                if (IsFs3SectionReadable(toc_entry.type, queryOptions))
+                {
+                    if (ignoreDToc && toc_entry.device_data)
+                    {
                         break;
                     }
                     // Only when we have full verify or the info of this section should be collected for query
                     std::vector<u_int8_t> buffv(entry_size_in_bytes);
-                    u_int8_t *buff = (u_int8_t *)(buffv.size() ? (&(buffv[0])) : NULL);
-                    if (show_itoc) {
+                    u_int8_t* buff = (u_int8_t*)(buffv.size() ? (&(buffv[0])) : NULL);
+                    if (show_itoc)
+                    {
                         cibfw_itoc_entry_dump(&toc_entry, stdout);
-                        if (!DumpFs3CRCCheck(toc_entry.type, phys_addr, entry_size_in_bytes, 0, 0, true, verifyCallBackFunc)) {
+                        if (!DumpFs3CRCCheck(toc_entry.type, phys_addr, entry_size_in_bytes, 0, 0, true,
+                                             verifyCallBackFunc))
+                        {
                             ret_val = false;
                         }
-                    } else {
-                        if (!verbose) {
+                    }
+                    else
+                    {
+                        if (!verbose)
+                        {
                             READBUF((*_ioAccess), flash_addr, buff, entry_size_in_bytes, "Section");
                         }
-                        else {
-                            if (!(*_ioAccess).read(flash_addr, buff, entry_size_in_bytes, true, "Section")) {
+                        else
+                        {
+                            if (!(*_ioAccess).read(flash_addr, buff, entry_size_in_bytes, true, "Section"))
+                            {
                                 return errmsg("%s - read error (%s)\n", "Section", (*_ioAccess).err());
                             }
                         }
                         Fs3UpdateImgCache(buff, flash_addr, entry_size_in_bytes);
-                        u_int32_t sect_crc = CalcImageCRC((u_int32_t *)buff, toc_entry.size);
+                        u_int32_t sect_crc = CalcImageCRC((u_int32_t*)buff, toc_entry.size);
 
-                        //printf("-D- flash_addr: %#x, toc_entry_size = %#x, actual sect = %#x, from itoc: %#x np_crc = %s\n", flash_addr, toc_entry.size, sect_crc,
+                        // printf("-D- flash_addr: %#x, toc_entry_size = %#x, actual sect = %#x, from itoc: %#x np_crc =
+                        // %s\n", flash_addr, toc_entry.size, sect_crc,
                         //    toc_entry.section_crc, toc_entry.no_crc ? "yes" : "no");
-                        if (!DumpFs3CRCCheck(toc_entry.type, phys_addr, entry_size_in_bytes, sect_crc, toc_entry.section_crc, toc_entry.no_crc, verifyCallBackFunc)) {
-                            if (toc_entry.device_data) {
+                        if (!DumpFs3CRCCheck(toc_entry.type, phys_addr, entry_size_in_bytes, sect_crc,
+                                             toc_entry.section_crc, toc_entry.no_crc, verifyCallBackFunc))
+                        {
+                            if (toc_entry.device_data)
+                            {
                                 _badDevDataSections = true;
                             }
                             ret_val = false;
-                        } else {
-                            //printf("-D- toc type : 0x%.8x\n" , toc_entry.type);
-                            GetSectData(_fs3ImgInfo.tocArr[section_index].section_data, (u_int32_t *)buff, toc_entry.size * 4);
-                            if (IsGetInfoSupported(toc_entry.type)) {
-                                if (!GetImageInfoFromSection(buff, toc_entry.type, toc_entry.size * 4)) {
+                        }
+                        else
+                        {
+                            // printf("-D- toc type : 0x%.8x\n" , toc_entry.type);
+                            GetSectData(_fs3ImgInfo.tocArr[section_index].section_data, (u_int32_t*)buff,
+                                        toc_entry.size * 4);
+                            if (IsGetInfoSupported(toc_entry.type))
+                            {
+                                if (!GetImageInfoFromSection(buff, toc_entry.type, toc_entry.size * 4))
+                                {
                                     ret_val = false;
-                                    errmsg("Failed to get info from section %d, check the supported_hw_id section in MLX file!\n", toc_entry.type);
+                                    errmsg(
+                                      "Failed to get info from section %d, check the supported_hw_id section in MLX file!\n",
+                                      toc_entry.type);
                                 }
-                            } else if (toc_entry.type == FS3_DBG_FW_INI) {
+                            }
+                            else if (toc_entry.type == FS3_DBG_FW_INI)
+                            {
                                 TOCPUn(buff, toc_entry.size);
-                                GetSectData(_fwConfSect, (u_int32_t *)buff, toc_entry.size * 4);
+                                GetSectData(_fwConfSect, (u_int32_t*)buff, toc_entry.size * 4);
                             }
                         }
                     }
                 }
-            } else {
+            }
+            else
+            {
                 /*
-                   printf("-D- Bad ITOC CRC: toc_entry.itoc_entry_crc = %#x, actual crc: %#x, entry_size_in_bytes = %#x\n", toc_entry.itoc_entry_crc,
-                        entry_crc, entry_size_in_bytes);
+                   printf("-D- Bad ITOC CRC: toc_entry.itoc_entry_crc = %#x, actual crc: %#x, entry_size_in_bytes =
+                   %#x\n", toc_entry.itoc_entry_crc, entry_crc, entry_size_in_bytes);
                  */
-                return errmsg(MLXFW_BAD_CRC_ERR, "Bad Itoc Entry CRC. Expected: 0x%x , Actual: 0x%x", toc_entry.itoc_entry_crc, entry_crc);
+                return errmsg(MLXFW_BAD_CRC_ERR, "Bad Itoc Entry CRC. Expected: 0x%x , Actual: 0x%x",
+                              toc_entry.itoc_entry_crc, entry_crc);
             }
 
             _fs3ImgInfo.tocArr[section_index].entry_addr = entry_addr;
@@ -629,17 +715,17 @@ bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr, bool &bad_signature, VerifyCa
     } while (toc_entry.type != FS3_END);
     _fs3ImgInfo.numOfItocs = section_index - 1;
 
-    if (!ignoreDToc && !mfg_exists) {
+    if (!ignoreDToc && !mfg_exists)
+    {
         _badDevDataSections = true;
         return errmsg(MLXFW_NO_MFG_ERR, "No \"" MFG_INFO "\" info section.");
     }
     return ret_val;
 }
 
-
 bool Fs3Operations::FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage, bool showItoc, bool ignoreDToc)
 {
-    //dummy assignment to avoid compiler warrning (isStripedImage is not used in fs3)
+    // dummy assignment to avoid compiler warrning (isStripedImage is not used in fs3)
     (void)isStripedImage;
 
     struct QueryOptions queryOptions;
@@ -648,7 +734,11 @@ bool Fs3Operations::FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedIm
     return FsVerifyAux(verifyCallBackFunc, showItoc, queryOptions, ignoreDToc);
 }
 
-bool Fs3Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_itoc, struct QueryOptions queryOptions, bool ignoreDToc, bool verbose)
+bool Fs3Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc,
+                                bool show_itoc,
+                                struct QueryOptions queryOptions,
+                                bool ignoreDToc,
+                                bool verbose)
 {
     DPRINTF(("Fs3Operations::FsVerifyAux\n"));
     u_int32_t cntx_image_start[CNTX_START_POS_SIZE] = {0};
@@ -658,8 +748,10 @@ bool Fs3Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
     u_int8_t binVerMajor = 0, binVerMinor = 0;
     bool bad_signature;
     FindAllImageStart(_ioAccess, cntx_image_start, &cntx_image_num, _cntx_magic_pattern);
-    if (cntx_image_num == 0) {
-        return errmsg(MLXFW_NO_VALID_IMAGE_ERR, "\nNo valid FS3 image found. Check the flash parameters, if specified.");
+    if (cntx_image_num == 0)
+    {
+        return errmsg(MLXFW_NO_VALID_IMAGE_ERR,
+                      "\nNo valid FS3 image found. Check the flash parameters, if specified.");
     }
 
     u_int32_t image_start = cntx_image_start[0];
@@ -667,30 +759,35 @@ bool Fs3Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
     // Read BOOT
     _ioAccess->set_address_convertor(0, 0);
     READBUF((*_ioAccess), image_start, buff, FS3_BOOT_START, "Image header");
-    Fs3UpdateImgCache((u_int8_t *)buff, 0, FS3_BOOT_START);
+    Fs3UpdateImgCache((u_int8_t*)buff, 0, FS3_BOOT_START);
     TOCPUn(buff, FS3_BOOT_START_IN_DW);
-    _maxImgLog2Size = EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) ? EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) : FS3_LOG_CHUNK_SIZE;
+    _maxImgLog2Size = EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) ?
+                        EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) :
+                        FS3_LOG_CHUNK_SIZE;
     binVerMajor = EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 8, 8);
     binVerMinor = EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 0, 8);
     // check if binary version is supported by the tool
-    if (!CheckBinVersion(binVerMajor, binVerMinor)) {
+    if (!CheckBinVersion(binVerMajor, binVerMinor))
+    {
         return false;
     }
     // Put info
     _fwImgInfo.imgStart = image_start;
     // read the chunk size from the image header
-    if (_maxImgLog2Size == 0x16 && _fwImgInfo.imgStart == 0x800000) {
+    if (_maxImgLog2Size == 0x16 && _fwImgInfo.imgStart == 0x800000)
+    {
         _fwImgInfo.cntxLog2ChunkSize = 0x17;
-    } else {
+    }
+    else
+    {
         _fwImgInfo.cntxLog2ChunkSize = _maxImgLog2Size;
     }
     _fwImgInfo.ext_info.is_failsafe = true;
-    _fwImgInfo.actuallyFailsafe  = true;
+    _fwImgInfo.actuallyFailsafe = true;
     _fwImgInfo.magicPatternFound = 1;
 
     _ioAccess->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
 
-
     report_callback(verifyCallBackFunc, "\nFS3 failsafe image\n\n");
     // adrianc: we dont check Preboot section (or boot start) because of a variance in the calculation of the CRC
 
@@ -702,19 +799,23 @@ bool Fs3Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
     _fs3ImgInfo.firstItocIsEmpty = false;
     // printf("-D- image_start = %#x\n", image_start);
     // Go over the ITOC entries
-    // adrianc: need to have the sector size hardcoded in the FW binary (since its determined in the image generation process)
+    // adrianc: need to have the sector size hardcoded in the FW binary (since its determined in the image generation
+    // process)
     u_int32_t sector_size = FS3_DEFAULT_SECTOR_SIZE;
     offset = (offset % sector_size == 0) ? offset : (offset + sector_size - offset % 0x1000);
-    while (offset < _ioAccess->get_effective_size()) {
-
-        if (VerifyTOC(offset, bad_signature, verifyCallBackFunc, show_itoc, queryOptions, ignoreDToc, verbose)) {
+    while (offset < _ioAccess->get_effective_size())
+    {
+        if (VerifyTOC(offset, bad_signature, verifyCallBackFunc, show_itoc, queryOptions, ignoreDToc, verbose))
+        {
             return true;
-        } else {
-            if (!bad_signature) {
+        }
+        else
+        {
+            if (!bad_signature)
+            {
                 return false;
             }
             _fs3ImgInfo.firstItocIsEmpty = true;
-
         }
         offset += sector_size;
     }
@@ -728,73 +829,85 @@ bool Fs3Operations::FsIntQueryAux(bool readRom, bool quickQuery, bool ignoreDToc
     queryOptions.readRom = readRom;
     queryOptions.quickQuery = quickQuery;
 
-    if (!FsVerifyAux((VerifyCallBack)NULL, 0, queryOptions, ignoreDToc, verbose)) {
+    if (!FsVerifyAux((VerifyCallBack)NULL, 0, queryOptions, ignoreDToc, verbose))
+    {
         return false;
     }
 
     // get chip type and device sw id, from device/image
-    const u_int32_t *swId = (u_int32_t *)NULL;
-    if (_ioAccess->is_flash()) {
-        if (!getInfoFromHwDevid(_ioAccess->get_dev_id(), _fwImgInfo.ext_info.chip_type, &swId)) {
+    const u_int32_t* swId = (u_int32_t*)NULL;
+    if (_ioAccess->is_flash())
+    {
+        if (!getInfoFromHwDevid(_ioAccess->get_dev_id(), _fwImgInfo.ext_info.chip_type, &swId))
+        {
             return false;
         }
         _fwImgInfo.ext_info.dev_type = swId[0];
-        if (!_fwParams.ignoreCacheRep) {
+        if (!_fwParams.ignoreCacheRep)
+        {
             getRunningFwVersion();
         }
-    } else if (_fwImgInfo.supportedHwIdNum > 0) {
+    }
+    else if (_fwImgInfo.supportedHwIdNum > 0)
+    {
         // image
-        if (!getInfoFromHwDevid(_fwImgInfo.supportedHwId[0], _fwImgInfo.ext_info.chip_type, &swId)) {
+        if (!getInfoFromHwDevid(_fwImgInfo.supportedHwId[0], _fwImgInfo.ext_info.chip_type, &swId))
+        {
             return false;
         }
         _fwImgInfo.ext_info.dev_type = swId[0];
     }
-    if (FwType() == FIT_FS4 &&
-        _fwImgInfo.ext_info.image_info_minor_version >= 3 &&
-        _fwImgInfo.ext_info.pci_device_id != 0) {
+    if (FwType() == FIT_FS4 && _fwImgInfo.ext_info.image_info_minor_version >= 3 &&
+        _fwImgInfo.ext_info.pci_device_id != 0)
+    {
         _fwImgInfo.ext_info.dev_type = _fwImgInfo.ext_info.pci_device_id;
     }
-    if (_signatureExists == 0 || _publicKeysExists == 0 || _fs3ImgInfo.ext_info.mcc_en == 0) {
+    if (_signatureExists == 0 || _publicKeysExists == 0 || _fs3ImgInfo.ext_info.mcc_en == 0)
+    {
         _fs3ImgInfo.ext_info.security_mode = SM_NONE;
     }
     _internalQueryPerformed = true;
     return true;
 }
 
-bool Fs3Operations::getRunningFwVersion() {
+bool Fs3Operations::getRunningFwVersion()
+{
 #ifndef UEFI_BUILD
     reg_access_status_t reg_access_rc;
     struct reg_access_hca_mgir mgir;
     memset(&mgir, 0, sizeof(mgir));
     mfile* mf = _ioAccess->getMfileObj();
     reg_access_rc = reg_access_mgir(mf, REG_ACCESS_METHOD_GET, &mgir);
-    if (reg_access_rc == ME_OK) {
+    if (reg_access_rc == ME_OK)
+    {
         strncpy(_fwImgInfo.ext_info.running_branch_ver,
-                (char*) mgir.dev_info.dev_branch_tag,
+                (char*)mgir.dev_info.dev_branch_tag,
                 sizeof(_fwImgInfo.ext_info.running_branch_ver) - 1);
         _fwImgInfo.ext_info.running_fw_ver[0] = mgir.fw_info.extended_major;
         _fwImgInfo.ext_info.running_fw_ver[1] = mgir.fw_info.extended_minor;
         _fwImgInfo.ext_info.running_fw_ver[2] = mgir.fw_info.extended_sub_minor;
-        if (_fwImgInfo.ext_info.running_fw_ver[0] == 0
-                && _fwImgInfo.ext_info.running_fw_ver[1] == 0
-                && _fwImgInfo.ext_info.running_fw_ver[2] == 0) {
+        if (_fwImgInfo.ext_info.running_fw_ver[0] == 0 && _fwImgInfo.ext_info.running_fw_ver[1] == 0 &&
+            _fwImgInfo.ext_info.running_fw_ver[2] == 0)
+        {
             // Deprecated versions
             _fwImgInfo.ext_info.running_fw_ver[0] = mgir.fw_info.major;
             _fwImgInfo.ext_info.running_fw_ver[1] = mgir.fw_info.minor;
             _fwImgInfo.ext_info.running_fw_ver[2] = mgir.fw_info.sub_minor;
         }
-    } else {
+    }
+    else
+    {
         _fwImgInfo.ext_info.running_branch_ver[0] = '\0';
         struct connectib_icmd_get_fw_info fwVer;
         memset(&fwVer, 0, sizeof(fwVer));
-        int rc = gcif_get_fw_info(((Flash *) _ioAccess)->getMfileObj(), &fwVer);
-        if (rc && rc != GCIF_STATUS_UNSUPPORTED_ICMD_VERSION
-                && rc != GCIF_STATUS_INVALID_OPCODE
-                && rc != GCIF_ICMD_NOT_SUPPORTED) {
-            return errmsg("Failed to get running FW version. %s",
-                    gcif_err_str(rc));
-        }
-        if (!rc) {
+        int rc = gcif_get_fw_info(((Flash*)_ioAccess)->getMfileObj(), &fwVer);
+        if (rc && rc != GCIF_STATUS_UNSUPPORTED_ICMD_VERSION && rc != GCIF_STATUS_INVALID_OPCODE &&
+            rc != GCIF_ICMD_NOT_SUPPORTED)
+        {
+            return errmsg("Failed to get running FW version. %s", gcif_err_str(rc));
+        }
+        if (!rc)
+        {
             _fwImgInfo.ext_info.running_fw_ver[0] = fwVer.fw_version.MAJOR;
             _fwImgInfo.ext_info.running_fw_ver[1] = fwVer.fw_version.MINOR;
             _fwImgInfo.ext_info.running_fw_ver[2] = fwVer.fw_version.SUBMINOR;
@@ -809,7 +922,8 @@ void Fs3Operations::deal_with_signal()
 #ifndef UEFI_BUILD
     int sig;
     sig = mft_signal_is_fired();
-    if (sig) {
+    if (sig)
+    {
         mft_signal_set_fired(0);
         mft_signal_set_handling(0);
         raise(sig);
@@ -819,22 +933,27 @@ void Fs3Operations::deal_with_signal()
     return;
 }
 
-reg_access_status_t Fs3Operations::getGI(mfile *mf,
-        struct reg_access_hca_mgir *gi) {
+reg_access_status_t Fs3Operations::getGI(mfile* mf, struct reg_access_hca_mgir* gi)
+{
     reg_access_status_t rc = ME_REG_ACCESS_OK;
     u_int32_t tp = 0;
     mget_mdevs_type(mf, &tp);
 #if !defined(UEFI_BUILD) && !defined(NO_INBAND)
     mft_signal_set_handling(1);
-    if (tp == MST_IB) {
+    if (tp == MST_IB)
+    {
         rc = (reg_access_status_t)mad_ifc_general_info_hw(mf, &gi->hw_info);
-        if (!rc) {
+        if (!rc)
+        {
             rc = (reg_access_status_t)mad_ifc_general_info_fw(mf, &gi->fw_info);
-            if (!rc) {
+            if (!rc)
+            {
                 rc = (reg_access_status_t)mad_ifc_general_info_sw(mf, &gi->sw_info);
             }
         }
-    } else {
+    }
+    else
+    {
         rc = reg_access_mgir(mf, REG_ACCESS_METHOD_GET, gi);
     }
     deal_with_signal();
@@ -842,36 +961,43 @@ reg_access_status_t Fs3Operations::getGI(mfile *mf,
     rc = reg_access_mgir(mf, REG_ACCESS_METHOD_GET, gi);
 #endif
     return rc;
-
 }
 
-
-bool Fs3Operations::FwQuery(fw_info_t *fwInfo, bool readRom, bool /*isStripedImage*/, bool quickQuery, bool ignoreDToc, bool verbose)
+bool Fs3Operations::FwQuery(fw_info_t* fwInfo,
+                            bool readRom,
+                            bool /*isStripedImage*/,
+                            bool quickQuery,
+                            bool ignoreDToc,
+                            bool verbose)
 {
-    //isStripedImage flag is not needed in FS3 image format
+    // isStripedImage flag is not needed in FS3 image format
     DPRINTF(("Fs3Operations::FwQuery\n"));
     reg_access_status_t rc = ME_ERROR;
     struct reg_access_hca_mgir mgir;
     // FsIntQueryAux will update _fwImgInfo.ext_info & _fs3ImgInfo.ext_info
-    if (!FsIntQueryAux(readRom, quickQuery, ignoreDToc, verbose)) {
+    if (!FsIntQueryAux(readRom, quickQuery, ignoreDToc, verbose))
+    {
         return false;
     }
-    if (_ioAccess->is_flash() && _fwParams.ignoreCacheRep == 0) {
+    if (_ioAccess->is_flash() && _fwParams.ignoreCacheRep == 0)
+    {
         /*
-        * * MGIR
-        * */
+         * * MGIR
+         * */
         memset(&mgir, 0, sizeof(mgir));
-        rc = getGI(((Flash *)_ioAccess)->getMfileObj(), &mgir);
-        if (rc == ME_OK) {
+        rc = getGI(((Flash*)_ioAccess)->getMfileObj(), &mgir);
+        if (rc == ME_OK)
+        {
             _fwImgInfo.ext_info.isfu_major = mgir.fw_info.isfu_major;
         }
     }
 
     mfile* mf = getMfileObj();
-    memcpy(&(fwInfo->fw_info),  &(_fwImgInfo.ext_info),  sizeof(fw_info_com_t));
+    memcpy(&(fwInfo->fw_info), &(_fwImgInfo.ext_info), sizeof(fw_info_com_t));
     memcpy(&(fwInfo->fs3_info), &(_fs3ImgInfo.ext_info), sizeof(fs3_info_t));
     fwInfo->fw_type = FwType();
-    if (rc == ME_OK && mf != NULL && mf->flags & MDEVS_IB) { //for IB devices only
+    if (rc == ME_OK && mf != NULL && mf->flags & MDEVS_IB)
+    { // for IB devices only
         fwInfo->fw_info.running_fw_ver[0] = mgir.fw_info.extended_major;
         fwInfo->fw_info.running_fw_ver[1] = mgir.fw_info.extended_minor;
         fwInfo->fw_info.running_fw_ver[2] = mgir.fw_info.extended_sub_minor;
@@ -884,13 +1010,13 @@ u_int8_t Fs3Operations::FwType()
     return FIT_FS3;
 }
 
-
 bool Fs3Operations::FwInit()
 {
     FwInitCom();
     memset(&_fs3ImgInfo.ext_info, 0, sizeof(_fs3ImgInfo.ext_info));
     _fs3ImgInfo.numOfItocs = 0;
-    for (int i = 0; i < MAX_TOCS_NUM; i++) {
+    for (int i = 0; i < MAX_TOCS_NUM; i++)
+    {
         memset(&_fs3ImgInfo.tocArr[i].data, 0, sizeof(_fs3ImgInfo.tocArr[i].data));
         memset(&_fs3ImgInfo.tocArr[i].toc_entry, 0, sizeof(_fs3ImgInfo.tocArr[i].toc_entry));
         _fs3ImgInfo.tocArr[i].entry_addr = 0;
@@ -905,26 +1031,36 @@ bool Fs3Operations::FwInit()
     return true;
 }
 
-#define GET_DIFFER_STR(flash_toc_entry, image_toc_entry) \
-    (flash_toc_entry->device_data != image_toc_entry->device_data) ? "device_data" : \
-                                                                     (flash_toc_entry->no_crc != image_toc_entry->no_crc)   ? "no_crc" : \
-                                                                                                                              (flash_toc_entry->relative_addr != image_toc_entry->relative_addr) ? "relative_addr" : ""
-
-bool Fs3Operations::UpdateDevDataITOC(Fs3Operations &imageOps, struct toc_info *image_toc_info_entry, struct toc_info *flash_toc_arr, int flash_toc_size)
+#define GET_DIFFER_STR(flash_toc_entry, image_toc_entry)             \
+    (flash_toc_entry->device_data != image_toc_entry->device_data) ? \
+      "device_data" :                                                \
+      (flash_toc_entry->no_crc != image_toc_entry->no_crc) ?         \
+      "no_crc" :                                                     \
+      (flash_toc_entry->relative_addr != image_toc_entry->relative_addr) ? "relative_addr" : ""
+
+bool Fs3Operations::UpdateDevDataITOC(Fs3Operations& imageOps,
+                                      struct toc_info* image_toc_info_entry,
+                                      struct toc_info* flash_toc_arr,
+                                      int flash_toc_size)
 {
     u_int8_t itoc_data[CIBFW_ITOC_ENTRY_SIZE];
-    struct cibfw_itoc_entry *image_toc_entry = &image_toc_info_entry->toc_entry;
+    struct cibfw_itoc_entry* image_toc_entry = &image_toc_info_entry->toc_entry;
 
-    for (int i = 0; i < flash_toc_size; i++) {
-        struct toc_info *flash_toc_info = &flash_toc_arr[i];
-        struct cibfw_itoc_entry *flash_toc_entry = &flash_toc_info->toc_entry;
-        if (flash_toc_entry->type == image_toc_entry->type) {
+    for (int i = 0; i < flash_toc_size; i++)
+    {
+        struct toc_info* flash_toc_info = &flash_toc_arr[i];
+        struct cibfw_itoc_entry* flash_toc_entry = &flash_toc_info->toc_entry;
+        if (flash_toc_entry->type == image_toc_entry->type)
+        {
             // sanity checks on itoc entry
-            if ((flash_toc_entry->device_data != image_toc_entry->device_data) || \
-                 (flash_toc_entry->no_crc != image_toc_entry->no_crc) || \
-                 (flash_toc_entry->relative_addr != image_toc_entry->relative_addr)) {
-                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "An inconsistency was found in %s section attributes. %s ITOC attribute differs", \
-                              GetSectionNameByType(image_toc_entry->type), GET_DIFFER_STR(flash_toc_entry, image_toc_entry));
+            if ((flash_toc_entry->device_data != image_toc_entry->device_data) ||
+                (flash_toc_entry->no_crc != image_toc_entry->no_crc) ||
+                (flash_toc_entry->relative_addr != image_toc_entry->relative_addr))
+            {
+                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
+                              "An inconsistency was found in %s section attributes. %s ITOC attribute differs",
+                              GetSectionNameByType(image_toc_entry->type),
+                              GET_DIFFER_STR(flash_toc_entry, image_toc_entry));
             }
             // replace itoc entry in the image
             memset(itoc_data, 0, CIBFW_ITOC_ENTRY_SIZE);
@@ -942,7 +1078,8 @@ bool Fs3Operations::CheckFs3ImgSize(Fs3Operations& imageOps, bool useImageDevDat
      * SLOT0: starts add flash address 0x0
      * SLOT1: starts at flash address 2^_maxImgLogSize
      * Device sections can either be a part of SLOT0 Image or SLOT1 or not, depending on flash size
-     * if flash size is greater than 2^(_maxImgLogSize+1) than device sections and first/second image dont share same area
+     * if flash size is greater than 2^(_maxImgLogSize+1) than device sections and first/second image dont share same
+     * area
      * */
     Fs3Operations& ops = useImageDevData ? imageOps : *this;
     u_int32_t maxFsImgSize = 1 << imageOps._maxImgLog2Size;
@@ -951,16 +1088,23 @@ bool Fs3Operations::CheckFs3ImgSize(Fs3Operations& imageOps, bool useImageDevDat
     u_int32_t maxImgDataSizeSlot0, maxImgDataSizeSlot1;
 
     // find smallest abs address in SLOT0
-    for (int i = 0; i < ops._fs3ImgInfo.numOfItocs; i++) {
-        struct cibfw_itoc_entry *toc_entry = &ops._fs3ImgInfo.tocArr[i].toc_entry;
+    for (int i = 0; i < ops._fs3ImgInfo.numOfItocs; i++)
+    {
+        struct cibfw_itoc_entry* toc_entry = &ops._fs3ImgInfo.tocArr[i].toc_entry;
         u_int32_t tocEntryFlashAddr = toc_entry->flash_addr << 2;
-        if (toc_entry->device_data) {
-            if (tocEntryFlashAddr > maxFsImgSize) {
+        if (toc_entry->device_data)
+        {
+            if (tocEntryFlashAddr > maxFsImgSize)
+            {
                 // address in SLOT1
-                smallestAbsAddrSlot1 = smallestAbsAddrSlot1 > tocEntryFlashAddr ? tocEntryFlashAddr : smallestAbsAddrSlot1;
-            } else {
+                smallestAbsAddrSlot1 =
+                  smallestAbsAddrSlot1 > tocEntryFlashAddr ? tocEntryFlashAddr : smallestAbsAddrSlot1;
+            }
+            else
+            {
                 // address in SLOT0
-                smallestAbsAddrSlot0 = smallestAbsAddrSlot0 > tocEntryFlashAddr ? tocEntryFlashAddr : smallestAbsAddrSlot0;
+                smallestAbsAddrSlot0 =
+                  smallestAbsAddrSlot0 > tocEntryFlashAddr ? tocEntryFlashAddr : smallestAbsAddrSlot0;
             }
         }
     }
@@ -968,91 +1112,116 @@ bool Fs3Operations::CheckFs3ImgSize(Fs3Operations& imageOps, bool useImageDevDat
     maxImgDataSizeSlot1 = smallestAbsAddrSlot1 - maxFsImgSize;
 
     u_int32_t maxImgDataSize = maxImgDataSizeSlot0 < maxImgDataSizeSlot1 ? maxImgDataSizeSlot0 : maxImgDataSizeSlot1;
-    if (imageOps._fs3ImgInfo.sizeOfImgData > maxImgDataSize) {
-        return errmsg(MLXFW_IMAGE_TOO_LARGE_ERR, "Size of image data (0x%x) is greater than max size of image data (0x%x)",
-                      imageOps._fs3ImgInfo.sizeOfImgData,  maxImgDataSize);
+    if (imageOps._fs3ImgInfo.sizeOfImgData > maxImgDataSize)
+    {
+        return errmsg(MLXFW_IMAGE_TOO_LARGE_ERR,
+                      "Size of image data (0x%x) is greater than max size of image data (0x%x)",
+                      imageOps._fs3ImgInfo.sizeOfImgData, maxImgDataSize);
     }
     return true;
 }
 
-u_int32_t Fs3Operations::getNewImageStartAddress(Fs3Operations &imageOps, bool isBurnFailSafe)
+u_int32_t Fs3Operations::getNewImageStartAddress(Fs3Operations& imageOps, bool isBurnFailSafe)
 {
     u_int32_t newImageStartAddress;
     if ((_fwImgInfo.imgStart != 0 && imageOps._fwImgInfo.cntxLog2ChunkSize != 0x17) ||
         (_fwImgInfo.imgStart == 0x800000 && imageOps._fwImgInfo.cntxLog2ChunkSize == 0x17) ||
-        (!isBurnFailSafe && ((Flash *)_ioAccess)->get_ignore_cache_replacment())) {
+        (!isBurnFailSafe && ((Flash*)_ioAccess)->get_ignore_cache_replacment()))
+    {
         // if the burn is not failsafe and with -ocr, the image is burnt at 0x0
         newImageStartAddress = 0;
-    } else if (_fwImgInfo.cntxLog2ChunkSize == 0x17) {
+    }
+    else if (_fwImgInfo.cntxLog2ChunkSize == 0x17)
+    {
         newImageStartAddress = 0x800000;
-    } else {
+    }
+    else
+    {
         newImageStartAddress = (1 << imageOps._fwImgInfo.cntxLog2ChunkSize);
     }
     return newImageStartAddress;
 }
 
-bool Fs3Operations::BurnFs3Image(Fs3Operations &imageOps,
-                                 ExtBurnParams& burnParams)
+bool Fs3Operations::BurnFs3Image(Fs3Operations& imageOps, ExtBurnParams& burnParams)
 {
     u_int8_t is_curr_image_in_odd_chunks;
     u_int32_t total_img_size = 0;
     u_int32_t sector_size = FS3_DEFAULT_SECTOR_SIZE;
     u_int8_t imageSignature[16];
-    Flash    *f     = (Flash *)(this->_ioAccess);
-    FImage   *fim   = (FImage *)(imageOps._ioAccess);
-    u_int8_t *data8;
+    Flash* f = (Flash*)(this->_ioAccess);
+    FImage* fim = (FImage*)(imageOps._ioAccess);
+    u_int8_t* data8;
 
-    if (_fwImgInfo.imgStart != 0 || (!burnParams.burnFailsafe && ((Flash *)_ioAccess)->get_ignore_cache_replacment())) {
+    if (_fwImgInfo.imgStart != 0 || (!burnParams.burnFailsafe && ((Flash*)_ioAccess)->get_ignore_cache_replacment()))
+    {
         is_curr_image_in_odd_chunks = 1;
-    } else {
+    }
+    else
+    {
         is_curr_image_in_odd_chunks = 0;
     }
 
     u_int32_t new_image_start = getNewImageStartAddress(imageOps, burnParams.burnFailsafe);
-    /*printf("-D- new_image_start = %#x, is_curr_image_in_odd_chunks = %#x\n", new_image_start, is_curr_image_in_odd_chunks);*/
+    /*printf("-D- new_image_start = %#x, is_curr_image_in_odd_chunks = %#x\n", new_image_start,
+     * is_curr_image_in_odd_chunks);*/
 
-    if (new_image_start == 0x800000) {
+    if (new_image_start == 0x800000)
+    {
         f->set_address_convertor(0x17, 1);
-    } else {
+    }
+    else
+    {
         // take chunk size from image in case of a non failsafe burn (in any case they should be the same)
         f->set_address_convertor(imageOps._fwImgInfo.cntxLog2ChunkSize, !is_curr_image_in_odd_chunks);
     }
 
-
     // check max image size
-    bool useImageDevData =  !burnParams.burnFailsafe && burnParams.useImgDevData;
-    if (!CheckFs3ImgSize(imageOps, useImageDevData)) {
+    bool useImageDevData = !burnParams.burnFailsafe && burnParams.useImgDevData;
+    if (!CheckFs3ImgSize(imageOps, useImageDevData))
+    {
         return false;
     }
 
     // update devDataTocsInImage
-    for (int i = 0; i < imageOps._fs3ImgInfo.numOfItocs; i++) {
-        struct toc_info *itoc_info_p = &imageOps._fs3ImgInfo.tocArr[i];
-        struct cibfw_itoc_entry *toc_entry = &itoc_info_p->toc_entry;
+    for (int i = 0; i < imageOps._fs3ImgInfo.numOfItocs; i++)
+    {
+        struct toc_info* itoc_info_p = &imageOps._fs3ImgInfo.tocArr[i];
+        struct cibfw_itoc_entry* toc_entry = &itoc_info_p->toc_entry;
 
-        if (toc_entry->device_data) {
+        if (toc_entry->device_data)
+        {
             // update dev_data itoc with the device's dev_data section addr
-            if (burnParams.burnFailsafe || !burnParams.useImgDevData) {
-                // we update the device data entires if : a. we burn failsafe or b. we burn non-failsafe but we take the device data anyway
-                if (!UpdateDevDataITOC(imageOps, itoc_info_p, _fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs)) {
+            if (burnParams.burnFailsafe || !burnParams.useImgDevData)
+            {
+                // we update the device data entires if : a. we burn failsafe or b. we burn non-failsafe but we take the
+                // device data anyway
+                if (!UpdateDevDataITOC(imageOps, itoc_info_p, _fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs))
+                {
                     return false;
                 }
             }
         }
     }
     // sanity check on the image itoc array
-    if (!imageOps.CheckItocArray()) {
+    if (!imageOps.CheckItocArray())
+    {
         return errmsg(MLXFW_IMAGE_CORRUPTED_ERR, "%s", imageOps.err());
     }
-    //find total image size that will be written
-    for (int i = 0; i < imageOps._fs3ImgInfo.numOfItocs; i++) {
-        struct toc_info *itoc_info_p = &imageOps._fs3ImgInfo.tocArr[i];
-        struct cibfw_itoc_entry *toc_entry = &itoc_info_p->toc_entry;
-        if (!toc_entry->device_data) {
+    // find total image size that will be written
+    for (int i = 0; i < imageOps._fs3ImgInfo.numOfItocs; i++)
+    {
+        struct toc_info* itoc_info_p = &imageOps._fs3ImgInfo.tocArr[i];
+        struct cibfw_itoc_entry* toc_entry = &itoc_info_p->toc_entry;
+        if (!toc_entry->device_data)
+        {
             total_img_size += toc_entry->size << 2;
-        } else if (!burnParams.burnFailsafe && burnParams.useImgDevData) {
+        }
+        else if (!burnParams.burnFailsafe && burnParams.useImgDevData)
+        {
             total_img_size += toc_entry->size << 2;
-        } else {
+        }
+        else
+        {
             continue;
         }
     }
@@ -1060,7 +1229,8 @@ bool Fs3Operations::BurnFs3Image(Fs3Operations &imageOps,
     // add boot section, itoc array (wo signature)
     total_img_size += imageOps._fs3ImgInfo.itocAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
 
-    if (total_img_size <= sector_size) {
+    if (total_img_size <= sector_size)
+    {
         return errmsg("Failed to burn FW. Internal error.");
     }
 
@@ -1068,78 +1238,83 @@ bool Fs3Operations::BurnFs3Image(Fs3Operations &imageOps,
     int alreadyWrittenSz = 0;
 
     /* Write begining of image: up to and including ITOCs  W/O signature */
-    u_int32_t beginingWithoutSignatureSize =  imageOps._fs3ImgInfo.itocAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
+    u_int32_t beginingWithoutSignatureSize = imageOps._fs3ImgInfo.itocAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
     data8 = new u_int8_t[beginingWithoutSignatureSize];
     imageOps._imageCache.get(data8, FS3_FW_SIGNATURE_SIZE, beginingWithoutSignatureSize);
     // write boot section, itoc array (wo signature)
-    if (!writeImageEx(
-            burnParams.progressFuncEx,
-            burnParams.progressUserData,
-            burnParams.progressFunc,
-            FS3_FW_SIGNATURE_SIZE,
-            data8,
-            beginingWithoutSignatureSize,
-            false,
-            false,
-            total_img_size,
-            alreadyWrittenSz)) {
+    if (!writeImageEx(burnParams.progressFuncEx,
+                      burnParams.progressUserData,
+                      burnParams.progressFunc,
+                      FS3_FW_SIGNATURE_SIZE,
+                      data8,
+                      beginingWithoutSignatureSize,
+                      false,
+                      false,
+                      total_img_size,
+                      alreadyWrittenSz))
+    {
         delete[] data8;
         return false;
     }
     delete[] data8;
     alreadyWrittenSz += beginingWithoutSignatureSize;
     // write itoc entries data
-    for (int i = 0; i < imageOps._fs3ImgInfo.numOfItocs; i++) {
-        struct toc_info *itoc_info_p = &imageOps._fs3ImgInfo.tocArr[i];
-        struct cibfw_itoc_entry *toc_entry = &itoc_info_p->toc_entry;
+    for (int i = 0; i < imageOps._fs3ImgInfo.numOfItocs; i++)
+    {
+        struct toc_info* itoc_info_p = &imageOps._fs3ImgInfo.tocArr[i];
+        struct cibfw_itoc_entry* toc_entry = &itoc_info_p->toc_entry;
         bool writeSection = true;
-        if (toc_entry->device_data && (burnParams.burnFailsafe || !burnParams.useImgDevData)) {
+        if (toc_entry->device_data && (burnParams.burnFailsafe || !burnParams.useImgDevData))
+        {
             writeSection = false;
         }
 
-        if (writeSection) {
-            if (!writeImageEx(
-                    burnParams.progressFuncEx,
-                    burnParams.progressUserData,
-                    burnParams.progressFunc,
-                    toc_entry->flash_addr << 2,
-                        &(itoc_info_p->section_data[0]),
-                        itoc_info_p->section_data.size(),
-                        !toc_entry->relative_addr,
-                        false, total_img_size, alreadyWrittenSz)) {
+        if (writeSection)
+        {
+            if (!writeImageEx(burnParams.progressFuncEx, burnParams.progressUserData, burnParams.progressFunc,
+                              toc_entry->flash_addr << 2, &(itoc_info_p->section_data[0]),
+                              itoc_info_p->section_data.size(), !toc_entry->relative_addr, false, total_img_size,
+                              alreadyWrittenSz))
+            {
                 return false;
             }
             alreadyWrittenSz += itoc_info_p->section_data.size();
         }
     }
 
-    if (!f->is_flash()) {
+    if (!f->is_flash())
+    {
         return true;
     }
 
-    if (!fim->read(0, imageSignature, 16)) {
+    if (!fim->read(0, imageSignature, 16))
+    {
         return errmsg("Failed to read from image: %s", fim->err());
     }
     // Write new signature
-    if (!f->write(0, imageSignature, 16, true)) {
+    if (!f->write(0, imageSignature, 16, true))
+    {
         return errmsg("Failed to write image signature: %s", f->err());
     }
-    return DoAfterBurnJobs(_cntx_magic_pattern, imageOps, burnParams, f,
-                           new_image_start, is_curr_image_in_odd_chunks);
+    return DoAfterBurnJobs(_cntx_magic_pattern, imageOps, burnParams, f, new_image_start, is_curr_image_in_odd_chunks);
 }
 
 bool Fs3Operations::CheckAndDealWithChunkSizes(u_int32_t cntxLog2ChunkSize, u_int32_t imageCntxLog2ChunkSize)
 {
-    if (cntxLog2ChunkSize > 0x18) {
+    if (cntxLog2ChunkSize > 0x18)
+    {
         return errmsg("Unsupported Device partition size 0x%x", cntxLog2ChunkSize);
     }
-    if (imageCntxLog2ChunkSize > 0x18) {
+    if (imageCntxLog2ChunkSize > 0x18)
+    {
         return errmsg("Unsupported Image partition size 0x%x", imageCntxLog2ChunkSize);
     }
-    if (cntxLog2ChunkSize != imageCntxLog2ChunkSize) {
+    if (cntxLog2ChunkSize != imageCntxLog2ChunkSize)
+    {
         if (((cntxLog2ChunkSize != 0x16) && (cntxLog2ChunkSize != 0x17)) ||
             ((imageCntxLog2ChunkSize != 0x16) && (imageCntxLog2ChunkSize != 0x17)) ||
-            (imageCntxLog2ChunkSize == 0x18 || cntxLog2ChunkSize == 0x18)) {
+            (imageCntxLog2ChunkSize == 0x18 || cntxLog2ChunkSize == 0x18))
+        {
             return errmsg("Device and Image partition size differ(0x%x/0x%x), use non failsafe burn flow.",
                           cntxLog2ChunkSize, imageCntxLog2ChunkSize);
         }
@@ -1149,12 +1324,15 @@ bool Fs3Operations::CheckAndDealWithChunkSizes(u_int32_t cntxLog2ChunkSize, u_in
 
 bool Fs3Operations::isWriteProtected(bool& is_write_protected)
 {
-    if (_ioAccess->is_flash()) {
-        FBase *origFlashObj = (FBase*)NULL;
-        if (!((Flash*)_ioAccess)->get_ignore_cache_replacment()) {
+    if (_ioAccess->is_flash())
+    {
+        FBase* origFlashObj = (FBase*)NULL;
+        if (!((Flash*)_ioAccess)->get_ignore_cache_replacment())
+        {
             origFlashObj = _ioAccess;
             _fwParams.ignoreCacheRep = 1;
-            if (!FwOperations::FwAccessCreate(_fwParams, &_ioAccess)) {
+            if (!FwOperations::FwAccessCreate(_fwParams, &_ioAccess))
+            {
                 _ioAccess = origFlashObj;
                 _fwParams.ignoreCacheRep = 0;
                 return errmsg(MLXFW_OPEN_OCR_ERR, "Failed to open device for direct flash access");
@@ -1163,114 +1341,147 @@ bool Fs3Operations::isWriteProtected(bool& is_write_protected)
         is_write_protected = ((Flash*)_ioAccess)->is_flash_write_protected();
         FLASH_RESTORE(origFlashObj);
     }
-    else {
+    else
+    {
         is_write_protected = false;
     }
 
     return true;
 }
 
-bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
+bool Fs3Operations::FsBurnAux(FwOperations* imgops, ExtBurnParams& burnParams)
 {
-    Fs3Operations& imageOps = *((Fs3Operations *) imgops);
+    Fs3Operations& imageOps = *((Fs3Operations*)imgops);
 
-    if (imageOps.FwType() != FIT_FS3) {
+    if (imageOps.FwType() != FIT_FS3)
+    {
         return errmsg(MLXFW_IMAGE_FORMAT_ERR, "FW image type is not compatible with device (FS3)");
     }
     bool devIntQueryRes = FsIntQueryAux();
 
-    if (!devIntQueryRes && burnParams.burnFailsafe) {
+    if (!devIntQueryRes && burnParams.burnFailsafe)
+    {
         return false;
     }
     // for image we execute full verify to bring all the information needed for ROM Patch
-    if (!imageOps.FsIntQueryAux(true, false)) {
+    if (!imageOps.FsIntQueryAux(true, false))
+    {
         return false;
     }
     // Check Matching device ID
-    if (!burnParams.noDevidCheck && _ioAccess->is_flash()) {
-        if (imageOps._fwImgInfo.supportedHwIdNum) {
+    if (!burnParams.noDevidCheck && _ioAccess->is_flash())
+    {
+        if (imageOps._fwImgInfo.supportedHwIdNum)
+        {
             if (!CheckMatchingHwDevId(_ioAccess->get_dev_id(),
                                       _ioAccess->get_rev_id(),
                                       imageOps._fwImgInfo.supportedHwId,
-                                      imageOps._fwImgInfo.supportedHwIdNum)) {
+                                      imageOps._fwImgInfo.supportedHwIdNum))
+            {
                 return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n", this->err());
             }
-        } else {  // no suppored hw ids (problem with the image ?)
+        }
+        else
+        { // no suppored hw ids (problem with the image ?)
             return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "No supported devices were found in the FW image.");
         }
     }
 
-    if (!burnParams.burnFailsafe) {
+    if (!burnParams.burnFailsafe)
+    {
         // some checks in case we burn in a non-failsafe manner and attempt to integrate existing device
         // data sections from device.
-        if (!burnParams.useImgDevData) {
+        if (!burnParams.useImgDevData)
+        {
             // we will take device data section from device: perform some checks
-            if (_fs3ImgInfo.itocAddr == 0) {
-                return errmsg("Cannot extract device data sections: invalid ITOC section. please ignore extracting device data sections.");
+            if (_fs3ImgInfo.itocAddr == 0)
+            {
+                return errmsg(
+                  "Cannot extract device data sections: invalid ITOC section. please ignore extracting device data sections.");
             }
-            if (_badDevDataSections) {
-                return errmsg("Cannot integrate device data sections: device data sections are corrupted. please ignore extracting device data sections.");
+            if (_badDevDataSections)
+            {
+                return errmsg(
+                  "Cannot integrate device data sections: device data sections are corrupted. please ignore extracting device data sections.");
             }
-        } else {
+        }
+        else
+        {
             // we will take device data sections from image: make sure device is not write protected
             bool is_write_protected;
-            if (!isWriteProtected(is_write_protected)) {
+            if (!isWriteProtected(is_write_protected))
+            {
                 return errmsg("%s", err());
             }
-            if (is_write_protected) {
+            if (is_write_protected)
+            {
                 return errmsg("Cannot burn device data sections, Flash is write protected.");
             }
         }
     }
 
-    if (devIntQueryRes && !CheckPSID(imageOps, burnParams.allowPsidChange)) {
+    if (devIntQueryRes && !CheckPSID(imageOps, burnParams.allowPsidChange))
+    {
         return false;
     }
 
-    if (burnParams.burnFailsafe) {
+    if (burnParams.burnFailsafe)
+    {
         // Check image and device chunk sizes are Ok
-        if (!CheckAndDealWithChunkSizes(_fwImgInfo.cntxLog2ChunkSize, imageOps._fwImgInfo.cntxLog2ChunkSize)) {
+        if (!CheckAndDealWithChunkSizes(_fwImgInfo.cntxLog2ChunkSize, imageOps._fwImgInfo.cntxLog2ChunkSize))
+        {
             return false;
         }
 
         // Check if the burnt FW version is OK
-        if (!CheckFwVersion(imageOps, burnParams.ignoreVersionCheck)) {
+        if (!CheckFwVersion(imageOps, burnParams.ignoreVersionCheck))
+        {
             return false;
         }
 
         // Check TimeStamp
-        if (!TestAndSetTimeStamp(imgops)) {
+        if (!TestAndSetTimeStamp(imgops))
+        {
             return false;
         }
 
         // ROM patchs
-        if ((burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST) && (_fwImgInfo.ext_info.roms_info.exp_rom_found)) {
+        if ((burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST) &&
+            (_fwImgInfo.ext_info.roms_info.exp_rom_found))
+        {
             // here we should take rom from device and insert into the image
             // i.e if we have rom in image remove it and put the rom from the device else just put rom from device.
-            // 1. use Fs3ModifySection to integrate _romSect buff with the image , newImageData contains the modified image buffer
+            // 1. use Fs3ModifySection to integrate _romSect buff with the image , newImageData contains the modified
+            // image buffer
             std::vector<u_int8_t> romSect = _romSect;
-            TOCPUn((u_int32_t *)&romSect[0], romSect.size() / 4);
-            if (!imageOps.Fs3ReplaceSectionInDevImg(FS3_ROM_CODE, FS3_PCI_CODE, true, (u_int8_t *)NULL, 0,
-                                                    (u_int32_t *)&romSect[0], (u_int32_t)romSect.size())) {
+            TOCPUn((u_int32_t*)&romSect[0], romSect.size() / 4);
+            if (!imageOps.Fs3ReplaceSectionInDevImg(FS3_ROM_CODE, FS3_PCI_CODE, true, (u_int8_t*)NULL, 0,
+                                                    (u_int32_t*)&romSect[0], (u_int32_t)romSect.size()))
+            {
                 return errmsg(MLXFW_ROM_UPDATE_IN_IMAGE_ERR, "failed to update ROM in image. %s", imageOps.err());
             }
         }
         // image vsd patch
-        if (!burnParams.useImagePs && (burnParams.vsdSpecified || burnParams.useDevImgInfo)) {
+        if (!burnParams.useImagePs && (burnParams.vsdSpecified || burnParams.useDevImgInfo))
+        {
             // get image info section :
-            struct toc_info *imageInfoToc = (struct toc_info *)NULL;
-            if (!imageOps.Fs3GetItocInfo(imageOps._fs3ImgInfo.tocArr, imageOps._fs3ImgInfo.numOfItocs, FS3_IMAGE_INFO, imageInfoToc)) {
+            struct toc_info* imageInfoToc = (struct toc_info*)NULL;
+            if (!imageOps.Fs3GetItocInfo(imageOps._fs3ImgInfo.tocArr, imageOps._fs3ImgInfo.numOfItocs, FS3_IMAGE_INFO,
+                                         imageInfoToc))
+            {
                 return errmsg(MLXFW_GET_SECT_ERR, "failed to get Image Info section.");
             }
             // modify it:
             std::vector<u_int8_t> imageInfoSect = imageInfoToc->section_data;
             struct image_layout_image_info image_info;
             image_layout_image_info_unpack(&image_info, &imageInfoSect[0]);
-            if (burnParams.vsdSpecified) {
+            if (burnParams.vsdSpecified)
+            {
                 strncpy(image_info.vsd, burnParams.userVsd, VSD_LEN);
             }
             image_layout_image_info_pack(&image_info, &imageInfoSect[0]);
-            if (burnParams.useDevImgInfo) {
+            if (burnParams.useDevImgInfo)
+            {
                 // update PSID, name and description in image info
                 struct tools_open_image_info tools_image_info;
                 tools_open_image_info_unpack(&tools_image_info, &imageInfoSect[0]);
@@ -1280,9 +1491,11 @@ bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
                 tools_open_image_info_pack(&tools_image_info, &imageInfoSect[0]);
             }
             // re-insert it into the image:
-            if (!imageOps.Fs3ReplaceSectionInDevImg(FS3_IMAGE_INFO, FS3_FW_ADB, true, (u_int8_t *) NULL, 0,
-                                                    (u_int32_t *)&imageInfoSect[0], (u_int32_t)imageInfoSect.size())) {
-                return errmsg(MLXFW_UPDATE_SECT_ERR, "failed to update IMAGE_INFO section in image. %s", imageOps.err());
+            if (!imageOps.Fs3ReplaceSectionInDevImg(FS3_IMAGE_INFO, FS3_FW_ADB, true, (u_int8_t*)NULL, 0,
+                                                    (u_int32_t*)&imageInfoSect[0], (u_int32_t)imageInfoSect.size()))
+            {
+                return errmsg(MLXFW_UPDATE_SECT_ERR, "failed to update IMAGE_INFO section in image. %s",
+                              imageOps.err());
             }
         }
     }
@@ -1290,9 +1503,10 @@ bool Fs3Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
     return BurnFs3Image(imageOps, burnParams);
 }
 
-bool Fs3Operations::FwBurn(FwOperations *imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
+bool Fs3Operations::FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurn\n");
     }
 
@@ -1301,12 +1515,12 @@ bool Fs3Operations::FwBurn(FwOperations *imageOps, u_int8_t forceVersion, Progre
     burnParams.progressFunc = progressFunc;
 
     return FwBurnAdvanced(imageOps, burnParams);
-
 }
 
 bool Fs3Operations::ReBurnCurrentImage(ProgressCallBack progressFunc)
 {
-    if (!FsIntQueryAux(true, false)) {
+    if (!FsIntQueryAux(true, false))
+    {
         return false;
     }
 
@@ -1314,17 +1528,18 @@ bool Fs3Operations::ReBurnCurrentImage(ProgressCallBack progressFunc)
     vector<u_int8_t> newImageData(size);
     _imageCache.get(newImageData, 0x0, size);
 
-    FwOperations *newImageOps;
+    FwOperations* newImageOps;
     ExtBurnParams newBurnParams;
 
-    if (!CreateBasicImageFromData((u_int32_t *)newImageData.data(),
-                                  size, &newImageOps)) {
+    if (!CreateBasicImageFromData((u_int32_t*)newImageData.data(), size, &newImageOps))
+    {
         return false;
     }
 
     newBurnParams.updateParamsForBasicImage(progressFunc);
 
-    if (!FsBurnAux(newImageOps, newBurnParams)) {
+    if (!FsBurnAux(newImageOps, newBurnParams))
+    {
         newImageOps->FwCleanUp();
         delete newImageOps;
         return errmsg("Failed to re-burn image after modify: %s", err());
@@ -1336,28 +1551,35 @@ bool Fs3Operations::ReBurnCurrentImage(ProgressCallBack progressFunc)
     return true;
 }
 
-bool Fs3Operations::FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams& burnParams)
+bool Fs3Operations::FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurnAdvanced\n");
     }
 
-    //Check if alignment is needed
-    if ((burnParams.burnFailsafe ||
-         (!burnParams.burnFailsafe && !burnParams.useImgDevData)) &&
-        CheckIfAlignmentIsNeeded(imageOps)) {
-        if (!AlignDeviceSections(imageOps)) {
+    // Check if alignment is needed
+    if ((burnParams.burnFailsafe || (!burnParams.burnFailsafe && !burnParams.useImgDevData)) &&
+        CheckIfAlignmentIsNeeded(imageOps))
+    {
+        if (!AlignDeviceSections(imageOps))
+        {
             return errmsg("Failed to align the device sections: %s", err());
         }
     }
 
-    if (FwCheckIf8MBShiftingNeeded(imageOps, burnParams)) {
-        if (burnParams.shift8MBIfNeeded) {
-            if (!ReBurnCurrentImage(burnParams.progressFunc)) {
+    if (FwCheckIf8MBShiftingNeeded(imageOps, burnParams))
+    {
+        if (burnParams.shift8MBIfNeeded)
+        {
+            if (!ReBurnCurrentImage(burnParams.progressFunc))
+            {
                 return false;
             }
             return true;
-        } else {
+        }
+        else
+        {
             return errmsg("Cannot Burn given FW, need to reburn the same Firmware to the second flash partition");
         }
     }
@@ -1365,7 +1587,7 @@ bool Fs3Operations::FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams& burnPa
     return FsBurnAux(imageOps, burnParams);
 }
 
-bool Fs3Operations::FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc)
+bool Fs3Operations::FwBurnBlock(FwOperations* imageOps, ProgressCallBack progressFunc)
 {
     // Avoid Warning!
     (void)imageOps;
@@ -1373,36 +1595,41 @@ bool Fs3Operations::FwBurnBlock(FwOperations *imageOps, ProgressCallBack progres
     return errmsg("FwBurnBlock is not supported anymore in FS3 image.");
 }
 
-bool Fs3Operations::FwReadData(void *image, u_int32_t *imageSize, bool verbose)
+bool Fs3Operations::FwReadData(void* image, u_int32_t* imageSize, bool verbose)
 {
     struct QueryOptions queryOptions;
-    if (!imageSize) {
+    if (!imageSize)
+    {
         return errmsg("bad parameter is given to FwReadData\n");
     }
 
     queryOptions.readRom = true;
     queryOptions.quickQuery = false;
-    if (image == NULL) {
+    if (image == NULL)
+    {
         // When we need only to get size, no need for reading entire image
         queryOptions.readRom = false;
         queryOptions.quickQuery = true;
     }
     // Avoid Warning
-    if (!FsVerifyAux((VerifyCallBack)NULL, 0, queryOptions, false, verbose)) {
+    if (!FsVerifyAux((VerifyCallBack)NULL, 0, queryOptions, false, verbose))
+    {
         return false;
     }
 
-    _imageCache.get((u_int8_t *)image, _fwImgInfo.lastImageAddr);
+    _imageCache.get((u_int8_t*)image, _fwImgInfo.lastImageAddr);
     *imageSize = _fwImgInfo.lastImageAddr;
     return true;
 }
 
 bool Fs3Operations::FwReadRom(std::vector<u_int8_t>& romSect)
 {
-    if (!FsIntQueryAux()) {
+    if (!FsIntQueryAux())
+    {
         return false;
     }
-    if (_romSect.empty()) {
+    if (_romSect.empty())
+    {
         return errmsg("Read ROM failed: The FW does not contain a ROM section");
     }
     romSect = _romSect;
@@ -1413,52 +1640,63 @@ bool Fs3Operations::FwReadRom(std::vector<u_int8_t>& romSect)
 
 bool Fs3Operations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool)
 {
-    //FwGetSection only supports retrieving FS3_DBG_FW_INI section atm.
-    if (sectType != FS3_DBG_FW_INI) {
+    // FwGetSection only supports retrieving FS3_DBG_FW_INI section atm.
+    if (sectType != FS3_DBG_FW_INI)
+    {
         return errmsg("Unsupported section type.");
     }
-    //set the sector to read (need to remove it after read)
+    // set the sector to read (need to remove it after read)
     _readSectList.push_back(sectType);
-    if (!FsIntQueryAux()) {
+    if (!FsIntQueryAux())
+    {
         _readSectList.pop_back();
         return false;
     }
     _readSectList.pop_back();
     sectInfo = _fwConfSect;
-    if (sectInfo.empty()) {
+    if (sectInfo.empty())
+    {
         return errmsg("INI section not found in the given image.");
     }
     return true;
 }
 
-bool Fs3Operations::VerifyImageAfterModifications() {
+bool Fs3Operations::VerifyImageAfterModifications()
+{
     return FsIntQueryAux(false, false);
 }
 
 bool Fs3Operations::FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc)
 {
-    if (!baseGuid.base_guid_specified && !baseGuid.base_mac_specified) {
+    if (!baseGuid.base_guid_specified && !baseGuid.base_mac_specified)
+    {
         return errmsg("base GUID/MAC were not specified.");
     }
 
-    if (baseGuid.base_mac_specified && !CheckMac(baseGuid.base_mac)) {
-        return errmsg("Bad MAC (" MAC_FORMAT ") given: %s. Please specify a valid MAC value", baseGuid.base_mac.h, baseGuid.base_mac.l, err());
+    if (baseGuid.base_mac_specified && !CheckMac(baseGuid.base_mac))
+    {
+        return errmsg("Bad MAC (" MAC_FORMAT ") given: %s. Please specify a valid MAC value", baseGuid.base_mac.h,
+                      baseGuid.base_mac.l, err());
     }
-    if (!baseGuid.use_pp_attr) {
+    if (!baseGuid.use_pp_attr)
+    {
         baseGuid.num_of_guids_pp[0] = baseGuid.num_of_guids ? baseGuid.num_of_guids : DEFAULT_GUID_NUM;
         baseGuid.step_size_pp[0] = baseGuid.step_size ? baseGuid.step_size : DEFAULT_STEP;
         baseGuid.num_of_guids_pp[1] = baseGuid.num_of_guids ? baseGuid.num_of_guids : DEFAULT_GUID_NUM;
         baseGuid.step_size_pp[1] = baseGuid.step_size ? baseGuid.step_size : DEFAULT_STEP;
         baseGuid.use_pp_attr = 1;
     }
-    if (FwType() == FIT_FS3) {
+    if (FwType() == FIT_FS3)
+    {
         FAIL_NO_OCR("set manufacture GUIDs/MACs");
     }
-    if (!UpdateSection(&baseGuid, FS3_MFG_INFO, false, CMD_SET_MFG_GUIDS, callBackFunc)) {
+    if (!UpdateSection(&baseGuid, FS3_MFG_INFO, false, CMD_SET_MFG_GUIDS, callBackFunc))
+    {
         return false;
     }
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
-    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications()) {
+    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications())
+    {
         return false;
     }
 
@@ -1468,11 +1706,13 @@ bool Fs3Operations::FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc)
 bool Fs3Operations::FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc)
 {
     // in FS3 default behavior when setting GUIDs / MFG is to assign ini default step size and number.
-    fs3_uid_t bGuid = {baseGuid, 1, {0, 0}, 0, 0, 0, 1, 1, {DEFAULT_GUID_NUM, DEFAULT_STEP}, {DEFAULT_GUID_NUM, DEFAULT_STEP} };
+    fs3_uid_t bGuid = {
+      baseGuid, 1, {0, 0}, 0, 0, 0, 1, 1, {DEFAULT_GUID_NUM, DEFAULT_STEP}, {DEFAULT_GUID_NUM, DEFAULT_STEP}};
     return FwSetMFG(bGuid, callBackFunc);
 }
 
-bool Fs3Operations::parseDevData(bool readRom, bool quickQuery, bool verbose) {
+bool Fs3Operations::parseDevData(bool readRom, bool quickQuery, bool verbose)
+{
     return FsIntQueryAux(readRom, quickQuery, false, verbose);
 }
 
@@ -1482,65 +1722,80 @@ bool Fs3Operations::FwSetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc,
     memset(&usrGuid, 0, sizeof(usrGuid));
     // Avoid Warning because there is no need for progressFunc
     (void)progressFunc;
-    if (sgParam.userGuids.empty()) {
+    if (sgParam.userGuids.empty())
+    {
         return errmsg("Base GUID not found.");
     }
-    //query device to get mfg info (for guids override en bit)
-    if (!parseDevData(false)) {
+    // query device to get mfg info (for guids override en bit)
+    if (!parseDevData(false))
+    {
         return false;
     }
 
-    if (!_fs3ImgInfo.ext_info.guids_override_en) {
+    if (!_fs3ImgInfo.ext_info.guids_override_en)
+    {
         return errmsg("guids override is not set, cannot set device guids");
     }
 
-    usrGuid.num_of_guids_pp[0] = sgParam.usePPAttr ? sgParam.numOfGUIDsPP[0] : sgParam.numOfGUIDs ? sgParam.numOfGUIDs : DEFAULT_GUID_NUM;
-    usrGuid.step_size_pp[0] =  sgParam.usePPAttr ? sgParam.stepSizePP[0] : sgParam.stepSize ? sgParam.stepSize : DEFAULT_STEP;
-    usrGuid.num_of_guids_pp[1] = sgParam.usePPAttr ? sgParam.numOfGUIDsPP[1] : sgParam.numOfGUIDs ? sgParam.numOfGUIDs : DEFAULT_GUID_NUM;
-    usrGuid.step_size_pp[1] =  sgParam.usePPAttr ? sgParam.stepSizePP[1] : sgParam.stepSize ? sgParam.stepSize : DEFAULT_STEP;
+    usrGuid.num_of_guids_pp[0] =
+      sgParam.usePPAttr ? sgParam.numOfGUIDsPP[0] : sgParam.numOfGUIDs ? sgParam.numOfGUIDs : DEFAULT_GUID_NUM;
+    usrGuid.step_size_pp[0] =
+      sgParam.usePPAttr ? sgParam.stepSizePP[0] : sgParam.stepSize ? sgParam.stepSize : DEFAULT_STEP;
+    usrGuid.num_of_guids_pp[1] =
+      sgParam.usePPAttr ? sgParam.numOfGUIDsPP[1] : sgParam.numOfGUIDs ? sgParam.numOfGUIDs : DEFAULT_GUID_NUM;
+    usrGuid.step_size_pp[1] =
+      sgParam.usePPAttr ? sgParam.stepSizePP[1] : sgParam.stepSize ? sgParam.stepSize : DEFAULT_STEP;
     usrGuid.use_pp_attr = 1;
 
     usrGuid.base_guid_specified = false;
     usrGuid.base_mac_specified = false;
     usrGuid.set_mac_from_guid = false;
 
-    if (sgParam.guidsSpecified || sgParam.uidSpecified) {
+    if (sgParam.guidsSpecified || sgParam.uidSpecified)
+    {
         usrGuid.base_guid_specified = true;
         usrGuid.base_guid = sgParam.userGuids[0];
         usrGuid.set_mac_from_guid = sgParam.uidSpecified ? true : false;
     }
-    if (sgParam.macsSpecified) {
+    if (sgParam.macsSpecified)
+    {
         // check base mac
-        if (!CheckMac(sgParam.userGuids[1])) {
-            return errmsg("Bad MAC (" MAC_FORMAT ") given: %s. Please specify a valid MAC value", sgParam.userGuids[1].h, sgParam.userGuids[1].l, err());
+        if (!CheckMac(sgParam.userGuids[1]))
+        {
+            return errmsg("Bad MAC (" MAC_FORMAT ") given: %s. Please specify a valid MAC value",
+                          sgParam.userGuids[1].h, sgParam.userGuids[1].l, err());
         }
         usrGuid.base_mac_specified = true;
         usrGuid.base_mac = sgParam.userGuids[1];
     }
 
-    if (!usrGuid.base_guid_specified && !usrGuid.base_mac_specified) {
+    if (!usrGuid.base_guid_specified && !usrGuid.base_mac_specified)
+    {
         return errmsg("base GUID/MAC were not specified.");
     }
-    if (FwType() == FIT_FS3) {
+    if (FwType() == FIT_FS3)
+    {
         FAIL_NO_OCR("set GUIDs/MACs");
     }
-    if (!UpdateSection(&usrGuid, FS3_DEV_INFO, false, CMD_SET_GUIDS, callBackFunc)) {
+    if (!UpdateSection(&usrGuid, FS3_DEV_INFO, false, CMD_SET_GUIDS, callBackFunc))
+    {
         return false;
     }
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
-    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications()) {
+    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications())
+    {
         return false;
     }
     return true;
 }
 
-bool Fs3Operations::isOld4MBImage(FwOperations *imageOps)
+bool Fs3Operations::isOld4MBImage(FwOperations* imageOps)
 {
-    return (!(*(Fs3Operations *)imageOps)._fs3ImgInfo.runFromAny &&
-            ((*(Fs3Operations *)imageOps)._fwImgInfo.cntxLog2ChunkSize == 0x16));
+    return (!(*(Fs3Operations*)imageOps)._fs3ImgInfo.runFromAny &&
+            ((*(Fs3Operations*)imageOps)._fwImgInfo.cntxLog2ChunkSize == 0x16));
 }
 
-bool Fs3Operations::FwCheckIfWeCanBurnWithFwControl(FwOperations *imageOps)
+bool Fs3Operations::FwCheckIfWeCanBurnWithFwControl(FwOperations* imageOps)
 {
     /*
      * The function check what happen if we are in mcc mode, can we burn the given image?
@@ -1555,24 +1810,25 @@ bool Fs3Operations::FwCheckIfWeCanBurnWithFwControl(FwOperations *imageOps)
 
     fw_info_t dev_info_img;
 
-    if (_fwParams.hndlType == FHT_UEFI_DEV) {
+    if (_fwParams.hndlType == FHT_UEFI_DEV)
+    {
         memset(&dev_info_img, 0, sizeof(dev_info_img));
-        if (!((Fs3Operations *)imageOps)->FwQuery(&dev_info_img)) {
+        if (!((Fs3Operations*)imageOps)->FwQuery(&dev_info_img))
+        {
             return false;
         }
     }
 
     bool result = ((_fs3ImgInfo.runFromAny && (_fwImgInfo.imgStart == 0x0 || _fwImgInfo.imgStart == 0x400000)) &&
                    isOld4MBImage(imageOps)) ||
-                  (!_fs3ImgInfo.runFromAny && ((Fs3Operations *)imageOps)->_fwImgInfo.cntxLog2ChunkSize == 0x17) ||
+                  (!_fs3ImgInfo.runFromAny && ((Fs3Operations*)imageOps)->_fwImgInfo.cntxLog2ChunkSize == 0x17) ||
                   (_fwParams.hndlType == FHT_UEFI_DEV && (!(dev_info_img.fs3_info.security_mode & SMM_SIGNED_FW)) &&
-                  (_fs3ImgInfo.ext_info.security_mode & SMM_SIGNED_FW ));
-    //printf("-D- result=%d\n", result);
+                   (_fs3ImgInfo.ext_info.security_mode & SMM_SIGNED_FW));
+    // printf("-D- result=%d\n", result);
     return result;
 }
 
-bool Fs3Operations::FwCheckIf8MBShiftingNeeded(FwOperations *imageOps,
-                                               const ExtBurnParams& burnParams)
+bool Fs3Operations::FwCheckIf8MBShiftingNeeded(FwOperations* imageOps, const ExtBurnParams& burnParams)
 {
     /*
      * When do we need to do shifting?
@@ -1587,66 +1843,75 @@ bool Fs3Operations::FwCheckIf8MBShiftingNeeded(FwOperations *imageOps,
      * From above we can conclude that if the running FW is old (runFromAny==0) then
      * no need for shifting.
      */
-    if (!_fs3ImgInfo.runFromAny) {
+    if (!_fs3ImgInfo.runFromAny)
+    {
         return false;
     }
-    u_int32_t new_image_start = getNewImageStartAddress(*(Fs3Operations *)imageOps,
-                                                        burnParams.burnFailsafe);
+    u_int32_t new_image_start = getNewImageStartAddress(*(Fs3Operations*)imageOps, burnParams.burnFailsafe);
     bool res = (new_image_start == 0x800000 && isOld4MBImage(imageOps));
-    //printf("-D- res=%d\n", res);
+    // printf("-D- res=%d\n", res);
     return res;
 }
 
-bool Fs3Operations::FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc)
+bool Fs3Operations::FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc)
 {
-    if (!vpdFileStr) {
+    if (!vpdFileStr)
+    {
         return errmsg("Please specify a valid vpd file.");
     }
     FAIL_NO_OCR("set VPD");
 
-    if (!UpdateSection(vpdFileStr, FS3_VPD_R0, false, CMD_BURN_VPD, callBackFunc)) {
+    if (!UpdateSection(vpdFileStr, FS3_VPD_R0, false, CMD_BURN_VPD, callBackFunc))
+    {
         return false;
     }
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
-    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications()) {
+    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications())
+    {
         return false;
     }
     return true;
 }
 
-bool Fs3Operations::GetModifiedSectionInfo(fs3_section_t sectionType, fs3_section_t nextSectionType, u_int32_t &newSectAddr,
-                                           fs3_section_t &SectToPut, u_int32_t &oldSectSize)
+bool Fs3Operations::GetModifiedSectionInfo(fs3_section_t sectionType,
+                                           fs3_section_t nextSectionType,
+                                           u_int32_t& newSectAddr,
+                                           fs3_section_t& SectToPut,
+                                           u_int32_t& oldSectSize)
 {
-    struct toc_info *curr_itoc = (struct toc_info *)NULL;
+    struct toc_info* curr_itoc = (struct toc_info*)NULL;
     if (Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sectionType, curr_itoc) ||
-        Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, nextSectionType, curr_itoc)) {
+        Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, nextSectionType, curr_itoc))
+    {
         newSectAddr = curr_itoc->toc_entry.flash_addr << 2;
-        SectToPut = (curr_itoc->toc_entry.type == sectionType) ? sectionType :  nextSectionType;
+        SectToPut = (curr_itoc->toc_entry.type == sectionType) ? sectionType : nextSectionType;
         oldSectSize = curr_itoc->toc_entry.size * 4;
         return true;
     }
     return false;
 }
 
-bool Fs3Operations::ShiftItocAddrInEntry(struct toc_info *newItocInfo, struct toc_info *oldItocInfo, int shiftSize)
+bool Fs3Operations::ShiftItocAddrInEntry(struct toc_info* newItocInfo, struct toc_info* oldItocInfo, int shiftSize)
 {
     u_int32_t currSectaddr;
     CopyItocInfo(newItocInfo, oldItocInfo);
-    currSectaddr =  (newItocInfo->toc_entry.flash_addr << 2) + shiftSize;
+    currSectaddr = (newItocInfo->toc_entry.flash_addr << 2) + shiftSize;
     Fs3UpdateItocInfo(newItocInfo, currSectaddr);
     return true;
 }
-bool Fs3Operations::Fs3UpdateItocInfo(struct toc_info *newItocInfo, u_int32_t newSectAddr, fs3_section_t sectionType, u_int32_t *newSectData,
+bool Fs3Operations::Fs3UpdateItocInfo(struct toc_info* newItocInfo,
+                                      u_int32_t newSectAddr,
+                                      fs3_section_t sectionType,
+                                      u_int32_t* newSectData,
                                       u_int32_t NewSectSize)
 {
-    std::vector<u_int8_t>  newSecVect(NewSectSize);
+    std::vector<u_int8_t> newSecVect(NewSectSize);
     newItocInfo->toc_entry.type = sectionType;
     memcpy(&newSecVect[0], newSectData, NewSectSize);
     return Fs3UpdateItocInfo(newItocInfo, newSectAddr, NewSectSize / 4, newSecVect);
 }
 
-
-bool Fs3Operations::CopyItocInfo(struct toc_info *newTocInfo, struct toc_info *currToc)
+bool Fs3Operations::CopyItocInfo(struct toc_info* newTocInfo, struct toc_info* currToc)
 {
     memcpy(newTocInfo->data, currToc->data, CIBFW_ITOC_ENTRY_SIZE);
     newTocInfo->entry_addr = currToc->entry_addr;
@@ -1655,33 +1920,45 @@ bool Fs3Operations::CopyItocInfo(struct toc_info *newTocInfo, struct toc_info *c
     return true;
 }
 
-
-
-
-bool Fs3Operations::UpdateItocAfterInsert(fs3_section_t sectionType, u_int32_t newSectAddr, fs3_section_t SectToPut, bool toAdd, u_int32_t *newSectData,
-                                          u_int32_t removedOrNewSectSize, struct toc_info *tocArr, u_int32_t &numOfItocs)
+bool Fs3Operations::UpdateItocAfterInsert(fs3_section_t sectionType,
+                                          u_int32_t newSectAddr,
+                                          fs3_section_t SectToPut,
+                                          bool toAdd,
+                                          u_int32_t* newSectData,
+                                          u_int32_t removedOrNewSectSize,
+                                          struct toc_info* tocArr,
+                                          u_int32_t& numOfItocs)
 {
     bool isReplacement = (sectionType == SectToPut) ? true : false;
     int shiftSize;
 
-    if (toAdd) {
-        if (isReplacement) {
-            struct toc_info *curr_itoc = (struct toc_info *)NULL;
+    if (toAdd)
+    {
+        if (isReplacement)
+        {
+            struct toc_info* curr_itoc = (struct toc_info*)NULL;
             u_int32_t sectSize;
-            if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sectionType, curr_itoc)) {
+            if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sectionType, curr_itoc))
+            {
                 return false;
             }
             sectSize = curr_itoc->toc_entry.size * 4;
             shiftSize = (removedOrNewSectSize > sectSize) ? removedOrNewSectSize - sectSize : 0;
-        } else {
+        }
+        else
+        {
             shiftSize = removedOrNewSectSize;
         }
-        if (shiftSize % FS3_DEFAULT_SECTOR_SIZE) {
+        if (shiftSize % FS3_DEFAULT_SECTOR_SIZE)
+        {
             shiftSize += (FS3_DEFAULT_SECTOR_SIZE - shiftSize % FS3_DEFAULT_SECTOR_SIZE);
         }
-    } else {
+    }
+    else
+    {
         shiftSize = 0;
-        if (removedOrNewSectSize % FS3_DEFAULT_SECTOR_SIZE) {
+        if (removedOrNewSectSize % FS3_DEFAULT_SECTOR_SIZE)
+        {
             removedOrNewSectSize += (FS3_DEFAULT_SECTOR_SIZE - removedOrNewSectSize % FS3_DEFAULT_SECTOR_SIZE);
         }
         shiftSize -= removedOrNewSectSize;
@@ -1690,22 +1967,29 @@ bool Fs3Operations::UpdateItocAfterInsert(fs3_section_t sectionType, u_int32_t n
     int shifEntryToc = 0;
     u_int32_t shiftEntryAddr = -1;
     int ignoreShiftIdx = -1;
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-        struct toc_info *curr_itoc = &_fs3ImgInfo.tocArr[i];
-        struct toc_info *newTocInfo = &tocArr[numOfItocs];
-        u_int32_t currSectaddr =  curr_itoc->toc_entry.flash_addr << 2; // Put it in one place
-        //printf("-D- BEFORE : Entry Type: %#x, Entry offset: %#x\n", curr_itoc->toc_entry.type, curr_itoc->entry_addr);
-        if (currSectaddr > newSectAddr) {
-            if (!curr_itoc->toc_entry.relative_addr) {
-
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        struct toc_info* curr_itoc = &_fs3ImgInfo.tocArr[i];
+        struct toc_info* newTocInfo = &tocArr[numOfItocs];
+        u_int32_t currSectaddr = curr_itoc->toc_entry.flash_addr << 2; // Put it in one place
+        // printf("-D- BEFORE : Entry Type: %#x, Entry offset: %#x\n", curr_itoc->toc_entry.type,
+        // curr_itoc->entry_addr);
+        if (currSectaddr > newSectAddr)
+        {
+            if (!curr_itoc->toc_entry.relative_addr)
+            {
                 CopyItocInfo(newTocInfo, curr_itoc);
-            } else {
+            }
+            else
+            {
                 ShiftItocAddrInEntry(newTocInfo, curr_itoc, shiftSize);
-
             }
-        } else if (currSectaddr == newSectAddr) {
+        }
+        else if (currSectaddr == newSectAddr)
+        {
             shiftEntryAddr = curr_itoc->entry_addr + CIBFW_ITOC_ENTRY_SIZE;
-            if (!toAdd) {
+            if (!toAdd)
+            {
                 shifEntryToc = -1 * CIBFW_ITOC_ENTRY_SIZE;
                 continue;
             }
@@ -1713,74 +1997,97 @@ bool Fs3Operations::UpdateItocAfterInsert(fs3_section_t sectionType, u_int32_t n
             CopyItocInfo(newTocInfo, curr_itoc);
             Fs3UpdateItocInfo(newTocInfo, newSectAddr, sectionType, newSectData, removedOrNewSectSize);
 
-            if (!isReplacement) {
+            if (!isReplacement)
+            {
                 // put next section
                 newTocInfo = &tocArr[++numOfItocs];
                 ShiftItocAddrInEntry(newTocInfo, curr_itoc, shiftSize);
                 newTocInfo->entry_addr = shiftEntryAddr;
                 ignoreShiftIdx = numOfItocs;
-            } else {
+            }
+            else
+            {
                 shifEntryToc = 0;
             }
-        } else {
+        }
+        else
+        {
             // just Copy the ITOC as is
             CopyItocInfo(newTocInfo, curr_itoc);
         }
         numOfItocs++;
     }
-    if (shifEntryToc) {
-        for (int i = 0; i < (int)numOfItocs; i++) {
-            struct toc_info *tocInfo = &tocArr[i];
-            if (i != ignoreShiftIdx && tocInfo->entry_addr >= shiftEntryAddr) {
+    if (shifEntryToc)
+    {
+        for (int i = 0; i < (int)numOfItocs; i++)
+        {
+            struct toc_info* tocInfo = &tocArr[i];
+            if (i != ignoreShiftIdx && tocInfo->entry_addr >= shiftEntryAddr)
+            {
                 tocInfo->entry_addr += shifEntryToc;
             }
-            //printf("-D- AFTER : Entry Type: %#x, Entry offset: %#x\n", tocInfo->toc_entry.type, tocInfo->entry_addr);
+            // printf("-D- AFTER : Entry Type: %#x, Entry offset: %#x\n", tocInfo->toc_entry.type, tocInfo->entry_addr);
         }
     }
     return true;
 }
 
-bool Fs3Operations::UpdateImageAfterInsert(struct toc_info *tocArr, u_int32_t numOfItocs, u_int8_t *newImgData, u_int32_t newImageSize)
+bool Fs3Operations::UpdateImageAfterInsert(struct toc_info* tocArr,
+                                           u_int32_t numOfItocs,
+                                           u_int8_t* newImgData,
+                                           u_int32_t newImageSize)
 {
-
     // Copy data before itocAddr and ITOC header
-    //memcpy(newImgData, &_imageCache[0], _fs3ImgInfo.itocAddr);
-    if (newImgData) {
+    // memcpy(newImgData, &_imageCache[0], _fs3ImgInfo.itocAddr);
+    if (newImgData)
+    {
         _imageCache.get(newImgData, _fs3ImgInfo.itocAddr);
         memcpy(&newImgData[_fs3ImgInfo.itocAddr], _fs3ImgInfo.itocHeader, CIBFW_ITOC_HEADER_SIZE);
-    } else {
+    }
+    else
+    {
         Fs3UpdateImgCache(_fs3ImgInfo.itocHeader, _fs3ImgInfo.itocAddr, CIBFW_ITOC_HEADER_SIZE);
         newImageSize = _fwImgInfo.lastImageAddr;
     }
-    for (int i = 0; i < (int)numOfItocs; i++) {
+    for (int i = 0; i < (int)numOfItocs; i++)
+    {
         // Inits
         u_int32_t itocOffset = _fs3ImgInfo.itocAddr + CIBFW_ITOC_HEADER_SIZE + i * CIBFW_ITOC_ENTRY_SIZE;
-        struct toc_info *currItoc = &tocArr[i];
+        struct toc_info* currItoc = &tocArr[i];
         u_int8_t sectType = currItoc->toc_entry.type;
         u_int32_t sectAddr = currItoc->toc_entry.flash_addr << 2;
         u_int32_t sectSize = currItoc->toc_entry.size * 4;
         // Some checks
-        if (sectAddr + sectSize > newImageSize) {
-            return errmsg("Internal error: Size of modified image (0x%x) is longer than size of original image (0x%x)!", sectAddr + sectSize, newImageSize);
+        if (sectAddr + sectSize > newImageSize)
+        {
+            return errmsg("Internal error: Size of modified image (0x%x) is longer than size of original image (0x%x)!",
+                          sectAddr + sectSize, newImageSize);
         }
-        if (sectSize != currItoc->section_data.size()) {
-            return errmsg("Internal error: Sectoion size of %s (0x%x) is not equal to allocated memory for it(0x%x)", GetSectionNameByType(sectType),
-                          sectSize, (u_int32_t)currItoc->section_data.size());
+        if (sectSize != currItoc->section_data.size())
+        {
+            return errmsg("Internal error: Sectoion size of %s (0x%x) is not equal to allocated memory for it(0x%x)",
+                          GetSectionNameByType(sectType), sectSize, (u_int32_t)currItoc->section_data.size());
         }
-        if (!newImgData) {
+        if (!newImgData)
+        {
             Fs3UpdateImgCache(currItoc->data, itocOffset, CIBFW_ITOC_ENTRY_SIZE);
             Fs3UpdateImgCache(&currItoc->section_data[0], sectAddr, sectSize);
-        } else {
+        }
+        else
+        {
             memcpy(&newImgData[itocOffset], currItoc->data, CIBFW_ITOC_ENTRY_SIZE);
 
             memcpy(&newImgData[sectAddr], &currItoc->section_data[0], sectSize);
         }
     }
     u_int32_t lastItocSect = _fs3ImgInfo.itocAddr + CIBFW_ITOC_HEADER_SIZE + numOfItocs * CIBFW_ITOC_ENTRY_SIZE;
-    if (!newImgData) {
+    if (!newImgData)
+    {
         u_int8_t fs3_end_buf[CIBFW_ITOC_ENTRY_SIZE] = {FS3_END};
         Fs3UpdateImgCache(fs3_end_buf, lastItocSect, CIBFW_ITOC_ENTRY_SIZE);
-    } else {
+    }
+    else
+    {
         memset(&newImgData[lastItocSect], FS3_END, CIBFW_ITOC_ENTRY_SIZE);
     }
 
@@ -1789,9 +2096,9 @@ bool Fs3Operations::UpdateImageAfterInsert(struct toc_info *tocArr, u_int32_t nu
 
 /*
  * Adrianc: this is probably the longest method signature in this file. to make things clear:
- *              Fs3ReplaceSectionInDevImg() adds a new section to the firmware image or removes an exsisting section from the firmware image.
- *              if user specified newImgData, the modified image (after add/remove) will be copied to the buffer, else the object itself will be modified
- *              (i.e imageCache and itocs updated)
+ *              Fs3ReplaceSectionInDevImg() adds a new section to the firmware image or removes an exsisting section
+ *from the firmware image. if user specified newImgData, the modified image (after add/remove) will be copied to the
+ *buffer, else the object itself will be modified (i.e imageCache and itocs updated)
  *
  *@param sectionType : section type to add or remove
  *@param nextSectionType : in case of adding, add the new section before this section type
@@ -1803,64 +2110,85 @@ bool Fs3Operations::UpdateImageAfterInsert(struct toc_info *tocArr, u_int32_t nu
  *@param UpdateExsistingTocArr: update the objects itoc array
  * */
 
-bool Fs3Operations::Fs3ReplaceSectionInDevImg(fs3_section_t sectionType, fs3_section_t nextSectionType, bool toAdd, u_int8_t *newImgData, u_int32_t newImageSize,
-                                              u_int32_t *newSectData, u_int32_t NewSectSize)
+bool Fs3Operations::Fs3ReplaceSectionInDevImg(fs3_section_t sectionType,
+                                              fs3_section_t nextSectionType,
+                                              bool toAdd,
+                                              u_int8_t* newImgData,
+                                              u_int32_t newImageSize,
+                                              u_int32_t* newSectData,
+                                              u_int32_t NewSectSize)
 {
     u_int32_t newSectAddr;
     u_int32_t numOfItocs;
     struct toc_info tocArr[MAX_TOCS_NUM];
     fs3_section_t sectToPut;
     u_int32_t oldSectSize;
-    if (!GetModifiedSectionInfo(sectionType, nextSectionType, newSectAddr, sectToPut, oldSectSize)) {
+    if (!GetModifiedSectionInfo(sectionType, nextSectionType, newSectAddr, sectToPut, oldSectSize))
+    {
         return false;
     }
     u_int32_t removedOrNewSectSize = (toAdd) ? NewSectSize : oldSectSize;
 
-    if (!UpdateItocAfterInsert(sectionType, newSectAddr, sectToPut, toAdd, newSectData, removedOrNewSectSize, tocArr, numOfItocs)) {
+    if (!UpdateItocAfterInsert(sectionType, newSectAddr, sectToPut, toAdd, newSectData, removedOrNewSectSize, tocArr,
+                               numOfItocs))
+    {
         return false;
     }
-    if (!UpdateImageAfterInsert(tocArr, numOfItocs, newImgData, newImageSize)) {
+    if (!UpdateImageAfterInsert(tocArr, numOfItocs, newImgData, newImageSize))
+    {
         return false;
     }
-    if (!newImgData) {
+    if (!newImgData)
+    {
         // uptade was perform on the object, update its itoc array
         _fs3ImgInfo.numOfItocs = numOfItocs;
-        for (u_int32_t i = 0; i < numOfItocs; i++) {
+        for (u_int32_t i = 0; i < numOfItocs; i++)
+        {
             _fs3ImgInfo.tocArr[i] = tocArr[i];
         }
     }
     return true;
 }
 
-bool Fs3Operations::Fs3ModifySection(fs3_section_t sectionType, fs3_section_t neighbourSection, bool toAdd, u_int32_t *newSectData, u_int32_t newSectSize,
+bool Fs3Operations::Fs3ModifySection(fs3_section_t sectionType,
+                                     fs3_section_t neighbourSection,
+                                     bool toAdd,
+                                     u_int32_t* newSectData,
+                                     u_int32_t newSectSize,
                                      ProgressCallBack progressFunc)
 {
     // Get image data and ROM data and integrate ROM data into image data
     // Verify FW on device
-    if (!FwVerify((VerifyCallBack)NULL)) {
+    if (!FwVerify((VerifyCallBack)NULL))
+    {
         return errmsg("Verify FW burn on the device failed: %s", err());
     }
 
     std::vector<u_int8_t> newImageData(_fwImgInfo.lastImageAddr);
     // u_int8_t *newImageData = new u_int8_t[_fwImgInfo.lastImageAddr];
 
-    if (!Fs3ReplaceSectionInDevImg(sectionType, neighbourSection, toAdd, (u_int8_t *)&newImageData[0], _fwImgInfo.lastImageAddr,
-                                   newSectData, newSectSize)) {
+    if (!Fs3ReplaceSectionInDevImg(sectionType, neighbourSection, toAdd, (u_int8_t*)&newImageData[0],
+                                   _fwImgInfo.lastImageAddr, newSectData, newSectSize))
+    {
         return false;
     }
     // Burn the new image into the device.
     burnDataParamsT params;
-    params.data = (u_int32_t *)&newImageData[0];
+    params.data = (u_int32_t*)&newImageData[0];
     params.dataSize = _fwImgInfo.lastImageAddr;
     params.progressFunc = progressFunc;
     params.calcSha = _signatureExists;
-    if (!FwBurnData(params)) {
+    if (!FwBurnData(params))
+    {
         return false;
     }
     return true;
 }
 
-bool Fs3Operations::Fs3AddSection(fs3_section_t sectionType, fs3_section_t neighbourSection, u_int32_t *newSectData, u_int32_t newSectSize,
+bool Fs3Operations::Fs3AddSection(fs3_section_t sectionType,
+                                  fs3_section_t neighbourSection,
+                                  u_int32_t* newSectData,
+                                  u_int32_t newSectSize,
                                   ProgressCallBack progressFunc)
 {
     // We need to add the new section before the neighbourSection
@@ -1869,34 +2197,42 @@ bool Fs3Operations::Fs3AddSection(fs3_section_t sectionType, fs3_section_t neigh
 
 bool Fs3Operations::Fs3RemoveSection(fs3_section_t sectionType, ProgressCallBack progressFunc)
 {
-    return Fs3ModifySection(sectionType, sectionType, false, (u_int32_t *)NULL, 0, progressFunc);
+    return Fs3ModifySection(sectionType, sectionType, false, (u_int32_t*)NULL, 0, progressFunc);
 }
 
-bool Fs3Operations::FwBurnRom(FImage *romImg, bool ignoreProdIdCheck, bool ignoreDevidCheck,
+bool Fs3Operations::FwBurnRom(FImage* romImg,
+                              bool ignoreProdIdCheck,
+                              bool ignoreDevidCheck,
                               ProgressCallBack progressFunc)
 {
     roms_info_t romsInfo;
 
-    if (romImg == NULL) {
+    if (romImg == NULL)
+    {
         return errmsg("Bad ROM image is given.");
     }
 
-    if (romImg->getBufLength() == 0) {
+    if (romImg->getBufLength() == 0)
+    {
         return errmsg("Bad ROM file: Empty file.");
     }
-    if (!FwOperations::getRomsInfo(romImg, romsInfo)) {
+    if (!FwOperations::getRomsInfo(romImg, romsInfo))
+    {
         return errmsg("Failed to read given ROM.");
     }
-    if (!FsIntQueryAux(false)) {
+    if (!FsIntQueryAux(false))
+    {
         return false;
     }
 
-    if (!ignoreDevidCheck && !FwOperations::checkMatchingExpRomDevId(_fwImgInfo.ext_info.dev_type, romsInfo)) {
-        return errmsg("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n", _fwImgInfo.ext_info.dev_type,
-                      romsInfo.exp_rom_com_devid);
+    if (!ignoreDevidCheck && !FwOperations::checkMatchingExpRomDevId(_fwImgInfo.ext_info.dev_type, romsInfo))
+    {
+        return errmsg("Image file ROM: FW is for device %d, but Exp-ROM is for device %d\n",
+                      _fwImgInfo.ext_info.dev_type, romsInfo.exp_rom_com_devid);
     }
 
-    if (!RomCommonCheck(ignoreProdIdCheck, false)) {
+    if (!RomCommonCheck(ignoreProdIdCheck, false))
+    {
         return false;
     }
     return Fs3AddSection(FS3_ROM_CODE, FS3_PCI_CODE, romImg->getBuf(), romImg->getBufLength(), progressFunc);
@@ -1904,61 +2240,80 @@ bool Fs3Operations::FwBurnRom(FImage *romImg, bool ignoreProdIdCheck, bool ignor
 
 bool Fs3Operations::FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc)
 {
-    //run int query to get product ver
-    if (!FsIntQueryAux(true)) {
+    // run int query to get product ver
+    if (!FsIntQueryAux(true))
+    {
         return false;
     }
 
-    if (!RomCommonCheck(ignoreProdIdCheck, true)) {
+    if (!RomCommonCheck(ignoreProdIdCheck, true))
+    {
         return false;
     }
     return Fs3RemoveSection(FS3_ROM_CODE, progressFunc);
 }
 
-bool Fs3Operations::Fs3GetItocInfo(struct toc_info *tocArr, int num_of_itocs, fs3_section_t sect_type, struct toc_info*&curr_toc)
+bool Fs3Operations::Fs3GetItocInfo(struct toc_info* tocArr,
+                                   int num_of_itocs,
+                                   fs3_section_t sect_type,
+                                   struct toc_info*& curr_toc)
 {
-    for (int i = 0; i < num_of_itocs; i++) {
-        struct toc_info *itoc_info = &tocArr[i];
-        if (itoc_info->toc_entry.type == sect_type) {
-            curr_toc =  itoc_info;
+    for (int i = 0; i < num_of_itocs; i++)
+    {
+        struct toc_info* itoc_info = &tocArr[i];
+        if (itoc_info->toc_entry.type == sect_type)
+        {
+            curr_toc = itoc_info;
             return true;
         }
     }
     return errmsg("ITOC entry type: %s (%d) not found", GetSectionNameByType(sect_type), sect_type);
 }
 
-bool Fs3Operations::Fs3UpdateMfgUidsSection(struct toc_info *curr_toc, std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                                            std::vector<u_int8_t>  &newSectionData)
+bool Fs3Operations::Fs3UpdateMfgUidsSection(struct toc_info* curr_toc,
+                                            std::vector<u_int8_t> section_data,
+                                            fs3_uid_t base_uid,
+                                            std::vector<u_int8_t>& newSectionData)
 {
     struct cibfw_mfg_info cib_mfg_info;
     struct cx4fw_mfg_info cx4_mfg_info;
     (void)curr_toc;
-    cibfw_mfg_info_unpack(&cib_mfg_info, (u_int8_t *)&section_data[0]);
+    cibfw_mfg_info_unpack(&cib_mfg_info, (u_int8_t*)&section_data[0]);
 
-    if (CHECK_MFG_OLD_FORMAT(cib_mfg_info)) {
-        if (!Fs3ChangeUidsFromBase(base_uid, cib_mfg_info.guids)) {
+    if (CHECK_MFG_OLD_FORMAT(cib_mfg_info))
+    {
+        if (!Fs3ChangeUidsFromBase(base_uid, cib_mfg_info.guids))
+        {
             return false;
         }
-    } else if (CHECK_MFG_NEW_FORMAT(cib_mfg_info)) {
-        cx4fw_mfg_info_unpack(&cx4_mfg_info, (u_int8_t *)&section_data[0]);
-        if (!Fs3ChangeUidsFromBase(base_uid, cx4_mfg_info.guids)) {
+    }
+    else if (CHECK_MFG_NEW_FORMAT(cib_mfg_info))
+    {
+        cx4fw_mfg_info_unpack(&cx4_mfg_info, (u_int8_t*)&section_data[0]);
+        if (!Fs3ChangeUidsFromBase(base_uid, cx4_mfg_info.guids))
+        {
             return false;
         }
-    } else {
-        return errmsg("Unknown MFG_INFO format version (%d.%d).", cib_mfg_info.major_version, cib_mfg_info.minor_version);
+    }
+    else
+    {
+        return errmsg("Unknown MFG_INFO format version (%d.%d).", cib_mfg_info.major_version,
+                      cib_mfg_info.minor_version);
     }
     newSectionData = section_data;
 
-    if (CHECK_MFG_NEW_FORMAT(cib_mfg_info)) {
-        cx4fw_mfg_info_pack(&cx4_mfg_info, (u_int8_t *)&newSectionData[0]);
-    } else {
-        cibfw_mfg_info_pack(&cib_mfg_info, (u_int8_t *)&newSectionData[0]);
+    if (CHECK_MFG_NEW_FORMAT(cib_mfg_info))
+    {
+        cx4fw_mfg_info_pack(&cx4_mfg_info, (u_int8_t*)&newSectionData[0]);
+    }
+    else
+    {
+        cibfw_mfg_info_pack(&cib_mfg_info, (u_int8_t*)&newSectionData[0]);
     }
     return true;
 }
 
-#define GUID_TO_64(guid_st) \
-    (guid_st.l | (u_int64_t)guid_st.h << 32)
+#define GUID_TO_64(guid_st) (guid_st.l | (u_int64_t)guid_st.h << 32)
 
 bool Fs3Operations::Fs3ChangeUidsFromBase(fs3_uid_t base_uid, struct cibfw_guids& guids)
 {
@@ -1967,26 +2322,32 @@ bool Fs3Operations::Fs3ChangeUidsFromBase(fs3_uid_t base_uid, struct cibfw_guids
      */
     u_int64_t base_guid_64;
     u_int64_t base_mac_64;
-    if (!base_uid.use_pp_attr) {
+    if (!base_uid.use_pp_attr)
+    {
         return errmsg("Expected per port attributes to be specified");
     }
 
     base_guid_64 = GUID_TO_64(base_uid.base_guid);
-    base_mac_64 = (((u_int64_t)base_uid.base_guid.l & 0xffffff) | (((u_int64_t)base_uid.base_guid.h & 0xffffff00) << 16));
+    base_mac_64 =
+      (((u_int64_t)base_uid.base_guid.l & 0xffffff) | (((u_int64_t)base_uid.base_guid.h & 0xffffff00) << 16));
     guids.guids[0].uid = base_guid_64;
-    guids.guids[0].num_allocated = base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.guids[0].num_allocated;
+    guids.guids[0].num_allocated =
+      base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.guids[0].num_allocated;
     guids.guids[0].step = base_uid.step_size_pp[0] != DEFAULT_STEP ? base_uid.step_size_pp[0] : guids.guids[0].step;
 
     guids.guids[1].uid = base_guid_64 + (guids.guids[0].num_allocated * guids.guids[0].step);
-    guids.guids[1].num_allocated = base_uid.num_of_guids_pp[1] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[1] : guids.guids[1].num_allocated;
+    guids.guids[1].num_allocated =
+      base_uid.num_of_guids_pp[1] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[1] : guids.guids[1].num_allocated;
     guids.guids[1].step = base_uid.step_size_pp[1] != DEFAULT_STEP ? base_uid.step_size_pp[1] : guids.guids[1].step;
 
     guids.macs[0].uid = base_mac_64;
-    guids.macs[0].num_allocated = base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.macs[0].num_allocated;
+    guids.macs[0].num_allocated =
+      base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.macs[0].num_allocated;
     guids.macs[0].step = base_uid.step_size_pp[0] != DEFAULT_STEP ? base_uid.step_size_pp[0] : guids.macs[0].step;
 
     guids.macs[1].uid = base_mac_64 + (guids.macs[0].num_allocated * guids.macs[0].step);
-    guids.macs[1].num_allocated = base_uid.num_of_guids_pp[1] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[1] : guids.macs[1].num_allocated;
+    guids.macs[1].num_allocated =
+      base_uid.num_of_guids_pp[1] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[1] : guids.macs[1].num_allocated;
     guids.macs[1].step = base_uid.step_size_pp[1] != DEFAULT_STEP ? base_uid.step_size_pp[1] : guids.macs[1].step;
     return true;
 }
@@ -1998,142 +2359,172 @@ bool Fs3Operations::Fs3ChangeUidsFromBase(fs3_uid_t base_uid, struct cx4fw_guids
      */
     u_int64_t base_guid_64;
     u_int64_t base_mac_64;
-    if (!base_uid.use_pp_attr) {
+    if (!base_uid.use_pp_attr)
+    {
         return errmsg("Expected per port attributes to be specified");
     }
 
     base_guid_64 = base_uid.base_guid_specified ? GUID_TO_64(base_uid.base_guid) : guids.guids.uid;
     base_mac_64 = base_uid.base_mac_specified ? GUID_TO_64(base_uid.base_mac) : guids.macs.uid;
-    if (base_uid.set_mac_from_guid && base_uid.base_guid_specified) {
+    if (base_uid.set_mac_from_guid && base_uid.base_guid_specified)
+    {
         // in case we derrive mac from guid
-        base_mac_64 = (((u_int64_t)base_uid.base_guid.l & 0xffffff) | (((u_int64_t)base_uid.base_guid.h & 0xffffff00) << 16));
+        base_mac_64 =
+          (((u_int64_t)base_uid.base_guid.l & 0xffffff) | (((u_int64_t)base_uid.base_guid.h & 0xffffff00) << 16));
     }
 
     guids.guids.uid = base_guid_64;
-    guids.guids.num_allocated = base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.guids.num_allocated;
+    guids.guids.num_allocated =
+      base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.guids.num_allocated;
     guids.guids.step = base_uid.step_size_pp[0] != DEFAULT_STEP ? base_uid.step_size_pp[0] : guids.guids.step;
 
     guids.macs.uid = base_mac_64;
-    guids.macs.num_allocated = base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.macs.num_allocated;
+    guids.macs.num_allocated =
+      base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.macs.num_allocated;
     guids.macs.step = base_uid.step_size_pp[0] != DEFAULT_STEP ? base_uid.step_size_pp[0] : guids.macs.step;
     return true;
 }
 
-bool Fs3Operations::Fs3UpdateUidsSection(struct toc_info *curr_toc, std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                                         std::vector<u_int8_t>  &newSectionData)
+bool Fs3Operations::Fs3UpdateUidsSection(struct toc_info* curr_toc,
+                                         std::vector<u_int8_t> section_data,
+                                         fs3_uid_t base_uid,
+                                         std::vector<u_int8_t>& newSectionData)
 {
     struct cibfw_device_info cib_dev_info;
     struct cx4fw_device_info cx4_dev_info;
     (void)curr_toc;
-    cibfw_device_info_unpack(&cib_dev_info, (u_int8_t *)&section_data[0]);
+    cibfw_device_info_unpack(&cib_dev_info, (u_int8_t*)&section_data[0]);
 
-    if (CHECK_DEV_INFO_OLD_FORMAT(cib_dev_info)) {
-        if (!Fs3ChangeUidsFromBase(base_uid, cib_dev_info.guids)) {
+    if (CHECK_DEV_INFO_OLD_FORMAT(cib_dev_info))
+    {
+        if (!Fs3ChangeUidsFromBase(base_uid, cib_dev_info.guids))
+        {
             return false;
         }
-    } else if (CHECK_DEV_INFO_NEW_FORMAT(cib_dev_info)) {
-        cx4fw_device_info_unpack(&cx4_dev_info, (u_int8_t *)&section_data[0]);
-        if (!Fs3ChangeUidsFromBase(base_uid, cx4_dev_info.guids)) {
+    }
+    else if (CHECK_DEV_INFO_NEW_FORMAT(cib_dev_info))
+    {
+        cx4fw_device_info_unpack(&cx4_dev_info, (u_int8_t*)&section_data[0]);
+        if (!Fs3ChangeUidsFromBase(base_uid, cx4_dev_info.guids))
+        {
             return false;
         }
-    } else {
-        return errmsg("Unknown DEV_INFO format version (%d.%d).", cib_dev_info.major_version, cib_dev_info.minor_version);
+    }
+    else
+    {
+        return errmsg("Unknown DEV_INFO format version (%d.%d).", cib_dev_info.major_version,
+                      cib_dev_info.minor_version);
     }
     newSectionData = section_data;
 
-    if (CHECK_DEV_INFO_NEW_FORMAT(cib_dev_info)) {
-        cx4fw_device_info_pack(&cx4_dev_info, (u_int8_t *)&newSectionData[0]);
-    } else {
-        cibfw_device_info_pack(&cib_dev_info, (u_int8_t *)&newSectionData[0]);
+    if (CHECK_DEV_INFO_NEW_FORMAT(cib_dev_info))
+    {
+        cx4fw_device_info_pack(&cx4_dev_info, (u_int8_t*)&newSectionData[0]);
+    }
+    else
+    {
+        cibfw_device_info_pack(&cib_dev_info, (u_int8_t*)&newSectionData[0]);
     }
     return true;
 }
 
-bool Fs3Operations::Fs3UpdateVsdSection(struct toc_info *curr_toc, std::vector<u_int8_t>  section_data, char *user_vsd,
-                                        std::vector<u_int8_t>  &newSectionData)
+bool Fs3Operations::Fs3UpdateVsdSection(struct toc_info* curr_toc,
+                                        std::vector<u_int8_t> section_data,
+                                        char* user_vsd,
+                                        std::vector<u_int8_t>& newSectionData)
 {
     struct cibfw_device_info dev_info;
     (void)curr_toc;
-    cibfw_device_info_unpack(&dev_info, (u_int8_t *)&section_data[0]);
+    cibfw_device_info_unpack(&dev_info, (u_int8_t*)&section_data[0]);
     memset(dev_info.vsd, 0, sizeof(dev_info.vsd));
     strncpy(dev_info.vsd, user_vsd, TOOLS_ARR_SZ(dev_info.vsd) - 1);
     newSectionData = section_data;
-    cibfw_device_info_pack(&dev_info, (u_int8_t *)&newSectionData[0]);
+    cibfw_device_info_pack(&dev_info, (u_int8_t*)&newSectionData[0]);
     return true;
 }
 
-bool Fs3Operations::Fs3UpdateVpdSection(struct toc_info *curr_toc, char *vpd,
-                                        std::vector<u_int8_t>  &newSectionData)
+bool Fs3Operations::Fs3UpdateVpdSection(struct toc_info* curr_toc, char* vpd, std::vector<u_int8_t>& newSectionData)
 {
     int vpd_size = 0;
-    u_int8_t *vpd_data = (u_int8_t *)NULL;
+    u_int8_t* vpd_data = (u_int8_t*)NULL;
 
-    if (!ReadBinFile(vpd, vpd_data, vpd_size)) {
+    if (!ReadBinFile(vpd, vpd_data, vpd_size))
+    {
         return false;
     }
-    if (vpd_size % 4) {
+    if (vpd_size % 4)
+    {
         delete[] vpd_data;
         return errmsg("Size of VPD file: %d is not 4-byte aligned!", vpd_size);
     }
     // assuming VPD section is the last piece of Data on the flash
-    if ((_ioAccess)->is_flash() && (getAbsAddr(curr_toc) + vpd_size > (_ioAccess)->get_effective_size())) {
+    if ((_ioAccess)->is_flash() && (getAbsAddr(curr_toc) + vpd_size > (_ioAccess)->get_effective_size()))
+    {
         delete[] vpd_data;
-        return errmsg("VPD data exceeds flash size, max VPD size: 0x%x bytes", (_ioAccess)->get_effective_size() - getAbsAddr(curr_toc));
+        return errmsg("VPD data exceeds flash size, max VPD size: 0x%x bytes",
+                      (_ioAccess)->get_effective_size() - getAbsAddr(curr_toc));
     }
-    GetSectData(newSectionData, (u_int32_t *)vpd_data, vpd_size);
+    GetSectData(newSectionData, (u_int32_t*)vpd_data, vpd_size);
     curr_toc->toc_entry.size = vpd_size / 4;
     delete[] vpd_data;
     return true;
 }
 
-bool Fs3Operations::Fs3UpdatePublicKeysSection(unsigned int currSectionSize, const char *publicKeys,
-                                               std::vector<u_int8_t>  &newSectionData, bool silent)
+bool Fs3Operations::Fs3UpdatePublicKeysSection(unsigned int currSectionSize,
+                                               const char* publicKeys,
+                                               std::vector<u_int8_t>& newSectionData,
+                                               bool silent)
 {
     int publicKeysSize = 0, publicKeysSizeInDW = 0;
-    u_int8_t *publicKeysData = (u_int8_t *)NULL;
+    u_int8_t* publicKeysData = (u_int8_t*)NULL;
 
-    if (!ReadBinFile(publicKeys, publicKeysData, publicKeysSize)) {
+    if (!ReadBinFile(publicKeys, publicKeysData, publicKeysSize))
+    {
         return false;
     }
 
     publicKeysSizeInDW = publicKeysSize >> 2;
 
-    if (publicKeysSizeInDW != (int)currSectionSize) {
+    if (publicKeysSizeInDW != (int)currSectionSize)
+    {
         delete[] publicKeysData;
-        if (silent == false) {
+        if (silent == false)
+        {
             return errmsg("The Size of the given public keys section (%d bytes) is not valid", publicKeysSize);
         }
-        else {
+        else
+        {
             return false;
         }
     }
 
-    GetSectData(newSectionData, (u_int32_t *)publicKeysData, publicKeysSize);
+    GetSectData(newSectionData, (u_int32_t*)publicKeysData, publicKeysSize);
     delete[] publicKeysData;
     return true;
 }
 
-
 // all device data section might be shifted by SHIFT_SIZE due to
 // flash with write protect sector 0f 64kb instead of 4kb
 #define SHIFT_SIZE 0xf000 // 60kb
 
-
-bool Fs3Operations::Fs3GetNewSectionAddr(struct toc_info *curr_toc, u_int32_t &NewSectionAddr, bool failsafe_section)
+bool Fs3Operations::Fs3GetNewSectionAddr(struct toc_info* curr_toc, u_int32_t& NewSectionAddr, bool failsafe_section)
 {
     u_int32_t flash_addr = curr_toc->toc_entry.flash_addr << 2;
 
     // HACK: THIS IS AN UGLY HACK, SHOULD BE REMOVED ASAP
-    // Possible solution : if a section is failsafe  make its size 2kb thus both section will fit in a 4kb chunk (addr & 0x800 == 0x800 then its in second place, if == 0 its in first place )
+    // Possible solution : if a section is failsafe  make its size 2kb thus both section will fit in a 4kb chunk (addr &
+    // 0x800 == 0x800 then its in second place, if == 0 its in first place )
 
-    if (failsafe_section) {
+    if (failsafe_section)
+    {
         // we assume dev_info is the only FS section.
         // get the two dev_info addresses (section is failsafe) according to the location of the mfg section
-        toc_info *toc = (toc_info *) NULL;
+        toc_info* toc = (toc_info*)NULL;
         u_int32_t devInfoAddr1 = 0;
         u_int32_t devInfoAddr2 = 0;
 
-        if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, FS3_MFG_INFO, toc)) {
+        if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, FS3_MFG_INFO, toc))
+        {
             return errmsg("failed to locate MFG_INFO address within the FW image");
         }
         // calculate device info sections (fs section) address according to the MFG section
@@ -2141,222 +2532,276 @@ bool Fs3Operations::Fs3GetNewSectionAddr(struct toc_info *curr_toc, u_int32_t &N
         devInfoAddr1 = (toc->toc_entry.flash_addr << 2) - 0x1000;
         devInfoAddr2 = (toc->toc_entry.flash_addr << 2) - 0x2000;
 
-        if ((flash_addr == devInfoAddr1) || (flash_addr == devInfoAddr2)) {
+        if ((flash_addr == devInfoAddr1) || (flash_addr == devInfoAddr2))
+        {
             NewSectionAddr = (flash_addr == devInfoAddr1) ? devInfoAddr2 : devInfoAddr1;
-        } else {
+        }
+        else
+        {
             // FW image is a mess
             return errmsg("DEV_INFO section is located in an unexpected address(0x%x)", flash_addr);
         }
-    } else {
+    }
+    else
+    {
         NewSectionAddr = flash_addr;
     }
     return true;
 }
 
-bool Fs3Operations::CalcItocEntryCRC(struct toc_info *curr_toc)
+bool Fs3Operations::CalcItocEntryCRC(struct toc_info* curr_toc)
 {
     u_int8_t new_entry_data[CIBFW_ITOC_ENTRY_SIZE];
     memset(new_entry_data, 0, CIBFW_ITOC_ENTRY_SIZE);
 
     cibfw_itoc_entry_pack(&curr_toc->toc_entry, new_entry_data);
-    u_int32_t entry_crc = CalcImageCRC((u_int32_t *)new_entry_data, (TOC_ENTRY_SIZE / 4) - 1);
+    u_int32_t entry_crc = CalcImageCRC((u_int32_t*)new_entry_data, (TOC_ENTRY_SIZE / 4) - 1);
     curr_toc->toc_entry.itoc_entry_crc = entry_crc;
     return true;
-
 }
 
-bool Fs3Operations::Fs3UpdateItocData(struct toc_info *currToc)
+bool Fs3Operations::Fs3UpdateItocData(struct toc_info* currToc)
 {
     CalcItocEntryCRC(currToc);
     memset(currToc->data, 0, CIBFW_ITOC_ENTRY_SIZE);
     cibfw_itoc_entry_pack(&currToc->toc_entry, currToc->data);
 
     return true;
-
 }
 
-bool Fs3Operations::Fs3UpdateItocInfo(struct toc_info *curr_toc, u_int32_t newSectionAddr)
+bool Fs3Operations::Fs3UpdateItocInfo(struct toc_info* curr_toc, u_int32_t newSectionAddr)
 {
     // We assume it's absolute
     curr_toc->toc_entry.flash_addr = newSectionAddr >> 2;
     return Fs3UpdateItocData(curr_toc);
-
 }
-bool Fs3Operations::Fs3UpdateItocInfo(struct toc_info *curr_toc, u_int32_t newSectionAddr, u_int32_t NewSectSize, std::vector<u_int8_t>  newSectionData)
+bool Fs3Operations::Fs3UpdateItocInfo(struct toc_info* curr_toc,
+                                      u_int32_t newSectionAddr,
+                                      u_int32_t NewSectSize,
+                                      std::vector<u_int8_t> newSectionData)
 {
     curr_toc->section_data = newSectionData;
     curr_toc->toc_entry.size = NewSectSize;
-    u_int32_t new_crc = CalcImageCRC((u_int32_t *)&newSectionData[0], curr_toc->toc_entry.size);
+    u_int32_t new_crc = CalcImageCRC((u_int32_t*)&newSectionData[0], curr_toc->toc_entry.size);
     curr_toc->toc_entry.section_crc = new_crc;
 
     return Fs3UpdateItocInfo(curr_toc, newSectionAddr);
 }
 
 bool Fs3Operations::Fs3ReburnItocSection(u_int32_t newSectionAddr,
-                                         u_int32_t newSectionSize, std::vector<u_int8_t>  newSectionData, const char *msg, PrintCallBack callBackFunc)
+                                         u_int32_t newSectionSize,
+                                         std::vector<u_int8_t> newSectionData,
+                                         const char* msg,
+                                         PrintCallBack callBackFunc)
 {
     char message[127];
 
     sprintf(message, "Updating %-4s section - ", msg);
     // Burn new Section
     // we pass a null callback and print the progress here as the writes are small (guids/mfg/vpd_str)
-    // in the future if we want to pass the cb prints to writeImage , need to change the signature of progressCallBack to receive and optional string to print
+    // in the future if we want to pass the cb prints to writeImage , need to change the signature of progressCallBack
+    // to receive and optional string to print
 
     PRINT_PROGRESS(callBackFunc, message);
 
-    if (!writeImage((ProgressCallBack)NULL, newSectionAddr, (u_int8_t *)&newSectionData[0], newSectionSize, true, true)) {
-        PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    if (!writeImage((ProgressCallBack)NULL, newSectionAddr, (u_int8_t*)&newSectionData[0], newSectionSize, true, true))
+    {
+        PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
         return false;
     }
-    PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+    PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
     // Update new ITOC section
     bool is_flash = _ioAccess->is_flash();
-    if (!reburnItocSection(callBackFunc, is_flash)) {
+    if (!reburnItocSection(callBackFunc, is_flash))
+    {
         return false;
     }
     return true;
 }
 
-bool Fs3Operations::Fs3UpdateForbiddenVersionsSection(unsigned int currSectionSize, char *fileName,
-                                                      std::vector<u_int8_t>  &newSectionData)
+bool Fs3Operations::Fs3UpdateForbiddenVersionsSection(unsigned int currSectionSize,
+                                                      char* fileName,
+                                                      std::vector<u_int8_t>& newSectionData)
 {
     int size = 0, sizeInDW = 0;
-    u_int8_t *data = (u_int8_t *)NULL;
+    u_int8_t* data = (u_int8_t*)NULL;
 
-    if (!ReadBinFile(fileName, data, size)) {
+    if (!ReadBinFile(fileName, data, size))
+    {
         return false;
     }
 
     sizeInDW = size >> 2;
 
-    if (sizeInDW != (int)currSectionSize) {
+    if (sizeInDW != (int)currSectionSize)
+    {
         delete[] data;
         return errmsg("The Size of the given forbidden versions section (%d bytes) is not valid", size);
     }
 
-    GetSectData(newSectionData, (u_int32_t *)data, size);
+    GetSectData(newSectionData, (u_int32_t*)data, size);
     delete[] data;
     return true;
 }
 
-//add callback if we want info during section update
-bool Fs3Operations::UpdateSection(void *new_info, fs3_section_t sect_type, bool is_sect_failsafe, CommandType cmd_type, PrintCallBack callBackFunc)
+// add callback if we want info during section update
+bool Fs3Operations::UpdateSection(void* new_info,
+                                  fs3_section_t sect_type,
+                                  bool is_sect_failsafe,
+                                  CommandType cmd_type,
+                                  PrintCallBack callBackFunc)
 {
-    struct toc_info *curr_toc = (struct toc_info *)NULL;
+    struct toc_info* curr_toc = (struct toc_info*)NULL;
     std::vector<u_int8_t> newSection;
     u_int32_t newSectionAddr;
-    const char *type_msg;
+    const char* type_msg;
     // init sector to read
     _readSectList.push_back(sect_type);
-    if (!FsIntQueryAux()) {
+    if (!FsIntQueryAux())
+    {
         _readSectList.pop_back();
         return false;
     }
     _readSectList.pop_back();
     // _silent = curr_silent;
 
-    if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sect_type, curr_toc)) {
+    if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sect_type, curr_toc))
+    {
         return false;
     }
 
-    if (sect_type == FS3_MFG_INFO) {
-        fs3_uid_t base_uid = *(fs3_uid_t *)new_info;
+    if (sect_type == FS3_MFG_INFO)
+    {
+        fs3_uid_t base_uid = *(fs3_uid_t*)new_info;
         type_msg = "GUID";
-        if (!Fs3UpdateMfgUidsSection(curr_toc, curr_toc->section_data, base_uid, newSection)) {
+        if (!Fs3UpdateMfgUidsSection(curr_toc, curr_toc->section_data, base_uid, newSection))
+        {
             return false;
         }
-    } else if (sect_type == FS3_DEV_INFO) {
-        if (cmd_type == CMD_SET_GUIDS) {
-            fs3_uid_t base_uid = *(fs3_uid_t *)new_info;
+    }
+    else if (sect_type == FS3_DEV_INFO)
+    {
+        if (cmd_type == CMD_SET_GUIDS)
+        {
+            fs3_uid_t base_uid = *(fs3_uid_t*)new_info;
             type_msg = "GUID";
-            if (!Fs3UpdateUidsSection(curr_toc, curr_toc->section_data, base_uid, newSection)) {
+            if (!Fs3UpdateUidsSection(curr_toc, curr_toc->section_data, base_uid, newSection))
+            {
                 return false;
             }
-        } else if (cmd_type == CMD_SET_VSD) {
-            char *user_vsd = (char *)new_info;
+        }
+        else if (cmd_type == CMD_SET_VSD)
+        {
+            char* user_vsd = (char*)new_info;
             type_msg = "VSD";
-            if (!Fs3UpdateVsdSection(curr_toc, curr_toc->section_data, user_vsd, newSection)) {
+            if (!Fs3UpdateVsdSection(curr_toc, curr_toc->section_data, user_vsd, newSection))
+            {
                 return false;
             }
-        } else {
+        }
+        else
+        {
             // We shouldnt reach here EVER
-            type_msg = (char *)"Unknown";
+            type_msg = (char*)"Unknown";
         }
-    } else if (sect_type == FS3_VPD_R0) {
-        char *vpd_file = (char *)new_info;
+    }
+    else if (sect_type == FS3_VPD_R0)
+    {
+        char* vpd_file = (char*)new_info;
         type_msg = "VPD";
-        if (!Fs3UpdateVpdSection(curr_toc, vpd_file, newSection)) {
+        if (!Fs3UpdateVpdSection(curr_toc, vpd_file, newSection))
+        {
             return false;
         }
-    } else if (sect_type == FS3_IMAGE_SIGNATURE_256 && cmd_type == CMD_SET_SIGNATURE) {
-        vector<u_int8_t> sig((u_int8_t *)new_info, (u_int8_t *)new_info + CX4FW_IMAGE_SIGNATURE_256_SIZE);
+    }
+    else if (sect_type == FS3_IMAGE_SIGNATURE_256 && cmd_type == CMD_SET_SIGNATURE)
+    {
+        vector<u_int8_t> sig((u_int8_t*)new_info, (u_int8_t*)new_info + CX4FW_IMAGE_SIGNATURE_256_SIZE);
         type_msg = "SIGNATURE";
         newSection.resize(CX4FW_IMAGE_SIGNATURE_256_SIZE);
         memcpy(newSection.data(), sig.data(), CX4FW_IMAGE_SIGNATURE_256_SIZE);
-    } else if (sect_type == FS3_IMAGE_SIGNATURE_512 && cmd_type == CMD_SET_SIGNATURE) {
-        vector<u_int8_t> sig((u_int8_t *)new_info, (u_int8_t *)new_info + CX4FW_IMAGE_SIGNATURE_512_SIZE);
+    }
+    else if (sect_type == FS3_IMAGE_SIGNATURE_512 && cmd_type == CMD_SET_SIGNATURE)
+    {
+        vector<u_int8_t> sig((u_int8_t*)new_info, (u_int8_t*)new_info + CX4FW_IMAGE_SIGNATURE_512_SIZE);
         type_msg = "SIGNATURE";
         newSection.resize(CX4FW_IMAGE_SIGNATURE_512_SIZE);
         memcpy(newSection.data(), sig.data(), CX4FW_IMAGE_SIGNATURE_512_SIZE);
-    } else if (sect_type == FS3_PUBLIC_KEYS_2048 && cmd_type == CMD_SET_PUBLIC_KEYS) {
-        char *publickeys_file = (char *)new_info;
+    }
+    else if (sect_type == FS3_PUBLIC_KEYS_2048 && cmd_type == CMD_SET_PUBLIC_KEYS)
+    {
+        char* publickeys_file = (char*)new_info;
         type_msg = "PUBLIC KEYS 2048";
-        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection)) {
+        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection))
+        {
             return false;
         }
-    } else if (sect_type == FS3_PUBLIC_KEYS_4096 && cmd_type == CMD_SET_PUBLIC_KEYS) {
-        char *publickeys_file = (char *)new_info;
+    }
+    else if (sect_type == FS3_PUBLIC_KEYS_4096 && cmd_type == CMD_SET_PUBLIC_KEYS)
+    {
+        char* publickeys_file = (char*)new_info;
         type_msg = "PUBLIC KEYS 4096";
-        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection)) {
+        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection))
+        {
             return false;
         }
     }
     else if (sect_type == FS4_RSA_4096_SIGNATURES && cmd_type == CMD_SET_PUBLIC_4096_RSA_KEY)
     {
-        char *publicKeysData = (char *)new_info;
+        char* publicKeysData = (char*)new_info;
         type_msg = "PUBLIC FS4_RSA_4096_SIGNATURES 4096";
-        GetSectData(newSection, (u_int32_t *)publicKeysData, curr_toc->toc_entry.size);
+        GetSectData(newSection, (u_int32_t*)publicKeysData, curr_toc->toc_entry.size);
     }
-    else if (sect_type == FS3_FORBIDDEN_VERSIONS && cmd_type == CMD_SET_FORBIDDEN_VERSIONS) {
-        char *forbiddenVersions_file = (char *)new_info;
+    else if (sect_type == FS3_FORBIDDEN_VERSIONS && cmd_type == CMD_SET_FORBIDDEN_VERSIONS)
+    {
+        char* forbiddenVersions_file = (char*)new_info;
         type_msg = "Forbidden Versions";
-        if (!Fs3UpdateForbiddenVersionsSection(curr_toc->toc_entry.size, forbiddenVersions_file, newSection)) {
+        if (!Fs3UpdateForbiddenVersionsSection(curr_toc->toc_entry.size, forbiddenVersions_file, newSection))
+        {
             return false;
         }
-    } else {
+    }
+    else
+    {
         return errmsg("Section type %s is not supported\n", GetSectionNameByType(sect_type));
     }
 
-    if (!Fs3GetNewSectionAddr(curr_toc, newSectionAddr, is_sect_failsafe)) {
+    if (!Fs3GetNewSectionAddr(curr_toc, newSectionAddr, is_sect_failsafe))
+    {
         return false;
     }
-    if (!Fs3UpdateItocInfo(curr_toc, newSectionAddr, curr_toc->toc_entry.size, newSection)) {
+    if (!Fs3UpdateItocInfo(curr_toc, newSectionAddr, curr_toc->toc_entry.size, newSection))
+    {
         return false;
     }
-    if (!Fs3ReburnItocSection(newSectionAddr, curr_toc->toc_entry.size * 4, newSection, type_msg, callBackFunc)) {
+    if (!Fs3ReburnItocSection(newSectionAddr, curr_toc->toc_entry.size * 4, newSection, type_msg, callBackFunc))
+    {
         return false;
     }
     return true;
 }
 
-
-bool Fs3Operations::FwSetVSD(char *vsdStr, ProgressCallBack progressFunc, PrintCallBack printFunc)
+bool Fs3Operations::FwSetVSD(char* vsdStr, ProgressCallBack progressFunc, PrintCallBack printFunc)
 {
     // Avoid warning
     (void)progressFunc;
-    if (!vsdStr) {
+    if (!vsdStr)
+    {
         return errmsg("Please specify a valid VSD string.");
     }
 
-    if (strlen(vsdStr) > VSD_LEN) {
+    if (strlen(vsdStr) > VSD_LEN)
+    {
         return errmsg("VSD string is too long(%d), max allowed length: %d", (int)strlen(vsdStr), (int)VSD_LEN);
     }
     FAIL_NO_OCR("set VSD");
-    if (!UpdateSection(vsdStr, FS3_DEV_INFO, false, CMD_SET_VSD, printFunc)) {
+    if (!UpdateSection(vsdStr, FS3_DEV_INFO, false, CMD_SET_VSD, printFunc))
+    {
         return false;
     }
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
-    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications()) {
+    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications())
+    {
         return false;
     }
     return true;
@@ -2396,37 +2841,43 @@ bool Fs3Operations::FwResetNvData()
      */
 }
 
-u_int32_t Fs3Operations::getAbsAddr(toc_info *toc)
+u_int32_t Fs3Operations::getAbsAddr(toc_info* toc)
 {
-    if (toc->toc_entry.relative_addr) {
+    if (toc->toc_entry.relative_addr)
+    {
         return ((toc->toc_entry.flash_addr << 2) + _fwImgInfo.imgStart);
     }
     return toc->toc_entry.flash_addr << 2;
 }
 
-u_int32_t Fs3Operations::getAbsAddr(toc_info *toc, u_int32_t imgStart)
+u_int32_t Fs3Operations::getAbsAddr(toc_info* toc, u_int32_t imgStart)
 {
-    if (toc->toc_entry.relative_addr) {
+    if (toc->toc_entry.relative_addr)
+    {
         return ((toc->toc_entry.flash_addr << 2) + imgStart);
     }
     return toc->toc_entry.flash_addr << 2;
 }
 
-//get the last fw section address (i.e the maximal address + size of the fw section)
+// get the last fw section address (i.e the maximal address + size of the fw section)
 bool Fs3Operations::getLastFwSAddr(u_int32_t& lastAddr)
 {
-    struct toc_info *maxToc = (struct toc_info *)NULL;
+    struct toc_info* maxToc = (struct toc_info*)NULL;
     int i;
     // find first itoc that isnt device data (assumption: there is at least one)
-    for (i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
+    for (i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
         maxToc = &(_fs3ImgInfo.tocArr[i]);
-        if (!maxToc->toc_entry.device_data) {
+        if (!maxToc->toc_entry.device_data)
+        {
             break;
         }
     }
     // find the last non device data itoc
-    for (; i < _fs3ImgInfo.numOfItocs; i++) {
-        if ((!_fs3ImgInfo.tocArr[i].toc_entry.device_data) && getAbsAddr(&(_fs3ImgInfo.tocArr[i])) > getAbsAddr(maxToc)) {
+    for (; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        if ((!_fs3ImgInfo.tocArr[i].toc_entry.device_data) && getAbsAddr(&(_fs3ImgInfo.tocArr[i])) > getAbsAddr(maxToc))
+        {
             maxToc = &_fs3ImgInfo.tocArr[i];
         }
     }
@@ -2436,22 +2887,27 @@ bool Fs3Operations::getLastFwSAddr(u_int32_t& lastAddr)
 
 bool Fs3Operations::getFirstDevDataAddr(u_int32_t& firstAddr)
 {
-    struct toc_info *minToc = (struct toc_info *)NULL;
-    //find first dev data itoc entry
+    struct toc_info* minToc = (struct toc_info*)NULL;
+    // find first dev data itoc entry
     int i;
-    for (i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-        if (_fs3ImgInfo.tocArr[i].toc_entry.device_data) {
+    for (i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        if (_fs3ImgInfo.tocArr[i].toc_entry.device_data)
+        {
             minToc = &(_fs3ImgInfo.tocArr[i]);
             break;
         }
     }
-    if (!minToc) {
+    if (!minToc)
+    {
         return errmsg("failed to get device data ITOC.");
     }
     i++;
     // find the minimal one
-    for (; i < _fs3ImgInfo.numOfItocs; i++) {
-        if (_fs3ImgInfo.tocArr[i].toc_entry.device_data && (getAbsAddr(&(_fs3ImgInfo.tocArr[i])) < getAbsAddr(minToc))) {
+    for (; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        if (_fs3ImgInfo.tocArr[i].toc_entry.device_data && (getAbsAddr(&(_fs3ImgInfo.tocArr[i])) < getAbsAddr(minToc)))
+        {
             minToc = &(_fs3ImgInfo.tocArr[i]);
         }
     }
@@ -2461,68 +2917,78 @@ bool Fs3Operations::getFirstDevDataAddr(u_int32_t& firstAddr)
 
 bool Fs3Operations::reburnItocSection(PrintCallBack callBackFunc, bool burnFailsafe)
 {
-
     // HACK SHOULD BE REMOVED ASAP
     u_int32_t sector_size = FS3_DEFAULT_SECTOR_SIZE;
     // Itoc section is failsafe (two sectors after boot section are reserved for itoc entries)
     u_int32_t oldItocAddr = _fs3ImgInfo.itocAddr;
     u_int32_t newItocAddr = oldItocAddr;
-    if (burnFailsafe) {
-        newItocAddr = (_fs3ImgInfo.firstItocIsEmpty) ? (_fs3ImgInfo.itocAddr - sector_size) :  (_fs3ImgInfo.itocAddr + sector_size);
+    if (burnFailsafe)
+    {
+        newItocAddr =
+          (_fs3ImgInfo.firstItocIsEmpty) ? (_fs3ImgInfo.itocAddr - sector_size) : (_fs3ImgInfo.itocAddr + sector_size);
     }
 
     // Update new ITOC
     u_int32_t itocSize = (_fs3ImgInfo.numOfItocs + 1) * CIBFW_ITOC_ENTRY_SIZE + CIBFW_ITOC_HEADER_SIZE;
-    u_int8_t *p = new u_int8_t[itocSize];
+    u_int8_t* p = new u_int8_t[itocSize];
     memcpy(p, _fs3ImgInfo.itocHeader, CIBFW_ITOC_HEADER_SIZE);
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-        struct toc_info *curr_itoc = &_fs3ImgInfo.tocArr[i];
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        struct toc_info* curr_itoc = &_fs3ImgInfo.tocArr[i];
         memcpy(p + CIBFW_ITOC_HEADER_SIZE + i * CIBFW_ITOC_ENTRY_SIZE, curr_itoc->data, CIBFW_ITOC_ENTRY_SIZE);
     }
     memset(&p[itocSize] - CIBFW_ITOC_ENTRY_SIZE, FS3_END, CIBFW_ITOC_ENTRY_SIZE);
 
-    PRINT_PROGRESS(callBackFunc, (char *)"Updating ITOC section - ");
+    PRINT_PROGRESS(callBackFunc, (char*)"Updating ITOC section - ");
     bool rc = writeImage((ProgressCallBack)NULL, newItocAddr, p, itocSize, false, true);
     delete[] p;
-    if (!rc) {
-        PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    if (!rc)
+    {
+        PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
         return false;
     }
-    PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+    PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
     u_int32_t zeros = 0;
 
-    if (burnFailsafe) {
-        PRINT_PROGRESS(callBackFunc, (char *)"Restoring signature   - ");
-        if (!writeImage((ProgressCallBack)NULL, oldItocAddr, (u_int8_t *)&zeros, 4, false, true)) {
-            PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    if (burnFailsafe)
+    {
+        PRINT_PROGRESS(callBackFunc, (char*)"Restoring signature   - ");
+        if (!writeImage((ProgressCallBack)NULL, oldItocAddr, (u_int8_t*)&zeros, 4, false, true))
+        {
+            PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
             return false;
         }
-        PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+        PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
     }
     return true;
 }
 
-bool Fs3Operations::extractUUIDFromString(const char *uuid, std::vector<u_int32_t>& uuidData)
+bool Fs3Operations::extractUUIDFromString(const char* uuid, std::vector<u_int32_t>& uuidData)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     string strData;
     string uuidString = uuid;
     // remove whitespace and hyphens
-    for (string::const_iterator it = uuidString.begin(); it != uuidString.end(); ++it) {
-        if (isspace(*it) || *it == '-' || *it == ':') {
+    for (string::const_iterator it = uuidString.begin(); it != uuidString.end(); ++it)
+    {
+        if (isspace(*it) || *it == '-' || *it == ':')
+        {
             continue;
         }
-        if (!isxdigit(*it)) {
+        if (!isxdigit(*it))
+        {
             return errmsg("Bad UUID format. UUID must contain hexadecimal digits separated by hyphens");
         }
         strData += *it;
     }
     // extract the data
-    if (strData.length() !=  UUID_LEN * 2) {
+    if (strData.length() != UUID_LEN * 2)
+    {
         return errmsg("Bad UUID format. UUID length must be %d digits", UUID_LEN * 2);
     }
     uuidData.resize(0);
-    for (size_t i = 0; i < UUID_LEN * 2; i += 8) {
+    for (size_t i = 0; i < UUID_LEN * 2; i += 8)
+    {
         stringstream dwSS(strData.substr(i, 8));
         u_int32_t dwData;
         dwSS >> std::hex >> dwData;
@@ -2536,42 +3002,56 @@ bool Fs3Operations::extractUUIDFromString(const char *uuid, std::vector<u_int32_
 #endif
 }
 
-bool Fs3Operations::FwSignWithTwoRSAKeys(const char *privPemFile1, const char *uuid1,
-                                         const char *privPemFile2, const char *uuid2, PrintCallBack printFunc)
+bool Fs3Operations::FwSignWithTwoRSAKeys(const char* privPemFile1,
+                                         const char* uuid1,
+                                         const char* privPemFile2,
+                                         const char* uuid2,
+                                         PrintCallBack printFunc)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     MlxSignRSA rsa1, rsa2;
 
     int rc = rsa1.setPrivKeyFromFile(privPemFile1);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to set the first private key from file (rc = 0x%x)\n", rc);
     }
 
     rc = rsa2.setPrivKeyFromFile(privPemFile2);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to set the second private key from file (rc = 0x%x)\n", rc);
     }
 
     int privKey1Length = rsa1.getPrivKeyLength();
     int privKey2Length = rsa2.getPrivKeyLength();
 
-    if (privKey1Length == 0x100 && privKey2Length == 0x200) {
-        if (!FwInsertEncSHA(MlxSign::SHA512, privPemFile2, uuid2, printFunc)) {
+    if (privKey1Length == 0x100 && privKey2Length == 0x200)
+    {
+        if (!FwInsertEncSHA(MlxSign::SHA512, privPemFile2, uuid2, printFunc))
+        {
             return false;
         }
-        if (!FwInsertEncSHA(MlxSign::SHA256, privPemFile1, uuid1, printFunc)) {
+        if (!FwInsertEncSHA(MlxSign::SHA256, privPemFile1, uuid1, printFunc))
+        {
             return false;
         }
-    } else if (privKey1Length == 0x200 && privKey2Length == 0x100) {
-        if (!FwInsertEncSHA(MlxSign::SHA512, privPemFile1, uuid1, printFunc)) {
+    }
+    else if (privKey1Length == 0x200 && privKey2Length == 0x100)
+    {
+        if (!FwInsertEncSHA(MlxSign::SHA512, privPemFile1, uuid1, printFunc))
+        {
             return false;
         }
-        if (!FwInsertEncSHA(MlxSign::SHA256, privPemFile2, uuid2, printFunc)) {
+        if (!FwInsertEncSHA(MlxSign::SHA256, privPemFile2, uuid2, printFunc))
+        {
             return false;
         }
-    } else {
-        return errmsg("Unexpected length of keys (first key %d bytes, second key length %d)",
-                      privKey1Length, privKey2Length);
+    }
+    else
+    {
+        return errmsg("Unexpected length of keys (first key %d bytes, second key length %d)", privKey1Length,
+                      privKey2Length);
     }
     return true;
 #else
@@ -2585,8 +3065,9 @@ bool Fs3Operations::FwSignWithTwoRSAKeys(const char *privPemFile1, const char *u
 }
 bool Fs3Operations::IsSectionExists(fs3_section_t sectType)
 {
-    struct toc_info *curr_toc = (struct toc_info *)NULL;
-    if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sectType, curr_toc)) {
+    struct toc_info* curr_toc = (struct toc_info*)NULL;
+    if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, sectType, curr_toc))
+    {
         return false;
     }
     return true;
@@ -2595,50 +3076,63 @@ bool Fs3Operations::IsSectionExists(fs3_section_t sectType)
 bool Fs3Operations::Fs3MemSetSignature(fs3_section_t sectType, u_int32_t size, PrintCallBack printFunc)
 {
     vector<u_int8_t> buff;
-    if (sectType != FS3_IMAGE_SIGNATURE_256 &&
-        sectType != FS3_IMAGE_SIGNATURE_512) {
+    if (sectType != FS3_IMAGE_SIGNATURE_256 && sectType != FS3_IMAGE_SIGNATURE_512)
+    {
         return false;
     }
-    if (!FsIntQueryAux(false)) {
+    if (!FsIntQueryAux(false))
+    {
         return false;
     }
-    if (!IsSectionExists(sectType)) {
+    if (!IsSectionExists(sectType))
+    {
         return true;
     }
     buff.resize(size, 0x0);
-    if (!UpdateSection(buff.data(), sectType, false, CMD_SET_SIGNATURE, printFunc)) {
+    if (!UpdateSection(buff.data(), sectType, false, CMD_SET_SIGNATURE, printFunc))
+    {
         return false;
     }
     return true;
 }
-bool Fs3Operations::signForFwUpdate(const char *privPemFile, const char *uuid, PrintCallBack printFunc)
+bool Fs3Operations::signForFwUpdate(const char* privPemFile, const char* uuid, PrintCallBack printFunc)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     MlxSignRSA rsa;
 
     int rc = rsa.setPrivKeyFromFile(privPemFile);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to set private key from file (rc = 0x%x)\n", rc);
     }
 
     int privKeyLength = rsa.getPrivKeyLength();
-    if (privKeyLength == 0x100) {
-        //MemsetSection();
-        if (!Fs3MemSetSignature(FS3_IMAGE_SIGNATURE_512, CX4FW_IMAGE_SIGNATURE_512_SIZE, printFunc)) {
+    if (privKeyLength == 0x100)
+    {
+        // MemsetSection();
+        if (!Fs3MemSetSignature(FS3_IMAGE_SIGNATURE_512, CX4FW_IMAGE_SIGNATURE_512_SIZE, printFunc))
+        {
             return false;
         }
-        if (!FwInsertEncSHA(MlxSign::SHA256, privPemFile, uuid, printFunc)) {
+        if (!FwInsertEncSHA(MlxSign::SHA256, privPemFile, uuid, printFunc))
+        {
             return false;
         }
-    } else if (privKeyLength == 0x200) {
-        //MemsetSection();
-        if (!Fs3MemSetSignature(FS3_IMAGE_SIGNATURE_256, CX4FW_IMAGE_SIGNATURE_256_SIZE, printFunc)) {
+    }
+    else if (privKeyLength == 0x200)
+    {
+        // MemsetSection();
+        if (!Fs3MemSetSignature(FS3_IMAGE_SIGNATURE_256, CX4FW_IMAGE_SIGNATURE_256_SIZE, printFunc))
+        {
             return false;
         }
-        if (!FwInsertEncSHA(MlxSign::SHA512, privPemFile, uuid, printFunc)) {
+        if (!FwInsertEncSHA(MlxSign::SHA512, privPemFile, uuid, printFunc))
+        {
             return false;
         }
-    } else {
+    }
+    else
+    {
         return errmsg("Unexpected length of key(%d bytes)", privKeyLength);
     }
     return true;
@@ -2650,47 +3144,56 @@ bool Fs3Operations::signForFwUpdate(const char *privPemFile, const char *uuid, P
 #endif
 }
 
-bool Fs3Operations::FwInsertEncSHA(MlxSign::SHAType shaType, const char *privPemFile,
-                                   const char *uuid, PrintCallBack printFunc)
+bool Fs3Operations::FwInsertEncSHA(MlxSign::SHAType shaType,
+                                   const char* privPemFile,
+                                   const char* uuid,
+                                   PrintCallBack printFunc)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     MlxSignRSA rsa;
     int rc;
     vector<u_int8_t> sha, encSha, sig;
-    vector <u_int32_t> uuidData;
+    vector<u_int32_t> uuidData;
     struct cx4fw_image_signature_256 image_signature_256;
     struct cx4fw_image_signature_512 image_signature_512;
 
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("Signing is not applicable for devices");
     }
 
-    if (!extractUUIDFromString(uuid, uuidData)) {
+    if (!extractUUIDFromString(uuid, uuidData))
+    {
         return false;
     }
 
-    if ((uuidData.size() << 2) != sizeof(image_signature_256.keypair_uuid)) {
-        return errmsg("Mismatching UUID size(%d), expected %d bytes",
-                      (int)uuidData.size() << 2, (int)sizeof(image_signature_256.keypair_uuid));
+    if ((uuidData.size() << 2) != sizeof(image_signature_256.keypair_uuid))
+    {
+        return errmsg("Mismatching UUID size(%d), expected %d bytes", (int)uuidData.size() << 2,
+                      (int)sizeof(image_signature_256.keypair_uuid));
     }
     vector<u_int8_t> fourMbImage;
-    if (!FwCalcSHA(shaType, sha, fourMbImage)) {
+    if (!FwCalcSHA(shaType, sha, fourMbImage))
+    {
         return false;
     }
 
-    //Sign the SHA256:
+    // Sign the SHA256:
     string privPemFileStr(privPemFile);
     rc = rsa.setPrivKeyFromFile(privPemFileStr);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to set private key from file (rc = 0x%x)\n", rc);
     }
 
     rc = rsa.sign(shaType, sha, encSha);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to encrypt the SHA (rc = 0x%x)\n", rc);
     }
 
-    if (shaType == MlxSign::SHA256) {
+    if (shaType == MlxSign::SHA256)
+    {
         memset(&image_signature_256, 0, sizeof(image_signature_256));
         memcpy(image_signature_256.signature, encSha.data(), encSha.size());
         TOCPUn(image_signature_256.signature, encSha.size() >> 2);
@@ -2698,11 +3201,13 @@ bool Fs3Operations::FwInsertEncSHA(MlxSign::SHAType shaType, const char *privPem
         sig.resize(CX4FW_IMAGE_SIGNATURE_256_SIZE, 0x0);
         cx4fw_image_signature_256_pack(&image_signature_256, sig.data());
 
-        if (!UpdateSection(sig.data(), FS3_IMAGE_SIGNATURE_256,
-                              false, CMD_SET_SIGNATURE, printFunc)) {
+        if (!UpdateSection(sig.data(), FS3_IMAGE_SIGNATURE_256, false, CMD_SET_SIGNATURE, printFunc))
+        {
             return false;
         }
-    } else if (shaType == MlxSign::SHA512) {
+    }
+    else if (shaType == MlxSign::SHA512)
+    {
         memset(&image_signature_512, 0, sizeof(image_signature_512));
         memcpy(image_signature_512.signature, encSha.data(), encSha.size());
         TOCPUn(image_signature_512.signature, encSha.size() >> 2);
@@ -2710,15 +3215,18 @@ bool Fs3Operations::FwInsertEncSHA(MlxSign::SHAType shaType, const char *privPem
         sig.resize(CX4FW_IMAGE_SIGNATURE_512_SIZE, 0x0);
         cx4fw_image_signature_512_pack(&image_signature_512, sig.data());
 
-        if (!UpdateSection(sig.data(), FS3_IMAGE_SIGNATURE_512,
-                              false, CMD_SET_SIGNATURE, printFunc)) {
+        if (!UpdateSection(sig.data(), FS3_IMAGE_SIGNATURE_512, false, CMD_SET_SIGNATURE, printFunc))
+        {
             return false;
         }
-    } else {
+    }
+    else
+    {
         return errmsg("Unexpected type of SHA");
     }
 
-    if (!FsIntQueryAux(false, false)) {
+    if (!FsIntQueryAux(false, false))
+    {
         return false;
     }
 
@@ -2737,11 +3245,13 @@ bool Fs3Operations::FwInsertSHA256(PrintCallBack printFunc)
     vector<u_int8_t> sha, sig;
     struct cx4fw_image_signature_256 image_signature_256;
 
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("Signing is not applicable for devices");
     }
     vector<u_int8_t> fourMbImage;
-    if (!FwCalcSHA(MlxSign::SHA256, sha, fourMbImage)) {
+    if (!FwCalcSHA(MlxSign::SHA256, sha, fourMbImage))
+    {
         return false;
     }
 
@@ -2751,51 +3261,62 @@ bool Fs3Operations::FwInsertSHA256(PrintCallBack printFunc)
     sig.resize(CX4FW_IMAGE_SIGNATURE_256_SIZE);
     cx4fw_image_signature_256_pack(&image_signature_256, sig.data());
 
-    if (!UpdateSection(sig.data(), FS3_IMAGE_SIGNATURE_256,
-                          false, CMD_SET_SIGNATURE, printFunc)) {
+    if (!UpdateSection(sig.data(), FS3_IMAGE_SIGNATURE_256, false, CMD_SET_SIGNATURE, printFunc))
+    {
         return false;
     }
 
-    if (!FsIntQueryAux(false, false)) {
+    if (!FsIntQueryAux(false, false))
+    {
         return false;
     }
 
     return true;
 }
 
-bool Fs3Operations::CheckPublicKeysFile(const char *fname, fs3_section_t& sectionType, bool silent)
+bool Fs3Operations::CheckPublicKeysFile(const char* fname, fs3_section_t& sectionType, bool silent)
 {
     int publicKeysSize = 0;
-    u_int8_t *publicKeysData = (u_int8_t *)NULL;
-    if (!ReadBinFile(fname, publicKeysData, publicKeysSize)) {
+    u_int8_t* publicKeysData = (u_int8_t*)NULL;
+    if (!ReadBinFile(fname, publicKeysData, publicKeysSize))
+    {
         return false;
     }
 
-    if (publicKeysSize < CX4FW_PUBLIC_KEY_2048_SIZE || publicKeysSize < CX4FW_PUBLIC_KEY_4096_SIZE) {
+    if (publicKeysSize < CX4FW_PUBLIC_KEY_2048_SIZE || publicKeysSize < CX4FW_PUBLIC_KEY_4096_SIZE)
+    {
         delete[] publicKeysData;
         return errmsg("Invalid size (%d bytes) of public keys file", publicKeysSize);
     }
 
-    //try to parse as cx4fw_public_key_2048:
+    // try to parse as cx4fw_public_key_2048:
     struct cx4fw_public_key_2048 cx4fw_public_key_2048;
     memset(&cx4fw_public_key_2048, 0x0, sizeof(cx4fw_public_key_2048));
     cx4fw_public_key_2048_unpack(&cx4fw_public_key_2048, publicKeysData);
-    if (cx4fw_public_key_2048.auth_type == 0x3) {
+    if (cx4fw_public_key_2048.auth_type == 0x3)
+    {
         sectionType = FS3_PUBLIC_KEYS_2048;
-    } else {
-        //Try to parse it as 4096
+    }
+    else
+    {
+        // Try to parse it as 4096
         struct cx4fw_public_key_4096 cx4fw_public_key_4096;
         memset(&cx4fw_public_key_4096, 0x0, sizeof(cx4fw_public_key_4096));
         cx4fw_public_key_4096_unpack(&cx4fw_public_key_4096, publicKeysData);
-        if (cx4fw_public_key_4096.auth_type == 0x4) {
+        if (cx4fw_public_key_4096.auth_type == 0x4)
+        {
             sectionType = FS3_PUBLIC_KEYS_4096;
-        } else {
+        }
+        else
+        {
             delete[] publicKeysData;
-            if (silent == false) {
+            if (silent == false)
+            {
                 return errmsg("Invalid type of key found in the public keys file");
             }
-            else {
-                return false;//without print message
+            else
+            {
+                return false; // without print message
             }
         }
     }
@@ -2803,27 +3324,32 @@ bool Fs3Operations::CheckPublicKeysFile(const char *fname, fs3_section_t& sectio
     return true;
 }
 
-bool Fs3Operations::FwSetPublicKeys(char *fname, PrintCallBack callBackFunc)
+bool Fs3Operations::FwSetPublicKeys(char* fname, PrintCallBack callBackFunc)
 {
     fs3_section_t sectionType;
 
-    if (!fname) {
+    if (!fname)
+    {
         return errmsg("Please specify a valid public keys file.");
     }
 
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("Setting Public Keys is not applicable for devices.");
     }
 
-    if (!CheckPublicKeysFile(fname, sectionType)) {
+    if (!CheckPublicKeysFile(fname, sectionType))
+    {
         return false;
     }
 
-    if (!UpdateSection(fname, sectionType, false, CMD_SET_PUBLIC_KEYS, callBackFunc)) {
+    if (!UpdateSection(fname, sectionType, false, CMD_SET_PUBLIC_KEYS, callBackFunc))
+    {
         return false;
     }
 
-    if (!FsIntQueryAux(false, false)) {
+    if (!FsIntQueryAux(false, false))
+    {
         return false;
     }
 
@@ -2832,21 +3358,25 @@ bool Fs3Operations::FwSetPublicKeys(char *fname, PrintCallBack callBackFunc)
     return true;
 }
 
-bool Fs3Operations::FwSetForbiddenVersions(char *fname, PrintCallBack callBackFunc)
+bool Fs3Operations::FwSetForbiddenVersions(char* fname, PrintCallBack callBackFunc)
 {
-    if (!fname) {
+    if (!fname)
+    {
         return errmsg("Please specify a valid forbidden versions file.");
     }
 
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("Setting Forbidden Versions is not applicable for devices.");
     }
 
-    if (!UpdateSection(fname, FS3_FORBIDDEN_VERSIONS, false, CMD_SET_FORBIDDEN_VERSIONS, callBackFunc)) {
+    if (!UpdateSection(fname, FS3_FORBIDDEN_VERSIONS, false, CMD_SET_FORBIDDEN_VERSIONS, callBackFunc))
+    {
         return false;
     }
 
-    if (!FsIntQueryAux(false, false)) {
+    if (!FsIntQueryAux(false, false))
+    {
         return false;
     }
     INSERT_SHA_IF_NEEDS(callBackFunc);
@@ -2861,40 +3391,52 @@ u_int32_t Fs3Operations::getImageSize()
 
 bool Fs3Operations::GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_t>& img)
 {
-    if (!FwExtract4MBImage(img, true)) {
+    if (!FwExtract4MBImage(img, true))
+    {
         return false;
     }
 
-    if (shaType == MlxSign::SHA256) {
+    if (shaType == MlxSign::SHA256)
+    {
         MaskItocSectionAndEntry(FS3_IMAGE_SIGNATURE_256, img);
-    } else if (shaType == MlxSign::SHA512) {
+    }
+    else if (shaType == MlxSign::SHA512)
+    {
         MaskItocSectionAndEntry(FS3_IMAGE_SIGNATURE_256, img);
         MaskItocSectionAndEntry(FS3_IMAGE_SIGNATURE_512, img);
-    } else {
+    }
+    else
+    {
         return errmsg("Unexpected type of SHA");
     }
 
     return true;
 }
 
-bool Fs3Operations::FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc,
-    bool verbose, bool ignoreImageStart)
+bool Fs3Operations::FwExtract4MBImage(vector<u_int8_t>& img,
+                                      bool maskMagicPatternAndDevToc,
+                                      bool verbose,
+                                      bool ignoreImageStart)
 {
     u_int32_t size = 0;
-    if (!FsIntQueryAux(true, false, false, verbose)) {
+    if (!FsIntQueryAux(true, false, false, verbose))
+    {
         return false;
     }
     size = getImageSize();
-    //copy
+    // copy
     img.resize(size);
-    if (ignoreImageStart) {
+    if (ignoreImageStart)
+    {
         _imageCache.get(img.data(), 0, size);
     }
-    else {
+    else
+    {
         _imageCache.get(img.data(), _fwImgInfo.imgStart, size);
     }
-    if (maskMagicPatternAndDevToc) {
-        //set magic patterns to 0xFF
+    if (maskMagicPatternAndDevToc)
+    {
+        // set magic patterns to 0xFF
         memset(img.data(), 0xFF, 16);
         maskDevToc(img);
     }
@@ -2903,8 +3445,10 @@ bool Fs3Operations::FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatte
 
 void Fs3Operations::MaskItocSectionAndEntry(u_int32_t itocType, vector<u_int8_t>& img)
 {
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-        if (_fs3ImgInfo.tocArr[i].toc_entry.type == itocType) {
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        if (_fs3ImgInfo.tocArr[i].toc_entry.type == itocType)
+        {
             u_int32_t tocEntryAddr = _fs3ImgInfo.tocArr[i].entry_addr;
             u_int32_t tocEntryDataAddr = _fs3ImgInfo.tocArr[i].toc_entry.flash_addr << 2;
             memset(img.data() + tocEntryAddr, 0xFF, TOC_ENTRY_SIZE);
@@ -2915,12 +3459,14 @@ void Fs3Operations::MaskItocSectionAndEntry(u_int32_t itocType, vector<u_int8_t>
 
 bool writeToFile(string filePath, const std::vector<u_int8_t> buff)
 {
-    FILE *fh = fopen(filePath.c_str(), "wb");
-    if (fh == NULL) {
+    FILE* fh = fopen(filePath.c_str(), "wb");
+    if (fh == NULL)
+    {
         return false;
     }
     // Write
-    if (fwrite(&buff[0], 1, buff.size(), fh) != buff.size()) {
+    if (fwrite(&buff[0], 1, buff.size(), fh) != buff.size())
+    {
         fclose(fh);
         return false;
     }
@@ -2930,115 +3476,132 @@ bool writeToFile(string filePath, const std::vector<u_int8_t> buff)
 
 void Fs3Operations::maskDevToc(vector<u_int8_t>& img)
 {
-    //set device itocs entries to 0xFF
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-        if (_fs3ImgInfo.tocArr[i].toc_entry.device_data) {
+    // set device itocs entries to 0xFF
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        if (_fs3ImgInfo.tocArr[i].toc_entry.device_data)
+        {
             u_int32_t tocEntryAddr = _fs3ImgInfo.tocArr[i].entry_addr;
             memset(img.data() + tocEntryAddr, 0xFF, TOC_ENTRY_SIZE);
         }
     }
 }
 
-bool Fs3Operations::CreateDtoc(vector<u_int8_t>& img, u_int8_t* SectionData, u_int32_t section_size, u_int32_t flash_data_addr,
-    fs3_section_t section, u_int32_t tocEntryAddr, bool IsCRC)
+bool Fs3Operations::CreateDtoc(vector<u_int8_t>& img,
+                               u_int8_t* SectionData,
+                               u_int32_t section_size,
+                               u_int32_t flash_data_addr,
+                               fs3_section_t section,
+                               u_int32_t tocEntryAddr,
+                               bool IsCRC)
 {
     struct toc_info itoc_info_p;
     memset(&itoc_info_p.data, 0, sizeof(itoc_info_p.data));
     memset(&itoc_info_p.toc_entry, 0, sizeof(struct cibfw_itoc_entry));
 
-
     itoc_info_p.section_data.resize(section_size, 0xff);
     itoc_info_p.entry_addr = tocEntryAddr;
-    struct cibfw_itoc_entry *toc_entry = &(itoc_info_p.toc_entry);
+    struct cibfw_itoc_entry* toc_entry = &(itoc_info_p.toc_entry);
     toc_entry->size = section_size >> 2;
     toc_entry->type = (u_int8_t)section;
-    if (!IsCRC) {
+    if (!IsCRC)
+    {
         toc_entry->no_crc = 1;
     }
-    else {
+    else
+    {
         toc_entry->no_crc = 0;
     }
     toc_entry->device_data = 1;
     toc_entry->flash_addr = flash_data_addr >> 2;
 
-    u_int32_t new_crc = CalcImageCRC((u_int32_t *)SectionData, toc_entry->size);
+    u_int32_t new_crc = CalcImageCRC((u_int32_t*)SectionData, toc_entry->size);
     toc_entry->section_crc = new_crc;
 
     CalcItocEntryCRC(&itoc_info_p);
-    u_int8_t itoc_data[CIBFW_ITOC_ENTRY_SIZE] = { 0 };
+    u_int8_t itoc_data[CIBFW_ITOC_ENTRY_SIZE] = {0};
     cibfw_itoc_entry_pack(toc_entry, itoc_data);
     memcpy(img.data() + tocEntryAddr, itoc_data, CIBFW_ITOC_ENTRY_SIZE);
     return true;
-
 }
 
 bool Fs3Operations::RemoveWriteProtection()
 {
-    if (((Flash *)_ioAccess)->is_flash_write_protected() == false) {
+    if (((Flash*)_ioAccess)->is_flash_write_protected() == false)
+    {
         return true;
     }
-    mflash *mfl = (mflash *)NULL;
+    mflash* mfl = (mflash*)NULL;
     int retries = 0;
-    //disable write protection:
+    // disable write protection:
     ext_flash_attr_t attr;
     memset(&attr, 0x0, sizeof(attr));
-    if (!((Flash *)_ioAccess)->get_attr(attr)) {
+    if (!((Flash*)_ioAccess)->get_attr(attr))
+    {
         return false;
     }
 
-    mfl = ((Flash *)_ioAccess)->getMflashObj();
+    mfl = ((Flash*)_ioAccess)->getMflashObj();
     write_protect_info_t protect_info;
     memset(&protect_info, 0, sizeof(protect_info));
-    for (unsigned int i = 0; i < attr.banks_num; i++) {
+    for (unsigned int i = 0; i < attr.banks_num; i++)
+    {
         int rc = mf_set_write_protect(mfl, i, &protect_info);
-        if (rc != MFE_OK) {
-            errmsg("Failed to disable flash write protection: %s",
-                mf_err2str(rc));
+        if (rc != MFE_OK)
+        {
+            errmsg("Failed to disable flash write protection: %s", mf_err2str(rc));
             return false;
         }
     }
 
-    while (((Flash *)_ioAccess)->is_flash_write_protected() && retries++ < 10) {
+    while (((Flash*)_ioAccess)->is_flash_write_protected() && retries++ < 10)
+    {
         msleep(500);
     }
-    if (retries == 10) {
+    if (retries == 10)
+    {
         errmsg("Failed to disable flash write protection");
         return false;
     }
     return true;
 }
-bool Fs3Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t devid_t, const cx4fw_uid_entry& base_guid, const cx4fw_uid_entry& base_mac)
+bool Fs3Operations::RestoreDevToc(vector<u_int8_t>& img,
+                                  char* psid,
+                                  dm_dev_id_t devid_t,
+                                  const cx4fw_uid_entry& base_guid,
+                                  const cx4fw_uid_entry& base_mac)
 {
     (void)devid_t;
     u_int32_t tocEntryAddr = 0;
     u_int32_t flash_data_addr = 0;
     img.resize(0x1000000, 0xff);
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
-            tocEntryAddr = _fs3ImgInfo.tocArr[i].entry_addr;
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
+        tocEntryAddr = _fs3ImgInfo.tocArr[i].entry_addr;
     }
     /*NV_DATA0*/
-    tocEntryAddr += TOC_ENTRY_SIZE;//goto free space
-    u_int8_t NvDataSectionData[CONNECTX4LX_NV_DATA_SIZE] = { 0 };
+    tocEntryAddr += TOC_ENTRY_SIZE; // goto free space
+    u_int8_t NvDataSectionData[CONNECTX4LX_NV_DATA_SIZE] = {0};
     flash_data_addr = 0x0fa0000;
     memcpy(img.data() + flash_data_addr, NvDataSectionData, CONNECTX4LX_NV_DATA_SIZE);
     CreateDtoc(img, NvDataSectionData, CONNECTX4LX_NV_DATA_SIZE, flash_data_addr, FS3_NV_DATA0, tocEntryAddr, false);
 
     /*NV_DATA2*/
-    tocEntryAddr += TOC_ENTRY_SIZE;//goto free space
+    tocEntryAddr += TOC_ENTRY_SIZE; // goto free space
     flash_data_addr = 0x0fb0000;
     memcpy(img.data() + flash_data_addr, NvDataSectionData, CONNECTX4LX_NV_DATA_SIZE);
     CreateDtoc(img, NvDataSectionData, CONNECTX4LX_NV_DATA_SIZE, flash_data_addr, FS3_NV_DATA2, tocEntryAddr, false);
 
     /*NV_LOG*/
-    tocEntryAddr += TOC_ENTRY_SIZE;//goto free space
-    u_int8_t NvLogSectionData[CONNECTX4LX_NV_DATA_SIZE] = { 0 };
+    tocEntryAddr += TOC_ENTRY_SIZE; // goto free space
+    u_int8_t NvLogSectionData[CONNECTX4LX_NV_DATA_SIZE] = {0};
     flash_data_addr = 0x0fc0000;
     memcpy(img.data() + flash_data_addr, NvLogSectionData, CONNECTX4LX_NV_DATA_SIZE);
     CreateDtoc(img, NvLogSectionData, CONNECTX4LX_NV_DATA_SIZE, flash_data_addr, FS3_FW_NV_LOG, tocEntryAddr, false);
     /*DEV_INFO*/
-    tocEntryAddr += TOC_ENTRY_SIZE;//goto free space
+    tocEntryAddr += TOC_ENTRY_SIZE; // goto free space
     struct cx4fw_device_info cx4_dev_info;
-    u_int8_t DeviceSectionData[CX4FW_DEVICE_INFO_SIZE] = { 0 };
+    u_int8_t DeviceSectionData[CX4FW_DEVICE_INFO_SIZE] = {0};
     memset(&cx4_dev_info, 0, sizeof(cx4_dev_info));
 
     cx4_dev_info.major_version = 2;
@@ -3050,30 +3613,30 @@ bool Fs3Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     cx4_dev_info.guids.guids.num_allocated = base_guid.num_allocated;
     cx4_dev_info.guids.guids.step = base_guid.step;
     cx4_dev_info.guids.guids.uid = base_guid.uid;
-        //0x7cfe9003002c6c8cULL;
+    // 0x7cfe9003002c6c8cULL;
     cx4_dev_info.guids.macs.num_allocated = base_mac.num_allocated;
     cx4_dev_info.guids.macs.step = base_mac.step;
     cx4_dev_info.guids.macs.uid = base_mac.uid;
-        //0x7cfe9003002c6c8cULL;
+    // 0x7cfe9003002c6c8cULL;
     cx4_dev_info.vsd_vendor_id = 0x15b3;
     flash_data_addr = 0xfee000;
     cx4fw_device_info_pack(&cx4_dev_info, DeviceSectionData);
-    if (img.size() < flash_data_addr + CX4FW_DEVICE_INFO_SIZE) {
+    if (img.size() < flash_data_addr + CX4FW_DEVICE_INFO_SIZE)
+    {
         img.resize(flash_data_addr + CX4FW_DEVICE_INFO_SIZE, 0xff);
     }
     memcpy(img.data() + flash_data_addr, DeviceSectionData, CX4FW_DEVICE_INFO_SIZE);
     CreateDtoc(img, DeviceSectionData, CX4FW_DEVICE_INFO_SIZE, flash_data_addr, FS3_DEV_INFO, tocEntryAddr, true);
 
-
     /*MFG_INFO*/
-    tocEntryAddr += TOC_ENTRY_SIZE;//goto free space
+    tocEntryAddr += TOC_ENTRY_SIZE; // goto free space
     struct cx4fw_mfg_info cx4_mfg_info;
-    u_int8_t MfgInfoData[CX4FW_MFG_INFO_SIZE] = { 0 };
+    u_int8_t MfgInfoData[CX4FW_MFG_INFO_SIZE] = {0};
     memset(&cx4_mfg_info, 0, sizeof(cx4_mfg_info));
 
     cx4_mfg_info.major_version = 1;
     cx4_mfg_info.minor_version = 0;
-    cx4_mfg_info.guids_override_en = 1;//get the GUIDs from DEV_INFO
+    cx4_mfg_info.guids_override_en = 1; // get the GUIDs from DEV_INFO
     cx4_mfg_info.guids.guids.num_allocated = base_guid.num_allocated;
     cx4_mfg_info.guids.guids.step = base_guid.step;
     cx4_mfg_info.guids.guids.uid = base_guid.uid;
@@ -3084,13 +3647,14 @@ bool Fs3Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     strncpy(cx4_mfg_info.psid, psid, PSID_LEN);
     cx4fw_mfg_info_pack(&cx4_mfg_info, MfgInfoData);
     flash_data_addr = 0xff8000;
-    if (img.size() < flash_data_addr + CX4FW_MFG_INFO_SIZE) {
+    if (img.size() < flash_data_addr + CX4FW_MFG_INFO_SIZE)
+    {
         img.resize(flash_data_addr + CX4FW_MFG_INFO_SIZE, 0xff);
     }
     memcpy(img.data() + flash_data_addr, MfgInfoData, CX4FW_MFG_INFO_SIZE);
     CreateDtoc(img, MfgInfoData, CX4FW_MFG_INFO_SIZE, flash_data_addr, FS3_MFG_INFO, tocEntryAddr, true);
     /*VPD_R0*/
-    tocEntryAddr += TOC_ENTRY_SIZE;//goto free space
+    tocEntryAddr += TOC_ENTRY_SIZE; // goto free space
     CreateDtoc(img, NULL, 0, flash_data_addr + CX4FW_MFG_INFO_SIZE, FS3_VPD_R0, tocEntryAddr, true);
     return true;
 }
@@ -3099,23 +3663,30 @@ bool Fs3Operations::FwCalcSHA(MlxSign::SHAType shaType, vector<u_int8_t>& sha, v
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     vector<u_int8_t> img;
-    MlxSignSHA *mlxSignSHA = NULL;
+    MlxSignSHA* mlxSignSHA = NULL;
     FwInit();
     _imageCache.clear();
-    if (!GetImageDataForSign(shaType, img)) {
+    if (!GetImageDataForSign(shaType, img))
+    {
         return false;
     }
 
-    if (shaType == MlxSign::SHA256) {
+    if (shaType == MlxSign::SHA256)
+    {
         mlxSignSHA = new MlxSignSHA256();
-    } else if (shaType == MlxSign::SHA512) {
+    }
+    else if (shaType == MlxSign::SHA512)
+    {
         mlxSignSHA = new MlxSignSHA512();
-    } else {
+    }
+    else
+    {
         return errmsg("Unexpected type of SHA");
     }
     (*mlxSignSHA) << img;
     fourMbImage.resize(img.size());
-    for (unsigned int i = 0; i < img.size(); i++) {
+    for (unsigned int i = 0; i < img.size(); i++)
+    {
         fourMbImage[i] = img[i];
     }
     mlxSignSHA->getDigest(sha);
@@ -3129,28 +3700,29 @@ bool Fs3Operations::FwCalcSHA(MlxSign::SHAType shaType, vector<u_int8_t>& sha, v
 #endif
 }
 
-#define PUSH_DEV_DATA(vec) \
-    vec.push_back(FS3_MFG_INFO); \
-    vec.push_back(FS3_DEV_INFO); \
-    vec.push_back(FS3_NV_DATA0); \
-    vec.push_back(FS3_NV_DATA1); \
-    vec.push_back(FS3_NV_DATA2); \
+#define PUSH_DEV_DATA(vec)        \
+    vec.push_back(FS3_MFG_INFO);  \
+    vec.push_back(FS3_DEV_INFO);  \
+    vec.push_back(FS3_NV_DATA0);  \
+    vec.push_back(FS3_NV_DATA1);  \
+    vec.push_back(FS3_NV_DATA2);  \
     vec.push_back(FS3_FW_NV_LOG); \
     vec.push_back(FS3_VPD_R0)
 #define POP_DEV_DATA(vec) \
-    vec.pop_back(); \
-    vec.pop_back(); \
-    vec.pop_back(); \
-    vec.pop_back(); \
-    vec.pop_back(); \
-    vec.pop_back(); \
+    vec.pop_back();       \
+    vec.pop_back();       \
+    vec.pop_back();       \
+    vec.pop_back();       \
+    vec.pop_back();       \
+    vec.pop_back();       \
     vec.pop_back()
 
-bool Fs3Operations::TocComp::operator()(toc_info * elem1, toc_info * elem2)
+bool Fs3Operations::TocComp::operator()(toc_info* elem1, toc_info* elem2)
 {
     u_int32_t absAddr1 = (elem1->toc_entry.flash_addr << 2) + (elem1->toc_entry.relative_addr ? _startAdd : 0);
     u_int32_t absAddr2 = (elem2->toc_entry.flash_addr << 2) + (elem2->toc_entry.relative_addr ? _startAdd : 0);
-    if (absAddr1 < absAddr2) {
+    if (absAddr1 < absAddr2)
+    {
         return true;
     }
     return false;
@@ -3158,121 +3730,140 @@ bool Fs3Operations::TocComp::operator()(toc_info * elem1, toc_info * elem2)
 
 bool Fs3Operations::FwShiftDevData(PrintCallBack progressFunc)
 {
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         return errmsg("cannot shift device data sections on Image.");
     }
-    const char *flashType = ((Flash *)_ioAccess)->getFlashType();
-    if (flashType == NULL) {
+    const char* flashType = ((Flash*)_ioAccess)->getFlashType();
+    if (flashType == NULL)
+    {
         return errmsg("Cannot shift device data on old flash types.");
     }
-    if (strcasecmp(flashType, "N25Q0XX") != 0) {
+    if (strcasecmp(flashType, "N25Q0XX") != 0)
+    {
         return errmsg("Cannot shift device data on flash type %s.", flashType);
     }
 
-    //query device and get device data sectors.
+    // query device and get device data sectors.
     PUSH_DEV_DATA(_readSectList);
-    if (!FsIntQueryAux()) {
+    if (!FsIntQueryAux())
+    {
         POP_DEV_DATA(_readSectList);
         return false;
     }
     POP_DEV_DATA(_readSectList);
 
-    if (_fwImgInfo.ext_info.chip_type != CT_CONNECT_IB) {
+    if (_fwImgInfo.ext_info.chip_type != CT_CONNECT_IB)
+    {
         return errmsg("Cannot shift device data. Unsupported device.");
     }
 
     u_int32_t lastFwDataAddr;
     u_int32_t firstDevDataAddr;
-    if (!getLastFwSAddr(lastFwDataAddr) || !getFirstDevDataAddr(firstDevDataAddr)) {
+    if (!getLastFwSAddr(lastFwDataAddr) || !getFirstDevDataAddr(firstDevDataAddr))
+    {
         return errmsg("Failed to get ITOC information.");
     }
 
     // check if we already shifted
-    struct toc_info *mfgToc = (struct toc_info *)NULL;
-    if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, FS3_MFG_INFO, mfgToc)) {
+    struct toc_info* mfgToc = (struct toc_info*)NULL;
+    if (!Fs3GetItocInfo(_fs3ImgInfo.tocArr, _fs3ImgInfo.numOfItocs, FS3_MFG_INFO, mfgToc))
+    {
         return errmsg("Failed to get MFG_INFO ITOC information.");
     }
 
-    if (getAbsAddr(mfgToc) < _ioAccess->get_effective_size() - (((Flash *)(_ioAccess))->get_sector_size())) {
+    if (getAbsAddr(mfgToc) < _ioAccess->get_effective_size() - (((Flash*)(_ioAccess))->get_sector_size()))
+    {
         return errmsg("Device data sections already shifted.");
     }
 
-    //check if we can shift all dev data sections by 60KB
-    if (lastFwDataAddr > (firstDevDataAddr - SHIFT_SIZE)) {
+    // check if we can shift all dev data sections by 60KB
+    if (lastFwDataAddr > (firstDevDataAddr - SHIFT_SIZE))
+    {
         return errmsg("Cannot shift device data sections, fw image is too big.");
     }
     // for each device data section move it by an offset of 60kb (0xf000)
 
-    PRINT_PROGRESS(progressFunc, (char *)"Shifting dev data section - ");
+    PRINT_PROGRESS(progressFunc, (char*)"Shifting dev data section - ");
 
-    // possible problem : if itoc array isnt ordered by ascending flash address and dev data sections are larger that 60kb
-    // there is a chance we runover exsisting device data sections
-    // Fix : preform the section shift by order from the lowest addresss to the highest.
+    // possible problem : if itoc array isnt ordered by ascending flash address and dev data sections are larger that
+    // 60kb there is a chance we runover exsisting device data sections Fix : preform the section shift by order from
+    // the lowest addresss to the highest.
     std::vector<struct toc_info*> sortedTocs(_fs3ImgInfo.numOfItocs);
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
         sortedTocs[i] = &(_fs3ImgInfo.tocArr[i]);
     }
     std::sort(sortedTocs.begin(), sortedTocs.end(), TocComp(_fwImgInfo.imgStart));
 
     // shift the location of device data sections by SHIFT_SIZE (60kb)
-    for (std::vector<struct toc_info*>::iterator it = sortedTocs.begin(); it != sortedTocs.end(); it++) {
-        if ((*it)->toc_entry.device_data) {
+    for (std::vector<struct toc_info*>::iterator it = sortedTocs.begin(); it != sortedTocs.end(); it++)
+    {
+        if ((*it)->toc_entry.device_data)
+        {
             // update the itoc (basically update the flash_addr and itoc entry crc)
-            struct toc_info *currToc = *it;
-            if (!Fs3UpdateItocInfo(currToc, ((currToc->toc_entry.flash_addr << 2) - SHIFT_SIZE))) {
-                PRINT_PROGRESS(progressFunc, (char *)"FAILED\n");
+            struct toc_info* currToc = *it;
+            if (!Fs3UpdateItocInfo(currToc, ((currToc->toc_entry.flash_addr << 2) - SHIFT_SIZE)))
+            {
+                PRINT_PROGRESS(progressFunc, (char*)"FAILED\n");
                 return false;
             }
             // write the section to its new place in the flash
-            if (!writeImage((ProgressCallBack)NULL, getAbsAddr(currToc), (u_int8_t *)&currToc->section_data[0], (currToc->toc_entry.size << 2), true, true)) {
-                PRINT_PROGRESS(progressFunc, (char *)"FAILED\n");
+            if (!writeImage((ProgressCallBack)NULL, getAbsAddr(currToc), (u_int8_t*)&currToc->section_data[0],
+                            (currToc->toc_entry.size << 2), true, true))
+            {
+                PRINT_PROGRESS(progressFunc, (char*)"FAILED\n");
                 return false;
             }
         }
     }
-    PRINT_PROGRESS(progressFunc, (char *)"OK\n");
+    PRINT_PROGRESS(progressFunc, (char*)"OK\n");
     // update itoc section
-    if (!reburnItocSection(progressFunc)) {
+    if (!reburnItocSection(progressFunc))
+    {
         return false;
     }
     return true;
 }
 
-
 bool Fs3Operations::CheckItocArrConsistency(std::vector<struct toc_info*>& sortedTocVec, u_int32_t imageStartAddr)
 {
     u_int32_t sectEndAddr = 0, nextSectStrtAddr = 0;
     std::vector<struct toc_info*>::iterator it = sortedTocVec.begin(), itNext = sortedTocVec.begin();
     itNext++;
-    for (; itNext != sortedTocVec.end(); it++, itNext++) {
+    for (; itNext != sortedTocVec.end(); it++, itNext++)
+    {
         sectEndAddr = getAbsAddr(*it, imageStartAddr) + ((*it)->toc_entry.size << 2) - 1;
         nextSectStrtAddr = getAbsAddr(*itNext, imageStartAddr);
-        if (sectEndAddr >= nextSectStrtAddr) {
-            return errmsg("inconsistency found in ITOC. %s(0x%x) section will potentially overwrite %s(0x%x) section.", \
-                          GetSectionNameByType((*it)->toc_entry.type), (*it)->toc_entry.type, \
+        if (sectEndAddr >= nextSectStrtAddr)
+        {
+            return errmsg("inconsistency found in ITOC. %s(0x%x) section will potentially overwrite %s(0x%x) section.",
+                          GetSectionNameByType((*it)->toc_entry.type), (*it)->toc_entry.type,
                           GetSectionNameByType((*itNext)->toc_entry.type), (*itNext)->toc_entry.type);
         }
     }
     return true;
 }
 
-
 bool Fs3Operations::CheckItocArray()
 {
     // sort the itocs
     std::vector<struct toc_info*> sortedTocs(_fs3ImgInfo.numOfItocs);
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
         sortedTocs[i] = &(_fs3ImgInfo.tocArr[i]);
     }
     std::sort(sortedTocs.begin(), sortedTocs.end(), TocComp(0));
     // check for inconsistency image burnt on 1st half
-    if (!CheckItocArrConsistency(sortedTocs, 0)) {
+    if (!CheckItocArrConsistency(sortedTocs, 0))
+    {
         return false;
     }
 
     std::sort(sortedTocs.begin(), sortedTocs.end(), TocComp((1 << _fwImgInfo.cntxLog2ChunkSize)));
     // check for inconsistency image burn on second half
-    if (!CheckItocArrConsistency(sortedTocs, (1 << _fwImgInfo.cntxLog2ChunkSize))) {
+    if (!CheckItocArrConsistency(sortedTocs, (1 << _fwImgInfo.cntxLog2ChunkSize)))
+    {
         return false;
     }
     return true;
@@ -3285,84 +3876,90 @@ bool Fs3Operations::IsCriticalSection(u_int8_t sect_type)
     return true;
 }
 
-
 bool Fs3Operations::PrepItocSectionsForCompare(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical)
 {
-    if (_internalQueryPerformed == false) {
-        if (!FsIntQueryAux(true, false, false, true)) {
+    if (_internalQueryPerformed == false)
+    {
+        if (!FsIntQueryAux(true, false, false, true))
+        {
             return false;
         }
     }
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
         struct toc_info* itoc_info_p = &(_fs3ImgInfo.tocArr[i]);
-        //struct fs4_toc_info *itoc_info_p = &this->_fs3ImgInfo.itocArr.tocArr[i];
-        struct cibfw_itoc_entry *toc_entry = &(itoc_info_p->toc_entry);
+        // struct fs4_toc_info *itoc_info_p = &this->_fs3ImgInfo.itocArr.tocArr[i];
+        struct cibfw_itoc_entry* toc_entry = &(itoc_info_p->toc_entry);
         if (IsCriticalSection(toc_entry->type))
         {
             critical.reserve(critical.size() + itoc_info_p->section_data.size());
             critical.insert(critical.end(), itoc_info_p->section_data.begin(), itoc_info_p->section_data.end());
-            //printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr, itoc_info_p->toc_entry.type,
-                //(unsigned int)(itoc_info_p->section_data.size() + padding_size), GetSectionNameByType(itoc_info_p->toc_entry.type));
+            // printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr,
+            // itoc_info_p->toc_entry.type, (unsigned int)(itoc_info_p->section_data.size() + padding_size),
+            // GetSectionNameByType(itoc_info_p->toc_entry.type));
         }
         else
         {
-            if (itoc_info_p->toc_entry.type == FS3_VPD_R0 || itoc_info_p->toc_entry.type == FS3_MFG_INFO || itoc_info_p->toc_entry.type == FS3_DEV_INFO ||
-                itoc_info_p->toc_entry.type == FS3_NV_DATA1 || itoc_info_p->toc_entry.type == FS3_NV_DATA2 || itoc_info_p->toc_entry.type == FS3_FW_NV_LOG ||
-                itoc_info_p->toc_entry.type == FS3_NV_DATA0) {
+            if (itoc_info_p->toc_entry.type == FS3_VPD_R0 || itoc_info_p->toc_entry.type == FS3_MFG_INFO ||
+                itoc_info_p->toc_entry.type == FS3_DEV_INFO || itoc_info_p->toc_entry.type == FS3_NV_DATA1 ||
+                itoc_info_p->toc_entry.type == FS3_NV_DATA2 || itoc_info_p->toc_entry.type == FS3_FW_NV_LOG ||
+                itoc_info_p->toc_entry.type == FS3_NV_DATA0)
+            {
                 continue;
             }
-            //printf("-D- addr  0x%.8x flash addr 0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr, toc_entry->flash_addr << 2, itoc_info_p->toc_entry.type,
-              //  (unsigned int)itoc_info_p->section_data.size(), GetSectionNameByType(itoc_info_p->toc_entry.type));
+            // printf("-D- addr  0x%.8x flash addr 0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n",
+            // itoc_info_p->entry_addr, toc_entry->flash_addr << 2, itoc_info_p->toc_entry.type,
+            //  (unsigned int)itoc_info_p->section_data.size(), GetSectionNameByType(itoc_info_p->toc_entry.type));
             non_critical.reserve(non_critical.size() + itoc_info_p->section_data.size());
             non_critical.insert(non_critical.end(), itoc_info_p->section_data.begin(), itoc_info_p->section_data.end());
-            //currentItoc++;
+            // currentItoc++;
         }
     }
     return true;
 }
 
-
-
 const char* Fs3Operations::FwGetResetRecommandationStr()
 {
-
 #if defined(__VMKERNEL_UW_NATIVE__)
     // mlxfwreset is not supported in VMWare ATM
     return REBOOT_REQUIRED_STR;
 #else
-    if (!_isfuSupported) {
+    if (!_isfuSupported)
+    {
         return REBOOT_REQUIRED_STR;
     }
     return REBOOT_OR_FWRESET_REQUIRED_STR;
 #endif
 }
 
-
-const char*  Fs3Operations::FwGetReSignMsgStr()
+const char* Fs3Operations::FwGetReSignMsgStr()
 {
-    if (!_ioAccess->is_flash() && (_fs3ImgInfo.ext_info.security_mode & SMM_SIGNED_FW)) {
+    if (!_ioAccess->is_flash() && (_fs3ImgInfo.ext_info.security_mode & SMM_SIGNED_FW))
+    {
         return RESIGN_MSG;
     }
-    return (const char *)NULL;
+    return (const char*)NULL;
 }
 
 bool Fs3Operations::Fs3IsfuActivateImage(u_int32_t newImageStart)
 {
     int rc = 0;
-    mfile *mf = _ioAccess->is_flash() ? ((Flash *)_ioAccess)->getMfileObj() : (mfile *)NULL;
+    mfile* mf = _ioAccess->is_flash() ? ((Flash*)_ioAccess)->getMfileObj() : (mfile*)NULL;
     struct cibfw_register_mfai mfai;
     struct reg_access_hca_mfrl_reg_ext mfrl;
     memset(&mfai, 0, sizeof(mfai));
     memset(&mfrl, 0, sizeof(mfrl));
 
-    if (!mf) {
+    if (!mf)
+    {
         return errmsg("Failed to activate image. No mfile object found.");
     }
 
     mfai.address = newImageStart;
     mfai.use_address = 1;
     rc = reg_access_mfai(mf, REG_ACCESS_METHOD_SET, &mfai);
-    if (!rc) {
+    if (!rc)
+    {
         // send warm boot (bit 6)
         mfrl.reset_trigger = 1 << 6;
         rc = reg_access_mfrl(mf, REG_ACCESS_METHOD_SET, &mfrl);
@@ -3370,7 +3967,8 @@ bool Fs3Operations::Fs3IsfuActivateImage(u_int32_t newImageStart)
         rc = (rc == ME_REG_ACCESS_BAD_PARAM) ? ME_OK : rc;
     }
 
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to activate image. %s", m_err2str((MError)rc));
     }
     return true;
@@ -3382,7 +3980,8 @@ bool Fs3Operations::FwCalcMD5(u_int8_t md5sum[16])
     (void)md5sum;
     return errmsg("Operation not supported");
 #else
-    if (!FsIntQueryAux(true, false)) {
+    if (!FsIntQueryAux(true, false))
+    {
         return false;
     }
     // push beggining of image to md5buff
@@ -3390,22 +3989,27 @@ bool Fs3Operations::FwCalcMD5(u_int8_t md5sum[16])
     std::vector<u_int8_t> md5buff(sz, 0);
     _imageCache.get(&(md5buff[0]), sz);
     // push all non dev data sections to md5buff
-    for (unsigned int j = 0; j < TOC_HEADER_SIZE; j++) {
+    for (unsigned int j = 0; j < TOC_HEADER_SIZE; j++)
+    {
         md5buff.push_back(_imageCache[_fs3ImgInfo.itocAddr + j]);
     }
     // push itoc header
-    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++) {
+    for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
+    {
         // push each non-dev-data section to md5sum buffer
         u_int32_t tocEntryAddr = _fs3ImgInfo.tocArr[i].entry_addr;
         u_int32_t tocDataAddr = _fs3ImgInfo.tocArr[i].toc_entry.flash_addr << 2;
-        u_int32_t tocDataSize =  _fs3ImgInfo.tocArr[i].toc_entry.size << 2;
-        if (!_fs3ImgInfo.tocArr[i].toc_entry.device_data) {
+        u_int32_t tocDataSize = _fs3ImgInfo.tocArr[i].toc_entry.size << 2;
+        if (!_fs3ImgInfo.tocArr[i].toc_entry.device_data)
+        {
             // itoc entry
-            for (unsigned int j = 0; j < TOC_ENTRY_SIZE; j++) {
+            for (unsigned int j = 0; j < TOC_ENTRY_SIZE; j++)
+            {
                 md5buff.push_back(_imageCache[tocEntryAddr + j]);
             }
             // itoc data
-            for (unsigned int j = 0; j < tocDataSize; j++) {
+            for (unsigned int j = 0; j < tocDataSize; j++)
+            {
                 md5buff.push_back(_imageCache[tocDataAddr + j]);
             }
         }
@@ -3416,27 +4020,37 @@ bool Fs3Operations::FwCalcMD5(u_int8_t md5sum[16])
 #endif
 }
 
-Tlv_Status_t Fs3Operations::GetTsObj(TimeStampIFC **tsObj)
+Tlv_Status_t Fs3Operations::GetTsObj(TimeStampIFC** tsObj)
 {
-    if (_ioAccess->is_flash()) {
-        *tsObj = TimeStampIFC::getIFC(((Flash *)(_ioAccess))->getMfileObj());
-    } else {
+    if (_ioAccess->is_flash())
+    {
+        *tsObj = TimeStampIFC::getIFC(((Flash*)(_ioAccess))->getMfileObj());
+    }
+    else
+    {
         // check if buffer or file and allocate accrodingly
-        if (_fwParams.hndlType == FHT_FW_FILE) {
+        if (_fwParams.hndlType == FHT_FW_FILE)
+        {
             *tsObj = TimeStampIFC::getIFC(_fname, _fwImgInfo.lastImageAddr);
-        } else if (_fwParams.hndlType == FHT_FW_BUFF) {
-            *tsObj = TimeStampIFC::getIFC((u_int8_t *)((FImage *)_ioAccess)->getBuf(), ((FImage *)_ioAccess)->getBufLength());
-        } else {
-            *tsObj = (TimeStampIFC *)NULL;
+        }
+        else if (_fwParams.hndlType == FHT_FW_BUFF)
+        {
+            *tsObj =
+              TimeStampIFC::getIFC((u_int8_t*)((FImage*)_ioAccess)->getBuf(), ((FImage*)_ioAccess)->getBufLength());
+        }
+        else
+        {
+            *tsObj = (TimeStampIFC*)NULL;
             errmsg("Unsupported FW handle type.");
             return TS_HANDLE_NOT_SUPPORTED;
         }
     }
     Tlv_Status_t rc = (*tsObj)->init();
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", (*tsObj)->err());
         delete *tsObj;
-        *tsObj = (TimeStampIFC *)NULL;
+        *tsObj = (TimeStampIFC*)NULL;
         return rc;
     }
     return TS_OK;
@@ -3444,21 +4058,25 @@ Tlv_Status_t Fs3Operations::GetTsObj(TimeStampIFC **tsObj)
 
 bool Fs3Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer)
 {
-    TimeStampIFC *tsObj;
+    TimeStampIFC* tsObj;
     Tlv_Status_t rc;
 
-    if (!_ioAccess->is_flash() && !FsIntQueryAux(false, true)) {
+    if (!_ioAccess->is_flash() && !FsIntQueryAux(false, true))
+    {
         return false;
     }
-    if (GetTsObj(&tsObj)) {
+    if (GetTsObj(&tsObj))
+    {
         return errmsg("Failed to set timestamp. %s", err());
     }
 
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         // if caller hasnt specified fw version take from image
         struct tools_open_fw_version zeroVer;
         memset(&zeroVer, 0, sizeof(zeroVer));
-        if (!memcmp(&fwVer, &zeroVer, sizeof(fwVer))) {
+        if (!memcmp(&fwVer, &zeroVer, sizeof(fwVer)))
+        {
             fwVer.fw_ver_major = _fwImgInfo.ext_info.fw_ver[0];
             fwVer.fw_ver_minor = _fwImgInfo.ext_info.fw_ver[1];
             fwVer.fw_ver_subminor = _fwImgInfo.ext_info.fw_ver[2];
@@ -3466,7 +4084,8 @@ bool Fs3Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct
     }
 
     rc = tsObj->setTimeStamp(timestamp, fwVer);
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", tsObj->err());
     }
     delete tsObj;
@@ -3475,42 +4094,52 @@ bool Fs3Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct
 
 bool Fs3Operations::FwResetTimeStamp()
 {
-    TimeStampIFC *tsObj;
+    TimeStampIFC* tsObj;
     Tlv_Status_t rc;
 
-    if (!_ioAccess->is_flash() && !FsIntQueryAux(false, true)) {
+    if (!_ioAccess->is_flash() && !FsIntQueryAux(false, true))
+    {
         return false;
     }
-    if (GetTsObj(&tsObj)) {
+    if (GetTsObj(&tsObj))
+    {
         return errmsg("Failed to reset timestamp. %s", err());
     }
     rc = tsObj->resetTimeStamp();
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", tsObj->err());
     }
     delete tsObj;
     return rc ? false : true;
 }
 
-bool Fs3Operations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning)
+bool Fs3Operations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                     struct tools_open_fw_version& fwVer,
+                                     bool queryRunning)
 {
-    TimeStampIFC *tsObj;
+    TimeStampIFC* tsObj;
     Tlv_Status_t rc;
-    if (!_ioAccess->is_flash()) {
-        if (queryRunning) {
+    if (!_ioAccess->is_flash())
+    {
+        if (queryRunning)
+        {
             return errmsg("cannot get running FW Timestamp on image file");
         }
-        if (!FsIntQueryAux(false, true)) {
+        if (!FsIntQueryAux(false, true))
+        {
             return false;
         }
     }
 
-    if (GetTsObj(&tsObj)) {
+    if (GetTsObj(&tsObj))
+    {
         return errmsg("Failed to query timestamp. %s", err());
     }
 
     rc = tsObj->queryTimeStamp(timestamp, fwVer, queryRunning);
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", tsObj->err());
     }
     delete tsObj;
@@ -3519,23 +4148,25 @@ bool Fs3Operations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, stru
 
 bool Fs3Operations::RomCommonCheck(bool ignoreProdIdCheck, bool checkIfRomEmpty)
 {
-    if (getInfoFromChipType(_fwImgInfo.ext_info.chip_type).chipFamilyType
-        != CFT_HCA) {
+    if (getInfoFromChipType(_fwImgInfo.ext_info.chip_type).chipFamilyType != CFT_HCA)
+    {
         return errmsg("Updating ROM is supported only for HCA devices.");
     }
 
-    if (checkIfRomEmpty && _romSect.empty()) {
+    if (checkIfRomEmpty && _romSect.empty())
+    {
         return errmsg("The FW does not contain a ROM section");
     }
 
-    if (!ignoreProdIdCheck &&
-        strcmp(_fwImgInfo.ext_info.product_ver, "") != 0) {
+    if (!ignoreProdIdCheck && strcmp(_fwImgInfo.ext_info.product_ver, "") != 0)
+    {
         return errmsg("The device FW contains common FW/ROM Product Version - "
                       "The ROM cannot be updated separately.");
     }
 
     // Deleting ROM is not allowed on Device with Timestamp enabled.
-    if (DeviceTimestampEnabled()) {
+    if (DeviceTimestampEnabled())
+    {
         return errmsg("A valid Timestamp was detected on device."
                       " ROM cannot be updated. reset timestamp and resume operation");
     }
@@ -3548,23 +4179,26 @@ bool Fs3Operations::DeviceTimestampEnabled()
     Tlv_Status_t rc;
     Tlv_Status_t queryNextTsRc;
     Tlv_Status_t queryRunningTsRc;
-    TimeStampIFC *devTsObj;
+    TimeStampIFC* devTsObj;
     struct tools_open_ts_entry devTs;
     struct tools_open_fw_version devFwVer;
     memset(&devTs, 0, sizeof(devTs));
     memset(&devFwVer, 0, sizeof(devFwVer));
 
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         return false;
     }
 
-    if (_fwParams.ignoreCacheRep) {
+    if (_fwParams.ignoreCacheRep)
+    {
         // direct flash assume no TS
         return false;
     }
 
     rc = GetTsObj(&devTsObj);
-    if (rc) {
+    if (rc)
+    {
         return false;
     }
     // TS supported, make sure no valid TS is set
@@ -3573,7 +4207,8 @@ bool Fs3Operations::DeviceTimestampEnabled()
     // Cleanup
     delete devTsObj;
 
-    if (queryRunningTsRc == TS_OK || queryNextTsRc == TS_OK) {
+    if (queryRunningTsRc == TS_OK || queryNextTsRc == TS_OK)
+    {
         return true;
     }
     return false;
@@ -3585,30 +4220,35 @@ bool Fs3Operations::CalcHMAC(const vector<u_int8_t>& key, vector<u_int8_t>& dige
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     vector<u_int8_t> data;
 
-    if (!FwExtract4MBImage(data, false)) {
+    if (!FwExtract4MBImage(data, false))
+    {
         return errmsg("Failed to retrieve FW Image");
     }
 
-    //mask hmac itoc entry and section
+    // mask hmac itoc entry and section
     MaskItocSectionAndEntry(FS3_HMAC_DIGEST, data);
 
-    //mask magic pattern (First 16 bytes):
-    for (unsigned int i = 0; i < 16; i++) {
+    // mask magic pattern (First 16 bytes):
+    for (unsigned int i = 0; i < 16; i++)
+    {
         data[i] = 0xFF;
     }
 
-    //Remove the HMAC section from the end of the buffer
+    // Remove the HMAC section from the end of the buffer
     u_int32_t hmacSectionSize = 0x0;
     u_int32_t hmacSectionOffset = 0x0;
-    if (!GetSectionSizeAndOffset(FS3_HMAC_DIGEST, hmacSectionSize, hmacSectionOffset)) {
+    if (!GetSectionSizeAndOffset(FS3_HMAC_DIGEST, hmacSectionSize, hmacSectionOffset))
+    {
         return errmsg("HMAC section is not found\n");
     }
 
-    for (unsigned int i = 0; i < hmacSectionSize; i++) {
+    for (unsigned int i = 0; i < hmacSectionSize; i++)
+    {
         data.pop_back();
     }
 
-    if (hmacSectionOffset != data.size()) {
+    if (hmacSectionOffset != data.size())
+    {
         return errmsg("HMAC section is not the last section in the FW data\n");
     }
 
@@ -3625,7 +4265,9 @@ bool Fs3Operations::CalcHMAC(const vector<u_int8_t>& key, vector<u_int8_t>& dige
 #endif
 }
 
-bool Fs3Operations::invalidateOldFWImages(const u_int32_t magic_pattern[], Flash *flash_access, u_int32_t new_image_start)
+bool Fs3Operations::invalidateOldFWImages(const u_int32_t magic_pattern[],
+                                          Flash* flash_access,
+                                          u_int32_t new_image_start)
 {
     u_int32_t zeroes = 0;
     u_int32_t image_start_addrs[CNTX_START_POS_SIZE] = {0};
@@ -3634,10 +4276,14 @@ bool Fs3Operations::invalidateOldFWImages(const u_int32_t magic_pattern[], Flash
 
     FindAllImageStart(flash_access, image_start_addrs, &num_of_images_found, magic_pattern);
     // Address convertor is disabled after FindAllImageStart() - use phys addresses
-    for (u_int32_t i = 0; i < num_of_images_found; i++) {
-        if (image_start_addrs[i] != new_image_start) {
-            DPRINTF(("Fs3Operations::invalidateOldFWImages - Invalidating old fw signature at addr 0x%x\n", image_start_addrs[i]));
-            if (!flash_access->write(image_start_addrs[i], &zeroes, sizeof(zeroes), true)) {
+    for (u_int32_t i = 0; i < num_of_images_found; i++)
+    {
+        if (image_start_addrs[i] != new_image_start)
+        {
+            DPRINTF(("Fs3Operations::invalidateOldFWImages - Invalidating old fw signature at addr 0x%x\n",
+                     image_start_addrs[i]));
+            if (!flash_access->write(image_start_addrs[i], &zeroes, sizeof(zeroes), true))
+            {
                 return errmsg(MLXFW_FLASH_WRITE_ERR, "Failed to invalidate old fw signature: %s", flash_access->err());
             }
         }
@@ -3645,15 +4291,20 @@ bool Fs3Operations::invalidateOldFWImages(const u_int32_t magic_pattern[], Flash
     return true;
 }
 
-bool Fs3Operations::bootAddrUpdate(Flash *flash_access, u_int32_t new_image_start, ExtBurnParams& burnParams)
+bool Fs3Operations::bootAddrUpdate(Flash* flash_access, u_int32_t new_image_start, ExtBurnParams& burnParams)
 {
     bool boot_address_was_updated = true;
 
     // if we access without cache replacement or the burn was non failsafe, update YU bootloaders.
-    // if we access with cache replacement notify currently running fw of new image start address to crspace (for SW reset)
-    if (!SUPPORTS_ISFU(_fwImgInfo.ext_info.chip_type) || !burnParams.burnFailsafe || flash_access->get_ignore_cache_replacment()) {
+    // if we access with cache replacement notify currently running fw of new image start address to crspace (for SW
+    // reset)
+    if (!SUPPORTS_ISFU(_fwImgInfo.ext_info.chip_type) || !burnParams.burnFailsafe ||
+        flash_access->get_ignore_cache_replacment())
+    {
         boot_address_was_updated = flash_access->update_boot_addr(new_image_start);
-    } else {
+    }
+    else
+    {
         _isfuSupported = Fs3IsfuActivateImage(new_image_start);
         boot_address_was_updated = _isfuSupported;
     }
@@ -3661,52 +4312,70 @@ bool Fs3Operations::bootAddrUpdate(Flash *flash_access, u_int32_t new_image_star
     return boot_address_was_updated;
 }
 
-bool Fs3Operations::DoAfterBurnJobs(const u_int32_t magic_pattern[], Fs3Operations &imageOps,
-                                    ExtBurnParams& burnParams, Flash *flash_access,
-                                    u_int32_t new_image_start, u_int8_t is_curr_image_in_odd_chunks)
+bool Fs3Operations::DoAfterBurnJobs(const u_int32_t magic_pattern[],
+                                    Fs3Operations& imageOps,
+                                    ExtBurnParams& burnParams,
+                                    Flash* flash_access,
+                                    u_int32_t new_image_start,
+                                    u_int8_t is_curr_image_in_odd_chunks)
 {
     u_int32_t zeroes = 0;
     bool boot_address_was_updated = bootAddrUpdate(flash_access, new_image_start, burnParams);
 
-    if (imageOps._fwImgInfo.ext_info.is_failsafe) {
-        if (!burnParams.burnFailsafe) {
+    if (imageOps._fwImgInfo.ext_info.is_failsafe)
+    {
+        if (!burnParams.burnFailsafe)
+        {
             // When burning in nofs, remnant of older image with different chunk size
             // may reside on the flash -
             // Invalidate all images marking on flash except the one we've just burnt
-            if (!invalidateOldFWImages(magic_pattern, flash_access, new_image_start)) {
+            if (!invalidateOldFWImages(magic_pattern, flash_access, new_image_start))
+            {
                 return errmsg(MLXFW_FLASH_WRITE_ERR, "Failed to invalidate old fw signature: %s", flash_access->err());
             }
-        } else {
+        }
+        else
+        {
             // invalidate previous signature
-            if (_fwImgInfo.imgStart == 0x800000) {
+            if (_fwImgInfo.imgStart == 0x800000)
+            {
                 flash_access->set_address_convertor(0x17, is_curr_image_in_odd_chunks);
-            } else if (_fwImgInfo.imgStart == 0x400000) {
+            }
+            else if (_fwImgInfo.imgStart == 0x400000)
+            {
                 flash_access->set_address_convertor(_fwImgInfo.cntxLog2ChunkSize, 1 /*is_curr_image_in_odd_chunks*/);
-            } else {
+            }
+            else
+            {
                 flash_access->set_address_convertor(imageOps._fwImgInfo.cntxLog2ChunkSize, is_curr_image_in_odd_chunks);
             }
             DPRINTF(("Fs3Operations::DoAfterBurnJobs - Invalidating old fw signature\n"));
-            if (!flash_access->write(0, &zeroes, sizeof(zeroes), true)) {
+            if (!flash_access->write(0, &zeroes, sizeof(zeroes), true))
+            {
                 return errmsg(MLXFW_FLASH_WRITE_ERR, "Failed to invalidate old fw signature: %s", flash_access->err());
             }
         }
     }
-    if (boot_address_was_updated == false) {
+    if (boot_address_was_updated == false)
+    {
         report_warn("Failed to update FW boot address. Power cycle the device in order to load the new FW.\n");
     }
     return true;
 }
-bool Fs3Operations::InsertSecureFWSignature(vector<u_int8_t> signature, const char *uuid, PrintCallBack printFunc)
+bool Fs3Operations::InsertSecureFWSignature(vector<u_int8_t> signature, const char* uuid, PrintCallBack printFunc)
 {
     struct cx4fw_image_signature_512 image_signature_512;
-    vector <u_int32_t> uuidData;
-    if (_ioAccess->is_flash()) {
+    vector<u_int32_t> uuidData;
+    if (_ioAccess->is_flash())
+    {
         return errmsg("Signing is not applicable for devices");
     }
-    if (!extractUUIDFromString(uuid, uuidData)) {
+    if (!extractUUIDFromString(uuid, uuidData))
+    {
         return false;
     }
-    if (!Fs3MemSetSignature(FS3_IMAGE_SIGNATURE_256, CX4FW_IMAGE_SIGNATURE_256_SIZE, printFunc)) {
+    if (!Fs3MemSetSignature(FS3_IMAGE_SIGNATURE_256, CX4FW_IMAGE_SIGNATURE_256_SIZE, printFunc))
+    {
         return false;
     }
     memset(&image_signature_512, 0, sizeof(image_signature_512));
@@ -3715,8 +4384,8 @@ bool Fs3Operations::InsertSecureFWSignature(vector<u_int8_t> signature, const ch
     memcpy(image_signature_512.keypair_uuid, uuidData.data(), uuidData.size() << 2);
     signature.resize(CX4FW_IMAGE_SIGNATURE_512_SIZE, 0x0);
     cx4fw_image_signature_512_pack(&image_signature_512, signature.data());
-    if (!UpdateSection(signature.data(), FS3_IMAGE_SIGNATURE_512,
-        false, CMD_SET_SIGNATURE, printFunc)) {
+    if (!UpdateSection(signature.data(), FS3_IMAGE_SIGNATURE_512, false, CMD_SET_SIGNATURE, printFunc))
+    {
         return false;
     }
     return true;
diff --git a/mlxfwops/lib/fs3_ops.h b/mlxfwops/lib/fs3_ops.h
index a3d4154b..4f4e8d2d 100644
--- a/mlxfwops/lib/fs3_ops.h
+++ b/mlxfwops/lib/fs3_ops.h
@@ -31,11 +31,9 @@
  * SOFTWARE.
  */
 
-
 #ifndef FS3_OPS_
 #define FS3_OPS_
 
-
 #include "reg_access/reg_access.h"
 #include <cibfw_layouts.h>
 #include <image_layout_layouts.h>
@@ -56,150 +54,215 @@
 #define FS3_MIN_BIN_VER_MAJOR 1
 #define FS3_MIN_BIN_VER_MINOR 1
 
-#define FLASH_RESTORE(origFlashObj) \
-    if (origFlashObj) { \
-        _ioAccess->close(); \
-        delete _ioAccess; \
-        _ioAccess = origFlashObj; \
+#define FLASH_RESTORE(origFlashObj)   \
+    if (origFlashObj)                 \
+    {                                 \
+        _ioAccess->close();           \
+        delete _ioAccess;             \
+        _ioAccess = origFlashObj;     \
         _fwParams.ignoreCacheRep = 0; \
     }
 
-#define SUPPORTS_ISFU(chip_type) \
-    (chip_type == CT_CONNECT_IB || \
-     chip_type == CT_CONNECTX4 || chip_type == CT_CONNECTX4_LX || \
-     chip_type == CT_CONNECTX5 || \
-     chip_type == CT_CONNECTX6  || chip_type == CT_CONNECTX6DX || chip_type == CT_CONNECTX6LX || \
-     chip_type == CT_CONNECTX7 || \
-     chip_type == CT_BLUEFIELD || chip_type == CT_BLUEFIELD2 || chip_type == CT_BLUEFIELD3)
-
-#define FAIL_NO_OCR(str) do { \
-        if (_ioAccess->is_flash() && _fwParams.ignoreCacheRep == 0) { \
+#define SUPPORTS_ISFU(chip_type)                                                                \
+    (chip_type == CT_CONNECT_IB || chip_type == CT_CONNECTX4 || chip_type == CT_CONNECTX4_LX || \
+     chip_type == CT_CONNECTX5 || chip_type == CT_CONNECTX6 || chip_type == CT_CONNECTX6DX ||   \
+     chip_type == CT_CONNECTX6LX || chip_type == CT_CONNECTX7 || chip_type == CT_BLUEFIELD ||   \
+     chip_type == CT_BLUEFIELD2 || chip_type == CT_BLUEFIELD3)
+
+#define FAIL_NO_OCR(str)                                                                        \
+    do                                                                                          \
+    {                                                                                           \
+        if (_ioAccess->is_flash() && _fwParams.ignoreCacheRep == 0)                             \
+        {                                                                                       \
             return errmsg(MLXFW_OCR_ERR, "-ocr flag must be specified for %s operation.", str); \
-        } \
-} while (0)
+        }                                                                                       \
+    } while (0)
 
-class Fs3Operations : public FwOperations {
+class Fs3Operations : public FwOperations
+{
 public:
-
-
-    Fs3Operations(FBase *ioAccess) : FwOperations(ioAccess), _imageCache(0xFF),
-        _isfuSupported(false), _badDevDataSections(false), _maxImgLog2Size(0),
-        _signatureExists(0), _publicKeysExists(0)
+    Fs3Operations(FBase* ioAccess) :
+        FwOperations(ioAccess),
+        _imageCache(0xFF),
+        _isfuSupported(false),
+        _badDevDataSections(false),
+        _maxImgLog2Size(0),
+        _signatureExists(0),
+        _publicKeysExists(0)
     {
         _minBinMinorVer = FS3_MIN_BIN_VER_MINOR;
         _minBinMajorVer = FS3_MIN_BIN_VER_MAJOR;
         _maxBinMajorVer = FS3_MAX_BIN_VER_MAJOR;
     };
 
-    virtual ~Fs3Operations()  {};
-    //virtual void print_type() {printf("-D- FS3 type!\n");};
-    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage = false, bool showItoc = false, bool ignoreDToc = false);
-    virtual bool FwQuery(fw_info_t *fwInfo, bool readRom = true, bool isStripedImage = false, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
+    virtual ~Fs3Operations(){};
+    // virtual void print_type() {printf("-D- FS3 type!\n");};
+    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc,
+                          bool isStripedImage = false,
+                          bool showItoc = false,
+                          bool ignoreDToc = false);
+    virtual bool FwQuery(fw_info_t* fwInfo,
+                         bool readRom = true,
+                         bool isStripedImage = false,
+                         bool quickQuery = true,
+                         bool ignoreDToc = false,
+                         bool verbose = false);
     virtual u_int8_t FwType();
     virtual bool FwInit();
-    virtual bool FwReadData(void *image, u_int32_t *image_size, bool verbose = false);
-    static void    deal_with_signal();
+    virtual bool FwReadData(void* image, u_int32_t* image_size, bool verbose = false);
+    static void deal_with_signal();
 
     virtual bool FwReadRom(std::vector<u_int8_t>& romSect);
-    virtual bool FwBurnRom(FImage *romImg, bool ignoreProdIdCheck = false, bool ignoreDevidCheck = false, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    virtual bool FwBurnRom(FImage* romImg,
+                           bool ignoreProdIdCheck = false,
+                           bool ignoreDevidCheck = false,
+                           ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     virtual bool FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
 
-    virtual bool FwBurn(FwOperations *imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
-    virtual bool FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams& burnParams);
-    virtual bool FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc);
+    virtual bool
+      FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    virtual bool FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams);
+    virtual bool FwBurnBlock(FwOperations* imageOps, ProgressCallBack progressFunc);
 
-    virtual bool FwSetGuids(sg_params_t& sgParam, PrintCallBack callBack = (PrintCallBack)NULL, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    virtual bool FwSetGuids(sg_params_t& sgParam,
+                            PrintCallBack callBack = (PrintCallBack)NULL,
+                            ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     virtual bool FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false);
-    virtual bool FwSetVSD(char *vsdStr, ProgressCallBack progressFunc = (ProgressCallBack)NULL, PrintCallBack printFunc = (PrintCallBack)NULL);
-    virtual bool FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetVSD(char* vsdStr,
+                          ProgressCallBack progressFunc = (ProgressCallBack)NULL,
+                          PrintCallBack printFunc = (PrintCallBack)NULL);
+    virtual bool FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     virtual bool FwResetNvData();
     virtual bool FwShiftDevData(PrintCallBack progressFunc = (PrintCallBack)NULL);
-    virtual const char*  FwGetResetRecommandationStr();
-    virtual const char*  FwGetReSignMsgStr();
-    virtual bool InsertSecureFWSignature(vector<u_int8_t> signature, const char *uuid, PrintCallBack printFunc);
+    virtual const char* FwGetResetRecommandationStr();
+    virtual const char* FwGetReSignMsgStr();
+    virtual bool InsertSecureFWSignature(vector<u_int8_t> signature, const char* uuid, PrintCallBack printFunc);
     bool FwInsertSHA256(PrintCallBack printFunc = (PrintCallBack)NULL);
-    bool signForFwUpdate(const char *privPemFile, const char *uuid, PrintCallBack printFunc = (PrintCallBack)NULL);
-    bool FwSignWithTwoRSAKeys(const char *privPemFile1, const char *uuid1,
-                              const char *privPemFile2, const char *uuid2, PrintCallBack printFunc = (PrintCallBack)NULL);
-
-    bool FwInsertEncSHA(MlxSign::SHAType shaType, const char *privPemFile,
-                        const char *uuid, PrintCallBack printFunc = (PrintCallBack)NULL);
-
-    virtual bool FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc, bool verbose = false, bool ignoreImageStart = false);
+    bool signForFwUpdate(const char* privPemFile, const char* uuid, PrintCallBack printFunc = (PrintCallBack)NULL);
+    bool FwSignWithTwoRSAKeys(const char* privPemFile1,
+                              const char* uuid1,
+                              const char* privPemFile2,
+                              const char* uuid2,
+                              PrintCallBack printFunc = (PrintCallBack)NULL);
+
+    bool FwInsertEncSHA(MlxSign::SHAType shaType,
+                        const char* privPemFile,
+                        const char* uuid,
+                        PrintCallBack printFunc = (PrintCallBack)NULL);
+
+    virtual bool FwExtract4MBImage(vector<u_int8_t>& img,
+                                   bool maskMagicPatternAndDevToc,
+                                   bool verbose = false,
+                                   bool ignoreImageStart = false);
     virtual bool GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_t>& img);
-    virtual bool FwSetPublicKeys(char *fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
-    virtual bool FwSetForbiddenVersions(char *fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetPublicKeys(char* fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetForbiddenVersions(char* fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwCalcMD5(u_int8_t md5sum[16]);
     virtual bool FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer);
-    virtual bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning = false);
+    virtual bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                  struct tools_open_fw_version& fwVer,
+                                  bool queryRunning = false);
     virtual bool FwResetTimeStamp();
-    Tlv_Status_t GetTsObj(TimeStampIFC **tsObj);
+    Tlv_Status_t GetTsObj(TimeStampIFC** tsObj);
 
-    bool FwCheckIfWeCanBurnWithFwControl(FwOperations *imageOps);
-    bool FwCheckIf8MBShiftingNeeded(FwOperations *imageOps, const ExtBurnParams& burnParams);
+    bool FwCheckIfWeCanBurnWithFwControl(FwOperations* imageOps);
+    bool FwCheckIf8MBShiftingNeeded(FwOperations* imageOps, const ExtBurnParams& burnParams);
     using FwOperations::CalcHMAC;
     bool CalcHMAC(const vector<u_int8_t>& key, vector<u_int8_t>& digest);
     virtual bool GetSectionSizeAndOffset(fs3_section_t sectType, u_int32_t& size, u_int32_t& offset);
-    MlargeBuffer GetImageCache() { return  _imageCache; }
-    virtual bool UpdateSection(void *new_info, fs3_section_t sect_type = FS3_DEV_INFO, bool is_sect_failsafe = true, CommandType cmd_type = CMD_UNKNOWN, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    MlargeBuffer GetImageCache() { return _imageCache; }
+    virtual bool UpdateSection(void* new_info,
+                               fs3_section_t sect_type = FS3_DEV_INFO,
+                               bool is_sect_failsafe = true,
+                               CommandType cmd_type = CMD_UNKNOWN,
+                               PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool PrepItocSectionsForCompare(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical);
-    virtual bool RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t devid_t, const cx4fw_uid_entry& base_guid, const cx4fw_uid_entry& base_mac);
+    virtual bool RestoreDevToc(vector<u_int8_t>& img,
+                               char* psid,
+                               dm_dev_id_t devid_t,
+                               const cx4fw_uid_entry& base_guid,
+                               const cx4fw_uid_entry& base_mac);
     bool IsCriticalSection(u_int8_t sect_type);
-protected:
-    #define ITOC_ASCII 0x49544f43
-    #define TOC_RAND1  0x04081516
-    #define TOC_RAND2  0x2342cafa
-    #define TOC_RAND3  0xbacafe00
-    #define TOC_HEADER_SIZE 0x20
-    #define TOC_ENTRY_SIZE  0x20
-    #define FS3_FW_SIGNATURE_SIZE 0x10
-    #define MAX_TOCS_NUM         64
-    #define MFG_INFO "MFG_INFO"
-    #define DEV_INFO "DEV_INFO"
-    #define UNKNOWN_SECTION "UNKNOWN"
 
-    u_int32_t getNewImageStartAddress(Fs3Operations &imageOps, bool isBurnFailSafe);
-    virtual bool FsBurnAux(FwOperations *imageOps, ExtBurnParams& burnParams);
-    bool DumpFs3CRCCheck(u_int8_t sect_type, u_int32_t sect_addr, u_int32_t sect_size, u_int32_t crc_act, u_int32_t crc_exp,
-                         bool ignore_crc = false, VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
-    bool Fs3UpdateImgCache(u_int8_t *buff, u_int32_t addr, u_int32_t size);
-    virtual bool UpdateImgCache(u_int8_t *buff, u_int32_t addr, u_int32_t size);
-    virtual bool FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_itoc, struct QueryOptions queryOptions, bool ignoreDToc = false, bool verbose = false);
-    virtual bool FsIntQueryAux(bool readRom = true, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
+protected:
+#define ITOC_ASCII 0x49544f43
+#define TOC_RAND1 0x04081516
+#define TOC_RAND2 0x2342cafa
+#define TOC_RAND3 0xbacafe00
+#define TOC_HEADER_SIZE 0x20
+#define TOC_ENTRY_SIZE 0x20
+#define FS3_FW_SIGNATURE_SIZE 0x10
+#define MAX_TOCS_NUM 64
+#define MFG_INFO "MFG_INFO"
+#define DEV_INFO "DEV_INFO"
+#define UNKNOWN_SECTION "UNKNOWN"
+
+    u_int32_t getNewImageStartAddress(Fs3Operations& imageOps, bool isBurnFailSafe);
+    virtual bool FsBurnAux(FwOperations* imageOps, ExtBurnParams& burnParams);
+    bool DumpFs3CRCCheck(u_int8_t sect_type,
+                         u_int32_t sect_addr,
+                         u_int32_t sect_size,
+                         u_int32_t crc_act,
+                         u_int32_t crc_exp,
+                         bool ignore_crc = false,
+                         VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
+    bool Fs3UpdateImgCache(u_int8_t* buff, u_int32_t addr, u_int32_t size);
+    virtual bool UpdateImgCache(u_int8_t* buff, u_int32_t addr, u_int32_t size);
+    virtual bool FsVerifyAux(VerifyCallBack verifyCallBackFunc,
+                             bool show_itoc,
+                             struct QueryOptions queryOptions,
+                             bool ignoreDToc = false,
+                             bool verbose = false);
+    virtual bool
+      FsIntQueryAux(bool readRom = true, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
     const char* GetSectionNameByType(u_int8_t section_type);
-    bool GetImageInfoFromSection(u_int8_t *buff, u_int8_t sect_type, u_int32_t sect_size, u_int8_t check_support_only = 0);
+    bool
+      GetImageInfoFromSection(u_int8_t* buff, u_int8_t sect_type, u_int32_t sect_size, u_int8_t check_support_only = 0);
     bool IsGetInfoSupported(u_int8_t sect_type);
     bool IsFs3SectionReadable(u_int8_t type, QueryOptions queryOptions);
-    bool GetMfgInfo(u_int8_t *buff);
-    bool GetDevInfo(u_int8_t *buff);
-    bool GetImageInfo(u_int8_t *buff);
-    bool GetRomInfo(u_int8_t *buff, u_int32_t size);
+    bool GetMfgInfo(u_int8_t* buff);
+    bool GetDevInfo(u_int8_t* buff);
+    bool GetImageInfo(u_int8_t* buff);
+    bool GetRomInfo(u_int8_t* buff, u_int32_t size);
     bool GetImgSigInfo(u_int32_t keypair_uuid[4]);
-    bool GetImgSigInfo256(u_int8_t *buff);
-    bool GetImgSigInfo512(u_int8_t *buff);
-    bool invalidateOldFWImages(const u_int32_t magic_pattern[], Flash *f, u_int32_t new_image_start);
-    bool bootAddrUpdate(Flash *flash_access, u_int32_t new_image_start, ExtBurnParams& burnParams);
-    bool DoAfterBurnJobs(const u_int32_t magic_patter[], Fs3Operations &imageOps,
-                         ExtBurnParams& burnParams, Flash *flash_access,
-                         u_int32_t new_image_start, u_int8_t is_curr_image_in_odd_chunks);
-    bool CreateDtoc(vector<u_int8_t>& img, u_int8_t* SectionData, u_int32_t section_size, u_int32_t flash_data_addr,
-        fs3_section_t section, u_int32_t tocEntryAddr, bool IsCRC);
+    bool GetImgSigInfo256(u_int8_t* buff);
+    bool GetImgSigInfo512(u_int8_t* buff);
+    bool invalidateOldFWImages(const u_int32_t magic_pattern[], Flash* f, u_int32_t new_image_start);
+    bool bootAddrUpdate(Flash* flash_access, u_int32_t new_image_start, ExtBurnParams& burnParams);
+    bool DoAfterBurnJobs(const u_int32_t magic_patter[],
+                         Fs3Operations& imageOps,
+                         ExtBurnParams& burnParams,
+                         Flash* flash_access,
+                         u_int32_t new_image_start,
+                         u_int8_t is_curr_image_in_odd_chunks);
+    bool CreateDtoc(vector<u_int8_t>& img,
+                    u_int8_t* SectionData,
+                    u_int32_t section_size,
+                    u_int32_t flash_data_addr,
+                    fs3_section_t section,
+                    u_int32_t tocEntryAddr,
+                    bool IsCRC);
     virtual bool getRunningFwVersion();
     virtual bool Fs3IsfuActivateImage(u_int32_t newImageStart);
-    bool Fs3ReburnItocSection(u_int32_t newSectionAddr, u_int32_t newSectionSize, std::vector<u_int8_t>  newSectionData, const char *msg, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    bool Fs3ReburnItocSection(u_int32_t newSectionAddr,
+                              u_int32_t newSectionSize,
+                              std::vector<u_int8_t> newSectionData,
+                              const char* msg,
+                              PrintCallBack callBackFunc = (PrintCallBack)NULL);
     bool Fs3ChangeUidsFromBase(fs3_uid_t base_uid, struct cibfw_guids& guids);
     bool Fs3ChangeUidsFromBase(fs3_uid_t base_uid, struct cx4fw_guids& guids);
     bool DeviceTimestampEnabled();
     bool RomCommonCheck(bool ignoreProdIdCheck, bool checkIfRomEmpty);
-    bool extractUUIDFromString(const char *uuid, std::vector<u_int32_t>& uuidData);
+    bool extractUUIDFromString(const char* uuid, std::vector<u_int32_t>& uuidData);
 
-    bool Fs3UpdatePublicKeysSection(unsigned int size, const char *publicKeys,
-                                    std::vector<u_int8_t>  &newSectionData, bool silent = false);
-    bool Fs3UpdateForbiddenVersionsSection(unsigned int size, char *publicKeys,
-                                           std::vector<u_int8_t>  &newSectionData);
+    bool Fs3UpdatePublicKeysSection(unsigned int size,
+                                    const char* publicKeys,
+                                    std::vector<u_int8_t>& newSectionData,
+                                    bool silent = false);
+    bool Fs3UpdateForbiddenVersionsSection(unsigned int size, char* publicKeys, std::vector<u_int8_t>& newSectionData);
 
     bool CheckAndDealWithChunkSizes(u_int32_t cntxLog2ChunkSize, u_int32_t imageCntxLog2ChunkSize);
     bool ReBurnCurrentImage(ProgressCallBack progressFunc);
@@ -209,18 +272,20 @@ class Fs3Operations : public FwOperations {
     virtual bool VerifyImageAfterModifications();
     virtual bool parseDevData(bool readRom = true, bool quickQuery = true, bool verbose = false);
 
-    bool isOld4MBImage(FwOperations *imageOps);
+    bool isOld4MBImage(FwOperations* imageOps);
     bool FwCalcSHA(MlxSign::SHAType shaType, vector<u_int8_t>& sha256, vector<u_int8_t>& fourMbImage);
-    bool CheckPublicKeysFile(const char *fname, fs3_section_t& sectionType, bool silent = false);
+    bool CheckPublicKeysFile(const char* fname, fs3_section_t& sectionType, bool silent = false);
     bool isWriteProtected(bool& is_write_protected);
-    struct toc_info {
+    struct toc_info
+    {
         u_int32_t entry_addr;
         struct cibfw_itoc_entry toc_entry;
         u_int8_t data[CIBFW_ITOC_ENTRY_SIZE];
-        std::vector<u_int8_t>  section_data;
+        std::vector<u_int8_t> section_data;
     };
 
-    struct Fs3ImgInfo {
+    struct Fs3ImgInfo
+    {
         fs3_info_t ext_info;
         int numOfItocs;
         struct toc_info tocArr[MAX_TOCS_NUM];
@@ -237,62 +302,107 @@ class Fs3Operations : public FwOperations {
     Fs3ImgInfo _fs3ImgInfo;
     MlargeBuffer _imageCache;
     bool _isfuSupported;
-    bool _badDevDataSections; // set true if during verify one of the device data section is corrupt or mfg section missing
+    bool _badDevDataSections; // set true if during verify one of the device data section is corrupt or mfg section
+                              // missing
     u_int32_t _maxImgLog2Size;
 
     u_int8_t _signatureExists;
     u_int8_t _publicKeysExists;
 
 private:
-    #define CRC_CHECK_OUTPUT  CRC_CHECK_OLD ")"
-    #define FS3_CRC_CHECK_OUT CRC_CHECK_OLD ":0x%x)"
-    #define PRE_CRC_OUTPUT   "    "
-    #define FS3_DEFAULT_SECTOR_SIZE 0x1000
-    #define FS3_LOG2_CHUNK_SIZE_DW_OFFSET 0x9
-
-    reg_access_status_t getGI(mfile *mf, struct reg_access_hca_mgir *gi);
-    bool VerifyTOC(u_int32_t dtoc_addr, bool& bad_signature, VerifyCallBack verifyCallBackFunc, bool show_itoc,
-                   struct QueryOptions queryOptions, bool ignoreDToc = false, bool verbose = false);
-    bool CheckTocSignature(struct cibfw_itoc_header *itoc_header, u_int32_t first_signature);
-    bool BurnFs3Image(Fs3Operations &imageOps, ExtBurnParams& burnParams);
-    bool UpdateDevDataITOC(Fs3Operations &imageOps, struct toc_info *image_toc_info_entry, struct toc_info *flash_toc_arr, int flash_toc_size);
-
-    bool Fs3GetItocInfo(struct toc_info *tocArr, int num_of_itocs, fs3_section_t sect_type, struct toc_info*&curr_toc);
-    bool Fs3UpdateMfgUidsSection(struct toc_info *curr_toc, std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                                 std::vector<u_int8_t>  &newSectionData);
-    bool Fs3UpdateUidsSection(struct toc_info *curr_toc, std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                              std::vector<u_int8_t>  &newSectionData);
-    bool Fs3UpdateVsdSection(struct toc_info *curr_toc, std::vector<u_int8_t>  section_data, char *user_vsd,
-                             std::vector<u_int8_t>  &newSectionData);
-    bool Fs3UpdateVpdSection(struct toc_info *curr_toc, char *vpd, std::vector<u_int8_t>  &newSectionData);
-    bool Fs3GetNewSectionAddr(struct toc_info *curr_toc, u_int32_t &NewSectionAddr, bool failsafe_section);
-    bool Fs3UpdateItocInfo(struct toc_info *curr_toc, u_int32_t newSectionAddr, u_int32_t itocSize, std::vector<u_int8_t>  newSectionData);
-    bool Fs3UpdateItocInfo(struct toc_info *curr_toc, u_int32_t newSectionAddr);
-    bool Fs3UpdateItocInfo(struct toc_info *newItocInfo, u_int32_t newSectionAddr, fs3_section_t sectionType, u_int32_t *newSectData, u_int32_t NewSectSize);
-    bool Fs3UpdateItocData(struct toc_info *currToc);
-
-    bool GetModifiedSectionInfo(fs3_section_t sectionType, fs3_section_t nextSectionType, u_int32_t &newSectAddr,
-                                fs3_section_t &sectToPut, u_int32_t &oldSectSize);
-    bool UpdateItocAfterInsert(fs3_section_t sectionType, u_int32_t newSectAddr, fs3_section_t SectToPut,  bool toAdd, u_int32_t *newSectData, u_int32_t NewSectSize,
-                               struct toc_info *tocArr, u_int32_t &numOfItocs);
-    bool UpdateImageAfterInsert(struct toc_info *tocArr, u_int32_t numOfItocs, u_int8_t *newImgData, u_int32_t newSectSize);
-    bool Fs3ReplaceSectionInDevImg(fs3_section_t sectionType, fs3_section_t nextSectionType, bool toAdd, u_int8_t *newImgData,
-                                   u_int32_t newImageSize, u_int32_t *newSectData, u_int32_t NewSectSize);
-    bool CalcItocEntryCRC(struct toc_info *curr_toc);
-    bool ShiftItocAddrInEntry(struct toc_info *newItocInfo, struct toc_info *oldItocInfo, int shiftSize);
-    bool CopyItocInfo(struct toc_info *newTocInfo, struct toc_info *currToc);
-    bool Fs3ModifySection(fs3_section_t sectionType, fs3_section_t neighbourSection, bool toAdd, u_int32_t *newSectData,
-                          u_int32_t newImageSize, ProgressCallBack progressFunc);
+#define CRC_CHECK_OUTPUT CRC_CHECK_OLD ")"
+#define FS3_CRC_CHECK_OUT CRC_CHECK_OLD ":0x%x)"
+#define PRE_CRC_OUTPUT "    "
+#define FS3_DEFAULT_SECTOR_SIZE 0x1000
+#define FS3_LOG2_CHUNK_SIZE_DW_OFFSET 0x9
+
+    reg_access_status_t getGI(mfile* mf, struct reg_access_hca_mgir* gi);
+    bool VerifyTOC(u_int32_t dtoc_addr,
+                   bool& bad_signature,
+                   VerifyCallBack verifyCallBackFunc,
+                   bool show_itoc,
+                   struct QueryOptions queryOptions,
+                   bool ignoreDToc = false,
+                   bool verbose = false);
+    bool CheckTocSignature(struct cibfw_itoc_header* itoc_header, u_int32_t first_signature);
+    bool BurnFs3Image(Fs3Operations& imageOps, ExtBurnParams& burnParams);
+    bool UpdateDevDataITOC(Fs3Operations& imageOps,
+                           struct toc_info* image_toc_info_entry,
+                           struct toc_info* flash_toc_arr,
+                           int flash_toc_size);
+
+    bool Fs3GetItocInfo(struct toc_info* tocArr, int num_of_itocs, fs3_section_t sect_type, struct toc_info*& curr_toc);
+    bool Fs3UpdateMfgUidsSection(struct toc_info* curr_toc,
+                                 std::vector<u_int8_t> section_data,
+                                 fs3_uid_t base_uid,
+                                 std::vector<u_int8_t>& newSectionData);
+    bool Fs3UpdateUidsSection(struct toc_info* curr_toc,
+                              std::vector<u_int8_t> section_data,
+                              fs3_uid_t base_uid,
+                              std::vector<u_int8_t>& newSectionData);
+    bool Fs3UpdateVsdSection(struct toc_info* curr_toc,
+                             std::vector<u_int8_t> section_data,
+                             char* user_vsd,
+                             std::vector<u_int8_t>& newSectionData);
+    bool Fs3UpdateVpdSection(struct toc_info* curr_toc, char* vpd, std::vector<u_int8_t>& newSectionData);
+    bool Fs3GetNewSectionAddr(struct toc_info* curr_toc, u_int32_t& NewSectionAddr, bool failsafe_section);
+    bool Fs3UpdateItocInfo(struct toc_info* curr_toc,
+                           u_int32_t newSectionAddr,
+                           u_int32_t itocSize,
+                           std::vector<u_int8_t> newSectionData);
+    bool Fs3UpdateItocInfo(struct toc_info* curr_toc, u_int32_t newSectionAddr);
+    bool Fs3UpdateItocInfo(struct toc_info* newItocInfo,
+                           u_int32_t newSectionAddr,
+                           fs3_section_t sectionType,
+                           u_int32_t* newSectData,
+                           u_int32_t NewSectSize);
+    bool Fs3UpdateItocData(struct toc_info* currToc);
+
+    bool GetModifiedSectionInfo(fs3_section_t sectionType,
+                                fs3_section_t nextSectionType,
+                                u_int32_t& newSectAddr,
+                                fs3_section_t& sectToPut,
+                                u_int32_t& oldSectSize);
+    bool UpdateItocAfterInsert(fs3_section_t sectionType,
+                               u_int32_t newSectAddr,
+                               fs3_section_t SectToPut,
+                               bool toAdd,
+                               u_int32_t* newSectData,
+                               u_int32_t NewSectSize,
+                               struct toc_info* tocArr,
+                               u_int32_t& numOfItocs);
+    bool UpdateImageAfterInsert(struct toc_info* tocArr,
+                                u_int32_t numOfItocs,
+                                u_int8_t* newImgData,
+                                u_int32_t newSectSize);
+    bool Fs3ReplaceSectionInDevImg(fs3_section_t sectionType,
+                                   fs3_section_t nextSectionType,
+                                   bool toAdd,
+                                   u_int8_t* newImgData,
+                                   u_int32_t newImageSize,
+                                   u_int32_t* newSectData,
+                                   u_int32_t NewSectSize);
+    bool CalcItocEntryCRC(struct toc_info* curr_toc);
+    bool ShiftItocAddrInEntry(struct toc_info* newItocInfo, struct toc_info* oldItocInfo, int shiftSize);
+    bool CopyItocInfo(struct toc_info* newTocInfo, struct toc_info* currToc);
+    bool Fs3ModifySection(fs3_section_t sectionType,
+                          fs3_section_t neighbourSection,
+                          bool toAdd,
+                          u_int32_t* newSectData,
+                          u_int32_t newImageSize,
+                          ProgressCallBack progressFunc);
     virtual bool Fs3RemoveSection(fs3_section_t sectionType, ProgressCallBack progressFunc);
-    bool Fs3AddSection(fs3_section_t sectionType, fs3_section_t neighbourSection, u_int32_t *newSectData, u_int32_t newSectSize,
+    bool Fs3AddSection(fs3_section_t sectionType,
+                       fs3_section_t neighbourSection,
+                       u_int32_t* newSectData,
+                       u_int32_t newSectSize,
                        ProgressCallBack progressFunc);
     bool CheckFs3ImgSize(Fs3Operations& imageOps, bool useImageDevData = false);
     bool CheckItocArray();
     bool CheckItocArrConsistency(std::vector<struct toc_info*>& sortedTocVec, u_int32_t imageStartAddr);
 
-
-    u_int32_t getAbsAddr(toc_info *toc);
-    u_int32_t getAbsAddr(toc_info *toc, u_int32_t imgStart);
+    u_int32_t getAbsAddr(toc_info* toc);
+    u_int32_t getAbsAddr(toc_info* toc, u_int32_t imgStart);
     bool getLastFwSAddr(u_int32_t& lastAddr);
     bool getFirstDevDataAddr(u_int32_t& firstAddr);
     virtual bool reburnItocSection(PrintCallBack callBackFunc, bool burnFailsafe = true);
@@ -300,17 +410,16 @@ class Fs3Operations : public FwOperations {
     virtual void maskDevToc(vector<u_int8_t>& img);
     virtual void MaskItocSectionAndEntry(u_int32_t itocType, vector<u_int8_t>& img);
     // this class is for sorting the itoc array by ascending absolute flash_addr used in FwShiftDevData
-    class TocComp {
-public:
-        TocComp(u_int32_t startAdd) :  _startAdd(startAdd) {};
-        ~TocComp() {};
-        bool operator()(toc_info *elem1, toc_info *elem2);
-private:
+    class TocComp
+    {
+    public:
+        TocComp(u_int32_t startAdd) : _startAdd(startAdd){};
+        ~TocComp(){};
+        bool operator()(toc_info* elem1, toc_info* elem2);
+
+    private:
         u_int32_t _startAdd;
     };
-
 };
 
-
-
 #endif // FS3_OPS_
diff --git a/mlxfwops/lib/fs4_ops.cpp b/mlxfwops/lib/fs4_ops.cpp
index 33764f3f..fc15cfac 100644
--- a/mlxfwops/lib/fs4_ops.cpp
+++ b/mlxfwops/lib/fs4_ops.cpp
@@ -31,7 +31,6 @@
  * SOFTWARE.
  */
 
-
 #include <stdlib.h>
 #include <algorithm>
 #include <vector>
@@ -57,11 +56,11 @@
 #include <sstream>
 #if !defined(NO_CS_CMD)
 #include <tools_crypto/tools_md5.h>
-#endif //NO_CS_CMD
+#endif // NO_CS_CMD
 #if !defined(NO_OPEN_SSL)
 #include <mlxsign_lib/mlxsign_lib.h>
-#endif //NO_OPEN_SSL
-#endif //UEFI_BUILD
+#endif // NO_OPEN_SSL
+#endif // UEFI_BUILD
 
 #include "fs4_ops.h"
 #include "fs3_ops.h"
@@ -77,20 +76,21 @@
 #define DEFAULT_GUID_NUM 0xff
 #define DEFAULT_STEP DEFAULT_GUID_NUM
 
-#define GUID_TO_64(guid_st) \
-    (guid_st.l | (u_int64_t)guid_st.h << 32)
+#define GUID_TO_64(guid_st) (guid_st.l | (u_int64_t)guid_st.h << 32)
 
-#define CHECK_IF_FS4_FILE_FOR_TIMESTAMP_OP() \
-    if (!_ioAccess->is_flash()) { \
-        return errmsg( \
-            "Timestamp operation for FS4 FW image files is not supported"); \
+#define CHECK_IF_FS4_FILE_FOR_TIMESTAMP_OP()                                          \
+    if (!_ioAccess->is_flash())                                                       \
+    {                                                                                 \
+        return errmsg("Timestamp operation for FS4 FW image files is not supported"); \
     }
 
 #define COUNT_OF_SECTIONS_TO_ALIGN 5
 
-void Fs4Operations::FwCleanUp() {
+void Fs4Operations::FwCleanUp()
+{
     FwOperations::FwCleanUp();
-    if (_encrypted_image_io_access) {
+    if (_encrypted_image_io_access)
+    {
         _encrypted_image_io_access->close();
         delete _encrypted_image_io_access;
         _encrypted_image_io_access = (FImage*)NULL;
@@ -99,9 +99,11 @@ void Fs4Operations::FwCleanUp() {
 
 bool Fs4Operations::CheckSignatures(u_int32_t a[], u_int32_t b[], int n)
 {
-    for (int i = 0; i < n; i++) {
-        if (a[i] != b[i]) {
-            //printf("-D- a[%d]=%d b[%d]=%d", i, a[i], i, b[i]);
+    for (int i = 0; i < n; i++)
+    {
+        if (a[i] != b[i])
+        {
+            // printf("-D- a[%d]=%d b[%d]=%d", i, a[i], i, b[i]);
             return false;
         }
     }
@@ -113,18 +115,22 @@ bool Fs4Operations::IsEncryptedDevice(bool& is_encrypted)
     DPRINTF(("Fs4Operations::IsEncryptedDevice\n"));
     is_encrypted = false;
 
-    if (_signatureMngr->IsLifeCycleSupported() && _signatureMngr->IsEncryptionSupported()) {
+    if (_signatureMngr->IsLifeCycleSupported() && _signatureMngr->IsEncryptionSupported())
+    {
         chip_type_t chip_type;
-        const u_int32_t *swId = (u_int32_t*)NULL;
-        if (!getInfoFromHwDevid(GetHwDevId(), chip_type, &swId)) {
+        const u_int32_t* swId = (u_int32_t*)NULL;
+        if (!getInfoFromHwDevid(GetHwDevId(), chip_type, &swId))
+        {
             return false;
         }
         CRSpaceRegisters crSpaceReg(getMfileObj(), chip_type);
-        if (crSpaceReg.getLifeCycle() == GA_SECURED) {
+        if (crSpaceReg.getLifeCycle() == GA_SECURED)
+        {
             is_encrypted = true;
         }
     }
-    else {
+    else
+    {
         is_encrypted = false;
     }
 
@@ -140,8 +146,10 @@ bool Fs4Operations::IsEncryptedImage(bool& is_encrypted)
 
     is_encrypted = false;
 
-    if (!_is_hw_ptrs_initialized) {
-        if (!initHwPtrs(true)) {
+    if (!_is_hw_ptrs_initialized)
+    {
+        if (!initHwPtrs(true))
+        {
             DPRINTF(("Fs4Operations::IsEncryptedImage HW pointers not found"));
             return false;
         }
@@ -149,10 +157,12 @@ bool Fs4Operations::IsEncryptedImage(bool& is_encrypted)
 
     READBUF((*_ioAccess), _itoc_ptr, buffer, TOC_HEADER_SIZE, "ITOC Header");
     image_layout_itoc_header_unpack(&itocHeader, buffer);
-    if (!CheckTocSignature(&itocHeader, ITOC_ASCII)) { // Check first location of ITOC header magic-pattern
+    if (!CheckTocSignature(&itocHeader, ITOC_ASCII))
+    { // Check first location of ITOC header magic-pattern
         READBUF((*_ioAccess), _itoc_ptr + FS4_DEFAULT_SECTOR_SIZE, buffer, TOC_HEADER_SIZE, "ITOC Header");
         image_layout_itoc_header_unpack(&itocHeader, buffer);
-        if (!CheckTocSignature(&itocHeader, ITOC_ASCII)) { // Check second location of ITOC header magic-pattern
+        if (!CheckTocSignature(&itocHeader, ITOC_ASCII))
+        { // Check second location of ITOC header magic-pattern
             is_encrypted = true;
         }
     }
@@ -160,32 +170,36 @@ bool Fs4Operations::IsEncryptedImage(bool& is_encrypted)
     return true;
 }
 
-bool Fs4Operations::isEncrypted(bool& is_encrypted) {
+bool Fs4Operations::isEncrypted(bool& is_encrypted)
+{
     DPRINTF(("Fs4Operations::isEncrypted\n"));
     bool res = false;
 
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         DPRINTF(("Fs4Operations::isEncrypted call IsEncryptedDevice\n"));
         res = IsEncryptedDevice(is_encrypted);
     }
-    else {
+    else
+    {
         DPRINTF(("Fs4Operations::isEncrypted call IsEncryptedImage\n"));
         res = IsEncryptedImage(is_encrypted);
     }
 
-    DPRINTF(("Fs4Operations::isEncrypted is_encrypted = %s, res = %s\n", is_encrypted ? "TRUE" : "FALSE", res ? "TRUE" : "FALSE"));
+    DPRINTF(("Fs4Operations::isEncrypted is_encrypted = %s, res = %s\n", is_encrypted ? "TRUE" : "FALSE",
+             res ? "TRUE" : "FALSE"));
     return res;
 }
 
-bool Fs4Operations::CheckTocSignature(struct image_layout_itoc_header *itoc_header, u_int32_t first_signature)
+bool Fs4Operations::CheckTocSignature(struct image_layout_itoc_header* itoc_header, u_int32_t first_signature)
 {
-    u_int32_t a[4] = {itoc_header->signature0, itoc_header->signature1,
-                      itoc_header->signature2, itoc_header->signature3};
+    u_int32_t a[4] = {itoc_header->signature0, itoc_header->signature1, itoc_header->signature2,
+                      itoc_header->signature3};
     u_int32_t b[4] = {first_signature, TOC_RAND1, TOC_RAND2, TOC_RAND3};
     return CheckSignatures(a, b, 4);
 }
 
-bool Fs4Operations::CheckDevInfoSignature(u_int32_t *buff)
+bool Fs4Operations::CheckDevInfoSignature(u_int32_t* buff)
 {
     u_int32_t sig0 = buff[0], sig1 = buff[1], sig2 = buff[2], sig3 = buff[3];
     TOCPU1(sig0);
@@ -194,25 +208,26 @@ bool Fs4Operations::CheckDevInfoSignature(u_int32_t *buff)
     TOCPU1(sig3);
     u_int32_t a[4] = {sig0, sig1, sig2, sig3};
     u_int32_t b[4] = {DEV_INFO_SIG0, DEV_INFO_SIG1, DEV_INFO_SIG2, DEV_INFO_SIG3};
-    //printf("sig0=%x sig1=%x sig2=%x sig3=%x\n", sig0, sig1, sig2, sig3);
+    // printf("sig0=%x sig1=%x sig2=%x sig3=%x\n", sig0, sig1, sig2, sig3);
     return CheckSignatures(a, b, 4);
 }
 
-//CodeView: move it to Base class
+// CodeView: move it to Base class
 bool Fs4Operations::getImgStart()
 {
     DPRINTF(("Fs4Operations::getImgStart\n"));
     u_int32_t cntx_image_start[CNTX_START_POS_SIZE] = {0};
     u_int32_t cntx_image_num = 0;
 
-    FindAllImageStart(_ioAccess, cntx_image_start,
-                      &cntx_image_num, _fs4_magic_pattern);
+    FindAllImageStart(_ioAccess, cntx_image_start, &cntx_image_num, _fs4_magic_pattern);
 
-    if (cntx_image_num == 0) {
+    if (cntx_image_num == 0)
+    {
         return errmsg(MLXFW_NO_VALID_IMAGE_ERR,
                       "\nNo valid FS4 image found. Check the flash parameters, if specified.");
     }
-    if (cntx_image_num > 1) {
+    if (cntx_image_num > 1)
+    {
         return errmsg(MLXFW_MULTIPLE_VALID_IMAGES_ERR,
                       "More than one FS4 image found on %s",
                       this->_ioAccess->is_flash() ? "Device" : "image");
@@ -224,7 +239,10 @@ bool Fs4Operations::getImgStart()
     return true;
 }
 
-bool Fs4Operations::getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc, FBase* ioAccess, bool IsBurningProcess, bool isVerify)
+bool Fs4Operations::getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc,
+                                           FBase* ioAccess,
+                                           bool IsBurningProcess,
+                                           bool isVerify)
 {
     DPRINTF(("Fs4Operations::getExtendedHWAravaPtrs\n"));
 #if defined(UEFI_BUILD)
@@ -237,47 +255,49 @@ bool Fs4Operations::getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc, FB
     u_int32_t buff[s];
     struct image_layout_hw_pointers_carmel hw_pointers;
     u_int32_t physAddr = FS4_HW_PTR_START;
-    if (!IsBurningProcess) {
+    if (!IsBurningProcess)
+    {
         physAddr += _fwImgInfo.imgStart;
     }
-    READBUF((*ioAccess),
-        physAddr,
-        buff,
-        IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE,
-        "HW Arava Pointers");
+    READBUF((*ioAccess), physAddr, buff, IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE, "HW Arava Pointers");
 
     // Fix pointers that are 0xFFFFFFFF
-    for (unsigned int k = 0; k < s; k += 2) {
-        if (buff[k] == 0xFFFFFFFF){            
-            buff[k] = 0;    // Fix pointer            
-            buff[k+1] = 0;  // Fix CRC
+    for (unsigned int k = 0; k < s; k += 2)
+    {
+        if (buff[k] == 0xFFFFFFFF)
+        {
+            buff[k] = 0;     // Fix pointer
+            buff[k + 1] = 0; // Fix CRC
         }
     }
 
-    image_layout_hw_pointers_carmel_unpack(&hw_pointers, (u_int8_t *)buff);
+    image_layout_hw_pointers_carmel_unpack(&hw_pointers, (u_int8_t*)buff);
 
     //- Check CRC of each pointers (always check CRC before you call ToCPU
-    for (unsigned int k = 0; k < s; k += 2) {
-        u_int32_t *tempBuff = (u_int32_t *)buff;
-        //Calculate HW CRC:
-        u_int32_t calcPtrCRC = calc_hw_crc((u_int8_t *)((u_int32_t *)tempBuff + k), 6);
+    for (unsigned int k = 0; k < s; k += 2)
+    {
+        u_int32_t* tempBuff = (u_int32_t*)buff;
+        // Calculate HW CRC:
+        u_int32_t calcPtrCRC = calc_hw_crc((u_int8_t*)((u_int32_t*)tempBuff + k), 6);
         u_int32_t ptrCRC = tempBuff[k + 1];
         u_int32_t ptr = tempBuff[k];
         TOCPUn(&ptr, 1);
         TOCPUn(&ptrCRC, 1);
-        if (!DumpFs3CRCCheck(FS4_HW_PTR, physAddr + 4 * k, IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE, calcPtrCRC,
-            ptrCRC, false, verifyCallBackFunc)) {
+        if (!DumpFs3CRCCheck(FS4_HW_PTR, physAddr + 4 * k, IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE, calcPtrCRC, ptrCRC,
+                             false, verifyCallBackFunc))
+        {
             return false;
         }
     }
 
-    //CodeView: generate tools_layout
+    // CodeView: generate tools_layout
     _boot_record_ptr = hw_pointers.boot_record_ptr.ptr;
     _boot2_ptr = hw_pointers.boot2_ptr.ptr;
     _itoc_ptr = hw_pointers.toc_ptr.ptr;
     _tools_ptr = hw_pointers.tools_ptr.ptr;
 
-    if (isVerify == false) {
+    if (isVerify == false)
+    {
         _authentication_start_ptr = hw_pointers.authentication_start_pointer.ptr;
         _authentication_end_ptr = hw_pointers.authentication_end_pointer.ptr;
         _digest_mdk_ptr = hw_pointers.digest_pointer.ptr;
@@ -294,19 +314,22 @@ bool Fs4Operations::getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc, FB
 #endif
 }
 
-bool Fs4Operations::openEncryptedImageAccess(const char* encrypted_image_path) {
+bool Fs4Operations::openEncryptedImageAccess(const char* encrypted_image_path)
+{
     DPRINTF(("Fs4Operations::openEncryptedImageAccess\n"));
     // After this method is done we won't be able verify 'this' (nonencrypted) image
     // since we'll replace its read/write with the encrypted image
     // so we we'll verify it now just to make sure it's valid
     //* Verify nonencrypted image
-    if (!FsIntQueryAux()) {
+    if (!FsIntQueryAux())
+    {
         return errmsg("Failed to verify nonencrypted image");
     }
 
     //* Create io access to the encrypted image
     _encrypted_image_io_access = new FImage;
-    if (!_encrypted_image_io_access->open(encrypted_image_path, false, false)) {
+    if (!_encrypted_image_io_access->open(encrypted_image_path, false, false))
+    {
         delete _encrypted_image_io_access;
         return errmsg("Failed to open image %s", encrypted_image_path);
     }
@@ -315,9 +338,8 @@ bool Fs4Operations::openEncryptedImageAccess(const char* encrypted_image_path) {
 
 bool Fs4Operations::getExtendedHWPtrs(VerifyCallBack verifyCallBackFunc, FBase* ioAccess, bool IsBurningProcess)
 {
-
-    //TODO
-    //printf("1=0x%x 2=0x%x\n", _fwImgInfo.supportedHwId[0], CX6_HW_ID);
+    // TODO
+    // printf("1=0x%x 2=0x%x\n", _fwImgInfo.supportedHwId[0], CX6_HW_ID);
     /*if (_fwImgInfo.supportedHwId[0] != CX6_HW_ID) {
         return errmsg("Extended HW pointers are only for ConnectX-6\n");
     }*/
@@ -326,33 +348,32 @@ bool Fs4Operations::getExtendedHWPtrs(VerifyCallBack verifyCallBackFunc, FBase*
     u_int32_t buff[s];
     struct cx6fw_hw_pointers hw_pointers;
     u_int32_t physAddr = FS4_HW_PTR_START;
-    if (!IsBurningProcess) {
+    if (!IsBurningProcess)
+    {
         physAddr += _fwImgInfo.imgStart;
     }
 
-    READBUF((*ioAccess),
-            physAddr,
-            buff,
-            IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE,
-            "HW Pointers");
-    cx6fw_hw_pointers_unpack(&hw_pointers, (u_int8_t *)buff);
+    READBUF((*ioAccess), physAddr, buff, IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE, "HW Pointers");
+    cx6fw_hw_pointers_unpack(&hw_pointers, (u_int8_t*)buff);
 
     //- Check CRC of each pointers (always check CRC before you call ToCPU
-    for (unsigned int k = 0; k < s; k += 2) {
-        u_int32_t *tempBuff = (u_int32_t *) buff;
-        //Calculate HW CRC:
-        u_int32_t calcPtrCRC = calc_hw_crc((u_int8_t *)((u_int32_t *)tempBuff + k), 6);
+    for (unsigned int k = 0; k < s; k += 2)
+    {
+        u_int32_t* tempBuff = (u_int32_t*)buff;
+        // Calculate HW CRC:
+        u_int32_t calcPtrCRC = calc_hw_crc((u_int8_t*)((u_int32_t*)tempBuff + k), 6);
         u_int32_t ptrCRC = tempBuff[k + 1];
         u_int32_t ptr = tempBuff[k];
         TOCPUn(&ptr, 1);
         TOCPUn(&ptrCRC, 1);
-        if (!DumpFs3CRCCheck(FS4_HW_PTR, physAddr + 4 * k, IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE, calcPtrCRC,
-                             ptrCRC, false, verifyCallBackFunc)) {
+        if (!DumpFs3CRCCheck(FS4_HW_PTR, physAddr + 4 * k, IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE, calcPtrCRC, ptrCRC,
+                             false, verifyCallBackFunc))
+        {
             return false;
         }
     }
 
-    //CodeView: generate tools_layout
+    // CodeView: generate tools_layout
     _boot2_ptr = hw_pointers.boot2_ptr.ptr;
     _itoc_ptr = hw_pointers.toc_ptr.ptr;
     _tools_ptr = hw_pointers.tools_ptr.ptr;
@@ -379,17 +400,18 @@ bool Fs4Operations::verifyToolsArea(VerifyCallBack verifyCallBackFunc)
     struct image_layout_tools_area tools_area;
 
     READBUF((*_ioAccess), physAddr, buff, IMAGE_LAYOUT_TOOLS_AREA_SIZE, "Tools Area");
-    image_layout_tools_area_unpack(&tools_area, (u_int8_t *)buff);
+    image_layout_tools_area_unpack(&tools_area, (u_int8_t*)buff);
 
     binVerMinor = tools_area.bin_ver_minor;
     binVerMajor = tools_area.bin_ver_major;
     _maxImgLog2Size = tools_area.log2_img_slot_size;
     toolsAreaCRC = tools_area.crc;
 
-    calculatedToolsAreaCRC = CalcImageCRC((u_int32_t *)buff, IMAGE_LAYOUT_TOOLS_AREA_SIZE / 4 - 1);
+    calculatedToolsAreaCRC = CalcImageCRC((u_int32_t*)buff, IMAGE_LAYOUT_TOOLS_AREA_SIZE / 4 - 1);
 
-    if (!DumpFs3CRCCheck(FS4_TOOLS_AREA, physAddr, IMAGE_LAYOUT_TOOLS_AREA_SIZE, calculatedToolsAreaCRC,
-                         toolsAreaCRC, false, verifyCallBackFunc)) {
+    if (!DumpFs3CRCCheck(FS4_TOOLS_AREA, physAddr, IMAGE_LAYOUT_TOOLS_AREA_SIZE, calculatedToolsAreaCRC, toolsAreaCRC,
+                         false, verifyCallBackFunc))
+    {
         return false;
     }
 
@@ -400,20 +422,24 @@ bool Fs4Operations::verifyToolsArea(VerifyCallBack verifyCallBackFunc)
        printf("-D- Expected tools area CRC=%d\n", calculatedToolsAreaCRC);*/
 
     //- Check if binary version is supported by the tool
-    if (!CheckBinVersion(binVerMajor, binVerMinor)) {
+    if (!CheckBinVersion(binVerMajor, binVerMinor))
+    {
         return false;
     }
 
-    //Put info
-    if (_maxImgLog2Size == 0x16 && _fwImgInfo.imgStart == 0x800000) {
+    // Put info
+    if (_maxImgLog2Size == 0x16 && _fwImgInfo.imgStart == 0x800000)
+    {
         _fwImgInfo.cntxLog2ChunkSize = 0x17;
-    } else {
+    }
+    else
+    {
         _fwImgInfo.cntxLog2ChunkSize = _maxImgLog2Size;
     }
-    DPRINTF(("_fwImgInfo.cntxLog2ChunkSize = 0x%x\n",_fwImgInfo.cntxLog2ChunkSize));
+    DPRINTF(("_fwImgInfo.cntxLog2ChunkSize = 0x%x\n", _fwImgInfo.cntxLog2ChunkSize));
     _fwImgInfo.ext_info.is_failsafe = true;
     DPRINTF(("_fwImgInfo.ext_info.is_failsafe = true\n"));
-    _fwImgInfo.actuallyFailsafe  = true;
+    _fwImgInfo.actuallyFailsafe = true;
     DPRINTF(("_fwImgInfo.actuallyFailsafe  = true\n"));
     _fwImgInfo.magicPatternFound = 1;
     DPRINTF(("_fwImgInfo.magicPatternFound = 1\n"));
@@ -423,7 +449,6 @@ bool Fs4Operations::verifyToolsArea(VerifyCallBack verifyCallBackFunc)
 
 bool Fs4Operations::verifyTocHeader(u_int32_t tocAddr, bool isDtoc, VerifyCallBack verifyCallBackFunc)
 {
-
     struct image_layout_itoc_header itocHeader;
     u_int8_t buffer[TOC_HEADER_SIZE];
     u_int32_t physAddr;
@@ -436,27 +461,30 @@ bool Fs4Operations::verifyTocHeader(u_int32_t tocAddr, bool isDtoc, VerifyCallBa
     READBUF((*_ioAccess), tocAddr, buffer, TOC_HEADER_SIZE, "TOC Header");
     Fs3UpdateImgCache(buffer, tocAddr, TOC_HEADER_SIZE);
     image_layout_itoc_header_unpack(&itocHeader, buffer);
-    //TODO: check if we really need this:
-    if (isDtoc) {
+    // TODO: check if we really need this:
+    if (isDtoc)
+    {
         memcpy(_fs4ImgInfo.dtocArr.tocHeader, buffer, IMAGE_LAYOUT_ITOC_HEADER_SIZE);
-    } else {
+    }
+    else
+    {
         memcpy(_fs4ImgInfo.itocArr.tocHeader, buffer, IMAGE_LAYOUT_ITOC_HEADER_SIZE);
     }
 
     // Check the signature in the header:
-    u_int32_t first_signature =   isDtoc ? DTOC_ASCII : ITOC_ASCII;
-    if (!CheckTocSignature(&itocHeader, first_signature)) {
+    u_int32_t first_signature = isDtoc ? DTOC_ASCII : ITOC_ASCII;
+    if (!CheckTocSignature(&itocHeader, first_signature))
+    {
         return false;
     }
 
-    tocCrc = CalcImageCRC((u_int32_t *)buffer, (TOC_HEADER_SIZE / 4) - 1);
-    physAddr = _ioAccess->get_phys_from_cont(
-        tocAddr,
-        isDtoc ? 0 : _fwImgInfo.cntxLog2ChunkSize,
-        _fwImgInfo.imgStart != 0);
+    tocCrc = CalcImageCRC((u_int32_t*)buffer, (TOC_HEADER_SIZE / 4) - 1);
+    physAddr =
+      _ioAccess->get_phys_from_cont(tocAddr, isDtoc ? 0 : _fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
 
-    if (!DumpFs3CRCCheck(isDtoc ? FS3_DTOC : FS3_ITOC, physAddr, TOC_HEADER_SIZE, tocCrc,
-                         itocHeader.itoc_entry_crc, false, verifyCallBackFunc)) {
+    if (!DumpFs3CRCCheck(isDtoc ? FS3_DTOC : FS3_ITOC, physAddr, TOC_HEADER_SIZE, tocCrc, itocHeader.itoc_entry_crc,
+                         false, verifyCallBackFunc))
+    {
         return false;
     }
 
@@ -469,22 +497,26 @@ bool Fs4Operations::verifyTocHeader(u_int32_t tocAddr, bool isDtoc, VerifyCallBa
     1. Complete line is 0x0 (including the 4B CRC) --> handle it the same as other line, remove the last 4B
     2. Leftover (not a complete line at the end) --> keep it as is
 */
-void Fs4Operations::RemoveCRCsFromMainSection(vector<u_int8_t>& img) {
+void Fs4Operations::RemoveCRCsFromMainSection(vector<u_int8_t>& img)
+{
     //* Get MAIN section ITOC entry
     struct fs4_toc_info* main_itoc_entry = NULL;
-    fs4_toc_info *itoc_entries = _fs4ImgInfo.itocArr.tocArr;
-    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++) {
-        if (itoc_entries[i].toc_entry.cache_line_crc) {
+    fs4_toc_info* itoc_entries = _fs4ImgInfo.itocArr.tocArr;
+    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        if (itoc_entries[i].toc_entry.cache_line_crc)
+        {
             main_itoc_entry = &(itoc_entries[i]);
             break;
         }
     }
-    if (main_itoc_entry == NULL) {
+    if (main_itoc_entry == NULL)
+    {
         return;
     }
 
     u_int32_t main_addr = main_itoc_entry->toc_entry.flash_addr << 2; // addr in entry is in DW
-    u_int32_t main_size = main_itoc_entry->toc_entry.size << 2; // size in entry is in DW
+    u_int32_t main_size = main_itoc_entry->toc_entry.size << 2;       // size in entry is in DW
 
     vector<u_int8_t> tmp_img;
     tmp_img.reserve(img.size());
@@ -495,14 +527,18 @@ void Fs4Operations::RemoveCRCsFromMainSection(vector<u_int8_t>& img) {
     //* Copying MAIN section without CRCs
     const u_int32_t MAIN_LINE_SIZE = 68; // Line in MAIN is 64B data + 4B crc
     const u_int32_t MAIN_LINE_DATA_ONLY_SIZE = MAIN_LINE_SIZE - 4;
-    for (u_int32_t offset = 0; offset < main_size; offset += MAIN_LINE_SIZE) {
+    for (u_int32_t offset = 0; offset < main_size; offset += MAIN_LINE_SIZE)
+    {
         u_int32_t line_start_addr = main_addr + offset;
-        if (offset + MAIN_LINE_SIZE > main_size) {
+        if (offset + MAIN_LINE_SIZE > main_size)
+        {
             // In case last line isn't a full line there will be no CRC
             tmp_img.insert(tmp_img.end(), img.begin() + line_start_addr, img.begin() + main_addr + main_size);
         }
-        else {
-            tmp_img.insert(tmp_img.end(), img.begin() + line_start_addr, img.begin() + line_start_addr + MAIN_LINE_DATA_ONLY_SIZE);
+        else
+        {
+            tmp_img.insert(tmp_img.end(), img.begin() + line_start_addr,
+                           img.begin() + line_start_addr + MAIN_LINE_DATA_ONLY_SIZE);
         }
     }
 
@@ -515,9 +551,11 @@ void Fs4Operations::RemoveCRCsFromMainSection(vector<u_int8_t>& img) {
 /*
     This function responsible on removing boot-record last 4B of CRC
 */
-bool Fs4Operations::MaskBootRecordCRC(vector<u_int8_t>& img) {
+bool Fs4Operations::MaskBootRecordCRC(vector<u_int8_t>& img)
+{
     u_int32_t boot_record_size_without_crc = 0;
-    if (!getBootRecordSize(boot_record_size_without_crc)) {
+    if (!getBootRecordSize(boot_record_size_without_crc))
+    {
         return errmsg("Failed to get boot_record size\n");
     }
     u_int32_t boot_record_crc_addr = _boot_record_ptr + boot_record_size_without_crc;
@@ -526,19 +564,25 @@ bool Fs4Operations::MaskBootRecordCRC(vector<u_int8_t>& img) {
     return true;
 }
 
-bool Fs4Operations::GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_t>& img) {
-    if (!Fs3Operations::GetImageDataForSign(shaType, img)) {
+bool Fs4Operations::GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_t>& img)
+{
+    if (!Fs3Operations::GetImageDataForSign(shaType, img))
+    {
         return false;
     }
 
     //* In case of security version 2 (Carmel onwards) we'll ignore MAIN CRCs for fw-update signature
-    if (getSecureBootSignVersion() == VERSION_2) {
-        // Removal order is critical, we must remove from the end of the image to its start (first MAIN then boot-record)
-        // since lower addresses won't be affected by erasing data from higher addresses
+    if (getSecureBootSignVersion() == VERSION_2)
+    {
+        // Removal order is critical, we must remove from the end of the image to its start (first MAIN then
+        // boot-record) since lower addresses won't be affected by erasing data from higher addresses
         RemoveCRCsFromMainSection(img);
-        //* In case of devices after Carmel we'll ignore boot-record CRC for fw-update signature same as secure-boot signature
-        if (getChipType(_fwImgInfo.supportedHwId[0]) != CT_CONNECTX7) {
-            if (!MaskBootRecordCRC(img)) {
+        //* In case of devices after Carmel we'll ignore boot-record CRC for fw-update signature same as secure-boot
+        // signature
+        if (getChipType(_fwImgInfo.supportedHwId[0]) != CT_CONNECTX7)
+        {
+            if (!MaskBootRecordCRC(img))
+            {
                 return false;
             }
         }
@@ -547,29 +591,37 @@ bool Fs4Operations::GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_
     return true;
 }
 
-bool Fs4Operations::FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc,
-    bool verbose, bool ignoreImageStart)
+bool Fs4Operations::FwExtract4MBImage(vector<u_int8_t>& img,
+                                      bool maskMagicPatternAndDevToc,
+                                      bool verbose,
+                                      bool ignoreImageStart)
 {
     bool res = false;
 
     bool image_encrypted = false;
-    if (!isEncrypted(image_encrypted)) {
+    if (!isEncrypted(image_encrypted))
+    {
         return errmsg(getErrorCode(), "%s", err());
     }
-    if (_encrypted_image_io_access or image_encrypted) {
+    if (_encrypted_image_io_access or image_encrypted)
+    {
         res = FwExtractEncryptedImage(img, maskMagicPatternAndDevToc, verbose, ignoreImageStart);
     }
-    else {
+    else
+    {
         res = Fs3Operations::FwExtract4MBImage(img, maskMagicPatternAndDevToc, verbose, ignoreImageStart);
     }
 
     return res;
 }
 
-bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr, bool show_itoc, bool isDtoc,
-                                     struct QueryOptions queryOptions, VerifyCallBack verifyCallBackFunc, bool verbose)
+bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr,
+                                     bool show_itoc,
+                                     bool isDtoc,
+                                     struct QueryOptions queryOptions,
+                                     VerifyCallBack verifyCallBackFunc,
+                                     bool verbose)
 {
-
     struct image_layout_itoc_entry tocEntry;
     int section_index = 0;
     u_int32_t entryAddr;
@@ -580,49 +632,55 @@ bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr, bool show_itoc, bool isD
     bool mfgExists = false;
     int validDevInfoCount = 0;
     bool retVal = true;
-    TocArray *tocArray;
+    TocArray* tocArray;
 
-    if (isDtoc) {
+    if (isDtoc)
+    {
         tocArray = &(_fs4ImgInfo.dtocArr);
-    } else {
+    }
+    else
+    {
         tocArray = &(_fs4ImgInfo.itocArr);
     }
 
-    do {
+    do
+    {
         // Read toc entry
-        if (nextBootFwVer) {
+        if (nextBootFwVer)
+        {
             // if nextBootFwVer is true, read only fw version (FS3_IMAGE_INFO section)
             // section index should be 8 for this case
             section_index = 8;
         }
 
-        entryAddr = tocAddr + TOC_HEADER_SIZE + section_index *  TOC_ENTRY_SIZE;
-        if (!(*_ioAccess).read(entryAddr, entryBuffer, TOC_ENTRY_SIZE, verbose)) {
+        entryAddr = tocAddr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
+        if (!(*_ioAccess).read(entryAddr, entryBuffer, TOC_ENTRY_SIZE, verbose))
+        {
             return errmsg("%s - read error (%s)\n", "TOC Entry", (*_ioAccess).err());
         }
 
         Fs3UpdateImgCache(entryBuffer, entryAddr, TOC_ENTRY_SIZE);
         image_layout_itoc_entry_unpack(&tocEntry, entryBuffer);
-        if (tocEntry.type == FS3_MFG_INFO) {
+        if (tocEntry.type == FS3_MFG_INFO)
+        {
             mfgExists = true;
         }
 
-        if (tocEntry.type != FS3_END) {
-            if (section_index + 1 >= MAX_TOCS_NUM) {
-                return errmsg(
-                    "Internal error: number of %s %d is greater than allowed %d",
-                    isDtoc ? "DTocs" : "ITocs",
-                    section_index + 1,
-                    MAX_TOCS_NUM);
+        if (tocEntry.type != FS3_END)
+        {
+            if (section_index + 1 >= MAX_TOCS_NUM)
+            {
+                return errmsg("Internal error: number of %s %d is greater than allowed %d",
+                              isDtoc ? "DTocs" : "ITocs",
+                              section_index + 1,
+                              MAX_TOCS_NUM);
             }
 
-            entryCrc = CalcImageCRC((u_int32_t *)entryBuffer, (TOC_ENTRY_SIZE / 4) - 1);
-            if (tocEntry.itoc_entry_crc != entryCrc) {
-                return errmsg(
-                    MLXFW_BAD_CRC_ERR, "Bad %s Entry CRC. Expected: 0x%x , Actual: 0x%x",
-                    isDtoc ? "DToc" : "IToc",
-                    tocEntry.itoc_entry_crc,
-                    entryCrc);
+            entryCrc = CalcImageCRC((u_int32_t*)entryBuffer, (TOC_ENTRY_SIZE / 4) - 1);
+            if (tocEntry.itoc_entry_crc != entryCrc)
+            {
+                return errmsg(MLXFW_BAD_CRC_ERR, "Bad %s Entry CRC. Expected: 0x%x , Actual: 0x%x",
+                              isDtoc ? "DToc" : "IToc", tocEntry.itoc_entry_crc, entryCrc);
             }
 
             entrySizeInBytes = tocEntry.size * 4;
@@ -630,134 +688,158 @@ bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr, bool show_itoc, bool isD
             // Update last image address
             u_int32_t section_last_addr;
             u_int32_t flash_addr = tocEntry.flash_addr << 2;
-            if (isDtoc) {
+            if (isDtoc)
+            {
                 physAddr = flash_addr;
                 _fs4ImgInfo.smallestDTocAddr =
-                    (_fs4ImgInfo.smallestDTocAddr < flash_addr && _fs4ImgInfo.smallestDTocAddr > 0)
-                    ? _fs4ImgInfo.smallestDTocAddr : flash_addr;
-            } else {
-                physAddr = _ioAccess->get_phys_from_cont(flash_addr,
-                                                         _fwImgInfo.cntxLog2ChunkSize,
-                                                         _fwImgInfo.imgStart != 0);
+                  (_fs4ImgInfo.smallestDTocAddr < flash_addr && _fs4ImgInfo.smallestDTocAddr > 0) ?
+                    _fs4ImgInfo.smallestDTocAddr :
+                    flash_addr;
+            }
+            else
+            {
+                physAddr =
+                  _ioAccess->get_phys_from_cont(flash_addr, _fwImgInfo.cntxLog2ChunkSize, _fwImgInfo.imgStart != 0);
                 section_last_addr = physAddr + entrySizeInBytes;
                 _fwImgInfo.lastImageAddr =
-                    (_fwImgInfo.lastImageAddr >= section_last_addr) ?
-                    _fwImgInfo.lastImageAddr : section_last_addr;
+                  (_fwImgInfo.lastImageAddr >= section_last_addr) ? _fwImgInfo.lastImageAddr : section_last_addr;
             }
 
-            if (IsFs3SectionReadable(tocEntry.type, queryOptions)) {
-
+            if (IsFs3SectionReadable(tocEntry.type, queryOptions))
+            {
                 // Only when we have full verify or the info of this section should be collected for query
                 std::vector<u_int8_t> buffv(entrySizeInBytes);
-                u_int8_t *buff = (u_int8_t *)(buffv.size() ? (&(buffv[0])) : NULL);
+                u_int8_t* buff = (u_int8_t*)(buffv.size() ? (&(buffv[0])) : NULL);
 
-                if (show_itoc) {
+                if (show_itoc)
+                {
                     image_layout_itoc_entry_dump(&tocEntry, stdout);
-                    if (!DumpFs3CRCCheck(tocEntry.type, physAddr, entrySizeInBytes, 0,
-                                         0, true, verifyCallBackFunc)) {
+                    if (!DumpFs3CRCCheck(tocEntry.type, physAddr, entrySizeInBytes, 0, 0, true, verifyCallBackFunc))
+                    {
                         retVal = false;
                     }
-                } else {
+                }
+                else
+                {
                     //* Choosing the correct io access to read from
                     FBase* io = _ioAccess;
-                    if (_encrypted_image_io_access) {
+                    if (_encrypted_image_io_access)
+                    {
                         io = _encrypted_image_io_access; // If encrypted image was given we'll read from it
                     }
                     DPRINTF(("Fs4Operations::verifyTocEntries reading %s %s section from %simage\n",
-                            GetSectionNameByType(tocEntry.type),
-                            isDtoc ? "DTOC" : "ITOC",
-                            _encrypted_image_io_access ? "encrypted " : ""));
+                             GetSectionNameByType(tocEntry.type),
+                             isDtoc ? "DTOC" : "ITOC",
+                             _encrypted_image_io_access ? "encrypted " : ""));
 
-                    if (!(*io).read(flash_addr, buff, entrySizeInBytes, verbose)) {
+                    if (!(*io).read(flash_addr, buff, entrySizeInBytes, verbose))
+                    {
                         return errmsg("%s - read error (%s)\n", "Section", (*io).err());
                     }
 
                     Fs3UpdateImgCache(buff, flash_addr, entrySizeInBytes);
                     u_int32_t sect_act_crc = 0;
                     u_int32_t sect_exp_crc = 0;
-                    if (tocEntry.crc == INITOCENTRY) {
-                        //crc is in the itoc entry
-                        sect_act_crc = CalcImageCRC((u_int32_t *)buff, tocEntry.size);
+                    if (tocEntry.crc == INITOCENTRY)
+                    {
+                        // crc is in the itoc entry
+                        sect_act_crc = CalcImageCRC((u_int32_t*)buff, tocEntry.size);
                         sect_exp_crc = tocEntry.section_crc;
-                        //printf("-D-INITOCENTRY sect_act_crc=%d sect_exp_crc=%d\n", sect_act_crc, sect_exp_crc);
-                    } else if (tocEntry.crc == INSECTION) {
-                        //calc crc on the section without the last dw which contains crc
-                        sect_act_crc = CalcImageCRC((u_int32_t *)buff, tocEntry.size - 1);
-                        //crc is in the section, last two bytes
-                        sect_exp_crc = ((u_int32_t *)buff)[tocEntry.size - 1];
+                        // printf("-D-INITOCENTRY sect_act_crc=%d sect_exp_crc=%d\n", sect_act_crc, sect_exp_crc);
+                    }
+                    else if (tocEntry.crc == INSECTION)
+                    {
+                        // calc crc on the section without the last dw which contains crc
+                        sect_act_crc = CalcImageCRC((u_int32_t*)buff, tocEntry.size - 1);
+                        // crc is in the section, last two bytes
+                        sect_exp_crc = ((u_int32_t*)buff)[tocEntry.size - 1];
                         TOCPU1(sect_exp_crc)
-                        sect_exp_crc = (u_int16_t) sect_exp_crc;
-                        //printf("-D-INSECTION sect_act_crc=%d sect_exp_crc=%d\n", sect_act_crc, sect_exp_crc);
+                        sect_exp_crc = (u_int16_t)sect_exp_crc;
+                        // printf("-D-INSECTION sect_act_crc=%d sect_exp_crc=%d\n", sect_act_crc, sect_exp_crc);
                     }
 
-                    if (tocEntry.type != FS3_DEV_INFO || CheckDevInfoSignature((u_int32_t *)buff)) {
-
-                        // Check if a cache_line_crc section (Ex. MAIN_CODE) is encrypted (has 4B AUTH-TAG) or not (has 2B CRC)
+                    if (tocEntry.type != FS3_DEV_INFO || CheckDevInfoSignature((u_int32_t*)buff))
+                    {
+                        // Check if a cache_line_crc section (Ex. MAIN_CODE) is encrypted (has 4B AUTH-TAG) or not (has
+                        // 2B CRC)
                         bool is_encrypted_cache_line_crc_section = false;
-                        if (tocEntry.cache_line_crc == 1) {
-                            u_int32_t first_line_crc_or_authtag = ((u_int32_t *)buff)[16]; // DWORD 16 is CRC or AUTH-TAG
+                        if (tocEntry.cache_line_crc == 1)
+                        {
+                            u_int32_t first_line_crc_or_authtag = ((u_int32_t*)buff)[16]; // DWORD 16 is CRC or AUTH-TAG
                             TOCPU1(first_line_crc_or_authtag)
                             bool is_authtag = (first_line_crc_or_authtag & 0xffff0000) != 0x0;
-                            is_encrypted_cache_line_crc_section = is_authtag; // if encrypted section will have auth-tag 
+                            is_encrypted_cache_line_crc_section = is_authtag; // if encrypted section will have auth-tag
                         }
 
-
-                        bool ignore_crc = (tocEntry.crc == NOCRC) || is_encrypted_cache_line_crc_section; // In case of encrypted MAIN_CODE section we'll ignore CRC
-                        if (!_encrypted_image_io_access && // In case of encrypted image we don't want to check section CRC
-                            !DumpFs3CRCCheck(tocEntry.type,
-                                            physAddr,
-                                            entrySizeInBytes,
-                                            sect_act_crc,
-                                            sect_exp_crc,
-                                            ignore_crc, verifyCallBackFunc)) {
-                            if (isDtoc) {
+                        bool ignore_crc = (tocEntry.crc == NOCRC) ||
+                                          is_encrypted_cache_line_crc_section; // In case of encrypted MAIN_CODE section
+                                                                               // we'll ignore CRC
+                        if (!_encrypted_image_io_access && // In case of encrypted image we don't want to check section
+                                                           // CRC
+                            !DumpFs3CRCCheck(tocEntry.type, physAddr, entrySizeInBytes, sect_act_crc, sect_exp_crc,
+                                             ignore_crc, verifyCallBackFunc))
+                        {
+                            if (isDtoc)
+                            {
                                 _badDevDataSections = true;
                             }
                             retVal = false;
-                        } else {
-                            //printf("-D- toc type : 0x%.8x\n" , toc_entry.type);
-                            GetSectData(tocArray->tocArr[section_index].section_data,
-                                        (u_int32_t *)buff, tocEntry.size * 4);
+                        }
+                        else
+                        {
+                            // printf("-D- toc type : 0x%.8x\n" , toc_entry.type);
+                            GetSectData(tocArray->tocArr[section_index].section_data, (u_int32_t*)buff,
+                                        tocEntry.size * 4);
                             bool isDevInfoSection = (tocEntry.type == FS3_DEV_INFO);
-                            bool isDevInfoValid = isDevInfoSection && CheckDevInfoSignature((u_int32_t *)buff);
-                            if (isDevInfoValid) {
+                            bool isDevInfoValid = isDevInfoSection && CheckDevInfoSignature((u_int32_t*)buff);
+                            if (isDevInfoValid)
+                            {
                                 validDevInfoCount++;
                             }
-                            if (!isDevInfoSection || isDevInfoValid) {
-                                if (IsGetInfoSupported(tocEntry.type)) {
-                                    u_int8_t *section_buff;
+                            if (!isDevInfoSection || isDevInfoValid)
+                            {
+                                if (IsGetInfoSupported(tocEntry.type))
+                                {
+                                    u_int8_t* section_buff;
                                     section_buff = buff;
                                     vector<u_int8_t> non_encrypted_buff;
-                                    if (_encrypted_image_io_access) {
+                                    if (_encrypted_image_io_access)
+                                    {
                                         // In case of encrypted image, parsing info section from the non-encrypted image
                                         non_encrypted_buff.resize(tocEntry.size * 4);
-                                        READBUF((*_ioAccess), flash_addr, non_encrypted_buff.data(), entrySizeInBytes, "Section");
+                                        READBUF((*_ioAccess), flash_addr, non_encrypted_buff.data(), entrySizeInBytes,
+                                                "Section");
                                         section_buff = non_encrypted_buff.data();
                                     }
-                                    if (!GetImageInfoFromSection(section_buff, tocEntry.type, tocEntry.size * 4)) {
+                                    if (!GetImageInfoFromSection(section_buff, tocEntry.type, tocEntry.size * 4))
+                                    {
                                         retVal = false;
-                                        errmsg("Failed to get info from section %d, check the supported_hw_id section in MLX file!\n", tocEntry.type);
+                                        errmsg(
+                                          "Failed to get info from section %d, check the supported_hw_id section in MLX file!\n",
+                                          tocEntry.type);
                                     }
-                                } else if (tocEntry.type == FS3_DBG_FW_INI) {
+                                }
+                                else if (tocEntry.type == FS3_DBG_FW_INI)
+                                {
                                     TOCPUn(buff, tocEntry.size);
-                                    GetSectData(_fwConfSect, (u_int32_t *)buff, tocEntry.size * 4);
+                                    GetSectData(_fwConfSect, (u_int32_t*)buff, tocEntry.size * 4);
                                 }
                             }
                         }
-                    } else {
-                        GetSectData(tocArray->tocArr[section_index].section_data,
-                                    (u_int32_t *)buff, tocEntry.size * 4);
+                    }
+                    else
+                    {
+                        GetSectData(tocArray->tocArr[section_index].section_data, (u_int32_t*)buff, tocEntry.size * 4);
                     }
                 }
             }
 
             tocArray->tocArr[section_index].entry_addr = entryAddr;
             tocArray->tocArr[section_index].toc_entry = tocEntry;
-            memcpy(tocArray->tocArr[section_index].data,
-                   entryBuffer, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
-
+            memcpy(tocArray->tocArr[section_index].data, entryBuffer, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
         }
-        if (nextBootFwVer) {
+        if (nextBootFwVer)
+        {
             // if nextBootFwVer, return after reading fw version
             break;
         }
@@ -766,21 +848,24 @@ bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr, bool show_itoc, bool isD
 
     tocArray->numOfTocs = section_index - 1;
 
-    if (isDtoc) {
-        if (!mfgExists) {
+    if (isDtoc)
+    {
+        if (!mfgExists)
+        {
             _badDevDataSections = true;
             return errmsg(MLXFW_NO_MFG_ERR, "No \"" MFG_INFO "\" info section.");
         }
-        //when you start checking device info signatures => uncomment this code
+        // when you start checking device info signatures => uncomment this code
         if (validDevInfoCount != 1 && !show_itoc &&
             (_readSectList.size() == 0 ||
-             find(_readSectList.begin(), _readSectList.end(), FS3_DEV_INFO) != _readSectList.end())
-            ) {
+             find(_readSectList.begin(), _readSectList.end(), FS3_DEV_INFO) != _readSectList.end()))
+        {
             _badDevDataSections = true;
-            if (validDevInfoCount == 0) {
+            if (validDevInfoCount == 0)
+            {
                 return errmsg(MLXFW_NO_VALID_DEVICE_INFO_ERR, "No \"" DEV_INFO "\" info section.");
             }
-            //more than one valid devinfo:
+            // more than one valid devinfo:
             return errmsg(MLXFW_TWO_VALID_DEVICE_INFO_ERR, "Two \"" DEV_INFO "\" info sections.");
         }
     }
@@ -788,17 +873,21 @@ bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr, bool show_itoc, bool isD
     return retVal;
 }
 
-bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_itoc,
-                                struct QueryOptions queryOptions, bool ignoreDToc, bool verbose)
+bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc,
+                                bool show_itoc,
+                                struct QueryOptions queryOptions,
+                                bool ignoreDToc,
+                                bool verbose)
 {
     DPRINTF(("Fs4Operations::FsVerifyAux\n"));
     u_int32_t dtocPtr;
-    u_int8_t *buff;
+    u_int8_t* buff;
     u_int32_t log2_chunk_size;
     bool is_image_in_odd_chunks;
 
     DPRINTF(("Fs4Operations::FsVerifyAux call getImgStart()\n"));
-    if (!getImgStart()) { // Set _fwImgInfo.imgStart with the image start address
+    if (!getImgStart())
+    { // Set _fwImgInfo.imgStart with the image start address
         return false;
     }
 
@@ -806,14 +895,18 @@ bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
 
     _ioAccess->set_address_convertor(0, 0);
     DPRINTF(("Fs4Operations::FsVerifyAux call getExtendedHWAravaPtrs()\n"));
-    if (!getExtendedHWAravaPtrs(verifyCallBackFunc, _ioAccess, false, true)) {
+    if (!getExtendedHWAravaPtrs(verifyCallBackFunc, _ioAccess, false, true))
+    {
         return false;
     }
 
-    // if nextBootFwVer is true, no need to get all the information, just the fw version is enough - therefore skip everything else
-    if (!nextBootFwVer) {
+    // if nextBootFwVer is true, no need to get all the information, just the fw version is enough - therefore skip
+    // everything else
+    if (!nextBootFwVer)
+    {
         DPRINTF(("Fs4Operations::FsVerifyAux call verifyToolsArea()\n"));
-        if (!verifyToolsArea(verifyCallBackFunc)) {
+        if (!verifyToolsArea(verifyCallBackFunc))
+        {
             return false;
         }
 
@@ -833,23 +926,29 @@ bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
         _fs4ImgInfo.itocArr.tocArrayAddr = _itoc_ptr;
 
         DPRINTF(("Fs4Operations::FsVerifyAux call isHashesTableHwPtrValid()\n"));
-        if (isHashesTableHwPtrValid()) {
+        if (isHashesTableHwPtrValid())
+        {
             const u_int32_t HASHES_TABLE_TAIL_SIZE = 8;
 
             //* Check hashes_table header CRC
-            READALLOCBUF((*_ioAccess), _hashes_table_ptr, buff, IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE, "HASHES TABLE HEADER");
+            READALLOCBUF((*_ioAccess), _hashes_table_ptr, buff, IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE,
+                         "HASHES TABLE HEADER");
             // Calculate CRC
-            u_int32_t hashes_table_header_calc_crc = CalcImageCRC((u_int32_t *)buff, (IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE / 4) - 1);
+            u_int32_t hashes_table_header_calc_crc =
+              CalcImageCRC((u_int32_t*)buff, (IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE / 4) - 1);
             // Read CRC
-            u_int32_t hashes_table_header_crc = ((u_int32_t *)buff)[(IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE / 4) - 1];
+            u_int32_t hashes_table_header_crc = ((u_int32_t*)buff)[(IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE / 4) - 1];
             free(buff);
             TOCPU1(hashes_table_header_crc)
             hashes_table_header_crc = hashes_table_header_crc & 0xFFFF;
             // Compare calculated crc with crc from image
-            if (hashes_table_header_calc_crc != hashes_table_header_crc) {
+            if (hashes_table_header_calc_crc != hashes_table_header_crc)
+            {
                 report_callback(verifyCallBackFunc, "%s /0x%08x/ - wrong CRC (exp:0x%x, act:0x%x)\n",
-                            "HASHES TABLE HEADER", _hashes_table_ptr + IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE - 4, hashes_table_header_calc_crc, hashes_table_header_crc);
-                if (!_fwParams.ignoreCrcCheck) {
+                                "HASHES TABLE HEADER", _hashes_table_ptr + IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE - 4,
+                                hashes_table_header_calc_crc, hashes_table_header_crc);
+                if (!_fwParams.ignoreCrcCheck)
+                {
                     return errmsg("Bad CRC");
                 }
             }
@@ -862,65 +961,70 @@ bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
             free(buff);
 
             //* Get hashes_table data
-            const u_int32_t hashes_table_size = IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE + IMAGE_LAYOUT_HTOC_HEADER_SIZE \
-                                            + MAX_HTOC_ENTRIES_NUM * (IMAGE_LAYOUT_HTOC_ENTRY_SIZE + header.hash_size) \
-                                            + HASHES_TABLE_TAIL_SIZE;
+            const u_int32_t hashes_table_size =
+              IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE + IMAGE_LAYOUT_HTOC_HEADER_SIZE +
+              MAX_HTOC_ENTRIES_NUM * (IMAGE_LAYOUT_HTOC_ENTRY_SIZE + header.hash_size) + HASHES_TABLE_TAIL_SIZE;
             READALLOCBUF((*_ioAccess), _hashes_table_ptr, buff, hashes_table_size, "HASHES TABLE");
 
             Fs3UpdateImgCache(buff, _hashes_table_ptr, hashes_table_size);
 
             //* Check hashes_table CRC
             // Calculate CRC
-            u_int32_t hashes_table_calc_crc = CalcImageCRC((u_int32_t *)buff, (hashes_table_size / 4) - 1);
+            u_int32_t hashes_table_calc_crc = CalcImageCRC((u_int32_t*)buff, (hashes_table_size / 4) - 1);
             // Read CRC
-            u_int32_t hashes_table_crc = ((u_int32_t *)buff)[(hashes_table_size / 4) - 1];
+            u_int32_t hashes_table_crc = ((u_int32_t*)buff)[(hashes_table_size / 4) - 1];
             TOCPU1(hashes_table_crc)
             hashes_table_crc = hashes_table_crc & 0xFFFF;
             free(buff);
             if (!DumpFs3CRCCheck(FS4_HASHES_TABLE, _hashes_table_ptr, hashes_table_size, hashes_table_calc_crc,
-                                hashes_table_crc, false, verifyCallBackFunc)) {
+                                 hashes_table_crc, false, verifyCallBackFunc))
+            {
                 return false;
             }
         }
 
         DPRINTF(("Fs4Operations::FsVerifyAux call verifyTocHeader() ITOC\n"));
-        if (!verifyTocHeader(_itoc_ptr, false, verifyCallBackFunc)) {
+        if (!verifyTocHeader(_itoc_ptr, false, verifyCallBackFunc))
+        {
             _itoc_ptr += FS4_DEFAULT_SECTOR_SIZE;
             _fs4ImgInfo.itocArr.tocArrayAddr = _itoc_ptr;
             _fs4ImgInfo.firstItocArrayIsEmpty = true;
-            if (!verifyTocHeader(_itoc_ptr, false, verifyCallBackFunc)) {
+            if (!verifyTocHeader(_itoc_ptr, false, verifyCallBackFunc))
+            {
                 return errmsg(MLXFW_NO_VALID_ITOC_ERR, "No valid ITOC Header was found.");
             }
         }
     }
-    if (_ioAccess->is_flash() == false && _signatureDataSet == false) {
-        //read the MDK HW pointed data from the image (binary file). Don't read from flash!
+    if (_ioAccess->is_flash() == false && _signatureDataSet == false)
+    {
+        // read the MDK HW pointed data from the image (binary file). Don't read from flash!
         int signature_size = 3 * HMAC_SIGNATURE_LENGTH;
-        uint8_t signature_data[3 * HMAC_SIGNATURE_LENGTH] = { 0 };
+        uint8_t signature_data[3 * HMAC_SIGNATURE_LENGTH] = {0};
         int signature_offset = _digest_mdk_ptr;
-        if (signature_offset == 0) {
+        if (signature_offset == 0)
+        {
             signature_offset = _digest_recovery_key_ptr;
         }
-        if (signature_offset != 0) {
-            READBUF((*_ioAccess),
-                signature_offset,
-                signature_data,
-                signature_size,
-                "Reading data pointed by HW MDK Pointer");
+        if (signature_offset != 0)
+        {
+            READBUF((*_ioAccess), signature_offset, signature_data, signature_size,
+                    "Reading data pointed by HW MDK Pointer");
 
             Fs3UpdateImgCache(signature_data, signature_offset, signature_size);
         }
         _signatureDataSet = true;
     }
     DPRINTF(("Fs4Operations::FsVerifyAux call verifyTocEntries() ITOC\n"));
-    if (!verifyTocEntries(_itoc_ptr, show_itoc, false,
-                          queryOptions, verifyCallBackFunc, verbose)) {
+    if (!verifyTocEntries(_itoc_ptr, show_itoc, false, queryOptions, verifyCallBackFunc, verbose))
+    {
         return false;
     }
-    if (nextBootFwVer) {
+    if (nextBootFwVer)
+    {
         return true;
     }
-    if (ignoreDToc) {
+    if (ignoreDToc)
+    {
         return true;
     }
     // Verify DTOC:
@@ -930,14 +1034,15 @@ bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
     //-Verify DToC Header:
     dtocPtr = _ioAccess->get_effective_size() - FS4_DEFAULT_SECTOR_SIZE;
     DPRINTF(("Fs4Operations::FsVerifyAux call verifyTocHeader() DTOC\n"));
-    if (!verifyTocHeader(dtocPtr, true, verifyCallBackFunc)) {
+    if (!verifyTocHeader(dtocPtr, true, verifyCallBackFunc))
+    {
         return errmsg(MLXFW_NO_VALID_ITOC_ERR, "No valid DTOC Header was found.");
     }
     _fs4ImgInfo.dtocArr.tocArrayAddr = dtocPtr;
     //-Verify DToC Entries:
     DPRINTF(("Fs4Operations::FsVerifyAux call verifyTocEntries() DTOC\n"));
-    if (!verifyTocEntries(dtocPtr, show_itoc, true,
-                          queryOptions, verifyCallBackFunc, verbose)) {
+    if (!verifyTocEntries(dtocPtr, show_itoc, true, queryOptions, verifyCallBackFunc, verbose))
+    {
         _ioAccess->set_address_convertor(log2_chunk_size, is_image_in_odd_chunks);
         return false;
     }
@@ -948,10 +1053,12 @@ bool Fs4Operations::FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_ito
 bool Fs4Operations::FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage, bool showItoc, bool ignoreDToc)
 {
     bool image_encrypted = false;
-    if (!isEncrypted(image_encrypted)) {
+    if (!isEncrypted(image_encrypted))
+    {
         return errmsg(getErrorCode(), "%s", err());
     }
-    if (image_encrypted) {
+    if (image_encrypted)
+    {
         return errmsg("Cannot verify an encrypted %s", _ioAccess->is_flash() ? "flash" : "image");
     }
 
@@ -973,65 +1080,75 @@ bool Fs4Operations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sect
     return Fs3Operations::FwGetSection(sectType, sectInfo);
 }
 
-bool Fs4Operations::GetImageInfo(u_int8_t *buff)
+bool Fs4Operations::GetImageInfo(u_int8_t* buff)
 {
     DPRINTF(("Fs4Operations::GetImageInfo call Fs3Operations::GetImageInfo\n"));
     bool success = Fs3Operations::GetImageInfo(buff);
 
     //* Fix burn_image_size if required (required only for BB first FW release)
-    if (success && !_ioAccess->is_flash()/*image*/) {
+    if (success && !_ioAccess->is_flash() /*image*/)
+    {
         DPRINTF(("Fs4Operations::GetImageInfo check if fix burn_image_size is required\n"));
         bool is_encrypted_image;
-        if (!IsEncryptedImage(is_encrypted_image)) {
+        if (!IsEncryptedImage(is_encrypted_image))
+        {
             return false;
         }
-        if ((is_encrypted_image || _encrypted_image_io_access) && _fwImgInfo.ext_info.burn_image_size == 0) {
+        if ((is_encrypted_image || _encrypted_image_io_access) && _fwImgInfo.ext_info.burn_image_size == 0)
+        {
             DPRINTF(("Fs4Operations::GetImageInfo read burn_image_size from the address 16MB\n"));
             //* Read burn_image_size from the address 16MB ("outside" the range that we burn)
-            u_int32_t burn_image_size; 
-            u_int8_t *buff;
+            u_int32_t burn_image_size;
+            u_int8_t* buff;
             //* Choosing the correct io to read from
             FBase* io = _ioAccess;
-            if (_encrypted_image_io_access) {
+            if (_encrypted_image_io_access)
+            {
                 io = _encrypted_image_io_access; // If encrypted image was given we'll read from it
             }
 
-            READALLOCBUF((*io), ENCRYPTED_BURN_IMAGE_SIZE_LOCATION_IN_BYTES, buff, 4, "IMAGE_LAST_ADDR"); // Reading DWORD from addr 16MB
+            READALLOCBUF((*io), ENCRYPTED_BURN_IMAGE_SIZE_LOCATION_IN_BYTES, buff, 4,
+                         "IMAGE_LAST_ADDR"); // Reading DWORD from addr 16MB
             burn_image_size = ((u_int32_t*)buff)[0];
             TOCPU1(burn_image_size);
             free(buff);
             _fwImgInfo.ext_info.burn_image_size = burn_image_size;
-        } 
+        }
     }
     return true;
-
 }
 
-bool Fs4Operations::encryptedFwReadImageInfoSection() {
+bool Fs4Operations::encryptedFwReadImageInfoSection()
+{
     //* Read IMAGE_INFO section
     u_int32_t image_info_section_addr = _image_info_section_ptr + _fwImgInfo.imgStart;
-    DPRINTF(("Fs4Operations::encryptedFwReadImageInfoSection image_info_section_addr = 0x%x\n", image_info_section_addr));
+    DPRINTF(
+      ("Fs4Operations::encryptedFwReadImageInfoSection image_info_section_addr = 0x%x\n", image_info_section_addr));
     vector<u_int8_t> image_info_data;
     image_info_data.resize(IMAGE_LAYOUT_IMAGE_INFO_SIZE);
-    if (!_ioAccess->read(image_info_section_addr, image_info_data.data(), IMAGE_LAYOUT_IMAGE_INFO_SIZE)) {
+    if (!_ioAccess->read(image_info_section_addr, image_info_data.data(), IMAGE_LAYOUT_IMAGE_INFO_SIZE))
+    {
         return errmsg("%s - read error (%s)\n", "IMAGE_INFO", (*_ioAccess).err());
     }
 
     //* Parse IMAGE_INFO section
-    if (!GetImageInfo(image_info_data.data())) {
+    if (!GetImageInfo(image_info_data.data()))
+    {
         return errmsg("Failed to parse IMAGE_INFO section - %s", err());
     }
 
     return true;
 }
 
-bool Fs4Operations::parseDevData(bool readRom, bool quickQuery, bool verbose) {
+bool Fs4Operations::parseDevData(bool readRom, bool quickQuery, bool verbose)
+{
     //* Initializing DTOC info
     _ioAccess->set_address_convertor(0, 0);
     // Parse DTOC header:
     u_int32_t dtoc_addr = _ioAccess->get_size() - FS4_DEFAULT_SECTOR_SIZE;
     DPRINTF(("Fs4Operations::parseDevData call verifyTocHeader() DTOC, dtoc_addr = 0x%x\n", dtoc_addr));
-    if (!verifyTocHeader(dtoc_addr, true, (VerifyCallBack)NULL)) {
+    if (!verifyTocHeader(dtoc_addr, true, (VerifyCallBack)NULL))
+    {
         return errmsg(MLXFW_NO_VALID_ITOC_ERR, "No valid DTOC Header was found.");
     }
     _fs4ImgInfo.dtocArr.tocArrayAddr = dtoc_addr;
@@ -1041,71 +1158,85 @@ bool Fs4Operations::parseDevData(bool readRom, bool quickQuery, bool verbose) {
     queryOptions.readRom = readRom;
     queryOptions.quickQuery = quickQuery;
     DPRINTF(("Fs4Operations::parseDevData call verifyTocEntries() DTOC\n"));
-    if (!verifyTocEntries(dtoc_addr, false, true,
-                        queryOptions, (VerifyCallBack)NULL, verbose)) {
+    if (!verifyTocEntries(dtoc_addr, false, true, queryOptions, (VerifyCallBack)NULL, verbose))
+    {
         return false;
     }
 
     return true;
 }
 
-bool Fs4Operations::encryptedFwQuery(fw_info_t *fwInfo, bool readRom, bool quickQuery, bool ignoreDToc, bool verbose)
+bool Fs4Operations::encryptedFwQuery(fw_info_t* fwInfo, bool readRom, bool quickQuery, bool ignoreDToc, bool verbose)
 {
     DPRINTF(("Fs4Operations::encryptedFwQuery\n"));
 
-    if (!initHwPtrs(true)) {
+    if (!initHwPtrs(true))
+    {
         DPRINTF(("Fs4Operations::encryptedFwQuery HW pointers not found"));
         return false;
     }
 
-    if (!encryptedFwReadImageInfoSection()) {
+    if (!encryptedFwReadImageInfoSection())
+    {
         return errmsg("%s", err());
     }
 
-    if (!ignoreDToc) {
-        if (!parseDevData(readRom, quickQuery, verbose)) {
+    if (!ignoreDToc)
+    {
+        if (!parseDevData(readRom, quickQuery, verbose))
+        {
             return errmsg("%s", err());
         }
     }
 
     _fwImgInfo.ext_info.is_failsafe = true;
-    memcpy(&(fwInfo->fw_info),  &(_fwImgInfo.ext_info),  sizeof(fw_info_com_t));
+    memcpy(&(fwInfo->fw_info), &(_fwImgInfo.ext_info), sizeof(fw_info_com_t));
     memcpy(&(fwInfo->fs3_info), &(_fs3ImgInfo.ext_info), sizeof(fs3_info_t));
     fwInfo->fw_type = FwType();
 
-    if (!QuerySecurityFeatures()) {
+    if (!QuerySecurityFeatures())
+    {
         return false;
     }
 
     _fwImgInfo.ext_info.is_failsafe = true;
-    memcpy(&(fwInfo->fw_info),  &(_fwImgInfo.ext_info),  sizeof(fw_info_com_t));
+    memcpy(&(fwInfo->fw_info), &(_fwImgInfo.ext_info), sizeof(fw_info_com_t));
     memcpy(&(fwInfo->fs3_info), &(_fs3ImgInfo.ext_info), sizeof(fs3_info_t));
     fwInfo->fw_type = FwType();
-    
+
     return true;
 }
 
-bool Fs4Operations::FwQuery(fw_info_t *fwInfo, bool readRom, bool isStripedImage, bool quickQuery, bool ignoreDToc, bool verbose)
+bool Fs4Operations::FwQuery(fw_info_t* fwInfo,
+                            bool readRom,
+                            bool isStripedImage,
+                            bool quickQuery,
+                            bool ignoreDToc,
+                            bool verbose)
 {
     DPRINTF(("Fs4Operations::FwQuery\n"));
 
     bool image_encrypted = false;
-    if (!isEncrypted(image_encrypted)) {
+    if (!isEncrypted(image_encrypted))
+    {
         return errmsg(getErrorCode(), "%s", err());
     }
-    if (image_encrypted) {
+    if (image_encrypted)
+    {
         return encryptedFwQuery(fwInfo, readRom, quickQuery, ignoreDToc, verbose);
     }
 
-    if (!Fs3Operations::FwQuery(fwInfo, readRom, isStripedImage, quickQuery, ignoreDToc, verbose)) {
+    if (!Fs3Operations::FwQuery(fwInfo, readRom, isStripedImage, quickQuery, ignoreDToc, verbose))
+    {
         return false;
     }
 
-    if (!QuerySecurityFeatures()) {
+    if (!QuerySecurityFeatures())
+    {
         return false;
     }
 
-    memcpy(&(fwInfo->fw_info),  &(_fwImgInfo.ext_info),  sizeof(fw_info_com_t));
+    memcpy(&(fwInfo->fw_info), &(_fwImgInfo.ext_info), sizeof(fw_info_com_t));
     memcpy(&(fwInfo->fs3_info), &(_fs3ImgInfo.ext_info), sizeof(fs3_info_t));
 
     return true;
@@ -1115,8 +1246,10 @@ bool Fs4Operations::IsLifeCycleAccessible(chip_type_t chip_type)
 {
     DPRINTF(("Fs4Operations::IsLifeCycleAccessible\n"));
     bool res = true;
-    if (IsLifeCycleSupported()) {
-        if (dm_is_livefish_mode(getMfileObj())) {
+    if (IsLifeCycleSupported())
+    {
+        if (dm_is_livefish_mode(getMfileObj()))
+        {
             switch (chip_type)
             {
                 case CT_BLUEFIELD2:
@@ -1130,7 +1263,8 @@ bool Fs4Operations::IsLifeCycleAccessible(chip_type_t chip_type)
             }
         }
     }
-    else {
+    else
+    {
         res = false;
     }
 
@@ -1167,26 +1301,33 @@ bool Fs4Operations::IsSecurityVersionAccessible(chip_type_t chip_type)
 
 bool Fs4Operations::QuerySecurityFeatures()
 {
-    DPRINTF(("Fs4Operations::QuerySecurityFeatures _fwImgInfo.ext_info.chip_type = %d\n", _fwImgInfo.ext_info.chip_type));
+    DPRINTF(
+      ("Fs4Operations::QuerySecurityFeatures _fwImgInfo.ext_info.chip_type = %d\n", _fwImgInfo.ext_info.chip_type));
     _fs3ImgInfo.ext_info.image_security_version = _security_version;
     _fs3ImgInfo.ext_info.device_security_version_access_method = NOT_VALID;
-    if (_ioAccess->is_flash()) {
-        try {
-            if (IsLifeCycleAccessible(_fwImgInfo.ext_info.chip_type)) {
+    if (_ioAccess->is_flash())
+    {
+        try
+        {
+            if (IsLifeCycleAccessible(_fwImgInfo.ext_info.chip_type))
+            {
                 CRSpaceRegisters crSpaceReg(getMfileObj(), _fwImgInfo.ext_info.chip_type);
                 _fs3ImgInfo.ext_info.life_cycle = crSpaceReg.getLifeCycle();
 
-                if (_fs3ImgInfo.ext_info.life_cycle == GA_SECURED) {
+                if (_fs3ImgInfo.ext_info.life_cycle == GA_SECURED)
+                {
                     _fs3ImgInfo.ext_info.global_image_status = crSpaceReg.getGlobalImageStatus();
 
-                    if (IsSecurityVersionAccessible(_fwImgInfo.ext_info.chip_type)) {
+                    if (IsSecurityVersionAccessible(_fwImgInfo.ext_info.chip_type))
+                    {
                         _fs3ImgInfo.ext_info.device_security_version_gw = crSpaceReg.getSecurityVersion();
                         _fs3ImgInfo.ext_info.device_security_version_access_method = DIRECT_ACCESS;
                     }
                 }
             }
         }
-        catch(exception& e) {
+        catch (exception& e)
+        {
             printf("%s\n", e.what());
             return false;
         }
@@ -1202,29 +1343,33 @@ u_int8_t Fs4Operations::FwType()
 
 bool Fs4Operations::FwInit()
 {
-    if (!Fs3Operations::FwInit()) {
+    if (!Fs3Operations::FwInit())
+    {
         return false;
     }
     _fs4ImgInfo.firstItocArrayIsEmpty = 0;
     _fs4ImgInfo.smallestDTocAddr = 0;
-    _fwImgInfo.fwType = (fw_img_type_t) FwType();
+    _fwImgInfo.fwType = (fw_img_type_t)FwType();
     return true;
 }
 
 bool Fs4Operations::CheckFs4ImgSize(Fs4Operations& imageOps, bool useImageDevData)
 {
-    //check if max itoc is not overwriting the chunk
-    if (imageOps._fwImgInfo.lastImageAddr >= (u_int32_t)(imageOps._fwImgInfo.imgStart + (1 << imageOps._maxImgLog2Size))) {
+    // check if max itoc is not overwriting the chunk
+    if (imageOps._fwImgInfo.lastImageAddr >= (u_int32_t)(imageOps._fwImgInfo.imgStart + (1 << imageOps._maxImgLog2Size)))
+    {
         return errmsg(MLXFW_IMAGE_TOO_LARGE_ERR,
                       "Last ITOC section ends at address (0x%x) which is greater than max size of image (0x%x)",
                       imageOps._fwImgInfo.lastImageAddr,
                       imageOps._maxImgLog2Size);
     }
 
-    //check if minimal dtoc is not overwriting the preceding chunk
-    if (useImageDevData) {
+    // check if minimal dtoc is not overwriting the preceding chunk
+    if (useImageDevData)
+    {
         u_int32_t devAreaStartAddress = _ioAccess->get_effective_size() - (1 << imageOps._maxImgLog2Size);
-        if (imageOps._fs4ImgInfo.smallestDTocAddr < devAreaStartAddress) {
+        if (imageOps._fs4ImgInfo.smallestDTocAddr < devAreaStartAddress)
+        {
             return errmsg(MLXFW_DTOC_OVERWRITE_CHUNK,
                           "First DTOC address (0x%x) is less than device area start address (0x%x)",
                           imageOps._fs4ImgInfo.smallestDTocAddr,
@@ -1235,74 +1380,83 @@ bool Fs4Operations::CheckFs4ImgSize(Fs4Operations& imageOps, bool useImageDevDat
     return true;
 }
 
-
-bool Fs4Operations::getEncryptedImageSize(u_int32_t *imageSize){
+bool Fs4Operations::getEncryptedImageSize(u_int32_t* imageSize)
+{
     DPRINTF(("Fs4Operations::getEncryptedImageSize\n"));
     fw_info_t fwInfo;
-    if (!encryptedFwQuery(&fwInfo, false, false)) {
+    if (!encryptedFwQuery(&fwInfo, false, false))
+    {
         return errmsg("%s", err());
     }
     *imageSize = fwInfo.fw_info.burn_image_size;
     return true;
 }
 
-bool Fs4Operations::FwReadEncryptedData(void *image, u_int32_t imageSize, bool verbose){
+bool Fs4Operations::FwReadEncryptedData(void* image, u_int32_t imageSize, bool verbose)
+{
     DPRINTF(("Fs4Operations::FwReadEncryptedData\n"));
     vector<u_int8_t> data;
     data.resize(imageSize);
-    if (!(*_ioAccess).read(_fwImgInfo.imgStart, data.data(), imageSize, verbose)) {
+    if (!(*_ioAccess).read(_fwImgInfo.imgStart, data.data(), imageSize, verbose))
+    {
         return errmsg("%s - read error (%s)\n", "Image", (*_ioAccess).err());
     }
     memcpy(image, data.data(), imageSize);
     return true;
 }
 
-
-bool Fs4Operations::FwReadData(void *image, u_int32_t *imageSize, bool verbose)
+bool Fs4Operations::FwReadData(void* image, u_int32_t* imageSize, bool verbose)
 {
-
-    //* Read encrypted data 
+    //* Read encrypted data
     bool is_encrypted = false;
     DPRINTF(("Fs4Operations::FwReadData\n"));
-    if (!isEncrypted(is_encrypted)) {
+    if (!isEncrypted(is_encrypted))
+    {
         return errmsg(getErrorCode(), "%s", err());
     }
-    if (is_encrypted) {
-        if (image == NULL) {
+    if (is_encrypted)
+    {
+        if (image == NULL)
+        {
             bool result = getEncryptedImageSize(imageSize);
             DPRINTF(("Fs4Operations::FwReadData imageSize=0x%x result=%s\n", *imageSize, result ? "true" : "false"));
             return result;
-        } else {
+        }
+        else
+        {
             return FwReadEncryptedData(image, *imageSize, verbose);
         }
-    } 
+    }
 
     //* Read non-encrypted data
     struct QueryOptions queryOptions;
-    if (!imageSize) {
+    if (!imageSize)
+    {
         return errmsg("bad parameter is given to FwReadData\n");
     }
 
     queryOptions.readRom = true;
     queryOptions.quickQuery = false;
-    if (image == NULL) {
+    if (image == NULL)
+    {
         // When we need only to get size, no need for reading entire image
         queryOptions.readRom = false;
         queryOptions.quickQuery = true;
     }
     // Avoid Warning
-    if (!FsVerifyAux((VerifyCallBack)NULL, 0, queryOptions, false, verbose)) {
+    if (!FsVerifyAux((VerifyCallBack)NULL, 0, queryOptions, false, verbose))
+    {
         return false;
     }
 
-    _imageCache.get((u_int8_t *)image,
-                    _fwImgInfo.lastImageAddr);
-    //size will be always as (_ioAccess)->get_size(), as the dtoc always at the end
+    _imageCache.get((u_int8_t*)image, _fwImgInfo.lastImageAddr);
+    // size will be always as (_ioAccess)->get_size(), as the dtoc always at the end
     *imageSize = (_ioAccess)->get_size();
 
-    //take device sections
-    if (image != NULL) {
-        _imageCache.get((u_int8_t *)image + _fs4ImgInfo.smallestDTocAddr,
+    // take device sections
+    if (image != NULL)
+    {
+        _imageCache.get((u_int8_t*)image + _fs4ImgInfo.smallestDTocAddr,
                         _fs4ImgInfo.smallestDTocAddr,
                         (_ioAccess)->get_size() - _fs4ImgInfo.smallestDTocAddr);
     }
@@ -1313,48 +1467,45 @@ bool Fs4Operations::FwReadData(void *image, u_int32_t *imageSize, bool verbose)
 bool Fs4Operations::Fs4RemoveSectionAux(fs3_section_t sectionType)
 {
     int itocEntryIndex = 0;
-    struct   fs4_toc_info *itocEntry = (struct fs4_toc_info *)NULL;
-    TocArray *itocArray = &_fs4ImgInfo.itocArr;
+    struct fs4_toc_info* itocEntry = (struct fs4_toc_info*)NULL;
+    TocArray* itocArray = &_fs4ImgInfo.itocArr;
 
-    if (!Fs4GetItocInfo(itocArray->tocArr, itocArray->numOfTocs,
-                        sectionType, itocEntry, itocEntryIndex)) {
+    if (!Fs4GetItocInfo(itocArray->tocArr, itocArray->numOfTocs, sectionType, itocEntry, itocEntryIndex))
+    {
         return false;
     }
 
     u_int32_t sectionSizeInBytes = itocEntry->section_data.size();
     u_int32_t sectionSizeInDW = sectionSizeInBytes >> 2;
 
-    //update the sections that are after this section
-    for (int i = itocEntryIndex + 1; i < itocArray->numOfTocs; i++) {
-        struct fs4_toc_info *tocInfo = itocArray->tocArr + i;
-        tocInfo->toc_entry.flash_addr =
-            tocInfo->toc_entry.flash_addr - sectionSizeInDW;
+    // update the sections that are after this section
+    for (int i = itocEntryIndex + 1; i < itocArray->numOfTocs; i++)
+    {
+        struct fs4_toc_info* tocInfo = itocArray->tocArr + i;
+        tocInfo->toc_entry.flash_addr = tocInfo->toc_entry.flash_addr - sectionSizeInDW;
         tocInfo->entry_addr = tocInfo->entry_addr - IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
 
         updateTocEntryCRC(tocInfo);
 
         updateTocEntryData(tocInfo);
 
-        Fs3UpdateImgCache(tocInfo->data, tocInfo->entry_addr,
-                          IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
-        Fs3UpdateImgCache(tocInfo->section_data.data(),
-                          tocInfo->toc_entry.flash_addr << 2,
+        Fs3UpdateImgCache(tocInfo->data, tocInfo->entry_addr, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
+        Fs3UpdateImgCache(tocInfo->section_data.data(), tocInfo->toc_entry.flash_addr << 2,
                           tocInfo->toc_entry.size << 2);
-
     }
 
     _fwImgInfo.lastImageAddr = _fwImgInfo.lastImageAddr - sectionSizeInBytes;
 
-    //remove the itoc from the array and update the cache
-    for (int i = itocEntryIndex + 1; i < (itocArray->numOfTocs + 1); i++) {
+    // remove the itoc from the array and update the cache
+    for (int i = itocEntryIndex + 1; i < (itocArray->numOfTocs + 1); i++)
+    {
         TocArray::copyTocArrEntry(itocArray->tocArr + i - 1, itocArray->tocArr + i);
     }
 
     _fs4ImgInfo.itocArr.numOfTocs--;
 
-    u_int32_t lastItocSectAddress = itocArray->tocArrayAddr +
-                                    IMAGE_LAYOUT_ITOC_HEADER_SIZE +
-                                    itocArray->numOfTocs * IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
+    u_int32_t lastItocSectAddress =
+      itocArray->tocArrayAddr + IMAGE_LAYOUT_ITOC_HEADER_SIZE + itocArray->numOfTocs * IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
     updateTocEndEntryInImgCache(lastItocSectAddress);
 
     return true;
@@ -1364,18 +1515,20 @@ bool Fs4Operations::Fs4RemoveSection(fs3_section_t sectionType, ProgressCallBack
 {
     vector<u_int8_t> newImageData;
 
-    if (!Fs4RemoveSectionAux(sectionType)) {
+    if (!Fs4RemoveSectionAux(sectionType))
+    {
         return false;
     }
 
     _imageCache.get(newImageData, 0, (_ioAccess)->get_size());
 
     burnDataParamsT params;
-    params.data = (u_int32_t *)&newImageData[0];
+    params.data = (u_int32_t*)&newImageData[0];
     params.dataSize = newImageData.size();
     params.progressFunc = progressFunc;
     params.calcSha = _signatureExists;
-    if (!FwBurnData(params)) {
+    if (!FwBurnData(params))
+    {
         return false;
     }
 
@@ -1384,12 +1537,14 @@ bool Fs4Operations::Fs4RemoveSection(fs3_section_t sectionType, ProgressCallBack
 
 bool Fs4Operations::FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc)
 {
-    //run int query to get product ver
-    if (!FsIntQueryAux(true, false)) {
+    // run int query to get product ver
+    if (!FsIntQueryAux(true, false))
+    {
         return false;
     }
 
-    if (!RomCommonCheck(ignoreProdIdCheck, true)) {
+    if (!RomCommonCheck(ignoreProdIdCheck, true))
+    {
         return false;
     }
 
@@ -1397,133 +1552,144 @@ bool Fs4Operations::FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progres
 }
 
 bool Fs4Operations::Fs4AddSectionAux(fs3_section_t sectionType,
-                                     enum CRCTYPE crcType, u_int8_t zippedImage, u_int32_t *newSectData,
+                                     enum CRCTYPE crcType,
+                                     u_int8_t zippedImage,
+                                     u_int32_t* newSectData,
                                      u_int32_t newSectSize)
 {
-    struct fs4_toc_info *itocEntry = (struct fs4_toc_info *)NULL;
+    struct fs4_toc_info* itocEntry = (struct fs4_toc_info*)NULL;
     int itocEntryIndex = 0;
-    TocArray *itocArray = &_fs4ImgInfo.itocArr;
-    struct fs4_toc_info *newITocEntry;
-
-    //search for the section, remove it if found
-    if (Fs4GetItocInfo(itocArray->tocArr, itocArray->numOfTocs, sectionType,
-                       itocEntry, itocEntryIndex)) {
-        if (getImageSize() - (itocEntry->toc_entry.size << 2) + newSectSize
-            > (u_int32_t)(1 << _maxImgLog2Size)) {
+    TocArray* itocArray = &_fs4ImgInfo.itocArr;
+    struct fs4_toc_info* newITocEntry;
+
+    // search for the section, remove it if found
+    if (Fs4GetItocInfo(itocArray->tocArr, itocArray->numOfTocs, sectionType, itocEntry, itocEntryIndex))
+    {
+        if (getImageSize() - (itocEntry->toc_entry.size << 2) + newSectSize > (u_int32_t)(1 << _maxImgLog2Size))
+        {
             return errmsg("Section size is too large");
         }
-        if (!Fs4RemoveSectionAux(sectionType)) {
+        if (!Fs4RemoveSectionAux(sectionType))
+        {
             return false;
         }
-    } else {
-        if (getImageSize() + newSectSize >
-            (u_int32_t)(1 << _maxImgLog2Size)) {
+    }
+    else
+    {
+        if (getImageSize() + newSectSize > (u_int32_t)(1 << _maxImgLog2Size))
+        {
             return errmsg("Section size is too large");
         }
-        if (itocArray->numOfTocs + 1 > MAX_TOCS_NUM) {
-            return errmsg(
-                "Cannot add TOC entry, too many entries in iTOC array.");
+        if (itocArray->numOfTocs + 1 > MAX_TOCS_NUM)
+        {
+            return errmsg("Cannot add TOC entry, too many entries in iTOC array.");
         }
     }
 
     newITocEntry = itocArray->tocArr + itocArray->numOfTocs;
 
-    //update the new itoc entry
+    // update the new itoc entry
     Fs4Operations::TocArray::initEmptyTocArrEntry(newITocEntry);
 
-    newITocEntry->entry_addr = itocArray->tocArrayAddr + TOC_HEADER_SIZE +
-                               itocArray->numOfTocs * TOC_ENTRY_SIZE;
+    newITocEntry->entry_addr = itocArray->tocArrayAddr + TOC_HEADER_SIZE + itocArray->numOfTocs * TOC_ENTRY_SIZE;
     newITocEntry->toc_entry.type = sectionType;
     newITocEntry->toc_entry.size = newSectSize >> 2;
-    newITocEntry->toc_entry.flash_addr =
-        (_fwImgInfo.lastImageAddr - _fwImgInfo.imgStart) >> 2;
+    newITocEntry->toc_entry.flash_addr = (_fwImgInfo.lastImageAddr - _fwImgInfo.imgStart) >> 2;
     newITocEntry->toc_entry.crc = crcType;
     newITocEntry->toc_entry.zipped_image = zippedImage;
-    newITocEntry->toc_entry.section_crc = CalcImageCRC((u_int32_t *)newSectData,
-                                                       newSectSize >> 2);
+    newITocEntry->toc_entry.section_crc = CalcImageCRC((u_int32_t*)newSectData, newSectSize >> 2);
 
     updateTocEntryCRC(newITocEntry);
 
     updateTocEntryData(newITocEntry);
 
-    updateTocEntrySectionData(newITocEntry, (u_int8_t *)newSectData, newSectSize);
+    updateTocEntrySectionData(newITocEntry, (u_int8_t*)newSectData, newSectSize);
 
     itocArray->numOfTocs++;
 
     _fwImgInfo.lastImageAddr += newSectSize;
 
-    Fs3UpdateImgCache(newITocEntry->data, newITocEntry->entry_addr,
-                      IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
+    Fs3UpdateImgCache(newITocEntry->data, newITocEntry->entry_addr, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
 
-    u_int32_t lastItocSectAddress = itocArray->tocArrayAddr +
-                                    IMAGE_LAYOUT_ITOC_HEADER_SIZE +
-                                    itocArray->numOfTocs * IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
+    u_int32_t lastItocSectAddress =
+      itocArray->tocArrayAddr + IMAGE_LAYOUT_ITOC_HEADER_SIZE + itocArray->numOfTocs * IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
     updateTocEndEntryInImgCache(lastItocSectAddress);
 
-    Fs3UpdateImgCache(newITocEntry->section_data.data(),
-                      newITocEntry->toc_entry.flash_addr << 2,
+    Fs3UpdateImgCache(newITocEntry->section_data.data(), newITocEntry->toc_entry.flash_addr << 2,
                       newITocEntry->toc_entry.size << 2);
 
     return true;
 }
 
 bool Fs4Operations::Fs4AddSection(fs3_section_t sectionType,
-                                  enum CRCTYPE crcType, u_int8_t zippedImage, u_int32_t *newSectData,
-                                  u_int32_t newSectSize, ProgressCallBack progressFunc)
+                                  enum CRCTYPE crcType,
+                                  u_int8_t zippedImage,
+                                  u_int32_t* newSectData,
+                                  u_int32_t newSectSize,
+                                  ProgressCallBack progressFunc)
 {
     vector<u_int8_t> newImageData;
 
-    if (!Fs4AddSectionAux(sectionType, crcType, zippedImage, newSectData,
-                          newSectSize)) {
+    if (!Fs4AddSectionAux(sectionType, crcType, zippedImage, newSectData, newSectSize))
+    {
         return false;
     }
 
     _imageCache.get(newImageData, 0, (_ioAccess)->get_size());
     burnDataParamsT params;
-    params.data = (u_int32_t *)&newImageData[0];
+    params.data = (u_int32_t*)&newImageData[0];
     params.dataSize = newImageData.size();
     params.progressFunc = progressFunc;
     params.calcSha = _signatureExists;
-    if (!FwBurnData(params)) {
+    if (!FwBurnData(params))
+    {
         return false;
     }
 
     return true;
 }
 
-bool Fs4Operations::FwBurnRom(FImage *romImg, bool ignoreProdIdCheck, bool ignoreDevidCheck,
+bool Fs4Operations::FwBurnRom(FImage* romImg,
+                              bool ignoreProdIdCheck,
+                              bool ignoreDevidCheck,
                               ProgressCallBack progressFunc)
 {
     roms_info_t romsInfo;
 
-    if (romImg == NULL) {
+    if (romImg == NULL)
+    {
         return errmsg("Bad ROM image is given.");
     }
 
-    if (romImg->getBufLength() == 0) {
+    if (romImg->getBufLength() == 0)
+    {
         return errmsg("Bad ROM file: Empty file.");
     }
 
-    if (!FwOperations::getRomsInfo(romImg, romsInfo)) {
+    if (!FwOperations::getRomsInfo(romImg, romsInfo))
+    {
         return errmsg("Failed to read given ROM.");
     }
 
-    if (!FsIntQueryAux(false, false)) {
+    if (!FsIntQueryAux(false, false))
+    {
         return false;
     }
 
-    if (!ignoreDevidCheck && !FwOperations::checkMatchingExpRomDevId(
-            _fwImgInfo.ext_info.dev_type, romsInfo)) {
+    if (!ignoreDevidCheck && !FwOperations::checkMatchingExpRomDevId(_fwImgInfo.ext_info.dev_type, romsInfo))
+    {
         return errmsg("Image file ROM: FW is for device %d, but Exp-ROM is "
-                      "for device %d\n", _fwImgInfo.ext_info.dev_type,
-                      romsInfo.exp_rom_com_devid);
+                      "for device %d\n",
+                      _fwImgInfo.ext_info.dev_type, romsInfo.exp_rom_com_devid);
     }
 
-    if (!RomCommonCheck(ignoreProdIdCheck, false)) {
+    if (!RomCommonCheck(ignoreProdIdCheck, false))
+    {
         return false;
     }
 
-    if (romImg->getBuf() == NULL) {
+    if (romImg->getBuf() == NULL)
+    {
         return false;
     }
     return Fs4AddSection(FS3_ROM_CODE, INITOCENTRY, 0, romImg->getBuf(), romImg->getBufLength(), progressFunc);
@@ -1536,130 +1702,145 @@ void Fs4Operations::updateTocEndEntryInImgCache(u_int32_t lastItocSectAddress)
     Fs3UpdateImgCache(tocEndBuff, lastItocSectAddress, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
 }
 
-void Fs4Operations::updateTocEntryCRC(struct fs4_toc_info *tocEntry)
+void Fs4Operations::updateTocEntryCRC(struct fs4_toc_info* tocEntry)
 {
     u_int8_t tocEntryBuff[IMAGE_LAYOUT_ITOC_ENTRY_SIZE];
 
     memset(tocEntryBuff, 0, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
     image_layout_itoc_entry_pack(&(tocEntry->toc_entry), tocEntryBuff);
-    tocEntry->toc_entry.itoc_entry_crc =
-        CalcImageCRC((u_int32_t *)tocEntryBuff, TOC_ENTRY_SIZE / 4 - 1);
+    tocEntry->toc_entry.itoc_entry_crc = CalcImageCRC((u_int32_t*)tocEntryBuff, TOC_ENTRY_SIZE / 4 - 1);
 }
 
-void Fs4Operations::updateTocHeaderCRC(struct image_layout_itoc_header *tocHeader)
+void Fs4Operations::updateTocHeaderCRC(struct image_layout_itoc_header* tocHeader)
 {
     u_int8_t tocHeaderBuff[IMAGE_LAYOUT_ITOC_HEADER_SIZE];
 
     memset(tocHeaderBuff, 0, IMAGE_LAYOUT_ITOC_HEADER_SIZE);
     image_layout_itoc_header_pack(tocHeader, tocHeaderBuff);
-    tocHeader->itoc_entry_crc =
-        CalcImageCRC((u_int32_t *)tocHeaderBuff, IMAGE_LAYOUT_ITOC_HEADER_SIZE / 4 - 1);
+    tocHeader->itoc_entry_crc = CalcImageCRC((u_int32_t*)tocHeaderBuff, IMAGE_LAYOUT_ITOC_HEADER_SIZE / 4 - 1);
 }
 
-void Fs4Operations::updateTocEntryData(struct fs4_toc_info *tocEntry)
+void Fs4Operations::updateTocEntryData(struct fs4_toc_info* tocEntry)
 {
     memset(tocEntry->data, 0, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
     image_layout_itoc_entry_pack(&(tocEntry->toc_entry), tocEntry->data);
 }
 
-void Fs4Operations::updateTocEntrySectionData(struct fs4_toc_info *tocEntry,
-                                              u_int8_t *data, u_int32_t dataSize)
+void Fs4Operations::updateTocEntrySectionData(struct fs4_toc_info* tocEntry, u_int8_t* data, u_int32_t dataSize)
 {
     tocEntry->section_data.resize(dataSize);
     memcpy(tocEntry->section_data.data(), data, dataSize);
 }
 
-bool Fs4Operations::restoreWriteProtection(mflash *mfl, u_int8_t banksNum,
-                                           write_protect_info_t protect_info[])
+bool Fs4Operations::restoreWriteProtection(mflash* mfl, u_int8_t banksNum, write_protect_info_t protect_info[])
 {
-    for (unsigned int i = 0; i < banksNum; i++) {
+    for (unsigned int i = 0; i < banksNum; i++)
+    {
         int rc = mf_set_write_protect(mfl, i, protect_info + i);
-        if (rc != MFE_OK) {
-            return errmsg("Failed to restore write protection settings: %s",
-                          mf_err2str(rc));
+        if (rc != MFE_OK)
+        {
+            return errmsg("Failed to restore write protection settings: %s", mf_err2str(rc));
         }
     }
     return true;
 }
 
-bool Fs4Operations::CreateDtoc(vector<u_int8_t>& img, u_int8_t* SectionData, u_int32_t section_size, u_int32_t flash_data_addr,
-    fs3_section_t section, u_int32_t tocEntryAddr, CRCTYPE crc)
+bool Fs4Operations::CreateDtoc(vector<u_int8_t>& img,
+                               u_int8_t* SectionData,
+                               u_int32_t section_size,
+                               u_int32_t flash_data_addr,
+                               fs3_section_t section,
+                               u_int32_t tocEntryAddr,
+                               CRCTYPE crc)
 {
     struct fs4_toc_info itoc_info;
     memset(&itoc_info.data, 0, sizeof(itoc_info.data));
     memset(&itoc_info.toc_entry, 0, sizeof(struct image_layout_itoc_entry));
     itoc_info.section_data.resize(section_size, 0xff);
     itoc_info.entry_addr = tocEntryAddr;
-    struct image_layout_itoc_entry *toc_entry_p = &(itoc_info.toc_entry);
+    struct image_layout_itoc_entry* toc_entry_p = &(itoc_info.toc_entry);
     toc_entry_p->size = section_size >> 2;
     toc_entry_p->type = (u_int8_t)section;
     toc_entry_p->crc = (int)crc;
     toc_entry_p->flash_addr = flash_data_addr >> 2;
-    if (crc == INITOCENTRY) {
-        u_int32_t new_crc = CalcImageCRC((u_int32_t *)SectionData, toc_entry_p->size);
+    if (crc == INITOCENTRY)
+    {
+        u_int32_t new_crc = CalcImageCRC((u_int32_t*)SectionData, toc_entry_p->size);
         toc_entry_p->section_crc = new_crc;
     }
     updateTocEntryCRC(&itoc_info);
-    u_int8_t itoc_data[IMAGE_LAYOUT_ITOC_ENTRY_SIZE] = { 0 };
+    u_int8_t itoc_data[IMAGE_LAYOUT_ITOC_ENTRY_SIZE] = {0};
     image_layout_itoc_entry_pack(toc_entry_p, itoc_data);
     memcpy(img.data() + tocEntryAddr, itoc_data, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
     return true;
 }
 
-#define CONNECTX5_NV_LOG_SIZE 2*(CONNECTX5_NV_DATA_SIZE)
+#define CONNECTX5_NV_LOG_SIZE 2 * (CONNECTX5_NV_DATA_SIZE)
 #define CX5_FLASH_SIZE 0x1000000
 
-bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t devid_t, const cx4fw_uid_entry& base_guid, const cx4fw_uid_entry& base_mac)
+bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img,
+                                  char* psid,
+                                  dm_dev_id_t devid_t,
+                                  const cx4fw_uid_entry& base_guid,
+                                  const cx4fw_uid_entry& base_mac)
 {
     /*DTOC HEADER*/
 
     u_int32_t flash_data_addr = 0;
     u_int32_t flash_size = 2 * CX5_FLASH_SIZE;
     u_int32_t nvlogSize = CONNECTX5_NV_LOG_SIZE;
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_size = CX5_FLASH_SIZE;
-        nvlogSize = CONNECTX5_NV_LOG_SIZE/2;
+        nvlogSize = CONNECTX5_NV_LOG_SIZE / 2;
     }
 
     img.resize(flash_size, 0xff);
     u_int32_t dtocPtr = flash_size - FS4_DEFAULT_SECTOR_SIZE;
-    u_int8_t dtocHeader[] = { 0x44 ,0x54 ,0x4f ,0x43 ,0x04 ,0x08 ,0x15 ,0x16 ,0x23 ,0x42 ,0xca ,0xfa ,0xba ,0xca ,0xfe ,0x00 ,
-                             0x01 ,0x00 ,0x00 ,0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0xbd ,0x90 };
+    u_int8_t dtocHeader[] = {0x44, 0x54, 0x4f, 0x43, 0x04, 0x08, 0x15, 0x16, 0x23, 0x42, 0xca,
+                             0xfa, 0xba, 0xca, 0xfe, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
+                             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0x90};
 
     memcpy(img.data() + dtocPtr, dtocHeader, IMAGE_LAYOUT_ITOC_HEADER_SIZE);
     u_int32_t section_index = 0;
     u_int32_t entryAddr = dtocPtr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
     /* NV_LOG */
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_data_addr = 0xf90000;
     }
-    else {
+    else
+    {
         flash_data_addr = 0x1f00000;
     }
-    u_int8_t NvLogBuffer[CONNECTX5_NV_LOG_SIZE] = { 0 };
+    u_int8_t NvLogBuffer[CONNECTX5_NV_LOG_SIZE] = {0};
     memcpy(img.data() + flash_data_addr, NvLogBuffer, nvlogSize);
     CreateDtoc(img, NvLogBuffer, CONNECTX5_NV_LOG_SIZE, flash_data_addr, FS3_FW_NV_LOG, entryAddr, NOCRC);
 
     /* NV_DATA 0*/
     section_index++;
     entryAddr = dtocPtr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_data_addr = 0xfb0000;
     }
-    else {
+    else
+    {
         flash_data_addr = 0x1f20000;
     }
-    u_int8_t NvDataBuffer[CONNECTX5_NV_DATA_SIZE] = { 0 };
+    u_int8_t NvDataBuffer[CONNECTX5_NV_DATA_SIZE] = {0};
     memcpy(img.data() + flash_data_addr, NvDataBuffer, CONNECTX5_NV_DATA_SIZE);
     CreateDtoc(img, NvDataBuffer, CONNECTX5_NV_DATA_SIZE, flash_data_addr, FS3_NV_DATA0, entryAddr, NOCRC);
 
     /* NV_DATA 2*/
     section_index++;
     entryAddr = dtocPtr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_data_addr = 0xfc0000;
     }
-    else {
+    else
+    {
         flash_data_addr = 0x1f40000;
     }
 
@@ -1667,10 +1848,12 @@ bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     CreateDtoc(img, NvDataBuffer, CONNECTX5_NV_DATA_SIZE, flash_data_addr, FS3_NV_DATA2, entryAddr, NOCRC);
 
     /*DEV_INFO*/
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_data_addr = 0xfd0000;
     }
-    else {
+    else
+    {
         flash_data_addr = 0x1f60000;
     }
     section_index++;
@@ -1678,7 +1861,7 @@ bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
 
     struct image_layout_device_info dev_info;
     memset(&dev_info, 0, sizeof(dev_info));
-    u_int8_t DevInfoBuffer[IMAGE_LAYOUT_DEVICE_INFO_SIZE] = { 0 };
+    u_int8_t DevInfoBuffer[IMAGE_LAYOUT_DEVICE_INFO_SIZE] = {0};
     dev_info.signature0 = DEV_INFO_SIG0;
     dev_info.signature1 = DEV_INFO_SIG1;
     dev_info.signature2 = DEV_INFO_SIG2;
@@ -1695,18 +1878,20 @@ bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     dev_info.guids.macs.uid = base_mac.uid;
 
     image_layout_device_info_pack(&dev_info, DevInfoBuffer);
-    u_int32_t newSectionCRC = CalcImageCRC((u_int32_t *)DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1);
+    u_int32_t newSectionCRC = CalcImageCRC((u_int32_t*)DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1);
     u_int32_t newCRC = TOCPU1(newSectionCRC);
-    ((u_int32_t *)DevInfoBuffer)[IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1] = newCRC;
+    ((u_int32_t*)DevInfoBuffer)[IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1] = newCRC;
 
     memcpy(img.data() + flash_data_addr, DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE);
     CreateDtoc(img, DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE, flash_data_addr, FS3_DEV_INFO, entryAddr, INSECTION);
 
     /*DEV_INFO FAILSAFE*/
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_data_addr = 0xfe0000;
     }
-    else {
+    else
+    {
         flash_data_addr = 0x1f70000;
     }
     section_index++;
@@ -1717,9 +1902,9 @@ bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     dev_info.signature2 = 0;
     dev_info.signature3 = 0;
     image_layout_device_info_pack(&dev_info, DevInfoBuffer);
-    newSectionCRC = CalcImageCRC((u_int32_t *)DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1);
+    newSectionCRC = CalcImageCRC((u_int32_t*)DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1);
     newCRC = TOCPU1(newSectionCRC);
-    ((u_int32_t *)DevInfoBuffer)[IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1] = newCRC;
+    ((u_int32_t*)DevInfoBuffer)[IMAGE_LAYOUT_DEVICE_INFO_SIZE / 4 - 1] = newCRC;
 
     memcpy(img.data() + flash_data_addr, DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE);
     CreateDtoc(img, DevInfoBuffer, IMAGE_LAYOUT_DEVICE_INFO_SIZE, flash_data_addr, FS3_DEV_INFO, entryAddr, INSECTION);
@@ -1727,16 +1912,18 @@ bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     /*MFG_INFO*/
     section_index++;
     entryAddr = dtocPtr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
-    if (devid_t == DeviceConnectX5) {
+    if (devid_t == DeviceConnectX5)
+    {
         flash_data_addr = 0xff8000;
     }
-    else {
+    else
+    {
         flash_data_addr = 0x1ff8000;
     }
     struct cx4fw_mfg_info cx4_mfg_info;
-    u_int8_t MfgInfoData[CX4FW_MFG_INFO_SIZE] = { 0 };
+    u_int8_t MfgInfoData[CX4FW_MFG_INFO_SIZE] = {0};
     memset(&cx4_mfg_info, 0, sizeof(cx4_mfg_info));
-    cx4_mfg_info.guids_override_en = 1;//get the GUIDs from DEV_INFO
+    cx4_mfg_info.guids_override_en = 1; // get the GUIDs from DEV_INFO
     cx4_mfg_info.guids.guids.num_allocated = base_guid.num_allocated;
     cx4_mfg_info.guids.guids.step = base_guid.step;
     cx4_mfg_info.guids.guids.uid = base_guid.uid;
@@ -1755,31 +1942,32 @@ bool Fs4Operations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     entryAddr = dtocPtr + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
     struct image_layout_itoc_entry toc_entry;
     memset(&toc_entry, 0, sizeof(struct image_layout_itoc_entry));
-    u_int8_t entryBuffer[TOC_ENTRY_SIZE] = { 0 };
+    u_int8_t entryBuffer[TOC_ENTRY_SIZE] = {0};
     flash_data_addr += CX4FW_MFG_INFO_SIZE;
 
     toc_entry.size = 0;
     toc_entry.type = FS3_VPD_R0;
     toc_entry.flash_addr = flash_data_addr >> 2;
     toc_entry.crc = (int)INITOCENTRY;
-    toc_entry.section_crc = CalcImageCRC((u_int32_t *)NULL, toc_entry.size);
+    toc_entry.section_crc = CalcImageCRC((u_int32_t*)NULL, toc_entry.size);
     image_layout_itoc_entry_pack(&toc_entry, entryBuffer);
-    u_int32_t entry_crc = CalcImageCRC((u_int32_t *)entryBuffer, (TOC_ENTRY_SIZE / 4) - 1);
+    u_int32_t entry_crc = CalcImageCRC((u_int32_t*)entryBuffer, (TOC_ENTRY_SIZE / 4) - 1);
     toc_entry.itoc_entry_crc = entry_crc;
     image_layout_itoc_entry_pack(&toc_entry, entryBuffer);
     memcpy(img.data() + entryAddr, entryBuffer, TOC_ENTRY_SIZE);
     return true;
 }
 
-bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
+bool Fs4Operations::AlignDeviceSections(FwOperations* imageOps)
 {
     bool rc = true;
     u_int8_t data[FS4_DEFAULT_SECTOR_SIZE] = {0};
 
     struct image_layout_itoc_header itocHeader;
-    image_layout_itoc_header_unpack(&itocHeader, ((Fs4Operations *)imageOps)->_fs4ImgInfo.itocArr.tocHeader);
+    image_layout_itoc_header_unpack(&itocHeader, ((Fs4Operations*)imageOps)->_fs4ImgInfo.itocArr.tocHeader);
 
-    if (itocHeader.flash_layout_version != 1) {
+    if (itocHeader.flash_layout_version != 1)
+    {
         return errmsg("Please update MFT package");
     }
 
@@ -1787,91 +1975,101 @@ bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
     bool is_image_in_odd_chunks_bu = _ioAccess->get_is_image_in_odd_chunks();
 
     unsigned int retries = 0;
-    const int nvLogIndex = 0, nvData0Index = 1, nvData1Index = 2,
-              devInfo0Index = 3, devInfo1Index = 4;
-
-    struct fs4_toc_info *sections[COUNT_OF_SECTIONS_TO_ALIGN] = {(struct fs4_toc_info *)NULL,
-                                                                 (struct fs4_toc_info *)NULL,
-                                                                 (struct fs4_toc_info *)NULL,
-                                                                 (struct fs4_toc_info *)NULL,
-                                                                 (struct fs4_toc_info *)NULL};
-
-    const char *sectionsNames[COUNT_OF_SECTIONS_TO_ALIGN] = { GetSectionNameByType(FS3_FW_NV_LOG),
-                                                              GetSectionNameByType(FS3_NV_DATA0),
-                                                              GetSectionNameByType(FS3_NV_DATA2),
-                                                              GetSectionNameByType(FS3_DEV_INFO),
-                                                              GetSectionNameByType(FS3_DEV_INFO) };
-
-    const u_int32_t newOffsets[COUNT_OF_SECTIONS_TO_ALIGN] = {0xf90000, 0xfb0000,
-                                                              0xfc0000, 0xfd0000, 0xfe0000};
-
-    const u_int32_t offsets[COUNT_OF_SECTIONS_TO_ALIGN] = {0xc00000, 0xc10000,
-                                                           0xc20000, 0xc30000, 0xc40000};
-
-    //find related sections
-    for (int i = 0; i < _fs4ImgInfo.dtocArr.numOfTocs; i++) {
-        struct fs4_toc_info *toc = &_fs4ImgInfo.dtocArr.tocArr[i];
-        if (toc->toc_entry.type == FS3_FW_NV_LOG) {
+    const int nvLogIndex = 0, nvData0Index = 1, nvData1Index = 2, devInfo0Index = 3, devInfo1Index = 4;
+
+    struct fs4_toc_info* sections[COUNT_OF_SECTIONS_TO_ALIGN] = {(struct fs4_toc_info*)NULL, (struct fs4_toc_info*)NULL,
+                                                                 (struct fs4_toc_info*)NULL, (struct fs4_toc_info*)NULL,
+                                                                 (struct fs4_toc_info*)NULL};
+
+    const char* sectionsNames[COUNT_OF_SECTIONS_TO_ALIGN] = {
+      GetSectionNameByType(FS3_FW_NV_LOG), GetSectionNameByType(FS3_NV_DATA0), GetSectionNameByType(FS3_NV_DATA2),
+      GetSectionNameByType(FS3_DEV_INFO), GetSectionNameByType(FS3_DEV_INFO)};
+
+    const u_int32_t newOffsets[COUNT_OF_SECTIONS_TO_ALIGN] = {0xf90000, 0xfb0000, 0xfc0000, 0xfd0000, 0xfe0000};
+
+    const u_int32_t offsets[COUNT_OF_SECTIONS_TO_ALIGN] = {0xc00000, 0xc10000, 0xc20000, 0xc30000, 0xc40000};
+
+    // find related sections
+    for (int i = 0; i < _fs4ImgInfo.dtocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* toc = &_fs4ImgInfo.dtocArr.tocArr[i];
+        if (toc->toc_entry.type == FS3_FW_NV_LOG)
+        {
             sections[nvLogIndex] = toc;
-        } else if (toc->toc_entry.type == FS3_NV_DATA0) {
+        }
+        else if (toc->toc_entry.type == FS3_NV_DATA0)
+        {
             sections[nvData0Index] = toc;
-        } else if (toc->toc_entry.type == FS3_NV_DATA2) {
+        }
+        else if (toc->toc_entry.type == FS3_NV_DATA2)
+        {
             sections[nvData1Index] = toc;
-        } else if (toc->toc_entry.type == FS3_DEV_INFO) {
-            if (sections[devInfo0Index]) {
+        }
+        else if (toc->toc_entry.type == FS3_DEV_INFO)
+        {
+            if (sections[devInfo0Index])
+            {
                 sections[devInfo1Index] = toc;
-            } else {
+            }
+            else
+            {
                 sections[devInfo0Index] = toc;
             }
         }
     }
 
-    for (unsigned int i = 0; i < COUNT_OF_SECTIONS_TO_ALIGN; i++) {
-        if (sections[i] == NULL) {
-            return errmsg("%s section was not found!",
-                          sectionsNames[i]);
+    for (unsigned int i = 0; i < COUNT_OF_SECTIONS_TO_ALIGN; i++)
+    {
+        if (sections[i] == NULL)
+        {
+            return errmsg("%s section was not found!", sectionsNames[i]);
         }
-        if ((sections[i]->toc_entry.flash_addr << 2) != offsets[i]) {
+        if ((sections[i]->toc_entry.flash_addr << 2) != offsets[i])
+        {
             return errmsg("The section %s was expected to be at address "
                           "0x%x but it is at 0x%x",
-                          sectionsNames[i], offsets[i],
-                          sections[i]->toc_entry.flash_addr << 2);
+                          sectionsNames[i], offsets[i], sections[i]->toc_entry.flash_addr << 2);
         }
-        for (int j = 0; j < _fs4ImgInfo.dtocArr.numOfTocs; j++) {
-            struct fs4_toc_info *toc = &_fs4ImgInfo.dtocArr.tocArr[j];
+        for (int j = 0; j < _fs4ImgInfo.dtocArr.numOfTocs; j++)
+        {
+            struct fs4_toc_info* toc = &_fs4ImgInfo.dtocArr.tocArr[j];
             u_int32_t start = toc->toc_entry.flash_addr << 2;
             u_int32_t end = (toc->toc_entry.flash_addr << 2) + (toc->toc_entry.size << 2) - 1;
-            if (checkIfSectionsOverlap(newOffsets[i],
-                                       newOffsets[i] + (sections[i]->toc_entry.size << 2) - 1,
-                                       start, end)) {
+            if (checkIfSectionsOverlap(newOffsets[i], newOffsets[i] + (sections[i]->toc_entry.size << 2) - 1, start,
+                                       end))
+            {
                 return errmsg("%s section's new address overlaps with %s section",
                               sectionsNames[i],
                               GetSectionNameByType(toc->toc_entry.type));
             }
         }
-        //check if new offset overlaps with other new offsets
-        for (unsigned int j = 0; j < COUNT_OF_SECTIONS_TO_ALIGN; j++) {
-            if (i != j) {
+        // check if new offset overlaps with other new offsets
+        for (unsigned int j = 0; j < COUNT_OF_SECTIONS_TO_ALIGN; j++)
+        {
+            if (i != j)
+            {
                 if (checkIfSectionsOverlap(newOffsets[i],
                                            newOffsets[i] + (sections[i]->toc_entry.size << 2) - 1,
                                            newOffsets[j],
-                                           newOffsets[j] + (sections[j]->toc_entry.size << 2) - 1)) {
-                    return errmsg("%s section's new address overlaps with %s section new address",
-                                  sectionsNames[i], sectionsNames[j]);
+                                           newOffsets[j] + (sections[j]->toc_entry.size << 2) - 1))
+                {
+                    return errmsg("%s section's new address overlaps with %s section new address", sectionsNames[i],
+                                  sectionsNames[j]);
                 }
             }
         }
-
     }
 
-    FBase *origFlashObj = (FBase *)NULL;
-    FBase *flashObjWithOcr = (FBase *)NULL;
+    FBase* origFlashObj = (FBase*)NULL;
+    FBase* flashObjWithOcr = (FBase*)NULL;
 
-    //Re-open flash with -ocr if needed
-    if (_fwParams.ignoreCacheRep == 0) {
+    // Re-open flash with -ocr if needed
+    if (_fwParams.ignoreCacheRep == 0)
+    {
         origFlashObj = _ioAccess;
         _fwParams.ignoreCacheRep = 1;
-        if (!FwOperations::FwAccessCreate(_fwParams, &_ioAccess)) {
+        if (!FwOperations::FwAccessCreate(_fwParams, &_ioAccess))
+        {
             _ioAccess = origFlashObj;
             _fwParams.ignoreCacheRep = 0;
             return errmsg("Failed to open device for direct flash access");
@@ -1879,49 +2077,55 @@ bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
         flashObjWithOcr = _ioAccess;
     }
 
-    mflash *mfl = (mflash *)NULL;
+    mflash* mfl = (mflash*)NULL;
 
-    //disable write protection:
+    // disable write protection:
     ext_flash_attr_t attr;
     memset(&attr, 0x0, sizeof(attr));
-    if (!((Flash *)_ioAccess)->get_attr(attr)) {
+    if (!((Flash*)_ioAccess)->get_attr(attr))
+    {
         rc = false;
         goto cleanup;
     }
 
-    mfl = ((Flash *)_ioAccess)->getMflashObj();
+    mfl = ((Flash*)_ioAccess)->getMflashObj();
     write_protect_info_t protect_info;
     memset(&protect_info, 0, sizeof(protect_info));
-    for (unsigned int i = 0; i < attr.banks_num; i++) {
+    for (unsigned int i = 0; i < attr.banks_num; i++)
+    {
         int rc = mf_set_write_protect(mfl, i, &protect_info);
-        if (rc != MFE_OK) {
-            errmsg("Failed to disable flash write protection: %s",
-                   mf_err2str(rc));
+        if (rc != MFE_OK)
+        {
+            errmsg("Failed to disable flash write protection: %s", mf_err2str(rc));
             rc = false;
             goto cleanup;
         }
     }
 
-    while (((Flash *)_ioAccess)->is_flash_write_protected() && retries++ < 5) {
+    while (((Flash*)_ioAccess)->is_flash_write_protected() && retries++ < 5)
+    {
         msleep(500);
     }
-    if (retries == 5) {
+    if (retries == 5)
+    {
         errmsg("Failed to disable flash write protection");
         rc = false;
         goto cleanup;
     }
 
-    if (flashObjWithOcr != NULL) {
+    if (flashObjWithOcr != NULL)
+    {
         _ioAccess = origFlashObj;
         _fwParams.ignoreCacheRep = 0;
     }
 
-    //read the sections from the flash
+    // read the sections from the flash
     _readSectList.push_back(FS3_FW_NV_LOG);
     _readSectList.push_back(FS3_NV_DATA0);
     _readSectList.push_back(FS3_NV_DATA2);
     _readSectList.push_back(FS3_DEV_INFO);
-    if (!FsIntQueryAux()) {
+    if (!FsIntQueryAux())
+    {
         _readSectList.pop_back();
         _readSectList.pop_back();
         _readSectList.pop_back();
@@ -1934,25 +2138,27 @@ bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
     _readSectList.pop_back();
     _readSectList.pop_back();
 
-    //move to the new offsets:
-    for (unsigned int i = 0; i < COUNT_OF_SECTIONS_TO_ALIGN; i++) {
-        //flash address is in DW and offset is given in bytes
+    // move to the new offsets:
+    for (unsigned int i = 0; i < COUNT_OF_SECTIONS_TO_ALIGN; i++)
+    {
+        // flash address is in DW and offset is given in bytes
         sections[i]->toc_entry.flash_addr = newOffsets[i] >> 2;
-        //we updated the entry => calculate new CRC
+        // we updated the entry => calculate new CRC
         updateTocEntryCRC(sections[i]);
-        //update the image cache with the toc entry changes:
+        // update the image cache with the toc entry changes:
         u_int8_t buff[IMAGE_LAYOUT_ITOC_ENTRY_SIZE];
         memset(buff, 0x0, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
         image_layout_itoc_entry_pack(&(sections[i]->toc_entry), buff);
-        Fs3UpdateImgCache(buff, _fs4ImgInfo.dtocArr.tocArrayAddr +
-                          ((sections[i] - _fs4ImgInfo.dtocArr.tocArr + 1)
-                           * IMAGE_LAYOUT_ITOC_ENTRY_SIZE), IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
-        //write the section data to the new offset
+        Fs3UpdateImgCache(buff,
+                          _fs4ImgInfo.dtocArr.tocArrayAddr +
+                            ((sections[i] - _fs4ImgInfo.dtocArr.tocArr + 1) * IMAGE_LAYOUT_ITOC_ENTRY_SIZE),
+                          IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
+        // write the section data to the new offset
         if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL, newOffsets[i],
-                          sections[i]->section_data.data(),
-                          sections[i]->section_data.size(), true, true, 0, 0)) {
-            if (!restoreWriteProtection(mfl, attr.banks_num,
-                                        attr.protect_info_array)) {
+                          sections[i]->section_data.data(), sections[i]->section_data.size(), true, true, 0, 0))
+        {
+            if (!restoreWriteProtection(mfl, attr.banks_num, attr.protect_info_array))
+            {
                 rc = false;
                 goto cleanup;
             }
@@ -1960,29 +2166,26 @@ bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
             rc = false;
             goto cleanup;
         }
-        //update the image cache with the new section:
-        Fs3UpdateImgCache(sections[i]->section_data.data(), newOffsets[i],
-                          sections[i]->section_data.size());
+        // update the image cache with the new section:
+        Fs3UpdateImgCache(sections[i]->section_data.data(), newOffsets[i], sections[i]->section_data.size());
     }
 
-    //set dtoc.header.flash_layout_version to 0x1
+    // set dtoc.header.flash_layout_version to 0x1
     struct image_layout_itoc_header dtocHeader;
     image_layout_itoc_header_unpack(&dtocHeader, _fs4ImgInfo.dtocArr.tocHeader);
     dtocHeader.flash_layout_version = 0x1;
     updateTocHeaderCRC(&dtocHeader);
     image_layout_itoc_header_pack(&dtocHeader, _fs4ImgInfo.dtocArr.tocHeader);
-    //update image cache with the dtoc headers changes:
-    Fs3UpdateImgCache(_fs4ImgInfo.dtocArr.tocHeader,
-                      _fs4ImgInfo.dtocArr.tocArrayAddr,
-                      IMAGE_LAYOUT_ITOC_HEADER_SIZE);
-
-    //write the dtoc array
-    _imageCache.get(data, _fs4ImgInfo.dtocArr.tocArrayAddr,
-                    FS4_DEFAULT_SECTOR_SIZE);
+    // update image cache with the dtoc headers changes:
+    Fs3UpdateImgCache(_fs4ImgInfo.dtocArr.tocHeader, _fs4ImgInfo.dtocArr.tocArrayAddr, IMAGE_LAYOUT_ITOC_HEADER_SIZE);
+
+    // write the dtoc array
+    _imageCache.get(data, _fs4ImgInfo.dtocArr.tocArrayAddr, FS4_DEFAULT_SECTOR_SIZE);
     if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL, _fs4ImgInfo.dtocArr.tocArrayAddr, data,
-                      FS4_DEFAULT_SECTOR_SIZE, true, true, 0, 0)) {
-        if (!restoreWriteProtection(mfl, attr.banks_num,
-                                    attr.protect_info_array)) {
+                      FS4_DEFAULT_SECTOR_SIZE, true, true, 0, 0))
+    {
+        if (!restoreWriteProtection(mfl, attr.banks_num, attr.protect_info_array))
+        {
             rc = false;
             goto cleanup;
         }
@@ -1991,20 +2194,24 @@ bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
         goto cleanup;
     }
 
-    if (flashObjWithOcr != NULL) {
+    if (flashObjWithOcr != NULL)
+    {
         _ioAccess = flashObjWithOcr;
         _fwParams.ignoreCacheRep = 1;
     }
-    if (!restoreWriteProtection(mfl, attr.banks_num, attr.protect_info_array)) {
+    if (!restoreWriteProtection(mfl, attr.banks_num, attr.protect_info_array))
+    {
         rc = false;
         goto cleanup;
     }
 
 cleanup:
-    if (attr.type_str) {
+    if (attr.type_str)
+    {
         delete attr.type_str;
     }
-    if (flashObjWithOcr != NULL) {
+    if (flashObjWithOcr != NULL)
+    {
         _ioAccess = origFlashObj;
         _fwParams.ignoreCacheRep = 0;
         flashObjWithOcr->close();
@@ -2016,63 +2223,74 @@ bool Fs4Operations::AlignDeviceSections(FwOperations *imageOps)
     return rc;
 }
 
-bool Fs4Operations::CheckIfAlignmentIsNeeded(FwOperations *imgops)
+bool Fs4Operations::CheckIfAlignmentIsNeeded(FwOperations* imgops)
 {
-    Fs4Operations& imageOps = *((Fs4Operations *) imgops);
+    Fs4Operations& imageOps = *((Fs4Operations*)imgops);
     struct image_layout_itoc_header itocHeader, dtocHeader;
     image_layout_itoc_header_unpack(&dtocHeader, _fs4ImgInfo.dtocArr.tocHeader);
     image_layout_itoc_header_unpack(&itocHeader, imageOps._fs4ImgInfo.itocArr.tocHeader);
 
-    if (dtocHeader.flash_layout_version <
-        itocHeader.flash_layout_version) {
+    if (dtocHeader.flash_layout_version < itocHeader.flash_layout_version)
+    {
         return true;
     }
 
     return false;
 }
 
-bool Fs4Operations::FwExtractEncryptedImage(vector<u_int8_t>& img, bool maskMagicPattern,
-    bool verbose, bool ignoreImageStart)
+bool Fs4Operations::FwExtractEncryptedImage(vector<u_int8_t>& img,
+                                            bool maskMagicPattern,
+                                            bool verbose,
+                                            bool ignoreImageStart)
 {
     //* Choosing the correct io to read from
     FBase* io = _ioAccess;
-    if (_encrypted_image_io_access) {
+    if (_encrypted_image_io_access)
+    {
         io = _encrypted_image_io_access; // If encrypted image was given we'll read from it
     }
 
     getImgStart(); // Stores image start value in _fwImgInfo.imgStart
     u_int32_t image_start = 0;
-    if (!ignoreImageStart) {
+    if (!ignoreImageStart)
+    {
         image_start = _fwImgInfo.imgStart;
     }
 
     //* Get image size
     fw_info_t fwInfo;
-    if (!encryptedFwQuery(&fwInfo, false, false, true)) {
+    if (!encryptedFwQuery(&fwInfo, false, false, true))
+    {
         return errmsg("%s", err());
     }
     u_int32_t burn_image_size = fwInfo.fw_info.burn_image_size;
 
     //* Read image from _fwImgInfo.imgStart to burn_image_size (_fwImgInfo.imgStart expected to be zero)
-    DPRINTF(("Fs4Operations::FwExtractEncryptedImage - Reading 0x%x bytes from address 0x%x\n", burn_image_size, image_start));
+    DPRINTF(("Fs4Operations::FwExtractEncryptedImage - Reading 0x%x bytes from address 0x%x\n", burn_image_size,
+             image_start));
     img.resize(burn_image_size);
-    if (!(*io).read(image_start, img.data(), burn_image_size, verbose)) {
+    if (!(*io).read(image_start, img.data(), burn_image_size, verbose))
+    {
         return errmsg("%s - read error (%s)\n", "image", (*io).err());
     }
 
-    if (maskMagicPattern) {
+    if (maskMagicPattern)
+    {
         memset(img.data(), 0xFF, 16);
     }
 
     return true;
 }
 
-bool Fs4Operations::readFS4Log2ChunkSizeFromImage(u_int32_t& log2_chunk_size) {
-    if (_ioAccess->is_flash()) {
+bool Fs4Operations::readFS4Log2ChunkSizeFromImage(u_int32_t& log2_chunk_size)
+{
+    if (_ioAccess->is_flash())
+    {
         return errmsg("readLog2ChunkSizeFromImage operation not supported on device\n");
     }
 
-    if (!getImgStart()) { // Stores image start value in _fwImgInfo.imgStart
+    if (!getImgStart())
+    { // Stores image start value in _fwImgInfo.imgStart
         return errmsg("Failed to get image start\n");
     }
 
@@ -2082,14 +2300,18 @@ bool Fs4Operations::readFS4Log2ChunkSizeFromImage(u_int32_t& log2_chunk_size) {
     _ioAccess->set_address_convertor(0, 0);
     READBUF((*_ioAccess), _fwImgInfo.imgStart, buff, FS3_BOOT_START, "Image header");
     TOCPUn(buff, FS3_BOOT_START_IN_DW);
-    log2_chunk_size = EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) ? EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) : FS4_ENCRYPTED_LOG_CHUNK_SIZE;
+    log2_chunk_size = EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) ?
+                        EXTRACT(buff[FS3_LOG2_CHUNK_SIZE_DW_OFFSET], 16, 8) :
+                        FS4_ENCRYPTED_LOG_CHUNK_SIZE;
     DPRINTF(("Fs4Operations::readFS4Log2ChunkSizeFromImage - log2_chunk_size = %d\n", log2_chunk_size));
 
     return true;
 }
 
-bool Fs4Operations::DoAfterBurnJobs(const u_int32_t magic_pattern[], ExtBurnParams& burnParams,
-                                    Flash *flash_access, u_int32_t new_image_start,
+bool Fs4Operations::DoAfterBurnJobs(const u_int32_t magic_pattern[],
+                                    ExtBurnParams& burnParams,
+                                    Flash* flash_access,
+                                    u_int32_t new_image_start,
                                     u_int32_t log2_chunk_size)
 {
     u_int32_t zeroes = 0;
@@ -2097,24 +2319,31 @@ bool Fs4Operations::DoAfterBurnJobs(const u_int32_t magic_pattern[], ExtBurnPara
 
     bool boot_address_was_updated = bootAddrUpdate(flash_access, new_image_start, burnParams);
 
-    if (!burnParams.burnFailsafe) {
+    if (!burnParams.burnFailsafe)
+    {
         // When burning in nofs, remnant of older image with different chunk size
         // may reside on the flash -
         // Invalidate all images marking on flash except the one we've just burnt
         invalidateOldFWImages(magic_pattern, flash_access, new_image_start);
-    } else {
+    }
+    else
+    {
         // invalidate previous signature
         flash_access->set_address_convertor(0, 0);
-        if (new_image_start == 0x0) {
+        if (new_image_start == 0x0)
+        {
             old_fw_signatrue_addr = 1 << log2_chunk_size;
         }
-        DPRINTF(("Fs4Operations::DoAfterBurnJobs - Invalidating old fw signature at addr 0x%x\n", old_fw_signatrue_addr));
-        if (!flash_access->write(old_fw_signatrue_addr, &zeroes, sizeof(zeroes), true)) {
+        DPRINTF(
+          ("Fs4Operations::DoAfterBurnJobs - Invalidating old fw signature at addr 0x%x\n", old_fw_signatrue_addr));
+        if (!flash_access->write(old_fw_signatrue_addr, &zeroes, sizeof(zeroes), true))
+        {
             return errmsg(MLXFW_FLASH_WRITE_ERR, "Failed to invalidate old fw signature: %s", flash_access->err());
         }
     }
 
-    if (boot_address_was_updated == false) {
+    if (boot_address_was_updated == false)
+    {
         report_warn("Failed to update FW boot address. Power cycle the device in order to load the new FW.\n");
     }
     return true;
@@ -2127,21 +2356,26 @@ bool Fs4Operations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& bu
     u_int32_t new_image_start_addr;
     u_int32_t total_img_size = 0;
 
-    if (_ioAccess == NULL) {
+    if (_ioAccess == NULL)
+    {
         return errmsg("ioAccess doesn't exist\n");
     }
-    if (_signatureMngr == NULL) {
+    if (_signatureMngr == NULL)
+    {
         return errmsg("Signature manager doesn't exist\n");
     }
 
     //* Preparations in case we need to burn device data (DTOC)
-    if (burnParams.useImgDevData) {
+    if (burnParams.useImgDevData)
+    {
         //* Check if flash is write protected
         bool is_write_protected;
-        if (!isWriteProtected(is_write_protected)) {
+        if (!isWriteProtected(is_write_protected))
+        {
             return errmsg("%s", err());
         }
-        if (is_write_protected) {
+        if (is_write_protected)
+        {
             return errmsg("Cannot burn device data sections, Flash is write protected.");
         }
 
@@ -2149,7 +2383,8 @@ bool Fs4Operations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& bu
         ((Fs4Operations*)imageOps)->parseDevData(true, false);
 
         //* DTOC sanity check
-        if (!((Fs4Operations*)imageOps)->CheckDTocArray()) {
+        if (!((Fs4Operations*)imageOps)->CheckDTocArray())
+        {
             return errmsg(MLXFW_IMAGE_CORRUPTED_ERR, "%s", imageOps->err());
         }
 
@@ -2157,30 +2392,35 @@ bool Fs4Operations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& bu
         total_img_size += ((Fs4Operations*)imageOps)->_fs4ImgInfo.dtocArr.getSectionsTotalSize();
     }
 
-    if (burnParams.burnFailsafe) {
+    if (burnParams.burnFailsafe)
+    {
         DPRINTF(("Fs4Operations::burnEncryptedImage Looking for image start on flash\n"));
-        if (!getImgStart()) { // Stores image start value in _fwImgInfo.imgStart
+        if (!getImgStart())
+        { // Stores image start value in _fwImgInfo.imgStart
             return errmsg("%s", err());
         }
     }
-    else {
+    else
+    {
         DPRINTF(("Fs4Operations::burnEncryptedImage No fail safe burn, ignore looking for image start on flash\n"));
     }
 
     DPRINTF(("Fs4Operations::burnEncryptedImage _fwImgInfo.imgStart = 0x%x\n", _fwImgInfo.imgStart));
     //* Read chunk (=half-flash) size from image
-    // ((Fs4Operations*)imageOps)->readFS4Log2ChunkSizeFromImage(log2_chunk_size); // TODO - use this function once it's fixed
+    // ((Fs4Operations*)imageOps)->readFS4Log2ChunkSizeFromImage(log2_chunk_size); // TODO - use this function once it's
+    // fixed
     log2_chunk_size = FS4_ENCRYPTED_LOG_CHUNK_SIZE;
 
     //* Assign new image start addr and current image partition
     is_curr_image_on_second_partition = 0;
     new_image_start_addr = 1 << log2_chunk_size;
-    if (_fwImgInfo.imgStart != 0 ||
-        (!burnParams.burnFailsafe && ((Flash*)_ioAccess)->get_ignore_cache_replacment())) {
+    if (_fwImgInfo.imgStart != 0 || (!burnParams.burnFailsafe && ((Flash*)_ioAccess)->get_ignore_cache_replacment()))
+    {
         is_curr_image_on_second_partition = 1;
         new_image_start_addr = 0;
     }
-    DPRINTF(("Fs4Operations::burnEncryptedImage - is_curr_image_on_second_partition = %d, new_image_start_addr = 0x%x\n", is_curr_image_on_second_partition, new_image_start_addr));
+    DPRINTF(("Fs4Operations::burnEncryptedImage - is_curr_image_on_second_partition = %d, new_image_start_addr = 0x%x\n",
+             is_curr_image_on_second_partition, new_image_start_addr));
 
     //* Extract encrypted image
     std::vector<u_int8_t> imgBuff;
@@ -2197,62 +2437,63 @@ bool Fs4Operations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& bu
     int alreadyWrittenSz = 0;
     //* Burn image without signature
     DPRINTF(("Fs4Operations::burnEncryptedImage - Burning image without magic-pattern\n"));
-    if (!writeImageEx(
-            burnParams.progressFuncEx,
-            burnParams.progressUserData,
-            burnParams.progressFunc,
-            new_image_start_addr + FS3_FW_SIGNATURE_SIZE,   // addr
-            imgBuff.data() + FS3_FW_SIGNATURE_SIZE,         // data
-            imgBuff.size() - FS3_FW_SIGNATURE_SIZE,         // size
-            true,                                           // phys addr
-            false,
-            total_img_size,
-            alreadyWrittenSz))
+    if (!writeImageEx(burnParams.progressFuncEx,
+                      burnParams.progressUserData,
+                      burnParams.progressFunc,
+                      new_image_start_addr + FS3_FW_SIGNATURE_SIZE, // addr
+                      imgBuff.data() + FS3_FW_SIGNATURE_SIZE,       // data
+                      imgBuff.size() - FS3_FW_SIGNATURE_SIZE,       // size
+                      true,                                         // phys addr
+                      false,
+                      total_img_size,
+                      alreadyWrittenSz))
     {
         return errmsg("Failed to burn encrypted image\n");
     }
     alreadyWrittenSz += imgBuff.size() - FS3_FW_SIGNATURE_SIZE;
 
-    if (burnParams.useImgDevData) {
+    if (burnParams.useImgDevData)
+    {
         //* Burning DTOC
         // Get DTOC from the cache
         u_int8_t* dtoc_data = new u_int8_t[FS4_DEFAULT_SECTOR_SIZE];
         u_int32_t dtoc_addr = imageOps->GetIoAccess()->get_size() - FS4_DEFAULT_SECTOR_SIZE;
         DPRINTF(("Fs4Operations::burnEncryptedImage - Burning DTOC at addr 0x%0x\n", dtoc_addr));
         ((Fs4Operations*)imageOps)->_imageCache.get(dtoc_data, dtoc_addr, FS4_DEFAULT_SECTOR_SIZE);
-        if (!writeImageEx(
-                burnParams.progressFuncEx,
-                burnParams.progressUserData,
-                burnParams.progressFunc,
-                dtoc_addr,
-                dtoc_data,
-                FS4_DEFAULT_SECTOR_SIZE,
-                true,
-                true,
-                total_img_size,
-                alreadyWrittenSz)) {
+        if (!writeImageEx(burnParams.progressFuncEx,
+                          burnParams.progressUserData,
+                          burnParams.progressFunc,
+                          dtoc_addr,
+                          dtoc_data,
+                          FS4_DEFAULT_SECTOR_SIZE,
+                          true,
+                          true,
+                          total_img_size,
+                          alreadyWrittenSz))
+        {
             delete[] dtoc_data;
             return false;
         }
         delete[] dtoc_data;
         alreadyWrittenSz += FS4_DEFAULT_SECTOR_SIZE;
 
-        for (int i = 0; i < ((Fs4Operations*)imageOps)->_fs4ImgInfo.dtocArr.numOfTocs; i++) {
-            struct fs4_toc_info *dtoc_info_p = &((Fs4Operations*)imageOps)->_fs4ImgInfo.dtocArr.tocArr[i];
-            struct image_layout_itoc_entry *dtoc_entry = &dtoc_info_p->toc_entry;
-            DPRINTF(("burning DTOC section addr=0x%08x size=0x%08x\n",
-                    dtoc_entry->flash_addr << 2, (u_int32_t)dtoc_info_p->section_data.size()));
-            if (!writeImageEx(
-                    burnParams.progressFuncEx,
-                    burnParams.progressUserData,
-                    burnParams.progressFunc,
-                    dtoc_entry->flash_addr << 2,
-                    &(dtoc_info_p->section_data[0]),
-                    dtoc_info_p->section_data.size(),
-                    true,
-                    true,
-                    total_img_size,
-                    alreadyWrittenSz)) {
+        for (int i = 0; i < ((Fs4Operations*)imageOps)->_fs4ImgInfo.dtocArr.numOfTocs; i++)
+        {
+            struct fs4_toc_info* dtoc_info_p = &((Fs4Operations*)imageOps)->_fs4ImgInfo.dtocArr.tocArr[i];
+            struct image_layout_itoc_entry* dtoc_entry = &dtoc_info_p->toc_entry;
+            DPRINTF(("burning DTOC section addr=0x%08x size=0x%08x\n", dtoc_entry->flash_addr << 2,
+                     (u_int32_t)dtoc_info_p->section_data.size()));
+            if (!writeImageEx(burnParams.progressFuncEx,
+                              burnParams.progressUserData,
+                              burnParams.progressFunc,
+                              dtoc_entry->flash_addr << 2,
+                              &(dtoc_info_p->section_data[0]),
+                              dtoc_info_p->section_data.size(),
+                              true,
+                              true,
+                              total_img_size,
+                              alreadyWrittenSz))
+            {
                 return false;
             }
             alreadyWrittenSz += dtoc_info_p->section_data.size();
@@ -2261,103 +2502,112 @@ bool Fs4Operations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& bu
 
     //* Burn signature
     DPRINTF(("Fs4Operations::burnEncryptedImage - Burning image magic-pattern\n"));
-    if (!writeImageEx(
-            burnParams.progressFuncEx,
-            burnParams.progressUserData,
-            burnParams.progressFunc,
-            new_image_start_addr,       // addr
-            imgBuff.data(),             // data
-            FS3_FW_SIGNATURE_SIZE,      // size
-            true,                       // phys addr
-            true,
-            total_img_size,
-            alreadyWrittenSz))
+    if (!writeImageEx(burnParams.progressFuncEx,
+                      burnParams.progressUserData,
+                      burnParams.progressFunc,
+                      new_image_start_addr,  // addr
+                      imgBuff.data(),        // data
+                      FS3_FW_SIGNATURE_SIZE, // size
+                      true,                  // phys addr
+                      true,
+                      total_img_size,
+                      alreadyWrittenSz))
     {
         return errmsg("Failed to burn encrypted image signature\n");
     }
     alreadyWrittenSz += FS3_FW_SIGNATURE_SIZE;
 
-    return DoAfterBurnJobs(_fs4_magic_pattern, burnParams, (Flash*)(this->_ioAccess),
-                           new_image_start_addr, log2_chunk_size);
+    return DoAfterBurnJobs(_fs4_magic_pattern, burnParams, (Flash*)(this->_ioAccess), new_image_start_addr,
+                           log2_chunk_size);
 }
 
-bool Fs4Operations::BurnFs4Image(Fs4Operations &imageOps,
-                                 ExtBurnParams& burnParams)
+bool Fs4Operations::BurnFs4Image(Fs4Operations& imageOps, ExtBurnParams& burnParams)
 {
     u_int8_t is_curr_image_in_odd_chunks;
     u_int32_t total_img_size = 0;
     u_int32_t sector_size = FS4_DEFAULT_SECTOR_SIZE;
-    Flash    *f     = (Flash *)(this->_ioAccess);
-    u_int8_t *data8;
+    Flash* f = (Flash*)(this->_ioAccess);
+    u_int8_t* data8;
     bool useImageDevData;
     int alreadyWrittenSz;
-    if (_ioAccess == NULL) {
+    if (_ioAccess == NULL)
+    {
         return errmsg("ioAccess doesn't exist\n");
     }
-    if (_signatureMngr == NULL) {
+    if (_signatureMngr == NULL)
+    {
         return errmsg("Signature manager doesn't exist\n");
     }
 
-    if (_fwImgInfo.imgStart != 0 ||
-        (!burnParams.burnFailsafe && ((Flash *)_ioAccess)->get_ignore_cache_replacment())) {
+    if (_fwImgInfo.imgStart != 0 || (!burnParams.burnFailsafe && ((Flash*)_ioAccess)->get_ignore_cache_replacment()))
+    {
         is_curr_image_in_odd_chunks = 1;
-    } else {
+    }
+    else
+    {
         is_curr_image_in_odd_chunks = 0;
     }
     u_int32_t new_image_start = getNewImageStartAddress(imageOps, burnParams.burnFailsafe);
 
-    if (new_image_start == 0x800000) {
+    if (new_image_start == 0x800000)
+    {
         f->set_address_convertor(0x17, 1);
-    } else {
+    }
+    else
+    {
         // take chunk size from image in case of a non failsafe burn (in any case they should be the same)
         f->set_address_convertor(imageOps._fwImgInfo.cntxLog2ChunkSize, !is_curr_image_in_odd_chunks);
     }
 
     // check max image size
-    useImageDevData =  !burnParams.burnFailsafe && burnParams.useImgDevData;
-    if (!CheckFs4ImgSize(imageOps, useImageDevData)) {
+    useImageDevData = !burnParams.burnFailsafe && burnParams.useImgDevData;
+    if (!CheckFs4ImgSize(imageOps, useImageDevData))
+    {
         return false;
     }
 
-    //Sanity check on the image itoc array
-    if (!imageOps.CheckITocArray()) {
+    // Sanity check on the image itoc array
+    if (!imageOps.CheckITocArray())
+    {
         return errmsg(MLXFW_IMAGE_CORRUPTED_ERR, "%s", imageOps.err());
     }
 
-    //Find total image size that will be written
-    total_img_size += imageOps._fs4ImgInfo.itocArr.getSectionsTotalSize();//itoc sections
-    //Add boot section, itoc array (wo signature)
+    // Find total image size that will be written
+    total_img_size += imageOps._fs4ImgInfo.itocArr.getSectionsTotalSize(); // itoc sections
+    // Add boot section, itoc array (wo signature)
     total_img_size += imageOps._fs4ImgInfo.itocArr.tocArrayAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
-    if (burnParams.useImgDevData) {
-        total_img_size += sector_size;//dtoc array
-        total_img_size += imageOps._fs4ImgInfo.dtocArr.getSectionsTotalSize();//dtoc sections
+    if (burnParams.useImgDevData)
+    {
+        total_img_size += sector_size;                                         // dtoc array
+        total_img_size += imageOps._fs4ImgInfo.dtocArr.getSectionsTotalSize(); // dtoc sections
     }
 
-    if (total_img_size <= sector_size) {
+    if (total_img_size <= sector_size)
+    {
         return errmsg("Failed to burn FW. Internal error.");
     }
 
-    //Write the image:
+    // Write the image:
     alreadyWrittenSz = 0;
 
-    //bring the boot section and itoc array from the cache
+    // bring the boot section and itoc array from the cache
     u_int32_t beginingWithoutSignatureSize =
-        imageOps._fs4ImgInfo.itocArr.tocArrayAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
+      imageOps._fs4ImgInfo.itocArr.tocArrayAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
     data8 = new u_int8_t[beginingWithoutSignatureSize];
     imageOps._imageCache.get(data8, FS3_FW_SIGNATURE_SIZE, beginingWithoutSignatureSize);
 
-    //Write boot section and IToc array (without signature)
-    if (!writeImageEx(
-            burnParams.progressFuncEx,
-            burnParams.progressUserData,
-            burnParams.progressFunc,
-            FS3_FW_SIGNATURE_SIZE,
-            data8,
-            imageOps._fs4ImgInfo.itocArr.tocArrayAddr + sector_size - FS3_FW_SIGNATURE_SIZE,
-            false,
-            false,
-            total_img_size,
-            alreadyWrittenSz)) {
+    // Write boot section and IToc array (without signature)
+    if (!writeImageEx(burnParams.progressFuncEx,
+                      burnParams.progressUserData,
+                      burnParams.progressFunc,
+                      FS3_FW_SIGNATURE_SIZE,
+                      data8,
+                      imageOps._fs4ImgInfo.itocArr.tocArrayAddr + sector_size - FS3_FW_SIGNATURE_SIZE,
+                      false,
+                      false,
+                      total_img_size,
+                      alreadyWrittenSz))
+    {
         delete[] data8;
         return false;
     }
@@ -2365,84 +2615,90 @@ bool Fs4Operations::BurnFs4Image(Fs4Operations &imageOps,
     alreadyWrittenSz += imageOps._fs4ImgInfo.itocArr.tocArrayAddr + sector_size - FS3_FW_SIGNATURE_SIZE;
 
     // write itoc entries data
-    for (int i = 0; i < imageOps._fs4ImgInfo.itocArr.numOfTocs; i++) {
-        struct fs4_toc_info *itoc_info_p = &imageOps._fs4ImgInfo.itocArr.tocArr[i];
-        struct image_layout_itoc_entry *toc_entry = &itoc_info_p->toc_entry;
-        if (!writeImageEx(
-                burnParams.progressFuncEx,
-                burnParams.progressUserData,
-                burnParams.progressFunc,
-                toc_entry->flash_addr << 2,
-                &(itoc_info_p->section_data[0]),
-                itoc_info_p->section_data.size(),
-                false,//addresses of itocs are relative and not physical
-                false,
-                total_img_size,
-                alreadyWrittenSz)) {
+    for (int i = 0; i < imageOps._fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* itoc_info_p = &imageOps._fs4ImgInfo.itocArr.tocArr[i];
+        struct image_layout_itoc_entry* toc_entry = &itoc_info_p->toc_entry;
+        if (!writeImageEx(burnParams.progressFuncEx,
+                          burnParams.progressUserData,
+                          burnParams.progressFunc,
+                          toc_entry->flash_addr << 2,
+                          &(itoc_info_p->section_data[0]),
+                          itoc_info_p->section_data.size(),
+                          false, // addresses of itocs are relative and not physical
+                          false,
+                          total_img_size,
+                          alreadyWrittenSz))
+        {
             return false;
         }
         alreadyWrittenSz += itoc_info_p->section_data.size();
     }
 
-    if (burnParams.useImgDevData) {
-        //Write dtoc array only if ignore_dev_data
+    if (burnParams.useImgDevData)
+    {
+        // Write dtoc array only if ignore_dev_data
 
-        //Sanity check on the image dtoc array
-        if (!imageOps.CheckDTocArray()) {
+        // Sanity check on the image dtoc array
+        if (!imageOps.CheckDTocArray())
+        {
             return errmsg(MLXFW_IMAGE_CORRUPTED_ERR, "%s", imageOps.err());
         }
 
-        //bring the dtoc array from the cache
+        // bring the dtoc array from the cache
         data8 = new u_int8_t[sector_size];
-        imageOps._imageCache.get(data8, imageOps._fs4ImgInfo.dtocArr.tocArrayAddr,
-                                 sector_size);
-        if (!writeImageEx(
-                burnParams.progressFuncEx,
-                burnParams.progressUserData,
-                burnParams.progressFunc,
-                imageOps._fs4ImgInfo.dtocArr.tocArrayAddr,
-                data8,
-                sector_size,
-                true,
-                true,
-                total_img_size,
-                alreadyWrittenSz)) {
+        imageOps._imageCache.get(data8, imageOps._fs4ImgInfo.dtocArr.tocArrayAddr, sector_size);
+        if (!writeImageEx(burnParams.progressFuncEx,
+                          burnParams.progressUserData,
+                          burnParams.progressFunc,
+                          imageOps._fs4ImgInfo.dtocArr.tocArrayAddr,
+                          data8,
+                          sector_size,
+                          true,
+                          true,
+                          total_img_size,
+                          alreadyWrittenSz))
+        {
             delete[] data8;
             return false;
         }
         delete[] data8;
         alreadyWrittenSz += sector_size;
 
-        //TODO: write device area (dtoc's entries)
-        for (int i = 0; i < imageOps._fs4ImgInfo.dtocArr.numOfTocs; i++) {
-            struct fs4_toc_info *itoc_info_p = &imageOps._fs4ImgInfo.dtocArr.tocArr[i];
-            struct image_layout_itoc_entry *toc_entry = &itoc_info_p->toc_entry;
-            if (!writeImageEx(
-                    burnParams.progressFuncEx,
-                    burnParams.progressUserData,
-                    burnParams.progressFunc,
-                    toc_entry->flash_addr << 2,
-                    &(itoc_info_p->section_data[0]),
-                    itoc_info_p->section_data.size(),
-                    true,
-                    true,
-                    total_img_size,
-                    alreadyWrittenSz)) {
+        // TODO: write device area (dtoc's entries)
+        for (int i = 0; i < imageOps._fs4ImgInfo.dtocArr.numOfTocs; i++)
+        {
+            struct fs4_toc_info* itoc_info_p = &imageOps._fs4ImgInfo.dtocArr.tocArr[i];
+            struct image_layout_itoc_entry* toc_entry = &itoc_info_p->toc_entry;
+            if (!writeImageEx(burnParams.progressFuncEx,
+                              burnParams.progressUserData,
+                              burnParams.progressFunc,
+                              toc_entry->flash_addr << 2,
+                              &(itoc_info_p->section_data[0]),
+                              itoc_info_p->section_data.size(),
+                              true,
+                              true,
+                              total_img_size,
+                              alreadyWrittenSz))
+            {
                 return false;
             }
             alreadyWrittenSz += itoc_info_p->section_data.size();
         }
     }
 
-    if (!f->is_flash()) {
+    if (!f->is_flash())
+    {
         return true;
     }
     bool IsUpdateSignatures = true;
     chip_type chip = this->_fwImgInfo.ext_info.chip_type;
-    if (burnParams.use_chip_type == true) {
-        chip = burnParams.chip_type;//patch for BF
+    if (burnParams.use_chip_type == true)
+    {
+        chip = burnParams.chip_type; // patch for BF
     }
-    switch (chip) {
+    switch (chip)
+    {
         case CT_CONNECTX6:
             getExtendedHWPtrs((VerifyCallBack)NULL, imageOps._ioAccess, true);
             break;
@@ -2450,11 +2706,13 @@ bool Fs4Operations::BurnFs4Image(Fs4Operations &imageOps,
             getExtendedHWAravaPtrs((VerifyCallBack)NULL, imageOps._ioAccess, true);
             break;
         case CT_BLUEFIELD:
-            if (burnParams.use_chip_type == true) {
-                if (!_signatureMngr->AddSignature(_ioAccess->getMfileObj(), &imageOps, f, 0)) {
+            if (burnParams.use_chip_type == true)
+            {
+                if (!_signatureMngr->AddSignature(_ioAccess->getMfileObj(), &imageOps, f, 0))
+                {
                     return false;
                 }
-                IsUpdateSignatures = false;//already updated right now
+                IsUpdateSignatures = false; // already updated right now
             }
             break;
         default:
@@ -2462,14 +2720,18 @@ bool Fs4Operations::BurnFs4Image(Fs4Operations &imageOps,
             break;
     }
 
-    if (IsUpdateSignatures) {
+    if (IsUpdateSignatures)
+    {
         u_int32_t imageOffset = _digest_mdk_ptr;
-        if (imageOffset == 0) {
-            //use recovery ptr!
+        if (imageOffset == 0)
+        {
+            // use recovery ptr!
             imageOffset = _digest_recovery_key_ptr;
         }
-        if (imageOffset != 0) {
-            if (!_signatureMngr->AddSignature(_ioAccess->getMfileObj(), &imageOps, f, imageOffset)) {
+        if (imageOffset != 0)
+        {
+            if (!_signatureMngr->AddSignature(_ioAccess->getMfileObj(), &imageOps, f, imageOffset))
+            {
                 return false;
             }
         }
@@ -2477,175 +2739,188 @@ bool Fs4Operations::BurnFs4Image(Fs4Operations &imageOps,
     // Write new signature
     data8 = new u_int8_t[FS3_FW_SIGNATURE_SIZE];
     imageOps._imageCache.get(data8, 0, FS3_FW_SIGNATURE_SIZE);
-    if (!writeImageEx(
-            burnParams.progressFuncEx,
-            burnParams.progressUserData,
-            burnParams.progressFunc,
-            new_image_start,
-                data8,
-                FS3_FW_SIGNATURE_SIZE,
-                true,
-                true,
-                total_img_size,
-                alreadyWrittenSz)) {
+    if (!writeImageEx(burnParams.progressFuncEx,
+                      burnParams.progressUserData,
+                      burnParams.progressFunc,
+                      new_image_start,
+                      data8,
+                      FS3_FW_SIGNATURE_SIZE,
+                      true,
+                      true,
+                      total_img_size,
+                      alreadyWrittenSz))
+    {
         delete[] data8;
         return false;
     }
     delete[] data8;
 
-    return Fs3Operations::DoAfterBurnJobs(_fs4_magic_pattern, imageOps, burnParams, f,
-                           new_image_start, is_curr_image_in_odd_chunks);
+    return Fs3Operations::DoAfterBurnJobs(_fs4_magic_pattern, imageOps, burnParams, f, new_image_start,
+                                          is_curr_image_in_odd_chunks);
 }
 
-bool Fs4Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
+bool Fs4Operations::FsBurnAux(FwOperations* imgops, ExtBurnParams& burnParams)
 {
     bool devIntQueryRes;
     bool rc;
-    Fs4Operations& imageOps = *((Fs4Operations *) imgops);
+    Fs4Operations& imageOps = *((Fs4Operations*)imgops);
 
-    if (imageOps.FwType() != FIT_FS4) {
+    if (imageOps.FwType() != FIT_FS4)
+    {
         return errmsg(MLXFW_IMAGE_FORMAT_ERR, "FW image type is not compatible with device (FS4)");
     }
 
     devIntQueryRes = FsIntQueryAux();
 
-    if (!devIntQueryRes && burnParams.burnFailsafe) {
+    if (!devIntQueryRes && burnParams.burnFailsafe)
+    {
         return false;
     }
-    //For image we execute full verify to bring all the information needed for ROM Patch
-    if (!imageOps.FsIntQueryAux(true, false)) {
+    // For image we execute full verify to bring all the information needed for ROM Patch
+    if (!imageOps.FsIntQueryAux(true, false))
+    {
         return false;
     }
 
-    //Check Matching device ID
-    if (!burnParams.noDevidCheck && _ioAccess->is_flash()) {
-        if (imageOps._fwImgInfo.supportedHwIdNum) {
+    // Check Matching device ID
+    if (!burnParams.noDevidCheck && _ioAccess->is_flash())
+    {
+        if (imageOps._fwImgInfo.supportedHwIdNum)
+        {
             if (!CheckMatchingHwDevId(_ioAccess->get_dev_id(),
                                       _ioAccess->get_rev_id(),
                                       imageOps._fwImgInfo.supportedHwId,
-                                      imageOps._fwImgInfo.supportedHwIdNum)) {
-                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
-                              "Device/Image mismatch: %s\n", this->err());
+                                      imageOps._fwImgInfo.supportedHwIdNum))
+            {
+                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n", this->err());
             }
             if (burnParams.burnFailsafe == false &&
-                !CheckMatchingBinning(_ioAccess->get_dev_id(),
-                                      _ioAccess->get_bin_id(),
-                                      imageOps._fwImgInfo.ext_info.dev_type)) {
+                !CheckMatchingBinning(_ioAccess->get_dev_id(), _ioAccess->get_bin_id(),
+                                      imageOps._fwImgInfo.ext_info.dev_type))
+            {
                 // we check Chip Bin information only on failsafe burn
                 // during Firmware update flow - PSID will ensure a correct match.
-                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
-                              "Device/Image mismatch: %s\n", this->err());
+                return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "Device/Image mismatch: %s\n", this->err());
             }
-        } else {
-            //No supported HW IDs (problem with the image ?)
-            return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
-                          "No supported devices were found in the FW image.");
+        }
+        else
+        {
+            // No supported HW IDs (problem with the image ?)
+            return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "No supported devices were found in the FW image.");
         }
     }
 
-    if (!burnParams.burnFailsafe) {
-        //Some checks in case we burn in a non-failsafe manner and attempt to
+    if (!burnParams.burnFailsafe)
+    {
+        // Some checks in case we burn in a non-failsafe manner and attempt to
         // integrate existing device Data sections from device.
-        if (!burnParams.useImgDevData) {
-            //We will take device data section from device: perform some checks
-            if (_fs4ImgInfo.dtocArr.tocArrayAddr == 0) {
+        if (!burnParams.useImgDevData)
+        {
+            // We will take device data section from device: perform some checks
+            if (_fs4ImgInfo.dtocArr.tocArrayAddr == 0)
+            {
                 return errmsg("Cannot extract device data sections: "
                               "Invalid DTOC section. "
                               "Please ignore extracting device data sections.");
             }
-            if (_badDevDataSections) {
+            if (_badDevDataSections)
+            {
                 return errmsg("Cannot integrate device data sections: "
                               "Device data sections are corrupted. "
                               "Please ignore extracting device data sections.");
             }
-        } else {
-            //We will take device data sections from image: make sure device is not write protected
+        }
+        else
+        {
+            // We will take device data sections from image: make sure device is not write protected
             bool is_write_protected;
-            if (!isWriteProtected(is_write_protected)) {
+            if (!isWriteProtected(is_write_protected))
+            {
                 return errmsg("%s", err());
             }
-            if (is_write_protected) {
+            if (is_write_protected)
+            {
                 return errmsg("Cannot burn device data sections, Flash is write protected.");
             }
         }
     }
 
-    if (devIntQueryRes && !CheckPSID(imageOps, burnParams.allowPsidChange)) {
+    if (devIntQueryRes && !CheckPSID(imageOps, burnParams.allowPsidChange))
+    {
         return false;
     }
 
-    if (burnParams.burnFailsafe) {
-        if (!CheckAndDealWithChunkSizes(_fwImgInfo.cntxLog2ChunkSize, imageOps._fwImgInfo.cntxLog2ChunkSize)) {
+    if (burnParams.burnFailsafe)
+    {
+        if (!CheckAndDealWithChunkSizes(_fwImgInfo.cntxLog2ChunkSize, imageOps._fwImgInfo.cntxLog2ChunkSize))
+        {
             return false;
         }
 
         // Check if the burnt FW version is OK
-        if (!CheckFwVersion(imageOps, burnParams.ignoreVersionCheck)) {
+        if (!CheckFwVersion(imageOps, burnParams.ignoreVersionCheck))
+        {
             return false;
         }
 
         // Check TimeStamp
-        if (!TestAndSetTimeStamp(imgops)) {
+        if (!TestAndSetTimeStamp(imgops))
+        {
             return false;
         }
 
         // ROM patchs
         if ((burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST) &&
-            _fwImgInfo.ext_info.roms_info.exp_rom_found) {
+            _fwImgInfo.ext_info.roms_info.exp_rom_found)
+        {
             std::vector<u_int8_t> romSect = _romSect;
-            TOCPUn((u_int32_t *)romSect.data(), romSect.size() >> 2);
-            if (!imageOps.Fs4AddSectionAux(FS3_ROM_CODE, INITOCENTRY, 0,
-                                           (u_int32_t *)romSect.data(), romSect.size())) {
-                return errmsg(MLXFW_ROM_UPDATE_IN_IMAGE_ERR,
-                              "failed to update ROM in image. %s", imageOps.err());
+            TOCPUn((u_int32_t*)romSect.data(), romSect.size() >> 2);
+            if (!imageOps.Fs4AddSectionAux(FS3_ROM_CODE, INITOCENTRY, 0, (u_int32_t*)romSect.data(), romSect.size()))
+            {
+                return errmsg(MLXFW_ROM_UPDATE_IN_IMAGE_ERR, "failed to update ROM in image. %s", imageOps.err());
             }
         }
 
         // Image vsd patch
-        if (!burnParams.useImagePs &&
-            (burnParams.vsdSpecified || burnParams.useDevImgInfo)) {
+        if (!burnParams.useImagePs && (burnParams.vsdSpecified || burnParams.useDevImgInfo))
+        {
             // get image info section :
-            struct fs4_toc_info *imageInfoToc = (struct fs4_toc_info *)NULL;
-            if (!imageOps.Fs4GetItocInfo(imageOps._fs4ImgInfo.itocArr.tocArr,
-                                         imageOps._fs4ImgInfo.itocArr.numOfTocs,
-                                         FS3_IMAGE_INFO, imageInfoToc)) {
-                return errmsg(MLXFW_GET_SECT_ERR,
-                              "failed to get Image Info section.");
+            struct fs4_toc_info* imageInfoToc = (struct fs4_toc_info*)NULL;
+            if (!imageOps.Fs4GetItocInfo(imageOps._fs4ImgInfo.itocArr.tocArr, imageOps._fs4ImgInfo.itocArr.numOfTocs,
+                                         FS3_IMAGE_INFO, imageInfoToc))
+            {
+                return errmsg(MLXFW_GET_SECT_ERR, "failed to get Image Info section.");
             }
 
             std::vector<u_int8_t> imageInfoSect = imageInfoToc->section_data;
 
-            if (burnParams.vsdSpecified) {
+            if (burnParams.vsdSpecified)
+            {
                 struct cibfw_image_info image_info;
                 cibfw_image_info_unpack(&image_info, &imageInfoSect[0]);
                 strncpy(image_info.vsd, burnParams.userVsd, VSD_LEN);
                 cibfw_image_info_pack(&image_info, &imageInfoSect[0]);
             }
 
-            if (burnParams.useDevImgInfo) {
+            if (burnParams.useDevImgInfo)
+            {
                 // update PSID, name and description in image info
                 struct tools_open_image_info tools_image_info;
                 tools_open_image_info_unpack(&tools_image_info, &imageInfoSect[0]);
-                strncpy(tools_image_info.psid, _fwImgInfo.ext_info.psid,
-                        PSID_LEN + 1);
-                strncpy(tools_image_info.name, _fs3ImgInfo.ext_info.name,
-                        NAME_LEN);
-                strncpy(tools_image_info.description,
-                        _fs3ImgInfo.ext_info.description, DESCRIPTION_LEN);
+                strncpy(tools_image_info.psid, _fwImgInfo.ext_info.psid, PSID_LEN + 1);
+                strncpy(tools_image_info.name, _fs3ImgInfo.ext_info.name, NAME_LEN);
+                strncpy(tools_image_info.description, _fs3ImgInfo.ext_info.description, DESCRIPTION_LEN);
                 tools_open_image_info_pack(&tools_image_info, &imageInfoSect[0]);
             }
 
-            //update image info toc and section
-            if (!Fs4UpdateItocInfo(imageInfoToc,
-                                   imageInfoToc->toc_entry.size,
-                                   imageInfoSect)) {
+            // update image info toc and section
+            if (!Fs4UpdateItocInfo(imageInfoToc, imageInfoToc->toc_entry.size, imageInfoSect))
+            {
                 return false;
             }
-            //update the toc in the cache
-            imageOps.Fs3UpdateImgCache(imageInfoToc->data,
-                                       imageInfoToc->entry_addr,
-                                       IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
-            //update the section in the cache
+            // update the toc in the cache
+            imageOps.Fs3UpdateImgCache(imageInfoToc->data, imageInfoToc->entry_addr, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
+            // update the section in the cache
             imageOps.Fs3UpdateImgCache(imageInfoToc->section_data.data(),
                                        imageInfoToc->toc_entry.flash_addr << 2,
                                        imageInfoToc->toc_entry.size * 4);
@@ -2657,20 +2932,27 @@ bool Fs4Operations::FsBurnAux(FwOperations *imgops, ExtBurnParams& burnParams)
     return rc;
 }
 
-bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
-                                   fs3_section_t sect_type, struct fs4_toc_info *&curr_toc)
+bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info* tocArr,
+                                   int num_of_itocs,
+                                   fs3_section_t sect_type,
+                                   struct fs4_toc_info*& curr_toc)
 {
     int tocIndex;
     return Fs4GetItocInfo(tocArr, num_of_itocs, sect_type, curr_toc, tocIndex);
 }
 
-bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
-                                   fs3_section_t sect_type, struct fs4_toc_info *&curr_toc, int& toc_index)
+bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info* tocArr,
+                                   int num_of_itocs,
+                                   fs3_section_t sect_type,
+                                   struct fs4_toc_info*& curr_toc,
+                                   int& toc_index)
 {
-    for (int i = 0; i < num_of_itocs; i++) {
-        struct fs4_toc_info *itoc_info = &tocArr[i];
-        if (itoc_info->toc_entry.type == sect_type) {
-            curr_toc =  itoc_info;
+    for (int i = 0; i < num_of_itocs; i++)
+    {
+        struct fs4_toc_info* itoc_info = &tocArr[i];
+        if (itoc_info->toc_entry.type == sect_type)
+        {
+            curr_toc = itoc_info;
             toc_index = i;
             return true;
         }
@@ -2678,45 +2960,61 @@ bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itoc
     return errmsg("TOC entry type: %s (%d) not found", GetSectionNameByType(sect_type), sect_type);
 }
 
-bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
-                                   fs3_section_t sect_type, vector<struct fs4_toc_info *>& curr_toc)
+bool Fs4Operations::Fs4GetItocInfo(struct fs4_toc_info* tocArr,
+                                   int num_of_itocs,
+                                   fs3_section_t sect_type,
+                                   vector<struct fs4_toc_info*>& curr_toc)
 {
-    for (int i = 0; i < num_of_itocs; i++) {
-        struct fs4_toc_info *itoc_info = &tocArr[i];
-        if (itoc_info->toc_entry.type == sect_type) {
+    for (int i = 0; i < num_of_itocs; i++)
+    {
+        struct fs4_toc_info* itoc_info = &tocArr[i];
+        if (itoc_info->toc_entry.type == sect_type)
+        {
             curr_toc.push_back(itoc_info);
         }
     }
     return true;
 }
 
-bool Fs4Operations::Fs4UpdateMfgUidsSection(struct fs4_toc_info *curr_toc,
-                                            std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                                            std::vector<u_int8_t>  &newSectionData)
+bool Fs4Operations::Fs4UpdateMfgUidsSection(struct fs4_toc_info* curr_toc,
+                                            std::vector<u_int8_t> section_data,
+                                            fs3_uid_t base_uid,
+                                            std::vector<u_int8_t>& newSectionData)
 {
     struct cibfw_mfg_info cib_mfg_info;
     struct cx4fw_mfg_info cx4_mfg_info;
     (void)curr_toc;
-    cibfw_mfg_info_unpack(&cib_mfg_info, (u_int8_t *)&section_data[0]);
+    cibfw_mfg_info_unpack(&cib_mfg_info, (u_int8_t*)&section_data[0]);
 
-    if (cib_mfg_info.major_version == 0) {
-        if (!Fs3ChangeUidsFromBase(base_uid, cib_mfg_info.guids)) {
+    if (cib_mfg_info.major_version == 0)
+    {
+        if (!Fs3ChangeUidsFromBase(base_uid, cib_mfg_info.guids))
+        {
             return false;
         }
-    } else if (cib_mfg_info.major_version == 1) {
-        cx4fw_mfg_info_unpack(&cx4_mfg_info, (u_int8_t *)&section_data[0]);
-        if (!Fs3ChangeUidsFromBase(base_uid, cx4_mfg_info.guids)) {
+    }
+    else if (cib_mfg_info.major_version == 1)
+    {
+        cx4fw_mfg_info_unpack(&cx4_mfg_info, (u_int8_t*)&section_data[0]);
+        if (!Fs3ChangeUidsFromBase(base_uid, cx4_mfg_info.guids))
+        {
             return false;
         }
-    } else {
-        return errmsg("Unknown MFG_INFO format version (%d.%d).", cib_mfg_info.major_version, cib_mfg_info.minor_version);
+    }
+    else
+    {
+        return errmsg("Unknown MFG_INFO format version (%d.%d).", cib_mfg_info.major_version,
+                      cib_mfg_info.minor_version);
     }
     newSectionData = section_data;
 
-    if (cib_mfg_info.major_version == 1) {
-        cx4fw_mfg_info_pack(&cx4_mfg_info, (u_int8_t *)&newSectionData[0]);
-    } else {
-        cibfw_mfg_info_pack(&cib_mfg_info, (u_int8_t *)&newSectionData[0]);
+    if (cib_mfg_info.major_version == 1)
+    {
+        cx4fw_mfg_info_pack(&cx4_mfg_info, (u_int8_t*)&newSectionData[0]);
+    }
+    else
+    {
+        cibfw_mfg_info_pack(&cib_mfg_info, (u_int8_t*)&newSectionData[0]);
     }
     return true;
 }
@@ -2728,35 +3026,42 @@ bool Fs4Operations::Fs4ChangeUidsFromBase(fs3_uid_t base_uid, struct image_layou
      */
     u_int64_t base_guid_64;
     u_int64_t base_mac_64;
-    if (!base_uid.use_pp_attr) {
+    if (!base_uid.use_pp_attr)
+    {
         return errmsg("Expected per port attributes to be specified");
     }
 
     base_guid_64 = base_uid.base_guid_specified ? GUID_TO_64(base_uid.base_guid) : guids.guids.uid;
     base_mac_64 = base_uid.base_mac_specified ? GUID_TO_64(base_uid.base_mac) : guids.macs.uid;
-    if (base_uid.set_mac_from_guid && base_uid.base_guid_specified) {
+    if (base_uid.set_mac_from_guid && base_uid.base_guid_specified)
+    {
         // in case we derrive mac from guid
-        base_mac_64 = (((u_int64_t)base_uid.base_guid.l & 0xffffff) | (((u_int64_t)base_uid.base_guid.h & 0xffffff00) << 16));
+        base_mac_64 =
+          (((u_int64_t)base_uid.base_guid.l & 0xffffff) | (((u_int64_t)base_uid.base_guid.h & 0xffffff00) << 16));
     }
 
     guids.guids.uid = base_guid_64;
-    guids.guids.num_allocated = base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.guids.num_allocated;
+    guids.guids.num_allocated =
+      base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.guids.num_allocated;
     guids.guids.step = base_uid.step_size_pp[0] != DEFAULT_STEP ? base_uid.step_size_pp[0] : guids.guids.step;
 
     guids.macs.uid = base_mac_64;
-    guids.macs.num_allocated = base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.macs.num_allocated;
+    guids.macs.num_allocated =
+      base_uid.num_of_guids_pp[0] != DEFAULT_GUID_NUM ? base_uid.num_of_guids_pp[0] : guids.macs.num_allocated;
     guids.macs.step = base_uid.step_size_pp[0] != DEFAULT_STEP ? base_uid.step_size_pp[0] : guids.macs.step;
     return true;
 }
 
-bool Fs4Operations::Fs4UpdateUidsSection(std::vector<u_int8_t>  section_data,
-                                         fs3_uid_t base_uid, std::vector<u_int8_t>  &newSectionData)
+bool Fs4Operations::Fs4UpdateUidsSection(std::vector<u_int8_t> section_data,
+                                         fs3_uid_t base_uid,
+                                         std::vector<u_int8_t>& newSectionData)
 {
     struct image_layout_device_info dev_info;
 
-    image_layout_device_info_unpack(&dev_info, (u_int8_t *)&section_data[0]);
+    image_layout_device_info_unpack(&dev_info, (u_int8_t*)&section_data[0]);
 
-    if (!Fs4ChangeUidsFromBase(base_uid, dev_info.guids)) {
+    if (!Fs4ChangeUidsFromBase(base_uid, dev_info.guids))
+    {
         return false;
     }
 
@@ -2767,16 +3072,17 @@ bool Fs4Operations::Fs4UpdateUidsSection(std::vector<u_int8_t>  section_data,
 
     newSectionData = section_data;
 
-    image_layout_device_info_pack(&dev_info, (u_int8_t *)&newSectionData[0]);
+    image_layout_device_info_pack(&dev_info, (u_int8_t*)&newSectionData[0]);
     return true;
 }
 
-bool Fs4Operations::Fs4UpdateVsdSection(std::vector<u_int8_t>  section_data, char *user_vsd,
-                                        std::vector<u_int8_t>  &newSectionData)
+bool Fs4Operations::Fs4UpdateVsdSection(std::vector<u_int8_t> section_data,
+                                        char* user_vsd,
+                                        std::vector<u_int8_t>& newSectionData)
 {
     struct image_layout_device_info dev_info;
 
-    image_layout_device_info_unpack(&dev_info, (u_int8_t *)&section_data[0]);
+    image_layout_device_info_unpack(&dev_info, (u_int8_t*)&section_data[0]);
     memset(dev_info.vsd, 0, sizeof(dev_info.vsd));
     strncpy(dev_info.vsd, user_vsd, TOOLS_ARR_SZ(dev_info.vsd) - 1);
     newSectionData = section_data;
@@ -2784,7 +3090,7 @@ bool Fs4Operations::Fs4UpdateVsdSection(std::vector<u_int8_t>  section_data, cha
     dev_info.signature1 = DEV_INFO_SIG1;
     dev_info.signature2 = DEV_INFO_SIG2;
     dev_info.signature3 = DEV_INFO_SIG3;
-    image_layout_device_info_pack(&dev_info, (u_int8_t *)&newSectionData[0]);
+    image_layout_device_info_pack(&dev_info, (u_int8_t*)&newSectionData[0]);
     return true;
 }
 
@@ -2856,20 +3162,24 @@ bool Fs4Operations::UpdateDigitalCertRWSection(char* certChainFile,
     return true;
 }
 
-bool Fs4Operations::UpdateCertChainSection(struct fs4_toc_info *curr_toc, char *certChainFile,
-                                           std::vector<u_int8_t>  &newSectionData)
+bool Fs4Operations::UpdateCertChainSection(struct fs4_toc_info* curr_toc,
+                                           char* certChainFile,
+                                           std::vector<u_int8_t>& newSectionData)
 {
     int cert_chain_buff_size = 0;
-    u_int8_t *cert_chain_buff = (u_int8_t *)NULL;
+    u_int8_t* cert_chain_buff = (u_int8_t*)NULL;
 
-    if (!ReadBinFile(certChainFile, cert_chain_buff, cert_chain_buff_size)) {
+    if (!ReadBinFile(certChainFile, cert_chain_buff, cert_chain_buff_size))
+    {
         return false;
     }
 
     //* Assert given certificate chain doesn't exceed its allocated size
     u_int32_t cert_chain_0_section_size = curr_toc->toc_entry.size << 2;
-    if ((u_int32_t)cert_chain_buff_size > cert_chain_0_section_size) {
-        return errmsg("Attestation certificate chain data exceeds its allocated size of 0x%x bytes", cert_chain_0_section_size);
+    if ((u_int32_t)cert_chain_buff_size > cert_chain_0_section_size)
+    {
+        return errmsg("Attestation certificate chain data exceeds its allocated size of 0x%x bytes",
+                      cert_chain_0_section_size);
     }
 
     newSectionData.resize(cert_chain_0_section_size, 0); // Init section data with 0x0
@@ -2878,36 +3188,38 @@ bool Fs4Operations::UpdateCertChainSection(struct fs4_toc_info *curr_toc, char *
     return true;
 }
 
-bool Fs4Operations::Fs4UpdateVpdSection(struct fs4_toc_info *curr_toc, char *vpd,
-                                        std::vector<u_int8_t>  &newSectionData)
+bool Fs4Operations::Fs4UpdateVpdSection(struct fs4_toc_info* curr_toc, char* vpd, std::vector<u_int8_t>& newSectionData)
 {
     int vpd_size = 0;
-    u_int8_t *vpd_data = (u_int8_t *)NULL;
+    u_int8_t* vpd_data = (u_int8_t*)NULL;
 
-    if (!ReadBinFile(vpd, vpd_data, vpd_size)) {
+    if (!ReadBinFile(vpd, vpd_data, vpd_size))
+    {
         return false;
     }
-    if (vpd_size % 4) {
+    if (vpd_size % 4)
+    {
         delete[] vpd_data;
         return errmsg("Size of VPD file: %d is not 4-byte aligned!", vpd_size);
     }
 
-    //check if vpd exceeds the dtoc array
+    // check if vpd exceeds the dtoc array
     u_int32_t vpdAddress = curr_toc->toc_entry.flash_addr << 2;
-    if (vpdAddress + vpd_size >=
-        (_ioAccess->get_size() - FS4_DEFAULT_SECTOR_SIZE)) {
+    if (vpdAddress + vpd_size >= (_ioAccess->get_size() - FS4_DEFAULT_SECTOR_SIZE))
+    {
         delete[] vpd_data;
-        return errmsg("VPD data exceeds dtoc array, max VPD size: 0x%x bytes",
-                      _ioAccess->get_size() - vpdAddress - 1);
+        return errmsg("VPD data exceeds dtoc array, max VPD size: 0x%x bytes", _ioAccess->get_size() - vpdAddress - 1);
     }
-    GetSectData(newSectionData, (u_int32_t *)vpd_data, vpd_size);
+    GetSectData(newSectionData, (u_int32_t*)vpd_data, vpd_size);
     curr_toc->toc_entry.size = vpd_size / 4;
     delete[] vpd_data;
     return true;
 }
 
-bool Fs4Operations::Fs4ReburnSection(u_int32_t newSectionAddr, u_int32_t newSectionSize,
-                                     std::vector<u_int8_t>  newSectionData, const char *msg,
+bool Fs4Operations::Fs4ReburnSection(u_int32_t newSectionAddr,
+                                     u_int32_t newSectionSize,
+                                     std::vector<u_int8_t> newSectionData,
+                                     const char* msg,
                                      PrintCallBack callBackFunc)
 {
     char message[127];
@@ -2918,26 +3230,32 @@ bool Fs4Operations::Fs4ReburnSection(u_int32_t newSectionAddr, u_int32_t newSect
     PRINT_PROGRESS(callBackFunc, message);
 
     // If encrypted image is valid we want to write to it
-    if (_encrypted_image_io_access) {
+    if (_encrypted_image_io_access)
+    {
         DPRINTF(("Fs4Operations::Fs4ReburnSection updating encrypted image at addr 0x%x\n", newSectionAddr));
-        if (!_encrypted_image_io_access->write(newSectionAddr, (u_int8_t *)&newSectionData[0], newSectionSize)) {
+        if (!_encrypted_image_io_access->write(newSectionAddr, (u_int8_t*)&newSectionData[0], newSectionSize))
+        {
             return errmsg("%s", _encrypted_image_io_access->err());
         }
     }
-    else {
-        if (!writeImage((ProgressCallBack)NULL, newSectionAddr, (u_int8_t *)&newSectionData[0], newSectionSize, true, true)) {
-            PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    else
+    {
+        if (!writeImage((ProgressCallBack)NULL, newSectionAddr, (u_int8_t*)&newSectionData[0], newSectionSize, true,
+                        true))
+        {
+            PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
             return false;
         }
     }
 
-    PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+    PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
 
     return true;
 }
 
-bool Fs4Operations::CalcHashOnSection(u_int32_t addr, u_int32_t size, vector<u_int8_t>& hash) {
-#if !defined(NO_OPEN_SSL) && !defined(NO_DYNAMIC_ENGINE) //mlxSignSHA is only available with OPEN_SSL
+bool Fs4Operations::CalcHashOnSection(u_int32_t addr, u_int32_t size, vector<u_int8_t>& hash)
+{
+#if !defined(NO_OPEN_SSL) && !defined(NO_DYNAMIC_ENGINE) // mlxSignSHA is only available with OPEN_SSL
     vector<u_int8_t> data;
     data.resize(size);
     READBUF((*_ioAccess), addr, (u_int32_t*)&data[0], size, "Reading section data for hash calculation");
@@ -2955,9 +3273,11 @@ bool Fs4Operations::CalcHashOnSection(u_int32_t addr, u_int32_t size, vector<u_i
 #endif
 }
 
-bool Fs4Operations::IsSectionShouldBeHashed(fs3_section_t section_type) {
+bool Fs4Operations::IsSectionShouldBeHashed(fs3_section_t section_type)
+{
     bool res;
-    switch (section_type) {
+    switch (section_type)
+    {
         case FS3_PUBLIC_KEYS_2048:
         case FS3_PUBLIC_KEYS_4096:
         case FS3_IMAGE_SIGNATURE_256:
@@ -2972,16 +3292,20 @@ bool Fs4Operations::IsSectionShouldBeHashed(fs3_section_t section_type) {
     return res;
 }
 
-bool Fs4Operations::UpdateSectionHashInHashesTable(u_int32_t addr, u_int32_t size, fs3_section_t type) {
-    if (getSecureBootSignVersion() == VERSION_2 && IsSectionShouldBeHashed(type)) {
+bool Fs4Operations::UpdateSectionHashInHashesTable(u_int32_t addr, u_int32_t size, fs3_section_t type)
+{
+    if (getSecureBootSignVersion() == VERSION_2 && IsSectionShouldBeHashed(type))
+    {
         DPRINTF(("Fs4Operations::UpdateSectionHashInHashesTable type=0x%x\n", type));
 
         vector<u_int8_t> hash;
-        if (!CalcHashOnSection(addr, size, hash)) {
+        if (!CalcHashOnSection(addr, size, hash))
+        {
             return errmsg("Failed to calculate section hash");
         }
 
-        if (!UpdateHashInHashesTable(type, hash)) {
+        if (!UpdateHashInHashesTable(type, hash))
+        {
             return false;
         }
     }
@@ -2989,12 +3313,14 @@ bool Fs4Operations::UpdateSectionHashInHashesTable(u_int32_t addr, u_int32_t siz
     return true;
 }
 
-bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u_int8_t> hash) {
+bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u_int8_t> hash)
+{
     //* Init HTOC
     vector<u_int8_t> img;
     FwInit();
     _imageCache.clear();
-    if (!FwExtract4MBImage(img, true)) {
+    if (!FwExtract4MBImage(img, true))
+    {
         return false;
     }
     const u_int32_t htoc_address = _hashes_table_ptr + IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE;
@@ -3003,9 +3329,11 @@ bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u
     // TODO - move below logic to HTOC
     //* Get hash addr in hashes_table
     struct image_layout_htoc_entry htoc_entry;
-    if (!htoc->GetEntryBySectionType(section_type, htoc_entry)) {
+    if (!htoc->GetEntryBySectionType(section_type, htoc_entry))
+    {
         DPRINTF(("Fs4Operations::UpdateHashInHashesTable Can't find section type 0x%x in htoc\n", section_type));
-        if (!htoc->AddNewEntry(_ioAccess, section_type, htoc_entry)) {
+        if (!htoc->AddNewEntry(_ioAccess, section_type, htoc_entry))
+        {
             return errmsg("Failed to add new entry of section type 0x%x to htoc", section_type);
         }
     }
@@ -3013,14 +3341,16 @@ bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u
     u_int32_t hash_size = htoc->header.hash_size;
 
     //* Insert hash (SHA512) to hashes_table
-    if (!_ioAccess->write(hash_addr, hash.data(), hash_size)) {
+    if (!_ioAccess->write(hash_addr, hash.data(), hash_size))
+    {
         return errmsg("Failed to insert hash to hashes_table");
     }
 
     //* Calculate CRC on modified hashes_table
     const u_int32_t HASHES_TABLE_TAIL_SIZE = 8;
-    u_int32_t hashes_table_size = IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE + IMAGE_LAYOUT_HTOC_HEADER_SIZE + \
-                                MAX_HTOC_ENTRIES_NUM * (IMAGE_LAYOUT_HTOC_ENTRY_SIZE + hash_size) + HASHES_TABLE_TAIL_SIZE;
+    u_int32_t hashes_table_size = IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE + IMAGE_LAYOUT_HTOC_HEADER_SIZE +
+                                  MAX_HTOC_ENTRIES_NUM * (IMAGE_LAYOUT_HTOC_ENTRY_SIZE + hash_size) +
+                                  HASHES_TABLE_TAIL_SIZE;
     u_int8_t* hashes_table_data;
     READALLOCBUF((*_ioAccess), _hashes_table_ptr, hashes_table_data, hashes_table_size, "HASHES TABLE");
     u_int32_t hashes_table_crc = CalcImageCRC((u_int32_t*)hashes_table_data, (hashes_table_size / 4) - 1);
@@ -3028,7 +3358,8 @@ bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u
 
     //* Insert calculated CRC to last DWORD in hashes_table
     u_int32_t hashes_table_crc_addr = _hashes_table_ptr + hashes_table_size - 4;
-    if (!_ioAccess->write(hashes_table_crc_addr, &hashes_table_crc, 4)) {
+    if (!_ioAccess->write(hashes_table_crc_addr, &hashes_table_crc, 4))
+    {
         return errmsg("Failed to write hashes_table crc");
     }
 
@@ -3038,12 +3369,17 @@ bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u
 bool Fs4Operations::Fs4ReburnTocSection(bool isDtoc, PrintCallBack callBackFunc)
 {
     // Update new TOC section
-    if (isDtoc) {
-        if (!reburnDTocSection(callBackFunc)) {
+    if (isDtoc)
+    {
+        if (!reburnDTocSection(callBackFunc))
+        {
             return false;
         }
-    } else {
-        if (!reburnITocSection(callBackFunc, _ioAccess->is_flash())) {
+    }
+    else
+    {
+        if (!reburnITocSection(callBackFunc, _ioAccess->is_flash()))
+        {
             return false;
         }
     }
@@ -3055,25 +3391,28 @@ bool Fs4Operations::reburnDTocSection(PrintCallBack callBackFunc)
     // Itoc section is failsafe (two sectors after boot section are reserved for itoc entries)
     u_int32_t tocAddr = _fs4ImgInfo.dtocArr.tocArrayAddr;
     // Update new ITOC
-    u_int32_t tocSize = (_fs4ImgInfo.dtocArr.numOfTocs + 1) * IMAGE_LAYOUT_ITOC_ENTRY_SIZE + IMAGE_LAYOUT_ITOC_HEADER_SIZE;
-    u_int8_t *p = new u_int8_t[tocSize];
+    u_int32_t tocSize =
+      (_fs4ImgInfo.dtocArr.numOfTocs + 1) * IMAGE_LAYOUT_ITOC_ENTRY_SIZE + IMAGE_LAYOUT_ITOC_HEADER_SIZE;
+    u_int8_t* p = new u_int8_t[tocSize];
     memcpy(p, _fs4ImgInfo.dtocArr.tocHeader, CIBFW_ITOC_HEADER_SIZE);
-    for (int i = 0; i < _fs4ImgInfo.dtocArr.numOfTocs; i++) {
-        struct fs4_toc_info *curr_itoc = &_fs4ImgInfo.dtocArr.tocArr[i];
+    for (int i = 0; i < _fs4ImgInfo.dtocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* curr_itoc = &_fs4ImgInfo.dtocArr.tocArr[i];
         memcpy(p + IMAGE_LAYOUT_ITOC_HEADER_SIZE + i * IMAGE_LAYOUT_ITOC_ENTRY_SIZE,
                curr_itoc->data,
                IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
     }
     memset(&p[tocSize] - IMAGE_LAYOUT_ITOC_ENTRY_SIZE, FS3_END, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
 
-    PRINT_PROGRESS(callBackFunc, (char *)"Updating DTOC section - ");
+    PRINT_PROGRESS(callBackFunc, (char*)"Updating DTOC section - ");
     bool rc = writeImage((ProgressCallBack)NULL, tocAddr, p, tocSize, true, true);
     delete[] p;
-    if (!rc) {
-        PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    if (!rc)
+    {
+        PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
         return false;
     }
-    PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+    PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
 
     return true;
 }
@@ -3084,51 +3423,58 @@ bool Fs4Operations::reburnITocSection(PrintCallBack callBackFunc, bool isFailSaf
     u_int32_t sector_size = FS3_DEFAULT_SECTOR_SIZE;
     u_int32_t oldITocAddr = _fs4ImgInfo.itocArr.tocArrayAddr;
     u_int32_t newITocAddr = oldITocAddr;
-    if (isFailSafe) {
-        newITocAddr = (_fs4ImgInfo.firstItocArrayIsEmpty) ?
-                      (_fs4ImgInfo.itocArr.tocArrayAddr - sector_size) :
-                      (_fs4ImgInfo.itocArr.tocArrayAddr + sector_size);
+    if (isFailSafe)
+    {
+        newITocAddr = (_fs4ImgInfo.firstItocArrayIsEmpty) ? (_fs4ImgInfo.itocArr.tocArrayAddr - sector_size) :
+                                                            (_fs4ImgInfo.itocArr.tocArrayAddr + sector_size);
     }
     // Update new ITOC
-    u_int32_t tocSize = (_fs4ImgInfo.itocArr.numOfTocs + 1) * IMAGE_LAYOUT_ITOC_ENTRY_SIZE + IMAGE_LAYOUT_ITOC_HEADER_SIZE;
-    u_int8_t *p = new u_int8_t[tocSize];
+    u_int32_t tocSize =
+      (_fs4ImgInfo.itocArr.numOfTocs + 1) * IMAGE_LAYOUT_ITOC_ENTRY_SIZE + IMAGE_LAYOUT_ITOC_HEADER_SIZE;
+    u_int8_t* p = new u_int8_t[tocSize];
     memcpy(p, _fs4ImgInfo.itocArr.tocHeader, CIBFW_ITOC_HEADER_SIZE);
-    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++) {
-        struct fs4_toc_info *curr_itoc = &_fs4ImgInfo.itocArr.tocArr[i];
+    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* curr_itoc = &_fs4ImgInfo.itocArr.tocArr[i];
         memcpy(p + IMAGE_LAYOUT_ITOC_HEADER_SIZE + i * IMAGE_LAYOUT_ITOC_ENTRY_SIZE,
                curr_itoc->data,
                IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
     }
     memset(&p[tocSize] - IMAGE_LAYOUT_ITOC_ENTRY_SIZE, FS3_END, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
 
-    PRINT_PROGRESS(callBackFunc, (char *)"Updating ITOC section - ");
+    PRINT_PROGRESS(callBackFunc, (char*)"Updating ITOC section - ");
     bool rc = writeImage((ProgressCallBack)NULL, newITocAddr, p, tocSize, true, true);
     delete[] p;
-    if (!rc) {
-        PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    if (!rc)
+    {
+        PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
         return false;
     }
-    PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+    PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
 
     u_int32_t zeros = 0;
-    if (isFailSafe) {
-        PRINT_PROGRESS(callBackFunc, (char *)"Restoring signature   - ");
-        if (!writeImage((ProgressCallBack)NULL, oldITocAddr, (u_int8_t *)&zeros, 4, false, true)) {
-            PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+    if (isFailSafe)
+    {
+        PRINT_PROGRESS(callBackFunc, (char*)"Restoring signature   - ");
+        if (!writeImage((ProgressCallBack)NULL, oldITocAddr, (u_int8_t*)&zeros, 4, false, true))
+        {
+            PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
             return false;
         }
-        PRINT_PROGRESS(callBackFunc, (char *)"OK\n");
+        PRINT_PROGRESS(callBackFunc, (char*)"OK\n");
     }
 
-    if (getSecureBootSignVersion() == VERSION_2) {
-
+    if (getSecureBootSignVersion() == VERSION_2)
+    {
         vector<u_int8_t> hash;
-        u_int32_t itocSize = _fs4ImgInfo.itocArr.numOfTocs * TOC_ENTRY_SIZE + TOC_HEADER_SIZE; 
-        if (!CalcHashOnSection(newITocAddr, itocSize, hash)) {
+        u_int32_t itocSize = _fs4ImgInfo.itocArr.numOfTocs * TOC_ENTRY_SIZE + TOC_HEADER_SIZE;
+        if (!CalcHashOnSection(newITocAddr, itocSize, hash))
+        {
             return errmsg("Failed to calculate ITOC hash");
         }
 
-        if (!UpdateHashInHashesTable(FS3_ITOC, hash)) {
+        if (!UpdateHashInHashesTable(FS3_ITOC, hash))
+        {
             return false;
         }
     }
@@ -3136,26 +3482,30 @@ bool Fs4Operations::reburnITocSection(PrintCallBack callBackFunc, bool isFailSaf
     return true;
 }
 
-bool Fs4Operations::Fs4UpdateItocInfo(struct fs4_toc_info *curr_toc,
-                                      u_int32_t NewSectSize, std::vector<u_int8_t>&  newSectionData)
+bool Fs4Operations::Fs4UpdateItocInfo(struct fs4_toc_info* curr_toc,
+                                      u_int32_t NewSectSize,
+                                      std::vector<u_int8_t>& newSectionData)
 {
     u_int8_t tocEntryBuff[IMAGE_LAYOUT_ITOC_ENTRY_SIZE];
 
     curr_toc->toc_entry.size = NewSectSize;
     curr_toc->section_data = newSectionData;
 
-    if (curr_toc->toc_entry.crc == INITOCENTRY) {
-        curr_toc->toc_entry.section_crc = CalcImageCRC((u_int32_t *)&newSectionData[0], curr_toc->toc_entry.size);
-    } else if (curr_toc->toc_entry.crc == INSECTION) {
-        u_int32_t newSectionCRC = CalcImageCRC((u_int32_t *)&newSectionData[0], curr_toc->toc_entry.size - 1);
-        ((u_int32_t *)curr_toc->section_data.data())[curr_toc->toc_entry.size - 1] = newSectionCRC;
-        ((u_int32_t *)newSectionData.data())[curr_toc->toc_entry.size - 1] = TOCPU1(newSectionCRC);
+    if (curr_toc->toc_entry.crc == INITOCENTRY)
+    {
+        curr_toc->toc_entry.section_crc = CalcImageCRC((u_int32_t*)&newSectionData[0], curr_toc->toc_entry.size);
+    }
+    else if (curr_toc->toc_entry.crc == INSECTION)
+    {
+        u_int32_t newSectionCRC = CalcImageCRC((u_int32_t*)&newSectionData[0], curr_toc->toc_entry.size - 1);
+        ((u_int32_t*)curr_toc->section_data.data())[curr_toc->toc_entry.size - 1] = newSectionCRC;
+        ((u_int32_t*)newSectionData.data())[curr_toc->toc_entry.size - 1] = TOCPU1(newSectionCRC);
     }
 
     memset(tocEntryBuff, 0, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
     image_layout_itoc_entry_pack(&curr_toc->toc_entry, tocEntryBuff);
 
-    u_int32_t newEntryCRC = CalcImageCRC((u_int32_t *)tocEntryBuff, (TOC_ENTRY_SIZE / 4) - 1);
+    u_int32_t newEntryCRC = CalcImageCRC((u_int32_t*)tocEntryBuff, (TOC_ENTRY_SIZE / 4) - 1);
     curr_toc->toc_entry.itoc_entry_crc = newEntryCRC;
 
     memset(curr_toc->data, 0, IMAGE_LAYOUT_ITOC_ENTRY_SIZE);
@@ -3166,28 +3516,29 @@ bool Fs4Operations::Fs4UpdateItocInfo(struct fs4_toc_info *curr_toc,
 
 bool Fs4Operations::isDTocSection(fs3_section_t sect_type, bool& isDtoc)
 {
-    switch ((int)sect_type) {
-    case FS3_MFG_INFO:
-    case FS3_DEV_INFO:
-    case FS3_VPD_R0:
-    case FS4_DIGITAL_CERT_RW:
-    case FS4_CERT_CHAIN_0:
-        isDtoc = true;
-        break;
-
-    case FS3_PUBLIC_KEYS_4096:
-    case FS3_PUBLIC_KEYS_2048:
-    case FS3_IMAGE_SIGNATURE_256:
-    case FS3_IMAGE_SIGNATURE_512:
-    case FS3_FORBIDDEN_VERSIONS:
-    case FS4_RSA_PUBLIC_KEY:
-    case FS4_RSA_4096_SIGNATURES:
-        isDtoc = false;
-        break;
-
-    default:
-        return errmsg("Section type %s is not supported\n", GetSectionNameByType(sect_type));
-        break;
+    switch ((int)sect_type)
+    {
+        case FS3_MFG_INFO:
+        case FS3_DEV_INFO:
+        case FS3_VPD_R0:
+        case FS4_DIGITAL_CERT_RW:
+        case FS4_CERT_CHAIN_0:
+            isDtoc = true;
+            break;
+
+        case FS3_PUBLIC_KEYS_4096:
+        case FS3_PUBLIC_KEYS_2048:
+        case FS3_IMAGE_SIGNATURE_256:
+        case FS3_IMAGE_SIGNATURE_512:
+        case FS3_FORBIDDEN_VERSIONS:
+        case FS4_RSA_PUBLIC_KEY:
+        case FS4_RSA_4096_SIGNATURES:
+            isDtoc = false;
+            break;
+
+        default:
+            return errmsg("Section type %s is not supported\n", GetSectionNameByType(sect_type));
+            break;
     }
     return true;
 }
@@ -3195,49 +3546,61 @@ bool Fs4Operations::isDTocSection(fs3_section_t sect_type, bool& isDtoc)
 bool Fs4Operations::IsSectionExists(fs3_section_t sectType)
 {
     bool isDtoc;
-    struct fs4_toc_info  *tocArr;
+    struct fs4_toc_info* tocArr;
     u_int32_t numOfTocs;
-    struct fs4_toc_info *curr_toc = (fs4_toc_info *)NULL;
+    struct fs4_toc_info* curr_toc = (fs4_toc_info*)NULL;
     int tocIndex = 0;
 
-    if (!isDTocSection(sectType, isDtoc)) {
+    if (!isDTocSection(sectType, isDtoc))
+    {
         return false;
     }
 
-    if (isDtoc) {
+    if (isDtoc)
+    {
         tocArr = _fs4ImgInfo.dtocArr.tocArr;
         numOfTocs = _fs4ImgInfo.dtocArr.numOfTocs;
-    } else {
+    }
+    else
+    {
         tocArr = _fs4ImgInfo.itocArr.tocArr;
         numOfTocs = _fs4ImgInfo.itocArr.numOfTocs;
     }
-    if (!Fs4GetItocInfo(tocArr, numOfTocs, sectType, curr_toc, tocIndex)) {
+    if (!Fs4GetItocInfo(tocArr, numOfTocs, sectType, curr_toc, tocIndex))
+    {
         return false;
     }
     return true;
 }
 
-bool Fs4Operations::VerifyImageAfterModifications() {
+bool Fs4Operations::VerifyImageAfterModifications()
+{
     bool image_encrypted = false;
-    if (!isEncrypted(image_encrypted)) {
+    if (!isEncrypted(image_encrypted))
+    {
         return errmsg(getErrorCode(), "%s", err());
     }
 
-    if (image_encrypted) {
+    if (image_encrypted)
+    {
         fw_info_t fwInfo;
-        if (!encryptedFwQuery(&fwInfo, false, false)) {
+        if (!encryptedFwQuery(&fwInfo, false, false))
+        {
             return errmsg("%s", err());
         }
     }
-    else if (!FsIntQueryAux(false, false)) {
+    else if (!FsIntQueryAux(false, false))
+    {
         return false;
     }
 
     return true;
 }
 
-bool Fs4Operations::FwSetCertChain(char *certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc) {
-    if (!certFileStr) {
+bool Fs4Operations::FwSetCertChain(char* certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc)
+{
+    if (!certFileStr)
+    {
         return errmsg("Please specify a valid certificate chain file.");
     }
     FAIL_NO_OCR("set attestation certificate chain");
@@ -3262,197 +3625,257 @@ bool Fs4Operations::FwSetCertChain(char *certFileStr, u_int32_t certIndex, Print
         }
     }
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
-    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications()) {
+    if (!_ioAccess->is_flash() && !VerifyImageAfterModifications())
+    {
         return false;
     }
     return true;
 }
 
-bool Fs4Operations::UpdateSection(void *new_info, fs3_section_t sect_type, bool, CommandType cmd_type, PrintCallBack callBackFunc)
+bool Fs4Operations::UpdateSection(void* new_info,
+                                  fs3_section_t sect_type,
+                                  bool,
+                                  CommandType cmd_type,
+                                  PrintCallBack callBackFunc)
 {
-    struct fs4_toc_info *curr_toc = (fs4_toc_info *)NULL;
-    struct fs4_toc_info *old_toc = (fs4_toc_info *)NULL;
+    struct fs4_toc_info* curr_toc = (fs4_toc_info*)NULL;
+    struct fs4_toc_info* old_toc = (fs4_toc_info*)NULL;
     std::vector<u_int8_t> newSection;
     u_int32_t newSectionAddr;
-    const char *type_msg;
-    struct fs4_toc_info  *tocArr;
+    const char* type_msg;
+    struct fs4_toc_info* tocArr;
     u_int32_t numOfTocs;
     u_int32_t zeroes = 0;
     bool isDtoc;
 
-    if (!isDTocSection(sect_type, isDtoc)) {
+    if (!isDTocSection(sect_type, isDtoc))
+    {
         return false;
     }
 
     bool image_encrypted = false;
-    if (!isEncrypted(image_encrypted)) {
+    if (!isEncrypted(image_encrypted))
+    {
         return errmsg(getErrorCode(), "%s", err());
     }
 
-    if (image_encrypted) {
-        if (!isDtoc) {
+    if (image_encrypted)
+    {
+        if (!isDtoc)
+        {
             return errmsg("Can't update ITOC section in case of encrypted image");
         }
         fw_info_t fwInfo;
-        if (!encryptedFwQuery(&fwInfo)) {
+        if (!encryptedFwQuery(&fwInfo))
+        {
             return errmsg("%s", err());
         }
     }
-    else {
+    else
+    {
         // init sector to read
         _readSectList.push_back(sect_type);
-        if (!FsIntQueryAux()) {
+        if (!FsIntQueryAux())
+        {
             _readSectList.pop_back();
             return false;
         }
         _readSectList.pop_back();
     }
 
-
     bool is_sect_failsafe = (sect_type == FS3_DEV_INFO);
 
-
-    if (isDtoc) {
+    if (isDtoc)
+    {
         tocArr = _fs4ImgInfo.dtocArr.tocArr;
         numOfTocs = _fs4ImgInfo.dtocArr.numOfTocs;
-    } else {
+    }
+    else
+    {
         tocArr = _fs4ImgInfo.itocArr.tocArr;
         numOfTocs = _fs4ImgInfo.itocArr.numOfTocs;
     }
 
-    if (is_sect_failsafe) {
-        vector<struct fs4_toc_info *> tocs;
-        //find first valid section
-        if (!Fs4GetItocInfo(tocArr, numOfTocs, sect_type, tocs)) {
+    if (is_sect_failsafe)
+    {
+        vector<struct fs4_toc_info*> tocs;
+        // find first valid section
+        if (!Fs4GetItocInfo(tocArr, numOfTocs, sect_type, tocs))
+        {
             return false;
         }
-        if (tocs.size() < 2) {
-            PRINT_PROGRESS(callBackFunc, (char *)"FAILED\n");
+        if (tocs.size() < 2)
+        {
+            PRINT_PROGRESS(callBackFunc, (char*)"FAILED\n");
             return false;
         }
-        for (size_t i = 0; i < tocs.size(); i++) {
-            if (CheckDevInfoSignature((u_int32_t *)(tocs[i]->section_data.data()))) {
+        for (size_t i = 0; i < tocs.size(); i++)
+        {
+            if (CheckDevInfoSignature((u_int32_t*)(tocs[i]->section_data.data())))
+            {
                 old_toc = tocs[i];
-                //find the second section (valid or not valid, does not matter)
-                if (i == 0) {
+                // find the second section (valid or not valid, does not matter)
+                if (i == 0)
+                {
                     curr_toc = tocs[1];
-                } else {
+                }
+                else
+                {
                     curr_toc = tocs[0];
                 }
                 break;
             }
         }
-        if (!old_toc) {
+        if (!old_toc)
+        {
             return errmsg("Bad DEV_INFO signature.");
         }
-    } else {
+    }
+    else
+    {
         int tocIndex = 0;
-        if (!Fs4GetItocInfo(tocArr, numOfTocs, sect_type, curr_toc, tocIndex)) {
+        if (!Fs4GetItocInfo(tocArr, numOfTocs, sect_type, curr_toc, tocIndex))
+        {
             return false;
         }
-        if (sect_type == FS3_VPD_R0 && ((u_int32_t)tocIndex) != numOfTocs - 1) {
+        if (sect_type == FS3_VPD_R0 && ((u_int32_t)tocIndex) != numOfTocs - 1)
+        {
             return errmsg("VPD Section is not the last device section");
         }
     }
 
-    if (!curr_toc) {
+    if (!curr_toc)
+    {
         return errmsg("Couldn't find TOC array.");
     }
 
-    if (sect_type == FS3_MFG_INFO) {
-        fs3_uid_t base_uid = *(fs3_uid_t *)new_info;
+    if (sect_type == FS3_MFG_INFO)
+    {
+        fs3_uid_t base_uid = *(fs3_uid_t*)new_info;
         type_msg = "GUID";
-        if (!Fs4UpdateMfgUidsSection(curr_toc, curr_toc->section_data, base_uid,
-                                     newSection)) {
+        if (!Fs4UpdateMfgUidsSection(curr_toc, curr_toc->section_data, base_uid, newSection))
+        {
             return false;
         }
-    } else if (sect_type == FS3_DEV_INFO) {
-        if (cmd_type == CMD_SET_GUIDS) {
-            fs3_uid_t base_uid = *(fs3_uid_t *)new_info;
+    }
+    else if (sect_type == FS3_DEV_INFO)
+    {
+        if (cmd_type == CMD_SET_GUIDS)
+        {
+            fs3_uid_t base_uid = *(fs3_uid_t*)new_info;
             type_msg = "GUID";
-            if (!Fs4UpdateUidsSection(old_toc->section_data, base_uid, newSection)) {
+            if (!Fs4UpdateUidsSection(old_toc->section_data, base_uid, newSection))
+            {
                 return false;
             }
-        } else if (cmd_type == CMD_SET_VSD) {
-            char *user_vsd = (char *)new_info;
+        }
+        else if (cmd_type == CMD_SET_VSD)
+        {
+            char* user_vsd = (char*)new_info;
             type_msg = "VSD";
-            if (!Fs4UpdateVsdSection(old_toc->section_data,
-                                     user_vsd,
-                                     newSection)) {
+            if (!Fs4UpdateVsdSection(old_toc->section_data, user_vsd, newSection))
+            {
                 return false;
             }
-        } else {
+        }
+        else
+        {
             // We shouldnt reach here EVER
-            type_msg = (char *)"Unknown";
+            type_msg = (char*)"Unknown";
         }
-    } else if (sect_type == FS3_VPD_R0) {
-        char *vpd_file = (char *)new_info;
+    }
+    else if (sect_type == FS3_VPD_R0)
+    {
+        char* vpd_file = (char*)new_info;
         type_msg = "VPD";
-        if (!Fs4UpdateVpdSection(curr_toc, vpd_file, newSection)) {
+        if (!Fs4UpdateVpdSection(curr_toc, vpd_file, newSection))
+        {
             return false;
         }
-    } else if (sect_type == FS4_CERT_CHAIN_0) {
-        char *cert_chain_file = (char *)new_info;
+    }
+    else if (sect_type == FS4_CERT_CHAIN_0)
+    {
+        char* cert_chain_file = (char*)new_info;
         type_msg = "CERT_CHAIN_0";
-        if (!UpdateCertChainSection(curr_toc, cert_chain_file, newSection)) {
+        if (!UpdateCertChainSection(curr_toc, cert_chain_file, newSection))
+        {
             return false;
         }
-    } else if (sect_type == FS3_IMAGE_SIGNATURE_256 && cmd_type == CMD_SET_SIGNATURE) {
-        vector<u_int8_t> sig((u_int8_t *)new_info, (u_int8_t *)new_info + CX4FW_IMAGE_SIGNATURE_256_SIZE);
+    }
+    else if (sect_type == FS3_IMAGE_SIGNATURE_256 && cmd_type == CMD_SET_SIGNATURE)
+    {
+        vector<u_int8_t> sig((u_int8_t*)new_info, (u_int8_t*)new_info + CX4FW_IMAGE_SIGNATURE_256_SIZE);
         type_msg = "SIGNATURE";
         newSection.resize(CX4FW_IMAGE_SIGNATURE_256_SIZE);
         memcpy(newSection.data(), sig.data(), CX4FW_IMAGE_SIGNATURE_256_SIZE);
-        //Check if padding is needed, by comparing with the real size in the itoc entry:
+        // Check if padding is needed, by comparing with the real size in the itoc entry:
         u_int32_t sizeInItocEntry = curr_toc->toc_entry.size << 2;
-        if (sizeInItocEntry > CX4FW_IMAGE_SIGNATURE_256_SIZE) {
-            for (unsigned int l = 0; l < sizeInItocEntry - CX4FW_IMAGE_SIGNATURE_256_SIZE; l++) {
+        if (sizeInItocEntry > CX4FW_IMAGE_SIGNATURE_256_SIZE)
+        {
+            for (unsigned int l = 0; l < sizeInItocEntry - CX4FW_IMAGE_SIGNATURE_256_SIZE; l++)
+            {
                 newSection.push_back(0x0);
             }
         }
-    } else if (sect_type == FS3_IMAGE_SIGNATURE_512 && cmd_type == CMD_SET_SIGNATURE) {
-        vector<u_int8_t> sig((u_int8_t *)new_info, (u_int8_t *)new_info + CX4FW_IMAGE_SIGNATURE_512_SIZE);
+    }
+    else if (sect_type == FS3_IMAGE_SIGNATURE_512 && cmd_type == CMD_SET_SIGNATURE)
+    {
+        vector<u_int8_t> sig((u_int8_t*)new_info, (u_int8_t*)new_info + CX4FW_IMAGE_SIGNATURE_512_SIZE);
         type_msg = "SIGNATURE";
         newSection.resize(CX4FW_IMAGE_SIGNATURE_512_SIZE);
         memcpy(newSection.data(), sig.data(), CX4FW_IMAGE_SIGNATURE_512_SIZE);
         u_int32_t sizeInItocEntry = curr_toc->toc_entry.size << 2;
-        if (sizeInItocEntry > CX4FW_IMAGE_SIGNATURE_256_SIZE) {
-            for (unsigned int l = 0; l < sizeInItocEntry - CX4FW_IMAGE_SIGNATURE_256_SIZE; l++) {
+        if (sizeInItocEntry > CX4FW_IMAGE_SIGNATURE_256_SIZE)
+        {
+            for (unsigned int l = 0; l < sizeInItocEntry - CX4FW_IMAGE_SIGNATURE_256_SIZE; l++)
+            {
                 newSection.push_back(0x0);
             }
         }
-    } else if (sect_type == FS3_PUBLIC_KEYS_2048 && cmd_type == CMD_SET_PUBLIC_KEYS) {
-        char *publickeys_file = (char *)new_info;
+    }
+    else if (sect_type == FS3_PUBLIC_KEYS_2048 && cmd_type == CMD_SET_PUBLIC_KEYS)
+    {
+        char* publickeys_file = (char*)new_info;
         type_msg = "PUBLIC KEYS";
-        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection)) {
+        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection))
+        {
             return false;
         }
-    } 
-    else if (sect_type == FS3_PUBLIC_KEYS_4096 && cmd_type == CMD_SET_PUBLIC_KEYS) {
-        char *publickeys_file = (char *)new_info;
+    }
+    else if (sect_type == FS3_PUBLIC_KEYS_4096 && cmd_type == CMD_SET_PUBLIC_KEYS)
+    {
+        char* publickeys_file = (char*)new_info;
         type_msg = "PUBLIC KEYS 4096";
-        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection)) {
+        if (!Fs3UpdatePublicKeysSection(curr_toc->toc_entry.size, publickeys_file, newSection))
+        {
             return false;
         }
-    } 
+    }
 #if !defined(UEFI_BUILD)
-    else if (sect_type == FS4_RSA_PUBLIC_KEY) {
-        char *publicKeysData = (char *)new_info;
+    else if (sect_type == FS4_RSA_PUBLIC_KEY)
+    {
+        char* publicKeysData = (char*)new_info;
         type_msg = "FS4_RSA_PUBLIC_KEY";
-        GetSectData(newSection, (u_int32_t *)publicKeysData, connectx4_public_keys_3_size());
-    } 
-    else if (sect_type == FS4_RSA_4096_SIGNATURES) {
-        char *signaturesData = (char *)new_info;
+        GetSectData(newSection, (u_int32_t*)publicKeysData, connectx4_public_keys_3_size());
+    }
+    else if (sect_type == FS4_RSA_4096_SIGNATURES)
+    {
+        char* signaturesData = (char*)new_info;
         type_msg = "FS4_RSA_4096_SIGNATURES";
-        GetSectData(newSection, (u_int32_t *)signaturesData, connectx4_secure_boot_signatures_size());
+        GetSectData(newSection, (u_int32_t*)signaturesData, connectx4_secure_boot_signatures_size());
     }
-#endif    
-    else if (sect_type == FS3_FORBIDDEN_VERSIONS && cmd_type == CMD_SET_FORBIDDEN_VERSIONS) {
-        char *forbiddenVersions_file = (char *)new_info;
+#endif
+    else if (sect_type == FS3_FORBIDDEN_VERSIONS && cmd_type == CMD_SET_FORBIDDEN_VERSIONS)
+    {
+        char* forbiddenVersions_file = (char*)new_info;
         type_msg = "Forbidden Versions";
-        if (!Fs3UpdateForbiddenVersionsSection(curr_toc->toc_entry.size, forbiddenVersions_file, newSection)) {
+        if (!Fs3UpdateForbiddenVersionsSection(curr_toc->toc_entry.size, forbiddenVersions_file, newSection))
+        {
             return false;
         }
-    } else {
+    }
+    else
+    {
         return errmsg("Section type %s is not supported\n", GetSectionNameByType(sect_type));
     }
 
@@ -3461,20 +3884,22 @@ bool Fs4Operations::UpdateSection(void *new_info, fs3_section_t sect_type, bool,
         return false;
     }
 
-    if (is_sect_failsafe) {
+    if (is_sect_failsafe)
+    {
         u_int32_t flash_addr = old_toc->toc_entry.flash_addr << 2;
         // If encrypted image was given we'll write to it
-        if (_encrypted_image_io_access) {
+        if (_encrypted_image_io_access)
+        {
             DPRINTF(("Fs4Operations::UpdateSection updating encrypted image at addr 0x%x with 0x0\n", flash_addr));
-            if (!_encrypted_image_io_access->write(flash_addr,
-                                                   (u_int8_t *)&zeroes, sizeof(zeroes))) {
+            if (!_encrypted_image_io_access->write(flash_addr, (u_int8_t*)&zeroes, sizeof(zeroes)))
+            {
                 return errmsg("%s", _encrypted_image_io_access->err());
             }
         }
-        else {
-            if (!writeImage((ProgressCallBack)NULL,
-                            flash_addr,
-                            (u_int8_t *)&zeroes, sizeof(zeroes), isDtoc, true)) {
+        else
+        {
+            if (!writeImage((ProgressCallBack)NULL, flash_addr, (u_int8_t*)&zeroes, sizeof(zeroes), isDtoc, true))
+            {
                 return false;
             }
         }
@@ -3611,12 +4036,12 @@ bool Fs4Operations::UpdateSection(fs3_section_t sectionType,
     return true;
 }
 
-u_int32_t Fs4Operations::getAbsAddr(fs4_toc_info *toc)
+u_int32_t Fs4Operations::getAbsAddr(fs4_toc_info* toc)
 {
     return ((toc->toc_entry.flash_addr << 2) + _fwImgInfo.imgStart);
 }
 
-u_int32_t Fs4Operations::getAbsAddr(fs4_toc_info *toc, u_int32_t imgStart)
+u_int32_t Fs4Operations::getAbsAddr(fs4_toc_info* toc, u_int32_t imgStart)
 {
     return ((toc->toc_entry.flash_addr << 2) + imgStart);
 }
@@ -3628,15 +4053,18 @@ bool Fs4Operations::FwShiftDevData(PrintCallBack progressFunc)
     return errmsg("Shifting device data sections is not supported in FS4 image format.");
 }
 
-#define OPEN_OCR(origFlashObj) do { \
-        origFlashObj = _ioAccess; \
-        _fwParams.ignoreCacheRep = 1; \
-        if (!FwOperations::FwAccessCreate(_fwParams, &_ioAccess)) { \
-            _ioAccess = origFlashObj; \
-            _fwParams.ignoreCacheRep = 0; \
+#define OPEN_OCR(origFlashObj)                                              \
+    do                                                                      \
+    {                                                                       \
+        origFlashObj = _ioAccess;                                           \
+        _fwParams.ignoreCacheRep = 1;                                       \
+        if (!FwOperations::FwAccessCreate(_fwParams, &_ioAccess))           \
+        {                                                                   \
+            _ioAccess = origFlashObj;                                       \
+            _fwParams.ignoreCacheRep = 0;                                   \
             return errmsg("Failed to open device for direct flash access"); \
-        } \
-} while (0)
+        }                                                                   \
+    } while (0)
 
 bool Fs4Operations::FwCalcMD5(u_int8_t md5sum[16])
 {
@@ -3644,7 +4072,8 @@ bool Fs4Operations::FwCalcMD5(u_int8_t md5sum[16])
     (void)md5sum;
     return errmsg("Operation not supported");
 #else
-    if (!FsIntQueryAux(true, false)) {
+    if (!FsIntQueryAux(true, false))
+    {
         return false;
     }
     // push beggining of image to md5buff
@@ -3652,21 +4081,25 @@ bool Fs4Operations::FwCalcMD5(u_int8_t md5sum[16])
     std::vector<u_int8_t> md5buff(sz, 0);
     _imageCache.get(&(md5buff[0]), sz);
     // push all non dev data sections to md5buff
-    for (unsigned int j = 0; j < TOC_HEADER_SIZE; j++) {
+    for (unsigned int j = 0; j < TOC_HEADER_SIZE; j++)
+    {
         md5buff.push_back(_imageCache[_fs4ImgInfo.itocArr.tocArrayAddr + j]);
     }
     // push itoc header
-    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++) {
+    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
         // push each non-dev-data section to md5sum buffer
         u_int32_t tocEntryAddr = _fs4ImgInfo.itocArr.tocArr[i].entry_addr;
         u_int32_t tocDataAddr = _fs4ImgInfo.itocArr.tocArr[i].toc_entry.flash_addr << 2;
-        u_int32_t tocDataSize =  _fs4ImgInfo.itocArr.tocArr[i].toc_entry.size << 2;
+        u_int32_t tocDataSize = _fs4ImgInfo.itocArr.tocArr[i].toc_entry.size << 2;
         // itoc entry
-        for (unsigned int j = 0; j < TOC_ENTRY_SIZE; j++) {
+        for (unsigned int j = 0; j < TOC_ENTRY_SIZE; j++)
+        {
             md5buff.push_back(_imageCache[tocEntryAddr + j]);
         }
         // itoc data
-        for (unsigned int j = 0; j < tocDataSize; j++) {
+        for (unsigned int j = 0; j < tocDataSize; j++)
+        {
             md5buff.push_back(_imageCache[tocDataAddr + j]);
         }
     }
@@ -3678,8 +4111,8 @@ bool Fs4Operations::FwCalcMD5(u_int8_t md5sum[16])
 
 bool Fs4Operations::CheckDTocArray()
 {
-
-    if (!CheckTocArrConsistency(_fs4ImgInfo.dtocArr, 0)) {
+    if (!CheckTocArrConsistency(_fs4ImgInfo.dtocArr, 0))
+    {
         return false;
     }
 
@@ -3689,12 +4122,14 @@ bool Fs4Operations::CheckDTocArray()
 bool Fs4Operations::CheckITocArray()
 {
     // Check for inconsistency image burnt on 1st half
-    if (!CheckTocArrConsistency(_fs4ImgInfo.itocArr, 0)) {
+    if (!CheckTocArrConsistency(_fs4ImgInfo.itocArr, 0))
+    {
         return false;
     }
 
     // Check for inconsistency image burn on second half
-    if (!CheckTocArrConsistency(_fs4ImgInfo.itocArr, (1 << _fwImgInfo.cntxLog2ChunkSize))) {
+    if (!CheckTocArrConsistency(_fs4ImgInfo.itocArr, (1 << _fwImgInfo.cntxLog2ChunkSize)))
+    {
         return false;
     }
     return true;
@@ -3702,29 +4137,28 @@ bool Fs4Operations::CheckITocArray()
 
 bool Fs4Operations::CheckTocArrConsistency(TocArray& tocArr, u_int32_t imageStartAddr)
 {
-
     u_int32_t sectEndAddr = 0;
     u_int32_t nextSectStrtAddr = 0;
 
-    //Sort the tocs
-    std::vector<struct fs4_toc_info *> sortedTocVec(tocArr.numOfTocs);
-    for (int i = 0; i < tocArr.numOfTocs; i++) {
+    // Sort the tocs
+    std::vector<struct fs4_toc_info*> sortedTocVec(tocArr.numOfTocs);
+    for (int i = 0; i < tocArr.numOfTocs; i++)
+    {
         sortedTocVec[i] = &(tocArr.tocArr[i]);
     }
     std::sort(sortedTocVec.begin(), sortedTocVec.end(), TocComp(imageStartAddr));
 
-    std::vector<struct fs4_toc_info *>::iterator it = sortedTocVec.begin(), itNext = sortedTocVec.begin();
+    std::vector<struct fs4_toc_info*>::iterator it = sortedTocVec.begin(), itNext = sortedTocVec.begin();
     itNext++;
-    for (; itNext != sortedTocVec.end(); it++, itNext++) {
+    for (; itNext != sortedTocVec.end(); it++, itNext++)
+    {
         sectEndAddr = getAbsAddr(*it, imageStartAddr) + ((*it)->toc_entry.size << 2) - 1;
         nextSectStrtAddr = getAbsAddr(*itNext, imageStartAddr);
-        if (sectEndAddr >= nextSectStrtAddr) {
-            return errmsg(
-                "Inconsistency found in TOC. %s(0x%x) section will potentially overwrite %s(0x%x) section.", \
-                GetSectionNameByType((*it)->toc_entry.type),
-                (*it)->toc_entry.type, \
-                GetSectionNameByType((*itNext)->toc_entry.type),
-                (*itNext)->toc_entry.type);
+        if (sectEndAddr >= nextSectStrtAddr)
+        {
+            return errmsg("Inconsistency found in TOC. %s(0x%x) section will potentially overwrite %s(0x%x) section.",
+                          GetSectionNameByType((*it)->toc_entry.type), (*it)->toc_entry.type,
+                          GetSectionNameByType((*itNext)->toc_entry.type), (*itNext)->toc_entry.type);
         }
     }
 
@@ -3736,37 +4170,42 @@ u_int32_t Fs4Operations::getImageSize()
     return _fwImgInfo.lastImageAddr - _fwImgInfo.imgStart;
 }
 
-bool Fs4Operations::GetImageSize(u_int32_t* image_size){
-    
+bool Fs4Operations::GetImageSize(u_int32_t* image_size)
+{
     bool is_encrypted = false;
-    if (!isEncrypted(is_encrypted)){
+    if (!isEncrypted(is_encrypted))
+    {
         return false;
     }
 
-    if (is_encrypted) {
-
-        if (!getEncryptedImageSize(image_size)){
+    if (is_encrypted)
+    {
+        if (!getEncryptedImageSize(image_size))
+        {
             return false;
         }
-    } else {
+    }
+    else
+    {
         *image_size = getImageSize();
-
     }
 
     return true;
 }
 
-
 void Fs4Operations::MaskItocSectionAndEntry(u_int32_t itocType, vector<u_int8_t>& img)
 {
-    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++) {
-        if (_fs4ImgInfo.itocArr.tocArr[i].toc_entry.type == itocType) {
+    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        if (_fs4ImgInfo.itocArr.tocArr[i].toc_entry.type == itocType)
+        {
             //* Mask section
             u_int32_t tocEntryDataAddr = _fs4ImgInfo.itocArr.tocArr[i].toc_entry.flash_addr << 2;
             memset(img.data() + tocEntryDataAddr, 0xFF, _fs4ImgInfo.itocArr.tocArr[i].toc_entry.size << 2);
 
             //* Mask section's ITOC entry
-            if (!_encrypted_image_io_access) {
+            if (!_encrypted_image_io_access)
+            {
                 // In case of signing BB image (encrypted) we'll not mask the image signature 256/512 itoc entries
                 // due to FW limitation
                 u_int32_t tocEntryAddr = _fs4ImgInfo.itocArr.tocArr[i].entry_addr;
@@ -3778,13 +4217,12 @@ void Fs4Operations::MaskItocSectionAndEntry(u_int32_t itocType, vector<u_int8_t>
 
 void Fs4Operations::maskDevToc(vector<u_int8_t>& img)
 {
-    //no device tocs in the itoc
+    // no device tocs in the itoc
     (void)img;
     return;
 }
 
-bool Fs4Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp,
-                                   struct tools_open_fw_version& fwVer)
+bool Fs4Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer)
 {
     CHECK_IF_FS4_FILE_FOR_TIMESTAMP_OP()
 
@@ -3792,7 +4230,8 @@ bool Fs4Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp,
 }
 
 bool Fs4Operations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
-                                     struct tools_open_fw_version& fwVer, bool queryRunning)
+                                     struct tools_open_fw_version& fwVer,
+                                     bool queryRunning)
 {
     CHECK_IF_FS4_FILE_FOR_TIMESTAMP_OP()
 
@@ -3808,18 +4247,22 @@ bool Fs4Operations::FwResetTimeStamp()
 
 bool Fs4Operations::GetSectionSizeAndOffset(fs3_section_t sectType, u_int32_t& size, u_int32_t& offset)
 {
-    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++) {
-        struct fs4_toc_info *toc = &_fs4ImgInfo.itocArr.tocArr[i];
-        if (toc->toc_entry.type == sectType) {
+    for (int i = 0; i < _fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* toc = &_fs4ImgInfo.itocArr.tocArr[i];
+        if (toc->toc_entry.type == sectType)
+        {
             size = toc->toc_entry.size << 2;
             offset = toc->toc_entry.flash_addr << 2;
             return true;
         }
     }
 
-    for (int i = 0; i < _fs4ImgInfo.dtocArr.numOfTocs; i++) {
-        struct fs4_toc_info *toc = &_fs4ImgInfo.dtocArr.tocArr[i];
-        if (toc->toc_entry.type == sectType) {
+    for (int i = 0; i < _fs4ImgInfo.dtocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* toc = &_fs4ImgInfo.dtocArr.tocArr[i];
+        if (toc->toc_entry.type == sectType)
+        {
             size = toc->toc_entry.size << 2;
             offset = toc->toc_entry.flash_addr << 2;
             return true;
@@ -3835,11 +4278,13 @@ bool validateHmacKey(string key_str, unsigned int correct_key_len)
     // The keyFile should contain 128 chars, each 2 of them represent 1 byte of key (hex)
     bool res = true;
     key_str.erase(std::remove_if(key_str.begin(), key_str.end(), ::isspace), key_str.end());
-    if(key_str.size() != correct_key_len * 2) {
+    if (key_str.size() != correct_key_len * 2)
+    {
         res = false;
     }
-    else if(key_str.find_first_not_of("0123456789abcdefABCDEF") != std::string::npos) {
-        res =  false;
+    else if (key_str.find_first_not_of("0123456789abcdefABCDEF") != std::string::npos)
+    {
+        res = false;
     }
     return res;
 }
@@ -3850,7 +4295,8 @@ bool Fs4Operations::FwSignSection(const vector<u_int8_t>& section, const string
     MlxSignRSA rsa;
     vector<u_int8_t> sha;
     int rc = rsa.setPrivKeyFromFile(privPemFileStr);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to set private key from file (rc = 0x%x)\n", rc);
     }
 
@@ -3859,7 +4305,8 @@ bool Fs4Operations::FwSignSection(const vector<u_int8_t>& section, const string
     mlxSignSHA.getDigest(sha);
 
     rc = rsa.sign(MlxSign::SHA512, sha, encSha);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("Failed to encrypt the SHA (rc = 0x%x)\n", rc);
     }
 
@@ -3867,26 +4314,23 @@ bool Fs4Operations::FwSignSection(const vector<u_int8_t>& section, const string
 }
 #endif
 
-int Fs4Operations::getBoot2Size(u_int32_t address) {
-
+int Fs4Operations::getBoot2Size(u_int32_t address)
+{
     u_int32_t num_of_dwords;
 
     // Read the num of DWs for the second dword
-    READBUF((*_ioAccess),
-        address+4,
-        &num_of_dwords,
-        4,
-        "num of DWs");
+    READBUF((*_ioAccess), address + 4, &num_of_dwords, 4, "num of DWs");
 
     TOCPU1(num_of_dwords)
 
     return (4 + num_of_dwords) * 4; // 2 dwords for header + 2 dwords for tail
-
 }
 
 // This function is called from getBootDataForSignVersion2() only so currently it supports CX7 onwards only
-bool Fs4Operations::getBootRecordSize(u_int32_t& boot_record_size) {
-    switch (getChipType(_fwImgInfo.supportedHwId[0])) {
+bool Fs4Operations::getBootRecordSize(u_int32_t& boot_record_size)
+{
+    switch (getChipType(_fwImgInfo.supportedHwId[0]))
+    {
         case CT_CONNECTX7:
             boot_record_size = 0x3f4;
             return true;
@@ -3910,94 +4354,81 @@ bool Fs4Operations::getBootRecordSize(u_int32_t& boot_record_size) {
     }
 }
 
-bool Fs4Operations::getBootDataForSignVersion1(vector<u_int8_t>& data) {
+bool Fs4Operations::getBootDataForSignVersion1(vector<u_int8_t>& data)
+{
     u_int32_t physAddr = _authentication_start_ptr;
     const unsigned int data_size = _authentication_end_ptr - _authentication_start_ptr + 1;
     data.resize(data_size);
 
     //* Choosing the correct io to read from
     FBase* io = _ioAccess;
-    if (_encrypted_image_io_access) {
-        DPRINTF(("Fs4Operations::getBootDataForSignVersion1 reading from encrypted image from addr 0x%x: 0x%x bytes\n", physAddr, data_size));
+    if (_encrypted_image_io_access)
+    {
+        DPRINTF(("Fs4Operations::getBootDataForSignVersion1 reading from encrypted image from addr 0x%x: 0x%x bytes\n",
+                 physAddr, data_size));
         io = _encrypted_image_io_access; // If encrypted image was given we'll read from it
     }
 
-    READBUF((*io),
-        physAddr,
-        data.data(),
-        data_size,
-        "Reading data pointed by HW Pointers");
+    READBUF((*io), physAddr, data.data(), data_size, "Reading data pointed by HW Pointers");
     return true;
 }
 
-bool Fs4Operations::getBootDataForSignVersion2(vector<u_int8_t>& data) {
+bool Fs4Operations::getBootDataForSignVersion2(vector<u_int8_t>& data)
+{
     unsigned int data_offset = 0;
 
     // Boot version
     const u_int32_t BOOT_VERSION_ADDRESS = 0x10;
     const u_int32_t BOOT_VERSION_SIZE = 0x8; // including reserved dword
     data.resize(data.size() + BOOT_VERSION_SIZE);
-    READBUF((*_ioAccess),
-        BOOT_VERSION_ADDRESS,
-        data.data() + data_offset,
-        BOOT_VERSION_SIZE,
-        "Reading boot version");
+    READBUF((*_ioAccess), BOOT_VERSION_ADDRESS, data.data() + data_offset, BOOT_VERSION_SIZE, "Reading boot version");
 
     data_offset += BOOT_VERSION_SIZE;
 
-
     // HW pointers (without CRC)
     const u_int32_t HW_POINTER_SIZE = 4;
     const u_int32_t HW_POINTER_CRC_SIZE = 4;
     const int NUM_OF_HW_POINTERS = 16;
-    for (int ii = 0; ii < NUM_OF_HW_POINTERS; ii++) {
+    for (int ii = 0; ii < NUM_OF_HW_POINTERS; ii++)
+    {
         data.resize(data.size() + HW_POINTER_SIZE);
         READBUF((*_ioAccess),
-            FS4_HW_PTR_START + ii * (HW_POINTER_SIZE + HW_POINTER_CRC_SIZE),
-            data.data() + data_offset,
-            HW_POINTER_SIZE,
-            "Reading HW pointer");
+                FS4_HW_PTR_START + ii * (HW_POINTER_SIZE + HW_POINTER_CRC_SIZE),
+                data.data() + data_offset,
+                HW_POINTER_SIZE,
+                "Reading HW pointer");
 
         data_offset += HW_POINTER_SIZE;
     }
 
     // Boot record
     u_int32_t boot_record_size = 0;
-    if (!getBootRecordSize(boot_record_size)) {
+    if (!getBootRecordSize(boot_record_size))
+    {
         return errmsg("Failed to get boot_record size\n");
     }
     data.resize(data.size() + boot_record_size);
-    READBUF((*_ioAccess),
-        _boot_record_ptr,
-        data.data() + data_offset,
-        boot_record_size,
-        "Reading boot record");
+    READBUF((*_ioAccess), _boot_record_ptr, data.data() + data_offset, boot_record_size, "Reading boot record");
     data_offset += boot_record_size;
 
     // Boot2
     u_int32_t boot2_size = getBoot2Size(_boot2_ptr);
     data.resize(data.size() + boot2_size);
-    READBUF((*_ioAccess),
-        _boot2_ptr,
-        data.data() + data_offset,
-        boot2_size,
-        "Reading boot2");
+    READBUF((*_ioAccess), _boot2_ptr, data.data() + data_offset, boot2_size, "Reading boot2");
     data_offset += boot2_size;
 
     // Hashes table
     u_int32_t hashes_table_size = getHashesTableSize(_hashes_table_ptr);
     data.resize(data.size() + hashes_table_size);
-    READBUF((*_ioAccess),
-        _hashes_table_ptr,
-        data.data() + data_offset,
-        hashes_table_size,
-        "Reading hashes table");
+    READBUF((*_ioAccess), _hashes_table_ptr, data.data() + data_offset, hashes_table_size, "Reading hashes table");
 
     return true;
 }
 
-bool Fs4Operations::getBootDataForSign(vector<u_int8_t>& data) {
-    switch (getSecureBootSignVersion()) {
+bool Fs4Operations::getBootDataForSign(vector<u_int8_t>& data)
+{
+    switch (getSecureBootSignVersion())
+    {
         case VERSION_1:
             return getBootDataForSignVersion1(data);
         case VERSION_2:
@@ -4007,40 +4438,45 @@ bool Fs4Operations::getBootDataForSign(vector<u_int8_t>& data) {
     }
 }
 
-#if !defined(UEFI_BUILD) 
-bool fromFileToArray(string & fileName, vector<u_int8_t>& outputArray, unsigned int PublicKeySize)
+#if !defined(UEFI_BUILD)
+bool fromFileToArray(string& fileName, vector<u_int8_t>& outputArray, unsigned int PublicKeySize)
 {
     FILE* pFile = fopen(fileName.c_str(), "rt");
-    if(pFile == NULL) {
+    if (pFile == NULL)
+    {
         return false;
     }
     fseek(pFile, 0L, SEEK_END);
     size_t input_length = ftell(pFile);
-    //input length must be 2*puublic key size since the input file is text formatted and each 2 characters in it = 1 byte data
-    if (input_length != (PublicKeySize << 1)) {
+    // input length must be 2*puublic key size since the input file is text formatted and each 2 characters in it = 1
+    // byte data
+    if (input_length != (PublicKeySize << 1))
+    {
         fclose(pFile);
         return false;
     }
     fseek(pFile, 0L, SEEK_SET);
-    char *data = new char[input_length];
-    if(data == NULL) {
+    char* data = new char[input_length];
+    if (data == NULL)
+    {
         fclose(pFile);
         return false;
     }
     fread(data, sizeof(char), input_length, pFile);
     fclose(pFile);
-    outputArray.resize(input_length/2);
-    for (size_t i = 0; i < input_length; i+=2)
+    outputArray.resize(input_length / 2);
+    for (size_t i = 0; i < input_length; i += 2)
     {
-        char tempBuf[3] = { 0 };
+        char tempBuf[3] = {0};
         tempBuf[0] = data[i];
-        tempBuf[1] = data[i+1];
+        tempBuf[1] = data[i + 1];
         int scanResult = 0;
-        if(sscanf(tempBuf, "%x", &scanResult) != 1) {
+        if (sscanf(tempBuf, "%x", &scanResult) != 1)
+        {
             delete[] data;
             return false;
         }
-        outputArray[i/2] = scanResult;
+        outputArray[i / 2] = scanResult;
     }
     delete[] data;
     return true;
@@ -4049,7 +4485,8 @@ bool fromFileToArray(string & fileName, vector<u_int8_t>& outputArray, unsigned
 
 bool Fs4Operations::IsSecureBootSupported()
 {
-    if (_signatureMngr == NULL) {
+    if (_signatureMngr == NULL)
+    {
         return false;
     }
     return _signatureMngr->IsSecureBootSupported();
@@ -4057,7 +4494,8 @@ bool Fs4Operations::IsSecureBootSupported()
 
 bool Fs4Operations::IsCableQuerySupported()
 {
-    if (_signatureMngr == NULL) {
+    if (_signatureMngr == NULL)
+    {
         return false;
     }
     return _signatureMngr->IsCableQuerySupported();
@@ -4065,76 +4503,92 @@ bool Fs4Operations::IsCableQuerySupported()
 
 bool Fs4Operations::IsLifeCycleSupported()
 {
-    if (_signatureMngr == NULL) {
+    if (_signatureMngr == NULL)
+    {
         return false;
     }
     return _signatureMngr->IsLifeCycleSupported();
 }
 
-bool Fs4Operations::PreparePublicKeyData(const char *public_key_file, vector <u_int8_t>& publicKeyData, unsigned int& pem_offset)
+bool Fs4Operations::PreparePublicKeyData(const char* public_key_file,
+                                         vector<u_int8_t>& publicKeyData,
+                                         unsigned int& pem_offset)
 {
     connectx4_public_keys_3 unpackedData;
     unsigned int PublicKeySize = sizeof(unpackedData.file_public_keys_3[0].key);
     fs3_section_t sectionType;
     bool PublicKeyIsSet = false;
     string pubFileStr(public_key_file);
-    //is the public key file in PEM format?
-    if (CheckPublicKeysFile(public_key_file, sectionType, true)) {
-        if (sectionType == FS3_PUBLIC_KEYS_4096) {
-            if (Fs3UpdatePublicKeysSection((CONNECTX4_PUBLIC_KEYS_3_SIZE >> 2), public_key_file, publicKeyData, true)) {
+    // is the public key file in PEM format?
+    if (CheckPublicKeysFile(public_key_file, sectionType, true))
+    {
+        if (sectionType == FS3_PUBLIC_KEYS_4096)
+        {
+            if (Fs3UpdatePublicKeysSection((CONNECTX4_PUBLIC_KEYS_3_SIZE >> 2), public_key_file, publicKeyData, true))
+            {
                 PublicKeyIsSet = true;
-                pem_offset = CONNECTX4_FILE_PUBLIC_KEYS_3_SIZE - PublicKeySize;//first 32 bytes in the PEM file are auxilary data
+                pem_offset =
+                  CONNECTX4_FILE_PUBLIC_KEYS_3_SIZE - PublicKeySize; // first 32 bytes in the PEM file are auxilary data
             }
         }
     }
-    //Is the public key file in text format?
-    if (PublicKeyIsSet == false) {
-        if (!fromFileToArray(pubFileStr, publicKeyData, PublicKeySize)) {
+    // Is the public key file in text format?
+    if (PublicKeyIsSet == false)
+    {
+        if (!fromFileToArray(pubFileStr, publicKeyData, PublicKeySize))
+        {
             return errmsg("PreparePublicKeyData: Public key file parsing failed");
         }
     }
     return true;
 }
 
-bool Fs4Operations::storePublicKeyInSection(const char *public_key_file, const char *uuid) {
+bool Fs4Operations::storePublicKeyInSection(const char* public_key_file, const char* uuid)
+{
     //* Parse uuid
-    vector <u_int32_t> uuidData;
-    if (!extractUUIDFromString(uuid, uuidData)) {
+    vector<u_int32_t> uuidData;
+    if (!extractUUIDFromString(uuid, uuidData))
+    {
         return errmsg("storePublicKeyInSection: UUID parsing failed.");
     }
 
     //* Parse public-key
-    vector <u_int8_t> publicKeyData;
+    vector<u_int8_t> publicKeyData;
     unsigned int pem_offset = 0;
-    if (!PreparePublicKeyData(public_key_file, publicKeyData, pem_offset)) { // Parsing public_key_file and storing public key in publicKeyData
+    if (!PreparePublicKeyData(public_key_file, publicKeyData, pem_offset))
+    { // Parsing public_key_file and storing public key in publicKeyData
         return errmsg("storePublicKeyInSection failed - Error: %s", err());
     }
 
     //* Prepare public-key and uuid data to be stored in section
-    vector <u_int8_t> finishData;
+    vector<u_int8_t> finishData;
     connectx4_public_keys_3 unpackedData;
     unsigned int PublicKeySize = sizeof(unpackedData.file_public_keys_3[0].key);
     memset(&unpackedData, 0, sizeof(unpackedData));
     unpackedData.file_public_keys_3[0].keypair_exp = 0x10001;
-    memcpy(&unpackedData.file_public_keys_3[0].keypair_uuid, uuidData.data(), sizeof(unpackedData.file_public_keys_3[0].keypair_uuid));
+    memcpy(&unpackedData.file_public_keys_3[0].keypair_uuid, uuidData.data(),
+           sizeof(unpackedData.file_public_keys_3[0].keypair_uuid));
     memcpy(&unpackedData.file_public_keys_3[0].key, publicKeyData.data() + pem_offset, PublicKeySize);
     TOCPUn(&unpackedData.file_public_keys_3[0].key, PublicKeySize >> 2);
     finishData.resize(connectx4_public_keys_3_size());
     connectx4_public_keys_3_pack(&unpackedData, finishData.data());
 
     //* Store public-key and uuid in section and update its matching ITOC entry (with updated section_crc and entry_crc)
-    if (!UpdateSection(finishData.data(), FS4_RSA_PUBLIC_KEY, true, CMD_BURN, NULL)) {
+    if (!UpdateSection(finishData.data(), FS4_RSA_PUBLIC_KEY, true, CMD_BURN, NULL))
+    {
         return errmsg("storePublicKeyInSection failed - Error: %s", err());
     }
 
     return true;
 }
 
-bool Fs4Operations::storeSecureBootSignaturesInSection(vector<u_int8_t> boot_signature, vector<u_int8_t> critical_sections_signature,
-                                                        vector<u_int8_t> non_critical_sections_signature)
+bool Fs4Operations::storeSecureBootSignaturesInSection(vector<u_int8_t> boot_signature,
+                                                       vector<u_int8_t> critical_sections_signature,
+                                                       vector<u_int8_t> non_critical_sections_signature)
 {
     //* Assert critical and non-critical signatures vectors are both empty or both not empty
-    if (critical_sections_signature.empty() != non_critical_sections_signature.empty()) {
+    if (critical_sections_signature.empty() != non_critical_sections_signature.empty())
+    {
         return false;
     }
 
@@ -4143,73 +4597,93 @@ bool Fs4Operations::storeSecureBootSignaturesInSection(vector<u_int8_t> boot_sig
     connectx4_secure_boot_signatures secure_boot_signatures;
     memset(&secure_boot_signatures, 0, sizeof(secure_boot_signatures));
 
-    memcpy(&secure_boot_signatures.boot_signature, boot_signature.data(), sizeof(secure_boot_signatures.boot_signature));
+    memcpy(&secure_boot_signatures.boot_signature, boot_signature.data(),
+           sizeof(secure_boot_signatures.boot_signature));
     TOCPUn(&secure_boot_signatures.boot_signature, sizeof(secure_boot_signatures.boot_signature) >> 2);
 
-    if (!critical_sections_signature.empty()) {
-        memcpy(&secure_boot_signatures.critical_signature, critical_sections_signature.data(), sizeof(secure_boot_signatures.critical_signature));
+    if (!critical_sections_signature.empty())
+    {
+        memcpy(&secure_boot_signatures.critical_signature, critical_sections_signature.data(),
+               sizeof(secure_boot_signatures.critical_signature));
         TOCPUn(&secure_boot_signatures.critical_signature, sizeof(secure_boot_signatures.critical_signature) >> 2);
     }
 
-    if (!non_critical_sections_signature.empty()) {
-        memcpy(&secure_boot_signatures.non_critical_signature, non_critical_sections_signature.data(), sizeof(secure_boot_signatures.non_critical_signature));
-        TOCPUn(&secure_boot_signatures.non_critical_signature, sizeof(secure_boot_signatures.non_critical_signature) >> 2);
+    if (!non_critical_sections_signature.empty())
+    {
+        memcpy(&secure_boot_signatures.non_critical_signature, non_critical_sections_signature.data(),
+               sizeof(secure_boot_signatures.non_critical_signature));
+        TOCPUn(&secure_boot_signatures.non_critical_signature,
+               sizeof(secure_boot_signatures.non_critical_signature) >> 2);
     }
 
     finishData.resize(connectx4_secure_boot_signatures_size());
     connectx4_secure_boot_signatures_pack(&secure_boot_signatures, finishData.data());
-    if (!UpdateSection(finishData.data(), FS4_RSA_4096_SIGNATURES, true, CMD_BURN, NULL)) {
+    if (!UpdateSection(finishData.data(), FS4_RSA_4096_SIGNATURES, true, CMD_BURN, NULL))
+    {
         return errmsg("storeSecureBootSignaturesInSection: store secure-boot signatures failed.\n");
     }
     return true;
 }
 
-bool Fs4Operations::initHwPtrs(bool isVerify) {
-    if (!getImgStart()) { // Set _fwImgInfo.imgStart with the image start address
+bool Fs4Operations::initHwPtrs(bool isVerify)
+{
+    if (!getImgStart())
+    { // Set _fwImgInfo.imgStart with the image start address
         return false;
     }
 
-    if (!getExtendedHWAravaPtrs((VerifyCallBack)NULL, _ioAccess, false, isVerify)) {
+    if (!getExtendedHWAravaPtrs((VerifyCallBack)NULL, _ioAccess, false, isVerify))
+    {
         return errmsg("initHwPtrs: HW pointers not found.\n");
     }
     return true;
 }
 
-bool Fs4Operations::isHashesTableHwPtrValid() {
+bool Fs4Operations::isHashesTableHwPtrValid()
+{
     //* Check HW pointers initialized
-    if (!_is_hw_ptrs_initialized) {
-        if (!initHwPtrs()) {
+    if (!_is_hw_ptrs_initialized)
+    {
+        if (!initHwPtrs())
+        {
             return errmsg("isHashesTableHwPtrValid: HW pointers not found");
         }
     }
 
     //* Check if pointer is valid
     bool res = true;
-    if (_hashes_table_ptr == 0xffffffff or _hashes_table_ptr == 0x0) {
+    if (_hashes_table_ptr == 0xffffffff or _hashes_table_ptr == 0x0)
+    {
         res = false;
     }
     return res;
 }
 
-bool Fs4Operations::signForFwUpdateUsingHSM(const char *uuid, MlxSign::OpensslEngineSigner& engineSigner, PrintCallBack printFunc) {
+bool Fs4Operations::signForFwUpdateUsingHSM(const char* uuid,
+                                            MlxSign::OpensslEngineSigner& engineSigner,
+                                            PrintCallBack printFunc)
+{
 #ifndef NO_OPEN_SSL
     vector<u_int8_t> fourMbImage;
     vector<u_int8_t> signature;
     vector<u_int8_t> sha;
 
     //* Get image data (image_signature,image_signature_2 sections masked with 0xff)
-    if (!FwCalcSHA(MlxSign::SHA512, sha, fourMbImage)) {
+    if (!FwCalcSHA(MlxSign::SHA512, sha, fourMbImage))
+    {
         return errmsg("signForFwUpdateUsingHSM: Failed to read image");
     }
 
     //* Sign image data
     int rc = engineSigner.sign(fourMbImage, signature);
-    if (rc) {
+    if (rc)
+    {
         return errmsg("signForFwUpdateUsingHSM: Failed to create secured FW signature (rc = 0x%x)", rc);
     }
 
     //* Store FW update signature in section
-    if (!InsertSecureFWSignature(signature, uuid, printFunc)) {
+    if (!InsertSecureFWSignature(signature, uuid, printFunc))
+    {
         return errmsg("signForFwUpdateUsingHSM: Failed to insert secured FW signature\n");
     }
 #else
@@ -4219,79 +4693,100 @@ bool Fs4Operations::signForFwUpdateUsingHSM(const char *uuid, MlxSign::OpensslEn
     return errmsg("signForFwUpdateUsingHSM is not suppported");
 #endif
 
-
     return true;
 }
 
-SecureBootSignVersion Fs4Operations::getSecureBootSignVersion() {
+SecureBootSignVersion Fs4Operations::getSecureBootSignVersion()
+{
     SecureBootSignVersion res = VERSION_1;
 
     //* Check if hashes_table exists
-    if (isHashesTableHwPtrValid()) {
+    if (isHashesTableHwPtrValid())
+    {
         res = VERSION_2;
     }
     return res;
 }
 
-bool Fs4Operations::signForSecureBootUsingHSM(const char *public_key_file, const char *uuid, MlxSign::OpensslEngineSigner& engineSigner)
+bool Fs4Operations::signForSecureBootUsingHSM(const char* public_key_file,
+                                              const char* uuid,
+                                              MlxSign::OpensslEngineSigner& engineSigner)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("signForSecureBootUsingHSM not allowed for devices");
     }
-    if (!initHwPtrs()) {
+    if (!initHwPtrs())
+    {
         return errmsg("signForSecureBootUsingHSM failed - Error: HW pointers not found");
     }
 
     SecureBootSignVersion secure_boot_version = getSecureBootSignVersion();
 
-    if (secure_boot_version == VERSION_2) {
-        if (!SetImageIVHwPointer()) {
+    if (secure_boot_version == VERSION_2)
+    {
+        if (!SetImageIVHwPointer())
+        {
             return errmsg("signForSecureBootUsingHSM failed - Error: %s\n", err());
         }
     }
 
-    if (!storePublicKeyInSection(public_key_file, uuid)) {
+    if (!storePublicKeyInSection(public_key_file, uuid))
+    {
         return errmsg("signForSecureBootUsingHSM failed - Error: storePublicKeyInSection failed (%s)\n", err());
     }
 
     //* Get boot area signature
     vector<u_int8_t> boot_data;
     vector<u_int8_t> boot_signature;
-    if (!getBootDataForSign(boot_data)) {
+    if (!getBootDataForSign(boot_data))
+    {
         return errmsg("signForSecureBootUsingHSM failed - Error: getBootDataForSign failed (%s)\n", err());
     }
     int rc = engineSigner.sign(boot_data, boot_signature);
-    if (rc) {
-        return errmsg("signForSecureBootUsingHSM failed - Error: failed to set private key from engine (rc = 0x%x)", rc);
+    if (rc)
+    {
+        return errmsg("signForSecureBootUsingHSM failed - Error: failed to set private key from engine (rc = 0x%x)",
+                      rc);
     }
 
     //* Get critical and non-critical sections signatures
     vector<u_int8_t> critical_sections_data, non_critical_sections_data;
     vector<u_int8_t> critical_signature, non_critical_signature;
-    if (secure_boot_version == VERSION_1) {
-        if (!getCriticalNonCriticalSections(critical_sections_data, non_critical_sections_data)) {
-            return errmsg("signForSecureBootUsingHSM failed - Error: getCriticalNonCriticalSections failed (%s)\n", err());
+    if (secure_boot_version == VERSION_1)
+    {
+        if (!getCriticalNonCriticalSections(critical_sections_data, non_critical_sections_data))
+        {
+            return errmsg("signForSecureBootUsingHSM failed - Error: getCriticalNonCriticalSections failed (%s)\n",
+                          err());
         }
         rc = engineSigner.sign(critical_sections_data, critical_signature);
-        if (rc) {
-            return errmsg("signForSecureBootUsingHSM failed - Error: failed to set private key from engine (rc = 0x%x)", rc);
+        if (rc)
+        {
+            return errmsg("signForSecureBootUsingHSM failed - Error: failed to set private key from engine (rc = 0x%x)",
+                          rc);
         }
         rc = engineSigner.sign(non_critical_sections_data, non_critical_signature);
-        if (rc) {
-            return errmsg("signForSecureBootUsingHSM failed - Error: failed to set private key from engine (rc = 0x%x)", rc);
+        if (rc)
+        {
+            return errmsg("signForSecureBootUsingHSM failed - Error: failed to set private key from engine (rc = 0x%x)",
+                          rc);
         }
     }
 
     //* Store secure boot signatures in section
     bool res;
-    if (secure_boot_version == VERSION_1) {
+    if (secure_boot_version == VERSION_1)
+    {
         res = storeSecureBootSignaturesInSection(boot_signature, critical_signature, non_critical_signature);
     }
-    else {
+    else
+    {
         res = storeSecureBootSignaturesInSection(boot_signature);
     }
-    if (!res) {
+    if (!res)
+    {
         return errmsg("signForSecureBootUsingHSM: Failed to insert secure boot signatures (%s)\n", err());
     }
 
@@ -4304,25 +4799,30 @@ bool Fs4Operations::signForSecureBootUsingHSM(const char *public_key_file, const
 #endif
 }
 
-bool Fs4Operations::signForSecureBoot(const char *private_key_file, const char *public_key_file, const char *uuid)
+bool Fs4Operations::signForSecureBoot(const char* private_key_file, const char* public_key_file, const char* uuid)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("signForSecureBoot not allowed for devices");
     }
-    if (!initHwPtrs()) {
+    if (!initHwPtrs())
+    {
         return errmsg("signForSecureBoot failed - Error: HW pointers not found\n");
     }
 
     SecureBootSignVersion secure_boot_version = getSecureBootSignVersion();
 
-    if (secure_boot_version == VERSION_2) {
-        if (!SetImageIVHwPointer()) {
+    if (secure_boot_version == VERSION_2)
+    {
+        if (!SetImageIVHwPointer())
+        {
             return errmsg("signForSecureBoot failed - Error: %s\n", err());
         }
     }
 
-    if (!storePublicKeyInSection(public_key_file, uuid)) {
+    if (!storePublicKeyInSection(public_key_file, uuid))
+    {
         return errmsg("signForSecureBoot failed - Error: %s\n", err());
     }
 
@@ -4331,118 +4831,134 @@ bool Fs4Operations::signForSecureBoot(const char *private_key_file, const char *
     //* Get boot area signature
     vector<u_int8_t> boot_data;
     vector<u_int8_t> boot_signature;
-    if (!getBootDataForSign(boot_data)) {
+    if (!getBootDataForSign(boot_data))
+    {
         return errmsg("signForSecureBoot failed - Error: getBootDataForSign failed (%s)\n", err());
     }
-    if (!FwSignSection(boot_data, privPemFileStr, boot_signature)) {
+    if (!FwSignSection(boot_data, privPemFileStr, boot_signature))
+    {
         return false;
     }
 
     //* Get critical and non-critical sections signatures
     vector<u_int8_t> critical_sections_data, non_critical_sections_data;
     vector<u_int8_t> critical_signature, non_critical_signature;
-    if (secure_boot_version == VERSION_1) {
-        if (!getCriticalNonCriticalSections(critical_sections_data, non_critical_sections_data)) {
+    if (secure_boot_version == VERSION_1)
+    {
+        if (!getCriticalNonCriticalSections(critical_sections_data, non_critical_sections_data))
+        {
             return errmsg("signForSecureBoot failed - Error: getCriticalNonCriticalSections failed (%s)\n", err());
         }
-        if (!FwSignSection(critical_sections_data, privPemFileStr, critical_signature)) {
+        if (!FwSignSection(critical_sections_data, privPemFileStr, critical_signature))
+        {
             return false;
         }
-        if (!FwSignSection(non_critical_sections_data, privPemFileStr, non_critical_signature)) {
+        if (!FwSignSection(non_critical_sections_data, privPemFileStr, non_critical_signature))
+        {
             return false;
         }
     }
-    
+
     //* Store secure boot signatures in section
     bool res;
-    if (secure_boot_version == VERSION_1) {
+    if (secure_boot_version == VERSION_1)
+    {
         res = storeSecureBootSignaturesInSection(boot_signature, critical_signature, non_critical_signature);
     }
-    else {
+    else
+    {
         res = storeSecureBootSignaturesInSection(boot_signature);
     }
-    if (!res) {
+    if (!res)
+    {
         return errmsg("signForSecureBoot failed - Error: failed to insert secure boot signatures (%s)\n", err());
     }
 
     return true;
 
 #else
-    (void) private_key_file; 
-    (void) public_key_file; 
-    (void) uuid;
+    (void)private_key_file;
+    (void)public_key_file;
+    (void)uuid;
     return errmsg("signForSecureBoot is not suppported.");
 #endif
 }
 
-bool Fs4Operations::FwSignWithHmac(const char *keyFile)
+bool Fs4Operations::FwSignWithHmac(const char* keyFile)
 {
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
     vector<u_int8_t> critical, non_critical, bin_data, digest;
     u_int32_t physAddr = _authentication_start_ptr;
-    if (_ioAccess->is_flash()) {
-        return errmsg( "Adding HMAC not allowed for devices");
+    if (_ioAccess->is_flash())
+    {
+        return errmsg("Adding HMAC not allowed for devices");
     }
-    if (!getExtendedHWPtrs((VerifyCallBack)NULL, _ioAccess)) {
+    if (!getExtendedHWPtrs((VerifyCallBack)NULL, _ioAccess))
+    {
         return false;
     }
     const unsigned int s = _authentication_end_ptr - _authentication_start_ptr + 1;
 
     bin_data.resize(s);
-    READBUF((*_ioAccess),
-            physAddr,
-            bin_data.data(),
-            s,
-            "Reading data pointed by HW Pointers");
+    READBUF((*_ioAccess), physAddr, bin_data.data(), s, "Reading data pointed by HW Pointers");
 
     const int key_len = 64;
     std::ifstream f(keyFile);
     std::stringstream buf;
     buf << f.rdbuf();
     std::string fileContents = buf.str();
-    if(!validateHmacKey(fileContents, key_len))
+    if (!validateHmacKey(fileContents, key_len))
         return errmsg("Key must be of length of 64 bytes, each byte represented with two chars (hex)");
     unsigned char key_buf[key_len + 1];
     std::string num_str = "";
     size_t file_content_size = fileContents.size();
-    for (size_t i = 0; i < file_content_size; i++) {
-        if (i % 2 != 0) {
+    for (size_t i = 0; i < file_content_size; i++)
+    {
+        if (i % 2 != 0)
+        {
             num_str += fileContents[i];
             key_buf[i / 2] = strtol(num_str.c_str(), NULL, 16);
         }
-        else {
+        else
+        {
             num_str = fileContents[i];
         }
     }
     vector<u_int8_t> key(key_buf, key_buf + key_len);
 
     PrepItocSectionsForHmac(critical, non_critical);
-    if (!CalcHMAC(key, bin_data, digest)) {
+    if (!CalcHMAC(key, bin_data, digest))
+    {
         return false;
     }
 
     if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL, _digest_recovery_key_ptr, digest.data(),
-                      digest.size(), true, true, 0, 0)) {
+                      digest.size(), true, true, 0, 0))
+    {
         return false;
     }
 
     digest.resize(0x0);
-    if (!CalcHMAC(key, critical, digest)) {
+    if (!CalcHMAC(key, critical, digest))
+    {
         return false;
     }
 
-    if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL, _digest_recovery_key_ptr + digest.size(), digest.data(),
-                      digest.size(), true, true, 0, 0)) {
+    if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL, _digest_recovery_key_ptr + digest.size(),
+                      digest.data(), digest.size(), true, true, 0, 0))
+    {
         return false;
     }
 
     digest.resize(0);
-    if (!CalcHMAC(key, non_critical, digest)) {
+    if (!CalcHMAC(key, non_critical, digest))
+    {
         return false;
     }
 
-    if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL, _digest_recovery_key_ptr + 2 * digest.size(), digest.data(),
-                      digest.size(), true, true, 0, 0)) {
+    if (!writeImageEx((ProgressCallBackEx)NULL, NULL, (ProgressCallBack)NULL,
+                      _digest_recovery_key_ptr + 2 * digest.size(), digest.data(), digest.size(), true, true, 0, 0))
+    {
         return false;
     }
 
@@ -4453,7 +4969,8 @@ bool Fs4Operations::FwSignWithHmac(const char *keyFile)
 #endif
 }
 
-bool Fs4Operations::updateHwPointer(u_int32_t addr, u_int32_t val) {
+bool Fs4Operations::updateHwPointer(u_int32_t addr, u_int32_t val)
+{
     struct image_layout_hw_pointer_entry hw_pointer;
     hw_pointer.ptr = TOCPU1(val);
 
@@ -4464,40 +4981,45 @@ bool Fs4Operations::updateHwPointer(u_int32_t addr, u_int32_t val) {
 
     //* Write HW pointer and its CRC to image
     image_layout_hw_pointer_entry_pack(&hw_pointer, hw_pointer_data.data());
-    if (!_ioAccess->write(addr, hw_pointer_data.data(), IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE)) {
+    if (!_ioAccess->write(addr, hw_pointer_data.data(), IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE))
+    {
         return errmsg("updateHwPointer writing to hw pointer in addr 0x%08x failed\n", addr);
     }
 
     return true;
 }
 
-bool Fs4Operations::SetImageIVHwPointer() {
+bool Fs4Operations::SetImageIVHwPointer()
+{
 #if !defined(UEFI_BUILD) && !defined(NO_OPEN_SSL)
-    if (_ioAccess->is_flash()) {
+    if (_ioAccess->is_flash())
+    {
         return errmsg("SetImageIVHwPointer is not applicable for devices\n");
     }
     fw_info_t fwInfo;
-    if (!FwQuery(&fwInfo, false, false, false, true)) {
+    if (!FwQuery(&fwInfo, false, false, false, true))
+    {
         return false; // implicit set to errmsg
     }
     //* Assuming query already done so image info section is parsed and following members initialized accordingly
     struct image_layout_FW_VERSION fw_version;
-    fw_version.MAJOR    = _fwImgInfo.ext_info.fw_ver[0];
-    fw_version.MINOR    = _fwImgInfo.ext_info.fw_ver[1];
+    fw_version.MAJOR = _fwImgInfo.ext_info.fw_ver[0];
+    fw_version.MINOR = _fwImgInfo.ext_info.fw_ver[1];
     fw_version.SUBMINOR = _fwImgInfo.ext_info.fw_ver[2];
-    fw_version.Hour     = _fwImgInfo.ext_info.fw_rel_time[0];
-    fw_version.Minutes  = _fwImgInfo.ext_info.fw_rel_time[1];
-    fw_version.Seconds  = _fwImgInfo.ext_info.fw_rel_time[2];
-    fw_version.Day      = _fwImgInfo.ext_info.fw_rel_date[0];
-    fw_version.Month    = _fwImgInfo.ext_info.fw_rel_date[1];
-    fw_version.Year     = _fwImgInfo.ext_info.fw_rel_date[2];
+    fw_version.Hour = _fwImgInfo.ext_info.fw_rel_time[0];
+    fw_version.Minutes = _fwImgInfo.ext_info.fw_rel_time[1];
+    fw_version.Seconds = _fwImgInfo.ext_info.fw_rel_time[2];
+    fw_version.Day = _fwImgInfo.ext_info.fw_rel_date[0];
+    fw_version.Month = _fwImgInfo.ext_info.fw_rel_date[1];
+    fw_version.Year = _fwImgInfo.ext_info.fw_rel_date[2];
 
     vector<u_int8_t> fw_version_data(IMAGE_LAYOUT_FW_VERSION_SIZE, 0x0);
     image_layout_FW_VERSION_pack(&fw_version, fw_version_data.data());
     DPRINTF(("Fs4Operations::SetImageIVHwPointer FW version and date for hash256:\n"));
-    for (u_int32_t i = 0; i < (u_int32_t)fw_version_data.size(); i += 4) {
-        DPRINTF(("Fs4Operations::SetImageIVHwPointer 0x%02x%02x%02x%02x\n",
-                fw_version_data[i], fw_version_data[i+1], fw_version_data[i+2], fw_version_data[i+3]));
+    for (u_int32_t i = 0; i < (u_int32_t)fw_version_data.size(); i += 4)
+    {
+        DPRINTF(("Fs4Operations::SetImageIVHwPointer 0x%02x%02x%02x%02x\n", fw_version_data[i], fw_version_data[i + 1],
+                 fw_version_data[i + 2], fw_version_data[i + 3]));
     }
 
     //* Calculate SHA256 on FW version and date
@@ -4517,13 +5039,15 @@ bool Fs4Operations::SetImageIVHwPointer() {
 
 bool Fs4Operations::PrepItocSectionsForHmac(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical)
 {
-    if (!FsIntQueryAux(true, false)) {
+    if (!FsIntQueryAux(true, false))
+    {
         return false;
     }
 
-    for (int i = 0; i < this->_fs4ImgInfo.itocArr.numOfTocs; i++) {
-        struct fs4_toc_info *itoc_info_p = &this->_fs4ImgInfo.itocArr.tocArr[i];
-        struct image_layout_itoc_entry *toc_entry = &(itoc_info_p->toc_entry);
+    for (int i = 0; i < this->_fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* itoc_info_p = &this->_fs4ImgInfo.itocArr.tocArr[i];
+        struct image_layout_itoc_entry* toc_entry = &(itoc_info_p->toc_entry);
         if (IsCriticalSection(toc_entry->type))
         {
             critical.reserve(critical.size() + itoc_info_p->section_data.size());
@@ -4531,7 +5055,8 @@ bool Fs4Operations::PrepItocSectionsForHmac(vector<u_int8_t>& critical, vector<u
         }
         else
         {
-            if (itoc_info_p->toc_entry.type == FS4_RSA_4096_SIGNATURES) {
+            if (itoc_info_p->toc_entry.type == FS4_RSA_4096_SIGNATURES)
+            {
                 continue;
             }
             non_critical.reserve(non_critical.size() + itoc_info_p->section_data.size());
@@ -4543,26 +5068,32 @@ bool Fs4Operations::PrepItocSectionsForHmac(vector<u_int8_t>& critical, vector<u
 
 bool Fs4Operations::PrepItocSectionsForCompare(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical)
 {
-    for (int i = 0; i < this->_fs4ImgInfo.itocArr.numOfTocs; i++) {
-        struct fs4_toc_info *itoc_info_p = &this->_fs4ImgInfo.itocArr.tocArr[i];
-        struct image_layout_itoc_entry *toc_entry = &(itoc_info_p->toc_entry);
+    for (int i = 0; i < this->_fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
+        struct fs4_toc_info* itoc_info_p = &this->_fs4ImgInfo.itocArr.tocArr[i];
+        struct image_layout_itoc_entry* toc_entry = &(itoc_info_p->toc_entry);
         if (IsCriticalSection(toc_entry->type))
         {
             critical.reserve(critical.size() + itoc_info_p->section_data.size());
             critical.insert(critical.end(), itoc_info_p->section_data.begin(), itoc_info_p->section_data.end());
-            //printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr, itoc_info_p->toc_entry.type, 
-                //(unsigned int)(itoc_info_p->section_data.size() + padding_size), GetSectionNameByType(itoc_info_p->toc_entry.type));
+            // printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr,
+            // itoc_info_p->toc_entry.type, (unsigned int)(itoc_info_p->section_data.size() + padding_size),
+            // GetSectionNameByType(itoc_info_p->toc_entry.type));
         }
         else
         {
-            if (itoc_info_p->toc_entry.type == FS4_RSA_4096_SIGNATURES || itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_512 ||
-                itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_256) {
+            if (itoc_info_p->toc_entry.type == FS4_RSA_4096_SIGNATURES ||
+                itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_512 ||
+                itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_256)
+            {
                 continue;
             }
-            //printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr, itoc_info_p->toc_entry.type, (unsigned int)itoc_info_p->section_data.size(), GetSectionNameByType(itoc_info_p->toc_entry.type));
+            // printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr,
+            // itoc_info_p->toc_entry.type, (unsigned int)itoc_info_p->section_data.size(),
+            // GetSectionNameByType(itoc_info_p->toc_entry.type));
             non_critical.reserve(non_critical.size() + itoc_info_p->section_data.size());
             non_critical.insert(non_critical.end(), itoc_info_p->section_data.begin(), itoc_info_p->section_data.end());
-            //currentItoc++;
+            // currentItoc++;
         }
     }
     return true;
@@ -4570,14 +5101,17 @@ bool Fs4Operations::PrepItocSectionsForCompare(vector<u_int8_t>& critical, vecto
 
 bool Fs4Operations::getCriticalNonCriticalSections(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical)
 {
-    if (!FsIntQueryAux(true, false)) {
+    if (!FsIntQueryAux(true, false))
+    {
         return false;
     }
-    for (int i = 0; i < this->_fs4ImgInfo.itocArr.numOfTocs; i++) {
+    for (int i = 0; i < this->_fs4ImgInfo.itocArr.numOfTocs; i++)
+    {
         unsigned long padding_size = 0;
-        struct fs4_toc_info *itoc_info_p = &this->_fs4ImgInfo.itocArr.tocArr[i];
-        struct image_layout_itoc_entry *toc_entry = &(itoc_info_p->toc_entry);
-        if (itoc_info_p->section_data.size() % GLOBAL_ALIGNMENT) {
+        struct fs4_toc_info* itoc_info_p = &this->_fs4ImgInfo.itocArr.tocArr[i];
+        struct image_layout_itoc_entry* toc_entry = &(itoc_info_p->toc_entry);
+        if (itoc_info_p->section_data.size() % GLOBAL_ALIGNMENT)
+        {
             padding_size = GLOBAL_ALIGNMENT - (itoc_info_p->section_data.size() % GLOBAL_ALIGNMENT);
         }
         if (IsCriticalSection(toc_entry->type))
@@ -4585,22 +5119,26 @@ bool Fs4Operations::getCriticalNonCriticalSections(vector<u_int8_t>& critical, v
             critical.reserve(critical.size() + itoc_info_p->section_data.size() + padding_size);
             critical.insert(critical.end(), itoc_info_p->section_data.begin(), itoc_info_p->section_data.end());
             critical.insert(critical.end(), padding_size, 0xff);
-            //printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr, itoc_info_p->toc_entry.type, 
-                //(unsigned int)(itoc_info_p->section_data.size() + padding_size), GetSectionNameByType(itoc_info_p->toc_entry.type));
+            // printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n", itoc_info_p->entry_addr,
+            // itoc_info_p->toc_entry.type, (unsigned int)(itoc_info_p->section_data.size() + padding_size),
+            // GetSectionNameByType(itoc_info_p->toc_entry.type));
         }
         else
         {
-            if (itoc_info_p->toc_entry.type == FS4_RSA_4096_SIGNATURES || itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_512 || 
-                itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_256) {
-                    continue;
+            if (itoc_info_p->toc_entry.type == FS4_RSA_4096_SIGNATURES ||
+                itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_512 ||
+                itoc_info_p->toc_entry.type == FS3_IMAGE_SIGNATURE_256)
+            {
+                continue;
             }
             // printf("-D- addr  0x%.8x toc type : 0x%.8x  size 0x%.8x name %s\n",
             //         itoc_info_p->toc_entry.flash_addr*4, itoc_info_p->toc_entry.type,
-            //         (unsigned int)itoc_info_p->section_data.size(), GetSectionNameByType(itoc_info_p->toc_entry.type));
+            //         (unsigned int)itoc_info_p->section_data.size(),
+            //         GetSectionNameByType(itoc_info_p->toc_entry.type));
             non_critical.reserve(non_critical.size() + itoc_info_p->section_data.size() + padding_size);
             non_critical.insert(non_critical.end(), itoc_info_p->section_data.begin(), itoc_info_p->section_data.end());
             non_critical.insert(non_critical.end(), padding_size, 0xff);
-            //currentItoc++;
+            // currentItoc++;
         }
     }
     return true;
@@ -4635,16 +5173,22 @@ bool Fs4Operations::IsSecurityVersionViolated(u_int32_t image_security_version)
     u_int32_t imageSecurityVersion = image_security_version;
     u_int32_t deviceEfuseSecurityVersion;
 
-    if (getenv("FLINT_IGNORE_SECURITY_VERSION_CHECK") != NULL) {
+    if (getenv("FLINT_IGNORE_SECURITY_VERSION_CHECK") != NULL)
+    {
         return false;
     }
-    
+
     // Set device security-version (from EFUSEs)
-    if (_fs3ImgInfo.ext_info.device_security_version_access_method == MFSV) {
+    if (_fs3ImgInfo.ext_info.device_security_version_access_method == MFSV)
+    {
         deviceEfuseSecurityVersion = _fs3ImgInfo.ext_info.device_security_version_mfsv.efuses_sec_ver;
-    } else if (_fs3ImgInfo.ext_info.device_security_version_access_method == DIRECT_ACCESS) {
+    }
+    else if (_fs3ImgInfo.ext_info.device_security_version_access_method == DIRECT_ACCESS)
+    {
         deviceEfuseSecurityVersion = _fs3ImgInfo.ext_info.device_security_version_gw;
-    } else {
+    }
+    else
+    {
         deviceEfuseSecurityVersion = 0;
     }
 
@@ -4652,11 +5196,12 @@ bool Fs4Operations::IsSecurityVersionViolated(u_int32_t image_security_version)
     return (imageSecurityVersion < deviceEfuseSecurityVersion);
 }
 
-bool Fs4Operations::TocComp::operator()(fs4_toc_info *elem1, fs4_toc_info *elem2)
+bool Fs4Operations::TocComp::operator()(fs4_toc_info* elem1, fs4_toc_info* elem2)
 {
     u_int32_t absAddr1 = (elem1->toc_entry.flash_addr << 2) + _startAdd;
     u_int32_t absAddr2 = (elem2->toc_entry.flash_addr << 2) + _startAdd;
-    if (absAddr1 < absAddr2) {
+    if (absAddr1 < absAddr2)
+    {
         return true;
     }
     return false;
@@ -4665,17 +5210,19 @@ bool Fs4Operations::TocComp::operator()(fs4_toc_info *elem1, fs4_toc_info *elem2
 u_int32_t Fs4Operations::TocArray::getSectionsTotalSize()
 {
     u_int32_t s = 0;
-    for (int i = 0; i < numOfTocs; i++) {
-        struct fs4_toc_info *itoc_info_p = &(tocArr[i]);
-        struct image_layout_itoc_entry *toc_entry = &itoc_info_p->toc_entry;
+    for (int i = 0; i < numOfTocs; i++)
+    {
+        struct fs4_toc_info* itoc_info_p = &(tocArr[i]);
+        struct image_layout_itoc_entry* toc_entry = &itoc_info_p->toc_entry;
         s += toc_entry->size << 2;
     }
     return s;
 }
 
-void Fs4Operations::TocArray::initEmptyTocArrEntry(struct fs4_toc_info * tocArrEntry)
+void Fs4Operations::TocArray::initEmptyTocArrEntry(struct fs4_toc_info* tocArrEntry)
 {
-    if (!tocArrEntry) {
+    if (!tocArrEntry)
+    {
         return;
     }
     memset(tocArrEntry->data, 0, sizeof(tocArrEntry->data));
@@ -4685,9 +5232,10 @@ void Fs4Operations::TocArray::initEmptyTocArrEntry(struct fs4_toc_info * tocArrE
     return;
 }
 
-void Fs4Operations::TocArray::copyTocArrEntry(struct fs4_toc_info * dest, struct fs4_toc_info * src)
+void Fs4Operations::TocArray::copyTocArrEntry(struct fs4_toc_info* dest, struct fs4_toc_info* src)
 {
-    if (!src || !dest) {
+    if (!src || !dest)
+    {
         return;
     }
 
@@ -4702,22 +5250,26 @@ Fs4Operations::TocArray::TocArray()
 {
     numOfTocs = 0;
     tocArrayAddr = 0;
-    for (int i = 0; i < MAX_TOCS_NUM; i++) {
+    for (int i = 0; i < MAX_TOCS_NUM; i++)
+    {
         Fs4Operations::TocArray::initEmptyTocArrEntry(&tocArr[i]);
     }
     memset(&tocHeader, 0, sizeof(tocHeader));
 }
 
-Fs4Operations::HTOC::HTOC(vector<u_int8_t> img, u_int32_t htoc_start_addr) {
+Fs4Operations::HTOC::HTOC(vector<u_int8_t> img, u_int32_t htoc_start_addr)
+{
     memset(entries, 0, MAX_HTOC_ENTRIES_NUM * sizeof(image_layout_htoc_entry));
     this->htoc_start_addr = htoc_start_addr;
     //* Parse header
-    vector<u_int8_t> header_data(img.begin() + htoc_start_addr, img.begin() + htoc_start_addr + IMAGE_LAYOUT_HTOC_HEADER_SIZE);
+    vector<u_int8_t> header_data(img.begin() + htoc_start_addr,
+                                 img.begin() + htoc_start_addr + IMAGE_LAYOUT_HTOC_HEADER_SIZE);
     image_layout_htoc_header_unpack(&header, header_data.data());
     // image_layout_htoc_header_dump(&header, stdout);
     //* Parse entries
     u_int32_t entries_start_addr = htoc_start_addr + IMAGE_LAYOUT_HTOC_HEADER_SIZE;
-    for (int ii = 0; ii < header.num_of_entries; ii++) {
+    for (int ii = 0; ii < header.num_of_entries; ii++)
+    {
         u_int32_t entry_addr = entries_start_addr + ii * IMAGE_LAYOUT_HTOC_ENTRY_SIZE;
         vector<u_int8_t> entry_data(img.begin() + entry_addr, img.begin() + entry_addr + IMAGE_LAYOUT_HTOC_ENTRY_SIZE);
         image_layout_htoc_entry_unpack(&(entries[ii]), entry_data.data());
@@ -4725,9 +5277,13 @@ Fs4Operations::HTOC::HTOC(vector<u_int8_t> img, u_int32_t htoc_start_addr) {
     }
 }
 
-bool Fs4Operations::HTOC::AddNewEntry(FBase* ioAccess, fs3_section_t section_type, struct image_layout_htoc_entry& htoc_entry) {
+bool Fs4Operations::HTOC::AddNewEntry(FBase* ioAccess,
+                                      fs3_section_t section_type,
+                                      struct image_layout_htoc_entry& htoc_entry)
+{
     DPRINTF(("Fs4Operations::HTOC::AddNewEntry htoc num_of_entries = %d\n", header.num_of_entries));
-    if (header.num_of_entries == MAX_HTOC_ENTRIES_NUM) {
+    if (header.num_of_entries == MAX_HTOC_ENTRIES_NUM)
+    {
         return false;
     }
 
@@ -4738,12 +5294,14 @@ bool Fs4Operations::HTOC::AddNewEntry(FBase* ioAccess, fs3_section_t section_typ
     htoc_entry.section_type = section_type;
 
     //* Writing new htoc entry
-    u_int32_t htoc_entry_addr = htoc_start_addr + IMAGE_LAYOUT_HTOC_HEADER_SIZE + htoc_entry_index * IMAGE_LAYOUT_HTOC_ENTRY_SIZE;
+    u_int32_t htoc_entry_addr =
+      htoc_start_addr + IMAGE_LAYOUT_HTOC_HEADER_SIZE + htoc_entry_index * IMAGE_LAYOUT_HTOC_ENTRY_SIZE;
     vector<u_int8_t> htoc_entry_data;
     htoc_entry_data.resize(IMAGE_LAYOUT_HTOC_ENTRY_SIZE);
     image_layout_htoc_entry_pack(&htoc_entry, htoc_entry_data.data());
     DPRINTF(("Fs4Operations::HTOC::AddNewEntry Writing new htoc entry at addr 0x%x\n", htoc_entry_addr));
-    if (!ioAccess->write(htoc_entry_addr, htoc_entry_data.data(), IMAGE_LAYOUT_HTOC_ENTRY_SIZE)) {
+    if (!ioAccess->write(htoc_entry_addr, htoc_entry_data.data(), IMAGE_LAYOUT_HTOC_ENTRY_SIZE))
+    {
         return false;
     }
 
@@ -4753,17 +5311,21 @@ bool Fs4Operations::HTOC::AddNewEntry(FBase* ioAccess, fs3_section_t section_typ
     htoc_header_data.resize(IMAGE_LAYOUT_HTOC_HEADER_SIZE);
     image_layout_htoc_header_pack(&header, htoc_header_data.data());
     DPRINTF(("Fs4Operations::HTOC::AddNewEntry Writing updated htoc header at addr 0x%x\n", htoc_start_addr));
-    if (!ioAccess->write(htoc_start_addr, htoc_header_data.data(), IMAGE_LAYOUT_HTOC_HEADER_SIZE)) {
+    if (!ioAccess->write(htoc_start_addr, htoc_header_data.data(), IMAGE_LAYOUT_HTOC_HEADER_SIZE))
+    {
         return false;
     }
 
     return true;
 }
 
-bool Fs4Operations::HTOC::GetEntryBySectionType(fs3_section_t section_type, struct image_layout_htoc_entry& htoc_entry) {
+bool Fs4Operations::HTOC::GetEntryBySectionType(fs3_section_t section_type, struct image_layout_htoc_entry& htoc_entry)
+{
     bool res = false;
-    for (int ii = 0; ii < header.num_of_entries; ii++) {
-        if (entries[ii].section_type == section_type) {
+    for (int ii = 0; ii < header.num_of_entries; ii++)
+    {
+        if (entries[ii].section_type == section_type)
+        {
             htoc_entry = entries[ii];
             res = true;
             break;
diff --git a/mlxfwops/lib/fs4_ops.h b/mlxfwops/lib/fs4_ops.h
index 31c50ef5..2a244beb 100644
--- a/mlxfwops/lib/fs4_ops.h
+++ b/mlxfwops/lib/fs4_ops.h
@@ -31,7 +31,6 @@
  * SOFTWARE.
  */
 
-
 #ifndef FS4_OPS_
 #define FS4_OPS_
 
@@ -50,14 +49,25 @@
 #define MAX_HTOC_ENTRIES_NUM 28
 #define ENCRYPTED_BURN_IMAGE_SIZE_LOCATION_IN_BYTES 0x1000000 // 16MB
 #define DELTA_IV_HW_POINTER_ADDR 0x88
-enum SecureBootSignVersion {VERSION_1 = 1, VERSION_2};
+enum SecureBootSignVersion
+{
+    VERSION_1 = 1,
+    VERSION_2
+};
 
-class Fs4Operations : public Fs3Operations {
+class Fs4Operations : public Fs3Operations
+{
 public:
-
-    Fs4Operations(FBase *ioAccess) :
-        Fs3Operations(ioAccess), _boot2_ptr(0), _itoc_ptr(0), _tools_ptr(0), _digest_mdk_ptr(0),
-        _digest_recovery_key_ptr(0), _public_key_ptr(0), _signatureDataSet(false), _is_hw_ptrs_initialized(false),
+    Fs4Operations(FBase* ioAccess) :
+        Fs3Operations(ioAccess),
+        _boot2_ptr(0),
+        _itoc_ptr(0),
+        _tools_ptr(0),
+        _digest_mdk_ptr(0),
+        _digest_recovery_key_ptr(0),
+        _public_key_ptr(0),
+        _signatureDataSet(false),
+        _is_hw_ptrs_initialized(false),
         _encrypted_image_io_access(NULL)
     {
         _minBinMinorVer = FS4_MIN_BIN_VER_MINOR;
@@ -65,32 +75,44 @@ class Fs4Operations : public Fs3Operations {
         _maxBinMajorVer = FS4_MAX_BIN_VER_MAJOR;
     };
 
-    virtual ~Fs4Operations()  {};
+    virtual ~Fs4Operations(){};
     virtual u_int8_t FwType();
     virtual bool FwInit();
 
-    bool FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage = false, bool showItoc = false, bool ignoreDToc = false);
+    bool FwVerify(VerifyCallBack verifyCallBackFunc,
+                  bool isStripedImage = false,
+                  bool showItoc = false,
+                  bool ignoreDToc = false);
     bool FwShiftDevData(PrintCallBack progressFunc = (PrintCallBack)NULL);
     bool FwCalcMD5(u_int8_t md5sum[16]);
-    bool FwDeleteRom(bool ignoreProdIdCheck,
-                     ProgressCallBack progressFunc = (ProgressCallBack)NULL);
-    bool FwBurnRom(FImage *romImg, bool ignoreProdIdCheck = false,
+    bool FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    bool FwBurnRom(FImage* romImg,
+                   bool ignoreProdIdCheck = false,
                    bool ignoreDevidCheck = false,
                    ProgressCallBack progressFunc = (ProgressCallBack)NULL);
     bool FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer);
     bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
-                          struct tools_open_fw_version& fwVer, bool queryRunning = false);
+                          struct tools_open_fw_version& fwVer,
+                          bool queryRunning = false);
     bool FwResetTimeStamp();
     virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false);
-    bool FwSignWithHmac(const char *key_file);
-    bool signForSecureBoot(const char *private_key_file, const char *public_key_file, const char *guid_key_file);
-    bool signForSecureBootUsingHSM(const char *public_key_file, const char *uuid, MlxSign::OpensslEngineSigner& engineSigner);
-    bool signForFwUpdateUsingHSM(const char *uuid, MlxSign::OpensslEngineSigner& engineSigner, PrintCallBack printFunc);
-    virtual bool PreparePublicKeyData(const char *public_key_file, vector <u_int8_t>& publicKeyData, unsigned int& pem_offset);
-    virtual bool storePublicKeyInSection(const char *public_key_file, const char *uuid);
-    virtual bool storeSecureBootSignaturesInSection(vector<u_int8_t> boot_signature, vector<u_int8_t> critical_sections_signature = vector<u_int8_t>(),
-                                                    vector<u_int8_t> non_critical_sections_signature = vector<u_int8_t>());
-    virtual bool FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc, bool verbose = false, bool ignoreImageStart = false);
+    bool FwSignWithHmac(const char* key_file);
+    bool signForSecureBoot(const char* private_key_file, const char* public_key_file, const char* guid_key_file);
+    bool signForSecureBootUsingHSM(const char* public_key_file,
+                                   const char* uuid,
+                                   MlxSign::OpensslEngineSigner& engineSigner);
+    bool signForFwUpdateUsingHSM(const char* uuid, MlxSign::OpensslEngineSigner& engineSigner, PrintCallBack printFunc);
+    virtual bool
+      PreparePublicKeyData(const char* public_key_file, vector<u_int8_t>& publicKeyData, unsigned int& pem_offset);
+    virtual bool storePublicKeyInSection(const char* public_key_file, const char* uuid);
+    virtual bool
+      storeSecureBootSignaturesInSection(vector<u_int8_t> boot_signature,
+                                         vector<u_int8_t> critical_sections_signature = vector<u_int8_t>(),
+                                         vector<u_int8_t> non_critical_sections_signature = vector<u_int8_t>());
+    virtual bool FwExtract4MBImage(vector<u_int8_t>& img,
+                                   bool maskMagicPatternAndDevToc,
+                                   bool verbose = false,
+                                   bool ignoreImageStart = false);
     virtual bool GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_t>& img);
     virtual bool IsSecureBootSupported();
     virtual bool IsCableQuerySupported();
@@ -98,29 +120,39 @@ class Fs4Operations : public Fs3Operations {
     bool PrepItocSectionsForHmac(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical);
     bool IsCriticalSection(u_int8_t sect_type);
     bool CalcHMAC(const vector<u_int8_t>& key, const vector<u_int8_t>& data, vector<u_int8_t>& digest);
-    bool CheckIfAlignmentIsNeeded(FwOperations *imgops);
+    bool CheckIfAlignmentIsNeeded(FwOperations* imgops);
     virtual bool PrepItocSectionsForCompare(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical);
     bool getCriticalNonCriticalSections(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical);
-    virtual bool RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t devid_t, const cx4fw_uid_entry& base_guid, const cx4fw_uid_entry& base_mac);
+    virtual bool RestoreDevToc(vector<u_int8_t>& img,
+                               char* psid,
+                               dm_dev_id_t devid_t,
+                               const cx4fw_uid_entry& base_guid,
+                               const cx4fw_uid_entry& base_mac);
     bool initHwPtrs(bool isVerify = false);
     bool isHashesTableHwPtrValid();
     bool isEncrypted(bool& is_encrypted);
     bool openEncryptedImageAccess(const char* encrypted_image_path);
-    bool FwExtractEncryptedImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc,
-                                 bool verbose = false, bool ignoreImageStart = false);
+    bool FwExtractEncryptedImage(vector<u_int8_t>& img,
+                                 bool maskMagicPatternAndDevToc,
+                                 bool verbose = false,
+                                 bool ignoreImageStart = false);
     bool burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& burnParams);
     bool readFS4Log2ChunkSizeFromImage(u_int32_t& log2_chunk_size);
-    bool DoAfterBurnJobs(const u_int32_t magic_patter[], ExtBurnParams& burnParams, Flash *flash_access,
-                         u_int32_t new_image_start, u_int32_t log2_chunk_size);
+    bool DoAfterBurnJobs(const u_int32_t magic_patter[],
+                         ExtBurnParams& burnParams,
+                         Flash* flash_access,
+                         u_int32_t new_image_start,
+                         u_int32_t log2_chunk_size);
     virtual void FwCleanUp();
     bool IsLifeCycleAccessible(chip_type_t chip_type);
     bool IsSecurityVersionAccessible(chip_type_t chip_type);
     bool IsSecurityVersionViolated(u_int32_t image_security_version);
-    bool GetImageInfo(u_int8_t *buff);
+    bool GetImageInfo(u_int8_t* buff);
     bool GetImageSize(u_int32_t* image_size);
 
 protected:
-    struct fs4_toc_info {
+    struct fs4_toc_info
+    {
         u_int32_t entry_addr;
         struct image_layout_itoc_entry toc_entry;
         u_int8_t data[IMAGE_LAYOUT_ITOC_ENTRY_SIZE];
@@ -131,27 +163,33 @@ class Fs4Operations : public Fs3Operations {
     virtual bool VerifyImageAfterModifications();
     bool parseDevData(bool readRom = true, bool quickQuery = true, bool verbose = false);
 
-
 private:
-    #define PRE_CRC_OUTPUT   "    "
-    #define FS4_DEFAULT_SECTOR_SIZE 0x1000
-    #define DTOC_ASCII 0x44544f43
+#define PRE_CRC_OUTPUT "    "
+#define FS4_DEFAULT_SECTOR_SIZE 0x1000
+#define DTOC_ASCII 0x44544f43
 
-    enum CRCTYPE {INITOCENTRY = 0, NOCRC = 1, INSECTION = 2};
+    enum CRCTYPE
+    {
+        INITOCENTRY = 0,
+        NOCRC = 1,
+        INSECTION = 2
+    };
 
-    class TocArray {
+    class TocArray
+    {
     public:
         static void initEmptyTocArrEntry(struct fs4_toc_info* tocArrEntry);
         static void copyTocArrEntry(struct fs4_toc_info* dest, struct fs4_toc_info* src);
         TocArray();
-        u_int32_t           getSectionsTotalSize();
+        u_int32_t getSectionsTotalSize();
         int numOfTocs;
         struct fs4_toc_info tocArr[MAX_TOCS_NUM];
         u_int8_t tocHeader[IMAGE_LAYOUT_ITOC_HEADER_SIZE];
         u_int32_t tocArrayAddr;
     };
 
-    class HTOC {
+    class HTOC
+    {
     public:
         struct image_layout_htoc_header header;
         struct image_layout_htoc_entry entries[MAX_HTOC_ENTRIES_NUM];
@@ -162,34 +200,57 @@ class Fs4Operations : public Fs3Operations {
         bool AddNewEntry(FBase* ioAccess, fs3_section_t section_type, struct image_layout_htoc_entry& htoc_entry);
     };
 
-    struct Fs4ImgInfo {
+    struct Fs4ImgInfo
+    {
         TocArray itocArr;
         TocArray dtocArr;
         u_int8_t firstItocArrayIsEmpty;
         u_int32_t smallestDTocAddr;
-
     };
 #ifndef UEFI_BUILD
     bool FwSignSection(const vector<u_int8_t>& section, const string privPemFileStr, vector<u_int8_t>& encSha);
 #endif
     bool CheckSignatures(u_int32_t a[], u_int32_t b[], int n);
     bool encryptedFwReadImageInfoSection();
-    bool encryptedFwQuery(fw_info_t *fwInfo, bool readRom = true, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
-    virtual bool FwQuery(fw_info_t *fwInfo, bool readRom = true, bool isStripedImage = false, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
-    bool FsVerifyAux(VerifyCallBack verifyCallBackFunc, bool show_itoc, struct QueryOptions queryOptions, bool ignoreDToc = false, bool verbose = false);
+    bool encryptedFwQuery(fw_info_t* fwInfo,
+                          bool readRom = true,
+                          bool quickQuery = true,
+                          bool ignoreDToc = false,
+                          bool verbose = false);
+    virtual bool FwQuery(fw_info_t* fwInfo,
+                         bool readRom = true,
+                         bool isStripedImage = false,
+                         bool quickQuery = true,
+                         bool ignoreDToc = false,
+                         bool verbose = false);
+    bool FsVerifyAux(VerifyCallBack verifyCallBackFunc,
+                     bool show_itoc,
+                     struct QueryOptions queryOptions,
+                     bool ignoreDToc = false,
+                     bool verbose = false);
     bool Init();
-    bool CheckTocSignature(struct image_layout_itoc_header *itoc_header, u_int32_t first_signature);
-    bool CheckDevInfoSignature(u_int32_t *buff);
-    bool FsBurnAux(FwOperations *imageOps, ExtBurnParams& burnParams);
-    bool BurnFs4Image(Fs4Operations &imageOps, ExtBurnParams& burnParams);
-    bool Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
-                        fs3_section_t sect_type, struct fs4_toc_info*&curr_toc);
-    bool Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
-                        fs3_section_t sect_type, struct fs4_toc_info*&curr_toc,
+    bool CheckTocSignature(struct image_layout_itoc_header* itoc_header, u_int32_t first_signature);
+    bool CheckDevInfoSignature(u_int32_t* buff);
+    bool FsBurnAux(FwOperations* imageOps, ExtBurnParams& burnParams);
+    bool BurnFs4Image(Fs4Operations& imageOps, ExtBurnParams& burnParams);
+    bool Fs4GetItocInfo(struct fs4_toc_info* tocArr,
+                        int num_of_itocs,
+                        fs3_section_t sect_type,
+                        struct fs4_toc_info*& curr_toc);
+    bool Fs4GetItocInfo(struct fs4_toc_info* tocArr,
+                        int num_of_itocs,
+                        fs3_section_t sect_type,
+                        struct fs4_toc_info*& curr_toc,
                         int& toc_index);
-    bool Fs4GetItocInfo(struct fs4_toc_info  *tocArr, int num_of_itocs,
-                        fs3_section_t sect_type, vector<struct fs4_toc_info*>& curr_toc);
-    bool UpdateSection(void *new_info, fs3_section_t sect_type = FS3_DEV_INFO, bool is_sect_failsafe = true, CommandType cmd_type = CMD_UNKNOWN, PrintCallBack callBackFunc = (PrintCallBack)NULL );
+    bool Fs4GetItocInfo(struct fs4_toc_info* tocArr,
+                        int num_of_itocs,
+                        fs3_section_t sect_type,
+                        vector<struct fs4_toc_info*>& curr_toc);
+    bool UpdateSection(void* new_info,
+                       fs3_section_t sect_type = FS3_DEV_INFO,
+                       bool is_sect_failsafe = true,
+                       CommandType cmd_type = CMD_UNKNOWN,
+                       PrintCallBack callBackFunc = (PrintCallBack)NULL);
     bool UpdateSection(fs3_section_t sectionType,
                        std::vector<u_int8_t>& newSectionData,
                        const char* msg,
@@ -198,83 +259,99 @@ class Fs4Operations : public Fs3Operations {
                       std::vector<u_int8_t>& newSectionData,
                       const char* msg,
                       PrintCallBack callBackFunc);
-    bool Fs4UpdateMfgUidsSection(struct fs4_toc_info *curr_toc,
-                                 std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                                 std::vector<u_int8_t>  &newSectionData);
+    bool Fs4UpdateMfgUidsSection(struct fs4_toc_info* curr_toc,
+                                 std::vector<u_int8_t> section_data,
+                                 fs3_uid_t base_uid,
+                                 std::vector<u_int8_t>& newSectionData);
     bool Fs4ChangeUidsFromBase(fs3_uid_t base_uid, struct image_layout_guids& guids);
-    bool Fs4UpdateUidsSection(std::vector<u_int8_t>  section_data, fs3_uid_t base_uid,
-                              std::vector<u_int8_t>  &newSectionData);
-    bool Fs4UpdateVsdSection(std::vector<u_int8_t>  section_data, char *user_vsd,
-                             std::vector<u_int8_t>  &newSectionData);
-    bool Fs4UpdateVpdSection(struct fs4_toc_info *curr_toc, char *vpd,
-                             std::vector<u_int8_t>  &newSectionData);
-    bool UpdateCertChainSection(struct fs4_toc_info *curr_toc, char *certChainFile,
-                                std::vector<u_int8_t>  &newSectionData);
+    bool Fs4UpdateUidsSection(std::vector<u_int8_t> section_data,
+                              fs3_uid_t base_uid,
+                              std::vector<u_int8_t>& newSectionData);
+    bool Fs4UpdateVsdSection(std::vector<u_int8_t> section_data, char* user_vsd, std::vector<u_int8_t>& newSectionData);
+    bool Fs4UpdateVpdSection(struct fs4_toc_info* curr_toc, char* vpd, std::vector<u_int8_t>& newSectionData);
+    bool
+      UpdateCertChainSection(struct fs4_toc_info* curr_toc, char* certChainFile, std::vector<u_int8_t>& newSectionData);
     bool
       UpdateDigitalCertRWSection(char* certChainFile, u_int32_t certChainIndex, std::vector<u_int8_t>& newSectionData);
-    bool FwSetCertChain(char *certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc);
-    bool Fs4ReburnSection(u_int32_t newSectionAddr, u_int32_t newSectionSize,
-                          std::vector<u_int8_t>  newSectionData, const char *msg,
+    bool FwSetCertChain(char* certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc);
+    bool Fs4ReburnSection(u_int32_t newSectionAddr,
+                          u_int32_t newSectionSize,
+                          std::vector<u_int8_t> newSectionData,
+                          const char* msg,
                           PrintCallBack callBackFunc);
     bool Fs4ReburnTocSection(bool isDtoc, PrintCallBack callBackFunc);
     bool reburnDTocSection(PrintCallBack callBackFunc);
     bool reburnITocSection(PrintCallBack callBackFunc, bool isFailSafe);
-    bool Fs4UpdateItocInfo(struct fs4_toc_info *curr_toc, u_int32_t NewSectSize,
-                           std::vector<u_int8_t>&  newSectionData);
-    bool FwReadData(void *image, u_int32_t *imageSize, bool verbose = false);
-    bool getEncryptedImageSize(u_int32_t *imageSize);
-    bool FwReadEncryptedData(void *image, u_int32_t imageSize, bool verbose);
-    bool CreateDtoc(vector<u_int8_t>& img, u_int8_t* SectionData, u_int32_t section_size, u_int32_t flash_data_addr,
-        fs3_section_t section, u_int32_t tocEntryAddr, CRCTYPE CRC);
+    bool Fs4UpdateItocInfo(struct fs4_toc_info* curr_toc, u_int32_t NewSectSize, std::vector<u_int8_t>& newSectionData);
+    bool FwReadData(void* image, u_int32_t* imageSize, bool verbose = false);
+    bool getEncryptedImageSize(u_int32_t* imageSize);
+    bool FwReadEncryptedData(void* image, u_int32_t imageSize, bool verbose);
+    bool CreateDtoc(vector<u_int8_t>& img,
+                    u_int8_t* SectionData,
+                    u_int32_t section_size,
+                    u_int32_t flash_data_addr,
+                    fs3_section_t section,
+                    u_int32_t tocEntryAddr,
+                    CRCTYPE CRC);
     bool Fs4RemoveSectionAux(fs3_section_t sectionType);
-    bool Fs4RemoveSection(fs3_section_t sectionType,
-                          ProgressCallBack progressFunc);
+    bool Fs4RemoveSection(fs3_section_t sectionType, ProgressCallBack progressFunc);
     bool Fs4AddSectionAux(fs3_section_t sectionType,
-                          enum CRCTYPE crcType, u_int8_t zippedImage, u_int32_t *newSectData,
+                          enum CRCTYPE crcType,
+                          u_int8_t zippedImage,
+                          u_int32_t* newSectData,
                           u_int32_t newSectSize);
-    bool Fs4AddSection(fs3_section_t sectionType, enum CRCTYPE crcType,
-                       u_int8_t zippedImage, u_int32_t *newSectData, u_int32_t newSectSize,
+    bool Fs4AddSection(fs3_section_t sectionType,
+                       enum CRCTYPE crcType,
+                       u_int8_t zippedImage,
+                       u_int32_t* newSectData,
+                       u_int32_t newSectSize,
                        ProgressCallBack progressFunc);
     void updateTocEndEntryInImgCache(u_int32_t lastItocSectAddress);
-    void updateTocEntryCRC(struct fs4_toc_info *tocEntry);
-    void updateTocEntryData(struct fs4_toc_info *tocEntry);
-    void updateTocEntrySectionData(struct fs4_toc_info *tocEntry,
-                                   u_int8_t *data, u_int32_t dataSize);
-    void updateTocHeaderCRC(struct image_layout_itoc_header *tocHeader);
-    inline bool checkIfSectionsOverlap(u_int32_t s1, u_int32_t e1, u_int32_t s2,
-                                       u_int32_t e2);
+    void updateTocEntryCRC(struct fs4_toc_info* tocEntry);
+    void updateTocEntryData(struct fs4_toc_info* tocEntry);
+    void updateTocEntrySectionData(struct fs4_toc_info* tocEntry, u_int8_t* data, u_int32_t dataSize);
+    void updateTocHeaderCRC(struct image_layout_itoc_header* tocHeader);
+    inline bool checkIfSectionsOverlap(u_int32_t s1, u_int32_t e1, u_int32_t s2, u_int32_t e2);
 
-    int  getBoot2Size(u_int32_t address);
-    int  getHashesTableSize(u_int32_t address) {return getBoot2Size(address);} // Hashes table size calculated the same as boot2
+    int getBoot2Size(u_int32_t address);
+    int getHashesTableSize(u_int32_t address)
+    {
+        return getBoot2Size(address);
+    } // Hashes table size calculated the same as boot2
     bool getBootRecordSize(u_int32_t& boot_record_size);
     bool getBootDataForSign(vector<u_int8_t>& data);
     bool getBootDataForSignVersion1(vector<u_int8_t>& data);
     bool getBootDataForSignVersion2(vector<u_int8_t>& data);
     bool CheckFs4ImgSize(Fs4Operations& imageOps, bool useImageDevData = false);
 
-    u_int32_t getAbsAddr(fs4_toc_info *toc);
-    u_int32_t getAbsAddr(fs4_toc_info *toc, u_int32_t imgStart);
+    u_int32_t getAbsAddr(fs4_toc_info* toc);
+    u_int32_t getAbsAddr(fs4_toc_info* toc, u_int32_t imgStart);
     bool getImgStart();
     bool getExtendedHWPtrs(VerifyCallBack verifyCallBackFunc, FBase* ioAccess, bool IsBurningProcess = false);
-    bool getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc, FBase* ioAccess, bool IsBurningProcess = false, bool isVerify = false);
+    bool getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc,
+                                FBase* ioAccess,
+                                bool IsBurningProcess = false,
+                                bool isVerify = false);
     bool verifyToolsArea(VerifyCallBack verifyCallBackFunc);
     bool verifyTocHeader(u_int32_t tocAddr, bool isDtoc, VerifyCallBack verifyCallBackFunc);
-    bool verifyTocEntries(u_int32_t tocAddr, bool show_itoc, bool isDtoc,
-                          struct QueryOptions queryOptions, VerifyCallBack verifyCallBackFunc, bool verbose = false);
+    bool verifyTocEntries(u_int32_t tocAddr,
+                          bool show_itoc,
+                          bool isDtoc,
+                          struct QueryOptions queryOptions,
+                          VerifyCallBack verifyCallBackFunc,
+                          bool verbose = false);
     bool CheckTocArrConsistency(TocArray& tocArr, u_int32_t imageStartAddr);
     bool CheckITocArray();
     bool CheckDTocArray();
     u_int32_t getImageSize();
     void maskDevToc(vector<u_int8_t>& img);
     void MaskItocSectionAndEntry(u_int32_t itocType, vector<u_int8_t>& img);
-    bool Fs4UpdateSignatureSection(vector<u_int8_t>  sha256Buff,
-                                   vector<u_int8_t>  &newSectionData);
+    bool Fs4UpdateSignatureSection(vector<u_int8_t> sha256Buff, vector<u_int8_t>& newSectionData);
     bool isDTocSection(fs3_section_t sect_type, bool& isDtoc);
 
-    bool AlignDeviceSections(FwOperations *imageOps);
-    
-    bool restoreWriteProtection(mflash *mfl, u_int8_t banksNum,
-                                write_protect_info_t protect_info[]);
+    bool AlignDeviceSections(FwOperations* imageOps);
+
+    bool restoreWriteProtection(mflash* mfl, u_int8_t banksNum, write_protect_info_t protect_info[]);
 
     bool GetSectionSizeAndOffset(fs3_section_t sectType, u_int32_t& size, u_int32_t& offset);
     SecureBootSignVersion getSecureBootSignVersion();
@@ -306,28 +383,27 @@ class Fs4Operations : public Fs3Operations {
     u_int32_t _security_version;
     u_int32_t _gcm_image_iv;
     u_int32_t _hashes_table_ptr;
-    bool      _signatureDataSet;
-    bool      _is_hw_ptrs_initialized;
-    FImage*   _encrypted_image_io_access;
-    u_int32_t GetPublicKeySecureBootPtr() {
-        return _public_key_ptr;
-    }
-    //This class is for sorting the itoc array by ascending absolute flash_addr used in FwShiftDevData
-    class TocComp {
+    bool _signatureDataSet;
+    bool _is_hw_ptrs_initialized;
+    FImage* _encrypted_image_io_access;
+    u_int32_t GetPublicKeySecureBootPtr() { return _public_key_ptr; }
+    // This class is for sorting the itoc array by ascending absolute flash_addr used in FwShiftDevData
+    class TocComp
+    {
     public:
-        TocComp(u_int32_t startAdd) :  _startAdd(startAdd) {};
-        ~TocComp() {};
-        bool operator()(fs4_toc_info *elem1, fs4_toc_info *elem2);
+        TocComp(u_int32_t startAdd) : _startAdd(startAdd){};
+        ~TocComp(){};
+        bool operator()(fs4_toc_info* elem1, fs4_toc_info* elem2);
+
     private:
         u_int32_t _startAdd;
     };
-
 };
 
-bool Fs4Operations::checkIfSectionsOverlap(u_int32_t s1, u_int32_t e1, u_int32_t s2,
-                                           u_int32_t e2)
+bool Fs4Operations::checkIfSectionsOverlap(u_int32_t s1, u_int32_t e1, u_int32_t s2, u_int32_t e2)
 {
-    if ((s1 >= s2 && s1 <= e2) || (s2 >= s1 && s2 <= e1)) {
+    if ((s1 >= s2 && s1 <= e2) || (s2 >= s1 && s2 <= e1))
+    {
         return true;
     }
 
diff --git a/mlxfwops/lib/fs_checks.cpp b/mlxfwops/lib/fs_checks.cpp
index a5fe62f5..970d1fc6 100644
--- a/mlxfwops/lib/fs_checks.cpp
+++ b/mlxfwops/lib/fs_checks.cpp
@@ -37,89 +37,104 @@
 #include <sstream>
 #endif
 
-const char*FsChecks::AlignmentUserMessage = "An update is needed for the flash layout.\n"
-                                            "The Operation is not failsafe and terminating the process is not allowed.\n";
+const char* FsChecks::AlignmentUserMessage =
+  "An update is needed for the flash layout.\n"
+  "The Operation is not failsafe and terminating the process is not allowed.\n";
 
-const char*FsChecks::ShiftingUserMessage = "Shifting between different image partition sizes requires current image "
-                                           "to be re-programmed on the flash.\n"
-                                           "Once the operation is done, "
-                                           "reload FW and run the command again.\n";
+const char* FsChecks::ShiftingUserMessage = "Shifting between different image partition sizes requires current image "
+                                            "to be re-programmed on the flash.\n"
+                                            "Once the operation is done, "
+                                            "reload FW and run the command again.\n";
 
-bool FsChecks::ExecuteChecks(FwOperations **devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo)
+bool FsChecks::ExecuteChecks(FwOperations** devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo)
 {
     bool isFsCtrlOperations = false;
     u_int8_t fwType = _devFwOps->FwType();
 
-    if (fwType != FIT_FS3 && fwType != FIT_FS4) {
+    if (fwType != FIT_FS3 && fwType != FIT_FS4)
+    {
         return true;
     }
 
-    if (_devInfo.fs3_info.security_mode & SMM_SECURE_FW) {
+    if (_devInfo.fs3_info.security_mode & SMM_SECURE_FW)
+    {
         return true;
     }
 
-    FwOperations *tempDevFwOps = _devFwOps;
+    FwOperations* tempDevFwOps = _devFwOps;
 
-    if (tempDevFwOps->IsFsCtrlOperations()) {
-        //Reopen fwops with no fw ctrl
+    if (tempDevFwOps->IsFsCtrlOperations())
+    {
+        // Reopen fwops with no fw ctrl
         isFsCtrlOperations = true;
         _isItWasFwControlFlow = true;
         _fwParams.noFwCtrl = true;
         _fwParams.uefiExtra.dev_info.no_fw_ctrl = true;
         tempDevFwOps = FwOperations::FwOperationsCreate(_fwParams);
-        if (!tempDevFwOps) {
+        if (!tempDevFwOps)
+        {
             return true;
         }
-        //We need to query again (no need for rom)
+        // We need to query again (no need for rom)
         fw_info_t devInfo2;
-        if (!tempDevFwOps->FwQuery(&devInfo2, false)) {
+        if (!tempDevFwOps->FwQuery(&devInfo2, false))
+        {
             tempDevFwOps->FwCleanUp();
             delete tempDevFwOps;
             return true;
         }
     }
 
-    //Check if alignment is needed in CX5
-    if (fwType == FIT_FS4 &&
-        (_burnParams.burnFailsafe ||
-         (!_burnParams.burnFailsafe && !_burnParams.useImgDevData))) {
-        if (tempDevFwOps->CheckIfAlignmentIsNeeded(_imageFwOps)) {
+    // Check if alignment is needed in CX5
+    if (fwType == FIT_FS4 && (_burnParams.burnFailsafe || (!_burnParams.burnFailsafe && !_burnParams.useImgDevData)))
+    {
+        if (tempDevFwOps->CheckIfAlignmentIsNeeded(_imageFwOps))
+        {
             _isAlignmentNeeded = true;
-            if (isFsCtrlOperations) {
+            if (isFsCtrlOperations)
+            {
                 _isFallBackToRegularFlowNeeded = true;
             }
             _isTimeConsumingFixesNeeded = true;
         }
     }
 
-    //Check if we can burn with mcc:
+    // Check if we can burn with mcc:
     if (isFsCtrlOperations && (tempDevFwOps->FwCheckIfWeCanBurnWithFwControl(_imageFwOps) ||
-                              (_fwParams.hndlType == FHT_UEFI_DEV && _burnParams.allowPsidChange))) {
+                               (_fwParams.hndlType == FHT_UEFI_DEV && _burnParams.allowPsidChange)))
+    {
         _isFallBackToRegularFlowNeeded = true;
     }
 
-    //Check if shifting is needed
-    if (tempDevFwOps->FwCheckIf8MBShiftingNeeded(_imageFwOps, _burnParams)) {
+    // Check if shifting is needed
+    if (tempDevFwOps->FwCheckIf8MBShiftingNeeded(_imageFwOps, _burnParams))
+    {
         _is8MBShiftingNeeded = true;
-        if (isFsCtrlOperations) {
+        if (isFsCtrlOperations)
+        {
             _isFallBackToRegularFlowNeeded = true;
         }
         _burnParams.shift8MBIfNeeded = true;
         _isTimeConsumingFixesNeeded = true;
     }
 
-    if (isFsCtrlOperations) {
-        if (_isFallBackToRegularFlowNeeded) {
-            //do the query again with queryRom = true
+    if (isFsCtrlOperations)
+    {
+        if (_isFallBackToRegularFlowNeeded)
+        {
+            // do the query again with queryRom = true
             memset(&_devInfo, 0, sizeof(_devInfo));
             _devQueryRes = tempDevFwOps->FwQuery(&_devInfo);
-            if (!_devQueryRes) {
+            if (!_devQueryRes)
+            {
                 tempDevFwOps->FwCleanUp();
                 delete tempDevFwOps;
                 return false;
             }
             _devFwOps = tempDevFwOps;
-        } else {
+        }
+        else
+        {
             tempDevFwOps->FwCleanUp();
             delete tempDevFwOps;
         }
@@ -130,15 +145,17 @@ bool FsChecks::ExecuteChecks(FwOperations **devFwOps, FwOperations::ExtBurnParam
     return true;
 }
 
-void FsChecks::UpdateContext(FwOperations **devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo)
+void FsChecks::UpdateContext(FwOperations** devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo)
 {
-    if (_isFallBackToRegularFlowNeeded) {
+    if (_isFallBackToRegularFlowNeeded)
+    {
         (*devFwOps)->FwCleanUp();
         delete (*devFwOps);
         (*devFwOps) = _devFwOps;
         devInfo = _devInfo;
     }
-    if (_is8MBShiftingNeeded) {
+    if (_is8MBShiftingNeeded)
+    {
         burnParams = _burnParams;
     }
 }
@@ -149,36 +166,39 @@ string AddIdentToString(const string& ident, const string& s)
     std::stringstream ss(s);
     vector<string> lines;
 
-    while (ss.good()) {
+    while (ss.good())
+    {
         string line;
         getline(ss, line, '\n');
         lines.push_back(line);
     }
 
-    if (lines.size() == 0) {
+    if (lines.size() == 0)
+    {
         return s;
     }
 
     string newS = "";
-    for (size_t i = 0; i < lines.size(); i++) {
+    for (size_t i = 0; i < lines.size(); i++)
+    {
         newS += ident + lines[i] + "\n";
     }
 
     return newS;
 }
 
-
 void FsChecks::GetUserQuestions(vector<string>& questions, const string& ident)
 {
-    if (_is8MBShiftingNeeded) {
+    if (_is8MBShiftingNeeded)
+    {
         string question = FsChecks::ShiftingUserMessage;
         questions.push_back(AddIdentToString(ident, question));
     }
-    if (_isAlignmentNeeded) {
+    if (_isAlignmentNeeded)
+    {
         string question = FsChecks::AlignmentUserMessage;
         questions.push_back(AddIdentToString(ident, question));
     }
-
 }
 
 #endif
diff --git a/mlxfwops/lib/fs_checks.h b/mlxfwops/lib/fs_checks.h
index a53bb193..d1a834de 100644
--- a/mlxfwops/lib/fs_checks.h
+++ b/mlxfwops/lib/fs_checks.h
@@ -31,35 +31,44 @@
  * SOFTWARE.
  */
 
-
 #ifndef FS_CHECKS_
 #define FS_CHECKS_
 
-
 #include "fw_ops.h"
 #if !defined(UEFI_BUILD)
 #include <string>
 #endif
 
-class MLXFWOP_API FsChecks {
+class MLXFWOP_API FsChecks
+{
 public:
-    FsChecks(fw_info_t devInfo, FwOperations *devFwOps, FwOperations *imageFwOps,
+    FsChecks(fw_info_t devInfo,
+             FwOperations* devFwOps,
+             FwOperations* imageFwOps,
              FwOperations::ExtBurnParams burnParams,
              FwOperations::fw_ops_params_t fwParams) :
-        _is8MBShiftingNeeded(false), _isAlignmentNeeded(false),
-        _isFallBackToRegularFlowNeeded(false), _isItWasFwControlFlow(false),
-        _isTimeConsumingFixesNeeded(false), _devQueryRes(false), _devFwOps(devFwOps),
-        _imageFwOps(imageFwOps), _burnParams(burnParams), _devInfo(devInfo),
-        _fwParams(fwParams) {}
-    bool ExecuteChecks(FwOperations **devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo);
-    void UpdateContext(FwOperations **devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo);
+        _is8MBShiftingNeeded(false),
+        _isAlignmentNeeded(false),
+        _isFallBackToRegularFlowNeeded(false),
+        _isItWasFwControlFlow(false),
+        _isTimeConsumingFixesNeeded(false),
+        _devQueryRes(false),
+        _devFwOps(devFwOps),
+        _imageFwOps(imageFwOps),
+        _burnParams(burnParams),
+        _devInfo(devInfo),
+        _fwParams(fwParams)
+    {
+    }
+    bool ExecuteChecks(FwOperations** devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo);
+    void UpdateContext(FwOperations** devFwOps, FwOperations::ExtBurnParams& burnParams, fw_info_t& devInfo);
 #if !defined(UEFI_BUILD)
     void GetUserQuestions(vector<string>& questions, const string& ident = "");
 #endif
-    //virtual ~FsChecks()  {};
+    // virtual ~FsChecks()  {};
 
-    static const char *AlignmentUserMessage;
-    static const char *ShiftingUserMessage;
+    static const char* AlignmentUserMessage;
+    static const char* ShiftingUserMessage;
 
     bool _is8MBShiftingNeeded;
     bool _isAlignmentNeeded;
@@ -67,12 +76,11 @@ class MLXFWOP_API FsChecks {
     bool _isItWasFwControlFlow;
     bool _isTimeConsumingFixesNeeded;
     bool _devQueryRes;
-    FwOperations *_devFwOps;
-    FwOperations *_imageFwOps;
+    FwOperations* _devFwOps;
+    FwOperations* _imageFwOps;
     FwOperations::ExtBurnParams _burnParams;
     fw_info_t _devInfo;
     FwOperations::fw_ops_params_t _fwParams;
-
 };
 
 #endif // FS_CHECKS_
diff --git a/mlxfwops/lib/fsctrl_ops.cpp b/mlxfwops/lib/fsctrl_ops.cpp
index 91137955..8cec12b6 100644
--- a/mlxfwops/lib/fsctrl_ops.cpp
+++ b/mlxfwops/lib/fsctrl_ops.cpp
@@ -40,30 +40,39 @@
 
 bool FsCtrlOperations::unsupportedOperation()
 {
-    if (_fsCtrlImgInfo.security_mode & SMM_SECURE_FW) {
+    if (_fsCtrlImgInfo.security_mode & SMM_SECURE_FW)
+    {
         return errmsg("Unsupported operation under Secure FW");
-    } else {
+    }
+    else
+    {
         return errmsg("Unsupported operation under Controlled FW, please retry with --no_fw_ctrl <command>");
     }
 }
 
 u_int8_t FsCtrlOperations::FwType()
 {
-    if (!_hwDevId) {
-        if (!FsIntQuery()) {
+    if (!_hwDevId)
+    {
+        if (!FsIntQuery())
+        {
             return FS_UNKNOWN_IMG;
         }
     }
     u_int8_t fwFormat = GetFwFormatFromHwDevID(_hwDevId);
-    if (fwFormat == FS_FS2_GEN) {
+    if (fwFormat == FS_FS2_GEN)
+    {
         return FIT_FS2;
-    } else if (fwFormat == FS_FS3_GEN) {
+    }
+    else if (fwFormat == FS_FS3_GEN)
+    {
         return FIT_FS3;
-    } else if (fwFormat == FS_FS4_GEN) {
+    }
+    else if (fwFormat == FS_FS4_GEN)
+    {
         return FIT_FS4;
     }
     return FIT_FSCTRL;
-
 }
 
 bool FsCtrlOperations::FwInit()
@@ -71,15 +80,17 @@ bool FsCtrlOperations::FwInit()
     FwInitCom();
     _fwImgInfo.fwType = FIT_FSCTRL;
     memset(&(_fsCtrlImgInfo), 0, sizeof(fs3_info_t));
-    if (!FsIntQuery()) {
+    if (!FsIntQuery())
+    {
         return false;
     }
     return true;
 }
 
-static void extractFwVersion(u_int16_t *fwVerArr, u_int32_t fwVersion)
+static void extractFwVersion(u_int16_t* fwVerArr, u_int32_t fwVersion)
 {
-    if (!fwVerArr) {
+    if (!fwVerArr)
+    {
         return;
     }
     fwVerArr[0] = EXTRACT(fwVersion, 24, 8);
@@ -87,9 +98,10 @@ static void extractFwVersion(u_int16_t *fwVerArr, u_int32_t fwVersion)
     fwVerArr[2] = EXTRACT(fwVersion, 0, 16);
 }
 
-static void extractFwVersion(u_int16_t *fwVerArr,
-        const reg_access_hca_rom_version fwVersion) {
-    if (!fwVerArr) {
+static void extractFwVersion(u_int16_t* fwVerArr, const reg_access_hca_rom_version fwVersion)
+{
+    if (!fwVerArr)
+    {
         return;
     }
     fwVerArr[0] = fwVersion.major;
@@ -97,38 +109,42 @@ static void extractFwVersion(u_int16_t *fwVerArr,
     fwVerArr[2] = fwVersion.build;
 }
 
-
-static void extractFwVersion(u_int16_t *fwVerArr, const char* fwVersion) {
-    if (!fwVerArr) {
+static void extractFwVersion(u_int16_t* fwVerArr, const char* fwVersion)
+{
+    if (!fwVerArr)
+    {
         return;
     }
-    
+
     char* str = new char[strlen(fwVersion) + 1];
     char* token = NULL;
     int index = 0;
 
     memset(str, 0, strlen(fwVersion) + 1);
-    strcpy(str, fwVersion);    
+    strcpy(str, fwVersion);
     token = strtok(str, ".");
 
     // converting fw version tokens to numbers
-    while (token != NULL && index < 3) {
+    while (token != NULL && index < 3)
+    {
         fwVerArr[index] = atoi(token);
         token = strtok(NULL, ".");
         ++index;
     }
 
     // 3 tokens are expected in fw version format
-    if (token != NULL || index != 3){
+    if (token != NULL || index != 3)
+    {
         printf("-W- Wrong FW version format.\n");
     }
 
     delete[] str;
 }
 
-static void extractFwBuildTime(u_int16_t *fwRelDate, u_int32_t buildTime)
+static void extractFwBuildTime(u_int16_t* fwRelDate, u_int32_t buildTime)
 {
-    if (!fwRelDate) {
+    if (!fwRelDate)
+    {
         return;
     }
     fwRelDate[0] = EXTRACT(buildTime, 0, 8);
@@ -139,34 +155,43 @@ static void extractFwBuildTime(u_int16_t *fwRelDate, u_int32_t buildTime)
 bool FsCtrlOperations::FsIntQuery()
 {
     fwInfoT fwQuery;
-    if (!_fwCompsAccess->queryFwInfo(&fwQuery, nextBootFwVer)) {
-        return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "Failed to query the FW - Err[%d] - %s", _fwCompsAccess->getLastError(), _fwCompsAccess->getLastErrMsg());
+    if (!_fwCompsAccess->queryFwInfo(&fwQuery, nextBootFwVer))
+    {
+        return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "Failed to query the FW - Err[%d] - %s",
+                      _fwCompsAccess->getLastError(), _fwCompsAccess->getLastErrMsg());
     }
-    if (fwQuery.pending_fw_valid) {
+    if (fwQuery.pending_fw_valid)
+    {
         extractFwVersion(_fwImgInfo.ext_info.fw_ver, fwQuery.pending_fw_version.version);
         extractFwBuildTime(_fwImgInfo.ext_info.fw_rel_date, fwQuery.pending_fw_version.build_time);
-    } else {
+    }
+    else
+    {
         extractFwVersion(_fwImgInfo.ext_info.fw_ver, fwQuery.running_fw_version.version);
         extractFwBuildTime(_fwImgInfo.ext_info.fw_rel_date, fwQuery.running_fw_version.build_time);
     }
     extractFwVersion(_fwImgInfo.ext_info.running_fw_ver, fwQuery.running_fw_version.version);
-    if (fwQuery.running_fw_version.version_string_length) {
+    if (fwQuery.running_fw_version.version_string_length)
+    {
         strcpy(_fwImgInfo.ext_info.product_ver, fwQuery.product_ver);
     }
 
     // get chip type and device sw id
-    const u_int32_t *swId = (u_int32_t*) NULL;
-    if (!getInfoFromHwDevid(fwQuery.hw_dev_id, _fwImgInfo.ext_info.chip_type, &swId)) {
+    const u_int32_t* swId = (u_int32_t*)NULL;
+    if (!getInfoFromHwDevid(fwQuery.hw_dev_id, _fwImgInfo.ext_info.chip_type, &swId))
+    {
         return false;
     }
 
     // Copy version_string to fw version and VSD to branch ver, only for switches fw version
-    if (!IS_HCA(_fwImgInfo.ext_info.chip_type)) {
+    if (!IS_HCA(_fwImgInfo.ext_info.chip_type))
+    {
         ExtractSwitchFWVersion(fwQuery);
     }
 
     // if nextBootFwVer, only fw version is needed and chip type, return.
-    if (nextBootFwVer) {
+    if (nextBootFwVer)
+    {
         return true;
     }
 
@@ -186,35 +211,43 @@ bool FsCtrlOperations::FsIntQuery()
     _fwImgInfo.ext_info.dev_rev = fwQuery.rev_id;
     _fwImgInfo.ext_info.is_failsafe = true;
 
-    _fsCtrlImgInfo.security_mode = (security_mode_t)
-                                   (SMM_MCC_EN |
-                                    ((fwQuery.security_type.debug_fw  == 1) ? SMM_DEBUG_FW  : 0) |
-                                    ((fwQuery.security_type.signed_fw == 1) ? SMM_SIGNED_FW : 0) |
-                                    ((fwQuery.security_type.secure_fw == 1) ? SMM_SECURE_FW : 0) |
-                                    ((fwQuery.security_type.dev_fw    == 1) ? SMM_DEV_FW    : 0));
+    _fsCtrlImgInfo.security_mode =
+      (security_mode_t)(SMM_MCC_EN | ((fwQuery.security_type.debug_fw == 1) ? SMM_DEBUG_FW : 0) |
+                        ((fwQuery.security_type.signed_fw == 1) ? SMM_SIGNED_FW : 0) |
+                        ((fwQuery.security_type.secure_fw == 1) ? SMM_SECURE_FW : 0) |
+                        ((fwQuery.security_type.dev_fw == 1) ? SMM_DEV_FW : 0));
 
     _fsCtrlImgInfo.sec_boot = fwQuery.sec_boot;
     _fsCtrlImgInfo.life_cycle = fwQuery.life_cycle;
     _fsCtrlImgInfo.encryption = fwQuery.encryption;
     std::vector<FwComponent> compsMap;
-    if (!_fwCompsAccess->getFwComponents(compsMap, false)) {
-        return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "Failed to get the FW Components MAP, err[%d]", _fwCompsAccess->getLastError());
+    if (!_fwCompsAccess->getFwComponents(compsMap, false))
+    {
+        return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()),
+                      "Failed to get the FW Components MAP, err[%d]", _fwCompsAccess->getLastError());
     }
-    for (std::vector<FwComponent>::iterator it = compsMap.begin(); it != compsMap.end(); it++) {
-        if (it->getStatus() == FwComponent::COMPSTAT_PRESENT || it->getStatus() == FwComponent::COMPSTAT_IN_USE) {
-            if (it->getType() == FwComponent::COMPID_CS_TOKEN) {
+    for (std::vector<FwComponent>::iterator it = compsMap.begin(); it != compsMap.end(); it++)
+    {
+        if (it->getStatus() == FwComponent::COMPSTAT_PRESENT || it->getStatus() == FwComponent::COMPSTAT_IN_USE)
+        {
+            if (it->getType() == FwComponent::COMPID_CS_TOKEN)
+            {
                 _fsCtrlImgInfo.security_mode |= SMM_CS_TOKEN;
             }
-            if (it->getType() == FwComponent::COMPID_DBG_TOKEN) {
+            if (it->getType() == FwComponent::COMPID_DBG_TOKEN)
+            {
                 _fsCtrlImgInfo.security_mode |= SMM_DBG_TOKEN;
             }
-            if (it->getType() == FwComponent::COMPID_CRYPTO_TO_COMMISSIONING) {
+            if (it->getType() == FwComponent::COMPID_CRYPTO_TO_COMMISSIONING)
+            {
                 _fsCtrlImgInfo.security_mode |= SMM_CRYTO_TO_COMMISSIONING;
             }
-            if (it->getType() == FwComponent::COMPID_RMCS_TOKEN) {
+            if (it->getType() == FwComponent::COMPID_RMCS_TOKEN)
+            {
                 _fsCtrlImgInfo.security_mode |= SMM_RMCS_TOKEN;
             }
-            if (it->getType() == FwComponent::COMPID_RMDT_TOKEN) {
+            if (it->getType() == FwComponent::COMPID_RMDT_TOKEN)
+            {
                 _fsCtrlImgInfo.security_mode |= SMM_RMDT_TOKEN;
             }
         }
@@ -235,40 +268,49 @@ bool FsCtrlOperations::FsIntQuery()
     memset(&mcam, 0, sizeof(mcam));
     mcam.access_reg_group = 2;
     rc = reg_access_mcam(mf, REG_ACCESS_METHOD_GET, &mcam);
-    if (rc == ME_OK){
-        mfsv_reg_supported = EXTRACT(mcam.mng_access_reg_cap_mask[13], 5, 1); // bit 21 
+    if (rc == ME_OK)
+    {
+        mfsv_reg_supported = EXTRACT(mcam.mng_access_reg_cap_mask[13], 5, 1); // bit 21
     }
-    DPRINTF(("mfsv_reg_supported = %d\n",mfsv_reg_supported));
+    DPRINTF(("mfsv_reg_supported = %d\n", mfsv_reg_supported));
 
-    if (_fsCtrlImgInfo.sec_boot == 1 && _fsCtrlImgInfo.life_cycle == GA_SECURED && mfsv_reg_supported == 1){
+    if (_fsCtrlImgInfo.sec_boot == 1 && _fsCtrlImgInfo.life_cycle == GA_SECURED && mfsv_reg_supported == 1)
+    {
         _fsCtrlImgInfo.device_security_version_access_method = MFSV;
-    } else {
+    }
+    else
+    {
         _fsCtrlImgInfo.device_security_version_access_method = NOT_VALID;
     }
 
-    // GET MFSV 
-    if (mfsv_reg_supported == 1){
+    // GET MFSV
+    if (mfsv_reg_supported == 1)
+    {
         struct reg_access_hca_mfsv_reg mfsv_reg;
         memset(&mfsv_reg, 0, sizeof(mfsv_reg));
         rc = reg_access_mfsv(mf, REG_ACCESS_METHOD_GET, &mfsv_reg);
-        if (rc == ME_OK){
+        if (rc == ME_OK)
+        {
             //// reg_access_hca_mfsv_reg_print(&mfsv_reg, stdout, 4);
-            memcpy(&(_fsCtrlImgInfo.device_security_version_mfsv),  &mfsv_reg,  sizeof(reg_access_hca_mfsv_reg)); 
+            memcpy(&(_fsCtrlImgInfo.device_security_version_mfsv), &mfsv_reg, sizeof(reg_access_hca_mfsv_reg));
         }
     }
 
     //* Read global image status
-    if (_fsCtrlImgInfo.sec_boot == true) {        
-        try {            
+    if (_fsCtrlImgInfo.sec_boot == true)
+    {
+        try
+        {
             CRSpaceRegisters cr_space_reg(mf, _fwImgInfo.ext_info.chip_type);
             _fsCtrlImgInfo.global_image_status = cr_space_reg.getGlobalImageStatus();
         }
-        catch(logic_error e) {
+        catch (logic_error e)
+        {
             printf("%s\n", e.what());
             return false;
-
         }
-        catch(exception e) {
+        catch (exception e)
+        {
             printf("%s\n", e.what());
             return false;
         }
@@ -280,18 +322,21 @@ bool FsCtrlOperations::FsIntQuery()
 
     _fwImgInfo.ext_info.roms_info.num_of_exp_rom = fwQuery.nRoms;
     _fwImgInfo.ext_info.roms_info.exp_rom_found = fwQuery.nRoms > 0;
-    for (int i = 0; i < fwQuery.nRoms; i++) {
+    for (int i = 0; i < fwQuery.nRoms; i++)
+    {
         _fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_product_id = fwQuery.roms[i].type;
         _fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_proto = 0xff; // NA
         _fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_supp_cpu_arch = fwQuery.roms[i].arch;
-        _fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_num_ver_fields = FwOperations::RomInfo::getNumVerFromProdId(_fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_product_id);
+        _fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_num_ver_fields =
+          FwOperations::RomInfo::getNumVerFromProdId(_fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_product_id);
         extractFwVersion(_fwImgInfo.ext_info.roms_info.rom_info[i].exp_rom_ver, fwQuery.roms[i].version);
     }
 
     strncpy(_fsCtrlImgInfo.name, fwQuery.name, NAME_LEN);
     strncpy(_fsCtrlImgInfo.description, fwQuery.description, DESCRIPTION_LEN);
     (strncpy(_fsCtrlImgInfo.deviceVsd, fwQuery.deviceVsd, VSD_LEN));
-    if (FwType() == FIT_FS3) {
+    if (FwType() == FIT_FS3)
+    {
         memcpy(_fwImgInfo.ext_info.vsd, fwQuery.deviceVsd, VSD_LEN);
     }
     (strncpy(_fsCtrlImgInfo.image_vsd, fwQuery.imageVsd, VSD_LEN));
@@ -300,16 +345,19 @@ bool FsCtrlOperations::FsIntQuery()
 
 void FsCtrlOperations::ExtractSwitchFWVersion(const fwInfoT& fwQuery)
 {
-    if (VerifyBranchFormat(fwQuery.imageVsd)) {
+    if (VerifyBranchFormat(fwQuery.imageVsd))
+    {
         strncpy(_fwImgInfo.ext_info.running_branch_ver, fwQuery.imageVsd, BRANCH_LEN);
     }
     if (fwQuery.running_fw_version.version_string_length &&
-        fwQuery.running_fw_version.version_string_length <= BRANCH_LEN) {
+        fwQuery.running_fw_version.version_string_length <= BRANCH_LEN)
+    {
         extractFwVersion(_fwImgInfo.ext_info.fw_ver, (const char*)fwQuery.running_fw_version.version_string);
         extractFwVersion(_fwImgInfo.ext_info.running_fw_ver, (const char*)fwQuery.running_fw_version.version_string);
     }
     if (fwQuery.pending_fw_version.version_string_length &&
-        fwQuery.pending_fw_version.version_string_length <= BRANCH_LEN) {
+        fwQuery.pending_fw_version.version_string_length <= BRANCH_LEN)
+    {
         extractFwVersion(_fwImgInfo.ext_info.fw_ver, (const char*)fwQuery.pending_fw_version.version_string);
     }
 
@@ -317,7 +365,8 @@ void FsCtrlOperations::ExtractSwitchFWVersion(const fwInfoT& fwQuery)
     // it will evaluate to "true" (this happens in FwVersion class)
     if ((_fwImgInfo.ext_info.fw_ver[0] == _fwImgInfo.ext_info.running_fw_ver[0]) &&
         (_fwImgInfo.ext_info.fw_ver[1] == _fwImgInfo.ext_info.running_fw_ver[1]) &&
-        (_fwImgInfo.ext_info.fw_ver[2] == _fwImgInfo.ext_info.running_fw_ver[2])) {
+        (_fwImgInfo.ext_info.fw_ver[2] == _fwImgInfo.ext_info.running_fw_ver[2]))
+    {
         strncpy(_fwImgInfo.ext_info.branch_ver, fwQuery.imageVsd, BRANCH_LEN);
         _fwImgInfo.ext_info.branch_ver[BRANCH_LEN - 1] = '\0';
     }
@@ -325,45 +374,52 @@ void FsCtrlOperations::ExtractSwitchFWVersion(const fwInfoT& fwQuery)
 
 bool FsCtrlOperations::FwReactivateImage()
 {
-    if (!_fwCompsAccess->fwReactivateImage()) {
+    if (!_fwCompsAccess->fwReactivateImage())
+    {
         fw_comps_error_t errCode = _fwCompsAccess->getLastError();
-        switch (errCode) {
-        case FWCOMPS_IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR, "Prohibited by current FW version");
-        case FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_COPY_FAILED:
-            return errmsg(MLXFW_IMAGE_RACTIVATION_FIRST_PAGE_COPY_FAILED, "First page copy failed");
-        case FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED, "First page erase failed");
-        case FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED, "First page restore failed");
-        case FWCOMPS_IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED, "FW deactivation failed");
-        case FWCOMPS_IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED, "FW already reactivated");
-        case FWCOMPS_IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED, "FW reset required");
-        case FWCOMPS_IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED, "FW programming needed");
-        case FWCOMPS_GENERAL_ERR:
-            return errmsg(MLXFW_ERR, "FW ICMD related error");
-        case FWCOMPS_IMAGE_REACTIVATION_WAITING_TIME_EXPIRED:
-            return errmsg(MLXFW_ERR, "Image reactivation - timeout expired");
-        case FWCOMPS_IMAGE_REACTIVATION_FW_NOT_SUPPORTED:
-            return errmsg(MLXFW_ERR, "Image reactivation - FW doesn't support this operation");
-        default:
-            return errmsg(MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR, "Unknown error occurred");
+        switch (errCode)
+        {
+            case FWCOMPS_IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_PROHIBITED_FW_VER_ERR, "Prohibited by current FW version");
+            case FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_COPY_FAILED:
+                return errmsg(MLXFW_IMAGE_RACTIVATION_FIRST_PAGE_COPY_FAILED, "First page copy failed");
+            case FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_FIRST_PAGE_ERASE_FAILED, "First page erase failed");
+            case FWCOMPS_IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_FIRST_PAGE_RESTORE_FAILED, "First page restore failed");
+            case FWCOMPS_IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_FW_DEACTIVATION_FAILED, "FW deactivation failed");
+            case FWCOMPS_IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_FW_ALREADY_ACTIVATED, "FW already reactivated");
+            case FWCOMPS_IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_ERROR_DEVICE_RESET_REQUIRED, "FW reset required");
+            case FWCOMPS_IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_FW_PROGRAMMING_NEEDED, "FW programming needed");
+            case FWCOMPS_GENERAL_ERR:
+                return errmsg(MLXFW_ERR, "FW ICMD related error");
+            case FWCOMPS_IMAGE_REACTIVATION_WAITING_TIME_EXPIRED:
+                return errmsg(MLXFW_ERR, "Image reactivation - timeout expired");
+            case FWCOMPS_IMAGE_REACTIVATION_FW_NOT_SUPPORTED:
+                return errmsg(MLXFW_ERR, "Image reactivation - FW doesn't support this operation");
+            default:
+                return errmsg(MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR, "Unknown error occurred");
         }
     }
     return true;
 }
 
-bool FsCtrlOperations::FwQuery(fw_info_t *fwInfo, bool readRom, bool isStripedImage, bool quickQuery, bool ignoreDToc, bool verbose)
+bool FsCtrlOperations::FwQuery(fw_info_t* fwInfo,
+                               bool readRom,
+                               bool isStripedImage,
+                               bool quickQuery,
+                               bool ignoreDToc,
+                               bool verbose)
 {
-    (void) isStripedImage;
-    (void) readRom;
-    (void) quickQuery;
-    (void) ignoreDToc;
-    (void) verbose;
+    (void)isStripedImage;
+    (void)readRom;
+    (void)quickQuery;
+    (void)ignoreDToc;
+    (void)verbose;
     memcpy(&(fwInfo->fw_info), &(_fwImgInfo.ext_info), sizeof(fw_info_com_t));
     memcpy(&(fwInfo->fs3_info), &(_fsCtrlImgInfo), sizeof(fs3_info_t));
     fwInfo->fs3_info.fs3_uids_info.valid_field = 1;
@@ -381,25 +437,29 @@ bool FsCtrlOperations::FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripe
     return FwVerifyAdv(extVerParams);
 }
 
-bool FsCtrlOperations::FwVerifyAdv(ExtVerifyParams &verifyParams)
+bool FsCtrlOperations::FwVerifyAdv(ExtVerifyParams& verifyParams)
 {
     bool ret = true;
-    FwOperations *imageOps = NULL;
+    FwOperations* imageOps = NULL;
     if (!_createImageOps(&imageOps))
     {
         return errmsg("%s", err());
     }
 
     bool image_encrypted = false;
-    if (!imageOps->isEncrypted(image_encrypted)) {
+    if (!imageOps->isEncrypted(image_encrypted))
+    {
         errmsg(imageOps->getErrorCode(), "%s", imageOps->err());
         ret = false;
     }
-    else if (image_encrypted) {
+    else if (image_encrypted)
+    {
         errmsg("Cannot verify an encrypted flash");
         ret = false;
     }
-    else if (!imageOps->FwVerify(verifyParams.verifyCallBackFunc, verifyParams.isStripedImage, verifyParams.showItoc, true)) {
+    else if (!imageOps->FwVerify(verifyParams.verifyCallBackFunc, verifyParams.isStripedImage, verifyParams.showItoc,
+                                 true))
+    {
         errmsg(imageOps->getErrorCode(), "%s", imageOps->err());
         ret = false;
     }
@@ -408,68 +468,83 @@ bool FsCtrlOperations::FwVerifyAdv(ExtVerifyParams &verifyParams)
     return ret;
 }
 
-bool FsCtrlOperations::FwReadData(void *image, u_int32_t *image_size, bool verbose)
+bool FsCtrlOperations::FwReadData(void* image, u_int32_t* image_size, bool verbose)
 {
-    (void) image;
-    (void) image_size;
-    (void) verbose;
+    (void)image;
+    (void)image_size;
+    (void)verbose;
     return errmsg("Read image is not supported");
 }
 
-bool FsCtrlOperations::ReadBootImage(void *image, u_int32_t *image_size, ProgressCallBackAdvSt *stProgressFunc)
+bool FsCtrlOperations::ReadBootImage(void* image, u_int32_t* image_size, ProgressCallBackAdvSt* stProgressFunc)
 {
-    if (image) {
+    if (image)
+    {
         FwComponent bootImgComp;
-        if (!_fwCompsAccess->readComponent(FwComponent::COMPID_BOOT_IMG, bootImgComp, true, (ProgressCallBackAdvSt*) stProgressFunc)) {
-            if (!_fwCompsAccess->readComponent(FwComponent::COMPID_BOOT_IMG, bootImgComp, false, (ProgressCallBackAdvSt*) stProgressFunc)) {
-                return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "Failed to read boot image, %s - RC[%d]", _fwCompsAccess->getLastErrMsg(), (int) _fwCompsAccess->getLastError());
+        if (!_fwCompsAccess->readComponent(FwComponent::COMPID_BOOT_IMG, bootImgComp, true,
+                                           (ProgressCallBackAdvSt*)stProgressFunc))
+        {
+            if (!_fwCompsAccess->readComponent(FwComponent::COMPID_BOOT_IMG, bootImgComp, false,
+                                               (ProgressCallBackAdvSt*)stProgressFunc))
+            {
+                return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()),
+                              "Failed to read boot image, %s - RC[%d]", _fwCompsAccess->getLastErrMsg(),
+                              (int)_fwCompsAccess->getLastError());
             }
         }
         *image_size = bootImgComp.getSize();
         memcpy(image, bootImgComp.getData().data(), *image_size);
         return true;
-    } else {
+    }
+    else
+    {
         std::vector<FwComponent> compsMap;
-        if (!_fwCompsAccess->getFwComponents(compsMap, false)) {
-            return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "Failed to get the FW Components MAP, err[%d]", _fwCompsAccess->getLastError());
+        if (!_fwCompsAccess->getFwComponents(compsMap, false))
+        {
+            return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()),
+                          "Failed to get the FW Components MAP, err[%d]", _fwCompsAccess->getLastError());
         }
-        for (std::vector<FwComponent>::iterator it = compsMap.begin(); it != compsMap.end(); it++) {
-            if (it->getType() == FwComponent::COMPID_BOOT_IMG) {
+        for (std::vector<FwComponent>::iterator it = compsMap.begin(); it != compsMap.end(); it++)
+        {
+            if (it->getType() == FwComponent::COMPID_BOOT_IMG)
+            {
                 *image_size = it->getSize();
                 return true;
             }
         }
         return errmsg("Failed to get the Boot image");
-
     }
 }
 
-bool FsCtrlOperations::FwReadRom(std::vector<u_int8_t> &romSect)
+bool FsCtrlOperations::FwReadRom(std::vector<u_int8_t>& romSect)
 {
-    (void) romSect;
+    (void)romSect;
     return unsupportedOperation();
 }
 
-bool FsCtrlOperations::FwBurnRom(FImage *romImg, bool ignoreProdIdCheck, bool ignoreDevidCheck,
+bool FsCtrlOperations::FwBurnRom(FImage* romImg,
+                                 bool ignoreProdIdCheck,
+                                 bool ignoreDevidCheck,
                                  ProgressCallBack progressFunc)
 {
-    (void) romImg;
-    (void) ignoreDevidCheck;
-    (void) ignoreProdIdCheck;
-    (void) progressFunc;
+    (void)romImg;
+    (void)ignoreDevidCheck;
+    (void)ignoreProdIdCheck;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
 bool FsCtrlOperations::FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc)
 {
-    (void) ignoreProdIdCheck;
-    (void) progressFunc;
+    (void)ignoreProdIdCheck;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
-bool FsCtrlOperations::FwBurn(FwOperations *imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
+bool FsCtrlOperations::FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurnAdvanced\n");
     }
     ExtBurnParams params = ExtBurnParams();
@@ -478,34 +553,51 @@ bool FsCtrlOperations::FwBurn(FwOperations *imageOps, u_int8_t forceVersion, Pro
     return FwBurnAdvanced(imageOps, params);
 }
 
-bool FsCtrlOperations::BadParamErrMsg(const char *unSupportedOperation, bool isSecure)
+bool FsCtrlOperations::BadParamErrMsg(const char* unSupportedOperation, bool isSecure)
 {
-    const char *noCtrlFwReccomendation = "";
-    const char *fwType = "Secure";
-    if (!isSecure) {
+    const char* noCtrlFwReccomendation = "";
+    const char* fwType = "Secure";
+    if (!isSecure)
+    {
         noCtrlFwReccomendation = " You can try to run again with the flag \"--no_fw_ctrl\".";
         fwType = "controlled";
     }
-    return errmsg(MLXFW_UNSUPPORTED_PARAM, "%s is unsupported under %s FW.%s", unSupportedOperation, fwType, noCtrlFwReccomendation);
+    return errmsg(MLXFW_UNSUPPORTED_PARAM, "%s is unsupported under %s FW.%s", unSupportedOperation, fwType,
+                  noCtrlFwReccomendation);
 }
 
-bool FsCtrlOperations::VerifyAllowedParams(ExtBurnParams &burnParams, bool isSecure)
+bool FsCtrlOperations::VerifyAllowedParams(ExtBurnParams& burnParams, bool isSecure)
 {
-    if (burnParams.vsdSpecified) {
+    if (burnParams.vsdSpecified)
+    {
         return BadParamErrMsg("Specifying vsd", isSecure);
-    } else if (!burnParams.burnFailsafe) {
+    }
+    else if (!burnParams.burnFailsafe)
+    {
         return BadParamErrMsg("Burning in non-failsafe mode", isSecure);
-    } else if (burnParams.allowPsidChange) {
+    }
+    else if (burnParams.allowPsidChange)
+    {
         return BadParamErrMsg("Changing PSID", isSecure);
-    } else if (burnParams.useImagePs) {
+    }
+    else if (burnParams.useImagePs)
+    {
         return BadParamErrMsg("Burning vsd as appears in the given image", isSecure);
-    } else if (burnParams.noDevidCheck) {
+    }
+    else if (burnParams.noDevidCheck)
+    {
         return BadParamErrMsg("Not checking device id", isSecure);
-    } else if (burnParams.useImgDevData) {
+    }
+    else if (burnParams.useImgDevData)
+    {
         return BadParamErrMsg("Using image device data", isSecure);
-    } else if (burnParams.useDevImgInfo) {
+    }
+    else if (burnParams.useDevImgInfo)
+    {
         return BadParamErrMsg("Using device image info", isSecure);
-    } else if (burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST) {
+    }
+    else if (burnParams.burnRomOptions == ExtBurnParams::BRO_FROM_DEV_IF_EXIST)
+    {
         return BadParamErrMsg("Burning ROM from device", isSecure);
     }
     return true;
@@ -514,12 +606,14 @@ bool FsCtrlOperations::VerifyAllowedParams(ExtBurnParams &burnParams, bool isSec
 bool FsCtrlOperations::_createImageOps(FwOperations** imageOps)
 {
     u_int32_t imageSize = 0;
-    if (!ReadBootImage(NULL, &imageSize)) {
+    if (!ReadBootImage(NULL, &imageSize))
+    {
         return errmsg("Failed to get boot image size");
     }
     std::vector<u_int8_t> imageData;
     imageData.resize(imageSize);
-    if (!ReadBootImage((void*)imageData.data(), &imageSize)) {
+    if (!ReadBootImage((void*)imageData.data(), &imageSize))
+    {
         return errmsg("Failed to read boot image");
     }
     fw_ops_params_t imageParams;
@@ -529,7 +623,8 @@ bool FsCtrlOperations::_createImageOps(FwOperations** imageOps)
     imageParams.hndlType = FHT_FW_BUFF;
     imageParams.ignoreCrcCheck = _fwParams.ignoreCrcCheck;
     *imageOps = FwOperations::FwOperationsCreate(imageParams);
-    if (!(*imageOps)) {
+    if (!(*imageOps))
+    {
         return errmsg("Failed to create image ops");
     }
     return true;
@@ -572,46 +667,60 @@ bool FsCtrlOperations::isEncrypted(bool& is_encrypted)
     return true;
 }
 
-bool FsCtrlOperations::FwBurnAdvanced(std::vector <u_int8_t> imageOps4MData, ExtBurnParams& burnParams, FwComponent::comps_ids_t ComponentId)
+bool FsCtrlOperations::FwBurnAdvanced(std::vector<u_int8_t> imageOps4MData,
+                                      ExtBurnParams& burnParams,
+                                      FwComponent::comps_ids_t ComponentId)
 {
     return _Burn(imageOps4MData, burnParams, ComponentId);
 }
 
-bool FsCtrlOperations::FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams &burnParams)
+bool FsCtrlOperations::FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams)
 {
-    if (imageOps == NULL) {
+    if (imageOps == NULL)
+    {
         return errmsg("bad parameter is given to FwBurnAdvanced\n");
     }
-    if (!FsIntQuery()) {
+    if (!FsIntQuery())
+    {
         return false;
     }
     fw_info_t fw_query;
     memset(&fw_query, 0, sizeof(fw_info_t));
-    if (!imageOps->FwQuery(&fw_query, true)) {
+    if (!imageOps->FwQuery(&fw_query, true))
+    {
         return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "Failed to query the image\n");
     }
-    if (!VerifyAllowedParams(burnParams, fw_query.fs3_info.security_mode & SMM_SECURE_FW)) {
+    if (!VerifyAllowedParams(burnParams, fw_query.fs3_info.security_mode & SMM_SECURE_FW))
+    {
         return false;
     }
-    if (!CheckPSID(*imageOps, false)) {
-        if (burnParams.allowPsidChange) {
+    if (!CheckPSID(*imageOps, false))
+    {
+        if (burnParams.allowPsidChange)
+        {
             return errmsg(MLXFW_PSID_MISMATCH_ERR, "Changing PSID is not supported under controlled FW.");
         }
         return false;
     }
     // Check if the burnt FW version is OK
-    if (!CheckFwVersion(*imageOps, burnParams.ignoreVersionCheck)) {
+    if (!CheckFwVersion(*imageOps, burnParams.ignoreVersionCheck))
+    {
         return false;
     }
-    if (fw_query.fs3_info.security_mode == SM_NONE) {
-        return errmsg(MLXFW_MISSING_IMAGE_SIGNATURE, "This is an old image format that does not have a signature or does not support FW control commands.\n-E- please retry with --no_fw_ctrl flag\n");
+    if (fw_query.fs3_info.security_mode == SM_NONE)
+    {
+        return errmsg(
+          MLXFW_MISSING_IMAGE_SIGNATURE,
+          "This is an old image format that does not have a signature or does not support FW control commands.\n-E- please retry with --no_fw_ctrl flag\n");
     }
     // Check TimeStamp
-    if (!TestAndSetTimeStamp(imageOps)) {
+    if (!TestAndSetTimeStamp(imageOps))
+    {
         return false;
     }
-    std::vector <u_int8_t> imageOps4MData;
-    if (!imageOps->FwExtract4MBImage(imageOps4MData, true)) {
+    std::vector<u_int8_t> imageOps4MData;
+    if (!imageOps->FwExtract4MBImage(imageOps4MData, true))
+    {
         return errmsg(imageOps->getErrorCode(), "Failed to Extract 4MB from the image");
     }
     return _Burn(imageOps4MData, burnParams);
@@ -622,29 +731,35 @@ bool FsCtrlOperations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams&
     return FwBurnAdvanced(imageOps, burnParams);
 }
 
-bool FsCtrlOperations::_Burn(std::vector <u_int8_t> imageOps4MData, ExtBurnParams& burnParams, FwComponent::comps_ids_t ComponentId)
+bool FsCtrlOperations::_Burn(std::vector<u_int8_t> imageOps4MData,
+                             ExtBurnParams& burnParams,
+                             FwComponent::comps_ids_t ComponentId)
 {
 #ifdef UEFI_BUILD
     burnParams.ProgressFuncAdv.uefi_func = burnParams.progressFunc;
 #else
-    burnParams.progressFunc = (ProgressCallBack) NULL;
+    burnParams.progressFunc = (ProgressCallBack)NULL;
 #endif
     FwComponent bootImageComponent;
     std::vector<FwComponent> compsToBurn;
 
     bootImageComponent.init(imageOps4MData, imageOps4MData.size(), ComponentId);
     compsToBurn.push_back(bootImageComponent);
-    if (!_fwCompsAccess->lock_flash_semaphore()) {
+    if (!_fwCompsAccess->lock_flash_semaphore())
+    {
         return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "%s", _fwCompsAccess->getLastErrMsg());
     }
-    if (_fwCompsAccess->isMCDDSupported()) {
+    if (_fwCompsAccess->isMCDDSupported())
+    {
         // Checking if BME is disabled to print indication to user
         bool isBmeSet = DMAComponentAccess::isBMESet(_fwCompsAccess->getMfileObj());
-        if (!isBmeSet) {
+        if (!isBmeSet)
+        {
             DPRINTF(("-W- DMA burning is not supported due to BME is unset (Bus primary Enable).\n"));
         }
     }
-    if (!_fwCompsAccess->burnComponents(compsToBurn, &burnParams.ProgressFuncAdv)) {
+    if (!_fwCompsAccess->burnComponents(compsToBurn, &burnParams.ProgressFuncAdv))
+    {
         _fwCompsAccess->unlock_flash_semaphore();
         return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "%s", _fwCompsAccess->getLastErrMsg());
     }
@@ -652,71 +767,88 @@ bool FsCtrlOperations::_Burn(std::vector <u_int8_t> imageOps4MData, ExtBurnParam
     return true;
 }
 
-
-bool FsCtrlOperations::FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc)
+bool FsCtrlOperations::FwBurnBlock(FwOperations* imageOps, ProgressCallBack progressFunc)
 {
-    (void) imageOps;
-    (void) progressFunc;
+    (void)imageOps;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
 bool FsCtrlOperations::FwWriteBlock(u_int32_t addr, std::vector<u_int8_t> dataVec, ProgressCallBack progressFunc)
 {
-    (void) addr;
-    (void) dataVec;
-    (void) progressFunc;
+    (void)addr;
+    (void)dataVec;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
-bool FsCtrlOperations::FwSetGuids(sg_params_t &sgParam, PrintCallBack callBackFunc, ProgressCallBack progressFunc)
+bool FsCtrlOperations::FwSetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc, ProgressCallBack progressFunc)
 {
-    (void) callBackFunc;
-    (void) progressFunc;
+    (void)callBackFunc;
+    (void)progressFunc;
     mac_guid_t macGuid;
 
     memset(&macGuid, 0, sizeof(macGuid));
 
-    if (sgParam.userGuids.empty()) {
+    if (sgParam.userGuids.empty())
+    {
         return errmsg("Base GUID not found.");
     }
-    if (!sgParam.guidsSpecified && !sgParam.macsSpecified && !sgParam.uidSpecified) {
+    if (!sgParam.guidsSpecified && !sgParam.macsSpecified && !sgParam.uidSpecified)
+    {
         return errmsg("base GUID/MAC were not specified.");
     }
-    if (!sgParam.updateCrc || sgParam.numOfGUIDs != 0 || sgParam.stepSize != 0 || sgParam.numOfGUIDsPP[0] != 0xff || sgParam.numOfGUIDsPP[1] != 0xff || sgParam.stepSizePP[0] != 0xff || sgParam.stepSizePP[1] != 0xff) {
+    if (!sgParam.updateCrc || sgParam.numOfGUIDs != 0 || sgParam.stepSize != 0 || sgParam.numOfGUIDsPP[0] != 0xff ||
+        sgParam.numOfGUIDsPP[1] != 0xff || sgParam.stepSizePP[0] != 0xff || sgParam.stepSizePP[1] != 0xff)
+    {
         return errmsg("Tried to set unsupported values. Allowed values to set are mac,guid,uid.");
     }
 
-    if (sgParam.uidSpecified) {
+    if (sgParam.uidSpecified)
+    {
         macGuid.guid = sgParam.userGuids[0];
-        u_int64_t baseMac = (((u_int64_t) macGuid.guid.l & 0xffffff) | (((u_int64_t) macGuid.guid.h & 0xffffff00) << 16));
+        u_int64_t baseMac = (((u_int64_t)macGuid.guid.l & 0xffffff) | (((u_int64_t)macGuid.guid.h & 0xffffff00) << 16));
         macGuid.mac.h = baseMac >> 32;
         macGuid.mac.l = baseMac & 0x00000000ffffffff;
-    } else {
+    }
+    else
+    {
         fwInfoT fwQuery;
-        if (!_fwCompsAccess->queryFwInfo(&fwQuery)) {
+        if (!_fwCompsAccess->queryFwInfo(&fwQuery))
+        {
             return false;
         }
-        if (sgParam.macsSpecified) {
-            if (sgParam.userGuids.size() < 2) {
+        if (sgParam.macsSpecified)
+        {
+            if (sgParam.userGuids.size() < 2)
+            {
                 return errmsg("MAC was not found.");
             }
             // check base mac
-            if (!CheckMac(sgParam.userGuids[1])) {
-                return errmsg("Bad MAC (" MAC_FORMAT ") given: %s. Please specify a valid MAC value", sgParam.userGuids[1].h, sgParam.userGuids[1].l, err());
+            if (!CheckMac(sgParam.userGuids[1]))
+            {
+                return errmsg("Bad MAC (" MAC_FORMAT ") given: %s. Please specify a valid MAC value",
+                              sgParam.userGuids[1].h, sgParam.userGuids[1].l, err());
             }
             macGuid.mac = sgParam.userGuids[1];
-        } else {
+        }
+        else
+        {
             macGuid.mac.h = fwQuery.base_mac.uid >> 32;
             macGuid.mac.l = fwQuery.base_mac.uid & 0x00000000ffffffff;
         }
-        if (sgParam.guidsSpecified) {
+        if (sgParam.guidsSpecified)
+        {
             macGuid.guid = sgParam.userGuids[0];
-        } else {
+        }
+        else
+        {
             macGuid.guid.h = fwQuery.base_guid.uid >> 32;
             macGuid.guid.l = fwQuery.base_guid.uid & 0x00000000ffffffff;
         }
     }
-    if (!_fwCompsAccess->setMacsGuids(macGuid)) {
+    if (!_fwCompsAccess->setMacsGuids(macGuid))
+    {
         return errmsg(FwCompsErrToFwOpsErr(_fwCompsAccess->getLastError()), "%s", _fwCompsAccess->getLastErrMsg());
     }
     return true;
@@ -724,46 +856,46 @@ bool FsCtrlOperations::FwSetGuids(sg_params_t &sgParam, PrintCallBack callBackFu
 
 bool FsCtrlOperations::FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc)
 {
-    (void) baseGuid;
-    (void) callBackFunc;
+    (void)baseGuid;
+    (void)callBackFunc;
     return unsupportedOperation();
 }
 
 bool FsCtrlOperations::FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc)
 {
-    (void) baseGuid;
-    (void) callBackFunc;
+    (void)baseGuid;
+    (void)callBackFunc;
     return unsupportedOperation();
 }
 
 // use progressFunc when dealing with FS2 image and printFunc when dealing with FS3 image.
-bool FsCtrlOperations::FwSetVSD(char *vsdStr, ProgressCallBack progressFunc, PrintCallBack printFunc)
+bool FsCtrlOperations::FwSetVSD(char* vsdStr, ProgressCallBack progressFunc, PrintCallBack printFunc)
 {
-    (void) vsdStr;
-    (void) printFunc;
-    (void) progressFunc;
+    (void)vsdStr;
+    (void)printFunc;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
-bool FsCtrlOperations::FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc)
+bool FsCtrlOperations::FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc)
 {
-    (void) vpdFileStr;
-    (void) callBackFunc;
+    (void)vpdFileStr;
+    (void)callBackFunc;
     return unsupportedOperation();
 }
 
 bool FsCtrlOperations::FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc)
 {
-    (void) userKey;
-    (void) progressFunc;
+    (void)userKey;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
-bool FsCtrlOperations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t> &sectInfo, bool stripedImage)
+bool FsCtrlOperations::FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage)
 {
-    (void) sectInfo;
-    (void) sectType;
-    (void) stripedImage;
+    (void)sectInfo;
+    (void)sectType;
+    (void)stripedImage;
     return unsupportedOperation();
 }
 
@@ -774,7 +906,7 @@ bool FsCtrlOperations::FwResetNvData()
 
 bool FsCtrlOperations::FwShiftDevData(PrintCallBack progressFunc)
 {
-    (void) progressFunc;
+    (void)progressFunc;
     return unsupportedOperation();
 }
 
@@ -789,26 +921,32 @@ const char* FsCtrlOperations::FwGetResetRecommandationStr()
 
 bool FsCtrlOperations::FwCalcMD5(u_int8_t md5sum[16])
 {
-    (void) md5sum;
+    (void)md5sum;
     return unsupportedOperation();
 }
 
 FsCtrlOperations::~FsCtrlOperations()
 {
-    if (_fwCompsAccess) {
+    if (_fwCompsAccess)
+    {
         delete _fwCompsAccess;
         _fwCompsAccess = (FwCompsMgr*)NULL;
     }
 }
 
-bool FsCtrlOperations::FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int8_t> &dataVec)
+bool FsCtrlOperations::FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int8_t>& dataVec)
 {
     DPRINTF(("Read from flash using MCC"));
-    if (!_fwCompsAccess->readBlockFromComponent(FwComponent::COMPID_BOOT_IMG, addr, size, dataVec)) {
+    if (!_fwCompsAccess->readBlockFromComponent(FwComponent::COMPID_BOOT_IMG, addr, size, dataVec))
+    {
         fw_comps_error_t errCode = _fwCompsAccess->getLastError();
-        if (errCode == FWCOMPS_READ_OUTSIDE_IMAGE_RANGE) {
-            return errmsg(MLXFW_BAD_PARAM_ERR, "Reading %#x bytes from address %#x is out of flash limits\n", size, (unsigned int) addr);
-        } else {
+        if (errCode == FWCOMPS_READ_OUTSIDE_IMAGE_RANGE)
+        {
+            return errmsg(MLXFW_BAD_PARAM_ERR, "Reading %#x bytes from address %#x is out of flash limits\n", size,
+                          (unsigned int)addr);
+        }
+        else
+        {
             return errmsg(MLXFW_FLASH_READ_ERR, "%s", _fwCompsAccess->getLastErrMsg());
         }
     }
@@ -818,90 +956,91 @@ bool FsCtrlOperations::FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u
 int FsCtrlOperations::FwCompsErrToFwOpsErr(fw_comps_error_t err)
 {
     int fwOpsErr = MLXFW_OK;
-    switch (err) {
-    case FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR:
-        fwOpsErr = MLXFW_BURN_REJECTED_DIGEST_ERR;
-        break;
-
-    case FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE:
-        fwOpsErr = MLXFW_BURN_REJECTED_NOT_APPLICABLE;
-        break;
-
-    case FWCOMPS_MCC_ERR_REJECTED_UNKNOWN_KEY:
-        fwOpsErr = MLXFW_BURN_REJECTED_UNKNOWN_KEY;
-        break;
-
-    case FWCOMPS_MCC_ERR_REJECTED_AUTH_FAILED:
-        fwOpsErr = MLXFW_BURN_REJECTED_AUTH_FAILED;
-        break;
-
-    case FWCOMPS_MCC_ERR_REJECTED_UNSIGNED:
-        fwOpsErr = MLXFW_BURN_REJECTED_UNSIGNED;
-        break;
-
-    case FWCOMPS_MCC_ERR_REJECTED_KEY_NOT_APPLICABLE:
-        fwOpsErr = MLXFW_BURN_REJECTED_KEY_NOT_APPLICABLE;
-        break;
-
-    case FWCOMPS_MCC_ERR_REJECTED_BAD_FORMAT:
-        fwOpsErr = MLXFW_BURN_REJECTED_BAD_FORMAT;
-        break;
-
-    case FWCOMPS_MCC_ERR_BLOCKED_PENDING_RESET:
-        fwOpsErr = MLXFW_BURN_BLOCKED_PENDING_RESET;
-        break;
-
-    case FWCOMPS_MCC_UNEXPECTED_STATE:
-        fwOpsErr = MLXFW_FSM_UNEXPECTED_STATE;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_NOT_A_SECURED_FW:
-        fwOpsErr = MLXFW_REJECTED_NOT_A_SECURED_FW;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_MFG_BASE_MAC_NOT_LISTED:
-        fwOpsErr = MLXFW_REJECTED_MFG_BASE_MAC_NOT_LISTED;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_NO_DEBUG_TOKEN:
-        fwOpsErr = MLXFW_REJECTED_NO_DEBUG_TOKEN;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_VERSION_NUM_MISMATCH:
-        fwOpsErr = MLXFW_REJECTED_VERSION_NUM_MISMATCH;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_USER_TIMESTAMP_MISMATCH:
-        fwOpsErr = MLXFW_REJECTED_USER_TIMESTAMP_MISMATCH;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_FORBIDDEN_VERSION:
-        fwOpsErr = MLXFW_REJECTED_FORBIDDEN_VERSION;
-        break;
-
-    case FWCOMPS_MCC_FLASH_ERASE_ERROR:
-        fwOpsErr = MLXFW_FLASH_ERASE_ERROR;
-        break;
-
-    case FWCOMPS_MEM_ALLOC_FAILED:
-        fwOpsErr = MLXFW_MEM_ERR;
-        break;
-
-    case FWCOMPS_MCC_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION:
-        fwOpsErr = MLXFW_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION;
-        break;
-
-    default:
-        if (err != FWCOMPS_SUCCESS) {
-            fwOpsErr = MLXFW_ERR;
-        }
-        break;
+    switch (err)
+    {
+        case FWCOMPS_MCC_ERR_REJECTED_DIGEST_ERR:
+            fwOpsErr = MLXFW_BURN_REJECTED_DIGEST_ERR;
+            break;
+
+        case FWCOMPS_MCC_ERR_REJECTED_NOT_APPLICABLE:
+            fwOpsErr = MLXFW_BURN_REJECTED_NOT_APPLICABLE;
+            break;
+
+        case FWCOMPS_MCC_ERR_REJECTED_UNKNOWN_KEY:
+            fwOpsErr = MLXFW_BURN_REJECTED_UNKNOWN_KEY;
+            break;
+
+        case FWCOMPS_MCC_ERR_REJECTED_AUTH_FAILED:
+            fwOpsErr = MLXFW_BURN_REJECTED_AUTH_FAILED;
+            break;
+
+        case FWCOMPS_MCC_ERR_REJECTED_UNSIGNED:
+            fwOpsErr = MLXFW_BURN_REJECTED_UNSIGNED;
+            break;
+
+        case FWCOMPS_MCC_ERR_REJECTED_KEY_NOT_APPLICABLE:
+            fwOpsErr = MLXFW_BURN_REJECTED_KEY_NOT_APPLICABLE;
+            break;
+
+        case FWCOMPS_MCC_ERR_REJECTED_BAD_FORMAT:
+            fwOpsErr = MLXFW_BURN_REJECTED_BAD_FORMAT;
+            break;
+
+        case FWCOMPS_MCC_ERR_BLOCKED_PENDING_RESET:
+            fwOpsErr = MLXFW_BURN_BLOCKED_PENDING_RESET;
+            break;
+
+        case FWCOMPS_MCC_UNEXPECTED_STATE:
+            fwOpsErr = MLXFW_FSM_UNEXPECTED_STATE;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_NOT_A_SECURED_FW:
+            fwOpsErr = MLXFW_REJECTED_NOT_A_SECURED_FW;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_MFG_BASE_MAC_NOT_LISTED:
+            fwOpsErr = MLXFW_REJECTED_MFG_BASE_MAC_NOT_LISTED;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_NO_DEBUG_TOKEN:
+            fwOpsErr = MLXFW_REJECTED_NO_DEBUG_TOKEN;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_VERSION_NUM_MISMATCH:
+            fwOpsErr = MLXFW_REJECTED_VERSION_NUM_MISMATCH;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_USER_TIMESTAMP_MISMATCH:
+            fwOpsErr = MLXFW_REJECTED_USER_TIMESTAMP_MISMATCH;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_FORBIDDEN_VERSION:
+            fwOpsErr = MLXFW_REJECTED_FORBIDDEN_VERSION;
+            break;
+
+        case FWCOMPS_MCC_FLASH_ERASE_ERROR:
+            fwOpsErr = MLXFW_FLASH_ERASE_ERROR;
+            break;
+
+        case FWCOMPS_MEM_ALLOC_FAILED:
+            fwOpsErr = MLXFW_MEM_ERR;
+            break;
+
+        case FWCOMPS_MCC_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION:
+            fwOpsErr = MLXFW_REJECTED_IMAGE_CAN_NOT_BOOT_FROM_PARTITION;
+            break;
+
+        default:
+            if (err != FWCOMPS_SUCCESS)
+            {
+                fwOpsErr = MLXFW_ERR;
+            }
+            break;
     }
     return fwOpsErr;
 }
 
-
-Tlv_Status_t FsCtrlOperations::GetTsObj(TimeStampIFC **tsObj)
+Tlv_Status_t FsCtrlOperations::GetTsObj(TimeStampIFC** tsObj)
 {
     *tsObj = TimeStampIFC::getIFC(_fwCompsAccess->getMfileObj());
     return TS_OK;
@@ -909,15 +1048,17 @@ Tlv_Status_t FsCtrlOperations::GetTsObj(TimeStampIFC **tsObj)
 
 bool FsCtrlOperations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer)
 {
-    TimeStampIFC *tsObj;
+    TimeStampIFC* tsObj;
     Tlv_Status_t rc;
 
-    if (GetTsObj(&tsObj)) {
+    if (GetTsObj(&tsObj))
+    {
         return errmsg("Failed to set timestamp. %s", err());
     }
 
     rc = tsObj->setTimeStamp(timestamp, fwVer);
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", tsObj->err());
     }
     delete tsObj;
@@ -926,31 +1067,37 @@ bool FsCtrlOperations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, str
 
 bool FsCtrlOperations::FwResetTimeStamp()
 {
-    TimeStampIFC *tsObj;
+    TimeStampIFC* tsObj;
     Tlv_Status_t rc;
 
-    if (GetTsObj(&tsObj)) {
+    if (GetTsObj(&tsObj))
+    {
         return errmsg("Failed to reset timestamp. %s", err());
     }
     rc = tsObj->resetTimeStamp();
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", tsObj->err());
     }
     delete tsObj;
     return rc ? false : true;
 }
 
-bool FsCtrlOperations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning)
+bool FsCtrlOperations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                        struct tools_open_fw_version& fwVer,
+                                        bool queryRunning)
 {
-    TimeStampIFC *tsObj;
+    TimeStampIFC* tsObj;
     Tlv_Status_t rc;
 
-    if (GetTsObj(&tsObj)) {
+    if (GetTsObj(&tsObj))
+    {
         return errmsg("Failed to query timestamp. %s", err());
     }
 
     rc = tsObj->queryTimeStamp(timestamp, fwVer, queryRunning);
-    if (rc) {
+    if (rc)
+    {
         errmsg("%s", tsObj->err());
     }
     delete tsObj;
@@ -983,16 +1130,22 @@ bool FsCtrlOperations::IsSecurityVersionViolated(u_int32_t image_security_versio
     u_int32_t imageSecurityVersion = image_security_version;
     u_int32_t deviceEfuseSecurityVersion;
 
-    if (getenv("FLINT_IGNORE_SECURITY_VERSION_CHECK") != NULL) {
+    if (getenv("FLINT_IGNORE_SECURITY_VERSION_CHECK") != NULL)
+    {
         return false;
     }
-    
+
     // Set device security-version (from EFUSEs)
-    if (_fsCtrlImgInfo.device_security_version_access_method == MFSV) {
+    if (_fsCtrlImgInfo.device_security_version_access_method == MFSV)
+    {
         deviceEfuseSecurityVersion = _fsCtrlImgInfo.device_security_version_mfsv.efuses_sec_ver;
-    } else if (_fsCtrlImgInfo.device_security_version_access_method == DIRECT_ACCESS) { // matanel - this case is relevant to fsctrl?
+    }
+    else if (_fsCtrlImgInfo.device_security_version_access_method == DIRECT_ACCESS)
+    { // matanel - this case is relevant to fsctrl?
         deviceEfuseSecurityVersion = _fsCtrlImgInfo.device_security_version_gw;
-    } else {
+    }
+    else
+    {
         deviceEfuseSecurityVersion = 0;
     }
 
diff --git a/mlxfwops/lib/fsctrl_ops.h b/mlxfwops/lib/fsctrl_ops.h
index d4b35f62..d4f6f854 100644
--- a/mlxfwops/lib/fsctrl_ops.h
+++ b/mlxfwops/lib/fsctrl_ops.h
@@ -37,10 +37,10 @@
 #include "fw_comps_mgr/fw_comps_mgr_dma_access.h"
 #include "tools_layouts/image_layout_layouts.h"
 
-class FsCtrlOperations : public FwOperations {
+class FsCtrlOperations : public FwOperations
+{
 public:
-
-    FsCtrlOperations(FwCompsMgr *fwComps) :
+    FsCtrlOperations(FwCompsMgr* fwComps) :
         FwOperations((FBase*)NULL), _fwCompsAccess(fwComps), _isSecured(false), _hwDevId(0)
     {
         memset(&_fsCtrlImgInfo, 0, sizeof(_fsCtrlImgInfo));
@@ -50,85 +50,101 @@ class FsCtrlOperations : public FwOperations {
 
     virtual u_int8_t FwType();
 
-    virtual bool FwQuery(fw_info_t *fwInfo, bool readRom = true, bool isStripedImage = false, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false);
-    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage = false, bool showItoc = false,
+    virtual bool FwQuery(fw_info_t* fwInfo,
+                         bool readRom = true,
+                         bool isStripedImage = false,
+                         bool quickQuery = true,
+                         bool ignoreDToc = false,
+                         bool verbose = false);
+    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc,
+                          bool isStripedImage = false,
+                          bool showItoc = false,
                           bool ignoreDToc = false); // Add callback print
-    virtual bool FwVerifyAdv(ExtVerifyParams &verifyParams);
-    //on call of FwReadData with Null image we get image_size
-    virtual bool FwReadData(void *image, u_int32_t *image_sizes, bool verbose = false);
-    virtual bool FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int8_t> &dataVec);
+    virtual bool FwVerifyAdv(ExtVerifyParams& verifyParams);
+    // on call of FwReadData with Null image we get image_size
+    virtual bool FwReadData(void* image, u_int32_t* image_sizes, bool verbose = false);
+    virtual bool FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int8_t>& dataVec);
 
-    virtual bool FwReadRom(std::vector<u_int8_t> &romSect);
-    virtual bool FwBurnRom(FImage *romImg, bool ignoreProdIdCheck = false, bool ignoreDevidCheck = false,
-                           ProgressCallBack progressFunc = (ProgressCallBack) NULL); // can also read the rom from flint and give a vector of u_int8_t
-    virtual bool FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc = (ProgressCallBack) NULL);
+    virtual bool FwReadRom(std::vector<u_int8_t>& romSect);
+    virtual bool FwBurnRom(FImage* romImg,
+                           bool ignoreProdIdCheck = false,
+                           bool ignoreDevidCheck = false,
+                           ProgressCallBack progressFunc = (ProgressCallBack)NULL); // can also read the rom from flint
+                                                                                    // and give a vector of u_int8_t
+    virtual bool FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
 
-    virtual bool FwBurn(FwOperations *imageOps, u_int8_t forceVersion,
-                        ProgressCallBack progressFunc = (ProgressCallBack) NULL);
-    virtual bool FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams &burnParams);
-    virtual bool FwBurnAdvanced(std::vector <u_int8_t> imageOps4MData, ExtBurnParams& burnParams, FwComponent::comps_ids_t ComponentId = FwComponent::COMPID_BOOT_IMG);
-    virtual bool FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc); //Add: callback progress, question arr, callback question, configurations
-    bool FwWriteBlock(u_int32_t addr, std::vector<u_int8_t> dataVec,
-                      ProgressCallBack progressFunc = (ProgressCallBack) NULL);
+    virtual bool
+      FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    virtual bool FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams);
+    virtual bool FwBurnAdvanced(std::vector<u_int8_t> imageOps4MData,
+                                ExtBurnParams& burnParams,
+                                FwComponent::comps_ids_t ComponentId = FwComponent::COMPID_BOOT_IMG);
+    virtual bool FwBurnBlock(FwOperations* imageOps,
+                             ProgressCallBack progressFunc); // Add: callback progress, question arr, callback question,
+                                                             // configurations
+    bool FwWriteBlock(u_int32_t addr,
+                      std::vector<u_int8_t> dataVec,
+                      ProgressCallBack progressFunc = (ProgressCallBack)NULL);
 
-    virtual bool FwSetGuids(sg_params_t &sgParam, PrintCallBack callBackFunc = (PrintCallBack) NULL,
-                            ProgressCallBack progressFunc = (ProgressCallBack) NULL);
+    virtual bool FwSetGuids(sg_params_t& sgParam,
+                            PrintCallBack callBackFunc = (PrintCallBack)NULL,
+                            ProgressCallBack progressFunc = (ProgressCallBack)NULL);
 
-    virtual bool FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack) NULL);
-    virtual bool FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack) NULL);
+    virtual bool FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     // use progressFunc when dealing with FS2 image and printFunc when dealing with FS3 image.
-    virtual bool FwSetVSD(char *vsdStr, ProgressCallBack progressFunc = (ProgressCallBack) NULL,
-                          PrintCallBack printFunc = (PrintCallBack) NULL);
-    virtual bool FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack) NULL);
-    virtual bool FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc = (ProgressCallBack) NULL);
-    virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t> &sectInfo, bool stripedImage = false);
+    virtual bool FwSetVSD(char* vsdStr,
+                          ProgressCallBack progressFunc = (ProgressCallBack)NULL,
+                          PrintCallBack printFunc = (PrintCallBack)NULL);
+    virtual bool FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+    virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false);
     virtual bool FwResetNvData();
-    virtual bool FwShiftDevData(PrintCallBack progressFunc = (PrintCallBack) NULL);
+    virtual bool FwShiftDevData(PrintCallBack progressFunc = (PrintCallBack)NULL);
     virtual const char* FwGetResetRecommandationStr();
 
     virtual bool FwInit();
     virtual bool FwCalcMD5(u_int8_t md5sum[16]);
     virtual bool FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer);
-    virtual bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning = false);
+    virtual bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                  struct tools_open_fw_version& fwVer,
+                                  bool queryRunning = false);
     virtual bool FwResetTimeStamp();
     virtual u_int32_t GetHwDevId() { return _hwDevId; }
     bool FwReactivateImage();
-    Tlv_Status_t GetTsObj(TimeStampIFC **tsObj);
+    Tlv_Status_t GetTsObj(TimeStampIFC** tsObj);
     bool isEncrypted(bool& is_encrypted);
     bool getITOCAddr(u_int32_t& addr);
     bool CheckITOCSignature(u_int8_t* signature);
     bool burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& burnParams);
 
-    virtual bool IsFsCtrlOperations()
-    {
-        return true;
-    }
-    virtual mfile* getMfileObj() {
-        return _fwCompsAccess->getMfileObj();
-    }
+    virtual bool IsFsCtrlOperations() { return true; }
+    virtual mfile* getMfileObj() { return _fwCompsAccess->getMfileObj(); }
     virtual bool IsSecureBootSupported();
     virtual bool IsCableQuerySupported();
     virtual bool IsLifeCycleSupported();
     virtual bool IsEncryptionSupported();
     virtual bool IsSecurityVersionViolated(u_int32_t image_security_version);
-    
+
 protected:
     bool FsIntQuery();
-    bool GetImageInfo(u_int8_t *buff);
-    bool ReadBootImage(void *image, u_int32_t *image_size,
-                       ProgressCallBackAdvSt *stProgressFunc = (ProgressCallBackAdvSt*)NULL);
+    bool GetImageInfo(u_int8_t* buff);
+    bool ReadBootImage(void* image,
+                       u_int32_t* image_size,
+                       ProgressCallBackAdvSt* stProgressFunc = (ProgressCallBackAdvSt*)NULL);
 
     bool unsupportedOperation();
     int FwCompsErrToFwOpsErr(fw_comps_error_t err);
-    virtual bool VerifyAllowedParams(ExtBurnParams &burnParams, bool isSecure);
-    bool BadParamErrMsg(const char *unSupportedOperation, bool isSecure);
-    bool _Burn(std::vector <u_int8_t> imageOps4MData, ExtBurnParams& burnParams, FwComponent::comps_ids_t ComponentId = FwComponent::COMPID_BOOT_IMG);
+    virtual bool VerifyAllowedParams(ExtBurnParams& burnParams, bool isSecure);
+    bool BadParamErrMsg(const char* unSupportedOperation, bool isSecure);
+    bool _Burn(std::vector<u_int8_t> imageOps4MData,
+               ExtBurnParams& burnParams,
+               FwComponent::comps_ids_t ComponentId = FwComponent::COMPID_BOOT_IMG);
     bool _createImageOps(FwOperations** imgOps);
     void ExtractSwitchFWVersion(const fwInfoT& fwQuery);
-    
+
     fs3_info_t _fsCtrlImgInfo;
-    FwCompsMgr *_fwCompsAccess;
+    FwCompsMgr* _fwCompsAccess;
     bool _isSecured;
     u_int32_t _hwDevId;
 };
-
diff --git a/mlxfwops/lib/fuse_gw.cpp b/mlxfwops/lib/fuse_gw.cpp
old mode 100755
new mode 100644
index 2b0ff81a..cb4569cc
--- a/mlxfwops/lib/fuse_gw.cpp
+++ b/mlxfwops/lib/fuse_gw.cpp
@@ -35,8 +35,7 @@
 #include <bit_slice.h>
 #include "fuse_gw.h"
 
-FuseGW::FuseGW(mfile* mf): _mf(mf), _gw_address(0), _data_address(0), _data_bit_offset(0), _data_bit_len(0)
-{};
+FuseGW::FuseGW(mfile* mf) : _mf(mf), _gw_address(0), _data_address(0), _data_bit_offset(0), _data_bit_len(0){};
 
 void FuseGW::setGWAddress(u_int32_t address)
 {
@@ -61,14 +60,17 @@ void FuseGW::setFieldBitLen(size_t len)
 void FuseGW::getData(u_int32_t& data)
 {
     // Read from GW
-    try {
+    try
+    {
         lock();
         executeReadCommand();
         waitForResult();
         readResult(data);
         unlock();
-    } catch (const char* msg) {
-        unlock();   
+    }
+    catch (const char* msg)
+    {
+        unlock();
         throw msg;
     }
 }
@@ -77,7 +79,7 @@ void FuseGW::getData(u_int32_t& data)
 // Private methods
 // ---------------
 
-void FuseGW::lock() 
+void FuseGW::lock()
 {
     waitForGWLockState(_gw_address, 0);
 
@@ -85,20 +87,22 @@ void FuseGW::lock()
     waitForGWLockState(_gw_address + 4, 1);
 }
 
-void FuseGW::waitForGWLockState(u_int32_t address, u_int32_t requiredState) 
+void FuseGW::waitForGWLockState(u_int32_t address, u_int32_t requiredState)
 {
     const u_int32_t MAX_ITER_NUM = 100;
     const u_int32_t SLEEP_TIME = 10; // [msec]
-    u_int32_t iter_num = 0;    
+    u_int32_t iter_num = 0;
     u_int32_t currentState = getCurrentGWState(address);
 
-    while (currentState != requiredState) {
+    while (currentState != requiredState)
+    {
         msleep(SLEEP_TIME);
 
         currentState = getCurrentGWState(address);
 
-        iter_num++;        
-        if (iter_num > MAX_ITER_NUM) {
+        iter_num++;
+        if (iter_num > MAX_ITER_NUM)
+        {
             throw "failed to lock (timeout error)";
         }
     }
@@ -108,44 +112,50 @@ bool FuseGW::getCurrentGWState(u_int32_t address)
 {
     u_int32_t ctrl_reg = 0;
 
-    if (mread4(_mf, address, &ctrl_reg) != 4) {
+    if (mread4(_mf, address, &ctrl_reg) != 4)
+    {
         throw "failed to lock (read error)";
     }
-        
+
     return EXTRACT(ctrl_reg, CTRL_LOCK_BIT_OFFSET, 1);
 }
 
-void FuseGW::executeReadCommand() 
+void FuseGW::executeReadCommand()
 {
     int rc = mwrite4(_mf, _gw_address, CTRL_READ | CTRL_BUSY);
-    if (rc != 4) {
+    if (rc != 4)
+    {
         throw "failed to executeReadCommand (write error)";
     }
 }
 
-void FuseGW::waitForResult() 
+void FuseGW::waitForResult()
 {
     int iter_num = 0, MAX_ITER_NUM = 100;
     int const SLEEP_TIME = 10; // [msec]
 
     bool busy;
-    do {
+    do
+    {
         int rc = 0;
         u_int32_t ctrl_reg = 0;
 
-        if (iter_num != 0) {
+        if (iter_num != 0)
+        {
             msleep(SLEEP_TIME);
         }
         rc = mread4(_mf, _gw_address, &ctrl_reg);
-        
-        if (rc != 4) {
+
+        if (rc != 4)
+        {
             throw "failed to waitForResult (read error)";
         }
 
         busy = (ctrl_reg & CTRL_BUSY) != 0;
         iter_num++;
-        
-        if (iter_num > MAX_ITER_NUM) {
+
+        if (iter_num > MAX_ITER_NUM)
+        {
             throw "failed to waitForResult (timeout error)";
         }
     } while (busy);
@@ -154,44 +164,45 @@ void FuseGW::waitForResult()
 void FuseGW::readResult(u_int32_t& result)
 {
     int rc = mread4(_mf, _data_address, &result);
-    if (rc !=  4) 
+    if (rc != 4)
     {
         throw "failed to readResult (read error)";
     }
 
-    TOCPU(&result);    
+    TOCPU(&result);
     result = EXTRACT(result, _data_bit_offset, _data_bit_len);
 }
 
-void FuseGW::unlock(){
+void FuseGW::unlock()
+{
     int rc = mwrite4(_mf, _gw_address, 0);
-    if (rc != 4) {
+    if (rc != 4)
+    {
         throw "failed to unlock (write error)";
     }
 }
 
-
 /********************************************************************************/
 /*                                                                              */
 /*                        SecureBootFuse Class                                  */
 /*                                                                              */
 /********************************************************************************/
 
-SecureBootFuse::SecureBootFuse(mfile* mf, chip_type_t chip_type):
+SecureBootFuse::SecureBootFuse(mfile* mf, chip_type_t chip_type) :
     _gw(mf), _chip_type(chip_type), _is_supported_in_live_fish(false)
 {
     switch (chip_type)
     {
         case CT_CONNECTX7:
-            _gw.setGWAddress(0xE4C00);      // irisc.ir_fuse_gw
-            _gw.setDataAddress(0xE4E7C);    // irisc.ir_fuse_gw.desc0.secure_boot
+            _gw.setGWAddress(0xE4C00);   // irisc.ir_fuse_gw
+            _gw.setDataAddress(0xE4E7C); // irisc.ir_fuse_gw.desc0.secure_boot
             _gw.setFieldBitOffset(28);
             _gw.setFieldBitLen(1);
             _is_supported_in_live_fish = true;
             break;
         case CT_QUANTUM2:
-            _gw.setGWAddress(0xa2800);      // mng.irisc.ir_fuse_gw
-            _gw.setDataAddress(0xa2a7c);    // mng.ir.ir_fuse_gw.desc0.secure_boot
+            _gw.setGWAddress(0xa2800);   // mng.irisc.ir_fuse_gw
+            _gw.setDataAddress(0xa2a7c); // mng.ir.ir_fuse_gw.desc0.secure_boot
             _gw.setFieldBitOffset(29);
             _gw.setFieldBitLen(1);
             _is_supported_in_live_fish = true;
@@ -212,11 +223,11 @@ int SecureBootFuse::isSecureBoot(bool& is_secure_boot)
 {
     u_int32_t data;
     int rc = 0;
-    
+
     try
     {
         _gw.getData(data);
-        
+
         switch (_chip_type)
         {
             case CT_CONNECTX7:
@@ -229,17 +240,17 @@ int SecureBootFuse::isSecureBoot(bool& is_secure_boot)
                 break;
         }
     }
-    catch(const char* msg)
+    catch (const char* msg)
     {
         printf("-E- Failed to get data from Fuse: %s.\n", msg);
         rc = -1;
     }
-    catch(exception e)
+    catch (exception e)
     {
         printf("-E- Failed to get data from Fuse: %s.\n", e.what());
         rc = -1;
     }
-    catch(...)
+    catch (...)
     {
         rc = -1;
     }
@@ -247,28 +258,27 @@ int SecureBootFuse::isSecureBoot(bool& is_secure_boot)
     return rc;
 }
 
-
 /********************************************************************************/
 /*                                                                              */
 /*                        LifeCycleFuse Class                                   */
 /*                                                                              */
 /********************************************************************************/
 
-LifeCycleFuse::LifeCycleFuse(mfile* mf, chip_type_t chip_type):
+LifeCycleFuse::LifeCycleFuse(mfile* mf, chip_type_t chip_type) :
     _gw(mf), _chip_type(chip_type), _is_supported_in_live_fish(false)
 {
     switch (chip_type)
     {
         case CT_CONNECTX7:
-            _gw.setGWAddress(0xF4550);      // yu.fuse_gw_life_cycle
-            _gw.setDataAddress(0xF455C);    // yu.fuse_gw_life_cycle.desc0.life_cycle_replica0
+            _gw.setGWAddress(0xF4550);   // yu.fuse_gw_life_cycle
+            _gw.setDataAddress(0xF455C); // yu.fuse_gw_life_cycle.desc0.life_cycle_replica0
             _gw.setFieldBitOffset(0);
             _gw.setFieldBitLen(32);
             _is_supported_in_live_fish = true;
             break;
         case CT_QUANTUM2:
-            _gw.setGWAddress(0xf3250);      // mng.yu.fuse_gw_life_cycle
-            _gw.setDataAddress(0xf325c);    // mng.yu.fuse_gw_life_cycle.desc0.life_cycle_replica0
+            _gw.setGWAddress(0xf3250);   // mng.yu.fuse_gw_life_cycle
+            _gw.setDataAddress(0xf325c); // mng.yu.fuse_gw_life_cycle.desc0.life_cycle_replica0
             _gw.setFieldBitOffset(0);
             _gw.setFieldBitLen(32);
             _is_supported_in_live_fish = true;
@@ -288,11 +298,11 @@ int LifeCycleFuse::getStatus(life_cycle_t& life_cycle)
 {
     u_int32_t data;
     int rc = 0;
-    
+
     try
     {
-        _gw.getData(data); 
-        
+        _gw.getData(data);
+
         switch (_chip_type)
         {
             case CT_CONNECTX7:
@@ -305,17 +315,17 @@ int LifeCycleFuse::getStatus(life_cycle_t& life_cycle)
                 break;
         }
     }
-    catch(const char* msg)
+    catch (const char* msg)
     {
         printf("-E- Failed to get data from Fuse: %s.\n", msg);
         rc = -1;
     }
-    catch(exception e)
+    catch (exception e)
     {
         printf("-E- Failed to get data from Fuse: %s.\n", e.what());
         rc = -1;
     }
-    catch(...)
+    catch (...)
     {
         rc = -1;
     }
@@ -324,7 +334,7 @@ int LifeCycleFuse::getStatus(life_cycle_t& life_cycle)
 }
 
 // in 4 bytes there are 16 replicas, each replica is 2 bits.
-// this method calculates the vote for each bit, and determines bit's value 
+// this method calculates the vote for each bit, and determines bit's value
 // in the life cycle status using majority vote
 life_cycle_t LifeCycleFuse::calcMajorityVote4B(u_int32_t data)
 {
@@ -367,7 +377,7 @@ u_int8_t LifeCycleFuse::calcOnBits1B(u_int8_t byte)
     u_int8_t first_bit_mask = 0x1;
     size_t i = 0;
 
-    for (; i < BYTE_SIZE; ++i) 
+    for (; i < BYTE_SIZE; ++i)
     {
         on_bits_count += ((byte >> i) & first_bit_mask);
     }
@@ -375,36 +385,35 @@ u_int8_t LifeCycleFuse::calcOnBits1B(u_int8_t byte)
     return on_bits_count;
 }
 
-
 /********************************************************************************/
 /*                                                                              */
 /*                        SecurityVersionFuse Class                             */
 /*                                                                              */
 /********************************************************************************/
 
-SecurityVersionFuse::SecurityVersionFuse(mfile* mf, chip_type_t chip_type):
+SecurityVersionFuse::SecurityVersionFuse(mfile* mf, chip_type_t chip_type) :
     _rollbackProtectionGW(mf), _minimalSecurityVersionGW(mf), _chip_type(chip_type), _is_supported_in_live_fish(false)
 {
     switch (chip_type)
     {
         case CT_CONNECTX7:
-            _rollbackProtectionGW.setGWAddress(0xf4540);      
-            _rollbackProtectionGW.setDataAddress(0xf4548);    
+            _rollbackProtectionGW.setGWAddress(0xf4540);
+            _rollbackProtectionGW.setDataAddress(0xf4548);
             _rollbackProtectionGW.setFieldBitOffset(0);
             _rollbackProtectionGW.setFieldBitLen(32);
-            _minimalSecurityVersionGW.setGWAddress(0xf4520);      
-            _minimalSecurityVersionGW.setDataAddress(0xf452c);  
+            _minimalSecurityVersionGW.setGWAddress(0xf4520);
+            _minimalSecurityVersionGW.setDataAddress(0xf452c);
             _minimalSecurityVersionGW.setFieldBitOffset(0);
             _minimalSecurityVersionGW.setFieldBitLen(32);
             _is_supported_in_live_fish = true;
             break;
         case CT_QUANTUM2:
-            _rollbackProtectionGW.setGWAddress(0xf3240);      
-            _rollbackProtectionGW.setDataAddress(0xf3248);    
+            _rollbackProtectionGW.setGWAddress(0xf3240);
+            _rollbackProtectionGW.setDataAddress(0xf3248);
             _rollbackProtectionGW.setFieldBitOffset(0);
             _rollbackProtectionGW.setFieldBitLen(32);
-            _minimalSecurityVersionGW.setGWAddress(0xf3220);      
-            _minimalSecurityVersionGW.setDataAddress(0xf322c);  
+            _minimalSecurityVersionGW.setGWAddress(0xf3220);
+            _minimalSecurityVersionGW.setDataAddress(0xf322c);
             _minimalSecurityVersionGW.setFieldBitOffset(0);
             _minimalSecurityVersionGW.setFieldBitLen(32);
             _is_supported_in_live_fish = true;
@@ -424,7 +433,7 @@ bool SecurityVersionFuse::getSecurityVersion(u_int32_t& securityVersion)
 {
     u_int32_t data;
     int rc = 0;
-    
+
     try
     {
         u_int32_t const MINIMAL_SECURITY_VERSION_MASK = 0x00000ff0;
@@ -439,9 +448,9 @@ bool SecurityVersionFuse::getSecurityVersion(u_int32_t& securityVersion)
                 _rollbackProtectionGW.setDataAddress(0xf454c);
                 _rollbackProtectionGW.getData(data);
                 securityVersion += countSetBits(data);
-                
+
                 _minimalSecurityVersionGW.getData(data);
-                securityVersion += ((data & MINIMAL_SECURITY_VERSION_MASK) >> MINIMAL_SECURITY_VERSION_OFFSET); 
+                securityVersion += ((data & MINIMAL_SECURITY_VERSION_MASK) >> MINIMAL_SECURITY_VERSION_OFFSET);
                 break;
             default:
                 printf("-E- Failed to get data from Fuse: Device is not supported.\n");
@@ -449,17 +458,17 @@ bool SecurityVersionFuse::getSecurityVersion(u_int32_t& securityVersion)
                 break;
         }
     }
-    catch(const char* msg)
+    catch (const char* msg)
     {
         printf("-E- Failed to get data from Fuse: %s.\n", msg);
         rc = -1;
     }
-    catch(exception e)
+    catch (exception e)
     {
         printf("-E- Failed to get data from Fuse: %s.\n", e.what());
         rc = -1;
     }
-    catch(...)
+    catch (...)
     {
         rc = -1;
     }
@@ -467,9 +476,11 @@ bool SecurityVersionFuse::getSecurityVersion(u_int32_t& securityVersion)
     return rc;
 }
 
-u_int32_t SecurityVersionFuse::countSetBits(u_int32_t num){
+u_int32_t SecurityVersionFuse::countSetBits(u_int32_t num)
+{
     u_int32_t count = 0;
-    while (num) {
+    while (num)
+    {
         count += num & 1;
         num >>= 1;
     }
diff --git a/mlxfwops/lib/fuse_gw.h b/mlxfwops/lib/fuse_gw.h
old mode 100755
new mode 100644
index 68a98844..0ea0cca1
--- a/mlxfwops/lib/fuse_gw.h
+++ b/mlxfwops/lib/fuse_gw.h
@@ -41,12 +41,12 @@
 
 using namespace std;
 
-class FuseGW 
+class FuseGW
 {
 public:
     FuseGW(mfile* mf);
-    ~FuseGW() {};
-        
+    ~FuseGW(){};
+
     void getData(u_int32_t& data);
     void setGWAddress(u_int32_t address);
     void setDataAddress(u_int32_t address);
@@ -56,14 +56,14 @@ class FuseGW
 private:
     mfile* _mf;
     u_int32_t _gw_address;
-    u_int32_t _data_address; 
-    size_t _data_bit_offset; 
+    u_int32_t _data_address;
+    size_t _data_bit_offset;
     size_t _data_bit_len;
 
     u_int32_t static const CTRL_LOCK_BIT_OFFSET = 31;
-    u_int32_t static const CTRL_RW   = 0x40000000;
+    u_int32_t static const CTRL_RW = 0x40000000;
     u_int32_t static const CTRL_READ = CTRL_RW & 0xffffffff;
-    u_int32_t static const CTRL_BUSY = 0x20000000;        
+    u_int32_t static const CTRL_BUSY = 0x20000000;
 
     void lock();
     void waitForGWLockState(u_int32_t address, u_int32_t requiredState);
@@ -76,12 +76,11 @@ class FuseGW
     void alignBits(u_int8_t* src, size_t byte_len, size_t bit_offset);
 };
 
-
 class LifeCycleFuse
 {
 public:
     LifeCycleFuse(mfile* mf, chip_type_t chip_type);
-    ~LifeCycleFuse() {};
+    ~LifeCycleFuse(){};
 
     bool isAccessibleInLiveFish();
     int getStatus(life_cycle_t& life_cycle);
@@ -92,16 +91,15 @@ class LifeCycleFuse
 
     FuseGW _gw;
     chip_type_t _chip_type;
-    
+
     bool _is_supported_in_live_fish;
 };
 
-
 class SecureBootFuse
 {
 public:
     SecureBootFuse(mfile* mf, chip_type_t chip_type);
-    ~SecureBootFuse() {};
+    ~SecureBootFuse(){};
 
     bool isAccessibleInLiveFish();
     int isSecureBoot(bool& is_secure_boot);
@@ -112,19 +110,22 @@ class SecureBootFuse
     bool _is_supported_in_live_fish;
 };
 
-
 class SecurityVersionFuse
 {
 public:
     SecurityVersionFuse(mfile* mf, chip_type_t chip_type);
-    ~SecurityVersionFuse() {};
+    ~SecurityVersionFuse(){};
 
     bool isAccessibleInLiveFish();
     bool getSecurityVersion(u_int32_t& result);
 
-private:   
-    typedef enum {ROLLBACK_PROTECTION, MINIMAL_VERSION} gw_type_t;
-    
+private:
+    typedef enum
+    {
+        ROLLBACK_PROTECTION,
+        MINIMAL_VERSION
+    } gw_type_t;
+
     void getRollbackProtection(u_int32_t* result);
     void getMinimalSecurityVersion(u_int32_t* result);
     void setGWAddress(gw_type_t gw_type);
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index 9107fcde..907f8f84 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
@@ -31,8 +31,6 @@
  * SOFTWARE.
  */
 
-
-
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
@@ -56,62 +54,65 @@
 #if !defined(UEFI_BUILD)
 #if !defined(NO_OPEN_SSL)
 #include <mlxsign_lib/mlxsign_lib.h>
-#endif //NO_OPEN_SSL
-#endif //UEFI_BUILD
-
+#endif // NO_OPEN_SSL
+#endif // UEFI_BUILD
 
 #ifndef __WIN__
-    #define OP_NOT_SUPPORTED EOPNOTSUPP
+#define OP_NOT_SUPPORTED EOPNOTSUPP
 #else // __WIN__
-    #define OP_NOT_SUPPORTED EINVAL
+#define OP_NOT_SUPPORTED EINVAL
 #endif // __WIN__
 
-
 #define BAD_CRC_MSG "Bad CRC."
-extern const char *g_sectNames[];
+extern const char* g_sectNames[];
 
-bool FwOperations::readBufAux(FBase& f, u_int32_t o, void *d, int l, const char*
-                              p)
+bool FwOperations::readBufAux(FBase& f, u_int32_t o, void* d, int l, const char* p)
 {
     bool rc = true;
     READBUF(f, o, d, l, p);
     return rc;
 }
 
-
-int FwOperations::getFileSignature(const char *fname)
+int FwOperations::getFileSignature(const char* fname)
 {
-    FILE *fin;
-    unsigned char tmpb[16] = { 0 };
+    FILE* fin;
+    unsigned char tmpb[16] = {0};
     int res = IMG_SIG_TYPE_UNKNOWN;
 
-    if (!(fin = fopen(fname, "r"))) {
+    if (!(fin = fopen(fname, "r")))
+    {
         // abit ugly , need to establish a correct ret val
         return IMG_SIG_OPEN_FILE_FAILED;
     }
-    if (!fgets((char*)tmpb, sizeof(tmpb), fin)) {
+    if (!fgets((char*)tmpb, sizeof(tmpb), fin))
+    {
         fclose(fin);
         return IMG_SIG_OPEN_FILE_FAILED;
     }
 
-    if (tmpb[0] == 0xCC && tmpb[1] == 0 && tmpb[2] == 0xCC && tmpb[3] == 1) {
+    if (tmpb[0] == 0xCC && tmpb[1] == 0 && tmpb[2] == 0xCC && tmpb[3] == 1)
+    {
         res = IMG_SIG_TYPE_CC;
         fclose(fin);
         return res;
     }
 
-    if (strlen((const char*)tmpb) < 4) {
+    if (strlen((const char*)tmpb) < 4)
+    {
         fclose(fin);
         return res;
     }
 
-    if (!strncmp((char*)tmpb, "MTFW", 4)) {
+    if (!strncmp((char*)tmpb, "MTFW", 4))
+    {
         res = IMG_SIG_TYPE_BIN;
     }
-    if (!strncmp((char*)tmpb, "MFAR", 4)) {
+    if (!strncmp((char*)tmpb, "MFAR", 4))
+    {
         res = IMG_SIG_TYPE_MFA;
     }
-    if (!strncmp((char*)tmpb, "MTCF", 4)) {
+    if (!strncmp((char*)tmpb, "MTCF", 4))
+    {
         res = IMG_SIG_TYPE_CF;
     }
     fclose(fin);
@@ -120,63 +121,81 @@ int FwOperations::getFileSignature(const char *fname)
 
 #ifndef NO_MFA_SUPPORT
 
-int FwOperations::getBufferSignature(u_int8_t *buf, u_int32_t size)
+int FwOperations::getBufferSignature(u_int8_t* buf, u_int32_t size)
 {
     int res = 0;
 
-    if (size < 4) {
+    if (size < 4)
+    {
         return 0;
     }
-    if (!strncmp((char*)buf, "MTFW", 4)) {
+    if (!strncmp((char*)buf, "MTFW", 4))
+    {
         res = IMG_SIG_TYPE_BIN;
     }
-    if (!strncmp((char*)buf, "MFAR", 4)) {
+    if (!strncmp((char*)buf, "MFAR", 4))
+    {
         res = IMG_SIG_TYPE_MFA;
     }
 
     return res;
 }
 
-int FwOperations::getMfaImgInner(char *fileName, u_int8_t *mfa_buf, int size,
-                                 char *psid, u_int8_t **imgbuf, char *errBuf, int errBufSize)
+int FwOperations::getMfaImgInner(char* fileName,
+                                 u_int8_t* mfa_buf,
+                                 int size,
+                                 char* psid,
+                                 u_int8_t** imgbuf,
+                                 char* errBuf,
+                                 int errBufSize)
 {
-    int image_type = 1; //FW image
-    mfa_desc *mfa_d = NULL;
+    int image_type = 1; // FW image
+    mfa_desc* mfa_d = NULL;
     int res = -1;
 
     // open mfa file
-    if (fileName) {
+    if (fileName)
+    {
         res = mfa_open_file(&mfa_d, fileName);
-    } else if (mfa_buf && size != 0) {
+    }
+    else if (mfa_buf && size != 0)
+    {
         res = mfa_open_buf(&mfa_d, mfa_buf, size);
-    } else {
+    }
+    else
+    {
         WriteToErrBuff(errBuf, (char*)"Internal error: bad parameters to getMfaImg", errBufSize);
         return res;
     }
 
-    if (res) {
+    if (res)
+    {
         // mfa_open_* failed, return error.
         res = res < 0 ? res : -1 * res;
         WriteToErrBuff(errBuf, (char*)"Failed to open mfa file", errBufSize);
         return res;
     }
 
-    if (psid == NULL) {
+    if (psid == NULL)
+    {
         WriteToErrBuff(errBuf, (char*)"Internal error: PSID must be supplied", errBufSize);
-        if (mfa_d) {
+        if (mfa_d)
+        {
             mfa_close(mfa_d);
         }
-        return -1; //No psid => no image
+        return -1; // No psid => no image
     }
 
     // get appropriate image for requested PSID from mfa file
     res = mfa_get_image(mfa_d, psid, image_type, (char*)"", imgbuf);
 
     // if res != 0 there is an error
-    if (res) {
-        const char *errStr = mfa_get_last_error(mfa_d);
+    if (res)
+    {
+        const char* errStr = mfa_get_last_error(mfa_d);
         // if error field is empty return generic message
-        if (!errStr || strlen(errStr) == 0) {
+        if (!errStr || strlen(errStr) == 0)
+        {
             errStr = "Failed to get MFA Image";
         }
 
@@ -188,46 +207,48 @@ int FwOperations::getMfaImgInner(char *fileName, u_int8_t *mfa_buf, int size,
     return res;
 }
 
-int FwOperations::getMfaImg(char *fileName, char *psid, u_int8_t **imgbuf, char *errBuf, int errBufSize)
+int FwOperations::getMfaImg(char* fileName, char* psid, u_int8_t** imgbuf, char* errBuf, int errBufSize)
 {
-    return getMfaImgInner(fileName, NULL, 0,
-                          psid,  imgbuf, errBuf, errBufSize);
+    return getMfaImgInner(fileName, NULL, 0, psid, imgbuf, errBuf, errBufSize);
 }
 
-
-int FwOperations::getMfaImg(u_int8_t *mfa_buf, int size, char *psid, u_int8_t **imgbuf, char *errBuf, int errBufSize)
+int FwOperations::getMfaImg(u_int8_t* mfa_buf, int size, char* psid, u_int8_t** imgbuf, char* errBuf, int errBufSize)
 {
-    return getMfaImgInner(NULL, mfa_buf, size,
-                          psid, imgbuf, errBuf, errBufSize);
+    return getMfaImgInner(NULL, mfa_buf, size, psid, imgbuf, errBuf, errBufSize);
 }
 
 #endif
 
-
 void FwOperations::FwCleanUp()
 {
-    if (_ioAccess) {
+    if (_ioAccess)
+    {
         _ioAccess->close();
         delete _ioAccess;
         _ioAccess = (FBase*)NULL;
     }
-    if (_fname) {
+    if (_fname)
+    {
         delete[] _fname;
         _fname = (char*)NULL;
     }
-    if (_devName) {
+    if (_devName)
+    {
         delete[] _devName;
         _devName = (char*)NULL;
     }
-    if (_fwParams.fileHndl) {
+    if (_fwParams.fileHndl)
+    {
         delete[] _fwParams.fileHndl;
         _fwParams.fileHndl = (char*)NULL;
     }
-    if (_fwParams.mstHndl) {
+    if (_fwParams.mstHndl)
+    {
         delete[] _fwParams.mstHndl;
         _fwParams.mstHndl = (char*)NULL;
     }
-    if (_fwParams.psid) {
+    if (_fwParams.psid)
+    {
         delete[] _fwParams.psid;
         _fwParams.psid = (char*)NULL;
     }
@@ -235,7 +256,8 @@ void FwOperations::FwCleanUp()
 
 bool FwOperations::FwVerifyAdv(ExtVerifyParams& verifyParams)
 {
-    return FwVerify(verifyParams.verifyCallBackFunc, verifyParams.isStripedImage, verifyParams.showItoc, verifyParams.ignoreDToc);
+    return FwVerify(verifyParams.verifyCallBackFunc, verifyParams.isStripedImage, verifyParams.showItoc,
+                    verifyParams.ignoreDToc);
 }
 
 void FwOperations::FwInitCom()
@@ -253,48 +275,58 @@ void FwOperations::GetFwParams(fw_ops_params_t& fwParams)
     fwParams = _fwParams;
 }
 
-void FwOperations::getSupporteHwId(u_int32_t **supportedHwId, u_int32_t &supportedHwIdNum)
+void FwOperations::getSupporteHwId(u_int32_t** supportedHwId, u_int32_t& supportedHwIdNum)
 {
-    *supportedHwId    = _fwImgInfo.supportedHwId;
+    *supportedHwId = _fwImgInfo.supportedHwId;
     supportedHwIdNum = _fwImgInfo.supportedHwIdNum;
-
 }
 
-bool FwOperations::checkBoot2(u_int32_t beg, u_int32_t offs, u_int32_t& next, bool fullRead, const char *pref, VerifyCallBack verifyCallBackFunc)
+bool FwOperations::checkBoot2(u_int32_t beg,
+                              u_int32_t offs,
+                              u_int32_t& next,
+                              bool fullRead,
+                              const char* pref,
+                              VerifyCallBack verifyCallBackFunc)
 {
     DPRINTF(("FwOperations::checkBoot2\n"));
     u_int32_t size = 0x0;
 
-    char *pr = new char[strlen(pref) + 512];
+    char* pr = new char[strlen(pref) + 512];
     sprintf(pr, "%s /0x%08x/ (BOOT2)", pref, offs + beg);
     // Size
-    if (!(*_ioAccess).read(offs + beg + 4, &size)) {
+    if (!(*_ioAccess).read(offs + beg + 4, &size))
+    {
         errmsg("%s - read error (%s)\n", pr, (*_ioAccess).err());
         delete[] pr;
         return false;
     }
     TOCPU1(size);
     DPRINTF(("FwOperations::checkBoot2 size = 0x%x\n", size));
-    if (size > 1048576 || size < 4) {
+    if (size > 1048576 || size < 4)
+    {
         report_callback(verifyCallBackFunc, "%s /0x%08x/ - unexpected size (0x%x)\n", pr, offs + beg + 4, size);
         delete[] pr;
         return false;
     }
     _fwImgInfo.bootSize = (size + 4) * 4;
 
-    // Get absolute address on flash when checking BOOT2 for FS3 image format (for FS2 its always displayed as contiguous)
-    // Adrianc: why dont we show them both in the same way when running verify.
-    u_int32_t boot2AbsAddr = ((this->FwType() == FIT_FS3 || this->FwType() == FIT_FS4) && _ioAccess->is_flash()) ? \
-                             _ioAccess->get_phys_from_cont(beg, _fwImgInfo.cntxLog2ChunkSize, (_fwImgInfo.imgStart != 0)) : beg;
+    // Get absolute address on flash when checking BOOT2 for FS3 image format (for FS2 its always displayed as
+    // contiguous) Adrianc: why dont we show them both in the same way when running verify.
+    u_int32_t boot2AbsAddr =
+      ((this->FwType() == FIT_FS3 || this->FwType() == FIT_FS4) && _ioAccess->is_flash()) ?
+        _ioAccess->get_phys_from_cont(beg, _fwImgInfo.cntxLog2ChunkSize, (_fwImgInfo.imgStart != 0)) :
+        beg;
 
     sprintf(pr, "%s /0x%08x-0x%08x (0x%06x)/ (BOOT2)", pref, offs + boot2AbsAddr,
             offs + boot2AbsAddr + (size + 4) * 4 - 1, (size + 4) * 4);
 
-    if ((_ioAccess->is_flash() && fullRead == true) || !_ioAccess->is_flash()) {
+    if ((_ioAccess->is_flash() && fullRead == true) || !_ioAccess->is_flash())
+    {
         Crc16 crc;
-        u_int32_t *buff = new u_int32_t[size + 4];
+        u_int32_t* buff = new u_int32_t[size + 4];
         bool rc = readBufAux((*_ioAccess), offs + beg, buff, size * 4 + 16, pr);
-        if (!rc) {
+        if (!rc)
+        {
             delete[] pr;
             delete[] buff;
             return rc;
@@ -305,21 +337,23 @@ bool FwOperations::checkBoot2(u_int32_t beg, u_int32_t offs, u_int32_t& next, bo
         CRC1n(crc, buff, size + 4);
         CRC1n(_ioAccess->get_image_crc(), buff, size + 4);
 
-
         crc.finish();
 
         u_int32_t crc_act = buff[size + 3];
         delete[] buff;
-        if (crc.get() != crc_act) {
+        if (crc.get() != crc_act)
+        {
             DPRINTF(("FwOperations::checkBoot2 wrong CRC (exp:0x%x, act:0x%x)\n", crc.get(), crc_act));
-            report_callback(verifyCallBackFunc, "%s /0x%08x/ - wrong CRC (exp:0x%x, act:0x%x)\n",
-                            pr, offs + beg, crc.get(), crc_act);
-            if (!_fwParams.ignoreCrcCheck) {
+            report_callback(verifyCallBackFunc, "%s /0x%08x/ - wrong CRC (exp:0x%x, act:0x%x)\n", pr, offs + beg,
+                            crc.get(), crc_act);
+            if (!_fwParams.ignoreCrcCheck)
+            {
                 delete[] pr;
                 return errmsg(MLXFW_BAD_CRC_ERR, BAD_CRC_MSG);
             }
         }
-        else {
+        else
+        {
             report_callback(verifyCallBackFunc, "%s - OK\n", pr);
         }
         _ioAccess->get_image_crc() << crc_act;
@@ -329,21 +363,34 @@ bool FwOperations::checkBoot2(u_int32_t beg, u_int32_t offs, u_int32_t& next, bo
     return true;
 } // checkBoot2
 
-
-bool FwOperations::CheckAndPrintCrcRes(char *pr, bool blank_crc, u_int32_t off, u_int32_t crc_act, u_int32_t crc_exp, bool ignore_crc,
+bool FwOperations::CheckAndPrintCrcRes(char* pr,
+                                       bool blank_crc,
+                                       u_int32_t off,
+                                       u_int32_t crc_act,
+                                       u_int32_t crc_exp,
+                                       bool ignore_crc,
                                        VerifyCallBack verifyCallBackFunc)
 {
-    if (ignore_crc) {
+    if (ignore_crc)
+    {
         report_callback(verifyCallBackFunc, "%s - CRC IGNORED\n", pr);
-    } else {
-        if (blank_crc) {
+    }
+    else
+    {
+        if (blank_crc)
+        {
             report_callback(verifyCallBackFunc, "%s - BLANK CRC (0xffff)\n", pr);
-        } else if (crc_exp == crc_act) {
+        }
+        else if (crc_exp == crc_act)
+        {
             report_callback(verifyCallBackFunc, "%s - OK\n", pr);
-        } else {
-            report_callback(verifyCallBackFunc, "%s /0x%08x/ - wrong CRC (exp:0x%x, act:0x%x)\n",
-                            pr, off, crc_exp, crc_act);
-            if (!_fwParams.ignoreCrcCheck) {
+        }
+        else
+        {
+            report_callback(verifyCallBackFunc, "%s /0x%08x/ - wrong CRC (exp:0x%x, act:0x%x)\n", pr, off, crc_exp,
+                            crc_act);
+            if (!_fwParams.ignoreCrcCheck)
+            {
                 return errmsg(BAD_CRC_MSG);
             }
         }
@@ -351,60 +398,45 @@ bool FwOperations::CheckAndPrintCrcRes(char *pr, bool blank_crc, u_int32_t off,
     return true;
 }
 
-const u_int32_t FwOperations::_cntx_magic_pattern[4] = {
-    0x4D544657,   // Ascii of "MTFW"
-    0x8CDFD000,   // Random data
-    0xDEAD9270,
-    0x4154BEEF
-};
+const u_int32_t FwOperations::_cntx_magic_pattern[4] = {0x4D544657, // Ascii of "MTFW"
+                                                        0x8CDFD000, // Random data
+                                                        0xDEAD9270, 0x4154BEEF};
 
-const u_int32_t FwOperations::_fs4_magic_pattern[4] = {
-    0x4D544657,
-    0xABCDEF00,
-    0xFADE1234,
-    0x5678DEAD
-};
+const u_int32_t FwOperations::_fs4_magic_pattern[4] = {0x4D544657, 0xABCDEF00, 0xFADE1234, 0x5678DEAD};
 
 const u_int32_t FwOperations::_cntx_image_start_pos[FwOperations::CNTX_START_POS_SIZE] = {
-    0,
-    0x10000,
-    0x20000,
-    0x40000,
-    0x80000,
-    0x100000,
-    0x200000,
-    0x400000,
-    0x800000,
-    0x1000000
-};
+  0, 0x10000, 0x20000, 0x40000, 0x80000, 0x100000, 0x200000, 0x400000, 0x800000, 0x1000000};
 
-bool FwOperations::FindMagicPattern(FBase *ioAccess, u_int32_t addr,
-                                    u_int32_t const cntx_magic_pattern[])
+bool FwOperations::FindMagicPattern(FBase* ioAccess, u_int32_t addr, u_int32_t const cntx_magic_pattern[])
 {
-    if (addr + 16 > ioAccess->get_effective_size()) {
+    if (addr + 16 > ioAccess->get_effective_size())
+    {
         return false;
     }
-    for (int i = 0; i < 4; i++) {
+    for (int i = 0; i < 4; i++)
+    {
         u_int32_t w;
         READ4_NOERRMSG((*ioAccess), addr + i * 4, &w);
         TOCPU1(w);
-        if (w != cntx_magic_pattern[i]) {
-            DPRINTF(("FwOperations::FindMagicPattern addr=0x%x false\n",addr));
-            //printf("-D- Looking for magic pattern %d addr %06x: Exp=%08x Act=%08x\n", i, addr + i * 4, _cntx_magic_pattern[i], w);
+        if (w != cntx_magic_pattern[i])
+        {
+            DPRINTF(("FwOperations::FindMagicPattern addr=0x%x false\n", addr));
+            // printf("-D- Looking for magic pattern %d addr %06x: Exp=%08x Act=%08x\n", i, addr + i * 4,
+            // _cntx_magic_pattern[i], w);
             return false;
         }
     }
 
-    DPRINTF(("FwOperations::FindMagicPattern addr=0x%x true\n",addr));
+    DPRINTF(("FwOperations::FindMagicPattern addr=0x%x true\n", addr));
     return true;
 }
 
 // FindAllImageStart
 // OUT: start_locations: set to the start addresses of the found image markers (in accending order)
 // OUT: found_images:    Number of found images (and number of valid entries in the start_locations array).
-bool FwOperations::FindAllImageStart(FBase *ioAccess,
+bool FwOperations::FindAllImageStart(FBase* ioAccess,
                                      u_int32_t start_locations[CNTX_START_POS_SIZE],
-                                     u_int32_t *found_images,
+                                     u_int32_t* found_images,
                                      u_int32_t const cntx_magic_pattern[])
 {
     DPRINTF(("FwOperations::FindAllImageStart\n"));
@@ -412,9 +444,10 @@ bool FwOperations::FindAllImageStart(FBase *ioAccess,
 
     needed_pos_num = CNTX_START_POS_SIZE;
 
-    if (ioAccess->is_flash()) {
-        if ( (ioAccess->get_dev_id() == CX2_HW_ID) ||
-             (ioAccess->get_dev_id() == IS4_HW_ID)) {
+    if (ioAccess->is_flash())
+    {
+        if ((ioAccess->get_dev_id() == CX2_HW_ID) || (ioAccess->get_dev_id() == IS4_HW_ID))
+        {
             needed_pos_num = OLD_CNTX_START_POS_SIZE;
         }
     }
@@ -423,15 +456,19 @@ bool FwOperations::FindAllImageStart(FBase *ioAccess,
      *     valid image to be found. as a WA we dont check at 0x400000. basic flash operations
      *     are affected when attempting to access addressess greater than 0x3fffff.
      */
-    if (ioAccess->get_dev_id() == SWITCH_IB_HW_ID) {
+    if (ioAccess->get_dev_id() == SWITCH_IB_HW_ID)
+    {
         needed_pos_num -= 1;
     }
 
     ioAccess->set_address_convertor(0, 0);
-    if (found_images) {
+    if (found_images)
+    {
         *found_images = 0;
-        for (int i = 0; i < needed_pos_num; i++) {
-            if (FindMagicPattern(ioAccess, _cntx_image_start_pos[i], cntx_magic_pattern)) {
+        for (int i = 0; i < needed_pos_num; i++)
+        {
+            if (FindMagicPattern(ioAccess, _cntx_image_start_pos[i], cntx_magic_pattern))
+            {
                 start_locations[*found_images] = _cntx_image_start_pos[i];
                 (*found_images)++;
             }
@@ -442,129 +479,156 @@ bool FwOperations::FindAllImageStart(FBase *ioAccess,
     return true;
 }
 // CAN BE IN ANOTHER MODULE
-bool FwOperations::GetSectData(std::vector<u_int8_t>& file_sect, const u_int32_t *buff, const u_int32_t size)
+bool FwOperations::GetSectData(std::vector<u_int8_t>& file_sect, const u_int32_t* buff, const u_int32_t size)
 {
-
     file_sect.clear();
-    file_sect.insert(file_sect.end(),
-                     (u_int8_t*)buff,
-                     (u_int8_t*)buff + size);
-
+    file_sect.insert(file_sect.end(), (u_int8_t*)buff, (u_int8_t*)buff + size);
 
     return true;
 }
 
-
-bool FwOperations::FwAccessCreate(fw_ops_params_t& fwParams, FBase **ioAccessP)
+bool FwOperations::FwAccessCreate(fw_ops_params_t& fwParams, FBase** ioAccessP)
 {
     DPRINTF(("FwOperations::FwAccessCreate\n"));
-    if (fwParams.hndlType == FHT_FW_FILE) {
+    if (fwParams.hndlType == FHT_FW_FILE)
+    {
 #ifndef NO_MFA_SUPPORT
         int sig = getFileSignature(fwParams.fileHndl);
-        if (sig == IMG_SIG_OPEN_FILE_FAILED) { //i.e we failed to open file
+        if (sig == IMG_SIG_OPEN_FILE_FAILED)
+        { // i.e we failed to open file
             WriteToErrBuff(fwParams.errBuff, strerror(errno), fwParams.errBuffSize);
             return false;
         }
-        if (sig == IMG_SIG_TYPE_BIN || sig == IMG_SIG_TYPE_CF) {
+        if (sig == IMG_SIG_TYPE_BIN || sig == IMG_SIG_TYPE_CF)
+        {
             *ioAccessP = new FImage;
-            if (!(*ioAccessP)->open(fwParams.fileHndl, false, !fwParams.shortErrors)) {
+            if (!(*ioAccessP)->open(fwParams.fileHndl, false, !fwParams.shortErrors))
+            {
                 WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
                 delete *ioAccessP;
                 return false;
             }
-        } else if (sig == IMG_SIG_TYPE_MFA) {
-            u_int8_t *imgbuf = NULL;
+        }
+        else if (sig == IMG_SIG_TYPE_MFA)
+        {
+            u_int8_t* imgbuf = NULL;
             int sz;
             // get image from mfa file
-            if ((sz = getMfaImg(fwParams.fileHndl, fwParams.psid, &imgbuf, fwParams.errBuff, fwParams.errBuffSize)) < 0) {
+            if ((sz = getMfaImg(fwParams.fileHndl, fwParams.psid, &imgbuf, fwParams.errBuff, fwParams.errBuffSize)) < 0)
+            {
                 return false;
             }
             *ioAccessP = new FImage;
-            if (!((FImage*)(*ioAccessP))->open((u_int32_t*)imgbuf, (u_int32_t)sz, !fwParams.shortErrors)) {
+            if (!((FImage*)(*ioAccessP))->open((u_int32_t*)imgbuf, (u_int32_t)sz, !fwParams.shortErrors))
+            {
                 mfa_release_image(imgbuf);
                 WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
                 delete *ioAccessP;
                 return false;
             }
             mfa_release_image(imgbuf);
-        } else {
+        }
+        else
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)"Invalid Image signature.", fwParams.errBuffSize);
-            return false; //Unknown signature
+            return false; // Unknown signature
         }
 #else
         *ioAccessP = new FImage;
-        if (!(*ioAccessP)->open(fwParams.fileHndl, false, !fwParams.shortErrors)) {
+        if (!(*ioAccessP)->open(fwParams.fileHndl, false, !fwParams.shortErrors))
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
             delete *ioAccessP;
             return false;
         }
 #endif
-    } else if (fwParams.hndlType == FHT_FW_BUFF) {
+    }
+    else if (fwParams.hndlType == FHT_FW_BUFF)
+    {
         u_int32_t numInfo = fwParams.buffSize;
 #ifndef NO_MFA_SUPPORT
         int sig = getBufferSignature((u_int8_t*)fwParams.buffHndl, numInfo);
-        if (sig == IMG_SIG_TYPE_BIN) {
+        if (sig == IMG_SIG_TYPE_BIN)
+        {
             *ioAccessP = new FImage;
-            if (!((FImage*)*ioAccessP)->open(fwParams.buffHndl, (u_int32_t)numInfo, !fwParams.shortErrors)) {
+            if (!((FImage*)*ioAccessP)->open(fwParams.buffHndl, (u_int32_t)numInfo, !fwParams.shortErrors))
+            {
                 WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
                 delete *ioAccessP;
                 return false;
             }
-        } else if (sig == IMG_SIG_TYPE_MFA) {
-            u_int8_t *imgbuf;
+        }
+        else if (sig == IMG_SIG_TYPE_MFA)
+        {
+            u_int8_t* imgbuf;
             int sz;
             // get image from mfa file
-            if ((sz = getMfaImg((u_int8_t*)fwParams.buffHndl, numInfo, fwParams.psid, &imgbuf, fwParams.errBuff, fwParams.errBuffSize)) < 0) {
+            if ((sz = getMfaImg((u_int8_t*)fwParams.buffHndl, numInfo, fwParams.psid, &imgbuf, fwParams.errBuff,
+                                fwParams.errBuffSize)) < 0)
+            {
                 return false;
             }
             *ioAccessP = new FImage;
-            if (!((FImage*)*ioAccessP)->open((u_int32_t*)imgbuf, (u_int32_t)sz, !fwParams.shortErrors)) {
+            if (!((FImage*)*ioAccessP)->open((u_int32_t*)imgbuf, (u_int32_t)sz, !fwParams.shortErrors))
+            {
                 mfa_release_image(imgbuf);
                 WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
                 delete *ioAccessP;
                 return false;
             }
             mfa_release_image(imgbuf);
-        } else {
+        }
+        else
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)"Invalid Image signature.", fwParams.errBuffSize);
-            return false;//Unknown signature
+            return false; // Unknown signature
         }
 #else
         *ioAccessP = new FImage;
-        if (!((FImage*)*ioAccessP)->open(fwParams.buffHndl, numInfo, !fwParams.shortErrors)) {
+        if (!((FImage*)*ioAccessP)->open(fwParams.buffHndl, numInfo, !fwParams.shortErrors))
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
             delete *ioAccessP;
             return false;
         }
 #endif
-    } else if (fwParams.hndlType == FHT_UEFI_DEV) {
+    }
+    else if (fwParams.hndlType == FHT_UEFI_DEV)
+    {
         *ioAccessP = new Flash;
-        if (!(*ioAccessP)->open(fwParams.uefiHndl, &fwParams.uefiExtra, false, !fwParams.shortErrors)) {
+        if (!(*ioAccessP)->open(fwParams.uefiHndl, &fwParams.uefiExtra, false, !fwParams.shortErrors))
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
             delete *ioAccessP;
             return false;
         }
-    } else if (fwParams.hndlType == FHT_MST_DEV) {
+    }
+    else if (fwParams.hndlType == FHT_MST_DEV)
+    {
         *ioAccessP = new Flash;
-        if (!(*ioAccessP)->open(fwParams.mstHndl, fwParams.forceLock, fwParams.readOnly, fwParams.numOfBanks, \
-                                        fwParams.flashParams, fwParams.ignoreCacheRep, !fwParams.shortErrors, fwParams.cx3FwAccess)) {
+        if (!(*ioAccessP)
+               ->open(fwParams.mstHndl, fwParams.forceLock, fwParams.readOnly, fwParams.numOfBanks,
+                      fwParams.flashParams, fwParams.ignoreCacheRep, !fwParams.shortErrors, fwParams.cx3FwAccess))
+        {
             // TODO: release memory here ?
             WriteToErrBuff(fwParams.errBuff, (char*)(*ioAccessP)->err(), fwParams.errBuffSize);
             delete *ioAccessP;
             return false;
         }
-        //set no flash verify if needed (default =false)
+        // set no flash verify if needed (default =false)
         (*ioAccessP)->set_no_flash_verify(fwParams.noFlashVerify);
         // work with 64KB sector size if possible to increase performace in full fw burn
         ((*ioAccessP)->set_flash_working_mode(Flash::Fwm_64KB));
-    } else {
+    }
+    else
+    {
         WriteToErrBuff(fwParams.errBuff, (char*)"Unknown Handle Type.", fwParams.errBuffSize);
         return false;
     }
     return true;
 }
 
-u_int8_t FwOperations::IsFS4Image(FBase& f, u_int32_t *found_images)
+u_int8_t FwOperations::IsFS4Image(FBase& f, u_int32_t* found_images)
 {
     DPRINTF(("FwOperations::IsFS4Image\n"));
     u_int32_t data;
@@ -573,15 +637,20 @@ u_int8_t FwOperations::IsFS4Image(FBase& f, u_int32_t *found_images)
 
     FindAllImageStart(&f, image_start, found_images, _fs4_magic_pattern);
 
-    if (*found_images) {
-        //check if the image_format_version is ok
+    if (*found_images)
+    {
+        // check if the image_format_version is ok
         READ4_NOERRMSG(f, image_start[0] + 0x10, &data);
         TOCPU1(data);
         image_version = data >> 24;
-        DPRINTF(("FwOperations::IsFS4Image fw_image.begin_area.boot_version.image_format_version = %d\n", image_version));
-        if (image_version == 1) {//1 is the current version
+        DPRINTF(
+          ("FwOperations::IsFS4Image fw_image.begin_area.boot_version.image_format_version = %d\n", image_version));
+        if (image_version == 1)
+        { // 1 is the current version
             return FS_FS4_GEN;
-        } else {
+        }
+        else
+        {
             return FS_UNKNOWN_IMG;
         }
     }
@@ -589,19 +658,23 @@ u_int8_t FwOperations::IsFS4Image(FBase& f, u_int32_t *found_images)
     return FS_UNKNOWN_IMG;
 }
 
-u_int8_t FwOperations::IsFS3OrFS2Image(FBase& f, u_int32_t *found_images)
+u_int8_t FwOperations::IsFS3OrFS2Image(FBase& f, u_int32_t* found_images)
 {
     u_int32_t data;
     u_int8_t image_version;
     u_int32_t image_start[CNTX_START_POS_SIZE] = {0};
     FindAllImageStart(&f, image_start, found_images, _cntx_magic_pattern);
-    if (found_images) {
+    if (found_images)
+    {
         READ4_NOERRMSG(f, image_start[0] + FS3_IND_ADDR, &data);
         TOCPU1(data);
         image_version = data >> 24;
-        if (image_version == IMG_VER_FS3) {
+        if (image_version == IMG_VER_FS3)
+        {
             return FS_FS3_GEN;
-        } else {
+        }
+        else
+        {
             // TODO: if the img format version is unknown we should fail instead of considering it FS2
             return FS_FS2_GEN;
         }
@@ -613,7 +686,8 @@ u_int8_t FwOperations::IsCableImage(FBase& f)
 {
     char data[5] = {0};
     READ4_NOERRMSG(f, 0, (u_int32_t*)&data);
-    if (!strncmp(data, "MTCF", 4)) {
+    if (!strncmp(data, "MTCF", 4))
+    {
         return FS_FC1_GEN;
     }
     return FS_UNKNOWN_IMG;
@@ -625,52 +699,62 @@ u_int8_t FwOperations::CheckFwFormat(FBase& f, bool getFwFormatFromImg)
     u_int8_t v;
     u_int32_t found_images = 0;
 
-    if (f.is_flash() && !getFwFormatFromImg) {
+    if (f.is_flash() && !getFwFormatFromImg)
+    {
         return GetFwFormatFromHwDevID(f.get_dev_id());
-    } else {
+    }
+    else
+    {
         v = IsCableImage(f);
-        if (v != FS_UNKNOWN_IMG) {
+        if (v != FS_UNKNOWN_IMG)
+        {
             return v;
         }
-        //First check if it is FS4
+        // First check if it is FS4
         v = IsFS4Image(f, &found_images);
-        if (found_images) {
+        if (found_images)
+        {
             return v;
         }
-        //If not FS4 then check if it is FS3 or FS2
+        // If not FS4 then check if it is FS3 or FS2
         return IsFS3OrFS2Image(f, &found_images);
     }
     return FS_UNKNOWN_IMG;
 }
 
-
 bool FwOperations::CheckBinVersion(u_int8_t binVerMajor, u_int8_t binVerMinor)
 {
-    if (binVerMajor == 0 && binVerMinor == 0) {
+    if (binVerMajor == 0 && binVerMinor == 0)
+    {
         return true;
     }
 
-    if (binVerMajor > _maxBinMajorVer /*FS4_MAX_BIN_VER_MAJOR*/) {
+    if (binVerMajor > _maxBinMajorVer /*FS4_MAX_BIN_VER_MAJOR*/)
+    {
         return errmsg(MLXFW_UNSUPPORTED_BIN_VER_ERR,
                       "Unsupported binary version (%d.%d) please update to latest MFT package",
                       binVerMajor,
                       binVerMinor);
     }
-    if (binVerMajor < _minBinMajorVer/*FS4_MIN_BIN_VER_MAJOR*/
-        || (binVerMajor == _minBinMajorVer    /*FS4_MIN_BIN_VER_MAJOR*/
-            && binVerMinor < _minBinMinorVer)) {
+    if (binVerMajor < _minBinMajorVer      /*FS4_MIN_BIN_VER_MAJOR*/
+        || (binVerMajor == _minBinMajorVer /*FS4_MIN_BIN_VER_MAJOR*/
+            && binVerMinor < _minBinMinorVer))
+    {
         return errmsg(MLXFW_UNSUPPORTED_BIN_VER_ERR,
-                      "Unsupported binary version (%d.%d) minimal supported version (%d.%d)", \
-                      binVerMajor,
-                      binVerMinor,
-                      _minBinMajorVer /*FS4_MIN_BIN_VER_MAJOR*/,
-                      _minBinMinorVer /*FS4_MIN_BIN_VER_MINOR*/);
+                      "Unsupported binary version (%d.%d) minimal supported version (%d.%d)", binVerMajor, binVerMinor,
+                      _minBinMajorVer /*FS4_MIN_BIN_VER_MAJOR*/, _minBinMinorVer /*FS4_MIN_BIN_VER_MINOR*/);
     }
 
     return true;
 }
 
-FwOperations* FwOperations::FwOperationsCreate(void *fwHndl, void *info, char *psid, fw_hndl_type_t hndlType, char *errBuff, int buffSize, bool ignore_crc_check)
+FwOperations* FwOperations::FwOperationsCreate(void* fwHndl,
+                                               void* info,
+                                               char* psid,
+                                               fw_hndl_type_t hndlType,
+                                               char* errBuff,
+                                               int buffSize,
+                                               bool ignore_crc_check)
 {
     DPRINTF(("FwOperations::FwOperationsCreate\n"));
     fw_ops_params_t fwParams;
@@ -682,15 +766,22 @@ FwOperations* FwOperations::FwOperationsCreate(void *fwHndl, void *info, char *p
     fwParams.ignoreCrcCheck = ignore_crc_check;
     fwParams.shortErrors = true;
 
-    if (hndlType == FHT_FW_FILE) {
+    if (hndlType == FHT_FW_FILE)
+    {
         fwParams.fileHndl = (char*)fwHndl;
-    } else if (hndlType == FHT_FW_BUFF) {
+    }
+    else if (hndlType == FHT_FW_BUFF)
+    {
         fwParams.buffHndl = (u_int32_t*)fwHndl;
         fwParams.buffSize = *((u_int32_t*)info);
-    } else if (hndlType == FHT_UEFI_DEV) {
+    }
+    else if (hndlType == FHT_UEFI_DEV)
+    {
         fwParams.uefiHndl = (uefi_Dev_t*)fwHndl;
         fwParams.uefiExtra = *(uefi_dev_extra_t*)info;
-    } else if (hndlType == FHT_MST_DEV) {
+    }
+    else if (hndlType == FHT_MST_DEV)
+    {
         fwParams.mstHndl = (char*)fwHndl;
         fwParams.forceLock = false;
         fwParams.readOnly = false;
@@ -699,25 +790,33 @@ FwOperations* FwOperations::FwOperationsCreate(void *fwHndl, void *info, char *p
         fwParams.ignoreCacheRep = 0;
         fwParams.noFlashVerify = false;
         fwParams.cx3FwAccess = 0;
-    } else if (hndlType == FHT_CABLE_DEV) {
+    }
+    else if (hndlType == FHT_CABLE_DEV)
+    {
         fwParams.buffHndl = (u_int32_t*)fwHndl;
     }
     return FwOperationsCreate(fwParams);
 }
 
-bool FwOperations::imageDevOperationsCreate(fw_ops_params_t& devParams, fw_ops_params_t& imgParams,
-                                            FwOperations **devFwOps, FwOperations **imgFwOps,
-                                            bool ignoreSecurityAttributes, bool ignoreDToc)
+bool FwOperations::imageDevOperationsCreate(fw_ops_params_t& devParams,
+                                            fw_ops_params_t& imgParams,
+                                            FwOperations** devFwOps,
+                                            FwOperations** imgFwOps,
+                                            bool ignoreSecurityAttributes,
+                                            bool ignoreDToc)
 {
     *imgFwOps = FwOperationsCreate(imgParams);
-    if (!(*imgFwOps)) {
+    if (!(*imgFwOps))
+    {
         return false;
     }
 
-    if ((*imgFwOps)->FwType() == FIT_FS2) {
+    if ((*imgFwOps)->FwType() == FIT_FS2)
+    {
         devParams.canSkipFwCtrl = true;
         *devFwOps = FwOperationsCreate(devParams);
-        if (!(*devFwOps)) {
+        if (!(*devFwOps))
+        {
             return false;
         }
         return true;
@@ -725,16 +824,19 @@ bool FwOperations::imageDevOperationsCreate(fw_ops_params_t& devParams, fw_ops_p
 
     fw_info_t imgQuery;
     memset(&imgQuery, 0, sizeof(fw_info_t));
-    if (!(*imgFwOps)->FwQuery(&imgQuery, true, false, true, ignoreDToc)) {
+    if (!(*imgFwOps)->FwQuery(&imgQuery, true, false, true, ignoreDToc))
+    {
         *imgFwOps = NULL;
         return false;
     }
-    if (imgQuery.fs3_info.security_mode == SM_NONE && ignoreSecurityAttributes == false) {
+    if (imgQuery.fs3_info.security_mode == SM_NONE && ignoreSecurityAttributes == false)
+    {
         devParams.noFwCtrl = true;
     }
 
     *devFwOps = FwOperationsCreate(devParams);
-    if (!(*devFwOps)) {
+    if (!(*devFwOps))
+    {
         return false;
     }
     return true;
@@ -748,17 +850,23 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams)
     _fwParams.cx3FwAccess = fwParams.cx3FwAccess;
     _fwParams.errBuff = (char*)NULL;
     _fwParams.errBuffSize = 0;
-    _fwParams.fileHndl = (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ? \
-                         strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) : (char*)NULL;
+    _fwParams.fileHndl =
+      (fwParams.hndlType == FHT_FW_FILE && fwParams.fileHndl) ?
+        strncpy((char*)(new char[(strlen(fwParams.fileHndl) + 1)]), fwParams.fileHndl, strlen(fwParams.fileHndl) + 1) :
+        (char*)NULL;
     // no support for flash params
     _fwParams.flashParams = (flash_params_t*)NULL;
     _fwParams.forceLock = fwParams.forceLock;
     _fwParams.ignoreCacheRep = fwParams.ignoreCacheRep;
-    _fwParams.mstHndl = (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ? \
-                        strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) : (char*)NULL;
+    _fwParams.mstHndl =
+      (fwParams.hndlType == FHT_MST_DEV && fwParams.mstHndl) ?
+        strncpy((char*)(new char[(strlen(fwParams.mstHndl) + 1)]), fwParams.mstHndl, strlen(fwParams.mstHndl) + 1) :
+        (char*)NULL;
     _fwParams.noFlashVerify = fwParams.noFlashVerify;
     _fwParams.numOfBanks = fwParams.numOfBanks;
-    _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid, strlen(fwParams.psid) + 1) : (char*)NULL;
+    _fwParams.psid = fwParams.psid ? strncpy((char*)(new char[(strlen(fwParams.psid) + 1)]), fwParams.psid,
+                                             strlen(fwParams.psid) + 1) :
+                                     (char*)NULL;
     _fwParams.readOnly = fwParams.readOnly;
     _fwParams.shortErrors = fwParams.shortErrors;
     _fwParams.uefiExtra = fwParams.uefiExtra;
@@ -767,8 +875,10 @@ void FwOperations::BackUpFwParams(fw_ops_params_t& fwParams)
     _fwParams.ignoreCrcCheck = fwParams.ignoreCrcCheck;
 }
 
-const char* file_handle_type_to_str(fw_hndl_type_t type) {
-    switch(type) {
+const char* file_handle_type_to_str(fw_hndl_type_t type)
+{
+    switch (type)
+    {
         case FHT_MST_DEV:
             return "MST_DEVICE";
         case FHT_FW_FILE:
@@ -787,186 +897,226 @@ const char* file_handle_type_to_str(fw_hndl_type_t type) {
 FwOperations* FwOperations::FwOperationsCreate(fw_ops_params_t& fwParams)
 {
     DPRINTF(("FwOperations::FwOperationsCreate\n"));
-    FwOperations *fwops;
+    FwOperations* fwops;
     u_int8_t fwFormat;
-    FBase *ioAccess = (FBase*)NULL;
-    FwCompsMgr *fwCompsAccess = (FwCompsMgr*)NULL;
+    FBase* ioAccess = (FBase*)NULL;
+    FwCompsMgr* fwCompsAccess = (FwCompsMgr*)NULL;
     bool getFwFormatFromImg = false;
 #ifdef CABLES_SUPP
-    if (fwParams.hndlType == FHT_CABLE_DEV) {
+    if (fwParams.hndlType == FHT_CABLE_DEV)
+    {
         fwops = new CableFwOperations(fwParams.mstHndl);
-        if (!fwops->FwInit()) {
+        if (!fwops->FwInit())
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)fwops->err(), fwParams.errBuffSize);
             delete fwops;
             return (FwOperations*)NULL;
         }
         fwops->_devName = strcpy(new char[strlen(fwParams.mstHndl) + 1], fwParams.mstHndl);
-    } else
+    }
+    else
 #endif
     {
         if ((!fwParams.ignoreCacheRep && !fwParams.noFwCtrl && fwParams.hndlType == FHT_MST_DEV) ||
-            (fwParams.hndlType == FHT_UEFI_DEV     &&
-             !fwParams.uefiExtra.dev_info.no_fw_ctrl)) {
+            (fwParams.hndlType == FHT_UEFI_DEV && !fwParams.uefiExtra.dev_info.no_fw_ctrl))
+        {
             fw_comps_error_t fwCompsErr = FWCOMPS_SUCCESS;
-            if (fwParams.hndlType == FHT_MST_DEV) {
-                if (!fwParams.canSkipFwCtrl) {//CX3/PRO are unsupported
+            if (fwParams.hndlType == FHT_MST_DEV)
+            {
+                if (!fwParams.canSkipFwCtrl)
+                { // CX3/PRO are unsupported
                     fwCompsAccess = new FwCompsMgr(fwParams.mstHndl);
                 }
-                else {
+                else
+                {
                     fwCompsErr = FWCOMPS_UNSUPPORTED_DEVICE;
                 }
-            } else if (fwParams.hndlType == FHT_UEFI_DEV) {
+            }
+            else if (fwParams.hndlType == FHT_UEFI_DEV)
+            {
                 fwCompsAccess = new FwCompsMgr(fwParams.uefiHndl, &fwParams.uefiExtra);
             }
             // In case MCDA capability isn't supported according to MCAM, we'll have
             // fwCompsAccess object created, but with an internal error in fwCompsErr
-            if (fwCompsAccess != NULL) {
+            if (fwCompsAccess != NULL)
+            {
                 fwCompsErr = fwCompsAccess->getLastError();
             }
 
-            if (fwCompsErr != FWCOMPS_SUCCESS) {
+            if (fwCompsErr != FWCOMPS_SUCCESS)
+            {
                 bool exitOnError = false;
-                if (fwCompsErr == FWCOMPS_MTCR_OPEN_DEVICE_ERROR) {
+                if (fwCompsErr == FWCOMPS_MTCR_OPEN_DEVICE_ERROR)
+                {
                     // mtcr lib failed to open the provided device.
                     WriteToErrBuff(fwParams.errBuff, (char*)"Failed to open device", fwParams.errBuffSize);
                     exitOnError = true;
                 }
-                else if(fwCompsErr == FWCOMPS_REG_ACCESS_RES_NOT_AVLBL) {
+                else if (fwCompsErr == FWCOMPS_REG_ACCESS_RES_NOT_AVLBL)
+                {
                     WriteToErrBuff(fwParams.errBuff, (char*)fwCompsAccess->getLastErrMsg(), fwParams.errBuffSize);
                     exitOnError = true;
                 }
-                if (fwCompsAccess != NULL) {
+                if (fwCompsAccess != NULL)
+                {
                     delete fwCompsAccess;
                 }
-                fwCompsAccess = (FwCompsMgr*) NULL;
-                if (exitOnError) {
+                fwCompsAccess = (FwCompsMgr*)NULL;
+                if (exitOnError)
+                {
                     return (FwOperations*)NULL;
                 }
-            } else {
+            }
+            else
+            {
                 fwInfoT fwInfo;
-                if (fwParams.forceLock) {
+                if (fwParams.forceLock)
+                {
                     fwCompsAccess->forceRelease();
                 }
 
-                if (fwParams.mccUnsupported &&
-                    fwCompsAccess->queryFwInfo(&fwInfo) == true &&
-                    fwInfo.security_type.secure_fw == 0) {
+                if (fwParams.mccUnsupported && fwCompsAccess->queryFwInfo(&fwInfo) == true &&
+                    fwInfo.security_type.secure_fw == 0)
+                {
                     delete fwCompsAccess;
-                    fwCompsAccess = (FwCompsMgr*) NULL;
-                } else {
+                    fwCompsAccess = (FwCompsMgr*)NULL;
+                }
+                else
+                {
                     //* WA for non secured BB to work in no_fw_ctrl mode (instead of MCC) by setting fwParams.noFwCtrl=1
                     dm_dev_id_t deviceId = DeviceUnknown;
                     u_int32_t hwDevId = 0x0;
                     u_int32_t hwRevId = 0x0;
-                    if ((fwCompsAccess->getMfileObj()->flags & MDEVS_IB) == 0) {
+                    if ((fwCompsAccess->getMfileObj()->flags & MDEVS_IB) == 0)
+                    {
                         FLASH_ACCESS_DPRINTF(("Not IB interface\n"));
-                        if (dm_get_device_id(fwCompsAccess->getMfileObj(), &deviceId, &hwDevId, &hwRevId) == MFE_OK) {
+                        if (dm_get_device_id(fwCompsAccess->getMfileObj(), &deviceId, &hwDevId, &hwRevId) == MFE_OK)
+                        {
                             FLASH_ACCESS_DPRINTF(("deviceId = %s\n", dm_dev_type2str(deviceId)));
-                            if (deviceId == DeviceQuantum2) {
+                            if (deviceId == DeviceQuantum2)
+                            {
                                 FLASH_ACCESS_DPRINTF(("BB device identified\n"));
-                                if (fwCompsAccess->queryFwInfo(&fwInfo)) {
-                                    if (fwInfo.security_type.secure_fw == 0) {
-                                        FLASH_ACCESS_DPRINTF(("Non secured BB device, deleting fw comps mgr object and setting no_fw_ctrl mode\n"));
+                                if (fwCompsAccess->queryFwInfo(&fwInfo))
+                                {
+                                    if (fwInfo.security_type.secure_fw == 0)
+                                    {
+                                        FLASH_ACCESS_DPRINTF((
+                                          "Non secured BB device, deleting fw comps mgr object and setting no_fw_ctrl mode\n"));
                                         delete fwCompsAccess;
-                                        fwCompsAccess = (FwCompsMgr*) NULL;
+                                        fwCompsAccess = (FwCompsMgr*)NULL;
                                         fwParams.noFwCtrl = 1;
                                     }
-                                    else {
+                                    else
+                                    {
                                         FLASH_ACCESS_DPRINTF(("Secured BB device, using MCC flow\n"));
                                     }
                                 }
-                                else {
+                                else
+                                {
                                     FLASH_ACCESS_DPRINTF(("Failed to query fw comps mgr object\n"));
                                 }
                             }
                         }
                     }
                     //* MCC flow
-                    if (fwParams.noFwCtrl == 0) {
+                    if (fwParams.noFwCtrl == 0)
+                    {
                         FLASH_ACCESS_DPRINTF(("Flash init to use MCC flow\n"));
                         fwFormat = FS_FSCTRL_GEN;
                         goto init_fwops;
                     }
                 }
             }
-
         }
-        if (!FwAccessCreate(fwParams, &ioAccess)) {
+        if (!FwAccessCreate(fwParams, &ioAccess))
+        {
             return (FwOperations*)NULL;
         }
-        if (fwParams.hndlType == FHT_UEFI_DEV) {
+        if (fwParams.hndlType == FHT_UEFI_DEV)
+        {
             // IN UEFI we don't have an access to read devID from cr-space so we are reading it from FW  image signature
             getFwFormatFromImg = true;
         }
 
-
         fwFormat = CheckFwFormat(*ioAccess, getFwFormatFromImg);
-init_fwops:
-        switch (fwFormat) {
+    init_fwops:
+        switch (fwFormat)
+        {
 #if !defined(UEFI_BUILD)
-        case FS_FS2_GEN: {
+            case FS_FS2_GEN:
+            {
                 DPRINTF(("FS2 ops created for %s\n", file_handle_type_to_str(fwParams.hndlType)));
                 fwops = new Fs2Operations(ioAccess);
                 break;
-        }
+            }
 #endif
-        case FS_FS3_GEN: {
+            case FS_FS3_GEN:
+            {
                 DPRINTF(("FS3 ops created for %s\n", file_handle_type_to_str(fwParams.hndlType)));
                 fwops = new Fs3Operations(ioAccess);
                 break;
-        }
+            }
 
-        case FS_FS4_GEN: {
+            case FS_FS4_GEN:
+            {
                 DPRINTF(("FS4 ops created for %s\n", file_handle_type_to_str(fwParams.hndlType)));
                 fwops = new Fs4Operations(ioAccess);
                 break;
-        }
+            }
 
-        case FS_FSCTRL_GEN: {
-                if (!fwCompsAccess) {
+            case FS_FSCTRL_GEN:
+            {
+                if (!fwCompsAccess)
+                {
                     return (FwOperations*)NULL;
                 }
                 DPRINTF(("FSCTRL ops created for %s\n", file_handle_type_to_str(fwParams.hndlType)));
                 fwops = new FsCtrlOperations(fwCompsAccess);
                 break;
-        }
+            }
 
 #ifdef CABLES_SUPP
-        case FS_FC1_GEN: {
+            case FS_FC1_GEN:
+            {
                 fwops = new CableFwOperations(ioAccess);
                 break;
-        }
+            }
 
 #endif
-        default:
-            delete ioAccess;
-            WriteToErrBuff(fwParams.errBuff, (char*)"Invalid Firmware Format (found FS Gen 1)", fwParams.errBuffSize);
-            return (FwOperations*)NULL;
+            default:
+                delete ioAccess;
+                WriteToErrBuff(fwParams.errBuff, (char*)"Invalid Firmware Format (found FS Gen 1)",
+                               fwParams.errBuffSize);
+                return (FwOperations*)NULL;
         }
         // save initialization parameters
         fwops->BackUpFwParams(fwParams);
         fwops->_advErrors = !fwParams.shortErrors;
-        if (!fwops->FwInit()) {
+        if (!fwops->FwInit())
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)"FwInit has failed!", fwParams.errBuffSize);
-            delete fwops;//will also delete the fwCompsAccess! no memory leak here
+            delete fwops; // will also delete the fwCompsAccess! no memory leak here
             return NULL;
         }
-        if (!fwops->CreateSignatureManager()) {
+        if (!fwops->CreateSignatureManager())
+        {
             WriteToErrBuff(fwParams.errBuff, (char*)"Cannot create signature manager!", fwParams.errBuffSize);
-            delete fwops;//will also delete the fwCompsAccess! no memory leak here
+            delete fwops; // will also delete the fwCompsAccess! no memory leak here
             return NULL;
         }
-        if (fwParams.hndlType == FHT_FW_FILE) {
+        if (fwParams.hndlType == FHT_FW_FILE)
+        {
             fwops->_fname = strcpy(new char[strlen(fwParams.fileHndl) + 1], fwParams.fileHndl);
         }
-        if (fwParams.hndlType == FHT_MST_DEV) {
+        if (fwParams.hndlType == FHT_MST_DEV)
+        {
             fwops->_devName = strcpy(new char[strlen(fwParams.mstHndl) + 1], fwParams.mstHndl);
         }
     }
     return fwops;
 }
 
-u_int32_t FwOperations::CalcImageCRC(u_int32_t *buff, u_int32_t size)
+u_int32_t FwOperations::CalcImageCRC(u_int32_t* buff, u_int32_t size)
 {
     Crc16 crc;
     TOCPUn(buff, size);
@@ -977,14 +1127,24 @@ u_int32_t FwOperations::CalcImageCRC(u_int32_t *buff, u_int32_t size)
     return new_crc;
 }
 
-bool FwOperations::writeImageEx(ProgressCallBackEx progressFuncEx, void *progressUserData, ProgressCallBack progressFunc, u_int32_t addr, void *data, int cnt, 
-    bool isPhysAddr, bool readModifyWrite, int totalSz, int alreadyWrittenSz, bool cpuUtilization, int cpuPercent)
+bool FwOperations::writeImageEx(ProgressCallBackEx progressFuncEx,
+                                void* progressUserData,
+                                ProgressCallBack progressFunc,
+                                u_int32_t addr,
+                                void* data,
+                                int cnt,
+                                bool isPhysAddr,
+                                bool readModifyWrite,
+                                int totalSz,
+                                int alreadyWrittenSz,
+                                bool cpuUtilization,
+                                int cpuPercent)
 {
 #ifndef __WIN__
     (void)cpuUtilization;
     (void)cpuPercent;
 #endif
-    u_int8_t   *p = (u_int8_t*)data;
+    u_int8_t* p = (u_int8_t*)data;
     u_int32_t curr_addr = addr;
     u_int32_t towrite = cnt;
     u_int32_t last_percent = 0xff;
@@ -992,42 +1152,60 @@ bool FwOperations::writeImageEx(ProgressCallBackEx progressFuncEx, void *progres
     int origFlashWorkingMode = Flash::Fwm_Default;
     u_int32_t CurrentIteration = 0;
     bool rc;
-    while (towrite) {
+    while (towrite)
+    {
         // Write
         int trans;
-        if (_ioAccess->is_flash()) {
-            if (readModifyWrite) {
+        if (_ioAccess->is_flash())
+        {
+            if (readModifyWrite)
+            {
                 // perform write with the smallest supported sector size
                 origFlashWorkingMode = _ioAccess->get_flash_working_mode();
                 _ioAccess->set_flash_working_mode(Flash::Fwm_Default);
             }
-            if (cpuUtilization) {
+            if (cpuUtilization)
+            {
                 _ioAccess->set_flash_utilization(cpuUtilization, cpuPercent);
             }
             trans = (towrite > (int)Flash::TRANS) ? (int)Flash::TRANS : towrite;
-            if (isPhysAddr) {
-                if (readModifyWrite) {
+            if (isPhysAddr)
+            {
+                if (readModifyWrite)
+                {
                     rc = _ioAccess->read_modify_write_phy(curr_addr, p, trans);
-                } else {
+                }
+                else
+                {
                     rc = _ioAccess->write_phy(curr_addr, p, trans);
                 }
-            } else {
-                if (readModifyWrite) {
+            }
+            else
+            {
+                if (readModifyWrite)
+                {
                     rc = _ioAccess->read_modify_write(curr_addr, p, trans);
-                } else {
+                }
+                else
+                {
                     rc = _ioAccess->write(curr_addr, p, trans);
                 }
             }
-            if (readModifyWrite) {
+            if (readModifyWrite)
+            {
                 // restore erase sector size
                 _ioAccess->set_flash_working_mode(origFlashWorkingMode);
             }
-            if (!rc) {
+            if (!rc)
+            {
                 return errmsg(MLXFW_FLASH_WRITE_ERR, "Flash write failed: %s", _ioAccess->err());
             }
-        } else {
+        }
+        else
+        {
             trans = towrite;
-            if (!((FImage*)_ioAccess)->write(curr_addr, p, trans)) {
+            if (!((FImage*)_ioAccess)->write(curr_addr, p, trans))
+            {
                 return errmsg("%s", _ioAccess->err());
             }
         }
@@ -1036,21 +1214,27 @@ bool FwOperations::writeImageEx(ProgressCallBackEx progressFuncEx, void *progres
         towrite -= trans;
         CurrentIteration++;
 #ifdef __WIN__
-        if (cpuUtilization) {
-            if ((CurrentIteration % cpuPercent) == 0) {
+        if (cpuUtilization)
+        {
+            if ((CurrentIteration % cpuPercent) == 0)
+            {
                 msleep(500);
             }
         }
 #endif
         // Report
-        if (progressFunc != NULL || progressFuncEx != NULL) {
+        if (progressFunc != NULL || progressFuncEx != NULL)
+        {
             u_int32_t curr_percent = ((cnt - towrite + alreadyWrittenSz) * 100) / totalSz;
-            if(last_percent != curr_percent) {
+            if (last_percent != curr_percent)
+            {
                 last_percent = curr_percent;
-                if (progressFunc != NULL && progressFunc((int)curr_percent)) {
+                if (progressFunc != NULL && progressFunc((int)curr_percent))
+                {
                     return errmsg("Aborting... received interrupt signal");
                 }
-                if (progressFuncEx != NULL && progressFuncEx((int)curr_percent, progressUserData)) {
+                if (progressFuncEx != NULL && progressFuncEx((int)curr_percent, progressUserData))
+                {
                     return errmsg("Aborting... received interrupt signal");
                 }
             }
@@ -1059,19 +1243,28 @@ bool FwOperations::writeImageEx(ProgressCallBackEx progressFuncEx, void *progres
     return true;
 } //  Flash::WriteImage
 
-
-bool FwOperations::writeImage(ProgressCallBack progressFunc, u_int32_t addr, void *data, int cnt, bool isPhysAddr, bool readModifyWrite, int totalSz, int alreadyWrittenSz)
+bool FwOperations::writeImage(ProgressCallBack progressFunc,
+                              u_int32_t addr,
+                              void* data,
+                              int cnt,
+                              bool isPhysAddr,
+                              bool readModifyWrite,
+                              int totalSz,
+                              int alreadyWrittenSz)
 {
-    return writeImageEx((ProgressCallBackEx)NULL, NULL, progressFunc, addr, data, cnt, isPhysAddr, readModifyWrite, totalSz, alreadyWrittenSz);
+    return writeImageEx((ProgressCallBackEx)NULL, NULL, progressFunc, addr, data, cnt, isPhysAddr, readModifyWrite,
+                        totalSz, alreadyWrittenSz);
 }
 
 bool FwOperations::CheckMac(u_int64_t mac)
 {
-    if ((mac >> 40) & 0x1) {
+    if ((mac >> 40) & 0x1)
+    {
         return errmsg("Multicast bit (bit 40) is set");
     }
 
-    if (mac >> 48) {
+    if (mac >> 48)
+    {
         return errmsg("More than 48 bits are used");
     }
 
@@ -1080,16 +1273,16 @@ bool FwOperations::CheckMac(u_int64_t mac)
 
 bool FwOperations::CheckMac(guid_t mac)
 {
-    u_int64_t bigMac = ((u_int64_t)mac.h << 32 & 0xffffffff00000000ULL) | ((u_int64_t)mac.l & 0x00000000ffffffffULL );
+    u_int64_t bigMac = ((u_int64_t)mac.h << 32 & 0xffffffff00000000ULL) | ((u_int64_t)mac.l & 0x00000000ffffffffULL);
     return CheckMac(bigMac);
 }
 
-void FwOperations::recalcSectionCrc(u_int8_t *buf, u_int32_t data_size)
+void FwOperations::recalcSectionCrc(u_int8_t* buf, u_int32_t data_size)
 {
-
     Crc16 crc;
     u_int32_t crcRes;
-    for (u_int32_t i = 0; i < data_size; i += 4) {
+    for (u_int32_t i = 0; i < data_size; i += 4)
+    {
         crc << __be32_to_cpu(*(u_int32_t*)(buf + i));
     }
     crc.finish();
@@ -1100,10 +1293,13 @@ void FwOperations::recalcSectionCrc(u_int8_t *buf, u_int32_t data_size)
 chip_type_t FwOperations::getChipType()
 {
     int i = 0;
-    while (hwDevData[i].name != NULL) {
+    while (hwDevData[i].name != NULL)
+    {
         int j = 0;
-        while (hwDevData[i].swDevIds[j] != 0) {
-            if (hwDevData[i].swDevIds[j] == _fwImgInfo.ext_info.dev_type) {
+        while (hwDevData[i].swDevIds[j] != 0)
+        {
+            if (hwDevData[i].swDevIds[j] == _fwImgInfo.ext_info.dev_type)
+            {
                 return hwDevData[i].chipType;
             }
             j++;
@@ -1116,21 +1312,25 @@ chip_type_t FwOperations::getChipType()
 chip_type_t FwOperations::getChipType(u_int32_t devid)
 {
     int i = 0;
-    while (hwDevData[i].name != NULL) {
-            if (hwDevData[i].hwDevId == devid) {
-                return hwDevData[i].chipType;
-            }
+    while (hwDevData[i].name != NULL)
+    {
+        if (hwDevData[i].hwDevId == devid)
+        {
+            return hwDevData[i].chipType;
+        }
         i++;
     }
     return CT_UNKNOWN;
 }
 
-bool FwOperations::getInfoFromHwDevid(u_int32_t hwDevId, chip_type_t& chipT, const u_int32_t **swIds)
+bool FwOperations::getInfoFromHwDevid(u_int32_t hwDevId, chip_type_t& chipT, const u_int32_t** swIds)
 {
     int i = 0;
-    u_int32_t localDevId = hwDevId & 0xffff;//remove revison ID, it's not relevant here
-    while (hwDevData[i].name != NULL) {
-        if (hwDevData[i].hwDevId == localDevId) {
+    u_int32_t localDevId = hwDevId & 0xffff; // remove revison ID, it's not relevant here
+    while (hwDevData[i].name != NULL)
+    {
+        if (hwDevData[i].hwDevId == localDevId)
+        {
             chipT = hwDevData[i].chipType;
             *swIds = hwDevData[i].swDevIds;
             return true;
@@ -1143,8 +1343,10 @@ bool FwOperations::getInfoFromHwDevid(u_int32_t hwDevId, chip_type_t& chipT, con
 FwOperations::HwDevData FwOperations::getInfoFromChipType(chip_type_t chipT) const
 {
     int i = 0;
-    while (hwDevData[i].name != NULL) {
-        if (hwDevData[i].chipType == chipT) {
+    while (hwDevData[i].name != NULL)
+    {
+        if (hwDevData[i].chipType == chipT)
+        {
             return hwDevData[i];
         }
         i++;
@@ -1152,80 +1354,80 @@ FwOperations::HwDevData FwOperations::getInfoFromChipType(chip_type_t chipT) con
     return hwDevData[i];
 }
 
-// TODO:combine both databases(hwDevData and hwDev2Str) and remove old unsupporded devices i.e infinihost infinihost_iii_ex infinihost_iii_lx
+// TODO:combine both databases(hwDevData and hwDev2Str) and remove old unsupporded devices i.e infinihost
+// infinihost_iii_ex infinihost_iii_lx
 const FwOperations::HwDevData FwOperations::hwDevData[] = {
-    { "ConnectX",          CX2_HW_ID, CT_CONNECTX, CFT_HCA, 2,  {25408, 25418, 26418, 26438,
-                                                                 26428, 25448, 26448, 26468,
-                                                                 25458, 26458, 26478, 26488,
-                                                                 4097, 4098, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-3",        CX3_HW_ID, CT_CONNECTX, CFT_HCA, 2,  {4099, 4100, 4101, 4102,
-                                                                 4104, 4105, 4106,
-                                                                 4107, 4108, 4109, 4110,
-                                                                 4111, 4112, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-3Pro",    CX3_PRO_HW_ID, CT_CONNECTX, CFT_HCA, 2, {4103, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Connect_IB",       CONNECT_IB_HW_ID, CT_CONNECT_IB, CFT_HCA, 2, {CONNECT_IB_SW_ID, 4114, 4115, 4116,
-                                                                        4117, 4118, 4119, 4120,
-                                                                        4121, 4122, 4123, 4124, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "InfiniScale IV",   IS4_HW_ID,        CT_IS4,          CFT_SWITCH,  0, {48436, 48437, 48438, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "SwitchX",          SWITCHX_HW_ID,    CT_SWITCHX,      CFT_SWITCH,  0, {51000, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Switch_IB",        SWITCH_IB_HW_ID,  CT_SWITCH_IB,    CFT_SWITCH,  0, {52000, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-4",       CX4_HW_ID,        CT_CONNECTX4,    CFT_HCA,     0, {4115, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-4LX",     CX4LX_HW_ID,      CT_CONNECTX4_LX, CFT_HCA,     0, {4117, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-5",       CX5_HW_ID,        CT_CONNECTX5,    CFT_HCA,     0, {4119, 4121, 0}, {{CX5_LOW_BIN, {4119, 0}},
-                                                                                               {CX5_HIGH_BIN, {4119, 4121, 0}},
-                                                                                               {UNKNOWN_BIN, {0}}}},
-    { "ConnectX-6",       CX6_HW_ID,        CT_CONNECTX6,    CFT_HCA,     0, {4123, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-6DX",     CX6DX_HW_ID,      CT_CONNECTX6DX,  CFT_HCA,     0, {4125, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-6LX",     CX6LX_HW_ID,      CT_CONNECTX6LX,  CFT_HCA,     0, {4127, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-7",       CX7_HW_ID,        CT_CONNECTX7,    CFT_HCA,     0, {4129, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "ConnectX-8",       CX8_HW_ID,        CT_CONNECTX8,    CFT_HCA,     0, {4131, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "BlueField",        BF_HW_ID,         CT_BLUEFIELD,    CFT_HCA,     0, {41680, 41681, 41682, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "BlueField2",       BF2_HW_ID,        CT_BLUEFIELD2,   CFT_HCA,     0, {41684, 41685, 41686, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "BlueField3",       BF3_HW_ID,        CT_BLUEFIELD3,   CFT_HCA,     0, {41690, 41691, 41692, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Spectrum",         SPECTRUM_HW_ID,   CT_SPECTRUM,     CFT_SWITCH,  0, {52100, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Switch_IB2",       SWITCH_IB2_HW_ID, CT_SWITCH_IB2,   CFT_SWITCH,  0, {53000, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Quantum",          QUANTUM_HW_ID,    CT_QUANTUM,      CFT_SWITCH,  0, {54000, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Spectrum2",        SPECTRUM2_HW_ID,  CT_SPECTRUM2,    CFT_SWITCH,  0, {53100, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Spectrum3",        SPECTRUM3_HW_ID,  CT_SPECTRUM3,    CFT_SWITCH,  0, {53104, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Quantum2",         QUANTUM2_HW_ID,   CT_QUANTUM2,     CFT_SWITCH,  0, {54002, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Spectrum4",        SPECTRUM4_HW_ID,  CT_SPECTRUM4,    CFT_SWITCH,  0, {53120, 0}, {{UNKNOWN_BIN, {0}}}},
-    { "Gearbox",          GEARBOX_HW_ID,    CT_GEARBOX,      CFT_GEARBOX, 0, {0, 0},     {{UNKNOWN_BIN, {0}}}},
-    { "GearboxManager",   GB_MANAGER_HW_ID, CT_GEARBOX_MGR,  CFT_GEARBOX, 0, {0, 0},     {{UNKNOWN_BIN, {0}}}},
-    { "AbirGearbox",      ABIR_GB_HW_ID,    CT_ABIR_GEARBOX, CFT_GEARBOX, 0, {0, 0},     {{UNKNOWN_BIN, {0}}}},
-    { (char*)NULL,       0,                 CT_UNKNOWN,      CFT_UNKNOWN, 0, {0}, {{UNKNOWN_BIN, {0}}}},// zero devid terminator
+  {"ConnectX",
+   CX2_HW_ID,
+   CT_CONNECTX,
+   CFT_HCA,
+   2,
+   {25408, 25418, 26418, 26438, 26428, 25448, 26448, 26468, 25458, 26458, 26478, 26488, 4097, 4098, 0},
+   {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-3",
+   CX3_HW_ID,
+   CT_CONNECTX,
+   CFT_HCA,
+   2,
+   {4099, 4100, 4101, 4102, 4104, 4105, 4106, 4107, 4108, 4109, 4110, 4111, 4112, 0},
+   {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-3Pro", CX3_PRO_HW_ID, CT_CONNECTX, CFT_HCA, 2, {4103, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Connect_IB",
+   CONNECT_IB_HW_ID,
+   CT_CONNECT_IB,
+   CFT_HCA,
+   2,
+   {CONNECT_IB_SW_ID, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, 4123, 4124, 0},
+   {{UNKNOWN_BIN, {0}}}},
+  {"InfiniScale IV", IS4_HW_ID, CT_IS4, CFT_SWITCH, 0, {48436, 48437, 48438, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"SwitchX", SWITCHX_HW_ID, CT_SWITCHX, CFT_SWITCH, 0, {51000, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Switch_IB", SWITCH_IB_HW_ID, CT_SWITCH_IB, CFT_SWITCH, 0, {52000, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-4", CX4_HW_ID, CT_CONNECTX4, CFT_HCA, 0, {4115, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-4LX", CX4LX_HW_ID, CT_CONNECTX4_LX, CFT_HCA, 0, {4117, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-5",
+   CX5_HW_ID,
+   CT_CONNECTX5,
+   CFT_HCA,
+   0,
+   {4119, 4121, 0},
+   {{CX5_LOW_BIN, {4119, 0}}, {CX5_HIGH_BIN, {4119, 4121, 0}}, {UNKNOWN_BIN, {0}}}},
+  {"ConnectX-6", CX6_HW_ID, CT_CONNECTX6, CFT_HCA, 0, {4123, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-6DX", CX6DX_HW_ID, CT_CONNECTX6DX, CFT_HCA, 0, {4125, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-6LX", CX6LX_HW_ID, CT_CONNECTX6LX, CFT_HCA, 0, {4127, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-7", CX7_HW_ID, CT_CONNECTX7, CFT_HCA, 0, {4129, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"ConnectX-8", CX8_HW_ID, CT_CONNECTX8, CFT_HCA, 0, {4131, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"BlueField", BF_HW_ID, CT_BLUEFIELD, CFT_HCA, 0, {41680, 41681, 41682, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"BlueField2", BF2_HW_ID, CT_BLUEFIELD2, CFT_HCA, 0, {41684, 41685, 41686, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"BlueField3", BF3_HW_ID, CT_BLUEFIELD3, CFT_HCA, 0, {41690, 41691, 41692, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Spectrum", SPECTRUM_HW_ID, CT_SPECTRUM, CFT_SWITCH, 0, {52100, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Switch_IB2", SWITCH_IB2_HW_ID, CT_SWITCH_IB2, CFT_SWITCH, 0, {53000, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Quantum", QUANTUM_HW_ID, CT_QUANTUM, CFT_SWITCH, 0, {54000, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Spectrum2", SPECTRUM2_HW_ID, CT_SPECTRUM2, CFT_SWITCH, 0, {53100, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Spectrum3", SPECTRUM3_HW_ID, CT_SPECTRUM3, CFT_SWITCH, 0, {53104, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Quantum2", QUANTUM2_HW_ID, CT_QUANTUM2, CFT_SWITCH, 0, {54002, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Spectrum4", SPECTRUM4_HW_ID, CT_SPECTRUM4, CFT_SWITCH, 0, {53120, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Gearbox", GEARBOX_HW_ID, CT_GEARBOX, CFT_GEARBOX, 0, {0, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"GearboxManager", GB_MANAGER_HW_ID, CT_GEARBOX_MGR, CFT_GEARBOX, 0, {0, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"AbirGearbox", ABIR_GB_HW_ID, CT_ABIR_GEARBOX, CFT_GEARBOX, 0, {0, 0}, {{UNKNOWN_BIN, {0}}}},
+  {(char*)NULL, 0, CT_UNKNOWN, CFT_UNKNOWN, 0, {0}, {{UNKNOWN_BIN, {0}}}}, // zero devid terminator
 };
 
 const FwOperations::HwDev2Str FwOperations::hwDev2Str[] = {
-    {"ConnectX-2",        CX2_HW_ID,        0xB0},
-    {"ConnectIB",         CONNECT_IB_HW_ID, 0x00},
-    {"ConnectX-3 A0",     CX3_HW_ID,        0x00},
-    {"ConnectX-3 A1",     CX3_HW_ID,        0x01},
-    {"ConnectX-3Pro",     CX3_PRO_HW_ID,    0x00},
-    {"ConnectX-4",        CX4_HW_ID,        0x00},
-    {"ConnectX-4LX",      CX4LX_HW_ID,      0x00},
-    {"ConnectX-5",        CX5_HW_ID,        0x00},
-    {"ConnectX-6",        CX6_HW_ID,        0x00},
-    {"ConnectX-6DX",      CX6DX_HW_ID,      0x00},
-    {"ConnectX-6LX",      CX6LX_HW_ID,      0x00},
-    {"ConnectX-7",        CX7_HW_ID,        0x00},
-    {"ConnectX-8",        CX8_HW_ID,        0x00},
-    {"BlueField",         BF_HW_ID,         0x00},
-    {"BlueField2",        BF2_HW_ID,        0x00},
-    {"BlueField3",        BF3_HW_ID,        0x00},
-    {"SwitchX A0",        SWITCHX_HW_ID,    0x00},
-    {"SwitchX A1",        SWITCHX_HW_ID,    0x01},
-    {"InfiniScale IV A0", IS4_HW_ID,        0xA0},
-    {"InfiniScale IV A1", IS4_HW_ID,        0xA1},
-    {"SwitchIB A0",       SWITCH_IB_HW_ID,  0x00},
-    {"Spectrum A0",       SPECTRUM_HW_ID,   0x00},
-    {"SwitchIB2 A0",      SWITCH_IB2_HW_ID, 0x00},
-    {"Quantum A0",        QUANTUM_HW_ID,    0x00},
-    {"Spectrum A1",       SPECTRUM_HW_ID,   0x01},
-    {"Spectrum2 A0",      SPECTRUM2_HW_ID,  0x00},
-    {"Spectrum3 A0",      SPECTRUM3_HW_ID,  0x00},
-    {"Quantum2 A0",       QUANTUM2_HW_ID,    0x00},
-    {"Spectrum4 A0",      SPECTRUM4_HW_ID,   0x00},
-    { (char*)NULL,       (u_int32_t)0, (u_int8_t)0x00},      // zero device ID terminator
+  {"ConnectX-2", CX2_HW_ID, 0xB0},          {"ConnectIB", CONNECT_IB_HW_ID, 0x00},
+  {"ConnectX-3 A0", CX3_HW_ID, 0x00},       {"ConnectX-3 A1", CX3_HW_ID, 0x01},
+  {"ConnectX-3Pro", CX3_PRO_HW_ID, 0x00},   {"ConnectX-4", CX4_HW_ID, 0x00},
+  {"ConnectX-4LX", CX4LX_HW_ID, 0x00},      {"ConnectX-5", CX5_HW_ID, 0x00},
+  {"ConnectX-6", CX6_HW_ID, 0x00},          {"ConnectX-6DX", CX6DX_HW_ID, 0x00},
+  {"ConnectX-6LX", CX6LX_HW_ID, 0x00},      {"ConnectX-7", CX7_HW_ID, 0x00},
+  {"ConnectX-8", CX8_HW_ID, 0x00},          {"BlueField", BF_HW_ID, 0x00},
+  {"BlueField2", BF2_HW_ID, 0x00},          {"BlueField3", BF3_HW_ID, 0x00},
+  {"SwitchX A0", SWITCHX_HW_ID, 0x00},      {"SwitchX A1", SWITCHX_HW_ID, 0x01},
+  {"InfiniScale IV A0", IS4_HW_ID, 0xA0},   {"InfiniScale IV A1", IS4_HW_ID, 0xA1},
+  {"SwitchIB A0", SWITCH_IB_HW_ID, 0x00},   {"Spectrum A0", SPECTRUM_HW_ID, 0x00},
+  {"SwitchIB2 A0", SWITCH_IB2_HW_ID, 0x00}, {"Quantum A0", QUANTUM_HW_ID, 0x00},
+  {"Spectrum A1", SPECTRUM_HW_ID, 0x01},    {"Spectrum2 A0", SPECTRUM2_HW_ID, 0x00},
+  {"Spectrum3 A0", SPECTRUM3_HW_ID, 0x00},  {"Quantum2 A0", QUANTUM2_HW_ID, 0x00},
+  {"Spectrum4 A0", SPECTRUM4_HW_ID, 0x00},  {(char*)NULL, (u_int32_t)0, (u_int8_t)0x00}, // zero device ID terminator
 };
 
 chip_type FwOperations::GetChipType(string chip)
@@ -1282,21 +1484,25 @@ chip_type FwOperations::GetChipType(string chip)
         return CT_GEARBOX;
     else if (chip == "CT_GEARBOX_MGR")
         return CT_GEARBOX_MGR;
-    else return CT_UNKNOWN;
+    else
+        return CT_UNKNOWN;
 }
 
 #define ARR_SIZE(arr) sizeof(arr) / sizeof(arr[0])
 #define MAX_HW_NAME_LEN 100
-bool FwOperations::HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char *hw_name)
+bool FwOperations::HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char* hw_name)
 {
+    for (int i = 0; hwDev2Str[i].hwDevId != 0; i++)
+    {
+        const HwDev2Str* hwDev2StrMem = &(hwDev2Str[i]);
 
-    for (int i = 0; hwDev2Str[i].hwDevId != 0; i++) {
-        const HwDev2Str *hwDev2StrMem = &(hwDev2Str[i]);
-
-        if (hwDev2StrMem->hwDevId == hw_id && hwDev2StrMem->revId == rev_id) {
+        if (hwDev2StrMem->hwDevId == hw_id && hwDev2StrMem->revId == rev_id)
+        {
             int len = strlen(hwDev2StrMem->name);
-            if (len >= MAX_HW_NAME_LEN) {
-                return errmsg("Internal error: Length of device name: %d exceeds the maximum allowed size: %d", len, MAX_HW_NAME_LEN - 1);
+            if (len >= MAX_HW_NAME_LEN)
+            {
+                return errmsg("Internal error: Length of device name: %d exceeds the maximum allowed size: %d", len,
+                              MAX_HW_NAME_LEN - 1);
             }
             strcpy(hw_name, hwDev2StrMem->name);
             return true;
@@ -1307,76 +1513,92 @@ bool FwOperations::HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char *hw_name
     return true;
 }
 
-
 // This function gets the HW ID of the target device and the dev ID from
 // the image. It then matches the 2 IDs and returns an error in case of
 // mismatch. The match is not 1:1 , since the FW image contains the SW
 // dev id, and a single hw dev id may match multiple SW dev IDs.
 //
-bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_int32_t *supportedHwId, u_int32_t supportedHwIdNum)
+bool FwOperations::CheckMatchingHwDevId(u_int32_t hwDevId,
+                                        u_int32_t rev_id,
+                                        u_int32_t* supportedHwId,
+                                        u_int32_t supportedHwIdNum)
 {
-
     char supp_hw_id_list[MAX_NUM_SUPP_HW_LIST_STR] = {'\0'};
     char curr_hw_id_name[MAX_HW_NAME_LEN];
 
-    for (u_int32_t i = 0; i < supportedHwIdNum; i++) {
+    for (u_int32_t i = 0; i < supportedHwIdNum; i++)
+    {
         u_int32_t currSupportedHwId = supportedHwId[i];
-        u_int32_t supp_hw_id  = currSupportedHwId & 0xffff;
+        u_int32_t supp_hw_id = currSupportedHwId & 0xffff;
         u_int32_t supp_rev_id = (currSupportedHwId >> 16) & 0xff;
         u_int32_t tmp_size_of_list;
         char hw_name[MAX_HW_NAME_LEN];
 
-        if (currSupportedHwId == 0) {
+        if (currSupportedHwId == 0)
+        {
             break;
         }
         // Check if device is supported!
-        if (supp_hw_id == hwDevId && supp_rev_id == rev_id) {
+        if (supp_hw_id == hwDevId && supp_rev_id == rev_id)
+        {
             return true;
         }
-        // Append checked to list of supported device in order to print it in the error if we this device is not supported
+        // Append checked to list of supported device in order to print it in the error if we this device is not
+        // supported
 
         // Get the HW name of current supported HW ID
-        if (!HWIdRevToName(supp_hw_id, supp_rev_id, hw_name)) {
+        if (!HWIdRevToName(supp_hw_id, supp_rev_id, hw_name))
+        {
             return false;
         }
         // Check if we don't exceed the array size we have
         tmp_size_of_list = strlen(supp_hw_id_list) + strlen(hw_name) + 2;
-        if (tmp_size_of_list >= MAX_NUM_SUPP_HW_LIST_STR) {
+        if (tmp_size_of_list >= MAX_NUM_SUPP_HW_LIST_STR)
+        {
             return errmsg("Internal error: Size of supported devs list: %d exceeds the maximum allowed size: %d",
                           tmp_size_of_list, MAX_NUM_SUPP_HW_LIST_STR - 1);
         }
 
-        if (supp_hw_id_list[0] == '\0') {
+        if (supp_hw_id_list[0] == '\0')
+        {
             sprintf(supp_hw_id_list, "%s", hw_name);
-        } else {
+        }
+        else
+        {
             strcat(supp_hw_id_list, ", ");
             strcat(supp_hw_id_list, hw_name);
         }
     }
     // If we get here, this FW cannot be burnt in the current device.
     // Get the Device name
-    if (!HWIdRevToName(hwDevId, rev_id, curr_hw_id_name)) {
+    if (!HWIdRevToName(hwDevId, rev_id, curr_hw_id_name))
+    {
         return false;
     }
 
-    return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR, "FW image file cannot be programmed to device %s, it is intended for: %s only",
-                  curr_hw_id_name, supp_hw_id_list);
+    return errmsg(MLXFW_DEVICE_IMAGE_MISMATCH_ERR,
+                  "FW image file cannot be programmed to device %s, it is intended for: %s only", curr_hw_id_name,
+                  supp_hw_id_list);
 }
 bool FwOperations::CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId)
 {
-
-    const HwDevData *devData = (const HwDevData*)NULL;
-    const char *hwDevName = (const char*)NULL;
+    const HwDevData* devData = (const HwDevData*)NULL;
+    const char* hwDevName = (const char*)NULL;
 
     // First, find the HW device that the SW id matches
-    for (int i = 0; hwDevData[i].hwDevId != 0; i++) {
-        if (hwDevData[i].hwDevId == hwDevId) {
+    for (int i = 0; hwDevData[i].hwDevId != 0; i++)
+    {
+        if (hwDevData[i].hwDevId == hwDevId)
+        {
             hwDevName = hwDevData[i].name; // TODO: Check bug if device not found
         }
 
-        if (devData == NULL) {
-            for (int j = 0; hwDevData[i].swDevIds[j]; j++) {
-                if (hwDevData[i].swDevIds[j] == imageDevId) {
+        if (devData == NULL)
+        {
+            for (int j = 0; hwDevData[i].swDevIds[j]; j++)
+            {
+                if (hwDevData[i].swDevIds[j] == imageDevId)
+                {
                     devData = &hwDevData[i];
                     break;
                 }
@@ -1384,14 +1606,14 @@ bool FwOperations::CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId)
         }
     }
 
-    if (devData == NULL) {
-        report_warn("Unknown device id (%d) in the given FW image. Skipping HW match check.\n",
-                    imageDevId);
+    if (devData == NULL)
+    {
+        report_warn("Unknown device id (%d) in the given FW image. Skipping HW match check.\n", imageDevId);
         return true;
-    } else if (devData->hwDevId != hwDevId) {
-        return errmsg("Trying to burn a \"%s\" image on a \"%s\" device.",
-                      devData->name,
-                      hwDevName);
+    }
+    else if (devData->hwDevId != hwDevId)
+    {
+        return errmsg("Trying to burn a \"%s\" image on a \"%s\" device.", devData->name, hwDevName);
     }
 
     return true;
@@ -1399,21 +1621,28 @@ bool FwOperations::CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId)
 
 bool FwOperations::CheckMatchingBinning(u_int32_t hwDevId, BinIdT binningVal, u_int32_t imageDevId)
 {
-    const HwDevData *devData = (const HwDevData*)NULL;
+    const HwDevData* devData = (const HwDevData*)NULL;
 
     // First, find the HW device that the Hw id matches
-    for (int i = 0; hwDevData[i].hwDevId != 0; i++) {
-        if (hwDevData[i].hwDevId == hwDevId) {
+    for (int i = 0; hwDevData[i].hwDevId != 0; i++)
+    {
+        if (hwDevData[i].hwDevId == hwDevId)
+        {
             devData = &hwDevData[i];
         }
     }
-    if (devData != NULL) {
+    if (devData != NULL)
+    {
         // Find the bin speed and match its SW ID to the ImageDevID
-        for (int j = 0; devData->binningId[j].binId != UNKNOWN_BIN; j++) {
-            if (devData->binningId[j].binId == binningVal) {
+        for (int j = 0; devData->binningId[j].binId != UNKNOWN_BIN; j++)
+        {
+            if (devData->binningId[j].binId == binningVal)
+            {
                 int k = 0;
-                while (devData->binningId[j].swId[k] != 0) {
-                    if (imageDevId == devData->binningId[j].swId[k]) {
+                while (devData->binningId[j].swId[k] != 0)
+                {
+                    if (imageDevId == devData->binningId[j].swId[k])
+                    {
                         return true;
                     }
                     k++;
@@ -1425,9 +1654,10 @@ bool FwOperations::CheckMatchingBinning(u_int32_t hwDevId, BinIdT binningVal, u_
     return true;
 }
 
-void FwOperations::FwDebugPrint(char *str)
+void FwOperations::FwDebugPrint(char* str)
 {
-    if (_printFunc != NULL) {
+    if (_printFunc != NULL)
+    {
         _printFunc(str);
     }
 }
@@ -1438,26 +1668,30 @@ bool FwOperations::FwSetPrint(PrintCallBack PrintFunc)
     return true;
 }
 
-bool FwOperations::CheckPSID(FwOperations &imageOps, u_int8_t allow_psid_change)
+bool FwOperations::CheckPSID(FwOperations& imageOps, u_int8_t allow_psid_change)
 {
-    if (!allow_psid_change) {
-        if (strncmp( _fwImgInfo.ext_info.psid, imageOps._fwImgInfo.ext_info.psid, PSID_LEN)) {
-            return errmsg(MLXFW_PSID_MISMATCH_ERR, "Image PSID is %s, it cannot be burnt into current device (PSID: %s)",
+    if (!allow_psid_change)
+    {
+        if (strncmp(_fwImgInfo.ext_info.psid, imageOps._fwImgInfo.ext_info.psid, PSID_LEN))
+        {
+            return errmsg(MLXFW_PSID_MISMATCH_ERR,
+                          "Image PSID is %s, it cannot be burnt into current device (PSID: %s)",
                           imageOps._fwImgInfo.ext_info.psid, _fwImgInfo.ext_info.psid);
         }
     }
     return true;
 }
 
-bool FwOperations::CheckFwVersion(FwOperations &imageOps,
-        u_int8_t forceVersion) {
-    if (!forceVersion) {
-        FwVersion current(createFwVersion(&_fwImgInfo.ext_info)), image(
-                createFwVersion(&imageOps._fwImgInfo.ext_info));
-        if (current.are_same_branch(image)) {
-            if (current >= image) {
-                return errmsg(MLXFW_FW_ALREADY_UPDATED_ERR,
-                        "FW is already updated.");
+bool FwOperations::CheckFwVersion(FwOperations& imageOps, u_int8_t forceVersion)
+{
+    if (!forceVersion)
+    {
+        FwVersion current(createFwVersion(&_fwImgInfo.ext_info)), image(createFwVersion(&imageOps._fwImgInfo.ext_info));
+        if (current.are_same_branch(image))
+        {
+            if (current >= image)
+            {
+                return errmsg(MLXFW_FW_ALREADY_UPDATED_ERR, "FW is already updated.");
             }
         }
     }
@@ -1466,12 +1700,18 @@ bool FwOperations::CheckFwVersion(FwOperations &imageOps,
 
 bool FwOperations::FwSwReset()
 {
-    if (msw_reset(getMfileObj())) {
-        if (errno == EPERM) {
+    if (msw_reset(getMfileObj()))
+    {
+        if (errno == EPERM)
+        {
             return errmsg("operation supported only for IB switches.");
-        } else if (errno == OP_NOT_SUPPORTED) {
+        }
+        else if (errno == OP_NOT_SUPPORTED)
+        {
             return errmsg("operation supported only for un-managed switches.");
-        } else {
+        }
+        else
+        {
             return errmsg("operation failed, errno - %d.", errno);
         }
     }
@@ -1479,12 +1719,16 @@ bool FwOperations::FwSwReset()
     return true;
 }
 
-void FwOperations::WriteToErrBuff(char *errBuff, char *errStr, int bufSize)
+void FwOperations::WriteToErrBuff(char* errBuff, char* errStr, int bufSize)
 {
-    if (bufSize > 0) {
-        if (bufSize > (int)strlen(errStr)) {
+    if (bufSize > 0)
+    {
+        if (bufSize > (int)strlen(errStr))
+        {
             strncpy(errBuff, errStr, bufSize);
-        } else {
+        }
+        else
+        {
             strncpy(errBuff, errStr, bufSize - 4);
             strcpy(&errBuff[bufSize - 4], "...");
         }
@@ -1492,24 +1736,23 @@ void FwOperations::WriteToErrBuff(char *errBuff, char *errStr, int bufSize)
     return;
 }
 
-bool FwOperations::UpdateImgCache(u_int8_t *buff, u_int32_t addr, u_int32_t size)
+bool FwOperations::UpdateImgCache(u_int8_t* buff, u_int32_t addr, u_int32_t size)
 {
-    //avoid compiler warrnings
+    // avoid compiler warrnings
     (void)buff;
     (void)addr;
     (void)size;
-    //in FS2 we dont have ImgCache, just in FS3 so we define a defult behaviour.
+    // in FS2 we dont have ImgCache, just in FS3 so we define a defult behaviour.
     return true;
 }
 
 bool FwOperations::CntxEthOnly(u_int32_t devid)
 {
-    return (devid == 25448) ||      // ETH
-           (devid == 26448) ||      // ETH
-           (devid == 25458) ||      //
-           (devid == 26458) ||      //
-           (devid == 26468) ||
-           (devid == 26478);
+    return (devid == 25448) || // ETH
+           (devid == 26448) || // ETH
+           (devid == 25458) || //
+           (devid == 26458) || //
+           (devid == 26468) || (devid == 26478);
 }
 
 // RomInfo implementation
@@ -1518,7 +1761,8 @@ FwOperations::RomInfo::RomInfo(const std::vector<u_int8_t>& romSector, bool resE
 {
     expRomFound = !romSector.empty();
     romSect = romSector;
-    if (resEndi) {
+    if (resEndi)
+    {
         TOCPUn(&romSect[0], romSect.size() / 4);
     }
     numOfExpRom = 0;
@@ -1531,10 +1775,10 @@ FwOperations::RomInfo::RomInfo(const std::vector<u_int8_t>& romSector, bool resE
     memset(&romsInfo, 0, (sizeof(rom_info_t) * MAX_ROMS_NUM));
 }
 
-
-bool FwOperations::RomInfo::initRomsInfo(roms_info_t * info)
+bool FwOperations::RomInfo::initRomsInfo(roms_info_t* info)
 {
-    if (info == NULL) {
+    if (info == NULL)
+    {
         return errmsg("invalid roms_info_t pointer.");
     }
     info->exp_rom_found = expRomFound;
@@ -1543,20 +1787,23 @@ bool FwOperations::RomInfo::initRomsInfo(roms_info_t * info)
     info->exp_rom_com_devid = expRomComDevid;
     info->exp_rom_warning = expRomWarning;
     info->exp_rom_err_msg_valid = expRomErrMsgValid;
-    //copy strings and rom_info
-    for (int i = 0; i < MAX_ROM_ERR_MSG_LEN; i++) {
+    // copy strings and rom_info
+    for (int i = 0; i < MAX_ROM_ERR_MSG_LEN; i++)
+    {
         info->exp_rom_warning_msg[i] = expRomWarningMsg[i];
         info->exp_rom_err_msg[i] = expRomErrMsg[i];
     }
-    for (int i = 0; i < MAX_ROMS_NUM; i++) {
-        //copy rom_info struct
+    for (int i = 0; i < MAX_ROMS_NUM; i++)
+    {
+        // copy rom_info struct
         info->rom_info[i].exp_rom_product_id = romsInfo[i].exp_rom_product_id; // 0 - invalid.
         info->rom_info[i].exp_rom_dev_id = romsInfo[i].exp_rom_dev_id;
         info->rom_info[i].exp_rom_supp_cpu_arch = romsInfo[i].exp_rom_supp_cpu_arch;
         info->rom_info[i].exp_rom_port = romsInfo[i].exp_rom_port;
         info->rom_info[i].exp_rom_proto = romsInfo[i].exp_rom_proto;
         info->rom_info[i].exp_rom_num_ver_fields = romsInfo[i].exp_rom_num_ver_fields;
-        for (int j = 0; j < 3; j++) {
+        for (int j = 0; j < 3; j++)
+        {
             info->rom_info[i].exp_rom_ver[j] = romsInfo[i].exp_rom_ver[j];
         }
     }
@@ -1566,17 +1813,18 @@ bool FwOperations::RomInfo::initRomsInfo(roms_info_t * info)
 
 bool FwOperations::RomInfo::ParseInfo()
 {
-    if (!GetExpRomVersion()) {
-        snprintf(expRomErrMsg, MAX_ROM_ERR_MSG_LEN, "%s",  err());
+    if (!GetExpRomVersion())
+    {
+        snprintf(expRomErrMsg, MAX_ROM_ERR_MSG_LEN, "%s", err());
         expRomErrMsgValid = true;
-        //printf("-D-expRomErrMsg: %s \n", expRomErrMsg);
-    }
-    //printf("-D- expRomFound: %d   \n",expRomFound);
-    //printf("-D- numOfExpRom: %d   \n",numOfExpRom);
-    //printf("-D- noRomChecksum: %d   \n",noRomChecksum);
-    //printf("-D- expRomComDevid: %d   \n",expRomComDevid);
-    //printf("-D- expRomWarning: %d   \n",expRomWarning);
-    //printf("-D- expRomErrMsgValid: %d   \n",expRomErrMsgValid);
+        // printf("-D-expRomErrMsg: %s \n", expRomErrMsg);
+    }
+    // printf("-D- expRomFound: %d   \n",expRomFound);
+    // printf("-D- numOfExpRom: %d   \n",numOfExpRom);
+    // printf("-D- noRomChecksum: %d   \n",noRomChecksum);
+    // printf("-D- expRomComDevid: %d   \n",expRomComDevid);
+    // printf("-D- expRomWarning: %d   \n",expRomWarning);
+    // printf("-D- expRomErrMsgValid: %d   \n",expRomErrMsgValid);
     return true;
 }
 
@@ -1594,7 +1842,8 @@ bool FwOperations::RomInfo::GetExpRomVersion()
     // of rom, no mlxsign: string will appear
     magicString[magicLen - 1] = ':';
 
-    if (romSect.empty()) {
+    if (romSect.empty())
+    {
         return errmsg("Expansion Rom section not found.");
     }
     // When checking the version of the expansion rom, only the first image has
@@ -1604,9 +1853,9 @@ bool FwOperations::RomInfo::GetExpRomVersion()
     // image.
 
     // Checksum:
-    if (romSect.size() < 4) {
-        return errmsg("ROM size (0x%x) is too small",
-                      (u_int32_t) romSect.size());
+    if (romSect.size() < 4)
+    {
+        return errmsg("ROM size (0x%x) is too small", (u_int32_t)romSect.size());
     }
 
     // restore endianess is done in the constructor if needed.
@@ -1615,22 +1864,28 @@ bool FwOperations::RomInfo::GetExpRomVersion()
     // We will look for the magic string in whole ROM instead of the first part of it.
     romChecksumRange = romSect.size();
 
-    for (u_int32_t i = 0; i < romChecksumRange; i++) {
-        for (u_int32_t j = 0; j < magicLen; j++) {
-            if (romSect[i + j] != magicString[j]) {
+    for (u_int32_t i = 0; i < romChecksumRange; i++)
+    {
+        for (u_int32_t j = 0; j < magicLen; j++)
+        {
+            if (romSect[i + j] != magicString[j])
+            {
                 break;
-            } else if (j == magicLen - 1) {
+            }
+            else if (j == magicLen - 1)
+            {
                 magicFound = true;
             }
         }
 
-
-        if (magicFound) {
+        if (magicFound)
+        {
             // Get the ROM info after the mlxsign
             bool rc;
-            rom_info_t *currRom;
+            rom_info_t* currRom;
 
-            if (numOfExpRom == MAX_ROMS_NUM) {
+            if (numOfExpRom == MAX_ROMS_NUM)
+            {
                 expRomWarning = true;
                 snprintf(expRomWarningMsg,
                          MAX_ROM_ERR_MSG_LEN,
@@ -1643,62 +1898,70 @@ bool FwOperations::RomInfo::GetExpRomVersion()
             currRom = &(romsInfo[numOfExpRom]);
             verOffset = i + magicLen;
             rc = GetExpRomVerForOneRom(verOffset);
-            if (rc != true) {
+            if (rc != true)
+            {
                 return rc;
             }
 
             // Get the device ID and check if it mismatches with other ROMs
-            if (expRomComDevid != MISS_MATCH_DEV_ID) { // When the DevId is already mismatched, no end to any check
-                if (currRom->exp_rom_dev_id != EXP_ROM_GEN_DEVID) {  // When we have a device ID on the ROM
-                    if (expRomComDevid == EXP_ROM_GEN_DEVID) { // Update the common DevId at the first time we find ID
+            if (expRomComDevid != MISS_MATCH_DEV_ID)
+            { // When the DevId is already mismatched, no end to any check
+                if (currRom->exp_rom_dev_id != EXP_ROM_GEN_DEVID)
+                { // When we have a device ID on the ROM
+                    if (expRomComDevid == EXP_ROM_GEN_DEVID)
+                    { // Update the common DevId at the first time we find ID
                         expRomComDevid = currRom->exp_rom_dev_id;
-                    } else { // Check if we have the same IDs, if yes, continue
-                        if (currRom->exp_rom_dev_id != expRomComDevid) { // There is a mismatch between ROMs
+                    }
+                    else
+                    { // Check if we have the same IDs, if yes, continue
+                        if (currRom->exp_rom_dev_id != expRomComDevid)
+                        { // There is a mismatch between ROMs
                             expRomComDevid = MISS_MATCH_DEV_ID;
                             expRomWarning = true;
-                            snprintf(expRomWarningMsg,
-                                     MAX_ROM_ERR_MSG_LEN,
-                                     "The device IDs of the ROMs mismatched.");
+                            snprintf(expRomWarningMsg, MAX_ROM_ERR_MSG_LEN, "The device IDs of the ROMs mismatched.");
                         }
                     }
                 }
             }
 
-            magicFound = false;      // Clean the magic_found to start search for another magic string
+            magicFound = false;       // Clean the magic_found to start search for another magic string
             i += (ROM_INFO_SIZE - 1); // Increase the index to point to the end of the ROM info.
             numOfExpRom++;
         }
     }
 
     // TODO: ADD CHECKSUM CHECK
-    if (!numOfExpRom) {
+    if (!numOfExpRom)
+    {
         return errmsg("Cannot get ROM version. Signature not found.");
-
     }
 
-    if (!noRomChecksum) { // No need for checksum on some ROMs like uEFI
+    if (!noRomChecksum)
+    { // No need for checksum on some ROMs like uEFI
         u_int8_t romChecksum = 0;
         romChecksumRange = romSect[2] * 512;
-        if (romChecksumRange > romSect.size()) {
-            return errmsg(
-                "ROM size field (0x%2x) is larger than actual ROM size (0x%x)",
-                romChecksumRange, (u_int32_t) romSect.size());
-        } else if (romChecksumRange == 0) {
-            return errmsg(
-                "ROM size field is 0. Unknown ROM format or corrupted ROM.");
+        if (romChecksumRange > romSect.size())
+        {
+            return errmsg("ROM size field (0x%2x) is larger than actual ROM size (0x%x)", romChecksumRange,
+                          (u_int32_t)romSect.size());
+        }
+        else if (romChecksumRange == 0)
+        {
+            return errmsg("ROM size field is 0. Unknown ROM format or corrupted ROM.");
         }
 
-        for (u_int32_t i = 0; i < romChecksumRange; i++) {
+        for (u_int32_t i = 0; i < romChecksumRange; i++)
+        {
             romChecksum += romSect[i];
         }
 
-        if (romChecksum != 0) {
+        if (romChecksum != 0)
+        {
             expRomWarning = true;
-            snprintf(
-                expRomWarningMsg,
-                MAX_ROM_ERR_MSG_LEN,
-                "Bad ROM Checksum (0x%02x), ROM info may not be displayed correctly.",
-                romChecksum);
+            snprintf(expRomWarningMsg,
+                     MAX_ROM_ERR_MSG_LEN,
+                     "Bad ROM Checksum (0x%02x), ROM info may not be displayed correctly.",
+                     romChecksum);
         }
     }
 
@@ -1707,22 +1970,25 @@ bool FwOperations::RomInfo::GetExpRomVersion()
 
 u_int8_t FwOperations::RomInfo::getNumVerFromProdId(u_int16_t prodId)
 {
-    if (prodId == 0xF) {
+    if (prodId == 0xF)
+    {
         return 1;
-    } else {
+    }
+    else
+    {
         return 3;
     }
 }
 
 bool FwOperations::RomInfo::GetExpRomVerForOneRom(u_int32_t verOffset)
 {
-
     u_int32_t tmp;
     u_int32_t offs4;
     u_int32_t offs8;
-    rom_info_t *romInfo;
+    rom_info_t* romInfo;
 
-    if (numOfExpRom == MAX_ROMS_NUM) {
+    if (numOfExpRom == MAX_ROMS_NUM)
+    {
         expRomWarning = true;
         snprintf(expRomWarningMsg,
                  MAX_ROM_ERR_MSG_LEN,
@@ -1735,95 +2001,104 @@ bool FwOperations::RomInfo::GetExpRomVerForOneRom(u_int32_t verOffset)
     // Following mlxsign: refer to layout in Flash Programminng application note.
 
     // Get expansion rom product ID
-    tmp = __le32_to_cpu(*((u_int32_t*) &romSect[verOffset]));
-    offs4 = __le32_to_cpu(*((u_int32_t*) &romSect[verOffset + 4]));
+    tmp = __le32_to_cpu(*((u_int32_t*)&romSect[verOffset]));
+    offs4 = __le32_to_cpu(*((u_int32_t*)&romSect[verOffset + 4]));
 
     romInfo->exp_rom_product_id = tmp >> 16;
     romInfo->exp_rom_num_ver_fields = FwOperations::RomInfo::getNumVerFromProdId(romInfo->exp_rom_product_id);
 
     // Get ROM version
     romInfo->exp_rom_ver[0] = tmp & 0xff; // always valid
-    if (romInfo->exp_rom_product_id != 0xf) {
+    if (romInfo->exp_rom_product_id != 0xf)
+    {
         romInfo->exp_rom_ver[1] = offs4 >> 16 & 0xff;
         romInfo->exp_rom_ver[2] = offs4 & 0xffff;
     }
 
-    if (romInfo->exp_rom_product_id == 0x11 || romInfo->exp_rom_product_id == 0x21) {
+    if (romInfo->exp_rom_product_id == 0x11 || romInfo->exp_rom_product_id == 0x21)
+    {
         noRomChecksum = true;
     }
 
-    if (romInfo->exp_rom_product_id >= 0x10) {
-        offs8 = __le32_to_cpu(*((u_int32_t*) &romSect[verOffset + 8]));
+    if (romInfo->exp_rom_product_id >= 0x10)
+    {
+        offs8 = __le32_to_cpu(*((u_int32_t*)&romSect[verOffset + 8]));
         romInfo->exp_rom_supp_cpu_arch = (offs8 >> 8) & 0xf;
         romInfo->exp_rom_dev_id = offs8 >> 16;
-        //0x12 is CLP we have only 1 version field and no port
-        if (romInfo->exp_rom_product_id != 0x12) {
+        // 0x12 is CLP we have only 1 version field and no port
+        if (romInfo->exp_rom_product_id != 0x12)
+        {
             romInfo->exp_rom_port = (offs8 >> 12) & 0xf;
             romInfo->exp_rom_proto = offs8 & 0xff;
         }
-    } else if (romInfo->exp_rom_product_id == 0xf) {
+    }
+    else if (romInfo->exp_rom_product_id == 0xf)
+    {
         // get string length
-        u_int32_ba tmp_ba = __le32_to_cpu(*((u_int32_t*) &romSect[verOffset + 0xc]));
+        u_int32_ba tmp_ba = __le32_to_cpu(*((u_int32_t*)&romSect[verOffset + 0xc]));
         u_int32_t str_len = u_int32_t(tmp_ba.range(15, 8));
         u_int32_t sign_length = u_int32_t(tmp_ba.range(7, 0));
         u_int32_t dws_num = ((str_len + 3) / 4) + 4;
 
-        if (sign_length < dws_num) {
-            return errmsg(
-                "The Signature length (%d) and the ROM version string length (%d) are not coordinated",
-                sign_length, str_len);
+        if (sign_length < dws_num)
+        {
+            return errmsg("The Signature length (%d) and the ROM version string length (%d) are not coordinated",
+                          sign_length, str_len);
         }
 
         int svnv;
         char free_str[FREE_STR_MAX_LEN];
-        strncpy(free_str, (char*) &romSect[verOffset + 0x10], str_len);
+        strncpy(free_str, (char*)&romSect[verOffset + 0x10], str_len);
         free_str[str_len] = '\0';
-        if (sscanf((char*) free_str, "%d", &svnv) == 1) {
+        if (sscanf((char*)free_str, "%d", &svnv) == 1)
+        {
             romInfo->exp_rom_ver[0] = svnv;
         }
 
-        tmp_ba = __le32_to_cpu(*((u_int32_t*) &romSect[0x18]));
+        tmp_ba = __le32_to_cpu(*((u_int32_t*)&romSect[0x18]));
         u_int32_t dev_id_off = u_int32_t(tmp_ba.range(15, 0)) + 4;
 
-        if (dev_id_off >= romSect.size()) {
-            return errmsg(
-                "The device ID offset %#x is out of range. ROM size: %#x",
-                dev_id_off, (u_int32_t) romSect.size());
+        if (dev_id_off >= romSect.size())
+        {
+            return errmsg("The device ID offset %#x is out of range. ROM size: %#x", dev_id_off,
+                          (u_int32_t)romSect.size());
         }
 
         // get devid
-        tmp_ba = __le32_to_cpu(*((u_int32_t*) &romSect[dev_id_off]));
+        tmp_ba = __le32_to_cpu(*((u_int32_t*)&romSect[dev_id_off]));
         romInfo->exp_rom_dev_id = u_int32_t(tmp_ba.range(31, 16));
         u_int32_t vendor_id = u_int32_t(tmp_ba.range(15, 0));
 
-        if (vendor_id != MELLANOX_VENDOR_ID) {
+        if (vendor_id != MELLANOX_VENDOR_ID)
+        {
             expRomWarning = true;
-            snprintf(expRomWarningMsg,
-                     MAX_ROM_ERR_MSG_LEN,
-                     "The Exp-ROM PCI vendor ID: %#x does not match the expected value: %#x.",
-                     vendor_id, MELLANOX_VENDOR_ID);
+            snprintf(expRomWarningMsg, MAX_ROM_ERR_MSG_LEN,
+                     "The Exp-ROM PCI vendor ID: %#x does not match the expected value: %#x.", vendor_id,
+                     MELLANOX_VENDOR_ID);
         }
-
     }
     return true;
 }
 
-bool FwOperations::ReadBinFile(const char *fimage, u_int8_t*&file_data, int &file_size)
+bool FwOperations::ReadBinFile(const char* fimage, u_int8_t*& file_data, int& file_size)
 {
 #ifndef UEFI_BUILD
-    FILE *fh;
+    FILE* fh;
 
-    if ((fh = fopen(fimage, "rb")) == NULL) {
+    if ((fh = fopen(fimage, "rb")) == NULL)
+    {
         return errmsg("Can not open %s: %s\n", fimage, strerror(errno));
     }
 
-    if (fseek(fh, 0, SEEK_END) < 0) {
+    if (fseek(fh, 0, SEEK_END) < 0)
+    {
         fclose(fh);
         return errmsg("Failed to get size of the file \"%s\": %s\n", fimage, strerror(errno));
     }
 
     int read_file_size = ftell(fh);
-    if (read_file_size < 0) {
+    if (read_file_size < 0)
+    {
         fclose(fh);
         return errmsg("Failed to get size of the file \"%s\": %s\n", fimage, strerror(errno));
     }
@@ -1831,7 +2106,8 @@ bool FwOperations::ReadBinFile(const char *fimage, u_int8_t*&file_data, int &fil
 
     file_size = read_file_size;
     file_data = new u_int8_t[file_size];
-    if (fread(file_data, 1, read_file_size, fh) != (size_t)read_file_size) {
+    if (fread(file_data, 1, read_file_size, fh) != (size_t)read_file_size)
+    {
         delete[] file_data;
         fclose(fh);
         return errmsg("Failed to read from %s: %s\n", fimage, strerror(errno));
@@ -1843,42 +2119,49 @@ bool FwOperations::ReadBinFile(const char *fimage, u_int8_t*&file_data, int &fil
 #endif
 }
 
-void FwOperations::SetDevFlags(chip_type_t chipType, u_int32_t devType, fw_img_type_t fwType, bool &ibDev, bool &ethDev)
+void FwOperations::SetDevFlags(chip_type_t chipType, u_int32_t devType, fw_img_type_t fwType, bool& ibDev, bool& ethDev)
 {
-
     (void)devType;
-    if (chipType == CT_IS4) {
-        ibDev =  true;
+    if (chipType == CT_IS4)
+    {
+        ibDev = true;
         ethDev = false;
-    } else if (chipType == CT_SWITCHX) {
+    }
+    else if (chipType == CT_SWITCHX)
+    {
         ibDev = true;
         ethDev = true;
-    } else {
-        ibDev  = (fwType == FIT_FS3 && chipType != CT_SPECTRUM) || (chipType == CT_CONNECTX && !CntxEthOnly(devType));
-        ethDev = (chipType == CT_CONNECTX) || \
-                 (chipType == CT_CONNECTX4) || (chipType == CT_CONNECTX4_LX) || \
-                 (chipType == CT_CONNECTX5) || \
-                 (chipType == CT_CONNECTX6) || (chipType == CT_CONNECTX6DX) || (chipType == CT_CONNECTX6LX) || \
-                 (chipType == CT_SPECTRUM) || (chipType == CT_SPECTRUM2) || (chipType == CT_SPECTRUM3) || \
-                 (chipType == CT_CONNECTX7) || (chipType == CT_QUANTUM2) || (chipType == CT_SPECTRUM4) || \
-                 (chipType == CT_BLUEFIELD) || (chipType == CT_BLUEFIELD2) || (chipType == CT_BLUEFIELD3) || \
-                 (chipType == CT_CONNECTX8);
-    }
-
-    if ((!ibDev && !ethDev) || chipType == CT_UNKNOWN) {
+    }
+    else
+    {
+        ibDev = (fwType == FIT_FS3 && chipType != CT_SPECTRUM) || (chipType == CT_CONNECTX && !CntxEthOnly(devType));
+        ethDev = (chipType == CT_CONNECTX) || (chipType == CT_CONNECTX4) || (chipType == CT_CONNECTX4_LX) ||
+                 (chipType == CT_CONNECTX5) || (chipType == CT_CONNECTX6) || (chipType == CT_CONNECTX6DX) ||
+                 (chipType == CT_CONNECTX6LX) || (chipType == CT_SPECTRUM) || (chipType == CT_SPECTRUM2) ||
+                 (chipType == CT_SPECTRUM3) || (chipType == CT_CONNECTX7) || (chipType == CT_QUANTUM2) ||
+                 (chipType == CT_SPECTRUM4) || (chipType == CT_BLUEFIELD) || (chipType == CT_BLUEFIELD2) ||
+                 (chipType == CT_BLUEFIELD3) || (chipType == CT_CONNECTX8);
+    }
+
+    if ((!ibDev && !ethDev) || chipType == CT_UNKNOWN)
+    {
         // Unknown device id - for forward compat - assume that ConnectX is MP and
         // prev HCAs are IB only (these flags are for printing only - no real harm can be done).
         // TODO: FS2 does not mean ConnectX now.
         ibDev = true;
-        if (fwType == FIT_FS2) {
+        if (fwType == FIT_FS2)
+        {
             ethDev = true;
-        } else {
+        }
+        else
+        {
             ethDev = false;
         }
     }
 }
 
-bool FwOperations::IsFwSupportingRomModify(const FwVersion& fw_ver) {
+bool FwOperations::IsFwSupportingRomModify(const FwVersion& fw_ver)
+{
     FwVersion mod(MAJOR_MOD_ROM_FW, MINOR_MOD_ROM_FW, SUBMINOR_MOD_ROM_FW);
     // only used in connectx (FS2)
     return fw_ver.compare_master_version(mod) >= 0;
@@ -1897,64 +2180,64 @@ bool FwOperations::checkMatchingExpRomDevId(const fw_info_t& info)
     return checkMatchingExpRomDevId(info.fw_info.dev_type, info.fw_info.roms_info);
 }
 
-
 bool FwOperations::checkMatchingExpRomDevId(u_int16_t dev_type, const roms_info_t& roms_info)
 {
-    if ((roms_info.num_of_exp_rom > 0) && (dev_type)
-        && (roms_info.exp_rom_com_devid != EXP_ROM_GEN_DEVID) \
-        && (roms_info.exp_rom_com_devid != MISS_MATCH_DEV_ID)
-        && (dev_type != roms_info.exp_rom_com_devid)) {
+    if ((roms_info.num_of_exp_rom > 0) && (dev_type) && (roms_info.exp_rom_com_devid != EXP_ROM_GEN_DEVID) &&
+        (roms_info.exp_rom_com_devid != MISS_MATCH_DEV_ID) && (dev_type != roms_info.exp_rom_com_devid))
+    {
         return false;
     }
     return true;
 }
 
-
 bool FwOperations::FwWriteBlock(u_int32_t addr, std::vector<u_int8_t> dataVec, ProgressCallBack progressFunc)
 {
-    if (dataVec.empty()) {
+    if (dataVec.empty())
+    {
         return errmsg("no data to write.");
     }
     // make sure we work on device
-    if (!_ioAccess->is_flash()) {
+    if (!_ioAccess->is_flash())
+    {
         return errmsg("no flash detected.(command is only supported on flash)");
     }
 
-    //check if flash is big enough
-    if ((addr + dataVec.size()) > _ioAccess->get_effective_size()) {
+    // check if flash is big enough
+    if ((addr + dataVec.size()) > _ioAccess->get_effective_size())
+    {
         return errmsg("Writing %#x bytes from address %#x is out of flash limits (%#x bytes)\n",
-                      (unsigned int)(dataVec.size()), (unsigned int)addr, (unsigned int)_ioAccess->get_effective_size());
+                      (unsigned int)(dataVec.size()), (unsigned int)addr,
+                      (unsigned int)_ioAccess->get_effective_size());
     }
 
-    if (!writeImage(progressFunc, addr, &dataVec[0], (int)dataVec.size())) {
+    if (!writeImage(progressFunc, addr, &dataVec[0], (int)dataVec.size()))
+    {
         return false;
     }
     return true;
 };
 
-
-bool FwOperations::CreateBasicImageFromData(u_int32_t *data, u_int32_t dataSize,
-                                            FwOperations **newImgOps)
+bool FwOperations::CreateBasicImageFromData(u_int32_t* data, u_int32_t dataSize, FwOperations** newImgOps)
 {
     fwOpsParams imgOpsParams;
     memset(&imgOpsParams, 0, sizeof(imgOpsParams));
     char errBuff[1024] = {0};
 
-    imgOpsParams.psid      = (char*)NULL;
-    imgOpsParams.buffHndl  = data;
+    imgOpsParams.psid = (char*)NULL;
+    imgOpsParams.buffHndl = data;
     imgOpsParams.buffSize = dataSize;
     imgOpsParams.errBuff = errBuff;
     imgOpsParams.errBuffSize = 1024;
     imgOpsParams.hndlType = FHT_FW_BUFF;
 
     *newImgOps = FwOperationsCreate(imgOpsParams);
-    if (*newImgOps == NULL) {
-        return errmsg("Internal error: Failed to create modified image: %s",
-                      errBuff);
+    if (*newImgOps == NULL)
+    {
+        return errmsg("Internal error: Failed to create modified image: %s", errBuff);
     }
-    if (!(*newImgOps)->FwVerify((VerifyCallBack)NULL)) {
-        errmsg("Internal error: Modified image failed to verify: %s",
-               (*newImgOps)->err());
+    if (!(*newImgOps)->FwVerify((VerifyCallBack)NULL))
+    {
+        errmsg("Internal error: Modified image failed to verify: %s", (*newImgOps)->err());
         (*newImgOps)->FwCleanUp();
         delete (*newImgOps);
         return false;
@@ -1963,8 +2246,7 @@ bool FwOperations::CreateBasicImageFromData(u_int32_t *data, u_int32_t dataSize,
     return true;
 };
 
-
-bool FwOperations::FwBurnData(u_int32_t *data, u_int32_t dataSize, ProgressCallBack progressFunc)
+bool FwOperations::FwBurnData(u_int32_t* data, u_int32_t dataSize, ProgressCallBack progressFunc)
 {
     burnDataParamsT params;
     params.data = data;
@@ -1975,17 +2257,19 @@ bool FwOperations::FwBurnData(u_int32_t *data, u_int32_t dataSize, ProgressCallB
 }
 bool FwOperations::FwBurnData(burnDataParamsT& burnDataParams)
 {
-    u_int32_t *data = burnDataParams.data;
+    u_int32_t* data = burnDataParams.data;
     u_int32_t dataSize = burnDataParams.dataSize;
     ProgressCallBack progressFunc = burnDataParams.progressFunc;
-    FwOperations *newImgOps;
+    FwOperations* newImgOps;
     ExtBurnParams burnParams = ExtBurnParams();
 
-    if (!CreateBasicImageFromData(data, dataSize, &newImgOps)) {
+    if (!CreateBasicImageFromData(data, dataSize, &newImgOps))
+    {
         return false;
     }
 
-    if (burnDataParams.calcSha && !newImgOps->FwInsertSHA256((PrintCallBack)NULL)) {
+    if (burnDataParams.calcSha && !newImgOps->FwInsertSHA256((PrintCallBack)NULL))
+    {
         errmsg("Inserting SHA256/SHA512 failed: %s", newImgOps->err());
         newImgOps->FwCleanUp();
         delete newImgOps;
@@ -1994,7 +2278,8 @@ bool FwOperations::FwBurnData(burnDataParamsT& burnDataParams)
 
     burnParams.updateParamsForBasicImage(progressFunc);
 
-    if (!FwBurnAdvanced(newImgOps, burnParams)) {
+    if (!FwBurnAdvanced(newImgOps, burnParams))
+    {
         newImgOps->FwCleanUp();
         delete newImgOps;
         return errmsg("Failed to re-burn image after modify: %s", err());
@@ -2006,13 +2291,13 @@ bool FwOperations::FwBurnData(burnDataParamsT& burnDataParams)
     return true;
 }
 
-
-bool FwOperations::getRomsInfo(FBase *io, roms_info_t& romsInfo)
+bool FwOperations::getRomsInfo(FBase* io, roms_info_t& romsInfo)
 {
     std::vector<u_int8_t> romSector;
     romSector.clear();
     romSector.resize(io->get_effective_size());
-    if (!io->read(0, &romSector[0], io->get_effective_size())) {
+    if (!io->read(0, &romSector[0], io->get_effective_size()))
+    {
         return false;
     }
     RomInfo info(romSector, false);
@@ -2023,53 +2308,54 @@ bool FwOperations::getRomsInfo(FBase *io, roms_info_t& romsInfo)
 
 const char* FwOperations::expRomType2Str(u_int16_t type)
 {
-    switch (type) {
-    case 0x1:
-        return "CLP1";
+    switch (type)
+    {
+        case 0x1:
+            return "CLP1";
 
-    case 0x2:
-        return "CLP2";
+        case 0x2:
+            return "CLP2";
 
-    case 0x3:
-        return "CLP3";
+        case 0x3:
+            return "CLP3";
 
-    case 0x4:
-        return "CLP4";
+        case 0x4:
+            return "CLP4";
 
-    case 0xf:
-        return "CLP";         // hack as 0xf isnt always CLP (its type is defined in the free string inside the ROM)
+        case 0xf:
+            return "CLP"; // hack as 0xf isnt always CLP (its type is defined in the free string inside the ROM)
 
-    case 0x10:
-        return "PXE";
+        case 0x10:
+            return "PXE";
 
-    case 0x11:
-        return "UEFI";
+        case 0x11:
+            return "UEFI";
 
-    case 0x12:
-        return "CLP";
+        case 0x12:
+            return "CLP";
 
-    case 0x13:
-        return "NVMe";
+        case 0x13:
+            return "NVMe";
 
-    case 0x14:
-        return "UEFI Virtio net";
+        case 0x14:
+            return "UEFI Virtio net";
 
-    case 0x15:
-        return "UEFI Virtio blk";
+        case 0x15:
+            return "UEFI Virtio blk";
 
-    case 0x16:
-       return "PXE Virtio net";
+        case 0x16:
+            return "PXE Virtio net";
 
-    case 0x21:
-        return "FCODE";
+        case 0x21:
+            return "FCODE";
 
-    default:
-        return (const char*)NULL;
+        default:
+            return (const char*)NULL;
     }
     return (const char*)NULL;
 }
 
-bool FwOperations::FwSetCertChain(char *, u_int32_t, PrintCallBack)
+bool FwOperations::FwSetCertChain(char*, u_int32_t, PrintCallBack)
 {
     return errmsg("Operation not supported.");
 }
@@ -2106,7 +2392,9 @@ bool FwOperations::IsEncryptionSupported()
     return errmsg("IsEncryptionSupported not supported.");
 }
 
-bool FwOperations::FwBurnAdvanced(std::vector <u_int8_t> imageOps4MData, ExtBurnParams& burnParams, FwComponent::comps_ids_t ComponentId)
+bool FwOperations::FwBurnAdvanced(std::vector<u_int8_t> imageOps4MData,
+                                  ExtBurnParams& burnParams,
+                                  FwComponent::comps_ids_t ComponentId)
 {
     (void)imageOps4MData;
     (void)burnParams;
@@ -2116,13 +2404,16 @@ bool FwOperations::FwBurnAdvanced(std::vector <u_int8_t> imageOps4MData, ExtBurn
 
 bool FwOperations::PrepItocSectionsForCompare(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical)
 {
-    (void) critical;
-    (void) non_critical;
+    (void)critical;
+    (void)non_critical;
     return errmsg("Operation not supported.");
 }
 
-bool FwOperations::UpdateSection(void *new_info, fs3_section_t sect_type, bool is_sect_failsafe, 
-    CommandType cmd_type, PrintCallBack callBackFunc)
+bool FwOperations::UpdateSection(void* new_info,
+                                 fs3_section_t sect_type,
+                                 bool is_sect_failsafe,
+                                 CommandType cmd_type,
+                                 PrintCallBack callBackFunc)
 {
     (void)new_info;
     (void)sect_type;
@@ -2131,7 +2422,9 @@ bool FwOperations::UpdateSection(void *new_info, fs3_section_t sect_type, bool i
     (void)callBackFunc;
     return errmsg("Operation not supported.");
 }
-bool FwOperations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning)
+bool FwOperations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                    struct tools_open_fw_version& fwVer,
+                                    bool queryRunning)
 {
     (void)timestamp;
     (void)fwVer;
@@ -2139,7 +2432,7 @@ bool FwOperations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struc
     return errmsg("Operation not supported.");
 }
 
-Tlv_Status_t FwOperations::GetTsObj(TimeStampIFC **tsObj)
+Tlv_Status_t FwOperations::GetTsObj(TimeStampIFC** tsObj)
 {
     (void)tsObj;
     errmsg("Unsupported FW type.");
@@ -2156,7 +2449,7 @@ bool FwOperations::signForFwUpdate(const char*, const char*, PrintCallBack)
     return errmsg("signForFwUpdate not supported");
 }
 
-bool FwOperations::signForFwUpdateUsingHSM(const char *, MlxSign::OpensslEngineSigner&, PrintCallBack)
+bool FwOperations::signForFwUpdateUsingHSM(const char*, MlxSign::OpensslEngineSigner&, PrintCallBack)
 {
     return errmsg("signForFwUpdateUsingHSM not supported");
 }
@@ -2171,11 +2464,11 @@ bool FwOperations::FwSignWithHmac(const char*)
     return errmsg("FwSignWithHmac not supported");
 }
 
-bool FwOperations::signForSecureBoot(const char *, const char *, const char *)
+bool FwOperations::signForSecureBoot(const char*, const char*, const char*)
 {
     return errmsg("signForSecureBoot not supported");
 }
-bool FwOperations::signForSecureBootUsingHSM(const char *, const char *, MlxSign::OpensslEngineSigner&)
+bool FwOperations::signForSecureBootUsingHSM(const char*, const char*, MlxSign::OpensslEngineSigner&)
 {
     return errmsg("signForSecureBoot not supported");
 }
@@ -2198,11 +2491,11 @@ bool FwOperations::isEncrypted(bool& is_encrypted)
     DPRINTF(("FwOperations::isEncrypted res = FALSE\n"));
     return true;
 }
-bool FwOperations::FwExtractEncryptedImage(vector<u_int8_t>& , bool , bool , bool )
+bool FwOperations::FwExtractEncryptedImage(vector<u_int8_t>&, bool, bool, bool)
 {
     return errmsg("FwExtractEncryptedImage not supported");
 }
-bool FwOperations::burnEncryptedImage(FwOperations *, ExtBurnParams& )
+bool FwOperations::burnEncryptedImage(FwOperations*, ExtBurnParams&)
 {
     return errmsg("Burning encrypted image not supported");
 }
@@ -2219,7 +2512,6 @@ bool FwOperations::IsCriticalSection(u_int8_t sect_type)
     return errmsg("IsCriticalSection not supported");
 }
 
-
 bool FwOperations::CalcHMAC(const vector<u_int8_t>& key, const vector<u_int8_t>& data, vector<u_int8_t>& digest)
 {
     (void)key;
@@ -2228,7 +2520,10 @@ bool FwOperations::CalcHMAC(const vector<u_int8_t>& key, const vector<u_int8_t>&
     return errmsg("CalcHMAC not supported");
 }
 
-bool FwOperations::FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc, bool verbose, bool ignoreImageStart)
+bool FwOperations::FwExtract4MBImage(vector<u_int8_t>& img,
+                                     bool maskMagicPatternAndDevToc,
+                                     bool verbose,
+                                     bool ignoreImageStart)
 {
     (void)img;
     (void)maskMagicPatternAndDevToc;
@@ -2237,7 +2532,11 @@ bool FwOperations::FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatter
     return errmsg("Operation not supported");
 }
 
-bool FwOperations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t devid_t, const cx4fw_uid_entry& base_guid, const cx4fw_uid_entry& base_mac)
+bool FwOperations::RestoreDevToc(vector<u_int8_t>& img,
+                                 char* psid,
+                                 dm_dev_id_t devid_t,
+                                 const cx4fw_uid_entry& base_guid,
+                                 const cx4fw_uid_entry& base_mac)
 {
     (void)img;
     (void)psid;
@@ -2247,28 +2546,30 @@ bool FwOperations::RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t
     return errmsg("Operation not supported");
 }
 
-bool FwOperations::FwSetPublicKeys(char *fname, PrintCallBack callBackFunc)
+bool FwOperations::FwSetPublicKeys(char* fname, PrintCallBack callBackFunc)
 {
-    (void) fname;
-    (void) callBackFunc;
+    (void)fname;
+    (void)callBackFunc;
     return errmsg("Operation not supported");
 }
 
-bool FwOperations::FwSetForbiddenVersions(char *fname, PrintCallBack callBackFunc)
+bool FwOperations::FwSetForbiddenVersions(char* fname, PrintCallBack callBackFunc)
 {
-    (void) fname;
-    (void) callBackFunc;
+    (void)fname;
+    (void)callBackFunc;
     return errmsg("Operation not supported");
 }
 
 bool FwOperations::FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int8_t>& dataVec)
 {
-    if (addr + size > _ioAccess->get_effective_size()) {
+    if (addr + size > _ioAccess->get_effective_size())
+    {
         return errmsg(MLXFW_BAD_PARAM_ERR, "Reading %#x bytes from address %#x is out of flash limits (%#x bytes)\n",
                       size, (unsigned int)addr, (unsigned int)_ioAccess->get_effective_size());
     }
-    //read from flash/image
-    if (!_ioAccess->read(addr, &dataVec[0], size)) {
+    // read from flash/image
+    if (!_ioAccess->read(addr, &dataVec[0], size))
+    {
         return errmsg(MLXFW_BAD_PARAM_ERR, "%s", _ioAccess->err());
     }
     return true;
@@ -2276,56 +2577,43 @@ bool FwOperations::FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int
 
 u_int8_t FwOperations::GetFwFormatFromHwDevID(u_int32_t hwDevId)
 {
-    if ((hwDevId == CX2_HW_ID)       ||
-        ( hwDevId == CX3_HW_ID)      ||
-        ( hwDevId == IS4_HW_ID)      ||
-        ( hwDevId == SWITCHX_HW_ID)  ||
-        ( hwDevId == CX3_PRO_HW_ID)) {
+    if ((hwDevId == CX2_HW_ID) || (hwDevId == CX3_HW_ID) || (hwDevId == IS4_HW_ID) || (hwDevId == SWITCHX_HW_ID) ||
+        (hwDevId == CX3_PRO_HW_ID))
+    {
         return FS_FS2_GEN;
-    } else if ( (hwDevId == CONNECT_IB_HW_ID) ||
-                (hwDevId == SWITCH_IB_HW_ID)  ||
-                (hwDevId == CX4_HW_ID)        ||
-                (hwDevId == CX4LX_HW_ID)      ||
-                (hwDevId == SPECTRUM_HW_ID)   ||
-                (hwDevId == SWITCH_IB2_HW_ID)) {
+    }
+    else if ((hwDevId == CONNECT_IB_HW_ID) || (hwDevId == SWITCH_IB_HW_ID) || (hwDevId == CX4_HW_ID) ||
+             (hwDevId == CX4LX_HW_ID) || (hwDevId == SPECTRUM_HW_ID) || (hwDevId == SWITCH_IB2_HW_ID))
+    {
         return FS_FS3_GEN;
-    } else if (hwDevId == CX5_HW_ID ||
-               hwDevId == CX6_HW_ID ||
-               hwDevId == CX6DX_HW_ID ||
-               hwDevId == CX6LX_HW_ID ||
-               hwDevId == CX7_HW_ID ||
-               hwDevId == CX8_HW_ID ||
-               hwDevId == BF_HW_ID      ||
-               hwDevId == BF2_HW_ID      ||
-               hwDevId == BF3_HW_ID      ||
-               hwDevId == QUANTUM_HW_ID ||
-               hwDevId == QUANTUM2_HW_ID ||
-               hwDevId == SPECTRUM4_HW_ID ||
-               hwDevId == SPECTRUM2_HW_ID ||
-               hwDevId == SPECTRUM3_HW_ID ||
-               hwDevId == GEARBOX_HW_ID ||
-               hwDevId == GB_MANAGER_HW_ID ||
-               hwDevId == ABIR_GB_HW_ID) {
+    }
+    else if (hwDevId == CX5_HW_ID || hwDevId == CX6_HW_ID || hwDevId == CX6DX_HW_ID || hwDevId == CX6LX_HW_ID ||
+             hwDevId == CX7_HW_ID || hwDevId == CX8_HW_ID || hwDevId == BF_HW_ID || hwDevId == BF2_HW_ID ||
+             hwDevId == BF3_HW_ID || hwDevId == QUANTUM_HW_ID || hwDevId == QUANTUM2_HW_ID ||
+             hwDevId == SPECTRUM4_HW_ID || hwDevId == SPECTRUM2_HW_ID || hwDevId == SPECTRUM3_HW_ID ||
+             hwDevId == GEARBOX_HW_ID || hwDevId == GB_MANAGER_HW_ID || hwDevId == ABIR_GB_HW_ID)
+    {
         return FS_FS4_GEN;
     }
     return FS_UNKNOWN_IMG;
 }
 
-const char*  FwOperations::FwGetReSignMsgStr()
+const char* FwOperations::FwGetReSignMsgStr()
 {
     return (const char*)NULL;
 }
 
-bool FwOperations::TestAndSetTimeStamp(FwOperations *imageOps)
+bool FwOperations::TestAndSetTimeStamp(FwOperations* imageOps)
 {
-    if (!IS_HCA(imageOps->_fwImgInfo.ext_info.chip_type)) {//switches don't support MVTS register.
+    if (!IS_HCA(imageOps->_fwImgInfo.ext_info.chip_type))
+    { // switches don't support MVTS register.
         return true;
     }
     Tlv_Status_t rc;
     Tlv_Status_t devTsQueryRc;
     bool retRc = true;
-    TimeStampIFC *imgTsObj;
-    TimeStampIFC *devTsObj;
+    TimeStampIFC* imgTsObj;
+    TimeStampIFC* devTsObj;
     bool tsFoundOnImage = false;
     struct tools_open_ts_entry imgTs;
     struct tools_open_fw_version imgFwVer;
@@ -2336,32 +2624,40 @@ bool FwOperations::TestAndSetTimeStamp(FwOperations *imageOps)
     memset(&devTs, 0, sizeof(devTs));
     memset(&devFwVer, 0, sizeof(devFwVer));
 
-    if (_ioAccess && !_ioAccess->is_flash()) {
+    if (_ioAccess && !_ioAccess->is_flash())
+    {
         // no need to test timestamp on image
         return true;
     }
 
-    if (_fwParams.ignoreCacheRep) {
+    if (_fwParams.ignoreCacheRep)
+    {
         // direct flash access no check is needed
         return true;
     }
-    if (imageOps->_ioAccess && imageOps->_ioAccess->is_flash()) {
+    if (imageOps->_ioAccess && imageOps->_ioAccess->is_flash())
+    {
         return errmsg("TestAndSetTimeStamp bad params");
     }
-    if (imageOps->GetTsObj(&imgTsObj)) {
+    if (imageOps->GetTsObj(&imgTsObj))
+    {
         return errmsg("%s", imageOps->err());
     }
     rc = GetTsObj(&devTsObj);
-    if (rc) {
+    if (rc)
+    {
         delete imgTsObj;
         return rc == TS_TIMESTAMPING_NOT_SUPPORTED ? true : false;
     }
     // check if device supports timestamping or if device is not in livefish
     devTsQueryRc = devTsObj->queryTimeStamp(devTs, devFwVer);
-    if (devTsQueryRc == TS_TIMESTAMPING_NOT_SUPPORTED || devTsQueryRc == TS_UNSUPPORTED_ICMD_VERSION) {
+    if (devTsQueryRc == TS_TIMESTAMPING_NOT_SUPPORTED || devTsQueryRc == TS_UNSUPPORTED_ICMD_VERSION)
+    {
         retRc = true;
         goto cleanup;
-    } else if (devTsQueryRc && devTsQueryRc != TS_NO_VALID_TIMESTAMP) {
+    }
+    else if (devTsQueryRc && devTsQueryRc != TS_NO_VALID_TIMESTAMP)
+    {
         retRc = errmsg("%s", devTsObj->err());
         goto cleanup;
     }
@@ -2369,54 +2665,73 @@ bool FwOperations::TestAndSetTimeStamp(FwOperations *imageOps)
     // Option 1 image was timestampped need to try and set it on device
     // Option 2 image was not timestampped but device was timestampped
     rc = imgTsObj->queryTimeStamp(imgTs, imgFwVer);
-    if (rc == TS_OK) {
+    if (rc == TS_OK)
+    {
         tsFoundOnImage = true;
-    } else if (rc != TS_TLV_NOT_FOUND) {
+    }
+    else if (rc != TS_TLV_NOT_FOUND)
+    {
         retRc = errmsg("%s", imgTsObj->err());
         goto cleanup;
     }
 
-    if (tsFoundOnImage) {
+    if (tsFoundOnImage)
+    {
         // timestamp found on image, attempt to set it on device
         rc = devTsObj->setTimeStamp(imgTs, imgFwVer);
-        if (rc == TS_OK) {
+        if (rc == TS_OK)
+        {
             retRc = true;
-        } else {
+        }
+        else
+        {
             retRc = errmsg("%s", devTsObj->err());
         }
-    } else {
-        if (devTsQueryRc == TS_NO_VALID_TIMESTAMP) {
-            // no timestamp on image and no valid timestamp on device check if we got running timestamp if we do then fail
+    }
+    else
+    {
+        if (devTsQueryRc == TS_NO_VALID_TIMESTAMP)
+        {
+            // no timestamp on image and no valid timestamp on device check if we got running timestamp if we do then
+            // fail
             devTsQueryRc = devTsObj->queryTimeStamp(devTs, devFwVer, true);
-            if (devTsQueryRc == TS_OK) {
+            if (devTsQueryRc == TS_OK)
+            {
                 // we got running timestamp return error
-                retRc = errmsg("No valid timestamp detected. please set a valid timestamp on image/device or reset timestamps on device.");
-
-            } else if (devTsQueryRc == TS_NO_VALID_TIMESTAMP) {
+                retRc = errmsg(
+                  "No valid timestamp detected. please set a valid timestamp on image/device or reset timestamps on device.");
+            }
+            else if (devTsQueryRc == TS_NO_VALID_TIMESTAMP)
+            {
                 // timestamping not used on device.
                 retRc = true;
-            } else {
+            }
+            else
+            {
                 retRc = errmsg("%s", devTsObj->err());
             }
-        } else {
+        }
+        else
+        {
             fw_info_t fw_query;
             memset(&fw_query, 0, sizeof(fw_info_t));
-            if (!imageOps->FwQuery(&fw_query, true)) {
+            if (!imageOps->FwQuery(&fw_query, true))
+            {
                 return errmsg("Failed to query the image\n");
             }
             // we got a valid timestamp on device but not on image! compare the FW version
             if (devFwVer.fw_ver_major == fw_query.fw_info.fw_ver[0] &&
                 devFwVer.fw_ver_minor == fw_query.fw_info.fw_ver[1] &&
-                devFwVer.fw_ver_subminor == fw_query.fw_info.fw_ver[2]) {
+                devFwVer.fw_ver_subminor == fw_query.fw_info.fw_ver[2])
+            {
                 // versions match allow update
                 retRc = true;
-            } else {
-                retRc = errmsg("Stamped FW version mismatch: %d.%d.%04d differs from %d.%d.%04d", devFwVer.fw_ver_major, \
-                               devFwVer.fw_ver_minor, \
-                               devFwVer.fw_ver_subminor, \
-                               fw_query.fw_info.fw_ver[0], \
-                               fw_query.fw_info.fw_ver[1], \
-                               fw_query.fw_info.fw_ver[2]);
+            }
+            else
+            {
+                retRc = errmsg("Stamped FW version mismatch: %d.%d.%04d differs from %d.%d.%04d", devFwVer.fw_ver_major,
+                               devFwVer.fw_ver_minor, devFwVer.fw_ver_subminor, fw_query.fw_info.fw_ver[0],
+                               fw_query.fw_info.fw_ver[1], fw_query.fw_info.fw_ver[2]);
             }
         }
     }
@@ -2426,39 +2741,47 @@ bool FwOperations::TestAndSetTimeStamp(FwOperations *imageOps)
     return retRc;
 }
 
-FwVersion FwOperations::createFwVersion(u_int16_t fw_ver0, u_int16_t fw_ver1, u_int16_t fw_ver2) {
+FwVersion FwOperations::createFwVersion(u_int16_t fw_ver0, u_int16_t fw_ver1, u_int16_t fw_ver2)
+{
     return FwVersion(fw_ver0, fw_ver1, fw_ver2);
 }
-FwVersion FwOperations::createFwVersion(const fw_info_com_t* fwInfo) {
-    return FwVersion(fwInfo->fw_ver[0], fwInfo->fw_ver[1], fwInfo->fw_ver[2],
-            fwInfo->branch_ver);
+FwVersion FwOperations::createFwVersion(const fw_info_com_t* fwInfo)
+{
+    return FwVersion(fwInfo->fw_ver[0], fwInfo->fw_ver[1], fwInfo->fw_ver[2], fwInfo->branch_ver);
 }
 
-FwVersion FwOperations::createRunningFwVersion(const fw_info_com_t* fwInfo) {
-    return FwVersion(fwInfo->running_fw_ver[0], fwInfo->running_fw_ver[1],
-            fwInfo->running_fw_ver[2], fwInfo->running_branch_ver);
+FwVersion FwOperations::createRunningFwVersion(const fw_info_com_t* fwInfo)
+{
+    return FwVersion(fwInfo->running_fw_ver[0], fwInfo->running_fw_ver[1], fwInfo->running_fw_ver[2],
+                     fwInfo->running_branch_ver);
 }
 
 bool FwOperations::CreateSignatureManager()
 {
-    if (IsFsCtrlOperations()) {//FW control device
-        if (_fwImgInfo.ext_info.chip_type == CT_UNKNOWN) {
+    if (IsFsCtrlOperations())
+    { // FW control device
+        if (_fwImgInfo.ext_info.chip_type == CT_UNKNOWN)
+        {
             return errmsg("CreateSignatureManager: Unknown chip type\n");
         }
         _signatureMngr = SignatureManagerFactory::GetInstance()->CreateSignatureManager(_fwImgInfo.ext_info.chip_type);
         return true;
     }
-    //here ioAccess must be initialized
-    if (_ioAccess == NULL) {
+    // here ioAccess must be initialized
+    if (_ioAccess == NULL)
+    {
         return errmsg("CreateSignatureManager: ioAccess is NULL\n");
     }
     u_int32_t hwDevId = 0;
-    if (_ioAccess->is_flash()) {//device
+    if (_ioAccess->is_flash())
+    { // device
         hwDevId = GetHwDevId();
-        _signatureMngr = SignatureManagerFactory::GetInstance()->CreateSignatureManager(hwDevId, _fwImgInfo.ext_info.dev_rev);
+        _signatureMngr =
+          SignatureManagerFactory::GetInstance()->CreateSignatureManager(hwDevId, _fwImgInfo.ext_info.dev_rev);
         return true;
     }
-    else {//BIN file
+    else
+    { // BIN file
         // For images we get the AbstractSignatureManager (base class) since we don't know the chip type in this stage
         _signatureMngr = SignatureManagerFactory::GetInstance()->CreateSignatureManager(CT_UNKNOWN);
         return true;
@@ -2473,11 +2796,11 @@ bool FwOperations::InsertSecureFWSignature(vector<u_int8_t>, const char*, PrintC
 {
     return errmsg("InsertSecureFWSignature not supported");
 }
-bool FwOperations::PreparePublicKeyData(const char *, vector <u_int8_t>&, unsigned int&)
+bool FwOperations::PreparePublicKeyData(const char*, vector<u_int8_t>&, unsigned int&)
 {
     return errmsg("PreparePublicKeyData not supported");
 }
-bool FwOperations::storePublicKeyInSection(const char *, const char *)
+bool FwOperations::storePublicKeyInSection(const char*, const char*)
 {
     return errmsg("storePublicKeyInSection not supported");
 }
@@ -2497,20 +2820,27 @@ u_int32_t FwOperations::GetPublicKeySecureBootPtr()
 bool FwOperations::VerifyBranchFormat(const char* vsdString)
 {
     size_t length = strlen(vsdString);
-    if (length > BRANCH_LEN || length < MIN_BRANCH_LEN) {
+    if (length > BRANCH_LEN || length < MIN_BRANCH_LEN)
+    {
         return false;
     }
-    if (vsdString[length - MIN_BRANCH_LEN] == '_') {
-        for (size_t i = length - MIN_BRANCH_LEN + 1; i < length; i++) {
-            if (!isdigit(vsdString[i])) {
+    if (vsdString[length - MIN_BRANCH_LEN] == '_')
+    {
+        for (size_t i = length - MIN_BRANCH_LEN + 1; i < length; i++)
+        {
+            if (!isdigit(vsdString[i]))
+            {
                 return false;
             }
         }
         return true;
     }
-    else if (vsdString[length - MIN_BRANCH_LEN + 1] == '-') {
-        for (size_t i = length - MIN_BRANCH_LEN + 2; i < length; i++) {
-            if (!isdigit(vsdString[i])) {
+    else if (vsdString[length - MIN_BRANCH_LEN + 1] == '-')
+    {
+        for (size_t i = length - MIN_BRANCH_LEN + 2; i < length; i++)
+        {
+            if (!isdigit(vsdString[i]))
+            {
                 return false;
             }
         }
@@ -2529,7 +2859,8 @@ bool FwOperations::IsSecurityVersionViolated(u_int32_t)
     return false;
 }
 
-bool FwOperations::GetImageSize(u_int32_t*){
+bool FwOperations::GetImageSize(u_int32_t*)
+{
     return errmsg("GetImageSize is not supported");
 }
 
@@ -2541,14 +2872,16 @@ bool FwOperations::CheckPemKeySize(const string privPemFileStr, u_int32_t& keySi
     vector<u_int8_t> encSha;
     vector<u_int8_t> sha;
     int rc = rsa.setPrivKeyFromFile(privPemFileStr);
-    if (rc) {
+    if (rc)
+    {
         return false;
     }
     MlxSignSHA512 mlxSignSHA;
     mlxSignSHA << section;
     mlxSignSHA.getDigest(sha);
     rc = rsa.sign(MlxSign::SHA512, sha, encSha);
-    if (rc) {
+    if (rc)
+    {
         return false;
     }
     keySize = encSha.size();
@@ -2556,11 +2889,7 @@ bool FwOperations::CheckPemKeySize(const string privPemFileStr, u_int32_t& keySi
 }
 #endif
 
-
-
-CRSpaceRegisters::CRSpaceRegisters(mfile* mf, chip_type_t chip_type): _mf(mf), _chip_type(chip_type)
-{}
-
+CRSpaceRegisters::CRSpaceRegisters(mfile* mf, chip_type_t chip_type) : _mf(mf), _chip_type(chip_type) {}
 
 life_cycle_t CRSpaceRegisters::getLifeCycle()
 {
@@ -2599,12 +2928,12 @@ life_cycle_t CRSpaceRegisters::getLifeCycle()
     return (life_cycle_t)getConsecutiveBits(lifeCycle, firstBit, bitLen);
 }
 
-
 int CRSpaceRegisters::getGlobalImageStatus()
 {
     size_t global_image_status_address = 0;
 
-    switch (_chip_type) {
+    switch (_chip_type)
+    {
         case CT_CONNECTX6DX:
         case CT_CONNECTX6LX:
         case CT_CONNECTX7:
@@ -2623,18 +2952,18 @@ int CRSpaceRegisters::getGlobalImageStatus()
     return (int)getRegister(global_image_status_address);
 }
 
-
 u_int32_t CRSpaceRegisters::getSecurityVersion()
 {
     u_int32_t securityVersion = 0;
     u_int32_t rollbackMSB = 0, rollbackLSB = 0;
     u_int32_t minimalSecurityVersion = 0;
 
-    switch (_chip_type) {
+    switch (_chip_type)
+    {
         case CT_QUANTUM2:
             rollbackMSB = getRegister(0xf3248);
             rollbackLSB = getRegister(0xf324c);
-            minimalSecurityVersion = getConsecutiveBits(getRegister(0xf3238), 3, 8);            
+            minimalSecurityVersion = getConsecutiveBits(getRegister(0xf3238), 3, 8);
             break;
         case CT_BLUEFIELD3:
             rollbackMSB = getRegister(0xf4348);
@@ -2655,18 +2984,17 @@ u_int32_t CRSpaceRegisters::getSecurityVersion()
     return securityVersion;
 }
 
-
 u_int32_t CRSpaceRegisters::countSetBits(u_int32_t num)
 {
     u_int32_t count = 0;
-    while (num) {
+    while (num)
+    {
         count += num & 1;
         num >>= 1;
     }
     return count;
 }
 
-
 u_int32_t CRSpaceRegisters::getConsecutiveBits(u_int32_t data, u_int8_t firstBit, u_int8_t numOfBits)
 {
     u_int32_t mask = 0xffffffff;
@@ -2676,12 +3004,12 @@ u_int32_t CRSpaceRegisters::getConsecutiveBits(u_int32_t data, u_int8_t firstBit
     return data;
 }
 
-
 u_int32_t CRSpaceRegisters::getRegister(u_int32_t address)
 {
     u_int32_t crSpaceReg;
     int rc = mread4(_mf, address, &crSpaceReg);
-    if (rc != 4){
+    if (rc != 4)
+    {
         throw runtime_error("-E- Failed to read from CRSpace.");
     }
 
diff --git a/mlxfwops/lib/fw_ops.h b/mlxfwops/lib/fw_ops.h
index 4ad64325..e99d5363 100644
--- a/mlxfwops/lib/fw_ops.h
+++ b/mlxfwops/lib/fw_ops.h
@@ -31,7 +31,6 @@
  * SOFTWARE.
  */
 
-
 #ifndef FW_OPS_H
 #define FW_OPS_H
 
@@ -48,14 +47,14 @@
 #endif
 #include <fw_comps_mgr/fw_comps_mgr.h>
 #if !defined(NO_OPEN_SSL)
-    #include <mlxsign_lib/mlxsign_lib.h>
-    #if !defined(NO_DYNAMIC_ENGINE)
-        #include <mlxsign_lib/mlxsign_openssl_engine.h>
-    #endif
+#include <mlxsign_lib/mlxsign_lib.h>
+#if !defined(NO_DYNAMIC_ENGINE)
+#include <mlxsign_lib/mlxsign_openssl_engine.h>
+#endif
 #endif
 
-//declaration only to enable compilation when NO_OPEN_SSL
-//of signForFwUpdateUsingHSM(...), signForSecureBootUsingHSM(...) which decelare OpensslEngineSigner in argument.
+// declaration only to enable compilation when NO_OPEN_SSL
+// of signForFwUpdateUsingHSM(...), signForSecureBootUsingHSM(...) which decelare OpensslEngineSigner in argument.
 #ifdef NO_OPEN_SSL
 namespace MlxSign
 {
@@ -70,14 +69,15 @@ typedef f_prog_func_adv_st ProgressCallBackAdvSt;
 typedef f_prog_func_str PrintCallBack;
 typedef fw_ver_info_t FwVerInfo;
 
-typedef int (*PrintCallBackAdv) (int completion, char *str);
+typedef int (*PrintCallBackAdv)(int completion, char* str);
 MLXFWOP_API extern bool nextBootFwVer;
 #define GLOBAL_ALIGNMENT 0x80
 #define UUID_LEN 16
-class MLXFWOP_API FwOperations : public FlintErrMsg {
+class MLXFWOP_API FwOperations : public FlintErrMsg
+{
 public:
-    #define EXP_ROM_GEN_DEVID 0
-    #define MISS_MATCH_DEV_ID 0xffff
+#define EXP_ROM_GEN_DEVID 0
+#define MISS_MATCH_DEV_ID 0xffff
     class ExtBurnParams;
     class ExtVerifyParams;
     struct fwOpsParams;
@@ -85,7 +85,8 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
     typedef fwOpsParams fw_ops_params_t;
     typedef sgParams sg_params_t;
     // typedef std::tr1::function<void (void)> VerifyCallback;
-    enum {
+    enum
+    {
         IMG_SIG_TYPE_UNKNOWN = 0,
         IMG_SIG_TYPE_BIN = 1,
         IMG_SIG_TYPE_MFA = 2,
@@ -93,155 +94,227 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         IMG_SIG_TYPE_CC = 4,
         IMG_SIG_OPEN_FILE_FAILED = 5
     };
-    FwOperations(FBase *ioAccess) :
-        _ioAccess(ioAccess), _isCached(false), _wasVerified(false),
-        _quickQuery(false), _printFunc((PrintCallBack)NULL), _fname((const char*)NULL), \
-        _devName((const char*)NULL), _advErrors(true), _minBinMinorVer(0), _minBinMajorVer(0),
-        _maxBinMajorVer(0), _signatureMngr((ISignatureManager*)NULL), _internalQueryPerformed(false)
+    FwOperations(FBase* ioAccess) :
+        _ioAccess(ioAccess),
+        _isCached(false),
+        _wasVerified(false),
+        _quickQuery(false),
+        _printFunc((PrintCallBack)NULL),
+        _fname((const char*)NULL),
+        _devName((const char*)NULL),
+        _advErrors(true),
+        _minBinMinorVer(0),
+        _minBinMajorVer(0),
+        _maxBinMajorVer(0),
+        _signatureMngr((ISignatureManager*)NULL),
+        _internalQueryPerformed(false)
     {
         memset(_sectionsToRead, 0, sizeof(_sectionsToRead));
         memset(&_fwImgInfo, 0, sizeof(_fwImgInfo));
         memset(&_fwParams, 0, sizeof(_fwParams));
     };
 
-    bool IsFifthGen() {
-        return (_ioAccess != NULL && _ioAccess->is_flash() && _ioAccess->is_fifth_gen());
-    }
+    bool IsFifthGen() { return (_ioAccess != NULL && _ioAccess->is_flash() && _ioAccess->is_fifth_gen()); }
 
     bool CreateSignatureManager();
 
     virtual ~FwOperations()
     {
-        if (_ioAccess) {
+        if (_ioAccess)
+        {
             delete _ioAccess;
         }
-        if (_signatureMngr) {
+        if (_signatureMngr)
+        {
             delete _signatureMngr;
         }
     };
-    //virtual void print_type() {};
-    virtual mfile* getMfileObj() {
-        mfile *mf = _ioAccess->is_flash() ? ((Flash *)_ioAccess)->getMfileObj() : (mfile *)NULL;
+    // virtual void print_type() {};
+    virtual mfile* getMfileObj()
+    {
+        mfile* mf = _ioAccess->is_flash() ? ((Flash*)_ioAccess)->getMfileObj() : (mfile*)NULL;
         return mf;
     }
     FBase* GetIoAccess() { return _ioAccess; }
     virtual u_int8_t FwType() = 0;
     static bool IsFwSupportingRomModify(const FwVersion&);
     static bool CntxEthOnly(u_int32_t devid);
-    static void SetDevFlags(chip_type_t chipType, u_int32_t devType, fw_img_type_t fwType, bool &ibDev, bool &ethDev);
+    static void SetDevFlags(chip_type_t chipType, u_int32_t devType, fw_img_type_t fwType, bool& ibDev, bool& ethDev);
     static bool checkMatchingExpRomDevId(const fw_info_t& info);
     static bool checkMatchingExpRomDevId(u_int16_t dev_type, const roms_info_t& roms_info);
     static const char* expRomType2Str(u_int16_t type);
     static chip_type GetChipType(string chip);
     static chip_type_t getChipType(u_int32_t devid);
-    bool readBufAux(FBase& f, u_int32_t o, void *d, int l, const char *p);
-    virtual bool FwQuery(fw_info_t *fwInfo, bool readRom = true, bool isStripedImage = false, bool quickQuery = true, bool ignoreDToc = false, bool verbose = false) = 0;
-    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc, bool isStripedImage = false, bool showItoc = false, bool ignoreDToc = false) = 0; // Add callback print
+    bool readBufAux(FBase& f, u_int32_t o, void* d, int l, const char* p);
+    virtual bool FwQuery(fw_info_t* fwInfo,
+                         bool readRom = true,
+                         bool isStripedImage = false,
+                         bool quickQuery = true,
+                         bool ignoreDToc = false,
+                         bool verbose = false) = 0;
+    virtual bool FwVerify(VerifyCallBack verifyCallBackFunc,
+                          bool isStripedImage = false,
+                          bool showItoc = false,
+                          bool ignoreDToc = false) = 0; // Add callback print
     virtual bool FwVerifyAdv(ExtVerifyParams& verifyParams);
-    //on call of FwReadData with Null image we get image_size
-    virtual bool FwReadData(void *image, u_int32_t *image_size, bool verbose = false) = 0;
+    // on call of FwReadData with Null image we get image_size
+    virtual bool FwReadData(void* image, u_int32_t* image_size, bool verbose = false) = 0;
     virtual bool FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int8_t>& dataVec);
     virtual u_int32_t GetPublicKeySecureBootPtr();
-    virtual bool FwReactivateImage()
-    {
-        return errmsg("Operation not supported.");
-    }
-    virtual bool PreparePublicKeyData(const char *public_key_file, vector <u_int8_t>& publicKeyData, unsigned int& pem_offset);
-    virtual bool storePublicKeyInSection(const char *public_key_file, const char *uuid);
+    virtual bool FwReactivateImage() { return errmsg("Operation not supported."); }
+    virtual bool
+      PreparePublicKeyData(const char* public_key_file, vector<u_int8_t>& publicKeyData, unsigned int& pem_offset);
+    virtual bool storePublicKeyInSection(const char* public_key_file, const char* uuid);
     virtual bool FwInsertSHA256(PrintCallBack printFunc = (PrintCallBack)NULL);
-    virtual bool InsertSecureFWSignature(vector<u_int8_t> signature, const char *uuid, PrintCallBack printFunc);
-    virtual bool storeSecureBootSignaturesInSection(vector<u_int8_t> boot_signature, vector<u_int8_t> critical_sections_signature = vector<u_int8_t>(),
-                                                    vector<u_int8_t> non_critical_sections_signature = vector<u_int8_t>());
-    virtual bool signForFwUpdate(const char *privPemFile, const char *uuid, PrintCallBack printFunc = (PrintCallBack)NULL);
-    virtual bool signForFwUpdateUsingHSM(const char *uuid, MlxSign::OpensslEngineSigner& engineSigner, PrintCallBack printFunc);
-    virtual bool FwSignWithTwoRSAKeys(const char *privPemFile1, const char *uuid1,
-                                      const char *privPemFile2, const char *uuid2, PrintCallBack printFunc = (PrintCallBack)NULL);
-    virtual bool FwSignWithHmac(const char *key_file);
-    virtual bool signForSecureBoot(const char *private_key_file, const char *public_key_file, const char *guid_key_file);
-    virtual bool signForSecureBootUsingHSM(const char *public_key_file, const char *uuid, MlxSign::OpensslEngineSigner& engineSigner);
+    virtual bool InsertSecureFWSignature(vector<u_int8_t> signature, const char* uuid, PrintCallBack printFunc);
+    virtual bool
+      storeSecureBootSignaturesInSection(vector<u_int8_t> boot_signature,
+                                         vector<u_int8_t> critical_sections_signature = vector<u_int8_t>(),
+                                         vector<u_int8_t> non_critical_sections_signature = vector<u_int8_t>());
+    virtual bool
+      signForFwUpdate(const char* privPemFile, const char* uuid, PrintCallBack printFunc = (PrintCallBack)NULL);
+    virtual bool
+      signForFwUpdateUsingHSM(const char* uuid, MlxSign::OpensslEngineSigner& engineSigner, PrintCallBack printFunc);
+    virtual bool FwSignWithTwoRSAKeys(const char* privPemFile1,
+                                      const char* uuid1,
+                                      const char* privPemFile2,
+                                      const char* uuid2,
+                                      PrintCallBack printFunc = (PrintCallBack)NULL);
+    virtual bool FwSignWithHmac(const char* key_file);
+    virtual bool signForSecureBoot(const char* private_key_file, const char* public_key_file, const char* guid_key_file);
+    virtual bool signForSecureBootUsingHSM(const char* public_key_file,
+                                           const char* uuid,
+                                           MlxSign::OpensslEngineSigner& engineSigner);
     virtual bool PrepItocSectionsForHmac(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical);
     virtual bool IsCriticalSection(u_int8_t sect_type);
 
-    virtual bool FwExtract4MBImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc, bool verbose = false, bool ignoreImageStart = false);
-    virtual bool RestoreDevToc(vector<u_int8_t>& img, char* psid, dm_dev_id_t devid_t, const cx4fw_uid_entry& base_guid, const cx4fw_uid_entry& base_mac);
+    virtual bool FwExtract4MBImage(vector<u_int8_t>& img,
+                                   bool maskMagicPatternAndDevToc,
+                                   bool verbose = false,
+                                   bool ignoreImageStart = false);
+    virtual bool RestoreDevToc(vector<u_int8_t>& img,
+                               char* psid,
+                               dm_dev_id_t devid_t,
+                               const cx4fw_uid_entry& base_guid,
+                               const cx4fw_uid_entry& base_mac);
     virtual bool initHwPtrs(bool isVerify = false);
     virtual bool isHashesTableHwPtrValid();
     virtual bool openEncryptedImageAccess(const char* encrypted_image_path);
     virtual bool isEncrypted(bool& is_encrypted);
-    virtual bool FwExtractEncryptedImage(vector<u_int8_t>& img, bool maskMagicPatternAndDevToc,
-                                         bool verbose = false, bool ignoreImageStart = false);
-    virtual bool burnEncryptedImage(FwOperations *imageOps, ExtBurnParams& burnParams);
-    virtual bool FwSetPublicKeys(char *fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
-    virtual bool FwSetForbiddenVersions(char *fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwExtractEncryptedImage(vector<u_int8_t>& img,
+                                         bool maskMagicPatternAndDevToc,
+                                         bool verbose = false,
+                                         bool ignoreImageStart = false);
+    virtual bool burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& burnParams);
+    virtual bool FwSetPublicKeys(char* fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetForbiddenVersions(char* fname, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool CalcHMAC(const vector<u_int8_t>& key, const vector<u_int8_t>& data, vector<u_int8_t>& digest);
     virtual bool FwReadRom(std::vector<u_int8_t>& romSect) = 0;
-    virtual bool FwBurnRom(FImage *romImg, bool ignoreProdIdCheck = false, bool ignoreDevidCheck = false, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0; // can also read the rom from flint and give a vector of u_int8_t
+    virtual bool FwBurnRom(FImage* romImg,
+                           bool ignoreProdIdCheck = false,
+                           bool ignoreDevidCheck = false,
+                           ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0; // can also read the rom from
+                                                                                        // flint and give a vector of
+                                                                                        // u_int8_t
     virtual bool FwDeleteRom(bool ignoreProdIdCheck, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
 
-    virtual bool FwBurn(FwOperations *imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
-    virtual bool FwBurnAdvanced(FwOperations *imageOps, ExtBurnParams& burnParams) = 0;
-    virtual bool getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc, FBase* ioAccess, bool IsBurningProcess, bool isVerify);
-    virtual bool FwBurnAdvanced(std::vector <u_int8_t> imageOps4MData, ExtBurnParams& burnParams, FwComponent::comps_ids_t ComponentId = FwComponent::COMPID_BOOT_IMG);
-    virtual bool FwBurnBlock(FwOperations *imageOps, ProgressCallBack progressFunc) = 0; //Add: callback progress, question arr, callback question, configurations
-    virtual bool FwWriteBlock(u_int32_t addr, std::vector<u_int8_t> dataVec, ProgressCallBack progressFunc = (ProgressCallBack)NULL);
-
-    virtual bool FwSetGuids(sg_params_t& sgParam, PrintCallBack callBackFunc = (PrintCallBack)NULL, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
+    virtual bool
+      FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
+    virtual bool FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& burnParams) = 0;
+    virtual bool
+      getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc, FBase* ioAccess, bool IsBurningProcess, bool isVerify);
+    virtual bool FwBurnAdvanced(std::vector<u_int8_t> imageOps4MData,
+                                ExtBurnParams& burnParams,
+                                FwComponent::comps_ids_t ComponentId = FwComponent::COMPID_BOOT_IMG);
+    virtual bool FwBurnBlock(FwOperations* imageOps,
+                             ProgressCallBack progressFunc) = 0; // Add: callback progress, question arr, callback
+                                                                 // question, configurations
+    virtual bool FwWriteBlock(u_int32_t addr,
+                              std::vector<u_int8_t> dataVec,
+                              ProgressCallBack progressFunc = (ProgressCallBack)NULL);
+
+    virtual bool FwSetGuids(sg_params_t& sgParam,
+                            PrintCallBack callBackFunc = (PrintCallBack)NULL,
+                            ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
 
     virtual bool FwSetMFG(fs3_uid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL) = 0;
     virtual bool FwSetMFG(guid_t baseGuid, PrintCallBack callBackFunc = (PrintCallBack)NULL) = 0;
     // use progressFunc when dealing with FS2 image and printFunc when dealing with FS3 image.
-    virtual bool FwSetVSD(char *vsdStr, ProgressCallBack progressFunc = (ProgressCallBack)NULL, PrintCallBack printFunc = (PrintCallBack)NULL) = 0;
-    virtual bool FwSetVPD(char *vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL) = 0;
-    virtual bool FwSetCertChain(char *certFileStr,  u_int32_t certIndex, PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    virtual bool FwSetVSD(char* vsdStr,
+                          ProgressCallBack progressFunc = (ProgressCallBack)NULL,
+                          PrintCallBack printFunc = (PrintCallBack)NULL) = 0;
+    virtual bool FwSetVPD(char* vpdFileStr, PrintCallBack callBackFunc = (PrintCallBack)NULL) = 0;
+    virtual bool
+      FwSetCertChain(char* certFileStr, u_int32_t certIndex, PrintCallBack callBackFunc = (PrintCallBack)NULL);
     virtual bool FwSetAccessKey(hw_key_t userKey, ProgressCallBack progressFunc = (ProgressCallBack)NULL) = 0;
     virtual bool FwGetSection(u_int32_t sectType, std::vector<u_int8_t>& sectInfo, bool stripedImage = false) = 0;
     virtual bool FwResetNvData() = 0;
     virtual bool FwShiftDevData(PrintCallBack progressFunc = (PrintCallBack)NULL) = 0;
-    virtual const char*  FwGetResetRecommandationStr() = 0;
-    virtual const char*  FwGetReSignMsgStr();
+    virtual const char* FwGetResetRecommandationStr() = 0;
+    virtual const char* FwGetReSignMsgStr();
 
     virtual bool FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer);
-    virtual bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer, bool queryRunning = false);
+    virtual bool FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
+                                  struct tools_open_fw_version& fwVer,
+                                  bool queryRunning = false);
     virtual bool FwResetTimeStamp();
 
-    virtual bool FwCheckIfWeCanBurnWithFwControl(FwOperations*) {return true;}
-    virtual bool FwCheckIf8MBShiftingNeeded(FwOperations*, const ExtBurnParams&) {return false;}
+    virtual bool FwCheckIfWeCanBurnWithFwControl(FwOperations*) { return true; }
+    virtual bool FwCheckIf8MBShiftingNeeded(FwOperations*, const ExtBurnParams&) { return false; }
 
-    bool CreateBasicImageFromData(u_int32_t *data, u_int32_t dataSize, FwOperations **newImgOps);
+    bool CreateBasicImageFromData(u_int32_t* data, u_int32_t dataSize, FwOperations** newImgOps);
 
     virtual bool CheckIfAlignmentIsNeeded(FwOperations*) { return false; }
-    virtual bool AlignDeviceSections(FwOperations*/*imageOps*/) { return errmsg("Align device sections is not supported"); }
-    virtual bool RemoveWriteProtection() 
-    { 
-        return true; 
-        //Though Remove write protection is not supported, return true.
+    virtual bool AlignDeviceSections(FwOperations* /*imageOps*/)
+    {
+        return errmsg("Align device sections is not supported");
+    }
+    virtual bool RemoveWriteProtection()
+    {
+        return true;
+        // Though Remove write protection is not supported, return true.
     }
     virtual void FwCleanUp();
     virtual bool FwInit() = 0;
     virtual bool FsIntQuery() { return true; }
     bool FwSetPrint(PrintCallBack PrintFunc);
 
-    virtual bool UpdateSection(void *new_info, fs3_section_t sect_type = FS3_DEV_INFO, bool is_sect_failsafe = true, CommandType cmd_type = CMD_UNKNOWN, PrintCallBack callBackFunc = (PrintCallBack)NULL);
-    //needed for flint low level operations
+    virtual bool UpdateSection(void* new_info,
+                               fs3_section_t sect_type = FS3_DEV_INFO,
+                               bool is_sect_failsafe = true,
+                               CommandType cmd_type = CMD_UNKNOWN,
+                               PrintCallBack callBackFunc = (PrintCallBack)NULL);
+    // needed for flint low level operations
     bool FwSwReset();
-    virtual bool CheckCX4Device() {return true; /* deprecated always return true*/ }
+    virtual bool CheckCX4Device() { return true; /* deprecated always return true*/ }
     virtual bool FwCalcMD5(u_int8_t md5sum[16]) = 0;
-    virtual u_int32_t GetHwDevId() 
-    { 
+    virtual u_int32_t GetHwDevId()
+    {
         mfile* mf = _ioAccess->getMfileObj();
         dm_dev_id_t deviceId = DeviceUnknown;
         u_int32_t hwDevId = 0x0, hwRevId = 0x0;
-        if (dm_get_device_id(mf, &deviceId, &hwDevId, &hwRevId)) {
+        if (dm_get_device_id(mf, &deviceId, &hwDevId, &hwRevId))
+        {
             return 0xffff;
         }
         return hwDevId;
     }
-    //virtual bool FwBurnBlock(FwOperations &FwImageAccess); // Add call back
-    static FwOperations* FwOperationsCreate(void *fwHndl, void *info, char *psid, fw_hndl_type_t hndlType, char *errBuff = (char*)NULL, int buffSize = 0, bool ignore_crc_check = false);
+    // virtual bool FwBurnBlock(FwOperations &FwImageAccess); // Add call back
+    static FwOperations* FwOperationsCreate(void* fwHndl,
+                                            void* info,
+                                            char* psid,
+                                            fw_hndl_type_t hndlType,
+                                            char* errBuff = (char*)NULL,
+                                            int buffSize = 0,
+                                            bool ignore_crc_check = false);
     static FwOperations* FwOperationsCreate(fw_ops_params_t& fwParams);
 
-    static bool          imageDevOperationsCreate(fw_ops_params_t& devParams, fw_ops_params_t& imgParams,
-                                                  FwOperations **devFwOps, FwOperations **imgFwOps, bool ignoreSecurityAttributes = false, bool ignoreDToc = false);
+    static bool imageDevOperationsCreate(fw_ops_params_t& devParams,
+                                         fw_ops_params_t& imgParams,
+                                         FwOperations** devFwOps,
+                                         FwOperations** imgFwOps,
+                                         bool ignoreSecurityAttributes = false,
+                                         bool ignoreDToc = false);
 
     virtual bool IsFsCtrlOperations();
     virtual bool PrepItocSectionsForCompare(vector<u_int8_t>& critical, vector<u_int8_t>& non_critical);
@@ -250,15 +323,15 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
     virtual bool IsLifeCycleSupported();
     virtual bool IsEncryptionSupported();
     void GetFwParams(fw_ops_params_t&);
-    virtual void CleanInterruptedCommand() {}//by default do nothing
+    virtual void CleanInterruptedCommand() {} // by default do nothing
     virtual bool FwCalcSHA(MlxSign::SHAType, vector<u_int8_t>&, vector<u_int8_t>&);
-    //bool GetExpRomVersionWrapper();
-    void getSupporteHwId(u_int32_t **supportedHwId, u_int32_t &supportedHwIdNum);
+    // bool GetExpRomVersionWrapper();
+    void getSupporteHwId(u_int32_t** supportedHwId, u_int32_t& supportedHwIdNum);
 
     static FwVersion createFwVersion(const fw_info_com_t*);
     static FwVersion createFwVersion(u_int16_t fw_ver0, u_int16_t fw_ver1, u_int16_t fw_ver2);
     static FwVersion createRunningFwVersion(const fw_info_com_t*);
-    static int       getFileSignature(const char *fname);
+    static int getFileSignature(const char* fname);
     virtual bool IsLifeCycleAccessible(chip_type_t chip_type);
     virtual bool IsSecurityVersionViolated(u_int32_t image_security_version);
     virtual bool GetImageSize(u_int32_t* image_size);
@@ -266,15 +339,17 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
 #ifndef UEFI_BUILD
     static bool CheckPemKeySize(const string privPemFileStr, u_int32_t& keySize);
 #endif
-    class MLXFWOP_API RomInfo : FlintErrMsg {
-public:
+    class MLXFWOP_API RomInfo : FlintErrMsg
+    {
+    public:
         RomInfo(const std::vector<u_int8_t>& romSector, bool resEndi = true);
-        ~RomInfo() {};
-        bool initRomsInfo(roms_info_t *info);
+        ~RomInfo(){};
+        bool initRomsInfo(roms_info_t* info);
         bool ParseInfo();
         static u_int8_t getNumVerFromProdId(u_int16_t prodId);
-private:
-        //Rom Information
+
+    private:
+        // Rom Information
         bool expRomFound;
         u_int8_t numOfExpRom;
         u_int8_t noRomChecksum;
@@ -290,20 +365,22 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         bool GetExpRomVersion();
     };
 
-    class ExtBurnStatus {
-public:
+    class ExtBurnStatus
+    {
+    public:
         bool imageCachedSuccessfully;
         ExtBurnStatus() : imageCachedSuccessfully(false) {}
     };
-    class ExtBurnParams {
-
-public:
-        typedef enum BurnRomOption {
+    class ExtBurnParams
+    {
+    public:
+        typedef enum BurnRomOption
+        {
             BRO_DEFAULT,
             BRO_ONLY_FROM_IMG,
             BRO_FROM_DEV_IF_EXIST,
         } BurnRomOption;
-        //burn params
+        // burn params
         bool userGuidsSpecified;
         bool userMacsSpecified;
         bool userUidSpecified;
@@ -317,32 +394,55 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         bool noDevidCheck;
         bool skipCiReq; // FS2 image only - skip sending cache image request to driver at the end of the burn
         bool ignoreVersionCheck;
-        bool useImgDevData; // FS3 image only - take device data sections from image (valid only if burnFailsafe== false)
+        bool useImgDevData; // FS3 image only - take device data sections from image (valid only if burnFailsafe==
+                            // false)
         bool useDevImgInfo; // FS3 image only - preserve select fields of image_info section on the device when burning.
         BurnRomOption burnRomOptions;
         bool shift8MBIfNeeded;
 
-        //callback fun
+        // callback fun
         ProgressCallBack progressFunc;
         ProgressCallBackAdvSt ProgressFuncAdv;
         ProgressCallBackEx progressFuncEx;
-        void *progressUserData;
-        //data
-        char *userVsd;
+        void* progressUserData;
+        // data
+        char* userVsd;
         bool use_cpu_utilization;
         int cpu_utilization;
-        std::vector<guid_t> userUids; //contains either guids or uids
+        std::vector<guid_t> userUids; // contains either guids or uids
         ExtBurnStatus burnStatus;
         chip_type_t chip_type;
         bool use_chip_type;
-        ExtBurnParams() : userGuidsSpecified(false), userMacsSpecified(false), userUidSpecified(false),
-            vsdSpecified(false), blankGuids(false), burnFailsafe(true), allowPsidChange(false),
-            useImagePs(false), useImageGuids(false), singleImageBurn(true), noDevidCheck(false),
-            skipCiReq(false), ignoreVersionCheck(false), useImgDevData(false), useDevImgInfo(false),
-            burnRomOptions(BRO_DEFAULT), shift8MBIfNeeded(false), progressFunc((ProgressCallBack)NULL),
-            progressFuncEx((ProgressCallBackEx)NULL), progressUserData(NULL), userVsd((char*)NULL), use_cpu_utilization(false), cpu_utilization(-1),
-            chip_type(CT_UNKNOWN), use_chip_type(false)
-        { ProgressFuncAdv.func = (f_prog_func_adv)NULL; ProgressFuncAdv.opaque = NULL;}
+        ExtBurnParams() :
+            userGuidsSpecified(false),
+            userMacsSpecified(false),
+            userUidSpecified(false),
+            vsdSpecified(false),
+            blankGuids(false),
+            burnFailsafe(true),
+            allowPsidChange(false),
+            useImagePs(false),
+            useImageGuids(false),
+            singleImageBurn(true),
+            noDevidCheck(false),
+            skipCiReq(false),
+            ignoreVersionCheck(false),
+            useImgDevData(false),
+            useDevImgInfo(false),
+            burnRomOptions(BRO_DEFAULT),
+            shift8MBIfNeeded(false),
+            progressFunc((ProgressCallBack)NULL),
+            progressFuncEx((ProgressCallBackEx)NULL),
+            progressUserData(NULL),
+            userVsd((char*)NULL),
+            use_cpu_utilization(false),
+            cpu_utilization(-1),
+            chip_type(CT_UNKNOWN),
+            use_chip_type(false)
+        {
+            ProgressFuncAdv.func = (f_prog_func_adv)NULL;
+            ProgressFuncAdv.opaque = NULL;
+        }
 
         void updateParamsForBasicImage(ProgressCallBack progressFunc)
         {
@@ -354,42 +454,48 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         }
     };
 
-    class ExtVerifyParams {
-
-public:
+    class ExtVerifyParams
+    {
+    public:
         VerifyCallBack verifyCallBackFunc; // Print function call back for print the different sections in the verify
-        bool isStripedImage; // If the image is striped
-        bool showItoc; // Show the ITOC header only
-        bool ignoreDToc; // Ignore verifying DTOC sections
-        ProgressCallBackAdvSt *progressFuncAdv; // Advance progress function that used in FW controlled operations (e.g. under secure fw)
-
-        ExtVerifyParams(VerifyCallBack vFunc) : verifyCallBackFunc(vFunc), isStripedImage(false), showItoc(false),
-            ignoreDToc(false), progressFuncAdv((ProgressCallBackAdvSt*)NULL) {};
+        bool isStripedImage;               // If the image is striped
+        bool showItoc;                     // Show the ITOC header only
+        bool ignoreDToc;                   // Ignore verifying DTOC sections
+        ProgressCallBackAdvSt* progressFuncAdv; // Advance progress function that used in FW controlled operations (e.g.
+                                                // under secure fw)
+
+        ExtVerifyParams(VerifyCallBack vFunc) :
+            verifyCallBackFunc(vFunc),
+            isStripedImage(false),
+            showItoc(false),
+            ignoreDToc(false),
+            progressFuncAdv((ProgressCallBackAdvSt*)NULL){};
     };
 
-    struct fwOpsParams {
+    struct fwOpsParams
+    {
         // COMMON
-        char *psid;     // can be NULL
+        char* psid; // can be NULL
         fw_hndl_type_t hndlType;
-        char *errBuff;     // can be NULL
-        int errBuffSize;     // can be zero if above NULL
+        char* errBuff;   // can be NULL
+        int errBuffSize; // can be zero if above NULL
         // FHT_FW_FILE
-        char *fileHndl;
+        char* fileHndl;
         // FHT_FW_BUFF
-        u_int32_t *buffHndl;
+        u_int32_t* buffHndl;
         u_int32_t buffSize;
         // FHT_UEFI_DEV
-        uefi_Dev_t *uefiHndl;
+        uefi_Dev_t* uefiHndl;
         uefi_dev_extra_t uefiExtra;
         // FHT_MST_DEV
-        char *mstHndl;
+        char* mstHndl;
         bool forceLock;
         bool readOnly;
-        int numOfBanks;     // should be set to -1 for "auto-detect"
-        flash_params_t *flashParams;     // can be NULL
+        int numOfBanks;              // should be set to -1 for "auto-detect"
+        flash_params_t* flashParams; // can be NULL
         int ignoreCacheRep;
         bool noFlashVerify;
-        bool shortErrors;     // show short/long error msgs (default shuold be false)
+        bool shortErrors; // show short/long error msgs (default shuold be false)
         int cx3FwAccess;
         int isCableFw;
         bool noFwCtrl;
@@ -398,25 +504,28 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         bool ignoreCrcCheck;
     };
 
-    struct sgParams {
-        bool updateCrc;     //default should be set to true
-        bool stripedImage;     // default shuold be set to false unless working on striped image file
+    struct sgParams
+    {
+        bool updateCrc;    // default should be set to true
+        bool stripedImage; // default shuold be set to false unless working on striped image file
         bool macsSpecified;
         bool guidsSpecified;
-        bool uidSpecified;     // valid for ConnectIB only
+        bool uidSpecified; // valid for ConnectIB only
         std::vector<guid_t> userGuids;
-        u_int8_t numOfGUIDs;     // number of GUIDs to allocate for each port. keep zero for default. (FS3 image Only)
-        u_int8_t stepSize;     // step size between GUIDs. keep zero for default. (FS3 Image Only)
-        bool usePPAttr;     // if set, use the per prot attributes below (FS3 Image Only)
-        u_int8_t numOfGUIDsPP[2];     // number of GUIDs to allocate for each port. keep 0xff for default. (FS3 image Only)
-        u_int8_t stepSizePP[2];     // step size between GUIDs. keep 0xff for default. (FS3 Image Only)
+        u_int8_t numOfGUIDs;      // number of GUIDs to allocate for each port. keep zero for default. (FS3 image Only)
+        u_int8_t stepSize;        // step size between GUIDs. keep zero for default. (FS3 Image Only)
+        bool usePPAttr;           // if set, use the per prot attributes below (FS3 Image Only)
+        u_int8_t numOfGUIDsPP[2]; // number of GUIDs to allocate for each port. keep 0xff for default. (FS3 image Only)
+        u_int8_t stepSizePP[2];   // step size between GUIDs. keep 0xff for default. (FS3 Image Only)
     };
+
 protected:
-    #define FS3_IND_ADDR 0x24
-    #define FS4_IND_ADDR 0x10
-    #define ARR_SIZE(arr) sizeof(arr) / sizeof(arr[0])
+#define FS3_IND_ADDR 0x24
+#define FS4_IND_ADDR 0x10
+#define ARR_SIZE(arr) sizeof(arr) / sizeof(arr[0])
 
-    struct FwImgInfo {
+    struct FwImgInfo
+    {
         fw_info_com_t ext_info;
         u_int32_t imgStart;
         bool actuallyFailsafe;
@@ -431,20 +540,24 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         u_int32_t lastImageAddr;
         fw_img_type_t fwType;
     };
-    enum {
+    enum
+    {
         OLD_CNTX_START_POS_SIZE = 6,
         CNTX_START_POS_SIZE = 10
     };
-    enum {
+    enum
+    {
         MAX_SW_DEVICES_PER_HW = 32
     };
 
-    enum {
+    enum
+    {
         IMG_VER_FS2 = 0,
         IMG_VER_FS3 = 3,
         IMG_VER_FS4 = 4
     };
-    enum {
+    enum
+    {
         FS_OLD_GEN = 0,
         FS_FS2_GEN,
         FS_FS3_GEN,
@@ -454,14 +567,16 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         FS_UNKNOWN_IMG
     };
 
-    struct BinId2SwId {
+    struct BinId2SwId
+    {
         BinIdT binId;
         // Zero terminated list of SW device ids
         u_int32_t swId[MAX_SW_DEVICES_PER_HW];
     };
 
-    struct HwDevData {
-        const char *name;
+    struct HwDevData
+    {
+        const char* name;
         u_int32_t hwDevId;
         chip_type_t chipType;
         chip_family_type chipFamilyType;
@@ -472,83 +587,115 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
         const BinId2SwId binningId[MAX_SW_DEVICES_PER_HW];
     };
 
-    struct HwDev2Str {
-        const char *name;
+    struct HwDev2Str
+    {
+        const char* name;
         u_int32_t hwDevId;
         u_int8_t revId;
     };
 
-    struct SectionInfo {
+    struct SectionInfo
+    {
         u_int8_t type;
-        const char    *name;
+        const char* name;
     };
 
-    struct QueryOptions {
+    struct QueryOptions
+    {
         bool quickQuery;
         bool readRom;
     };
 
-
-    class burnDataParamsT {
-public:
-        u_int32_t *data;
+    class burnDataParamsT
+    {
+    public:
+        u_int32_t* data;
         u_int32_t dataSize;
         ProgressCallBack progressFunc;
         bool calcSha;
 
-        burnDataParamsT() : data((u_int32_t*)NULL), dataSize(0), progressFunc((ProgressCallBack)NULL), calcSha(false) {};
+        burnDataParamsT() : data((u_int32_t*)NULL), dataSize(0), progressFunc((ProgressCallBack)NULL), calcSha(false){};
     };
 
-    typedef int (*print2log_func) (const char *format, ...);
+    typedef int (*print2log_func)(const char* format, ...);
 
     // Protected Methods
     static int GetFwVerFormat(u_int16_t fwVer[3]);
-    virtual bool UpdateImgCache(u_int8_t *buff, u_int32_t addr, u_int32_t size);
-    bool CheckAndPrintCrcRes(char *pr, bool blank_crc, u_int32_t off, u_int32_t crc_act, u_int32_t crc_exp, bool ignore_crc = false,
+    virtual bool UpdateImgCache(u_int8_t* buff, u_int32_t addr, u_int32_t size);
+    bool CheckAndPrintCrcRes(char* pr,
+                             bool blank_crc,
+                             u_int32_t off,
+                             u_int32_t crc_act,
+                             u_int32_t crc_exp,
+                             bool ignore_crc = false,
                              VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
-    bool checkBoot2(u_int32_t beg, u_int32_t offs, u_int32_t& next, bool fullRead, const char *pref,
+    bool checkBoot2(u_int32_t beg,
+                    u_int32_t offs,
+                    u_int32_t& next,
+                    bool fullRead,
+                    const char* pref,
                     VerifyCallBack verifyCallBackFunc = (VerifyCallBack)NULL);
-    u_int32_t CalcImageCRC(u_int32_t *buff, u_int32_t size);
-    bool writeImage(ProgressCallBack progressFunc, u_int32_t addr, void *data, int cnt, bool isPhysAddr = false, bool readModifyWrite = false, int totalSz = -1, int alreadyWrittenSz = 0);
-    bool writeImageEx(ProgressCallBackEx progressFuncEx, void *progressUserData, ProgressCallBack progressFunc, u_int32_t addr, void *data, int cnt, bool isPhysAddr = false, 
-    bool readModifyWrite = false, int totalSz = -1, int alreadyWrittenSz = 0, bool cpuUtilization = false, int cpuPercent = -1);
+    u_int32_t CalcImageCRC(u_int32_t* buff, u_int32_t size);
+    bool writeImage(ProgressCallBack progressFunc,
+                    u_int32_t addr,
+                    void* data,
+                    int cnt,
+                    bool isPhysAddr = false,
+                    bool readModifyWrite = false,
+                    int totalSz = -1,
+                    int alreadyWrittenSz = 0);
+    bool writeImageEx(ProgressCallBackEx progressFuncEx,
+                      void* progressUserData,
+                      ProgressCallBack progressFunc,
+                      u_int32_t addr,
+                      void* data,
+                      int cnt,
+                      bool isPhysAddr = false,
+                      bool readModifyWrite = false,
+                      int totalSz = -1,
+                      int alreadyWrittenSz = 0,
+                      bool cpuUtilization = false,
+                      int cpuPercent = -1);
     //////////////////////////////////////////////////////////////////
-    bool GetSectData(std::vector<u_int8_t>& file_sect, const u_int32_t *buff, const u_int32_t size);
+    bool GetSectData(std::vector<u_int8_t>& file_sect, const u_int32_t* buff, const u_int32_t size);
     ////////////////////////////////////////////////////////////////////
     bool CheckMatchingDevId(u_int32_t hwDevId, u_int32_t imageDevId);
-    bool CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_int32_t *supportedHwId, u_int32_t supportedHwIdNum);
+    bool CheckMatchingHwDevId(u_int32_t hwDevId, u_int32_t rev_id, u_int32_t* supportedHwId, u_int32_t supportedHwIdNum);
     bool CheckMatchingBinning(u_int32_t hwDevId, BinIdT binningVal, u_int32_t imageDevId);
-    bool HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char *hw_name);
+    bool HWIdRevToName(u_int32_t hw_id, u_int8_t rev_id, char* hw_name);
     bool CheckMac(u_int64_t mac);
     bool CheckMac(guid_t mac);
-    void recalcSectionCrc(u_int8_t *buf, u_int32_t data_size);
+    void recalcSectionCrc(u_int8_t* buf, u_int32_t data_size);
     void FwInitCom();
-    void FwDebugPrint(char *str);
+    void FwDebugPrint(char* str);
 
-    static bool FindAllImageStart(FBase *ioAccess, u_int32_t start_locations[CNTX_START_POS_SIZE], u_int32_t *found_images, u_int32_t const cntx_magic_pattern[]);
-    static bool     getRomsInfo(FBase *io, roms_info_t& romsInfo);
+    static bool FindAllImageStart(FBase* ioAccess,
+                                  u_int32_t start_locations[CNTX_START_POS_SIZE],
+                                  u_int32_t* found_images,
+                                  u_int32_t const cntx_magic_pattern[]);
+    static bool getRomsInfo(FBase* io, roms_info_t& romsInfo);
 
-    bool GetQuickQuery()           {return _quickQuery;}
-    bool CheckFwVersion(FwOperations &imgFwOps, u_int8_t forceVersion);
-    bool CheckPSID(FwOperations &imageOps, u_int8_t allow_psid_change = false);
+    bool GetQuickQuery() { return _quickQuery; }
+    bool CheckFwVersion(FwOperations& imgFwOps, u_int8_t forceVersion);
+    bool CheckPSID(FwOperations& imageOps, u_int8_t allow_psid_change = false);
     chip_type_t getChipType();
-    bool getInfoFromHwDevid(u_int32_t hwDevId, chip_type_t& chipT, const u_int32_t **swIds);
+    bool getInfoFromHwDevid(u_int32_t hwDevId, chip_type_t& chipT, const u_int32_t** swIds);
     HwDevData getInfoFromChipType(chip_type_t chipT) const;
 
-    bool ReadBinFile(const char *fimage, u_int8_t*&file_data, int &file_size);
-    bool FwBurnData(u_int32_t *data, u_int32_t dataSize, ProgressCallBack progressFunc);
+    bool ReadBinFile(const char* fimage, u_int8_t*& file_data, int& file_size);
+    bool FwBurnData(u_int32_t* data, u_int32_t dataSize, ProgressCallBack progressFunc);
     bool FwBurnData(burnDataParamsT& burnDataParams);
-    static bool FwAccessCreate(fw_ops_params_t& fwParams, FBase **ioAccessP);
+    static bool FwAccessCreate(fw_ops_params_t& fwParams, FBase** ioAccessP);
     bool CheckBinVersion(u_int8_t binVerMajor, u_int8_t binVerMinor);
 
     static u_int8_t GetFwFormatFromHwDevID(u_int32_t hwDevId);
 
-    virtual Tlv_Status_t GetTsObj(TimeStampIFC **tsObj);
-    bool TestAndSetTimeStamp(FwOperations *imageOps);
+    virtual Tlv_Status_t GetTsObj(TimeStampIFC** tsObj);
+    bool TestAndSetTimeStamp(FwOperations* imageOps);
     virtual bool VerifyBranchFormat(const char* vsdString);
 
     // Protected Members
-    FBase *_ioAccess;
+    FBase* _ioAccess;
     bool _isCached;
     FwImgInfo _fwImgInfo;
     fw_ops_params_t _fwParams;
@@ -561,8 +708,8 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
     bool _quickQuery;
 
     PrintCallBack _printFunc;
-    const char *_fname;
-    const char *_devName;
+    const char* _fname;
+    const char* _devName;
     // show advanced error msgs
     bool _advErrors;
 
@@ -573,22 +720,25 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
     bool _internalQueryPerformed;
 
 private:
-
     // Static Methods
 #ifndef NO_MFA_SUPPORT
-    static int      getMfaImgInner(char *fileName, u_int8_t *mfa_buf, int size,
-                                   char *psid, u_int8_t **imgbuf, char *errBuf, int errBufSize);
-    static int      getMfaImg(char *fileName, char *psid, u_int8_t **imgbuf, char *errBuf, int errBufSize);
-    static int      getMfaImg(u_int8_t *mfa_buf, int size, char *psid, u_int8_t **imgbuf, char *errMsg, int errBufSize);
+    static int getMfaImgInner(char* fileName,
+                              u_int8_t* mfa_buf,
+                              int size,
+                              char* psid,
+                              u_int8_t** imgbuf,
+                              char* errBuf,
+                              int errBufSize);
+    static int getMfaImg(char* fileName, char* psid, u_int8_t** imgbuf, char* errBuf, int errBufSize);
+    static int getMfaImg(u_int8_t* mfa_buf, int size, char* psid, u_int8_t** imgbuf, char* errMsg, int errBufSize);
 #endif
-    
-    static int      getBufferSignature(u_int8_t *buf, u_int32_t size);
+
+    static int getBufferSignature(u_int8_t* buf, u_int32_t size);
     static u_int8_t CheckFwFormat(FBase& f, bool getFwFormatFromImg = false);
-    static u_int8_t IsFS4Image(FBase& f, u_int32_t *found_images);
-    static u_int8_t IsFS3OrFS2Image(FBase& f, u_int32_t *found_images);
+    static u_int8_t IsFS4Image(FBase& f, u_int32_t* found_images);
+    static u_int8_t IsFS3OrFS2Image(FBase& f, u_int32_t* found_images);
     static u_int8_t IsCableImage(FBase& f);
-    static bool     FindMagicPattern(FBase *ioAccess, u_int32_t addr,
-                                     u_int32_t const cntx_magic_pattern[]);
+    static bool FindMagicPattern(FBase* ioAccess, u_int32_t addr, u_int32_t const cntx_magic_pattern[]);
 
     /* Name:        WriteToErrBuff
      * Description: Write a string into buffer.
@@ -597,7 +747,7 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
      * @param[in] errBuff - pointer to dist error buffer
      * @param[in] errStr - pointer to source string
      * @param[in] bufSize - size of error buffer */
-    static void WriteToErrBuff(char *errBuff, char *errStr, int bufSize);
+    static void WriteToErrBuff(char* errBuff, char* errStr, int bufSize);
 
     void BackUpFwParams(fw_ops_params_t& fwParams);
     // Methods
@@ -608,19 +758,18 @@ class MLXFWOP_API FwOperations : public FlintErrMsg {
     // Members
     static const HwDevData hwDevData[];
     static const HwDev2Str hwDev2Str[];
-    //fw_hndl_type_t _hndlType;  //not used atm
+    // fw_hndl_type_t _hndlType;  //not used atm
 
 protected:
     static const u_int32_t _cntx_magic_pattern[4];
     static const u_int32_t _fs4_magic_pattern[4];
 };
 
-
 class CRSpaceRegisters
 {
 public:
     CRSpaceRegisters(mfile* mf, chip_type_t chip_type);
-    
+
     int getGlobalImageStatus();
     life_cycle_t getLifeCycle();
     u_int32_t getSecurityVersion();
diff --git a/mlxfwops/lib/fw_version.cpp b/mlxfwops/lib/fw_version.cpp
index 193ee378..8595e6cb 100644
--- a/mlxfwops/lib/fw_version.cpp
+++ b/mlxfwops/lib/fw_version.cpp
@@ -43,30 +43,32 @@ const unsigned short FORMAT0_SIB_MAJOR = 11;
 const unsigned short FORMAT0_MAX_MINOR_SIB = 1;
 const unsigned short FORMAT1_MIN_MINOR = 100;
 
-FwVersion::FwVersion() :
-        _major(0), _minor(0), _subminor(0), _devBranchTag("") {
-}
+FwVersion::FwVersion() : _major(0), _minor(0), _subminor(0), _devBranchTag("") {}
 
-FwVersion::FwVersion(unsigned short int major, unsigned short int minor,
-        unsigned short int subminor, const std::string& devBranchTag) :
-        _major(major), _minor(minor), _subminor(subminor),
-        _devBranchTag(devBranchTag) {
+FwVersion::FwVersion(unsigned short int major,
+                     unsigned short int minor,
+                     unsigned short int subminor,
+                     const std::string& devBranchTag) :
+    _major(major), _minor(minor), _subminor(subminor), _devBranchTag(devBranchTag)
+{
 }
 
-FwVersion::~FwVersion() {
-}
+FwVersion::~FwVersion() {}
 
 FwVersion::FwVersion(const FwVersion& rhs) :
-        _major(rhs._major), _minor(rhs._minor), _subminor(rhs._subminor),
-        _devBranchTag(rhs._devBranchTag) {
+    _major(rhs._major), _minor(rhs._minor), _subminor(rhs._subminor), _devBranchTag(rhs._devBranchTag)
+{
 }
 
-std::string FwVersion::get() const {
+std::string FwVersion::get() const
+{
     return get_fw_version();
 }
 
-FwVersion& FwVersion::operator =(const FwVersion& rhs) {
-    if (this != &rhs) {
+FwVersion& FwVersion::operator=(const FwVersion& rhs)
+{
+    if (this != &rhs)
+    {
         _major = rhs._major;
         _minor = rhs._minor;
         _subminor = rhs._subminor;
@@ -75,42 +77,46 @@ FwVersion& FwVersion::operator =(const FwVersion& rhs) {
     return *this;
 }
 
-bool FwVersion::operator ==(const FwVersion& rhs) const {
-    return _major == rhs._major &&
-           _minor == rhs._minor &&
-           _subminor == rhs._subminor &&
+bool FwVersion::operator==(const FwVersion& rhs) const
+{
+    return _major == rhs._major && _minor == rhs._minor && _subminor == rhs._subminor &&
            _devBranchTag == rhs._devBranchTag;
 }
 
-std::ostream& operator <<(std::ostream& os, const FwVersion& fw_ver) {
+std::ostream& operator<<(std::ostream& os, const FwVersion& fw_ver)
+{
     return os << fw_ver.get_fw_version();
 }
 
-std::string FwVersion::get_fw_version(const std::string& master_format,
-        bool even_subminor, const std::string& not_set) const {
-    if (!is_set()) {
+std::string
+  FwVersion::get_fw_version(const std::string& master_format, bool even_subminor, const std::string& not_set) const
+{
+    if (!is_set())
+    {
         return not_set;
     }
-    if (!is_master_branch()) {
+    if (!is_master_branch())
+    {
         return _devBranchTag;
     }
     return get_master_version(master_format, even_subminor);
 }
 
-std::string FwVersion::get_master_version(const std::string& format,
-        bool even_subminor) const {
+std::string FwVersion::get_master_version(const std::string& format, bool even_subminor) const
+{
     char buff[MAX_VERSION_LENGTH + 1];
-    snprintf(buff, sizeof(buff), format.c_str(), _major, _minor,
-            _subminor - (even_subminor ? _subminor % 2 : 0));
+    snprintf(buff, sizeof(buff), format.c_str(), _major, _minor, _subminor - (even_subminor ? _subminor % 2 : 0));
     return buff;
 }
 
-bool FwVersion::is_set() const {
+bool FwVersion::is_set() const
+{
     return _major || _minor || _subminor || !_devBranchTag.empty();
 }
 
-bool FwVersion::operator !=(const FwVersion& rhs) const {
-    return !(this->operator ==(rhs));
+bool FwVersion::operator!=(const FwVersion& rhs) const
+{
+    return !(this->operator==(rhs));
 }
 
 // 13 is Spectrum1
@@ -124,25 +130,29 @@ bool FwVersion::operator !=(const FwVersion& rhs) const {
 // 34 is Spectrum4
 bool FwVersion::is_switch_or_gb() const
 {
-    if (_major == 0 && _minor == 0 && _subminor == 0 && !_devBranchTag.empty()) {
+    if (_major == 0 && _minor == 0 && _subminor == 0 && !_devBranchTag.empty())
+    {
         return true;
     }
-    if (_major == 11 || _major == 13 || _major == 15 || _major == 27
-        || _major == 29 || _major == 30 || _major == 31 || _major == 34
-        || _major == 19 || _major == 21) {
+    if (_major == 11 || _major == 13 || _major == 15 || _major == 27 || _major == 29 || _major == 30 || _major == 31 ||
+        _major == 34 || _major == 19 || _major == 21)
+    {
         return true;
     }
     return false;
 }
 
-bool FwVersion::is_master_branch() const {
-    if (!is_switch_or_gb()) {
+bool FwVersion::is_master_branch() const
+{
+    if (!is_switch_or_gb())
+    {
         return true;
     }
     return _devBranchTag.empty();
 }
 
-bool FwVersion::are_same_branch(const FwVersion& rhs) const {
+bool FwVersion::are_same_branch(const FwVersion& rhs) const
+{
     // one is master other is dev
     if (is_master_branch() != rhs.is_master_branch())
         return false;
@@ -150,71 +160,80 @@ bool FwVersion::are_same_branch(const FwVersion& rhs) const {
     if (is_master_branch())
         return true;
     // check if prefix for string is the same
-    return _devBranchTag.substr(0, _devBranchTag.size() - MAX_MINOR_LENGETH)
-            == rhs._devBranchTag.substr(0,
-                    rhs._devBranchTag.size() - MAX_MINOR_LENGETH);
+    return _devBranchTag.substr(0, _devBranchTag.size() - MAX_MINOR_LENGETH) ==
+           rhs._devBranchTag.substr(0, rhs._devBranchTag.size() - MAX_MINOR_LENGETH);
 }
 
-int FwVersion::compare_master_version(const FwVersion& rhs) const {
-    if (get_master_format() != rhs.get_master_format()) {
+int FwVersion::compare_master_version(const FwVersion& rhs) const
+{
+    if (get_master_format() != rhs.get_master_format())
+    {
         // check for old formats
         return get_master_format() - rhs.get_master_format();
     }
-    unsigned short int lhs_master_version[] = { _major, _minor, _subminor };
-    unsigned short int rhs_master_version[] = { rhs._major, rhs._minor, rhs._subminor };
-    for (unsigned short i = 0; i < sizeof(lhs_master_version)/sizeof(lhs_master_version[0]); i++) {
-        if (lhs_master_version[i] != rhs_master_version[i]) {
+    unsigned short int lhs_master_version[] = {_major, _minor, _subminor};
+    unsigned short int rhs_master_version[] = {rhs._major, rhs._minor, rhs._subminor};
+    for (unsigned short i = 0; i < sizeof(lhs_master_version) / sizeof(lhs_master_version[0]); i++)
+    {
+        if (lhs_master_version[i] != rhs_master_version[i])
+        {
             return lhs_master_version[i] - rhs_master_version[i];
         }
     }
     return 0;
 }
 
-int FwVersion::compare(const FwVersion& rhs) const {
-    if (!are_same_branch(rhs)) {
+int FwVersion::compare(const FwVersion& rhs) const
+{
+    if (!are_same_branch(rhs))
+    {
         throw FwVersionException();
     }
-    if (is_master_branch()) {
-        //master branch
+    if (is_master_branch())
+    {
+        // master branch
         return compare_master_version(rhs);
     }
     // branch version
-    return atoi(
-            _devBranchTag.substr(_devBranchTag.size() - MAX_MINOR_LENGETH,
-                    MAX_MINOR_LENGETH).c_str())
-            - atoi(
-                    rhs._devBranchTag.substr(
-                            rhs._devBranchTag.size() - MAX_MINOR_LENGETH,
-                            MAX_MINOR_LENGETH).c_str());
+    return atoi(_devBranchTag.substr(_devBranchTag.size() - MAX_MINOR_LENGETH, MAX_MINOR_LENGETH).c_str()) -
+           atoi(rhs._devBranchTag.substr(rhs._devBranchTag.size() - MAX_MINOR_LENGETH, MAX_MINOR_LENGETH).c_str());
 }
 
-int FwVersion::get_master_format() const {
-    if (_minor >= FORMAT1_MIN_MINOR) {
+int FwVersion::get_master_format() const
+{
+    if (_minor >= FORMAT1_MIN_MINOR)
+    {
         return 1;
     }
-    if ((_major == FORMAT0_CIB_MAJOR && _minor <= FORMAT0_MAX_MINOR_CIB)
-            || (_major == FORMAT0_SIB_MAJOR && _minor <= FORMAT0_MAX_MINOR_SIB)) {
+    if ((_major == FORMAT0_CIB_MAJOR && _minor <= FORMAT0_MAX_MINOR_CIB) ||
+        (_major == FORMAT0_SIB_MAJOR && _minor <= FORMAT0_MAX_MINOR_SIB))
+    {
         return 0;
     }
     return 2;
 }
 
-bool FwVersion::operator <(const FwVersion& rhs) const {
+bool FwVersion::operator<(const FwVersion& rhs) const
+{
     return compare(rhs) < 0;
 }
 
-bool FwVersion::operator <=(const FwVersion& rhs) const {
+bool FwVersion::operator<=(const FwVersion& rhs) const
+{
     return compare(rhs) <= 0;
 }
 
-bool FwVersion::operator >(const FwVersion& rhs) const {
+bool FwVersion::operator>(const FwVersion& rhs) const
+{
     return compare(rhs) > 0;
 }
 
-bool FwVersion::operator >=(const FwVersion& rhs) const {
+bool FwVersion::operator>=(const FwVersion& rhs) const
+{
     return compare(rhs) >= 0;
 }
 
-FwVersion* FwVersion::clone() const {
+FwVersion* FwVersion::clone() const
+{
     return new FwVersion(*this);
 }
diff --git a/mlxfwops/lib/fw_version.h b/mlxfwops/lib/fw_version.h
index 6b6103fd..265162e6 100644
--- a/mlxfwops/lib/fw_version.h
+++ b/mlxfwops/lib/fw_version.h
@@ -49,20 +49,18 @@
 #define MLXFWOP_API
 #endif
 
-const std::string DIFFERENT_BRANCHES_EXCEPTION =
-        "Trying to compare different branches is invalid";
+const std::string DIFFERENT_BRANCHES_EXCEPTION = "Trying to compare different branches is invalid";
 const std::string NOT_SET_VERSION = "";
 const unsigned short MAX_VERSION_LENGTH = 28;
 
-class FwVersionException: public std::runtime_error {
+class FwVersionException : public std::runtime_error
+{
 public:
-    FwVersionException() :
-            std::runtime_error(DIFFERENT_BRANCHES_EXCEPTION) {
-    }
+    FwVersionException() : std::runtime_error(DIFFERENT_BRANCHES_EXCEPTION) {}
 };
 
-
-class MLXFWOP_API FwVersion {
+class MLXFWOP_API FwVersion
+{
     /*
      * Using MGIR command, when a given FW binary has non-zero value in
      * DEVELOPMENT_INFO, it shall be treated as a development branch file.
@@ -72,34 +70,34 @@ class MLXFWOP_API FwVersion {
      */
 public:
     FwVersion();
-    FwVersion(unsigned short int, unsigned short int, unsigned short int,
-            const std::string& = "");
+    FwVersion(unsigned short int, unsigned short int, unsigned short int, const std::string& = "");
     virtual ~FwVersion();
     FwVersion(const FwVersion&);
     FwVersion& operator=(const FwVersion&);
     bool operator==(const FwVersion&) const;
     bool operator!=(const FwVersion&) const;
-    bool operator>(const FwVersion &) const;
-    bool operator<(const FwVersion &) const;
-    bool operator>=(const FwVersion &) const;
-    bool operator<=(const FwVersion &) const;
+    bool operator>(const FwVersion&) const;
+    bool operator<(const FwVersion&) const;
+    bool operator>=(const FwVersion&) const;
+    bool operator<=(const FwVersion&) const;
     std::string get() const;
     friend std::ostream& operator<<(std::ostream&, const FwVersion&);
     std::string get_fw_version(const std::string& master_format = "%d.%d.%d",
-            bool even_subminor = false,
-            const std::string& not_set = NOT_SET_VERSION) const;
+                               bool even_subminor = false,
+                               const std::string& not_set = NOT_SET_VERSION) const;
     bool is_set() const;
     bool are_same_branch(const FwVersion&) const;
     int compare_master_version(const FwVersion&) const;
     int compare(const FwVersion&) const;
     virtual FwVersion* clone() const;
+
 protected:
     unsigned short int _major;
     unsigned short int _minor;
     unsigned short int _subminor;
     std::string _devBranchTag;
-    virtual std::string get_master_version(const std::string& format,
-            bool even_subminor = false) const;
+    virtual std::string get_master_version(const std::string& format, bool even_subminor = false) const;
+
 private:
     bool is_master_branch() const;
     bool is_switch_or_gb() const;
diff --git a/mlxfwops/lib/mlxfwops.cpp b/mlxfwops/lib/mlxfwops.cpp
index 39b26a23..878ecea1 100644
--- a/mlxfwops/lib/mlxfwops.cpp
+++ b/mlxfwops/lib/mlxfwops.cpp
@@ -31,21 +31,20 @@
  * SOFTWARE.
  */
 
-
 // #include <stdlib.h>
 
 #include "mlxfwops.h"
 #include "fw_ops.h"
 #include "fs_checks.h"
 #ifdef UEFI_BUILD
-    #include "uefi_c.h"
+#include "uefi_c.h"
 #endif
 
 #define ERR_BUFF_SIZE 1024
 
 bool nextBootFwVer = false;
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_adv(mlxfwops_t **mlxfwops_p, fwops_params_t* params)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_adv(mlxfwops_t** mlxfwops_p, fwops_params_t* params)
 {
     FwOperations::fw_ops_params_t fwParams;
     memset(&fwParams, 0, sizeof(fwParams));
@@ -62,17 +61,26 @@ MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_adv(mlxfwops_t **mlxfwops_p, fwops
     fwParams.noFlashVerify = false;
     fwParams.flashParams = (flash_params_t*)NULL;
     fwParams.shortErrors = true;
-    *mlxfwops_p = (mlxfwops_t*) FwOperations::FwOperationsCreate(fwParams);
-    if (*mlxfwops_p == NULL) {
+    *mlxfwops_p = (mlxfwops_t*)FwOperations::FwOperationsCreate(fwParams);
+    if (*mlxfwops_p == NULL)
+    {
         return MLXFW_MEM_ERR;
     }
     return MLXFW_OK;
 }
 
-int mlxfw_open_int(mlxfwops_t **mlxfwops_p, void *fw_hndl, void *extra, char *psid, fw_hndl_type_t hndl_type, char *err_buf, int buf_size)
+int mlxfw_open_int(mlxfwops_t** mlxfwops_p,
+                   void* fw_hndl,
+                   void* extra,
+                   char* psid,
+                   fw_hndl_type_t hndl_type,
+                   char* err_buf,
+                   int buf_size)
 {
-    *mlxfwops_p = (mlxfwops_t*) FwOperations::FwOperationsCreate((void*)fw_hndl, extra, psid, hndl_type, err_buf, buf_size);
-    if (*mlxfwops_p == NULL) {
+    *mlxfwops_p =
+      (mlxfwops_t*)FwOperations::FwOperationsCreate((void*)fw_hndl, extra, psid, hndl_type, err_buf, buf_size);
+    if (*mlxfwops_p == NULL)
+    {
         return MLXFW_MEM_ERR;
     }
     return MLXFW_OK;
@@ -88,28 +96,31 @@ FwOperations::ExtBurnParams initBurnParams(u_int8_t force_version, f_prog_func p
     return burnParams;
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_verbose(mlxfwops_t **mlxfwops_p, char *device_name, char *buf, int buf_size)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_verbose(mlxfwops_t** mlxfwops_p,
+                                                      char* device_name,
+                                                      char* buf,
+                                                      int buf_size)
 {
     return mlxfw_open_int(mlxfwops_p, device_name, NULL, (char*)NULL, FHT_MST_DEV, buf, buf_size);
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_device(mlxfwops_t **mlxfwops_p, char *handle_name)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_device(mlxfwops_t** mlxfwops_p, char* handle_name)
 {
     return mlxfw_open_int(mlxfwops_p, handle_name, NULL, (char*)NULL, FHT_MST_DEV, (char*)NULL, 0);
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_image(mlxfwops_t **mlxfwops_p, char *file_name, char *psid)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_image(mlxfwops_t** mlxfwops_p, char* file_name, char* psid)
 {
     return mlxfw_open_int(mlxfwops_p, file_name, NULL, psid, FHT_FW_FILE, (char*)NULL, 0);
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_buffer(mlxfwops_t **mlxfwops_p, void *buffer, u_int32_t size, char *psid)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_buffer(mlxfwops_t** mlxfwops_p, void* buffer, u_int32_t size, char* psid)
 {
     return mlxfw_open_int(mlxfwops_p, buffer, &size, psid, FHT_FW_BUFF, (char*)NULL, 0);
 }
 
 #ifdef CABLES_SUPP
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_cable(mlxfwops_t **mlxfwops_p, char *handle_name, int port)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_cable(mlxfwops_t** mlxfwops_p, char* handle_name, int port)
 {
     return mlxfw_open_int(mlxfwops_p, handle_name, &port, (char*)NULL, FHT_CABLE_DEV, (char*)NULL, 0);
 }
@@ -117,7 +128,11 @@ MLXFWOP_API int MLXFWOPCALL mlxfw_open_cable(mlxfwops_t **mlxfwops_p, char *hand
 
 #ifdef UEFI_BUILD
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_uefi(mlxfwops_t **mlxfwops_p, uefi_Dev_t *dev, f_fw_cmd fw_cmd_func, f_dma_alloc dma_func, uefi_dev_info_t *dev_info)
+MLXFWOP_API int MLXFWOPCALL mlxfw_open_uefi(mlxfwops_t** mlxfwops_p,
+                                            uefi_Dev_t* dev,
+                                            f_fw_cmd fw_cmd_func,
+                                            f_dma_alloc dma_func,
+                                            uefi_dev_info_t* dev_info)
 {
     uefi_dev_extra_t dev_extra;
     memset(&dev_extra, 0, sizeof(dev_extra));
@@ -127,9 +142,10 @@ MLXFWOP_API int MLXFWOPCALL mlxfw_open_uefi(mlxfwops_t **mlxfwops_p, uefi_Dev_t
     return mlxfw_open_int(mlxfwops_p, dev, (void*)&dev_extra, (char*)NULL, FHT_UEFI_DEV, (char*)NULL, 0);
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_set_print(mlxfwops_t *mlxfwops, f_prog_func_str print_func)
+MLXFWOP_API int MLXFWOPCALL mlxfw_set_print(mlxfwops_t* mlxfwops, f_prog_func_str print_func)
 {
-    if (mlxfwops == NULL) {
+    if (mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
     return !static_cast<FwOperations*>((void*)mlxfwops)->FwSetPrint(print_func);
@@ -137,149 +153,162 @@ MLXFWOP_API int MLXFWOPCALL mlxfw_set_print(mlxfwops_t *mlxfwops, f_prog_func_st
 
 MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err)
 {
-    switch (err) {
-    case 0:
-        return "";
+    switch (err)
+    {
+        case 0:
+            return "";
 
-    case MLXFW_ERR:
-        return "General Error";
+        case MLXFW_ERR:
+            return "General Error";
 
-    case MLXFW_MEM_ERR:
-        return "Memory allocation Error";
+        case MLXFW_MEM_ERR:
+            return "Memory allocation Error";
 
-    case MLXFW_ERR_IN_STR:
-        return "Error in String";
+        case MLXFW_ERR_IN_STR:
+            return "Error in String";
 
-    case MLXFW_PSID_MISMATCH_ERR:
-        return "PSID Mismatch";
+        case MLXFW_PSID_MISMATCH_ERR:
+            return "PSID Mismatch";
 
-    case MLXFW_FLASH_WRITE_ERR:
-        return "Flash write Failed";
+        case MLXFW_FLASH_WRITE_ERR:
+            return "Flash write Failed";
 
-    case MLXFW_NO_VALID_IMAGE_ERR:
-        return "No valid image found";
+        case MLXFW_NO_VALID_IMAGE_ERR:
+            return "No valid image found";
 
-    case MLXFW_MULTIPLE_VALID_IMAGES_ERR:
-        return "More than one valid image found";
+        case MLXFW_MULTIPLE_VALID_IMAGES_ERR:
+            return "More than one valid image found";
 
-    case MLXFW_BAD_CRC_ERR:
-        return "Bad CRC";
+        case MLXFW_BAD_CRC_ERR:
+            return "Bad CRC";
 
-    case MLXFW_BAD_CHECKSUM_ERR:
-        return "Bad Checksum";
+        case MLXFW_BAD_CHECKSUM_ERR:
+            return "Bad Checksum";
 
-    case MLXFW_SECTION_TOO_LARGE_ERR:
-        return "Section too large";
+        case MLXFW_SECTION_TOO_LARGE_ERR:
+            return "Section too large";
 
-    case MLXFW_SECTION_CORRUPTED_ERR:
-        return "Section is corrupted";
+        case MLXFW_SECTION_CORRUPTED_ERR:
+            return "Section is corrupted";
 
-    case MLXFW_IMAGE_NOT_FS_ERR:
-        return "Image is not failsafe";
+        case MLXFW_IMAGE_NOT_FS_ERR:
+            return "Image is not failsafe";
 
-    case MLXFW_IMAGE_TOO_LARGE_ERR:
-        return "Image too large";
+        case MLXFW_IMAGE_TOO_LARGE_ERR:
+            return "Image too large";
 
-    case MLXFW_IMAGE_FORMAT_ERR:
-        return "Incompatible image format";
+        case MLXFW_IMAGE_FORMAT_ERR:
+            return "Incompatible image format";
 
-    case MLXFW_DEVICE_IMAGE_MISMATCH_ERR:
-        return "FW image does not match device";
+        case MLXFW_DEVICE_IMAGE_MISMATCH_ERR:
+            return "FW image does not match device";
 
-    case MLXFW_IMAGE_CORRUPTED_ERR:
-        return "FW image corrupted";
+        case MLXFW_IMAGE_CORRUPTED_ERR:
+            return "FW image corrupted";
 
-    case MLXFW_FS_INFO_MISMATCH_ERR:
-        return "Failsafe information mismatch";
+        case MLXFW_FS_INFO_MISMATCH_ERR:
+            return "Failsafe information mismatch";
 
-    case MLXFW_DEV_ID_ERR:
-        return "Unsupported device ID";
+        case MLXFW_DEV_ID_ERR:
+            return "Unsupported device ID";
 
-    case MLXFW_UNSUPPORTED_BIN_VER_ERR:
-        return "Unsupported binary version";
+        case MLXFW_UNSUPPORTED_BIN_VER_ERR:
+            return "Unsupported binary version";
 
-    case MLXFW_NO_VALID_ITOC_ERR:
-        return "No valid ITOC found";
+        case MLXFW_NO_VALID_ITOC_ERR:
+            return "No valid ITOC found";
 
-    case MLXFW_NO_MFG_ERR:
-        return "No MFG_INFO section found";
+        case MLXFW_NO_MFG_ERR:
+            return "No MFG_INFO section found";
 
-    case MLXFW_UNKNOWN_SECT_VER_ERR:
-        return "Unknown Section Version";
+        case MLXFW_UNKNOWN_SECT_VER_ERR:
+            return "Unknown Section Version";
 
-    case MLXFW_OCR_ERR:
-        return "-ocr flag must be specified";
+        case MLXFW_OCR_ERR:
+            return "-ocr flag must be specified";
 
-    case MLXFW_OPEN_OCR_ERR:
-        return "Failed to open device for flash direct access";
+        case MLXFW_OPEN_OCR_ERR:
+            return "Failed to open device for flash direct access";
 
-    case MLXFW_FW_ALREADY_UPDATED_ERR:
-        return "FW already updated";
+        case MLXFW_FW_ALREADY_UPDATED_ERR:
+            return "FW already updated";
 
-    case MLXFW_ROM_UPDATE_IN_IMAGE_ERR:
-        return "Failed to update Exp-ROM in image";
+        case MLXFW_ROM_UPDATE_IN_IMAGE_ERR:
+            return "Failed to update Exp-ROM in image";
 
-    case MLXFW_GET_SECT_ERR:
-        return "Failed to get Section";
+        case MLXFW_GET_SECT_ERR:
+            return "Failed to get Section";
 
-    case MLXFW_UPDATE_SECT_ERR:
-        return "Failed to update section";
+        case MLXFW_UPDATE_SECT_ERR:
+            return "Failed to update section";
 
-    case MLXFW_BAD_PARAM_ERR:
-        return "Bad parameter";
-    case MLXFW_FS_CHECKS_ERR:
-        return "Fixes are needed for Flash layout, an error occurred while preparing the operation";
-    default:
-        return "Unknown Error";
+        case MLXFW_BAD_PARAM_ERR:
+            return "Bad parameter";
+        case MLXFW_FS_CHECKS_ERR:
+            return "Fixes are needed for Flash layout, an error occurred while preparing the operation";
+        default:
+            return "Unknown Error";
     }
 }
 
 #endif
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_burn(mlxfwops_t *dev_mlxfwops, mlxfwops_t *img_mlxfwops, u_int8_t force_version, f_prog_func prog_func, int allow_psid_change)
+MLXFWOP_API int MLXFWOPCALL mlxfw_burn(mlxfwops_t* dev_mlxfwops,
+                                       mlxfwops_t* img_mlxfwops,
+                                       u_int8_t force_version,
+                                       f_prog_func prog_func,
+                                       int allow_psid_change)
 {
-    if (dev_mlxfwops == NULL || img_mlxfwops == NULL) {
+    if (dev_mlxfwops == NULL || img_mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
     FwOperations::ExtBurnParams burnParams = initBurnParams(force_version, prog_func, allow_psid_change);
-    bool rc = !static_cast<FwOperations*>((void*)dev_mlxfwops)->FwBurnAdvanced(static_cast<FwOperations*>((void*)img_mlxfwops),burnParams);
+    bool rc = !static_cast<FwOperations*>((void*)dev_mlxfwops)
+                 ->FwBurnAdvanced(static_cast<FwOperations*>((void*)img_mlxfwops), burnParams);
     int errorCode = static_cast<FwOperations*>((void*)dev_mlxfwops)->getErrorCode(); // the class's verbose error code
-    return rc ? ( errorCode ? errorCode : rc) : rc;
+    return rc ? (errorCode ? errorCode : rc) : rc;
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_fs_check_and_update(fw_info_t *fw_info, mlxfwops_t **dev_mlxfwops_p, mlxfwops_t *img_mlxfwops,
-        u_int8_t force_version, f_prog_func prog_func, int allow_psid_change/*, mlxfwparams_t* fwParams*/)
+MLXFWOP_API int MLXFWOPCALL mlxfw_fs_check_and_update(fw_info_t* fw_info,
+                                                      mlxfwops_t** dev_mlxfwops_p,
+                                                      mlxfwops_t* img_mlxfwops,
+                                                      u_int8_t force_version,
+                                                      f_prog_func prog_func,
+                                                      int allow_psid_change /*, mlxfwparams_t* fwParams*/)
 {
-    if (dev_mlxfwops_p == NULL || *dev_mlxfwops_p == NULL || img_mlxfwops == NULL) {
+    if (dev_mlxfwops_p == NULL || *dev_mlxfwops_p == NULL || img_mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
 
-    mlxfwops_t* dev_mlxfwops= *dev_mlxfwops_p;
+    mlxfwops_t* dev_mlxfwops = *dev_mlxfwops_p;
 
     FwOperations::ExtBurnParams burnParams = initBurnParams(force_version, prog_func, allow_psid_change);
     FwOperations::fw_ops_params_t fwParams;
     (static_cast<FwOperations*>((void*)dev_mlxfwops))->GetFwParams(fwParams);
 
     FsChecks fsChecks(*fw_info, static_cast<FwOperations*>((void*)dev_mlxfwops),
-            static_cast<FwOperations*>((void*)img_mlxfwops), burnParams,
-            fwParams);
-    if (!fsChecks.ExecuteChecks( static_cast<FwOperations**>((void*)dev_mlxfwops_p), burnParams, *fw_info)) {
+                      static_cast<FwOperations*>((void*)img_mlxfwops), burnParams, fwParams);
+    if (!fsChecks.ExecuteChecks(static_cast<FwOperations**>((void*)dev_mlxfwops_p), burnParams, *fw_info))
+    {
         return MLXFW_FS_CHECKS_ERR;
     }
 
     return MLXFW_OK;
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_query(mlxfwops_t *mlxfwops, fw_info_t *fw_info)
+MLXFWOP_API int MLXFWOPCALL mlxfw_query(mlxfwops_t* mlxfwops, fw_info_t* fw_info)
 {
-    if (mlxfwops == NULL) {
+    if (mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
 #ifdef UEFI_BUILD
     // skip reading ROM in UEFI due to performance issues
-    return (static_cast<FwOperations*>((void*)mlxfwops)->FwQuery(fw_info, false) == true) ? MLXFW_OK :  MLXFW_ERR_IN_STR;
+    return (static_cast<FwOperations*>((void*)mlxfwops)->FwQuery(fw_info, false) == true) ? MLXFW_OK : MLXFW_ERR_IN_STR;
 #else
-    return (static_cast<FwOperations*>((void*)mlxfwops)->FwQuery(fw_info, true) == true) ? MLXFW_OK :  MLXFW_ERR_IN_STR;
+    return (static_cast<FwOperations*>((void*)mlxfwops)->FwQuery(fw_info, true) == true) ? MLXFW_OK : MLXFW_ERR_IN_STR;
 #endif
 }
 
@@ -288,25 +317,28 @@ MLXFWOP_API const char* MLXFWOPCALL mlxfw_exp_rom_type_to_str(u_int16_t type)
     return FwOperations::expRomType2Str(type);
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_verify(mlxfwops_t *mlxfwops)
+MLXFWOP_API int MLXFWOPCALL mlxfw_verify(mlxfwops_t* mlxfwops)
 {
-    if (mlxfwops == NULL) {
+    if (mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
     return !static_cast<FwOperations*>((void*)mlxfwops)->FwVerify((f_prog_func_str)NULL);
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_read_image(mlxfwops_t *mlxfwops, void *image, u_int32_t *image_size)
+MLXFWOP_API int MLXFWOPCALL mlxfw_read_image(mlxfwops_t* mlxfwops, void* image, u_int32_t* image_size)
 {
-    if (mlxfwops == NULL) {
+    if (mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
     return !(static_cast<FwOperations*>((void*)mlxfwops)->FwReadData(image, image_size));
 }
 
-MLXFWOP_API void MLXFWOPCALL mlxfw_close(mlxfwops_t *mlxfwops)
+MLXFWOP_API void MLXFWOPCALL mlxfw_close(mlxfwops_t* mlxfwops)
 {
-    if (mlxfwops) {
+    if (mlxfwops)
+    {
         static_cast<FwOperations*>((void*)mlxfwops)->FwCleanUp();
         delete static_cast<FwOperations*>((void*)mlxfwops);
         mlxfwops = (mlxfwops_t*)NULL;
@@ -314,17 +346,19 @@ MLXFWOP_API void MLXFWOPCALL mlxfw_close(mlxfwops_t *mlxfwops)
     return;
 }
 
-MLXFWOP_API const char* MLXFWOPCALL mlxfw_get_last_error(mlxfwops_t *mlxfwops)
+MLXFWOP_API const char* MLXFWOPCALL mlxfw_get_last_error(mlxfwops_t* mlxfwops)
 {
-    if (mlxfwops == NULL) {
+    if (mlxfwops == NULL)
+    {
         return "Cannot get last error - No mlxfwops handle";
     }
     return (static_cast<FwOperations*>((void*)mlxfwops)->err());
 }
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_get_last_error_code(mlxfwops_t *mlxfwops)
+MLXFWOP_API int MLXFWOPCALL mlxfw_get_last_error_code(mlxfwops_t* mlxfwops)
 {
-    if (mlxfwops == NULL) {
+    if (mlxfwops == NULL)
+    {
         return MLXFW_BAD_PARAM_ERR;
     }
     return (static_cast<FwOperations*>((void*)mlxfwops)->getErrorCode());
diff --git a/mlxfwops/lib/mlxfwops.h b/mlxfwops/lib/mlxfwops.h
index d161345b..9f8ba51e 100644
--- a/mlxfwops/lib/mlxfwops.h
+++ b/mlxfwops/lib/mlxfwops.h
@@ -31,7 +31,6 @@
  * SOFTWARE.
  */
 
-
 #ifndef MLXFWOP_H
 #define MLXFWOP_H
 
@@ -39,69 +38,87 @@
 #include "mlxfwops_com.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-typedef struct mlxfwops mlxfwops_t;
+    typedef struct mlxfwops mlxfwops_t;
 
-struct image_context {
-    void *data;
-    u_int32_t size;
-};
+    struct image_context
+    {
+        void* data;
+        u_int32_t size;
+    };
 
-typedef struct {
-    char *device_name;
-    char *buf;
-    int buf_size;
-    int mcc_unsupported;
-    int no_fw_ctrl;
-} fwops_params_t;
+    typedef struct
+    {
+        char* device_name;
+        char* buf;
+        int buf_size;
+        int mcc_unsupported;
+        int no_fw_ctrl;
+    } fwops_params_t;
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_device(mlxfwops_t **mlxfwops_p, char *device_name);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_device(mlxfwops_t** mlxfwops_p, char* device_name);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_verbose(mlxfwops_t **mlxfwops_p, char *device_name, char *buf, int buf_size);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_verbose(mlxfwops_t** mlxfwops_p,
+                                                          char* device_name,
+                                                          char* buf,
+                                                          int buf_size);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_adv(mlxfwops_t **mlxfwops_p, fwops_params_t* params);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_device_adv(mlxfwops_t** mlxfwops_p, fwops_params_t* params);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_image(mlxfwops_t **mlxfwops_p, char *file_name, char *psid);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_image(mlxfwops_t** mlxfwops_p, char* file_name, char* psid);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_buffer(mlxfwops_t **mlxfwops_p, void *buffer, u_int32_t size, char *psid);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_buffer(mlxfwops_t** mlxfwops_p, void* buffer, u_int32_t size, char* psid);
 
 #ifdef CABLES_SUPP
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_cable(mlxfwops_t **mlxfwops_p, char *handle_name, int port);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_cable(mlxfwops_t** mlxfwops_p, char* handle_name, int port);
 #endif
 
 #ifdef UEFI_BUILD
 #include <mft_uefi_common.h>
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_open_uefi(mlxfwops_t **mlxfwops_p, uefi_Dev_t *dev, f_fw_cmd fw_cmd_func, f_dma_alloc dma_func, uefi_dev_info_t *dev_info);
-MLXFWOP_API int MLXFWOPCALL mlxfw_set_print(mlxfwops_t *mlxfwops, f_prog_func_str print_func);
-MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_open_uefi(mlxfwops_t** mlxfwops_p,
+                                                uefi_Dev_t* dev,
+                                                f_fw_cmd fw_cmd_func,
+                                                f_dma_alloc dma_func,
+                                                uefi_dev_info_t* dev_info);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_set_print(mlxfwops_t* mlxfwops, f_prog_func_str print_func);
+    MLXFWOP_API const char* MLXFWOPCALL mlxfw_err2str(int err);
 
 #endif
 
-MLXFWOP_API const char* MLXFWOPCALL mlxfw_get_last_error(mlxfwops_t *mlxfwops);
+    MLXFWOP_API const char* MLXFWOPCALL mlxfw_get_last_error(mlxfwops_t* mlxfwops);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_get_last_error_code(mlxfwops_t *mlxfwops);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_get_last_error_code(mlxfwops_t* mlxfwops);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_burn(mlxfwops_t *dev_mlxfwops, mlxfwops_t *img_mlxfwops, u_int8_t force_version, f_prog_func prog_func, int allow_psid_change);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_burn(mlxfwops_t* dev_mlxfwops,
+                                           mlxfwops_t* img_mlxfwops,
+                                           u_int8_t force_version,
+                                           f_prog_func prog_func,
+                                           int allow_psid_change);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_read_image(mlxfwops_t *mlxfwops, void *image, u_int32_t *image_size);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_read_image(mlxfwops_t* mlxfwops, void* image, u_int32_t* image_size);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_verify(mlxfwops_t *mlxfwops);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_verify(mlxfwops_t* mlxfwops);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_query(mlxfwops_t *mlxfwops, fw_info_t *fw_query);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_query(mlxfwops_t* mlxfwops, fw_info_t* fw_query);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_type_match(mlxfwops_t *dev_mlxfwops, mlxfwops_t *img_mlxfwops);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_type_match(mlxfwops_t* dev_mlxfwops, mlxfwops_t* img_mlxfwops);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_fs_check_and_update(fw_info_t *fw_info, mlxfwops_t **dev_mlxfwops, mlxfwops_t *img_mlxfwops,
-        u_int8_t force_version, f_prog_func prog_func, int allow_psid_change);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_fs_check_and_update(fw_info_t* fw_info,
+                                                          mlxfwops_t** dev_mlxfwops,
+                                                          mlxfwops_t* img_mlxfwops,
+                                                          u_int8_t force_version,
+                                                          f_prog_func prog_func,
+                                                          int allow_psid_change);
 
-MLXFWOP_API const char* MLXFWOPCALL mlxfw_exp_rom_type_to_str(u_int16_t type);
+    MLXFWOP_API const char* MLXFWOPCALL mlxfw_exp_rom_type_to_str(u_int16_t type);
 
-MLXFWOP_API void MLXFWOPCALL mlxfw_close(mlxfwops_t *mlxfwops);
+    MLXFWOP_API void MLXFWOPCALL mlxfw_close(mlxfwops_t* mlxfwops);
 
-MLXFWOP_API int MLXFWOPCALL mlxfw_test(mlxfwops_t *mlxfwops, u_int32_t *read_data);
+    MLXFWOP_API int MLXFWOPCALL mlxfw_test(mlxfwops_t* mlxfwops, u_int32_t* read_data);
 
 #ifdef __cplusplus
 }
diff --git a/mlxfwops/lib/mlxfwops_com.h b/mlxfwops/lib/mlxfwops_com.h
index 8cb3966f..b6893828 100644
--- a/mlxfwops/lib/mlxfwops_com.h
+++ b/mlxfwops/lib/mlxfwops_com.h
@@ -59,40 +59,41 @@
 #define EFIAPI
 #endif
 
-#define CONNECTX_HW_ID      400
-#define SWITCHX_HW_ID       581
-#define SWITCH_IB_HW_ID     583
-#define SPECTRUM_HW_ID      585
-#define SWITCH_IB2_HW_ID    587
-#define QUANTUM_HW_ID       589
-#define SPECTRUM2_HW_ID     590
-#define SPECTRUM3_HW_ID     592
-#define QUANTUM2_HW_ID      599
-#define SPECTRUM4_HW_ID     596
-#define GEARBOX_HW_ID       594
-#define GB_MANAGER_HW_ID    595
-#define ABIR_GB_HW_ID       598
-#define CX4_HW_ID           521
-#define CX4LX_HW_ID         523
-#define CX5_HW_ID           525
-#define CX6_HW_ID           527
-#define CX6DX_HW_ID         530
-#define CX6LX_HW_ID         534
-#define CX7_HW_ID           536
-#define CX8_HW_ID           542
-#define BF_HW_ID            529
-#define BF2_HW_ID           532
-#define BF3_HW_ID           540
-#define CX2_HW_ID           400
-#define CX3_HW_ID           501
-#define CX3_PRO_HW_ID       503
-#define IS4_HW_ID           435
-#define CONNECT_IB_HW_ID    511
+#define CONNECTX_HW_ID 400
+#define SWITCHX_HW_ID 581
+#define SWITCH_IB_HW_ID 583
+#define SPECTRUM_HW_ID 585
+#define SWITCH_IB2_HW_ID 587
+#define QUANTUM_HW_ID 589
+#define SPECTRUM2_HW_ID 590
+#define SPECTRUM3_HW_ID 592
+#define QUANTUM2_HW_ID 599
+#define SPECTRUM4_HW_ID 596
+#define GEARBOX_HW_ID 594
+#define GB_MANAGER_HW_ID 595
+#define ABIR_GB_HW_ID 598
+#define CX4_HW_ID 521
+#define CX4LX_HW_ID 523
+#define CX5_HW_ID 525
+#define CX6_HW_ID 527
+#define CX6DX_HW_ID 530
+#define CX6LX_HW_ID 534
+#define CX7_HW_ID 536
+#define CX8_HW_ID 542
+#define BF_HW_ID 529
+#define BF2_HW_ID 532
+#define BF3_HW_ID 540
+#define CX2_HW_ID 400
+#define CX3_HW_ID 501
+#define CX3_PRO_HW_ID 503
+#define IS4_HW_ID 435
+#define CONNECT_IB_HW_ID 511
 
 #define INBAND_MAX_REG_SIZE 44
-#define MCDA_REG_HEADER     16
+#define MCDA_REG_HEADER 16
 
-typedef enum {
+typedef enum
+{
     PROG_WITH_PRECENTAGE,
     PROG_WITHOUT_PRECENTAGE,
     PROG_STRING_ONLY,
@@ -106,20 +107,21 @@ typedef enum
     GA_NON_SECURED = 2,
     RMA = 3,
     NUM_OF_LIFE_CYCLES = 4
-}life_cycle_t;
+} life_cycle_t;
 
 typedef int EFIAPI (*f_prog_func)(int completion);
-typedef int EFIAPI (*f_prog_func_ex)(int completion, void *opaque);
-typedef int EFIAPI (*f_prog_func_adv)(int completion, const char *str, prog_t, void *opaque);
-typedef int (*f_prog_func_str)(char *str);
+typedef int EFIAPI (*f_prog_func_ex)(int completion, void* opaque);
+typedef int EFIAPI (*f_prog_func_adv)(int completion, const char* str, prog_t, void* opaque);
+typedef int (*f_prog_func_str)(char* str);
 
-typedef struct {
+typedef struct
+{
     f_prog_func_adv func;
-    void *opaque;
+    void* opaque;
     f_prog_func uefi_func;
 } f_prog_func_adv_st;
 
-#define VSD_LEN  208
+#define VSD_LEN 208
 #define PSID_LEN 16
 #define PRODUCT_VER_LEN 16
 #define PRS_NAME_LEN 100
@@ -130,27 +132,29 @@ typedef struct {
 #define BRANCH_LEN 28
 #define MIN_BRANCH_LEN 5
 
-#define FREE_STR_MAX_LEN    256
+#define FREE_STR_MAX_LEN 256
 
-#define MAX_ROMS_NUM        5
+#define MAX_ROMS_NUM 5
 #define MAX_ROM_ERR_MSG_LEN 256
-#define ROM_INFO_SIZE       12
+#define ROM_INFO_SIZE 12
 
-//min version that supports Rom Modify
-#define MAJOR_MOD_ROM_FW    2
-#define MINOR_MOD_ROM_FW    6
+// min version that supports Rom Modify
+#define MAJOR_MOD_ROM_FW 2
+#define MINOR_MOD_ROM_FW 6
 #define SUBMINOR_MOD_ROM_FW 1410
 
-//Macros
+// Macros
 #define PRINT_PROGRESS(printFunc, arg) \
-    do { \
-        if (printFunc) { \
-            printFunc((arg)); \
-        } \
-    } while (0) \
-
-
-enum {
+    do                                 \
+    {                                  \
+        if (printFunc)                 \
+        {                              \
+            printFunc((arg));          \
+        }                              \
+    } while (0)
+
+enum
+{
     MLXFW_OK = 0,
     MLXFW_ERR,
     MLXFW_MEM_ERR,
@@ -222,14 +226,16 @@ enum {
     MLXFW_IMAGE_REACTIVATION_UNKNOWN_ERROR
 };
 
-enum {
+enum
+{
     GUIDS = 4,
     MACS = 2,
     MAX_GUIDS = 32
 };
 
 // needed for flint query
-enum {
+enum
+{
     BX_NP_GUIDS = 2,
     BX_SYS_GUIDS = 1,
     BX_GUIDS = BX_NP_GUIDS + BX_SYS_GUIDS,
@@ -244,7 +250,8 @@ enum {
     BX_SLICES_NUM = 2,
 };
 
-enum {
+enum
+{
     BI_IMACS = 0,
     BI_EMACS = BI_IMACS + BX_IMACS,
     BI_WWPNS = BI_EMACS + BX_EMACS,
@@ -253,20 +260,22 @@ enum {
     BI_SYS_GUID = BX_ALL_GUIDS - 1,
 };
 
-typedef enum security_mode_mask {
-    SMM_MCC_EN    = 0x1,
-    SMM_DEBUG_FW  = 0x1 << 1,
+typedef enum security_mode_mask
+{
+    SMM_MCC_EN = 0x1,
+    SMM_DEBUG_FW = 0x1 << 1,
     SMM_SIGNED_FW = 0x1 << 2,
     SMM_SECURE_FW = 0x1 << 3,
-    SMM_DEV_FW    = 0x1 << 4,
-    SMM_CS_TOKEN  = 0x1 << 5,
+    SMM_DEV_FW = 0x1 << 4,
+    SMM_CS_TOKEN = 0x1 << 5,
     SMM_DBG_TOKEN = 0x1 << 6,
     SMM_CRYTO_TO_COMMISSIONING = 0x1 << 7,
-    SMM_RMCS_TOKEN  = 0x1 << 8,
-    SMM_RMDT_TOKEN  = 0x1 << 9
+    SMM_RMCS_TOKEN = 0x1 << 8,
+    SMM_RMDT_TOKEN = 0x1 << 9
 } security_mode_mask_t;
 
-typedef enum security_mode {
+typedef enum security_mode
+{
     SM_NONE = 0x0,
     SM_SHA_DIGEST = SMM_MCC_EN,
     SM_SIGNED_IMAGE = SMM_MCC_EN | SMM_SIGNED_FW,
@@ -274,7 +283,8 @@ typedef enum security_mode {
     SM_DEBUG_FW = SMM_MCC_EN | SMM_SIGNED_FW | SMM_SECURE_FW | SMM_DEBUG_FW
 } security_mode_t;
 
-typedef enum chip_type {
+typedef enum chip_type
+{
     CT_UNKNOWN = 0,
     CT_CONNECTX,
     CT_SWITCHX,
@@ -305,56 +315,58 @@ typedef enum chip_type {
     CT_ABIR_GEARBOX
 } chip_type_t;
 
-#define IS_HCA(chipType) \
-    (((chipType) == CT_CONNECTX) || \
-    ((chipType) == CT_CONNECT_IB) || \
-    ((chipType) == CT_CONNECTX4) || ((chipType) == CT_CONNECTX4_LX) || \
-    ((chipType) == CT_CONNECTX5) || \
-    ((chipType) == CT_CONNECTX6) || ((chipType) == CT_CONNECTX6DX) || ((chipType) == CT_CONNECTX6LX) || \
-    ((chipType) == CT_CONNECTX7) || ((chipType) == CT_CONNECTX8) || \
-    ((chipType) == CT_BLUEFIELD) || ((chipType) == CT_BLUEFIELD2) || ((chipType) == CT_BLUEFIELD3))
+#define IS_HCA(chipType)                                                                                 \
+    (((chipType) == CT_CONNECTX) || ((chipType) == CT_CONNECT_IB) || ((chipType) == CT_CONNECTX4) ||     \
+     ((chipType) == CT_CONNECTX4_LX) || ((chipType) == CT_CONNECTX5) || ((chipType) == CT_CONNECTX6) ||  \
+     ((chipType) == CT_CONNECTX6DX) || ((chipType) == CT_CONNECTX6LX) || ((chipType) == CT_CONNECTX7) || \
+     ((chipType) == CT_CONNECTX8) || ((chipType) == CT_BLUEFIELD) || ((chipType) == CT_BLUEFIELD2) ||    \
+     ((chipType) == CT_BLUEFIELD3))
 
-
-typedef enum chip_family_type {
+typedef enum chip_family_type
+{
     CFT_UNKNOWN = 0,
     CFT_HCA,
     CFT_SWITCH,
     CFT_GEARBOX
 } chip_family_type_t;
 
-typedef struct guid {
+typedef struct guid
+{
     u_int32_t h;
     u_int32_t l;
 } guid_t;
 typedef guid_t hw_key_t;
 
-typedef struct fs3_uid {
+typedef struct fs3_uid
+{
     guid_t base_guid;
     int base_guid_specified;
     guid_t base_mac;
     int base_mac_specified;
-    u_int8_t num_of_guids; // set 0 for default
-    u_int8_t step_size; // set 0 for default, not relevant for devices >= CX4
-    int set_mac_from_guid;  // if set , base_mac will be derrived automatically from base guid
-    int use_pp_attr; // if set, num_of_guids[2] and step_size[2] will be used for the uid attributes.
+    u_int8_t num_of_guids;       // set 0 for default
+    u_int8_t step_size;          // set 0 for default, not relevant for devices >= CX4
+    int set_mac_from_guid;       // if set , base_mac will be derrived automatically from base guid
+    int use_pp_attr;             // if set, num_of_guids[2] and step_size[2] will be used for the uid attributes.
     u_int8_t num_of_guids_pp[2]; // set 0xff for default
-    u_int8_t step_size_pp[2]; // set 0xff for default, not relevant for devices >= CX4
+    u_int8_t step_size_pp[2];    // set 0xff for default, not relevant for devices >= CX4
 } fs3_uid_t;
 
-typedef struct fs4_uid {
+typedef struct fs4_uid
+{
     guid_t base_guid;
     int base_guid_specified;
     guid_t base_mac;
     int base_mac_specified;
-    u_int8_t num_of_guids; // set 0 for default
-    u_int8_t step_size; // set 0 for default, not relevant for devices >= CX4
-    int set_mac_from_guid;  // if set , base_mac will be derrived automatically from base guid
-    int use_pp_attr; // if set, num_of_guids[2] and step_size[2] will be used for the uid attributes.
+    u_int8_t num_of_guids;       // set 0 for default
+    u_int8_t step_size;          // set 0 for default, not relevant for devices >= CX4
+    int set_mac_from_guid;       // if set , base_mac will be derrived automatically from base guid
+    int use_pp_attr;             // if set, num_of_guids[2] and step_size[2] will be used for the uid attributes.
     u_int8_t num_of_guids_pp[2]; // set 0xff for default
-    u_int8_t step_size_pp[2]; // set 0xff for default, not relevant for devices >= CX4
+    u_int8_t step_size_pp[2];    // set 0xff for default, not relevant for devices >= CX4
 } fs4_uid_t;
 
-typedef struct rom_info {
+typedef struct rom_info
+{
     u_int16_t exp_rom_product_id; // 0 - invalid.
     u_int16_t exp_rom_ver[3];
     u_int16_t exp_rom_dev_id;
@@ -362,36 +374,47 @@ typedef struct rom_info {
     u_int8_t exp_rom_proto;
     u_int8_t exp_rom_num_ver_fields;
     u_int8_t exp_rom_supp_cpu_arch;
-    //char      expRomFreestr[FREE_STR_MAX_LEN];
+    // char      expRomFreestr[FREE_STR_MAX_LEN];
 } rom_info_t;
 
-struct fs3_uid_entry {
+struct fs3_uid_entry
+{
     u_int8_t num_allocated;
     u_int8_t step; // not relevant for devices >= CX4
     u_int64_t uid;
 };
 
-typedef struct cibfw_uids {
+typedef struct cibfw_uids
+{
     struct fs3_uid_entry guids[2];
     struct fs3_uid_entry macs[2];
 } cib_uids_t;
 
-typedef struct cx4fw_uids {
+typedef struct cx4fw_uids
+{
     struct fs3_uid_entry base_guid;
     struct fs3_uid_entry base_mac;
 } cx4_uids_t;
 
-typedef struct uids {
+typedef struct uids
+{
     int valid_field; // 0: cib_uids , 1: cx4_uids
-    union {
+    union
+    {
         cib_uids_t cib_uids;
         cx4_uids_t cx4_uids;
     };
 } uids_t;
 
-typedef enum {NOT_VALID, DIRECT_ACCESS, MFSV} device_security_version_access_method_t;
+typedef enum
+{
+    NOT_VALID,
+    DIRECT_ACCESS,
+    MFSV
+} device_security_version_access_method_t;
 
-typedef struct fs3_info_ext {
+typedef struct fs3_info_ext
+{
     u_int8_t guids_override_en;
     uids_t fs3_uids_info;
     uids_t orig_fs3_uids_info;
@@ -410,18 +433,19 @@ typedef struct fs3_info_ext {
     bool dev_sec_boot;
 
     // security version (for fs4)
-    u_int32_t                               image_security_version;       
+    u_int32_t image_security_version;
     device_security_version_access_method_t device_security_version_access_method;
-    u_int32_t                               device_security_version_gw;
-    struct reg_access_hca_mfsv_reg          device_security_version_mfsv;
-    
+    u_int32_t device_security_version_gw;
+    struct reg_access_hca_mfsv_reg device_security_version_mfsv;
+
     int global_image_status;
 
 } fs3_info_t;
 
 // typedef struct fs3_info_ext fs4_info_t;
 
-typedef struct fs2_info_ext {
+typedef struct fs2_info_ext
+{
     guid_t guids[MAX_GUIDS];
     u_int32_t guid_num;
     u_int32_t config_sectors;
@@ -433,7 +457,8 @@ typedef struct fs2_info_ext {
 } fs2_info_t;
 
 #ifdef CABLES_SUPP
-typedef struct cablefw_info_ext {
+typedef struct cablefw_info_ext
+{
     u_int8_t fw_gw_revision[2];
     u_int16_t fw_dev_id;
     u_int32_t fw_revision;
@@ -441,7 +466,8 @@ typedef struct cablefw_info_ext {
 } cablefw_info_t;
 #endif
 
-typedef struct roms_info {
+typedef struct roms_info
+{
     u_int8_t exp_rom_found;
     u_int8_t num_of_exp_rom;
     u_int8_t no_rom_checksum;
@@ -453,7 +479,8 @@ typedef struct roms_info {
     rom_info_t rom_info[MAX_ROMS_NUM];
 } roms_info_t;
 
-typedef struct fw_info_com {
+typedef struct fw_info_com
+{
     char psid[PSID_LEN + 1];
     u_int8_t vsd_sect_found; // relevant to FS2 image only
     char vsd[VSD_LEN + 1];
@@ -478,11 +505,12 @@ typedef struct fw_info_com {
     char branch_ver[BRANCH_LEN + 1];
     char running_branch_ver[BRANCH_LEN + 1];
     u_int8_t encrypted_fw;
-    u_int32_t burn_image_size;  //! Be aware! This field is backward compatible starting from BB/CX-7 
-                                //! Use this field only for encrypted images
+    u_int32_t burn_image_size; //! Be aware! This field is backward compatible starting from BB/CX-7
+                               //! Use this field only for encrypted images
 } fw_info_com_t;
 
-typedef struct fw_info_ext {
+typedef struct fw_info_ext
+{
     u_int8_t fw_type;
     fw_info_com_t fw_info;
     fs2_info_t fs2_info;
@@ -493,7 +521,8 @@ typedef struct fw_info_ext {
     // fs3_info_t fs4_info;
 } fw_info_t;
 
-typedef enum fw_hndl_type {
+typedef enum fw_hndl_type
+{
     FHT_MST_DEV,
     FHT_FW_FILE,
     FHT_UEFI_DEV,
@@ -501,7 +530,8 @@ typedef enum fw_hndl_type {
     FHT_CABLE_DEV,
 } fw_hndl_type_t;
 
-typedef enum fw_img_type {
+typedef enum fw_img_type
+{
     FIT_FS2 = 0,
     FIT_FS3 = 1,
     FIT_FC1 = 2,
@@ -509,13 +539,15 @@ typedef enum fw_img_type {
     FIT_FSCTRL = 4,
 } fw_img_type_t;
 
-enum ExpRomProto {
+enum ExpRomProto
+{
     ER_IB = 0,
     ER_ETH = 1,
     ER_VPI = 2
 };
 
-enum ExpRomCpuArch {
+enum ExpRomCpuArch
+{
     ERC_UNSPECIFIED = 0,
     ERC_AMD64 = 1,
     ERC_AARCH64 = 2,
@@ -523,7 +555,8 @@ enum ExpRomCpuArch {
     ERC_IA32 = 4
 };
 
-typedef enum fw_ver_info {
+typedef enum fw_ver_info
+{
     FVI_SMALLER = -1,
     FVI_EQUAL = 0,
     FVI_GREATER = 1,
diff --git a/mlxfwops/lib/security_version_gw.cpp b/mlxfwops/lib/security_version_gw.cpp
index e647b385..d2ea1209 100644
--- a/mlxfwops/lib/security_version_gw.cpp
+++ b/mlxfwops/lib/security_version_gw.cpp
@@ -33,22 +33,24 @@
 
 #include "security_version_gw.h"
 
-bool SecurityVersionGW::isAccessibleInLiveFish(){
-
+bool SecurityVersionGW::isAccessibleInLiveFish()
+{
     setGWAddress(ROLLBACK_PROTECTION); // only to set _ctrl_address (can pick ROLLBACK_PROTECTION or MINIMAL_VERSION)
     return _ctrl_address == GW_NOT_SUPPORTED ? false : true;
-
 }
 
-bool SecurityVersionGW::getSecurityVersion(u_int32_t* result){
-    
+bool SecurityVersionGW::getSecurityVersion(u_int32_t* result)
+{
     u_int32_t rollbackProtection;
     u_int32_t minimalSecurityVersion;
-    
-    try{
+
+    try
+    {
         getRollbackProtection(&rollbackProtection);
         getMinimalSecurityVersion(&minimalSecurityVersion);
-    } catch (const char* msg) {
+    }
+    catch (const char* msg)
+    {
         // Ignore the message and return false instead
         return false;
     }
@@ -61,39 +63,42 @@ bool SecurityVersionGW::getSecurityVersion(u_int32_t* result){
 // Private methods
 // ---------------
 
-void SecurityVersionGW::setGWAddress(gw_type_t gw_type){
-
-    switch (_chip_type){
+void SecurityVersionGW::setGWAddress(gw_type_t gw_type)
+{
+    switch (_chip_type)
+    {
         case CT_CONNECTX7:
-            _ctrl_address = (gw_type == ROLLBACK_PROTECTION ? 0xf4540 : 0xf4520 );
+            _ctrl_address = (gw_type == ROLLBACK_PROTECTION ? 0xf4540 : 0xf4520);
             break;
         case CT_BLUEFIELD3:
-            _ctrl_address = (gw_type == ROLLBACK_PROTECTION ? 0xf4340 : 0xf4320 ) ;
+            _ctrl_address = (gw_type == ROLLBACK_PROTECTION ? 0xf4340 : 0xf4320);
             break;
         default:
-            _ctrl_address = GW_NOT_SUPPORTED; 
+            _ctrl_address = GW_NOT_SUPPORTED;
     }
 
     _result1_address = _ctrl_address + 8;
-    _result2_address =  _result1_address + 4;
-
+    _result2_address = _result1_address + 4;
 }
 
-void SecurityVersionGW::getRollbackProtection(u_int32_t* result){
-
+void SecurityVersionGW::getRollbackProtection(u_int32_t* result)
+{
     u_int32_t result1, result2;
 
     setGWAddress(ROLLBACK_PROTECTION);
-    
+
     // Read from GW
-    try {
+    try
+    {
         lock();
         executeReadCommand();
         waitForResult();
         readResult1(&result1);
         readResult2(&result2);
         unlock();
-    } catch (const char* msg) {
+    }
+    catch (const char* msg)
+    {
         unlock();
         throw msg;
     }
@@ -101,101 +106,110 @@ void SecurityVersionGW::getRollbackProtection(u_int32_t* result){
     *result = countSetBits(result1) + countSetBits(result2);
 }
 
-
-void SecurityVersionGW::getMinimalSecurityVersion(u_int32_t* result){
-
+void SecurityVersionGW::getMinimalSecurityVersion(u_int32_t* result)
+{
     u_int32_t result2;
 
     setGWAddress(MINIMAL_VERSION);
 
     // Read from GW
-    try {
+    try
+    {
         lock();
         executeReadCommand();
         waitForResult();
         readResult2(&result2);
         unlock();
-    } catch (const char* msg) {
-        unlock();   
+    }
+    catch (const char* msg)
+    {
+        unlock();
         throw msg;
     }
 
     // Extract minimal_security_version
     u_int32_t const MINIMAL_SECURITY_VERSION_MASK = 0x00000ff0;
     u_int32_t const MINIMAL_SECURITY_VERSION_OFFSET = 4;
-    *result = (result2 & MINIMAL_SECURITY_VERSION_MASK) >> MINIMAL_SECURITY_VERSION_OFFSET; 
-
+    *result = (result2 & MINIMAL_SECURITY_VERSION_MASK) >> MINIMAL_SECURITY_VERSION_OFFSET;
 }
 
-
-void SecurityVersionGW::lock(){
-
+void SecurityVersionGW::lock()
+{
     int iter_num = 0, MAX_ITER_NUM = 100;
     int const SLEEP_TIME = 10; // [msec]
 
     bool lock;
-    do {
+    do
+    {
         int rc = 0;
         u_int32_t ctrl_reg = 0;
-        if (iter_num != 0) msleep(SLEEP_TIME);
+        if (iter_num != 0)
+            msleep(SLEEP_TIME);
         rc = mread4(_mf, _ctrl_address, &ctrl_reg);
-        if (rc != 4) throw "failed to lock (read error)";
+        if (rc != 4)
+            throw "failed to lock (read error)";
         lock = (ctrl_reg & CTRL_LOCK) != 0;
         iter_num++;
-        if (iter_num > MAX_ITER_NUM) throw "failed to lock (timeout error)";
+        if (iter_num > MAX_ITER_NUM)
+            throw "failed to lock (timeout error)";
     } while (lock);
-
 }
 
-
-void SecurityVersionGW::executeReadCommand(){
-
+void SecurityVersionGW::executeReadCommand()
+{
     int rc = mwrite4(_mf, _ctrl_address, CTRL_READ | CTRL_BUSY);
-    if (rc != 4) throw "failed to executeReadCommand (write error)";
+    if (rc != 4)
+        throw "failed to executeReadCommand (write error)";
 }
 
-
-void SecurityVersionGW::waitForResult(){
-
+void SecurityVersionGW::waitForResult()
+{
     int iter_num = 0, MAX_ITER_NUM = 100;
     int const SLEEP_TIME = 10; // [msec]
 
     bool busy;
-    do {
+    do
+    {
         int rc = 0;
         u_int32_t ctrl_reg = 0;
-        if (iter_num != 0) msleep(SLEEP_TIME);
+        if (iter_num != 0)
+            msleep(SLEEP_TIME);
         rc = mread4(_mf, _ctrl_address, &ctrl_reg);
-        if (rc != 4) throw "failed to waitForResult (read error)";
+        if (rc != 4)
+            throw "failed to waitForResult (read error)";
         busy = (ctrl_reg & CTRL_BUSY) != 0;
         iter_num++;
-        if (iter_num > MAX_ITER_NUM) throw "failed to waitForResult (timeout error)";
+        if (iter_num > MAX_ITER_NUM)
+            throw "failed to waitForResult (timeout error)";
     } while (busy);
-
 }
 
-
-void SecurityVersionGW::readResult1(u_int32_t* result){
+void SecurityVersionGW::readResult1(u_int32_t* result)
+{
     int rc = mread4(_mf, _result1_address, result);
-    if (rc != 4) throw "failed to readResult1 (read error)";
+    if (rc != 4)
+        throw "failed to readResult1 (read error)";
 }
 
-
-void SecurityVersionGW::readResult2(u_int32_t* result){
+void SecurityVersionGW::readResult2(u_int32_t* result)
+{
     int rc = mread4(_mf, _result2_address, result);
-    if (rc != 4) throw "failed to readResult2 (read error)";
+    if (rc != 4)
+        throw "failed to readResult2 (read error)";
 }
 
-
-void SecurityVersionGW::unlock(){
+void SecurityVersionGW::unlock()
+{
     int rc = mwrite4(_mf, _ctrl_address, 0);
-    if (rc != 4) throw "failed to unlock (write error)";
+    if (rc != 4)
+        throw "failed to unlock (write error)";
 }
 
-
-u_int32_t SecurityVersionGW::countSetBits(u_int32_t num){
+u_int32_t SecurityVersionGW::countSetBits(u_int32_t num)
+{
     u_int32_t count = 0;
-    while (num) {
+    while (num)
+    {
         count += num & 1;
         num >>= 1;
     }
diff --git a/mlxfwops/lib/security_version_gw.h b/mlxfwops/lib/security_version_gw.h
index 820e0a7b..e044737e 100644
--- a/mlxfwops/lib/security_version_gw.h
+++ b/mlxfwops/lib/security_version_gw.h
@@ -37,11 +37,11 @@
 #include <mtcr.h>
 #include "flint_base.h"
 
-class SecurityVersionGW {
-
+class SecurityVersionGW
+{
 public:
-    SecurityVersionGW(mfile* mf, chip_type_t chip_type):_mf(mf),_chip_type(chip_type){};
-    ~SecurityVersionGW() {};
+    SecurityVersionGW(mfile* mf, chip_type_t chip_type) : _mf(mf), _chip_type(chip_type){};
+    ~SecurityVersionGW(){};
 
     bool isAccessibleInLiveFish();
     bool getSecurityVersion(u_int32_t* result);
@@ -50,9 +50,13 @@ class SecurityVersionGW {
     mfile* _mf;
     chip_type_t _chip_type;
     u_int32_t static const GW_NOT_SUPPORTED = 0x0;
-    typedef enum {ROLLBACK_PROTECTION, MINIMAL_VERSION} gw_type_t;
+    typedef enum
+    {
+        ROLLBACK_PROTECTION,
+        MINIMAL_VERSION
+    } gw_type_t;
 
-    u_int32_t _ctrl_address; 
+    u_int32_t _ctrl_address;
     u_int32_t _result1_address;
     u_int32_t _result2_address;
 
@@ -61,7 +65,6 @@ class SecurityVersionGW {
     u_int32_t static const CTRL_READ = CTRL_RW & 0xffffffff;
     u_int32_t static const CTRL_BUSY = 0x20000000;
 
-
     void getRollbackProtection(u_int32_t* result);
     void getMinimalSecurityVersion(u_int32_t* result);
     void setGWAddress(gw_type_t gw_type);
@@ -74,7 +77,6 @@ class SecurityVersionGW {
     void unlock();
 
     u_int32_t countSetBits(u_int32_t num);
-
 };
 
 #endif /*SECURITY_VERSION_GW_*/
\ No newline at end of file
diff --git a/mlxfwops/lib/signature_manager.h b/mlxfwops/lib/signature_manager.h
index 34555b15..2f0d56d9 100644
--- a/mlxfwops/lib/signature_manager.h
+++ b/mlxfwops/lib/signature_manager.h
@@ -39,11 +39,10 @@
 class Fs3Operations;
 class Flash;
 
-
 class ISignatureManager : public FlintErrMsg
 {
 public:
-    virtual bool AddSignature(mfile* mf, Fs3Operations* imageOps, Flash *f, u_int32_t imageOffset) = 0;
+    virtual bool AddSignature(mfile* mf, Fs3Operations* imageOps, Flash* f, u_int32_t imageOffset) = 0;
     virtual bool IsSecureBootSupported() = 0;
     virtual bool IsLifeCycleSupported() = 0;
     virtual bool IsCableQuerySupported() = 0;
@@ -51,18 +50,16 @@ class ISignatureManager : public FlintErrMsg
     virtual ~ISignatureManager() {}
 };
 
-class AbstractSignatureManager : public ISignatureManager {
+class AbstractSignatureManager : public ISignatureManager
+{
 public:
     AbstractSignatureManager() {}
     virtual ~AbstractSignatureManager() {}
-    virtual bool AddSignature(mfile*, Fs3Operations*, Flash*, u_int32_t)
-    {
-        return true;
-    }
-    virtual bool IsSecureBootSupported()        { return false; }
-    virtual bool IsCableQuerySupported()    { return false; }
-    virtual bool IsLifeCycleSupported()     { return false; }
-    virtual bool IsEncryptionSupported()    { return false; }
+    virtual bool AddSignature(mfile*, Fs3Operations*, Flash*, u_int32_t) { return true; }
+    virtual bool IsSecureBootSupported() { return false; }
+    virtual bool IsCableQuerySupported() { return false; }
+    virtual bool IsLifeCycleSupported() { return false; }
+    virtual bool IsEncryptionSupported() { return false; }
 };
 
 class FwOperationsSignatureManager : public AbstractSignatureManager
@@ -77,18 +74,17 @@ class BluefieldFwOperationsSignatureManager : public AbstractSignatureManager
 public:
     BluefieldFwOperationsSignatureManager() : AbstractSignatureManager() {}
     virtual ~BluefieldFwOperationsSignatureManager() {}
-    virtual bool AddSignature(mfile* mf, Fs3Operations* imageOps, Flash *f, u_int32_t imageOffset);
+    virtual bool AddSignature(mfile* mf, Fs3Operations* imageOps, Flash* f, u_int32_t imageOffset);
 };
 
-
 class ConnectX6FwOperationsSignatureManager : public AbstractSignatureManager
 {
 public:
     ConnectX6FwOperationsSignatureManager() : AbstractSignatureManager() {}
     virtual ~ConnectX6FwOperationsSignatureManager() {}
-    virtual bool AddSignature(mfile* mf, Fs3Operations* imageOps, Flash *f, u_int32_t imageOffset);
-    virtual bool IsLifeCycleSupported()     { return true; }
-    virtual bool IsCableQuerySupported()    { return true; }
+    virtual bool AddSignature(mfile* mf, Fs3Operations* imageOps, Flash* f, u_int32_t imageOffset);
+    virtual bool IsLifeCycleSupported() { return true; }
+    virtual bool IsCableQuerySupported() { return true; }
 };
 
 class RavenSwitchSignatureManager : public AbstractSignatureManager
@@ -96,7 +92,7 @@ class RavenSwitchSignatureManager : public AbstractSignatureManager
 public:
     RavenSwitchSignatureManager() : AbstractSignatureManager() {}
     virtual ~RavenSwitchSignatureManager() {}
-    virtual bool IsCableQuerySupported()    { return true; }
+    virtual bool IsCableQuerySupported() { return true; }
 };
 
 class SecuredSwitchSignatureManager : public AbstractSignatureManager
@@ -104,10 +100,10 @@ class SecuredSwitchSignatureManager : public AbstractSignatureManager
 public:
     SecuredSwitchSignatureManager() : AbstractSignatureManager() {}
     virtual ~SecuredSwitchSignatureManager() {}
-    virtual bool IsCableQuerySupported()    { return true; }
-    virtual bool IsLifeCycleSupported()     { return true; }
-    virtual bool IsSecureBootSupported()        { return true; }
-    virtual bool IsEncryptionSupported()    { return true; }
+    virtual bool IsCableQuerySupported() { return true; }
+    virtual bool IsLifeCycleSupported() { return true; }
+    virtual bool IsSecureBootSupported() { return true; }
+    virtual bool IsEncryptionSupported() { return true; }
 };
 
 class ConnectX6DXFwOperationsSignatureManager : public AbstractSignatureManager
@@ -115,9 +111,9 @@ class ConnectX6DXFwOperationsSignatureManager : public AbstractSignatureManager
 public:
     ConnectX6DXFwOperationsSignatureManager() : AbstractSignatureManager() {}
     virtual ~ConnectX6DXFwOperationsSignatureManager() {}
-    virtual bool IsLifeCycleSupported()     { return true; }
-    virtual bool IsSecureBootSupported()    { return true; }
-    virtual bool IsCableQuerySupported()    { return true; }
+    virtual bool IsLifeCycleSupported() { return true; }
+    virtual bool IsSecureBootSupported() { return true; }
+    virtual bool IsCableQuerySupported() { return true; }
 };
 
 class ConnectX6LXFwOperationsSignatureManager : public ConnectX6DXFwOperationsSignatureManager
@@ -132,7 +128,7 @@ class ConnectX7FwOperationsSignatureManager : public ConnectX6DXFwOperationsSign
 public:
     ConnectX7FwOperationsSignatureManager() : ConnectX6DXFwOperationsSignatureManager() {}
     virtual ~ConnectX7FwOperationsSignatureManager() {}
-    virtual bool IsEncryptionSupported()    { return true; }
+    virtual bool IsEncryptionSupported() { return true; }
 };
 
 class Bluefield2FwOperationsSignatureManager : public ConnectX6DXFwOperationsSignatureManager
@@ -156,6 +152,3 @@ class GearBoxSignatureManager : public AbstractSignatureManager
     virtual ~GearBoxSignatureManager() {}
     virtual bool AddSignature(mfile*, Fs3Operations*, Flash*, u_int32_t) { return false; }
 };
-
-
-
diff --git a/mlxfwops/lib/signature_manager_factory.h b/mlxfwops/lib/signature_manager_factory.h
index a7807496..e7fea429 100644
--- a/mlxfwops/lib/signature_manager_factory.h
+++ b/mlxfwops/lib/signature_manager_factory.h
@@ -39,81 +39,107 @@
 class SignatureManagerFactory
 {
 public:
-    static SignatureManagerFactory* GetInstance() {
+    static SignatureManagerFactory* GetInstance()
+    {
         static SignatureManagerFactory obj;
         return &obj;
     }
 
-    ISignatureManager* CreateSignatureManager(u_int32_t hwDevId, u_int32_t hwRevId) {
+    ISignatureManager* CreateSignatureManager(u_int32_t hwDevId, u_int32_t hwRevId)
+    {
         dm_dev_id_t deviceId = DeviceUnknown;
-        if (dm_get_device_id_offline(hwDevId, hwRevId, &deviceId)) {
+        if (dm_get_device_id_offline(hwDevId, hwRevId, &deviceId))
+        {
             printf("Failed to identify the device - Can not create SignatureManager!\n");
             return (ISignatureManager*)NULL;
         }
-        if (deviceId == DeviceBlueField) {
+        if (deviceId == DeviceBlueField)
+        {
             return new BluefieldFwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceConnectX6) {
+        else if (deviceId == DeviceConnectX6)
+        {
             return new ConnectX6FwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceConnectX6DX) {
+        else if (deviceId == DeviceConnectX6DX)
+        {
             return new ConnectX6DXFwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceConnectX7) {
+        else if (deviceId == DeviceConnectX7)
+        {
             return new ConnectX7FwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceBlueField2) {
+        else if (deviceId == DeviceBlueField2)
+        {
             return new Bluefield2FwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceBlueField3) {
+        else if (deviceId == DeviceBlueField3)
+        {
             return new Bluefield3FwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceConnectX6LX) {
+        else if (deviceId == DeviceConnectX6LX)
+        {
             return new ConnectX6LXFwOperationsSignatureManager();
         }
-        else if (deviceId == DeviceSpectrum || deviceId == DeviceSpectrum2 || deviceId == DeviceSpectrum3 || deviceId == DeviceQuantum) {
+        else if (deviceId == DeviceSpectrum || deviceId == DeviceSpectrum2 || deviceId == DeviceSpectrum3 ||
+                 deviceId == DeviceQuantum)
+        {
             return new RavenSwitchSignatureManager();
         }
-        else if (deviceId == DeviceQuantum2 || deviceId == DeviceSpectrum4) {
+        else if (deviceId == DeviceQuantum2 || deviceId == DeviceSpectrum4)
+        {
             return new SecuredSwitchSignatureManager();
         }
-        else {
+        else
+        {
             return new FwOperationsSignatureManager();
         }
     }
 
-    ISignatureManager* CreateSignatureManager(chip_type_t chip) {
-        if (chip == CT_BLUEFIELD) {
+    ISignatureManager* CreateSignatureManager(chip_type_t chip)
+    {
+        if (chip == CT_BLUEFIELD)
+        {
             return new BluefieldFwOperationsSignatureManager();
         }
-        else if (chip == CT_CONNECTX6) {
+        else if (chip == CT_CONNECTX6)
+        {
             return new ConnectX6FwOperationsSignatureManager();
         }
-        else if (chip == CT_CONNECTX6DX) {
+        else if (chip == CT_CONNECTX6DX)
+        {
             return new ConnectX6DXFwOperationsSignatureManager();
         }
-        else if (chip == CT_CONNECTX7) {
+        else if (chip == CT_CONNECTX7)
+        {
             return new ConnectX7FwOperationsSignatureManager();
         }
-        else if (chip == CT_BLUEFIELD2) {
+        else if (chip == CT_BLUEFIELD2)
+        {
             return new Bluefield2FwOperationsSignatureManager();
         }
-        else if (chip == CT_BLUEFIELD3) {
+        else if (chip == CT_BLUEFIELD3)
+        {
             return new Bluefield3FwOperationsSignatureManager();
         }
-        else if (chip == CT_CONNECTX6LX) {
+        else if (chip == CT_CONNECTX6LX)
+        {
             return new ConnectX6LXFwOperationsSignatureManager();
         }
-        else if (chip == CT_GEARBOX) {
+        else if (chip == CT_GEARBOX)
+        {
             return new GearBoxSignatureManager();
         }
-        else if(chip == CT_QUANTUM || chip == CT_SPECTRUM || chip == CT_SPECTRUM2 || chip == CT_SPECTRUM3) {
+        else if (chip == CT_QUANTUM || chip == CT_SPECTRUM || chip == CT_SPECTRUM2 || chip == CT_SPECTRUM3)
+        {
             return new RavenSwitchSignatureManager();
         }
-        else if (chip == CT_QUANTUM2 || chip == CT_SPECTRUM4) {
+        else if (chip == CT_QUANTUM2 || chip == CT_SPECTRUM4)
+        {
             return new SecuredSwitchSignatureManager();
         }
-        else {
+        else
+        {
             return new FwOperationsSignatureManager();
         }
     }
diff --git a/mlxfwops/uefi_c/mft_uefi_common.h b/mlxfwops/uefi_c/mft_uefi_common.h
index f8feba12..568de6d2 100644
--- a/mlxfwops/uefi_c/mft_uefi_common.h
+++ b/mlxfwops/uefi_c/mft_uefi_common.h
@@ -39,24 +39,24 @@
 #ifndef MFT_MLXFWOPS_UEFI_C_MFT_UEFI_COMMON_H_
 #define MFT_MLXFWOPS_UEFI_C_MFT_UEFI_COMMON_H_
 
-
 typedef struct _MLX4_DEV uefi_Dev_t;
 
-typedef int (*f_fw_cmd) (uefi_Dev_t *dev, void *buffer, int *w_size, int *r_size);
-typedef int (*f_dma_alloc) (uefi_Dev_t *dev, u_int64_t* pa, u_int64_t* va);
+typedef int (*f_fw_cmd)(uefi_Dev_t* dev, void* buffer, int* w_size, int* r_size);
+typedef int (*f_dma_alloc)(uefi_Dev_t* dev, u_int64_t* pa, u_int64_t* va);
 
-typedef struct uefi_dev_info {
+typedef struct uefi_dev_info
+{
     u_int32_t hw_dev_id;
     u_int32_t rev_id;
     u_int32_t max_buffer_size;
     u_int8_t no_fw_ctrl;
 } uefi_dev_info_t;
 
-typedef struct uefi_dev_extra {
+typedef struct uefi_dev_extra
+{
     f_fw_cmd fw_cmd_func;
     f_dma_alloc dma_func;
     uefi_dev_info_t dev_info;
 } uefi_dev_extra_t;
 
-
 #endif /* MFT_MLXFWOPS_UEFI_C_MFT_UEFI_COMMON_H_ */
diff --git a/mlxfwupdate/cmd_line_params.cpp b/mlxfwupdate/cmd_line_params.cpp
index 8f31b381..737620d0 100644
--- a/mlxfwupdate/cmd_line_params.cpp
+++ b/mlxfwupdate/cmd_line_params.cpp
@@ -34,10 +34,8 @@
 
 #include "cmd_line_params.h"
 
-
 CmdLineParams::CmdLineParams()
 {
-
     force_update = 0;
     update_fw = 0;
     use_mfa_file = 0;
@@ -52,34 +50,34 @@ CmdLineParams::CmdLineParams()
     use_lookup_file = 0;
     list_file_contents = false;
     display_archive_names = false;
-    extract_image   = false;
-    show_progress   = true;
-    log_on_update   = false;
-    calc_crc        = false;
-    query_device    = false;
+    extract_image = false;
+    show_progress = true;
+    log_on_update = false;
+    calc_crc = false;
+    query_device = false;
     query_device_xml = false;
     clear_semaphore = false;
-    extract_all     = false;
-    no_fw_ctrl      = false;
-    target_file     = "";
-    server_url      = "https://www.mellanox.com";
-    proxy           = "";
-    update_online   = false;
-    download        = false;
+    extract_all = false;
+    no_fw_ctrl = false;
+    target_file = "";
+    server_url = "https://www.mellanox.com";
+    proxy = "";
+    update_online = false;
+    download = false;
     download_default = false;
     get_download_opt = "";
-    download_os     = "";  // will be changed to enum
-    download_type   = "";
-    download_dev    = "";
-    download_key    = "last_release";
+    download_os = ""; // will be changed to enum
+    download_type = "";
+    download_dev = "";
+    download_key = "last_release";
     psid = "";
-    burnFailsafe    = true;
+    burnFailsafe = true;
     onlineQueryPsids = "";
-    queryFormat     = "text";
-    download_dir    = ".";
-    extract_dir     = ".";
-    lvim            = false;
-    dl              = false;
+    queryFormat = "text";
+    download_dir = ".";
+    extract_dir = ".";
+    lvim = false;
+    dl = false;
     no_extract_list = false;
     numberOfRetrials = 5;
 
@@ -93,16 +91,12 @@ CmdLineParams::CmdLineParams()
     certificate = string(certificatPath);
 
 #else
-    #ifdef MSTFLINT
+#ifdef MSTFLINT
     certificate = (string)ROOT_PATH + "etc/mstflint/ca-bundle.crt";
-    #else
+#else
     certificate = (string)ROOT_PATH + "etc/mft/ca-bundle.crt";
-    #endif
+#endif
 #endif
 }
 
-
-CmdLineParams::~CmdLineParams()
-{
-}
-
+CmdLineParams::~CmdLineParams() {}
diff --git a/mlxfwupdate/cmd_line_params.h b/mlxfwupdate/cmd_line_params.h
index 851f2471..dfdd041d 100644
--- a/mlxfwupdate/cmd_line_params.h
+++ b/mlxfwupdate/cmd_line_params.h
@@ -41,7 +41,8 @@
 
 using namespace std;
 
-class CmdLineParams {
+class CmdLineParams
+{
 public:
     CmdLineParams();
     ~CmdLineParams();
diff --git a/mlxfwupdate/cmd_line_parser.cpp b/mlxfwupdate/cmd_line_parser.cpp
index 3bfa3a30..dfa5f33d 100644
--- a/mlxfwupdate/cmd_line_parser.cpp
+++ b/mlxfwupdate/cmd_line_parser.cpp
@@ -45,9 +45,9 @@
 #include "tools_version.h"
 
 #ifdef MST_UL
-    #define TOOL_NAME "mstfwmanager"
+#define TOOL_NAME "mstfwmanager"
 #else
-    #define TOOL_NAME "mlxfwmanager"
+#define TOOL_NAME "mlxfwmanager"
 #endif
 
 #define TOOL_VERSION "1.0"
@@ -57,167 +57,163 @@ using namespace std;
 using namespace mft_utils;
 
 /* Command line options definitions, _L for long options and _S for short ones. */
-#define VERSION_L           "version"
-#define VERSION_S           'v'
+#define VERSION_L "version"
+#define VERSION_S 'v'
 
-#define CURRENT_DIR_L       "current-dir"
-#define CURRENT_DIR_S       ' '
+#define CURRENT_DIR_L "current-dir"
+#define CURRENT_DIR_S ' '
 
-#define DEVICE_L            "dev"
-#define DEVICE_S            'd'
+#define DEVICE_L "dev"
+#define DEVICE_S 'd'
 
-#define EXE_REL_PATH_L      "exe-rel-path"
-#define EXE_REL_PATH_S      ' '
+#define EXE_REL_PATH_L "exe-rel-path"
+#define EXE_REL_PATH_S ' '
 
-#define UPDATE_L            "update"
-#define UPDATE_S            'u'
+#define UPDATE_L "update"
+#define UPDATE_S 'u'
 
-#define CLEAR_SEM_L         "clear-semaphore"
-#define CLEAR_SEM_S         ' '
+#define CLEAR_SEM_L "clear-semaphore"
+#define CLEAR_SEM_S ' '
 
-#define USE_IMG_FILE_L       "image-file"
-#define USE_IMG_FILE_S       'i'
+#define USE_IMG_FILE_L "image-file"
+#define USE_IMG_FILE_S 'i'
 
-#define USE_IMG_DIR_L       "image-dir"
-#define USE_IMG_DIR_S       'D'
+#define USE_IMG_DIR_L "image-dir"
+#define USE_IMG_DIR_S 'D'
 
-#define UPDATE_L            "update"
-#define UPDATE_S            'u'
+#define UPDATE_L "update"
+#define UPDATE_S 'u'
 
-#define ARCHIVE_NAMES_L     "archive-names"
-#define ARCHIVE_NAMES_S     ' '
+#define ARCHIVE_NAMES_L "archive-names"
+#define ARCHIVE_NAMES_S ' '
 
-#define PROXY_L             "proxy"
-#define PROXY_S             ' '
+#define PROXY_L "proxy"
+#define PROXY_S ' '
 
-#define SERVER_URL_L        "server-url"
-#define SERVER_URL_S        ' '
+#define SERVER_URL_L "server-url"
+#define SERVER_URL_S ' '
 
-#define CERTIFICATE_L       "ssl-certificate"
-#define CERTIFICATE_S       ' '
+#define CERTIFICATE_L "ssl-certificate"
+#define CERTIFICATE_S ' '
 
-#define ONLINE_IMGS_L       "online"
-#define ONLINE_IMGS_S       ' '
+#define ONLINE_IMGS_L "online"
+#define ONLINE_IMGS_S ' '
 
-#define ONLINE_QUERY_L      "online-query-psid"
-#define ONLINE_QUERY_S      ' '
+#define ONLINE_QUERY_L "online-query-psid"
+#define ONLINE_QUERY_S ' '
 
-#define DNLD_KEY_L          "key"
-#define DNLD_KEY_S          ' '
+#define DNLD_KEY_L "key"
+#define DNLD_KEY_S ' '
 
+#define USE_DEFAULT_L "download-default"
+#define USE_DEFAULT_S ' '
 
-#define USE_DEFAULT_L       "download-default"
-#define USE_DEFAULT_S       ' '
+#define DNLD_L "download"
+#define DNLD_S ' '
 
-#define DNLD_L              "download"
-#define DNLD_S              ' '
+#define DNLD_TYPE_L "download-type"
+#define DNLD_TYPE_S ' '
 
-#define DNLD_TYPE_L         "download-type"
-#define DNLD_TYPE_S         ' '
+#define DNLD_OS_L "download-os"
+#define DNLD_OS_S ' '
 
-#define DNLD_OS_L           "download-os"
-#define DNLD_OS_S           ' '
+#define DNLD_DEV_L "download-device"
+#define DNLD_DEV_S ' '
 
-#define DNLD_DEV_L          "download-device"
-#define DNLD_DEV_S          ' '
+#define GET_DNLD_OPT_L "get-download-opt"
+#define GET_DNLD_OPT_S ' '
 
-#define GET_DNLD_OPT_L          "get-download-opt"
-#define GET_DNLD_OPT_S          ' '
+#define FORCE_L "force"
+#define FORCE_S 'f'
 
+#define YES_L "yes"
+#define YES_S 'y'
 
+#define NO_L "no"
+#define NO_S ' '
 
-#define FORCE_L             "force"
-#define FORCE_S             'f'
+#define LIST_CONTENT_L "list-content"
+#define LIST_CONTENT_S 'l'
 
-#define YES_L               "yes"
-#define YES_S               'y'
+#define FFV_L "ffv"
+#define FFV_S ' '
 
-#define NO_L                "no"
-#define NO_S                ' '
+#define PSID_L "psid"
+#define PSID_S ' '
 
-#define LIST_CONTENT_L      "list-content"
-#define LIST_CONTENT_S      'l'
+#define CRC_L "crc"
+#define CRC_S ' '
 
-#define FFV_L               "ffv"
-#define FFV_S               ' '
+#define EXTRACT_L "extract"
+#define EXTRACT_S ' '
 
-#define PSID_L              "psid"
-#define PSID_S              ' '
+#define EXTRACT_FILE_L "extract-file"
+#define EXTRACT_FILE_S ' '
 
-#define CRC_L              "crc"
-#define CRC_S              ' '
+#define EXTRACT_ALL_L "extract-all"
+#define EXTRACT_ALL_S ' '
 
+#define EXTRACT_DIR_L "extract-dir"
+#define EXTRACT_DIR_S ' '
 
-#define EXTRACT_L           "extract"
-#define EXTRACT_S           ' '
+#define QUERY_L "query"
+#define QUERY_S ' '
 
-#define EXTRACT_FILE_L      "extract-file"
-#define EXTRACT_FILE_S      ' '
+#define QUERY_XML_L "query-xml"
+#define QUERY_XML_S ' '
 
-#define EXTRACT_ALL_L       "extract-all"
-#define EXTRACT_ALL_S       ' '
+#define QUERY_FORMAT_L "query-format"
+#define QUERY_FORMAT_S ' '
 
-#define EXTRACT_DIR_L       "extract-dir"
-#define EXTRACT_DIR_S       ' '
+#define LOG_ON_UPDATE_L "log-on-update"
+#define LOG_ON_UPDATE_S ' '
 
-#define QUERY_L             "query"
-#define QUERY_S             ' '
+#define LOG_L "log"
+#define LOG_S ' '
 
-#define QUERY_XML_L         "query-xml"
-#define QUERY_XML_S         ' '
+#define LOG_FILE_L "log-file"
+#define LOG_FILE_S 'L'
 
-#define QUERY_FORMAT_L      "query-format"
-#define QUERY_FORMAT_S      ' '
+#define NO_PROGRESS_L "no-progress"
+#define NO_PROGRESS_S ' '
 
-#define LOG_ON_UPDATE_L     "log-on-update"
-#define LOG_ON_UPDATE_S     ' '
+#define XML_L "xml"
+#define XML_S 'x'
 
-#define LOG_L               "log"
-#define LOG_S               ' '
+#define OUT_FILE_L "outfile"
+#define OUT_FILE_S 'o'
 
-#define LOG_FILE_L          "log-file"
-#define LOG_FILE_S          'L'
+#define LOOKUP_FILE_L "lookup"
+#define LOOKUP_FILE_S ' '
 
-#define NO_PROGRESS_L       "no-progress"
-#define NO_PROGRESS_S       ' '
+#define HELP_L "help"
+#define HELP_S 'h'
 
-#define XML_L               "xml"
-#define XML_S               'x'
+#define HIDDEN_HELP_L "hhelp"
+#define HIDDEN_HELP_S ' '
 
-#define OUT_FILE_L          "outfile"
-#define OUT_FILE_S          'o'
+#define BURN_FAIL_SAFE_L "nofs"
+#define BURN_FAIL_SAFE_S ' '
 
-#define LOOKUP_FILE_L       "lookup"
-#define LOOKUP_FILE_S       ' '
+#define RET_DL_L "ret-dl"
+#define RET_DL_S ' '
 
-#define HELP_L              "help"
-#define HELP_S              'h'
+#define RET_LVIM_L "ret-lvim"
+#define RET_LVIM_S ' '
 
-#define HIDDEN_HELP_L       "hhelp"
-#define HIDDEN_HELP_S       ' '
+#define NO_EXTRACT_LIST_L "no_extract_list"
+#define NO_EXTRACT_LIST_S ' '
 
-#define BURN_FAIL_SAFE_L    "nofs"
-#define BURN_FAIL_SAFE_S    ' '
+#define NUM_OF_RETRIALS_L "download_retrials"
+#define NUM_OF_RETRIALS_S ' '
 
-#define RET_DL_L            "ret-dl"
-#define RET_DL_S            ' '
-
-#define RET_LVIM_L          "ret-lvim"
-#define RET_LVIM_S          ' '
-
-#define NO_EXTRACT_LIST_L        "no_extract_list"
-#define NO_EXTRACT_LIST_S        ' '
-
-#define NUM_OF_RETRIALS_L      "download_retrials"
-#define NUM_OF_RETRIALS_S      ' '
-
-#define NO_FW_CTRL_L        "no_fw_ctrl"
-#define NO_FW_CTRL_S        ' '
+#define NO_FW_CTRL_L "no_fw_ctrl"
+#define NO_FW_CTRL_S ' '
 
 string toolName = "";
 /************************************
-* Function: CmdLineParser
-************************************/
+ * Function: CmdLineParser
+ ************************************/
 static void printExamples()
 {
     cout << "Examples:" << endl;
@@ -230,18 +226,22 @@ static void printExamples()
     cout << "\t4. Update the card's firmware from latest version on the web" << endl;
     cout << "\t>> " << toolName << " --" << ONLINE_IMGS_L << " -u" << endl;
     cout << "\t5. Download latest FW package from the web" << endl;
-    cout << "\t>> " << toolName << " --" << USE_DEFAULT_L << " --" << DNLD_OS_L << " Linux_x64" << " --" << DNLD_TYPE_L << " self_extractor" << endl << endl;
+    cout << "\t>> " << toolName << " --" << USE_DEFAULT_L << " --" << DNLD_OS_L << " Linux_x64"
+         << " --" << DNLD_TYPE_L << " self_extractor" << endl
+         << endl;
 }
-CmdLineParser::CmdLineParser(CmdLineParams *params, char **argv, int argc) :
-    CommandLineRequester(""),
-    _cmdParser("")
+CmdLineParser::CmdLineParser(CmdLineParams* params, char** argv, int argc) : CommandLineRequester(""), _cmdParser("")
 {
     toolName = TOOL_NAME;
     _cmdLineParams = params;
-    for (int i = 0; i < argc; i++) {
-        if (strstr((const char*)argv[i], NO_EXTRACT_LIST_L) != NULL) {
+    for (int i = 0; i < argc; i++)
+    {
+        if (strstr((const char*)argv[i], NO_EXTRACT_LIST_L) != NULL)
+        {
             _cmdLineParams->no_extract_list = true;
-        } else if (strstr((const char*)argv[i], CURRENT_DIR_L) != NULL) {
+        }
+        else if (strstr((const char*)argv[i], CURRENT_DIR_L) != NULL)
+        {
             // This option is hidden and only used with self extractors
             toolName = "mlxup";
         }
@@ -252,28 +252,31 @@ CmdLineParser::CmdLineParser(CmdLineParams *params, char **argv, int argc) :
 }
 
 /************************************
-* Function: ~CmdLineParser
-************************************/
-CmdLineParser::~CmdLineParser()
-{
-}
+ * Function: ~CmdLineParser
+ ************************************/
+CmdLineParser::~CmdLineParser() {}
 
 /************************************
-* Function: parse
-************************************/
-bool CmdLineParser::parse(char **argv, int argc)
+ * Function: parse
+ ************************************/
+bool CmdLineParser::parse(char** argv, int argc)
 {
     _cmdParser.AddRequester(this);
     int rc = _cmdParser.ParseOptions(argc, argv, false);
 
-    if (rc == PARSE_ERROR_SHOW_USAGE) { // parse error and we need to dump usage
-        cout <<  _cmdParser.GetSynopsis().c_str();
+    if (rc == PARSE_ERROR_SHOW_USAGE)
+    { // parse error and we need to dump usage
+        cout << _cmdParser.GetSynopsis().c_str();
         return false;
-    } else if (rc == PARSE_OK_WITH_EXIT) {   // OK but need to exit
+    }
+    else if (rc == PARSE_OK_WITH_EXIT)
+    { // OK but need to exit
         exit(0);
         return false;
-    } else if (rc == PARSE_ERROR) {   // error but no need to dump usage
-        cout <<  _cmdParser.GetSynopsis().c_str();
+    }
+    else if (rc == PARSE_ERROR)
+    { // error but no need to dump usage
+        cout << _cmdParser.GetSynopsis().c_str();
         return false;
     }
 
@@ -281,253 +284,150 @@ bool CmdLineParser::parse(char **argv, int argc)
 }
 
 /************************************
-* Function: initOptions
-************************************/
+ * Function: initOptions
+ ************************************/
 void CmdLineParser::initOptions()
 {
     AddDescription(TOOL_DESC);
 
-    #ifdef ONLY_PCI_FORMAT
-    this->AddOptions(DEVICE_L,
-                     DEVICE_S,
-                     "DeviceName",
-                     "Perform operation for specified PCI (using the format <Bus>:<Device>.<Function>) or IB device(s)."   " Multiple devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
-    #else
-    this->AddOptions(DEVICE_L,
-                     DEVICE_S,
-                     "DeviceName",
-                     "Perform operation for specified mst device(s). Run 'mst status' command to list the available devices. Multiple devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
-    #endif
-
-    this->AddOptions(NUM_OF_RETRIALS_L,
-                     NUM_OF_RETRIALS_S,
-                     "NumOfRetrials",
-                     "Number of download retrials default is 5",
+#ifdef ONLY_PCI_FORMAT
+    this->AddOptions(
+      DEVICE_L,
+      DEVICE_S,
+      "DeviceName",
+      "Perform operation for specified PCI (using the format <Bus>:<Device>.<Function>) or IB device(s)."
+      " Multiple devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
+#else
+    this->AddOptions(
+      DEVICE_L,
+      DEVICE_S,
+      "DeviceName",
+      "Perform operation for specified mst device(s). Run 'mst status' command to list the available devices. Multiple devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
+#endif
+
+    this->AddOptions(NUM_OF_RETRIALS_L, NUM_OF_RETRIALS_S, "NumOfRetrials", "Number of download retrials default is 5",
                      true);
 
-    this->AddOptions(HELP_L,
-                     HELP_S,
-                     "",
-                     "Show this message and exit");
+    this->AddOptions(HELP_L, HELP_S, "", "Show this message and exit");
 
-    this->AddOptions(CURRENT_DIR_L,
-                     CURRENT_DIR_S,
-                     "currentDir",
-                     "current directory used only with self extractor",
+    this->AddOptions(CURRENT_DIR_L, CURRENT_DIR_S, "currentDir", "current directory used only with self extractor",
                      true);
 
-    this->AddOptions(HIDDEN_HELP_L,
-                     HIDDEN_HELP_S,
-                     "",
-                     "Show hidden options help and exit",
-                     true); //Hidden
-
-    this->AddOptions(VERSION_L,
-                     VERSION_S,
-                     "",
-                     "Show the executable version and exit");
-
-    this->AddOptions(QUERY_L,
-                     QUERY_S,
-                     "",
-                     "Query device(s) info");
-
-    this->AddOptions(QUERY_XML_L,
-                     QUERY_XML_S,
-                     "",
-                     "Query device(s) info (xml format)",
-                     true);
+    this->AddOptions(HIDDEN_HELP_L, HIDDEN_HELP_S, "", "Show hidden options help and exit",
+                     true); // Hidden
 
-    this->AddOptions(QUERY_FORMAT_L,
-                     QUERY_FORMAT_S,
-                     "Format",
+    this->AddOptions(VERSION_L, VERSION_S, "", "Show the executable version and exit");
+
+    this->AddOptions(QUERY_L, QUERY_S, "", "Query device(s) info");
+
+    this->AddOptions(QUERY_XML_L, QUERY_XML_S, "", "Query device(s) info (xml format)", true);
+
+    this->AddOptions(QUERY_FORMAT_L, QUERY_FORMAT_S, "Format",
                      "(Query | Online query) output format, XML | Text - default Text");
 
-    this->AddOptions(UPDATE_L,
-                     UPDATE_S,
-                     "",
-                     "Update firmware image(s) on the device(s)");
+    this->AddOptions(UPDATE_L, UPDATE_S, "", "Update firmware image(s) on the device(s)");
 
-    this->AddOptions(USE_IMG_FILE_L,
-                     USE_IMG_FILE_S,
-                     "FileName",
-                     "Specified image file to use");
+    this->AddOptions(USE_IMG_FILE_L, USE_IMG_FILE_S, "FileName", "Specified image file to use");
 
-    this->AddOptions(USE_IMG_DIR_L,
-                     USE_IMG_DIR_S,
-                     "DirectoryName",
+    this->AddOptions(USE_IMG_DIR_L, USE_IMG_DIR_S, "DirectoryName",
                      "Specified directory instead of default to locate image files");
 
     this->AddOptions(LOOKUP_FILE_L,
                      LOOKUP_FILE_S,
                      "LookupFileName",
                      "Provide PSID-Description lookup file",
-                     true); //Hidden
-
-    this->AddOptions(FORCE_L,
-                     FORCE_S,
-                     "",
-                     "Force image update");
-
-    this->AddOptions(NO_FW_CTRL_L,
-                     NO_FW_CTRL_S,
-                     "",
-                     "Don't use FW Ctrl update");
-
-    this->AddOptions(YES_L,
-                     YES_S,
-                     "",
-                     "Answer is yes in prompts");
-
-    this->AddOptions(NO_L,
-                     NO_S,
-                     "",
-                     "Answer is no in prompts");
-
-    this->AddOptions(FFV_L,
-                     FFV_S,
-                     "",
-                     "Compare Firmware family version",
-                     true); //Hidden
-
-    this->AddOptions(CLEAR_SEM_L,
-                     CLEAR_SEM_S,
-                     "",
-                     "Force clear the flash semaphore on the device, No command is allowed when this flag is used. "
-                     "NOTE: May result in system instability or flash corruption if the device or another application is currently using the flash. Exercise caution."
-                     );
-
-    this->AddOptions(EXE_REL_PATH_L,
-                     EXE_REL_PATH_S,
-                     "",
-                     "Use paths relative to the location of the executable",
-                     false);
+                     true); // Hidden
+
+    this->AddOptions(FORCE_L, FORCE_S, "", "Force image update");
+
+    this->AddOptions(NO_FW_CTRL_L, NO_FW_CTRL_S, "", "Don't use FW Ctrl update");
+
+    this->AddOptions(YES_L, YES_S, "", "Answer is yes in prompts");
+
+    this->AddOptions(NO_L, NO_S, "", "Answer is no in prompts");
+
+    this->AddOptions(FFV_L, FFV_S, "", "Compare Firmware family version",
+                     true); // Hidden
+
+    this->AddOptions(
+      CLEAR_SEM_L,
+      CLEAR_SEM_S,
+      "",
+      "Force clear the flash semaphore on the device, No command is allowed when this flag is used. "
+      "NOTE: May result in system instability or flash corruption if the device or another application is currently using the flash. Exercise caution.");
+
+    this->AddOptions(EXE_REL_PATH_L, EXE_REL_PATH_S, "", "Use paths relative to the location of the executable", false);
+
+    this->AddOptions(PSID_L, PSID_S, "PSID", "specify PSID",
+                     true); // Hidden
 
-    this->AddOptions(PSID_L,
-                     PSID_S,
-                     "PSID",
-                     "specify PSID",
-                     true);//Hidden
-
-    this->AddOptions(CRC_L,
-                     CRC_S,
-                     "",
-                     "CRC calculation of raw file provided with -i option",
-                     true);//Hidden
-
-    this->AddOptions(EXTRACT_L,
-                     EXTRACT_S,
-                     "",
-                     "Extract image, if " + (string)EXTRACT_FILE_L + " not specified, will be exported in production format",
-                     true);//Hidden
-
-    this->AddOptions(EXTRACT_FILE_L,
-                     EXTRACT_FILE_S,
-                     "FileName",
-                     "Write to target file",
-                     true);//Hidden
-
-    if (_cmdLineParams->no_extract_list == false) {
+    this->AddOptions(CRC_L, CRC_S, "", "CRC calculation of raw file provided with -i option",
+                     true); // Hidden
+
+    this->AddOptions(
+      EXTRACT_L,
+      EXTRACT_S,
+      "",
+      "Extract image, if " + (string)EXTRACT_FILE_L + " not specified, will be exported in production format",
+      true); // Hidden
+
+    this->AddOptions(EXTRACT_FILE_L, EXTRACT_FILE_S, "FileName", "Write to target file",
+                     true); // Hidden
+
+    if (_cmdLineParams->no_extract_list == false)
+    {
         this->AddOptions(EXTRACT_DIR_L,
                          EXTRACT_DIR_S,
                          "ExtractDir",
                          "If specified image files will"
                          " be extracted to this directory",
-                         true);//Hidden
+                         true); // Hidden
 
-        this->AddOptions(EXTRACT_ALL_L,
-                         EXTRACT_ALL_S,
-                         "",
-                         "Extract all images in production format",
-                         true);//Hidden
+        this->AddOptions(EXTRACT_ALL_L, EXTRACT_ALL_S, "", "Extract all images in production format",
+                         true); // Hidden
 
         this->AddOptions(LIST_CONTENT_L,
                          LIST_CONTENT_S,
                          "",
                          "List file/Directory content, used with --" USE_IMG_DIR_L " and --" USE_IMG_FILE_L " flags");
 
-        this->AddOptions(ARCHIVE_NAMES_L,
-                         ARCHIVE_NAMES_S,
-                         "",
-                         "Display archive names in listing");
-        this->AddOptions(BURN_FAIL_SAFE_L,
-                         BURN_FAIL_SAFE_S,
-                         "",
-                         "Burn image in a non failsafe manner",
-                         false);
+        this->AddOptions(ARCHIVE_NAMES_L, ARCHIVE_NAMES_S, "", "Display archive names in listing");
+        this->AddOptions(BURN_FAIL_SAFE_L, BURN_FAIL_SAFE_S, "", "Burn image in a non failsafe manner", false);
+    }
+    else
+    {
+        this->AddOptions(BURN_FAIL_SAFE_L, BURN_FAIL_SAFE_S, "", "Burn image in a non failsafe manner", true);
+    }
+    this->AddOptions(LOG_ON_UPDATE_L, LOG_ON_UPDATE_S, "", "Create log file on update",
+                     true); // Hidden
 
-    } else {
-        this->AddOptions(BURN_FAIL_SAFE_L,
-                         BURN_FAIL_SAFE_S,
-                         "",
-                         "Burn image in a non failsafe manner",
-                         true);
-    }
-    this->AddOptions(LOG_ON_UPDATE_L,
-                     LOG_ON_UPDATE_S,
-                     "",
-                     "Create log file on update",
-                     true);//Hidden
-
-    this->AddOptions(LOG_L,
-                     LOG_S,
-                     "",
-                     "Create log file");
-
-    this->AddOptions(LOG_FILE_L,
-                     LOG_FILE_S,
-                     "LogFileName",
-                     "Use specified log file");
-
-    this->AddOptions(NO_PROGRESS_L,
-                     NO_PROGRESS_S,
-                     "",
-                     "Do not show progress");
-
-    this->AddOptions(XML_L,
-                     XML_S,
-                     "",
-                     "Output in XML format",
-                     true);//Hidden
-
-    this->AddOptions(OUT_FILE_L,
-                     OUT_FILE_S,
-                     "OutputFileName",
-                     "Write to specified output file");
-
-    this->AddOptions(ONLINE_IMGS_L,
-                     ONLINE_IMGS_S,
-                     "",
-                     "Fetch required FW images online from Mellanox server",
-                     false);
+    this->AddOptions(LOG_L, LOG_S, "", "Create log file");
 
-    this->AddOptions(ONLINE_QUERY_L,
-                     ONLINE_QUERY_S,
-                     "PSIDs",
-                     "Query FW info, PSID(s) are comma separated",
-                     false);
+    this->AddOptions(LOG_FILE_L, LOG_FILE_S, "LogFileName", "Use specified log file");
+
+    this->AddOptions(NO_PROGRESS_L, NO_PROGRESS_S, "", "Do not show progress");
+
+    this->AddOptions(XML_L, XML_S, "", "Output in XML format",
+                     true); // Hidden
 
-    this->AddOptions(DNLD_KEY_L,
-                     DNLD_KEY_S,
-                     "key",
-                     "Key for custom download/update");
+    this->AddOptions(OUT_FILE_L, OUT_FILE_S, "OutputFileName", "Write to specified output file");
+
+    this->AddOptions(ONLINE_IMGS_L, ONLINE_IMGS_S, "", "Fetch required FW images online from Mellanox server", false);
+
+    this->AddOptions(ONLINE_QUERY_L, ONLINE_QUERY_S, "PSIDs", "Query FW info, PSID(s) are comma separated", false);
+
+    this->AddOptions(DNLD_KEY_L, DNLD_KEY_S, "key", "Key for custom download/update");
 
     this->AddOptions(DNLD_L,
                      DNLD_S,
                      "DirectoryName",
                      "Download files from server to a specified directory",
-                     false); //Hidden
+                     false); // Hidden
 
-    this->AddOptions(USE_DEFAULT_L,
-                     USE_DEFAULT_S,
-                     "",
-                     "Use Default values for download");
+    this->AddOptions(USE_DEFAULT_L, USE_DEFAULT_S, "", "Use Default values for download");
 
-    this->AddOptions(GET_DNLD_OPT_L,
-                     GET_DNLD_OPT_S,
-                     "OPT",
-                     "Get download options for OS or Device\nOptions are: OS, Device",
-                     false);
+    this->AddOptions(GET_DNLD_OPT_L, GET_DNLD_OPT_S, "OPT",
+                     "Get download options for OS or Device\nOptions are: OS, Device", false);
 
     this->AddOptions(DNLD_DEV_L,
                      DNLD_DEV_S,
@@ -538,52 +438,31 @@ void CmdLineParser::initOptions()
     this->AddOptions(DNLD_OS_L,
                      DNLD_OS_S,
                      "OS",
-                     "Only for self_extractor download: Use '--" GET_DNLD_OPT_L " OS' option to view available OS for sfx download",
-                     false);
-
-    this->AddOptions(DNLD_TYPE_L,
-                     DNLD_TYPE_S,
-                     "Type",
-                     "MFA | self_extractor - default All",
+                     "Only for self_extractor download: Use '--" GET_DNLD_OPT_L
+                     " OS' option to view available OS for sfx download",
                      false);
 
-    this->AddOptions(SERVER_URL_L,
-                     SERVER_URL_S,
-                     "URL",
-                     "Server URL for online operations",
-                     true);
+    this->AddOptions(DNLD_TYPE_L, DNLD_TYPE_S, "Type", "MFA | self_extractor - default All", false);
 
-    this->AddOptions(CERTIFICATE_L,
-                     CERTIFICATE_S,
-                     "Certificate",
-                     "SSL certificate For secure connection");
+    this->AddOptions(SERVER_URL_L, SERVER_URL_S, "URL", "Server URL for online operations", true);
 
-    this->AddOptions(RET_DL_L,
-                     RET_DL_S,
-                     "",
-                     "Change return Value",
-                     true);
+    this->AddOptions(CERTIFICATE_L, CERTIFICATE_S, "Certificate", "SSL certificate For secure connection");
 
-    this->AddOptions(RET_LVIM_L,
-                     RET_LVIM_S,
-                     "",
-                     "change return Value",
-                     true);
+    this->AddOptions(RET_DL_L, RET_DL_S, "", "Change return Value", true);
 
+    this->AddOptions(RET_LVIM_L, RET_LVIM_S, "", "change return Value", true);
 
-    this->AddOptions(NO_EXTRACT_LIST_L,
-                     NO_EXTRACT_LIST_S,
-                     "",
-                     "Do not extract or list binaries",
-                     true); //Hidden
+    this->AddOptions(NO_EXTRACT_LIST_L, NO_EXTRACT_LIST_S, "", "Do not extract or list binaries",
+                     true); // Hidden
 }
 
-bool csvSplit(string str, vector<string> &strv)
+bool csvSplit(string str, vector<string>& strv)
 {
     size_t pos;
     bool res = true;
 
-    while ((pos = str.find(';')) != string::npos) {
+    while ((pos = str.find(';')) != string::npos)
+    {
         string tmp = str.substr(0, pos);
         strv.push_back(tmp);
         str = str.substr(pos + 1);
@@ -593,237 +472,348 @@ bool csvSplit(string str, vector<string> &strv)
     return res;
 }
 
-
 /************************************
-* Function: HandleOption
-************************************/
+ * Function: HandleOption
+ ************************************/
 ParseStatus CmdLineParser::HandleOption(string name, string value)
 {
-
-    if (name == DEVICE_L) {
+    if (name == DEVICE_L)
+    {
         _cmdLineParams->device_names.clear();
-        if (!csvSplit(value, _cmdLineParams->device_names)) {
+        if (!csvSplit(value, _cmdLineParams->device_names))
+        {
             return PARSE_ERROR_SHOW_USAGE;
         }
         return PARSE_OK;
-    } else if (name == EXE_REL_PATH_L) {
+    }
+    else if (name == EXE_REL_PATH_L)
+    {
         _cmdLineParams->use_exe_rel_paths = 1;
         return PARSE_OK;
-    } else if (name == CURRENT_DIR_L) {
+    }
+    else if (name == CURRENT_DIR_L)
+    {
         _cmdLineParams->current_dir = value;
         return PARSE_OK;
-    } else if (name == CLEAR_SEM_L) {
+    }
+    else if (name == CLEAR_SEM_L)
+    {
         _cmdLineParams->clear_semaphore = true;
         return PARSE_OK;
-    } else if (name == UPDATE_L) {
+    }
+    else if (name == UPDATE_L)
+    {
         _cmdLineParams->update_fw = 1;
         return PARSE_OK;
-    } else if (name == ARCHIVE_NAMES_L) {
+    }
+    else if (name == ARCHIVE_NAMES_L)
+    {
         _cmdLineParams->display_archive_names = true;
         return PARSE_OK;
-    } else if (name == SERVER_URL_L) {
+    }
+    else if (name == SERVER_URL_L)
+    {
         _cmdLineParams->server_url = value;
         return PARSE_OK;
-    } else if (name == PROXY_L) {
+    }
+    else if (name == PROXY_L)
+    {
         _cmdLineParams->proxy = value;
         return PARSE_OK;
-    } else if (name == CERTIFICATE_L) {
+    }
+    else if (name == CERTIFICATE_L)
+    {
         _cmdLineParams->certificate = value;
         return PARSE_OK;
-    } else if (name == ONLINE_IMGS_L) {
+    }
+    else if (name == ONLINE_IMGS_L)
+    {
         _cmdLineParams->update_online = true;
         return PARSE_OK;
-    } else if (name == ONLINE_QUERY_L) {
+    }
+    else if (name == ONLINE_QUERY_L)
+    {
         _cmdLineParams->onlineQueryPsids = value;
         return PARSE_OK;
-    } else if (name == USE_IMG_FILE_L) {
+    }
+    else if (name == USE_IMG_FILE_L)
+    {
         // Check if --image-dir was already parsed
-        if (_cmdLineParams->use_mfa_dir == 1) {
+        if (_cmdLineParams->use_mfa_dir == 1)
+        {
             printf("-E- Flags --" USE_IMG_FILE_L " and --" USE_IMG_DIR_L " are not to be used in the same command\n");
             return PARSE_ERROR;
         }
         _cmdLineParams->use_mfa_file = 1;
         _cmdLineParams->mfa_file = value;
         return PARSE_OK;
-    } else if (name == USE_IMG_DIR_L) {
+    }
+    else if (name == USE_IMG_DIR_L)
+    {
         // Check if --image-file was already parsed
-        if (_cmdLineParams->use_mfa_file == 1) {
+        if (_cmdLineParams->use_mfa_file == 1)
+        {
             printf("-E- Flags --" USE_IMG_FILE_L " and --" USE_IMG_DIR_L " are not to be used in the same command\n");
             return PARSE_ERROR;
         }
         _cmdLineParams->use_mfa_dir = 1;
         _cmdLineParams->mfa_dir = value;
         return PARSE_OK;
-    } else if (name == USE_DEFAULT_L) {
+    }
+    else if (name == USE_DEFAULT_L)
+    {
         _cmdLineParams->download_default = 1;
         return PARSE_OK;
-    } else if (name == DNLD_L) {
+    }
+    else if (name == DNLD_L)
+    {
         _cmdLineParams->download = true;
         _cmdLineParams->download_dir = value;
         return PARSE_OK;
-    } else if (name == GET_DNLD_OPT_L) {
+    }
+    else if (name == GET_DNLD_OPT_L)
+    {
         trim(value);
         to_lowercase(value);
-        if (value != "os" && value != "device") {
+        if (value != "os" && value != "device")
+        {
             printf("-E- Invalid value %s. please specify: OS | Device\n ", value.c_str());
             return PARSE_ERROR;
         }
         _cmdLineParams->get_download_opt = value;
         return PARSE_OK;
-    } else if (name == DNLD_DEV_L) {
+    }
+    else if (name == DNLD_DEV_L)
+    {
         trim(value);
         to_lowercase(value);
         _cmdLineParams->download_dev = value;
         return PARSE_OK;
-    } else if (name == DNLD_OS_L) {
+    }
+    else if (name == DNLD_OS_L)
+    {
         trim(value);
         to_lowercase(value);
         _cmdLineParams->download_os = value;
         return PARSE_OK;
-    } else if (name == DNLD_TYPE_L) {
+    }
+    else if (name == DNLD_TYPE_L)
+    {
         trim(value);
         to_lowercase(value);
-        if (value != "mfa" && value != "self_extractor" && value != "all") {
+        if (value != "mfa" && value != "self_extractor" && value != "all")
+        {
             printf("-E- Value :'%s' is not valid, valid values are : MFA | self_extractor|All\n", value.c_str());
             return PARSE_ERROR;
         }
         _cmdLineParams->download_type = value;
         return PARSE_OK;
-    } else if (name == DNLD_KEY_L) {
+    }
+    else if (name == DNLD_KEY_L)
+    {
         _cmdLineParams->download_key = value;
         return PARSE_OK;
-    } else if (name == LOG_ON_UPDATE_L) {
+    }
+    else if (name == LOG_ON_UPDATE_L)
+    {
         _cmdLineParams->log_on_update = true;
         return PARSE_OK;
-    } else if (name == LOG_L) {
+    }
+    else if (name == LOG_L)
+    {
         _cmdLineParams->create_log = 1;
         return PARSE_OK;
-    } else if (name == PSID_L) {
+    }
+    else if (name == PSID_L)
+    {
         _cmdLineParams->psid = value;
         return PARSE_OK;
-    } else if (name == CRC_L) {
+    }
+    else if (name == CRC_L)
+    {
         _cmdLineParams->calc_crc = true;
         return PARSE_OK;
-    } else if (name == EXTRACT_L) {
+    }
+    else if (name == EXTRACT_L)
+    {
         _cmdLineParams->extract_image = true;
         return PARSE_OK;
-    } else if (name == EXTRACT_ALL_L) {
+    }
+    else if (name == EXTRACT_ALL_L)
+    {
         _cmdLineParams->extract_all = true;
         return PARSE_OK;
-    } else if (name == EXTRACT_DIR_L) {
+    }
+    else if (name == EXTRACT_DIR_L)
+    {
         _cmdLineParams->extract_dir = value;
         return PARSE_OK;
-    } else if (name == EXTRACT_FILE_L) {
+    }
+    else if (name == EXTRACT_FILE_L)
+    {
         _cmdLineParams->target_file = value;
         return PARSE_OK;
-    } else if (name == QUERY_L) {
+    }
+    else if (name == QUERY_L)
+    {
         _cmdLineParams->query_device = true;
         return PARSE_OK;
-    } else if (name == QUERY_XML_L) {
+    }
+    else if (name == QUERY_XML_L)
+    {
         _cmdLineParams->query_device_xml = true;
         return PARSE_OK;
-    } else if (name == QUERY_FORMAT_L) {
+    }
+    else if (name == QUERY_FORMAT_L)
+    {
         trim(value);
         to_lowercase(value);
-        if (value != "xml" && value != "text") {
+        if (value != "xml" && value != "text")
+        {
             printf("-E- Value :'%s' is not valid, valid values are : XML | Text\n", value.c_str());
             return PARSE_ERROR;
         }
         _cmdLineParams->queryFormat = value;
-        if (_cmdLineParams->queryFormat == "xml") {
+        if (_cmdLineParams->queryFormat == "xml")
+        {
             _cmdLineParams->query_device_xml = true;
         }
         return PARSE_OK;
-    } else if (name == LOG_FILE_L) {
+    }
+    else if (name == LOG_FILE_L)
+    {
         _cmdLineParams->create_log = 1;
         _cmdLineParams->use_log_file = 1;
         _cmdLineParams->log_file = value;
         return PARSE_OK;
-    } else if (name == NO_PROGRESS_L) {
+    }
+    else if (name == NO_PROGRESS_L)
+    {
         _cmdLineParams->show_progress = false;
         return PARSE_OK;
-    } else if (name == XML_L) {
+    }
+    else if (name == XML_L)
+    {
         _cmdLineParams->write_xml = 1;
         _cmdLineParams->dl = true;
         return PARSE_OK;
-    } else if (name == OUT_FILE_L) {
+    }
+    else if (name == OUT_FILE_L)
+    {
         _cmdLineParams->use_output_file = 1;
         _cmdLineParams->output_file = value;
         return PARSE_OK;
-    } else if (name == LOOKUP_FILE_L) {
+    }
+    else if (name == LOOKUP_FILE_L)
+    {
         _cmdLineParams->use_lookup_file = 1;
         _cmdLineParams->lookup_file = value;
         return PARSE_OK;
-    } else if (name == FORCE_L) {
+    }
+    else if (name == FORCE_L)
+    {
         _cmdLineParams->force_update = 1;
         return PARSE_OK;
-    } else if (name == NO_FW_CTRL_L) {
+    }
+    else if (name == NO_FW_CTRL_L)
+    {
         _cmdLineParams->no_fw_ctrl = true;
         return PARSE_OK;
-    } else if (name == YES_L) {
+    }
+    else if (name == YES_L)
+    {
         // Check if --no was already parsed
-        if (_cmdLineParams->yes_no_ == 0) {
+        if (_cmdLineParams->yes_no_ == 0)
+        {
             printf("-E- Flags --" YES_L " and --" NO_L " are not to be used in the same command\n");
             return PARSE_ERROR;
         }
         _cmdLineParams->yes_no_ = 1;
         return PARSE_OK;
-    } else if (name == NO_L) {
+    }
+    else if (name == NO_L)
+    {
         // Check if --yes was already parsed
-        if (_cmdLineParams->yes_no_ == 1) {
+        if (_cmdLineParams->yes_no_ == 1)
+        {
             printf("-E- Flags --" YES_L " and --" NO_L " are not to be used in the same command\n");
             return PARSE_ERROR;
         }
         _cmdLineParams->yes_no_ = 0;
         return PARSE_OK;
-    } else if (name == LIST_CONTENT_L) {
+    }
+    else if (name == LIST_CONTENT_L)
+    {
         _cmdLineParams->list_file_contents = true;
         return PARSE_OK;
-    } else if (name == FFV_L) {
+    }
+    else if (name == FFV_L)
+    {
         _cmdLineParams->compare_ffv = 1;
         return PARSE_OK;
-    } else if (name == HELP_L) {
+    }
+    else if (name == HELP_L)
+    {
         cout << _cmdParser.GetUsage();
         printExamples();
         return PARSE_OK_WITH_EXIT;
-    } else if (name == HIDDEN_HELP_L) {
+    }
+    else if (name == HIDDEN_HELP_L)
+    {
         cout << _cmdParser.GetUsage(true);
         printExamples();
         return PARSE_OK_WITH_EXIT;
-    } else if (name == VERSION_L) {
+    }
+    else if (name == VERSION_L)
+    {
         print_version_string((const char*)toolName.c_str(), TOOL_VERSION);
         return PARSE_OK_WITH_EXIT;
-    } else if (name == BURN_FAIL_SAFE_L) {
+    }
+    else if (name == BURN_FAIL_SAFE_L)
+    {
         _cmdLineParams->burnFailsafe = false;
         return PARSE_OK;
-    } else if (name == RET_DL_L) {
+    }
+    else if (name == RET_DL_L)
+    {
         _cmdLineParams->dl = true;
         return PARSE_OK;
-    } else if (name == RET_LVIM_L) {
+    }
+    else if (name == RET_LVIM_L)
+    {
         _cmdLineParams->lvim = true;
         return PARSE_OK;
-    } else if (name == NO_EXTRACT_LIST_L) {
+    }
+    else if (name == NO_EXTRACT_LIST_L)
+    {
         _cmdLineParams->no_extract_list = true;
         return PARSE_OK;
-    } else if (name == NUM_OF_RETRIALS_L) {
+    }
+    else if (name == NUM_OF_RETRIALS_L)
+    {
         std::istringstream iss(value);
         iss >> _cmdLineParams->numberOfRetrials >> std::ws;
-        if (!iss.eof()) {
+        if (!iss.eof())
+        {
             cout << "-E- Could not parse val: " << value << "\n";
             return PARSE_ERROR_SHOW_USAGE;
         }
-        #if !defined(__FreeBSD__)
-        if (iss.fail()) {
+#if !defined(__FreeBSD__)
+        if (iss.fail())
+        {
             cout << "-E- Could not parse val: " << value << "\n";
             return PARSE_ERROR_SHOW_USAGE;
         }
-        #endif
-        if (_cmdLineParams->numberOfRetrials < 0) {
+#endif
+        if (_cmdLineParams->numberOfRetrials < 0)
+        {
             cout << "-E- Negative value is not allowed " << value << "\n";
             return PARSE_ERROR;
         }
         return PARSE_OK;
-    } else {
+    }
+    else
+    {
         cout << "Unknown Flag: " << name << "\n";
         return PARSE_ERROR_SHOW_USAGE;
     }
diff --git a/mlxfwupdate/cmd_line_parser.h b/mlxfwupdate/cmd_line_parser.h
index 391a3d26..d874ecef 100644
--- a/mlxfwupdate/cmd_line_parser.h
+++ b/mlxfwupdate/cmd_line_parser.h
@@ -45,9 +45,9 @@
 class CmdLineParser : public CommandLineRequester
 {
 public:
-    CmdLineParser(CmdLineParams *params, char **argv, int argc);
+    CmdLineParser(CmdLineParams* params, char** argv, int argc);
     ~CmdLineParser();
-    bool parse(char **argv, int argc);
+    bool parse(char** argv, int argc);
     ParseStatus HandleOption(string name, string value);
 
 private:
@@ -55,5 +55,5 @@ class CmdLineParser : public CommandLineRequester
 
 private:
     CommandLineParser _cmdParser;
-    CmdLineParams *_cmdLineParams;
+    CmdLineParams* _cmdLineParams;
 };
diff --git a/mlxfwupdate/err_msgs.h b/mlxfwupdate/err_msgs.h
index 64d834fa..5138f9e3 100644
--- a/mlxfwupdate/err_msgs.h
+++ b/mlxfwupdate/err_msgs.h
@@ -36,10 +36,11 @@
 #ifndef __ERR_MSGS__
 #define __ERR_MSGS__
 
-enum {
+enum
+{
     MLX_FWM_SUCCESS = 0,
     ERR_CODE_QUERY_FAILED = 1,
-    ERR_CODE_PROG_FAILED  = 2,
+    ERR_CODE_PROG_FAILED = 2,
     ERR_CODE_BAD_CMD_ARGS = 3,
     ERR_CODE_CREATE_LOG_FAIL = 4,
     ERR_CODE_FETCH_LOCAL_DEVICES_FAIL = 5,
@@ -56,7 +57,7 @@ enum {
     ERR_CODE_MIXED_VERSIONS_FOUND = 16,
     ERR_CODE_FILE_PARSE_FAILED = 17,
     ERR_CODE_INTERRUPTED = 18,
-    ERR_CODE_NOT_ROOT    = 19,
+    ERR_CODE_NOT_ROOT = 19,
     ERR_CODE_NO_DEVICES_FOUND = 20,
     ERR_CODE_NO_DEVICES_FOUND_LVIM = 171,
     ERR_CODE_CLEAR_SEMAPORE = 21,
@@ -70,33 +71,33 @@ enum {
     ERR_CODES_NUM
 };
 
-#define ERR_MSG_QUERY_FAILED             "Failed to query one or more devices"
-#define ERR_MSG_PROG_FAILED              "Failed to program device"
-#define ERR_MSG_BAD_CMD_ARGS             "Bad command line arguments"
-#define ERR_MSG_CREATE_LOG_FAIL          "Failed to create log file"
+#define ERR_MSG_QUERY_FAILED "Failed to query one or more devices"
+#define ERR_MSG_PROG_FAILED "Failed to program device"
+#define ERR_MSG_BAD_CMD_ARGS "Bad command line arguments"
+#define ERR_MSG_CREATE_LOG_FAIL "Failed to create log file"
 #define ERR_MSG_FETCH_LOCAL_DEVICES_FAIL "Failed during device query"
-#define ERR_MSG_SERVER_DOWNLOAD_FAILED   "Failed to download from server"
-#define ERR_MSG_MEM_ALLOC_FAIL           "Failed to allocate memory"
-#define ERR_MSG_INTERNAL_ERR             "Internal Error"
-#define ERR_MSG_IMG_NOT_FOUND            "No relevant image found for one or more devices"
-#define ERR_MSG_CREATE_OUTPUT_FILE_FAIL  "Failed to create output file"
-#define ERR_MSG_MULTI_IMG_SRC_FOUND      "Failed due to multiple image source ambiguity"
-#define ERR_MSG_BAD_INI_FILE             "Error parsing ini file"
-#define ERR_MSG_SERVER_RETRIEVE_FAIL     "Failed to retrieve from server"
-#define ERR_MSG_WRITE_FILE_FAIL          "Failed to write file"
-#define ERR_MSG_EXTRACT_IMAGE_FAIL       "Failed to extract image"
-#define ERR_MSG_MIXED_VERSIONS_FOUND     "Mixed component versions found"
-#define ERR_MSG_FILE_PARSE_FAILED        "Failed while parsing file"
-#define ERR_MSG_INTERRUPTED              "Interrupted by user"
-#define ERR_MSG_NOT_ROOT                 "User is not root"
-#define ERR_MSG_NO_DEVICES_FOUND         "No devices found or specified"
-#define ERR_MSG_CLEAR_SEMAPORE           "Clear semaphore failure"
-#define ERR_MSG_UNKNOWN_EXPANSION_ROM    "Unknown expansion rom"
-#define ERR_MSG_UNSUPPORTED_DEVICE       "Device is not supported in online update"
+#define ERR_MSG_SERVER_DOWNLOAD_FAILED "Failed to download from server"
+#define ERR_MSG_MEM_ALLOC_FAIL "Failed to allocate memory"
+#define ERR_MSG_INTERNAL_ERR "Internal Error"
+#define ERR_MSG_IMG_NOT_FOUND "No relevant image found for one or more devices"
+#define ERR_MSG_CREATE_OUTPUT_FILE_FAIL "Failed to create output file"
+#define ERR_MSG_MULTI_IMG_SRC_FOUND "Failed due to multiple image source ambiguity"
+#define ERR_MSG_BAD_INI_FILE "Error parsing ini file"
+#define ERR_MSG_SERVER_RETRIEVE_FAIL "Failed to retrieve from server"
+#define ERR_MSG_WRITE_FILE_FAIL "Failed to write file"
+#define ERR_MSG_EXTRACT_IMAGE_FAIL "Failed to extract image"
+#define ERR_MSG_MIXED_VERSIONS_FOUND "Mixed component versions found"
+#define ERR_MSG_FILE_PARSE_FAILED "Failed while parsing file"
+#define ERR_MSG_INTERRUPTED "Interrupted by user"
+#define ERR_MSG_NOT_ROOT "User is not root"
+#define ERR_MSG_NO_DEVICES_FOUND "No devices found or specified"
+#define ERR_MSG_CLEAR_SEMAPORE "Clear semaphore failure"
+#define ERR_MSG_UNKNOWN_EXPANSION_ROM "Unknown expansion rom"
+#define ERR_MSG_UNSUPPORTED_DEVICE "Device is not supported in online update"
 #define ERR_MSG_ONLINE_UPDATE_CONNECTION_ERROR "Failed to communicate with Server"
-#define ERR_MSG_ONLINE_UPDATE_INTERNAL_ERR   "Internal Error in online update"
-#define ERR_MSG_IVALID_CHOICE                "Select choice is invalid"
-#define ERR_MSG_NONE_FAIL_SAFE               "Burn is fail safe, None fail safe required"
-#define ERR_MSG_SERVER_QUERY                 "Failed to query PSIDs from server"
+#define ERR_MSG_ONLINE_UPDATE_INTERNAL_ERR "Internal Error in online update"
+#define ERR_MSG_IVALID_CHOICE "Select choice is invalid"
+#define ERR_MSG_NONE_FAIL_SAFE "Burn is fail safe, None fail safe required"
+#define ERR_MSG_SERVER_QUERY "Failed to query PSIDs from server"
 
 #endif
diff --git a/mlxfwupdate/fw_version_old_clp.cpp b/mlxfwupdate/fw_version_old_clp.cpp
index daf74d15..7a501e58 100644
--- a/mlxfwupdate/fw_version_old_clp.cpp
+++ b/mlxfwupdate/fw_version_old_clp.cpp
@@ -35,29 +35,28 @@
 #include "fw_version_old_clp.h"
 #include <stdio.h>
 
-FwVersionOldClp::FwVersionOldClp() :
-        FwVersion() {
-}
+FwVersionOldClp::FwVersionOldClp() : FwVersion() {}
 
 FwVersionOldClp::FwVersionOldClp(unsigned short int major,
-        unsigned short int minor, unsigned short int subminor,
-        const std::string& devBranchTag) :
-        FwVersion(major, minor, subminor, devBranchTag) {
-
+                                 unsigned short int minor,
+                                 unsigned short int subminor,
+                                 const std::string& devBranchTag) :
+    FwVersion(major, minor, subminor, devBranchTag)
+{
 }
 
-FwVersionOldClp::~FwVersionOldClp() {
-}
+FwVersionOldClp::~FwVersionOldClp() {}
 
-std::string FwVersionOldClp::get_master_version(const std::string& format,
-        bool even_subminor) const {
-    (void) format;
-    (void) even_subminor;
-    char buff[MAX_VERSION_LENGTH + 1] = { 0 };
+std::string FwVersionOldClp::get_master_version(const std::string& format, bool even_subminor) const
+{
+    (void)format;
+    (void)even_subminor;
+    char buff[MAX_VERSION_LENGTH + 1] = {0};
     snprintf(buff, sizeof(buff), "%d", _minor);
     return buff;
 }
 
-FwVersionOldClp* FwVersionOldClp::clone() const {
+FwVersionOldClp* FwVersionOldClp::clone() const
+{
     return new FwVersionOldClp(*this);
 }
diff --git a/mlxfwupdate/fw_version_old_clp.h b/mlxfwupdate/fw_version_old_clp.h
index 52c5126c..c81bc96e 100644
--- a/mlxfwupdate/fw_version_old_clp.h
+++ b/mlxfwupdate/fw_version_old_clp.h
@@ -37,16 +37,16 @@
 
 #include <mlxfwops/lib/fw_version.h>
 
-class FwVersionOldClp: public FwVersion {
+class FwVersionOldClp : public FwVersion
+{
 public:
     FwVersionOldClp();
-    FwVersionOldClp(unsigned short int, unsigned short int, unsigned short int,
-            const std::string& = "");
+    FwVersionOldClp(unsigned short int, unsigned short int, unsigned short int, const std::string& = "");
     virtual ~FwVersionOldClp();
     FwVersionOldClp* clone() const;
+
 private:
-    std::string get_master_version(const std::string& format,
-            bool even_subminor = false) const;
+    std::string get_master_version(const std::string& format, bool even_subminor = false) const;
 };
 
 #endif /* MLXFWUPDATE_FW_VERSION_OLD_CLP_H_ */
diff --git a/mlxfwupdate/fw_version_with_sub_build.cpp b/mlxfwupdate/fw_version_with_sub_build.cpp
index 3cdc071e..977aa8e3 100644
--- a/mlxfwupdate/fw_version_with_sub_build.cpp
+++ b/mlxfwupdate/fw_version_with_sub_build.cpp
@@ -35,29 +35,27 @@
 #include "fw_version_with_sub_build.h"
 #include <stdio.h>
 
-FwVersionWithSubBuild::FwVersionWithSubBuild() :
-        FwVersion() {
-}
+FwVersionWithSubBuild::FwVersionWithSubBuild() : FwVersion() {}
 
 FwVersionWithSubBuild::FwVersionWithSubBuild(unsigned short int major,
-        unsigned short int minor, unsigned short int subminor,
-        const std::string& devBranchTag) :
-        FwVersion(major, minor, subminor, devBranchTag) {
-
+                                             unsigned short int minor,
+                                             unsigned short int subminor,
+                                             const std::string& devBranchTag) :
+    FwVersion(major, minor, subminor, devBranchTag)
+{
 }
 
-FwVersionWithSubBuild::~FwVersionWithSubBuild() {
-}
+FwVersionWithSubBuild::~FwVersionWithSubBuild() {}
 
-std::string FwVersionWithSubBuild::get_master_version(const std::string& format,
-        bool even_subminor) const {
-    char buff[MAX_VERSION_LENGTH + 1] = { 0 };
-    snprintf(buff, sizeof(buff), format.c_str(), _major, _minor,
-            _subminor / 100,
-            _subminor % 100 - (even_subminor ? _subminor % 2 : 0));
+std::string FwVersionWithSubBuild::get_master_version(const std::string& format, bool even_subminor) const
+{
+    char buff[MAX_VERSION_LENGTH + 1] = {0};
+    snprintf(buff, sizeof(buff), format.c_str(), _major, _minor, _subminor / 100,
+             _subminor % 100 - (even_subminor ? _subminor % 2 : 0));
     return buff;
 }
 
-FwVersionWithSubBuild* FwVersionWithSubBuild::clone() const {
+FwVersionWithSubBuild* FwVersionWithSubBuild::clone() const
+{
     return new FwVersionWithSubBuild(*this);
 }
diff --git a/mlxfwupdate/fw_version_with_sub_build.h b/mlxfwupdate/fw_version_with_sub_build.h
index c515a9aa..224b5617 100644
--- a/mlxfwupdate/fw_version_with_sub_build.h
+++ b/mlxfwupdate/fw_version_with_sub_build.h
@@ -37,16 +37,16 @@
 
 #include <mlxfwops/lib/fw_version.h>
 
-class FwVersionWithSubBuild: public FwVersion {
+class FwVersionWithSubBuild : public FwVersion
+{
 public:
     FwVersionWithSubBuild();
-    FwVersionWithSubBuild(unsigned short int, unsigned short int,
-            unsigned short int, const std::string& = "");
+    FwVersionWithSubBuild(unsigned short int, unsigned short int, unsigned short int, const std::string& = "");
     virtual ~FwVersionWithSubBuild();
     FwVersionWithSubBuild* clone() const;
+
 private:
-    std::string get_master_version(const std::string& format,
-            bool even_subminor = false) const;
+    std::string get_master_version(const std::string& format, bool even_subminor = false) const;
 };
 
 #endif /* MLXFWUPDATE_FW_VERSION_WITH_SUB_BUILD_H_ */
diff --git a/mlxfwupdate/image_access.cpp b/mlxfwupdate/image_access.cpp
index 2765dea4..6dcb3db8 100644
--- a/mlxfwupdate/image_access.cpp
+++ b/mlxfwupdate/image_access.cpp
@@ -50,10 +50,9 @@
 
 using namespace std;
 
-
 ImageAccess::ImageAccess(int compareFFV)
 {
-    _imgFwOps   = NULL;
+    _imgFwOps = NULL;
     _compareFFV = compareFFV;
     memset(&_imgFwParams, 0, sizeof(_imgFwParams));
     memset(_errBuff, 0, sizeof(_errBuff));
@@ -61,7 +60,8 @@ ImageAccess::ImageAccess(int compareFFV)
 
 ImageAccess::~ImageAccess()
 {
-    if (_imgFwOps) {
+    if (_imgFwOps)
+    {
         _imgFwOps->FwCleanUp();
         delete _imgFwOps;
         _imgFwOps = NULL;
@@ -70,48 +70,58 @@ ImageAccess::~ImageAccess()
 
 bool ImageAccess::hasMFAs(string directory)
 {
-    DIR *d;
-    struct dirent *dir;
+    DIR* d;
+    struct dirent* dir;
     int rc;
     d = opendir(directory.c_str());
-    if (d == NULL) {
+    if (d == NULL)
+    {
         return false;
     }
-    while ((dir = readdir(d)) != NULL) {
+    while ((dir = readdir(d)) != NULL)
+    {
         string fl = dir->d_name;
-        if (fl == "." || fl == "..") {
+        if (fl == "." || fl == "..")
+        {
             continue;
         }
         string fpath = directory;
         fpath += "/";
         fpath += fl;
         rc = getFileSignature(fpath);
-        if (rc == IMG_SIG_TYPE_BIN || rc == IMG_SIG_TYPE_MFA) {
+        if (rc == IMG_SIG_TYPE_BIN || rc == IMG_SIG_TYPE_MFA)
+        {
             closedir(d);
             return true;
         }
     }
     closedir(d);
     return false;
-
 }
-int ImageAccess::queryDirPsid(string &path, string &psid, string &selector_tag, int image_type, vector<PsidQueryItem> &riv)
+int ImageAccess::queryDirPsid(string& path,
+                              string& psid,
+                              string& selector_tag,
+                              int image_type,
+                              vector<PsidQueryItem>& riv)
 {
     int res = 0;
-    DIR *d;
-    struct dirent *dir;
+    DIR* d;
+    struct dirent* dir;
     int found = 0;
     int rc;
 
     d = opendir(path.c_str());
-    if (d == NULL) {
+    if (d == NULL)
+    {
         return -1;
     }
 
-    while ((dir = readdir(d)) != NULL) {
+    while ((dir = readdir(d)) != NULL)
+    {
         PsidQueryItem ro;
         string fl = dir->d_name;
-        if (fl == "." || fl == "..") {
+        if (fl == "." || fl == "..")
+        {
             continue;
         }
         string fpath = path;
@@ -119,11 +129,13 @@ int ImageAccess::queryDirPsid(string &path, string &psid, string &selector_tag,
         fpath += fl;
 
         rc = this->queryPsid(fpath.c_str(), psid, selector_tag, image_type, ro);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             res = -1;
             goto clean_up;
         }
-        if (rc == 1) {
+        if (rc == 1)
+        {
             riv.push_back(ro);
             found++;
             riv[0].found = found;
@@ -131,7 +143,8 @@ int ImageAccess::queryDirPsid(string &path, string &psid, string &selector_tag,
         }
     }
 
-    if (found > 1) {
+    if (found > 1)
+    {
         res = -2;
     }
 
@@ -140,43 +153,48 @@ int ImageAccess::queryDirPsid(string &path, string &psid, string &selector_tag,
     return res;
 }
 
-bool ImageAccess::openImg(fw_hndl_type_t hndlType, char *psid, char *fileHndl)
+bool ImageAccess::openImg(fw_hndl_type_t hndlType, char* psid, char* fileHndl)
 {
-
     memset(_errBuff, 0, sizeof(_errBuff));
-    _imgFwParams.errBuff      = _errBuff;
-    _imgFwParams.errBuffSize  = MLNX_ERR_BUFF_SIZE;
-    _imgFwParams.hndlType     = hndlType;
-    _imgFwParams.psid         = psid;
-    _imgFwParams.fileHndl     = fileHndl;
-    _imgFwParams.shortErrors  = true;
+    _imgFwParams.errBuff = _errBuff;
+    _imgFwParams.errBuffSize = MLNX_ERR_BUFF_SIZE;
+    _imgFwParams.hndlType = hndlType;
+    _imgFwParams.psid = psid;
+    _imgFwParams.fileHndl = fileHndl;
+    _imgFwParams.shortErrors = true;
     _imgFwOps = FwOperations::FwOperationsCreate(_imgFwParams);
-    if (_imgFwOps == NULL) {
-        _errMsg  = "-E- " + (string)_errBuff + "\n";
-        if (_errMsg.find("upgrade tool") != std::string::npos) {
+    if (_imgFwOps == NULL)
+    {
+        _errMsg = "-E- " + (string)_errBuff + "\n";
+        if (_errMsg.find("upgrade tool") != std::string::npos)
+        {
             _warning = _errMsg;
-        } else if (_errMsg.find("with higher Version") != std::string::npos) {
+        }
+        else if (_errMsg.find("with higher Version") != std::string::npos)
+        {
             _warning = _errMsg;
         }
-        _log    += _errMsg;
+        _log += _errMsg;
         return false;
     }
     return true;
-
 }
 
-int ImageAccess::queryPsid(const string &fname, const string &psid,
-                           string &selector_tag, int image_type,
-                           PsidQueryItem &ri)
+int ImageAccess::queryPsid(const string& fname,
+                           const string& psid,
+                           string& selector_tag,
+                           int image_type,
+                           PsidQueryItem& ri)
 {
     int res = 0;
-    mfa_desc *mfa_d = NULL;
+    mfa_desc* mfa_d = NULL;
     fw_info_t img_query;
     string iniName = "";
     vector<u_int8_t> sect; // to get fw configuration.
     vector<u_int8_t> dest;
 
-    if (!openImg(FHT_FW_FILE, (char*)psid.c_str(), (char*)fname.c_str())) {
+    if (!openImg(FHT_FW_FILE, (char*)psid.c_str(), (char*)fname.c_str()))
+    {
         return 0;
     }
 
@@ -184,14 +202,16 @@ int ImageAccess::queryPsid(const string &fname, const string &psid,
     ri.found = 0;
 
     memset(&img_query, 0, sizeof(img_query));
-    if (!_imgFwOps->FwQuery(&img_query, true)) {
-        _errMsg  = "Failed to query " +  (string)_imgFwOps->err();
+    if (!_imgFwOps->FwQuery(&img_query, true))
+    {
+        _errMsg = "Failed to query " + (string)_imgFwOps->err();
         _log += _errMsg;
         goto clean_up;
     }
 
-    if (!psid.compare(img_query.fw_info.psid)) {
-        u_int32_t *supporteHwId;
+    if (!psid.compare(img_query.fw_info.psid))
+    {
+        u_int32_t* supporteHwId;
         u_int32_t supporteHwIdNum;
         _imgFwOps->getSupporteHwId(&supporteHwId, supporteHwIdNum);
         ri.found = 1;
@@ -201,12 +221,16 @@ int ImageAccess::queryPsid(const string &fname, const string &psid,
         ri.revId = (ri.devId >> 16) & 0xffff;
         ri.devId = ri.devId & 0xffff;
         ri.isFailSafe = img_query.fw_info.is_failsafe;
-        if (_imgFwOps->FwGetSection(H_FW_CONF, sect)) {
-            if (unzipDataFile(sect, dest, "Fw Configuration")) {
-                char *ptr = strstr((char*)&dest[0], "Name =");
+        if (_imgFwOps->FwGetSection(H_FW_CONF, sect))
+        {
+            if (unzipDataFile(sect, dest, "Fw Configuration"))
+            {
+                char* ptr = strstr((char*)&dest[0], "Name =");
                 int counter = 7;
-                while (ptr && * ptr != '\n' && * ptr != '\r') {
-                    if (counter-- > 0) {
+                while (ptr && *ptr != '\n' && *ptr != '\r')
+                {
+                    if (counter-- > 0)
+                    {
                         ptr++;
                         continue;
                     }
@@ -216,25 +240,31 @@ int ImageAccess::queryPsid(const string &fname, const string &psid,
             }
         }
         ri.iniName = iniName;
-        if (!mfa_open_file(&mfa_d, (char*)fname.c_str())) {
-            char *pn =  mfa_get_board_metadata(mfa_d, (char*)psid.c_str(), (char*)"PN");
-            if (pn != NULL) {
+        if (!mfa_open_file(&mfa_d, (char*)fname.c_str()))
+        {
+            char* pn = mfa_get_board_metadata(mfa_d, (char*)psid.c_str(), (char*)"PN");
+            if (pn != NULL)
+            {
                 ri.pns = pn;
                 free(pn);
             }
-            char *desc =  mfa_get_board_metadata(mfa_d, (char*)psid.c_str(), (char*)"DESCRIPTION");//TODO: Make more efficient
-            if (desc != NULL) {
+            char* desc =
+              mfa_get_board_metadata(mfa_d, (char*)psid.c_str(), (char*)"DESCRIPTION"); // TODO: Make more efficient
+            if (desc != NULL)
+            {
                 ri.description = desc;
                 free(desc);
             }
             mfa_close(mfa_d);
         }
-        if (!_compareFFV) {
+        if (!_compareFFV)
+        {
             ImgVersion imgv;
-            imgv.setVersion("FW", 3, img_query.fw_info.fw_ver,
-                    img_query.fw_info.branch_ver);
+            imgv.setVersion("FW", 3, img_query.fw_info.fw_ver, img_query.fw_info.branch_ver);
             ri.imgVers.push_back(imgv);
-        } else {
+        }
+        else
+        {
             u_int16_t fwVer[4];
             fwVer[0] = img_query.fw_info.fw_ver[0];
             fwVer[1] = img_query.fw_info.fw_ver[1];
@@ -244,11 +274,13 @@ int ImageAccess::queryPsid(const string &fname, const string &psid,
             imgv.setVersion("FW", 4, fwVer);
             ri.imgVers.push_back(imgv);
         }
-        for (int i = 0; i < img_query.fw_info.roms_info.num_of_exp_rom; i++) {
+        for (int i = 0; i < img_query.fw_info.roms_info.num_of_exp_rom; i++)
+        {
             ImgVersion imgVer;
-            const char *tpc = _imgFwOps->expRomType2Str(img_query.fw_info.roms_info.rom_info[i].exp_rom_product_id);
-            if (tpc == NULL) {
-                //imgVer.setExpansionRomtoUnknown();
+            const char* tpc = _imgFwOps->expRomType2Str(img_query.fw_info.roms_info.rom_info[i].exp_rom_product_id);
+            if (tpc == NULL)
+            {
+                // imgVer.setExpansionRomtoUnknown();
                 tpc = "UNKNOWN_ROM";
             }
             int sz = img_query.fw_info.roms_info.rom_info[i].exp_rom_num_ver_fields;
@@ -259,8 +291,8 @@ int ImageAccess::queryPsid(const string &fname, const string &psid,
     }
 
 clean_up:
-    (void) selector_tag;
-    (void) image_type;
+    (void)selector_tag;
+    (void)image_type;
     _imgFwOps->FwCleanUp();
     delete _imgFwOps;
     _imgFwOps = NULL;
@@ -268,71 +300,84 @@ int ImageAccess::queryPsid(const string &fname, const string &psid,
     return res;
 }
 
-
-int ImageAccess::getImage(const string &fname, const string &psid, string &selector_tag, int image_type, u_int8_t **filebuf)
+int ImageAccess::getImage(const string& fname,
+                          const string& psid,
+                          string& selector_tag,
+                          int image_type,
+                          u_int8_t** filebuf)
 {
     int res = -1;
     int type = getFileSignature(fname);
 
-    if (type == IMG_SIG_TYPE_MFA) {
-        mfa_desc *mfa_d;
+    if (type == IMG_SIG_TYPE_MFA)
+    {
+        mfa_desc* mfa_d;
         int rc = mfa_open_file(&mfa_d, (char*)fname.c_str());
-        if (!rc) {
+        if (!rc)
+        {
             res = mfa_get_image(mfa_d, (char*)psid.c_str(), image_type, (char*)selector_tag.c_str(), filebuf);
             mfa_close(mfa_d);
-        } else {
+        }
+        else
+        {
             res = -1;
         }
-    } else if (type == IMG_SIG_TYPE_BIN) {
+    }
+    else if (type == IMG_SIG_TYPE_BIN)
+    {
         res = getImage(fname, filebuf);
     }
-    //else type is unknown and res = -1
+    // else type is unknown and res = -1
 
     return res;
 }
 
-
-int ImageAccess::getImage(const string &fname, u_int8_t **filebuf)
+int ImageAccess::getImage(const string& fname, u_int8_t** filebuf)
 {
     int res = -1;
-    FILE *fp;
-    u_int8_t *buf = NULL;
+    FILE* fp;
+    u_int8_t* buf = NULL;
     long int fsize;
     long int sz;
 
-    if ((fp = fopen(fname.c_str(), "rb")) == NULL) {
+    if ((fp = fopen(fname.c_str(), "rb")) == NULL)
+    {
         _errMsg = "Failed to open file : " + (string)fname.c_str();
-        _log    += _errMsg;
+        _log += _errMsg;
         return -1;
     }
 
-    if (fseek(fp, 0L, SEEK_END) < 0) {
+    if (fseek(fp, 0L, SEEK_END) < 0)
+    {
         _errMsg = "Fseek failed on file : " + (string)fname.c_str();
-        _log    += _errMsg;
+        _log += _errMsg;
         goto clean_up;
     }
 
     fsize = ftell(fp);
-    if (fsize <= 0) {
+    if (fsize <= 0)
+    {
         _errMsg = "Ftell failed on file : " + (string)fname.c_str();
-        _log    += _errMsg;
+        _log += _errMsg;
         goto clean_up;
     }
     rewind(fp);
 
     buf = (u_int8_t*)malloc(fsize * sizeof(u_int8_t));
-    if (buf == NULL) {
+    if (buf == NULL)
+    {
         _errMsg = "Memory allocation failure for file : " + (string)fname.c_str();
-        _log    += _errMsg;
+        _log += _errMsg;
         goto clean_up;
     }
 
     memset(buf, 0, fsize);
-    *filebuf  = buf;
+    *filebuf = buf;
     sz = fread(buf, 1, fsize, fp);
-    if (sz != fsize || sz <= 0 || buf == NULL) {
-        _errMsg = "ftell size is not equivalent to fread total size" + (string) fname.c_str();
-        _log    += _errMsg;
+    if (sz != fsize || sz <= 0 || buf == NULL)
+    {
+        _errMsg = "ftell size is not equivalent to fread total size" + (string)fname.c_str();
+        _log += _errMsg;
         goto clean_up;
     }
 
@@ -340,57 +385,64 @@ int ImageAccess::getImage(const string &fname, u_int8_t **filebuf)
 
 clean_up:
     fclose(fp);
-    if (res == -1) {
-        if (buf != NULL) {
+    if (res == -1)
+    {
+        if (buf != NULL)
+        {
             free(buf);
         }
     }
     return res;
 }
 
-
-int ImageAccess::getFileSignature(const string & fname)
+int ImageAccess::getFileSignature(const string& fname)
 {
     static const int header_size = 16;
-    FILE *fin;
+    FILE* fin;
     char tmpb[header_size];
     int res = -2;
-    do {
-        if (!(fin = fopen(fname.c_str(), "r"))) {
+    do
+    {
+        if (!(fin = fopen(fname.c_str(), "r")))
+        {
             break;
         }
 
-        if (1 > fread(tmpb, header_size, 1, fin)) {
+        if (1 > fread(tmpb, header_size, 1, fin))
+        {
             break;
         }
         res = getBufferSignature((u_int8_t*)tmpb, 4);
-    }while(0);
+    } while (0);
 
-    if(fin) {
+    if (fin)
+    {
         fclose(fin);
     }
     return res;
 }
 
-
-int ImageAccess::getBufferSignature(u_int8_t *buf, u_int32_t size)
+int ImageAccess::getBufferSignature(u_int8_t* buf, u_int32_t size)
 {
     int res = IMG_SIG_TYPE_UNKNOWN;
 
-    if (0 == memcmp(buf, "MTFW", 4)) {
+    if (0 == memcmp(buf, "MTFW", 4))
+    {
         res = IMG_SIG_TYPE_BIN;
     }
-    else if (0 == memcmp(buf, "MFAR", 4)) {
+    else if (0 == memcmp(buf, "MFAR", 4))
+    {
         res = IMG_SIG_TYPE_MFA;
     }
-    else if(0 == memcmp(buf, PldmPkg::UUID, size)) {
+    else if (0 == memcmp(buf, PldmPkg::UUID, size))
+    {
         res = IMG_SIG_TYPE_PLDM;
     }
 
     return res;
 }
 
-int ImageAccess::get_bin_content(const string & fname, vector<PsidQueryItem> &riv)
+int ImageAccess::get_bin_content(const string& fname, vector<PsidQueryItem>& riv)
 {
     fw_info_t img_query;
     int res = 0;
@@ -398,18 +450,21 @@ int ImageAccess::get_bin_content(const string & fname, vector<PsidQueryItem> &ri
     PsidQueryItem item;
     ImgVersion imgv;
 
-    if (_imgFwOps != NULL) {
-        _errMsg  = "_imgFwOPs should be null";
+    if (_imgFwOps != NULL)
+    {
+        _errMsg = "_imgFwOPs should be null";
         _log += _errMsg;
         return -1;
     }
-    if (!openImg(FHT_FW_FILE, NULL, (char*)fname.c_str())) {
+    if (!openImg(FHT_FW_FILE, NULL, (char*)fname.c_str()))
+    {
         return -1;
     }
 
     memset(&img_query, 0, sizeof(img_query));
-    if (!_imgFwOps->FwQuery(&img_query, true)) {
-        _errMsg  = "Failed to query " +  (string)_imgFwOps->err();
+    if (!_imgFwOps->FwQuery(&img_query, true))
+    {
+        _errMsg = "Failed to query " + (string)_imgFwOps->err();
         _log += _errMsg;
         res = -1;
         goto clean_up;
@@ -421,18 +476,20 @@ int ImageAccess::get_bin_content(const string & fname, vector<PsidQueryItem> &ri
     item.pns = "";
     item.board_rev = "";
 
-    imgv.setVersion("FW", 3, img_query.fw_info.fw_ver,
-            img_query.fw_info.branch_ver);
+    imgv.setVersion("FW", 3, img_query.fw_info.fw_ver, img_query.fw_info.branch_ver);
     item.imgVers.push_back(imgv);
-    for (int i = 0; i < img_query.fw_info.roms_info.num_of_exp_rom; i++) {
+    for (int i = 0; i < img_query.fw_info.roms_info.num_of_exp_rom; i++)
+    {
         ImgVersion imgVer;
-        const char *tpc = _imgFwOps->expRomType2Str(img_query.fw_info.roms_info.rom_info[i].exp_rom_product_id);
-        if (tpc == NULL) {
-            //imgVer.setExpansionRomtoUnknown();
+        const char* tpc = _imgFwOps->expRomType2Str(img_query.fw_info.roms_info.rom_info[i].exp_rom_product_id);
+        if (tpc == NULL)
+        {
+            // imgVer.setExpansionRomtoUnknown();
             tpc = "UNKNOWN_ROM";
         }
         int sz = img_query.fw_info.roms_info.rom_info[i].exp_rom_num_ver_fields;
-        if (img_query.fw_info.roms_info.rom_info[i].exp_rom_product_id == 0xf) {
+        if (img_query.fw_info.roms_info.rom_info[i].exp_rom_product_id == 0xf)
+        {
             sz = 1;
         }
         imgVer.setVersion(tpc, sz, img_query.fw_info.roms_info.rom_info[i].exp_rom_ver);
@@ -448,73 +505,91 @@ int ImageAccess::get_bin_content(const string & fname, vector<PsidQueryItem> &ri
     return res;
 }
 
-
-int ImageAccess::get_mfa_content(const string & fname, vector<PsidQueryItem> &riv)
+int ImageAccess::get_mfa_content(const string& fname, vector<PsidQueryItem>& riv)
 {
-    mfa_desc *mfa_d;
-    map_entry_hdr *me = NULL;
+    mfa_desc* mfa_d;
+    map_entry_hdr* me = NULL;
     char psid[33];
 
-    if (mfa_open_file(&mfa_d, (char*)fname.c_str())) {
+    if (mfa_open_file(&mfa_d, (char*)fname.c_str()))
+    {
         return -1;
     }
     me = NULL;
-    while ((me = mfa_get_next_mentry(mfa_d, me))) {
+    while ((me = mfa_get_next_mentry(mfa_d, me)))
+    {
         PsidQueryItem item;
         strncpy(psid, me->board_type_id, 32);
         psid[32] = 0;
         item.psid = psid;
-        char *val = mfa_get_map_entry_metadata(me, (char*)"PN");
-        if (val == NULL) {
+        char* val = mfa_get_map_entry_metadata(me, (char*)"PN");
+        if (val == NULL)
+        {
             item.pns = "";
-        } else {
+        }
+        else
+        {
             item.pns = val;
             free(val);
         }
         val = mfa_get_map_entry_metadata(me, (char*)"BOARD_REV");
-        if (val == NULL) {
+        if (val == NULL)
+        {
             item.board_rev = "";
-        } else {
+        }
+        else
+        {
             item.board_rev = val;
             free(val);
         }
         val = mfa_get_map_entry_metadata(me, (char*)"DESCRIPTION");
-        if (val == NULL) {
+        if (val == NULL)
+        {
             item.description = "";
-        } else {
+        }
+        else
+        {
             item.description = val;
             free(val);
         }
-        val = mfa_get_map_entry_metadata(me, (char*) "BRANCH");
-        if (val == NULL) {
+        val = mfa_get_map_entry_metadata(me, (char*)"BRANCH");
+        if (val == NULL)
+        {
             item.branch = "";
-        } else {
+        }
+        else
+        {
             item.branch = val;
             free(val);
         }
 
-        map_image_entry *imge;
-        for (int i = 0; i < me->nimages; i++) {
+        map_image_entry* imge;
+        for (int i = 0; i < me->nimages; i++)
+        {
             imge = mfa_get_map_image(me, i);
-            if (imge == NULL) {
+            if (imge == NULL)
+            {
                 continue;
             }
-            toc_entry *toc = mfa_get_image_toc(mfa_d, imge);
-            if (toc == NULL) {
+            toc_entry* toc = mfa_get_image_toc(mfa_d, imge);
+            if (toc == NULL)
+            {
                 continue;
             }
-            if (toc->num_ver_fields != 0) {
+            if (toc->num_ver_fields != 0)
+            {
                 item.type = imge->image_type;
                 char select_tag[33];
                 strncpy(select_tag, imge->select_tag, 32);
                 select_tag[32] = 0;
                 item.selector_tag = select_tag;
-                char *subImgType;
-                if ((subImgType = mfasec_get_sub_image_type_str(toc->subimage_type)) != NULL) {
+                char* subImgType;
+                if ((subImgType = mfasec_get_sub_image_type_str(toc->subimage_type)) != NULL)
+                {
                     ImgVersion imgv;
-                    if (subImgType[0] != '\0') { //Not a padding section
-                        imgv.setVersion(subImgType, toc->num_ver_fields,
-                                toc->version, item.branch);
+                    if (subImgType[0] != '\0')
+                    { // Not a padding section
+                        imgv.setVersion(subImgType, toc->num_ver_fields, toc->version, item.branch);
                         item.imgVers.push_back(imgv);
                     }
                 }
@@ -527,12 +602,14 @@ int ImageAccess::get_mfa_content(const string & fname, vector<PsidQueryItem> &ri
 }
 #define ITOC_ASCII 0x49544f43
 #define TOC_HEADER_SIZE 0x20
-#define TOC_ENTRY_SIZE  0x20
+#define TOC_ENTRY_SIZE 0x20
 #define FS3_DEFAULT_SECTOR_SIZE 0x1000
 
-bool ImageAccess::extract_pldm_image_info(const u_int8_t * buff, u_int32_t size, PsidQueryItem &query_item) {
+bool ImageAccess::extract_pldm_image_info(const u_int8_t* buff, u_int32_t size, PsidQueryItem& query_item)
+{
     FImage fimage;
-    if (!fimage.open((u_int32_t*)buff, size)) {
+    if (!fimage.open((u_int32_t*)buff, size))
+    {
         return false;
     }
     static const u_int32_t sector_size = FS3_DEFAULT_SECTOR_SIZE;
@@ -540,28 +617,32 @@ bool ImageAccess::extract_pldm_image_info(const u_int8_t * buff, u_int32_t size,
     offset = (offset % sector_size == 0) ? offset : (offset + sector_size - offset % 0x1000);
     u_int8_t buffer[TOC_HEADER_SIZE], entry_buffer[TOC_ENTRY_SIZE];
     struct connectx4_itoc_header itoc_header;
-    while (offset < fimage.get_size()) {
-        //read ITOC header
+    while (offset < fimage.get_size())
+    {
+        // read ITOC header
         fimage.read(offset, buffer, TOC_HEADER_SIZE);
         connectx4_itoc_header_unpack(&itoc_header, buffer);
-        if (itoc_header.signature0 != ITOC_ASCII) {
+        if (itoc_header.signature0 != ITOC_ASCII)
+        {
             offset += sector_size;
             continue;
         }
         int section_index = 0;
         struct connectx4_itoc_entry toc_entry;
-        do {
-            //read ITOC entry
-            u_int32_t entry_addr = offset + TOC_HEADER_SIZE + section_index *  TOC_ENTRY_SIZE;
+        do
+        {
+            // read ITOC entry
+            u_int32_t entry_addr = offset + TOC_HEADER_SIZE + section_index * TOC_ENTRY_SIZE;
             fimage.read(entry_addr, entry_buffer, TOC_ENTRY_SIZE);
 
             connectx4_itoc_entry_unpack(&toc_entry, entry_buffer);
-            if (toc_entry.type == FS3_IMAGE_INFO) {
+            if (toc_entry.type == FS3_IMAGE_INFO)
+            {
                 u_int32_t flash_addr = toc_entry.flash_addr << 2;
                 u_int32_t entry_size_in_bytes = toc_entry.size * 4;
-                u_int8_t *buff = new u_int8_t[entry_size_in_bytes];
+                u_int8_t* buff = new u_int8_t[entry_size_in_bytes];
                 fimage.read(flash_addr, buff, entry_size_in_bytes);
-                //read image info
+                // read image info
                 struct connectx4_image_info image_info;
                 connectx4_image_info_unpack(&image_info, buff);
                 query_item.name = image_info.name;
@@ -569,17 +650,17 @@ bool ImageAccess::extract_pldm_image_info(const u_int8_t * buff, u_int32_t size,
                 query_item.description = image_info.description;
                 static const int FW_VER_SIZE = 3;
                 u_int16_t fw_ver[FW_VER_SIZE];
-                char fw_branch[BRANCH_LEN + 1] = { 0 };
+                char fw_branch[BRANCH_LEN + 1] = {0};
                 fw_ver[0] = image_info.FW_VERSION.MAJOR;
                 fw_ver[1] = image_info.FW_VERSION.MINOR;
                 fw_ver[2] = image_info.FW_VERSION.SUBMINOR;
                 (strncpy(fw_branch, image_info.vsd, BRANCH_LEN));
-                fw_branch[BRANCH_LEN] = (char) 0;
+                fw_branch[BRANCH_LEN] = (char)0;
                 ImgVersion imgv;
                 imgv.setVersion("FW", FW_VER_SIZE, fw_ver, fw_branch);
                 query_item.imgVers.push_back(imgv);
 
-                delete [] buff;
+                delete[] buff;
                 break;
             }
 
@@ -591,44 +672,44 @@ bool ImageAccess::extract_pldm_image_info(const u_int8_t * buff, u_int32_t size,
     return 0;
 }
 
-int ImageAccess::get_pldm_content(const string & fname,
-        vector<PsidQueryItem> &riv) {
+int ImageAccess::get_pldm_content(const string& fname, vector<PsidQueryItem>& riv)
+{
     PldmBuffer pldm_buff;
     pldm_buff.loadFile(fname);
     PldmPkg pldm;
     pldm.unpack(pldm_buff);
 
     u_int8_t dev_count = pldm.getDeviceIDRecordCount();
-    for(u_int8_t i=0; i<dev_count; i++) {
-        PldmDevIdRecord * rec = pldm.getDeviceIDRecord(i);
+    for (u_int8_t i = 0; i < dev_count; i++)
+    {
+        PldmDevIdRecord* rec = pldm.getDeviceIDRecord(i);
         PsidQueryItem item;
         item.psid = rec->getDevicePsid();
         item.description = rec->getDescription();
         int image_index = rec->getComponentImageIndex();
-        PldmComponenetImage * image_obj = pldm.getComponentImage(image_index);
-        extract_pldm_image_info(image_obj->getComponentData(),
-                image_obj->getComponentSize(), item);
+        PldmComponenetImage* image_obj = pldm.getComponentImage(image_index);
+        extract_pldm_image_info(image_obj->getComponentData(), image_obj->getComponentSize(), item);
         riv.push_back(item);
     }
 
     return 0;
 }
 
-
-int ImageAccess::get_file_content(const string & fname, vector<PsidQueryItem> &riv)
+int ImageAccess::get_file_content(const string& fname, vector<PsidQueryItem>& riv)
 {
     int type = getFileSignature(fname);
     int res = -1;
-    switch(type) {
-    case IMG_SIG_TYPE_BIN:
-        res = get_bin_content(fname, riv);
-        break;
-    case IMG_SIG_TYPE_MFA:
-        res = get_mfa_content(fname, riv);
-        break;
-    case IMG_SIG_TYPE_PLDM:
-        res = get_pldm_content(fname, riv);
-        break;
+    switch (type)
+    {
+        case IMG_SIG_TYPE_BIN:
+            res = get_bin_content(fname, riv);
+            break;
+        case IMG_SIG_TYPE_MFA:
+            res = get_mfa_content(fname, riv);
+            break;
+        case IMG_SIG_TYPE_PLDM:
+            res = get_pldm_content(fname, riv);
+            break;
     }
     return res;
 }
@@ -647,4 +728,3 @@ string ImageAccess::getLog()
 {
     return _log;
 }
-
diff --git a/mlxfwupdate/image_access.h b/mlxfwupdate/image_access.h
index caf92c30..529d7ea9 100644
--- a/mlxfwupdate/image_access.h
+++ b/mlxfwupdate/image_access.h
@@ -36,7 +36,6 @@
 #ifndef __IMAGE_ACCESS_H__
 #define __IMAGE_ACCESS_H__
 
-
 #include <mlxfwops_com.h>
 #include <fw_ops.h>
 #include <compatibility.h>
@@ -46,48 +45,50 @@
 
 using namespace std;
 #define MLNX_ERR_BUFF_SIZE 1024
-enum {
+enum
+{
     IMG_SIG_TYPE_UNKNOWN = 0,
     IMG_SIG_TYPE_BIN = 1,
     IMG_SIG_TYPE_MFA = 2,
     IMG_SIG_TYPE_PLDM = 3
 };
 
-class ImageAccess {
+class ImageAccess
+{
 public:
     ImageAccess(int compareFFV);
     ~ImageAccess();
-    int queryDirPsid(string &path, string &psid, string &selector_tag, int image_type, vector<PsidQueryItem> &riv);
-    int queryPsid(const string &fname, const string &psid, string &selector_tag, int image_type, PsidQueryItem &ri);
-    int getImage(const string &fname, u_int8_t **filebuf);
-    int getImage(const string &fname, const string &psid, string &selector_tag, int image_type, u_int8_t **filebuf);
-    int get_file_content(const string & fname, vector<PsidQueryItem> &riv);
-    static int getFileSignature(const string & fname);
+    int queryDirPsid(string& path, string& psid, string& selector_tag, int image_type, vector<PsidQueryItem>& riv);
+    int queryPsid(const string& fname, const string& psid, string& selector_tag, int image_type, PsidQueryItem& ri);
+    int getImage(const string& fname, u_int8_t** filebuf);
+    int getImage(const string& fname, const string& psid, string& selector_tag, int image_type, u_int8_t** filebuf);
+    int get_file_content(const string& fname, vector<PsidQueryItem>& riv);
+    static int getFileSignature(const string& fname);
     static bool hasMFAs(string dir);
     string getLastErrMsg();
     string getlastWarning();
     string getLog();
 
 private:
-    int queryPsidMfa(const string &fname, const string &psid, string &selector_tag, int image_type, PsidQueryItem &ri);
-    int queryPsidBin(const string &fname, const string &psid, PsidQueryItem &ri);
-    int getImageBin(const string &fname, u_int8_t **filebuf);
-    int getImageMfa(const string &fname, const string &psid, string &selector_tag, int image_type, u_int8_t **filebuf);
-    int checkImgSignature(const char *fname);
+    int queryPsidMfa(const string& fname, const string& psid, string& selector_tag, int image_type, PsidQueryItem& ri);
+    int queryPsidBin(const string& fname, const string& psid, PsidQueryItem& ri);
+    int getImageBin(const string& fname, u_int8_t** filebuf);
+    int getImageMfa(const string& fname, const string& psid, string& selector_tag, int image_type, u_int8_t** filebuf);
+    int checkImgSignature(const char* fname);
 
-    int get_mfa_content(const string & fname, vector<PsidQueryItem> &riv);
-    int get_pldm_content(const string & fname, vector<PsidQueryItem> &riv);
-    int get_bin_content(const string & fname, vector<PsidQueryItem> &riv);
-    bool extract_pldm_image_info(const u_int8_t * buff, u_int32_t size, PsidQueryItem &ri);
-    static int getBufferSignature(u_int8_t *buf, u_int32_t size);
-    bool openImg(fw_hndl_type_t hndlType, char *psid, char *fileHndl);
+    int get_mfa_content(const string& fname, vector<PsidQueryItem>& riv);
+    int get_pldm_content(const string& fname, vector<PsidQueryItem>& riv);
+    int get_bin_content(const string& fname, vector<PsidQueryItem>& riv);
+    bool extract_pldm_image_info(const u_int8_t* buff, u_int32_t size, PsidQueryItem& ri);
+    static int getBufferSignature(u_int8_t* buf, u_int32_t size);
+    bool openImg(fw_hndl_type_t hndlType, char* psid, char* fileHndl);
     char _errBuff[MLNX_ERR_BUFF_SIZE];
     int _compareFFV;
     string _log;
     string _errMsg;
     string _warning;
     FwOperations::fw_ops_params_t _imgFwParams;
-    FwOperations *_imgFwOps;
+    FwOperations* _imgFwOps;
 };
 
 #endif
diff --git a/mlxfwupdate/img_version.cpp b/mlxfwupdate/img_version.cpp
index 5124f77b..e36f74cf 100644
--- a/mlxfwupdate/img_version.cpp
+++ b/mlxfwupdate/img_version.cpp
@@ -46,32 +46,40 @@ const string NOT_SET = "FW version isn't set";
 const string ALREADY_SET = "Trying to set an already set FW version";
 const int UPDATE_ON_DIFFERENT_BRANCHES = -1;
 
-ImgVersion::ImgVersion() :
-        _type(), _fwVer(NULL), _isExpansionRomUnknown(false), _isOldMinor(
-                false), _isSubBuild(false) {
+ImgVersion::ImgVersion() : _type(), _fwVer(NULL), _isExpansionRomUnknown(false), _isOldMinor(false), _isSubBuild(false)
+{
 }
 
 ImgVersion::ImgVersion(const ImgVersion& rhs) :
-        _type(rhs._type), _isExpansionRomUnknown(rhs._isExpansionRomUnknown), _isOldMinor(
-                rhs._isOldMinor), _isSubBuild(rhs._isSubBuild) {
+    _type(rhs._type),
+    _isExpansionRomUnknown(rhs._isExpansionRomUnknown),
+    _isOldMinor(rhs._isOldMinor),
+    _isSubBuild(rhs._isSubBuild)
+{
     _fwVer = rhs._fwVer->clone();
 }
 
-ImgVersion::~ImgVersion() {
-    if (_fwVer != NULL) {
+ImgVersion::~ImgVersion()
+{
+    if (_fwVer != NULL)
+    {
         delete _fwVer;
         _fwVer = NULL;
     }
 }
 
-string ImgVersion::getTypeStr() {
+string ImgVersion::getTypeStr()
+{
     return _type;
 }
 
-ImgVersion& ImgVersion::operator =(const ImgVersion& rhs) {
-    if (this != &rhs) {
+ImgVersion& ImgVersion::operator=(const ImgVersion& rhs)
+{
+    if (this != &rhs)
+    {
         _type = rhs._type;
-        if (_fwVer != NULL) {
+        if (_fwVer != NULL)
+        {
             throw SetVersionException(ALREADY_SET);
         }
         _fwVer = rhs._fwVer->clone();
@@ -82,51 +90,63 @@ ImgVersion& ImgVersion::operator =(const ImgVersion& rhs) {
     return *this;
 }
 
-void ImgVersion::setVersion(const std::string& imgType, u_int8_t verSz,
-        const u_int16_t* ver, const string& verBranch) {
-    if (_fwVer != NULL) {
+void ImgVersion::setVersion(const std::string& imgType, u_int8_t verSz, const u_int16_t* ver, const string& verBranch)
+{
+    if (_fwVer != NULL)
+    {
         throw SetVersionException(ALREADY_SET);
     }
-    switch (verSz) {
-    case 3:
-        _fwVer = new FwVersion(ver[0], ver[1], ver[2], verBranch);
-        _isSubBuild = false;
-        break;
-    case 4:
-        if (ver[2] * 100 + ver[3] > 9999) {
-            throw SetVersionException(SUBMINOR_VALUE);
-        }
-        _fwVer = new FwVersionWithSubBuild(ver[0], ver[1],
-                ver[2] * 100 + ver[3], verBranch);
-        _isSubBuild = true;
-        break;
-    case 1:
-        if (imgType != "CLP") {
+    switch (verSz)
+    {
+        case 3:
+            _fwVer = new FwVersion(ver[0], ver[1], ver[2], verBranch);
+            _isSubBuild = false;
+            break;
+        case 4:
+            if (ver[2] * 100 + ver[3] > 9999)
+            {
+                throw SetVersionException(SUBMINOR_VALUE);
+            }
+            _fwVer = new FwVersionWithSubBuild(ver[0], ver[1], ver[2] * 100 + ver[3], verBranch);
+            _isSubBuild = true;
+            break;
+        case 1:
+            if (imgType != "CLP")
+            {
+                throw SetVersionException(MASTER_ARGUMENTS);
+            }
+            _fwVer = new FwVersionOldClp(0, ver[0], 0, verBranch);
+            _isSubBuild = false;
+            break;
+        default:
             throw SetVersionException(MASTER_ARGUMENTS);
-        }
-        _fwVer = new FwVersionOldClp(0, ver[0], 0, verBranch);
-        _isSubBuild = false;
-        break;
-    default:
-        throw SetVersionException(MASTER_ARGUMENTS);
     }
     _type = imgType;
     _isOldMinor = (ver[1] <= 99);
 }
 
-string ImgVersion::getPrintableVersion(int ffv, bool show_type) {
-    if (_fwVer == NULL) {
+string ImgVersion::getPrintableVersion(int ffv, bool show_type)
+{
+    if (_fwVer == NULL)
+    {
         throw SetVersionException(NOT_SET);
     }
     string prefix = show_type ? (_type + " ") : "", format;
-    if (_type.size()) {
-        if (!_type.compare("FW") || !_type.compare("Running FW")) {
-            if (!ffv) {
+    if (_type.size())
+    {
+        if (!_type.compare("FW") || !_type.compare("Running FW"))
+        {
+            if (!ffv)
+            {
                 format = _isOldMinor ? "%d.%d.%04d" : "%d.%04d.%04d";
-            } else {
+            }
+            else
+            {
                 format = "%02d.%02d.%02d.%02d";
             }
-        } else {
+        }
+        else
+        {
             format = _isSubBuild ? "%d.%d.%d.%04d" : "%d.%d.%04d";
         }
     }
@@ -134,11 +154,14 @@ string ImgVersion::getPrintableVersion(int ffv, bool show_type) {
     return prefix + _fwVer->get_fw_version(format);
 }
 
-int ImgVersion::compareFw(const ImgVersion &imv) const {
-    if (_fwVer == NULL) {
+int ImgVersion::compareFw(const ImgVersion& imv) const
+{
+    if (_fwVer == NULL)
+    {
         throw SetVersionException(NOT_SET);
     }
-    if (!_fwVer->are_same_branch(*imv._fwVer)) {
+    if (!_fwVer->are_same_branch(*imv._fwVer))
+    {
         return UPDATE_ON_DIFFERENT_BRANCHES;
     }
     return _fwVer->compare(*imv._fwVer);
diff --git a/mlxfwupdate/img_version.h b/mlxfwupdate/img_version.h
index 8464e829..015a1edf 100644
--- a/mlxfwupdate/img_version.h
+++ b/mlxfwupdate/img_version.h
@@ -42,23 +42,24 @@
 
 using namespace std;
 
-class ImgVersion {
-    class SetVersionException: public std::runtime_error {
+class ImgVersion
+{
+    class SetVersionException : public std::runtime_error
+    {
     public:
-        SetVersionException(const std::string error) :
-                runtime_error(error) {
-        }
+        SetVersionException(const std::string error) : runtime_error(error) {}
     };
+
 public:
     ImgVersion();
     ImgVersion(const ImgVersion&);
     virtual ~ImgVersion();
     ImgVersion& operator=(const ImgVersion&);
-    void setVersion(const string& imgType, u_int8_t verSz, const u_int16_t* ver,
-            const string& verBranch = "");
+    void setVersion(const string& imgType, u_int8_t verSz, const u_int16_t* ver, const string& verBranch = "");
     string getPrintableVersion(int ffv, bool show_type = true);
     string getTypeStr();
-    int compareFw(const ImgVersion &imv) const;
+    int compareFw(const ImgVersion& imv) const;
+
 private:
     string _type;
     FwVersion* _fwVer;
@@ -68,4 +69,3 @@ class ImgVersion {
 };
 
 #endif
-
diff --git a/mlxfwupdate/menu.cpp b/mlxfwupdate/menu.cpp
index ea20aca2..926eba59 100644
--- a/mlxfwupdate/menu.cpp
+++ b/mlxfwupdate/menu.cpp
@@ -32,91 +32,90 @@
  *
  */
 
-
 #include "menu.h"
 #include <algorithm>
 
 BaseMenu::BaseMenu()
 {
     _isPrev = false;
-    _valid  = false;
-    _all       = 0;
-    _goBack    = 0;
-    _exit      = 0;
+    _valid = false;
+    _all = 0;
+    _goBack = 0;
+    _exit = 0;
     _maxChoice = 0;
 }
 
-BaseMenu::~BaseMenu()
-{
-
-}
-
-FileTypeMenu::FileTypeMenu()  : BaseMenu()
-{
-
-}
+BaseMenu::~BaseMenu() {}
 
-FileTypeMenu::~FileTypeMenu()
-{
+FileTypeMenu::FileTypeMenu() : BaseMenu() {}
 
-}
-BaseMenu* FileTypeMenu::getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+FileTypeMenu::~FileTypeMenu() {}
+BaseMenu* FileTypeMenu::getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    BaseMenu *newMenu = NULL;
+    BaseMenu* newMenu = NULL;
 
-    if (!cmd_params.download_dev.length()) {
+    if (!cmd_params.download_dev.length())
+    {
         newMenu = new DevFamilyMenu;
         return newMenu;
-    } else {
+    }
+    else
+    {
         DevFamilyMenu::setValuesDirectly(cmd_params, filterOPtions);
     }
 
-    if (filterOPtions.file_type != "mfa" && !cmd_params.download_os.length()) {
+    if (filterOPtions.file_type != "mfa" && !cmd_params.download_os.length())
+    {
         newMenu = new OSMenu;
         return newMenu;
-    } else {
+    }
+    else
+    {
         OSMenu::setValuesDirectly(cmd_params, filterOPtions);
     }
 
-    //newMenu = new PickFilesMenu;
+    // newMenu = new PickFilesMenu;
     return newMenu;
-
 }
 
-BaseMenu* FileTypeMenu::getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+BaseMenu* FileTypeMenu::getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) cmd_params;
-    (void) filterOPtions;
-    BaseMenu *newMenu = NULL;
+    (void)cmd_params;
+    (void)filterOPtions;
+    BaseMenu* newMenu = NULL;
     return newMenu;
 }
 
-bool FileTypeMenu::isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+bool FileTypeMenu::isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) cmd_params;
-    (void) filterOPtions;
+    (void)cmd_params;
+    (void)filterOPtions;
     return _isPrev;
 }
 
-bool FileTypeMenu::isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+bool FileTypeMenu::isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) filterOPtions;
+    (void)filterOPtions;
     return !cmd_params.download_type.length();
 }
 
-void FileTypeMenu::setValuesDirectly(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+void FileTypeMenu::setValuesDirectly(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    if (cmd_params.download_type == "") {
+    if (cmd_params.download_type == "")
+    {
         filterOPtions.file_type = "";
-    } else {
+    }
+    else
+    {
         filterOPtions.file_type = cmd_params.download_type;
     }
 }
 
-void FileTypeMenu::generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+void FileTypeMenu::generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
     _menuText = "";
-    if (isValid(cmd_params, filterOPtions)) {
+    if (isValid(cmd_params, filterOPtions))
+    {
         _menuText = "------ Download Type Selection ------\n";
         _menuText += "\t1- MFA            : (Contains FW images)\n";
         _menuText += "\t2- Self_Extractor : (Update Package for Mellanox Firmware)\n";
@@ -125,109 +124,122 @@ void FileTypeMenu::generateMenu(CmdLineParams &cmd_params, filesOPtions &filterO
         _menuText += "\n-?- Select an option: ";
         _maxChoice = 4;
         printText();
-    } else {
+    }
+    else
+    {
         setValuesDirectly(cmd_params, filterOPtions);
     }
 }
 
-bool FileTypeMenu::parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions)
+bool FileTypeMenu::parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions)
 {
     isPrev = false;
     isExit = false;
-    if (choice > _maxChoice || choice <= 0) {
+    if (choice > _maxChoice || choice <= 0)
+    {
         fprintf(stderr, "-E- Invalid choice!\n");
         return false;
     }
 
-    switch (choice) {
-    case 4:
-        isExit = true;
-        break;
+    switch (choice)
+    {
+        case 4:
+            isExit = true;
+            break;
 
-    case 3:
-        filterOPtions.file_type = "all";
-        break;
+        case 3:
+            filterOPtions.file_type = "all";
+            break;
 
-    case 2:
-        filterOPtions.file_type = "self_extractor";
-        break;
+        case 2:
+            filterOPtions.file_type = "self_extractor";
+            break;
 
-    default:
-        filterOPtions.file_type = "mfa";
+        default:
+            filterOPtions.file_type = "mfa";
     }
     return true;
 }
 
-BaseMenu* DevFamilyMenu::getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+BaseMenu* DevFamilyMenu::getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    BaseMenu *newMenu = NULL;
+    BaseMenu* newMenu = NULL;
 
-    if (filterOPtions.file_type != "mfa" && !cmd_params.download_os.length()) {
+    if (filterOPtions.file_type != "mfa" && !cmd_params.download_os.length())
+    {
         newMenu = new OSMenu;
         return newMenu;
-    } else {
+    }
+    else
+    {
         OSMenu::setValuesDirectly(cmd_params, filterOPtions);
     }
 
-    //newMenu = new PickFilesMenu;
+    // newMenu = new PickFilesMenu;
     return newMenu;
-
 }
 
-DevFamilyMenu::DevFamilyMenu()  : BaseMenu()
-{
+DevFamilyMenu::DevFamilyMenu() : BaseMenu() {}
 
-}
+DevFamilyMenu::~DevFamilyMenu() {}
 
-DevFamilyMenu::~DevFamilyMenu()
+BaseMenu* DevFamilyMenu::getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-
-}
-
-BaseMenu* DevFamilyMenu::getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
-{
-    (void) filterOPtions;
-    BaseMenu *newMenu = NULL;
-    if (!cmd_params.download_type.length()) {
+    (void)filterOPtions;
+    BaseMenu* newMenu = NULL;
+    if (!cmd_params.download_type.length())
+    {
         newMenu = new FileTypeMenu;
     }
     return newMenu;
 }
 
-bool DevFamilyMenu::isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+bool DevFamilyMenu::isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) filterOPtions;
+    (void)filterOPtions;
     _isPrev = !cmd_params.download_type.length();
     return _isPrev;
 }
 
-bool DevFamilyMenu::isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+bool DevFamilyMenu::isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
     unsigned int i = 0;
-    vector <string> _availableFamilies;
-    if (!cmd_params.download_dev.length()) {
-        for (i = 0; i < filterOPtions.files.size(); i++) {
-            if (std::find(_availableFamilies.begin(), availableFamilies.end(), filterOPtions.files[i].family) == _availableFamilies.end() &&
-                (filterOPtions.file_type == "all" || filterOPtions.file_type == filterOPtions.files[i].file_type)) {
+    vector<string> _availableFamilies;
+    if (!cmd_params.download_dev.length())
+    {
+        for (i = 0; i < filterOPtions.files.size(); i++)
+        {
+            if (std::find(_availableFamilies.begin(), availableFamilies.end(), filterOPtions.files[i].family) ==
+                  _availableFamilies.end() &&
+                (filterOPtions.file_type == "all" || filterOPtions.file_type == filterOPtions.files[i].file_type))
+            {
                 _availableFamilies.push_back(filterOPtions.files[i].family);
             }
         }
-    } else {
+    }
+    else
+    {
         return false;
     }
-    if (_availableFamilies.size() == 1) {
+    if (_availableFamilies.size() == 1)
+    {
         filterOPtions.family = _availableFamilies[0];
         return false;
-    } else {
+    }
+    else
+    {
         return true;
     }
 }
 
-void DevFamilyMenu::setValuesDirectly(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+void DevFamilyMenu::setValuesDirectly(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    if (cmd_params.download_dev == "") {
+    if (cmd_params.download_dev == "")
+    {
         filterOPtions.family = "all";
-    } else {
+    }
+    else
+    {
         filterOPtions.family = cmd_params.download_dev;
     }
 }
@@ -237,32 +249,38 @@ string DevFamilyMenu::beautify(string family)
     return beautify_device_name(family);
 }
 
-void DevFamilyMenu::generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+void DevFamilyMenu::generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
     _menuText = "";
-    if (isValid(cmd_params, filterOPtions)) {
-
+    if (isValid(cmd_params, filterOPtions))
+    {
         _menuText = "------ Device Family Selection ------\n";
         unsigned int i = 0;
 
-        for (i = 0; i < filterOPtions.files.size(); i++) {
-            if (std::find(availableFamilies.begin(), availableFamilies.end(), filterOPtions.files[i].family) == availableFamilies.end() &&
-                (filterOPtions.file_type == "all" || filterOPtions.file_type == filterOPtions.files[i].file_type)) {
+        for (i = 0; i < filterOPtions.files.size(); i++)
+        {
+            if (std::find(availableFamilies.begin(), availableFamilies.end(), filterOPtions.files[i].family) ==
+                  availableFamilies.end() &&
+                (filterOPtions.file_type == "all" || filterOPtions.file_type == filterOPtions.files[i].file_type))
+            {
                 availableFamilies.push_back(filterOPtions.files[i].family);
             }
         }
 
-        for (i = 0; i < availableFamilies.size(); i++) {
+        for (i = 0; i < availableFamilies.size(); i++)
+        {
             _menuText += "\t" + int_to_string(i + 1) + "- " + beautify(availableFamilies[i]) + "\n";
         }
 
-        if (availableFamilies.size() > 1) {
+        if (availableFamilies.size() > 1)
+        {
             _menuText += "\t" + int_to_string(i + 1) + "- All\n";
             _all = i + 1;
             i++;
             _maxChoice = i;
         }
-        if (isPrevious(cmd_params, filterOPtions)) {
+        if (isPrevious(cmd_params, filterOPtions))
+        {
             _goBack = i + 1;
             _menuText += "\t" + int_to_string(_goBack) + "- Back\n";
             i++;
@@ -275,119 +293,146 @@ void DevFamilyMenu::generateMenu(CmdLineParams &cmd_params, filesOPtions &filter
     }
 }
 
-bool DevFamilyMenu::parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions)
+bool DevFamilyMenu::parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions)
 {
-
     isPrev = false;
     isExit = false;
-    if (choice > _maxChoice || choice <= 0) {
+    if (choice > _maxChoice || choice <= 0)
+    {
         fprintf(stderr, "-E- Invalid choice!\n");
         return false;
     }
 
-    if (choice == _goBack) {
+    if (choice == _goBack)
+    {
         isPrev = true;
         return true;
-    } else if (choice == _exit) {
+    }
+    else if (choice == _exit)
+    {
         isExit = true;
         return true;
-    } else if (choice == _all) {
+    }
+    else if (choice == _all)
+    {
         filterOPtions.family = "all";
         return true;
-    } else {
+    }
+    else
+    {
         filterOPtions.family = availableFamilies[choice - 1];
     }
     return true;
 }
 
-
-BaseMenu* OSMenu::getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+BaseMenu* OSMenu::getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) filterOPtions;
-    (void) cmd_params;
-    //BaseMenu *newMenu =  new PickFilesMenu;
+    (void)filterOPtions;
+    (void)cmd_params;
+    // BaseMenu *newMenu =  new PickFilesMenu;
     return NULL;
-
 }
 
-BaseMenu* OSMenu::getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+BaseMenu* OSMenu::getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) filterOPtions;
-    BaseMenu *newMenu = NULL;
-    if (!cmd_params.download_dev.length()) {
+    (void)filterOPtions;
+    BaseMenu* newMenu = NULL;
+    if (!cmd_params.download_dev.length())
+    {
         newMenu = new DevFamilyMenu;
-    } else if (!cmd_params.download_type.length()) {
+    }
+    else if (!cmd_params.download_type.length())
+    {
         newMenu = new FileTypeMenu;
     }
     return newMenu;
 }
 
-bool OSMenu::isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+bool OSMenu::isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) filterOPtions;
+    (void)filterOPtions;
     _isPrev = (!cmd_params.download_type.length() || !cmd_params.download_dev.length());
     return _isPrev;
 }
 
-bool OSMenu::isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+bool OSMenu::isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    (void) filterOPtions;
+    (void)filterOPtions;
     return !cmd_params.download_os.length();
 }
 
-void OSMenu::setValuesDirectly(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+void OSMenu::setValuesDirectly(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
-    if (cmd_params.download_os == "") {
+    if (cmd_params.download_os == "")
+    {
         filterOPtions.os = "all";
-    } else {
+    }
+    else
+    {
         filterOPtions.os = cmd_params.download_os;
     }
-
 }
 string OSMenu::beautify(string os)
 {
-    if (os == "linux_ppc64") {
+    if (os == "linux_ppc64")
+    {
         os = "Linux_PPC64";
-    } else if (os == "linux_ppc64le") {
+    }
+    else if (os == "linux_ppc64le")
+    {
         os = "Linux_PPC64le";
-    } else if (os == "fbsd10_64") {
+    }
+    else if (os == "fbsd10_64")
+    {
         os = "FBSD10_64";
-    } else if (os == "fbsd10_32") {
+    }
+    else if (os == "fbsd10_32")
+    {
         os = "FBSD10_32";
-    } else if (os == "fbsd10_1_64") {
+    }
+    else if (os == "fbsd10_1_64")
+    {
         os = "FBSD10_1_64";
-    } else if (os == "fbsd11_64") {
+    }
+    else if (os == "fbsd11_64")
+    {
         os = "FBSD11_64";
     }
     os[0] = toupper(os[0]);
     return os;
 }
-void OSMenu::generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions)
+void OSMenu::generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions)
 {
     _menuText = "";
-    if (isValid(cmd_params, filterOPtions)) {
+    if (isValid(cmd_params, filterOPtions))
+    {
         _menuText = "------ Operating System Selection ------\n";
         unsigned int i = 0;
-        for (i = 0; i < filterOPtions.files.size(); i++) {
+        for (i = 0; i < filterOPtions.files.size(); i++)
+        {
             if (filterOPtions.files[i].os != "all" &&
                 std::find(availableOs.begin(), availableOs.end(), filterOPtions.files[i].os) == availableOs.end() &&
                 (filterOPtions.family == "all" || filterOPtions.family == filterOPtions.files[i].family) &&
-                (filterOPtions.file_type == "all" || filterOPtions.file_type == filterOPtions.files[i].file_type)) {
+                (filterOPtions.file_type == "all" || filterOPtions.file_type == filterOPtions.files[i].file_type))
+            {
                 availableOs.push_back(filterOPtions.files[i].os);
             }
         }
 
-        for (i = 0; i < availableOs.size(); i++) {
+        for (i = 0; i < availableOs.size(); i++)
+        {
             _menuText += "\t" + int_to_string(i + 1) + "- " + beautify(availableOs[i]) + "\n";
         }
 
-        if (availableOs.size() > 1) {
+        if (availableOs.size() > 1)
+        {
             _menuText += "\t" + int_to_string(i + 1) + "- All\n";
             _all = i + 1;
             i++;
         }
 
-        if (isPrevious(cmd_params, filterOPtions)) {
+        if (isPrevious(cmd_params, filterOPtions))
+        {
             _goBack = i + 1;
             _menuText += "\t" + int_to_string(_goBack) + "- Back\n";
             _maxChoice = _goBack;
@@ -401,35 +446,45 @@ void OSMenu::generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions
     }
 }
 
-OSMenu::OSMenu()  : BaseMenu()
+OSMenu::OSMenu() : BaseMenu()
 {
-    ;;
+    ;
+    ;
 }
 
 OSMenu::~OSMenu()
 {
-    ;;
+    ;
+    ;
 }
 
-bool OSMenu::parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions)
+bool OSMenu::parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions)
 {
     isPrev = false;
     isExit = false;
-    if (choice > _maxChoice || choice <= 0) {
+    if (choice > _maxChoice || choice <= 0)
+    {
         fprintf(stderr, "-E- Invalid choice!\n");
         return false;
     }
 
-    if (choice == _goBack) {
+    if (choice == _goBack)
+    {
         isPrev = true;
         return true;
-    } else if (choice == _exit) {
+    }
+    else if (choice == _exit)
+    {
         isExit = true;
         return true;
-    } else if (choice == _all) {
+    }
+    else if (choice == _all)
+    {
         filterOPtions.os = "all";
         return true;
-    } else {
+    }
+    else
+    {
         filterOPtions.os = availableOs[choice - 1];
     }
     return true;
diff --git a/mlxfwupdate/menu.h b/mlxfwupdate/menu.h
index ba20558a..c4a6a2fb 100644
--- a/mlxfwupdate/menu.h
+++ b/mlxfwupdate/menu.h
@@ -41,15 +41,16 @@
 #include "mlxfwmanager_common.h"
 #include "cmd_line_params.h"
 
-struct filesOPtions {
+struct filesOPtions
+{
     string file_type;
     string family;
     string os;
-    vector <string> names;
-    vector <string> urls;
-    vector <string> osDirName;
-    vector <DownloadedFileProperties> files;
-    vector <DownloadedFileProperties> filtered;
+    vector<string> names;
+    vector<string> urls;
+    vector<string> osDirName;
+    vector<DownloadedFileProperties> files;
+    vector<DownloadedFileProperties> filtered;
 };
 
 class BaseMenu
@@ -57,16 +58,14 @@ class BaseMenu
 public:
     BaseMenu();
     virtual ~BaseMenu();
-    virtual BaseMenu* getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions) = 0;
-    virtual BaseMenu* getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions) = 0;
-    virtual bool parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions)  = 0;
-    virtual void generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions) = 0;
-    virtual bool isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions)      = 0;
-    virtual bool isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions)    = 0;
-    void printText()
-    {
-        std::cout << _menuText;
-    }
+    virtual BaseMenu* getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions) = 0;
+    virtual BaseMenu* getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions) = 0;
+    virtual bool parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions) = 0;
+    virtual void generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions) = 0;
+    virtual bool isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions) = 0;
+    virtual bool isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions) = 0;
+    void printText() { std::cout << _menuText; }
+
 protected:
     int _maxChoice;
     bool _valid;
@@ -77,49 +76,54 @@ class BaseMenu
     std::string _menuText; // This string will be shared by all children (i.e. derived) classes
 };
 
-class FileTypeMenu : public BaseMenu {
+class FileTypeMenu : public BaseMenu
+{
 public:
     FileTypeMenu();
     ~FileTypeMenu();
-    BaseMenu* getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    BaseMenu* getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions);
-    void generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    static void setValuesDirectly(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
+    BaseMenu* getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    BaseMenu* getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions);
+    void generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    static void setValuesDirectly(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
 };
 
-class DevFamilyMenu : public BaseMenu {
+class DevFamilyMenu : public BaseMenu
+{
 public:
     DevFamilyMenu();
     ~DevFamilyMenu();
-    BaseMenu* getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    BaseMenu* getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions);
-    void generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    static void setValuesDirectly(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
+    BaseMenu* getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    BaseMenu* getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions);
+    void generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    static void setValuesDirectly(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+
 private:
     string beautify(string family);
-    vector <string> availableFamilies;
+    vector<string> availableFamilies;
 };
 
-class OSMenu : public BaseMenu {
+class OSMenu : public BaseMenu
+{
 public:
     OSMenu();
     ~OSMenu();
-    BaseMenu* getNextMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    BaseMenu* getPrevMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool parseChoice(int choice, bool &isExit, bool &isPrev, filesOPtions &filterOPtions);
-    void generateMenu(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool isValid(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    bool isPrevious(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
-    static void setValuesDirectly(CmdLineParams &cmd_params, filesOPtions &filterOPtions);
+    BaseMenu* getNextMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    BaseMenu* getPrevMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool parseChoice(int choice, bool& isExit, bool& isPrev, filesOPtions& filterOPtions);
+    void generateMenu(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool isValid(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    bool isPrevious(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+    static void setValuesDirectly(CmdLineParams& cmd_params, filesOPtions& filterOPtions);
+
 private:
     string beautify(string os);
-    vector <string> availableOs;
+    vector<string> availableOs;
 };
 
 #endif /* MENU_H_ */
diff --git a/mlxfwupdate/mlnx_dev.cpp b/mlxfwupdate/mlnx_dev.cpp
index ff8ad980..bd41d84c 100644
--- a/mlxfwupdate/mlnx_dev.cpp
+++ b/mlxfwupdate/mlnx_dev.cpp
@@ -52,47 +52,52 @@
 #include <netinet/in.h>
 #include <linux/sockios.h>
 #include <linux/if.h>
-#define ETHTOOL_GDRVINFO        0x00000003 /* Get driver info. */
-#define ETHTOOL_FWVERS_LEN      32
-#define ETHTOOL_BUSINFO_LEN     32
+#define ETHTOOL_GDRVINFO 0x00000003 /* Get driver info. */
+#define ETHTOOL_FWVERS_LEN 32
+#define ETHTOOL_BUSINFO_LEN 32
 
-
-struct ethtool_drvinfo {
+struct ethtool_drvinfo
+{
     __u32 cmd;
-    char driver[32];            /* driver short name, "tulip", "eepro100" */
-    char version[32];           /* driver version string */
-    char fw_version[ETHTOOL_FWVERS_LEN];        /* firmware version string */
-    char bus_info[ETHTOOL_BUSINFO_LEN];         /* Bus info for this IF. */
+    char driver[32];                     /* driver short name, "tulip", "eepro100" */
+    char version[32];                    /* driver version string */
+    char fw_version[ETHTOOL_FWVERS_LEN]; /* firmware version string */
+    char bus_info[ETHTOOL_BUSINFO_LEN];  /* Bus info for this IF. */
     /* For PCI devices, use pci_name(pci_dev). */
     char reserved1[32];
     char reserved2[12];
-    __u32 n_priv_flags;         /* number of flags valid in ETHTOOL_GPFLAGS */
-    __u32 n_stats;              /* number of u64's from ETHTOOL_GSTATS */
+    __u32 n_priv_flags; /* number of flags valid in ETHTOOL_GPFLAGS */
+    __u32 n_stats;      /* number of u64's from ETHTOOL_GSTATS */
     __u32 testinfo_len;
-    __u32 eedump_len;           /* Size of data from ETHTOOL_GEEPROM (bytes) */
-    __u32 regdump_len;          /* Size of data from ETHTOOL_GREGS (bytes) */
+    __u32 eedump_len;  /* Size of data from ETHTOOL_GEEPROM (bytes) */
+    __u32 regdump_len; /* Size of data from ETHTOOL_GREGS (bytes) */
 };
 #endif
 
 using namespace std;
 
-
 void MlnxDev::initUniqueId()
 {
-    mfile *mf = mopen(getDevName().c_str());
-    if (!mf) {
+    mfile* mf = mopen(getDevName().c_str());
+    if (!mf)
+    {
         return;
     }
-    vpd_result_t *vpdP = NULL;
-    if (mvpd_read(mf, &vpdP, VPD_RO) == 0 && vpdP != NULL) {
+    vpd_result_t* vpdP = NULL;
+    if (mvpd_read(mf, &vpdP, VPD_RO) == 0 && vpdP != NULL)
+    {
         int i = 0;
         string pn;
         string sn;
-        while (i < vpdP->ro_fields_size) {
+        while (i < vpdP->ro_fields_size)
+        {
             string id = string(vpdP->ro_fields[i].id);
-            if (id == "PN") {
+            if (id == "PN")
+            {
                 pn = string(vpdP->ro_fields[i].data);
-            } else if (id == "SN") {
+            }
+            else if (id == "SN")
+            {
                 sn = string(vpdP->ro_fields[i].data);
             }
             i++;
@@ -107,26 +112,26 @@ void MlnxDev::_MlnxDevInit(int compare_ffv)
 {
     _compareFFV = compare_ffv;
     _querySuccess = 0;
-    _burnSuccess  = -1;
+    _burnSuccess = -1;
     _ExpRomExists = 0;
-    _needsUpdate  = false;
-    _devFwOps     = NULL;
-    _imgFwOps     = NULL;
-    _description  = "";
-    guidPortOne  = "N/A";
-    guidPortTwo  = "N/A";
-    macPortOne   = "N/A";
-    macPortTwo   = "N/A";
+    _needsUpdate = false;
+    _devFwOps = NULL;
+    _imgFwOps = NULL;
+    _description = "";
+    guidPortOne = "N/A";
+    guidPortTwo = "N/A";
+    macPortOne = "N/A";
+    macPortTwo = "N/A";
     _deviceTypeStr = "N/A";
-    _deviceType   = DeviceUnknown;
+    _deviceType = DeviceUnknown;
     memset(&_devFwParams, 0, sizeof(_devFwParams));
     memset(&_imgFwParams, 0, sizeof(_imgFwParams));
     portOneType = PORT_NA;
     portTwoType = PORT_NA;
-    _partNumber  = "";
-    isOnlyBase   = false;
+    _partNumber = "";
+    isOnlyBase = false;
     _commander = NULL;
-    _noFwCtrl  = false;
+    _noFwCtrl = false;
     _mccSupport = true;
     _preBurnInit = false;
     _uniqueId = "NA";
@@ -135,8 +140,7 @@ void MlnxDev::_MlnxDevInit(int compare_ffv)
     setDeviceType();
 }
 
-
-MlnxDev::MlnxDev(dev_info *devinfo, int compare_ffv)
+MlnxDev::MlnxDev(dev_info* devinfo, int compare_ffv)
 {
     _init_type = INIT_DEVINFO;
     _devinfo = devinfo;
@@ -146,102 +150,128 @@ MlnxDev::MlnxDev(dev_info *devinfo, int compare_ffv)
     _deviceEncrypted = false;
 }
 
-
-MlnxDev::MlnxDev(const char *devname, int compare_ffv)
+MlnxDev::MlnxDev(const char* devname, int compare_ffv)
 {
     _devinfo = NULL;
     _init_type = INIT_DEVNAME;
     _devname = devname;
     _MlnxDevInit(compare_ffv);
-
 }
 
-void MlnxDev::setGuidMac(fw_info_t &fw_query)
+void MlnxDev::setGuidMac(fw_info_t& fw_query)
 {
-    bool isFs2  = (fw_query.fw_type == FIT_FS2) ? true : false;
+    bool isFs2 = (fw_query.fw_type == FIT_FS2) ? true : false;
     char buff[512] = {0};
-    string mac_format   = "%4.4x%8.8x";
+    string mac_format = "%4.4x%8.8x";
     string guild_format = "%8.8x%8.8x";
-    if (_deviceType == DeviceUnknown) {
+    if (_deviceType == DeviceUnknown)
+    {
         return;
     }
-    if (isFs2) {
-        if (fw_query.fs2_info.guid_num < 3) {
+    if (isFs2)
+    {
+        if (fw_query.fs2_info.guid_num < 3)
+        {
             return;
         }
-        if (fw_query.fs2_info.guid_num < 6) {
-            if (fw_query.fs2_info.guids[1].h || fw_query.fs2_info.guids[1].l) {
-                snprintf(buff, sizeof(buff) - 1, guild_format.c_str(),
-                         fw_query.fs2_info.guids[1].h, fw_query.fs2_info.guids[1].l);
+        if (fw_query.fs2_info.guid_num < 6)
+        {
+            if (fw_query.fs2_info.guids[1].h || fw_query.fs2_info.guids[1].l)
+            {
+                snprintf(buff, sizeof(buff) - 1, guild_format.c_str(), fw_query.fs2_info.guids[1].h,
+                         fw_query.fs2_info.guids[1].l);
                 guidPortOne = (string)buff;
             }
-            if (fw_query.fs2_info.guids[2].h || fw_query.fs2_info.guids[2].l) {
-                snprintf(buff, sizeof(buff) - 1, guild_format.c_str(),
-                         fw_query.fs2_info.guids[2].h, fw_query.fs2_info.guids[2].l);
+            if (fw_query.fs2_info.guids[2].h || fw_query.fs2_info.guids[2].l)
+            {
+                snprintf(buff, sizeof(buff) - 1, guild_format.c_str(), fw_query.fs2_info.guids[2].h,
+                         fw_query.fs2_info.guids[2].l);
                 guidPortTwo = (string)buff;
             }
-        } else {
-            if (portOneType == PORT_ETH) {
-                if (fw_query.fs2_info.guids[4].h || fw_query.fs2_info.guids[4].l) {
-                    snprintf(buff, sizeof(buff) - 1, mac_format.c_str(),
-                             fw_query.fs2_info.guids[4].h, fw_query.fs2_info.guids[4].l);
+        }
+        else
+        {
+            if (portOneType == PORT_ETH)
+            {
+                if (fw_query.fs2_info.guids[4].h || fw_query.fs2_info.guids[4].l)
+                {
+                    snprintf(buff, sizeof(buff) - 1, mac_format.c_str(), fw_query.fs2_info.guids[4].h,
+                             fw_query.fs2_info.guids[4].l);
                     macPortOne = (string)buff;
                 }
-            } else if (portOneType == PORT_IB) {
-                if (fw_query.fs2_info.guids[1].h || fw_query.fs2_info.guids[1].l) {
-                    snprintf(buff, sizeof(buff) - 1, guild_format.c_str(),
-                             fw_query.fs2_info.guids[1].h, fw_query.fs2_info.guids[1].l);
+            }
+            else if (portOneType == PORT_IB)
+            {
+                if (fw_query.fs2_info.guids[1].h || fw_query.fs2_info.guids[1].l)
+                {
+                    snprintf(buff, sizeof(buff) - 1, guild_format.c_str(), fw_query.fs2_info.guids[1].h,
+                             fw_query.fs2_info.guids[1].l);
                     guidPortOne = (string)buff;
                 }
             }
 
-            if (portTwoType == PORT_ETH) {
-                if (fw_query.fs2_info.guids[5].h || fw_query.fs2_info.guids[5].l) {
-                    snprintf(buff, sizeof(buff) - 1, mac_format.c_str(),
-                             fw_query.fs2_info.guids[5].h, fw_query.fs2_info.guids[5].l);
+            if (portTwoType == PORT_ETH)
+            {
+                if (fw_query.fs2_info.guids[5].h || fw_query.fs2_info.guids[5].l)
+                {
+                    snprintf(buff, sizeof(buff) - 1, mac_format.c_str(), fw_query.fs2_info.guids[5].h,
+                             fw_query.fs2_info.guids[5].l);
                     macPortTwo = (string)buff;
                 }
-            } else if (portTwoType == PORT_IB) {
-                if (fw_query.fs2_info.guids[2].h || fw_query.fs2_info.guids[2].l) {
-                    snprintf(buff, sizeof(buff) - 1, guild_format.c_str(),
-                             fw_query.fs2_info.guids[2].h, fw_query.fs2_info.guids[2].l);
+            }
+            else if (portTwoType == PORT_IB)
+            {
+                if (fw_query.fs2_info.guids[2].h || fw_query.fs2_info.guids[2].l)
+                {
+                    snprintf(buff, sizeof(buff) - 1, guild_format.c_str(), fw_query.fs2_info.guids[2].h,
+                             fw_query.fs2_info.guids[2].l);
                     guidPortTwo = (string)buff;
                 }
             }
         }
-    } else {
-        if (fw_query.fs3_info.fs3_uids_info.valid_field) {
+    }
+    else
+    {
+        if (fw_query.fs3_info.fs3_uids_info.valid_field)
+        {
             snprintf(buff, sizeof(buff) - 1, "%016" U64H_FMT_GEN,
                      fw_query.fs3_info.fs3_uids_info.cx4_uids.base_guid.uid);
-
-        } else {
+        }
+        else
+        {
             snprintf(buff, sizeof(buff) - 1, "%016" U64H_FMT_GEN,
                      fw_query.fs3_info.fs3_uids_info.cib_uids.guids[0].uid);
         }
         if (fw_query.fs3_info.fs3_uids_info.cib_uids.guids[0].uid ||
-            fw_query.fs3_info.fs3_uids_info.cx4_uids.base_guid.uid) {
+            fw_query.fs3_info.fs3_uids_info.cx4_uids.base_guid.uid)
+        {
             guidPortOne = (string)buff;
         }
-        if (fw_query.fs3_info.fs3_uids_info.valid_field) {
+        if (fw_query.fs3_info.fs3_uids_info.valid_field)
+        {
             snprintf(buff, sizeof(buff) - 1, "%012" U64H_FMT_GEN,
                      fw_query.fs3_info.fs3_uids_info.cx4_uids.base_mac.uid);
-            if (fw_query.fs3_info.fs3_uids_info.cx4_uids.base_mac.uid) {
+            if (fw_query.fs3_info.fs3_uids_info.cx4_uids.base_mac.uid)
+            {
                 macPortOne = (string)buff;
             }
             sprintf(buff, " ");
-        } else {
+        }
+        else
+        {
             snprintf(buff, sizeof(buff) - 1, "%016" U64H_FMT_GEN,
                      fw_query.fs3_info.fs3_uids_info.cib_uids.guids[1].uid);
         }
         if (fw_query.fs3_info.fs3_uids_info.cx4_uids.base_mac.uid ||
-            fw_query.fs3_info.fs3_uids_info.cib_uids.guids[1].uid) {
+            fw_query.fs3_info.fs3_uids_info.cib_uids.guids[1].uid)
+        {
             guidPortTwo = (string)buff;
         }
     }
-//    printf("Guild 1 : %s\n", guidPortOne.c_str());
-//    printf("Guild 2 : %s\n", guidPortTwo.c_str());
-//    printf("MAC   1 : %s\n", macPortOne.c_str());
-//    printf("MAC   2 : %s\n", macPortTwo.c_str());
+    //    printf("Guild 1 : %s\n", guidPortOne.c_str());
+    //    printf("Guild 2 : %s\n", guidPortTwo.c_str());
+    //    printf("MAC   1 : %s\n", macPortOne.c_str());
+    //    printf("MAC   2 : %s\n", macPortTwo.c_str());
 }
 
 bool MlnxDev::clearSemaphore()
@@ -249,18 +279,20 @@ bool MlnxDev::clearSemaphore()
     bool clearSemaphore = true;
     bool overRideCacheReplacement = false;
     int numberOfBanks = -1;
-    FBase *io = new Flash;
-    if (io == NULL) {
-        _errMsg  = "could not allocate io flash";
-        _log    += _errMsg;
+    FBase* io = new Flash;
+    if (io == NULL)
+    {
+        _errMsg = "could not allocate io flash";
+        _log += _errMsg;
         return false;
     }
-    if (!((Flash*)io)->open(getDevDisplayName().c_str(), clearSemaphore, false, numberOfBanks,
-                            NULL, overRideCacheReplacement)) {
+    if (!((Flash*)io)
+           ->open(getDevDisplayName().c_str(), clearSemaphore, false, numberOfBanks, NULL, overRideCacheReplacement))
+    {
         // if we have Hw_Access command we dont fail straght away
 
         _errMsg = (io)->err();
-        _log    += _errMsg;
+        _log += _errMsg;
         delete io;
         return false;
     }
@@ -271,46 +303,55 @@ bool MlnxDev::clearSemaphore()
 
 MlnxDev::~MlnxDev()
 {
-
-    if (_devFwOps) {
+    if (_devFwOps)
+    {
         _devFwOps->FwCleanUp();
         delete _devFwOps;
         _devFwOps = NULL;
     }
-    if (_imgFwOps) {
+    if (_imgFwOps)
+    {
         _imgFwOps->FwCleanUp();
         delete _imgFwOps;
         _imgFwOps = NULL;
     }
 }
 
-
 bool MlnxDev::doesDevNeedUpdate()
 {
     return _needsUpdate;
 }
 
-
 MlnxDev::port_type_t MlnxDev::findPortType(int port)
 {
     ParamView pv;
     pv.mlxconfigName = "LINK_TYPE_P1";
-    if (port == 2) {
+    if (port == 2)
+    {
         pv.mlxconfigName = "LINK_TYPE_P2";
     }
-    if (!_commander) {
+    if (!_commander)
+    {
         return PORT_NA;
     }
-    try {
+    try
+    {
         _commander->getCfg(pv);
-    } catch (MlxcfgException& e) {
+    }
+    catch (MlxcfgException& e)
+    {
         return PORT_NA;
     }
-    if (pv.val == 2) {
+    if (pv.val == 2)
+    {
         return PORT_ETH;
-    } else if (pv.val == 1) {
+    }
+    else if (pv.val == 1)
+    {
         return PORT_IB;
-    } else {
+    }
+    else
+    {
         return PORT_NA;
     }
 }
@@ -319,95 +360,103 @@ void MlnxDev::setDeviceType(void)
 {
     dm_dev_id_t ptr_dm_dev_id = DeviceUnknown;
     u_int32_t ptr_hw_dev_id = 0;
-    u_int32_t ptr_hw_rev    = 0;
-    mfile       *mf = NULL;
+    u_int32_t ptr_hw_rev = 0;
+    mfile* mf = NULL;
 
     mf = mopen(getDevName().c_str());
-    if (!mf) {
+    if (!mf)
+    {
         return;
     }
 
-    if (dm_get_device_id(mf, &ptr_dm_dev_id, &ptr_hw_dev_id, &ptr_hw_rev)) {
+    if (dm_get_device_id(mf, &ptr_dm_dev_id, &ptr_hw_dev_id, &ptr_hw_rev))
+    {
         mclose(mf);
         return;
     }
 
-
-    switch (ptr_dm_dev_id) {
-    case DeviceSpectrum:
-    case DeviceSpectrum2:
-    case DeviceSpectrum3:
-    case DeviceSpectrum4:
-        portOneType = PORT_ETH;
-        portTwoType = PORT_ETH;
-        isOnlyBase = true;
-        break;
-
-    case DeviceConnectIB:
-        portOneType = PORT_IB;
-        portTwoType = PORT_IB;
-        break;
-
-    case DeviceConnectX2:
-    case DeviceConnectX3:
-    case DeviceConnectX3Pro:
-        u_int32_t mac;
-        if ((mread4(mf, 0x1f148, &mac)) == 4) {     // port1
-            portOneType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
-        }
-        if ((mread4(mf, 0x1f164, &mac)) == 4) {     // port2
-            portTwoType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
-        }
-        break;
-
-    case DeviceSwitchIB:
-    case DeviceSwitchIB2:
-    case DeviceQuantum:
-    case DeviceQuantum2:
-        portOneType = PORT_IB;
-        portTwoType = PORT_IB;
-        isOnlyBase = true;
-        break;
-
-    case DeviceConnectX4LX:
-        portOneType = PORT_ETH;
-        portTwoType = PORT_ETH;
-        isOnlyBase   = true;
-        break;
-
-    case DeviceConnectX4:
-    case DeviceConnectX5:
-    case DeviceConnectX6:
-    case DeviceConnectX6DX:
-    case DeviceConnectX6LX:
-    case DeviceConnectX7:
-    case DeviceBlueField:
-    case DeviceBlueField2:
-    case DeviceBlueField3:
-        try {
-            _commander = Commander::create(mf, getDevName(), "");
-        } catch (MlxcfgException& e) {
+    switch (ptr_dm_dev_id)
+    {
+        case DeviceSpectrum:
+        case DeviceSpectrum2:
+        case DeviceSpectrum3:
+        case DeviceSpectrum4:
+            portOneType = PORT_ETH;
+            portTwoType = PORT_ETH;
+            isOnlyBase = true;
+            break;
+
+        case DeviceConnectIB:
+            portOneType = PORT_IB;
+            portTwoType = PORT_IB;
+            break;
+
+        case DeviceConnectX2:
+        case DeviceConnectX3:
+        case DeviceConnectX3Pro:
+            u_int32_t mac;
+            if ((mread4(mf, 0x1f148, &mac)) == 4)
+            { // port1
+                portOneType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
+            }
+            if ((mread4(mf, 0x1f164, &mac)) == 4)
+            { // port2
+                portTwoType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
+            }
+            break;
+
+        case DeviceSwitchIB:
+        case DeviceSwitchIB2:
+        case DeviceQuantum:
+        case DeviceQuantum2:
+            portOneType = PORT_IB;
+            portTwoType = PORT_IB;
+            isOnlyBase = true;
+            break;
+
+        case DeviceConnectX4LX:
+            portOneType = PORT_ETH;
+            portTwoType = PORT_ETH;
+            isOnlyBase = true;
+            break;
+
+        case DeviceConnectX4:
+        case DeviceConnectX5:
+        case DeviceConnectX6:
+        case DeviceConnectX6DX:
+        case DeviceConnectX6LX:
+        case DeviceConnectX7:
+        case DeviceBlueField:
+        case DeviceBlueField2:
+        case DeviceBlueField3:
+            try
+            {
+                _commander = Commander::create(mf, getDevName(), "");
+            }
+            catch (MlxcfgException& e)
+            {
+                _commander = NULL;
+            }
+            isOnlyBase = true;
+            portOneType = findPortType(1);
+            portTwoType = findPortType(2);
+            if (_commander)
+            {
+                delete _commander;
+            }
             _commander = NULL;
-        }
-        isOnlyBase = true;
-        portOneType = findPortType(1);
-        portTwoType = findPortType(2);
-        if (_commander) {
-            delete _commander;
-        }
-        _commander = NULL;
-        break;
+            break;
 
-    default:
-        portOneType = PORT_NA;
-        portTwoType = PORT_NA;
+        default:
+            portOneType = PORT_NA;
+            portTwoType = PORT_NA;
     }
-    if (mf) {
+    if (mf)
+    {
         mclose(mf);
     }
     _deviceTypeStr = (string)dm_dev_type2str(ptr_dm_dev_id);
-    _deviceType    = ptr_dm_dev_id;
-
+    _deviceType = ptr_dm_dev_id;
 }
 
 void MlnxDev::setDevToNeedUpdate()
@@ -422,79 +471,81 @@ void MlnxDev::setNoFwCtrl()
 
 void MlnxDev::patchPsidInfo(string psid)
 {
-    if (psid.size() > 0) {
+    if (psid.size() > 0)
+    {
         _psid = psid;
     }
 }
 
-
 string MlnxDev::getBoardTypeId()
 {
-    if (_psid.size() > 0) {
+    if (_psid.size() > 0)
+    {
         return _psid;
     }
     return _boardTypeId;
 }
 
-
 string MlnxDev::getLastErrMsg()
 {
     return _errMsg;
 }
 
-
 string MlnxDev::getLog()
 {
     return _log;
 }
 
-
-int MlnxDev::compareFWVer(const ImgVersion& ver) {
+int MlnxDev::compareFWVer(const ImgVersion& ver)
+{
     int idx = getImageIndex("FW");
-    if (idx == -1) {
+    if (idx == -1)
+    {
         return 0;
     }
     return _imageVers[idx].compareFw(ver);
 }
 
-
 int MlnxDev::isBurnSuccess()
 {
     return _burnSuccess;
 }
 
-
 int MlnxDev::isQuerySuccess()
 {
     return _querySuccess;
 }
 
-
-bool MlnxDev::openImg(u_int32_t *fileBuffer, u_int32_t bufferSize)
+bool MlnxDev::openImg(u_int32_t* fileBuffer, u_int32_t bufferSize)
 {
     memset(_errBuff, 0, sizeof(_errBuff));
-    _imgFwParams.errBuff      = _errBuff;
-    _imgFwParams.errBuffSize  = MLNX_ERR_BUFF_SIZE;
-    _imgFwParams.hndlType     = FHT_FW_BUFF;
-    _imgFwParams.psid         = (char*)_psid.c_str();
-    _imgFwParams.buffHndl     = fileBuffer;
-    _imgFwParams.buffSize     = bufferSize;
-    _imgFwParams.shortErrors  = true;
+    _imgFwParams.errBuff = _errBuff;
+    _imgFwParams.errBuffSize = MLNX_ERR_BUFF_SIZE;
+    _imgFwParams.hndlType = FHT_FW_BUFF;
+    _imgFwParams.psid = (char*)_psid.c_str();
+    _imgFwParams.buffHndl = fileBuffer;
+    _imgFwParams.buffSize = bufferSize;
+    _imgFwParams.shortErrors = true;
     _imgFwOps = FwOperations::FwOperationsCreate(_imgFwParams);
-    if (_imgFwOps == NULL) {
-        _errMsg  = _errBuff;
-        _log    += _errMsg;
+    if (_imgFwOps == NULL)
+    {
+        _errMsg = _errBuff;
+        _log += _errMsg;
         return false;
     }
     return true;
 }
 
-int MlnxDev::preBurn(string mfa_file, f_prog_func prog_cb, bool burnFailsafe,
-                     bool& isTimeConsumingFixesNeeded, vector<string>& questions, f_prog_func_adv stage_prog)
+int MlnxDev::preBurn(string mfa_file,
+                     f_prog_func prog_cb,
+                     bool burnFailsafe,
+                     bool& isTimeConsumingFixesNeeded,
+                     vector<string>& questions,
+                     f_prog_func_adv stage_prog)
 {
     string cmd;
     int rc;
-    u_int8_t *filebuf = NULL;
+    u_int8_t* filebuf = NULL;
     ImageAccess imgacc(_compareFFV);
     fw_info_t dev_fw_query;
     fw_info_t img_fw_query;
@@ -502,82 +553,99 @@ int MlnxDev::preBurn(string mfa_file, f_prog_func prog_cb, bool burnFailsafe,
     memset(&img_fw_query, 0, sizeof(img_fw_query));
     _burnSuccess = 0;
     int sza = imgacc.getImage(mfa_file, &filebuf);
-    if (sza < 0) {
+    if (sza < 0)
+    {
         _errMsg = imgacc.getLastErrMsg();
-        _log    += imgacc.getLog();
+        _log += imgacc.getLog();
         return -1;
     }
 
-    if (!openImg((u_int32_t*)filebuf, (u_int32_t)sza)) {
+    if (!openImg((u_int32_t*)filebuf, (u_int32_t)sza))
+    {
         goto clean_up_on_error;
     }
 
-    if (!_imgFwOps->isEncrypted(_imageEncrypted)) {
-        _errMsg  = "Failed to identify if image is encrypted.";
+    if (!_imgFwOps->isEncrypted(_imageEncrypted))
+    {
+        _errMsg = "Failed to identify if image is encrypted.";
         rc = -1;
         goto clean_up_on_error;
-    }    
-    
+    }
+
     rc = _imgFwOps->FwQuery(&img_fw_query);
-    if (!rc) {
-        _errMsg  = "Failed to query the image, " +  (string)_imgFwOps->err();
+    if (!rc)
+    {
+        _errMsg = "Failed to query the image, " + (string)_imgFwOps->err();
         _log += _errMsg;
         goto clean_up_on_error;
     }
 
-    if (img_fw_query.fs3_info.security_mode == SM_NONE) {
+    if (img_fw_query.fs3_info.security_mode == SM_NONE)
+    {
         setNoFwCtrl();
     }
-    if (!OpenDev()) {
+    if (!OpenDev())
+    {
         goto clean_up_on_error;
     }
 
-    if (!_devFwOps->isEncrypted(_deviceEncrypted)) {
-        _errMsg  = "Failed to identify if device is encrypted.";
+    if (!_devFwOps->isEncrypted(_deviceEncrypted))
+    {
+        _errMsg = "Failed to identify if device is encrypted.";
         rc = -1;
-        goto clean_up_on_error;        
+        goto clean_up_on_error;
     }
 #ifdef __WIN__
-    if (LockDevice(_devFwOps) != TOOLS_SYNC_OK) {
+    if (LockDevice(_devFwOps) != TOOLS_SYNC_OK)
+    {
         return -1;
     }
 #endif
-    if (_deviceEncrypted != _imageEncrypted) {
+    if (_deviceEncrypted != _imageEncrypted)
+    {
         char errMsg[100];
         sprintf(errMsg, "Burning %sencrypted image on %sencrypted device is not allowed.\n",
                 _imageEncrypted ? "" : "non-", _deviceEncrypted ? "" : "non-");
-        _errMsg  = errMsg;
+        _errMsg = errMsg;
         rc = -1;
-        goto clean_up_on_error;                
+        goto clean_up_on_error;
     }
 
     rc = _devFwOps->FwQuery(&dev_fw_query);
-    if (!rc) {
-        _errMsg  = "Failed to query the device, " +  (string)_devFwOps->err();
+    if (!rc)
+    {
+        _errMsg = "Failed to query the device, " + (string)_devFwOps->err();
         _log += _errMsg;
         goto clean_up_on_error;
     }
 
     // Abort if the image is restricted according to the Security-Version
-    if (_devFwOps->IsSecurityVersionViolated(img_fw_query.fs3_info.image_security_version)) {
-        _errMsg  = "The image you're trying to burn is restricted. Aborting ...";
+    if (_devFwOps->IsSecurityVersionViolated(img_fw_query.fs3_info.image_security_version))
+    {
+        _errMsg = "The image you're trying to burn is restricted. Aborting ...";
         _log += _errMsg;
         goto clean_up_on_error;
     }
 
     _burnParams.burnFailsafe = burnFailsafe;
-    if (_burnParams.burnFailsafe) {
-        if (_burnParams.burnFailsafe && (!img_fw_query.fw_info.is_failsafe || !dev_fw_query.fw_info.is_failsafe)) {
-            if (!img_fw_query.fw_info.is_failsafe && !dev_fw_query.fw_info.is_failsafe) {
+    if (_burnParams.burnFailsafe)
+    {
+        if (_burnParams.burnFailsafe && (!img_fw_query.fw_info.is_failsafe || !dev_fw_query.fw_info.is_failsafe))
+        {
+            if (!img_fw_query.fw_info.is_failsafe && !dev_fw_query.fw_info.is_failsafe)
+            {
                 _burnParams.burnFailsafe = false;
-            } else {
+            }
+            else
+            {
                 char err[512] = {0};
-                snprintf(err, sizeof(err) - 1,
-                         "Failsafe burn failed: FW image in the %s is non failsafe.\n"
-                         "    you cannot burn a%s failsafe image over a%s failsafe image in a failsafe mode.\n"
-                         "    If you want to burn in non failsafe mode, use the \"--nofs\" switch along with \"-d device\".\n",
-                         img_fw_query.fw_info.is_failsafe ? "flash" : "given file",  img_fw_query.fw_info.is_failsafe ? "" : " non", \
-                         dev_fw_query.fw_info.is_failsafe ? "" : " non");
+                snprintf(
+                  err, sizeof(err) - 1,
+                  "Failsafe burn failed: FW image in the %s is non failsafe.\n"
+                  "    you cannot burn a%s failsafe image over a%s failsafe image in a failsafe mode.\n"
+                  "    If you want to burn in non failsafe mode, use the \"--nofs\" switch along with \"-d device\".\n",
+                  img_fw_query.fw_info.is_failsafe ? "flash" : "given file",
+                  img_fw_query.fw_info.is_failsafe ? "" : " non", dev_fw_query.fw_info.is_failsafe ? "" : " non");
                 _errMsg = err;
                 _log += _errMsg;
                 goto clean_up_on_error;
@@ -585,18 +653,21 @@ int MlnxDev::preBurn(string mfa_file, f_prog_func prog_cb, bool burnFailsafe,
         }
 
         FwOperations::fw_ops_params_t fwParams;
-        if (InitDevFWParams(fwParams)) {
+        if (InitDevFWParams(fwParams))
+        {
             FsChecks fsChecks(dev_fw_query, _devFwOps, _imgFwOps, _burnParams, fwParams);
-            if (fsChecks.ExecuteChecks(&_devFwOps, _burnParams, dev_fw_query)) {
+            if (fsChecks.ExecuteChecks(&_devFwOps, _burnParams, dev_fw_query))
+            {
                 fsChecks.GetUserQuestions(questions);
                 isTimeConsumingFixesNeeded = fsChecks._isTimeConsumingFixesNeeded;
                 delete[] fwParams.mstHndl;
-            } else {
+            }
+            else
+            {
                 delete[] fwParams.mstHndl;
                 goto clean_up_on_error;
             }
         }
-
     }
     _burnParams.progressFunc = prog_cb;
     _burnParams.ProgressFuncAdv.func = stage_prog;
@@ -609,13 +680,15 @@ int MlnxDev::preBurn(string mfa_file, f_prog_func prog_cb, bool burnFailsafe,
     return 0;
 
 clean_up_on_error:
-    if (_devFwOps) {
+    if (_devFwOps)
+    {
         UnlockDevice(_devFwOps);
         _devFwOps->FwCleanUp();
         delete _devFwOps;
         _devFwOps = NULL;
     }
-    if (_imgFwOps) {
+    if (_imgFwOps)
+    {
         _imgFwOps->FwCleanUp();
         delete _imgFwOps;
         _imgFwOps = NULL;
@@ -628,28 +701,36 @@ int MlnxDev::burn(bool& imageWasCached)
 {
     int res = 0, rc = 0;
 
-    if (!_preBurnInit) {
-        _errMsg  = "Pre-burn was not processed";
+    if (!_preBurnInit)
+    {
+        _errMsg = "Pre-burn was not processed";
         res = -1;
         goto clean_up;
     }
 #ifdef __WIN__
-    if (LockDevice(_devFwOps) != TOOLS_SYNC_OK) {
+    if (LockDevice(_devFwOps) != TOOLS_SYNC_OK)
+    {
         return -1;
     }
 #endif
     //* Burn encrypted image using MCC flow or direct-access
-    if (_deviceEncrypted && _imageEncrypted) {    
-        rc = _devFwOps->burnEncryptedImage(_imgFwOps, _burnParams);                
+    if (_deviceEncrypted && _imageEncrypted)
+    {
+        rc = _devFwOps->burnEncryptedImage(_imgFwOps, _burnParams);
     }
-    else {        
+    else
+    {
         rc = _devFwOps->FwBurnAdvanced(_imgFwOps, _burnParams);
     }
-    if (!rc) {
-        if (_devFwOps->err() != NULL) {
-            _errMsg  = _devFwOps->err();
-        } else {
-            _errMsg  = "Failed to burn, unknown reason";
+    if (!rc)
+    {
+        if (_devFwOps->err() != NULL)
+        {
+            _errMsg = _devFwOps->err();
+        }
+        else
+        {
+            _errMsg = "Failed to burn, unknown reason";
         }
         _log += _errMsg;
         res = -1;
@@ -661,13 +742,15 @@ int MlnxDev::burn(bool& imageWasCached)
     imageWasCached = _burnParams.burnStatus.imageCachedSuccessfully;
 
 clean_up:
-    if (_devFwOps) {
+    if (_devFwOps)
+    {
         UnlockDevice(_devFwOps);
         _devFwOps->FwCleanUp();
         delete _devFwOps;
         _devFwOps = NULL;
     }
-    if (_imgFwOps) {
+    if (_imgFwOps)
+    {
         _imgFwOps->FwCleanUp();
         delete _imgFwOps;
         _imgFwOps = NULL;
@@ -685,7 +768,8 @@ bool MlnxDev::InitDevFWParams(FwOperations::fw_ops_params_t& devFwParams)
     char* deviceName = (char*)devName.c_str();
     int length = ((strlen(deviceName) + 1) * sizeof(char));
     devFwParams.mstHndl = new char[length];
-    if (devFwParams.mstHndl == NULL) {
+    if (devFwParams.mstHndl == NULL)
+    {
         _errMsg = "Failed to allocate Memory";
         _log += _errMsg;
         return false;
@@ -707,14 +791,16 @@ bool MlnxDev::InitDevFWParams(FwOperations::fw_ops_params_t& devFwParams)
 
 bool MlnxDev::OpenDev()
 {
-    if (!InitDevFWParams(_devFwParams)) {
+    if (!InitDevFWParams(_devFwParams))
+    {
         return false;
     }
     _devFwOps = FwOperations::FwOperationsCreate(_devFwParams);
     delete[] _devFwParams.mstHndl;
-    if (_devFwOps == NULL) {
-        _errMsg  = _errBuff;
-        _log    += _errMsg;
+    if (_devFwOps == NULL)
+    {
+        _errMsg = _errBuff;
+        _log += _errMsg;
         return false;
     }
     return true;
@@ -732,18 +818,23 @@ int MlnxDev::queryFwops()
     vector<u_int8_t> sect; // to get fw configuration.
     vector<u_int8_t> dest;
 
-    int versionFields = 3;/*TODO: set variable length*/
+    int versionFields = 3; /*TODO: set variable length*/
 
-    if (!OpenDev()) {
+    if (!OpenDev())
+    {
         return -1;
     }
 
     memset(&fw_query, 0, sizeof(fw_info_t));
-    if (!_devFwOps->FwQuery(&fw_query, true)) {
-        if (_devFwOps->err() != NULL) {
-            _errMsg  = "Failed to query " +  (string)_devFwOps->err();
-        } else {
-            _errMsg  = "Failed to query : unknown reason";
+    if (!_devFwOps->FwQuery(&fw_query, true))
+    {
+        if (_devFwOps->err() != NULL)
+        {
+            _errMsg = "Failed to query " + (string)_devFwOps->err();
+        }
+        else
+        {
+            _errMsg = "Failed to query : unknown reason";
         }
         _log += _errMsg;
         goto clean_up;
@@ -751,33 +842,43 @@ int MlnxDev::queryFwops()
     setGuidMac(fw_query);
 
     // attempt to take some fields from image info
-    if (fw_query.fw_type == FIT_FS3 || fw_query.fw_type == FIT_FS4) {
-        if (strlen(fw_query.fs3_info.description)) {
+    if (fw_query.fw_type == FIT_FS3 || fw_query.fw_type == FIT_FS4)
+    {
+        if (strlen(fw_query.fs3_info.description))
+        {
             _description = fw_query.fs3_info.description;
         }
-        if (strlen(fw_query.fs3_info.name)) {
+        if (strlen(fw_query.fs3_info.name))
+        {
             _partNumber = fw_query.fs3_info.name;
         }
     }
 
-    if (!_description.size() || !_partNumber.size()) {  // take missing from ini
+    if (!_description.size() || !_partNumber.size())
+    { // take missing from ini
         setMccSupport(false);
         _devFwOps->FwCleanUp();
         delete _devFwOps;
-        if (!OpenDev()) {
+        if (!OpenDev())
+        {
             return -1;
         }
         setMccSupport(true);
-        if (_devFwOps->FwGetSection((_devFwOps->FwType() == FIT_FS2) ? (int)H_FW_CONF : (int)FS3_DBG_FW_INI, sect)) {
+        if (_devFwOps->FwGetSection((_devFwOps->FwType() == FIT_FS2) ? (int)H_FW_CONF : (int)FS3_DBG_FW_INI, sect))
+        {
             // Take from ini
-            if (unzipDataFile(sect, dest, "Fw Configuration")) {
-                char *ptr;
+            if (unzipDataFile(sect, dest, "Fw Configuration"))
+            {
+                char* ptr;
                 int counter;
-                if (!_partNumber.size()) {
+                if (!_partNumber.size())
+                {
                     ptr = strstr((char*)&dest[0], "Name =");
                     counter = 7;
-                    while (ptr && * ptr != '\n' && * ptr != '\r') {
-                        if (counter-- > 0) {
+                    while (ptr && *ptr != '\n' && *ptr != '\r')
+                    {
+                        if (counter-- > 0)
+                        {
                             ptr++;
                             continue;
                         }
@@ -785,11 +886,14 @@ int MlnxDev::queryFwops()
                         ptr++;
                     }
                 }
-                if (!_description.size()) {
+                if (!_description.size())
+                {
                     ptr = strstr((char*)&dest[0], "Description =");
                     counter = 14;
-                    while (ptr && * ptr != '\n' && * ptr != '\r') {
-                        if (counter-- > 0) {
+                    while (ptr && *ptr != '\n' && *ptr != '\r')
+                    {
+                        if (counter-- > 0)
+                        {
                             ptr++;
                             continue;
                         }
@@ -800,12 +904,16 @@ int MlnxDev::queryFwops()
             }
         }
     }
-    if (!_compareFFV) {
-        for (i = 0; i < versionFields; i++) {
+    if (!_compareFFV)
+    {
+        for (i = 0; i < versionFields; i++)
+        {
             fwVer[i] = fw_query.fw_info.fw_ver[i];
             runningfwVer[i] = fw_query.fw_info.running_fw_ver[i];
         }
-    } else {
+    }
+    else
+    {
         fwVer[0] = fw_query.fw_info.fw_ver[0];
         fwVer[1] = fw_query.fw_info.fw_ver[1];
         fwVer[2] = fw_query.fw_info.fw_ver[2] / 100;
@@ -816,25 +924,28 @@ int MlnxDev::queryFwops()
         runningfwVer[2] = fw_query.fw_info.running_fw_ver[2] / 100;
         runningfwVer[3] = fw_query.fw_info.running_fw_ver[2] % 100;
     }
-    imgv.setVersion("FW", versionFields + _compareFFV, fwVer,
-            fw_query.fw_info.branch_ver);
+    imgv.setVersion("FW", versionFields + _compareFFV, fwVer, fw_query.fw_info.branch_ver);
     _imageVers.push_back(imgv);
 
-    if ((fw_query.fw_info.running_fw_ver[0] || fw_query.fw_info.running_fw_ver[1] || fw_query.fw_info.running_fw_ver[2]) && \
-        (fw_query.fw_info.running_fw_ver[0] != fw_query.fw_info.fw_ver[0] || \
-         fw_query.fw_info.running_fw_ver[1] != fw_query.fw_info.fw_ver[1] || \
-         fw_query.fw_info.running_fw_ver[2] != fw_query.fw_info.fw_ver[2])) {
+    if ((fw_query.fw_info.running_fw_ver[0] || fw_query.fw_info.running_fw_ver[1] ||
+         fw_query.fw_info.running_fw_ver[2]) &&
+        (fw_query.fw_info.running_fw_ver[0] != fw_query.fw_info.fw_ver[0] ||
+         fw_query.fw_info.running_fw_ver[1] != fw_query.fw_info.fw_ver[1] ||
+         fw_query.fw_info.running_fw_ver[2] != fw_query.fw_info.fw_ver[2]))
+    {
         ImgVersion imgrv;
-        imgrv.setVersion("FW (Running)", versionFields + _compareFFV,
-                runningfwVer, fw_query.fw_info.running_branch_ver);
+        imgrv.setVersion("FW (Running)", versionFields + _compareFFV, runningfwVer,
+                         fw_query.fw_info.running_branch_ver);
         _imageVers.push_back(imgrv);
     }
 
-    for (i = 0; i < fw_query.fw_info.roms_info.num_of_exp_rom; i++) {
+    for (i = 0; i < fw_query.fw_info.roms_info.num_of_exp_rom; i++)
+    {
         ImgVersion imgVer;
-        const char *tpc = _devFwOps->expRomType2Str(fw_query.fw_info.roms_info.rom_info[i].exp_rom_product_id);
-        if (tpc == NULL) {
-            //imgVer.setExpansionRomtoUnknown();
+        const char* tpc = _devFwOps->expRomType2Str(fw_query.fw_info.roms_info.rom_info[i].exp_rom_product_id);
+        if (tpc == NULL)
+        {
+            // imgVer.setExpansionRomtoUnknown();
             tpc = "UNKNOWN_ROM";
         }
         int sz = fw_query.fw_info.roms_info.rom_info[i].exp_rom_num_ver_fields;
@@ -855,27 +966,29 @@ int MlnxDev::queryFwops()
     return res;
 }
 
-
-
 #if !defined(__WIN__) && !defined(__FreeBSD__)
-static int readSysFs(dev_info *devinfo, fw_info_t *fw_query)
+static int readSysFs(dev_info* devinfo, fw_info_t* fw_query)
 {
     int res = -1;
     char path[256] = {0};
-    char buf [40] = {0};
-    DIR *d;
-    struct dirent *dir;
+    char buf[40] = {0};
+    DIR* d;
+    struct dirent* dir;
     int v0, v1, v2, v20, v21;
 
-    snprintf(path, sizeof(path) - 1, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/infiniband", devinfo->pci.domain, devinfo->pci.bus, devinfo->pci.dev, devinfo->pci.func);
+    snprintf(path, sizeof(path) - 1, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/infiniband", devinfo->pci.domain,
+             devinfo->pci.bus, devinfo->pci.dev, devinfo->pci.func);
     d = opendir(path);
-    if (d == NULL) {
+    if (d == NULL)
+    {
         return -1;
     }
 
-    while ((dir = readdir(d)) != NULL) {
+    while ((dir = readdir(d)) != NULL)
+    {
         string fl = dir->d_name;
-        if (fl == "." || fl == "..") {
+        if (fl == "." || fl == "..")
+        {
             continue;
         }
         string fpath = path;
@@ -884,12 +997,15 @@ static int readSysFs(dev_info *devinfo, fw_info_t *fw_query)
         fpath += "/";
         string file = fpath;
         file += "fw_ver";
-        FILE *f = fopen(file.c_str(), "r");
-        if (f == NULL) {
+        FILE* f = fopen(file.c_str(), "r");
+        if (f == NULL)
+        {
             continue;
         }
-        if (fgets(buf, 32, f)) {
-            if (buf[strlen(buf) - 1] == '\n') {
+        if (fgets(buf, 32, f))
+        {
+            if (buf[strlen(buf) - 1] == '\n')
+            {
                 buf[strlen(buf) - 1] = 0;
             }
             int tmp = sscanf(buf, "%d.%d.%d", &v0, &v1, &v2);
@@ -898,20 +1014,23 @@ static int readSysFs(dev_info *devinfo, fw_info_t *fw_query)
             fw_query->fw_info.fw_ver[2] = v2;
             v20 = v2 / 100;
             v21 = v2 % 100;
-            (void) tmp;
-            snprintf(fw_query->fw_info.product_ver, sizeof(fw_query->fw_info.product_ver) - 1, "%02d.%02d.%02d.%02d", v0 % 100, v1 % 100, v20 % 100, v21 % 100);
+            (void)tmp;
+            snprintf(fw_query->fw_info.product_ver, sizeof(fw_query->fw_info.product_ver) - 1, "%02d.%02d.%02d.%02d",
+                     v0 % 100, v1 % 100, v20 % 100, v21 % 100);
         }
         fclose(f);
 
-
         file = fpath;
         file += "board_id";
         f = fopen(file.c_str(), "r");
-        if (f == NULL) {
+        if (f == NULL)
+        {
             continue;
         }
-        if (fgets(buf, 32, f)) {
-            if (buf[strlen(buf) - 1] == '\n') {
+        if (fgets(buf, 32, f))
+        {
+            if (buf[strlen(buf) - 1] == '\n')
+            {
                 buf[strlen(buf) - 1] = 0;
             }
             strcpy(fw_query->fw_info.psid, buf);
@@ -925,8 +1044,7 @@ static int readSysFs(dev_info *devinfo, fw_info_t *fw_query)
     return res;
 }
 
-
-static int getEthtoolInfo(dev_info *devinfo, fw_info_t *fw_query)
+static int getEthtoolInfo(dev_info* devinfo, fw_info_t* fw_query)
 {
     int sock;
     struct ifreq ifr;
@@ -934,36 +1052,42 @@ static int getEthtoolInfo(dev_info *devinfo, fw_info_t *fw_query)
     int rc;
     int res = -1;
     char path[256] = {0};
-    DIR *d;
-    struct dirent *dir;
+    DIR* d;
+    struct dirent* dir;
     int v0, v1, v2, v20, v21;
 
-    snprintf(path, sizeof(path) - 1, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/net", devinfo->pci.domain, devinfo->pci.bus, devinfo->pci.dev, devinfo->pci.func);
+    snprintf(path, sizeof(path) - 1, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/net", devinfo->pci.domain,
+             devinfo->pci.bus, devinfo->pci.dev, devinfo->pci.func);
     d = opendir(path);
-    if (d == NULL) {
+    if (d == NULL)
+    {
         return -1;
     }
 
     sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-    if (sock < 0) {
+    if (sock < 0)
+    {
         closedir(d);
         return -1;
     }
 
-    while ((dir = readdir(d)) != NULL) {
+    while ((dir = readdir(d)) != NULL)
+    {
         string fl = dir->d_name;
-        if (fl == "." || fl == "..") {
+        if (fl == "." || fl == "..")
+        {
             continue;
         }
 
-        strncpy(ifr.ifr_name, fl.c_str(), sizeof(ifr.ifr_name) - 1);//the rest of dest will be filled with zeros
+        strncpy(ifr.ifr_name, fl.c_str(), sizeof(ifr.ifr_name) - 1); // the rest of dest will be filled with zeros
         ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
         ifr.ifr_data = &edata;
         edata.cmd = ETHTOOL_GDRVINFO;
 
         rc = ioctl(sock, SIOCETHTOOL, &ifr);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             continue;
         }
 
@@ -973,8 +1097,9 @@ static int getEthtoolInfo(dev_info *devinfo, fw_info_t *fw_query)
         fw_query->fw_info.fw_ver[2] = v2;
         v20 = v2 / 100;
         v21 = v2 % 100;
-        (void) tmp;
-        snprintf(fw_query->fw_info.product_ver, sizeof(fw_query->fw_info.product_ver) - 1, "%02d.%02d.%02d.%02d", v0 % 100, v1 % 100, v20 % 100, v21 % 100);
+        (void)tmp;
+        snprintf(fw_query->fw_info.product_ver, sizeof(fw_query->fw_info.product_ver) - 1, "%02d.%02d.%02d.%02d",
+                 v0 % 100, v1 % 100, v20 % 100, v21 % 100);
 
         fw_query->fw_info.psid[0] = '\0';
         res = 0;
@@ -995,52 +1120,63 @@ int MlnxDev::query()
     int i;
     int rc;
     char buf[32] = {0};
-    (void) buf;
+    (void)buf;
     ImgVersion imgv;
     u_int16_t fwVer[4];
     fw_info_t fw_query;
 
-    int versionFields = 3;/*TODO: set variable length*/
-    if (geteuid() == 0) {
+    int versionFields = 3; /*TODO: set variable length*/
+    if (geteuid() == 0)
+    {
         return queryFwops();
-    } else {
+    }
+    else
+    {
         _errMsg = "User is Not Root";
         _log += _errMsg;
         rc = -1;
     }
 
-    if (rc && (_init_type == INIT_DEVINFO)) {
-        #if !defined(__FreeBSD__)
+    if (rc && (_init_type == INIT_DEVINFO))
+    {
+#if !defined(__FreeBSD__)
         rc = readSysFs(_devinfo, &fw_query);
-        if (rc) {
+        if (rc)
+        {
             rc = getEthtoolInfo(_devinfo, &fw_query);
-            if (rc) {
+            if (rc)
+            {
                 goto clean_up;
             }
-            snprintf(buf, sizeof(buf) - 1, "%04x:%04x:%04x:%04x", _devinfo->pci.vend_id, _devinfo->pci.dev_id, _devinfo->pci.subsys_vend_id, _devinfo->pci.subsys_id);
+            snprintf(buf, sizeof(buf) - 1, "%04x:%04x:%04x:%04x", _devinfo->pci.vend_id, _devinfo->pci.dev_id,
+                     _devinfo->pci.subsys_vend_id, _devinfo->pci.subsys_id);
             _boardTypeId = buf;
         }
-        #else
+#else
         goto clean_up;
-        #endif
-    } else {
+#endif
+    }
+    else
+    {
         return rc;
     }
 
-    if (!_compareFFV) {
-        for (i = 0; i < versionFields; i++) {
+    if (!_compareFFV)
+    {
+        for (i = 0; i < versionFields; i++)
+        {
             fwVer[i] = fw_query.fw_info.fw_ver[i];
         }
-    } else {
+    }
+    else
+    {
         fwVer[0] = fw_query.fw_info.fw_ver[0];
         fwVer[1] = fw_query.fw_info.fw_ver[1];
         fwVer[2] = fw_query.fw_info.fw_ver[2] / 100;
         fwVer[3] = fw_query.fw_info.fw_ver[2] % 100;
-
     }
 
-    imgv.setVersion("FW", versionFields + _compareFFV, fwVer,
-            fw_query.fw_info.branch_ver);
+    imgv.setVersion("FW", versionFields + _compareFFV, fwVer, fw_query.fw_info.branch_ver);
     _imageVers.push_back(imgv);
     _productVer = fw_query.fw_info.product_ver;
     _psid = fw_query.fw_info.psid;
@@ -1061,30 +1197,38 @@ int MlnxDev::query()
 
 #endif //__WIN__
 
-
 string MlnxDev::getDevDisplayName(bool pci_if_possible)
 {
     char tmpb[20] = {0};
     string devname = "";
 
-    if (_init_type == INIT_DEVINFO) {
-        if (_devinfo->type == MDEVS_TAVOR_CR) {
-            snprintf(tmpb, sizeof(tmpb) - 1, "%04x:%02x:%02x.%x", _devinfo->pci.domain,
-                     _devinfo->pci.bus, _devinfo->pci.dev, _devinfo->pci.func);
+    if (_init_type == INIT_DEVINFO)
+    {
+        if (_devinfo->type == MDEVS_TAVOR_CR)
+        {
+            snprintf(tmpb, sizeof(tmpb) - 1, "%04x:%02x:%02x.%x", _devinfo->pci.domain, _devinfo->pci.bus,
+                     _devinfo->pci.dev, _devinfo->pci.func);
             devname = tmpb;
             //_devinfo->pci.conf_dev;
-        } else {
+        }
+        else
+        {
             devname = _devinfo->dev_name;
         }
-        if (pci_if_possible) {
+        if (pci_if_possible)
+        {
             return devname;
         }
-        #ifndef ONLY_PCI_FORMAT
+#ifndef ONLY_PCI_FORMAT
         devname = _devinfo->dev_name;
-        #endif
-    } else if (_init_type == INIT_DEVNAME) {
+#endif
+    }
+    else if (_init_type == INIT_DEVNAME)
+    {
         devname = _devname;
-    } else {
+    }
+    else
+    {
         fprintf(stderr, "-E- mlnx_dev.cpp: unexpected value for _init_type: %d\n", _init_type);
     }
     return devname;
@@ -1104,48 +1248,56 @@ string MlnxDev::getDevName()
 {
     string devname;
 
-    if (_init_type == INIT_DEVINFO) {
+    if (_init_type == INIT_DEVINFO)
+    {
         devname = _devinfo->dev_name;
-    } else if (_init_type == INIT_DEVNAME) {
+    }
+    else if (_init_type == INIT_DEVNAME)
+    {
         devname = _devname;
-    } else {
+    }
+    else
+    {
         devname = "UNKNOWN";
         fprintf(stderr, "-E- mlnx_dev.cpp: unexpected value for _init_type: %d\n", _init_type);
     }
     return devname;
 }
 
-
 string MlnxDev::getPsid()
 {
     return _psid;
 }
 
-
 int MlnxDev::getImageIndex(string type)
 {
     int idx = -1;
 
-    for (int i = 0; i < (int)_imageVers.size(); i++) {
-        if (!_imageVers[i].getTypeStr().compare(type)) {
+    for (int i = 0; i < (int)_imageVers.size(); i++)
+    {
+        if (!_imageVers[i].getTypeStr().compare(type))
+        {
             idx = i;
         }
     }
     return idx;
 }
 
-
 string MlnxDev::getFWVersion(bool show_type, bool use_default_ffv)
 {
     string st;
     int idx = getImageIndex("FW");
 
-    if (idx == -1) {
+    if (idx == -1)
+    {
         return st;
     }
-    if (use_default_ffv) {
+    if (use_default_ffv)
+    {
         st = _imageVers[idx].getPrintableVersion(_compareFFV, show_type);
-    } else {
+    }
+    else
+    {
         st = _imageVers[idx].getPrintableVersion(0, show_type);
     }
     return st;
@@ -1168,32 +1320,37 @@ string MlnxDev::getPartNumber()
 
 bool MlnxDev::checkExistence(vector<MlnxDev*>& devs)
 {
-    for (vector<MlnxDev*>::iterator it = devs.begin(); it != devs.end(); it++) {
-        if (this->equals(*it) == true) {
+    for (vector<MlnxDev*>::iterator it = devs.begin(); it != devs.end(); it++)
+    {
+        if (this->equals(*it) == true)
+        {
             return true;
         }
     }
     return false;
 }
 
-
-bool MlnxDev::equals(MlnxDev *dev)
+bool MlnxDev::equals(MlnxDev* dev)
 {
     string devUinqueId = dev->getUniqueId();
-    if (_uniqueId != "NA" && devUinqueId != "NA") {
-        if (_uniqueId == devUinqueId) {
+    if (_uniqueId != "NA" && devUinqueId != "NA")
+    {
+        if (_uniqueId == devUinqueId)
+        {
             return true;
         }
     }
     return false;
 }
-int MlnxDev::LockDevice(FwOperations *fwOps)
+int MlnxDev::LockDevice(FwOperations* fwOps)
 {
 #ifdef __WIN__
-    //relevant only on devices
-    if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL) {
+    // relevant only on devices
+    if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL)
+    {
         mfile* mFile = fwOps->getMfileObj();
-        if (m_ToolsSync.init(mFile) != TOOLS_SYNC_OK) {
+        if (m_ToolsSync.init(mFile) != TOOLS_SYNC_OK)
+        {
             printf("-E- Other tool is accessing the device! Please try again later.\n");
             return -1;
         }
@@ -1204,13 +1361,14 @@ int MlnxDev::LockDevice(FwOperations *fwOps)
     return 0;
 }
 
-
-int MlnxDev::UnlockDevice(FwOperations *fwOps)
+int MlnxDev::UnlockDevice(FwOperations* fwOps)
 {
 #ifdef __WIN__
-    //relevant only on devices
-    if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL) {
-        if (m_ToolsSync.close() != NAMED_SYNC_OK) {
+    // relevant only on devices
+    if (fwOps->FwType() == FIT_FS3 || fwOps->FwType() == FIT_FS4 || fwOps->FwType() == FIT_FSCTRL)
+    {
+        if (m_ToolsSync.close() != NAMED_SYNC_OK)
+        {
             printf("Mlxfwmanger: Prevention cannot unlock device.\n");
             return -1;
         }
diff --git a/mlxfwupdate/mlnx_dev.h b/mlxfwupdate/mlnx_dev.h
index 8694b310..bd72c2f4 100644
--- a/mlxfwupdate/mlnx_dev.h
+++ b/mlxfwupdate/mlnx_dev.h
@@ -52,20 +52,25 @@
 using namespace std;
 #define MLNX_ERR_BUFF_SIZE 1024
 
-class MlnxDev {
+class MlnxDev
+{
 public:
-    MlnxDev(dev_info *devinfo, int compare_ffv);
-    MlnxDev(const char *devname, int compare_ffv);
+    MlnxDev(dev_info* devinfo, int compare_ffv);
+    MlnxDev(const char* devname, int compare_ffv);
     ~MlnxDev();
 
-    int    query();
-    int    preBurn(string mfa_file, f_prog_func prog_cb, bool burnFailsafe, bool& isTimeConsumingFixesNeeded,
-                   vector<string>& questions, f_prog_func_adv stage_prog = (f_prog_func_adv)NULL);
-    int    burn(bool&);
-    bool   clearSemaphore();
-    int    isBurnSuccess();
-    int    isQuerySuccess();
-    int    compareFWVer(const ImgVersion& ver);
+    int query();
+    int preBurn(string mfa_file,
+                f_prog_func prog_cb,
+                bool burnFailsafe,
+                bool& isTimeConsumingFixesNeeded,
+                vector<string>& questions,
+                f_prog_func_adv stage_prog = (f_prog_func_adv)NULL);
+    int burn(bool&);
+    bool clearSemaphore();
+    int isBurnSuccess();
+    int isQuerySuccess();
+    int compareFWVer(const ImgVersion& ver);
     string getLastErrMsg();
     string getLog();
     string getDevDisplayName(bool pci_if_possible = false);
@@ -78,23 +83,25 @@ class MlnxDev {
     dm_dev_id_t getDeviceType();
     string getBoardTypeId();
     dev_info* getDevInfo();
-    void   patchPsidInfo(string psid);
-    void   setDevToNeedUpdate();
-    bool   doesDevNeedUpdate();
-    void   setNoFwCtrl();
-    void   setMccSupport(bool val = true) {_mccSupport = val;};
+    void patchPsidInfo(string psid);
+    void setDevToNeedUpdate();
+    bool doesDevNeedUpdate();
+    void setNoFwCtrl();
+    void setMccSupport(bool val = true) { _mccSupport = val; };
     vector<ImgVersion> _imageVers;
     inline bool isAlignmentNeeded();
-    inline void setShifting8MBInBurnParams(bool v) {_burnParams.shift8MBIfNeeded = v;}
+    inline void setShifting8MBInBurnParams(bool v) { _burnParams.shift8MBIfNeeded = v; }
 
     bool checkExistence(vector<MlnxDev*>& devs);
-    string getUniqueId() {return _uniqueId;};
+    string getUniqueId() { return _uniqueId; };
+
 public:
     string guidPortOne;
     string guidPortTwo;
     string macPortOne;
     string macPortTwo;
-    typedef enum    {
+    typedef enum
+    {
         PORT_NA,
         PORT_IB,
         PORT_ETH
@@ -102,28 +109,31 @@ class MlnxDev {
     port_type_t portOneType;
     port_type_t portTwoType;
     bool isOnlyBase;
+
 private:
     bool InitDevFWParams(FwOperations::fw_ops_params_t& devFwParams);
     void setDeviceType(void);
-    void setGuidMac(fw_info_t &fw_query);
+    void setGuidMac(fw_info_t& fw_query);
     void _MlnxDevInit(int compare_ffv);
-    int  getImageIndex(string type);
-    int  queryFwops();
+    int getImageIndex(string type);
+    int queryFwops();
     bool OpenDev();
-    bool openImg(u_int32_t *fileBuffer, u_int32_t bufferSize);
+    bool openImg(u_int32_t* fileBuffer, u_int32_t bufferSize);
     port_type_t findPortType(int port);
     void initUniqueId();
-    bool equals(MlnxDev *dev);
-    int LockDevice(FwOperations *fwOps);
-    int UnlockDevice(FwOperations *fwOps);
+    bool equals(MlnxDev* dev);
+    int LockDevice(FwOperations* fwOps);
+    int UnlockDevice(FwOperations* fwOps);
+
 private:
-    typedef enum    {
+    typedef enum
+    {
         INIT_DEVINFO,
         INIT_DEVNAME
     } init_type_t;
 
     init_type_t _init_type;
-    dev_info *_devinfo;
+    dev_info* _devinfo;
     string _devname;
     int _querySuccess;
     int _burnSuccess;
@@ -134,15 +144,15 @@ class MlnxDev {
     string _errMsg;
     string _boardTypeId;
     string _uniqueId;
-    FwOperations *_devFwOps;
-    FwOperations *_imgFwOps;
+    FwOperations* _devFwOps;
+    FwOperations* _imgFwOps;
     FwOperations::fw_ops_params_t _devFwParams;
     FwOperations::fw_ops_params_t _imgFwParams;
     FwOperations::ExtBurnParams _burnParams;
     bool _imageEncrypted;
     bool _deviceEncrypted;
 
-    Commander *_commander;
+    Commander* _commander;
     char _errBuff[MLNX_ERR_BUFF_SIZE];
     int _compareFFV;
     int _ExpRomExists;
diff --git a/mlxfwupdate/mlxfwmanager.cpp b/mlxfwupdate/mlxfwmanager.cpp
index d2a4fe82..a87d7e0e 100644
--- a/mlxfwupdate/mlxfwmanager.cpp
+++ b/mlxfwupdate/mlxfwmanager.cpp
@@ -33,7 +33,6 @@
  *
  */
 
-
 #include "mlxfwmanager.h"
 #ifdef _MSC_VER
 #include <direct.h>
@@ -44,23 +43,26 @@
 #include <algorithm>
 #include <set>
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-    try {
+    try
+    {
         return mainEntry(argc, argv);
-    } catch (runtime_error &e) {
+    }
+    catch (runtime_error& e)
+    {
         fprintf(stderr, "-E- %s\n", e.what());
         return ERR_CODE_SERVER_RETRIEVE_FAIL;
     }
 }
-int mainEntry(int argc, char *argv[])
+int mainEntry(int argc, char* argv[])
 {
     int res = 0;
     config_t config;
     bool early_cleanup = true;
     bool os_valid;
     int rc, rc0;
-    vector<string>  dev_names;
+    vector<string> dev_names;
     vector<MlnxDev*> devs;
     CmdLineParams cmd_params;
     string arch = "";
@@ -74,11 +76,11 @@ int mainEntry(int argc, char *argv[])
     vector<dm_dev_id_t> dev_types_list;
     vector<string> downloaded_files_names;
     vector<string> mfa_list;
-    vector <string> urls_links;
+    vector<string> urls_links;
     string mpath;
     int err_continue = 0;
     int devs_num = 0;
-    dev_info *devsinfo = NULL;
+    dev_info* devsinfo = NULL;
     string strbuf;
     OutputFmts outfmts;
     PsidLookupDB psidLookupDB;
@@ -89,69 +91,82 @@ int mainEntry(int argc, char *argv[])
     string logDir;
     int (*progressCB)(int);
     int (*advProgressCB)(int, const char*, prog_t, void*);
-    ServerRequest *srq = NULL;
+    ServerRequest* srq = NULL;
     initHandler();
     CmdLineParser cmdParser(&cmd_params, argv, argc);
     logDir = getLogDir(toolName);
-    //parse command line args
-    if (!cmdParser.parse(argv, argc)) {
+    // parse command line args
+    if (!cmdParser.parse(argv, argc))
+    {
         res = ERR_CODE_BAD_CMD_ARGS;
         string cmdLine = "";
-        for (int i = 1; i < argc; ++i) {
-            if (cmdLine.length()) {
+        for (int i = 1; i < argc; ++i)
+        {
+            if (cmdLine.length())
+            {
                 cmdLine += " ";
             }
             cmdLine += argv[i];
         }
         return res;
     }
-    if (!initConfig(config, argv, cmd_params)) {
+    if (!initConfig(config, argv, cmd_params))
+    {
         res = ERR_CODE_BAD_INI_FILE;
         return res;
     }
 
-    if (!checkCmdParams(cmd_params, config)) {
+    if (!checkCmdParams(cmd_params, config))
+    {
         res = ERR_CODE_BAD_CMD_ARGS;
         return res;
     }
-    if (cmd_params.calc_crc) {
-        if (config.mfa_path == ".") {
+    if (cmd_params.calc_crc)
+    {
+        if (config.mfa_path == ".")
+        {
             fprintf(stderr, "-E- Bad command line arguments, image file is mandatory\n");
             return ERR_CODE_BAD_CMD_ARGS;
         }
-        return CalcFileCrc((char* )config.mfa_path.c_str());
+        return CalcFileCrc((char*)config.mfa_path.c_str());
     }
 
-    if (isServerRequestorRequired(cmd_params)) {
-        srq = new ServerRequest(cmd_params.server_url.c_str(),
-                                cmd_params.proxy.c_str(), cmd_params.compare_ffv,
-                                cmd_params.show_progress, cmd_params.download_key,
-                                cmd_params.certificate, cmd_params.numberOfRetrials);
-        if (srq == NULL) {
+    if (isServerRequestorRequired(cmd_params))
+    {
+        srq = new ServerRequest(cmd_params.server_url.c_str(), cmd_params.proxy.c_str(), cmd_params.compare_ffv,
+                                cmd_params.show_progress, cmd_params.download_key, cmd_params.certificate,
+                                cmd_params.numberOfRetrials);
+        if (srq == NULL)
+        {
             res = ERR_CODE_MEM_ALLOC_FAIL;
             return res;
         }
     }
-    if (cmd_params.query_device || cmd_params.query_device_xml) {
+    if (cmd_params.query_device || cmd_params.query_device_xml)
+    {
         cmd_params.update_fw = 0;
     }
 
-    if (cmd_params.query_device_xml) {
+    if (cmd_params.query_device_xml)
+    {
         cmd_params.write_xml = true;
     }
 
-    if (cmd_params.device_names.size() != 0 && cmd_params.write_xml && !cmd_params.query_device_xml) {
+    if (cmd_params.device_names.size() != 0 && cmd_params.write_xml && !cmd_params.query_device_xml)
+    {
         fprintf(stdout, "-W- XML is not functional when -d is used in  command line\n");
     }
     progressCB = progressCB_nodisplay;
     advProgressCB = NULL;
-    if (cmd_params.show_progress) {
+    if (cmd_params.show_progress)
+    {
         progressCB = progressCB_display;
-        advProgressCB = (f_prog_func_adv) & advProgressFunc_display;
+        advProgressCB = (f_prog_func_adv)&advProgressFunc_display;
     }
 
     formatted_output = cmd_params.write_xml;
-    if (cmd_params.use_output_file) {
+    if (cmd_params.use_output_file)
+    {
         strbuf = adjustRelPath(cmd_params.output_file, config.adjuster_path);
     }
 
@@ -159,208 +174,265 @@ int mainEntry(int argc, char *argv[])
 
     outfmts.setForceModeParam(cmd_params.force_update);
 
-    if (cmd_params.use_output_file) {
+    if (cmd_params.use_output_file)
+    {
         outFileName = adjustRelPath(cmd_params.output_file, config.adjuster_path);
         FOut = createOutFile(outFileName, true);
-        if (FOut == NULL) {
+        if (FOut == NULL)
+        {
             fprintf(stderr, "-E- Failed to create an output file %s\n", outFileName.c_str());
             res = ERR_CODE_CREATE_OUTPUT_FILE_FAIL;
             goto early_err_clean_up;
         }
     }
-    if (cmd_params.download_os.length()) {
+    if (cmd_params.download_os.length())
+    {
         IS_OKAY_To_INTERRUPT = true;
         res = check_valid_os_type(cmd_params, &os_valid);
-        if (res) {
+        if (res)
+        {
             goto early_err_clean_up;
         }
-        if (!os_valid) {
-            fprintf(stderr, "-E- Invalid --download-os argument \"%s\"\n",
-                    cmd_params.download_os.c_str());
+        if (!os_valid)
+        {
+            fprintf(stderr, "-E- Invalid --download-os argument \"%s\"\n", cmd_params.download_os.c_str());
             res = ERR_CODE_INVALID_CHOICE;
             goto early_err_clean_up;
         }
         IS_OKAY_To_INTERRUPT = false;
     }
-    if (cmd_params.onlineQueryPsids.length()) {
-        if (cmd_params.queryFormat == "text") {
+    if (cmd_params.onlineQueryPsids.length())
+    {
+        if (cmd_params.queryFormat == "text")
+        {
             res = handleOnlinePsidsQuery(srq, cmd_params, config);
-        } else {
+        }
+        else
+        {
             res = handleOnlinePsidsQueryXml(srq, cmd_params, config);
         }
         goto clean_up;
     }
 
-    if (cmd_params.get_download_opt != "") {
+    if (cmd_params.get_download_opt != "")
+    {
         IS_OKAY_To_INTERRUPT = true;
         res = handleGetDownloadOptionsRequest(srq, cmd_params);
         goto early_err_clean_up;
     }
 
-    if (cmd_params.download) {
+    if (cmd_params.download)
+    {
         IS_OKAY_To_INTERRUPT = true;
         cmd_params.download_dir = adjustRelPath(cmd_params.download_dir, config.adjuster_path);
-        if (ImageAccess::hasMFAs(cmd_params.download_dir)) {
-            print_out("-W- '%s' contains MFA images which might conflict with future update on this directory\n\n", cmd_params.download_dir.c_str());
+        if (ImageAccess::hasMFAs(cmd_params.download_dir))
+        {
+            print_out("-W- '%s' contains MFA images which might conflict with future update on this directory\n\n",
+                      cmd_params.download_dir.c_str());
         }
         res = handleDownloadRequest(srq, cmd_params, config);
         goto early_err_clean_up;
     }
 
-    //Listing of binary files content
-    if (cmd_params.list_file_contents) {
+    // Listing of binary files content
+    if (cmd_params.list_file_contents)
+    {
         res = list_files_content(config);
         goto clean_up;
     }
 
-    if (cmd_params.extract_all) {
+    if (cmd_params.extract_all)
+    {
         IS_OKAY_To_INTERRUPT = true;
         res = extract_all(cmd_params, config, srq);
         goto clean_up;
     }
 
-    if (cmd_params.extract_image) {
+    if (cmd_params.extract_image)
+    {
         res = extract_image(cmd_params, config, srq);
-        if (cmd_params.update_online) {
+        if (cmd_params.update_online)
+        {
             RemoveDir(config.mfa_path);
         }
         goto clean_up;
     }
 
-    if ((cmd_params.device_names.size() == 0 || cmd_params.device_names.size() > 1) &&
-        cmd_params.clear_semaphore) {
+    if ((cmd_params.device_names.size() == 0 || cmd_params.device_names.size() > 1) && cmd_params.clear_semaphore)
+    {
         print_err("-E- Please specify a device to clear semaphore for.\n");
         res = ERR_CODE_CLEAR_SEMAPORE;
         goto clean_up;
     }
-    if ((cmd_params.device_names.size() == 0 || cmd_params.device_names.size() > 1) &&
-        !cmd_params.burnFailsafe) {
+    if ((cmd_params.device_names.size() == 0 || cmd_params.device_names.size() > 1) && !cmd_params.burnFailsafe)
+    {
         print_err("-E- Please specify a device to burn in non failsafe mode.\n");
         res = ERR_CODE_CLEAR_SEMAPORE;
         goto clean_up;
     }
-    //Open a log file
-    if (cmd_params.create_log || cmd_params.log_on_update) {
-        if (cmd_params.use_log_file) {
+    // Open a log file
+    if (cmd_params.create_log || cmd_params.log_on_update)
+    {
+        if (cmd_params.use_log_file)
+        {
             logFileName = adjustRelPath(cmd_params.log_file, config.adjuster_path);
         }
         FLog = createOutFile(logFileName, cmd_params.use_log_file);
-        if (FLog == NULL) {
-            if (!cmd_params.use_log_file) {
+        if (FLog == NULL)
+        {
+            if (!cmd_params.use_log_file)
+            {
                 fprintf(stderr, "-E- Failed to create a log file in %s\n", logDir.c_str());
-            } else {
+            }
+            else
+            {
                 fprintf(stderr, "-E- Failed to write log file %s\n", logFileName.c_str());
             }
             res = ERR_CODE_CREATE_LOG_FAIL;
             goto early_err_clean_up;
         }
-        //Print the command line to the log file
+        // Print the command line to the log file
         fprintf(FLog, "CMD: %s ", toolName.c_str());
-        for (int i = 1; i < argc; i++) {
+        for (int i = 1; i < argc; i++)
+        {
             fprintf(FLog, "%s ", argv[i]);
         }
         fprintf(FLog, "\n");
     }
 
-    //Create Dev list
-    if (cmd_params.device_names.size() != 0) {
+    // Create Dev list
+    if (cmd_params.device_names.size() != 0)
+    {
         devs_num = cmd_params.device_names.size();
-    } else {
+    }
+    else
+    {
         devs_num = getLocalDevices(&devsinfo);
-        if (devs_num == 0) {
+        if (devs_num == 0)
+        {
             res = ERR_CODE_NO_DEVICES_FOUND;
             res = mapRetValue(res, config.setupType);
-            if (cmd_params.write_xml) {
-                //devs and psidLookupDB are both empty here
+            if (cmd_params.write_xml)
+            {
+                // devs and psidLookupDB are both empty here
                 outfmts.createInventoryXML(devs, psidLookupDB, res, getErrStr(res), strbuf, cmd_params.use_output_file);
-                if (!cmd_params.use_output_file) {
+                if (!cmd_params.use_output_file)
+                {
                     printf("%s", strbuf.c_str());
                 }
-            } else {
-                #if  defined(ONLY_PCI_FORMAT) || defined(__WIN__)
+            }
+            else
+            {
+#if defined(ONLY_PCI_FORMAT) || defined(__WIN__)
                 print_err("-E- No devices found or specified\n");
-                #else
-                print_err("-E- No devices found or specified, mst might be stopped, run 'mst start' to load MST modules\n");
-                #endif
+#else
+                print_err(
+                  "-E- No devices found or specified, mst might be stopped, run 'mst start' to load MST modules\n");
+#endif
             }
             goto clean_up;
-        } else if (devs_num < 0) {
+        }
+        else if (devs_num < 0)
+        {
             print_err("-E- Failed to retrieve device(s) names\n");
             res = ERR_CODE_FETCH_LOCAL_DEVICES_FAIL;
             goto clean_up;
         }
     }
 
-    //Read Lookup file
-    if (cmd_params.use_lookup_file) {
+    // Read Lookup file
+    if (cmd_params.use_lookup_file)
+    {
         psidLookupDB.readFile(adjustRelPath(cmd_params.lookup_file, config.adjuster_path));
     }
 
-    //Query all Devs
+    // Query all Devs
     print_out("Querying Mellanox devices firmware ...\n");
-    for (int i = 0; i < devs_num; i++) {
-        MlnxDev *dev;
-        if (cmd_params.device_names.size()) {
+    for (int i = 0; i < devs_num; i++)
+    {
+        MlnxDev* dev;
+        if (cmd_params.device_names.size())
+        {
             dev = new MlnxDev(cmd_params.device_names[i].c_str(), cmd_params.compare_ffv);
-            if (cmd_params.clear_semaphore) {
-                if (!dev->clearSemaphore()) {
+            if (cmd_params.clear_semaphore)
+            {
+                if (!dev->clearSemaphore())
+                {
                     print_err("-E- Failed to clear semaphore : %s\n", dev->getLastErrMsg().c_str());
                     res = ERR_CODE_CLEAR_SEMAPORE;
-                } else {
+                }
+                else
+                {
                     print_out("-I- Semaphore is cleared!\n");
                     res = 0;
                 }
                 devs.push_back(dev);
                 goto early_err_clean_up;
             }
-        } else {
+        }
+        else
+        {
             dev = new MlnxDev(&devsinfo[i], cmd_params.compare_ffv);
         }
-        if (cmd_params.no_fw_ctrl) {
+        if (cmd_params.no_fw_ctrl)
+        {
             dev->setNoFwCtrl();
         }
         dev->query();
-        if (!dev->isQuerySuccess()) {
+        if (!dev->isQuerySuccess())
+        {
             res = ERR_CODE_QUERY_FAILED;
-        } else {
+        }
+        else
+        {
             dev->patchPsidInfo(psidLookupDB.getPsid(dev->getBoardTypeId()));
-            if (cmd_params.use_lookup_file && !psidLookupDB.isPsidExist(dev->getPsid())) {
+            if (cmd_params.use_lookup_file && !psidLookupDB.isPsidExist(dev->getPsid()))
+            {
                 delete dev;
                 continue;
             }
         }
-        if (dev->checkExistence(devs) == true) {
+        if (dev->checkExistence(devs) == true)
+        {
             delete dev;
             continue;
         }
         devs.push_back(dev);
     }
-    if (!devs.size()) {
+    if (!devs.size())
+    {
         print_out("-W- No devices found that match lookup file\n");
     }
-    //Get unique PSID list
+    // Get unique PSID list
     getUniquePsidList(devs, psid_list, dev_types_list, fw_version_list);
 
-    //Query MFAs
-    if (psid_list.size() > 0) {
+    // Query MFAs
+    if (psid_list.size() > 0)
+    {
         mpath = config.mfa_path;
-        if (cmd_params.update_online) {
-            if (CreateTempDir(mpath, config.mfa_path) < 0) {
+        if (cmd_params.update_online)
+        {
+            if (CreateTempDir(mpath, config.mfa_path) < 0)
+            {
                 print_err("-E- Could not create Temp Directory for update\n");
                 res = 1;
                 goto early_err_clean_up;
             }
             mpath = config.mfa_path;
-        } else if (cmd_params.use_mfa_file) {
+        }
+        else if (cmd_params.use_mfa_file)
+        {
             mpath = adjustRelPath(cmd_params.mfa_file, config.adjuster_path);
         }
-        rc = queryMFAs(srq, mpath, psid_list, dev_types_list, psidUpdateInfo, cmd_params.update_online, errorMsg, fw_version_list);
-        if (rc < 0) {
-            //print_err("-E- No relevant image files or info could be found\n");
+        rc = queryMFAs(srq, mpath, psid_list, dev_types_list, psidUpdateInfo, cmd_params.update_online, errorMsg,
+                       fw_version_list);
+        if (rc < 0)
+        {
+            // print_err("-E- No relevant image files or info could be found\n");
             err_continue++;
         }
 
-        //Get required list of MFAs to download/burn
+        // Get required list of MFAs to download/burn
         getUniqueMFAList(devs, psidUpdateInfo, cmd_params.force_update, mfa_list, downloaded_files_names);
     }
 
@@ -376,26 +448,31 @@ int mainEntry(int argc, char *argv[])
                                       errorMsg,
                                       cmd_params);
 
-
-    //Error codes returned from checkAndDisplay...
+    // Error codes returned from checkAndDisplay...
     res = rc;
-    if (cmd_params.query_device_xml) {
+    if (cmd_params.query_device_xml)
+    {
         xml_query = "<Devices>\n" + xml_query + "\n</Devices>";
         print_out_xml("%s\n", xml_query.c_str());
         goto clean_up;
-    } else if (cmd_params.query_device && !cmd_params.write_xml) {
+    }
+    else if (cmd_params.query_device && !cmd_params.write_xml)
+    {
         goto clean_up;
     }
 
-
-    if (!cmd_params.update_fw || (cmd_params.update_fw && cmd_params.write_xml &&
-                                  (cmd_params.query_device || cmd_params.yes_no_ != 1))) {
-        if (!res) {
+    if (!cmd_params.update_fw ||
+        (cmd_params.update_fw && cmd_params.write_xml && (cmd_params.query_device || cmd_params.yes_no_ != 1)))
+    {
+        if (!res)
+        {
             res = rc;
         }
-        if (cmd_params.write_xml && cmd_params.device_names.size() == 0) {
+        if (cmd_params.write_xml && cmd_params.device_names.size() == 0)
+        {
             outfmts.createInventoryXML(devs, psidLookupDB, res, getErrStr(res), strbuf, cmd_params.use_output_file);
-            if (!cmd_params.use_output_file) {
+            if (!cmd_params.use_output_file)
+            {
                 printf("%s", strbuf.c_str());
             }
         }
@@ -403,226 +480,286 @@ int mainEntry(int argc, char *argv[])
     }
     print_out("\n");
 
-    //Update devices FW
-    //rc = 0;
+    // Update devices FW
+    // rc = 0;
     burn_cnt = 0;
     burn_success_cnt = 0;
     status_strings.resize(devs.size() + 1);
 
-    for (int i = 0; i < (int)devs.size(); i++) {
-        if (!devs[i]->isQuerySuccess()) {
+    for (int i = 0; i < (int)devs.size(); i++)
+    {
+        if (!devs[i]->isQuerySuccess())
+        {
             status_strings[i] = "Device query failed";
             err_continue++;
             continue;
         }
-        if (psidUpdateInfo.find(devs[i]->getPsid()) == psidUpdateInfo.end()) {
+        if (psidUpdateInfo.find(devs[i]->getPsid()) == psidUpdateInfo.end())
+        {
             status_strings[i] = "Error - no matching image found";
             err_continue++;
             continue;
         }
-        if (psidUpdateInfo[devs[i]->getPsid()].found != 1) {
+        if (psidUpdateInfo[devs[i]->getPsid()].found != 1)
+        {
             status_strings[i] = "Error - no matching image found";
             err_continue++;
             continue;
         }
-        if (!cmd_params.force_update) {
-            if (!devs[i]->doesDevNeedUpdate()) {
+        if (!cmd_params.force_update)
+        {
+            if (!devs[i]->doesDevNeedUpdate())
+            {
                 status_strings[i] = "Up to date";
                 continue;
             }
         }
         require_update_cnt++;
     }
-    if (!cmd_params.force_update) {
-        if (require_update_cnt != 0) {
+    if (!cmd_params.force_update)
+    {
+        if (require_update_cnt != 0)
+        {
             int answer = prompt("Perform FW update? [y/N]: ", cmd_params.yes_no_);
-            if (!answer) {
+            if (!answer)
+            {
                 print_out("No updates performed\n");
-                //res = rc;
+                // res = rc;
                 goto clean_up;
             }
-        } else {
+        }
+        else
+        {
             goto early_err_clean_up;
         }
     }
 
-    if (cmd_params.update_online && require_update_cnt) {
-        //Download relevant files
-        if (mfa_list.size() > 0) {
+    if (cmd_params.update_online && require_update_cnt)
+    {
+        // Download relevant files
+        if (mfa_list.size() > 0)
+        {
             print_out("\n");
-            vector <string> dummy;
-            rc = download(srq, mfa_list, downloaded_files_names,
-                          dummy, config.mfa_path, false);
-            if (rc < 0) {
+            vector<string> dummy;
+            rc = download(srq, mfa_list, downloaded_files_names, dummy, config.mfa_path, false);
+            if (rc < 0)
+            {
                 res = ERR_CODE_SERVER_RETRIEVE_FAIL;
                 goto clean_up;
             }
         }
     }
-    for (int i = 0; i < (int)devs.size(); i++) {
-        if (status_strings[i].size() != 0) {
+    for (int i = 0; i < (int)devs.size(); i++)
+    {
+        if (status_strings[i].size() != 0)
+        {
             print_out("Device #%d: %s\n", (i + 1), status_strings[i].c_str());
             continue;
-        } else {
+        }
+        else
+        {
             print_out("Device #%d: %s", (i + 1), "Updating FW ...     \n");
         }
         burn_cnt++;
         string mfa_file = config.mfa_path;
         string tmp = psidUpdateInfo[devs[i]->getPsid()].url;
-        if (!cmd_params.use_mfa_file) {
+        if (!cmd_params.use_mfa_file)
+        {
             size_t pos = tmp.rfind("/");
-            if (pos != string::npos) {
+            if (pos != string::npos)
+            {
                 tmp = tmp.substr(pos + 1);
             }
             mfa_file += "/";
             mfa_file += tmp;
-        } else {
+        }
+        else
+        {
             mfa_file = tmp;
         }
         bool imageWasCached = false;
         vector<string> questions;
         bool isTimeConsumingFixesNeeded = false;
-        rc0 = devs[i]->preBurn(mfa_file, progressCB, cmd_params.burnFailsafe,
-                               isTimeConsumingFixesNeeded, questions, advProgressCB);
-        if (rc0) {
-            if (abort_request) {
+        rc0 = devs[i]->preBurn(mfa_file, progressCB, cmd_params.burnFailsafe, isTimeConsumingFixesNeeded, questions,
+                               advProgressCB);
+        if (rc0)
+        {
+            if (abort_request)
+            {
                 print_out("\b\b\b\bInterrupted\n");
                 res = ERR_CODE_INTERRUPTED;
                 devs[i]->clearSemaphore();
                 goto early_err_clean_up;
-            } else {
+            }
+            else
+            {
                 print_out("\b\b\b\bFail : %s \n", devs[i]->getLastErrMsg().c_str());
             }
-        } else {
-            for (unsigned int questionIndex = 0; questionIndex < questions.size(); questionIndex++) {
+        }
+        else
+        {
+            for (unsigned int questionIndex = 0; questionIndex < questions.size(); questionIndex++)
+            {
                 print_out("%s", questions[questionIndex].c_str());
                 int answer = prompt("Perform update? [y/N]: ", cmd_params.yes_no_);
-                if (!answer) {
+                if (!answer)
+                {
                     print_out("No updates performed\n");
                     goto clean_up;
                 }
             }
-            if (isTimeConsumingFixesNeeded) {
+            if (isTimeConsumingFixesNeeded)
+            {
                 print_out("Preparing...\n");
             }
             rc0 = devs[i]->burn(imageWasCached);
-            if (!rc0) {
+            if (!rc0)
+            {
                 print_out("\b\b\b\bDone\n");
                 burn_success_cnt++;
-                if (imageWasCached) {
+                if (imageWasCached)
+                {
                     print_out("Image was successfully cached by driver.\n");
                 }
-            } else {
-                if (abort_request) {
+            }
+            else
+            {
+                if (abort_request)
+                {
                     print_out("\b\b\b\bInterrupted\n");
                     res = ERR_CODE_INTERRUPTED;
                     devs[i]->clearSemaphore();
                     goto early_err_clean_up;
-                } else {
+                }
+                else
+                {
                     print_out("\b\b\b\bFail : %s \n", devs[i]->getLastErrMsg().c_str());
                 }
             }
         }
         rc |= rc0;
-        if (FLog != NULL) {
+        if (FLog != NULL)
+        {
             fprintf(FLog, "%s\n", devs[i]->getLog().c_str());
         }
     }
 
-    if (burn_cnt > 0) {
-        if (rc) {
+    if (burn_cnt > 0)
+    {
+        if (rc)
+        {
             res = ERR_CODE_PROG_FAILED;
         }
     }
 
-    if (burn_success_cnt > 0) {
+    if (burn_success_cnt > 0)
+    {
         print_out("\nRestart needed for updates to take effect.\n");
     }
-    if (err_continue > 0) {
-        res = 255; //errors were encountered
+    if (err_continue > 0)
+    {
+        res = 255; // errors were encountered
         print_err("-E- One or more errors were encountered.\n");
     }
-    if (burn_success_cnt > 0 && ((burn_success_cnt < burn_cnt) || (err_continue > 0))) {
-        res = 254; //At least one device was burnt successfully, a failure was encountered at least on other device
+    if (burn_success_cnt > 0 && ((burn_success_cnt < burn_cnt) || (err_continue > 0)))
+    {
+        res = 254; // At least one device was burnt successfully, a failure was encountered at least on other device
     }
 
-    if (cmd_params.update_online && require_update_cnt) { //
+    if (cmd_params.update_online && require_update_cnt)
+    { //
         RemoveDir(config.mfa_path);
     }
-    if (cmd_params.write_xml && cmd_params.device_names.size() == 0) {
+    if (cmd_params.write_xml && cmd_params.device_names.size() == 0)
+    {
         outfmts.createBurnXML(devs, psidUpdateInfo, psidLookupDB, strbuf, cmd_params.use_output_file, CompareFFV);
-        if (!cmd_params.use_output_file) {
+        if (!cmd_params.use_output_file)
+        {
             printf("%s", strbuf.c_str());
         }
     }
 
 clean_up:
-    //Add clean up for devices in devs vector
+    // Add clean up for devices in devs vector
     early_cleanup = false;
 early_err_clean_up:
-    if (early_cleanup) {
-        if (cmd_params.write_xml) {
+    if (early_cleanup)
+    {
+        if (cmd_params.write_xml)
+        {
             outfmts.createFailXML(res, cmd_params.update_fw, strbuf, cmd_params.use_output_file);
-            if (!cmd_params.use_output_file) {
+            if (!cmd_params.use_output_file)
+            {
                 printf("%s", strbuf.c_str());
             }
         }
     }
-    if (srq != NULL) {
+    if (srq != NULL)
+    {
         delete srq;
     }
-    if (FLog != NULL) {
+    if (FLog != NULL)
+    {
         fclose(FLog);
-        if (((burn_cnt && cmd_params.log_on_update) || cmd_params.create_log) && !cmd_params.write_xml) {
+        if (((burn_cnt && cmd_params.log_on_update) || cmd_params.create_log) && !cmd_params.write_xml)
+        {
             printf("Log File: %s\n", logFileName.c_str());
-        } else {
-            //delete log
+        }
+        else
+        {
+            // delete log
             unlink(logFileName.c_str());
         }
     }
 
-    if (cmd_params.use_output_file) {
-        if (FOut != NULL) {
+    if (cmd_params.use_output_file)
+    {
+        if (FOut != NULL)
+        {
             fclose(FOut);
         }
     }
 
     mdevices_info_destroy(devsinfo, devs_num);
 
-    for (int i = 0; i < (int)devs.size(); i++) {
+    for (int i = 0; i < (int)devs.size(); i++)
+    {
         delete devs[i];
     }
     return mapRetValue(res, config.setupType);
 }
 
-int extract_all(CmdLineParams &cmd_params, config_t &config, ServerRequest *srq)
+int extract_all(CmdLineParams& cmd_params, config_t& config, ServerRequest* srq)
 {
-
     ImageAccess imgacc(CompareFFV);
     vector<PsidQueryItem> items;
     string fpath = cmd_params.mfa_file;
-    if (fpath == "") {
+    if (fpath == "")
+    {
         print_err("-E- Please specify image file to extract, use -i option\n");
         return -1;
     }
-    //TODO: list content by image type
+    // TODO: list content by image type
     int rc = imgacc.get_file_content(fpath, items);
-    if (rc) {
+    if (rc)
+    {
         print_err("-E- Error parsing file: %s\n", fpath.c_str());
         return -1;
     }
     print_out("-I- Please wait while extracting images ...\n");
-    for (unsigned int i = 0; i < items.size(); i++) {
+    for (unsigned int i = 0; i < items.size(); i++)
+    {
         cmd_params.psid = items[i].psid;
         rc = extract_image(cmd_params, config, srq, true);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
     }
     print_out("\n-I- %d image are extracted successfully\n", (int)items.size());
     return rc;
 }
-int extract_image(CmdLineParams &cmd_params, config_t &config, ServerRequest *srq, bool useExtractDir)
+int extract_image(CmdLineParams& cmd_params, config_t& config, ServerRequest* srq, bool useExtractDir)
 {
     map<string, PsidQueryItem> psidUpdateInfo;
     vector<string> psid_list;
@@ -632,10 +769,11 @@ int extract_image(CmdLineParams &cmd_params, config_t &config, ServerRequest *sr
     string errorMsg = "";
     int res = 0;
     int rc;
-    u_int8_t *filebuf = NULL;
+    u_int8_t* filebuf = NULL;
     ImageAccess imgacc(CompareFFV);
 
-    if (cmd_params.psid == "") {
+    if (cmd_params.psid == "")
+    {
         print_err("-E- Need to provide PSID for extraction.\n");
         res = ERR_CODE_BAD_CMD_ARGS;
         return res;
@@ -644,12 +782,15 @@ int extract_image(CmdLineParams &cmd_params, config_t &config, ServerRequest *sr
     psid_list.push_back(cmd_params.psid);
     mpath = config.mfa_path;
 
-    if (cmd_params.use_mfa_file) {
+    if (cmd_params.use_mfa_file)
+    {
         mpath = adjustRelPath(cmd_params.mfa_file, config.adjuster_path);
     }
 
-    rc = queryMFAs(srq, mpath, psid_list, dev_types_list, psidUpdateInfo, cmd_params.update_online, errorMsg, fw_version_list);
-    if (rc < 0) {
+    rc = queryMFAs(srq, mpath, psid_list, dev_types_list, psidUpdateInfo, cmd_params.update_online, errorMsg,
+                   fw_version_list);
+    if (rc < 0)
+    {
         print_err("-E- Failed while reading file(s)\n");
         res = ERR_CODE_IMG_NOT_FOUND;
         return res;
@@ -657,114 +798,136 @@ int extract_image(CmdLineParams &cmd_params, config_t &config, ServerRequest *sr
     config.mfa_path = mpath;
     int cnt = psidUpdateInfo.size();
     ssize_t sza = 0;
-    if (cnt == 1) {
+    if (cnt == 1)
+    {
         string srcFile = psidUpdateInfo[cmd_params.psid].url;
         string tag = psidUpdateInfo[cmd_params.psid].selector_tag;
         sza = imgacc.getImage(srcFile.c_str(), cmd_params.psid, tag, 1, &filebuf);
-        if (sza > 0) {
+        if (sza > 0)
+        {
             string targetFile = cmd_params.target_file;
-            if (generateProductionName(targetFile, psidUpdateInfo[cmd_params.psid])) {
+            if (generateProductionName(targetFile, psidUpdateInfo[cmd_params.psid]))
+            {
                 res = ERR_CODE_WRITE_FILE_FAIL;
                 goto clean_up;
             }
 
-            if (useExtractDir) {
+            if (useExtractDir)
+            {
                 targetFile = cmd_params.extract_dir + (string)PATH_SEPARATOR + targetFile;
             }
             targetFile = adjustRelPath(targetFile, config.adjuster_path);
             print_out("Extracting image for psid: %s to %s  ...\n", cmd_params.psid.c_str(), targetFile.c_str());
-            FILE *f = fopen(targetFile.c_str(), "wb");
+            FILE* f = fopen(targetFile.c_str(), "wb");
             int sz = 0;
-            if (f != NULL) {
+            if (f != NULL)
+            {
                 sz = fwrite(filebuf, 1, sza, f);
                 fclose(f);
-                if (sz < sza) {
+                if (sz < sza)
+                {
                     print_err("-E- Failed while writing to file.\n");
                     res = ERR_CODE_WRITE_FILE_FAIL;
                 }
-            } else {
+            }
+            else
+            {
                 print_err("-E- Failed to open %s for writing.\n", targetFile.c_str());
                 res = ERR_CODE_WRITE_FILE_FAIL;
             }
             print_out("Done!\n");
-        } else {
+        }
+        else
+        {
             print_err("-E- Failed to extract image, MFA file might not have requested PSID\n");
             res = ERR_CODE_INTERNAL_ERR;
         }
-    } else if (cnt > 1) {
+    }
+    else if (cnt > 1)
+    {
         print_err("-E- More than one relevant image found. Not performing extraction!\n");
         res = ERR_CODE_IMG_NOT_FOUND;
-    } else {
+    }
+    else
+    {
         print_err("-E- NO mfa file found!\n");
         res = ERR_CODE_IMG_NOT_FOUND;
     }
 
 clean_up:
-    if (filebuf) {
+    if (filebuf)
+    {
         free(filebuf);
     }
     return res;
 }
 
-
-bool checkCmdParams(CmdLineParams &cmd_params, config_t &config)
+bool checkCmdParams(CmdLineParams& cmd_params, config_t& config)
 {
-    if (cmd_params.use_mfa_dir) {
-        if (!isDirectory(adjustRelPath(cmd_params.mfa_dir, config.adjuster_path))) {
+    if (cmd_params.use_mfa_dir)
+    {
+        if (!isDirectory(adjustRelPath(cmd_params.mfa_dir, config.adjuster_path)))
+        {
             fprintf(stderr, "-E- Can't find directory %s\n", cmd_params.mfa_dir.c_str());
             return false;
         }
     }
 
-    if ((cmd_params.download_os.length() ||
-         cmd_params.download_type.length() ||
-         cmd_params.download_dev.length()) ||
-        cmd_params.download_default) {
+    if ((cmd_params.download_os.length() || cmd_params.download_type.length() || cmd_params.download_dev.length()) ||
+        cmd_params.download_default)
+    {
         cmd_params.download = true;
     }
 
-    if (cmd_params.download) {
+    if (cmd_params.download)
+    {
         cmd_params.write_xml = 0;
-        if (!isDirectory(adjustRelPath(cmd_params.download_dir, config.adjuster_path))) {
+        if (!isDirectory(adjustRelPath(cmd_params.download_dir, config.adjuster_path)))
+        {
             fprintf(stderr, "-E- Can't find directory %s\n", cmd_params.download_dir.c_str());
             return false;
         }
     }
 
-    if (!cmd_params.download && (cmd_params.download_os.length() ||
-                                 cmd_params.download_type.length() ||
-                                 cmd_params.download_dev.length())) {
+    if (!cmd_params.download &&
+        (cmd_params.download_os.length() || cmd_params.download_type.length() || cmd_params.download_dev.length()))
+    {
         fprintf(stderr, "-E- Please specify download Directory\n");
         return false;
     }
 
-    if (cmd_params.download_os.length() &&
-        cmd_params.download_type.length() &&
-        cmd_params.download_dev.length()) {
+    if (cmd_params.download_os.length() && cmd_params.download_type.length() && cmd_params.download_dev.length())
+    {
         cmd_params.download_default = true;
     }
 
-    if (cmd_params.target_file.length() && !cmd_params.extract_image) {
+    if (cmd_params.target_file.length() && !cmd_params.extract_image)
+    {
         fprintf(stderr, "-E- Please use --extract option along with extract file\n");
         return false;
     }
-    if (cmd_params.use_lookup_file) {
+    if (cmd_params.use_lookup_file)
+    {
         cmd_params.lookup_file = adjustRelPath(cmd_params.lookup_file, config.adjuster_path);
-        if (!isFile(cmd_params.lookup_file)) {
+        if (!isFile(cmd_params.lookup_file))
+        {
             fprintf(stderr, "-E- Can't find file %s\n", cmd_params.lookup_file.c_str());
             return false;
         }
-
     }
-    if (cmd_params.use_mfa_file) {
-        if (!isFile(adjustRelPath(cmd_params.mfa_file, config.adjuster_path))) {
+    if (cmd_params.use_mfa_file)
+    {
+        if (!isFile(adjustRelPath(cmd_params.mfa_file, config.adjuster_path)))
+        {
             fprintf(stderr, "-E- Can't find file %s\n", cmd_params.mfa_file.c_str());
             return false;
         }
     }
-    if (cmd_params.onlineQueryPsids.length() || cmd_params.download || cmd_params.update_online) {
+    if (cmd_params.onlineQueryPsids.length() || cmd_params.download || cmd_params.update_online)
+    {
         cmd_params.certificate = adjustRelPath(cmd_params.certificate, config.adjuster_path);
-        if (!isFile(cmd_params.certificate)) {
+        if (!isFile(cmd_params.certificate))
+        {
             fprintf(stderr, "-E- Can't find Certificate %s\n", cmd_params.certificate.c_str());
             return false;
         }
@@ -772,24 +935,30 @@ bool checkCmdParams(CmdLineParams &cmd_params, config_t &config)
     return true;
 }
 
-
 string adjustRelPath(string path, string adjuster)
 {
     string tmp;
-    if ((path.size() == 0) || (adjuster.size() == 0)) {
+    if ((path.size() == 0) || (adjuster.size() == 0))
+    {
         return path;
     }
 
 #if defined(__WIN__)
-    if (path.find("\\") == std::string::npos) {
+    if (path.find("\\") == std::string::npos)
+    {
         ;
-    } else if (path[0] == '.') {
+    }
+    else if (path[0] == '.')
+    {
         ;
-    } else {
+    }
+    else
+    {
         return path;
     }
 #else
-    if (path[0] == '/') {
+    if (path[0] == '/')
+    {
         return path;
     }
 #endif
@@ -802,10 +971,13 @@ string adjustRelPath(string path, string adjuster)
     tmp = result;
     return tmp;
 #else
-    char *result;
-    if ((result = realpath(tmp.c_str(), NULL)) == NULL) {
+    char* result;
+    if ((result = realpath(tmp.c_str(), NULL)) == NULL)
+    {
         return tmp;
-    } else {
+    }
+    else
+    {
         tmp.assign(result);
         free(result);
         return tmp;
@@ -815,35 +987,43 @@ string adjustRelPath(string path, string adjuster)
 
 bool isServerRequestorRequired(CmdLineParams& cmd_params)
 {
-    return ( cmd_params.download ||
-             cmd_params.onlineQueryPsids.length() ||
-             cmd_params.update_online ||
-             cmd_params.get_download_opt.length() );
+    return (cmd_params.download || cmd_params.onlineQueryPsids.length() || cmd_params.update_online ||
+            cmd_params.get_download_opt.length());
 }
 
-int download(ServerRequest *srq, vector<string> &url,
-             vector <string>&fileNames, vector <string>&os,
-             string orgPath, bool show_location)
+int download(ServerRequest* srq,
+             vector<string>& url,
+             vector<string>& fileNames,
+             vector<string>& os,
+             string orgPath,
+             bool show_location)
 {
     int res = 0;
     int rc;
     string error;
     string path = orgPath;
     string newFileName = "";
-    if (show_location) {
+    if (show_location)
+    {
         print_out("Please wait while downloading Files to : '%s'\n", path.c_str());
-    } else {
+    }
+    else
+    {
         IS_OKAY_To_INTERRUPT = true;
         print_out("Please wait while downloading MFA(s) ... ");
     }
-    for (unsigned i = 0; i < url.size(); i++) {
-        if (show_location) {
+    for (unsigned i = 0; i < url.size(); i++)
+    {
+        if (show_location)
+        {
             path = orgPath;
             newFileName = fileNames[i];
-            if (os[i] != "all") {
+            if (os[i] != "all")
+            {
                 path = path + PATH_SEPARATOR + os[i];
                 newFileName = path + PATH_SEPARATOR + newFileName;
-                if ((rc = MkDir(path)) != 0 && rc != EEXIST) {
+                if ((rc = MkDir(path)) != 0 && rc != EEXIST)
+                {
                     error += "-E- Failed to download " + newFileName + " " + strerror(rc) + "\n";
                     print_out("\t%d - %s : Failed\n", i, (os[i] + PATH_SEPARATOR + fileNames[i]).c_str());
                     res--;
@@ -853,84 +1033,100 @@ int download(ServerRequest *srq, vector<string> &url,
             }
             print_out("\t%d - %s : ...", i, (newFileName).c_str());
         }
-        if ((rc = srq->download(url[i], path))) {
+        if ((rc = srq->download(url[i], path)))
+        {
             string errmsg;
             int errnum;
             srq->getError(errnum, errmsg);
-            if (show_location) {
+            if (show_location)
+            {
                 error += "-E- Failed to download " + fileNames[i] + ", Error :" + errmsg + "\n";
-            } else {
+            }
+            else
+            {
                 error = "-E- Failed to download MFA file(s) from server, Error : " + errmsg + "\n";
             }
             res--;
         }
 
-        if (show_location) {
+        if (show_location)
+        {
             print_out("%s\n", (rc == 0) ? "\b\b\b\b Done" : "\b\b\b\b Failed");
         }
     }
     print_out("\n");
-    if (!show_location) {
+    if (!show_location)
+    {
         IS_OKAY_To_INTERRUPT = false;
     }
 
-    if (res) {
+    if (res)
+    {
         print_err("%s\n", error.c_str());
     }
     return res;
 }
 
-
-int prompt(const char *str, int yes_no_)
+int prompt(const char* str, int yes_no_)
 {
     int a;
     int res = 0;
-    if (yes_no_ == -1) {
-        if (!formatted_output && (FOut == stdout)) {
+    if (yes_no_ == -1)
+    {
+        if (!formatted_output && (FOut == stdout))
+        {
             printf("%s", str);
             std::string answer;
             std::getline(std::cin, answer);
-            if (answer.length() > 0) {
+            if (answer.length() > 0)
+            {
                 a = answer[0];
-            } else {
+            }
+            else
+            {
                 a = 'n';
             }
-        } else {
+        }
+        else
+        {
             a = 'n';
         }
-    } else {
+    }
+    else
+    {
         a = (yes_no_) ? 'y' : 'n';
     }
 
-    if (a == 'y' || a == 'Y') {
+    if (a == 'y' || a == 'Y')
+    {
         res = 1;
     }
     return res;
 }
 
-
-int getLocalDevices(dev_info **devs)
+int getLocalDevices(dev_info** devs)
 {
     int len = 0;
 
     *devs = mdevices_info(MDEVS_TAVOR_CR, &len);
-    if (!len) {
+    if (!len)
+    {
         return 0;
     }
     return len;
 }
 
-
-int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
-                                 map<string, PsidQueryItem> &psidUpdateInfo,
-                                 PsidLookupDB &psidLookupDB, int update_query_,
+int checkAndDisplayDeviceQuery1D(vector<MlnxDev*>& devs,
+                                 map<string, PsidQueryItem>& psidUpdateInfo,
+                                 PsidLookupDB& psidLookupDB,
+                                 int update_query_,
                                  int img_path_provided,
                                  int force_update,
                                  bool is_query,
                                  bool is_query_xml,
-                                 string &xml_query,
-                                 string &errorMsg,
-                                 CmdLineParams &cmd_params)
+                                 string& xml_query,
+                                 string& errorMsg,
+                                 CmdLineParams& cmd_params)
 {
     unsigned w;
     int res = 0;
@@ -946,16 +1142,18 @@ int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
     string xml_output = "";
     string tmpstr;
     print_out("\n");
-    if (devs.size() > 0) {
+    if (devs.size() > 0)
+    {
         w = 14;
         sprintf(fmtdev, "%%-%ds", w + 3);
     }
 
-    for (int i = 0; i < (int)devs.size(); i++) {
+    for (int i = 0; i < (int)devs.size(); i++)
+    {
         map<string, bool> expRomTypes;
         map<string, int> devRomTypeIndex;
         map<string, int> availRomTypeIndex;
-        string devname    = devs[i]->getDevDisplayName();
+        string devname = devs[i]->getDevDisplayName();
         string deviceType = devs[i]->getDeviceTypeStr();
         string description;
         string pn = "--";
@@ -966,24 +1164,35 @@ int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
         bool multiple_images_found = false;
         string statusStr;
         bool device_has_unknown_expansionRom = false;
-        bool image_has_unknown_expansionRom  = false;
-        if (devs[i]->isQuerySuccess()) {
+        bool image_has_unknown_expansionRom = false;
+        if (devs[i]->isQuerySuccess())
+        {
             devQuerySuccess = true;
             pn = devs[i]->getPartNumber();
-            if (pn.length()) {
-                ;;
-            } else if (psidLookupDB.getPN(devs[i]->getBoardTypeId()) != "") {
+            if (pn.length())
+            {
+                ;
+                ;
+            }
+            else if (psidLookupDB.getPN(devs[i]->getBoardTypeId()) != "")
+            {
                 pn = psidLookupDB.getPN(devs[i]->getBoardTypeId());
-            } else {
-                if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end()) {
+            }
+            else
+            {
+                if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end())
+                {
                     pn = psidUpdateInfo[devs[i]->getPsid()].pns;
-                } else {
+                }
+                else
+                {
                     pn = "";
                 }
             }
 
             ver = devs[i]->getFWVersion(false);
-            for (unsigned int j = 0; j < devs[i]->_imageVers.size(); j++) {
+            for (unsigned int j = 0; j < devs[i]->_imageVers.size(); j++)
+            {
                 expRomTypes[devs[i]->_imageVers[j].getTypeStr()] = true;
                 devRomTypeIndex[devs[i]->_imageVers[j].getTypeStr()] = j;
                 availRomTypeIndex[devs[i]->_imageVers[j].getTypeStr()] = -1;
@@ -992,26 +1201,33 @@ int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
             availVer = "N/A";
             description = devs[i]->getDescription();
 
-            if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end()) {
-                if (!description.length()) {
+            if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end())
+            {
+                if (!description.length())
+                {
                     description = psidUpdateInfo[devs[i]->getPsid()].description;
                 }
-                if (psidUpdateInfo[devs[i]->getPsid()].found) {
+                if (psidUpdateInfo[devs[i]->getPsid()].found)
+                {
                     imgFound = true;
-                    vector<ImgVersion> *imgVers = &psidUpdateInfo[devs[i]->getPsid()].imgVers;
-                    for (unsigned int j = 0; j < imgVers->size(); j++) {
+                    vector<ImgVersion>* imgVers = &psidUpdateInfo[devs[i]->getPsid()].imgVers;
+                    for (unsigned int j = 0; j < imgVers->size(); j++)
+                    {
                         expRomTypes[(*imgVers)[j].getTypeStr()] = true;
                         availRomTypeIndex[(*imgVers)[j].getTypeStr()] = j;
-                        if (devRomTypeIndex.find((*imgVers)[j].getTypeStr()) == devRomTypeIndex.end()) {
+                        if (devRomTypeIndex.find((*imgVers)[j].getTypeStr()) == devRomTypeIndex.end())
+                        {
                             devRomTypeIndex[(*imgVers)[j].getTypeStr()] = -1;
                         }
                     }
 
-                    ImgVersion *fwImgVer = (ImgVersion*)psidUpdateInfo[devs[i]->getPsid()].findImageVersion("FW");
-                    if (fwImgVer != NULL) {
+                    ImgVersion* fwImgVer = (ImgVersion*)psidUpdateInfo[devs[i]->getPsid()].findImageVersion("FW");
+                    if (fwImgVer != NULL)
+                    {
                         availVer = fwImgVer->getPrintableVersion(CompareFFV, false);
                     }
-                    if (psidUpdateInfo[devs[i]->getPsid()].found > 1) {
+                    if (psidUpdateInfo[devs[i]->getPsid()].found > 1)
+                    {
                         multiple_img_cnt++;
                         multiple_images_found = true;
                         availVer = "N/A";
@@ -1023,10 +1239,12 @@ int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
         int nKeepReasons = 0;
         int nUpdateReasons = 0;
 
-        //Check versions of FW components on device against available images for update
-        for (map<string, bool>::iterator iter = expRomTypes.begin(); iter != expRomTypes.end(); ++iter) {
-            string k =  iter->first;
-            if (k != "FW") {
+        // Check versions of FW components on device against available images for update
+        for (map<string, bool>::iterator iter = expRomTypes.begin(); iter != expRomTypes.end(); ++iter)
+        {
+            string k = iter->first;
+            if (k != "FW")
+            {
                 continue;
             }
             /*
@@ -1034,69 +1252,96 @@ int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
                 device_has_unknown_expansionRom = true;
                }
 
-               if (availRomTypeIndex[k] != -1 && psidUpdateInfo[devs[i]->getPsid()].imgVers[availRomTypeIndex[k]].isExpansionRomUnknown()) {
+               if (availRomTypeIndex[k] != -1 &&
+               psidUpdateInfo[devs[i]->getPsid()].imgVers[availRomTypeIndex[k]].isExpansionRomUnknown()) {
                 image_has_unknown_expansionRom = true;
                }*/
-            if ((devRomTypeIndex[k] != -1) && (availRomTypeIndex[k] == -1)) {
+            if ((devRomTypeIndex[k] != -1) && (availRomTypeIndex[k] == -1))
+            {
                 nKeepReasons++;
             }
-            if ((devRomTypeIndex[k] == -1) && (availRomTypeIndex[k] != -1)) {
+            if ((devRomTypeIndex[k] == -1) && (availRomTypeIndex[k] != -1))
+            {
                 nUpdateReasons++;
             }
-            if ((devRomTypeIndex[k] != -1) && (availRomTypeIndex[k] != -1)) {
-                ImgVersion *devImgVer = &devs[i]->_imageVers[devRomTypeIndex[k]];
-                ImgVersion *fileImgVer = &psidUpdateInfo[devs[i]->getPsid()].imgVers[availRomTypeIndex[k]];
+            if ((devRomTypeIndex[k] != -1) && (availRomTypeIndex[k] != -1))
+            {
+                ImgVersion* devImgVer = &devs[i]->_imageVers[devRomTypeIndex[k]];
+                ImgVersion* fileImgVer = &psidUpdateInfo[devs[i]->getPsid()].imgVers[availRomTypeIndex[k]];
 
-                //u_int16_t fwVer[3] = {3,4,141};
-                //psidUpdateInfo[devs[i]->getPsid()].imgVers[1].setVersion("PXE", 3, fwVer);
-                if (devImgVer->compareFw(*fileImgVer) < 0) {
+                // u_int16_t fwVer[3] = {3,4,141};
+                // psidUpdateInfo[devs[i]->getPsid()].imgVers[1].setVersion("PXE", 3, fwVer);
+                if (devImgVer->compareFw(*fileImgVer) < 0)
+                {
                     nUpdateReasons++;
-                } else if (devImgVer->compareFw(*fileImgVer) > 0) {
+                }
+                else if (devImgVer->compareFw(*fileImgVer) > 0)
+                {
                     nKeepReasons++;
                 }
             }
         }
 
-        //Set operation status string per device
-        if (!devQuerySuccess) {
+        // Set operation status string per device
+        if (!devQuerySuccess)
+        {
             statusStr = "Failed to open device";
-            tmpstr = "-E- Failed to query " + devs[i]->getDevDisplayName() + " device, error : " + devs[i]->getLastErrMsg() + "\n";
+            tmpstr = "-E- Failed to query " + devs[i]->getDevDisplayName() +
+                     " device, error : " + devs[i]->getLastErrMsg() + "\n";
             print_err_str += tmpstr;
             query_failed_cnt++;
             res = ERR_CODE_QUERY_FAILED;
-        } else {
+        }
+        else
+        {
             statusStr = "No matching image found";
-            if (multiple_images_found) {
+            if (multiple_images_found)
+            {
                 statusStr = "Multiple image files found";
-            } else if (device_has_unknown_expansionRom) {
+            }
+            else if (device_has_unknown_expansionRom)
+            {
                 statusStr = "Device has unknown expansion rom";
                 unknown_expansion_rom++;
-            } else if (image_has_unknown_expansionRom) {
+            }
+            else if (image_has_unknown_expansionRom)
+            {
                 statusStr = "Image has unknown expansion rom";
                 unknown_expansion_rom++;
-            } else if (imgFound) {
-                if ((nUpdateReasons > 0) && (nKeepReasons == 0)) {
+            }
+            else if (imgFound)
+            {
+                if ((nUpdateReasons > 0) && (nKeepReasons == 0))
+                {
                     statusStr = "Update required";
                     devs[i]->setDevToNeedUpdate();
                     update_cnt++;
-                } else if (force_update) {
+                }
+                else if (force_update)
+                {
                     statusStr = "Forced update required";
                     update_cnt++;
-                } else if ((nUpdateReasons > 0) && (nKeepReasons > 0)) {
+                }
+                else if ((nUpdateReasons > 0) && (nKeepReasons > 0))
+                {
                     statusStr = "N/A (Mixed versions)";
                     mixed_versions_cnt++;
-                } else if ((nUpdateReasons == 0) && (nKeepReasons >= 0)) {
+                }
+                else if ((nUpdateReasons == 0) && (nKeepReasons >= 0))
+                {
                     statusStr = "Up to date";
                 }
-
-            } else {
+            }
+            else
+            {
                 no_img_cnt++;
             }
         }
 
         pn = (pn == "") ? "N/A" : pn;
-        if (!is_query_xml) {
-            #if 0
+        if (!is_query_xml)
+        {
+#if 0
             if (!is_query) {
                 printDeviceInfo(i, devname, deviceType, pn, description,
                                 statusStr, devs, ver, availVer, expRomTypes, devRomTypeIndex,
@@ -1106,121 +1351,153 @@ int checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs,
                                      statusStr, devs, ver, availVer, expRomTypes, devRomTypeIndex,
                                      availRomTypeIndex, psidUpdateInfo, multiple_images_found);
             }
-            #endif
-            printDeviceInfoQuery(i, devname, deviceType, pn, description,
-                                 statusStr, devs, ver, availVer, expRomTypes, devRomTypeIndex,
-                                 availRomTypeIndex, psidUpdateInfo, multiple_images_found);
-
-        } else {
-            if (xml_query.length()) {
+#endif
+            printDeviceInfoQuery(i, devname, deviceType, pn, description, statusStr, devs, ver, availVer, expRomTypes,
+                                 devRomTypeIndex, availRomTypeIndex, psidUpdateInfo, multiple_images_found);
+        }
+        else
+        {
+            if (xml_query.length())
+            {
                 xml_query += "\n";
             }
-            xml_query += generateQueryXML(i, devname, deviceType, pn, description,
-                                          statusStr, devs, ver, availVer, expRomTypes, devRomTypeIndex,
-                                          availRomTypeIndex, psidUpdateInfo, multiple_images_found);
+            xml_query +=
+              generateQueryXML(i, devname, deviceType, pn, description, statusStr, devs, ver, availVer, expRomTypes,
+                               devRomTypeIndex, availRomTypeIndex, psidUpdateInfo, multiple_images_found);
         }
     }
 
-    if (is_query || is_query_xml) {
+    if (is_query || is_query_xml)
+    {
         return res;
     }
 
-    if ((update_query_ == 0) || (update_cnt == 0)) {
-        if (update_cnt) {
-            tmpstr = "Found " + int_to_string(update_cnt) + " device(s) requiring firmware update. Please use -u flag to perform the update.\n";
+    if ((update_query_ == 0) || (update_cnt == 0))
+    {
+        if (update_cnt)
+        {
+            tmpstr = "Found " + int_to_string(update_cnt) +
+                     " device(s) requiring firmware update. Please use -u flag to perform the update.\n";
             print_out_str += tmpstr;
         }
-        if (query_failed_cnt > 0) {
+        if (query_failed_cnt > 0)
+        {
             res = ERR_CODE_QUERY_FAILED;
         }
-        if (img_path_provided) {
-            if (no_img_cnt > 0) {
-                tmpstr = "-E- Could not find matching firmware images for " + int_to_string(no_img_cnt) + " device(s).\n";
+        if (img_path_provided)
+        {
+            if (no_img_cnt > 0)
+            {
+                tmpstr =
+                  "-E- Could not find matching firmware images for " + int_to_string(no_img_cnt) + " device(s).\n";
                 print_err_str += tmpstr;
                 res = ERR_CODE_IMG_NOT_FOUND;
             }
         }
-        if (unknown_expansion_rom) {
+        if (unknown_expansion_rom)
+        {
             tmpstr = "-E- Found Unknown expansion ROM  for " + int_to_string(unknown_expansion_rom) + " device(s).\n";
             print_err_str += tmpstr;
             res = ERR_CODE_UNKNOWN_EXPANSION_ROM;
         }
-        if (mixed_versions_cnt > 0) {
-            tmpstr = "-E- Found mixed component image versions for " + int_to_string(mixed_versions_cnt) + " device(s).\n";
+        if (mixed_versions_cnt > 0)
+        {
+            tmpstr =
+              "-E- Found mixed component image versions for " + int_to_string(mixed_versions_cnt) + " device(s).\n";
             print_err_str += tmpstr;
             res = ERR_CODE_MIXED_VERSIONS_FOUND;
         }
-        if (multiple_img_cnt || errorMsg.length()) {
+        if (multiple_img_cnt || errorMsg.length())
+        {
             print_err_str += errorMsg;
             res = ERR_CODE_MULTI_IMG_SRC_FOUND;
         }
 
-        if (img_path_provided && (no_img_cnt == 0) && (update_cnt == 0) && (query_failed_cnt == 0) && (multiple_img_cnt == 0) && (mixed_versions_cnt == 0) && unknown_expansion_rom == 0) {
+        if (img_path_provided && (no_img_cnt == 0) && (update_cnt == 0) && (query_failed_cnt == 0) &&
+            (multiple_img_cnt == 0) && (mixed_versions_cnt == 0) && unknown_expansion_rom == 0)
+        {
             tmpstr = "All listed device(s) firmware images are up to date.\n";
             print_out_str += tmpstr;
         }
     }
 
-    if (update_query_) {
-        if ((no_img_cnt > 0) || (multiple_img_cnt > 0)) {
-            if (no_img_cnt > 0) {
-                #if 0
+    if (update_query_)
+    {
+        if ((no_img_cnt > 0) || (multiple_img_cnt > 0))
+        {
+            if (no_img_cnt > 0)
+            {
+#if 0
                 sprintf(tmpstr, "-E- Could not find matching firmware images for %d device(s).\n", no_img_cnt);
                 print_err_str += tmpstr;
-                #endif
+#endif
                 res = ERR_CODE_IMG_NOT_FOUND;
             }
-            #if 0
+#if 0
             if (multiple_img_cnt) {
                 sprintf(tmpstr, "-E- Multiple images found for %d device(s) in the provided path.\n", multiple_img_cnt);
                 print_err_str += tmpstr;
                 res = ERR_CODE_MULTI_IMG_SRC_FOUND;
             }
-            #endif
+#endif
         }
-        if (update_cnt) {
+        if (update_cnt)
+        {
             tmpstr = "Found " + int_to_string(update_cnt) + " device(s) requiring firmware update...\n";
             print_out_str += tmpstr;
         }
     }
 
-    if (print_out_str.size() > 0) {
+    if (print_out_str.size() > 0)
+    {
         print_out("---------\n");
-        if (update_query_ == 0) {
+        if (update_query_ == 0)
+        {
             print_out("%s", print_out_str.c_str());
         }
     }
-    if (print_err_str.size() > 0) {
-        if (print_out_str.size() == 0) {
+    if (print_err_str.size() > 0)
+    {
+        if (print_out_str.size() == 0)
+        {
             print_err("---------\n");
         }
         print_err("%s", print_err_str.c_str());
     }
 
-    if (update_query_ != 0) {
-        if (print_out_str.size() > 0) {
+    if (update_query_ != 0)
+    {
+        if (print_out_str.size() > 0)
+        {
             print_out("%s", print_out_str.c_str());
         }
     }
-    (void) cmd_params;
+    (void)cmd_params;
     return res;
 }
 
-void getUniquePsidList(vector<MlnxDev*> &devs, vector<string> &psid_list,
-                       vector<dm_dev_id_t> &dev_types_list, vector<string> &fw_version_list)
+void getUniquePsidList(vector<MlnxDev*>& devs,
+                       vector<string>& psid_list,
+                       vector<dm_dev_id_t>& dev_types_list,
+                       vector<string>& fw_version_list)
 {
-    for (int i = 0; i < (int)devs.size(); i++) {
-        if (!devs[i]->isQuerySuccess()) {
+    for (int i = 0; i < (int)devs.size(); i++)
+    {
+        if (!devs[i]->isQuerySuccess())
+        {
             continue;
         }
         int found = 0;
-        for (int j = 0; j < (int)psid_list.size(); j++) {
-            if (!psid_list[j].compare(devs[i]->getPsid())) {
+        for (int j = 0; j < (int)psid_list.size(); j++)
+        {
+            if (!psid_list[j].compare(devs[i]->getPsid()))
+            {
                 found = 1;
                 break;
             }
         }
-        if (!found) {
+        if (!found)
+        {
             dev_types_list.push_back(devs[i]->getDeviceType());
             psid_list.push_back(devs[i]->getPsid());
             fw_version_list.push_back(devs[i]->getFWVersion(false, false).c_str());
@@ -1228,24 +1505,31 @@ void getUniquePsidList(vector<MlnxDev*> &devs, vector<string> &psid_list,
     }
 }
 
-
-void getUniqueMFAList(vector<MlnxDev*> &devs, map<string, PsidQueryItem> &psidUpdateInfo, int force_update, vector<string> &mfa_list, vector <string> &mfa_base_name_list)
+void getUniqueMFAList(vector<MlnxDev*>& devs,
+                      map<string, PsidQueryItem>& psidUpdateInfo,
+                      int force_update,
+                      vector<string>& mfa_list,
+                      vector<string>& mfa_base_name_list)
 {
     map<string, int> mfa2download;
-    for (int i = 0; i < (int)devs.size(); i++) {
-        if (!devs[i]->isQuerySuccess()) {
+    for (int i = 0; i < (int)devs.size(); i++)
+    {
+        if (!devs[i]->isQuerySuccess())
+        {
             continue;
         }
-        if (psidUpdateInfo.find(devs[i]->getPsid()) == psidUpdateInfo.end()) {
+        if (psidUpdateInfo.find(devs[i]->getPsid()) == psidUpdateInfo.end())
+        {
             continue;
         }
-        if (!psidUpdateInfo[devs[i]->getPsid()].found) {
+        if (!psidUpdateInfo[devs[i]->getPsid()].found)
+        {
             continue;
         }
-        if (force_update
-                || (devs[i]->compareFWVer(
-                        psidUpdateInfo[devs[i]->getPsid()].imgVers[0]) < 0)) {
-            if (mfa2download.count(psidUpdateInfo[devs[i]->getPsid()].url) == 0) {
+        if (force_update || (devs[i]->compareFWVer(psidUpdateInfo[devs[i]->getPsid()].imgVers[0]) < 0))
+        {
+            if (mfa2download.count(psidUpdateInfo[devs[i]->getPsid()].url) == 0)
+            {
                 mfa_list.push_back(psidUpdateInfo[devs[i]->getPsid()].url);
                 mfa_base_name_list.push_back(psidUpdateInfo[devs[i]->getPsid()].name);
             }
@@ -1254,307 +1538,362 @@ void getUniqueMFAList(vector<MlnxDev*> &devs, map<string, PsidQueryItem> &psidUp
     }
 }
 
-
 int isDirectory(string path)
 {
     int status;
     struct stat st;
 
     status = stat(path.c_str(), &st);
-    if (status != 0) {
+    if (status != 0)
+    {
         return 0;
     }
 
     return (S_ISDIR(st.st_mode));
 }
 
-
 int isFile(string path)
 {
     int status;
     struct stat st;
 
     status = stat(path.c_str(), &st);
-    if (status != 0) {
+    if (status != 0)
+    {
         return 0;
     }
 
     return (S_ISREG(st.st_mode));
 }
 
-
-int  getMFAListFromPSIDs(string mfa_path, vector<string> &psid_list, vector<PsidQueryItem> &results, string &errorMsg)
+int getMFAListFromPSIDs(string mfa_path, vector<string>& psid_list, vector<PsidQueryItem>& results, string& errorMsg)
 {
     int rc;
     ImageAccess imgacc(CompareFFV);
     string arch = "";
     int res = 0;
 
-    for (unsigned i = 0; i < psid_list.size(); i++) {
+    for (unsigned i = 0; i < psid_list.size(); i++)
+    {
         int _FileOrDir = 0;
         vector<PsidQueryItem> riv;
         PsidQueryItem ri;
-        if (isDirectory(mfa_path)) {
+        if (isDirectory(mfa_path))
+        {
             _FileOrDir = 1;
             rc = imgacc.queryDirPsid(mfa_path, psid_list[i], arch, 1, riv);
-            if (imgacc.getlastWarning().length()) {
+            if (imgacc.getlastWarning().length())
+            {
                 errorMsg += imgacc.getlastWarning();
             }
-        } else if (isFile(mfa_path)) {
+        }
+        else if (isFile(mfa_path))
+        {
             _FileOrDir = 2;
             rc = imgacc.queryPsid(mfa_path, psid_list[i], arch, 1, ri);
-            if (imgacc.getlastWarning().length()) {
+            if (imgacc.getlastWarning().length())
+            {
                 errorMsg += imgacc.getlastWarning();
             }
-        } else {
+        }
+        else
+        {
             errorMsg += "-E- Bad path: " + mfa_path + "\n";
             return -1;
         }
-        if (rc == 1) {
+        if (rc == 1)
+        {
             res++;
-        } else if (rc == 0) {
-            //print_err("No image files found for PSID:%s in path: %s\n", psid_list[i].c_str(), mfa_path.c_str());
-        } else if (rc == -1) {
-            //print_err("Error querying files for PSID: %s\n",psid_list[i].c_str());
+        }
+        else if (rc == 0)
+        {
+            // print_err("No image files found for PSID:%s in path: %s\n", psid_list[i].c_str(), mfa_path.c_str());
+        }
+        else if (rc == -1)
+        {
+            // print_err("Error querying files for PSID: %s\n",psid_list[i].c_str());
             return -1;
-        } else if (rc < -1) {
-            errorMsg += "-E- There are multiple image sources for device with PSID=" + psid_list[i] + " found in files:\n";
-            for (unsigned j = 0; j < riv.size(); j++) {
+        }
+        else if (rc < -1)
+        {
+            errorMsg +=
+              "-E- There are multiple image sources for device with PSID=" + psid_list[i] + " found in files:\n";
+            for (unsigned j = 0; j < riv.size(); j++)
+            {
                 errorMsg += riv[j].url + "\n";
             }
             res = -2;
         }
-        if (_FileOrDir == 1) {
-            if (riv.size() > 0) {
+        if (_FileOrDir == 1)
+        {
+            if (riv.size() > 0)
+            {
                 results.push_back(riv[0]);
             }
-        } else if (_FileOrDir == 2) {
+        }
+        else if (_FileOrDir == 2)
+        {
             results.push_back(ri);
         }
     }
     return 0;
 }
 
-
-int queryMFAs(ServerRequest *srq, string &mfa_path, vector<string> &psid_list, vector<dm_dev_id_t> &dev_types_list,
-              map<string, PsidQueryItem> &psidUpdateInfo, int online_update, string &errorMsg, vector<string> &fw_version_list)
+int queryMFAs(ServerRequest* srq,
+              string& mfa_path,
+              vector<string>& psid_list,
+              vector<dm_dev_id_t>& dev_types_list,
+              map<string, PsidQueryItem>& psidUpdateInfo,
+              int online_update,
+              string& errorMsg,
+              vector<string>& fw_version_list)
 {
     int res = -1;
     int rc = 0;
     vector<PsidQueryItem> results;
     vector<string> mfaLinks;
     vector<string> fileNames;
-    if (online_update && dev_types_list.size()) {
-        //Query online MFAs
-        if (srq->updateMFAsRequest(psid_list, dev_types_list, fw_version_list, results) < 0) {
-            //fprintf(stderr, "-E- Failed during PSID query on server.\n");
+    if (online_update && dev_types_list.size())
+    {
+        // Query online MFAs
+        if (srq->updateMFAsRequest(psid_list, dev_types_list, fw_version_list, results) < 0)
+        {
+            // fprintf(stderr, "-E- Failed during PSID query on server.\n");
             srq->getError(res, errorMsg);
             goto clean_up;
         }
         srq->getError(res, errorMsg);
-    } else {
-        //Query Local MFAs
+    }
+    else
+    {
+        // Query Local MFAs
         rc = getMFAListFromPSIDs(mfa_path, psid_list, results, errorMsg);
-        if (rc == -1) {
-            //fprintf(stderr, "-E- Failed during PSID local query.\n");
+        if (rc == -1)
+        {
+            // fprintf(stderr, "-E- Failed during PSID local query.\n");
             goto clean_up;
         }
     }
-    for (unsigned i = 0; i < results.size(); i++) {
+    for (unsigned i = 0; i < results.size(); i++)
+    {
         psidUpdateInfo[results[i].psid] = results[i];
     }
-    res = rc; //rc == 0 or rc == -2 (-2 in case of multiple sources per psid)
+    res = rc; // rc == 0 or rc == -2 (-2 in case of multiple sources per psid)
 
 clean_up:
     return res;
 }
 
-
-FILE* createOutFile(string &fileName, bool fileSpecified)
+FILE* createOutFile(string& fileName, bool fileSpecified)
 {
     int rc;
     time_t now;
-    tm *ltm;
+    tm* ltm;
     char name[100];
     unsigned pid;
     string logDir = getLogDir(toolName);
-    if (!fileSpecified) {
-        #if defined(__WIN__)
+    if (!fileSpecified)
+    {
+#if defined(__WIN__)
         pid = (unsigned)GetCurrentProcessId();
         rc = mkdir(logDir.c_str());
-        #else
+#else
         pid = (unsigned)getpid();
         rc = mkdir(logDir.c_str(), 0777);
-        #endif
-        if (rc) {
-            if (errno != EEXIST) {
+#endif
+        if (rc)
+        {
+            if (errno != EEXIST)
+            {
                 return NULL;
             }
         }
 
         now = time(0);
         ltm = localtime(&now);
-        if (ltm == NULL) {
+        if (ltm == NULL)
+        {
             return NULL;
         }
-        sprintf(name, "%s-%d%02d%02d_%02d%02d%02d_%u.log", toolName.c_str(),
-                ltm->tm_year + 1900, ltm->tm_mon + 1, ltm->tm_mday,
-                ltm->tm_hour, ltm->tm_min, ltm->tm_sec, pid);
+        sprintf(name, "%s-%d%02d%02d_%02d%02d%02d_%u.log", toolName.c_str(), ltm->tm_year + 1900, ltm->tm_mon + 1,
+                ltm->tm_mday, ltm->tm_hour, ltm->tm_min, ltm->tm_sec, pid);
 
         fileName = logDir;
-        #if defined(__WIN__)
+#if defined(__WIN__)
         fileName += "\\";
-        #else
+#else
         fileName += "/";
-        #endif
+#endif
         fileName += name;
     }
 
-    FILE *f = fopen(fileName.c_str(), "w");
+    FILE* f = fopen(fileName.c_str(), "w");
 
     return f;
 }
 
-
 int progressCB_display(int completion)
 {
     print_out("\b\b\b\b%3d%%", completion);
     return abort_request;
 }
 
-int advProgressFunc_display(int completion, const char *stage, prog_t type, int *unknownProgress)
+int advProgressFunc_display(int completion, const char* stage, prog_t type, int* unknownProgress)
 {
-    switch (type) {
-    case PROG_WITH_PRECENTAGE:
-        print_out("\r%s - %3d%%", stage, completion);
-        break;
+    switch (type)
+    {
+        case PROG_WITH_PRECENTAGE:
+            print_out("\r%s - %3d%%", stage, completion);
+            break;
 
-    case PROG_OK:
-        print_out("\r%s -   OK          \n", stage);
-        break;
+        case PROG_OK:
+            print_out("\r%s -   OK          \n", stage);
+            break;
 
-    case PROG_STRING_ONLY:
-        print_out("%s\n", stage);
-        break;
+        case PROG_STRING_ONLY:
+            print_out("%s\n", stage);
+            break;
 
-    case PROG_WITHOUT_PRECENTAGE:
-        if (unknownProgress) {
-            static const char *progStr[] = { "[.    ]", "[..   ]", "[...  ]", "[.... ]", "[.....]", "[ ....]", "[  ...]", "[   ..]", "[    .]", "[     ]" };
-            int size = sizeof(progStr) / sizeof(progStr[0]);
-            print_out("\r%s - %s", stage, progStr[(*unknownProgress) % size]);
-            (*unknownProgress)++;
-        }
-        break;
+        case PROG_WITHOUT_PRECENTAGE:
+            if (unknownProgress)
+            {
+                static const char* progStr[] = {"[.    ]", "[..   ]", "[...  ]", "[.... ]", "[.....]",
+                                                "[ ....]", "[  ...]", "[   ..]", "[    .]", "[     ]"};
+                int size = sizeof(progStr) / sizeof(progStr[0]);
+                print_out("\r%s - %s", stage, progStr[(*unknownProgress) % size]);
+                (*unknownProgress)++;
+            }
+            break;
     }
     return abort_request;
 }
 
-
 int progressCB_nodisplay(int completion)
 {
-    (void) completion;
+    (void)completion;
     return abort_request;
 }
 
-
-void  getExePath(char *argv[], string &exe_path)
+void getExePath(char* argv[], string& exe_path)
 {
     exe_path = argv[0];
     size_t pos = exe_path.rfind("/");
-    if (pos != string::npos) {
-        exe_path = exe_path.substr(0, pos + 1); //Include the slash
-    } else {
+    if (pos != string::npos)
+    {
+        exe_path = exe_path.substr(0, pos + 1); // Include the slash
+    }
+    else
+    {
         exe_path = "./";
     }
 }
 
 #define INI_FILESYSTEM_SECTION "filesystem"
-#define     INI_SRCDIR_KEY "srcdir"
+#define INI_SRCDIR_KEY "srcdir"
 #define INI_SERVER_SECTION "server"
-#define     INI_PROXY_KEY "proxy"
+#define INI_PROXY_KEY "proxy"
 
-bool getIniParams(config_t &config)
+bool getIniParams(config_t& config)
 {
     string file = config.exe_path;
     file += "/mlxfwmanager.ini";
 
-    if (!isFile(file)) { //If file does not exist then ignore
+    if (!isFile(file))
+    { // If file does not exist then ignore
         return true;
     }
-    dictionary *ini_dict = iniparser_load(file.c_str());
-    if (!ini_dict) {
+    dictionary* ini_dict = iniparser_load(file.c_str());
+    if (!ini_dict)
+    {
         print_err("-E- Failed to load ini file %s: %s\n", file.c_str(), strerror(errno));
         return false;
     }
 
-    config.mfa_path = iniparser_getstring(ini_dict, INI_FILESYSTEM_SECTION ":" INI_SRCDIR_KEY, (char*)config.mfa_path.c_str());
-    config.http_proxy = iniparser_getstring(ini_dict, INI_SERVER_SECTION ":" INI_PROXY_KEY, (char*)config.http_proxy.c_str());
+    config.mfa_path =
+      iniparser_getstring(ini_dict, INI_FILESYSTEM_SECTION ":" INI_SRCDIR_KEY, (char*)config.mfa_path.c_str());
+    config.http_proxy =
+      iniparser_getstring(ini_dict, INI_SERVER_SECTION ":" INI_PROXY_KEY, (char*)config.http_proxy.c_str());
 
-    if (ini_dict) {
+    if (ini_dict)
+    {
         iniparser_freedict(ini_dict);
     }
     return true;
 }
 
-
-bool initConfig(config_t &config, char *argv[], CmdLineParams &cmd_params)
+bool initConfig(config_t& config, char* argv[], CmdLineParams& cmd_params)
 {
     config.display_file_names = false;
     config.path_is_file = false;
     config.adjuster_path = "";
-    if (cmd_params.lvim) {
+    if (cmd_params.lvim)
+    {
         config.setupType = mlxFWMSetupType::lvim;
-    } else if (cmd_params.dl) {
+    }
+    else if (cmd_params.dl)
+    {
         config.setupType = mlxFWMSetupType::dl;
-    } else {
+    }
+    else
+    {
         config.setupType = mlxFWMSetupType::normal;
     }
-    if (cmd_params.current_dir.length()) {
+    if (cmd_params.current_dir.length())
+    {
         config.exe_path = cmd_params.current_dir;
         cmd_params.use_exe_rel_paths = 1;
-    } else {
+    }
+    else
+    {
         char tmpPath[1024] = {0};
 #ifdef __WIN__
         DWORD rc = GetCurrDir(1024, tmpPath);
 #else
-        char *rc = GetCurrDir(1024, tmpPath);
+        char* rc = GetCurrDir(1024, tmpPath);
 #endif
-        (void)rc; //Adrianc: avoiding warrnings the Owner should deal with the return code.
+        (void)rc; // Adrianc: avoiding warrnings the Owner should deal with the return code.
         config.adjuster_path = tmpPath;
         config.adjuster_path += PATH_SEPARATOR;
         getExePath(argv, config.exe_path);
     }
 
-    if (cmd_params.use_exe_rel_paths == 1) {
+    if (cmd_params.use_exe_rel_paths == 1)
+    {
         config.adjuster_path = config.exe_path;
     }
 
     config.mfa_path = ".";
     config.http_server = cmd_params.server_url;
-    config.http_proxy  = cmd_params.proxy;
+    config.http_proxy = cmd_params.proxy;
 
-    if (config.adjuster_path[config.adjuster_path.length() - 1] == ' ') {
+    if (config.adjuster_path[config.adjuster_path.length() - 1] == ' ')
+    {
         config.adjuster_path.erase(config.adjuster_path.length() - 1);
     }
 
-    if (cmd_params.update_online) {
+    if (cmd_params.update_online)
+    {
         config.mfa_path = (string)TMP_DIR + "/online_update_mfa_";
     }
 
-    if (!getIniParams(config)) {
+    if (!getIniParams(config))
+    {
         return false;
     }
 
-    if (cmd_params.use_mfa_dir) {
+    if (cmd_params.use_mfa_dir)
+    {
         config.mfa_path = adjustRelPath(cmd_params.mfa_dir, config.adjuster_path);
     }
 
-    if (cmd_params.use_mfa_file) {
+    if (cmd_params.use_mfa_file)
+    {
         config.mfa_path = adjustRelPath(cmd_params.mfa_file, config.adjuster_path);
         config.path_is_file = true;
     }
 
-    if (cmd_params.display_archive_names) {
+    if (cmd_params.display_archive_names)
+    {
         config.display_file_names = true;
     }
     cmd_params.extract_dir = adjustRelPath(cmd_params.extract_dir, config.adjuster_path);
@@ -1562,66 +1901,79 @@ bool initConfig(config_t &config, char *argv[], CmdLineParams &cmd_params)
     return true;
 }
 
-int list_files_content(config_t &config)
+int list_files_content(config_t& config)
 {
     string fname;
-    DIR *d;
-    struct dirent *dir;
+    DIR* d;
+    struct dirent* dir;
     int rc;
     int res = MLX_FWM_SUCCESS;
     ImageAccess imgacc(CompareFFV);
     bool show_titles = true;
     int displayed_files_cnt = 0;
 
-    if (config.path_is_file) {
+    if (config.path_is_file)
+    {
         vector<PsidQueryItem> items;
         string fpath = config.mfa_path;
-        //TODO: list content by image type
+        // TODO: list content by image type
         rc = imgacc.get_file_content(fpath, items);
-        if (rc) {
+        if (rc)
+        {
             print_err("-E- Error parsing file: %s\n", fpath.c_str());
             res = ERR_CODE_FILE_PARSE_FAILED;
         }
-        else {
+        else
+        {
             display_file_listing(items, config.psid, show_titles);
         }
     }
-    else {
+    else
+    {
         d = opendir(config.mfa_path.c_str());
-        if (d == NULL) {
+        if (d == NULL)
+        {
             return -1;
         }
 
-        while ((dir = readdir(d)) != NULL) {
+        while ((dir = readdir(d)) != NULL)
+        {
             string fl = dir->d_name;
-            if (fl == "." || fl == "..") {
+            if (fl == "." || fl == "..")
+            {
                 continue;
             }
             string fpath = config.mfa_path;
-            if (fpath.length() > 0) {
-                #if defined(__WIN__)
-                if (fpath[fpath.length() - 1] != '\\') {
+            if (fpath.length() > 0)
+            {
+#if defined(__WIN__)
+                if (fpath[fpath.length() - 1] != '\\')
+                {
                     fpath += "\\";
                 }
-                #else
-                if (fpath[fpath.length() - 1] != '/') {
+#else
+                if (fpath[fpath.length() - 1] != '/')
+                {
                     fpath += "/";
                 }
-                #endif
+#endif
             }
             fpath += fl;
 
-            if (imgacc.getFileSignature(fpath) <= 0) {
+            if (imgacc.getFileSignature(fpath) <= 0)
+            {
                 continue;
             }
             vector<PsidQueryItem> items;
             rc = imgacc.get_file_content(fpath, items);
-            if (rc) {
+            if (rc)
+            {
                 print_err("-E- Error parsing file: %s\n", fpath.c_str());
                 res = ERR_CODE_FILE_PARSE_FAILED;
                 continue;
             }
-            if (config.display_file_names) {
+            if (config.display_file_names)
+            {
                 printf("Supported Boards in File: %s\n", fpath.c_str());
                 show_titles = true;
             }
@@ -1631,9 +1983,11 @@ int list_files_content(config_t &config)
             displayed_files_cnt++;
         }
         closedir(d);
-        if (displayed_files_cnt == 0) {
+        if (displayed_files_cnt == 0)
+        {
             print_out("No image files found\n");
-            if (res != ERR_CODE_FILE_PARSE_FAILED) {
+            if (res != ERR_CODE_FILE_PARSE_FAILED)
+            {
                 res = ERR_CODE_IMG_NOT_FOUND;
             }
         }
@@ -1642,34 +1996,38 @@ int list_files_content(config_t &config)
     return res;
 }
 
-
 void display_field_str(string field, int size, string display_if_empty = "")
 {
     char fmt[50];
     string f;
 
-    if (field.size() == 0) {
+    if (field.size() == 0)
+    {
         f = display_if_empty;
-    } else {
+    }
+    else
+    {
         f = field;
     }
     sprintf(fmt, "%%%ds", -size);
     print_out(fmt, f.c_str());
 }
 
-
-void display_file_listing(vector<PsidQueryItem> &items, string psid, bool show_titles)
+void display_file_listing(vector<PsidQueryItem>& items, string psid, bool show_titles)
 {
     int max_pn_length = 25;
     int tmpLen = 0;
     bool breakFlag = false;
-    for (unsigned i = 0; i < items.size(); i++) {  // to make all fields aligned
+    for (unsigned i = 0; i < items.size(); i++)
+    { // to make all fields aligned
         tmpLen = items[i].pns.length();
-        if (tmpLen > max_pn_length) {
+        if (tmpLen > max_pn_length)
+        {
             max_pn_length = tmpLen;
         }
     }
-    if (show_titles) {
+    if (show_titles)
+    {
         display_field_str("PN", max_pn_length);
         print_out(" ");
         display_field_str("PSID", 18);
@@ -1681,28 +2039,35 @@ void display_file_listing(vector<PsidQueryItem> &items, string psid, bool show_t
         display_field_str("Description", 32);
         print_out(" ");
         print_out("\n");
-        for (int i = 0; i < 110; i++) {
+        for (int i = 0; i < 110; i++)
+        {
             print_out("-");
         }
         print_out("\n");
     }
-    for (unsigned i = 0; i < items.size(); i++) {
-        if (psid.length()) {
-            if (psid.compare(items[i].psid)) {
+    for (unsigned i = 0; i < items.size(); i++)
+    {
+        if (psid.length())
+        {
+            if (psid.compare(items[i].psid))
+            {
                 continue;
             }
             breakFlag = true;
         }
 
-        ImgVersion *imv;
+        ImgVersion* imv;
 
         display_field_str(items[i].pns, max_pn_length, "N/A");
         print_out(" ");
         display_field_str(items[i].psid, 18);
         print_out(" ");
-        if ((imv = (ImgVersion*)items[i].findImageVersion("FW"))) {
+        if ((imv = (ImgVersion*)items[i].findImageVersion("FW")))
+        {
             display_field_str(imv->getPrintableVersion(0), 28);
-        } else {
+        }
+        else
+        {
             display_field_str("", 16);
         }
         print_out(" ");
@@ -1711,8 +2076,10 @@ void display_file_listing(vector<PsidQueryItem> &items, string psid, bool show_t
         display_field_str(items[i].description, 32);
         print_out("\n");
 
-        for (unsigned int j = 0; j < items[i].imgVers.size(); j++) {
-            if (!items[i].imgVers[j].getTypeStr().compare("FW")) {
+        for (unsigned int j = 0; j < items[i].imgVers.size(); j++)
+        {
+            if (!items[i].imgVers[j].getTypeStr().compare("FW"))
+            {
                 continue;
             }
             display_field_str("", max_pn_length, "");
@@ -1721,66 +2088,75 @@ void display_file_listing(vector<PsidQueryItem> &items, string psid, bool show_t
             print_out(" ");
             display_field_str(items[i].imgVers[j].getPrintableVersion(0), 12);
             print_out(" ");
-            //display_field_str("", 16, "");
-            //display_field_str("", 32);
+            // display_field_str("", 16, "");
+            // display_field_str("", 32);
             print_out("\n");
         }
 
-        if (breakFlag) {
+        if (breakFlag)
+        {
             break;
         }
     }
 }
 
-int CalcFileCrc(char *fileName)
+int CalcFileCrc(char* fileName)
 {
-    FILE *fp;
-    u_int8_t *buf = NULL;
+    FILE* fp;
+    u_int8_t* buf = NULL;
     long fsize;
     int total = 0;
     int sz;
     int res = 0;
 
-    if ((fp = fopen(fileName, "rb")) == NULL) {
+    if ((fp = fopen(fileName, "rb")) == NULL)
+    {
         return -1;
     }
 
-    if (fseek(fp, 0L, SEEK_END)) {
+    if (fseek(fp, 0L, SEEK_END))
+    {
         printf("Failed to seek end of file : '%s'\n", fileName);
         goto err_clean_up;
     }
 
-    if ((fsize = ftell(fp)) == -1) {
+    if ((fsize = ftell(fp)) == -1)
+    {
         printf("Failed to ftell file : '%s'\n", fileName);
         goto err_clean_up;
     }
 
     rewind(fp);
     buf = (u_int8_t*)malloc(fsize);
-    if (buf == NULL) {
+    if (buf == NULL)
+    {
         printf("Memory Allocation failure\n");
         goto err_clean_up;
     }
 
-    while (total < fsize) {
+    while (total < fsize)
+    {
         sz = fread(&buf[total], 1, fsize, fp);
-        if (sz < 0) {
+        if (sz < 0)
+        {
             break;
         }
         total += sz;
     }
 
-    if (total != fsize) {
+    if (total != fsize)
+    {
         goto err_clean_up;
     }
     res = 0;
 
     u_int32_t calc_crc;
     calc_crc = mfasec_crc32(buf, total, 0);
-    printf("CRC32 = %08x\n",  calc_crc);
+    printf("CRC32 = %08x\n", calc_crc);
 
 err_clean_up:
-    if (buf != NULL) {
+    if (buf != NULL)
+    {
         free(buf);
     }
     fclose(fp);
@@ -1796,9 +2172,10 @@ void fixXmlKey(string& k)
 
 void TerminationHandler(int signum)
 {
-    (void) signum;
+    (void)signum;
     abort_request = 1;
-    if (IS_OKAY_To_INTERRUPT) {
+    if (IS_OKAY_To_INTERRUPT)
+    {
         print_out("\nInterrupted\n");
         exit(0);
     }
@@ -1807,112 +2184,147 @@ void TerminationHandler(int signum)
 #ifdef __WIN__
 #include <windows.h>
 
-static BOOL CtrlHandler( DWORD fdwCtrlType )
+static BOOL CtrlHandler(DWORD fdwCtrlType)
 {
     switch (fdwCtrlType)
     {
-    // Handle the CTRL-C signal.
-    case CTRL_C_EVENT:
-    // CTRL-CLOSE: confirm that the user wants to exit.
-    case CTRL_CLOSE_EVENT:
-    // Pass other signals to the next handler.
-    case CTRL_BREAK_EVENT:
-    case CTRL_LOGOFF_EVENT:
-    case CTRL_SHUTDOWN_EVENT:
-        TerminationHandler(SIGINT);
-        return TRUE;
+        // Handle the CTRL-C signal.
+        case CTRL_C_EVENT:
+        // CTRL-CLOSE: confirm that the user wants to exit.
+        case CTRL_CLOSE_EVENT:
+        // Pass other signals to the next handler.
+        case CTRL_BREAK_EVENT:
+        case CTRL_LOGOFF_EVENT:
+        case CTRL_SHUTDOWN_EVENT:
+            TerminationHandler(SIGINT);
+            return TRUE;
 
-    default:
-        return FALSE;
+        default:
+            return FALSE;
     }
 }
 
 #endif
 
-
 void initHandler()
 {
 #ifdef __WIN__
 #define SIGNAL_NUM 3
     int signalList[SIGNAL_NUM] = {SIGINT, SIGTERM, SIGABRT};
-    SetConsoleCtrlHandler( (PHANDLER_ROUTINE) CtrlHandler, true );
+    SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, true);
 #else
 #define SIGNAL_NUM 4
     int signalList[SIGNAL_NUM] = {SIGINT, SIGTERM, SIGPIPE, SIGHUP};
 #endif
 
-    //set the signal handler
-    for (int i = 0; i < SIGNAL_NUM; i++) {
+    // set the signal handler
+    for (int i = 0; i < SIGNAL_NUM; i++)
+    {
         void (*prevFunc)(int);
         prevFunc = signal(signalList[i], TerminationHandler);
-        if (prevFunc == SIG_ERR) {
+        if (prevFunc == SIG_ERR)
+        {
             printf("-E- failed to set signal Handler.");
             exit(ERR_CODE_INTERRUPTED);
         }
     }
 }
 
-string generateQueryXML(int dev_index, string devname, string deviceType, string pn, string description,
-                        string statusStr, vector<MlnxDev*> &devs, string ver, string availVer, map<string, bool> expRomTypes,
-                        map<string, int> devRomTypeIndex, map<string, int> availRomTypeIndex, map<string, PsidQueryItem> &psidUpdateInfo, bool multiple_images_found)
+string generateQueryXML(int dev_index,
+                        string devname,
+                        string deviceType,
+                        string pn,
+                        string description,
+                        string statusStr,
+                        vector<MlnxDev*>& devs,
+                        string ver,
+                        string availVer,
+                        map<string, bool> expRomTypes,
+                        map<string, int> devRomTypeIndex,
+                        map<string, int> availRomTypeIndex,
+                        map<string, PsidQueryItem>& psidUpdateInfo,
+                        bool multiple_images_found)
 {
     string output = "";
-    output += "    <Device pciName=\"" + devname + "\" type=\"" + deviceType + "\" psid=\"" + devs[dev_index]->getPsid().c_str() + "\" partNumber=\"" + pn + "\">\n";
+    output += "    <Device pciName=\"" + devname + "\" type=\"" + deviceType + "\" psid=\"" +
+              devs[dev_index]->getPsid().c_str() + "\" partNumber=\"" + pn + "\">\n";
     output += "      <Versions>\n";
     output += "        <FW current=\"" + ver + "\" available=\"" + availVer + "\"/>\n";
-    for (map<string, bool>::iterator iter = expRomTypes.begin(); iter != expRomTypes.end(); ++iter) {
-        string k =  iter->first;
+    for (map<string, bool>::iterator iter = expRomTypes.begin(); iter != expRomTypes.end(); ++iter)
+    {
+        string k = iter->first;
         string dver = "N/A";
         string aver = "N/A";
         string fwType = string(k);
-        if (!k.compare("FW")) {
+        if (!k.compare("FW"))
+        {
             continue;
         }
 
-        if (devRomTypeIndex[k] != -1) {
+        if (devRomTypeIndex[k] != -1)
+        {
             dver = devs[dev_index]->_imageVers[devRomTypeIndex[k]].getPrintableVersion(0, false);
         }
-        if (availRomTypeIndex[k] != -1) {
-            aver = psidUpdateInfo[devs[dev_index]->getPsid()].imgVers[availRomTypeIndex[k]].getPrintableVersion(0, false);
+        if (availRomTypeIndex[k] != -1)
+        {
+            aver =
+              psidUpdateInfo[devs[dev_index]->getPsid()].imgVers[availRomTypeIndex[k]].getPrintableVersion(0, false);
         }
         fixXmlKey(fwType);
-        if (multiple_images_found) {
+        if (multiple_images_found)
+        {
             output += "        <" + fwType + " current=\"" + dver + "\" available=\"N/A\"/>\n";
-        } else {
+        }
+        else
+        {
             output += "        <" + fwType + " current=\"" + dver + "\" available=\"" + aver + "\"/>\n";
         }
     }
     output += "      </Versions>\n";
     fixXmlString(description);
-    if (devs[dev_index]->isOnlyBase) {
-        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH) {
+    if (devs[dev_index]->isOnlyBase)
+    {
+        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH)
+        {
             output += "      <MACs Base_Mac=\"" + devs[dev_index]->macPortOne + "\" />\n";
-        } else if (devs[dev_index]->portOneType == MlnxDev::PORT_IB) {
+        }
+        else if (devs[dev_index]->portOneType == MlnxDev::PORT_IB)
+        {
             output += "      <GUIDs Base_Guid=\"" + devs[dev_index]->guidPortOne + "\" />\n";
-        } else {
+        }
+        else
+        {
             output += "      <MACs Base_Mac=\"" + devs[dev_index]->macPortOne + "\" />\n";
             output += "      <GUIDs Base_Guid=\"" + devs[dev_index]->guidPortOne + "\" />\n";
         }
-    } else {
-        if (devs[dev_index]->portOneType == MlnxDev::PORT_IB || devs[dev_index]->portTwoType == MlnxDev::PORT_IB) {
+    }
+    else
+    {
+        if (devs[dev_index]->portOneType == MlnxDev::PORT_IB || devs[dev_index]->portTwoType == MlnxDev::PORT_IB)
+        {
             string ports = "";
-            if (devs[dev_index]->portOneType  == MlnxDev::PORT_IB) {
+            if (devs[dev_index]->portOneType == MlnxDev::PORT_IB)
+            {
                 ports = "port1=\"" + devs[dev_index]->guidPortOne + "\" ";
             }
 
-            if (devs[dev_index]->portTwoType == MlnxDev::PORT_IB) {
+            if (devs[dev_index]->portTwoType == MlnxDev::PORT_IB)
+            {
                 ports += "port2=\"" + devs[dev_index]->guidPortTwo + "\"";
             }
             output += "      <GUIDs " + ports + "/>\n";
         }
 
-        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH || devs[dev_index]->portTwoType == MlnxDev::PORT_ETH) {
+        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH || devs[dev_index]->portTwoType == MlnxDev::PORT_ETH)
+        {
             string ports = "";
-            if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH) {
+            if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH)
+            {
                 ports = "port1=\"" + devs[dev_index]->macPortOne + "\" ";
             }
 
-            if (devs[dev_index]->portTwoType == MlnxDev::PORT_ETH) {
+            if (devs[dev_index]->portTwoType == MlnxDev::PORT_ETH)
+            {
                 ports += "port2=\"" + devs[dev_index]->macPortTwo + "\"";
             }
             output += "      <MACs " + ports + "/>\n";
@@ -1922,12 +2334,22 @@ string generateQueryXML(int dev_index, string devname, string deviceType, string
     output += "      <Description>" + description + "</Description>\n";
     output += "    </Device>";
     return output;
-
 }
 
-void printDeviceInfoQuery(int dev_index, string devname, string deviceType, string pn, string description,
-                          string statusStr, vector<MlnxDev*> &devs, string ver, string availVer, map<string, bool> expRomTypes,
-                          map<string, int> devRomTypeIndex, map<string, int> availRomTypeIndex, map<string, PsidQueryItem> &psidUpdateInfo, bool multiple_images_found)
+void printDeviceInfoQuery(int dev_index,
+                          string devname,
+                          string deviceType,
+                          string pn,
+                          string description,
+                          string statusStr,
+                          vector<MlnxDev*>& devs,
+                          string ver,
+                          string availVer,
+                          map<string, bool> expRomTypes,
+                          map<string, int> devRomTypeIndex,
+                          map<string, int> availRomTypeIndex,
+                          map<string, PsidQueryItem>& psidUpdateInfo,
+                          bool multiple_images_found)
 {
     print_out("Device #%d:\n", dev_index + 1);
     print_out("----------\n\n");
@@ -1936,35 +2358,55 @@ void printDeviceInfoQuery(int dev_index, string devname, string deviceType, stri
     print_out("  Description:      %s\n", description.c_str());
     print_out("  PSID:             %s\n", devs[dev_index]->getPsid().c_str());
     print_out("  PCI Device Name:  %s\n", devname.c_str());
-    if (devs[dev_index]->isOnlyBase) {
-        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH) {
+    if (devs[dev_index]->isOnlyBase)
+    {
+        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH)
+        {
             print_out("  Base MAC:         %s\n", devs[dev_index]->macPortOne.c_str());
-            if (devs[dev_index]->portTwoType == MlnxDev::PORT_IB) {
+            if (devs[dev_index]->portTwoType == MlnxDev::PORT_IB)
+            {
                 print_out("  Base GUID:        %s\n", devs[dev_index]->guidPortOne.c_str());
             }
-        } else if (devs[dev_index]->portOneType == MlnxDev::PORT_IB) {
+        }
+        else if (devs[dev_index]->portOneType == MlnxDev::PORT_IB)
+        {
             print_out("  Base GUID:        %s\n", devs[dev_index]->guidPortOne.c_str());
-            if (devs[dev_index]->portTwoType == MlnxDev::PORT_ETH) {
+            if (devs[dev_index]->portTwoType == MlnxDev::PORT_ETH)
+            {
                 print_out("  Base MAC:         %s\n", devs[dev_index]->macPortOne.c_str());
             }
-        } else {
+        }
+        else
+        {
             print_out("  Base GUID:        %s\n", devs[dev_index]->guidPortOne.c_str());
             print_out("  Base MAC:         %s\n", devs[dev_index]->macPortOne.c_str());
         }
-    } else {
-        if (devs[dev_index]->portOneType  == MlnxDev::PORT_ETH) {
+    }
+    else
+    {
+        if (devs[dev_index]->portOneType == MlnxDev::PORT_ETH)
+        {
             print_out("  Port1 MAC:        %s\n", devs[dev_index]->macPortOne.c_str());
-        } else if (devs[dev_index]->portOneType  == MlnxDev::PORT_IB) {
+        }
+        else if (devs[dev_index]->portOneType == MlnxDev::PORT_IB)
+        {
             print_out("  Port1 GUID:       %s\n", devs[dev_index]->guidPortOne.c_str());
-        } else {
+        }
+        else
+        {
             print_out("  Port1 MAC:        %s\n", devs[dev_index]->macPortOne.c_str());
             print_out("  Port1 GUID:       %s\n", devs[dev_index]->guidPortOne.c_str());
         }
-        if (devs[dev_index]->portTwoType == MlnxDev::PORT_ETH) {
+        if (devs[dev_index]->portTwoType == MlnxDev::PORT_ETH)
+        {
             print_out("  Port2 MAC:        %s\n", devs[dev_index]->macPortTwo.c_str());
-        } else if (devs[dev_index]->portTwoType == MlnxDev::PORT_IB) {
+        }
+        else if (devs[dev_index]->portTwoType == MlnxDev::PORT_IB)
+        {
             print_out("  Port2 GUID:       %s\n", devs[dev_index]->guidPortTwo.c_str());
-        } else {
+        }
+        else
+        {
             print_out("  Port2 MAC:        %s\n", devs[dev_index]->macPortTwo.c_str());
             print_out("  Port2 GUID:       %s\n", devs[dev_index]->guidPortTwo.c_str());
         }
@@ -1972,41 +2414,48 @@ void printDeviceInfoQuery(int dev_index, string devname, string deviceType, stri
     print_out("  Versions:         %-14s %-14s\n", "Current", "Available");
     print_out("     FW             %-14s %-14s\n", ver.c_str(), availVer.c_str());
 
-    for (map<string, bool>::iterator iter = expRomTypes.begin(); iter != expRomTypes.end(); ++iter) {
-        string k =  iter->first;
+    for (map<string, bool>::iterator iter = expRomTypes.begin(); iter != expRomTypes.end(); ++iter)
+    {
+        string k = iter->first;
         string dver = "N/A";
         string aver = "N/A";
-        if (!k.compare("FW")) {
+        if (!k.compare("FW"))
+        {
             continue;
         }
-        if (devRomTypeIndex[k] != -1) {
+        if (devRomTypeIndex[k] != -1)
+        {
             dver = devs[dev_index]->_imageVers[devRomTypeIndex[k]].getPrintableVersion(0, false);
         }
-        if (availRomTypeIndex[k] != -1) {
-            aver = psidUpdateInfo[devs[dev_index]->getPsid()].imgVers[availRomTypeIndex[k]].getPrintableVersion(0, false);
+        if (availRomTypeIndex[k] != -1)
+        {
+            aver =
+              psidUpdateInfo[devs[dev_index]->getPsid()].imgVers[availRomTypeIndex[k]].getPrintableVersion(0, false);
         }
 
         print_out("     %-12s   %-14s %-14s\n", k.c_str(), dver.c_str(), (multiple_images_found) ? "--" : aver.c_str());
     }
     print_out("\n  Status:           %s\n\n", statusStr.c_str());
-    if (devs[dev_index]->doesDevNeedUpdate()) {
+    if (devs[dev_index]->doesDevNeedUpdate())
+    {
         displayReleaseNoteMFAs(psidUpdateInfo, devs, dev_index);
     }
 }
 
-void fixXmlString(string & stringToFix)
+void fixXmlString(string& stringToFix)
 {
     string rep[5] = {"\"", "&", "'", ">", "<"};
-    for (int i = 0; i < 5; i++) {
+    for (int i = 0; i < 5; i++)
+    {
         replaceStringInPlace(stringToFix, rep[i], "");
     }
 }
 
-void replaceStringInPlace(string& subject, const string& search,
-                          const string& replace)
+void replaceStringInPlace(string& subject, const string& search, const string& replace)
 {
     int pos = 0;
-    while ((pos = subject.find(search, pos)) != (int)std::string::npos) {
+    while ((pos = subject.find(search, pos)) != (int)std::string::npos)
+    {
         subject.replace(pos, search.length(), replace);
         pos += replace.length();
     }
@@ -2019,55 +2468,67 @@ string getline()
     return str;
 }
 
-int handleOnlinePsidsQueryXml(ServerRequest *srq, CmdLineParams &cmd_params, config_t config)
+int handleOnlinePsidsQueryXml(ServerRequest* srq, CmdLineParams& cmd_params, config_t config)
 {
     int res = 0;
-    (void) config;
-    vector <PsidQueryItem> psidUpdateInfo;
-    if (srq->queryPsids(cmd_params.onlineQueryPsids, psidUpdateInfo)) {
+    (void)config;
+    vector<PsidQueryItem> psidUpdateInfo;
+    if (srq->queryPsids(cmd_params.onlineQueryPsids, psidUpdateInfo))
+    {
         print_err("<Psids>\n </Psids>\n");
         res = ERR_CODE_SERVER_QUERY_FAILED;
         return res;
     }
 
     string output = "<Psids>\n";
-    for (unsigned int i = 0; i < psidUpdateInfo.size(); i++) {
+    for (unsigned int i = 0; i < psidUpdateInfo.size(); i++)
+    {
         PsidQueryItem ri = psidUpdateInfo[i];
         string status;
         string ver = "N/A";
         string mfa = "N/A";
         string release_note = "";
-        if (ri.found) {
+        if (ri.found)
+        {
             status = "Found";
-            ImgVersion *img = (ImgVersion*)ri.findImageVersion("FW");
-            if (img) {
+            ImgVersion* img = (ImgVersion*)ri.findImageVersion("FW");
+            if (img)
+            {
                 ver = img->getPrintableVersion(cmd_params.compare_ffv, false);
             }
             mfa = ri.name;
             release_note = ri.release_note.length() ? "\n" + ri.release_note : "";
-        } else {
+        }
+        else
+        {
             status = "Not Found";
             res = 1;
         }
         output += "    <Psid psid=\"" + ri.psid + "\" MFA=\"" + mfa + "\" partNumber=\"" + ri.pns + "\">\n";
         output += "      <Versions>\n";
         output += "        <FW available=\"" + ver + "\"/>\n";
-        if (ri.found) {
-            for (unsigned int j = 0; j < ri.imgVers.size(); j++) {
+        if (ri.found)
+        {
+            for (unsigned int j = 0; j < ri.imgVers.size(); j++)
+            {
                 string type = ri.imgVers[j].getTypeStr();
-                if (type == "FW") {
+                if (type == "FW")
+                {
                     continue;
                 }
-                output += "        <" + type + " available=\"" + ri.imgVers[j].getPrintableVersion(cmd_params.compare_ffv, false) + "\"/>\n";
+                output += "        <" + type + " available=\"" +
+                          ri.imgVers[j].getPrintableVersion(cmd_params.compare_ffv, false) + "\"/>\n";
             }
         }
         output += "      </Versions>\n";
-        if (release_note.length()) {
+        if (release_note.length())
+        {
             std::istringstream stream(release_note);
             string line;
             getline(stream, line);
             release_note = line;
-            while (!stream.eof()) {
+            while (!stream.eof())
+            {
                 getline(stream, line);
                 release_note += "\\n" + line;
             }
@@ -2081,12 +2542,13 @@ int handleOnlinePsidsQueryXml(ServerRequest *srq, CmdLineParams &cmd_params, con
     printf("%s\n", output.c_str());
     return res;
 }
-int handleOnlinePsidsQuery(ServerRequest *srq, CmdLineParams &cmd_params, config_t config)
+int handleOnlinePsidsQuery(ServerRequest* srq, CmdLineParams& cmd_params, config_t config)
 {
     int res = 0;
-    (void) config;
-    vector <PsidQueryItem> psidUpdateInfo;
-    if (srq->queryPsids(cmd_params.onlineQueryPsids, psidUpdateInfo)) {
+    (void)config;
+    vector<PsidQueryItem> psidUpdateInfo;
+    if (srq->queryPsids(cmd_params.onlineQueryPsids, psidUpdateInfo))
+    {
         print_err("-E- Failed to query PSIDs from server\n");
         string errorMsg;
         srq->getError(res, errorMsg);
@@ -2095,21 +2557,26 @@ int handleOnlinePsidsQuery(ServerRequest *srq, CmdLineParams &cmd_params, config
         return res;
     }
 
-    for (unsigned int i = 0; i < psidUpdateInfo.size(); i++) {
+    for (unsigned int i = 0; i < psidUpdateInfo.size(); i++)
+    {
         PsidQueryItem ri = psidUpdateInfo[i];
         string status;
         string ver = "N/A";
         string mfa = "N/A";
         string release_note = "N/A";
-        if (ri.found) {
+        if (ri.found)
+        {
             status = "Found";
-            ImgVersion *img = (ImgVersion*)ri.findImageVersion("FW");
-            if (img) {
+            ImgVersion* img = (ImgVersion*)ri.findImageVersion("FW");
+            if (img)
+            {
                 ver = img->getPrintableVersion(cmd_params.compare_ffv, false);
             }
             mfa = ri.name;
             release_note = ri.release_note.length() ? "\n" + ri.release_note : "N/A";
-        } else {
+        }
+        else
+        {
             status = "Not Found";
             res = 1;
         }
@@ -2120,10 +2587,13 @@ int handleOnlinePsidsQuery(ServerRequest *srq, CmdLineParams &cmd_params, config
         print_out("  MFA Name:         %s\n", mfa.c_str());
         print_out("  Versions:         %-14s\n", "Available");
         print_out("     FW             %-14s\n", ver.c_str());
-        if (ri.found) {
-            for (unsigned int j = 0; j < ri.imgVers.size(); j++) {
+        if (ri.found)
+        {
+            for (unsigned int j = 0; j < ri.imgVers.size(); j++)
+            {
                 string type = ri.imgVers[j].getTypeStr();
-                if (type == "FW") {
+                if (type == "FW")
+                {
                     continue;
                 }
                 print_out("     %-12s   %-14s\n", type.c_str(),
@@ -2135,53 +2605,63 @@ int handleOnlinePsidsQuery(ServerRequest *srq, CmdLineParams &cmd_params, config
         string line;
         getline(stream, line);
         print_out("  Release Notes:     %-14s\n", line.c_str());
-        while (!stream.eof()) {
+        while (!stream.eof())
+        {
             getline(stream, line);
             print_out("                    %-14s\n", line.c_str());
         }
         print_out("\n  Status:           %s\n\n", status.c_str());
-
     }
     return res;
 }
 
-
-static int getFileProperties(ServerRequest *srq, vector<DownloadedFileProperties>& filePropVec, string osFilter = "", string devFilter = "", string fileTypeFilter = "")
+static int getFileProperties(ServerRequest* srq,
+                             vector<DownloadedFileProperties>& filePropVec,
+                             string osFilter = "",
+                             string devFilter = "",
+                             string fileTypeFilter = "")
 {
-    if (!srq) {
+    if (!srq)
+    {
         return ERR_CODE_INTERNAL_ERR;
     }
 
-    if (srq->DownloadFilesRequest(filePropVec, osFilter, devFilter, fileTypeFilter)) {
+    if (srq->DownloadFilesRequest(filePropVec, osFilter, devFilter, fileTypeFilter))
+    {
         return ERR_CODE_SERVER_DOWNLOAD_FAILED;
     }
     return MLX_FWM_SUCCESS;
 }
 
-int check_valid_os_type(CmdLineParams &cmd_params, bool* os_valid) {
-    vector <DownloadedFileProperties> filePropVec;
+int check_valid_os_type(CmdLineParams& cmd_params, bool* os_valid)
+{
+    vector<DownloadedFileProperties> filePropVec;
     int res = MLX_FWM_SUCCESS;
     *os_valid = false;
-    if (cmd_params.download_os == "all") {
+    if (cmd_params.download_os == "all")
+    {
         *os_valid = true;
         return res;
     }
-    ServerRequest *srq = new ServerRequest(cmd_params.server_url.c_str(),
-                                cmd_params.proxy.c_str(), cmd_params.compare_ffv,
-                                cmd_params.show_progress, cmd_params.download_key,
-                                cmd_params.certificate, cmd_params.numberOfRetrials);
-    if (srq == NULL) {
+    ServerRequest* srq = new ServerRequest(cmd_params.server_url.c_str(), cmd_params.proxy.c_str(),
+                                           cmd_params.compare_ffv, cmd_params.show_progress, cmd_params.download_key,
+                                           cmd_params.certificate, cmd_params.numberOfRetrials);
+    if (srq == NULL)
+    {
         return ERR_CODE_MEM_ALLOC_FAIL;
     }
     res = getFileProperties(srq, filePropVec, "", "", "self_extractor");
-    if (res) {
+    if (res)
+    {
         print_err("-E- Failed to query files on server\n");
         string errorMsg;
         srq->getError(res, errorMsg);
         print_err("%s\n", errorMsg.c_str());
     }
-    for (std::vector<DownloadedFileProperties>::iterator it = filePropVec.begin(); it != filePropVec.end(); it++) {
-        if (cmd_params.download_os == it->os) {
+    for (std::vector<DownloadedFileProperties>::iterator it = filePropVec.begin(); it != filePropVec.end(); it++)
+    {
+        if (cmd_params.download_os == it->os)
+        {
             *os_valid = true;
             break;
         }
@@ -2190,17 +2670,21 @@ int check_valid_os_type(CmdLineParams &cmd_params, bool* os_valid) {
     return res;
 }
 
-int handleGetDownloadOptionsRequest(ServerRequest *srq, CmdLineParams &cmd_params)
+int handleGetDownloadOptionsRequest(ServerRequest* srq, CmdLineParams& cmd_params)
 {
     std::set<string> availOpt;
-    vector <DownloadedFileProperties> filePropVec;
+    vector<DownloadedFileProperties> filePropVec;
     int res = MLX_FWM_SUCCESS;
 
     res = getFileProperties(srq, filePropVec, "", "", cmd_params.get_download_opt == "os" ? "self_extractor" : "mfa");
-    if (res) {
-        if (cmd_params.download_key != "last_release") {
+    if (res)
+    {
+        if (cmd_params.download_key != "last_release")
+        {
             print_err("-E- Failed to Query files on server, might be invalid key?\n");
-        } else {
+        }
+        else
+        {
             print_err("-E- Failed to query files on server\n");
             string errorMsg;
             srq->getError(res, errorMsg);
@@ -2210,30 +2694,34 @@ int handleGetDownloadOptionsRequest(ServerRequest *srq, CmdLineParams &cmd_param
     }
 
     bool insertOS = cmd_params.get_download_opt == "os";
-    for (std::vector<DownloadedFileProperties>::iterator it = filePropVec.begin(); it != filePropVec.end(); it++) {
+    for (std::vector<DownloadedFileProperties>::iterator it = filePropVec.begin(); it != filePropVec.end(); it++)
+    {
         availOpt.insert(insertOS ? it->os : it->family);
     }
 
-    for (std::set<string>::iterator it = availOpt.begin(); it != availOpt.end(); it++) {
+    for (std::set<string>::iterator it = availOpt.begin(); it != availOpt.end(); it++)
+    {
         print_out("%s\n", (*it).c_str());
     }
     return res;
 }
 
-
-int handleDownloadRequest(ServerRequest *srq, CmdLineParams &cmd_params, config_t config)
+int handleDownloadRequest(ServerRequest* srq, CmdLineParams& cmd_params, config_t config)
 {
     int res = 0;
-    (void) config;
-    vector <DownloadedFileProperties> files;
+    (void)config;
+    vector<DownloadedFileProperties> files;
     filesOPtions filterOPtions;
 
-    //print_out("\n");
-    if (getFileProperties(srq, files, cmd_params.download_os, cmd_params.download_dev,
-                          cmd_params.download_type)) {
-        if (cmd_params.download_key != "last_release") {
+    // print_out("\n");
+    if (getFileProperties(srq, files, cmd_params.download_os, cmd_params.download_dev, cmd_params.download_type))
+    {
+        if (cmd_params.download_key != "last_release")
+        {
             print_err("-E- Failed to download files from server, might be invalid key?\n");
-        } else {
+        }
+        else
+        {
             print_err("-E- Failed to download files from server\n");
             string errorMsg;
             srq->getError(res, errorMsg);
@@ -2243,57 +2731,71 @@ int handleDownloadRequest(ServerRequest *srq, CmdLineParams &cmd_params, config_
         return res;
     }
 
-    if (!cmd_params.download_default) {
+    if (!cmd_params.download_default)
+    {
         filterOPtions.files.swap(files);
-        BaseMenu *currentMenu = new FileTypeMenu;
+        BaseMenu* currentMenu = new FileTypeMenu;
 
-        while (currentMenu != NULL) {
+        while (currentMenu != NULL)
+        {
             bool isPrev = false;
             bool isExit = false;
             int choice = 0;
             int invalid = false;
-            BaseMenu *aNewmenu;
+            BaseMenu* aNewmenu;
             currentMenu->generateMenu(cmd_params, filterOPtions);
-            if (currentMenu->isValid(cmd_params, filterOPtions)) {
+            if (currentMenu->isValid(cmd_params, filterOPtions))
+            {
                 std::istringstream iss(getline());
                 iss.clear();
                 iss >> choice;
-                if (!iss.eof()) {
+                if (!iss.eof())
+                {
                     sleep(1);
                     invalid = true;
                 }
-                if (iss.fail()) {
+                if (iss.fail())
+                {
                     sleep(1);
                     invalid = true;
                 }
                 print_out("\n");
-            } else {
+            }
+            else
+            {
                 aNewmenu = currentMenu->getNextMenu(cmd_params, filterOPtions);
                 delete currentMenu;
                 currentMenu = aNewmenu;
                 continue;
             }
-            if (abort_request) {
+            if (abort_request)
+            {
                 delete currentMenu;
                 return res;
             }
-            if (!abort_request && invalid) {
+            if (!abort_request && invalid)
+            {
                 delete currentMenu;
                 print_err("-E- Invalid choice\n");
                 return 1;
             }
-            if (!currentMenu->parseChoice(choice, isExit, isPrev, filterOPtions)) {
+            if (!currentMenu->parseChoice(choice, isExit, isPrev, filterOPtions))
+            {
                 delete currentMenu;
                 return -1;
             }
-            if (isExit) {
+            if (isExit)
+            {
                 delete currentMenu;
                 return 0;
             }
 
-            if (isPrev) {
+            if (isPrev)
+            {
                 aNewmenu = currentMenu->getPrevMenu(cmd_params, filterOPtions);
-            } else {
+            }
+            else
+            {
                 aNewmenu = currentMenu->getNextMenu(cmd_params, filterOPtions);
             }
             delete currentMenu;
@@ -2301,24 +2803,35 @@ int handleDownloadRequest(ServerRequest *srq, CmdLineParams &cmd_params, config_
         }
 
         filterOPtions.filtered.clear();
-        for (unsigned int i = 0; i < filterOPtions.files.size(); i++) {
-            if (filterOPtions.files[i].file_type != filterOPtions.file_type && filterOPtions.file_type != "all") {
+        for (unsigned int i = 0; i < filterOPtions.files.size(); i++)
+        {
+            if (filterOPtions.files[i].file_type != filterOPtions.file_type && filterOPtions.file_type != "all")
+            {
                 continue;
-            } else if (filterOPtions.files[i].family != filterOPtions.family && filterOPtions.family != "all") {
+            }
+            else if (filterOPtions.files[i].family != filterOPtions.family && filterOPtions.family != "all")
+            {
                 continue;
-            } else if (filterOPtions.files[i].os   != filterOPtions.os && filterOPtions.os != "all" && filterOPtions.files[i].os != "all") {
+            }
+            else if (filterOPtions.files[i].os != filterOPtions.os && filterOPtions.os != "all" &&
+                     filterOPtions.files[i].os != "all")
+            {
                 continue;
             }
             filterOPtions.filtered.push_back(filterOPtions.files[i]);
         }
 
-        for (unsigned int i = 0; i < filterOPtions.filtered.size(); i++) {
+        for (unsigned int i = 0; i < filterOPtions.filtered.size(); i++)
+        {
             filterOPtions.urls.push_back(filterOPtions.filtered[i].url);
             filterOPtions.names.push_back(filterOPtions.filtered[i].name);
             filterOPtions.osDirName.push_back(filterOPtions.filtered[i].os);
         }
-    } else { // take files as is
-        for (unsigned int i = 0; i < files.size(); i++) {
+    }
+    else
+    { // take files as is
+        for (unsigned int i = 0; i < files.size(); i++)
+        {
             filterOPtions.urls.push_back(files[i].url);
             filterOPtions.names.push_back(files[i].name);
             filterOPtions.osDirName.push_back(files[i].os);
@@ -2326,72 +2839,92 @@ int handleDownloadRequest(ServerRequest *srq, CmdLineParams &cmd_params, config_
         filterOPtions.filtered.swap(files);
     }
     print_out("\n");
-    if (!filterOPtions.urls.size()) {
+    if (!filterOPtions.urls.size())
+    {
         print_err("-E- Failed to find files that match your request\n");
         return 1;
     }
 
-    //displayFilesToBeDownloaded(filterOPtions, cmd_params);
+    // displayFilesToBeDownloaded(filterOPtions, cmd_params);
 
-    if (!displayReleaseNoteFiles(filterOPtions, cmd_params)) {
+    if (!displayReleaseNoteFiles(filterOPtions, cmd_params))
+    {
         return res;
     }
     res = download(srq, filterOPtions.urls, filterOPtions.names, filterOPtions.osDirName, cmd_params.download_dir);
-    if (res < 0) {
+    if (res < 0)
+    {
         print_err("-E- Failed to download files from server\n");
         res = ERR_CODE_SERVER_RETRIEVE_FAIL;
-    } else {
+    }
+    else
+    {
         print_out("Downloading file(s) to : '%s' is done successfully\n", cmd_params.download_dir.c_str());
     }
     return res;
 }
 
-int generateProductionName(string &targetFile, PsidQueryItem ri)
+int generateProductionName(string& targetFile, PsidQueryItem ri)
 {
     int res = 0;
 
-    if (targetFile.length()) {
+    if (targetFile.length())
+    {
         return res;
     }
 
     string IC_code_name;
     dm_dev_id_t devType;
 
-    if (dm_get_device_id_offline(ri.devId, ri.revId, &devType)) {
+    if (dm_get_device_id_offline(ri.devId, ri.revId, &devType))
+    {
         IC_code_name = "X";
-    } else {
-        switch (devType) {
-        case DeviceInfiniScaleIV:
-            IC_code_name = "IS4";
-            break;
+    }
+    else
+    {
+        switch (devType)
+        {
+            case DeviceInfiniScaleIV:
+                IC_code_name = "IS4";
+                break;
 
-        case DeviceSwitchX:
-            IC_code_name = "SX";
-            break;
+            case DeviceSwitchX:
+                IC_code_name = "SX";
+                break;
 
-        default:
-            IC_code_name = dm_dev_type2str(devType);
+            default:
+                IC_code_name = dm_dev_type2str(devType);
         }
     }
 
-    ImgVersion *fwImgVer = (ImgVersion*)ri.findImageVersion("FW");
-    if (fwImgVer == NULL) {
+    ImgVersion* fwImgVer = (ImgVersion*)ri.findImageVersion("FW");
+    if (fwImgVer == NULL)
+    {
         print_err("-E- UnExpected error getting version\n");
         return 1;
     }
     string fw = fwImgVer->getPrintableVersion(0, false);
     targetFile = "fw-" + IC_code_name + "-rel-" + fw + "-";
-    if (ri.iniName != "") {
+    if (ri.iniName != "")
+    {
         targetFile += ri.iniName;
-    } else if (ri.pns != "") {
+    }
+    else if (ri.pns != "")
+    {
         targetFile += ri.pns;
-    } else {
+    }
+    else
+    {
         targetFile += ri.psid;
     }
-    for (unsigned int i = 0; i < ri.imgVers.size(); i++) {
-        if (ri.imgVers[i].getTypeStr() == "FW") {
+    for (unsigned int i = 0; i < ri.imgVers.size(); i++)
+    {
+        if (ri.imgVers[i].getTypeStr() == "FW")
+        {
             continue;
-        } else {
+        }
+        else
+        {
             targetFile += "-";
             targetFile += ri.imgVers[i].getTypeStr();
             targetFile += "-";
@@ -2404,7 +2937,8 @@ int generateProductionName(string &targetFile, PsidQueryItem ri)
 
 void displayReleaseNoteMFAs(map<string, PsidQueryItem> psidUpdateInfo, vector<MlnxDev*> devs, int deviceIndex)
 {
-    if (psidUpdateInfo[devs[deviceIndex]->getPsid()].release_note.length()) {
+    if (psidUpdateInfo[devs[deviceIndex]->getPsid()].release_note.length())
+    {
         print_out("Release notes for the available Firmware:\n");
         print_out("-----------------------------------------\n\n");
         print_out("  %s\n", psidUpdateInfo[devs[deviceIndex]->getPsid()].release_note.c_str());
@@ -2420,45 +2954,53 @@ void displayReleaseNoteMFAs(map<string, PsidQueryItem> psidUpdateInfo, vector<Ml
     print_out("\n");
    }*/
 
-int displayReleaseNoteFiles(const filesOPtions& filterOPtions, const CmdLineParams &cmd_params)
+int displayReleaseNoteFiles(const filesOPtions& filterOPtions, const CmdLineParams& cmd_params)
 {
-
     map<std::string, std::string> releaseNote;
-    map<std::string, vector <string> > os;
-    map<std::string, vector <string> > files;
+    map<std::string, vector<string> > os;
+    map<std::string, vector<string> > files;
     string tmp = "";
-    for (unsigned int i = 0; i < filterOPtions.filtered.size(); i++) {
+    for (unsigned int i = 0; i < filterOPtions.filtered.size(); i++)
+    {
         files[filterOPtions.filtered[i].family].push_back(filterOPtions.filtered[i].name);
         os[filterOPtions.filtered[i].family].push_back(filterOPtions.filtered[i].os);
-        if (filterOPtions.filtered[i].release_note.length()) {
+        if (filterOPtions.filtered[i].release_note.length())
+        {
             releaseNote[filterOPtions.filtered[i].family] = filterOPtions.filtered[i].release_note;
         }
     }
 
     print_out("------ Files To Be Downloaded ------\n\n");
-    for (map<std::string, vector <string> >::iterator p = files.begin(); p != files.end(); ++p) {
+    for (map<std::string, vector<string> >::iterator p = files.begin(); p != files.end(); ++p)
+    {
         print_out("\n%s :\n", beautify_device_name(p->first).c_str());
-        print_out("%.*s\n\n", p->first.length() + 2 < 40 ?  (int)p->first.length() + 2 : 39, "----------------------------------------");
+        print_out("%.*s\n\n", p->first.length() + 2 < 40 ? (int)p->first.length() + 2 : 39,
+                  "----------------------------------------");
         print_out("<Files>:\n");
-        for (unsigned int i = 0; i < p->second.size(); i++) {
+        for (unsigned int i = 0; i < p->second.size(); i++)
+        {
             tmp = "";
-            if (os[p->first][i] != "all") {
+            if (os[p->first][i] != "all")
+            {
                 tmp = os[p->first][i] + PATH_SEPARATOR;
             }
             print_out("%d - %s\n", i, (tmp + p->second[i]).c_str());
         }
         print_out("\n");
 
-        if (releaseNote.count(p->first)) {
+        if (releaseNote.count(p->first))
+        {
             print_out("<Release Notes>:\n");
             print_out("%s\n", releaseNote[p->first].c_str());
         }
         print_out("\n");
     }
     int answer = prompt("Perform Download? [y/N]: ", cmd_params.yes_no_);
-    if (!answer && !abort_request) {
+    if (!answer && !abort_request)
+    {
         sleep(1);
-        if (!abort_request && IS_OKAY_To_INTERRUPT) {
+        if (!abort_request && IS_OKAY_To_INTERRUPT)
+        {
             print_out("\nNo download performed\n");
         }
     }
diff --git a/mlxfwupdate/mlxfwmanager.h b/mlxfwupdate/mlxfwmanager.h
index f18d6973..85136dbc 100644
--- a/mlxfwupdate/mlxfwmanager.h
+++ b/mlxfwupdate/mlxfwmanager.h
@@ -59,37 +59,55 @@
 #include "mlxfwmanager_common.h"
 #include "menu.h"
 
-FILE *FLog = NULL;
-FILE *FOut = stdout;
-FILE *FErr = stderr;
+FILE* FLog = NULL;
+FILE* FOut = stdout;
+FILE* FErr = stderr;
 extern string toolName;
 
-#define print_out(...) do {                                        \
-        if (!formatted_output) {                              \
-            fprintf(FOut, __VA_ARGS__);                        \
-            fflush(FOut);                                     \
-        }                                                     \
-        if (FLog != NULL) { fprintf(FLog, __VA_ARGS__);}        \
-} while (0)
-
-#define print_err(...) do {                                        \
-        if (!formatted_output) {                              \
-            fprintf(FErr, __VA_ARGS__);                       \
-            fflush(FErr);                                     \
-        }                                                     \
-        if (FLog != NULL) { fprintf(FLog, __VA_ARGS__);} \
-} while (0)
-#define print_out_xml(...)do {                                        \
-        fprintf(FOut, __VA_ARGS__);                        \
-        fflush(FOut);                                     \
-        if (FLog != NULL) {fprintf(FLog, __VA_ARGS__);}        \
-} while (0)
+#define print_out(...)                  \
+    do                                  \
+    {                                   \
+        if (!formatted_output)          \
+        {                               \
+            fprintf(FOut, __VA_ARGS__); \
+            fflush(FOut);               \
+        }                               \
+        if (FLog != NULL)               \
+        {                               \
+            fprintf(FLog, __VA_ARGS__); \
+        }                               \
+    } while (0)
+
+#define print_err(...)                  \
+    do                                  \
+    {                                   \
+        if (!formatted_output)          \
+        {                               \
+            fprintf(FErr, __VA_ARGS__); \
+            fflush(FErr);               \
+        }                               \
+        if (FLog != NULL)               \
+        {                               \
+            fprintf(FLog, __VA_ARGS__); \
+        }                               \
+    } while (0)
+#define print_out_xml(...)              \
+    do                                  \
+    {                                   \
+        fprintf(FOut, __VA_ARGS__);     \
+        fflush(FOut);                   \
+        if (FLog != NULL)               \
+        {                               \
+            fprintf(FLog, __VA_ARGS__); \
+        }                               \
+    } while (0)
 
 int formatted_output = 0;
 
 using namespace std;
 
-typedef struct {
+typedef struct
+{
     string mfa_path;
     bool path_is_file;
     bool display_file_names;
@@ -101,73 +119,116 @@ typedef struct {
     mlxFWMSetupType::T setupType;
 } config_t;
 
-int mainEntry(int argc, char *argv[]);
+int mainEntry(int argc, char* argv[]);
 string getline();
-//void    displayFilesToBeDownloaded(filesOPtions filterOPtions, CmdLineParams cmd_params);
-int    displayReleaseNoteFiles(const filesOPtions& filterOPtions, const CmdLineParams &cmd_params);
-void   displayReleaseNoteMFAs(map<string, PsidQueryItem> psidUpdateInfo, vector<MlnxDev*> devs, int deviceIndex);
-void   display_file_listing(vector<PsidQueryItem> &items, string psid, bool show_titles);
-int    getLocalDevices(dev_info **devs);
-void   getUniquePsidList(vector<MlnxDev*> &devs, vector<string> &psid_list, vector<dm_dev_id_t> &dev_types_list, vector<string> &fw_version_list);
-void   getUniqueMFAList(vector<MlnxDev*> &devs, map<string, PsidQueryItem> &psidUpdateInfo, int force_update, vector<string> &mfa_list, vector <string> &mfa_base_name_list);
-int    queryMFAs(ServerRequest *srq, string &mfa_path, vector<string> &psid_list, vector<dm_dev_id_t> &dev_types_list, map<string, PsidQueryItem> &psidUpdateInfo, int online_update, string &errorMsg, vector<string> &fw_version_list);
-int    download(ServerRequest *srq, vector<string> &url, vector <string>&fileNames, vector <string>&os, string path, bool show_location = true);
-int    checkAndDisplayDeviceQuery1D(vector<MlnxDev*> &devs, map<string, PsidQueryItem> &psidUpdateInfo, PsidLookupDB &psidLookupDB,
-                                    int update_query_, int img_path_provided, int force_update, bool is_query, bool is_query_xml, string &xml_query, string &errorMsg, CmdLineParams &cmd_params);
-
-void printDeviceInfoQuery(int dev_index, string devname, string deviceType, string pn, string description,
-                          string statusStr, vector<MlnxDev*> &devs, string ver, string availVer, map<string, bool> expRomTypes,
-                          map<string, int> devRomTypeIndex, map<string, int> availRomTypeIndex, map<string, PsidQueryItem> &psidUpdateInfo, bool multiple_images_found);
-
-string generateQueryXML(int dev_index, string devname, string deviceType, string pn, string description,
-                        string statusStr, vector<MlnxDev*> &devs, string ver, string availVer, map<string, bool> expRomTypes,
-                        map<string, int> devRomTypeIndex, map<string, int> availRomTypeIndex, map<string, PsidQueryItem> &psidUpdateInfo, bool multiple_images_found);
-
-int    prompt(const char *str, int yes_no_);
-FILE*  createOutFile(string &fileName, bool fileSpecified);
-int    progressCB_nodisplay(int completion);
-int    progressCB_display(int completion);
-int    advProgressFunc_display(int completion, const char *stage, prog_t type, int *unknownProgress);
-bool   checkCmdParams(CmdLineParams &cmd_params, config_t &config);
-bool   initConfig(config_t &config, char *argv[], CmdLineParams &cmd_params);
-bool   getIniParams(config_t &config);
+// void    displayFilesToBeDownloaded(filesOPtions filterOPtions, CmdLineParams cmd_params);
+int displayReleaseNoteFiles(const filesOPtions& filterOPtions, const CmdLineParams& cmd_params);
+void displayReleaseNoteMFAs(map<string, PsidQueryItem> psidUpdateInfo, vector<MlnxDev*> devs, int deviceIndex);
+void display_file_listing(vector<PsidQueryItem>& items, string psid, bool show_titles);
+int getLocalDevices(dev_info** devs);
+void getUniquePsidList(vector<MlnxDev*>& devs,
+                       vector<string>& psid_list,
+                       vector<dm_dev_id_t>& dev_types_list,
+                       vector<string>& fw_version_list);
+void getUniqueMFAList(vector<MlnxDev*>& devs,
+                      map<string, PsidQueryItem>& psidUpdateInfo,
+                      int force_update,
+                      vector<string>& mfa_list,
+                      vector<string>& mfa_base_name_list);
+int queryMFAs(ServerRequest* srq,
+              string& mfa_path,
+              vector<string>& psid_list,
+              vector<dm_dev_id_t>& dev_types_list,
+              map<string, PsidQueryItem>& psidUpdateInfo,
+              int online_update,
+              string& errorMsg,
+              vector<string>& fw_version_list);
+int download(ServerRequest* srq,
+             vector<string>& url,
+             vector<string>& fileNames,
+             vector<string>& os,
+             string path,
+             bool show_location = true);
+int checkAndDisplayDeviceQuery1D(vector<MlnxDev*>& devs,
+                                 map<string, PsidQueryItem>& psidUpdateInfo,
+                                 PsidLookupDB& psidLookupDB,
+                                 int update_query_,
+                                 int img_path_provided,
+                                 int force_update,
+                                 bool is_query,
+                                 bool is_query_xml,
+                                 string& xml_query,
+                                 string& errorMsg,
+                                 CmdLineParams& cmd_params);
+
+void printDeviceInfoQuery(int dev_index,
+                          string devname,
+                          string deviceType,
+                          string pn,
+                          string description,
+                          string statusStr,
+                          vector<MlnxDev*>& devs,
+                          string ver,
+                          string availVer,
+                          map<string, bool> expRomTypes,
+                          map<string, int> devRomTypeIndex,
+                          map<string, int> availRomTypeIndex,
+                          map<string, PsidQueryItem>& psidUpdateInfo,
+                          bool multiple_images_found);
+
+string generateQueryXML(int dev_index,
+                        string devname,
+                        string deviceType,
+                        string pn,
+                        string description,
+                        string statusStr,
+                        vector<MlnxDev*>& devs,
+                        string ver,
+                        string availVer,
+                        map<string, bool> expRomTypes,
+                        map<string, int> devRomTypeIndex,
+                        map<string, int> availRomTypeIndex,
+                        map<string, PsidQueryItem>& psidUpdateInfo,
+                        bool multiple_images_found);
+
+int prompt(const char* str, int yes_no_);
+FILE* createOutFile(string& fileName, bool fileSpecified);
+int progressCB_nodisplay(int completion);
+int progressCB_display(int completion);
+int advProgressFunc_display(int completion, const char* stage, prog_t type, int* unknownProgress);
+bool checkCmdParams(CmdLineParams& cmd_params, config_t& config);
+bool initConfig(config_t& config, char* argv[], CmdLineParams& cmd_params);
+bool getIniParams(config_t& config);
 string adjustRelPath(string path, string adjuster);
-int    isDirectory(string path);
-int    isFile(string path);
-int    list_files_content(config_t &config);
-int    extract_all(CmdLineParams &cmd_params, config_t &config, ServerRequest *srq);
-int    extract_image(CmdLineParams &cmd_params, config_t &config, ServerRequest *srq, bool useExtractDir = false);
-int   CalcFileCrc(char *fileName);
-void  TerminationHandler(int signum);
-void  initHandler();
-void  replaceStringInPlace(string& subject, const string& search,
-                           const string& replace);
-void  fixXmlString(string & stringToFix);
+int isDirectory(string path);
+int isFile(string path);
+int list_files_content(config_t& config);
+int extract_all(CmdLineParams& cmd_params, config_t& config, ServerRequest* srq);
+int extract_image(CmdLineParams& cmd_params, config_t& config, ServerRequest* srq, bool useExtractDir = false);
+int CalcFileCrc(char* fileName);
+void TerminationHandler(int signum);
+void initHandler();
+void replaceStringInPlace(string& subject, const string& search, const string& replace);
+void fixXmlString(string& stringToFix);
 
 bool isServerRequestorRequired(CmdLineParams& cmd_params);
 
-int check_valid_os_type(CmdLineParams &cmd_params, bool* os_valid);
+int check_valid_os_type(CmdLineParams& cmd_params, bool* os_valid);
 
-int handleGetDownloadOptionsRequest(ServerRequest *srq, CmdLineParams &cmd_params);
+int handleGetDownloadOptionsRequest(ServerRequest* srq, CmdLineParams& cmd_params);
 
-int   handleDownloadRequest(ServerRequest *srq,
-                            CmdLineParams &cmd_params, config_t config);
-
-int handleOnlinePsidsQuery(ServerRequest *srq,
-                           CmdLineParams &cmd_params, config_t config);
-int handleOnlinePsidsQueryXml(ServerRequest *srq,
-                              CmdLineParams &cmd_params, config_t config);
-void filterFiles(vector <DownloadedFileProperties> files,
-                 vector <DownloadedFileProperties> &filtered_files,
-                 int file_type, int os, int family);
-
-int generateProductionName(string &targetFile, PsidQueryItem ri);
+int handleDownloadRequest(ServerRequest* srq, CmdLineParams& cmd_params, config_t config);
 
+int handleOnlinePsidsQuery(ServerRequest* srq, CmdLineParams& cmd_params, config_t config);
+int handleOnlinePsidsQueryXml(ServerRequest* srq, CmdLineParams& cmd_params, config_t config);
+void filterFiles(vector<DownloadedFileProperties> files,
+                 vector<DownloadedFileProperties>& filtered_files,
+                 int file_type,
+                 int os,
+                 int family);
 
+int generateProductionName(string& targetFile, PsidQueryItem ri);
 
 int abort_request = 0;
 int CompareFFV = 0;
 bool IS_OKAY_To_INTERRUPT = false;
-
-
-
diff --git a/mlxfwupdate/mlxfwmanager_common.cpp b/mlxfwupdate/mlxfwmanager_common.cpp
index 16fc2612..d044048a 100644
--- a/mlxfwupdate/mlxfwmanager_common.cpp
+++ b/mlxfwupdate/mlxfwmanager_common.cpp
@@ -40,11 +40,12 @@
 #endif
 
 #if defined(__WIN__)
-const char* SafeGetEnv(const char *var)
+const char* SafeGetEnv(const char* var)
 {
-    char *val = getenv(var);
-    if (val == NULL) {
-        return ".";                 //Local dir
+    char* val = getenv(var);
+    if (val == NULL)
+    {
+        return "."; // Local dir
     }
     return val;
 }
@@ -57,38 +58,47 @@ int mapRetValue(int rc, mlxFWMSetupType::T setupType)
 
     map<int, int> dl;
     dl[ERR_CODE_NO_DEVICES_FOUND] = 0;
-    switch (setupType) {
-    case mlxFWMSetupType::lvim:
-        if (lvim.find(rc) != lvim.end() ) {
-            return lvim[rc];
-        }
-        break;
+    switch (setupType)
+    {
+        case mlxFWMSetupType::lvim:
+            if (lvim.find(rc) != lvim.end())
+            {
+                return lvim[rc];
+            }
+            break;
 
-    case mlxFWMSetupType::dl:
-        if (dl.find(rc) != dl.end() ) {
-            return dl[rc];
-        }
-        break;
+        case mlxFWMSetupType::dl:
+            if (dl.find(rc) != dl.end())
+            {
+                return dl[rc];
+            }
+            break;
 
-    default:
-        return rc;
+        default:
+            return rc;
     }
     return rc;
 }
 string beautify_device_name(string family)
 {
-    if (family == "connectx") {
+    if (family == "connectx")
+    {
         return "ConnectX";
-    } else if (family == "connect-ib") {
+    }
+    else if (family == "connect-ib")
+    {
         return "Connect-IB";
-    } else if (family == "connectx-4") {
+    }
+    else if (family == "connectx-4")
+    {
         return "ConnectX-4";
-    } else {
+    }
+    else
+    {
         return family;
     }
 }
 
-
 int CreateTempDir(string tempDir, string& tempBaseDir)
 {
     int rc = 0;
@@ -96,14 +106,14 @@ int CreateTempDir(string tempDir, string& tempBaseDir)
     const int len = 512;
     char tmpstr[len] = {0};
 
-
-    #ifdef __WIN__
+#ifdef __WIN__
     int size;
     int pid;
     templ = tempDir;
 
     size = sizeof(tmpstr);
-    if (!GetUserName((LPTSTR)tmpstr, (LPDWORD)&size)) {
+    if (!GetUserName((LPTSTR)tmpstr, (LPDWORD)&size))
+    {
         fprintf(stderr, "-E- Failed to get username\n");
         return -1;
     }
@@ -115,53 +125,57 @@ int CreateTempDir(string tempDir, string& tempBaseDir)
 
     FixPath(templ);
     rc = ForceMkDir(templ);
-    if (rc != 0) {
+    if (rc != 0)
+    {
         fprintf(stderr, "-E- Failed to create temporary directory %s: %s\n", templ.c_str(), strerror(rc));
         return -1;
     }
-    #else
-    char *temp;
+#else
+    char* temp;
     tempDir += "XXXXXX";
     strncpy(tmpstr, tempDir.c_str(), len - 1);
     temp = mkdtemp(tmpstr);
-    if (temp == NULL) {
+    if (temp == NULL)
+    {
         fprintf(stderr, "-E- Failed to create temporary directory\n");
         return -1;
     }
     templ = tmpstr;
-    #endif
+#endif
 
     tempBaseDir = templ;
     return rc;
 }
 
-int RemoveDir(const string &dir)
+int RemoveDir(const string& dir)
 {
     string rmdirCmd;
 
-    #ifdef __WIN__
+#ifdef __WIN__
     rmdirCmd = "rd /s /q \"";
     rmdirCmd += dir;
     rmdirCmd += "\"";
-    #else
-    if ((dir == "/") || (dir == "")) {
+#else
+    if ((dir == "/") || (dir == ""))
+    {
         return 0;
     }
     rmdirCmd = "rm -rf ";
     rmdirCmd += dir;
-    #endif
+#endif
     return system(rmdirCmd.c_str());
 }
 
 int MkDir(const string dir)
 {
     int rc;
-    #ifdef __WIN__
+#ifdef __WIN__
     rc = mkdir(dir.c_str());
-    #else
+#else
     rc = mkdir(dir.c_str(), 0777);
-    #endif
-    if (rc) {
+#endif
+    if (rc)
+    {
         rc = errno;
     }
     return rc;
@@ -169,38 +183,44 @@ int MkDir(const string dir)
 
 #ifdef __WIN__
 
-void FixPath(string &s)
+void FixPath(string& s)
 {
-    #ifdef __WIN__
+#ifdef __WIN__
     size_t pos;
-    while ((pos = s.find('/')) != string::npos) {
-        s.replace( pos, 1, "\\");
+    while ((pos = s.find('/')) != string::npos)
+    {
+        s.replace(pos, 1, "\\");
     }
-    #else
+#else
     (void)s;
-    #endif
+#endif
 }
 
 int ForceMkDir(const string dir)
 {
     int rc = MkDir(dir);
-    if (rc != 0) {
-        if (rc == EEXIST) {
+    if (rc != 0)
+    {
+        if (rc == EEXIST)
+        {
             RemoveDir(dir);
             rc = MkDir(dir);
-        } else {
+        }
+        else
+        {
             return rc;
         }
     }
     return rc;
 }
 
-int mlxfw_replace(char *st, char *orig, char *repl)
+int mlxfw_replace(char* st, char* orig, char* repl)
 {
     char buffer[1024];
-    char *ch;
+    char* ch;
 
-    if (!(ch = strstr(st, orig))) {
+    if (!(ch = strstr(st, orig)))
+    {
         return 0;
     }
     strncpy(buffer, st, ch - st);
@@ -211,13 +231,14 @@ int mlxfw_replace(char *st, char *orig, char *repl)
     return 0;
 }
 
-int mlxfw_get_exec_name_from_path(char *str, char *exec_name)
+int mlxfw_get_exec_name_from_path(char* str, char* exec_name)
 {
-    char *tmp_str = new char[strlen(str) + 1];
-    char *pch;
+    char* tmp_str = new char[strlen(str) + 1];
+    char* pch;
     strcpy(tmp_str, str);
     pch = strtok(tmp_str, "\\");
-    while (pch != NULL) {
+    while (pch != NULL)
+    {
         strcpy(exec_name, pch);
         pch = strtok(NULL, "\\");
     }
@@ -227,13 +248,12 @@ int mlxfw_get_exec_name_from_path(char *str, char *exec_name)
 
 #endif
 
-bool unzipDataFile(std::vector<u_int8_t> data,
-                   std::vector<u_int8_t> &newData,
-                   const char *sectionName)
+bool unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t>& newData, const char* sectionName)
 {
 #ifndef NO_ZLIB
     int rc;
-    if (data.empty()) {
+    if (data.empty())
+    {
         return false;
     }
     // restore endianess.
@@ -244,17 +264,19 @@ bool unzipDataFile(std::vector<u_int8_t> data,
     destLen *= 40; // Assuming this is the best compression ratio
     vector<u_int8_t> dest(destLen);
 
-    for (int i = 0; i < 32; i++) {
-        rc = uncompress((Bytef*)&(dest[0]), &destLen,
-                        (const Bytef*)&(data[0]), data.size());
-        if (rc != Z_BUF_ERROR) {
+    for (int i = 0; i < 32; i++)
+    {
+        rc = uncompress((Bytef*)&(dest[0]), &destLen, (const Bytef*)&(data[0]), data.size());
+        if (rc != Z_BUF_ERROR)
+        {
             break;
         }
         destLen *= 2;
         dest.resize(destLen);
     }
 
-    if (rc != Z_OK) {
+    if (rc != Z_OK)
+    {
         return false;
     }
     // printf("%s", (char*)&(dest[0]));
@@ -262,34 +284,35 @@ bool unzipDataFile(std::vector<u_int8_t> data,
     newData = dest;
     newData[destLen] = 0; // Terminating NULL
     newData.resize(destLen + 1);
-    (void) sectionName;
+    (void)sectionName;
     return true;
 #else
     // avoid warnings
-    (void) data;
-    (void) newData;
-    (void) sectionName;
+    (void)data;
+    (void)newData;
+    (void)sectionName;
     return false;
 #endif
 }
 
 #ifdef __WIN__
-int my_chmod(const char *path, mode_t mode)
+int my_chmod(const char* path, mode_t mode)
 {
-
     int result = _chmod(path, (mode & MS_MODE_MASK));
 
-    if (result != 0) {
+    if (result != 0)
+    {
         result = errno;
     }
     return (result);
 }
 #else
-int my_chmod(const char *path, mode_t mode)
+int my_chmod(const char* path, mode_t mode)
 {
     int result = chmod(path, mode);
 
-    if (result != 0) {
+    if (result != 0)
+    {
         result = errno;
     }
     return (result);
@@ -299,7 +322,7 @@ int my_chmod(const char *path, mode_t mode)
 string getErrStr(int rc)
 {
     map<int, string> err_msg;
-    err_msg[MLX_FWM_SUCCESS] =  "";
+    err_msg[MLX_FWM_SUCCESS] = "";
     err_msg[ERR_CODE_QUERY_FAILED] = ERR_MSG_QUERY_FAILED;
     err_msg[ERR_CODE_PROG_FAILED] = ERR_MSG_PROG_FAILED;
     err_msg[ERR_CODE_BAD_CMD_ARGS] = ERR_MSG_BAD_CMD_ARGS;
@@ -329,7 +352,8 @@ string getErrStr(int rc)
     err_msg[ERR_CODE_INVALID_CHOICE] = ERR_MSG_IVALID_CHOICE;
     err_msg[ERR_CODE_NONE_FAIL_SAFE] = ERR_MSG_NONE_FAIL_SAFE;
     err_msg[ERR_CODE_SERVER_QUERY_FAILED] = ERR_MSG_SERVER_QUERY;
-    if (err_msg.find(rc) != err_msg.end()) {
+    if (err_msg.find(rc) != err_msg.end())
+    {
         return err_msg[rc];
     }
     return "Unknown error";
diff --git a/mlxfwupdate/mlxfwmanager_common.h b/mlxfwupdate/mlxfwmanager_common.h
index d6c6c8c7..2c001b86 100644
--- a/mlxfwupdate/mlxfwmanager_common.h
+++ b/mlxfwupdate/mlxfwmanager_common.h
@@ -32,9 +32,6 @@
  *
  */
 
-
-
-
 #ifndef __MLXFWMANAGER_COMMON_H__
 #define __MLXFWMANAGER_COMMON_H__
 
@@ -59,40 +56,44 @@
 #include "err_msgs.h"
 
 #ifndef NO_ZLIB
-    #include <zlib.h>
+#include <zlib.h>
 #endif
 
-
 #if defined(__WIN__)
 #include <process.h>
 #include <io.h>
 #ifdef _MSC_VER
 typedef int mode_t;
 #endif
-const char* SafeGetEnv(const char *var);
+const char* SafeGetEnv(const char* var);
 #define TMP_DIR SafeGetEnv("TEMP")
 #define PATH_SEPARATOR "\\"
 #define GetCurrDir(sz, buf) GetCurrentDirectory(sz, buf)
 #else
-#define TMP_DIR  "/tmp"
+#define TMP_DIR "/tmp"
 #define PATH_SEPARATOR "/"
 #define GetCurrDir(sz, buf) getcwd(buf, sz)
 #endif
 
-
 using namespace std;
 
 inline string getLogDir(string toolName)
 {
-    #if defined(__WIN__)
+#if defined(__WIN__)
     (void)toolName;
     return TMP_DIR;
-    #else
+#else
     return (string) "/tmp/" + toolName + "_workdir";
-    #endif
+#endif
 }
-namespace mlxFWMSetupType {
-enum T {normal, lvim, dl};
+namespace mlxFWMSetupType
+{
+enum T
+{
+    normal,
+    lvim,
+    dl
+};
 };
 
 inline string int_to_string(int num)
@@ -103,26 +104,26 @@ inline string int_to_string(int num)
 }
 
 string getErrStr(int rc);
-int    mapRetValue(int rc, mlxFWMSetupType::T setupType);
+int mapRetValue(int rc, mlxFWMSetupType::T setupType);
 string beautify_device_name(string family);
-int    CreateTempDir(string tempDir, string& tempBaseDir);
-int    my_chmod(const char *path, mode_t mode);
-int    RemoveDir(const string &dir);
+int CreateTempDir(string tempDir, string& tempBaseDir);
+int my_chmod(const char* path, mode_t mode);
+int RemoveDir(const string& dir);
 
-bool   unzipDataFile(std::vector<u_int8_t> data,
-                     std::vector<u_int8_t> &newData, const char *sectionName);
-int  MkDir(const string dir);
+bool unzipDataFile(std::vector<u_int8_t> data, std::vector<u_int8_t>& newData, const char* sectionName);
+int MkDir(const string dir);
 
 #if defined(__WIN__)
-int  ForceMkDir(const string dir);
-void FixPath(string &s);
-int mlxfw_replace(char *st, char *orig, char *repl);
-int mlxfw_get_exec_name_from_path(char *str, char *exec_name);
+int ForceMkDir(const string dir);
+void FixPath(string& s);
+int mlxfw_replace(char* st, char* orig, char* repl);
+int mlxfw_get_exec_name_from_path(char* str, char* exec_name);
 #define mlxfw_MTCR_DLL_NAME "libmtcr-1.dll"
 static const mode_t MS_MODE_MASK = 0x0000ffff;
 #endif
 
-class DownloadedFileProperties {
+class DownloadedFileProperties
+{
 public:
     string url;
     string name;
@@ -134,4 +135,3 @@ class DownloadedFileProperties {
 };
 
 #endif
-
diff --git a/mlxfwupdate/output_fmts.cpp b/mlxfwupdate/output_fmts.cpp
index 81d2698b..49b83eb2 100644
--- a/mlxfwupdate/output_fmts.cpp
+++ b/mlxfwupdate/output_fmts.cpp
@@ -42,7 +42,6 @@
 #include "err_msgs.h"
 #include <iomanip>
 
-
 string int2str(int n)
 {
     stringstream num;
@@ -53,7 +52,6 @@ string int2str(int n)
     return str;
 }
 
-
 string hex2str(int n, int w = 1)
 {
     stringstream num;
@@ -64,60 +62,74 @@ string hex2str(int n, int w = 1)
     return str;
 }
 
-
-int OutputFmts::createInventoryXML(vector<MlnxDev*> &devs, PsidLookupDB &psidLookupDB, int result, string msg, string &buffer, int buf_is_file)
+int OutputFmts::createInventoryXML(vector<MlnxDev*>& devs,
+                                   PsidLookupDB& psidLookupDB,
+                                   int result,
+                                   string msg,
+                                   string& buffer,
+                                   int buf_is_file)
 {
     int res = 0;
 #ifdef USE_XML
     xmlDocPtr doc = NULL;
-    xmlNodePtr root_node = NULL, devices_node = NULL, node = NULL; //device_node = NULL, fw_node = NULL, ;
+    xmlNodePtr root_node = NULL, devices_node = NULL, node = NULL; // device_node = NULL, fw_node = NULL, ;
     doc = xmlNewDoc(BAD_CAST "1.0");
 
     root_node = xmlNewNode(NULL, BAD_CAST "SVMInventory");
     xmlNewProp(root_node, BAD_CAST "lang", BAD_CAST "en");
     xmlDocSetRootElement(doc, root_node);
 
-    for (unsigned i = 0; i < devs.size(); i++) {
+    for (unsigned i = 0; i < devs.size(); i++)
+    {
         devices_node = xmlNewChild(root_node, NULL, BAD_CAST "Device", NULL);
         xmlNewProp(devices_node, BAD_CAST "vendorID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.vend_id).c_str());
         xmlNewProp(devices_node, BAD_CAST "deviceID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.dev_id).c_str());
-        xmlNewProp(devices_node, BAD_CAST "subDeviceID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_id, 4).c_str());
-        xmlNewProp(devices_node, BAD_CAST "subVendorID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_vend_id).c_str());
+        xmlNewProp(devices_node, BAD_CAST "subDeviceID",
+                   BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_id, 4).c_str());
+        xmlNewProp(devices_node, BAD_CAST "subVendorID",
+                   BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_vend_id).c_str());
         xmlNewProp(devices_node, BAD_CAST "domain", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.domain).c_str());
         xmlNewProp(devices_node, BAD_CAST "bus", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.bus).c_str());
         xmlNewProp(devices_node, BAD_CAST "device", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.dev).c_str());
         xmlNewProp(devices_node, BAD_CAST "function", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.func).c_str());
-        if (!devs[i]->isQuerySuccess()) {
+        if (!devs[i]->isQuerySuccess())
+        {
             continue;
         }
-        xmlNewProp(devices_node, BAD_CAST "display", BAD_CAST psidLookupDB.getProdDesc(devs[i]->getBoardTypeId()).c_str());
+        xmlNewProp(devices_node, BAD_CAST "display",
+                   BAD_CAST psidLookupDB.getProdDesc(devs[i]->getBoardTypeId()).c_str());
         node = xmlNewChild(devices_node, NULL, BAD_CAST "Application", NULL);
         xmlNewProp(node, BAD_CAST "componentType", BAD_CAST "FRMW");
         xmlNewProp(node, BAD_CAST "version", BAD_CAST devs[i]->getFWVersion(false).c_str());
         xmlNewProp(node, BAD_CAST "display", BAD_CAST psidLookupDB.getProdDesc(devs[i]->getBoardTypeId()).c_str());
-
     }
 
-    if (result) {
+    if (result)
+    {
         node = xmlNewChild(root_node, NULL, BAD_CAST "SPStatus", NULL);
         xmlNewProp(node, BAD_CAST "result", BAD_CAST "false");
         node = xmlNewChild(node, NULL, BAD_CAST "Message", BAD_CAST msg.c_str());
         xmlNewProp(node, BAD_CAST "id", BAD_CAST int2str(result).c_str());
     }
 
-    if (buf_is_file) {
+    if (buf_is_file)
+    {
         int rc = xmlSaveFormatFileEnc(buffer.c_str(), doc, "UTF-8", 1);
-        if (rc == -1) {
+        if (rc == -1)
+        {
             res = -1;
         }
-    } else {
-        xmlChar *doc_txt_ptr;
+    }
+    else
+    {
+        xmlChar* doc_txt_ptr;
         int doc_txt_len;
 
         xmlDocDumpFormatMemoryEnc(doc, &doc_txt_ptr, &doc_txt_len, "UTF-8", 1);
-        if (doc_txt_len) {
+        if (doc_txt_len)
+        {
             buffer = (char*)doc_txt_ptr;
-            //xmlFree(doc_txt_ptr); //TODO: This is a leak, temporarily only until windows crash is resolved!!
+            // xmlFree(doc_txt_ptr); //TODO: This is a leak, temporarily only until windows crash is resolved!!
         }
     }
 
@@ -127,8 +139,12 @@ int OutputFmts::createInventoryXML(vector<MlnxDev*> &devs, PsidLookupDB &psidLoo
     return res;
 }
 
-
-int OutputFmts::createBurnXML(vector<MlnxDev*> &devs, map<string, PsidQueryItem> &psidUpdateInfo, PsidLookupDB &psidLookupDB, string &buffer, int buf_is_file, int compareFFV)
+int OutputFmts::createBurnXML(vector<MlnxDev*>& devs,
+                              map<string, PsidQueryItem>& psidUpdateInfo,
+                              PsidLookupDB& psidLookupDB,
+                              string& buffer,
+                              int buf_is_file,
+                              int compareFFV)
 {
     int res = 0;
 #ifdef USE_XML
@@ -140,17 +156,22 @@ int OutputFmts::createBurnXML(vector<MlnxDev*> &devs, map<string, PsidQueryItem>
     root_node = xmlNewNode(NULL, BAD_CAST "SVMExecution");
     xmlNewProp(root_node, BAD_CAST "lang", BAD_CAST "en");
     xmlDocSetRootElement(doc, root_node);
-    for (unsigned i = 0; i < devs.size(); i++) {
+    for (unsigned i = 0; i < devs.size(); i++)
+    {
         devices_node = xmlNewChild(root_node, NULL, BAD_CAST "Device", NULL);
         xmlNewProp(devices_node, BAD_CAST "vendorID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.vend_id).c_str());
         xmlNewProp(devices_node, BAD_CAST "deviceID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.dev_id).c_str());
-        xmlNewProp(devices_node, BAD_CAST "subDeviceID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_id, 4).c_str());
-        xmlNewProp(devices_node, BAD_CAST "subVendorID", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_vend_id).c_str());
+        xmlNewProp(devices_node, BAD_CAST "subDeviceID",
+                   BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_id, 4).c_str());
+        xmlNewProp(devices_node, BAD_CAST "subVendorID",
+                   BAD_CAST hex2str(devs[i]->getDevInfo()->pci.subsys_vend_id).c_str());
         xmlNewProp(devices_node, BAD_CAST "bus", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.bus).c_str());
         xmlNewProp(devices_node, BAD_CAST "device", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.dev).c_str());
         xmlNewProp(devices_node, BAD_CAST "function", BAD_CAST hex2str(devs[i]->getDevInfo()->pci.func).c_str());
-        xmlNewProp(devices_node, BAD_CAST "display", BAD_CAST psidLookupDB.getProdDesc(devs[i]->getBoardTypeId()).c_str());
-        if (!devs[i]->isQuerySuccess()) {
+        xmlNewProp(devices_node, BAD_CAST "display",
+                   BAD_CAST psidLookupDB.getProdDesc(devs[i]->getBoardTypeId()).c_str());
+        if (!devs[i]->isQuerySuccess())
+        {
             node = xmlNewChild(devices_node, NULL, BAD_CAST "SPStatus", NULL);
             xmlNewProp(node, BAD_CAST "result", BAD_CAST "false");
             node = xmlNewChild(node, NULL, BAD_CAST "Message", BAD_CAST "Failed to query the device.");
@@ -162,12 +183,16 @@ int OutputFmts::createBurnXML(vector<MlnxDev*> &devs, map<string, PsidQueryItem>
         xmlNewProp(app_node, BAD_CAST "version", BAD_CAST devs[i]->getFWVersion(false).c_str());
         xmlNewProp(app_node, BAD_CAST "display", BAD_CAST psidLookupDB.getProdDesc(devs[i]->getBoardTypeId()).c_str());
 
-        if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end()) {
-            if (psidUpdateInfo[devs[i]->getPsid()].found) {
+        if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end())
+        {
+            if (psidUpdateInfo[devs[i]->getPsid()].found)
+            {
                 node = xmlNewChild(app_node, NULL, BAD_CAST "Package", NULL);
-                ImgVersion *fwImgVer = (ImgVersion*)psidUpdateInfo[devs[i]->getPsid()].findImageVersion("FW");
-                if (fwImgVer != NULL) {
-                    xmlNewProp(node, BAD_CAST "version", BAD_CAST fwImgVer->getPrintableVersion(compareFFV, false).c_str());
+                ImgVersion* fwImgVer = (ImgVersion*)psidUpdateInfo[devs[i]->getPsid()].findImageVersion("FW");
+                if (fwImgVer != NULL)
+                {
+                    xmlNewProp(node, BAD_CAST "version",
+                               BAD_CAST fwImgVer->getPrintableVersion(compareFFV, false).c_str());
                 }
             }
         }
@@ -175,63 +200,82 @@ int OutputFmts::createBurnXML(vector<MlnxDev*> &devs, map<string, PsidQueryItem>
 
         int burn_res = ERR_CODE_PROG_FAILED;
         string msg = "Update failure.";
-        if (devs[i]->isBurnSuccess() == 0) {
+        if (devs[i]->isBurnSuccess() == 0)
+        {
             msg += " ";
             msg += devs[i]->getLastErrMsg();
-        } else if (devs[i]->isBurnSuccess() == 1) {
+        }
+        else if (devs[i]->isBurnSuccess() == 1)
+        {
             boot_required = 1;
             burn_res = MLX_FWM_SUCCESS;
             msg = "Update success.";
-        } else { // == -1
-            if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end()) {
-                if (!psidUpdateInfo[devs[i]->getPsid()].found) {
+        }
+        else
+        { // == -1
+            if (psidUpdateInfo.find(devs[i]->getPsid()) != psidUpdateInfo.end())
+            {
+                if (!psidUpdateInfo[devs[i]->getPsid()].found)
+                {
                     msg += " No relevant image file was found for this device";
-                } else if (psidUpdateInfo[devs[i]->getPsid()].found > 1) {
+                }
+                else if (psidUpdateInfo[devs[i]->getPsid()].found > 1)
+                {
                     msg += " Multiple image sources found for this device";
-                } else {
-                    ImgVersion *fwImgVer = (ImgVersion*)psidUpdateInfo[devs[i]->getPsid()].findImageVersion("FW");
-                    if (fwImgVer != NULL) {
-                        if ((devs[i]->compareFWVer(*fwImgVer) <= 0) && !_force_mode) {
+                }
+                else
+                {
+                    ImgVersion* fwImgVer = (ImgVersion*)psidUpdateInfo[devs[i]->getPsid()].findImageVersion("FW");
+                    if (fwImgVer != NULL)
+                    {
+                        if ((devs[i]->compareFWVer(*fwImgVer) <= 0) && !_force_mode)
+                        {
                             burn_res = MLX_FWM_SUCCESS;
                             msg = "Update success. No update required.";
                         }
                     }
                 }
-            } else {
+            }
+            else
+            {
                 msg = "Update failure. No relevant image file was found for this device";
             }
         }
 
-        xmlNewProp(node, BAD_CAST "result", BAD_CAST(burn_res ? "false" : "true" ));
+        xmlNewProp(node, BAD_CAST "result", BAD_CAST(burn_res ? "false" : "true"));
         node = xmlNewChild(node, NULL, BAD_CAST "Message", BAD_CAST msg.c_str());
         xmlNewProp(node, BAD_CAST "id", BAD_CAST int2str(burn_res).c_str());
     }
     node = xmlNewChild(root_node, NULL, BAD_CAST "RebootRequired", BAD_CAST int2str(boot_required).c_str());
 
-    if (buf_is_file) {
+    if (buf_is_file)
+    {
         int rc = xmlSaveFormatFileEnc(buffer.c_str(), doc, "UTF-8", 1);
-        if (rc == -1) {
+        if (rc == -1)
+        {
             res = -1;
         }
-    } else {
-        xmlChar *doc_txt_ptr;
+    }
+    else
+    {
+        xmlChar* doc_txt_ptr;
         int doc_txt_len;
 
         xmlDocDumpFormatMemoryEnc(doc, &doc_txt_ptr, &doc_txt_len, "UTF-8", 1);
-        if (doc_txt_len) {
+        if (doc_txt_len)
+        {
             buffer = (char*)doc_txt_ptr;
-            //xmlFree(doc_txt_ptr); //TODO: This is a leak, temporarily only until windows crash is resolved!!
+            // xmlFree(doc_txt_ptr); //TODO: This is a leak, temporarily only until windows crash is resolved!!
         }
     }
-    (void) node;
+    (void)node;
     xmlFreeDoc(doc);
     xmlCleanupParser();
 #endif
     return res;
 }
 
-
-int OutputFmts::createFailXML(int result, int update_query_, string &buffer, int buf_is_file)
+int OutputFmts::createFailXML(int result, int update_query_, string& buffer, int buf_is_file)
 {
     int res = 0;
 #ifdef USE_XML
@@ -239,9 +283,12 @@ int OutputFmts::createFailXML(int result, int update_query_, string &buffer, int
     xmlNodePtr root_node = NULL, node = NULL;
     doc = xmlNewDoc(BAD_CAST "1.0");
 
-    if (update_query_ == 0) {
+    if (update_query_ == 0)
+    {
         root_node = xmlNewNode(NULL, BAD_CAST "SVMInventory");
-    } else {
+    }
+    else
+    {
         root_node = xmlNewNode(NULL, BAD_CAST "SVMExecution");
     }
     xmlNewProp(root_node, BAD_CAST "lang", BAD_CAST "en");
@@ -249,41 +296,46 @@ int OutputFmts::createFailXML(int result, int update_query_, string &buffer, int
 
     node = xmlNewChild(root_node, NULL, BAD_CAST "SPStatus", NULL);
     xmlNewProp(node, BAD_CAST "result", BAD_CAST "false");
-    if (update_query_ == 1) {
+    if (update_query_ == 1)
+    {
         xmlNewProp(node, BAD_CAST "code", BAD_CAST int2str(result).c_str());
     }
     node = xmlNewChild(node, NULL, BAD_CAST "Message", BAD_CAST getErrStr(result).c_str());
     xmlNewProp(node, BAD_CAST "id", BAD_CAST int2str(result).c_str());
 
-    if (update_query_ == 1) {
+    if (update_query_ == 1)
+    {
         node = xmlNewChild(root_node, NULL, BAD_CAST "RebootRequired", BAD_CAST "0");
     }
 
-    if (buf_is_file) {
+    if (buf_is_file)
+    {
         int rc = xmlSaveFormatFileEnc(buffer.c_str(), doc, "UTF-8", 1);
-        if (rc == -1) {
+        if (rc == -1)
+        {
             res = -1;
         }
-    } else {
-        xmlChar *doc_txt_ptr;
+    }
+    else
+    {
+        xmlChar* doc_txt_ptr;
         int doc_txt_len;
 
         xmlDocDumpFormatMemoryEnc(doc, &doc_txt_ptr, &doc_txt_len, "UTF-8", 1);
-        if (doc_txt_len) {
+        if (doc_txt_len)
+        {
             buffer = (char*)doc_txt_ptr;
-            //xmlFree(doc_txt_ptr); //TODO: This is a leak, temporarily only until windows crash is resolved!!
+            // xmlFree(doc_txt_ptr); //TODO: This is a leak, temporarily only until windows crash is resolved!!
         }
     }
-    (void) node;
+    (void)node;
     xmlFreeDoc(doc);
     xmlCleanupParser();
 #endif
     return res;
 }
 
-
 void OutputFmts::setForceModeParam(bool force_mode)
 {
     _force_mode = force_mode;
 }
-
diff --git a/mlxfwupdate/output_fmts.h b/mlxfwupdate/output_fmts.h
index d7faec0a..744716b1 100644
--- a/mlxfwupdate/output_fmts.h
+++ b/mlxfwupdate/output_fmts.h
@@ -48,14 +48,23 @@ using namespace std;
 class OutputFmts
 {
 public:
-    int createInventoryXML(vector<MlnxDev*> &devs, PsidLookupDB &psidLookupDB, int result, string msg, string &buffer, int buf_is_file);
-    int createBurnXML(vector<MlnxDev*> &devs, map<string, PsidQueryItem> &psidUpdateInfo, PsidLookupDB &psidLookupDB, string &buffer, int buf_is_file, int CompareFFV);
-    int createFailXML(int result, int update_query_, string &buffer, int buf_is_file);
+    int createInventoryXML(vector<MlnxDev*>& devs,
+                           PsidLookupDB& psidLookupDB,
+                           int result,
+                           string msg,
+                           string& buffer,
+                           int buf_is_file);
+    int createBurnXML(vector<MlnxDev*>& devs,
+                      map<string, PsidQueryItem>& psidUpdateInfo,
+                      PsidLookupDB& psidLookupDB,
+                      string& buffer,
+                      int buf_is_file,
+                      int CompareFFV);
+    int createFailXML(int result, int update_query_, string& buffer, int buf_is_file);
     void setForceModeParam(bool force_mode);
 
 private:
     bool _force_mode;
 };
 
-
 #endif
diff --git a/mlxfwupdate/psid_lookup_db.cpp b/mlxfwupdate/psid_lookup_db.cpp
index 6c14cd6f..f4eeb976 100644
--- a/mlxfwupdate/psid_lookup_db.cpp
+++ b/mlxfwupdate/psid_lookup_db.cpp
@@ -37,20 +37,22 @@
 #include <stdio.h>
 #include <iostream>
 
-
-int PsidLookupDB::csv2vector(string str, vector<string> &explode)
+int PsidLookupDB::csv2vector(string str, vector<string>& explode)
 {
     size_t pos;
     int cnt = 0;
 
-    if (str.size() == 0) {
+    if (str.size() == 0)
+    {
         return 0;
     }
 
-    do {
+    do
+    {
         cnt++;
         pos = str.find(',');
-        if (pos == string::npos) {
+        if (pos == string::npos)
+        {
             explode.push_back(str);
             break;
         }
@@ -61,25 +63,28 @@ int PsidLookupDB::csv2vector(string str, vector<string> &explode)
     return cnt;
 }
 
-
 void PsidLookupDB::readFile(string fName)
 {
-    FILE *fin;
+    FILE* fin;
     char tmpb[256];
 
-    if ((fin = fopen(fName.c_str(), "r")) == NULL) {
+    if ((fin = fopen(fName.c_str(), "r")) == NULL)
+    {
         return;
     }
 
-    while (fgets(tmpb, sizeof(tmpb), fin)) {
+    while (fgets(tmpb, sizeof(tmpb), fin))
+    {
         PsidLookupInfo pi;
         vector<string> expld;
         string str = tmpb;
-        if (str.find('\n')) {
-            str = str.substr(0, str.size() - 1); //remove newline character
+        if (str.find('\n'))
+        {
+            str = str.substr(0, str.size() - 1); // remove newline character
         }
 
-        if (csv2vector(str, expld) < 4) {
+        if (csv2vector(str, expld) < 4)
+        {
             continue;
         }
 
@@ -92,28 +97,28 @@ void PsidLookupDB::readFile(string fName)
     fclose(fin);
 }
 
-
 string PsidLookupDB::getPN(string id)
 {
-    if (_keyLookupMap.find(id) == _keyLookupMap.end()) {
+    if (_keyLookupMap.find(id) == _keyLookupMap.end())
+    {
         return "";
     }
     return _keyLookupMap[id].pn;
 }
 
-
 string PsidLookupDB::getProdDesc(string id)
 {
-    if (_keyLookupMap.find(id) == _keyLookupMap.end()) {
+    if (_keyLookupMap.find(id) == _keyLookupMap.end())
+    {
         return "";
     }
     return _keyLookupMap[id].prodDesc;
 }
 
-
 string PsidLookupDB::getPsid(string id)
 {
-    if (_keyLookupMap.find(id) == _keyLookupMap.end()) {
+    if (_keyLookupMap.find(id) == _keyLookupMap.end())
+    {
         return "";
     }
     return _keyLookupMap[id].psid;
@@ -121,7 +126,8 @@ string PsidLookupDB::getPsid(string id)
 
 bool PsidLookupDB::isPsidExist(string psid)
 {
-    if (_keyLookupMap.find(psid) == _keyLookupMap.end()) {
+    if (_keyLookupMap.find(psid) == _keyLookupMap.end())
+    {
         return false;
     }
     return true;
diff --git a/mlxfwupdate/psid_lookup_db.h b/mlxfwupdate/psid_lookup_db.h
index e5c409b2..5e3c5c83 100644
--- a/mlxfwupdate/psid_lookup_db.h
+++ b/mlxfwupdate/psid_lookup_db.h
@@ -42,18 +42,21 @@
 
 using namespace std;
 
-class PsidLookupDB {
+class PsidLookupDB
+{
 public:
-    void   readFile(string fName);
+    void readFile(string fName);
     string getPN(string id);
     string getProdDesc(string id);
     string getPsid(string id);
-    bool   isPsidExist(string psid);
+    bool isPsidExist(string psid);
+
 private:
-    int csv2vector(string str, vector<string> &explode);
+    int csv2vector(string str, vector<string>& explode);
 
-    class PsidLookupInfo {
-public:
+    class PsidLookupInfo
+    {
+    public:
         string pn;
         string prodDesc;
         string psid;
diff --git a/mlxfwupdate/psid_query_item.cpp b/mlxfwupdate/psid_query_item.cpp
index ad609a02..b039380e 100644
--- a/mlxfwupdate/psid_query_item.cpp
+++ b/mlxfwupdate/psid_query_item.cpp
@@ -35,20 +35,21 @@
 
 #include "psid_query_item.h"
 
-
 const ImgVersion* PsidQueryItem::findImageVersion(string type)
 {
     int idx = -1;
 
-    for (unsigned int i = 0; i < imgVers.size(); i++) {
-        if (!imgVers[i].getTypeStr().compare(type)) {
+    for (unsigned int i = 0; i < imgVers.size(); i++)
+    {
+        if (!imgVers[i].getTypeStr().compare(type))
+        {
             idx = i;
         }
     }
 
-    if (idx == -1) {
+    if (idx == -1)
+    {
         return NULL;
     }
     return &imgVers[idx];
 }
-
diff --git a/mlxfwupdate/psid_query_item.h b/mlxfwupdate/psid_query_item.h
index 2fb055de..67260091 100644
--- a/mlxfwupdate/psid_query_item.h
+++ b/mlxfwupdate/psid_query_item.h
@@ -42,13 +42,11 @@
 
 using namespace std;
 
-class PsidQueryItem {
+class PsidQueryItem
+{
 public:
-
-    PsidQueryItem() : devId(0), revId(0), found(0), isFailSafe(true) {};
-    virtual ~PsidQueryItem()
-    {
-    }
+    PsidQueryItem() : devId(0), revId(0), found(0), isFailSafe(true){};
+    virtual ~PsidQueryItem() {}
     const ImgVersion* findImageVersion(string type);
     string psid;
     string url;
diff --git a/mlxfwupdate/server_request.cpp b/mlxfwupdate/server_request.cpp
index ababdd56..0b3f5e06 100644
--- a/mlxfwupdate/server_request.cpp
+++ b/mlxfwupdate/server_request.cpp
@@ -42,7 +42,6 @@
 #include <vector>
 #include <string>
 
-
 using namespace std;
 #ifndef USE_CURL
 #define USE_CURL
@@ -50,21 +49,27 @@ using namespace std;
 
 extern int abort_request;
 
-ServerRequest::ServerRequest(const char *url, const char *proxy,
-                             int compare_ffv, bool show_progress,
-                             string key, string certificate,
-                             unsigned int numberOfRetrials) : _LastErrorNo(0)
+ServerRequest::ServerRequest(const char* url,
+                             const char* proxy,
+                             int compare_ffv,
+                             bool show_progress,
+                             string key,
+                             string certificate,
+                             unsigned int numberOfRetrials) :
+    _LastErrorNo(0)
 {
-    _UseProxy      = 0;
-    _Url           = url;
-    _WebService    = _Url + "/downloads/firmware/mlx_fw_online_query.php";
-    _compare_ffv   = compare_ffv;
+    _UseProxy = 0;
+    _Url = url;
+    _WebService = _Url + "/downloads/firmware/mlx_fw_online_query.php";
+    _compare_ffv = compare_ffv;
     _show_progress = show_progress;
-    _ceritifcate   = certificate;
+    _ceritifcate = certificate;
     _numberOfRetrials = numberOfRetrials;
-    _headers       = NULL;
-    if (proxy != NULL) {
-        if (proxy[0] != 0) {
+    _headers = NULL;
+    if (proxy != NULL)
+    {
+        if (proxy[0] != 0)
+        {
             _UseProxy = 1;
             _Proxy = proxy;
         }
@@ -72,27 +77,23 @@ ServerRequest::ServerRequest(const char *url, const char *proxy,
     _key = key;
 }
 
+ServerRequest::~ServerRequest() {}
 
-ServerRequest::~ServerRequest()
-{
-
-}
-
-int ServerRequest::parseQueryResponse(string jsonTxt,
-                                      vector<PsidQueryItem> &result,
-                                      bool ignoreNotFound)
+int ServerRequest::parseQueryResponse(string jsonTxt, vector<PsidQueryItem>& result, bool ignoreNotFound)
 {
 #ifdef USE_CURL
     string fileTag;
     Json::Value root;
     Json::Reader reader;
     bool rc = reader.parse(jsonTxt, root);
-    if (!rc) {
+    if (!rc)
+    {
         setError(rc, "-E- Failed To parse server response\n");
         return -1;
     }
     result.clear();
-    for (unsigned j = 0; j < root.size(); j++) {
+    for (unsigned j = 0; j < root.size(); j++)
+    {
         PsidQueryItem ri;
         ri.found = 0;
         ri.type = -1;
@@ -100,54 +101,82 @@ int ServerRequest::parseQueryResponse(string jsonTxt,
         ri.pns = "";
         ri.isFailSafe = true; // will be used for future!
         ri.release_note = "";
-        if (!root[j].isObject()) {
+        if (!root[j].isObject())
+        {
             setError(-1, "-E- Failed To parse server response\n");
             return -1;
         }
-        if (root[j].isMember("Found")) {
-            if (ignoreNotFound && !root[j].get("Found", Json::nullValue).asInt()) {
+        if (root[j].isMember("Found"))
+        {
+            if (ignoreNotFound && !root[j].get("Found", Json::nullValue).asInt())
+            {
                 continue;
             }
-        } else {
+        }
+        else
+        {
             continue;
         }
-        try {
+        try
+        {
             Json::Value::Members profileNames = root[j].getMemberNames();
-            for (unsigned i = 0; i < profileNames.size(); i++) {
-                if (!profileNames[i].compare("PSID")) {
-                    ri.psid  = root[j].get("PSID", Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Found")) {
+            for (unsigned i = 0; i < profileNames.size(); i++)
+            {
+                if (!profileNames[i].compare("PSID"))
+                {
+                    ri.psid = root[j].get("PSID", Json::nullValue).asString();
+                }
+                else if (!profileNames[i].compare("Found"))
+                {
                     ri.found = root[j].get(profileNames[i], Json::nullValue).asInt();
-                } else if (!profileNames[i].compare("Type")) {
+                }
+                else if (!profileNames[i].compare("Type"))
+                {
                     ri.type = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Found")) {
+                }
+                else if (!profileNames[i].compare("Found"))
+                {
                     ri.found = root[j].get(profileNames[i], Json::nullValue).asInt();
-                } else if (!profileNames[i].compare("PN")) {
+                }
+                else if (!profileNames[i].compare("PN"))
+                {
                     ri.pns = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Name")) {
+                }
+                else if (!profileNames[i].compare("Name"))
+                {
                     ri.name = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Release_note")) {
+                }
+                else if (!profileNames[i].compare("Release_note"))
+                {
                     ri.release_note = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Ver")) {
+                }
+                else if (!profileNames[i].compare("Ver"))
+                {
                     const Json::Value versions = root[j]["Ver"];
-                    if (versions.empty()) {
+                    if (versions.empty())
+                    {
                         continue;
                     }
                     Json::Value::Members ROMS = versions.getMemberNames();
 
-                    for (unsigned x = 0; x < ROMS.size(); x++) {
+                    for (unsigned x = 0; x < ROMS.size(); x++)
+                    {
                         string rom_type = ROMS[x];
                         string rom_ver = versions.get(ROMS[x], Json::nullValue).asString();
                         int m, n, s;
                         u_int16_t fwVer[4];
                         int len;
-                        if (sscanf(rom_ver.c_str(), "%d.%d.%d", &m, &n, &s)) {
-                            if (!_compare_ffv || rom_type != "FW") {
+                        if (sscanf(rom_ver.c_str(), "%d.%d.%d", &m, &n, &s))
+                        {
+                            if (!_compare_ffv || rom_type != "FW")
+                            {
                                 fwVer[0] = m;
                                 fwVer[1] = n;
                                 fwVer[2] = s;
                                 len = 3;
-                            } else {
+                            }
+                            else
+                            {
                                 fwVer[0] = m;
                                 fwVer[1] = n;
                                 fwVer[2] = s / 100;
@@ -159,17 +188,22 @@ int ServerRequest::parseQueryResponse(string jsonTxt,
                             ri.imgVers.push_back(imgv);
                         }
                     }
-                } else if (!profileNames[i].compare("URL")) {
+                }
+                else if (!profileNames[i].compare("URL"))
+                {
                     ri.url = root[j].get(profileNames[i], Json::nullValue).asString();
                     ri.url = genertDownloadUrl(ri.url);
                 }
             }
-        } catch (runtime_error &e) {
-            setError(-1, (string)"-E-" + e.what() + "\n");
+        }
+        catch (runtime_error& e)
+        {
+            setError(-1, (string) "-E-" + e.what() + "\n");
             return -1;
         }
         result.push_back(ri);
-        if (!ri.found) {
+        if (!ri.found)
+        {
             setError(0, "-W- No online newer fw found for psid : " + ri.psid + "\n");
         }
     }
@@ -180,38 +214,38 @@ int ServerRequest::parseQueryResponse(string jsonTxt,
 void ServerRequest::setError(int error_num, string error_msg)
 {
     _LastErrorStr += error_msg;
-    _LastErrorNo  = error_num;
+    _LastErrorNo = error_num;
 }
 
-void ServerRequest::getError(int &error_num, string &error_msg)
+void ServerRequest::getError(int& error_num, string& error_msg)
 {
-    error_num     = _LastErrorNo;
-    error_msg     = _LastErrorStr;
+    error_num = _LastErrorNo;
+    error_msg = _LastErrorStr;
 }
 
-int ServerRequest::DownloadFilesRequest(vector <DownloadedFileProperties> &files,
-                                        string os, string devs, string type)
+int ServerRequest::DownloadFilesRequest(vector<DownloadedFileProperties>& files, string os, string devs, string type)
 {
-
-    int res          = 0;
+    int res = 0;
 #ifdef USE_CURL
     string response;
     Json::Value root;
     Json::StyledWriter writer;
 
-    root["mode"]     = 2;
-    root["psids"]    = "";
-    root["os"]       = (os.length())   ? os   : "all";
-    root["type"]     = (type.length()) ? type : "all";
-    root["devs"]     = (devs.length()) ? devs : "all";
-    root["key"]      = _key;
-    string data = writer.write( root );
+    root["mode"] = 2;
+    root["psids"] = "";
+    root["os"] = (os.length()) ? os : "all";
+    root["type"] = (type.length()) ? type : "all";
+    root["devs"] = (devs.length()) ? devs : "all";
+    root["key"] = _key;
+    string data = writer.write(root);
     res = curl_request_str(_WebService.c_str(), data.c_str(), response);
-    if (res) {
+    if (res)
+    {
         return res;
     }
     res = parseDownloadFilesResponse(response, files);
-    if (res) {
+    if (res)
+    {
         return res;
     }
 
@@ -219,95 +253,116 @@ int ServerRequest::DownloadFilesRequest(vector <DownloadedFileProperties> &files
     return res;
 }
 
-int ServerRequest::parseDownloadFilesResponse(string jsonTxt, vector <DownloadedFileProperties> &files)
+int ServerRequest::parseDownloadFilesResponse(string jsonTxt, vector<DownloadedFileProperties>& files)
 {
-
 #ifdef USE_CURL
     Json::Value root;
     Json::Reader reader;
     string url;
-    //printf("response = %s\n", jsonTxt.c_str());
+    // printf("response = %s\n", jsonTxt.c_str());
     bool rc = reader.parse(jsonTxt, root);
-    if (!rc) {
+    if (!rc)
+    {
         setError(rc, "-E- Failed To parse server response\n");
         return -1;
     }
-    for (unsigned j = 0; j < root.size(); j++) {
-        if (!root[j].isObject()) {
+    for (unsigned j = 0; j < root.size(); j++)
+    {
+        if (!root[j].isObject())
+        {
             setError(-1, "-E- Failed To parse server response\n");
             return -1;
         }
-        string name         = "";
-        string url          = "";
-        string descr        = "";
+        string name = "";
+        string url = "";
+        string descr = "";
         string release_note = "";
-        string family       = "";
-        string file_type    = "";
-        string os           = "";
-        try {
+        string family = "";
+        string file_type = "";
+        string os = "";
+        try
+        {
             Json::Value::Members profileNames = root[j].getMemberNames();
-            for (unsigned i = 0; i < profileNames.size(); i++) {
-                if (!profileNames[i].compare("URL")) {
+            for (unsigned i = 0; i < profileNames.size(); i++)
+            {
+                if (!profileNames[i].compare("URL"))
+                {
                     url = root[j].get(profileNames[i], Json::nullValue).asString();
                     url = genertDownloadUrl(url);
-                } else if (!profileNames[i].compare("Name")) {
+                }
+                else if (!profileNames[i].compare("Name"))
+                {
                     name = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Family")) {
+                }
+                else if (!profileNames[i].compare("Family"))
+                {
                     family = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Type")) {
+                }
+                else if (!profileNames[i].compare("Type"))
+                {
                     file_type = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Descr")) {
+                }
+                else if (!profileNames[i].compare("Descr"))
+                {
                     descr = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("OS")) {
+                }
+                else if (!profileNames[i].compare("OS"))
+                {
                     os = root[j].get(profileNames[i], Json::nullValue).asString();
-                } else if (!profileNames[i].compare("Release_note")) {
+                }
+                else if (!profileNames[i].compare("Release_note"))
+                {
                     release_note = root[j].get(profileNames[i], Json::nullValue).asString();
                 }
             }
-        } catch (runtime_error &e) {
-            setError(-1, (string)"-E-" + e.what() + "\n");
+        }
+        catch (runtime_error& e)
+        {
+            setError(-1, (string) "-E-" + e.what() + "\n");
             return -1;
         }
         DownloadedFileProperties file;
-        file.url  = url;
+        file.url = url;
         file.name = name;
         file.family = family;
         file.file_type = file_type;
-        file.descr  = descr;
-        file.os     = os;
+        file.descr = descr;
+        file.os = os;
         file.release_note = release_note;
         files.push_back(file);
     }
-    if (!files.size()) {
+    if (!files.size())
+    {
         return -1;
     }
 #endif
     return 0;
 }
 
-int ServerRequest::queryPsids(string psids, vector<PsidQueryItem> &results)
+int ServerRequest::queryPsids(string psids, vector<PsidQueryItem>& results)
 {
-
     int res = 0;
 
- #ifdef USE_CURL
+#ifdef USE_CURL
 
     Json::Value root;
     Json::StyledWriter writer;
-    string response  = "";
-    root["psids"]    = psids;
-    root["mode"]     = 3;   // 0 query
-    root["key"]      = _key;
-    string data = writer.write( root );
-    //printf("request : %s\n", data.c_str());
+    string response = "";
+    root["psids"] = psids;
+    root["mode"] = 3; // 0 query
+    root["key"] = _key;
+    string data = writer.write(root);
+    // printf("request : %s\n", data.c_str());
     res = curl_request_str(_WebService.c_str(), data.c_str(), response);
-    if (res) {
+    if (res)
+    {
         return res;
     }
 
-    //printf("Response : %s\n", response.c_str());
+    // printf("Response : %s\n", response.c_str());
     res = parseQueryResponse(response, results, false);
-    if (res) {
+    if (res)
+    {
         return res;
     }
 
@@ -315,47 +370,51 @@ int ServerRequest::queryPsids(string psids, vector<PsidQueryItem> &results)
     return res;
 }
 
-int ServerRequest::updateMFAsRequest(vector<string> &psid_list,
-                                     vector<dm_dev_id_t> &dev_types_list,
-                                     vector<string> &fw_version_list,
-                                     vector<PsidQueryItem> &results)
+int ServerRequest::updateMFAsRequest(vector<string>& psid_list,
+                                     vector<dm_dev_id_t>& dev_types_list,
+                                     vector<string>& fw_version_list,
+                                     vector<PsidQueryItem>& results)
 {
     int res = 0;
-    (void) dev_types_list;
- #ifdef USE_CURL
+    (void)dev_types_list;
+#ifdef USE_CURL
 
     Json::Value root;
     Json::StyledWriter writer;
-    string psids     = "";
-    string devices   = "";
-    string response  = "";
-    string versions  = "";
+    string psids = "";
+    string devices = "";
+    string response = "";
+    string versions = "";
     string tmp;
-    for (unsigned i = 0; i < psid_list.size(); i++) {
-        if (i > 0) {
-            psids   += ",";
+    for (unsigned i = 0; i < psid_list.size(); i++)
+    {
+        if (i > 0)
+        {
+            psids += ",";
             devices += ",";
             versions += ",";
         }
-        psids    += psid_list[i];
+        psids += psid_list[i];
         versions += fw_version_list[i];
     }
 
-    root["psids"]    = psids;
-    root["devs"]     = devices;
-    root["mode"]     = 0;   // 0 update
+    root["psids"] = psids;
+    root["devs"] = devices;
+    root["mode"] = 0; // 0 update
     root["versions"] = versions;
-    root["key"]      = _key;
-    string data = writer.write( root );
-    //printf("request : %s\n", data.c_str());
+    root["key"] = _key;
+    string data = writer.write(root);
+    // printf("request : %s\n", data.c_str());
     res = curl_request_str(_WebService.c_str(), data.c_str(), response);
-    if (res) {
+    if (res)
+    {
         return res;
     }
 
-    //printf("Response : %s\n", response.c_str());
+    // printf("Response : %s\n", response.c_str());
     res = parseQueryResponse(response, results);
-    if (res) {
+    if (res)
+    {
         return res;
     }
 
@@ -368,7 +427,6 @@ string ServerRequest::genertDownloadUrl(string file_url)
     return _Url + "/" + file_url;
 }
 
-
 #if 0
 int ServerRequest::queryAllMFAs(vector<string> &mfa_list)
 {
@@ -425,9 +483,11 @@ int ServerRequest::download(string url, string dest_path)
     ssize_t pos = url.rfind('/');
     string name = dest_path;
     name += "/";
-    if (pos > 0) {
+    if (pos > 0)
+    {
         string tmp = url.substr(pos);
-        if (tmp.length() > 0) {
+        if (tmp.length() > 0)
+        {
             name += tmp;
             res = curl_request(url.c_str(), NULL, name.c_str(), _numberOfRetrials);
         }
@@ -436,39 +496,37 @@ int ServerRequest::download(string url, string dest_path)
     return res;
 }
 
-
 #ifdef USE_CURL
-static size_t write_data(void *ptr, size_t size, size_t nmemb, FILE *stream)
+static size_t write_data(void* ptr, size_t size, size_t nmemb, FILE* stream)
 {
     size_t written = fwrite(ptr, size, nmemb, stream);
     return written;
 }
 #endif
 
-
-int ServerRequest::curl_request(const char *url,
-                                const char *data,
-                                const char *dest_file,
-                                int numOfRet)
+int ServerRequest::curl_request(const char* url, const char* data, const char* dest_file, int numOfRet)
 {
     int res = 0;
 #ifdef USE_CURL
     CURLcode rc;
-    FILE *fp;
-    CURL *_curl = curl_easy_init();
-    if (_curl == NULL) {
+    FILE* fp;
+    CURL* _curl = curl_easy_init();
+    if (_curl == NULL)
+    {
         _LastErrorNo = ERR_SRVREQ_ACCESS_INIT;
         setError(-1, "-E- Server access error\n");
         return -1;
     }
     _LastErrorStr = "";
     fp = fopen(dest_file, "wb");
-    if (fp == NULL && errno == EACCES) {
+    if (fp == NULL && errno == EACCES)
+    {
         unlink(dest_file);
         fp = fopen(dest_file, "wb");
     }
-    if (fp == NULL) {
-        setError(-1, "Failed to Open file for writing " + (string) strerror(errno) + "\n");
+    if (fp == NULL)
+    {
+        setError(-1, "Failed to Open file for writing " + (string)strerror(errno) + "\n");
         return -1;
     }
     curl_easy_setopt(_curl, CURLOPT_TIMEOUT, 360); // 6 minute operation timeout
@@ -478,16 +536,19 @@ int ServerRequest::curl_request(const char *url,
     curl_easy_setopt(_curl, CURLOPT_WRITEFUNCTION, write_data);
     curl_easy_setopt(_curl, CURLOPT_WRITEDATA, fp);
     curl_easy_setopt(_curl, CURLOPT_CAINFO, _ceritifcate.c_str());
-    if (_show_progress) {
+    if (_show_progress)
+    {
         // Internal CURL progressmeter must be disabled if we provide our own callback
         curl_easy_setopt(_curl, CURLOPT_NOPROGRESS, false);
         // Install the callback function
         curl_easy_setopt(_curl, CURLOPT_PROGRESSFUNCTION, progress_func);
     }
-    if (_Proxy.size() > 0) {
+    if (_Proxy.size() > 0)
+    {
         curl_easy_setopt(_curl, CURLOPT_PROXY, _Proxy.c_str());
     }
-    if (data != NULL) {
+    if (data != NULL)
+    {
         curl_easy_setopt(_curl, CURLOPT_POST, 1);
         curl_easy_setopt(_curl, CURLOPT_POSTFIELDS, data);
     }
@@ -496,14 +557,17 @@ int ServerRequest::curl_request(const char *url,
     // Perform the request, res will get the return code
     rc = curl_easy_perform(_curl);
     // Check for errors
-    if (rc == CURLE_OPERATION_TIMEDOUT && numOfRet > 0) {
-        if (curl_request(url, data, dest_file, numOfRet - 1) == 0) {
+    if (rc == CURLE_OPERATION_TIMEDOUT && numOfRet > 0)
+    {
+        if (curl_request(url, data, dest_file, numOfRet - 1) == 0)
+        {
             rc = CURLE_OK;
         }
     }
-    if (rc != CURLE_OK) {
-        if ((rc == CURLE_OPERATION_TIMEDOUT && numOfRet == 0) ||
-            (rc != CURLE_OPERATION_TIMEDOUT)) {
+    if (rc != CURLE_OK)
+    {
+        if ((rc == CURLE_OPERATION_TIMEDOUT && numOfRet == 0) || (rc != CURLE_OPERATION_TIMEDOUT))
+        {
             setError(-1, (string)curl_easy_strerror(rc));
         }
         res = -1;
@@ -516,29 +580,32 @@ int ServerRequest::curl_request(const char *url,
     curl_easy_cleanup(_curl);
     curl_global_cleanup();
     fclose(fp);
-    if (res) {
+    if (res)
+    {
         unlink(dest_file);
-    } else {
-        #if !defined(__WIN__)
+    }
+    else
+    {
+#if !defined(__WIN__)
         string tmp = (string)dest_file;
-        if (tmp.find(".mfa") == std::string::npos && tmp.find(".exe") == std::string::npos) {
+        if (tmp.find(".mfa") == std::string::npos && tmp.find(".exe") == std::string::npos)
+        {
             int retVal = my_chmod(dest_file, EXECUTABLE_MODE);
-            (void) retVal;
+            (void)retVal;
         }
-        #endif
+#endif
     }
 #endif
     return res;
 }
 
-
 #ifdef USE_CURL
-static
-size_t writebuf_data(void *ptr, size_t size, size_t nmemb, string *strm)
+static size_t writebuf_data(void* ptr, size_t size, size_t nmemb, string* strm)
 {
     size_t written = size * nmemb;
-    char *str = new char[written + 1];
-    if (str == NULL) {
+    char* str = new char[written + 1];
+    if (str == NULL)
+    {
         return 0;
     }
     strncpy(str, (char*)ptr, written);
@@ -549,14 +616,14 @@ size_t writebuf_data(void *ptr, size_t size, size_t nmemb, string *strm)
 }
 #endif
 
-
-int ServerRequest::curl_request_str(const char *url, const char *data, string& response)
+int ServerRequest::curl_request_str(const char* url, const char* data, string& response)
 {
     int res = 0;
 #ifdef USE_CURL
 
-    CURL *_curl = curl_easy_init();
-    if (_curl == NULL) {
+    CURL* _curl = curl_easy_init();
+    if (_curl == NULL)
+    {
         _LastErrorNo = ERR_SRVREQ_ACCESS_INIT;
         setError(-1, "-E- Server access error\n");
         return -1;
@@ -570,19 +637,20 @@ int ServerRequest::curl_request_str(const char *url, const char *data, string& r
 
     _headers = curl_slist_append(_headers, "Accept: application/json");
     _headers = curl_slist_append(_headers, "Content-Type: application/json");
-    curl_easy_setopt(_curl, CURLOPT_HTTPHEADER, _headers );
+    curl_easy_setopt(_curl, CURLOPT_HTTPHEADER, _headers);
     curl_easy_setopt(_curl, CURLOPT_POST, 1);
     curl_easy_setopt(_curl, CURLOPT_POSTFIELDS, data);
     curl_easy_setopt(_curl, CURLOPT_POSTFIELDSIZE, strlen(data));
     curl_easy_setopt(_curl, CURLOPT_SSL_VERIFYPEER, true);
-    //curl_easy_setopt(curl, CURLOPT_VERBOSE,1);
-    //curl_easy_setopt(curl, CURLOPT_HEADER,1);
+    // curl_easy_setopt(curl, CURLOPT_VERBOSE,1);
+    // curl_easy_setopt(curl, CURLOPT_HEADER,1);
 
     // Perform the request, res will get the return code
     rc = curl_easy_perform(_curl);
-    //fprintf(stderr, "Response : %s\n", response.c_str());
+    // fprintf(stderr, "Response : %s\n", response.c_str());
     // Check for errors
-    if (rc != CURLE_OK) {
+    if (rc != CURLE_OK)
+    {
         setError(-1, "-E- " + (string)curl_easy_strerror(rc) + "\n");
         res = -1;
         goto clean_up;
@@ -597,13 +665,11 @@ int ServerRequest::curl_request_str(const char *url, const char *data, string& r
     return res;
 }
 
-
-int progress_func(void *ptr, double totalToDownload, double nowDownloaded,
-                  double totalToUpload, double nowUploaded)
+int progress_func(void* ptr, double totalToDownload, double nowDownloaded, double totalToUpload, double nowUploaded)
 {
-    (void) ptr;
-    (void) totalToUpload;
-    (void) nowUploaded;
+    (void)ptr;
+    (void)totalToUpload;
+    (void)nowUploaded;
 
     double fractionDownloaded = (nowDownloaded / totalToDownload) * 100;
     fractionDownloaded = fractionDownloaded > 0 ? fractionDownloaded : 0;
diff --git a/mlxfwupdate/server_request.h b/mlxfwupdate/server_request.h
index 148082ab..3b443e31 100644
--- a/mlxfwupdate/server_request.h
+++ b/mlxfwupdate/server_request.h
@@ -56,47 +56,51 @@
 
 using namespace std;
 
-enum {
+enum
+{
     ERR_SRVREQ_ACCESS_INIT = 1,
 };
 
-#define URL_TAG       "url"
+#define URL_TAG "url"
 #define FILE_NAME_TAG "name"
-#define ERR_MSG_TAG   "err_msg"
-#define ERR_NUM_TAG   "err_num"
+#define ERR_MSG_TAG "err_msg"
+#define ERR_NUM_TAG "err_num"
 
-int    progress_func(void *ptr, double TotalToDownload,
-                     double NowDownloaded, double TotalToUpload,
-                     double NowUploaded);
+int progress_func(void* ptr, double TotalToDownload, double NowDownloaded, double TotalToUpload, double NowUploaded);
 
-class ServerRequest {
+class ServerRequest
+{
 public:
-    ServerRequest(const char *url, const char *proxy,
-                  int compare_ffv, bool show_progress, string key,
+    ServerRequest(const char* url,
+                  const char* proxy,
+                  int compare_ffv,
+                  bool show_progress,
+                  string key,
                   string certificate,
                   unsigned int numberOfRetrials);
     ~ServerRequest();
-    int updateMFAsRequest(vector<string> &psid_list,
-                          vector<dm_dev_id_t> &dev_types_list,
-                          vector<string> &fw_version_list,
-                          vector<PsidQueryItem> &results);
-//        int queryAllMFAs(vector<string> &mfa_list);
-    int DownloadFilesRequest(vector <DownloadedFileProperties> &files,
-                             string os, string devs, string type);
+    int updateMFAsRequest(vector<string>& psid_list,
+                          vector<dm_dev_id_t>& dev_types_list,
+                          vector<string>& fw_version_list,
+                          vector<PsidQueryItem>& results);
+    //        int queryAllMFAs(vector<string> &mfa_list);
+    int DownloadFilesRequest(vector<DownloadedFileProperties>& files, string os, string devs, string type);
 
-    int queryPsids(string psids, vector<PsidQueryItem> &results);
+    int queryPsids(string psids, vector<PsidQueryItem>& results);
     int download(string url, string dest_path);
-    void getError(int &error, string &error_msg);
-    inline void setNumberOfTrials(unsigned int num) {_numberOfRetrials = num;};
+    void getError(int& error, string& error_msg);
+    inline void setNumberOfTrials(unsigned int num) { _numberOfRetrials = num; };
+
 private:
     void setError(int error, string error_msg);
-    int  parseQueryResponse(string jsonTxt, vector<PsidQueryItem> &results, bool ignoreNotFound = true);
-//        int  parseQueryAllMFAsRespone(string jsonTxt, vector <string>&result);
-    int  parseDownloadFilesResponse(string jsonTxt, vector <DownloadedFileProperties> &files);
+    int parseQueryResponse(string jsonTxt, vector<PsidQueryItem>& results, bool ignoreNotFound = true);
+    //        int  parseQueryAllMFAsRespone(string jsonTxt, vector <string>&result);
+    int parseDownloadFilesResponse(string jsonTxt, vector<DownloadedFileProperties>& files);
 
-    int curl_request(const char *url, const char *data, const char *dest_file, int numOfRet);
-    int curl_request_str(const char *url, const char *data, string& response);
+    int curl_request(const char* url, const char* data, const char* dest_file, int numOfRet);
+    int curl_request_str(const char* url, const char* data, string& response);
     string genertDownloadUrl(string file_url);
+
 private:
     string _Url;
     string _WebService;
@@ -110,10 +114,10 @@ class ServerRequest {
     string _key;
     string _ceritifcate;
     unsigned int _numberOfRetrials;
-    #ifdef USE_CURL
-    static CURL *_curl;
-    struct curl_slist *_headers;
-    #endif
+#ifdef USE_CURL
+    static CURL* _curl;
+    struct curl_slist* _headers;
+#endif
 };
 
 #endif
diff --git a/mlxreg/mlxreg_exception.cpp b/mlxreg/mlxreg_exception.cpp
index 5658c03d..e04de602 100644
--- a/mlxreg/mlxreg_exception.cpp
+++ b/mlxreg/mlxreg_exception.cpp
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -38,9 +38,9 @@
 using namespace mlxreg;
 
 /************************************
-* Function: MlxRegException
-************************************/
-MlxRegException::MlxRegException(const char *fmt, ...)
+ * Function: MlxRegException
+ ************************************/
+MlxRegException::MlxRegException(const char* fmt, ...)
 {
     char tmp[1024];
     va_list args;
@@ -51,35 +51,27 @@ MlxRegException::MlxRegException(const char *fmt, ...)
 }
 
 /************************************
-* Function: MlxRegException
-************************************/
-MlxRegException::MlxRegException(const std::string& msg) :
-    _msg(msg)
-{
-}
+ * Function: MlxRegException
+ ************************************/
+MlxRegException::MlxRegException(const std::string& msg) : _msg(msg) {}
 
 /************************************
-* Function: ~MlxRegException
-************************************/
-MlxRegException::~MlxRegException() throw()
-{
-
-}
+ * Function: ~MlxRegException
+ ************************************/
+MlxRegException::~MlxRegException() throw() {}
 
 /************************************
-* Function: what_s
-************************************/
+ * Function: what_s
+ ************************************/
 std::string MlxRegException::what_s() const
 {
     return _msg;
 }
 
 /************************************
-* Function: what
-************************************/
+ * Function: what
+ ************************************/
 const char* MlxRegException::what() const throw()
 {
     return _msg.c_str();
 }
-
-
diff --git a/mlxreg/mlxreg_exception.h b/mlxreg/mlxreg_exception.h
index 264a7d89..4c851080 100644
--- a/mlxreg/mlxreg_exception.h
+++ b/mlxreg/mlxreg_exception.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -37,13 +37,13 @@
 #include <string>
 #include <exception>
 
-namespace mlxreg {
-
+namespace mlxreg
+{
 class MlxRegException : public std::exception
 {
 public:
-    MlxRegException(const char *fmt, ...);
-    MlxRegException(const std::string & msg);
+    MlxRegException(const char* fmt, ...);
+    MlxRegException(const std::string& msg);
     virtual ~MlxRegException() throw();
 
     virtual std::string what_s() const;
@@ -53,6 +53,6 @@ class MlxRegException : public std::exception
     std::string _msg;
 };
 
-}
+} // namespace mlxreg
 
 #endif /* MLXREG_EXCEPTION_H */
diff --git a/mlxreg/mlxreg_lib.cpp b/mlxreg/mlxreg_lib.cpp
index 5147bdd4..04886b2c 100644
--- a/mlxreg/mlxreg_lib.cpp
+++ b/mlxreg/mlxreg_lib.cpp
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -49,37 +49,46 @@ using namespace mlxreg;
 const int MlxRegLib::RETRIES_COUNT = 3;
 const int MlxRegLib::SLEEP_INTERVAL = 100;
 
-MlxRegLib::MlxRegLib(mfile *mf, string extAdbFile, bool isExternal)
+MlxRegLib::MlxRegLib(mfile* mf, string extAdbFile, bool isExternal)
 {
     _mf = mf;
     _isExternal = isExternal;
-    try {
-        if (_isExternal && extAdbFile == "") {
+    try
+    {
+        if (_isExternal && extAdbFile == "")
+        {
             dm_dev_id_t devID = getDevId();
             extAdbFile = PrmAdbDB::getDefaultDBName(dm_dev_is_switch(devID));
         }
         initAdb(extAdbFile);
-    } catch (MlxRegException& adbInitExp) {
-        if (_adb) {
+    }
+    catch (MlxRegException& adbInitExp)
+    {
+        if (_adb)
+        {
             delete _adb;
         }
         throw adbInitExp;
     }
     string unionNode = REG_ACCESS_UNION_NODE;
-    string rootNode  = unionNode + "_selector";
-    if (_isExternal) {
-        rootNode  = rootNode + "_ext";
+    string rootNode = unionNode + "_selector";
+    if (_isExternal)
+    {
+        rootNode = rootNode + "_ext";
     }
 
-    _regAccessRootNode  = _adb->createLayout(rootNode);
-    if (!_regAccessRootNode) {
+    _regAccessRootNode = _adb->createLayout(rootNode);
+    if (!_regAccessRootNode)
+    {
         throw MlxRegException("No supported access registers found");
     }
     _regAccessUnionNode = _regAccessRootNode->getChildByPath(unionNode);
-    if (!_regAccessUnionNode) {
+    if (!_regAccessUnionNode)
+    {
         throw MlxRegException("No supported access registers found");
     }
-    if (!_regAccessUnionNode->isUnion()) {
+    if (!_regAccessUnionNode->isUnion())
+    {
         throw MlxRegException("No supported access registers found");
     }
     try
@@ -98,14 +107,16 @@ MlxRegLib::MlxRegLib(mfile *mf, string extAdbFile, bool isExternal)
 }
 
 /************************************
-* Function: ~MlxRegLib
-************************************/
+ * Function: ~MlxRegLib
+ ************************************/
 MlxRegLib::~MlxRegLib()
 {
-    if (_regAccessRootNode) {
+    if (_regAccessRootNode)
+    {
         delete _regAccessRootNode;
     }
-    if (_adb) {
+    if (_adb)
+    {
         delete _adb;
     }
 }
@@ -115,129 +126,139 @@ dm_dev_id_t MlxRegLib::getDevId()
     return getDevId(_mf);
 }
 
-dm_dev_id_t MlxRegLib::getDevId(mfile *mf)
+dm_dev_id_t MlxRegLib::getDevId(mfile* mf)
 {
     dm_dev_id_t devID = DeviceUnknown;
     u_int32_t hwDevID = 0;
     u_int32_t hwChipRev = 0;
-    if (dm_get_device_id(mf, &devID, &hwDevID, &hwChipRev)) {
+    if (dm_get_device_id(mf, &devID, &hwDevID, &hwChipRev))
+    {
         throw MlxRegException("Failed to read device ID");
     }
     return devID;
 }
 
-bool MlxRegLib::isDeviceSupported(mfile *mf)
+bool MlxRegLib::isDeviceSupported(mfile* mf)
 {
     dm_dev_id_t devID = getDevId(mf);
-    return devID != DeviceConnectX2 && devID != DeviceConnectX3 && devID != DeviceConnectX3Pro && devID != DeviceSwitchX;
+    return devID != DeviceConnectX2 && devID != DeviceConnectX3 && devID != DeviceConnectX3Pro &&
+           devID != DeviceSwitchX;
 }
 
 void MlxRegLib::initAdb(string extAdbFile)
 {
     _adb = new Adb();
-    if (extAdbFile != "") {
-        if (!_adb->load(extAdbFile, false, false)) {
+    if (extAdbFile != "")
+    {
+        if (!_adb->load(extAdbFile, false, false))
+        {
             throw MlxRegException("Failure in loading Adabe file. %s", _adb->getLastError().c_str());
         }
-    } else {
+    }
+    else
+    {
         throw MlxRegException("No Adabe was provided, please provide Adabe file to continue");
     }
 }
 
 /************************************
-* Function: findAdbNode
-************************************/
+ * Function: findAdbNode
+ ************************************/
 AdbInstance* MlxRegLib::findAdbNode(string name)
 {
-    if (_regAccessMap.find(name) == _regAccessMap.end()) {
+    if (_regAccessMap.find(name) == _regAccessMap.end())
+    {
         throw MlxRegException("Can't find access register name: %s", name.c_str());
     }
     return _regAccessUnionNode->getUnionSelectedNodeName(name);
 }
 
 /************************************
-* Function: showRegister
-************************************/
-MlxRegLibStatus MlxRegLib::showRegister(string regName, std::vector<AdbInstance*> &fields)
+ * Function: showRegister
+ ************************************/
+MlxRegLibStatus MlxRegLib::showRegister(string regName, std::vector<AdbInstance*>& fields)
 {
-    AdbInstance *adbNode = findAdbNode(regName);
+    AdbInstance* adbNode = findAdbNode(regName);
     fields = adbNode->getLeafFields(true);
     return MRLS_SUCCESS;
 }
 
 /************************************
-* Function: showRegisters
-************************************/
-MlxRegLibStatus MlxRegLib::showRegisters(std::vector<string> &regs)
+ * Function: showRegisters
+ ************************************/
+MlxRegLibStatus MlxRegLib::showRegisters(std::vector<string>& regs)
 {
-    for (std::map<string, u_int64_t>::iterator it = _regAccessMap.begin(); it != _regAccessMap.end(); ++it) {
+    for (std::map<string, u_int64_t>::iterator it = _regAccessMap.begin(); it != _regAccessMap.end(); ++it)
+    {
         regs.push_back(it->first);
     }
     return MRLS_SUCCESS;
 }
 
 /************************************
-* Function: sendMaccessReg
-************************************/
-int MlxRegLib::sendMaccessReg(u_int16_t regId, int method, std::vector<u_int32_t> &data)
+ * Function: sendMaccessReg
+ ************************************/
+int MlxRegLib::sendMaccessReg(u_int16_t regId, int method, std::vector<u_int32_t>& data)
 {
     int status = 0;
     int rc;
     std::vector<u_int32_t> temp_data;
     copy(data.begin(), data.end(), back_inserter(temp_data));
     int i = RETRIES_COUNT;
-    do {
+    do
+    {
         rc = maccess_reg(_mf,
-                           regId,
-                           (maccess_reg_method_t)method,
-                           (u_int32_t*)&data[0],
-                           (sizeof(u_int32_t) * data.size()),
-                           (sizeof(u_int32_t) * data.size()),
-                           (sizeof(u_int32_t) * data.size()),
-                           &status);
-        if ((rc != ME_ICMD_STATUS_IFC_BUSY &&
-                status != ME_REG_ACCESS_BAD_PARAM) ||
-                !(_mf->flags & MDEVS_REM)) {
+                         regId,
+                         (maccess_reg_method_t)method,
+                         (u_int32_t*)&data[0],
+                         (sizeof(u_int32_t) * data.size()),
+                         (sizeof(u_int32_t) * data.size()),
+                         (sizeof(u_int32_t) * data.size()),
+                         &status);
+        if ((rc != ME_ICMD_STATUS_IFC_BUSY && status != ME_REG_ACCESS_BAD_PARAM) || !(_mf->flags & MDEVS_REM))
+        {
             break;
         }
         data.clear();
         copy(temp_data.begin(), temp_data.end(), back_inserter(data));
         msleep(SLEEP_INTERVAL);
-    } while(i-->0);
+    } while (i-- > 0);
     temp_data.clear();
     return rc;
 }
 
 /************************************
-* Function: sendRegister
-************************************/
-MlxRegLibStatus MlxRegLib::sendRegister(string regName, int method, std::vector<u_int32_t> &data)
+ * Function: sendRegister
+ ************************************/
+MlxRegLibStatus MlxRegLib::sendRegister(string regName, int method, std::vector<u_int32_t>& data)
 {
     u_int16_t regId = (u_int16_t)_regAccessMap.find(regName)->second;
     int rc;
     rc = sendMaccessReg(regId, method, data);
-    if (rc) {
+    if (rc)
+    {
         throw MlxRegException("Failed to send access register: %s", m_err2str((MError)rc));
     }
     return MRLS_SUCCESS;
 }
 
 /************************************
-* Function: sendRegister
-************************************/
-MlxRegLibStatus MlxRegLib::sendRegister(u_int16_t regId, int method, std::vector<u_int32_t> &data)
+ * Function: sendRegister
+ ************************************/
+MlxRegLibStatus MlxRegLib::sendRegister(u_int16_t regId, int method, std::vector<u_int32_t>& data)
 {
     int rc;
     rc = sendMaccessReg(regId, method, data);
-    if (rc) {
+    if (rc)
+    {
         throw MlxRegException("Failed send access register: %s", m_err2str((MError)rc));
     }
     return MRLS_SUCCESS;
 }
 
 /************************************
-* Function: getLastErrMsg
-************************************/
+ * Function: getLastErrMsg
+ ************************************/
 string MlxRegLib::getLastErrMsg()
 {
     std::stringstream sstm;
@@ -245,69 +266,76 @@ string MlxRegLib::getLastErrMsg()
     string errCodeStr = err2Str(lastErrCode);
     string errStr = err();
     sstm << errCodeStr;
-    if (errStr != errCodeStr) {
+    if (errStr != errCodeStr)
+    {
         sstm << ": " << errStr;
     }
     return sstm.str();
 }
 
 /************************************
-* Function: isRegSizeSupported
-************************************/
+ * Function: isRegSizeSupported
+ ************************************/
 bool MlxRegLib::isRegSizeSupported(string regName)
 {
-    AdbInstance *adbNode = _regAccessUnionNode->getUnionSelectedNodeName(regName);
+    AdbInstance* adbNode = _regAccessUnionNode->getUnionSelectedNodeName(regName);
     return (((adbNode->size >> 3) <= (u_int32_t)mget_max_reg_size(_mf, MACCESS_REG_METHOD_SET)) ||
             ((adbNode->size >> 3) <= (u_int32_t)mget_max_reg_size(_mf, MACCESS_REG_METHOD_GET)));
 }
 
 /************************************
-* Function: isAccessRegisterSupported
-************************************/
-void MlxRegLib::isAccessRegisterSupported(mfile *mf)
+ * Function: isAccessRegisterSupported
+ ************************************/
+void MlxRegLib::isAccessRegisterSupported(mfile* mf)
 {
     int status;
     struct icmd_hca_icmd_query_cap_general icmd_cap;
     int i = RETRIES_COUNT;
-    do {
+    do
+    {
         memset(&icmd_cap, 0, sizeof(icmd_cap));
         status = get_icmd_query_cap(mf, &icmd_cap);
-        if(!(status || icmd_cap.allow_icmd_access_reg_on_all_registers == 0))
+        if (!(status || icmd_cap.allow_icmd_access_reg_on_all_registers == 0))
             break;
         msleep(SLEEP_INTERVAL);
     } while (i-- > 0);
 
-    if (status || icmd_cap.allow_icmd_access_reg_on_all_registers == 0) {
+    if (status || icmd_cap.allow_icmd_access_reg_on_all_registers == 0)
+    {
         throw MlxRegException("FW burnt on device does not support generic access register");
     }
 }
 /************************************
-* Function: isAccessRegisterGMPSupported
-************************************/
+ * Function: isAccessRegisterGMPSupported
+ ************************************/
 bool MlxRegLib::isAccessRegisterGMPSupported(maccess_reg_method_t reg_method)
 {
     return (bool)(supports_reg_access_gmp(_mf, reg_method));
 }
 
 /************************************
-* Function: isIBDevice
-************************************/
+ * Function: isIBDevice
+ ************************************/
 bool MlxRegLib::isIBDevice()
 {
     return (bool)(_mf->flags & MDEVS_IB);
 }
 
 /************************************
-* Function: dumpRegisterData
-************************************/
-MlxRegLibStatus MlxRegLib::dumpRegisterData(string output_file_name, std::vector<u_int32_t> &data)
+ * Function: dumpRegisterData
+ ************************************/
+MlxRegLibStatus MlxRegLib::dumpRegisterData(string output_file_name, std::vector<u_int32_t>& data)
 {
     FILE* outputFile = fopen(output_file_name.c_str(), "w");
-    if (outputFile) {
-        for(std::vector<u_int32_t>::size_type i = 0; i != data.size(); i++) {
-            fprintf(outputFile,"%08x\n",CPU_TO_BE32(data[i]));
+    if (outputFile)
+    {
+        for (std::vector<u_int32_t>::size_type i = 0; i != data.size(); i++)
+        {
+            fprintf(outputFile, "%08x\n", CPU_TO_BE32(data[i]));
         }
-    } else {
+    }
+    else
+    {
         throw MlxRegException("Failed to open file");
     }
     return MRLS_SUCCESS;
diff --git a/mlxreg/mlxreg_lib.h b/mlxreg/mlxreg_lib.h
index 289db9b3..d0616961 100644
--- a/mlxreg/mlxreg_lib.h
+++ b/mlxreg/mlxreg_lib.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -42,55 +42,58 @@
 #include <mft_utils/errmsg.h>
 #include "mlxreg_exception.h"
 
-
-namespace mlxreg {
-
-typedef enum {
+namespace mlxreg
+{
+typedef enum
+{
     MRLS_SUCCESS = 0,
     MRLS_GENERAL
 } MlxRegLibStatus;
 
-class MlxRegLib : public ErrMsg {
+class MlxRegLib : public ErrMsg
+{
 public:
-    MlxRegLib(mfile *mf, string extAdbFile, bool isExternal = true);
+    MlxRegLib(mfile* mf, string extAdbFile, bool isExternal = true);
     ~MlxRegLib(); // Dto'r
     /* * * * * * * * * * * * * *
-    * library Getters/Setters *
-    * * * * * * * * * * * * * */
+     * library Getters/Setters *
+     * * * * * * * * * * * * * */
     AdbInstance* findAdbNode(string name);
     AdbInstance* getAdbTable() { return _regAccessRootNode; };
     /* * * * * * * *
-    * library API *
-    * * * * * * * */
+     * library API *
+     * * * * * * * */
     string getLastErrMsg();
-    MlxRegLibStatus showRegisters(std::vector<string> &regs); // Return all available register names
-    MlxRegLibStatus showRegister(string regName, std::vector<AdbInstance*> &fields); // Return all fields of given register
-    MlxRegLibStatus sendRegister(string regName, int method, std::vector<u_int32_t> &data); // Send register by name
-    MlxRegLibStatus sendRegister(u_int16_t regId, int method, std::vector<u_int32_t> &data); // Send register by ID
+    MlxRegLibStatus showRegisters(std::vector<string>& regs); // Return all available register names
+    MlxRegLibStatus showRegister(string regName,
+                                 std::vector<AdbInstance*>& fields); // Return all fields of given register
+    MlxRegLibStatus sendRegister(string regName, int method, std::vector<u_int32_t>& data);  // Send register by name
+    MlxRegLibStatus sendRegister(u_int16_t regId, int method, std::vector<u_int32_t>& data); // Send register by ID
     dm_dev_id_t getDevId();
-    static dm_dev_id_t getDevId(mfile *mf);
-    static bool isDeviceSupported(mfile *mf);
-    static void isAccessRegisterSupported(mfile *mf);
+    static dm_dev_id_t getDevId(mfile* mf);
+    static bool isDeviceSupported(mfile* mf);
+    static void isAccessRegisterSupported(mfile* mf);
     bool isAccessRegisterGMPSupported(maccess_reg_method_t reg_method);
     bool isIBDevice();
-    MlxRegLibStatus dumpRegisterData(string output_file_name, std::vector<u_int32_t> &data);
+    MlxRegLibStatus dumpRegisterData(string output_file_name, std::vector<u_int32_t>& data);
+
 protected:
     /* Functions */
     bool isRegSizeSupported(string regName);
-    int sendMaccessReg(u_int16_t regId, int method, std::vector<u_int32_t> &data);
+    int sendMaccessReg(u_int16_t regId, int method, std::vector<u_int32_t>& data);
     void initAdb(string extAdbFile);
 
     /* Data Members */
-    mfile *_mf;
+    mfile* _mf;
     static map<dm_dev_id_t, Adb*> _adbDBs;
     static const int RETRIES_COUNT;
     static const int SLEEP_INTERVAL;
-    Adb *_adb;
-    AdbInstance *_regAccessRootNode;
-    AdbInstance *_regAccessUnionNode;
-    std::map<string, u_int64_t>   _regAccessMap;
+    Adb* _adb;
+    AdbInstance* _regAccessRootNode;
+    AdbInstance* _regAccessUnionNode;
+    std::map<string, u_int64_t> _regAccessMap;
     bool _isExternal;
 };
 
-}
+} // namespace mlxreg
 #endif /* MLXREG_LIB_H */
diff --git a/mlxreg/mlxreg_parser.cpp b/mlxreg/mlxreg_parser.cpp
index 1828c171..455c3257 100644
--- a/mlxreg/mlxreg_parser.cpp
+++ b/mlxreg/mlxreg_parser.cpp
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -41,155 +41,184 @@
 using namespace mlxreg;
 
 /************************************
-* Function: RegParser
-************************************/
-RegAccessParser::RegAccessParser(string data, string indexes, AdbInstance *regNode, std::vector<u_int32_t> buffer, bool ignore_ro)
+ * Function: RegParser
+ ************************************/
+RegAccessParser::RegAccessParser(string data,
+                                 string indexes,
+                                 AdbInstance* regNode,
+                                 std::vector<u_int32_t> buffer,
+                                 bool ignore_ro)
 {
-    _data      = data;
-    _indexes   = indexes;
-    _regNode   = regNode;
+    _data = data;
+    _indexes = indexes;
+    _regNode = regNode;
     _ignore_ro = ignore_ro;
     output_file = "";
-    if (!regNode) {
+    if (!regNode)
+    {
         _parseMode = Pm_Unknown;
-    } else {
+    }
+    else
+    {
         _parseMode = Pm_Known;
     }
-    _len    = buffer.size();
+    _len = buffer.size();
     _buffer = buffer;
     /*
      * Initiate byte-swapping
      * At this point we know the the buffer <buffer> argument already been trough byte-
      * swapping process, we need to re-commit this process so the data will be correct.
      */
-    for (std::vector<u_int32_t>::size_type j = 0; j < _buffer.size(); j++) {
+    for (std::vector<u_int32_t>::size_type j = 0; j < _buffer.size(); j++)
+    {
         _buffer[j] = CPU_TO_BE32((_buffer[j]));
     }
 }
 /************************************
-* Function: RegParser
-************************************/
-RegAccessParser::RegAccessParser(string data, string indexes, AdbInstance *regNode, u_int32_t len, bool ignore_ro)
+ * Function: RegParser
+ ************************************/
+RegAccessParser::RegAccessParser(string data, string indexes, AdbInstance* regNode, u_int32_t len, bool ignore_ro)
 {
-    _data      = data;
-    _indexes   = indexes;
-    _regNode   = regNode;
+    _data = data;
+    _indexes = indexes;
+    _regNode = regNode;
     _ignore_ro = ignore_ro;
     output_file = "";
-    _len       = len;
+    _len = len;
     // Set parsing method
-    if (!regNode) {
-        if (_len > MAX_REG_SIZE) {
+    if (!regNode)
+    {
+        if (_len > MAX_REG_SIZE)
+        {
             throw MlxRegException("Register length: 0x%08x is too large", _len);
         }
         _parseMode = Pm_Unknown;
         _len = (_len + 3) / 4;
-    } else {
+    }
+    else
+    {
         _parseMode = Pm_Known;
         _len = (_regNode->size) >> 5;
     }
-    //Resize buffer
+    // Resize buffer
     _buffer.resize(_len);
 }
 
 /************************************
-* Function: parse
-************************************/
+ * Function: parse
+ ************************************/
 std::vector<u_int32_t> RegAccessParser::genBuff()
 {
-    if (_parseMode == Pm_Known) {
+    if (_parseMode == Pm_Known)
+    {
         return genBuffKnown();
-    } else {
+    }
+    else
+    {
         return genBuffUnknown();
     }
 }
 
 /************************************
-* Function: genBuffKnown
-************************************/
+ * Function: genBuffKnown
+ ************************************/
 std::vector<u_int32_t> RegAccessParser::genBuffKnown()
 {
     parseIndexes();
     // Update buffer with data values
-    if (_data != "") {
+    if (_data != "")
+    {
         parseData();
     }
     // Convert to BE32
-    for (std::vector<u_int32_t>::size_type j = 0; j < _buffer.size(); j++) {
+    for (std::vector<u_int32_t>::size_type j = 0; j < _buffer.size(); j++)
+    {
         _buffer[j] = CPU_TO_BE32((_buffer[j]));
     }
     return _buffer;
 }
 
 /************************************
-* Function: genBuffUnknown
-************************************/
+ * Function: genBuffUnknown
+ ************************************/
 std::vector<u_int32_t> RegAccessParser::genBuffUnknown()
 {
     parseUnknown();
     // Convert to BE32
-    for (std::vector<u_int32_t>::size_type j = 0; j < _buffer.size(); j++) {
+    for (std::vector<u_int32_t>::size_type j = 0; j < _buffer.size(); j++)
+    {
         _buffer[j] = CPU_TO_BE32((_buffer[j]));
     }
     return _buffer;
 }
 
 /************************************
-* Function: parseIndexes
-************************************/
+ * Function: parseIndexes
+ ************************************/
 void RegAccessParser::parseIndexes()
 {
     std::vector<string> idxTokens = strSplit(_indexes, ',', false);
     std::vector<string> expectedIdxs = getAllIndexes(_regNode);
     std::vector<string> foundIdxs;
     // Update buffer with indexes values
-    for (std::vector<std::string>::size_type i = 0; i != idxTokens.size(); i++) {
+    for (std::vector<std::string>::size_type i = 0; i != idxTokens.size(); i++)
+    {
         std::vector<std::string> idx = strSplit(idxTokens[i], '=', true);
         string idxName = idx[0];
-        string idxVal  = idx[1];
+        string idxVal = idx[1];
         u_int32_t uintVal;
         strToUint32((char*)idxVal.c_str(), uintVal);
-        AdbInstance *field = getField(idxName);
+        AdbInstance* field = getField(idxName);
         // Make sure that the field is INDEX
-        if (std::find(expectedIdxs.begin(), expectedIdxs.end(), idxName) != expectedIdxs.end()) {
-            if (std::find(foundIdxs.begin(), foundIdxs.end(), idxName) != foundIdxs.end()) {
+        if (std::find(expectedIdxs.begin(), expectedIdxs.end(), idxName) != expectedIdxs.end())
+        {
+            if (std::find(foundIdxs.begin(), foundIdxs.end(), idxName) != foundIdxs.end())
+            {
                 throw MlxRegException("You wrote field: %s twice", idxName.c_str());
             }
             foundIdxs.push_back(idxName);
-        } else {
+        }
+        else
+        {
             throw MlxRegException("Field: %s is not an index.", idxName.c_str());
         }
         updateBuffer(field->offset, field->size, uintVal);
     }
     // Make sure that all the indexes are set
-    for (std::vector<std::string>::size_type i = 0; i != expectedIdxs.size(); i++) {
+    for (std::vector<std::string>::size_type i = 0; i != expectedIdxs.size(); i++)
+    {
         bool idxFound = false;
-        for (std::vector<std::string>::size_type j = 0; j != foundIdxs.size(); j++) {
-            if (expectedIdxs[i] == foundIdxs[j]) {
+        for (std::vector<std::string>::size_type j = 0; j != foundIdxs.size(); j++)
+        {
+            if (expectedIdxs[i] == foundIdxs[j])
+            {
                 idxFound = true;
             }
         }
-        if (!idxFound) {
+        if (!idxFound)
+        {
             throw MlxRegException("Index: %s was not provided", expectedIdxs[i].c_str());
         }
     }
 }
 
 /************************************
-* Function: parseData
-************************************/
+ * Function: parseData
+ ************************************/
 void RegAccessParser::parseData()
 {
     std::vector<string> datTokens = strSplit(_data, ',', false);
     // Update buffer with data values
-    for (std::vector<std::string>::size_type i = 0; i != datTokens.size(); i++) {
+    for (std::vector<std::string>::size_type i = 0; i != datTokens.size(); i++)
+    {
         std::vector<std::string> dat = strSplit(datTokens[i], '=', true);
         string datName = dat[0];
-        string datVal  = dat[1];
+        string datVal = dat[1];
         u_int32_t uintVal;
         strToUint32((char*)datVal.c_str(), uintVal);
-        AdbInstance *field = getField(datName);
-        if (isRO(field)) {
+        AdbInstance* field = getField(datName);
+        if (isRO(field))
+        {
             throw MlxRegException("Field: %s is ReadOnly", datName.c_str());
         }
         updateBuffer(field->offset, field->size, uintVal);
@@ -197,41 +226,43 @@ void RegAccessParser::parseData()
 }
 
 /************************************
-* Function: parseUnknown
-************************************/
+ * Function: parseUnknown
+ ************************************/
 void RegAccessParser::parseUnknown()
 {
     // Split input strings
     std::vector<string> idxTokens = strSplit(_indexes, ',', false);
     updateBufferUnknwon(idxTokens);
-    if (_data != "") {
+    if (_data != "")
+    {
         std::vector<string> datTokens = strSplit(_data, ',', false);
         updateBufferUnknwon(datTokens);
     }
 }
 
 /************************************
-* Function: updateBuffer
-************************************/
+ * Function: updateBuffer
+ ************************************/
 void RegAccessParser::updateBuffer(u_int32_t offset, u_int32_t size, u_int32_t val)
 {
     _buffer[offset >> 5] = MERGE(_buffer[offset >> 5], val, (offset % 32), size);
 }
 
 /************************************
-* Function: updateBufferUnknown
-*
-* Raw Data/Indexes Pattern is:
-* Address.Offset:Size=Data
-* Where:
-* Address: In bytes (DWORD aligned).
-* Offset:  In bits within the address.
-* Size:    In bits.
-************************************/
+ * Function: updateBufferUnknown
+ *
+ * Raw Data/Indexes Pattern is:
+ * Address.Offset:Size=Data
+ * Where:
+ * Address: In bytes (DWORD aligned).
+ * Offset:  In bits within the address.
+ * Size:    In bits.
+ ************************************/
 void RegAccessParser::updateBufferUnknwon(std::vector<string> fieldTokens)
 {
     // Parse fields
-    for (std::vector<std::string>::size_type i = 0; i != fieldTokens.size(); i++) {
+    for (std::vector<std::string>::size_type i = 0; i != fieldTokens.size(); i++)
+    {
         std::vector<std::string> fieldToken = strSplit(fieldTokens[i], '=', true);
         // extract <data>
         u_int32_t fieldDataUint;
@@ -245,7 +276,8 @@ void RegAccessParser::updateBufferUnknwon(std::vector<string> fieldTokens)
         string fieldSizeStr = fieldPropVec[1];
         strToUint32((char*)fieldSizeStr.c_str(), fieldSizeUint);
         // validate <size>
-        if (fieldSizeUint > 32) {
+        if (fieldSizeUint > 32)
+        {
             throw MlxRegException("Invalid size: %d. max size = 32 (bits)", fieldSizeUint);
         }
         // extract <address> <offset>
@@ -261,15 +293,18 @@ void RegAccessParser::updateBufferUnknwon(std::vector<string> fieldTokens)
         strToUint32((char*)fieldOffsetStr.c_str(), fieldOffsetUint);
         // validation
         // Address out of range
-        if (fieldAddrUint > (_buffer.size() << 2)) {
+        if (fieldAddrUint > (_buffer.size() << 2))
+        {
             throw MlxRegException("Address: 0x%08x is out of range", fieldOffsetUint);
         }
         // Address not 4 bytes aligned
-        if (fieldAddrUint % 0x4 != 0) {
+        if (fieldAddrUint % 0x4 != 0)
+        {
             throw MlxRegException("Address: 0x%08x is not 4-bytes aligned", fieldOffsetUint);
         }
         // offset + size out of address range
-        if ((fieldOffsetUint + fieldSizeUint) > 32) {
+        if ((fieldOffsetUint + fieldSizeUint) > 32)
+        {
             throw MlxRegException("Offset: %d and Size: %d is out of address range", fieldOffsetUint, fieldSizeUint);
         }
         // Update buffer
@@ -280,25 +315,30 @@ void RegAccessParser::updateBufferUnknwon(std::vector<string> fieldTokens)
 }
 
 /************************************
-* Function: strSplit
-************************************/
+ * Function: strSplit
+ ************************************/
 std::vector<string> RegAccessParser::strSplit(string str, char delimiter, bool forcePairs)
 {
     std::vector<string> internal;
     std::stringstream ss(str); // Turn the string into a stream.
     std::string tok;
-    while (getline(ss, tok, delimiter)) {
+    while (getline(ss, tok, delimiter))
+    {
         internal.push_back((const string)tok);
     }
     // Vector must contain <key-values> otherwise it's invalid.
-    if (forcePairs) {
-        if (internal.size() != 2) {
+    if (forcePairs)
+    {
+        if (internal.size() != 2)
+        {
             throw MlxRegException("Argument: %s is invalid", str.c_str());
         }
     }
     // Can't have an empty key/value
-    for (std::vector<string>::size_type i = 0; i != internal.size(); i++) {
-        if (internal[i].length() == 0) {
+    for (std::vector<string>::size_type i = 0; i != internal.size(); i++)
+    {
+        if (internal[i].length() == 0)
+        {
             throw MlxRegException("Argument: %s is invalid", str.c_str());
         }
     }
@@ -306,91 +346,104 @@ std::vector<string> RegAccessParser::strSplit(string str, char delimiter, bool f
 }
 
 /************************************
-* Function: strToUint32
-************************************/
-void RegAccessParser::strToUint32(char *str, u_int32_t &uint)
+ * Function: strToUint32
+ ************************************/
+void RegAccessParser::strToUint32(char* str, u_int32_t& uint)
 {
-    char *endp;
+    char* endp;
     errno = 0;
     uint = strtoul(str, &endp, 0);
-    if (*endp || errno == ERANGE) {
+    if (*endp || errno == ERANGE)
+    {
         throw MlxRegException("Argument: %s is invalid.", str);
     }
-    if (str[0] == '-') {
+    if (str[0] == '-')
+    {
         throw MlxRegException("Argument: %s is invalid. It must be non-negative.", str);
     }
     return;
 }
 
 /************************************
-* Function: getFieldWithParents
-************************************/
-bool RegAccessParser::checkFieldWithPath(AdbInstance* field, u_int32_t idx, std::vector<string> &fieldsChain)
+ * Function: getFieldWithParents
+ ************************************/
+bool RegAccessParser::checkFieldWithPath(AdbInstance* field, u_int32_t idx, std::vector<string>& fieldsChain)
 {
-   if (idx == 0 && (field->name == fieldsChain[0])) {
-       return true;
-   } else if (field->name == fieldsChain[idx]) {
+    if (idx == 0 && (field->name == fieldsChain[0]))
+    {
+        return true;
+    }
+    else if (field->name == fieldsChain[idx])
+    {
         return checkFieldWithPath(field->parent, --idx, fieldsChain);
-    } else {
+    }
+    else
+    {
         return false;
     }
 }
 /************************************
-* Function: getField
-************************************/
+ * Function: getField
+ ************************************/
 AdbInstance* RegAccessParser::getField(string name)
 {
     // this will allow to access the leaf field by specifying it's parent.
     std::vector<string> fieldsChain = strSplit(name, '.', false);
     std::vector<AdbInstance*> subItems = _regNode->getLeafFields(true);
-    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++) {
-        if (checkFieldWithPath(subItems[i], fieldsChain.size() - 1, fieldsChain)) {
+    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++)
+    {
+        if (checkFieldWithPath(subItems[i], fieldsChain.size() - 1, fieldsChain))
+        {
             return subItems[i];
         }
     }
     throw MlxRegException("Can't find field name: \"%s\"", name.c_str());
 }
 
-string RegAccessParser::getAccess(const AdbInstance *field)
+string RegAccessParser::getAccess(const AdbInstance* field)
 {
     string access = field->getInstanceAttr("access");
-    if (access.empty()) {
+    if (access.empty())
+    {
         access = "N/A";
-        if (field->parent) {
+        if (field->parent)
+        {
             access = getAccess(field->parent);
         }
     }
     return access;
 }
 
-bool RegAccessParser::checkAccess(const AdbInstance *field, const string accessStr)
+bool RegAccessParser::checkAccess(const AdbInstance* field, const string accessStr)
 {
     return getAccess(field) == accessStr;
 }
 
-
-bool RegAccessParser::isRO(AdbInstance *field)
+bool RegAccessParser::isRO(AdbInstance* field)
 {
-    if (_ignore_ro) {
+    if (_ignore_ro)
+    {
         return false;
     }
     return checkAccess(field, "RO");
 }
 
-bool RegAccessParser::isIndex(AdbInstance *field)
+bool RegAccessParser::isIndex(AdbInstance* field)
 {
     return checkAccess(field, "INDEX");
 }
 
 /************************************
-* Function: getAllIndexes
-************************************/
-std::vector<string> RegAccessParser::getAllIndexes(AdbInstance *node)
+ * Function: getAllIndexes
+ ************************************/
+std::vector<string> RegAccessParser::getAllIndexes(AdbInstance* node)
 {
     std::vector<string> indexes;
     std::vector<AdbInstance*> subItems = node->getLeafFields(true);
-    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++) {
-        if (isIndex(subItems[i])) {
+    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++)
+    {
+        if (isIndex(subItems[i]))
+        {
             indexes.push_back(subItems[i]->name);
         }
     }
@@ -399,12 +452,12 @@ std::vector<string> RegAccessParser::getAllIndexes(AdbInstance *node)
 
 void RegAccessParser::updateField(string field_name, u_int32_t value)
 {
-    AdbInstance *field = getField(field_name);
+    AdbInstance* field = getField(field_name);
     updateBuffer(field->offset, field->size, value);
 }
 
 u_int32_t RegAccessParser::getFieldValue(string field_name, std::vector<u_int32_t>& buff)
 {
-    AdbInstance *field = getField(field_name);
+    AdbInstance* field = getField(field_name);
     return (u_int32_t)field->popBuf((u_int8_t*)&buff[0]);
 }
diff --git a/mlxreg/mlxreg_parser.h b/mlxreg/mlxreg_parser.h
index 998072c2..122778ce 100644
--- a/mlxreg/mlxreg_parser.h
+++ b/mlxreg/mlxreg_parser.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -40,11 +40,12 @@
 #include <adb_parser/adb_parser.h>
 #include "mlxreg_exception.h"
 
-namespace mlxreg {
-
+namespace mlxreg
+{
 #define MAX_REG_SIZE 0x2000
 
-typedef enum {
+typedef enum
+{
     Pm_Known = 0,
     Pm_Unknown
 } parseMode;
@@ -52,39 +53,45 @@ typedef enum {
 class RegAccessParser
 {
 public:
-    RegAccessParser(string data, string indexes, AdbInstance *regNode, std::vector<u_int32_t> buffer, bool ignore_ro = false);
-    RegAccessParser(string data, string indexes, AdbInstance *regNode, u_int32_t len, bool ignore_ro = false);
+    RegAccessParser(string data,
+                    string indexes,
+                    AdbInstance* regNode,
+                    std::vector<u_int32_t> buffer,
+                    bool ignore_ro = false);
+    RegAccessParser(string data, string indexes, AdbInstance* regNode, u_int32_t len, bool ignore_ro = false);
     std::vector<u_int32_t> genBuff();
-    u_int32_t getDataLen() {return _len;};
-    static void strToUint32(char *str, u_int32_t &uint);
-    static string getAccess(const AdbInstance *field);
+    u_int32_t getDataLen() { return _len; };
+    static void strToUint32(char* str, u_int32_t& uint);
+    static string getAccess(const AdbInstance* field);
+
 protected:
     string _data;
     string _indexes;
     u_int32_t _len;
-    AdbInstance *_regNode;
+    AdbInstance* _regNode;
     parseMode _parseMode;
     string output_file;
-    std::vector<u_int32_t>    _buffer;
+    std::vector<u_int32_t> _buffer;
     bool _ignore_ro;
     std::vector<u_int32_t> genBuffUnknown();
     std::vector<u_int32_t> genBuffKnown();
     void parseIndexes();
     void parseData();
     void parseUnknown();
-    bool checkFieldWithPath(AdbInstance* field, u_int32_t idx, std::vector<string> &fieldsChain);
+    bool checkFieldWithPath(AdbInstance* field, u_int32_t idx, std::vector<string>& fieldsChain);
     AdbInstance* getField(string name);
     std::vector<string> strSplit(string str, char delimiter, bool forcePairs);
     void updateBuffer(u_int32_t offset, u_int32_t size, u_int32_t val);
     void updateBufferUnknwon(std::vector<string> fieldTokens);
     void updateField(string field_name, u_int32_t value);
     u_int32_t getFieldValue(string field_name, std::vector<u_int32_t>& buff);
-    bool isRO(AdbInstance *field);
-    bool isIndex(AdbInstance *field);
-    std::vector<string> getAllIndexes(AdbInstance *node);
+    bool isRO(AdbInstance* field);
+    bool isIndex(AdbInstance* field);
+    std::vector<string> getAllIndexes(AdbInstance* node);
+
 private:
-    bool checkAccess(const AdbInstance *field, const string accessStr);
+    bool checkAccess(const AdbInstance* field, const string accessStr);
 };
 
-}
+} // namespace mlxreg
 #endif /* MLXREG_PARSER_H */
diff --git a/mlxreg/mlxreg_ui.cpp b/mlxreg/mlxreg_ui.cpp
index cc4de62c..bbd63389 100644
--- a/mlxreg/mlxreg_ui.cpp
+++ b/mlxreg/mlxreg_ui.cpp
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -59,194 +59,201 @@
 #define MLXREG_EXEC "mlxreg"
 #endif
 
-#define CHECK_UNIQUE_OP(op) \
-    if (op != CMD_UNKNOWN) { \
+#define CHECK_UNIQUE_OP(op)                                                        \
+    if (op != CMD_UNKNOWN)                                                         \
+    {                                                                              \
         throw MlxRegException("incompatible flags combination, please read help"); \
     }
 
-#define CHECK_UNIQUE_STR(op) \
-    if (op != "") { \
+#define CHECK_UNIQUE_STR(op)                                                       \
+    if (op != "")                                                                  \
+    {                                                                              \
         throw MlxRegException("incompatible flags combination, please read help"); \
     }
 
-#define CHECK_UNIQUE_UINT(op) \
-    if (op != 0) { \
+#define CHECK_UNIQUE_UINT(op)                                                      \
+    if (op != 0)                                                                   \
+    {                                                                              \
         throw MlxRegException("incompatible flags combination, please read help"); \
     }
 
-#define PRINT_LINE(len) \
-    for (int i = 0; i < len; i++) { \
-        printf("="); \
-    } \
+#define PRINT_LINE(len)           \
+    for (int i = 0; i < len; i++) \
+    {                             \
+        printf("=");              \
+    }                             \
     printf("\n");
 
 /************************************
-* FLAGS Constants
-************************************/
-#define DEVICE_FLAG                 "device"
-#define DEVICE_FLAG_SHORT           'd'
-#define HELP_FLAG                   "help"
-#define HELP_FLAG_SHORT             'h'
-#define VERSION_FLAG                "version"
-#define VERSION_FLAG_SHORT          'v'
-#define ADB_FILE_FLAG               "adb_file"
-#define ADB_FILE_FLAG_SHORT         'a'
-#define REG_NAME_FLAG               "reg_name"
-#define REG_NAME_FLAG_SHORT         ' '
-#define REG_ID_FLAG                 "reg_id"
-#define REG_ID_FLAG_SHORT           ' '
-#define IDXES_FLAG                  "indexes"
-#define IDXES_FLAG_SHORT            'i'
-#define REG_LEN_FLAG                "reg_len"
-#define REG_LEN_FLAG_SHORT          ' '
-#define OP_GET_FLAG                 "get"
-#define OP_GET_FLAG_SHORT           'g'
-#define OP_SET_FLAG                 "set"
-#define OP_SET_FLAG_SHORT           's'
-#define OP_SHOW_REG_FLAG            "show_reg"
-#define OP_SHOW_REG_FLAG_SHORT      ' '
-#define OP_SHOW_REGS_FLAG           "show_regs"
-#define OP_SHOW_REGS_FLAG_SHORT     ' '
-#define OP_SHOW_ALL_REGS_FLAG       "show_all_regs"
+ * FLAGS Constants
+ ************************************/
+#define DEVICE_FLAG "device"
+#define DEVICE_FLAG_SHORT 'd'
+#define HELP_FLAG "help"
+#define HELP_FLAG_SHORT 'h'
+#define VERSION_FLAG "version"
+#define VERSION_FLAG_SHORT 'v'
+#define ADB_FILE_FLAG "adb_file"
+#define ADB_FILE_FLAG_SHORT 'a'
+#define REG_NAME_FLAG "reg_name"
+#define REG_NAME_FLAG_SHORT ' '
+#define REG_ID_FLAG "reg_id"
+#define REG_ID_FLAG_SHORT ' '
+#define IDXES_FLAG "indexes"
+#define IDXES_FLAG_SHORT 'i'
+#define REG_LEN_FLAG "reg_len"
+#define REG_LEN_FLAG_SHORT ' '
+#define OP_GET_FLAG "get"
+#define OP_GET_FLAG_SHORT 'g'
+#define OP_SET_FLAG "set"
+#define OP_SET_FLAG_SHORT 's'
+#define OP_SHOW_REG_FLAG "show_reg"
+#define OP_SHOW_REG_FLAG_SHORT ' '
+#define OP_SHOW_REGS_FLAG "show_regs"
+#define OP_SHOW_REGS_FLAG_SHORT ' '
+#define OP_SHOW_ALL_REGS_FLAG "show_all_regs"
 #define OP_SHOW_ALL_REGS_FLAG_SHORT ' '
-#define IGNORE_CAP_CHECK_FLAG       "ignore_cap_check"
+#define IGNORE_CAP_CHECK_FLAG "ignore_cap_check"
 #define IGNORE_CAP_CHECK_FLAG_SHORT ' '
-#define IGNORE_REG_CHECK_FLAG       "ignore_reg_check"
+#define IGNORE_REG_CHECK_FLAG "ignore_reg_check"
 #define IGNORE_REG_CHECK_FLAG_SHORT ' '
-#define FORCE_FLAG                  "yes"
-#define FORCE_FLAG_SHORT            ' '
-#define IGNORE_RO                   "ignore_ro"
-#define IGNORE_RO_SHORT             ' '
-#define FILE_TO_DUMP_BUFFER         "output_file"
-#define FILE_TO_DUMP_BUFFER_SHORT    ' '
-#define FILE_IO                     "file_io"
-#define FILE_IO_SHORT               ' '
+#define FORCE_FLAG "yes"
+#define FORCE_FLAG_SHORT ' '
+#define IGNORE_RO "ignore_ro"
+#define IGNORE_RO_SHORT ' '
+#define FILE_TO_DUMP_BUFFER "output_file"
+#define FILE_TO_DUMP_BUFFER_SHORT ' '
+#define FILE_IO "file_io"
+#define FILE_IO_SHORT ' '
 
 using namespace mlxreg;
 
 /************************************
-* Function: MlxRegUi
-************************************/
-MlxRegUi::MlxRegUi() :
-    CommandLineRequester("mlxreg OPTIONS"),
-    _cmdParser("mlxreg")
+ * Function: MlxRegUi
+ ************************************/
+MlxRegUi::MlxRegUi() : CommandLineRequester("mlxreg OPTIONS"), _cmdParser("mlxreg")
 {
     initCmdParser();
-    _device         = "";
-    _mf             = NULL;
-    _extAdbFile     = "";
-    _regName        = "";
-    _regID          = 0;
-    _dataStr        = "";
-    _indexesStr     = "";
-    _dataLen        = 0;
+    _device = "";
+    _mf = NULL;
+    _extAdbFile = "";
+    _regName = "";
+    _regID = 0;
+    _dataStr = "";
+    _indexesStr = "";
+    _dataLen = 0;
     _ignoreCapCheck = false;
-    _op             = CMD_UNKNOWN;
-    _mlxRegLib      = NULL;
-    _force          = false;
-    _ignore_ro      = false;
-    _output_file    ="";
-    _file_io        ="";
+    _op = CMD_UNKNOWN;
+    _mlxRegLib = NULL;
+    _force = false;
+    _ignore_ro = false;
+    _output_file = "";
+    _file_io = "";
 
 #if defined(EXTERNAL) || defined(MST_UL)
-    _isExternal     = true;
+    _isExternal = true;
 #else
-    _isExternal     = false;
+    _isExternal = false;
 #endif
 }
 
 /************************************
-* Function: ~MlxRegUi
-************************************/
+ * Function: ~MlxRegUi
+ ************************************/
 MlxRegUi::~MlxRegUi()
 {
-    if (_mf) {
+    if (_mf)
+    {
         mclose(_mf);
     }
-    if (_mlxRegLib) {
+    if (_mlxRegLib)
+    {
         delete _mlxRegLib;
     }
 }
 
 /************************************
-* Function: initCmdParser
-************************************/
+ * Function: initCmdParser
+ ************************************/
 void MlxRegUi::initCmdParser()
 {
-    AddOptions(DEVICE_FLAG,       DEVICE_FLAG_SHORT, "MstDevice", "Mellanox mst device name");
-    AddOptions(HELP_FLAG,         HELP_FLAG_SHORT, "", "Show help message and exit");
-    AddOptions(VERSION_FLAG,      VERSION_FLAG_SHORT, "", "Show version and exit");
-    AddOptions(ADB_FILE_FLAG,     ADB_FILE_FLAG_SHORT, "AdbFile", "External ADB file");
-    AddOptions(REG_NAME_FLAG,     REG_NAME_FLAG_SHORT, "RegisterName", "Access register name");
-    AddOptions(REG_ID_FLAG,       REG_ID_FLAG_SHORT, "RegisterID", "Access register ID");
-    AddOptions(IDXES_FLAG,        IDXES_FLAG_SHORT, "RegisterData", "Register data");
-    AddOptions(REG_LEN_FLAG,      REG_LEN_FLAG_SHORT, "RegisterDataLen", "Register data length");
+    AddOptions(DEVICE_FLAG, DEVICE_FLAG_SHORT, "MstDevice", "Mellanox mst device name");
+    AddOptions(HELP_FLAG, HELP_FLAG_SHORT, "", "Show help message and exit");
+    AddOptions(VERSION_FLAG, VERSION_FLAG_SHORT, "", "Show version and exit");
+    AddOptions(ADB_FILE_FLAG, ADB_FILE_FLAG_SHORT, "AdbFile", "External ADB file");
+    AddOptions(REG_NAME_FLAG, REG_NAME_FLAG_SHORT, "RegisterName", "Access register name");
+    AddOptions(REG_ID_FLAG, REG_ID_FLAG_SHORT, "RegisterID", "Access register ID");
+    AddOptions(IDXES_FLAG, IDXES_FLAG_SHORT, "RegisterData", "Register data");
+    AddOptions(REG_LEN_FLAG, REG_LEN_FLAG_SHORT, "RegisterDataLen", "Register data length");
     AddOptions(IGNORE_CAP_CHECK_FLAG, IGNORE_CAP_CHECK_FLAG_SHORT, "", "");
     AddOptions(IGNORE_REG_CHECK_FLAG, IGNORE_REG_CHECK_FLAG_SHORT, "", "");
-    AddOptions(OP_GET_FLAG,       OP_GET_FLAG_SHORT, "", "Register access GET");
-    AddOptions(OP_SET_FLAG,       OP_SET_FLAG_SHORT, "RegisterData", "Register access SET");
-    AddOptions(OP_SHOW_REG_FLAG,  OP_SHOW_REG_FLAG_SHORT, "RegisterName", "Print register <reg_name> properties and exit");
+    AddOptions(OP_GET_FLAG, OP_GET_FLAG_SHORT, "", "Register access GET");
+    AddOptions(OP_SET_FLAG, OP_SET_FLAG_SHORT, "RegisterData", "Register access SET");
+    AddOptions(OP_SHOW_REG_FLAG, OP_SHOW_REG_FLAG_SHORT, "RegisterName",
+               "Print register <reg_name> properties and exit");
     AddOptions(OP_SHOW_REGS_FLAG, OP_SHOW_REGS_FLAG_SHORT, "", "Print available registers names and exit");
     AddOptions(OP_SHOW_ALL_REGS_FLAG, OP_SHOW_ALL_REGS_FLAG_SHORT, "", "");
     AddOptions(FORCE_FLAG, FORCE_FLAG_SHORT, "", "");
     AddOptions(IGNORE_RO, IGNORE_RO_SHORT, "", "Ignore the access check in the SET operation");
-    AddOptions(FILE_TO_DUMP_BUFFER, FILE_TO_DUMP_BUFFER_SHORT, "OutputFile", "Dump buffer to file instead of sending to device");
+    AddOptions(FILE_TO_DUMP_BUFFER, FILE_TO_DUMP_BUFFER_SHORT, "OutputFile",
+               "Dump buffer to file instead of sending to device");
     AddOptions(FILE_IO, FILE_IO_SHORT, "FilePath", "Work with file for IO instead of CLI flags");
 
     _cmdParser.AddRequester(this);
 }
 
 /************************************
-* Function: printFlagLine
-************************************/
+ * Function: printFlagLine
+ ************************************/
 static void printFlagLine(const char flag_s, string flag_l, string param, string desc)
 {
     string sflags_s(1, flag_s);
-    if (sflags_s != " ") {
+    if (sflags_s != " ")
+    {
         printf(IDENT2 "-%-2s|--%-10s", sflags_s.c_str(), flag_l.c_str());
-    } else {
+    }
+    else
+    {
         printf(IDENT2 "--%-14s", flag_l.c_str());
     }
-    if (param.length()) {
+    if (param.length())
+    {
         printf(" <%s>", param.c_str());
-    } else {
+    }
+    else
+    {
         printf("\t");
     }
     printf(IDENT3 ": %-30s\n", desc.c_str());
 }
 
 /************************************
-* Function: PrintHelp
-************************************/
+ * Function: PrintHelp
+ ************************************/
 void MlxRegUi::printHelp()
 {
     // print opening
-    printf(
-        IDENT "NAME:\n"
-        IDENT2 MLXREG_EXEC "\n"
-        IDENT "SYNOPSIS:\n"
-        IDENT2 MLXREG_EXEC " [OPTIONS]\n");
-    printf(
-        IDENT "DESCRIPTION:\n"
-        IDENT2 "Exposes supported access registers, and allows users to obtain information regarding\n"
-        IDENT2 "the registers fields and attributes, and to set and get data with specific\n"
-        IDENT2 "register.\n");
+    printf(IDENT "NAME:\n" IDENT2 MLXREG_EXEC "\n" IDENT "SYNOPSIS:\n" IDENT2 MLXREG_EXEC " [OPTIONS]\n");
+    printf(IDENT "DESCRIPTION:\n" IDENT2
+                 "Exposes supported access registers, and allows users to obtain information regarding\n" IDENT2
+                 "the registers fields and attributes, and to set and get data with specific\n" IDENT2 "register.\n");
     // print options
     printf("\n");
     printf(IDENT "OPTIONS:\n");
-    printFlagLine(HELP_FLAG_SHORT,          HELP_FLAG,         "", "Display help message.");
-    printFlagLine(VERSION_FLAG_SHORT,       VERSION_FLAG,      "", "Display version info.");
-    printFlagLine(DEVICE_FLAG_SHORT,        DEVICE_FLAG,       "device", "Perform operation for a specified mst device.");
-    printFlagLine(ADB_FILE_FLAG_SHORT,      ADB_FILE_FLAG,     "adb_file", "An external ADB file");
-    printFlagLine(REG_NAME_FLAG_SHORT,      REG_NAME_FLAG,     "reg_name", "Known access register name");
-    printFlagLine(REG_ID_FLAG_SHORT,        REG_ID_FLAG,       "reg_ID", "Access register ID");
-    printFlagLine(REG_LEN_FLAG_SHORT,       REG_LEN_FLAG,      "reg_length", "Access register layout length (bytes)");
-    printFlagLine(IDXES_FLAG_SHORT,         IDXES_FLAG,        "idxs_vals", "Register indexes");
-    printFlagLine(OP_GET_FLAG_SHORT,        OP_GET_FLAG,       "", "Register access GET");
-    printFlagLine(OP_SET_FLAG_SHORT,        OP_SET_FLAG,       "reg_dataStr", "Register access SET");
-    printFlagLine(OP_SHOW_REG_FLAG_SHORT,   OP_SHOW_REG_FLAG,  "reg_name", "Print the fields of a given reg access (must have reg_name)");
-    printFlagLine(OP_SHOW_REGS_FLAG_SHORT,  OP_SHOW_REGS_FLAG, "", "Print all available reg access'");
-    printFlagLine(FORCE_FLAG_SHORT,         FORCE_FLAG,        "", "Non-interactive mode, answer yes to all questions");
+    printFlagLine(HELP_FLAG_SHORT, HELP_FLAG, "", "Display help message.");
+    printFlagLine(VERSION_FLAG_SHORT, VERSION_FLAG, "", "Display version info.");
+    printFlagLine(DEVICE_FLAG_SHORT, DEVICE_FLAG, "device", "Perform operation for a specified mst device.");
+    printFlagLine(ADB_FILE_FLAG_SHORT, ADB_FILE_FLAG, "adb_file", "An external ADB file");
+    printFlagLine(REG_NAME_FLAG_SHORT, REG_NAME_FLAG, "reg_name", "Known access register name");
+    printFlagLine(REG_ID_FLAG_SHORT, REG_ID_FLAG, "reg_ID", "Access register ID");
+    printFlagLine(REG_LEN_FLAG_SHORT, REG_LEN_FLAG, "reg_length", "Access register layout length (bytes)");
+    printFlagLine(IDXES_FLAG_SHORT, IDXES_FLAG, "idxs_vals", "Register indexes");
+    printFlagLine(OP_GET_FLAG_SHORT, OP_GET_FLAG, "", "Register access GET");
+    printFlagLine(OP_SET_FLAG_SHORT, OP_SET_FLAG, "reg_dataStr", "Register access SET");
+    printFlagLine(OP_SHOW_REG_FLAG_SHORT, OP_SHOW_REG_FLAG, "reg_name",
+                  "Print the fields of a given reg access (must have reg_name)");
+    printFlagLine(OP_SHOW_REGS_FLAG_SHORT, OP_SHOW_REGS_FLAG, "", "Print all available reg access'");
+    printFlagLine(FORCE_FLAG_SHORT, FORCE_FLAG, "", "Non-interactive mode, answer yes to all questions");
 
     // print usage examples
     printf("\n");
@@ -261,13 +268,15 @@ void MlxRegUi::printHelp()
 }
 
 /************************************
-* Function: getLongestNodeLen
-************************************/
+ * Function: getLongestNodeLen
+ ************************************/
 size_t getLongestNodeLen(std::vector<AdbInstance*> root)
 {
     size_t len = 0;
-    for (std::vector<AdbInstance*>::size_type i = 0; i != root.size(); i++) {
-        if (strlen(root[i]->name.c_str()) > len) {
+    for (std::vector<AdbInstance*>::size_type i = 0; i != root.size(); i++)
+    {
+        if (strlen(root[i]->name.c_str()) > len)
+        {
             len = strlen(root[i]->name.c_str());
         }
     }
@@ -275,14 +284,16 @@ size_t getLongestNodeLen(std::vector<AdbInstance*> root)
 }
 
 /************************************
-* Function: printRegFields
-************************************/
+ * Function: printRegFields
+ ************************************/
 void MlxRegUi::printRegFields(vector<AdbInstance*> nodeFields)
 {
     int largestName = (int)getLongestNodeLen(nodeFields);
-    printf("%-*s | %-10s | %-8s | %-8s | %-8s\n", largestName, "Field Name", "Address (Bytes)", "Offset (Bits)", "Size (Bits)", "Access");
+    printf("%-*s | %-10s | %-8s | %-8s | %-8s\n", largestName, "Field Name", "Address (Bytes)", "Offset (Bits)",
+           "Size (Bits)", "Access");
     PRINT_LINE(58 + largestName);
-    for (std::vector<AdbInstance*>::size_type i = 0; i != nodeFields.size(); i++) {
+    for (std::vector<AdbInstance*>::size_type i = 0; i != nodeFields.size(); i++)
+    {
         printf("%-*s | 0x%08x      | %-8d      | %-8d    | %-15s\n",
                largestName,
                nodeFields[i]->name.c_str(),
@@ -291,31 +302,34 @@ void MlxRegUi::printRegFields(vector<AdbInstance*> nodeFields)
                nodeFields[i]->fieldDesc->eSize(),
                RegAccessParser::getAccess(nodeFields[i]).c_str());
     }
-    PRINT_LINE(58 + largestName);;
+    PRINT_LINE(58 + largestName);
+    ;
 }
 
 /************************************
-* Function: printRegNames
-************************************/
+ * Function: printRegNames
+ ************************************/
 void MlxRegUi::printRegNames(std::vector<string> regs)
 {
     printf("Available Access Registers\n");
     PRINT_LINE(104);
-    for (std::vector<string>::size_type i = 0; i != regs.size(); i++) {
+    for (std::vector<string>::size_type i = 0; i != regs.size(); i++)
+    {
         printf("%-30s\n", regs[i].c_str());
     }
 }
 
 /************************************
-* Function: printAdbContext
-************************************/
-void MlxRegUi::printAdbContext(AdbInstance *node, std::vector<u_int32_t> buff)
+ * Function: printAdbContext
+ ************************************/
+void MlxRegUi::printAdbContext(AdbInstance* node, std::vector<u_int32_t> buff)
 {
     std::vector<AdbInstance*> subItems = node->getLeafFields(true);
     int largestName = (int)getLongestNodeLen(subItems);
     printf("%-*s | %-8s\n", largestName, "Field Name", "Data");
     PRINT_LINE(largestName + 14);
-    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++) {
+    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++)
+    {
         printf("%-*s | 0x%08x\n",
                largestName,
                subItems[i]->name.c_str(),
@@ -325,14 +339,15 @@ void MlxRegUi::printAdbContext(AdbInstance *node, std::vector<u_int32_t> buff)
 }
 
 /************************************
-* Function: printAdbContext
-************************************/
+ * Function: printAdbContext
+ ************************************/
 void MlxRegUi::printBuff(std::vector<u_int32_t> buff)
 {
     u_int32_t rawAddr = 0;
     printf("Address    | Data\n");
     PRINT_LINE(23);
-    for (std::vector<u_int32_t>::size_type i = 0; i != buff.size(); i++) {
+    for (std::vector<u_int32_t>::size_type i = 0; i != buff.size(); i++)
+    {
         printf("0x%08x | 0x%08x\n", rawAddr, CPU_TO_BE32(buff[i]));
         rawAddr += 4;
     }
@@ -340,110 +355,148 @@ void MlxRegUi::printBuff(std::vector<u_int32_t> buff)
 }
 
 /************************************
-* Function: askUser
-************************************/
-bool MlxRegUi::askUser(const char *question)
+ * Function: askUser
+ ************************************/
+bool MlxRegUi::askUser(const char* question)
 {
     printf("\n %s ? (y/n) [n] : ", question);
-    if (_force) {
+    if (_force)
+    {
         printf("y\n");
-    } else {
+    }
+    else
+    {
         mft_restore_and_raise();
         fflush(stdout);
         std::string answer;
         std::getline(std::cin, answer);
-        if (strcasecmp(answer.c_str(), "y") &&
-            strcasecmp(answer.c_str(), "yes")) {
+        if (strcasecmp(answer.c_str(), "y") && strcasecmp(answer.c_str(), "yes"))
+        {
             return false;
         }
-        mft_signal_set_handling(1);//set again in case we move from here to another critical section.
+        mft_signal_set_handling(1); // set again in case we move from here to another critical section.
     }
     return true;
 }
 
 /************************************
-* Function: HandleOption
-************************************/
+ * Function: HandleOption
+ ************************************/
 ParseStatus MlxRegUi::HandleOption(string name, string value)
 {
-    if (name == HELP_FLAG) {
+    if (name == HELP_FLAG)
+    {
         printHelp();
         return PARSE_OK_WITH_EXIT;
-    } else if (name == VERSION_FLAG) {
+    }
+    else if (name == VERSION_FLAG)
+    {
 #if defined(EXTERNAL) || defined(MST_UL)
         print_version_string(MLXREG_EXEC, NULL);
 #else
         print_version_string("mlxreg (internal)", NULL);
 #endif
         return PARSE_OK_WITH_EXIT;
-    } else if (name == DEVICE_FLAG) {
+    }
+    else if (name == DEVICE_FLAG)
+    {
         _device = value;
         return PARSE_OK;
-    } else if (name == ADB_FILE_FLAG) {
+    }
+    else if (name == ADB_FILE_FLAG)
+    {
         _extAdbFile = value;
         return PARSE_OK;
-    } else if (name == IDXES_FLAG) {
+    }
+    else if (name == IDXES_FLAG)
+    {
         _indexesStr = value;
         return PARSE_OK;
-    } else if (name == REG_NAME_FLAG) {
+    }
+    else if (name == REG_NAME_FLAG)
+    {
         CHECK_UNIQUE_UINT(_regID);
         CHECK_UNIQUE_UINT(_dataLen);
         _regName = value;
         return PARSE_OK;
-    } else if (name == REG_ID_FLAG) {
+    }
+    else if (name == REG_ID_FLAG)
+    {
         CHECK_UNIQUE_STR(_regName);
         RegAccessParser::strToUint32((char*)value.c_str(), _regID);
         return PARSE_OK;
-    } else if (name == REG_LEN_FLAG) {
+    }
+    else if (name == REG_LEN_FLAG)
+    {
         CHECK_UNIQUE_STR(_regName);
         RegAccessParser::strToUint32((char*)value.c_str(), _dataLen);
         return PARSE_OK;
     }
 #if !defined(EXTERNAL) && !defined(MST_UL)
-    else if (name == IGNORE_CAP_CHECK_FLAG) {
+    else if (name == IGNORE_CAP_CHECK_FLAG)
+    {
         _ignoreCapCheck = true;
         return PARSE_OK;
     }
 #endif
-    else if (name == IGNORE_REG_CHECK_FLAG) {
+    else if (name == IGNORE_REG_CHECK_FLAG)
+    {
         // TODO: remove IGNORE_REG_CHECK_FLAG from UI after 4.14.0 release, it's deprecated
-        cout << endl << "-W- The flag --" << IGNORE_REG_CHECK_FLAG
-             << " is deprecated and will be removed." << endl << endl;
+        cout << endl
+             << "-W- The flag --" << IGNORE_REG_CHECK_FLAG << " is deprecated and will be removed." << endl
+             << endl;
         return PARSE_OK;
-    } else if (name == FORCE_FLAG) {
+    }
+    else if (name == FORCE_FLAG)
+    {
         _force = true;
         return PARSE_OK;
-    } else if (name == OP_SET_FLAG) {
+    }
+    else if (name == OP_SET_FLAG)
+    {
         CHECK_UNIQUE_OP(_op);
         _op = CMD_SET;
         _dataStr = value;
         return PARSE_OK;
-    } else if (name == OP_GET_FLAG) {
+    }
+    else if (name == OP_GET_FLAG)
+    {
         CHECK_UNIQUE_OP(_op);
         _op = CMD_GET;
         return PARSE_OK;
-    } else if (name == OP_SHOW_REG_FLAG) {
+    }
+    else if (name == OP_SHOW_REG_FLAG)
+    {
         CHECK_UNIQUE_OP(_op);
         _op = CMD_SHOW_REG;
         _regName = value;
         return PARSE_OK;
-    } else if (name == OP_SHOW_REGS_FLAG) {
+    }
+    else if (name == OP_SHOW_REGS_FLAG)
+    {
         CHECK_UNIQUE_OP(_op);
         _op = CMD_SHOW_REGS;
         return PARSE_OK;
-    } else if (name == OP_SHOW_ALL_REGS_FLAG) {
+    }
+    else if (name == OP_SHOW_ALL_REGS_FLAG)
+    {
         CHECK_UNIQUE_OP(_op);
         _op = CMD_SHOW_ALL_REGS;
         return PARSE_OK;
     }
 #if !defined(EXTERNAL) && !defined(MST_UL)
-    else if (name == IGNORE_RO) {
+    else if (name == IGNORE_RO)
+    {
         _ignore_ro = true;
         return PARSE_OK;
-    } else if (name == FILE_TO_DUMP_BUFFER) {
+    }
+    else if (name == FILE_TO_DUMP_BUFFER)
+    {
         _output_file = value;
         return PARSE_OK;
-    } else if (name == FILE_IO){
+    }
+    else if (name == FILE_IO)
+    {
         _file_io = value;
         return PARSE_OK;
     }
@@ -452,50 +505,61 @@ ParseStatus MlxRegUi::HandleOption(string name, string value)
 }
 
 /************************************
-* Function: paramValidate
-************************************/
+ * Function: paramValidate
+ ************************************/
 void MlxRegUi::paramValidate()
 {
-    if (_device == "") {
+    if (_device == "")
+    {
         throw MlxRegException("you must provide a device name");
     }
-    if (_op == CMD_UNKNOWN) {
+    if (_op == CMD_UNKNOWN)
+    {
         throw MlxRegException("no operation flag, please read help");
     }
-    if (_op == CMD_SHOW_REG) {
-        if (_regName == "") {
+    if (_op == CMD_SHOW_REG)
+    {
+        if (_regName == "")
+        {
             throw MlxRegException("you must provide reg_name in order to use show_register");
         }
-        if (_regID != 0) {
+        if (_regID != 0)
+        {
             throw MlxRegException("you can't use show_register with reg_id");
         }
     }
-    if (_op == CMD_GET || _op == CMD_SET) {
-        if (_regID == 0 && _regName == "") {
+    if (_op == CMD_GET || _op == CMD_SET)
+    {
+        if (_regID == 0 && _regName == "")
+        {
             throw MlxRegException("you must provide register name or register id when SET/GET");
         }
         // Unknown mode
-        if (_regID != 0) {
-            if (_dataLen == 0) {
+        if (_regID != 0)
+        {
+            if (_dataLen == 0)
+            {
                 throw MlxRegException("you must provide register length when SET/GET using register id");
             }
         }
     }
-    if (_op == CMD_SET && _dataStr == "") {
+    if (_op == CMD_SET && _dataStr == "")
+    {
         throw MlxRegException("you must provide registers data string to use SET");
     }
 }
 
-
-void MlxRegUi::readFromFile(string file_name, vector<u_int32_t> &buff, int len)
+void MlxRegUi::readFromFile(string file_name, vector<u_int32_t>& buff, int len)
 {
     ifstream file;
-    file.open( file_name.c_str(), ios::binary );
-    
-    for (int idx=0; idx<(len/4); idx++) {
+    file.open(file_name.c_str(), ios::binary);
+
+    for (int idx = 0; idx < (len / 4); idx++)
+    {
         u_int32_t data;
-        file.read((char*) &data, sizeof(u_int32_t));
-        if (!file) {
+        file.read((char*)&data, sizeof(u_int32_t));
+        if (!file)
+        {
             MlxRegException("Failed to read from file");
         }
         buff.push_back(__cpu_to_be32(data));
@@ -504,66 +568,75 @@ void MlxRegUi::readFromFile(string file_name, vector<u_int32_t> &buff, int len)
     file.close();
 }
 
-
 void MlxRegUi::writeToFile(string file_name, vector<u_int32_t> buff)
 {
     ofstream file;
     file.open(file_name.c_str(), ios::binary | ios::in | ios::out); // Overwrite the file (in/out)
-    for(unsigned int idx=0; idx<buff.size(); idx++) {
+    for (unsigned int idx = 0; idx < buff.size(); idx++)
+    {
         u_int32_t data = __cpu_to_be32(buff[idx]);
-        file.write((char*) &data, sizeof(u_int32_t));
+        file.write((char*)&data, sizeof(u_int32_t));
     }
     file.close();
 }
 
-
 void MlxRegUi::sendCmdBasedOnFileIo(maccess_reg_method_t cmd, int reg_size)
 {
-    
-    std::vector<u_int32_t>  buff; 
+    std::vector<u_int32_t> buff;
 
     //* read input from file
     readFromFile(_file_io, buff, reg_size);
-    
+
     //* Send GET command
     _mlxRegLib->sendRegister(_regName, cmd, buff);
 
     //* Write output to file (for GET)
-    if (cmd == MACCESS_REG_METHOD_GET) {
+    if (cmd == MACCESS_REG_METHOD_GET)
+    {
         writeToFile(_file_io, buff);
-    } 
+    }
 }
 
-void MlxRegUi::run(int argc, char **argv)
+void MlxRegUi::run(int argc, char** argv)
 {
     ParseStatus rc = _cmdParser.ParseOptions(argc, argv);
 
-    if (rc == PARSE_OK_WITH_EXIT) {
+    if (rc == PARSE_OK_WITH_EXIT)
+    {
         return;
-    } else if (rc == PARSE_ERROR) {
+    }
+    else if (rc == PARSE_ERROR)
+    {
         cout << _cmdParser.GetUsage();
         throw MlxRegException("failed to parse arguments. %s", _cmdParser.GetErrDesc());
     }
     paramValidate();
     // Init device
     _mf = mopen(_device.c_str());
-    if (!_mf) {
+    if (!_mf)
+    {
         throw MlxRegException("Failed to open device: \"" + _device + "\", " + strerror(errno));
     }
 
-    if (!MlxRegLib::isDeviceSupported(_mf)) {
+    if (!MlxRegLib::isDeviceSupported(_mf))
+    {
         throw MlxRegException("Device is not supported");
     }
 
-    if (_ignoreCapCheck == false) {
-        try {
+    if (_ignoreCapCheck == false)
+    {
+        try
+        {
             MlxRegLib::isAccessRegisterSupported(_mf);
-        } catch (MlxRegException& exp) {
+        }
+        catch (MlxRegException& exp)
+        {
 #if defined(EXTERNAL) || defined(MST_UL)
             throw exp;
 #else
-            throw MlxRegException("%s. \n   internal only: FW might be old, consider running " \
-                    "with --%s (This flag is deprecated)", exp.what(), IGNORE_CAP_CHECK_FLAG);
+            throw MlxRegException("%s. \n   internal only: FW might be old, consider running "
+                                  "with --%s (This flag is deprecated)",
+                                  exp.what(), IGNORE_CAP_CHECK_FLAG);
 #endif
         }
     }
@@ -571,93 +644,111 @@ void MlxRegUi::run(int argc, char **argv)
     _mlxRegLib = new MlxRegLib(_mf, _extAdbFile, _isExternal);
 
     std::vector<AdbInstance*> regFields;
-    std::vector<string>       regs;
-    AdbInstance *regNode = NULL;
-    std::vector<u_int32_t>    buff;
-
-    switch (_op) {
-    case CMD_SHOW_REG:
-        _mlxRegLib->showRegister(_regName, regFields);
-        printRegFields(regFields);
-        break;
-
-    case CMD_SHOW_REGS:
-        _mlxRegLib->showRegisters(regs);
-        printRegNames(regs);
-        break;
-
-    case CMD_SHOW_ALL_REGS:
-        // TODO: remove CMD_SHOW_ALL_REGS from UI after 4.14.0 release, it's deprecated
-        cout << endl << "-W- The option --" << OP_SHOW_ALL_REGS_FLAG
-             << " is deprecated and will be removed, please use --"
-             << OP_SHOW_REGS_FLAG << " instead." << endl << endl;
-        _mlxRegLib->showRegisters(regs);
-        printRegNames(regs);
-        break;
+    std::vector<string> regs;
+    AdbInstance* regNode = NULL;
+    std::vector<u_int32_t> buff;
 
-    case CMD_GET:
+    switch (_op)
+    {
+        case CMD_SHOW_REG:
+            _mlxRegLib->showRegister(_regName, regFields);
+            printRegFields(regFields);
+            break;
+
+        case CMD_SHOW_REGS:
+            _mlxRegLib->showRegisters(regs);
+            printRegNames(regs);
+            break;
+
+        case CMD_SHOW_ALL_REGS:
+            // TODO: remove CMD_SHOW_ALL_REGS from UI after 4.14.0 release, it's deprecated
+            cout << endl
+                 << "-W- The option --" << OP_SHOW_ALL_REGS_FLAG << " is deprecated and will be removed, please use --"
+                 << OP_SHOW_REGS_FLAG << " instead." << endl
+                 << endl;
+            _mlxRegLib->showRegisters(regs);
+            printRegNames(regs);
+            break;
+
+        case CMD_GET:
         {
-            if (_file_io != "") {
+            if (_file_io != "")
+            {
                 assert(_regName != "");
                 int reg_size = (_mlxRegLib->findAdbNode(_regName)->size) / 8; // in Bytes
                 sendCmdBasedOnFileIo(MACCESS_REG_METHOD_GET, reg_size);
                 break;
             }
 
-            if (_regName != "") {
+            if (_regName != "")
+            {
                 regNode = _mlxRegLib->findAdbNode(_regName);
             }
             RegAccessParser parser(_dataStr, _indexesStr, regNode, _dataLen);
             buff = parser.genBuff();
             printf("Sending access register...\n\n");
-            if (_regName != "") { // Known mode
+            if (_regName != "")
+            { // Known mode
                 _mlxRegLib->sendRegister(_regName, MACCESS_REG_METHOD_GET, buff);
                 printAdbContext(regNode, buff);
-            } else {          // Unknown mode
+            }
+            else
+            { // Unknown mode
                 _mlxRegLib->sendRegister(_regID, MACCESS_REG_METHOD_GET, buff);
                 printBuff(buff);
             }
         }
         break;
 
-    case CMD_SET:
+        case CMD_SET:
         {
-            if (_file_io != "") {
+            if (_file_io != "")
+            {
                 int reg_size = (_mlxRegLib->findAdbNode(_regName)->size) / 8; // in Bytes
                 sendCmdBasedOnFileIo(MACCESS_REG_METHOD_SET, reg_size);
                 break;
             }
 
-            if (_regName != "") {
+            if (_regName != "")
+            {
                 regNode = _mlxRegLib->findAdbNode(_regName);
             }
             // Read current register data into buffer
             RegAccessParser parserGet(_dataStr, _indexesStr, regNode, _dataLen, _ignore_ro);
             buff = parserGet.genBuff();
-            if (_regName != "") { // Known mode
+            if (_regName != "")
+            { // Known mode
                 _mlxRegLib->sendRegister(_regName, MACCESS_REG_METHOD_GET, buff);
-            } else {          // Unknown mode
+            }
+            else
+            { // Unknown mode
                 _mlxRegLib->sendRegister(_regID, MACCESS_REG_METHOD_GET, buff);
             }
             // Update the register buffer with user inputs
             RegAccessParser parser(_dataStr, _indexesStr, regNode, buff, _ignore_ro);
             buff = parser.genBuff();
-            if (_output_file != "") {
+            if (_output_file != "")
+            {
                 printAdbContext(regNode, buff);
                 _mlxRegLib->dumpRegisterData(_output_file, buff);
                 break;
             }
-            if (_regName != "") { // Known mode
+            if (_regName != "")
+            { // Known mode
                 printf("You are about to send access register: %s with the following data:\n", _regName.c_str());
                 printAdbContext(regNode, buff);
-                if (askUser("Do you want to continue")) {
+                if (askUser("Do you want to continue"))
+                {
                     printf(" Sending access register...\n");
                     _mlxRegLib->sendRegister(_regName, MACCESS_REG_METHOD_SET, buff);
                 }
-            } else {          // Unknown mode
+            }
+            else
+            { // Unknown mode
                 printf("You are about to send access register id: 0x%x with the following data:\n", _regID);
                 printBuff(buff);
-                if (askUser("Do you want to continue")) {
+                if (askUser("Do you want to continue"))
+                {
                     printf(" Sending access register...\n");
                     _mlxRegLib->sendRegister(_regID, MACCESS_REG_METHOD_SET, buff);
                 }
@@ -665,15 +756,15 @@ void MlxRegUi::run(int argc, char **argv)
         }
         break;
 
-    default:
-        break;
+        default:
+            break;
     }
 }
 
 /************************************
-* Function: main
-************************************/
-int main(int argc, char **argv)
+ * Function: main
+ ************************************/
+int main(int argc, char** argv)
 {
     try
     {
@@ -699,4 +790,3 @@ int main(int argc, char **argv)
     }
     return 0;
 }
-
diff --git a/mlxreg/mlxreg_ui.h b/mlxreg/mlxreg_ui.h
index b97a24d3..fda029dd 100644
--- a/mlxreg/mlxreg_ui.h
+++ b/mlxreg/mlxreg_ui.h
@@ -1,25 +1,25 @@
-/* 
+/*
  * Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
- * 
+ *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
  * General Public License (GPL) Version 2, available from the file
  * COPYING in the main directory of this source tree, or the
  * OpenIB.org BSD license below:
- * 
+ *
  *     Redistribution and use in source and binary forms, with or
  *     without modification, are permitted provided that the following
  *     conditions are met:
- * 
+ *
  *      - Redistributions of source code must retain the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer.
- * 
+ *
  *      - Redistributions in binary form must reproduce the above
  *        copyright notice, this list of conditions and the following
  *        disclaimer in the documentation and/or other materials
  *        provided with the distribution.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -45,9 +45,9 @@
 
 using namespace mlxreg;
 
-
-typedef enum {
-    //Debug register commands
+typedef enum
+{
+    // Debug register commands
     CMD_SET = 0,
     CMD_GET,
     CMD_SHOW_REG,
@@ -62,27 +62,27 @@ class MlxRegUi : public CommandLineRequester
     MlxRegUi();
     ~MlxRegUi();
     ParseStatus HandleOption(string name, string value);
-    void run(int agc, char **argv);
+    void run(int agc, char** argv);
 
 private:
     void initCmdParser();
     void printHelp();
     void paramValidate();
-    bool askUser(const char *question);
+    bool askUser(const char* question);
 
-    //Print
+    // Print
     void printRegFields(vector<AdbInstance*> nodeFields);
     void printRegNames(std::vector<string> regs);
-    void printAdbContext(AdbInstance *node, std::vector<u_int32_t> buff);
+    void printAdbContext(AdbInstance* node, std::vector<u_int32_t> buff);
     void printBuff(std::vector<u_int32_t> buff);
 
-    void readFromFile(string file_name, vector<u_int32_t> &buff, int len);
+    void readFromFile(string file_name, vector<u_int32_t>& buff, int len);
     void writeToFile(string file_name, vector<u_int32_t> buff);
     void sendCmdBasedOnFileIo(maccess_reg_method_t cmd, int reg_size);
 
     CommandLineParser _cmdParser;
     string _device;
-    mfile *_mf;
+    mfile* _mf;
     string _extAdbFile;
     string _regName;
     u_int32_t _regID;
@@ -92,7 +92,7 @@ class MlxRegUi : public CommandLineRequester
     bool _ignoreCapCheck;
     MlxRegOper _op;
     bool _force;
-    MlxRegLib *_mlxRegLib;
+    MlxRegLib* _mlxRegLib;
     bool _isExternal;
     bool _ignore_ro;
     string _output_file;
diff --git a/mlxsign_lib/mlxsign_com_def.h b/mlxsign_lib/mlxsign_com_def.h
index ea110e4f..7e997261 100644
--- a/mlxsign_lib/mlxsign_com_def.h
+++ b/mlxsign_lib/mlxsign_com_def.h
@@ -36,7 +36,6 @@
 
 namespace MlxSign
 {
-
 enum SHAType
 {
     SHA256,
diff --git a/mlxsign_lib/mlxsign_lib.cpp b/mlxsign_lib/mlxsign_lib.cpp
index 1fa3fcc1..8c9ac5d7 100644
--- a/mlxsign_lib/mlxsign_lib.cpp
+++ b/mlxsign_lib/mlxsign_lib.cpp
@@ -46,10 +46,14 @@
 using namespace std;
 using namespace MlxSign;
 
-#define CHECK_RC(rc, expRc, errCode) do { \
-        if ((rc) != (expRc)) { return (errCode);} \
-} while (0)
-
+#define CHECK_RC(rc, expRc, errCode) \
+    do                               \
+    {                                \
+        if ((rc) != (expRc))         \
+        {                            \
+            return (errCode);        \
+        }                            \
+    } while (0)
 
 MlxSignSHA::MlxSignSHA(u_int32_t digestLength)
 {
@@ -60,15 +64,17 @@ int MlxSignSHA::getDigest(std::string& digest)
 {
     int rc;
     std::vector<u_int8_t> digestVec;
-    char *digestStr = new char[_digestLength * 2 + 1];
+    char* digestStr = new char[_digestLength * 2 + 1];
 
     rc = getDigest(digestVec);
-    if (rc != MlxSign::MLX_SIGN_SUCCESS) {
+    if (rc != MlxSign::MLX_SIGN_SUCCESS)
+    {
         delete[] digestStr;
         return rc;
     }
     // transform to string
-    for (u_int64_t i = 0; i < digestVec.size(); i++) {
+    for (u_int64_t i = 0; i < digestVec.size(); i++)
+    {
         snprintf(digestStr + i * 2, 3, "%02x", digestVec[i]);
     }
     digest = digestStr;
@@ -89,7 +95,8 @@ MlxSignSHA& operator<<(MlxSignSHA& lhs, u_int8_t data)
 
 MlxSignSHA& operator<<(MlxSignSHA& lhs, const std::vector<u_int8_t>& buff)
 {
-    for (std::vector<u_int8_t>::const_iterator it = buff.begin(); it != buff.end(); it++) {
+    for (std::vector<u_int8_t>::const_iterator it = buff.begin(); it != buff.end(); it++)
+    {
         lhs._buff.push_back(*it);
     }
     return lhs;
@@ -100,9 +107,7 @@ MlxSignSHA& operator<<(MlxSignSHA& lhs, const std::vector<u_int8_t>& buff)
  *
  */
 
-MlxSignSHA256::MlxSignSHA256() : MlxSignSHA(SHA256_DIGEST_LENGTH)
-{
-}
+MlxSignSHA256::MlxSignSHA256() : MlxSignSHA(SHA256_DIGEST_LENGTH) {}
 
 int MlxSignSHA256::getDigest(std::vector<u_int8_t>& digest)
 {
@@ -110,9 +115,12 @@ int MlxSignSHA256::getDigest(std::vector<u_int8_t>& digest)
     SHA256_CTX ctx;
     digest.resize(_digestLength);
     memset(&digest[0], 0, digest.size());
-    rc = SHA256_Init( &ctx); CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_INIT_ERROR);
-    rc = SHA256_Update(&ctx, (void*)(&_buff[0]), _buff.size()); CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
-    rc = SHA256_Final(&digest[0], &ctx); CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
+    rc = SHA256_Init(&ctx);
+    CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_INIT_ERROR);
+    rc = SHA256_Update(&ctx, (void*)(&_buff[0]), _buff.size());
+    CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
+    rc = SHA256_Final(&digest[0], &ctx);
+    CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
     return MlxSign::MLX_SIGN_SUCCESS;
 }
 
@@ -120,9 +128,7 @@ int MlxSignSHA256::getDigest(std::vector<u_int8_t>& digest)
  * MlxSignSHA512
  *
  */
-MlxSignSHA512::MlxSignSHA512() : MlxSignSHA(SHA512_DIGEST_LENGTH)
-{
-}
+MlxSignSHA512::MlxSignSHA512() : MlxSignSHA(SHA512_DIGEST_LENGTH) {}
 
 int MlxSignSHA512::getDigest(std::vector<u_int8_t>& digest)
 {
@@ -130,23 +136,26 @@ int MlxSignSHA512::getDigest(std::vector<u_int8_t>& digest)
     SHA512_CTX ctx;
     digest.resize(_digestLength);
     memset(&digest[0], 0, digest.size());
-    rc = SHA512_Init( &ctx); CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_INIT_ERROR);
-    rc = SHA512_Update(&ctx, (void*)(&_buff[0]), _buff.size()); CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
-    rc = SHA512_Final(&digest[0], &ctx); CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
+    rc = SHA512_Init(&ctx);
+    CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_INIT_ERROR);
+    rc = SHA512_Update(&ctx, (void*)(&_buff[0]), _buff.size());
+    CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
+    rc = SHA512_Final(&digest[0], &ctx);
+    CHECK_RC(rc, 1, MlxSign::MLX_SIGN_SHA_CALCULATION_ERROR);
     return MlxSign::MLX_SIGN_SUCCESS;
 }
 
-MlxSignRSA::MlxSignRSA() : _privCtx(NULL), _pubCtx(NULL)
-{
-}
+MlxSignRSA::MlxSignRSA() : _privCtx(NULL), _pubCtx(NULL) {}
 
 MlxSignRSA::~MlxSignRSA()
 {
-    if (_privCtx) {
+    if (_privCtx)
+    {
         RSA_free((RSA*)_privCtx);
     }
 
-    if (_pubCtx) {
+    if (_pubCtx)
+    {
         RSA_free((RSA*)_pubCtx);
     }
 }
@@ -162,9 +171,12 @@ int MlxSignRSA::setPrivKey(const std::string& pemKey)
 
 int MlxSignRSA::getPrivKeyLength() const
 {
-    if (_privCtx) {
+    if (_privCtx)
+    {
         return RSA_size((RSA*)_privCtx);
-    } else {
+    }
+    else
+    {
         return 0x0;
     }
 }
@@ -184,13 +196,15 @@ int MlxSignRSA::sign(MlxSign::SHAType shaType, const std::vector<u_int8_t>& msg,
     unsigned int maxMsgSize, signLen;
     std::vector<u_int8_t> encryptedMsgTemp;
 
-    if (!_privCtx) {
+    if (!_privCtx)
+    {
         return MlxSign::MLX_SIGN_RSA_NO_PRIV_KEY_ERROR;
     }
 
     // size check
     maxMsgSize = RSA_size((RSA*)_privCtx);
-    if (msg.size() > maxMsgSize) {
+    if (msg.size() > maxMsgSize)
+    {
         return MlxSign::MLX_SIGN_RSA_MESSAGE_TOO_LONG_ERROR;
     }
     // do the job
@@ -198,15 +212,21 @@ int MlxSignRSA::sign(MlxSign::SHAType shaType, const std::vector<u_int8_t>& msg,
 
     int type;
 
-    if (shaType == MlxSign::SHA256) {
+    if (shaType == MlxSign::SHA256)
+    {
         type = NID_sha256;
-    } else if (shaType == MlxSign::SHA512) {
+    }
+    else if (shaType == MlxSign::SHA512)
+    {
         type = NID_sha512;
-    } else {
+    }
+    else
+    {
         return MlxSign::MLX_SIGN_UNSUPPORTED_SHA_TYPE;
     }
 
-    if (!RSA_sign(type, msg.data(), msg.size(), encryptedMsgTemp.data(), &signLen, (RSA*)_privCtx)) {
+    if (!RSA_sign(type, msg.data(), msg.size(), encryptedMsgTemp.data(), &signLen, (RSA*)_privCtx))
+    {
         return MlxSign::MLX_SIGN_RSA_CALCULATION_ERROR;
     }
     encryptedMsg.resize(signLen, 0);
@@ -215,20 +235,28 @@ int MlxSignRSA::sign(MlxSign::SHAType shaType, const std::vector<u_int8_t>& msg,
     return MlxSign::MLX_SIGN_SUCCESS;
 }
 
-int MlxSignRSA::verify(MlxSign::SHAType shaType, const std::vector<u_int8_t>& digest, const std::vector<u_int8_t>& sig, bool& result)
+int MlxSignRSA::verify(MlxSign::SHAType shaType,
+                       const std::vector<u_int8_t>& digest,
+                       const std::vector<u_int8_t>& sig,
+                       bool& result)
 {
-
-    if (!_pubCtx) {
+    if (!_pubCtx)
+    {
         return MlxSign::MLX_SIGN_RSA_NO_PUB_KEY_ERROR;
     }
 
     int type;
 
-    if (shaType == MlxSign::SHA256) {
+    if (shaType == MlxSign::SHA256)
+    {
         type = NID_sha256;
-    } else if (shaType == MlxSign::SHA512) {
+    }
+    else if (shaType == MlxSign::SHA512)
+    {
         type = NID_sha512;
-    } else {
+    }
+    else
+    {
         return MlxSign::MLX_SIGN_UNSUPPORTED_SHA_TYPE;
     }
 
@@ -239,15 +267,19 @@ int MlxSignRSA::verify(MlxSign::SHAType shaType, const std::vector<u_int8_t>& di
 
 std::string MlxSignRSA::str(const std::vector<u_int8_t>& msg)
 {
-    char *digestStr = NULL;
-    try {
+    char* digestStr = NULL;
+    try
+    {
         digestStr = new char[msg.size() * 2 + 1];
         memset(digestStr, 0, sizeof(char) * (msg.size() * 2 + 1));
-    }catch (...) {
+    }
+    catch (...)
+    {
         return "";
     }
 
-    for (u_int64_t i = 0; i < msg.size(); i++) {
+    for (u_int64_t i = 0; i < msg.size(); i++)
+    {
         snprintf(digestStr + i * 2, 3, "%02x", msg[i]);
     }
     std::string result = digestStr;
@@ -255,57 +287,70 @@ std::string MlxSignRSA::str(const std::vector<u_int8_t>& msg)
     return result;
 }
 
-#define REPLACE_RSA_CTX(ctx, newCtx) \
-    do {                                                            \
-        if ((newCtx)) {                                         \
-            if ((ctx)) {                                            \
-                RSA_free((RSA*)(ctx));                 \
-            }                                                           \
-            (ctx) = (void*)(newCtx);                        \
-        }                                                               \
+#define REPLACE_RSA_CTX(ctx, newCtx)   \
+    do                                 \
+    {                                  \
+        if ((newCtx))                  \
+        {                              \
+            if ((ctx))                 \
+            {                          \
+                RSA_free((RSA*)(ctx)); \
+            }                          \
+            (ctx) = (void*)(newCtx);   \
+        }                              \
     } while (0)
 
 int MlxSignRSA::createRSAFromPEMFileName(const std::string& fname, bool isPrivateKey)
 {
-    FILE *fp = fopen(fname.c_str(), "rb");
-    RSA *rsa = NULL;
-    if (!fp) {
+    FILE* fp = fopen(fname.c_str(), "rb");
+    RSA* rsa = NULL;
+    if (!fp)
+    {
         return MlxSign::MLX_SIGN_RSA_FILE_OPEN_ERROR;
     }
     rsa = RSA_new();
-    if (isPrivateKey) {
+    if (isPrivateKey)
+    {
         rsa = PEM_read_RSAPrivateKey(fp, &rsa, NULL, NULL);
         REPLACE_RSA_CTX(_privCtx, rsa);
-    } else {
+    }
+    else
+    {
         rsa = PEM_read_RSA_PUBKEY(fp, &rsa, NULL, NULL);
         REPLACE_RSA_CTX(_pubCtx, rsa);
     }
 
     fclose(fp);
-    if (rsa == NULL) {
+    if (rsa == NULL)
+    {
         return MlxSign::MLX_SIGN_RSA_INIT_CTX_ERROR;
     }
     return MlxSign::MLX_SIGN_SUCCESS;
 }
 
-int MlxSignRSA::createRSAFromPEMKeyString(const std::string& pemKey,  bool isPrivateKey)
+int MlxSignRSA::createRSAFromPEMKeyString(const std::string& pemKey, bool isPrivateKey)
 {
-    RSA *rsa = NULL;
-    BIO *keybio;
+    RSA* rsa = NULL;
+    BIO* keybio;
     // TODO: check if this may leak
     keybio = BIO_new_mem_buf((void*)pemKey.c_str(), -1);
-    if (keybio == NULL) {
+    if (keybio == NULL)
+    {
         return MlxSign::MLX_SIGN_RSA_KEY_BIO_ERROR;
     }
-    if (isPrivateKey) {
+    if (isPrivateKey)
+    {
         rsa = PEM_read_bio_RSAPrivateKey(keybio, &rsa, NULL, NULL);
         REPLACE_RSA_CTX(_privCtx, rsa);
-    } else {
+    }
+    else
+    {
         rsa = PEM_read_bio_RSA_PUBKEY(keybio, &rsa, NULL, NULL);
         REPLACE_RSA_CTX(_pubCtx, rsa);
     }
     BIO_free_all(keybio);
-    if (rsa == NULL) {
+    if (rsa == NULL)
+    {
         return MlxSign::MLX_SIGN_RSA_INIT_CTX_ERROR;
     }
     return MlxSign::MLX_SIGN_SUCCESS;
@@ -323,8 +368,8 @@ MlxSignHMAC::MlxSignHMAC()
 
 int MlxSignHMAC::setKey(const std::vector<u_int8_t>& key)
 {
-
-    if (HMAC_Init_ex((HMAC_CTX*)ctx, (char*)key.data(), key.size(), EVP_sha512(), NULL) == 0) {
+    if (HMAC_Init_ex((HMAC_CTX*)ctx, (char*)key.data(), key.size(), EVP_sha512(), NULL) == 0)
+    {
         return MlxSign::MLX_SIGN_HMAC_ERROR;
     }
 
@@ -333,7 +378,8 @@ int MlxSignHMAC::setKey(const std::vector<u_int8_t>& key)
 
 MlxSignHMAC& operator<<(MlxSignHMAC& lhs, const std::vector<u_int8_t>& buff)
 {
-    for (std::vector<u_int8_t>::const_iterator it = buff.begin(); it != buff.end(); it++) {
+    for (std::vector<u_int8_t>::const_iterator it = buff.begin(); it != buff.end(); it++)
+    {
         lhs.data.push_back(*it);
     }
 
@@ -342,16 +388,17 @@ MlxSignHMAC& operator<<(MlxSignHMAC& lhs, const std::vector<u_int8_t>& buff)
 
 int MlxSignHMAC::getDigest(std::vector<u_int8_t>& digest)
 {
-    unsigned int len = 64; //512 bits
+    unsigned int len = 64; // 512 bits
 
-    if (HMAC_Update((HMAC_CTX*)ctx, (unsigned char*)data.data(), data.size()) == 0) {
+    if (HMAC_Update((HMAC_CTX*)ctx, (unsigned char*)data.data(), data.size()) == 0)
+    {
         return MlxSign::MLX_SIGN_HMAC_ERROR;
     }
 
     digest.resize(len);
 
-    //TODO why len is passed by reference?
-    //TODO HMAC_Final must return 1 on success and 0 on failure but that is not happening!
+    // TODO why len is passed by reference?
+    // TODO HMAC_Final must return 1 on success and 0 on failure but that is not happening!
     HMAC_Final((HMAC_CTX*)ctx, digest.data(), &len);
     return MlxSign::MLX_SIGN_SUCCESS;
 }
@@ -366,4 +413,4 @@ MlxSignHMAC::~MlxSignHMAC()
 #endif
 }
 
-#endif //ENABLE_OPENSSL
+#endif // ENABLE_OPENSSL
diff --git a/mlxsign_lib/mlxsign_lib.h b/mlxsign_lib/mlxsign_lib.h
index c18f966d..0f33b028 100644
--- a/mlxsign_lib/mlxsign_lib.h
+++ b/mlxsign_lib/mlxsign_lib.h
@@ -40,10 +40,8 @@
 #include <compatibility.h>
 #include "mlxsign_com_def.h"
 
-
 using namespace std;
 
-
 /*
  * Class MlxSignSHA: used for calculating SHA digest on a data buffer.
  * Usage:
@@ -58,10 +56,11 @@ using namespace std;
  *      sha256.getDigest(result);
  *      cout << result;
  */
-class MlxSignSHA {
+class MlxSignSHA
+{
 public:
     MlxSignSHA(u_int32_t);
-    virtual ~MlxSignSHA() {};
+    virtual ~MlxSignSHA(){};
     friend MlxSignSHA& operator<<(MlxSignSHA& lhs, u_int8_t data);
     friend MlxSignSHA& operator<<(MlxSignSHA& lhs, const std::vector<u_int8_t>& buff);
 
@@ -74,13 +73,15 @@ class MlxSignSHA {
     std::vector<u_int8_t> _buff;
 };
 
-class MlxSignSHA256 : public MlxSignSHA {
+class MlxSignSHA256 : public MlxSignSHA
+{
 public:
     MlxSignSHA256();
     int getDigest(std::vector<u_int8_t>& digest);
 };
 
-class MlxSignSHA512 : public MlxSignSHA {
+class MlxSignSHA512 : public MlxSignSHA
+{
 public:
     MlxSignSHA512();
     int getDigest(std::vector<u_int8_t>& digest);
@@ -104,7 +105,8 @@ class MlxSignSHA512 : public MlxSignSHA {
  *      rsa.setPubKeyFromFile(filePathPub);
  *      rsa.decrypt(encryptedMsg, originalMsg);
  */
-class MlxSignRSA {
+class MlxSignRSA
+{
 public:
     ~MlxSignRSA();
     MlxSignRSA();
@@ -116,30 +118,33 @@ class MlxSignRSA {
     int setPubKey(const std::string& pemKey);
 
     int sign(MlxSign::SHAType shaType, const std::vector<u_int8_t>& msg, std::vector<u_int8_t>& encryptedMsg);
-    int verify(MlxSign::SHAType shaType, const std::vector<u_int8_t>& sha256Dgst, const std::vector<u_int8_t>& sig, bool& result);
+    int verify(MlxSign::SHAType shaType,
+               const std::vector<u_int8_t>& sha256Dgst,
+               const std::vector<u_int8_t>& sig,
+               bool& result);
 
     std::string str(const std::vector<u_int8_t>& msg);
+
 private:
     int createRSAFromPEMFileName(const std::string& fname, bool isPrivateKey);
-    int createRSAFromPEMKeyString(const std::string& pemKey,  bool isPrivateKey);
-    void *_privCtx;
-    void *_pubCtx;
+    int createRSAFromPEMKeyString(const std::string& pemKey, bool isPrivateKey);
+    void* _privCtx;
+    void* _pubCtx;
 };
 
-
-class MlxSignHMAC {
+class MlxSignHMAC
+{
 public:
     MlxSignHMAC();
     int setKey(const std::vector<u_int8_t>& key);
-    //int update(const std::vector<u_int8_t>& buff);
+    // int update(const std::vector<u_int8_t>& buff);
     friend MlxSignHMAC& operator<<(MlxSignHMAC& lhs, const std::vector<u_int8_t>& buff);
     int getDigest(std::vector<u_int8_t>& digest);
     ~MlxSignHMAC();
 
 private:
-    void *ctx;
+    void* ctx;
     std::vector<u_int8_t> data;
-
 };
 
 #endif /* USER_MLXSIGN_LIB_MLXSIGN_LIB_H_ */
diff --git a/mlxsign_lib/mlxsign_openssl_engine.cpp b/mlxsign_lib/mlxsign_openssl_engine.cpp
index d40826b4..fc345034 100644
--- a/mlxsign_lib/mlxsign_openssl_engine.cpp
+++ b/mlxsign_lib/mlxsign_openssl_engine.cpp
@@ -57,13 +57,29 @@ string to_lowercase_copy(string str)
     return str;
 }
 
-OpensslEngineException::OpensslEngineException(const string &exceptionMsg, ErrorCode errorCode) : msg(exceptionMsg), errorCode(errorCode) {}
-OpensslEngineException::OpensslEngineException(const char *exceptionMsg, ErrorCode errorCode) : msg(exceptionMsg), errorCode(errorCode) {}
-const string OpensslEngineException::getErrorString() const throw() { return msg; }
-const char *OpensslEngineException::what() const throw() { return msg.c_str(); }
-ErrorCode OpensslEngineException::getErrorCode() { return errorCode; }
+OpensslEngineException::OpensslEngineException(const string& exceptionMsg, ErrorCode errorCode) :
+    msg(exceptionMsg), errorCode(errorCode)
+{
+}
+OpensslEngineException::OpensslEngineException(const char* exceptionMsg, ErrorCode errorCode) :
+    msg(exceptionMsg), errorCode(errorCode)
+{
+}
+const string OpensslEngineException::getErrorString() const throw()
+{
+    return msg;
+}
+const char* OpensslEngineException::what() const throw()
+{
+    return msg.c_str();
+}
+ErrorCode OpensslEngineException::getErrorCode()
+{
+    return errorCode;
+}
 
-OpensslEngineSigner::OpensslEngineSigner(const string &engineName, const string &keyIdentifier) : mdCtx(NULL), key(NULL), engineName(engineName), keyIdentifier(keyIdentifier)
+OpensslEngineSigner::OpensslEngineSigner(const string& engineName, const string& keyIdentifier) :
+    mdCtx(NULL), key(NULL), engineName(engineName), keyIdentifier(keyIdentifier)
 {
     SSL_library_init();
     SSL_load_error_strings();
@@ -103,9 +119,9 @@ OpensslEngineSigner::~OpensslEngineSigner()
 
 string OpensslEngineSigner::getOpenSSLError()
 {
-    BIO *bio = BIO_new(BIO_s_mem());
+    BIO* bio = BIO_new(BIO_s_mem());
     ERR_print_errors(bio);
-    char *buf = NULL;
+    char* buf = NULL;
     size_t len = BIO_get_mem_data(bio, &buf);
     string errorString(buf, len);
     BIO_free(bio);
@@ -118,15 +134,18 @@ void OpensslEngineSigner::initOpenSSLEngine()
     engine = ENGINE_by_id(engineName.c_str());
     if (engine == NULL)
     {
-        throw OpensslEngineException("Invalid engine: " + engineName, MlxSign::MLX_SIGN_RSA_KEY_INIT_ENGINE_OPENSSL_ERROR);
+        throw OpensslEngineException("Invalid engine: " + engineName,
+                                     MlxSign::MLX_SIGN_RSA_KEY_INIT_ENGINE_OPENSSL_ERROR);
     }
     if (!ENGINE_init(engine))
     {
-        throw OpensslEngineException("Failed to init engine: " + engineName, MlxSign::MLX_SIGN_RSA_KEY_INIT_ENGINE_OPENSSL_ERROR);
+        throw OpensslEngineException("Failed to init engine: " + engineName,
+                                     MlxSign::MLX_SIGN_RSA_KEY_INIT_ENGINE_OPENSSL_ERROR);
     }
     if (!ENGINE_set_default(engine, ENGINE_METHOD_ALL))
     {
-        throw OpensslEngineException("Failed to use engine: " + engineName, MlxSign::MLX_SIGN_RSA_KEY_INIT_ENGINE_OPENSSL_ERROR);
+        throw OpensslEngineException("Failed to use engine: " + engineName,
+                                     MlxSign::MLX_SIGN_RSA_KEY_INIT_ENGINE_OPENSSL_ERROR);
     }
 }
 
@@ -135,7 +154,8 @@ void OpensslEngineSigner::loadPrivateKey()
     key = ENGINE_load_private_key(engine, keyIdentifier.c_str(), NULL, NULL);
     if (!key)
     {
-        throw OpensslEngineException("Failed to load key from engine with key identifier:" + keyIdentifier, MlxSign::MLX_SIGN_RSA_KEY_ILLEGAL_OPENSSL_URI);
+        throw OpensslEngineException("Failed to load key from engine with key identifier:" + keyIdentifier,
+                                     MlxSign::MLX_SIGN_RSA_KEY_ILLEGAL_OPENSSL_URI);
     }
     privateKeySize = EVP_PKEY_size(key);
 }
@@ -150,38 +170,42 @@ void OpensslEngineSigner::createContext()
     mdCtx = EVP_MD_CTX_create();
     if (!mdCtx)
     {
-        throw OpensslEngineException("Failed to create conxtext:" + getOpenSSLError(), MLX_SIGN_RSA_KEY_DIGEST_INIT_OPENSSL_ERROR);
+        throw OpensslEngineException("Failed to create conxtext:" + getOpenSSLError(),
+                                     MLX_SIGN_RSA_KEY_DIGEST_INIT_OPENSSL_ERROR);
     }
 }
 
-void OpensslEngineSigner::digest(const vector<u_int8_t> &msg, vector<u_int8_t> &signed_msg)
+void OpensslEngineSigner::digest(const vector<u_int8_t>& msg, vector<u_int8_t>& signed_msg)
 {
-
-    int rc = EVP_DigestSignInit(mdCtx, NULL, EVP_sha512(), NULL, (EVP_PKEY *)key);
+    int rc = EVP_DigestSignInit(mdCtx, NULL, EVP_sha512(), NULL, (EVP_PKEY*)key);
     if (rc != 1)
     {
-        throw OpensslEngineException("Failed to init digest:" + getOpenSSLError(), MLX_SIGN_RSA_KEY_DIGEST_INIT_OPENSSL_ERROR);
+        throw OpensslEngineException("Failed to init digest:" + getOpenSSLError(),
+                                     MLX_SIGN_RSA_KEY_DIGEST_INIT_OPENSSL_ERROR);
     }
     /* Call update with the message */
     rc = EVP_DigestSignUpdate(mdCtx, msg.data(), msg.size());
     if (rc != 1)
     {
-        throw OpensslEngineException("EVP_DigestSignUpdate failed: " + getOpenSSLError(), MlxSign::MLX_SIGN_RSA_KEY_DIGEST_UPDATE_OPENSSL_ERROR);
+        throw OpensslEngineException("EVP_DigestSignUpdate failed: " + getOpenSSLError(),
+                                     MlxSign::MLX_SIGN_RSA_KEY_DIGEST_UPDATE_OPENSSL_ERROR);
     }
     size_t slen = 0;
     /* Finalise the DigestSign operation */
     /* First call EVP_DigestSignFinal with a NULL sig parameter to obtain the length of the
-        * signature. Length is returned in slen */
+     * signature. Length is returned in slen */
     rc = EVP_DigestSignFinal(mdCtx, NULL, &slen);
     if (rc != 1)
     {
-        throw OpensslEngineException("Digest failed: " + getOpenSSLError(), MlxSign::MLX_SIGN_RSA_KEY_DIGEST_FINAL_OPENSSL_ERROR);
+        throw OpensslEngineException("Digest failed: " + getOpenSSLError(),
+                                     MlxSign::MLX_SIGN_RSA_KEY_DIGEST_FINAL_OPENSSL_ERROR);
     }
     /* Allocate memory for the signature based on size in slen */
-    unsigned char *sig;
-    if (!(sig = (unsigned char *)OPENSSL_malloc(sizeof(unsigned char) * (slen))))
+    unsigned char* sig;
+    if (!(sig = (unsigned char*)OPENSSL_malloc(sizeof(unsigned char) * (slen))))
     {
-        throw OpensslEngineException("Digest failed: " + getOpenSSLError(), MlxSign::MLX_SIGN_RSA_KEY_MEMORY_ALLOC_OPENSSL_ERROR);
+        throw OpensslEngineException("Digest failed: " + getOpenSSLError(),
+                                     MlxSign::MLX_SIGN_RSA_KEY_MEMORY_ALLOC_OPENSSL_ERROR);
     }
     signed_msg.resize(slen);
     /* Obtain the signature */
@@ -189,7 +213,8 @@ void OpensslEngineSigner::digest(const vector<u_int8_t> &msg, vector<u_int8_t> &
     if (rc != 1)
     {
         OPENSSL_free(sig);
-        throw OpensslEngineException("Digest failed: " + getOpenSSLError(), MlxSign::MLX_SIGN_RSA_KEY_DIGEST_FINAL_OPENSSL_ERROR);
+        throw OpensslEngineException("Digest failed: " + getOpenSSLError(),
+                                     MlxSign::MLX_SIGN_RSA_KEY_DIGEST_FINAL_OPENSSL_ERROR);
     }
     for (unsigned int i = 0; i < slen; i++)
     {
@@ -207,7 +232,7 @@ ErrorCode OpensslEngineSigner::init()
         loadPrivateKey();
         createContext();
     }
-    catch (OpensslEngineException &ex)
+    catch (OpensslEngineException& ex)
     {
         cout << ex.getErrorString() << endl;
         errorCode = ex.getErrorCode();
@@ -215,14 +240,14 @@ ErrorCode OpensslEngineSigner::init()
     return errorCode;
 }
 
-ErrorCode OpensslEngineSigner::sign(const vector<u_int8_t> &msg, vector<u_int8_t> &signed_msg)
+ErrorCode OpensslEngineSigner::sign(const vector<u_int8_t>& msg, vector<u_int8_t>& signed_msg)
 {
     MlxSign::ErrorCode errorCode = MlxSign::MLX_SIGN_SUCCESS;
     try
     {
         digest(msg, signed_msg);
     }
-    catch (OpensslEngineException &ex)
+    catch (OpensslEngineException& ex)
     {
         cout << ex.getErrorString() << endl;
         errorCode = ex.getErrorCode();
@@ -230,4 +255,4 @@ ErrorCode OpensslEngineSigner::sign(const vector<u_int8_t> &msg, vector<u_int8_t
     return errorCode;
 }
 
-#endif //ENABLE_OPENSSL
+#endif // ENABLE_OPENSSL
diff --git a/mlxsign_lib/mlxsign_openssl_engine.h b/mlxsign_lib/mlxsign_openssl_engine.h
index cce3455d..88680098 100644
--- a/mlxsign_lib/mlxsign_openssl_engine.h
+++ b/mlxsign_lib/mlxsign_openssl_engine.h
@@ -49,14 +49,13 @@ using namespace std;
 
 namespace MlxSign
 {
-
 class OpensslEngineException : public exception
 {
 public:
-    OpensslEngineException(const string &exceptionMsg, ErrorCode errorCode);
-    OpensslEngineException(const char *exceptionMsg, ErrorCode errorCode);
+    OpensslEngineException(const string& exceptionMsg, ErrorCode errorCode);
+    OpensslEngineException(const char* exceptionMsg, ErrorCode errorCode);
     virtual const string getErrorString() const throw();
-    virtual const char *what() const throw();
+    virtual const char* what() const throw();
     virtual ~OpensslEngineException() throw(){};
     ErrorCode getErrorCode();
 
@@ -69,24 +68,24 @@ class OpensslEngineException : public exception
 class OpensslEngineSigner
 {
 public:
-    OpensslEngineSigner(const string &engineName, const string &keyIdentifier);
+    OpensslEngineSigner(const string& engineName, const string& keyIdentifier);
     virtual ~OpensslEngineSigner();
     ErrorCode init();
-    ErrorCode sign(const vector<u_int8_t> &msg, vector<u_int8_t> &signed_msg);
+    ErrorCode sign(const vector<u_int8_t>& msg, vector<u_int8_t>& signed_msg);
     int getPrivateKeySize();
 
 private:
-    EVP_MD_CTX *mdCtx;
-    EVP_PKEY *key;
+    EVP_MD_CTX* mdCtx;
+    EVP_PKEY* key;
     int privateKeySize;
-    ENGINE *engine;
+    ENGINE* engine;
     string engineName;
     string keyIdentifier;
     string getOpenSSLError();
     void initOpenSSLEngine();
     void loadPrivateKey();
     void createContext();
-    void digest(const vector<u_int8_t> &msg, vector<u_int8_t> &signed_msg);
+    void digest(const vector<u_int8_t>& msg, vector<u_int8_t>& signed_msg);
 };
 
 } // namespace MlxSign
diff --git a/mlxsign_lib/mlxsign_signer_interface.cpp b/mlxsign_lib/mlxsign_signer_interface.cpp
index 3362d7dc..a0a3daf1 100644
--- a/mlxsign_lib/mlxsign_signer_interface.cpp
+++ b/mlxsign_lib/mlxsign_signer_interface.cpp
@@ -36,24 +36,32 @@
 
 using namespace MlxSign;
 
-MlxSignRSAViaOpenssl::MlxSignRSAViaOpenssl(string privPemFileStr): _privPemFileStr(privPemFileStr), _shaType(MlxSign::SHA512)
-{}
+MlxSignRSAViaOpenssl::MlxSignRSAViaOpenssl(string privPemFileStr) :
+    _privPemFileStr(privPemFileStr), _shaType(MlxSign::SHA512)
+{
+}
 
 ErrorCode MlxSignRSAViaOpenssl::Init()
 {
     int keyLength = 0;
     int rc = _rsa.setPrivKeyFromFile(_privPemFileStr);
-    if (rc) {
+    if (rc)
+    {
         printf("-E- Failed to set private key from file (rc = 0x%x)\n", rc);
         return MLX_SIGN_ERROR;
     }
 
     keyLength = _rsa.getPrivKeyLength();
-    if (keyLength == 0x100) {
+    if (keyLength == 0x100)
+    {
         _shaType = MlxSign::SHA256;
-    } else if (keyLength == 0x200) {
+    }
+    else if (keyLength == 0x200)
+    {
         _shaType = MlxSign::SHA512;
-    } else {
+    }
+    else
+    {
         printf("Unexpected length of key(%d bytes)", keyLength);
         return MLX_SIGN_ERROR;
     }
@@ -66,39 +74,45 @@ ErrorCode MlxSignRSAViaOpenssl::Sign(const vector<u_int8_t>& data, vector<u_int8
     vector<u_int8_t> sha;
     int rc;
 
-    if (_shaType == MlxSign::SHA256) {
+    if (_shaType == MlxSign::SHA256)
+    {
         MlxSignSHA256 mlxSignSHA;
         mlxSignSHA << data;
         mlxSignSHA.getDigest(sha);
-    } else {
+    }
+    else
+    {
         MlxSignSHA512 mlxSignSHA;
         mlxSignSHA << data;
         mlxSignSHA.getDigest(sha);
     }
 
     rc = _rsa.sign(_shaType, sha, signature);
-    if (rc) {
+    if (rc)
+    {
         printf("-E- Failed to encrypt the SHA (rc = 0x%x)\n", rc);
         return MLX_SIGN_ERROR;
     }
 
-    return MLX_SIGN_SUCCESS;    
+    return MLX_SIGN_SUCCESS;
 }
 
-MlxSignRSAViaHSM::MlxSignRSAViaHSM(string opensslEngine, string opensslKeyID): 
-_engineSigner(opensslEngine, opensslKeyID),
-_opensslEngine(opensslEngine)
-{}
+MlxSignRSAViaHSM::MlxSignRSAViaHSM(string opensslEngine, string opensslKeyID) :
+    _engineSigner(opensslEngine, opensslKeyID), _opensslEngine(opensslEngine)
+{
+}
 
 ErrorCode MlxSignRSAViaHSM::Init()
 {
     int rc = _engineSigner.init();
-    if (rc) {
+    if (rc)
+    {
         printf("-E- Failed to initialize %s engine (rc = 0x%x)\n", _opensslEngine.c_str(), rc);
         return MLX_SIGN_ERROR;
     }
     int keySize = _engineSigner.getPrivateKeySize();
-    if( keySize != KEY_SIZE_512 ) {
+    if (keySize != KEY_SIZE_512)
+    {
         printf("-E- The HSM key has to be 4096 bit!\n");
         return MLX_SIGN_ERROR;
     }
@@ -108,11 +122,12 @@ ErrorCode MlxSignRSAViaHSM::Init()
 ErrorCode MlxSignRSAViaHSM::Sign(const vector<u_int8_t>& data, vector<u_int8_t>& signature)
 {
     int rc = _engineSigner.sign(data, signature);
-    if (rc) {
+    if (rc)
+    {
         printf("-E- Failed to create secured FW signature (rc = 0x%x)", rc);
         return MLX_SIGN_ERROR;
     }
     return MLX_SIGN_SUCCESS;
 }
 
-#endif //ENABLE_OPENSSL
\ No newline at end of file
+#endif // ENABLE_OPENSSL
\ No newline at end of file
diff --git a/mlxsign_lib/mlxsign_signer_interface.h b/mlxsign_lib/mlxsign_signer_interface.h
index 0f066134..88c0f71d 100644
--- a/mlxsign_lib/mlxsign_signer_interface.h
+++ b/mlxsign_lib/mlxsign_signer_interface.h
@@ -33,7 +33,6 @@
 #ifndef USER_MLXSIGN_LIB_MLXSIGN_SIGNER_INTERFACE_H_
 #define USER_MLXSIGN_LIB_MLXSIGN_SIGNER_INTERFACE_H_
 
-
 #include "mlxsign_lib.h"
 #include "mlxsign_openssl_engine.h"
 
@@ -43,14 +42,16 @@ using namespace std;
  * Class Signer: interface for various types of signers
  */
 
-class Signer {
+class Signer
+{
 public:
-    virtual ~Signer() {};
+    virtual ~Signer(){};
     virtual MlxSign::ErrorCode Init() = 0;
     virtual MlxSign::ErrorCode Sign(const vector<u_int8_t>& msg, vector<u_int8_t>& signature) = 0;
 };
 
-class MlxSignRSAViaOpenssl : public Signer {
+class MlxSignRSAViaOpenssl : public Signer
+{
 public:
     MlxSignRSAViaOpenssl(string privPemFileStr);
 
@@ -63,7 +64,8 @@ class MlxSignRSAViaOpenssl : public Signer {
     MlxSignRSA _rsa;
 };
 
-class MlxSignRSAViaHSM : public Signer {
+class MlxSignRSAViaHSM : public Signer
+{
 public:
     MlxSignRSAViaHSM(string opensslEngine, string opensslKeyID);
 
diff --git a/mstdump/crd_lib/crdump.c b/mstdump/crd_lib/crdump.c
index 9f85fe4f..0b9ac81e 100644
--- a/mstdump/crd_lib/crdump.c
+++ b/mstdump/crd_lib/crdump.c
@@ -42,48 +42,48 @@
 #include <compatibility.h>
 #include <stdio.h>
 
-#define CRD_SELECT_CSV_PATH(dev_name) \
-    do {                              \
+#define CRD_SELECT_CSV_PATH(dev_name)    \
+    do                                   \
+    {                                    \
         strcat(csv_file_path, dev_name); \
-        strcat(csv_file_path, ".csv"); \
+        strcat(csv_file_path, ".csv");   \
     } while (0)
 
-
-#define CRD_CHECK_NULL(var) \
-    if (var == NULL)       \
-        do {               \
+#define CRD_CHECK_NULL(var)                        \
+    if (var == NULL)                               \
+        do                                         \
+        {                                          \
             CRD_DEBUG("Sent %s is null!\n", #var); \
-            return CRD_INVALID_PARM;              \
-        } while (0)
-
+            return CRD_INVALID_PARM;               \
+    } while (0)
 
 #if defined(__WIN__)
-#    define strcasecmp    _stricmp
-#    define CRD_MTCR_DLL_NAME "libmtcr-1.dll"
+#define strcasecmp _stricmp
+#define CRD_MTCR_DLL_NAME "libmtcr-1.dll"
 #endif
 
-
 //#define CRD_DEBUG_BUILD
 #ifdef CRD_DEBUG_BUILD
-#    define CRD_DEBUG(fmt, ...)printf("%s:%s:%d: "fmt, __FILE__, __FUNCTION__, __LINE__,##__VA_ARGS__);
+#define CRD_DEBUG(fmt, ...) printf("%s:%s:%d: " fmt, __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__);
 #else
-#    define CRD_DEBUG(fmt, ...)
+#define CRD_DEBUG(fmt, ...)
 #endif
 
-#define CRD_EMPTY  "EMPTY"
+#define CRD_EMPTY "EMPTY"
 #define CRD_UNKOWN "UNKNOWN"
 
 #define CRD_MAXLINESIZE 1024
-#define CRD_MAXFLDS 3 /* maximum possible number of fields */
+#define CRD_MAXFLDS 3     /* maximum possible number of fields */
 #define CRD_MAXFLDSIZE 32 /* longest possible field + 1 = 31 byte field */
 #define CRD_CSV_PATH_SIZE 1024
 #define CRD_MAX_REG_ACCESS_BLOCK 256
 
 // Scratchpad 2
-#define CRD_SP2_TLV_FIRST_ADDRESS 0x18 /* This first tlv address is valid only for HCA */
+#define CRD_SP2_TLV_FIRST_ADDRESS 0x18         /* This first tlv address is valid only for HCA */
 #define CRD_SP2_TLV_SIGNATURE_VALUE 0x54306F6C /* signature value is T0ol */
 
-typedef struct crd_sp2_tlv {
+typedef struct crd_sp2_tlv
+{
     u_int32_t signature;
     u_int32_t size;
     u_int32_t writable;
@@ -92,17 +92,17 @@ typedef struct crd_sp2_tlv {
     u_int32_t address;
 } crd_sp2_tlv_t;
 
-typedef struct crd_parsed_csv {
-
+typedef struct crd_parsed_csv
+{
     u_int32_t addr;
     u_int32_t len;
     char enable_addr[100];
 
 } crd_parsed_csv_t;
 
-
-struct crd_ctxt {
-    mfile     *mf;
+struct crd_ctxt
+{
+    mfile* mf;
     u_int32_t dev_type;
     u_int32_t number_of_dwords;
     int is_full;
@@ -110,7 +110,7 @@ struct crd_ctxt {
     int cause_off;
     char csv_path[CRD_CSV_PATH_SIZE];
     u_int32_t block_count;
-    crd_parsed_csv_t *blocks;
+    crd_parsed_csv_t* blocks;
 };
 
 static char crd_error[CRD_CSV_PATH_SIZE + 50];
@@ -118,63 +118,70 @@ static char crd_error[CRD_CSV_PATH_SIZE + 50];
 /*
    Store the csv file path at csv_file_path.
  */
-static int crd_get_csv_path(IN dm_dev_id_t dev_type, OUT char *csv_file_path, IN const char *db_path);
+static int crd_get_csv_path(IN dm_dev_id_t dev_type, OUT char* csv_file_path, IN const char* db_path);
 
 /*
    count number of dwords, and store all needed data from csv file at parsed_csv
  */
-static int crd_count_double_word(IN mfile *mf, IN char *csv_file_path, OUT u_int32_t *number_of_dwords,
-                                 OUT crd_parsed_csv_t blocks[], IN int is_full,
-                                 IN u_int8_t read_single_dword, IN u_int8_t with_sp2);
+static int crd_count_double_word(IN mfile* mf,
+                                 IN char* csv_file_path,
+                                 OUT u_int32_t* number_of_dwords,
+                                 OUT crd_parsed_csv_t blocks[],
+                                 IN int is_full,
+                                 IN u_int8_t read_single_dword,
+                                 IN u_int8_t with_sp2);
 
 /*
    Fill addresses at dword_arr
  */
-static int crd_fill_address(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr);
+static int crd_fill_address(IN crd_ctxt_t* context, OUT crd_dword_t* dword_arr);
 
 /*
    Read a line from csv file
  */
-static int crd_read_line(IN FILE *fd, OUT char *tmp);
+static int crd_read_line(IN FILE* fd, OUT char* tmp);
 
 /*
    Tokenize line for address, len, and enable_adder
  */
 
-static void crd_parse(IN char *record, IN char *delim, OUT char arr[][CRD_MAXFLDSIZE], OUT int *field_count);
+static void crd_parse(IN char* record, IN char* delim, OUT char arr[][CRD_MAXFLDSIZE], OUT int* field_count);
 
-static int crd_update_csv_path(IN OUT char *csv_file_path, IN const char *db_path);
+static int crd_update_csv_path(IN OUT char* csv_file_path, IN const char* db_path);
 
-static int crd_count_blocks(IN char *csv_file_path, OUT u_int32_t *block_count, u_int8_t read_single_dword);
+static int crd_count_blocks(IN char* csv_file_path, OUT u_int32_t* block_count, u_int8_t read_single_dword);
 
-static int crd_count_tlv_blocks_and_dwords(IN mfile *mf, OUT u_int32_t *block_count, OUT u_int32_t *number_of_dwords);
+static int crd_count_tlv_blocks_and_dwords(IN mfile* mf, OUT u_int32_t* block_count, OUT u_int32_t* number_of_dwords);
 
-static int crd_get_tlv_from_address(IN mfile *mf, IN u_int32_t address, OUT crd_sp2_tlv_t *crd_sp2_tlv);
+static int crd_get_tlv_from_address(IN mfile* mf, IN u_int32_t address, OUT crd_sp2_tlv_t* crd_sp2_tlv);
 
 static int crd_is_tlv_signature_valid(IN u_int32_t signature);
 
 static int crd_is_tlv_address_valid(IN u_int32_t address);
 
-static int crd_set_tlv_blocks(IN mfile *mf, OUT crd_parsed_csv_t blocks[], IN u_int32_t sp2_start_block);
+static int crd_set_tlv_blocks(IN mfile* mf, OUT crd_parsed_csv_t blocks[], IN u_int32_t sp2_start_block);
 
 #if !defined(__WIN__) && !defined(MST_UL)
-static char* crd_trim(char *s);
+static char* crd_trim(char* s);
 
-static char* crd_rtrim(char *s);
+static char* crd_rtrim(char* s);
 
-static char* crd_ltrim(char *s);
+static char* crd_ltrim(char* s);
 #endif
 
-
 #if defined(__WIN__)
-static int crd_replace(INOUT char *st, IN char *orig, IN char *repl);
+static int crd_replace(INOUT char* st, IN char* orig, IN char* repl);
 
-static int crd_get_exec_name_from_path(IN char *str, OUT char *exec_name);
+static int crd_get_exec_name_from_path(IN char* str, OUT char* exec_name);
 #endif
 
-int crd_init(OUT crd_ctxt_t **context, IN mfile *mf, IN int is_full, IN int cause_addr, IN int cause_off, IN const char *db_path)
+int crd_init(OUT crd_ctxt_t** context,
+             IN mfile* mf,
+             IN int is_full,
+             IN int cause_addr,
+             IN int cause_off,
+             IN const char* db_path)
 {
-
     dm_dev_id_t dev_type = DeviceUnknown;
     u_int32_t with_sp2 = 0;
     u_int32_t dev_id = 0;
@@ -184,79 +191,87 @@ int crd_init(OUT crd_ctxt_t **context, IN mfile *mf, IN int is_full, IN int caus
     u_int32_t sp2_number_of_dwords = 0;
     u_int32_t sp2_block_count = 0;
     u_int8_t read_single_dword = 0;
-    char csv_file_path [CRD_CSV_PATH_SIZE] = {0x0};
-
+    char csv_file_path[CRD_CSV_PATH_SIZE] = {0x0};
 
     int rc = CRD_OK;
 
     CRD_CHECK_NULL(mf);
     CRD_CHECK_NULL(context);
 
-    if (cause_addr >= 0 && cause_off < 0) {
+    if (cause_addr >= 0 && cause_off < 0)
+    {
         CRD_DEBUG("cause_off is negative : %d ", cause_off);
         return CRD_INVALID_PARM;
     }
 
-    if (cause_addr >= 0 && cause_off >= 0) {
+    if (cause_addr >= 0 && cause_off >= 0)
+    {
         read_single_dword = 1;
     }
     CRD_DEBUG("getting device id\n");
-    if (dm_get_device_id(mf, &dev_type, &dev_id, &chip_rev)) {
+    if (dm_get_device_id(mf, &dev_type, &dev_id, &chip_rev))
+    {
         CRD_DEBUG("Failed to identify device.");
         return CRD_UNKOWN_DEVICE;
     }
 
     CRD_DEBUG("Device type : 0x%x, device id : 0x%x, chip rev : 0x%x\n", dev_type, dev_id, chip_rev);
-    if ((rc = crd_get_csv_path(dev_type, csv_file_path, db_path)) != CRD_OK) {
+    if ((rc = crd_get_csv_path(dev_type, csv_file_path, db_path)) != CRD_OK)
+    {
         return rc;
     }
 
-
     CRD_DEBUG("allocating struct\n");
     *context = (crd_ctxt_t*)malloc(sizeof(crd_ctxt_t));
-    if (*context == NULL) {
+    if (*context == NULL)
+    {
         CRD_DEBUG("Failed to allocate memmory for context \n");
         return CRD_MEM_ALLOCATION_ERR;
     }
 
-    if (dm_dev_is_hca(dev_type)) {
+    if (dm_dev_is_hca(dev_type))
+    {
         with_sp2 = 1;
         rc = crd_count_tlv_blocks_and_dwords(mf, &sp2_block_count, &sp2_number_of_dwords);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
     }
 
     rc = crd_count_blocks(csv_file_path, &block_count, read_single_dword);
-    if (rc) {
+    if (rc)
+    {
         free(*context);
         return rc;
     }
 
     CRD_DEBUG("Block count : %d\n", block_count);
-    (*context)->blocks = (crd_parsed_csv_t*) malloc(sizeof(crd_parsed_csv_t) * (block_count + sp2_block_count));
-    if ((*context)->blocks == NULL) {
+    (*context)->blocks = (crd_parsed_csv_t*)malloc(sizeof(crd_parsed_csv_t) * (block_count + sp2_block_count));
+    if ((*context)->blocks == NULL)
+    {
         CRD_DEBUG("Failed to allocate memmory for csv blocks\n");
         free(*context);
         return CRD_MEM_ALLOCATION_ERR;
     }
 
-
-    rc = crd_count_double_word(mf, csv_file_path, &number_of_dwords,(*context)->blocks, is_full, read_single_dword, with_sp2);
-    if (rc) {
+    rc = crd_count_double_word(mf, csv_file_path, &number_of_dwords, (*context)->blocks, is_full, read_single_dword,
+                               with_sp2);
+    if (rc)
+    {
         goto Cleanup;
     }
 
     mset_addr_space(mf, AS_ND_CRSPACE);
 
     CRD_DEBUG("Number of found dwords are : %d \n", number_of_dwords);
-    (*context)->mf               = mf;
-    (*context)->dev_type         = dev_type;
+    (*context)->mf = mf;
+    (*context)->dev_type = dev_type;
     (*context)->number_of_dwords = number_of_dwords + sp2_number_of_dwords;
-    (*context)->is_full          = is_full;
-    (*context)->block_count      = block_count + sp2_block_count;
-    (*context)->cause_addr       = cause_addr;
-    (*context)->cause_off        = cause_off;
+    (*context)->is_full = is_full;
+    (*context)->block_count = block_count + sp2_block_count;
+    (*context)->cause_addr = cause_addr;
+    (*context)->cause_off = cause_off;
     strcpy((*context)->csv_path, csv_file_path);
     return rc;
 
@@ -265,24 +280,23 @@ int crd_init(OUT crd_ctxt_t **context, IN mfile *mf, IN int is_full, IN int caus
     return rc;
 }
 
-
-int crd_get_addr_list(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr)
+int crd_get_addr_list(IN crd_ctxt_t* context, OUT crd_dword_t* dword_arr)
 {
-
     int rc;
 
     CRD_CHECK_NULL(context);
     CRD_CHECK_NULL(dword_arr);
 
     rc = crd_fill_address(context, dword_arr);
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
 
     return CRD_OK;
 }
 
-int crd_dump_data(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr, IN crd_callback_t func)
+int crd_dump_data(IN crd_ctxt_t* context, OUT crd_dword_t* dword_arr, IN crd_callback_t func)
 {
     u_int32_t i = 0;
     u_int32_t j = 0;
@@ -291,51 +305,65 @@ int crd_dump_data(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr, IN crd_cal
     u_int32_t cause_reg = 0;
 
     int total = 0;
-    char *data;
+    char* data;
     crd_dword_t tmp_dword;
 
     CRD_CHECK_NULL(context);
 
-    if (dword_arr == NULL && func == NULL) {
+    if (dword_arr == NULL && func == NULL)
+    {
         CRD_DEBUG("Nothing to do\n");
         return CRD_INVALID_PARM;
     }
 
-    for (i = 0; i < context->block_count; i++) {
-        if (!context->is_full && strcmp(context->blocks[i].enable_addr, CRD_EMPTY)) {
+    for (i = 0; i < context->block_count; i++)
+    {
+        if (!context->is_full && strcmp(context->blocks[i].enable_addr, CRD_EMPTY))
+        {
             continue;
         }
 
-        data = (char*) malloc(context->blocks[i].len * sizeof(u_int32_t));
-        if (data == NULL) {
+        data = (char*)malloc(context->blocks[i].len * sizeof(u_int32_t));
+        if (data == NULL)
+        {
             return CRD_MEM_ALLOCATION_ERR;
         }
         memset(data, 0, context->blocks[i].len * sizeof(u_int32_t));
 
-        rc = mread4_block(context->mf, context->blocks[i].addr, (u_int32_t*)data, context->blocks[i].len * sizeof(u_int32_t));
-        if (context->blocks[i].len * sizeof(u_int32_t) != rc) {
-            sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", context->blocks[i].addr, strerror(errno), (u_int32_t)errno);
+        rc = mread4_block(context->mf, context->blocks[i].addr, (u_int32_t*)data,
+                          context->blocks[i].len * sizeof(u_int32_t));
+        if (context->blocks[i].len * sizeof(u_int32_t) != rc)
+        {
+            sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", context->blocks[i].addr, strerror(errno),
+                    (u_int32_t)errno);
             free(data);
             return CRD_CR_READ_ERR;
         }
 
-        for (j = 0; j < context->blocks[i].len; j++) {
-            if ((u_int32_t)total >= context->number_of_dwords) { // dummy check tadah!
+        for (j = 0; j < context->blocks[i].len; j++)
+        {
+            if ((u_int32_t)total >= context->number_of_dwords)
+            { // dummy check tadah!
                 CRD_DEBUG("value exceeded, something wrong in calculation!");
                 free(data);
                 return CRD_EXCEED_VALUE;
             }
-            addr =  context->blocks[i].addr + (j * sizeof(u_int32_t));
-
-            if (context->cause_addr >= 0) {  /* if we want to check cause bit - read it and verify it hasn't been raised */
-                if (mread4(context->mf, context->cause_addr, &cause_reg) != sizeof(u_int32_t)) {
-                    CRD_DEBUG("Cr read (0x%08x) failed: %s(%d)\n", context->cause_addr, strerror(errno), (u_int32_t)errno);
-                    sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", context->cause_addr, strerror(errno), (u_int32_t)errno);
+            addr = context->blocks[i].addr + (j * sizeof(u_int32_t));
+
+            if (context->cause_addr >= 0)
+            { /* if we want to check cause bit - read it and verify it hasn't been raised */
+                if (mread4(context->mf, context->cause_addr, &cause_reg) != sizeof(u_int32_t))
+                {
+                    CRD_DEBUG("Cr read (0x%08x) failed: %s(%d)\n", context->cause_addr, strerror(errno),
+                              (u_int32_t)errno);
+                    sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", context->cause_addr, strerror(errno),
+                            (u_int32_t)errno);
                     free(data);
                     return CRD_CR_READ_ERR;
                 }
                 cause_reg = EXTRACT(cause_reg, context->cause_off, 1);
-                if (cause_reg) {
+                if (cause_reg)
+                {
                     CRD_DEBUG("Cause bit set by read from address 0x%x\n", addr);
                     sprintf(crd_error, "Cause bit set by read from address 0x%x", addr);
                     free(data);
@@ -343,11 +371,13 @@ int crd_dump_data(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr, IN crd_cal
                 }
             }
 
-            if (dword_arr != NULL) {
+            if (dword_arr != NULL)
+            {
                 dword_arr[total].addr = addr;
                 dword_arr[total].data = ((u_int32_t*)data)[j];
             }
-            if (func != NULL) {
+            if (func != NULL)
+            {
                 tmp_dword.addr = addr;
                 tmp_dword.data = ((u_int32_t*)data)[j];
                 func(&tmp_dword);
@@ -359,46 +389,44 @@ int crd_dump_data(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr, IN crd_cal
     return CRD_OK;
 }
 
-int crd_get_dword_num(IN crd_ctxt_t *context, OUT u_int32_t *arr_size)
+int crd_get_dword_num(IN crd_ctxt_t* context, OUT u_int32_t* arr_size)
 {
-
     CRD_CHECK_NULL(context);
     *arr_size = context->number_of_dwords;
     return CRD_OK;
 }
 
-
-static int crd_get_csv_path(IN dm_dev_id_t dev_type, OUT char *csv_file_path, IN const char *db_path)
+static int crd_get_csv_path(IN dm_dev_id_t dev_type, OUT char* csv_file_path, IN const char* db_path)
 {
-
     const int dev_name_len = 100;
     char dev_name[100] = {0};
     int rc;
 
     strncpy(dev_name, dm_dev_type2str(dev_type), dev_name_len - 1);
 
-    if (!strcmp(dev_name, "Unknown Device")) {
+    if (!strcmp(dev_name, "Unknown Device"))
+    {
         return CRD_UNKOWN_DEVICE;
     }
 
     rc = crd_update_csv_path(csv_file_path, db_path);
-    if (rc != CRD_OK) {
+    if (rc != CRD_OK)
+    {
         return rc;
     }
     CRD_SELECT_CSV_PATH(dev_name);
     return CRD_OK;
 }
 
-static void crd_parse(IN char *record, IN char *delim, OUT char arr[][CRD_MAXFLDSIZE],
-                      OUT int *field_count)
+static void crd_parse(IN char* record, IN char* delim, OUT char arr[][CRD_MAXFLDSIZE], OUT int* field_count)
 {
-
-    char *p = strtok(record, delim);
+    char* p = strtok(record, delim);
     int field = 0;
     strcpy(arr[0], "\0");
     strcpy(arr[1], "\0");
     strcpy(arr[2], "\0");
-    while (p) {
+    while (p)
+    {
         strcpy(arr[field], p);
         field++;
         p = strtok(NULL, delim);
@@ -411,7 +439,7 @@ static int crd_is_tlv_signature_valid(IN u_int32_t signature)
     int is_signature_valid = CRD_TLV_SIGNATURE_INVALID;
     if (signature == CRD_SP2_TLV_SIGNATURE_VALUE)
     {
-        is_signature_valid =  CRD_OK;
+        is_signature_valid = CRD_OK;
     }
 
     return is_signature_valid;
@@ -422,13 +450,13 @@ static int crd_is_tlv_address_valid(IN u_int32_t address)
     int is_address_valid = CRD_TLV_ADDRESS_INVALID;
     if ((int)address != -1)
     {
-        is_address_valid =  CRD_OK;
+        is_address_valid = CRD_OK;
     }
 
     return is_address_valid;
 }
 
-static int crd_count_tlv_blocks_and_dwords(IN mfile *mf, OUT u_int32_t *block_count, OUT u_int32_t *number_of_dwords)
+static int crd_count_tlv_blocks_and_dwords(IN mfile* mf, OUT u_int32_t* block_count, OUT u_int32_t* number_of_dwords)
 {
     int rc = 0;
     crd_sp2_tlv_t current_tlv;
@@ -437,20 +465,21 @@ static int crd_count_tlv_blocks_and_dwords(IN mfile *mf, OUT u_int32_t *block_co
     *block_count = 0;
     *number_of_dwords = 0;
     rc = crd_get_tlv_from_address(mf, CRD_SP2_TLV_FIRST_ADDRESS, &current_tlv);
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
     tlv_signature = current_tlv.signature;
     tlv_address = current_tlv.address;
 
-    while (crd_is_tlv_signature_valid(tlv_signature) == CRD_OK &&
-           crd_is_tlv_address_valid(tlv_address) == CRD_OK)
+    while (crd_is_tlv_signature_valid(tlv_signature) == CRD_OK && crd_is_tlv_address_valid(tlv_address) == CRD_OK)
     {
         (*block_count)++;
         (*number_of_dwords) += current_tlv.size;
 
         rc = crd_get_tlv_from_address(mf, current_tlv.address, &current_tlv);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
         tlv_signature = current_tlv.signature;
@@ -459,8 +488,7 @@ static int crd_count_tlv_blocks_and_dwords(IN mfile *mf, OUT u_int32_t *block_co
     return CRD_OK;
 }
 
-
-static int crd_set_tlv_blocks(IN mfile *mf, OUT crd_parsed_csv_t blocks[], IN u_int32_t sp2_start_block)
+static int crd_set_tlv_blocks(IN mfile* mf, OUT crd_parsed_csv_t blocks[], IN u_int32_t sp2_start_block)
 {
     int rc = 0;
     crd_sp2_tlv_t current_tlv;
@@ -469,14 +497,14 @@ static int crd_set_tlv_blocks(IN mfile *mf, OUT crd_parsed_csv_t blocks[], IN u_
     u_int32_t block_number = sp2_start_block;
 
     rc = crd_get_tlv_from_address(mf, CRD_SP2_TLV_FIRST_ADDRESS, &current_tlv);
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
     tlv_signature = current_tlv.signature;
     tlv_address = current_tlv.address;
 
-    while (crd_is_tlv_signature_valid(tlv_signature) == CRD_OK &&
-           crd_is_tlv_address_valid(tlv_address) == CRD_OK)
+    while (crd_is_tlv_signature_valid(tlv_signature) == CRD_OK && crd_is_tlv_address_valid(tlv_address) == CRD_OK)
     {
         blocks[block_number].addr = current_tlv.address;
         blocks[block_number].len = current_tlv.size;
@@ -484,7 +512,8 @@ static int crd_set_tlv_blocks(IN mfile *mf, OUT crd_parsed_csv_t blocks[], IN u_
 
         block_number++;
         rc = crd_get_tlv_from_address(mf, current_tlv.address, &current_tlv);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
         tlv_signature = current_tlv.signature;
@@ -493,27 +522,31 @@ static int crd_set_tlv_blocks(IN mfile *mf, OUT crd_parsed_csv_t blocks[], IN u_
     return CRD_OK;
 }
 
-static int crd_get_tlv_from_address(IN mfile *mf, IN u_int32_t address, OUT crd_sp2_tlv_t *crd_sp2_tlv)
+static int crd_get_tlv_from_address(IN mfile* mf, IN u_int32_t address, OUT crd_sp2_tlv_t* crd_sp2_tlv)
 {
     u_int32_t data;
-    
+
     // read signature
-    if (mread4(mf, address, &data) != sizeof(u_int32_t)) {
+    if (mread4(mf, address, &data) != sizeof(u_int32_t))
+    {
         CRD_DEBUG("Cr read (0x%08x) failed: %s(%d)\n", address, strerror(errno), (u_int32_t)errno);
         sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", address, strerror(errno), (u_int32_t)errno);
         return CRD_CR_READ_ERR;
     }
-    else {
+    else
+    {
         crd_sp2_tlv->signature = data;
     }
 
     // read size, writable, fw, version
-    if (mread4(mf, address + 4, &data) != sizeof(u_int32_t)) {
+    if (mread4(mf, address + 4, &data) != sizeof(u_int32_t))
+    {
         CRD_DEBUG("Cr read (0x%08x) failed: %s(%d)\n", address + 4, strerror(errno), (u_int32_t)errno);
         sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", address + 4, strerror(errno), (u_int32_t)errno);
         return CRD_CR_READ_ERR;
     }
-    else {
+    else
+    {
         crd_sp2_tlv->size = EXTRACT(data, 0, 20);
         crd_sp2_tlv->writable = EXTRACT(data, 20, 1);
         crd_sp2_tlv->fw = EXTRACT(data, 21, 1);
@@ -521,48 +554,55 @@ static int crd_get_tlv_from_address(IN mfile *mf, IN u_int32_t address, OUT crd_
     }
 
     // read address
-    if (mread4(mf, address + 8, &data) != sizeof(u_int32_t)) {
+    if (mread4(mf, address + 8, &data) != sizeof(u_int32_t))
+    {
         CRD_DEBUG("Cr read (0x%08x) failed: %s(%d)\n", address + 8, strerror(errno), (u_int32_t)errno);
         sprintf(crd_error, "Cr read (0x%08x) failed: %s(%d)", address + 8, strerror(errno), (u_int32_t)errno);
         return CRD_CR_READ_ERR;
     }
-    else {
+    else
+    {
         crd_sp2_tlv->address = data;
     }
-    
+
     return CRD_OK;
 }
 
-static int crd_count_blocks(IN char *csv_file_path,
-                            OUT u_int32_t *block_count, u_int8_t read_single_dword)
+static int crd_count_blocks(IN char* csv_file_path, OUT u_int32_t* block_count, u_int8_t read_single_dword)
 {
-
     char tmp[1024] = {0x0};
     char arr[CRD_MAXFLDS][CRD_MAXFLDSIZE];
     int field_count = 0;
     *block_count = 0;
 
     CRD_DEBUG("CSV file path : %s\n", csv_file_path);
-    FILE *fd = fopen(csv_file_path, "r");
-    if (fd == NULL) {
+    FILE* fd = fopen(csv_file_path, "r");
+    if (fd == NULL)
+    {
         CRD_DEBUG("Failed to open csv file : '%s'\n", csv_file_path);
         sprintf(crd_error, "Failed to open csv file : '%s'", csv_file_path);
         return CRD_OPEN_FILE_ERROR;
     }
-    while (!feof(fd)) {
-        if (crd_read_line(fd, tmp) == CRD_SKIP) {
+    while (!feof(fd))
+    {
+        if (crd_read_line(fd, tmp) == CRD_SKIP)
+        {
             continue;
         }
         crd_parse(tmp, ",", arr, &field_count); /* whack record into fields */
-        if (field_count < 2) {
+        if (field_count < 2)
+        {
             CRD_DEBUG("CSV File has bad format, line : %s\n", tmp);
             sprintf(crd_error, "CSV File has bad format, line : %s", tmp);
             fclose(fd);
             return CRD_CSV_BAD_FORMAT;
         }
-        if (read_single_dword) {
+        if (read_single_dword)
+        {
             *block_count += atoi(arr[1]);
-        } else {
+        }
+        else
+        {
             *block_count += 1;
         }
     }
@@ -570,68 +610,88 @@ static int crd_count_blocks(IN char *csv_file_path,
     return CRD_OK;
 }
 
-static int crd_count_double_word(IN mfile *mf, IN char *csv_file_path, OUT u_int32_t *number_of_dwords,
-                                 OUT crd_parsed_csv_t blocks[], IN int is_full,
-                                 IN u_int8_t read_single_dword, IN u_int8_t with_sp2)
+static int crd_count_double_word(IN mfile* mf,
+                                 IN char* csv_file_path,
+                                 OUT u_int32_t* number_of_dwords,
+                                 OUT crd_parsed_csv_t blocks[],
+                                 IN int is_full,
+                                 IN u_int8_t read_single_dword,
+                                 IN u_int8_t with_sp2)
 {
-    int rc                = 0;
-    int field_count       = 0;
-    int block_count       = 0;
-    u_int32_t addr        = 0;
-    u_int32_t len         = 0;
-    u_int32_t i           = 0;
+    int rc = 0;
+    int field_count = 0;
+    int block_count = 0;
+    u_int32_t addr = 0;
+    u_int32_t len = 0;
+    u_int32_t i = 0;
     char enable_addr[100] = {0};
-    char tmp[1024]  = {0x0};
+    char tmp[1024] = {0x0};
     char arr[CRD_MAXFLDS][CRD_MAXFLDSIZE];
 
     *number_of_dwords = 0;
 
     CRD_DEBUG("CSV file path : %s\n", csv_file_path);
-    FILE *fd = fopen(csv_file_path, "r");
-    if (fd == NULL) {
+    FILE* fd = fopen(csv_file_path, "r");
+    if (fd == NULL)
+    {
         CRD_DEBUG("Failed to open csv file : '%s'\n", csv_file_path);
         sprintf(crd_error, "Failed to open csv file : '%s'", csv_file_path);
         return CRD_OPEN_FILE_ERROR;
     }
 
-    while (!feof(fd)) {
-        if (crd_read_line(fd, tmp) == CRD_SKIP) {
+    while (!feof(fd))
+    {
+        if (crd_read_line(fd, tmp) == CRD_SKIP)
+        {
             continue;
         }
         crd_parse(tmp, ",", arr, &field_count); /* whack record into fields */
-        if (field_count < 2) {
+        if (field_count < 2)
+        {
             CRD_DEBUG("CSV File has bad format, line : %s\n", tmp);
             sprintf(crd_error, "CSV File has bad format, line : %s", tmp);
             fclose(fd);
             return CRD_CSV_BAD_FORMAT;
         }
         addr = (u_int32_t)strtol(arr[0], NULL, 0);
-        len  = atoi(arr[1]);
-        if (!read_single_dword) {
+        len = atoi(arr[1]);
+        if (!read_single_dword)
+        {
             blocks[block_count].addr = addr;
-            blocks[block_count].len  = len;
-            if (field_count > 2) {
+            blocks[block_count].len = len;
+            if (field_count > 2)
+            {
                 strcpy(blocks[block_count].enable_addr, arr[2]);
-                if (is_full || (!is_full && !strcmp(blocks[block_count].enable_addr, CRD_EMPTY))) {
+                if (is_full || (!is_full && !strcmp(blocks[block_count].enable_addr, CRD_EMPTY)))
+                {
                     *number_of_dwords += len;
                 }
-            } else   {
+            }
+            else
+            {
                 strcpy(blocks[block_count].enable_addr, CRD_EMPTY);
                 *number_of_dwords += len;
             }
             block_count += 1;
-        } else {
-            if (field_count > 2) {
+        }
+        else
+        {
+            if (field_count > 2)
+            {
                 strcpy(enable_addr, arr[2]);
-            } else {
+            }
+            else
+            {
                 strcpy(enable_addr, CRD_EMPTY);
             }
-            if (is_full || (!is_full && !strcmp(enable_addr, CRD_EMPTY))) {
+            if (is_full || (!is_full && !strcmp(enable_addr, CRD_EMPTY)))
+            {
                 *number_of_dwords += len;
             }
-            for (i = 0; i < len; i++) {
+            for (i = 0; i < len; i++)
+            {
                 blocks[block_count].addr = addr;
-                blocks[block_count].len  = 1;
+                blocks[block_count].len = 1;
                 strcpy(blocks[block_count].enable_addr, enable_addr);
                 block_count += 1;
                 addr += 4;
@@ -640,9 +700,11 @@ static int crd_count_double_word(IN mfile *mf, IN char *csv_file_path, OUT u_int
     }
     fclose(fd);
 
-    if (with_sp2) {
+    if (with_sp2)
+    {
         rc = crd_set_tlv_blocks(mf, blocks, block_count);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
     }
@@ -650,20 +712,23 @@ static int crd_count_double_word(IN mfile *mf, IN char *csv_file_path, OUT u_int
     return CRD_OK;
 }
 
-static int crd_fill_address(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr)
+static int crd_fill_address(IN crd_ctxt_t* context, OUT crd_dword_t* dword_arr)
 {
     u_int32_t i = 0;
     u_int32_t j = 0;
     int total = 0;
 
-    for (i = 0; i < context->block_count; i++) {
-        for (j = 0; j < context->blocks[i].len; j++) {
-
-            //CRD_UNKOWN, CRD_EMPTY
-            if (!context->is_full && strcmp(context->blocks[i].enable_addr, CRD_EMPTY)) {
+    for (i = 0; i < context->block_count; i++)
+    {
+        for (j = 0; j < context->blocks[i].len; j++)
+        {
+            // CRD_UNKOWN, CRD_EMPTY
+            if (!context->is_full && strcmp(context->blocks[i].enable_addr, CRD_EMPTY))
+            {
                 break;
             }
-            if ((u_int32_t)total >= context->number_of_dwords) {
+            if ((u_int32_t)total >= context->number_of_dwords)
+            {
                 CRD_DEBUG("value exceeded, something wrong in calculation!");
                 return CRD_EXCEED_VALUE;
             }
@@ -674,35 +739,49 @@ static int crd_fill_address(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr)
     return CRD_OK;
 }
 
-static int crd_read_line(IN FILE *fd, OUT char *tmp)
+static int crd_read_line(IN FILE* fd, OUT char* tmp)
 {
-
     int i = 0;
     int j = 0;
-    for (i = 0; i < CRD_MAXLINESIZE;) { // This loop to read line by line no matter the length of the line.
-        if (!feof(fd)) {
+    for (i = 0; i < CRD_MAXLINESIZE;)
+    { // This loop to read line by line no matter the length of the line.
+        if (!feof(fd))
+        {
             int c = fgetc(fd);
-            if (c == '#') {
-                if (!fgets(tmp, 300, fd)) {  // Avoid warning
+            if (c == '#')
+            {
+                if (!fgets(tmp, 300, fd))
+                { // Avoid warning
                 }
                 tmp[0] = 0;
                 continue;
-            } else if (c == '\r')   {
+            }
+            else if (c == '\r')
+            {
                 break;
-            } else if (c == '\n')   {
+            }
+            else if (c == '\n')
+            {
                 break;
-            } else if (c == ' ')   {
+            }
+            else if (c == ' ')
+            {
                 continue;
-            } else   {
+            }
+            else
+            {
                 j++;
                 tmp[i] = c;
                 i++;
             }
-        } else   {
+        }
+        else
+        {
             return CRD_SKIP;
         }
     }
-    if (!j) {
+    if (!j)
+    {
         return CRD_SKIP;
     }
     tmp[i] = 0;
@@ -711,12 +790,13 @@ static int crd_read_line(IN FILE *fd, OUT char *tmp)
 
 #if defined(__WIN__)
 
-static int crd_replace(INOUT char *st, IN char *orig, IN char *repl)
+static int crd_replace(INOUT char* st, IN char* orig, IN char* repl)
 {
     char buffer[CRD_CSV_PATH_SIZE] = {0x0};
-    char *ch;
+    char* ch;
 
-    if (!(ch = strstr(st, orig))) {
+    if (!(ch = strstr(st, orig)))
+    {
         return CRD_OK;
     }
     strncpy(buffer, st, ch - st);
@@ -727,17 +807,19 @@ static int crd_replace(INOUT char *st, IN char *orig, IN char *repl)
     return CRD_OK;
 }
 
-static int crd_get_exec_name_from_path(IN char *str, OUT char *exec_name)
+static int crd_get_exec_name_from_path(IN char* str, OUT char* exec_name)
 {
-    char *tmp_str = (char *)malloc(sizeof(char) * (strlen(str) + 1));
-    if (tmp_str == NULL) {
+    char* tmp_str = (char*)malloc(sizeof(char) * (strlen(str) + 1));
+    if (tmp_str == NULL)
+    {
         CRD_DEBUG("Failed to allocate memmory\n");
         return CRD_MEM_ALLOCATION_ERR;
     }
-    char *pch;
+    char* pch;
     strcpy(tmp_str, str);
     pch = strtok(tmp_str, "\\");
-    while (pch != NULL) {
+    while (pch != NULL)
+    {
         strcpy(exec_name, pch);
         pch = strtok(NULL, "\\");
     }
@@ -746,42 +828,43 @@ static int crd_get_exec_name_from_path(IN char *str, OUT char *exec_name)
 }
 #endif
 
-
 #if !defined(__WIN__) && !defined(MST_UL)
-static char* crd_ltrim(char *s)
+static char* crd_ltrim(char* s)
 {
-    while (isspace(*s)) {
+    while (isspace(*s))
+    {
         s++;
     }
     return s;
 }
 
-static char* crd_rtrim(char *s)
+static char* crd_rtrim(char* s)
 {
-    char *back;
+    char* back;
     int len = strlen(s);
 
-    if (len == 0) {
-        return(s);
+    if (len == 0)
+    {
+        return (s);
     }
     back = s + len;
-    while (isspace(*--back)) {
+    while (isspace(*--back))
+    {
         ;
     }
     *(back + 1) = '\0';
     return s;
 }
 
-static char* crd_trim(char *s)
+static char* crd_trim(char* s)
 {
     return crd_rtrim(crd_ltrim(s));
 }
 #endif
 
-static int crd_update_csv_path(IN OUT char *csv_file_path, IN const char *db_path)
+static int crd_update_csv_path(IN OUT char* csv_file_path, IN const char* db_path)
 {
-
-    int found  = 0;
+    int found = 0;
 #ifdef __WIN__
     char exec_name[CRD_CSV_PATH_SIZE];
     (void)db_path;
@@ -799,40 +882,49 @@ static int crd_update_csv_path(IN OUT char *csv_file_path, IN const char *db_pat
     char conf_path[256] = ROOT_PATH;
     char data_path[CRD_CSV_PATH_SIZE] = {0x0};
     char prefix[CRD_CSV_PATH_SIZE] = {0x0};
-    char      *tmp_value = NULL;
+    char* tmp_value = NULL;
     char line[CRD_MAXLINESIZE] = {0};
-    FILE      *fd;
+    FILE* fd;
 
-    if (db_path != NULL && *db_path != '\0') {
+    if (db_path != NULL && *db_path != '\0')
+    {
         strncpy(csv_file_path, db_path, CRD_CSV_PATH_SIZE - 1);
         return CRD_OK;
     }
     strcat(conf_path, "etc/mft/mft.conf");
     fd = fopen(conf_path, "r");
-    if (fd == NULL) {
+    if (fd == NULL)
+    {
         CRD_DEBUG("Failed to open conf file : %s\n", conf_path);
         sprintf(crd_error, "Failed to open conf file : %s", conf_path);
         return CRD_OPEN_FILE_ERROR;
     }
 
-    while ((fgets(line, CRD_MAXLINESIZE, fd))) {
-        if (strstr(line, "mstdump_dbs") != NULL) {
+    while ((fgets(line, CRD_MAXLINESIZE, fd)))
+    {
+        if (strstr(line, "mstdump_dbs") != NULL)
+        {
             tmp_value = strtok(line, "=");
-            if (tmp_value != NULL) {
+            if (tmp_value != NULL)
+            {
                 tmp_value = strtok(NULL, "=");
                 crd_trim(tmp_value);
                 strncpy(data_path, tmp_value, CRD_CSV_PATH_SIZE - 1);
             }
-        } else if (strstr(line, "mft_prefix_location") != NULL) {
+        }
+        else if (strstr(line, "mft_prefix_location") != NULL)
+        {
             tmp_value = strtok(line, "=");
-            if (tmp_value != NULL) {
+            if (tmp_value != NULL)
+            {
                 tmp_value = strtok(NULL, "=");
                 crd_trim(tmp_value);
                 strncpy(prefix, tmp_value, CRD_CSV_PATH_SIZE - 1);
             }
         }
     }
-    if (strlen(prefix) && strlen(data_path)) {
+    if (strlen(prefix) && strlen(data_path))
+    {
         strcpy(csv_file_path, prefix);
         strcat(csv_file_path, data_path);
         strcat(csv_file_path, "/");
@@ -841,13 +933,14 @@ static int crd_update_csv_path(IN OUT char *csv_file_path, IN const char *db_pat
 
     fclose(fd);
 #endif
-    if (!found) {
+    if (!found)
+    {
         return CRD_CONF_BAD_FORMAT;
     }
     return CRD_OK;
 }
 
-void crd_free(IN crd_ctxt_t *context)
+void crd_free(IN crd_ctxt_t* context)
 {
     free(context->blocks);
     free(context);
@@ -855,44 +948,45 @@ void crd_free(IN crd_ctxt_t *context)
 
 const char* crd_err_str(int rc)
 {
-    switch (rc) {
-    case CRD_OK:
-        return "Ok";
+    switch (rc)
+    {
+        case CRD_OK:
+            return "Ok";
 
-    case CRD_MEM_ALLOCATION_ERR:
-        return "Memory allocation error";
+        case CRD_MEM_ALLOCATION_ERR:
+            return "Memory allocation error";
 
-    case CRD_CR_READ_ERR:
-        return crd_error;
+        case CRD_CR_READ_ERR:
+            return crd_error;
 
-    case CRD_INVALID_PARM:
-        return "Invalid parameter";
+        case CRD_INVALID_PARM:
+            return "Invalid parameter";
 
-    case CRD_UNKOWN_DEVICE:
-        return "Unknown/Unsupported device";
+        case CRD_UNKOWN_DEVICE:
+            return "Unknown/Unsupported device";
 
-    case CRD_CSV_BAD_FORMAT:
-        return crd_error;
+        case CRD_CSV_BAD_FORMAT:
+            return crd_error;
 
-    case CRD_CONF_BAD_FORMAT:
-        return "Conf file has no valid mstdumb_db path.";
+        case CRD_CONF_BAD_FORMAT:
+            return "Conf file has no valid mstdumb_db path.";
 
-    case CRD_OPEN_FILE_ERROR:
-        return crd_error;
+        case CRD_OPEN_FILE_ERROR:
+            return crd_error;
 
-    case CRD_SKIP:
-        return "Skip";
+        case CRD_SKIP:
+            return "Skip";
 
-    case CRD_NOT_SUPPORTED:
-        return "Not supported";
+        case CRD_NOT_SUPPORTED:
+            return "Not supported";
 
-    case CRD_EXCEED_VALUE:
-        return "Value exceed";
+        case CRD_EXCEED_VALUE:
+            return "Value exceed";
 
-    case CRD_CAUSE_BIT:
-        return crd_error;
+        case CRD_CAUSE_BIT:
+            return crd_error;
 
-    default:
-        return "Unknown error";
+        default:
+            return "Unknown error";
     }
 }
diff --git a/mstdump/crd_lib/crdump.h b/mstdump/crd_lib/crdump.h
old mode 100755
new mode 100644
index a9531add..e9f4287c
--- a/mstdump/crd_lib/crdump.h
+++ b/mstdump/crd_lib/crdump.h
@@ -40,40 +40,38 @@
 #include <errno.h>
 #include <mtcr.h>
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-
-enum crd_return_code {
-    CRD_OK = 0,
-    CRD_MEM_ALLOCATION_ERR,
-    CRD_CR_READ_ERR,
-    CRD_INVALID_PARM,
-    CRD_UNKOWN_DEVICE,
-    CRD_CSV_BAD_FORMAT,
-    CRD_CONF_BAD_FORMAT,
-    CRD_OPEN_FILE_ERROR,
-    CRD_SKIP,
-    CRD_NOT_SUPPORTED,
-    CRD_EXCEED_VALUE,
-    CRD_CAUSE_BIT,
-    CRD_TLV_SIGNATURE_INVALID,
-    CRD_TLV_ADDRESS_INVALID,
-};
-
-
-typedef struct crd_ctxt crd_ctxt_t;
-
-typedef struct crd_dword {
-    u_int32_t addr;
-    u_int32_t data;
-} crd_dword_t;
-
-
-typedef void (*crd_callback_t) (crd_dword_t*);  // call back
-
+    enum crd_return_code
+    {
+        CRD_OK = 0,
+        CRD_MEM_ALLOCATION_ERR,
+        CRD_CR_READ_ERR,
+        CRD_INVALID_PARM,
+        CRD_UNKOWN_DEVICE,
+        CRD_CSV_BAD_FORMAT,
+        CRD_CONF_BAD_FORMAT,
+        CRD_OPEN_FILE_ERROR,
+        CRD_SKIP,
+        CRD_NOT_SUPPORTED,
+        CRD_EXCEED_VALUE,
+        CRD_CAUSE_BIT,
+        CRD_TLV_SIGNATURE_INVALID,
+        CRD_TLV_ADDRESS_INVALID,
+    };
+
+    typedef struct crd_ctxt crd_ctxt_t;
+
+    typedef struct crd_dword
+    {
+        u_int32_t addr;
+        u_int32_t data;
+    } crd_dword_t;
+
+    typedef void (*crd_callback_t)(crd_dword_t*); // call back
 
 #ifndef IN
 #define IN
@@ -93,38 +91,47 @@ typedef void (*crd_callback_t) (crd_dword_t*);  // call back
 #define CRD_DLL_EXPORT
 #endif
 
-/*
-
-   Must be called before others methods to allocate memory and store all needed configuration
-
- */
-CRD_DLL_EXPORT int crd_init(OUT crd_ctxt_t **context, IN mfile *mf, IN int is_full, IN int cause, IN int cause_off, IN const char *db_path);  // fill device type, and number of dewords according to the is_full
-
-/*
-   Store cr space length at arr_size
- */
-CRD_DLL_EXPORT int crd_get_dword_num(IN crd_ctxt_t *context, OUT u_int32_t *arr_size);
-
-
-/*
-   Store all addresses are dword_arr array
- */
-CRD_DLL_EXPORT int crd_get_addr_list(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr); // caller well allocate the array and addresses will be filled.
-
-/*
-   Store all addresses and data in dword_arr, if func is not null, it will be called on each dword
- */
-CRD_DLL_EXPORT int crd_dump_data(IN crd_ctxt_t *context, OUT crd_dword_t *dword_arr, IN crd_callback_t func);// values will be filled.
-
-/*
-   Return string representation of the error code
- */
-CRD_DLL_EXPORT const char* crd_err_str(int rc);
-
-/*
-   Free context
- */
-CRD_DLL_EXPORT void crd_free(IN crd_ctxt_t *context);
+    /*
+
+       Must be called before others methods to allocate memory and store all needed configuration
+
+     */
+    CRD_DLL_EXPORT int crd_init(OUT crd_ctxt_t** context,
+                                IN mfile* mf,
+                                IN int is_full,
+                                IN int cause,
+                                IN int cause_off,
+                                IN const char* db_path); // fill device type, and number of dewords according to the
+                                                         // is_full
+
+    /*
+       Store cr space length at arr_size
+     */
+    CRD_DLL_EXPORT int crd_get_dword_num(IN crd_ctxt_t* context, OUT u_int32_t* arr_size);
+
+    /*
+       Store all addresses are dword_arr array
+     */
+    CRD_DLL_EXPORT int crd_get_addr_list(IN crd_ctxt_t* context,
+                                         OUT crd_dword_t* dword_arr); // caller well allocate the array and addresses
+                                                                      // will be filled.
+
+    /*
+       Store all addresses and data in dword_arr, if func is not null, it will be called on each dword
+     */
+    CRD_DLL_EXPORT int crd_dump_data(IN crd_ctxt_t* context,
+                                     OUT crd_dword_t* dword_arr,
+                                     IN crd_callback_t func); // values will be filled.
+
+    /*
+       Return string representation of the error code
+     */
+    CRD_DLL_EXPORT const char* crd_err_str(int rc);
+
+    /*
+       Free context
+     */
+    CRD_DLL_EXPORT void crd_free(IN crd_ctxt_t* context);
 
 #ifdef __cplusplus
 }
diff --git a/mstdump/crd_main/mstdump.c b/mstdump/crd_main/mstdump.c
index c5226501..89940c6d 100644
--- a/mstdump/crd_main/mstdump.c
+++ b/mstdump/crd_main/mstdump.c
@@ -36,7 +36,6 @@
 #include <common/tools_version.h>
 #include <common/bit_slice.h>
 
-
 #define CAUSE_FLAG "--cause"
 #define MAX_DEV_LEN 512
 
@@ -48,92 +47,106 @@
 #define DEV_EXAMPLE "/dev/mst/mt4099_pci_cr0"
 #endif
 
-
 // string explaining the cmd-line structure
-char correct_cmdline[] = "   Mellanox "MSTDUMP_NAME " utility, dumps device internal configuration data\n\
-   Usage: "MSTDUMP_NAME " [-full] <device> [i2c-slave] [-v[ersion] [-h[elp]]]\n\n\
+char correct_cmdline[] = "   Mellanox " MSTDUMP_NAME " utility, dumps device internal configuration data\n\
+   Usage: " MSTDUMP_NAME " [-full] <device> [i2c-slave] [-v[ersion] [-h[elp]]]\n\n\
    -full              :  Dump more expanded list of addresses\n\
                          Note : be careful when using this flag, None safe addresses might be read.\n\
    -v | --version     :  Display version info\n\
    -h | --help        :  Print this help message\n\
    Example :\n\
-            "MSTDUMP_NAME " "DEV_EXAMPLE "\n";
-
+            " MSTDUMP_NAME " " DEV_EXAMPLE "\n";
 
-void print_dword(crd_dword_t *dword)
+void print_dword(crd_dword_t* dword)
 {
     printf("0x%8.8x 0x%8.8x\n", dword->addr, dword->data);
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     int i;
-    mfile *mf;
+    mfile* mf;
     int rc;
     int full = 0;
     int cause_addr = -1, cause_off = -1;
-    crd_ctxt_t *context;
+    crd_ctxt_t* context;
     u_int32_t arr_size = 0;
-    char *endptr;
+    char* endptr;
     u_int8_t new_i2c_slave = 0;
     char device[MAX_DEV_LEN] = {0};
 #if defined(__linux__) || defined(__FreeBSD__)
-    if (geteuid() != 0) {
+    if (geteuid() != 0)
+    {
         printf("-E- Permission denied: User is not root\n");
         return 1;
     }
 #endif
 
-    if (argc < 2 || argc > 4) {
+    if (argc < 2 || argc > 4)
+    {
         fprintf(stderr, "%s", correct_cmdline);
         return 2;
     }
 
-    for (i = 1; i < argc; ++i) {
+    for (i = 1; i < argc; ++i)
+    {
         /* check position-independent flags */
-        if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "-help") || !strcmp(argv[i], "--help")) {
+        if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "-help") || !strcmp(argv[i], "--help"))
+        {
             fprintf(stdout, "%s", correct_cmdline);
             exit(0);
-        } else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "-version") || !strcmp(argv[i], "--version"))   {
+        }
+        else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "-version") || !strcmp(argv[i], "--version"))
+        {
             print_version_string(MSTDUMP_NAME, "");
             exit(0);
-        } else if (!strncmp(argv[i], CAUSE_FLAG, strlen(CAUSE_FLAG)))   {
-            if (sscanf(argv[i], CAUSE_FLAG "=%i.%d", &cause_addr, &cause_off) != 2) {
+        }
+        else if (!strncmp(argv[i], CAUSE_FLAG, strlen(CAUSE_FLAG)))
+        {
+            if (sscanf(argv[i], CAUSE_FLAG "=%i.%d", &cause_addr, &cause_off) != 2)
+            {
                 fprintf(stderr, "Invalid parameters to " CAUSE_FLAG " flag\n");
                 fprintf(stdout, "%s", correct_cmdline);
                 exit(1);
             }
-            if (cause_addr < 0 || cause_off < 0) {
+            if (cause_addr < 0 || cause_off < 0)
+            {
                 fprintf(stderr, "Parameters to " CAUSE_FLAG " flag must be non-negative values\n");
                 exit(1);
             }
         }
     }
 
-    i = 1;  // i points to the current command line argument
+    i = 1; // i points to the current command line argument
 
-    if (i < argc && !strcasecmp(argv[i], "-full")) {
+    if (i < argc && !strcasecmp(argv[i], "-full"))
+    {
         full = 1;
         ++i;
     }
-    if (i >= argc) {
+    if (i >= argc)
+    {
         fprintf(stderr, "Device is not specified in command line. Exiting.\n");
         fprintf(stdout, "%s", correct_cmdline);
         return 1;
     }
     strncpy(device, argv[i], MAX_DEV_LEN - 1);
-    if (!( mf = mopen_adv((const char*)device, (MType)(MST_DEFAULT | MST_CABLE)))) {
+    if (!(mf = mopen_adv((const char*)device, (MType)(MST_DEFAULT | MST_CABLE))))
+    {
         fprintf(stderr, "Unable to open device %s. Exiting.\n", argv[i]);
         return 1;
     }
-    ++i;    // move past the device parameter
+    ++i; // move past the device parameter
 
-    if (i < argc && !strncmp(argv[i], CAUSE_FLAG, strlen(CAUSE_FLAG))) {
+    if (i < argc && !strncmp(argv[i], CAUSE_FLAG, strlen(CAUSE_FLAG)))
+    {
         i++;
     }
-    if (i < argc) {
+    if (i < argc)
+    {
         new_i2c_slave = (u_int8_t)strtoul(argv[i], &endptr, 0);
-        if (*endptr || !*argv[i]) {
+        if (*endptr || !*argv[i])
+        {
             fprintf(stderr, "Invalid i2c-slave %s\n", argv[i]);
             mclose(mf);
             return 1;
@@ -141,8 +154,10 @@ int main(int argc, char *argv[])
         mset_i2c_slave(mf, new_i2c_slave);
         i++;
     }
-    if (i < argc) {
-        if (i < argc) {
+    if (i < argc)
+    {
+        if (i < argc)
+        {
             fprintf(stderr, "Unknown argument: %s.\n", argv[i]);
             fprintf(stderr, "%s", correct_cmdline);
             mclose(mf);
@@ -151,22 +166,25 @@ int main(int argc, char *argv[])
     }
     rc = CRD_OK;
     rc = crd_init(&context, mf, full, cause_addr, cause_off, NULL);
-    if (rc) {
+    if (rc)
+    {
         mclose(mf);
         goto error;
     }
 
-    //printf("Number of blocks : 0x%d\n",(context)->block_count);
+    // printf("Number of blocks : 0x%d\n",(context)->block_count);
 
     rc = crd_get_dword_num(context, &arr_size);
-    if (rc) {
+    if (rc)
+    {
         crd_free(context);
         mclose(mf);
         goto error;
     }
 
     rc = crd_dump_data(context, NULL, print_dword);
-    if (rc) {
+    if (rc)
+    {
         crd_free(context);
         mclose(mf);
         goto error;
@@ -179,4 +197,3 @@ int main(int argc, char *argv[])
     printf("-E- %s\n", crd_err_str(rc));
     return rc;
 }
-
diff --git a/mtcr_freebsd/mtcr_ul.c b/mtcr_freebsd/mtcr_ul.c
index e6358129..36800d5f 100644
--- a/mtcr_freebsd/mtcr_ul.c
+++ b/mtcr_freebsd/mtcr_ul.c
@@ -73,40 +73,44 @@
 #include <dirent.h>
 #include <sys/file.h>
 
-
-#define MST_VPD_DFLT_TIMEOUT   2000
-#define PCI_VPD_ADDR   0x2
+#define MST_VPD_DFLT_TIMEOUT 2000
+#define PCI_VPD_ADDR 0x2
 #define PCI_CAP_ID_VPD 0x3
-#define PCI_VPD_DATA   0x4
-
-#define	_PATH_DEVPCI	"/dev/pci"
+#define PCI_VPD_DATA 0x4
 
+#define _PATH_DEVPCI "/dev/pci"
 
-typedef enum {
+typedef enum
+{
     Clear_Vsec_Semaphore = 0x1
 } adv_opt_t;
 
-
 #define FREEBSD_LOCK_FILE_DIR "/tmp/mft_lockfiles"
 #define FREEBSD_LOCK_FILE_FORMAT "/tmp/mft_lockfiles/%s"
 
 #define CHECK_LOCK(rc) \
-    if (rc) { \
-        return rc; \
+    if (rc)            \
+    {                  \
+        return rc;     \
     }
 
 #define FREEBSD_MAX_RETRY_CNT 8192
 static int _flock_int(int fdlock, int operation)
 {
     int cnt = 0;
-    if (fdlock == 0) {
+    if (fdlock == 0)
+    {
         // in case we failed to create the lock file we ignore the locking mechanism
         return 0;
     }
-    do {
-        if (flock(fdlock, operation | LOCK_NB) == 0) {
+    do
+    {
+        if (flock(fdlock, operation | LOCK_NB) == 0)
+        {
             return 0;
-        } else if (errno != EWOULDBLOCK) {
+        }
+        else if (errno != EWOULDBLOCK)
+        {
             break; // BAD! lock/free failed
         }
         usleep(10);
@@ -114,27 +118,29 @@ static int _flock_int(int fdlock, int operation)
     } while (cnt < FREEBSD_MAX_RETRY_CNT);
     perror("failed to perform lock operation.");
     return -1;
-
 }
 
-static int _create_lock(mfile *mf, char* devname)
+static int _create_lock(mfile* mf, char* devname)
 {
-    char fname[64] = { 0 };
+    char fname[64] = {0};
     int rc;
     int fd = 0;
 
     snprintf(fname, sizeof(fname) - 1, FREEBSD_LOCK_FILE_FORMAT, devname);
     rc = mkdir("/tmp", 0777);
-    if (rc && errno != EEXIST) {
+    if (rc && errno != EEXIST)
+    {
         goto cl_clean_up;
     }
     rc = mkdir(FREEBSD_LOCK_FILE_DIR, 0777);
-    if (rc && errno != EEXIST) {
+    if (rc && errno != EEXIST)
+    {
         goto cl_clean_up;
     }
 
     fd = open(fname, O_RDONLY | O_CREAT, 0777);
-    if (fd < 0) {
+    if (fd < 0)
+    {
         goto cl_clean_up;
     }
 
@@ -147,106 +153,120 @@ static int _create_lock(mfile *mf, char* devname)
 }
 /*End of Lock file section */
 
-void mtcr_connectx_flush(void *ptr, int fdlock)
+void mtcr_connectx_flush(void* ptr, int fdlock)
 {
     u_int32_t value;
     int rc = _flock_int(fdlock, LOCK_EX);
-    if (rc) {
+    if (rc)
+    {
         return;
     }
-    *((u_int32_t *) ((char *) ptr + 0xf0380)) = 0x0;
-    do {
-        asm volatile ("" ::: "memory");
-        value = __be32_to_cpu(*((u_int32_t *) ((char *) ptr + 0xf0380)));
+    *((u_int32_t*)((char*)ptr + 0xf0380)) = 0x0;
+    do
+    {
+        asm volatile("" ::: "memory");
+        value = __be32_to_cpu(*((u_int32_t*)((char*)ptr + 0xf0380)));
     } while (value);
     rc = _flock_int(fdlock, LOCK_UN);
-    if (rc) {
+    if (rc)
+    {
         return;
     }
 }
 
-int mtcr_check_signature(mfile *mf)
+int mtcr_check_signature(mfile* mf)
 {
     unsigned signature;
     int rc;
     rc = mread4(mf, 0xF0014, &signature);
-    if (rc != 4) {
-        if (!errno) {
+    if (rc != 4)
+    {
+        if (!errno)
+        {
             errno = EIO;
         }
         return -1;
     }
 
-    switch (signature & 0xffff) {
-    case 0x190:     /* 400 */
-        if (signature == 0xa00190 && mf->ptr) {
-            mf->connectx_flush = 1;
-            mtcr_connectx_flush(mf->ptr, mf->fdlock);
-        }
+    switch (signature & 0xffff)
+    {
+        case 0x190: /* 400 */
+            if (signature == 0xa00190 && mf->ptr)
+            {
+                mf->connectx_flush = 1;
+                mtcr_connectx_flush(mf->ptr, mf->fdlock);
+            }
 
-    case 0x5a44:     /* 23108 */
-    case 0x6278:     /* 25208 */
-    case 0x5e8c:     /* 24204 */
-    case 0x6274:     /* 25204 */
-        return 0;
+        case 0x5a44: /* 23108 */
+        case 0x6278: /* 25208 */
+        case 0x5e8c: /* 24204 */
+        case 0x6274: /* 25204 */
+            return 0;
 
-    default:
-        errno = ENOTTY;
-        return -1;
+        default:
+            errno = ENOTTY;
+            return -1;
     }
 }
 
-
-
-#define READ4_PCI(mf, val_ptr, pci_offs, err_prefix, action_on_fail)    \
-    do {                                                                \
-        int rc;                                                         \
-        int lock_rc;                                                    \
-        lock_rc = _flock_int(mf->fdlock, LOCK_EX);                      \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        rc = read_config(mf, pci_offs, val_ptr, 4);                 \
-        lock_rc = _flock_int(mf->fdlock, LOCK_UN);                      \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        if (rc) {                                                       \
-            return rc;                                                  \
-        }                                                               \
+#define READ4_PCI(mf, val_ptr, pci_offs, err_prefix, action_on_fail) \
+    do                                                               \
+    {                                                                \
+        int rc;                                                      \
+        int lock_rc;                                                 \
+        lock_rc = _flock_int(mf->fdlock, LOCK_EX);                   \
+        if (lock_rc)                                                 \
+        {                                                            \
+            perror(err_prefix);                                      \
+            action_on_fail;                                          \
+        }                                                            \
+        rc = read_config(mf, pci_offs, val_ptr, 4);                  \
+        lock_rc = _flock_int(mf->fdlock, LOCK_UN);                   \
+        if (lock_rc)                                                 \
+        {                                                            \
+            perror(err_prefix);                                      \
+            action_on_fail;                                          \
+        }                                                            \
+        if (rc)                                                      \
+        {                                                            \
+            return rc;                                               \
+        }                                                            \
     } while (0)
 
-#define WRITE4_PCI(mf, val, pci_offs, err_prefix, action_on_fail)           \
-    do {                                                                \
-        int rc;                                                         \
-        int lock_rc;                                                    \
-        lock_rc = _flock_int(mf->fdlock, LOCK_EX);                      \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        rc = write_config(mf, pci_offs, val, 4);                        \
-        lock_rc = _flock_int(mf->fdlock, LOCK_UN);                      \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        if (rc) {                                                       \
-            return rc;                                                  \
-        }                                                               \
+#define WRITE4_PCI(mf, val, pci_offs, err_prefix, action_on_fail) \
+    do                                                            \
+    {                                                             \
+        int rc;                                                   \
+        int lock_rc;                                              \
+        lock_rc = _flock_int(mf->fdlock, LOCK_EX);                \
+        if (lock_rc)                                              \
+        {                                                         \
+            perror(err_prefix);                                   \
+            action_on_fail;                                       \
+        }                                                         \
+        rc = write_config(mf, pci_offs, val, 4);                  \
+        lock_rc = _flock_int(mf->fdlock, LOCK_UN);                \
+        if (lock_rc)                                              \
+        {                                                         \
+            perror(err_prefix);                                   \
+            action_on_fail;                                       \
+        }                                                         \
+        if (rc)                                                   \
+        {                                                         \
+            return rc;                                            \
+        }                                                         \
     } while (0)
 
-
-
-#define PCI_CONF_ADDR   (0x00000058)
-#define PCI_CONF_DATA   (0x0000005c)
+#define PCI_CONF_ADDR (0x00000058)
+#define PCI_CONF_DATA (0x0000005c)
 #define MLNX_VENDOR_SPECIFIC_CAP_ID 0x9
 
 /* PCI address space related enum*/
-enum {
-    PCI_CAP_PTR = 0x34, PCI_HDR_SIZE = 0x40, PCI_EXT_SPACE_ADDR = 0xff,
+enum
+{
+    PCI_CAP_PTR = 0x34,
+    PCI_HDR_SIZE = 0x40,
+    PCI_EXT_SPACE_ADDR = 0xff,
 
     PCI_CTRL_OFFSET = 0x4, // for space / semaphore / auto-increment bit
     PCI_COUNTER_OFFSET = 0x8,
@@ -262,38 +282,46 @@ enum {
     PCI_STATUS_BIT_OFFS = 29,
     PCI_STATUS_BIT_LEN = 3,
 
-    PCI_HEADER_OFFS = 0x0, PCI_SUBSYS_OFFS = 0x2c, PCI_CLASS_OFFS = 0x8,
+    PCI_HEADER_OFFS = 0x0,
+    PCI_SUBSYS_OFFS = 0x2c,
+    PCI_CLASS_OFFS = 0x8,
 };
 
 /* Mellanox vendor specific enum */
-enum {
-    CAP_ID = 0x9, IFC_MAX_RETRIES = 0x10000, SEM_MAX_RETRIES = 0x1000
+enum
+{
+    CAP_ID = 0x9,
+    IFC_MAX_RETRIES = 0x10000,
+    SEM_MAX_RETRIES = 0x1000
 };
 
 /* PCI operation enum(read or write)*/
-enum {
-    READ_OP = 0, WRITE_OP = 1,
+enum
+{
+    READ_OP = 0,
+    WRITE_OP = 1,
 };
 
-int read_config(mfile *mf, unsigned int reg, uint32_t *data, int width)
+int read_config(mfile* mf, unsigned int reg, uint32_t* data, int width)
 {
     struct pci_io pi = {};
     pi.pi_sel = mf->sel;
     pi.pi_reg = reg;
     pi.pi_width = width;
 
-    if (ioctl(mf->fd, PCIOCREAD, &pi) < 0) {
+    if (ioctl(mf->fd, PCIOCREAD, &pi) < 0)
+    {
         errno = EIO;
         return -1;
     }
 
-    //printf("%s:  dev:%d reg=%x width=%d data=%x\n", __FUNCTION__, pi.pi_sel.pc_dev, reg, width, pi.pi_data);
+    // printf("%s:  dev:%d reg=%x width=%d data=%x\n", __FUNCTION__, pi.pi_sel.pc_dev, reg, width, pi.pi_data);
     *data = (pi.pi_data);
 
     return 0;
 }
 
-int write_config(mfile *mf, unsigned int reg, uint32_t data, int width)
+int write_config(mfile* mf, unsigned int reg, uint32_t data, int width)
 {
     struct pci_io pi = {};
     pi.pi_sel = mf->sel;
@@ -301,8 +329,10 @@ int write_config(mfile *mf, unsigned int reg, uint32_t data, int width)
     pi.pi_width = width;
     pi.pi_data = data;
 
-    //printf("%s: dev:%d reg:%x width:%d data:%x\n", __FUNCTION__, pi.pi_sel.pc_dev, pi.pi_reg, pi.pi_width, pi.pi_data);
-    if (ioctl(mf->fd, PCIOCWRITE, &pi) < 0) {
+    // printf("%s: dev:%d reg:%x width:%d data:%x\n", __FUNCTION__, pi.pi_sel.pc_dev, pi.pi_reg, pi.pi_width,
+    // pi.pi_data);
+    if (ioctl(mf->fd, PCIOCWRITE, &pi) < 0)
+    {
         errno = EIO;
         return -1;
     }
@@ -310,39 +340,42 @@ int write_config(mfile *mf, unsigned int reg, uint32_t data, int width)
     return 0;
 }
 
-
-
 #define WO_REG_ADDR_DATA 0xbadacce5
-#define DEVID_OFFSET     0xf0014
+#define DEVID_OFFSET 0xf0014
 #define PCICONF_ADDR_OFF 0x58
 #define PCICONF_DATA_OFF 0x5c
 
-static int is_wo_pciconf_gw(mfile *mf)
+static int is_wo_pciconf_gw(mfile* mf)
 {
     unsigned offset = DEVID_OFFSET;
     u_int32_t data = 0;
     int lock_rc;
     lock_rc = _flock_int(mf->fdlock, LOCK_EX);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         return 0;
     }
-    int rc = write_config(mf, PCI_CONF_ADDR, (unsigned long) offset, 4);
-    if (rc < 0) {
+    int rc = write_config(mf, PCI_CONF_ADDR, (unsigned long)offset, 4);
+    if (rc < 0)
+    {
         goto cleanup;
     }
     rc = read_config(mf, PCI_CONF_ADDR, &data, 4);
-    if (rc < 0) {
+    if (rc < 0)
+    {
         rc = 0;
         goto cleanup;
     }
-    //printf("-D- Data: %#x\n", data);
-    if (data == WO_REG_ADDR_DATA) {
+    // printf("-D- Data: %#x\n", data);
+    if (data == WO_REG_ADDR_DATA)
+    {
         rc = 1;
     }
-    cleanup:
+cleanup:
     lock_rc = _flock_int(mf->fdlock, LOCK_UN);
-    if (lock_rc) {
-       return rc;
+    if (lock_rc)
+    {
+        return rc;
     }
     return rc;
 }
@@ -354,84 +387,98 @@ static int is_wo_pciconf_gw(mfile *mf)
 /*set addr space*/
 
 /* Read Write new functions (4Bytes, Block)*/
-int pci_find_capability(mfile *mf, int cap_id)
+int pci_find_capability(mfile* mf, int cap_id)
 {
     unsigned offset;
-    unsigned char visited[256] = { 0 }; /* Prevent infinite loops */
+    unsigned char visited[256] = {0}; /* Prevent infinite loops */
     uint32_t reg;
     int ret;
     int curr_cap;
 
     int lock_rc;
     lock_rc = _flock_int(mf->fdlock, LOCK_EX);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         return 0;
     }
     ret = read_config(mf, PCI_CAP_PTR, &reg, 4);
 
-    if (ret) {
+    if (ret)
+    {
         ret = 0;
         goto cleanup;
     }
 
-    offset = ((unsigned char *) &reg)[0];
-    while (1) {
-        if (offset < PCI_HDR_SIZE || offset > PCI_EXT_SPACE_ADDR) {
+    offset = ((unsigned char*)&reg)[0];
+    while (1)
+    {
+        if (offset < PCI_HDR_SIZE || offset > PCI_EXT_SPACE_ADDR)
+        {
             ret = 0;
             goto cleanup;
         }
         ret = read_config(mf, offset, &reg, 4);
-        if (ret) {
+        if (ret)
+        {
             ret = 0;
             goto cleanup;
         }
 
         visited[offset] = 1;
-        curr_cap = ((unsigned char *) &reg)[0];
-        if (curr_cap == cap_id) {
+        curr_cap = ((unsigned char*)&reg)[0];
+        if (curr_cap == cap_id)
+        {
             ret = offset;
             goto cleanup;
         }
 
-        offset = ((unsigned char *) &reg)[1];
-        if (visited[offset]) {
+        offset = ((unsigned char*)&reg)[1];
+        if (visited[offset])
+        {
             ret = 0;
             goto cleanup;
         }
     }
 cleanup:
     lock_rc = _flock_int(mf->fdlock, LOCK_UN);
-    if (lock_rc) {
-       return ret;
+    if (lock_rc)
+    {
+        return ret;
     }
     return ret;
 }
 
-static int _vendor_specific_sem(mfile *mf, int state)
+static int _vendor_specific_sem(mfile* mf, int state)
 {
     uint32_t lock_val;
     uint32_t counter = 0;
     int retries = 0;
-    if (!state) {
+    if (!state)
+    {
         // unlock
         WRITE4_PCI(mf, 0, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "unlock semaphore", return -1);
-    } else {
+    }
+    else
+    {
         // lock
-        do {
-            if (retries > SEM_MAX_RETRIES) {
+        do
+        {
+            if (retries > SEM_MAX_RETRIES)
+            {
                 return -1;
             }
             // read semaphore untill 0x0
             READ4_PCI(mf, &lock_val, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "read counter", return -1);
-            if (lock_val) {
-                //semaphore is taken
+            if (lock_val)
+            {
+                // semaphore is taken
                 retries++;
                 msleep(1); // wait for current op to end
                 continue;
             }
-            //read ticket
+            // read ticket
             READ4_PCI(mf, &counter, mf->vsec_addr + PCI_COUNTER_OFFSET, "read counter", return -1);
-            //write ticket to semaphore dword
+            // write ticket to semaphore dword
             WRITE4_PCI(mf, counter, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "write counter to semaphore", return -1);
             // read back semaphore make sure ticket == semaphore else repeat
             READ4_PCI(mf, &lock_val, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "read counter", return -1);
@@ -441,12 +488,14 @@ static int _vendor_specific_sem(mfile *mf, int state)
     return 0;
 }
 
-static int _wait_on_flag(mfile *mf, u_int8_t expected_val)
+static int _wait_on_flag(mfile* mf, u_int8_t expected_val)
 {
     int retries = 0;
     uint32_t flag;
-    do {
-        if (retries > IFC_MAX_RETRIES) {
+    do
+    {
+        if (retries > IFC_MAX_RETRIES)
+        {
             return -1;
         }
 
@@ -454,15 +503,16 @@ static int _wait_on_flag(mfile *mf, u_int8_t expected_val)
 
         flag = EXTRACT(flag, PCI_FLAG_BIT_OFFS, 1);
         retries++;
-        if ((retries & 0xf) == 0) {
+        if ((retries & 0xf) == 0)
+        {
             // dont sleep always
-            //usleep_range(1,5);
+            // usleep_range(1,5);
         }
     } while (flag != expected_val);
     return 0;
 }
 
-static int _set_addr_space(mfile *mf, u_int16_t space)
+static int _set_addr_space(mfile* mf, u_int16_t space)
 {
     // read modify write
     uint32_t val;
@@ -471,31 +521,36 @@ static int _set_addr_space(mfile *mf, u_int16_t space)
     WRITE4_PCI(mf, val, mf->vsec_addr + PCI_CTRL_OFFSET, "write domain", return -1);
     // read status and make sure space is supported
     READ4_PCI(mf, &val, mf->vsec_addr + PCI_CTRL_OFFSET, "read status", return -1);
-    if (EXTRACT(val, PCI_STATUS_BIT_OFFS, PCI_STATUS_BIT_LEN) == 0) {
+    if (EXTRACT(val, PCI_STATUS_BIT_OFFS, PCI_STATUS_BIT_LEN) == 0)
+    {
         return -1;
     }
     return 0;
 }
 
-static int _pciconf_rw(mfile *mf, unsigned int offset, uint32_t *data, int rw)
+static int _pciconf_rw(mfile* mf, unsigned int offset, uint32_t* data, int rw)
 {
     int ret = 0;
     uint32_t address = offset;
 
-    //last 2 bits must be zero as we only allow 30 bits addresses
-    if (EXTRACT(address, 30, 2)) {
+    // last 2 bits must be zero as we only allow 30 bits addresses
+    if (EXTRACT(address, 30, 2))
+    {
         return -1;
     }
 
     address = MERGE(address, (rw ? 1 : 0), PCI_FLAG_BIT_OFFS, 1);
-    if (rw == WRITE_OP) {
+    if (rw == WRITE_OP)
+    {
         // write data
         WRITE4_PCI(mf, *data, mf->vsec_addr + PCI_DATA_OFFSET, "write value", return -1);
         // write address
         WRITE4_PCI(mf, address, mf->vsec_addr + PCI_ADDR_OFFSET, "write offset", return -1);
         // wait on flag
         ret = _wait_on_flag(mf, 0);
-    } else {
+    }
+    else
+    {
         // write address
         WRITE4_PCI(mf, address, mf->vsec_addr + PCI_ADDR_OFFSET, "write offset", return -1);
         // wait on flag
@@ -506,21 +561,22 @@ static int _pciconf_rw(mfile *mf, unsigned int offset, uint32_t *data, int rw)
     return ret;
 }
 
-static int _send_pci_cmd_int(mfile *mf, int space, unsigned int offset,
-                             uint32_t *data, int rw)
+static int _send_pci_cmd_int(mfile* mf, int space, unsigned int offset, uint32_t* data, int rw)
 {
     int ret = 0;
 
     // take semaphore
     ret = _vendor_specific_sem(mf, 1);
-    if (ret) {
-        //printf("-D- Failed to take Semaphore!\n");
+    if (ret)
+    {
+        // printf("-D- Failed to take Semaphore!\n");
         return ret;
     }
     // set address space
     ret = _set_addr_space(mf, space);
-    if (ret) {
-        //printf("-D- Failed to set space!\n");
+    if (ret)
+    {
+        // printf("-D- Failed to set space!\n");
         goto cleanup;
     }
     // read/write the data
@@ -531,80 +587,86 @@ static int _send_pci_cmd_int(mfile *mf, int space, unsigned int offset,
     return ret;
 }
 
-static int _block_op(mfile *mf, int space, unsigned int offset, int size,
-                     uint32_t *data, int rw)
+static int _block_op(mfile* mf, int space, unsigned int offset, int size, uint32_t* data, int rw)
 {
     int i;
     int ret = 0;
     int wrote_or_read = size;
-    if (size % 4) {
+    if (size % 4)
+    {
         return -1;
     }
     // lock semaphore and set address space
     ret = _vendor_specific_sem(mf, 1);
-    if (ret) {
+    if (ret)
+    {
         return -1;
     }
     // set address space
     ret = _set_addr_space(mf, space);
-    if (ret) {
+    if (ret)
+    {
         wrote_or_read = -1;
         goto cleanup;
     }
-    for (i = 0; i < size; i += 4) {
-        if (_pciconf_rw(mf, offset + i, &(data[(i >> 2)]), rw)) {
+    for (i = 0; i < size; i += 4)
+    {
+        if (_pciconf_rw(mf, offset + i, &(data[(i >> 2)]), rw))
+        {
             wrote_or_read = i;
             goto cleanup;
         }
     }
-cleanup: _vendor_specific_sem(mf, 0);
+cleanup:
+    _vendor_specific_sem(mf, 0);
     return wrote_or_read;
 }
 
-static int mwrite4_new(mfile *mf, unsigned int offset, uint32_t data)
+static int mwrite4_new(mfile* mf, unsigned int offset, uint32_t data)
 {
     int ret;
 
     ret = _send_pci_cmd_int(mf, mf->address_space, offset, &data, WRITE_OP);
-    if (ret) {
+    if (ret)
+    {
         return -1;
     }
     return 4;
 }
 
-static int mread4_new(mfile *mf, unsigned int offset, uint32_t *data)
+static int mread4_new(mfile* mf, unsigned int offset, uint32_t* data)
 {
     int ret;
 
     ret = _send_pci_cmd_int(mf, mf->address_space, offset, data, READ_OP);
-    if (ret) {
+    if (ret)
+    {
         return -1;
     }
     return 4;
 }
 
-static int mwrite4_block_new(mfile *mf, unsigned int offset, int size,
-                             uint32_t *data)
+static int mwrite4_block_new(mfile* mf, unsigned int offset, int size, uint32_t* data)
 {
     return _block_op(mf, mf->address_space, offset, size, data, WRITE_OP);
 }
 
-static int mread4_block_new(mfile *mf, unsigned int offset, int size,
-                            uint32_t *data)
+static int mread4_block_new(mfile* mf, unsigned int offset, int size, uint32_t* data)
 {
     return _block_op(mf, mf->address_space, offset, size, data, READ_OP);
 }
 
-static int vsec_spaces_supported(mfile *mf)
+static int vsec_spaces_supported(mfile* mf)
 {
     // take semaphore
     int supported = 1;
     int ret = _vendor_specific_sem(mf, 1);
-    if (ret) {
+    if (ret)
+    {
         return supported;
     }
-    if (_set_addr_space(mf, AS_CR_SPACE) || _set_addr_space(mf, AS_ICMD)
-        || _set_addr_space(mf, AS_SEMAPHORE)) {
+    if (_set_addr_space(mf, AS_CR_SPACE) || _set_addr_space(mf, AS_ICMD) || _set_addr_space(mf, AS_SEMAPHORE))
+    {
         supported = 0;
     }
     // clear semaphore
@@ -616,55 +678,66 @@ static int vsec_spaces_supported(mfile *mf)
  * End of Capabilities section
  */
 
-
 /*
  * Open Mellanox Software tools (mst) driver. Device type==INFINIHOST
  * Return valid mfile ptr or 0 on failure
  */
 
-int device_exists(const char *devname);
+int device_exists(const char* devname);
 
 #if __FreeBSD_version > 700000
-int getsel(const char *str, struct pcisel *selout)
+int getsel(const char* str, struct pcisel* selout)
 {
-    char *ep = strchr(str, '@');
-    char *epbase;
+    char* ep = strchr(str, '@');
+    char* epbase;
     struct pcisel sel;
     unsigned long selarr[4];
     int i;
-    //printf("__FreeBSD_version > 700000 detected.\n");
+    // printf("__FreeBSD_version > 700000 detected.\n");
 
-    if (ep == NULL) {
-        ep = (char *)str;
-    } else {
+    if (ep == NULL)
+    {
+        ep = (char*)str;
+    }
+    else
+    {
         ep++;
     }
 
     epbase = ep;
 
-    if (strncmp(ep, "pci", 3) == 0) {
+    if (strncmp(ep, "pci", 3) == 0)
+    {
         ep += 3;
         i = 0;
-        do {
+        do
+        {
             selarr[i++] = strtoul(ep, &ep, 10);
         } while ((*ep == ':' || *ep == '.') && *++ep != '\0' && i < 4);
 
-        if (i > 2) {
+        if (i > 2)
+        {
             sel.pc_func = selarr[--i];
-        } else {
+        }
+        else
+        {
             sel.pc_func = 0;
         }
         sel.pc_dev = selarr[--i];
         sel.pc_bus = selarr[--i];
-        if (i > 0) {
+        if (i > 0)
+        {
             sel.pc_domain = selarr[--i];
-        } else {
+        }
+        else
+        {
             sel.pc_domain = 0;
         }
     }
-    if (*ep != '\x0' || ep == epbase) {
+    if (*ep != '\x0' || ep == epbase)
+    {
         return 1;
-        //errx(1, "cannot parse selector %s ep:'%s' epbase:%s, %d", str, ep, epbase, *ep);
+        // errx(1, "cannot parse selector %s ep:'%s' epbase:%s, %d", str, ep, epbase, *ep);
     }
 
     *selout = sel;
@@ -672,44 +745,54 @@ int getsel(const char *str, struct pcisel *selout)
     return 0;
 }
 #else
-int getsel(const char *str, struct pcisel *selout)
+int getsel(const char* str, struct pcisel* selout)
 {
-    char *ep = strchr(str, '@');
-    char *epbase;
+    char* ep = strchr(str, '@');
+    char* epbase;
     struct pcisel sel;
 
-    //printf("__FreeBSD_version < 700000 detected: %d\n", __FreeBSD_version);
+    // printf("__FreeBSD_version < 700000 detected: %d\n", __FreeBSD_version);
 
-    if (ep == NULL) {
-        ep = (char *) str;
-    } else {
+    if (ep == NULL)
+    {
+        ep = (char*)str;
+    }
+    else
+    {
         ep++;
     }
 
     epbase = ep;
 
-    if (strncmp(ep, "pci", 3) == 0) {
+    if (strncmp(ep, "pci", 3) == 0)
+    {
         ep += 3;
         sel.pc_bus = strtoul(ep, &ep, 0);
-        if (!ep || *ep++ != ':') {
+        if (!ep || *ep++ != ':')
+        {
             errno = EINVAL;
             return 1;
-            //errx(1, "cannot parse selector %s", str);
+            // errx(1, "cannot parse selector %s", str);
         }
         sel.pc_dev = strtoul(ep, &ep, 0);
-        if (!ep || *ep != ':') {
+        if (!ep || *ep != ':')
+        {
             sel.pc_func = 0;
-        } else {
+        }
+        else
+        {
             ep++;
             sel.pc_func = strtoul(ep, &ep, 0);
         }
-        if (*ep == ':') {
+        if (*ep == ':')
+        {
             ep++;
         }
     }
-    if (*ep != '\x0' || ep == epbase) {
+    if (*ep != '\x0' || ep == epbase)
+    {
         return 1;
-        //errx(1, "cannot parse selector %s", str);
+        // errx(1, "cannot parse selector %s", str);
     }
 
     *selout = sel;
@@ -718,125 +801,144 @@ int getsel(const char *str, struct pcisel *selout)
 }
 #endif
 
-int mtcr_open_config(mfile *mf, const char *name)
+int mtcr_open_config(mfile* mf, const char* name)
 {
-    //printf("open_config %s %s mf:%p\n", name, _PATH_DEVPCI, mf);
+    // printf("open_config %s %s mf:%p\n", name, _PATH_DEVPCI, mf);
 
-    if (!mf) {
+    if (!mf)
+    {
         printf("Internal: Uninitialized mfile\n");
         exit(1);
     }
 
     mf->fd = open(_PATH_DEVPCI, O_RDWR, 0);
-    if (mf->fd < 0) {
+    if (mf->fd < 0)
+    {
         printf("err opening: %s", _PATH_DEVPCI);
         return -1;
     }
 
-    //printf("open_config name:%s fd:%d\n", name, mf->fd);
+    // printf("open_config name:%s fd:%d\n", name, mf->fd);
     int ret = getsel(name, &mf->sel);
-    //printf("open_config getsel done %d\n", mf->sel.pc_dev);
+    // printf("open_config getsel done %d\n", mf->sel.pc_dev);
     mf->tp = MST_PCICONF;
 
     return ret;
 }
 
-mfile* mopen_int(const char *name, u_int32_t adv_opt)
+mfile* mopen_int(const char* name, u_int32_t adv_opt)
 {
-    char *real_name = (char *)name;
+    char* real_name = (char*)name;
     int is_cable = 0;
 #ifndef MST_UL
     int port = 0;
 #endif
-    if (getuid() != 0) {
+    if (getuid() != 0)
+    {
         errno = EACCES;
         return NULL;
     }
-    //printf("%s: open %s\n", __FUNCTION__, name);
+    // printf("%s: open %s\n", __FUNCTION__, name);
 #ifndef MST_UL
     char tmp_name[512] = {0};
-    char *p_cable = strstr(name, "_cable");
-    if (p_cable != 0) {
+    char* p_cable = strstr(name, "_cable");
+    if (p_cable != 0)
+    {
         strncpy(tmp_name, name, 512 - 1);
         tmp_name[p_cable - name] = 0;
         is_cable = 1;
         real_name = tmp_name;
 
-        //printf("-D- splitting name: %s\n", real_name);
-        if (strstr(p_cable + 1, "_") != NULL) {
+        // printf("-D- splitting name: %s\n", real_name);
+        if (strstr(p_cable + 1, "_") != NULL)
+        {
             p_cable += 7;
-            if (*p_cable != '\0') {
+            if (*p_cable != '\0')
+            {
                 port = atoi(p_cable);
             }
         }
     }
 #endif
-    if (!device_exists(real_name)) {
+    if (!device_exists(real_name))
+    {
         errno = ENOENT;
         return NULL;
     }
-    mfile *mf = malloc(sizeof(mfile));
+    mfile* mf = malloc(sizeof(mfile));
     memset(mf, 0, sizeof(mfile));
-    if (!mf) {
+    if (!mf)
+    {
         return NULL;
     }
     mf->sock = -1;
     mf->user_page_list.page_amount = 0;
 
     mf->flags = MDEVS_TAVOR_CR;
-    if (!mtcr_open_config(mf, real_name)) {
+    if (!mtcr_open_config(mf, real_name))
+    {
         _create_lock(mf, real_name);
         mf->wo_addr = is_wo_pciconf_gw(mf);
-        //printf("-D- is_wo_pciconf_gw: %d\n", mf->wo_addr);
+        // printf("-D- is_wo_pciconf_gw: %d\n", mf->wo_addr);
         mf->vsec_addr = pci_find_capability(mf, MLNX_VENDOR_SPECIFIC_CAP_ID);
         mf->vpd_cap_addr = pci_find_capability(mf, PCI_CAP_ID_VPD);
         mf->is_cable = is_cable;
         mf->vsec_supp = 0;
-        if (mf->vsec_addr) {
-            if (adv_opt & Clear_Vsec_Semaphore) {
+        if (mf->vsec_addr)
+        {
+            if (adv_opt & Clear_Vsec_Semaphore)
+            {
                 _vendor_specific_sem(mf, 0);
             }
             mf->vsec_supp = vsec_spaces_supported(mf);
             mf->address_space = AS_CR_SPACE;
         }
-        //printf("mtcr_open_config Succeeded VSEC_SUPP: %d\n", mf->vsec_supp);
+        // printf("mtcr_open_config Succeeded VSEC_SUPP: %d\n", mf->vsec_supp);
 #ifndef MST_UL
-        if (mf->is_cable) {
+        if (mf->is_cable)
+        {
             mf->flags = MDEVS_CABLE;
             mf->dl_context = mtcr_utils_load_dl_ctx(DL_CABLES);
-            dl_handle_t *hdl = (dl_handle_t *)mf->dl_context;
-            if (!hdl || !hdl->mcables.mcables_open || hdl->mcables.mcables_open(mf, port)) {
+            dl_handle_t* hdl = (dl_handle_t*)mf->dl_context;
+            if (!hdl || !hdl->mcables.mcables_open || hdl->mcables.mcables_open(mf, port))
+            {
                 mclose(mf);
                 return 0;
             }
         }
 #endif
         return mf;
-    } else {
-        //printf("mtcr_open_config failed\n");
+    }
+    else
+    {
+        // printf("mtcr_open_config failed\n");
         errno = ENOENT;
         free(mf);
         return NULL;
     }
 }
 
-mfile* mopen(const char *name)
+mfile* mopen(const char* name)
 {
     return mopen_adv(name, MST_DEFAULT);
 }
-mfile* mopend(char const *name, DType dtype)
+mfile* mopend(char const* name, DType dtype)
 {
     (void)dtype;
     return mopen_int(name, 0);
 }
 
-mfile* mopen_adv(const char *name, MType mtype)
+mfile* mopen_adv(const char* name, MType mtype)
 {
-    mfile *mf = mopend(name, MST_TAVOR);
-    if (mf) {
-        if (mf->tp & mtype) {
+    mfile* mf = mopend(name, MST_TAVOR);
+    if (mf)
+    {
+        if (mf->tp & mtype)
+        {
             return mf;
-        } else {
+        }
+        else
+        {
             errno = EPERM;
             mclose(mf);
             return NULL;
@@ -845,7 +947,7 @@ mfile* mopen_adv(const char *name, MType mtype)
     return mf;
 }
 
-mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *dma_func, void *extra_data)
+mfile* mopen_fw_ctx(void* fw_cmd_context, void* fw_cmd_func, void* dma_func, void* extra_data)
 {
     // not relevant for freebsd
     (void)fw_cmd_context;
@@ -859,31 +961,36 @@ mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *dma_func, voi
  * Close Mellanox driver
  * req. descriptor
  */
-int mclose(mfile *mf)
+int mclose(mfile* mf)
 {
-    if (!mf) {
+    if (!mf)
+    {
         return 0;
     }
 #ifndef MST_UL
-    if (mf->tp == MST_CABLE) {
+    if (mf->tp == MST_CABLE)
+    {
         int ret = -1;
         CALL_DL_FUNC(mcables, mcables_close, ret, mf);
-        if (ret != -1) {
+        if (ret != -1)
+        {
             mtcr_utils_free_dl_ctx(mf->dl_context);
         }
     }
 #endif
-    //printf("closing\n");
+    // printf("closing\n");
     close(mf->fd);
-    if (mf->fdlock) {
+    if (mf->fdlock)
+    {
         close(mf->fdlock);
     }
 
-    if(mf->user_page_list.page_amount) {
+    if (mf->user_page_list.page_amount)
+    {
         release_dma_pages(mf, mf->user_page_list.page_amount);
     }
 
-    //printf("freeing\n");
+    // printf("freeing\n");
     free(mf);
     return 0;
 }
@@ -893,53 +1000,63 @@ int mclose(mfile *mf)
 /*
  * Read 4 bytes, return number of succ. read bytes or -1 on failure
  */
-int mread4_old(mfile *mf, unsigned int offset, u_int32_t *value)
+int mread4_old(mfile* mf, unsigned int offset, u_int32_t* value)
 {
     int rc;
     offset = __cpu_to_le32(offset);
-    if (mf->wo_addr) {
+    if (mf->wo_addr)
+    {
         offset |= 0x1;
     }
 
     int lock_rc;
     lock_rc = _flock_int(mf->fdlock, LOCK_EX);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         return 0;
     }
-    rc = write_config(mf, PCI_CONF_ADDR, (unsigned long) offset, 4);
-    if (rc) {
+    rc = write_config(mf, PCI_CONF_ADDR, (unsigned long)offset, 4);
+    if (rc)
+    {
         goto cleanup;
     }
 
     rc = read_config(mf, PCI_CONF_DATA, value, 4);
 
-    if (rc) {
+    if (rc)
+    {
         goto cleanup;
     }
 
     *value = __le32_to_cpu(*value);
 cleanup:
     lock_rc = _flock_int(mf->fdlock, LOCK_UN);
-    if (lock_rc || rc) {
+    if (lock_rc || rc)
+    {
         return 0;
     }
     return 4;
 }
 
-int mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
 #ifndef MST_UL
-    if (mf->tp == MST_CABLE) {
+    if (mf->tp == MST_CABLE)
+    {
         int rc = 0;
         CALL_DL_FUNC(mcables, mcables_read4, rc, mf, offset, value);
-        if (!rc) {
+        if (!rc)
+        {
             return 4;
-        } else {
+        }
+        else
+        {
             return -1;
         }
     }
 #endif
-    if (mf->vsec_supp) {
+    if (mf->vsec_supp)
+    {
         return mread4_new(mf, offset, value);
     }
     return mread4_old(mf, offset, value);
@@ -948,7 +1065,7 @@ int mread4(mfile *mf, unsigned int offset, u_int32_t *value)
 /*
  * HACK- Only to pass freebsd compilation
  */
-int mread64(mfile *mf, unsigned int offset, void *data, int length)
+int mread64(mfile* mf, unsigned int offset, void* data, int length)
 {
     (void)mf;
     (void)offset;
@@ -960,7 +1077,7 @@ int mread64(mfile *mf, unsigned int offset, void *data, int length)
 /*
  * HACK- Only to pass freebsd compilation
  */
-int mwrite64(mfile *mf, unsigned int offset, void *data, int length)
+int mwrite64(mfile* mf, unsigned int offset, void* data, int length)
 {
     (void)mf;
     (void)offset;
@@ -969,13 +1086,13 @@ int mwrite64(mfile *mf, unsigned int offset, void *data, int length)
     return -1;
 }
 
-//read_config(int fd, struct pcisel *sel, unsigned long reg, int width);
-//write_config(mf->fd, int fd, struct pcisel *sel, unsigned long reg, unsigned long data, int width)
+// read_config(int fd, struct pcisel *sel, unsigned long reg, int width);
+// write_config(mf->fd, int fd, struct pcisel *sel, unsigned long reg, unsigned long data, int width)
 
 /*
  * Write 4 bytes, return number of succ. written bytes or -1 on failure
  */
-int mwrite4_old(mfile *mf, unsigned int offset, u_int32_t value)
+int mwrite4_old(mfile* mf, unsigned int offset, u_int32_t value)
 {
     int rc;
 
@@ -984,153 +1101,176 @@ int mwrite4_old(mfile *mf, unsigned int offset, u_int32_t value)
 
     int lock_rc;
     lock_rc = _flock_int(mf->fdlock, LOCK_EX);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         return 0;
     }
-    if (mf->wo_addr) {
-        rc = write_config(mf, PCI_CONF_DATA, (unsigned long) value, 4);
-        if (rc) {
+    if (mf->wo_addr)
+    {
+        rc = write_config(mf, PCI_CONF_DATA, (unsigned long)value, 4);
+        if (rc)
+        {
             goto cleanup;
         }
-        rc = write_config(mf, PCI_CONF_ADDR, (unsigned long) offset, 4);
-        if (rc) {
+        rc = write_config(mf, PCI_CONF_ADDR, (unsigned long)offset, 4);
+        if (rc)
+        {
             goto cleanup;
         }
-    } else {
-        rc = write_config(mf, PCI_CONF_ADDR, (unsigned long) offset, 4);
-        if (rc) {
+    }
+    else
+    {
+        rc = write_config(mf, PCI_CONF_ADDR, (unsigned long)offset, 4);
+        if (rc)
+        {
             goto cleanup;
         }
-        rc = write_config(mf, PCI_CONF_DATA, (unsigned long) value, 4);
-        if (rc) {
+        rc = write_config(mf, PCI_CONF_DATA, (unsigned long)value, 4);
+        if (rc)
+        {
             goto cleanup;
         }
     }
 
 cleanup:
     lock_rc = _flock_int(mf->fdlock, LOCK_UN);
-    if (lock_rc || rc) {
+    if (lock_rc || rc)
+    {
         return 0;
     }
     return 4;
 }
 
-int mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
 #ifndef MST_UL
-    if (mf->tp == MST_CABLE) {
+    if (mf->tp == MST_CABLE)
+    {
         int rc = 0;
         CALL_DL_FUNC(mcables, mcables_write4, rc, mf, offset, value);
-        if (!rc) {
+        if (!rc)
+        {
             return 4;
-        } else {
+        }
+        else
+        {
             return -1;
         }
     }
 #endif
-    if (mf->vsec_supp) {
+    if (mf->vsec_supp)
+    {
         return mwrite4_new(mf, offset, value);
     }
     return mwrite4_old(mf, offset, value);
 }
 //////////// NEW   ////////////////////
 
-static int mread_chunk_as_multi_mread4(mfile *mf, unsigned int offset,
-                                       void *data, int length)
+static int mread_chunk_as_multi_mread4(mfile* mf, unsigned int offset, void* data, int length)
 {
     int i;
-    if (length % 4) {
+    if (length % 4)
+    {
         return -EINVAL;
     }
-    for (i = 0; i < length; i += 4) {
+    for (i = 0; i < length; i += 4)
+    {
         u_int32_t value;
-        if (mread4(mf, offset + i, &value) != 4) {
+        if (mread4(mf, offset + i, &value) != 4)
+        {
             return -1;
         }
-        memcpy((char *) data + i, &value, 4);
+        memcpy((char*)data + i, &value, 4);
     }
     return length;
 }
 
-static int mwrite_chunk_as_multi_mwrite4(mfile *mf, unsigned int offset,
-                                         void *data, int length)
+static int mwrite_chunk_as_multi_mwrite4(mfile* mf, unsigned int offset, void* data, int length)
 {
     int i;
-    if (length % 4) {
+    if (length % 4)
+    {
         return -EINVAL;
     }
-    for (i = 0; i < length; i += 4) {
+    for (i = 0; i < length; i += 4)
+    {
         u_int32_t value;
-        memcpy(&value, (char *) data + i, 4);
-        if (mwrite4(mf, offset + i, value) != 4) {
+        memcpy(&value, (char*)data + i, 4);
+        if (mwrite4(mf, offset + i, value) != 4)
+        {
             return -1;
         }
     }
     return length;
 }
 
-int mread4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mread4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
     int rc = byte_len;
 #ifndef MST_UL
-    if (mf->tp == MST_CABLE) {
+    if (mf->tp == MST_CABLE)
+    {
         int ret = 0;
         CALL_DL_FUNC(mcables, mcables_read4_block, ret, mf, offset, data, byte_len);
-        if (ret != 0) {
+        if (ret != 0)
+        {
             rc -= ret; // Return less than byte_len to ensure error in reading
         }
         return rc;
     }
 #endif
-    if (mf->vsec_supp) {
+    if (mf->vsec_supp)
+    {
         int rc = mread4_block_new(mf, offset, byte_len, data);
-        //printf("-D- MREAD BLOCK LEN: %d, RC: %d\n", byte_len, rc);
+        // printf("-D- MREAD BLOCK LEN: %d, RC: %d\n", byte_len, rc);
         return rc;
     }
     rc = mread_chunk_as_multi_mread4(mf, offset, data, byte_len);
     return rc;
 }
 
-int mwrite4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mwrite4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
     int rc = byte_len;
 #ifndef MST_UL
-    if (mf->tp == MST_CABLE) {
+    if (mf->tp == MST_CABLE)
+    {
         int ret = 0;
         CALL_DL_FUNC(mcables, mcables_write4_block, ret, mf, offset, data, byte_len);
-        if (ret != 0) {
+        if (ret != 0)
+        {
             rc -= ret; // Return less than byte_len to ensure error in reading
         }
         return rc;
     }
 #endif
-    if (mf->vsec_supp) {
+    if (mf->vsec_supp)
+    {
         return mwrite4_block_new(mf, offset, byte_len, data);
     }
     rc = mwrite_chunk_as_multi_mwrite4(mf, offset, data, byte_len);
     return rc;
 }
 
-int msw_reset(mfile *mf)
+int msw_reset(mfile* mf)
 {
     (void)mf;
     return -1;
 }
 
-int mhca_reset(mfile *mf)
+int mhca_reset(mfile* mf)
 {
     (void)mf;
     return -1;
 }
 
-int mi2c_detect(mfile *mf, u_int8_t slv_arr[SLV_ADDRS_NUM])
+int mi2c_detect(mfile* mf, u_int8_t slv_arr[SLV_ADDRS_NUM])
 {
     (void)mf;
     (void)slv_arr;
     return 1;
 }
-int mread_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
-                   unsigned int offset, void *data, int length)
+int mread_i2cblock(mfile* mf, unsigned char i2c_slave, u_int8_t addr_width, unsigned int offset, void* data, int length)
 {
     (void)mf;
     (void)i2c_slave;
@@ -1141,8 +1281,7 @@ int mread_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
     return 0;
 }
 
-int mwrite_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
-                    unsigned int offset, void *data, int length)
+int mwrite_i2cblock(mfile* mf, unsigned char i2c_slave, u_int8_t addr_width, unsigned int offset, void* data, int length)
 {
     (void)mf;
     (void)i2c_slave;
@@ -1153,35 +1292,36 @@ int mwrite_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
     return 0;
 }
 
-static void fix_endianness(u_int32_t *buf, int len)
+static void fix_endianness(u_int32_t* buf, int len)
 {
     int i;
 
-    for (i = 0; i < (len / 4); ++i) {
-        //printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
+    for (i = 0; i < (len / 4); ++i)
+    {
+        // printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
         buf[i] = __be32_to_cpu(buf[i]);
-        //printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
+        // printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
     }
 }
 
-int mread_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mread_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
     int rc;
-    rc = mread4_block(mf, offset, (u_int32_t *) data, byte_len);
-    fix_endianness((u_int32_t *) data, byte_len);
+    rc = mread4_block(mf, offset, (u_int32_t*)data, byte_len);
+    fix_endianness((u_int32_t*)data, byte_len);
     return rc;
-
 }
 
-int mwrite_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mwrite_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
-    fix_endianness((u_int32_t *) data, byte_len);
-    return mwrite4_block(mf, offset, (u_int32_t *) data, byte_len);
+    fix_endianness((u_int32_t*)data, byte_len);
+    return mwrite4_block(mf, offset, (u_int32_t*)data, byte_len);
 }
 
-int mget_mdevs_flags(mfile *mf, u_int32_t *devs_flags)
+int mget_mdevs_flags(mfile* mf, u_int32_t* devs_flags)
 {
-    if (mf == NULL || devs_flags == NULL) {
+    if (mf == NULL || devs_flags == NULL)
+    {
         errno = -EINVAL;
         return 1;
     }
@@ -1190,9 +1330,10 @@ int mget_mdevs_flags(mfile *mf, u_int32_t *devs_flags)
     return 0;
 }
 
-int mget_mdevs_type(mfile *mf, u_int32_t *mtype)
+int mget_mdevs_type(mfile* mf, u_int32_t* mtype)
 {
-    if (mf == NULL || mtype == NULL) {
+    if (mf == NULL || mtype == NULL)
+    {
         errno = -EINVAL;
         return 1;
     }
@@ -1201,21 +1342,25 @@ int mget_mdevs_type(mfile *mf, u_int32_t *mtype)
     return 0;
 }
 
-unsigned char mset_i2c_slave(mfile *mf, unsigned char new_i2c_slave)
+unsigned char mset_i2c_slave(mfile* mf, unsigned char new_i2c_slave)
 {
     unsigned char ret;
-    if (mf) {
+    if (mf)
+    {
         ret = mf->i2c_slave;
         mf->i2c_slave = new_i2c_slave;
-    } else {
+    }
+    else
+    {
         ret = 0xff;
     }
     return ret;
 }
 
-int mget_i2c_slave(mfile *mf, unsigned char *new_i2c_slave_p)
+int mget_i2c_slave(mfile* mf, unsigned char* new_i2c_slave_p)
 {
-    if (mf) {
+    if (mf)
+    {
         *new_i2c_slave_p = mf->i2c_slave;
         return 0;
     }
@@ -1225,32 +1370,37 @@ int mget_i2c_slave(mfile *mf, unsigned char *new_i2c_slave_p)
 #define MLX_DEV_PREFIX1 "mlx4_core"
 #define MLX_DEV_PREFIX2 "mlx5_core"
 
-static int get_device_ids(const char *dev_name, dev_info *dinfo)
+static int get_device_ids(const char* dev_name, dev_info* dinfo)
 {
-    mfile *mf = mopen(dev_name);
+    mfile* mf = mopen(dev_name);
     int rc = 0;
     u_int32_t buf = 0;
-    if (!mf) {
+    if (!mf)
+    {
         return 1;
     }
 
     int lock_rc = _flock_int(mf->fdlock, LOCK_EX);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         return 1;
     }
     rc = read_config(mf, PCI_HEADER_OFFS, &buf, 4);
-    if (rc) {
+    if (rc)
+    {
         goto exit;
     }
     dinfo->pci.vend_id = EXTRACT(buf, 0, 16);
     dinfo->pci.dev_id = EXTRACT(buf, 16, 16);
     rc = read_config(mf, PCI_CLASS_OFFS, &buf, 4);
-    if (rc) {
+    if (rc)
+    {
         goto exit;
     }
     dinfo->pci.class_id = EXTRACT(buf, 8, 24);
     rc = read_config(mf, PCI_SUBSYS_OFFS, &buf, 4);
-    if (rc) {
+    if (rc)
+    {
         goto exit;
     }
     dinfo->pci.subsys_vend_id = EXTRACT(buf, 0, 16);
@@ -1259,97 +1409,119 @@ static int get_device_ids(const char *dev_name, dev_info *dinfo)
 exit:
     lock_rc = _flock_int(mf->fdlock, LOCK_UN);
     mclose(mf);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         return 1;
     }
     return rc;
 }
-static int get_dev_dbdf(const char *dev_name, unsigned int *domain,
-                        unsigned int *bus, unsigned int *dev, unsigned int *func)
+static int
+  get_dev_dbdf(const char* dev_name, unsigned int* domain, unsigned int* bus, unsigned int* dev, unsigned int* func)
 {
-    char *dbdf_str = strstr(dev_name, "pci");
+    char* dbdf_str = strstr(dev_name, "pci");
     int rc = 0;
-    if (!dbdf_str) {
+    if (!dbdf_str)
+    {
         return 1;
     }
     rc = sscanf(dbdf_str, "pci%u:%u:%u:%u", domain, bus, dev, func);
-    if (rc != 4) {
+    if (rc != 4)
+    {
         return 1;
     }
     return 0;
 }
 
-int get_device_flags(const char *name)
+int get_device_flags(const char* name)
 {
     int mask = 0;
     mask = MDEVS_TAVOR_CR;
-    if (strstr(name, "cable")) {
+    if (strstr(name, "cable"))
+    {
         mask = MDEVS_CABLE;
     }
     return mask;
 }
 
-#define CABLES_DIR   "/etc/mft/cables"
-#define PUTC(c) do {     \
+#define CABLES_DIR "/etc/mft/cables"
+#define PUTC(c)            \
+    do                     \
+    {                      \
         *p++ = (c);        \
-        if (++cnt >= len) { \
-            closedir(dir);  \
-            return -1;      \
-        } } while (0)
-#define PUTS(s) do { for (i = 0; (s)[i]; i++) { PUTC((s)[i]); } } while (0)
-
+        if (++cnt >= len)  \
+        {                  \
+            closedir(dir); \
+            return -1;     \
+        }                  \
+    } while (0)
+#define PUTS(s)                  \
+    do                           \
+    {                            \
+        for (i = 0; (s)[i]; i++) \
+        {                        \
+            PUTC((s)[i]);        \
+        }                        \
+    } while (0)
 
-int mdevices_v(char *buf, int len, int mask, int verbosity)
+int mdevices_v(char* buf, int len, int mask, int verbosity)
 {
     int i;
     int s, b, d, f, tmp;
     int rc = 0;
     int cnt = 0;
-    FILE *fp;
+    FILE* fp;
     char dev_line[1035];
-    char *p = buf;
-    if (mask & MDEVS_TAVOR_CR) {
+    char* p = buf;
+    if (mask & MDEVS_TAVOR_CR)
+    {
         /* Get all Mellanox devices - this cmd will return the needed devices one in every line */
         fp =
-            popen(
-                "pciconf -lv | grep -B 1 Mellanox | grep pci | cut -f1 | cut -f2 -d \"@\" | cut -f1-4 -d \":\"",
-                "r");
-        if (fp == NULL) {
+          popen("pciconf -lv | grep -B 1 Mellanox | grep pci | cut -f1 | cut -f2 -d \"@\" | cut -f1-4 -d \":\"", "r");
+        if (fp == NULL)
+        {
             return -1;
         }
 
         /* Read the output one line at a time */
-        while (fgets(dev_line, sizeof(dev_line) - 1, fp) != NULL) {
+        while (fgets(dev_line, sizeof(dev_line) - 1, fp) != NULL)
+        {
             tmp = sscanf(dev_line, "pci%d:%d:%d:%d\n", &s, &b, &d, &f);
             (void)tmp; // TODO: check sscanf ret value
-            if (!verbosity && f != 0) {
+            if (!verbosity && f != 0)
+            {
                 continue;
             }
-            for (i = 0; !(dev_line[i] == '\n'); i++) {
+            for (i = 0; !(dev_line[i] == '\n'); i++)
+            {
                 *p++ = dev_line[i];
-                if (++cnt >= len) {
+                if (++cnt >= len)
+                {
                     pclose(fp);
                     return -1;
                 }
             }
             *p++ = 0; /* terminate device */
-            rc++; /* increament the device count */
+            rc++;     /* increament the device count */
         }
         /* close */
         pclose(fp);
     }
-    if (mask & MDEVS_CABLE) {
+    if (mask & MDEVS_CABLE)
+    {
         /*
          * Get cables
          */
-        DIR           *dir = opendir(CABLES_DIR);
-        struct dirent *dirent;
-        if (dir != NULL) {
+        DIR* dir = opendir(CABLES_DIR);
+        struct dirent* dirent;
+        if (dir != NULL)
+        {
             dirent = readdir(dir);
-            while (dirent != NULL) {
-                char *name = dirent->d_name;
+            while (dirent != NULL)
+            {
+                char* name = dirent->d_name;
                 /* According to mask */
-                if (get_device_flags(name) & MDEVS_CABLE) {
+                if (get_device_flags(name) & MDEVS_CABLE)
+                {
                     PUTS(name);
                     PUTC('\0');
                     rc++;
@@ -1362,65 +1534,80 @@ int mdevices_v(char *buf, int len, int mask, int verbosity)
     return rc;
 }
 
-int mdevices(char *buf, int len, int mask)
+int mdevices(char* buf, int len, int mask)
 {
     return mdevices_v(buf, len, mask, 0);
 }
 
-
-
-static void remove_newline_chars(char *str)
+static void remove_newline_chars(char* str)
 {
     int i;
-    for (i = strlen(str) - 1; i >= 0 && (str[i] == '\n' || str[i] == '\r'); i--) {
+    for (i = strlen(str) - 1; i >= 0 && (str[i] == '\n' || str[i] == '\r'); i--)
+    {
         str[i] = '\0';
     }
 }
 
 // replace with a new string
 // free the old one
-static char *manipulate_ib_dev_line(char *line)
+static char* manipulate_ib_dev_line(char* line)
 {
-    if (!line) {
+    if (!line)
+    {
         return NULL;
     }
-    char *old_str = line;
-    char *new_str = NULL;
+    char* old_str = line;
+    char* new_str = NULL;
 
-    while (*line != '.') {
-        if (!(*line)) {
+    while (*line != '.')
+    {
+        if (!(*line))
+        {
             goto cleanup;
         }
         line++;
     }
     line++;
 
-    char *end = line;
-    char *num = NULL;
+    char* end = line;
+    char* num = NULL;
     int count_dots = 0;
-    while (1) {
-        if (!(*end)) {
+    while (1)
+    {
+        if (!(*end))
+        {
             goto cleanup;
-        } else if (*end == '.') {
-            if (count_dots) {
+        }
+        else if (*end == '.')
+        {
+            if (count_dots)
+            {
                 *end = '\0';
                 break;
-            } else {
+            }
+            else
+            {
                 count_dots++;
-                if (*(end+1)) {
+                if (*(end + 1))
+                {
                     num = end + 1;
-                } else {
+                }
+                else
+                {
                     goto cleanup;
                 }
             }
-        } else if (*end == '_') {
-            *(end+1) = '\0';
+        }
+        else if (*end == '_')
+        {
+            *(end + 1) = '\0';
         }
         end++;
     }
     line = strcat(line, num);
-    new_str = (char *)malloc(strlen(line) + 1);
-    if (!new_str) {
+    new_str = (char*)malloc(strlen(line) + 1);
+    if (!new_str)
+    {
         errno = ENOMEM;
         goto cleanup;
     }
@@ -1432,13 +1619,15 @@ static char *manipulate_ib_dev_line(char *line)
 }
 
 // number_of_first_entries_to_skip should be 0 for regular array destruction
-static void destroy_str_arr(char **arr, int number_of_first_entries_to_skip)
+static void destroy_str_arr(char** arr, int number_of_first_entries_to_skip)
 {
-    if (!arr) {
+    if (!arr)
+    {
         return;
     }
     int i;
-    for (i = number_of_first_entries_to_skip; arr[i]; i++) {
+    for (i = number_of_first_entries_to_skip; arr[i]; i++)
+    {
         free(arr[i]);
         arr[i] = NULL;
     }
@@ -1448,25 +1637,28 @@ static void destroy_str_arr(char **arr, int number_of_first_entries_to_skip)
 
 // copying file lines into a an array of char*, while manipulating each line with a special function (if supplied)
 // caller should destroy the array
-static char **file2array(FILE *fp, char *(*string_mainpulation_func_ptr)(char *))
+static char** file2array(FILE* fp, char* (*string_mainpulation_func_ptr)(char*))
 {
-    char *line = NULL;
+    char* line = NULL;
     size_t len = 0;
-    int lines_allocated = 8; //can realloc later
+    int lines_allocated = 8; // can realloc later
     int error = 0;
     int i = 0;
 
-    char **arr = (char **)malloc((lines_allocated + 1) * sizeof(char *));
-    if (!arr) {
+    char** arr = (char**)malloc((lines_allocated + 1) * sizeof(char*));
+    if (!arr)
+    {
         errno = ENOMEM;
         error = 1;
         goto cleanup;
     }
-    memset(arr, 0, (lines_allocated + 1) * sizeof(char *));
+    memset(arr, 0, (lines_allocated + 1) * sizeof(char*));
 
-    while (getline(&line, &len, fp) != -1) {
-        arr[i] = (char *)malloc(len * sizeof(char));
-        if (!arr[i]) {
+    while (getline(&line, &len, fp) != -1)
+    {
+        arr[i] = (char*)malloc(len * sizeof(char));
+        if (!arr[i])
+        {
             errno = ENOMEM;
             error = 1;
             goto cleanup;
@@ -1477,17 +1669,21 @@ static char **file2array(FILE *fp, char *(*string_mainpulation_func_ptr)(char *)
         len = 0;
 
         remove_newline_chars(arr[i]);
-        if (string_mainpulation_func_ptr) {
+        if (string_mainpulation_func_ptr)
+        {
             arr[i] = (*string_mainpulation_func_ptr)(arr[i]);
         }
-        if (!arr[i]) {
+        if (!arr[i])
+        {
             continue;
         }
         i++;
-        if (i >= lines_allocated) {
+        if (i >= lines_allocated)
+        {
             lines_allocated *= 2;
-            char **tmp = realloc(arr, (lines_allocated + 1) * sizeof(char *));
-            if (!tmp) {
+            char** tmp = realloc(arr, (lines_allocated + 1) * sizeof(char*));
+            if (!tmp)
+            {
                 errno = ENOMEM;
                 error = 1;
                 goto cleanup;
@@ -1498,13 +1694,16 @@ static char **file2array(FILE *fp, char *(*string_mainpulation_func_ptr)(char *)
 cleanup:
     // This is done so the caller can free all the array cells without knowing its size
     // Iterate until NULL termination
-    if(arr) {
+    if (arr)
+    {
         arr[i] = NULL;
     }
-    if (line) {
+    if (line)
+    {
         free(line);
     }
-    if (error || i == 0) {
+    if (error || i == 0)
+    {
         destroy_str_arr(arr, 0);
         return NULL;
     }
@@ -1515,158 +1714,185 @@ static char **file2array(FILE *fp, char *(*string_mainpulation_func_ptr)(char *)
 // Execute cmd and get output in a strings array, after desired output manipulation
 // via a speacial manipulation function (if supplied)
 // if there is relevant input to the special function pass it as well.
-static char **exec_cmd_get_output(char *cmd, char *(*string_mainpulation_func_ptr)(char *))
+static char** exec_cmd_get_output(char* cmd, char* (*string_mainpulation_func_ptr)(char*))
 {
-    char *wrapped_cmd = (char *)malloc(strlen(cmd) + strlen(" 2>/dev/null") + 2);
-    if (!wrapped_cmd) {
+    char* wrapped_cmd = (char*)malloc(strlen(cmd) + strlen(" 2>/dev/null") + 2);
+    if (!wrapped_cmd)
+    {
         return NULL;
     }
     sprintf(wrapped_cmd, "%s %s", cmd, " 2>/dev/null");
-    FILE *fp = popen(wrapped_cmd, "r");
+    FILE* fp = popen(wrapped_cmd, "r");
     free(wrapped_cmd);
-    if (!fp) {
+    if (!fp)
+    {
         return NULL;
     }
-    char **output = file2array(fp, string_mainpulation_func_ptr);
+    char** output = file2array(fp, string_mainpulation_func_ptr);
     pclose(fp);
     return output;
 }
 
-static char *exec_cmd_get_output_first_line(char *cmd, char *(*string_mainpulation_func_ptr)(char *))
+static char* exec_cmd_get_output_first_line(char* cmd, char* (*string_mainpulation_func_ptr)(char*))
 {
-    char **res = exec_cmd_get_output(cmd, string_mainpulation_func_ptr);
-    char *out = res[0];
+    char** res = exec_cmd_get_output(cmd, string_mainpulation_func_ptr);
+    char* out = res[0];
     destroy_str_arr(res, 1);
     return out;
 }
 
-static char **get_ports(char *ib_dev)
+static char** get_ports(char* ib_dev)
 {
-    char *cmd = (char *)malloc(strlen("sysctl sys.class.infiniband..ports | awk -F. '{print $6}' | uniq | sort") +
-            strlen(ib_dev) + 1);
-    if (!cmd) {
+    char* cmd = (char*)malloc(strlen("sysctl sys.class.infiniband..ports | awk -F. '{print $6}' | uniq | sort") +
+                              strlen(ib_dev) + 1);
+    if (!cmd)
+    {
         return NULL;
     }
     sprintf(cmd, "sysctl sys.class.infiniband.%s.ports | awk -F. '{print $6}' | uniq | sort", ib_dev);
-    char **out = exec_cmd_get_output(cmd, NULL);
+    char** out = exec_cmd_get_output(cmd, NULL);
     free(cmd);
     return out;
 }
 
-static char *get_link_layer(char *ib_dev, char *port)
+static char* get_link_layer(char* ib_dev, char* port)
 {
-    char *cmd = (char *)malloc(strlen("sysctl -n sys.class.infiniband..ports..link_layer") +
-            strlen(ib_dev) + strlen(port) + 1);
-    if (!cmd) {
+    char* cmd =
+      (char*)malloc(strlen("sysctl -n sys.class.infiniband..ports..link_layer") + strlen(ib_dev) + strlen(port) + 1);
+    if (!cmd)
+    {
         return NULL;
     }
     sprintf(cmd, "sysctl -n sys.class.infiniband.%s.ports.%s.link_layer", ib_dev, port);
-    char *out = exec_cmd_get_output_first_line(cmd, NULL);
+    char* out = exec_cmd_get_output_first_line(cmd, NULL);
     free(cmd);
     return out;
 }
 
-static char *get_eth_net_dev(char *ib_dev, char *port)
+static char* get_eth_net_dev(char* ib_dev, char* port)
 {
-    char *cmd = (char *)malloc(strlen("sysctl -n sysctl sys.class.infiniband..ports..gid_attrs.ndevs.0") +
-            strlen(ib_dev) + strlen(port) + 1);
-    if (!cmd) {
+    char* cmd = (char*)malloc(strlen("sysctl -n sysctl sys.class.infiniband..ports..gid_attrs.ndevs.0") +
+                              strlen(ib_dev) + strlen(port) + 1);
+    if (!cmd)
+    {
         return NULL;
     }
     sprintf(cmd, "sysctl -n sysctl sys.class.infiniband.%s.ports.%s.gid_attrs.ndevs.0", ib_dev, port);
-    char *out = exec_cmd_get_output_first_line(cmd, NULL);
+    char* out = exec_cmd_get_output_first_line(cmd, NULL);
     free(cmd);
     return out;
 }
 
-static char **get_ifcs()
+static char** get_ifcs()
 {
     return exec_cmd_get_output("ifconfig -l | tr \" \" \"\\n\"", NULL);
 }
 
-static char *get_gid(char *ib_dev, char *port)
+static char* get_gid(char* ib_dev, char* port)
 {
-    char *cmd = (char *)malloc(strlen("sysctl -n sys.class.infiniband..ports..gids.0 |"
-            " cut -b 21- | sed -e 's/://g'") + strlen(ib_dev) + strlen(port) + 1);
-    if (!cmd) {
+    char* cmd = (char*)malloc(strlen("sysctl -n sys.class.infiniband..ports..gids.0 |"
+                                     " cut -b 21- | sed -e 's/://g'") +
+                              strlen(ib_dev) + strlen(port) + 1);
+    if (!cmd)
+    {
         return NULL;
     }
     sprintf(cmd, "sysctl -n sys.class.infiniband.%s.ports.%s.gids.0 | cut -b 21- | sed -e 's/://g'", ib_dev, port);
-    char *out = exec_cmd_get_output_first_line(cmd, NULL);
+    char* out = exec_cmd_get_output_first_line(cmd, NULL);
     free(cmd);
     return out;
 }
 
-static char *lladdr_to_gid_format(char *lladdr)
+static char* lladdr_to_gid_format(char* lladdr)
 {
-    if (!lladdr) {
+    if (!lladdr)
+    {
         return NULL;
     }
 
     int end = strlen(lladdr) - 1;
     int i;
     int dot_count = 0;
-    for (i = end; i >= 0; i--) {
-        if (lladdr[i] == '.') {
+    for (i = end; i >= 0; i--)
+    {
+        if (lladdr[i] == '.')
+        {
             dot_count++;
         }
-        if (dot_count == 8) {
+        if (dot_count == 8)
+        {
             lladdr = &lladdr[i];
             break;
         }
-        if (i == 0) {
+        if (i == 0)
+        {
             return NULL;
         }
     }
-    if (*(lladdr+1) && *(lladdr+2) && *(lladdr+2) != '.') {
+    if (*(lladdr + 1) && *(lladdr + 2) && *(lladdr + 2) != '.')
+    {
         lladdr++;
     }
-    char *curptr = lladdr;
-    while (*curptr) {
-        if (*curptr == '.') {
-            if (*(curptr+1) && ((*(curptr+2) == '.') || !(*(curptr+2)))) {
+    char* curptr = lladdr;
+    while (*curptr)
+    {
+        if (*curptr == '.')
+        {
+            if (*(curptr + 1) && ((*(curptr + 2) == '.') || !(*(curptr + 2))))
+            {
                 *curptr = '0';
                 curptr++;
-            } else {
+            }
+            else
+            {
                 *curptr = '\0';
-                if (*(curptr+1)) {
-                    lladdr = strcat(lladdr, curptr+1);
+                if (*(curptr + 1))
+                {
+                    lladdr = strcat(lladdr, curptr + 1);
                 }
             }
-        } else {
+        }
+        else
+        {
             curptr++;
         }
     }
     return lladdr;
 }
 
-static char *get_lladdr(char *ifc)
+static char* get_lladdr(char* ifc)
 {
-    char *cmd = (char *)malloc(strlen("ifconfig  | grep lladdr | awk '{print $2}'") + strlen(ifc) + 1);
-    if (!cmd) {
+    char* cmd = (char*)malloc(strlen("ifconfig  | grep lladdr | awk '{print $2}'") + strlen(ifc) + 1);
+    if (!cmd)
+    {
         return NULL;
     }
     sprintf(cmd, "ifconfig %s | grep lladdr | awk '{print $2}'", ifc);
-    char *lladdr = exec_cmd_get_output_first_line(cmd, NULL);
+    char* lladdr = exec_cmd_get_output_first_line(cmd, NULL);
     free(cmd);
     return lladdr_to_gid_format(lladdr);
 }
 
-static char *get_inband_net_dev(char *ib_dev, char *port, char **ifcs)
+static char* get_inband_net_dev(char* ib_dev, char* port, char** ifcs)
 {
-    char *gid = get_gid(ib_dev, port);
-    if (!gid) {
+    char* gid = get_gid(ib_dev, port);
+    if (!gid)
+    {
         return NULL;
     }
     int i;
-    for (i = 0; ifcs[i]; i++) {
-        if (strstr(ifcs[i], "ib") == ifcs[i]) {
-            char *lladdr = get_lladdr(ifcs[i]);
-            if (!strcmp(lladdr, gid)) {
+    for (i = 0; ifcs[i]; i++)
+    {
+        if (strstr(ifcs[i], "ib") == ifcs[i])
+        {
+            char* lladdr = get_lladdr(ifcs[i]);
+            if (!strcmp(lladdr, gid))
+            {
                 free(lladdr);
                 free(gid);
-                char *netdev = (char *)malloc(strlen(ifcs[i]) + 1);
-                if (!netdev) {
+                char* netdev = (char*)malloc(strlen(ifcs[i]) + 1);
+                if (!netdev)
+                {
                     errno = ENOMEM;
                     return NULL;
                 }
@@ -1680,58 +1906,73 @@ static char *get_inband_net_dev(char *ib_dev, char *port, char **ifcs)
     return NULL;
 }
 
-static char **get_net_devs(char **ib_devs)
+static char** get_net_devs(char** ib_devs)
 {
-    if (!ib_devs) {
+    if (!ib_devs)
+    {
         return NULL;
     }
-    char **ifcs = get_ifcs();
-    if (!ifcs) {
+    char** ifcs = get_ifcs();
+    if (!ifcs)
+    {
         return NULL;
     }
-    char **ports = NULL;
-    char *link_layer = NULL;
+    char** ports = NULL;
+    char* link_layer = NULL;
     int i;
     int error = 0;
-    int lines_allocated = 8; //can realloc later
+    int lines_allocated = 8; // can realloc later
 
-    char **net_devs = (char **)malloc((lines_allocated + 1) * sizeof(char *));
-    if (!net_devs) {
+    char** net_devs = (char**)malloc((lines_allocated + 1) * sizeof(char*));
+    if (!net_devs)
+    {
         errno = ENOMEM;
         error = 1;
         goto cleanup;
     }
-    memset(net_devs, 0, (lines_allocated + 1) * sizeof(char *));
+    memset(net_devs, 0, (lines_allocated + 1) * sizeof(char*));
     int k = 0;
-    for (i = 0; ib_devs[i]; i++) {
+    for (i = 0; ib_devs[i]; i++)
+    {
         ports = get_ports(ib_devs[i]);
-        if (!ports) {
+        if (!ports)
+        {
             error = 1;
             goto cleanup;
         }
         int j;
-        for (j = 0; ports[j]; j++) {
+        for (j = 0; ports[j]; j++)
+        {
             link_layer = get_link_layer(ib_devs[i], ports[j]);
-            if (!link_layer) {
+            if (!link_layer)
+            {
                 error = 1;
                 goto cleanup;
             }
-            char *netdev;
-            if (!strcmp(link_layer, "Ethernet")) {
+            char* netdev;
+            if (!strcmp(link_layer, "Ethernet"))
+            {
                 netdev = get_eth_net_dev(ib_devs[i], ports[j]);
-            } else if (!strcmp(link_layer, "InfiniBand")) {
+            }
+            else if (!strcmp(link_layer, "InfiniBand"))
+            {
                 netdev = get_inband_net_dev(ib_devs[i], ports[j], ifcs);
-            } else {
+            }
+            else
+            {
                 error = 1;
                 goto cleanup;
             }
-            if (netdev) {
+            if (netdev)
+            {
                 net_devs[k] = netdev;
                 k++;
-                if (k > lines_allocated) {
+                if (k > lines_allocated)
+                {
                     lines_allocated *= 2;
-                    char **tmp = realloc(net_devs, (lines_allocated + 1) * sizeof(char *));
-                    if (!tmp) {
+                    char** tmp = realloc(net_devs, (lines_allocated + 1) * sizeof(char*));
+                    if (!tmp)
+                    {
                         errno = ENOMEM;
                         error = 1;
                         goto cleanup;
@@ -1743,7 +1984,8 @@ static char **get_net_devs(char **ib_devs)
     }
     net_devs[k] = NULL;
 cleanup:
-    if (error) {
+    if (error)
+    {
         destroy_str_arr(net_devs, 0);
         net_devs = NULL;
     }
@@ -1754,54 +1996,60 @@ static char **get_net_devs(char **ib_devs)
     return net_devs;
 }
 
-static char **get_ib_devs(char conf_dev[512])
+static char** get_ib_devs(char conf_dev[512])
 {
-    char *cmd = (char *)malloc(strlen("sysctl -a | grep mlx | grep pci | grep ") + strlen(conf_dev) + 1);
-    if (!cmd) {
+    char* cmd = (char*)malloc(strlen("sysctl -a | grep mlx | grep pci | grep ") + strlen(conf_dev) + 1);
+    if (!cmd)
+    {
         return NULL;
     }
     sprintf(cmd, "sysctl -a | grep mlx | grep pci | grep %s", conf_dev);
-    char **ib_devs = exec_cmd_get_output(cmd, manipulate_ib_dev_line);
+    char** ib_devs = exec_cmd_get_output(cmd, manipulate_ib_dev_line);
     free(cmd);
     return ib_devs;
 }
 
-dev_info* mdevices_info(int mask, int *len)
+dev_info* mdevices_info(int mask, int* len)
 {
     return mdevices_info_v(mask, len, 0);
 }
 
-dev_info* mdevices_info_v(int mask, int *len, int verbosity)
+dev_info* mdevices_info_v(int mask, int* len, int verbosity)
 {
-    char *devs = 0;
-    char *dev_name;
+    char* devs = 0;
+    char* dev_name;
     int size = 2048;
     int rc;
     int i;
 
     // Get list of devices
-    do {
-        if (devs) {
+    do
+    {
+        if (devs)
+        {
             free(devs);
         }
         size *= 2;
         devs = malloc(size);
-        if (!devs) {
+        if (!devs)
+        {
             errno = ENOMEM;
             return NULL;
         }
         rc = mdevices_v(devs, size, mask, verbosity);
     } while (rc == -1);
     *len = rc;
-    dev_info *dev_info_arr = malloc(sizeof(dev_info) * rc);
-    if (!dev_info_arr) {
+    dev_info* dev_info_arr = malloc(sizeof(dev_info) * rc);
+    if (!dev_info_arr)
+    {
         errno = ENOMEM;
         free(devs);
         return NULL;
     }
     memset(dev_info_arr, 0, sizeof(dev_info) * rc);
     dev_name = devs;
-    for (i = 0; i < *len; i++) {
+    for (i = 0; i < *len; i++)
+    {
         unsigned int domain = 0;
         unsigned int bus = 0;
         unsigned int dev = 0;
@@ -1809,39 +2057,47 @@ dev_info* mdevices_info_v(int mask, int *len, int verbosity)
         dev_info_arr[i].type = get_device_flags(dev_name);
         strcpy(dev_info_arr[i].dev_name, dev_name);
         strcpy(dev_info_arr[i].pci.conf_dev, dev_name);
-        if (dev_info_arr[i].type & MDEVS_TAVOR_CR) {
-            if (get_dev_dbdf(dev_name, &domain, &bus, &dev, &func)) {
+        if (dev_info_arr[i].type & MDEVS_TAVOR_CR)
+        {
+            if (get_dev_dbdf(dev_name, &domain, &bus, &dev, &func))
+            {
                 goto next;
             }
             dev_info_arr[i].pci.domain = domain;
             dev_info_arr[i].pci.bus = bus;
             dev_info_arr[i].pci.dev = dev;
             dev_info_arr[i].pci.func = func;
-            if (get_device_ids(dev_name, &dev_info_arr[i])) {
+            if (get_device_ids(dev_name, &dev_info_arr[i]))
+            {
                 goto next;
             }
         }
-        if (verbosity) {
+        if (verbosity)
+        {
             dev_info_arr[i].pci.ib_devs = get_ib_devs(dev_info_arr[i].pci.conf_dev);
             dev_info_arr[i].pci.net_devs = get_net_devs(dev_info_arr[i].pci.ib_devs);
         }
-next:
+    next:
         dev_name += strlen(dev_name) + 1;
     }
     free(devs);
     return dev_info_arr;
 }
 
-void mdevices_info_destroy(dev_info *dev_info, int len)
+void mdevices_info_destroy(dev_info* dev_info, int len)
 {
     int i;
 
-    if (dev_info){
-        for (i = 0; i < len; i++) {
-            if (dev_info[i].pci.ib_devs) {
+    if (dev_info)
+    {
+        for (i = 0; i < len; i++)
+        {
+            if (dev_info[i].pci.ib_devs)
+            {
                 destroy_str_arr(dev_info[i].pci.ib_devs, 0);
             }
-            if (dev_info[i].pci.net_devs) {
+            if (dev_info[i].pci.net_devs)
+            {
                 destroy_str_arr(dev_info[i].pci.net_devs, 0);
             }
         }
@@ -1851,14 +2107,20 @@ void mdevices_info_destroy(dev_info *dev_info, int len)
 }
 
 #define TLV_OPERATION_SIZE 4
-#define OP_TLV_SIZE        16
+#define OP_TLV_SIZE 16
 #define REG_TLV_HEADER_LEN 4
 
-enum {
+enum
+{
     MAD_CLASS_REG_ACCESS = 1,
 };
-enum {
-    TLV_END = 0, TLV_OPERATION = 1, TLV_DR = 2, TLV_REG = 3, TLV_USER_DATA = 4,
+enum
+{
+    TLV_END = 0,
+    TLV_OPERATION = 1,
+    TLV_DR = 2,
+    TLV_REG = 3,
+    TLV_USER_DATA = 4,
 };
 
 #define REGISTER_HEADERS_SIZE 20
@@ -1867,94 +2129,106 @@ enum {
 #define FWCTX_MAX_REG_SIZE 16
 #define TOOLS_HCR_MAX_REG_SIZE (TOOLS_HCR_MAX_MBOX - REGISTER_HEADERS_SIZE)
 
-static int supports_icmd(mfile *mf);
-static int supports_tools_cmdif_reg(mfile *mf);
-static int init_operation_tlv(struct OperationTlv *operation_tlv,
-                              u_int16_t reg_id, u_int8_t method);
-static int mreg_send_wrapper(mfile *mf, u_int8_t *data, int r_icmd_size,
-                             int w_icmd_size);
-static int mreg_send_raw(mfile *mf, u_int16_t reg_id,
-                         maccess_reg_method_t method, void *reg_data, u_int32_t reg_size,
-                         u_int32_t r_size_reg, u_int32_t w_size_reg, int *reg_status);
-int mget_max_reg_size(mfile *mf, maccess_reg_method_t reg_method);
+static int supports_icmd(mfile* mf);
+static int supports_tools_cmdif_reg(mfile* mf);
+static int init_operation_tlv(struct OperationTlv* operation_tlv, u_int16_t reg_id, u_int8_t method);
+static int mreg_send_wrapper(mfile* mf, u_int8_t* data, int r_icmd_size, int w_icmd_size);
+static int mreg_send_raw(mfile* mf,
+                         u_int16_t reg_id,
+                         maccess_reg_method_t method,
+                         void* reg_data,
+                         u_int32_t reg_size,
+                         u_int32_t r_size_reg,
+                         u_int32_t w_size_reg,
+                         int* reg_status);
+int mget_max_reg_size(mfile* mf, maccess_reg_method_t reg_method);
 
 // maccess_reg: Do a reg_access for the mf device.
 // - reg_data is both in and out
 // TODO: When the reg operation succeeds but the reg status is != 0,
 //       a specific
 
-int maccess_reg(mfile *mf, u_int16_t reg_id, maccess_reg_method_t reg_method,
-                void *reg_data, u_int32_t reg_size, u_int32_t r_size_reg,
-                u_int32_t w_size_reg, int *reg_status)
+int maccess_reg(mfile* mf,
+                u_int16_t reg_id,
+                maccess_reg_method_t reg_method,
+                void* reg_data,
+                u_int32_t reg_size,
+                u_int32_t r_size_reg,
+                u_int32_t w_size_reg,
+                int* reg_status)
 {
     int rc;
-    if (mf == NULL || reg_data == NULL || reg_status == NULL || reg_size <= 0) {
+    if (mf == NULL || reg_data == NULL || reg_status == NULL || reg_size <= 0)
+    {
         return ME_BAD_PARAMS;
     }
     // check register size
     u_int32_t max_size = (u_int32_t)mget_max_reg_size(mf, reg_method);
-    if (reg_size > max_size) {
-        //reg too big
+    if (reg_size > max_size)
+    {
+        // reg too big
         return ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;
     }
-    rc = mreg_send_raw(mf, reg_id, reg_method, reg_data, reg_size, r_size_reg,
-                       w_size_reg, reg_status);
+    rc = mreg_send_raw(mf, reg_id, reg_method, reg_data, reg_size, r_size_reg, w_size_reg, reg_status);
 
-    if (rc) {
+    if (rc)
+    {
         return rc;
-    } else if (*reg_status) {
-        switch (*reg_status) {
-        case 1:
-            return ME_REG_ACCESS_DEV_BUSY;
+    }
+    else if (*reg_status)
+    {
+        switch (*reg_status)
+        {
+            case 1:
+                return ME_REG_ACCESS_DEV_BUSY;
 
-        case 2:
-            return ME_REG_ACCESS_VER_NOT_SUPP;
+            case 2:
+                return ME_REG_ACCESS_VER_NOT_SUPP;
 
-        case 3:
-            return ME_REG_ACCESS_UNKNOWN_TLV;
+            case 3:
+                return ME_REG_ACCESS_UNKNOWN_TLV;
 
-        case 4:
-            return ME_REG_ACCESS_REG_NOT_SUPP;
+            case 4:
+                return ME_REG_ACCESS_REG_NOT_SUPP;
 
-        case 5:
-            return ME_REG_ACCESS_CLASS_NOT_SUPP;
+            case 5:
+                return ME_REG_ACCESS_CLASS_NOT_SUPP;
 
-        case 6:
-            return ME_REG_ACCESS_METHOD_NOT_SUPP;
+            case 6:
+                return ME_REG_ACCESS_METHOD_NOT_SUPP;
 
-        case 7:
-            return ME_REG_ACCESS_BAD_PARAM;
+            case 7:
+                return ME_REG_ACCESS_BAD_PARAM;
 
-        case 8:
-            return ME_REG_ACCESS_RES_NOT_AVLBL;
+            case 8:
+                return ME_REG_ACCESS_RES_NOT_AVLBL;
 
-        case 9:
-            return ME_REG_ACCESS_MSG_RECPT_ACK;
+            case 9:
+                return ME_REG_ACCESS_MSG_RECPT_ACK;
 
-        case 0x22:
-            return ME_REG_ACCESS_CONF_CORRUPT;
+            case 0x22:
+                return ME_REG_ACCESS_CONF_CORRUPT;
 
-        case 0x24:
-            return ME_REG_ACCESS_LEN_TOO_SMALL;
+            case 0x24:
+                return ME_REG_ACCESS_LEN_TOO_SMALL;
 
-        case 0x20:
-            return ME_REG_ACCESS_BAD_CONFIG;
+            case 0x20:
+                return ME_REG_ACCESS_BAD_CONFIG;
 
-        case 0x21:
-            return ME_REG_ACCESS_ERASE_EXEEDED;
+            case 0x21:
+                return ME_REG_ACCESS_ERASE_EXEEDED;
 
-        case 0x70:
-            return ME_REG_ACCESS_INTERNAL_ERROR;
+            case 0x70:
+                return ME_REG_ACCESS_INTERNAL_ERROR;
 
-        default:
-            return ME_REG_ACCESS_UNKNOWN_ERR;
+            default:
+                return ME_REG_ACCESS_UNKNOWN_ERR;
         }
     }
     return ME_OK;
 }
 
-static int init_operation_tlv(struct OperationTlv *operation_tlv,
-                              u_int16_t reg_id, u_int8_t method)
+static int init_operation_tlv(struct OperationTlv* operation_tlv, u_int16_t reg_id, u_int8_t method)
 {
     memset(operation_tlv, 0, sizeof(*operation_tlv));
 
@@ -1968,32 +2242,43 @@ static int init_operation_tlv(struct OperationTlv *operation_tlv,
 
 ///////////////////  Function that sends the register via the correct interface ///////////////////////////
 
-static int mreg_send_wrapper(mfile *mf, u_int8_t *data, int r_icmd_size,
-                             int w_icmd_size)
+static int mreg_send_wrapper(mfile* mf, u_int8_t* data, int r_icmd_size, int w_icmd_size)
 {
     int rc;
-    if (supports_icmd(mf)) {
-        rc = icmd_send_command_int(mf, FLASH_REG_ACCESS, data, w_icmd_size,
-                                   r_icmd_size, 0);
-        if (rc) {
+    if (supports_icmd(mf))
+    {
+        rc = icmd_send_command_int(mf, FLASH_REG_ACCESS, data, w_icmd_size, r_icmd_size, 0);
+        if (rc)
+        {
             return rc;
         }
-    } else if (supports_tools_cmdif_reg(mf)) {
+    }
+    else if (supports_tools_cmdif_reg(mf))
+    {
         rc = tools_cmdif_reg_access(mf, data, w_icmd_size, r_icmd_size);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
-    } else {
+    }
+    else
+    {
         return ME_NOT_IMPLEMENTED;
     }
     return ME_OK;
 }
 
-static int mreg_send_raw(mfile *mf, u_int16_t reg_id,
-                         maccess_reg_method_t method, void *reg_data, u_int32_t reg_size,
-                         u_int32_t r_size_reg, u_int32_t w_size_reg, int *reg_status)
+static int mreg_send_raw(mfile* mf,
+                         u_int16_t reg_id,
+                         maccess_reg_method_t method,
+                         void* reg_data,
+                         u_int32_t reg_size,
+                         u_int32_t r_size_reg,
+                         u_int32_t w_size_reg,
+                         int* reg_status)
 {
-    //printf("-D- reg_id = %d, reg_size = %d, r_size_reg = %d , w_size_reg = %d\n",reg_id,reg_size,r_size_reg,w_size_reg);
+    // printf("-D- reg_id = %d, reg_size = %d, r_size_reg = %d , w_size_reg =
+    // %d\n",reg_id,reg_size,r_size_reg,w_size_reg);
     int mad_rc, cmdif_size = 0;
     struct OperationTlv tlv;
     struct reg_tlv tlv_info;
@@ -2008,7 +2293,7 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id,
 
     cmdif_size += OperationTlv_pack(&tlv, buffer);
     cmdif_size += reg_tlv_pack(&tlv_info, buffer + OP_TLV_SIZE);
-    //put the reg itself into the buffer
+    // put the reg itself into the buffer
     memcpy(buffer + OP_TLV_SIZE + REG_TLV_HEADER_LEN, reg_data, reg_size);
     cmdif_size += reg_size;
 
@@ -2019,11 +2304,12 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id,
     fprintf(stdout, "\tReg Tlv\n");
     reg_tlv_dump(&tlv_info, stdout);
 #endif
-    // printf("-D- reg_info.len = |%d, OP_TLV: %d, REG_TLV= %d, cmdif_size = %d\n", reg_info.len, OP_TLV_SIZE, REG_RLV_HEADER_LEN, cmdif_size);
-    // update r/w_size_reg with the size of op tlv and reg tlv as we need to read/write them as well
+    // printf("-D- reg_info.len = |%d, OP_TLV: %d, REG_TLV= %d, cmdif_size = %d\n", reg_info.len, OP_TLV_SIZE,
+    // REG_RLV_HEADER_LEN, cmdif_size); update r/w_size_reg with the size of op tlv and reg tlv as we need to read/write
+    // them as well
     r_size_reg += OP_TLV_SIZE + REG_TLV_HEADER_LEN;
     w_size_reg += OP_TLV_SIZE + REG_TLV_HEADER_LEN;
-    //printf("-D- reg_size = %d, r_size_reg = %d , w_size_reg = %d\n",reg_size,r_size_reg,w_size_reg);
+    // printf("-D- reg_size = %d, r_size_reg = %d , w_size_reg = %d\n",reg_size,r_size_reg,w_size_reg);
 
     mad_rc = mreg_send_wrapper(mf, buffer, r_size_reg, w_size_reg);
     // Unpack the mad
@@ -2041,14 +2327,14 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id,
 #endif
     // Check the return value
     *reg_status = tlv.status;
-    if (mad_rc) {
+    if (mad_rc)
+    {
         return mad_rc;
     }
 
     return ME_OK;
 }
 
-
 #define HW_ID_ADDR 0xf0014
 
 #define CONNECTX3_HW_ID 0x1f5
@@ -2056,245 +2342,255 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id,
 #define SWITCHX_HW_ID 0x245
 #define INFINISCALE4_HW_ID 0x1b3
 
-static int supports_icmd(mfile *mf)
+static int supports_icmd(mfile* mf)
 {
     u_int32_t dev_id;
 
-    if (mread4(mf, HW_ID_ADDR, &dev_id) != 4) {
+    if (mread4(mf, HW_ID_ADDR, &dev_id) != 4)
+    {
         // cr might be locked and retured 0xbad0cafe but we dont care we search for device that supports icmd
         return 0;
     }
-    switch (dev_id & 0xffff) { // that the hw device id
-    case INFINISCALE4_HW_ID:
-    case CONNECTX3_HW_ID:
-    case CONNECTX3_PRO_HW_ID:
-    case SWITCHX_HW_ID:
-        return 0;
+    switch (dev_id & 0xffff)
+    { // that the hw device id
+        case INFINISCALE4_HW_ID:
+        case CONNECTX3_HW_ID:
+        case CONNECTX3_PRO_HW_ID:
+        case SWITCHX_HW_ID:
+            return 0;
 
-    default:
-        break;
+        default:
+            break;
     }
     return 1;
 }
 
-static int supports_tools_cmdif_reg(mfile *mf)
+static int supports_tools_cmdif_reg(mfile* mf)
 {
     u_int32_t dev_id;
 
-    if (mread4(mf, HW_ID_ADDR, &dev_id) != 4) {
+    if (mread4(mf, HW_ID_ADDR, &dev_id) != 4)
+    {
         return 0;
     }
-    switch (dev_id & 0xffff) { // that the hw device id
-    case CONNECTX3_HW_ID:     //Cx3
-    case CONNECTX3_PRO_HW_ID:     // Cx3-pro
-        if (tools_cmdif_is_supported(mf) == ME_OK) {
-            return 1;
-        }
-        return 0;
+    switch (dev_id & 0xffff)
+    {                             // that the hw device id
+        case CONNECTX3_HW_ID:     // Cx3
+        case CONNECTX3_PRO_HW_ID: // Cx3-pro
+            if (tools_cmdif_is_supported(mf) == ME_OK)
+            {
+                return 1;
+            }
+            return 0;
 
-    default:
-        return 0;
+        default:
+            return 0;
     }
-
 }
 
-int mget_max_reg_size(mfile *mf, maccess_reg_method_t reg_method)
+int mget_max_reg_size(mfile* mf, maccess_reg_method_t reg_method)
 {
-    if (mf->acc_reg_params.max_reg_size[reg_method]) {
+    if (mf->acc_reg_params.max_reg_size[reg_method])
+    {
         return mf->acc_reg_params.max_reg_size[reg_method];
-    } else if (supports_icmd(mf)) {
+    }
+    else if (supports_icmd(mf))
+    {
         // we support icmd and we dont use IB interface -> we use icmd for reg access
-        //TOOD: get size dynamically from icmd_params once we have support by fw for mfba with size field greater than 8 bits
+        // TOOD: get size dynamically from icmd_params once we have support by fw for mfba with size field greater than
+        // 8 bits
         mf->acc_reg_params.max_reg_size[reg_method] = ICMD_MAX_REG_SIZE;
-    } else if (supports_tools_cmdif_reg(mf)) {
+    }
+    else if (supports_tools_cmdif_reg(mf))
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = TOOLS_HCR_MAX_REG_SIZE;
     }
     return mf->acc_reg_params.max_reg_size[reg_method];
 }
 
 /************************************
-* Function: m_err2str
-************************************/
+ * Function: m_err2str
+ ************************************/
 const char* m_err2str(MError status)
 {
-    switch (status) {
-    case ME_OK:
-        return "ME_OK";
+    switch (status)
+    {
+        case ME_OK:
+            return "ME_OK";
 
-    case ME_ERROR:
-        return "General error";
+        case ME_ERROR:
+            return "General error";
 
-    case ME_BAD_PARAMS:
-        return "ME_BAD_PARAMS";
+        case ME_BAD_PARAMS:
+            return "ME_BAD_PARAMS";
 
-    case ME_CR_ERROR:
-        return "ME_CR_ERROR";
+        case ME_CR_ERROR:
+            return "ME_CR_ERROR";
 
-    case ME_NOT_IMPLEMENTED:
-        return "ME_NOT_IMPLEMENTED";
+        case ME_NOT_IMPLEMENTED:
+            return "ME_NOT_IMPLEMENTED";
 
-    case ME_SEM_LOCKED:
-        return "Semaphore locked";
+        case ME_SEM_LOCKED:
+            return "Semaphore locked";
 
-    case ME_MEM_ERROR:
-        return "ME_MEM_ERROR";
+        case ME_MEM_ERROR:
+            return "ME_MEM_ERROR";
 
-    case ME_UNSUPPORTED_OPERATION:
-        return "ME_UNSUPPORTED_OPERATION";
+        case ME_UNSUPPORTED_OPERATION:
+            return "ME_UNSUPPORTED_OPERATION";
 
-    case ME_MAD_SEND_FAILED:
-        return "ME_MAD_SEND_FAILED";
+        case ME_MAD_SEND_FAILED:
+            return "ME_MAD_SEND_FAILED";
 
-    case ME_UNKOWN_ACCESS_TYPE:
-        return "ME_UNKOWN_ACCESS_TYPE";
+        case ME_UNKOWN_ACCESS_TYPE:
+            return "ME_UNKOWN_ACCESS_TYPE";
 
-    case ME_UNSUPPORTED_ACCESS_TYPE:
-        return "ME_UNSUPPORTED_ACCESS_TYPE";
+        case ME_UNSUPPORTED_ACCESS_TYPE:
+            return "ME_UNSUPPORTED_ACCESS_TYPE";
 
-    case ME_UNSUPPORTED_DEVICE:
-        return "ME_UNSUPPORTED_DEVICE";
+        case ME_UNSUPPORTED_DEVICE:
+            return "ME_UNSUPPORTED_DEVICE";
 
-    // Reg access errors
-    case ME_REG_ACCESS_BAD_STATUS_ERR:
-        return "ME_REG_ACCESS_BAD_STATUS_ERR";
+        // Reg access errors
+        case ME_REG_ACCESS_BAD_STATUS_ERR:
+            return "ME_REG_ACCESS_BAD_STATUS_ERR";
 
-    case ME_REG_ACCESS_BAD_METHOD:
-        return "Bad method";
+        case ME_REG_ACCESS_BAD_METHOD:
+            return "Bad method";
 
-    case ME_REG_ACCESS_NOT_SUPPORTED:
-        return "The Register access is not supported by the device";
+        case ME_REG_ACCESS_NOT_SUPPORTED:
+            return "The Register access is not supported by the device";
 
-    case ME_REG_ACCESS_DEV_BUSY:
-        return "Device is busy";
+        case ME_REG_ACCESS_DEV_BUSY:
+            return "Device is busy";
 
-    case ME_REG_ACCESS_VER_NOT_SUPP:
-        return "Version not supported";
+        case ME_REG_ACCESS_VER_NOT_SUPP:
+            return "Version not supported";
 
-    case ME_REG_ACCESS_UNKNOWN_TLV:
-        return "Unknown TLV";
+        case ME_REG_ACCESS_UNKNOWN_TLV:
+            return "Unknown TLV";
 
-    case ME_REG_ACCESS_REG_NOT_SUPP:
-        return "Register not supported";
+        case ME_REG_ACCESS_REG_NOT_SUPP:
+            return "Register not supported";
 
-    case ME_REG_ACCESS_CLASS_NOT_SUPP:
-        return "Class not supported";
+        case ME_REG_ACCESS_CLASS_NOT_SUPP:
+            return "Class not supported";
 
-    case ME_REG_ACCESS_METHOD_NOT_SUPP:
-        return "Method not supported";
+        case ME_REG_ACCESS_METHOD_NOT_SUPP:
+            return "Method not supported";
 
-    case ME_REG_ACCESS_BAD_PARAM:
-        return "Bad parameter";
+        case ME_REG_ACCESS_BAD_PARAM:
+            return "Bad parameter";
 
-    case ME_REG_ACCESS_RES_NOT_AVLBL:
-        return "Resource unavailable";
+        case ME_REG_ACCESS_RES_NOT_AVLBL:
+            return "Resource unavailable";
 
-    case ME_REG_ACCESS_MSG_RECPT_ACK:
-        return "Message receipt ack";
+        case ME_REG_ACCESS_MSG_RECPT_ACK:
+            return "Message receipt ack";
 
-    case ME_REG_ACCESS_UNKNOWN_ERR:
-        return "Unknown register error";
+        case ME_REG_ACCESS_UNKNOWN_ERR:
+            return "Unknown register error";
 
-    case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
-        return "Register is too large";
+        case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
+            return "Register is too large";
 
-    case ME_REG_ACCESS_CONF_CORRUPT:
-        return "Config Section Corrupted";
+        case ME_REG_ACCESS_CONF_CORRUPT:
+            return "Config Section Corrupted";
 
-    case ME_REG_ACCESS_LEN_TOO_SMALL:
-        return "The given Register length is too small for the Tlv";
+        case ME_REG_ACCESS_LEN_TOO_SMALL:
+            return "The given Register length is too small for the Tlv";
 
-    case ME_REG_ACCESS_BAD_CONFIG:
-        return "The configuration is rejected";
+        case ME_REG_ACCESS_BAD_CONFIG:
+            return "The configuration is rejected";
 
-    case ME_REG_ACCESS_ERASE_EXEEDED:
-        return "The erase count exceeds its limit";
+        case ME_REG_ACCESS_ERASE_EXEEDED:
+            return "The erase count exceeds its limit";
 
-    case ME_REG_ACCESS_INTERNAL_ERROR:
-        return "Firmware internal error";
+        case ME_REG_ACCESS_INTERNAL_ERROR:
+            return "Firmware internal error";
 
-    // ICMD access errors
-    case ME_ICMD_STATUS_CR_FAIL:
-        return "ME_ICMD_STATUS_CR_FAIL";
+        // ICMD access errors
+        case ME_ICMD_STATUS_CR_FAIL:
+            return "ME_ICMD_STATUS_CR_FAIL";
 
-    case ME_ICMD_STATUS_SEMAPHORE_TO:
-        return "ME_ICMD_STATUS_SEMAPHORE_TO";
+        case ME_ICMD_STATUS_SEMAPHORE_TO:
+            return "ME_ICMD_STATUS_SEMAPHORE_TO";
 
-    case ME_ICMD_STATUS_EXECUTE_TO:
-        return "ME_ICMD_STATUS_EXECUTE_TO";
+        case ME_ICMD_STATUS_EXECUTE_TO:
+            return "ME_ICMD_STATUS_EXECUTE_TO";
 
-    case ME_ICMD_STATUS_IFC_BUSY:
-        return "ME_ICMD_STATUS_IFC_BUSY";
+        case ME_ICMD_STATUS_IFC_BUSY:
+            return "ME_ICMD_STATUS_IFC_BUSY";
 
-    case ME_ICMD_STATUS_ICMD_NOT_READY:
-        return "ME_ICMD_STATUS_ICMD_NOT_READY";
+        case ME_ICMD_STATUS_ICMD_NOT_READY:
+            return "ME_ICMD_STATUS_ICMD_NOT_READY";
 
-    case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
-        return "ME_ICMD_UNSUPPORTED_ICMD_VERSION";
+        case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
+            return "ME_ICMD_UNSUPPORTED_ICMD_VERSION";
 
-    case ME_ICMD_NOT_SUPPORTED:
-        return "ME_REG_ACCESS_ICMD_NOT_SUPPORTED";
+        case ME_ICMD_NOT_SUPPORTED:
+            return "ME_REG_ACCESS_ICMD_NOT_SUPPORTED";
 
-    case ME_ICMD_INVALID_OPCODE:
-        return "ME_ICMD_INVALID_OPCODE";
+        case ME_ICMD_INVALID_OPCODE:
+            return "ME_ICMD_INVALID_OPCODE";
 
-    case ME_ICMD_INVALID_CMD:
-        return "ME_ICMD_INVALID_CMD";
+        case ME_ICMD_INVALID_CMD:
+            return "ME_ICMD_INVALID_CMD";
 
-    case ME_ICMD_OPERATIONAL_ERROR:
-        return "ME_ICMD_OPERATIONAL_ERROR";
+        case ME_ICMD_OPERATIONAL_ERROR:
+            return "ME_ICMD_OPERATIONAL_ERROR";
 
-    case ME_ICMD_BAD_PARAM:
-        return "ME_ICMD_BAD_PARAM";
+        case ME_ICMD_BAD_PARAM:
+            return "ME_ICMD_BAD_PARAM";
 
-    case ME_ICMD_BUSY:
-        return "ME_ICMD_BUSY";
+        case ME_ICMD_BUSY:
+            return "ME_ICMD_BUSY";
 
-    case ME_ICMD_ICM_NOT_AVAIL:
-        return "ME_ICMD_ICM_NOT_AVAIL";
+        case ME_ICMD_ICM_NOT_AVAIL:
+            return "ME_ICMD_ICM_NOT_AVAIL";
 
-    case ME_ICMD_WRITE_PROTECT:
-        return "ME_ICMD_WRITE_PROTECT";
+        case ME_ICMD_WRITE_PROTECT:
+            return "ME_ICMD_WRITE_PROTECT";
 
-    case ME_ICMD_UNKNOWN_STATUS:
-        return "ME_ICMD_UNKNOWN_STATUS";
+        case ME_ICMD_UNKNOWN_STATUS:
+            return "ME_ICMD_UNKNOWN_STATUS";
 
-    case ME_ICMD_SIZE_EXCEEDS_LIMIT:
-        return "ME_ICMD_SIZE_EXCEEDS_LIMIT";
+        case ME_ICMD_SIZE_EXCEEDS_LIMIT:
+            return "ME_ICMD_SIZE_EXCEEDS_LIMIT";
 
-    // MAD IFC errors
-    case ME_MAD_BUSY:
-        return "Temporarily busy. MAD discarded. This is not an error";
+        // MAD IFC errors
+        case ME_MAD_BUSY:
+            return "Temporarily busy. MAD discarded. This is not an error";
 
-    case ME_MAD_REDIRECT:
-        return "Redirection. This is not an error";
+        case ME_MAD_REDIRECT:
+            return "Redirection. This is not an error";
 
-    case ME_MAD_BAD_VER:
-        return "Bad version";
+        case ME_MAD_BAD_VER:
+            return "Bad version";
 
-    case ME_MAD_METHOD_NOT_SUPP:
-        return "Method not supported";
+        case ME_MAD_METHOD_NOT_SUPP:
+            return "Method not supported";
 
-    case ME_MAD_METHOD_ATTR_COMB_NOT_SUPP:
-        return "Method and attribute combination isn't supported";
+        case ME_MAD_METHOD_ATTR_COMB_NOT_SUPP:
+            return "Method and attribute combination isn't supported";
 
-    case ME_MAD_BAD_DATA:
-        return "Bad attribute modifer or field";
+        case ME_MAD_BAD_DATA:
+            return "Bad attribute modifer or field";
 
-    case ME_MAD_GENERAL_ERR:
-        return "Unknown MAD error";
+        case ME_MAD_GENERAL_ERR:
+            return "Unknown MAD error";
 
-    default:
-        return "Unknown error code";
+        default:
+            return "Unknown error code";
     }
 }
 
-void mpci_change(mfile *mf)
+void mpci_change(mfile* mf)
 {
-    (void) mf;
+    (void)mf;
 }
 
-int mib_smp_get(mfile *mf, u_int8_t *data, u_int16_t attr_id,
-                u_int32_t attr_mod)
+int mib_smp_get(mfile* mf, u_int8_t* data, u_int16_t attr_id, u_int32_t attr_mod)
 {
     (void)mf;
     (void)data;
@@ -2304,8 +2600,7 @@ int mib_smp_get(mfile *mf, u_int8_t *data, u_int16_t attr_id,
     return -1;
 }
 
-int mib_smp_set(mfile *mf, u_int8_t *data, u_int16_t attr_id,
-                u_int32_t attr_mod)
+int mib_smp_set(mfile* mf, u_int8_t* data, u_int16_t attr_id, u_int32_t attr_mod)
 {
     (void)mf;
     (void)data;
@@ -2315,7 +2610,7 @@ int mib_smp_set(mfile *mf, u_int8_t *data, u_int16_t attr_id,
     return -1;
 }
 
-int mset_cr_access(mfile *mf, int access)
+int mset_cr_access(mfile* mf, int access)
 {
     (void)mf;
     (void)access;
@@ -2323,54 +2618,60 @@ int mset_cr_access(mfile *mf, int access)
     return -1;
 }
 
-int mget_vsec_supp(mfile *mf)
+int mget_vsec_supp(mfile* mf)
 {
     return mf->vsec_supp;
 }
 
-int mget_addr_space(mfile *mf)
+int mget_addr_space(mfile* mf)
 {
     return mf->address_space;
 }
-int mset_addr_space(mfile *mf, int space)
+int mset_addr_space(mfile* mf, int space)
 {
-    switch (space) {
-    case AS_CR_SPACE:
-    case AS_ICMD:
-    case AS_SEMAPHORE:
-        break;
+    switch (space)
+    {
+        case AS_CR_SPACE:
+        case AS_ICMD:
+        case AS_SEMAPHORE:
+            break;
 
-    default:
-        return -1;
+        default:
+            return -1;
     }
     mf->address_space = space;
     return 0;
 }
 
-int device_exists(const char *devname)
+int device_exists(const char* devname)
 {
-    char *devs = NULL;
-    char *pdevs;
+    char* devs = NULL;
+    char* pdevs;
     int size = 512;
     int rc = 0;
     int i = 0;
     int res = 0;
     // Get list of devices
-    do {
-        if (devs) {
+    do
+    {
+        if (devs)
+        {
             free(devs);
         }
         size *= 2;
         devs = malloc(size);
-        if (!devs) {
+        if (!devs)
+        {
             errno = ENOMEM;
             return 0;
         }
         rc = mdevices_v(devs, size, MDEVS_ALL, 1);
     } while (rc == -1);
     pdevs = devs;
-    while (i < rc) {
-        if (!strcmp(devname, pdevs)) {
+    while (i < rc)
+    {
+        if (!strcmp(devname, pdevs))
+        {
             res = 1;
             goto cleanup;
         }
@@ -2378,28 +2679,31 @@ int device_exists(const char *devname)
         i++;
     }
 cleanup:
-    if (devs) {
+    if (devs)
+    {
         free(devs);
     }
     return res;
 }
 
-int mclear_pci_semaphore(const char *name)
+int mclear_pci_semaphore(const char* name)
 {
-    mfile *mf;
+    mfile* mf;
     int rc = ME_OK;
     mf = mopen_int(name, Clear_Vsec_Semaphore);
-    if (!mf) {
+    if (!mf)
+    {
         return ME_ERROR;
     }
-    if (mf->tp != MST_PCICONF) {
+    if (mf->tp != MST_PCICONF)
+    {
         rc = ME_UNSUPPORTED_ACCESS_TYPE;
     }
     mclose(mf);
     return rc;
 }
 
-int mvpd_read4_int(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_read4_int(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
     int vpd_cap = mf->vpd_cap_addr;
     uint16_t write_addr;
@@ -2408,75 +2712,90 @@ int mvpd_read4_int(mfile *mf, unsigned int offset, u_int8_t value[4])
     int count_to_timeout;
     int done = 0;
 
-    if (!mf || !value) {
+    if (!mf || !value)
+    {
         return ME_BAD_PARAMS;
     }
-    if (!vpd_cap) {
+    if (!vpd_cap)
+    {
         return ME_UNSUPPORTED_OPERATION;
     }
     int lock_rc = _flock_int(mf->fdlock, LOCK_EX);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         perror("READ VPD");
         return ME_ERROR;
     }
     /* sets F bit to zero and write VPD addr */
     write_addr = (0x7fff & offset);
     res = write_config(mf, vpd_cap + PCI_VPD_ADDR, write_addr, 2);
-    if (res) {
+    if (res)
+    {
         res = ME_CR_ERROR;
         goto cleanup;
     }
 
     /* wait for data until F bit is set with one */
-    for (count_to_timeout = 0; count_to_timeout < MST_VPD_DFLT_TIMEOUT; count_to_timeout++) {
+    for (count_to_timeout = 0; count_to_timeout < MST_VPD_DFLT_TIMEOUT; count_to_timeout++)
+    {
         res = read_config(mf, vpd_cap + PCI_VPD_ADDR, &read_addr, 2);
-        if (res) {
+        if (res)
+        {
             res = ME_CR_ERROR;
             goto cleanup;
         }
-        if (read_addr & 0x8000) {
+        if (read_addr & 0x8000)
+        {
             done = 1;
             break;
         }
         sched_yield();
     }
-    if (done) {
-        res = read_config(mf, vpd_cap + PCI_VPD_DATA, (uint32_t *)value, 4);
-        if (res) {
+    if (done)
+    {
+        res = read_config(mf, vpd_cap + PCI_VPD_DATA, (uint32_t*)value, 4);
+        if (res)
+        {
             res = ME_CR_ERROR;
         }
-    } else {
+    }
+    else
+    {
         res = ME_TIMEOUT;
     }
 cleanup:
     lock_rc = _flock_int(mf->fdlock, LOCK_UN);
-    if (lock_rc) {
+    if (lock_rc)
+    {
         perror("READ VPD");
         return ME_ERROR;
     }
     return res;
 }
 
-int mvpd_read4(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_read4(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
-
-    if (offset % 4) {
+    if (offset % 4)
+    {
         u_int8_t qword[8] = {0};
         int rc = 0;
         unsigned int aligned_offset = (offset / 4) * 4;
         rc = mvpd_read4_int(mf, aligned_offset, qword);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
         rc = mvpd_read4_int(mf, aligned_offset + 4, qword + 4);
         memcpy(value, qword + (offset % 4), 4);
         return 0;
-    } else {
+    }
+    else
+    {
         return mvpd_read4_int(mf, offset, value);
     }
 }
 
-int mvpd_write4(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_write4(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
     (void)mf;
     (void)offset;
@@ -2484,7 +2803,7 @@ int mvpd_write4(mfile *mf, unsigned int offset, u_int8_t value[4])
     return ME_UNSUPPORTED_OPERATION;
 }
 
-int supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method)
+int supports_reg_access_gmp(mfile* mf, maccess_reg_method_t reg_method)
 {
     (void)mf;
     (void)reg_method;
@@ -2492,15 +2811,15 @@ int supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method)
     return 0;
 }
 
-int get_dma_pages(mfile *mf, struct mtcr_page_info* page_info,
-                  int page_amount)
+int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info, int page_amount)
 {
     int page_allocated_counter = 0;
     int page_counter = 0;
     int ret_code = ME_OK;
 
     // Parameter validation.
-    if(!mf || !page_info) {
+    if (!mf || !page_info)
+    {
         return ME_BAD_PARAMS;
     }
 
@@ -2508,22 +2827,22 @@ int get_dma_pages(mfile *mf, struct mtcr_page_info* page_info,
     int file_descriptor = open("/dev/mem", O_RDWR);
 
     // Pin the memory in the kernel space.
-    for (page_counter = 0;
-            page_counter < page_amount;
-            page_counter++) {
-
+    for (page_counter = 0; page_counter < page_amount; page_counter++)
+    {
         // Allocate the buffer.
         char* current_page = aligned_alloc(PAGE_SIZE, PAGE_SIZE);
 
         // Page allocated ?
-        if (!current_page) {
+        if (!current_page)
+        {
             ret_code = ME_MEM_ERROR;
             break;
         }
 
         page_allocated_counter++;
 
-        if ((uintptr_t)current_page % PAGE_SIZE) {
+        if ((uintptr_t)current_page % PAGE_SIZE)
+        {
             ret_code = ME_MEM_ERROR;
             break;
         }
@@ -2531,63 +2850,63 @@ int get_dma_pages(mfile *mf, struct mtcr_page_info* page_info,
         // We need to call mlock after the pages allocation in order to
         //   lock the virtual address space into RAM and preventing that
         //   memory from being paged to the swap area.
-        if (mlock(current_page, PAGE_SIZE)) {
+        if (mlock(current_page, PAGE_SIZE))
+        {
             ret_code = ME_MEM_ERROR;
             break;
         }
 
         // Save the virtual address in order to deallocate
         //   the memory at the close function.
-        mf->user_page_list.page_list[page_counter] =
-            current_page;
+        mf->user_page_list.page_list[page_counter] = current_page;
 
         // Building the ioctl structure.
         struct mem_extract memory_user = {};
         memory_user.me_vaddr = (uintptr_t)current_page;
 
         // Pin the user memory in the kernel space.
-        int return_code = ioctl(file_descriptor, MEM_EXTRACT_PADDR,
-                                &memory_user);
+        int return_code = ioctl(file_descriptor, MEM_EXTRACT_PADDR, &memory_user);
 
-        if (return_code || (memory_user.me_state != ME_STATE_MAPPED)) {
+        if (return_code || (memory_user.me_state != ME_STATE_MAPPED))
+        {
             ret_code = ME_MEM_ERROR;
             break;
         }
 
         // Save the PA and VA for the tool.
-        page_info->page_addresses_array[page_counter].dma_address =
-            memory_user.me_paddr;
-        page_info->page_addresses_array[page_counter].virtual_address =
-            (uintptr_t)current_page;
+        page_info->page_addresses_array[page_counter].dma_address = memory_user.me_paddr;
+        page_info->page_addresses_array[page_counter].virtual_address = (uintptr_t)current_page;
     }
 
     // Close the device file /dev/mem.
     close(file_descriptor);
 
-    if (ret_code) {
+    if (ret_code)
+    {
         release_dma_pages(mf, page_allocated_counter);
     }
 
-    else {
+    else
+    {
         mf->user_page_list.page_amount = page_amount;
     }
 
     return ret_code;
 }
 
-int release_dma_pages(mfile *mf, int page_amount)
+int release_dma_pages(mfile* mf, int page_amount)
 {
     // Parameter validation.
-    if(!mf) {
+    if (!mf)
+    {
         return -1;
     }
 
     // Deallocate the pages.
-    for (int page_counter = 0;
-            page_counter < page_amount;
-            page_counter++) {
-
-        if (!mf->user_page_list.page_list[page_counter]) {
+    for (int page_counter = 0; page_counter < page_amount; page_counter++)
+    {
+        if (!mf->user_page_list.page_list[page_counter])
+        {
             continue;
         }
 
@@ -2607,52 +2926,55 @@ int release_dma_pages(mfile *mf, int page_amount)
     return 0;
 }
 
-int mset_i2c_addr_width(mfile *mf, u_int8_t addr_width)
+int mset_i2c_addr_width(mfile* mf, u_int8_t addr_width)
 {
     (void)mf;
     (void)addr_width;
     return 1;
 }
-int mget_i2c_addr_width(mfile *mf, u_int8_t *addr_width)
+int mget_i2c_addr_width(mfile* mf, u_int8_t* addr_width)
 {
     (void)mf;
     (void)addr_width;
     return 1;
 }
 
-int set_i2c_freq(mfile* mf, u_int8_t freq) {
-    (void) mf;
-    (void) freq;
+int set_i2c_freq(mfile* mf, u_int8_t freq)
+{
+    (void)mf;
+    (void)freq;
     return 1;
 }
 
-int get_i2c_freq(mfile* mf, u_int8_t* freq) {
-    (void) mf;
-    (void) freq;
+int get_i2c_freq(mfile* mf, u_int8_t* freq)
+{
+    (void)mf;
+    (void)freq;
     return 1;
 }
 
-
-int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data)
+int read_dword_from_conf_space(mfile* mf, u_int32_t offset, u_int32_t* data)
 {
     int ret = 0;
 
     // Parameters validation.
-    if(!mf || !data)
+    if (!mf || !data)
     {
         return -1;
     }
 
     // take semaphore.
     ret = _vendor_specific_sem(mf, 1);
-    if (ret) {
+    if (ret)
+    {
         return ret;
     }
 
     // set address space.
     ret = _set_addr_space(mf, mf->address_space);
 
-    if (!ret) {
+    if (!ret)
+    {
         // read the data.
         READ4_PCI(mf, data, offset, "read value", return -1);
     }
@@ -2663,10 +2985,7 @@ int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data)
     return ret;
 }
 
-
-int mcables_remote_operation_server_side(mfile* mf, u_int32_t address,
-                                        u_int32_t length, u_int8_t* data,
-                                        int remote_op)
+int mcables_remote_operation_server_side(mfile* mf, u_int32_t address, u_int32_t length, u_int8_t* data, int remote_op)
 {
     (void)mf;
     (void)address;
@@ -2676,10 +2995,7 @@ int mcables_remote_operation_server_side(mfile* mf, u_int32_t address,
     return 0;
 }
 
-
-int mcables_remote_operation_client_side(mfile* mf, u_int32_t address,
-                                        u_int32_t length, u_int8_t* data,
-                                        int remote_op)
+int mcables_remote_operation_client_side(mfile* mf, u_int32_t address, u_int32_t length, u_int8_t* data, int remote_op)
 {
     (void)mf;
     (void)address;
@@ -2689,10 +3005,7 @@ int mcables_remote_operation_client_side(mfile* mf, u_int32_t address,
     return 0;
 }
 
-
-int mlxcables_remote_operation_client_side(mfile* mf, const char* device_name,
-                                           char op, char flags,
-                                           const char* reg_name)
+int mlxcables_remote_operation_client_side(mfile* mf, const char* device_name, char op, char flags, const char* reg_name)
 {
     (void)mf;
     (void)device_name;
diff --git a/mtcr_py/cmtcr.c b/mtcr_py/cmtcr.c
index f8143e50..85c11219 100644
--- a/mtcr_py/cmtcr.c
+++ b/mtcr_py/cmtcr.c
@@ -38,33 +38,34 @@
 #include <errno.h>
 
 #define CMTCR_UNUSED(var) ((void)(var))
-static PyObject *mtcrModule = 0;
-static PyObject *mtcrExceptionType = 0;
+static PyObject* mtcrModule = 0;
+static PyObject* mtcrExceptionType = 0;
 
 /**********************************************
  * mtcr_init
  * @return
  *********************************************/
-PyObject* mtcr_init(PyObject *self, PyObject *args)
+PyObject* mtcr_init(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
-    const char *dev;
-    mfile *mf;
-
+    PyObject* mfileObj;
+    const char* dev;
+    mfile* mf;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "Os", &mfileObj, &dev)) {
+    if (!PyArg_ParseTuple(args, "Os", &mfileObj, &dev))
+    {
         return NULL;
     }
 
     mf = mopen(dev);
-    if (!mf) {
+    if (!mf)
+    {
         PyErr_SetString(mtcrExceptionType, strerror(errno));
         return NULL;
     }
 
-    PyObject *mfLong = PyLong_FromVoidPtr(mf);
+    PyObject* mfLong = PyLong_FromVoidPtr(mf);
     PyObject_SetAttrString(mfileObj, "mf", mfLong);
     Py_DecRef(mfLong);
 
@@ -74,21 +75,23 @@ PyObject* mtcr_init(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_close
  *********************************************/
-PyObject* mtcr_close(PyObject *self, PyObject *args)
+PyObject* mtcr_close(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
-    const char *dev;
-    mfile *mf;
+    PyObject* mfileObj;
+    const char* dev;
+    mfile* mf;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "Os", &mfileObj, &dev)) {
+    if (!PyArg_ParseTuple(args, "Os", &mfileObj, &dev))
+    {
         return NULL;
     }
 
-    PyObject *mfLong = PyObject_GetAttrString(mfileObj, "mf");
-    mf = (mfile*) PyLong_AsVoidPtr(mfLong);
-    if (mf) {
+    PyObject* mfLong = PyObject_GetAttrString(mfileObj, "mf");
+    mf = (mfile*)PyLong_AsVoidPtr(mfLong);
+    if (mf)
+    {
         mclose(mf);
     }
     Py_DecRef(mfLong);
@@ -99,19 +102,20 @@ PyObject* mtcr_close(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_del
  *********************************************/
-PyObject* mtcr_del(PyObject *self, PyObject *args)
+PyObject* mtcr_del(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
-    const char *dev;
+    PyObject* mfileObj;
+    const char* dev;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "Os", &mfileObj, &dev)) {
+    if (!PyArg_ParseTuple(args, "Os", &mfileObj, &dev))
+    {
         return NULL;
     }
 
     mtcr_close(self, args);
-    PyObject *mfLong = PyLong_FromLong(0);
+    PyObject* mfLong = PyLong_FromLong(0);
     PyObject_SetAttrString(mfLong, "mf", mfLong);
     Py_DecRef(mfLong);
 
@@ -121,25 +125,27 @@ PyObject* mtcr_del(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_read4
  *********************************************/
-PyObject* mtcr_read4(PyObject *self, PyObject *args)
+PyObject* mtcr_read4(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
+    PyObject* mfileObj;
     int addr;
-    mfile *mf;
+    mfile* mf;
     u_int32_t value;
-    PyObject *valueObj;
+    PyObject* valueObj;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "Oi", &mfileObj, &addr)) {
+    if (!PyArg_ParseTuple(args, "Oi", &mfileObj, &addr))
+    {
         return NULL;
     }
 
-    PyObject *mfLong = PyObject_GetAttrString(mfileObj, "mf");
-    mf = (mfile*) PyLong_AsVoidPtr(mfLong);
+    PyObject* mfLong = PyObject_GetAttrString(mfileObj, "mf");
+    mf = (mfile*)PyLong_AsVoidPtr(mfLong);
     Py_DecRef(mfLong);
 
-    if (mread4(mf, addr, &value) != 4) {
+    if (mread4(mf, addr, &value) != 4)
+    {
         PyErr_SetString(mtcrExceptionType, strerror(errno));
         return NULL;
     }
@@ -151,40 +157,44 @@ PyObject* mtcr_read4(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_read4
  *********************************************/
-PyObject* mtcr_read4block(PyObject *self, PyObject *args)
+PyObject* mtcr_read4block(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
+    PyObject* mfileObj;
     int addr;
     int i;
-    mfile *mf;
+    mfile* mf;
     int dword_len;
-    PyObject *data_list;
-    u_int32_t *data_buf;
-    PyObject *mfLong;
+    PyObject* data_list;
+    u_int32_t* data_buf;
+    PyObject* mfLong;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "Oii", &mfileObj, &addr, &dword_len)) {
+    if (!PyArg_ParseTuple(args, "Oii", &mfileObj, &addr, &dword_len))
+    {
         return NULL;
     }
 
     mfLong = PyObject_GetAttrString(mfileObj, "mf");
-    mf = (mfile*) PyLong_AsVoidPtr(mfLong);
+    mf = (mfile*)PyLong_AsVoidPtr(mfLong);
     Py_DecRef(mfLong);
 
     data_buf = malloc(sizeof(u_int32_t) * dword_len);
-    if (!data_buf) {
+    if (!data_buf)
+    {
         PyErr_SetString(mtcrExceptionType, "Out read of memory");
         return NULL;
     }
 
-    if (mread4_block(mf, addr, data_buf, dword_len * 4) != (dword_len * 4)) {
+    if (mread4_block(mf, addr, data_buf, dword_len * 4) != (dword_len * 4))
+    {
         PyErr_SetString(mtcrExceptionType, strerror(errno));
         return NULL;
     }
 
     data_list = PyList_New(dword_len);
-    for (i = 0; i < dword_len; i++) {
+    for (i = 0; i < dword_len; i++)
+    {
         PyList_SET_ITEM(data_list, i, PyInt_FromLong((long)data_buf[i]));
     }
 
@@ -194,24 +204,26 @@ PyObject* mtcr_read4block(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_write4
  *********************************************/
-PyObject* mtcr_write4(PyObject *self, PyObject *args)
+PyObject* mtcr_write4(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
+    PyObject* mfileObj;
     int addr;
-    mfile *mf;
+    mfile* mf;
     u_int32_t value;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "Oii", &mfileObj, &addr, &value)) {
+    if (!PyArg_ParseTuple(args, "Oii", &mfileObj, &addr, &value))
+    {
         return NULL;
     }
 
-    PyObject *mfLong = PyObject_GetAttrString(mfileObj, "mf");
-    mf = (mfile*) PyLong_AsVoidPtr(mfLong);
+    PyObject* mfLong = PyObject_GetAttrString(mfileObj, "mf");
+    mf = (mfile*)PyLong_AsVoidPtr(mfLong);
     Py_DecRef(mfLong);
 
-    if (mwrite4(mf, addr, value) != 4) {
+    if (mwrite4(mf, addr, value) != 4)
+    {
         PyErr_SetString(mtcrExceptionType, strerror(errno));
         return NULL;
     }
@@ -222,39 +234,43 @@ PyObject* mtcr_write4(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_write4block
  *********************************************/
-PyObject* mtcr_write4block(PyObject *self, PyObject *args)
+PyObject* mtcr_write4block(PyObject* self, PyObject* args)
 {
-    PyObject *mfileObj;
+    PyObject* mfileObj;
     int addr;
     int i;
-    mfile *mf;
+    mfile* mf;
     int dword_len;
-    PyObject *data_list;
-    u_int32_t *data_buf;
-    PyObject *mfLong;
+    PyObject* data_list;
+    u_int32_t* data_buf;
+    PyObject* mfLong;
 
     CMTCR_UNUSED(self);
     // Parse args
-    if (!PyArg_ParseTuple(args, "OiO", &mfileObj, &addr, &data_list)) {
+    if (!PyArg_ParseTuple(args, "OiO", &mfileObj, &addr, &data_list))
+    {
         return NULL;
     }
 
     mfLong = PyObject_GetAttrString(mfileObj, "mf");
-    mf = (mfile*) PyLong_AsVoidPtr(mfLong);
+    mf = (mfile*)PyLong_AsVoidPtr(mfLong);
     Py_DecRef(mfLong);
 
     dword_len = PyList_Size(data_list);
     data_buf = malloc(sizeof(u_int32_t) * dword_len);
-    if (!data_buf) {
+    if (!data_buf)
+    {
         PyErr_SetString(mtcrExceptionType, "Write Out of memory");
         return NULL;
     }
 
-    for (i = 0; i < dword_len; i++) {
+    for (i = 0; i < dword_len; i++)
+    {
         data_buf[i] = PyLong_AsUnsignedLong(PyList_GET_ITEM(data_list, i));
     }
 
-    if (mwrite4_block(mf, addr, data_buf, dword_len * 4) != (dword_len * 4)) {
+    if (mwrite4_block(mf, addr, data_buf, dword_len * 4) != (dword_len * 4))
+    {
         PyErr_SetString(mtcrExceptionType, strerror(errno));
         return NULL;
     }
@@ -265,14 +281,15 @@ PyObject* mtcr_write4block(PyObject *self, PyObject *args)
 /**********************************************
  * mtcr_funcs static db
  *********************************************/
-static PyMethodDef mtcr_funcs [] = { {"mtcr_init", (PyCFunction)mtcr_init, METH_VARARGS,  "Init mfile object"},
-                                     {"mtcr_close", (PyCFunction)mtcr_close, METH_VARARGS, "Close internal mfile"},
-                                     {"mtcr_del", (PyCFunction)mtcr_del, METH_VARARGS, "Free resources"},
-                                     {"mtcr_read4", (PyCFunction)mtcr_read4, METH_VARARGS, "Read dword"},
-                                     {"mtcr_write4", (PyCFunction)mtcr_write4, METH_VARARGS, "Write dword"},
-                                     {"mtcr_read4block", (PyCFunction)mtcr_read4block, METH_VARARGS, "Read block of dwords"},
-                                     {"mtcr_write4block", (PyCFunction)mtcr_write4block, METH_VARARGS, "Write block of dwords"},
-                                     {NULL, NULL, 0, NULL} };
+static PyMethodDef mtcr_funcs[] = {
+  {"mtcr_init", (PyCFunction)mtcr_init, METH_VARARGS, "Init mfile object"},
+  {"mtcr_close", (PyCFunction)mtcr_close, METH_VARARGS, "Close internal mfile"},
+  {"mtcr_del", (PyCFunction)mtcr_del, METH_VARARGS, "Free resources"},
+  {"mtcr_read4", (PyCFunction)mtcr_read4, METH_VARARGS, "Read dword"},
+  {"mtcr_write4", (PyCFunction)mtcr_write4, METH_VARARGS, "Write dword"},
+  {"mtcr_read4block", (PyCFunction)mtcr_read4block, METH_VARARGS, "Read block of dwords"},
+  {"mtcr_write4block", (PyCFunction)mtcr_write4block, METH_VARARGS, "Write block of dwords"},
+  {NULL, NULL, 0, NULL}};
 
 #define STR_EXPAND(tok) #tok
 #define STR(tok) STR_EXPAND(tok)
@@ -287,20 +304,22 @@ static PyMethodDef mtcr_funcs [] = { {"mtcr_init", (PyCFunction)mtcr_init, METH_
  * initcmtcr
  * @return
  *********************************************/
-#ifndef PyMODINIT_FUNC  /* declarations for DLL import/export */
+#ifndef PyMODINIT_FUNC /* declarations for DLL import/export */
 #define PyMODINIT_FUNC void
 #endif
 PyMODINIT_FUNC INIT_FUNC()
 {
     Py_InitModule(MODULE_NAME, mtcr_funcs);
     mtcrModule = PyImport_ImportModule("mtcr");
-    if (!mtcrModule) {
+    if (!mtcrModule)
+    {
         PyErr_SetString(mtcrExceptionType, "Failed to import module");
         return;
     }
 
-    mtcrExceptionType =  PyObject_GetAttrString(mtcrModule, "MtcrException");
-    if (!mtcrExceptionType) {
+    mtcrExceptionType = PyObject_GetAttrString(mtcrModule, "MtcrException");
+    if (!mtcrExceptionType)
+    {
         PyErr_SetString(PyExc_ImportError, "Failed to import MtcrException class");
         return;
     }
diff --git a/mtcr_py/mtcr.py b/mtcr_py/mtcr.py
index bd8cd646..4fdcc45d 100644
--- a/mtcr_py/mtcr.py
+++ b/mtcr_py/mtcr.py
@@ -29,7 +29,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 import os
 import sys
@@ -37,21 +37,27 @@
 import ctypes
 import struct
 
+
 def ones(n):
     return (1 << n) - 1
 
+
 def extractField(val, start, size):
-    return (val & (ones(size)<<start)) >> start
+    return (val & (ones(size) << start)) >> start
+
 
 def insertField(val1, start1, val2, start2, size):
-    return val1 & ~(ones(size)<<start1) | (extractField(val2, start2, size) << start1)
+    return val1 & ~(ones(size) << start1) | (extractField(val2, start2, size) << start1)
+
 
 class MtcrException(Exception):
     pass
 
+
 class CmdIfException(Exception):
     pass
 
+
 ##########################
 CMTCR = None
 try:
@@ -60,14 +66,14 @@ class CmdIfException(Exception):
     if platform.system() == "Windows" or os.name == "nt":
         try:
             CMTCR = CDLL("libmtcr-1.dll", use_errno=True)
-        except:
+        except BaseException:
             CMTCR = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libmtcr-1.dll"), use_errno=True)
     else:
         try:
             CMTCR = CDLL("cmtcr.so", use_errno=True)
-        except:
+        except BaseException:
             CMTCR = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "cmtcr.so"), use_errno=True)
-except:
+except BaseException:
     CMTCR = None
 
 if CMTCR:
@@ -98,13 +104,13 @@ def close(self):
 
         def is_cable(self):
             return '_cable' in str(self.mdev)
-        
+
         def is_linkx(self):
             return '_lx' in str(self.mdev)
 
         def open(self):
             if self.is_cable() or self.is_linkx():
-                self.mf = ctypes.c_void_p(self.mopenFuncAdv(self.mdev,0xffffffff))
+                self.mf = ctypes.c_void_p(self.mopenFuncAdv(self.mdev, 0xffffffff))
             else:
                 self.mf = ctypes.c_void_p(self.mopenFunc(self.mdev))
 
@@ -112,8 +118,6 @@ def open(self):
                 error = os.strerror(ctypes.get_errno())
                 raise MtcrException("Failed to re-open device (%s): %s" % (self.mdev.decode("utf-8"), error))
 
-
-
         ##########################
         def __del__(self):
             self.close()
@@ -144,9 +148,9 @@ def writeField(self, val, addr, startBit, size):
             self.write4(addr, newVal)
 
         ##########################
-        def read4Block(self, addr, size): # size in dwords
+        def read4Block(self, addr, size):  # size in dwords
             dataArr = (c_uint32 * size)()
-            if self.mread4BlockFunc(self.mf, addr, cast(dataArr, POINTER(c_uint32)), size*4) !=  size*4:
+            if self.mread4BlockFunc(self.mf, addr, cast(dataArr, POINTER(c_uint32)), size * 4) != size * 4:
                 raise MtcrException("Failed to read block from mst device from address 0x%x of size %d bytes" % (addr, size))
             return list(dataArr)
 
@@ -154,16 +158,16 @@ def read4Block(self, addr, size): # size in dwords
         def write4Block(self, addr, dataList):
             size = len(dataList)
             dataArr = (c_uint32 * size)(*dataList)
-            if self.mwrite4BlockFunc(self.mf, addr, cast(dataArr, POINTER(c_uint32)), size*4) !=  size*4:
+            if self.mwrite4BlockFunc(self.mf, addr, cast(dataArr, POINTER(c_uint32)), size * 4) != size * 4:
                 raise MtcrException("Failed to write block to mst device to address 0x%x of size %d bytes" % (addr, size))
-            
+
         ##########################
         def icmdSendCmd(self, opcode, data, skipWrite):
             dataArr = (c_uint8 * len(data))(*data)
             rc = self.icmdSendCommandFunc(self.mf, opcode, cast(dataArr, POINTER(c_uint8)), len(data), skipWrite)
 
-            #data can also be used as output so need to convert back from dataArr.
-            for i,x in enumerate(dataArr):
+            # data can also be used as output so need to convert back from dataArr.
+            for i, x in enumerate(dataArr):
                 data[i] = dataArr[i]
             if rc:
                 raise CmdIfException("Failed to send command")
@@ -175,7 +179,7 @@ def mHcaReset(self, dbdf_list):
             bus_array = (ctypes.c_ulong * bus_array_size)()
 
             # Extract the bus value from the dbdf list.
-            for idx,dbdf in enumerate(dbdf_list):
+            for idx, dbdf in enumerate(dbdf_list):
                 bus_array[idx] = int(dbdf[5:7], 16)
 
             if self.mHcaResetFunc(self.mf, bus_array, bus_array_size) != 0:
@@ -183,11 +187,10 @@ def mHcaReset(self, dbdf_list):
         ##########################
 
 
-
 else:
     import subprocess
     import string
-    
+
     def getstatusoutput(cmd):
         pipe = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         cout = pipe.stdout
@@ -240,22 +243,22 @@ def writeField(self, val, addr, startBit, size):
             self.write4(addr, newVal)
 
         ##########################
-        def read4Block(self, addr, size): # size in dwords
+        def read4Block(self, addr, size):  # size in dwords
             l = []
-            for add in range(addr, addr + size*4, 4):
+            for add in range(addr, addr + size * 4, 4):
                 l.append(self.read4(add))
             return l
 
         ##########################
         def write4Block(self, addr, dataList):
             size = len(dataList)
-            for i, current_addr in enumerate(range(addr, addr + size*4, 4)):
+            for i, current_addr in enumerate(range(addr, addr + size * 4, 4)):
                 self.write4(current_addr, dataList[i])
-        
-        ##########################   
+
+        ##########################
         def icmdSendCmd(self, opcode, data, skipWrite):
             raise MtcrException("icmd isn't supported in MCRA mode")
 
-        ##########################   
+        ##########################
         def mHcaReset(self, dbdf_list):
             raise MtcrException("mswReset isn't supported in MCRA mode")
diff --git a/mtcr_py/test.py b/mtcr_py/test.py
index 3bdc1270..71d42321 100755
--- a/mtcr_py/test.py
+++ b/mtcr_py/test.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 
 from __future__ import print_function
diff --git a/mtcr_ul/mtcr_ib.h b/mtcr_ul/mtcr_ib.h
index c0581a45..9fa2e4b1 100644
--- a/mtcr_ul/mtcr_ib.h
+++ b/mtcr_ul/mtcr_ib.h
@@ -41,27 +41,30 @@
 
 #include <mtcr.h>
 
-int mib_open(const char *name, mfile *mf, int mad_init);
-int mib_close(mfile *mf);
-int mib_read4(mfile *mf, unsigned int offset, u_int32_t *value);
-int mib_write4(mfile *mf, unsigned int offset, u_int32_t value);
-int mib_read64(mfile *mf, unsigned int offset, void *data, int length);
-int mib_write64(mfile *mf, unsigned int offset, void *data, int length);
+int mib_open(const char* name, mfile* mf, int mad_init);
+int mib_close(mfile* mf);
+int mib_read4(mfile* mf, unsigned int offset, u_int32_t* value);
+int mib_write4(mfile* mf, unsigned int offset, u_int32_t value);
+int mib_read64(mfile* mf, unsigned int offset, void* data, int length);
+int mib_write64(mfile* mf, unsigned int offset, void* data, int length);
 
-int mib_readblock(mfile *mf, unsigned int offset, u_int32_t *data, int length);
-int mib_writeblock(mfile *mf, unsigned int offset, u_int32_t *data, int length);
-int mib_swreset(mfile *mf);
-int mib_get_chunk_size(mfile *mf);
-int mib_acces_reg_mad(mfile *mf, u_int8_t *data);
+int mib_readblock(mfile* mf, unsigned int offset, u_int32_t* data, int length);
+int mib_writeblock(mfile* mf, unsigned int offset, u_int32_t* data, int length);
+int mib_swreset(mfile* mf);
+int mib_get_chunk_size(mfile* mf);
+int mib_acces_reg_mad(mfile* mf, u_int8_t* data);
 
-int mib_smp_set(mfile *mf, u_int8_t *data, u_int16_t attr_id, u_int32_t attr_mod);
-int mib_smp_get(mfile *mf, u_int8_t *data, u_int16_t attr_id, u_int32_t attr_mod);
-int mib_semaphore_lock_smp(mfile *mf, u_int8_t *data, sem_lock_method_t method);
-int mib_get_gmp(mfile *mf, unsigned attr_id, unsigned mod, u_int32_t *vsmad_data, size_t vsmad_data_len);
-int mib_supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method);
-int mib_send_gmp_access_reg_mad(mfile *mf, u_int32_t *data,
-                                u_int32_t reg_size, u_int32_t reg_id,
-                                maccess_reg_method_t reg_method, int *reg_status);
-int mib_supports_reg_access_cls_a(mfile *mf, maccess_reg_method_t reg_method);
-int mib_send_cls_a_access_reg_mad(mfile *mf, u_int8_t *data);
+int mib_smp_set(mfile* mf, u_int8_t* data, u_int16_t attr_id, u_int32_t attr_mod);
+int mib_smp_get(mfile* mf, u_int8_t* data, u_int16_t attr_id, u_int32_t attr_mod);
+int mib_semaphore_lock_smp(mfile* mf, u_int8_t* data, sem_lock_method_t method);
+int mib_get_gmp(mfile* mf, unsigned attr_id, unsigned mod, u_int32_t* vsmad_data, size_t vsmad_data_len);
+int mib_supports_reg_access_gmp(mfile* mf, maccess_reg_method_t reg_method);
+int mib_send_gmp_access_reg_mad(mfile* mf,
+                                u_int32_t* data,
+                                u_int32_t reg_size,
+                                u_int32_t reg_id,
+                                maccess_reg_method_t reg_method,
+                                int* reg_status);
+int mib_supports_reg_access_cls_a(mfile* mf, maccess_reg_method_t reg_method);
+int mib_send_cls_a_access_reg_mad(mfile* mf, u_int8_t* data);
 #endif
diff --git a/mtcr_ul/mtcr_ib_ofed.c b/mtcr_ul/mtcr_ib_ofed.c
index 8e40cf68..a59a507d 100644
--- a/mtcr_ul/mtcr_ib_ofed.c
+++ b/mtcr_ul/mtcr_ib_ofed.c
@@ -45,10 +45,8 @@
 *   author: yoniy@mellanox.co.il , Apr. 16th 2007
 */
 
-
-
 #if HAVE_CONFIG_H
-#  include <config.h>
+#include <config.h>
 #endif
 #include <ctype.h>
 #include <stdio.h>
@@ -73,58 +71,60 @@
 #include <infiniband/mad.h>
 
 #ifdef __WIN__
-    #include <windows.h>
-    #include "com_def.h"
-
-    #define BAD_RET_VAL 1
-    #define LIB_IBMAD  "libibmad"
-
-    #define MY_GetPointerAddress(ivm, func_name, f_type) do { \
-        ivm->func_name = (f_type)GetProcAddress(ivm->dl_handle, #func_name); \
-        if (ivm->func_name == NULL) { \
+#include <windows.h>
+#include "com_def.h"
+
+#define BAD_RET_VAL 1
+#define LIB_IBMAD "libibmad"
+
+#define MY_GetPointerAddress(ivm, func_name, f_type)                                 \
+    do                                                                               \
+    {                                                                                \
+        ivm->func_name = (f_type)GetProcAddress(ivm->dl_handle, #func_name);         \
+        if (ivm->func_name == NULL)                                                  \
+        {                                                                            \
             IBERROR(("Failed to find %s function on ibal.dll file.\n", #func_name)); \
-            errno = ENOSYS; \
-            return -1; \
-        } \
-} while (0)
+            errno = ENOSYS;                                                          \
+            return -1;                                                               \
+        }                                                                            \
+    } while (0)
 
-    #define MY_GetProcAddress(ivm, func_name)  MY_GetPointerAddress(ivm, func_name, f_##func_name)
-    #define MY_GetProcAddressIgnoreFail(ivm, func_name) \
+#define MY_GetProcAddress(ivm, func_name) MY_GetPointerAddress(ivm, func_name, f_##func_name)
+#define MY_GetProcAddressIgnoreFail(ivm, func_name) \
     ivm->func_name = (f_##func_name)GetProcAddress(ivm->dl_handle, #func_name)
-    #define MY_GetVarAddress(ivm, var_name)    MY_GetPointerAddress(ivm, var_name, void*)
-
-    #define DLL_HANDLE HINSTANCE
-    #define OP_NOT_SUPPORTED EINVAL
-    #define IBMAD_CALL_CONV __stdcall
+#define MY_GetVarAddress(ivm, var_name) MY_GetPointerAddress(ivm, var_name, void*)
 
+#define DLL_HANDLE HINSTANCE
+#define OP_NOT_SUPPORTED EINVAL
+#define IBMAD_CALL_CONV __stdcall
 
 #else
-    #include <getopt.h>
-    #include <unistd.h>
-    #include <dlfcn.h>
-    #include <asm/byteorder.h>
-
-    #define DLL_HANDLE void*
-    #define BAD_RET_VAL ~0llu
-    #define MY_DLSYM(mf, func_name) do { \
-        const char *dl_error; \
+#include <getopt.h>
+#include <unistd.h>
+#include <dlfcn.h>
+#include <asm/byteorder.h>
+
+#define DLL_HANDLE void*
+#define BAD_RET_VAL ~0llu
+#define MY_DLSYM(mf, func_name)                           \
+    do                                                    \
+    {                                                     \
+        const char* dl_error;                             \
         mf->func_name = dlsym(mf->dl_handle, #func_name); \
-        if ((dl_error = dlerror()) != NULL)  { \
-            IBERROR(("%s", dl_error)); \
-            return -1; \
-        } \
-} while (0)
+        if ((dl_error = dlerror()) != NULL)               \
+        {                                                 \
+            IBERROR(("%s", dl_error));                    \
+            return -1;                                    \
+        }                                                 \
+    } while (0)
 
-    #define MY_DLSYM_IGNORE_FAIL(mf, func_name) \
-    mf->func_name = dlsym(mf->dl_handle, #func_name)
-
-    #define OP_NOT_SUPPORTED EOPNOTSUPP
-    #define IBMAD_CALL_CONV
+#define MY_DLSYM_IGNORE_FAIL(mf, func_name) mf->func_name = dlsym(mf->dl_handle, #func_name)
 
+#define OP_NOT_SUPPORTED EOPNOTSUPP
+#define IBMAD_CALL_CONV
 
 #endif
 
-
 #define __BUILD_VERSION_TAG__ 1.1
 //#include "ibvsmad.h"
 
@@ -134,118 +134,157 @@
 // #define DEBUG(fmt, args...)  if (verbose) iberror(0, __FUNCTION__, fmt, ## args)
 // #define IBERROR(fmt, args...)   iberror(1, __FUNCTION__, fmt, ## args)
 
-#define IBERROR(args) do {               printf("-E- ibvsmad : "); \
-                                         printf args; \
-                                         printf("\n"); \
-                                         errno = EINVAL; \
-} while (0)
-#define DEBUG(args) do {   if (verbose) { \
-                               printf("-D- ibvsmad : "); \
-                               printf args; \
-                               printf("\n"); \
-                               errno = EINVAL; \
-                           } \
-} while (0)
+#define IBERROR(args)             \
+    do                            \
+    {                             \
+        printf("-E- ibvsmad : "); \
+        printf args;              \
+        printf("\n");             \
+        errno = EINVAL;           \
+    } while (0)
+#define DEBUG(args)                   \
+    do                                \
+    {                                 \
+        if (verbose)                  \
+        {                             \
+            printf("-D- ibvsmad : "); \
+            printf args;              \
+            printf("\n");             \
+            errno = EINVAL;           \
+        }                             \
+    } while (0)
 
 // BIT Slicing macros
-#define ONES32(size)                    ((size) ? (0xffffffff >> (32 - (size))) : 0)
-#define MASK32(offset, size)             (ONES32(size) << (offset))
+#define ONES32(size) ((size) ? (0xffffffff >> (32 - (size))) : 0)
+#define MASK32(offset, size) (ONES32(size) << (offset))
 
-#define EXTRACT_C(source, offset, size)   ((((unsigned)(source)) >> (offset)) & ONES32(size))
-#define EXTRACT(src, start, len)          (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
+#define EXTRACT_C(source, offset, size) ((((unsigned)(source)) >> (offset)) & ONES32(size))
+#define EXTRACT(src, start, len) (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
 
-#define MERGE_C(rsrc1, rsrc2, start, len)  ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
-#define MERGE(rsrc1, rsrc2, start, len)    (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
+#define MERGE_C(rsrc1, rsrc2, start, len) \
+    ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
+#define MERGE(rsrc1, rsrc2, start, len) (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
 
 #define SWAPL(l) bswap_32(l)
 
+#define IB_VENDOR_SPECIFIC_CLASS_0xA 0x0A
+#define IB_VENDOR_SPECIFIC_CLASS_0x9 0x09
 
-#define IB_VENDOR_SPECIFIC_CLASS_0xA    0x0A
-#define IB_VENDOR_SPECIFIC_CLASS_0x9    0x09
-
-#define NUMBER_OF_MGMT_ELEMENTS         4
+#define NUMBER_OF_MGMT_ELEMENTS 4
 
-#define IB_VS_ATTR_SW_RESET             0x12
-#define IB_VS_ATTR_EXT_PORT_INFO        0x13
-#define IB_VS_ATTR_CR_ACCESS            0x50
-#define IB_VS_ATTR_GENERAL_INFO         0x17
-#define IB_VS_ATTR_ACCESS_REGISTER_GMP  0x51
+#define IB_VS_ATTR_SW_RESET 0x12
+#define IB_VS_ATTR_EXT_PORT_INFO 0x13
+#define IB_VS_ATTR_CR_ACCESS 0x50
+#define IB_VS_ATTR_GENERAL_INFO 0x17
+#define IB_VS_ATTR_ACCESS_REGISTER_GMP 0x51
 
-#define IB_VS_ATTRMOD_CR            0x00008000
+#define IB_VS_ATTRMOD_CR 0x00008000
 #define IB_VS_ATTR_EPI_ATTRMOD_I2C1 0x02
 
-#define IB_VS_CR_NUM_OF_RECORDS     1
-#define IB_VS_CR_ONE_RECORD_SIZE    4
+#define IB_VS_CR_NUM_OF_RECORDS 1
+#define IB_VS_CR_ONE_RECORD_SIZE 4
 
-#define I2C_CHUNK_SIZE  64
-#define I2C_DEVICE_ID   0x56
+#define I2C_CHUNK_SIZE 64
+#define I2C_DEVICE_ID 0x56
 #define I2C_MEMORY_ADDR 0
 
-#define KEY_GUID_SIZE  32
+#define KEY_GUID_SIZE 32
 
-#define UNSUPP_DEVS_NUM   15
-#define DEVID_ADDRESS     0xf0014
+#define UNSUPP_DEVS_NUM 15
+#define DEVID_ADDRESS 0xf0014
 
 #define CLASS_VS_SIZE_BYTES 224
 #define CLASS_VS_DATA_OFFSET 0x20
 
 // ConfigSpaceAccess Mode 0 supports address of up to 24 bits.
 #define MODE_0_MAX_ADDRESS_RANGE 0x7FFFFF
-#define MODE_2_MAX_RECORDS_NUM   18
-#define MODE_2_MAX_DATA_SIZE     (MODE_2_MAX_RECORDS_NUM * 4)
+#define MODE_2_MAX_RECORDS_NUM 18
+#define MODE_2_MAX_DATA_SIZE (MODE_2_MAX_RECORDS_NUM * 4)
 
 // Convert BYTES - DWORDS with MEMCPY BE
-#define BYTES_TO_DWORD_BE(dw_dest, byte_src) do {   u_int32_t tmp; \
-                                                    memcpy(&tmp, byte_src, 4); \
-                                                    *(dw_dest) = __be32_to_cpu(tmp); \
-} while (0)
-
-#define DWORD_TO_BYTES_BE(bytes_dest, dw_src) do { u_int32_t tmp; \
-                                                   tmp = __cpu_to_be32(*(dw_src)); \
-                                                   memcpy(bytes_dest, &tmp, 4); \
-} while (0)
-
-#define CHECK_NULL(pointer) if (pointer == NULL) {return -1;}
-
-typedef struct ibmad_port*IBMAD_CALL_CONV (*f_mad_rpc_open_port)(char *dev_name, int dev_port,
-                                                                 int *mgmt_classes,
-                                                                 int num_classes);
-typedef void IBMAD_CALL_CONV (*f_mad_rpc_close_port)(struct ibmad_port *srcport);
-typedef int IBMAD_CALL_CONV (*f_ib_resolve_portid_str_via)(ib_portid_t *portid, char *addr_str,
-                                                           int dest, ib_portid_t *sm_id, const struct ibmad_port *srcport);
-typedef uint8_t*IBMAD_CALL_CONV (*f_ib_vendor_call_via)(void *data, ib_portid_t *portid, ib_vendor_call_t *call,
-                                                        const struct ibmad_port *srcport);
-typedef uint8_t*IBMAD_CALL_CONV (*f_smp_query_via)(void *buf, ib_portid_t *id, unsigned attrid, unsigned mod,
-                                                   unsigned timeout, const struct ibmad_port *srcport);
-typedef uint8_t*IBMAD_CALL_CONV (*f_smp_query_status_via)(void *buf, ib_portid_t *id, unsigned attrid, unsigned mod,
-                                                          unsigned timeout, int *rstatus, const struct ibmad_port *srcport);
-typedef uint8_t*IBMAD_CALL_CONV (*f_smp_set_via)(void *buf, ib_portid_t *id, unsigned attrid, unsigned mod,
-                                                 unsigned timeout, const struct ibmad_port *srcport );
-typedef uint8_t*IBMAD_CALL_CONV (*f_smp_set_status_via)(void *buf, ib_portid_t *id, unsigned attrid, unsigned mod,
-                                                        unsigned timeout, int *rstatus, const struct ibmad_port *srcport );
-typedef void IBMAD_CALL_CONV (*f_smp_mkey_set)(struct ibmad_port *srcport, uint64_t mkey);
-
-typedef void IBMAD_CALL_CONV (*f_mad_rpc_set_retries)(struct ibmad_port *port, int retries);
-typedef void IBMAD_CALL_CONV (*f_mad_rpc_set_timeout)(struct ibmad_port *port, int timeout);
-typedef uint32_t IBMAD_CALL_CONV (*f_mad_get_field)(void *buf, int base_offs, enum MAD_FIELDS field);
-
-typedef char*IBMAD_CALL_CONV (*f_portid2str)(ib_portid_t *portid);
-
-typedef void* IBMAD_CALL_CONV (*f_mad_rpc_rmpp) (const struct ibmad_port *srcport, ib_rpc_t * rpc,
-                                                 ib_portid_t * dport, ib_rmpp_hdr_t * rmpp,
-                                                 void *data);
-
-typedef int IBMAD_CALL_CONV (*f_mad_send_via) (ib_rpc_t * rpc, ib_portid_t * dport,
-                                               ib_rmpp_hdr_t * rmpp, void *data,
-                                               struct ibmad_port *srcport);
-
-typedef void* IBMAD_CALL_CONV (*f_mad_rpc) (const struct ibmad_port *srcport, ib_rpc_t* rpc,
-                                            ib_portid_t* dport, void *payload, void* rcvdata);
-
+#define BYTES_TO_DWORD_BE(dw_dest, byte_src) \
+    do                                       \
+    {                                        \
+        u_int32_t tmp;                       \
+        memcpy(&tmp, byte_src, 4);           \
+        *(dw_dest) = __be32_to_cpu(tmp);     \
+    } while (0)
+
+#define DWORD_TO_BYTES_BE(bytes_dest, dw_src) \
+    do                                        \
+    {                                         \
+        u_int32_t tmp;                        \
+        tmp = __cpu_to_be32(*(dw_src));       \
+        memcpy(bytes_dest, &tmp, 4);          \
+    } while (0)
+
+#define CHECK_NULL(pointer) \
+    if (pointer == NULL)    \
+    {                       \
+        return -1;          \
+    }
+
+typedef struct ibmad_port*
+  IBMAD_CALL_CONV (*f_mad_rpc_open_port)(char* dev_name, int dev_port, int* mgmt_classes, int num_classes);
+typedef void IBMAD_CALL_CONV (*f_mad_rpc_close_port)(struct ibmad_port* srcport);
+typedef int IBMAD_CALL_CONV (*f_ib_resolve_portid_str_via)(ib_portid_t* portid,
+                                                           char* addr_str,
+                                                           int dest,
+                                                           ib_portid_t* sm_id,
+                                                           const struct ibmad_port* srcport);
+typedef uint8_t* IBMAD_CALL_CONV (*f_ib_vendor_call_via)(void* data,
+                                                         ib_portid_t* portid,
+                                                         ib_vendor_call_t* call,
+                                                         const struct ibmad_port* srcport);
+typedef uint8_t* IBMAD_CALL_CONV (*f_smp_query_via)(void* buf,
+                                                    ib_portid_t* id,
+                                                    unsigned attrid,
+                                                    unsigned mod,
+                                                    unsigned timeout,
+                                                    const struct ibmad_port* srcport);
+typedef uint8_t* IBMAD_CALL_CONV (*f_smp_query_status_via)(void* buf,
+                                                           ib_portid_t* id,
+                                                           unsigned attrid,
+                                                           unsigned mod,
+                                                           unsigned timeout,
+                                                           int* rstatus,
+                                                           const struct ibmad_port* srcport);
+typedef uint8_t* IBMAD_CALL_CONV (*f_smp_set_via)(void* buf,
+                                                  ib_portid_t* id,
+                                                  unsigned attrid,
+                                                  unsigned mod,
+                                                  unsigned timeout,
+                                                  const struct ibmad_port* srcport);
+typedef uint8_t* IBMAD_CALL_CONV (*f_smp_set_status_via)(void* buf,
+                                                         ib_portid_t* id,
+                                                         unsigned attrid,
+                                                         unsigned mod,
+                                                         unsigned timeout,
+                                                         int* rstatus,
+                                                         const struct ibmad_port* srcport);
+typedef void IBMAD_CALL_CONV (*f_smp_mkey_set)(struct ibmad_port* srcport, uint64_t mkey);
+
+typedef void IBMAD_CALL_CONV (*f_mad_rpc_set_retries)(struct ibmad_port* port, int retries);
+typedef void IBMAD_CALL_CONV (*f_mad_rpc_set_timeout)(struct ibmad_port* port, int timeout);
+typedef uint32_t IBMAD_CALL_CONV (*f_mad_get_field)(void* buf, int base_offs, enum MAD_FIELDS field);
+
+typedef char* IBMAD_CALL_CONV (*f_portid2str)(ib_portid_t* portid);
+
+typedef void* IBMAD_CALL_CONV (*f_mad_rpc_rmpp)(const struct ibmad_port* srcport,
+                                                ib_rpc_t* rpc,
+                                                ib_portid_t* dport,
+                                                ib_rmpp_hdr_t* rmpp,
+                                                void* data);
+
+typedef int IBMAD_CALL_CONV (
+  *f_mad_send_via)(ib_rpc_t* rpc, ib_portid_t* dport, ib_rmpp_hdr_t* rmpp, void* data, struct ibmad_port* srcport);
+
+typedef void* IBMAD_CALL_CONV (
+  *f_mad_rpc)(const struct ibmad_port* srcport, ib_rpc_t* rpc, ib_portid_t* dport, void* payload, void* rcvdata);
 
 struct __ibvsmad_hndl_t
 {
-    struct ibmad_port *srcport;
+    struct ibmad_port* srcport;
 
     ib_portid_t portid;
     int sock;
@@ -280,7 +319,7 @@ struct __ibvsmad_hndl_t
     f_mad_send_via mad_send_via;
     f_mad_rpc mad_rpc;
 
-    void *ibdebug;
+    void* ibdebug;
 };
 
 typedef struct __ibvsmad_hndl_t ibvs_mad;
@@ -295,19 +334,22 @@ static int verbose = 0;
 */
 
 #define IB_SMP_ATTR_CR_ACCESS 0xff50
-#define IB_DATA_INDEX     8
-#define MAX_IB_SMP_DATA_SIZE    (IB_SMP_DATA_SIZE - IB_DATA_INDEX)
-#define MAX_IB_SMP_DATA_DW_NUM  MAX_IB_SMP_DATA_SIZE / 4
+#define IB_DATA_INDEX 8
+#define MAX_IB_SMP_DATA_SIZE (IB_SMP_DATA_SIZE - IB_DATA_INDEX)
+#define MAX_IB_SMP_DATA_DW_NUM MAX_IB_SMP_DATA_SIZE / 4
 
 #define CONFIG_ACCESS_MODE_2_DATA_OFFSET 4
 #define CONFIG_ACCESS_MODE_2_BITMASK_OFFSET 8
 
-void set_mkey_for_smp_mad(ibvs_mad *vsmad)
+void set_mkey_for_smp_mad(ibvs_mad* vsmad)
 {
 #ifdef __linux__
-    if (vsmad->mkey) {
+    if (vsmad->mkey)
+    {
         vsmad->smp_mkey_set(vsmad->srcport, vsmad->mkey);
-    } else {
+    }
+    else
+    {
         vsmad->smp_mkey_set(vsmad->srcport, 0);
     }
 #else
@@ -322,9 +364,8 @@ void set_mkey_for_smp_mad(ibvs_mad *vsmad)
 // Bits 0-15: Address LSB
 static u_int32_t create_attribute_mode_0(u_int32_t memory_address, u_int8_t num_of_dwords)
 {
-    return ( (EXTRACT(memory_address, 0, 16) << 00) & 0x0000ffff ) |
-           ( (num_of_dwords << 16) & 0x00ff0000 ) |
-           ( (EXTRACT(memory_address, 16, 8) << 24) & 0xff000000 );
+    return ((EXTRACT(memory_address, 0, 16) << 00) & 0x0000ffff) | ((num_of_dwords << 16) & 0x00ff0000) |
+           ((EXTRACT(memory_address, 16, 8) << 24) & 0xff000000);
 }
 
 // Attribute modifier for mode 2:
@@ -332,28 +373,30 @@ static u_int32_t create_attribute_mode_0(u_int32_t memory_address, u_int8_t num_
 // Bits 16-21: Number of records (= number of dwords)
 static u_int32_t create_attribute_mode_2(u_int8_t num_of_dwords)
 {
-    return  ( ( ( 2 << 22) & 0x800000 ) |
-            ( (num_of_dwords << 16) & 0x00ff0000 ));
+    return (((2 << 22) & 0x800000) | ((num_of_dwords << 16) & 0x00ff0000));
 }
 
 // For ConfigSpaceAccess Mad we use mode 2
 // only for accessing addresses larger than 24 bits.
 static unsigned int should_use_mode_2(u_int32_t memory_address, u_int8_t num_of_dwords)
 {
-    return memory_address + (num_of_dwords * 4) >
-           MODE_0_MAX_ADDRESS_RANGE ? 1 : 0;
+    return memory_address + (num_of_dwords * 4) > MODE_0_MAX_ADDRESS_RANGE ? 1 : 0;
 }
 
-static void set_mad_data_for_mode_2(u_int32_t memory_address, u_int8_t num_of_dwords,
-                                    u_int8_t* mad_data, u_int32_t* attribute_mod,
-                                    u_int32_t* mask, unsigned int* data_offset)
+static void set_mad_data_for_mode_2(u_int32_t memory_address,
+                                    u_int8_t num_of_dwords,
+                                    u_int8_t* mad_data,
+                                    u_int32_t* attribute_mod,
+                                    u_int32_t* mask,
+                                    unsigned int* data_offset)
 {
     int i = 0;
     *attribute_mod = create_attribute_mode_2(num_of_dwords);
 
     // First dword of each record of ConfigSpaceAccess mode 2
     // contains the current address.
-    for (i = 0; i < num_of_dwords; i++) {
+    for (i = 0; i < num_of_dwords; i++)
+    {
         u_int32_t record_offset = memory_address + i;
         DWORD_TO_BYTES_BE(mad_data + IB_DATA_INDEX + (i * 4), &record_offset);
     }
@@ -365,18 +408,20 @@ static void set_mad_data_for_mode_2(u_int32_t memory_address, u_int8_t num_of_dw
     *mask = 0xFFFFFFFF;
 }
 
-static uint64_t ibvsmad_craccess_rw_smp(ibvs_mad *h, u_int32_t memory_address, int method, u_int8_t num_of_dwords, u_int32_t *data)
+static uint64_t
+  ibvsmad_craccess_rw_smp(ibvs_mad* h, u_int32_t memory_address, int method, u_int8_t num_of_dwords, u_int32_t* data)
 {
     u_int8_t mad_data[IB_SMP_DATA_SIZE] = {0};
     int i;
-    u_int8_t *p;
+    u_int8_t* p;
     u_int32_t attribute_mod = 0;
     u_int64_t mkey = 0;
     u_int32_t mask = 0;
     unsigned int data_offset = 0;
     unsigned int use_mode_2 = should_use_mode_2(memory_address, num_of_dwords);
 
-    if (num_of_dwords > MAX_IB_SMP_DATA_DW_NUM) {
+    if (num_of_dwords > MAX_IB_SMP_DATA_DW_NUM)
+    {
         IBERROR(("size is too big, maximum number of dwords is %d", MAX_IB_SMP_DATA_DW_NUM));
         return BAD_RET_VAL;
     }
@@ -386,48 +431,61 @@ static uint64_t ibvsmad_craccess_rw_smp(ibvs_mad *h, u_int32_t memory_address, i
     memcpy(&mad_data[0], &mkey, 8);
     set_mkey_for_smp_mad(h);
 
-    if (use_mode_2) {
-        set_mad_data_for_mode_2(memory_address, num_of_dwords,
-                                mad_data, &attribute_mod,
-                                &mask, &data_offset);
-
-    } else {
+    if (use_mode_2)
+    {
+        set_mad_data_for_mode_2(memory_address, num_of_dwords, mad_data, &attribute_mod, &mask, &data_offset);
+    }
+    else
+    {
         attribute_mod = create_attribute_mode_0(memory_address, num_of_dwords);
     }
 
     DEBUG(("Sending ConfigSpaceAccess SMP MAD...\n"));
-    if (h->portid.lid) {
+    if (h->portid.lid)
+    {
         DEBUG(("Management Class: 0x1\n"));
-    } else {
+    }
+    else
+    {
         DEBUG(("Management Class: 0x81\n"));
     }
     DEBUG(("Attribute Modifier = 0x%08x\n", attribute_mod));
-     if (use_mode_2) {
+    if (use_mode_2)
+    {
         DEBUG(("Mode: 2\n"));
-    } else {
+    }
+    else
+    {
         DEBUG(("Mode: 0\n"));
     }
     DEBUG(("Attribute ID = 0x%08x\n", IB_SMP_ATTR_CR_ACCESS));
     DEBUG(("Memory Address = 0x%08x\n", memory_address));
     DEBUG(("Number of dwords = %d\n", num_of_dwords));
 
-    if (method == IB_MAD_METHOD_GET) {
+    if (method == IB_MAD_METHOD_GET)
+    {
         p = h->smp_query_via(mad_data, &h->portid, IB_SMP_ATTR_CR_ACCESS, attribute_mod, 0, h->srcport);
 
-        if (!p) {
+        if (!p)
+        {
             return BAD_RET_VAL;
         }
 
-        for (i = 0; i < num_of_dwords; i++) {
+        for (i = 0; i < num_of_dwords; i++)
+        {
             BYTES_TO_DWORD_BE(data + i, mad_data + IB_DATA_INDEX + data_offset + (i * 4));
         }
-    } else {
-        for (i = 0; i < num_of_dwords; i++) {
+    }
+    else
+    {
+        for (i = 0; i < num_of_dwords; i++)
+        {
             DWORD_TO_BYTES_BE(mad_data + IB_DATA_INDEX + data_offset + (i * 4), data + i);
             DWORD_TO_BYTES_BE(mad_data + IB_DATA_INDEX + CONFIG_ACCESS_MODE_2_BITMASK_OFFSET + (i * 4), &mask);
         }
         p = h->smp_set_via(mad_data, &h->portid, IB_SMP_ATTR_CR_ACCESS, attribute_mod, 0, h->srcport);
-        if (!p) {
+        if (!p)
+        {
             return BAD_RET_VAL;
         }
     }
@@ -436,55 +494,63 @@ static uint64_t ibvsmad_craccess_rw_smp(ibvs_mad *h, u_int32_t memory_address, i
 }
 
 // TODO: Correct this value.
-#define  MAX_VS_DATA_SIZE (IB_VENDOR_RANGE1_DATA_SIZE -  IB_DATA_INDEX)
-#define  MAX_IB_VS_DATA_DW_NUM  MAX_VS_DATA_SIZE / 4
-
-static uint64_t ibvsmad_craccess_rw_vs(ibvs_mad *h, u_int32_t memory_address,
-                                       int method, u_int8_t num_of_dwords,
-                                       u_int32_t *data, int class)
+#define MAX_VS_DATA_SIZE (IB_VENDOR_RANGE1_DATA_SIZE - IB_DATA_INDEX)
+#define MAX_IB_VS_DATA_DW_NUM MAX_VS_DATA_SIZE / 4
+
+static uint64_t ibvsmad_craccess_rw_vs(ibvs_mad* h,
+                                       u_int32_t memory_address,
+                                       int method,
+                                       u_int8_t num_of_dwords,
+                                       u_int32_t* data,
+                                       int class)
 {
     u_int8_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE] = {0};
     ib_vendor_call_t call;
     int i;
-    u_int8_t *p;
+    u_int8_t* p;
     u_int32_t attribute_mod = 0;
     u_int32_t mask = 0;
     u_int64_t vskey = 0;
     unsigned int data_offset = 0;
     int use_mode_2 = should_use_mode_2(memory_address, num_of_dwords);
 
-    if (h == NULL || data == NULL) {
+    if (h == NULL || data == NULL)
+    {
         return BAD_RET_VAL;
     }
 
-    if (num_of_dwords > MAX_IB_VS_DATA_DW_NUM) {
-        IBERROR(("size (%d) is too big, maximum num of dwords is %d", num_of_dwords,
-                 MAX_IB_VS_DATA_DW_NUM));
+    if (num_of_dwords > MAX_IB_VS_DATA_DW_NUM)
+    {
+        IBERROR(("size (%d) is too big, maximum num of dwords is %d", num_of_dwords, MAX_IB_VS_DATA_DW_NUM));
         return BAD_RET_VAL;
     }
 
-    if (use_mode_2) {
-        set_mad_data_for_mode_2(memory_address, num_of_dwords,
-                                vsmad_data, &attribute_mod,
-                                &mask, &data_offset);
-    } else {
+    if (use_mode_2)
+    {
+        set_mad_data_for_mode_2(memory_address, num_of_dwords, vsmad_data, &attribute_mod, &mask, &data_offset);
+    }
+    else
+    {
         attribute_mod = create_attribute_mode_0(memory_address, num_of_dwords);
     }
 
-    call.method     = method;
+    call.method = method;
     call.mgmt_class = class;
-    call.attrid     = IB_VS_ATTR_CR_ACCESS;
-    call.mod        = attribute_mod;
-    call.oui        = IB_OPENIB_OUI;
-    call.timeout    = 0;
+    call.attrid = IB_VS_ATTR_CR_ACCESS;
+    call.mod = attribute_mod;
+    call.oui = IB_OPENIB_OUI;
+    call.timeout = 0;
     memset(&call.rmpp, 0, sizeof(call.rmpp));
 
     DEBUG(("Sending ConfigSpaceAccess VS MAD...\n"));
     DEBUG(("Management Class = 0x%02x\n", call.mgmt_class));
     DEBUG(("Attribute Modifier = 0x%08x\n", call.mod));
-    if (use_mode_2) {
+    if (use_mode_2)
+    {
         DEBUG(("Mode: 2\n"));
-    } else {
+    }
+    else
+    {
         DEBUG(("Mode: 0\n"));
     }
     DEBUG(("Attribute ID = 0x%08x\n", call.attrid));
@@ -495,182 +561,190 @@ static uint64_t ibvsmad_craccess_rw_vs(ibvs_mad *h, u_int32_t memory_address,
     vskey = __cpu_to_be64(h->vskey);
     memcpy(vsmad_data, &vskey, 8);
 
-    for (i = 0; i < num_of_dwords; i++) {
-        if (method == IB_MAD_METHOD_SET) {
+    for (i = 0; i < num_of_dwords; i++)
+    {
+        if (method == IB_MAD_METHOD_SET)
+        {
             DWORD_TO_BYTES_BE(vsmad_data + IB_DATA_INDEX + data_offset + (i * 4), data + i);
             DWORD_TO_BYTES_BE(vsmad_data + IB_DATA_INDEX + CONFIG_ACCESS_MODE_2_BITMASK_OFFSET + (i * 4), &mask);
         }
     }
 
     p = h->ib_vendor_call_via(vsmad_data, &h->portid, &call, h->srcport);
-    if (!p) {
+    if (!p)
+    {
         return BAD_RET_VAL;
     }
 
-    for (i = 0; i < num_of_dwords; i++) {
+    for (i = 0; i < num_of_dwords; i++)
+    {
         BYTES_TO_DWORD_BE(data + i, vsmad_data + IB_DATA_INDEX + data_offset + (i * 4));
     }
 
     return 0;
 }
 
-static uint64_t ibvsmad_craccess_rw(ibvs_mad *h, u_int32_t memory_address, int method, u_int8_t num_of_dwords, u_int32_t *data)
+static uint64_t
+  ibvsmad_craccess_rw(ibvs_mad* h, u_int32_t memory_address, int method, u_int8_t num_of_dwords, u_int32_t* data)
 {
-    if (h->use_smp) {
+    if (h->use_smp)
+    {
         return ibvsmad_craccess_rw_smp(h, memory_address, method, num_of_dwords, data);
-    } else {
-        if (h->use_class_a) {
-            return ibvsmad_craccess_rw_vs(h, memory_address,
-                                          method, num_of_dwords,
-                                          data, IB_VENDOR_SPECIFIC_CLASS_0xA);
-        } else {
+    }
+    else
+    {
+        if (h->use_class_a)
+        {
+            return ibvsmad_craccess_rw_vs(h, memory_address, method, num_of_dwords, data, IB_VENDOR_SPECIFIC_CLASS_0xA);
+        }
+        else
+        {
             // Backward compatibility: Sending class 0x9.
-            return ibvsmad_craccess_rw_vs(h, memory_address,
-                                          method, num_of_dwords,
-                                          data, IB_VENDOR_SPECIFIC_CLASS_0x9);
+            return ibvsmad_craccess_rw_vs(h, memory_address, method, num_of_dwords, data, IB_VENDOR_SPECIFIC_CLASS_0x9);
         }
-
     }
     return 0;
 }
 
 #ifdef __WIN__
 
-
-int process_dynamic_linking(ibvs_mad *ivm, int mad_init)
+int process_dynamic_linking(ibvs_mad* ivm, int mad_init)
 {
-
     ivm->dl_handle = LoadLibrary(TEXT(LIB_IBMAD));
 
-    if (ivm->dl_handle != NULL) {
-        MY_GetProcAddress(ivm, mad_rpc_open_port        );
-        MY_GetProcAddress(ivm, mad_rpc_close_port       );
-        MY_GetProcAddress(ivm, ib_vendor_call_via       );
+    if (ivm->dl_handle != NULL)
+    {
+        MY_GetProcAddress(ivm, mad_rpc_open_port);
+        MY_GetProcAddress(ivm, mad_rpc_close_port);
+        MY_GetProcAddress(ivm, ib_vendor_call_via);
         MY_GetProcAddress(ivm, ib_resolve_portid_str_via);
-        MY_GetProcAddress(ivm, smp_query_via            );
-        MY_GetProcAddressIgnoreFail(ivm, smp_query_status_via );
-        MY_GetProcAddress(ivm, smp_set_via              );
-        MY_GetProcAddressIgnoreFail(ivm, smp_set_status_via );
-        MY_GetProcAddress(ivm, mad_rpc_set_retries      );
-        MY_GetProcAddress(ivm, mad_rpc_set_timeout      );
-        MY_GetProcAddress(ivm, mad_rpc_rmpp             );
-        MY_GetProcAddress(ivm, mad_rpc                  );
-        MY_GetProcAddress(ivm, portid2str               );
-        MY_GetProcAddress(ivm, mad_get_field            );
-        MY_GetProcAddress(ivm, mad_send_via             );
-        MY_GetVarAddress(ivm,  ibdebug                  );
-
-    } else {
-
-        IBERROR(("Failed to load "LIB_IBMAD ".dll library %#x", (unsigned int)GetLastError()));
+        MY_GetProcAddress(ivm, smp_query_via);
+        MY_GetProcAddressIgnoreFail(ivm, smp_query_status_via);
+        MY_GetProcAddress(ivm, smp_set_via);
+        MY_GetProcAddressIgnoreFail(ivm, smp_set_status_via);
+        MY_GetProcAddress(ivm, mad_rpc_set_retries);
+        MY_GetProcAddress(ivm, mad_rpc_set_timeout);
+        MY_GetProcAddress(ivm, mad_rpc_rmpp);
+        MY_GetProcAddress(ivm, mad_rpc);
+        MY_GetProcAddress(ivm, portid2str);
+        MY_GetProcAddress(ivm, mad_get_field);
+        MY_GetProcAddress(ivm, mad_send_via);
+        MY_GetVarAddress(ivm, ibdebug);
+    }
+    else
+    {
+        IBERROR(("Failed to load " LIB_IBMAD ".dll library %#x", (unsigned int)GetLastError()));
         errno = ENOENT;
         return -1;
     }
     return 0;
 }
 
-int free_dll_handle(mfile *mf)
+int free_dll_handle(mfile* mf)
 {
     return FreeLibrary(((ibvs_mad*)(mf->ctx))->dl_handle);
 }
 
 #else
 
-int process_dynamic_linking(ibvs_mad *ivm, int mad_init)
+int process_dynamic_linking(ibvs_mad* ivm, int mad_init)
 {
-
-    char *libs[] = {"libibmad.so.5", "libibmad.so.12"};
+    char* libs[] = {"libibmad.so.5", "libibmad.so.12"};
 
     u_int32_t i;
     (void)mad_init;
-    for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++) {
+    for (i = 0; i < sizeof(libs) / sizeof(libs[0]); i++)
+    {
         ivm->dl_handle = dlopen(libs[i], RTLD_LAZY);
-        if (ivm->dl_handle) {
+        if (ivm->dl_handle)
+        {
             break;
         }
     }
-    if (!ivm->dl_handle) {
-        const char *errstr = dlerror();
+    if (!ivm->dl_handle)
+    {
+        const char* errstr = dlerror();
         IBERROR(("%s", errstr));
-        //free(ivm);
+        // free(ivm);
         return -1;
-
     }
 
     dlerror();
 
-    MY_DLSYM(ivm, mad_rpc_open_port        );
-    MY_DLSYM(ivm, mad_rpc_close_port       );
-    MY_DLSYM(ivm, ib_vendor_call_via       );
+    MY_DLSYM(ivm, mad_rpc_open_port);
+    MY_DLSYM(ivm, mad_rpc_close_port);
+    MY_DLSYM(ivm, ib_vendor_call_via);
     MY_DLSYM(ivm, ib_resolve_portid_str_via);
-    MY_DLSYM(ivm, smp_query_via            );
-    MY_DLSYM_IGNORE_FAIL(ivm, smp_query_status_via );
-    MY_DLSYM(ivm, smp_set_via              );
-    MY_DLSYM_IGNORE_FAIL(ivm, smp_set_status_via   );
-    MY_DLSYM(ivm, mad_rpc_set_retries      );
-    MY_DLSYM(ivm, mad_rpc_set_timeout      );
-    MY_DLSYM(ivm, mad_rpc_rmpp             );
-    MY_DLSYM(ivm, mad_get_field            );
-    MY_DLSYM(ivm, portid2str               );
-    MY_DLSYM(ivm, smp_mkey_set             );
-    MY_DLSYM(ivm, mad_send_via             );
-    MY_DLSYM(ivm, mad_rpc                  );
-    MY_DLSYM(ivm, ibdebug                  );
+    MY_DLSYM(ivm, smp_query_via);
+    MY_DLSYM_IGNORE_FAIL(ivm, smp_query_status_via);
+    MY_DLSYM(ivm, smp_set_via);
+    MY_DLSYM_IGNORE_FAIL(ivm, smp_set_status_via);
+    MY_DLSYM(ivm, mad_rpc_set_retries);
+    MY_DLSYM(ivm, mad_rpc_set_timeout);
+    MY_DLSYM(ivm, mad_rpc_rmpp);
+    MY_DLSYM(ivm, mad_get_field);
+    MY_DLSYM(ivm, portid2str);
+    MY_DLSYM(ivm, smp_mkey_set);
+    MY_DLSYM(ivm, mad_send_via);
+    MY_DLSYM(ivm, mad_rpc);
+    MY_DLSYM(ivm, ibdebug);
     return 0;
 }
 
-
-int free_dll_handle(mfile *mf)
+int free_dll_handle(mfile* mf)
 {
     return dlclose(((ibvs_mad*)(mf->ctx))->dl_handle);
 }
 
 #endif
 
-char* my_strdup(const char *name)
+char* my_strdup(const char* name)
 {
     int len;
-    char *buf;
+    char* buf;
 
-    if (name == NULL) {
+    if (name == NULL)
+    {
         return NULL;
     }
     len = strlen(name);
 
     buf = malloc((len + 1) * sizeof(char));
-    if (buf == NULL) {
+    if (buf == NULL)
+    {
         return NULL;
-
     }
     strcpy(buf, name);
 
     return buf;
 }
-#define MTCR_IB_TIMEOUT     "MTCR_IB_TIMEOUT"
-#define MTCR_IB_RETRIES     "MTCR_IB_RETRIES"
-#define MTCR_IB_VKEY        "MTCR_IB_VKEY"
+#define MTCR_IB_TIMEOUT "MTCR_IB_TIMEOUT"
+#define MTCR_IB_RETRIES "MTCR_IB_RETRIES"
+#define MTCR_IB_VKEY "MTCR_IB_VKEY"
 #define MTCR_IBMAD_DEBUG "MTCR_IBMAD_DEBUG"
 
-int get_env_var(char *env_name, int *env_var)
+int get_env_var(char* env_name, int* env_var)
 {
-    char *env_val;
+    char* env_val;
     env_val = getenv(env_name);
-    if (env_val) {
+    if (env_val)
+    {
         *env_var = atol(env_val);
     }
     return 0;
 }
-int get_64_env_var(char *env_name, u_int64_t *env_var)
+int get_64_env_var(char* env_name, u_int64_t* env_var)
 {
     char *env_val, *endp = NULL;
     env_val = getenv(env_name);
-    if (env_val) {
+    if (env_val)
+    {
         *env_var = strtoull(env_val, &endp, 0);
     }
     return 0;
 }
 
-int get_env_vars(ibvs_mad *ivm)
+int get_env_vars(ibvs_mad* ivm)
 {
     get_env_var(MTCR_IB_TIMEOUT, &(ivm->timeout));
     get_env_var(MTCR_IB_RETRIES, &(ivm->retries_num));
@@ -678,34 +752,31 @@ int get_env_vars(ibvs_mad *ivm)
     return 0;
 }
 
-
-
-int is_vs_crspace_supported(ibvs_mad *h)
+int is_vs_crspace_supported(ibvs_mad* h)
 {
-    u_int8_t *p;
+    u_int8_t* p;
     u_int8_t mad_data[IB_SMP_DATA_SIZE] = {0};
     u_int32_t dev_id;
     u_int32_t data = 0;
     int i = 0;
     u_int32_t unsupported_devs[UNSUPP_DEVS_NUM] = {
-        0x6746,     /* MT26438 [ConnectX-2 VPI w/ Virtualization+]"*/
-        0x6764,     /* MT26468 [Mountain top]"                     */
-        0xbd34,     /* IS4 IB SDR"                                 */
-        0xbd35,     /* IS4 IB DDR"                                 */
-        0xbd36,     /* IS4 IB QDR"                                 */
-        0xfa66,     /* BridgeX VPI up, E/FC down"                  */
-        0xfa7a,     /* BridgeX EN up, E/FC down"                   */
-        0x1001,     /* ConnectX-2 VF"                              */
-        0x1003,     /* MT27500 [ConnectX-3]"                       */
-        0x1005,     /* MT27510 Family"                             */
-        0x1007,     /* MT27520 ConnectX-3 Pro Family"              */
+      0x6746, /* MT26438 [ConnectX-2 VPI w/ Virtualization+]"*/
+      0x6764, /* MT26468 [Mountain top]"                     */
+      0xbd34, /* IS4 IB SDR"                                 */
+      0xbd35, /* IS4 IB DDR"                                 */
+      0xbd36, /* IS4 IB QDR"                                 */
+      0xfa66, /* BridgeX VPI up, E/FC down"                  */
+      0xfa7a, /* BridgeX EN up, E/FC down"                   */
+      0x1001, /* ConnectX-2 VF"                              */
+      0x1003, /* MT27500 [ConnectX-3]"                       */
+      0x1005, /* MT27510 Family"                             */
+      0x1007, /* MT27520 ConnectX-3 Pro Family"              */
 
     };
 
-    uint64_t ret = ibvsmad_craccess_rw_vs(h, DEVID_ADDRESS,
-                                          IB_MAD_METHOD_GET, 1,
-                                          &data, IB_VENDOR_SPECIFIC_CLASS_0xA);
-    if (!ret) {
+    uint64_t ret = ibvsmad_craccess_rw_vs(h, DEVID_ADDRESS, IB_MAD_METHOD_GET, 1, &data, IB_VENDOR_SPECIFIC_CLASS_0xA);
+    if (!ret)
+    {
         h->use_class_a = 1;
         return 1;
     }
@@ -714,14 +785,17 @@ int is_vs_crspace_supported(ibvs_mad *h)
     set_mkey_for_smp_mad(h);
     p = h->smp_query_via(mad_data, &h->portid, IB_ATTR_NODE_INFO, 0, 0, h->srcport);
 
-    if (NULL == p) {
+    if (NULL == p)
+    {
         return 1;
     }
 
-    dev_id  = h->mad_get_field(mad_data, 0, IB_NODE_DEVID_F);
+    dev_id = h->mad_get_field(mad_data, 0, IB_NODE_DEVID_F);
 
-    for (i = 0; i < UNSUPP_DEVS_NUM; i++) {
-        if (dev_id == unsupported_devs[i]) {
+    for (i = 0; i < UNSUPP_DEVS_NUM; i++)
+    {
+        if (dev_id == unsupported_devs[i])
+        {
             return 1;
         }
     }
@@ -729,47 +803,42 @@ int is_vs_crspace_supported(ibvs_mad *h)
     return 0;
 }
 
-
-
-
-typedef enum key_type_t {
+typedef enum key_type_t
+{
     MKEY,
     VSKEY
 } key_type;
 
-
-
-
 char* trim(char* string)
 {
     char* back;
 
     // Left trim.
-    while (isspace(*string)) {
+    while (isspace(*string))
+    {
         string++;
     }
 
     int len = strlen(string);
 
-    if (len == 0) {
-        return(string);
+    if (len == 0)
+    {
+        return (string);
     }
 
     // Right trim.
     back = string + len;
 
-    while (isspace(*--back)) {}
+    while (isspace(*--back))
+    {
+    }
 
     *(back + 1) = '\0';
 
     return string;
 }
 
-
-
-
-int get_mft_conf_field_value(char* line, char* field_name,
-                             char* value, int* is_empty)
+int get_mft_conf_field_value(char* line, char* field_name, char* value, int* is_empty)
 {
     char* delimiter = "=";
     char* tmp_value;
@@ -798,9 +867,6 @@ int get_mft_conf_field_value(char* line, char* field_name,
     return -1;
 }
 
-
-
-
 int load_file(FILE** file_descriptor, const char* file_name_path)
 {
     // Open the file.
@@ -815,9 +881,6 @@ int load_file(FILE** file_descriptor, const char* file_name_path)
     return 0;
 }
 
-
-
-
 int parse_mft_cfg_file(char* sm_config_path, key_type key)
 {
     const char* sm_config_default_path = "/var/cache/opensm/";
@@ -840,7 +903,6 @@ int parse_mft_cfg_file(char* sm_config_path, key_type key)
 
     FILE* mft_conf_file_descriptor = NULL;
 
-
     // Load the mft configuration file.
     if (load_file(&mft_conf_file_descriptor, mft_conf_file_path))
     {
@@ -852,11 +914,10 @@ int parse_mft_cfg_file(char* sm_config_path, key_type key)
     while ((fgets(line, 1024, mft_conf_file_descriptor)))
     {
         // Check if the mkey feature is enable.
-        if (!get_mft_conf_field_value(line, key_enabled_field,
-                                      value, &is_empty))
+        if (!get_mft_conf_field_value(line, key_enabled_field, value, &is_empty))
         {
             // key feature is supported ?
-            if(strcmp(value, "yes"))
+            if (strcmp(value, "yes"))
             {
                 // Mkey is unsuppurted.
                 break;
@@ -866,8 +927,7 @@ int parse_mft_cfg_file(char* sm_config_path, key_type key)
         }
 
         // Check if the user changed the default mkey directory.
-        else if (!get_mft_conf_field_value(line, "sm_config_dir",
-                                           value, &is_empty))
+        else if (!get_mft_conf_field_value(line, "sm_config_dir", value, &is_empty))
         {
             if (!is_key_enabled)
             {
@@ -897,15 +957,12 @@ int parse_mft_cfg_file(char* sm_config_path, key_type key)
     return ret_value;
 }
 
-
-
 void get_lid_integer(char* lid, int* lid_integer)
 {
     int base = 10;
 
     // Check if we have '0x' in the beginning of the string.
-    if ((strlen(lid) > 1) && (lid[0] == '0') &&
-            ((lid[1] == 'x') || (lid[1] == 'X')))
+    if ((strlen(lid) > 1) && (lid[0] == '0') && ((lid[1] == 'x') || (lid[1] == 'X')))
     {
         base = 16;
     }
@@ -913,10 +970,7 @@ void get_lid_integer(char* lid, int* lid_integer)
     *lid_integer = strtol(lid, NULL, base);
 }
 
-
-
-int find_guid(char* lid, char* guid,
-              char* line)
+int find_guid(char* lid, char* guid, char* line)
 {
     char* delimiter = " ";
     char* tmp_value;
@@ -946,25 +1000,22 @@ int find_guid(char* lid, char* guid,
     get_lid_integer(trim(tmp_value), &lid_upper_bound);
 
     if (lid_from_device >= lid_lower_bound && lid_from_device <= lid_upper_bound)
-        {
-            strcpy(guid, tmp_guid);
-            ret_value = 0;
-        }
+    {
+        strcpy(guid, tmp_guid);
+        ret_value = 0;
+    }
 
     return ret_value;
 }
 
-
-int parse_lid2guid_file(char* sm_config_path, char* lid,
-                        char* guid)
+int parse_lid2guid_file(char* sm_config_path, char* lid, char* guid)
 {
-    const char* guid2lid= "guid2lid";
+    const char* guid2lid = "guid2lid";
     FILE* file_descriptor = NULL;
     char line[1024] = {0};
     char conf_path[256];
     int ret_value = -1;
 
-
     // Parse the guid2lid file.
     strcpy(conf_path, sm_config_path);
     strcat(conf_path, guid2lid);
@@ -978,8 +1029,7 @@ int parse_lid2guid_file(char* sm_config_path, char* lid,
     // Go over the content of the guid2lid file.
     while ((fgets(line, 1024, file_descriptor)))
     {
-        if (!find_guid(lid, guid,
-                       line))
+        if (!find_guid(lid, guid, line))
         {
             ret_value = 0;
             break;
@@ -992,9 +1042,7 @@ int parse_lid2guid_file(char* sm_config_path, char* lid,
     return ret_value;
 }
 
-
-int parse_guid2key_file(ibvs_mad* ivm, char* sm_config_path,
-                         char* guid, key_type key)
+int parse_guid2key_file(ibvs_mad* ivm, char* sm_config_path, char* guid, key_type key)
 {
     char* guid2key_filename;
     char* delimiter = " ";
@@ -1055,24 +1103,18 @@ int parse_guid2key_file(ibvs_mad* ivm, char* sm_config_path,
     return ret_value;
 }
 
-
-
-
-int extract_key(ibvs_mad* ivm, char* sm_config_path,
-                 char* lid, key_type key)
+int extract_key(ibvs_mad* ivm, char* sm_config_path, char* lid, key_type key)
 {
     char guid[KEY_GUID_SIZE];
 
     // Parse the lid2guid file.
-    if (parse_lid2guid_file(sm_config_path, lid,
-                            guid))
+    if (parse_lid2guid_file(sm_config_path, lid, guid))
     {
         return -1;
     }
 
     // Parse the guid2key file.
-    if (parse_guid2key_file(ivm, sm_config_path,
-                             guid, key))
+    if (parse_guid2key_file(ivm, sm_config_path, guid, key))
     {
         return -1;
     }
@@ -1080,22 +1122,18 @@ int extract_key(ibvs_mad* ivm, char* sm_config_path,
     return 0;
 }
 
-
-
-
 int get_key(ibvs_mad* ivm, char* lid, key_type key)
 {
     char sm_config_path[256] = {0};
 
-
     // Parameters validation.
-    if(!ivm || !lid)
+    if (!ivm || !lid)
     {
         return -1;
     }
 
     // Parse the configuration file in order to extract the key info.
-    if(parse_mft_cfg_file(sm_config_path, key))
+    if (parse_mft_cfg_file(sm_config_path, key))
     {
         // Failed to parse the key fields from
         //   the mft configuration file.
@@ -1103,8 +1141,7 @@ int get_key(ibvs_mad* ivm, char* lid, key_type key)
     }
 
     // Extract the key.
-    if(extract_key(ivm, sm_config_path,
-                    lid, key))
+    if (extract_key(ivm, sm_config_path, lid, key))
     {
         // Failed to extract the key.
         return -1;
@@ -1113,38 +1150,37 @@ int get_key(ibvs_mad* ivm, char* lid, key_type key)
     return 0;
 }
 
-
 /********************************************************
 **
 *    Initialize madrpc; Register the vendor specific management classes under
 *    the libibmad library; Resolve destination lid from input.
 *
 */
-int mib_open(const char *name, mfile *mf, int mad_init)
+int mib_open(const char* name, mfile* mf, int mad_init)
 {
-    char        *ca              = 0;
-    int mgmt_classes[NUMBER_OF_MGMT_ELEMENTS] = {IB_SMI_CLASS,
-                                                 IB_SMI_DIRECT_CLASS,
-                                                 IB_VENDOR_SPECIFIC_CLASS_0x9,
+    char* ca = 0;
+    int mgmt_classes[NUMBER_OF_MGMT_ELEMENTS] = {IB_SMI_CLASS, IB_SMI_DIRECT_CLASS, IB_VENDOR_SPECIFIC_CLASS_0x9,
                                                  IB_VENDOR_SPECIFIC_CLASS_0xA};
-    ib_portid_t *sm_id           = 0;
-    int ca_port         = 0;
-    ibvs_mad    *ivm             = NULL;
-    char        *nbuf            = NULL;
-    char        *path_str, *p;
-    int rc              = -1;
+    ib_portid_t* sm_id = 0;
+    int ca_port = 0;
+    ibvs_mad* ivm = NULL;
+    char* nbuf = NULL;
+    char *path_str, *p;
+    int rc = -1;
     int lid_provided = 0;
-    char        *sl_str;
+    char* sl_str;
 
-    char *first_comma;
-    char *second_comma;
-    //ibdebug = 1;
-    if (!mf || !name) {
+    char* first_comma;
+    char* second_comma;
+    // ibdebug = 1;
+    if (!mf || !name)
+    {
         IBERROR(("Bad(null) device argument for inband access"));
         errno = EINVAL;
         goto end;
     }
-    if (!(ivm = (ibvs_mad*)malloc(sizeof(ibvs_mad)))) {
+    if (!(ivm = (ibvs_mad*)malloc(sizeof(ibvs_mad))))
+    {
         IBERROR(("can't allocate ibvsmad_mfile"));
         errno = ENOMEM;
         goto end;
@@ -1152,7 +1188,8 @@ int mib_open(const char *name, mfile *mf, int mad_init)
     memset(ivm, 0, sizeof(ibvs_mad));
 
     nbuf = my_strdup(name);
-    if (nbuf == NULL) {
+    if (nbuf == NULL)
+    {
         errno = ENOMEM;
         goto end;
     }
@@ -1160,70 +1197,82 @@ int mib_open(const char *name, mfile *mf, int mad_init)
     ivm->mkey_is_supported = 0;
     ivm->vskey_is_supported = 0;
 
-    if (strncmp("ibdr-", nbuf, 5) == 0) {
+    if (strncmp("ibdr-", nbuf, 5) == 0)
+    {
         ivm->use_smp = 1;
         ivm->dest_type = IB_DEST_DRPATH;
-        path_str  = nbuf + 5;
-    } else if (strncmp("iblid-", nbuf, 6) == 0) {
+        path_str = nbuf + 5;
+    }
+    else if (strncmp("iblid-", nbuf, 6) == 0)
+    {
         ivm->use_smp = 1;
         ivm->dest_type = IB_DEST_LID;
-        path_str  = nbuf + 6;
-    } else if ((p = strstr(nbuf, "lid-")) != 0) {
+        path_str = nbuf + 6;
+    }
+    else if ((p = strstr(nbuf, "lid-")) != 0)
+    {
 #ifdef __linux__
         ivm->mkey_is_supported = 1;
         ivm->vskey_is_supported = 1;
 #endif
         lid_provided = 1;
         ivm->dest_type = IB_DEST_LID;
-        path_str  = p + 4;
-
-    } else if ((p = strstr(nbuf, "lid_noinit-")) != 0) {
+        path_str = p + 4;
+    }
+    else if ((p = strstr(nbuf, "lid_noinit-")) != 0)
+    {
 #ifdef __linux__
         ivm->mkey_is_supported = 1;
         ivm->vskey_is_supported = 1;
 #endif
         lid_provided = 1;
         ivm->dest_type = IB_DEST_LID;
-        path_str  = p + 11;
+        path_str = p + 11;
         mad_init = 0;
-
-    } else {
+    }
+    else
+    {
         IBERROR(("Bad device argument for inband access"));
         errno = EINVAL;
         goto end;
     }
 
     first_comma = strstr(nbuf, ",");
-    if (first_comma) {
+    if (first_comma)
+    {
         *first_comma = '\0';
         ca = first_comma + 1;
 
         second_comma = strstr(ca, ",");
-        if (second_comma) {
-            char *ep;
+        if (second_comma)
+        {
+            char* ep;
             *second_comma = '\0';
 
             ca_port = strtol(second_comma + 1, &ep, 0);
 
-            if (*ep != '\0') {
+            if (*ep != '\0')
+            {
                 IBERROR(("Bad port number format (%s)", second_comma + 1));
                 errno = EINVAL;
                 goto end;
             }
-
         }
     }
 
     ivm->retries_num = MAD_DEF_RETRIES;
-    ivm->timeout     = MAD_DEF_TIMEOUT_MS;
+    ivm->timeout = MAD_DEF_TIMEOUT_MS;
     // Get env variables.
     get_env_vars(ivm);
     // The DR in the device name is a '.' separated list.
     // Change it to a ',' separated list like ibmad likes.
-    if (ivm->dest_type == IB_DEST_DRPATH) {
-        char *c;
-        for (c = path_str; *c; c++) {
-            if (*c == '.') {
+    if (ivm->dest_type == IB_DEST_DRPATH)
+    {
+        char* c;
+        for (c = path_str; *c; c++)
+        {
+            if (*c == '.')
+            {
                 *c = ',';
             }
         }
@@ -1231,31 +1280,32 @@ int mib_open(const char *name, mfile *mf, int mad_init)
 
 #ifdef IBVSMAD_DLOPEN
 
-    ivm->mad_rpc_open_port         = mad_rpc_open_port;
-    ivm->mad_rpc_close_port        = mad_rpc_close_port;
-    ivm->ib_vendor_call_via        = ib_vendor_call_via;
+    ivm->mad_rpc_open_port = mad_rpc_open_port;
+    ivm->mad_rpc_close_port = mad_rpc_close_port;
+    ivm->ib_vendor_call_via = ib_vendor_call_via;
     ivm->ib_resolve_portid_str_via = ib_resolve_portid_str_via;
-    ivm->smp_query_via             = smp_query_via;
-    ivm->smp_set_via               = smp_set_via;
-    ivm->mad_rpc_set_retries       = mad_rpc_set_retries;
-    ivm->mad_rpc_set_timeout       = mad_rpc_set_timeout;
-    ivm->mad_get_field             = mad_get_field;
-    ivm->portid2str                = portid2str;
+    ivm->smp_query_via = smp_query_via;
+    ivm->smp_set_via = smp_set_via;
+    ivm->mad_rpc_set_retries = mad_rpc_set_retries;
+    ivm->mad_rpc_set_timeout = mad_rpc_set_timeout;
+    ivm->mad_get_field = mad_get_field;
+    ivm->portid2str = portid2str;
 
 #ifdef __linux__
-    ivm->smp_mkey_set              = smp_mkey_set;
+    ivm->smp_mkey_set = smp_mkey_set;
 #endif
 
 #else
-    if (process_dynamic_linking(ivm, mad_init) == -1) {
+    if (process_dynamic_linking(ivm, mad_init) == -1)
+    {
         goto end;
     }
 #endif
     get_env_var(MTCR_IBMAD_DEBUG, ivm->ibdebug);
 
-    ivm->srcport = ivm->mad_rpc_open_port(ca, ca_port,
-                                          mgmt_classes, NUMBER_OF_MGMT_ELEMENTS);
-    if (ivm->srcport == NULL) {
+    ivm->srcport = ivm->mad_rpc_open_port(ca, ca_port, mgmt_classes, NUMBER_OF_MGMT_ELEMENTS);
+    if (ivm->srcport == NULL)
+    {
         goto end;
     }
 
@@ -1266,35 +1316,42 @@ int mib_open(const char *name, mfile *mf, int mad_init)
     ivm->mkey = 0;
     ivm->vskey = 0;
 
-    if (ivm->mkey_is_supported) {
+    if (ivm->mkey_is_supported)
+    {
         rc = get_key(ivm, path_str, MKEY);
         // Do we have an mkey?
-        if (!rc) {
+        if (!rc)
+        {
             // Set the mkey.
             ivm->smp_mkey_set(ivm->srcport, ivm->mkey);
         }
     }
 
-    if (ivm->vskey_is_supported) {
+    if (ivm->vskey_is_supported)
+    {
         get_key(ivm, path_str, VSKEY);
     }
 
-    rc = ivm->ib_resolve_portid_str_via(&ivm->portid, (char*)path_str,
-            ivm->dest_type, sm_id, ivm->srcport);
-    if (rc != 0) {
+    rc = ivm->ib_resolve_portid_str_via(&ivm->portid, (char*)path_str, ivm->dest_type, sm_id, ivm->srcport);
+    if (rc != 0)
+    {
         IBERROR(("can't resolve destination port %s", path_str));
         goto end;
     }
 
-    //TODO: Remove the SL setting if DR method is mainly used.
+    // TODO: Remove the SL setting if DR method is mainly used.
 
     // For ConnectIB:
     // If the target device is connectib or SX and we use LID rout, use the SMP LID route and not the GPM
-    if (lid_provided) {
-        if (is_vs_crspace_supported(ivm)) {
+    if (lid_provided)
+    {
+        if (is_vs_crspace_supported(ivm))
+        {
             DEBUG(("For this LID using VS MAD"));
             ivm->use_smp = 0;
-        } else {
+        }
+        else
+        {
             DEBUG(("For this LID using SMP MAD"));
             ivm->use_smp = 1;
         }
@@ -1302,14 +1359,19 @@ int mib_open(const char *name, mfile *mf, int mad_init)
 
 #define MTCR_IBSL_ENV "MTCR_IB_SL"
 
-    if (!ivm->use_smp) {
+    if (!ivm->use_smp)
+    {
         sl_str = getenv(MTCR_IBSL_ENV);
-        if (sl_str) {
-            char *ep;
+        if (sl_str)
+        {
+            char* ep;
             u_int32_t sl = strtoul(sl_str, &ep, 0);
-            if (*ep) {
+            if (*ep)
+            {
                 fprintf(stderr, "-E- Failed to parse env var %s (%s). Ignoring\n", MTCR_IBSL_ENV, sl_str);
-            } else {
+            }
+            else
+            {
                 ivm->portid.sl = (u_int8_t)sl;
             }
         }
@@ -1317,43 +1379,47 @@ int mib_open(const char *name, mfile *mf, int mad_init)
 
     mf->ctx = ivm;
 
-    if (nbuf) {
+    if (nbuf)
+    {
         free(nbuf);
     }
 
     return 0;
 end:
-    if (ivm) {
+    if (ivm)
+    {
 #ifndef __WIN__
-        if (ivm->dl_handle) {
+        if (ivm->dl_handle)
+        {
             dlclose(ivm->dl_handle);
         }
 #endif
         free(ivm);
     }
-    if (nbuf) {
+    if (nbuf)
+    {
         free(nbuf);
     }
     return -1;
 }
 
-
-
 /********************************************************
 **
 *    Free resources
 *
 */
-int mib_close(mfile *mf)
+int mib_close(mfile* mf)
 {
-    if (mf) {
-        if (mf->ctx) {
+    if (mf)
+    {
+        if (mf->ctx)
+        {
             // TODO: free the ddl handlers
-            ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+            ibvs_mad* h = (ibvs_mad*)(mf->ctx);
             h->mad_rpc_close_port(h->srcport);
-    #ifndef IBVSMAD_DLOPEN
+#ifndef IBVSMAD_DLOPEN
             free_dll_handle(mf);
-    #endif
+#endif
             free(mf->ctx);
             mf->ctx = NULL;
         }
@@ -1361,43 +1427,47 @@ int mib_close(mfile *mf)
     return 0;
 }
 
-#define CHECK_ALIGN(length) { \
-        if (length % 4) {                                       \
+#define CHECK_ALIGN(length)                                      \
+    {                                                            \
+        if (length % 4)                                          \
+        {                                                        \
             IBERROR(("Size must be 4 aligned, got %d", length)); \
-            return -1;                                          \
-        }                                                       \
-}
-
+            return -1;                                           \
+        }                                                        \
+    }
 
-int mib_get_chunk_size(mfile *mf)
+int mib_get_chunk_size(mfile* mf)
 {
-    if (!mf || !mf->ctx) {
+    if (!mf || !mf->ctx)
+    {
         IBERROR(("get chunk size failed. Null Param."));
         return -1;
     }
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
-    if (h->use_smp) {
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+    if (h->use_smp)
+    {
         return MAX_IB_SMP_DATA_SIZE;
     }
     return MAX_VS_DATA_SIZE;
 }
 
-
 /********************************************************
 **
 *    Read an IS3 CR-Space 32 bit register
 *
 */
-int mib_read4(mfile *mf, u_int32_t memory_address, u_int32_t *data)
+int mib_read4(mfile* mf, u_int32_t memory_address, u_int32_t* data)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("cr access read failed. Null Param."));
         return -1;
     }
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
 
     DEBUG(("mread4 of 0x%08x", memory_address));
-    if (ibvsmad_craccess_rw(h, memory_address, IB_MAD_METHOD_GET, 1, data) == ~0ull) {
+    if (ibvsmad_craccess_rw(h, memory_address, IB_MAD_METHOD_GET, 1, data) == ~0ull)
+    {
         IBERROR(("cr access read to %s failed", h->portid2str(&h->portid)));
         return -1;
     }
@@ -1409,59 +1479,67 @@ int mib_read4(mfile *mf, u_int32_t memory_address, u_int32_t *data)
 *    Write an IS3 CR-Space 32 bit register
 *
 */
-int mib_write4(mfile *mf, u_int32_t memory_address, u_int32_t _data)
+int mib_write4(mfile* mf, u_int32_t memory_address, u_int32_t _data)
 {
-    if (!mf || !mf->ctx) {
+    if (!mf || !mf->ctx)
+    {
         IBERROR(("cr access write failed. Null Param."));
         return -1;
     }
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
 
     u_int32_t data = _data;
     DEBUG(("mwrite4 of 0x%08x\n", memory_address));
 
-    if (ibvsmad_craccess_rw(h, memory_address, IB_MAD_METHOD_SET, 1, &data) == ~0ull) {
+    if (ibvsmad_craccess_rw(h, memory_address, IB_MAD_METHOD_SET, 1, &data) == ~0ull)
+    {
         IBERROR(("cr access write to %s failed", h->portid2str(&h->portid)));
         return -1;
     }
     return 4;
 }
 
-enum {
+enum
+{
     BLOCKOP_READ,
     BLOCKOP_WRITE
 };
 
-int mib_block_op(mfile *mf, unsigned int offset, u_int32_t *data, int length, int op)
+int mib_block_op(mfile* mf, unsigned int offset, u_int32_t* data, int length, int op)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("cr access read failed. Null Param."));
         return -1;
     }
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
     int method = IB_MAD_METHOD_GET;
-    if (op == BLOCKOP_WRITE) {
+    if (op == BLOCKOP_WRITE)
+    {
         method = IB_MAD_METHOD_SET;
     }
     CHECK_ALIGN(length);
     int chunk_size = mib_get_chunk_size(mf);
     // for addresses > 24 bits we use ConfigSpaceAccess mode 2
     // which is limited to 72 bytes.
-    if (offset + MAX_VS_DATA_SIZE > MODE_0_MAX_ADDRESS_RANGE) {
+    if (offset + MAX_VS_DATA_SIZE > MODE_0_MAX_ADDRESS_RANGE)
+    {
         chunk_size = MODE_2_MAX_DATA_SIZE;
     }
     int t_offset = 0;
-    while (t_offset < length) {
+    while (t_offset < length)
+    {
         int left_size = length - t_offset;
         int to_op = left_size > chunk_size ? chunk_size : left_size;
         unsigned int curret_offset = offset + t_offset;
-        if (ibvsmad_craccess_rw(h, curret_offset, method, (to_op / 4), data + t_offset / 4) == ~0ull) {
-            IBERROR(("cr access %s to %s failed", op == BLOCKOP_READ ? "read" : "write",
-                     h->portid2str(&h->portid)));
+        if (ibvsmad_craccess_rw(h, curret_offset, method, (to_op / 4), data + t_offset / 4) == ~0ull)
+        {
+            IBERROR(("cr access %s to %s failed", op == BLOCKOP_READ ? "read" : "write", h->portid2str(&h->portid)));
             return -1;
         }
         // If approaching addresses > 24 bits we will switch to mode 2.
-        if (curret_offset + chunk_size > MODE_0_MAX_ADDRESS_RANGE) {
+        if (curret_offset + chunk_size > MODE_0_MAX_ADDRESS_RANGE)
+        {
             chunk_size = MODE_2_MAX_DATA_SIZE;
         }
         t_offset += chunk_size;
@@ -1469,38 +1547,40 @@ int mib_block_op(mfile *mf, unsigned int offset, u_int32_t *data, int length, in
     return length;
 }
 
-MTCR_API int mib_readblock(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+MTCR_API int mib_readblock(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     return mib_block_op(mf, offset, data, length, BLOCKOP_READ);
 }
-MTCR_API int mib_writeblock(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+MTCR_API int mib_writeblock(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     return mib_block_op(mf, offset, data, length, BLOCKOP_WRITE);
 }
 
-int is_managed_node_supports_swreset(mfile *mf)
+int is_managed_node_supports_swreset(mfile* mf)
 {
     ib_vendor_call_t call;
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
-    u_int8_t *p;
-    u_int32_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE/4] = {0};
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+    u_int8_t* p;
+    u_int32_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE / 4] = {0};
 
-    call.method     = IB_MAD_METHOD_GET;
+    call.method = IB_MAD_METHOD_GET;
     call.mgmt_class = IB_VENDOR_SPECIFIC_CLASS_0xA;
-    call.attrid     = IB_VS_ATTR_GENERAL_INFO;
-    call.mod        = 0;
-    call.oui        = IB_OPENIB_OUI;
-    call.timeout    = 0;
-    memset(&call.rmpp, 0, sizeof (call.rmpp));
+    call.attrid = IB_VS_ATTR_GENERAL_INFO;
+    call.mod = 0;
+    call.oui = IB_OPENIB_OUI;
+    call.timeout = 0;
+    memset(&call.rmpp, 0, sizeof(call.rmpp));
 
     p = h->ib_vendor_call_via(vsmad_data, &h->portid, &call, h->srcport);
-    if (!p) {
+    if (!p)
+    {
         fprintf(stderr, "-E- ib mad method call failed.\n");
         return 0;
     }
 
     int i;
-    for (i = 0; i < IB_VENDOR_RANGE1_DATA_SIZE/4; i++) {
+    for (i = 0; i < IB_VENDOR_RANGE1_DATA_SIZE / 4; i++)
+    {
         vsmad_data[i] = __be32_to_cpu(vsmad_data[i]);
     }
 
@@ -1508,16 +1588,14 @@ int is_managed_node_supports_swreset(mfile *mf)
     // We want to skip them when relating GeneralInfo MAD fields in specific.
     // The capability_mask offset which is 0x80, is calculated from the beginning of GeneralInfo MAD fields.
     // So overall we have an offset of 0x8+0x80 bytes.
-    const int capability_mask_byte_offset = 0x8+0x80;
+    const int capability_mask_byte_offset = 0x8 + 0x80;
     const int is_enh_port0_device_reset_supported_bit_offset = 25;
-    return EXTRACT(vsmad_data[capability_mask_byte_offset/4],
-                   is_enh_port0_device_reset_supported_bit_offset,
-                   1);
+    return EXTRACT(vsmad_data[capability_mask_byte_offset / 4], is_enh_port0_device_reset_supported_bit_offset, 1);
 }
 
-int is_node_managed(ibvs_mad *h)
+int is_node_managed(ibvs_mad* h)
 {
-    u_int8_t *p;
+    u_int8_t* p;
     u_int8_t mad_data[IB_SMP_DATA_SIZE] = {0};
     u_int8_t enhanced_port;
 
@@ -1528,7 +1606,8 @@ int is_node_managed(ibvs_mad *h)
 
     p = h->smp_query_via(mad_data, &h->portid, IB_ATTR_SWITCH_INFO, 0, 0, h->srcport);
 
-    if (NULL == p) {
+    if (NULL == p)
+    {
         return 0;
     }
 
@@ -1543,52 +1622,60 @@ int is_node_managed(ibvs_mad *h)
 
 */
 #define MTCR_SWRESET_ENV "MTCR_SWRESET_TIMER"
-int mib_swreset(mfile *mf)
+int mib_swreset(mfile* mf)
 {
-    if (!mf || !mf->ctx) {
+    if (!mf || !mf->ctx)
+    {
         errno = EINVAL;
         IBERROR(("swreset write failed. Null Param."));
         return -1;
     }
 
     u_int32_t swreset_timer = 15;
-    char *ep;
-    char *swreset_env;
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
-    u_int8_t *p;
+    char* ep;
+    char* swreset_env;
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
+    u_int8_t* p;
     u_int8_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE] = {0};
     ib_vendor_call_t call;
 
     swreset_env = getenv(MTCR_SWRESET_ENV);
-    if (swreset_env) {
-
+    if (swreset_env)
+    {
         u_int32_t new_timer = strtol(swreset_env, &ep, 0);
-        if (*ep != '\0') {
+        if (*ep != '\0')
+        {
             fprintf(stderr, "-W- Bad %s env var format. Ignoring\n", MTCR_SWRESET_ENV);
-        } else if (new_timer > 255) {
+        }
+        else if (new_timer > 255)
+        {
             fprintf(stderr, "-W- Bad %s env var value ( > 255). Ignoring\n", MTCR_SWRESET_ENV);
-        } else {
+        }
+        else
+        {
             /* All OK */
             fprintf(stderr, "-I- Set reset timer to %d seconds\n", new_timer);
             swreset_timer = new_timer;
         }
     }
 
-    if (is_node_managed(h) && !is_managed_node_supports_swreset(mf)) {
+    if (is_node_managed(h) && !is_managed_node_supports_swreset(mf))
+    {
         errno = OP_NOT_SUPPORTED;
         return -1;
     }
 
-    call.method     = IB_MAD_METHOD_SET;
+    call.method = IB_MAD_METHOD_SET;
     call.mgmt_class = IB_VENDOR_SPECIFIC_CLASS_0xA;
-    call.attrid     = IB_VS_ATTR_SW_RESET;
-    call.mod        = swreset_timer;
-    call.oui        = IB_OPENIB_OUI;
-    call.timeout    = 0;
+    call.attrid = IB_VS_ATTR_SW_RESET;
+    call.mod = swreset_timer;
+    call.oui = IB_OPENIB_OUI;
+    call.timeout = 0;
     memset(&call.rmpp, 0, sizeof call.rmpp);
 
     p = h->ib_vendor_call_via(vsmad_data, &h->portid, &call, h->srcport);
-    if (!p) {
+    if (!p)
+    {
         return -1;
     }
 
@@ -1599,32 +1686,39 @@ int mib_swreset(mfile *mf)
 
 static int mib_status_translate(int status)
 {
-    switch ((status >> 2) & 0x7) {
-    case 1:
-        return ME_MAD_BAD_VER;
+    switch ((status >> 2) & 0x7)
+    {
+        case 1:
+            return ME_MAD_BAD_VER;
 
-    case 2:
-        return ME_MAD_METHOD_NOT_SUPP;
+        case 2:
+            return ME_MAD_METHOD_NOT_SUPP;
 
-    case 3:
-        return ME_MAD_METHOD_ATTR_COMB_NOT_SUPP;
+        case 3:
+            return ME_MAD_METHOD_ATTR_COMB_NOT_SUPP;
 
-    case 7:
-        return ME_MAD_BAD_DATA;
+        case 7:
+            return ME_MAD_BAD_DATA;
     }
 
-    if (status & 0x1) {
+    if (status & 0x1)
+    {
         return ME_MAD_BUSY;
-    } else if ((status >> 1) & 0x1) {
+    }
+    else if ((status >> 1) & 0x1)
+    {
         return ME_MAD_REDIRECT;
     }
 
     return ME_MAD_GENERAL_ERR;
 }
 
-uint8_t *cls_a_query_via(void* rcvbuf, ibvs_mad* vsmad,
-                         ib_portid_t* dest, const unsigned timeout,
-                         const unsigned attribute_id, const struct ibmad_port* srcport,
+uint8_t* cls_a_query_via(void* rcvbuf,
+                         ibvs_mad* vsmad,
+                         ib_portid_t* dest,
+                         const unsigned timeout,
+                         const unsigned attribute_id,
+                         const struct ibmad_port* srcport,
                          int* return_status)
 {
     ib_rpc_v1_t rpc;
@@ -1633,7 +1727,8 @@ uint8_t *cls_a_query_via(void* rcvbuf, ibvs_mad* vsmad,
     int lid = dest->lid;
     void* p_ret;
 
-    if (lid == -1) {
+    if (lid == -1)
+    {
         IBWARN("only lid routed is supported");
         return NULL;
     }
@@ -1649,10 +1744,12 @@ uint8_t *cls_a_query_via(void* rcvbuf, ibvs_mad* vsmad,
     // but the offset for VSKey & MKey in the mad is the same.
     rpc.mkey = vsmad->vskey;
 
-    if (!dest->qp) {
+    if (!dest->qp)
+    {
         dest->qp = 1;
     }
-    if (!dest->qkey) {
+    if (!dest->qkey)
+    {
         dest->qkey = IB_DEFAULT_QP1_QKEY;
     }
 
@@ -1662,9 +1759,10 @@ uint8_t *cls_a_query_via(void* rcvbuf, ibvs_mad* vsmad,
     return p_ret;
 }
 
-int mib_send_cls_a_access_reg_mad(mfile *mf, u_int8_t *data)
+int mib_send_cls_a_access_reg_mad(mfile* mf, u_int8_t* data)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("mib_send_cls_a_access_reg_mad failed. Null Param."));
         return ME_BAD_PARAMS;
     }
@@ -1672,19 +1770,23 @@ int mib_send_cls_a_access_reg_mad(mfile *mf, u_int8_t *data)
     u_int8_t* call_result;
     int return_status = -1;
 
-    //Set the VSKey.
-    if (vsmad->vskey) {
+    // Set the VSKey.
+    if (vsmad->vskey)
+    {
         vsmad->smp_mkey_set(vsmad->srcport, vsmad->vskey);
-    } else {
+    }
+    else
+    {
         vsmad->smp_mkey_set(vsmad->srcport, 0);
     }
 
-    call_result = cls_a_query_via(data, vsmad, &vsmad->portid,
-                                  0, IB_SMP_ATTR_REG_ACCESS,
-                                  vsmad->srcport, &return_status);
+    call_result =
+      cls_a_query_via(data, vsmad, &vsmad->portid, 0, IB_SMP_ATTR_REG_ACCESS, vsmad->srcport, &return_status);
 
-    if (!call_result || return_status > 0) {
-        if (return_status > 0) {
+    if (!call_result || return_status > 0)
+    {
+        if (return_status > 0)
+        {
             return mib_status_translate(return_status);
         }
         return -1;
@@ -1695,28 +1797,29 @@ int mib_send_cls_a_access_reg_mad(mfile *mf, u_int8_t *data)
 
 int response_expected(int method)
 {
-    return method == IB_MAD_METHOD_GET ||
-           method == IB_MAD_METHOD_SET ||
-           method == IB_MAD_METHOD_TRAP;
+    return method == IB_MAD_METHOD_GET || method == IB_MAD_METHOD_SET || method == IB_MAD_METHOD_TRAP;
 }
 
-
-uint8_t* ib_vendor_call_status_via(ibvs_mad* vsmad, void* data,
-                                   ib_portid_t* portid, ib_vendor_call_t* call,
-                                   struct ibmad_port* srcport, int* return_status)
+uint8_t* ib_vendor_call_status_via(ibvs_mad* vsmad,
+                                   void* data,
+                                   ib_portid_t* portid,
+                                   ib_vendor_call_t* call,
+                                   struct ibmad_port* srcport,
+                                   int* return_status)
 {
     ib_rpc_v1_t rpc;
     rpc.rstatus = 0;
     ib_rpc_t* rpcold = (ib_rpc_t*)(void*)&rpc;
     int range1 = 0, resp_expected;
-    void *p_ret;
+    void* p_ret;
 
-    if (portid->lid <= 0) {
-        return NULL;    /* no direct SMI */
+    if (portid->lid <= 0)
+    {
+        return NULL; /* no direct SMI */
     }
 
-    if (!(range1 = mad_is_vendor_range1(call->mgmt_class)) &&
-        !(mad_is_vendor_range2(call->mgmt_class))) {
+    if (!(range1 = mad_is_vendor_range1(call->mgmt_class)) && !(mad_is_vendor_range2(call->mgmt_class)))
+    {
         return NULL;
     }
 
@@ -1727,21 +1830,22 @@ uint8_t* ib_vendor_call_status_via(ibvs_mad* vsmad, void* data,
     rpc.attr.id = call->attrid;
     rpc.attr.mod = call->mod;
     rpc.timeout = resp_expected ? call->timeout : 0;
-    rpc.datasz =
-        range1 ? IB_VENDOR_RANGE1_DATA_SIZE : IB_VENDOR_RANGE2_DATA_SIZE;
-    rpc.dataoffs =
-        range1 ? IB_VENDOR_RANGE1_DATA_OFFS : IB_VENDOR_RANGE2_DATA_OFFS;
+    rpc.datasz = range1 ? IB_VENDOR_RANGE1_DATA_SIZE : IB_VENDOR_RANGE2_DATA_SIZE;
+    rpc.dataoffs = range1 ? IB_VENDOR_RANGE1_DATA_OFFS : IB_VENDOR_RANGE2_DATA_OFFS;
 
-    if (!range1) {
+    if (!range1)
+    {
         rpc.oui = call->oui;
     }
 
     portid->qp = 1;
-    if (!portid->qkey) {
+    if (!portid->qkey)
+    {
         portid->qkey = IB_DEFAULT_QP1_QKEY;
     }
 
-    if (resp_expected) {
+    if (resp_expected)
+    {
         p_ret = vsmad->mad_rpc_rmpp(srcport, rpcold, portid, NULL, data);
         errno = rpc.error;
         *return_status = rpc.rstatus;
@@ -1757,7 +1861,8 @@ uint8_t* ib_vendor_call_status_via(ibvs_mad* vsmad, void* data,
 // The translation table is available in the MADs PRM.
 int translate_mad_status_to_reg_status_gmp(int mad_status)
 {
-    switch(mad_status) {
+    switch (mad_status)
+    {
         case 0:
             return ME_OK;
         case 1:
@@ -1775,9 +1880,12 @@ int translate_mad_status_to_reg_status_gmp(int mad_status)
     }
 }
 
-int mib_send_gmp_access_reg_mad(mfile *mf, u_int32_t *data,
-                                u_int32_t reg_size, u_int32_t reg_id,
-                                maccess_reg_method_t reg_method, int *reg_status)
+int mib_send_gmp_access_reg_mad(mfile* mf,
+                                u_int32_t* data,
+                                u_int32_t reg_size,
+                                u_int32_t reg_id,
+                                maccess_reg_method_t reg_method,
+                                int* reg_status)
 {
     // The buffer should contain:
     // 2 dwords for the vskey,
@@ -1794,31 +1902,33 @@ int mib_send_gmp_access_reg_mad(mfile *mf, u_int32_t *data,
     u_int32_t vsmad_data[buffer_size];
     u_int32_t orig_vsmad_data[buffer_size];
 
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("mib_send_gmp_access_reg_mad failed. Null Param."));
         return ME_BAD_PARAMS;
     }
-    if (!mib_supports_reg_access_gmp(mf, reg_method)) {
+    if (!mib_supports_reg_access_gmp(mf, reg_method))
+    {
         return ME_GMP_MAD_UNSUPPORTED_OPERATION;
     }
 
     memset(vsmad_data, 0x0, buffer_size);
     memset(orig_vsmad_data, 0x0, buffer_size);
 
-    ibvs_mad *vsmad = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* vsmad = (ibvs_mad*)(mf->ctx);
     u_int64_t vskey = __cpu_to_be64(vsmad->vskey);
     memcpy(&vsmad_data[vskey_offset], &vskey, vskey_size * 4);
     memcpy(&vsmad_data[data_offset], data, data_size * 4);
     memcpy(&orig_vsmad_data[0], vsmad_data, buffer_size * 4);
 
     ib_vendor_call_t call;
-    u_int8_t *call_result;
-    call.method     = reg_method;
+    u_int8_t* call_result;
+    call.method = reg_method;
     call.mgmt_class = IB_VENDOR_SPECIFIC_CLASS_0xA;
-    call.attrid     = IB_VS_ATTR_ACCESS_REGISTER_GMP;
-    call.mod        = reg_id;
-    call.oui        = IB_OPENIB_OUI;
-    call.timeout    = 0;
+    call.attrid = IB_VS_ATTR_ACCESS_REGISTER_GMP;
+    call.mod = reg_id;
+    call.oui = IB_OPENIB_OUI;
+    call.timeout = 0;
     memset(&call.rmpp, 0, sizeof(call.rmpp));
 
     int num_of_blocks = (reg_size / (data_size * 4)) + ((reg_size % (data_size * 4)) ? 1 : 0);
@@ -1826,15 +1936,20 @@ int mib_send_gmp_access_reg_mad(mfile *mf, u_int32_t *data,
     u_int32_t block_dword;
     int return_status = -1;
 
-    for (block_num = 0; block_num < num_of_blocks; block_num++) {
-        block_dword = __cpu_to_be32(((u_int32_t)block_num) << 16); //block offset in the config dword, see PRM for details
+    for (block_num = 0; block_num < num_of_blocks; block_num++)
+    {
+        block_dword =
+          __cpu_to_be32(((u_int32_t)block_num) << 16); // block offset in the config dword, see PRM for details
         memcpy(&vsmad_data[config_offset], &block_dword, config_size * 4);
-        call_result = ib_vendor_call_status_via(vsmad, vsmad_data, &vsmad->portid, &call, vsmad->srcport, &return_status);
-        if (!call_result) {
+        call_result =
+          ib_vendor_call_status_via(vsmad, vsmad_data, &vsmad->portid, &call, vsmad->srcport, &return_status);
+        if (!call_result)
+        {
             return -1;
         }
 
-        if (return_status > 0) {
+        if (return_status > 0)
+        {
             *reg_status = translate_mad_status_to_reg_status_gmp(return_status);
         }
         int num_of_bytes = (block_num == num_of_blocks - 1) ? ((int)reg_size % (data_size * 4)) : (data_size * 4);
@@ -1845,54 +1960,60 @@ int mib_send_gmp_access_reg_mad(mfile *mf, u_int32_t *data,
     return ME_OK;
 }
 
-int mib_get_gmp(mfile *mf, unsigned attr_id, unsigned mod, u_int32_t *vsmad_data, size_t vsmad_data_len)
+int mib_get_gmp(mfile* mf, unsigned attr_id, unsigned mod, u_int32_t* vsmad_data, size_t vsmad_data_len)
 {
-    if (!mf || !mf->ctx || !vsmad_data || vsmad_data_len != IB_VENDOR_RANGE1_DATA_SIZE/4) {
+    if (!mf || !mf->ctx || !vsmad_data || vsmad_data_len != IB_VENDOR_RANGE1_DATA_SIZE / 4)
+    {
         return ME_BAD_PARAMS;
     }
 
     ib_vendor_call_t call;
-    ibvs_mad *vs_mad = (ibvs_mad*)(mf->ctx);
-    u_int8_t *call_result;
+    ibvs_mad* vs_mad = (ibvs_mad*)(mf->ctx);
+    u_int8_t* call_result;
 
-    call.method     = IB_MAD_METHOD_GET;
+    call.method = IB_MAD_METHOD_GET;
     call.mgmt_class = IB_VENDOR_SPECIFIC_CLASS_0xA;
-    call.attrid     = attr_id;
-    call.mod        = mod;
-    call.oui        = IB_OPENIB_OUI;
-    call.timeout    = 0;
-    memset(&call.rmpp, 0, sizeof (call.rmpp));
+    call.attrid = attr_id;
+    call.mod = mod;
+    call.oui = IB_OPENIB_OUI;
+    call.timeout = 0;
+    memset(&call.rmpp, 0, sizeof(call.rmpp));
 
     call_result = vs_mad->ib_vendor_call_via(vsmad_data, &vs_mad->portid, &call, vs_mad->srcport);
-    if (!call_result) {
+    if (!call_result)
+    {
         return -1;
     }
 
     int i;
-    for (i = 0; i < IB_VENDOR_RANGE1_DATA_SIZE/4; i++) {
+    for (i = 0; i < IB_VENDOR_RANGE1_DATA_SIZE / 4; i++)
+    {
         vsmad_data[i] = __be32_to_cpu(vsmad_data[i]);
     }
     return ME_OK;
 }
 
-int mib_get_general_info_gmp(mfile *mf, u_int32_t *vsmad_data, size_t vsmad_data_len)
+int mib_get_general_info_gmp(mfile* mf, u_int32_t* vsmad_data, size_t vsmad_data_len)
 {
     return mib_get_gmp(mf, IB_VS_ATTR_GENERAL_INFO, 0, vsmad_data, vsmad_data_len);
 }
 
-int mib_supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method)
+int mib_supports_reg_access_gmp(mfile* mf, maccess_reg_method_t reg_method)
 {
-    if (!mf || !mf->ctx) {
+    if (!mf || !mf->ctx)
+    {
         return 0;
     }
 
-    if (!((mf->flags & MDEVS_IB) && (((ibvs_mad *)(mf->ctx))->dest_type == IB_DEST_LID) &&
-            (reg_method == MACCESS_REG_METHOD_GET))) {
+    if (!((mf->flags & MDEVS_IB) && (((ibvs_mad*)(mf->ctx))->dest_type == IB_DEST_LID) &&
+          (reg_method == MACCESS_REG_METHOD_GET)))
+    {
         return 0;
     }
 
-    u_int32_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE/4] = {0};
-    if (mib_get_general_info_gmp(mf, vsmad_data, IB_VENDOR_RANGE1_DATA_SIZE/4)) {
+    u_int32_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE / 4] = {0};
+    if (mib_get_general_info_gmp(mf, vsmad_data, IB_VENDOR_RANGE1_DATA_SIZE / 4))
+    {
         return 0;
     }
 
@@ -1900,34 +2021,42 @@ int mib_supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method)
     // We want to skip them when relating GeneralInfo MAD fields in specific.
     // The capability_mask offset which is 0x80, is calculated from the beginning of GeneralInfo MAD fields.
     // So overall we have an offset of 0x8+0x80 bytes.
-    const int capability_mask_byte_offset = 0x8+0x80;
+    const int capability_mask_byte_offset = 0x8 + 0x80;
     const int is_access_register_supported_bit_offset = 20;
-    return EXTRACT(vsmad_data[capability_mask_byte_offset/4], is_access_register_supported_bit_offset, 1);
+    return EXTRACT(vsmad_data[capability_mask_byte_offset / 4], is_access_register_supported_bit_offset, 1);
 }
 
-int mib_acces_reg_mad(mfile *mf, u_int8_t *data)
+int mib_acces_reg_mad(mfile* mf, u_int8_t* data)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("mib_acces_reg_mad failed. Null Param."));
         return ME_BAD_PARAMS;
     }
-    u_int8_t *p;
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+    u_int8_t* p;
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
     int status = -1;
 
     // Set the MKey.
     set_mkey_for_smp_mad(h);
 
     // Call smp set function
-    if (h->smp_set_status_via) {
+    if (h->smp_set_status_via)
+    {
         p = h->smp_set_status_via(data, &(h->portid), IB_SMP_ATTR_REG_ACCESS, 0, 0, &status, h->srcport);
-    } else {
+    }
+    else
+    {
         p = h->smp_set_via(data, &(h->portid), IB_SMP_ATTR_REG_ACCESS, 0, 0, h->srcport);
     }
-    if (!p || status > 0) {
-        if (status != -1) {
+    if (!p || status > 0)
+    {
+        if (status != -1)
+        {
             return mib_status_translate(status);
-        } else {
+        }
+        else
+        {
             return -1;
         }
     }
@@ -1935,29 +2064,37 @@ int mib_acces_reg_mad(mfile *mf, u_int8_t *data)
     return ME_OK;
 }
 
-int mib_smp_set(mfile *mf, u_int8_t *data, u_int16_t attr_id, u_int32_t attr_mod)
+int mib_smp_set(mfile* mf, u_int8_t* data, u_int16_t attr_id, u_int32_t attr_mod)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("mib_smp_set failed. Null Param."));
         return ME_BAD_PARAMS;
     }
-    u_int8_t *p;
+    u_int8_t* p;
     int status = -1;
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
 
     // Set the MKey.
     set_mkey_for_smp_mad(h);
 
     // Call smp set function
-    if (h->smp_set_status_via) {
+    if (h->smp_set_status_via)
+    {
         p = h->smp_set_status_via(data, &(h->portid), attr_id, attr_mod, 0, &status, h->srcport);
-    } else {
+    }
+    else
+    {
         p = h->smp_set_via(data, &(h->portid), attr_id, attr_mod, 0, h->srcport);
     }
-    if (!p || status > 0) {
-        if (status != -1) {
+    if (!p || status > 0)
+    {
+        if (status != -1)
+        {
             return mib_status_translate(status);
-        } else {
+        }
+        else
+        {
             return -1;
         }
     }
@@ -1965,30 +2102,38 @@ int mib_smp_set(mfile *mf, u_int8_t *data, u_int16_t attr_id, u_int32_t attr_mod
     return ME_OK;
 }
 
-int mib_smp_get(mfile *mf, u_int8_t *data, u_int16_t attr_id, u_int32_t attr_mod)
+int mib_smp_get(mfile* mf, u_int8_t* data, u_int16_t attr_id, u_int32_t attr_mod)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("mib_smp_get failed. Null Param."));
         return ME_BAD_PARAMS;
     }
-    u_int8_t *p;
+    u_int8_t* p;
     int status = -1;
-    ibvs_mad *h = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* h = (ibvs_mad*)(mf->ctx);
 
     // Set the MKey.
     set_mkey_for_smp_mad(h);
 
     // Call smp set function
-    if (h->smp_query_status_via) {
+    if (h->smp_query_status_via)
+    {
         p = h->smp_query_status_via(data, &(h->portid), attr_id, attr_mod, 0, &status, h->srcport);
-    } else {
+    }
+    else
+    {
         p = h->smp_query_via(data, &(h->portid), attr_id, attr_mod, 0, h->srcport);
     }
 
-    if (!p || status > 0) {
-        if (status != -1) {
+    if (!p || status > 0)
+    {
+        if (status != -1)
+        {
             return mib_status_translate(status);
-        } else {
+        }
+        else
+        {
             return -1;
         }
     }
@@ -1996,38 +2141,53 @@ int mib_smp_get(mfile *mf, u_int8_t *data, u_int16_t attr_id, u_int32_t attr_mod
     return ME_OK;
 }
 
-int mib_semaphore_lock_smp(mfile *mf, u_int8_t *data, sem_lock_method_t method)
+int mib_semaphore_lock_smp(mfile* mf, u_int8_t* data, sem_lock_method_t method)
 {
-    if (!mf || !mf->ctx || !data) {
+    if (!mf || !mf->ctx || !data)
+    {
         IBERROR(("mib_semaphore_lock_smp failed. Null Param."));
         return ME_BAD_PARAMS;
     }
-    u_int8_t *smp_result;
+    u_int8_t* smp_result;
     int status = -1;
-    ibvs_mad *vs_mad = (ibvs_mad*)(mf->ctx);
+    ibvs_mad* vs_mad = (ibvs_mad*)(mf->ctx);
 
     // Setting MKey for this attribute caused MAD failures
     // and was disabled.
 
-    if (method == SEM_LOCK_SET) {
-        if (vs_mad->smp_set_status_via) {
-            smp_result = vs_mad->smp_set_status_via(data, &(vs_mad->portid), SMP_SEMAPHOE_LOCK_CMD, 0, 0, &status, vs_mad->srcport);
-        } else {
+    if (method == SEM_LOCK_SET)
+    {
+        if (vs_mad->smp_set_status_via)
+        {
+            smp_result = vs_mad->smp_set_status_via(data, &(vs_mad->portid), SMP_SEMAPHOE_LOCK_CMD, 0, 0, &status,
+                                                    vs_mad->srcport);
+        }
+        else
+        {
             smp_result = vs_mad->smp_set_via(data, &(vs_mad->portid), SMP_SEMAPHOE_LOCK_CMD, 0, 0, vs_mad->srcport);
         }
-    } else {
-        if (vs_mad->smp_query_status_via) {
-            smp_result = vs_mad->smp_query_status_via(data, &(vs_mad->portid), SMP_SEMAPHOE_LOCK_CMD, 0, 0, &status, vs_mad->srcport);
-        } else {
+    }
+    else
+    {
+        if (vs_mad->smp_query_status_via)
+        {
+            smp_result = vs_mad->smp_query_status_via(data, &(vs_mad->portid), SMP_SEMAPHOE_LOCK_CMD, 0, 0, &status,
+                                                      vs_mad->srcport);
+        }
+        else
+        {
             smp_result = vs_mad->smp_query_via(data, &(vs_mad->portid), SMP_SEMAPHOE_LOCK_CMD, 0, 0, vs_mad->srcport);
         }
     }
 
-
-    if (!smp_result || status > 0) {
-        if (status != -1) {
+    if (!smp_result || status > 0)
+    {
+        if (status != -1)
+        {
             return mib_status_translate(status);
-        } else {
+        }
+        else
+        {
             return -1;
         }
     }
@@ -2035,20 +2195,22 @@ int mib_semaphore_lock_smp(mfile *mf, u_int8_t *data, sem_lock_method_t method)
     return ME_OK;
 }
 
-int mib_supports_reg_access_cls_a(mfile *mf, maccess_reg_method_t reg_method)
+int mib_supports_reg_access_cls_a(mfile* mf, maccess_reg_method_t reg_method)
 {
-    if (!mf || !mf->ctx) {
+    if (!mf || !mf->ctx)
+    {
         return 0;
     }
 
-    if (!((mf->flags & MDEVS_IB) &&
-         (((ibvs_mad *)(mf->ctx))->dest_type == IB_DEST_LID) &&
-         (reg_method == MACCESS_REG_METHOD_SET || reg_method == MACCESS_REG_METHOD_GET))) {
+    if (!((mf->flags & MDEVS_IB) && (((ibvs_mad*)(mf->ctx))->dest_type == IB_DEST_LID) &&
+          (reg_method == MACCESS_REG_METHOD_SET || reg_method == MACCESS_REG_METHOD_GET)))
+    {
         return 0;
     }
 
-    u_int32_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE/4] = {0};
-    if (mib_get_general_info_gmp(mf, vsmad_data, IB_VENDOR_RANGE1_DATA_SIZE/4)) {
+    u_int32_t vsmad_data[IB_VENDOR_RANGE1_DATA_SIZE / 4] = {0};
+    if (mib_get_general_info_gmp(mf, vsmad_data, IB_VENDOR_RANGE1_DATA_SIZE / 4))
+    {
         return 0;
     }
 
@@ -2056,8 +2218,9 @@ int mib_supports_reg_access_cls_a(mfile *mf, maccess_reg_method_t reg_method)
     // We want to skip them when relating GeneralInfo MAD fields in specific.
     // The capability_mask offset which is 0x80, is calculated from the beginning of GeneralInfo MAD fields.
     // So overall we have an offset of 0x8+0x80 bytes.
-    const int capability_mask_byte_offset = 0x8+0x80;
+    const int capability_mask_byte_offset = 0x8 + 0x80;
     const int is_access_register_supported_bit_offset = 20;
-    const int is_supported = EXTRACT(vsmad_data[capability_mask_byte_offset/4], is_access_register_supported_bit_offset, 1);
+    const int is_supported =
+      EXTRACT(vsmad_data[capability_mask_byte_offset / 4], is_access_register_supported_bit_offset, 1);
     return is_supported;
 }
diff --git a/mtcr_ul/mtcr_ib_res_mgt.c b/mtcr_ul/mtcr_ib_res_mgt.c
index 4a913839..4450ac82 100644
--- a/mtcr_ul/mtcr_ib_res_mgt.c
+++ b/mtcr_ul/mtcr_ib_res_mgt.c
@@ -38,36 +38,45 @@
 
 #define IB_SMP_DATA_SIZE 48
 
-#define DBG_PRINTF(...) do { if (getenv("MFT_DEBUG") != NULL) { fprintf(stderr, __VA_ARGS__); } } while (0)
+#define DBG_PRINTF(...)                   \
+    do                                    \
+    {                                     \
+        if (getenv("MFT_DEBUG") != NULL)  \
+        {                                 \
+            fprintf(stderr, __VA_ARGS__); \
+        }                                 \
+    } while (0)
 
 /* Description -   */
 /* Size in bytes - 12 */
-struct semaphore_lock_cmd {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
+struct semaphore_lock_cmd
+{
+    /*---------------- DWORD[0] (Offset 0x0) ----------------*/
     /* Description - The maximal Semaphore Address supported by the device. */
     /* 0.0 - 0.7 */
     u_int8_t semaphore_max_addr;
     /* Description - The lease time for a lock is 50msec *2^LeaseTimeExponent */
     /* 0.16 - 0.23 */
     u_int8_t lease_time_exponent;
-    /* Description - Should be used to extend a lock. When a lock owner application wish to extend the lock it should set this bit to 1 and fill the Key field with key obtained by the GetResp() to successful acquiring of a lock. */
+    /* Description - Should be used to extend a lock. When a lock owner application wish to extend the lock it should
+     * set this bit to 1 and fill the Key field with key obtained by the GetResp() to successful acquiring of a lock. */
     /* 0.31 - 4.31 */
     u_int8_t is_lease;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
+    /*---------------- DWORD[1] (Offset 0x4) ----------------*/
     /* Description - The specific Semaphore being queried or requested a lock for */
     /* 4.0 - 4.15 */
     u_int16_t semaphore_addr;
     /* Description - 1 = Lock, 2 = Extend, 3 = Release */
     /* 4.16 - 4.17 */
     u_int8_t op;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description - This field is provided by the device on a successful lock. It should be used by the user in order to either extend or release of the lock. */
+    /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+    /* Description - This field is provided by the device on a successful lock. It should be used by the user in order
+     * to either extend or release of the lock. */
     /* 8.0 - 8.31 */
     u_int32_t lock_key;
 };
 
-
-void semaphore_lock_cmd_pack(const struct semaphore_lock_cmd *ptr_struct, u_int8_t *ptr_buff)
+void semaphore_lock_cmd_pack(const struct semaphore_lock_cmd* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -93,10 +102,9 @@ void semaphore_lock_cmd_pack(const struct semaphore_lock_cmd *ptr_struct, u_int8
 
     offset = 64;
     push_to_buff_32(ptr_buff, offset, ptr_struct->lock_key);
-
 }
 
-void semaphore_lock_cmd_unpack(struct semaphore_lock_cmd *ptr_struct, u_int8_t *ptr_buff)
+void semaphore_lock_cmd_unpack(struct semaphore_lock_cmd* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -124,18 +132,16 @@ void semaphore_lock_cmd_unpack(struct semaphore_lock_cmd *ptr_struct, u_int8_t *
 
     offset = 64;
     ptr_struct->lock_key = pop_from_buff_32(ptr_buff, offset);
-
 }
 
-int mib_semaphore_lock_vs_mad(
-    mfile *mf,
-    sem_op_t op,
-    u_int32_t sem_addr,
-    u_int32_t lock_key,
-    u_int32_t *res,
-    int *is_leaseable,
-    u_int8_t *lease_time_exp,
-    sem_lock_method_t method)
+int mib_semaphore_lock_vs_mad(mfile* mf,
+                              sem_op_t op,
+                              u_int32_t sem_addr,
+                              u_int32_t lock_key,
+                              u_int32_t* res,
+                              int* is_leaseable,
+                              u_int8_t* lease_time_exp,
+                              sem_lock_method_t method)
 {
 #ifndef NO_INBAND
     u_int8_t mad_data[IB_SMP_DATA_SIZE] = {0};
@@ -148,9 +154,12 @@ int mib_semaphore_lock_vs_mad(
     DBG_PRINTF("#######BFORE#####\n# SEM_ADDR: 0x%x\n# OP: %d\n# Lock_Key: 0x%x\n#################\n",
                cmd.semaphore_addr, cmd.op, cmd.lock_key);
     semaphore_lock_cmd_pack(&cmd, mad_data);
-    if (method == SEM_LOCK_SET) {
+    if (method == SEM_LOCK_SET)
+    {
         rc = mib_semaphore_lock_smp(mf, mad_data, method);
-    } else {
+    }
+    else
+    {
         rc = mib_semaphore_lock_smp(mf, mad_data, method);
     }
     semaphore_lock_cmd_unpack(&cmd, mad_data);
@@ -173,7 +182,7 @@ int mib_semaphore_lock_vs_mad(
 #endif
 }
 
-int mib_semaphore_lock_is_supported(mfile *mf)
+int mib_semaphore_lock_is_supported(mfile* mf)
 {
 #ifndef NO_INBAND
     u_int8_t mad_data[IB_SMP_DATA_SIZE] = {0};
@@ -182,9 +191,12 @@ int mib_semaphore_lock_is_supported(mfile *mf)
     mib_smp_get(mf, mad_data, SMP_SEMAPHOE_LOCK_CMD, 0);
     semaphore_lock_cmd_unpack(&cmd, mad_data);
     DBG_PRINTF("###### QUERY #####\n# MAX_SEM_ADDR: 0x%x\n#################\n", cmd.semaphore_max_addr);
-    if (cmd.semaphore_max_addr > 0) {
+    if (cmd.semaphore_max_addr > 0)
+    {
         return 1;
-    } else {
+    }
+    else
+    {
         return 0;
     }
 #else
diff --git a/mtcr_ul/mtcr_ib_res_mgt.h b/mtcr_ul/mtcr_ib_res_mgt.h
index 9d691e23..85a9e760 100644
--- a/mtcr_ul/mtcr_ib_res_mgt.h
+++ b/mtcr_ul/mtcr_ib_res_mgt.h
@@ -36,22 +36,22 @@
 
 #include <mtcr.h>
 
-typedef enum {
+typedef enum
+{
     SMP_SEM_LOCK = 1,
     SMP_SEM_EXTEND,
     SMP_SEM_RELEASE
 } sem_op_t;
 
-MTCR_API int mib_semaphore_lock_vs_mad(
-    mfile *mf,
-    sem_op_t op,
-    u_int32_t sem_addr,
-    u_int32_t lock_key,
-    u_int32_t *res,
-    int *is_leaseable,
-    u_int8_t *lease_time_exp,
-    sem_lock_method_t method);
+MTCR_API int mib_semaphore_lock_vs_mad(mfile* mf,
+                                       sem_op_t op,
+                                       u_int32_t sem_addr,
+                                       u_int32_t lock_key,
+                                       u_int32_t* res,
+                                       int* is_leaseable,
+                                       u_int8_t* lease_time_exp,
+                                       sem_lock_method_t method);
 
-MTCR_API int mib_semaphore_lock_is_supported(mfile *mf);
+MTCR_API int mib_semaphore_lock_is_supported(mfile* mf);
 
 #endif
diff --git a/mtcr_ul/mtcr_icmd_cif.h b/mtcr_ul/mtcr_icmd_cif.h
index 362f6b63..ba621847 100644
--- a/mtcr_ul/mtcr_icmd_cif.h
+++ b/mtcr_ul/mtcr_icmd_cif.h
@@ -31,11 +31,12 @@
  *
  */
 
-#ifndef _MTCR_ICMD_CIF     /* guard */
+#ifndef _MTCR_ICMD_CIF /* guard */
 #define _MTCR_ICMD_CIF
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <compatibility.h>
@@ -45,8 +46,7 @@ extern "C" {
 #include <mtcr_int_defs.h>
 #endif
 
-
-/* --------- Typedefs & Constants ---------------------------------- */
+    /* --------- Typedefs & Constants ---------------------------------- */
 
 #ifndef IN
 #define IN
@@ -54,62 +54,61 @@ extern "C" {
 #define INOUT
 #endif
 
-#define FLASH_REG_ACCESS    0x9001
-#define ICMD_MAX_CMD_SIZE   0x340 // max mailbox size
-
-MTCR_API extern int increase_poll_time;
-
-
-/* --------- Functional API ---------------------------------------- */
-/**
- * Create a device-context for the command-interface of a ConnectIB device.
- * @param[in] mf    Open mfile to the desired device.
- * @return          zero value on success, non zero value on failure.
- **/
-int icmd_open(mfile *mf);
-
-/**
- * Close an open device-context for the command-interface of a
- * ConnectIB device.
- * @param[in] dev   A pointer to a device context, previously
- *                  obtained by a call to <tt>gcif_open</tt>.
- **/
-void icmd_close(mfile *mf);
-
-/**
- * Handles the send command procedure.
- * for completeness, but calling it is strongly advised against.
- * @param[in] dev   A pointer to a device context, previously
- *                  obtained by a call to <tt>gcif_open</tt>.
- * @return          One of the GCIF_STATUS_* values, or a raw
- *                  status value (as indicated in cr-space).
- **/
-int icmd_send_command_int(mfile     *mf,
-                          IN int opcode,
-                          INOUT void *data,
-                          IN int write_data_size,
-                          IN int read_data_size,
-                          IN int skip_write);
-
-int icmd_send_command_enhanced(mfile     *mf,
-                               IN int opcode,
-                               INOUT void *data,
-                               IN int write_data_size,
-                               IN int read_data_size,
-                               IN int skip_write);
-
-/**
- * Take the Tools-HCR semaphore. This functionality is provided
- * for completeness, but calling it is strongly advised against.
- * @param[in] dev   A pointer to a device context, previously
- *                  obtained by a call to <tt>gcif_open</tt>.
- * @return          One of the GCIF_STATUS_* values, or a raw
- *                  status value (as indicated in cr-space).
- **/
-int icmd_take_semaphore(mfile *mf);
+#define FLASH_REG_ACCESS 0x9001
+#define ICMD_MAX_CMD_SIZE 0x340 // max mailbox size
+
+    MTCR_API extern int increase_poll_time;
+
+    /* --------- Functional API ---------------------------------------- */
+    /**
+     * Create a device-context for the command-interface of a ConnectIB device.
+     * @param[in] mf    Open mfile to the desired device.
+     * @return          zero value on success, non zero value on failure.
+     **/
+    int icmd_open(mfile* mf);
+
+    /**
+     * Close an open device-context for the command-interface of a
+     * ConnectIB device.
+     * @param[in] dev   A pointer to a device context, previously
+     *                  obtained by a call to <tt>gcif_open</tt>.
+     **/
+    void icmd_close(mfile* mf);
+
+    /**
+     * Handles the send command procedure.
+     * for completeness, but calling it is strongly advised against.
+     * @param[in] dev   A pointer to a device context, previously
+     *                  obtained by a call to <tt>gcif_open</tt>.
+     * @return          One of the GCIF_STATUS_* values, or a raw
+     *                  status value (as indicated in cr-space).
+     **/
+    int icmd_send_command_int(mfile* mf,
+                              IN int opcode,
+                              INOUT void* data,
+                              IN int write_data_size,
+                              IN int read_data_size,
+                              IN int skip_write);
+
+    int icmd_send_command_enhanced(mfile* mf,
+                                   IN int opcode,
+                                   INOUT void* data,
+                                   IN int write_data_size,
+                                   IN int read_data_size,
+                                   IN int skip_write);
+
+    /**
+     * Take the Tools-HCR semaphore. This functionality is provided
+     * for completeness, but calling it is strongly advised against.
+     * @param[in] dev   A pointer to a device context, previously
+     *                  obtained by a call to <tt>gcif_open</tt>.
+     * @return          One of the GCIF_STATUS_* values, or a raw
+     *                  status value (as indicated in cr-space).
+     **/
+    int icmd_take_semaphore(mfile* mf);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* _MTCR_ICMD_CIF guard */
+#endif /* _MTCR_ICMD_CIF guard */
diff --git a/mtcr_ul/mtcr_int_defs.h b/mtcr_ul/mtcr_int_defs.h
index 2f58e88b..3b8e3873 100644
--- a/mtcr_ul/mtcr_int_defs.h
+++ b/mtcr_ul/mtcr_int_defs.h
@@ -36,18 +36,19 @@
 
 #include "mtcr_com_defs.h"
 
-typedef int (*f_mread4)        (mfile *mf, unsigned int offset, u_int32_t *value);
-typedef int (*f_mwrite4)       (mfile *mf, unsigned int offset, u_int32_t value);
-typedef int (*f_mread4_block)  (mfile *mf, unsigned int offset, u_int32_t *data, int byte_len);
-typedef int (*f_mwrite4_block) (mfile *mf, unsigned int offset, u_int32_t *data, int byte_len);
-typedef int (*f_maccess_reg)   (mfile *mf, u_int8_t *data);
-typedef int (*f_mclose)        (mfile *mf);
+typedef int (*f_mread4)(mfile* mf, unsigned int offset, u_int32_t* value);
+typedef int (*f_mwrite4)(mfile* mf, unsigned int offset, u_int32_t value);
+typedef int (*f_mread4_block)(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len);
+typedef int (*f_mwrite4_block)(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len);
+typedef int (*f_maccess_reg)(mfile* mf, u_int8_t* data);
+typedef int (*f_mclose)(mfile* mf);
 
-typedef struct ul_ctx {
+typedef struct ul_ctx
+{
     int fdlock;
     /* Hermon WA */
-    int connectx_flush;              /* For ConnectX A0 */
-    int need_flush;              /* For ConnectX A0 */
+    int connectx_flush; /* For ConnectX A0 */
+    int need_flush;     /* For ConnectX A0 */
 
     f_mread4 mread4;
     f_mwrite4 mwrite4;
@@ -55,7 +56,7 @@ typedef struct ul_ctx {
     f_mwrite4_block mwrite4_block;
     f_maccess_reg maccess_reg;
     f_mclose mclose;
-    int wo_addr;              /* Is write Only Addr GW */
+    int wo_addr; /* Is write Only Addr GW */
     /******** RESERVED FIELDS FOR SWITCHING METHOD IF NEEDED ******/
     int res_access_type;
     int res_fdlock;
@@ -67,6 +68,3 @@ typedef struct ul_ctx {
     int via_driver;
 } ul_ctx_t;
 #endif
-
-
-
diff --git a/mtcr_ul/mtcr_mem_ops.c b/mtcr_ul/mtcr_mem_ops.c
index 8e0b38e1..89fdc70d 100644
--- a/mtcr_ul/mtcr_mem_ops.c
+++ b/mtcr_ul/mtcr_mem_ops.c
@@ -43,7 +43,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-int mtcr_memaccess(mfile* mf, unsigned int offset, unsigned int size, unsigned char *data, int rw, mem_type_t type)
+int mtcr_memaccess(mfile* mf, unsigned int offset, unsigned int size, unsigned char* data, int rw, mem_type_t type)
 {
 #if defined(__WIN__) || defined(MST_UL) || defined(__FreeBSD__) || defined(__VMKERNEL_UW_NATIVE__)
     (void)type;
@@ -54,28 +54,34 @@ int mtcr_memaccess(mfile* mf, unsigned int offset, unsigned int size, unsigned c
     (void)rw;
     return ME_UNSUPPORTED_OPERATION;
 #else
-    if (mf->ul_ctx) {
+    if (mf->ul_ctx)
+    {
         return ME_UNSUPPORTED_OPERATION;
     }
     unsigned int iterator = 0;
-    while (iterator < size) {
-        unsigned int op_size = ((size - iterator) > PCICONF_MAX_MEMACCESS_SIZE) ? PCICONF_MAX_MEMACCESS_SIZE : (size - iterator);
+    while (iterator < size)
+    {
+        unsigned int op_size =
+          ((size - iterator) > PCICONF_MAX_MEMACCESS_SIZE) ? PCICONF_MAX_MEMACCESS_SIZE : (size - iterator);
         struct mst_mem_access_st mem_access;
         memset(&mem_access, 0, sizeof(mem_access));
         mem_access._rw = rw;
         mem_access.offset = offset + iterator;
         mem_access.size = op_size;
         mem_access.mem_type = type;
-        if (rw) {
+        if (rw)
+        {
             /*
              * Write OP
              */
             memcpy(mem_access.data, data + iterator, op_size);
         }
-        if (ioctl(mf->fd, PCICONF_MEM_ACCESS, &mem_access) < 0) {
+        if (ioctl(mf->fd, PCICONF_MEM_ACCESS, &mem_access) < 0)
+        {
             return ME_ERROR;
         }
-        if (!rw) {
+        if (!rw)
+        {
             /*
              * Read OP
              */
@@ -87,8 +93,7 @@ int mtcr_memaccess(mfile* mf, unsigned int offset, unsigned int size, unsigned c
 #endif
 }
 
-
-int get_mem_props(mfile *mf, mem_type_t type, mem_props_t *props)
+int get_mem_props(mfile* mf, mem_type_t type, mem_props_t* props)
 {
 #if defined(__WIN__) || defined(MST_UL) || defined(__FreeBSD__) || defined(__VMKERNEL_UW_NATIVE__)
     (void)mf;
@@ -96,45 +101,52 @@ int get_mem_props(mfile *mf, mem_type_t type, mem_props_t *props)
     (void)props;
     return ME_UNSUPPORTED_OPERATION;
 #else
-    if (!mf || !mf->dma_props) {
+    if (!mf || !mf->dma_props)
+    {
         return ME_UNSUPPORTED_OPERATION;
     }
-    if (type >= MEM_END) {
+    if (type >= MEM_END)
+    {
         return ME_BAD_PARAMS;
     }
-    struct dma_prop *dma_props_p = (struct dma_prop*)mf->dma_props + (int)type;
+    struct dma_prop* dma_props_p = (struct dma_prop*)mf->dma_props + (int)type;
     props->dma_pa = dma_props_p->dma_pa;
     props->mem_size = dma_props_p->mem_size;
     return ME_OK;
 #endif
 }
 
-void init_mem_ops(mfile *mf)
+void init_mem_ops(mfile* mf)
 {
 #if defined(__WIN__) || defined(MST_UL) || defined(__FreeBSD__) || defined(__VMKERNEL_UW_NATIVE__)
     (void)mf;
 #else
-    if (!mf || mf->ul_ctx) {
+    if (!mf || mf->ul_ctx)
+    {
         return;
     }
     struct mst_dma_props_st dma_props_params;
     memset(&dma_props_params, 0, sizeof(dma_props_params));
-    if (ioctl(mf->fd, PCICONF_DMA_PROPS, &dma_props_params) < 0) {
+    if (ioctl(mf->fd, PCICONF_DMA_PROPS, &dma_props_params) < 0)
+    {
         mf->dma_props = NULL;
-    } else {
+    }
+    else
+    {
         mf->dma_props = malloc(sizeof(dma_props_params.dma_props));
-        if (mf->dma_props) {
+        if (mf->dma_props)
+        {
             memcpy(mf->dma_props, &dma_props_params.dma_props, sizeof(dma_props_params.dma_props));
         }
     }
 #endif
 }
 
-void close_mem_ops(mfile *mf)
+void close_mem_ops(mfile* mf)
 {
-    if (mf->dma_props) {
+    if (mf->dma_props)
+    {
         free(mf->dma_props);
         mf->dma_props = NULL;
     }
 }
-
diff --git a/mtcr_ul/mtcr_mem_ops.h b/mtcr_ul/mtcr_mem_ops.h
index cb533fe7..70fccead 100644
--- a/mtcr_ul/mtcr_mem_ops.h
+++ b/mtcr_ul/mtcr_mem_ops.h
@@ -33,21 +33,22 @@
 
 #include "mtcr.h"
 
-typedef enum {
+typedef enum
+{
     MEM_ICMD,
     MEM_END
 } mem_type_t;
 
-typedef struct {
+typedef struct
+{
     unsigned long long int dma_pa;
     unsigned int mem_size;
 } mem_props_t;
 
-void init_mem_ops(mfile *mf);
+void init_mem_ops(mfile* mf);
 
-void close_mem_ops(mfile *mf);
+void close_mem_ops(mfile* mf);
 
-int mtcr_memaccess(mfile* mf, unsigned int offset, unsigned int size, unsigned char *data, int rw, mem_type_t type);
-
-int get_mem_props(mfile *mf, mem_type_t type, mem_props_t *props);
+int mtcr_memaccess(mfile* mf, unsigned int offset, unsigned int size, unsigned char* data, int rw, mem_type_t type);
 
+int get_mem_props(mfile* mf, mem_type_t type, mem_props_t* props);
diff --git a/mtcr_ul/mtcr_tools_cif.c b/mtcr_ul/mtcr_tools_cif.c
index fff20d2b..3cf29114 100644
--- a/mtcr_ul/mtcr_tools_cif.c
+++ b/mtcr_ul/mtcr_tools_cif.c
@@ -45,54 +45,63 @@
 #include <mtcr_mf.h>
 #endif
 
-#define TOOLS_HCR_ADDR      0x80780
-#define CR_MBOX_ADDR        0xe0000
-#define CMD_IF_SIZE         28
-#define CMD_IF_WAIT_GO      2000
-
-#define TOOLS_HCR_SEM       0xf03bc // sem47
-#define TOOLS_SEM_TRIES     1024     // Number of tries to obtain a TOOLS sem.
-
-#define MBOX_WRITE_OP       0x70
-#define MBOX_READ_OP        0x71
-#define REG_ACCESS_OP       0x3b
-
-#define MREAD4_ADV(offs, val_ptr, action_on_fail)   do { \
-        if (mread4(mf, offs, val_ptr) != 4) { \
-            /*fprintf(stderr, "-E- Cr read (0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), strerror(errno), (u_int32_t)errno);*/ \
-            action_on_fail; \
-        } \
-        /*printf("-D- %s:%d mread4: offs = %#x, val = %#x\n", __FUNCTION__, __LINE__, offs, val);*/ \
-} while (0)
-
-#define MWRITE4_ADV(offs, val, action_on_fail)  do { \
-        if (mwrite4(mf, offs, val) != 4) { \
-            /*fprintf(stderr, "-E- Cr write (0x%08x, 0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), (u_int32_t)(val), strerror(errno), (u_int32_t)errno);*/ \
-            action_on_fail; \
-        } \
-        /*printf("-D- %s:%d mwrite4: offs = %#x, val = %#x\n",   __FUNCTION__, __LINE__, offs, val);*/ \
-} while (0)
+#define TOOLS_HCR_ADDR 0x80780
+#define CR_MBOX_ADDR 0xe0000
+#define CMD_IF_SIZE 28
+#define CMD_IF_WAIT_GO 2000
+
+#define TOOLS_HCR_SEM 0xf03bc // sem47
+#define TOOLS_SEM_TRIES 1024  // Number of tries to obtain a TOOLS sem.
+
+#define MBOX_WRITE_OP 0x70
+#define MBOX_READ_OP 0x71
+#define REG_ACCESS_OP 0x3b
+
+#define MREAD4_ADV(offs, val_ptr, action_on_fail)                                                          \
+    do                                                                                                     \
+    {                                                                                                      \
+        if (mread4(mf, offs, val_ptr) != 4)                                                                \
+        {                                                                                                  \
+            /*fprintf(stderr, "-E- Cr read (0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), strerror(errno), \
+             * (u_int32_t)errno);*/                                                                        \
+            action_on_fail;                                                                                \
+        }                                                                                                  \
+        /*printf("-D- %s:%d mread4: offs = %#x, val = %#x\n", __FUNCTION__, __LINE__, offs, val);*/        \
+    } while (0)
+
+#define MWRITE4_ADV(offs, val, action_on_fail)                                                                       \
+    do                                                                                                               \
+    {                                                                                                                \
+        if (mwrite4(mf, offs, val) != 4)                                                                             \
+        {                                                                                                            \
+            /*fprintf(stderr, "-E- Cr write (0x%08x, 0x%08x) failed: %s(%d)\n", (u_int32_t)(offs), (u_int32_t)(val), \
+             * strerror(errno), (u_int32_t)errno);*/                                                                 \
+            action_on_fail;                                                                                          \
+        }                                                                                                            \
+        /*printf("-D- %s:%d mwrite4: offs = %#x, val = %#x\n",   __FUNCTION__, __LINE__, offs, val);*/               \
+    } while (0)
 #define MREAD4(offs, val_ptr) MREAD4_ADV(offs, val_ptr, return ME_CR_ERROR)
 #define MWRITE4(offs, val) MWRITE4_ADV(offs, val, return ME_CR_ERROR)
 
-
-#define TOCPUn(s, n) do {                                          \
-        u_int32_t ii;                                                   \
-        u_int32_t *p = (u_int32_t*)(s);                               \
-        for (ii = 0; ii < (n); ii++, p++)                         \
-            *p = __be32_to_cpu(*p);                                    \
-} while (0)
+#define TOCPUn(s, n)                      \
+    do                                    \
+    {                                     \
+        u_int32_t ii;                     \
+        u_int32_t* p = (u_int32_t*)(s);   \
+        for (ii = 0; ii < (n); ii++, p++) \
+            *p = __be32_to_cpu(*p);       \
+    } while (0)
 
 #if __BYTE_ORDER == __BIG_ENDIAN
 
-#define SWAP_DW_BE(uint64_num) \
-    (((uint64_num) & 0xffffffffULL) << 32) | (((uint64_num) >> 32) & 0xffffffffULL)
+#define SWAP_DW_BE(uint64_num) (((uint64_num)&0xffffffffULL) << 32) | (((uint64_num) >> 32) & 0xffffffffULL)
 
 #else
 #define SWAP_DW_BE(uint64_num) (uint64_num)
 #endif
 
-typedef struct tools_cmdif_t {
+typedef struct tools_cmdif_t
+{
     u_int32_t in_param_h;
     u_int32_t in_param_l;
     u_int32_t out_param_h;
@@ -107,37 +116,37 @@ typedef struct tools_cmdif_t {
     u_int8_t status;
 } tools_cmdif;
 
-
 static int translate_status(int status)
 {
-    switch (status) {
-    case 0x0:
-        return ME_OK;
+    switch (status)
+    {
+        case 0x0:
+            return ME_OK;
 
-    case 0x1:
-        return ME_CMDIF_BUSY;
+        case 0x1:
+            return ME_CMDIF_BUSY;
 
-    case 0x2:
-        return ME_CMDIF_BAD_OP;
+        case 0x2:
+            return ME_CMDIF_BAD_OP;
 
-    case 0x3:
-        return ME_CMDIF_UNKN_TLV;
+        case 0x3:
+            return ME_CMDIF_UNKN_TLV;
 
-    case 0x4:
-        return ME_CMDIF_BAD_SYS;
+        case 0x4:
+            return ME_CMDIF_BAD_SYS;
 
-    case 0x9:
-        return ME_CMDIF_RES_STATE;
+        case 0x9:
+            return ME_CMDIF_RES_STATE;
 
-    default:
-        //printf("-D- Unknown status: 0x%x\n", status);
-        return ME_CMDIF_UNKN_STATUS;
+        default:
+            // printf("-D- Unknown status: 0x%x\n", status);
+            return ME_CMDIF_UNKN_STATUS;
     }
 }
 
-extern void mpci_change(mfile *mf);
+extern void mpci_change(mfile* mf);
 
-static void tools_cmdif_pack(tools_cmdif *cmd, u_int32_t *buf)
+static void tools_cmdif_pack(tools_cmdif* cmd, u_int32_t* buf)
 {
     memset((char*)buf, 0, CMD_IF_SIZE);
     buf[0] = cmd->in_param_h;
@@ -145,82 +154,93 @@ static void tools_cmdif_pack(tools_cmdif *cmd, u_int32_t *buf)
     buf[2] = cmd->input_modifier;
     // out h
     // out l
-    buf[5] = MERGE(buf[5], cmd->token,               16, 16);
-    buf[6] = MERGE(buf[6], cmd->opcode,               0, 12);
-    buf[6] = MERGE(buf[6], cmd->opcode_modifier,     12,  4);
-    buf[6] = MERGE(buf[6], cmd->e,                   22,  1);
+    buf[5] = MERGE(buf[5], cmd->token, 16, 16);
+    buf[6] = MERGE(buf[6], cmd->opcode, 0, 12);
+    buf[6] = MERGE(buf[6], cmd->opcode_modifier, 12, 4);
+    buf[6] = MERGE(buf[6], cmd->e, 22, 1);
 }
 
-static void tools_cmdif_unpack(tools_cmdif *cmd, u_int32_t *buf)
+static void tools_cmdif_unpack(tools_cmdif* cmd, u_int32_t* buf)
 {
     memset(cmd, 0, sizeof(tools_cmdif));
 
-    cmd->in_param_h       = buf[0];
-    cmd->in_param_l       = buf[1];
+    cmd->in_param_h = buf[0];
+    cmd->in_param_l = buf[1];
 
     cmd->input_modifier = buf[2];
-    cmd->out_param_h      = buf[3];
-    cmd->out_param_l      = buf[4];
-    cmd->opcode         = EXTRACT(buf[6], 0, 12);
+    cmd->out_param_h = buf[3];
+    cmd->out_param_l = buf[4];
+    cmd->opcode = EXTRACT(buf[6], 0, 12);
     cmd->opcode_modifier = EXTRACT(buf[6], 12, 4);
-    cmd->status         = EXTRACT(buf[6], 24, 8);
+    cmd->status = EXTRACT(buf[6], 24, 8);
 }
 
-static int tools_cmdif_flash_lock(mfile *mf, int lock_state)
+static int tools_cmdif_flash_lock(mfile* mf, int lock_state)
 {
     // Obtain Semaphore
     u_int32_t cnt = 0;
     u_int32_t word = 0;
-    if (lock_state) {
-        do {
-            if (++cnt > TOOLS_SEM_TRIES) {
-                //printf("-E- Can not obtain Flash semaphore");
+    if (lock_state)
+    {
+        do
+        {
+            if (++cnt > TOOLS_SEM_TRIES)
+            {
+                // printf("-E- Can not obtain Flash semaphore");
                 return ME_SEM_LOCKED;
             }
             MREAD4(TOOLS_HCR_SEM, &word);
-            if (word) {
+            if (word)
+            {
                 msleep(rand() % 5);
             }
         } while (word);
-    } else {
+    }
+    else
+    {
         MWRITE4(TOOLS_HCR_SEM, 0);
     }
 
     return ME_OK;
 }
 
-int tools_cmdif_unlock_semaphore(mfile *mf)
+int tools_cmdif_unlock_semaphore(mfile* mf)
 {
     return tools_cmdif_flash_lock(mf, 0);
 }
 
-static int tools_cmdif_wait_go(mfile *mf, int *retries)
+static int tools_cmdif_wait_go(mfile* mf, int* retries)
 {
     int i;
     u_int8_t go_bit;
     int wait = 1;
 
-    for (i = 0; i < CMD_IF_WAIT_GO; i++) {
+    for (i = 0; i < CMD_IF_WAIT_GO; i++)
+    {
         u_int32_t word = 0;
         MREAD4(TOOLS_HCR_ADDR + CMD_IF_SIZE - 4, &word);
         go_bit = EXTRACT(word, 23, 1);
-        if (!go_bit) {
-            if (retries) {
+        if (!go_bit)
+        {
+            if (retries)
+            {
                 *retries = i;
             }
             return 0;
         }
-        if (i > 5) { // after some iteration put sleeps bwtween busy-wait
-            msleep(wait);  // don't hog the cpu with busy-wait
-            if (wait < 8) {
-                wait *= 2;    // exponential backoff - up-to 8ms between polls
+        if (i > 5)
+        {                 // after some iteration put sleeps bwtween busy-wait
+            msleep(wait); // don't hog the cpu with busy-wait
+            if (wait < 8)
+            {
+                wait *= 2; // exponential backoff - up-to 8ms between polls
             }
         }
     }
     return ME_CMDIF_BUSY;
 }
 
-static int tools_cmdif_send_cmd_int(mfile *mf, tools_cmdif *cmd)
+static int tools_cmdif_send_cmd_int(mfile* mf, tools_cmdif* cmd)
 {
     u_int32_t raw_cmd[CMD_IF_SIZE / 4];
     int act_retries;
@@ -228,46 +248,52 @@ static int tools_cmdif_send_cmd_int(mfile *mf, tools_cmdif *cmd)
 
     // Check if the go BIT is ready
     rc = tools_cmdif_wait_go(mf, NULL);
-    if (rc) {
-        //printf("tools_cmdif_send: GO bit set before command issued (rc=%d)\n", rc);
+    if (rc)
+    {
+        // printf("tools_cmdif_send: GO bit set before command issued (rc=%d)\n", rc);
         return ME_CMDIF_BUSY;
     }
     // Prepare the date of the command we're gonna execute
     tools_cmdif_pack(cmd, raw_cmd);
-    if (mwrite4_block(mf, TOOLS_HCR_ADDR, raw_cmd, CMD_IF_SIZE) != CMD_IF_SIZE) {
+    if (mwrite4_block(mf, TOOLS_HCR_ADDR, raw_cmd, CMD_IF_SIZE) != CMD_IF_SIZE)
+    {
         return ME_CR_ERROR;
     }
 
-    raw_cmd[6] = MERGE(raw_cmd[6],      1,                   23,  1); // go
+    raw_cmd[6] = MERGE(raw_cmd[6], 1, 23, 1); // go
     MWRITE4(TOOLS_HCR_ADDR + 24, raw_cmd[6]);
 
     rc = tools_cmdif_wait_go(mf, &act_retries);
 
-    if (rc) {
+    if (rc)
+    {
         return ME_CMDIF_TOUT;
     }
 
-    if (mread4_block(mf, TOOLS_HCR_ADDR, raw_cmd, CMD_IF_SIZE) != CMD_IF_SIZE) {
+    if (mread4_block(mf, TOOLS_HCR_ADDR, raw_cmd, CMD_IF_SIZE) != CMD_IF_SIZE)
+    {
         return ME_CR_ERROR;
     }
 
     tools_cmdif_unpack(cmd, raw_cmd);
 
-    if (cmd->status) {
-        //printf("-E- CMD IF Bad status. Op: 0x%x Status: 0x%x\n", cmd->opcode, cmd->status);
+    if (cmd->status)
+    {
+        // printf("-E- CMD IF Bad status. Op: 0x%x Status: 0x%x\n", cmd->opcode, cmd->status);
         return ME_CMDIF_BAD_STATUS; // TODO - Special return code here - needs a specific attention
     }
     return ME_OK;
 }
 
-int tools_cmdif_send_inline_cmd_int(mfile *mf,
+int tools_cmdif_send_inline_cmd_int(mfile* mf,
                                     u_int32_t in_param[2],
                                     u_int32_t out_param[2],
                                     u_int32_t input_modifier,
                                     u_int16_t opcode,
                                     u_int8_t opcode_modifier)
 {
-    if (!mf) {
+    if (!mf)
+    {
         return ME_BAD_PARAMS;
     }
     tools_cmdif cmdif;
@@ -278,9 +304,10 @@ int tools_cmdif_send_inline_cmd_int(mfile *mf,
     cmdif.opcode = opcode;
     cmdif.opcode_modifier = opcode_modifier;
 
-    //take semaphore
+    // take semaphore
     mpci_change(mf);
-    if (tools_cmdif_flash_lock(mf, 1)) {
+    if (tools_cmdif_flash_lock(mf, 1))
+    {
         mpci_change(mf);
         return ME_SEM_LOCKED;
     }
@@ -288,27 +315,31 @@ int tools_cmdif_send_inline_cmd_int(mfile *mf,
     // release it
     tools_cmdif_flash_lock(mf, 0);
     mpci_change(mf);
-    if (out_param) {
+    if (out_param)
+    {
         out_param[0] = cmdif.out_param_l;
         out_param[1] = cmdif.out_param_h;
     }
-    if (rc || cmdif.status) {
+    if (rc || cmdif.status)
+    {
         return (rc != ME_CMDIF_BAD_STATUS) ? rc : translate_status(cmdif.status);
     }
     return rc;
 }
 
-int tools_cmdif_send_inline_cmd(mfile *mf,
+int tools_cmdif_send_inline_cmd(mfile* mf,
                                 u_int64_t in_param,
-                                u_int64_t *out_param,
+                                u_int64_t* out_param,
                                 u_int32_t input_modifier,
                                 u_int16_t opcode,
                                 u_int8_t opcode_modifier)
 {
     int rc;
     in_param = SWAP_DW_BE(in_param);
-    rc = tools_cmdif_send_inline_cmd_int(mf, (u_int32_t*)((u_int8_t*)&in_param), (u_int32_t*)out_param, input_modifier, opcode, opcode_modifier);
-    if (out_param) {
+    rc = tools_cmdif_send_inline_cmd_int(
+      mf, (u_int32_t*)((u_int8_t*)&in_param), (u_int32_t*)out_param, input_modifier, opcode, opcode_modifier);
+    if (out_param)
+    {
         u_int64_t swapped_out_param = SWAP_DW_BE(*out_param);
         *out_param = swapped_out_param;
     }
@@ -316,14 +347,15 @@ int tools_cmdif_send_inline_cmd(mfile *mf,
 }
 
 // read from mailbox method. output[2] is in BigEndian
-static int tools_cmdif_mbox_read(mfile *mf, u_int32_t offset, u_int32_t output[2])
+static int tools_cmdif_mbox_read(mfile* mf, u_int32_t offset, u_int32_t output[2])
 {
-    if (!mf || (offset & 0x1) != 0 || !output) {// offset should be quad word aligned (i.e only even dwords)
+    if (!mf || (offset & 0x1) != 0 || !output)
+    { // offset should be quad word aligned (i.e only even dwords)
         return ME_BAD_PARAMS;
     }
     tools_cmdif cmdif;
     memset(&cmdif, 0, sizeof(tools_cmdif));
-    //printf("-D- offset: 0x%x\n", offset>>2);
+    // printf("-D- offset: 0x%x\n", offset>>2);
     cmdif.input_modifier = offset; // offset is in dwords
     cmdif.opcode = MBOX_READ_OP;
 
@@ -331,17 +363,19 @@ static int tools_cmdif_mbox_read(mfile *mf, u_int32_t offset, u_int32_t output[2
     // swap endianess because tools_cmdif_send_cmd_int returns output in CPU endianess
     output[0] = __be32_to_cpu(cmdif.out_param_l);
     output[1] = __be32_to_cpu(cmdif.out_param_h);
-    if (rc || cmdif.status) {
+    if (rc || cmdif.status)
+    {
         return (rc != ME_CMDIF_BAD_STATUS) ? rc : translate_status(cmdif.status);
     }
-    //printf("-D- mbox read OK\n");
+    // printf("-D- mbox read OK\n");
     return ME_OK;
 }
 
 // write to mailbox method. input[2] is in BigEndian
-static int tools_cmdif_mbox_write(mfile *mf, u_int32_t offset, u_int32_t input[2])
+static int tools_cmdif_mbox_write(mfile* mf, u_int32_t offset, u_int32_t input[2])
 {
-    if (!mf || (offset & 0x1) != 0) {// offset should be quad word aligned (i.e only even dwords)
+    if (!mf || (offset & 0x1) != 0)
+    { // offset should be quad word aligned (i.e only even dwords)
         return ME_BAD_PARAMS;
     }
     tools_cmdif cmdif;
@@ -353,50 +387,58 @@ static int tools_cmdif_mbox_write(mfile *mf, u_int32_t offset, u_int32_t input[2
     cmdif.opcode = MBOX_WRITE_OP;
     int rc = tools_cmdif_send_cmd_int(mf, &cmdif);
 
-    if (rc || cmdif.status) {
+    if (rc || cmdif.status)
+    {
         return (rc != ME_CMDIF_BAD_STATUS) ? rc : translate_status(cmdif.status);
     }
     return ME_OK;
 }
 
-static int tools_cmdif_cr_mbox_write(mfile *mf, u_int32_t offset, u_int8_t *data, int size)
+static int tools_cmdif_cr_mbox_write(mfile* mf, u_int32_t offset, u_int8_t* data, int size)
 {
-    if (!mf || !data || (offset + size > TOOLS_HCR_MAX_MBOX)) {
+    if (!mf || !data || (offset + size > TOOLS_HCR_MAX_MBOX))
+    {
         return ME_BAD_PARAMS;
     }
-    if (mwrite_buffer(mf, CR_MBOX_ADDR + offset, data, size) != size) {
+    if (mwrite_buffer(mf, CR_MBOX_ADDR + offset, data, size) != size)
+    {
         return ME_CR_ERROR;
     }
     return ME_OK;
 }
 
-static int tools_cmdif_cr_mbox_read(mfile *mf, u_int32_t offset, u_int8_t *data, int size)
+static int tools_cmdif_cr_mbox_read(mfile* mf, u_int32_t offset, u_int8_t* data, int size)
 {
-    if (!mf || !data || (offset + size > TOOLS_HCR_MAX_MBOX)) {
+    if (!mf || !data || (offset + size > TOOLS_HCR_MAX_MBOX))
+    {
         return ME_BAD_PARAMS;
     }
-    if (mread_buffer(mf, CR_MBOX_ADDR + offset, data, size) != size) {
+    if (mread_buffer(mf, CR_MBOX_ADDR + offset, data, size) != size)
+    {
         return ME_CR_ERROR;
     }
     return ME_OK;
 }
 
-int tools_cmdif_is_supported(mfile *mf)
+int tools_cmdif_is_supported(mfile* mf)
 {
     int rc = ME_OK;
     // run mailbox write cmd (read command fails after driver restart or internal reset)
     u_int32_t writebuf[2] = {0};
-    if (!mf) {
+    if (!mf)
+    {
         return ME_BAD_PARAMS;
     }
     mpci_change(mf);
     // take semaphore
-    if (tools_cmdif_flash_lock(mf, 1)) {
+    if (tools_cmdif_flash_lock(mf, 1))
+    {
         rc = ME_SEM_LOCKED;
         goto cleanup;
     }
     rc = tools_cmdif_mbox_write(mf, 0, writebuf);
-    if (rc) {
+    if (rc)
+    {
         tools_cmdif_flash_lock(mf, 0);
         goto cleanup;
     }
@@ -407,12 +449,13 @@ int tools_cmdif_is_supported(mfile *mf)
 }
 
 #define MAGIC 0xbadb00f
-int tools_cmdif_is_cr_mbox_supported(mfile *mf)
+int tools_cmdif_is_cr_mbox_supported(mfile* mf)
 {
     int rc;
     u_int32_t val = 0;
     mpci_change(mf);
-    if ((rc = tools_cmdif_flash_lock(mf, 1))) {
+    if ((rc = tools_cmdif_flash_lock(mf, 1)))
+    {
         goto cleanup_no_sem;
     }
     // attempt to write/read from cr-mbox
@@ -422,64 +465,73 @@ int tools_cmdif_is_cr_mbox_supported(mfile *mf)
     tools_cmdif_flash_lock(mf, 0);
 cleanup_no_sem:
     mpci_change(mf);
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
     return val == MAGIC ? ME_OK : ME_CMDIF_NOT_SUPP;
 }
 
-#define COMPLEMENT_TO_QUAD_ALIGNED(byte_sz) \
-    ((byte_sz) + ((8 - ((byte_sz) & 7) == 8) ? 0 : (8 - ((byte_sz) & 7))))
+#define COMPLEMENT_TO_QUAD_ALIGNED(byte_sz) ((byte_sz) + ((8 - ((byte_sz)&7) == 8) ? 0 : (8 - ((byte_sz)&7))))
 
-int tools_cmdif_send_mbox_command_int(mfile *mf,
+int tools_cmdif_send_mbox_command_int(mfile* mf,
                                       u_int32_t input_modifier,
                                       u_int16_t opcode,
                                       u_int8_t opcode_modifier,
                                       int data_offs_in_mbox,
-                                      void *data,
+                                      void* data,
                                       int write_data_size,
                                       int read_data_size,
                                       int skip_write,
                                       int use_cr_mbox)
 {
-    int read_data_size_quad_aligned =  COMPLEMENT_TO_QUAD_ALIGNED(read_data_size);
-    int write_data_size_quad_aligned =  COMPLEMENT_TO_QUAD_ALIGNED(write_data_size);
-    int rc,
-        i;
-    /*printf("-D- opcode: 0x%x, opcode mod: 0x%x, data_offs_in_mbox: 0x%x, write_data_size: 0x%x(0x%x), read_data_size 0x%x(0x%x), skip_write: %d\n",\
-             opcode, opcode_modifier, data_offs_in_mbox, write_data_size, write_data_size_quad_aligned, read_data_size, read_data_size_quad_aligned, skip_write);*/
+    int read_data_size_quad_aligned = COMPLEMENT_TO_QUAD_ALIGNED(read_data_size);
+    int write_data_size_quad_aligned = COMPLEMENT_TO_QUAD_ALIGNED(write_data_size);
+    int rc, i;
+    /*printf("-D- opcode: 0x%x, opcode mod: 0x%x, data_offs_in_mbox: 0x%x, write_data_size: 0x%x(0x%x), read_data_size
+       0x%x(0x%x), skip_write: %d\n",\ opcode, opcode_modifier, data_offs_in_mbox, write_data_size,
+       write_data_size_quad_aligned, read_data_size, read_data_size_quad_aligned, skip_write);*/
     // check params
-    if (!mf || !data || data_offs_in_mbox < 0 || (data_offs_in_mbox & 7) != 0 || \
-        data_offs_in_mbox + read_data_size_quad_aligned > TOOLS_HCR_MAX_MBOX || \
-        data_offs_in_mbox + write_data_size_quad_aligned > TOOLS_HCR_MAX_MBOX) {
+    if (!mf || !data || data_offs_in_mbox < 0 || (data_offs_in_mbox & 7) != 0 ||
+        data_offs_in_mbox + read_data_size_quad_aligned > TOOLS_HCR_MAX_MBOX ||
+        data_offs_in_mbox + write_data_size_quad_aligned > TOOLS_HCR_MAX_MBOX)
+    {
         return ME_BAD_PARAMS;
     }
     mpci_change(mf);
-    //take semaphore
-    if (tools_cmdif_flash_lock(mf, 1)) {
+    // take semaphore
+    if (tools_cmdif_flash_lock(mf, 1))
+    {
         mpci_change(mf);
         return ME_SEM_LOCKED;
     }
 
     // write to mailbox if needed
     u_int8_t mailbox[TOOLS_HCR_MAX_MBOX] = {0};
-    if (!skip_write) {
+    if (!skip_write)
+    {
         // place the data inside 256 bytes buffer (init with zeroes) and write the entire buffer to mbox
         // it is required in the TOOLS_HCR HLD to write the ENTIRE MBOX
 
         memcpy(&(mailbox[data_offs_in_mbox]), data, write_data_size);
 
-        if (use_cr_mbox == 1) {
-            //write mbox to virtual cr-space
+        if (use_cr_mbox == 1)
+        {
+            // write mbox to virtual cr-space
             rc = tools_cmdif_cr_mbox_write(mf, 0x0, mailbox, TOOLS_HCR_MAX_MBOX);
-            if (rc) {
+            if (rc)
+            {
                 goto cleanup;
             }
-        } else {
+        }
+        else
+        {
             int i;
-            for (i = 0; i < TOOLS_HCR_MAX_MBOX; i += 8) { // it is required to write in quad word chunks
+            for (i = 0; i < TOOLS_HCR_MAX_MBOX; i += 8)
+            { // it is required to write in quad word chunks
                 rc = tools_cmdif_mbox_write(mf, i / 4, (u_int32_t*)&mailbox[i]);
-                if (rc) {
+                if (rc)
+                {
                     goto cleanup;
                 }
             }
@@ -493,24 +545,33 @@ int tools_cmdif_send_mbox_command_int(mfile *mf,
     cmdif.input_modifier = input_modifier;
     rc = tools_cmdif_send_cmd_int(mf, &cmdif);
 
-    if (rc || cmdif.status) {
-        if (rc == ME_CMDIF_BAD_STATUS) {
-            rc = translate_status(cmdif.status); // means that driver is down or we dont support the extended version of tools hcr.
+    if (rc || cmdif.status)
+    {
+        if (rc == ME_CMDIF_BAD_STATUS)
+        {
+            rc = translate_status(cmdif.status); // means that driver is down or we dont support the extended version of
+                                                 // tools hcr.
         }
         goto cleanup;
     }
     // read from mbox
     // read read_data_size bytes from mbox and update our data
-    if (use_cr_mbox == 1) {
+    if (use_cr_mbox == 1)
+    {
         // read mailbox from virtual CR-space
         rc = tools_cmdif_cr_mbox_read(mf, data_offs_in_mbox, &mailbox[data_offs_in_mbox], read_data_size_quad_aligned);
-        if (rc) {
+        if (rc)
+        {
             goto cleanup;
         }
-    } else {
-        for (i = data_offs_in_mbox; i < (data_offs_in_mbox + read_data_size_quad_aligned); i += 8) { // it is required to write in quad word chunks (64bits each time)
+    }
+    else
+    {
+        for (i = data_offs_in_mbox; i < (data_offs_in_mbox + read_data_size_quad_aligned); i += 8)
+        { // it is required to write in quad word chunks (64bits each time)
             rc = tools_cmdif_mbox_read(mf, i / 4, (u_int32_t*)&(mailbox[i]));
-            if (rc) {
+            if (rc)
+            {
                 goto cleanup;
             }
         }
@@ -524,44 +585,46 @@ int tools_cmdif_send_mbox_command_int(mfile *mf,
     return rc;
 }
 
-
-int tools_cmdif_reg_access(mfile *mf, void *data, int write_data_size, int read_data_size)
+int tools_cmdif_reg_access(mfile* mf, void* data, int write_data_size, int read_data_size)
 {
     int rc;
-    if (mf->hcr_params.supp_cr_mbox == 0) {
+    if (mf->hcr_params.supp_cr_mbox == 0)
+    {
         rc = tools_cmdif_is_cr_mbox_supported(mf);
-        if (rc == ME_OK) {
+        if (rc == ME_OK)
+        {
             mf->hcr_params.supp_cr_mbox = 1;
-        } else if (rc == ME_CMDIF_NOT_SUPP) {
+        }
+        else if (rc == ME_CMDIF_NOT_SUPP)
+        {
             mf->hcr_params.supp_cr_mbox = -1;
-        } else {
+        }
+        else
+        {
             // CR error or Semaphore locked
             return rc;
         }
     }
-    if (mf->hcr_params.supp_cr_mbox == 1) {
-        rc = tools_cmdif_send_mbox_command_int(mf, 1, REG_ACCESS_OP, 0, \
-                                               0, data, write_data_size, read_data_size, 0, 1);
-    } else {
-        rc = tools_cmdif_send_mbox_command_int(mf, 0, REG_ACCESS_OP, 0, \
-                                               0, data, write_data_size, read_data_size, 0, 0);
+    if (mf->hcr_params.supp_cr_mbox == 1)
+    {
+        rc = tools_cmdif_send_mbox_command_int(mf, 1, REG_ACCESS_OP, 0, 0, data, write_data_size, read_data_size, 0, 1);
+    }
+    else
+    {
+        rc = tools_cmdif_send_mbox_command_int(mf, 0, REG_ACCESS_OP, 0, 0, data, write_data_size, read_data_size, 0, 0);
     }
     return rc;
 }
 
-
-int tools_cmdif_send_mbox_command(mfile *mf,
+int tools_cmdif_send_mbox_command(mfile* mf,
                                   u_int32_t input_modifier,
                                   u_int16_t opcode,
                                   u_int8_t opcode_modifier,
                                   int data_offs_in_mbox,
-                                  void *data,
+                                  void* data,
                                   int data_size,
                                   int skip_write)
 {
-
-    return tools_cmdif_send_mbox_command_int(mf, input_modifier, opcode, opcode_modifier, \
-                                             data_offs_in_mbox, data, data_size, \
-                                             data_size, skip_write, 0);
+    return tools_cmdif_send_mbox_command_int(
+      mf, input_modifier, opcode, opcode_modifier, data_offs_in_mbox, data, data_size, data_size, skip_write, 0);
 }
-
diff --git a/mtcr_ul/mtcr_tools_cif.h b/mtcr_ul/mtcr_tools_cif.h
index b0674a81..b897fc0c 100644
--- a/mtcr_ul/mtcr_tools_cif.h
+++ b/mtcr_ul/mtcr_tools_cif.h
@@ -31,48 +31,47 @@
  *
  */
 
-#ifndef _MTCR_TOOLS_CIF     /* guard */
+#ifndef _MTCR_TOOLS_CIF /* guard */
 #define _MTCR_TOOLS_CIF
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-
 #include <compatibility.h>
 #include <mtcr.h>
 
-#define FLASH_REG_ACCESS    0x9001
+#define FLASH_REG_ACCESS 0x9001
 
 #define TOOLS_HCR_MAX_MBOX 288
 
-// tools flash semaphore (62) will be taken at the begining of each command specified here
-// and released at the end of the command.
-
+    // tools flash semaphore (62) will be taken at the begining of each command specified here
+    // and released at the end of the command.
 
-/*
- * register access tools HCR
- *
- * data:            the raw register data
- * write_data_size:	amount of data to write to the mailbox (rest assumed to be zero)
- * read_data_size:	amount of data to be read from the mailbox
- *
- * data will contain the updated register.
- */
+    /*
+     * register access tools HCR
+     *
+     * data:            the raw register data
+     * write_data_size:	amount of data to write to the mailbox (rest assumed to be zero)
+     * read_data_size:	amount of data to be read from the mailbox
+     *
+     * data will contain the updated register.
+     */
 
-int tools_cmdif_reg_access(mfile *mf, void *data, int write_data_size, int read_data_size);
+    int tools_cmdif_reg_access(mfile* mf, void* data, int write_data_size, int read_data_size);
 
-/*
- * tools_cmdif_is_supported tools HCR
- *
- * check if sending registers via tools HCR is supported
- *
- */
-MTCR_API int tools_cmdif_is_supported(mfile *mf);
-MTCR_API int tools_cmdif_is_cr_mbox_supported(mfile *mf);
+    /*
+     * tools_cmdif_is_supported tools HCR
+     *
+     * check if sending registers via tools HCR is supported
+     *
+     */
+    MTCR_API int tools_cmdif_is_supported(mfile* mf);
+    MTCR_API int tools_cmdif_is_cr_mbox_supported(mfile* mf);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif  /* _MTCR_TOOLS_CIF guard */
+#endif /* _MTCR_TOOLS_CIF guard */
diff --git a/mtcr_ul/mtcr_ul.c b/mtcr_ul/mtcr_ul.c
index 57fbe07e..458d619c 100644
--- a/mtcr_ul/mtcr_ul.c
+++ b/mtcr_ul/mtcr_ul.c
@@ -40,36 +40,37 @@
 #include <common/tools_utils.h>
 #include <stdlib.h>
 
-int mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
     return mread4_ul(mf, offset, value);
 }
 
-int mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
     return mwrite4_ul(mf, offset, value);
 }
 
-int mread4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mread4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
     return mread4_block_ul(mf, offset, data, byte_len);
 }
 
-int mwrite4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mwrite4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
     return mwrite4_block_ul(mf, offset, data, byte_len);
 }
 
-int msw_reset(mfile *mf)
+int msw_reset(mfile* mf)
 {
 #ifndef NO_INBAND
-    switch (mf->tp) {
-    case MST_IB:
-        return mib_swreset(mf);
+    switch (mf->tp)
+    {
+        case MST_IB:
+            return mib_swreset(mf);
 
-    default:
-        errno = EPERM;
-        return -1;
+        default:
+            errno = EPERM;
+            return -1;
     }
 #else
     (void)mf;
@@ -77,83 +78,92 @@ int msw_reset(mfile *mf)
 #endif
 }
 
-int mhca_reset(mfile *mf)
+int mhca_reset(mfile* mf)
 {
-    (void) mf;
+    (void)mf;
     errno = ENOTSUP;
     return -1;
 }
 
-int mdevices(char *buf, int len, int mask)
+int mdevices(char* buf, int len, int mask)
 {
     return mdevices_ul(buf, len, mask);
 }
 
-
-dev_info* mdevices_info(int mask, int *len)
+dev_info* mdevices_info(int mask, int* len)
 {
     return mdevices_info_ul(mask, len);
 }
 
-dev_info* mdevices_info_v(int mask, int *len, int verbosity)
+dev_info* mdevices_info_v(int mask, int* len, int verbosity)
 {
     return mdevices_info_v_ul(mask, len, verbosity);
 }
 
-void mdevices_info_destroy(dev_info *dev_info, int len)
+void mdevices_info_destroy(dev_info* dev_info, int len)
 {
     int i, j;
-    if (dev_info) {
-        for (i = 0; i < len; i++) {
-            if (dev_info[i].type == MDEVS_TAVOR_CR &&
-                dev_info[i].pci.ib_devs) {
-                for (j = 0; dev_info[i].pci.ib_devs[j]; j++) {
-                    if (dev_info[i].pci.ib_devs[j]) {
+    if (dev_info)
+    {
+        for (i = 0; i < len; i++)
+        {
+            if (dev_info[i].type == MDEVS_TAVOR_CR && dev_info[i].pci.ib_devs)
+            {
+                for (j = 0; dev_info[i].pci.ib_devs[j]; j++)
+                {
+                    if (dev_info[i].pci.ib_devs[j])
+                    {
                         free(dev_info[i].pci.ib_devs[j]);
                     }
                 }
                 free(dev_info[i].pci.ib_devs);
             }
-            if (dev_info[i].type == MDEVS_TAVOR_CR &&
-                dev_info[i].pci.net_devs) {
-                for (j = 0; dev_info[i].pci.net_devs[j]; j++) {
-                    if (dev_info[i].pci.net_devs[j]) {
+            if (dev_info[i].type == MDEVS_TAVOR_CR && dev_info[i].pci.net_devs)
+            {
+                for (j = 0; dev_info[i].pci.net_devs[j]; j++)
+                {
+                    if (dev_info[i].pci.net_devs[j])
+                    {
                         free(dev_info[i].pci.net_devs[j]);
                     }
                 }
                 free(dev_info[i].pci.net_devs);
             }
-
         }
         free(dev_info);
     }
 }
 
-mfile* mopen(const char *name)
+mfile* mopen(const char* name)
 {
     return mopen_ul(name);
 }
 
-mfile* mopend(const char *name, DType dtype)
+mfile* mopend(const char* name, DType dtype)
 {
-    if (dtype != MST_TAVOR) {
+    if (dtype != MST_TAVOR)
+    {
         return NULL;
     }
     return mopen(name);
 }
 
-int mclose(mfile *mf)
+int mclose(mfile* mf)
 {
     return mclose_ul(mf);
 }
 
-mfile* mopen_adv(const char *name, MType mtype)
+mfile* mopen_adv(const char* name, MType mtype)
 {
-    mfile *mf = mopend(name, MST_TAVOR);
-    if (mf) {
-        if (mf->tp & mtype) {
+    mfile* mf = mopend(name, MST_TAVOR);
+    if (mf)
+    {
+        if (mf->tp & mtype)
+        {
             return mf;
-        } else {
+        }
+        else
+        {
             errno = EPERM;
             mclose(mf);
             return NULL;
@@ -162,7 +172,7 @@ mfile* mopen_adv(const char *name, MType mtype)
     return mf;
 }
 
-mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *extra_data)
+mfile* mopen_fw_ctx(void* fw_cmd_context, void* fw_cmd_func, void* extra_data)
 {
     // not implemented
     TOOLS_UNUSED(fw_cmd_context);
@@ -171,92 +181,99 @@ mfile* mopen_fw_ctx(void *fw_cmd_context, void *fw_cmd_func, void *extra_data)
     return NULL;
 }
 
-unsigned char mset_i2c_slave(mfile *mf, unsigned char new_i2c_slave)
+unsigned char mset_i2c_slave(mfile* mf, unsigned char new_i2c_slave)
 {
-    (void) mf;
-    (void) new_i2c_slave; /* compiler warning */
+    (void)mf;
+    (void)new_i2c_slave; /* compiler warning */
     fprintf(stderr, "Warning: libmtcr: mset_i2c_slave() is not implemented and has no effect.\n");
     return 0;
 }
 
-
-
-int maccess_reg_mad(mfile *mf, u_int8_t *data)
+int maccess_reg_mad(mfile* mf, u_int8_t* data)
 {
     return maccess_reg_mad_ul(mf, data);
 }
 
-int mos_reg_access(mfile *mf, int reg_access, void *reg_data, u_int32_t cmd_type)
+int mos_reg_access(mfile* mf, int reg_access, void* reg_data, u_int32_t cmd_type)
 {
-    (void) mf;
-    (void) reg_data; /* compiler warning */
-    (void) cmd_type; /* compiler warning */
-    (void) reg_access; /* compiler warning */
+    (void)mf;
+    (void)reg_data;   /* compiler warning */
+    (void)cmd_type;   /* compiler warning */
+    (void)reg_access; /* compiler warning */
     fprintf(stderr, "Warning: libmtcr: mos_reg_access() is not implemented and has no effect.\n");
     return ME_NOT_IMPLEMENTED;
 }
 
-int maccess_reg_cmdif(mfile *mf, reg_access_t reg_access, void *reg_data, u_int32_t cmd_type)
+int maccess_reg_cmdif(mfile* mf, reg_access_t reg_access, void* reg_data, u_int32_t cmd_type)
 {
-    (void) mf;
-    (void) reg_data; /* compiler warning */
-    (void) cmd_type; /* compiler warning */
-    (void) reg_access; /* compiler warning */
+    (void)mf;
+    (void)reg_data;   /* compiler warning */
+    (void)cmd_type;   /* compiler warning */
+    (void)reg_access; /* compiler warning */
     fprintf(stderr, "Warning: libmtcr: maccess_reg_cmdif() is not implemented and has no effect.\n");
     return ME_NOT_IMPLEMENTED;
 }
 
-int mread_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mread_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
     return mread_buffer_ul(mf, offset, data, byte_len);
 }
 
-int mwrite_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mwrite_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
     return mwrite_buffer_ul(mf, offset, data, byte_len);
 }
 
-int maccess_reg(mfile *mf, u_int16_t reg_id, maccess_reg_method_t reg_method, void *reg_data, u_int32_t reg_size,
-                u_int32_t r_size_reg, u_int32_t w_size_reg, int *reg_status)
+int maccess_reg(mfile* mf,
+                u_int16_t reg_id,
+                maccess_reg_method_t reg_method,
+                void* reg_data,
+                u_int32_t reg_size,
+                u_int32_t r_size_reg,
+                u_int32_t w_size_reg,
+                int* reg_status)
 {
     return maccess_reg_ul(mf, reg_id, reg_method, reg_data, reg_size, r_size_reg, w_size_reg, reg_status);
 }
 
-int mget_max_reg_size(mfile *mf, maccess_reg_method_t reg_method)
+int mget_max_reg_size(mfile* mf, maccess_reg_method_t reg_method)
 {
     return mget_max_reg_size_ul(mf, reg_method);
 }
 
-int supports_reg_access_gmp(mfile *mf, maccess_reg_method_t reg_method)
+int supports_reg_access_gmp(mfile* mf, maccess_reg_method_t reg_method)
 {
     return supports_reg_access_gmp_ul(mf, reg_method);
 }
 
-int mget_vsec_supp(mfile *mf)
+int mget_vsec_supp(mfile* mf)
 {
     return mf->vsec_supp;
 }
 
-MTCR_API int mget_addr_space(mfile *mf)
+MTCR_API int mget_addr_space(mfile* mf)
 {
     return mf->address_space;
 }
 
-MTCR_API int mset_addr_space(mfile *mf, int space)
+MTCR_API int mset_addr_space(mfile* mf, int space)
 {
-    if (space < 0 || space >= AS_END) {
-         return -1;
-     }
-    if (VSEC_SUPPORTED_UL(mf) && (mf->vsec_cap_mask & (1 << space_to_cap_offset(space)))) {
-         mf->address_space = space;
-         return 0;
-     }
-     return -1;
+    if (space < 0 || space >= AS_END)
+    {
+        return -1;
+    }
+    if (VSEC_SUPPORTED_UL(mf) && (mf->vsec_cap_mask & (1 << space_to_cap_offset(space))))
+    {
+        mf->address_space = space;
+        return 0;
+    }
+    return -1;
 }
 
-int mget_mdevs_flags(mfile *mf, u_int32_t *devs_flags)
+int mget_mdevs_flags(mfile* mf, u_int32_t* devs_flags)
 {
-    if (mf == NULL || devs_flags == NULL) {
+    if (mf == NULL || devs_flags == NULL)
+    {
         errno = EINVAL;
         return 1;
     }
@@ -265,9 +282,10 @@ int mget_mdevs_flags(mfile *mf, u_int32_t *devs_flags)
     return 0;
 }
 
-int mget_mdevs_type(mfile *mf, u_int32_t *mtype)
+int mget_mdevs_type(mfile* mf, u_int32_t* mtype)
 {
-    if (mf == NULL || mtype == NULL) {
+    if (mf == NULL || mtype == NULL)
+    {
         errno = EINVAL;
         return 1;
     }
@@ -276,17 +294,17 @@ int mget_mdevs_type(mfile *mf, u_int32_t *mtype)
     return 0;
 }
 
-int mclear_pci_semaphore(const char *name)
+int mclear_pci_semaphore(const char* name)
 {
     return mclear_pci_semaphore_ul(name);
 }
 
-int mvpd_read4(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_read4(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
     return mvpd_read4_ul(mf, offset, value);
 }
 
-int mvpd_write4(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_write4(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
     (void)mf;
     (void)offset;
diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c
index 314c59c1..4a2d2827 100644
--- a/mtcr_ul/mtcr_ul_com.c
+++ b/mtcr_ul/mtcr_ul_com.c
@@ -34,11 +34,11 @@
  *
  */
 
-//use memory mapped /dev/mem for access
+// use memory mapped /dev/mem for access
 #define CONFIG_ENABLE_MMAP 1
-//mmap /dev/mem for memory access (does not work on sparc)
+// mmap /dev/mem for memory access (does not work on sparc)
 #define CONFIG_USE_DEV_MEM 1
-//use pci configuration cycles for access
+// use pci configuration cycles for access
 #define CONFIG_ENABLE_PCICONF 1
 
 #ifndef _XOPEN_SOURCE
@@ -55,7 +55,14 @@
 #endif
 
 #define MTCR_MAP_SIZE 0x100000
-#define DBG_PRINTF(...) do { if (getenv("MFT_DEBUG") != NULL) { fprintf(stderr, __VA_ARGS__); } } while (0)
+#define DBG_PRINTF(...)                   \
+    do                                    \
+    {                                     \
+        if (getenv("MFT_DEBUG") != NULL)  \
+        {                                 \
+            fprintf(stderr, __VA_ARGS__); \
+        }                                 \
+    } while (0)
 
 #include <stdio.h>
 #include <dirent.h>
@@ -92,23 +99,23 @@
 
 #include "kernel/mst.h"
 
-#define CX3_SW_ID    4099
+#define CX3_SW_ID 4099
 #define CX3PRO_SW_ID 4103
 
-typedef enum {
+typedef enum
+{
     Clear_Vsec_Semaphore = 0x1,
 } adv_opt_t;
 
-
-#define DBDF             "%4.4x:%2.2x:%2.2x.%1.1x"
-#define DRIVER_CR_NAME   "/dev/"DBDF "_mstcr"
-#define DRIVER_CONF_NAME "/dev/"DBDF "_mstconf"
+#define DBDF "%4.4x:%2.2x:%2.2x.%1.1x"
+#define DRIVER_CR_NAME "/dev/" DBDF "_mstcr"
+#define DRIVER_CONF_NAME "/dev/" DBDF "_mstconf"
 
 /* Forward decl*/
-static int get_inband_dev_from_pci(char *inband_dev, char *pci_dev);
+static int get_inband_dev_from_pci(char* inband_dev, char* pci_dev);
 int check_force_config(unsigned my_domain, unsigned my_bus, unsigned my_dev, unsigned my_func);
-mfile* mopen_ul_int(const char *name, u_int32_t adv_opt);
-int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned bus, unsigned dev, unsigned func);
+mfile* mopen_ul_int(const char* name, u_int32_t adv_opt);
+int init_dev_info_ul(mfile* mf, const char* dev_name, unsigned domain, unsigned bus, unsigned dev, unsigned func);
 /*
  * Lock file section:
  *
@@ -126,8 +133,9 @@ int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned
 //                    /tmp/mstflint_lockfiles/0000:0b:00.0_mem
 // general format : /tmp/mstflint_lockfiles/<domain:bus:device.function>_<config|mem>
 #define CHECK_LOCK(rc) \
-    if (rc) { \
-        return rc; \
+    if (rc)            \
+    {                  \
+        return rc;     \
     }
 
 #define MAX_RETRY_CNT 4096
@@ -135,45 +143,55 @@ int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned
 static int _flock_int(int fdlock, int operation)
 {
     int cnt = 0;
-    if (fdlock == 0) { // in case we failed to create the lock file we ignore the locking mechanism
+    if (fdlock == 0)
+    { // in case we failed to create the lock file we ignore the locking mechanism
         return 0;
     }
-    do {
-        if (flock(fdlock, operation | LOCK_NB) == 0) {
+    do
+    {
+        if (flock(fdlock, operation | LOCK_NB) == 0)
+        {
             return 0;
-        } else if (errno != EWOULDBLOCK) {
+        }
+        else if (errno != EWOULDBLOCK)
+        {
             break; // BAD! lock/free failed
         }
-        if ((cnt & 0xf) == 0) { // sleep every 16 retries
+        if ((cnt & 0xf) == 0)
+        { // sleep every 16 retries
             usleep(1);
         }
         cnt++;
     } while (cnt < MAX_RETRY_CNT);
     perror("failed to perform lock operation.");
     return -1;
-
 }
 
-static int _create_lock(mfile *mf, unsigned domain, unsigned bus, unsigned dev, unsigned func)
+static int _create_lock(mfile* mf, unsigned domain, unsigned bus, unsigned dev, unsigned func)
 {
-    char fname[64] = { 0 };
+    char fname[64] = {0};
     int rc;
     int fd = 0;
-    if (!(mf->ul_ctx)) {
+    if (!(mf->ul_ctx))
+    {
         goto cl_clean_up;
     }
-    snprintf(fname, sizeof(fname) - 1, LOCK_FILE_FORMAT, domain, bus, dev, func, mf->tp == MST_PCICONF ? "config" : "mem");
+    snprintf(fname, sizeof(fname) - 1, LOCK_FILE_FORMAT, domain, bus, dev, func,
+             mf->tp == MST_PCICONF ? "config" : "mem");
     rc = mkdir("/tmp", 0777);
-    if (rc && errno != EEXIST) {
+    if (rc && errno != EEXIST)
+    {
         goto cl_clean_up;
     }
     rc = mkdir(LOCK_FILE_DIR, 0777);
-    if (rc && errno != EEXIST) {
+    if (rc && errno != EEXIST)
+    {
         goto cl_clean_up;
     }
 
     fd = open(fname, O_RDONLY | O_CREAT, 0777);
-    if (fd < 0) {
+    if (fd < 0)
+    {
         goto cl_clean_up;
     }
 
@@ -186,16 +204,22 @@ static int _create_lock(mfile *mf, unsigned domain, unsigned bus, unsigned dev,
 }
 /*End of Lock file section */
 
-static int _extract_dbdf_from_full_name(const char *name, unsigned *domain, unsigned *bus, unsigned *dev,
-                                        unsigned *func)
+static int _extract_dbdf_from_full_name(const char* name, unsigned* domain, unsigned* bus, unsigned* dev, unsigned* func)
 {
-    if (sscanf(name, "/sys/bus/pci/devices/%4x:%2x:%2x.%d/resource0", domain, bus, dev, func) == 4) {
+    if (sscanf(name, "/sys/bus/pci/devices/%4x:%2x:%2x.%d/resource0", domain, bus, dev, func) == 4)
+    {
         return 0;
-    } else if (sscanf(name, "/sys/bus/pci/devices/%4x:%2x:%2x.%d/config", domain, bus, dev, func) == 4) {
+    }
+    else if (sscanf(name, "/sys/bus/pci/devices/%4x:%2x:%2x.%d/config", domain, bus, dev, func) == 4)
+    {
         return 0;
-    } else if (sscanf(name, "/proc/bus/pci/%4x:%2x/%2x.%d", domain, bus, dev, func) == 4) {
+    }
+    else if (sscanf(name, "/proc/bus/pci/%4x:%2x/%2x.%d", domain, bus, dev, func) == 4)
+    {
         return 0;
-    } else if (sscanf(name, "/proc/bus/pci/%2x/%2x.%d", bus, dev, func) == 3) {
+    }
+    else if (sscanf(name, "/proc/bus/pci/%2x/%2x.%d", bus, dev, func) == 3)
+    {
         *domain = 0;
         return 0;
     }
@@ -204,16 +228,17 @@ static int _extract_dbdf_from_full_name(const char *name, unsigned *domain, unsi
     return -1;
 }
 
-static int mtcr_connectx_flush(void *ptr, int fdlock)
+static int mtcr_connectx_flush(void* ptr, int fdlock)
 {
     u_int32_t value;
     int rc;
     rc = _flock_int(fdlock, LOCK_EX);
     CHECK_LOCK(rc);
-    *((u_int32_t*) ((char*) ptr + 0xf0380)) = 0x0;
-    do {
-        asm volatile ("" ::: "memory");
-        u_int32_t tmp = *((u_int32_t* )((char* )ptr + 0xf0380));
+    *((u_int32_t*)((char*)ptr + 0xf0380)) = 0x0;
+    do
+    {
+        asm volatile("" ::: "memory");
+        u_int32_t tmp = *((u_int32_t*)((char*)ptr + 0xf0380));
         value = __be32_to_cpu(tmp);
     } while (value);
     rc = _flock_int(fdlock, LOCK_UN);
@@ -221,55 +246,60 @@ static int mtcr_connectx_flush(void *ptr, int fdlock)
     return 0;
 }
 
-int mread4_ul(mfile *mf, unsigned int offset, u_int32_t *value)
+int mread4_ul(mfile* mf, unsigned int offset, u_int32_t* value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     return ctx->mread4(mf, offset, value);
 }
 
-int mwrite4_ul(mfile *mf, unsigned int offset, u_int32_t value)
+int mwrite4_ul(mfile* mf, unsigned int offset, u_int32_t value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     return ctx->mwrite4(mf, offset, value);
 }
 
 // TODO: Verify change 'data' type from void* to u_in32_t* does not mess up things
-static int mread_chunk_as_multi_mread4(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int mread_chunk_as_multi_mread4(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     int i = 0;
-    if (length % 4) {
+    if (length % 4)
+    {
         return EINVAL;
     }
-    for (i = 0; i < length; i += 4) {
+    for (i = 0; i < length; i += 4)
+    {
         u_int32_t value = 0;
-        if (mread4_ul(mf, offset + i, &value) != 4) {
+        if (mread4_ul(mf, offset + i, &value) != 4)
+        {
             return -1;
         }
-        memcpy((char*) data + i, &value, 4);
+        memcpy((char*)data + i, &value, 4);
     }
     return length;
 }
 
-static int mwrite_chunk_as_multi_mwrite4(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int mwrite_chunk_as_multi_mwrite4(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     int i = 0;
-    if (length % 4) {
+    if (length % 4)
+    {
         return EINVAL;
     }
-    for (i = 0; i < length; i += 4) {
+    for (i = 0; i < length; i += 4)
+    {
         u_int32_t value = 0;
-        memcpy(&value, (char*) data + i, 4);
-        if (mwrite4_ul(mf, offset + i, value) != 4) {
+        memcpy(&value, (char*)data + i, 4);
+        if (mwrite4_ul(mf, offset + i, value) != 4)
+        {
             return -1;
         }
     }
     return length;
 }
 
-
-static int mst_driver_connectx_flush(mfile *mf);
-int mtcr_driver_cr_mread4(mfile *mf, unsigned int offset, u_int32_t *value);
-void mpci_change_ul(mfile *mf);
+static int mst_driver_connectx_flush(mfile* mf);
+int mtcr_driver_cr_mread4(mfile* mf, unsigned int offset, u_int32_t* value);
+void mpci_change_ul(mfile* mf);
 
 /*
  * Return values:
@@ -278,39 +308,47 @@ void mpci_change_ul(mfile *mf);
  * 1 : Device does not support memory access
  *
  */
-static
-int mtcr_check_signature(mfile *mf)
+static int mtcr_check_signature(mfile* mf)
 {
     unsigned signature = 0;
     int rc;
-    char *connectx_flush = getenv("CONNECTX_FLUSH");
+    char* connectx_flush = getenv("CONNECTX_FLUSH");
     rc = mread4_ul(mf, 0xF0014, &signature);
-    if (rc != 4) {
-        if (!errno) {
+    if (rc != 4)
+    {
+        if (!errno)
+        {
             errno = EIO;
         }
         return -1;
     }
 
-    switch (signature) {
-    case 0xbad0cafe:     /* secure host mode device id */
-        return 0;
+    switch (signature)
+    {
+        case 0xbad0cafe: /* secure host mode device id */
+            return 0;
 
-    case 0xbadacce5:     /* returned upon mapping the UAR bar */
-    case 0xffffffff:     /* returned when pci mem access is disabled (driver down) */
-        return 1;
+        case 0xbadacce5: /* returned upon mapping the UAR bar */
+        case 0xffffffff: /* returned when pci mem access is disabled (driver down) */
+            return 1;
     }
 
-    if (connectx_flush == NULL || strcmp(connectx_flush, "0")) {
-        if ((signature == 0xa00190 || (signature & 0xffff) == 0x1f5 || (signature & 0xffff) == 0x1f7)
-            && mf->tp == MST_PCI) {
-            ul_ctx_t *ctx = mf->ul_ctx;
+    if (connectx_flush == NULL || strcmp(connectx_flush, "0"))
+    {
+        if ((signature == 0xa00190 || (signature & 0xffff) == 0x1f5 || (signature & 0xffff) == 0x1f7) &&
+            mf->tp == MST_PCI)
+        {
+            ul_ctx_t* ctx = mf->ul_ctx;
             ctx->connectx_flush = 1;
-            if (ctx->via_driver) {
-                if (mst_driver_connectx_flush(mf)) {
+            if (ctx->via_driver)
+            {
+                if (mst_driver_connectx_flush(mf))
+                {
                     return -1;
                 }
-            } else if (mtcr_connectx_flush(mf->bar_virtual_addr, ctx->fdlock)) {
+            }
+            else if (mtcr_connectx_flush(mf->bar_virtual_addr, ctx->fdlock))
+            {
                 return -1;
             }
         }
@@ -319,22 +357,25 @@ int mtcr_check_signature(mfile *mf)
     return 0;
 }
 
-int mst_driver_vpd_read4(mfile *mf, unsigned int offset, u_int8_t value[])
+int mst_driver_vpd_read4(mfile* mf, unsigned int offset, u_int8_t value[])
 {
     int flag = 0;
     struct mst_vpd_read4_st read_vpd4;
-    if (mf->tp != MST_PCICONF) {
+    if (mf->tp != MST_PCICONF)
+    {
         mpci_change_ul(mf);
         flag = 1;
     }
     memset(&read_vpd4, 0, sizeof(read_vpd4));
     read_vpd4.offset = offset;
     int ret = ioctl(mf->fd, PCICONF_VPD_READ4, &read_vpd4);
-    if (ret < 0) {
+    if (ret < 0)
+    {
         return ret;
     }
     memcpy(value, &read_vpd4.data, 4);
-    if (flag) {
+    if (flag)
+    {
         mpci_change_ul(mf);
     }
     return 0;
@@ -349,72 +390,91 @@ int mst_driver_vpd_read4(mfile *mf, unsigned int offset, u_int8_t value[])
  *  7:3 = slot
  *  2:0 = function
  */
-#define PCI_DEVFN(slot, func)    ((((slot) & 0x1f) << 3) | ((func) & 0x07))
-#define PCI_SLOT(devfn)     (((devfn) >> 3) & 0x1f)
-#define PCI_FUNC(devfn)     ((devfn) & 0x07)
+#define PCI_DEVFN(slot, func) ((((slot)&0x1f) << 3) | ((func)&0x07))
+#define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
+#define PCI_FUNC(devfn) ((devfn)&0x07)
 
-static
-unsigned long long mtcr_procfs_get_offset(unsigned my_bus, unsigned my_dev, unsigned my_func)
+static unsigned long long mtcr_procfs_get_offset(unsigned my_bus, unsigned my_dev, unsigned my_func)
 {
-    FILE *f;
+    FILE* f;
     unsigned irq;
     unsigned long long base_addr[6], rom_base_addr, size[6], rom_size;
 
     unsigned bus, dev, func;
-    //unsigned vendor_id;
-    //unsigned device_id;
+    // unsigned vendor_id;
+    // unsigned device_id;
     unsigned int cnt;
 
-    unsigned long long offset = (unsigned long long) -1;
+    unsigned long long offset = (unsigned long long)-1;
 
     char buf[4048];
 
     f = fopen("/proc/bus/pci/devices", "r");
-    if (!f) {
+    if (!f)
+    {
         return offset;
     }
 
     for (;;)
-        if (fgets(buf, sizeof(buf) - 1, f)) {
+        if (fgets(buf, sizeof(buf) - 1, f))
+        {
             unsigned dfn, vend;
 
-            cnt = sscanf(buf, "%x %x %x %llx %llx %llx %llx %llx %llx "
-                         "%llx %llx %llx %llx %llx %llx %llx %llx", &dfn, &vend, &irq, &base_addr[0], &base_addr[1],
-                         &base_addr[2], &base_addr[3], &base_addr[4], &base_addr[5], &rom_base_addr, &size[0], &size[1],
-                         &size[2], &size[3], &size[4], &size[5], &rom_size);
-            if (cnt != 9 && cnt != 10 && cnt != 17) {
+            cnt = sscanf(buf,
+                         "%x %x %x %llx %llx %llx %llx %llx %llx "
+                         "%llx %llx %llx %llx %llx %llx %llx %llx",
+                         &dfn, &vend, &irq, &base_addr[0], &base_addr[1], &base_addr[2], &base_addr[3], &base_addr[4],
+                         &base_addr[5], &rom_base_addr, &size[0], &size[1], &size[2], &size[3], &size[4], &size[5],
+                         &rom_size);
+            if (cnt != 9 && cnt != 10 && cnt != 17)
+            {
                 fprintf(stderr, "proc: parse error (read only %d items)\n", cnt);
-                fprintf(stderr, "the offending line in " "/proc/bus/pci/devices" " is "
-                        "\"%.*s\"\n", (int) sizeof(buf), buf);
+                fprintf(stderr,
+                        "the offending line in "
+                        "/proc/bus/pci/devices"
+                        " is "
+                        "\"%.*s\"\n",
+                        (int)sizeof(buf), buf);
                 goto error;
             }
             bus = dfn >> 8U;
             dev = PCI_SLOT(dfn & 0xff);
             func = PCI_FUNC(dfn & 0xff);
-            //vendor_id = vend >> 16U;
-            //device_id = vend & 0xffff;
+            // vendor_id = vend >> 16U;
+            // device_id = vend & 0xffff;
 
-            if (bus == my_bus && dev == my_dev && func == my_func) {
+            if (bus == my_bus && dev == my_dev && func == my_func)
+            {
                 break;
             }
-        } else {
+        }
+        else
+        {
             goto error;
         }
 
-    if (cnt != 17 || size[1] != 0 || size[0] != MTCR_MAP_SIZE) {
-        if (0) {
-            fprintf(stderr, "proc: unexpected region size values: "
-                    "cnt=%d, size[0]=%#llx, size[1]=%#llx\n", cnt, size[0], size[1]);
-        }
-        if (0) {
-            fprintf(stderr, "the offending line in " "/proc/bus/pci/devices"
-                    " is \"%.*s\"\n", (int) sizeof(buf), buf);
+    if (cnt != 17 || size[1] != 0 || size[0] != MTCR_MAP_SIZE)
+    {
+        if (0)
+        {
+            fprintf(stderr,
+                    "proc: unexpected region size values: "
+                    "cnt=%d, size[0]=%#llx, size[1]=%#llx\n",
+                    cnt, size[0], size[1]);
+        }
+        if (0)
+        {
+            fprintf(stderr,
+                    "the offending line in "
+                    "/proc/bus/pci/devices"
+                    " is \"%.*s\"\n",
+                    (int)sizeof(buf), buf);
         }
         goto error;
     }
 
-    offset = ((unsigned long long) (base_addr[1]) << 32)
-             + ((unsigned long long) (base_addr[0]) & ~(unsigned long long) (0xfffff));
+    offset = ((unsigned long long)(base_addr[1]) << 32) +
+             ((unsigned long long)(base_addr[0]) & ~(unsigned long long)(0xfffff));
 
     fclose(f);
     return offset;
@@ -425,26 +485,30 @@ unsigned long long mtcr_procfs_get_offset(unsigned my_bus, unsigned my_dev, unsi
     return offset;
 }
 
-static
-unsigned long long mtcr_sysfs_get_offset(unsigned domain, unsigned bus, unsigned dev, unsigned func)
+static unsigned long long mtcr_sysfs_get_offset(unsigned domain, unsigned bus, unsigned dev, unsigned func)
 {
     unsigned long long start, end, type;
-    unsigned long long offset = (unsigned long long) -1;
-    FILE *f;
+    unsigned long long offset = (unsigned long long)-1;
+    FILE* f;
     int cnt;
     char mbuf[99] = "/sys/bus/pci/devices/XXXX:XX:XX.X/resource";
     sprintf(mbuf, "/sys/bus/pci/devices/%4.4x:%2.2x:%2.2x.%1.1x/resource", domain, bus, dev, func);
 
     f = fopen(mbuf, "r");
-    if (!f) {
+    if (!f)
+    {
         return offset;
     }
 
     cnt = fscanf(f, "0x%llx 0x%llx 0x%llx", &start, &end, &type);
-    if (cnt != 3 || end != start + MTCR_MAP_SIZE - 1) {
-        if (0) {
-            fprintf(stderr, "proc: unexpected region size values: "
-                    "cnt=%d, start=%#llx, end=%#llx\n", cnt, start, end);
+    if (cnt != 3 || end != start + MTCR_MAP_SIZE - 1)
+    {
+        if (0)
+        {
+            fprintf(stderr,
+                    "proc: unexpected region size values: "
+                    "cnt=%d, start=%#llx, end=%#llx\n",
+                    cnt, start, end);
         }
         goto error;
     }
@@ -462,33 +526,37 @@ unsigned long long mtcr_sysfs_get_offset(unsigned domain, unsigned bus, unsigned
 // PCI MEMORY ACCESS FUNCTIONS
 //
 
-static
-int mtcr_pcicr_mclose(mfile *mf)
+static int mtcr_pcicr_mclose(mfile* mf)
 {
-    if (mf) {
-        if (mf->bar_virtual_addr) {
+    if (mf)
+    {
+        if (mf->bar_virtual_addr)
+        {
             munmap(mf->bar_virtual_addr, MTCR_MAP_SIZE);
         }
-        if (mf->fd > 0) {
+        if (mf->fd > 0)
+        {
             close(mf->fd);
         }
-        if (mf->res_fd > 0) {
+        if (mf->res_fd > 0)
+        {
             close(mf->res_fd);
         }
     }
     return 0;
 }
 
-static
-int mtcr_mmap(mfile *mf, const char *name, off_t off, int ioctl_needed)
+static int mtcr_mmap(mfile* mf, const char* name, off_t off, int ioctl_needed)
 {
     int err;
     mf->fd = open(name, O_RDWR | O_SYNC);
-    if (mf->fd < 0) {
+    if (mf->fd < 0)
+    {
         return -1;
     }
 
-    if (ioctl_needed && ioctl(mf->fd, PCIIOC_MMAP_IS_MEM) < 0) {
+    if (ioctl_needed && ioctl(mf->fd, PCIIOC_MMAP_IS_MEM) < 0)
+    {
         err = errno;
         close(mf->fd);
         errno = err;
@@ -497,7 +565,8 @@ int mtcr_mmap(mfile *mf, const char *name, off_t off, int ioctl_needed)
 
     mf->bar_virtual_addr = mmap(NULL, MTCR_MAP_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, mf->fd, off);
 
-    if (!mf->bar_virtual_addr || mf->bar_virtual_addr == MAP_FAILED) {
+    if (!mf->bar_virtual_addr || mf->bar_virtual_addr == MAP_FAILED)
+    {
         err = errno;
         close(mf->fd);
         errno = err;
@@ -506,16 +575,19 @@ int mtcr_mmap(mfile *mf, const char *name, off_t off, int ioctl_needed)
     return 0;
 }
 
-int mtcr_pcicr_mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mtcr_pcicr_mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
 
-    if (offset >= MTCR_MAP_SIZE) {
+    if (offset >= MTCR_MAP_SIZE)
+    {
         errno = EINVAL;
         return 0;
     }
-    if (ctx->need_flush) {
-        if (mtcr_connectx_flush(mf->bar_virtual_addr, ctx->fdlock)) {
+    if (ctx->need_flush)
+    {
+        if (mtcr_connectx_flush(mf->bar_virtual_addr, ctx->fdlock))
+        {
             return 0;
         }
         ctx->need_flush = 0;
@@ -525,24 +597,24 @@ int mtcr_pcicr_mread4(mfile *mf, unsigned int offset, u_int32_t *value)
     return 4;
 }
 
-int mtcr_pcicr_mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mtcr_pcicr_mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
 
-    if (offset >= MTCR_MAP_SIZE) {
+    if (offset >= MTCR_MAP_SIZE)
+    {
         errno = EINVAL;
         return 0;
     }
-    *((u_int32_t*) ((char*) mf->bar_virtual_addr + offset)) = __cpu_to_be32(value);
+    *((u_int32_t*)((char*)mf->bar_virtual_addr + offset)) = __cpu_to_be32(value);
     ctx->need_flush = ctx->connectx_flush;
     return 4;
 }
 
-static
-int mtcr_pcicr_open(mfile *mf, const char *name, char *conf_name, off_t off, int ioctl_needed, u_int32_t adv_opt)
+static int mtcr_pcicr_open(mfile* mf, const char* name, char* conf_name, off_t off, int ioctl_needed, u_int32_t adv_opt)
 {
     int rc;
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
 
     mf->tp = MST_PCI;
 
@@ -558,19 +630,24 @@ int mtcr_pcicr_open(mfile *mf, const char *name, char *conf_name, off_t off, int
     ctx->need_flush = 0;
 
     rc = mtcr_mmap(mf, name, off, ioctl_needed);
-    if (rc) {
+    if (rc)
+    {
         goto end;
     }
 
     rc = mtcr_check_signature(mf);
 end:
-    if (rc) {
+    if (rc)
+    {
         mtcr_pcicr_mclose(mf);
-    } else if (conf_name != NULL) {
-        mfile *conf_mf = mopen_ul_int(conf_name, adv_opt);
-        if (conf_mf != NULL) {
+    }
+    else if (conf_name != NULL)
+    {
+        mfile* conf_mf = mopen_ul_int(conf_name, adv_opt);
+        if (conf_mf != NULL)
+        {
             mf->res_fd = conf_mf->fd;
-            ul_ctx_t *conf_ctx = conf_mf->ul_ctx;
+            ul_ctx_t* conf_ctx = conf_mf->ul_ctx;
             mf->res_tp = conf_mf->tp;
             mf->vsec_addr = conf_mf->vsec_addr;
             mf->vsec_supp = conf_mf->vsec_supp;
@@ -587,16 +664,17 @@ int mtcr_pcicr_open(mfile *mf, const char *name, char *conf_name, off_t off, int
     return rc;
 }
 
-
-
 //
 // PCI CONF ACCESS FUNCTIONS
 //
 
 #if CONFIG_ENABLE_PCICONF
 /* PCI address space related enum*/
-enum {
-    PCI_CAP_PTR = 0x34, PCI_HDR_SIZE = 0x40, PCI_EXT_SPACE_ADDR = 0xff,
+enum
+{
+    PCI_CAP_PTR = 0x34,
+    PCI_HDR_SIZE = 0x40,
+    PCI_EXT_SPACE_ADDR = 0xff,
 
     PCI_CTRL_OFFSET = 0x4, // for space / semaphore / auto-increment bit
     PCI_COUNTER_OFFSET = 0x8,
@@ -614,88 +692,108 @@ enum {
 };
 
 /* Mellanox vendor specific enum */
-enum {
-    CAP_ID = 0x9, ICMD_DOMAIN = 0x1, CR_SPACE_DOMAIN = 0x2, SEMAPHORE_DOMAIN = 0xa, IFC_MAX_RETRIES = 2048
+enum
+{
+    CAP_ID = 0x9,
+    ICMD_DOMAIN = 0x1,
+    CR_SPACE_DOMAIN = 0x2,
+    SEMAPHORE_DOMAIN = 0xa,
+    IFC_MAX_RETRIES = 2048
 };
 
 /* PCI operation enum(read or write)*/
-enum {
-    READ_OP = 0, WRITE_OP = 1,
+enum
+{
+    READ_OP = 0,
+    WRITE_OP = 1,
 };
 
-#define READ4_PCI(mf, val_ptr, pci_offs, err_prefix, action_on_fail)    \
-    do {                                                                \
-        int rc;                                                         \
-        int lock_rc;                                                    \
-        ul_ctx_t *pci_ctx = mf->ul_ctx;                                 \
-        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_EX);                 \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        rc = pread(mf->fd, val_ptr, 4, pci_offs);                       \
-        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_UN);                 \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        if (rc != 4) {                                                 \
-            if (rc < 0) {                                                 \
-                perror(err_prefix);}                                     \
-            action_on_fail;                                             \
-        }                                                               \
-        *val_ptr = __le32_to_cpu(*val_ptr); \
+#define READ4_PCI(mf, val_ptr, pci_offs, err_prefix, action_on_fail) \
+    do                                                               \
+    {                                                                \
+        int rc;                                                      \
+        int lock_rc;                                                 \
+        ul_ctx_t* pci_ctx = mf->ul_ctx;                              \
+        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_EX);              \
+        if (lock_rc)                                                 \
+        {                                                            \
+            perror(err_prefix);                                      \
+            action_on_fail;                                          \
+        }                                                            \
+        rc = pread(mf->fd, val_ptr, 4, pci_offs);                    \
+        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_UN);              \
+        if (lock_rc)                                                 \
+        {                                                            \
+            perror(err_prefix);                                      \
+            action_on_fail;                                          \
+        }                                                            \
+        if (rc != 4)                                                 \
+        {                                                            \
+            if (rc < 0)                                              \
+            {                                                        \
+                perror(err_prefix);                                  \
+            }                                                        \
+            action_on_fail;                                          \
+        }                                                            \
+        *val_ptr = __le32_to_cpu(*val_ptr);                          \
     } while (0)
 
-#define WRITE4_PCI(mf, val, pci_offs, err_prefix, action_on_fail)           \
-    do {                                                                \
-        int rc;                                                         \
-        int lock_rc;                                                    \
-        u_int32_t val_le;                                               \
-        ul_ctx_t *pci_ctx = mf->ul_ctx;                                 \
-        val_le = __cpu_to_le32(val);                                    \
-        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_EX);                 \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        rc = pwrite(mf->fd, &val_le, 4, pci_offs);                      \
-        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_UN);                 \
-        if (lock_rc) {                                                  \
-            perror(err_prefix);                                         \
-            action_on_fail;                                             \
-        }                                                               \
-        if (rc != 4) {                                                 \
-            if (rc < 0) {                                                 \
-                perror(err_prefix);}                                     \
-            action_on_fail;                                         \
-        }                                                               \
+#define WRITE4_PCI(mf, val, pci_offs, err_prefix, action_on_fail) \
+    do                                                            \
+    {                                                             \
+        int rc;                                                   \
+        int lock_rc;                                              \
+        u_int32_t val_le;                                         \
+        ul_ctx_t* pci_ctx = mf->ul_ctx;                           \
+        val_le = __cpu_to_le32(val);                              \
+        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_EX);           \
+        if (lock_rc)                                              \
+        {                                                         \
+            perror(err_prefix);                                   \
+            action_on_fail;                                       \
+        }                                                         \
+        rc = pwrite(mf->fd, &val_le, 4, pci_offs);                \
+        lock_rc = _flock_int(pci_ctx->fdlock, LOCK_UN);           \
+        if (lock_rc)                                              \
+        {                                                         \
+            perror(err_prefix);                                   \
+            action_on_fail;                                       \
+        }                                                         \
+        if (rc != 4)                                              \
+        {                                                         \
+            if (rc < 0)                                           \
+            {                                                     \
+                perror(err_prefix);                               \
+            }                                                     \
+            action_on_fail;                                       \
+        }                                                         \
     } while (0)
 
-
 #define WO_REG_ADDR_DATA 0xbadacce5
-#define DEVID_OFFSET     0xf0014
+#define DEVID_OFFSET 0xf0014
 #define PCICONF_ADDR_OFF 0x58
 #define PCICONF_DATA_OFF 0x5c
 
-
-int mtcr_driver_mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mtcr_driver_mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
     int rc = 4;
     struct mst_read4_st r4;
     memset(&r4, 0, sizeof(struct mst_read4_st));
     r4.address_space = (unsigned int)mf->address_space;
     r4.offset = offset;
-    if ((ioctl(mf->fd, PCICONF_READ4, &r4)) < 0) {
+    if ((ioctl(mf->fd, PCICONF_READ4, &r4)) < 0)
+    {
         rc = -1;
-    } else {
+    }
+    else
+    {
         *value = r4.data;
     }
 
     return rc;
 }
 
-int mtcr_driver_mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mtcr_driver_mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
     int rc = 4;
     struct mst_write4_st r4;
@@ -704,30 +802,35 @@ int mtcr_driver_mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
     r4.offset = offset;
     r4.data = value;
     r4.address_space = (unsigned int)mf->address_space;
-    if (ioctl(mf->fd, PCICONF_WRITE4, &r4) < 0) {
+    if (ioctl(mf->fd, PCICONF_WRITE4, &r4) < 0)
+    {
         rc = -1;
-    } else {
+    }
+    else
+    {
         rc = 4;
     }
     return rc;
 }
 
-static
-int mst_driver_connectx_flush(mfile *mf)
+static int mst_driver_connectx_flush(mfile* mf)
 {
     mtcr_driver_mwrite4(mf, mf->connectx_wa_slot, 0);
     u_int32_t value = 0x1;
-    do {
+    do
+    {
         mtcr_driver_mread4(mf, mf->connectx_wa_slot, &value);
     } while (value);
     return 0;
 }
 
-int mtcr_driver_cr_mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mtcr_driver_cr_mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
-    if (ctx->need_flush) {
-        if (mst_driver_connectx_flush(mf)) {
+    ul_ctx_t* ctx = mf->ul_ctx;
+    if (ctx->need_flush)
+    {
+        if (mst_driver_connectx_flush(mf))
+        {
             return 0;
         }
         ctx->need_flush = 0;
@@ -735,23 +838,26 @@ int mtcr_driver_cr_mread4(mfile *mf, unsigned int offset, u_int32_t *value)
     return mtcr_driver_mread4(mf, offset, value);
 }
 
-int mtcr_driver_cr_mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mtcr_driver_cr_mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
-    if (mtcr_driver_mwrite4(mf, offset, value) != 4) {
+    ul_ctx_t* ctx = mf->ul_ctx;
+    if (mtcr_driver_mwrite4(mf, offset, value) != 4)
+    {
         return 0;
     }
     ctx->need_flush = ctx->connectx_flush;
     return 4;
 }
 
-static int driver_mread_chunk_as_multi_mread4(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int driver_mread_chunk_as_multi_mread4(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     int i;
-    for (i = 0; i < length; i += 4) {
+    for (i = 0; i < length; i += 4)
+    {
         u_int32_t value = 0x0;
 
-        if (mread4(mf, offset + i, &value) != 4) {
+        if (mread4(mf, offset + i, &value) != 4)
+        {
             return -1;
         }
         memcpy(data + i / 4, &value, 4);
@@ -759,28 +865,33 @@ static int driver_mread_chunk_as_multi_mread4(mfile *mf, unsigned int offset, u_
     return length;
 }
 
-static int driver_mwrite_chunk_as_multi_mwrite4(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int driver_mwrite_chunk_as_multi_mwrite4(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     int i;
-    if (length % 4) {
+    if (length % 4)
+    {
         return EINVAL;
     }
-    for (i = 0; i < length; i += 4) {
+    for (i = 0; i < length; i += 4)
+    {
         u_int32_t value;
         memcpy(&value, data + i / 4, 4);
-        if (mwrite4(mf, offset + i, value) != 4) {
+        if (mwrite4(mf, offset + i, value) != 4)
+        {
             return -1;
         }
     }
     return length;
 }
 
-static int driver_mwrite4_block(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int driver_mwrite4_block(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
-    if (mf->tp == MST_PCICONF && mf->vsec_supp) {
+    if (mf->tp == MST_PCICONF && mf->vsec_supp)
+    {
         int left_size = 0;
-        u_int32_t *dest_ptr = data;
-        for (left_size = length; left_size > 0; left_size -= PCICONF_MAX_BUFFER_SIZE) {
+        u_int32_t* dest_ptr = data;
+        for (left_size = length; left_size > 0; left_size -= PCICONF_MAX_BUFFER_SIZE)
+        {
             int towrite;
             towrite = (left_size >= PCICONF_MAX_BUFFER_SIZE) ? PCICONF_MAX_BUFFER_SIZE : left_size;
             struct mst_write4_buffer_st write4_buf;
@@ -790,25 +901,29 @@ static int driver_mwrite4_block(mfile *mf, unsigned int offset, u_int32_t *data,
             write4_buf.size = towrite;
             memcpy(write4_buf.data, dest_ptr, towrite);
             int ret = ioctl(mf->fd, PCICONF_WRITE4_BUFFER, &write4_buf);
-            if (ret < 0) {
+            if (ret < 0)
+            {
                 return -1;
             }
             offset += towrite;
             dest_ptr += towrite / sizeof(u_int32_t);
         }
         return length;
-    } else {
-
+    }
+    else
+    {
         return driver_mwrite_chunk_as_multi_mwrite4(mf, offset, data, length);
     }
 }
 
-static int driver_mread4_block(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int driver_mread4_block(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
-    if (mf->tp == MST_PCICONF && mf->vsec_supp) {
+    if (mf->tp == MST_PCICONF && mf->vsec_supp)
+    {
         int left_size = 0;
-        u_int32_t *dest_ptr = data;
-        for (left_size = length; left_size > 0; left_size -= PCICONF_MAX_BUFFER_SIZE) {
+        u_int32_t* dest_ptr = data;
+        for (left_size = length; left_size > 0; left_size -= PCICONF_MAX_BUFFER_SIZE)
+        {
             int toread = (left_size >= PCICONF_MAX_BUFFER_SIZE) ? PCICONF_MAX_BUFFER_SIZE : left_size;
 
             struct mst_read4_buffer_st read4_buf;
@@ -820,9 +935,12 @@ static int driver_mread4_block(mfile *mf, unsigned int offset, u_int32_t *data,
             // We support backward compatibility.
             // There is a known bug with PCICONF_READ4_BUFFER ioctl and data may be corrupted.
             int ret;
-            if ((ret = ioctl(mf->fd, PCICONF_READ4_BUFFER_EX, &read4_buf)) < 0) {
-                if ((ret = ioctl(mf->fd, PCICONF_READ4_BUFFER, &read4_buf)) < 0) {
-                    if ((ret = ioctl(mf->fd, PCICONF_READ4_BUFFER_BC, &read4_buf)) < 0) {
+            if ((ret = ioctl(mf->fd, PCICONF_READ4_BUFFER_EX, &read4_buf)) < 0)
+            {
+                if ((ret = ioctl(mf->fd, PCICONF_READ4_BUFFER, &read4_buf)) < 0)
+                {
+                    if ((ret = ioctl(mf->fd, PCICONF_READ4_BUFFER_BC, &read4_buf)) < 0)
+                    {
                         return -1;
                     }
                 }
@@ -832,61 +950,67 @@ static int driver_mread4_block(mfile *mf, unsigned int offset, u_int32_t *data,
             dest_ptr += toread / sizeof(u_int32_t);
         }
         return length;
-    } else {
+    }
+    else
+    {
         return driver_mread_chunk_as_multi_mread4(mf, offset, data, length);
     }
 }
 
-static
-int mtcr_driver_mclose(mfile *mf)
+static int mtcr_driver_mclose(mfile* mf)
 {
-    if (mf) {
-        if (mf->bar_virtual_addr) {
+    if (mf)
+    {
+        if (mf->bar_virtual_addr)
+        {
             munmap(mf->bar_virtual_addr, MTCR_MAP_SIZE);
         }
-        if (mf->fd > 0) {
+        if (mf->fd > 0)
+        {
             close(mf->fd);
         }
-        if (mf->res_fd > 0) {
+        if (mf->res_fd > 0)
+        {
             close(mf->res_fd);
         }
     }
     return 0;
 }
 
-static
-int mtcr_driver_open(mfile *mf, MType dev_type,
-                     unsigned domain_p, unsigned bus_p, unsigned dev_p, unsigned func_p)
+static int
+  mtcr_driver_open(mfile* mf, MType dev_type, unsigned domain_p, unsigned bus_p, unsigned dev_p, unsigned func_p)
 {
     int rc = 0;
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     char driver_cr_name[40];
     char driver_conf_name[40];
 
     sprintf(driver_cr_name, DRIVER_CR_NAME, domain_p, bus_p, dev_p, func_p);
     sprintf(driver_conf_name, DRIVER_CONF_NAME, domain_p, bus_p, dev_p, func_p);
 
-
     int cr_valid = 0;
     ctx->connectx_flush = 0;
-    ctx->need_flush     = 0;
-    ctx->via_driver     = 1;
-    if (dev_type == MST_DRIVER_CR) {
+    ctx->need_flush = 0;
+    ctx->via_driver = 1;
+    if (dev_type == MST_DRIVER_CR)
+    {
         mf->fd = open(driver_cr_name, O_RDWR | O_SYNC);
-        //Failed to open cr, go to conf
-        if (mf->fd < 0) {
+        // Failed to open cr, go to conf
+        if (mf->fd < 0)
+        {
             goto end;
         }
-        mf->tp             = MST_PCI;
-        ctx->mread4        = mtcr_driver_cr_mread4;
-        ctx->mwrite4       = mtcr_driver_cr_mwrite4;
-        ctx->mread4_block  = driver_mread4_block;
+        mf->tp = MST_PCI;
+        ctx->mread4 = mtcr_driver_cr_mread4;
+        ctx->mwrite4 = mtcr_driver_cr_mwrite4;
+        ctx->mread4_block = driver_mread4_block;
         ctx->mwrite4_block = driver_mwrite4_block;
-        ctx->mclose        = mtcr_driver_mclose;
-        mf->bar_virtual_addr            = NULL;
+        ctx->mclose = mtcr_driver_mclose;
+        mf->bar_virtual_addr = NULL;
         unsigned int slot_num;
         rc = ioctl(mf->fd, PCI_CONNECTX_WA, &slot_num);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             goto end;
         }
 
@@ -898,158 +1022,185 @@ int mtcr_driver_open(mfile *mf, MType dev_type,
     }
 
 end:
-    if (rc) {
+    if (rc)
+    {
         mtcr_driver_mclose(mf);
-    } else if (cr_valid) {
+    }
+    else if (cr_valid)
+    {
         mf->res_fd = open(driver_conf_name, O_RDWR | O_SYNC);
-        if (mf->res_fd < 0) {
+        if (mf->res_fd < 0)
+        {
             return -1;
         }
-        mf->res_tp             = MST_PCICONF;
-        ctx->res_mread4        = mtcr_driver_mread4;
-        ctx->res_mwrite4       = mtcr_driver_mwrite4;
-        ctx->res_mread4_block  = driver_mread_chunk_as_multi_mread4;
+        mf->res_tp = MST_PCICONF;
+        ctx->res_mread4 = mtcr_driver_mread4;
+        ctx->res_mwrite4 = mtcr_driver_mwrite4;
+        ctx->res_mread4_block = driver_mread_chunk_as_multi_mread4;
         ctx->res_mwrite4_block = driver_mwrite_chunk_as_multi_mwrite4;
     }
 
-    if (!cr_valid) {
+    if (!cr_valid)
+    {
         rc = 0;
         mf->fd = open(driver_conf_name, O_RDWR | O_SYNC);
-        if (mf->fd < 0) {
+        if (mf->fd < 0)
+        {
             return -1;
         }
         struct mst_params dev_params;
         memset(&dev_params, 0, sizeof(dev_params));
-        if (ioctl(mf->fd, MST_PARAMS, &dev_params) < 0) {
+        if (ioctl(mf->fd, MST_PARAMS, &dev_params) < 0)
+        {
             fprintf(stderr, "-E- Failed to get Device PARAMS!\n");
             return -1;
         }
         mf->vsec_supp = (int)dev_params.vendor_specific_cap;
-        if (dev_params.vendor_specific_cap) {
+        if (dev_params.vendor_specific_cap)
+        {
             mf->address_space = CR_SPACE_DOMAIN;
-            mf->vsec_cap_mask |= ((1 << VCC_INITIALIZED) | (1 << VCC_SEMAPHORE_SPACE_SUPPORTED) |
-                                  (1 << VCC_CRSPACE_SPACE_SUPPORTED) | (1 << VCC_ICMD_SPACE_SUPPORTED) |
-                                  (1 << VCC_ICMD_EXT_SPACE_SUPPORTED));
+            mf->vsec_cap_mask |=
+              ((1 << VCC_INITIALIZED) | (1 << VCC_SEMAPHORE_SPACE_SUPPORTED) | (1 << VCC_CRSPACE_SPACE_SUPPORTED) |
+               (1 << VCC_ICMD_SPACE_SUPPORTED) | (1 << VCC_ICMD_EXT_SPACE_SUPPORTED));
         }
         mf->tp = MST_PCICONF;
-        ctx->mread4        = mtcr_driver_mread4;
-        ctx->mwrite4       = mtcr_driver_mwrite4;
-        ctx->mread4_block  = driver_mread4_block;
+        ctx->mread4 = mtcr_driver_mread4;
+        ctx->mwrite4 = mtcr_driver_mwrite4;
+        ctx->mread4_block = driver_mread4_block;
         ctx->mwrite4_block = driver_mwrite4_block;
-        ctx->mclose        = mtcr_driver_mclose;
+        ctx->mclose = mtcr_driver_mclose;
         init_dev_info_ul(mf, driver_conf_name, domain_p, bus_p, dev_p, func_p);
     }
 
     return rc;
 }
 
-
-static int is_wo_pciconf_gw(mfile *mf)
+static int is_wo_pciconf_gw(mfile* mf)
 {
     unsigned offset = DEVID_OFFSET;
     u_int32_t data = 0;
     int rc = pwrite(mf->fd, &offset, 4, PCICONF_ADDR_OFF);
-    if (rc < 0) {
+    if (rc < 0)
+    {
         return 0;
     }
     rc = pread(mf->fd, &data, 4, PCICONF_ADDR_OFF);
-    if (rc < 0) {
+    if (rc < 0)
+    {
         return 0;
     }
-    if (data == WO_REG_ADDR_DATA) {
+    if (data == WO_REG_ADDR_DATA)
+    {
         return 1;
     }
     return 0;
 }
 
-int pci_find_capability(mfile *mf, int cap_id)
+int pci_find_capability(mfile* mf, int cap_id)
 {
     unsigned offset;
-    unsigned char visited[256] = { }; /* Prevent infinite loops */
+    unsigned char visited[256] = {}; /* Prevent infinite loops */
     unsigned char data[2];
     int ret;
     int lock_ret;
-    ul_ctx_t *pci_ctx = mf->ul_ctx;
+    ul_ctx_t* pci_ctx = mf->ul_ctx;
 
     // protect against parallel access
     lock_ret = _flock_int(pci_ctx->fdlock, LOCK_EX);
-    if (lock_ret) {
+    if (lock_ret)
+    {
         return 0;
     }
 
     ret = pread(mf->fd, data, 1, PCI_CAP_PTR);
 
     lock_ret = _flock_int(pci_ctx->fdlock, LOCK_UN);
-    if (lock_ret) {
+    if (lock_ret)
+    {
         return 0;
     }
 
-    if (ret != 1) {
+    if (ret != 1)
+    {
         return 0;
     }
 
     offset = data[0];
-    while (1) {
-        if (offset < PCI_HDR_SIZE || offset > PCI_EXT_SPACE_ADDR) {
+    while (1)
+    {
+        if (offset < PCI_HDR_SIZE || offset > PCI_EXT_SPACE_ADDR)
+        {
             return 0;
         }
 
         lock_ret = _flock_int(pci_ctx->fdlock, LOCK_EX);
-        if (lock_ret) {
+        if (lock_ret)
+        {
             return 0;
         }
 
         ret = pread(mf->fd, data, sizeof data, offset);
 
         lock_ret = _flock_int(pci_ctx->fdlock, LOCK_UN);
-        if (lock_ret) {
+        if (lock_ret)
+        {
             return 0;
         }
 
-        if (ret != sizeof data) {
+        if (ret != sizeof data)
+        {
             return 0;
         }
 
         visited[offset] = 1;
 
-        if (data[0] == cap_id) {
+        if (data[0] == cap_id)
+        {
             return offset;
         }
 
         offset = data[1];
 
-        if (offset > PCI_EXT_SPACE_ADDR) {
+        if (offset > PCI_EXT_SPACE_ADDR)
+        {
             return 0;
         }
-        if (visited[offset]) {
+        if (visited[offset])
+        {
             return 0;
         }
     }
     return 0;
 }
 
-int mtcr_pciconf_cap9_sem(mfile *mf, int state)
+int mtcr_pciconf_cap9_sem(mfile* mf, int state)
 {
     u_int32_t lock_val;
     u_int32_t counter = 0;
     int retries = 0;
-    if (!state) { // unlock
+    if (!state)
+    { // unlock
         WRITE4_PCI(mf, 0, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "unlock semaphore", return ME_PCI_WRITE_ERROR);
-    } else { // lock
-        do {
-            if (retries > IFC_MAX_RETRIES) {
+    }
+    else
+    { // lock
+        do
+        {
+            if (retries > IFC_MAX_RETRIES)
+            {
                 return ME_SEM_LOCKED;
             }
             // read semaphore untill 0x0
             READ4_PCI(mf, &lock_val, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "read counter", return ME_PCI_READ_ERROR);
-            if (lock_val) { //semaphore is taken
+            if (lock_val)
+            { // semaphore is taken
                 retries++;
                 msleep(1); // wait for current op to end
                 continue;
             }
-            //read ticket
+            // read ticket
             READ4_PCI(mf, &counter, mf->vsec_addr + PCI_COUNTER_OFFSET, "read counter", return ME_PCI_READ_ERROR);
-            //write ticket to semaphore dword
+            // write ticket to semaphore dword
             WRITE4_PCI(mf, counter, mf->vsec_addr + PCI_SEMAPHORE_OFFSET, "write counter to semaphore",
                        return ME_PCI_WRITE_ERROR);
             // read back semaphore make sure ticket == semaphore else repeat
@@ -1060,25 +1211,28 @@ int mtcr_pciconf_cap9_sem(mfile *mf, int state)
     return ME_OK;
 }
 
-int mtcr_pciconf_wait_on_flag(mfile *mf, u_int8_t expected_val)
+int mtcr_pciconf_wait_on_flag(mfile* mf, u_int8_t expected_val)
 {
     int retries = 0;
     u_int32_t flag;
-    do {
-        if (retries > IFC_MAX_RETRIES) {
+    do
+    {
+        if (retries > IFC_MAX_RETRIES)
+        {
             return ME_PCI_IFC_TOUT;
         }
         READ4_PCI(mf, &flag, mf->vsec_addr + PCI_ADDR_OFFSET, "read flag", return ME_PCI_READ_ERROR);
         flag = EXTRACT(flag, PCI_FLAG_BIT_OFFS, 1);
         retries++;
-        if ((retries & 0xf) == 0) { // dont sleep always
+        if ((retries & 0xf) == 0)
+        { // dont sleep always
             msleep(1);
         }
     } while (flag != expected_val);
     return ME_OK;
 }
 
-int mtcr_pciconf_set_addr_space(mfile *mf, u_int16_t space)
+int mtcr_pciconf_set_addr_space(mfile* mf, u_int16_t space)
 {
     // read modify write
     u_int32_t val;
@@ -1087,34 +1241,40 @@ int mtcr_pciconf_set_addr_space(mfile *mf, u_int16_t space)
     WRITE4_PCI(mf, val, mf->vsec_addr + PCI_CTRL_OFFSET, "write domain", return ME_PCI_WRITE_ERROR);
     // read status and make sure space is supported
     READ4_PCI(mf, &val, mf->vsec_addr + PCI_CTRL_OFFSET, "read status", return ME_PCI_READ_ERROR);
-    if (EXTRACT(val, PCI_STATUS_BIT_OFFS, PCI_STATUS_BIT_LEN) == 0) {
+    if (EXTRACT(val, PCI_STATUS_BIT_OFFS, PCI_STATUS_BIT_LEN) == 0)
+    {
         return ME_PCI_SPACE_NOT_SUPPORTED;
     }
     return ME_OK;
 }
 
-int mtcr_pciconf_rw(mfile *mf, unsigned int offset, u_int32_t *data, int rw)
+int mtcr_pciconf_rw(mfile* mf, unsigned int offset, u_int32_t* data, int rw)
 {
     int rc = ME_OK;
     u_int32_t address = offset;
 
-    //last 2 bits must be zero as we only allow 30 bits addresses
-    if (EXTRACT(address, 30, 2)) {
-        if (errno == EEXIST) {  // not sure if it's OK to change errno in all cases
+    // last 2 bits must be zero as we only allow 30 bits addresses
+    if (EXTRACT(address, 30, 2))
+    {
+        if (errno == EEXIST)
+        { // not sure if it's OK to change errno in all cases
             errno = EINVAL;
         }
         return ME_BAD_PARAMS;
     }
 
     address = MERGE(address, (rw ? 1 : 0), PCI_FLAG_BIT_OFFS, 1);
-    if (rw == WRITE_OP) {
+    if (rw == WRITE_OP)
+    {
         // write data
         WRITE4_PCI(mf, *data, mf->vsec_addr + PCI_DATA_OFFSET, "write value", return ME_PCI_WRITE_ERROR);
         // write address
         WRITE4_PCI(mf, address, mf->vsec_addr + PCI_ADDR_OFFSET, "write offset", return ME_PCI_WRITE_ERROR);
         // wait on flag
         rc = mtcr_pciconf_wait_on_flag(mf, 0);
-    } else {
+    }
+    else
+    {
         // write address
         WRITE4_PCI(mf, address, mf->vsec_addr + PCI_ADDR_OFFSET, "write offset", return ME_PCI_WRITE_ERROR);
         // wait on flag
@@ -1125,19 +1285,21 @@ int mtcr_pciconf_rw(mfile *mf, unsigned int offset, u_int32_t *data, int rw)
     return rc;
 }
 
-int mtcr_pciconf_send_pci_cmd_int(mfile *mf, int space, unsigned int offset, u_int32_t *data, int rw)
+int mtcr_pciconf_send_pci_cmd_int(mfile* mf, int space, unsigned int offset, u_int32_t* data, int rw)
 {
     int rc = ME_OK;
 
     // take semaphore
     rc = mtcr_pciconf_cap9_sem(mf, 1);
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
 
     // set address space
     rc = mtcr_pciconf_set_addr_space(mf, space);
-    if (rc) {
+    if (rc)
+    {
         goto cleanup;
     }
 
@@ -1150,162 +1312,189 @@ int mtcr_pciconf_send_pci_cmd_int(mfile *mf, int space, unsigned int offset, u_i
 }
 
 // adrianc: no need to lock the file semaphore if we access cr-space through mellanox vendor specific cap
-int mtcr_pciconf_mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mtcr_pciconf_mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
     int rc;
     rc = mtcr_pciconf_send_pci_cmd_int(mf, mf->address_space, offset, value, READ_OP);
-    if (rc) {
+    if (rc)
+    {
         return -1;
     }
     return 4;
 }
-int mtcr_pciconf_mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mtcr_pciconf_mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
     int rc;
     rc = mtcr_pciconf_send_pci_cmd_int(mf, mf->address_space, offset, &value, WRITE_OP);
-    if (rc) {
+    if (rc)
+    {
         return -1;
     }
     return 4;
 }
 
-static int block_op_pciconf(mfile *mf, unsigned int offset, u_int32_t *data, int length, int rw)
+static int block_op_pciconf(mfile* mf, unsigned int offset, u_int32_t* data, int length, int rw)
 {
     int i;
     int rc = ME_OK;
     int wrote_or_read = length;
-    if (length % 4) {
+    if (length % 4)
+    {
         return -1;
     }
     // lock semaphore and set address space
     rc = mtcr_pciconf_cap9_sem(mf, 1);
-    if (rc) {
+    if (rc)
+    {
         return -1;
     }
     // set address space
     rc = mtcr_pciconf_set_addr_space(mf, mf->address_space);
-    if (rc) {
+    if (rc)
+    {
         wrote_or_read = -1;
         goto cleanup;
     }
 
-    for (i = 0; i < length; i += 4) {
-        if (mtcr_pciconf_rw(mf, offset + i, &(data[(i >> 2)]), rw)) {
+    for (i = 0; i < length; i += 4)
+    {
+        if (mtcr_pciconf_rw(mf, offset + i, &(data[(i >> 2)]), rw))
+        {
             wrote_or_read = i;
             goto cleanup;
         }
     }
-cleanup: mtcr_pciconf_cap9_sem(mf, 0);
+cleanup:
+    mtcr_pciconf_cap9_sem(mf, 0);
     return wrote_or_read;
 }
 
-static int mread4_block_pciconf(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int mread4_block_pciconf(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     return block_op_pciconf(mf, offset, data, length, READ_OP);
 }
 
-static int mwrite4_block_pciconf(mfile *mf, unsigned int offset, u_int32_t *data, int length)
+static int mwrite4_block_pciconf(mfile* mf, unsigned int offset, u_int32_t* data, int length)
 {
     return block_op_pciconf(mf, offset, data, length, WRITE_OP);
 }
 
-int mtcr_pciconf_mread4_old(mfile *mf, unsigned int offset, u_int32_t *value)
+int mtcr_pciconf_mread4_old(mfile* mf, unsigned int offset, u_int32_t* value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     unsigned int new_offset = offset;
     int rc;
-    if (ctx->wo_addr) {
+    if (ctx->wo_addr)
+    {
         new_offset |= 0x1;
     }
     // adrianc: PCI registers always in le32
     offset = __cpu_to_le32(new_offset);
     rc = _flock_int(ctx->fdlock, LOCK_EX);
-    if (rc) {
+    if (rc)
+    {
         goto pciconf_read_cleanup;
     }
     rc = pwrite(mf->fd, &offset, 4, PCICONF_ADDR_OFF);
-    if (rc < 0) {
+    if (rc < 0)
+    {
         perror("write offset");
         goto pciconf_read_cleanup;
     }
-    if (rc != 4) {
+    if (rc != 4)
+    {
         rc = 0;
         goto pciconf_read_cleanup;
     }
 
     rc = pread(mf->fd, value, 4, PCICONF_DATA_OFF);
-    if (rc < 0) {
+    if (rc < 0)
+    {
         perror("read value");
         goto pciconf_read_cleanup;
     }
-    *value = __le32_to_cpu(*value);;
+    *value = __le32_to_cpu(*value);
+    ;
 pciconf_read_cleanup:
-    if (_flock_int(ctx->fdlock, LOCK_UN)) {
+    if (_flock_int(ctx->fdlock, LOCK_UN))
+    {
         return rc;
     }
     return rc;
 }
 
-int mtcr_pciconf_mwrite4_old(mfile *mf, unsigned int offset, u_int32_t value)
+int mtcr_pciconf_mwrite4_old(mfile* mf, unsigned int offset, u_int32_t value)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     int rc;
     value = __cpu_to_le32(value);
     offset = __cpu_to_le32(offset);
     rc = _flock_int(ctx->fdlock, LOCK_EX);
-    if (rc) {
+    if (rc)
+    {
         goto pciconf_write_cleanup;
     }
-    if (ctx->wo_addr) {
+    if (ctx->wo_addr)
+    {
         rc = pwrite(mf->fd, &value, 4, PCICONF_DATA_OFF);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             perror("write value");
             goto pciconf_write_cleanup;
         }
-        if (rc != 4) {
+        if (rc != 4)
+        {
             rc = 0;
             goto pciconf_write_cleanup;
         }
         rc = pwrite(mf->fd, &offset, 4, PCICONF_ADDR_OFF);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             perror("write offset");
             goto pciconf_write_cleanup;
         }
-
-    } else {
+    }
+    else
+    {
         rc = pwrite(mf->fd, &offset, 4, PCICONF_ADDR_OFF);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             perror("write offset");
             goto pciconf_write_cleanup;
         }
-        if (rc != 4) {
+        if (rc != 4)
+        {
             rc = 0;
             goto pciconf_write_cleanup;
         }
         rc = pwrite(mf->fd, &value, 4, PCICONF_DATA_OFF);
-        if (rc < 0) {
+        if (rc < 0)
+        {
             perror("write value");
             goto pciconf_write_cleanup;
         }
     }
 pciconf_write_cleanup:
-    if (_flock_int(ctx->fdlock, LOCK_UN)) {
+    if (_flock_int(ctx->fdlock, LOCK_UN))
+    {
         return rc;
     }
     return rc;
 }
 
-static
-int mtcr_pciconf_mclose(mfile *mf)
+static int mtcr_pciconf_mclose(mfile* mf)
 {
     unsigned int word;
-    if (mf) {
+    if (mf)
+    {
         // Adrianc: set address in PCI configuration space to be non-semaphore.
         int rc = mread4_ul(mf, 0xf0014, &word);
-        if (mf->fd > 0) {
+        if (mf->fd > 0)
+        {
             close(mf->fd);
         }
-        if (rc != 4) {
+        if (rc != 4)
+        {
             return 1;
         }
     }
@@ -1315,59 +1504,62 @@ int mtcr_pciconf_mclose(mfile *mf)
 
 int space_to_cap_offset(int space)
 {
-    switch (space) {
-    case AS_ICMD_EXT:
-        return VCC_ICMD_EXT_SPACE_SUPPORTED;
-    case AS_CR_SPACE:
-        return VCC_CRSPACE_SPACE_SUPPORTED;
-    case AS_ICMD:
-        return VCC_ICMD_SPACE_SUPPORTED;
-    case AS_NODNIC_INIT_SEG:
-        return VCC_NODNIC_INIT_SEG_SPACE_SUPPORTED;
-    case AS_EXPANSION_ROM:
-        return VCC_EXPANSION_ROM_SPACE_SUPPORTED;
-    case AS_ND_CRSPACE:
-        return VCC_ND_CRSPACE_SPACE_SUPPORTED;
-    case AS_SCAN_CRSPACE:
-        return VCC_SCAN_CRSPACE_SPACE_SUPPORTED;
-    case AS_SEMAPHORE:
-        return VCC_SEMAPHORE_SPACE_SUPPORTED;
-    case AS_MAC:
-        return VCC_MAC_SPACE_SUPPORTED;
-    default:
-        return 0;
+    switch (space)
+    {
+        case AS_ICMD_EXT:
+            return VCC_ICMD_EXT_SPACE_SUPPORTED;
+        case AS_CR_SPACE:
+            return VCC_CRSPACE_SPACE_SUPPORTED;
+        case AS_ICMD:
+            return VCC_ICMD_SPACE_SUPPORTED;
+        case AS_NODNIC_INIT_SEG:
+            return VCC_NODNIC_INIT_SEG_SPACE_SUPPORTED;
+        case AS_EXPANSION_ROM:
+            return VCC_EXPANSION_ROM_SPACE_SUPPORTED;
+        case AS_ND_CRSPACE:
+            return VCC_ND_CRSPACE_SPACE_SUPPORTED;
+        case AS_SCAN_CRSPACE:
+            return VCC_SCAN_CRSPACE_SPACE_SUPPORTED;
+        case AS_SEMAPHORE:
+            return VCC_SEMAPHORE_SPACE_SUPPORTED;
+        case AS_MAC:
+            return VCC_MAC_SPACE_SUPPORTED;
+        default:
+            return 0;
     }
 }
 
 // Turning on the space capability bit in vsec_cap_mask iff
 // space capability supported
-static
-int get_space_support_status(mfile *mf, u_int16_t space)
+static int get_space_support_status(mfile* mf, u_int16_t space)
 {
     int status = mtcr_pciconf_set_addr_space(mf, space) == ME_OK ? 1 : 0;
     mf->vsec_cap_mask |= (status << space_to_cap_offset(space));
     return status;
 }
 
-static
-int mtcr_pciconf_open(mfile *mf, const char *name, u_int32_t adv_opt)
+static int mtcr_pciconf_open(mfile* mf, const char* name, u_int32_t adv_opt)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     mf->fd = -1;
     mf->fd = open(name, O_RDWR | O_SYNC);
-    if (mf->fd < 0) {
+    if (mf->fd < 0)
+    {
         return -1;
     }
 
     mf->tp = MST_PCICONF;
 
-    if ((mf->vsec_addr = pci_find_capability(mf, CAP_ID))) {
+    if ((mf->vsec_addr = pci_find_capability(mf, CAP_ID)))
+    {
         mf->vsec_supp = 1;
         // check if the needed spaces are supported
-        if (adv_opt & Clear_Vsec_Semaphore) {
+        if (adv_opt & Clear_Vsec_Semaphore)
+        {
             mtcr_pciconf_cap9_sem(mf, 0);
         }
-        if (mtcr_pciconf_cap9_sem(mf, 1)) {
+        if (mtcr_pciconf_cap9_sem(mf, 1))
+        {
             close(mf->fd);
             errno = EBUSY;
             return -1;
@@ -1387,15 +1579,18 @@ int mtcr_pciconf_open(mfile *mf, const char *name, u_int32_t adv_opt)
         mtcr_pciconf_cap9_sem(mf, 0);
     }
 
-    if (VSEC_SUPPORTED_UL(mf)) {
+    if (VSEC_SUPPORTED_UL(mf))
+    {
         mf->address_space = AS_CR_SPACE;
         ctx->mread4 = mtcr_pciconf_mread4;
         ctx->mwrite4 = mtcr_pciconf_mwrite4;
         ctx->mread4_block = mread4_block_pciconf;
         ctx->mwrite4_block = mwrite4_block_pciconf;
-    } else {
+    }
+    else
+    {
         ctx->wo_addr = is_wo_pciconf_gw(mf);
-        //printf("Write Only Address: %#x\n", ctx->wo_addr);
+        // printf("Write Only Address: %#x\n", ctx->wo_addr);
         ctx->mread4 = mtcr_pciconf_mread4_old;
         ctx->mwrite4 = mtcr_pciconf_mwrite4_old;
         ctx->mread4_block = mread_chunk_as_multi_mread4;
@@ -1405,8 +1600,7 @@ int mtcr_pciconf_open(mfile *mf, const char *name, u_int32_t adv_opt)
     return 0;
 }
 #else
-static
-int mtcr_pciconf_open(mfile *mf, const char *name, u_int32_t adv_opt)
+static int mtcr_pciconf_open(mfile* mf, const char* name, u_int32_t adv_opt)
 {
     return -1;
 }
@@ -1416,11 +1610,10 @@ int mtcr_pciconf_open(mfile *mf, const char *name, u_int32_t adv_opt)
 // IN-BAND ACCESS FUNCTIONS
 //
 
-static
-int mtcr_inband_open(mfile *mf, const char *name)
+static int mtcr_inband_open(mfile* mf, const char* name)
 {
 #ifndef NO_INBAND
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     mf->tp = MST_IB;
     mf->flags |= MDEVS_IB;
     ctx->mread4 = mib_read4;
@@ -1429,23 +1622,26 @@ int mtcr_inband_open(mfile *mf, const char *name)
     ctx->mwrite4_block = mib_writeblock;
     ctx->maccess_reg = mib_acces_reg_mad;
     ctx->mclose = mib_close;
-    char *p;
-    if ((p = strstr(name, "ibdr-")) != 0 || (p = strstr(name, "iblid-")) != 0 || (p = strstr(name, "lid-")) != 0) {
+    char* p;
+    if ((p = strstr(name, "ibdr-")) != 0 || (p = strstr(name, "iblid-")) != 0 || (p = strstr(name, "lid-")) != 0)
+    {
         return mib_open(p, mf, 0);
-    } else {
+    }
+    else
+    {
         return -1;
     }
 
 #else
-    (void) name;
-    (void) mf;
+    (void)name;
+    (void)mf;
     errno = ENOSYS;
     return -1;
 #endif
 }
 
-static MType mtcr_parse_name(const char *name, int *force, unsigned *domain_p, unsigned *bus_p, unsigned *dev_p,
-                             unsigned *func_p)
+static MType
+  mtcr_parse_name(const char* name, int* force, unsigned* domain_p, unsigned* bus_p, unsigned* dev_p, unsigned* func_p)
 {
     unsigned my_domain = 0;
     unsigned my_bus;
@@ -1462,41 +1658,47 @@ static MType mtcr_parse_name(const char *name, int *force, unsigned *domain_p, u
     unsigned len = strlen(name);
     unsigned tmp;
 
-    if (len >= sizeof config && !strcmp(config, name + len + 1 - sizeof config)) {
+    if (len >= sizeof config && !strcmp(config, name + len + 1 - sizeof config))
+    {
         *force = 1;
         return MST_PCICONF;
     }
 
-    if (len >= sizeof resource0 && !strcmp(resource0, name + len + 1 - sizeof resource0)) {
+    if (len >= sizeof resource0 && !strcmp(resource0, name + len + 1 - sizeof resource0))
+    {
         *force = 1;
         return MST_PCI;
     }
 
-    if (!strncmp(name, "/proc/bus/pci/", sizeof procbuspci - 1)) {
+    if (!strncmp(name, "/proc/bus/pci/", sizeof procbuspci - 1))
+    {
         *force = 1;
         return MST_PCICONF;
     }
 
-    if (sscanf(name, "lid-%x", &tmp) == 1 || sscanf(name, "ibdr-%x", &tmp) == 1 || strstr(name, "lid-") != 0
-        || strstr(name, "ibdr-") != 0) {
+    if (sscanf(name, "lid-%x", &tmp) == 1 || sscanf(name, "ibdr-%x", &tmp) == 1 || strstr(name, "lid-") != 0 ||
+        strstr(name, "ibdr-") != 0)
+    {
         *force = 1;
         return MST_IB;
     }
 
-    if (sscanf(name, "mthca%x", &tmp) == 1 || sscanf(name, "mlx4_%x", &tmp) == 1
-        || sscanf(name, "mlx5_%x", &tmp) == 1) {
+    if (sscanf(name, "mthca%x", &tmp) == 1 || sscanf(name, "mlx4_%x", &tmp) == 1 || sscanf(name, "mlx5_%x", &tmp) == 1)
+    {
         char mbuf[4048] = {0};
         char pbuf[4048] = {0};
-        char *base;
+        char* base;
 
         r = snprintf(mbuf, sizeof(mbuf) - 1, "/sys/class/infiniband/%s/device", name);
-        if (r <= 0 || r >= (int) sizeof mbuf) {
+        if (r <= 0 || r >= (int)sizeof mbuf)
+        {
             fprintf(stderr, "Unable to print device name %s\n", name);
             goto parse_error;
         }
 
         r = readlink(mbuf, pbuf, sizeof(pbuf) - 1);
-        if (r < 0) {
+        if (r < 0)
+        {
             perror("read link");
             fprintf(stderr, "Unable to read link %s\n", mbuf);
             return MST_ERROR;
@@ -1504,39 +1706,46 @@ static MType mtcr_parse_name(const char *name, int *force, unsigned *domain_p, u
         pbuf[r] = '\0';
 
         base = basename(pbuf);
-        if (!base) {
+        if (!base)
+        {
             goto parse_error;
         }
         scnt = sscanf(base, "%x:%x:%x.%x", &my_domain, &my_bus, &my_dev, &my_func);
-        if (scnt != 4) {
+        if (scnt != 4)
+        {
             goto parse_error;
         }
-        if (sscanf(name, "mlx5_%x", &tmp) == 1) {
+        if (sscanf(name, "mlx5_%x", &tmp) == 1)
+        {
             force_config = 1;
         }
         goto name_parsed;
     }
 
     scnt = sscanf(name, "%x:%x.%x", &my_bus, &my_dev, &my_func);
-    if (scnt == 3) {
+    if (scnt == 3)
+    {
         force_config = check_force_config(my_domain, my_bus, my_dev, my_func);
         goto name_parsed;
     }
 
     scnt = sscanf(name, "%x:%x:%x.%x", &my_domain, &my_bus, &my_dev, &my_func);
-    if (scnt == 4) {
+    if (scnt == 4)
+    {
         force_config = check_force_config(my_domain, my_bus, my_dev, my_func);
         goto name_parsed;
     }
 
     scnt = sscanf(name, "pciconf-%x:%x.%x", &my_bus, &my_dev, &my_func);
-    if (scnt == 3) {
+    if (scnt == 3)
+    {
         force_config = 1;
         goto name_parsed;
     }
 
     scnt = sscanf(name, "pciconf-%x:%x:%x.%x", &my_domain, &my_bus, &my_dev, &my_func);
-    if (scnt == 4) {
+    if (scnt == 4)
+    {
         force_config = 1;
         goto name_parsed;
     }
@@ -1554,23 +1763,25 @@ static MType mtcr_parse_name(const char *name, int *force, unsigned *domain_p, u
     *force = 0;
 
     sprintf(driver_conf_name, DRIVER_CONF_NAME, my_domain, my_bus, my_dev, my_func);
-    sprintf(driver_cr_name,   DRIVER_CR_NAME,   my_domain, my_bus, my_dev, my_func);
+    sprintf(driver_cr_name, DRIVER_CR_NAME, my_domain, my_bus, my_dev, my_func);
 
-    if (access(driver_cr_name, F_OK) != -1) {
+    if (access(driver_cr_name, F_OK) != -1)
+    {
         return MST_DRIVER_CR;
     }
 
-    if (access(driver_conf_name, F_OK) != -1) {
+    if (access(driver_conf_name, F_OK) != -1)
+    {
         return MST_DRIVER_CONF;
     }
 
-
 #ifdef __aarch64__
     // on ARM processors MMAP not supported
     (void)force_config;
     return MST_PCICONF;
 #else
-    if (force_config) {
+    if (force_config)
+    {
         return MST_PCICONF;
     }
     return MST_PCI;
@@ -1578,28 +1789,29 @@ static MType mtcr_parse_name(const char *name, int *force, unsigned *domain_p, u
 }
 #endif
 
-int mread4_block_ul(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mread4_block_ul(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     return ctx->mread4_block(mf, offset, data, byte_len);
 }
 
-int mwrite4_block_ul(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mwrite4_block_ul(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     return ctx->mwrite4_block(mf, offset, data, byte_len);
 }
 
-int msw_reset_ul(mfile *mf)
+int msw_reset_ul(mfile* mf)
 {
 #ifndef NO_INBAND
-    switch (mf->tp) {
-    case MST_IB:
-        return mib_swreset(mf);
+    switch (mf->tp)
+    {
+        case MST_IB:
+            return mib_swreset(mf);
 
-    default:
-        errno = EPERM;
-        return -1;
+        default:
+            errno = EPERM;
+            return -1;
     }
 #else
     (void)mf;
@@ -1607,85 +1819,71 @@ int msw_reset_ul(mfile *mf)
 #endif
 }
 
-int mhca_reset_ul(mfile *mf)
+int mhca_reset_ul(mfile* mf)
 {
-    (void) mf;
+    (void)mf;
     errno = ENOTSUP;
     return -1;
 }
 
 static long supported_dev_ids[] = {
-    /* CX2 */
-    0x6340, 0x634a, 0x6368, 0x6372,
-    0x6732, 0x673c, 0x6750, 0x675a,
-    0x676e, 0x6746, 0x6764,
-    /*****/
-    0x1003,     //Connect-X3
-    0x1007,     //Connect-X3Pro
-    0x1011,     //Connect-IB
-    0x1013,     //Connect-X4
-    0x1015,     //Connect-X4Lx
-    0x1017,     //Connect-X5
-    0x1019,     //Connect-X5Ex
-    0x101b,     //Connect-X6
-    0x101d,     //Connect-X6DX
-    0x101f,     //Connect-X6LX
-    0x1021,     //Connect-X7
-    0xc738,     //SwitchX
-    0xcb20,     //Switch-IB
-    0xcb84,     //Spectrum
-    0xcf08,     //Switch-IB2
-    0xd2f0,     //Quantum
-    0xd2f2,     //Quantum2
-    0xcf6c,     //Spectrum2
-    0xa2d2,     //MT416842 Family BlueField integrated ConnectX-5 network controller
-    0xa2d6,     //MT42822 Family BlueField2 integrated ConnectX-6DX network controller
-    0xa2dc,     //MT43244 Family BlueField3 integrated ConnectX-7 network controller
-    0xcf70,     //Spectrum3
-    0xcf80,     //Spectrum4
-    0x1976,     //Schrodinger
-    -1
-};
-
-static long live_fish_id_database[] = {
-    0x191,
-    0x246,
-    0x249,
-    0x24b,
-    0x24d,
-    0x24e,
-    0x1F6,
-    0x1F8,
-    0x1FF,
-    0x247,
-    0x209,
-    0x20b,
-    0x20d,
-    0x20f,
-    0x211,
-    0x214, //BlueField2
-    0x212, //Connect-X6DX
-    0x216, //Connect-X6LX
-    0x218, //Connect-X7
-    0x21C, //BlueField3
-    0x250, //Spectrum3
-    0x254, //Spectrum4
-    0x257, //Quantum2
-    -1
-};
+  /* CX2 */
+  0x6340, 0x634a, 0x6368, 0x6372, 0x6732, 0x673c, 0x6750, 0x675a, 0x676e, 0x6746, 0x6764,
+  /*****/
+  0x1003, // Connect-X3
+  0x1007, // Connect-X3Pro
+  0x1011, // Connect-IB
+  0x1013, // Connect-X4
+  0x1015, // Connect-X4Lx
+  0x1017, // Connect-X5
+  0x1019, // Connect-X5Ex
+  0x101b, // Connect-X6
+  0x101d, // Connect-X6DX
+  0x101f, // Connect-X6LX
+  0x1021, // Connect-X7
+  0xc738, // SwitchX
+  0xcb20, // Switch-IB
+  0xcb84, // Spectrum
+  0xcf08, // Switch-IB2
+  0xd2f0, // Quantum
+  0xd2f2, // Quantum2
+  0xcf6c, // Spectrum2
+  0xa2d2, // MT416842 Family BlueField integrated ConnectX-5 network controller
+  0xa2d6, // MT42822 Family BlueField2 integrated ConnectX-6DX network controller
+  0xa2dc, // MT43244 Family BlueField3 integrated ConnectX-7 network controller
+  0xcf70, // Spectrum3
+  0xcf80, // Spectrum4
+  0x1976, // Schrodinger
+  -1};
+
+static long live_fish_id_database[] = {0x191, 0x246, 0x249, 0x24b, 0x24d, 0x24e, 0x1F6, 0x1F8,
+                                       0x1FF, 0x247, 0x209, 0x20b, 0x20d, 0x20f, 0x211,
+                                       0x214, // BlueField2
+                                       0x212, // Connect-X6DX
+                                       0x216, // Connect-X6LX
+                                       0x218, // Connect-X7
+                                       0x21C, // BlueField3
+                                       0x250, // Spectrum3
+                                       0x254, // Spectrum4
+                                       0x257, // Quantum2
+                                       -1};
 
 int is_supported_devid(long devid)
 {
     int i = 0;
-    while (supported_dev_ids[i] != -1) {
-        if (devid == supported_dev_ids[i]) {
+    while (supported_dev_ids[i] != -1)
+    {
+        if (devid == supported_dev_ids[i])
+        {
             return 1;
         }
         i++;
     }
     i = 0;
-    while (live_fish_id_database[i] != -1) {
-        if (devid == live_fish_id_database[i]) {
+    while (live_fish_id_database[i] != -1)
+    {
+        if (devid == live_fish_id_database[i])
+        {
             return 1;
         }
         i++;
@@ -1693,20 +1891,21 @@ int is_supported_devid(long devid)
     return 0;
 }
 
-int is_supported_device(char *devname)
+int is_supported_device(char* devname)
 {
-
     char fname[64] = {0};
     char inbuf[64] = {0};
-    FILE *f;
+    FILE* f;
     int ret_val = 0;
     snprintf(fname, sizeof(fname) - 1, "/sys/bus/pci/devices/%s/device", devname);
     f = fopen(fname, "r");
-    if (f == NULL) {
-        //printf("-D- Could not open file: %s\n", fname);
+    if (f == NULL)
+    {
+        // printf("-D- Could not open file: %s\n", fname);
         return 1;
     }
-    if (fgets(inbuf, sizeof(inbuf), f)) {
+    if (fgets(inbuf, sizeof(inbuf), f))
+    {
         long devid = strtol(inbuf, NULL, 0);
         ret_val = is_supported_devid(devid);
     }
@@ -1714,26 +1913,26 @@ int is_supported_device(char *devname)
     return ret_val;
 }
 
-int mdevices_ul(char *buf, int len, int mask)
+int mdevices_ul(char* buf, int len, int mask)
 {
     return mdevices_v_ul(buf, len, mask, 0);
 }
 
-int mdevices_v_ul(char *buf, int len, int mask, int verbosity)
+int mdevices_v_ul(char* buf, int len, int mask, int verbosity)
 {
+#define MDEVS_TAVOR_CR 0x20
+#define MLNX_PCI_VENDOR_ID 0x15b3
 
-#define MDEVS_TAVOR_CR  0x20
-#define MLNX_PCI_VENDOR_ID  0x15b3
-
-    FILE *f;
-    DIR *d;
-    struct dirent *dir;
+    FILE* f;
+    DIR* d;
+    struct dirent* dir;
     int pos = 0;
     int sz;
     int rsz;
     int ndevs = 0;
 
-    if (!(mask & MDEVS_TAVOR_CR)) {
+    if (!(mask & MDEVS_TAVOR_CR))
+    {
         return 0;
     }
 
@@ -1741,38 +1940,49 @@ int mdevices_v_ul(char *buf, int len, int mask, int verbosity)
     char fname[64] = {0};
 
     d = opendir("/sys/bus/pci/devices");
-    if (d == NULL) {
+    if (d == NULL)
+    {
         return -2;
     }
 
-    while ((dir = readdir(d)) != NULL) {
-        if (dir->d_name[0] == '.') {
+    while ((dir = readdir(d)) != NULL)
+    {
+        if (dir->d_name[0] == '.')
+        {
             continue;
         }
         sz = strlen(dir->d_name);
-        if (sz > 2 && strcmp(dir->d_name + sz - 2, ".0") && !verbosity) {
+        if (sz > 2 && strcmp(dir->d_name + sz - 2, ".0") && !verbosity)
+        {
             continue;
-        } else if (sz > 4 && strcmp(dir->d_name + sz - 4, "00.0") && !verbosity) {
+        }
+        else if (sz > 4 && strcmp(dir->d_name + sz - 4, "00.0") && !verbosity)
+        {
             // Skip virtual functions
             char physfn[64] = {0};
-            DIR *physfndir;
+            DIR* physfndir;
             snprintf(physfn, sizeof(physfn) - 1, "/sys/bus/pci/devices/%.34s/physfn", dir->d_name);
-            if ((physfndir = opendir(physfn)) != NULL) {
+            if ((physfndir = opendir(physfn)) != NULL)
+            {
                 closedir(physfndir);
                 continue;
             }
         }
         snprintf(fname, sizeof(fname) - 1, "/sys/bus/pci/devices/%.34s/vendor", dir->d_name);
         f = fopen(fname, "r");
-        if (f == NULL) {
+        if (f == NULL)
+        {
             ndevs = -2;
             goto cleanup_dir_opened;
         }
-        if (fgets(inbuf, sizeof(inbuf), f)) {
+        if (fgets(inbuf, sizeof(inbuf), f))
+        {
             long venid = strtoul(inbuf, NULL, 0);
-            if (venid == MLNX_PCI_VENDOR_ID && is_supported_device(dir->d_name)) {
-                rsz = sz + 1; //dev name size + place for Null char
-                if ((pos + rsz) > len) {
+            if (venid == MLNX_PCI_VENDOR_ID && is_supported_device(dir->d_name))
+            {
+                rsz = sz + 1; // dev name size + place for Null char
+                if ((pos + rsz) > len)
+                {
                     ndevs = -1;
                     goto cleanup_file_opened;
                 }
@@ -1794,18 +2004,19 @@ int mdevices_v_ul(char *buf, int len, int mask, int verbosity)
     return ndevs;
 }
 
-static
-int read_pci_config_header(u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_t func, u_int8_t data[0x40])
+static int read_pci_config_header(u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_t func, u_int8_t data[0x40])
 {
     char proc_dev[64];
     sprintf(proc_dev, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/config", domain, bus, dev, func);
-    FILE *f = fopen(proc_dev, "r");
-    if (!f) {
-        //fprintf(stderr, "Failed to open (%s) for reading: %s\n", proc_dev, strerror(errno));
+    FILE* f = fopen(proc_dev, "r");
+    if (!f)
+    {
+        // fprintf(stderr, "Failed to open (%s) for reading: %s\n", proc_dev, strerror(errno));
         return 1;
     }
     setvbuf(f, NULL, _IONBF, 0);
-    if (fread(data, 0x40, 1, f) != 1) {
+    if (fread(data, 0x40, 1, f) != 1)
+    {
         fprintf(stderr, "Failed to read from (%s): %s\n", proc_dev, strerror(errno));
         fclose(f);
         return 1;
@@ -1818,12 +2029,14 @@ int read_pci_config_header(u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_
 int check_force_config(unsigned my_domain, unsigned my_bus, unsigned my_dev, unsigned my_func)
 {
     u_int8_t conf_header[0x40];
-    u_int32_t *conf_header_32p = (u_int32_t*) conf_header;
-    if (read_pci_config_header(my_domain, my_bus, my_dev, my_func, conf_header)) {
+    u_int32_t* conf_header_32p = (u_int32_t*)conf_header;
+    if (read_pci_config_header(my_domain, my_bus, my_dev, my_func, conf_header))
+    {
         return 0;
     }
     u_int32_t devid = __le32_to_cpu(conf_header_32p[0]) >> 16;
-    if (devid == CX3PRO_SW_ID || devid == CX3_SW_ID) {
+    if (devid == CX3PRO_SW_ID || devid == CX3_SW_ID)
+    {
         return 0;
     }
     return 1;
@@ -1833,52 +2046,63 @@ int check_force_config(unsigned my_domain, unsigned my_bus, unsigned my_dev, uns
 
 static char** get_ib_net_devs(int domain, int bus, int dev, int func, int ib_eth_)
 {
-    char **ib_net_devs = NULL;
+    char** ib_net_devs = NULL;
     int i;
     int count = 0;
     int plan_b = 0;
-    DIR           *dir;
-    struct dirent *dirent;
-    char **ib_net_devs_r;
+    DIR* dir;
+    struct dirent* dirent;
+    char** ib_net_devs_r;
     char sysfs_path[256];
 
-    if (ib_eth_) {
+    if (ib_eth_)
+    {
         sprintf(sysfs_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/infiniband", domain, bus, dev, func);
-    } else {
+    }
+    else
+    {
         sprintf(sysfs_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/net", domain, bus, dev, func);
     }
 
-    if ((dir = opendir(sysfs_path)) == NULL) {
+    if ((dir = opendir(sysfs_path)) == NULL)
+    {
         sprintf(sysfs_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x", domain, bus, dev, func);
-        if ((dir = opendir(sysfs_path)) == NULL) {
+        if ((dir = opendir(sysfs_path)) == NULL)
+        {
             return NULL;
         }
         plan_b = 1;
     }
-    while ((dirent = readdir(dir)) != NULL) {
-        char *name = dirent->d_name;
-        if (!strcmp(name, ".") || !strcmp(name, "..")) {
+    while ((dirent = readdir(dir)) != NULL)
+    {
+        char* name = dirent->d_name;
+        if (!strcmp(name, ".") || !strcmp(name, ".."))
+        {
             continue;
         }
-        if (plan_b) {
-            char *p = NULL;
-            char *devs_inf = ib_eth_ ? IB_INF : ETH_INF;
+        if (plan_b)
+        {
+            char* p = NULL;
+            char* devs_inf = ib_eth_ ? IB_INF : ETH_INF;
             p = strstr(name, devs_inf);
-            if (!p) {
+            if (!p)
+            {
                 continue;
             }
             name = p + strlen(devs_inf);
         }
         count++;
         ib_net_devs_r = (char**)realloc(ib_net_devs, (count + 1) * sizeof(char*));
-        if (!ib_net_devs_r) {
+        if (!ib_net_devs_r)
+        {
             closedir(dir);
             goto mem_error;
         }
         ib_net_devs = ib_net_devs_r;
 
         ib_net_devs[count - 1] = (char*)malloc(strlen(name) + 1);
-        if (!ib_net_devs[count - 1]) {
+        if (!ib_net_devs[count - 1])
+        {
             closedir(dir);
             goto mem_error;
         }
@@ -1892,9 +2116,12 @@ static char** get_ib_net_devs(int domain, int bus, int dev, int func, int ib_eth
 
 mem_error:
     fprintf(stderr, "Memory allocation failure for ib/net devices\n");
-    if (ib_net_devs) {
-        for (i = 0; i < count; i++) {
-            if (ib_net_devs[i]) {
+    if (ib_net_devs)
+    {
+        for (i = 0; i < count; i++)
+        {
+            if (ib_net_devs[i])
+            {
                 free(ib_net_devs[i]);
             }
         }
@@ -1905,28 +2132,30 @@ static char** get_ib_net_devs(int domain, int bus, int dev, int func, int ib_eth
     return NULL;
 }
 
-static int get_vf_devs(int domain, int bus, int dev, int func, char *buf,
-                       int len)
+static int get_vf_devs(int domain, int bus, int dev, int func, char* buf, int len)
 {
     int count = 0;
-    DIR *physfndir;
-    struct dirent *_dirent;
+    DIR* physfndir;
+    struct dirent* _dirent;
     char sysfs_path[256];
     int pos = 0;
 
-    sprintf(sysfs_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x",
-            domain, bus, dev, func);
-    if ((physfndir = opendir(sysfs_path)) == NULL) {
+    sprintf(sysfs_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x", domain, bus, dev, func);
+    if ((physfndir = opendir(sysfs_path)) == NULL)
+    {
         return count;
     }
-    while ((_dirent = readdir(physfndir)) != NULL) {
-        char *name = _dirent->d_name;
+    while ((_dirent = readdir(physfndir)) != NULL)
+    {
+        char* name = _dirent->d_name;
         int sz = 0;
-        if (strstr(name, "virtfn") != name) {
+        if (strstr(name, "virtfn") != name)
+        {
             continue;
         }
         sz = strlen(name) + 1;
-        if ((pos + sz) > len) {
+        if ((pos + sz) > len)
+        {
             count = -1;
             closedir(physfndir);
             return count;
@@ -1941,8 +2170,7 @@ static int get_vf_devs(int domain, int bus, int dev, int func, char *buf,
 
 #define VIRTFN_LINK_NAME_SIZE 128
 #define VIRTFN_PATH_SIZE 128
-static void read_vf_info(vf_info *virtfn_info, u_int16_t domain, u_int8_t bus,
-                         u_int8_t dev, u_int8_t func, char *virtfn)
+static void read_vf_info(vf_info* virtfn_info, u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_t func, char* virtfn)
 {
     char linkname[VIRTFN_LINK_NAME_SIZE];
     char virtfn_path[VIRTFN_PATH_SIZE];
@@ -1954,20 +2182,17 @@ static void read_vf_info(vf_info *virtfn_info, u_int16_t domain, u_int8_t bus,
     unsigned vf_func = 0;
     int force;
 
-    sprintf(virtfn_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/%s",
-            domain, bus, dev, func, virtfn);
-
+    sprintf(virtfn_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/%s", domain, bus, dev, func, virtfn);
 
     link_size = readlink(virtfn_path, linkname, VIRTFN_LINK_NAME_SIZE - 1);
-    if (link_size < 0) {
+    if (link_size < 0)
+    {
         return;
     }
     linkname[link_size] = '\0';
-    strncpy(virtfn_info->dev_name, basename(linkname),
-            sizeof(virtfn_info->dev_name) - 1);
+    strncpy(virtfn_info->dev_name, basename(linkname), sizeof(virtfn_info->dev_name) - 1);
 
-    dev_type = mtcr_parse_name(virtfn_info->dev_name, &force, &vf_domain,
-                               &vf_bus, &vf_dev, &vf_func);
+    dev_type = mtcr_parse_name(virtfn_info->dev_name, &force, &vf_domain, &vf_bus, &vf_dev, &vf_func);
     (void)dev_type;
 
     virtfn_info->domain = vf_domain;
@@ -1979,48 +2204,55 @@ static void read_vf_info(vf_info *virtfn_info, u_int16_t domain, u_int8_t bus,
     virtfn_info->net_devs = get_ib_net_devs(vf_domain, vf_bus, vf_dev, vf_func, 0);
 }
 
-vf_info* get_vf_info(u_int16_t domain, u_int8_t bus, u_int8_t dev,
-                     u_int8_t func, u_int16_t *len)
+vf_info* get_vf_info(u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_t func, u_int16_t* len)
 {
     int vf_count = 0;
-    char *vf_devs = NULL;
-    vf_info *vf_arr = NULL;
-    char *virtfn;
+    char* vf_devs = NULL;
+    vf_info* vf_arr = NULL;
+    char* virtfn;
     int i;
     int size = 2048;
 
     // Get list of devices
-    do {
-        if (vf_devs) {
+    do
+    {
+        if (vf_devs)
+        {
             free(vf_devs);
         }
         size *= 2;
-        vf_devs = (char*) malloc(size);
-        if (!vf_devs) {
+        vf_devs = (char*)malloc(size);
+        if (!vf_devs)
+        {
             return NULL;
         }
         vf_count = get_vf_devs(domain, bus, dev, func, vf_devs, size);
     } while (vf_count == -1);
 
-    if (vf_count <= 0) {
+    if (vf_count <= 0)
+    {
         *len = 0;
-        if (vf_devs) {
+        if (vf_devs)
+        {
             free(vf_devs);
         }
         return NULL;
     }
     *len = vf_count;
     virtfn = vf_devs;
-    vf_arr = (vf_info*) malloc(sizeof(vf_info) * vf_count);
-    if (!vf_arr) {
-        if (vf_devs) {
+    vf_arr = (vf_info*)malloc(sizeof(vf_info) * vf_count);
+    if (!vf_arr)
+    {
+        if (vf_devs)
+        {
             free(vf_devs);
         }
         return NULL;
     }
     memset(vf_arr, 0, sizeof(vf_info) * vf_count);
 
-    for (i = 0; i < vf_count; i++) {
+    for (i = 0; i < vf_count; i++)
+    {
         read_vf_info(&vf_arr[i], domain, bus, dev, func, virtfn);
         virtfn += strlen(virtfn) + 1;
     }
@@ -2029,85 +2261,96 @@ vf_info* get_vf_info(u_int16_t domain, u_int8_t bus, u_int8_t dev,
     return vf_arr;
 }
 
-static void get_numa_node(u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_t func, char *data)
+static void get_numa_node(u_int16_t domain, u_int8_t bus, u_int8_t dev, u_int8_t func, char* data)
 {
     char numa_path[64];
     int c;
     int i = 0;
     sprintf(numa_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/numa_node", domain, bus, dev, func);
-    FILE *f = fopen(numa_path, "rb");
-    if (!f) {
+    FILE* f = fopen(numa_path, "rb");
+    if (!f)
+    {
         strcpy(data, "NA");
         return;
     }
 
-    while ((c = getc(f)) != EOF && c != '\n') {
+    while ((c = getc(f)) != EOF && c != '\n')
+    {
         data[i++] = c;
     }
     data[i] = '\0';
     fclose(f);
 }
 
-dev_info* mdevices_info_ul(int mask, int *len)
+dev_info* mdevices_info_ul(int mask, int* len)
 {
     return mdevices_info_v_ul(mask, len, 0);
 }
 
-dev_info* mdevices_info_v_ul(int mask, int *len, int verbosity)
+dev_info* mdevices_info_v_ul(int mask, int* len, int verbosity)
 {
-    char *devs = 0;
-    char *dev_name;
+    char* devs = 0;
+    char* dev_name;
     int size = 2048;
     int rc;
     int i;
 
     // Get list of devices
-    do {
-        if (devs) {
+    do
+    {
+        if (devs)
+        {
             free(devs);
         }
         size *= 2;
-        devs = (char*) malloc(size);
-        if (!devs) {
+        devs = (char*)malloc(size);
+        if (!devs)
+        {
             return NULL;
         }
         rc = mdevices_v_ul(devs, size, mask, verbosity);
     } while (rc == -1);
 
-    if (rc <= 0) {
+    if (rc <= 0)
+    {
         *len = 0;
-        if (devs) {
+        if (devs)
+        {
             free(devs);
         }
         return NULL;
     }
     // For each device read
-    dev_info *dev_info_arr = (dev_info*) malloc(sizeof(dev_info) * rc);
-    if (!dev_info_arr) {
-        if (devs) {
+    dev_info* dev_info_arr = (dev_info*)malloc(sizeof(dev_info) * rc);
+    if (!dev_info_arr)
+    {
+        if (devs)
+        {
             free(devs);
         }
         return NULL;
     }
     memset(dev_info_arr, 0, sizeof(dev_info) * rc);
     dev_name = devs;
-    for (i = 0; i < rc; i++) {
+    for (i = 0; i < rc; i++)
+    {
         int domain = 0;
         int bus = 0;
         int dev = 0;
         int func = 0;
 
         dev_info_arr[i].ul_mode = 1;
-        dev_info_arr[i].type = (Mdevs) MDEVS_TAVOR_CR;
+        dev_info_arr[i].type = (Mdevs)MDEVS_TAVOR_CR;
         u_int8_t conf_header[0x40];
-        u_int32_t *conf_header_32p = (u_int32_t*) conf_header;
+        u_int32_t* conf_header_32p = (u_int32_t*)conf_header;
 
         // update default device name
         strncpy(dev_info_arr[i].dev_name, dev_name, sizeof(dev_info_arr[i].dev_name) - 1);
         strncpy(dev_info_arr[i].pci.cr_dev, dev_name, sizeof(dev_info_arr[i].pci.cr_dev) - 1);
 
         // update dbdf
-        if (sscanf(dev_name, "%x:%x:%x.%x", &domain, &bus, &dev, &func) != 4) {
+        if (sscanf(dev_name, "%x:%x:%x.%x", &domain, &bus, &dev, &func) != 4)
+        {
             rc = -1;
             len = 0;
             free(dev_info_arr);
@@ -2123,16 +2366,15 @@ dev_info* mdevices_info_v_ul(int mask, int *len, int verbosity)
         snprintf(dev_info_arr[i].pci.conf_dev, sizeof(dev_info_arr[i].pci.conf_dev) - 1,
                  "/sys/bus/pci/devices/%04x:%02x:%02x.%x/config", domain, bus, dev, func);
 
-
         // Get attached infiniband devices
-        dev_info_arr[i].pci.ib_devs  = get_ib_net_devs(domain, bus, dev, func, 1);
+        dev_info_arr[i].pci.ib_devs = get_ib_net_devs(domain, bus, dev, func, 1);
         dev_info_arr[i].pci.net_devs = get_ib_net_devs(domain, bus, dev, func, 0);
         get_numa_node(domain, bus, dev, func, (char*)(dev_info_arr[i].pci.numa_node));
-        dev_info_arr[i].pci.virtfn_arr = get_vf_info(domain, bus, dev, func,
-                                                     &(dev_info_arr[i].pci.virtfn_count));
+        dev_info_arr[i].pci.virtfn_arr = get_vf_info(domain, bus, dev, func, &(dev_info_arr[i].pci.virtfn_count));
 
         // read configuration space header
-        if (read_pci_config_header(domain, bus, dev, func, conf_header)) {
+        if (read_pci_config_header(domain, bus, dev, func, conf_header))
+        {
             goto next;
         }
 
@@ -2142,9 +2384,7 @@ dev_info* mdevices_info_v_ul(int mask, int *len, int verbosity)
         dev_info_arr[i].pci.subsys_id = __le32_to_cpu(conf_header_32p[11]) >> 16;
         dev_info_arr[i].pci.subsys_vend_id = __le32_to_cpu(conf_header_32p[11]) & 0xffff;
 
-
-
-next:
+    next:
         dev_name += strlen(dev_name) + 1;
     }
 
@@ -2153,26 +2393,32 @@ dev_info* mdevices_info_v_ul(int mask, int *len, int verbosity)
     return dev_info_arr;
 }
 
-static void destroy_ib_net_devs(char **devs)
+static void destroy_ib_net_devs(char** devs)
 {
     int j;
-    for (j = 0; devs[j]; j++) {
-        if (devs[j]) {
+    for (j = 0; devs[j]; j++)
+    {
+        if (devs[j])
+        {
             free(devs[j]);
         }
     }
     free(devs);
 }
 
-static void destroy_vf_devs(vf_info *vf_info_arr, int len)
+static void destroy_vf_devs(vf_info* vf_info_arr, int len)
 {
     int i;
-    if (vf_info_arr) {
-        for (i = 0; i < len; i++) {
-            if (vf_info_arr[i].ib_devs) {
+    if (vf_info_arr)
+    {
+        for (i = 0; i < len; i++)
+        {
+            if (vf_info_arr[i].ib_devs)
+            {
                 destroy_ib_net_devs(vf_info_arr[i].ib_devs);
             }
-            if (vf_info_arr[i].net_devs) {
+            if (vf_info_arr[i].net_devs)
+            {
                 destroy_ib_net_devs(vf_info_arr[i].net_devs);
             }
         }
@@ -2180,23 +2426,24 @@ static void destroy_vf_devs(vf_info *vf_info_arr, int len)
     }
 }
 
-void mdevices_info_destroy_ul(dev_info *dev_info, int len)
+void mdevices_info_destroy_ul(dev_info* dev_info, int len)
 {
     int i;
-    if (dev_info) {
-        for (i = 0; i < len; i++) {
-            if (dev_info[i].type == MDEVS_TAVOR_CR &&
-                dev_info[i].pci.ib_devs) {
+    if (dev_info)
+    {
+        for (i = 0; i < len; i++)
+        {
+            if (dev_info[i].type == MDEVS_TAVOR_CR && dev_info[i].pci.ib_devs)
+            {
                 destroy_ib_net_devs(dev_info[i].pci.ib_devs);
             }
-            if (dev_info[i].type == MDEVS_TAVOR_CR &&
-                dev_info[i].pci.net_devs) {
+            if (dev_info[i].type == MDEVS_TAVOR_CR && dev_info[i].pci.net_devs)
+            {
                 destroy_ib_net_devs(dev_info[i].pci.net_devs);
             }
-            if (dev_info[i].type == MDEVS_TAVOR_CR &&
-                dev_info[i].pci.virtfn_arr) {
-                destroy_vf_devs(dev_info[i].pci.virtfn_arr,
-                                dev_info[i].pci.virtfn_count);
+            if (dev_info[i].type == MDEVS_TAVOR_CR && dev_info[i].pci.virtfn_arr)
+            {
+                destroy_vf_devs(dev_info[i].pci.virtfn_arr, dev_info[i].pci.virtfn_count);
             }
         }
         free(dev_info);
@@ -2208,24 +2455,29 @@ void mdevices_info_destroy_ul(dev_info *dev_info, int len)
  * and vice versa
  */
 
-extern void mpci_change(mfile *mf)
+extern void mpci_change(mfile* mf)
 {
     mf->mpci_change(mf);
     return;
 }
 
-void mpci_change_ul(mfile *mf)
+void mpci_change_ul(mfile* mf)
 {
-    if (mf->res_tp == MST_PCICONF) {
+    if (mf->res_tp == MST_PCICONF)
+    {
         mf->res_tp = MST_PCI;
         mf->tp = MST_PCICONF;
-    } else if (mf->res_tp == MST_PCI) {
+    }
+    else if (mf->res_tp == MST_PCI)
+    {
         mf->res_tp = MST_PCICONF;
         mf->tp = MST_PCI;
-    } else {
+    }
+    else
+    {
         return;
     }
-    ul_ctx_t *ctx = mf->ul_ctx;
+    ul_ctx_t* ctx = mf->ul_ctx;
     /***** Switching READ WRITE FUNCS ******/
     f_mread4 tmp_mread4 = ctx->mread4;
     ctx->mread4 = ctx->res_mread4;
@@ -2253,9 +2505,9 @@ void mpci_change_ul(mfile *mf)
     mf->res_fd = fd;
 }
 
-mfile* mopen_ul_int(const char *name, u_int32_t adv_opt)
+mfile* mopen_ul_int(const char* name, u_int32_t adv_opt)
 {
-    mfile *mf;
+    mfile* mf;
     off_t offset;
     unsigned domain = 0, bus = 0, dev = 0, func = 0;
     MType dev_type;
@@ -2268,27 +2520,31 @@ mfile* mopen_ul_int(const char *name, u_int32_t adv_opt)
     int err;
     int rc;
 
-    if (geteuid() != 0) {
+    if (geteuid() != 0)
+    {
         errno = EACCES;
         return NULL;
     }
-    mf = (mfile*) malloc(sizeof(mfile));
-    if (!mf) {
+    mf = (mfile*)malloc(sizeof(mfile));
+    if (!mf)
+    {
         return NULL;
     }
     memset(mf, 0, sizeof(mfile));
     mf->ul_ctx = malloc(sizeof(ul_ctx_t));
-    if (!(mf->ul_ctx)) {
+    if (!(mf->ul_ctx))
+    {
         goto open_failed;
     }
     memset(mf->ul_ctx, 0, sizeof(ul_ctx_t));
 
-   // Initialize the user page list.
+    // Initialize the user page list.
     mf->user_page_list.page_list = NULL;
     mf->user_page_list.page_amount = 0;
 
     mf->dev_name = strdup(name);
-    if (!mf->dev_name) {
+    if (!mf->dev_name)
+    {
         goto open_failed;
     }
     mf->sock = -1; // we are not opening remotely
@@ -2296,128 +2552,158 @@ mfile* mopen_ul_int(const char *name, u_int32_t adv_opt)
     mf->res_fd = -1;
     mf->mpci_change = mpci_change_ul;
     dev_type = mtcr_parse_name(name, &force, &domain, &bus, &dev, &func);
-    if (dev_type == MST_DRIVER_CR || dev_type == MST_DRIVER_CONF) {
+    if (dev_type == MST_DRIVER_CR || dev_type == MST_DRIVER_CONF)
+    {
         rc = mtcr_driver_open(mf, dev_type, domain, bus, dev, func);
-        if (rc) {
+        if (rc)
+        {
             goto open_failed;
         }
         return mf;
     }
-    if (dev_type == MST_ERROR) {
+    if (dev_type == MST_ERROR)
+    {
         goto open_failed;
     }
     mf->tp = dev_type;
     mf->flags = MDEVS_TAVOR_CR;
-    if (dev_type == MST_PCICONF || dev_type == MST_PCI) {
+    if (dev_type == MST_PCICONF || dev_type == MST_PCI)
+    {
         // allocate lock to sync between parallel cr space requests (CONF/MEMORY only)
-        if (force) {
+        if (force)
+        {
             // need to extract the dbdf format from the full name
-            if (_extract_dbdf_from_full_name(name, &domain, &bus, &dev, &func)) {
+            if (_extract_dbdf_from_full_name(name, &domain, &bus, &dev, &func))
+            {
                 goto open_failed;
             }
         }
-        if (_create_lock(mf, domain, bus, dev, func)) {
+        if (_create_lock(mf, domain, bus, dev, func))
+        {
             goto open_failed;
         }
 
         sprintf(pcidev, "%4.4x:%2.2x:%2.2x.%1.1x", domain, bus, dev, func);
-        if (!is_supported_device(pcidev)) {
+        if (!is_supported_device(pcidev))
+        {
             errno = ENOTSUP;
             goto open_failed;
         }
 
-        if (init_dev_info_ul(mf, name, domain, bus, dev, func)) {
+        if (init_dev_info_ul(mf, name, domain, bus, dev, func))
+        {
             goto open_failed;
         }
     }
 
     sprintf(cbuf, "/sys/bus/pci/devices/%4.4x:%2.2x:%2.2x.%1.1x/config", domain, bus, dev, func);
 
-    if (force) {
-        switch (dev_type) {
-        case MST_PCICONF:
-            rc = mtcr_pciconf_open(mf, name, adv_opt);
-            break;
+    if (force)
+    {
+        switch (dev_type)
+        {
+            case MST_PCICONF:
+                rc = mtcr_pciconf_open(mf, name, adv_opt);
+                break;
 
-        case MST_PCI:
-            rc = mtcr_pcicr_open(mf, name, cbuf, 0, 0, adv_opt);
-            break;
+            case MST_PCI:
+                rc = mtcr_pcicr_open(mf, name, cbuf, 0, 0, adv_opt);
+                break;
 
-        case MST_IB:
-            rc = mtcr_inband_open(mf, name);
-            break;
+            case MST_IB:
+                rc = mtcr_inband_open(mf, name);
+                break;
 
-        default:
-            goto open_failed;
+            default:
+                goto open_failed;
         }
 
-        if (0 == rc) {
+        if (0 == rc)
+        {
             return mf;
         }
         goto open_failed;
     }
 
-    if (dev_type == MST_PCICONF) {
+    if (dev_type == MST_PCICONF)
+    {
         goto access_config_forced;
     }
 
     sprintf(rbuf, "/sys/bus/pci/devices/%4.4x:%2.2x:%2.2x.%1.1x/resource0", domain, bus, dev, func);
 
     rc = mtcr_pcicr_open(mf, rbuf, cbuf, 0, 0, adv_opt);
-    if (rc == 0) {
+    if (rc == 0)
+    {
         return mf;
-    } else if (rc == 1) {
+    }
+    else if (rc == 1)
+    {
         goto access_config_forced;
     }
 
     /* Following access methods need the resource BAR */
     offset = mtcr_sysfs_get_offset(domain, bus, dev, func);
-    if (offset == -1 && !domain) {
+    if (offset == -1 && !domain)
+    {
         offset = mtcr_procfs_get_offset(bus, dev, func);
     }
-    if (offset == -1) {
+    if (offset == -1)
+    {
         goto access_config_forced;
     }
 
     sprintf(pdbuf, "/proc/bus/pci/%4.4x:%2.2x/%2.2x.%1.1x", domain, bus, dev, func);
     rc = mtcr_pcicr_open(mf, pdbuf, cbuf, offset, 1, adv_opt);
-    if (rc == 0) {
+    if (rc == 0)
+    {
         return mf;
-    } else if (rc == 1) {
+    }
+    else if (rc == 1)
+    {
         goto access_config_forced;
     }
 
-    if (!domain) {
+    if (!domain)
+    {
         sprintf(pbuf, "/proc/bus/pci/%2.2x/%2.2x.%1.1x", bus, dev, func);
         rc = mtcr_pcicr_open(mf, pbuf, cbuf, offset, 1, adv_opt);
-        if (rc == 0) {
+        if (rc == 0)
+        {
             return mf;
-        } else if (rc == 1) {
+        }
+        else if (rc == 1)
+        {
             goto access_config_forced;
         }
     }
 
 #if CONFIG_USE_DEV_MEM
     /* Non-portable, but helps some systems */
-    if (!mtcr_pcicr_open(mf, "/dev/mem", cbuf, offset, 0, adv_opt)) {
+    if (!mtcr_pcicr_open(mf, "/dev/mem", cbuf, offset, 0, adv_opt))
+    {
         return mf;
     }
 #endif
 
 access_config_forced:
     sprintf(cbuf, "/sys/bus/pci/devices/%4.4x:%2.2x:%2.2x.%1.1x/config", domain, bus, dev, func);
-    if (!mtcr_pciconf_open(mf, cbuf, adv_opt)) {
+    if (!mtcr_pciconf_open(mf, cbuf, adv_opt))
+    {
         return mf;
     }
 
     sprintf(pdbuf, "/proc/bus/pci/%4.4x:%2.2x/%2.2x.%1.1x", domain, bus, dev, func);
-    if (!mtcr_pciconf_open(mf, pdbuf, adv_opt)) {
+    if (!mtcr_pciconf_open(mf, pdbuf, adv_opt))
+    {
         return mf;
     }
 
-    if (!domain) {
+    if (!domain)
+    {
         sprintf(pbuf, "/proc/bus/pci/%2.2x/%2.2x.%1.1x", bus, dev, func);
-        if (!mtcr_pciconf_open(mf, pdbuf, adv_opt)) {
+        if (!mtcr_pciconf_open(mf, pdbuf, adv_opt))
+        {
             return mf;
         }
     }
@@ -2429,28 +2715,29 @@ mfile* mopen_ul_int(const char *name, u_int32_t adv_opt)
     return NULL;
 }
 
-int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned bus, unsigned dev, unsigned func)
+int init_dev_info_ul(mfile* mf, const char* dev_name, unsigned domain, unsigned bus, unsigned dev, unsigned func)
 {
     int i;
     int devs_len;
     int ret = 0;
-    dev_info *devs = mdevices_info_v_ul(0xffffffff, &devs_len, 1);
-    for (i = 0; i < devs_len; i++) {
-        if (devs[i].pci.domain == domain &&
-            devs[i].pci.bus == bus &&
-            devs[i].pci.dev == dev &&
-            devs[i].pci.func == func) {
+    dev_info* devs = mdevices_info_v_ul(0xffffffff, &devs_len, 1);
+    for (i = 0; i < devs_len; i++)
+    {
+        if (devs[i].pci.domain == domain && devs[i].pci.bus == bus && devs[i].pci.dev == dev && devs[i].pci.func == func)
+        {
             break;
         }
     }
 
-    if (i == devs_len) {
+    if (i == devs_len)
+    {
         ret = 1;
         goto cleanup;
     }
 
     mf->dinfo = malloc(sizeof(*mf->dinfo));
-    if (!mf->dinfo) {
+    if (!mf->dinfo)
+    {
         errno = ENOMEM;
         ret = 2;
         goto cleanup;
@@ -2458,44 +2745,53 @@ int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned
 
     memcpy(mf->dinfo, &devs[i], sizeof(*mf->dinfo));
     strncpy(mf->dinfo->dev_name, dev_name, sizeof(mf->dinfo->dev_name) / sizeof(mf->dinfo->dev_name[0]) - 1);
-    if (mf->dinfo->type == MDEVS_TAVOR_CR) {
-        if (devs[i].pci.ib_devs) {
+    if (mf->dinfo->type == MDEVS_TAVOR_CR)
+    {
+        if (devs[i].pci.ib_devs)
+        {
             // count ib devs
             int j;
-            char **curr = devs[i].pci.ib_devs;
+            char** curr = devs[i].pci.ib_devs;
             int cnt = 0;
-            while (*(curr++)) {
+            while (*(curr++))
+            {
                 cnt++;
             }
 
             mf->dinfo->pci.ib_devs = malloc((cnt + 1) * sizeof(char*));
-            if (!mf->dinfo->pci.ib_devs) {
+            if (!mf->dinfo->pci.ib_devs)
+            {
                 errno = ENOMEM;
                 free(mf->dinfo);
                 ret = 3;
                 goto cleanup;
             }
 
-            for (j = 0; j < cnt; j++) {
+            for (j = 0; j < cnt; j++)
+            {
                 mf->dinfo->pci.ib_devs[j] = malloc(strlen(devs[i].pci.ib_devs[j]) + 1);
                 strcpy(mf->dinfo->pci.ib_devs[j], devs[i].pci.ib_devs[j]);
             }
             mf->dinfo->pci.ib_devs[cnt] = NULL;
         }
 
-        if (devs[i].pci.net_devs) {
+        if (devs[i].pci.net_devs)
+        {
             // count net devs
             int j;
-            char **curr = devs[i].pci.net_devs;
+            char** curr = devs[i].pci.net_devs;
             int cnt = 0;
-            while (*(curr++)) {
+            while (*(curr++))
+            {
                 cnt++;
             }
 
             mf->dinfo->pci.net_devs = malloc((cnt + 1) * sizeof(char*));
-            if (!mf->dinfo->pci.net_devs) {
+            if (!mf->dinfo->pci.net_devs)
+            {
                 errno = ENOMEM;
-                if (mf->dinfo->pci.ib_devs) {
+                if (mf->dinfo->pci.ib_devs)
+                {
                     free(mf->dinfo->pci.ib_devs);
                 }
                 free(mf->dinfo);
@@ -2503,7 +2799,8 @@ int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned
                 goto cleanup;
             }
 
-            for (j = 0; j < cnt; j++) {
+            for (j = 0; j < cnt; j++)
+            {
                 mf->dinfo->pci.net_devs[j] = malloc(strlen(devs[i].pci.net_devs[j]) + 1);
                 strcpy(mf->dinfo->pci.net_devs[j], devs[i].pci.net_devs[j]);
             }
@@ -2516,20 +2813,22 @@ int init_dev_info_ul(mfile *mf, const char *dev_name, unsigned domain, unsigned
     return ret;
 }
 
-
-mfile* mopen_ul(const char *name)
+mfile* mopen_ul(const char* name)
 {
-    mfile *mf = mopen_ul_int(name, 0);
+    mfile* mf = mopen_ul_int(name, 0);
 
     return mf;
 }
 
-void free_dev_info_ul(mfile *mf)
+void free_dev_info_ul(mfile* mf)
 {
-    if (mf->dinfo) {
-        if (mf->dinfo->pci.ib_devs) {
-            char **curr = mf->dinfo->pci.ib_devs;
-            while (*(curr)) {
+    if (mf->dinfo)
+    {
+        if (mf->dinfo->pci.ib_devs)
+        {
+            char** curr = mf->dinfo->pci.ib_devs;
+            while (*(curr))
+            {
                 free(*curr);
                 curr++;
             }
@@ -2537,9 +2836,11 @@ void free_dev_info_ul(mfile *mf)
             free(mf->dinfo->pci.ib_devs);
         }
 
-        if (mf->dinfo->pci.net_devs) {
-            char **curr = mf->dinfo->pci.net_devs;
-            while (*(curr)) {
+        if (mf->dinfo->pci.net_devs)
+        {
+            char** curr = mf->dinfo->pci.net_devs;
+            while (*(curr))
+            {
                 free(*curr);
                 curr++;
             }
@@ -2552,31 +2853,39 @@ void free_dev_info_ul(mfile *mf)
     }
 }
 
-int mclose_ul(mfile *mf)
+int mclose_ul(mfile* mf)
 {
-    if (mf != NULL) {
-        ul_ctx_t *ctx = mf->ul_ctx;
-        if (ctx) {
-            if (ctx->mclose != NULL) {
+    if (mf != NULL)
+    {
+        ul_ctx_t* ctx = mf->ul_ctx;
+        if (ctx)
+        {
+            if (ctx->mclose != NULL)
+            {
                 // close icmd if if needed
-                if (mf->icmd.icmd_opened) {
+                if (mf->icmd.icmd_opened)
+                {
                     icmd_close(mf);
                 }
                 ctx->mclose(mf);
             }
 
-            if (ctx->fdlock) {
+            if (ctx->fdlock)
+            {
                 close(ctx->fdlock);
             }
-            if (ctx->res_fdlock) {
+            if (ctx->res_fdlock)
+            {
                 close(ctx->res_fdlock);
             }
             free(ctx);
         }
-        if (mf->dev_name) {
+        if (mf->dev_name)
+        {
             free(mf->dev_name);
         }
-        if(mf->user_page_list.page_amount) {
+        if (mf->user_page_list.page_amount)
+        {
             release_dma_pages(mf, mf->user_page_list.page_amount);
         }
         free_dev_info_ul(mf);
@@ -2588,37 +2897,39 @@ int mclose_ul(mfile *mf)
 #define IBDR_MAX_NAME_SIZE 128
 #define BDF_NAME_SIZE 12
 #define DEV_DIR_MAX_SIZE 256
-static
-int get_inband_dev_from_pci(char *inband_dev, char *pci_dev)
+static int get_inband_dev_from_pci(char* inband_dev, char* pci_dev)
 {
     unsigned domain = 0, bus = 0, dev = 0, func = 0;
     int force = 0;
     MType dev_type;
-    DIR *d;
-    struct dirent *dir;
+    DIR* d;
+    struct dirent* dir;
     char subdirname[DEV_DIR_MAX_SIZE] = {0};
     char linkname[DEV_DIR_MAX_SIZE] = {0};
     int found = 0;
     char dirname[] = "/sys/class/infiniband";
     dev_type = mtcr_parse_name(pci_dev, &force, &domain, &bus, &dev, &func);
 
-
     d = opendir(dirname);
-    if (d == NULL) {
+    if (d == NULL)
+    {
         errno = ENODEV;
         return -2;
     }
 
-    while ((dir = readdir(d)) != NULL) {
+    while ((dir = readdir(d)) != NULL)
+    {
         unsigned curr_domain = 0, curr_bus = 0, curr_dev = 0, curr_func = 0;
         int curr_force = 0, link_size;
-        if (dir->d_name[0] == '.') {
+        if (dir->d_name[0] == '.')
+        {
             continue;
         }
         snprintf(subdirname, DEV_DIR_MAX_SIZE - 1, "%s/%.100s/device", dirname, dir->d_name);
         link_size = readlink(subdirname, linkname, DEV_DIR_MAX_SIZE);
 
-        if (link_size < BDF_NAME_SIZE) {
+        if (link_size < BDF_NAME_SIZE)
+        {
             /*
              * Fixing coverity issue to make [link_size - BDF_NAME_SIZE] valid
              */
@@ -2627,7 +2938,8 @@ int get_inband_dev_from_pci(char *inband_dev, char *pci_dev)
         dev_type = mtcr_parse_name(&linkname[link_size - BDF_NAME_SIZE], &curr_force, &curr_domain, &curr_bus,
                                    &curr_dev, &curr_func);
 
-        if (domain == curr_domain && bus == curr_bus && dev == curr_dev && func == curr_func) {
+        if (domain == curr_domain && bus == curr_bus && dev == curr_dev && func == curr_func)
+        {
             snprintf(inband_dev, IBDR_MAX_NAME_SIZE - 1, "ibdr-0,%.100s,1", dir->d_name);
             found = 1;
             break;
@@ -2635,22 +2947,25 @@ int get_inband_dev_from_pci(char *inband_dev, char *pci_dev)
     }
 
     closedir(d);
-    (void) dev_type; // avoid compiler warrnings
-    if (found) {
+    (void)dev_type; // avoid compiler warrnings
+    if (found)
+    {
         return 0;
-    } else {
+    }
+    else
+    {
         errno = ENODEV;
         return -1;
     }
 }
 
-static
-int reopen_pci_as_inband(mfile *mf)
+static int reopen_pci_as_inband(mfile* mf)
 {
     int rc;
     char inband_dev[IBDR_MAX_NAME_SIZE] = {0};
     rc = get_inband_dev_from_pci(inband_dev, mf->dev_name);
-    if (rc) {
+    if (rc)
+    {
         errno = ENODEV;
         return -1;
     }
@@ -2663,18 +2978,21 @@ int reopen_pci_as_inband(mfile *mf)
     return rc;
 }
 
-int maccess_reg_mad_ul(mfile *mf, u_int8_t *data)
+int maccess_reg_mad_ul(mfile* mf, u_int8_t* data)
 {
     int rc;
 
-    if (mf == NULL || data == NULL) {
+    if (mf == NULL || data == NULL)
+    {
         return ME_BAD_PARAMS;
     }
 
-    if (mf->tp != MST_IB) {
+    if (mf->tp != MST_IB)
+    {
         // Close current device and re-open as inband
         rc = reopen_pci_as_inband(mf);
-        if (rc) {
+        if (rc)
+        {
             errno = ENODEV; // for compatibility untill we change mtcr to use error code
             return ME_REG_ACCESS_UNKNOWN_ERR;
         }
@@ -2683,29 +3001,29 @@ int maccess_reg_mad_ul(mfile *mf, u_int8_t *data)
     return ((ul_ctx_t*)mf->ul_ctx)->maccess_reg(mf, data);
 }
 
-static void mtcr_fix_endianness(u_int32_t *buf, int len)
+static void mtcr_fix_endianness(u_int32_t* buf, int len)
 {
     int i;
 
-    for (i = 0; i < (len / 4); ++i) {
+    for (i = 0; i < (len / 4); ++i)
+    {
         u_int32_t tmp = buf[i];
         buf[i] = __be32_to_cpu(tmp);
     }
 }
 
-int mread_buffer_ul(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mread_buffer_ul(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
     int rc;
-    rc = mread4_block_ul(mf, offset, (u_int32_t*) data, byte_len);
-    mtcr_fix_endianness((u_int32_t*) data, byte_len);
+    rc = mread4_block_ul(mf, offset, (u_int32_t*)data, byte_len);
+    mtcr_fix_endianness((u_int32_t*)data, byte_len);
     return rc;
-
 }
 
-int mwrite_buffer_ul(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mwrite_buffer_ul(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
-    mtcr_fix_endianness((u_int32_t*) data, byte_len);
-    return mwrite4_block_ul(mf, offset, (u_int32_t*) data, byte_len);
+    mtcr_fix_endianness((u_int32_t*)data, byte_len);
+    return mwrite4_block_ul(mf, offset, (u_int32_t*)data, byte_len);
 }
 
 /*
@@ -2713,19 +3031,24 @@ int mwrite_buffer_ul(mfile *mf, unsigned int offset, u_int8_t *data, int byte_le
  */
 
 #define TLV_OPERATION_SIZE 4
-#define OP_TLV_SIZE        16
+#define OP_TLV_SIZE 16
 #define REG_TLV_HEADER_LEN 4
 
-enum {
+enum
+{
     MAD_CLASS_REG_ACCESS = 1,
     MAD_CLASS_A_REG_ACCESS = 0x0A,
 };
 
 u_int8_t class_to_use = MAD_CLASS_REG_ACCESS;
 
-
-enum {
-    TLV_END = 0, TLV_OPERATION = 1, TLV_DR = 2, TLV_REG = 3, TLV_USER_DATA = 4,
+enum
+{
+    TLV_END = 0,
+    TLV_OPERATION = 1,
+    TLV_DR = 2,
+    TLV_REG = 3,
+    TLV_USER_DATA = 4,
 };
 
 #define REGISTER_HEADERS_SIZE 12
@@ -2733,65 +3056,72 @@ enum {
 #define INBAND_MAX_REG_SIZE_CLS_A 204
 #define INBAND_MAX_GMP_DWORDS_NUM 55
 #define INBAND_MAX_GMP_BLOCKS 16
-#define INBAND_MAX_GMP_REG_SIZE INBAND_MAX_GMP_BLOCKS * INBAND_MAX_GMP_DWORDS_NUM * 4
+#define INBAND_MAX_GMP_REG_SIZE INBAND_MAX_GMP_BLOCKS* INBAND_MAX_GMP_DWORDS_NUM * 4
 #define ICMD_MAX_REG_SIZE (ICMD_MAX_CMD_SIZE - REGISTER_HEADERS_SIZE)
 #define FWCTX_MAX_REG_SIZE 16
 #define TOOLS_HCR_MAX_REG_SIZE (TOOLS_HCR_MAX_MBOX - REGISTER_HEADERS_SIZE)
 
-static int supports_icmd(mfile *mf);
-static int supports_tools_cmdif_reg(mfile *mf);
-static int init_operation_tlv(struct OperationTlv *operation_tlv, u_int16_t reg_id, u_int8_t method);
-static int mreg_send_wrapper(mfile *mf, u_int8_t *data, int r_icmd_size, int w_icmd_size);
-static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t method, void *reg_data, u_int32_t reg_size,
-                         u_int32_t r_size_reg, u_int32_t w_size_reg, int *reg_status);
+static int supports_icmd(mfile* mf);
+static int supports_tools_cmdif_reg(mfile* mf);
+static int init_operation_tlv(struct OperationTlv* operation_tlv, u_int16_t reg_id, u_int8_t method);
+static int mreg_send_wrapper(mfile* mf, u_int8_t* data, int r_icmd_size, int w_icmd_size);
+static int mreg_send_raw(mfile* mf,
+                         u_int16_t reg_id,
+                         maccess_reg_method_t method,
+                         void* reg_data,
+                         u_int32_t reg_size,
+                         u_int32_t r_size_reg,
+                         u_int32_t w_size_reg,
+                         int* reg_status);
 
 int return_by_reg_status(int reg_status)
 {
-    switch (reg_status) {
-    case 1:
-        return ME_REG_ACCESS_DEV_BUSY;
+    switch (reg_status)
+    {
+        case 1:
+            return ME_REG_ACCESS_DEV_BUSY;
 
-    case 2:
-        return ME_REG_ACCESS_VER_NOT_SUPP;
+        case 2:
+            return ME_REG_ACCESS_VER_NOT_SUPP;
 
-    case 3:
-        return ME_REG_ACCESS_UNKNOWN_TLV;
+        case 3:
+            return ME_REG_ACCESS_UNKNOWN_TLV;
 
-    case 4:
-        return ME_REG_ACCESS_REG_NOT_SUPP;
+        case 4:
+            return ME_REG_ACCESS_REG_NOT_SUPP;
 
-    case 5:
-        return ME_REG_ACCESS_CLASS_NOT_SUPP;
+        case 5:
+            return ME_REG_ACCESS_CLASS_NOT_SUPP;
 
-    case 6:
-        return ME_REG_ACCESS_METHOD_NOT_SUPP;
+        case 6:
+            return ME_REG_ACCESS_METHOD_NOT_SUPP;
 
-    case 7:
-        return ME_REG_ACCESS_BAD_PARAM;
+        case 7:
+            return ME_REG_ACCESS_BAD_PARAM;
 
-    case 8:
-        return ME_REG_ACCESS_RES_NOT_AVLBL;
+        case 8:
+            return ME_REG_ACCESS_RES_NOT_AVLBL;
 
-    case 9:
-        return ME_REG_ACCESS_MSG_RECPT_ACK;
+        case 9:
+            return ME_REG_ACCESS_MSG_RECPT_ACK;
 
-    case 0x22:
-        return ME_REG_ACCESS_CONF_CORRUPT;
+        case 0x22:
+            return ME_REG_ACCESS_CONF_CORRUPT;
 
-    case 0x24:
-        return ME_REG_ACCESS_LEN_TOO_SMALL;
+        case 0x24:
+            return ME_REG_ACCESS_LEN_TOO_SMALL;
 
-    case 0x20:
-        return ME_REG_ACCESS_BAD_CONFIG;
+        case 0x20:
+            return ME_REG_ACCESS_BAD_CONFIG;
 
-    case 0x21:
-        return ME_REG_ACCESS_ERASE_EXEEDED;
+        case 0x21:
+            return ME_REG_ACCESS_ERASE_EXEEDED;
 
-    case 0x70:
-        return ME_REG_ACCESS_INTERNAL_ERROR;
+        case 0x70:
+            return ME_REG_ACCESS_INTERNAL_ERROR;
 
-    default:
-        return ME_REG_ACCESS_UNKNOWN_ERR;
+        default:
+            return ME_REG_ACCESS_UNKNOWN_ERR;
     }
 }
 
@@ -2801,66 +3131,74 @@ int supports_reg_access_smp(mfile* mf)
            (!(mf->flags & MDEVS_IB) && (supports_icmd(mf) || supports_tools_cmdif_reg(mf)));
 }
 
-int maccess_reg_ul(mfile *mf,
+int maccess_reg_ul(mfile* mf,
                    u_int16_t reg_id,
                    maccess_reg_method_t reg_method,
-                   void *reg_data,
+                   void* reg_data,
                    u_int32_t reg_size,
                    u_int32_t r_size_reg,
                    u_int32_t w_size_reg,
-                   int *reg_status)
+                   int* reg_status)
 {
     DBG_PRINTF("Sending Access Register:\n");
     DBG_PRINTF("Register ID: 0x%04x\n", reg_id);
     DBG_PRINTF("Register Size: %d bytes\n", reg_size);
     int rc = -1;
     class_to_use = MAD_CLASS_REG_ACCESS;
-    if (mf == NULL || reg_data == NULL || reg_status == NULL || reg_size <= 0) {
+    if (mf == NULL || reg_data == NULL || reg_status == NULL || reg_size <= 0)
+    {
         return ME_BAD_PARAMS;
     }
     // check register size
-    unsigned int max_size = (unsigned int) mget_max_reg_size_ul(mf, reg_method);
-    if (reg_size > (unsigned int) max_size) {
-        //reg too big
+    unsigned int max_size = (unsigned int)mget_max_reg_size_ul(mf, reg_method);
+    if (reg_size > (unsigned int)max_size)
+    {
+        // reg too big
         return ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;
     }
 
 #ifndef MST_UL
-    if (mf->flags & MDEVS_MLNX_OS) {
+    if (mf->flags & MDEVS_MLNX_OS)
+    {
         rc = mos_reg_access_raw(mf, reg_id, reg_method, reg_data, reg_size, reg_status);
-        if (!rc) {
+        if (!rc)
+        {
             return ME_OK;
         }
     }
 #endif
 
-    if (reg_size <= INBAND_MAX_REG_SIZE) {
-        if (supports_reg_access_smp(mf)) {
-            rc = mreg_send_raw(mf, reg_id, reg_method,
-                               reg_data, reg_size, r_size_reg,
-                               w_size_reg, reg_status);
+    if (reg_size <= INBAND_MAX_REG_SIZE)
+    {
+        if (supports_reg_access_smp(mf))
+        {
+            rc = mreg_send_raw(mf, reg_id, reg_method, reg_data, reg_size, r_size_reg, w_size_reg, reg_status);
         }
-        if (rc == ME_OK && (*reg_status == 0)) {
+        if (rc == ME_OK && (*reg_status == 0))
+        {
             DBG_PRINTF("AccessRegister SMP Sent Successfully!\n");
             return ME_OK;
-        } else {
-                DBG_PRINTF("AccessRegister Class SMP Failed!\n");
-                DBG_PRINTF("Mad Status: 0x%08x\n", rc);
-                DBG_PRINTF("Register Status: 0x%08x\n", *reg_status);
-                class_to_use = MAD_CLASS_A_REG_ACCESS;
+        }
+        else
+        {
+            DBG_PRINTF("AccessRegister Class SMP Failed!\n");
+            DBG_PRINTF("Mad Status: 0x%08x\n", rc);
+            DBG_PRINTF("Register Status: 0x%08x\n", *reg_status);
+            class_to_use = MAD_CLASS_A_REG_ACCESS;
         }
     }
 
-    if ((reg_size <= INBAND_MAX_REG_SIZE_CLS_A) &&
-        (supports_reg_access_cls_a_ul(mf, reg_method))) {
+    if ((reg_size <= INBAND_MAX_REG_SIZE_CLS_A) && (supports_reg_access_cls_a_ul(mf, reg_method)))
+    {
         class_to_use = MAD_CLASS_A_REG_ACCESS;
-        rc = mreg_send_raw(mf, reg_id, reg_method,
-                           reg_data, reg_size, r_size_reg,
-                           w_size_reg, reg_status);
-        if (rc == ME_OK && (*reg_status == 0)) {
+        rc = mreg_send_raw(mf, reg_id, reg_method, reg_data, reg_size, r_size_reg, w_size_reg, reg_status);
+        if (rc == ME_OK && (*reg_status == 0))
+        {
             DBG_PRINTF("AccessRegister Class 0xA Sent Successfully!\n");
             return ME_OK;
-        } else {
+        }
+        else
+        {
             DBG_PRINTF("AccessRegister Class 0xA Failed!\n");
             DBG_PRINTF("Mad Status: 0x%08x\n", rc);
             DBG_PRINTF("Register Status: 0x%08x\n", *reg_status);
@@ -2868,11 +3206,11 @@ int maccess_reg_ul(mfile *mf,
         }
     }
 
-    if (supports_reg_access_gmp_ul(mf, reg_method)) {
-        rc = mib_send_gmp_access_reg_mad_ul(mf, (u_int32_t *)reg_data,
-                                            reg_size, reg_id,
-                                            reg_method, reg_status);
-        if (rc == ME_OK && *reg_status == 0) {
+    if (supports_reg_access_gmp_ul(mf, reg_method))
+    {
+        rc = mib_send_gmp_access_reg_mad_ul(mf, (u_int32_t*)reg_data, reg_size, reg_id, reg_method, reg_status);
+        if (rc == ME_OK && *reg_status == 0)
+        {
             DBG_PRINTF("AccessRegisterGMP Sent Successfully!\n");
             return ME_OK;
         }
@@ -2882,24 +3220,28 @@ int maccess_reg_ul(mfile *mf,
     }
 
     // Fallback - Attempting SMP as last resort.
-    if (supports_reg_access_smp(mf)) {
+    if (supports_reg_access_smp(mf))
+    {
         class_to_use = MAD_CLASS_REG_ACCESS;
         rc = mreg_send_raw(mf, reg_id, reg_method, reg_data, reg_size, r_size_reg, w_size_reg, reg_status);
-    } else {
+    }
+    else
+    {
         return ME_REG_ACCESS_NOT_SUPPORTED;
     }
 
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
-    else if (*reg_status) {
+    else if (*reg_status)
+    {
         return return_by_reg_status(*reg_status);
     }
     return ME_OK;
 }
 
-
-int supports_reg_access_gmp_ul(mfile *mf, maccess_reg_method_t reg_method)
+int supports_reg_access_gmp_ul(mfile* mf, maccess_reg_method_t reg_method)
 {
 #ifndef MST_UL
     return mib_supports_reg_access_gmp(mf, reg_method);
@@ -2910,7 +3252,7 @@ int supports_reg_access_gmp_ul(mfile *mf, maccess_reg_method_t reg_method)
 #endif
 }
 
-int supports_reg_access_cls_a_ul(mfile *mf, maccess_reg_method_t reg_method)
+int supports_reg_access_cls_a_ul(mfile* mf, maccess_reg_method_t reg_method)
 {
 #ifndef MST_UL
     return mib_supports_reg_access_cls_a(mf, reg_method);
@@ -2921,8 +3263,7 @@ int supports_reg_access_cls_a_ul(mfile *mf, maccess_reg_method_t reg_method)
 #endif
 }
 
-
-int mib_send_cls_a_access_reg_mad_ul(mfile *mf, u_int8_t *data)
+int mib_send_cls_a_access_reg_mad_ul(mfile* mf, u_int8_t* data)
 {
 #ifndef MST_UL
     return mib_send_cls_a_access_reg_mad(mf, data);
@@ -2933,15 +3274,15 @@ int mib_send_cls_a_access_reg_mad_ul(mfile *mf, u_int8_t *data)
 #endif
 }
 
-
-int mib_send_gmp_access_reg_mad_ul(mfile *mf, u_int32_t *data,
-                                   u_int32_t reg_size, u_int32_t reg_id,
-                                   maccess_reg_method_t reg_method, int *reg_status)
+int mib_send_gmp_access_reg_mad_ul(mfile* mf,
+                                   u_int32_t* data,
+                                   u_int32_t reg_size,
+                                   u_int32_t reg_id,
+                                   maccess_reg_method_t reg_method,
+                                   int* reg_status)
 {
 #ifndef MST_UL
-    return mib_send_gmp_access_reg_mad(mf, data,
-                                       reg_size, reg_id,
-                                       reg_method, reg_status);
+    return mib_send_gmp_access_reg_mad(mf, data, reg_size, reg_id, reg_method, reg_status);
 #else
     (void)mf;
     (void)data;
@@ -2953,8 +3294,7 @@ int mib_send_gmp_access_reg_mad_ul(mfile *mf, u_int32_t *data,
 #endif
 }
 
-
-static int init_operation_tlv(struct OperationTlv *operation_tlv, u_int16_t reg_id, u_int8_t method)
+static int init_operation_tlv(struct OperationTlv* operation_tlv, u_int16_t reg_id, u_int8_t method)
 {
     memset(operation_tlv, 0, sizeof(*operation_tlv));
 
@@ -2968,50 +3308,73 @@ static int init_operation_tlv(struct OperationTlv *operation_tlv, u_int16_t reg_
 
 ///////////////////  Function that sends the register via the correct interface ///////////////////////////
 
-static int mreg_send_wrapper(mfile *mf, u_int8_t *data, int r_icmd_size, int w_icmd_size)
+static int mreg_send_wrapper(mfile* mf, u_int8_t* data, int r_icmd_size, int w_icmd_size)
 {
     int rc;
-    if (mf->tp == MST_IB) { //inband access
+    if (mf->tp == MST_IB)
+    { // inband access
         rc = maccess_reg_mad(mf, data);
-        if (rc) {
-            //printf("-E- 2. Access reg mad failed with rc = %#x\n", rc);
+        if (rc)
+        {
+            // printf("-E- 2. Access reg mad failed with rc = %#x\n", rc);
             return ME_MAD_SEND_FAILED;
         }
-    } else if (supports_icmd(mf)) {
+    }
+    else if (supports_icmd(mf))
+    {
 #if defined(MST_UL) && !defined(MST_UL_ICMD)
-        if (mf->vsec_supp) { // we support accessing fw via icmd space
+        if (mf->vsec_supp)
+        { // we support accessing fw via icmd space
             rc = icmd_send_command_int(mf, FLASH_REG_ACCESS, data, w_icmd_size, r_icmd_size, 0);
-            if (rc) {
+            if (rc)
+            {
                 return rc;
             }
-        } else { // send register via inband (maccess_reg_mad will open the device as inband thus consecutives calls will go to the first if)
+        }
+        else
+        { // send register via inband (maccess_reg_mad will open the device as inband thus consecutives calls will go to
+          // the first if)
             rc = maccess_reg_mad(mf, data);
-            if (rc) {
-                //printf("-E- 2. Access reg mad failed with rc = %#x\n", rc);
+            if (rc)
+            {
+                // printf("-E- 2. Access reg mad failed with rc = %#x\n", rc);
                 return ME_MAD_SEND_FAILED;
             }
         }
 #else
         rc = icmd_send_command_int(mf, FLASH_REG_ACCESS, data, w_icmd_size, r_icmd_size, 0);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
 #endif
-    } else if (supports_tools_cmdif_reg(mf)) {
+    }
+    else if (supports_tools_cmdif_reg(mf))
+    {
         rc = tools_cmdif_reg_access(mf, data, w_icmd_size, r_icmd_size);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
-    } else {
+    }
+    else
+    {
         return ME_NOT_IMPLEMENTED;
     }
     return ME_OK;
 }
 
-static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t method, void *reg_data, u_int32_t reg_size,
-                         u_int32_t r_size_reg, u_int32_t w_size_reg, int *reg_status)
+static int mreg_send_raw(mfile* mf,
+                         u_int16_t reg_id,
+                         maccess_reg_method_t method,
+                         void* reg_data,
+                         u_int32_t reg_size,
+                         u_int32_t r_size_reg,
+                         u_int32_t w_size_reg,
+                         int* reg_status)
 {
-    //printf("-D- reg_id = %d, reg_size = %d, r_size_reg = %d , w_size_reg = %d \n",reg_id,reg_size,r_size_reg,w_size_reg);
+    // printf("-D- reg_id = %d, reg_size = %d, r_size_reg = %d , w_size_reg = %d
+    // \n",reg_id,reg_size,r_size_reg,w_size_reg);
     int mad_rc, cmdif_size = 0;
     struct OperationTlv tlv;
     struct reg_tlv tlv_info;
@@ -3027,7 +3390,7 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t metho
 
     cmdif_size += OperationTlv_pack(&tlv, buffer);
     cmdif_size += reg_tlv_pack(&tlv_info, buffer + OP_TLV_SIZE);
-    //put the reg itself into the buffer
+    // put the reg itself into the buffer
     memcpy(buffer + OP_TLV_SIZE + REG_TLV_HEADER_LEN, reg_data, reg_size);
     cmdif_size += reg_size;
 
@@ -3038,15 +3401,19 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t metho
     fprintf(stdout, "\tReg Tlv\n");
     reg_tlv_dump(&tlv_info, stdout);
 #endif
-    // printf("-D- reg_info.len = |%d, OP_TLV: %d, REG_TLV= %d, cmdif_size = %d\n", reg_info.len, OP_TLV_SIZE, REG_RLV_HEADER_LEN, cmdif_size);
-    // update r/w_size_reg with the size of op tlv and reg tlv as we need to read/write them as well
+    // printf("-D- reg_info.len = |%d, OP_TLV: %d, REG_TLV= %d, cmdif_size = %d\n", reg_info.len, OP_TLV_SIZE,
+    // REG_RLV_HEADER_LEN, cmdif_size); update r/w_size_reg with the size of op tlv and reg tlv as we need to read/write
+    // them as well
     r_size_reg += OP_TLV_SIZE + REG_TLV_HEADER_LEN;
     w_size_reg += OP_TLV_SIZE + REG_TLV_HEADER_LEN;
-    //printf("-D- reg_size = %d, r_size_reg = %d , w_size_reg = %d \n",reg_size,r_size_reg,w_size_reg);
+    // printf("-D- reg_size = %d, r_size_reg = %d , w_size_reg = %d \n",reg_size,r_size_reg,w_size_reg);
 
-    if (class_to_use == MAD_CLASS_A_REG_ACCESS) {
+    if (class_to_use == MAD_CLASS_A_REG_ACCESS)
+    {
         mad_rc = mib_send_cls_a_access_reg_mad_ul(mf, buffer);
-    } else {
+    }
+    else
+    {
         mad_rc = mreg_send_wrapper(mf, buffer, r_size_reg, w_size_reg);
     }
     // Unpack the mad
@@ -3064,7 +3431,8 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t metho
 #endif
     // Check the return value
     *reg_status = tlv.status;
-    if (mad_rc) {
+    if (mad_rc)
+    {
         return mad_rc;
     }
     return ME_OK;
@@ -3079,92 +3447,116 @@ static int mreg_send_raw(mfile *mf, u_int16_t reg_id, maccess_reg_method_t metho
 
 #define HW_ID_ADDR 0xf0014
 
-static int supports_icmd(mfile *mf)
+static int supports_icmd(mfile* mf)
 {
     u_int32_t dev_id = 0;
 
-    if (mread4_ul(mf, HW_ID_ADDR, &dev_id) != 4) { // cr might be locked and retured 0xbad0cafe but we dont care we search for device that supports icmd
+    if (mread4_ul(mf, HW_ID_ADDR, &dev_id) != 4)
+    { // cr might be locked and retured 0xbad0cafe but we dont care we search for device that supports icmd
         return 0;
     }
-    switch (dev_id & 0xffff) { // that the hw device id
-    case CONNECTX2_HW_ID:
-    case CONNECTX3_HW_ID:
-    case CONNECTX3_PRO_HW_ID:
-    case INFINISCALE4_HW_ID:
-    case SWITCHX_HW_ID:
-        return 0;
+    switch (dev_id & 0xffff)
+    { // that the hw device id
+        case CONNECTX2_HW_ID:
+        case CONNECTX3_HW_ID:
+        case CONNECTX3_PRO_HW_ID:
+        case INFINISCALE4_HW_ID:
+        case SWITCHX_HW_ID:
+            return 0;
 
-    default:
-        break;
+        default:
+            break;
     }
     return 1;
 }
 
-static int supports_tools_cmdif_reg(mfile *mf)
+static int supports_tools_cmdif_reg(mfile* mf)
 {
     u_int32_t dev_id = 0;
-    if (mread4_ul(mf, HW_ID_ADDR, &dev_id) != 4) { // cr might be locked and retured 0xbad0cafe but we dont care we search for device that supports tools cmdif
+    if (mread4_ul(mf, HW_ID_ADDR, &dev_id) != 4)
+    { // cr might be locked and retured 0xbad0cafe but we dont care we search for device that supports tools cmdif
         return 0;
     }
-    switch (dev_id & 0xffff) { // that the hw device id
-    case CONNECTX3_HW_ID:     //Cx3
-    case CONNECTX3_PRO_HW_ID:     // Cx3-pro
-        if (tools_cmdif_is_supported(mf) == ME_OK) {
-            return 1;
-        }
-        break;
+    switch (dev_id & 0xffff)
+    {                             // that the hw device id
+        case CONNECTX3_HW_ID:     // Cx3
+        case CONNECTX3_PRO_HW_ID: // Cx3-pro
+            if (tools_cmdif_is_supported(mf) == ME_OK)
+            {
+                return 1;
+            }
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
     return 0;
 }
 
-int mget_max_reg_size_ul(mfile *mf, maccess_reg_method_t reg_method)
+int mget_max_reg_size_ul(mfile* mf, maccess_reg_method_t reg_method)
 {
-    if (mf->acc_reg_params.max_reg_size[reg_method]) {
+    if (mf->acc_reg_params.max_reg_size[reg_method])
+    {
         return mf->acc_reg_params.max_reg_size[reg_method];
-    } else if (supports_reg_access_gmp_ul(mf, reg_method)) {
+    }
+    else if (supports_reg_access_gmp_ul(mf, reg_method))
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = INBAND_MAX_GMP_REG_SIZE;
-    } else if (supports_reg_access_cls_a_ul(mf, reg_method)) {
+    }
+    else if (supports_reg_access_cls_a_ul(mf, reg_method))
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = INBAND_MAX_REG_SIZE_CLS_A;
-    } else if (mf->flags & MDEVS_IB) {
+    }
+    else if (mf->flags & MDEVS_IB)
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = INBAND_MAX_REG_SIZE;
-    } else if (mf->flags & MDEVS_MLNX_OS) {
+    }
+    else if (mf->flags & MDEVS_MLNX_OS)
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = INBAND_MAX_REG_SIZE;
-    } else if (mf->flags & MDEVS_FWCTX) {
+    }
+    else if (mf->flags & MDEVS_FWCTX)
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = FWCTX_MAX_REG_SIZE;
-    } else if (supports_icmd(mf)) {
+    }
+    else if (supports_icmd(mf))
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = ICMD_MAX_REG_SIZE;
-    } else if (supports_tools_cmdif_reg(mf)) {
+    }
+    else if (supports_tools_cmdif_reg(mf))
+    {
         mf->acc_reg_params.max_reg_size[reg_method] = TOOLS_HCR_MAX_REG_SIZE;
     }
     return mf->acc_reg_params.max_reg_size[reg_method];
 }
 
-int mclear_pci_semaphore_ul(const char *name)
+int mclear_pci_semaphore_ul(const char* name)
 {
-    mfile *mf;
+    mfile* mf;
     int rc = ME_OK;
     mf = mopen_ul_int(name, Clear_Vsec_Semaphore);
-    if (!mf) {
+    if (!mf)
+    {
         return ME_ERROR;
     }
-    if ((mf->tp & (MST_PCICONF | MST_PCI)) == 0) {
+    if ((mf->tp & (MST_PCICONF | MST_PCI)) == 0)
+    {
         rc = ME_UNSUPPORTED_ACCESS_TYPE;
     }
     mclose_ul(mf);
     return rc;
 }
 
-int mvpd_read4_ul_int(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_read4_ul_int(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
     char proc_dev[64];
-    if (!(mf->dinfo)) {
+    if (!(mf->dinfo))
+    {
         errno = EPERM;
         return -1;
     }
-    if ((ul_ctx_t*)mf->ul_ctx && ((ul_ctx_t*)mf->ul_ctx)->via_driver) {
+    if ((ul_ctx_t*)mf->ul_ctx && ((ul_ctx_t*)mf->ul_ctx)->via_driver)
+    {
         return mst_driver_vpd_read4(mf, offset, value);
     }
     u_int16_t domain = (mf->dinfo)->pci.domain;
@@ -3178,20 +3570,23 @@ int mvpd_read4_ul_int(mfile *mf, unsigned int offset, u_int8_t value[4])
      */
 
     sprintf(proc_dev, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/vpd", domain, bus, dev, func);
-    FILE *f = fopen(proc_dev, "r");
-    if (!f) {
-        //fprintf(stderr, "Failed to open (%s) for reading: %s\n", proc_dev, strerror(errno));
+    FILE* f = fopen(proc_dev, "r");
+    if (!f)
+    {
+        // fprintf(stderr, "Failed to open (%s) for reading: %s\n", proc_dev, strerror(errno));
         return errno;
     }
 
     setvbuf(f, NULL, _IONBF, 0);
-    if (fseek(f, offset, SEEK_SET)) {
-        //fprintf(stderr, "Reached End Of File: %s\n", strerror(errno));
+    if (fseek(f, offset, SEEK_SET))
+    {
+        // fprintf(stderr, "Reached End Of File: %s\n", strerror(errno));
         fclose(f);
         return errno;
     }
-    if (fread(value, 1, 4, f) < 1) {
-        //fprintf(stderr, "Failed to read from (%s): %s\n", proc_dev, strerror(errno));
+    if (fread(value, 1, 4, f) < 1)
+    {
+        // fprintf(stderr, "Failed to read from (%s): %s\n", proc_dev, strerror(errno));
         fclose(f);
         return errno;
     }
@@ -3199,256 +3594,258 @@ int mvpd_read4_ul_int(mfile *mf, unsigned int offset, u_int8_t value[4])
     return 0;
 }
 
-int mvpd_read4_ul(mfile *mf, unsigned int offset, u_int8_t value[4])
+int mvpd_read4_ul(mfile* mf, unsigned int offset, u_int8_t value[4])
 {
-    if (offset % 4) {
+    if (offset % 4)
+    {
         u_int8_t qword[8] = {0};
         int rc = 0;
         unsigned int aligned_offset = (offset / 4) * 4;
         rc = mvpd_read4_ul_int(mf, aligned_offset, qword);
-        if (rc) {
+        if (rc)
+        {
             return rc;
         }
         rc = mvpd_read4_ul_int(mf, aligned_offset + 4, qword + 4);
         memcpy(value, qword + (offset % 4), 4);
         return 0;
-    } else {
+    }
+    else
+    {
         return mvpd_read4_ul_int(mf, offset, value);
     }
 }
 
 /************************************
-* Function: m_err2str
-************************************/
+ * Function: m_err2str
+ ************************************/
 const char* m_err2str(MError status)
 {
-    switch (status) {
-    case ME_OK:
-        return "ME_OK";
+    switch (status)
+    {
+        case ME_OK:
+            return "ME_OK";
 
-    case ME_ERROR:
-        return "General error";
+        case ME_ERROR:
+            return "General error";
 
-    case ME_BAD_PARAMS:
-        return "ME_BAD_PARAMS";
+        case ME_BAD_PARAMS:
+            return "ME_BAD_PARAMS";
 
-    case ME_CR_ERROR:
-        return "ME_CR_ERROR";
+        case ME_CR_ERROR:
+            return "ME_CR_ERROR";
 
-    case ME_NOT_IMPLEMENTED:
-        return "ME_NOT_IMPLEMENTED";
+        case ME_NOT_IMPLEMENTED:
+            return "ME_NOT_IMPLEMENTED";
 
-    case ME_SEM_LOCKED:
-        return "Semaphore locked";
+        case ME_SEM_LOCKED:
+            return "Semaphore locked";
 
-    case ME_MEM_ERROR:
-        return "ME_MEM_ERROR";
+        case ME_MEM_ERROR:
+            return "ME_MEM_ERROR";
 
-    case ME_UNSUPPORTED_OPERATION:
-        return "ME_UNSUPPORTED_OPERATION";
+        case ME_UNSUPPORTED_OPERATION:
+            return "ME_UNSUPPORTED_OPERATION";
 
-    case ME_GMP_MAD_UNSUPPORTED_OPERATION:
-        return "Sending GMP MAD supports only Get() method, and you are trying to send Set() method\n"
-               "to a register which is not small enough to send with SMP MAD.";
+        case ME_GMP_MAD_UNSUPPORTED_OPERATION:
+            return "Sending GMP MAD supports only Get() method, and you are trying to send Set() method\n"
+                   "to a register which is not small enough to send with SMP MAD.";
 
-    case ME_MAD_SEND_FAILED:
-        return "ME_MAD_SEND_FAILED";
+        case ME_MAD_SEND_FAILED:
+            return "ME_MAD_SEND_FAILED";
 
-    case ME_UNKOWN_ACCESS_TYPE:
-        return "ME_UNKOWN_ACCESS_TYPE";
+        case ME_UNKOWN_ACCESS_TYPE:
+            return "ME_UNKOWN_ACCESS_TYPE";
 
-    case ME_UNSUPPORTED_ACCESS_TYPE:
-        return "ME_UNSUPPORTED_ACCESS_TYPE";
+        case ME_UNSUPPORTED_ACCESS_TYPE:
+            return "ME_UNSUPPORTED_ACCESS_TYPE";
 
-    case ME_UNSUPPORTED_DEVICE:
-        return "ME_UNSUPPORTED_DEVICE";
+        case ME_UNSUPPORTED_DEVICE:
+            return "ME_UNSUPPORTED_DEVICE";
 
-    // Reg access errors
-    case ME_REG_ACCESS_BAD_STATUS_ERR:
-        return "ME_REG_ACCESS_BAD_STATUS_ERR";
+        // Reg access errors
+        case ME_REG_ACCESS_BAD_STATUS_ERR:
+            return "ME_REG_ACCESS_BAD_STATUS_ERR";
 
-    case ME_REG_ACCESS_BAD_METHOD:
-        return "Bad method";
+        case ME_REG_ACCESS_BAD_METHOD:
+            return "Bad method";
 
-    case ME_REG_ACCESS_NOT_SUPPORTED:
-        return "The Register access is not supported by the device";
+        case ME_REG_ACCESS_NOT_SUPPORTED:
+            return "The Register access is not supported by the device";
 
-    case ME_REG_ACCESS_DEV_BUSY:
-        return "Device is busy";
+        case ME_REG_ACCESS_DEV_BUSY:
+            return "Device is busy";
 
-    case ME_REG_ACCESS_VER_NOT_SUPP:
-        return "Version not supported";
+        case ME_REG_ACCESS_VER_NOT_SUPP:
+            return "Version not supported";
 
-    case ME_REG_ACCESS_UNKNOWN_TLV:
-        return "Unknown TLV";
+        case ME_REG_ACCESS_UNKNOWN_TLV:
+            return "Unknown TLV";
 
-    case ME_REG_ACCESS_REG_NOT_SUPP:
-        return "Register not supported";
+        case ME_REG_ACCESS_REG_NOT_SUPP:
+            return "Register not supported";
 
-    case ME_REG_ACCESS_CLASS_NOT_SUPP:
-        return "Class not supported";
+        case ME_REG_ACCESS_CLASS_NOT_SUPP:
+            return "Class not supported";
 
-    case ME_REG_ACCESS_METHOD_NOT_SUPP:
-        return "Method not supported";
+        case ME_REG_ACCESS_METHOD_NOT_SUPP:
+            return "Method not supported";
 
-    case ME_REG_ACCESS_BAD_PARAM:
-        return "Bad parameter";
+        case ME_REG_ACCESS_BAD_PARAM:
+            return "Bad parameter";
 
-    case ME_REG_ACCESS_RES_NOT_AVLBL:
-        return "Resource unavailable";
+        case ME_REG_ACCESS_RES_NOT_AVLBL:
+            return "Resource unavailable";
 
-    case ME_REG_ACCESS_MSG_RECPT_ACK:
-        return "Message receipt ack";
+        case ME_REG_ACCESS_MSG_RECPT_ACK:
+            return "Message receipt ack";
 
-    case ME_REG_ACCESS_UNKNOWN_ERR:
-        return "Unknown register error";
+        case ME_REG_ACCESS_UNKNOWN_ERR:
+            return "Unknown register error";
 
-    case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
-        return "Register is too large";
+        case ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT:
+            return "Register is too large";
 
-    case ME_REG_ACCESS_CONF_CORRUPT:
-        return "Config Section Corrupted";
+        case ME_REG_ACCESS_CONF_CORRUPT:
+            return "Config Section Corrupted";
 
-    case ME_REG_ACCESS_LEN_TOO_SMALL:
-        return "The given Register length is too small for the Tlv";
+        case ME_REG_ACCESS_LEN_TOO_SMALL:
+            return "The given Register length is too small for the Tlv";
 
-    case ME_REG_ACCESS_BAD_CONFIG:
-        return "The configuration is rejected";
+        case ME_REG_ACCESS_BAD_CONFIG:
+            return "The configuration is rejected";
 
-    case ME_REG_ACCESS_ERASE_EXEEDED:
-        return "The erase count exceeds its limit";
+        case ME_REG_ACCESS_ERASE_EXEEDED:
+            return "The erase count exceeds its limit";
 
-    case ME_REG_ACCESS_INTERNAL_ERROR:
-        return "Firmware internal error";
+        case ME_REG_ACCESS_INTERNAL_ERROR:
+            return "Firmware internal error";
 
-    // ICMD access errors
-    case ME_ICMD_STATUS_CR_FAIL:
-        return "ME_ICMD_STATUS_CR_FAIL";
+        // ICMD access errors
+        case ME_ICMD_STATUS_CR_FAIL:
+            return "ME_ICMD_STATUS_CR_FAIL";
 
-    case ME_ICMD_STATUS_SEMAPHORE_TO:
-        return "ME_ICMD_STATUS_SEMAPHORE_TO";
+        case ME_ICMD_STATUS_SEMAPHORE_TO:
+            return "ME_ICMD_STATUS_SEMAPHORE_TO";
 
-    case ME_ICMD_STATUS_EXECUTE_TO:
-        return "ME_ICMD_STATUS_EXECUTE_TO";
+        case ME_ICMD_STATUS_EXECUTE_TO:
+            return "ME_ICMD_STATUS_EXECUTE_TO";
 
-    case ME_ICMD_STATUS_IFC_BUSY:
-        return "ME_ICMD_STATUS_IFC_BUSY";
+        case ME_ICMD_STATUS_IFC_BUSY:
+            return "ME_ICMD_STATUS_IFC_BUSY";
 
-    case ME_ICMD_STATUS_ICMD_NOT_READY:
-        return "ME_ICMD_STATUS_ICMD_NOT_READY";
+        case ME_ICMD_STATUS_ICMD_NOT_READY:
+            return "ME_ICMD_STATUS_ICMD_NOT_READY";
 
-    case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
-        return "ME_ICMD_UNSUPPORTED_ICMD_VERSION";
+        case ME_ICMD_UNSUPPORTED_ICMD_VERSION:
+            return "ME_ICMD_UNSUPPORTED_ICMD_VERSION";
 
-    case ME_ICMD_NOT_SUPPORTED:
-        return "ME_REG_ACCESS_ICMD_NOT_SUPPORTED";
+        case ME_ICMD_NOT_SUPPORTED:
+            return "ME_REG_ACCESS_ICMD_NOT_SUPPORTED";
 
-    case ME_ICMD_INVALID_OPCODE:
-        return "ME_ICMD_INVALID_OPCODE";
+        case ME_ICMD_INVALID_OPCODE:
+            return "ME_ICMD_INVALID_OPCODE";
 
-    case ME_ICMD_INVALID_CMD:
-        return "ME_ICMD_INVALID_CMD";
+        case ME_ICMD_INVALID_CMD:
+            return "ME_ICMD_INVALID_CMD";
 
-    case ME_ICMD_OPERATIONAL_ERROR:
-        return "ME_ICMD_OPERATIONAL_ERROR";
+        case ME_ICMD_OPERATIONAL_ERROR:
+            return "ME_ICMD_OPERATIONAL_ERROR";
 
-    case ME_ICMD_BAD_PARAM:
-        return "ME_ICMD_BAD_PARAM";
+        case ME_ICMD_BAD_PARAM:
+            return "ME_ICMD_BAD_PARAM";
 
-    case ME_ICMD_BUSY:
-        return "ME_ICMD_BUSY";
+        case ME_ICMD_BUSY:
+            return "ME_ICMD_BUSY";
 
-    case ME_ICMD_ICM_NOT_AVAIL:
-        return "ME_ICMD_ICM_NOT_AVAIL";
+        case ME_ICMD_ICM_NOT_AVAIL:
+            return "ME_ICMD_ICM_NOT_AVAIL";
 
-    case ME_ICMD_WRITE_PROTECT:
-        return "ME_ICMD_WRITE_PROTECT";
+        case ME_ICMD_WRITE_PROTECT:
+            return "ME_ICMD_WRITE_PROTECT";
 
-    case ME_ICMD_UNKNOWN_STATUS:
-        return "ME_ICMD_UNKNOWN_STATUS";
+        case ME_ICMD_UNKNOWN_STATUS:
+            return "ME_ICMD_UNKNOWN_STATUS";
 
-    case ME_ICMD_SIZE_EXCEEDS_LIMIT:
-        return "ME_ICMD_SIZE_EXCEEDS_LIMIT";
+        case ME_ICMD_SIZE_EXCEEDS_LIMIT:
+            return "ME_ICMD_SIZE_EXCEEDS_LIMIT";
 
-    // TOOLS HCR access errors
-    case ME_CMDIF_BUSY:
-        return "Tools HCR busy";
+        // TOOLS HCR access errors
+        case ME_CMDIF_BUSY:
+            return "Tools HCR busy";
 
-    case ME_CMDIF_TOUT:
-        return "Tools HCR time out.";
+        case ME_CMDIF_TOUT:
+            return "Tools HCR time out.";
 
-    case ME_CMDIF_BAD_OP:
-        return "Operation not supported";
+        case ME_CMDIF_BAD_OP:
+            return "Operation not supported";
 
-    case ME_CMDIF_NOT_SUPP:
-        return "Tools HCR not supported";
+        case ME_CMDIF_NOT_SUPP:
+            return "Tools HCR not supported";
 
-    case ME_CMDIF_BAD_SYS:
-        return "bad system status (driver may be down or Fw does not support this operation)";
+        case ME_CMDIF_BAD_SYS:
+            return "bad system status (driver may be down or Fw does not support this operation)";
 
-    case ME_CMDIF_UNKN_TLV:
-        return "Unknown TLV";
+        case ME_CMDIF_UNKN_TLV:
+            return "Unknown TLV";
 
-    case ME_CMDIF_RES_STATE:
-        return "Bad reset state";
+        case ME_CMDIF_RES_STATE:
+            return "Bad reset state";
 
-    case ME_CMDIF_UNKN_STATUS:
-        return "Unknown status";
+        case ME_CMDIF_UNKN_STATUS:
+            return "Unknown status";
 
-    // MAD IFC errors
-    case ME_MAD_BUSY:
-        return "Temporarily busy. MAD discarded. This is not an error";
+        // MAD IFC errors
+        case ME_MAD_BUSY:
+            return "Temporarily busy. MAD discarded. This is not an error";
 
-    case ME_MAD_REDIRECT:
-        return "Redirection. This is not an error";
+        case ME_MAD_REDIRECT:
+            return "Redirection. This is not an error";
 
-    case ME_MAD_BAD_VER:
-        return "Bad version";
+        case ME_MAD_BAD_VER:
+            return "Bad version";
 
-    case ME_MAD_METHOD_NOT_SUPP:
-        return "Method not supported";
+        case ME_MAD_METHOD_NOT_SUPP:
+            return "Method not supported";
 
-    case ME_MAD_METHOD_ATTR_COMB_NOT_SUPP:
-        return "Method and attribute combination isn't supported";
+        case ME_MAD_METHOD_ATTR_COMB_NOT_SUPP:
+            return "Method and attribute combination isn't supported";
 
-    case ME_MAD_BAD_DATA:
-        return "Bad attribute modifier or field";
+        case ME_MAD_BAD_DATA:
+            return "Bad attribute modifier or field";
 
-    case ME_MAD_GENERAL_ERR:
-        return "Unknown MAD error";
+        case ME_MAD_GENERAL_ERR:
+            return "Unknown MAD error";
 
-    default:
-        return "Unknown error code";
+        default:
+            return "Unknown error code";
     }
 }
 
-
-int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info,
-                  int page_amount)
+int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info, int page_amount)
 {
- #if !defined(__VMKERNEL_UW_NATIVE__)
+#if !defined(__VMKERNEL_UW_NATIVE__)
     int page_size = sysconf(_SC_PAGESIZE);
     int pages_size = page_amount * page_size;
     int page_counter;
     int ret_value;
-  
 
     // Parameters validation.
-    if(!mf || !page_info)
+    if (!mf || !page_info)
     {
         return -1;
     }
 
     // Save the page amount.
     page_info->page_amount = page_amount;
-    
+
     // Allocate user buffer.
     mf->user_page_list.page_list = memalign(page_size, pages_size);
     if (!mf->user_page_list.page_list)
     {
         return -1;
     }
-    
+
     // We need to call mlock after the pages allocation in order to
     //   lock the virtual address space into RAM and preventing that
     //   memory from being paged to the swap area.
@@ -3460,13 +3857,11 @@ int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info,
     page_info->page_pointer_start = (unsigned long)mf->user_page_list.page_list;
 
     // Save the virtual address.
-    for (page_counter = 0;
-            page_counter < page_amount;
-            page_counter++)
+    for (page_counter = 0; page_counter < page_amount; page_counter++)
     {
         int current_offest = (page_size * page_counter);
         page_info->page_addresses_array[page_counter].virtual_address =
-            (u_int64_t)(mf->user_page_list.page_list + current_offest);
+          (u_int64_t)(mf->user_page_list.page_list + current_offest);
     }
 
     // Pin the memory in the kernel space.
@@ -3486,28 +3881,27 @@ int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info,
     (void)mf;
     (void)page_info;
     (void)page_amount;
-  
+
     // MST VMWare driver is unsupported.
     return -1;
 #endif
 }
 
-
 int release_dma_pages(mfile* mf, int page_amount)
 {
 #if !defined(__VMKERNEL_UW_NATIVE__)
     struct mtcr_page_info page_info;
 
-
     // Parameter validation.
-    if(!mf) {
+    if (!mf)
+    {
         return -1;
     }
 
     page_info.page_amount = page_amount;
 
     ioctl(mf->fd, PCICONF_RELEASE_DMA_PAGES, &page_info);
-    
+
     // Free the user space memory.
     free(mf->user_page_list.page_list);
     mf->user_page_list.page_list = NULL;
@@ -3523,14 +3917,13 @@ int release_dma_pages(mfile* mf, int page_amount)
 #endif
 }
 
-
-int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data)
+int read_dword_from_conf_space(mfile* mf, u_int32_t offset, u_int32_t* data)
 {
 #if !defined(__VMKERNEL_UW_NATIVE__)
     int ret = 0;
 
     // Parameters validation.
-    if(!mf || !data)
+    if (!mf || !data)
     {
         return -1;
     }
@@ -3544,7 +3937,6 @@ int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data)
 
     return ret;
 
-
 #else
     (void)mf;
     (void)offset;
@@ -3553,5 +3945,4 @@ int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data)
     // MST VMWare driver is unsupported.
     return -1;
 #endif
-
 }
diff --git a/mtcr_ul/mtcr_ul_com.h b/mtcr_ul/mtcr_ul_com.h
index e63e16af..69699e83 100644
--- a/mtcr_ul/mtcr_ul_com.h
+++ b/mtcr_ul/mtcr_ul_com.h
@@ -44,116 +44,127 @@
 #include "mtcr_mf.h"
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-/*
- * Read 4 bytes, return number of succ. read bytes or -1 on failure
- */
-int mread4_ul(mfile *mf, unsigned int offset, u_int32_t *value);
-
-/*
- * Write 4 bytes, return number of succ. written bytes or -1 on failure
- */
-int mwrite4_ul(mfile *mf, unsigned int offset, u_int32_t value);
-
-
-int mread4_block_ul(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len);
-int mwrite4_block_ul(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len);
-
-int msw_reset_ul(mfile *mf);
-int mhca_reset_ul(mfile *mf);
-
-/*
- * Get list of MST_ul(Mellanox Software Tools) devices.
- * Put all device names as null-terminated strings to buf.
- *
- * Return number of devices found or -1 if buf overflow
- */
-int mdevices_ul(char *buf, int len, int mask);
-
-/*
- * Get list of MST_ul(Mellanox Software Tools) devices.
- * Put all device names as null-terminated strings to buf.
- *
- * Return number of devices found or -1 if buf overflow
- */
-int mdevices_v_ul(char *buf, int len, int mask, int verbosity);
-
-/*
- * Get list of MST_ul(Mellanox Software Tools) devices info records.
- * Return a dynamic allocated array of dev_info records.
- * len will be updated to hold the array length
- *
- */
-dev_info* mdevices_info_ul(int mask, int *len);
-
-/*
- *  * Get list of MST (Mellanox Software Tools) devices info records.
- *  * Return a dynamic allocated array of dev_info records.
- *  * len will be updated to hold the array length
- *  * Verbosity will decide whether to get all the Physical functions or not.
- */
-dev_info* mdevices_info_v_ul(int mask, int *len, int verbosity);
-
-/*
- * Open Mellanox Software tools_ul(mst) driver. Device type==INFINIHOST
- * Return valid void ptr or 0 on failure
- */
-mfile* mopen_ul(const char *name);
-
-/*
- * Close Mellanox driver
- * req. descriptor
- */
-int mclose_ul(mfile *mf);
-
-int maccess_reg_mad_ul(mfile *mf, u_int8_t *data);
-
-int maccess_reg_ul(mfile *mf,
-                   u_int16_t reg_id,
-                   maccess_reg_method_t reg_method,
-                   void *reg_data,
-                   u_int32_t reg_size,
-                   u_int32_t r_size_reg, // used when sending via icmd interface_ul(how much data should be read back to the user)
-                   u_int32_t w_size_reg, // used when sending via icmd interface_ul(how much data should be written to the scratchpad)
-                                         // if you dont know what you are doing then r_size_reg = w_size_reg = your_register_size
-                   int       *reg_status);
-
-
-
-int tools_cmdif_send_inline_cmd_ul(mfile *mf, u_int64_t in_param, u_int64_t *out_param,
-                                   u_int32_t input_modifier, u_int16_t opcode, u_int8_t opcode_modifier);
-
-int tools_cmdif_send_mbox_command_ul(mfile *mf, u_int32_t input_modifier, u_int16_t opcode, u_int8_t opcode_modifier,
-                                     int data_offs_in_mbox, void *data, int data_size, int skip_write);
-
-int tools_cmdif_unlock_semaphore_ul(mfile *mf);
-
-
-int mget_max_reg_size_ul(mfile *mf, maccess_reg_method_t reg_method);
-int supports_reg_access_gmp_ul(mfile *mf, maccess_reg_method_t reg_method);
-int supports_reg_access_cls_a_ul(mfile *mf, maccess_reg_method_t reg_method);
-int mib_send_cls_a_access_reg_mad_ul(mfile *mf, u_int8_t *data);
-int mib_send_gmp_access_reg_mad_ul(mfile *mf, u_int32_t *data,
-                                   u_int32_t reg_size, u_int32_t reg_id,
-                                   maccess_reg_method_t reg_method, int *reg_status);
-
-int mread_buffer_ul(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len);
-int mwrite_buffer_ul(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len);
-
-int mclear_pci_semaphore_ul(const char *name);
-
-int mvpd_read4_ul(mfile *mf, unsigned int offset, u_int8_t value[4]);
-
-int space_to_cap_offset(int space);
-
-int get_dma_pages(mfile *mf, struct mtcr_page_info* page_info,
-                  int page_amount);
-
-int release_dma_pages(mfile *mf, int page_amount);
-
-int read_dword_from_conf_space(mfile *mf, u_int32_t offset, u_int32_t* data);
+    /*
+     * Read 4 bytes, return number of succ. read bytes or -1 on failure
+     */
+    int mread4_ul(mfile* mf, unsigned int offset, u_int32_t* value);
+
+    /*
+     * Write 4 bytes, return number of succ. written bytes or -1 on failure
+     */
+    int mwrite4_ul(mfile* mf, unsigned int offset, u_int32_t value);
+
+    int mread4_block_ul(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len);
+    int mwrite4_block_ul(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len);
+
+    int msw_reset_ul(mfile* mf);
+    int mhca_reset_ul(mfile* mf);
+
+    /*
+     * Get list of MST_ul(Mellanox Software Tools) devices.
+     * Put all device names as null-terminated strings to buf.
+     *
+     * Return number of devices found or -1 if buf overflow
+     */
+    int mdevices_ul(char* buf, int len, int mask);
+
+    /*
+     * Get list of MST_ul(Mellanox Software Tools) devices.
+     * Put all device names as null-terminated strings to buf.
+     *
+     * Return number of devices found or -1 if buf overflow
+     */
+    int mdevices_v_ul(char* buf, int len, int mask, int verbosity);
+
+    /*
+     * Get list of MST_ul(Mellanox Software Tools) devices info records.
+     * Return a dynamic allocated array of dev_info records.
+     * len will be updated to hold the array length
+     *
+     */
+    dev_info* mdevices_info_ul(int mask, int* len);
+
+    /*
+     *  * Get list of MST (Mellanox Software Tools) devices info records.
+     *  * Return a dynamic allocated array of dev_info records.
+     *  * len will be updated to hold the array length
+     *  * Verbosity will decide whether to get all the Physical functions or not.
+     */
+    dev_info* mdevices_info_v_ul(int mask, int* len, int verbosity);
+
+    /*
+     * Open Mellanox Software tools_ul(mst) driver. Device type==INFINIHOST
+     * Return valid void ptr or 0 on failure
+     */
+    mfile* mopen_ul(const char* name);
+
+    /*
+     * Close Mellanox driver
+     * req. descriptor
+     */
+    int mclose_ul(mfile* mf);
+
+    int maccess_reg_mad_ul(mfile* mf, u_int8_t* data);
+
+    int maccess_reg_ul(mfile* mf,
+                       u_int16_t reg_id,
+                       maccess_reg_method_t reg_method,
+                       void* reg_data,
+                       u_int32_t reg_size,
+                       u_int32_t r_size_reg, // used when sending via icmd interface_ul(how much data should be read
+                                             // back to the user)
+                       u_int32_t w_size_reg, // used when sending via icmd interface_ul(how much data should be written
+                                             // to the scratchpad) if you dont know what you are doing then r_size_reg =
+                                             // w_size_reg = your_register_size
+                       int* reg_status);
+
+    int tools_cmdif_send_inline_cmd_ul(mfile* mf,
+                                       u_int64_t in_param,
+                                       u_int64_t* out_param,
+                                       u_int32_t input_modifier,
+                                       u_int16_t opcode,
+                                       u_int8_t opcode_modifier);
+
+    int tools_cmdif_send_mbox_command_ul(mfile* mf,
+                                         u_int32_t input_modifier,
+                                         u_int16_t opcode,
+                                         u_int8_t opcode_modifier,
+                                         int data_offs_in_mbox,
+                                         void* data,
+                                         int data_size,
+                                         int skip_write);
+
+    int tools_cmdif_unlock_semaphore_ul(mfile* mf);
+
+    int mget_max_reg_size_ul(mfile* mf, maccess_reg_method_t reg_method);
+    int supports_reg_access_gmp_ul(mfile* mf, maccess_reg_method_t reg_method);
+    int supports_reg_access_cls_a_ul(mfile* mf, maccess_reg_method_t reg_method);
+    int mib_send_cls_a_access_reg_mad_ul(mfile* mf, u_int8_t* data);
+    int mib_send_gmp_access_reg_mad_ul(mfile* mf,
+                                       u_int32_t* data,
+                                       u_int32_t reg_size,
+                                       u_int32_t reg_id,
+                                       maccess_reg_method_t reg_method,
+                                       int* reg_status);
+
+    int mread_buffer_ul(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len);
+    int mwrite_buffer_ul(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len);
+
+    int mclear_pci_semaphore_ul(const char* name);
+
+    int mvpd_read4_ul(mfile* mf, unsigned int offset, u_int8_t value[4]);
+
+    int space_to_cap_offset(int space);
+
+    int get_dma_pages(mfile* mf, struct mtcr_page_info* page_info, int page_amount);
+
+    int release_dma_pages(mfile* mf, int page_amount);
+
+    int read_dword_from_conf_space(mfile* mf, u_int32_t offset, u_int32_t* data);
 
 #ifdef __cplusplus
 }
diff --git a/mtcr_ul/mtcr_ul_icmd_cif.c b/mtcr_ul/mtcr_ul_icmd_cif.c
index 77a4e5c1..db874845 100644
--- a/mtcr_ul/mtcr_ul_icmd_cif.c
+++ b/mtcr_ul/mtcr_ul_icmd_cif.c
@@ -49,196 +49,217 @@
 
 #include "mtcr_mem_ops.h"
 
-
 #define ICMD_QUERY_CAP_CMD_ID 0x8400
 #define ICMD_QUERY_CAP_CMD_SZ 0x8
 #define ICMD_QUERY_CAP_EXMB_ICMD_OFF 0x8
 
 // _DEBUG_MODE   // un-comment this to enable debug prints
 
-#define ICMD_DEFAULT_TIMEOUT        5120
-#define STAT_CFG_NOT_DONE_ADDR_CIB   0xb0004
-#define STAT_CFG_NOT_DONE_ADDR_CX4   0xb0004
-#define STAT_CFG_NOT_DONE_ADDR_SW_IB   0x80010
-#define STAT_CFG_NOT_DONE_ADDR_QUANTUM   0x100010
-#define STAT_CFG_NOT_DONE_ADDR_CX5   0xb5e04
-#define STAT_CFG_NOT_DONE_ADDR_CX6   0xb5f04
-#define STAT_CFG_NOT_DONE_ADDR_CX7   0xb5f04
-#define STAT_CFG_NOT_DONE_BITOFF_CIB   31
-#define STAT_CFG_NOT_DONE_BITOFF_CX4   31
+#define ICMD_DEFAULT_TIMEOUT 5120
+#define STAT_CFG_NOT_DONE_ADDR_CIB 0xb0004
+#define STAT_CFG_NOT_DONE_ADDR_CX4 0xb0004
+#define STAT_CFG_NOT_DONE_ADDR_SW_IB 0x80010
+#define STAT_CFG_NOT_DONE_ADDR_QUANTUM 0x100010
+#define STAT_CFG_NOT_DONE_ADDR_CX5 0xb5e04
+#define STAT_CFG_NOT_DONE_ADDR_CX6 0xb5f04
+#define STAT_CFG_NOT_DONE_ADDR_CX7 0xb5f04
+#define STAT_CFG_NOT_DONE_BITOFF_CIB 31
+#define STAT_CFG_NOT_DONE_BITOFF_CX4 31
 #define STAT_CFG_NOT_DONE_BITOFF_SW_IB 0
-#define STAT_CFG_NOT_DONE_BITOFF_CX5   31
-#define STAT_CFG_NOT_DONE_BITOFF_CX7   31
-#define SEMAPHORE_ADDR_CIB   0xe27f8 //sem62
-#define SEMAPHORE_ADDR_CX4   0xe250c // sem67 bit31 is the semaphore bit here (only one semaphore in this dword)
+#define STAT_CFG_NOT_DONE_BITOFF_CX5 31
+#define STAT_CFG_NOT_DONE_BITOFF_CX7 31
+#define SEMAPHORE_ADDR_CIB 0xe27f8   // sem62
+#define SEMAPHORE_ADDR_CX4 0xe250c   // sem67 bit31 is the semaphore bit here (only one semaphore in this dword)
 #define SEMAPHORE_ADDR_SW_IB 0xa24f8 // sem 62
 #define SEMAPHORE_ADDR_QUANTUM 0xa68f8
 #define SEMAPHORE_ADDR_QUANTUM2 0xa52f8
-#define SEMAPHORE_ADDR_CX5   0xe74e0
-#define SEMAPHORE_ADDR_CX7   0xe5660
-#define HCR_ADDR_CIB         0x0
-#define HCR_ADDR_CX4         HCR_ADDR_CIB
-#define HCR_ADDR_CX5         HCR_ADDR_CIB
-#define HCR_ADDR_CX7         HCR_ADDR_CIB
-#define HCR_ADDR_SW_IB       0x80000
-#define HCR_ADDR_QUANTUM       0x100000
+#define SEMAPHORE_ADDR_CX5 0xe74e0
+#define SEMAPHORE_ADDR_CX7 0xe5660
+#define HCR_ADDR_CIB 0x0
+#define HCR_ADDR_CX4 HCR_ADDR_CIB
+#define HCR_ADDR_CX5 HCR_ADDR_CIB
+#define HCR_ADDR_CX7 HCR_ADDR_CIB
+#define HCR_ADDR_SW_IB 0x80000
+#define HCR_ADDR_QUANTUM 0x100000
 #define ICMD_VERSION_BITOFF 24
 #define ICMD_VERSION_BITLEN 8
-#define CMD_PTR_ADDR_CIB        0x0
-#define CMD_PTR_ADDR_SW_IB      0x80000
-#define CMD_PTR_ADDR_QUANTUM      0x100000
-#define CMD_PTR_ADDR_CX4        CMD_PTR_ADDR_CIB
-#define CMD_PTR_ADDR_CX5        CMD_PTR_ADDR_CIB
-#define CMD_PTR_ADDR_CX7        CMD_PTR_ADDR_CIB
-#define CMD_PTR_BITOFF      0
-#define CMD_PTR_BITLEN      24
-#define CTRL_OFFSET         0x3fc
-#define BUSY_BITOFF         0
-#define BUSY_BITLEN         1
-#define EXMB_BITOFF         1
-#define EXMB_BITLEN         1
-#define OPCODE_BITOFF       16
-#define OPCODE_BITLEN       16
-#define STATUS_BITOFF       8
-#define STATUS_BITLEN       8
-#define VCR_CTRL_ADDR       0x0
-#define VCR_SEMAPHORE62     0x0 // semaphore Domain
-#define VCR_CMD_ADDR        0x100000 // mailbox addr
-#define VCR_CMD_SIZE_ADDR   0x1000 // mailbox size
-
-#define EXT_MBOX_DMA_OFF    0x8
-
-#define SEMAPHORE_ADDR_GBOX                0xa6850
-#define CMD_PTR_ADDR_GBOX                  0x90010
-#define GBOX_GW_OPCODE_OFFSET              256
-#define GBOX_GW_REG_OPCODE_OFFSET          252
-#define GBOX_GW_REQUEST_DATA_BLOCK_OFFSET  0
+#define CMD_PTR_ADDR_CIB 0x0
+#define CMD_PTR_ADDR_SW_IB 0x80000
+#define CMD_PTR_ADDR_QUANTUM 0x100000
+#define CMD_PTR_ADDR_CX4 CMD_PTR_ADDR_CIB
+#define CMD_PTR_ADDR_CX5 CMD_PTR_ADDR_CIB
+#define CMD_PTR_ADDR_CX7 CMD_PTR_ADDR_CIB
+#define CMD_PTR_BITOFF 0
+#define CMD_PTR_BITLEN 24
+#define CTRL_OFFSET 0x3fc
+#define BUSY_BITOFF 0
+#define BUSY_BITLEN 1
+#define EXMB_BITOFF 1
+#define EXMB_BITLEN 1
+#define OPCODE_BITOFF 16
+#define OPCODE_BITLEN 16
+#define STATUS_BITOFF 8
+#define STATUS_BITLEN 8
+#define VCR_CTRL_ADDR 0x0
+#define VCR_SEMAPHORE62 0x0      // semaphore Domain
+#define VCR_CMD_ADDR 0x100000    // mailbox addr
+#define VCR_CMD_SIZE_ADDR 0x1000 // mailbox size
+
+#define EXT_MBOX_DMA_OFF 0x8
+
+#define SEMAPHORE_ADDR_GBOX 0xa6850
+#define CMD_PTR_ADDR_GBOX 0x90010
+#define GBOX_GW_OPCODE_OFFSET 256
+#define GBOX_GW_REG_OPCODE_OFFSET 252
+#define GBOX_GW_REQUEST_DATA_BLOCK_OFFSET 0
 #define GBOX_GW_RESPONSE_DATA_BLOCK_OFFSET 260
-#define GBOX_MAX_DATA_SIZE                 256
-#define GBOX_STAT_CFG_NOT_DONE_ADDR        0x90000
-#define GBOX_REG_ACCESS_CMD_OPCODE         0x0ff
-#define GBOX_BUSY_BITOFF             31
-#define GBOX_OPCODE_BITOFF           16
-#define GBOX_OPCODE_BITLEN           10
-#define GBOX_REG_ACC_W_SIZE_BITOFF   0
-#define GBOX_REG_ACC_W_SIZE_BITLEN   8
-#define GBOX_STATUS_BITOFF           28
-#define GBOX_STATUS_BITLEN           3
-#define GBOX_STATUS1_BITOFF          8
-#define GBOX_STATUS1_BITLEN          7
-#define GBOX_READ_SIZE_BITOFF        0
-#define GBOX_READ_SIZE_BITLEN        8
+#define GBOX_MAX_DATA_SIZE 256
+#define GBOX_STAT_CFG_NOT_DONE_ADDR 0x90000
+#define GBOX_REG_ACCESS_CMD_OPCODE 0x0ff
+#define GBOX_BUSY_BITOFF 31
+#define GBOX_OPCODE_BITOFF 16
+#define GBOX_OPCODE_BITLEN 10
+#define GBOX_REG_ACC_W_SIZE_BITOFF 0
+#define GBOX_REG_ACC_W_SIZE_BITLEN 8
+#define GBOX_STATUS_BITOFF 28
+#define GBOX_STATUS_BITLEN 3
+#define GBOX_STATUS1_BITOFF 8
+#define GBOX_STATUS1_BITLEN 7
+#define GBOX_READ_SIZE_BITOFF 0
+#define GBOX_READ_SIZE_BITLEN 8
 /*
  * General Macros
  */
-#define CHECK_RC(rc) if ((rc)) {return (rc); }
-#define CHECK_RC_GO_TO(rc, lable) if ((rc)) {goto lable; }
-#define DBG_PRINTF(...) do { if (getenv("MFT_DEBUG") != NULL) { fprintf(stderr, __VA_ARGS__); } } while (0)
+#define CHECK_RC(rc) \
+    if ((rc))        \
+    {                \
+        return (rc); \
+    }
+#define CHECK_RC_GO_TO(rc, lable) \
+    if ((rc))                     \
+    {                             \
+        goto lable;               \
+    }
+#define DBG_PRINTF(...)                   \
+    do                                    \
+    {                                     \
+        if (getenv("MFT_DEBUG") != NULL)  \
+        {                                 \
+            fprintf(stderr, __VA_ARGS__); \
+        }                                 \
+    } while (0)
 /*
  * Macros for accessing CR-Space
  */
-#define MWRITE_BUF(mf, offset, data, byte_len)                                             \
-    (((unsigned)(mwrite_buffer((mf), (offset), (data), (byte_len))) != (unsigned)(byte_len))  \
-     ? ME_ICMD_STATUS_CR_FAIL : ME_OK)
-#define MREAD_BUF(mf, offset, data, byte_len)                                              \
-    (((unsigned)(mread_buffer((mf), (offset), (data), (byte_len))) != (unsigned)(byte_len))   \
-     ? ME_ICMD_STATUS_CR_FAIL : ME_OK)
-
-#define MWRITE4(mf, offset, value)                             \
-    (((unsigned)(mwrite4((mf), (offset), (value))) != 4U)      \
-     ? ME_ICMD_STATUS_CR_FAIL : ME_OK)
-#define MREAD4(mf, offset, ptr)                                \
-    (((unsigned)(mread4((mf), (offset), (ptr))) != 4U)         \
-     ? ME_ICMD_STATUS_CR_FAIL : ME_OK)
+#define MWRITE_BUF(mf, offset, data, byte_len)                                                 \
+    (((unsigned)(mwrite_buffer((mf), (offset), (data), (byte_len))) != (unsigned)(byte_len)) ? \
+       ME_ICMD_STATUS_CR_FAIL :                                                                \
+       ME_OK)
+#define MREAD_BUF(mf, offset, data, byte_len)                                                                          \
+    (((unsigned)(mread_buffer((mf), (offset), (data), (byte_len))) != (unsigned)(byte_len)) ? ME_ICMD_STATUS_CR_FAIL : \
+                                                                                              ME_OK)
+
+#define MWRITE4(mf, offset, value) \
+    (((unsigned)(mwrite4((mf), (offset), (value))) != 4U) ? ME_ICMD_STATUS_CR_FAIL : ME_OK)
+#define MREAD4(mf, offset, ptr) (((unsigned)(mread4((mf), (offset), (ptr))) != 4U) ? ME_ICMD_STATUS_CR_FAIL : ME_OK)
 
 /*
  * Macros for accessing Icmd Space
  */
-#define SET_SPACE_FOR_ICMD_ACCESS(mf)   \
-    if (mf->vsec_supp) {               \
-        mset_addr_space(mf, AS_ICMD);   \
+#define SET_SPACE_FOR_ICMD_ACCESS(mf) \
+    if (mf->vsec_supp)                \
+    {                                 \
+        mset_addr_space(mf, AS_ICMD); \
     }
-#define SET_SPACE_FOR_SEMAPHORE_ACCESS(mf)   \
-    if (mf->vsec_supp) {               \
-        mset_addr_space(mf, AS_SEMAPHORE);   \
+#define SET_SPACE_FOR_SEMAPHORE_ACCESS(mf) \
+    if (mf->vsec_supp)                     \
+    {                                      \
+        mset_addr_space(mf, AS_SEMAPHORE); \
     }
 #define RESTORE_SPACE(mf) mset_addr_space(mf, AS_CR_SPACE)
 
-    static int MWRITE4_ICMD(mfile* mf, int offset, u_int32_t value)
-    { 
-        SET_SPACE_FOR_ICMD_ACCESS(mf); 
-        DBG_PRINTF("-D- MWRITE4_ICMD: off: %x, addr_space: %x\n", offset, mf->address_space); 
-        if (mwrite4(mf, offset, value) != 4) { 
-            mset_addr_space(mf, AS_CR_SPACE); 
-            return ME_ICMD_STATUS_CR_FAIL;
-        } 
-        RESTORE_SPACE(mf); 
-        return ME_OK;
-    } 
-
+static int MWRITE4_ICMD(mfile* mf, int offset, u_int32_t value)
+{
+    SET_SPACE_FOR_ICMD_ACCESS(mf);
+    DBG_PRINTF("-D- MWRITE4_ICMD: off: %x, addr_space: %x\n", offset, mf->address_space);
+    if (mwrite4(mf, offset, value) != 4)
+    {
+        mset_addr_space(mf, AS_CR_SPACE);
+        return ME_ICMD_STATUS_CR_FAIL;
+    }
+    RESTORE_SPACE(mf);
+    return ME_OK;
+}
 
-    static int MREAD4_ICMD(mfile* mf, int offset, u_int32_t* ptr)
+static int MREAD4_ICMD(mfile* mf, int offset, u_int32_t* ptr)
+{
+    SET_SPACE_FOR_ICMD_ACCESS(mf);
+    DBG_PRINTF("-D- MREAD4_ICMD: off: %x, addr_space: %x\r\n", offset, mf->address_space);
+    if (mread4(mf, offset, ptr) != 4)
     {
-        SET_SPACE_FOR_ICMD_ACCESS(mf); 
-        DBG_PRINTF("-D- MREAD4_ICMD: off: %x, addr_space: %x\r\n", offset, mf->address_space); 
-        if (mread4(mf, offset, ptr) != 4) { 
-            RESTORE_SPACE(mf); 
-            return ME_ICMD_STATUS_CR_FAIL;
-        } 
-        RESTORE_SPACE(mf); 
-        return ME_OK;
+        RESTORE_SPACE(mf);
+        return ME_ICMD_STATUS_CR_FAIL;
     }
+    RESTORE_SPACE(mf);
+    return ME_OK;
+}
 
-#define MWRITE_BUF_ICMD(mf, offset, data, byte_len, action_on_fail) \
-    do { \
+#define MWRITE_BUF_ICMD(mf, offset, data, byte_len, action_on_fail)                              \
+    do                                                                                           \
+    {                                                                                            \
         DBG_PRINTF("-D- MWRITE_BUF_ICMD: off: %x, addr_space: %x\n", offset, mf->address_space); \
-        SET_SPACE_FOR_ICMD_ACCESS(mf); \
-        if ((unsigned)mwrite_buffer(mf, offset, data, byte_len) != (unsigned)byte_len) { \
-            RESTORE_SPACE(mf); \
-            action_on_fail; \
-        } \
-        RESTORE_SPACE(mf); \
+        SET_SPACE_FOR_ICMD_ACCESS(mf);                                                           \
+        if ((unsigned)mwrite_buffer(mf, offset, data, byte_len) != (unsigned)byte_len)           \
+        {                                                                                        \
+            RESTORE_SPACE(mf);                                                                   \
+            action_on_fail;                                                                      \
+        }                                                                                        \
+        RESTORE_SPACE(mf);                                                                       \
     } while (0)
 
-#define MREAD_BUF_ICMD(mf, offset, data, byte_len, action_on_fail) \
-    do { \
+#define MREAD_BUF_ICMD(mf, offset, data, byte_len, action_on_fail)                              \
+    do                                                                                          \
+    {                                                                                           \
         DBG_PRINTF("-D- MREAD_BUF_ICMD: off: %x, addr_space: %x\n", offset, mf->address_space); \
-        SET_SPACE_FOR_ICMD_ACCESS(mf); \
-        if ((unsigned)mread_buffer(mf, offset, data, byte_len) != (unsigned)byte_len) { \
-            RESTORE_SPACE(mf); \
-            action_on_fail; \
-        } \
-        RESTORE_SPACE(mf); \
+        SET_SPACE_FOR_ICMD_ACCESS(mf);                                                          \
+        if ((unsigned)mread_buffer(mf, offset, data, byte_len) != (unsigned)byte_len)           \
+        {                                                                                       \
+            RESTORE_SPACE(mf);                                                                  \
+            action_on_fail;                                                                     \
+        }                                                                                       \
+        RESTORE_SPACE(mf);                                                                      \
     } while (0)
 
 /*
  * Macros for accessing semaphore space
  */
-    int MWRITE4_SEMAPHORE(mfile* mf, int offset, int value)
-    { 
-        SET_SPACE_FOR_SEMAPHORE_ACCESS(mf); 
-        if (mwrite4(mf, offset, value) != 4) { 
-            RESTORE_SPACE(mf); 
-            return ME_ICMD_STATUS_CR_FAIL;
-        } 
-        RESTORE_SPACE(mf); 
-        return ME_OK;
+int MWRITE4_SEMAPHORE(mfile* mf, int offset, int value)
+{
+    SET_SPACE_FOR_SEMAPHORE_ACCESS(mf);
+    if (mwrite4(mf, offset, value) != 4)
+    {
+        RESTORE_SPACE(mf);
+        return ME_ICMD_STATUS_CR_FAIL;
     }
+    RESTORE_SPACE(mf);
+    return ME_OK;
+}
 
-
-    int MREAD4_SEMAPHORE(mfile* mf, int offset, u_int32_t* ptr) 
+int MREAD4_SEMAPHORE(mfile* mf, int offset, u_int32_t* ptr)
+{
+    SET_SPACE_FOR_SEMAPHORE_ACCESS(mf);
+    if (mread4(mf, offset, ptr) != 4)
     {
-        SET_SPACE_FOR_SEMAPHORE_ACCESS(mf); 
-        if (mread4(mf, offset, ptr) != 4) { 
-            RESTORE_SPACE(mf); 
-            return ME_ICMD_STATUS_CR_FAIL;
-        } 
-        RESTORE_SPACE(mf); 
-        return ME_OK;
+        RESTORE_SPACE(mf);
+        return ME_ICMD_STATUS_CR_FAIL;
     }
+    RESTORE_SPACE(mf);
+    return ME_OK;
+}
 
-enum {
-    RW_READ  = 0x1,
+enum
+{
+    RW_READ = 0x1,
     RW_WRITE = 0x0
 };
 
@@ -248,31 +269,34 @@ enum {
  *  according to Hw devid
  */
 
-#define HW_ID_ADDR      0xf0014
-#define CIB_HW_ID       511
-#define CX4_HW_ID       521
-#define CX4LX_HW_ID     523
-#define CX5_HW_ID       525
-#define CX6_HW_ID       527
-#define CX6DX_HW_ID     530
-#define CX6LX_HW_ID     534
-#define CX7_HW_ID       536
-#define BF_HW_ID        529
-#define BF2_HW_ID       532
-#define BF3_HW_ID       540
-#define SW_IB_HW_ID     583
-#define SW_EN_HW_ID     585
-#define SW_IB2_HW_ID    587
-#define QUANTUM_HW_ID   589
+#define HW_ID_ADDR 0xf0014
+#define CIB_HW_ID 511
+#define CX4_HW_ID 521
+#define CX4LX_HW_ID 523
+#define CX5_HW_ID 525
+#define CX6_HW_ID 527
+#define CX6DX_HW_ID 530
+#define CX6LX_HW_ID 534
+#define CX7_HW_ID 536
+#define BF_HW_ID 529
+#define BF2_HW_ID 532
+#define BF3_HW_ID 540
+#define SW_IB_HW_ID 583
+#define SW_EN_HW_ID 585
+#define SW_IB2_HW_ID 587
+#define QUANTUM_HW_ID 589
 #define SPECTRUM2_HW_ID 590
 #define SPECTRUM3_HW_ID 592
-#define QUANTUM2_HW_ID  599
+#define QUANTUM2_HW_ID 599
 #define SPECTRUM4_HW_ID 596
 #define AMOS_GBOX_HW_ID 594
 
 /***** GLOBALS *****/
 int increase_poll_time = 0;
-void  set_increase_poll_time(int new_value) { increase_poll_time = new_value; }
+void set_increase_poll_time(int new_value)
+{
+    increase_poll_time = new_value;
+}
 
 u_int32_t gbox_gw_start_addr = 0xffff;
 /***** GLOBALS *****/
@@ -281,17 +305,18 @@ u_int32_t gbox_gw_start_addr = 0xffff;
 /*
  * get_version
  */
-static int get_version(mfile *mf, u_int32_t hcr_address)
+static int get_version(mfile* mf, u_int32_t hcr_address)
 {
     u_int32_t reg = 0x0;
-    if (MREAD4(mf, hcr_address, &reg)) {
+    if (MREAD4(mf, hcr_address, &reg))
+    {
         return ME_ICMD_STATUS_CR_FAIL;
     }
     reg = EXTRACT(reg, ICMD_VERSION_BITOFF, ICMD_VERSION_BITLEN);
     return reg;
 }
 
-static MError check_busy_bit(mfile *mf, int busy_bit_offset, u_int32_t *reg) 
+static MError check_busy_bit(mfile* mf, int busy_bit_offset, u_int32_t* reg)
 {
     DBG_PRINTF("Check Go bit\n");
     int rc = MREAD4_ICMD(mf, mf->icmd.ctrl_addr, reg);
@@ -300,7 +325,7 @@ static MError check_busy_bit(mfile *mf, int busy_bit_offset, u_int32_t *reg)
     return EXTRACT((*reg), busy_bit_offset, BUSY_BITLEN);
 }
 
-static MError set_busy_bit(mfile *mf, u_int32_t *reg, int busy_bit_offset) 
+static MError set_busy_bit(mfile* mf, u_int32_t* reg, int busy_bit_offset)
 {
     *reg = MERGE(*reg, 1, busy_bit_offset, BUSY_BITLEN);
     return MWRITE4_ICMD(mf, mf->icmd.ctrl_addr, *reg);
@@ -308,21 +333,25 @@ static MError set_busy_bit(mfile *mf, u_int32_t *reg, int busy_bit_offset)
 
 static int set_sleep()
 {
-    char *icmd_sleep_env;
+    char* icmd_sleep_env;
     int icmd_sleep = -1;
 
-    if (increase_poll_time) {
+    if (increase_poll_time)
+    {
         // increase_poll_time is set by low_cpu flag. To reduce CPU utilization
         icmd_sleep_env = "10\0";
     }
-    else {
+    else
+    {
         icmd_sleep_env = getenv("MFT_CMD_SLEEP");
     }
 
-    if (icmd_sleep_env) {
-        char *endptr;
+    if (icmd_sleep_env)
+    {
+        char* endptr;
         icmd_sleep = strtol(icmd_sleep_env, &endptr, 10);
-        if (*endptr != '\0') {
+        if (*endptr != '\0')
+        {
             icmd_sleep = -1;
         }
     }
@@ -337,10 +366,12 @@ static int set_icmd_timeout()
 
     icmd_timeout_env = getenv("MFT_ICMD_TIMEOUT");
 
-    if (icmd_timeout_env) {
+    if (icmd_timeout_env)
+    {
         char* endptr;
         icmd_timeout = strtol(icmd_timeout_env, &endptr, 10);
-        if (endptr != NULL && *endptr != '\0') {
+        if (endptr != NULL && *endptr != '\0')
+        {
             icmd_timeout = ICMD_DEFAULT_TIMEOUT;
         }
     }
@@ -353,66 +384,68 @@ static int set_icmd_timeout()
  */
 static int translate_status(int status)
 {
-    switch (status) {
-    case 0x0:
-        return ME_OK;
+    switch (status)
+    {
+        case 0x0:
+            return ME_OK;
 
-    case 0x1:
-        return ME_ICMD_INVALID_OPCODE;
+        case 0x1:
+            return ME_ICMD_INVALID_OPCODE;
 
-    case 0x2:
-        return ME_ICMD_INVALID_CMD;
+        case 0x2:
+            return ME_ICMD_INVALID_CMD;
 
-    case 0x3:
-        return ME_ICMD_OPERATIONAL_ERROR;
+        case 0x3:
+            return ME_ICMD_OPERATIONAL_ERROR;
 
-    case 0x4:
-        return ME_ICMD_BAD_PARAM;
+        case 0x4:
+            return ME_ICMD_BAD_PARAM;
 
-    case 0x5:
-        return ME_ICMD_BUSY;
+        case 0x5:
+            return ME_ICMD_BUSY;
 
-    case 0x6:
-        return ME_ICMD_ICM_NOT_AVAIL;
+        case 0x6:
+            return ME_ICMD_ICM_NOT_AVAIL;
 
-    case 0x7:
-        return ME_ICMD_WRITE_PROTECT;
+        case 0x7:
+            return ME_ICMD_WRITE_PROTECT;
 
-    default:
-        return ME_ICMD_UNKNOWN_STATUS;
+        default:
+            return ME_ICMD_UNKNOWN_STATUS;
     }
 }
 
 static int translate_gbox_icmd_status(int status)
 {
-    switch (status) {
-    case 0x0:
-        return ME_OK;
+    switch (status)
+    {
+        case 0x0:
+            return ME_OK;
 
-    case 0x1:
-        return ME_ERROR;
+        case 0x1:
+            return ME_ERROR;
 
-    case 0x2:
-        return ME_UNKOWN_ACCESS_TYPE;
+        case 0x2:
+            return ME_UNKOWN_ACCESS_TYPE;
 
-    case 0x3:
-        return ME_ICMD_BAD_PARAM;
+        case 0x3:
+            return ME_ICMD_BAD_PARAM;
 
-    case 0x6:
-        return ME_TIMEOUT;
+        case 0x6:
+            return ME_TIMEOUT;
 
-    case 0x7:
-        return ME_ICMD_NOT_SUPPORTED;
+        case 0x7:
+            return ME_ICMD_NOT_SUPPORTED;
 
-    default:
-        return ME_ICMD_UNKNOWN_STATUS;
+        default:
+            return ME_ICMD_UNKNOWN_STATUS;
     }
 }
 
 /*
  * set_and_poll_on_busy_bit - Sets the busy bit to 1, wait untill it is 0 again.
  */
-static int set_and_poll_on_busy_bit(mfile *mf, int enhanced, int busy_bit_offset, u_int32_t* reg)
+static int set_and_poll_on_busy_bit(mfile* mf, int enhanced, int busy_bit_offset, u_int32_t* reg)
 {
     u_int32_t busy;
     int i, wait;
@@ -429,41 +462,58 @@ static int set_and_poll_on_busy_bit(mfile *mf, int enhanced, int busy_bit_offset
     int icmd_timeout = set_icmd_timeout();
 
     // wait for command to execute
-    i = 0; wait = 1;
-    do {
-        if (++i > icmd_timeout) {
+    i = 0;
+    wait = 1;
+    do
+    {
+        if (++i > icmd_timeout)
+        {
             // this number of iterations should take ~~30sec, which is the defined command t/o
             DBG_PRINTF("Execution timed-out\n");
             return ME_ICMD_STATUS_EXECUTE_TO;
         }
 
-        if ((i < 100) || (i % 100 == 0)) {
+        if ((i < 100) || (i % 100 == 0))
+        {
             DBG_PRINTF("Waiting for busy-bit to clear (iteration #%d)...\n", i);
         }
 
-        if (icmd_sleep > 0) {
-            if (i == 3) {
+        if (icmd_sleep > 0)
+        {
+            if (i == 3)
+            {
                 msleep(icmd_sleep);
-            } else if (i > 3) {
+            }
+            else if (i > 3)
+            {
                 msleep(wait);
-                if (wait < 8) {
-                    wait *= 2;              // exponential backoff - up-to 8ms between polls
+                if (wait < 8)
+                {
+                    wait *= 2; // exponential backoff - up-to 8ms between polls
                 }
             }
-            if(increase_poll_time) {
+            if (increase_poll_time)
+            {
                 // adding msleep to reduce the CPU utilization (low_cpu flag)
                 msleep(10);
             }
-        } else {
-            if(!enhanced) {
-                if (i > 5) {
+        }
+        else
+        {
+            if (!enhanced)
+            {
+                if (i > 5)
+                {
                     // after some iteration put sleeps between busy-wait
-                    msleep(wait);  // don't hog the cpu with busy-wait
-                    if (wait < 8) {
-                        wait *= 2;              // exponential backoff - up-to 8ms between polls
+                    msleep(wait); // don't hog the cpu with busy-wait
+                    if (wait < 8)
+                    {
+                        wait *= 2; // exponential backoff - up-to 8ms between polls
                     }
                 }
-            } else {
+            }
+            else
+            {
 #ifdef _MSC_VER
                 msleep(1);
 #else
@@ -478,14 +528,13 @@ static int set_and_poll_on_busy_bit(mfile *mf, int enhanced, int busy_bit_offset
 
     DBG_PRINTF("Command completed!\n");
 
-
     return ME_OK;
 }
 
 /*
  * set_opcode
  */
-static int set_opcode(mfile *mf, u_int16_t opcode)
+static int set_opcode(mfile* mf, u_int16_t opcode)
 {
     u_int32_t reg = 0x0;
     u_int8_t exmb = mf->icmd.dma_icmd;
@@ -504,57 +553,62 @@ static int set_opcode(mfile *mf, u_int16_t opcode)
 /*
  * icmd_is_cmd_ifc_ready
  */
-static int icmd_is_cmd_ifc_ready(mfile *mf, int enhanced)
+static int icmd_is_cmd_ifc_ready(mfile* mf, int enhanced)
 {
     u_int32_t reg = 0x0;
-    if(!enhanced || mf->icmd.icmd_ready == MTCR_STATUS_UNKNOWN) {
+    if (!enhanced || mf->icmd.icmd_ready == MTCR_STATUS_UNKNOWN)
+    {
         u_int32_t bit_val = 0;
-        if (MREAD4(mf, mf->icmd.static_cfg_not_done_addr, &reg)) {
+        if (MREAD4(mf, mf->icmd.static_cfg_not_done_addr, &reg))
+        {
             return ME_ICMD_STATUS_CR_FAIL;
         }
         bit_val = EXTRACT(reg, mf->icmd.static_cfg_not_done_offs, 1);
         mf->icmd.icmd_ready = (bit_val == 0) ? MTCR_STATUS_TRUE : MTCR_STATUS_FALSE;
     }
-    return (mf->icmd.icmd_ready == MTCR_STATUS_TRUE) ?  ME_OK : ME_ICMD_STATUS_ICMD_NOT_READY;
+    return (mf->icmd.icmd_ready == MTCR_STATUS_TRUE) ? ME_OK : ME_ICMD_STATUS_ICMD_NOT_READY;
 }
 
 #define SMP_ICMD_SEM_ADDR 0x0
 
-static int icmd_clear_semaphore_com(mfile *mf)
+static int icmd_clear_semaphore_com(mfile* mf)
 {
 #ifndef __FreeBSD__
     int is_leaseable;
     u_int8_t lease_exp;
-    if ((mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CIB  ||
-         mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CX4) &&
-        mf->icmd.ib_semaphore_lock_supported) {
-        if (!mf->icmd.lock_key) {
+    if ((mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CIB || mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CX4) &&
+        mf->icmd.ib_semaphore_lock_supported)
+    {
+        if (!mf->icmd.lock_key)
+        {
             return ME_OK;
         }
         DBG_PRINTF("VS_MAD SEM Release .. ");
-        if (mib_semaphore_lock_vs_mad(mf, SMP_SEM_RELEASE, SMP_ICMD_SEM_ADDR, mf->icmd.lock_key,
-                                      &(mf->icmd.lock_key), &is_leaseable, &lease_exp, SEM_LOCK_SET)) {
+        if (mib_semaphore_lock_vs_mad(mf, SMP_SEM_RELEASE, SMP_ICMD_SEM_ADDR, mf->icmd.lock_key, &(mf->icmd.lock_key),
+                                      &is_leaseable, &lease_exp, SEM_LOCK_SET))
+        {
             DBG_PRINTF("Failed!\n");
             return ME_ICMD_STATUS_CR_FAIL;
         }
-        if (mf->icmd.lock_key != 0) {
+        if (mf->icmd.lock_key != 0)
+        {
             return ME_ICMD_STATUS_CR_FAIL;
         }
         DBG_PRINTF("Succeeded!\n");
-    } else
+    }
+    else
 #endif
     {
         MWRITE4_SEMAPHORE(mf, mf->icmd.semaphore_addr, 0);
     }
     mf->icmd.took_semaphore = 0;
-    return ME_OK; 
+    return ME_OK;
 }
 
-
 /*
  * icmd_clear_semaphore
  */
-int icmd_clear_semaphore(mfile *mf)
+int icmd_clear_semaphore(mfile* mf)
 {
     DBG_PRINTF("Clearing semaphore\n");
     // open icmd interface by demand
@@ -570,43 +624,50 @@ int icmd_clear_semaphore(mfile *mf)
  * icmd_take_semaphore
  */
 
-static int icmd_take_semaphore_com(mfile *mf, u_int32_t expected_read_val)
+static int icmd_take_semaphore_com(mfile* mf, u_int32_t expected_read_val)
 {
     u_int32_t read_val = 0x0;
     unsigned retries = 0;
 
     DBG_PRINTF("Taking semaphore...\n");
-    do {     // loop while the semaphore is taken by someone else
-        if (++retries > 256) {
+    do
+    { // loop while the semaphore is taken by someone else
+        if (++retries > 256)
+        {
             return ME_ICMD_STATUS_SEMAPHORE_TO;
         }
 #ifndef __FreeBSD__
         int is_leaseable;
         u_int8_t lease_exp;
-        if ((mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CIB  ||
-             mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CX4) &&
-            mf->icmd.ib_semaphore_lock_supported) {
+        if ((mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CIB || mf->icmd.semaphore_addr == SEMAPHORE_ADDR_CX4) &&
+            mf->icmd.ib_semaphore_lock_supported)
+        {
             DBG_PRINTF("VS_MAD SEM LOCK .. ");
-            read_val = mib_semaphore_lock_vs_mad(mf, SMP_SEM_LOCK, SMP_ICMD_SEM_ADDR, 0,
-                                                 &(mf->icmd.lock_key), &is_leaseable, &lease_exp, SEM_LOCK_SET);
-            if (read_val && read_val != ME_MAD_BUSY) {
+            read_val = mib_semaphore_lock_vs_mad(mf, SMP_SEM_LOCK, SMP_ICMD_SEM_ADDR, 0, &(mf->icmd.lock_key),
+                                                 &is_leaseable, &lease_exp, SEM_LOCK_SET);
+            if (read_val && read_val != ME_MAD_BUSY)
+            {
                 DBG_PRINTF("Failed!\n");
                 return ME_ICMD_STATUS_ICMD_NOT_READY;
             }
             /* Fail to obtain the lock */
-            if (mf->icmd.lock_key == 0) {
+            if (mf->icmd.lock_key == 0)
+            {
                 read_val = 1;
             }
             DBG_PRINTF("Succeeded!\n");
-        } else
+        }
+        else
 #endif
         {
-            if (mf->vsec_supp) {
-                //write expected val before reading it
+            if (mf->vsec_supp)
+            {
+                // write expected val before reading it
                 MWRITE4_SEMAPHORE(mf, mf->icmd.semaphore_addr, expected_read_val);
             }
             MREAD4_SEMAPHORE(mf, mf->icmd.semaphore_addr, &read_val);
-            if (read_val == expected_read_val) {
+            if (read_val == expected_read_val)
+            {
                 break;
             }
         }
@@ -619,7 +680,7 @@ static int icmd_take_semaphore_com(mfile *mf, u_int32_t expected_read_val)
     return ME_OK;
 }
 
-int icmd_take_semaphore(mfile *mf)
+int icmd_take_semaphore(mfile* mf)
 {
     // open icmd interface by demand
     int ret;
@@ -627,12 +688,16 @@ int icmd_take_semaphore(mfile *mf)
     ret = icmd_open(mf);
     CHECK_RC(ret);
 
-    if (mf->vsec_supp) {
-        if (!pid) {
+    if (mf->vsec_supp)
+    {
+        if (!pid)
+        {
             pid = getpid();
         }
         return icmd_take_semaphore_com(mf, pid);
-    } else {
+    }
+    else
+    {
         return icmd_take_semaphore_com(mf, 0);
     }
 }
@@ -640,8 +705,8 @@ int icmd_take_semaphore(mfile *mf)
 static int check_msg_size(mfile* mf, int write_data_size, int read_data_size)
 {
     // check data size does not exceed mailbox size
-    if (write_data_size > (int)mf->icmd.max_cmd_size || 
-        read_data_size > (int)mf->icmd.max_cmd_size) {
+    if (write_data_size > (int)mf->icmd.max_cmd_size || read_data_size > (int)mf->icmd.max_cmd_size)
+    {
         DBG_PRINTF("write_data_size <%x-%x> mf->icmd.max_cmd_size .. ", write_data_size, mf->icmd.max_cmd_size);
         DBG_PRINTF("read_data_size <%x-%x> mf->icmd.max_cmd_size\n", read_data_size, mf->icmd.max_cmd_size);
         return ME_ICMD_SIZE_EXCEEDS_LIMIT;
@@ -649,15 +714,14 @@ static int check_msg_size(mfile* mf, int write_data_size, int read_data_size)
     return ME_OK;
 }
 
-static int icmd_send_command_com(mfile    *mf,
+static int icmd_send_command_com(mfile* mf,
                                  IN int opcode,
-                                 INOUT void *data,
+                                 INOUT void* data,
                                  IN int write_data_size,
                                  IN int read_data_size,
                                  IN int skip_write,
                                  IN int enhanced)
 {
-
     int ret;
     // open icmd interface by demand
     ret = icmd_open(mf);
@@ -668,7 +732,8 @@ static int icmd_send_command_com(mfile    *mf,
 
     ret = icmd_is_cmd_ifc_ready(mf, enhanced);
     CHECK_RC(ret);
-    if(!enhanced) {
+    if (!enhanced)
+    {
         ret = icmd_take_semaphore(mf);
         CHECK_RC(ret);
     }
@@ -676,19 +741,25 @@ static int icmd_send_command_com(mfile    *mf,
     ret = set_opcode(mf, opcode);
     CHECK_RC_GO_TO(ret, cleanup);
 
-    if (!skip_write) {
+    if (!skip_write)
+    {
         DBG_PRINTF("-D- Writing command to mailbox\n");
-        if (mf->icmd.dma_icmd) {
-            if (mtcr_memaccess(mf, 0, read_data_size, data, 1, MEM_ICMD)) {
+        if (mf->icmd.dma_icmd)
+        {
+            if (mtcr_memaccess(mf, 0, read_data_size, data, 1, MEM_ICMD))
+            {
                 ret = ME_ICMD_STATUS_CR_FAIL;
                 goto cleanup;
             }
-        } else {
+        }
+        else
+        {
             MWRITE_BUF_ICMD(mf, mf->icmd.cmd_addr, data, write_data_size, ret = ME_ICMD_STATUS_CR_FAIL; goto cleanup;);
         }
     }
 
-    if (mf->icmd.dma_icmd) {
+    if (mf->icmd.dma_icmd)
+    {
         ret = MWRITE4_ICMD(mf, mf->icmd.ctrl_addr + EXT_MBOX_DMA_OFF, EXTRACT64(mf->icmd.dma_pa, 32, 32));
         CHECK_RC(ret);
         ret = MWRITE4_ICMD(mf, mf->icmd.ctrl_addr + EXT_MBOX_DMA_OFF + 4, EXTRACT64(mf->icmd.dma_pa, 0, 32));
@@ -697,54 +768,60 @@ static int icmd_send_command_com(mfile    *mf,
 
     u_int32_t reg = 0x0;
     // check go bit down
-    ret = check_busy_bit(mf,  BUSY_BITOFF, &reg);
+    ret = check_busy_bit(mf, BUSY_BITOFF, &reg);
     CHECK_RC(ret);
 
-    // set go bit + poll + returned status 
+    // set go bit + poll + returned status
     ret = set_and_poll_on_busy_bit(mf, enhanced, BUSY_BITOFF, &reg);
     CHECK_RC_GO_TO(ret, cleanup);
 
-    // get status 
+    // get status
     ret = translate_status(EXTRACT(reg, STATUS_BITOFF, STATUS_BITLEN));
     CHECK_RC_GO_TO(ret, cleanup);
 
     DBG_PRINTF("-D- Reading command from mailbox");
 
-    if (mf->icmd.dma_icmd) {
-        if (mtcr_memaccess(mf, 0, read_data_size, data, 0, MEM_ICMD)) {
+    if (mf->icmd.dma_icmd)
+    {
+        if (mtcr_memaccess(mf, 0, read_data_size, data, 0, MEM_ICMD))
+        {
             ret = ME_ICMD_STATUS_CR_FAIL;
             goto cleanup;
         }
-    } else {
+    }
+    else
+    {
         MREAD_BUF_ICMD(mf, mf->icmd.cmd_addr, data, read_data_size, ret = ME_ICMD_STATUS_CR_FAIL; goto cleanup;);
     }
 
     ret = ME_OK;
 cleanup:
-    if(!enhanced) {
-        (void) icmd_clear_semaphore(mf);
+    if (!enhanced)
+    {
+        (void)icmd_clear_semaphore(mf);
     }
     return ret;
 }
 
-
 /*
  * set_gbox_gw_opcode_block
  */
 static u_int32_t set_gbox_gw_opcode_block(u_int16_t opcode, int size)
 {
     u_int32_t reg = 0x0;
-   
-    reg = MERGE(reg, (u_int32_t)(size/4), GBOX_REG_ACC_W_SIZE_BITOFF, GBOX_REG_ACC_W_SIZE_BITLEN);
+
+    reg = MERGE(reg, (u_int32_t)(size / 4), GBOX_REG_ACC_W_SIZE_BITOFF, GBOX_REG_ACC_W_SIZE_BITLEN);
     reg = MERGE(reg, opcode, GBOX_OPCODE_BITOFF, GBOX_OPCODE_BITLEN);
     return reg;
 }
 
-static MError get_gbox_gw_start_addr(mfile *mf, u_int32_t* start_addr)
+static MError get_gbox_gw_start_addr(mfile* mf, u_int32_t* start_addr)
 {
-    // get gbox_gw_start_addr by reading cr-space only once  
-    if (gbox_gw_start_addr == 0xffff) {
-        if (MREAD4(mf, CMD_PTR_ADDR_GBOX, &gbox_gw_start_addr)) {
+    // get gbox_gw_start_addr by reading cr-space only once
+    if (gbox_gw_start_addr == 0xffff)
+    {
+        if (MREAD4(mf, CMD_PTR_ADDR_GBOX, &gbox_gw_start_addr))
+        {
             return ME_ICMD_STATUS_CR_FAIL;
         }
         // no need to /4
@@ -752,20 +829,18 @@ static MError get_gbox_gw_start_addr(mfile *mf, u_int32_t* start_addr)
         *start_addr = gbox_gw_start_addr;
     }
     return ME_OK;
-} 
+}
 
-static int icmd_send_gbox_command_com(mfile      *mf,
-                                      INOUT void *data,
-                                      IN int     write_data_size,
-                                      IN int     read_data_size,
-                                      IN int     enhanced)
+static int
+  icmd_send_gbox_command_com(mfile* mf, INOUT void* data, IN int write_data_size, IN int read_data_size, IN int enhanced)
 {
     int ret;
     u_int32_t data_start_off = 0x0;
-    u_int8_t buffer[GBOX_MAX_DATA_SIZE+4] = {0};
+    u_int8_t buffer[GBOX_MAX_DATA_SIZE + 4] = {0};
     u_int32_t reg = 0x0;
 
-    if (mf->gb_info.gb_conn_type != GEARBPX_OVER_MTUSB) {
+    if (mf->gb_info.gb_conn_type != GEARBPX_OVER_MTUSB)
+    {
         // wasn't supposed to get here
         return ME_ERROR;
     }
@@ -779,13 +854,14 @@ static int icmd_send_gbox_command_com(mfile      *mf,
 
     ret = icmd_is_cmd_ifc_ready(mf, enhanced);
     CHECK_RC(ret);
-    if(!enhanced) {
+    if (!enhanced)
+    {
         ret = icmd_take_semaphore(mf);
         CHECK_RC(ret);
     }
 
     // check go bit down
-    ret = check_busy_bit(mf,  GBOX_BUSY_BITOFF, &reg);
+    ret = check_busy_bit(mf, GBOX_BUSY_BITOFF, &reg);
     CHECK_RC(ret);
 
     // write to data request section
@@ -801,11 +877,11 @@ static int icmd_send_gbox_command_com(mfile      *mf,
     ret = set_and_poll_on_busy_bit(mf, enhanced, GBOX_BUSY_BITOFF, &reg);
     CHECK_RC_GO_TO(ret, sem_cleanup);
 
-    // get status 
+    // get status
     ret = translate_gbox_icmd_status(EXTRACT(reg, GBOX_STATUS_BITOFF, GBOX_STATUS_BITLEN));
     CHECK_RC_GO_TO(ret, sem_cleanup);
     ret = EXTRACT(reg, GBOX_STATUS1_BITOFF, GBOX_STATUS1_BITLEN);
-  
+
     // read response
     DBG_PRINTF("-D- Reading command from mailbox");
     // no need to read size, it is the same (fw dont change this field) - uncommnet if logic will change
@@ -814,25 +890,23 @@ static int icmd_send_gbox_command_com(mfile      *mf,
 
     // reset buffer
     memset(buffer, 0, GBOX_MAX_DATA_SIZE);
-    // put register status in first 4 bytes 
+    // put register status in first 4 bytes
     memcpy(buffer, &ret, 4);
     // get response data (into buffer+4)
-    MREAD_BUF_ICMD(mf, mf->gb_info.data_res_addr, buffer + 4, orig_reg_size, ret = ME_ICMD_STATUS_CR_FAIL; goto sem_cleanup;);
-    memcpy(data, buffer, read_data_size);      // read_data_size is same as orig size + 4
+    MREAD_BUF_ICMD(mf, mf->gb_info.data_res_addr, buffer + 4, orig_reg_size, ret = ME_ICMD_STATUS_CR_FAIL;
+                   goto sem_cleanup;);
+    memcpy(data, buffer, read_data_size); // read_data_size is same as orig size + 4
 
     ret = ME_OK;
 sem_cleanup:
-    if(!enhanced) {
-        (void) icmd_clear_semaphore(mf);
+    if (!enhanced)
+    {
+        (void)icmd_clear_semaphore(mf);
     }
     return ret;
 }
 
-int icmd_send_command(mfile    *mf,
-                      IN int opcode,
-                      INOUT void *data,
-                      IN int data_size,
-                      IN int skip_write)
+int icmd_send_command(mfile* mf, IN int opcode, INOUT void* data, IN int data_size, IN int skip_write)
 {
     return icmd_send_command_int(mf, opcode, data, data_size, data_size, skip_write);
 }
@@ -840,39 +914,41 @@ int icmd_send_command(mfile    *mf,
 /*
  * icmd_send_command
  */
-int icmd_send_command_int(mfile    *mf,
+int icmd_send_command_int(mfile* mf,
                           IN int opcode,
-                          INOUT void *data,
+                          INOUT void* data,
                           IN int write_data_size,
                           IN int read_data_size,
                           IN int skip_write)
 {
-    if ((mf->gb_info.is_gb_mngr ||  mf->gb_info.is_gearbox) && mf->gb_info.gb_conn_type == GEARBPX_OVER_MTUSB){
-        return icmd_send_gbox_command_com(mf, data, write_data_size, read_data_size, 0); 
+    if ((mf->gb_info.is_gb_mngr || mf->gb_info.is_gearbox) && mf->gb_info.gb_conn_type == GEARBPX_OVER_MTUSB)
+    {
+        return icmd_send_gbox_command_com(mf, data, write_data_size, read_data_size, 0);
     }
-    else {
+    else
+    {
         return icmd_send_command_com(mf, opcode, data, write_data_size, read_data_size, skip_write, 0);
     }
 }
 
-
-
-int icmd_send_command_enhanced(mfile    *mf,
-                              IN int opcode,
-                              INOUT void *data,
-                              IN int write_data_size,
-                              IN int read_data_size,
-                              IN int skip_write)
+int icmd_send_command_enhanced(mfile* mf,
+                               IN int opcode,
+                               INOUT void* data,
+                               IN int write_data_size,
+                               IN int read_data_size,
+                               IN int skip_write)
 {
-    if ((mf->gb_info.is_gb_mngr ||  mf->gb_info.is_gearbox) && mf->gb_info.gb_conn_type == GEARBPX_OVER_MTUSB){
-        return icmd_send_gbox_command_com(mf, data, write_data_size, read_data_size, 1); 
+    if ((mf->gb_info.is_gb_mngr || mf->gb_info.is_gearbox) && mf->gb_info.gb_conn_type == GEARBPX_OVER_MTUSB)
+    {
+        return icmd_send_gbox_command_com(mf, data, write_data_size, read_data_size, 1);
     }
-    else {
+    else
+    {
         return icmd_send_command_com(mf, opcode, data, write_data_size, read_data_size, skip_write, 1);
     }
 }
 
-static int icmd_init_cr(mfile *mf)
+static int icmd_init_cr(mfile* mf)
 {
     int icmd_ver;
     u_int32_t hcr_address;
@@ -885,132 +961,138 @@ static int icmd_init_cr(mfile *mf)
 
     // get device specific addresses
     MREAD4((mf), (HW_ID_ADDR), &(hw_id));
-    switch (hw_id & 0xffff) {
-    case (CIB_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_CIB;
-        hcr_address = HCR_ADDR_CIB;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CIB;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CIB;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
-        break;
-
-    case (CX4LX_HW_ID):
-    case (CX4_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_CX4;
-        hcr_address = HCR_ADDR_CX4;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX4;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX4;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
-        break;
-
-    case (CX5_HW_ID):
-    case (BF_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_CX5;
-        hcr_address = HCR_ADDR_CX5;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX5;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX5;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
-        break;
-
-    case (SW_IB_HW_ID):
-    case (SW_EN_HW_ID):
-    case (SW_IB2_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_SW_IB;
-        hcr_address = HCR_ADDR_SW_IB;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_SW_IB;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_SW_IB;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
-        break;
-
-    case (QUANTUM_HW_ID):
-    case (SPECTRUM2_HW_ID):
-    case (SPECTRUM3_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_QUANTUM;
-        hcr_address = HCR_ADDR_QUANTUM;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_QUANTUM;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
-        break;
-
-    case (QUANTUM2_HW_ID):
-    case (SPECTRUM4_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_QUANTUM;
-        hcr_address = HCR_ADDR_QUANTUM;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_QUANTUM2;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
-        break;
-
-    case (CX6_HW_ID):
-    case (CX6DX_HW_ID):
-    case (CX6LX_HW_ID):
-    case (BF2_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_CX5;
-        hcr_address = HCR_ADDR_CX5;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX5;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX6;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5;
-        break;
-
-    case (CX7_HW_ID):
-    case (BF3_HW_ID):
-        cmd_ptr_addr = CMD_PTR_ADDR_CX7;
-        hcr_address = HCR_ADDR_CX7;
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX7;
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX7;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX7;
-        break;
-
-    case (AMOS_GBOX_HW_ID):
-        mf->icmd.ctrl_addr = GBOX_MAX_DATA_SIZE;
-
-        u_int32_t start_addr = 0x0;
-        MError rc = get_gbox_gw_start_addr(mf, &start_addr);
-        if (rc) {
-            return ME_ERROR;
-        }
+    switch (hw_id & 0xffff)
+    {
+        case (CIB_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_CIB;
+            hcr_address = HCR_ADDR_CIB;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CIB;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CIB;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
+            break;
 
-        mf->icmd.ctrl_addr += start_addr;
-        mf->icmd.cmd_addr = start_addr + GBOX_GW_OPCODE_OFFSET;
-        mf->gb_info.data_req_addr = start_addr + GBOX_GW_REQUEST_DATA_BLOCK_OFFSET;
-        mf->gb_info.data_res_addr = start_addr + GBOX_GW_RESPONSE_DATA_BLOCK_OFFSET;
-
-        mf->icmd.semaphore_addr = SEMAPHORE_ADDR_GBOX;
-        mf->icmd.static_cfg_not_done_addr = GBOX_STAT_CFG_NOT_DONE_ADDR;     
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5;   
-        mf->icmd.max_cmd_size = GBOX_MAX_DATA_SIZE;
-        mf->icmd.icmd_opened = 1;
-        
-        return ME_OK;
-        break;
+        case (CX4LX_HW_ID):
+        case (CX4_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_CX4;
+            hcr_address = HCR_ADDR_CX4;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX4;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX4;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
+            break;
 
-    default:
-        return ME_ICMD_NOT_SUPPORTED;
+        case (CX5_HW_ID):
+        case (BF_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_CX5;
+            hcr_address = HCR_ADDR_CX5;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX5;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX5;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
+            break;
+
+        case (SW_IB_HW_ID):
+        case (SW_EN_HW_ID):
+        case (SW_IB2_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_SW_IB;
+            hcr_address = HCR_ADDR_SW_IB;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_SW_IB;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_SW_IB;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
+            break;
+
+        case (QUANTUM_HW_ID):
+        case (SPECTRUM2_HW_ID):
+        case (SPECTRUM3_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_QUANTUM;
+            hcr_address = HCR_ADDR_QUANTUM;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_QUANTUM;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
+            break;
+
+        case (QUANTUM2_HW_ID):
+        case (SPECTRUM4_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_QUANTUM;
+            hcr_address = HCR_ADDR_QUANTUM;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_QUANTUM2;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
+            break;
+
+        case (CX6_HW_ID):
+        case (CX6DX_HW_ID):
+        case (CX6LX_HW_ID):
+        case (BF2_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_CX5;
+            hcr_address = HCR_ADDR_CX5;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX5;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX6;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5;
+            break;
+
+        case (CX7_HW_ID):
+        case (BF3_HW_ID):
+            cmd_ptr_addr = CMD_PTR_ADDR_CX7;
+            hcr_address = HCR_ADDR_CX7;
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX7;
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX7;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX7;
+            break;
+
+        case (AMOS_GBOX_HW_ID):
+            mf->icmd.ctrl_addr = GBOX_MAX_DATA_SIZE;
+
+            u_int32_t start_addr = 0x0;
+            MError rc = get_gbox_gw_start_addr(mf, &start_addr);
+            if (rc)
+            {
+                return ME_ERROR;
+            }
+
+            mf->icmd.ctrl_addr += start_addr;
+            mf->icmd.cmd_addr = start_addr + GBOX_GW_OPCODE_OFFSET;
+            mf->gb_info.data_req_addr = start_addr + GBOX_GW_REQUEST_DATA_BLOCK_OFFSET;
+            mf->gb_info.data_res_addr = start_addr + GBOX_GW_RESPONSE_DATA_BLOCK_OFFSET;
+
+            mf->icmd.semaphore_addr = SEMAPHORE_ADDR_GBOX;
+            mf->icmd.static_cfg_not_done_addr = GBOX_STAT_CFG_NOT_DONE_ADDR;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5;
+            mf->icmd.max_cmd_size = GBOX_MAX_DATA_SIZE;
+            mf->icmd.icmd_opened = 1;
+
+            return ME_OK;
+            break;
+
+        default:
+            return ME_ICMD_NOT_SUPPORTED;
     }
     mf->icmd.max_cmd_size = ICMD_MAX_CMD_SIZE;
     icmd_ver = get_version(mf, hcr_address);
     // get command and control addresses
-    switch (icmd_ver) {
-    case 1:
-        if (MREAD4(mf, cmd_ptr_addr, &reg)) {
-            return ME_ICMD_STATUS_CR_FAIL;
-        }
-        mf->icmd.cmd_addr  = EXTRACT(reg, CMD_PTR_BITOFF, CMD_PTR_BITLEN);
-        mf->icmd.ctrl_addr = mf->icmd.cmd_addr + CTRL_OFFSET;
-        break;
+    switch (icmd_ver)
+    {
+        case 1:
+            if (MREAD4(mf, cmd_ptr_addr, &reg))
+            {
+                return ME_ICMD_STATUS_CR_FAIL;
+            }
+            mf->icmd.cmd_addr = EXTRACT(reg, CMD_PTR_BITOFF, CMD_PTR_BITLEN);
+            mf->icmd.ctrl_addr = mf->icmd.cmd_addr + CTRL_OFFSET;
+            break;
 
-    case ME_ICMD_STATUS_CR_FAIL:
-        return ME_ICMD_STATUS_CR_FAIL;
+        case ME_ICMD_STATUS_CR_FAIL:
+            return ME_ICMD_STATUS_CR_FAIL;
 
-    default:
-        return ME_ICMD_UNSUPPORTED_ICMD_VERSION;
+        default:
+            return ME_ICMD_UNSUPPORTED_ICMD_VERSION;
     }
-    // if IB check if we support locking via MAD
+        // if IB check if we support locking via MAD
 #ifndef __FreeBSD__
-    if (mget_mdevs_flags(mf, &dev_type)) {
+    if (mget_mdevs_flags(mf, &dev_type))
+    {
         dev_type = 0;
     }
-    if ((dev_type & MDEVS_IB) && (mib_semaphore_lock_is_supported(mf))) {
+    if ((dev_type & MDEVS_IB) && (mib_semaphore_lock_is_supported(mf)))
+    {
         mf->icmd.ib_semaphore_lock_supported = 1;
     }
 #endif
@@ -1024,77 +1106,79 @@ static int icmd_init_vcr_crspace_addr(mfile* mf)
 
     // get device specific addresses
     MREAD4((mf), (HW_ID_ADDR), &(hw_id));
-    switch (hw_id & 0xffff) {
-    case (CIB_HW_ID):
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CIB;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
-        break;
-
-    case (CX4LX_HW_ID):
-    case (CX4_HW_ID):
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX4;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
-        break;
-
-    case (CX5_HW_ID):
-    case (BF_HW_ID):
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX5;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
-        break;
-
-    case (SW_IB_HW_ID):
-    case (SW_EN_HW_ID):
-    case (SW_IB2_HW_ID):
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_SW_IB;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
-        break;
-
-    case (QUANTUM_HW_ID):
-    case (SPECTRUM2_HW_ID):
-    case (SPECTRUM3_HW_ID):
-    case (QUANTUM2_HW_ID):
-    case (SPECTRUM4_HW_ID):
-        mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
-        mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
-        break;
-
-    case (CX6_HW_ID):
-    case (CX6DX_HW_ID):
-    case (CX6LX_HW_ID):
-    case (BF2_HW_ID):
-    case (BF3_HW_ID):
-    case (CX7_HW_ID):
+    switch (hw_id & 0xffff)
+    {
+        case (CIB_HW_ID):
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CIB;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
+            break;
+
+        case (CX4LX_HW_ID):
+        case (CX4_HW_ID):
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX4;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
+            break;
+
+        case (CX5_HW_ID):
+        case (BF_HW_ID):
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX5;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CIB;
+            break;
+
+        case (SW_IB_HW_ID):
+        case (SW_EN_HW_ID):
+        case (SW_IB2_HW_ID):
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_SW_IB;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
+            break;
+
+        case (QUANTUM_HW_ID):
+        case (SPECTRUM2_HW_ID):
+        case (SPECTRUM3_HW_ID):
+        case (QUANTUM2_HW_ID):
+        case (SPECTRUM4_HW_ID):
+            mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
+            mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
+            break;
+
+        case (CX6_HW_ID):
+        case (CX6DX_HW_ID):
+        case (CX6LX_HW_ID):
+        case (BF2_HW_ID):
+        case (BF3_HW_ID):
+        case (CX7_HW_ID):
             mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX6;
             mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5; // same bit offset as CX5
             break;
 
-    case (AMOS_GBOX_HW_ID):
+        case (AMOS_GBOX_HW_ID):
             mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX6;
             mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5; // same bit offset as CX5
             break;
 
-    default:
-        return ME_ICMD_NOT_SUPPORTED;
+        default:
+            return ME_ICMD_NOT_SUPPORTED;
     }
     return ME_OK;
 }
 
-static int icmd_init_vcr(mfile *mf)
+static int icmd_init_vcr(mfile* mf)
 {
     int rc = ME_OK;
     static u_int32_t pid = 0;
     static u_int32_t size = 0;
-    if (!pid) {
+    if (!pid)
+    {
         pid = getpid();
     }
-    
+
     mf->icmd.cmd_addr = VCR_CMD_ADDR;
     mf->icmd.ctrl_addr = VCR_CTRL_ADDR;
     mf->icmd.semaphore_addr = VCR_SEMAPHORE62;
     DBG_PRINTF("-D- Getting VCR_CMD_SIZE_ADDR\n");
-    
+
     rc = icmd_take_semaphore_com(mf, pid);
-    CHECK_RC(rc); 
+    CHECK_RC(rc);
     // get max command size
     rc = MREAD4_ICMD(mf, VCR_CMD_SIZE_ADDR, &mf->icmd.max_cmd_size);
     size = mf->icmd.max_cmd_size;
@@ -1112,76 +1196,79 @@ static int icmd_init_vcr(mfile *mf)
     DBG_PRINTF("-D- iCMD ctrl addr: 0x%x\n", mf->icmd.ctrl_addr);
     DBG_PRINTF("-D- iCMD semaphore addr(semaphore space): 0x%x\n", mf->icmd.semaphore_addr);
     DBG_PRINTF("-D- iCMD max mailbox size: 0x%x  size %d\n", mf->icmd.max_cmd_size, size);
-    DBG_PRINTF("-D- iCMD stat_cfg_not_done addr: 0x%x:%d\n", mf->icmd.static_cfg_not_done_addr, mf->icmd.static_cfg_not_done_offs);
+    DBG_PRINTF("-D- iCMD stat_cfg_not_done addr: 0x%x:%d\n", mf->icmd.static_cfg_not_done_addr,
+               mf->icmd.static_cfg_not_done_offs);
     return ME_OK;
 }
 
-void icmd_get_dma_support(mfile *mf)
+void icmd_get_dma_support(mfile* mf)
 {
     mf->icmd.dma_icmd = 0;
     mem_props_t mem_p;
-    if (get_mem_props(mf, MEM_ICMD, &mem_p)) {
+    if (get_mem_props(mf, MEM_ICMD, &mem_p))
+    {
         return;
     }
     mf->icmd.dma_pa = mem_p.dma_pa;
     mf->icmd.dma_size = mem_p.mem_size;
-    if (getenv("ENABLE_DMA_ICMD") == NULL) {
+    if (getenv("ENABLE_DMA_ICMD") == NULL)
+    {
         return;
     }
-    if (!mf->icmd.dma_pa) {
+    if (!mf->icmd.dma_pa)
+    {
         return;
     }
     u_int8_t dev_cap_data[ICMD_QUERY_CAP_CMD_SZ] = {0};
     int rc = icmd_send_command(mf, ICMD_QUERY_CAP_CMD_ID, dev_cap_data, ICMD_QUERY_CAP_CMD_SZ, 0);
-    if (!rc) {
+    if (!rc)
+    {
         mf->icmd.dma_icmd = pop_from_buff(dev_cap_data, ICMD_QUERY_CAP_EXMB_ICMD_OFF, 1);
     }
-
 }
 
 #ifndef __FreeBSD__
 static int is_pci_device(mfile* mf)
 {
-    return (mf->flags & MDEVS_I2CM)
-        || (mf->flags & (MDEVS_CABLE | MDEVS_LINKX_CHIP))
-        || (mf->flags & MDEVS_SOFTWARE);
+    return (mf->flags & MDEVS_I2CM) || (mf->flags & (MDEVS_CABLE | MDEVS_LINKX_CHIP)) || (mf->flags & MDEVS_SOFTWARE);
 }
 
-
-static int is_livefish_device(mfile *mf)
+static int is_livefish_device(mfile* mf)
 {
     // Make sure to update this table both in mtcr.c & mtcr_ul_com.c !
-    static u_int32_t live_fish_ids[][2] = {
-        {DeviceConnectX4_HwId, DeviceConnectX4_HwId},
-        {DeviceConnectX4LX_HwId, DeviceConnectX4LX_HwId},
-        {DeviceConnectX5_HwId, DeviceConnectX5_HwId},
-        {DeviceConnectX6_HwId, DeviceConnectX6_HwId},
-        {DeviceConnectX6DX_HwId, DeviceConnectX6DX_HwId},
-        {DeviceConnectX6LX_HwId, DeviceConnectX6LX_HwId},
-        {DeviceConnectX7_HwId, DeviceConnectX7_HwId},
-        {DeviceBlueField3_HwId, DeviceBlueField3_HwId},
-        {DeviceBlueField2_HwId, DeviceBlueField2_HwId},
-        {DeviceBlueField_HwId, DeviceBlueField_HwId},
-        {DeviceSwitchIB_HwId, DeviceSwitchIB_HwId},
-        {DeviceSpectrum_HwId, DeviceSpectrum_HwId},
-        {DeviceSwitchIB2_HwId, DeviceSwitchIB2_HwId},
-        {DeviceQuantum_HwId, DeviceQuantum_HwId},
-        {DeviceQuantum2_HwId, DeviceQuantum2_HwId},
-        {DeviceSpectrum2_HwId, DeviceSpectrum2_HwId},
-        {DeviceSpectrum3_HwId, DeviceSpectrum3_HwId},
-        {DeviceSpectrum4_HwId, DeviceSpectrum4_HwId},
-        {0, 0    }
-    };
+    static u_int32_t live_fish_ids[][2] = {{DeviceConnectX4_HwId, DeviceConnectX4_HwId},
+                                           {DeviceConnectX4LX_HwId, DeviceConnectX4LX_HwId},
+                                           {DeviceConnectX5_HwId, DeviceConnectX5_HwId},
+                                           {DeviceConnectX6_HwId, DeviceConnectX6_HwId},
+                                           {DeviceConnectX6DX_HwId, DeviceConnectX6DX_HwId},
+                                           {DeviceConnectX6LX_HwId, DeviceConnectX6LX_HwId},
+                                           {DeviceConnectX7_HwId, DeviceConnectX7_HwId},
+                                           {DeviceBlueField3_HwId, DeviceBlueField3_HwId},
+                                           {DeviceBlueField2_HwId, DeviceBlueField2_HwId},
+                                           {DeviceBlueField_HwId, DeviceBlueField_HwId},
+                                           {DeviceSwitchIB_HwId, DeviceSwitchIB_HwId},
+                                           {DeviceSpectrum_HwId, DeviceSpectrum_HwId},
+                                           {DeviceSwitchIB2_HwId, DeviceSwitchIB2_HwId},
+                                           {DeviceQuantum_HwId, DeviceQuantum_HwId},
+                                           {DeviceQuantum2_HwId, DeviceQuantum2_HwId},
+                                           {DeviceSpectrum2_HwId, DeviceSpectrum2_HwId},
+                                           {DeviceSpectrum3_HwId, DeviceSpectrum3_HwId},
+                                           {DeviceSpectrum4_HwId, DeviceSpectrum4_HwId},
+                                           {0, 0}};
     int i = 0;
     unsigned int hwdevid = 0;
-    if (mf->tp == MST_SOFTWARE) {
+    if (mf->tp == MST_SOFTWARE)
+    {
         return 1;
     }
     int rc = mread4(mf, 0xf0014, &hwdevid);
-    hwdevid &= 0xffff;//otherwise, BF A1 will fail in the searching (0x00010211)
-    if (rc == 4) {
-        while (live_fish_ids[i][0] != 0) {
-            if (live_fish_ids[i][0] == hwdevid) {
+    hwdevid &= 0xffff; // otherwise, BF A1 will fail in the searching (0x00010211)
+    if (rc == 4)
+    {
+        while (live_fish_ids[i][0] != 0)
+        {
+            if (live_fish_ids[i][0] == hwdevid)
+            {
                 return (mf->dinfo->pci.dev_id == live_fish_ids[i][1]);
             }
             i++;
@@ -1191,16 +1278,18 @@ static int is_livefish_device(mfile *mf)
 }
 #endif
 
-int icmd_open(mfile *mf)
+int icmd_open(mfile* mf)
 {
-    if (mf->icmd.icmd_opened) {
+    if (mf->icmd.icmd_opened)
+    {
         return ME_OK;
     }
 
 #ifndef __FreeBSD__
     // Currently livefish check is supported for PCI devices & devices that map to CR.
     // ICMD is not supported while in livefish (GW is locked).
-    if ((is_pci_device(mf) || (mf->flags & MDEVS_TAVOR_CR)) && is_livefish_device(mf)) {
+    if ((is_pci_device(mf) || (mf->flags & MDEVS_TAVOR_CR)) && is_livefish_device(mf))
+    {
         return ME_ICMD_NOT_SUPPORTED;
     }
 #endif
@@ -1209,11 +1298,13 @@ int icmd_open(mfile *mf)
     mf->icmd.ib_semaphore_lock_supported = 0;
     // attempt to open via CR-Space
 #if defined(MST_UL) && !defined(MST_UL_ICMD)
-    if (mf->vsec_supp) {
+    if (mf->vsec_supp)
+    {
         return icmd_init_vcr(mf);
     }
     // ugly hack avoid compiler warrnings
-    if (0) {
+    if (0)
+    {
         icmd_init_cr(mf);
     }
     return ME_ICMD_NOT_SUPPORTED;
@@ -1221,13 +1312,17 @@ int icmd_open(mfile *mf)
     /*if (mf->gb_info.is_gearbox){
         return icmd_init_cr(mf);
     }*/
-    if (mf->vsec_supp) {
+    if (mf->vsec_supp)
+    {
         int rc = icmd_init_vcr(mf);
-        if (rc == ME_OK) {
+        if (rc == ME_OK)
+        {
             icmd_get_dma_support(mf);
         }
         return rc;
-    } else {
+    }
+    else
+    {
         return icmd_init_cr(mf);
     }
 
@@ -1237,16 +1332,17 @@ int icmd_open(mfile *mf)
 /*
  * icmd_close
  */
-void icmd_close(mfile *mf)
+void icmd_close(mfile* mf)
 {
-    if (mf) {
-        if (mf->icmd.took_semaphore) {
-            if (icmd_clear_semaphore(mf)) {
+    if (mf)
+    {
+        if (mf->icmd.took_semaphore)
+        {
+            if (icmd_clear_semaphore(mf))
+            {
                 DBG_PRINTF("Failed to clear semaphore!\n");
             }
         }
         mf->icmd.icmd_opened = 0;
     }
 }
-
-
diff --git a/mtcr_ul/packets_common.c b/mtcr_ul/packets_common.c
index 6c8100fe..eb000cbc 100644
--- a/mtcr_ul/packets_common.c
+++ b/mtcr_ul/packets_common.c
@@ -37,58 +37,56 @@
 #include <string.h>
 #include <sys/types.h>
 #ifdef __WIN__
-    #include <winsock2.h>   // for htonl
+#include <winsock2.h> // for htonl
 #endif
 
-
 /************************************/
-void push_to_buff_64(u_int8_t *buff, u_int32_t bit_offset, u_int64_t field_value)
+void push_to_buff_64(u_int8_t* buff, u_int32_t bit_offset, u_int64_t field_value)
 {
 #if defined(__ia64__)
-    u_int32_t *buffer = PTR_32_OF_BUFF(buff, (bit_offset / 8));
+    u_int32_t* buffer = PTR_32_OF_BUFF(buff, (bit_offset / 8));
     u_int64_t value = CPU_TO_BE64(field_value);
     memcpy(buffer, &value, sizeof(value));
 #else
-    u_int64_t *buffer = PTR_64_OF_BUFF(buff, (bit_offset / 8));
+    u_int64_t* buffer = PTR_64_OF_BUFF(buff, (bit_offset / 8));
     memcpy(buffer, &field_value, sizeof(field_value));
     *buffer = CPU_TO_BE64(*buffer);
 #endif
 }
 
-
 /************************************/
-void push_to_buff_32(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_value)
+void push_to_buff_32(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_value)
 {
-    u_int32_t *buffer = PTR_32_OF_BUFF(buff, (bit_offset / 8));
+    u_int32_t* buffer = PTR_32_OF_BUFF(buff, (bit_offset / 8));
     memcpy(buffer, &field_value, sizeof(field_value));
     *buffer = CPU_TO_BE32(*buffer);
 }
 
-
 /************************************/
-//the next function will push the field into the buffer by inserting it's MSB bits first
-//and therefore by doing it we save the CPU_TO_BE operation
-void push_to_buff(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
+// the next function will push the field into the buffer by inserting it's MSB bits first
+// and therefore by doing it we save the CPU_TO_BE operation
+void push_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
 {
-    u_int32_t i         = 0;
-    u_int32_t byte_n    = bit_offset / 8;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8;
     u_int32_t byte_n_offset = bit_offset % 8;
     u_int32_t to_push;
 
-    //going over all bits in field
-    while (i < field_size) {
+    // going over all bits in field
+    while (i < field_size)
+    {
         to_push = PCK_MIN(8 - byte_n_offset, field_size - i);
         i += to_push;
-        //printf("Inserting %u bits(%u) to byte %u to bit %u\n", to_push, EXTRACT8(field_value, field_size - i, to_push), byte_n, 8 - to_push - byte_n_offset);
+        // printf("Inserting %u bits(%u) to byte %u to bit %u\n", to_push, EXTRACT8(field_value, field_size - i,
+        // to_push), byte_n, 8 - to_push - byte_n_offset);
         INSERTF_8(BYTE_N(buff, byte_n), 8 - to_push - byte_n_offset, field_value, field_size - i, to_push);
-        byte_n_offset  = 0; //(byte_n_offset + to_push) % 8;
+        byte_n_offset = 0; //(byte_n_offset + to_push) % 8;
         byte_n++;
     }
 }
 
-
 /************************************/
-u_int64_t pop_from_buff_64(u_int8_t *buff, u_int32_t bit_offset)
+u_int64_t pop_from_buff_64(u_int8_t* buff, u_int32_t bit_offset)
 {
 #if defined(__ia64__)
     u_int64_t value = 0;
@@ -99,68 +97,73 @@ u_int64_t pop_from_buff_64(u_int8_t *buff, u_int32_t bit_offset)
 #endif
 }
 
-
 /************************************/
-u_int32_t pop_from_buff_32(u_int8_t *buff, u_int32_t bit_offset)
+u_int32_t pop_from_buff_32(u_int8_t* buff, u_int32_t bit_offset)
 {
     return (BE32_TO_CPU(FIELD_32_OF_BUFF(buff, (bit_offset / 8))));
 }
 
-
 /************************************/
-//the next function will pop the field into the buffer by removing it's MSB bits first
-//and therefore by doing it we save the BE_TO_CPU operation
-u_int32_t pop_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+// the next function will pop the field into the buffer by removing it's MSB bits first
+// and therefore by doing it we save the BE_TO_CPU operation
+u_int32_t pop_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
-    u_int32_t i         = 0;
-    u_int32_t byte_n    = bit_offset / 8;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8;
     u_int32_t byte_n_offset = bit_offset % 8;
-    u_int32_t field_32  = 0;
+    u_int32_t field_32 = 0;
     u_int32_t to_pop;
 
-    //going over all bits in field
-    while (i < field_size) {
-        to_pop =  PCK_MIN(8 - byte_n_offset, field_size - i);
+    // going over all bits in field
+    while (i < field_size)
+    {
+        to_pop = PCK_MIN(8 - byte_n_offset, field_size - i);
         i += to_pop;
-        //printf("Removing %u bits(%u) from byte %u to bit %u\n", to_pop, EXTRACT8(BYTE_N(buff, byte_n), 8 - to_pop - byte_n_offset, to_pop), byte_n, field_size - i);
+        // printf("Removing %u bits(%u) from byte %u to bit %u\n", to_pop, EXTRACT8(BYTE_N(buff, byte_n), 8 - to_pop -
+        // byte_n_offset, to_pop), byte_n, field_size - i);
         INSERTF_8(field_32, field_size - i, BYTE_N(buff, byte_n), 8 - to_pop - byte_n_offset, to_pop);
-        byte_n_offset  = 0; //(byte_n_offset + to_pop) % 8;
+        byte_n_offset = 0; //(byte_n_offset + to_pop) % 8;
         byte_n++;
     }
     return field_32;
 }
 
 /************************************
-* Function: calc_array_field_address
-* Calculates array fields offset address
-************************************/
+ * Function: calc_array_field_address
+ * Calculates array fields offset address
+ ************************************/
 u_int32_t calc_array_field_offset(u_int32_t start_bit_offset,
                                   u_int32_t arr_elemnt_size,
-                                  int arr_idx, u_int32_t parent_node_size,
+                                  int arr_idx,
+                                  u_int32_t parent_node_size,
                                   int is_big_endian_arr)
 {
     u_int32_t offs;
 
-    if (arr_elemnt_size > 32) {
-        if (arr_elemnt_size % 32) {
+    if (arr_elemnt_size > 32)
+    {
+        if (arr_elemnt_size % 32)
+        {
             fprintf(stderr, "\n-W- Array field size is not 32 bit aligned.\n");
         }
         start_bit_offset += arr_elemnt_size * (u_int32_t)arr_idx;
         return start_bit_offset;
     }
 
-    if (is_big_endian_arr) {
+    if (is_big_endian_arr)
+    {
         u_int32_t dword_delta;
         offs = start_bit_offset - arr_elemnt_size * (u_int32_t)arr_idx;
-        dword_delta = (((start_bit_offset >> 5) << 2) - ((offs >> 5) << 2 )) / 4;
-        if (dword_delta) {
+        dword_delta = (((start_bit_offset >> 5) << 2) - ((offs >> 5) << 2)) / 4;
+        if (dword_delta)
+        {
             offs += 64 * dword_delta;
         }
-    } else {
+    }
+    else
+    {
         offs = start_bit_offset + arr_elemnt_size * (u_int32_t)arr_idx;
     }
 
     return PCK_MIN(32, parent_node_size) - (offs % 32) - arr_elemnt_size + ((offs >> 5) << 5);
 }
-
-
diff --git a/mtcr_ul/packets_common.h b/mtcr_ul/packets_common.h
index 2614877d..2ab255fc 100644
--- a/mtcr_ul/packets_common.h
+++ b/mtcr_ul/packets_common.h
@@ -41,7 +41,7 @@
 #include "compatibility.h"
 
 #ifndef __WIN__
-    #include <netinet/in.h>
+#include <netinet/in.h>
 /************************************/
 /* Endianess Defines */
 /*
@@ -74,132 +74,116 @@
  */
 #endif
 
-
-
 /************************************/
 /* Bit manipulation macros */
 
 /* MASK generate a bit mask S bits width */
 //#define MASK32(S)     ( ((u_int32_t) ~0L) >> (32-(S)) )
-#define MASK8(S)        ( ((u_int8_t) ~0) >> (8 - (S)) )
+#define MASK8(S) (((u_int8_t)~0) >> (8 - (S)))
 
 /* BITS generate a bit mask with bits O+S..O set (assumes 32 / 8 bit integer) */
 //#define BITS32(O,S)   ( MASK32(S) << (O) )
-#define BITS8(O, S)      ( MASK8(S) << (O) )
+#define BITS8(O, S) (MASK8(S) << (O))
 
 /* EXTRACT32/8 macro extracts S bits from (u_int32_t/u_int8_t)W with offset O
  * and shifts them O places to the right (right justifies the field extracted) */
 //#define EXTRACT32(W,O,S)  ( ((W)>>(O)) & MASK32(S) )
-#define EXTRACT8(W, O, S)     ( ((W) >> (O)) & MASK8(S) )
+#define EXTRACT8(W, O, S) (((W) >> (O)) & MASK8(S))
 
-#define PCK_MIN(a, b)   ((a) < (b) ? (a) : (b))
+#define PCK_MIN(a, b) ((a) < (b) ? (a) : (b))
 /* INSERT32/8 macro inserts S bits with offset O from field F into word W (u_int32_t/u_int8_t) */
 //#define INSERT32(W,F,O,S)     ((W)= ( ( (W) & (~BITS32(O,S)) ) | (((F) & MASK32(S))<<(O)) ))
-#define INSERT8(W, F, O, S)        ((W) = ( ( (W) &(~BITS8(O, S)) ) | (((F) &MASK8(S)) << (O)) ))
+#define INSERT8(W, F, O, S) ((W) = (((W) & (~BITS8(O, S))) | (((F)&MASK8(S)) << (O))))
 
 //#define INSERTF_32(W,O1,F,O2,S)   (INSERT32(W, EXTRACT32(F, O2, S), O1, S) )
-#define INSERTF_8(W, O1, F, O2, S)      (INSERT8(W, EXTRACT8(F, O2, S), O1, S) )
-
+#define INSERTF_8(W, O1, F, O2, S) (INSERT8(W, EXTRACT8(F, O2, S), O1, S))
 
 /************************************/
-#define PTR_64_OF_BUFF(buf, offset)     ((u_int64_t*)((u_int8_t*)(buf) + (offset)))
-#define PTR_32_OF_BUFF(buf, offset)     ((u_int32_t*)((u_int8_t*)(buf) + (offset)))
-#define PTR_8_OF_BUFF(buf, offset)      ((u_int8_t*)((u_int8_t*)(buf) + (offset)))
-#define FIELD_64_OF_BUFF(buf, offset)   (*PTR_64_OF_BUFF(buf, offset))
-#define FIELD_32_OF_BUFF(buf, offset)   (*PTR_32_OF_BUFF(buf, offset))
-#define FIELD_8_OF_BUFF(buf, offset)    (*PTR_8_OF_BUFF(buf, offset))
-#define DWORD_N(buf, n)                 FIELD_32_OF_BUFF((buf), (n) * 4)
-#define BYTE_N(buf, n)                  FIELD_8_OF_BUFF((buf), (n))
-
+#define PTR_64_OF_BUFF(buf, offset) ((u_int64_t*)((u_int8_t*)(buf) + (offset)))
+#define PTR_32_OF_BUFF(buf, offset) ((u_int32_t*)((u_int8_t*)(buf) + (offset)))
+#define PTR_8_OF_BUFF(buf, offset) ((u_int8_t*)((u_int8_t*)(buf) + (offset)))
+#define FIELD_64_OF_BUFF(buf, offset) (*PTR_64_OF_BUFF(buf, offset))
+#define FIELD_32_OF_BUFF(buf, offset) (*PTR_32_OF_BUFF(buf, offset))
+#define FIELD_8_OF_BUFF(buf, offset) (*PTR_8_OF_BUFF(buf, offset))
+#define DWORD_N(buf, n) FIELD_32_OF_BUFF((buf), (n)*4)
+#define BYTE_N(buf, n) FIELD_8_OF_BUFF((buf), (n))
 
 /************************************/
 // #define MIN(a, b)   ((a) < (b) ? (a) : (b))
 
-
 /************************************/
-#define CPU_TO_BE32(x)  htonl(x)
-#define BE32_TO_CPU(x)  ntohl(x)
-#define CPU_TO_BE16(x)  htons(x)
-#define BE16_TO_CPU(x)  ntohs(x)
-#define CPU_TO_LE32(x)  __cpu_to_le32(x)
-#define LE32_TO_CPU(x)  __le32_to_cpu(x)
+#define CPU_TO_BE32(x) htonl(x)
+#define BE32_TO_CPU(x) ntohl(x)
+#define CPU_TO_BE16(x) htons(x)
+#define BE16_TO_CPU(x) ntohs(x)
+#define CPU_TO_LE32(x) __cpu_to_le32(x)
+#define LE32_TO_CPU(x) __le32_to_cpu(x)
 #ifdef _LITTLE_ENDIANESS
-    #define CPU_TO_BE64(x) (((u_int64_t)htonl((u_int32_t)((x) & 0xffffffff)) << 32) | \
-                            ((u_int64_t)htonl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define CPU_TO_BE64(x) \
+    (((u_int64_t)htonl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)htonl((u_int32_t)((x >> 32) & 0xffffffff))))
 
-    #define BE64_TO_CPU(x) (((u_int64_t)ntohl((u_int32_t)((x) & 0xffffffff)) << 32) | \
-                            ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define BE64_TO_CPU(x) \
+    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
 #else
-    #define CPU_TO_BE64(x) (x)
-    #define BE64_TO_CPU(x) (x)
+#define CPU_TO_BE64(x) (x)
+#define BE64_TO_CPU(x) (x)
 #endif
 
-
 /************************************/
 /* define macros to the architecture of the CPU */
 #if defined(__linux__) || defined(__FreeBSD__)
-#   if defined(__i386__)
-#       define ARCH_x86
-#   elif defined(__x86_64__)
-#       define ARCH_x86_64
-#   elif defined(__ia64__)
-#       define ARCH_ia64
-#   elif defined(__m68k__)
-#       define ARCH_m68k
-#   elif defined(__hppa__)
-#       define ARCH_hppa
-#   elif defined(__PPC64__) || defined(__s390x__)
-#       define ARCH_ppc64
-#   elif defined(__PPC__)
-#       define ARCH_ppc
-#   elif defined(__aarch64__)
-#       define ARCH_arm64
-#   elif defined(__arm__)
-#       define ARCH_arm6l
-#   elif defined(__riscv)
-#       define ARCH_riscv
-#   else
-#       error Unknown CPU architecture using the linux OS
-#   endif
+#if defined(__i386__)
+#define ARCH_x86
+#elif defined(__x86_64__)
+#define ARCH_x86_64
+#elif defined(__ia64__)
+#define ARCH_ia64
+#elif defined(__m68k__)
+#define ARCH_m68k
+#elif defined(__hppa__)
+#define ARCH_hppa
+#elif defined(__PPC64__) || defined(__s390x__)
+#define ARCH_ppc64
+#elif defined(__PPC__)
+#define ARCH_ppc
+#elif defined(__aarch64__)
+#define ARCH_arm64
+#elif defined(__arm__)
+#define ARCH_arm6l
+#elif defined(__riscv)
+#define ARCH_riscv
+#else
+#error Unknown CPU architecture using the linux OS
+#endif
 #elif defined(_WIN32)
 //#   error Windows OS need to define macros
 #else
-#   error Unknown OS
+#error Unknown OS
 #endif
 
 /**********************************/
 /* define macros for print fields */
 //#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)
 /*
- #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_riscv))
- #   define U64H_FMT "0x%016lx"
- #   define U64D_FMT "%lu"
- #   define U32H_FMT "0x%08x"
- #   define U16H_FMT "0x%04x"
- #   define U8H_FMT  "0x%02x"
- #   define U32D_FMT "%u"
- #   define STR_FMT "%s"
- #elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) defined(ARCH_m68k) || defined(ARCH_hppa)
- #   define U64H_FMT "0x%016llx"
- #   define U64D_FMT "%llu"
- #   define U32H_FMT "0x%08x"
- #   define U16H_FMT "0x%04x"
- #   define U8H_FMT  "0x%02x"
- #   define U32D_FMT "%u"
- #   define STR_FMT "%s"
- #else  // ARCH
- #   error Unknown architecture
- #endif // ARCH
+ #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)
+ || defined(ARCH_riscv)) #   define U64H_FMT "0x%016lx" #   define U64D_FMT "%lu" #   define U32H_FMT "0x%08x" # define
+ U16H_FMT "0x%04x" #   define U8H_FMT  "0x%02x" #   define U32D_FMT "%u" #   define STR_FMT "%s" #elif defined(ARCH_x86)
+ || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) defined(ARCH_m68k) ||
+ defined(ARCH_hppa) #   define U64H_FMT "0x%016llx" #   define U64D_FMT "%llu" #   define U32H_FMT "0x%08x" #   define
+ U16H_FMT "0x%04x" #   define U8H_FMT  "0x%02x" #   define U32D_FMT "%u" #   define STR_FMT "%s" #else  // ARCH # error
+ Unknown architecture #endif // ARCH
  */
 
 /**********************************/
-void push_to_buff_64(u_int8_t *buff, u_int32_t bit_offset, u_int64_t field_value);
-void push_to_buff_32(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_value);
-void push_to_buff(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
-u_int64_t pop_from_buff_64(u_int8_t *buff, u_int32_t bit_offset);
-u_int32_t pop_from_buff_32(u_int8_t *buff, u_int32_t bit_offset);
-u_int32_t pop_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size);
-u_int32_t calc_array_field_offset(u_int32_t start_bit_offset, u_int32_t arr_elemnt_size, int arr_idx, u_int32_t parent_node_size, int is_big_endian_arr);
-#endif          /* def packet_common_H */
-
-
+void push_to_buff_64(u_int8_t* buff, u_int32_t bit_offset, u_int64_t field_value);
+void push_to_buff_32(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_value);
+void push_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
+u_int64_t pop_from_buff_64(u_int8_t* buff, u_int32_t bit_offset);
+u_int32_t pop_from_buff_32(u_int8_t* buff, u_int32_t bit_offset);
+u_int32_t pop_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size);
+u_int32_t calc_array_field_offset(u_int32_t start_bit_offset,
+                                  u_int32_t arr_elemnt_size,
+                                  int arr_idx,
+                                  u_int32_t parent_node_size,
+                                  int is_big_endian_arr);
+#endif /* def packet_common_H */
diff --git a/mtcr_ul/packets_layout.c b/mtcr_ul/packets_layout.c
index 069f68cc..33368deb 100644
--- a/mtcr_ul/packets_layout.c
+++ b/mtcr_ul/packets_layout.c
@@ -48,8 +48,7 @@
  * Size: 128 bits
  * Description:  */
 
-
-u_int32_t OperationTlv_pack(struct OperationTlv *data_to_pack, u_int8_t *packed_buffer)
+u_int32_t OperationTlv_pack(struct OperationTlv* data_to_pack, u_int8_t* packed_buffer)
 {
     push_to_buff(packed_buffer, 24, 8, data_to_pack->reserved0);
     push_to_buff(packed_buffer, 17, 7, data_to_pack->status);
@@ -64,7 +63,7 @@ u_int32_t OperationTlv_pack(struct OperationTlv *data_to_pack, u_int8_t *packed_
     return 16;
 }
 
-void OperationTlv_unpack(struct OperationTlv *unpacked_data, u_int8_t *buffer_to_unpack)
+void OperationTlv_unpack(struct OperationTlv* unpacked_data, u_int8_t* buffer_to_unpack)
 {
     unpacked_data->reserved0 = pop_from_buff(buffer_to_unpack, 24, 8);
     unpacked_data->status = pop_from_buff(buffer_to_unpack, 17, 7);
@@ -78,18 +77,18 @@ void OperationTlv_unpack(struct OperationTlv *unpacked_data, u_int8_t *buffer_to
     unpacked_data->tid = pop_from_buff_64(buffer_to_unpack, 64);
 }
 
-void OperationTlv_dump(struct OperationTlv *data_to_print, FILE *out_port)
+void OperationTlv_dump(struct OperationTlv* data_to_print, FILE* out_port)
 {
-    fprintf(out_port, "OperationTlv::reserved0: "U32D_FMT "\n", data_to_print->reserved0);
-    fprintf(out_port, "OperationTlv::status: "U32D_FMT "\n", data_to_print->status);
-    fprintf(out_port, "OperationTlv::dr: "U32D_FMT "\n", data_to_print->dr);
-    fprintf(out_port, "OperationTlv::len: "U32D_FMT "\n", data_to_print->len);
-    fprintf(out_port, "OperationTlv::Type: "U32D_FMT "\n", data_to_print->Type);
-    fprintf(out_port, "OperationTlv::class: "U32D_FMT "\n", data_to_print->class);
-    fprintf(out_port, "OperationTlv::method: "U32D_FMT "\n", data_to_print->method);
-    fprintf(out_port, "OperationTlv::r: "U32D_FMT "\n", data_to_print->r);
-    fprintf(out_port, "OperationTlv::register_id: "U32D_FMT "\n", data_to_print->register_id);
-    fprintf(out_port, "OperationTlv::tid: "U64D_FMT "\n", data_to_print->tid);
+    fprintf(out_port, "OperationTlv::reserved0: " U32D_FMT "\n", data_to_print->reserved0);
+    fprintf(out_port, "OperationTlv::status: " U32D_FMT "\n", data_to_print->status);
+    fprintf(out_port, "OperationTlv::dr: " U32D_FMT "\n", data_to_print->dr);
+    fprintf(out_port, "OperationTlv::len: " U32D_FMT "\n", data_to_print->len);
+    fprintf(out_port, "OperationTlv::Type: " U32D_FMT "\n", data_to_print->Type);
+    fprintf(out_port, "OperationTlv::class: " U32D_FMT "\n", data_to_print->class);
+    fprintf(out_port, "OperationTlv::method: " U32D_FMT "\n", data_to_print->method);
+    fprintf(out_port, "OperationTlv::r: " U32D_FMT "\n", data_to_print->r);
+    fprintf(out_port, "OperationTlv::register_id: " U32D_FMT "\n", data_to_print->register_id);
+    fprintf(out_port, "OperationTlv::tid: " U64D_FMT "\n", data_to_print->tid);
 }
 
 /*************************************/
@@ -97,8 +96,7 @@ void OperationTlv_dump(struct OperationTlv *data_to_print, FILE *out_port)
  * Size: 32 bits
  * Description: reg_tlv */
 
-
-u_int32_t reg_tlv_pack(struct reg_tlv *data_to_pack, u_int8_t *packed_buffer)
+u_int32_t reg_tlv_pack(struct reg_tlv* data_to_pack, u_int8_t* packed_buffer)
 {
     push_to_buff(packed_buffer, 16, 16, data_to_pack->reserved0);
     push_to_buff(packed_buffer, 5, 11, data_to_pack->len);
@@ -106,16 +104,16 @@ u_int32_t reg_tlv_pack(struct reg_tlv *data_to_pack, u_int8_t *packed_buffer)
     return 4;
 }
 
-void reg_tlv_unpack(struct reg_tlv *unpacked_data, u_int8_t *buffer_to_unpack)
+void reg_tlv_unpack(struct reg_tlv* unpacked_data, u_int8_t* buffer_to_unpack)
 {
     unpacked_data->reserved0 = pop_from_buff(buffer_to_unpack, 16, 16);
     unpacked_data->len = pop_from_buff(buffer_to_unpack, 5, 11);
     unpacked_data->Type = pop_from_buff(buffer_to_unpack, 0, 5);
 }
 
-void reg_tlv_dump(struct reg_tlv *data_to_print, FILE *out_port)
+void reg_tlv_dump(struct reg_tlv* data_to_print, FILE* out_port)
 {
-    fprintf(out_port, "reg_tlv::reserved0: "U32D_FMT "\n", data_to_print->reserved0);
-    fprintf(out_port, "reg_tlv::len: "U32D_FMT "\n", data_to_print->len);
-    fprintf(out_port, "reg_tlv::Type: "U32D_FMT "\n", data_to_print->Type);
+    fprintf(out_port, "reg_tlv::reserved0: " U32D_FMT "\n", data_to_print->reserved0);
+    fprintf(out_port, "reg_tlv::len: " U32D_FMT "\n", data_to_print->len);
+    fprintf(out_port, "reg_tlv::Type: " U32D_FMT "\n", data_to_print->Type);
 }
diff --git a/mtcr_ul/packets_layout.h b/mtcr_ul/packets_layout.h
index 4a76cd91..8efdbe64 100644
--- a/mtcr_ul/packets_layout.h
+++ b/mtcr_ul/packets_layout.h
@@ -51,10 +51,11 @@
  * Size: 32 bits
  * Description: reg_tlv */
 
-struct reg_tlv {
-    u_int16_t reserved0;      /* bit_offset:0 */    /* element_size: 16 */
-    u_int16_t len;      /* bit_offset:16 */    /* element_size: 11 */
-    u_int8_t Type;       /* bit_offset:27 */    /* element_size: 5 */    /* TX - 0, RX - ignore */
+struct reg_tlv
+{
+    u_int16_t reserved0; /* bit_offset:0 */                  /* element_size: 16 */
+    u_int16_t len; /* bit_offset:16 */                       /* element_size: 11 */
+    u_int8_t Type; /* bit_offset:27 */ /* element_size: 5 */ /* TX - 0, RX - ignore */
 };
 
 /*************************************/
@@ -62,17 +63,18 @@ struct reg_tlv {
  * Size: 128 bits
  * Description:  */
 
-struct OperationTlv {
-    u_int8_t reserved0;       /* bit_offset:0 */    /* element_size: 8 */
-    u_int8_t status;       /* bit_offset:8 */    /* element_size: 7 */
-    u_int8_t dr;       /* bit_offset:15 */    /* element_size: 1 */
-    u_int16_t len;      /* bit_offset:16 */    /* element_size: 11 */
-    u_int8_t Type;       /* bit_offset:27 */    /* element_size: 5 */    /* TX - 0, RX - ignore */
-    u_int8_t class;       /* bit_offset:32 */    /* element_size: 8 */
-    u_int8_t method;       /* bit_offset:40 */    /* element_size: 7 */
-    u_int8_t r;       /* bit_offset:47 */    /* element_size: 1 */
-    u_int16_t register_id;      /* bit_offset:48 */    /* element_size: 16 */
-    u_int64_t tid;      /* bit_offset:64 */    /* element_size: 64 */
+struct OperationTlv
+{
+    u_int8_t reserved0; /* bit_offset:0 */                   /* element_size: 8 */
+    u_int8_t status; /* bit_offset:8 */                      /* element_size: 7 */
+    u_int8_t dr; /* bit_offset:15 */                         /* element_size: 1 */
+    u_int16_t len; /* bit_offset:16 */                       /* element_size: 11 */
+    u_int8_t Type; /* bit_offset:27 */ /* element_size: 5 */ /* TX - 0, RX - ignore */
+    u_int8_t class; /* bit_offset:32 */                      /* element_size: 8 */
+    u_int8_t method; /* bit_offset:40 */                     /* element_size: 7 */
+    u_int8_t r; /* bit_offset:47 */                          /* element_size: 1 */
+    u_int16_t register_id; /* bit_offset:48 */               /* element_size: 16 */
+    u_int64_t tid; /* bit_offset:64 */                       /* element_size: 64 */
 };
 
 /*************************************/
@@ -80,20 +82,17 @@ struct OperationTlv {
  * Size: 32 bits
  * Description: reg_tlv */
 
-u_int32_t reg_tlv_pack(struct reg_tlv *data_to_pack, u_int8_t *packed_buffer);
-void reg_tlv_unpack(struct reg_tlv *unpacked_data, u_int8_t *buffer_to_unpack);
-void reg_tlv_dump(struct reg_tlv *data_to_print, FILE *out_port);
-
-
+u_int32_t reg_tlv_pack(struct reg_tlv* data_to_pack, u_int8_t* packed_buffer);
+void reg_tlv_unpack(struct reg_tlv* unpacked_data, u_int8_t* buffer_to_unpack);
+void reg_tlv_dump(struct reg_tlv* data_to_print, FILE* out_port);
 
 /*************************************/
 /* Name: OperationTlv
  * Size: 128 bits
  * Description:  */
 
-u_int32_t OperationTlv_pack(struct OperationTlv *data_to_pack, u_int8_t *packed_buffer);
-void OperationTlv_unpack(struct OperationTlv *unpacked_data, u_int8_t *buffer_to_unpack);
-void OperationTlv_dump(struct OperationTlv *data_to_print, FILE *out_port);
-
+u_int32_t OperationTlv_pack(struct OperationTlv* data_to_pack, u_int8_t* packed_buffer);
+void OperationTlv_unpack(struct OperationTlv* unpacked_data, u_int8_t* buffer_to_unpack);
+void OperationTlv_dump(struct OperationTlv* data_to_print, FILE* out_port);
 
 #endif /* internal_packets_functions_H */
diff --git a/mvpd/mvpd.c b/mvpd/mvpd.c
index 68de94ef..39e192eb 100644
--- a/mvpd/mvpd.c
+++ b/mvpd/mvpd.c
@@ -42,20 +42,22 @@
 #endif
 #include "mvpd.h"
 
-#if defined(__MINGW32__) || defined(__MINGW64__) || defined(_MSC_VER)    /* Windows */
+#if defined(__MINGW32__) || defined(__MINGW64__) || defined(_MSC_VER) /* Windows */
 #define syslog(lvl, format, ...)
 #else
 #include <syslog.h>
 #endif
 
-enum {
+enum
+{
     INTERNAL_PARAMS_ERROR = 0x33444,
 };
 
-enum {
+enum
+{
     VPD_TAG_ID = 0x02, /* Product name of the device */
-    VPD_TAG_R = 0x10, /* Read-only keywords */
-    VPD_TAG_W = 0x11, /* Read-write keywords */
+    VPD_TAG_R = 0x10,  /* Read-only keywords */
+    VPD_TAG_W = 0x11,  /* Read-write keywords */
     VPD_TAG_END = 0x0F /* End Tag */
 };
 
@@ -65,7 +67,7 @@ enum {
 
 #define VPD_TAG_NAME(a) (VPD_TAG_LARGE(a) ? (a[0] & 0x7F) : (a[0] >> 3))
 
-#define VPD_TAG_LENGTH(a)  (VPD_TAG_LARGE(a) ? ((a[2] << 8) | (a[1])) : (a[0] & 0x7))
+#define VPD_TAG_LENGTH(a) (VPD_TAG_LARGE(a) ? ((a[2] << 8) | (a[1])) : (a[0] & 0x7))
 
 #define VPD_TAG_HEAD(a) (VPD_TAG_LARGE(a) ? 0x3 : 0x1)
 
@@ -74,79 +76,86 @@ enum {
 #define CONVERT(r) (r == VPD_RO ? VPD_TAG_R : VPD_TAG_W)
 
 #if defined(_MSC_VER)
-#define PACK( __declaration__ ) __pragma( pack(push, 1) ) __declaration__ __pragma( pack(pop) )
+#define PACK(__declaration__) __pragma(pack(push, 1)) __declaration__ __pragma(pack(pop))
 #else
-#define PACK( __declaration__ ) __declaration__ __attribute__((__packed__))
+#define PACK(__declaration__) __declaration__ __attribute__((__packed__))
 #endif
 
-PACK(
-struct vpd_field {
+PACK(struct vpd_field {
     unsigned char keyword[2];
     unsigned char length;
     unsigned char data[0];
-}); 
+});
 
-
-int my_vpd_read(mfile *mf,
-                u_int8_t *raw_vpd,
-                int raw_vpd_size,
-                u_int8_t *buf,
-                unsigned offset,
-                int size)
+int my_vpd_read(mfile* mf, u_int8_t* raw_vpd, int raw_vpd_size, u_int8_t* buf, unsigned offset, int size)
 {
     unsigned i;
     int ret;
-    if (mf != NULL) {
-        for (i = 0; (int)i < size; i += 0x4) {
+    if (mf != NULL)
+    {
+        for (i = 0; (int)i < size; i += 0x4)
+        {
             u_int8_t value[4] = {0};
             ret = mvpd_read4(mf, offset + i, value);
-            if (ret) {
+            if (ret)
+            {
                 syslog(3, "LIBMVPD: MVPD_READ4 failed on offset:%d, RC[%d]", offset, ret);
                 return MVPD_ACCESS_ERR;
             }
             memcpy(buf + i, value, 4 * sizeof(u_int8_t));
         }
-    } else if (raw_vpd != NULL) {
-        if ((int)(offset + size) > raw_vpd_size) {
+    }
+    else if (raw_vpd != NULL)
+    {
+        if ((int)(offset + size) > raw_vpd_size)
+        {
             size = raw_vpd_size - offset;
-            if (size < 0) {
+            if (size < 0)
+            {
                 return MVPD_TRUNCATED;
             }
         }
         memcpy(buf, raw_vpd + offset, size * sizeof(u_int8_t));
-    } else {
+    }
+    else
+    {
         return INTERNAL_PARAMS_ERROR;
     }
     return MVPD_OK;
 }
 
-int mvpd_get_raw_vpd(mfile *mf, u_int8_t *raw_data_buf, int size)
+int mvpd_get_raw_vpd(mfile* mf, u_int8_t* raw_data_buf, int size)
 {
     dm_dev_id_t dev_type;
     u_int32_t dev_id;
     u_int32_t rev_id;
-    
-    if (mf == NULL) {
+
+    if (mf == NULL)
+    {
         return INTERNAL_PARAMS_ERROR;
     }
 
-    if (dm_get_device_id(mf, &dev_type, &dev_id, &rev_id) != 0) {
+    if (dm_get_device_id(mf, &dev_type, &dev_id, &rev_id) != 0)
+    {
         return INTERNAL_PARAMS_ERROR;
     }
-    
-    if (dm_dev_is_hca(dev_type) == true) {
+
+    if (dm_dev_is_hca(dev_type) == true)
+    {
         return my_vpd_read(mf, NULL, 0, raw_data_buf, 0, size);
     }
-    else {
+    else
+    {
         return MVPD_OK;
     }
 }
 
-int allocate_result(vpd_result_t **result)
+int allocate_result(vpd_result_t** result)
 {
-    vpd_result_t *res;
-    res = (vpd_result_t*) malloc(sizeof(vpd_result_t));
-    if (res == NULL) {
+    vpd_result_t* res;
+    res = (vpd_result_t*)malloc(sizeof(vpd_result_t));
+    if (res == NULL)
+    {
         return MVPD_MEM_ERR;
     }
     memset(res, 0, sizeof(vpd_result_t));
@@ -154,16 +163,14 @@ int allocate_result(vpd_result_t **result)
     return MVPD_OK;
 }
 
-int fill_id(vpd_result_t *result,
-            u_int8_t *data,
-            unsigned offset
-            )
+int fill_id(vpd_result_t* result, u_int8_t* data, unsigned offset)
 {
     vpd_tag_t id_tag;
     strcpy(id_tag.id, "ID");
     id_tag.len = VPD_TAG_LENGTH(data);
-    id_tag.data = (char*) malloc(id_tag.len + 1);
-    if (id_tag.data == NULL) {
+    id_tag.data = (char*)malloc(id_tag.len + 1);
+    if (id_tag.data == NULL)
+    {
         return MVPD_MEM_ERR;
     }
     memcpy(id_tag.data, VPD_TAG_DATA(data), id_tag.len);
@@ -174,34 +181,42 @@ int fill_id(vpd_result_t *result,
     return MVPD_OK;
 }
 
-int fill_fields(vpd_result_t *result,
-                u_int8_t *data,
+int fill_fields(vpd_result_t* result,
+                u_int8_t* data,
                 unsigned offset,
                 int read_type,
-                unsigned *checksum_offset,
+                unsigned* checksum_offset,
                 int strict)
 {
     int i;
     int fields_num = 0;
     int fields_idx = 0;
     vpd_tag_t id_tag;
-    vpd_tag_t *fields_list;
-    struct vpd_field *field = NULL;
-    if (read_type == VPD_TAG_R) {
-        if (result->ro_fields_size != 0) {
+    vpd_tag_t* fields_list;
+    struct vpd_field* field = NULL;
+    if (read_type == VPD_TAG_R)
+    {
+        if (result->ro_fields_size != 0)
+        {
             syslog(3, "LIBMVPD: Format error RO fields !");
             return MVPD_FORMAT_ERR;
         }
-    } else {
-        if (result->rw_fields_size != 0) {
+    }
+    else
+    {
+        if (result->rw_fields_size != 0)
+        {
             syslog(3, "LIBMVPD: Format error RW fields !");
             return MVPD_FORMAT_ERR;
         }
     }
-    for (i = 0; i < VPD_TAG_LENGTH(data); i += 0x3 + field->length) {
-        field = (struct vpd_field*) (VPD_TAG_DATA(data) + i);
-        if (strict) {
-            if (i + 0x3 > VPD_TAG_LENGTH(data) ||  i + 0x3 + field->length > VPD_TAG_LENGTH(data)) {
+    for (i = 0; i < VPD_TAG_LENGTH(data); i += 0x3 + field->length)
+    {
+        field = (struct vpd_field*)(VPD_TAG_DATA(data) + i);
+        if (strict)
+        {
+            if (i + 0x3 > VPD_TAG_LENGTH(data) || i + 0x3 + field->length > VPD_TAG_LENGTH(data))
+            {
                 fprintf(stderr, "-E- In tag %s offset 0x%x+0x%x there is an invalid field (keyword: 0x%x).\n",
                         VPD_TAG_NAME(data) == VPD_TAG_R ? "VPD_R" : "VPD_W", offset, i, field->keyword[0]);
                 return MVPD_FORMAT_ERR;
@@ -209,84 +224,104 @@ int fill_fields(vpd_result_t *result,
         }
         fields_num++;
     }
-    fields_list = (vpd_tag_t*) malloc(fields_num * sizeof(vpd_tag_t));
-    if (fields_list == NULL) {
+    fields_list = (vpd_tag_t*)malloc(fields_num * sizeof(vpd_tag_t));
+    if (fields_list == NULL)
+    {
         return MVPD_MEM_ERR;
     }
-    for (i = 0; i < VPD_TAG_LENGTH(data); i += 0x3 + field->length) {
-        field = (struct vpd_field*) (VPD_TAG_DATA(data) + i);
+    for (i = 0; i < VPD_TAG_LENGTH(data); i += 0x3 + field->length)
+    {
+        field = (struct vpd_field*)(VPD_TAG_DATA(data) + i);
         id_tag.id[0] = field->keyword[0];
         id_tag.id[1] = field->keyword[1];
         id_tag.id[2] = '\0';
-        if (strict && ( strlen(id_tag.id) == 0 ||
-                      !isprint(field->keyword[0]) ||
-                      !isprint(field->keyword[1]))) {
+        if (strict && (strlen(id_tag.id) == 0 || !isprint(field->keyword[0]) || !isprint(field->keyword[1])))
+        {
             // fail if keywords are non printable/empty if strict==1 (indicates corrupt VPD)
             free(fields_list);
             return MVPD_FORMAT_ERR;
         }
         id_tag.len = field->length;
-        id_tag.data = (char*) malloc(id_tag.len + 1);
-        if (id_tag.data == NULL) {
+        id_tag.data = (char*)malloc(id_tag.len + 1);
+        if (id_tag.data == NULL)
+        {
             free(fields_list);
             return MVPD_MEM_ERR;
         }
         memcpy(id_tag.data, field->data, id_tag.len);
         id_tag.data[id_tag.len] = '\0';
         id_tag.offset = offset + i + VPD_TAG_HEAD(data);
-        if (strcmp(id_tag.id, "RV") == 0) {
+        if (strcmp(id_tag.id, "RV") == 0)
+        {
             *checksum_offset = id_tag.offset + 0x3; /* 0x3 is the header of the field */
         }
-        //syslog(3, "LIBMVPD: Filed TAG: %s, data: %s", id_tag.id, id_tag.data);
+        // syslog(3, "LIBMVPD: Filed TAG: %s, data: %s", id_tag.id, id_tag.data);
         fields_list[fields_idx++] = id_tag;
     }
-    if (read_type == VPD_TAG_R) {
+    if (read_type == VPD_TAG_R)
+    {
         result->ro_fields_size += fields_num;
         result->ro_fields = fields_list;
-    } else {
+    }
+    else
+    {
         result->rw_fields_size += fields_num;
         result->rw_fields = fields_list;
     }
     return MVPD_OK;
 }
 
-int check_checksum(u_int8_t *id_data,
-                   int id_size,
-                   u_int8_t *ro_data,
-                   unsigned rv_offset)
+int check_checksum(u_int8_t* id_data, int id_size, u_int8_t* ro_data, unsigned rv_offset)
 {
-
     int i;
     u_int8_t sum = 0;
-    //printf("-D- RV OFF: 0x%x, id_size: %x\n", rv_offset, id_size);
-    if ((int)rv_offset < id_size) {
+    // printf("-D- RV OFF: 0x%x, id_size: %x\n", rv_offset, id_size);
+    if ((int)rv_offset < id_size)
+    {
         return MVPD_BAD_CHECKSUM;
     }
-    for (i = 0; i < id_size; i++) {
+    for (i = 0; i < id_size; i++)
+    {
         sum += id_data[i];
     }
-    for (i = 0; i <= (int)(rv_offset - id_size); i++) {
+    for (i = 0; i <= (int)(rv_offset - id_size); i++)
+    {
         sum += ro_data[i];
     }
-    if (sum) {
+    if (sum)
+    {
         return MVPD_BAD_CHECKSUM;
     }
     return MVPD_OK;
 }
 
-#define CHECK_RC(rc) do {if (rc) {goto error;}} while (0)
-#define CHECK_NULL(ptr) do {if (NULL == ptr) {goto error;}} while (0)
-
-
-int mvpd_read_or_parse(mfile *mf,
-                       u_int8_t *raw_vpd,
+#define CHECK_RC(rc)    \
+    do                  \
+    {                   \
+        if (rc)         \
+        {               \
+            goto error; \
+        }               \
+    } while (0)
+#define CHECK_NULL(ptr)  \
+    do                   \
+    {                    \
+        if (NULL == ptr) \
+        {                \
+            goto error;  \
+        }                \
+    } while (0)
+
+int mvpd_read_or_parse(mfile* mf,
+                       u_int8_t* raw_vpd,
                        int raw_vpd_size,
-                       vpd_result_t **result,
+                       vpd_result_t** result,
                        vpd_tags_type_t read_type,
                        int strict,
                        int checksum_verify)
 {
-    struct vpd_tags_info_t {
+    struct vpd_tags_info_t
+    {
         unsigned id_tag_offset;
         int id_tag_len;
         unsigned ro_tag_offset;
@@ -294,13 +329,13 @@ int mvpd_read_or_parse(mfile *mf,
         unsigned rw_tag_offset;
         int rw_tag_len;
     };
-    struct vpd_tags_info_t vpd_tags_info = { .id_tag_len = -1, .ro_tag_len = -1, .rw_tag_len = -1};
+    struct vpd_tags_info_t vpd_tags_info = {.id_tag_len = -1, .ro_tag_len = -1, .rw_tag_len = -1};
     u_int8_t buff[4] = {0};
     unsigned offset = 0;
     unsigned checksum_offset = 0;
-    u_int8_t *id_data = NULL;
-    u_int8_t *ro_data = NULL;
-    u_int8_t *rw_data = NULL;
+    u_int8_t* id_data = NULL;
+    u_int8_t* ro_data = NULL;
+    u_int8_t* rw_data = NULL;
     int checksum_res = -1;
     int rc = MVPD_MEM_ERR;
     unsigned actual_size = 1 << 15; /*MAX SIZE OF VPD */
@@ -308,187 +343,216 @@ int mvpd_read_or_parse(mfile *mf,
     dm_dev_id_t dev_type;
     u_int32_t dev_id;
     u_int32_t rev_id;
-    
+
     // when mf is NULL we parse the raw_vpd inside my_vpd_read method, no need to check if it's a NIC in case of parse
-    if (mf != NULL) {
-        if (dm_get_device_id(mf, &dev_type, &dev_id, &rev_id) != 0) {
+    if (mf != NULL)
+    {
+        if (dm_get_device_id(mf, &dev_type, &dev_id, &rev_id) != 0)
+        {
             return INTERNAL_PARAMS_ERROR;
         }
-        
-        if (dm_dev_is_hca(dev_type) == false) {
+
+        if (dm_dev_is_hca(dev_type) == false)
+        {
             return MVPD_OK;
         }
     }
 
-    if (raw_vpd != NULL) {
+    if (raw_vpd != NULL)
+    {
         actual_size = raw_vpd_size;
     }
-    if (allocate_result(result)) {
+    if (allocate_result(result))
+    {
         return MVPD_MEM_ERR;
     }
-    for (offset = 0; offset < actual_size; offset += len) {
-        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, buff, offset, 4); CHECK_RC(rc);
+    for (offset = 0; offset < actual_size; offset += len)
+    {
+        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, buff, offset, 4);
+        CHECK_RC(rc);
         len = VPD_TAG_HEAD(buff) + VPD_TAG_LENGTH(buff);
-        if (VPD_TAG_NAME(buff) == VPD_TAG_END) {
+        if (VPD_TAG_NAME(buff) == VPD_TAG_END)
+        {
             break;
-        } else if (VPD_TAG_NAME(buff) == VPD_TAG_ID) {
+        }
+        else if (VPD_TAG_NAME(buff) == VPD_TAG_ID)
+        {
             vpd_tags_info.id_tag_len = len;
             vpd_tags_info.id_tag_offset = offset;
-        } else if (VPD_TAG_NAME(buff) == VPD_TAG_R) {
+        }
+        else if (VPD_TAG_NAME(buff) == VPD_TAG_R)
+        {
             vpd_tags_info.ro_tag_len = len;
             vpd_tags_info.ro_tag_offset = offset;
-        } else if (VPD_TAG_NAME(buff) == VPD_TAG_W) {
+        }
+        else if (VPD_TAG_NAME(buff) == VPD_TAG_W)
+        {
             vpd_tags_info.rw_tag_len = len;
             vpd_tags_info.rw_tag_offset = offset;
-        } else {
+        }
+        else
+        {
             syslog(3, "LIBMVPD: Unknown TAG %x in offset: %x !", VPD_TAG_NAME(buff), offset);
             rc = MVPD_FORMAT_ERR;
             goto error;
         }
     }
-    if (offset == 0) {
+    if (offset == 0)
+    {
         rc = MVPD_EMPTY;
         goto error;
     }
-    if (vpd_tags_info.ro_tag_len <= 0 || vpd_tags_info.id_tag_len <= 0) {
+    if (vpd_tags_info.ro_tag_len <= 0 || vpd_tags_info.id_tag_len <= 0)
+    {
         rc = MVPD_FORMAT_ERR;
         goto error;
     }
-    if (read_type & VPD_RO) {
+    if (read_type & VPD_RO)
+    {
         /* TAKE THE ID TAG */
-        //syslog(3, "LIBMVPD: Reading VPD RO SECTION");
+        // syslog(3, "LIBMVPD: Reading VPD RO SECTION");
         int id_len = vpd_tags_info.id_tag_len;
         int ro_len = vpd_tags_info.ro_tag_len;
         int read_size = (id_len + 3) & ~3;
         size_t alocated_read_size = read_size * sizeof(u_int8_t);
         offset = vpd_tags_info.id_tag_offset;
-        id_data = (u_int8_t*) malloc(alocated_read_size);
+        id_data = (u_int8_t*)malloc(alocated_read_size);
         CHECK_NULL(id_data);
         memset(id_data, 0, alocated_read_size);
-        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, id_data, offset, read_size); CHECK_RC(rc);
-        rc = fill_id(*result, id_data, offset); CHECK_RC(rc);
+        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, id_data, offset, read_size);
+        CHECK_RC(rc);
+        rc = fill_id(*result, id_data, offset);
+        CHECK_RC(rc);
         (*result)->vpd_size += id_len;
         /* TAKE THE RO FIELDS */
         read_size = (ro_len + 3) & ~3;
         alocated_read_size = read_size * sizeof(u_int8_t);
         offset = vpd_tags_info.ro_tag_offset;
-        ro_data = (u_int8_t*) malloc(alocated_read_size);
+        ro_data = (u_int8_t*)malloc(alocated_read_size);
         CHECK_NULL(ro_data);
         memset(ro_data, 0, alocated_read_size);
-        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, ro_data, offset, read_size); CHECK_RC(rc);
-        //syslog(3, "LIBMVPD: Reading VPD RO Done, filling fields !");
-        rc = fill_fields(*result, ro_data, offset, VPD_TAG_NAME(ro_data), &checksum_offset, strict); CHECK_RC(rc);
-        //syslog(3, "LIBMVPD: Filling fields done, checking CHECKSUM: %d!", checksum_offset);
+        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, ro_data, offset, read_size);
+        CHECK_RC(rc);
+        // syslog(3, "LIBMVPD: Reading VPD RO Done, filling fields !");
+        rc = fill_fields(*result, ro_data, offset, VPD_TAG_NAME(ro_data), &checksum_offset, strict);
+        CHECK_RC(rc);
+        // syslog(3, "LIBMVPD: Filling fields done, checking CHECKSUM: %d!", checksum_offset);
         (*result)->vpd_size += ro_len;
         checksum_res = check_checksum(id_data, id_len, ro_data, checksum_offset);
-        //syslog(3, "LIBMVPD: checking CHECKSUM Done !");
-        free(ro_data); ro_data = NULL;
-        free(id_data); id_data = NULL;
+        // syslog(3, "LIBMVPD: checking CHECKSUM Done !");
+        free(ro_data);
+        ro_data = NULL;
+        free(id_data);
+        id_data = NULL;
     }
 
-    if ((read_type & VPD_RW) && vpd_tags_info.rw_tag_len > 0) {
-        //syslog(3, "LIBMVPD: Reading VPD RW SECTION");
+    if ((read_type & VPD_RW) && vpd_tags_info.rw_tag_len > 0)
+    {
+        // syslog(3, "LIBMVPD: Reading VPD RW SECTION");
         int len = vpd_tags_info.rw_tag_len;
         int read_size = (len + 3) & ~3;
         size_t allocated_rw_size = read_size * sizeof(u_int8_t);
         offset = vpd_tags_info.rw_tag_offset;
-        rw_data = (u_int8_t*) malloc(allocated_rw_size);
+        rw_data = (u_int8_t*)malloc(allocated_rw_size);
         CHECK_NULL(rw_data);
         memset(rw_data, 0, allocated_rw_size);
-        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, rw_data, offset, read_size); CHECK_RC(rc);
-        rc = fill_fields(*result, rw_data, offset, VPD_TAG_NAME(rw_data), &checksum_offset, strict); CHECK_RC(rc);
+        rc = my_vpd_read(mf, raw_vpd, raw_vpd_size, rw_data, offset, read_size);
+        CHECK_RC(rc);
+        rc = fill_fields(*result, rw_data, offset, VPD_TAG_NAME(rw_data), &checksum_offset, strict);
+        CHECK_RC(rc);
         (*result)->vpd_size += len;
         free(rw_data);
     }
     /* If the RO field were read check the checksum */
-    if (checksum_verify && checksum_res != -1) {
+    if (checksum_verify && checksum_res != -1)
+    {
         return checksum_res;
     }
     return MVPD_OK;
 
 error:
-    if (id_data != NULL) {
+    if (id_data != NULL)
+    {
         free(id_data);
     }
-    if (ro_data != NULL) {
+    if (ro_data != NULL)
+    {
         free(ro_data);
     }
-    if (rw_data != NULL) {
+    if (rw_data != NULL)
+    {
         free(rw_data);
     }
     mvpd_result_free(*result);
     return rc;
-
 }
 
-int mvpd_read(mfile *mf,
-              vpd_result_t **result,
-              vpd_tags_type_t read_type)
+int mvpd_read(mfile* mf, vpd_result_t** result, vpd_tags_type_t read_type)
 {
     return mvpd_read_adv(mf, result, read_type, 0);
 }
 
-int mvpd_read_adv(mfile *mf,
-                  vpd_result_t **result,
-                  vpd_tags_type_t read_type,
-                  int strict)
+int mvpd_read_adv(mfile* mf, vpd_result_t** result, vpd_tags_type_t read_type, int strict)
 {
-    if (mf == NULL || result == NULL) {
+    if (mf == NULL || result == NULL)
+    {
         return MVPD_BAD_PARAMS;
     }
     return mvpd_read_or_parse(mf, NULL, -1, result, read_type, strict, 0);
 }
 
-int mvpd_parse(u_int8_t *raw_vpd,
-               int size,
-               vpd_result_t **result,
-               vpd_tags_type_t read_type)
+int mvpd_parse(u_int8_t* raw_vpd, int size, vpd_result_t** result, vpd_tags_type_t read_type)
 {
     return mvpd_parse_adv(raw_vpd, size, result, read_type, 0, 0);
 }
 
-int mvpd_parse_adv(u_int8_t *raw_vpd,
+int mvpd_parse_adv(u_int8_t* raw_vpd,
                    int size,
-                   vpd_result_t **result,
+                   vpd_result_t** result,
                    vpd_tags_type_t read_type,
                    int strict,
                    int checksum_ver)
 {
-    if (raw_vpd == NULL || size <= 0 || result == NULL) {
+    if (raw_vpd == NULL || size <= 0 || result == NULL)
+    {
         return MVPD_BAD_PARAMS;
     }
     return mvpd_read_or_parse(NULL, raw_vpd, size, result, read_type, strict, checksum_ver);
 }
 
-void free_fields(vpd_tag_t *fields_list,
-                 int len)
+void free_fields(vpd_tag_t* fields_list, int len)
 {
     int i;
-    for (i = 0; i < len; i++) {
+    for (i = 0; i < len; i++)
+    {
         free(fields_list[i].data);
     }
     free(fields_list);
 }
 
-int mvpd_result_free(vpd_result_t *result)
+int mvpd_result_free(vpd_result_t* result)
 {
-    if (result == NULL) {
+    if (result == NULL)
+    {
         return 1;
     }
-    if (result->ro_fields != NULL) {
+    if (result->ro_fields != NULL)
+    {
         free_fields(result->ro_fields, result->ro_fields_size);
     }
-    if (result->rw_fields != NULL) {
+    if (result->rw_fields != NULL)
+    {
         free_fields(result->rw_fields, result->rw_fields_size);
     }
-    if (result->id.data != NULL) {
+    if (result->id.data != NULL)
+    {
         free(result->id.data);
     }
     free(result);
     return MVPD_OK;
 }
 
-int mvpd_get_vpd_size(mfile *mf, int *size)
+int mvpd_get_vpd_size(mfile* mf, int* size)
 {
     int mvpd_len;
     int len = 0;
@@ -497,26 +561,33 @@ int mvpd_get_vpd_size(mfile *mf, int *size)
     dm_dev_id_t dev_type;
     u_int32_t dev_id;
     u_int32_t rev_id;
-    
-    if (mf == NULL) {
+
+    if (mf == NULL)
+    {
         return INTERNAL_PARAMS_ERROR;
     }
 
-    if (dm_get_device_id(mf, &dev_type, &dev_id, &rev_id) != 0) {
+    if (dm_get_device_id(mf, &dev_type, &dev_id, &rev_id) != 0)
+    {
         return INTERNAL_PARAMS_ERROR;
     }
-    
-    if (dm_dev_is_hca(dev_type) == true) {
-        for (mvpd_len = 0; mvpd_len < VPD_MAX_SIZE; mvpd_len += len) {
+
+    if (dm_dev_is_hca(dev_type) == true)
+    {
+        for (mvpd_len = 0; mvpd_len < VPD_MAX_SIZE; mvpd_len += len)
+        {
             res = my_vpd_read(mf, NULL, 0, buff, mvpd_len, 4);
-            if (res != MVPD_OK) {
+            if (res != MVPD_OK)
+            {
                 return res;
             }
             len = VPD_TAG_HEAD(buff) + VPD_TAG_LENGTH(buff);
-            if (VPD_TAG_NAME(buff) == VPD_TAG_END) {
+            if (VPD_TAG_NAME(buff) == VPD_TAG_END)
+            {
                 break;
             }
-            if (VPD_TAG_NAME(buff) != VPD_TAG_ID && VPD_TAG_NAME(buff) != VPD_TAG_R && VPD_TAG_NAME(buff) != VPD_TAG_W) {
+            if (VPD_TAG_NAME(buff) != VPD_TAG_ID && VPD_TAG_NAME(buff) != VPD_TAG_R && VPD_TAG_NAME(buff) != VPD_TAG_W)
+            {
                 syslog(3, "LIBMVPD: Unknown TAG %x in offset: %x !", VPD_TAG_NAME(buff), mvpd_len);
                 return MVPD_FORMAT_ERR;
             }
@@ -526,4 +597,3 @@ int mvpd_get_vpd_size(mfile *mf, int *size)
 
     return 0;
 }
-
diff --git a/mvpd/mvpd.h b/mvpd/mvpd.h
index 51a5e439..a0ee0563 100644
--- a/mvpd/mvpd.h
+++ b/mvpd/mvpd.h
@@ -34,14 +34,14 @@
  *
  */
 
-
 #ifndef _MVPD_H
 #define _MVPD_H
 
 #include <mtcr.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #ifdef _MSC_VER
@@ -50,54 +50,63 @@ extern "C" {
 #define MVPD_DLL_EXPORT
 #endif
 
-enum {
-    MVPD_OK = 0,
-    MVPD_ERR,
-    MVPD_MEM_ERR,
-    MVPD_BAD_PARAMS,
-    MVPD_ACCESS_ERR,
-    MVPD_FORMAT_ERR,
-    MVPD_TRUNCATED,
-    MVPD_BAD_CHECKSUM,
-    MVPD_EMPTY,
-    MVPD_END,
-};
-
-typedef enum {
-    VPD_RO = 1 << 0, /* Read-only VPD tags type */
-    VPD_RW = 1 << 1, /* Read-Write VPD tags type */
-    VPD_ALL = VPD_RO | VPD_RW, /* Read All VPD tags */
-} vpd_tags_type_t;
-
-typedef struct vpd_tag {
-    char id[3];   // Leave a slot for NULL termination
-    int len;
-    char *data;
-    int offset;   // start of this tag in vpd address space
-} vpd_tag_t;
-
-typedef struct {
-    int vpd_size;
-    vpd_tag_t id;
-    int ro_fields_size;
-    vpd_tag_t *ro_fields;
-    int rw_fields_size;
-    vpd_tag_t *rw_fields;
-} vpd_result_t;
-
-MVPD_DLL_EXPORT int mvpd_get_vpd_size(mfile *mf, int *size);
-
-MVPD_DLL_EXPORT int mvpd_read(mfile *mf, vpd_result_t **result, vpd_tags_type_t read_type);
-
-MVPD_DLL_EXPORT int mvpd_read_adv(mfile *mf, vpd_result_t **result, vpd_tags_type_t read_type, int strict);
-
-MVPD_DLL_EXPORT int mvpd_parse(u_int8_t *raw_vpd, int size, vpd_result_t **result, vpd_tags_type_t read_type);
-
-MVPD_DLL_EXPORT int mvpd_parse_adv(u_int8_t *raw_vpd, int size, vpd_result_t **result, vpd_tags_type_t read_type, int strict, int checksum_verify);
-
-MVPD_DLL_EXPORT int mvpd_result_free(vpd_result_t *result);
-
-MVPD_DLL_EXPORT int mvpd_get_raw_vpd(mfile *mf, u_int8_t *raw_data_buf, int size);
+    enum
+    {
+        MVPD_OK = 0,
+        MVPD_ERR,
+        MVPD_MEM_ERR,
+        MVPD_BAD_PARAMS,
+        MVPD_ACCESS_ERR,
+        MVPD_FORMAT_ERR,
+        MVPD_TRUNCATED,
+        MVPD_BAD_CHECKSUM,
+        MVPD_EMPTY,
+        MVPD_END,
+    };
+
+    typedef enum
+    {
+        VPD_RO = 1 << 0,           /* Read-only VPD tags type */
+        VPD_RW = 1 << 1,           /* Read-Write VPD tags type */
+        VPD_ALL = VPD_RO | VPD_RW, /* Read All VPD tags */
+    } vpd_tags_type_t;
+
+    typedef struct vpd_tag
+    {
+        char id[3]; // Leave a slot for NULL termination
+        int len;
+        char* data;
+        int offset; // start of this tag in vpd address space
+    } vpd_tag_t;
+
+    typedef struct
+    {
+        int vpd_size;
+        vpd_tag_t id;
+        int ro_fields_size;
+        vpd_tag_t* ro_fields;
+        int rw_fields_size;
+        vpd_tag_t* rw_fields;
+    } vpd_result_t;
+
+    MVPD_DLL_EXPORT int mvpd_get_vpd_size(mfile* mf, int* size);
+
+    MVPD_DLL_EXPORT int mvpd_read(mfile* mf, vpd_result_t** result, vpd_tags_type_t read_type);
+
+    MVPD_DLL_EXPORT int mvpd_read_adv(mfile* mf, vpd_result_t** result, vpd_tags_type_t read_type, int strict);
+
+    MVPD_DLL_EXPORT int mvpd_parse(u_int8_t* raw_vpd, int size, vpd_result_t** result, vpd_tags_type_t read_type);
+
+    MVPD_DLL_EXPORT int mvpd_parse_adv(u_int8_t* raw_vpd,
+                                       int size,
+                                       vpd_result_t** result,
+                                       vpd_tags_type_t read_type,
+                                       int strict,
+                                       int checksum_verify);
+
+    MVPD_DLL_EXPORT int mvpd_result_free(vpd_result_t* result);
+
+    MVPD_DLL_EXPORT int mvpd_get_raw_vpd(mfile* mf, u_int8_t* raw_data_buf, int size);
 
 #ifdef __cplusplus
 }
diff --git a/pldmlib/pldm_buff.cpp b/pldmlib/pldm_buff.cpp
index ad1e2f3c..76cc7e77 100644
--- a/pldmlib/pldm_buff.cpp
+++ b/pldmlib/pldm_buff.cpp
@@ -44,13 +44,13 @@
 
 #include "pldm_buff.h"
 
+PldmBuffer::PldmBuffer() : m_buff(NULL), m_pos(0), m_size(0) {}
 
-PldmBuffer::PldmBuffer(): m_buff(NULL), m_pos(0), m_size(0) {
-}
-
-PldmBuffer::~PldmBuffer() {
-    if (m_buff) {
-        delete [] m_buff;
+PldmBuffer::~PldmBuffer()
+{
+    if (m_buff)
+    {
+        delete[] m_buff;
         m_buff = NULL;
     }
 }
@@ -58,90 +58,99 @@ PldmBuffer::~PldmBuffer() {
 bool PldmBuffer::loadFile(const std::string& fname)
 {
     // open the file:
-    FILE * fp;
+    FILE* fp;
 
     fp = fopen(fname.c_str(), "rb");
-    if (!fp) {
+    if (!fp)
+    {
         return false;
     }
 
-    //Get file length
+    // Get file length
     fseek(fp, 0, SEEK_END);
-    m_size=ftell(fp);
+    m_size = ftell(fp);
     fseek(fp, 0, SEEK_SET);
 
-    //Allocate memory
-    if (m_buff) {
-        delete [] m_buff;
+    // Allocate memory
+    if (m_buff)
+    {
+        delete[] m_buff;
         m_buff = NULL;
     }
 
-    m_buff= new u_int8_t[m_size+1];
+    m_buff = new u_int8_t[m_size + 1];
     if (!m_buff)
     {
         return false;
     }
 
-    //Read file contents into buffer
+    // Read file contents into buffer
     size_t read_size = fread(m_buff, m_size, 1, fp);
     fclose(fp);
 
     return (read_size == (size_t)m_size);
 }
 
-
-void PldmBuffer::read(u_int8_t & val) {
+void PldmBuffer::read(u_int8_t& val)
+{
     val = *(m_buff + m_pos);
     m_pos += sizeof(u_int8_t);
 }
 
-void PldmBuffer::read(u_int16_t & val) {
-    val = *(u_int16_t *)(m_buff + m_pos);
+void PldmBuffer::read(u_int16_t& val)
+{
+    val = *(u_int16_t*)(m_buff + m_pos);
     m_pos += sizeof(u_int16_t);
     val = __le16_to_cpu(val);
 }
 
-void PldmBuffer::read(u_int32_t & val) {
-    val = *(u_int32_t *)(m_buff + m_pos);
+void PldmBuffer::read(u_int32_t& val)
+{
+    val = *(u_int32_t*)(m_buff + m_pos);
     m_pos += sizeof(u_int32_t);
     val = __le32_to_cpu(val);
 }
 
-void PldmBuffer::read(std::string& str, size_t str_size) {
-    u_int8_t *arr = new u_int8_t[str_size];
+void PldmBuffer::read(std::string& str, size_t str_size)
+{
+    u_int8_t* arr = new u_int8_t[str_size];
     read(arr, str_size);
-    str = std::string(reinterpret_cast<char const *>(arr), str_size);
-    delete [] arr;
+    str = std::string(reinterpret_cast<char const*>(arr), str_size);
+    delete[] arr;
 }
 
-void PldmBuffer::read(u_int8_t *arr, size_t arr_size) {
+void PldmBuffer::read(u_int8_t* arr, size_t arr_size)
+{
     memcpy(arr, m_buff + m_pos, arr_size);
     m_pos += arr_size;
 }
 
-int PldmBuffer::seek(long offset, int whence) {
+int PldmBuffer::seek(long offset, int whence)
+{
     long new_pos = -1;
 
-    switch(whence) {
-    case SEEK_SET:
-        new_pos = offset;
-        break;
-    case SEEK_CUR:
-        new_pos = m_pos + offset;
-        break;
-    case SEEK_END:
-        new_pos = m_size + offset;
-        break;
+    switch (whence)
+    {
+        case SEEK_SET:
+            new_pos = offset;
+            break;
+        case SEEK_CUR:
+            new_pos = m_pos + offset;
+            break;
+        case SEEK_END:
+            new_pos = m_size + offset;
+            break;
     }
 
-    if(new_pos < 0 || new_pos > m_size) {
+    if (new_pos < 0 || new_pos > m_size)
+    {
         return -1;
     }
     m_pos = new_pos;
     return 0;
 }
 
-long PldmBuffer::tell() {
+long PldmBuffer::tell()
+{
     return m_pos;
 }
-
diff --git a/pldmlib/pldm_buff.h b/pldmlib/pldm_buff.h
index 748eddd8..f4e749ec 100644
--- a/pldmlib/pldm_buff.h
+++ b/pldmlib/pldm_buff.h
@@ -40,26 +40,27 @@
 #include <string>
 #include <compatibility.h>
 
-class PldmBuffer {
+class PldmBuffer
+{
 public:
     PldmBuffer();
     virtual ~PldmBuffer();
 
     bool loadFile(const std::string& fname);
 
-    void read(u_int8_t & val);
-    void read(u_int16_t & val);
-    void read(u_int32_t & val);
+    void read(u_int8_t& val);
+    void read(u_int16_t& val);
+    void read(u_int32_t& val);
     void read(std::string& str, size_t str_size);
-    void read(u_int8_t *arr, size_t arr_size);
+    void read(u_int8_t* arr, size_t arr_size);
 
     int seek(long offset, int whence);
     long tell();
+
 private:
-    u_int8_t * m_buff;
+    u_int8_t* m_buff;
     long m_pos;
     long m_size;
 };
 
 #endif /* _PLDM_BUFF_H_ */
-
diff --git a/pldmlib/pldm_component_image.cpp b/pldmlib/pldm_component_image.cpp
index ac102d4c..a986895f 100644
--- a/pldmlib/pldm_component_image.cpp
+++ b/pldmlib/pldm_component_image.cpp
@@ -40,26 +40,33 @@
 #include <errno.h>
 #include <string>
 
-
 #include "pldm_buff.h"
 #include "pldm_component_image.h"
 
-
-PldmComponenetImage::PldmComponenetImage(): componentClassification(0),
-    componentIdentifier(0), componentComparisonStamp(0), componentOptions(0),
-    requestedComponentActivationMethod(0), componentLocationOffset(0),
-    componentSize(0), componentVersionStringType(0),
-    componentVersionStringLength(0), componentData(NULL) {
+PldmComponenetImage::PldmComponenetImage() :
+    componentClassification(0),
+    componentIdentifier(0),
+    componentComparisonStamp(0),
+    componentOptions(0),
+    requestedComponentActivationMethod(0),
+    componentLocationOffset(0),
+    componentSize(0),
+    componentVersionStringType(0),
+    componentVersionStringLength(0),
+    componentData(NULL)
+{
 }
 
-PldmComponenetImage::~PldmComponenetImage() {
-    if(componentData) {
-        delete [] componentData;
+PldmComponenetImage::~PldmComponenetImage()
+{
+    if (componentData)
+    {
+        delete[] componentData;
     }
 }
 
-bool PldmComponenetImage::unpack(PldmBuffer & buff) {
-
+bool PldmComponenetImage::unpack(PldmBuffer& buff)
+{
     buff.read(componentClassification);
     buff.read(componentIdentifier);
     buff.read(componentComparisonStamp);
@@ -74,7 +81,8 @@ bool PldmComponenetImage::unpack(PldmBuffer & buff) {
     return readComponentData(buff);
 }
 
-bool PldmComponenetImage::readComponentData(PldmBuffer & buff) {
+bool PldmComponenetImage::readComponentData(PldmBuffer& buff)
+{
     componentData = new u_int8_t[componentSize];
     // restore previous position
     long pos = buff.tell();
@@ -85,7 +93,8 @@ bool PldmComponenetImage::readComponentData(PldmBuffer & buff) {
     return true;
 }
 
-void PldmComponenetImage::print(FILE * fp) {
+void PldmComponenetImage::print(FILE* fp)
+{
     fprintf(fp, "componentClassification: 0x%X\n", componentClassification);
     fprintf(fp, "componentIdentifier: 0x%X\n", componentIdentifier);
     fprintf(fp, "componentComparisonStamp: 0x%X\n", componentComparisonStamp);
diff --git a/pldmlib/pldm_component_image.h b/pldmlib/pldm_component_image.h
index 071311e2..a6950b51 100644
--- a/pldmlib/pldm_component_image.h
+++ b/pldmlib/pldm_component_image.h
@@ -38,17 +38,18 @@
 #ifndef _PLDM_COMPONENET_IMAGE_
 #define _PLDM_COMPONENET_IMAGE_
 
-class PldmComponenetImage {
+class PldmComponenetImage
+{
 public:
     PldmComponenetImage();
     virtual ~PldmComponenetImage();
-    bool unpack(PldmBuffer & buff);
-    void print(FILE * fp);
+    bool unpack(PldmBuffer& buff);
+    void print(FILE* fp);
     u_int32_t getComponentSize() const { return componentSize; }
-    const u_int8_t * getComponentData() const { return componentData; }
+    const u_int8_t* getComponentData() const { return componentData; }
 
 private:
-    bool readComponentData(PldmBuffer & buff);
+    bool readComponentData(PldmBuffer& buff);
 
     u_int16_t componentClassification;
     u_int16_t componentIdentifier;
@@ -61,8 +62,7 @@ class PldmComponenetImage {
     u_int8_t componentVersionStringLength;
     std::string componentVersionString;
 
-    u_int8_t * componentData;
+    u_int8_t* componentData;
 };
 
 #endif /* _PLDM_COMPONENET_IMAGE_ */
-
diff --git a/pldmlib/pldm_dev_id_record.cpp b/pldmlib/pldm_dev_id_record.cpp
index 8daf3f29..4f3794a3 100644
--- a/pldmlib/pldm_dev_id_record.cpp
+++ b/pldmlib/pldm_dev_id_record.cpp
@@ -40,118 +40,136 @@
 #include <string>
 #include <vector>
 
-
 #include "pldm_buff.h"
 #include "pldm_record_descriptor.h"
 #include "pldm_dev_id_record.h"
 
-
-
-PldmDevIdRecord::PldmDevIdRecord(u_int8_t bitmapBitLength):
-        componentBitmapBitLength(bitmapBitLength), recordLength(0),
-        descriptorCount(0), deviceUpdateOptionFlags(0),
-        componentImageSetVersionStringType(0),
-        componentImageSetVersionStringLength(0),
-        firmwareDevicePackageDataLength(0), applicableComponents(NULL),
-        firmwareDevicePackageData(NULL) {
+PldmDevIdRecord::PldmDevIdRecord(u_int8_t bitmapBitLength) :
+    componentBitmapBitLength(bitmapBitLength),
+    recordLength(0),
+    descriptorCount(0),
+    deviceUpdateOptionFlags(0),
+    componentImageSetVersionStringType(0),
+    componentImageSetVersionStringLength(0),
+    firmwareDevicePackageDataLength(0),
+    applicableComponents(NULL),
+    firmwareDevicePackageData(NULL)
+{
 }
 
-PldmDevIdRecord::~PldmDevIdRecord() {
-    if(applicableComponents) {
-        delete [] applicableComponents;
+PldmDevIdRecord::~PldmDevIdRecord()
+{
+    if (applicableComponents)
+    {
+        delete[] applicableComponents;
     }
-    if(firmwareDevicePackageData) {
-        delete [] firmwareDevicePackageData;
+    if (firmwareDevicePackageData)
+    {
+        delete[] firmwareDevicePackageData;
     }
-    while(!recordDescriptors.empty()) {
+    while (!recordDescriptors.empty())
+    {
         delete recordDescriptors.back();
         recordDescriptors.pop_back();
     }
-
 }
 
-bool PldmDevIdRecord::unpack(PldmBuffer & buff) {
+bool PldmDevIdRecord::unpack(PldmBuffer& buff)
+{
     buff.read(recordLength);
     buff.read(descriptorCount);
     buff.read(deviceUpdateOptionFlags);
     buff.read(componentImageSetVersionStringType);
     buff.read(componentImageSetVersionStringLength);
     buff.read(firmwareDevicePackageDataLength);
-    if(componentBitmapBitLength) {
-        u_int8_t applicableComponentsLen = componentBitmapBitLength/8;
+    if (componentBitmapBitLength)
+    {
+        u_int8_t applicableComponentsLen = componentBitmapBitLength / 8;
         applicableComponents = new u_int8_t[applicableComponentsLen];
         buff.read(applicableComponents, applicableComponentsLen);
     }
-    buff.read(componentImageSetVersionString,
-            componentImageSetVersionStringLength);
-    for(u_int8_t i=0; i<descriptorCount; i++) {
-        PldmRecordDescriptor * descriptor = new PldmRecordDescriptor();
+    buff.read(componentImageSetVersionString, componentImageSetVersionStringLength);
+    for (u_int8_t i = 0; i < descriptorCount; i++)
+    {
+        PldmRecordDescriptor* descriptor = new PldmRecordDescriptor();
         descriptor->unpack(buff);
         recordDescriptors.push_back(descriptor);
     }
-    if(firmwareDevicePackageDataLength) {
+    if (firmwareDevicePackageDataLength)
+    {
         buff.read(firmwareDevicePackageData, firmwareDevicePackageDataLength);
     }
     return true;
 }
 
-void PldmDevIdRecord::print(FILE * fp) {
+void PldmDevIdRecord::print(FILE* fp)
+{
     fprintf(fp, "recordLength: 0x%X\n", recordLength);
     fprintf(fp, "descriptorCount: 0x%X\n", descriptorCount);
     fprintf(fp, "deviceUpdateOptionFlags: 0x%X\n", deviceUpdateOptionFlags);
     fprintf(fp, "componentImageSetVersionStringType: 0x%X\n", componentImageSetVersionStringType);
     fprintf(fp, "componentImageSetVersionStringLength: 0x%X\n", componentImageSetVersionStringLength);
     fprintf(fp, "firmwareDevicePackageDataLength: 0x%X\n", firmwareDevicePackageDataLength);
-    if(componentBitmapBitLength) {
-        u_int8_t applicableComponentsLen = componentBitmapBitLength/8;
-        for(u_int8_t i=0; i<applicableComponentsLen; i++) {
+    if (componentBitmapBitLength)
+    {
+        u_int8_t applicableComponentsLen = componentBitmapBitLength / 8;
+        for (u_int8_t i = 0; i < applicableComponentsLen; i++)
+        {
             fprintf(fp, "applicableComponents[%d]: 0x%X\n", i, applicableComponents[i]);
         }
     }
     fprintf(fp, "componentImageSetVersionString: %s\n", componentImageSetVersionString.c_str());
-    for(u_int8_t i=0; i<descriptorCount; i++) {
+    for (u_int8_t i = 0; i < descriptorCount; i++)
+    {
         fprintf(fp, "recordDescriptors[%d]:\n", i);
         recordDescriptors[i]->print(fp);
     }
-
 }
 
-int PldmDevIdRecord::getComponentImageIndex() const {
-    u_int8_t applicableComponentsLen = componentBitmapBitLength/8;
+int PldmDevIdRecord::getComponentImageIndex() const
+{
+    u_int8_t applicableComponentsLen = componentBitmapBitLength / 8;
     int index = -1;
     static const u_int8_t index_map[] = {0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80};
-    for(u_int8_t i=0; i<applicableComponentsLen; i++) {
+    for (u_int8_t i = 0; i < applicableComponentsLen; i++)
+    {
         u_int8_t flags = applicableComponents[i];
-        for(u_int8_t j=0; j<8; j++) {
-            if (flags & index_map[j]) {
+        for (u_int8_t j = 0; j < 8; j++)
+        {
+            if (flags & index_map[j])
+            {
                 index = i * 8 + j;
                 break;
             }
         }
-        if(index != -1)
+        if (index != -1)
             break;
     }
     return index;
 }
 
-std::string PldmDevIdRecord::getDevicePsid() const {
+std::string PldmDevIdRecord::getDevicePsid() const
+{
     std::string psid;
-    for(u_int8_t i=0; i<descriptorCount; i++) {
+    for (u_int8_t i = 0; i < descriptorCount; i++)
+    {
         psid = recordDescriptors[i]->getPsid();
-        if(psid != "")
+        if (psid != "")
             break;
     }
     return psid;
 }
 
-std::string PldmDevIdRecord::getDescription() const {
-
+std::string PldmDevIdRecord::getDescription() const
+{
     std::string description;
-    for(u_int8_t i=0; i<descriptorCount - 1; i++) {
+    for (u_int8_t i = 0; i < descriptorCount - 1; i++)
+    {
         description += (recordDescriptors[i]->getDescription() + ", ");
     }
-    if(descriptorCount > 0) {
-        description += recordDescriptors[descriptorCount-1]->getDescription();
+    if (descriptorCount > 0)
+    {
+        description += recordDescriptors[descriptorCount - 1]->getDescription();
     }
     return description;
 }
diff --git a/pldmlib/pldm_dev_id_record.h b/pldmlib/pldm_dev_id_record.h
index f4bafac9..3e8c1a9e 100644
--- a/pldmlib/pldm_dev_id_record.h
+++ b/pldmlib/pldm_dev_id_record.h
@@ -40,15 +40,17 @@
 
 class PldmRecordDescriptor;
 
-class PldmDevIdRecord {
+class PldmDevIdRecord
+{
 public:
-    PldmDevIdRecord(u_int8_t componentBitmapBitLength=0);
+    PldmDevIdRecord(u_int8_t componentBitmapBitLength = 0);
     virtual ~PldmDevIdRecord();
-    bool unpack(PldmBuffer & buff);
+    bool unpack(PldmBuffer& buff);
     int getComponentImageIndex() const;
     std::string getDevicePsid() const;
     std::string getDescription() const;
-    void print(FILE * fp);
+    void print(FILE* fp);
+
 private:
     u_int8_t componentBitmapBitLength;
 
@@ -58,11 +60,10 @@ class PldmDevIdRecord {
     u_int8_t componentImageSetVersionStringType;
     u_int8_t componentImageSetVersionStringLength;
     u_int16_t firmwareDevicePackageDataLength;
-    u_int8_t * applicableComponents;
+    u_int8_t* applicableComponents;
     std::string componentImageSetVersionString;
-    std::vector<PldmRecordDescriptor *> recordDescriptors;
-    u_int8_t * firmwareDevicePackageData;
+    std::vector<PldmRecordDescriptor*> recordDescriptors;
+    u_int8_t* firmwareDevicePackageData;
 };
 
 #endif /* _PLDM_DEV_ID_RECORD_HDR_ */
-
diff --git a/pldmlib/pldm_pkg.cpp b/pldmlib/pldm_pkg.cpp
index 1d5373d4..b5ae8985 100644
--- a/pldmlib/pldm_pkg.cpp
+++ b/pldmlib/pldm_pkg.cpp
@@ -48,40 +48,45 @@
 #include "pldm_component_image.h"
 #include "pldm_pkg.h"
 
-const u_int8_t PldmPkg::UUID[] = {0xF0, 0x18, 0x87, 0x8C, 0xCB, 0x7D, 0x49,
-            0x43, 0x98, 0x00, 0xA0, 0x2F, 0x05, 0x9A, 0xCA, 0x02};
+const u_int8_t PldmPkg::UUID[] = {0xF0, 0x18, 0x87, 0x8C, 0xCB, 0x7D, 0x49, 0x43,
+                                  0x98, 0x00, 0xA0, 0x2F, 0x05, 0x9A, 0xCA, 0x02};
 
-PldmPkg::PldmPkg(): deviceIDRecordCount(0) {
-}
+PldmPkg::PldmPkg() : deviceIDRecordCount(0) {}
 
-PldmPkg::~PldmPkg() {
-    while(!deviceIDRecords.empty()) {
+PldmPkg::~PldmPkg()
+{
+    while (!deviceIDRecords.empty())
+    {
         delete deviceIDRecords.back();
         deviceIDRecords.pop_back();
     }
-    while(!componentImages.empty()) {
+    while (!componentImages.empty())
+    {
         delete componentImages.back();
         componentImages.pop_back();
     }
 }
 
-bool PldmPkg::unpack(PldmBuffer & buff) {
-    if(!packageHeader.unpack(buff)) {
+bool PldmPkg::unpack(PldmBuffer& buff)
+{
+    if (!packageHeader.unpack(buff))
+    {
         return false;
     }
     buff.read(deviceIDRecordCount);
-    u_int8_t componentBitmapBitLength = \
-            packageHeader.getComponentBitmapBitLength();
+    u_int8_t componentBitmapBitLength = packageHeader.getComponentBitmapBitLength();
     u_int8_t i;
-    for(i=0; i< deviceIDRecordCount; i++) {
-        PldmDevIdRecord * deviceIDRecord = new PldmDevIdRecord(componentBitmapBitLength);
+    for (i = 0; i < deviceIDRecordCount; i++)
+    {
+        PldmDevIdRecord* deviceIDRecord = new PldmDevIdRecord(componentBitmapBitLength);
         deviceIDRecord->unpack(buff);
         deviceIDRecords.push_back(deviceIDRecord);
         psidImageMap[deviceIDRecord->getDevicePsid()] = deviceIDRecord->getComponentImageIndex();
     }
     buff.read(componentImageCount);
-    for(i=0; i< componentImageCount; i++) {
-        PldmComponenetImage * componentImage = new PldmComponenetImage();
+    for (i = 0; i < componentImageCount; i++)
+    {
+        PldmComponenetImage* componentImage = new PldmComponenetImage();
         componentImage->unpack(buff);
         componentImages.push_back(componentImage);
     }
@@ -89,30 +94,33 @@ bool PldmPkg::unpack(PldmBuffer & buff) {
     return true;
 }
 
-
-void PldmPkg::print(FILE * fp) {
+void PldmPkg::print(FILE* fp)
+{
     fprintf(fp, "packageHeader:\n");
     packageHeader.print(fp);
     fprintf(fp, "deviceIDRecordCount: 0x%X\n", deviceIDRecordCount);
     u_int8_t i;
-    for(i=0; i< deviceIDRecordCount; i++) {
+    for (i = 0; i < deviceIDRecordCount; i++)
+    {
         fprintf(fp, "deviceIDRecords[%d]:\n", i);
         deviceIDRecords[i]->print(fp);
     }
     fprintf(fp, "componentImageCount: 0x%X\n", componentImageCount);
-    for(i=0; i< componentImageCount; i++) {
+    for (i = 0; i < componentImageCount; i++)
+    {
         fprintf(fp, "componentImages[%d]:\n", i);
         componentImages[i]->print(fp);
     }
     fprintf(fp, "packageHeaderChecksum: 0x%X\n", packageHeaderChecksum);
 }
 
-const PldmComponenetImage * PldmPkg::getImageByPsid(const std::string & psid) const {
+const PldmComponenetImage* PldmPkg::getImageByPsid(const std::string& psid) const
+{
     PsidImageMap::const_iterator it = psidImageMap.find(psid);
     if (it == psidImageMap.end())
         return NULL;
     int location = it->second;
-    if(location == -1 || location >= componentImageCount)
+    if (location == -1 || location >= componentImageCount)
         return NULL;
     return componentImages[location];
 }
diff --git a/pldmlib/pldm_pkg.h b/pldmlib/pldm_pkg.h
index 2b034c41..234e0888 100644
--- a/pldmlib/pldm_pkg.h
+++ b/pldmlib/pldm_pkg.h
@@ -48,27 +48,23 @@
 class PldmDevIdRecord;
 class PldmComponenetImage;
 
-class PldmPkg {
+class PldmPkg
+{
 public:
     PldmPkg();
     virtual ~PldmPkg();
 
-    bool unpack(PldmBuffer & buff);
-    void print(FILE * fp);
+    bool unpack(PldmBuffer& buff);
+    void print(FILE* fp);
 
-    const PldmComponenetImage * getImageByPsid(const std::string & psid) const;
+    const PldmComponenetImage* getImageByPsid(const std::string& psid) const;
 
     static const u_int8_t UUID[];
 
     u_int8_t getDeviceIDRecordCount() const { return deviceIDRecordCount; }
-    PldmDevIdRecord * getDeviceIDRecord(u_int8_t index) const {
-        return deviceIDRecords[index];
-    }
-    PldmComponenetImage * getComponentImage(u_int16_t index) const {
-        return componentImages[index];
-    }
-    void getDeviceComponentImages(u_int8_t dev_index,
-            std::vector<PldmComponenetImage *> images_list) const;
+    PldmDevIdRecord* getDeviceIDRecord(u_int8_t index) const { return deviceIDRecords[index]; }
+    PldmComponenetImage* getComponentImage(u_int16_t index) const { return componentImages[index]; }
+    void getDeviceComponentImages(u_int8_t dev_index, std::vector<PldmComponenetImage*> images_list) const;
 
 private:
     typedef std::map<std::string, int> PsidImageMap;
@@ -76,11 +72,10 @@ class PldmPkg {
 
     PldmPkgHdr packageHeader;
     u_int8_t deviceIDRecordCount;
-    std::vector<PldmDevIdRecord *> deviceIDRecords;
+    std::vector<PldmDevIdRecord*> deviceIDRecords;
     u_int16_t componentImageCount;
-    std::vector<PldmComponenetImage *> componentImages;
+    std::vector<PldmComponenetImage*> componentImages;
     u_int32_t packageHeaderChecksum;
 };
 
 #endif /* _PLDM_PKG_H_ */
-
diff --git a/pldmlib/pldm_pkg_hdr.cpp b/pldmlib/pldm_pkg_hdr.cpp
index a3445dac..ffc5c9e0 100644
--- a/pldmlib/pldm_pkg_hdr.cpp
+++ b/pldmlib/pldm_pkg_hdr.cpp
@@ -40,31 +40,34 @@
 #include <errno.h>
 #include <string>
 
-
 #include "pldm_buff.h"
 #include "pldm_pkg_hdr.h"
 
-
-PldmPkgHdr::PldmPkgHdr(): packageHeaderFormatRevision(0), packageHeaderSize(0),
-        componentBitmapBitLength(0), packageVersionStringType(0),
-        packageVersionStringLength(0)
+PldmPkgHdr::PldmPkgHdr() :
+    packageHeaderFormatRevision(0),
+    packageHeaderSize(0),
+    componentBitmapBitLength(0),
+    packageVersionStringType(0),
+    packageVersionStringLength(0)
 {
     int i = 0;
-    for(i=0; i<ID_COUNT; i++) {
+    for (i = 0; i < ID_COUNT; i++)
+    {
         packageHeaderIdentifier[i] = 0;
     }
 
-    for(i=0; i<TIMESTAMP_SIZE; i++) {
+    for (i = 0; i < TIMESTAMP_SIZE; i++)
+    {
         packageReleaseDateTime[i] = 0;
     }
-
 }
 
-PldmPkgHdr::~PldmPkgHdr() {
-}
+PldmPkgHdr::~PldmPkgHdr() {}
 
-bool PldmPkgHdr::unpack(PldmBuffer & buff) {
-    for(int i=0; i<ID_COUNT; i++) {
+bool PldmPkgHdr::unpack(PldmBuffer& buff)
+{
+    for (int i = 0; i < ID_COUNT; i++)
+    {
         buff.read(packageHeaderIdentifier[i]);
     }
     buff.read(packageHeaderFormatRevision);
@@ -77,11 +80,11 @@ bool PldmPkgHdr::unpack(PldmBuffer & buff) {
     return true;
 }
 
-void PldmPkgHdr::print(FILE * fp) {
-
-    for(int i=0; i<ID_COUNT; i++) {
-        fprintf(fp, "packageHeaderIdentifier[%d]: 0x%X\n", i,
-                packageHeaderIdentifier[i]);
+void PldmPkgHdr::print(FILE* fp)
+{
+    for (int i = 0; i < ID_COUNT; i++)
+    {
+        fprintf(fp, "packageHeaderIdentifier[%d]: 0x%X\n", i, packageHeaderIdentifier[i]);
     }
     fprintf(fp, "packageHeaderFormatRevision: 0x%X\n", packageHeaderFormatRevision);
     fprintf(fp, "packageHeaderSize: 0x%X\n", packageHeaderSize);
diff --git a/pldmlib/pldm_pkg_hdr.h b/pldmlib/pldm_pkg_hdr.h
index 1889f800..e3a2ed64 100644
--- a/pldmlib/pldm_pkg_hdr.h
+++ b/pldmlib/pldm_pkg_hdr.h
@@ -38,38 +38,23 @@
 #ifndef _PLDM_PKG_HDR_
 #define _PLDM_PKG_HDR_
 
-class PldmPkgHdr {
+class PldmPkgHdr
+{
 public:
     PldmPkgHdr();
     virtual ~PldmPkgHdr();
 
-    bool unpack(PldmBuffer & buff);
-    void print(FILE * fp);
+    bool unpack(PldmBuffer& buff);
+    void print(FILE* fp);
 
-    const u_int32_t * getPackageHeaderIdentifier() const {
-        return packageHeaderIdentifier;
-    }
-    u_int8_t getPackageHeaderFormatRevision() const {
-        return packageHeaderFormatRevision;
-    }
-    u_int16_t getPackageHeaderSize() const {
-        return packageHeaderSize;
-    }
-    const u_int8_t * getPackageReleaseDateTime() const {
-        return packageReleaseDateTime;
-    }
-    u_int16_t getComponentBitmapBitLength() const {
-        return componentBitmapBitLength;
-    }
-    u_int8_t getPackageVersionStringType() const {
-        return packageVersionStringType;
-    }
-    u_int8_t getPackageVersionStringLength() const {
-        return packageVersionStringLength;
-    }
-    const std::string & getPackageVersionString() const {
-        return packageVersionString;
-    }
+    const u_int32_t* getPackageHeaderIdentifier() const { return packageHeaderIdentifier; }
+    u_int8_t getPackageHeaderFormatRevision() const { return packageHeaderFormatRevision; }
+    u_int16_t getPackageHeaderSize() const { return packageHeaderSize; }
+    const u_int8_t* getPackageReleaseDateTime() const { return packageReleaseDateTime; }
+    u_int16_t getComponentBitmapBitLength() const { return componentBitmapBitLength; }
+    u_int8_t getPackageVersionStringType() const { return packageVersionStringType; }
+    u_int8_t getPackageVersionStringLength() const { return packageVersionStringLength; }
+    const std::string& getPackageVersionString() const { return packageVersionString; }
 
 private:
     static const int ID_COUNT = 4;
@@ -85,4 +70,3 @@ class PldmPkgHdr {
 };
 
 #endif /* _PLDM_PKG_HDR_ */
-
diff --git a/pldmlib/pldm_record_descriptor.cpp b/pldmlib/pldm_record_descriptor.cpp
index d7449c6e..7ea49b91 100644
--- a/pldmlib/pldm_record_descriptor.cpp
+++ b/pldmlib/pldm_record_descriptor.cpp
@@ -39,25 +39,25 @@
 #include <stdio.h>
 #include <string>
 
-
 #include "pldm_buff.h"
 #include "pldm_record_descriptor.h"
 
+PldmRecordDescriptor::PldmRecordDescriptor() : descriptorType(0), descriptorLength(0), descriptorData(NULL) {}
 
-PldmRecordDescriptor::PldmRecordDescriptor(): descriptorType(0),
-    descriptorLength(0), descriptorData(NULL){
-}
-
-PldmRecordDescriptor::~PldmRecordDescriptor() {
-    if(descriptorData) {
-        delete [] descriptorData;
+PldmRecordDescriptor::~PldmRecordDescriptor()
+{
+    if (descriptorData)
+    {
+        delete[] descriptorData;
     }
 }
 
-bool PldmRecordDescriptor::unpack(PldmBuffer & buff) {
+bool PldmRecordDescriptor::unpack(PldmBuffer& buff)
+{
     buff.read(descriptorType);
     buff.read(descriptorLength);
-    if(descriptorLength) {
+    if (descriptorLength)
+    {
         descriptorData = new u_int8_t[descriptorLength];
         buff.read(descriptorData, descriptorLength);
         extractPsid();
@@ -65,46 +65,46 @@ bool PldmRecordDescriptor::unpack(PldmBuffer & buff) {
     return true;
 }
 
-void PldmRecordDescriptor::extractPsid() {
-    if (descriptorType == Vendor_Defined) {
-        u_int8_t * psidptr = descriptorData;
+void PldmRecordDescriptor::extractPsid()
+{
+    if (descriptorType == Vendor_Defined)
+    {
+        u_int8_t* psidptr = descriptorData;
         psidptr++;
         u_int8_t prefixlen = *psidptr;
         psidptr++;
         psidptr += prefixlen;
-        psid = std::string(reinterpret_cast<const char *>(psidptr));
+        psid = std::string(reinterpret_cast<const char*>(psidptr));
     }
 }
 
-void PldmRecordDescriptor::print(FILE * fp) {
+void PldmRecordDescriptor::print(FILE* fp)
+{
     fprintf(fp, "descriptorType: 0x%X ", descriptorType);
     fprintf(fp, "descriptorLength: 0x%X ", descriptorLength);
     fprintf(fp, "data: %s\n", getDescription().c_str());
 }
 
-std::string PldmRecordDescriptor::getDescription() const {
+std::string PldmRecordDescriptor::getDescription() const
+{
     char description[256] = {'\0'};
-    switch(descriptorType) {
-    case PCI_Vendor_ID:
-        sprintf(description, "PCI Vendor ID: 0x%02x%02x",
-                descriptorData[1], descriptorData[0]);
-        break;
-    case PCI_Device_ID:
-            sprintf(description, "PCI Device ID: 0x%02x%02x",
-                    descriptorData[1], descriptorData[0]);
+    switch (descriptorType)
+    {
+        case PCI_Vendor_ID:
+            sprintf(description, "PCI Vendor ID: 0x%02x%02x", descriptorData[1], descriptorData[0]);
             break;
-    case PCI_Subsystem_Vendor_ID:
-            sprintf(description, "PCI Subsystem Vendor ID: 0x%02x%02x",
-                    descriptorData[1], descriptorData[0]);
+        case PCI_Device_ID:
+            sprintf(description, "PCI Device ID: 0x%02x%02x", descriptorData[1], descriptorData[0]);
             break;
-    case PCI_Subsystem_ID:
-            sprintf(description, "PCI Subsystem ID: 0x%02x%02x",
-                    descriptorData[1], descriptorData[0]);
+        case PCI_Subsystem_Vendor_ID:
+            sprintf(description, "PCI Subsystem Vendor ID: 0x%02x%02x", descriptorData[1], descriptorData[0]);
+            break;
+        case PCI_Subsystem_ID:
+            sprintf(description, "PCI Subsystem ID: 0x%02x%02x", descriptorData[1], descriptorData[0]);
+            break;
+        case Vendor_Defined:
+            sprintf(description, "PSID: %s", psid.c_str());
             break;
-    case Vendor_Defined:
-        sprintf(description, "PSID: %s", psid.c_str());
-        break;
-
     }
     return description;
 }
diff --git a/pldmlib/pldm_record_descriptor.h b/pldmlib/pldm_record_descriptor.h
index 65cd8e85..5450497d 100644
--- a/pldmlib/pldm_record_descriptor.h
+++ b/pldmlib/pldm_record_descriptor.h
@@ -38,28 +38,30 @@
 #ifndef _PLDM_RECORD_DESCRIPTOR_HDR_
 #define _PLDM_RECORD_DESCRIPTOR_HDR_
 
-class PldmRecordDescriptor {
+class PldmRecordDescriptor
+{
 public:
     PldmRecordDescriptor();
     virtual ~PldmRecordDescriptor();
 
-    bool unpack(PldmBuffer & buff);
-    void print(FILE * fp);
+    bool unpack(PldmBuffer& buff);
+    void print(FILE* fp);
 
-    const std::string & getPsid() const { return psid; }
+    const std::string& getPsid() const { return psid; }
     u_int16_t getDescriptorLength() const { return descriptorLength; }
-    const u_int8_t * getDescriptorData() const { return descriptorData; }
+    const u_int8_t* getDescriptorData() const { return descriptorData; }
     std::string getDescription() const;
 
 private:
     u_int16_t descriptorType;
     u_int16_t descriptorLength;
-    u_int8_t * descriptorData;
+    u_int8_t* descriptorData;
 
     std::string psid;
 
     void extractPsid();
-    enum {
+    enum
+    {
         PCI_Vendor_ID = 0x0000,
         IANA_Enterprise_ID = 0x0001,
         FD_UUID = 0x0002,
@@ -76,4 +78,3 @@ class PldmRecordDescriptor {
 };
 
 #endif /* _PLDM_RECORD_DESCRIPTOR_HDR_ */
-
diff --git a/reg_access/reg_access.c b/reg_access/reg_access.c
index e64f5ebb..a0710cad 100644
--- a/reg_access/reg_access.c
+++ b/reg_access/reg_access.c
@@ -34,80 +34,79 @@
 #include "reg_access.h"
 #include "common/compatibility.h"
 
-#define REG_ID_PCNR                     0x5050
-#define REG_ID_PAOS                     0x5006
-#define REG_ID_PTYS                     0x5004
-#define REG_ID_PMAOS                    0x5012
-#define REG_ID_MCIA                     0x9014
-#define REG_ID_MTMP                     0x900a
-#define REG_ID_MIRC                     0x9162
-#define REG_ID_MGIR                     0x9020
-#define REG_ID_PMLP                     0x5002
-#define REG_ID_MFPA                     0x9010
-#define REG_ID_MFBA                     0x9011
-#define REG_ID_MFBE                     0x9012
-#define REG_ID_MFMC                     0x9013
-#define REG_ID_MMDIO                    0x9017
-#define REG_ID_MJTAG                    0x901F
-#define REG_ID_PMDIC                    0x9021
-#define REG_ID_MNVA                     0x9024
-#define REG_ID_MNVI                     0x9025
-#define REG_ID_MVTS                     0x902c
-#define REG_ID_NVQGC                    0x9034
-#define REG_ID_MNVIA                    0x9029 // 4th gen
-#define REG_ID_NVQC                     0x9030
-#define REG_ID_MNVGN                    0x9035
-#define REG_ID_NVIA                     0x9033 // 5th gen
-#define REG_ID_MGNLE                    0x9036
-#define REG_ID_MLCOK                    0x402D
-#define REG_ID_PLIB                     0x500a
-#define REG_ID_RITR                     0x8002
-#define REG_ID_RICNT                    0x800b
-#define REG_ID_PPCNT                    0x5008
-#define REG_ID_SBPR                     0xb001
-#define REG_ID_SBCM                     0xb002
-#define REG_ID_SBPM                     0xb003
-#define REG_ID_SBMM                     0xb004
-#define REG_ID_STRS_STOP_TOGGLE         0x4027
-#define REG_ID_STRS_FAULT_INJECT        0x4028
-#define REG_ID_STRS_MINI_FLOW           0x4029
-#define REG_ID_STRS_RESOURCE            0x402A
-
-#define REG_ID_MTRC_CAP                 0x9040
-#define REG_ID_MTRC_STDB                0x9042
-#define REG_ID_MCDD                     0x905C
-#define REG_ID_MCQS                     0x9060
-#define REG_ID_MCC                      0x9062
-#define REG_ID_MCQI                     0x9061
-#define REG_ID_MCDA                     0x9063
-#define REG_ID_MQIS                     0x9064
-#define REG_ID_MTCQ                     0x9065
-#define REG_ID_MKDC                     0x9066
-#define REG_ID_MCAM                     0x907f
+#define REG_ID_PCNR 0x5050
+#define REG_ID_PAOS 0x5006
+#define REG_ID_PTYS 0x5004
+#define REG_ID_PMAOS 0x5012
+#define REG_ID_MCIA 0x9014
+#define REG_ID_MTMP 0x900a
+#define REG_ID_MIRC 0x9162
+#define REG_ID_MGIR 0x9020
+#define REG_ID_PMLP 0x5002
+#define REG_ID_MFPA 0x9010
+#define REG_ID_MFBA 0x9011
+#define REG_ID_MFBE 0x9012
+#define REG_ID_MFMC 0x9013
+#define REG_ID_MMDIO 0x9017
+#define REG_ID_MJTAG 0x901F
+#define REG_ID_PMDIC 0x9021
+#define REG_ID_MNVA 0x9024
+#define REG_ID_MNVI 0x9025
+#define REG_ID_MVTS 0x902c
+#define REG_ID_NVQGC 0x9034
+#define REG_ID_MNVIA 0x9029 // 4th gen
+#define REG_ID_NVQC 0x9030
+#define REG_ID_MNVGN 0x9035
+#define REG_ID_NVIA 0x9033 // 5th gen
+#define REG_ID_MGNLE 0x9036
+#define REG_ID_MLCOK 0x402D
+#define REG_ID_PLIB 0x500a
+#define REG_ID_RITR 0x8002
+#define REG_ID_RICNT 0x800b
+#define REG_ID_PPCNT 0x5008
+#define REG_ID_SBPR 0xb001
+#define REG_ID_SBCM 0xb002
+#define REG_ID_SBPM 0xb003
+#define REG_ID_SBMM 0xb004
+#define REG_ID_STRS_STOP_TOGGLE 0x4027
+#define REG_ID_STRS_FAULT_INJECT 0x4028
+#define REG_ID_STRS_MINI_FLOW 0x4029
+#define REG_ID_STRS_RESOURCE 0x402A
+
+#define REG_ID_MTRC_CAP 0x9040
+#define REG_ID_MTRC_STDB 0x9042
+#define REG_ID_MCDD 0x905C
+#define REG_ID_MCQS 0x9060
+#define REG_ID_MCC 0x9062
+#define REG_ID_MCQI 0x9061
+#define REG_ID_MCDA 0x9063
+#define REG_ID_MQIS 0x9064
+#define REG_ID_MTCQ 0x9065
+#define REG_ID_MKDC 0x9066
+#define REG_ID_MCAM 0x907f
 // TODO: get correct register ID for mfrl mfai
-#define REG_ID_MFRL                     0x9028
-#define REG_ID_MFAI                     0x9029
-#define REG_ID_MPCIR                    0x905a
-
-#define REG_ID_MGPIR                    0x9100
-#define REG_ID_MDFCR                    0x9101
-#define REG_ID_MDRCR                    0x9102
-#define REG_ID_MDSR                     0x9110
-#define REG_ID_MFSV                     0x9115
-
-#define REG_ID_MDDT                     0x9160
-#define REG_ID_MDDQ                     0x9161
+#define REG_ID_MFRL 0x9028
+#define REG_ID_MFAI 0x9029
+#define REG_ID_MPCIR 0x905a
+
+#define REG_ID_MGPIR 0x9100
+#define REG_ID_MDFCR 0x9101
+#define REG_ID_MDRCR 0x9102
+#define REG_ID_MDSR 0x9110
+#define REG_ID_MFSV 0x9115
+
+#define REG_ID_MDDT 0x9160
+#define REG_ID_MDDQ 0x9161
 // For mstdump oob feature:
-#define REG_ID_ICAM                     0x387F
-#define REG_ID_ICSR                     0x38F0
-
+#define REG_ID_ICAM 0x387F
+#define REG_ID_ICSR 0x38F0
 
 //==================================
-//RESOURCE DUMP FEATURE
-#define REG_ID_RES_DUMP                 0xC000
-#define REG_ID_DEBUG_CAP                0x8400
+// RESOURCE DUMP FEATURE
+#define REG_ID_RES_DUMP 0xC000
+#define REG_ID_DEBUG_CAP 0x8400
 //==================================
-#define REG_ID_MPEGC                    0x9056
+#define REG_ID_MPEGC 0x9056
 
 #define DWORD_SIZE 4
 // For MLNXOS, MGIR still limited with 44 bytes
@@ -117,107 +116,124 @@
 // for debug:
 
 #ifdef _ENABLE_DEBUG_
-# define DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func) \
+#define DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func)                        \
     printf("-I- Data Sent (Method: %s):\n", method == REG_ACCESS_METHOD_SET ? "SET" : "GET"); \
     print_func(data_struct, stdout, 1)
-# define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, print_func) \
+#define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, print_func)                         \
     printf("-I- Data Received (Mehtod: %s):\n", method == REG_ACCESS_METHOD_SET ? "SET" : "GET"); \
     print_func(data_struct, stdout, 1)
 #else
-# define DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func)
-# define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, print_func)
+#define DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func)
+#define DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, print_func)
 #endif
 
-
 /***************************************************/
 
 // register access for infinite size of arrays with specific size
-// r_reg_size is how much we want to read from the struct struct_name (fw request), w_reg_size is how much we want to write to the struct that we are sending for the fw.
-// note that the params data_p_name, data_size_name are the pointer to the array the fw should read\write to, and the size of it.
-#define REG_ACCESS_GEN_DATA_WITH_STATUS(mf, method, reg_id, data_struct, struct_name, prefix, reg_size, r_reg_size, w_reg_size \
-                                        , size_func, data_p_name, data_size_name) \
-    u_int32_t reg_size = data_struct->data_size_name + size_func(); \
-    u_int32_t *t_data = data_struct->data_p_name; \
-    u_int32_t t_offset = size_func(); \
-    u_int32_t r_size_reg = reg_size; \
-    u_int32_t w_size_reg = reg_size; \
-    if (method == REG_ACCESS_METHOD_GET) { \
-        w_size_reg -= data_struct->data_size_name; \
-    } else if (method == REG_ACCESS_METHOD_SET) { \
-        r_size_reg -= data_struct->data_size_name; \
-    } else { \
-        return ME_REG_ACCESS_BAD_METHOD; \
-    } \
-    int status = 0; \
-    int rc; \
-    int max_data_size = reg_size; \
-    u_int8_t *data = (u_int8_t*) malloc(max_data_size); \
-    if (!data) { return ME_MEM_ERROR;} \
-    memset(data, 0, max_data_size); \
-    prefix##_##struct_name##_pack(data_struct, data); \
-    if (t_data) {\
-        if ((int)t_offset + data_struct->data_size_name > max_data_size) {\
-            free(data);\
-            return ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;\
-        }\
-        memcpy(&data[t_offset], t_data, data_struct->data_size_name); \
-    }\
+// r_reg_size is how much we want to read from the struct struct_name (fw request), w_reg_size is how much we want to
+// write to the struct that we are sending for the fw. note that the params data_p_name, data_size_name are the pointer
+// to the array the fw should read\write to, and the size of it.
+#define REG_ACCESS_GEN_DATA_WITH_STATUS(mf, method, reg_id, data_struct, struct_name, prefix, reg_size, r_reg_size,   \
+                                        w_reg_size, size_func, data_p_name, data_size_name)                           \
+    u_int32_t reg_size = data_struct->data_size_name + size_func();                                                   \
+    u_int32_t* t_data = data_struct->data_p_name;                                                                     \
+    u_int32_t t_offset = size_func();                                                                                 \
+    u_int32_t r_size_reg = reg_size;                                                                                  \
+    u_int32_t w_size_reg = reg_size;                                                                                  \
+    if (method == REG_ACCESS_METHOD_GET)                                                                              \
+    {                                                                                                                 \
+        w_size_reg -= data_struct->data_size_name;                                                                    \
+    }                                                                                                                 \
+    else if (method == REG_ACCESS_METHOD_SET)                                                                         \
+    {                                                                                                                 \
+        r_size_reg -= data_struct->data_size_name;                                                                    \
+    }                                                                                                                 \
+    else                                                                                                              \
+    {                                                                                                                 \
+        return ME_REG_ACCESS_BAD_METHOD;                                                                              \
+    }                                                                                                                 \
+    int status = 0;                                                                                                   \
+    int rc;                                                                                                           \
+    int max_data_size = reg_size;                                                                                     \
+    u_int8_t* data = (u_int8_t*)malloc(max_data_size);                                                                \
+    if (!data)                                                                                                        \
+    {                                                                                                                 \
+        return ME_MEM_ERROR;                                                                                          \
+    }                                                                                                                 \
+    memset(data, 0, max_data_size);                                                                                   \
+    prefix##_##struct_name##_pack(data_struct, data);                                                                 \
+    if (t_data)                                                                                                       \
+    {                                                                                                                 \
+        if ((int)t_offset + data_struct->data_size_name > max_data_size)                                              \
+        {                                                                                                             \
+            free(data);                                                                                               \
+            return ME_REG_ACCESS_SIZE_EXCCEEDS_LIMIT;                                                                 \
+        }                                                                                                             \
+        memcpy(&data[t_offset], t_data, data_struct->data_size_name);                                                 \
+    }                                                                                                                 \
     rc = (int)maccess_reg(mf, reg_id, (maccess_reg_method_t)method, data, reg_size, r_size_reg, w_size_reg, &status); \
-    prefix##_##struct_name##_unpack(data_struct, data); \
-    if (rc || status) { \
-        free(data); \
-        return (reg_access_status_t)rc; \
-    } \
-    if (t_data) { \
-        data_struct->data_p_name = t_data; \
-        memcpy(t_data, &data[t_offset], data_struct->data_size_name); \
-    } \
-    free(data); \
-    return ME_OK; \
+    prefix##_##struct_name##_unpack(data_struct, data);                                                               \
+    if (rc || status)                                                                                                 \
+    {                                                                                                                 \
+        free(data);                                                                                                   \
+        return (reg_access_status_t)rc;                                                                               \
+    }                                                                                                                 \
+    if (t_data)                                                                                                       \
+    {                                                                                                                 \
+        data_struct->data_p_name = t_data;                                                                            \
+        memcpy(t_data, &data[t_offset], data_struct->data_size_name);                                                 \
+    }                                                                                                                 \
+    free(data);                                                                                                       \
+    return ME_OK;
 
 // register access for variable size registers (like mfba)
-#define REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size, pack_func, \
-                                           unpack_func, size_func, print_func, status) \
-    int rc; \
-    int max_data_size = size_func(); \
-    u_int8_t *data = NULL; \
-    if (method != REG_ACCESS_METHOD_GET && method != REG_ACCESS_METHOD_SET) { \
-        return ME_REG_ACCESS_BAD_METHOD; \
-    } \
-    data = (u_int8_t*)malloc(sizeof(u_int8_t) * max_data_size); \
-    if (!data) { return ME_MEM_ERROR;}; \
-    memset(data, 0, max_data_size); \
-    pack_func(data_struct, data); \
-    DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func); \
+#define REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size,  \
+                                           w_reg_size, pack_func, unpack_func, size_func, print_func, status)   \
+    int rc;                                                                                                     \
+    int max_data_size = size_func();                                                                            \
+    u_int8_t* data = NULL;                                                                                      \
+    if (method != REG_ACCESS_METHOD_GET && method != REG_ACCESS_METHOD_SET)                                     \
+    {                                                                                                           \
+        return ME_REG_ACCESS_BAD_METHOD;                                                                        \
+    }                                                                                                           \
+    data = (u_int8_t*)malloc(sizeof(u_int8_t) * max_data_size);                                                 \
+    if (!data)                                                                                                  \
+    {                                                                                                           \
+        return ME_MEM_ERROR;                                                                                    \
+    };                                                                                                          \
+    memset(data, 0, max_data_size);                                                                             \
+    pack_func(data_struct, data);                                                                               \
+    DEBUG_PRINT_SEND(data_struct, struct_name, method, print_func);                                             \
     rc = maccess_reg(mf, reg_id, (maccess_reg_method_t)method, data, reg_size, r_reg_size, w_reg_size, status); \
-    unpack_func(data_struct, data); \
-    free(data); \
+    unpack_func(data_struct, data);                                                                             \
+    free(data);                                                                                                 \
     DEBUG_PRINT_RECEIVE(data_struct, struct_name, method, print_func);
 
-#define REG_ACCESS_GENERIC_VAR(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size, pack_func, \
-                               unpack_func, size_func, print_func) \
-    int status = 0; \
-    REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size, pack_func, \
-                                       unpack_func, size_func, print_func, &status) \
-    if (rc || status) { \
-        return (reg_access_status_t)rc; \
-    } \
+#define REG_ACCESS_GENERIC_VAR(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size,         \
+                               pack_func, unpack_func, size_func, print_func)                                          \
+    int status = 0;                                                                                                    \
+    REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size, \
+                                       pack_func, unpack_func, size_func, print_func, &status)                         \
+    if (rc || status)                                                                                                  \
+    {                                                                                                                  \
+        return (reg_access_status_t)rc;                                                                                \
+    }                                                                                                                  \
     return ME_OK
 
 // reg access with changing length of read\write in the register struct
 #define REG_ACCCESS_VAR(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size, prefix) \
-    REG_ACCESS_GENERIC_VAR(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size, \
-                           prefix##_##struct_name##_pack, prefix##_##struct_name##_unpack, prefix##_##struct_name##_size, \
-                           prefix##_##struct_name##_print)
+    REG_ACCESS_GENERIC_VAR(mf, method, reg_id, data_struct, struct_name, reg_size, r_reg_size, w_reg_size,      \
+                           prefix##_##struct_name##_pack, prefix##_##struct_name##_unpack,                      \
+                           prefix##_##struct_name##_size, prefix##_##struct_name##_print)
 
 // register access for static sized registers
 #define REG_ACCCESS(mf, method, reg_id, data_struct, struct_name, prefix) \
-    int data_size = prefix##_##struct_name##_size(); \
+    int data_size = prefix##_##struct_name##_size();                      \
     REG_ACCCESS_VAR(mf, method, reg_id, data_struct, struct_name, data_size, data_size, data_size, prefix)
 
 #ifndef UEFI_BUILD
 
-reg_access_status_t reg_access_mddq(mfile *mf, reg_access_method_t method, struct reg_access_switch_mddq_ext *mddq)
+reg_access_status_t reg_access_mddq(mfile* mf, reg_access_method_t method, struct reg_access_switch_mddq_ext* mddq)
 {
     REG_ACCCESS(mf, method, REG_ID_MDDQ, mddq, mddq_ext, reg_access_switch);
 }
@@ -225,540 +241,592 @@ reg_access_status_t reg_access_mddq(mfile *mf, reg_access_method_t method, struc
 /************************************
  * Function: reg_access_pcnr
  ************************************/
-reg_access_status_t reg_access_pcnr(mfile *mf, reg_access_method_t method, struct reg_access_hca_pcnr_reg *pcnr)
+reg_access_status_t reg_access_pcnr(mfile* mf, reg_access_method_t method, struct reg_access_hca_pcnr_reg* pcnr)
 {
     REG_ACCCESS(mf, method, REG_ID_PCNR, pcnr, pcnr_reg, reg_access_hca);
-
 }
 
 /************************************
-* Function: reg_access_strs_stop_toggle_reg
-************************************/
-void reg_access_hca_strs_stop_toggle_reg_special_pack(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, u_int8_t *ptr_buff)
+ * Function: reg_access_strs_stop_toggle_reg
+ ************************************/
+void reg_access_hca_strs_stop_toggle_reg_special_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                                      u_int8_t* ptr_buff)
 {
     const u_int8_t RXB_HANG_TYPE = 0x9;
     const u_int8_t SXP_HANG_TYPE = 0x10;
     const u_int8_t PAUSE_TX_TYPE = 0x15;
     u_int8_t union_offset = 0x10;
     reg_access_hca_strs_stop_toggle_reg_pack(ptr_struct, ptr_buff);
-    if (ptr_struct->type == RXB_HANG_TYPE) {
-        reg_access_hca_rxb_hang_stop_toggle_modifier_pack((const struct reg_access_hca_rxb_hang_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
-                ptr_buff + union_offset);
+    if (ptr_struct->type == RXB_HANG_TYPE)
+    {
+        reg_access_hca_rxb_hang_stop_toggle_modifier_pack(
+          (const struct reg_access_hca_rxb_hang_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
+          ptr_buff + union_offset);
     }
-    else if (ptr_struct->type == PAUSE_TX_TYPE) {
-        reg_access_hca_pause_tx_stop_toggle_modifier_pack((const struct reg_access_hca_pause_tx_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
-                ptr_buff + union_offset);
+    else if (ptr_struct->type == PAUSE_TX_TYPE)
+    {
+        reg_access_hca_pause_tx_stop_toggle_modifier_pack(
+          (const struct reg_access_hca_pause_tx_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
+          ptr_buff + union_offset);
     }
-    else if (ptr_struct->type == SXP_HANG_TYPE) {
-        reg_access_hca_sxp_hang_stop_toggle_modifier_pack((const struct reg_access_hca_sxp_hang_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
-                ptr_buff + union_offset);
+    else if (ptr_struct->type == SXP_HANG_TYPE)
+    {
+        reg_access_hca_sxp_hang_stop_toggle_modifier_pack(
+          (const struct reg_access_hca_sxp_hang_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
+          ptr_buff + union_offset);
     }
-    else {
-        reg_access_hca_lock_source_stop_toggle_modifier_pack((const struct reg_access_hca_lock_source_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
-                ptr_buff + union_offset);
+    else
+    {
+        reg_access_hca_lock_source_stop_toggle_modifier_pack(
+          (const struct reg_access_hca_lock_source_stop_toggle_modifier*)&(ptr_struct->per_type_modifier),
+          ptr_buff + union_offset);
     }
 }
 
-reg_access_status_t reg_access_strs_stop_toggle_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_stop_toggle_reg *streg)
+reg_access_status_t reg_access_strs_stop_toggle_reg(mfile* mf,
+                                                    reg_access_method_t method,
+                                                    struct reg_access_hca_strs_stop_toggle_reg* streg)
 {
     int data_size = reg_access_hca_strs_stop_toggle_reg_size();
-    REG_ACCESS_GENERIC_VAR(mf, method, REG_ID_STRS_STOP_TOGGLE, streg, reg_access_hca_strs_stop_toggle_reg, data_size, data_size, data_size, \
-            reg_access_hca_strs_stop_toggle_reg_special_pack, reg_access_hca_strs_stop_toggle_reg_unpack, \
-            reg_access_hca_strs_stop_toggle_reg_size, reg_access_hca_strs_stop_toggle_reg_print);
+    REG_ACCESS_GENERIC_VAR(mf, method, REG_ID_STRS_STOP_TOGGLE, streg, reg_access_hca_strs_stop_toggle_reg, data_size,
+                           data_size, data_size, reg_access_hca_strs_stop_toggle_reg_special_pack,
+                           reg_access_hca_strs_stop_toggle_reg_unpack, reg_access_hca_strs_stop_toggle_reg_size,
+                           reg_access_hca_strs_stop_toggle_reg_print);
 }
 
-
-
 /************************************
-* Function: reg_access_strs_fault_injector_reg
-************************************/
-reg_access_status_t reg_access_strs_fault_injector_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_fault_inject_reg *strs_fault_inject_reg)
+ * Function: reg_access_strs_fault_injector_reg
+ ************************************/
+reg_access_status_t
+  reg_access_strs_fault_injector_reg(mfile* mf,
+                                     reg_access_method_t method,
+                                     struct reg_access_hca_strs_fault_inject_reg* strs_fault_inject_reg)
 {
     REG_ACCCESS(mf, method, REG_ID_STRS_FAULT_INJECT, strs_fault_inject_reg, strs_fault_inject_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_strs_mini_flow_reg
-************************************/
-void reg_access_hca_strs_mini_flow_reg_special_pack(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, u_int8_t *ptr_buff) {
+ * Function: reg_access_strs_mini_flow_reg
+ ************************************/
+void reg_access_hca_strs_mini_flow_reg_special_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                                    u_int8_t* ptr_buff)
+{
     const u_int8_t IRISC_HANG_TYPE = 0xF;
     // const u_int8_t PACKET_DROP_TYPE = 0x10;
     u_int8_t union_offset = 0x10;
     reg_access_hca_strs_mini_flow_reg_pack(ptr_struct, ptr_buff);
-    if (ptr_struct->type == IRISC_HANG_TYPE) {
-        reg_access_hca_irisc_hang_mini_flow_modifier_pack((const struct reg_access_hca_irisc_hang_mini_flow_modifier*)&(ptr_struct->per_type_modifier),
-                ptr_buff + union_offset);
+    if (ptr_struct->type == IRISC_HANG_TYPE)
+    {
+        reg_access_hca_irisc_hang_mini_flow_modifier_pack(
+          (const struct reg_access_hca_irisc_hang_mini_flow_modifier*)&(ptr_struct->per_type_modifier),
+          ptr_buff + union_offset);
     }
-    else {
-        reg_access_hca_packet_drop_mini_flow_modifier_pack((const struct reg_access_hca_packet_drop_mini_flow_modifier*)&(ptr_struct->per_type_modifier),
-                ptr_buff + union_offset);
+    else
+    {
+        reg_access_hca_packet_drop_mini_flow_modifier_pack(
+          (const struct reg_access_hca_packet_drop_mini_flow_modifier*)&(ptr_struct->per_type_modifier),
+          ptr_buff + union_offset);
     }
 }
 
-
-reg_access_status_t reg_access_strs_mini_flow_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_mini_flow_reg *strs_mini_flow_reg)
+reg_access_status_t reg_access_strs_mini_flow_reg(mfile* mf,
+                                                  reg_access_method_t method,
+                                                  struct reg_access_hca_strs_mini_flow_reg* strs_mini_flow_reg)
 {
     // REG_ACCCESS(mf, method, REG_ID_STRS_MINI_FLOW, strs_mini_flow_reg, strs_mini_flow_reg, reg_access_hca);
     int data_size = reg_access_hca_strs_mini_flow_reg_size();
-    REG_ACCESS_GENERIC_VAR(mf, method, REG_ID_STRS_MINI_FLOW, strs_mini_flow_reg, reg_access_hca_strs_mini_flow_reg, data_size, data_size, data_size, \
-            reg_access_hca_strs_mini_flow_reg_special_pack, reg_access_hca_strs_mini_flow_reg_unpack, \
-            reg_access_hca_strs_mini_flow_reg_size, reg_access_hca_strs_mini_flow_reg_print);
+    REG_ACCESS_GENERIC_VAR(mf, method, REG_ID_STRS_MINI_FLOW, strs_mini_flow_reg, reg_access_hca_strs_mini_flow_reg,
+                           data_size, data_size, data_size, reg_access_hca_strs_mini_flow_reg_special_pack,
+                           reg_access_hca_strs_mini_flow_reg_unpack, reg_access_hca_strs_mini_flow_reg_size,
+                           reg_access_hca_strs_mini_flow_reg_print);
 }
 
 /************************************
-* Function: reg_access_strs_resource_reg
-************************************/
-reg_access_status_t reg_access_strs_resource_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_resource_reg *strs_resource_reg)
+ * Function: reg_access_strs_resource_reg
+ ************************************/
+reg_access_status_t reg_access_strs_resource_reg(mfile* mf,
+                                                 reg_access_method_t method,
+                                                 struct reg_access_hca_strs_resource_reg* strs_resource_reg)
 {
     REG_ACCCESS(mf, method, REG_ID_STRS_RESOURCE, strs_resource_reg, strs_resource_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_pmaos
-************************************/
-reg_access_status_t reg_access_pmaos(mfile *mf, reg_access_method_t method, struct register_access_sib_pmaos *pmaos)
+ * Function: reg_access_pmaos
+ ************************************/
+reg_access_status_t reg_access_pmaos(mfile* mf, reg_access_method_t method, struct register_access_sib_pmaos* pmaos)
 {
     REG_ACCCESS(mf, method, REG_ID_PMAOS, pmaos, pmaos, register_access_sib);
 }
 
 /************************************
-* Function: reg_access_mtmp
-************************************/
-reg_access_status_t reg_access_mtmp(mfile *mf, reg_access_method_t method, struct register_access_sib_mtmp *mtmp)
+ * Function: reg_access_mtmp
+ ************************************/
+reg_access_status_t reg_access_mtmp(mfile* mf, reg_access_method_t method, struct register_access_sib_mtmp* mtmp)
 {
     REG_ACCCESS(mf, method, REG_ID_MTMP, mtmp, mtmp, register_access_sib);
 }
 
 /************************************
-* Function: reg_access_mnva
-************************************/
-reg_access_status_t reg_access_mnva(mfile *mf, reg_access_method_t method, struct tools_open_mnva *mnva)
+ * Function: reg_access_mnva
+ ************************************/
+reg_access_status_t reg_access_mnva(mfile* mf, reg_access_method_t method, struct tools_open_mnva* mnva)
 {
     // reg_size is in bytes
     u_int32_t reg_size = (mnva->nv_hdr.length << 2) + tools_open_nv_hdr_size();
     u_int32_t r_size_reg = reg_size;
     u_int32_t w_size_reg = reg_size;
-    if (method == REG_ACCESS_METHOD_GET) {
+    if (method == REG_ACCESS_METHOD_GET)
+    {
         w_size_reg -= mnva->nv_hdr.length << 2;
-    } else {
+    }
+    else
+    {
         r_size_reg -= mnva->nv_hdr.length << 2;
     }
     REG_ACCCESS_VAR(mf, method, REG_ID_MNVA, mnva, mnva, reg_size, r_size_reg, w_size_reg, tools_open);
 }
 
 /************************************
-* Function: reg_access_mnvi
-************************************/
-reg_access_status_t reg_access_mnvi(mfile *mf, reg_access_method_t method, struct tools_open_mnvi *mnvi)
+ * Function: reg_access_mnvi
+ ************************************/
+reg_access_status_t reg_access_mnvi(mfile* mf, reg_access_method_t method, struct tools_open_mnvi* mnvi)
 {
-    if (method != REG_ACCESS_METHOD_SET) {  // this register supports only set method
+    if (method != REG_ACCESS_METHOD_SET)
+    { // this register supports only set method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_MNVI, mnvi, mnvi, tools_open);
 }
 
 /************************************
-* Function: reg_access_mnvia
-************************************/
-reg_access_status_t reg_access_mnvia(mfile *mf, reg_access_method_t method, struct tools_open_mnvia *mnvia)
+ * Function: reg_access_mnvia
+ ************************************/
+reg_access_status_t reg_access_mnvia(mfile* mf, reg_access_method_t method, struct tools_open_mnvia* mnvia)
 {
-    if (method != REG_ACCESS_METHOD_SET) {  // this register supports only set method
+    if (method != REG_ACCESS_METHOD_SET)
+    { // this register supports only set method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_MNVIA, mnvia, mnvia, tools_open);
 }
 
 /************************************
-* Function: reg_access_nvqgc
-************************************/
-reg_access_status_t reg_access_nvqgc(mfile *mf, reg_access_method_t method, struct tools_open_nvqgc *nvqgc)
+ * Function: reg_access_nvqgc
+ ************************************/
+reg_access_status_t reg_access_nvqgc(mfile* mf, reg_access_method_t method, struct tools_open_nvqgc* nvqgc)
 {
-    if (method != REG_ACCESS_METHOD_GET) {  // this register supports only get method
+    if (method != REG_ACCESS_METHOD_GET)
+    { // this register supports only get method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_NVQGC, nvqgc, nvqgc, tools_open);
 }
 
 /************************************
-* Function: reg_access_nvdi
-************************************/
-reg_access_status_t reg_access_nvdi(mfile *mf, reg_access_method_t method, struct tools_open_nvdi *nvdi)
+ * Function: reg_access_nvdi
+ ************************************/
+reg_access_status_t reg_access_nvdi(mfile* mf, reg_access_method_t method, struct tools_open_nvdi* nvdi)
 {
-    if (method != REG_ACCESS_METHOD_SET) {  // this register supports only set method
+    if (method != REG_ACCESS_METHOD_SET)
+    { // this register supports only set method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_MNVI, nvdi, nvdi, tools_open);
 }
 
 /************************************
-* Function: reg_access_nvdia
-************************************/
-reg_access_status_t reg_access_nvia(mfile *mf, reg_access_method_t method, struct tools_open_nvia *nvia)
+ * Function: reg_access_nvdia
+ ************************************/
+reg_access_status_t reg_access_nvia(mfile* mf, reg_access_method_t method, struct tools_open_nvia* nvia)
 {
-    if (method != REG_ACCESS_METHOD_SET) {  // this register supports only set method
+    if (method != REG_ACCESS_METHOD_SET)
+    { // this register supports only set method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_NVIA, nvia, nvia, tools_open);
 }
 
 /************************************
-* Function: reg_access_nvqc
-************************************/
-reg_access_status_t reg_access_nvqc(mfile *mf, reg_access_method_t method, struct tools_open_nvqc *nvqc)
+ * Function: reg_access_nvqc
+ ************************************/
+reg_access_status_t reg_access_nvqc(mfile* mf, reg_access_method_t method, struct tools_open_nvqc* nvqc)
 {
-    if (method != REG_ACCESS_METHOD_GET) {  // this register supports only get method
+    if (method != REG_ACCESS_METHOD_GET)
+    { // this register supports only get method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_NVQC, nvqc, nvqc, tools_open);
 }
 
 /************************************
-* Function: reg_access_mnvgn
-************************************/
-reg_access_status_t reg_access_mnvgn(mfile *mf, reg_access_method_t method, struct tools_open_mnvgn *mnvgn, int *status)
+ * Function: reg_access_mnvgn
+ ************************************/
+reg_access_status_t reg_access_mnvgn(mfile* mf, reg_access_method_t method, struct tools_open_mnvgn* mnvgn, int* status)
 {
     int data_size = tools_open_mnvgn_size();
-    if (method != REG_ACCESS_METHOD_GET) {  // this register supports only get method
+    if (method != REG_ACCESS_METHOD_GET)
+    { // this register supports only get method
         return ME_REG_ACCESS_BAD_METHOD;
     }
 
-    REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, REG_ID_MNVGN, mnvgn, mnvgn, data_size, data_size, data_size, \
-                                       tools_open_mnvgn_pack, tools_open_mnvgn_unpack, tools_open_mnvgn_size, \
+    REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, REG_ID_MNVGN, mnvgn, mnvgn, data_size, data_size, data_size,
+                                       tools_open_mnvgn_pack, tools_open_mnvgn_unpack, tools_open_mnvgn_size,
                                        tools_open_mnvgn_print, status);
 
-    if (rc || *status) { \
-        return (reg_access_status_t)rc; \
-    } \
+    if (rc || *status)
+    {
+        return (reg_access_status_t)rc;
+    }
     return ME_OK;
 }
 
 /************************************
-* Function: reg_access_mgnle
-************************************/
-reg_access_status_t reg_access_mgnle(mfile *mf, reg_access_method_t method, struct tools_open_mgnle *mgnle, int *status)
+ * Function: reg_access_mgnle
+ ************************************/
+reg_access_status_t reg_access_mgnle(mfile* mf, reg_access_method_t method, struct tools_open_mgnle* mgnle, int* status)
 {
     int data_size = tools_open_mgnle_size();
-    if (method != REG_ACCESS_METHOD_GET) { // this register supports only get method
+    if (method != REG_ACCESS_METHOD_GET)
+    { // this register supports only get method
         return ME_REG_ACCESS_BAD_METHOD;
     }
 
-    REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, REG_ID_MGNLE, mgnle, mgnle, data_size, data_size, data_size, \
-                                       tools_open_mgnle_pack, tools_open_mgnle_unpack, tools_open_mgnle_size, \
+    REG_ACCESS_GENERIC_VAR_WITH_STATUS(mf, method, REG_ID_MGNLE, mgnle, mgnle, data_size, data_size, data_size,
+                                       tools_open_mgnle_pack, tools_open_mgnle_unpack, tools_open_mgnle_size,
                                        tools_open_mgnle_print, status);
 
-    if (rc || *status) { \
-        return (reg_access_status_t)rc; \
-    } \
+    if (rc || *status)
+    {
+        return (reg_access_status_t)rc;
+    }
 
     return ME_OK;
 }
 
 /************************************
-* Function: reg_access_mmdio
-************************************/
-reg_access_status_t reg_access_mmdio(mfile *mf, reg_access_method_t method, struct reg_access_hca_mmdio *mmdio)
+ * Function: reg_access_mmdio
+ ************************************/
+reg_access_status_t reg_access_mmdio(mfile* mf, reg_access_method_t method, struct reg_access_hca_mmdio* mmdio)
 {
-    if (method != REG_ACCESS_METHOD_SET) {   // this register supports only set method
+    if (method != REG_ACCESS_METHOD_SET)
+    { // this register supports only set method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_MMDIO, mmdio, mmdio, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_pmdic
-************************************/
-reg_access_status_t reg_access_pmdic(mfile *mf, reg_access_method_t method, struct tools_open_pmdic *pmdic)
+ * Function: reg_access_pmdic
+ ************************************/
+reg_access_status_t reg_access_pmdic(mfile* mf, reg_access_method_t method, struct tools_open_pmdic* pmdic)
 {
-    if (method != REG_ACCESS_METHOD_GET) {  // this register supports only get method
+    if (method != REG_ACCESS_METHOD_GET)
+    { // this register supports only get method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_PMDIC, pmdic, pmdic, tools_open);
 }
 
-
 //=================================================================================================================================
 /************************************
  * * Function: reg_access_resource_dump
  * ************************************/
-reg_access_status_t reg_access_res_dump(mfile *mf, reg_access_method_t method, struct reg_access_hca_resource_dump *resource_dump)
+reg_access_status_t
+  reg_access_res_dump(mfile* mf, reg_access_method_t method, struct reg_access_hca_resource_dump* resource_dump)
 {
     REG_ACCCESS(mf, method, REG_ID_RES_DUMP, resource_dump, resource_dump, reg_access_hca);
 }
 
-reg_access_status_t reg_access_debug_cap(mfile *mf, reg_access_method_t method, struct reg_access_hca_debug_cap *debug_cap)
+reg_access_status_t
+  reg_access_debug_cap(mfile* mf, reg_access_method_t method, struct reg_access_hca_debug_cap* debug_cap)
 {
     REG_ACCCESS(mf, method, REG_ID_DEBUG_CAP, debug_cap, debug_cap, reg_access_hca);
 }
 
 //=================================================================================================================================
 
-
-
 #endif //#ifndef UEFI_BUILD
 
 /************************************
-* Function: reg_access_nvda
-************************************/
-reg_access_status_t reg_access_nvda(mfile *mf, reg_access_method_t method, struct tools_open_nvda *nvda)
+ * Function: reg_access_nvda
+ ************************************/
+reg_access_status_t reg_access_nvda(mfile* mf, reg_access_method_t method, struct tools_open_nvda* nvda)
 {
     // reg_size is in bytes
     u_int32_t reg_size = nvda->nv_hdr.length + tools_open_nv_hdr_fifth_gen_size();
     u_int32_t r_size_reg = reg_size;
     u_int32_t w_size_reg = reg_size;
-    if (method == REG_ACCESS_METHOD_GET) {
+    if (method == REG_ACCESS_METHOD_GET)
+    {
         w_size_reg -= nvda->nv_hdr.length;
-    } else {
+    }
+    else
+    {
         r_size_reg -= nvda->nv_hdr.length;
     }
     REG_ACCCESS_VAR(mf, method, REG_ID_MNVA, nvda, nvda, reg_size, r_size_reg, w_size_reg, tools_open);
 }
 
 /************************************
-* Function: reg_access_mgir
-************************************/
-reg_access_status_t reg_access_mgir(mfile *mf, reg_access_method_t method, struct reg_access_hca_mgir *mgir) {
-    if (!mf) {
+ * Function: reg_access_mgir
+ ************************************/
+reg_access_status_t reg_access_mgir(mfile* mf, reg_access_method_t method, struct reg_access_hca_mgir* mgir)
+{
+    if (!mf)
+    {
         return ME_UNSUPPORTED_DEVICE;
-    } else if (mf->tp == MST_MLNXOS) {
-        REG_ACCCESS_VAR(mf, method, REG_ID_MGIR, mgir, mgir, MGIR_REG_SIZE,
-                MGIR_REG_SIZE, MGIR_REG_SIZE, reg_access_hca);
-    } else {
+    }
+    else if (mf->tp == MST_MLNXOS)
+    {
+        REG_ACCCESS_VAR(mf, method, REG_ID_MGIR, mgir, mgir, MGIR_REG_SIZE, MGIR_REG_SIZE, MGIR_REG_SIZE,
+                        reg_access_hca);
+    }
+    else
+    {
         REG_ACCCESS(mf, method, REG_ID_MGIR, mgir, mgir, reg_access_hca);
     }
 }
 
 /************************************
-* Function: reg_access_mirc
-************************************/
-reg_access_status_t reg_access_mirc(mfile *mf, reg_access_method_t method, struct tools_open_mirc_reg *mirc)
+ * Function: reg_access_mirc
+ ************************************/
+reg_access_status_t reg_access_mirc(mfile* mf, reg_access_method_t method, struct tools_open_mirc_reg* mirc)
 {
     REG_ACCCESS(mf, method, REG_ID_MIRC, mirc, mirc_reg, tools_open);
 }
 
-
 /************************************
-* Function: reg_access_mfba
-************************************/
-reg_access_status_t reg_access_mfba(mfile *mf, reg_access_method_t method, struct register_access_mfba *mfba)
+ * Function: reg_access_mfba
+ ************************************/
+reg_access_status_t reg_access_mfba(mfile* mf, reg_access_method_t method, struct register_access_mfba* mfba)
 {
     u_int32_t reg_size = mfba->size + REG_ACCESS_MFBA_HEADER_LEN;
     // the r/w_size_reg is for improved performance for when we send the register
-    // via icmd , since its relatively slow si no need to write the data array from mfba struct to the device when reading from the device
-    // and no need for reading the data array from the device when writing to the device (we just care about the status)
+    // via icmd , since its relatively slow si no need to write the data array from mfba struct to the device when
+    // reading from the device and no need for reading the data array from the device when writing to the device (we
+    // just care about the status)
     u_int32_t r_size_reg = reg_size;
     u_int32_t w_size_reg = reg_size;
-    if (method == REG_ACCESS_METHOD_GET) {
+    if (method == REG_ACCESS_METHOD_GET)
+    {
         w_size_reg -= mfba->size;
-    } else {
+    }
+    else
+    {
         r_size_reg -= mfba->size;
     }
-    //printf("-D- MFBA: data size: %d, reg_size: %d, r_size_reg: %d, w_size_reg: %d\n",mfba->size,reg_size,r_size_reg,w_size_reg);
+    // printf("-D- MFBA: data size: %d, reg_size: %d, r_size_reg: %d, w_size_reg:
+    // %d\n",mfba->size,reg_size,r_size_reg,w_size_reg);
     REG_ACCCESS_VAR(mf, method, REG_ID_MFBA, mfba, mfba, reg_size, r_size_reg, w_size_reg, register_access);
 }
 
 /************************************
-* Function: reg_access_mcam
-************************************/
-reg_access_status_t reg_access_mcam(mfile *mf, reg_access_method_t method, struct tools_open_mcam *mcam)
+ * Function: reg_access_mcam
+ ************************************/
+reg_access_status_t reg_access_mcam(mfile* mf, reg_access_method_t method, struct tools_open_mcam* mcam)
 {
     REG_ACCCESS(mf, method, REG_ID_MCAM, mcam, mcam, tools_open);
 }
 
 /************************************
-* Function: reg_access_mcda
-************************************/
-reg_access_status_t reg_access_mcda(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcda_reg *mcda)
+ * Function: reg_access_mcda
+ ************************************/
+reg_access_status_t reg_access_mcda(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcda_reg* mcda)
 {
     REG_ACCCESS(mf, method, REG_ID_MCDA, mcda, mcda_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_mqis
-************************************/
-reg_access_status_t reg_access_mqis(mfile *mf, reg_access_method_t method, struct reg_access_hca_mqis_reg *mqis)
+ * Function: reg_access_mqis
+ ************************************/
+reg_access_status_t reg_access_mqis(mfile* mf, reg_access_method_t method, struct reg_access_hca_mqis_reg* mqis)
 {
     REG_ACCCESS(mf, method, REG_ID_MQIS, mqis, mqis_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_mtrc_cap
-************************************/
-reg_access_status_t reg_access_mtrc_cap(mfile *mf, reg_access_method_t method, struct reg_access_hca_mtrc_cap_reg *mtrc_cap)
+ * Function: reg_access_mtrc_cap
+ ************************************/
+reg_access_status_t
+  reg_access_mtrc_cap(mfile* mf, reg_access_method_t method, struct reg_access_hca_mtrc_cap_reg* mtrc_cap)
 {
     REG_ACCCESS(mf, method, REG_ID_MTRC_CAP, mtrc_cap, mtrc_cap_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_mcc
-************************************/
-reg_access_status_t reg_access_mcc(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcc_reg *mcc)
+ * Function: reg_access_mcc
+ ************************************/
+reg_access_status_t reg_access_mcc(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcc_reg* mcc)
 {
     REG_ACCCESS(mf, method, REG_ID_MCC, mcc, mcc_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_mcqs
-************************************/
-reg_access_status_t reg_access_mcqs_inner(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcqs_reg *mcqs)
+ * Function: reg_access_mcqs
+ ************************************/
+reg_access_status_t reg_access_mcqs_inner(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcqs_reg* mcqs)
 {
     REG_ACCCESS(mf, method, REG_ID_MCQS, mcqs, mcqs_reg, reg_access_hca);
 }
 
-reg_access_status_t reg_access_mcqs(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcqs_reg *mcqs)
+reg_access_status_t reg_access_mcqs(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcqs_reg* mcqs)
 {
     reg_access_status_t ret = reg_access_mcqs_inner(mf, method, mcqs);
-    
-    char *path_env = getenv("MCQS_DEBUG");
-    if (path_env != NULL) {
-        printf ("-I- MCQS: Recieved data --\n");
+
+    char* path_env = getenv("MCQS_DEBUG");
+    if (path_env != NULL)
+    {
+        printf("-I- MCQS: Recieved data --\n");
         reg_access_hca_mcqs_reg_dump(mcqs, stdout);
     }
 
     return ret;
 }
 /************************************
-* Function: reg_access_mcqi
-************************************/
-reg_access_status_t reg_access_mcqi_inner(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcqi_reg *mcqi)
+ * Function: reg_access_mcqi
+ ************************************/
+reg_access_status_t reg_access_mcqi_inner(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcqi_reg* mcqi)
 {
     REG_ACCCESS(mf, method, REG_ID_MCQI, mcqi, mcqi_reg, reg_access_hca);
 }
 
-reg_access_status_t reg_access_mcqi(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcqi_reg *mcqi)
+reg_access_status_t reg_access_mcqi(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcqi_reg* mcqi)
 {
     reg_access_status_t ret = reg_access_mcqi_inner(mf, method, mcqi);
 
-    char *path_env = getenv("MCQI_DEBUG");
-    if (path_env != NULL) {
-        printf ("-I- MCQI: Recieved data --\n");
+    char* path_env = getenv("MCQI_DEBUG");
+    if (path_env != NULL)
+    {
+        printf("-I- MCQI: Recieved data --\n");
         reg_access_hca_mcqi_reg_dump(mcqi, stdout);
     }
     return ret;
 }
 
 /************************************
-* Function: reg_access_mfbe
-************************************/
-reg_access_status_t reg_access_mfbe(mfile *mf, reg_access_method_t method, struct register_access_mfbe *mfbe)
+ * Function: reg_access_mfbe
+ ************************************/
+reg_access_status_t reg_access_mfbe(mfile* mf, reg_access_method_t method, struct register_access_mfbe* mfbe)
 {
     REG_ACCCESS(mf, method, REG_ID_MFBE, mfbe, mfbe, register_access);
 }
 
 /************************************
-* Function: reg_access_mfpa
-************************************/
-reg_access_status_t reg_access_mfpa(mfile *mf, reg_access_method_t method, struct register_access_mfpa *mfpa)
+ * Function: reg_access_mfpa
+ ************************************/
+reg_access_status_t reg_access_mfpa(mfile* mf, reg_access_method_t method, struct register_access_mfpa* mfpa)
 {
     REG_ACCCESS(mf, method, REG_ID_MFPA, mfpa, mfpa, register_access);
 }
 
 /************************************
-* Function: reg_access_mfsv
-************************************/
-reg_access_status_t reg_access_mfsv(mfile *mf, reg_access_method_t method, struct reg_access_hca_mfsv_reg *mfsv)
+ * Function: reg_access_mfsv
+ ************************************/
+reg_access_status_t reg_access_mfsv(mfile* mf, reg_access_method_t method, struct reg_access_hca_mfsv_reg* mfsv)
 {
     REG_ACCCESS(mf, method, REG_ID_MFSV, mfsv, mfsv_reg, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_mfrl
-************************************/
-reg_access_status_t reg_access_mfrl(mfile *mf, reg_access_method_t method, struct reg_access_hca_mfrl_reg_ext *mfrl)
+ * Function: reg_access_mfrl
+ ************************************/
+reg_access_status_t reg_access_mfrl(mfile* mf, reg_access_method_t method, struct reg_access_hca_mfrl_reg_ext* mfrl)
 {
     REG_ACCCESS(mf, method, REG_ID_MFRL, mfrl, mfrl_reg_ext, reg_access_hca);
 }
 
 /************************************
-* Function: reg_access_mpcir
-************************************/
-reg_access_status_t reg_access_mpcir(mfile *mf, reg_access_method_t method, struct reg_access_hca_mpcir_ext *mpcir)
+ * Function: reg_access_mpcir
+ ************************************/
+reg_access_status_t reg_access_mpcir(mfile* mf, reg_access_method_t method, struct reg_access_hca_mpcir_ext* mpcir)
 {
     REG_ACCCESS(mf, method, REG_ID_MPCIR, mpcir, mpcir_ext, reg_access_hca);
 }
 
-
 /************************************
-* Function: reg_access_mfai
-************************************/
-reg_access_status_t reg_access_mfai(mfile *mf, reg_access_method_t method, struct cibfw_register_mfai *mfai)
+ * Function: reg_access_mfai
+ ************************************/
+reg_access_status_t reg_access_mfai(mfile* mf, reg_access_method_t method, struct cibfw_register_mfai* mfai)
 {
-    if (method != REG_ACCESS_METHOD_SET) { // this register supports only set method
+    if (method != REG_ACCESS_METHOD_SET)
+    { // this register supports only set method
         return ME_REG_ACCESS_BAD_METHOD;
     }
     REG_ACCCESS(mf, method, REG_ID_MFAI, mfai, mfai, cibfw_register);
 }
 
 /************************************
-* Function: reg_access_mvts
-************************************/
-reg_access_status_t reg_access_mvts(mfile *mf, reg_access_method_t method, struct tools_open_mvts *mvts)
+ * Function: reg_access_mvts
+ ************************************/
+reg_access_status_t reg_access_mvts(mfile* mf, reg_access_method_t method, struct tools_open_mvts* mvts)
 {
     REG_ACCCESS(mf, method, REG_ID_MVTS, mvts, mvts, tools_open);
 }
 
 /************************************
-* Function: reg_access_mfmc
-************************************/
-reg_access_status_t reg_access_mfmc(mfile *mf, reg_access_method_t method, struct tools_open_mfmc *mfmc)
+ * Function: reg_access_mfmc
+ ************************************/
+reg_access_status_t reg_access_mfmc(mfile* mf, reg_access_method_t method, struct tools_open_mfmc* mfmc)
 {
     REG_ACCCESS(mf, method, REG_ID_MFMC, mfmc, mfmc, tools_open);
 }
 
 /************************************
-* Function: reg_access_mfmc
-************************************/
-reg_access_status_t reg_access_mcdd(mfile *mf, reg_access_method_t method, struct tools_open_mcdd_reg *mcdd)
+ * Function: reg_access_mfmc
+ ************************************/
+reg_access_status_t reg_access_mcdd(mfile* mf, reg_access_method_t method, struct tools_open_mcdd_reg* mcdd)
 {
     REG_ACCCESS(mf, method, REG_ID_MCDD, mcdd, mcdd_reg, tools_open);
 }
 /************************************
-* Function: reg_access_mfpa_new
-************************************/
-reg_access_status_t reg_access_mfpa_new(mfile *mf, reg_access_method_t method, struct tools_open_mfpa *mfpa)
+ * Function: reg_access_mfpa_new
+ ************************************/
+reg_access_status_t reg_access_mfpa_new(mfile* mf, reg_access_method_t method, struct tools_open_mfpa* mfpa)
 {
     REG_ACCCESS(mf, method, REG_ID_MFPA, mfpa, mfpa, tools_open);
 }
 
 /************************************
-* Function: reg_access_secure_host
-************************************/
-reg_access_status_t reg_access_secure_host(mfile *mf, reg_access_method_t method, struct tools_open_mlock *mlock)
+ * Function: reg_access_secure_host
+ ************************************/
+reg_access_status_t reg_access_secure_host(mfile* mf, reg_access_method_t method, struct tools_open_mlock* mlock)
 {
     REG_ACCCESS(mf, method, REG_ID_MLCOK, mlock, mlock, tools_open);
 }
 /************************************
-* Function: reg_access_err2str
-************************************/
+ * Function: reg_access_err2str
+ ************************************/
 const char* reg_access_err2str(reg_access_status_t status)
 {
     return m_err2str(status);
 }
 /************************************
-* Function: reg_access_mtcq
-************************************/
-reg_access_status_t reg_access_mtcq(mfile *mf, reg_access_method_t method, struct reg_access_switch_mtcq_reg_ext *mtcq)
+ * Function: reg_access_mtcq
+ ************************************/
+reg_access_status_t reg_access_mtcq(mfile* mf, reg_access_method_t method, struct reg_access_switch_mtcq_reg_ext* mtcq)
 {
     REG_ACCCESS(mf, method, REG_ID_MTCQ, mtcq, mtcq_reg_ext, reg_access_switch);
 }
 /************************************
-* Function: reg_access_mdsr
-************************************/
-reg_access_status_t reg_access_mdsr(mfile *mf, reg_access_method_t method, struct reg_access_switch_mdsr_reg_ext *mdsr)
+ * Function: reg_access_mdsr
+ ************************************/
+reg_access_status_t reg_access_mdsr(mfile* mf, reg_access_method_t method, struct reg_access_switch_mdsr_reg_ext* mdsr)
 {
     REG_ACCCESS(mf, method, REG_ID_MDSR, mdsr, mdsr_reg_ext, reg_access_switch);
 }
 /************************************
-* Function: reg_access_mkdc
-************************************/
-reg_access_status_t reg_access_mkdc(mfile *mf, reg_access_method_t method, struct reg_access_switch_mkdc_reg_ext *mkdc)
+ * Function: reg_access_mkdc
+ ************************************/
+reg_access_status_t reg_access_mkdc(mfile* mf, reg_access_method_t method, struct reg_access_switch_mkdc_reg_ext* mkdc)
 {
     REG_ACCCESS(mf, method, REG_ID_MKDC, mkdc, mkdc_reg_ext, reg_access_switch);
 }
 /************************************
-* Function: reg_access_mpegc
-************************************/
-reg_access_status_t reg_access_mpegc(mfile *mf, reg_access_method_t method, struct reg_access_hca_mpegc_reg *mpegc)
+ * Function: reg_access_mpegc
+ ************************************/
+reg_access_status_t reg_access_mpegc(mfile* mf, reg_access_method_t method, struct reg_access_hca_mpegc_reg* mpegc)
 {
-//    reg_access_hca_mpegc_reg_dump(mpegc, stdout)s;
+    //    reg_access_hca_mpegc_reg_dump(mpegc, stdout)s;
     REG_ACCCESS(mf, method, REG_ID_MPEGC, mpegc, mpegc_reg, reg_access_hca);
 }
diff --git a/reg_access/reg_access.h b/reg_access/reg_access.h
index 2d6ca570..e6a7bf3e 100644
--- a/reg_access/reg_access.h
+++ b/reg_access/reg_access.h
@@ -33,7 +33,8 @@
 #ifndef REG_ACCESS_H
 #define REG_ACCESS_H
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <mtcr.h>
@@ -43,83 +44,103 @@ extern "C" {
 // uncoment for testing MDDT with PDDR
 //#include <tools_layouts/connectx4_layouts.h>
 
-// Hack, we include this for the MNV registers as they are not officialy a part of register_access so we defined them in tools.adb
+// Hack, we include this for the MNV registers as they are not officialy a part of register_access so we defined them in
+// tools.adb
 #include <tools_layouts/tools_open_layouts.h>
 #include <tools_layouts/reg_access_hca_layouts.h>
 #include <tools_layouts/reg_access_switch_layouts.h>
 #include <tools_layouts/register_access_sib_layouts.h>
 
-enum { // header lengths in bytes
-    REG_ACCESS_MFBA_HEADER_LEN = 12,
-};
+    enum
+    { // header lengths in bytes
+        REG_ACCESS_MFBA_HEADER_LEN = 12,
+    };
 
-typedef enum {
-    REG_ACCESS_METHOD_GET = MACCESS_REG_METHOD_GET,
-    REG_ACCESS_METHOD_SET = MACCESS_REG_METHOD_SET
-} reg_access_method_t;
-typedef enum {
-    MDDT_PRM_REGISTER_CMD_TYPE   = 0,
-    MDDT_COMMAND_CMD_TYPE        = 1,
-    MDDT_CRSPACE_ACCESS_CMD_TYPE = 2
-} mddt_command_type_t;
+    typedef enum
+    {
+        REG_ACCESS_METHOD_GET = MACCESS_REG_METHOD_GET,
+        REG_ACCESS_METHOD_SET = MACCESS_REG_METHOD_SET
+    } reg_access_method_t;
+    typedef enum
+    {
+        MDDT_PRM_REGISTER_CMD_TYPE = 0,
+        MDDT_COMMAND_CMD_TYPE = 1,
+        MDDT_CRSPACE_ACCESS_CMD_TYPE = 2
+    } mddt_command_type_t;
 
-// we use the same error messages as mtcr
-typedef MError reg_access_status_t;
+    // we use the same error messages as mtcr
+    typedef MError reg_access_status_t;
 
-reg_access_status_t reg_access_mnva(mfile *mf, reg_access_method_t method, struct tools_open_mnva *mnva);
-reg_access_status_t reg_access_mnvi(mfile *mf, reg_access_method_t method, struct tools_open_mnvi *mnvi);
-reg_access_status_t reg_access_mnvia(mfile *mf, reg_access_method_t method, struct tools_open_mnvia *mnvia);
-reg_access_status_t reg_access_nvqgc(mfile *mf, reg_access_method_t method, struct tools_open_nvqgc *nvqgc);
-reg_access_status_t reg_access_mmdio(mfile *mf, reg_access_method_t method, struct reg_access_hca_mmdio *mmdio);
-reg_access_status_t reg_access_pmdic(mfile *mf, reg_access_method_t method, struct tools_open_pmdic *pmdic);
-reg_access_status_t reg_access_nvdi(mfile *mf, reg_access_method_t method, struct tools_open_nvdi *nvdi);
-reg_access_status_t reg_access_nvia(mfile *mf, reg_access_method_t method, struct tools_open_nvia *nvia);
-reg_access_status_t reg_access_nvqc(mfile *mf, reg_access_method_t method, struct tools_open_nvqc *nvqc);
-reg_access_status_t reg_access_mnvgn(mfile *mf, reg_access_method_t method, struct tools_open_mnvgn *mnvgn, int *status);
-reg_access_status_t reg_access_mgnle(mfile *mf, reg_access_method_t method, struct tools_open_mgnle *mngnle, int *status);
-reg_access_status_t reg_access_res_dump(mfile *mf, reg_access_method_t method, struct reg_access_hca_resource_dump *res_dump);
-reg_access_status_t reg_access_debug_cap(mfile *mf, reg_access_method_t method, struct reg_access_hca_debug_cap *debug_cap);
+    reg_access_status_t reg_access_mnva(mfile* mf, reg_access_method_t method, struct tools_open_mnva* mnva);
+    reg_access_status_t reg_access_mnvi(mfile* mf, reg_access_method_t method, struct tools_open_mnvi* mnvi);
+    reg_access_status_t reg_access_mnvia(mfile* mf, reg_access_method_t method, struct tools_open_mnvia* mnvia);
+    reg_access_status_t reg_access_nvqgc(mfile* mf, reg_access_method_t method, struct tools_open_nvqgc* nvqgc);
+    reg_access_status_t reg_access_mmdio(mfile* mf, reg_access_method_t method, struct reg_access_hca_mmdio* mmdio);
+    reg_access_status_t reg_access_pmdic(mfile* mf, reg_access_method_t method, struct tools_open_pmdic* pmdic);
+    reg_access_status_t reg_access_nvdi(mfile* mf, reg_access_method_t method, struct tools_open_nvdi* nvdi);
+    reg_access_status_t reg_access_nvia(mfile* mf, reg_access_method_t method, struct tools_open_nvia* nvia);
+    reg_access_status_t reg_access_nvqc(mfile* mf, reg_access_method_t method, struct tools_open_nvqc* nvqc);
+    reg_access_status_t
+      reg_access_mnvgn(mfile* mf, reg_access_method_t method, struct tools_open_mnvgn* mnvgn, int* status);
+    reg_access_status_t
+      reg_access_mgnle(mfile* mf, reg_access_method_t method, struct tools_open_mgnle* mngnle, int* status);
+    reg_access_status_t
+      reg_access_res_dump(mfile* mf, reg_access_method_t method, struct reg_access_hca_resource_dump* res_dump);
+    reg_access_status_t
+      reg_access_debug_cap(mfile* mf, reg_access_method_t method, struct reg_access_hca_debug_cap* debug_cap);
 
-reg_access_status_t reg_access_pcnr(mfile *mf, reg_access_method_t method, struct reg_access_hca_pcnr_reg *pcnr);
+    reg_access_status_t reg_access_pcnr(mfile* mf, reg_access_method_t method, struct reg_access_hca_pcnr_reg* pcnr);
 
-reg_access_status_t reg_access_strs_stop_toggle_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_stop_toggle_reg *streg);
-reg_access_status_t reg_access_strs_fault_injector_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_fault_inject_reg *strs_fault_inject_reg);
-reg_access_status_t reg_access_strs_mini_flow_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_mini_flow_reg *strs_mini_flow_reg);
-reg_access_status_t reg_access_strs_resource_reg(mfile *mf, reg_access_method_t method, struct reg_access_hca_strs_resource_reg *strs_resource_reg);
+    reg_access_status_t reg_access_strs_stop_toggle_reg(mfile* mf,
+                                                        reg_access_method_t method,
+                                                        struct reg_access_hca_strs_stop_toggle_reg* streg);
+    reg_access_status_t
+      reg_access_strs_fault_injector_reg(mfile* mf,
+                                         reg_access_method_t method,
+                                         struct reg_access_hca_strs_fault_inject_reg* strs_fault_inject_reg);
+    reg_access_status_t reg_access_strs_mini_flow_reg(mfile* mf,
+                                                      reg_access_method_t method,
+                                                      struct reg_access_hca_strs_mini_flow_reg* strs_mini_flow_reg);
+    reg_access_status_t reg_access_strs_resource_reg(mfile* mf,
+                                                     reg_access_method_t method,
+                                                     struct reg_access_hca_strs_resource_reg* strs_resource_reg);
 
-reg_access_status_t reg_access_nvda(mfile *mf, reg_access_method_t method, struct tools_open_nvda *nvda);
-reg_access_status_t reg_access_mfba(mfile *mf, reg_access_method_t method, struct register_access_mfba *mfba);
-reg_access_status_t reg_access_mfbe(mfile *mf, reg_access_method_t method, struct register_access_mfbe *mfbe);
-reg_access_status_t reg_access_mfpa(mfile *mf, reg_access_method_t method, struct register_access_mfpa *mfpa);
-reg_access_status_t reg_access_mfsv(mfile *mf, reg_access_method_t method, struct reg_access_hca_mfsv_reg *mfsv);
-reg_access_status_t reg_access_mfrl(mfile *mf, reg_access_method_t method, struct reg_access_hca_mfrl_reg_ext *mfrl);
-reg_access_status_t reg_access_mpcir(mfile *mf, reg_access_method_t method, struct reg_access_hca_mpcir_ext *mpcir);
-reg_access_status_t reg_access_mfai(mfile *mf, reg_access_method_t method, struct cibfw_register_mfai *mfai);
-reg_access_status_t reg_access_mvts(mfile *mf, reg_access_method_t method, struct tools_open_mvts *mvts);
-reg_access_status_t reg_access_mfmc(mfile *mf, reg_access_method_t method, struct tools_open_mfmc *mfmc);
-reg_access_status_t reg_access_mfpa_new(mfile *mf, reg_access_method_t method, struct tools_open_mfpa *mfpa);
+    reg_access_status_t reg_access_nvda(mfile* mf, reg_access_method_t method, struct tools_open_nvda* nvda);
+    reg_access_status_t reg_access_mfba(mfile* mf, reg_access_method_t method, struct register_access_mfba* mfba);
+    reg_access_status_t reg_access_mfbe(mfile* mf, reg_access_method_t method, struct register_access_mfbe* mfbe);
+    reg_access_status_t reg_access_mfpa(mfile* mf, reg_access_method_t method, struct register_access_mfpa* mfpa);
+    reg_access_status_t reg_access_mfsv(mfile* mf, reg_access_method_t method, struct reg_access_hca_mfsv_reg* mfsv);
+    reg_access_status_t reg_access_mfrl(mfile* mf, reg_access_method_t method, struct reg_access_hca_mfrl_reg_ext* mfrl);
+    reg_access_status_t reg_access_mpcir(mfile* mf, reg_access_method_t method, struct reg_access_hca_mpcir_ext* mpcir);
+    reg_access_status_t reg_access_mfai(mfile* mf, reg_access_method_t method, struct cibfw_register_mfai* mfai);
+    reg_access_status_t reg_access_mvts(mfile* mf, reg_access_method_t method, struct tools_open_mvts* mvts);
+    reg_access_status_t reg_access_mfmc(mfile* mf, reg_access_method_t method, struct tools_open_mfmc* mfmc);
+    reg_access_status_t reg_access_mfpa_new(mfile* mf, reg_access_method_t method, struct tools_open_mfpa* mfpa);
 
-reg_access_status_t reg_access_mcam(mfile *mf, reg_access_method_t method, struct tools_open_mcam *mcam);
-reg_access_status_t reg_access_secure_host(mfile *mf, reg_access_method_t method, struct tools_open_mlock *mlock);
-/*
- * MCXX new burn commands
- */
-reg_access_status_t reg_access_mcda(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcda_reg *mcda);
-reg_access_status_t reg_access_mqis(mfile *mf, reg_access_method_t method, struct reg_access_hca_mqis_reg *mqis);
-reg_access_status_t reg_access_mcc(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcc_reg *mcc );
-reg_access_status_t reg_access_mcqs(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcqs_reg *mcqs);
-reg_access_status_t reg_access_mcqi(mfile *mf, reg_access_method_t method, struct reg_access_hca_mcqi_reg *mcqi);
-reg_access_status_t reg_access_mgir(mfile *mf, reg_access_method_t method,
-        struct reg_access_hca_mgir *mgir);
-reg_access_status_t reg_access_mtrc_cap(mfile *mf, reg_access_method_t method, struct reg_access_hca_mtrc_cap_reg *mtrc_cap);
-reg_access_status_t reg_access_mcdd(mfile *mf, reg_access_method_t method, struct tools_open_mcdd_reg *mcdd);
-const char* reg_access_err2str(reg_access_status_t status);
-reg_access_status_t reg_access_mirc(mfile *mf, reg_access_method_t method, struct tools_open_mirc_reg *mirc);
+    reg_access_status_t reg_access_mcam(mfile* mf, reg_access_method_t method, struct tools_open_mcam* mcam);
+    reg_access_status_t reg_access_secure_host(mfile* mf, reg_access_method_t method, struct tools_open_mlock* mlock);
+    /*
+     * MCXX new burn commands
+     */
+    reg_access_status_t reg_access_mcda(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcda_reg* mcda);
+    reg_access_status_t reg_access_mqis(mfile* mf, reg_access_method_t method, struct reg_access_hca_mqis_reg* mqis);
+    reg_access_status_t reg_access_mcc(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcc_reg* mcc);
+    reg_access_status_t reg_access_mcqs(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcqs_reg* mcqs);
+    reg_access_status_t reg_access_mcqi(mfile* mf, reg_access_method_t method, struct reg_access_hca_mcqi_reg* mcqi);
+    reg_access_status_t reg_access_mgir(mfile* mf, reg_access_method_t method, struct reg_access_hca_mgir* mgir);
+    reg_access_status_t
+      reg_access_mtrc_cap(mfile* mf, reg_access_method_t method, struct reg_access_hca_mtrc_cap_reg* mtrc_cap);
+    reg_access_status_t reg_access_mcdd(mfile* mf, reg_access_method_t method, struct tools_open_mcdd_reg* mcdd);
+    const char* reg_access_err2str(reg_access_status_t status);
+    reg_access_status_t reg_access_mirc(mfile* mf, reg_access_method_t method, struct tools_open_mirc_reg* mirc);
 
-reg_access_status_t reg_access_mkdc(mfile *mf, reg_access_method_t method, struct reg_access_switch_mkdc_reg_ext *mkdc);
-reg_access_status_t reg_access_mtcq(mfile *mf, reg_access_method_t method, struct reg_access_switch_mtcq_reg_ext *mtcq);
-reg_access_status_t reg_access_mdsr(mfile *mf, reg_access_method_t method, struct reg_access_switch_mdsr_reg_ext *mtcq);
-reg_access_status_t reg_access_mpegc(mfile *mf, reg_access_method_t method, struct reg_access_hca_mpegc_reg *mpegc);
+    reg_access_status_t
+      reg_access_mkdc(mfile* mf, reg_access_method_t method, struct reg_access_switch_mkdc_reg_ext* mkdc);
+    reg_access_status_t
+      reg_access_mtcq(mfile* mf, reg_access_method_t method, struct reg_access_switch_mtcq_reg_ext* mtcq);
+    reg_access_status_t
+      reg_access_mdsr(mfile* mf, reg_access_method_t method, struct reg_access_switch_mdsr_reg_ext* mtcq);
+    reg_access_status_t reg_access_mpegc(mfile* mf, reg_access_method_t method, struct reg_access_hca_mpegc_reg* mpegc);
 
 #ifdef __cplusplus
 }
diff --git a/reg_access/regaccess.py b/reg_access/regaccess.py
index 8a0b7f86..6bdb5f40 100644
--- a/reg_access/regaccess.py
+++ b/reg_access/regaccess.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 from __future__ import print_function
 import os
@@ -37,18 +37,23 @@
 import ctypes
 import mtcr
 
+
 def ones(n):
     return (1 << n) - 1
 
+
 def extractField(val, start, size):
-    return (val & (ones(size)<<start)) >> start
+    return (val & (ones(size) << start)) >> start
+
 
 def insertField(val1, start1, val2, start2, size):
-    return val1 & ~(ones(size)<<start1) | (extractField(val2, start2, size) << start1)
+    return val1 & ~(ones(size) << start1) | (extractField(val2, start2, size) << start1)
+
 
 class RegAccException(Exception):
     pass
 
+
 # Constants
 REG_ACCESS_METHOD_GET = 1
 REG_ACCESS_METHOD_SET = 2
@@ -60,12 +65,12 @@ class RegAccException(Exception):
     if platform.system() == "Windows" or os.name == "nt":
         try:
             REG_ACCESS = CDLL("libreg_access-1.dll")
-        except:
+        except BaseException:
             REG_ACCESS = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "libreg_access-1.dll"))
     else:
         try:
             REG_ACCESS = CDLL("rreg_access.so")
-        except:
+        except BaseException:
             REG_ACCESS = CDLL(os.path.join(os.path.dirname(os.path.realpath(__file__)), "rreg_access.so"))
 except Exception as exp:
     raise RegAccException("Failed to load shared library rreg_access.so/libreg_access-1.dll: %s" % exp)
@@ -74,63 +79,58 @@ class RegAccException(Exception):
 
     class ownershipEnum:
         REG_ACCESS_OWNERSHIP_TAKEN_SUCCESSFULLY = 0
-        REG_ACCESS_FAILED_TO_AQUIRE_OWNERSHIP   = 1
-        REG_ACCESS_NO_OWNERSHIP_REQUIRED        = 2
-
+        REG_ACCESS_FAILED_TO_AQUIRE_OWNERSHIP = 1
+        REG_ACCESS_NO_OWNERSHIP_REQUIRED = 2
 
     class RES_DUMP_ST(Structure):
         _fields_ = [
-            ("segment_type",c_uint16),
-            ("seq_num",c_uint8),
-            ("vhca_id_valid",c_uint8),
-            ("inline_dump",c_uint8),
-            ("more_dump",c_uint8),
-            ("vhca_id",c_uint16),
-            ("index_1",c_uint32),
-            ("index_2",c_uint32),
-            ("num_of_obj_2",c_uint16),
-            ("num_of_obj_1",c_uint16),
-            ("device_opaque",c_uint64),
-            ("mkey",c_uint32),
-            ("size",c_uint32),
-            ("address",c_uint64),
-            ("inline_data",c_uint32 * 52)
+            ("segment_type", c_uint16),
+            ("seq_num", c_uint8),
+            ("vhca_id_valid", c_uint8),
+            ("inline_dump", c_uint8),
+            ("more_dump", c_uint8),
+            ("vhca_id", c_uint16),
+            ("index_1", c_uint32),
+            ("index_2", c_uint32),
+            ("num_of_obj_2", c_uint16),
+            ("num_of_obj_1", c_uint16),
+            ("device_opaque", c_uint64),
+            ("mkey", c_uint32),
+            ("size", c_uint32),
+            ("address", c_uint64),
+            ("inline_data", c_uint32 * 52)
         ]
 
-
     class DIAGNOSTIC_CNTR_ST(Structure):
         _fields_ = [
-            ("counter_id",c_uint16),
-            ("sync",c_uint8)
+            ("counter_id", c_uint16),
+            ("sync", c_uint8)
         ]
 
-
     class DIAGNOSTIC_CNTR_ST_ARR(Array):
         _type_ = DIAGNOSTIC_CNTR_ST
         _length_ = 10
 
-
     class DEBUG_CUP_ST(Structure):
         _fields_ = [
-            ("log_max_samples",c_uint8),
-            ("resource_dump",c_uint8),
-            ("log_cr_dump_to_mem_size",c_uint8),
-            ("core_dump_qp",c_uint8),
-            ("core_dump_general",c_uint8),
-            ("log_min_sample_period",c_uint8),
-            ("diag_counter_tracer_dump",c_uint8),
-            ("health_mon_rx_activity",c_uint8),
-            ("repetitive",c_uint8),
-            ("single",c_uint8),
-            #("diagnostic_counter",POINTER(DIAGNOSTIC_CNTR_ST))
-            ("diagnostic_counter",POINTER(DIAGNOSTIC_CNTR_ST_ARR))
+            ("log_max_samples", c_uint8),
+            ("resource_dump", c_uint8),
+            ("log_cr_dump_to_mem_size", c_uint8),
+            ("core_dump_qp", c_uint8),
+            ("core_dump_general", c_uint8),
+            ("log_min_sample_period", c_uint8),
+            ("diag_counter_tracer_dump", c_uint8),
+            ("health_mon_rx_activity", c_uint8),
+            ("repetitive", c_uint8),
+            ("single", c_uint8),
+            # ("diagnostic_counter",POINTER(DIAGNOSTIC_CNTR_ST))
+            ("diagnostic_counter", POINTER(DIAGNOSTIC_CNTR_ST_ARR))
         ]
 
-
     class PCNR_ST(Structure):
         _fields_ = [
-            ("tuning_override",c_uint8),
-            ("local_port",c_uint8)
+            ("tuning_override", c_uint8),
+            ("local_port", c_uint8)
         ]
 
     class MFRL_ST(Structure):
@@ -151,10 +151,9 @@ class MPCIR_ST(Structure):
 
     class MCAM_REG_ST(Structure):
         _fields_ = [("access_reg_group", c_uint8),
-                     ("feature_group", c_uint8),
-                     ("mng_access_reg_cap_mask", c_uint8 * 16),
-                     ("mng_feature_cap_mask", c_uint8 * 16)]
-
+                    ("feature_group", c_uint8),
+                    ("mng_access_reg_cap_mask", c_uint8 * 16),
+                    ("mng_feature_cap_mask", c_uint8 * 16)]
 
     class MTRC_CAP_REG_ST(Structure):
         _fields_ = [("num_string_db", c_uint8),
@@ -166,16 +165,15 @@ class MTRC_CAP_REG_ST(Structure):
                     ("log_max_trace_buffer_size", c_uint8),
                     ("reg_access_hca_string_db_parameters", c_uint8 * 64)]
 
-
     class MGIR_ST(Structure):
         _fields_ = [("device_id", c_uint16),
                     ("device_hw_revision", c_uint16),
                     ("pvs", c_uint8),
                     ("technology", c_uint8),
-                    ("num_ports",c_uint8),
+                    ("num_ports", c_uint8),
                     ("hw_dev_id", c_uint16),
                     ("manufacturing_base_mac_47_32", c_uint16),
-                    ("module_base",c_uint8),
+                    ("module_base", c_uint8),
                     ("manufacturing_base_mac_31_0", c_uint32),
                     ("associated_module_id_31_0", c_uint32),
                     ("uptime", c_uint32),
@@ -288,11 +286,8 @@ def __del__(self):
             if self._mstDev:
                 self.close()
 
-
-
-
         def sendMtrcCapTakeOwnership(self):
-            
+
             mcamRegP = pointer(MCAM_REG_ST())
             rc = self._reg_access_mcam(self._mstDev.mf, c_uint(REG_ACCESS_METHOD_GET), mcamRegP)
             if rc:
@@ -320,7 +315,6 @@ def sendMtrcCapTakeOwnership(self):
                     return 0
                 iter += 1
 
-
         def sendResDump(self, segment_type, seq_num, inline_mode, more_dump, vhca_id, vhca_id_valid, index1, index2, num_of_obj2, num_of_obj1, device_opaque, mkey, size, address):
             resDumpRegP = pointer(RES_DUMP_ST())
             resDumpRegP.contents.segment_type = c_uint16(segment_type)
@@ -340,7 +334,7 @@ def sendResDump(self, segment_type, seq_num, inline_mode, more_dump, vhca_id, vh
             rc = self._reg_access_res_dump(self._mstDev.mf, c_uint(REG_ACCESS_METHOD_GET), resDumpRegP)
             if rc:
                 raise RegAccException("Failed to send Register RESOURCE DUMP with rc: %d" % rc)
-            #return (resDumpRegP.contents.segment_type, resDumpRegP.contents.seq_num, resDumpRegP.contents.inline_data[0])
+            # return (resDumpRegP.contents.segment_type, resDumpRegP.contents.seq_num, resDumpRegP.contents.inline_data[0])
             return ({"segment_type": resDumpRegP.contents.segment_type,
                      "seq_num": resDumpRegP.contents.seq_num,
                      "inline_dump": resDumpRegP.contents.inline_dump,
@@ -357,7 +351,6 @@ def sendResDump(self, segment_type, seq_num, inline_mode, more_dump, vhca_id, vh
                      "address": resDumpRegP.contents.address,
                      "inline_data": resDumpRegP.contents.inline_data})
 
-
         def sendDebugCap(self):
             debugCapRegP = pointer(DEBUG_CUP_ST())
             debugCapRegP.contents.log_max_samples = c_uint8(0)
@@ -379,8 +372,7 @@ def sendDebugCap(self):
                 raise RegAccException("Failed to send Register DEBUG CAP with rc: %d" % rc)
             return debugCapRegP.contents.resource_dump
 
-
-        def sendPcnr(self, tuning_override, local_port): # Requirments : new FW version + burn with allow_pcnr
+        def sendPcnr(self, tuning_override, local_port):  # Requirments : new FW version + burn with allow_pcnr
 
             pcnrRegisterP = pointer(PCNR_ST())
             pcnrRegisterP.contents.tuning_override = c_uint8(tuning_override)
@@ -390,9 +382,8 @@ def sendPcnr(self, tuning_override, local_port): # Requirments : new FW version
             if rc:
                 raise RegAccException("Failed to send Register PCNR: %s (%d)" % (self._err2str(rc), rc))
 
-
         def sendMpcir(self, command):
-            
+
             # 2 operations (both executed with 'set' register):
             #   (1) Start perperations for FW upgrade
             #   (2) Query operation #1 (idle/done)
@@ -413,12 +404,11 @@ def sendMpcir(self, command):
             if command == CMD_GET_STATUS:
                 return mpcirRegisterP.contents.ports_stat
 
-
         ##########################
         def sendMFRL(self, method, resetLevel=None, reset_type=None, reset_sync=None):
 
             mfrlRegisterP = pointer(MFRL_ST())
-            
+
             if method == REG_ACCESS_METHOD_SET:
                 if resetLevel is None or reset_type is None or reset_sync is None:
                     raise RegAccException("Failed to sendMFRL (reset level/type/sync is None for SET command)")
@@ -444,24 +434,23 @@ def to_bits(list_of_bytes):
                 list_of_bits = []
                 for byte_ in list_of_bytes:
                     # print("{0:08b}".format(byte_))
-                    for ii in range(7,-1,-1):
-                        val = 0 if byte_ & (1<<ii) == 0 else 1
+                    for ii in range(7, -1, -1):
+                        val = 0 if byte_ & (1 << ii) == 0 else 1
                         list_of_bits.append(val)
                 return list_of_bits[::-1]
 
             mcamRegP = pointer(MCAM_REG_ST())
-            rc = self._reg_access_mcam(self._mstDev.mf, c_uint(REG_ACCESS_METHOD_GET), mcamRegP)            
+            rc = self._reg_access_mcam(self._mstDev.mf, c_uint(REG_ACCESS_METHOD_GET), mcamRegP)
             if rc:
                 raise RegAccException("Failed to send Register MCAM (rc: {0})".format(rc))
-            
+
             return {
-                "access_reg_group" :mcamRegP.contents.access_reg_group,
-                "feature_group":mcamRegP.contents.feature_group,
+                "access_reg_group": mcamRegP.contents.access_reg_group,
+                "feature_group": mcamRegP.contents.feature_group,
                 "mng_access_reg_cap_mask": to_bits(mcamRegP.contents.mng_access_reg_cap_mask),
                 "mng_feature_cap_mask": to_bits(mcamRegP.contents.mng_feature_cap_mask)
             }
 
-
         ##########################
         def getFwVersion(self):
 
@@ -497,7 +486,6 @@ def getFWUptime(self):
 
             return mgirRegisterP.contents.uptime
 
-
         def getManufacturingBaseMac(self):
 
             mgirRegisterP = pointer(MGIR_ST())
@@ -507,11 +495,10 @@ def getManufacturingBaseMac(self):
             if rc:
                 raise RegAccException("Failed to send Register MGIR (case 2): %s (%d)" % (self._err2str(rc), rc))
 
-
             lsp = mgirRegisterP.contents.manufacturing_base_mac_31_0
             msp = mgirRegisterP.contents.manufacturing_base_mac_47_32
 
-            return msp*(2**32)+lsp
+            return msp * (2**32) + lsp
 
         def getSecureFWStatus(self):
             """ Returns True if the FW is secured, False otherwise.
@@ -562,7 +549,7 @@ def sendMddq(self, query_type, request_message_sequence, slot_index, query_index
                      "request_message_sequence": mddqRegisterP.contents.request_message_sequence,
                      "response_message_sequence": mddqRegisterP.contents.response_message_sequence,
                      "data_valid": mddqRegisterP.contents.data_valid},
-                     data)
+                    data)
 
 else:
     raise RegAccException("Failed to load rreg_access.so/libreg_access.dll")
diff --git a/resourcedump/__init__.py b/resourcedump/__init__.py
index be84d755..87004f02 100755
--- a/resourcedump/__init__.py
+++ b/resourcedump/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourcedump/commands/CommandFactory.py b/resourcedump/commands/CommandFactory.py
index b8761c75..aa622cd8 100755
--- a/resourcedump/commands/CommandFactory.py
+++ b/resourcedump/commands/CommandFactory.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # CommandFactory.py
 # Python implementation of the Class CommandFactory
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:00 AM
 # Original author: talve
-# 
+#
 #######################################################
 
 
@@ -60,4 +60,3 @@ def create(cls, command_type, **kwargs):
         if command_type not in cls.commands:
             raise Exception("command type:{0} is not supported".format(command_type))
         return cls.commands[command_type](**kwargs)
-
diff --git a/resourcedump/commands/DumpCommand.py b/resourcedump/commands/DumpCommand.py
index a01c8179..1d5254bd 100755
--- a/resourcedump/commands/DumpCommand.py
+++ b/resourcedump/commands/DumpCommand.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # DumpCommand.py
 # Python implementation of the Class DumpCommand
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:00 AM
 # Original author: talve
-# 
+#
 #######################################################
 from commands.ResDumpCommand import ResDumpCommand
 from commands.CommandFactory import CommandFactory
diff --git a/resourcedump/commands/QueryCommand.py b/resourcedump/commands/QueryCommand.py
index bb77c021..c2fc6884 100755
--- a/resourcedump/commands/QueryCommand.py
+++ b/resourcedump/commands/QueryCommand.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/commands/ResDumpCommand.py b/resourcedump/commands/ResDumpCommand.py
index 66bde9af..ed7d4bf1 100755
--- a/resourcedump/commands/ResDumpCommand.py
+++ b/resourcedump/commands/ResDumpCommand.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # ResDumpCommand.py
 # Python implementation of the Class ResDumpCommand
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:58 AM
 # Original author: talve
-# 
+#
 #######################################################
 from abc import ABC, abstractmethod
 
diff --git a/resourcedump/commands/__init__.py b/resourcedump/commands/__init__.py
index 16df8850..206aa266 100755
--- a/resourcedump/commands/__init__.py
+++ b/resourcedump/commands/__init__.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 from commands import QueryCommand, DumpCommand
diff --git a/resourcedump/fetchers/CapabilityFetcher.py b/resourcedump/fetchers/CapabilityFetcher.py
index 57a8576d..b820e274 100755
--- a/resourcedump/fetchers/CapabilityFetcher.py
+++ b/resourcedump/fetchers/CapabilityFetcher.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # CapabilityFetcher.py
 # Python implementation of the Class CapabilityFetcher
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:01 AM
 # Original author: talve
-# 
+#
 #######################################################
 
 
diff --git a/resourcedump/fetchers/ResourceDumpFetcher.py b/resourcedump/fetchers/ResourceDumpFetcher.py
index d34a0107..616f6ecb 100755
--- a/resourcedump/fetchers/ResourceDumpFetcher.py
+++ b/resourcedump/fetchers/ResourceDumpFetcher.py
@@ -1,38 +1,38 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # ResourceDumpFetcher.py
 # Python implementation of the Class CoreDumpFetcher
 # Generated by Enterprise Architect
@@ -88,10 +88,10 @@ class SwMkc(Packet):
             BitField('crossed_side_mkey', 0, 1),    # crossed side mkey. Valid if alter_pd_to_vhca_id==1
             BitField('reserved3', 0, 5),
             BitField('relaxed_ordering_write', 0, 1),    # If set
-                                                    # ,
-                                                    # issue PCIe cycle with "relaxed ordering" attribute (allows
-                                                    # write after write bypassing) for writes.
-                                                    # Supported only when HCA_CAP.relaxed_oredering_write==1.
+            # ,
+            # issue PCIe cycle with "relaxed ordering" attribute (allows
+            # write after write bypassing) for writes.
+            # Supported only when HCA_CAP.relaxed_oredering_write==1.
             BitField('reserved4', 0, 1),
             BitField('small_fence_on_rdma_read_response', 0, 1),    # Responder will have one read request toward the PCIe (per QP).
             BitField('umr_en', 0, 1),               # Enable umr operation on this MKey
@@ -131,12 +131,12 @@ class SwMkc(Packet):
                                                     # Supported only when HCA_CAP.
                                                     # tunneled_atomic==1.
             BitField('ma_translation_mode', 0, 2),    # MA translation mode
-                                                    # 0x0: None - no MA translation needed.
-                                                    # 0x1: ATS -
-                                                    # Supported only when HCA_CAP.ats==1, and valid only
-                                                    # when access_mode==PA or MTT.
-                                                    # 0x3: CAPI - valid when access_mode==PA. Then a CAPI translation
-                                                    # can be performed.
+            # 0x0: None - no MA translation needed.
+            # 0x1: ATS -
+            # Supported only when HCA_CAP.ats==1, and valid only
+            # when access_mode==PA or MTT.
+            # 0x3: CAPI - valid when access_mode==PA. Then a CAPI translation
+            # can be performed.
             BitField('reserved6', 0, 4),
             BitField('qpn', 0, 24),                 # For type 2 memory window - indicates the QP number this memory
                                                     # window is attached to.
@@ -153,11 +153,11 @@ class SwMkc(Packet):
             BitField('sync_umr', 0, 1),             # Memory region to be used by synchronous UMR process
             BitField('reserved8', 0, 2),
             BitField('expected_sigerr_count', 0, 1),    # LSB of expected number of sigerr_cqes. (See
-                                                    # Section 17.4.1, "
-                                                    # Signa
-                                                    # ture Handover Steps
-                                                    # ," on page 696
-                                                    # )
+            # Section 17.4.1, "
+            # Signa
+            # ture Handover Steps
+            # ," on page 696
+            # )
             BitField('reserved9', 0, 1),
             BitField('en_rinval', 0, 1),            # Enable remote invalidation
             BitField('pd', 0, 24),                  # Protection domain. Valid if alter_pd_to_vhca_id==0
@@ -175,15 +175,15 @@ class SwMkc(Packet):
             ShortField('crossing_target_vhca_id', 0),    # crossing/crossed VHCA ID. Valid if access_mode==INTER_GVMI (crossing) or alter_pd_to_vhca_id==1 (crossed)
             ShortField('reserved11', 0),
             IntField('translations_octword_size', 0),    # Size (in units of 16B) required for this MKey's physical buffer list or
-                                                    # SGEs
-                                                    # access_mode: MTT - each translation is 8B
-                                                    # access_mode: KLM
-                                                    # /Fixed
-                                                    #
-                                                    # Buffer Size
-                                                    # - each SGE is 16B
-                                                    # access_mode: PA - reserved
-                                                    # Must be a multiple of 4
+            # SGEs
+            # access_mode: MTT - each translation is 8B
+            # access_mode: KLM
+            # /Fixed
+            #
+            # Buffer Size
+            # - each SGE is 16B
+            # access_mode: PA - reserved
+            # Must be a multiple of 4
             BitField('reserved12', 0, 25),
             BitField('relaxed_ordering_read', 0, 1),    # Supported only when .relaxed_oredering_read==1.
             BitField('reserved13', 0, 1),
@@ -198,7 +198,6 @@ class SwMkc(Packet):
             BitField('reserved15', 0, 27),
         ]
 
-
     class CreateMkeyIn(Packet):
         fields_desc = [
             ShortField('opcode', MLX5_CMD_OP_CREATE_MKEY),
@@ -251,11 +250,11 @@ class CreateMkeyIn(Packet):
                                                     # should be 0x0).
             LongField('e_bsf_pointer', 0),
             IntField('translations_octword_actual_size', 0),    # Actual number of octwords that contain translation
-                                                    # entries. Can be 0 if no KLMs/MTTs are delivered.
+            # entries. Can be 0 if no KLMs/MTTs are delivered.
             IntField('mkey_umem_id', 0),
             LongField('mkey_umem_offset', 0),
             IntField('bsf_octword_actual_size', 0),    # Actual number of octwords that contain translation
-                                                    # entries. Can be 0 if no KLMs/MTTs are delivered.
+            # entries. Can be 0 if no KLMs/MTTs are delivered.
             StrFixedLenField('reserved4', None, length=156),
             FieldListField('klm_pas_mtt', [0 for x in range(0)], IntField('', 0), count_from=lambda pkt:0),    # Translation entries and BSFs.
         ]
@@ -370,18 +369,17 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
         buf_size = 0
         address = 0
 
-        if kwargs["vHCAid"] == None:
+        if kwargs["vHCAid"] is None:
             vhca_id = 0
         else:
             vhca_id = int(kwargs["vHCAid"])
             vhca_id_valid = 1
 
-
-        if kwargs["mem"] != None:
+        if kwargs["mem"] is not None:
             try:
                 self._create_mr_devx(kwargs["mem"], cs.MKEY_BUF_SIZE)
             except Exception as _:
-                if SCAPY_SUPPORT == False:
+                if not SCAPY_SUPPORT:
                     raise Exception("Missing 'scapy' package, please install scapy")
                 elif PYVERVBS_SUPPORT == False:
                     raise Exception("Missing 'pyverbs' package, please install pyverbs")
@@ -419,15 +417,15 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
             device_opaque = results["device_opaque"]
             size = int(math.ceil(results["size"] / 4))
 
-            if kwargs["mem"] != None:
+            if kwargs["mem"] is not None:
                 # Read all dwords and change endianness
                 my_data = []
                 for i in range(size):
-                    my_data.append(struct.unpack("<I", struct.pack(">I",  read32(self.umem.umem_addr, i)))[0])
+                    my_data.append(struct.unpack("<I", struct.pack(">I", read32(self.umem.umem_addr, i)))[0])
                 inline_data.extend(my_data)
             else:
                 inline_data.extend(results["inline_data"][:size])
-            
+
             if not self._validate_sequence_number(seg_number):
                 raise Exception("E - wrong sequence number while calling resource dump register with seq num = {0}"
                                 .format(seg_number))
@@ -437,9 +435,9 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
 
             if more_dump == 0:
                 call_res_dump = False
-            
+
         # Release the resorces if use mem mode
-        if kwargs["mem"] != None:
+        if kwargs["mem"] is not None:
             self.mkey_obj.close()
             self.umem.close()
 
@@ -447,8 +445,8 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
 
     try:
         def _create_umem(self, ctx, size,
-                    access=e.IBV_ACCESS_LOCAL_WRITE,
-                    alignment=resource.getpagesize()):
+                         access=e.IBV_ACCESS_LOCAL_WRITE,
+                         alignment=resource.getpagesize()):
             return Mlx5UMEM(ctx, size=size, alignment=alignment, access=access)
 
         def _create_mr_devx(self, rdma_device, buf_size):
@@ -468,5 +466,5 @@ def _create_mr_devx(self, rdma_device, buf_size):
 
             mkey_index = mkey_out.mkey_index
             self.lkey = mkey_index << 8
-    except Exception as _ :
+    except Exception as _:
         pass
diff --git a/resourcedump/fetchers/__init__.py b/resourcedump/fetchers/__init__.py
index be84d755..87004f02 100755
--- a/resourcedump/fetchers/__init__.py
+++ b/resourcedump/fetchers/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourcedump/filters/SegmentsFilter.py b/resourcedump/filters/SegmentsFilter.py
index aa455a6f..d5b554cd 100755
--- a/resourcedump/filters/SegmentsFilter.py
+++ b/resourcedump/filters/SegmentsFilter.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/filters/__init__.py b/resourcedump/filters/__init__.py
index dfa3f21c..87004f02 100755
--- a/resourcedump/filters/__init__.py
+++ b/resourcedump/filters/__init__.py
@@ -1,33 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourcedump/mstresourcedump.py b/resourcedump/mstresourcedump.py
index e0e9ab62..f25ba91d 100755
--- a/resourcedump/mstresourcedump.py
+++ b/resourcedump/mstresourcedump.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # MlxResDump.py
 # Python implementation of the Class MlxResDump
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:58 AM
 # Original author: talve
-# 
+#
 #######################################################
 import sys
 import os
@@ -178,7 +178,7 @@ def run(self):
         query_parser.add_argument(cs.UI_DASHES + cs.UI_ARG_VHCAID.replace("_", "-"),
                                   help='The virtual HCA (host channel adapter, NIC) ID')
         query_parser.add_argument(cs.UI_DASHES + cs.UI_ARG_MEM.replace("_", "-"), default=None,
-                                 help='Perform the dump through memory (ofed with rdma-core dependency). accepts: [rdma device (for example "mlx5_4")]')
+                                  help='Perform the dump through memory (ofed with rdma-core dependency). accepts: [rdma device (for example "mlx5_4")]')
 
         # required arguments by query sub parser
         query_required_args = query_parser.add_argument_group('required arguments')
@@ -189,7 +189,7 @@ def run(self):
         #     'dump -d test --source test2 --vHCAid 15 --index 1 --index2 2 --numOfObj1 10 --numOfObj2 20
         #           --depth inf --bin tt.txt'.split())
         arguments = parser.parse_args()
-        
+
         if len(sys.argv) < 2:
             parser.print_usage()
             sys.exit(1)
diff --git a/resourcedump/resource_data/DataPrinter.py b/resourcedump/resource_data/DataPrinter.py
index 0d570874..9259f0cd 100755
--- a/resourcedump/resource_data/DataPrinter.py
+++ b/resourcedump/resource_data/DataPrinter.py
@@ -1,48 +1,49 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # DataPrinter.py
 # Python implementation of the Class DataPrinter
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:04 AM
 # Original author: talve
-# 
+#
 #######################################################
 
 from __future__ import print_function
 
+
 class DataPrinter:
     """this class is responsible for print the given segments to the right output.
     """
@@ -71,7 +72,7 @@ def print_dump_data(cls, data, file):
                     rows = 0
                     print("-" * 43)
                     print("Segment Type: {}".format(seg.get_type()))
-                    print("Segment Size: {} Bytes".format(len(seg.get_data())*4))
+                    print("Segment Size: {} Bytes".format(len(seg.get_data()) * 4))
                     print("Segment Data:")
                     for dw in seg.get_data():
                         print('0x{0:0{1}X} '.format(dw, 8), end="")
@@ -92,5 +93,3 @@ def _write_to_file(cls, data, path):
                     binary_file.write(four_bytes)
 
         print("write to file: ", path)
-
-
diff --git a/resourcedump/resource_data/DumpData.py b/resourcedump/resource_data/DumpData.py
index 4bf6c83a..c804b5d9 100755
--- a/resourcedump/resource_data/DumpData.py
+++ b/resourcedump/resource_data/DumpData.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # DumpData.py
 # Python implementation of the Class DumpData
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:02 AM
 # Original author: talve
-# 
+#
 #######################################################
 from fetchers.ResourceDumpFetcher import ResourceDumpFetcher
 from resource_data.QueryData import QueryData
@@ -74,4 +74,3 @@ def get_dump(cls, **kwargs):
             raise Exception("not supported or missing argument")
 
         return dump_segments
-
diff --git a/resourcedump/resource_data/QueryData.py b/resourcedump/resource_data/QueryData.py
index a82b79ea..f067409e 100755
--- a/resourcedump/resource_data/QueryData.py
+++ b/resourcedump/resource_data/QueryData.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # QueryData.py
 # Python implementation of the Class QueryData
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:02 AM
 # Original author: talve
-# 
+#
 #######################################################
 from fetchers.ResourceDumpFetcher import ResourceDumpFetcher
 from filters.SegmentsFilter import SegmentsFilter
@@ -50,13 +50,13 @@ class QueryData:
     """
 
     @classmethod
-    def get_query(cls, device_name, vhca_id, mem = None):
+    def get_query(cls, device_name, vhca_id, mem=None):
         """this method is getting the query segments by using the CoreDumpFetcher and
         filter it by removing the none menu segments.
         """
         try:
             query_kwargs = {'segment': constants.RESOURCE_DUMP_SEGMENT_TYPE_MENU,
-                            'vHCAid': vhca_id, 'index1': 0, 'index2': 0, 'numOfObj1': 0, 'numOfObj2': 0, 'depth': 0, 'mem' : mem}
+                            'vHCAid': vhca_id, 'index1': 0, 'index2': 0, 'numOfObj1': 0, 'numOfObj2': 0, 'depth': 0, 'mem': mem}
             query_segments = ResourceDumpFetcher(device_name).fetch_data(**query_kwargs)
             res = SegmentsFilter.get_segments(query_segments, constants.RESOURCE_DUMP_SEGMENT_TYPE_MENU)
             try:
diff --git a/resourcedump/resource_data/__init__.py b/resourcedump/resource_data/__init__.py
index be84d755..87004f02 100755
--- a/resourcedump/resource_data/__init__.py
+++ b/resourcedump/resource_data/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourcedump/segments/CommandSegment.py b/resourcedump/segments/CommandSegment.py
index f59e4fe7..448aa262 100755
--- a/resourcedump/segments/CommandSegment.py
+++ b/resourcedump/segments/CommandSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/segments/ErrorSegment.py b/resourcedump/segments/ErrorSegment.py
index dc610cb0..b37abae2 100755
--- a/resourcedump/segments/ErrorSegment.py
+++ b/resourcedump/segments/ErrorSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/segments/InfoSegment.py b/resourcedump/segments/InfoSegment.py
index bebe8626..7b0484b4 100755
--- a/resourcedump/segments/InfoSegment.py
+++ b/resourcedump/segments/InfoSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/segments/MenuRecord.py b/resourcedump/segments/MenuRecord.py
index e29d2942..ca1e1be8 100755
--- a/resourcedump/segments/MenuRecord.py
+++ b/resourcedump/segments/MenuRecord.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -112,10 +112,10 @@ def _make_segment_type_line(self):
     def _make_table_header_line():
         """This method creates a string that represent the header in the table"""
         padding = cs.MENU_SEGMENT_TABLE_DUMP_PARAMS_LEN - len(
-                  cs.MENU_SEGMENT_TABLE_DUMP_PARAMS) + cs.MENU_SEGMENT_TABLE_GAP
+            cs.MENU_SEGMENT_TABLE_DUMP_PARAMS) + cs.MENU_SEGMENT_TABLE_GAP
         line = cs.MENU_SEGMENT_TABLE_DUMP_PARAMS + " " * padding
         padding = cs.MENU_SEGMENT_TABLE_APPLICABILITY_LEN - len(
-                  cs.MENU_SEGMENT_TABLE_APPLICABILITY) + cs.MENU_SEGMENT_TABLE_GAP
+            cs.MENU_SEGMENT_TABLE_APPLICABILITY) + cs.MENU_SEGMENT_TABLE_GAP
         line += cs.MENU_SEGMENT_TABLE_APPLICABILITY + " " * padding
         padding = cs.MENU_SEGMENT_TABLE_SPECIAL_VALUES_LEN - len(cs.MENU_SEGMENT_TABLE_SPECIAL_VALUES)
         line += cs.MENU_SEGMENT_TABLE_SPECIAL_VALUES + " " * padding
diff --git a/resourcedump/segments/MenuSegment.py b/resourcedump/segments/MenuSegment.py
index db55ad2d..a25fa5c5 100755
--- a/resourcedump/segments/MenuSegment.py
+++ b/resourcedump/segments/MenuSegment.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # MenuSegment.py
 # Python implementation of the Class MenuSegment
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:57 AM
 # Original author: talve
-# 
+#
 #######################################################
 from segments.Segment import Segment
 from segments.MenuRecord import MenuRecord
@@ -130,11 +130,11 @@ def is_supported(self, **kwargs):
                 raise DumpNotSupported(
                     "Dump type: {0} must have index2 attribute, and it wasn't provided".format(dump_type))
 
-            if index1 != None and not match_rec.supports_index1:
+            if index1 is not None and not match_rec.supports_index1:
                 raise DumpNotSupported(
                     "Dump type: {0} does not support index1 attribute, and it was provided".format(dump_type))
 
-            if index2 != None and not match_rec.supports_index2:
+            if index2 is not None and not match_rec.supports_index2:
                 raise DumpNotSupported(
                     "Dump type: {0} does not support index2 attribute, and it was provided".format(dump_type))
 
@@ -146,11 +146,11 @@ def is_supported(self, **kwargs):
                 raise DumpNotSupported(
                     "Dump type: {0} must have numOfObj2 attribute, and it wasn't provided".format(dump_type))
 
-            if num_of_objs_1 != None and not match_rec.supports_num_of_obj1:
+            if num_of_objs_1 is not None and not match_rec.supports_num_of_obj1:
                 raise DumpNotSupported(
                     "Dump type: {0} does not support numOfObj1 attribute, and it was provided".format(dump_type))
 
-            if num_of_objs_2 != None and not match_rec.supports_num_of_obj2:
+            if num_of_objs_2 is not None and not match_rec.supports_num_of_obj2:
                 raise DumpNotSupported(
                     "Dump type: {0} does not support numOfObj2 attribute, and it was provided".format(dump_type))
 
diff --git a/resourcedump/segments/NoticeSegment.py b/resourcedump/segments/NoticeSegment.py
index 123a781f..24aa76fa 100755
--- a/resourcedump/segments/NoticeSegment.py
+++ b/resourcedump/segments/NoticeSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/segments/RefSegment.py b/resourcedump/segments/RefSegment.py
index 959d1104..9ccaa400 100755
--- a/resourcedump/segments/RefSegment.py
+++ b/resourcedump/segments/RefSegment.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # RefSegment.py
 # Python implementation of the Class RefSegment
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:58 AM
 # Original author: talve
-# 
+#
 #######################################################
 from segments.Segment import Segment
 from segments.SegmentFactory import SegmentFactory
diff --git a/resourcedump/segments/ResourceSegment.py b/resourcedump/segments/ResourceSegment.py
index 71293866..54b5e80b 100755
--- a/resourcedump/segments/ResourceSegment.py
+++ b/resourcedump/segments/ResourceSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/segments/Segment.py b/resourcedump/segments/Segment.py
index c5799a04..bfaf05e0 100755
--- a/resourcedump/segments/Segment.py
+++ b/resourcedump/segments/Segment.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # Segment.py
 # Python implementation of the Class Segment
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:57 AM
 # Original author: talve
-# 
+#
 #######################################################
 from abc import ABC, abstractmethod
 
diff --git a/resourcedump/segments/SegmentCreator.py b/resourcedump/segments/SegmentCreator.py
index 7d10d979..6b7f5775 100755
--- a/resourcedump/segments/SegmentCreator.py
+++ b/resourcedump/segments/SegmentCreator.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # SegmentCreator.py
 # Python implementation of the Class SegmentCreator
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:03 AM
 # Original author: talve
-# 
+#
 #######################################################
 from segments.SegmentFactory import SegmentFactory
 from utils import constants as cs
diff --git a/resourcedump/segments/SegmentFactory.py b/resourcedump/segments/SegmentFactory.py
index e06436ab..b4a75da6 100755
--- a/resourcedump/segments/SegmentFactory.py
+++ b/resourcedump/segments/SegmentFactory.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # SegmentFactory.py
 # Python implementation of the Class SegmentFactory
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:59 AM
 # Original author: talve
-# 
+#
 #######################################################
 
 
diff --git a/resourcedump/segments/TerminateSegment.py b/resourcedump/segments/TerminateSegment.py
index 73501c86..28f3aa7f 100755
--- a/resourcedump/segments/TerminateSegment.py
+++ b/resourcedump/segments/TerminateSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/segments/__init__.py b/resourcedump/segments/__init__.py
index 195e1b5e..031179e7 100755
--- a/resourcedump/segments/__init__.py
+++ b/resourcedump/segments/__init__.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 from segments import MenuSegment, RefSegment, NoticeSegment, ResourceSegment, TerminateSegment, ErrorSegment, InfoSegment, CommandSegment
diff --git a/resourcedump/utils/Exceptions.py b/resourcedump/utils/Exceptions.py
index d623ec93..2ed378e7 100755
--- a/resourcedump/utils/Exceptions.py
+++ b/resourcedump/utils/Exceptions.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourcedump/utils/__init__.py b/resourcedump/utils/__init__.py
index 36e2bdcd..26bcf423 100755
--- a/resourcedump/utils/__init__.py
+++ b/resourcedump/utils/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
+# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourcedump/utils/constants.py b/resourcedump/utils/constants.py
index f8102689..9fdf25bd 100755
--- a/resourcedump/utils/constants.py
+++ b/resourcedump/utils/constants.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -117,4 +117,4 @@
 MENU_SEGMENT_TABLE_AND = ","
 MENU_SEGMENT_TABLE_WRAP = "_"
 
-MKEY_BUF_SIZE = 262144 # 2^18 bytes
+MKEY_BUF_SIZE = 262144  # 2^18 bytes
diff --git a/resourcedump/validation/ArgToMenuVerifier.py b/resourcedump/validation/ArgToMenuVerifier.py
index 49f4b76e..39aa9c09 100755
--- a/resourcedump/validation/ArgToMenuVerifier.py
+++ b/resourcedump/validation/ArgToMenuVerifier.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # ArgToMenuVerifier.py
 # Python implementation of the Class ArgToMenuVerifier
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:03 AM
 # Original author: talve
-# 
+#
 #######################################################
 
 
diff --git a/resourcedump/validation/CapabilityValidator.py b/resourcedump/validation/CapabilityValidator.py
index e00fe1df..94b3b01c 100755
--- a/resourcedump/validation/CapabilityValidator.py
+++ b/resourcedump/validation/CapabilityValidator.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # CapabilityValidator.py
 # Python implementation of the Class CapabilityValidator
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:01 AM
 # Original author: talve
-# 
+#
 #######################################################
 from fetchers.CapabilityFetcher import CapabilityFetcher
 
diff --git a/resourcedump/validation/__init__.py b/resourcedump/validation/__init__.py
index be84d755..87004f02 100755
--- a/resourcedump/validation/__init__.py
+++ b/resourcedump/validation/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourceparse/__init__.py b/resourceparse/__init__.py
index be84d755..87004f02 100755
--- a/resourceparse/__init__.py
+++ b/resourceparse/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourceparse/mstresourceparse.py b/resourceparse/mstresourceparse.py
index f6b67b9e..d879dcf5 100755
--- a/resourceparse/mstresourceparse.py
+++ b/resourceparse/mstresourceparse.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # resourceparse.py
 # Python implementation of the Class ResourceParse
 # Generated by Enterprise Architect
 # Created on:      16-Dec-2019 14:11:58 AM
 # Original author: talve
-# 
+#
 #######################################################
 import sys
 import os
diff --git a/resourceparse/parsers/AdbParser.py b/resourceparse/parsers/AdbParser.py
index 440c63eb..b3dc611a 100755
--- a/resourceparse/parsers/AdbParser.py
+++ b/resourceparse/parsers/AdbParser.py
@@ -1,43 +1,43 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # AdbParser.py
 # Python implementation of the Class AdbParser
 # Created on:      23-Mar-2020 8:00:00 AM
 # Original author: talve
-# 
+#
 #######################################################
 import xml.etree.ElementTree as ET
 
@@ -218,7 +218,6 @@ def _extract_array_to_list(self, index, item, subitems_list):
         calculated_size = int(size / (end_index - start_index))
         current_offset = offset
 
-
         for i in range(start_index, end_index):
             adb_layout_item = AdbLayoutItem()
             adb_layout_item.nodeDesc = self._node_to_node_desc(item)
@@ -239,8 +238,8 @@ def _node_to_AdbLayoutItem(self, node):
         """This method build adb layout field from a given node.
         """
         adb_layout_item = AdbLayoutItem()
-        #adb_layout_item.fieldDesc = None  # Reference to "AdbFieldDesc" object, always != None
-        #adb_layout_item.parent = None  # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
+        # adb_layout_item.fieldDesc = None  # Reference to "AdbFieldDesc" object, always != None
+        # adb_layout_item.parent = None  # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
         adb_layout_item.name = node.attrib["name"]
         adb_layout_item.nodeDesc = self._node_to_node_desc(node)  # For leafs must be None
         if "subnode" in node.attrib:
@@ -257,7 +256,7 @@ def _node_to_AdbLayoutItem(self, node):
         adb_layout_item.size = self._parse_node_size(node.attrib["size"])
         adb_layout_item.attrs = {}  # Attributes after evaluations and array expanding
         adb_layout_item.arrayIdx = -1  # in case of being part of an array this will hold the array index, -1 means not part of array
-        #adb_layout_item.vars = {}  # all variable relevant to this item after evaluation
+        # adb_layout_item.vars = {}  # all variable relevant to this item after evaluation
         return adb_layout_item
 
     def _node_to_node_desc(self, node):
@@ -265,12 +264,12 @@ def _node_to_node_desc(self, node):
         """
         node_description = AdbNodeDesc()
         #node_description.name = ""
-        #node_description.size = 0  # Size in bits
+        # node_description.size = 0  # Size in bits
         if "attr_is_union" in node.attrib:
             node_description.isUnion = self._parse_union(node.attrib["attr_is_union"])
         #node_description.desc = ""
-        #node_description.fields = []  # List of "AdbFieldDesc" objects
-        #node_description.attrs = {}  # Dictionary of attributes: key, value
+        # node_description.fields = []  # List of "AdbFieldDesc" objects
+        # node_description.attrs = {}  # Dictionary of attributes: key, value
         # defined in
         #node_description.fileName = ""
         #node_description.lineNumber = -1
@@ -298,7 +297,7 @@ def _parse_node_size(self, size_str):
         hex_size = int(size_parts[0], 16) * 8
         bit_size = int(size_parts[1], 10)
 
-        return hex_size+bit_size
+        return hex_size + bit_size
 
 ####################################################################
 
@@ -308,16 +307,16 @@ class AdbLayoutItem(object):
 
     ##########################
     def __init__(self):
-        self.fieldDesc   = None        # Reference to "AdbFieldDesc" object, always != None
-        self.nodeDesc    = None        # For leafs must be None
-        self.parent      = None        # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
-        self.name        = ""          # The instance name
-        self.subItems    = []          # List of the child items (for nodes only)
-        self.offset      = 0           # Global offset (relative to the 0 address)
-        self.size        = 0           # Element size in bits
-        self.attrs       = {}          # Attributes after evaluations and array expanding
-        self.arrayIdx    = -1          # in case of being part of an array this will hold the array index, -1 means not part of array
-        self.vars        = {}          # all variable relevant to this item after evaluation
+        self.fieldDesc = None        # Reference to "AdbFieldDesc" object, always != None
+        self.nodeDesc = None        # For leafs must be None
+        self.parent = None        # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
+        self.name = ""          # The instance name
+        self.subItems = []          # List of the child items (for nodes only)
+        self.offset = 0           # Global offset (relative to the 0 address)
+        self.size = 0           # Element size in bits
+        self.attrs = {}          # Attributes after evaluations and array expanding
+        self.arrayIdx = -1          # in case of being part of an array this will hold the array index, -1 means not part of array
+        self.vars = {}          # all variable relevant to this item after evaluation
 
 
 ####################################################################
@@ -326,18 +325,18 @@ class AdbFieldDesc(object):
 
     ##########################
     def __init__(self):
-        self.name       = ""
-        self.size       = 0                    # Size in bits (the whole array size)
-        self.offset     = None                 # Offset in bits (relative to the node start addr)
-        self.desc       = ""
-        self.lowBound   = 0
-        self.highBound  = 0
+        self.name = ""
+        self.size = 0                    # Size in bits (the whole array size)
+        self.offset = None                 # Offset in bits (relative to the node start addr)
+        self.desc = ""
+        self.lowBound = 0
+        self.highBound = 0
         self.unlimitedArr = False
         self.definedAsArr = False
-        self.subNode    = None                # Subnode name as string
-        self.attrs      = {}                  # Dictionary of attributes: key, value
-        self.reserved   = False
-        self.condition  = ""
+        self.subNode = None                # Subnode name as string
+        self.attrs = {}                  # Dictionary of attributes: key, value
+        self.reserved = False
+        self.condition = ""
 
 
 ####################################################################
@@ -346,12 +345,12 @@ class AdbNodeDesc(object):
 
     ##########################
     def __init__(self):
-        self.name       = ""
-        self.size       = 0                 # Size in bits
-        self.isUnion    = False
-        self.desc       = ""
-        self.fields     = []                # List of "AdbFieldDesc" objects
-        self.attrs      = {}                # Dictionary of attributes: key, value
+        self.name = ""
+        self.size = 0                 # Size in bits
+        self.isUnion = False
+        self.desc = ""
+        self.fields = []                # List of "AdbFieldDesc" objects
+        self.attrs = {}                # Dictionary of attributes: key, value
 
         # defined in
         self.fileName = ""
diff --git a/resourceparse/parsers/Parser.py b/resourceparse/parsers/Parser.py
index 413f1833..a26743ab 100755
--- a/resourceparse/parsers/Parser.py
+++ b/resourceparse/parsers/Parser.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # Parser.py
 # Python implementation of the Class Parser
 # Generated by Enterprise Architect
 # Created on:      19-Dec-2019 3:18:38 PM
 # Original author: talve
-# 
+#
 #######################################################
 import os
 import math
@@ -161,7 +161,7 @@ def _parse_segment(self, seg):
             else:
                 segment_name = "UNKNOWN"
 
-        seg.add_parsed_data(20*" " + "Segment", "{0} ({1})".format(segment_name, seg.get_type()))
+        seg.add_parsed_data(20 * " " + "Segment", "{0} ({1})".format(segment_name, seg.get_type()))
 
         # in case of a resource segment the offset of the adb doesnt consider the header so we need to pass it
         if self._is_resource_segment(seg.get_type()):
@@ -212,7 +212,7 @@ def _build_and_add_raw_data(cls, seg):
             if (dw_counter % cs.PARSER_NUM_OF_DW_IN_ROW) == 0:
                 seg.add_parsed_data("{:<15}".format(
                     "DWORD [{0}-{1}]".format(line_counter * 4, (line_counter * 4) + (len(hex_list) - 1))),
-                                    ''.join(hex_list[:]))
+                    ''.join(hex_list[:]))
                 line_counter += 1
                 hex_list.clear()
 
@@ -287,7 +287,7 @@ def _validate_adb_version_with_notice(self, adb_file_path):
                 self._get_next_notice_counter()
                 self._printer.print_notice_before_parse("Notice - {0}".format(
                     "adb fw version {0} is used for parsing while dump fw version is {1}".format(adb_fw_version,
-                        dump_fw_version)))
+                                                                                                 dump_fw_version)))
         else:
             self._get_next_notice_counter()
             self._printer.print_notice_before_parse(
@@ -307,7 +307,7 @@ def _is_adb_name_in_version_format(cls, adb_name):
         """This method check if the adb file name has the version format define by arch.
         """
         match = re.fullmatch("fw-[0-9]+-rel-[0-9]{2}_[0-9]{2}_[0-9]{4}", adb_name)
-        if match != None:
+        if match is not None:
             if match.string == adb_name:
                 return True
         return False
diff --git a/resourceparse/parsers/__init__.py b/resourceparse/parsers/__init__.py
index be84d755..87004f02 100755
--- a/resourceparse/parsers/__init__.py
+++ b/resourceparse/parsers/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourceparse/resource_data/AdbData.py b/resourceparse/resource_data/AdbData.py
index 46944e76..aa4675dc 100755
--- a/resourceparse/resource_data/AdbData.py
+++ b/resourceparse/resource_data/AdbData.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # AdbData.py
 # Python implementation of the Class AdbData
 # Generated by Enterprise Architect
 # Created on:      19-Dec-2019 3:18:29 PM
 # Original author: talve
-# 
+#
 #######################################################
 
 
@@ -53,4 +53,4 @@ def get_segment_map():
     def validate_adb_version():
         """This method validate the adb version.
         """
-        pass
\ No newline at end of file
+        pass
diff --git a/resourceparse/resource_data/DataPrinter.py b/resourceparse/resource_data/DataPrinter.py
index 3970b373..4b14a4f0 100755
--- a/resourceparse/resource_data/DataPrinter.py
+++ b/resourceparse/resource_data/DataPrinter.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # DataPrinter.py
 # Python implementation of the Class DataPrinter
 # Generated by Enterprise Architect
 # Created on:      19-Dec-2019 3:18:37 PM
 # Original author: talve
-# 
+#
 #######################################################
 from utils import constants as cs
 
diff --git a/resourceparse/resource_data/RawData.py b/resourceparse/resource_data/RawData.py
index e7b7c3bb..99d0b0f6 100755
--- a/resourceparse/resource_data/RawData.py
+++ b/resourceparse/resource_data/RawData.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # RawData.py
 # Python implementation of the Class RawData
 # Generated by Enterprise Architect
 # Created on:      19-Dec-2019 3:18:40 PM
 # Original author: talve
-# 
+#
 #######################################################
 import binascii
 from utils import constants as cs
diff --git a/resourceparse/resource_data/__init__.py b/resourceparse/resource_data/__init__.py
index be84d755..87004f02 100755
--- a/resourceparse/resource_data/__init__.py
+++ b/resourceparse/resource_data/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourceparse/segments/CommandSegment.py b/resourceparse/segments/CommandSegment.py
index 663629ee..ea92eb6e 100755
--- a/resourceparse/segments/CommandSegment.py
+++ b/resourceparse/segments/CommandSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourceparse/segments/ErrorSegment.py b/resourceparse/segments/ErrorSegment.py
index eed7ec0d..a9ae91ef 100755
--- a/resourceparse/segments/ErrorSegment.py
+++ b/resourceparse/segments/ErrorSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourceparse/segments/InfoSegment.py b/resourceparse/segments/InfoSegment.py
index b5c8f4de..fa79de85 100755
--- a/resourceparse/segments/InfoSegment.py
+++ b/resourceparse/segments/InfoSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -71,7 +71,7 @@ def get_version(self):
         #                                                  str(hex(int('{:0b}'.format(dw_data[0]).zfill(32)[16:32], 2))))
         offset = cs.SEGMENTS_HEADER_SIZE_IN_DW
         if len(dw_data) > cs.SEGMENTS_HEADER_SIZE_IN_DW:
-        #     self._parsed_data['Dump version'] = str(int('{:0b}'.format(dw_data[offset]).zfill(32)[24:32], 2))
+            #     self._parsed_data['Dump version'] = str(int('{:0b}'.format(dw_data[offset]).zfill(32)[24:32], 2))
             offset += 1
         #     self._parsed_data['HW version'] = str(int('{:0b}'.format(dw_data[offset]).zfill(32)[0:8], 2)) + "." + str(
         #         int('{:0b}'.format(dw_data[offset]).zfill(32)[8:16], 2)) + "." + str(
@@ -83,7 +83,7 @@ def get_version(self):
         return ""
 
     def add_parsed_data(self, key, value):
-        #if key == "fw_version":
+        # if key == "fw_version":
         #    self._version_str = "{0}.{1}.{2}".format(str(int('{:0b}'.format(int(value, 16)).zfill(32)[0:8], 2)),
         #                                             str(int('{:0b}'.format(int(value, 16)).zfill(32)[8:16], 2)),
         #                                             str(int('{:0b}'.format(int(value, 16)).zfill(32)[16:32], 2)))
diff --git a/resourceparse/segments/MenuRecord.py b/resourceparse/segments/MenuRecord.py
index e29d2942..ca1e1be8 100755
--- a/resourceparse/segments/MenuRecord.py
+++ b/resourceparse/segments/MenuRecord.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -112,10 +112,10 @@ def _make_segment_type_line(self):
     def _make_table_header_line():
         """This method creates a string that represent the header in the table"""
         padding = cs.MENU_SEGMENT_TABLE_DUMP_PARAMS_LEN - len(
-                  cs.MENU_SEGMENT_TABLE_DUMP_PARAMS) + cs.MENU_SEGMENT_TABLE_GAP
+            cs.MENU_SEGMENT_TABLE_DUMP_PARAMS) + cs.MENU_SEGMENT_TABLE_GAP
         line = cs.MENU_SEGMENT_TABLE_DUMP_PARAMS + " " * padding
         padding = cs.MENU_SEGMENT_TABLE_APPLICABILITY_LEN - len(
-                  cs.MENU_SEGMENT_TABLE_APPLICABILITY) + cs.MENU_SEGMENT_TABLE_GAP
+            cs.MENU_SEGMENT_TABLE_APPLICABILITY) + cs.MENU_SEGMENT_TABLE_GAP
         line += cs.MENU_SEGMENT_TABLE_APPLICABILITY + " " * padding
         padding = cs.MENU_SEGMENT_TABLE_SPECIAL_VALUES_LEN - len(cs.MENU_SEGMENT_TABLE_SPECIAL_VALUES)
         line += cs.MENU_SEGMENT_TABLE_SPECIAL_VALUES + " " * padding
diff --git a/resourceparse/segments/MenuSegment.py b/resourceparse/segments/MenuSegment.py
index 07f02aa0..72217991 100755
--- a/resourceparse/segments/MenuSegment.py
+++ b/resourceparse/segments/MenuSegment.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # MenuSegment.py
 # Python implementation of the Class MenuSegment
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:57 AM
 # Original author: talve
-# 
+#
 #######################################################
 from segments.Segment import Segment
 from segments.MenuRecord import MenuRecord
@@ -146,11 +146,11 @@ def is_supported(self, **kwargs):
                 raise DumpNotSupported(
                     "Dump type: {0} must have numOfObj2 attribute, and it wasn't provided".format(dump_type))
 
-            if num_of_objs_1 != None and not match_rec.supports_num_of_obj1:
+            if num_of_objs_1 is not None and not match_rec.supports_num_of_obj1:
                 raise DumpNotSupported(
                     "Dump type: {0} does not support numOfObj1 attribute, and it was provided".format(dump_type))
 
-            if num_of_objs_2 != None and not match_rec.supports_num_of_obj2:
+            if num_of_objs_2 is not None and not match_rec.supports_num_of_obj2:
                 raise DumpNotSupported(
                     "Dump type: {0} does not support numOfObj2 attribute, and it was provided".format(dump_type))
 
diff --git a/resourceparse/segments/NoticeSegment.py b/resourceparse/segments/NoticeSegment.py
index b1fa6f73..fb02176e 100755
--- a/resourceparse/segments/NoticeSegment.py
+++ b/resourceparse/segments/NoticeSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -79,7 +79,7 @@ def get_parsed_data(self):
                 self._parsed_data['notice msg'] = MenuRecord.bin_list_to_ascii(
                     dw_data[cs.ERROR_SEGMENT_NOTICE_MSG_START:
                             cs.ERROR_SEGMENT_NOTICE_MSG_END])
-            except:
+            except BaseException:
                 # in case that the bin is not an ascii we will not display the notice msg
                 pass
 
diff --git a/resourceparse/segments/RefSegment.py b/resourceparse/segments/RefSegment.py
index 9e914ab9..336cddda 100755
--- a/resourceparse/segments/RefSegment.py
+++ b/resourceparse/segments/RefSegment.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # RefSegment.py
 # Python implementation of the Class RefSegment
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:58 AM
 # Original author: talve
-# 
+#
 #######################################################
 from segments.Segment import Segment
 from segments.SegmentFactory import SegmentFactory
diff --git a/resourceparse/segments/ResourceSegment.py b/resourceparse/segments/ResourceSegment.py
index 04d287bf..02d4bc86 100755
--- a/resourceparse/segments/ResourceSegment.py
+++ b/resourceparse/segments/ResourceSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -73,4 +73,5 @@ def get_parsed_data(self):
         """
         return self._parsed_data
 
+
 SegmentFactory.register(constants.RESOURCE_DUMP_SEGMENT_TYPE_RESOURCE, ResourceSegment)
diff --git a/resourceparse/segments/Segment.py b/resourceparse/segments/Segment.py
index 8aac8402..70829f24 100755
--- a/resourceparse/segments/Segment.py
+++ b/resourceparse/segments/Segment.py
@@ -1,48 +1,49 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # Segment.py
 # Python implementation of the Class Segment
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:57 AM
 # Original author: talve
-# 
+#
 #######################################################
 from abc import ABC, abstractmethod
 from collections import OrderedDict
 
+
 class Segment(ABC):
     """this class is responsible for holding segment data according to its type.
     """
diff --git a/resourceparse/segments/SegmentCreator.py b/resourceparse/segments/SegmentCreator.py
index 7d10d979..6b7f5775 100755
--- a/resourceparse/segments/SegmentCreator.py
+++ b/resourceparse/segments/SegmentCreator.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # SegmentCreator.py
 # Python implementation of the Class SegmentCreator
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:12:03 AM
 # Original author: talve
-# 
+#
 #######################################################
 from segments.SegmentFactory import SegmentFactory
 from utils import constants as cs
diff --git a/resourceparse/segments/SegmentFactory.py b/resourceparse/segments/SegmentFactory.py
index e06436ab..b4a75da6 100755
--- a/resourceparse/segments/SegmentFactory.py
+++ b/resourceparse/segments/SegmentFactory.py
@@ -1,44 +1,44 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
-# 
+#
 # SegmentFactory.py
 # Python implementation of the Class SegmentFactory
 # Generated by Enterprise Architect
 # Created on:      14-Aug-2019 10:11:59 AM
 # Original author: talve
-# 
+#
 #######################################################
 
 
diff --git a/resourceparse/segments/TerminateSegment.py b/resourceparse/segments/TerminateSegment.py
index a3e8526b..99a0b2a7 100755
--- a/resourceparse/segments/TerminateSegment.py
+++ b/resourceparse/segments/TerminateSegment.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourceparse/segments/__init__.py b/resourceparse/segments/__init__.py
index 195e1b5e..031179e7 100755
--- a/resourceparse/segments/__init__.py
+++ b/resourceparse/segments/__init__.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 from segments import MenuSegment, RefSegment, NoticeSegment, ResourceSegment, TerminateSegment, ErrorSegment, InfoSegment, CommandSegment
diff --git a/resourceparse/utils/Exceptions.py b/resourceparse/utils/Exceptions.py
index d623ec93..2ed378e7 100755
--- a/resourceparse/utils/Exceptions.py
+++ b/resourceparse/utils/Exceptions.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
diff --git a/resourceparse/utils/__init__.py b/resourceparse/utils/__init__.py
index be84d755..87004f02 100755
--- a/resourceparse/utils/__init__.py
+++ b/resourceparse/utils/__init__.py
@@ -1,34 +1,31 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/resourceparse/utils/constants.py b/resourceparse/utils/constants.py
index 81df2c2d..aaf94428 100755
--- a/resourceparse/utils/constants.py
+++ b/resourceparse/utils/constants.py
@@ -1,34 +1,34 @@
-# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.   
+# Copyright (C) Jan 2020 Mellanox Technologies Ltd. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF        
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-# --                                                                        
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
 
 
 #######################################################
@@ -117,12 +117,12 @@
 RAW_DATA_CHUNK_SIZE_IN_BYTES = 4
 
 SEGMENTS_HEADER_SIZE_IN_DW = 1
-SEGMENTS_HEADER_SIZE_IN_BYTES = 4*SEGMENTS_HEADER_SIZE_IN_DW
+SEGMENTS_HEADER_SIZE_IN_BYTES = 4 * SEGMENTS_HEADER_SIZE_IN_DW
 RESOURCE_SEGMENT_START_OFFSET_IN_DW = 4
 RESOURCE_SEGMENT_START_OFFSET_IN_BYTES = 4 * RESOURCE_SEGMENT_START_OFFSET_IN_DW
 PARSER_NUM_OF_DW_IN_ROW = 4
 PARSER_STRING_NOT_FOUND = -1
 
-DATA_PRINTER_SEPARATOR = 80*"-"
+DATA_PRINTER_SEPARATOR = 80 * "-"
 
 WARNING_SIZE_DOESNT_MATCH = " Segment size({0} DWs) doesn't match the adb segment size({1} DWs)"
diff --git a/small_utils/binary_file.py b/small_utils/binary_file.py
index dfbc4d5a..c4a1a915 100755
--- a/small_utils/binary_file.py
+++ b/small_utils/binary_file.py
@@ -39,7 +39,7 @@ class BinaryFile(object):
     """
     def __init__(self, file_path):
         self._file_path = file_path
-    
+
     def read_byte(self, offset):
         """
         Read 1B from the pci configuration
@@ -85,13 +85,13 @@ def read(self, size, offset=0, skip_offset_list=None):
                     zero_binary = binascii.unhexlify("00")  # Initialization
                     offset_interval = self._get_read_intervals(skip_offset_list, offset, size)
                     for interval_start, interval_size in offset_interval:
-                        if interval_size: # read interval
+                        if interval_size:  # read interval
                             f.seek(interval_start)
                             data += f.read(interval_size)
                         else:  # add '00' to data
                             data += zero_binary
                 else:
-                    f.seek(offset)        
+                    f.seek(offset)
                     data = f.read(size)
         except Exception as err:
             raise RuntimeError("Failed to parse file: {0} for reading. ERROR: {1}".format(self._file_path, err))
@@ -120,7 +120,7 @@ def _get_read_intervals(skip_offset_list, offset, size):
                 skip_offset_list.remove(skip_offset)
         read_interval_set = set(skip_offset_list)
         # Add offset, offset+size to skip_list
-        read_interval_set.add(offset-1)
+        read_interval_set.add(offset - 1)
         read_interval_set.add(offset + size)
 
         read_interval_list = sorted(list(read_interval_set))
@@ -134,7 +134,7 @@ def _get_read_intervals(skip_offset_list, offset, size):
 
         result = result[:-1]                               # remove the last tuple (offset+size, 0)
         return sorted(set(result))
-    
+
     def write(self, bytes_list, size, offset=0):
         """
         A method  to write data to a binary file
@@ -145,16 +145,16 @@ def write(self, bytes_list, size, offset=0):
             data_to_write += "{0:x}".format(byte).zfill(2)
         if len(data_to_write) > size * 2:
             raise RuntimeError("Failed to write data {0} invalid size".format(data_to_write))
-        bin_data = binascii.unhexlify(data_to_write) # Return the binary data represented by the hexadecimal string
+        bin_data = binascii.unhexlify(data_to_write)  # Return the binary data represented by the hexadecimal string
         try:
             with open(self._file_path, "wb") as f:
                 f.seek(offset)
                 f.write(bin_data)
         except Exception as e:
             raise RuntimeError("Failed writing to a file: {0}. ERROR: {1}".format(self._file_path, e))
-    
+
     def chunkstring(self, string, length):
         """
         Chunks the string to list of strings in the given length
         """
-        return (string[0+i:length+i] for i in range(0, len(string), length))
\ No newline at end of file
+        return (string[0 + i:length + i] for i in range(0, len(string), length))
diff --git a/small_utils/congestion.cpp b/small_utils/congestion.cpp
index e1b18704..11edd798 100644
--- a/small_utils/congestion.cpp
+++ b/small_utils/congestion.cpp
@@ -40,46 +40,45 @@
 
 using namespace std;
 
-enum {
+enum
+{
     BIT_TX_LOSSY_OPER = 1,
     BIT_TX_SENSE = 1 << 3,
     BIT_MARK_TX_CQE = 1 << 4,
     BIT_MARK_TX_CNP = 1 << 5,
 };
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
     CongestionUI congestObject;
     CongestionUI::exit_status_t exit_code = congestObject.run(argc, argv);
     int rc = 0;
-    switch(exit_code) {
-    case CongestionUI::EXIT_STATUS_OK:
-        congestObject.printSuccess();
-        break;
-    case CongestionUI::EXIT_STATUS_ERROR:
-        congestObject.printError();
-        rc = 1;
-        break;
-    case CongestionUI::EXIT_STATUS_USAGE:
-        congestObject.printUsage();
-        rc = 1;
-        break;
-    case CongestionUI::EXIT_STATUS_DEV_ID_ERR:
-        congestObject.printErrorNotSupported();
-        rc = 1;
-        break;
-    case CongestionUI::EXIT_STATUS_CAP_ERR:
-        congestObject.printErrorNotSupported();
-        rc = 1;
-        break;
+    switch (exit_code)
+    {
+        case CongestionUI::EXIT_STATUS_OK:
+            congestObject.printSuccess();
+            break;
+        case CongestionUI::EXIT_STATUS_ERROR:
+            congestObject.printError();
+            rc = 1;
+            break;
+        case CongestionUI::EXIT_STATUS_USAGE:
+            congestObject.printUsage();
+            rc = 1;
+            break;
+        case CongestionUI::EXIT_STATUS_DEV_ID_ERR:
+            congestObject.printErrorNotSupported();
+            rc = 1;
+            break;
+        case CongestionUI::EXIT_STATUS_CAP_ERR:
+            congestObject.printErrorNotSupported();
+            rc = 1;
+            break;
     }
     return rc;
 }
 
-
-CongestionUI::CongestionUI() :
-            CommandLineRequester("mstcongestion [OPTIONS]"),
-            _cmdParser("mstcongestion")
+CongestionUI::CongestionUI() : CommandLineRequester("mstcongestion [OPTIONS]"), _cmdParser("mstcongestion")
 {
     _devname = "";
     _mf = NULL;
@@ -95,7 +94,8 @@ CongestionUI::CongestionUI() :
 
 CongestionUI::~CongestionUI()
 {
-    if (_mf) {
+    if (_mf)
+    {
         mclose(_mf);
         _mf = NULL;
     }
@@ -103,7 +103,6 @@ CongestionUI::~CongestionUI()
 
 void CongestionUI::initCmdParser()
 {
-
     AddOptions("device", 'd', "<PCI DEVICE>", "Mellanox PCI device address", false, true);
     AddOptions("mode", ' ', "<MODE>", "Set Mode, options are: [aggressive | dynamic]");
     AddOptions("action", ' ', "<ACTION>", "Set Action, options are: [disabled | drop | mark]");
@@ -121,40 +120,65 @@ bool CongestionUI::isDeviceSupported(dm_dev_id_t devid)
 
 ParseStatus CongestionUI::HandleOption(string name, string value)
 {
-    if (name == "device") {
+    if (name == "device")
+    {
         _devname = value;
-    } else if (name == "mode" ) {
+    }
+    else if (name == "mode")
+    {
         _ops++;
-        if (value == "aggressive") {
+        if (value == "aggressive")
+        {
             _mode = MODE_AGGRESSIVE;
-        } else if (value == "dynamic") {
+        }
+        else if (value == "dynamic")
+        {
             _mode = MODE_DYNAMIC;
-        } else {
+        }
+        else
+        {
             _errorMsg = "Invalid mode, options are: [aggressive | dynamic]";
             return PARSE_ERROR;
         }
-    } else if (name == "action") {
+    }
+    else if (name == "action")
+    {
         _ops++;
-        if (value == "disabled") {
+        if (value == "disabled")
+        {
             _action = ACTION_DISABLED;
-        } else if (value == "drop") {
+        }
+        else if (value == "drop")
+        {
             _action = ACTION_DROP;
-        } else if (value == "mark") {
+        }
+        else if (value == "mark")
+        {
             _action = ACTION_MARK;
-        } else {
+        }
+        else
+        {
             _errorMsg = "Invalid action, options are: [disabled | drop | mark]";
             return PARSE_ERROR;
         }
-    } else if (name == "help") {
+    }
+    else if (name == "help")
+    {
         printUsage();
         return PARSE_OK_WITH_EXIT;
-    } else if (name == "version") {
+    }
+    else if (name == "version")
+    {
         print_version_string("mstcongestion", NULL);
         return PARSE_OK_WITH_EXIT;
-    } else if (name == "query") {
+    }
+    else if (name == "query")
+    {
         _ops++;
         _query = true;
-    } else {
+    }
+    else
+    {
         _errorMsg = "Invalid option: " + name;
         return PARSE_ERROR;
     }
@@ -164,28 +188,36 @@ ParseStatus CongestionUI::HandleOption(string name, string value)
 CongestionUI::exit_status_t CongestionUI::run(int argc, char** argv)
 {
     ParseStatus rc = _cmdParser.ParseOptions(argc, argv);
-    if (rc == PARSE_OK && _devname == "") {
+    if (rc == PARSE_OK && _devname == "")
+    {
         _errorMsg = "Missing device.";
         rc = PARSE_ERROR;
     }
 
-    if (rc == PARSE_OK_WITH_EXIT) {
+    if (rc == PARSE_OK_WITH_EXIT)
+    {
         return EXIT_STATUS_OK;
-    } else if (rc == PARSE_ERROR) {
-        if (_errorMsg == "") {
+    }
+    else if (rc == PARSE_ERROR)
+    {
+        if (_errorMsg == "")
+        {
             _errorMsg = "Failed while parsing the arguments.";
         }
         return EXIT_STATUS_USAGE;
-    } else if (rc == PARSE_ERROR_SHOW_USAGE) {
+    }
+    else if (rc == PARSE_ERROR_SHOW_USAGE)
+    {
         return EXIT_STATUS_USAGE;
     }
 
     _mf = mopen(_devname.c_str());
-    if (!_mf) {
+    if (!_mf)
+    {
         _errorMsg = "Failed to open device: " + _devname;
         return EXIT_STATUS_ERROR;
     }
-    // Check supported device 
+    // Check supported device
     dm_dev_id_t devID = DeviceUnknown;
     u_int32_t hwDevID = 0;
     u_int32_t hwChipRev = 0;
@@ -199,7 +231,8 @@ CongestionUI::exit_status_t CongestionUI::run(int argc, char** argv)
     struct tools_open_mcam mcam;
     memset(&mcam, 0, sizeof(mcam));
     reg_access_status_t status = reg_access_mcam(_mf, REG_ACCESS_METHOD_GET, &mcam);
-    if (status) {
+    if (status)
+    {
         _errorMsg = "mstcongestion is not supported on this device (Failed to get device capabilities).";
         return EXIT_STATUS_CAP_ERR;
     }
@@ -207,35 +240,42 @@ CongestionUI::exit_status_t CongestionUI::run(int argc, char** argv)
     _dynamicSupp = caps & 0x2;
     _markCqeSupp = caps & 0x4;
     _markCnpSupp = caps & 0x8;
-    if (_ops != 1) {
+    if (_ops != 1)
+    {
         _errorMsg = "Please choose one operation.";
         return EXIT_STATUS_ERROR;
     }
     bool op_ret = true;
-    if (_mode != MODE_NA) {
+    if (_mode != MODE_NA)
+    {
         op_ret = setMode(_mode);
-    } else if (_action != ACTION_NA) {
+    }
+    else if (_action != ACTION_NA)
+    {
         op_ret = setAction(_action);
-    } else if (_query) {
+    }
+    else if (_query)
+    {
         op_ret = query();
     }
-    return op_ret? EXIT_STATUS_OK : EXIT_STATUS_ERROR;
+    return op_ret ? EXIT_STATUS_OK : EXIT_STATUS_ERROR;
 }
 
-
 bool CongestionUI::setMode(cong_mode_t mode)
 {
-    if (!_dynamicSupp) {
+    if (!_dynamicSupp)
+    {
         _errorMsg = "Dynamic overflow is not supported.";
         return false;
     }
     _successMsg = "Mode was set successfully.";
     struct reg_access_hca_mpegc_reg mpegc;
-    memset(&mpegc, 0, sizeof (mpegc));
+    memset(&mpegc, 0, sizeof(mpegc));
     mpegc.tx_overflow_sense = (int)mode;
     mpegc.field_select |= BIT_TX_SENSE;
     reg_access_status_t status = reg_access_mpegc(_mf, REG_ACCESS_METHOD_SET, &mpegc);
-    if (status) {
+    if (status)
+    {
         _errorMsg = string(reg_access_err2str(status));
         return false;
     }
@@ -246,25 +286,30 @@ bool CongestionUI::setAction(cong_action_t action)
 {
     _successMsg = "Action was set successfully.";
     struct reg_access_hca_mpegc_reg mpegc;
-    memset(&mpegc, 0, sizeof (mpegc));
+    memset(&mpegc, 0, sizeof(mpegc));
     mpegc.tx_lossy_overflow_oper = (int)action;
     mpegc.field_select |= BIT_TX_LOSSY_OPER;
-    if (action == ACTION_MARK) {
-        if (_markCqeSupp) {
+    if (action == ACTION_MARK)
+    {
+        if (_markCqeSupp)
+        {
             mpegc.field_select |= BIT_MARK_TX_CQE;
             mpegc.mark_cqe = 1;
         }
-        if (_markCnpSupp) {
+        if (_markCnpSupp)
+        {
             mpegc.field_select |= BIT_MARK_TX_CNP;
             mpegc.mark_cnp = 1;
         }
-        if(!mpegc.mark_cnp && !mpegc.mark_cqe) {
+        if (!mpegc.mark_cnp && !mpegc.mark_cqe)
+        {
             _errorMsg = "Mark action is not supported!";
             return false;
         }
     }
     reg_access_status_t status = reg_access_mpegc(_mf, REG_ACCESS_METHOD_SET, &mpegc);
-    if (status) {
+    if (status)
+    {
         _errorMsg = string(reg_access_err2str(status));
         return false;
     }
@@ -274,9 +319,10 @@ bool CongestionUI::setAction(cong_action_t action)
 bool CongestionUI::query()
 {
     struct reg_access_hca_mpegc_reg mpegc;
-    memset(&mpegc, 0, sizeof (mpegc));
+    memset(&mpegc, 0, sizeof(mpegc));
     reg_access_status_t status = reg_access_mpegc(_mf, REG_ACCESS_METHOD_GET, &mpegc);
-    if (status) {
+    if (status)
+    {
         _errorMsg = string(reg_access_err2str(status));
         return false;
     }
@@ -285,36 +331,38 @@ bool CongestionUI::query()
     return true;
 }
 
-
 string CongestionUI::getModeString(cong_mode_t mode)
 {
-    switch (mode) {
-    case MODE_AGGRESSIVE:
-        return "aggressive";
-    case MODE_DYNAMIC:
-        return "dynamic";
-    default:
-        return "N/A";
+    switch (mode)
+    {
+        case MODE_AGGRESSIVE:
+            return "aggressive";
+        case MODE_DYNAMIC:
+            return "dynamic";
+        default:
+            return "N/A";
     }
 }
 
 string CongestionUI::getActionString(cong_action_t action)
 {
-    switch (action) {
-    case ACTION_DISABLED:
-        return "disabled";
-    case ACTION_DROP:
-        return "drop";
-    case ACTION_MARK:
-        return "mark";
-    default:
-        return "N/A";
+    switch (action)
+    {
+        case ACTION_DISABLED:
+            return "disabled";
+        case ACTION_DROP:
+            return "drop";
+        case ACTION_MARK:
+            return "mark";
+        default:
+            return "N/A";
     }
 }
 
 void CongestionUI::printUsage()
 {
-    if(getError() != "") {
+    if (getError() != "")
+    {
         cout << "-E- Usage error: " << getError() << endl;
     }
     cout << _cmdParser.GetUsage() << endl;
@@ -332,7 +380,8 @@ void CongestionUI::printErrorNotSupported()
 
 void CongestionUI::printSuccess()
 {
-    if (getSuccess() != "") {
+    if (getSuccess() != "")
+    {
         cout << "-I- " << getSuccess() << endl;
     }
 }
diff --git a/small_utils/congestion.h b/small_utils/congestion.h
index 74ed3f8d..c3c5ab8e 100644
--- a/small_utils/congestion.h
+++ b/small_utils/congestion.h
@@ -38,9 +38,11 @@
 
 using namespace std;
 
-class CongestionUI : public CommandLineRequester {
+class CongestionUI : public CommandLineRequester
+{
 public:
-    typedef enum {
+    typedef enum
+    {
         EXIT_STATUS_OK = 0,
         EXIT_STATUS_ERROR = 1,
         EXIT_STATUS_USAGE = 2,
@@ -51,7 +53,7 @@ class CongestionUI : public CommandLineRequester {
     ~CongestionUI();
     ParseStatus HandleOption(string name, string value);
 
-    exit_status_t run(int argc, char **argv);
+    exit_status_t run(int argc, char** argv);
 
     void printUsage();
     void printError();
@@ -61,14 +63,15 @@ class CongestionUI : public CommandLineRequester {
     string getSuccess() { return _successMsg; };
 
 private:
-
-    typedef enum {
+    typedef enum
+    {
         MODE_AGGRESSIVE = 0,
         MODE_DYNAMIC = 1,
         MODE_NA
     } cong_mode_t;
 
-    typedef enum {
+    typedef enum
+    {
         ACTION_DISABLED = 0,
         ACTION_DROP = 1,
         ACTION_MARK = 2,
@@ -88,7 +91,7 @@ class CongestionUI : public CommandLineRequester {
     string _devname;
     cong_action_t _action;
     cong_mode_t _mode;
-    mfile *_mf;
+    mfile* _mf;
     string _errorMsg;
     string _successMsg;
     bool _query;
@@ -97,4 +100,3 @@ class CongestionUI : public CommandLineRequester {
     u_int8_t _markCqeSupp;
     u_int8_t _markCnpSupp;
 };
-
diff --git a/small_utils/mcra.c b/small_utils/mcra.c
index 0e3c481f..13b5672a 100644
--- a/small_utils/mcra.c
+++ b/small_utils/mcra.c
@@ -47,16 +47,17 @@
 #include "tools_version.h"
 #include <reg_access/reg_access.h>
 
-#define ONES32(size)                    ((size) ? (0xffffffff >> (32 - (size))) : 0)
-#define MASK32(offset, size)             (ONES32(size) << (offset))
+#define ONES32(size) ((size) ? (0xffffffff >> (32 - (size))) : 0)
+#define MASK32(offset, size) (ONES32(size) << (offset))
 
-#define EXTRACT_C(source, offset, size)   ((((unsigned)(source)) >> (offset)) & ONES32(size))
-#define EXTRACT(src, start, len)          (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
+#define EXTRACT_C(source, offset, size) ((((unsigned)(source)) >> (offset)) & ONES32(size))
+#define EXTRACT(src, start, len) (((len) == 32) ? (src) : EXTRACT_C(src, start, len))
 
-#define MERGE_C(rsrc1, rsrc2, start, len)  ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
-#define MERGE(rsrc1, rsrc2, start, len)    (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
+#define MERGE_C(rsrc1, rsrc2, start, len) \
+    ((((rsrc2) << (start)) & (MASK32((start), (len)))) | ((rsrc1) & (~MASK32((start), (len)))))
+#define MERGE(rsrc1, rsrc2, start, len) (((len) == 32) ? (rsrc2) : MERGE_C(rsrc1, rsrc2, start, len))
 
-#define ADB_DUMP_VAR   "ADB_DUMP"
+#define ADB_DUMP_VAR "ADB_DUMP"
 #define MAX_DEV_LEN 512
 
 void usage(int with_exit)
@@ -81,34 +82,35 @@ void usage(int with_exit)
     printf("\n");
     printf("Environment Variables:\n");
     printf("   ADB_DUMP      : Holds the path to adb dump, used for access by path (can be overridden by \"-a\").\n");
-    if (with_exit) {
+    if (with_exit)
+    {
         exit(1);
     }
 }
 #define MCRA_TOOL_NAME "mcra"
 #define MCRA_TOOL_VERSON "1.0.0"
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
-    char *endp;
-    char *dev = NULL;
+    char* endp;
+    char* dev = NULL;
     char device[MAX_DEV_LEN] = {0};
-    char *adb_dump = NULL;
-    char *path = NULL;
+    char* adb_dump = NULL;
+    char* path = NULL;
     int rc = 0;
     unsigned int addr = 0, val = 0;
     // Temp variable for using strtoul and then check if it's greater than UINT_MAX before assigning it to addr
     unsigned long int parsed_addr = 0;
-    mfile         *mf;
+    mfile* mf;
     unsigned int i2c_slave = 0;
     int c;
     int read_op = 0;
     int bit_offs = 0;
     int bit_size = 32;
     int byte_size = 0;
-    int read_block = 0;                 /* if 0 then read field according to "addr.bit:size", else read block of size "byte_size" */
+    int read_block = 0; /* if 0 then read field according to "addr.bit:size", else read block of size "byte_size" */
     int clear_semaphore = 0;
-    const char *op_name = "cr write";
+    const char* op_name = "cr write";
 
 #if 0
     int i, rc1;
@@ -122,58 +124,67 @@ int main(int argc, char *argv[])
 #endif
     (void)rc; // avoid warnings (we dont use it just assign)
     // Parse cmd line:
-    if (argc < 2) {
+    if (argc < 2)
+    {
         usage(1);
     }
 
-    while ((c = getopt(argc, argv, "s:a:hvc")) != -1) {
-        switch (c)  {
-        case 's':
-            i2c_slave  = strtoul(optarg, &endp, 0);
-            if (*endp || i2c_slave == 0 || i2c_slave > 0x7f) {
-                fprintf(stderr, "-E- Bad slave address given (%s).Expecting a non-negative number\n", optarg);
-                exit(1);
-            }
-            break;
+    while ((c = getopt(argc, argv, "s:a:hvc")) != -1)
+    {
+        switch (c)
+        {
+            case 's':
+                i2c_slave = strtoul(optarg, &endp, 0);
+                if (*endp || i2c_slave == 0 || i2c_slave > 0x7f)
+                {
+                    fprintf(stderr, "-E- Bad slave address given (%s).Expecting a non-negative number\n", optarg);
+                    exit(1);
+                }
+                break;
 
-        case 'a':
-            adb_dump = optarg;
-            break;
+            case 'a':
+                adb_dump = optarg;
+                break;
 
-        case 'v':
-            print_version_string(MCRA_TOOL_NAME, MCRA_TOOL_VERSON);
-            exit(0);
+            case 'v':
+                print_version_string(MCRA_TOOL_NAME, MCRA_TOOL_VERSON);
+                exit(0);
 
-        case 'h':
-            usage(0);
-            exit(0);
+            case 'h':
+                usage(0);
+                exit(0);
 
-        case 'c':
-            clear_semaphore = 1;
-            break;
+            case 'c':
+                clear_semaphore = 1;
+                break;
 
-        case '?':
-            usage(0);
-            exit(1);
+            case '?':
+                usage(0);
+                exit(1);
 
-        default:
-            fprintf(stderr, "-E- Unknown flag \"%c\"\n", c);
-            usage(0);
-            exit(1);
+            default:
+                fprintf(stderr, "-E- Unknown flag \"%c\"\n", c);
+                usage(0);
+                exit(1);
         }
     }
 
     // parse non-optons argv elements
-    if (optind >= argc) {
+    if (optind >= argc)
+    {
         fprintf(stderr, "-E- Missing device argument\n");
         exit(1);
-    } else {
+    }
+    else
+    {
         dev = argv[optind];
         optind++;
     }
 
-    if (clear_semaphore) {
-        if ((rc = mclear_pci_semaphore(dev))) {
+    if (clear_semaphore)
+    {
+        if ((rc = mclear_pci_semaphore(dev)))
+        {
             fprintf(stderr, "-E- Failed to clear PCI semaphore for device: %s. %s\n", dev, m_err2str((MError)rc));
             exit(1);
         }
@@ -181,161 +192,198 @@ int main(int argc, char *argv[])
         exit(0);
     }
 
-    if (optind >= argc) {
+    if (optind >= argc)
+    {
         fprintf(stderr, "-E- Missing address argument\n");
         exit(1);
-    } else {
+    }
+    else
+    {
         parsed_addr = strtoul(argv[optind], &endp, 0);
-        if (parsed_addr > UINT_MAX) {
+        if (parsed_addr > UINT_MAX)
+        {
             fprintf(stderr, "-E- Address is out of the range\n");
             exit(1);
         }
         addr = (unsigned int)parsed_addr;
-        if (*endp != '\0' && *endp != '.' && *endp != ',') {
-            //fprintf(stderr, "-E- Bad address given (%s). Unparsed string: \"%s\"\n", av[ap] ,endp);
-            //exit(1);
+        if (*endp != '\0' && *endp != '.' && *endp != ',')
+        {
+            // fprintf(stderr, "-E- Bad address given (%s). Unparsed string: \"%s\"\n", av[ap] ,endp);
+            // exit(1);
             path = argv[optind];
         }
 
-        if (*endp == ',') {
-            if (path) {
+        if (*endp == ',')
+        {
+            if (path)
+            {
                 fprintf(stderr, "-E- Can't read block with full path\n");
                 exit(1);
             }
             read_block = 1;
             byte_size = strtoul(endp + 1, &endp, 0);
 
-            if (*endp != '\0' || byte_size == 0) {
-                fprintf(stderr, "-E- Bad byte size in given address (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
+            if (*endp != '\0' || byte_size == 0)
+            {
+                fprintf(
+                  stderr, "-E- Bad byte size in given address (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
                 exit(1);
             }
         }
 
-        if (*endp == '.') {
-            if (path) {
+        if (*endp == '.')
+        {
+            if (path)
+            {
                 fprintf(stderr, "-E- Full path with bit address notation is illegal\n");
                 exit(1);
             }
 
             bit_offs = strtoul(endp + 1, &endp, 0);
-            if ((*endp != '\0' && *endp != ':') || bit_offs >= 32) {
-                fprintf(stderr, "-E- Bad bit offset in given address (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
+            if ((*endp != '\0' && *endp != ':') || bit_offs >= 32)
+            {
+                fprintf(
+                  stderr, "-E- Bad bit offset in given address (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
                 exit(1);
             }
         }
 
-        if (*endp == ':') {
-            if (path) {
+        if (*endp == ':')
+        {
+            if (path)
+            {
                 fprintf(stderr, "-E- Full path with bit size notation is illegal\n");
                 exit(1);
             }
 
             bit_size = strtoul(endp + 1, &endp, 0);
-            if (*endp != '\0') {
-                fprintf(stderr, "-E- Bad bit size in given address (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
+            if (*endp != '\0')
+            {
+                fprintf(
+                  stderr, "-E- Bad bit size in given address (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
                 exit(1);
             }
 
-            if (bit_size + bit_offs > 32) {
+            if (bit_size + bit_offs > 32)
+            {
                 fprintf(stderr, "-E- Bad bit offset/size in given address (%s) - exceeds 32 bits\n", argv[optind]);
 
                 exit(1);
             }
         }
 
-        if (!path && *endp) {
+        if (!path && *endp)
+        {
             fprintf(stderr, "-E- Bad address given (%s). Unparsed string: \"%s\"\n", argv[optind], endp);
             exit(1);
         }
 
         // Allow the bit_size to be ommited
-        if (bit_size + bit_offs > 32) {
+        if (bit_size + bit_offs > 32)
+        {
             bit_size = 32 - bit_offs;
         }
 
         optind++;
     }
 
-
-    if (optind >= argc) {
+    if (optind >= argc)
+    {
         read_op = 1;
         op_name = "cr read";
-    } else {
+    }
+    else
+    {
         val = strtoul(argv[optind], &endp, 0);
-        if (*endp) {
+        if (*endp)
+        {
             fprintf(stderr, "-E- Bad data given (%s)\n", argv[optind]);
             exit(1);
         }
         optind++;
     }
 
-    if (optind < argc) {
+    if (optind < argc)
+    {
         fprintf(stderr, "-E- Extra argument given (%s)\n", argv[optind]);
         exit(1);
     }
 
-    if (!adb_dump) {
+    if (!adb_dump)
+    {
         adb_dump = getenv(ADB_DUMP_VAR);
     }
     strncpy(device, dev, MAX_DEV_LEN - 1);
 
     // Do the job
     mf = mopen_adv((const char*)device, (MType)(MST_DEFAULT | MST_CABLE | MST_LINKX_CHIP));
-    if (!mf) {
+    if (!mf)
+    {
         perror("mopen");
         return 1;
     }
-    if (i2c_slave) {
+    if (i2c_slave)
+    {
         mset_i2c_slave(mf, (u_int8_t)i2c_slave);
     }
 
-    if (path) {
-        FILE *fp;
-        char *fpath;
+    if (path)
+    {
+        FILE* fp;
+        char* fpath;
         char line[1024];
         char *offset, *size;
         int path_found = 0;
 
-        if (!adb_dump) {
+        if (!adb_dump)
+        {
             fprintf(stderr, "-E- Can't access by path without providing adb dump file path\n");
             goto error;
         }
 
         fp = fopen(adb_dump, "r");
-        if (!fp) {
+        if (!fp)
+        {
             fprintf(stderr, "-E- Can't open adb dump (%s) file: %s\n", adb_dump, strerror(errno));
             goto error;
         }
 
-        while (fgets(line, sizeof(line), fp) != NULL) {
-            if (!strstr(line, path)) {
+        while (fgets(line, sizeof(line), fp) != NULL)
+        {
+            if (!strstr(line, path))
+            {
                 continue;
             }
 
             fpath = strtok(line, " ");
 
-            if (!fpath) {
+            if (!fpath)
+            {
                 fprintf(stderr, "-E- Bad register map file format (%s), Can't find path\n", line);
                 fclose(fp);
                 goto error;
             }
 
-            if (strcmp(fpath, path)) {
+            if (strcmp(fpath, path))
+            {
                 continue;
             }
 
             offset = strtok(NULL, " ");
             size = strtok(NULL, " ");
 
-            if (!offset || !size) {
+            if (!offset || !size)
+            {
                 fprintf(stderr, "-E- Bad register map file format (%s), Can't find offset/size\n", line);
                 fclose(fp);
                 goto error;
             }
             path_found = 1;
 
-            if (sscanf(offset, "0x%x.%d", &addr, &bit_offs) != 2) {
-                if (sscanf(offset, "0x%x", &addr) != 1) {
+            if (sscanf(offset, "0x%x.%d", &addr, &bit_offs) != 2)
+            {
+                if (sscanf(offset, "0x%x", &addr) != 1)
+                {
                     fprintf(stderr, "-E- Bad offset format in adb dump file, offset=%s\n", offset);
                     fclose(fp);
                     goto error;
@@ -344,7 +392,8 @@ int main(int argc, char *argv[])
                 bit_offs = 0;
             }
 
-            if (sscanf(size, "%d", &bit_size) != 1) {
+            if (sscanf(size, "%d", &bit_size) != 1)
+            {
                 fprintf(stderr, "-E- Bad size format in adb dump file, size=%s\n", size);
                 fclose(fp);
                 goto error;
@@ -354,19 +403,23 @@ int main(int argc, char *argv[])
         }
 
         fclose(fp);
-        if (!path_found) {
+        if (!path_found)
+        {
             fprintf(stderr, "-E- Can't find path (%s)\n", path);
             goto error;
         }
     }
 
-    if (read_op) {
-        if (read_block) {
+    if (read_op)
+    {
+        if (read_block)
+        {
             int i;
             int dowrd_size = ((byte_size - 1) / 4) + 1;
-            u_int32_t *data = malloc(sizeof(u_int32_t) * dowrd_size);
+            u_int32_t* data = malloc(sizeof(u_int32_t) * dowrd_size);
 
-            if (!data) {
+            if (!data)
+            {
                 fprintf(stderr, "-E- Failed to allocate memmory for read block buffer\n");
                 goto error;
             }
@@ -375,39 +428,49 @@ int main(int argc, char *argv[])
 
             rc = (mread4_block(mf, addr, data, dowrd_size * 4) != dowrd_size * 4);
 
-            if (rc) {
+            if (rc)
+            {
                 free(data);
                 goto access_error;
             }
 
             // print the dowrds
-            for (i = 0; i < dowrd_size; i++) {
+            for (i = 0; i < dowrd_size; i++)
+            {
                 printf("0x%08x 0x%08x\n", addr + i * 4, data[i]);
             }
             free(data);
-        } else {
+        }
+        else
+        {
             rc = (mread4(mf, addr, &val) != 4);
 
-            if (rc) {
+            if (rc)
+            {
                 goto access_error;
             }
 
             val = EXTRACT(val, bit_offs, bit_size);
             printf("0x%08x\n", val);
         }
-    } else {
-        if (read_block) {
+    }
+    else
+    {
+        if (read_block)
+        {
             fprintf(stderr, "-E- Writing blocks is not supported yet\n");
             exit(1);
         }
 
-        if (bit_offs != 0 || bit_size != 32) {
+        if (bit_offs != 0 || bit_size != 32)
+        {
             // read-modify-write
             u_int32_t tmp_val;
 
             rc = (mread4(mf, addr, &tmp_val) != 4);
 
-            if (rc) {
+            if (rc)
+            {
                 goto access_error;
             }
 
@@ -416,7 +479,8 @@ int main(int argc, char *argv[])
 
         rc = (mwrite4(mf, addr, val) != 4);
 
-        if (rc) {
+        if (rc)
+        {
             goto access_error;
         }
     }
@@ -433,4 +497,3 @@ int main(int argc, char *argv[])
     mclose(mf);
     return 0;
 }
-
diff --git a/small_utils/mlxfwresetlib/__init__.py b/small_utils/mlxfwresetlib/__init__.py
index e9ba75ee..396712bd 100644
--- a/small_utils/mlxfwresetlib/__init__.py
+++ b/small_utils/mlxfwresetlib/__init__.py
@@ -1,34 +1,31 @@
-#copyright (c) 2004-2020 Mellanox Technologies LTD. All rights reserved.   
+# copyright (c) 2004-2020 Mellanox Technologies LTD. All rights reserved.
 # Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-#                                                                           
-# This software is available to you under a choice of one of two            
-# licenses.  You may choose to be licensed under the terms of the GNU       
-# General Public License (GPL) Version 2, available from the file           
-# COPYING in the main directory of this source tree, or the                 
-# OpenIB.org BSD license below:                                             
-#                                                                           
-#     Redistribution and use in source and binary forms, with or            
-#     without modification, are permitted provided that the following       
-#     conditions are met:                                                   
-#                                                                           
-#      - Redistributions of source code must retain the above               
-#        copyright notice, this list of conditions and the following        
-#        disclaimer.                                                        
-#                                                                           
-#      - Redistributions in binary form must reproduce the above            
-#        copyright notice, this list of conditions and the following        
-#        disclaimer in the documentation and/or other materials             
-#        provided with the distribution.                                    
-#                                                                           
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,         
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE OF                   
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND                     
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS       
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN        
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN         
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE          
-# SOFTWARE.                                                                 
-#--                                                                         
-
-
-
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+#     Redistribution and use in source and binary forms, with or
+#     without modification, are permitted provided that the following
+#     conditions are met:
+#
+#      - Redistributions of source code must retain the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer.
+#
+#      - Redistributions in binary form must reproduce the above
+#        copyright notice, this list of conditions and the following
+#        disclaimer in the documentation and/or other materials
+#        provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# --
diff --git a/small_utils/mlxfwresetlib/cmd_reg_mcam.py b/small_utils/mlxfwresetlib/cmd_reg_mcam.py
index 6436e5d4..b88cc1a1 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mcam.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mcam.py
@@ -1,5 +1,5 @@
 # Copyright (c) Sep 2019 Mellanox Technologies LTD. All rights reserved.
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # This software is available to you under a choice of one of two
 # licenses.  You may choose to be licensed under the terms of the GNU
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 import sys
 try:
@@ -37,13 +37,13 @@
     print("-E- could not import : %s" % str(e))
     sys.exit(1)
 
+
 class CmdRegMcam():
 
     def __init__(self, reg_access):
 
         self._reg_access = reg_access
 
-
     def is_reset_by_fw_driver_sync_supported(self):
         """
         Read MCAM and check if the feature "reset by fw-driver sync" is supported
@@ -66,4 +66,4 @@ def reset_sync_query_text(self):
         supported_text = "Supported" if is_supported is True else "Not supported"
         result += "{0}: {1:<62}-{2:<14}{3}\n".format(1, "Driver is the owner", supported_text, "")
 
-        return result
\ No newline at end of file
+        return result
diff --git a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
index cd1d8ea4..039b34f5 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
@@ -28,24 +28,25 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 class CmdNotSupported(Exception):
     pass
 
+
 class CmdRegMfrl():
 
-    LIVE_PATCH, PCI_RESET, WARM_REBOOT = 0,3,4
+    LIVE_PATCH, PCI_RESET, WARM_REBOOT = 0, 3, 4
     reset_levels_db = [
-        {'level': LIVE_PATCH, 'description': 'Driver, PCI link, network link will remain up ("live-Patch")', 'mask' : 0x1, 'support_reset_type': False},
-        {'level': PCI_RESET, 'description': 'Driver restart and PCI reset', 'mask' : 0x8, 'support_reset_type': True},
-        {'level': WARM_REBOOT, 'description': 'Warm Reboot', 'mask' : 0x40, 'support_reset_type': True},
+        {'level': LIVE_PATCH, 'description': 'Driver, PCI link, network link will remain up ("live-Patch")', 'mask': 0x1, 'support_reset_type': False},
+        {'level': PCI_RESET, 'description': 'Driver restart and PCI reset', 'mask': 0x8, 'support_reset_type': True},
+        {'level': WARM_REBOOT, 'description': 'Warm Reboot', 'mask': 0x40, 'support_reset_type': True},
     ]
 
-    FULL_CHIP, PHY_LESS, NIC_ONLY = 0,1,2
+    FULL_CHIP, PHY_LESS, NIC_ONLY = 0, 1, 2
     reset_types_db = [
-        {'type': FULL_CHIP, 'description': 'Full chip reset', 'mask' : 0x1, 'supported': True},
-        {'type': PHY_LESS, 'description': 'Phy-less reset (keep network port active during reset)', 'mask' : 0x2},
-        {'type': NIC_ONLY, 'description': 'NIC only reset (for SoC devices)', 'mask' : 0x4}
+        {'type': FULL_CHIP, 'description': 'Full chip reset', 'mask': 0x1, 'supported': True},
+        {'type': PHY_LESS, 'description': 'Phy-less reset (keep network port active during reset)', 'mask': 0x2},
+        {'type': NIC_ONLY, 'description': 'NIC only reset (for SoC devices)', 'mask': 0x4}
     ]
 
     @classmethod
@@ -95,7 +96,7 @@ def __init__(self, reg_access):
 
         self._reg_access = reg_access
 
-        self._reset_levels = CmdRegMfrl.reset_levels_db[:] # copy
+        self._reset_levels = CmdRegMfrl.reset_levels_db[:]  # copy
         self._reset_types = CmdRegMfrl.reset_types_db[:]   # copy
 
         # Read register ('get' command) from device
@@ -104,10 +105,10 @@ def __init__(self, reg_access):
         # Update 'supported' field in reset_levels
         reset_level = reg['reset_level']
         for reset_level_ii in self._reset_levels:
-            reset_level_ii['supported'] = (reset_level & reset_level_ii['mask'])  != 0
+            reset_level_ii['supported'] = (reset_level & reset_level_ii['mask']) != 0
 
         # Update 'supported' field in reset_types
-        reset_type  = reg['reset_type']
+        reset_type = reg['reset_type']
         for reset_type_ii in self._reset_types:
             if 'supported' not in reset_type_ii:
                 reset_type_ii['supported'] = (reset_type & reset_type_ii['mask']) != 0
@@ -115,8 +116,8 @@ def __init__(self, reg_access):
     def _read_reg(self):
         reset_level, reset_type = self._reg_access.sendMFRL(self._reg_access.GET)
         return {
-            'reset_level' : reset_level,
-            'reset_type'  : reset_type
+            'reset_level': reset_level,
+            'reset_type': reset_type
         }
 
     def _write_reg(self, reset_level, reset_type, reset_sync):
@@ -131,7 +132,7 @@ def query_text(self):
             level = reset_level_ii['level']
             description = reset_level_ii['description']
             supported = "Supported" if reset_level_ii['supported'] else "Not Supported"
-            default = "(default)" if reset_level_ii["level"]==default_reset_level else ""
+            default = "(default)" if reset_level_ii["level"] == default_reset_level else ""
             result += "{0}: {1:<62}-{2:<14}{3}\n".format(level, description, supported, default)
 
         # Reset types
@@ -147,9 +148,9 @@ def query_text(self):
             type_ = reset_type_ii['type']
             description = reset_type_ii['description']
             supported = "Supported" if reset_type_ii['supported'] else "Not Supported"
-            default = "(default)" if reset_type_ii["type"]==default_reset_type else ""
+            default = "(default)" if reset_type_ii["type"] == default_reset_type else ""
             result += "{0}: {1:<62}-{2:<14}{3}\n".format(type_, description, supported, default)
-        
+
         return result
 
     def is_reset_level_supported(self, reset_level):
@@ -166,7 +167,7 @@ def is_reset_type_supported(self, reset_type):
             if reset_type_ii['type'] == reset_type:
                 return reset_type_ii['supported']
         else:
-            return False   
+            return False
 
     def is_reset_level_support_reset_type(self, reset_level):
         'Check if the input reset-level can be executed with reset_type (different than the default)'
@@ -189,12 +190,12 @@ def default_reset_type(self):
         # Return NIC_ONLY if supported (Will be supported only in SmartNIC)
         for reset_type_ii in self._reset_types:
             if reset_type_ii['supported'] and reset_type_ii['type'] == CmdRegMfrl.NIC_ONLY:
-                    return reset_type_ii['type']
-        
-        # Return FULL_CHIP 
+                return reset_type_ii['type']
+
+        # Return FULL_CHIP
         for reset_type_ii in self._reset_types:
             if reset_type_ii['supported'] and reset_type_ii['type'] == CmdRegMfrl.FULL_CHIP:
-                    return reset_type_ii['type']
+                return reset_type_ii['type']
 
         raise CmdNotSupported("There is no supported reset-type")
 
@@ -210,14 +211,14 @@ def send(self, reset_level, reset_type, reset_sync):
         Verify that reset-level and reset-type are supported (reset-sync is not verified)
         """
 
-        # Reset-level to send         
+        # Reset-level to send
         for reset_level_ii in self._reset_levels:
             if reset_level_ii['level'] == reset_level and reset_level_ii['supported']:
                 reset_level_2_send = reset_level_ii['mask']
                 break
         else:
             raise CmdNotSupported('Failed to send MFRL! reset-level {0} is not supported!'.format(reset_level))
-        
+
         # Reset-type to send
         for reset_type_ii in self._reset_types:
             if reset_type_ii['type'] == reset_type and reset_type_ii['supported']:
diff --git a/small_utils/mlxfwresetlib/cmd_reg_mpcir.py b/small_utils/mlxfwresetlib/cmd_reg_mpcir.py
index bba2cb2e..c55831c6 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mpcir.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mpcir.py
@@ -1,5 +1,5 @@
 # Copyright (c) Sep 2019 Mellanox Technologies LTD. All rights reserved.
-# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # This software is available to you under a choice of one of two
 # licenses.  You may choose to be licensed under the terms of the GNU
@@ -28,21 +28,24 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 import time
+
+
 class CmdRegMpcir():
 
     def __init__(self, reg_access):
         self._reg_access = reg_access
 
     def _wait_for_fw_idle(self):
-        DELAY_BETWEEN_SAMPLES = 0.01 # [sec]
+        DELAY_BETWEEN_SAMPLES = 0.01  # [sec]
         NUM_OF_SAMPLES = 10
         MPCIR_STATUS_IDLE = 0
 
         for _ in range(NUM_OF_SAMPLES):
-            if self._reg_access.sendMpcir(command="status") == MPCIR_STATUS_IDLE : break
+            if self._reg_access.sendMpcir(command="status") == MPCIR_STATUS_IDLE:
+                break
             time.sleep(DELAY_BETWEEN_SAMPLES)
         else:
             raise RuntimeError("FW is not ready to start ISSU flow (MPCIR)")
@@ -51,12 +54,13 @@ def _start_preperations(self):
         self._reg_access.sendMpcir(command="start")
 
     def _wait_for_completion(self):
-        DELAY_BETWEEN_SAMPLES = 0.01 # [sec]
+        DELAY_BETWEEN_SAMPLES = 0.01  # [sec]
         NUM_OF_SAMPLES = 10
-        MPCIR_STATUS_DONE = 1  
+        MPCIR_STATUS_DONE = 1
 
         for _ in range(NUM_OF_SAMPLES):
-            if self._reg_access.sendMpcir(command="status") == MPCIR_STATUS_DONE : break
+            if self._reg_access.sendMpcir(command="status") == MPCIR_STATUS_DONE:
+                break
             time.sleep(DELAY_BETWEEN_SAMPLES)
         else:
             raise RuntimeError("FW didn't finish preperations for FW upgrade on time (MPCIR)")
@@ -64,6 +68,6 @@ def _wait_for_completion(self):
     def prepare_for_phyless_fw_upgrade(self):
         'send FW an indication to perpare to PHY-less FW upgrade and wait for completion'
         # self._wait_for_fw_idle()  # Removed since it caused failure on MH setup.
-                                    # The first host will pass this wait, but others won't and raise exception.
+        # The first host will pass this wait, but others won't and raise exception.
         self._start_preperations()
-        self._wait_for_completion()
\ No newline at end of file
+        self._wait_for_completion()
diff --git a/small_utils/mlxfwresetlib/logger.py b/small_utils/mlxfwresetlib/logger.py
index 3bb81a04..0aa23120 100644
--- a/small_utils/mlxfwresetlib/logger.py
+++ b/small_utils/mlxfwresetlib/logger.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 import logging
 
@@ -50,23 +50,22 @@ def get(self, name, level):
         elif level == 'debug':
             log_level = logging.DEBUG
 
-
         #import logging
         logging.basicConfig(level=log_level, format='%(asctime)s - %(name)s - %(levelname)s - {%(pathname)s:%(lineno)d} - %(message)s')
         logger = logging.getLogger(name)
 
         #logger = logging.getLogger(name)
-        #logger.setLevel(logging.INFO)
+        # logger.setLevel(logging.INFO)
 
         # create a file handler
         #handler = logging.FileHandler(name+'.log')
-        #handler.setLevel(logging.INFO)
+        # handler.setLevel(logging.INFO)
 
         # create a logging format
         #formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-        #handler.setFormatter(formatter)
+        # handler.setFormatter(formatter)
 
         # add the handlers to the logger
-        #logger.addHandler(handler)
+        # logger.addHandler(handler)
 
         return logger
diff --git a/small_utils/mlxfwresetlib/mcra.py b/small_utils/mlxfwresetlib/mcra.py
index 786b4a48..fabf0757 100644
--- a/small_utils/mlxfwresetlib/mcra.py
+++ b/small_utils/mlxfwresetlib/mcra.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 """
 * $Id           : mcra.py 2017-11-28
@@ -39,20 +39,21 @@
 import platform
 from .mlxfwreset_utils import cmdExec
 
+
 class Mcra(object):
 
     def __init__(self):
 
-        self.mcra_cmd = self.pick_mcra_cmd() # mcra or mstmcra (in mstflint)
+        self.mcra_cmd = self.pick_mcra_cmd()  # mcra or mstmcra (in mstflint)
 
     def pick_mcra_cmd(self):
 
         SUCCESS = 0
 
         os = platform.system()
-        if os in ['Linux','FreeBSD']:
+        if os in ['Linux', 'FreeBSD']:
             identify_location_cmd = 'which'
-        elif os ==   'Windows':
+        elif os == 'Windows':
             identify_location_cmd = 'where'
         else:
             raise RuntimeError("Unsupported OS")
@@ -72,7 +73,7 @@ def read(self, device, addr, offset, length):
         cmd = "%s %s %s.%s:%s" % (self.mcra_cmd, device, addr, offset, length)
         (rc, stdout, stderr) = cmdExec(cmd)
         if rc:
-            raise RuntimeError (str(stderr))
+            raise RuntimeError(str(stderr))
         return int(stdout, 16)
 
     def write(self, device, addr, offset, length, value):
@@ -80,4 +81,4 @@ def write(self, device, addr, offset, length, value):
         cmd = "%s %s %s.%s:%s %s" % (self.mcra_cmd, device, addr, offset, length, value)
         (rc, _, stderr) = cmdExec(cmd)
         if rc:
-            raise RuntimeError (str(stderr))
+            raise RuntimeError(str(stderr))
diff --git a/small_utils/mlxfwresetlib/mlnx_peripheral_components.py b/small_utils/mlxfwresetlib/mlnx_peripheral_components.py
index a0aaa00a..8d722443 100644
--- a/small_utils/mlxfwresetlib/mlnx_peripheral_components.py
+++ b/small_utils/mlxfwresetlib/mlnx_peripheral_components.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 """
 * $Id           : mlnx_peripheral_components.py 2017-11-28
@@ -42,9 +42,10 @@
 from .pci_device import PciDevice
 from .mlxfwreset_utils import cmdExec
 
+
 class MlnxPeripheralComponents(object):
 
-    SD_SUPPORTED_DID = [0x21e,0x218,0x216,0x212,0x20f,0x20d,0x209,0x20b]  # Connectx8,Connectx7,Connectx6LX,Connectx6DX,Connectx6,Connectx5 (SD device) ,Connectx4/Connectx4Lx (MH device connected as SD)
+    SD_SUPPORTED_DID = [0x21e, 0x218, 0x216, 0x212, 0x20f, 0x20d, 0x209, 0x20b]  # Connectx8,Connectx7,Connectx6LX,Connectx6DX,Connectx6,Connectx5 (SD device) ,Connectx4/Connectx4Lx (MH device connected as SD)
 
     def __init__(self):
         self.pci_devices = []
@@ -81,7 +82,7 @@ def discover_pci_devices(self):
                         aliases.append(result.group(2))
                         if result.group(3) is None:
                             domain = 0
-                            aliases.append('0000:'+result.group(2))
+                            aliases.append('0000:' + result.group(2))
                         else:
                             domain = int(result.group(3), 16)
                         bus = int(result.group(4), 16)
@@ -94,11 +95,11 @@ def discover_pci_devices(self):
                         dev = int(result.group(4))
                         fn = int(result.group(5))
                     elif self.os == 'Windows':
-                        aliases.append(result.group(1)) # mt<id>_pciconf<N>
-                        aliases.append(result.group(2)) # dbdf
+                        aliases.append(result.group(1))  # mt<id>_pciconf<N>
+                        aliases.append(result.group(2))  # dbdf
                         if result.group(3) is None:     # no domain
                             domain = 0
-                            aliases.append('0000:'+result.group(2))
+                            aliases.append('0000:' + result.group(2))
                         else:
                             domain = int(result.group(3), 16)
                         bus = int(result.group(4), 16)
@@ -109,13 +110,13 @@ def discover_pci_devices(self):
 
                     pci_device = PciDevice(aliases, domain, bus, dev, fn)
                     self.pci_devices.append(pci_device)
-            except:
-                raise RuntimeError("Failed to get device PCI Address") # Why it's required??? You don't do anything in the excpetion
+            except BaseException:
+                raise RuntimeError("Failed to get device PCI Address")  # Why it's required??? You don't do anything in the excpetion
 
     def get_pci_device(self, alias):
         for pci_device in self.pci_devices:
             if pci_device.has_alias(alias):
-                return pci_device # TODO think if you need to copy
+                return pci_device  # TODO think if you need to copy
         else:
             raise RuntimeError("Failed to find {0} in pci-devices".format(alias))
 
@@ -147,7 +148,8 @@ def get_socket_direct_pci_devices(self, usr_pci_device):
                         continue
 
                     # Skip if device in livefish mode
-                    if pci_device.is_livefish_mode(): continue
+                    if pci_device.is_livefish_mode():
+                        continue
 
                     if usr_manufacturing_base_mac == pci_device.get_manufacturing_base_mac():
                         sd_pci_devices.append(pci_device)
@@ -162,7 +164,7 @@ def get_socket_direct_pci_devices(self, usr_pci_device):
     device = sys.argv[1]
 
     peripherals = MlnxPeripheralComponents()
-    for pci_device in  peripherals.pci_devices:
+    for pci_device in peripherals.pci_devices:
         print(pci_device)
 
     user_pci_device = peripherals.get_pci_device(device)
diff --git a/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py b/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py
index 04ca7d23..bdb2ef7a 100644
--- a/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py
+++ b/small_utils/mlxfwresetlib/mlxfwreset_mlnxdriver.py
@@ -48,9 +48,11 @@
 class DriverNotExist(Exception):
     pass
 
+
 class DriverDisabled(Exception):
     pass
-    
+
+
 class DriverUnknownMode(Exception):
     pass
 
@@ -59,6 +61,7 @@ class DriverUnknownMode(Exception):
 # OS Support :  Linux/Windows.
 ######################################################################
 
+
 class MlnxDriver(object):
     __metaclass__ = abc.ABCMeta
     """ Abstract driver Class that provides a simple start stop status methods
@@ -84,13 +87,13 @@ def getDriverStatus(self):
 
 class LinuxRshimUserSpaceDriver:
 
-    # The rshim user-space driver exists from BL2 (and up) 
+    # The rshim user-space driver exists from BL2 (and up)
     # To start/stop all the rshim user-space drivers manually you can use "systemctl start/stop rshim"
     # In the future this driver might be started/stopped automatically (???)
 
     def _scan_rshim_drivers(self):
 
-        result = [] 
+        result = []
         DRIVERS_PATH = "/dev/"
         rshim_drivers_names = [dir_name for dir_name in os.listdir(DRIVERS_PATH) if dir_name.startswith('rshim')]
         for rshim_driver_name in rshim_drivers_names:
@@ -100,13 +103,12 @@ def _scan_rshim_drivers(self):
                 for line in f:
                     if "DEV_NAME" in line:
                         rshim_pci_device_name = line.split()[1]
-                    if "DROP_MODE" in line: # Exist only in BL2 
+                    if "DROP_MODE" in line:  # Exist only in BL2
                         rshim_drop_mode = int(line.split()[1][0])
             if rshim_pci_device_name is not None and rshim_drop_mode is not None:
                 result.append((rshim_misc_file, rshim_pci_device_name, rshim_drop_mode))
         return result
 
-
     def __init__(self, logger, user_pci_device_name):
 
         self.logger = logger
@@ -128,7 +130,6 @@ def _update_drop_mode(self, action):
             if rc != 0:
                 raise RuntimeError('Failed to {0} user-space rshim driver ({1})'.format(action, self.rshim_misc_file))
 
-
     def stop(self):
         self._update_drop_mode('stop')
 
@@ -140,11 +141,11 @@ class MlnxDriverLinux(MlnxDriver):
 
     # blocklist_file_path = '/etc/modprobe.d/mlxfwreset.conf'
     PCI_DRIVERS_PATH = '/sys/bus/pci/drivers'
-    mlnx_drivers = ['mlx5_core','rshim_pcie','nvme']
+    mlnx_drivers = ['mlx5_core', 'rshim_pcie', 'nvme']
 
-    def __init__(self,devices,logger,skip): # devices : 1 physical function per card
+    def __init__(self, devices, logger, skip):  # devices : 1 physical function per card
 
-        self.drivers_dbdf = [] # A List of tuples (<dbdf>,<driver-name>)
+        self.drivers_dbdf = []  # A List of tuples (<dbdf>,<driver-name>)
 
         # Check if opensm is running in the background
         (rc, _, _) = cmdExec("pgrep opensm")
@@ -158,8 +159,8 @@ def __init__(self,devices,logger,skip): # devices : 1 physical function per card
             # Handle rshim user-space driver
             #################################
             self.rshim_driver = None
-            if len(devices) == 1: # BL devices has only one PCI device name (There is no BL socket-direct device)
-                pci_device_name = mlxfwreset_utils.getDevDBDF(devices[0], logger) # domain:bus:device.fn
+            if len(devices) == 1:  # BL devices has only one PCI device name (There is no BL socket-direct device)
+                pci_device_name = mlxfwreset_utils.getDevDBDF(devices[0], logger)  # domain:bus:device.fn
                 try:
                     self.rshim_driver = LinuxRshimUserSpaceDriver(logger, pci_device_name)
                 except DriverNotExist:
@@ -167,37 +168,37 @@ def __init__(self,devices,logger,skip): # devices : 1 physical function per card
 
             for device in devices:
 
-                dbdf = mlxfwreset_utils.getDevDBDF(device,logger)
+                dbdf = mlxfwreset_utils.getDevDBDF(device, logger)
                 dbd = dbdf.split('.')[0]
 
                 # Reset virtual functions (reset pf1 is speculative - only if exists)
                 for pf_num in range(2):
-                    num_vfs_file_path = '/sys/bus/pci/devices/{0}.{1}/sriov_numvfs'.format(dbd,pf_num)
+                    num_vfs_file_path = '/sys/bus/pci/devices/{0}.{1}/sriov_numvfs'.format(dbd, pf_num)
                     if os.path.exists(num_vfs_file_path):
                         cmd = "echo 0 > {0} ".format(num_vfs_file_path)
                         logger.info('{0}'.format(cmd))
                         (rc, out, _) = cmdExec(cmd)
-                        if rc!=0:
+                        if rc != 0:
                             logger.info('Reset virtual functions failed : {0}'.format(out))
 
                         # Verify the reset of the VFs
                         with open(num_vfs_file_path) as file:
-                            if int(file.read())!=0:
+                            if int(file.read()) != 0:
                                 raise RuntimeError('Reset virtual functions failed! Please reset virtual functions manually and resume operation')
 
                 # insert all the instances of the driver that need unbind/bind
-                cmd = "find {0} | grep {1}".format(MlnxDriverLinux.PCI_DRIVERS_PATH,dbd)
+                cmd = "find {0} | grep {1}".format(MlnxDriverLinux.PCI_DRIVERS_PATH, dbd)
                 logger.info('{0}'.format(cmd))
                 (_, out, _) = cmdExec(cmd)
                 for line in out.split('\n')[:-1]:
                     line = line.split('/')
-                    driver_name,dbdf = line[-2],line[-1]
+                    driver_name, dbdf = line[-2], line[-1]
                     if self.rshim_driver is not None and self.rshim_driver.pci_device_name == dbdf and driver_name in ["vfio-pci", "uio_pci_generic"]:
                         logger.info("skip on vfio/uio driver (rshim user-space driver will stop it)")
                         continue
                     if driver_name not in MlnxDriverLinux.mlnx_drivers:
                         raise RuntimeError("mlxfwreset doesn't support 3rd party driver ({0})!\nPlease, stop the driver manually and resume operation with --skip_driver".format(driver_name))
-                    self.drivers_dbdf.append((dbdf,driver_name))
+                    self.drivers_dbdf.append((dbdf, driver_name))
 
             self.drivers_dbdf.sort()
 
@@ -211,11 +212,11 @@ def driverStart(self):
 
         driver_err, rshim_err = None, None
 
-        #* Start NIC driver
-        for dbdf,driver_name in self.drivers_dbdf:
-            driver_path = '{0}/{1}'.format(MlnxDriverLinux.PCI_DRIVERS_PATH,driver_name)
+        # * Start NIC driver
+        for dbdf, driver_name in self.drivers_dbdf:
+            driver_path = '{0}/{1}'.format(MlnxDriverLinux.PCI_DRIVERS_PATH, driver_name)
             assert os.path.exists(driver_path)
-            
+
             # In case of hotplug the OS *might* start the driver automatically as part of the rescan/enumeration stage.
             # On kernel XXXX we saw that the driver file (sysfs) doesn't exist 'on time' and as a result the tool will
             # start the driver even though the OS already triggered the driver start. In this case the tool gets error
@@ -231,43 +232,42 @@ def driverStart(self):
                     cmd = 'echo "{0}" > {1}/bind'.format(dbdf, driver_path)
                     self.logger.info('{0}'.format(cmd))
                     (rc, _, _) = cmdExec(cmd)
-                    if rc == 0: # bind succeeded 
+                    if rc == 0:  # bind succeeded
                         driver_err = False
                         break
                     else:       # bind failed
                         try_num += 1
                         driver_err = True
                         sleep(0.1)
-        
-        #* Configure the driver in BlueField's internal host (ARM)            
+
+        # * Configure the driver in BlueField's internal host (ARM)
         if is_in_internal_host() and driver_err is False:                   # This code is WA. FR will be opened in rel1
             cmd = "mlnx_bf_configure"                                       # 2022 to address this issue (RM #2831210)
             rc, _, _ = cmdExec(cmd)
             if rc != 0:
                 print("-W- Failed to configure the driver")
 
-        #* Start RSHIM driver (BlueField)
+        # * Start RSHIM driver (BlueField)
         try:
             if self.rshim_driver:
                 self.rshim_driver.start()
         except Exception as err:
             rshim_err = err
 
-        #* Handle Errors (Best effort to try to start both drivers before indicating on error)
-        if driver_err:                          
+        # * Handle Errors (Best effort to try to start both drivers before indicating on error)
+        if driver_err:
             raise RuntimeError("Failed to start driver! please start driver manually")
         if rshim_err:
             raise rshim_err
 
-
     def driverStop(self):
         self.logger.info('MlnxDriverLinux driverStop()')
 
         if self.rshim_driver:
             self.rshim_driver.stop()
 
-        for dbdf,driver_name in self.drivers_dbdf:
-            driver_path = '{0}/{1}'.format(MlnxDriverLinux.PCI_DRIVERS_PATH,driver_name)
+        for dbdf, driver_name in self.drivers_dbdf:
+            driver_path = '{0}/{1}'.format(MlnxDriverLinux.PCI_DRIVERS_PATH, driver_name)
             assert os.path.exists(driver_path)
             cmd = 'echo "{0}" > {1}/unbind'.format(dbdf, driver_path)
             self.logger.info('{0}'.format(cmd))
@@ -279,7 +279,7 @@ def driverStop(self):
 class MlnxDriverFreeBSD(MlnxDriver):
     def __init__(self, logger, skip):
         logger.info('MlnxDriverFreeBSD object created')
-        if skip == True:
+        if skip:
             self.driverStatus = MlnxDriver.DRIVER_IGNORE
             return
         self._knownModules = [("mlx5en", False), ("mlx5ib", False), ("mlx4ib", False), ("mlxen", False),
@@ -335,8 +335,8 @@ def _powershell(self, cmd):
 
     def _get_pnp_device_name_for_network_adapter(self, network_adapter_name):
         """
-        The method will convert network_adapter name e.g "Ethernet 8" to pnp_device name (instance-id) 
-        e.g "PCI\VEN_15B3&DEV_A2D6&SUBSYS_004815B3&REV_00\4&2E75E12A&0&0110"
+        The method will convert network_adapter name e.g "Ethernet 8" to pnp_device name (instance-id)
+        e.g "PCI\\VEN_15B3&DEV_A2D6&SUBSYS_004815B3&REV_00\4&2E75E12A&0&0110"
         """
 
         cmd = "(Get-NetAdapterHardwareInfo -name '{0}').InterfaceDescription".format(network_adapter_name)
@@ -344,9 +344,9 @@ def _get_pnp_device_name_for_network_adapter(self, network_adapter_name):
         if rc != 0:
             raise RuntimeError("Failed to execute {0}".format(cmd))
 
-        interface_description = output.strip() 
-        
-        cmd = "(Get-PnpDevice -FriendlyName '{0}').InstanceId".format(interface_description)    # We use the InterfaceDescription from the previous command 
+        interface_description = output.strip()
+
+        cmd = "(Get-PnpDevice -FriendlyName '{0}').InstanceId".format(interface_description)    # We use the InterfaceDescription from the previous command
         rc, output, _ = self._powershell(cmd)                                                   # as FriendlyName in the current command
         if rc != 0:
             raise RuntimeError("Failed to execute {0}".format(cmd))
@@ -355,28 +355,27 @@ def _get_pnp_device_name_for_network_adapter(self, network_adapter_name):
         self.logger.info("network_adapter_name : {} ; pnp_device_name : {}".format(network_adapter_name, pnp_device_name))
         return pnp_device_name
 
-
     def __init__(self, logger, network_adapters, network_adapter_pci_device_id):
 
         self.logger = logger
 
-        #* Network-adapter to SOC-management PCI-device-id mapping table
+        # * Network-adapter to SOC-management PCI-device-id mapping table
         PCI_DEVICE_ID_MAPPING_TABLE = {0xA2D2: 0xC2D2, 0xA2D6: 0xC2D3, 0xA2D9: 0xC2D4, 0xA2DC: 0xC2D5}
 
-        #* Check if it's a Smart NIC. If yes, extract  pci-device-id of the management device
+        # * Check if it's a Smart NIC. If yes, extract  pci-device-id of the management device
         if network_adapter_pci_device_id in PCI_DEVICE_ID_MAPPING_TABLE:
             soc_management_pci_device_id = PCI_DEVICE_ID_MAPPING_TABLE[network_adapter_pci_device_id]
         else:
             self.logger.info("Not a SmartNIC device")
             raise DriverNotExist("Not a SmartNic device")
 
-        #* Assertion
+        # * Assertion
         if len(network_adapters) == 0:
             raise DriverNotExist("There is no management driver when there are no network adapters")
 
-        #* Check if "Get-PnpDevice" command exists
-        #! The "Get-PnpDevice" is not supported in "Windows server 2012" 
-        #! and "Windows server 2012 R2" so we can't support Bluefield in 
+        # * Check if "Get-PnpDevice" command exists
+        #! The "Get-PnpDevice" is not supported in "Windows server 2012"
+        #! and "Windows server 2012 R2" so we can't support Bluefield in
         #! these OS versions
         powershell_cmd = 'powershell.exe -c "Get-PnpDevice > $null"'
         result = cmdExec(powershell_cmd)
@@ -384,20 +383,19 @@ def __init__(self, logger, network_adapters, network_adapter_pci_device_id):
             self.logger.debug("Get-PnpDevice is not supported in this OS version")
             raise RuntimeError("Get-PnpDevice is not supported in this OS version")
 
-        #* Create a network-adapter as pnp device
+        # * Create a network-adapter as pnp device
         network_adapter_as_pnp_device = self._get_pnp_device_name_for_network_adapter(network_adapters[0])
         self.logger.debug("Network adapter as pnp device: {0}".format(network_adapter_as_pnp_device))
 
-
-        #* Extract the "common part" from the pnp-device
-        # The "common part" is common for both the network-adapter and SOC management 
-        # Example: 
+        # * Extract the "common part" from the pnp-device
+        # The "common part" is common for both the network-adapter and SOC management
+        # Example:
         #   pnp-device                    : PCI\VEN_15B3&DEV_A2D6&SUBSYS_004815B3&REV_00\4&2E75E12A&0&0110
         #   common part                   : 2E75E12A
         pnp_device_common_part = network_adapter_as_pnp_device.split("&")[4]
         self.logger.debug("pnp_device_common_part = {0}".format(pnp_device_common_part))
 
-        #* Set the name of the management driver
+        # * Set the name of the management driver
         cmd = "(Get-PnpDevice -InstanceId '*VEN_15B3*DEV_{0:x}*{1}*').InstanceId".format(soc_management_pci_device_id, pnp_device_common_part)
         rc, output, _ = self._powershell(cmd)
         if rc != 0:
@@ -405,7 +403,7 @@ def __init__(self, logger, network_adapters, network_adapter_pci_device_id):
         self.driver_name = output.strip()
         self.logger.info("rshim-driver name : {0}".format(self.driver_name))
 
-        #* Check if the management driver is enabled
+        # * Check if the management driver is enabled
         cmd = "(Get-PnpDevice -InstanceId '{0}').Status".format(self.driver_name)
         rc, output, _ = self._powershell(cmd)
         if rc == 0 and output.strip() == 'OK':
@@ -414,7 +412,6 @@ def __init__(self, logger, network_adapters, network_adapter_pci_device_id):
             self.logger.debug("rshim-driver name : {0} is disabled".format(self.driver_name))
             raise DriverDisabled("rshim-driver is disabled")
 
-
     def start(self):
         cmd = "Enable-PnpDevice -InstanceId '{0}' -confirm:$false".format(self.driver_name)
         rc, _, _ = self._powershell(cmd)
@@ -427,6 +424,7 @@ def stop(self):
         if rc != 0:
             raise RuntimeError("Failed to stop rshim-driver")
 
+
 class MlnxDriverWindows(MlnxDriver):
 
     def get_device_drivers(self, logger, seg_bus_device_list):
@@ -459,7 +457,7 @@ def read_5_lines(txt):
             seg_bus_device_list_ii = (seg_num_ii, bus_num_ii, device_num_ii)
             name_ii = name_line.split(':')[1].strip()
 
-            # Filter only relevant drivers 
+            # Filter only relevant drivers
             #  1. Ignore drivers that are not relevant to required PCI address
             #  2. Ignore the management driver ('rshim bus' in the 'Network Adapters' section)
             if seg_bus_device_list_ii in seg_bus_device_list and 'Management' not in description_line:
@@ -474,10 +472,10 @@ def _is_powershell_exists(self):
     def __init__(self, logger, skip, devices, pci_device_id):
 
         logger.info('MlnxDriverWindows object created')
-        if skip == True:
+        if skip:
             super(MlnxDriverWindows, self).__init__(logger, MlnxDriver.DRIVER_IGNORE)
             return
-        
+
         # Check if Powershell installed
         if self._is_powershell_exists() is False:
             raise RuntimeError("PowerShell.exe is not installed. Please stop the driver manually and re-run the tool with --skip_driver ")
@@ -485,12 +483,12 @@ def __init__(self, logger, skip, devices, pci_device_id):
         # Find seg:bus:device of the device(s)
         seg_bus_device_list = []
         for device in devices:
-            seg_bus_device = mlxfwreset_utils.getDevDBDF(device,logger).split('.')[0]
-            seg_num = int(seg_bus_device.split(':')[0],16)
-            bus_num = int(seg_bus_device.split(':')[1],16)
-            device_num = int(seg_bus_device.split(':')[2],16)
+            seg_bus_device = mlxfwreset_utils.getDevDBDF(device, logger).split('.')[0]
+            seg_num = int(seg_bus_device.split(':')[0], 16)
+            bus_num = int(seg_bus_device.split(':')[1], 16)
+            device_num = int(seg_bus_device.split(':')[2], 16)
             seg_bus_device_list.append((seg_num, bus_num, device_num))
-        
+
         # Find the relevant network adapters for the seg:bus:device
         targetedAdaptersTemp = self.get_device_drivers(logger, seg_bus_device_list)
         logger.debug(targetedAdaptersTemp)
@@ -500,8 +498,7 @@ def __init__(self, logger, skip, devices, pci_device_id):
         try:
             self.rshim_driver = WindowsRshimDriver(logger, targetedAdaptersTemp, pci_device_id)
         except (DriverNotExist, DriverDisabled):
-            self.rshim_driver = None     
-
+            self.rshim_driver = None
 
         # Filter the network adapters that are disabled
         self.targetedAdapters = []
@@ -515,7 +512,6 @@ def __init__(self, logger, skip, devices, pci_device_id):
                 self.targetedAdapters.append(targetedAdapter)
         logger.debug(self.targetedAdapters)
 
-
         drivers_exist = len(self.targetedAdapters) > 0 or self.rshim_driver
 
         driverStatus = MlnxDriver.DRIVER_LOADED if drivers_exist else MlnxDriver.DRIVER_IGNORE
@@ -526,7 +522,7 @@ def driverStart(self):
 
         driver_err, rshim_err = None, None
 
-        try:                                # rshim-driver must be enabled before network adapaters 
+        try:                                # rshim-driver must be enabled before network adapaters
             if self.rshim_driver:
                 self.rshim_driver.start()
         except Exception as err:
@@ -540,12 +536,11 @@ def driverStart(self):
                 driver_err = True
 
         # Error (Best effort to try to start both drivers before indicating on error)
-        if driver_err:                          
+        if driver_err:
             raise RuntimeError("Failed to start driver! please start driver manually")
         if rshim_err:
             raise rshim_err
 
-
     def driverStop(self):
         self.logger.info('MlnxDriverWindows driverStop()')
         for targetedAdapter in self.targetedAdapters:
@@ -554,16 +549,16 @@ def driverStop(self):
             (rc, stdout, _) = cmdExec(cmd)
             if rc != 0:
                 raise RuntimeError("Failed to stop driver! Please stop driver manually and resume Operation")
-        
+
         if self.rshim_driver:        # must be disabled after network adapaters
-            self.rshim_driver.stop() # reason: The manangement network adapter is a dependency of the SoC management i/f
+            self.rshim_driver.stop()  # reason: The manangement network adapter is a dependency of the SoC management i/f
 
 
 class MlnxDriverFactory(object):
-    def getDriverObj(self,logger, skip, devices, pci_device_id):
+    def getDriverObj(self, logger, skip, devices, pci_device_id):
         operatingSystem = platform.system()
         if operatingSystem == "Linux":
-            return MlnxDriverLinux(devices,logger,skip)
+            return MlnxDriverLinux(devices, logger, skip)
         elif operatingSystem == "FreeBSD":
             return MlnxDriverFreeBSD(logger, skip)
         elif operatingSystem == "Windows":
diff --git a/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py b/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
index f6f74aa7..63baca86 100755
--- a/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
+++ b/small_utils/mlxfwresetlib/mlxfwreset_status_checker.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 """
 * $Id           : fwreset_status_checker.py 2017-11-28
@@ -75,11 +75,11 @@ def UpdateUptimeAfterReset(self):
 
     def GetStatus(self):
         if self._UptimeBeforeStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusBeforeDone and\
-                        self._UptimeAfterStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusAfterDone:
+                self._UptimeAfterStatus == FirmwareResetStatusChecker.FirmwareUptimeStatusAfterDone:
             if self._UptimeAfterReset < self._UptimeBeforeReset:
                 return FirmwareResetStatusChecker.FirmwareResetStatusDone
             else:
-                if self._UptimeBeforeReset > 5: #5 seconds
+                if self._UptimeBeforeReset > 5:  # 5 seconds
                     return FirmwareResetStatusChecker.FirmwareResetStatusFailed
                 else:
                     return FirmwareResetStatusChecker.FirmwareResetStatusUnknown
diff --git a/small_utils/mlxfwresetlib/mlxfwreset_utils.py b/small_utils/mlxfwresetlib/mlxfwreset_utils.py
index 7be4aae5..3af4d3e0 100755
--- a/small_utils/mlxfwresetlib/mlxfwreset_utils.py
+++ b/small_utils/mlxfwresetlib/mlxfwreset_utils.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 """
 * $Id           : mlxfwreset_utils.py 2017-11-28
@@ -62,11 +62,13 @@ def cmdExec(cmd):
 # Description:  Run cmd in loops
 # OS Support :  N/A
 ######################################################################
-def cmdExecLoop( cmd, sleep_time, max_retries):
+
+
+def cmdExecLoop(cmd, sleep_time, max_retries):
     retries_num = 0
     rc = 1
-    while rc and retries_num <  max_retries:
-        (rc, stdout , stderr ) = cmdExec(cmd)
+    while rc and retries_num < max_retries:
+        (rc, stdout, stderr) = cmdExec(cmd)
         retries_num += 1
         time.sleep(sleep_time)
     return (rc, stdout, stderr)
@@ -76,30 +78,35 @@ def cmdExecLoop( cmd, sleep_time, max_retries):
 # OS Support :  N/A
 ######################################################################
 
+
 def getDomain(devAddr):
     devAddr = devAddr.split(":")
-    if len(devAddr) == 3 :
+    if len(devAddr) == 3:
         return devAddr[0]
     return None
 
+
 def addDomainToAddress(devAddr):
-    if len(devAddr.split(":")) == 2 :
+    if len(devAddr.split(":")) == 2:
         return "0000:" + devAddr
     return devAddr
 
+
 def removeDomainFromAddress(devAddr):
-    if len(devAddr.split(":")) == 3 :
+    if len(devAddr.split(":")) == 3:
         return devAddr[5:]
     return devAddr
 
+
 def isDevDBDFFormat(dev):
-    pat=r"[0-9,A-F,a-f]{4}:[0-9,A-F,a-f]{2}:[0-9,A-F,a-f]{2}\.[0-9,A-F,a-f]{1,2}"
+    pat = r"[0-9,A-F,a-f]{4}:[0-9,A-F,a-f]{2}:[0-9,A-F,a-f]{2}\.[0-9,A-F,a-f]{1,2}"
     if re.match(pat, dev):
         return True
     return False
 
+
 def isDevBDFFormat(dev):
-    pat=r"[0-9,A-F,a-f]{2}:[0-9,A-F,a-f]{2}\.[0-9,A-F,a-f]{1,2}"
+    pat = r"[0-9,A-F,a-f]{2}:[0-9,A-F,a-f]{2}\.[0-9,A-F,a-f]{1,2}"
     if re.match(pat, dev):
         return True
     return False
@@ -109,21 +116,22 @@ def isDevBDFFormat(dev):
 # OS Support :  Linux/Windows.
 ######################################################################
 
-def getDevDBDF(device,logger=None):
+
+def getDevDBDF(device, logger=None):
     if isDevDBDFFormat(device):
         return device
     if isDevBDFFormat(device):
         return addDomainToAddress(device)
 
     operatingSys = platform.system()
-    if (operatingSys == "FreeBSD") :
+    if (operatingSys == "FreeBSD"):
         if not(device.startswith("pci")):
             raise RuntimeError("Unexpected device name format")
         return device[3:]
     elif (operatingSys == "Linux"):
         cmd = "mdevices_info -vv"
         (rc, out, _) = cmdExec(cmd)
-        if rc != 0 :
+        if rc != 0:
             raise RuntimeError("Failed to get device PCI address")
         # extract bdf
         bdf = None
@@ -137,7 +145,7 @@ def getDevDBDF(device,logger=None):
     elif (operatingSys == "Windows"):
         cmd = "mdevices status -vv"
         (rc, out, _) = cmdExec(cmd)
-        if rc != 0 :
+        if rc != 0:
             raise RuntimeError("Failed to get device PCI address")
         # extract bdf
         bdf = None
@@ -152,8 +160,8 @@ def getDevDBDF(device,logger=None):
         raise RuntimeError("Unsupported OS")
 
 
-def is_in_internal_host(): 
-    ''' 
+def is_in_internal_host():
+    '''
     The function checks if the tool is running on the BlueField's internal host (ARM)
     The function will return true is the OS is Linux and PCIe root-port 00:00.0 is Mellanox
     '''
@@ -174,8 +182,9 @@ def is_in_internal_host():
 
     return is_in_internal_host.result
 
+
 def is_uefi_secureboot():
-    
+
     if platform.system() == "Linux":
         cmd = "mokutil --sb-state"
         rc, out, _ = cmdExec(cmd)
diff --git a/small_utils/mlxfwresetlib/pci_device.py b/small_utils/mlxfwresetlib/pci_device.py
index 14d9f832..34d6679e 100644
--- a/small_utils/mlxfwresetlib/pci_device.py
+++ b/small_utils/mlxfwresetlib/pci_device.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 """
 * $Id           : pci_device.py 2017-11-28
@@ -37,7 +37,8 @@
 
 from __future__ import print_function
 # TODO fix it latter - need to import the function from mlxfwreset.py
-import sys,os
+import sys
+import os
 mlxfwreset_dir = os.path.dirname(os.path.dirname(__file__))
 sys.path.append(mlxfwreset_dir)
 
@@ -57,8 +58,8 @@ def __init__(self, aliases, domain, bus, device, fn):
             FreeBSD 'pci0:2:0:0'
         '''
 
-        assert type(domain) == int and type(bus) == int and type(device) == int and type(fn) == int
-        assert type(aliases) == list
+        assert isinstance(domain, int) and isinstance(bus, int) and isinstance(device, int) and isinstance(fn, int)
+        assert isinstance(aliases, list)
 
         self.aliases = aliases
 
@@ -68,9 +69,9 @@ def __init__(self, aliases, domain, bus, device, fn):
         self.fn = fn
 
     def __str__(self):
-        return '{0} pci_address={1:04x}:{2:02x}:{3:02x}.{4:01x}'.format([alias for alias in self.aliases],self.domain, self.bus, self.device, self.fn)
+        return '{0} pci_address={1:04x}:{2:02x}:{3:02x}.{4:01x}'.format([alias for alias in self.aliases], self.domain, self.bus, self.device, self.fn)
 
-    def has_alias(self,alias):
+    def has_alias(self, alias):
         return alias in self.aliases
 
     def get_alias(self):
@@ -80,15 +81,14 @@ def get_cfg_did(self):
 
         DEVID_ADDR = [0xf0014, 0, 16]  # Adresses [Base offset length]
         mcra = Mcra()
-        return mcra.read(self.aliases[0],DEVID_ADDR[0], DEVID_ADDR[1], DEVID_ADDR[2])
-        #return get_cfg_did(self.aliases[0]) # PCI configuration DID
+        return mcra.read(self.aliases[0], DEVID_ADDR[0], DEVID_ADDR[1], DEVID_ADDR[2])
+        # return get_cfg_did(self.aliases[0]) # PCI configuration DID
 
     def is_livefish_mode(self):
         mst_device = MstDevice(self.aliases[0])
         device_mgt = DevMgt(mst_device)
         return True if device_mgt.isLivefishMode() == 1 else False
 
-
     def get_manufacturing_base_mac(self):
         # Be-careful : The logic won't work for all devices
 
diff --git a/small_utils/mlxpci_lib.py b/small_utils/mlxpci_lib.py
index 36e1bc37..ce2236a3 100644
--- a/small_utils/mlxpci_lib.py
+++ b/small_utils/mlxpci_lib.py
@@ -45,11 +45,11 @@
 CONFIG_SPACE_PTR_OFFSET = 0X34
 MAXIMUN_LEGACY_CAP_SIZE = 0x100
 MAX_PCI_OFFSET = 0xfff
-MELLANOX_PCI_SKIP_LIST = [0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f] # it is harmful for the device to read offset 0x58 and 0x5c for example
+MELLANOX_PCI_SKIP_LIST = [0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f]  # it is harmful for the device to read offset 0x58 and 0x5c for example
 VENDOR_ID_ADDR = 0X0
 DEVICE_ID_ADDR = 0x2
 # Legacy Capabilities
-CAP_PCI_EXPRESS= 0x10
+CAP_PCI_EXPRESS = 0x10
 CAP_MSI = 0x05
 CAP_MSI_X = 0x11
 CAP_POWER_MANAGEMENT = 0x01
@@ -67,21 +67,23 @@
 CAP_SRIOV = 0x10
 CAP_SECONDRY_PCI_EXPRESS = 0x19
 CAP_PHYSICAL_LAYER_GEN4 = 0x26
-CAP_DPC= 0x1d
+CAP_DPC = 0x1d
 CAP_ACS = 0xd
-CAP_ATS = 0xf    
+CAP_ATS = 0xf
 # Key:ID, value:size
 CAP_EXTENDED_DICT = {CAP_AER: 0x48,
-                    CAP_SRIOV: 0x40,
-                    CAP_SECONDRY_PCI_EXPRESS: 0x10,
-                    CAP_PHYSICAL_LAYER_GEN4: 0x40,
-                    CAP_DPC: 0x40,
-                    CAP_ATS: 0x8
-                   }
+                     CAP_SRIOV: 0x40,
+                     CAP_SECONDRY_PCI_EXPRESS: 0x10,
+                     CAP_PHYSICAL_LAYER_GEN4: 0x40,
+                     CAP_DPC: 0x40,
+                     CAP_ATS: 0x8
+                     }
+
 
 class NotSupportedDeviceException(Exception):
     pass
 
+
 class PCIDeviceBase(object):
     """
     Base class that represent a PCI device
@@ -90,23 +92,23 @@ def __init__(self, dbdf, debug_level="critical"):
         """
         """
         self.dbdf = dbdf
-        self.logger = LoggerFactory().get('mlxpci',debug_level)
+        self.logger = LoggerFactory().get('mlxpci', debug_level)
 
         temp_dir = tempfile.gettempdir()
         self.dump_file_path = os.path.join(temp_dir, "{0}.pkl".format(str(self.dbdf)))
 
-        self._pci_conf_space = {} # <capability-id> : <value:integer>
+        self._pci_conf_space = {}  # <capability-id> : <value:integer>
         self._pci_express_offset = None
-    
+
     def read(self, offset, size, skip_offset_list=None):
         """
         Read from PCI configuration space
         skip_offset_list is a list of offsets to skip reading for some offsets
         """
-        if self._is_valid_range(offset, size) is False: 
+        if self._is_valid_range(offset, size) is False:
             raise Exception("offset [{0}] with size {1} is not a valid offset to read from.".format(offset, size))
         self.logger.debug("Reading offset[{0}] with size [{1}] for PCI device[{2}]".format(offset, size, self.dbdf))
-        
+
     def write(self, offset, size, bytes_list):
         """
         Write to PCI configuration space
@@ -114,40 +116,40 @@ def write(self, offset, size, bytes_list):
         if self._is_valid_range(offset, size) is False:
             raise Exception("offset [{0}] with size {1} is not a valid offset to write.".format(offset, size))
         self.logger.debug("Writing [{0}] on  offset[{1}]  for PCI device[{2}]".format(bytes_list, offset, self.dbdf))
-    
+
     def save_configuration_space(self, to_file=False):
         """
         Save PCI configuration space of the device
         """
         self.logger.debug("Saving configurations for PCI device[{0}]".format(self.dbdf))
-        visited_capabilities = [] # A variable to save the visited capability to avoid an infinite loop
+        visited_capabilities = []  # A variable to save the visited capability to avoid an infinite loop
 
         # read and save PCI header 0x0-0x3f
         self.logger.debug("Reading and saving pci header [0x0-0x3f] ...")
         self._pci_conf_space["pci_header_start"] = self.read(0x0, 16)
         self._pci_conf_space["pci_header_bars"] = self.read(0x10, 24)
         self._pci_conf_space["pci_header_end"] = self.read(0x28, 24)
-        
+
         self.logger.debug("Reading and saving legacy list ...")
-        pci_legacy_ptr =  self.read_byte(CONFIG_SPACE_PTR_OFFSET)
+        pci_legacy_ptr = self.read_byte(CONFIG_SPACE_PTR_OFFSET)
         while pci_legacy_ptr != 0:
             assert 0 < pci_legacy_ptr < MAXIMUN_LEGACY_CAP_SIZE, "Legacy pointer (<{0:#x}>) is out of range".format(pci_legacy_ptr)
-            capability_id =  self.read_byte(pci_legacy_ptr)
+            capability_id = self.read_byte(pci_legacy_ptr)
             if capability_id in CAP_LEGACY_DICT:
                 if capability_id in visited_capabilities:
-                    raise RuntimeError("Capability id {0} was seen before (avoid infinite loop).".format(capability_id)) 
+                    raise RuntimeError("Capability id {0} was seen before (avoid infinite loop).".format(capability_id))
                 cap_size = CAP_LEGACY_DICT[capability_id]
-                self._pci_conf_space["{0}_leg".format(capability_id)] = self.read(pci_legacy_ptr,  cap_size)
+                self._pci_conf_space["{0}_leg".format(capability_id)] = self.read(pci_legacy_ptr, cap_size)
                 visited_capabilities.append(capability_id)
             pci_legacy_ptr = self.read_byte(pci_legacy_ptr + 1)
 
         self.logger.debug("Reading and saving extended list ...")
         pci_extended_ptr = MAXIMUN_LEGACY_CAP_SIZE
         visited_capabilities = []
-        while pci_extended_ptr and pci_extended_ptr != 0xfff: # Reading PCI Extended Configurations on VM will return 0XFFF For FBSD
+        while pci_extended_ptr and pci_extended_ptr != 0xfff:  # Reading PCI Extended Configurations on VM will return 0XFFF For FBSD
             assert pci_extended_ptr >= MAXIMUN_LEGACY_CAP_SIZE, "Extended pointer (<{0:#x}>) is out of range".format(pci_extended_ptr)
             capability_id = self.read_word(pci_extended_ptr)
-            if capability_id is None: # Reading PCI Extended Configurations on VM will return None
+            if capability_id is None:  # Reading PCI Extended Configurations on VM will return None
                 break
             if capability_id in CAP_EXTENDED_DICT:
                 if capability_id in visited_capabilities:
@@ -164,7 +166,7 @@ def save_configuration_space(self, to_file=False):
             self.logger.debug("PCI Configuration space dict {0} saved to a file {1}".format(self._pci_conf_space, self.dump_file_path))
             self._pci_conf_space = {}
         self.logger.info("PCI Configurations for [{0} was saved successfully]".format(self.dbdf))
-    
+
     def restore_configuration_space(self):
         """
         Restore PCI configuration space of the device
@@ -173,21 +175,20 @@ def restore_configuration_space(self):
         if self._pci_conf_space == {}:
             self._pci_conf_space = self._get_pci_conf_from_file()
 
-        visited_capabilities = [] # Save the visited capability to avoid infinit loop
+        visited_capabilities = []  # Save the visited capability to avoid infinit loop
 
         # Read and save PCI configuration space offset from 0x0-0xfff
         # Reading the pci conf space one time to have better performance
         cached_data = self.read(offset=0x0, size=MAX_PCI_OFFSET, skip_offset_list=MELLANOX_PCI_SKIP_LIST)
         # write pci header 0x0-0x3f
         self.logger.debug("Writing PCI header [0x0-0x3f] ...")
-        self.write(0x10, 24, self._pci_conf_space["pci_header_bars"]) # Restore the BAR 
-        self.write(0x0, 16, self._pci_conf_space["pci_header_start"]) # and then restore bar_enable (part of the "start")
+        self.write(0x10, 24, self._pci_conf_space["pci_header_bars"])  # Restore the BAR
+        self.write(0x0, 16, self._pci_conf_space["pci_header_start"])  # and then restore bar_enable (part of the "start")
         self.write(0x28, 24, self._pci_conf_space["pci_header_end"])
 
-
         # Write Legacy list
         self.logger.debug("Writing back Legacy list ...")
-        pci_legacy_ptr =  self._fetch_byte(cached_data, CONFIG_SPACE_PTR_OFFSET)
+        pci_legacy_ptr = self._fetch_byte(cached_data, CONFIG_SPACE_PTR_OFFSET)
         while pci_legacy_ptr:
             assert 0 < pci_legacy_ptr < MAXIMUN_LEGACY_CAP_SIZE, "Legacy pointer (<{0:#x}>) is out of range".format(pci_legacy_ptr)
             capability_id = self._fetch_byte(cached_data, pci_legacy_ptr)
@@ -206,7 +207,7 @@ def restore_configuration_space(self):
         while pci_extended_ptr and pci_extended_ptr != 0xfff:
             assert pci_extended_ptr >= MAXIMUN_LEGACY_CAP_SIZE, "Extended pointer (<{0:#x}>) is out of range".format(pci_extended_ptr)
             capability_id = self._fetch_word(cached_data, pci_extended_ptr)
-            if capability_id is None: # Reading PCI Extended Configurations on VM will return None
+            if capability_id is None:  # Reading PCI Extended Configurations on VM will return None
                 break
             if capability_id in CAP_EXTENDED_DICT and "{0}_ext".format(capability_id) in self._pci_conf_space:
                 if capability_id in visited_capabilities:
@@ -215,16 +216,16 @@ def restore_configuration_space(self):
                 self.write(pci_extended_ptr, cap_size, self._pci_conf_space["{0}_ext".format(capability_id)])
                 visited_capabilities.append(capability_id)
             pci_extended_ptr = self._fetch_word(cached_data, pci_extended_ptr + 2) >> 4
-            
+
         self.logger.info("PCI Configurations for [{0} was restored successfully]".format(self.dbdf))
-    
+
     def _is_valid_range(self, offset, size):
         """
         A method to validate offset and size
         it returns True if the offset is valid, else False
         """
         return (offset + size <= 0xfffe)
-    
+
     def _is_valid_device(self):
         """
         Checks if the device is valid or not
@@ -234,21 +235,21 @@ def _is_valid_device(self):
         if self._vendor_id == 0xffff and self._dev_id == 0xffff:
             return False
         return True
-    
+
     def _get_pci_express_offset(self):
         """
         Get PCI express offset
         """
         visited_capabilities = []
-        pci_legacy_ptr =  self.read_byte(CONFIG_SPACE_PTR_OFFSET)
+        pci_legacy_ptr = self.read_byte(CONFIG_SPACE_PTR_OFFSET)
         while pci_legacy_ptr != 0:
             assert 0 < pci_legacy_ptr < MAXIMUN_LEGACY_CAP_SIZE, "Legacy pointer (<{0:#x}>) is out of range".format(pci_legacy_ptr)
-            capability_id =  self.read_byte(pci_legacy_ptr)
+            capability_id = self.read_byte(pci_legacy_ptr)
             if capability_id == 0x10:
                 return pci_legacy_ptr
             if capability_id in CAP_LEGACY_DICT:
                 if capability_id in visited_capabilities:
-                    raise RuntimeError("Capability id {0} was seen before (avoid infinite loop).".format(capability_id)) 
+                    raise RuntimeError("Capability id {0} was seen before (avoid infinite loop).".format(capability_id))
                 visited_capabilities.append(capability_id)
             pci_legacy_ptr = self.read_byte(pci_legacy_ptr + 1)
         raise RuntimeError("Failed to find pci express offset")
@@ -261,7 +262,7 @@ def dll_link_active(self):
         LINK_STATUS_REG_OFFSET = 0x12
         link_status_reg_address = self._pci_express_offset + LINK_STATUS_REG_OFFSET
         link_status_reg_value = self.read_word(link_status_reg_address)
-        dll_value_bin = bin(link_status_reg_value).replace('0b', '').zfill(16)[-13-1]  #bit 13
+        dll_value_bin = bin(link_status_reg_value).replace('0b', '').zfill(16)[-13 - 1]  # bit 13
         return int(dll_value_bin)
 
     @property
@@ -272,7 +273,7 @@ def dll_link_active_reporting_capable(self):
         LINK_CAPABILITIES_REG_OFFSET = 0xc
         link_capabilities_reg_address = self._pci_express_offset + LINK_CAPABILITIES_REG_OFFSET
         link_capabilities_reg_value = self.read_long(link_capabilities_reg_address)
-        dll_reporting_cable_bin = bin(link_capabilities_reg_value).replace('0b', '').zfill(32)[-20-1]  #bit 20
+        dll_reporting_cable_bin = bin(link_capabilities_reg_value).replace('0b', '').zfill(32)[-20 - 1]  # bit 20
         return int(dll_reporting_cable_bin)
 
     @property
@@ -283,7 +284,7 @@ def hotplug_capable(self):
         SLOT_CAPABILITIES_REG_OFFSET = 0x14
         slot_capabilities_address = self._pci_express_offset + SLOT_CAPABILITIES_REG_OFFSET
         slot_capabilities_value = self.read_long(slot_capabilities_address)
-        hotplug_capable_value_str = bin(slot_capabilities_value).replace('0b', '').zfill(32)[-6-1]  #bit 6
+        hotplug_capable_value_str = bin(slot_capabilities_value).replace('0b', '').zfill(32)[-6 - 1]  # bit 6
         return int(hotplug_capable_value_str)
 
     @property
@@ -294,7 +295,7 @@ def hotplug_interrupt_enable(self):
         SLOT_CONTROL_REG_OFFSET = 0x18
         slot_control_address = self._pci_express_offset + SLOT_CONTROL_REG_OFFSET
         slot_control_value = self.read_word(slot_control_address)
-        hotplug_interrupt_enable_value_str = bin(slot_control_value).replace('0b', '').zfill(16)[-5-1]  #bit 5
+        hotplug_interrupt_enable_value_str = bin(slot_control_value).replace('0b', '').zfill(16)[-5 - 1]  # bit 5
         return int(hotplug_interrupt_enable_value_str)
 
     # Helper methods
@@ -309,7 +310,7 @@ def _fetch_word(self, cached_pci_conf, offset):
         """
         Helper method that extract a word from a data that was read before
         """
-        if offset + 1 < len(cached_pci_conf): # Device does not have extended PCI configurationfor VMs
+        if offset + 1 < len(cached_pci_conf):  # Device does not have extended PCI configurationfor VMs
             byte0 = "{0:x}".format(cached_pci_conf[offset]).zfill(2)
             byte1 = "{0:x}".format(cached_pci_conf[offset + 1]).zfill(2)
             return int("{0}{1}".format(byte1, byte0), 16)
@@ -349,10 +350,10 @@ def read(self, offset, size, skip_offset_list=None):
             return self._bin_file.read(offset=offset, size=size, skip_offset_list=skip_offset_list)
         except Exception as e:
             raise RuntimeError("Failed to read offset [{0}] with size [{1}] for PCI device [{2}]. Error is [{3}]".format(offset, size, self.dbdf, e))
-    
+
     def read_byte(self, offset):
         return self._bin_file.read_byte(offset)
-    
+
     def read_word(self, offset):
         assert offset % 2 == 0, "Offset should be aligned to 2"
         return self._bin_file.read_word(offset)
@@ -364,13 +365,13 @@ def read_long(self, offset):
     def write(self, offset, size, bytes_list):
         super(LinuxPCIDevice, self).write(offset, size, bytes_list)
         self._bin_file.write(bytes_list=bytes_list, offset=offset, size=size)
-        self.logger.debug("Data was Written [{0}] to  offset[{1}] for PCI device [{2}]".format(bytes_list, offset, self.dbdf))    
+        self.logger.debug("Data was Written [{0}] to  offset[{1}] for PCI device [{2}]".format(bytes_list, offset, self.dbdf))
 
 
 class FreeBSDPCIDevice(PCIDeviceBase):
     """
     PCI device for FreeBSD
-    """ 
+    """
     def __init__(self, dbdf, debug_level="debug"):
         super(FreeBSDPCIDevice, self).__init__(dbdf, debug_level)
         if self._is_valid_device() == False:
@@ -379,12 +380,12 @@ def __init__(self, dbdf, debug_level="debug"):
         self._pci_express_offset = self._get_pci_express_offset()
 
     def align_to(self, number, base, round="down"):
-        if number%base == 0:
-            ret_number = number  
+        if number % base == 0:
+            ret_number = number
         elif round == "down":
             ret_number = number - number % base
         elif round == "up":
-            ret_number =  number - number % base + base
+            ret_number = number - number % base + base
         else:
             raise RuntimeError("Please add valid round: up/down")
         return ret_number
@@ -405,10 +406,10 @@ def read(self, offset, size, skip_offset_list=None):
                     rc, out, err = exec_cmd(read_cmd)
                     if rc:
                         raise RuntimeError("Failed to read using cmd {0}, Error[{1}]".format(read_cmd, err))
-                    pci_hex_data_list = out.replace("\n", " ").split(" ") # Remove new lines + split on spaces
+                    pci_hex_data_list = out.replace("\n", " ").split(" ")  # Remove new lines + split on spaces
                     for hex_str in pci_hex_data_list:
-                        if hex_str != '':  # little endian 
-                            bytes_as_string += [hex_str[6:8] , hex_str[4:6] , hex_str[2:4] , hex_str[0:2]]
+                        if hex_str != '':  # little endian
+                            bytes_as_string += [hex_str[6:8], hex_str[4:6], hex_str[2:4], hex_str[0:2]]
                 else:
                     bytes_as_string.append("00")
         except Exception as e:
@@ -424,7 +425,7 @@ def read(self, offset, size, skip_offset_list=None):
             else:
                 bytes_list.append(None)
         return bytes_list
-    
+
     def read_byte(self, offset):
         """
         Reads 1B from the pci configuration
@@ -463,12 +464,12 @@ def write(self, offset, size, bytes_list):
         super(FreeBSDPCIDevice, self).write(offset, size, bytes_list)
         # assert offset % 4 == 0, "Offset {0} is not aligned to 4".format(offset)
 
-        for ii,byte in enumerate(bytes_list):
-            write_cmd = "pciconf -wb {0} {1} {2:02x}".format(self.dbdf, offset+ii, byte)
+        for ii, byte in enumerate(bytes_list):
+            write_cmd = "pciconf -wb {0} {1} {2:02x}".format(self.dbdf, offset + ii, byte)
             rc, _, err = exec_cmd(write_cmd)
             if rc:
                 raise RuntimeError("Failed to write pci conf space data using cmd {0}, Error[{1}]".format(write_cmd, err))
-        
+
 
 def exec_cmd(cmd):
     """
@@ -484,6 +485,7 @@ def exec_cmd(cmd):
     stat = p.wait()
     return stat, output[0].decode('utf-8'), output[1].decode('utf-8')  # RC, Stdout, Stderr
 
+
 class PCIDeviceFactory(object):
     """
     A factory class for get the right PCIDevice
@@ -496,4 +498,4 @@ def get(dbdf, debug_level="critical"):
         elif "FreeBSD" in machine_platform:
             return FreeBSDPCIDevice(dbdf, debug_level)
         else:
-            raise RuntimeError("OS [%s] is not supported yet." % machine_platform)
\ No newline at end of file
+            raise RuntimeError("OS [%s] is not supported yet." % machine_platform)
diff --git a/small_utils/mread.c b/small_utils/mread.c
index 55001901..46b640b6 100644
--- a/small_utils/mread.c
+++ b/small_utils/mread.c
@@ -41,40 +41,45 @@
 #include <stdlib.h>
 #include <string.h>
 
-void usage(const char *n)
+void usage(const char* n)
 {
     printf("%s <device> <addr>\n", n);
     exit(1);
 }
 
-int main(int ac, char *av[])
+int main(int ac, char* av[])
 {
-    char          *endp;
+    char* endp;
     int rc = 0;
     unsigned int addr, val;
-    mfile         *mf;
+    mfile* mf;
 
-    if (ac != 3) {
+    if (ac != 3)
+    {
         usage(av[0]);
     }
 
     addr = strtoul(av[2], &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         usage(av[0]);
     }
 
     mf = mopen(av[1]);
-    if (!mf) {
+    if (!mf)
+    {
         perror("mopen");
         return 1;
     }
 
-    if ((rc = mread4(mf, addr, &val)) < 0) {
+    if ((rc = mread4(mf, addr, &val)) < 0)
+    {
         perror("mread");
         mclose(mf);
         return 1;
     }
-    if (rc < 4) {
+    if (rc < 4)
+    {
         mclose(mf);
         printf("Read only %d bytes\n", rc);
         return 1;
diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index 862724d5..8353e397 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 from __future__ import print_function
 
@@ -62,7 +62,7 @@
     from mlxfwresetlib.mlxfwreset_utils import is_in_internal_host, is_uefi_secureboot
     from mlxfwresetlib.mlxfwreset_mlnxdriver import MlnxDriver
     from mlxfwresetlib.mlxfwreset_mlnxdriver import DriverUnknownMode
-    from mlxfwresetlib.mlxfwreset_mlnxdriver import MlnxDriverFactory,MlnxDriverLinux
+    from mlxfwresetlib.mlxfwreset_mlnxdriver import MlnxDriverFactory, MlnxDriverLinux
     from mlxfwresetlib.mlxfwreset_status_checker import FirmwareResetStatusChecker
     from mlxfwresetlib.logger import LoggerFactory
     from mlxfwresetlib.cmd_reg_mfrl import CmdRegMfrl, CmdNotSupported
@@ -83,30 +83,33 @@
     sys.exit(1)
 
 # Constants ###########################
+
+
 class SyncOwner():
     TOOL = 0
     DRIVER = 1
 
+
 MLNX_DEVICES = [
-               dict(name="ConnectX2", devid=0x190),
-               dict(name="ConnectX3Pro", devid=0x1f7),
-               dict(name="ConnectIB", devid=0x1ff, status_config_not_done=(0xb0004, 31)),
-               dict(name="ConnectX4", devid=0x209, status_config_not_done=(0xb0004, 31)),
-               dict(name="ConnectX4LX", devid=0x20b, status_config_not_done=(0xb0004, 31)),
-               dict(name="ConnectX5", devid=0x20d, status_config_not_done=(0xb5e04, 31)),
-               dict(name="BlueField", devid=0x211, status_config_not_done=(0xb5e04, 31)),
-               dict(name="BlueField2", devid=0x214, status_config_not_done=(0xb5f04, 31)),
-               dict(name="BlueField3", devid=0x21c, status_config_not_done=(0xb5f04, 31)),
-               dict(name="BlueField4", devid=0x220, status_config_not_done=(0xb5f04, 31)),
-               dict(name="ConnectX6", devid=0x20f, status_config_not_done=(0xb5f04, 31)),
-               dict(name="ConnectX6DX", devid=0x212, status_config_not_done=(0xb5f04, 31)),
-               dict(name="ConnectX6LX", devid=0x216, status_config_not_done=(0xb5f04, 31)),
-               dict(name="ConnectX7", devid=0x218, status_config_not_done=(0xb5f04, 31)),
-               dict(name="ConnectX8", devid=0x21e, status_config_not_done=(0xb5f04, 31)),
-               dict(name="ConnectX3", devid=0x1f5),
-               dict(name="SwitchX", devid=0x245),
-               dict(name="IS4", devid=0x1b3),
-               ]
+    dict(name="ConnectX2", devid=0x190),
+    dict(name="ConnectX3Pro", devid=0x1f7),
+    dict(name="ConnectIB", devid=0x1ff, status_config_not_done=(0xb0004, 31)),
+    dict(name="ConnectX4", devid=0x209, status_config_not_done=(0xb0004, 31)),
+    dict(name="ConnectX4LX", devid=0x20b, status_config_not_done=(0xb0004, 31)),
+    dict(name="ConnectX5", devid=0x20d, status_config_not_done=(0xb5e04, 31)),
+    dict(name="BlueField", devid=0x211, status_config_not_done=(0xb5e04, 31)),
+    dict(name="BlueField2", devid=0x214, status_config_not_done=(0xb5f04, 31)),
+    dict(name="BlueField3", devid=0x21c, status_config_not_done=(0xb5f04, 31)),
+    dict(name="BlueField4", devid=0x220, status_config_not_done=(0xb5f04, 31)),
+    dict(name="ConnectX6", devid=0x20f, status_config_not_done=(0xb5f04, 31)),
+    dict(name="ConnectX6DX", devid=0x212, status_config_not_done=(0xb5f04, 31)),
+    dict(name="ConnectX6LX", devid=0x216, status_config_not_done=(0xb5f04, 31)),
+    dict(name="ConnectX7", devid=0x218, status_config_not_done=(0xb5f04, 31)),
+    dict(name="ConnectX8", devid=0x21e, status_config_not_done=(0xb5f04, 31)),
+    dict(name="ConnectX3", devid=0x1f5),
+    dict(name="SwitchX", devid=0x245),
+    dict(name="IS4", devid=0x1b3),
+]
 
 # Supported devices.
 SUPP_DEVICES = ["ConnectIB", "ConnectX4", "ConnectX4LX", "ConnectX5", "BlueField",
@@ -122,7 +125,7 @@ class SyncOwner():
 PROG = 'mlxfwreset'
 if IS_MSTFLINT:
     PROG = 'mstfwreset'
-    
+
 TOOL_VERSION = "1.0.0"
 
 DESCRIPTION = textwrap.dedent('''\
@@ -131,16 +134,16 @@ class SyncOwner():
     2. Perform reset operation on the device
 ''' % PROG)
 # Adresses    [Base    offset  length]
-DEVID_ADDR = [0xf0014, 0     , 16   ]
+DEVID_ADDR = [0xf0014, 0, 16]
 
 COMMAND_ADDR = 0x4
 
-#sync constants:
-SYNC_TYPE_FW_RESET   = 0x1
-SYNC_STATE_IDLE      = 0x0
+# sync constants:
+SYNC_TYPE_FW_RESET = 0x1
+SYNC_STATE_IDLE = 0x0
 SYNC_STATE_GET_READY = 0x1
-SYNC_STATE_GO        = 0x2
-SYNC_STATE_DONE      = 0x3
+SYNC_STATE_GO = 0x2
+SYNC_STATE_DONE = 0x3
 
 # reg access Object
 RegAccessObj = None
@@ -166,10 +169,10 @@ class SyncOwner():
 logger = None
 device_global = None
 
-pciModuleName      = "mst_ppc_pci_reset.ko"
+pciModuleName = "mst_ppc_pci_reset.ko"
 pathToPciModuleDir = "/etc/mft/mlxfwreset"
 
-SUPPORTED_DEVICES_WITH_SWITCHES = ["15b3", "10ee","1af4"] #1af4 for Red Hat (virtio)
+SUPPORTED_DEVICES_WITH_SWITCHES = ["15b3", "10ee", "1af4"]  # 1af4 for Red Hat (virtio)
 
 
 ######################################################################
@@ -183,6 +186,8 @@ class PcnrError(Exception):
 # Description:  NoError Exception
 # OS Support :  Linux/FreeBSD/Windows.
 ######################################################################
+
+
 class NoError(Exception):
     pass
 
@@ -190,6 +195,8 @@ class NoError(Exception):
 # Description:  Warning Exception
 # OS Support :  Linux/FreeBSD/Windows.
 ######################################################################
+
+
 class WarningException(Exception):
     pass
 
@@ -197,6 +204,8 @@ class WarningException(Exception):
 # Description:  NoPciBridge Exception
 # OS Support :  Linux/FreeBSD/Windows.
 ######################################################################
+
+
 class NoPciBridgeException(Exception):
     pass
 
@@ -204,6 +213,8 @@ class NoPciBridgeException(Exception):
 # Description:  is_fw_ready
 # OS Support :  Linux/FreeBSD/Windows.
 ######################################################################
+
+
 def is_fw_ready(device):
     'Check if FW is ready to get icmd'
 
@@ -219,13 +230,15 @@ def is_fw_ready(device):
         status_config_not_done = mcraRead(device, address, offset, 1)
         return False if status_config_not_done == 1 else True
 
-    except:
+    except BaseException:
         raise RuntimeError("Failed to check if fw is ready to get ICMD")
 
 ######################################################################
 # Description:  wait_for_fw_ready
 # OS Support :  Linux/FreeBSD/Windows.
 ######################################################################
+
+
 def wait_for_fw_ready(device):
     'Wait for FW to be ready to get icmd'
 
@@ -233,17 +246,16 @@ def wait_for_fw_ready(device):
     POLL_SLEEP_INTERVAL = 0.001
 
     for ii in range(MAX_POLL_CNTR):
-        if is_fw_ready(device) == True:
+        if is_fw_ready(device):
             break
         else:
             time.sleep(POLL_SLEEP_INTERVAL)
-            if ii % 100 == 0: logger.debug("FW isn't ready ii={0}".format(ii))
+            if ii % 100 == 0:
+                logger.debug("FW isn't ready ii={0}".format(ii))
     else:
         logger.debug("Exit polling before FW is ready!!!!")
 
 
-
-
 ######################################################################
 # Description:  reset_fsm_register
 # OS Support :  Linux/FreeBSD/Windows.
@@ -262,17 +274,20 @@ def reset_fsm_register():
 # OS Support :  Linux/FreeBSDWindows.
 ######################################################################
 
+
 def sigHndl(signal, frame):
     reset_fsm_register()
 
     print("\nSignal %d received, Exiting..." % signal)
     sys.exit(1)
 
+
 def set_signal_handler():
     "Call sigHndl() when the user exit the process by typing ctrl+c or kill the process"
     signal.signal(signal.SIGINT, sigHndl)
     signal.signal(signal.SIGTERM, sigHndl)
 
+
 def ignore_signals():
     "Disable the option to cancel operation with ctrl+c or kill"
     signal.signal(signal.SIGINT, signal.SIG_IGN)
@@ -298,6 +313,8 @@ def isModuleLoaded(moduleName):
 #               use when txt needs to appear immediately on screen
 # OS Support :  Linux/Windows.
 ######################################################################
+
+
 def printAndFlush(str, endChar='\n'):
     print(str, end=endChar)
     sys.stdout.flush()
@@ -308,13 +325,14 @@ def printAndFlush(str, endChar='\n'):
 # OS Support :  Linux/Windows.
 ######################################################################
 
+
 def AskUser(question, autoYes=False):
     qStr = question + "?[y/N] "
-    if autoYes :
+    if autoYes:
         print(qStr + "y")
         return
     ans = raw_input(qStr)
-    if ans.lower() in ['y', "yes"] :
+    if ans.lower() in ['y', "yes"]:
         return
     raise RuntimeError("Aborted by user")
 
@@ -323,18 +341,20 @@ def AskUser(question, autoYes=False):
 # OS Support :  Linux/Windows.
 ######################################################################
 
+
 def mcraRead(device, addr, offset, length):
     cmd = "%s %s %s.%s:%s" % (MCRA, device, addr, offset, length)
     (rc, stdout, stderr) = cmdExec(cmd)
     if rc:
-        raise RuntimeError (str(stderr))
+        raise RuntimeError(str(stderr))
     return int(stdout, 16)
 
+
 def mcraWrite(device, addr, offset, length, value):
     cmd = "%s %s %s.%s:%s %s" % (MCRA, device, addr, offset, length, value)
     (rc, _, stderr) = cmdExec(cmd)
     if rc:
-        raise RuntimeError (str(stderr))
+        raise RuntimeError(str(stderr))
 
 
 ######################################################################
@@ -345,7 +365,7 @@ def getLinuxKernelVersion():
     cmd = 'uname -r'
     (rc, stdout, stderr) = cmdExec(cmd)
     if rc:
-        raise RuntimeError (str(stderr))
+        raise RuntimeError(str(stderr))
     pattern = r'(\d+\.\d+)\..*'
     result = re.match(pattern, stdout)
     if result:
@@ -364,10 +384,10 @@ class MlnxPciOp(object):
     """ Abstract Class that provides a unified way to perform pci operations
     """
     def __init__(self):
-        self.bridgeAddr=None
-    def read(self, devAddr, addr, width = "L"):
+        self.bridgeAddr = None
+    def read(self, devAddr, addr, width="L"):
         raise NotImplementedError("read() is not implemented")
-    def write(self, devAddr, addr, val, width = "L"):
+    def write(self, devAddr, addr, val, width="L"):
         raise NotImplementedError("write() is not implemented")
     def isMellanoxDevice(self, devAddr):
         raise NotImplementedError("isMellanoxDevice() is not implemented")
@@ -381,17 +401,18 @@ def savePCIConfigurationSpace(self, devAddr, pci_device):
         raise NotImplementedError("savePCIConfigurationSpace() is not implemented")
     def loadPCIConfigurationSpace(self, devAddr, pci_device, full=True):
         raise NotImplementedError("loadPCIConfigurationSpace() is not implemented")
-    def waitForDevice(self,devAddr):
-        pass # TODO need to implement for FreeBSD
-    def getAllBuses(self,devices):
+    def waitForDevice(self, devAddr):
+        pass  # TODO need to implement for FreeBSD
+    def getAllBuses(self, devices):
         raise NotImplementedError("getAllBuses() is not implemented")
-    def removeDevice(self,devAddr):
+    def removeDevice(self, devAddr):
         raise NotImplementedError("removeDevice() is not implemented")
     def rescan(self):
         raise NotImplementedError("rescan() is not implemented")
     def setPciBridgeAddr(self, bridgeAddr):
         self.bridgeAddr = bridgeAddr
 
+
 def printBuf(buf):
     bytes = buf.tolist()
     for i in range(len(bytes)):
@@ -408,40 +429,40 @@ class MlnxPciOpLinux(MlnxPciOp):
     def __init__(self):
         super(MlnxPciOpLinux, self).__init__()
         self.pciConfSpaceMap = {}
-        self.device_control_register_old = {} # key is dbdf, value is configuration of "device_control_register"
+        self.device_control_register_old = {}  # key is dbdf, value is configuration of "device_control_register"
 
-    def savePciConfOptimalValues(self,devAddr):
+    def savePciConfOptimalValues(self, devAddr):
         logger.debug("Saving device control register for device: %s" % devAddr)
         # Save the BIOS values of "device control register" (need to restore in case of OS 'remove'/'rescan')
         assert devAddr not in self.device_control_register_old, 'savePCIConfigurationSpace - {0} is already in dictionary'.format(devAddr)
-        self.device_control_register_old[devAddr] = self.read(devAddr, 0x68, 'w') # Reading "Device Control Register" (BIOS values)
+        self.device_control_register_old[devAddr] = self.read(devAddr, 0x68, 'w')  # Reading "Device Control Register" (BIOS values)
         logger.debug("Saving device control register for device: %s - DONE" % devAddr)
 
-    def loadPciConfOptimalValues(self,devAddr):
+    def loadPciConfOptimalValues(self, devAddr):
         logger.debug("Restoring device control register for device: %s" % devAddr)
         # bits 5-7 max_payload_size ; bits 12-14 max_read_request_size in "Device Control Register"
         MASK = 0b0111000011100000
         MASK__ = 0b1000111100011111
 
         assert devAddr in self.device_control_register_old, 'loadPciConfOptimalValues: {0} is not in dictionay'.format(devAddr)
-        device_control_register_new = self.read(devAddr, 0x68,'w')  # Reading "Device Control Register" (after pci 'rescan')
+        device_control_register_new = self.read(devAddr, 0x68, 'w')  # Reading "Device Control Register" (after pci 'rescan')
         device_control_register_updated = (device_control_register_new & MASK__) | (self.device_control_register_old[devAddr] & MASK)
         self.write(devAddr, 0x68, device_control_register_updated, 'w')  # Overwriting "Device Control Register"
         logger.debug("Restoring device control register for device: %s - Done" % devAddr)
 
-    def read(self, devAddr, addr, width = "L"):
+    def read(self, devAddr, addr, width="L"):
         cmd = "setpci -s %s 0x%x.%s" % (devAddr, addr, width)
         (rc, out, _) = cmdExec(cmd)
-        logger.debug('read : cmd={0} rc={1} out={2}'.format(cmd,rc,out))
+        logger.debug('read : cmd={0} rc={1} out={2}'.format(cmd, rc, out))
         if rc != 0 or not out:
             raise RuntimeError("Failed to read address 0x%x from device %s " % (addr, devAddr))
         return int(out, 16)
 
-    def write(self, devAddr, addr, val, width = "L"):
+    def write(self, devAddr, addr, val, width="L"):
 
         cmd = "setpci -s %s 0x%x.%s=0x%x" % (devAddr, addr, width, val)
         (rc, out, _) = cmdExec(cmd)
-        logger.debug('write : cmd={0} rc={1} out={2}'.format(cmd,rc,out))
+        logger.debug('write : cmd={0} rc={1} out={2}'.format(cmd, rc, out))
         if rc != 0:
             raise RuntimeError("Failed to write 0x%x to address 0x%x to device %s " % (val, addr, devAddr))
         return
@@ -459,20 +480,20 @@ def isMellanoxDevice(self, devAddr):
         return False
 
     def getPciBridgeAddr(self, devAddr):
-        if self.bridgeAddr : # user specified the bridge address
+        if self.bridgeAddr:  # user specified the bridge address
             return self.bridgeAddr
         devAddr = mlxfwreset_utils.addDomainToAddress(devAddr)
         cmd = r'readlink /sys/bus/pci/devices/%s | sed -e "s/.*\/\([0-9a-f:.]*\)\/%s/\1/g"' % (devAddr, devAddr)
         (rc, out, _) = cmdExec(cmd)
         bridgeDev = out.strip()
-        result = re.match(r'^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}\.[0-9A-Fa-f]$',bridgeDev)
+        result = re.match(r'^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}\.[0-9A-Fa-f]$', bridgeDev)
         if rc != 0 or result is None:
             raise NoPciBridgeException("Failed to get Bridge Device for the given PCI device! You might be running on a Virtual Machine!")
 
         return bridgeDev
 
     def getPciECapAddr(self, bridgeDev):
-        cmd = "lspci -s %s -v | grep 'Capabilities: \[.*\] Express' | sed -e 's/.*\[\([0-9,a-f].*\)\].*/\\1/g'" % bridgeDev
+        cmd = "lspci -s %s -v | grep 'Capabilities: \\[.*\\] Express' | sed -e 's/.*\\[\\([0-9,a-f].*\\)\\].*/\\1/g'" % bridgeDev
         (rc, capAddr, _) = cmdExec(cmd)
         if rc != 0 or len(capAddr.strip()) == 0:
             raise RuntimeError("Failed to find PCI bridge Pci Express Capability")
@@ -488,13 +509,13 @@ def getAllPciDevices(self, devAddr):
             i = q.get()
             files = os.listdir(i)
             for file in files:
-                if re.match(r'^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}\.[0-9A-Fa-f]$',file) is not None:
+                if re.match(r'^[0-9A-Fa-f]{4}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}\.[0-9A-Fa-f]$', file) is not None:
                     if self.getVendorId(file) in SUPPORTED_DEVICES_WITH_SWITCHES:
                         q.put(i + "/" + file)
                         devices.append(file)
         return devices
 
-    def getMFDeviceList(self,devAddr):
+    def getMFDeviceList(self, devAddr):
         """
         Return the device and the sibling devices (in case of Innova also cousins devices)
         """
@@ -502,19 +523,19 @@ def getMFDeviceList(self,devAddr):
         domainBus = ":".join(devAddr.split(":")[:2])
 
         if "ppc64" in platform.machine():
-            cmd = "lspci -d 15b3: -s {0}: -D | grep -v DMA".format(domainBus) # list without NVME emulation (on bluefield)
+            cmd = "lspci -d 15b3: -s {0}: -D | grep -v DMA".format(domainBus)  # list without NVME emulation (on bluefield)
             (rc, out, _) = cmdExec(cmd)
             if rc != 0:
                 raise RuntimeError("failed to execute: {0}".format(cmd))
             for line in out.splitlines():
                 MFDevices.append(line.split()[0])
-        else: 
+        else:
             pci_device_bridge1 = self.getPciBridgeAddr(devAddr)
-            if is_in_internal_host(): # Bluefield (NIC only reset)
+            if is_in_internal_host():  # Bluefield (NIC only reset)
                 pci_device_bridge2 = self.getPciBridgeAddr(pci_device_bridge1)
-                pci_device_bridge3 = self.getPciBridgeAddr(pci_device_bridge2)    
+                pci_device_bridge3 = self.getPciBridgeAddr(pci_device_bridge2)
                 return self.getAllPciDevices(pci_device_bridge3)
-            elif is_mellanox_device(pci_device_bridge1): # Innova
+            elif is_mellanox_device(pci_device_bridge1):  # Innova
                 pci_device_bridge2 = self.getPciBridgeAddr(pci_device_bridge1)
                 return self.getAllPciDevices(pci_device_bridge2)
             else:
@@ -532,15 +553,14 @@ def savePCIConfigurationSpace(self, devAddr, pci_device):
         pci_device.save_configuration_space()
 
     def loadPCIConfigurationSpace(self, devAddr, pci_device, full=True):
-        if full == True:
+        if full:
             pci_device.restore_configuration_space()
-        else: # OS 'remove'/'rescan' -> need to restore optimal value in "device control register" for old kernel module
+        else:  # OS 'remove'/'rescan' -> need to restore optimal value in "device control register" for old kernel module
             if getLinuxKernelVersion() < 4.2:
                 logger.info('old kernel')
                 self.loadPciConfOptimalValues(devAddr)
 
-
-    def waitForDevice(self,devAddr):
+    def waitForDevice(self, devAddr):
         logger.info('waitForDevice() called. Input is {0}'.format(devAddr))
         path = '/sys/bus/pci/devices/{0}/config'.format(devAddr)
         TIMEOUT = 100
@@ -552,12 +572,11 @@ def waitForDevice(self,devAddr):
 
         raise RuntimeError('Failed to find device in {0}'.format(path))
 
-    def removeDevice(self,devAddr):
+    def removeDevice(self, devAddr):
         cmd = 'echo 1 > /sys/bus/pci/devices/{0}/remove'.format(devAddr)
         (rc, _, _) = cmdExec(cmd)
         if rc != 0:
-           raise RuntimeError("failed to execute: %s" % cmd)
-
+            raise RuntimeError("failed to execute: %s" % cmd)
 
     def rescan(self):
         # TODO check how to exit if rescan is not back
@@ -565,22 +584,23 @@ def rescan(self):
         cmd = 'echo 1 > /sys/bus/pci/rescan'
         (rc, _, _) = cmdExec(cmd)
         if rc != 0:
-           raise RuntimeError("failed to execute: %s" % cmd)
+            raise RuntimeError("failed to execute: %s" % cmd)
 
-    def getAllBuses(self,devices):         
-        buses =[]
+    def getAllBuses(self, devices):
+        buses = []
         for dev in devices:
-            busId =  mlxfwreset_utils.getDevDBDF(dev)            
+            busId = mlxfwreset_utils.getDevDBDF(dev)
             buses += self.getMFDeviceList(busId)
         return buses
 
+
 class MlnxPciOpFreeBSD(MlnxPciOp):
 
     def __init__(self):
         super(MlnxPciOpFreeBSD, self).__init__()
         self.pciConfSpaceMap = {}
 
-    def read(self, devAddr, addr, width = "L"):
+    def read(self, devAddr, addr, width="L"):
         if not(devAddr.startswith("pci")):
             devAddr = "pci" + devAddr
         cmd = "pciconf -r %s 0x%x" % (devAddr, addr)
@@ -589,7 +609,7 @@ def read(self, devAddr, addr, width = "L"):
             raise RuntimeError("Failed to read address 0x%x from device %s " % (addr, devAddr))
         return int(out, 16)
 
-    def write(self, devAddr, addr, val, width = "L"):
+    def write(self, devAddr, addr, val, width="L"):
         if not(devAddr.startswith("pci")):
             devAddr = "pci" + devAddr
         cmd = "pciconf -w %s 0x%x 0x%x" % (devAddr, addr, val)
@@ -608,9 +628,9 @@ def isMellanoxDevice(self, devAddr):
         return False
 
     def getPciBridgeAddr(self, devAddr):
-        if self.bridgeAddr : # user specified bridge addr
+        if self.bridgeAddr:  # user specified bridge addr
             return self.bridgeAddr
-        if re.match("^\d+\:\d+\:\d+\:\d+$", devAddr) == None:
+        if re.match("^\\d+\\:\\d+\\:\\d+\\:\\d+$", devAddr) is None:
             raise RuntimeError("Illegal format for the device PCI address: %s" % devAddr)
         busNum = devAddr.split(":")[1]
         cmd = "sysctl -a | grep \"secbus: %s\"" % busNum
@@ -619,37 +639,37 @@ def getPciBridgeAddr(self, devAddr):
             raise NoPciBridgeException("Failed to get Bridge Device for the given PCI device! You might be running on a Virtual Machine!")
         linesCount = len(out.splitlines())
         if(linesCount == 0):
-            raise RuntimeError("There is no secbus with the value: %s" %busNum)
+            raise RuntimeError("There is no secbus with the value: %s" % busNum)
         if(linesCount > 1):
-            raise RuntimeError("Found more than one secbus with the value: %s" %busNum)
-        hostBridge = "pcib%s" %(out.split("pcib.")[1].split(".")[0])
-        
+            raise RuntimeError("Found more than one secbus with the value: %s" % busNum)
+        hostBridge = "pcib%s" % (out.split("pcib.")[1].split(".")[0])
+
         # get pci address of hostBridge
         cmd = "pciconf -l | grep {0}".format(hostBridge)
         rc, out, _ = cmdExec(cmd)
         if rc != 0:
             raise RuntimeError("Failed to extract PCI bridge address ({0})".format(cmd))
         try:
-            bridgeDevAddr = out.split()[0].split('@')[1][:-1] # Extract the pci device from the output
-        except:
+            bridgeDevAddr = out.split()[0].split('@')[1][:-1]  # Extract the pci device from the output
+        except BaseException:
             raise RuntimeError("Failed to extract PCI bridge address ({0})".format(out))
         return bridgeDevAddr
 
     def getPciECapAddr(self, bridgeDev):
-        cmd = "pciconf -lc %s | grep \"cap 10\" | sed -e 's/.*\[\([0-9,a-f]*\)\].*/\\1/g'" % bridgeDev
+        cmd = "pciconf -lc %s | grep \"cap 10\" | sed -e 's/.*\\[\\([0-9,a-f]*\\)\\].*/\\1/g'" % bridgeDev
         (rc, capAddr, _) = cmdExec(cmd)
         if rc != 0 or len(capAddr.strip()) == 0:
             raise RuntimeError("Failed to find PCI bridge Pci Express Capability")
         return int(capAddr, 16)
-    
+
     def getMFDeviceList(self, devAddr):
         MFDevices = []
         domainBus = ":".join(devAddr.split(":")[:-2])
         domainBus = "pci" + domainBus
-        cmd = "pciconf -l | grep 'chip=0x[0-9,a-f]\{4\}15b3 \|vendor=0x15b3' | grep %s | cut -f1 | cut -d@ -f2" %domainBus
+        cmd = "pciconf -l | grep 'chip=0x[0-9,a-f]\\{4\\}15b3 \\|vendor=0x15b3' | grep %s | cut -f1 | cut -d@ -f2" % domainBus
         (rc, out, _) = cmdExec(cmd)
-        if rc != 0 :
-            raise RuntimeError("failed to get execure: %s" %cmd)
+        if rc != 0:
+            raise RuntimeError("failed to get execure: %s" % cmd)
         out = out.strip().split('\n')
         for dev in out:
             MFDevices.append(dev[:-1])
@@ -662,7 +682,9 @@ def savePCIConfigurationSpace(self, devAddr, pci_device):
     def loadPCIConfigurationSpace(self, devAddr, pci_device, full=True):
         pci_device.restore_configuration_space()
 
-# TODO are we using this class ??? 
+# TODO are we using this class ???
+
+
 class MlnxPciOpWindows(MlnxPciOp):
 
     def __init__(self):
@@ -670,14 +692,14 @@ def __init__(self):
         self.lspciPath = os.path.join("c:", "pciutils-3.3.0", "lspci")
         self.setPciPath = os.path.join("c:", "pciutils-3.3.0", "setpci")
 
-    def read(self, devAddr, addr, width = "L"):
+    def read(self, devAddr, addr, width="L"):
         cmd = self.setPciPath + " -s %s 0x%x.%s" % (devAddr, addr, width)
         (rc, out, _) = cmdExec(cmd)
         if rc != 0:
             raise RuntimeError("Failed to read address 0x%x from device %s " % (addr, devAddr))
         return int(out, 16)
 
-    def write(self, devAddr, addr, val, width = "L"):
+    def write(self, devAddr, addr, val, width="L"):
         cmd = self.setPciPath + " -s %s 0x%x.%s=0x%x" % (devAddr, addr, width, val)
         (rc, out, _) = cmdExec(cmd)
         if rc != 0:
@@ -692,13 +714,13 @@ def getPciECapAddr(self, bridgeDev):
 
     def savePCIConfigurationSpace(self, devAddr, pci_device):
         raise NotImplementedError("savePCIConfigurationSpace() not implemented for windows")
-    
-    def loadPCIConfigurationSpace(self, devAddr, pci_device,full=True):
+
+    def loadPCIConfigurationSpace(self, devAddr, pci_device, full=True):
         raise NotImplementedError("loadPCIConfigurationSpace() not implemented for windows")
 
 
 class MlnxPciOpFactory(object):
-    def getPciOpObj(self,dbdf):
+    def getPciOpObj(self, dbdf):
         operatingSystem = platform.system()
         if operatingSystem == "Linux":
             return MlnxPciOpLinux()
@@ -715,6 +737,7 @@ def getPciOpObj(self,dbdf):
 # OS Support :  Linux.
 ######################################################################
 
+
 def mstRestart(busId):
     global MstFlags
     if platform.system() == "FreeBSD" or platform.system() == "Windows":
@@ -732,7 +755,7 @@ def mstRestart(busId):
             return 1
         if matchedLines[0].split()[-1] == '0':
             break
-        else :
+        else:
             time.sleep(2)
 
     cmd = "lspci -s %s" % busId
@@ -744,11 +767,11 @@ def mstRestart(busId):
         if rc == 0 and stdout != "":
             foundBus = True
             break
-        else :
+        else:
             time.sleep(2)
     if rc != 0:
         raise WarningException("Failed to run lspci command, please restart MST manually")
-    if foundBus == False:
+    if not foundBus:
         raise RuntimeError("The device is not appearing in lspci output!")
 
     ignore_signals()
@@ -756,7 +779,7 @@ def mstRestart(busId):
     logger.debug('Execute {0}'.format(cmd))
     (rc, stdout, stderr) = cmdExec(cmd)
     if rc != 0:
-        logger.debug('stdout:\n{0}\nstderr:\n{1}'.format(stdout,stderr))
+        logger.debug('stdout:\n{0}\nstderr:\n{1}'.format(stdout, stderr))
         raise WarningException("Failed to restart MST, please restart MST manually")
     set_signal_handler()
     return 0
@@ -766,7 +789,9 @@ def mstRestart(busId):
 # OS Support :  Linux/Windows.
 ######################################################################
 
-getDevidFromDevice = lambda device: mcraRead(device, DEVID_ADDR[0], DEVID_ADDR[1], DEVID_ADDR[2])
+
+def getDevidFromDevice(device):
+    return mcraRead(device, DEVID_ADDR[0], DEVID_ADDR[1], DEVID_ADDR[2])
 
 
 ######################################################################
@@ -783,7 +808,7 @@ def isDevSupp(device):
         raise RuntimeError("Failed to Identify Device: %s, %s" % (device, str(e)))
     for devDict in MLNX_DEVICES:
         if devDict["devid"] == devid:
-            if devDict["name"] in SUPP_DEVICES :
+            if devDict["name"] in SUPP_DEVICES:
                 return
             else:
                 raise RuntimeError("Unsupported Device: %s (%s)" % (device, devDict["name"]))
@@ -794,14 +819,15 @@ def isDevSupp(device):
 # OS Support : Linux
 ######################################################################
 
+
 def getAllPciModulePaths():
     global pciModuleName
     global pathToPciModuleDir
     paths = []
     for f in os.listdir(pathToPciModuleDir):
-        if os.path.isdir(os.path.join(pathToPciModuleDir, f)) == True:
+        if os.path.isdir(os.path.join(pathToPciModuleDir, f)):
             p = os.path.join(pathToPciModuleDir, f, pciModuleName)
-            if os.path.isfile(p) == True:
+            if os.path.isfile(p):
                 paths.append(p)
     return paths
 
@@ -810,15 +836,16 @@ def getAllPciModulePaths():
 # OS Support : Linux
 ######################################################################
 
+
 def getPciModulePath():
     global pciModuleName
     global pathToPciModuleDir
     cmd = "uname -r"
     (rc, unameOutput, _) = cmdExec(cmd)
-    if rc != 0 :
+    if rc != 0:
         return (False, getAllPciModulePaths())
     pathToModule = os.path.join(pathToPciModuleDir, unameOutput.strip(), pciModuleName)
-    if os.path.isfile(pathToModule) == True:
+    if os.path.isfile(pathToModule):
         return (True, pathToModule)
     else:
         return (False, getAllPciModulePaths())
@@ -828,13 +855,14 @@ def getPciModulePath():
 # OS Support: Linux
 #####################################################################
 
+
 def runPPCPciResetModule(path, busIds):
     busIdStr = ",".join(busIds)
     cmd = "insmod %s pci_dev=%s" % (path, busIdStr)
     logger.debug(cmd)
     (rc, out, err) = cmdExec(cmd)
-    if rc != 0 :
-        #check if failure is related to SELinux
+    if rc != 0:
+        # check if failure is related to SELinux
         if "Permission denied" in err:
             chconCmd = "chcon -t modules_object_t %s" % path
             (rc, out, err) = cmdExec(chconCmd)
@@ -850,6 +878,7 @@ def runPPCPciResetModule(path, busIds):
 # OS Support : Linux
 ######################################################################
 
+
 def resetPciAddrPPC(busIds):
 
     logger.debug('resetPciAddrPPC() called. input is {0}'.format(busIds))
@@ -858,35 +887,35 @@ def resetPciAddrPPC(busIds):
     if platform.system() != "Linux":
         raise RuntimeError("Unsupported OS(%s) for PPC reset flow" % (platform.system()))
 
-    if isModuleLoaded("mst_ppc_pci_reset") == True:
+    if isModuleLoaded("mst_ppc_pci_reset"):
         logger.debug('Unload the module "mst_ppc_pci_reset"')
         cmd = "rmmod mst_ppc_pci_reset"
         logger.debug(cmd)
         (rc, out, _) = cmdExec(cmd)
-    if isModuleLoaded("mst_ppc_pci_reset") == True:
+    if isModuleLoaded("mst_ppc_pci_reset"):
         raise RuntimeError("Failed to unload mst_ppc_pci_reset module. please unload it manually and try again.")
 
     logger.debug('Load the module "mst_ppc_pci_reset"')
     (foundModule, path) = getPciModulePath()
-    if foundModule == True:
+    if foundModule:
         (res, err) = runPPCPciResetModule(path, busIds)
-        if res == False:
+        if not res:
             raise RuntimeError("Failed to load pci reset module, make sure kernel-mft is installed properly: %s" % err)
     else:
         foundWorkingModule = False
         for p in path:
             (res, err) = runPPCPciResetModule(path, busIds)
-            if res == True:
+            if res:
                 foundWorkingModule = True
                 break
-        if foundWorkingModule == False:
+        if not foundWorkingModule:
             raise RuntimeError("Can not find the module: %s" % pciModuleName)
 
     logger.debug('Unload the module "mst_ppc_pci_reset"')
     cmd = "rmmod mst_ppc_pci_reset"
     logger.debug(cmd)
     (rc, out, err) = cmdExec(cmd)
-    if rc != 0 :
+    if rc != 0:
         raise RuntimeError("Failed to unload pci reset module: %s please unload the module manually" % err)
 
 
@@ -905,16 +934,17 @@ def resetPciAddrWindows(dbdf_list):
 # OS Support : Linux, FreeBSD
 ######################################################################
 
+
 def disablePci(bridgeDev, capAddr):
     logger.debug('disablePci() called')
-    
+
     disableAddr = capAddr + 0x10
     width = "L"
     oldCapDw = PciOpsObj.read(bridgeDev, disableAddr, width)
     # turn on Link Disable bit
     logger.debug('Disable PCI bridge {0} Link Control Register address {1:x}'.format(bridgeDev, disableAddr))
     newCapDw = oldCapDw | 0x10
-    logger.debug('old value: {0:x}; new value: {1:x}'.format(oldCapDw,newCapDw))
+    logger.debug('old value: {0:x}; new value: {1:x}'.format(oldCapDw, newCapDw))
     PciOpsObj.write(bridgeDev, disableAddr, newCapDw, width)
 
     return (bridgeDev, disableAddr, oldCapDw, width)
@@ -930,11 +960,11 @@ def enablePci(bridgeDev, disableAddr, oldCapDw, width):
 # OS Support : Linux, FreeBSD, Windows
 ######################################################################
 
-def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
+def resetPciAddr(device, devicesSD, driverObj, cmdLineArgs):
 
     isPPC = "ppc64" in platform.machine()
     isWindows = platform.system() == "Windows"
-    
+
     busId = DevDBDF
 
     # Determine the pci-device to poll (first Mellanox device in the pci tree)
@@ -943,14 +973,14 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
         pci_devices_to_poll_devid = []
         root_pci_devices = []
 
-        if is_in_internal_host(): # Bluefied (NIC only reset)
+        if is_in_internal_host():  # Bluefied (NIC only reset)
             pci_device_bridge1 = PciOpsObj.getPciBridgeAddr(DevDBDF)
             pci_device_bridge2 = PciOpsObj.getPciBridgeAddr(pci_device_bridge1)
             pci_device_bridge3 = PciOpsObj.getPciBridgeAddr(pci_device_bridge2)
 
             pci_devices_to_poll_devid.append(pci_device_bridge3)
             root_pci_devices.append(PCIDeviceFactory().get(pci_device_bridge3, "debug"))
-        elif is_pci_bridge_is_mellanox_device(DevDBDF): # Innova (FPGA)
+        elif is_pci_bridge_is_mellanox_device(DevDBDF):  # Innova (FPGA)
             pci_device_bridge1 = PciOpsObj.getPciBridgeAddr(DevDBDF)
             pci_device_bridge2 = PciOpsObj.getPciBridgeAddr(pci_device_bridge1)
             pci_device_bridge3 = PciOpsObj.getPciBridgeAddr(pci_device_bridge2)
@@ -963,7 +993,7 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
                 dbdf = mlxfwreset_utils.getDevDBDF(dev, logger)
                 pci_devices_to_poll_devid.append(dbdf)
 
-                if not isPPC: # PPC can run on VM (no PCI bridge device)
+                if not isPPC:  # PPC can run on VM (no PCI bridge device)
                     pci_device_bridge = PciOpsObj.getPciBridgeAddr(dbdf)
                     root_pci_devices.append(PCIDeviceFactory().get(pci_device_bridge, "debug"))
 
@@ -973,11 +1003,10 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
             for root_pci_device in root_pci_devices:
                 logger.info('root_pci_device={0}'.format(root_pci_device.dbdf))
 
-
-    if isWindows is False: # relevant for ppc(p7) TODO check power8/9 shouldn't use mst-save/load
+    if isWindows is False:  # relevant for ppc(p7) TODO check power8/9 shouldn't use mst-save/load
         logger.info('Save PCI Configuration space ...')
-       
-        devList = PciOpsObj.getMFDeviceList(busId) # Get all devices that you want to save/load pci configuration
+
+        devList = PciOpsObj.getMFDeviceList(busId)  # Get all devices that you want to save/load pci configuration
         logger.debug('devList is {0}'.format(devList))
         # for each PF/VF save its configuration space
         pci_device_dict = {}
@@ -1000,24 +1029,23 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
                 PciOpsObj.savePCIConfigurationSpace(pciDev, pci_device_object)
             devListsSD += busIdSD_list
 
-    #update FWResetStatusChecker
+    # update FWResetStatusChecker
     FWResetStatusChecker.UpdateUptimeBeforeReset()
-     
+
     # calculate bridge devices to reset and capaddr - we do it before the critical time
     if not isWindows and not isPPC:
         bridgeDevs = []
         for busId in [busId] + busIdsSD:
             bridgeDev = PciOpsObj.getPciBridgeAddr(busId)
-            if is_mellanox_device(bridgeDev) and not is_in_internal_host(): # Innova
+            if is_mellanox_device(bridgeDev) and not is_in_internal_host():  # Innova
                 bridgeDev = PciOpsObj.getPciBridgeAddr(bridgeDev)     # bridgeDev = pci_device_bridge2
                 bridgeDev = PciOpsObj.getPciBridgeAddr(bridgeDev)     # bridgeDev = pci_device_bridge3
-                 
+
             # Link Control Register : PCI_EXPRESS_CAP_OFFS + 0x10
             capAddr = PciOpsObj.getPciECapAddr(bridgeDev)
-                      
-            bridgeDevs.append((bridgeDev,capAddr))
-     
-     
+
+            bridgeDevs.append((bridgeDev, capAddr))
+
     if SkipMultihostSync or not CmdifObj.isMultiHostSyncSupported():
         stopDriver(driverObj)
     else:
@@ -1033,12 +1061,12 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
                 # logger.debug("read val of yu.gpio.gpios_bits.gpio_internal.datain = " + str(out))
             else:
                 raise Exception
-        except:
+        except BaseException:
             logger.debug('Not inside Smart-NIC integrated ARM or command is not supported in FW')
         stopDriverSync(driverObj)
 
     logger.debug('start critical time (driver is unloaded)')
-    
+
     # Close the mst device because the file handler is about to be removed
     # In windows we use the mstdevice to execute the reset pci
     if isWindows is False:
@@ -1047,13 +1075,12 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
             MstDevObjSD.close()
         logger.debug('finished to close mst device')
 
-    
     printAndFlush("-I- %-40s-" % ("Resetting PCI"), endChar="")
 
     ignore_signals()
     try:
         if isWindows:
-            dbdf_list= []
+            dbdf_list = []
             for deviceSD in devicesSD:
                 dbdf = mlxfwreset_utils.getDevDBDF(deviceSD, logger)
                 dbdf.encode("utf-8")
@@ -1063,17 +1090,17 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
             dbdf_list.append(busId)
 
             resetPciAddrWindows(dbdf_list)
-        elif isPPC:            
-            busIdsSD.append(busId)            
+        elif isPPC:
+            busIdsSD.append(busId)
             pfs = PciOpsObj.getAllBuses(busIdsSD)
             resetPciAddrPPC(pfs)
         else:
             info = []
- 
+
             # Disable
-            logger.debug('[Timing Test] PCI Disable') 
-            for bridgeDev,capAddr in bridgeDevs:
-                info.append(disablePci(bridgeDev,capAddr))
+            logger.debug('[Timing Test] PCI Disable')
+            for bridgeDev, capAddr in bridgeDevs:
+                info.append(disablePci(bridgeDev, capAddr))
 
             # Sleep
             logger.debug('sleeping... ({0} sec)'.format(cmdLineArgs.pci_link_downtime))
@@ -1088,20 +1115,19 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
     except Exception as e:
         raise RuntimeError("Failed To reset PCI(Driver starting will be skipped). %s" % str(e))
 
-
     if isWindows is False:
 
         logger.debug('WaitForDevice: in case of OS remove/rescan -> wait for pci-device to be part of pci-tree')
-        for pciDevList in [devList]+[devListsSD]:
+        for pciDevList in [devList] + [devListsSD]:
             for pciDev in pciDevList:
                 PciOpsObj.waitForDevice(pciDev)
 
         # Poll DLL Link Active (required to support AMD - RM #1599465)
         for root_pci_device in root_pci_devices:
-            if not isPPC and not is_in_internal_host() and root_pci_device.dll_link_active_reporting_capable:   # in BlueField's internal host (ARM) the root-port will 
-                MAX_WAIT_TIME = 2  # sec                                                                        # return a valid response (blocking) or 0xffff0001 when  
+            if not isPPC and not is_in_internal_host() and root_pci_device.dll_link_active_reporting_capable:   # in BlueField's internal host (ARM) the root-port will
+                MAX_WAIT_TIME = 2  # sec                                                                        # return a valid response (blocking) or 0xffff0001 when
                 poll_start_time = time.time()                                                                   # it's not ready (depending on its configuration)
-                for _ in range(1000*MAX_WAIT_TIME):
+                for _ in range(1000 * MAX_WAIT_TIME):
                     if root_pci_device.dll_link_active == 1:
                         poll_end_time = (time.time() - poll_start_time) * 1000
                         logger.debug('DLL link active is ready after {0} msec'.format(poll_end_time))
@@ -1111,11 +1137,11 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
                     print("\n-W- DLL link is not active (PCI device {0})".format(root_pci_device.dbdf))
 
         # Wait for FW (Iron) - Read devid
-        MAX_WAIT_TIME = 2 # sec
+        MAX_WAIT_TIME = 2  # sec
         poll_start_time = time.time()
         for pci_device_to_poll_devid in pci_devices_to_poll_devid:
-            for _ in range(1000*MAX_WAIT_TIME):
-                if PciOpsObj.read(pci_device_to_poll_devid, 0)>>16 != 0xffff: # device-id (0x2.W)
+            for _ in range(1000 * MAX_WAIT_TIME):
+                if PciOpsObj.read(pci_device_to_poll_devid, 0) >> 16 != 0xffff:  # device-id (0x2.W)
                     iron_end_time = (time.time() - poll_start_time) * 1000
                     logger.debug('IRON is ready after {0} msec'.format(iron_end_time))
                     break
@@ -1128,11 +1154,11 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
         logger.debug('Restore PCI configuration')
         if isPPC:
             logger.debug('PPC : indication for re-enumeration by MSE bit on each PCI device')
-            for pciDev in devList+devListsSD:
+            for pciDev in devList + devListsSD:
                 pci_device_object = pci_device_dict[pciDev]
                 command_reg = PciOpsObj.read(pciDev, COMMAND_ADDR, "W")
                 logger.debug('command_reg for [{0}]is {1:x}.'.format(pciDev, command_reg))
-                if (command_reg & 0x2) == 0: # command_reg[MSE] - Indication for re-enumeration (OS rescan)
+                if (command_reg & 0x2) == 0:  # command_reg[MSE] - Indication for re-enumeration (OS rescan)
                     PciOpsObj.loadPCIConfigurationSpace(pciDev, pci_device_object, full=True)
                 else:
                     PciOpsObj.loadPCIConfigurationSpace(pciDev, pci_device_object, full=False)
@@ -1142,21 +1168,19 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
             logger.debug('hotplug_capable={0}'.format(root_pci_devices[0].hotplug_capable))
             logger.debug('hotplug_interrupt_enable={0}'.format(root_pci_devices[0].hotplug_interrupt_enable))
             logger.debug('to_restore_pci_conf={0}'.format(to_restore_pci_conf))
-            for pciDev in devList+devListsSD:
+            for pciDev in devList + devListsSD:
                 pci_device_object = pci_device_dict[pciDev]
                 if to_restore_pci_conf:
                     PciOpsObj.loadPCIConfigurationSpace(pciDev, pci_device_object, full=True)
-                else: # os re-enumeration
+                else:  # os re-enumeration
                     PciOpsObj.loadPCIConfigurationSpace(pciDev, pci_device_object, full=False)
 
-
     # Need to re-open the file handler because PCI tree is updated (OS remove/rescan)
     if isWindows is False:
         MstDevObj.open()
         for MstDevObjSD in MstDevObjsSD:
             MstDevObjSD.open()
 
-
     set_signal_handler()
 
     printAndFlush("Done")
@@ -1165,9 +1189,10 @@ def resetPciAddr(device,devicesSD,driverObj, cmdLineArgs):
 def is_mellanox_device(devAddr):
     try:
         return PciOpsObj.isMellanoxDevice(devAddr)
-    except NotImplementedError: # Windows
+    except NotImplementedError:  # Windows
         return False
 
+
 def is_pci_bridge_is_mellanox_device(devAddr):
     try:
         pci_bridge_device = PciOpsObj.getPciBridgeAddr(devAddr)
@@ -1175,6 +1200,7 @@ def is_pci_bridge_is_mellanox_device(devAddr):
     except NoPciBridgeException:
         return False
 
+
 def send_reset_cmd_to_fw(mfrl, reset_level, reset_type, reset_sync=SyncOwner.TOOL):
     try:
         printAndFlush("-I- %-40s-" % ("Sending Reset Command To Fw"), endChar="")
@@ -1191,13 +1217,13 @@ def send_reset_cmd_to_fw(mfrl, reset_level, reset_type, reset_sync=SyncOwner.TOO
 def sendResetToFWSync(mfrl, reset_level, reset_type):
     status = CmdifObj.multiHostSyncStatus()
     if (status.fsm_state == SYNC_STATE_GET_READY and
-                 status.fsm_sync_type != SYNC_TYPE_FW_RESET) or\
+        status.fsm_sync_type != SYNC_TYPE_FW_RESET) or\
             status.fsm_state == SYNC_STATE_GO:
         raise RuntimeError("The fsm register is busy, run \"%s -d <device> reset_fsm_register\" to reset the register." % PROG)
-    elif status.fsm_state == SYNC_STATE_IDLE: # First Host arrived 
+    elif status.fsm_state == SYNC_STATE_IDLE:  # First Host arrived
         logger.debug('[Timing Test] MH SYNC send GET_READY (first host)')
         CmdifObj.multiHostSync(SYNC_STATE_GET_READY, SYNC_TYPE_FW_RESET, 0x1)
-        #WA: send again because in single host case the firmware will wait for a second call (fw bug ??)
+        # WA: send again because in single host case the firmware will wait for a second call (fw bug ??)
         CmdifObj.multiHostSync(SYNC_STATE_GET_READY, SYNC_TYPE_FW_RESET)
         logger.info('send SYNC_STATE_GET_READY command')
 
@@ -1205,7 +1231,7 @@ def sendResetToFWSync(mfrl, reset_level, reset_type):
             send_reset_cmd_to_fw(mfrl, reset_level, reset_type)
         except CmdNotSupported:
             CmdifObj.multiHostSync(SYNC_STATE_IDLE, SYNC_TYPE_FW_RESET)
-            raise RuntimeError("Command is not supported")            
+            raise RuntimeError("Command is not supported")
         except Exception as e:
             CmdifObj.multiHostSync(SYNC_STATE_IDLE, SYNC_TYPE_FW_RESET)
             raise e
@@ -1215,7 +1241,7 @@ def sendResetToFWSync(mfrl, reset_level, reset_type):
             CmdifObjSD.multiHostSync(SYNC_STATE_GET_READY, SYNC_TYPE_FW_RESET)
             logger.info('send SYNC_STATE_GET_READY command (SD)')
 
-    elif status.fsm_state == SYNC_STATE_GET_READY: # TODO (update after GA) and status.fsm_sync_type == SYNC_TYPE_FW_RESET
+    elif status.fsm_state == SYNC_STATE_GET_READY:  # TODO (update after GA) and status.fsm_sync_type == SYNC_TYPE_FW_RESET
         logger.debug('[Timing Test] MH SYNC send GET_READY')
         CmdifObj.multiHostSync(SYNC_STATE_GET_READY, SYNC_TYPE_FW_RESET)
         logger.info('send SYNC_STATE_GET_READY command')
@@ -1225,11 +1251,9 @@ def sendResetToFWSync(mfrl, reset_level, reset_type):
             CmdifObjSD.multiHostSync(SYNC_STATE_GET_READY, SYNC_TYPE_FW_RESET)
             logger.info('send SYNC_STATE_GET_READY command')
 
-
     # TODO (update after GA) else: reset_fsm_register
 
 
-
 ######################################################################
 # Description: Stop Driver
 ######################################################################
@@ -1240,7 +1264,7 @@ def stopDriver(driverObj):
             driverObj.driverStop()
             logger.debug('[Timing Test] Driver unbind')
         except Exception as e:
-            #try again, that will prevent problems in multihost
+            # try again, that will prevent problems in multihost
             time.sleep(1)
             driverObj.driverStop()
         printAndFlush("Done")
@@ -1248,6 +1272,8 @@ def stopDriver(driverObj):
 ######################################################################
 # Description: Stop Driver in Multihost setup
 ######################################################################
+
+
 def stopDriverSync(driverObj):
 
     def reloadDriver(driverObj):
@@ -1286,7 +1312,6 @@ def reloadDriver(driverObj):
     for CmdifObjSD in CmdifObjsSD:
         CmdifObjSD.multiHostSync(SYNC_STATE_GO, SYNC_TYPE_FW_RESET)
 
-
     status = CmdifObj.multiHostSyncStatus()
     timestamp = time.time()
     print_waiting_msg = True
@@ -1295,13 +1320,13 @@ def reloadDriver(driverObj):
         if status.fsm_sync_type != SYNC_TYPE_FW_RESET or status.fsm_state != SYNC_STATE_GO:
             errmsg = "Operation failed, the fsm register state or type is not as expected"
             msg = reloadDriver(driverObj)
-            raise RuntimeError(errmsg+msg)
+            raise RuntimeError(errmsg + msg)
 
         diffTime = time.time() - timestamp
         if diffTime > 180:
             errmsg = "fsm sync timed out"
             msg = reloadDriver(driverObj)
-            raise RuntimeError(errmsg+msg)
+            raise RuntimeError(errmsg + msg)
         if print_waiting_msg and diffTime > 2:
             print("Synchronizing with other hosts...")
             print_waiting_msg = False
@@ -1321,7 +1346,8 @@ def reloadDriver(driverObj):
 # OS Support : Linux
 ######################################################################
 
-def sendPcnr(regAccess,port_num):
+
+def sendPcnr(regAccess, port_num):
     try:
         logger.debug("Sending PCNR...")
         regAccess.sendPcnr(1, port_num)
@@ -1330,6 +1356,7 @@ def sendPcnr(regAccess,port_num):
         logger.debug('Failed to send pcnr. {0}'.format(e))  # port doesn't exist / old FW version, burn FW with allow_pcnr (ini file)
         raise PcnrError
 
+
 def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
     global PciOpsObj
     logger.info('resetFlow() called')
@@ -1343,12 +1370,11 @@ def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
         if '_' in device_global:
             pci_device_id = int(device_global.split('_')[0][2:])
 
-
     driverObj = MlnxDriverFactory().getDriverObj(logger, skipDriver, all_devices, pci_device_id)
 
     try:
         # Check if device with PCIe switch (Innova, BL) is supported
-        if platform.system() != "Windows" and is_pci_bridge_is_mellanox_device(DevDBDF): # Skip check on Windows OS (is_pci_bridge_is_mellanox_device is not implemented on Windows)
+        if platform.system() != "Windows" and is_pci_bridge_is_mellanox_device(DevDBDF):  # Skip check on Windows OS (is_pci_bridge_is_mellanox_device is not implemented on Windows)
             if platform.system() != "Linux":
                 raise RuntimeError("Resetting a device that contains a PCIe switch is supported only in Linux")
             if "ppc64" in platform.machine():
@@ -1358,16 +1384,15 @@ def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
             send_reset_cmd_to_fw(mfrl, reset_level, reset_type)
         else:
             sendResetToFWSync(mfrl, reset_level, reset_type)
-        
+
         try:
-            #PCNR - Reduce link up time (from ~4 sec to ~1.5 sec)
-            sendPcnr(RegAccessObj, 0) # port #0 (will fail if pcnr isn't supported by FW)
-            sendPcnr(RegAccessObj, 1) # port #1 (will fail if HW has only one port)
+            # PCNR - Reduce link up time (from ~4 sec to ~1.5 sec)
+            sendPcnr(RegAccessObj, 0)  # port #0 (will fail if pcnr isn't supported by FW)
+            sendPcnr(RegAccessObj, 1)  # port #1 (will fail if HW has only one port)
         except PcnrError:
             pass
 
-
-        # # Socket direct 
+        # # Socket direct
         # for RegAccessSD in RegAccessObjsSD:
         #     try:
         #         sendPcnr(RegAccessSD, 0)  # port #0 (will fail if pcnr isn't supported by FW)
@@ -1384,7 +1409,7 @@ def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
 
         if reset_level == CmdRegMfrl.PCI_RESET:
             # reset PCI
-            resetPciAddr(device,devicesSD,driverObj, cmdLineArgs)
+            resetPciAddr(device, devicesSD, driverObj, cmdLineArgs)
         elif reset_level == CmdRegMfrl.WARM_REBOOT:
             if SkipMultihostSync or not CmdifObj.isMultiHostSyncSupported():
                 stopDriver(driverObj)
@@ -1395,10 +1420,10 @@ def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
         # Wait for FW to be ready to get ICMD
         try:
             wait_for_fw_ready(device)
-        except: # bug 1980064 ('mst driver' is non-operational after PCI reset)
+        except BaseException:  # bug 1980064 ('mst driver' is non-operational after PCI reset)
             logger.warning("wait_for_fw_ready failed. Waiting 1 sec and continue")
             time.sleep(1)
-        
+
         logger.debug('end critical time (start to load driver)')
 
         if driverStat == MlnxDriver.DRIVER_LOADED:
@@ -1409,13 +1434,12 @@ def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
 
         logger.debug('UpdateUptimeAfterReset')
         FWResetStatusChecker.UpdateUptimeAfterReset()
-    
+
         # we close MstDevObj to allow a clean operation of mst restart
         MstDevObj.close()
-        for MstDevObjSD in MstDevObjsSD:    #Roei close mst devices for all "other" devices
+        for MstDevObjSD in MstDevObjsSD:  # Roei close mst devices for all "other" devices
             MstDevObjSD.close()
 
-
         if SkipMstRestart == False and platform.system() == "Linux" and not IS_MSTFLINT:
             printAndFlush("-I- %-40s-" % ("Restarting MST"), endChar="")
             if mstRestart(DevDBDF) == 0:
@@ -1431,6 +1455,8 @@ def resetFlow(device, devicesSD, reset_level, reset_type, cmdLineArgs, mfrl):
 ######################################################################
 # Description: Warm reboot reset Flow
 ######################################################################
+
+
 def rebootMachine():
     printAndFlush("-I- %-40s-" % ("Sending reboot command to machine"), endChar="")
     if platform.system() == "Windows":
@@ -1443,12 +1469,14 @@ def rebootMachine():
     else:
         printAndFlush("Failed")
         raise RuntimeError("Failed to reboot machine please reboot machine manually")
-    
+
 ######################################################################
 # Description:  execute reset level for device
 ######################################################################
+
+
 def execResLvl(device, devicesSD, reset_level, reset_type, reset_sync, cmdLineArgs, mfrl):
-    
+
     # mpcir usage removed due to RM #2214400
     # # In new FW, the FW doesn't need this command any more
     # if mfrl.is_phy_less_reset(reset_type):
@@ -1488,6 +1516,7 @@ def map2DevPathAux(mstOutput, device):
 # OS Support : Linux
 ######################################################################
 
+
 def map2DevPath(device):
     deviceStartsWith00000 = device.startswith("0000:")
     if deviceStartsWith00000:
@@ -1497,12 +1526,12 @@ def map2DevPath(device):
     if rc != 0:
         raise RuntimeError("Failed to run: " + cmd)
     d = map2DevPathAux(output, device)
-    if d != None:
+    if d is not None:
         return d
-    #if not found and the device starts with 0000 try again with 0000
+    # if not found and the device starts with 0000 try again with 0000
     if deviceStartsWith00000:
         d = map2DevPathAux(output, "0000:" + device)
-        if d != None:
+        if d is not None:
             return d
     raise RuntimeError("Can not find path of the provided mst device: " + device)
 
@@ -1533,48 +1562,48 @@ def main():
     # options arguments
     options_group = parser.add_argument_group('Options')
     options_group.add_argument('--device',
-                        '-d',
-                        required=True,
-                        help=':  Device to work with')
+                               '-d',
+                               required=True,
+                               help=':  Device to work with')
     options_group.add_argument('--level',
-                        '-l',
-                        type=int,
-                        choices=CmdRegMfrl.reset_levels(),
-                        dest='reset_level',
-                        help=':  Run reset with the specified reset-level')
+                               '-l',
+                               type=int,
+                               choices=CmdRegMfrl.reset_levels(),
+                               dest='reset_level',
+                               help=':  Run reset with the specified reset-level')
     options_group.add_argument('--type',
-                        '-t',
-                        type=int,
-                        choices=CmdRegMfrl.reset_types(),
-                        dest='reset_type',
-                        help=':  Run reset with the specified reset-type')
+                               '-t',
+                               type=int,
+                               choices=CmdRegMfrl.reset_types(),
+                               dest='reset_type',
+                               help=':  Run reset with the specified reset-type')
     options_group.add_argument('--sync',
-                        type=int,
-                        choices=[SyncOwner.TOOL, SyncOwner.DRIVER],
-                        default=SyncOwner.TOOL,
-                        dest='reset_sync',
-                        help=':  Run reset with the specified reset-sync')
+                               type=int,
+                               choices=[SyncOwner.TOOL, SyncOwner.DRIVER],
+                               default=SyncOwner.TOOL,
+                               dest='reset_sync',
+                               help=':  Run reset with the specified reset-sync')
     options_group.add_argument('--yes',
-                        '-y',
-                        help=':  answer "yes" on prompt',
-                        action="store_true")
+                               '-y',
+                               help=':  answer "yes" on prompt',
+                               action="store_true")
     options_group.add_argument('--skip_driver',
-                        '-s',
-                        help=":  Skip driver start/stop stage (driver must be stopped manually)",
-                        action="store_true")
+                               '-s',
+                               help=":  Skip driver start/stop stage (driver must be stopped manually)",
+                               action="store_true")
     options_group.add_argument('--mst_flags',
-                        '-m',
-                        help=":  Provide mst flags to be used when invoking mst restart step. For example: --mst_flags=\"--with_i2cdev\""
-                        if platform.system() == "Linux" and not IS_MSTFLINT else argparse.SUPPRESS)
+                               '-m',
+                               help=":  Provide mst flags to be used when invoking mst restart step. For example: --mst_flags=\"--with_i2cdev\""
+                               if platform.system() == "Linux" and not IS_MSTFLINT else argparse.SUPPRESS)
     options_group.add_argument('--version',
-                        '-v',
-                        help=':  Print tool version',
-                        action="version",
-                        version=tools_version.GetVersionString(PROG, TOOL_VERSION))
+                               '-v',
+                               help=':  Print tool version',
+                               action="version",
+                               version=tools_version.GetVersionString(PROG, TOOL_VERSION))
     options_group.add_argument('--help',
-                        '-h',
-                        help=':  show this help message and exit',
-                        action="help")
+                               '-h',
+                               help=':  show this help message and exit',
+                               action="help")
 
     # hidden flag for skipping mst restart when performing pci reset
     options_group.add_argument('--no_mst_restart',
@@ -1594,19 +1623,18 @@ def main():
                                help=argparse.SUPPRESS)
     # log level
     options_group.add_argument('--log',
-                               choices=['critical','error','warning','info','debug'],
+                               choices=['critical', 'error', 'warning', 'info', 'debug'],
                                help=argparse.SUPPRESS)
 
     def check_positive_float(val):
         try:
             val = float(val)
-            assert val>=0
-        except:
+            assert val >= 0
+        except BaseException:
             raise argparse.ArgumentTypeError("{0} is an invalid positive float value".format(val))
 
         return val
 
-
     # configuration of sleep-time (sec) between 'disable-pci' to 'enable-pci'
     options_group.add_argument('--pci_link_downtime',
                                type=check_positive_float,
@@ -1616,14 +1644,14 @@ def check_positive_float(val):
     # command arguments
     command_group = parser.add_argument_group('Commands')
     command_group.add_argument('command',
-                        nargs=1,
-                        choices=["q", "query", "r", "reset", "reset_fsm_register"],
-                        help=':  query: Query reset Level.\n reset: Execute reset.\n reset_fsm_register: Reset the fsm register.')
+                               nargs=1,
+                               choices=["q", "query", "r", "reset", "reset_fsm_register"],
+                               help=':  query: Query reset Level.\n reset: Execute reset.\n reset_fsm_register: Reset the fsm register.')
     args = parser.parse_args()
 
     device = args.device
     global device_global
-    device_global = args.device # required for reset_fsm_register when exiting with ctrl+c/exception (latter think how to move the global)
+    device_global = args.device  # required for reset_fsm_register when exiting with ctrl+c/exception (latter think how to move the global)
     yes = args.yes
 
     command = args.command[0]
@@ -1635,7 +1663,7 @@ def check_positive_float(val):
         command = "reset_fsm_register"
 
     # logger
-    logger = LoggerFactory().get('mlxfwreset',args.log)
+    logger = LoggerFactory().get('mlxfwreset', args.log)
 
     # open reg access obj
     global MstDevObj
@@ -1661,40 +1689,36 @@ def check_positive_float(val):
         else:
             logger.debug("Failed to execute 'lscpu' command rc = {0}".format(rc))
 
-
-
-
-    if platform.system() == "Linux": # Convert ib-device , net-device to mst-device(mst started) or pci-device
+    if platform.system() == "Linux":  # Convert ib-device , net-device to mst-device(mst started) or pci-device
         if IS_MSTFLINT:
             if device.startswith('mlx'):
                 driver_path = '/sys/class/infiniband/{0}/device'.format(device)
                 try:
                     device = os.path.basename(os.readlink(driver_path))
-                except:
+                except BaseException:
                     raise RuntimeError('Failed to Identify Device: {0}'.format(device))
         else:
             device = map2DevPath(device)
 
     # Insert Flow here
-    isDevSupp(device) # function takes ~330msec - TODO remove it if you need performace
+    isDevSupp(device)  # function takes ~330msec - TODO remove it if you need performace
 
-    DevDBDF = mlxfwreset_utils.getDevDBDF(device,logger)
+    DevDBDF = mlxfwreset_utils.getDevDBDF(device, logger)
     logger.info('device domain:bus:dev.fn (DBDF) is {0}'.format(DevDBDF))
     SkipMstRestart = args.no_mst_restart
     skipDriver = args.skip_driver
     SkipMultihostSync = args.skip_fsm_sync
     MstDevObj = mtcr.MstDevice(device)
-    RegAccessObj = regaccess.RegAccess(MstDevObj)    
+    RegAccessObj = regaccess.RegAccess(MstDevObj)
     CmdifObj = cmdif.CmdIf(MstDevObj)
     PciOpsObj = MlnxPciOpFactory().getPciOpObj(DevDBDF)
 
-
     mfrl = CmdRegMfrl(RegAccessObj)
     # mpcir = CmdRegMpcir(RegAccessObj)
     mcam = CmdRegMcam(RegAccessObj)
 
     logger.info('Check if device is livefish')
-    DevMgtObj = dev_mgt.DevMgt(MstDevObj) # check if device is in livefish
+    DevMgtObj = dev_mgt.DevMgt(MstDevObj)  # check if device is in livefish
     if DevMgtObj.isLivefishMode() == 1:
         raise RuntimeError("%s is not supported for device in Flash Recovery mode" % PROG)
 
@@ -1703,15 +1727,13 @@ def check_positive_float(val):
     if platform.system() == "Windows":
         from tools_sync import ToolsSync
         if ToolsSync(MstDevObj.mf).lock() == False:
-            raise RuntimeError("Other tool is accessing the device! Please try again latter")    
-
+            raise RuntimeError("Other tool is accessing the device! Please try again latter")
 
     # Socket Direct - Create a list of command i/f for all "other" devices
     global CmdifObjsSD
     global MstDevObjsSD
     global RegAccessObjsSD
 
-
     devicesSD = []
     if command == "reset" and not args.skip_socket_direct:
 
@@ -1726,7 +1748,7 @@ def check_positive_float(val):
                 MstDevObjsSD.append(mtcr.MstDevice(deviceSD))
                 RegAccessObjsSD.append(regaccess.RegAccess(MstDevObjsSD[-1]))
                 CmdifObjsSD.append(cmdif.CmdIf(MstDevObjsSD[-1]))
-        except:
+        except BaseException:
             logger.warning("Failed to check if device is Socket Direct!")
             devicesSD = []
             for MstDevObjSD in MstDevObjsSD:
@@ -1735,9 +1757,7 @@ def check_positive_float(val):
             CmdifObjsSD = []
             RegAccessObjsSD = []
 
-    MstFlags = "" if (args.mst_flags == None) else args.mst_flags   
-
-
+    MstFlags = "" if (args.mst_flags is None) else args.mst_flags
 
     logger.info('Create FWResetStatusChecker')
     FWResetStatusChecker = FirmwareResetStatusChecker(RegAccessObj)
@@ -1746,9 +1766,9 @@ def check_positive_float(val):
         if args.pci_bridge:
             PciOpsObj.setPciBridgeAddr(args.pci_bridge[0])
     except NotImplementedError as re:
-        if platform.system() == "Windows": 
+        if platform.system() == "Windows":
             pass
-        else: 
+        else:
             raise re
 
     print("")
@@ -1761,7 +1781,6 @@ def check_positive_float(val):
 
         #print("Reset device {0}:".format(device))
 
-
         reset_level = mfrl.default_reset_level() if args.reset_level is None else args.reset_level
         # print("  * reset-level is '{0}' ({1})".format(reset_level, mfrl.reset_level_description(reset_level)))
         if mfrl.is_reset_level_supported(reset_level) is False:
@@ -1780,11 +1799,10 @@ def check_positive_float(val):
             raise RuntimeError("Synchronization by driver is not supported in the current state of this device")
         if reset_sync != SyncOwner.TOOL and reset_level != CmdRegMfrl.PCI_RESET:
             raise RuntimeError("Reset-sync '{0}' is not supported with reset-level '{1}'".format(reset_sync, reset_level))
-        
-        minimal_or_requested = 'Minimal' if args.reset_level is None else 'Requested'
-        print("{0} reset level for device, {1}:\n".format(minimal_or_requested , device))
-        print("{0}: {1}".format(reset_level,mfrl.reset_level_description(reset_level)))
 
+        minimal_or_requested = 'Minimal' if args.reset_level is None else 'Requested'
+        print("{0} reset level for device, {1}:\n".format(minimal_or_requested, device))
+        print("{0}: {1}".format(reset_level, mfrl.reset_level_description(reset_level)))
 
         AskUser("Continue with reset", yes)
         execResLvl(device, devicesSD, reset_level, reset_type, reset_sync, args, mfrl)
@@ -1799,6 +1817,7 @@ def check_positive_float(val):
         print("-I- FSM register was reset successfully.")
     return 0
 
+
 if __name__ == '__main__':
     rc = 0
     try:
diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
index c6942844..ee9bddfa 100644
--- a/small_utils/mtserver.c
+++ b/small_utils/mtserver.c
@@ -113,29 +113,33 @@
  */
 
 #ifndef __WIN__
-    #define PREP_SIGNAL(signal_handler) signal(SIGPIPE, signal_handler);
-    #define WIN_INIT()
-    #define WIN_CLOSE(mf, cmd)
-    #define WIN_WHILE()
+#define PREP_SIGNAL(signal_handler) signal(SIGPIPE, signal_handler);
+#define WIN_INIT()
+#define WIN_CLOSE(mf, cmd)
+#define WIN_WHILE()
 #else
-    #include <winsock2.h>
-    #define PREP_SIGNAL(signal_handler)
-    #define WIN_INIT() {                          \
-        int rc;                                   \
-        WSADATA wsaData;                          \
-        rc = WSAStartup(MAKEWORD(2, 2), &wsaData); \
-        if (rc != 0) {                            \
+#include <winsock2.h>
+#define PREP_SIGNAL(signal_handler)
+#define WIN_INIT()                                                                     \
+    {                                                                                  \
+        int rc;                                                                        \
+        WSADATA wsaData;                                                               \
+        rc = WSAStartup(MAKEWORD(2, 2), &wsaData);                                     \
+        if (rc != 0)                                                                   \
+        {                                                                              \
             printf("-E- Winsock initialization failed (WSAStartup returned %d\n", rc); \
-            exit(1);                            \
-        }                                         \
-}
-    #define WIN_CLOSE(mf, cmd) { \
-        if (!mf && cmd != 'V') { \
-            break; \
-        } \
-}
+            exit(1);                                                                   \
+        }                                                                              \
+    }
+#define WIN_CLOSE(mf, cmd)     \
+    {                          \
+        if (!mf && cmd != 'V') \
+        {                      \
+            break;             \
+        }                      \
+    }
 
-    #define WIN_WHILE() while (1)
+#define WIN_WHILE() while (1)
 #endif
 
 #include <stdio.h>
@@ -153,21 +157,20 @@
 /*
  * Constants
  */
-#define DEF_PORT    23108
-#define MAX_DWORDS  128
-#define BUF_LEN  (MAX_DWORDS * 4 * 3)
-#define DEV_LEN  2048
-
+#define DEF_PORT 23108
+#define MAX_DWORDS 128
+#define BUF_LEN (MAX_DWORDS * 4 * 3)
+#define DEV_LEN 2048
 
 int sdebug = 0;
-int port = DEF_PORT;    /* Default port */
-
+int port = DEF_PORT; /* Default port */
 
 /* ////////////////////////////////////////////////////////////////////// */
-static void writes_deb(int con, char *s)
+static void writes_deb(int con, char* s)
 {
     writes(con, s, PT_TCP);
-    if (sdebug) {
+    if (sdebug)
+    {
         printf("-> %s\n", s);
     }
 }
@@ -177,7 +180,8 @@ void write_err(int con)
 {
     writen(con, "E ", 2, PT_TCP);
     writes(con, strerror(errno), PT_TCP);
-    if (sdebug) {
+    if (sdebug)
+    {
         printf("-> E %s\n", strerror(errno));
     }
 }
@@ -188,48 +192,45 @@ void write_ok(int con)
     writes_deb(con, "O");
 }
 
-
 // On windows we don't have simulator in the meantime!
 #if defined(SIMULATOR) && !defined(__WIN__)
 
-    #include <sys/mman.h>
-    #include <sys/types.h>
-    #include <sys/stat.h>
-    #include <fcntl.h>
-    #include <unistd.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
-    #define FILE_PATH "/tmp/mmap.log"
-    #define NUM_INTS  (0x2000000)
-    #define FILE_SIZE (NUM_INTS * sizeof(int))
+#define FILE_PATH "/tmp/mmap.log"
+#define NUM_INTS (0x2000000)
+#define FILE_SIZE (NUM_INTS * sizeof(int))
 
-u_int32_t *cr_space;
+u_int32_t* cr_space;
 char sim_str[] = "\t-i[d]   <id>   - set the device id.\n"
                  "\t-f[ile] <file> - load cr-space snapshot from dump file.\n";
 int id;
-char *dump_file = NULL;
+char* dump_file = NULL;
 int fd;
-mfile* mopen(const char *name)
+mfile* mopen(const char* name)
 {
     TOOLS_UNUSED(name);
     return (mfile*)0;
-
 }
 
-
-mfile* mopend(const char *name, DType dtype)
+mfile* mopend(const char* name, DType dtype)
 {
     TOOLS_UNUSED(name);
     TOOLS_UNUSED(dtype);
     return (mfile*)1;
 }
 
-int mclose(mfile *mf)
+int mclose(mfile* mf)
 {
     TOOLS_UNUSED(mf);
     return 0;
 }
 
-int mdevices(char *buf, int len, int mask)
+int mdevices(char* buf, int len, int mask)
 {
     TOOLS_UNUSED(len);
     TOOLS_UNUSED(mask);
@@ -237,28 +238,27 @@ int mdevices(char *buf, int len, int mask)
     return 1;
 }
 
-int mread4(mfile *mf, unsigned int offset, u_int32_t *value)
+int mread4(mfile* mf, unsigned int offset, u_int32_t* value)
 {
     TOOLS_UNUSED(mf);
     *value = __be32_to_cpu(cr_space[offset / 4]);
     return 4;
 }
 
-int mwrite4(mfile *mf, unsigned int offset, u_int32_t value)
+int mwrite4(mfile* mf, unsigned int offset, u_int32_t value)
 {
     TOOLS_UNUSED(mf);
     cr_space[offset / 4] = __cpu_to_be32(value);
-    //cr_space[offset/4] = value;
+    // cr_space[offset/4] = value;
     return 4;
 }
-int mi2c_detect(mfile *mf, u_int8_t slv_arr[SLV_ADDRS_NUM])
+int mi2c_detect(mfile* mf, u_int8_t slv_arr[SLV_ADDRS_NUM])
 {
     TOOLS_UNUSED(mf);
     TOOLS_UNUSED(slv_arr);
     return -1;
 }
-int mread_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
-                   unsigned int offset, void *data, int length)
+int mread_i2cblock(mfile* mf, unsigned char i2c_slave, u_int8_t addr_width, unsigned int offset, void* data, int length)
 {
     TOOLS_UNUSED(mf);
     TOOLS_UNUSED(i2c_slave);
@@ -269,9 +269,7 @@ int mread_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
     return 0;
 }
 
-int mcables_remote_operation_server_side(mfile* mf, u_int32_t address,
-                                         u_int32_t length, u_int8_t* data,
-                                         int remote_op)
+int mcables_remote_operation_server_side(mfile* mf, u_int32_t address, u_int32_t length, u_int8_t* data, int remote_op)
 {
     TOOLS_UNUSED(mf);
     TOOLS_UNUSED(address);
@@ -281,8 +279,7 @@ int mcables_remote_operation_server_side(mfile* mf, u_int32_t address,
     return 0;
 }
 
-int mwrite_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
-                    unsigned int offset, void *data, int length)
+int mwrite_i2cblock(mfile* mf, unsigned char i2c_slave, u_int8_t addr_width, unsigned int offset, void* data, int length)
 {
     TOOLS_UNUSED(mf);
     TOOLS_UNUSED(i2c_slave);
@@ -293,73 +290,79 @@ int mwrite_i2cblock(mfile *mf, unsigned char i2c_slave, u_int8_t addr_width,
     return 0;
 }
 
-int mwrite4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mwrite4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
     int i;
-    //printf("-D- inside mtserver\n");
-    if (byte_len % 4) {
-        return EINVAL;               // verify byte_len is multiplation of dword size
+    // printf("-D- inside mtserver\n");
+    if (byte_len % 4)
+    {
+        return EINVAL; // verify byte_len is multiplation of dword size
     }
     mf = NULL;
-    for (i = 0; i < byte_len; i += 4) {
+    for (i = 0; i < byte_len; i += 4)
+    {
         mwrite4(mf, offset + i, *(data++));
     }
     return byte_len;
 }
 
-static void fix_endianness(u_int32_t *buf, int len)
+static void fix_endianness(u_int32_t* buf, int len)
 {
     int i;
 
-    for (i = 0; i < (len / 4); ++i) {
-        //printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
+    for (i = 0; i < (len / 4); ++i)
+    {
+        // printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
         buf[i] = __be32_to_cpu(buf[i]);
-        //printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
+        // printf("-D- before: buf[%d] = %#x\n", i, buf[i]);
     }
 }
 
-int mwrite_buffer(mfile *mf, unsigned int offset, u_int8_t *data, int byte_len)
+int mwrite_buffer(mfile* mf, unsigned int offset, u_int8_t* data, int byte_len)
 {
-    //printf("-D- inside: mstsim:mwrite_buffer\n");
+    // printf("-D- inside: mstsim:mwrite_buffer\n");
     fix_endianness((u_int32_t*)data, byte_len);
     return mwrite4_block(mf, offset, (u_int32_t*)data, byte_len);
 }
 
-
-int mread4_block(mfile *mf, unsigned int offset, u_int32_t *data, int byte_len)
+int mread4_block(mfile* mf, unsigned int offset, u_int32_t* data, int byte_len)
 {
     int i;
-    if (byte_len % 4) {
-        return EINVAL;               // verify byte_len is multiplation of dword size
+    if (byte_len % 4)
+    {
+        return EINVAL; // verify byte_len is multiplation of dword size
     }
     mf = NULL;
-    for (i = 0; i < byte_len; i += 4) {
+    for (i = 0; i < byte_len; i += 4)
+    {
         mread4(mf, offset + i, data++);
     }
     return byte_len;
 }
 
-int check_id_arg(char *av[], int ac, int *i)
+int check_id_arg(char* av[], int ac, int* i)
 {
-    char *end;
-    if (++(*i) >= ac) {
+    char* end;
+    if (++(*i) >= ac)
+    {
         printf("After switch \"%s\" device id is expected.\n", av[--(*i)]);
         printf("Type \"%s -h\" for help.\n", av[0]);
         exit(1);
     }
     id = (int)strtol(av[*i], &end, 0);
-    if (*end) {
+    if (*end)
+    {
         printf("Invalid id: \"%s\" -- ?\n", end);
         printf("Type \"%s -h\" for help.\n", av[0]);
         exit(1);
     }
     return 0;
-
 }
 
-void check_file_arg(char *av[], int ac, int *i)
+void check_file_arg(char* av[], int ac, int* i)
 {
-    if (++(*i) >= ac) {
+    if (++(*i) >= ac)
+    {
         printf("After switch \"%s\" dump file is expected.\n", av[--(*i)]);
         printf("Type \"%s -h\" for help.\n", av[0]);
         exit(1);
@@ -369,21 +372,25 @@ void check_file_arg(char *av[], int ac, int *i)
 
 void load_dump_file()
 {
-    #define BUFSIZE 40
+#define BUFSIZE 40
     char buf[BUFSIZE];
     int line;
-    FILE *fh = fopen(dump_file, "r");
+    FILE* fh = fopen(dump_file, "r");
 
-    if (!fh) {
+    if (!fh)
+    {
         printf("-E- Error opening dump file for reading: %s\n", strerror(errno));
         exit(1);
     }
 
-    for (line = 1;; ++line) {
+    for (line = 1;; ++line)
+    {
         int address, value;
 
-        if (!fgets(buf, BUFSIZE, fh)) {
-            if (feof(fh)) {
+        if (!fgets(buf, BUFSIZE, fh))
+        {
+            if (feof(fh))
+            {
                 break;
             }
             fclose(fh);
@@ -391,7 +398,8 @@ void load_dump_file()
             exit(1);
         }
 
-        if (sscanf(buf, "%x %x", &address, &value) < 2) {
+        if (sscanf(buf, "%x %x", &address, &value) < 2)
+        {
             fclose(fh);
             printf("-E- Error parsing dump file at line %d\n", line);
             exit(1);
@@ -409,42 +417,49 @@ int prepare_the_map_file(void)
     int result;
     fd = open(FILE_PATH, O_RDWR | O_CREAT | O_TRUNC, (mode_t)0600);
 
-    if (fd == -1) {
+    if (fd == -1)
+    {
         printf("-E- Error opening file for writing\n");
         exit(1);
     }
 
     result = lseek(fd, FILE_SIZE - 1, SEEK_SET);
-    if (result == -1) {
+    if (result == -1)
+    {
         close(fd);
         perror("Error calling lseek() to 'stretch' the file");
         exit(1);
     }
 
     result = write(fd, "", 1);
-    if (result != 1) {
+    if (result != 1)
+    {
         close(fd);
         perror("Error writing last byte of the file");
         exit(1);
     }
 
     cr_space = mmap(0, FILE_SIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-    if (cr_space == MAP_FAILED) {
+    if (cr_space == MAP_FAILED)
+    {
         close(fd);
         perror("Error mmapping the file");
         exit(1);
     }
-    for (i = 0; i < NUM_INTS; ++i) {
+    for (i = 0; i < NUM_INTS; ++i)
+    {
         cr_space[i] = 0;
     }
 
     // load cr-space snapshot
-    if (dump_file) {
+    if (dump_file)
+    {
         load_dump_file();
     }
 
     // write id
-    if (id != 0) {
+    if (id != 0)
+    {
         mwrite4(NULL, 0xf0014, id);
     }
 
@@ -453,13 +468,14 @@ int prepare_the_map_file(void)
 
 int unmap_and_close_file(void)
 {
-    if (munmap(cr_space, FILE_SIZE) == -1) {
+    if (munmap(cr_space, FILE_SIZE) == -1)
+    {
         perror("Error un-mmapping the file");
     }
     close(fd);
     return 0;
 }
-void mpci_change(mfile *mf)
+void mpci_change(mfile* mf)
 {
     TOOLS_UNUSED(mf);
 }
@@ -469,47 +485,49 @@ void get_devices_list(int con)
     char dev_buf[DEV_LEN];
     int i, rc;
     rc = mdevices(dev_buf, DEV_LEN, MDEVS_ALL);
-    if (rc < 0) {
+    if (rc < 0)
+    {
         write_err(con);
-    } else {
+    }
+    else
+    {
         char *p = &dev_buf[0], vbuf[16];
         sprintf(vbuf, "O %d", rc);
         writes_deb(con, vbuf);
-        for (i = 0; i < rc; i++, p += strlen(p) + 1) {
+        for (i = 0; i < rc; i++, p += strlen(p) + 1)
+        {
             writes_deb(con, p);
         }
     }
-
 }
-int mget_vsec_supp(mfile *mf)
+int mget_vsec_supp(mfile* mf)
 {
     TOOLS_UNUSED(mf);
     return 0;
 }
-int mset_addr_space(mfile *mf, int space)
+int mset_addr_space(mfile* mf, int space)
 {
     TOOLS_UNUSED(mf);
     TOOLS_UNUSED(space);
     return 0;
 }
 #else
-extern void mpci_change(mfile *mf);
+extern void mpci_change(mfile* mf);
 
 #if defined(__linux__) && !defined(__VMKERNEL_UW_NATIVE__) && !defined(__VMKERNEL_UW_VMKLINUX__)
 extern int check_ul_mode();
 #endif
 
 char sim_str[100] = "";
-int check_id_arg(char *av[], int ac, int *i)
+int check_id_arg(char* av[], int ac, int* i)
 {
     (void)ac;
     printf("Invalid switch \"%s\".\n", av[*i]);
     printf("Type \"%s -h\" for help.\n", av[0]);
     exit(1);
-
 }
 
-void check_file_arg(char *av[], int ac, int *i)
+void check_file_arg(char* av[], int ac, int* i)
 {
     (void)ac;
     printf("Invalid switch \"%s\".\n", av[*i]);
@@ -525,35 +543,44 @@ int prepare_the_map_file(void)
 int unmap_and_close_file(void)
 {
     return 0;
-
 }
 
 void get_devices_list(int con)
 {
 #ifndef MST_UL
-    dev_info *mdevs_inf = NULL;
+    dev_info* mdevs_inf = NULL;
     int devs_num = -1, i = 0;
     mdevs_inf = mdevices_info(MDEVS_ALL, &devs_num);
 
-    if (devs_num < 0 || !mdevs_inf) {
+    if (devs_num < 0 || !mdevs_inf)
+    {
         write_err(con);
-    } else {
+    }
+    else
+    {
         char vbuf[16];
         int n = devs_num;
-        for (i = 0; i < devs_num; i++) {
-            if (mdevs_inf[i].pci.cr_dev[0]) {
+        for (i = 0; i < devs_num; i++)
+        {
+            if (mdevs_inf[i].pci.cr_dev[0])
+            {
                 n++;
             }
         }
         sprintf(vbuf, "O %d", n);
         writes_deb(con, vbuf);
-        for (i = 0; i < devs_num; i++) {
-            if (mdevs_inf[i].pci.conf_dev[0]) {
+        for (i = 0; i < devs_num; i++)
+        {
+            if (mdevs_inf[i].pci.conf_dev[0])
+            {
                 writes_deb(con, mdevs_inf[i].pci.conf_dev);
-            } else {
+            }
+            else
+            {
                 writes_deb(con, mdevs_inf[i].dev_name);
             }
-            if (mdevs_inf[i].pci.cr_dev[0]) {
+            if (mdevs_inf[i].pci.cr_dev[0])
+            {
                 writes_deb(con, mdevs_inf[i].pci.cr_dev);
             }
         }
@@ -566,10 +593,8 @@ void get_devices_list(int con)
 #endif
 /* ////////////////////////////////////////////////////////////////////// */
 
-
-
 /* ////////////////////////////////////////////////////////////////////// */
-void usage(const char *s)
+void usage(const char* s)
 {
     printf("Usage:\n\t%s [switches]\n\n", s);
     printf("Switches may be:\n");
@@ -587,35 +612,37 @@ void mySignal()
     exit(0);
 }
 
-#define GET_PARAM(param, str, type, param_name, err_msg) { \
-        char *end; \
-        param = (type)strtoul(str, &end, 0); \
-        if (*end) { \
+#define GET_PARAM(param, str, type, param_name, err_msg)  \
+    {                                                     \
+        char* end;                                        \
+        param = (type)strtoul(str, &end, 0);              \
+        if (*end)                                         \
+        {                                                 \
             sprintf(err_msg, "E Invalid %s", param_name); \
-            return 1; \
-        } \
-}
-
-
+            return 1;                                     \
+        }                                                 \
+    }
 
-int parse_cables_cmd(char *buf, u_int32_t* addr, u_int32_t* length,
-                     u_int8_t *data, char *err_msg)
+int parse_cables_cmd(char* buf, u_int32_t* addr, u_int32_t* length, u_int8_t* data, char* err_msg)
 {
-    char *args_array[3];
+    char* args_array[3];
     u_int8_t args_num = 2;
     int i;
 
-    args_array[0]  = buf + 2;
-    for (i = 1; i <= args_num; i++) {
+    args_array[0] = buf + 2;
+    for (i = 1; i <= args_num; i++)
+    {
         args_array[i] = strchr(args_array[i - 1], ' ');
-        if (args_array[i] == NULL) {
+        if (args_array[i] == NULL)
+        {
             break;
         }
         *(args_array[i]) = '\0';
         args_array[i]++;
     }
 
-    if (i < args_num) {
+    if (i < args_num)
+    {
         sprintf(err_msg, "E Bad msg internal error");
         return 1;
     }
@@ -626,53 +653,65 @@ int parse_cables_cmd(char *buf, u_int32_t* addr, u_int32_t* length,
     return 0;
 }
 
-
-
-
-int parse_i2c_cmd(char *buf, u_int8_t *addr_width, u_int8_t *slave_addr, int *size,
-                  unsigned int *offset, u_int8_t *data, char *err_msg)
+int parse_i2c_cmd(char* buf,
+                  u_int8_t* addr_width,
+                  u_int8_t* slave_addr,
+                  int* size,
+                  unsigned int* offset,
+                  u_int8_t* data,
+                  char* err_msg)
 {
-    char *p_arr[5];
+    char* p_arr[5];
     u_int8_t args_num;
     int i;
 
-    if (*buf == 'r') {
+    if (*buf == 'r')
+    {
         args_num = 4;
-    } else {
+    }
+    else
+    {
         args_num = 5;
     }
 
-    p_arr[0]  = buf + 2;
-    for (i = 1; i <= args_num; i++) {
+    p_arr[0] = buf + 2;
+    for (i = 1; i <= args_num; i++)
+    {
         p_arr[i] = strchr(p_arr[i - 1], ' ');
-        if (p_arr[i] == NULL) {
+        if (p_arr[i] == NULL)
+        {
             break;
         }
         *(p_arr[i]) = '\0';
         p_arr[i]++;
     }
 
-    if (i < args_num) {
+    if (i < args_num)
+    {
         sprintf(err_msg, "E Bad msg internal error");
         return 1;
     }
     GET_PARAM(*addr_width, p_arr[0], u_int8_t, "address width", err_msg);
     GET_PARAM(*slave_addr, p_arr[1], u_int8_t, "slave address", err_msg);
-    GET_PARAM(*size,       p_arr[2], u_int8_t, "length", err_msg);
-    GET_PARAM(*offset,     p_arr[3], u_int32_t, "offset", err_msg);
+    GET_PARAM(*size, p_arr[2], u_int8_t, "length", err_msg);
+    GET_PARAM(*offset, p_arr[3], u_int32_t, "offset", err_msg);
 
-    if (args_num == 5) {
-        char *p = p_arr[4];
+    if (args_num == 5)
+    {
+        char* p = p_arr[4];
 
-        if (*size > 64) {
+        if (*size > 64)
+        {
             sprintf(err_msg, "E Bad size which should be less than 64");
             return 1;
         }
-        if ((*size * 2) != (int)strlen(p)) {
+        if ((*size * 2) != (int)strlen(p))
+        {
             sprintf(err_msg, "E Bad data section");
             return 1;
         }
-        for (i = 0; i < *size; i++) {
+        for (i = 0; i < *size; i++)
+        {
             char tmp_num[10];
             // TODO: use 16 on the  strtoul
             strncpy(tmp_num, "0x", 3);
@@ -686,11 +725,12 @@ int parse_i2c_cmd(char *buf, u_int8_t *addr_width, u_int8_t *slave_addr, int *si
     return 0;
 }
 
-int copy_buff_to_str(char *str, u_int8_t *data, int size)
+int copy_buff_to_str(char* str, u_int8_t* data, int size)
 {
-    char *p = str;
+    char* p = str;
     int i;
-    for (i = 0; i < size; i++) {
+    for (i = 0; i < size; i++)
+    {
         sprintf(p, "%02x", data[i]);
         p += 2;
     }
@@ -698,78 +738,107 @@ int copy_buff_to_str(char *str, u_int8_t *data, int size)
 }
 
 /* ////////////////////////////////////////////////////////////////////// */
-#define CHK2(f, m) do { if ((f) < 0) { perror(m); exit(1); } } while (0)
+#define CHK2(f, m)     \
+    do                 \
+    {                  \
+        if ((f) < 0)   \
+        {              \
+            perror(m); \
+            exit(1);   \
+        }              \
+    } while (0)
 #define MSTSERVER_VERSION "1.4"
-#define MSTSERVER_NAME    "mtserver"
+#define MSTSERVER_NAME "mtserver"
 
-int main(int ac, char *av[])
+int main(int ac, char* av[])
 {
-    char *end;
-    char *local_dev = NULL;
+    char* end;
+    char* local_dev = NULL;
     char buf[BUF_LEN], dev_buf[DEV_LEN];
     int i, con, rc;
-    mfile *mf = 0;
+    mfile* mf = 0;
 
     /* Command line parsing. */
-    for (i = 1; i < ac; i++) {
-        switch (*av[i]) {
-        case '-':
-            ++av[i];
-            if (!strcmp(av[i], "p")  ||  !strcmp(av[i], "port")) {
-                if (++i >= ac) {
-                    printf("After switch \"%s\" port number is expected.\n", av[--i]);
-                    printf("Type \"%s -h\" for help.\n", av[0]);
-                    exit(1);
+    for (i = 1; i < ac; i++)
+    {
+        switch (*av[i])
+        {
+            case '-':
+                ++av[i];
+                if (!strcmp(av[i], "p") || !strcmp(av[i], "port"))
+                {
+                    if (++i >= ac)
+                    {
+                        printf("After switch \"%s\" port number is expected.\n", av[--i]);
+                        printf("Type \"%s -h\" for help.\n", av[0]);
+                        exit(1);
+                    }
+                    port = (int)strtol(av[i], &end, 0);
+                    if (*end)
+                    {
+                        printf("Invalid port: \"%s\" -- ?\n", end);
+                        printf("Type \"%s -h\" for help.\n", av[0]);
+                        exit(1);
+                    }
+                    if (port < 1 || port > 65535)
+                    {
+                        printf("-E- Invalid port value: %d, port should be 16-bit number (Range: 1-65535)\n", port);
+                        exit(1);
+                    }
                 }
-                port = (int)strtol(av[i], &end, 0);
-                if (*end) {
-                    printf("Invalid port: \"%s\" -- ?\n", end);
-                    printf("Type \"%s -h\" for help.\n", av[0]);
-                    exit(1);
+                else if (!strcmp(av[i], "dev"))
+                {
+                    if (++i >= ac)
+                    {
+                        printf("After switch \"%s\" a device is expected.\n", av[--i]);
+                        printf("Type \"%s -h\" for help.\n", av[0]);
+                        exit(1);
+                    }
+                    local_dev = av[i];
                 }
-                if (port < 1 || port > 65535) {
-                    printf("-E- Invalid port value: %d, port should be 16-bit number (Range: 1-65535)\n", port);
-                    exit(1);
+                else if (!strcmp(av[i], "d") || !strcmp(av[i], "debug"))
+                {
+                    sdebug = 1;
+                }
+                else if (!strcmp(av[i], "h") || !strcmp(av[i], "help"))
+                {
+                    usage(av[0]);
+                }
+                else if (!strcmp(av[i], "v") || !strcmp(av[i], "version"))
+                {
+                    print_version_string(MSTSERVER_NAME, MSTSERVER_VERSION);
+                    exit(0);
                 }
-            } else if (!strcmp(av[i], "dev")) {
-                if (++i >= ac) {
-                    printf("After switch \"%s\" a device is expected.\n", av[--i]);
-                    printf("Type \"%s -h\" for help.\n", av[0]);
+                else if (!strcmp(av[i], "i") || !strcmp(av[i], "id"))
+                {
+                    check_id_arg(av, ac, &i);
+                }
+                else if (!strcmp(av[i], "f") || !strcmp(av[i], "file"))
+                {
+                    check_file_arg(av, ac, &i);
+                }
+                else
+                {
+                    printf("Invalid switch \"%s\".\n", av[i]);
+                    usage(av[0]);
                     exit(1);
                 }
-                local_dev = av[i];
+                break;
 
-            } else if (!strcmp(av[i], "d")  ||  !strcmp(av[i], "debug")) {
-                sdebug = 1;
-            } else if (!strcmp(av[i], "h")  ||  !strcmp(av[i], "help")) {
+            case '?':
                 usage(av[0]);
-            } else if (!strcmp(av[i], "v")  ||  !strcmp(av[i], "version")) {
-                print_version_string(MSTSERVER_NAME, MSTSERVER_VERSION);
-                exit(0);
-            } else if (!strcmp(av[i], "i")  ||  !strcmp(av[i], "id")) {
-                check_id_arg(av, ac, &i);
-            } else if (!strcmp(av[i], "f")  ||  !strcmp(av[i], "file")) {
-                check_file_arg(av, ac, &i);
-            } else {
-                printf("Invalid switch \"%s\".\n", av[i]);
+                break;
+
+            default:
+                printf("Invalid parameter \"%s\".\n", av[i]);
                 usage(av[0]);
                 exit(1);
-            }
-            break;
-
-        case '?':
-            usage(av[0]);
-            break;
-
-        default:
-            printf("Invalid parameter \"%s\".\n", av[i]);
-            usage(av[0]);
-            exit(1);
         }
     }
 
 #ifdef MST_UL
-    if (local_dev == NULL) {
+    if (local_dev == NULL)
+    {
         printf("When accessing via user level mst, -dev <bus:dev.fun> flag must be provided\n");
         exit(1);
     }
@@ -782,28 +851,33 @@ int main(int ac, char *av[])
 
     /* Now open and start work */
     logset(1);
-    WIN_WHILE() {
+    WIN_WHILE()
+    {
         con = open_serv_connection(port);
         int addrInUseError = 0;
-        if (con < 0) {
+        if (con < 0)
+        {
 #ifdef __WIN__
             addrInUseError = WSAEADDRINUSE;
 #else
             addrInUseError = EADDRINUSE;
-#endif        
-            if (errno == addrInUseError) {
+#endif
+            if (errno == addrInUseError)
+            {
                 printf("Open connection (server side): Address already in use\n");
                 exit(1);
             }
         }
         CHK2(con, "Open connection (server side)");
 
-        for (;;) {
-
+        for (;;)
+        {
             memset(buf, 0, BUF_LEN);
             rc = reads(con, buf, BUF_LEN, PT_TCP);
-            if (rc <= 0) {
-                if (sdebug) {
+            if (rc <= 0)
+            {
+                if (sdebug)
+                {
                     printf("-D- read failed - closing connection. rc=%d, %s\n", rc, strerror(errno));
                 }
                 close(con);
@@ -817,321 +891,425 @@ int main(int ac, char *av[])
                 // TODO: Move to thread handling and unify Win and Lin behavior.
                 //
 
-                #ifndef __WIN__
-                if (rc < 0) {
+#ifndef __WIN__
+                if (rc < 0)
+                {
                     perror("");
                     exit(1);
                 }
-                #endif
-                break;    /*  EOF */
+#endif
+                break; /*  EOF */
             }
-            if (sdebug) {
+            if (sdebug)
+            {
                 printf("<- %s\n", buf);
             }
-            switch (*buf) {
-            case 'O':   /*  Open mfile */
+            switch (*buf)
+            {
+                case 'O': /*  Open mfile */
 
-                if (mf) {
-                    writes_deb(con, "E Already opened");
-                } else {
-#ifndef MST_UL
-                    DType dtype = strtoul(buf + 2, &end, 0);
-                    if (*end != ' ') {
-                        /*  Old style (O DEV_NAME) */
-                        mf = mopen(buf + 2);
-                    } else {
-                        /*  New style (O FLAG DEV_NAME) */
-                        mf = mopend(end + 1, dtype);
+                    if (mf)
+                    {
+                        writes_deb(con, "E Already opened");
                     }
+                    else
+                    {
+#ifndef MST_UL
+                        DType dtype = strtoul(buf + 2, &end, 0);
+                        if (*end != ' ')
+                        {
+                            /*  Old style (O DEV_NAME) */
+                            mf = mopen(buf + 2);
+                        }
+                        else
+                        {
+                            /*  New style (O FLAG DEV_NAME) */
+                            mf = mopend(end + 1, dtype);
+                        }
 #else
-                    mf = mopen(local_dev);
+                        mf = mopen(local_dev);
 #endif
-                    if (mf) {
+                        if (mf)
+                        {
 #if defined(__linux__) && !defined(SIMULATOR)
-                        // set request came from client
-                        mf->is_mtserver_req = 1;
+                            // set request came from client
+                            mf->is_mtserver_req = 1;
 #endif
-                        // write Recv buffer
-                        char res_buf[16];
-                        snprintf(res_buf, 16, "O %d", mget_vsec_supp(mf));
-                        writes_deb(con, res_buf);
-                    } else {
-                        write_err(con);
+                            // write Recv buffer
+                            char res_buf[16];
+                            snprintf(res_buf, 16, "O %d", mget_vsec_supp(mf));
+                            writes_deb(con, res_buf);
+                        }
+                        else
+                        {
+                            write_err(con);
+                        }
                     }
-                }
-                break;
+                    break;
 
-            case 'C':  /*  Close mfile */
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    if (mclose(mf) < 0) {
-                        write_err(con);
-                    } else {
-                        write_ok(con);
-                        mf = 0;
+                case 'C': /*  Close mfile */
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
                     }
-                }
-                break;
+                    else
+                    {
+                        if (mclose(mf) < 0)
+                        {
+                            write_err(con);
+                        }
+                        else
+                        {
+                            write_ok(con);
+                            mf = 0;
+                        }
+                    }
+                    break;
 
-            case 'V':  /*  Get version */
-                writes_deb(con, "O "MSTSERVER_VERSION);
-                break;
+                case 'V': /*  Get version */
+                    writes_deb(con, "O " MSTSERVER_VERSION);
+                    break;
 
-            case 'L':   /*  Get devices list */
-                if (local_dev == NULL) {
-                    get_devices_list(con);
-                } else {
-                    strcpy(dev_buf, "/dev/mst/mt25204_pci_cr0");
-                    printf("-D- local_dev=%s dev_buf=%s\n", local_dev, dev_buf);
-                    writes_deb(con, "O 1");
-                    writes_deb(con, dev_buf);
-                }
+                case 'L': /*  Get devices list */
+                    if (local_dev == NULL)
+                    {
+                        get_devices_list(con);
+                    }
+                    else
+                    {
+                        strcpy(dev_buf, "/dev/mst/mt25204_pci_cr0");
+                        printf("-D- local_dev=%s dev_buf=%s\n", local_dev, dev_buf);
+                        writes_deb(con, "O 1");
+                        writes_deb(con, dev_buf);
+                    }
 
-                break;
+                    break;
 
-            case 'R':   /*  Read word */
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    unsigned int offset;
-                    u_int32_t value;
-                    offset = strtoul(buf + 2, &end, 0);
-                    if (*end) {
-                        writes_deb(con, "E Invalid offset");
-                    } else {
-                        if (mread4(mf, offset, &value) < 4) {
-                            write_err(con);
-                        } else {
-                            char vbuf[16];
-                            sprintf(vbuf, "O 0x%08x", value);
-                            writes_deb(con, vbuf);
+                case 'R': /*  Read word */
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
+                    }
+                    else
+                    {
+                        unsigned int offset;
+                        u_int32_t value;
+                        offset = strtoul(buf + 2, &end, 0);
+                        if (*end)
+                        {
+                            writes_deb(con, "E Invalid offset");
+                        }
+                        else
+                        {
+                            if (mread4(mf, offset, &value) < 4)
+                            {
+                                write_err(con);
+                            }
+                            else
+                            {
+                                char vbuf[16];
+                                sprintf(vbuf, "O 0x%08x", value);
+                                writes_deb(con, vbuf);
+                            }
                         }
                     }
-                }
-                break;
+                    break;
 
 #ifndef MST_UL
-            case 'S':  /*  Scan I2C bus */
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    u_int8_t slv_arr[SLV_ADDRS_NUM] = {0};
-                    if (mi2c_detect(mf, slv_arr) < 0) {
-                        write_err(con);
-                    } else {
-                        int i;
-                        char *p, buf[1024];
-                        sprintf(buf, "O");
-                        p =  buf + 1;
-                        for (i = 0; i < SLV_ADDRS_NUM; i++) {
-                            if (slv_arr[i]) {
-                                sprintf(p, " 0x%02x", i);
-                                p += strlen(p);
+                case 'S': /*  Scan I2C bus */
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
+                    }
+                    else
+                    {
+                        u_int8_t slv_arr[SLV_ADDRS_NUM] = {0};
+                        if (mi2c_detect(mf, slv_arr) < 0)
+                        {
+                            write_err(con);
+                        }
+                        else
+                        {
+                            int i;
+                            char *p, buf[1024];
+                            sprintf(buf, "O");
+                            p = buf + 1;
+                            for (i = 0; i < SLV_ADDRS_NUM; i++)
+                            {
+                                if (slv_arr[i])
+                                {
+                                    sprintf(p, " 0x%02x", i);
+                                    p += strlen(p);
+                                }
                             }
+                            writes_deb(con, buf);
                         }
-                        writes_deb(con, buf);
                     }
-                }
-                break;
+                    break;
 
-            case 'B':
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    unsigned int offset;
-                    int size;
-                    u_int32_t buf_data[MAX_DWORDS];
-
-                    offset = strtoul(buf + 2, &end, 0);
-                    if (*end != ' ') {
-                        writes_deb(con, "E Invalid offset");
+                case 'B':
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
                     }
+                    else
+                    {
+                        unsigned int offset;
+                        int size;
+                        u_int32_t buf_data[MAX_DWORDS];
 
-                    size = strtoul(end, &end, 0);
-                    if (*end != '\0') {
-                        writes_deb(con, "E Invalid size");
-                    }
+                        offset = strtoul(buf + 2, &end, 0);
+                        if (*end != ' ')
+                        {
+                            writes_deb(con, "E Invalid offset");
+                        }
 
-                    if (mread4_block(mf, offset, buf_data, size) != size) {
-                        write_err(con);
-                    } else   {
-                        int i;
-                        int div4 = size >> 2;
-                        int mod4 = size % 4;
-                        sprintf(buf, "O");
-                        char *last = buf + 1;
-                        for (i = 0; i < div4; i++) {
-                            last += sprintf(last, " 0x%08x", buf_data[i]);
+                        size = strtoul(end, &end, 0);
+                        if (*end != '\0')
+                        {
+                            writes_deb(con, "E Invalid size");
+                        }
+
+                        if (mread4_block(mf, offset, buf_data, size) != size)
+                        {
+                            write_err(con);
                         }
-                        /* If the size is not divided by 4 need to read the remained bytes */
-                        if (mod4) {
-                            last += sprintf(last, " 0x");
-                            for (i = mod4 - 1; i >= 0; i--) {
-                                last += sprintf(last, "%02x", ((u_int8_t*)buf_data)[div4 * 4 + i]);
+                        else
+                        {
+                            int i;
+                            int div4 = size >> 2;
+                            int mod4 = size % 4;
+                            sprintf(buf, "O");
+                            char* last = buf + 1;
+                            for (i = 0; i < div4; i++)
+                            {
+                                last += sprintf(last, " 0x%08x", buf_data[i]);
                             }
+                            /* If the size is not divided by 4 need to read the remained bytes */
+                            if (mod4)
+                            {
+                                last += sprintf(last, " 0x");
+                                for (i = mod4 - 1; i >= 0; i--)
+                                {
+                                    last += sprintf(last, "%02x", ((u_int8_t*)buf_data)[div4 * 4 + i]);
+                                }
+                            }
+                            writes_deb(con, buf);
                         }
-                        writes_deb(con, buf);
                     }
-                }
-                break;
+                    break;
 
-            case 'U':
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    unsigned int offset;
-                    int size;
-                    u_int32_t buf_data[MAX_DWORDS];
-                    int i;
-
-                    offset = strtoul(buf + 2, &end, 0);
-                    if (*end != ' ') {
-                        writes_deb(con, "E Invalid offset");
+                case 'U':
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
                     }
+                    else
+                    {
+                        unsigned int offset;
+                        int size;
+                        u_int32_t buf_data[MAX_DWORDS];
+                        int i;
 
-                    size = strtoul(end, &end, 0);
-                    if (*end != ' ' || size > (MAX_DWORDS << 2)) {
-                        writes_deb(con, "E Invalid size");
-                    }
+                        offset = strtoul(buf + 2, &end, 0);
+                        if (*end != ' ')
+                        {
+                            writes_deb(con, "E Invalid offset");
+                        }
+
+                        size = strtoul(end, &end, 0);
+                        if (*end != ' ' || size > (MAX_DWORDS << 2))
+                        {
+                            writes_deb(con, "E Invalid size");
+                        }
 
-                    for (i = 0; i < (size + 3) >> 2; i++) {
-                        ((u_int32_t*)buf_data)[i] = strtoul(end, &end, 0);
+                        for (i = 0; i<(size + 3)> > 2; i++)
+                        {
+                            ((u_int32_t*)buf_data)[i] = strtoul(end, &end, 0);
+
+                            if (*end != (i < ((size + 3) >> 2) - 1 ? ' ' : '\0'))
+                            {
+                                writes_deb(con, "E Invalid data");
+                            }
+                        }
 
-                        if (*end != (i < ((size + 3) >> 2) - 1 ? ' ' : '\0')) {
-                            writes_deb(con, "E Invalid data");
+                        if (mwrite4_block(mf, offset, buf_data, size) != size)
+                        {
+                            write_err(con);
+                        }
+                        else
+                        {
+                            write_ok(con);
                         }
                     }
+                    break;
 
-                    if (mwrite4_block(mf, offset, buf_data, size) != size) {
-                        write_err(con);
-                    } else   {
-                        write_ok(con);
+                case 'r': /*  Read I2C */
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
                     }
-                }
-                break;
-
-            case 'r':   /*  Read I2C */
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    u_int8_t data[64];
-                    char err_msg[256];
-                    u_int8_t addr_width, slave_addr;
-                    unsigned int offset;
-                    int size;
-
-                    rc = parse_i2c_cmd(buf, &addr_width, &slave_addr, &size, &offset, data, err_msg);
-                    if (rc) {
-                        writes_deb(con, err_msg);
-                    } else {
-                        if (mread_i2cblock(mf, slave_addr, addr_width, offset, data, size) < size) {
-                            write_err(con);
-                        } else {
-                            char vbuff[256];
-                            sprintf(vbuff, "O 0x%x ", size);
-                            copy_buff_to_str(&vbuff[strlen(vbuff)], data, size);
-                            writes_deb(con, vbuff);
+                    else
+                    {
+                        u_int8_t data[64];
+                        char err_msg[256];
+                        u_int8_t addr_width, slave_addr;
+                        unsigned int offset;
+                        int size;
+
+                        rc = parse_i2c_cmd(buf, &addr_width, &slave_addr, &size, &offset, data, err_msg);
+                        if (rc)
+                        {
+                            writes_deb(con, err_msg);
+                        }
+                        else
+                        {
+                            if (mread_i2cblock(mf, slave_addr, addr_width, offset, data, size) < size)
+                            {
+                                write_err(con);
+                            }
+                            else
+                            {
+                                char vbuff[256];
+                                sprintf(vbuff, "O 0x%x ", size);
+                                copy_buff_to_str(&vbuff[strlen(vbuff)], data, size);
+                                writes_deb(con, vbuff);
+                            }
                         }
                     }
-                }
-                break;
+                    break;
 
-            case 'w':   /*  Read I2C */
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    u_int8_t data[64];
-                    char err_msg[256];
-                    u_int8_t addr_width, slave_addr;
-                    unsigned int offset;
-                    int size;
-
-                    rc = parse_i2c_cmd(buf, &addr_width, &slave_addr, &size, &offset, data, err_msg);
-                    if (rc) {
-                        writes_deb(con, err_msg);
-                    } else {
-                        if (mwrite_i2cblock(mf, slave_addr, addr_width, offset, data, size) < size) {
-                            write_err(con);
-                        } else {
-                            write_ok(con);
+                case 'w': /*  Read I2C */
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
+                    }
+                    else
+                    {
+                        u_int8_t data[64];
+                        char err_msg[256];
+                        u_int8_t addr_width, slave_addr;
+                        unsigned int offset;
+                        int size;
+
+                        rc = parse_i2c_cmd(buf, &addr_width, &slave_addr, &size, &offset, data, err_msg);
+                        if (rc)
+                        {
+                            writes_deb(con, err_msg);
+                        }
+                        else
+                        {
+                            if (mwrite_i2cblock(mf, slave_addr, addr_width, offset, data, size) < size)
+                            {
+                                write_err(con);
+                            }
+                            else
+                            {
+                                write_ok(con);
+                            }
                         }
                     }
-                }
-                break;
+                    break;
 #endif
 
-            case 'P':
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    mpci_change(mf);
-                    write_ok(con);
-                }
-                break;
+                case 'P':
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
+                    }
+                    else
+                    {
+                        mpci_change(mf);
+                        write_ok(con);
+                    }
+                    break;
 
-            case 'W':   /*  Write word */
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    unsigned int offset;
-                    u_int32_t value;
-                    char *p = strchr(buf + 2, ' ');
-                    if (!p) {
-                        writes_deb(con, "E Invalid format (should be OFFS DATA)");
-                    } else {
-                        *p = '\0';
-                        p++;
-                        offset = strtoul(buf + 2, &end, 0);
-                        if (*end) {
-                            writes_deb(con, "E Invalid offset");
-                        } else {
-                            value = strtoul(p, &end, 0);
-                            if (*end) {
-                                writes_deb(con, "E Invalid data");
-                            } else {
-                                if (mwrite4(mf, offset, value) < 4) {
-                                    write_err(con);
-                                } else {
-                                    write_ok(con);
+                case 'W': /*  Write word */
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
+                    }
+                    else
+                    {
+                        unsigned int offset;
+                        u_int32_t value;
+                        char* p = strchr(buf + 2, ' ');
+                        if (!p)
+                        {
+                            writes_deb(con, "E Invalid format (should be OFFS DATA)");
+                        }
+                        else
+                        {
+                            *p = '\0';
+                            p++;
+                            offset = strtoul(buf + 2, &end, 0);
+                            if (*end)
+                            {
+                                writes_deb(con, "E Invalid offset");
+                            }
+                            else
+                            {
+                                value = strtoul(p, &end, 0);
+                                if (*end)
+                                {
+                                    writes_deb(con, "E Invalid data");
+                                }
+                                else
+                                {
+                                    if (mwrite4(mf, offset, value) < 4)
+                                    {
+                                        write_err(con);
+                                    }
+                                    else
+                                    {
+                                        write_ok(con);
+                                    }
                                 }
                             }
                         }
                     }
-                }
-                break;
+                    break;
 
-            case 'A':
-                if (!mf) {
-                    writes_deb(con, "E Not opened");
-                } else {
-                    char *p = buf + 2;
-                    int space;
-                    space = strtol(p, &end, 0);
-                    if (*end) {
-                        writes_deb(con, "E Invalid offset");
+                case 'A':
+                    if (!mf)
+                    {
+                        writes_deb(con, "E Not opened");
                     }
-                    if (mset_addr_space(mf, space)) {
-                        write_err(con);
-                    } else {
-                        write_ok(con);
+                    else
+                    {
+                        char* p = buf + 2;
+                        int space;
+                        space = strtol(p, &end, 0);
+                        if (*end)
+                        {
+                            writes_deb(con, "E Invalid offset");
+                        }
+                        if (mset_addr_space(mf, space))
+                        {
+                            write_err(con);
+                        }
+                        else
+                        {
+                            write_ok(con);
+                        }
                     }
-                }
-                break;
+                    break;
 
-            default:
-                writes(con, "E Invalid command", PT_TCP);
-                if (sdebug) {
-                    printf("-> E Invalid command (len:%d cmd:\"%s\")\n",
-                           (int)strlen(buf), buf);
-                }
-                break;
+                default:
+                    writes(con, "E Invalid command", PT_TCP);
+                    if (sdebug)
+                    {
+                        printf("-> E Invalid command (len:%d cmd:\"%s\")\n", (int)strlen(buf), buf);
+                    }
+                    break;
             }
             WIN_CLOSE(mf, *buf);
         }
 
-        if (mf) {
-            if (sdebug) {
+        if (mf)
+        {
+            if (sdebug)
+            {
                 printf("-D- mf opened from a prev connection - closing\n");
             }
             mclose(mf);
diff --git a/small_utils/mwrite.c b/small_utils/mwrite.c
index 7eb0305b..418e69dc 100644
--- a/small_utils/mwrite.c
+++ b/small_utils/mwrite.c
@@ -40,45 +40,50 @@
 #include <stdlib.h>
 #include <string.h>
 
-
-void usage(const char *n)
+void usage(const char* n)
 {
     printf("%s <device> <addr> <value>\n", n);
     exit(1);
 }
 
-int main(int ac, char *av[])
+int main(int ac, char* av[])
 {
-    char          *endp;
+    char* endp;
     int rc = 0;
     unsigned int addr, val;
-    mfile         *mf;
+    mfile* mf;
 
-    if (ac != 4) {
+    if (ac != 4)
+    {
         usage(av[0]);
     }
 
     addr = strtoul(av[2], &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         usage(av[0]);
     }
     val = strtoul(av[3], &endp, 0);
-    if (*endp) {
+    if (*endp)
+    {
         usage(av[0]);
     }
 
     mf = mopen(av[1]);
-    if (!mf) {
+    if (!mf)
+    {
         perror("mopen");
         return 1;
     }
 
-    if ((rc = mwrite4(mf, addr, val)) < 0) {
+    if ((rc = mwrite4(mf, addr, val)) < 0)
+    {
         mclose(mf);
         perror("mwrite");
         return 1;
     }
-    if (rc < 4) {
+    if (rc < 4)
+    {
         mclose(mf);
         printf("Write only %d bytes\n", rc);
         return 1;
diff --git a/small_utils/tcp.c b/small_utils/tcp.c
index a99d0b55..d3d68a8a 100644
--- a/small_utils/tcp.c
+++ b/small_utils/tcp.c
@@ -41,13 +41,13 @@
 #include "tcp.h"
 #else
 // HACK: We redefine it here also because when including from mtcr.c tcp.h is not included
-typedef enum proto_type {
+typedef enum proto_type
+{
     PT_TCP = 0,
     PT_UDP,
 } proto_type_t;
 #endif
 
-
 #include <errno.h>
 #include <fcntl.h>
 #include <memory.h>
@@ -60,68 +60,73 @@ typedef enum proto_type {
 #define UDP_RECV_FLAGS 0
 
 #ifndef __WIN__
-    #include <unistd.h>
-    #include <netdb.h>
-    #include <netinet/in.h>
-    #include <sys/socket.h>
-    #include <sys/un.h>
-    #include <sys/types.h>
-    #include <sys/wait.h>
-    #include <sys/ioctl.h>
-    #include <arpa/inet.h>
-
-    #define SOCKET_BACKLOG           1
-    #undef COMP_CLOSE
-    #define COMP_CLOSE               close
-    #define TCP_COMP_READ(s, b, l)         read(s, b, l)
-    #define TCP_COMP_WRITE(s, b, l)        write(s, b, l)
-
-    #define UDP_COMP_READ(s, b, l)         recv(s, b, l, UDP_RECV_FLAGS)
-    #define UDP_COMP_WRITE(s, b, l)        send(s, b, l, UDP_RECV_FLAGS)
-
-    #define GET_CHILD_PID(child_pid) child_pid = fork()
-    #define EXEC_SIGNAL() if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) {return -1;}
-    #define EXEC_FOR() for (;;)
-    #define RET_ZERO_IN_WIN()
-    #define WIN_INIT()
+#include <unistd.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/ioctl.h>
+#include <arpa/inet.h>
+
+#define SOCKET_BACKLOG 1
+#undef COMP_CLOSE
+#define COMP_CLOSE close
+#define TCP_COMP_READ(s, b, l) read(s, b, l)
+#define TCP_COMP_WRITE(s, b, l) write(s, b, l)
+
+#define UDP_COMP_READ(s, b, l) recv(s, b, l, UDP_RECV_FLAGS)
+#define UDP_COMP_WRITE(s, b, l) send(s, b, l, UDP_RECV_FLAGS)
+
+#define GET_CHILD_PID(child_pid) child_pid = fork()
+#define EXEC_SIGNAL()                        \
+    if (signal(SIGCHLD, SIG_IGN) == SIG_ERR) \
+    {                                        \
+        return -1;                           \
+    }
+#define EXEC_FOR() for (;;)
+#define RET_ZERO_IN_WIN()
+#define WIN_INIT()
 #else
-    #include <winsock2.h>
-    #include <io.h>
+#include <winsock2.h>
+#include <io.h>
 
-    #define socklen_t int
+#define socklen_t int
 
-    #define SOCKET_BACKLOG           5
+#define SOCKET_BACKLOG 5
 
-#ifdef   COMP_CLOSE
-    #undef  COMP_CLOSE
-    #undef  COMP_READ
-    #undef  COMP_WRITE
+#ifdef COMP_CLOSE
+#undef COMP_CLOSE
+#undef COMP_READ
+#undef COMP_WRITE
 #endif
-    #define COMP_CLOSE               closesocket
+#define COMP_CLOSE closesocket
 
-    #define TCP_COMP_READ(s, b, l)         recv(s, b, l, 0)
-    #define TCP_COMP_WRITE(s, b, l)        send(s, b, l, 0)
+#define TCP_COMP_READ(s, b, l) recv(s, b, l, 0)
+#define TCP_COMP_WRITE(s, b, l) send(s, b, l, 0)
 
-    #define UDP_COMP_READ(s, b, l)         recv(s, b, l, UDP_RECV_FLAGS)
-    #define UDP_COMP_WRITE(s, b, l)        send(s, b, l, UDP_RECV_FLAGS)
+#define UDP_COMP_READ(s, b, l) recv(s, b, l, UDP_RECV_FLAGS)
+#define UDP_COMP_WRITE(s, b, l) send(s, b, l, UDP_RECV_FLAGS)
 
+#define GET_CHILD_PID(child_pid) child_pid = 0
+#define EXEC_SIGNAL()
+#define EXEC_FOR()
+#define RET_ZERO_IN_WIN() return 0
 
-    #define GET_CHILD_PID(child_pid) child_pid = 0
-    #define EXEC_SIGNAL()
-    #define EXEC_FOR()
-    #define RET_ZERO_IN_WIN()         return 0
-
-    #define WIN_INIT() {                          \
-        int rc;                                   \
-        WSADATA wsaData;                          \
+#define WIN_INIT()                                 \
+    {                                              \
+        int rc;                                    \
+        WSADATA wsaData;                           \
         rc = WSAStartup(MAKEWORD(2, 2), &wsaData); \
-        if (rc != 0) {                            \
-            return -1;                            \
-        }                                         \
-}
+        if (rc != 0)                               \
+        {                                          \
+            return -1;                             \
+        }                                          \
+    }
 #endif
 
-#undef  COMP_READ
+#undef COMP_READ
 
 #define COMP_ACCESS(s, b, l, p, f1, f2) (p == PT_UDP) ? f1(s, b, l) : f2(s, b, l);
 
@@ -129,27 +134,31 @@ typedef enum proto_type {
 
 #define COMP_WRITE(s, b, l, p) COMP_ACCESS(s, b, l, p, UDP_COMP_WRITE, TCP_COMP_WRITE)
 
-
-#define EXEC_PROTO_FUNC(proto, tcp_func, udp_func, args) { \
-        if (proto == PT_UDP) { \
-            return udp_func args; \
-        } \
-        return tcp_func args; \
-}
-
+#define EXEC_PROTO_FUNC(proto, tcp_func, udp_func, args) \
+    {                                                    \
+        if (proto == PT_UDP)                             \
+        {                                                \
+            return udp_func args;                        \
+        }                                                \
+        return tcp_func args;                            \
+    }
 
 /* ----------------------------------------------------- */
 /* ------------------------------ Log all socket traffic */
 /* ----------------------------------------------------- */
 /* ////////////////////////////////////////////////////////////////////// */
 static int log_ena = 0;
-INSIDE_MTCR void logset(const int ena) { log_ena = ena;}
-INSIDE_MTCR int  plog(const char *fmt, ...)
+INSIDE_MTCR void logset(const int ena)
+{
+    log_ena = ena;
+}
+INSIDE_MTCR int plog(const char* fmt, ...)
 {
     va_list ap;
     int rc = 0;
 
-    if (log_ena) {
+    if (log_ena)
+    {
         va_start(ap, fmt);
         rc = vprintf(fmt, ap);
         va_end(ap);
@@ -194,46 +203,53 @@ INSIDE_MTCR int  plog(const char *fmt, ...)
    }
  */
 
-INSIDE_MTCR int tcp_reads(int fd, char *ptr, int maxlen)
+INSIDE_MTCR int tcp_reads(int fd, char* ptr, int maxlen)
 {
     int n, done = 0, rc;
     char c;
-    for (n = 0; (n < maxlen - 1) && !done; n++) {
-        do {
+    for (n = 0; (n < maxlen - 1) && !done; n++)
+    {
+        do
+        {
             rc = COMP_READ(fd, &c, 1, PT_TCP);
-        }
-        while (rc < 0 && errno == EINTR);
-
-        switch (rc) {
-        case 1:
-            *ptr++ = c;
-            if (c == '\0') {
+        } while (rc < 0 && errno == EINTR);
+
+        switch (rc)
+        {
+            case 1:
+                *ptr++ = c;
+                if (c == '\0')
+                {
+                    done = 1;
+                }
+                break;
+
+            case 0:
                 done = 1;
-            }
-            break;
+                break;
 
-        case 0:
-            done = 1;
-            break;
-
-        default:
-            return -1;     /*  error */
+            default:
+                return -1; /*  error */
         }
     }
     *ptr = '\0';
     return n - 1;
 }
 
-INSIDE_MTCR int udp_reads(int fd, char *ptr, int maxlen)
+INSIDE_MTCR int udp_reads(int fd, char* ptr, int maxlen)
 {
     int rc = 0;
-    char *tmp_ptr = ptr;
-    do {
+    char* tmp_ptr = ptr;
+    do
+    {
         rc = COMP_READ(fd, tmp_ptr, maxlen - 1, PT_UDP);
     } while (rc < 0 && errno == EINTR);
-    if (rc > 0) {
+    if (rc > 0)
+    {
         tmp_ptr[rc] = '\0';
-    } else {
+    }
+    else
+    {
         *tmp_ptr = '\0';
     }
     return rc - 1;
@@ -243,9 +259,10 @@ INSIDE_MTCR int udp_reads(int fd, char *ptr, int maxlen)
 /*
 ** reads - reads string (till \0)  from the socket "fd"
 */
-INSIDE_MTCR int reads(int fd, char *ptr, int maxlen, proto_type_t proto)
+INSIDE_MTCR int reads(int fd, char* ptr, int maxlen, proto_type_t proto)
 {
-    if (proto == PT_UDP) {
+    if (proto == PT_UDP)
+    {
         return udp_reads(fd, ptr, maxlen);
     }
     return tcp_reads(fd, ptr, maxlen);
@@ -293,32 +310,35 @@ INSIDE_MTCR int reads(int fd, char *ptr, int maxlen, proto_type_t proto)
 ** Returns number of bytes written, or -1 if an error occurs.
 ** Return value will always be either -1 or "nbytes"
 */
-INSIDE_MTCR int writen(int fd, void *vptr, int nbytes, proto_type_t proto)
+INSIDE_MTCR int writen(int fd, void* vptr, int nbytes, proto_type_t proto)
 {
     int nleft, nwritten;
-    char    *ptr = (char*)vptr;
+    char* ptr = (char*)vptr;
 
     nleft = nbytes;
-    while (nleft > 0) {
-        do {
+    while (nleft > 0)
+    {
+        do
+        {
             nwritten = COMP_WRITE(fd, ptr, nleft, proto);
         } while (nwritten < 0 && errno == EINTR);
 
-        if (nwritten < 0) {
+        if (nwritten < 0)
+        {
             return -1;
         }
 
         nleft -= nwritten;
-        ptr   += nwritten;
+        ptr += nwritten;
     }
-    return(nbytes - nleft);
+    return (nbytes - nleft);
 }
 
 /* ////////////////////////////////////////////////////////////////////// */
 /*
 ** writes - write string (null ternminated buffer) to the socket "fd"
 */
-INSIDE_MTCR int writes(int fd, char *ptr, proto_type_t proto)
+INSIDE_MTCR int writes(int fd, char* ptr, proto_type_t proto)
 {
     return writen(fd, ptr, strlen(ptr) + 1, proto);
 }
@@ -341,15 +361,16 @@ INSIDE_MTCR int writes(int fd, char *ptr, proto_type_t proto)
 /*
 ** open_cli_connection - open client TCP connection and return socket fd
 */
-INSIDE_MTCR int open_cli_connection(const char *host, const int port, proto_type_t proto)
+INSIDE_MTCR int open_cli_connection(const char* host, const int port, proto_type_t proto)
 {
     int SockFD;
     struct sockaddr_in serv_addr;
-    struct hostent      *hent;
+    struct hostent* hent;
     int needs_bind = 0;
     int type = SOCK_STREAM, domain = AF_INET;
 
-    if (proto == PT_UDP) {
+    if (proto == PT_UDP)
+    {
         needs_bind = 1;
         type = SOCK_DGRAM;
         domain = PF_INET;
@@ -357,11 +378,12 @@ INSIDE_MTCR int open_cli_connection(const char *host, const int port, proto_type
 
     plog("open_connection(%s, %d)\n", host, port);
 
-    //Initialize Winsock
+    // Initialize Winsock
     WIN_INIT();
 
     /*  Try to determinate server IP address */
-    if ((hent = gethostbyname(host)) == NULL) {
+    if ((hent = gethostbyname(host)) == NULL)
+    {
         errno = EINVAL;
         return -1;
     }
@@ -370,27 +392,29 @@ INSIDE_MTCR int open_cli_connection(const char *host, const int port, proto_type
      * Fill in the structure "serv_addr" with the address of the
      * server that we want to connect with.
      */
-    memset((char*) &serv_addr, 0, sizeof(serv_addr));
-    serv_addr.sin_family      = AF_INET;
+    memset((char*)&serv_addr, 0, sizeof(serv_addr));
+    serv_addr.sin_family = AF_INET;
     memcpy(&serv_addr.sin_addr, (*(hent->h_addr_list)), sizeof(struct in_addr));
-    serv_addr.sin_port        = (short)htons((short)port);
+    serv_addr.sin_port = (short)htons((short)port);
 
     /*  Open a TCP socket (an Internet stream socket). */
-    if ( (SockFD = socket(domain, type, 0)) < 0) {
+    if ((SockFD = socket(domain, type, 0)) < 0)
+    {
         return -1;
     }
 
-
-    if (needs_bind) {
+    if (needs_bind)
+    {
         struct sockaddr_in my_addr;
         /*  Bind our local address so that the client can send to us. */
-        memset((char*) &my_addr, 0, sizeof(my_addr));
-        my_addr.sin_family      = AF_INET;
+        memset((char*)&my_addr, 0, sizeof(my_addr));
+        my_addr.sin_family = AF_INET;
         my_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-        my_addr.sin_port        = (short)(htons((short)port));
+        my_addr.sin_port = (short)(htons((short)port));
 
         /*  Bind our local address so that the client can send to us. */
-        if (bind(SockFD, (struct sockaddr*)&my_addr, sizeof(my_addr)) < 0) {
+        if (bind(SockFD, (struct sockaddr*)&my_addr, sizeof(my_addr)) < 0)
+        {
             COMP_CLOSE(SockFD);
             perror("bind failed\n");
             return -1;
@@ -400,7 +424,8 @@ INSIDE_MTCR int open_cli_connection(const char *host, const int port, proto_type
     /*
      * Connect to the server.
      */
-    if (connect(SockFD, (struct sockaddr*) &serv_addr, sizeof(serv_addr)) < 0) {
+    if (connect(SockFD, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0)
+    {
         COMP_CLOSE(SockFD);
         return -1;
     }
@@ -415,7 +440,7 @@ INSIDE_MTCR int open_cli_connection(const char *host, const int port, proto_type
 */
 INSIDE_MTCR int open_serv_connection(const int port)
 {
-    struct hostent     *hent;
+    struct hostent* hent;
     struct sockaddr_in serv_addr;
     struct sockaddr_in cli_inet_addr;
     int SockFD, newsockfd;
@@ -424,25 +449,28 @@ INSIDE_MTCR int open_serv_connection(const int port)
 
     EXEC_SIGNAL()
 
-    if ((SockFD = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+    if ((SockFD = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+    {
         return -1;
     }
 
     /*  Bind our local address so that the client can send to us. */
-    memset((char*) &serv_addr, 0, sizeof(serv_addr));
-    serv_addr.sin_family      = AF_INET;
+    memset((char*)&serv_addr, 0, sizeof(serv_addr));
+    serv_addr.sin_family = AF_INET;
     serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-    serv_addr.sin_port        = (short)(htons((short)port));
-    if (bind(SockFD, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {
-        #ifdef __WIN__
+    serv_addr.sin_port = (short)(htons((short)port));
+    if (bind(SockFD, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0)
+    {
+#ifdef __WIN__
         errno = WSAGetLastError();
-        #endif
+#endif
         COMP_CLOSE(SockFD);
         return -1;
     }
 
     /*  Get ready to accept connection */
-    if (listen(SockFD, SOCKET_BACKLOG) < 0) {
+    if (listen(SockFD, SOCKET_BACKLOG) < 0)
+    {
         COMP_CLOSE(SockFD);
         return -1;
     }
@@ -452,9 +480,10 @@ INSIDE_MTCR int open_serv_connection(const int port)
     {
         plog("Waiting for connection on port %d\n", port);
 
-        while ((newsockfd = accept(SockFD, (struct sockaddr*)&cli_inet_addr,
-                                   (socklen_t*)&clilen)) < 0) {
-            if (errno != EINTR) {
+        while ((newsockfd = accept(SockFD, (struct sockaddr*)&cli_inet_addr, (socklen_t*)&clilen)) < 0)
+        {
+            if (errno != EINTR)
+            {
                 COMP_CLOSE(SockFD);
                 return -1;
             }
@@ -462,25 +491,27 @@ INSIDE_MTCR int open_serv_connection(const int port)
 
         GET_CHILD_PID(childpid);
 
-        if (childpid < 0) {
+        if (childpid < 0)
+        {
             COMP_CLOSE(newsockfd);
             COMP_CLOSE(SockFD);
             return -1;
         }
-        if (childpid) {
+        if (childpid)
+        {
             /*  We are parent */
             COMP_CLOSE(newsockfd);
             RET_ZERO_IN_WIN();
             /*   ... and try accept next connection */
-        } else {
+        }
+        else
+        {
             /*  We are child */
             COMP_CLOSE(SockFD);
 
             /*  Determine the client host name */
-            hent = gethostbyaddr((char*)&cli_inet_addr.sin_addr,
-                                 sizeof(cli_inet_addr.sin_addr), AF_INET);
-            plog("Accepted connection from host \"%s\" ",
-                 hent ? hent->h_name : "????");
+            hent = gethostbyaddr((char*)&cli_inet_addr.sin_addr, sizeof(cli_inet_addr.sin_addr), AF_INET);
+            plog("Accepted connection from host \"%s\" ", hent ? hent->h_name : "????");
 
             /*  Determine the client host address */
             plog(" (%s)", inet_ntoa(cli_inet_addr.sin_addr));
@@ -489,6 +520,4 @@ INSIDE_MTCR int open_serv_connection(const int port)
             return newsockfd;
         }
     }
-
 }
-
diff --git a/small_utils/tcp.h b/small_utils/tcp.h
index 87aa361b..63814d46 100644
--- a/small_utils/tcp.h
+++ b/small_utils/tcp.h
@@ -40,12 +40,13 @@
 #define _MST_SOCKETS_H
 
 #ifndef __WIN__
-    #define ATTRIBUTE  __attribute__ ((format(printf, 1, 2)))
+#define ATTRIBUTE __attribute__((format(printf, 1, 2)))
 #else
-    #define ATTRIBUTE
+#define ATTRIBUTE
 #endif
 
-typedef enum proto_type {
+typedef enum proto_type
+{
     PT_TCP = 0,
     PT_UDP,
 } proto_type_t;
@@ -59,12 +60,12 @@ void logset(const int ena);
 /*
 ** plog - debug printouts (like printf). Set 1 via logset to see output
 */
-int plog(const char *fmt, ...) ATTRIBUTE;
+int plog(const char* fmt, ...) ATTRIBUTE;
 
 /*
 ** open_cli_connection - open client TCP/UDP connection and return socket fd
 */
-int open_cli_connection(const char *host, const int port, proto_type_t proto);
+int open_cli_connection(const char* host, const int port, proto_type_t proto);
 
 /*
 ** open_serv_connection - open server TCP connection and return socket fd
@@ -86,7 +87,7 @@ int open_serv_connection(const int port);
 /*
 ** reads - reads string (till \0)  from the socket "fd"
 */
-int reads(int fd, char *ptr, int maxlen, proto_type_t proto);
+int reads(int fd, char* ptr, int maxlen, proto_type_t proto);
 
 /*
 ** readnl - reads till till newline  from the socket "fd"
@@ -102,12 +103,12 @@ int reads(int fd, char *ptr, int maxlen, proto_type_t proto);
 ** Returns number of bytes written, or -1 if an error occurs.
 ** Return value will always be either -1 or "nbytes"
 */
-int writen(int fd, void *vptr, int nbytes, proto_type_t proto);
+int writen(int fd, void* vptr, int nbytes, proto_type_t proto);
 
 /*
 ** writes - write string (null ternminated buffer) to the socket "fd"
 */
-int writes(int fd, char *ptr, proto_type_t proto);
+int writes(int fd, char* ptr, proto_type_t proto);
 
 /*
 ** writenl - write newline ternminated buffer to the socket "fd"
diff --git a/small_utils/vpd.c b/small_utils/vpd.c
index 6fb86bf9..33aea5ae 100644
--- a/small_utils/vpd.c
+++ b/small_utils/vpd.c
@@ -54,40 +54,49 @@ static clock_t timeout_t = 5; // Just for compatibility, no meaning
 
 typedef unsigned char vpd_t[VPD_MAX_SIZE];
 
-void print_field(char *key, char *val)
+void print_field(char* key, char* val)
 {
-    if (strcmp(key, "RV") == 0) {
+    if (strcmp(key, "RV") == 0)
+    {
         return;
-    } else if (strlen(val)) {
+    }
+    else if (strlen(val))
+    {
         printf("%s:      %s\n", key, val);
     }
 }
 
-void print_bin_field(char *key, char *val)
+void print_bin_field(char* key, char* val)
 {
-    char *valTmp = malloc((strlen(val) * 2 + 1) * sizeof(char));
-    if (!valTmp) {
+    char* valTmp = malloc((strlen(val) * 2 + 1) * sizeof(char));
+    if (!valTmp)
+    {
         printf("-E- Failed to Allocate Memory");
         return;
     }
     memset(valTmp, 0, (strlen(val) * 2 + 1) * sizeof(char));
     int i = 0;
-    while (val[i] != '\0') {
-        sprintf(valTmp + i * 2, "%02x", (u_int8_t) val[i]);
+    while (val[i] != '\0')
+    {
+        sprintf(valTmp + i * 2, "%02x", (u_int8_t)val[i]);
         i++;
     }
     printf("%s(BIN): %s\n", key, valTmp);
     free(valTmp);
 }
 
-int is_printable(const char *value)
+int is_printable(const char* value)
 {
     int i = 0;
-    while (value[i] != '\0') {
-        if (isprint((int)value[i])) {
+    while (value[i] != '\0')
+    {
+        if (isprint((int)value[i]))
+        {
             i++;
             continue;
-        } else {
+        }
+        else
+        {
             return 0;
         }
     }
@@ -96,49 +105,65 @@ int is_printable(const char *value)
 
 static int is_keyword_valid(const char* kw)
 {
-    if (!kw || strlen(kw) == 0 || !is_printable(kw)) {
+    if (!kw || strlen(kw) == 0 || !is_printable(kw))
+    {
         return 0;
     }
     return 1;
 }
 
-//If you want to print all, pass NULL keyword
-//TODO adrianc: use common func - there is alot of duplicate code here.
-void find_and_print_vpd_data(vpd_result_t *vpd_data, vpd_tags_type_t vpd_type, const char *keyword)
+// If you want to print all, pass NULL keyword
+// TODO adrianc: use common func - there is alot of duplicate code here.
+void find_and_print_vpd_data(vpd_result_t* vpd_data, vpd_tags_type_t vpd_type, const char* keyword)
 {
-    if (vpd_type & VPD_RO) {
+    if (vpd_type & VPD_RO)
+    {
         int i;
-        if (!keyword || strcmp(keyword, "ID") == 0) {
+        if (!keyword || strcmp(keyword, "ID") == 0)
+        {
             print_field("ID", vpd_data->id.data);
-            if (keyword) {
+            if (keyword)
+            {
                 return;
             }
         }
-        for (i = 0; i < vpd_data->ro_fields_size; i++) {
-            if (!keyword || strcmp(vpd_data->ro_fields[i].id, keyword) == 0) {
-                if (is_keyword_valid(vpd_data->ro_fields[i].id)) {
+        for (i = 0; i < vpd_data->ro_fields_size; i++)
+        {
+            if (!keyword || strcmp(vpd_data->ro_fields[i].id, keyword) == 0)
+            {
+                if (is_keyword_valid(vpd_data->ro_fields[i].id))
+                {
                     // skip empty/non-printable keywords
                     print_field(vpd_data->ro_fields[i].id, vpd_data->ro_fields[i].data);
                 }
-                if (keyword) {
+                if (keyword)
+                {
                     return;
                 }
             }
         }
     }
-    if (vpd_type & VPD_RW) {
+    if (vpd_type & VPD_RW)
+    {
         int i;
-        for (i = 0; i < vpd_data->rw_fields_size; i++) {
-            if (!keyword || strcmp(vpd_data->rw_fields[i].id, keyword) == 0) {
-                if (is_keyword_valid(vpd_data->rw_fields[i].id)) {
+        for (i = 0; i < vpd_data->rw_fields_size; i++)
+        {
+            if (!keyword || strcmp(vpd_data->rw_fields[i].id, keyword) == 0)
+            {
+                if (is_keyword_valid(vpd_data->rw_fields[i].id))
+                {
                     // skip empty/non-printable keywords
-                    if (is_printable(vpd_data->rw_fields[i].data) == 1) {
+                    if (is_printable(vpd_data->rw_fields[i].data) == 1)
+                    {
                         print_field(vpd_data->rw_fields[i].id, vpd_data->rw_fields[i].data);
-                    } else {
+                    }
+                    else
+                    {
                         print_bin_field(vpd_data->rw_fields[i].id, vpd_data->rw_fields[i].data);
                     }
                 }
-                if (keyword) {
+                if (keyword)
+                {
                     return;
                 }
             }
@@ -146,175 +171,209 @@ void find_and_print_vpd_data(vpd_result_t *vpd_data, vpd_tags_type_t vpd_type, c
     }
 }
 
-//Returns a pointer to the position of the arg in OPTSTR, or NULL if not found
-char const* get_opt_pos(const char *option_suspect, int enforce_option_with_args)
+// Returns a pointer to the position of the arg in OPTSTR, or NULL if not found
+char const* get_opt_pos(const char* option_suspect, int enforce_option_with_args)
 {
-    if (!(strlen(option_suspect) == 2 && option_suspect[0] == '-')) {
+    if (!(strlen(option_suspect) == 2 && option_suspect[0] == '-'))
+    {
         return NULL;
     }
     char suspect_to_search[3];
     suspect_to_search[0] = option_suspect[1];
-    if (enforce_option_with_args) {
+    if (enforce_option_with_args)
+    {
         suspect_to_search[1] = ':';
         suspect_to_search[2] = 0;
-    } else {
+    }
+    else
+    {
         suspect_to_search[1] = 0;
     }
     return strstr(OPTSTR, suspect_to_search);
 }
 
-int verify_command_layout(int argc, char const **argv)
+int verify_command_layout(int argc, char const** argv)
 {
-    if (argc < 2) {
+    if (argc < 2)
+    {
         return 0;
     }
 
     int i;
-    for (i = 1; i < argc; i++) {
-        if (get_opt_pos(argv[i], 0) || get_opt_pos(argv[i - 1], 1)) {
+    for (i = 1; i < argc; i++)
+    {
+        if (get_opt_pos(argv[i], 0) || get_opt_pos(argv[i - 1], 1))
+        {
             continue;
-        } else {
+        }
+        else
+        {
             break;
         }
     }
-    //i is file argument or at the end of argv
-    for (i = i + 1; i < argc; i++) {
-        if (get_opt_pos(argv[i], 0)) {
+    // i is file argument or at the end of argv
+    for (i = i + 1; i < argc; i++)
+    {
+        if (get_opt_pos(argv[i], 0))
+        {
             return 0;
         }
     }
     return 1;
 }
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-    const char *name;
-    char *endptr;
+    const char* name;
+    char* endptr;
     int i;
     int rc = 0;
     vpd_t d;
     int m = 0;
     int n = 0;
     int strict = 0;
-    mfile *mf;
-    vpd_result_t *read_result;
+    mfile* mf;
+    vpd_result_t* read_result;
     vpd_tags_type_t read_type = VPD_ALL;
 
-    if (!verify_command_layout(argc, (char const**) argv)) {
+    if (!verify_command_layout(argc, (char const**)argv))
+    {
         fprintf(stderr, "-E- Bad input parameter.\n");
         rc = 1;
         goto usage;
     }
 
-    do {
+    do
+    {
         i = getopt(argc, argv, OPTSTR);
-        if (i < 0) {
+        if (i < 0)
+        {
             break;
         }
 
-        switch (i) {
-        case 'm':
-            m = 1;
-            break;
+        switch (i)
+        {
+            case 'm':
+                m = 1;
+                break;
 
-        case 'n':
-            n = 1;
-            break;
+            case 'n':
+                n = 1;
+                break;
 
-        case 's':
-            strict = 1;
-            break;
+            case 's':
+                strict = 1;
+                break;
 
-        case 'h':
-            rc = 0;
-            goto usage;
+            case 'h':
+                rc = 0;
+                goto usage;
 
-        case 'v':
-            print_version_string("mstvpd", VPD_TOOL_VERSON);
-            exit(0);
+            case 'v':
+                print_version_string("mstvpd", VPD_TOOL_VERSON);
+                exit(0);
 
-        case 'r':
-            read_type = VPD_RO;
-            break;
+            case 'r':
+                read_type = VPD_RO;
+                break;
 
-        case 't':
-            timeout_t = strtol(optarg, &endptr, 0);
-            if (*endptr != '\0') {
-                fprintf(stderr, "-E- Invalid timeout argument: %s.\n", optarg);
-                return 1;
-            }
-            if (timeout_t <= 0) {
-                fprintf(stderr, "-E- Wrong timeout, it should be > 0 !\n");
-                return 1;
-            }
-            break;
+            case 't':
+                timeout_t = strtol(optarg, &endptr, 0);
+                if (*endptr != '\0')
+                {
+                    fprintf(stderr, "-E- Invalid timeout argument: %s.\n", optarg);
+                    return 1;
+                }
+                if (timeout_t <= 0)
+                {
+                    fprintf(stderr, "-E- Wrong timeout, it should be > 0 !\n");
+                    return 1;
+                }
+                break;
 
-        default:
-            rc = 1;
-            goto usage;
+            default:
+                rc = 1;
+                goto usage;
         }
     } while (1 == 1);
 
     name = argv[optind];
     argc -= optind;
     argv += optind;
-    if (name == NULL) {
+    if (name == NULL)
+    {
         fprintf(stderr, "-E- Missing <file> argument !\n");
         return 33;
     }
-    if (!strcmp("-", name)) {
-        if (fread(d, VPD_MAX_SIZE, 1, stdin) != 1) {
+    if (!strcmp("-", name))
+    {
+        if (fread(d, VPD_MAX_SIZE, 1, stdin) != 1)
+        {
             return 3;
         }
-    } else {
+    }
+    else
+    {
         mf = mopen(name);
-        if (!mf) {
+        if (!mf)
+        {
             fprintf(stderr, "-E- Failed to open device %s!\n", name);
             return MVPD_BAD_PARAMS;
         }
         int mvpd_len = VPD_MAX_SIZE;
         rc = mvpd_get_vpd_size(mf, &mvpd_len);
-        if (rc != 0) {
+        if (rc != 0)
+        {
             fprintf(stderr, "-E- Failed to get VPD size from %s!\n", name);
             return MVPD_ERR;
         }
-        rc = mvpd_get_raw_vpd(mf, (u_int8_t*) d, mvpd_len);
-        if (rc) {
+        rc = mvpd_get_raw_vpd(mf, (u_int8_t*)d, mvpd_len);
+        if (rc)
+        {
             fprintf(stderr, "-E- Failed to read VPD from %s!\n", name);
             return MVPD_ERR;
         }
     }
 
-    if (m) {
+    if (m)
+    {
         return fwrite(d, VPD_MAX_SIZE, 1, stdout) != 1;
     }
-    rc = mvpd_parse_adv((u_int8_t*) d, VPD_MAX_SIZE, &read_result, read_type, strict, !n);
-    if (rc) {
+    rc = mvpd_parse_adv((u_int8_t*)d, VPD_MAX_SIZE, &read_result, read_type, strict, !n);
+    if (rc)
+    {
         fprintf(stderr, "-E- Failed to parse VPD from %s!\n", name);
         return MVPD_ERR;
     }
-    if (argc == 1) {
+    if (argc == 1)
+    {
         find_and_print_vpd_data(read_result, read_type, NULL);
-    } else {
-        for (i = 0; i < argc - 1; ++i) {
-            if (!strcmp(argv[i + 1], "--")) {
+    }
+    else
+    {
+        for (i = 0; i < argc - 1; ++i)
+        {
+            if (!strcmp(argv[i + 1], "--"))
+            {
                 continue;
             }
             find_and_print_vpd_data(read_result, read_type, argv[i + 1]);
         }
     }
-    if (read_result) {
+    if (read_result)
+    {
         mvpd_result_free(read_result);
     }
     return 0;
 
-usage: printf("Usage: %s [-m|-n|-r] [-t ##] <file> [-- keyword ...]\n", argv[0]);
+usage:
+    printf("Usage: %s [-m|-n|-r] [-t ##] <file> [-- keyword ...]\n", argv[0]);
     printf("-h\tPrint this help.\n");
     printf("-v\tPrint tool version.\n");
     printf("-m\tDump raw VPD data to stdout.\n");
     printf("-n\tDo not validate check sum.\n");
     printf("-r\tDo not check and display the VPD_W tag in the vpd data.\n");
-    printf("-t ##\tTime out after ## seconds. (Default is 30.)\n\n");  // Currently ignored - for compatibility
+    printf("-t ##\tTime out after ## seconds. (Default is 30.)\n\n"); // Currently ignored - for compatibility
     // We have also "-s" ("s" for "strict"), which is a hidden flag used by production.
     // There are cards out there with inconsistent format, ~200K cards,
     // which will cause the tool to fail if this flag is specified.
diff --git a/tools_crypto/tools_md5.c b/tools_crypto/tools_md5.c
index 69b013e5..1695e236 100644
--- a/tools_crypto/tools_md5.c
+++ b/tools_crypto/tools_md5.c
@@ -34,7 +34,7 @@
 #include <openssl/md5.h>
 #include "tools_md5.h"
 
-u_int8_t* tools_md5(const u_int8_t *src, u_int32_t src_len, u_int8_t dst[16])
+u_int8_t* tools_md5(const u_int8_t* src, u_int32_t src_len, u_int8_t dst[16])
 {
     return MD5((const unsigned char*)src, src_len, (unsigned char*)dst);
 }
diff --git a/tools_crypto/tools_md5.h b/tools_crypto/tools_md5.h
index b68c56a9..ad174e69 100644
--- a/tools_crypto/tools_md5.h
+++ b/tools_crypto/tools_md5.h
@@ -35,11 +35,12 @@
 #define TOOLS_MD5_H
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <common/compatibility.h>
-u_int8_t* tools_md5(const u_int8_t *src, u_int32_t src_len, u_int8_t dst[16]);
+    u_int8_t* tools_md5(const u_int8_t* src, u_int32_t src_len, u_int8_t dst[16]);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/adb_to_c_utils.c b/tools_layouts/adb_to_c_utils.c
index 113a1c8a..6be685eb 100644
--- a/tools_layouts/adb_to_c_utils.c
+++ b/tools_layouts/adb_to_c_utils.c
@@ -29,7 +29,6 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
 *** This file was generated at "2017-03-24 22:07:56"
@@ -41,77 +40,78 @@
 /************************************
  * Function: adb2c_calc_array_field_address
  ************************************/
-u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset, u_int32_t arr_elemnt_size,
-                                   int arr_idx, u_int32_t parent_node_size,
-                                   int is_big_endian_arr)
+u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset,
+                                         u_int32_t arr_elemnt_size,
+                                         int arr_idx,
+                                         u_int32_t parent_node_size,
+                                         int is_big_endian_arr)
 {
     u_int32_t offs;
 
     if (arr_elemnt_size > 32)
     {
         assert(!(arr_elemnt_size % 32));
-        start_bit_offset += arr_elemnt_size*(u_int32_t)arr_idx;                                                                                     
+        start_bit_offset += arr_elemnt_size * (u_int32_t)arr_idx;
         return start_bit_offset;
     }
 
     if (is_big_endian_arr)
     {
         u_int32_t dword_delta;
-        offs = start_bit_offset - arr_elemnt_size*(u_int32_t)arr_idx;
-        dword_delta = (((start_bit_offset>>5)<<2) - ((offs>>5)<<2))/4;
+        offs = start_bit_offset - arr_elemnt_size * (u_int32_t)arr_idx;
+        dword_delta = (((start_bit_offset >> 5) << 2) - ((offs >> 5) << 2)) / 4;
         if (dword_delta)
         {
-            offs += 64*dword_delta;
+            offs += 64 * dword_delta;
         }
     }
     else
     {
-        offs = start_bit_offset + arr_elemnt_size*(u_int32_t)arr_idx;
+        offs = start_bit_offset + arr_elemnt_size * (u_int32_t)arr_idx;
     }
 
-    //printf("==> %d\n", MIN(32, parent_node_size) - (offs%32) - arr_elemnt_size + ((offs>>5)<<5));
-    return ADB2C_MIN(32, parent_node_size) - (offs%32) - arr_elemnt_size + ((offs>>5)<<5);
+    // printf("==> %d\n", MIN(32, parent_node_size) - (offs%32) - arr_elemnt_size + ((offs>>5)<<5));
+    return ADB2C_MIN(32, parent_node_size) - (offs % 32) - arr_elemnt_size + ((offs >> 5) << 5);
 }
 
 /************************************
  * Function: adb2c_push_integer_to_buff
  ************************************/
-void adb2c_push_integer_to_buff(u_int8_t *buff, u_int32_t bit_offset,  u_int32_t byte_size, u_int64_t field_value)
+void adb2c_push_integer_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size, u_int64_t field_value)
 {
     field_value = ADB2C_CPU_TO_BE64(field_value);
-    memcpy(buff + bit_offset/8, (u_int8_t*)&field_value + (8-byte_size), (size_t)byte_size);
+    memcpy(buff + bit_offset / 8, (u_int8_t*)&field_value + (8 - byte_size), (size_t)byte_size);
 }
 
 /************************************
  * Function: adb2c_push_integer_to_buff_le
  ************************************/
 // little endian version of the function
-void adb2c_push_integer_to_buff_le(u_int8_t *buff, u_int32_t bit_offset,  u_int32_t byte_size, u_int64_t field_value)
+void adb2c_push_integer_to_buff_le(u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size, u_int64_t field_value)
 {
     field_value = ADB2C_CPU_TO_LE64(field_value);
-    memcpy(buff + bit_offset/8, (u_int8_t*)&field_value, (size_t)byte_size);
+    memcpy(buff + bit_offset / 8, (u_int8_t*)&field_value, (size_t)byte_size);
 }
 
-
 /************************************
  * Function: adb2c_push_bits_to_buff
  ************************************/
-//the next function will push the field into the buffer by inserting it's MSB bits first
-//and therefore by doing it we save the CPU_TO_BE operation
-void adb2c_push_bits_to_buff(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
+// the next function will push the field into the buffer by inserting it's MSB bits first
+// and therefore by doing it we save the CPU_TO_BE operation
+void adb2c_push_bits_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
 {
-    u_int32_t i 		= 0;
-    u_int32_t byte_n	= bit_offset / 8;
-    u_int32_t byte_n_offset	= bit_offset % 8;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8;
+    u_int32_t byte_n_offset = bit_offset % 8;
     u_int32_t to_push;
 
-    //going over all bits in field
+    // going over all bits in field
     while (i < field_size)
     {
         to_push = ADB2C_MIN(8 - byte_n_offset, field_size - i);
         i += to_push;
         ADB2C_INSERTF_8(ADB2C_BYTE_N(buff, byte_n), 8U - to_push - byte_n_offset, field_value, field_size - i, to_push);
-        byte_n_offset  = 0;	//(byte_n_offset + to_push) % 8U;
+        byte_n_offset = 0; //(byte_n_offset + to_push) % 8U;
         byte_n++;
     }
 }
@@ -119,17 +119,17 @@ void adb2c_push_bits_to_buff(u_int8_t *buff, u_int32_t bit_offset, u_int32_t fie
 /************************************
  * Function: adb2c_push_bits_to_buff_le
  ************************************/
-//the next function will push the field into the buffer by inserting it's LSB bits first
-//and therefore by doing it we save the CPU_TO_LE operation
-void adb2c_push_bits_to_buff_le(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
+// the next function will push the field into the buffer by inserting it's LSB bits first
+// and therefore by doing it we save the CPU_TO_LE operation
+void adb2c_push_bits_to_buff_le(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value)
 {
-    u_int32_t i                 = 0;
-    u_int32_t byte_n    = (bit_offset / 8) + (field_size / 8) - 1;
-    u_int32_t byte_n_offset     = bit_offset % 8;
+    u_int32_t i = 0;
+    u_int32_t byte_n = (bit_offset / 8) + (field_size / 8) - 1;
+    u_int32_t byte_n_offset = bit_offset % 8;
     u_int32_t to_push;
     byte_n += (field_size % 8) ? 1 : 0;
 
-    //going over all bits in field
+    // going over all bits in field
     while (i < field_size)
     {
         to_push = ADB2C_MIN(8 - byte_n_offset, (field_size - i) % 8);
@@ -137,7 +137,7 @@ void adb2c_push_bits_to_buff_le(u_int8_t *buff, u_int32_t bit_offset, u_int32_t
             to_push += 8;
         i += to_push;
         ADB2C_INSERTF_8(ADB2C_BYTE_N(buff, byte_n), 8U - to_push - byte_n_offset, field_value, field_size - i, to_push);
-        byte_n_offset  = 0;     //(byte_n_offset + to_push) % 8U;
+        byte_n_offset = 0; //(byte_n_offset + to_push) % 8U;
         byte_n--;
     }
 }
@@ -145,67 +145,67 @@ void adb2c_push_bits_to_buff_le(u_int8_t *buff, u_int32_t bit_offset, u_int32_t
 /************************************
  * Function: adb2c_push_to_buf
  ************************************/
-void adb2c_push_to_buf(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value)
+void adb2c_push_to_buf(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value)
 {
     bit_offset = adb2c_calc_array_field_address(bit_offset, field_size, 0, field_size + 32, 0);
     if (field_size <= 32)
         adb2c_push_bits_to_buff(buff, bit_offset, field_size, (u_int32_t)field_value);
     else
-        adb2c_push_integer_to_buff(buff, bit_offset, field_size/8,  field_value);
+        adb2c_push_integer_to_buff(buff, bit_offset, field_size / 8, field_value);
 }
 
 /************************************
  * Function: adb2c_push_to_buf_le
  ************************************/
-void adb2c_push_to_buf_le(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value)
+void adb2c_push_to_buf_le(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value)
 {
     bit_offset = adb2c_calc_array_field_address(bit_offset, field_size, 0, field_size + 32, 0);
     if (field_size <= 32)
         adb2c_push_bits_to_buff_le(buff, bit_offset, field_size, (u_int32_t)field_value);
     else
-        adb2c_push_integer_to_buff_le(buff, bit_offset, field_size/8,  field_value);
+        adb2c_push_integer_to_buff_le(buff, bit_offset, field_size / 8, field_value);
 }
 
 /************************************
  * Function: adb2c_pop_integer_from_buff
  ************************************/
-u_int64_t adb2c_pop_integer_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t byte_size)
+u_int64_t adb2c_pop_integer_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size)
 {
     u_int64_t val = 0;
-    memcpy((u_int8_t*)&val + (8-byte_size), buff + bit_offset/8, (size_t)byte_size);
+    memcpy((u_int8_t*)&val + (8 - byte_size), buff + bit_offset / 8, (size_t)byte_size);
     return ADB2C_BE64_TO_CPU(val);
 }
 
 /************************************
  * Function: adb2c_pop_integer_from_buff_le
  ************************************/
-u_int64_t adb2c_pop_integer_from_buff_le(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t byte_size)
+u_int64_t adb2c_pop_integer_from_buff_le(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size)
 {
     u_int64_t val = 0;
-    memcpy((u_int8_t*)&val, buff + bit_offset/8, (size_t)byte_size);
+    memcpy((u_int8_t*)&val, buff + bit_offset / 8, (size_t)byte_size);
     return ADB2C_LE64_TO_CPU(val);
 }
 
 /************************************
  * Function: adb2c_pop_bits_from_buff
  ************************************/
-//the next function will pop the field into the buffer by removing it's MSB bits first
-//and therefore by doing it we save the BE_TO_CPU operation
-u_int32_t adb2c_pop_bits_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+// the next function will pop the field into the buffer by removing it's MSB bits first
+// and therefore by doing it we save the BE_TO_CPU operation
+u_int32_t adb2c_pop_bits_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
-    u_int32_t i 		= 0;
-    u_int32_t byte_n	= bit_offset / 8;
-    u_int32_t byte_n_offset	= bit_offset % 8;
-    u_int32_t field_32	= 0;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8;
+    u_int32_t byte_n_offset = bit_offset % 8;
+    u_int32_t field_32 = 0;
     u_int32_t to_pop;
 
-    //going over all bits in field
+    // going over all bits in field
     while (i < field_size)
     {
-        to_pop =  ADB2C_MIN(8 - byte_n_offset, field_size - i);
+        to_pop = ADB2C_MIN(8 - byte_n_offset, field_size - i);
         i += to_pop;
         ADB2C_INSERTF_8(field_32, field_size - i, ADB2C_BYTE_N(buff, byte_n), 8 - to_pop - byte_n_offset, to_pop);
-        byte_n_offset  = 0;	//(byte_n_offset + to_pop) % 8;
+        byte_n_offset = 0; //(byte_n_offset + to_pop) % 8;
         byte_n++;
     }
     return field_32;
@@ -214,26 +214,26 @@ u_int32_t adb2c_pop_bits_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u
 /************************************
  * Function: adb2c_pop_bits_from_buff_le
  ************************************/
-//the next function will pop the field into the buffer by removing it's LSB bits first
-//and therefore by doing it we save the BE_TO_CPU operation
-u_int32_t adb2c_pop_bits_from_buff_le(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+// the next function will pop the field into the buffer by removing it's LSB bits first
+// and therefore by doing it we save the BE_TO_CPU operation
+u_int32_t adb2c_pop_bits_from_buff_le(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
-    u_int32_t i                 = 0;
-    u_int32_t byte_n    = bit_offset / 8 + (field_size / 8) - 1;
-    u_int32_t byte_n_offset     = bit_offset % 8;
-    u_int32_t field_32  = 0;
+    u_int32_t i = 0;
+    u_int32_t byte_n = bit_offset / 8 + (field_size / 8) - 1;
+    u_int32_t byte_n_offset = bit_offset % 8;
+    u_int32_t field_32 = 0;
     u_int32_t to_pop;
     byte_n += (field_size % 8) ? 1 : 0;
 
-    //going over all bits in field
+    // going over all bits in field
     while (i < field_size)
     {
-        to_pop =  ADB2C_MIN(8 - byte_n_offset, (field_size - i) % 8);
+        to_pop = ADB2C_MIN(8 - byte_n_offset, (field_size - i) % 8);
         if (to_pop == 0)
             to_pop += 8;
         i += to_pop;
         ADB2C_INSERTF_8(field_32, field_size - i, ADB2C_BYTE_N(buff, byte_n), 8 - to_pop - byte_n_offset, to_pop);
-        byte_n_offset  = 0;     //(byte_n_offset + to_pop) % 8;
+        byte_n_offset = 0; //(byte_n_offset + to_pop) % 8;
         byte_n--;
     }
     return field_32;
@@ -242,25 +242,25 @@ u_int32_t adb2c_pop_bits_from_buff_le(const u_int8_t *buff, u_int32_t bit_offset
 /************************************
  * Function: adb2c_pop_from_buf
  ************************************/
-u_int64_t adb2c_pop_from_buf(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+u_int64_t adb2c_pop_from_buf(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
     bit_offset = adb2c_calc_array_field_address(bit_offset, field_size, 0, field_size + 32, 0);
     if (field_size <= 32)
         return adb2c_pop_bits_from_buff(buff, bit_offset, field_size);
     else
-        return adb2c_pop_integer_from_buff(buff, bit_offset, field_size/8);
+        return adb2c_pop_integer_from_buff(buff, bit_offset, field_size / 8);
 }
 
 /************************************
  * Function: adb2c_pop_from_buf_le
  ************************************/
-u_int64_t adb2c_pop_from_buf_le(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size)
+u_int64_t adb2c_pop_from_buf_le(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size)
 {
     bit_offset = adb2c_calc_array_field_address(bit_offset, field_size, 0, field_size + 32, 0);
     if (field_size <= 32)
         return adb2c_pop_bits_from_buff_le(buff, bit_offset, field_size);
     else
-        return adb2c_pop_integer_from_buff_le(buff, bit_offset, field_size/8);
+        return adb2c_pop_integer_from_buff_le(buff, bit_offset, field_size / 8);
 }
 
 /************************************
@@ -275,7 +275,6 @@ const char* adb2c_db_get_field_enum_name(struct adb2c_field_format* field, int v
             return field->enums[i].name;
     }
 
-    
     return "Unknown Enum Value";
 }
 
@@ -299,14 +298,14 @@ int adb2c_db_get_field_enum_val(struct adb2c_field_format* field, const char* na
  ************************************/
 const char* adb2c_db_get_field_attr(struct adb2c_field_format* field, const char* attr_name)
 {
-	int i;
-	for (i = 0; i < field->attrs_len; i++)
-	{
-		if (!strcmp(attr_name, field->attrs[i].name))
-			return field->attrs[i].val;
-	}
-	
-	return NULL;
+    int i;
+    for (i = 0; i < field->attrs_len; i++)
+    {
+        if (!strcmp(attr_name, field->attrs[i].name))
+            return field->attrs[i].val;
+    }
+
+    return NULL;
 }
 
 /************************************
@@ -314,14 +313,14 @@ const char* adb2c_db_get_field_attr(struct adb2c_field_format* field, const char
  ************************************/
 const char* adb2c_db_get_node_attr(struct adb2c_node_format* node, const char* attr_name)
 {
-	int i;
-	for (i = 0; i < node->attrs_len; i++)
-	{
-		if (!strcmp(attr_name, node->attrs[i].name))
-			return node->attrs[i].val;
-	}
-
-	return NULL;
+    int i;
+    for (i = 0; i < node->attrs_len; i++)
+    {
+        if (!strcmp(attr_name, node->attrs[i].name))
+            return node->attrs[i].val;
+    }
+
+    return NULL;
 }
 
 /************************************
@@ -330,13 +329,13 @@ const char* adb2c_db_get_node_attr(struct adb2c_node_format* node, const char* a
 struct adb2c_node_format* adb2c_db_find_node(struct adb2c_node_db* db, const char* node_name)
 {
     int i;
-    
+
     for (i = 0; i < db->nodes_len; i++)
     {
         if (!strcmp(node_name, db->nodes[i].name))
             return &db->nodes[i];
     }
-    
+
     return NULL;
 }
 
@@ -346,13 +345,13 @@ struct adb2c_node_format* adb2c_db_find_node(struct adb2c_node_db* db, const cha
 struct adb2c_field_format* adb2c_db_find_field(struct adb2c_node_format* node, const char* field_name)
 {
     int i;
-    
-    for(i = 0; i < node->fields_len; i++)
+
+    for (i = 0; i < node->fields_len; i++)
     {
         if (!strcmp(field_name, node->fields[i].full_name))
             return &node->fields[i];
     }
-    
+
     return NULL;
 }
 
@@ -361,11 +360,11 @@ struct adb2c_field_format* adb2c_db_find_field(struct adb2c_node_format* node, c
  ************************************/
 void adb2c_add_indentation(FILE* file, int indent_level)
 {
-	while (indent_level)
-	{
-		fprintf(file, "\t");
-		indent_level--;
-	}
+    while (indent_level)
+    {
+        fprintf(file, "\t");
+        indent_level--;
+    }
 }
 
 /************************************
diff --git a/tools_layouts/adb_to_c_utils.h b/tools_layouts/adb_to_c_utils.h
index 142eefad..f3061eee 100644
--- a/tools_layouts/adb_to_c_utils.h
+++ b/tools_layouts/adb_to_c_utils.h
@@ -30,13 +30,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2016-10-19 23:52:08"
-         *** by:
-         ***    > /mswg/release/eat_me/last_release/adabe_plugins/adb2c/adb2pack.py --input adb/connectx5/connectx5.adb --file-prefix connectx5 --prefix connectx5_
-         ***/
+ *** This file was generated at "2016-10-19 23:52:08"
+ *** by:
+ ***    > /mswg/release/eat_me/last_release/adabe_plugins/adb2c/adb2pack.py --input adb/connectx5/connectx5.adb
+ *--file-prefix connectx5 --prefix connectx5_
+ ***/
 
 #ifndef ADABE_TO_C_UTILS
 #define ADABE_TO_C_UTILS
@@ -45,15 +45,16 @@
 #include <stdio.h>
 #include <string.h>
 
-//for htonl etc...
+// for htonl etc...
 #if defined(_WIN32) || defined(_WIN64)
-    #include<winsock2.h>
-#else   /* Linux */
-    #include<arpa/inet.h>
-#endif  /* Windows */
+#include <winsock2.h>
+#else /* Linux */
+#include <arpa/inet.h>
+#endif /* Windows */
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 /************************************/
@@ -61,244 +62,241 @@ extern "C" {
 /************************************/
 /* Endianess Defines */
 #if __BYTE_ORDER == __LITTLE_ENDIAN
-    #define PLATFORM_MEM "Little Endianess"
-    #define _LITTLE_ENDIANESS
-#else           /* __BYTE_ORDER == __BIG_ENDIAN */
-    #define PLATFORM_MEM "Big Endianess"
-    #define _BIG_ENDIANESS
+#define PLATFORM_MEM "Little Endianess"
+#define _LITTLE_ENDIANESS
+#else /* __BYTE_ORDER == __BIG_ENDIAN */
+#define PLATFORM_MEM "Big Endianess"
+#define _BIG_ENDIANESS
 #endif
 
-
 /* Bit manipulation macros */
 
 /* MASK generate a bit mask S bits width */
 //#define ADB2C_MASK32(S)     ( ((u_int32_t) ~0L) >> (32-(S)) )
-#define ADB2C_MASK8(S)        ( ((u_int8_t) ~0) >> (8-(S)) )
+#define ADB2C_MASK8(S) (((u_int8_t)~0) >> (8 - (S)))
 
 /* BITS generate a bit mask with bits O+S..O set (assumes 32 / 8 bit integer) */
 //#define ADB2C_BITS32(O,S)   ( ADB2C_MASK32(S) << (O) )
-#define ADB2C_BITS8(O,S)      ( ADB2C_MASK8(S) << (O) )
+#define ADB2C_BITS8(O, S) (ADB2C_MASK8(S) << (O))
 
 /* EXTRACT32/8 macro extracts S bits from (u_int32_t/u_int8_t)W with offset O
  * and shifts them O places to the right (right justifies the field extracted) */
 //#define ADB2C_EXTRACT32(W,O,S)  ( ((W)>>(O)) & ADB2C_MASK32(S) )
-#define ADB2C_EXTRACT8(W,O,S)     ( ((W)>>(O)) & ADB2C_MASK8(S) )
-
+#define ADB2C_EXTRACT8(W, O, S) (((W) >> (O)) & ADB2C_MASK8(S))
 
 /* INSERT32/8 macro inserts S bits with offset O from field F into word W (u_int32_t/u_int8_t) */
 //#define ADB2C_INSERT32(W,F,O,S)     ((W)= ( ( (W) & (~ADB2C_BITS32(O,S)) ) | (((F) & ADB2C_MASK32(S))<<(O)) ))
-#define ADB2C_INSERT8(W,F,O,S)        ((W)= ( ( (W) & (~ADB2C_BITS8(O,S)) ) | (((F) & ADB2C_MASK8(S))<<(O)) ))
+#define ADB2C_INSERT8(W, F, O, S) ((W) = (((W) & (~ADB2C_BITS8(O, S))) | (((F)&ADB2C_MASK8(S)) << (O))))
 
 //#define ADB2C_INSERTF_32(W,O1,F,O2,S)   (ADB2C_INSERT32(W, ADB2C_EXTRACT32(F, O2, S), O1, S) )
-#define ADB2C_INSERTF_8(W,O1,F,O2,S)      (ADB2C_INSERT8(W, ADB2C_EXTRACT8(F, O2, S), O1, S) )
-
-
-#define ADB2C_PTR_64_OF_BUFF(buf, offset)     ((u_int64_t*)((u_int8_t*)(buf) + (offset)))
-#define ADB2C_PTR_32_OF_BUFF(buf, offset)     ((u_int32_t*)((u_int8_t*)(buf) + (offset)))
-#define ADB2C_PTR_8_OF_BUFF(buf, offset)      ((u_int8_t*)((u_int8_t*)(buf) + (offset)))
-#define ADB2C_FIELD_64_OF_BUFF(buf, offset)   (*ADB2C_PTR_64_OF_BUFF(buf, offset))
-#define ADB2C_FIELD_32_OF_BUFF(buf, offset)   (*ADB2C_PTR_32_OF_BUFF(buf, offset))
-#define ADB2C_FIELD_8_OF_BUFF(buf, offset)    (*ADB2C_PTR_8_OF_BUFF(buf, offset))
-#define ADB2C_DWORD_N(buf, n)                 ADB2C_FIELD_32_OF_BUFF((buf), (n) * 4)
-#define ADB2C_BYTE_N(buf, n)                  ADB2C_FIELD_8_OF_BUFF((buf), (n))
-
-
-#define ADB2C_MIN(a, b)   ((a) < (b) ? (a) : (b))
-
-
-#define ADB2C_CPU_TO_BE32(x)  htonl(x)
-#define ADB2C_BE32_TO_CPU(x)  ntohl(x)
-#define ADB2C_CPU_TO_BE16(x)  htons(x)
-#define ADB2C_BE16_TO_CPU(x)  ntohs(x)
+#define ADB2C_INSERTF_8(W, O1, F, O2, S) (ADB2C_INSERT8(W, ADB2C_EXTRACT8(F, O2, S), O1, S))
+
+#define ADB2C_PTR_64_OF_BUFF(buf, offset) ((u_int64_t*)((u_int8_t*)(buf) + (offset)))
+#define ADB2C_PTR_32_OF_BUFF(buf, offset) ((u_int32_t*)((u_int8_t*)(buf) + (offset)))
+#define ADB2C_PTR_8_OF_BUFF(buf, offset) ((u_int8_t*)((u_int8_t*)(buf) + (offset)))
+#define ADB2C_FIELD_64_OF_BUFF(buf, offset) (*ADB2C_PTR_64_OF_BUFF(buf, offset))
+#define ADB2C_FIELD_32_OF_BUFF(buf, offset) (*ADB2C_PTR_32_OF_BUFF(buf, offset))
+#define ADB2C_FIELD_8_OF_BUFF(buf, offset) (*ADB2C_PTR_8_OF_BUFF(buf, offset))
+#define ADB2C_DWORD_N(buf, n) ADB2C_FIELD_32_OF_BUFF((buf), (n)*4)
+#define ADB2C_BYTE_N(buf, n) ADB2C_FIELD_8_OF_BUFF((buf), (n))
+
+#define ADB2C_MIN(a, b) ((a) < (b) ? (a) : (b))
+
+#define ADB2C_CPU_TO_BE32(x) htonl(x)
+#define ADB2C_BE32_TO_CPU(x) ntohl(x)
+#define ADB2C_CPU_TO_BE16(x) htons(x)
+#define ADB2C_BE16_TO_CPU(x) ntohs(x)
 #ifdef _LITTLE_ENDIANESS
-    #define ADB2C_CPU_TO_BE64(x) (((u_int64_t)htonl((u_int32_t)((x) & 0xffffffff)) << 32) |                             ((u_int64_t)htonl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_CPU_TO_BE64(x) \
+    (((u_int64_t)htonl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)htonl((u_int32_t)((x >> 32) & 0xffffffff))))
 
-    #define ADB2C_BE64_TO_CPU(x) (((u_int64_t)ntohl((u_int32_t)((x) & 0xffffffff)) << 32) |                             ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
-    #define ADB2C_LE64_TO_CPU(x) (x)
-    #define ADB2C_CPU_TO_LE64(x) (x)
+#define ADB2C_BE64_TO_CPU(x) \
+    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_LE64_TO_CPU(x) (x)
+#define ADB2C_CPU_TO_LE64(x) (x)
 #else
-    #define ADB2C_CPU_TO_BE64(x) (x)
-    #define ADB2C_BE64_TO_CPU(x) (x)
-    #define ADB2C_LE64_TO_CPU(x) (((u_int64_t)ntohl((u_int32_t)((x) & 0xffffffff)) << 32) |                             ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
-    #define ADB2C_CPU_TO_LE64(x) (((u_int64_t)ntohl((u_int32_t)((x) & 0xffffffff)) << 32) |                             ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_CPU_TO_BE64(x) (x)
+#define ADB2C_BE64_TO_CPU(x) (x)
+#define ADB2C_LE64_TO_CPU(x) \
+    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_CPU_TO_LE64(x) \
+    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
 
 #endif
 
-
 /* define macros to the architecture of the CPU */
-#if defined(__linux__) || defined(__FreeBSD__)             /* __linux || __FreeBSD__ */
-#   if defined(__i386__)
-#       define ARCH_x86
-#   elif defined(__x86_64__)
-#       define ARCH_x86_64
-#   elif defined(__ia64__)
-#       define ARCH_ia64
-#   elif defined(__m68k__)
-#       define ARCH_m68k
-#   elif defined(__hppa__)
-#       define ARCH_hppa
-#   elif defined(__PPC64__) || defined(__s390x__)
-#       define ARCH_ppc64
-#   elif defined(__PPC__)
-#       define ARCH_ppc
-#   elif defined(__aarch64__)
-#       define ARCH_arm64
-#   elif defined(__arm__)
-#       define ARCH_arm6l
-#   elif defined(__riscv)
-#       define ARCH_riscv
-#   else
-#       error Unknown CPU architecture using the linux OS
-#   endif
-#elif defined(__MINGW32__) || defined(__MINGW64__)		/* Windows MINGW */
-#   if defined(__MINGW32__)
-#       define ARCH_x86
-#   elif defined(__MINGW64__)
-#       define ARCH_x86_64
-#   else
-#       error Unknown CPU architecture using the windows-mingw OS
-#   endif
-#elif defined(_WIN32) || defined(_WIN64)                /* Windows */
-#   if defined(_WIN32)
-#       define ARCH_x86
-#   elif defined(_WIN64)
-#       define ARCH_x86_64
-#   else
-#       error Unknown CPU architecture using the windows OS
-#   endif
-#else                                                   /* Unknown */
-#   error Unknown OS
+#if defined(__linux__) || defined(__FreeBSD__) /* __linux || __FreeBSD__ */
+#if defined(__i386__)
+#define ARCH_x86
+#elif defined(__x86_64__)
+#define ARCH_x86_64
+#elif defined(__ia64__)
+#define ARCH_ia64
+#elif defined(__m68k__)
+#define ARCH_m68k
+#elif defined(__hppa__)
+#define ARCH_hppa
+#elif defined(__PPC64__) || defined(__s390x__)
+#define ARCH_ppc64
+#elif defined(__PPC__)
+#define ARCH_ppc
+#elif defined(__aarch64__)
+#define ARCH_arm64
+#elif defined(__arm__)
+#define ARCH_arm6l
+#elif defined(__riscv)
+#define ARCH_riscv
+#else
+#error Unknown CPU architecture using the linux OS
+#endif
+#elif defined(__MINGW32__) || defined(__MINGW64__) /* Windows MINGW */
+#if defined(__MINGW32__)
+#define ARCH_x86
+#elif defined(__MINGW64__)
+#define ARCH_x86_64
+#else
+#error Unknown CPU architecture using the windows-mingw OS
+#endif
+#elif defined(_WIN32) || defined(_WIN64) /* Windows */
+#if defined(_WIN32)
+#define ARCH_x86
+#elif defined(_WIN64)
+#define ARCH_x86_64
+#else
+#error Unknown CPU architecture using the windows OS
+#endif
+#else /* Unknown */
+#error Unknown OS
 #endif
-
 
 /* define macros for print fields */
-#define U32D_FMT    "%u"
-#define U32H_FMT    "0x%08x"
-#define UH_FMT		"0x%x"
-#define STR_FMT     "%s"
-#define U16H_FMT    "0x%04x"
-#define U8H_FMT     "0x%02x"
-
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || defined(ARCH_hppa)
-#   if defined(__MINGW32__) || defined(__MINGW64__)
-#       include <inttypes.h>
-#       define U64D_FMT    "0x%" PRId64
-#       define U64H_FMT    "0x%" PRIx64
-#       define U48H_FMT    "0x%" PRIx64
-#   else
-#       define U64D_FMT    "%llu"
-#       define U64H_FMT    "0x%016llx"
-#       define U48H_FMT    "0x%012llx"
-#   endif
-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
-#    define U64D_FMT    "%lu"
-#    define U64H_FMT    "0x%016lx"
-#	 define U48H_FMT	"0x%012lx" 
+#define U32D_FMT "%u"
+#define U32H_FMT "0x%08x"
+#define UH_FMT "0x%x"
+#define STR_FMT "%s"
+#define U16H_FMT "0x%04x"
+#define U8H_FMT "0x%02x"
+
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || \
+  defined(ARCH_hppa)
+#if defined(__MINGW32__) || defined(__MINGW64__)
+#include <inttypes.h>
+#define U64D_FMT "0x%" PRId64
+#define U64H_FMT "0x%" PRIx64
+#define U48H_FMT "0x%" PRIx64
 #else
-#   error Unknown architecture
-#endif  /* ARCH */
-
-
-#if !defined(_WIN32) && !defined(_WIN64)    		/* Linux */
-    #include <sys/types.h>
-#elif defined(__MINGW32__) || defined(__MINGW64__) || defined (_MSC_VER) 	/* windows - mingw */
-    #include <stdint.h>                                                                                                                                           
-    #ifndef   MFT_TOOLS_VARS                                                                                                                                      
-		#define MFT_TOOLS_VARS                                                                                                                                    
-		typedef uint8_t  u_int8_t;                                                                                                                                
-		typedef uint16_t u_int16_t;                                                                                                                               
-		typedef uint32_t u_int32_t;                                                                                                                               
-		typedef uint64_t u_int64_t;                                                                                                                               
-	#endif
-#else   											/* Windows */
-    typedef __int8                  int8_t;
-    typedef unsigned __int8         u_int8_t;
-    typedef __int16                 int16_t;
-    typedef unsigned __int16        u_int16_t;
-    typedef __int32                 int32_t;
-    typedef unsigned __int32        u_int32_t;
-    typedef __int64                 int64_t;
-    typedef unsigned __int64        u_int64_t;
+#define U64D_FMT "%llu"
+#define U64H_FMT "0x%016llx"
+#define U48H_FMT "0x%012llx"
+#endif
+#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_riscv)
+#define U64D_FMT "%lu"
+#define U64H_FMT "0x%016lx"
+#define U48H_FMT "0x%012lx"
+#else
+#error Unknown architecture
+#endif /* ARCH */
+
+#if !defined(_WIN32) && !defined(_WIN64) /* Linux */
+#include <sys/types.h>
+#elif defined(__MINGW32__) || defined(__MINGW64__) || defined(_MSC_VER) /* windows - mingw */
+#include <stdint.h>
+#ifndef MFT_TOOLS_VARS
+#define MFT_TOOLS_VARS
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+#endif
+#else /* Windows */
+typedef __int8 int8_t;
+typedef unsigned __int8 u_int8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 u_int16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 u_int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 u_int64_t;
 #endif
 
-
-/************************************/
-/************************************/
-/************************************/
-struct adb2c_attr_format
-{
-    const char* name;
-    const char* val;
-};
-
-struct adb2c_enum_format
-{
-	int				val;
-    const char*     name;
-};
-
-struct adb2c_field_format
-{
-    const char*             full_name;
-    const char*             desc;
-    int                     offs;
-    int                     size;
-    int                     enums_len;
-    struct adb2c_enum_format*     enums;
-    int                     attrs_len;
-    struct adb2c_attr_format*     attrs;
-};
-
-struct adb2c_node_format
-{
-    const char*          name;
-    const char*          desc;
-    int                  size;
-    int                  is_union;
-    int                  attrs_len;
-    struct adb2c_attr_format*  attrs;
-    int                  fields_len;
-    struct adb2c_field_format* fields;
-};
-
-struct adb2c_node_db
-{
-    int                 nodes_len;
-    struct adb2c_node_format* nodes;
-};
-
-/************************************/
-/************************************/
-/************************************/
-u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset, u_int32_t arr_elemnt_size,
-                                   int arr_idx, u_int32_t parent_node_size,
-                                   int is_big_endian_arr);
-/* Big Endian Functions */
-void adb2c_push_integer_to_buff(u_int8_t *buff, u_int32_t bit_offset,  u_int32_t byte_size, u_int64_t field_value);                                
-void adb2c_push_bits_to_buff(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
-void adb2c_push_to_buf(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value);
-u_int64_t adb2c_pop_integer_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t byte_size);
-u_int32_t adb2c_pop_bits_from_buff(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size);
-u_int64_t adb2c_pop_from_buf(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size);
-
-/* Little Endian Functions */
-void adb2c_push_integer_to_buff_le(u_int8_t *buff, u_int32_t bit_offset,  u_int32_t byte_size, u_int64_t field_value);
-void adb2c_push_bits_to_buff_le(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
-void adb2c_push_to_buf_le(u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value);
-u_int64_t adb2c_pop_integer_from_buff_le(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t byte_size);
-u_int32_t adb2c_pop_bits_from_buff_le(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size);
-u_int64_t adb2c_pop_from_buf_le(const u_int8_t *buff, u_int32_t bit_offset, u_int32_t field_size);
-
-
-void adb2c_add_indentation(FILE* file, int indent_level);
-
-void adb2c_print_raw(FILE* file, void* buff, int buff_len);
-const char* adb2c_db_get_field_enum_name(struct adb2c_field_format* field, int val);
-int adb2c_db_get_field_enum_val(struct adb2c_field_format* field, const char* name);
-const char* adb2c_db_get_field_attr(struct adb2c_field_format* field, const char* attr_name);
-const char* adb2c_db_get_node_attr(struct adb2c_node_format* node, const char* attr_name);
-struct adb2c_node_format* adb2c_db_find_node(struct adb2c_node_db* db, const char* node_name);
-struct adb2c_field_format* adb2c_db_find_field(struct adb2c_node_format*, const char* field_name);
+    /************************************/
+    /************************************/
+    /************************************/
+    struct adb2c_attr_format
+    {
+        const char* name;
+        const char* val;
+    };
+
+    struct adb2c_enum_format
+    {
+        int val;
+        const char* name;
+    };
+
+    struct adb2c_field_format
+    {
+        const char* full_name;
+        const char* desc;
+        int offs;
+        int size;
+        int enums_len;
+        struct adb2c_enum_format* enums;
+        int attrs_len;
+        struct adb2c_attr_format* attrs;
+    };
+
+    struct adb2c_node_format
+    {
+        const char* name;
+        const char* desc;
+        int size;
+        int is_union;
+        int attrs_len;
+        struct adb2c_attr_format* attrs;
+        int fields_len;
+        struct adb2c_field_format* fields;
+    };
+
+    struct adb2c_node_db
+    {
+        int nodes_len;
+        struct adb2c_node_format* nodes;
+    };
+
+    /************************************/
+    /************************************/
+    /************************************/
+    u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset,
+                                             u_int32_t arr_elemnt_size,
+                                             int arr_idx,
+                                             u_int32_t parent_node_size,
+                                             int is_big_endian_arr);
+    /* Big Endian Functions */
+    void adb2c_push_integer_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size, u_int64_t field_value);
+    void adb2c_push_bits_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
+    void adb2c_push_to_buf(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value);
+    u_int64_t adb2c_pop_integer_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size);
+    u_int32_t adb2c_pop_bits_from_buff(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size);
+    u_int64_t adb2c_pop_from_buf(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size);
+
+    /* Little Endian Functions */
+    void adb2c_push_integer_to_buff_le(u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size, u_int64_t field_value);
+    void adb2c_push_bits_to_buff_le(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
+    void adb2c_push_to_buf_le(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int64_t field_value);
+    u_int64_t adb2c_pop_integer_from_buff_le(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size);
+    u_int32_t adb2c_pop_bits_from_buff_le(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size);
+    u_int64_t adb2c_pop_from_buf_le(const u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size);
+
+    void adb2c_add_indentation(FILE* file, int indent_level);
+
+    void adb2c_print_raw(FILE* file, void* buff, int buff_len);
+    const char* adb2c_db_get_field_enum_name(struct adb2c_field_format* field, int val);
+    int adb2c_db_get_field_enum_val(struct adb2c_field_format* field, const char* name);
+    const char* adb2c_db_get_field_attr(struct adb2c_field_format* field, const char* attr_name);
+    const char* adb2c_db_get_node_attr(struct adb2c_node_format* node, const char* attr_name);
+    struct adb2c_node_format* adb2c_db_find_node(struct adb2c_node_db* db, const char* node_name);
+    struct adb2c_field_format* adb2c_db_find_field(struct adb2c_node_format*, const char* field_name);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/cibfw_layouts.c b/tools_layouts/cibfw_layouts.c
index d035d1cd..35e17938 100644
--- a/tools_layouts/cibfw_layouts.c
+++ b/tools_layouts/cibfw_layouts.c
@@ -30,1280 +30,1307 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2021-09-14 12:07:15"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cibfw/cibfw.adb --file-prefix cibfw --prefix cibfw_ --no-adb-utils
-         ***/
+ *** This file was generated at "2021-09-14 12:07:15"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cibfw/cibfw.adb --file-prefix
+ *cibfw --prefix cibfw_ --no-adb-utils
+ ***/
 #include "cibfw_layouts.h"
 
-void cibfw_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
 }
 
-void cibfw_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	*ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    *ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void cibfw_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level)
+void cibfw_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_uint64 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_uint64 ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t) *ptr_struct);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t)*ptr_struct);
 }
 
 unsigned int cibfw_uint64_size(void)
 {
-	return CIBFW_UINT64_SIZE;
+    return CIBFW_UINT64_SIZE;
 }
 
-void cibfw_uint64_dump(const u_int64_t *ptr_struct, FILE *fd)
+void cibfw_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
 {
-	cibfw_uint64_print(ptr_struct, fd, 0);
+    cibfw_uint64_print(ptr_struct, fd, 0);
 }
 
-void cibfw_reset_version_pack(const struct cibfw_reset_version *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_reset_version_pack(const struct cibfw_reset_version* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->major);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->major);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
 }
 
-void cibfw_reset_version_unpack(struct cibfw_reset_version *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_reset_version_unpack(struct cibfw_reset_version* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 56;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 56;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void cibfw_reset_version_print(const struct cibfw_reset_version *ptr_struct, FILE *fd, int indent_level)
+void cibfw_reset_version_print(const struct cibfw_reset_version* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_reset_version ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_reset_version ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " U32H_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " U32H_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
 }
 
 unsigned int cibfw_reset_version_size(void)
 {
-	return CIBFW_RESET_VERSION_SIZE;
+    return CIBFW_RESET_VERSION_SIZE;
 }
 
-void cibfw_reset_version_dump(const struct cibfw_reset_version *ptr_struct, FILE *fd)
+void cibfw_reset_version_dump(const struct cibfw_reset_version* ptr_struct, FILE* fd)
 {
-	cibfw_reset_version_print(ptr_struct, fd, 0);
+    cibfw_reset_version_print(ptr_struct, fd, 0);
 }
 
-void cibfw_uid_entry_pack(const struct cibfw_uid_entry *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_uid_entry_pack(const struct cibfw_uid_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_allocated);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->step);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->uid);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_allocated);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->step);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->uid);
 }
 
-void cibfw_uid_entry_unpack(struct cibfw_uid_entry *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_uid_entry_unpack(struct cibfw_uid_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->num_allocated = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->uid = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->num_allocated = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->uid = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void cibfw_uid_entry_print(const struct cibfw_uid_entry *ptr_struct, FILE *fd, int indent_level)
+void cibfw_uid_entry_print(const struct cibfw_uid_entry* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_uid_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_uid_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_allocated        : " UH_FMT "\n", ptr_struct->num_allocated);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "step                 : " UH_FMT "\n", ptr_struct->step);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uid                  : " U64H_FMT "\n", ptr_struct->uid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_allocated        : " UH_FMT "\n", ptr_struct->num_allocated);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "step                 : " UH_FMT "\n", ptr_struct->step);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uid                  : " U64H_FMT "\n", ptr_struct->uid);
 }
 
 unsigned int cibfw_uid_entry_size(void)
 {
-	return CIBFW_UID_ENTRY_SIZE;
-}
-
-void cibfw_uid_entry_dump(const struct cibfw_uid_entry *ptr_struct, FILE *fd)
-{
-	cibfw_uid_entry_print(ptr_struct, fd, 0);
-}
-
-void cibfw_FW_VERSION_pack(const struct cibfw_FW_VERSION *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Hour);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Minutes);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Seconds);
-	offset = 120;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Day);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Month);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
-}
-
-void cibfw_FW_VERSION_unpack(struct cibfw_FW_VERSION *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 48;
-	ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 80;
-	ptr_struct->Hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 72;
-	ptr_struct->Minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->Seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 120;
-	ptr_struct->Day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->Month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 96;
-	ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void cibfw_FW_VERSION_print(const struct cibfw_FW_VERSION *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_FW_VERSION ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Hour                 : " UH_FMT "\n", ptr_struct->Hour);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Minutes              : " UH_FMT "\n", ptr_struct->Minutes);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Seconds              : " UH_FMT "\n", ptr_struct->Seconds);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Day                  : " UH_FMT "\n", ptr_struct->Day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Month                : " UH_FMT "\n", ptr_struct->Month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Year                 : " UH_FMT "\n", ptr_struct->Year);
+    return CIBFW_UID_ENTRY_SIZE;
+}
+
+void cibfw_uid_entry_dump(const struct cibfw_uid_entry* ptr_struct, FILE* fd)
+{
+    cibfw_uid_entry_print(ptr_struct, fd, 0);
+}
+
+void cibfw_FW_VERSION_pack(const struct cibfw_FW_VERSION* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Hour);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Minutes);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Seconds);
+    offset = 120;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Day);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Month);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
+}
+
+void cibfw_FW_VERSION_unpack(struct cibfw_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 48;
+    ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 80;
+    ptr_struct->Hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 72;
+    ptr_struct->Minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->Seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 120;
+    ptr_struct->Day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->Month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 96;
+    ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void cibfw_FW_VERSION_print(const struct cibfw_FW_VERSION* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_FW_VERSION ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Hour                 : " UH_FMT "\n", ptr_struct->Hour);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Minutes              : " UH_FMT "\n", ptr_struct->Minutes);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Seconds              : " UH_FMT "\n", ptr_struct->Seconds);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Day                  : " UH_FMT "\n", ptr_struct->Day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Month                : " UH_FMT "\n", ptr_struct->Month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Year                 : " UH_FMT "\n", ptr_struct->Year);
 }
 
 unsigned int cibfw_FW_VERSION_size(void)
 {
-	return CIBFW_FW_VERSION_SIZE;
+    return CIBFW_FW_VERSION_SIZE;
 }
 
-void cibfw_FW_VERSION_dump(const struct cibfw_FW_VERSION *ptr_struct, FILE *fd)
+void cibfw_FW_VERSION_dump(const struct cibfw_FW_VERSION* ptr_struct, FILE* fd)
 {
-	cibfw_FW_VERSION_print(ptr_struct, fd, 0);
+    cibfw_FW_VERSION_print(ptr_struct, fd, 0);
 }
 
-void cibfw_TRIPPLE_VERSION_pack(const struct cibfw_TRIPPLE_VERSION *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_TRIPPLE_VERSION_pack(const struct cibfw_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
 }
 
-void cibfw_TRIPPLE_VERSION_unpack(struct cibfw_TRIPPLE_VERSION *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_TRIPPLE_VERSION_unpack(struct cibfw_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 48;
-	ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 48;
+    ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void cibfw_TRIPPLE_VERSION_print(const struct cibfw_TRIPPLE_VERSION *ptr_struct, FILE *fd, int indent_level)
+void cibfw_TRIPPLE_VERSION_print(const struct cibfw_TRIPPLE_VERSION* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_TRIPPLE_VERSION ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_TRIPPLE_VERSION ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
 }
 
 unsigned int cibfw_TRIPPLE_VERSION_size(void)
 {
-	return CIBFW_TRIPPLE_VERSION_SIZE;
+    return CIBFW_TRIPPLE_VERSION_SIZE;
 }
 
-void cibfw_TRIPPLE_VERSION_dump(const struct cibfw_TRIPPLE_VERSION *ptr_struct, FILE *fd)
+void cibfw_TRIPPLE_VERSION_dump(const struct cibfw_TRIPPLE_VERSION* ptr_struct, FILE* fd)
 {
-	cibfw_TRIPPLE_VERSION_print(ptr_struct, fd, 0);
+    cibfw_TRIPPLE_VERSION_print(ptr_struct, fd, 0);
 }
 
-void cibfw_guids_pack(const struct cibfw_guids *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_guids_pack(const struct cibfw_guids* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(0, 128, i, 512, 1);
-		cibfw_uid_entry_pack(&(ptr_struct->guids[i]), ptr_buff + offset / 8);
-	}
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(256, 128, i, 512, 1);
-		cibfw_uid_entry_pack(&(ptr_struct->macs[i]), ptr_buff + offset / 8);
-	}
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 128, i, 512, 1);
+        cibfw_uid_entry_pack(&(ptr_struct->guids[i]), ptr_buff + offset / 8);
+    }
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(256, 128, i, 512, 1);
+        cibfw_uid_entry_pack(&(ptr_struct->macs[i]), ptr_buff + offset / 8);
+    }
 }
 
-void cibfw_guids_unpack(struct cibfw_guids *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_guids_unpack(struct cibfw_guids* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(0, 128, i, 512, 1);
-		cibfw_uid_entry_unpack(&(ptr_struct->guids[i]), ptr_buff + offset / 8);
-	}
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(256, 128, i, 512, 1);
-		cibfw_uid_entry_unpack(&(ptr_struct->macs[i]), ptr_buff + offset / 8);
-	}
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 128, i, 512, 1);
+        cibfw_uid_entry_unpack(&(ptr_struct->guids[i]), ptr_buff + offset / 8);
+    }
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(256, 128, i, 512, 1);
+        cibfw_uid_entry_unpack(&(ptr_struct->macs[i]), ptr_buff + offset / 8);
+    }
 }
 
-void cibfw_guids_print(const struct cibfw_guids *ptr_struct, FILE *fd, int indent_level)
+void cibfw_guids_print(const struct cibfw_guids* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_guids ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_guids ========\n");
 
-	for (i = 0; i < 2; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "guids_%03d:\n", i);
-		cibfw_uid_entry_print(&(ptr_struct->guids[i]), fd, indent_level + 1);
-	}
-	for (i = 0; i < 2; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "macs_%03d:\n", i);
-		cibfw_uid_entry_print(&(ptr_struct->macs[i]), fd, indent_level + 1);
-	}
+    for (i = 0; i < 2; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "guids_%03d:\n", i);
+        cibfw_uid_entry_print(&(ptr_struct->guids[i]), fd, indent_level + 1);
+    }
+    for (i = 0; i < 2; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "macs_%03d:\n", i);
+        cibfw_uid_entry_print(&(ptr_struct->macs[i]), fd, indent_level + 1);
+    }
 }
 
 unsigned int cibfw_guids_size(void)
 {
-	return CIBFW_GUIDS_SIZE;
+    return CIBFW_GUIDS_SIZE;
 }
 
-void cibfw_guids_dump(const struct cibfw_guids *ptr_struct, FILE *fd)
+void cibfw_guids_dump(const struct cibfw_guids* ptr_struct, FILE* fd)
 {
-	cibfw_guids_print(ptr_struct, fd, 0);
+    cibfw_guids_print(ptr_struct, fd, 0);
 }
 
-void cibfw_image_size_pack(const struct cibfw_image_size *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_image_size_pack(const struct cibfw_image_size* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_step);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->run_from_any);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_size);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_step);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->run_from_any);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_size);
 }
 
-void cibfw_image_size_unpack(struct cibfw_image_size *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_image_size_unpack(struct cibfw_image_size* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->log_step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->run_from_any = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->max_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 24;
+    ptr_struct->log_step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->run_from_any = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->max_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void cibfw_image_size_print(const struct cibfw_image_size *ptr_struct, FILE *fd, int indent_level)
+void cibfw_image_size_print(const struct cibfw_image_size* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_image_size ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_image_size ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_step             : " UH_FMT "\n", ptr_struct->log_step);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "run_from_any         : " UH_FMT "\n", ptr_struct->run_from_any);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_size             : " U32H_FMT "\n", ptr_struct->max_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_step             : " UH_FMT "\n", ptr_struct->log_step);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "run_from_any         : " UH_FMT "\n", ptr_struct->run_from_any);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_size             : " U32H_FMT "\n", ptr_struct->max_size);
 }
 
 unsigned int cibfw_image_size_size(void)
 {
-	return CIBFW_IMAGE_SIZE_SIZE;
-}
-
-void cibfw_image_size_dump(const struct cibfw_image_size *ptr_struct, FILE *fd)
-{
-	cibfw_image_size_print(ptr_struct, fd, 0);
-}
-
-void cibfw_lfwp_version_vector_pack(const struct cibfw_lfwp_version_vector *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	cibfw_reset_version_pack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
-	offset = 64;
-	cibfw_reset_version_pack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
-	offset = 128;
-	cibfw_reset_version_pack(&(ptr_struct->pci_code), ptr_buff + offset / 8);
-	offset = 192;
-	cibfw_reset_version_pack(&(ptr_struct->phy_code), ptr_buff + offset / 8);
-	offset = 256;
-	cibfw_reset_version_pack(&(ptr_struct->ini), ptr_buff + offset / 8);
-	offset = 320;
-	cibfw_reset_version_pack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
-	offset = 384;
-	cibfw_reset_version_pack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
-	offset = 448;
-	cibfw_reset_version_pack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
-}
-
-void cibfw_lfwp_version_vector_unpack(struct cibfw_lfwp_version_vector *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	cibfw_reset_version_unpack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
-	offset = 64;
-	cibfw_reset_version_unpack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
-	offset = 128;
-	cibfw_reset_version_unpack(&(ptr_struct->pci_code), ptr_buff + offset / 8);
-	offset = 192;
-	cibfw_reset_version_unpack(&(ptr_struct->phy_code), ptr_buff + offset / 8);
-	offset = 256;
-	cibfw_reset_version_unpack(&(ptr_struct->ini), ptr_buff + offset / 8);
-	offset = 320;
-	cibfw_reset_version_unpack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
-	offset = 384;
-	cibfw_reset_version_unpack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
-	offset = 448;
-	cibfw_reset_version_unpack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
-}
-
-void cibfw_lfwp_version_vector_print(const struct cibfw_lfwp_version_vector *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_lfwp_version_vector ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "scratchpad:\n");
-	cibfw_reset_version_print(&(ptr_struct->scratchpad), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "icm_context:\n");
-	cibfw_reset_version_print(&(ptr_struct->icm_context), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_code:\n");
-	cibfw_reset_version_print(&(ptr_struct->pci_code), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy_code:\n");
-	cibfw_reset_version_print(&(ptr_struct->phy_code), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini:\n");
-	cibfw_reset_version_print(&(ptr_struct->ini), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved1:\n");
-	cibfw_reset_version_print(&(ptr_struct->reserved1), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved2:\n");
-	cibfw_reset_version_print(&(ptr_struct->reserved2), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved3:\n");
-	cibfw_reset_version_print(&(ptr_struct->reserved3), fd, indent_level + 1);
+    return CIBFW_IMAGE_SIZE_SIZE;
+}
+
+void cibfw_image_size_dump(const struct cibfw_image_size* ptr_struct, FILE* fd)
+{
+    cibfw_image_size_print(ptr_struct, fd, 0);
+}
+
+void cibfw_lfwp_version_vector_pack(const struct cibfw_lfwp_version_vector* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    cibfw_reset_version_pack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
+    offset = 64;
+    cibfw_reset_version_pack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
+    offset = 128;
+    cibfw_reset_version_pack(&(ptr_struct->pci_code), ptr_buff + offset / 8);
+    offset = 192;
+    cibfw_reset_version_pack(&(ptr_struct->phy_code), ptr_buff + offset / 8);
+    offset = 256;
+    cibfw_reset_version_pack(&(ptr_struct->ini), ptr_buff + offset / 8);
+    offset = 320;
+    cibfw_reset_version_pack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
+    offset = 384;
+    cibfw_reset_version_pack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
+    offset = 448;
+    cibfw_reset_version_pack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
+}
+
+void cibfw_lfwp_version_vector_unpack(struct cibfw_lfwp_version_vector* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    cibfw_reset_version_unpack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
+    offset = 64;
+    cibfw_reset_version_unpack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
+    offset = 128;
+    cibfw_reset_version_unpack(&(ptr_struct->pci_code), ptr_buff + offset / 8);
+    offset = 192;
+    cibfw_reset_version_unpack(&(ptr_struct->phy_code), ptr_buff + offset / 8);
+    offset = 256;
+    cibfw_reset_version_unpack(&(ptr_struct->ini), ptr_buff + offset / 8);
+    offset = 320;
+    cibfw_reset_version_unpack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
+    offset = 384;
+    cibfw_reset_version_unpack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
+    offset = 448;
+    cibfw_reset_version_unpack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
+}
+
+void cibfw_lfwp_version_vector_print(const struct cibfw_lfwp_version_vector* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_lfwp_version_vector ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "scratchpad:\n");
+    cibfw_reset_version_print(&(ptr_struct->scratchpad), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "icm_context:\n");
+    cibfw_reset_version_print(&(ptr_struct->icm_context), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_code:\n");
+    cibfw_reset_version_print(&(ptr_struct->pci_code), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy_code:\n");
+    cibfw_reset_version_print(&(ptr_struct->phy_code), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini:\n");
+    cibfw_reset_version_print(&(ptr_struct->ini), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved1:\n");
+    cibfw_reset_version_print(&(ptr_struct->reserved1), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved2:\n");
+    cibfw_reset_version_print(&(ptr_struct->reserved2), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved3:\n");
+    cibfw_reset_version_print(&(ptr_struct->reserved3), fd, indent_level + 1);
 }
 
 unsigned int cibfw_lfwp_version_vector_size(void)
 {
-	return CIBFW_LFWP_VERSION_VECTOR_SIZE;
+    return CIBFW_LFWP_VERSION_VECTOR_SIZE;
 }
 
-void cibfw_lfwp_version_vector_dump(const struct cibfw_lfwp_version_vector *ptr_struct, FILE *fd)
+void cibfw_lfwp_version_vector_dump(const struct cibfw_lfwp_version_vector* ptr_struct, FILE* fd)
 {
-	cibfw_lfwp_version_vector_print(ptr_struct, fd, 0);
+    cibfw_lfwp_version_vector_print(ptr_struct, fd, 0);
 }
 
-void cibfw_module_version_pack(const struct cibfw_module_version *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_module_version_pack(const struct cibfw_module_version* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->branch);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->minor);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->major);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->branch);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->minor);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->major);
 }
 
-void cibfw_module_version_unpack(struct cibfw_module_version *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_module_version_unpack(struct cibfw_module_version* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->branch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 12;
-	ptr_struct->minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 0;
-	ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 24;
+    ptr_struct->branch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 12;
+    ptr_struct->minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 0;
+    ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
 }
 
-void cibfw_module_version_print(const struct cibfw_module_version *ptr_struct, FILE *fd, int indent_level)
+void cibfw_module_version_print(const struct cibfw_module_version* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_module_version ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_module_version ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "branch               : " UH_FMT "\n", ptr_struct->branch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "branch               : " UH_FMT "\n", ptr_struct->branch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
 }
 
 unsigned int cibfw_module_version_size(void)
 {
-	return CIBFW_MODULE_VERSION_SIZE;
+    return CIBFW_MODULE_VERSION_SIZE;
 }
 
-void cibfw_module_version_dump(const struct cibfw_module_version *ptr_struct, FILE *fd)
+void cibfw_module_version_dump(const struct cibfw_module_version* ptr_struct, FILE* fd)
 {
-	cibfw_module_version_print(ptr_struct, fd, 0);
+    cibfw_module_version_print(ptr_struct, fd, 0);
 }
 
-void cibfw_operation_key_pack(const struct cibfw_operation_key *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_operation_key_pack(const struct cibfw_operation_key* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key_modifier);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key_modifier);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
 }
 
-void cibfw_operation_key_unpack(struct cibfw_operation_key *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_operation_key_unpack(struct cibfw_operation_key* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->key_modifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->key_modifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void cibfw_operation_key_print(const struct cibfw_operation_key *ptr_struct, FILE *fd, int indent_level)
+void cibfw_operation_key_print(const struct cibfw_operation_key* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_operation_key ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_operation_key ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key_modifier         : " UH_FMT "\n", ptr_struct->key_modifier);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key_modifier         : " UH_FMT "\n", ptr_struct->key_modifier);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
 }
 
 unsigned int cibfw_operation_key_size(void)
 {
-	return CIBFW_OPERATION_KEY_SIZE;
-}
-
-void cibfw_operation_key_dump(const struct cibfw_operation_key *ptr_struct, FILE *fd)
-{
-	cibfw_operation_key_print(ptr_struct, fd, 0);
-}
-
-void cibfw_device_info_pack(const struct cibfw_device_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
-	offset = 152;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 143;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->major_version);
-	offset = 256;
-	cibfw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 880;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
-		cibfw_operation_key_pack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
-	}
-}
-
-void cibfw_device_info_unpack(struct cibfw_device_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 152;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 143;
-	ptr_struct->major_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
-	offset = 256;
-	cibfw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 880;
-	ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
-		ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->vsd[208] = '\0';
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
-		cibfw_operation_key_unpack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
-	}
-}
-
-void cibfw_device_info_print(const struct cibfw_device_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_device_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cibfw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
-		fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keys_%03d:\n", i);
-		cibfw_operation_key_print(&(ptr_struct->keys[i]), fd, indent_level + 1);
-	}
+    return CIBFW_OPERATION_KEY_SIZE;
+}
+
+void cibfw_operation_key_dump(const struct cibfw_operation_key* ptr_struct, FILE* fd)
+{
+    cibfw_operation_key_print(ptr_struct, fd, 0);
+}
+
+void cibfw_device_info_pack(const struct cibfw_device_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
+    offset = 152;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 143;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->major_version);
+    offset = 256;
+    cibfw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 880;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
+        cibfw_operation_key_pack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
+    }
+}
+
+void cibfw_device_info_unpack(struct cibfw_device_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 152;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 143;
+    ptr_struct->major_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
+    offset = 256;
+    cibfw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 880;
+    ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
+        ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->vsd[208] = '\0';
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
+        cibfw_operation_key_unpack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
+    }
+}
+
+void cibfw_device_info_print(const struct cibfw_device_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_device_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cibfw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
+    fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keys_%03d:\n", i);
+        cibfw_operation_key_print(&(ptr_struct->keys[i]), fd, indent_level + 1);
+    }
 }
 
 unsigned int cibfw_device_info_size(void)
 {
-	return CIBFW_DEVICE_INFO_SIZE;
-}
-
-void cibfw_device_info_dump(const struct cibfw_device_info *ptr_struct, FILE *fd)
-{
-	cibfw_device_info_print(ptr_struct, fd, 0);
-}
-
-void cibfw_image_info_pack(const struct cibfw_image_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 27;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->encrypted_fw);
-	offset = 25;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->long_keys);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw_tokens_supported);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mcc_en);
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_vendor_nvconfig_files);
-	offset = 21;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_mlnx_nvconfig_files);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_supported);
-	offset = 19;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_tokens_supported);
-	offset = 18;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw);
-	offset = 17;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_fw);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	offset = 32;
-	cibfw_FW_VERSION_pack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
-	offset = 160;
-	cibfw_TRIPPLE_VERSION_pack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_vendor_id);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_device_id);
-	offset = 272;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_sub_vendor_id);
-	offset = 256;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_subsystem_id);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 432;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
-	}
-	offset = 2112;
-	cibfw_image_size_pack(&(ptr_struct->image_size), ptr_buff + offset / 8);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_hw_id[i]);
-	}
-	offset = 2368;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_num);
-	offset = 2432;
-	cibfw_lfwp_version_vector_pack(&(ptr_struct->lfwp_version_vector), ptr_buff + offset / 8);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prod_ver[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
-	}
-	offset = 6304;
-	cibfw_module_version_pack(&(ptr_struct->isfu), ptr_buff + offset / 8);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
-	}
-}
-
-void cibfw_image_info_unpack(struct cibfw_image_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 27;
-	ptr_struct->encrypted_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 25;
-	ptr_struct->long_keys = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 24;
-	ptr_struct->debug_fw_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 23;
-	ptr_struct->mcc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 22;
-	ptr_struct->signed_vendor_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 21;
-	ptr_struct->signed_mlnx_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 20;
-	ptr_struct->frc_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 19;
-	ptr_struct->cs_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 18;
-	ptr_struct->debug_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 17;
-	ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 16;
-	ptr_struct->secure_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 8;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	cibfw_FW_VERSION_unpack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
-	offset = 160;
-	cibfw_TRIPPLE_VERSION_unpack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
-	offset = 240;
-	ptr_struct->pci_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 224;
-	ptr_struct->pci_device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 272;
-	ptr_struct->pci_sub_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 256;
-	ptr_struct->pci_subsystem_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
-		ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->psid[16] = '\0';
-	offset = 432;
-	ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
-		ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->vsd[208] = '\0';
-	offset = 2112;
-	cibfw_image_size_unpack(&(ptr_struct->image_size), ptr_buff + offset / 8);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
-		ptr_struct->supported_hw_id[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	offset = 2368;
-	ptr_struct->ini_file_num = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 2432;
-	cibfw_lfwp_version_vector_unpack(&(ptr_struct->lfwp_version_vector), ptr_buff + offset / 8);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
-		ptr_struct->prod_ver[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->prod_ver[16] = '\0';
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
-		ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->description[256] = '\0';
-	offset = 6304;
-	cibfw_module_version_unpack(&(ptr_struct->isfu), ptr_buff + offset / 8);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
-		ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->name[64] = '\0';
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
-		ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->prs_name[128] = '\0';
-}
-
-void cibfw_image_info_print(const struct cibfw_image_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_image_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "encrypted_fw         : " UH_FMT "\n", ptr_struct->encrypted_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "long_keys            : " UH_FMT "\n", ptr_struct->long_keys);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug_fw_tokens_supported : " UH_FMT "\n", ptr_struct->debug_fw_tokens_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcc_en               : " UH_FMT "\n", ptr_struct->mcc_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_vendor_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_vendor_nvconfig_files);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_mlnx_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_mlnx_nvconfig_files);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "frc_supported        : " UH_FMT "\n", ptr_struct->frc_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cs_tokens_supported  : " UH_FMT "\n", ptr_struct->cs_tokens_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug_fw             : " UH_FMT "\n", ptr_struct->debug_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "secure_fw            : " UH_FMT "\n", ptr_struct->secure_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "FW_VERSION:\n");
-	cibfw_FW_VERSION_print(&(ptr_struct->FW_VERSION), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mic_version:\n");
-	cibfw_TRIPPLE_VERSION_print(&(ptr_struct->mic_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_vendor_id        : " UH_FMT "\n", ptr_struct->pci_vendor_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_device_id        : " UH_FMT "\n", ptr_struct->pci_device_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_sub_vendor_id    : " UH_FMT "\n", ptr_struct->pci_sub_vendor_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_subsystem_id     : " UH_FMT "\n", ptr_struct->pci_subsystem_id);
-		fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
-		fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_size:\n");
-	cibfw_image_size_print(&(ptr_struct->image_size), fd, indent_level + 1);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "supported_hw_id_%03d : " U32H_FMT "\n", i, ptr_struct->supported_hw_id[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini_file_num         : " U32H_FMT "\n", ptr_struct->ini_file_num);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lfwp_version_vector:\n");
-	cibfw_lfwp_version_vector_print(&(ptr_struct->lfwp_version_vector), fd, indent_level + 1);
-		fprintf(fd, "prod_ver             : \"%s\"\n", ptr_struct->prod_ver);
-		fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "isfu:\n");
-	cibfw_module_version_print(&(ptr_struct->isfu), fd, indent_level + 1);
-		fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
-		fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
+    return CIBFW_DEVICE_INFO_SIZE;
+}
+
+void cibfw_device_info_dump(const struct cibfw_device_info* ptr_struct, FILE* fd)
+{
+    cibfw_device_info_print(ptr_struct, fd, 0);
+}
+
+void cibfw_image_info_pack(const struct cibfw_image_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 27;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->encrypted_fw);
+    offset = 25;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->long_keys);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw_tokens_supported);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mcc_en);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_vendor_nvconfig_files);
+    offset = 21;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_mlnx_nvconfig_files);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_supported);
+    offset = 19;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_tokens_supported);
+    offset = 18;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw);
+    offset = 17;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_fw);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    offset = 32;
+    cibfw_FW_VERSION_pack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
+    offset = 160;
+    cibfw_TRIPPLE_VERSION_pack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_vendor_id);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_device_id);
+    offset = 272;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_sub_vendor_id);
+    offset = 256;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_subsystem_id);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 432;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
+    }
+    offset = 2112;
+    cibfw_image_size_pack(&(ptr_struct->image_size), ptr_buff + offset / 8);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_hw_id[i]);
+    }
+    offset = 2368;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_num);
+    offset = 2432;
+    cibfw_lfwp_version_vector_pack(&(ptr_struct->lfwp_version_vector), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prod_ver[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
+    }
+    offset = 6304;
+    cibfw_module_version_pack(&(ptr_struct->isfu), ptr_buff + offset / 8);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
+    }
+}
+
+void cibfw_image_info_unpack(struct cibfw_image_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 27;
+    ptr_struct->encrypted_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 25;
+    ptr_struct->long_keys = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 24;
+    ptr_struct->debug_fw_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 23;
+    ptr_struct->mcc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 22;
+    ptr_struct->signed_vendor_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 21;
+    ptr_struct->signed_mlnx_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 20;
+    ptr_struct->frc_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 19;
+    ptr_struct->cs_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 18;
+    ptr_struct->debug_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 17;
+    ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->secure_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 8;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    cibfw_FW_VERSION_unpack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
+    offset = 160;
+    cibfw_TRIPPLE_VERSION_unpack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
+    offset = 240;
+    ptr_struct->pci_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 224;
+    ptr_struct->pci_device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 272;
+    ptr_struct->pci_sub_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 256;
+    ptr_struct->pci_subsystem_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->psid[16] = '\0';
+    offset = 432;
+    ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
+        ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->vsd[208] = '\0';
+    offset = 2112;
+    cibfw_image_size_unpack(&(ptr_struct->image_size), ptr_buff + offset / 8);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
+        ptr_struct->supported_hw_id[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    offset = 2368;
+    ptr_struct->ini_file_num = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 2432;
+    cibfw_lfwp_version_vector_unpack(&(ptr_struct->lfwp_version_vector), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
+        ptr_struct->prod_ver[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->prod_ver[16] = '\0';
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
+        ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->description[256] = '\0';
+    offset = 6304;
+    cibfw_module_version_unpack(&(ptr_struct->isfu), ptr_buff + offset / 8);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
+        ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->name[64] = '\0';
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
+        ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->prs_name[128] = '\0';
+}
+
+void cibfw_image_info_print(const struct cibfw_image_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_image_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "encrypted_fw         : " UH_FMT "\n", ptr_struct->encrypted_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "long_keys            : " UH_FMT "\n", ptr_struct->long_keys);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug_fw_tokens_supported : " UH_FMT "\n", ptr_struct->debug_fw_tokens_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcc_en               : " UH_FMT "\n", ptr_struct->mcc_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_vendor_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_vendor_nvconfig_files);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_mlnx_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_mlnx_nvconfig_files);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "frc_supported        : " UH_FMT "\n", ptr_struct->frc_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cs_tokens_supported  : " UH_FMT "\n", ptr_struct->cs_tokens_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug_fw             : " UH_FMT "\n", ptr_struct->debug_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "secure_fw            : " UH_FMT "\n", ptr_struct->secure_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "FW_VERSION:\n");
+    cibfw_FW_VERSION_print(&(ptr_struct->FW_VERSION), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mic_version:\n");
+    cibfw_TRIPPLE_VERSION_print(&(ptr_struct->mic_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_vendor_id        : " UH_FMT "\n", ptr_struct->pci_vendor_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_device_id        : " UH_FMT "\n", ptr_struct->pci_device_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_sub_vendor_id    : " UH_FMT "\n", ptr_struct->pci_sub_vendor_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_subsystem_id     : " UH_FMT "\n", ptr_struct->pci_subsystem_id);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
+    fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_size:\n");
+    cibfw_image_size_print(&(ptr_struct->image_size), fd, indent_level + 1);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "supported_hw_id_%03d : " U32H_FMT "\n", i, ptr_struct->supported_hw_id[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini_file_num         : " U32H_FMT "\n", ptr_struct->ini_file_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lfwp_version_vector:\n");
+    cibfw_lfwp_version_vector_print(&(ptr_struct->lfwp_version_vector), fd, indent_level + 1);
+    fprintf(fd, "prod_ver             : \"%s\"\n", ptr_struct->prod_ver);
+    fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "isfu:\n");
+    cibfw_module_version_print(&(ptr_struct->isfu), fd, indent_level + 1);
+    fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
+    fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
 }
 
 unsigned int cibfw_image_info_size(void)
 {
-	return CIBFW_IMAGE_INFO_SIZE;
-}
-
-void cibfw_image_info_dump(const struct cibfw_image_info *ptr_struct, FILE *fd)
-{
-	cibfw_image_info_print(ptr_struct, fd, 0);
-}
-
-void cibfw_itoc_entry_pack(const struct cibfw_itoc_entry *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 22, (u_int32_t)ptr_struct->size);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 30, (u_int32_t)ptr_struct->param0);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cache_line_crc);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->zipped_image);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->param1);
-	offset = 161;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 29, (u_int32_t)ptr_struct->flash_addr);
-	offset = 160;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->relative_addr);
-	offset = 208;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->section_crc);
-	offset = 207;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->no_crc);
-	offset = 206;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->device_data);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
-}
-
-void cibfw_itoc_entry_unpack(struct cibfw_itoc_entry *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	ptr_struct->size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 22);
-	offset = 0;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 34;
-	ptr_struct->param0 = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 30);
-	offset = 33;
-	ptr_struct->cache_line_crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->zipped_image = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->param1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 161;
-	ptr_struct->flash_addr = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 29);
-	offset = 160;
-	ptr_struct->relative_addr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 208;
-	ptr_struct->section_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 207;
-	ptr_struct->no_crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 206;
-	ptr_struct->device_data = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 240;
-	ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void cibfw_itoc_entry_print(const struct cibfw_itoc_entry *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_itoc_entry ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param0               : " UH_FMT "\n", ptr_struct->param0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cache_line_crc       : " UH_FMT "\n", ptr_struct->cache_line_crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "zipped_image         : " UH_FMT "\n", ptr_struct->zipped_image);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param1               : " U32H_FMT "\n", ptr_struct->param1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_addr           : " UH_FMT "\n", ptr_struct->flash_addr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "relative_addr        : " UH_FMT "\n", ptr_struct->relative_addr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "section_crc          : " UH_FMT "\n", ptr_struct->section_crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "no_crc               : " UH_FMT "\n", ptr_struct->no_crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_data          : " UH_FMT "\n", ptr_struct->device_data);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
+    return CIBFW_IMAGE_INFO_SIZE;
+}
+
+void cibfw_image_info_dump(const struct cibfw_image_info* ptr_struct, FILE* fd)
+{
+    cibfw_image_info_print(ptr_struct, fd, 0);
+}
+
+void cibfw_itoc_entry_pack(const struct cibfw_itoc_entry* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 22, (u_int32_t)ptr_struct->size);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 30, (u_int32_t)ptr_struct->param0);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cache_line_crc);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->zipped_image);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->param1);
+    offset = 161;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 29, (u_int32_t)ptr_struct->flash_addr);
+    offset = 160;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->relative_addr);
+    offset = 208;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->section_crc);
+    offset = 207;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->no_crc);
+    offset = 206;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->device_data);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
+}
+
+void cibfw_itoc_entry_unpack(struct cibfw_itoc_entry* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    ptr_struct->size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 22);
+    offset = 0;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 34;
+    ptr_struct->param0 = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 30);
+    offset = 33;
+    ptr_struct->cache_line_crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->zipped_image = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->param1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 161;
+    ptr_struct->flash_addr = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 29);
+    offset = 160;
+    ptr_struct->relative_addr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 208;
+    ptr_struct->section_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 207;
+    ptr_struct->no_crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 206;
+    ptr_struct->device_data = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 240;
+    ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void cibfw_itoc_entry_print(const struct cibfw_itoc_entry* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_itoc_entry ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param0               : " UH_FMT "\n", ptr_struct->param0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cache_line_crc       : " UH_FMT "\n", ptr_struct->cache_line_crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "zipped_image         : " UH_FMT "\n", ptr_struct->zipped_image);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param1               : " U32H_FMT "\n", ptr_struct->param1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_addr           : " UH_FMT "\n", ptr_struct->flash_addr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "relative_addr        : " UH_FMT "\n", ptr_struct->relative_addr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "section_crc          : " UH_FMT "\n", ptr_struct->section_crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "no_crc               : " UH_FMT "\n", ptr_struct->no_crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_data          : " UH_FMT "\n", ptr_struct->device_data);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
 }
 
 unsigned int cibfw_itoc_entry_size(void)
 {
-	return CIBFW_ITOC_ENTRY_SIZE;
+    return CIBFW_ITOC_ENTRY_SIZE;
 }
 
-void cibfw_itoc_entry_dump(const struct cibfw_itoc_entry *ptr_struct, FILE *fd)
+void cibfw_itoc_entry_dump(const struct cibfw_itoc_entry* ptr_struct, FILE* fd)
 {
-	cibfw_itoc_entry_print(ptr_struct, fd, 0);
+    cibfw_itoc_entry_print(ptr_struct, fd, 0);
 }
 
-void cibfw_itoc_header_pack(const struct cibfw_itoc_header *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_itoc_header_pack(const struct cibfw_itoc_header* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
-	offset = 152;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
+    offset = 152;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
 }
 
-void cibfw_itoc_header_unpack(struct cibfw_itoc_header *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_itoc_header_unpack(struct cibfw_itoc_header* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 152;
-	ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 240;
-	ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 152;
+    ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 240;
+    ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void cibfw_itoc_header_print(const struct cibfw_itoc_header *ptr_struct, FILE *fd, int indent_level)
+void cibfw_itoc_header_print(const struct cibfw_itoc_header* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_itoc_header ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_itoc_header ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
 }
 
 unsigned int cibfw_itoc_header_size(void)
 {
-	return CIBFW_ITOC_HEADER_SIZE;
+    return CIBFW_ITOC_HEADER_SIZE;
 }
 
-void cibfw_itoc_header_dump(const struct cibfw_itoc_header *ptr_struct, FILE *fd)
+void cibfw_itoc_header_dump(const struct cibfw_itoc_header* ptr_struct, FILE* fd)
 {
-	cibfw_itoc_header_print(ptr_struct, fd, 0);
+    cibfw_itoc_header_print(ptr_struct, fd, 0);
 }
 
-void cibfw_mfg_info_pack(const struct cibfw_mfg_info *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_mfg_info_pack(const struct cibfw_mfg_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 255;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->guids_override_en);
-	offset = 232;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	offset = 256;
-	cibfw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 255;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->guids_override_en);
+    offset = 232;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    offset = 256;
+    cibfw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
 }
 
-void cibfw_mfg_info_unpack(struct cibfw_mfg_info *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_mfg_info_unpack(struct cibfw_mfg_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
-		ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->psid[16] = '\0';
-	offset = 255;
-	ptr_struct->guids_override_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 232;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 224;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 256;
-	cibfw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->psid[16] = '\0';
+    offset = 255;
+    ptr_struct->guids_override_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 232;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 224;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 256;
+    cibfw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
 }
 
-void cibfw_mfg_info_print(const struct cibfw_mfg_info *ptr_struct, FILE *fd, int indent_level)
+void cibfw_mfg_info_print(const struct cibfw_mfg_info* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_mfg_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_mfg_info ========\n");
 
-		fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids_override_en    : " UH_FMT "\n", ptr_struct->guids_override_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cibfw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids_override_en    : " UH_FMT "\n", ptr_struct->guids_override_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cibfw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
 }
 
 unsigned int cibfw_mfg_info_size(void)
 {
-	return CIBFW_MFG_INFO_SIZE;
+    return CIBFW_MFG_INFO_SIZE;
 }
 
-void cibfw_mfg_info_dump(const struct cibfw_mfg_info *ptr_struct, FILE *fd)
+void cibfw_mfg_info_dump(const struct cibfw_mfg_info* ptr_struct, FILE* fd)
 {
-	cibfw_mfg_info_print(ptr_struct, fd, 0);
+    cibfw_mfg_info_print(ptr_struct, fd, 0);
 }
 
-void cibfw_register_mfai_pack(const struct cibfw_register_mfai *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_register_mfai_pack(const struct cibfw_register_mfai* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->address);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->permanent);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->use_address);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->use_image_id);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_id);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->address);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->permanent);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->use_address);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->use_image_id);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_id);
 }
 
-void cibfw_register_mfai_unpack(struct cibfw_register_mfai *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_register_mfai_unpack(struct cibfw_register_mfai* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	ptr_struct->address = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 2;
-	ptr_struct->permanent = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->use_address = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->use_image_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->image_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->address = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 2;
+    ptr_struct->permanent = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->use_address = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->use_image_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->image_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void cibfw_register_mfai_print(const struct cibfw_register_mfai *ptr_struct, FILE *fd, int indent_level)
+void cibfw_register_mfai_print(const struct cibfw_register_mfai* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_register_mfai ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_register_mfai ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "address              : " UH_FMT "\n", ptr_struct->address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "permanent            : " UH_FMT "\n", ptr_struct->permanent);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "use_address          : " UH_FMT "\n", ptr_struct->use_address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "use_image_id         : " UH_FMT "\n", ptr_struct->use_image_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_id             : " UH_FMT "\n", ptr_struct->image_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "address              : " UH_FMT "\n", ptr_struct->address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "permanent            : " UH_FMT "\n", ptr_struct->permanent);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "use_address          : " UH_FMT "\n", ptr_struct->use_address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "use_image_id         : " UH_FMT "\n", ptr_struct->use_image_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_id             : " UH_FMT "\n", ptr_struct->image_id);
 }
 
 unsigned int cibfw_register_mfai_size(void)
 {
-	return CIBFW_REGISTER_MFAI_SIZE;
+    return CIBFW_REGISTER_MFAI_SIZE;
 }
 
-void cibfw_register_mfai_dump(const struct cibfw_register_mfai *ptr_struct, FILE *fd)
+void cibfw_register_mfai_dump(const struct cibfw_register_mfai* ptr_struct, FILE* fd)
 {
-	cibfw_register_mfai_print(ptr_struct, fd, 0);
+    cibfw_register_mfai_print(ptr_struct, fd, 0);
 }
 
-void cibfw_register_mfrl_pack(const struct cibfw_register_mfrl *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_register_mfrl_pack(const struct cibfw_register_mfrl* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->reset_level);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->reset_level);
 }
 
-void cibfw_register_mfrl_unpack(struct cibfw_register_mfrl *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_register_mfrl_unpack(struct cibfw_register_mfrl* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 56;
-	ptr_struct->reset_level = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->reset_level = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void cibfw_register_mfrl_print(const struct cibfw_register_mfrl *ptr_struct, FILE *fd, int indent_level)
+void cibfw_register_mfrl_print(const struct cibfw_register_mfrl* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_register_mfrl ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_register_mfrl ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reset_level          : " UH_FMT "\n", ptr_struct->reset_level);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reset_level          : " UH_FMT "\n", ptr_struct->reset_level);
 }
 
 unsigned int cibfw_register_mfrl_size(void)
 {
-	return CIBFW_REGISTER_MFRL_SIZE;
+    return CIBFW_REGISTER_MFRL_SIZE;
 }
 
-void cibfw_register_mfrl_dump(const struct cibfw_register_mfrl *ptr_struct, FILE *fd)
+void cibfw_register_mfrl_dump(const struct cibfw_register_mfrl* ptr_struct, FILE* fd)
 {
-	cibfw_register_mfrl_print(ptr_struct, fd, 0);
+    cibfw_register_mfrl_print(ptr_struct, fd, 0);
 }
 
-void cibfw_cibfw_Nodes_pack(const union cibfw_cibfw_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void cibfw_cibfw_Nodes_pack(const union cibfw_cibfw_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
-	cibfw_image_info_pack(&(ptr_struct->image_info), ptr_buff);
+    cibfw_image_info_pack(&(ptr_struct->image_info), ptr_buff);
 }
 
-void cibfw_cibfw_Nodes_unpack(union cibfw_cibfw_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void cibfw_cibfw_Nodes_unpack(union cibfw_cibfw_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
-	cibfw_image_info_unpack(&(ptr_struct->image_info), ptr_buff);
+    cibfw_image_info_unpack(&(ptr_struct->image_info), ptr_buff);
 }
 
-void cibfw_cibfw_Nodes_print(const union cibfw_cibfw_Nodes *ptr_struct, FILE *fd, int indent_level)
+void cibfw_cibfw_Nodes_print(const union cibfw_cibfw_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cibfw_cibfw_Nodes ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cibfw_cibfw_Nodes ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "register_mfai:\n");
-	cibfw_register_mfai_print(&(ptr_struct->register_mfai), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_entry:\n");
-	cibfw_itoc_entry_print(&(ptr_struct->itoc_entry), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cibfw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_header:\n");
-	cibfw_itoc_header_print(&(ptr_struct->itoc_header), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "register_mfrl:\n");
-	cibfw_register_mfrl_print(&(ptr_struct->register_mfrl), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_info:\n");
-	cibfw_device_info_print(&(ptr_struct->device_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfg_info:\n");
-	cibfw_mfg_info_print(&(ptr_struct->mfg_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_info:\n");
-	cibfw_image_info_print(&(ptr_struct->image_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "register_mfai:\n");
+    cibfw_register_mfai_print(&(ptr_struct->register_mfai), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_entry:\n");
+    cibfw_itoc_entry_print(&(ptr_struct->itoc_entry), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cibfw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_header:\n");
+    cibfw_itoc_header_print(&(ptr_struct->itoc_header), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "register_mfrl:\n");
+    cibfw_register_mfrl_print(&(ptr_struct->register_mfrl), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_info:\n");
+    cibfw_device_info_print(&(ptr_struct->device_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfg_info:\n");
+    cibfw_mfg_info_print(&(ptr_struct->mfg_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_info:\n");
+    cibfw_image_info_print(&(ptr_struct->image_info), fd, indent_level + 1);
 }
 
 unsigned int cibfw_cibfw_Nodes_size(void)
 {
-	return CIBFW_CIBFW_NODES_SIZE;
+    return CIBFW_CIBFW_NODES_SIZE;
 }
 
-void cibfw_cibfw_Nodes_dump(const union cibfw_cibfw_Nodes *ptr_struct, FILE *fd)
+void cibfw_cibfw_Nodes_dump(const union cibfw_cibfw_Nodes* ptr_struct, FILE* fd)
 {
-	cibfw_cibfw_Nodes_print(ptr_struct, fd, 0);
+    cibfw_cibfw_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/cibfw_layouts.h b/tools_layouts/cibfw_layouts.h
index 6aad7e8e..eaa3bf17 100644
--- a/tools_layouts/cibfw_layouts.h
+++ b/tools_layouts/cibfw_layouts.h
@@ -29,124 +29,133 @@
  * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
- */ 
+ */
 
 /***
-         *** This file was generated at "2019-08-11 16:47:37"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cibfw/cibfw.adb --file-prefix cibfw --prefix cibfw_
-         ***/
+ *** This file was generated at "2019-08-11 16:47:37"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cibfw/cibfw.adb --file-prefix
+ *cibfw --prefix cibfw_
+ ***/
 #ifndef CIBFW_LAYOUTS_H
 #define CIBFW_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 8 */
-struct cibfw_uint64 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int64_t uint64;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct cibfw_uint64
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int64_t uint64;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct cibfw_reset_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Match means upgrade supported, mismatch implies reset not supported */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - If Major matches. Match means seamless reset. Greater means reset supported. Less then upgrade not supported */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t minor;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct cibfw_reset_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Match means upgrade supported, mismatch implies reset not supported */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - If Major matches. Match means seamless reset. Greater means reset supported. Less then upgrade
+         * not supported */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t minor;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cibfw_uid_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Number of allocated UIDs in this entry */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t num_allocated;
-	/* Description - Step size by which to derive the UIDs for this entry
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cibfw_uid_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Number of allocated UIDs in this entry */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t num_allocated;
+        /* Description - Step size by which to derive the UIDs for this entry
 See struct description */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t step;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - For MACs, the upper 16 bits in the 'hi' dword are reserved */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t uid;
-};
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t step;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - For MACs, the upper 16 bits in the 'hi' dword are reserved */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t uid;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cibfw_FW_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t SUBMINOR;
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t MINOR;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.8 - 0x8.15 */
-	u_int8_t Hour;
-	/* Description -  */
-	/* 0x8.16 - 0x8.23 */
-	u_int8_t Minutes;
-	/* Description -  */
-	/* 0x8.24 - 0x8.31 */
-	u_int8_t Seconds;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.7 */
-	u_int8_t Day;
-	/* Description -  */
-	/* 0xc.8 - 0xc.15 */
-	u_int8_t Month;
-	/* Description -  */
-	/* 0xc.16 - 0xc.31 */
-	u_int16_t Year;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cibfw_FW_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.8 - 0x8.15 */
+        u_int8_t Hour;
+        /* Description -  */
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t Minutes;
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t Seconds;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t Day;
+        /* Description -  */
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t Month;
+        /* Description -  */
+        /* 0xc.16 - 0xc.31 */
+        u_int16_t Year;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct cibfw_TRIPPLE_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t SUBMINOR;
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t MINOR;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct cibfw_TRIPPLE_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct cibfw_guids {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - UIDs (MACs and GUIDs) Allocation Entry.
-guids[0], is used for system GUID, node GUID and port GUID of port 0. guids[1], is used for port GUID of port 1.;/Multiple UIDs can be assigned to a single port, to be used for multiple virtual guests.
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct cibfw_guids
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - UIDs (MACs and GUIDs) Allocation Entry.
+guids[0], is used for system GUID, node GUID and port GUID of port 0. guids[1], is used for port GUID of
+port 1.;/Multiple UIDs can be assigned to a single port, to be used for multiple virtual guests.
 
 Allocation Example:
 For a port GUID, if the
     UID = 0x2c9030001000
-    num_allocated  = 4, 
+    num_allocated  = 4,
     step = 8
 
 Then the GUIDs for this port would be:
@@ -154,579 +163,590 @@ Then the GUIDs for this port would be:
     0x2c9030001008
     0x2c9030001010
     0x2c9030001018 */
-	/* 0x0.0 - 0x1c.31 */
-	struct cibfw_uid_entry guids[2];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x3c.31 */
-	struct cibfw_uid_entry macs[2];
-};
+        /* 0x0.0 - 0x1c.31 */
+        struct cibfw_uid_entry guids[2];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x3c.31 */
+        struct cibfw_uid_entry macs[2];
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct cibfw_image_size {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - log of next address in bytes to search for an image. Address in bytes is 2^log_step */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t log_step;
-	/* Description - this image can run from any partition starting at address 0x0000000, 0x4000000, 0x800000. The code supports only two partitions. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t run_from_any;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Max possible size in bytes of image. Image read / write should not occure beyond this address */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t max_size;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct cibfw_image_size
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - log of next address in bytes to search for an image. Address in bytes is 2^log_step */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t log_step;
+        /* Description - this image can run from any partition starting at address 0x0000000, 0x4000000, 0x800000. The
+         * code supports only two partitions. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t run_from_any;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Max possible size in bytes of image. Image read / write should not occure beyond this address
+         */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t max_size;
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct cibfw_lfwp_version_vector {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct cibfw_reset_version scratchpad;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	struct cibfw_reset_version icm_context;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x14.31 */
-	struct cibfw_reset_version pci_code;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x1c.31 */
-	struct cibfw_reset_version phy_code;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x24.31 */
-	struct cibfw_reset_version ini;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x2c.31 */
-	struct cibfw_reset_version reserved1;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description -  */
-	/* 0x30.0 - 0x34.31 */
-	struct cibfw_reset_version reserved2;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description -  */
-	/* 0x38.0 - 0x3c.31 */
-	struct cibfw_reset_version reserved3;
-};
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct cibfw_lfwp_version_vector
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct cibfw_reset_version scratchpad;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        struct cibfw_reset_version icm_context;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x14.31 */
+        struct cibfw_reset_version pci_code;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x1c.31 */
+        struct cibfw_reset_version phy_code;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x24.31 */
+        struct cibfw_reset_version ini;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x2c.31 */
+        struct cibfw_reset_version reserved1;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description -  */
+        /* 0x30.0 - 0x34.31 */
+        struct cibfw_reset_version reserved2;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.0 - 0x3c.31 */
+        struct cibfw_reset_version reserved3;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct cibfw_module_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t branch;
-	/* Description -  */
-	/* 0x0.8 - 0x0.19 */
-	u_int16_t minor;
-	/* Description -  */
-	/* 0x0.20 - 0x0.31 */
-	u_int16_t major;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct cibfw_module_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t branch;
+        /* Description -  */
+        /* 0x0.8 - 0x0.19 */
+        u_int16_t minor;
+        /* Description -  */
+        /* 0x0.20 - 0x0.31 */
+        u_int16_t major;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cibfw_operation_key {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t key_modifier;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t key;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cibfw_operation_key
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t key_modifier;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t key;
+    };
 
-/* Description -   */
-/* Size in bytes - 512 */
-struct cibfw_device_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t signature3;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Format version for this struct */
-	/* 0x10.0 - 0x10.7 */
-	u_int8_t minor_version;
-	/* Description - Format version for this struct */
-	/* 0x10.8 - 0x10.16 */
-	u_int16_t major_version;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x5c.31 */
-	struct cibfw_guids guids;
-/*---------------- DWORD[27] (Offset 0x6c) ----------------*/
-	/* Description -  */
-	/* 0x6c.0 - 0x6c.15 */
-	u_int16_t vsd_vendor_id;
-/*---------------- DWORD[28] (Offset 0x70) ----------------*/
-	/* Description -  */
-	/* 0x70.24 - 0x140.23 */
-	char vsd[209];
-/*---------------- DWORD[88] (Offset 0x160) ----------------*/
-	/* Description -  */
-	/* 0x160.0 - 0x19c.31 */
-	struct cibfw_operation_key keys[4];
-};
+    /* Description -   */
+    /* Size in bytes - 512 */
+    struct cibfw_device_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Format version for this struct */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t minor_version;
+        /* Description - Format version for this struct */
+        /* 0x10.8 - 0x10.16 */
+        u_int16_t major_version;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x5c.31 */
+        struct cibfw_guids guids;
+        /*---------------- DWORD[27] (Offset 0x6c) ----------------*/
+        /* Description -  */
+        /* 0x6c.0 - 0x6c.15 */
+        u_int16_t vsd_vendor_id;
+        /*---------------- DWORD[28] (Offset 0x70) ----------------*/
+        /* Description -  */
+        /* 0x70.24 - 0x140.23 */
+        char vsd[209];
+        /*---------------- DWORD[88] (Offset 0x160) ----------------*/
+        /* Description -  */
+        /* 0x160.0 - 0x19c.31 */
+        struct cibfw_operation_key keys[4];
+    };
 
-/* Description -   */
-/* Size in bytes - 1024 */
-struct cibfw_image_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0x0 - not encrypted; 0x1 - encryption before signature; 0x2 - encryption after signature.  */
-	/* 0x0.3 - 0x0.4 */
-	u_int8_t encrypted_fw;
-	/* Description - Indicate that this binary support long keys (up to 4096bits) */
-	/* 0x0.6 - 0x0.6 */
-	u_int8_t long_keys;
-	/* Description - when set, debug-fw tokens are enabled. */
-	/* 0x0.7 - 0x0.7 */
-	u_int8_t debug_fw_tokens_supported;
-	/* Description - The image can be updated using the MCC/MCDA commands */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t mcc_en;
-	/* Description - OEM lifecycle NVCONFIG files are signed */
-	/* 0x0.9 - 0x0.9 */
-	u_int8_t signed_vendor_nvconfig_files;
-	/* Description - Mellanox lifecycle NVCONFIG files are signed */
-	/* 0x0.10 - 0x0.10 */
-	u_int8_t signed_mlnx_nvconfig_files;
-	/* Description - Factory re-customizationflow is supported */
-	/* 0x0.11 - 0x0.11 */
-	u_int8_t frc_supported;
-	/* Description - Customer Support Tokens are supported */
-	/* 0x0.12 - 0x0.12 */
-	u_int8_t cs_tokens_supported;
-	/* Description - This is a debug firmware */
-	/* 0x0.13 - 0x0.13 */
-	u_int8_t debug_fw;
-	/* Description - [MCC/MCDA flow] if set, the SHA 256 digest is encrypted - enabled by default for secure_fw - cr-space not closed */
-	/* 0x0.14 - 0x0.14 */
-	u_int8_t signed_fw;
-	/* Description - [MCC/MCDA flow] cr-space closed */
-	/* 0x0.15 - 0x0.15 */
-	u_int8_t secure_fw;
-	/* Description - IMAGE_INFO section minor version */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t minor_version;
-	/* Description - IMAGE_INFO section major version */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t major_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x10.31 */
-	struct cibfw_FW_VERSION FW_VERSION;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x18.31 */
-	struct cibfw_TRIPPLE_VERSION mic_version;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t pci_vendor_id;
-	/* Description -  */
-	/* 0x1c.16 - 0x1c.31 */
-	u_int16_t pci_device_id;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x20.15 */
-	u_int16_t pci_sub_vendor_id;
-	/* Description -  */
-	/* 0x20.16 - 0x20.31 */
-	u_int16_t pci_subsystem_id;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.24 - 0x34.23 */
-	char psid[17];
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-	/* Description -  */
-	/* 0x34.0 - 0x34.15 */
-	u_int16_t vsd_vendor_id;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description -  */
-	/* 0x38.24 - 0x108.23 */
-	char vsd[209];
-/*---------------- DWORD[66] (Offset 0x108) ----------------*/
-	/* Description - image size parameters */
-	/* 0x108.0 - 0x10c.31 */
-	struct cibfw_image_size image_size;
-/*---------------- DWORD[70] (Offset 0x118) ----------------*/
-	/* Description - HW device(s) supported by this FW image.
+    /* Description -   */
+    /* Size in bytes - 1024 */
+    struct cibfw_image_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0x0 - not encrypted; 0x1 - encryption before signature; 0x2 - encryption after signature.  */
+        /* 0x0.3 - 0x0.4 */
+        u_int8_t encrypted_fw;
+        /* Description - Indicate that this binary support long keys (up to 4096bits) */
+        /* 0x0.6 - 0x0.6 */
+        u_int8_t long_keys;
+        /* Description - when set, debug-fw tokens are enabled. */
+        /* 0x0.7 - 0x0.7 */
+        u_int8_t debug_fw_tokens_supported;
+        /* Description - The image can be updated using the MCC/MCDA commands */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t mcc_en;
+        /* Description - OEM lifecycle NVCONFIG files are signed */
+        /* 0x0.9 - 0x0.9 */
+        u_int8_t signed_vendor_nvconfig_files;
+        /* Description - Mellanox lifecycle NVCONFIG files are signed */
+        /* 0x0.10 - 0x0.10 */
+        u_int8_t signed_mlnx_nvconfig_files;
+        /* Description - Factory re-customizationflow is supported */
+        /* 0x0.11 - 0x0.11 */
+        u_int8_t frc_supported;
+        /* Description - Customer Support Tokens are supported */
+        /* 0x0.12 - 0x0.12 */
+        u_int8_t cs_tokens_supported;
+        /* Description - This is a debug firmware */
+        /* 0x0.13 - 0x0.13 */
+        u_int8_t debug_fw;
+        /* Description - [MCC/MCDA flow] if set, the SHA 256 digest is encrypted - enabled by default for secure_fw -
+         * cr-space not closed */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t signed_fw;
+        /* Description - [MCC/MCDA flow] cr-space closed */
+        /* 0x0.15 - 0x0.15 */
+        u_int8_t secure_fw;
+        /* Description - IMAGE_INFO section minor version */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t minor_version;
+        /* Description - IMAGE_INFO section major version */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x10.31 */
+        struct cibfw_FW_VERSION FW_VERSION;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x18.31 */
+        struct cibfw_TRIPPLE_VERSION mic_version;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t pci_vendor_id;
+        /* Description -  */
+        /* 0x1c.16 - 0x1c.31 */
+        u_int16_t pci_device_id;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x20.15 */
+        u_int16_t pci_sub_vendor_id;
+        /* Description -  */
+        /* 0x20.16 - 0x20.31 */
+        u_int16_t pci_subsystem_id;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.24 - 0x34.23 */
+        char psid[17];
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description -  */
+        /* 0x34.0 - 0x34.15 */
+        u_int16_t vsd_vendor_id;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.24 - 0x108.23 */
+        char vsd[209];
+        /*---------------- DWORD[66] (Offset 0x108) ----------------*/
+        /* Description - image size parameters */
+        /* 0x108.0 - 0x10c.31 */
+        struct cibfw_image_size image_size;
+        /*---------------- DWORD[70] (Offset 0x118) ----------------*/
+        /* Description - HW device(s) supported by this FW image.
 0 means invalid entry.
 For Golan A0, first entry should be 0x1ff
  */
-	/* 0x118.0 - 0x124.31 */
-	u_int32_t supported_hw_id[4];
-/*---------------- DWORD[74] (Offset 0x128) ----------------*/
-	/* Description -  */
-	/* 0x128.0 - 0x128.31 */
-	u_int32_t ini_file_num;
-/*---------------- DWORD[76] (Offset 0x130) ----------------*/
-	/* Description -  */
-	/* 0x130.0 - 0x16c.31 */
-	struct cibfw_lfwp_version_vector lfwp_version_vector;
-/*---------------- DWORD[112] (Offset 0x1c0) ----------------*/
-	/* Description - Product Version is the unified version of the FW and expansion ROM.
+        /* 0x118.0 - 0x124.31 */
+        u_int32_t supported_hw_id[4];
+        /*---------------- DWORD[74] (Offset 0x128) ----------------*/
+        /* Description -  */
+        /* 0x128.0 - 0x128.31 */
+        u_int32_t ini_file_num;
+        /*---------------- DWORD[76] (Offset 0x130) ----------------*/
+        /* Description -  */
+        /* 0x130.0 - 0x16c.31 */
+        struct cibfw_lfwp_version_vector lfwp_version_vector;
+        /*---------------- DWORD[112] (Offset 0x1c0) ----------------*/
+        /* Description - Product Version is the unified version of the FW and expansion ROM.
 Format is defined by the packager.
-When set to a non-empty string the FW update tool burns the image as a monolythic entity and refuses to update rom only or FW only. */
-	/* 0x1c0.24 - 0x1d0.23 */
-	char prod_ver[17];
-/*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
-	/* Description - Product description */
-	/* 0x1d0.24 - 0x2d0.23 */
-	char description[257];
-/*---------------- DWORD[197] (Offset 0x314) ----------------*/
-	/* Description -  */
-	/* 0x314.0 - 0x314.31 */
-	struct cibfw_module_version isfu;
-/*---------------- DWORD[208] (Offset 0x340) ----------------*/
-	/* Description - Product name */
-	/* 0x340.24 - 0x380.23 */
-	char name[65];
-/*---------------- DWORD[224] (Offset 0x380) ----------------*/
-	/* Description - PRS used to generate the FW binary */
-	/* 0x380.24 - 0x400.23 */
-	char prs_name[129];
-};
+When set to a non-empty string the FW update tool burns the image as a monolythic entity and refuses to update rom only
+or FW only. */
+        /* 0x1c0.24 - 0x1d0.23 */
+        char prod_ver[17];
+        /*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
+        /* Description - Product description */
+        /* 0x1d0.24 - 0x2d0.23 */
+        char description[257];
+        /*---------------- DWORD[197] (Offset 0x314) ----------------*/
+        /* Description -  */
+        /* 0x314.0 - 0x314.31 */
+        struct cibfw_module_version isfu;
+        /*---------------- DWORD[208] (Offset 0x340) ----------------*/
+        /* Description - Product name */
+        /* 0x340.24 - 0x380.23 */
+        char name[65];
+        /*---------------- DWORD[224] (Offset 0x380) ----------------*/
+        /* Description - PRS used to generate the FW binary */
+        /* 0x380.24 - 0x400.23 */
+        char prs_name[129];
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct cibfw_itoc_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.2 - 0x0.23 */
-	u_int32_t size;
-	/* Description - Section ID Section Type DESCRIPTION
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct cibfw_itoc_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.2 - 0x0.23 */
+        u_int32_t size;
+        /* Description - Section ID Section Type DESCRIPTION
 0x1 BOOT_CODE FW loader code
 0x2 PCI_CODE Code that is required to raise PCIe link.
 0x3 MAIN_CODE All non-PCIe FW code
 0x8 HW_BOOT_CFG Initial values for the PCI related registers
-0x9 HW_MAIN_CFG Initial values for all other registers 
-0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash Programming Application Note
-0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as number of physical functions
-(optional)
-0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related settings.
-(optional)
-0x18 ROM_CODE PXE/Boot over IB code. 
-0x30 DBG_LOG_MAP FW logger 'index to string' map. The map is in ASCI text. Format is TBD.
-                                          PARAM0 in the iTOC specifies the compression method of this sector:
-                                          0. Uncompressed
+0x9 HW_MAIN_CFG Initial values for all other registers
+0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash Programming
+Application Note 0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as
+number of physical functions (optional) 0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related
+settings. (optional) 0x18 ROM_CODE PXE/Boot over IB code. 0x30 DBG_LOG_MAP FW logger 'index to string' map. The map is
+in ASCI text. Format is TBD. PARAM0 in the iTOC specifies the compression method of this sector: 0. Uncompressed
                                           1. Zlib compress2()
                                           2. LZMA
-                                          Others - Reserved 
+                                          Others - Reserved
 0x31 DBG_FW_INI The Ini file used in the image generation. The PARAM0 applies the same as in  DBG_LOG_MAP section type.
-0x32 DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP section type.
-0xff END_MARKER A type of 0xff marks the end of the iTOC entries array. It is recommended to leave the unused part of the iTOC section blank (that is, 0xff in all unused bytes)
-All other values Reserved 
+0x32 DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP
+section type. 0xff END_MARKER A type of 0xff marks the end of the iTOC entries array. It is recommended to leave the
+unused part of the iTOC section blank (that is, 0xff in all unused bytes) All other values Reserved
  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - if partition type is code or ini then the load address is in here */
-	/* 0x4.0 - 0x4.29 */
-	u_int32_t param0;
-	/* Description - When this bit is set, Data within the section is protected by per-line crc. See yu.flash.replacement.crc_en */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t cache_line_crc;
-	/* Description - When this bit is set, image is zipped */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t zipped_image;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - if partition type is code then the jump address is in here */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t param1;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.2 - 0x14.30 */
-	u_int32_t flash_addr;
-	/* Description -  */
-	/* 0x14.31 - 0x14.31 */
-	u_int8_t relative_addr;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.15 */
-	u_int16_t section_crc;
-	/* Description -  */
-	/* 0x18.16 - 0x18.16 */
-	u_int8_t no_crc;
-	/* Description - When this bit is set, the section pointed by this entry in belongs to teh device tather than to teh FW image.
-A device_data section should not be updated in a regular FW update.
-Example for device_data section: VPD_R, GUIDs. */
-	/* 0x18.17 - 0x18.17 */
-	u_int8_t device_data;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t itoc_entry_crc;
-};
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - if partition type is code or ini then the load address is in here */
+        /* 0x4.0 - 0x4.29 */
+        u_int32_t param0;
+        /* Description - When this bit is set, Data within the section is protected by per-line crc. See
+         * yu.flash.replacement.crc_en */
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t cache_line_crc;
+        /* Description - When this bit is set, image is zipped */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t zipped_image;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - if partition type is code then the jump address is in here */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t param1;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.2 - 0x14.30 */
+        u_int32_t flash_addr;
+        /* Description -  */
+        /* 0x14.31 - 0x14.31 */
+        u_int8_t relative_addr;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.15 */
+        u_int16_t section_crc;
+        /* Description -  */
+        /* 0x18.16 - 0x18.16 */
+        u_int8_t no_crc;
+        /* Description - When this bit is set, the section pointed by this entry in belongs to teh device tather than to
+teh FW image. A device_data section should not be updated in a regular FW update. Example for device_data section:
+VPD_R, GUIDs. */
+        /* 0x18.17 - 0x18.17 */
+        u_int8_t device_data;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t itoc_entry_crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct cibfw_itoc_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 49 54 4f 43 */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - 04 08 15 16 */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - 23 42 ca fa */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - ba ca fe 00 */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t signature3;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Current version: 1 */
-	/* 0x10.0 - 0x10.7 */
-	u_int8_t version;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t itoc_entry_crc;
-};
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct cibfw_itoc_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 49 54 4f 43 */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - 04 08 15 16 */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - 23 42 ca fa */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - ba ca fe 00 */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Current version: 1 */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t version;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t itoc_entry_crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 320 */
-struct cibfw_mfg_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.24 - 0x10.23 */
-	char psid[17];
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - When this bit is set, the GUIDs should be taken from the device_info node.
+    /* Description -   */
+    /* Size in bytes - 320 */
+    struct cibfw_mfg_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.24 - 0x10.23 */
+        char psid[17];
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - When this bit is set, the GUIDs should be taken from the device_info node.
 When this bit is cleared, the GUIDs should be taken from the mfg_info node. */
-	/* 0x1c.0 - 0x1c.0 */
-	u_int8_t guids_override_en;
-	/* Description - MFG_INFO section minor version */
-	/* 0x1c.16 - 0x1c.23 */
-	u_int8_t minor_version;
-	/* Description - MFG_INFO section major version */
-	/* 0x1c.24 - 0x1c.31 */
-	u_int8_t major_version;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x5c.31 */
-	struct cibfw_guids guids;
-};
+        /* 0x1c.0 - 0x1c.0 */
+        u_int8_t guids_override_en;
+        /* Description - MFG_INFO section minor version */
+        /* 0x1c.16 - 0x1c.23 */
+        u_int8_t minor_version;
+        /* Description - MFG_INFO section major version */
+        /* 0x1c.24 - 0x1c.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x5c.31 */
+        struct cibfw_guids guids;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cibfw_register_mfai {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.23 */
-	u_int32_t address;
-	/* Description - if set make image permamnent */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t permanent;
-	/* Description - if set use address */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t use_address;
-	/* Description - if set use image id and not address */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t use_image_id;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t image_id;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cibfw_register_mfai
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.23 */
+        u_int32_t address;
+        /* Description - if set make image permamnent */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t permanent;
+        /* Description - if set use address */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t use_address;
+        /* Description - if set use image id and not address */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t use_image_id;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t image_id;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cibfw_register_mfrl {
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - on Read, required reset level. On write, minimum requested reset level
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cibfw_register_mfrl
+    {
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - on Read, required reset level. On write, minimum requested reset level
  0-Full ISFU
  1-Driver down but link is up
  2-driver and link down
  3-driver down, link down pci disable/enable
  7-server warm reboot
  8-server cold reboot */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t reset_level;
-};
-
-/* Description -   */
-/* Size in bytes - 1024 */
-union cibfw_cibfw_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct cibfw_register_mfai register_mfai;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct cibfw_itoc_entry itoc_entry;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct cibfw_guids guids;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct cibfw_itoc_header itoc_header;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct cibfw_register_mfrl register_mfrl;
-	/* Description -  */
-	/* 0x0.0 - 0x1fc.31 */
-	struct cibfw_device_info device_info;
-	/* Description -  */
-	/* 0x0.0 - 0x13c.31 */
-	struct cibfw_mfg_info mfg_info;
-	/* Description -  */
-	/* 0x0.0 - 0x3fc.31 */
-	struct cibfw_image_info image_info;
-};
-
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t reset_level;
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* uint64 */
-void cibfw_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_uint64_size(void);
-#define CIBFW_UINT64_SIZE    (0x8)
-void cibfw_uint64_dump(const u_int64_t *ptr_struct, FILE *fd);
-/* reset_version */
-void cibfw_reset_version_pack(const struct cibfw_reset_version *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_reset_version_unpack(struct cibfw_reset_version *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_reset_version_print(const struct cibfw_reset_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_reset_version_size(void);
-#define CIBFW_RESET_VERSION_SIZE    (0x8)
-void cibfw_reset_version_dump(const struct cibfw_reset_version *ptr_struct, FILE *fd);
-/* uid_entry */
-void cibfw_uid_entry_pack(const struct cibfw_uid_entry *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_uid_entry_unpack(struct cibfw_uid_entry *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_uid_entry_print(const struct cibfw_uid_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_uid_entry_size(void);
-#define CIBFW_UID_ENTRY_SIZE    (0x10)
-void cibfw_uid_entry_dump(const struct cibfw_uid_entry *ptr_struct, FILE *fd);
-/* FW_VERSION */
-void cibfw_FW_VERSION_pack(const struct cibfw_FW_VERSION *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_FW_VERSION_unpack(struct cibfw_FW_VERSION *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_FW_VERSION_print(const struct cibfw_FW_VERSION *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_FW_VERSION_size(void);
-#define CIBFW_FW_VERSION_SIZE    (0x10)
-void cibfw_FW_VERSION_dump(const struct cibfw_FW_VERSION *ptr_struct, FILE *fd);
-/* TRIPPLE_VERSION */
-void cibfw_TRIPPLE_VERSION_pack(const struct cibfw_TRIPPLE_VERSION *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_TRIPPLE_VERSION_unpack(struct cibfw_TRIPPLE_VERSION *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_TRIPPLE_VERSION_print(const struct cibfw_TRIPPLE_VERSION *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_TRIPPLE_VERSION_size(void);
-#define CIBFW_TRIPPLE_VERSION_SIZE    (0x8)
-void cibfw_TRIPPLE_VERSION_dump(const struct cibfw_TRIPPLE_VERSION *ptr_struct, FILE *fd);
-/* guids */
-void cibfw_guids_pack(const struct cibfw_guids *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_guids_unpack(struct cibfw_guids *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_guids_print(const struct cibfw_guids *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_guids_size(void);
-#define CIBFW_GUIDS_SIZE    (0x40)
-void cibfw_guids_dump(const struct cibfw_guids *ptr_struct, FILE *fd);
-/* image_size */
-void cibfw_image_size_pack(const struct cibfw_image_size *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_image_size_unpack(struct cibfw_image_size *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_image_size_print(const struct cibfw_image_size *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_image_size_size(void);
-#define CIBFW_IMAGE_SIZE_SIZE    (0x8)
-void cibfw_image_size_dump(const struct cibfw_image_size *ptr_struct, FILE *fd);
-/* lfwp_version_vector */
-void cibfw_lfwp_version_vector_pack(const struct cibfw_lfwp_version_vector *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_lfwp_version_vector_unpack(struct cibfw_lfwp_version_vector *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_lfwp_version_vector_print(const struct cibfw_lfwp_version_vector *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_lfwp_version_vector_size(void);
-#define CIBFW_LFWP_VERSION_VECTOR_SIZE    (0x40)
-void cibfw_lfwp_version_vector_dump(const struct cibfw_lfwp_version_vector *ptr_struct, FILE *fd);
-/* module_version */
-void cibfw_module_version_pack(const struct cibfw_module_version *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_module_version_unpack(struct cibfw_module_version *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_module_version_print(const struct cibfw_module_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_module_version_size(void);
-#define CIBFW_MODULE_VERSION_SIZE    (0x4)
-void cibfw_module_version_dump(const struct cibfw_module_version *ptr_struct, FILE *fd);
-/* operation_key */
-void cibfw_operation_key_pack(const struct cibfw_operation_key *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_operation_key_unpack(struct cibfw_operation_key *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_operation_key_print(const struct cibfw_operation_key *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_operation_key_size(void);
-#define CIBFW_OPERATION_KEY_SIZE    (0x10)
-void cibfw_operation_key_dump(const struct cibfw_operation_key *ptr_struct, FILE *fd);
-/* device_info */
-void cibfw_device_info_pack(const struct cibfw_device_info *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_device_info_unpack(struct cibfw_device_info *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_device_info_print(const struct cibfw_device_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_device_info_size(void);
-#define CIBFW_DEVICE_INFO_SIZE    (0x200)
-void cibfw_device_info_dump(const struct cibfw_device_info *ptr_struct, FILE *fd);
-/* image_info */
-void cibfw_image_info_pack(const struct cibfw_image_info *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_image_info_unpack(struct cibfw_image_info *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_image_info_print(const struct cibfw_image_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_image_info_size(void);
-#define CIBFW_IMAGE_INFO_SIZE    (0x400)
-void cibfw_image_info_dump(const struct cibfw_image_info *ptr_struct, FILE *fd);
-/* itoc_entry */
-void cibfw_itoc_entry_pack(const struct cibfw_itoc_entry *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_itoc_entry_unpack(struct cibfw_itoc_entry *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_itoc_entry_print(const struct cibfw_itoc_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_itoc_entry_size(void);
-#define CIBFW_ITOC_ENTRY_SIZE    (0x20)
-void cibfw_itoc_entry_dump(const struct cibfw_itoc_entry *ptr_struct, FILE *fd);
-/* itoc_header */
-void cibfw_itoc_header_pack(const struct cibfw_itoc_header *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_itoc_header_unpack(struct cibfw_itoc_header *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_itoc_header_print(const struct cibfw_itoc_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_itoc_header_size(void);
-#define CIBFW_ITOC_HEADER_SIZE    (0x20)
-void cibfw_itoc_header_dump(const struct cibfw_itoc_header *ptr_struct, FILE *fd);
-/* mfg_info */
-void cibfw_mfg_info_pack(const struct cibfw_mfg_info *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_mfg_info_unpack(struct cibfw_mfg_info *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_mfg_info_print(const struct cibfw_mfg_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_mfg_info_size(void);
-#define CIBFW_MFG_INFO_SIZE    (0x140)
-void cibfw_mfg_info_dump(const struct cibfw_mfg_info *ptr_struct, FILE *fd);
-/* register_mfai */
-void cibfw_register_mfai_pack(const struct cibfw_register_mfai *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_register_mfai_unpack(struct cibfw_register_mfai *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_register_mfai_print(const struct cibfw_register_mfai *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_register_mfai_size(void);
-#define CIBFW_REGISTER_MFAI_SIZE    (0x10)
-void cibfw_register_mfai_dump(const struct cibfw_register_mfai *ptr_struct, FILE *fd);
-/* register_mfrl */
-void cibfw_register_mfrl_pack(const struct cibfw_register_mfrl *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_register_mfrl_unpack(struct cibfw_register_mfrl *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_register_mfrl_print(const struct cibfw_register_mfrl *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_register_mfrl_size(void);
-#define CIBFW_REGISTER_MFRL_SIZE    (0x10)
-void cibfw_register_mfrl_dump(const struct cibfw_register_mfrl *ptr_struct, FILE *fd);
-/* cibfw_Nodes */
-void cibfw_cibfw_Nodes_pack(const union cibfw_cibfw_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void cibfw_cibfw_Nodes_unpack(union cibfw_cibfw_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void cibfw_cibfw_Nodes_print(const union cibfw_cibfw_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int cibfw_cibfw_Nodes_size(void);
-#define CIBFW_CIBFW_NODES_SIZE    (0x400)
-void cibfw_cibfw_Nodes_dump(const union cibfw_cibfw_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 1024 */
+    union cibfw_cibfw_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct cibfw_register_mfai register_mfai;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct cibfw_itoc_entry itoc_entry;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct cibfw_guids guids;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct cibfw_itoc_header itoc_header;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct cibfw_register_mfrl register_mfrl;
+        /* Description -  */
+        /* 0x0.0 - 0x1fc.31 */
+        struct cibfw_device_info device_info;
+        /* Description -  */
+        /* 0x0.0 - 0x13c.31 */
+        struct cibfw_mfg_info mfg_info;
+        /* Description -  */
+        /* 0x0.0 - 0x3fc.31 */
+        struct cibfw_image_info image_info;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* uint64 */
+    void cibfw_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_uint64_size(void);
+#define CIBFW_UINT64_SIZE (0x8)
+    void cibfw_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
+    /* reset_version */
+    void cibfw_reset_version_pack(const struct cibfw_reset_version* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_reset_version_unpack(struct cibfw_reset_version* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_reset_version_print(const struct cibfw_reset_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_reset_version_size(void);
+#define CIBFW_RESET_VERSION_SIZE (0x8)
+    void cibfw_reset_version_dump(const struct cibfw_reset_version* ptr_struct, FILE* fd);
+    /* uid_entry */
+    void cibfw_uid_entry_pack(const struct cibfw_uid_entry* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_uid_entry_unpack(struct cibfw_uid_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_uid_entry_print(const struct cibfw_uid_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_uid_entry_size(void);
+#define CIBFW_UID_ENTRY_SIZE (0x10)
+    void cibfw_uid_entry_dump(const struct cibfw_uid_entry* ptr_struct, FILE* fd);
+    /* FW_VERSION */
+    void cibfw_FW_VERSION_pack(const struct cibfw_FW_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_FW_VERSION_unpack(struct cibfw_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_FW_VERSION_print(const struct cibfw_FW_VERSION* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_FW_VERSION_size(void);
+#define CIBFW_FW_VERSION_SIZE (0x10)
+    void cibfw_FW_VERSION_dump(const struct cibfw_FW_VERSION* ptr_struct, FILE* fd);
+    /* TRIPPLE_VERSION */
+    void cibfw_TRIPPLE_VERSION_pack(const struct cibfw_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_TRIPPLE_VERSION_unpack(struct cibfw_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_TRIPPLE_VERSION_print(const struct cibfw_TRIPPLE_VERSION* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_TRIPPLE_VERSION_size(void);
+#define CIBFW_TRIPPLE_VERSION_SIZE (0x8)
+    void cibfw_TRIPPLE_VERSION_dump(const struct cibfw_TRIPPLE_VERSION* ptr_struct, FILE* fd);
+    /* guids */
+    void cibfw_guids_pack(const struct cibfw_guids* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_guids_unpack(struct cibfw_guids* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_guids_print(const struct cibfw_guids* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_guids_size(void);
+#define CIBFW_GUIDS_SIZE (0x40)
+    void cibfw_guids_dump(const struct cibfw_guids* ptr_struct, FILE* fd);
+    /* image_size */
+    void cibfw_image_size_pack(const struct cibfw_image_size* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_image_size_unpack(struct cibfw_image_size* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_image_size_print(const struct cibfw_image_size* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_image_size_size(void);
+#define CIBFW_IMAGE_SIZE_SIZE (0x8)
+    void cibfw_image_size_dump(const struct cibfw_image_size* ptr_struct, FILE* fd);
+    /* lfwp_version_vector */
+    void cibfw_lfwp_version_vector_pack(const struct cibfw_lfwp_version_vector* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_lfwp_version_vector_unpack(struct cibfw_lfwp_version_vector* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_lfwp_version_vector_print(const struct cibfw_lfwp_version_vector* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_lfwp_version_vector_size(void);
+#define CIBFW_LFWP_VERSION_VECTOR_SIZE (0x40)
+    void cibfw_lfwp_version_vector_dump(const struct cibfw_lfwp_version_vector* ptr_struct, FILE* fd);
+    /* module_version */
+    void cibfw_module_version_pack(const struct cibfw_module_version* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_module_version_unpack(struct cibfw_module_version* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_module_version_print(const struct cibfw_module_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_module_version_size(void);
+#define CIBFW_MODULE_VERSION_SIZE (0x4)
+    void cibfw_module_version_dump(const struct cibfw_module_version* ptr_struct, FILE* fd);
+    /* operation_key */
+    void cibfw_operation_key_pack(const struct cibfw_operation_key* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_operation_key_unpack(struct cibfw_operation_key* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_operation_key_print(const struct cibfw_operation_key* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_operation_key_size(void);
+#define CIBFW_OPERATION_KEY_SIZE (0x10)
+    void cibfw_operation_key_dump(const struct cibfw_operation_key* ptr_struct, FILE* fd);
+    /* device_info */
+    void cibfw_device_info_pack(const struct cibfw_device_info* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_device_info_unpack(struct cibfw_device_info* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_device_info_print(const struct cibfw_device_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_device_info_size(void);
+#define CIBFW_DEVICE_INFO_SIZE (0x200)
+    void cibfw_device_info_dump(const struct cibfw_device_info* ptr_struct, FILE* fd);
+    /* image_info */
+    void cibfw_image_info_pack(const struct cibfw_image_info* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_image_info_unpack(struct cibfw_image_info* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_image_info_print(const struct cibfw_image_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_image_info_size(void);
+#define CIBFW_IMAGE_INFO_SIZE (0x400)
+    void cibfw_image_info_dump(const struct cibfw_image_info* ptr_struct, FILE* fd);
+    /* itoc_entry */
+    void cibfw_itoc_entry_pack(const struct cibfw_itoc_entry* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_itoc_entry_unpack(struct cibfw_itoc_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_itoc_entry_print(const struct cibfw_itoc_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_itoc_entry_size(void);
+#define CIBFW_ITOC_ENTRY_SIZE (0x20)
+    void cibfw_itoc_entry_dump(const struct cibfw_itoc_entry* ptr_struct, FILE* fd);
+    /* itoc_header */
+    void cibfw_itoc_header_pack(const struct cibfw_itoc_header* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_itoc_header_unpack(struct cibfw_itoc_header* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_itoc_header_print(const struct cibfw_itoc_header* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_itoc_header_size(void);
+#define CIBFW_ITOC_HEADER_SIZE (0x20)
+    void cibfw_itoc_header_dump(const struct cibfw_itoc_header* ptr_struct, FILE* fd);
+    /* mfg_info */
+    void cibfw_mfg_info_pack(const struct cibfw_mfg_info* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_mfg_info_unpack(struct cibfw_mfg_info* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_mfg_info_print(const struct cibfw_mfg_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_mfg_info_size(void);
+#define CIBFW_MFG_INFO_SIZE (0x140)
+    void cibfw_mfg_info_dump(const struct cibfw_mfg_info* ptr_struct, FILE* fd);
+    /* register_mfai */
+    void cibfw_register_mfai_pack(const struct cibfw_register_mfai* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_register_mfai_unpack(struct cibfw_register_mfai* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_register_mfai_print(const struct cibfw_register_mfai* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_register_mfai_size(void);
+#define CIBFW_REGISTER_MFAI_SIZE (0x10)
+    void cibfw_register_mfai_dump(const struct cibfw_register_mfai* ptr_struct, FILE* fd);
+    /* register_mfrl */
+    void cibfw_register_mfrl_pack(const struct cibfw_register_mfrl* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_register_mfrl_unpack(struct cibfw_register_mfrl* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_register_mfrl_print(const struct cibfw_register_mfrl* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_register_mfrl_size(void);
+#define CIBFW_REGISTER_MFRL_SIZE (0x10)
+    void cibfw_register_mfrl_dump(const struct cibfw_register_mfrl* ptr_struct, FILE* fd);
+    /* cibfw_Nodes */
+    void cibfw_cibfw_Nodes_pack(const union cibfw_cibfw_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void cibfw_cibfw_Nodes_unpack(union cibfw_cibfw_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void cibfw_cibfw_Nodes_print(const union cibfw_cibfw_Nodes* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cibfw_cibfw_Nodes_size(void);
+#define CIBFW_CIBFW_NODES_SIZE (0x400)
+    void cibfw_cibfw_Nodes_dump(const union cibfw_cibfw_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/cx4fw_layouts.c b/tools_layouts/cx4fw_layouts.c
index b8170fb3..ecb408bb 100644
--- a/tools_layouts/cx4fw_layouts.c
+++ b/tools_layouts/cx4fw_layouts.c
@@ -29,733 +29,769 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2018-02-13 10:20:32"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cx4fw/cx4fw.adb --file-prefix cx4fw --prefix cx4fw_
-         ***/
+ *** This file was generated at "2018-02-13 10:20:32"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cx4fw/cx4fw.adb --file-prefix
+ *cx4fw --prefix cx4fw_
+ ***/
 #include "cx4fw_layouts.h"
 
-void cx4fw_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
 }
 
-void cx4fw_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	*ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    *ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void cx4fw_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_uint64 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_uint64 ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t) *ptr_struct);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t)*ptr_struct);
 }
 
 unsigned int cx4fw_uint64_size(void)
 {
-	return CX4FW_UINT64_SIZE;
+    return CX4FW_UINT64_SIZE;
 }
 
-void cx4fw_uint64_dump(const u_int64_t *ptr_struct, FILE *fd)
+void cx4fw_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
 {
-	cx4fw_uint64_print(ptr_struct, fd, 0);
+    cx4fw_uint64_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_uid_entry_pack(const struct cx4fw_uid_entry *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_uid_entry_pack(const struct cx4fw_uid_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_allocated);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->step);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->uid);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_allocated);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->step);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->uid);
 }
 
-void cx4fw_uid_entry_unpack(struct cx4fw_uid_entry *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_uid_entry_unpack(struct cx4fw_uid_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->num_allocated = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->uid = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->num_allocated = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->uid = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void cx4fw_uid_entry_print(const struct cx4fw_uid_entry *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_uid_entry_print(const struct cx4fw_uid_entry* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_uid_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_uid_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_allocated        : " UH_FMT "\n", ptr_struct->num_allocated);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "step                 : " UH_FMT "\n", ptr_struct->step);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uid                  : " U64H_FMT "\n", ptr_struct->uid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_allocated        : " UH_FMT "\n", ptr_struct->num_allocated);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "step                 : " UH_FMT "\n", ptr_struct->step);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uid                  : " U64H_FMT "\n", ptr_struct->uid);
 }
 
 unsigned int cx4fw_uid_entry_size(void)
 {
-	return CX4FW_UID_ENTRY_SIZE;
+    return CX4FW_UID_ENTRY_SIZE;
 }
 
-void cx4fw_uid_entry_dump(const struct cx4fw_uid_entry *ptr_struct, FILE *fd)
+void cx4fw_uid_entry_dump(const struct cx4fw_uid_entry* ptr_struct, FILE* fd)
 {
-	cx4fw_uid_entry_print(ptr_struct, fd, 0);
+    cx4fw_uid_entry_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_guids_pack(const struct cx4fw_guids *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_guids_pack(const struct cx4fw_guids* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	cx4fw_uid_entry_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 128;
-	cx4fw_uid_entry_pack(&(ptr_struct->macs), ptr_buff + offset / 8);
+    offset = 0;
+    cx4fw_uid_entry_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 128;
+    cx4fw_uid_entry_pack(&(ptr_struct->macs), ptr_buff + offset / 8);
 }
 
-void cx4fw_guids_unpack(struct cx4fw_guids *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_guids_unpack(struct cx4fw_guids* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	cx4fw_uid_entry_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 128;
-	cx4fw_uid_entry_unpack(&(ptr_struct->macs), ptr_buff + offset / 8);
+    offset = 0;
+    cx4fw_uid_entry_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 128;
+    cx4fw_uid_entry_unpack(&(ptr_struct->macs), ptr_buff + offset / 8);
 }
 
-void cx4fw_guids_print(const struct cx4fw_guids *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_guids_print(const struct cx4fw_guids* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_guids ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_guids ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cx4fw_uid_entry_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "macs:\n");
-	cx4fw_uid_entry_print(&(ptr_struct->macs), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cx4fw_uid_entry_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "macs:\n");
+    cx4fw_uid_entry_print(&(ptr_struct->macs), fd, indent_level + 1);
 }
 
 unsigned int cx4fw_guids_size(void)
 {
-	return CX4FW_GUIDS_SIZE;
+    return CX4FW_GUIDS_SIZE;
 }
 
-void cx4fw_guids_dump(const struct cx4fw_guids *ptr_struct, FILE *fd)
+void cx4fw_guids_dump(const struct cx4fw_guids* ptr_struct, FILE* fd)
 {
-	cx4fw_guids_print(ptr_struct, fd, 0);
+    cx4fw_guids_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_operation_key_pack(const struct cx4fw_operation_key *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_operation_key_pack(const struct cx4fw_operation_key* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key_modifier);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key_modifier);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
 }
 
-void cx4fw_operation_key_unpack(struct cx4fw_operation_key *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_operation_key_unpack(struct cx4fw_operation_key* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->key_modifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->key_modifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void cx4fw_operation_key_print(const struct cx4fw_operation_key *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_operation_key_print(const struct cx4fw_operation_key* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_operation_key ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_operation_key ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key_modifier         : " UH_FMT "\n", ptr_struct->key_modifier);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key_modifier         : " UH_FMT "\n", ptr_struct->key_modifier);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
 }
 
 unsigned int cx4fw_operation_key_size(void)
 {
-	return CX4FW_OPERATION_KEY_SIZE;
-}
-
-void cx4fw_operation_key_dump(const struct cx4fw_operation_key *ptr_struct, FILE *fd)
-{
-	cx4fw_operation_key_print(ptr_struct, fd, 0);
-}
-
-void cx4fw_device_info_pack(const struct cx4fw_device_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
-	offset = 152;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 143;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->major_version);
-	offset = 256;
-	cx4fw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 880;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
-		cx4fw_operation_key_pack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
-	}
-}
-
-void cx4fw_device_info_unpack(struct cx4fw_device_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 152;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 143;
-	ptr_struct->major_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
-	offset = 256;
-	cx4fw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 880;
-	ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
-		ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->vsd[208] = '\0';
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
-		cx4fw_operation_key_unpack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
-	}
-}
-
-void cx4fw_device_info_print(const struct cx4fw_device_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_device_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cx4fw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
-		fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keys_%03d:\n", i);
-		cx4fw_operation_key_print(&(ptr_struct->keys[i]), fd, indent_level + 1);
-	}
+    return CX4FW_OPERATION_KEY_SIZE;
+}
+
+void cx4fw_operation_key_dump(const struct cx4fw_operation_key* ptr_struct, FILE* fd)
+{
+    cx4fw_operation_key_print(ptr_struct, fd, 0);
+}
+
+void cx4fw_device_info_pack(const struct cx4fw_device_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
+    offset = 152;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 143;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->major_version);
+    offset = 256;
+    cx4fw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 880;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
+        cx4fw_operation_key_pack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
+    }
+}
+
+void cx4fw_device_info_unpack(struct cx4fw_device_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 152;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 143;
+    ptr_struct->major_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
+    offset = 256;
+    cx4fw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 880;
+    ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
+        ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->vsd[208] = '\0';
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
+        cx4fw_operation_key_unpack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
+    }
+}
+
+void cx4fw_device_info_print(const struct cx4fw_device_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_device_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cx4fw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
+    fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keys_%03d:\n", i);
+        cx4fw_operation_key_print(&(ptr_struct->keys[i]), fd, indent_level + 1);
+    }
 }
 
 unsigned int cx4fw_device_info_size(void)
 {
-	return CX4FW_DEVICE_INFO_SIZE;
+    return CX4FW_DEVICE_INFO_SIZE;
 }
 
-void cx4fw_device_info_dump(const struct cx4fw_device_info *ptr_struct, FILE *fd)
+void cx4fw_device_info_dump(const struct cx4fw_device_info* ptr_struct, FILE* fd)
 {
-	cx4fw_device_info_print(ptr_struct, fd, 0);
+    cx4fw_device_info_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_image_signature_256_pack(const struct cx4fw_image_signature_256 *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_image_signature_256_pack(const struct cx4fw_image_signature_256* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 2560, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature_uuid[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 2560, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(256, 32, i, 2560, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature[i]);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 2560, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature_uuid[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 2560, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(256, 32, i, 2560, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature[i]);
+    }
 }
 
-void cx4fw_image_signature_256_unpack(struct cx4fw_image_signature_256 *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_image_signature_256_unpack(struct cx4fw_image_signature_256* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 2560, 1);
-		ptr_struct->signature_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 2560, 1);
-		ptr_struct->keypair_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(256, 32, i, 2560, 1);
-		ptr_struct->signature[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 2560, 1);
+        ptr_struct->signature_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 2560, 1);
+        ptr_struct->keypair_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(256, 32, i, 2560, 1);
+        ptr_struct->signature[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void cx4fw_image_signature_256_print(const struct cx4fw_image_signature_256 *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_image_signature_256_print(const struct cx4fw_image_signature_256* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_image_signature_256 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_image_signature_256 ========\n");
 
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "signature_uuid_%03d  : " U32H_FMT "\n", i, ptr_struct->signature_uuid[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keypair_uuid_%03d    : " U32H_FMT "\n", i, ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 64; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "signature_%03d       : " U32H_FMT "\n", i, ptr_struct->signature[i]);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "signature_uuid_%03d  : " U32H_FMT "\n", i, ptr_struct->signature_uuid[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keypair_uuid_%03d    : " U32H_FMT "\n", i, ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 64; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "signature_%03d       : " U32H_FMT "\n", i, ptr_struct->signature[i]);
+    }
 }
 
 unsigned int cx4fw_image_signature_256_size(void)
 {
-	return CX4FW_IMAGE_SIGNATURE_256_SIZE;
+    return CX4FW_IMAGE_SIGNATURE_256_SIZE;
 }
 
-void cx4fw_image_signature_256_dump(const struct cx4fw_image_signature_256 *ptr_struct, FILE *fd)
+void cx4fw_image_signature_256_dump(const struct cx4fw_image_signature_256* ptr_struct, FILE* fd)
 {
-	cx4fw_image_signature_256_print(ptr_struct, fd, 0);
+    cx4fw_image_signature_256_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_image_signature_512_pack(const struct cx4fw_image_signature_512 *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_image_signature_512_pack(const struct cx4fw_image_signature_512* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 4608, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature_uuid[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 4608, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(256, 32, i, 4608, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature[i]);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 4608, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature_uuid[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 4608, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(256, 32, i, 4608, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature[i]);
+    }
 }
 
-void cx4fw_image_signature_512_unpack(struct cx4fw_image_signature_512 *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_image_signature_512_unpack(struct cx4fw_image_signature_512* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 4608, 1);
-		ptr_struct->signature_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 4608, 1);
-		ptr_struct->keypair_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(256, 32, i, 4608, 1);
-		ptr_struct->signature[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 4608, 1);
+        ptr_struct->signature_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 4608, 1);
+        ptr_struct->keypair_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(256, 32, i, 4608, 1);
+        ptr_struct->signature[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void cx4fw_image_signature_512_print(const struct cx4fw_image_signature_512 *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_image_signature_512_print(const struct cx4fw_image_signature_512* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_image_signature_512 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_image_signature_512 ========\n");
 
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "signature_uuid_%03d  : " U32H_FMT "\n", i, ptr_struct->signature_uuid[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keypair_uuid_%03d    : " U32H_FMT "\n", i, ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "signature_%03d       : " U32H_FMT "\n", i, ptr_struct->signature[i]);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "signature_uuid_%03d  : " U32H_FMT "\n", i, ptr_struct->signature_uuid[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keypair_uuid_%03d    : " U32H_FMT "\n", i, ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "signature_%03d       : " U32H_FMT "\n", i, ptr_struct->signature[i]);
+    }
 }
 
 unsigned int cx4fw_image_signature_512_size(void)
 {
-	return CX4FW_IMAGE_SIGNATURE_512_SIZE;
+    return CX4FW_IMAGE_SIGNATURE_512_SIZE;
 }
 
-void cx4fw_image_signature_512_dump(const struct cx4fw_image_signature_512 *ptr_struct, FILE *fd)
+void cx4fw_image_signature_512_dump(const struct cx4fw_image_signature_512* ptr_struct, FILE* fd)
 {
-	cx4fw_image_signature_512_print(ptr_struct, fd, 0);
+    cx4fw_image_signature_512_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_mfg_info_pack(const struct cx4fw_mfg_info *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_mfg_info_pack(const struct cx4fw_mfg_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 255;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->guids_override_en);
-	offset = 232;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	offset = 256;
-	cx4fw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 255;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->guids_override_en);
+    offset = 232;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    offset = 256;
+    cx4fw_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
 }
 
-void cx4fw_mfg_info_unpack(struct cx4fw_mfg_info *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_mfg_info_unpack(struct cx4fw_mfg_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
-		ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->psid[16] = '\0';
-	offset = 255;
-	ptr_struct->guids_override_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 232;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 224;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 256;
-	cx4fw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->psid[16] = '\0';
+    offset = 255;
+    ptr_struct->guids_override_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 232;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 224;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 256;
+    cx4fw_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
 }
 
-void cx4fw_mfg_info_print(const struct cx4fw_mfg_info *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_mfg_info_print(const struct cx4fw_mfg_info* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_mfg_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_mfg_info ========\n");
 
-		fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids_override_en    : " UH_FMT "\n", ptr_struct->guids_override_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cx4fw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids_override_en    : " UH_FMT "\n", ptr_struct->guids_override_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cx4fw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
 }
 
 unsigned int cx4fw_mfg_info_size(void)
 {
-	return CX4FW_MFG_INFO_SIZE;
-}
-
-void cx4fw_mfg_info_dump(const struct cx4fw_mfg_info *ptr_struct, FILE *fd)
-{
-	cx4fw_mfg_info_print(ptr_struct, fd, 0);
-}
-
-void cx4fw_public_key_2048_pack(const struct cx4fw_public_key_2048 *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->auth_type);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_en);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mlnx_nvconf_en);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vendor_nvconf_en);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_token_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_en);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->public_key_exp);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 2304, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(280, 8, i, 2304, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->key[i]);
-	}
-}
-
-void cx4fw_public_key_2048_unpack(struct cx4fw_public_key_2048 *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->auth_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 4;
-	ptr_struct->frc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->mlnx_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->vendor_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->cs_token_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->fw_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 96;
-	ptr_struct->public_key_exp = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 2304, 1);
-		ptr_struct->keypair_uuid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(280, 8, i, 2304, 1);
-		ptr_struct->key[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-}
-
-void cx4fw_public_key_2048_print(const struct cx4fw_public_key_2048 *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_public_key_2048 ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "auth_type            : " UH_FMT "\n", ptr_struct->auth_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "frc_en               : " UH_FMT "\n", ptr_struct->frc_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mlnx_nvconf_en       : " UH_FMT "\n", ptr_struct->mlnx_nvconf_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vendor_nvconf_en     : " UH_FMT "\n", ptr_struct->vendor_nvconf_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cs_token_en          : " UH_FMT "\n", ptr_struct->cs_token_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_en                : " UH_FMT "\n", ptr_struct->fw_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "public_key_exp       : " U32H_FMT "\n", ptr_struct->public_key_exp);
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keypair_uuid_%03d    : " UH_FMT "\n", i, ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "key_%03d             : " UH_FMT "\n", i, ptr_struct->key[i]);
-	}
+    return CX4FW_MFG_INFO_SIZE;
+}
+
+void cx4fw_mfg_info_dump(const struct cx4fw_mfg_info* ptr_struct, FILE* fd)
+{
+    cx4fw_mfg_info_print(ptr_struct, fd, 0);
+}
+
+void cx4fw_public_key_2048_pack(const struct cx4fw_public_key_2048* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->auth_type);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_en);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mlnx_nvconf_en);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vendor_nvconf_en);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_token_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_en);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->public_key_exp);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 2304, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(280, 8, i, 2304, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->key[i]);
+    }
+}
+
+void cx4fw_public_key_2048_unpack(struct cx4fw_public_key_2048* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->auth_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 4;
+    ptr_struct->frc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->mlnx_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->vendor_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->cs_token_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->fw_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 96;
+    ptr_struct->public_key_exp = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 2304, 1);
+        ptr_struct->keypair_uuid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(280, 8, i, 2304, 1);
+        ptr_struct->key[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+}
+
+void cx4fw_public_key_2048_print(const struct cx4fw_public_key_2048* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_public_key_2048 ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "auth_type            : " UH_FMT "\n", ptr_struct->auth_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "frc_en               : " UH_FMT "\n", ptr_struct->frc_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mlnx_nvconf_en       : " UH_FMT "\n", ptr_struct->mlnx_nvconf_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vendor_nvconf_en     : " UH_FMT "\n", ptr_struct->vendor_nvconf_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cs_token_en          : " UH_FMT "\n", ptr_struct->cs_token_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_en                : " UH_FMT "\n", ptr_struct->fw_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "public_key_exp       : " U32H_FMT "\n", ptr_struct->public_key_exp);
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keypair_uuid_%03d    : " UH_FMT "\n", i, ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "key_%03d             : " UH_FMT "\n", i, ptr_struct->key[i]);
+    }
 }
 
 unsigned int cx4fw_public_key_2048_size(void)
 {
-	return CX4FW_PUBLIC_KEY_2048_SIZE;
-}
-
-void cx4fw_public_key_2048_dump(const struct cx4fw_public_key_2048 *ptr_struct, FILE *fd)
-{
-	cx4fw_public_key_2048_print(ptr_struct, fd, 0);
-}
-
-void cx4fw_public_key_4096_pack(const struct cx4fw_public_key_4096 *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->auth_type);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_en);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mlnx_nvconf_en);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vendor_nvconf_en);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_token_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_en);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->public_key_exp);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 4352, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(280, 16, i, 4352, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key[i]);
-	}
-}
-
-void cx4fw_public_key_4096_unpack(struct cx4fw_public_key_4096 *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->auth_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 4;
-	ptr_struct->frc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->mlnx_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->vendor_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->cs_token_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->fw_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 96;
-	ptr_struct->public_key_exp = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 4352, 1);
-		ptr_struct->keypair_uuid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(280, 16, i, 4352, 1);
-		ptr_struct->key[i] = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	}
-}
-
-void cx4fw_public_key_4096_print(const struct cx4fw_public_key_4096 *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_public_key_4096 ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "auth_type            : " UH_FMT "\n", ptr_struct->auth_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "frc_en               : " UH_FMT "\n", ptr_struct->frc_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mlnx_nvconf_en       : " UH_FMT "\n", ptr_struct->mlnx_nvconf_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vendor_nvconf_en     : " UH_FMT "\n", ptr_struct->vendor_nvconf_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cs_token_en          : " UH_FMT "\n", ptr_struct->cs_token_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_en                : " UH_FMT "\n", ptr_struct->fw_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "public_key_exp       : " U32H_FMT "\n", ptr_struct->public_key_exp);
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keypair_uuid_%03d    : " UH_FMT "\n", i, ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "key_%03d             : " UH_FMT "\n", i, ptr_struct->key[i]);
-	}
+    return CX4FW_PUBLIC_KEY_2048_SIZE;
+}
+
+void cx4fw_public_key_2048_dump(const struct cx4fw_public_key_2048* ptr_struct, FILE* fd)
+{
+    cx4fw_public_key_2048_print(ptr_struct, fd, 0);
+}
+
+void cx4fw_public_key_4096_pack(const struct cx4fw_public_key_4096* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->auth_type);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_en);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mlnx_nvconf_en);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vendor_nvconf_en);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_token_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_en);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->public_key_exp);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 4352, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(280, 16, i, 4352, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key[i]);
+    }
+}
+
+void cx4fw_public_key_4096_unpack(struct cx4fw_public_key_4096* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->auth_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 4;
+    ptr_struct->frc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->mlnx_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->vendor_nvconf_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->cs_token_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->fw_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 96;
+    ptr_struct->public_key_exp = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 4352, 1);
+        ptr_struct->keypair_uuid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(280, 16, i, 4352, 1);
+        ptr_struct->key[i] = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    }
+}
+
+void cx4fw_public_key_4096_print(const struct cx4fw_public_key_4096* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_public_key_4096 ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "auth_type            : " UH_FMT "\n", ptr_struct->auth_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "frc_en               : " UH_FMT "\n", ptr_struct->frc_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mlnx_nvconf_en       : " UH_FMT "\n", ptr_struct->mlnx_nvconf_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vendor_nvconf_en     : " UH_FMT "\n", ptr_struct->vendor_nvconf_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cs_token_en          : " UH_FMT "\n", ptr_struct->cs_token_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_en                : " UH_FMT "\n", ptr_struct->fw_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "public_key_exp       : " U32H_FMT "\n", ptr_struct->public_key_exp);
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keypair_uuid_%03d    : " UH_FMT "\n", i, ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "key_%03d             : " UH_FMT "\n", i, ptr_struct->key[i]);
+    }
 }
 
 unsigned int cx4fw_public_key_4096_size(void)
 {
-	return CX4FW_PUBLIC_KEY_4096_SIZE;
+    return CX4FW_PUBLIC_KEY_4096_SIZE;
 }
 
-void cx4fw_public_key_4096_dump(const struct cx4fw_public_key_4096 *ptr_struct, FILE *fd)
+void cx4fw_public_key_4096_dump(const struct cx4fw_public_key_4096* ptr_struct, FILE* fd)
 {
-	cx4fw_public_key_4096_print(ptr_struct, fd, 0);
+    cx4fw_public_key_4096_print(ptr_struct, fd, 0);
 }
 
-void cx4fw_cx4fw_Nodes_pack(const union cx4fw_cx4fw_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void cx4fw_cx4fw_Nodes_pack(const union cx4fw_cx4fw_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
-	cx4fw_public_key_4096_pack(&(ptr_struct->public_key_4096), ptr_buff);
+    cx4fw_public_key_4096_pack(&(ptr_struct->public_key_4096), ptr_buff);
 }
 
-void cx4fw_cx4fw_Nodes_unpack(union cx4fw_cx4fw_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void cx4fw_cx4fw_Nodes_unpack(union cx4fw_cx4fw_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
-	cx4fw_public_key_4096_unpack(&(ptr_struct->public_key_4096), ptr_buff);
+    cx4fw_public_key_4096_unpack(&(ptr_struct->public_key_4096), ptr_buff);
 }
 
-void cx4fw_cx4fw_Nodes_print(const union cx4fw_cx4fw_Nodes *ptr_struct, FILE *fd, int indent_level)
+void cx4fw_cx4fw_Nodes_print(const union cx4fw_cx4fw_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx4fw_cx4fw_Nodes ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx4fw_cx4fw_Nodes ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_signature_256:\n");
-	cx4fw_image_signature_256_print(&(ptr_struct->image_signature_256), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_signature_512:\n");
-	cx4fw_image_signature_512_print(&(ptr_struct->image_signature_512), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_info:\n");
-	cx4fw_device_info_print(&(ptr_struct->device_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfg_info:\n");
-	cx4fw_mfg_info_print(&(ptr_struct->mfg_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	cx4fw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "public_key_2048:\n");
-	cx4fw_public_key_2048_print(&(ptr_struct->public_key_2048), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "public_key_4096:\n");
-	cx4fw_public_key_4096_print(&(ptr_struct->public_key_4096), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_signature_256:\n");
+    cx4fw_image_signature_256_print(&(ptr_struct->image_signature_256), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_signature_512:\n");
+    cx4fw_image_signature_512_print(&(ptr_struct->image_signature_512), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_info:\n");
+    cx4fw_device_info_print(&(ptr_struct->device_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfg_info:\n");
+    cx4fw_mfg_info_print(&(ptr_struct->mfg_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    cx4fw_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "public_key_2048:\n");
+    cx4fw_public_key_2048_print(&(ptr_struct->public_key_2048), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "public_key_4096:\n");
+    cx4fw_public_key_4096_print(&(ptr_struct->public_key_4096), fd, indent_level + 1);
 }
 
 unsigned int cx4fw_cx4fw_Nodes_size(void)
 {
-	return CX4FW_CX4FW_NODES_SIZE;
+    return CX4FW_CX4FW_NODES_SIZE;
 }
 
-void cx4fw_cx4fw_Nodes_dump(const union cx4fw_cx4fw_Nodes *ptr_struct, FILE *fd)
+void cx4fw_cx4fw_Nodes_dump(const union cx4fw_cx4fw_Nodes* ptr_struct, FILE* fd)
 {
-	cx4fw_cx4fw_Nodes_print(ptr_struct, fd, 0);
+    cx4fw_cx4fw_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/cx4fw_layouts.h b/tools_layouts/cx4fw_layouts.h
index 43d41460..3af6bc7c 100644
--- a/tools_layouts/cx4fw_layouts.h
+++ b/tools_layouts/cx4fw_layouts.h
@@ -29,366 +29,380 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2018-02-13 10:20:32"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cx4fw/cx4fw.adb --file-prefix cx4fw --prefix cx4fw_
-         ***/
+ *** This file was generated at "2018-02-13 10:20:32"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/cx4fw/cx4fw.adb --file-prefix
+ *cx4fw --prefix cx4fw_
+ ***/
 #ifndef CX4FW_LAYOUTS_H
 #define CX4FW_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 8 */
-struct cx4fw_uint64 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int64_t uint64;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct cx4fw_uint64
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int64_t uint64;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cx4fw_uid_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Number of allocated UIDs in this entry */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t num_allocated;
-	/* Description - Step size by which to derive the UIDs for this entry
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cx4fw_uid_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Number of allocated UIDs in this entry */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t num_allocated;
+        /* Description - Step size by which to derive the UIDs for this entry
 See struct description */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t step;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - For MACs, the upper 16 bits in the 'hi' dword are reserved */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t uid;
-};
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t step;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - For MACs, the upper 16 bits in the 'hi' dword are reserved */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t uid;
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct cx4fw_guids {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - UIDs (MACs and GUIDs) Allocation Entry.
-guids, is used for system GUID, node GUID and port GUID of port 0. ;/Multiple UIDs can be assigned to a single port, to be used for multiple virtual guests, multi host and managment */
-	/* 0x0.0 - 0xc.31 */
-	struct cx4fw_uid_entry guids;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x1c.31 */
-	struct cx4fw_uid_entry macs;
-};
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct cx4fw_guids
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - UIDs (MACs and GUIDs) Allocation Entry.
+guids, is used for system GUID, node GUID and port GUID of port 0. ;/Multiple UIDs can be assigned to a single port, to
+be used for multiple virtual guests, multi host and managment */
+        /* 0x0.0 - 0xc.31 */
+        struct cx4fw_uid_entry guids;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x1c.31 */
+        struct cx4fw_uid_entry macs;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct cx4fw_operation_key {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t key_modifier;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t key;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct cx4fw_operation_key
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t key_modifier;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t key;
+    };
 
-/* Description -   */
-/* Size in bytes - 512 */
-struct cx4fw_device_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t signature3;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Format version for this struct */
-	/* 0x10.0 - 0x10.7 */
-	u_int8_t minor_version;
-	/* Description - Format version for this struct */
-	/* 0x10.8 - 0x10.16 */
-	u_int16_t major_version;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x5c.31 */
-	struct cx4fw_guids guids;
-/*---------------- DWORD[27] (Offset 0x6c) ----------------*/
-	/* Description -  */
-	/* 0x6c.0 - 0x6c.15 */
-	u_int16_t vsd_vendor_id;
-/*---------------- DWORD[28] (Offset 0x70) ----------------*/
-	/* Description -  */
-	/* 0x70.24 - 0x140.23 */
-	char vsd[209];
-/*---------------- DWORD[88] (Offset 0x160) ----------------*/
-	/* Description -  */
-	/* 0x160.0 - 0x19c.31 */
-	struct cx4fw_operation_key keys[4];
-};
+    /* Description -   */
+    /* Size in bytes - 512 */
+    struct cx4fw_device_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Format version for this struct */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t minor_version;
+        /* Description - Format version for this struct */
+        /* 0x10.8 - 0x10.16 */
+        u_int16_t major_version;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x5c.31 */
+        struct cx4fw_guids guids;
+        /*---------------- DWORD[27] (Offset 0x6c) ----------------*/
+        /* Description -  */
+        /* 0x6c.0 - 0x6c.15 */
+        u_int16_t vsd_vendor_id;
+        /*---------------- DWORD[28] (Offset 0x70) ----------------*/
+        /* Description -  */
+        /* 0x70.24 - 0x140.23 */
+        char vsd[209];
+        /*---------------- DWORD[88] (Offset 0x160) ----------------*/
+        /* Description -  */
+        /* 0x160.0 - 0x19c.31 */
+        struct cx4fw_operation_key keys[4];
+    };
 
-/* Description -   */
-/* Size in bytes - 320 */
-struct cx4fw_image_signature_256 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - time based UUID for this signature */
-	/* 0x0.0 - 0xc.31 */
-	u_int32_t signature_uuid[4];
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The UUID of the keypair used for signing this file */
-	/* 0x10.0 - 0x1c.31 */
-	u_int32_t keypair_uuid[4];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - The signature itself */
-	/* 0x20.0 - 0x11c.31 */
-	u_int32_t signature[64];
-};
+    /* Description -   */
+    /* Size in bytes - 320 */
+    struct cx4fw_image_signature_256
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - time based UUID for this signature */
+        /* 0x0.0 - 0xc.31 */
+        u_int32_t signature_uuid[4];
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The UUID of the keypair used for signing this file */
+        /* 0x10.0 - 0x1c.31 */
+        u_int32_t keypair_uuid[4];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - The signature itself */
+        /* 0x20.0 - 0x11c.31 */
+        u_int32_t signature[64];
+    };
 
-/* Description -   */
-/* Size in bytes - 576 */
-struct cx4fw_image_signature_512 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - time based UUID for this signature */
-	/* 0x0.0 - 0xc.31 */
-	u_int32_t signature_uuid[4];
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The UUID of the keypair used for signing this file */
-	/* 0x10.0 - 0x1c.31 */
-	u_int32_t keypair_uuid[4];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - The signature itself */
-	/* 0x20.0 - 0x21c.31 */
-	u_int32_t signature[128];
-};
+    /* Description -   */
+    /* Size in bytes - 576 */
+    struct cx4fw_image_signature_512
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - time based UUID for this signature */
+        /* 0x0.0 - 0xc.31 */
+        u_int32_t signature_uuid[4];
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The UUID of the keypair used for signing this file */
+        /* 0x10.0 - 0x1c.31 */
+        u_int32_t keypair_uuid[4];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - The signature itself */
+        /* 0x20.0 - 0x21c.31 */
+        u_int32_t signature[128];
+    };
 
-/* Description -   */
-/* Size in bytes - 320 */
-struct cx4fw_mfg_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.24 - 0x10.23 */
-	char psid[17];
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - When this bit is set, the GUIDs should be taken from the device_info node.
+    /* Description -   */
+    /* Size in bytes - 320 */
+    struct cx4fw_mfg_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.24 - 0x10.23 */
+        char psid[17];
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - When this bit is set, the GUIDs should be taken from the device_info node.
 When this bit is cleared, the GUIDs should be taken from the mfg_info node. */
-	/* 0x1c.0 - 0x1c.0 */
-	u_int8_t guids_override_en;
-	/* Description - MFG_INFO section minor version */
-	/* 0x1c.16 - 0x1c.23 */
-	u_int8_t minor_version;
-	/* Description - MFG_INFO section major version */
-	/* 0x1c.24 - 0x1c.31 */
-	u_int8_t major_version;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x5c.31 */
-	struct cx4fw_guids guids;
-};
+        /* 0x1c.0 - 0x1c.0 */
+        u_int8_t guids_override_en;
+        /* Description - MFG_INFO section minor version */
+        /* 0x1c.16 - 0x1c.23 */
+        u_int8_t minor_version;
+        /* Description - MFG_INFO section major version */
+        /* 0x1c.24 - 0x1c.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x5c.31 */
+        struct cx4fw_guids guids;
+    };
 
-/* Description -   */
-/* Size in bytes - 288 */
-struct cx4fw_public_key_2048 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The authentication mechanism used with this key
+    /* Description -   */
+    /* Size in bytes - 288 */
+    struct cx4fw_public_key_2048
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The authentication mechanism used with this key
 0x0: INVALID_ENTRY
 0x1: SHA256
 _
 DIGEST
 0x3: _2048BIT_RSASSA_PKCS1_v1_5_WITH_SHA256 */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t auth_type;
-	/* Description - This key can be used for authenticating Factory Re Configuration responses. */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t frc_en;
-	/* Description - This key can be used for authenticating NVCONFIG files at MLLNX level. */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t mlnx_nvconf_en;
-	/* Description - This key can be used for authenticating NVCONFIG files at OEM level. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t vendor_nvconf_en;
-	/* Description - This key can be used for authenticating CS tokens at OEM level. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t cs_token_en;
-	/* Description - This key can be used for authenticating firmware, DBG_FW and DBG tokens */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t fw_en;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - The public key exponent.In most cases, the standard exponent (65537) will be used (per RFC4871). */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t public_key_exp;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - UUID of this key.The UUID is created by the sign server when it generates a new RSA key-pair. */
-	/* 0x10.24 - 0x20.23 */
-	u_int8_t keypair_uuid[16];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - A 2048 bit public-key  (0x100 bytes) */
-	/* 0x20.24 - 0x120.23 */
-	u_int8_t key[256];
-};
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t auth_type;
+        /* Description - This key can be used for authenticating Factory Re Configuration responses. */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t frc_en;
+        /* Description - This key can be used for authenticating NVCONFIG files at MLLNX level. */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t mlnx_nvconf_en;
+        /* Description - This key can be used for authenticating NVCONFIG files at OEM level. */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t vendor_nvconf_en;
+        /* Description - This key can be used for authenticating CS tokens at OEM level. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t cs_token_en;
+        /* Description - This key can be used for authenticating firmware, DBG_FW and DBG tokens */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t fw_en;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - The public key exponent.In most cases, the standard exponent (65537) will be used (per
+         * RFC4871). */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t public_key_exp;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - UUID of this key.The UUID is created by the sign server when it generates a new RSA key-pair.
+         */
+        /* 0x10.24 - 0x20.23 */
+        u_int8_t keypair_uuid[16];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - A 2048 bit public-key  (0x100 bytes) */
+        /* 0x20.24 - 0x120.23 */
+        u_int8_t key[256];
+    };
 
-/* Description -   */
-/* Size in bytes - 544 */
-struct cx4fw_public_key_4096 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The authentication mechanism used with this key
+    /* Description -   */
+    /* Size in bytes - 544 */
+    struct cx4fw_public_key_4096
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The authentication mechanism used with this key
 0x0: INVALID_ENTRY
 0x1: SHA256
 _
 DIGEST
 0x3: _2048BIT_RSASSA_PKCS1_v1_5_WITH_SHA256 */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t auth_type;
-	/* Description - This key can be used for authenticating Factory Re Configuration responses. */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t frc_en;
-	/* Description - This key can be used for authenticating NVCONFIG files at MLLNX level. */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t mlnx_nvconf_en;
-	/* Description - This key can be used for authenticating NVCONFIG files at OEM level. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t vendor_nvconf_en;
-	/* Description - This key can be used for authenticating CS tokens at OEM level. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t cs_token_en;
-	/* Description - This key can be used for authenticating firmware, DBG_FW and DBG tokens */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t fw_en;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - The public key exponent.In most cases, the standard exponent (65537) will be used (per RFC4871). */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t public_key_exp;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - UUID of this key.The UUID is created by the sign server when it generates a new RSA key-pair. */
-	/* 0x10.24 - 0x20.23 */
-	u_int8_t keypair_uuid[16];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - A 2048 bit public-key  (0x100 bytes) */
-	/* 0x20.24 - 0x220.23 */
-	u_int16_t key[256];
-};
-
-/* Description -   */
-/* Size in bytes - 576 */
-union cx4fw_cx4fw_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x13c.31 */
-	struct cx4fw_image_signature_256 image_signature_256;
-	/* Description -  */
-	/* 0x0.0 - 0x23c.31 */
-	struct cx4fw_image_signature_512 image_signature_512;
-	/* Description -  */
-	/* 0x0.0 - 0x1fc.31 */
-	struct cx4fw_device_info device_info;
-	/* Description -  */
-	/* 0x0.0 - 0x13c.31 */
-	struct cx4fw_mfg_info mfg_info;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct cx4fw_guids guids;
-	/* Description -  */
-	/* 0x0.0 - 0x11c.31 */
-	struct cx4fw_public_key_2048 public_key_2048;
-	/* Description -  */
-	/* 0x0.0 - 0x21c.31 */
-	struct cx4fw_public_key_4096 public_key_4096;
-};
-
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t auth_type;
+        /* Description - This key can be used for authenticating Factory Re Configuration responses. */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t frc_en;
+        /* Description - This key can be used for authenticating NVCONFIG files at MLLNX level. */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t mlnx_nvconf_en;
+        /* Description - This key can be used for authenticating NVCONFIG files at OEM level. */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t vendor_nvconf_en;
+        /* Description - This key can be used for authenticating CS tokens at OEM level. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t cs_token_en;
+        /* Description - This key can be used for authenticating firmware, DBG_FW and DBG tokens */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t fw_en;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - The public key exponent.In most cases, the standard exponent (65537) will be used (per
+         * RFC4871). */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t public_key_exp;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - UUID of this key.The UUID is created by the sign server when it generates a new RSA key-pair.
+         */
+        /* 0x10.24 - 0x20.23 */
+        u_int8_t keypair_uuid[16];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - A 2048 bit public-key  (0x100 bytes) */
+        /* 0x20.24 - 0x220.23 */
+        u_int16_t key[256];
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* uint64 */
-void cx4fw_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_uint64_size(void);
-#define CX4FW_UINT64_SIZE    (0x8)
-void cx4fw_uint64_dump(const u_int64_t *ptr_struct, FILE *fd);
-/* uid_entry */
-void cx4fw_uid_entry_pack(const struct cx4fw_uid_entry *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_uid_entry_unpack(struct cx4fw_uid_entry *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_uid_entry_print(const struct cx4fw_uid_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_uid_entry_size(void);
-#define CX4FW_UID_ENTRY_SIZE    (0x10)
-void cx4fw_uid_entry_dump(const struct cx4fw_uid_entry *ptr_struct, FILE *fd);
-/* guids */
-void cx4fw_guids_pack(const struct cx4fw_guids *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_guids_unpack(struct cx4fw_guids *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_guids_print(const struct cx4fw_guids *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_guids_size(void);
-#define CX4FW_GUIDS_SIZE    (0x40)
-void cx4fw_guids_dump(const struct cx4fw_guids *ptr_struct, FILE *fd);
-/* operation_key */
-void cx4fw_operation_key_pack(const struct cx4fw_operation_key *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_operation_key_unpack(struct cx4fw_operation_key *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_operation_key_print(const struct cx4fw_operation_key *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_operation_key_size(void);
-#define CX4FW_OPERATION_KEY_SIZE    (0x10)
-void cx4fw_operation_key_dump(const struct cx4fw_operation_key *ptr_struct, FILE *fd);
-/* device_info */
-void cx4fw_device_info_pack(const struct cx4fw_device_info *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_device_info_unpack(struct cx4fw_device_info *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_device_info_print(const struct cx4fw_device_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_device_info_size(void);
-#define CX4FW_DEVICE_INFO_SIZE    (0x200)
-void cx4fw_device_info_dump(const struct cx4fw_device_info *ptr_struct, FILE *fd);
-/* image_signature_256 */
-void cx4fw_image_signature_256_pack(const struct cx4fw_image_signature_256 *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_image_signature_256_unpack(struct cx4fw_image_signature_256 *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_image_signature_256_print(const struct cx4fw_image_signature_256 *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_image_signature_256_size(void);
-#define CX4FW_IMAGE_SIGNATURE_256_SIZE    (0x140)
-void cx4fw_image_signature_256_dump(const struct cx4fw_image_signature_256 *ptr_struct, FILE *fd);
-/* image_signature_512 */
-void cx4fw_image_signature_512_pack(const struct cx4fw_image_signature_512 *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_image_signature_512_unpack(struct cx4fw_image_signature_512 *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_image_signature_512_print(const struct cx4fw_image_signature_512 *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_image_signature_512_size(void);
-#define CX4FW_IMAGE_SIGNATURE_512_SIZE    (0x240)
-void cx4fw_image_signature_512_dump(const struct cx4fw_image_signature_512 *ptr_struct, FILE *fd);
-/* mfg_info */
-void cx4fw_mfg_info_pack(const struct cx4fw_mfg_info *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_mfg_info_unpack(struct cx4fw_mfg_info *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_mfg_info_print(const struct cx4fw_mfg_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_mfg_info_size(void);
-#define CX4FW_MFG_INFO_SIZE    (0x140)
-void cx4fw_mfg_info_dump(const struct cx4fw_mfg_info *ptr_struct, FILE *fd);
-/* public_key_2048 */
-void cx4fw_public_key_2048_pack(const struct cx4fw_public_key_2048 *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_public_key_2048_unpack(struct cx4fw_public_key_2048 *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_public_key_2048_print(const struct cx4fw_public_key_2048 *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_public_key_2048_size(void);
-#define CX4FW_PUBLIC_KEY_2048_SIZE    (0x120)
-void cx4fw_public_key_2048_dump(const struct cx4fw_public_key_2048 *ptr_struct, FILE *fd);
-/* public_key_4096 */
-void cx4fw_public_key_4096_pack(const struct cx4fw_public_key_4096 *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_public_key_4096_unpack(struct cx4fw_public_key_4096 *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_public_key_4096_print(const struct cx4fw_public_key_4096 *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_public_key_4096_size(void);
-#define CX4FW_PUBLIC_KEY_4096_SIZE    (0x220)
-void cx4fw_public_key_4096_dump(const struct cx4fw_public_key_4096 *ptr_struct, FILE *fd);
-/* cx4fw_Nodes */
-void cx4fw_cx4fw_Nodes_pack(const union cx4fw_cx4fw_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void cx4fw_cx4fw_Nodes_unpack(union cx4fw_cx4fw_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void cx4fw_cx4fw_Nodes_print(const union cx4fw_cx4fw_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx4fw_cx4fw_Nodes_size(void);
-#define CX4FW_CX4FW_NODES_SIZE    (0x240)
-void cx4fw_cx4fw_Nodes_dump(const union cx4fw_cx4fw_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 576 */
+    union cx4fw_cx4fw_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x13c.31 */
+        struct cx4fw_image_signature_256 image_signature_256;
+        /* Description -  */
+        /* 0x0.0 - 0x23c.31 */
+        struct cx4fw_image_signature_512 image_signature_512;
+        /* Description -  */
+        /* 0x0.0 - 0x1fc.31 */
+        struct cx4fw_device_info device_info;
+        /* Description -  */
+        /* 0x0.0 - 0x13c.31 */
+        struct cx4fw_mfg_info mfg_info;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct cx4fw_guids guids;
+        /* Description -  */
+        /* 0x0.0 - 0x11c.31 */
+        struct cx4fw_public_key_2048 public_key_2048;
+        /* Description -  */
+        /* 0x0.0 - 0x21c.31 */
+        struct cx4fw_public_key_4096 public_key_4096;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* uint64 */
+    void cx4fw_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_uint64_size(void);
+#define CX4FW_UINT64_SIZE (0x8)
+    void cx4fw_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
+    /* uid_entry */
+    void cx4fw_uid_entry_pack(const struct cx4fw_uid_entry* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_uid_entry_unpack(struct cx4fw_uid_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_uid_entry_print(const struct cx4fw_uid_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_uid_entry_size(void);
+#define CX4FW_UID_ENTRY_SIZE (0x10)
+    void cx4fw_uid_entry_dump(const struct cx4fw_uid_entry* ptr_struct, FILE* fd);
+    /* guids */
+    void cx4fw_guids_pack(const struct cx4fw_guids* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_guids_unpack(struct cx4fw_guids* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_guids_print(const struct cx4fw_guids* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_guids_size(void);
+#define CX4FW_GUIDS_SIZE (0x40)
+    void cx4fw_guids_dump(const struct cx4fw_guids* ptr_struct, FILE* fd);
+    /* operation_key */
+    void cx4fw_operation_key_pack(const struct cx4fw_operation_key* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_operation_key_unpack(struct cx4fw_operation_key* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_operation_key_print(const struct cx4fw_operation_key* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_operation_key_size(void);
+#define CX4FW_OPERATION_KEY_SIZE (0x10)
+    void cx4fw_operation_key_dump(const struct cx4fw_operation_key* ptr_struct, FILE* fd);
+    /* device_info */
+    void cx4fw_device_info_pack(const struct cx4fw_device_info* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_device_info_unpack(struct cx4fw_device_info* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_device_info_print(const struct cx4fw_device_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_device_info_size(void);
+#define CX4FW_DEVICE_INFO_SIZE (0x200)
+    void cx4fw_device_info_dump(const struct cx4fw_device_info* ptr_struct, FILE* fd);
+    /* image_signature_256 */
+    void cx4fw_image_signature_256_pack(const struct cx4fw_image_signature_256* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_image_signature_256_unpack(struct cx4fw_image_signature_256* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_image_signature_256_print(const struct cx4fw_image_signature_256* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_image_signature_256_size(void);
+#define CX4FW_IMAGE_SIGNATURE_256_SIZE (0x140)
+    void cx4fw_image_signature_256_dump(const struct cx4fw_image_signature_256* ptr_struct, FILE* fd);
+    /* image_signature_512 */
+    void cx4fw_image_signature_512_pack(const struct cx4fw_image_signature_512* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_image_signature_512_unpack(struct cx4fw_image_signature_512* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_image_signature_512_print(const struct cx4fw_image_signature_512* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_image_signature_512_size(void);
+#define CX4FW_IMAGE_SIGNATURE_512_SIZE (0x240)
+    void cx4fw_image_signature_512_dump(const struct cx4fw_image_signature_512* ptr_struct, FILE* fd);
+    /* mfg_info */
+    void cx4fw_mfg_info_pack(const struct cx4fw_mfg_info* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_mfg_info_unpack(struct cx4fw_mfg_info* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_mfg_info_print(const struct cx4fw_mfg_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_mfg_info_size(void);
+#define CX4FW_MFG_INFO_SIZE (0x140)
+    void cx4fw_mfg_info_dump(const struct cx4fw_mfg_info* ptr_struct, FILE* fd);
+    /* public_key_2048 */
+    void cx4fw_public_key_2048_pack(const struct cx4fw_public_key_2048* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_public_key_2048_unpack(struct cx4fw_public_key_2048* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_public_key_2048_print(const struct cx4fw_public_key_2048* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_public_key_2048_size(void);
+#define CX4FW_PUBLIC_KEY_2048_SIZE (0x120)
+    void cx4fw_public_key_2048_dump(const struct cx4fw_public_key_2048* ptr_struct, FILE* fd);
+    /* public_key_4096 */
+    void cx4fw_public_key_4096_pack(const struct cx4fw_public_key_4096* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_public_key_4096_unpack(struct cx4fw_public_key_4096* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_public_key_4096_print(const struct cx4fw_public_key_4096* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_public_key_4096_size(void);
+#define CX4FW_PUBLIC_KEY_4096_SIZE (0x220)
+    void cx4fw_public_key_4096_dump(const struct cx4fw_public_key_4096* ptr_struct, FILE* fd);
+    /* cx4fw_Nodes */
+    void cx4fw_cx4fw_Nodes_pack(const union cx4fw_cx4fw_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void cx4fw_cx4fw_Nodes_unpack(union cx4fw_cx4fw_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void cx4fw_cx4fw_Nodes_print(const union cx4fw_cx4fw_Nodes* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx4fw_cx4fw_Nodes_size(void);
+#define CX4FW_CX4FW_NODES_SIZE (0x240)
+    void cx4fw_cx4fw_Nodes_dump(const union cx4fw_cx4fw_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/cx6fw_layouts.c b/tools_layouts/cx6fw_layouts.c
old mode 100755
new mode 100644
index 730a28b3..a2a3acb4
--- a/tools_layouts/cx6fw_layouts.c
+++ b/tools_layouts/cx6fw_layouts.c
@@ -31,259 +31,259 @@
  */
 
 /***
-         *** This file was generated at "2018-08-29 13:02:13"
-         *** by:
-         ***    > /mswg/release/tools/a-me/a-me-1.0.110/adabe_plugins/adb2c/adb2pack.py --input adb/cx6fw/cx6fw.adb --file-prefix cx6fw --prefix cx6fw_
-         ***/
+ *** This file was generated at "2018-08-29 13:02:13"
+ *** by:
+ ***    > /mswg/release/tools/a-me/a-me-1.0.110/adabe_plugins/adb2c/adb2pack.py --input adb/cx6fw/cx6fw.adb
+ *--file-prefix cx6fw --prefix cx6fw_
+ ***/
 #include "cx6fw_layouts.h"
 
-void cx6fw_hw_pointer_entry_pack(const struct cx6fw_hw_pointer_entry *ptr_struct, u_int8_t *ptr_buff)
+void cx6fw_hw_pointer_entry_pack(const struct cx6fw_hw_pointer_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i = 0;
-	(void)offset;
-	(void)i;
-	(void)ptr_struct;
-	(void)ptr_buff;
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ptr);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ptr);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
 }
 
-void cx6fw_hw_pointer_entry_unpack(struct cx6fw_hw_pointer_entry *ptr_struct, const u_int8_t *ptr_buff)
+void cx6fw_hw_pointer_entry_unpack(struct cx6fw_hw_pointer_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i = 0;
-	(void)offset;
-	(void)i;
-	(void)ptr_struct;
-	(void)ptr_buff;
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-	offset = 0;
-	ptr_struct->ptr = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 48;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->ptr = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 48;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void cx6fw_hw_pointer_entry_print(const struct cx6fw_hw_pointer_entry *ptr_struct, FILE *fd, int indent_level)
+void cx6fw_hw_pointer_entry_print(const struct cx6fw_hw_pointer_entry* ptr_struct, FILE* fd, int indent_level)
 {
-	int i = 0;
-	(void)i;
-	(void)ptr_struct;
-	(void)fd;
-	(void)indent_level;
+    int i = 0;
+    (void)i;
+    (void)ptr_struct;
+    (void)fd;
+    (void)indent_level;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx6fw_hw_pointer_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx6fw_hw_pointer_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ptr                  : " U32H_FMT "\n", ptr_struct->ptr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ptr                  : " U32H_FMT "\n", ptr_struct->ptr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
 }
 
 unsigned int cx6fw_hw_pointer_entry_size(void)
 {
-	return CX6FW_HW_POINTER_ENTRY_SIZE;
+    return CX6FW_HW_POINTER_ENTRY_SIZE;
 }
 
-void cx6fw_hw_pointer_entry_dump(const struct cx6fw_hw_pointer_entry *ptr_struct, FILE *fd)
+void cx6fw_hw_pointer_entry_dump(const struct cx6fw_hw_pointer_entry* ptr_struct, FILE* fd)
 {
-	cx6fw_hw_pointer_entry_print(ptr_struct, fd, 0);
+    cx6fw_hw_pointer_entry_print(ptr_struct, fd, 0);
 }
 
-void cx6fw_hw_pointers_pack(const struct cx6fw_hw_pointers *ptr_struct, u_int8_t *ptr_buff)
+void cx6fw_hw_pointers_pack(const struct cx6fw_hw_pointers* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i = 0;
-	(void)offset;
-	(void)i;
-	(void)ptr_struct;
-	(void)ptr_buff;
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-	offset = 0;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
-	offset = 64;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
-	offset = 128;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
-	offset = 192;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
-	offset = 256;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->authentication_start_ptr), ptr_buff + offset / 8);
-	offset = 320;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->authentication_end_ptr), ptr_buff + offset / 8);
-	offset = 384;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->digest_mdk_ptr), ptr_buff + offset / 8);
-	offset = 448;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->digest_recovery_key_ptr), ptr_buff + offset / 8);
-	offset = 512;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr8), ptr_buff + offset / 8);
-	offset = 576;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr9), ptr_buff + offset / 8);
-	offset = 640;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr10), ptr_buff + offset / 8);
-	offset = 704;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr11), ptr_buff + offset / 8);
-	offset = 768;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr12), ptr_buff + offset / 8);
-	offset = 832;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr13), ptr_buff + offset / 8);
-	offset = 896;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr14), ptr_buff + offset / 8);
-	offset = 960;
-	cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr15), ptr_buff + offset / 8);
+    offset = 0;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
+    offset = 64;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
+    offset = 128;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
+    offset = 192;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
+    offset = 256;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->authentication_start_ptr), ptr_buff + offset / 8);
+    offset = 320;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->authentication_end_ptr), ptr_buff + offset / 8);
+    offset = 384;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->digest_mdk_ptr), ptr_buff + offset / 8);
+    offset = 448;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->digest_recovery_key_ptr), ptr_buff + offset / 8);
+    offset = 512;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr8), ptr_buff + offset / 8);
+    offset = 576;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr9), ptr_buff + offset / 8);
+    offset = 640;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr10), ptr_buff + offset / 8);
+    offset = 704;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr11), ptr_buff + offset / 8);
+    offset = 768;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr12), ptr_buff + offset / 8);
+    offset = 832;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr13), ptr_buff + offset / 8);
+    offset = 896;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr14), ptr_buff + offset / 8);
+    offset = 960;
+    cx6fw_hw_pointer_entry_pack(&(ptr_struct->reserved_ptr15), ptr_buff + offset / 8);
 }
 
-void cx6fw_hw_pointers_unpack(struct cx6fw_hw_pointers *ptr_struct, const u_int8_t *ptr_buff)
+void cx6fw_hw_pointers_unpack(struct cx6fw_hw_pointers* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i = 0;
-	(void)offset;
-	(void)i;
-	(void)ptr_struct;
-	(void)ptr_buff;
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-	offset = 0;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
-	offset = 64;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
-	offset = 128;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
-	offset = 192;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
-	offset = 256;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->authentication_start_ptr), ptr_buff + offset / 8);
-	offset = 320;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->authentication_end_ptr), ptr_buff + offset / 8);
-	offset = 384;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->digest_mdk_ptr), ptr_buff + offset / 8);
-	offset = 448;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->digest_recovery_key_ptr), ptr_buff + offset / 8);
-	offset = 512;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr8), ptr_buff + offset / 8);
-	offset = 576;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr9), ptr_buff + offset / 8);
-	offset = 640;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr10), ptr_buff + offset / 8);
-	offset = 704;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr11), ptr_buff + offset / 8);
-	offset = 768;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr12), ptr_buff + offset / 8);
-	offset = 832;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr13), ptr_buff + offset / 8);
-	offset = 896;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr14), ptr_buff + offset / 8);
-	offset = 960;
-	cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr15), ptr_buff + offset / 8);
+    offset = 0;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
+    offset = 64;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
+    offset = 128;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
+    offset = 192;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
+    offset = 256;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->authentication_start_ptr), ptr_buff + offset / 8);
+    offset = 320;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->authentication_end_ptr), ptr_buff + offset / 8);
+    offset = 384;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->digest_mdk_ptr), ptr_buff + offset / 8);
+    offset = 448;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->digest_recovery_key_ptr), ptr_buff + offset / 8);
+    offset = 512;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr8), ptr_buff + offset / 8);
+    offset = 576;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr9), ptr_buff + offset / 8);
+    offset = 640;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr10), ptr_buff + offset / 8);
+    offset = 704;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr11), ptr_buff + offset / 8);
+    offset = 768;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr12), ptr_buff + offset / 8);
+    offset = 832;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr13), ptr_buff + offset / 8);
+    offset = 896;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr14), ptr_buff + offset / 8);
+    offset = 960;
+    cx6fw_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr15), ptr_buff + offset / 8);
 }
 
-void cx6fw_hw_pointers_print(const struct cx6fw_hw_pointers *ptr_struct, FILE *fd, int indent_level)
+void cx6fw_hw_pointers_print(const struct cx6fw_hw_pointers* ptr_struct, FILE* fd, int indent_level)
 {
-	int i = 0;
-	(void)i;
-	(void)ptr_struct;
-	(void)fd;
-	(void)indent_level;
+    int i = 0;
+    (void)i;
+    (void)ptr_struct;
+    (void)fd;
+    (void)indent_level;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx6fw_hw_pointers ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx6fw_hw_pointers ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_record_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->boot_record_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot2_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->boot2_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "toc_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->toc_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tools_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->tools_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "authentication_start_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->authentication_start_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "authentication_end_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->authentication_end_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "digest_mdk_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->digest_mdk_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "digest_recovery_key_ptr:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->digest_recovery_key_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr8:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr8), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr9:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr9), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr10:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr10), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr11:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr11), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr12:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr12), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr13:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr13), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr14:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr14), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved_ptr15:\n");
-	cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr15), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_record_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->boot_record_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot2_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->boot2_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "toc_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->toc_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tools_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->tools_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "authentication_start_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->authentication_start_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "authentication_end_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->authentication_end_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "digest_mdk_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->digest_mdk_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "digest_recovery_key_ptr:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->digest_recovery_key_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr8:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr8), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr9:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr9), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr10:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr10), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr11:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr11), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr12:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr12), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr13:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr13), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr14:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr14), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved_ptr15:\n");
+    cx6fw_hw_pointer_entry_print(&(ptr_struct->reserved_ptr15), fd, indent_level + 1);
 }
 
 unsigned int cx6fw_hw_pointers_size(void)
 {
-	return CX6FW_HW_POINTERS_SIZE;
+    return CX6FW_HW_POINTERS_SIZE;
 }
 
-void cx6fw_hw_pointers_dump(const struct cx6fw_hw_pointers *ptr_struct, FILE *fd)
+void cx6fw_hw_pointers_dump(const struct cx6fw_hw_pointers* ptr_struct, FILE* fd)
 {
-	cx6fw_hw_pointers_print(ptr_struct, fd, 0);
+    cx6fw_hw_pointers_print(ptr_struct, fd, 0);
 }
 
-void cx6fw_cx6fw_Nodes_pack(const union cx6fw_cx6fw_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void cx6fw_cx6fw_Nodes_pack(const union cx6fw_cx6fw_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
-	cx6fw_hw_pointers_pack(&(ptr_struct->hw_pointers), ptr_buff);
+    cx6fw_hw_pointers_pack(&(ptr_struct->hw_pointers), ptr_buff);
 }
 
-void cx6fw_cx6fw_Nodes_unpack(union cx6fw_cx6fw_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void cx6fw_cx6fw_Nodes_unpack(union cx6fw_cx6fw_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
-	cx6fw_hw_pointers_unpack(&(ptr_struct->hw_pointers), ptr_buff);
+    cx6fw_hw_pointers_unpack(&(ptr_struct->hw_pointers), ptr_buff);
 }
 
-void cx6fw_cx6fw_Nodes_print(const union cx6fw_cx6fw_Nodes *ptr_struct, FILE *fd, int indent_level)
+void cx6fw_cx6fw_Nodes_print(const union cx6fw_cx6fw_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
-	int i = 0;
-	(void)i;
-	(void)ptr_struct;
-	(void)fd;
-	(void)indent_level;
+    int i = 0;
+    (void)i;
+    (void)ptr_struct;
+    (void)fd;
+    (void)indent_level;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== cx6fw_cx6fw_Nodes ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== cx6fw_cx6fw_Nodes ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_pointers:\n");
-	cx6fw_hw_pointers_print(&(ptr_struct->hw_pointers), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_pointers:\n");
+    cx6fw_hw_pointers_print(&(ptr_struct->hw_pointers), fd, indent_level + 1);
 }
 
 unsigned int cx6fw_cx6fw_Nodes_size(void)
 {
-	return CX6FW_CX6FW_NODES_SIZE;
+    return CX6FW_CX6FW_NODES_SIZE;
 }
 
-void cx6fw_cx6fw_Nodes_dump(const union cx6fw_cx6fw_Nodes *ptr_struct, FILE *fd)
+void cx6fw_cx6fw_Nodes_dump(const union cx6fw_cx6fw_Nodes* ptr_struct, FILE* fd)
 {
-	cx6fw_cx6fw_Nodes_print(ptr_struct, fd, 0);
+    cx6fw_cx6fw_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/cx6fw_layouts.h b/tools_layouts/cx6fw_layouts.h
old mode 100755
new mode 100644
index 302ebc30..27c62f04
--- a/tools_layouts/cx6fw_layouts.h
+++ b/tools_layouts/cx6fw_layouts.h
@@ -29,137 +29,138 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2018-08-29 13:02:13"
-         *** by:
-         ***    > /mswg/release/tools/a-me/a-me-1.0.110/adabe_plugins/adb2c/adb2pack.py --input adb/cx6fw/cx6fw.adb --file-prefix cx6fw --prefix cx6fw_
-         ***/
+ *** This file was generated at "2018-08-29 13:02:13"
+ *** by:
+ ***    > /mswg/release/tools/a-me/a-me-1.0.110/adabe_plugins/adb2c/adb2pack.py --input adb/cx6fw/cx6fw.adb
+ *--file-prefix cx6fw --prefix cx6fw_
+ ***/
 #ifndef CX6FW_LAYOUTS_H
 #define CX6FW_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -  HW pointer entry */
-/* Size in bytes - 8 */
-struct cx6fw_hw_pointer_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - pointer */
-	/* 0x0.0 - 0x0.31 */
-	 u_int32_t ptr;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - crc16 as calculated by HW */
-	/* 0x4.0 - 0x4.15 */
-	 u_int16_t crc;
-};
-
-/* Description -  HW pointers */
-/* Size in bytes - 128 */
-struct cx6fw_hw_pointers {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	 struct cx6fw_hw_pointer_entry boot_record_ptr;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	 struct cx6fw_hw_pointer_entry boot2_ptr;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x14.31 */
-	 struct cx6fw_hw_pointer_entry toc_ptr;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x1c.31 */
-	 struct cx6fw_hw_pointer_entry tools_ptr;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x24.31 */
-	 struct cx6fw_hw_pointer_entry authentication_start_ptr;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x2c.31 */
-	 struct cx6fw_hw_pointer_entry authentication_end_ptr;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description -  */
-	/* 0x30.0 - 0x34.31 */
-	 struct cx6fw_hw_pointer_entry digest_mdk_ptr;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description -  */
-	/* 0x38.0 - 0x3c.31 */
-	 struct cx6fw_hw_pointer_entry digest_recovery_key_ptr;
-/*---------------- DWORD[16] (Offset 0x40) ----------------*/
-	/* Description -  */
-	/* 0x40.0 - 0x44.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr8;
-/*---------------- DWORD[18] (Offset 0x48) ----------------*/
-	/* Description -  */
-	/* 0x48.0 - 0x4c.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr9;
-/*---------------- DWORD[20] (Offset 0x50) ----------------*/
-	/* Description -  */
-	/* 0x50.0 - 0x54.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr10;
-/*---------------- DWORD[22] (Offset 0x58) ----------------*/
-	/* Description -  */
-	/* 0x58.0 - 0x5c.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr11;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description -  */
-	/* 0x60.0 - 0x64.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr12;
-/*---------------- DWORD[26] (Offset 0x68) ----------------*/
-	/* Description -  */
-	/* 0x68.0 - 0x6c.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr13;
-/*---------------- DWORD[28] (Offset 0x70) ----------------*/
-	/* Description -  */
-	/* 0x70.0 - 0x74.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr14;
-/*---------------- DWORD[30] (Offset 0x78) ----------------*/
-	/* Description -  */
-	/* 0x78.0 - 0x7c.31 */
-	 struct cx6fw_hw_pointer_entry reserved_ptr15;
-};
-
-/* Description -   */
-/* Size in bytes - 512 */
-union cx6fw_cx6fw_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x7c.31 */
-	 struct cx6fw_hw_pointers hw_pointers;
-};
+    /* Description -  HW pointer entry */
+    /* Size in bytes - 8 */
+    struct cx6fw_hw_pointer_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - pointer */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t ptr;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - crc16 as calculated by HW */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t crc;
+    };
 
+    /* Description -  HW pointers */
+    /* Size in bytes - 128 */
+    struct cx6fw_hw_pointers
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct cx6fw_hw_pointer_entry boot_record_ptr;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        struct cx6fw_hw_pointer_entry boot2_ptr;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x14.31 */
+        struct cx6fw_hw_pointer_entry toc_ptr;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x1c.31 */
+        struct cx6fw_hw_pointer_entry tools_ptr;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x24.31 */
+        struct cx6fw_hw_pointer_entry authentication_start_ptr;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x2c.31 */
+        struct cx6fw_hw_pointer_entry authentication_end_ptr;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description -  */
+        /* 0x30.0 - 0x34.31 */
+        struct cx6fw_hw_pointer_entry digest_mdk_ptr;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.0 - 0x3c.31 */
+        struct cx6fw_hw_pointer_entry digest_recovery_key_ptr;
+        /*---------------- DWORD[16] (Offset 0x40) ----------------*/
+        /* Description -  */
+        /* 0x40.0 - 0x44.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr8;
+        /*---------------- DWORD[18] (Offset 0x48) ----------------*/
+        /* Description -  */
+        /* 0x48.0 - 0x4c.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr9;
+        /*---------------- DWORD[20] (Offset 0x50) ----------------*/
+        /* Description -  */
+        /* 0x50.0 - 0x54.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr10;
+        /*---------------- DWORD[22] (Offset 0x58) ----------------*/
+        /* Description -  */
+        /* 0x58.0 - 0x5c.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr11;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description -  */
+        /* 0x60.0 - 0x64.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr12;
+        /*---------------- DWORD[26] (Offset 0x68) ----------------*/
+        /* Description -  */
+        /* 0x68.0 - 0x6c.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr13;
+        /*---------------- DWORD[28] (Offset 0x70) ----------------*/
+        /* Description -  */
+        /* 0x70.0 - 0x74.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr14;
+        /*---------------- DWORD[30] (Offset 0x78) ----------------*/
+        /* Description -  */
+        /* 0x78.0 - 0x7c.31 */
+        struct cx6fw_hw_pointer_entry reserved_ptr15;
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* hw_pointer_entry */
-void cx6fw_hw_pointer_entry_pack(const struct cx6fw_hw_pointer_entry *ptr_struct, u_int8_t *ptr_buff);
-void cx6fw_hw_pointer_entry_unpack(struct cx6fw_hw_pointer_entry *ptr_struct, const u_int8_t *ptr_buff);
-void cx6fw_hw_pointer_entry_print(const struct cx6fw_hw_pointer_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx6fw_hw_pointer_entry_size(void);
-#define CX6FW_HW_POINTER_ENTRY_SIZE    (0x8)
-void cx6fw_hw_pointer_entry_dump(const struct cx6fw_hw_pointer_entry *ptr_struct, FILE *fd);
-/* hw_pointers */
-void cx6fw_hw_pointers_pack(const struct cx6fw_hw_pointers *ptr_struct, u_int8_t *ptr_buff);
-void cx6fw_hw_pointers_unpack(struct cx6fw_hw_pointers *ptr_struct, const u_int8_t *ptr_buff);
-void cx6fw_hw_pointers_print(const struct cx6fw_hw_pointers *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx6fw_hw_pointers_size(void);
-#define CX6FW_HW_POINTERS_SIZE    (0x80)
-void cx6fw_hw_pointers_dump(const struct cx6fw_hw_pointers *ptr_struct, FILE *fd);
-/* cx6fw_Nodes */
-void cx6fw_cx6fw_Nodes_pack(const union cx6fw_cx6fw_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void cx6fw_cx6fw_Nodes_unpack(union cx6fw_cx6fw_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void cx6fw_cx6fw_Nodes_print(const union cx6fw_cx6fw_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int cx6fw_cx6fw_Nodes_size(void);
-#define CX6FW_CX6FW_NODES_SIZE    (0x200)
-void cx6fw_cx6fw_Nodes_dump(const union cx6fw_cx6fw_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 512 */
+    union cx6fw_cx6fw_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x7c.31 */
+        struct cx6fw_hw_pointers hw_pointers;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* hw_pointer_entry */
+    void cx6fw_hw_pointer_entry_pack(const struct cx6fw_hw_pointer_entry* ptr_struct, u_int8_t* ptr_buff);
+    void cx6fw_hw_pointer_entry_unpack(struct cx6fw_hw_pointer_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void cx6fw_hw_pointer_entry_print(const struct cx6fw_hw_pointer_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx6fw_hw_pointer_entry_size(void);
+#define CX6FW_HW_POINTER_ENTRY_SIZE (0x8)
+    void cx6fw_hw_pointer_entry_dump(const struct cx6fw_hw_pointer_entry* ptr_struct, FILE* fd);
+    /* hw_pointers */
+    void cx6fw_hw_pointers_pack(const struct cx6fw_hw_pointers* ptr_struct, u_int8_t* ptr_buff);
+    void cx6fw_hw_pointers_unpack(struct cx6fw_hw_pointers* ptr_struct, const u_int8_t* ptr_buff);
+    void cx6fw_hw_pointers_print(const struct cx6fw_hw_pointers* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx6fw_hw_pointers_size(void);
+#define CX6FW_HW_POINTERS_SIZE (0x80)
+    void cx6fw_hw_pointers_dump(const struct cx6fw_hw_pointers* ptr_struct, FILE* fd);
+    /* cx6fw_Nodes */
+    void cx6fw_cx6fw_Nodes_pack(const union cx6fw_cx6fw_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void cx6fw_cx6fw_Nodes_unpack(union cx6fw_cx6fw_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void cx6fw_cx6fw_Nodes_print(const union cx6fw_cx6fw_Nodes* ptr_struct, FILE* fd, int indent_level);
+    unsigned int cx6fw_cx6fw_Nodes_size(void);
+#define CX6FW_CX6FW_NODES_SIZE (0x200)
+    void cx6fw_cx6fw_Nodes_dump(const union cx6fw_cx6fw_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/icmd_layouts.c b/tools_layouts/icmd_layouts.c
index 85f03278..e39d1ce0 100644
--- a/tools_layouts/icmd_layouts.c
+++ b/tools_layouts/icmd_layouts.c
@@ -32,8 +32,7 @@
 
 #include "icmd_layouts.h"
 
-
-void connectib_FW_VERSION_pack(const struct connectib_FW_VERSION *ptr_struct, u_int8_t* ptr_buff)
+void connectib_FW_VERSION_pack(const struct connectib_FW_VERSION* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -68,10 +67,9 @@ void connectib_FW_VERSION_pack(const struct connectib_FW_VERSION *ptr_struct, u_
 
     offset = 96;
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
-
 }
 
-void connectib_FW_VERSION_unpack(struct connectib_FW_VERSION *ptr_struct, const u_int8_t* ptr_buff)
+void connectib_FW_VERSION_unpack(struct connectib_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -106,10 +104,9 @@ void connectib_FW_VERSION_unpack(struct connectib_FW_VERSION *ptr_struct, const
 
     offset = 96;
     ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-
 }
 
-void connectib_FW_VERSION_print(const struct connectib_FW_VERSION *ptr_struct, FILE* file, int indent_level)
+void connectib_FW_VERSION_print(const struct connectib_FW_VERSION* ptr_struct, FILE* file, int indent_level)
 {
     adb2c_add_indentation(file, indent_level);
     fprintf(file, "======== connectib_FW_VERSION ========\n");
@@ -145,21 +142,19 @@ void connectib_FW_VERSION_print(const struct connectib_FW_VERSION *ptr_struct, F
 
     adb2c_add_indentation(file, indent_level);
     fprintf(file, "Year                 : " UH_FMT "\n", ptr_struct->Year);
-
 }
 
 int connectib_FW_VERSION_size(void)
 {
-     return 16;
+    return 16;
 }
 
-void connectib_FW_VERSION_dump(const struct connectib_FW_VERSION *ptr_struct, FILE* file)
+void connectib_FW_VERSION_dump(const struct connectib_FW_VERSION* ptr_struct, FILE* file)
 {
     connectib_FW_VERSION_print(ptr_struct, file, 0);
 }
 
-
-void connectib_icmd_get_fw_info_pack(const struct connectib_icmd_get_fw_info *ptr_struct, u_int8_t* ptr_buff)
+void connectib_icmd_get_fw_info_pack(const struct connectib_icmd_get_fw_info* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -169,19 +164,19 @@ void connectib_icmd_get_fw_info_pack(const struct connectib_icmd_get_fw_info *pt
     (void)ptr_buff;
 
     offset = 0;
-    connectib_FW_VERSION_pack(&(ptr_struct->fw_version), ptr_buff + offset/8);
+    connectib_FW_VERSION_pack(&(ptr_struct->fw_version), ptr_buff + offset / 8);
 
     offset = 144;
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hash_signature);
 
-    for (i = 0; i < 16; i++) {
-    offset = adb2c_calc_array_field_address(184, 8, i, 288, 1);
-    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    for (i = 0; i < 16; i++)
+    {
+        offset = adb2c_calc_array_field_address(184, 8, i, 288, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
     }
-
 }
 
-void connectib_icmd_get_fw_info_unpack(struct connectib_icmd_get_fw_info *ptr_struct, const u_int8_t* ptr_buff)
+void connectib_icmd_get_fw_info_unpack(struct connectib_icmd_get_fw_info* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -191,20 +186,21 @@ void connectib_icmd_get_fw_info_unpack(struct connectib_icmd_get_fw_info *ptr_st
     (void)ptr_buff;
 
     offset = 0;
-    connectib_FW_VERSION_unpack(&(ptr_struct->fw_version), ptr_buff + offset/8);
+    connectib_FW_VERSION_unpack(&(ptr_struct->fw_version), ptr_buff + offset / 8);
 
     offset = 144;
     ptr_struct->hash_signature = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 
-    for (i = 0; i < 16; i++) {
-    offset = adb2c_calc_array_field_address(184, 8, i, 288, 1);
-    ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 16; i++)
+    {
+        offset = adb2c_calc_array_field_address(184, 8, i, 288, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
 
     ptr_struct->psid[16] = '\0';
 }
 
-void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info *ptr_struct, FILE* file, int indent_level)
+void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info* ptr_struct, FILE* file, int indent_level)
 {
     adb2c_add_indentation(file, indent_level);
     fprintf(file, "======== connectib_icmd_get_fw_info ========\n");
@@ -226,141 +222,134 @@ void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info *p
 
 int connectib_icmd_get_fw_info_size(void)
 {
-     return 36;
+    return 36;
 }
 
-void connectib_icmd_get_fw_info_dump(const struct connectib_icmd_get_fw_info *ptr_struct, FILE* file)
+void connectib_icmd_get_fw_info_dump(const struct connectib_icmd_get_fw_info* ptr_struct, FILE* file)
 {
     connectib_icmd_get_fw_info_print(ptr_struct, file, 0);
 }
 
-void connectib_itrace_ctrl_pack(const struct connectib_itrace_ctrl *ptr_struct, u_int8_t* ptr_buff)
+void connectib_itrace_ctrl_pack(const struct connectib_itrace_ctrl* ptr_struct, u_int8_t* ptr_buff)
 {
-        u_int32_t offset;
-        int i = 0;
-        (void)offset;
-        (void)i;
-        (void)ptr_struct;
-        (void)ptr_buff;
-
-        offset = 24;
-        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_level);
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-        offset = 0;
-        adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->log_delay);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_level);
 
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->log_delay);
 }
 
-void connectib_itrace_ctrl_unpack(struct connectib_itrace_ctrl *ptr_struct, const u_int8_t* ptr_buff)
+void connectib_itrace_ctrl_unpack(struct connectib_itrace_ctrl* ptr_struct, const u_int8_t* ptr_buff)
 {
-        u_int32_t offset;
-        int i = 0;
-        (void)offset;
-        (void)i;
-        (void)ptr_struct;
-        (void)ptr_buff;
-
-        offset = 24;
-        ptr_struct->log_level = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-        offset = 0;
-        ptr_struct->log_delay = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 24;
+    ptr_struct->log_level = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 
+    offset = 0;
+    ptr_struct->log_delay = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void connectib_itrace_ctrl_print(const struct connectib_itrace_ctrl *ptr_struct, FILE* file, int indent_level)
+void connectib_itrace_ctrl_print(const struct connectib_itrace_ctrl* ptr_struct, FILE* file, int indent_level)
 {
-        adb2c_add_indentation(file, indent_level);
-        fprintf(file, "======== connectib_itrace_ctrl ========\n");
-        int i = 0;
-        (void)i;
-        (void)ptr_struct;
-        (void)file;
-        (void)indent_level;
-
-        adb2c_add_indentation(file, indent_level);
-        fprintf(file, "log_level            : " UH_FMT "\n", ptr_struct->log_level);
+    adb2c_add_indentation(file, indent_level);
+    fprintf(file, "======== connectib_itrace_ctrl ========\n");
+    int i = 0;
+    (void)i;
+    (void)ptr_struct;
+    (void)file;
+    (void)indent_level;
 
-        adb2c_add_indentation(file, indent_level);
-        fprintf(file, "log_delay            : " UH_FMT "\n", ptr_struct->log_delay);
+    adb2c_add_indentation(file, indent_level);
+    fprintf(file, "log_level            : " UH_FMT "\n", ptr_struct->log_level);
 
+    adb2c_add_indentation(file, indent_level);
+    fprintf(file, "log_delay            : " UH_FMT "\n", ptr_struct->log_delay);
 }
 
 int connectib_itrace_ctrl_size(void)
 {
-         return 4;
+    return 4;
 }
 
-void connectib_itrace_ctrl_dump(const struct connectib_itrace_ctrl *ptr_struct, FILE* file)
+void connectib_itrace_ctrl_dump(const struct connectib_itrace_ctrl* ptr_struct, FILE* file)
 {
-        connectib_itrace_ctrl_print(ptr_struct, file, 0);
+    connectib_itrace_ctrl_print(ptr_struct, file, 0);
 }
 
-void connectib_itrace_pack(const struct connectib_itrace *ptr_struct, u_int8_t* ptr_buff)
+void connectib_itrace_pack(const struct connectib_itrace* ptr_struct, u_int8_t* ptr_buff)
 {
-        u_int32_t offset;
-        int i = 0;
-        (void)offset;
-        (void)i;
-        (void)ptr_struct;
-        (void)ptr_buff;
-
-        offset = 0;
-        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->unit_mask);
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-        offset = 32;
-        connectib_itrace_ctrl_pack(&(ptr_struct->ctrl), ptr_buff + offset/8);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->unit_mask);
 
+    offset = 32;
+    connectib_itrace_ctrl_pack(&(ptr_struct->ctrl), ptr_buff + offset / 8);
 }
 
-void connectib_itrace_unpack(struct connectib_itrace *ptr_struct, const u_int8_t* ptr_buff)
+void connectib_itrace_unpack(struct connectib_itrace* ptr_struct, const u_int8_t* ptr_buff)
 {
-        u_int32_t offset;
-        int i = 0;
-        (void)offset;
-        (void)i;
-        (void)ptr_struct;
-        (void)ptr_buff;
-
-        offset = 0;
-        ptr_struct->unit_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-        offset = 32;
-        connectib_itrace_ctrl_unpack(&(ptr_struct->ctrl), ptr_buff + offset/8);
+    offset = 0;
+    ptr_struct->unit_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 
+    offset = 32;
+    connectib_itrace_ctrl_unpack(&(ptr_struct->ctrl), ptr_buff + offset / 8);
 }
 
-void connectib_itrace_print(const struct connectib_itrace *ptr_struct, FILE* file, int indent_level)
+void connectib_itrace_print(const struct connectib_itrace* ptr_struct, FILE* file, int indent_level)
 {
-        adb2c_add_indentation(file, indent_level);
-        fprintf(file, "======== connectib_itrace ========\n");
-        int i = 0;
-        (void)i;
-        (void)ptr_struct;
-        (void)file;
-        (void)indent_level;
-
-        adb2c_add_indentation(file, indent_level);
-        fprintf(file, "unit_mask            : " U32H_FMT "\n", ptr_struct->unit_mask);
+    adb2c_add_indentation(file, indent_level);
+    fprintf(file, "======== connectib_itrace ========\n");
+    int i = 0;
+    (void)i;
+    (void)ptr_struct;
+    (void)file;
+    (void)indent_level;
 
-        adb2c_add_indentation(file, indent_level);
-        fprintf(file, "ctrl:\n");
-        connectib_itrace_ctrl_print(&(ptr_struct->ctrl), file, indent_level + 1);
+    adb2c_add_indentation(file, indent_level);
+    fprintf(file, "unit_mask            : " U32H_FMT "\n", ptr_struct->unit_mask);
 
+    adb2c_add_indentation(file, indent_level);
+    fprintf(file, "ctrl:\n");
+    connectib_itrace_ctrl_print(&(ptr_struct->ctrl), file, indent_level + 1);
 }
 
 int connectib_itrace_size(void)
 {
-         return 16;
+    return 16;
 }
 
-void connectib_itrace_dump(const struct connectib_itrace *ptr_struct, FILE* file)
+void connectib_itrace_dump(const struct connectib_itrace* ptr_struct, FILE* file)
 {
-        connectib_itrace_print(ptr_struct, file, 0);
+    connectib_itrace_print(ptr_struct, file, 0);
 }
 
-
-void connectx4_icmd_mh_sync_pack(const struct connectx4_icmd_mh_sync *ptr_struct, u_int8_t* ptr_buff)
+void connectx4_icmd_mh_sync_pack(const struct connectx4_icmd_mh_sync* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -392,10 +381,9 @@ void connectx4_icmd_mh_sync_pack(const struct connectx4_icmd_mh_sync *ptr_struct
 
     offset = 96;
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->fsm_start_uptime);
-
 }
 
-void connectx4_icmd_mh_sync_unpack(struct connectx4_icmd_mh_sync *ptr_struct, const u_int8_t* ptr_buff)
+void connectx4_icmd_mh_sync_unpack(struct connectx4_icmd_mh_sync* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -427,10 +415,9 @@ void connectx4_icmd_mh_sync_unpack(struct connectx4_icmd_mh_sync *ptr_struct, co
 
     offset = 96;
     ptr_struct->fsm_start_uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-
 }
 
-void connectx4_icmd_mh_sync_print(const struct connectx4_icmd_mh_sync *ptr_struct, FILE* file, int indent_level)
+void connectx4_icmd_mh_sync_print(const struct connectx4_icmd_mh_sync* ptr_struct, FILE* file, int indent_level)
 {
     adb2c_add_indentation(file, indent_level);
     fprintf(file, "======== connectx4_icmd_mh_sync ========\n");
@@ -463,20 +450,20 @@ void connectx4_icmd_mh_sync_print(const struct connectx4_icmd_mh_sync *ptr_struc
 
     adb2c_add_indentation(file, indent_level);
     fprintf(file, "fsm_start_uptime     : " U32H_FMT "\n", ptr_struct->fsm_start_uptime);
-
 }
 
 int connectx4_icmd_mh_sync_size(void)
 {
-     return 16;
+    return 16;
 }
 
-void connectx4_icmd_mh_sync_dump(const struct connectx4_icmd_mh_sync *ptr_struct, FILE* file)
+void connectx4_icmd_mh_sync_dump(const struct connectx4_icmd_mh_sync* ptr_struct, FILE* file)
 {
     connectx4_icmd_mh_sync_print(ptr_struct, file, 0);
 }
 
-void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -522,7 +509,8 @@ void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpga);
 }
 
-void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -568,7 +556,9 @@ void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_gen
     ptr_struct->fpga = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general *ptr_struct, FILE *fd, int indent_level)
+void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_icmd_query_cap_general ========\n");
@@ -588,7 +578,8 @@ void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_ca
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "mh_sync              : " UH_FMT "\n", ptr_struct->mh_sync);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "allow_icmd_access_reg_on_all_registers : " UH_FMT "\n", ptr_struct->allow_icmd_access_reg_on_all_registers);
+    fprintf(fd, "allow_icmd_access_reg_on_all_registers : " UH_FMT "\n",
+            ptr_struct->allow_icmd_access_reg_on_all_registers);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "fw_info_psid         : " UH_FMT "\n", ptr_struct->fw_info_psid);
     adb2c_add_indentation(fd, indent_level);
@@ -617,305 +608,315 @@ void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_ca
 
 unsigned int connectx4_icmd_query_cap_general_size(void)
 {
-        return CONNECTX4_ICMD_QUERY_CAP_GENERAL_SIZE;
+    return CONNECTX4_ICMD_QUERY_CAP_GENERAL_SIZE;
 }
 
-void connectx4_icmd_query_cap_general_dump(const struct connectx4_icmd_query_cap_general *ptr_struct, FILE *fd)
+void connectx4_icmd_query_cap_general_dump(const struct connectx4_icmd_query_cap_general* ptr_struct, FILE* fd)
 {
     connectx4_icmd_query_cap_general_print(ptr_struct, fd, 0);
 }
 
 int connectib_icmd_set_port_sniffer_size(void)
 {
-	 return 16;
+    return 16;
 }
 
-void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_sniffer *ptr_struct, u_int8_t* ptr_buff)
+void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_sniffer* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i = 0;
-	(void)offset;
-	(void)i;
-	(void)ptr_struct;
-	(void)ptr_buff;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->gvmi);
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-	offset = 63;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sx_rx_);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->gvmi);
 
-	offset = 47;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->attach_detach_);
+    offset = 63;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sx_rx_);
 
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port);
+    offset = 47;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->attach_detach_);
 
-	offset = 104;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->sniffer_qpn);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port);
 
+    offset = 104;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->sniffer_qpn);
 }
 
-void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer *ptr_struct, const u_int8_t* ptr_buff)
+void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i = 0;
-	(void)offset;
-	(void)i;
-	(void)ptr_struct;
-	(void)ptr_buff;
-
-	offset = 16;
-	ptr_struct->gvmi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    u_int32_t offset;
+    int i = 0;
+    (void)offset;
+    (void)i;
+    (void)ptr_struct;
+    (void)ptr_buff;
 
-	offset = 63;
-	ptr_struct->sx_rx_ = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->gvmi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 
-	offset = 47;
-	ptr_struct->attach_detach_ = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 63;
+    ptr_struct->sx_rx_ = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 
-	offset = 64;
-	ptr_struct->port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 47;
+    ptr_struct->attach_detach_ = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 
-	offset = 104;
-	ptr_struct->sniffer_qpn = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 64;
+    ptr_struct->port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 
+    offset = 104;
+    ptr_struct->sniffer_qpn = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void connectx4_hw_pointer_entry_unpack(struct connectx4_hw_pointer_entry *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_hw_pointer_entry_unpack(struct connectx4_hw_pointer_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->ptr = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 48;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->ptr = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 48;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void connectx4_hw_pointers_arava_unpack(struct connectx4_hw_pointers_arava *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_hw_pointers_arava_unpack(struct connectx4_hw_pointers_arava* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
-	offset = 64;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
-	offset = 128;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
-	offset = 192;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
-	offset = 256;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->authentication_start_pointer), ptr_buff + offset / 8);
-	offset = 320;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->authentication_end_pointer), ptr_buff + offset / 8);
-	offset = 384;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->digest_pointer), ptr_buff + offset / 8);
-	offset = 448;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->digest_recovery_key_pointer), ptr_buff + offset / 8);
-	offset = 512;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->fw_window_start_pointer), ptr_buff + offset / 8);
-	offset = 576;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->fw_window_end_pointer), ptr_buff + offset / 8);
-	offset = 640;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->hmac_start_pointer), ptr_buff + offset / 8);
-	offset = 704;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->hmac_end_pointer), ptr_buff + offset / 8);
-	offset = 768;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->public_key_pointer), ptr_buff + offset / 8);
-	offset = 832;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr13_pointer), ptr_buff + offset / 8);
-	offset = 896;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr14_pointer), ptr_buff + offset / 8);
-	offset = 960;
-	connectx4_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr15_pointer), ptr_buff + offset / 8);
+    offset = 0;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
+    offset = 64;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
+    offset = 128;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
+    offset = 192;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
+    offset = 256;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->authentication_start_pointer), ptr_buff + offset / 8);
+    offset = 320;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->authentication_end_pointer), ptr_buff + offset / 8);
+    offset = 384;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->digest_pointer), ptr_buff + offset / 8);
+    offset = 448;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->digest_recovery_key_pointer), ptr_buff + offset / 8);
+    offset = 512;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->fw_window_start_pointer), ptr_buff + offset / 8);
+    offset = 576;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->fw_window_end_pointer), ptr_buff + offset / 8);
+    offset = 640;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->hmac_start_pointer), ptr_buff + offset / 8);
+    offset = 704;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->hmac_end_pointer), ptr_buff + offset / 8);
+    offset = 768;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->public_key_pointer), ptr_buff + offset / 8);
+    offset = 832;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr13_pointer), ptr_buff + offset / 8);
+    offset = 896;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr14_pointer), ptr_buff + offset / 8);
+    offset = 960;
+    connectx4_hw_pointer_entry_unpack(&(ptr_struct->reserved_ptr15_pointer), ptr_buff + offset / 8);
 }
 
 unsigned int connectx4_public_keys_3_size(void)
 {
-	return CONNECTX4_PUBLIC_KEYS_3_SIZE;
+    return CONNECTX4_PUBLIC_KEYS_3_SIZE;
 }
 
 unsigned int connectx4_secure_boot_signatures_size(void)
 {
-	return CONNECTX4_SECURE_BOOT_SIGNATURES_SIZE;
+    return CONNECTX4_SECURE_BOOT_SIGNATURES_SIZE;
 }
 
-void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 12288, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->boot_signature[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(4096, 32, i, 12288, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->critical_signature[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(8192, 32, i, 12288, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->non_critical_signature[i]);
-	}
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 12288, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->boot_signature[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(4096, 32, i, 12288, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->critical_signature[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(8192, 32, i, 12288, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->non_critical_signature[i]);
+    }
 }
 
-void connectx4_component_authentication_configuration_pack(const struct connectx4_component_authentication_configuration *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_component_authentication_configuration_pack(
+  const struct connectx4_component_authentication_configuration* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->auth_type);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_en);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mlnx_nvconfig_en);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vendor_nvconfig_en);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_token_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_en);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->auth_type);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_en);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mlnx_nvconfig_en);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vendor_nvconfig_en);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_token_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_en);
 }
 
-void connectx4_file_public_keys_3_pack(const struct connectx4_file_public_keys_3 *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_file_public_keys_3_pack(const struct connectx4_file_public_keys_3* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_exp);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 4352, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(160, 32, i, 4352, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->key[i]);
-	}
-	offset = 4256;
-	connectx4_component_authentication_configuration_pack(&(ptr_struct->component_authentication_configuration), ptr_buff + offset / 8);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_exp);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 4352, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(160, 32, i, 4352, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->key[i]);
+    }
+    offset = 4256;
+    connectx4_component_authentication_configuration_pack(&(ptr_struct->component_authentication_configuration),
+                                                          ptr_buff + offset / 8);
 }
 
-void connectx4_public_keys_3_pack(const struct connectx4_public_keys_3 *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_public_keys_3_pack(const struct connectx4_public_keys_3* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(0, 4352, i, 34816, 1);
-		connectx4_file_public_keys_3_pack(&(ptr_struct->file_public_keys_3[i]), ptr_buff + offset / 8);
-	}
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 4352, i, 34816, 1);
+        connectx4_file_public_keys_3_pack(&(ptr_struct->file_public_keys_3[i]), ptr_buff + offset / 8);
+    }
 }
 
 unsigned int icmd_hca_icmd_query_cap_general_size(void)
 {
-	return ICMD_HCA_ICMD_QUERY_CAP_GENERAL_SIZE;
-}
-
-void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_general *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->golden_tlv_version);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cwcam_reg);
-	offset = 11;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->capability_groups);
-	offset = 9;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->virtual_link_down);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->icmd_exmb);
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->capi);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->qcam_reg);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mcam_reg);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pcam_reg);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mh_sync);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->allow_icmd_access_reg_on_all_registers);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_info_psid);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_access);
-	offset = 63;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_p);
-	offset = 62;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_u);
-	offset = 61;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_m);
-	offset = 60;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_b);
-	offset = 59;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_a);
-	offset = 58;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_g);
-	offset = 57;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_s);
-	offset = 55;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rol_g);
-	offset = 54;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rol_s);
-	offset = 53;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpga);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_diagnostic_counters);
-}
-
-void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 29;
-	ptr_struct->golden_tlv_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 14;
-	ptr_struct->cwcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 11;
-	ptr_struct->capability_groups = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 9;
-	ptr_struct->virtual_link_down = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 8;
-	ptr_struct->icmd_exmb = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 7;
-	ptr_struct->capi = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->qcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->mcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->pcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->mh_sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->allow_icmd_access_reg_on_all_registers = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->fw_info_psid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->nv_access = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 63;
-	ptr_struct->wol_p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 62;
-	ptr_struct->wol_u = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 61;
-	ptr_struct->wol_m = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 60;
-	ptr_struct->wol_b = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 59;
-	ptr_struct->wol_a = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 58;
-	ptr_struct->wol_g = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 57;
-	ptr_struct->wol_s = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 55;
-	ptr_struct->rol_g = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 54;
-	ptr_struct->rol_s = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 53;
-	ptr_struct->fpga = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->num_of_diagnostic_counters = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    return ICMD_HCA_ICMD_QUERY_CAP_GENERAL_SIZE;
+}
+
+void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_general* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->golden_tlv_version);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cwcam_reg);
+    offset = 11;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->capability_groups);
+    offset = 9;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->virtual_link_down);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->icmd_exmb);
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->capi);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->qcam_reg);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mcam_reg);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pcam_reg);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mh_sync);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->allow_icmd_access_reg_on_all_registers);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fw_info_psid);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_access);
+    offset = 63;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_p);
+    offset = 62;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_u);
+    offset = 61;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_m);
+    offset = 60;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_b);
+    offset = 59;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_a);
+    offset = 58;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_g);
+    offset = 57;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wol_s);
+    offset = 55;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rol_g);
+    offset = 54;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rol_s);
+    offset = 53;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpga);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_diagnostic_counters);
+}
+
+void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general* ptr_struct,
+                                            const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 29;
+    ptr_struct->golden_tlv_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 14;
+    ptr_struct->cwcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 11;
+    ptr_struct->capability_groups = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 9;
+    ptr_struct->virtual_link_down = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 8;
+    ptr_struct->icmd_exmb = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 7;
+    ptr_struct->capi = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->qcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->mcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->pcam_reg = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->mh_sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->allow_icmd_access_reg_on_all_registers = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->fw_info_psid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->nv_access = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 63;
+    ptr_struct->wol_p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 62;
+    ptr_struct->wol_u = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 61;
+    ptr_struct->wol_m = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 60;
+    ptr_struct->wol_b = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 59;
+    ptr_struct->wol_a = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 58;
+    ptr_struct->wol_g = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 57;
+    ptr_struct->wol_s = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 55;
+    ptr_struct->rol_g = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 54;
+    ptr_struct->rol_s = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 53;
+    ptr_struct->fpga = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->num_of_diagnostic_counters = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
diff --git a/tools_layouts/icmd_layouts.h b/tools_layouts/icmd_layouts.h
index e05418a6..a97afe2e 100644
--- a/tools_layouts/icmd_layouts.h
+++ b/tools_layouts/icmd_layouts.h
@@ -33,251 +33,252 @@
 #ifndef ICMD_LAYOUTS_H
 #define ICMD_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 16 */
-struct connectib_FW_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.16 - 0x0.31 */
-     u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description -  */
-    /* 0x4.0 - 0x4.15 */
-     u_int16_t SUBMINOR;
-    /* Description -  */
-    /* 0x4.16 - 0x4.31 */
-     u_int16_t MINOR;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description -  */
-    /* 0x8.8 - 0x8.15 */
-     u_int8_t Hour;
-    /* Description -  */
-    /* 0x8.16 - 0x8.23 */
-     u_int8_t Minutes;
-    /* Description -  */
-    /* 0x8.24 - 0x8.31 */
-     u_int8_t Seconds;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-    /* Description -  */
-    /* 0xc.0 - 0xc.7 */
-     u_int8_t Day;
-    /* Description -  */
-    /* 0xc.8 - 0xc.15 */
-     u_int8_t Month;
-    /* Description -  */
-    /* 0xc.16 - 0xc.31 */
-     u_int16_t Year;
-};
-
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct connectib_icmd_set_port_sniffer {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	 u_int16_t gvmi;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.0 */
-	 u_int8_t sx_rx_;
-	/* Description -  */
-	/* 0x4.16 - 0x4.16 */
-	 u_int8_t attach_detach_;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.24 - 0x8.31 */
-	 u_int8_t port;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.23 */
-	 u_int32_t sniffer_qpn;
-};
-
-
-/* Description -   */
-/* Size in bytes - 36 */
-struct connectib_icmd_get_fw_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.0 - 0x10.31 */
-     struct connectib_FW_VERSION fw_version;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-    /* Description - Hash gen file signature */
-    /* 0x10.0 - 0x10.15 */
-     u_int16_t hash_signature;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-    /* Description -  */
-    /* 0x14.24 - 0x24.23 */
-     char psid[17];
-};
-
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct connectx4_icmd_mh_sync {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description - input mailbox: state of sync: IDLE, GET_READY, GO */
-    /* 0x0.0 - 0x0.3 */
-     u_int8_t input_state;
-    /* Description - input mailbox: sync_type - 0x01 = FW_RESET */
-    /* 0x0.8 - 0x0.15 */
-     u_int8_t input_sync_type;
-    /* Description - input mailbox: when set - ignore inactive hosts */
-    /* 0x0.31 - 0x0.31 */
-     u_int8_t input_ignore_inactive_hosts;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description - output mailbox: state of sync: IDLE, GET_READY, GO */
-    /* 0x4.0 - 0x4.3 */
-     u_int8_t fsm_state;
-    /* Description - output mailbox: sync_type - 0x01 = FW_RESET */
-    /* 0x4.8 - 0x4.15 */
-     u_int8_t fsm_sync_type;
-    /* Description - output mailbox: when set - ignore inactive hosts */
-    /* 0x4.31 - 0x4.31 */
-     u_int8_t fsm_ignore_inactive_hosts;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description - output mailbox: bit per host - indicates hosts already issued GET_READY */
-    /* 0x8.0 - 0x8.3 */
-     u_int8_t fsm_host_ready;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-    /* Description - output mailbox: NIC uptime since last reset in microsecondes at the moment of first GET_READY */
-    /* 0xc.0 - 0x10.31 */
-     u_int32_t fsm_start_uptime;
-};
-
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct connectib_FW_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.8 - 0x8.15 */
+        u_int8_t Hour;
+        /* Description -  */
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t Minutes;
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t Seconds;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t Day;
+        /* Description -  */
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t Month;
+        /* Description -  */
+        /* 0xc.16 - 0xc.31 */
+        u_int16_t Year;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct connectx4_icmd_query_cap_general {
-    /*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description - When set, the device supports emulating link down for all the associ
-    ated functions
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct connectib_icmd_set_port_sniffer
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t gvmi;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.0 */
+        u_int8_t sx_rx_;
+        /* Description -  */
+        /* 0x4.16 - 0x4.16 */
+        u_int8_t attach_detach_;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t port;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.23 */
+        u_int32_t sniffer_qpn;
+    };
 
-    using
-    "
-    ICMD_SET_VIRTUAL_
-    PARAMETERS
-    -
-    Set Device
-    Virtual Parameters
-    " */
-    /* 0x0.22 - 0x0.22 */
-    u_int8_t virtual_link_down;
-    /* Description - When set, the device supports using a memory buffer as a mailbox for
-    the ICMD, instead of the normal ICMD Mailbox. */
-    /* 0x0.23 - 0x0.23 */
-    u_int8_t icmd_exmb;
-    /* Description - If set, CAPI is supported. */
-    /* 0x0.24 - 0x0.24 */
-    u_int8_t capi;
-    /* Description - If set, QCAM register is supported.
-    See Table  612, "
-    QCAM - QoS Capa
-    bilities Mask Register Layout
-    ," on page  816
-    . */
-    /* 0x0.25 - 0x0.25 */
-    u_int8_t qcam_reg;
-    /* Description - If set, MCAM register is supported.
-    See Table  1053, "
-    MCAM - Manage
-    ment Capabilities Mask Register Layout
-    ," on page  1180
-    . */
-    /* 0x0.26 - 0x0.26 */
-    u_int8_t mcam_reg;
-    /* Description - If set, PCAM register is supported.
-    See Table  696, "
-    PCAM - Ports Capa
-    bilities Mask Register Layout
-    ," on page  905 */
-    /* 0x0.27 - 0x0.27 */
-    u_int8_t pcam_reg;
-    /* Description - When set, multi-host synchronization through the device is supported.
+    /* Description -   */
+    /* Size in bytes - 36 */
+    struct connectib_icmd_get_fw_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x10.31 */
+        struct connectib_FW_VERSION fw_version;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Hash gen file signature */
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t hash_signature;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.24 - 0x24.23 */
+        char psid[17];
+    };
 
-    See Section  25.4.3, "
-    ICMD_MH_SYNC - Multi-Host Synchronization
-    ," on
-    page  1190
-    . */
-    /* 0x0.28 - 0x0.28 */
-    u_int8_t mh_sync;
-    /* Description - If set, ICMD_ACCESS_REGISTER supports every register. (in the
-    past it supported some of them). */
-    /* 0x0.29 - 0x0.29 */
-    u_int8_t allow_icmd_access_reg_on_all_registers;
-    /* Description - When set, ICMD_QUERY_FW_INFO returns the
-    psid
-    field. */
-    /* 0x0.30 - 0x0.30 */
-    u_int8_t fw_info_psid;
-    /* Description - When set, ICMD_ACCESS_REGISTER supports the following regis
-    ters:
-    NVDA
-    NVDI
-    NVIA
-    NVQC */
-    /* 0x0.31 - 0x0.31 */
-    u_int8_t nv_access;
-    /*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description - If set, wake on phy activity is supported. */
-    /* 0x4.0 - 0x4.0 */
-    u_int8_t wol_p;
-    /* Description - If set, wake on unicast packet is supported. */
-    /* 0x4.1 - 0x4.1 */
-    u_int8_t wol_u;
-    /* Description - If set, wake on multicast packet is supported. */
-    /* 0x4.2 - 0x4.2 */
-    u_int8_t wol_m;
-    /* Description - If set, wake on broadcast packet is supported. */
-    /* 0x4.3 - 0x4.3 */
-    u_int8_t wol_b;
-    /* Description - If set, wake on ARP is supported. */
-    /* 0x4.4 - 0x4.4 */
-    u_int8_t wol_a;
-    /* Description - If set, wake on magic packet is supported. */
-    /* 0x4.5 - 0x4.5 */
-    u_int8_t wol_g;
-    /* Description - If set, wake on secured magic packet is supported. */
-    /* 0x4.6 - 0x4.6 */
-    u_int8_t wol_s;
-    /* Description - If set, reset on magic packet is supported. */
-    /* 0x4.8 - 0x4.8 */
-    u_int8_t rol_g;
-    /* Description - If set, reset on secured magic packet is supported. */
-    /* 0x4.9 - 0x4.9 */
-    u_int8_t rol_s;
-    /* Description - If set, FPGA device is supported by the device. See TBD */
-    /* 0x4.10 - 0x4.10 */
-    u_int8_t fpga;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct connectx4_icmd_mh_sync
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - input mailbox: state of sync: IDLE, GET_READY, GO */
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t input_state;
+        /* Description - input mailbox: sync_type - 0x01 = FW_RESET */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t input_sync_type;
+        /* Description - input mailbox: when set - ignore inactive hosts */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t input_ignore_inactive_hosts;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - output mailbox: state of sync: IDLE, GET_READY, GO */
+        /* 0x4.0 - 0x4.3 */
+        u_int8_t fsm_state;
+        /* Description - output mailbox: sync_type - 0x01 = FW_RESET */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t fsm_sync_type;
+        /* Description - output mailbox: when set - ignore inactive hosts */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t fsm_ignore_inactive_hosts;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - output mailbox: bit per host - indicates hosts already issued GET_READY */
+        /* 0x8.0 - 0x8.3 */
+        u_int8_t fsm_host_ready;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - output mailbox: NIC uptime since last reset in microsecondes at the moment of first GET_READY
+         */
+        /* 0xc.0 - 0x10.31 */
+        u_int32_t fsm_start_uptime;
+    };
 
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct connectx4_icmd_query_cap_general
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - When set, the device supports emulating link down for all the associ
+        ated functions
 
+        using
+        "
+        ICMD_SET_VIRTUAL_
+        PARAMETERS
+        -
+        Set Device
+        Virtual Parameters
+        " */
+        /* 0x0.22 - 0x0.22 */
+        u_int8_t virtual_link_down;
+        /* Description - When set, the device supports using a memory buffer as a mailbox for
+        the ICMD, instead of the normal ICMD Mailbox. */
+        /* 0x0.23 - 0x0.23 */
+        u_int8_t icmd_exmb;
+        /* Description - If set, CAPI is supported. */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t capi;
+        /* Description - If set, QCAM register is supported.
+        See Table  612, "
+        QCAM - QoS Capa
+        bilities Mask Register Layout
+        ," on page  816
+        . */
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t qcam_reg;
+        /* Description - If set, MCAM register is supported.
+        See Table  1053, "
+        MCAM - Manage
+        ment Capabilities Mask Register Layout
+        ," on page  1180
+        . */
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t mcam_reg;
+        /* Description - If set, PCAM register is supported.
+        See Table  696, "
+        PCAM - Ports Capa
+        bilities Mask Register Layout
+        ," on page  905 */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t pcam_reg;
+        /* Description - When set, multi-host synchronization through the device is supported.
 
+        See Section  25.4.3, "
+        ICMD_MH_SYNC - Multi-Host Synchronization
+        ," on
+        page  1190
+        . */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t mh_sync;
+        /* Description - If set, ICMD_ACCESS_REGISTER supports every register. (in the
+        past it supported some of them). */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t allow_icmd_access_reg_on_all_registers;
+        /* Description - When set, ICMD_QUERY_FW_INFO returns the
+        psid
+        field. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t fw_info_psid;
+        /* Description - When set, ICMD_ACCESS_REGISTER supports the following regis
+        ters:
+        NVDA
+        NVDI
+        NVIA
+        NVQC */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t nv_access;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - If set, wake on phy activity is supported. */
+        /* 0x4.0 - 0x4.0 */
+        u_int8_t wol_p;
+        /* Description - If set, wake on unicast packet is supported. */
+        /* 0x4.1 - 0x4.1 */
+        u_int8_t wol_u;
+        /* Description - If set, wake on multicast packet is supported. */
+        /* 0x4.2 - 0x4.2 */
+        u_int8_t wol_m;
+        /* Description - If set, wake on broadcast packet is supported. */
+        /* 0x4.3 - 0x4.3 */
+        u_int8_t wol_b;
+        /* Description - If set, wake on ARP is supported. */
+        /* 0x4.4 - 0x4.4 */
+        u_int8_t wol_a;
+        /* Description - If set, wake on magic packet is supported. */
+        /* 0x4.5 - 0x4.5 */
+        u_int8_t wol_g;
+        /* Description - If set, wake on secured magic packet is supported. */
+        /* 0x4.6 - 0x4.6 */
+        u_int8_t wol_s;
+        /* Description - If set, reset on magic packet is supported. */
+        /* 0x4.8 - 0x4.8 */
+        u_int8_t rol_g;
+        /* Description - If set, reset on secured magic packet is supported. */
+        /* 0x4.9 - 0x4.9 */
+        u_int8_t rol_s;
+        /* Description - If set, FPGA device is supported by the device. See TBD */
+        /* 0x4.10 - 0x4.10 */
+        u_int8_t fpga;
+    };
 
-struct connectib_itrace_ctrl {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
+    struct connectib_itrace_ctrl
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
         /* Description - threashhold of logging to print from:
 0 - LOG_DEBUG
 1 - LOG_INFO
 2 - LOG_WARNING
 3 - LOG_ERROR */
         /* 0x0.0 - 0x0.7 */
-         u_int8_t log_level;
+        u_int8_t log_level;
         /* Description - added delay (usec) to prevent log event lost */
         /* 0x0.16 - 0x0.31 */
-         u_int16_t log_delay;
-};
+        u_int16_t log_delay;
+    };
 
-struct connectib_itrace {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
+    struct connectib_itrace
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
         /* Description - bit numbers:
 0=DEBUG_INIT
 1=INIT
@@ -311,365 +312,390 @@ struct connectib_itrace {
 29=PHY_ETH
 30=VIRT */
         /* 0x0.0 - 0x4.31 */
-         u_int32_t unit_mask;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        u_int32_t unit_mask;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
         /* Description -  */
         /* 0x4.0 - 0x8.31 */
-         struct connectib_itrace_ctrl ctrl;
-};
+        struct connectib_itrace_ctrl ctrl;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct connectx4_component_authentication_configuration {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0-NULL, 1-SHA256Digest, 3-2048 bit RSA */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t auth_type;
-	/* Description - used for authenticating Factory Re-COnfiguration Responses */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t frc_en;
-	/* Description - used for signing NVCONFIG at MLNX level */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t mlnx_nvconfig_en;
-	/* Description - used for authenticating NVCONFIG at OEM level */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t vendor_nvconfig_en;
-	/* Description - used for authenticating CS tokens at OEM level */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t cs_token_en;
-	/* Description - Used for authenticating firmware, DBG_FW, DBG Tokens */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t fw_en;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct connectx4_component_authentication_configuration
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0-NULL, 1-SHA256Digest, 3-2048 bit RSA */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t auth_type;
+        /* Description - used for authenticating Factory Re-COnfiguration Responses */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t frc_en;
+        /* Description - used for signing NVCONFIG at MLNX level */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t mlnx_nvconfig_en;
+        /* Description - used for authenticating NVCONFIG at OEM level */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t vendor_nvconfig_en;
+        /* Description - used for authenticating CS tokens at OEM level */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t cs_token_en;
+        /* Description - Used for authenticating firmware, DBG_FW, DBG Tokens */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t fw_en;
+    };
 
-/* Description -   */
-/* Size in bytes - 544 */
-struct connectx4_file_public_keys_3 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - public key exponent, FW should use an exponent of 65537 */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t keypair_exp;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - UUID of this key created by server when it generates a keypair */
-	/* 0x4.0 - 0x10.31 */
-	u_int32_t keypair_uuid[4];
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - 4096 bit public-key */
-	/* 0x14.0 - 0x210.31 */
-	u_int32_t key[128];
-/*---------------- DWORD[133] (Offset 0x214) ----------------*/
-	/* Description - configuration bits to enable authentication for each component */
-	/* 0x214.0 - 0x214.31 */
-	struct connectx4_component_authentication_configuration component_authentication_configuration;
-};
+    /* Description -   */
+    /* Size in bytes - 544 */
+    struct connectx4_file_public_keys_3
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - public key exponent, FW should use an exponent of 65537 */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t keypair_exp;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - UUID of this key created by server when it generates a keypair */
+        /* 0x4.0 - 0x10.31 */
+        u_int32_t keypair_uuid[4];
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - 4096 bit public-key */
+        /* 0x14.0 - 0x210.31 */
+        u_int32_t key[128];
+        /*---------------- DWORD[133] (Offset 0x214) ----------------*/
+        /* Description - configuration bits to enable authentication for each component */
+        /* 0x214.0 - 0x214.31 */
+        struct connectx4_component_authentication_configuration component_authentication_configuration;
+    };
 
-/* Description -   */
-/* Size in bytes - 4352 */
-struct connectx4_public_keys_3 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x10fc.31 */
-	struct connectx4_file_public_keys_3 file_public_keys_3[8];
-};
+    /* Description -   */
+    /* Size in bytes - 4352 */
+    struct connectx4_public_keys_3
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x10fc.31 */
+        struct connectx4_file_public_keys_3 file_public_keys_3[8];
+    };
 
-/* Description -   */
-/* Size in bytes - 1536 */
-struct connectx4_secure_boot_signatures {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - boot signature of itocs: */
-	/* 0x0.0 - 0x1fc.31 */
-	u_int32_t boot_signature[128];
-/*---------------- DWORD[128] (Offset 0x200) ----------------*/
-	/* Description - fw critical signature of itcos: HW_BOOT_INI, PCIE_PHY_UC_COMMANDS, PCIE_LINK_CODE */
-	/* 0x200.0 - 0x3fc.31 */
-	u_int32_t critical_signature[128];
-/*---------------- DWORD[256] (Offset 0x400) ----------------*/
-	/* Description - fw non critical signatures of all other itocs  */
-	/* 0x400.0 - 0x5fc.31 */
-	u_int32_t non_critical_signature[128];
-};
+    /* Description -   */
+    /* Size in bytes - 1536 */
+    struct connectx4_secure_boot_signatures
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - boot signature of itocs: */
+        /* 0x0.0 - 0x1fc.31 */
+        u_int32_t boot_signature[128];
+        /*---------------- DWORD[128] (Offset 0x200) ----------------*/
+        /* Description - fw critical signature of itcos: HW_BOOT_INI, PCIE_PHY_UC_COMMANDS, PCIE_LINK_CODE */
+        /* 0x200.0 - 0x3fc.31 */
+        u_int32_t critical_signature[128];
+        /*---------------- DWORD[256] (Offset 0x400) ----------------*/
+        /* Description - fw non critical signatures of all other itocs  */
+        /* 0x400.0 - 0x5fc.31 */
+        u_int32_t non_critical_signature[128];
+    };
 
-/* Description -  HW pointer entry */
-/* Size in bytes - 8 */
-struct connectx4_hw_pointer_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description - pointer */
-    /* 0x0.0 - 0x0.31 */
-    u_int32_t ptr;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description - crc16 as calculated by HW */
-    /* 0x4.0 - 0x4.15 */
-    u_int16_t crc;
-};
+    /* Description -  HW pointer entry */
+    /* Size in bytes - 8 */
+    struct connectx4_hw_pointer_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - pointer */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t ptr;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - crc16 as calculated by HW */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t crc;
+    };
 
-/* Description -  HW pointers */
-/* Size in bytes - 128 */
-struct connectx4_hw_pointers_arava {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct connectx4_hw_pointer_entry boot_record_ptr;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	struct connectx4_hw_pointer_entry boot2_ptr;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x14.31 */
-	struct connectx4_hw_pointer_entry toc_ptr;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x1c.31 */
-	struct connectx4_hw_pointer_entry tools_ptr;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x24.31 */
-	struct connectx4_hw_pointer_entry authentication_start_pointer;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x2c.31 */
-	struct connectx4_hw_pointer_entry authentication_end_pointer;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description -  */
-	/* 0x30.0 - 0x34.31 */
-	struct connectx4_hw_pointer_entry digest_pointer;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description -  */
-	/* 0x38.0 - 0x3c.31 */
-	struct connectx4_hw_pointer_entry digest_recovery_key_pointer;
-/*---------------- DWORD[16] (Offset 0x40) ----------------*/
-	/* Description -  */
-	/* 0x40.0 - 0x44.31 */
-	struct connectx4_hw_pointer_entry fw_window_start_pointer;
-/*---------------- DWORD[18] (Offset 0x48) ----------------*/
-	/* Description -  */
-	/* 0x48.0 - 0x4c.31 */
-	struct connectx4_hw_pointer_entry fw_window_end_pointer;
-/*---------------- DWORD[20] (Offset 0x50) ----------------*/
-	/* Description -  */
-	/* 0x50.0 - 0x54.31 */
-	struct connectx4_hw_pointer_entry hmac_start_pointer;
-/*---------------- DWORD[22] (Offset 0x58) ----------------*/
-	/* Description -  */
-	/* 0x58.0 - 0x5c.31 */
-	struct connectx4_hw_pointer_entry hmac_end_pointer;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description -  */
-	/* 0x60.0 - 0x64.31 */
-	struct connectx4_hw_pointer_entry public_key_pointer;
-/*---------------- DWORD[26] (Offset 0x68) ----------------*/
-	/* Description -  */
-	/* 0x68.0 - 0x6c.31 */
-	struct connectx4_hw_pointer_entry reserved_ptr13_pointer;
-/*---------------- DWORD[28] (Offset 0x70) ----------------*/
-	/* Description -  */
-	/* 0x70.0 - 0x74.31 */
-	struct connectx4_hw_pointer_entry reserved_ptr14_pointer;
-/*---------------- DWORD[30] (Offset 0x78) ----------------*/
-	/* Description -  */
-	/* 0x78.0 - 0x7c.31 */
-	struct connectx4_hw_pointer_entry reserved_ptr15_pointer;
-};
+    /* Description -  HW pointers */
+    /* Size in bytes - 128 */
+    struct connectx4_hw_pointers_arava
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct connectx4_hw_pointer_entry boot_record_ptr;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        struct connectx4_hw_pointer_entry boot2_ptr;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x14.31 */
+        struct connectx4_hw_pointer_entry toc_ptr;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x1c.31 */
+        struct connectx4_hw_pointer_entry tools_ptr;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x24.31 */
+        struct connectx4_hw_pointer_entry authentication_start_pointer;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x2c.31 */
+        struct connectx4_hw_pointer_entry authentication_end_pointer;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description -  */
+        /* 0x30.0 - 0x34.31 */
+        struct connectx4_hw_pointer_entry digest_pointer;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.0 - 0x3c.31 */
+        struct connectx4_hw_pointer_entry digest_recovery_key_pointer;
+        /*---------------- DWORD[16] (Offset 0x40) ----------------*/
+        /* Description -  */
+        /* 0x40.0 - 0x44.31 */
+        struct connectx4_hw_pointer_entry fw_window_start_pointer;
+        /*---------------- DWORD[18] (Offset 0x48) ----------------*/
+        /* Description -  */
+        /* 0x48.0 - 0x4c.31 */
+        struct connectx4_hw_pointer_entry fw_window_end_pointer;
+        /*---------------- DWORD[20] (Offset 0x50) ----------------*/
+        /* Description -  */
+        /* 0x50.0 - 0x54.31 */
+        struct connectx4_hw_pointer_entry hmac_start_pointer;
+        /*---------------- DWORD[22] (Offset 0x58) ----------------*/
+        /* Description -  */
+        /* 0x58.0 - 0x5c.31 */
+        struct connectx4_hw_pointer_entry hmac_end_pointer;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description -  */
+        /* 0x60.0 - 0x64.31 */
+        struct connectx4_hw_pointer_entry public_key_pointer;
+        /*---------------- DWORD[26] (Offset 0x68) ----------------*/
+        /* Description -  */
+        /* 0x68.0 - 0x6c.31 */
+        struct connectx4_hw_pointer_entry reserved_ptr13_pointer;
+        /*---------------- DWORD[28] (Offset 0x70) ----------------*/
+        /* Description -  */
+        /* 0x70.0 - 0x74.31 */
+        struct connectx4_hw_pointer_entry reserved_ptr14_pointer;
+        /*---------------- DWORD[30] (Offset 0x78) ----------------*/
+        /* Description -  */
+        /* 0x78.0 - 0x7c.31 */
+        struct connectx4_hw_pointer_entry reserved_ptr15_pointer;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct icmd_hca_icmd_query_cap_general {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Golden TLV version.
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct icmd_hca_icmd_query_cap_general
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Golden TLV version.
  0: Legacy mode
 1: Golden TLV includes TTL */
-	/* 0x0.0 - 0x0.2 */
-	u_int8_t golden_tlv_version;
-	/* Description - If set, CWCAM register is supported. See TBD */
-	/* 0x0.17 - 0x0.17 */
-	u_int8_t cwcam_reg;
-	/* Description - When set, the command supports capability groups in addition to the 
+        /* 0x0.0 - 0x0.2 */
+        u_int8_t golden_tlv_version;
+        /* Description - If set, CWCAM register is supported. See TBD */
+        /* 0x0.17 - 0x0.17 */
+        u_int8_t cwcam_reg;
+        /* Description - When set, the command supports capability groups in addition to the
 General Capability group */
-	/* 0x0.20 - 0x0.20 */
-	u_int8_t capability_groups;
-	/* Description - When set, the device supports emulating link down for all the associ
+        /* 0x0.20 - 0x0.20 */
+        u_int8_t capability_groups;
+        /* Description - When set, the device supports emulating link down for all the associ
 ated functions
- 
-using 
+
+using
 "
 ICMD_SET_VIRTUAL_
 PARAMETERS
- - 
-Set Device 
+ -
+Set Device
 Virtual Parameters
 " */
-	/* 0x0.22 - 0x0.22 */
-	u_int8_t virtual_link_down;
-	/* Description - When set, the device supports using a memory buffer as a mailbox for 
+        /* 0x0.22 - 0x0.22 */
+        u_int8_t virtual_link_down;
+        /* Description - When set, the device supports using a memory buffer as a mailbox for
 the ICMD, instead of the normal ICMD Mailbox. */
-	/* 0x0.23 - 0x0.23 */
-	u_int8_t icmd_exmb;
-	/* Description - If set, CAPI is supported. */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t capi;
-	/* Description - If set, QCAM register is supported. 
+        /* 0x0.23 - 0x0.23 */
+        u_int8_t icmd_exmb;
+        /* Description - If set, CAPI is supported. */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t capi;
+        /* Description - If set, QCAM register is supported.
  See Table  612, "
 QCAM - QoS Capa
 bilities Mask Register Layout
 ," on page  816
 . */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t qcam_reg;
-	/* Description - If set, MCAM register is supported. 
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t qcam_reg;
+        /* Description - If set, MCAM register is supported.
  See Table  1053, "
 MCAM - Manage
 ment Capabilities Mask Register Layout
 ," on page  1180
 . */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t mcam_reg;
-	/* Description - If set, PCAM register is supported. 
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t mcam_reg;
+        /* Description - If set, PCAM register is supported.
  See Table  696, "
 PCAM - Ports Capa
 bilities Mask Register Layout
 ," on page  905 */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t pcam_reg;
-	/* Description - When set, multi-host synchronization through the device is supported. 
- 
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t pcam_reg;
+        /* Description - When set, multi-host synchronization through the device is supported.
+
 See Section  25.4.3, "
 ICMD_MH_SYNC - Multi-Host Synchronization
-," on 
+," on
 page  1190
 . */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t mh_sync;
-	/* Description - If set, ICMD_ACCESS_REGISTER supports every register. (in the 
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t mh_sync;
+        /* Description - If set, ICMD_ACCESS_REGISTER supports every register. (in the
 past it supported some of them). */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t allow_icmd_access_reg_on_all_registers;
-	/* Description - When set, ICMD_QUERY_FW_INFO returns the 
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t allow_icmd_access_reg_on_all_registers;
+        /* Description - When set, ICMD_QUERY_FW_INFO returns the
 psid
  field. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t fw_info_psid;
-	/* Description - When set, ICMD_ACCESS_REGISTER supports the following regis
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t fw_info_psid;
+        /* Description - When set, ICMD_ACCESS_REGISTER supports the following regis
 ters:
 NVDA
 NVDI
 NVIA
 NVQC */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t nv_access;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - If set, wake on phy activity is supported. */
-	/* 0x4.0 - 0x4.0 */
-	u_int8_t wol_p;
-	/* Description - If set, wake on unicast packet is supported. */
-	/* 0x4.1 - 0x4.1 */
-	u_int8_t wol_u;
-	/* Description - If set, wake on multicast packet is supported. */
-	/* 0x4.2 - 0x4.2 */
-	u_int8_t wol_m;
-	/* Description - If set, wake on broadcast packet is supported. */
-	/* 0x4.3 - 0x4.3 */
-	u_int8_t wol_b;
-	/* Description - If set, wake on ARP is supported. */
-	/* 0x4.4 - 0x4.4 */
-	u_int8_t wol_a;
-	/* Description - If set, wake on magic packet is supported. */
-	/* 0x4.5 - 0x4.5 */
-	u_int8_t wol_g;
-	/* Description - If set, wake on secured magic packet is supported. */
-	/* 0x4.6 - 0x4.6 */
-	u_int8_t wol_s;
-	/* Description - If set, reset on magic packet is supported. */
-	/* 0x4.8 - 0x4.8 */
-	u_int8_t rol_g;
-	/* Description - If set, reset on secured magic packet is supported. */
-	/* 0x4.9 - 0x4.9 */
-	u_int8_t rol_s;
-	/* Description - If set, FPGA device is supported by the device. See TBD */
-	/* 0x4.10 - 0x4.10 */
-	u_int8_t fpga;
-	/* Description - Indicate number of */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t num_of_diagnostic_counters;
-};
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t nv_access;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - If set, wake on phy activity is supported. */
+        /* 0x4.0 - 0x4.0 */
+        u_int8_t wol_p;
+        /* Description - If set, wake on unicast packet is supported. */
+        /* 0x4.1 - 0x4.1 */
+        u_int8_t wol_u;
+        /* Description - If set, wake on multicast packet is supported. */
+        /* 0x4.2 - 0x4.2 */
+        u_int8_t wol_m;
+        /* Description - If set, wake on broadcast packet is supported. */
+        /* 0x4.3 - 0x4.3 */
+        u_int8_t wol_b;
+        /* Description - If set, wake on ARP is supported. */
+        /* 0x4.4 - 0x4.4 */
+        u_int8_t wol_a;
+        /* Description - If set, wake on magic packet is supported. */
+        /* 0x4.5 - 0x4.5 */
+        u_int8_t wol_g;
+        /* Description - If set, wake on secured magic packet is supported. */
+        /* 0x4.6 - 0x4.6 */
+        u_int8_t wol_s;
+        /* Description - If set, reset on magic packet is supported. */
+        /* 0x4.8 - 0x4.8 */
+        u_int8_t rol_g;
+        /* Description - If set, reset on secured magic packet is supported. */
+        /* 0x4.9 - 0x4.9 */
+        u_int8_t rol_s;
+        /* Description - If set, FPGA device is supported by the device. See TBD */
+        /* 0x4.10 - 0x4.10 */
+        u_int8_t fpga;
+        /* Description - Indicate number of */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t num_of_diagnostic_counters;
+    };
 
-/* FW_VERSION */
-void connectib_FW_VERSION_pack(const struct connectib_FW_VERSION *ptr_struct, u_int8_t* ptr_buff);
-void connectib_FW_VERSION_unpack(struct connectib_FW_VERSION *ptr_struct, const u_int8_t* ptr_buff);
-void connectib_FW_VERSION_print(const struct connectib_FW_VERSION *ptr_struct, FILE* file, int indent_level);
-int connectib_FW_VERSION_size(void);
-#define CONNECTIB_FW_VERSION_SIZE    (0x10)
-void connectib_FW_VERSION_dump(const struct connectib_FW_VERSION *ptr_struct, FILE* file);
-/* icmd_get_fw_info */
-void connectib_icmd_get_fw_info_pack(const struct connectib_icmd_get_fw_info *ptr_struct, u_int8_t* ptr_buff);
-void connectib_icmd_get_fw_info_unpack(struct connectib_icmd_get_fw_info *ptr_struct, const u_int8_t* ptr_buff);
-void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info *ptr_struct, FILE* file, int indent_level);
-int connectib_icmd_get_fw_info_size(void);
-#define CONNECTIB_ICMD_GET_FW_INFO_SIZE    (0x24)
-void connectib_icmd_get_fw_info_dump(const struct connectib_icmd_get_fw_info *ptr_struct, FILE* file);
-/* itrace */
-void connectib_itrace_pack(const struct connectib_itrace *ptr_struct, u_int8_t* ptr_buff);
-void connectib_itrace_unpack(struct connectib_itrace *ptr_struct, const u_int8_t* ptr_buff);
-void connectib_itrace_print(const struct connectib_itrace *ptr_struct, FILE* file, int indent_level);
-int connectib_itrace_size(void);
-#define CONNECTIB_ITRACE_SIZE    (0x10)
-void connectib_itrace_dump(const struct connectib_itrace *ptr_struct, FILE* file);
-/* itrace_ctrl */
-void connectib_itrace_ctrl_pack(const struct connectib_itrace_ctrl *ptr_struct, u_int8_t* ptr_buff);
-void connectib_itrace_ctrl_unpack(struct connectib_itrace_ctrl *ptr_struct, const u_int8_t* ptr_buff);
-void connectib_itrace_ctrl_print(const struct connectib_itrace_ctrl *ptr_struct, FILE* file, int indent_level);
-int connectib_itrace_ctrl_size(void);
-#define CONNECTIB_ITRACE_CTRL_SIZE    (0x4)
-void connectib_itrace_ctrl_dump(const struct connectib_itrace_ctrl *ptr_struct, FILE* file);
-/* icmd_mh_sync */
-void connectx4_icmd_mh_sync_pack(const struct connectx4_icmd_mh_sync *ptr_struct, u_int8_t* ptr_buff);
-void connectx4_icmd_mh_sync_unpack(struct connectx4_icmd_mh_sync *ptr_struct, const u_int8_t* ptr_buff);
-void connectx4_icmd_mh_sync_print(const struct connectx4_icmd_mh_sync *ptr_struct, FILE* file, int indent_level);
-int connectx4_icmd_mh_sync_size(void);
-#define CONNECTX4_ICMD_MH_SYNC_SIZE    (0x10)
-void connectx4_icmd_mh_sync_dump(const struct connectx4_icmd_mh_sync *ptr_struct, FILE* file);
-/* icmd_query_cap_general */
-void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_icmd_query_cap_general_size(void);
-int connectib_icmd_set_port_sniffer_size(void);
-void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer *ptr_struct, const u_int8_t* ptr_buff);
-void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_sniffer *ptr_struct, u_int8_t* ptr_buff);
-#define CONNECTX4_ICMD_QUERY_CAP_GENERAL_SIZE    (0x8)
-void connectx4_icmd_query_cap_general_dump(const struct connectx4_icmd_query_cap_general *ptr_struct, FILE *fd);
+    /* FW_VERSION */
+    void connectib_FW_VERSION_pack(const struct connectib_FW_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void connectib_FW_VERSION_unpack(struct connectib_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void connectib_FW_VERSION_print(const struct connectib_FW_VERSION* ptr_struct, FILE* file, int indent_level);
+    int connectib_FW_VERSION_size(void);
+#define CONNECTIB_FW_VERSION_SIZE (0x10)
+    void connectib_FW_VERSION_dump(const struct connectib_FW_VERSION* ptr_struct, FILE* file);
+    /* icmd_get_fw_info */
+    void connectib_icmd_get_fw_info_pack(const struct connectib_icmd_get_fw_info* ptr_struct, u_int8_t* ptr_buff);
+    void connectib_icmd_get_fw_info_unpack(struct connectib_icmd_get_fw_info* ptr_struct, const u_int8_t* ptr_buff);
+    void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info* ptr_struct,
+                                          FILE* file,
+                                          int indent_level);
+    int connectib_icmd_get_fw_info_size(void);
+#define CONNECTIB_ICMD_GET_FW_INFO_SIZE (0x24)
+    void connectib_icmd_get_fw_info_dump(const struct connectib_icmd_get_fw_info* ptr_struct, FILE* file);
+    /* itrace */
+    void connectib_itrace_pack(const struct connectib_itrace* ptr_struct, u_int8_t* ptr_buff);
+    void connectib_itrace_unpack(struct connectib_itrace* ptr_struct, const u_int8_t* ptr_buff);
+    void connectib_itrace_print(const struct connectib_itrace* ptr_struct, FILE* file, int indent_level);
+    int connectib_itrace_size(void);
+#define CONNECTIB_ITRACE_SIZE (0x10)
+    void connectib_itrace_dump(const struct connectib_itrace* ptr_struct, FILE* file);
+    /* itrace_ctrl */
+    void connectib_itrace_ctrl_pack(const struct connectib_itrace_ctrl* ptr_struct, u_int8_t* ptr_buff);
+    void connectib_itrace_ctrl_unpack(struct connectib_itrace_ctrl* ptr_struct, const u_int8_t* ptr_buff);
+    void connectib_itrace_ctrl_print(const struct connectib_itrace_ctrl* ptr_struct, FILE* file, int indent_level);
+    int connectib_itrace_ctrl_size(void);
+#define CONNECTIB_ITRACE_CTRL_SIZE (0x4)
+    void connectib_itrace_ctrl_dump(const struct connectib_itrace_ctrl* ptr_struct, FILE* file);
+    /* icmd_mh_sync */
+    void connectx4_icmd_mh_sync_pack(const struct connectx4_icmd_mh_sync* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_icmd_mh_sync_unpack(struct connectx4_icmd_mh_sync* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_icmd_mh_sync_print(const struct connectx4_icmd_mh_sync* ptr_struct, FILE* file, int indent_level);
+    int connectx4_icmd_mh_sync_size(void);
+#define CONNECTX4_ICMD_MH_SYNC_SIZE (0x10)
+    void connectx4_icmd_mh_sync_dump(const struct connectx4_icmd_mh_sync* ptr_struct, FILE* file);
+    /* icmd_query_cap_general */
+    void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int connectx4_icmd_query_cap_general_size(void);
+    int connectib_icmd_set_port_sniffer_size(void);
+    void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_sniffer* ptr_struct,
+                                              u_int8_t* ptr_buff);
+#define CONNECTX4_ICMD_QUERY_CAP_GENERAL_SIZE (0x8)
+    void connectx4_icmd_query_cap_general_dump(const struct connectx4_icmd_query_cap_general* ptr_struct, FILE* fd);
 
-void connectx4_public_keys_3_pack(const struct connectx4_public_keys_3 *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_public_keys_3_unpack(struct connectx4_public_keys_3 *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_public_keys_3_print(const struct connectx4_public_keys_3 *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_public_keys_3_size(void);
-#define CONNECTX4_PUBLIC_KEYS_3_SIZE    (0x1100)
-void connectx4_public_keys_3_dump(const struct connectx4_public_keys_3 *ptr_struct, FILE *fd);
-/* secure_boot_signatures */
-void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_secure_boot_signatures_unpack(struct connectx4_secure_boot_signatures *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_secure_boot_signatures_print(const struct connectx4_secure_boot_signatures *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_secure_boot_signatures_size(void);
-#define CONNECTX4_SECURE_BOOT_SIGNATURES_SIZE    (0x600)
-void connectx4_secure_boot_signatures_dump(const struct connectx4_secure_boot_signatures *ptr_struct, FILE *fd);
-/* file_public_keys_3 */
-void connectx4_file_public_keys_3_pack(const struct connectx4_file_public_keys_3 *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_file_public_keys_3_unpack(struct connectx4_file_public_keys_3 *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_file_public_keys_3_print(const struct connectx4_file_public_keys_3 *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_file_public_keys_3_size(void);
-#define CONNECTX4_FILE_PUBLIC_KEYS_3_SIZE    (0x220)
-void connectx4_file_public_keys_3_dump(const struct connectx4_file_public_keys_3 *ptr_struct, FILE *fd);
-void connectx4_hw_pointers_arava_pack(const struct connectx4_hw_pointers_arava *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_hw_pointers_arava_unpack(struct connectx4_hw_pointers_arava *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_hw_pointers_arava_print(const struct connectx4_hw_pointers_arava *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_hw_pointers_arava_size(void);
-#define CONNECTX4_HW_POINTERS_ARAVA_SIZE    (0x80)
-void connectx4_hw_pointers_arava_dump(const struct connectx4_hw_pointers_arava *ptr_struct, FILE *fd);
-unsigned int icmd_hca_icmd_query_cap_general_size(void);
-#define ICMD_HCA_ICMD_QUERY_CAP_GENERAL_SIZE    (0x8)
-void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_general *ptr_struct, u_int8_t *ptr_buff);
-void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general *ptr_struct, const u_int8_t *ptr_buff);
+    void connectx4_public_keys_3_pack(const struct connectx4_public_keys_3* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_public_keys_3_unpack(struct connectx4_public_keys_3* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_public_keys_3_print(const struct connectx4_public_keys_3* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_public_keys_3_size(void);
+#define CONNECTX4_PUBLIC_KEYS_3_SIZE (0x1100)
+    void connectx4_public_keys_3_dump(const struct connectx4_public_keys_3* ptr_struct, FILE* fd);
+    /* secure_boot_signatures */
+    void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void connectx4_secure_boot_signatures_unpack(struct connectx4_secure_boot_signatures* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void connectx4_secure_boot_signatures_print(const struct connectx4_secure_boot_signatures* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int connectx4_secure_boot_signatures_size(void);
+#define CONNECTX4_SECURE_BOOT_SIGNATURES_SIZE (0x600)
+    void connectx4_secure_boot_signatures_dump(const struct connectx4_secure_boot_signatures* ptr_struct, FILE* fd);
+    /* file_public_keys_3 */
+    void connectx4_file_public_keys_3_pack(const struct connectx4_file_public_keys_3* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_file_public_keys_3_unpack(struct connectx4_file_public_keys_3* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_file_public_keys_3_print(const struct connectx4_file_public_keys_3* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int connectx4_file_public_keys_3_size(void);
+#define CONNECTX4_FILE_PUBLIC_KEYS_3_SIZE (0x220)
+    void connectx4_file_public_keys_3_dump(const struct connectx4_file_public_keys_3* ptr_struct, FILE* fd);
+    void connectx4_hw_pointers_arava_pack(const struct connectx4_hw_pointers_arava* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_hw_pointers_arava_unpack(struct connectx4_hw_pointers_arava* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_hw_pointers_arava_print(const struct connectx4_hw_pointers_arava* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int connectx4_hw_pointers_arava_size(void);
+#define CONNECTX4_HW_POINTERS_ARAVA_SIZE (0x80)
+    void connectx4_hw_pointers_arava_dump(const struct connectx4_hw_pointers_arava* ptr_struct, FILE* fd);
+    unsigned int icmd_hca_icmd_query_cap_general_size(void);
+#define ICMD_HCA_ICMD_QUERY_CAP_GENERAL_SIZE (0x8)
+    void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_general* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general* ptr_struct,
+                                                const u_int8_t* ptr_buff);
 
-#define CONNECTX5_NV_DATA_SIZE    (0x10000)
+#define CONNECTX5_NV_DATA_SIZE (0x10000)
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/image_info_layouts.c b/tools_layouts/image_info_layouts.c
index 0df29ed9..6219d08e 100644
--- a/tools_layouts/image_info_layouts.c
+++ b/tools_layouts/image_info_layouts.c
@@ -29,17 +29,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2018-06-25 13:22:56"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/connectx4/connectx4.adb --file-prefix connectx4 --prefix connectx4_
-         ***/
+ *** This file was generated at "2018-06-25 13:22:56"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/connectx4/connectx4.adb
+ *--file-prefix connectx4 --prefix connectx4_
+ ***/
 #include "image_info_layouts.h"
 
-
-void connectx4_FW_VERSION_pack(const struct connectx4_FW_VERSION *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_FW_VERSION_pack(const struct connectx4_FW_VERSION* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -63,7 +62,7 @@ void connectx4_FW_VERSION_pack(const struct connectx4_FW_VERSION *ptr_struct, u_
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
 }
 
-void connectx4_FW_VERSION_unpack(struct connectx4_FW_VERSION *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_FW_VERSION_unpack(struct connectx4_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -87,7 +86,7 @@ void connectx4_FW_VERSION_unpack(struct connectx4_FW_VERSION *ptr_struct, const
     ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void connectx4_FW_VERSION_print(const struct connectx4_FW_VERSION *ptr_struct, FILE *fd, int indent_level)
+void connectx4_FW_VERSION_print(const struct connectx4_FW_VERSION* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_FW_VERSION ========\n");
@@ -117,12 +116,12 @@ unsigned int connectx4_FW_VERSION_size(void)
     return CONNECTX4_FW_VERSION_SIZE;
 }
 
-void connectx4_FW_VERSION_dump(const struct connectx4_FW_VERSION *ptr_struct, FILE *fd)
+void connectx4_FW_VERSION_dump(const struct connectx4_FW_VERSION* ptr_struct, FILE* fd)
 {
     connectx4_FW_VERSION_print(ptr_struct, fd, 0);
 }
 
-void connectx4_module_version_pack(const struct connectx4_module_version *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_module_version_pack(const struct connectx4_module_version* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -134,7 +133,7 @@ void connectx4_module_version_pack(const struct connectx4_module_version *ptr_st
     adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->major);
 }
 
-void connectx4_module_version_unpack(struct connectx4_module_version *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_module_version_unpack(struct connectx4_module_version* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -146,7 +145,7 @@ void connectx4_module_version_unpack(struct connectx4_module_version *ptr_struct
     ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
 }
 
-void connectx4_module_version_print(const struct connectx4_module_version *ptr_struct, FILE *fd, int indent_level)
+void connectx4_module_version_print(const struct connectx4_module_version* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_module_version ========\n");
@@ -164,12 +163,12 @@ unsigned int connectx4_module_version_size(void)
     return CONNECTX4_MODULE_VERSION_SIZE;
 }
 
-void connectx4_module_version_dump(const struct connectx4_module_version *ptr_struct, FILE *fd)
+void connectx4_module_version_dump(const struct connectx4_module_version* ptr_struct, FILE* fd)
 {
     connectx4_module_version_print(ptr_struct, fd, 0);
 }
 
-void connectx4_TRIPPLE_VERSION_pack(const struct connectx4_TRIPPLE_VERSION *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_TRIPPLE_VERSION_pack(const struct connectx4_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -181,7 +180,7 @@ void connectx4_TRIPPLE_VERSION_pack(const struct connectx4_TRIPPLE_VERSION *ptr_
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
 }
 
-void connectx4_TRIPPLE_VERSION_unpack(struct connectx4_TRIPPLE_VERSION *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_TRIPPLE_VERSION_unpack(struct connectx4_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -193,7 +192,7 @@ void connectx4_TRIPPLE_VERSION_unpack(struct connectx4_TRIPPLE_VERSION *ptr_stru
     ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void connectx4_TRIPPLE_VERSION_print(const struct connectx4_TRIPPLE_VERSION *ptr_struct, FILE *fd, int indent_level)
+void connectx4_TRIPPLE_VERSION_print(const struct connectx4_TRIPPLE_VERSION* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_TRIPPLE_VERSION ========\n");
@@ -211,12 +210,12 @@ unsigned int connectx4_TRIPPLE_VERSION_size(void)
     return CONNECTX4_TRIPPLE_VERSION_SIZE;
 }
 
-void connectx4_TRIPPLE_VERSION_dump(const struct connectx4_TRIPPLE_VERSION *ptr_struct, FILE *fd)
+void connectx4_TRIPPLE_VERSION_dump(const struct connectx4_TRIPPLE_VERSION* ptr_struct, FILE* fd)
 {
     connectx4_TRIPPLE_VERSION_print(ptr_struct, fd, 0);
 }
 
-void connectx4_image_size_pack(const struct connectx4_image_size *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_image_size_pack(const struct connectx4_image_size* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -228,7 +227,7 @@ void connectx4_image_size_pack(const struct connectx4_image_size *ptr_struct, u_
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_size);
 }
 
-void connectx4_image_size_unpack(struct connectx4_image_size *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_image_size_unpack(struct connectx4_image_size* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -240,7 +239,7 @@ void connectx4_image_size_unpack(struct connectx4_image_size *ptr_struct, const
     ptr_struct->max_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void connectx4_image_size_print(const struct connectx4_image_size *ptr_struct, FILE *fd, int indent_level)
+void connectx4_image_size_print(const struct connectx4_image_size* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_image_size ========\n");
@@ -258,12 +257,12 @@ unsigned int connectx4_image_size_size(void)
     return CONNECTX4_IMAGE_SIZE_SIZE;
 }
 
-void connectx4_image_size_dump(const struct connectx4_image_size *ptr_struct, FILE *fd)
+void connectx4_image_size_dump(const struct connectx4_image_size* ptr_struct, FILE* fd)
 {
     connectx4_image_size_print(ptr_struct, fd, 0);
 }
 
-void connectx4_module_versions_pack(const struct connectx4_module_versions *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_module_versions_pack(const struct connectx4_module_versions* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -281,7 +280,7 @@ void connectx4_module_versions_pack(const struct connectx4_module_versions *ptr_
     connectx4_module_version_pack(&(ptr_struct->mad), ptr_buff + offset / 8);
 }
 
-void connectx4_module_versions_unpack(struct connectx4_module_versions *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_module_versions_unpack(struct connectx4_module_versions* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -299,7 +298,7 @@ void connectx4_module_versions_unpack(struct connectx4_module_versions *ptr_stru
     connectx4_module_version_unpack(&(ptr_struct->mad), ptr_buff + offset / 8);
 }
 
-void connectx4_module_versions_print(const struct connectx4_module_versions *ptr_struct, FILE *fd, int indent_level)
+void connectx4_module_versions_print(const struct connectx4_module_versions* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_module_versions ========\n");
@@ -329,12 +328,12 @@ unsigned int connectx4_module_versions_size(void)
     return CONNECTX4_MODULE_VERSIONS_SIZE;
 }
 
-void connectx4_module_versions_dump(const struct connectx4_module_versions *ptr_struct, FILE *fd)
+void connectx4_module_versions_dump(const struct connectx4_module_versions* ptr_struct, FILE* fd)
 {
     connectx4_module_versions_print(ptr_struct, fd, 0);
 }
 
-void connectx4_image_info_pack(const struct connectx4_image_info *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_image_info_pack(const struct connectx4_image_info* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -375,45 +374,52 @@ void connectx4_image_info_pack(const struct connectx4_image_info *ptr_struct, u_
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_sub_vendor_id);
     offset = 256;
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_subsystem_id);
-    for (i = 0; i < 16; ++i) {
+    for (i = 0; i < 16; ++i)
+    {
         offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
         adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
     }
     offset = 432;
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
-    for (i = 0; i < 208; ++i) {
+    for (i = 0; i < 208; ++i)
+    {
         offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
         adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
     }
     offset = 2112;
     connectx4_image_size_pack(&(ptr_struct->image_size), ptr_buff + offset / 8);
-    for (i = 0; i < 4; ++i) {
+    for (i = 0; i < 4; ++i)
+    {
         offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
         adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_hw_id[i]);
     }
     offset = 2368;
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_num);
-    for (i = 0; i < 16; ++i) {
+    for (i = 0; i < 16; ++i)
+    {
         offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
         adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prod_ver[i]);
     }
-    for (i = 0; i < 256; ++i) {
+    for (i = 0; i < 256; ++i)
+    {
         offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
         adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
     }
     offset = 6144;
     connectx4_module_versions_pack(&(ptr_struct->module_versions), ptr_buff + offset / 8);
-    for (i = 0; i < 64; ++i) {
+    for (i = 0; i < 64; ++i)
+    {
         offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
         adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
     }
-    for (i = 0; i < 128; ++i) {
+    for (i = 0; i < 128; ++i)
+    {
         offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
         adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
     }
 }
 
-void connectx4_image_info_unpack(struct connectx4_image_info *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_image_info_unpack(struct connectx4_image_info* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -454,51 +460,58 @@ void connectx4_image_info_unpack(struct connectx4_image_info *ptr_struct, const
     ptr_struct->pci_sub_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
     offset = 256;
     ptr_struct->pci_subsystem_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-    for (i = 0; i < 16; ++i) {
+    for (i = 0; i < 16; ++i)
+    {
         offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
         ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
-        ptr_struct->psid[16] = '\0';
+    ptr_struct->psid[16] = '\0';
     offset = 432;
     ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-    for (i = 0; i < 208; ++i) {
+    for (i = 0; i < 208; ++i)
+    {
         offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
         ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
-        ptr_struct->vsd[208] = '\0';
+    ptr_struct->vsd[208] = '\0';
     offset = 2112;
     connectx4_image_size_unpack(&(ptr_struct->image_size), ptr_buff + offset / 8);
-    for (i = 0; i < 4; ++i) {
+    for (i = 0; i < 4; ++i)
+    {
         offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
         ptr_struct->supported_hw_id[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
     }
     offset = 2368;
     ptr_struct->ini_file_num = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-    for (i = 0; i < 16; ++i) {
+    for (i = 0; i < 16; ++i)
+    {
         offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
         ptr_struct->prod_ver[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
-        ptr_struct->prod_ver[16] = '\0';
-    for (i = 0; i < 256; ++i) {
+    ptr_struct->prod_ver[16] = '\0';
+    for (i = 0; i < 256; ++i)
+    {
         offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
         ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
-        ptr_struct->description[256] = '\0';
+    ptr_struct->description[256] = '\0';
     offset = 6144;
     connectx4_module_versions_unpack(&(ptr_struct->module_versions), ptr_buff + offset / 8);
-    for (i = 0; i < 64; ++i) {
+    for (i = 0; i < 64; ++i)
+    {
         offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
         ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
-        ptr_struct->name[64] = '\0';
-    for (i = 0; i < 128; ++i) {
+    ptr_struct->name[64] = '\0';
+    for (i = 0; i < 128; ++i)
+    {
         offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
         ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     }
-        ptr_struct->prs_name[128] = '\0';
+    ptr_struct->prs_name[128] = '\0';
 }
 
-void connectx4_image_info_print(const struct connectx4_image_info *ptr_struct, FILE *fd, int indent_level)
+void connectx4_image_info_print(const struct connectx4_image_info* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -543,26 +556,27 @@ void connectx4_image_info_print(const struct connectx4_image_info *ptr_struct, F
     fprintf(fd, "pci_sub_vendor_id    : " UH_FMT "\n", ptr_struct->pci_sub_vendor_id);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pci_subsystem_id     : " UH_FMT "\n", ptr_struct->pci_subsystem_id);
-        fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
-        fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
+    fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "image_size:\n");
     connectx4_image_size_print(&(ptr_struct->image_size), fd, indent_level + 1);
-    for (i = 0; i < 4; ++i) {
+    for (i = 0; i < 4; ++i)
+    {
         adb2c_add_indentation(fd, indent_level);
         fprintf(fd, "supported_hw_id_%03d : " U32H_FMT "\n", i, ptr_struct->supported_hw_id[i]);
     }
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "ini_file_num         : " U32H_FMT "\n", ptr_struct->ini_file_num);
-        fprintf(fd, "prod_ver             : \"%s\"\n", ptr_struct->prod_ver);
-        fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
+    fprintf(fd, "prod_ver             : \"%s\"\n", ptr_struct->prod_ver);
+    fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "module_versions:\n");
     connectx4_module_versions_print(&(ptr_struct->module_versions), fd, indent_level + 1);
-        fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
-        fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
+    fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
+    fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
 }
 
 unsigned int connectx4_image_info_size(void)
@@ -570,12 +584,12 @@ unsigned int connectx4_image_info_size(void)
     return CONNECTX4_IMAGE_INFO_SIZE;
 }
 
-void connectx4_image_info_dump(const struct connectx4_image_info *ptr_struct, FILE *fd)
+void connectx4_image_info_dump(const struct connectx4_image_info* ptr_struct, FILE* fd)
 {
     connectx4_image_info_print(ptr_struct, fd, 0);
 }
 
-void connectx4_itoc_entry_pack(const struct connectx4_itoc_entry *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_itoc_entry_pack(const struct connectx4_itoc_entry* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -605,7 +619,7 @@ void connectx4_itoc_entry_pack(const struct connectx4_itoc_entry *ptr_struct, u_
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
 }
 
-void connectx4_itoc_entry_unpack(struct connectx4_itoc_entry *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_itoc_entry_unpack(struct connectx4_itoc_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -635,7 +649,7 @@ void connectx4_itoc_entry_unpack(struct connectx4_itoc_entry *ptr_struct, const
     ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void connectx4_itoc_entry_print(const struct connectx4_itoc_entry *ptr_struct, FILE *fd, int indent_level)
+void connectx4_itoc_entry_print(const struct connectx4_itoc_entry* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_itoc_entry ========\n");
@@ -671,12 +685,12 @@ unsigned int connectx4_itoc_entry_size(void)
     return CONNECTX4_ITOC_ENTRY_SIZE;
 }
 
-void connectx4_itoc_entry_dump(const struct connectx4_itoc_entry *ptr_struct, FILE *fd)
+void connectx4_itoc_entry_dump(const struct connectx4_itoc_entry* ptr_struct, FILE* fd)
 {
     connectx4_itoc_entry_print(ptr_struct, fd, 0);
 }
 
-void connectx4_itoc_header_pack(const struct connectx4_itoc_header *ptr_struct, u_int8_t *ptr_buff)
+void connectx4_itoc_header_pack(const struct connectx4_itoc_header* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -696,7 +710,7 @@ void connectx4_itoc_header_pack(const struct connectx4_itoc_header *ptr_struct,
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
 }
 
-void connectx4_itoc_header_unpack(struct connectx4_itoc_header *ptr_struct, const u_int8_t *ptr_buff)
+void connectx4_itoc_header_unpack(struct connectx4_itoc_header* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -716,7 +730,7 @@ void connectx4_itoc_header_unpack(struct connectx4_itoc_header *ptr_struct, cons
     ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void connectx4_itoc_header_print(const struct connectx4_itoc_header *ptr_struct, FILE *fd, int indent_level)
+void connectx4_itoc_header_print(const struct connectx4_itoc_header* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_itoc_header ========\n");
@@ -742,7 +756,7 @@ unsigned int connectx4_itoc_header_size(void)
     return CONNECTX4_ITOC_HEADER_SIZE;
 }
 
-void connectx4_itoc_header_dump(const struct connectx4_itoc_header *ptr_struct, FILE *fd)
+void connectx4_itoc_header_dump(const struct connectx4_itoc_header* ptr_struct, FILE* fd)
 {
     connectx4_itoc_header_print(ptr_struct, fd, 0);
 }
diff --git a/tools_layouts/image_info_layouts.h b/tools_layouts/image_info_layouts.h
index a768cf06..4d048693 100644
--- a/tools_layouts/image_info_layouts.h
+++ b/tools_layouts/image_info_layouts.h
@@ -29,406 +29,416 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2018-06-25 13:22:56"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/connectx4/connectx4.adb --file-prefix connectx4 --prefix connectx4_
-         ***/
+ *** This file was generated at "2018-06-25 13:22:56"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/connectx4/connectx4.adb
+ *--file-prefix connectx4 --prefix connectx4_
+ ***/
 #ifndef IMAGE_INFO_LAYOUTS_H
 #define IMAGE_INFO_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 16 */
-struct connectx4_FW_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.16 - 0x0.31 */
-    u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description -  */
-    /* 0x4.0 - 0x4.15 */
-    u_int16_t SUBMINOR;
-    /* Description -  */
-    /* 0x4.16 - 0x4.31 */
-    u_int16_t MINOR;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description -  */
-    /* 0x8.8 - 0x8.15 */
-    u_int8_t Hour;
-    /* Description -  */
-    /* 0x8.16 - 0x8.23 */
-    u_int8_t Minutes;
-    /* Description -  */
-    /* 0x8.24 - 0x8.31 */
-    u_int8_t Seconds;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-    /* Description -  */
-    /* 0xc.0 - 0xc.7 */
-    u_int8_t Day;
-    /* Description -  */
-    /* 0xc.8 - 0xc.15 */
-    u_int8_t Month;
-    /* Description -  */
-    /* 0xc.16 - 0xc.31 */
-    u_int16_t Year;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct connectx4_FW_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.8 - 0x8.15 */
+        u_int8_t Hour;
+        /* Description -  */
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t Minutes;
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t Seconds;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t Day;
+        /* Description -  */
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t Month;
+        /* Description -  */
+        /* 0xc.16 - 0xc.31 */
+        u_int16_t Year;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct connectx4_TRIPPLE_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.16 - 0x0.31 */
-    u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description -  */
-    /* 0x4.0 - 0x4.15 */
-    u_int16_t SUBMINOR;
-    /* Description -  */
-    /* 0x4.16 - 0x4.31 */
-    u_int16_t MINOR;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct connectx4_TRIPPLE_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct connectx4_module_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.0 - 0x0.7 */
-    u_int8_t branch;
-    /* Description -  */
-    /* 0x0.8 - 0x0.19 */
-    u_int16_t minor;
-    /* Description -  */
-    /* 0x0.20 - 0x0.31 */
-    u_int16_t major;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct connectx4_module_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t branch;
+        /* Description -  */
+        /* 0x0.8 - 0x0.19 */
+        u_int16_t minor;
+        /* Description -  */
+        /* 0x0.20 - 0x0.31 */
+        u_int16_t major;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct connectx4_image_size {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description - log of next address in bytes to search for an image. Address in bytes is 2^log_step */
-    /* 0x0.0 - 0x0.7 */
-    u_int8_t log_step;
-    /* Description - this image can run from any partition starting at address 0x0000000, 0x4000000, 0x800000. The code supports only two partitions. */
-    /* 0x0.31 - 0x0.31 */
-    u_int8_t run_from_any;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description - Max possible size in bytes of image. Image read / write should not occure beyond this address */
-    /* 0x4.0 - 0x4.31 */
-    u_int32_t max_size;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct connectx4_image_size
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - log of next address in bytes to search for an image. Address in bytes is 2^log_step */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t log_step;
+        /* Description - this image can run from any partition starting at address 0x0000000, 0x4000000, 0x800000. The
+         * code supports only two partitions. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t run_from_any;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Max possible size in bytes of image. Image read / write should not occure beyond this address
+         */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t max_size;
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct connectx4_module_versions {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.0 - 0x0.31 */
-    struct connectx4_module_version core;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description -  */
-    /* 0x4.0 - 0x4.31 */
-    struct connectx4_module_version phy;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description -  */
-    /* 0x8.0 - 0x8.31 */
-    struct connectx4_module_version kernel;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-    /* Description -  */
-    /* 0xc.0 - 0xc.31 */
-    struct connectx4_module_version iron_image;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-    /* Description -  */
-    /* 0x10.0 - 0x10.31 */
-    struct connectx4_module_version host_management;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-    /* Description -  */
-    /* 0x14.0 - 0x14.31 */
-    struct connectx4_module_version mad;
-};
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct connectx4_module_versions
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct connectx4_module_version core;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        struct connectx4_module_version phy;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        struct connectx4_module_version kernel;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        struct connectx4_module_version iron_image;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.31 */
+        struct connectx4_module_version host_management;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x14.31 */
+        struct connectx4_module_version mad;
+    };
 
-/* Description -   */
-/* Size in bytes - 1024 */
-struct connectx4_image_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description - Indicate that this binary support long keys (up to 4096bits) */
-    /* 0x0.6 - 0x0.6 */
-    u_int8_t long_keys;
-    /* Description - when set, debug-fw tokens are enabled. */
-    /* 0x0.7 - 0x0.7 */
-    u_int8_t debug_fw_tokens_supported;
-    /* Description - The image can be updated using the MCC/MCDA commands */
-    /* 0x0.8 - 0x0.8 */
-    u_int8_t mcc_en;
-    /* Description - OEM lifecycle NVCONFIG files are signed */
-    /* 0x0.9 - 0x0.9 */
-    u_int8_t signed_vendor_nvconfig_files;
-    /* Description - Mellanox lifecycle NVCONFIG files are signed */
-    /* 0x0.10 - 0x0.10 */
-    u_int8_t signed_mlnx_nvconfig_files;
-    /* Description - Factory re-customizationflow is supported */
-    /* 0x0.11 - 0x0.11 */
-    u_int8_t frc_supported;
-    /* Description - Customer Support Tokens are supported */
-    /* 0x0.12 - 0x0.12 */
-    u_int8_t cs_tokens_supported;
-    /* Description - This is a debug firmware */
-    /* 0x0.13 - 0x0.13 */
-    u_int8_t debug_fw;
-    /* Description - [MCC/MCDA flow] if set, the SHA 256 digest is encrypted - enabled by default for secure_fw - cr-space not closed */
-    /* 0x0.14 - 0x0.14 */
-    u_int8_t signed_fw;
-    /* Description - [MCC/MCDA flow] cr-space closed */
-    /* 0x0.15 - 0x0.15 */
-    u_int8_t secure_fw;
-    /* Description - IMAGE_INFO section minor version */
-    /* 0x0.16 - 0x0.23 */
-    u_int8_t minor_version;
-    /* Description - IMAGE_INFO section major version */
-    /* 0x0.24 - 0x0.31 */
-    u_int8_t major_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description -  */
-    /* 0x4.0 - 0x10.31 */
-    struct connectx4_FW_VERSION FW_VERSION;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-    /* Description -  */
-    /* 0x14.0 - 0x18.31 */
-    struct connectx4_TRIPPLE_VERSION mic_version;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-    /* Description -  */
-    /* 0x1c.0 - 0x1c.15 */
-    u_int16_t pci_vendor_id;
-    /* Description -  */
-    /* 0x1c.16 - 0x1c.31 */
-    u_int16_t pci_device_id;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-    /* Description -  */
-    /* 0x20.0 - 0x20.15 */
-    u_int16_t pci_sub_vendor_id;
-    /* Description -  */
-    /* 0x20.16 - 0x20.31 */
-    u_int16_t pci_subsystem_id;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-    /* Description -  */
-    /* 0x24.24 - 0x34.23 */
-    char psid[17];
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-    /* Description -  */
-    /* 0x34.0 - 0x34.15 */
-    u_int16_t vsd_vendor_id;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-    /* Description -  */
-    /* 0x38.24 - 0x108.23 */
-    char vsd[209];
-/*---------------- DWORD[66] (Offset 0x108) ----------------*/
-    /* Description - image size parameters */
-    /* 0x108.0 - 0x10c.31 */
-    struct connectx4_image_size image_size;
-/*---------------- DWORD[70] (Offset 0x118) ----------------*/
-    /* Description - HW device(s) supported by this FW image.
-0 means invalid entry.
-For Golan A0, first entry should be 0x1ff
- */
-    /* 0x118.0 - 0x124.31 */
-    u_int32_t supported_hw_id[4];
-/*---------------- DWORD[74] (Offset 0x128) ----------------*/
-    /* Description -  */
-    /* 0x128.0 - 0x128.31 */
-    u_int32_t ini_file_num;
-/*---------------- DWORD[112] (Offset 0x1c0) ----------------*/
-    /* Description - Product Version is the unified version of the FW and expansion ROM.
-Format is defined by the packager.
-When set to a non-empty string the FW update tool burns the image as a monolythic entity and refuses to update rom only or FW only. */
-    /* 0x1c0.24 - 0x1d0.23 */
-    char prod_ver[17];
-/*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
-    /* Description - Product description */
-    /* 0x1d0.24 - 0x2d0.23 */
-    char description[257];
-/*---------------- DWORD[192] (Offset 0x300) ----------------*/
-    /* Description -  */
-    /* 0x300.0 - 0x33c.31 */
-    struct connectx4_module_versions module_versions;
-/*---------------- DWORD[208] (Offset 0x340) ----------------*/
-    /* Description - Product name */
-    /* 0x340.24 - 0x380.23 */
-    char name[65];
-/*---------------- DWORD[224] (Offset 0x380) ----------------*/
-    /* Description - PRS used to generate the FW binary */
-    /* 0x380.24 - 0x400.23 */
-    char prs_name[129];
-};
+    /* Description -   */
+    /* Size in bytes - 1024 */
+    struct connectx4_image_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Indicate that this binary support long keys (up to 4096bits) */
+        /* 0x0.6 - 0x0.6 */
+        u_int8_t long_keys;
+        /* Description - when set, debug-fw tokens are enabled. */
+        /* 0x0.7 - 0x0.7 */
+        u_int8_t debug_fw_tokens_supported;
+        /* Description - The image can be updated using the MCC/MCDA commands */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t mcc_en;
+        /* Description - OEM lifecycle NVCONFIG files are signed */
+        /* 0x0.9 - 0x0.9 */
+        u_int8_t signed_vendor_nvconfig_files;
+        /* Description - Mellanox lifecycle NVCONFIG files are signed */
+        /* 0x0.10 - 0x0.10 */
+        u_int8_t signed_mlnx_nvconfig_files;
+        /* Description - Factory re-customizationflow is supported */
+        /* 0x0.11 - 0x0.11 */
+        u_int8_t frc_supported;
+        /* Description - Customer Support Tokens are supported */
+        /* 0x0.12 - 0x0.12 */
+        u_int8_t cs_tokens_supported;
+        /* Description - This is a debug firmware */
+        /* 0x0.13 - 0x0.13 */
+        u_int8_t debug_fw;
+        /* Description - [MCC/MCDA flow] if set, the SHA 256 digest is encrypted - enabled by default for secure_fw -
+         * cr-space not closed */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t signed_fw;
+        /* Description - [MCC/MCDA flow] cr-space closed */
+        /* 0x0.15 - 0x0.15 */
+        u_int8_t secure_fw;
+        /* Description - IMAGE_INFO section minor version */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t minor_version;
+        /* Description - IMAGE_INFO section major version */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x10.31 */
+        struct connectx4_FW_VERSION FW_VERSION;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x18.31 */
+        struct connectx4_TRIPPLE_VERSION mic_version;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t pci_vendor_id;
+        /* Description -  */
+        /* 0x1c.16 - 0x1c.31 */
+        u_int16_t pci_device_id;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x20.15 */
+        u_int16_t pci_sub_vendor_id;
+        /* Description -  */
+        /* 0x20.16 - 0x20.31 */
+        u_int16_t pci_subsystem_id;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.24 - 0x34.23 */
+        char psid[17];
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description -  */
+        /* 0x34.0 - 0x34.15 */
+        u_int16_t vsd_vendor_id;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.24 - 0x108.23 */
+        char vsd[209];
+        /*---------------- DWORD[66] (Offset 0x108) ----------------*/
+        /* Description - image size parameters */
+        /* 0x108.0 - 0x10c.31 */
+        struct connectx4_image_size image_size;
+        /*---------------- DWORD[70] (Offset 0x118) ----------------*/
+        /* Description - HW device(s) supported by this FW image.
+    0 means invalid entry.
+    For Golan A0, first entry should be 0x1ff
+     */
+        /* 0x118.0 - 0x124.31 */
+        u_int32_t supported_hw_id[4];
+        /*---------------- DWORD[74] (Offset 0x128) ----------------*/
+        /* Description -  */
+        /* 0x128.0 - 0x128.31 */
+        u_int32_t ini_file_num;
+        /*---------------- DWORD[112] (Offset 0x1c0) ----------------*/
+        /* Description - Product Version is the unified version of the FW and expansion ROM.
+    Format is defined by the packager.
+    When set to a non-empty string the FW update tool burns the image as a monolythic entity and refuses to update rom
+    only or FW only. */
+        /* 0x1c0.24 - 0x1d0.23 */
+        char prod_ver[17];
+        /*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
+        /* Description - Product description */
+        /* 0x1d0.24 - 0x2d0.23 */
+        char description[257];
+        /*---------------- DWORD[192] (Offset 0x300) ----------------*/
+        /* Description -  */
+        /* 0x300.0 - 0x33c.31 */
+        struct connectx4_module_versions module_versions;
+        /*---------------- DWORD[208] (Offset 0x340) ----------------*/
+        /* Description - Product name */
+        /* 0x340.24 - 0x380.23 */
+        char name[65];
+        /*---------------- DWORD[224] (Offset 0x380) ----------------*/
+        /* Description - PRS used to generate the FW binary */
+        /* 0x380.24 - 0x400.23 */
+        char prs_name[129];
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct connectx4_itoc_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description -  */
-    /* 0x0.2 - 0x0.23 */
-    u_int32_t size;
-    /* Description - Section ID Section Type DESCRIPTION
-0x1 BOOT_CODE FW loader code
-0x2 PCI_CODE Code that is required to raise PCIe link.
-0x3 MAIN_CODE All non-PCIe FW code
-0x8 HW_BOOT_CFG Initial values for the PCI related registers
-0x9 HW_MAIN_CFG Initial values for all other registers
-0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash Programming Application Note
-0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as number of physical functions
-(optional)
-0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related settings.
-(optional)
-0x18 ROM_CODE PXE/Boot over IB code.
-0x30 DBG_LOG_MAP FW logger 'index to string' map. The map is in ASCI text. Format is TBD.
-                                          PARAM0 in the iTOC specifies the compression method of this sector:
-                                          0. Uncompressed
-                                          1. Zlib compress2()
-                                          2. LZMA
-                                          Others - Reserved
-0x31 DBG_FW_INI The Ini file used in the image generation. The PARAM0 applies the same as in  DBG_LOG_MAP section type.
-0x32 DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP section type.
-0xff END_MARKER A type of 0xff marks the end of the iTOC entries array. It is recommended to leave the unused part of the iTOC section blank (that is, 0xff in all unused bytes)
-All other values Reserved
- */
-    /* 0x0.24 - 0x0.31 */
-    u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description - if partition type is code or ini then the load address is in here */
-    /* 0x4.0 - 0x4.29 */
-    u_int32_t param0;
-    /* Description - When this bit is set, Data within the section is protected by per-line crc. See yu.flash.replacement.crc_en */
-    /* 0x4.30 - 0x4.30 */
-    u_int8_t cache_line_crc;
-    /* Description - When this bit is set, image is zipped */
-    /* 0x4.31 - 0x4.31 */
-    u_int8_t zipped_image;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description - if partition type is code then the jump address is in here */
-    /* 0x8.0 - 0x8.31 */
-    u_int32_t param1;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-    /* Description -  */
-    /* 0x14.2 - 0x14.30 */
-    u_int32_t flash_addr;
-    /* Description -  */
-    /* 0x14.31 - 0x14.31 */
-    u_int8_t relative_addr;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-    /* Description -  */
-    /* 0x18.0 - 0x18.15 */
-    u_int16_t section_crc;
-    /* Description -  */
-    /* 0x18.16 - 0x18.16 */
-    u_int8_t no_crc;
-    /* Description - When this bit is set, the section pointed by this entry in belongs to teh device tather than to teh FW image.
-A device_data section should not be updated in a regular FW update.
-Example for device_data section: VPD_R, GUIDs. */
-    /* 0x18.17 - 0x18.17 */
-    u_int8_t device_data;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-    /* Description -  */
-    /* 0x1c.0 - 0x1c.15 */
-    u_int16_t itoc_entry_crc;
-};
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct connectx4_itoc_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.2 - 0x0.23 */
+        u_int32_t size;
+        /* Description - Section ID Section Type DESCRIPTION
+    0x1 BOOT_CODE FW loader code
+    0x2 PCI_CODE Code that is required to raise PCIe link.
+    0x3 MAIN_CODE All non-PCIe FW code
+    0x8 HW_BOOT_CFG Initial values for the PCI related registers
+    0x9 HW_MAIN_CFG Initial values for all other registers
+    0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash
+    Programming Application Note 0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related
+    settings, such as number of physical functions (optional) 0x12 FW_MAIN_CFG Initial values for user set-able hi level
+    non-hardware related settings. (optional) 0x18 ROM_CODE PXE/Boot over IB code. 0x30 DBG_LOG_MAP FW logger 'index to
+    string' map. The map is in ASCI text. Format is TBD. PARAM0 in the iTOC specifies the compression method of this
+    sector: 0. Uncompressed
+                                              1. Zlib compress2()
+                                              2. LZMA
+                                              Others - Reserved
+    0x31 DBG_FW_INI The Ini file used in the image generation. The PARAM0 applies the same as in  DBG_LOG_MAP section
+    type. 0x32 DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in
+    DBG_LOG_MAP section type. 0xff END_MARKER A type of 0xff marks the end of the iTOC entries array. It is recommended
+    to leave the unused part of the iTOC section blank (that is, 0xff in all unused bytes) All other values Reserved
+     */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - if partition type is code or ini then the load address is in here */
+        /* 0x4.0 - 0x4.29 */
+        u_int32_t param0;
+        /* Description - When this bit is set, Data within the section is protected by per-line crc. See
+         * yu.flash.replacement.crc_en */
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t cache_line_crc;
+        /* Description - When this bit is set, image is zipped */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t zipped_image;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - if partition type is code then the jump address is in here */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t param1;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.2 - 0x14.30 */
+        u_int32_t flash_addr;
+        /* Description -  */
+        /* 0x14.31 - 0x14.31 */
+        u_int8_t relative_addr;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.15 */
+        u_int16_t section_crc;
+        /* Description -  */
+        /* 0x18.16 - 0x18.16 */
+        u_int8_t no_crc;
+        /* Description - When this bit is set, the section pointed by this entry in belongs to teh device tather than to
+    teh FW image. A device_data section should not be updated in a regular FW update. Example for device_data section:
+    VPD_R, GUIDs. */
+        /* 0x18.17 - 0x18.17 */
+        u_int8_t device_data;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t itoc_entry_crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct connectx4_itoc_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-    /* Description - 49 54 4f 43 */
-    /* 0x0.0 - 0x0.31 */
-    u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-    /* Description - 04 08 15 16 */
-    /* 0x4.0 - 0x4.31 */
-    u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-    /* Description - 23 42 ca fa */
-    /* 0x8.0 - 0x8.31 */
-    u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-    /* Description - ba ca fe 00 */
-    /* 0xc.0 - 0xc.31 */
-    u_int32_t signature3;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-    /* Description - Current version: 1 */
-    /* 0x10.0 - 0x10.7 */
-    u_int8_t version;
-    /* Description - itoc_header: Represents the minimal layout version expected on the flash: 0. */
-    /* 0x10.24 - 0x10.31 */
-    u_int8_t flash_layout_version;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-    /* Description -  */
-    /* 0x1c.0 - 0x1c.15 */
-    u_int16_t itoc_entry_crc;
-};
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct connectx4_itoc_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 49 54 4f 43 */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - 04 08 15 16 */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - 23 42 ca fa */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - ba ca fe 00 */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Current version: 1 */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t version;
+        /* Description - itoc_header: Represents the minimal layout version expected on the flash: 0. */
+        /* 0x10.24 - 0x10.31 */
+        u_int8_t flash_layout_version;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t itoc_entry_crc;
+    };
 
-/* FW_VERSION */
-void connectx4_FW_VERSION_pack(const struct connectx4_FW_VERSION *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_FW_VERSION_unpack(struct connectx4_FW_VERSION *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_FW_VERSION_print(const struct connectx4_FW_VERSION *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_FW_VERSION_size(void);
-#define CONNECTX4_FW_VERSION_SIZE    (0x10)
-void connectx4_FW_VERSION_dump(const struct connectx4_FW_VERSION *ptr_struct, FILE *fd);
-/* module_version */
-void connectx4_module_version_pack(const struct connectx4_module_version *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_module_version_unpack(struct connectx4_module_version *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_module_version_print(const struct connectx4_module_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_module_version_size(void);
-#define CONNECTX4_MODULE_VERSION_SIZE    (0x4)
-void connectx4_module_version_dump(const struct connectx4_module_version *ptr_struct, FILE *fd);
-/* TRIPPLE_VERSION */
-void connectx4_TRIPPLE_VERSION_pack(const struct connectx4_TRIPPLE_VERSION *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_TRIPPLE_VERSION_unpack(struct connectx4_TRIPPLE_VERSION *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_TRIPPLE_VERSION_print(const struct connectx4_TRIPPLE_VERSION *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_TRIPPLE_VERSION_size(void);
-#define CONNECTX4_TRIPPLE_VERSION_SIZE    (0x8)
-void connectx4_TRIPPLE_VERSION_dump(const struct connectx4_TRIPPLE_VERSION *ptr_struct, FILE *fd);
-/* image_size */
-void connectx4_image_size_pack(const struct connectx4_image_size *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_image_size_unpack(struct connectx4_image_size *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_image_size_print(const struct connectx4_image_size *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_image_size_size(void);
-#define CONNECTX4_IMAGE_SIZE_SIZE    (0x8)
-void connectx4_image_size_dump(const struct connectx4_image_size *ptr_struct, FILE *fd);
-/* module_versions */
-void connectx4_module_versions_pack(const struct connectx4_module_versions *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_module_versions_unpack(struct connectx4_module_versions *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_module_versions_print(const struct connectx4_module_versions *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_module_versions_size(void);
-#define CONNECTX4_MODULE_VERSIONS_SIZE    (0x40)
-void connectx4_module_versions_dump(const struct connectx4_module_versions *ptr_struct, FILE *fd);
-/* image_info */
-void connectx4_image_info_pack(const struct connectx4_image_info *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_image_info_unpack(struct connectx4_image_info *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_image_info_print(const struct connectx4_image_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_image_info_size(void);
-#define CONNECTX4_IMAGE_INFO_SIZE    (0x400)
-void connectx4_image_info_dump(const struct connectx4_image_info *ptr_struct, FILE *fd);
-/* itoc_entry */
-void connectx4_itoc_entry_pack(const struct connectx4_itoc_entry *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_itoc_entry_unpack(struct connectx4_itoc_entry *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_itoc_entry_print(const struct connectx4_itoc_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_itoc_entry_size(void);
-#define CONNECTX4_ITOC_ENTRY_SIZE    (0x20)
-void connectx4_itoc_entry_dump(const struct connectx4_itoc_entry *ptr_struct, FILE *fd);
-/* itoc_header */
-void connectx4_itoc_header_pack(const struct connectx4_itoc_header *ptr_struct, u_int8_t *ptr_buff);
-void connectx4_itoc_header_unpack(struct connectx4_itoc_header *ptr_struct, const u_int8_t *ptr_buff);
-void connectx4_itoc_header_print(const struct connectx4_itoc_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int connectx4_itoc_header_size(void);
-#define CONNECTX4_ITOC_HEADER_SIZE    (0x20)
-void connectx4_itoc_header_dump(const struct connectx4_itoc_header *ptr_struct, FILE *fd);
+    /* FW_VERSION */
+    void connectx4_FW_VERSION_pack(const struct connectx4_FW_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_FW_VERSION_unpack(struct connectx4_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_FW_VERSION_print(const struct connectx4_FW_VERSION* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_FW_VERSION_size(void);
+#define CONNECTX4_FW_VERSION_SIZE (0x10)
+    void connectx4_FW_VERSION_dump(const struct connectx4_FW_VERSION* ptr_struct, FILE* fd);
+    /* module_version */
+    void connectx4_module_version_pack(const struct connectx4_module_version* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_module_version_unpack(struct connectx4_module_version* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_module_version_print(const struct connectx4_module_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_module_version_size(void);
+#define CONNECTX4_MODULE_VERSION_SIZE (0x4)
+    void connectx4_module_version_dump(const struct connectx4_module_version* ptr_struct, FILE* fd);
+    /* TRIPPLE_VERSION */
+    void connectx4_TRIPPLE_VERSION_pack(const struct connectx4_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_TRIPPLE_VERSION_unpack(struct connectx4_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_TRIPPLE_VERSION_print(const struct connectx4_TRIPPLE_VERSION* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_TRIPPLE_VERSION_size(void);
+#define CONNECTX4_TRIPPLE_VERSION_SIZE (0x8)
+    void connectx4_TRIPPLE_VERSION_dump(const struct connectx4_TRIPPLE_VERSION* ptr_struct, FILE* fd);
+    /* image_size */
+    void connectx4_image_size_pack(const struct connectx4_image_size* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_image_size_unpack(struct connectx4_image_size* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_image_size_print(const struct connectx4_image_size* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_image_size_size(void);
+#define CONNECTX4_IMAGE_SIZE_SIZE (0x8)
+    void connectx4_image_size_dump(const struct connectx4_image_size* ptr_struct, FILE* fd);
+    /* module_versions */
+    void connectx4_module_versions_pack(const struct connectx4_module_versions* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_module_versions_unpack(struct connectx4_module_versions* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_module_versions_print(const struct connectx4_module_versions* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_module_versions_size(void);
+#define CONNECTX4_MODULE_VERSIONS_SIZE (0x40)
+    void connectx4_module_versions_dump(const struct connectx4_module_versions* ptr_struct, FILE* fd);
+    /* image_info */
+    void connectx4_image_info_pack(const struct connectx4_image_info* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_image_info_unpack(struct connectx4_image_info* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_image_info_print(const struct connectx4_image_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_image_info_size(void);
+#define CONNECTX4_IMAGE_INFO_SIZE (0x400)
+    void connectx4_image_info_dump(const struct connectx4_image_info* ptr_struct, FILE* fd);
+    /* itoc_entry */
+    void connectx4_itoc_entry_pack(const struct connectx4_itoc_entry* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_itoc_entry_unpack(struct connectx4_itoc_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_itoc_entry_print(const struct connectx4_itoc_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_itoc_entry_size(void);
+#define CONNECTX4_ITOC_ENTRY_SIZE (0x20)
+    void connectx4_itoc_entry_dump(const struct connectx4_itoc_entry* ptr_struct, FILE* fd);
+    /* itoc_header */
+    void connectx4_itoc_header_pack(const struct connectx4_itoc_header* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_itoc_header_unpack(struct connectx4_itoc_header* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_itoc_header_print(const struct connectx4_itoc_header* ptr_struct, FILE* fd, int indent_level);
+    unsigned int connectx4_itoc_header_size(void);
+#define CONNECTX4_ITOC_HEADER_SIZE (0x20)
+    void connectx4_itoc_header_dump(const struct connectx4_itoc_header* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/image_layout_layouts.c b/tools_layouts/image_layout_layouts.c
old mode 100755
new mode 100644
index 040f7957..34b16d1a
--- a/tools_layouts/image_layout_layouts.c
+++ b/tools_layouts/image_layout_layouts.c
@@ -29,1841 +29,1887 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2022-02-06 17:27:46"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/image_layout/image_layout.adb --file-prefix image_layout --prefix image_layout_ --no-adb-utils
-         ***/
+ *** This file was generated at "2022-02-06 17:27:46"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/image_layout/image_layout.adb
+ *--file-prefix image_layout --prefix image_layout_ --no-adb-utils
+ ***/
 #include "image_layout_layouts.h"
 
-void image_layout_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
 }
 
-void image_layout_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	*ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    *ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level)
+void image_layout_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_uint64 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_uint64 ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t) *ptr_struct);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t)*ptr_struct);
 }
 
 unsigned int image_layout_uint64_size(void)
 {
-	return IMAGE_LAYOUT_UINT64_SIZE;
+    return IMAGE_LAYOUT_UINT64_SIZE;
 }
 
-void image_layout_uint64_dump(const u_int64_t *ptr_struct, FILE *fd)
+void image_layout_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
 {
-	image_layout_uint64_print(ptr_struct, fd, 0);
+    image_layout_uint64_print(ptr_struct, fd, 0);
 }
 
-void image_layout_htoc_entry_pack(const struct image_layout_htoc_entry *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_htoc_entry_pack(const struct image_layout_htoc_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hash_offset);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->section_type);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hash_offset);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->section_type);
 }
 
-void image_layout_htoc_entry_unpack(struct image_layout_htoc_entry *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_htoc_entry_unpack(struct image_layout_htoc_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->hash_offset = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->section_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->hash_offset = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->section_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_htoc_entry_print(const struct image_layout_htoc_entry *ptr_struct, FILE *fd, int indent_level)
+void image_layout_htoc_entry_print(const struct image_layout_htoc_entry* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_htoc_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_htoc_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hash_offset          : " UH_FMT "\n", ptr_struct->hash_offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "section_type         : " UH_FMT "\n", ptr_struct->section_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hash_offset          : " UH_FMT "\n", ptr_struct->hash_offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "section_type         : " UH_FMT "\n", ptr_struct->section_type);
 }
 
 unsigned int image_layout_htoc_entry_size(void)
 {
-	return IMAGE_LAYOUT_HTOC_ENTRY_SIZE;
+    return IMAGE_LAYOUT_HTOC_ENTRY_SIZE;
 }
 
-void image_layout_htoc_entry_dump(const struct image_layout_htoc_entry *ptr_struct, FILE *fd)
+void image_layout_htoc_entry_dump(const struct image_layout_htoc_entry* ptr_struct, FILE* fd)
 {
-	image_layout_htoc_entry_print(ptr_struct, fd, 0);
+    image_layout_htoc_entry_print(ptr_struct, fd, 0);
 }
 
-void image_layout_htoc_header_pack(const struct image_layout_htoc_header *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_htoc_header_pack(const struct image_layout_htoc_header* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_of_entries);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->hash_type);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hash_size);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_of_entries);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->hash_type);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hash_size);
 }
 
-void image_layout_htoc_header_unpack(struct image_layout_htoc_header *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_htoc_header_unpack(struct image_layout_htoc_header* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 56;
-	ptr_struct->num_of_entries = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->hash_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->hash_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 56;
+    ptr_struct->num_of_entries = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->hash_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->hash_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_htoc_header_print(const struct image_layout_htoc_header *ptr_struct, FILE *fd, int indent_level)
+void image_layout_htoc_header_print(const struct image_layout_htoc_header* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_htoc_header ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_htoc_header ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " U32H_FMT "\n", ptr_struct->version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_entries       : " UH_FMT "\n", ptr_struct->num_of_entries);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hash_type            : " UH_FMT "\n", ptr_struct->hash_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hash_size            : " UH_FMT "\n", ptr_struct->hash_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " U32H_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_entries       : " UH_FMT "\n", ptr_struct->num_of_entries);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hash_type            : " UH_FMT "\n", ptr_struct->hash_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hash_size            : " UH_FMT "\n", ptr_struct->hash_size);
 }
 
 unsigned int image_layout_htoc_header_size(void)
 {
-	return IMAGE_LAYOUT_HTOC_HEADER_SIZE;
+    return IMAGE_LAYOUT_HTOC_HEADER_SIZE;
 }
 
-void image_layout_htoc_header_dump(const struct image_layout_htoc_header *ptr_struct, FILE *fd)
+void image_layout_htoc_header_dump(const struct image_layout_htoc_header* ptr_struct, FILE* fd)
 {
-	image_layout_htoc_header_print(ptr_struct, fd, 0);
+    image_layout_htoc_header_print(ptr_struct, fd, 0);
 }
 
-void image_layout_module_version_pack(const struct image_layout_module_version *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_module_version_pack(const struct image_layout_module_version* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->branch);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->minor);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->major);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->branch);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->minor);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->major);
 }
 
-void image_layout_module_version_unpack(struct image_layout_module_version *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_module_version_unpack(struct image_layout_module_version* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->branch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 12;
-	ptr_struct->minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 0;
-	ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 24;
+    ptr_struct->branch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 12;
+    ptr_struct->minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 0;
+    ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
 }
 
-void image_layout_module_version_print(const struct image_layout_module_version *ptr_struct, FILE *fd, int indent_level)
+void image_layout_module_version_print(const struct image_layout_module_version* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_module_version ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_module_version ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "branch               : " UH_FMT "\n", ptr_struct->branch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "branch               : " UH_FMT "\n", ptr_struct->branch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
 }
 
 unsigned int image_layout_module_version_size(void)
 {
-	return IMAGE_LAYOUT_MODULE_VERSION_SIZE;
+    return IMAGE_LAYOUT_MODULE_VERSION_SIZE;
 }
 
-void image_layout_module_version_dump(const struct image_layout_module_version *ptr_struct, FILE *fd)
+void image_layout_module_version_dump(const struct image_layout_module_version* ptr_struct, FILE* fd)
 {
-	image_layout_module_version_print(ptr_struct, fd, 0);
+    image_layout_module_version_print(ptr_struct, fd, 0);
 }
 
-void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabilities *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabilities* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->reset_ver_en);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_vector_ver);
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->reset_ver_en);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_vector_ver);
 }
 
-void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	ptr_struct->reset_ver_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 16;
-	ptr_struct->version_vector_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 31;
+    ptr_struct->reset_ver_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->version_vector_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities *ptr_struct, FILE *fd, int indent_level)
+void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_reset_capabilities ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_reset_capabilities ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reset_ver_en         : " UH_FMT "\n", ptr_struct->reset_ver_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version_vector_ver   : " UH_FMT "\n", ptr_struct->version_vector_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reset_ver_en         : " UH_FMT "\n", ptr_struct->reset_ver_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version_vector_ver   : " UH_FMT "\n", ptr_struct->version_vector_ver);
 }
 
 unsigned int image_layout_reset_capabilities_size(void)
 {
-	return IMAGE_LAYOUT_RESET_CAPABILITIES_SIZE;
+    return IMAGE_LAYOUT_RESET_CAPABILITIES_SIZE;
 }
 
-void image_layout_reset_capabilities_dump(const struct image_layout_reset_capabilities *ptr_struct, FILE *fd)
+void image_layout_reset_capabilities_dump(const struct image_layout_reset_capabilities* ptr_struct, FILE* fd)
 {
-	image_layout_reset_capabilities_print(ptr_struct, fd, 0);
+    image_layout_reset_capabilities_print(ptr_struct, fd, 0);
 }
 
-void image_layout_reset_version_pack(const struct image_layout_reset_version *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_reset_version_pack(const struct image_layout_reset_version* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->major);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->branch);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->major);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->branch);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
 }
 
-void image_layout_reset_version_unpack(struct image_layout_reset_version *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_reset_version_unpack(struct image_layout_reset_version* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 12;
-	ptr_struct->branch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 4;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 12;
+    ptr_struct->branch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 4;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_reset_version_print(const struct image_layout_reset_version *ptr_struct, FILE *fd, int indent_level)
+void image_layout_reset_version_print(const struct image_layout_reset_version* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_reset_version ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_reset_version ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "branch               : " UH_FMT "\n", ptr_struct->branch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "branch               : " UH_FMT "\n", ptr_struct->branch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
 }
 
 unsigned int image_layout_reset_version_size(void)
 {
-	return IMAGE_LAYOUT_RESET_VERSION_SIZE;
+    return IMAGE_LAYOUT_RESET_VERSION_SIZE;
 }
 
-void image_layout_reset_version_dump(const struct image_layout_reset_version *ptr_struct, FILE *fd)
+void image_layout_reset_version_dump(const struct image_layout_reset_version* ptr_struct, FILE* fd)
 {
-	image_layout_reset_version_print(ptr_struct, fd, 0);
+    image_layout_reset_version_print(ptr_struct, fd, 0);
 }
 
-void image_layout_uid_entry_pack(const struct image_layout_uid_entry *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_uid_entry_pack(const struct image_layout_uid_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_allocated);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->step);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->uid);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_allocated);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->step);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->uid);
 }
 
-void image_layout_uid_entry_unpack(struct image_layout_uid_entry *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_uid_entry_unpack(struct image_layout_uid_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->num_allocated = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->uid = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->num_allocated = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->uid = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_uid_entry_print(const struct image_layout_uid_entry *ptr_struct, FILE *fd, int indent_level)
+void image_layout_uid_entry_print(const struct image_layout_uid_entry* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_uid_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_uid_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_allocated        : " UH_FMT "\n", ptr_struct->num_allocated);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "step                 : " UH_FMT "\n", ptr_struct->step);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uid                  : " U64H_FMT "\n", ptr_struct->uid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_allocated        : " UH_FMT "\n", ptr_struct->num_allocated);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "step                 : " UH_FMT "\n", ptr_struct->step);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uid                  : " U64H_FMT "\n", ptr_struct->uid);
 }
 
 unsigned int image_layout_uid_entry_size(void)
 {
-	return IMAGE_LAYOUT_UID_ENTRY_SIZE;
-}
-
-void image_layout_uid_entry_dump(const struct image_layout_uid_entry *ptr_struct, FILE *fd)
-{
-	image_layout_uid_entry_print(ptr_struct, fd, 0);
-}
-
-void image_layout_FW_VERSION_pack(const struct image_layout_FW_VERSION *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Hour);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Minutes);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Seconds);
-	offset = 120;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Day);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Month);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
-}
-
-void image_layout_FW_VERSION_unpack(struct image_layout_FW_VERSION *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 48;
-	ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 80;
-	ptr_struct->Hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 72;
-	ptr_struct->Minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->Seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 120;
-	ptr_struct->Day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->Month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 96;
-	ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void image_layout_FW_VERSION_print(const struct image_layout_FW_VERSION *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_FW_VERSION ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Hour                 : " UH_FMT "\n", ptr_struct->Hour);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Minutes              : " UH_FMT "\n", ptr_struct->Minutes);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Seconds              : " UH_FMT "\n", ptr_struct->Seconds);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Day                  : " UH_FMT "\n", ptr_struct->Day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Month                : " UH_FMT "\n", ptr_struct->Month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Year                 : " UH_FMT "\n", ptr_struct->Year);
+    return IMAGE_LAYOUT_UID_ENTRY_SIZE;
+}
+
+void image_layout_uid_entry_dump(const struct image_layout_uid_entry* ptr_struct, FILE* fd)
+{
+    image_layout_uid_entry_print(ptr_struct, fd, 0);
+}
+
+void image_layout_FW_VERSION_pack(const struct image_layout_FW_VERSION* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Hour);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Minutes);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Seconds);
+    offset = 120;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Day);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Month);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
+}
+
+void image_layout_FW_VERSION_unpack(struct image_layout_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 48;
+    ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 80;
+    ptr_struct->Hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 72;
+    ptr_struct->Minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->Seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 120;
+    ptr_struct->Day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->Month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 96;
+    ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void image_layout_FW_VERSION_print(const struct image_layout_FW_VERSION* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_FW_VERSION ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Hour                 : " UH_FMT "\n", ptr_struct->Hour);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Minutes              : " UH_FMT "\n", ptr_struct->Minutes);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Seconds              : " UH_FMT "\n", ptr_struct->Seconds);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Day                  : " UH_FMT "\n", ptr_struct->Day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Month                : " UH_FMT "\n", ptr_struct->Month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Year                 : " UH_FMT "\n", ptr_struct->Year);
 }
 
 unsigned int image_layout_FW_VERSION_size(void)
 {
-	return IMAGE_LAYOUT_FW_VERSION_SIZE;
+    return IMAGE_LAYOUT_FW_VERSION_SIZE;
 }
 
-void image_layout_FW_VERSION_dump(const struct image_layout_FW_VERSION *ptr_struct, FILE *fd)
+void image_layout_FW_VERSION_dump(const struct image_layout_FW_VERSION* ptr_struct, FILE* fd)
 {
-	image_layout_FW_VERSION_print(ptr_struct, fd, 0);
+    image_layout_FW_VERSION_print(ptr_struct, fd, 0);
 }
 
-void image_layout_TRIPPLE_VERSION_pack(const struct image_layout_TRIPPLE_VERSION *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_TRIPPLE_VERSION_pack(const struct image_layout_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MAJOR);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->SUBMINOR);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->MINOR);
 }
 
-void image_layout_TRIPPLE_VERSION_unpack(struct image_layout_TRIPPLE_VERSION *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_TRIPPLE_VERSION_unpack(struct image_layout_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 48;
-	ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->MAJOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 48;
+    ptr_struct->SUBMINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION *ptr_struct, FILE *fd, int indent_level)
+void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_TRIPPLE_VERSION ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_TRIPPLE_VERSION ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MAJOR                : " UH_FMT "\n", ptr_struct->MAJOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "SUBMINOR             : " UH_FMT "\n", ptr_struct->SUBMINOR);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MINOR                : " UH_FMT "\n", ptr_struct->MINOR);
 }
 
 unsigned int image_layout_TRIPPLE_VERSION_size(void)
 {
-	return IMAGE_LAYOUT_TRIPPLE_VERSION_SIZE;
+    return IMAGE_LAYOUT_TRIPPLE_VERSION_SIZE;
 }
 
-void image_layout_TRIPPLE_VERSION_dump(const struct image_layout_TRIPPLE_VERSION *ptr_struct, FILE *fd)
+void image_layout_TRIPPLE_VERSION_dump(const struct image_layout_TRIPPLE_VERSION* ptr_struct, FILE* fd)
 {
-	image_layout_TRIPPLE_VERSION_print(ptr_struct, fd, 0);
+    image_layout_TRIPPLE_VERSION_print(ptr_struct, fd, 0);
 }
 
-void image_layout_guids_pack(const struct image_layout_guids *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_guids_pack(const struct image_layout_guids* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	image_layout_uid_entry_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_uid_entry_pack(&(ptr_struct->macs), ptr_buff + offset / 8);
+    offset = 0;
+    image_layout_uid_entry_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_uid_entry_pack(&(ptr_struct->macs), ptr_buff + offset / 8);
 }
 
-void image_layout_guids_unpack(struct image_layout_guids *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_guids_unpack(struct image_layout_guids* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	image_layout_uid_entry_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_uid_entry_unpack(&(ptr_struct->macs), ptr_buff + offset / 8);
+    offset = 0;
+    image_layout_uid_entry_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_uid_entry_unpack(&(ptr_struct->macs), ptr_buff + offset / 8);
 }
 
-void image_layout_guids_print(const struct image_layout_guids *ptr_struct, FILE *fd, int indent_level)
+void image_layout_guids_print(const struct image_layout_guids* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_guids ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_guids ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	image_layout_uid_entry_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "macs:\n");
-	image_layout_uid_entry_print(&(ptr_struct->macs), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    image_layout_uid_entry_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "macs:\n");
+    image_layout_uid_entry_print(&(ptr_struct->macs), fd, indent_level + 1);
 }
 
 unsigned int image_layout_guids_size(void)
 {
-	return IMAGE_LAYOUT_GUIDS_SIZE;
+    return IMAGE_LAYOUT_GUIDS_SIZE;
 }
 
-void image_layout_guids_dump(const struct image_layout_guids *ptr_struct, FILE *fd)
+void image_layout_guids_dump(const struct image_layout_guids* ptr_struct, FILE* fd)
 {
-	image_layout_guids_print(ptr_struct, fd, 0);
+    image_layout_guids_print(ptr_struct, fd, 0);
 }
 
-void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->load_address);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->dw_size);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->load_address);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->dw_size);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
 }
 
-void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->load_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->dw_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->load_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->dw_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header *ptr_struct, FILE *fd, int indent_level)
+void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_hashes_table_header ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_hashes_table_header ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "load_address         : " U32H_FMT "\n", ptr_struct->load_address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dw_size              : " U32H_FMT "\n", ptr_struct->dw_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "load_address         : " U32H_FMT "\n", ptr_struct->load_address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dw_size              : " U32H_FMT "\n", ptr_struct->dw_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
 }
 
 unsigned int image_layout_hashes_table_header_size(void)
 {
-	return IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE;
+    return IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE;
 }
 
-void image_layout_hashes_table_header_dump(const struct image_layout_hashes_table_header *ptr_struct, FILE *fd)
+void image_layout_hashes_table_header_dump(const struct image_layout_hashes_table_header* ptr_struct, FILE* fd)
 {
-	image_layout_hashes_table_header_print(ptr_struct, fd, 0);
+    image_layout_hashes_table_header_print(ptr_struct, fd, 0);
 }
 
-void image_layout_htoc_pack(const struct image_layout_htoc *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_htoc_pack(const struct image_layout_htoc* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	image_layout_htoc_header_pack(&(ptr_struct->header), ptr_buff + offset / 8);
-	for (i = 0; i < 28; ++i) {
-		offset = adb2c_calc_array_field_address(128, 64, i, 1920, 1);
-		image_layout_htoc_entry_pack(&(ptr_struct->entry[i]), ptr_buff + offset / 8);
-	}
+    offset = 0;
+    image_layout_htoc_header_pack(&(ptr_struct->header), ptr_buff + offset / 8);
+    for (i = 0; i < 28; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 64, i, 1920, 1);
+        image_layout_htoc_entry_pack(&(ptr_struct->entry[i]), ptr_buff + offset / 8);
+    }
 }
 
-void image_layout_htoc_unpack(struct image_layout_htoc *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_htoc_unpack(struct image_layout_htoc* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	image_layout_htoc_header_unpack(&(ptr_struct->header), ptr_buff + offset / 8);
-	for (i = 0; i < 28; ++i) {
-		offset = adb2c_calc_array_field_address(128, 64, i, 1920, 1);
-		image_layout_htoc_entry_unpack(&(ptr_struct->entry[i]), ptr_buff + offset / 8);
-	}
+    offset = 0;
+    image_layout_htoc_header_unpack(&(ptr_struct->header), ptr_buff + offset / 8);
+    for (i = 0; i < 28; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 64, i, 1920, 1);
+        image_layout_htoc_entry_unpack(&(ptr_struct->entry[i]), ptr_buff + offset / 8);
+    }
 }
 
-void image_layout_htoc_print(const struct image_layout_htoc *ptr_struct, FILE *fd, int indent_level)
+void image_layout_htoc_print(const struct image_layout_htoc* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_htoc ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_htoc ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "header:\n");
-	image_layout_htoc_header_print(&(ptr_struct->header), fd, indent_level + 1);
-	for (i = 0; i < 28; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "entry_%03d:\n", i);
-		image_layout_htoc_entry_print(&(ptr_struct->entry[i]), fd, indent_level + 1);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "header:\n");
+    image_layout_htoc_header_print(&(ptr_struct->header), fd, indent_level + 1);
+    for (i = 0; i < 28; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "entry_%03d:\n", i);
+        image_layout_htoc_entry_print(&(ptr_struct->entry[i]), fd, indent_level + 1);
+    }
 }
 
 unsigned int image_layout_htoc_size(void)
 {
-	return IMAGE_LAYOUT_HTOC_SIZE;
+    return IMAGE_LAYOUT_HTOC_SIZE;
 }
 
-void image_layout_htoc_dump(const struct image_layout_htoc *ptr_struct, FILE *fd)
+void image_layout_htoc_dump(const struct image_layout_htoc* ptr_struct, FILE* fd)
 {
-	image_layout_htoc_print(ptr_struct, fd, 0);
+    image_layout_htoc_print(ptr_struct, fd, 0);
 }
 
-void image_layout_htoc_hash_pack(const struct image_layout_htoc_hash *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_htoc_hash_pack(const struct image_layout_htoc_hash* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 512, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->hash_val[i]);
-	}
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 512, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->hash_val[i]);
+    }
 }
 
-void image_layout_htoc_hash_unpack(struct image_layout_htoc_hash *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_htoc_hash_unpack(struct image_layout_htoc_hash* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 512, 1);
-		ptr_struct->hash_val[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 512, 1);
+        ptr_struct->hash_val[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void image_layout_htoc_hash_print(const struct image_layout_htoc_hash *ptr_struct, FILE *fd, int indent_level)
+void image_layout_htoc_hash_print(const struct image_layout_htoc_hash* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_htoc_hash ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_htoc_hash ========\n");
 
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "hash_val_%03d        : " U32H_FMT "\n", i, ptr_struct->hash_val[i]);
-	}
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "hash_val_%03d        : " U32H_FMT "\n", i, ptr_struct->hash_val[i]);
+    }
 }
 
 unsigned int image_layout_htoc_hash_size(void)
 {
-	return IMAGE_LAYOUT_HTOC_HASH_SIZE;
+    return IMAGE_LAYOUT_HTOC_HASH_SIZE;
 }
 
-void image_layout_htoc_hash_dump(const struct image_layout_htoc_hash *ptr_struct, FILE *fd)
+void image_layout_htoc_hash_dump(const struct image_layout_htoc_hash* ptr_struct, FILE* fd)
 {
-	image_layout_htoc_hash_print(ptr_struct, fd, 0);
+    image_layout_htoc_hash_print(ptr_struct, fd, 0);
 }
 
-void image_layout_hw_pointer_entry_pack(const struct image_layout_hw_pointer_entry *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_hw_pointer_entry_pack(const struct image_layout_hw_pointer_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ptr);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ptr);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
 }
 
-void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->ptr = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 48;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->ptr = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 48;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry *ptr_struct, FILE *fd, int indent_level)
+void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry* ptr_struct,
+                                         FILE* fd,
+                                         int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_hw_pointer_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_hw_pointer_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ptr                  : " U32H_FMT "\n", ptr_struct->ptr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ptr                  : " U32H_FMT "\n", ptr_struct->ptr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
 }
 
 unsigned int image_layout_hw_pointer_entry_size(void)
 {
-	return IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE;
+    return IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE;
 }
 
-void image_layout_hw_pointer_entry_dump(const struct image_layout_hw_pointer_entry *ptr_struct, FILE *fd)
+void image_layout_hw_pointer_entry_dump(const struct image_layout_hw_pointer_entry* ptr_struct, FILE* fd)
 {
-	image_layout_hw_pointer_entry_print(ptr_struct, fd, 0);
+    image_layout_hw_pointer_entry_print(ptr_struct, fd, 0);
 }
 
-void image_layout_image_size_pack(const struct image_layout_image_size *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_image_size_pack(const struct image_layout_image_size* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_step);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->run_from_any);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_size);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_step);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->run_from_any);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_size);
 }
 
-void image_layout_image_size_unpack(struct image_layout_image_size *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_image_size_unpack(struct image_layout_image_size* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->log_step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->run_from_any = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->max_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 24;
+    ptr_struct->log_step = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->run_from_any = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->max_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void image_layout_image_size_print(const struct image_layout_image_size *ptr_struct, FILE *fd, int indent_level)
+void image_layout_image_size_print(const struct image_layout_image_size* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_image_size ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_image_size ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_step             : " UH_FMT "\n", ptr_struct->log_step);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "run_from_any         : " UH_FMT "\n", ptr_struct->run_from_any);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_size             : " U32H_FMT "\n", ptr_struct->max_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_step             : " UH_FMT "\n", ptr_struct->log_step);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "run_from_any         : " UH_FMT "\n", ptr_struct->run_from_any);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_size             : " U32H_FMT "\n", ptr_struct->max_size);
 }
 
 unsigned int image_layout_image_size_size(void)
 {
-	return IMAGE_LAYOUT_IMAGE_SIZE_SIZE;
+    return IMAGE_LAYOUT_IMAGE_SIZE_SIZE;
 }
 
-void image_layout_image_size_dump(const struct image_layout_image_size *ptr_struct, FILE *fd)
+void image_layout_image_size_dump(const struct image_layout_image_size* ptr_struct, FILE* fd)
 {
-	image_layout_image_size_print(ptr_struct, fd, 0);
+    image_layout_image_size_print(ptr_struct, fd, 0);
 }
 
-void image_layout_module_versions_pack(const struct image_layout_module_versions *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_module_versions_pack(const struct image_layout_module_versions* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	image_layout_module_version_pack(&(ptr_struct->core), ptr_buff + offset / 8);
-	offset = 32;
-	image_layout_module_version_pack(&(ptr_struct->phy), ptr_buff + offset / 8);
-	offset = 64;
-	image_layout_module_version_pack(&(ptr_struct->kernel), ptr_buff + offset / 8);
-	offset = 96;
-	image_layout_module_version_pack(&(ptr_struct->iron_image), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_module_version_pack(&(ptr_struct->host_management), ptr_buff + offset / 8);
-	offset = 160;
-	image_layout_module_version_pack(&(ptr_struct->mad), ptr_buff + offset / 8);
+    offset = 0;
+    image_layout_module_version_pack(&(ptr_struct->core), ptr_buff + offset / 8);
+    offset = 32;
+    image_layout_module_version_pack(&(ptr_struct->phy), ptr_buff + offset / 8);
+    offset = 64;
+    image_layout_module_version_pack(&(ptr_struct->kernel), ptr_buff + offset / 8);
+    offset = 96;
+    image_layout_module_version_pack(&(ptr_struct->iron_image), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_module_version_pack(&(ptr_struct->host_management), ptr_buff + offset / 8);
+    offset = 160;
+    image_layout_module_version_pack(&(ptr_struct->mad), ptr_buff + offset / 8);
 }
 
-void image_layout_module_versions_unpack(struct image_layout_module_versions *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_module_versions_unpack(struct image_layout_module_versions* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	image_layout_module_version_unpack(&(ptr_struct->core), ptr_buff + offset / 8);
-	offset = 32;
-	image_layout_module_version_unpack(&(ptr_struct->phy), ptr_buff + offset / 8);
-	offset = 64;
-	image_layout_module_version_unpack(&(ptr_struct->kernel), ptr_buff + offset / 8);
-	offset = 96;
-	image_layout_module_version_unpack(&(ptr_struct->iron_image), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_module_version_unpack(&(ptr_struct->host_management), ptr_buff + offset / 8);
-	offset = 160;
-	image_layout_module_version_unpack(&(ptr_struct->mad), ptr_buff + offset / 8);
+    offset = 0;
+    image_layout_module_version_unpack(&(ptr_struct->core), ptr_buff + offset / 8);
+    offset = 32;
+    image_layout_module_version_unpack(&(ptr_struct->phy), ptr_buff + offset / 8);
+    offset = 64;
+    image_layout_module_version_unpack(&(ptr_struct->kernel), ptr_buff + offset / 8);
+    offset = 96;
+    image_layout_module_version_unpack(&(ptr_struct->iron_image), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_module_version_unpack(&(ptr_struct->host_management), ptr_buff + offset / 8);
+    offset = 160;
+    image_layout_module_version_unpack(&(ptr_struct->mad), ptr_buff + offset / 8);
 }
 
-void image_layout_module_versions_print(const struct image_layout_module_versions *ptr_struct, FILE *fd, int indent_level)
+void image_layout_module_versions_print(const struct image_layout_module_versions* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_module_versions ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_module_versions ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "core:\n");
-	image_layout_module_version_print(&(ptr_struct->core), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy:\n");
-	image_layout_module_version_print(&(ptr_struct->phy), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "kernel:\n");
-	image_layout_module_version_print(&(ptr_struct->kernel), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iron_image:\n");
-	image_layout_module_version_print(&(ptr_struct->iron_image), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "host_management:\n");
-	image_layout_module_version_print(&(ptr_struct->host_management), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mad:\n");
-	image_layout_module_version_print(&(ptr_struct->mad), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "core:\n");
+    image_layout_module_version_print(&(ptr_struct->core), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy:\n");
+    image_layout_module_version_print(&(ptr_struct->phy), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "kernel:\n");
+    image_layout_module_version_print(&(ptr_struct->kernel), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iron_image:\n");
+    image_layout_module_version_print(&(ptr_struct->iron_image), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "host_management:\n");
+    image_layout_module_version_print(&(ptr_struct->host_management), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mad:\n");
+    image_layout_module_version_print(&(ptr_struct->mad), fd, indent_level + 1);
 }
 
 unsigned int image_layout_module_versions_size(void)
 {
-	return IMAGE_LAYOUT_MODULE_VERSIONS_SIZE;
+    return IMAGE_LAYOUT_MODULE_VERSIONS_SIZE;
 }
 
-void image_layout_module_versions_dump(const struct image_layout_module_versions *ptr_struct, FILE *fd)
+void image_layout_module_versions_dump(const struct image_layout_module_versions* ptr_struct, FILE* fd)
 {
-	image_layout_module_versions_print(ptr_struct, fd, 0);
+    image_layout_module_versions_print(ptr_struct, fd, 0);
 }
 
-void image_layout_operation_key_pack(const struct image_layout_operation_key *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_operation_key_pack(const struct image_layout_operation_key* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key_modifier);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->key_modifier);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
 }
 
-void image_layout_operation_key_unpack(struct image_layout_operation_key *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_operation_key_unpack(struct image_layout_operation_key* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->key_modifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->key_modifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_operation_key_print(const struct image_layout_operation_key *ptr_struct, FILE *fd, int indent_level)
+void image_layout_operation_key_print(const struct image_layout_operation_key* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_operation_key ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_operation_key ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key_modifier         : " UH_FMT "\n", ptr_struct->key_modifier);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key_modifier         : " UH_FMT "\n", ptr_struct->key_modifier);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
 }
 
 unsigned int image_layout_operation_key_size(void)
 {
-	return IMAGE_LAYOUT_OPERATION_KEY_SIZE;
-}
-
-void image_layout_operation_key_dump(const struct image_layout_operation_key *ptr_struct, FILE *fd)
-{
-	image_layout_operation_key_print(ptr_struct, fd, 0);
-}
-
-void image_layout_version_vector_pack(const struct image_layout_version_vector *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	image_layout_reset_capabilities_pack(&(ptr_struct->reset_capabilities), ptr_buff + offset / 8);
-	offset = 32;
-	image_layout_reset_version_pack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
-	offset = 64;
-	image_layout_reset_version_pack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
-	offset = 96;
-	image_layout_reset_version_pack(&(ptr_struct->pci), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_reset_version_pack(&(ptr_struct->phy), ptr_buff + offset / 8);
-	offset = 160;
-	image_layout_reset_version_pack(&(ptr_struct->ini), ptr_buff + offset / 8);
-	offset = 192;
-	image_layout_reset_version_pack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
-	offset = 224;
-	image_layout_reset_version_pack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
-	offset = 256;
-	image_layout_reset_version_pack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
-	offset = 288;
-	image_layout_reset_version_pack(&(ptr_struct->reserved4), ptr_buff + offset / 8);
-	offset = 320;
-	image_layout_reset_version_pack(&(ptr_struct->reserved5), ptr_buff + offset / 8);
-	offset = 352;
-	image_layout_reset_version_pack(&(ptr_struct->reserved6), ptr_buff + offset / 8);
-}
-
-void image_layout_version_vector_unpack(struct image_layout_version_vector *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	image_layout_reset_capabilities_unpack(&(ptr_struct->reset_capabilities), ptr_buff + offset / 8);
-	offset = 32;
-	image_layout_reset_version_unpack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
-	offset = 64;
-	image_layout_reset_version_unpack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
-	offset = 96;
-	image_layout_reset_version_unpack(&(ptr_struct->pci), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_reset_version_unpack(&(ptr_struct->phy), ptr_buff + offset / 8);
-	offset = 160;
-	image_layout_reset_version_unpack(&(ptr_struct->ini), ptr_buff + offset / 8);
-	offset = 192;
-	image_layout_reset_version_unpack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
-	offset = 224;
-	image_layout_reset_version_unpack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
-	offset = 256;
-	image_layout_reset_version_unpack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
-	offset = 288;
-	image_layout_reset_version_unpack(&(ptr_struct->reserved4), ptr_buff + offset / 8);
-	offset = 320;
-	image_layout_reset_version_unpack(&(ptr_struct->reserved5), ptr_buff + offset / 8);
-	offset = 352;
-	image_layout_reset_version_unpack(&(ptr_struct->reserved6), ptr_buff + offset / 8);
-}
-
-void image_layout_version_vector_print(const struct image_layout_version_vector *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_version_vector ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reset_capabilities:\n");
-	image_layout_reset_capabilities_print(&(ptr_struct->reset_capabilities), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "scratchpad:\n");
-	image_layout_reset_version_print(&(ptr_struct->scratchpad), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "icm_context:\n");
-	image_layout_reset_version_print(&(ptr_struct->icm_context), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci:\n");
-	image_layout_reset_version_print(&(ptr_struct->pci), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy:\n");
-	image_layout_reset_version_print(&(ptr_struct->phy), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini:\n");
-	image_layout_reset_version_print(&(ptr_struct->ini), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved1:\n");
-	image_layout_reset_version_print(&(ptr_struct->reserved1), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved2:\n");
-	image_layout_reset_version_print(&(ptr_struct->reserved2), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved3:\n");
-	image_layout_reset_version_print(&(ptr_struct->reserved3), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved4:\n");
-	image_layout_reset_version_print(&(ptr_struct->reserved4), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved5:\n");
-	image_layout_reset_version_print(&(ptr_struct->reserved5), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved6:\n");
-	image_layout_reset_version_print(&(ptr_struct->reserved6), fd, indent_level + 1);
+    return IMAGE_LAYOUT_OPERATION_KEY_SIZE;
+}
+
+void image_layout_operation_key_dump(const struct image_layout_operation_key* ptr_struct, FILE* fd)
+{
+    image_layout_operation_key_print(ptr_struct, fd, 0);
+}
+
+void image_layout_version_vector_pack(const struct image_layout_version_vector* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    image_layout_reset_capabilities_pack(&(ptr_struct->reset_capabilities), ptr_buff + offset / 8);
+    offset = 32;
+    image_layout_reset_version_pack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
+    offset = 64;
+    image_layout_reset_version_pack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
+    offset = 96;
+    image_layout_reset_version_pack(&(ptr_struct->pci), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_reset_version_pack(&(ptr_struct->phy), ptr_buff + offset / 8);
+    offset = 160;
+    image_layout_reset_version_pack(&(ptr_struct->ini), ptr_buff + offset / 8);
+    offset = 192;
+    image_layout_reset_version_pack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
+    offset = 224;
+    image_layout_reset_version_pack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
+    offset = 256;
+    image_layout_reset_version_pack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
+    offset = 288;
+    image_layout_reset_version_pack(&(ptr_struct->reserved4), ptr_buff + offset / 8);
+    offset = 320;
+    image_layout_reset_version_pack(&(ptr_struct->reserved5), ptr_buff + offset / 8);
+    offset = 352;
+    image_layout_reset_version_pack(&(ptr_struct->reserved6), ptr_buff + offset / 8);
+}
+
+void image_layout_version_vector_unpack(struct image_layout_version_vector* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    image_layout_reset_capabilities_unpack(&(ptr_struct->reset_capabilities), ptr_buff + offset / 8);
+    offset = 32;
+    image_layout_reset_version_unpack(&(ptr_struct->scratchpad), ptr_buff + offset / 8);
+    offset = 64;
+    image_layout_reset_version_unpack(&(ptr_struct->icm_context), ptr_buff + offset / 8);
+    offset = 96;
+    image_layout_reset_version_unpack(&(ptr_struct->pci), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_reset_version_unpack(&(ptr_struct->phy), ptr_buff + offset / 8);
+    offset = 160;
+    image_layout_reset_version_unpack(&(ptr_struct->ini), ptr_buff + offset / 8);
+    offset = 192;
+    image_layout_reset_version_unpack(&(ptr_struct->reserved1), ptr_buff + offset / 8);
+    offset = 224;
+    image_layout_reset_version_unpack(&(ptr_struct->reserved2), ptr_buff + offset / 8);
+    offset = 256;
+    image_layout_reset_version_unpack(&(ptr_struct->reserved3), ptr_buff + offset / 8);
+    offset = 288;
+    image_layout_reset_version_unpack(&(ptr_struct->reserved4), ptr_buff + offset / 8);
+    offset = 320;
+    image_layout_reset_version_unpack(&(ptr_struct->reserved5), ptr_buff + offset / 8);
+    offset = 352;
+    image_layout_reset_version_unpack(&(ptr_struct->reserved6), ptr_buff + offset / 8);
+}
+
+void image_layout_version_vector_print(const struct image_layout_version_vector* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_version_vector ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reset_capabilities:\n");
+    image_layout_reset_capabilities_print(&(ptr_struct->reset_capabilities), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "scratchpad:\n");
+    image_layout_reset_version_print(&(ptr_struct->scratchpad), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "icm_context:\n");
+    image_layout_reset_version_print(&(ptr_struct->icm_context), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci:\n");
+    image_layout_reset_version_print(&(ptr_struct->pci), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy:\n");
+    image_layout_reset_version_print(&(ptr_struct->phy), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini:\n");
+    image_layout_reset_version_print(&(ptr_struct->ini), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved1:\n");
+    image_layout_reset_version_print(&(ptr_struct->reserved1), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved2:\n");
+    image_layout_reset_version_print(&(ptr_struct->reserved2), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved3:\n");
+    image_layout_reset_version_print(&(ptr_struct->reserved3), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved4:\n");
+    image_layout_reset_version_print(&(ptr_struct->reserved4), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved5:\n");
+    image_layout_reset_version_print(&(ptr_struct->reserved5), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved6:\n");
+    image_layout_reset_version_print(&(ptr_struct->reserved6), fd, indent_level + 1);
 }
 
 unsigned int image_layout_version_vector_size(void)
 {
-	return IMAGE_LAYOUT_VERSION_VECTOR_SIZE;
-}
-
-void image_layout_version_vector_dump(const struct image_layout_version_vector *ptr_struct, FILE *fd)
-{
-	image_layout_version_vector_print(ptr_struct, fd, 0);
-}
-
-void image_layout_device_info_pack(const struct image_layout_device_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
-	offset = 152;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 143;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->major_version);
-	offset = 256;
-	image_layout_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 880;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
-	}
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
-		image_layout_operation_key_pack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
-	}
-	offset = 4080;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
-}
-
-void image_layout_device_info_unpack(struct image_layout_device_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 152;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 143;
-	ptr_struct->major_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
-	offset = 256;
-	image_layout_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
-	offset = 880;
-	ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
-		ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->vsd[208] = '\0';
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
-		image_layout_operation_key_unpack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
-	}
-	offset = 4080;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void image_layout_device_info_print(const struct image_layout_device_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_device_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guids:\n");
-	image_layout_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
-		fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keys_%03d:\n", i);
-		image_layout_operation_key_print(&(ptr_struct->keys[i]), fd, indent_level + 1);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    return IMAGE_LAYOUT_VERSION_VECTOR_SIZE;
+}
+
+void image_layout_version_vector_dump(const struct image_layout_version_vector* ptr_struct, FILE* fd)
+{
+    image_layout_version_vector_print(ptr_struct, fd, 0);
+}
+
+void image_layout_device_info_pack(const struct image_layout_device_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
+    offset = 152;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 143;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->major_version);
+    offset = 256;
+    image_layout_guids_pack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 880;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
+    }
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
+        image_layout_operation_key_pack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
+    }
+    offset = 4080;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+}
+
+void image_layout_device_info_unpack(struct image_layout_device_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 152;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 143;
+    ptr_struct->major_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
+    offset = 256;
+    image_layout_guids_unpack(&(ptr_struct->guids), ptr_buff + offset / 8);
+    offset = 880;
+    ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(920, 8, i, 4096, 1);
+        ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->vsd[208] = '\0';
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2816, 128, i, 4096, 1);
+        image_layout_operation_key_unpack(&(ptr_struct->keys[i]), ptr_buff + offset / 8);
+    }
+    offset = 4080;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void image_layout_device_info_print(const struct image_layout_device_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_device_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guids:\n");
+    image_layout_guids_print(&(ptr_struct->guids), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
+    fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keys_%03d:\n", i);
+        image_layout_operation_key_print(&(ptr_struct->keys[i]), fd, indent_level + 1);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
 }
 
 unsigned int image_layout_device_info_size(void)
 {
-	return IMAGE_LAYOUT_DEVICE_INFO_SIZE;
+    return IMAGE_LAYOUT_DEVICE_INFO_SIZE;
 }
 
-void image_layout_device_info_dump(const struct image_layout_device_info *ptr_struct, FILE *fd)
+void image_layout_device_info_dump(const struct image_layout_device_info* ptr_struct, FILE* fd)
 {
-	image_layout_device_info_print(ptr_struct, fd, 0);
+    image_layout_device_info_print(ptr_struct, fd, 0);
 }
 
-void image_layout_hashes_table_pack(const struct image_layout_hashes_table *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_hashes_table_pack(const struct image_layout_hashes_table* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	image_layout_hashes_table_header_pack(&(ptr_struct->header), ptr_buff + offset / 8);
-	offset = 96;
-	image_layout_htoc_pack(&(ptr_struct->htoc), ptr_buff + offset / 8);
-	for (i = 0; i < 28; ++i) {
-		offset = adb2c_calc_array_field_address(2016, 512, i, 16416, 1);
-		image_layout_htoc_hash_pack(&(ptr_struct->hash[i]), ptr_buff + offset / 8);
-	}
-	offset = 16400;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+    offset = 0;
+    image_layout_hashes_table_header_pack(&(ptr_struct->header), ptr_buff + offset / 8);
+    offset = 96;
+    image_layout_htoc_pack(&(ptr_struct->htoc), ptr_buff + offset / 8);
+    for (i = 0; i < 28; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2016, 512, i, 16416, 1);
+        image_layout_htoc_hash_pack(&(ptr_struct->hash[i]), ptr_buff + offset / 8);
+    }
+    offset = 16400;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
 }
 
-void image_layout_hashes_table_unpack(struct image_layout_hashes_table *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_hashes_table_unpack(struct image_layout_hashes_table* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	image_layout_hashes_table_header_unpack(&(ptr_struct->header), ptr_buff + offset / 8);
-	offset = 96;
-	image_layout_htoc_unpack(&(ptr_struct->htoc), ptr_buff + offset / 8);
-	for (i = 0; i < 28; ++i) {
-		offset = adb2c_calc_array_field_address(2016, 512, i, 16416, 1);
-		image_layout_htoc_hash_unpack(&(ptr_struct->hash[i]), ptr_buff + offset / 8);
-	}
-	offset = 16400;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    image_layout_hashes_table_header_unpack(&(ptr_struct->header), ptr_buff + offset / 8);
+    offset = 96;
+    image_layout_htoc_unpack(&(ptr_struct->htoc), ptr_buff + offset / 8);
+    for (i = 0; i < 28; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2016, 512, i, 16416, 1);
+        image_layout_htoc_hash_unpack(&(ptr_struct->hash[i]), ptr_buff + offset / 8);
+    }
+    offset = 16400;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_hashes_table_print(const struct image_layout_hashes_table *ptr_struct, FILE *fd, int indent_level)
+void image_layout_hashes_table_print(const struct image_layout_hashes_table* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_hashes_table ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_hashes_table ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "header:\n");
-	image_layout_hashes_table_header_print(&(ptr_struct->header), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "htoc:\n");
-	image_layout_htoc_print(&(ptr_struct->htoc), fd, indent_level + 1);
-	for (i = 0; i < 28; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "hash_%03d:\n", i);
-		image_layout_htoc_hash_print(&(ptr_struct->hash[i]), fd, indent_level + 1);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "header:\n");
+    image_layout_hashes_table_header_print(&(ptr_struct->header), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "htoc:\n");
+    image_layout_htoc_print(&(ptr_struct->htoc), fd, indent_level + 1);
+    for (i = 0; i < 28; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "hash_%03d:\n", i);
+        image_layout_htoc_hash_print(&(ptr_struct->hash[i]), fd, indent_level + 1);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
 }
 
 unsigned int image_layout_hashes_table_size(void)
 {
-	return IMAGE_LAYOUT_HASHES_TABLE_SIZE;
-}
-
-void image_layout_hashes_table_dump(const struct image_layout_hashes_table *ptr_struct, FILE *fd)
-{
-	image_layout_hashes_table_print(ptr_struct, fd, 0);
-}
-
-void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_carmel *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
-	offset = 64;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
-	offset = 192;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
-	offset = 256;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->authentication_start_pointer), ptr_buff + offset / 8);
-	offset = 320;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->authentication_end_pointer), ptr_buff + offset / 8);
-	offset = 384;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->digest_pointer), ptr_buff + offset / 8);
-	offset = 448;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->digest_recovery_key_pointer), ptr_buff + offset / 8);
-	offset = 512;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->fw_window_start_pointer), ptr_buff + offset / 8);
-	offset = 576;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->fw_window_end_pointer), ptr_buff + offset / 8);
-	offset = 640;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->image_info_section_pointer), ptr_buff + offset / 8);
-	offset = 704;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->hmac_end_pointer), ptr_buff + offset / 8);
-	offset = 768;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->public_key_pointer), ptr_buff + offset / 8);
-	offset = 832;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->fw_security_version_pointer), ptr_buff + offset / 8);
-	offset = 896;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->gcm_iv_delta_pointer), ptr_buff + offset / 8);
-	offset = 960;
-	image_layout_hw_pointer_entry_pack(&(ptr_struct->hashes_table_pointer), ptr_buff + offset / 8);
-}
-
-void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
-	offset = 64;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
-	offset = 128;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
-	offset = 192;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
-	offset = 256;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->authentication_start_pointer), ptr_buff + offset / 8);
-	offset = 320;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->authentication_end_pointer), ptr_buff + offset / 8);
-	offset = 384;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->digest_pointer), ptr_buff + offset / 8);
-	offset = 448;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->digest_recovery_key_pointer), ptr_buff + offset / 8);
-	offset = 512;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->fw_window_start_pointer), ptr_buff + offset / 8);
-	offset = 576;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->fw_window_end_pointer), ptr_buff + offset / 8);
-	offset = 640;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->image_info_section_pointer), ptr_buff + offset / 8);
-	offset = 704;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->hmac_end_pointer), ptr_buff + offset / 8);
-	offset = 768;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->public_key_pointer), ptr_buff + offset / 8);
-	offset = 832;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->fw_security_version_pointer), ptr_buff + offset / 8);
-	offset = 896;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->gcm_iv_delta_pointer), ptr_buff + offset / 8);
-	offset = 960;
-	image_layout_hw_pointer_entry_unpack(&(ptr_struct->hashes_table_pointer), ptr_buff + offset / 8);
-}
-
-void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_hw_pointers_carmel ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_record_ptr:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->boot_record_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot2_ptr:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->boot2_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "toc_ptr:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->toc_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tools_ptr:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->tools_ptr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "authentication_start_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->authentication_start_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "authentication_end_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->authentication_end_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "digest_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->digest_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "digest_recovery_key_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->digest_recovery_key_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_window_start_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->fw_window_start_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_window_end_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->fw_window_end_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_info_section_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->image_info_section_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hmac_end_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->hmac_end_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "public_key_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->public_key_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_security_version_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->fw_security_version_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "gcm_iv_delta_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->gcm_iv_delta_pointer), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hashes_table_pointer:\n");
-	image_layout_hw_pointer_entry_print(&(ptr_struct->hashes_table_pointer), fd, indent_level + 1);
+    return IMAGE_LAYOUT_HASHES_TABLE_SIZE;
+}
+
+void image_layout_hashes_table_dump(const struct image_layout_hashes_table* ptr_struct, FILE* fd)
+{
+    image_layout_hashes_table_print(ptr_struct, fd, 0);
+}
+
+void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_carmel* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
+    offset = 64;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
+    offset = 192;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
+    offset = 256;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->authentication_start_pointer), ptr_buff + offset / 8);
+    offset = 320;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->authentication_end_pointer), ptr_buff + offset / 8);
+    offset = 384;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->digest_pointer), ptr_buff + offset / 8);
+    offset = 448;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->digest_recovery_key_pointer), ptr_buff + offset / 8);
+    offset = 512;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->fw_window_start_pointer), ptr_buff + offset / 8);
+    offset = 576;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->fw_window_end_pointer), ptr_buff + offset / 8);
+    offset = 640;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->image_info_section_pointer), ptr_buff + offset / 8);
+    offset = 704;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->hmac_end_pointer), ptr_buff + offset / 8);
+    offset = 768;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->public_key_pointer), ptr_buff + offset / 8);
+    offset = 832;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->fw_security_version_pointer), ptr_buff + offset / 8);
+    offset = 896;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->gcm_iv_delta_pointer), ptr_buff + offset / 8);
+    offset = 960;
+    image_layout_hw_pointer_entry_pack(&(ptr_struct->hashes_table_pointer), ptr_buff + offset / 8);
+}
+
+void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel* ptr_struct,
+                                            const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->boot_record_ptr), ptr_buff + offset / 8);
+    offset = 64;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->boot2_ptr), ptr_buff + offset / 8);
+    offset = 128;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->toc_ptr), ptr_buff + offset / 8);
+    offset = 192;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->tools_ptr), ptr_buff + offset / 8);
+    offset = 256;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->authentication_start_pointer), ptr_buff + offset / 8);
+    offset = 320;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->authentication_end_pointer), ptr_buff + offset / 8);
+    offset = 384;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->digest_pointer), ptr_buff + offset / 8);
+    offset = 448;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->digest_recovery_key_pointer), ptr_buff + offset / 8);
+    offset = 512;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->fw_window_start_pointer), ptr_buff + offset / 8);
+    offset = 576;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->fw_window_end_pointer), ptr_buff + offset / 8);
+    offset = 640;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->image_info_section_pointer), ptr_buff + offset / 8);
+    offset = 704;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->hmac_end_pointer), ptr_buff + offset / 8);
+    offset = 768;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->public_key_pointer), ptr_buff + offset / 8);
+    offset = 832;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->fw_security_version_pointer), ptr_buff + offset / 8);
+    offset = 896;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->gcm_iv_delta_pointer), ptr_buff + offset / 8);
+    offset = 960;
+    image_layout_hw_pointer_entry_unpack(&(ptr_struct->hashes_table_pointer), ptr_buff + offset / 8);
+}
+
+void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_hw_pointers_carmel ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_record_ptr:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->boot_record_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot2_ptr:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->boot2_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "toc_ptr:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->toc_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tools_ptr:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->tools_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "authentication_start_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->authentication_start_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "authentication_end_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->authentication_end_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "digest_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->digest_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "digest_recovery_key_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->digest_recovery_key_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_window_start_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->fw_window_start_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_window_end_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->fw_window_end_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_info_section_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->image_info_section_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hmac_end_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->hmac_end_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "public_key_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->public_key_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_security_version_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->fw_security_version_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "gcm_iv_delta_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->gcm_iv_delta_pointer), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hashes_table_pointer:\n");
+    image_layout_hw_pointer_entry_print(&(ptr_struct->hashes_table_pointer), fd, indent_level + 1);
 }
 
 unsigned int image_layout_hw_pointers_carmel_size(void)
 {
-	return IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE;
-}
-
-void image_layout_hw_pointers_carmel_dump(const struct image_layout_hw_pointers_carmel *ptr_struct, FILE *fd)
-{
-	image_layout_hw_pointers_carmel_print(ptr_struct, fd, 0);
-}
-
-void image_layout_image_info_pack(const struct image_layout_image_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_boot);
-	offset = 27;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->encrypted_fw);
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->windbond_flash_support);
-	offset = 25;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->long_keys);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw_tokens_supported);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mcc_en);
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_vendor_nvconfig_files);
-	offset = 21;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_mlnx_nvconfig_files);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_supported);
-	offset = 19;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_tokens_supported);
-	offset = 18;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw);
-	offset = 17;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_fw);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	offset = 32;
-	image_layout_FW_VERSION_pack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
-	offset = 160;
-	image_layout_TRIPPLE_VERSION_pack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_vendor_id);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_device_id);
-	offset = 272;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_sub_vendor_id);
-	offset = 256;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_subsystem_id);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 432;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
-	}
-	offset = 2112;
-	image_layout_image_size_pack(&(ptr_struct->image_size), ptr_buff + offset / 8);
-	offset = 2200;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->synced_reset_downtime);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_hw_id[i]);
-	}
-	offset = 2368;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_num);
-	offset = 2400;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->burn_image_size);
-	offset = 3200;
-	image_layout_version_vector_pack(&(ptr_struct->version_vector), ptr_buff + offset / 8);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prod_ver[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
-	}
-	offset = 6144;
-	image_layout_module_versions_pack(&(ptr_struct->module_versions), ptr_buff + offset / 8);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
-	}
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
-	}
-}
-
-void image_layout_image_info_unpack(struct image_layout_image_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 29;
-	ptr_struct->secure_boot = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 27;
-	ptr_struct->encrypted_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 26;
-	ptr_struct->windbond_flash_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 25;
-	ptr_struct->long_keys = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 24;
-	ptr_struct->debug_fw_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 23;
-	ptr_struct->mcc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 22;
-	ptr_struct->signed_vendor_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 21;
-	ptr_struct->signed_mlnx_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 20;
-	ptr_struct->frc_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 19;
-	ptr_struct->cs_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 18;
-	ptr_struct->debug_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 17;
-	ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 16;
-	ptr_struct->secure_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 8;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	image_layout_FW_VERSION_unpack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
-	offset = 160;
-	image_layout_TRIPPLE_VERSION_unpack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
-	offset = 240;
-	ptr_struct->pci_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 224;
-	ptr_struct->pci_device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 272;
-	ptr_struct->pci_sub_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 256;
-	ptr_struct->pci_subsystem_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
-		ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->psid[16] = '\0';
-	offset = 432;
-	ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 208; ++i) {
-		offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
-		ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->vsd[208] = '\0';
-	offset = 2112;
-	image_layout_image_size_unpack(&(ptr_struct->image_size), ptr_buff + offset / 8);
-	offset = 2200;
-	ptr_struct->synced_reset_downtime = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
-		ptr_struct->supported_hw_id[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	offset = 2368;
-	ptr_struct->ini_file_num = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 2400;
-	ptr_struct->burn_image_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 3200;
-	image_layout_version_vector_unpack(&(ptr_struct->version_vector), ptr_buff + offset / 8);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
-		ptr_struct->prod_ver[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->prod_ver[16] = '\0';
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
-		ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->description[256] = '\0';
-	offset = 6144;
-	image_layout_module_versions_unpack(&(ptr_struct->module_versions), ptr_buff + offset / 8);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
-		ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->name[64] = '\0';
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
-		ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->prs_name[128] = '\0';
-}
-
-void image_layout_image_info_print(const struct image_layout_image_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_image_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "secure_boot          : " UH_FMT "\n", ptr_struct->secure_boot);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "encrypted_fw         : " UH_FMT "\n", ptr_struct->encrypted_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "windbond_flash_support : " UH_FMT "\n", ptr_struct->windbond_flash_support);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "long_keys            : " UH_FMT "\n", ptr_struct->long_keys);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug_fw_tokens_supported : " UH_FMT "\n", ptr_struct->debug_fw_tokens_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcc_en               : " UH_FMT "\n", ptr_struct->mcc_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_vendor_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_vendor_nvconfig_files);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_mlnx_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_mlnx_nvconfig_files);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "frc_supported        : " UH_FMT "\n", ptr_struct->frc_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cs_tokens_supported  : " UH_FMT "\n", ptr_struct->cs_tokens_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug_fw             : " UH_FMT "\n", ptr_struct->debug_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "secure_fw            : " UH_FMT "\n", ptr_struct->secure_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "FW_VERSION:\n");
-	image_layout_FW_VERSION_print(&(ptr_struct->FW_VERSION), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mic_version:\n");
-	image_layout_TRIPPLE_VERSION_print(&(ptr_struct->mic_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_vendor_id        : " UH_FMT "\n", ptr_struct->pci_vendor_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_device_id        : " UH_FMT "\n", ptr_struct->pci_device_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_sub_vendor_id    : " UH_FMT "\n", ptr_struct->pci_sub_vendor_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_subsystem_id     : " UH_FMT "\n", ptr_struct->pci_subsystem_id);
-		fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
-		fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_size:\n");
-	image_layout_image_size_print(&(ptr_struct->image_size), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "synced_reset_downtime : " UH_FMT "\n", ptr_struct->synced_reset_downtime);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "supported_hw_id_%03d : " U32H_FMT "\n", i, ptr_struct->supported_hw_id[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini_file_num         : " U32H_FMT "\n", ptr_struct->ini_file_num);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "burn_image_size      : " U32H_FMT "\n", ptr_struct->burn_image_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version_vector:\n");
-	image_layout_version_vector_print(&(ptr_struct->version_vector), fd, indent_level + 1);
-		fprintf(fd, "prod_ver             : \"%s\"\n", ptr_struct->prod_ver);
-		fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "module_versions:\n");
-	image_layout_module_versions_print(&(ptr_struct->module_versions), fd, indent_level + 1);
-		fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
-		fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
+    return IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE;
+}
+
+void image_layout_hw_pointers_carmel_dump(const struct image_layout_hw_pointers_carmel* ptr_struct, FILE* fd)
+{
+    image_layout_hw_pointers_carmel_print(ptr_struct, fd, 0);
+}
+
+void image_layout_image_info_pack(const struct image_layout_image_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_boot);
+    offset = 27;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->encrypted_fw);
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->windbond_flash_support);
+    offset = 25;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->long_keys);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw_tokens_supported);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mcc_en);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_vendor_nvconfig_files);
+    offset = 21;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_mlnx_nvconfig_files);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->frc_supported);
+    offset = 19;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cs_tokens_supported);
+    offset = 18;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw);
+    offset = 17;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_fw);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    offset = 32;
+    image_layout_FW_VERSION_pack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
+    offset = 160;
+    image_layout_TRIPPLE_VERSION_pack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_vendor_id);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_device_id);
+    offset = 272;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_sub_vendor_id);
+    offset = 256;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pci_subsystem_id);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 432;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vsd_vendor_id);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vsd[i]);
+    }
+    offset = 2112;
+    image_layout_image_size_pack(&(ptr_struct->image_size), ptr_buff + offset / 8);
+    offset = 2200;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->synced_reset_downtime);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_hw_id[i]);
+    }
+    offset = 2368;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_num);
+    offset = 2400;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->burn_image_size);
+    offset = 3200;
+    image_layout_version_vector_pack(&(ptr_struct->version_vector), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prod_ver[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
+    }
+    offset = 6144;
+    image_layout_module_versions_pack(&(ptr_struct->module_versions), ptr_buff + offset / 8);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
+    }
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
+    }
+}
+
+void image_layout_image_info_unpack(struct image_layout_image_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 29;
+    ptr_struct->secure_boot = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 27;
+    ptr_struct->encrypted_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 26;
+    ptr_struct->windbond_flash_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 25;
+    ptr_struct->long_keys = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 24;
+    ptr_struct->debug_fw_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 23;
+    ptr_struct->mcc_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 22;
+    ptr_struct->signed_vendor_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 21;
+    ptr_struct->signed_mlnx_nvconfig_files = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 20;
+    ptr_struct->frc_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 19;
+    ptr_struct->cs_tokens_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 18;
+    ptr_struct->debug_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 17;
+    ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->secure_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 8;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    image_layout_FW_VERSION_unpack(&(ptr_struct->FW_VERSION), ptr_buff + offset / 8);
+    offset = 160;
+    image_layout_TRIPPLE_VERSION_unpack(&(ptr_struct->mic_version), ptr_buff + offset / 8);
+    offset = 240;
+    ptr_struct->pci_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 224;
+    ptr_struct->pci_device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 272;
+    ptr_struct->pci_sub_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 256;
+    ptr_struct->pci_subsystem_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->psid[16] = '\0';
+    offset = 432;
+    ptr_struct->vsd_vendor_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 208; ++i)
+    {
+        offset = adb2c_calc_array_field_address(472, 8, i, 8192, 1);
+        ptr_struct->vsd[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->vsd[208] = '\0';
+    offset = 2112;
+    image_layout_image_size_unpack(&(ptr_struct->image_size), ptr_buff + offset / 8);
+    offset = 2200;
+    ptr_struct->synced_reset_downtime = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(2240, 32, i, 8192, 1);
+        ptr_struct->supported_hw_id[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    offset = 2368;
+    ptr_struct->ini_file_num = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 2400;
+    ptr_struct->burn_image_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 3200;
+    image_layout_version_vector_unpack(&(ptr_struct->version_vector), ptr_buff + offset / 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3608, 8, i, 8192, 1);
+        ptr_struct->prod_ver[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->prod_ver[16] = '\0';
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
+        ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->description[256] = '\0';
+    offset = 6144;
+    image_layout_module_versions_unpack(&(ptr_struct->module_versions), ptr_buff + offset / 8);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
+        ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->name[64] = '\0';
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
+        ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->prs_name[128] = '\0';
+}
+
+void image_layout_image_info_print(const struct image_layout_image_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_image_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "secure_boot          : " UH_FMT "\n", ptr_struct->secure_boot);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "encrypted_fw         : " UH_FMT "\n", ptr_struct->encrypted_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "windbond_flash_support : " UH_FMT "\n", ptr_struct->windbond_flash_support);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "long_keys            : " UH_FMT "\n", ptr_struct->long_keys);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug_fw_tokens_supported : " UH_FMT "\n", ptr_struct->debug_fw_tokens_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcc_en               : " UH_FMT "\n", ptr_struct->mcc_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_vendor_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_vendor_nvconfig_files);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_mlnx_nvconfig_files : " UH_FMT "\n", ptr_struct->signed_mlnx_nvconfig_files);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "frc_supported        : " UH_FMT "\n", ptr_struct->frc_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cs_tokens_supported  : " UH_FMT "\n", ptr_struct->cs_tokens_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug_fw             : " UH_FMT "\n", ptr_struct->debug_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "secure_fw            : " UH_FMT "\n", ptr_struct->secure_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "FW_VERSION:\n");
+    image_layout_FW_VERSION_print(&(ptr_struct->FW_VERSION), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mic_version:\n");
+    image_layout_TRIPPLE_VERSION_print(&(ptr_struct->mic_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_vendor_id        : " UH_FMT "\n", ptr_struct->pci_vendor_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_device_id        : " UH_FMT "\n", ptr_struct->pci_device_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_sub_vendor_id    : " UH_FMT "\n", ptr_struct->pci_sub_vendor_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_subsystem_id     : " UH_FMT "\n", ptr_struct->pci_subsystem_id);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vsd_vendor_id        : " UH_FMT "\n", ptr_struct->vsd_vendor_id);
+    fprintf(fd, "vsd                  : \"%s\"\n", ptr_struct->vsd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_size:\n");
+    image_layout_image_size_print(&(ptr_struct->image_size), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "synced_reset_downtime : " UH_FMT "\n", ptr_struct->synced_reset_downtime);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "supported_hw_id_%03d : " U32H_FMT "\n", i, ptr_struct->supported_hw_id[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini_file_num         : " U32H_FMT "\n", ptr_struct->ini_file_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "burn_image_size      : " U32H_FMT "\n", ptr_struct->burn_image_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version_vector:\n");
+    image_layout_version_vector_print(&(ptr_struct->version_vector), fd, indent_level + 1);
+    fprintf(fd, "prod_ver             : \"%s\"\n", ptr_struct->prod_ver);
+    fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "module_versions:\n");
+    image_layout_module_versions_print(&(ptr_struct->module_versions), fd, indent_level + 1);
+    fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
+    fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
 }
 
 unsigned int image_layout_image_info_size(void)
 {
-	return IMAGE_LAYOUT_IMAGE_INFO_SIZE;
-}
-
-void image_layout_image_info_dump(const struct image_layout_image_info *ptr_struct, FILE *fd)
-{
-	image_layout_image_info_print(ptr_struct, fd, 0);
-}
-
-void image_layout_itoc_entry_pack(const struct image_layout_itoc_entry *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 22, (u_int32_t)ptr_struct->size);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 30, (u_int32_t)ptr_struct->param0);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cache_line_crc);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->zipped_image);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->param1);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->version);
-	offset = 161;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 29, (u_int32_t)ptr_struct->flash_addr);
-	offset = 208;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->section_crc);
-	offset = 205;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->crc);
-	offset = 192;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->encrypted_section);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
-}
-
-void image_layout_itoc_entry_unpack(struct image_layout_itoc_entry *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	ptr_struct->size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 22);
-	offset = 0;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 34;
-	ptr_struct->param0 = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 30);
-	offset = 33;
-	ptr_struct->cache_line_crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->zipped_image = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->param1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 144;
-	ptr_struct->version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 161;
-	ptr_struct->flash_addr = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 29);
-	offset = 208;
-	ptr_struct->section_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 205;
-	ptr_struct->crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 192;
-	ptr_struct->encrypted_section = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 240;
-	ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void image_layout_itoc_entry_print(const struct image_layout_itoc_entry *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_itoc_entry ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param0               : " UH_FMT "\n", ptr_struct->param0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cache_line_crc       : " UH_FMT "\n", ptr_struct->cache_line_crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "zipped_image         : " UH_FMT "\n", ptr_struct->zipped_image);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param1               : " U32H_FMT "\n", ptr_struct->param1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_addr           : " UH_FMT "\n", ptr_struct->flash_addr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "section_crc          : " UH_FMT "\n", ptr_struct->section_crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "encrypted_section    : " UH_FMT "\n", ptr_struct->encrypted_section);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
+    return IMAGE_LAYOUT_IMAGE_INFO_SIZE;
+}
+
+void image_layout_image_info_dump(const struct image_layout_image_info* ptr_struct, FILE* fd)
+{
+    image_layout_image_info_print(ptr_struct, fd, 0);
+}
+
+void image_layout_itoc_entry_pack(const struct image_layout_itoc_entry* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 22, (u_int32_t)ptr_struct->size);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 30, (u_int32_t)ptr_struct->param0);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cache_line_crc);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->zipped_image);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->param1);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->version);
+    offset = 161;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 29, (u_int32_t)ptr_struct->flash_addr);
+    offset = 208;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->section_crc);
+    offset = 205;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->crc);
+    offset = 192;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->encrypted_section);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
+}
+
+void image_layout_itoc_entry_unpack(struct image_layout_itoc_entry* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    ptr_struct->size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 22);
+    offset = 0;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 34;
+    ptr_struct->param0 = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 30);
+    offset = 33;
+    ptr_struct->cache_line_crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->zipped_image = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->param1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 144;
+    ptr_struct->version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 161;
+    ptr_struct->flash_addr = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 29);
+    offset = 208;
+    ptr_struct->section_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 205;
+    ptr_struct->crc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 192;
+    ptr_struct->encrypted_section = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 240;
+    ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void image_layout_itoc_entry_print(const struct image_layout_itoc_entry* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_itoc_entry ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param0               : " UH_FMT "\n", ptr_struct->param0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cache_line_crc       : " UH_FMT "\n", ptr_struct->cache_line_crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "zipped_image         : " UH_FMT "\n", ptr_struct->zipped_image);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param1               : " U32H_FMT "\n", ptr_struct->param1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_addr           : " UH_FMT "\n", ptr_struct->flash_addr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "section_crc          : " UH_FMT "\n", ptr_struct->section_crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "encrypted_section    : " UH_FMT "\n", ptr_struct->encrypted_section);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
 }
 
 unsigned int image_layout_itoc_entry_size(void)
 {
-	return IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
-}
-
-void image_layout_itoc_entry_dump(const struct image_layout_itoc_entry *ptr_struct, FILE *fd)
-{
-	image_layout_itoc_entry_print(ptr_struct, fd, 0);
-}
-
-void image_layout_itoc_header_pack(const struct image_layout_itoc_header *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
-	offset = 152;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->flash_layout_version);
-	offset = 184;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_of_entries);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
-}
-
-void image_layout_itoc_header_unpack(struct image_layout_itoc_header *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 152;
-	ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 128;
-	ptr_struct->flash_layout_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 184;
-	ptr_struct->num_of_entries = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 240;
-	ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void image_layout_itoc_header_print(const struct image_layout_itoc_header *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_itoc_header ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_layout_version : " UH_FMT "\n", ptr_struct->flash_layout_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_entries       : " UH_FMT "\n", ptr_struct->num_of_entries);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
+    return IMAGE_LAYOUT_ITOC_ENTRY_SIZE;
+}
+
+void image_layout_itoc_entry_dump(const struct image_layout_itoc_entry* ptr_struct, FILE* fd)
+{
+    image_layout_itoc_entry_print(ptr_struct, fd, 0);
+}
+
+void image_layout_itoc_header_pack(const struct image_layout_itoc_header* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
+    offset = 152;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->flash_layout_version);
+    offset = 184;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_of_entries);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->itoc_entry_crc);
+}
+
+void image_layout_itoc_header_unpack(struct image_layout_itoc_header* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 152;
+    ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 128;
+    ptr_struct->flash_layout_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 184;
+    ptr_struct->num_of_entries = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 240;
+    ptr_struct->itoc_entry_crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void image_layout_itoc_header_print(const struct image_layout_itoc_header* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_itoc_header ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_layout_version : " UH_FMT "\n", ptr_struct->flash_layout_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_entries       : " UH_FMT "\n", ptr_struct->num_of_entries);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_entry_crc       : " UH_FMT "\n", ptr_struct->itoc_entry_crc);
 }
 
 unsigned int image_layout_itoc_header_size(void)
 {
-	return IMAGE_LAYOUT_ITOC_HEADER_SIZE;
+    return IMAGE_LAYOUT_ITOC_HEADER_SIZE;
 }
 
-void image_layout_itoc_header_dump(const struct image_layout_itoc_header *ptr_struct, FILE *fd)
+void image_layout_itoc_header_dump(const struct image_layout_itoc_header* ptr_struct, FILE* fd)
 {
-	image_layout_itoc_header_print(ptr_struct, fd, 0);
+    image_layout_itoc_header_print(ptr_struct, fd, 0);
 }
 
-void image_layout_tools_area_pack(const struct image_layout_tools_area *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_tools_area_pack(const struct image_layout_tools_area* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->bin_ver_minor);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->bin_ver_major);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->log2_img_slot_size);
-	offset = 496;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->bin_ver_minor);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->bin_ver_major);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->log2_img_slot_size);
+    offset = 496;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
 }
 
-void image_layout_tools_area_unpack(struct image_layout_tools_area *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_tools_area_unpack(struct image_layout_tools_area* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 56;
-	ptr_struct->bin_ver_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->bin_ver_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->log2_img_slot_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 496;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 24;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->bin_ver_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->bin_ver_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->log2_img_slot_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 496;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_tools_area_print(const struct image_layout_tools_area *ptr_struct, FILE *fd, int indent_level)
+void image_layout_tools_area_print(const struct image_layout_tools_area* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_tools_area ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_tools_area ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bin_ver_minor        : " UH_FMT "\n", ptr_struct->bin_ver_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bin_ver_major        : " UH_FMT "\n", ptr_struct->bin_ver_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log2_img_slot_size   : " UH_FMT "\n", ptr_struct->log2_img_slot_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bin_ver_minor        : " UH_FMT "\n", ptr_struct->bin_ver_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bin_ver_major        : " UH_FMT "\n", ptr_struct->bin_ver_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log2_img_slot_size   : " UH_FMT "\n", ptr_struct->log2_img_slot_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
 }
 
 unsigned int image_layout_tools_area_size(void)
 {
-	return IMAGE_LAYOUT_TOOLS_AREA_SIZE;
+    return IMAGE_LAYOUT_TOOLS_AREA_SIZE;
 }
 
-void image_layout_tools_area_dump(const struct image_layout_tools_area *ptr_struct, FILE *fd)
+void image_layout_tools_area_dump(const struct image_layout_tools_area* ptr_struct, FILE* fd)
 {
-	image_layout_tools_area_print(ptr_struct, fd, 0);
+    image_layout_tools_area_print(ptr_struct, fd, 0);
 }
 
-void image_layout_image_layout_Nodes_pack(const union image_layout_image_layout_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void image_layout_image_layout_Nodes_pack(const union image_layout_image_layout_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
-	image_layout_hashes_table_pack(&(ptr_struct->hashes_table), ptr_buff);
+    image_layout_hashes_table_pack(&(ptr_struct->hashes_table), ptr_buff);
 }
 
-void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
-	image_layout_hashes_table_unpack(&(ptr_struct->hashes_table), ptr_buff);
+    image_layout_hashes_table_unpack(&(ptr_struct->hashes_table), ptr_buff);
 }
 
-void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes *ptr_struct, FILE *fd, int indent_level)
+void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== image_layout_image_layout_Nodes ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== image_layout_image_layout_Nodes ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tools_area:\n");
-	image_layout_tools_area_print(&(ptr_struct->tools_area), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_entry:\n");
-	image_layout_itoc_entry_print(&(ptr_struct->itoc_entry), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hashes_table:\n");
-	image_layout_hashes_table_print(&(ptr_struct->hashes_table), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_info:\n");
-	image_layout_image_info_print(&(ptr_struct->image_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_pointers_carmel:\n");
-	image_layout_hw_pointers_carmel_print(&(ptr_struct->hw_pointers_carmel), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "itoc_header:\n");
-	image_layout_itoc_header_print(&(ptr_struct->itoc_header), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_info:\n");
-	image_layout_device_info_print(&(ptr_struct->device_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tools_area:\n");
+    image_layout_tools_area_print(&(ptr_struct->tools_area), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_entry:\n");
+    image_layout_itoc_entry_print(&(ptr_struct->itoc_entry), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hashes_table:\n");
+    image_layout_hashes_table_print(&(ptr_struct->hashes_table), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_info:\n");
+    image_layout_image_info_print(&(ptr_struct->image_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_pointers_carmel:\n");
+    image_layout_hw_pointers_carmel_print(&(ptr_struct->hw_pointers_carmel), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "itoc_header:\n");
+    image_layout_itoc_header_print(&(ptr_struct->itoc_header), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_info:\n");
+    image_layout_device_info_print(&(ptr_struct->device_info), fd, indent_level + 1);
 }
 
 unsigned int image_layout_image_layout_Nodes_size(void)
 {
-	return IMAGE_LAYOUT_IMAGE_LAYOUT_NODES_SIZE;
+    return IMAGE_LAYOUT_IMAGE_LAYOUT_NODES_SIZE;
 }
 
-void image_layout_image_layout_Nodes_dump(const union image_layout_image_layout_Nodes *ptr_struct, FILE *fd)
+void image_layout_image_layout_Nodes_dump(const union image_layout_image_layout_Nodes* ptr_struct, FILE* fd)
 {
-	image_layout_image_layout_Nodes_print(ptr_struct, fd, 0);
+    image_layout_image_layout_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/image_layout_layouts.h b/tools_layouts/image_layout_layouts.h
old mode 100755
new mode 100644
index 9b897ec6..c22bb15e
--- a/tools_layouts/image_layout_layouts.h
+++ b/tools_layouts/image_layout_layouts.h
@@ -29,1010 +29,1066 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2022-02-06 17:27:46"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/image_layout/image_layout.adb --file-prefix image_layout --prefix image_layout_ --no-adb-utils
-         ***/
+ *** This file was generated at "2022-02-06 17:27:46"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/image_layout/image_layout.adb
+ *--file-prefix image_layout --prefix image_layout_ --no-adb-utils
+ ***/
 #ifndef IMAGE_LAYOUT_LAYOUTS_H
 #define IMAGE_LAYOUT_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 8 */
-struct image_layout_uint64 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int64_t uint64;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct image_layout_uint64
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int64_t uint64;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct image_layout_htoc_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t hash_offset;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t section_type;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct image_layout_htoc_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t hash_offset;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t section_type;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct image_layout_htoc_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t num_of_entries;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t hash_type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t hash_size;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct image_layout_htoc_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t num_of_entries;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t hash_type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t hash_size;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct image_layout_module_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t branch;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.8 - 0x0.19 */
-	u_int16_t minor;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.20 - 0x0.31 */
-	u_int16_t major;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct image_layout_module_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t branch;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.8 - 0x0.19 */
+        u_int16_t minor;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.20 - 0x0.31 */
+        u_int16_t major;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct image_layout_reset_capabilities {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Initial capability for reset level */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t reset_ver_en;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Version field used for the version vector. The firmware cannot peform Live-Patch from different version_vector_ver. Note: Different major values are not supported. */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t version_vector_ver;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct image_layout_reset_capabilities
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Initial capability for reset level */
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t reset_ver_en;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Version field used for the version vector. The firmware cannot peform Live-Patch from different
+         * version_vector_ver. Note: Different major values are not supported. */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t version_vector_ver;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct image_layout_reset_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - major must be supported in order to support lfwp */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t major;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - branch must be supported in order to support lfwp */
-	/* 0x0.16 - 0x0.19 */
-	u_int8_t branch;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - determines which transfer function to run */
-	/* 0x0.20 - 0x0.27 */
-	u_int8_t minor;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct image_layout_reset_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - major must be supported in order to support lfwp */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t major;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - branch must be supported in order to support lfwp */
+        /* 0x0.16 - 0x0.19 */
+        u_int8_t branch;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - determines which transfer function to run */
+        /* 0x0.20 - 0x0.27 */
+        u_int8_t minor;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct image_layout_uid_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Number of allocated UIDs in this entry */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t num_allocated;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Step size by which to derive the UIDs for this entry
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct image_layout_uid_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Number of allocated UIDs in this entry */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t num_allocated;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Step size by which to derive the UIDs for this entry
 See struct description */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t step;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - For MACs, the upper 16 bits in the 'hi' dword are reserved */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t uid;
-};
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t step;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - For MACs, the upper 16 bits in the 'hi' dword are reserved */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t uid;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct image_layout_FW_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t SUBMINOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t MINOR;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.8 - 0x8.15 */
-	u_int8_t Hour;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.16 - 0x8.23 */
-	u_int8_t Minutes;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.24 - 0x8.31 */
-	u_int8_t Seconds;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.7 */
-	u_int8_t Day;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.8 - 0xc.15 */
-	u_int8_t Month;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.16 - 0xc.31 */
-	u_int16_t Year;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct image_layout_FW_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.8 - 0x8.15 */
+        u_int8_t Hour;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t Minutes;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t Seconds;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t Day;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t Month;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.16 - 0xc.31 */
+        u_int16_t Year;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct image_layout_TRIPPLE_VERSION {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t MAJOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t SUBMINOR;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t MINOR;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct image_layout_TRIPPLE_VERSION
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t MAJOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t SUBMINOR;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t MINOR;
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct image_layout_guids {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - UIDs (MACs and GUIDs) Allocation Entry.
-guids, is used for system GUID, node GUID and port GUID of port 0. ;/Multiple UIDs can be assigned to a single port, to be used for multiple virtual guests, multi host and managment */
-	/* 0x0.0 - 0xc.31 */
-	struct image_layout_uid_entry guids;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x1c.31 */
-	struct image_layout_uid_entry macs;
-};
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct image_layout_guids
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - UIDs (MACs and GUIDs) Allocation Entry.
+guids, is used for system GUID, node GUID and port GUID of port 0. ;/Multiple UIDs can be assigned to a single port, to
+be used for multiple virtual guests, multi host and managment */
+        /* 0x0.0 - 0xc.31 */
+        struct image_layout_uid_entry guids;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x1c.31 */
+        struct image_layout_uid_entry macs;
+    };
 
-/* Description -   */
-/* Size in bytes - 12 */
-struct image_layout_hashes_table_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Hard-coded to 0 */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t load_address;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Num of payload DWs + 1 */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t dw_size;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Calculated over the first 2 DWs */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t crc;
-};
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct image_layout_hashes_table_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Hard-coded to 0 */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t load_address;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Num of payload DWs + 1 */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t dw_size;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Calculated over the first 2 DWs */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 240 */
-struct image_layout_htoc {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct image_layout_htoc_header header;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0xec.31 */
-	struct image_layout_htoc_entry entry[28];
-};
+    /* Description -   */
+    /* Size in bytes - 240 */
+    struct image_layout_htoc
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct image_layout_htoc_header header;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0xec.31 */
+        struct image_layout_htoc_entry entry[28];
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct image_layout_htoc_hash {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	u_int32_t hash_val[16];
-};
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct image_layout_htoc_hash
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        u_int32_t hash_val[16];
+    };
 
-/* Description -  HW pointer entry */
-/* Size in bytes - 8 */
-struct image_layout_hw_pointer_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - pointer */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t ptr;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - crc16 as calculated by HW */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t crc;
-};
+    /* Description -  HW pointer entry */
+    /* Size in bytes - 8 */
+    struct image_layout_hw_pointer_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - pointer */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t ptr;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - crc16 as calculated by HW */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct image_layout_image_size {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - log of next address in bytes to search for an image. Address in bytes is 2^log_step */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t log_step;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - this image can run from any partition starting at address 0x0000000, 0x4000000, 0x800000. The code supports only two partitions. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t run_from_any;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Max possible size in bytes of image. Image read / write should not occure beyond this address */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t max_size;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct image_layout_image_size
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - log of next address in bytes to search for an image. Address in bytes is 2^log_step */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t log_step;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - this image can run from any partition starting at address 0x0000000, 0x4000000, 0x800000. The
+         * code supports only two partitions. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t run_from_any;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Max possible size in bytes of image. Image read / write should not occure beyond this address
+         */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t max_size;
+    };
 
-/* Description -   */
-/* Size in bytes - 64 */
-struct image_layout_module_versions {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct image_layout_module_version core;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	struct image_layout_module_version phy;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	struct image_layout_module_version kernel;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	struct image_layout_module_version iron_image;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.31 */
-	struct image_layout_module_version host_management;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x14.31 */
-	struct image_layout_module_version mad;
-};
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct image_layout_module_versions
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct image_layout_module_version core;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        struct image_layout_module_version phy;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        struct image_layout_module_version kernel;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        struct image_layout_module_version iron_image;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.31 */
+        struct image_layout_module_version host_management;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x14.31 */
+        struct image_layout_module_version mad;
+    };
 
-/* Description -   */
-/* Size in bytes - 16 */
-struct image_layout_operation_key {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t key_modifier;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t key;
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct image_layout_operation_key
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t key_modifier;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t key;
+    };
 
-/* Description -   */
-/* Size in bytes - 48 */
-struct image_layout_version_vector {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct image_layout_reset_capabilities reset_capabilities;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - cores SP */
-	/* 0x4.0 - 0x4.31 */
-	struct image_layout_reset_version scratchpad;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	struct image_layout_reset_version icm_context;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - PCI domain */
-	/* 0xc.0 - 0xc.31 */
-	struct image_layout_reset_version pci;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - PHY domain */
-	/* 0x10.0 - 0x10.31 */
-	struct image_layout_reset_version phy;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x14.31 */
-	struct image_layout_reset_version ini;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.31 */
-	struct image_layout_reset_version reserved1;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.31 */
-	struct image_layout_reset_version reserved2;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x20.31 */
-	struct image_layout_reset_version reserved3;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.0 - 0x24.31 */
-	struct image_layout_reset_version reserved4;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x28.31 */
-	struct image_layout_reset_version reserved5;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description -  */
-	/* 0x2c.0 - 0x2c.31 */
-	struct image_layout_reset_version reserved6;
-};
+    /* Description -   */
+    /* Size in bytes - 48 */
+    struct image_layout_version_vector
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct image_layout_reset_capabilities reset_capabilities;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - cores SP */
+        /* 0x4.0 - 0x4.31 */
+        struct image_layout_reset_version scratchpad;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        struct image_layout_reset_version icm_context;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - PCI domain */
+        /* 0xc.0 - 0xc.31 */
+        struct image_layout_reset_version pci;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - PHY domain */
+        /* 0x10.0 - 0x10.31 */
+        struct image_layout_reset_version phy;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x14.31 */
+        struct image_layout_reset_version ini;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.31 */
+        struct image_layout_reset_version reserved1;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.31 */
+        struct image_layout_reset_version reserved2;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x20.31 */
+        struct image_layout_reset_version reserved3;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.0 - 0x24.31 */
+        struct image_layout_reset_version reserved4;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x28.31 */
+        struct image_layout_reset_version reserved5;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description -  */
+        /* 0x2c.0 - 0x2c.31 */
+        struct image_layout_reset_version reserved6;
+    };
 
-/* Description -   */
-/* Size in bytes - 512 */
-struct image_layout_device_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t signature3;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Format version for this struct */
-	/* 0x10.0 - 0x10.7 */
-	u_int8_t minor_version;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Format version for this struct */
-	/* 0x10.8 - 0x10.16 */
-	u_int16_t major_version;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x5c.31 */
-	struct image_layout_guids guids;
-/*---------------- DWORD[27] (Offset 0x6c) ----------------*/
-	/* Description -  */
-	/* 0x6c.0 - 0x6c.15 */
-	u_int16_t vsd_vendor_id;
-/*---------------- DWORD[28] (Offset 0x70) ----------------*/
-	/* Description -  */
-	/* 0x70.24 - 0x140.23 */
-	char vsd[209];
-/*---------------- DWORD[88] (Offset 0x160) ----------------*/
-	/* Description -  */
-	/* 0x160.0 - 0x19c.31 */
-	struct image_layout_operation_key keys[4];
-/*---------------- DWORD[127] (Offset 0x1fc) ----------------*/
-	/* Description -  */
-	/* 0x1fc.0 - 0x1fc.15 */
-	u_int16_t crc;
-};
+    /* Description -   */
+    /* Size in bytes - 512 */
+    struct image_layout_device_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Format version for this struct */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t minor_version;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Format version for this struct */
+        /* 0x10.8 - 0x10.16 */
+        u_int16_t major_version;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x5c.31 */
+        struct image_layout_guids guids;
+        /*---------------- DWORD[27] (Offset 0x6c) ----------------*/
+        /* Description -  */
+        /* 0x6c.0 - 0x6c.15 */
+        u_int16_t vsd_vendor_id;
+        /*---------------- DWORD[28] (Offset 0x70) ----------------*/
+        /* Description -  */
+        /* 0x70.24 - 0x140.23 */
+        char vsd[209];
+        /*---------------- DWORD[88] (Offset 0x160) ----------------*/
+        /* Description -  */
+        /* 0x160.0 - 0x19c.31 */
+        struct image_layout_operation_key keys[4];
+        /*---------------- DWORD[127] (Offset 0x1fc) ----------------*/
+        /* Description -  */
+        /* 0x1fc.0 - 0x1fc.15 */
+        u_int16_t crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 2052 */
-struct image_layout_hashes_table {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct image_layout_hashes_table_header header;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xf8.31 */
-	struct image_layout_htoc htoc;
-/*---------------- DWORD[63] (Offset 0xfc) ----------------*/
-	/* Description -  */
-	/* 0xfc.0 - 0x7f8.31 */
-	struct image_layout_htoc_hash hash[28];
-/*---------------- DWORD[512] (Offset 0x800) ----------------*/
-	/* Description -  */
-	/* 0x800.0 - 0x800.15 */
-	u_int16_t crc;
-};
+    /* Description -   */
+    /* Size in bytes - 2052 */
+    struct image_layout_hashes_table
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct image_layout_hashes_table_header header;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xf8.31 */
+        struct image_layout_htoc htoc;
+        /*---------------- DWORD[63] (Offset 0xfc) ----------------*/
+        /* Description -  */
+        /* 0xfc.0 - 0x7f8.31 */
+        struct image_layout_htoc_hash hash[28];
+        /*---------------- DWORD[512] (Offset 0x800) ----------------*/
+        /* Description -  */
+        /* 0x800.0 - 0x800.15 */
+        u_int16_t crc;
+    };
 
-/* Description -  HW pointers */
-/* Size in bytes - 128 */
-struct image_layout_hw_pointers_carmel {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct image_layout_hw_pointer_entry boot_record_ptr;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	struct image_layout_hw_pointer_entry boot2_ptr;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x14.31 */
-	struct image_layout_hw_pointer_entry toc_ptr;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x1c.31 */
-	struct image_layout_hw_pointer_entry tools_ptr;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x24.31 */
-	struct image_layout_hw_pointer_entry authentication_start_pointer;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x2c.31 */
-	struct image_layout_hw_pointer_entry authentication_end_pointer;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description -  */
-	/* 0x30.0 - 0x34.31 */
-	struct image_layout_hw_pointer_entry digest_pointer;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description -  */
-	/* 0x38.0 - 0x3c.31 */
-	struct image_layout_hw_pointer_entry digest_recovery_key_pointer;
-/*---------------- DWORD[16] (Offset 0x40) ----------------*/
-	/* Description -  */
-	/* 0x40.0 - 0x44.31 */
-	struct image_layout_hw_pointer_entry fw_window_start_pointer;
-/*---------------- DWORD[18] (Offset 0x48) ----------------*/
-	/* Description -  */
-	/* 0x48.0 - 0x4c.31 */
-	struct image_layout_hw_pointer_entry fw_window_end_pointer;
-/*---------------- DWORD[20] (Offset 0x50) ----------------*/
-	/* Description -  */
-	/* 0x50.0 - 0x54.31 */
-	struct image_layout_hw_pointer_entry image_info_section_pointer;
-/*---------------- DWORD[22] (Offset 0x58) ----------------*/
-	/* Description -  */
-	/* 0x58.0 - 0x5c.31 */
-	struct image_layout_hw_pointer_entry hmac_end_pointer;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description -  */
-	/* 0x60.0 - 0x64.31 */
-	struct image_layout_hw_pointer_entry public_key_pointer;
-/*---------------- DWORD[26] (Offset 0x68) ----------------*/
-	/* Description -  */
-	/* 0x68.0 - 0x6c.31 */
-	struct image_layout_hw_pointer_entry fw_security_version_pointer;
-/*---------------- DWORD[28] (Offset 0x70) ----------------*/
-	/* Description -  */
-	/* 0x70.0 - 0x74.31 */
-	struct image_layout_hw_pointer_entry gcm_iv_delta_pointer;
-/*---------------- DWORD[30] (Offset 0x78) ----------------*/
-	/* Description -  */
-	/* 0x78.0 - 0x7c.31 */
-	struct image_layout_hw_pointer_entry hashes_table_pointer;
-};
+    /* Description -  HW pointers */
+    /* Size in bytes - 128 */
+    struct image_layout_hw_pointers_carmel
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct image_layout_hw_pointer_entry boot_record_ptr;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        struct image_layout_hw_pointer_entry boot2_ptr;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x14.31 */
+        struct image_layout_hw_pointer_entry toc_ptr;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x1c.31 */
+        struct image_layout_hw_pointer_entry tools_ptr;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x24.31 */
+        struct image_layout_hw_pointer_entry authentication_start_pointer;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x2c.31 */
+        struct image_layout_hw_pointer_entry authentication_end_pointer;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description -  */
+        /* 0x30.0 - 0x34.31 */
+        struct image_layout_hw_pointer_entry digest_pointer;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.0 - 0x3c.31 */
+        struct image_layout_hw_pointer_entry digest_recovery_key_pointer;
+        /*---------------- DWORD[16] (Offset 0x40) ----------------*/
+        /* Description -  */
+        /* 0x40.0 - 0x44.31 */
+        struct image_layout_hw_pointer_entry fw_window_start_pointer;
+        /*---------------- DWORD[18] (Offset 0x48) ----------------*/
+        /* Description -  */
+        /* 0x48.0 - 0x4c.31 */
+        struct image_layout_hw_pointer_entry fw_window_end_pointer;
+        /*---------------- DWORD[20] (Offset 0x50) ----------------*/
+        /* Description -  */
+        /* 0x50.0 - 0x54.31 */
+        struct image_layout_hw_pointer_entry image_info_section_pointer;
+        /*---------------- DWORD[22] (Offset 0x58) ----------------*/
+        /* Description -  */
+        /* 0x58.0 - 0x5c.31 */
+        struct image_layout_hw_pointer_entry hmac_end_pointer;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description -  */
+        /* 0x60.0 - 0x64.31 */
+        struct image_layout_hw_pointer_entry public_key_pointer;
+        /*---------------- DWORD[26] (Offset 0x68) ----------------*/
+        /* Description -  */
+        /* 0x68.0 - 0x6c.31 */
+        struct image_layout_hw_pointer_entry fw_security_version_pointer;
+        /*---------------- DWORD[28] (Offset 0x70) ----------------*/
+        /* Description -  */
+        /* 0x70.0 - 0x74.31 */
+        struct image_layout_hw_pointer_entry gcm_iv_delta_pointer;
+        /*---------------- DWORD[30] (Offset 0x78) ----------------*/
+        /* Description -  */
+        /* 0x78.0 - 0x7c.31 */
+        struct image_layout_hw_pointer_entry hashes_table_pointer;
+    };
 
-/* Description -   */
-/* Size in bytes - 1024 */
-struct image_layout_image_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Indicate that this binary intended for secure boot enabled devices */
-	/* 0x0.2 - 0x0.2 */
-	u_int8_t secure_boot;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0x0 - not encrypted; 0x1 - encryption before signature; 0x2 - encryption after signature.  */
-	/* 0x0.3 - 0x0.4 */
-	u_int8_t encrypted_fw;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Indicate that this binary support windbond flash */
-	/* 0x0.5 - 0x0.5 */
-	u_int8_t windbond_flash_support;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Indicate that this binary support long keys (up to 4096bits) */
-	/* 0x0.6 - 0x0.6 */
-	u_int8_t long_keys;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - when set, debug-fw tokens are enabled. */
-	/* 0x0.7 - 0x0.7 */
-	u_int8_t debug_fw_tokens_supported;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The image can be updated using the MCC/MCDA commands */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t mcc_en;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - OEM lifecycle NVCONFIG files are signed */
-	/* 0x0.9 - 0x0.9 */
-	u_int8_t signed_vendor_nvconfig_files;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Mellanox lifecycle NVCONFIG files are signed */
-	/* 0x0.10 - 0x0.10 */
-	u_int8_t signed_mlnx_nvconfig_files;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Factory re-customizationflow is supported */
-	/* 0x0.11 - 0x0.11 */
-	u_int8_t frc_supported;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Customer Support Tokens are supported */
-	/* 0x0.12 - 0x0.12 */
-	u_int8_t cs_tokens_supported;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - This is a debug firmware */
-	/* 0x0.13 - 0x0.13 */
-	u_int8_t debug_fw;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - [MCC/MCDA flow] if set, the SHA 256 digest is encrypted - enabled by default for secure_fw - cr-space not closed */
-	/* 0x0.14 - 0x0.14 */
-	u_int8_t signed_fw;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - [MCC/MCDA flow] cr-space closed */
-	/* 0x0.15 - 0x0.15 */
-	u_int8_t secure_fw;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - IMAGE_INFO section minor version */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t minor_version;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - IMAGE_INFO section major version */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t major_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x10.31 */
-	struct image_layout_FW_VERSION FW_VERSION;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x18.31 */
-	struct image_layout_TRIPPLE_VERSION mic_version;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - PCI device ID of the device */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t pci_vendor_id;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - PCI device ID of the device */
-	/* 0x1c.16 - 0x1c.31 */
-	u_int16_t pci_device_id;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - PCI device ID of the device */
-	/* 0x20.0 - 0x20.15 */
-	u_int16_t pci_sub_vendor_id;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - PCI device ID of the device */
-	/* 0x20.16 - 0x20.31 */
-	u_int16_t pci_subsystem_id;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.24 - 0x34.23 */
-	char psid[17];
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-	/* Description -  */
-	/* 0x34.0 - 0x34.15 */
-	u_int16_t vsd_vendor_id;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description -  */
-	/* 0x38.24 - 0x108.23 */
-	char vsd[209];
-/*---------------- DWORD[66] (Offset 0x108) ----------------*/
-	/* Description - image size parameters */
-	/* 0x108.0 - 0x10c.31 */
-	struct image_layout_image_size image_size;
-/*---------------- DWORD[68] (Offset 0x110) ----------------*/
-	/* Description - The needed 10’s of ms timeout between the PCI link disable and PCI link enable. */
-	/* 0x110.0 - 0x110.7 */
-	u_int8_t synced_reset_downtime;
-/*---------------- DWORD[70] (Offset 0x118) ----------------*/
-	/* Description - HW device(s) supported by this FW image.
+    /* Description -   */
+    /* Size in bytes - 1024 */
+    struct image_layout_image_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Indicate that this binary intended for secure boot enabled devices */
+        /* 0x0.2 - 0x0.2 */
+        u_int8_t secure_boot;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0x0 - not encrypted; 0x1 - encryption before signature; 0x2 - encryption after signature.  */
+        /* 0x0.3 - 0x0.4 */
+        u_int8_t encrypted_fw;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Indicate that this binary support windbond flash */
+        /* 0x0.5 - 0x0.5 */
+        u_int8_t windbond_flash_support;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Indicate that this binary support long keys (up to 4096bits) */
+        /* 0x0.6 - 0x0.6 */
+        u_int8_t long_keys;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - when set, debug-fw tokens are enabled. */
+        /* 0x0.7 - 0x0.7 */
+        u_int8_t debug_fw_tokens_supported;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The image can be updated using the MCC/MCDA commands */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t mcc_en;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - OEM lifecycle NVCONFIG files are signed */
+        /* 0x0.9 - 0x0.9 */
+        u_int8_t signed_vendor_nvconfig_files;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Mellanox lifecycle NVCONFIG files are signed */
+        /* 0x0.10 - 0x0.10 */
+        u_int8_t signed_mlnx_nvconfig_files;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Factory re-customizationflow is supported */
+        /* 0x0.11 - 0x0.11 */
+        u_int8_t frc_supported;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Customer Support Tokens are supported */
+        /* 0x0.12 - 0x0.12 */
+        u_int8_t cs_tokens_supported;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - This is a debug firmware */
+        /* 0x0.13 - 0x0.13 */
+        u_int8_t debug_fw;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - [MCC/MCDA flow] if set, the SHA 256 digest is encrypted - enabled by default for secure_fw -
+         * cr-space not closed */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t signed_fw;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - [MCC/MCDA flow] cr-space closed */
+        /* 0x0.15 - 0x0.15 */
+        u_int8_t secure_fw;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - IMAGE_INFO section minor version */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t minor_version;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - IMAGE_INFO section major version */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x10.31 */
+        struct image_layout_FW_VERSION FW_VERSION;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x18.31 */
+        struct image_layout_TRIPPLE_VERSION mic_version;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - PCI device ID of the device */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t pci_vendor_id;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - PCI device ID of the device */
+        /* 0x1c.16 - 0x1c.31 */
+        u_int16_t pci_device_id;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - PCI device ID of the device */
+        /* 0x20.0 - 0x20.15 */
+        u_int16_t pci_sub_vendor_id;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - PCI device ID of the device */
+        /* 0x20.16 - 0x20.31 */
+        u_int16_t pci_subsystem_id;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.24 - 0x34.23 */
+        char psid[17];
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description -  */
+        /* 0x34.0 - 0x34.15 */
+        u_int16_t vsd_vendor_id;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description -  */
+        /* 0x38.24 - 0x108.23 */
+        char vsd[209];
+        /*---------------- DWORD[66] (Offset 0x108) ----------------*/
+        /* Description - image size parameters */
+        /* 0x108.0 - 0x10c.31 */
+        struct image_layout_image_size image_size;
+        /*---------------- DWORD[68] (Offset 0x110) ----------------*/
+        /* Description - The needed 10’s of ms timeout between the PCI link disable and PCI link enable. */
+        /* 0x110.0 - 0x110.7 */
+        u_int8_t synced_reset_downtime;
+        /*---------------- DWORD[70] (Offset 0x118) ----------------*/
+        /* Description - HW device(s) supported by this FW image.
 0 means invalid entry.
 For Golan A0, first entry should be 0x1ff
  */
-	/* 0x118.0 - 0x124.31 */
-	u_int32_t supported_hw_id[4];
-/*---------------- DWORD[74] (Offset 0x128) ----------------*/
-	/* Description -  */
-	/* 0x128.0 - 0x128.31 */
-	u_int32_t ini_file_num;
-/*---------------- DWORD[75] (Offset 0x12c) ----------------*/
-	/* Description -  */
-	/* 0x12c.0 - 0x12c.31 */
-	u_int32_t burn_image_size;
-/*---------------- DWORD[100] (Offset 0x190) ----------------*/
-	/* Description -  */
-	/* 0x190.0 - 0x1bc.31 */
-	struct image_layout_version_vector version_vector;
-/*---------------- DWORD[112] (Offset 0x1c0) ----------------*/
-	/* Description - Product Version is the unified version of the FW and expansion ROM.
+        /* 0x118.0 - 0x124.31 */
+        u_int32_t supported_hw_id[4];
+        /*---------------- DWORD[74] (Offset 0x128) ----------------*/
+        /* Description -  */
+        /* 0x128.0 - 0x128.31 */
+        u_int32_t ini_file_num;
+        /*---------------- DWORD[75] (Offset 0x12c) ----------------*/
+        /* Description -  */
+        /* 0x12c.0 - 0x12c.31 */
+        u_int32_t burn_image_size;
+        /*---------------- DWORD[100] (Offset 0x190) ----------------*/
+        /* Description -  */
+        /* 0x190.0 - 0x1bc.31 */
+        struct image_layout_version_vector version_vector;
+        /*---------------- DWORD[112] (Offset 0x1c0) ----------------*/
+        /* Description - Product Version is the unified version of the FW and expansion ROM.
 Format is defined by the packager.
-When set to a non-empty string the FW update tool burns the image as a monolythic entity and refuses to update rom only or FW only. */
-	/* 0x1c0.24 - 0x1d0.23 */
-	char prod_ver[17];
-/*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
-	/* Description - Product description */
-	/* 0x1d0.24 - 0x2d0.23 */
-	char description[257];
-/*---------------- DWORD[192] (Offset 0x300) ----------------*/
-	/* Description -  */
-	/* 0x300.0 - 0x33c.31 */
-	struct image_layout_module_versions module_versions;
-/*---------------- DWORD[208] (Offset 0x340) ----------------*/
-	/* Description - Product name */
-	/* 0x340.24 - 0x380.23 */
-	char name[65];
-/*---------------- DWORD[224] (Offset 0x380) ----------------*/
-	/* Description - PRS used to generate the FW binary */
-	/* 0x380.24 - 0x400.23 */
-	char prs_name[129];
-};
+When set to a non-empty string the FW update tool burns the image as a monolythic entity and refuses to update rom only
+or FW only. */
+        /* 0x1c0.24 - 0x1d0.23 */
+        char prod_ver[17];
+        /*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
+        /* Description - Product description */
+        /* 0x1d0.24 - 0x2d0.23 */
+        char description[257];
+        /*---------------- DWORD[192] (Offset 0x300) ----------------*/
+        /* Description -  */
+        /* 0x300.0 - 0x33c.31 */
+        struct image_layout_module_versions module_versions;
+        /*---------------- DWORD[208] (Offset 0x340) ----------------*/
+        /* Description - Product name */
+        /* 0x340.24 - 0x380.23 */
+        char name[65];
+        /*---------------- DWORD[224] (Offset 0x380) ----------------*/
+        /* Description - PRS used to generate the FW binary */
+        /* 0x380.24 - 0x400.23 */
+        char prs_name[129];
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct image_layout_itoc_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.2 - 0x0.23 */
-	u_int32_t size;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Section ID Section Type DESCRIPTION
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct image_layout_itoc_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.2 - 0x0.23 */
+        u_int32_t size;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Section ID Section Type DESCRIPTION
 0x1 BOOT_CODE FW loader code
 0x2 PCI_CODE Code that is required to raise PCIe link.
 0x3 MAIN_CODE All non-PCIe FW code
 0x8 HW_BOOT_CFG Initial values for the PCI related registers
-0x9 HW_MAIN_CFG Initial values for all other registers 
-0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash Programming Application Note
-0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as number of physical functions
-(optional)
-0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related settings.
-(optional)
-0x18 ROM_CODE PXE/Boot over IB code. 
-0x30 DBG_LOG_MAP FW logger 'index to string' map. The map is in ASCI text. Format is TBD.
-                                          PARAM0 in the iTOC specifies the compression method of this sector:
-                                          0. Uncompressed
+0x9 HW_MAIN_CFG Initial values for all other registers
+0x10 IMAGE_INFO Management data for the burning tool. See 'Image Info Section' chapter in the Mellanox Flash Programming
+Application Note 0x11 FW_BOOT_CFG Initial values for user set-able hi level non-hardware related settings, such as
+number of physical functions (optional) 0x12 FW_MAIN_CFG Initial values for user set-able hi level non-hardware related
+settings. (optional) 0x18 ROM_CODE PXE/Boot over IB code. 0x30 DBG_LOG_MAP FW logger 'index to string' map. The map is
+in ASCI text. Format is TBD. PARAM0 in the iTOC specifies the compression method of this sector: 0. Uncompressed
                                           1. Zlib compress2()
                                           2. LZMA
-                                          Others - Reserved 
+                                          Others - Reserved
 0x31 DBG_FW_INI The Ini file used in the image generation. The PARAM0 applies the same as in  DBG_LOG_MAP section type.
-0x32 DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP section type.
-0xff END_MARKER A type of 0xff marks the end of the iTOC entries array. It is recommended to leave the unused part of the iTOC section blank (that is, 0xff in all unused bytes)
-All other values Reserved 
+0x32 DBG_FW_PARAMS FW settable parameters. ASCII text. Format is TBD. The PARAM0 applies the same as in  DBG_LOG_MAP
+section type. 0xff END_MARKER A type of 0xff marks the end of the iTOC entries array. It is recommended to leave the
+unused part of the iTOC section blank (that is, 0xff in all unused bytes) All other values Reserved
  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - if partition type is code or ini then the load address is in here */
-	/* 0x4.0 - 0x4.29 */
-	u_int32_t param0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - When this bit is set, Data within the section is protected by per-line crc. See yu.flash.replacement.crc_en */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t cache_line_crc;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - When this bit is set, image is zipped */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t zipped_image;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - if partition type is code then the jump address is in here */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t param1;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t version;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.2 - 0x14.30 */
-	u_int32_t flash_addr;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.15 */
-	u_int16_t section_crc;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.16 - 0x18.18 */
-	u_int8_t crc;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - indicates whether the section referenced by the ITOC is encrypted */
-	/* 0x18.31 - 0x18.31 */
-	u_int8_t encrypted_section;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t itoc_entry_crc;
-};
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - if partition type is code or ini then the load address is in here */
+        /* 0x4.0 - 0x4.29 */
+        u_int32_t param0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - When this bit is set, Data within the section is protected by per-line crc. See
+         * yu.flash.replacement.crc_en */
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t cache_line_crc;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - When this bit is set, image is zipped */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t zipped_image;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - if partition type is code then the jump address is in here */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t param1;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t version;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.2 - 0x14.30 */
+        u_int32_t flash_addr;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.15 */
+        u_int16_t section_crc;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.16 - 0x18.18 */
+        u_int8_t crc;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - indicates whether the section referenced by the ITOC is encrypted */
+        /* 0x18.31 - 0x18.31 */
+        u_int8_t encrypted_section;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t itoc_entry_crc;
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct image_layout_itoc_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - for itoc 49 54 4f 43 
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct image_layout_itoc_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - for itoc 49 54 4f 43
 for dtoc 44 54 4f 43 */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - 04 08 15 16 */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - 23 42 ca fa */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - ba ca fe 00 */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t signature3;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Current version: 1 */
-	/* 0x10.0 - 0x10.7 */
-	u_int8_t version;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - itoc_header: Represents the minimal layout version expected on the flash: 1.
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - 04 08 15 16 */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - 23 42 ca fa */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - ba ca fe 00 */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Current version: 1 */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t version;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - itoc_header: Represents the minimal layout version expected on the flash: 1.
 dtoc_header: Represents the layout version depicted by the dTOC: 1. */
-	/* 0x10.24 - 0x10.31 */
-	u_int8_t flash_layout_version;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - indicates the number of ITOC entries in the image */
-	/* 0x14.0 - 0x14.7 */
-	u_int8_t num_of_entries;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t itoc_entry_crc;
-};
-
-/* Description -  tools speific section */
-/* Size in bytes - 64 */
-struct image_layout_tools_area {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - tools area minor version */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t minor;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - tools area major version */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - binary version minor set by image generation tool */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t bin_ver_minor;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - binary version major set by image generation tool */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t bin_ver_major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - log2 image slot size */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t log2_img_slot_size;
-/*---------------- DWORD[15] (Offset 0x3c) ----------------*/
-	/* Description -  */
-	/* 0x3c.0 - 0x3c.15 */
-	u_int16_t crc;
-};
-
-/* Description -   */
-/* Size in bytes - 2052 */
-union image_layout_image_layout_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct image_layout_tools_area tools_area;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct image_layout_itoc_entry itoc_entry;
-	/* Description -  */
-	/* 0x0.0 - 0x800.31 */
-	struct image_layout_hashes_table hashes_table;
-	/* Description -  */
-	/* 0x0.0 - 0x3fc.31 */
-	struct image_layout_image_info image_info;
-	/* Description -  */
-	/* 0x0.0 - 0x7c.31 */
-	struct image_layout_hw_pointers_carmel hw_pointers_carmel;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct image_layout_itoc_header itoc_header;
-	/* Description -  */
-	/* 0x0.0 - 0x1fc.31 */
-	struct image_layout_device_info device_info;
-};
+        /* 0x10.24 - 0x10.31 */
+        u_int8_t flash_layout_version;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - indicates the number of ITOC entries in the image */
+        /* 0x14.0 - 0x14.7 */
+        u_int8_t num_of_entries;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t itoc_entry_crc;
+    };
 
+    /* Description -  tools speific section */
+    /* Size in bytes - 64 */
+    struct image_layout_tools_area
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - tools area minor version */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t minor;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - tools area major version */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - binary version minor set by image generation tool */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t bin_ver_minor;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - binary version major set by image generation tool */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t bin_ver_major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - log2 image slot size */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t log2_img_slot_size;
+        /*---------------- DWORD[15] (Offset 0x3c) ----------------*/
+        /* Description -  */
+        /* 0x3c.0 - 0x3c.15 */
+        u_int16_t crc;
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* uint64 */
-void image_layout_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_uint64_size(void);
-#define IMAGE_LAYOUT_UINT64_SIZE    (0x8)
-void image_layout_uint64_dump(const u_int64_t *ptr_struct, FILE *fd);
-/* htoc_entry */
-void image_layout_htoc_entry_pack(const struct image_layout_htoc_entry *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_htoc_entry_unpack(struct image_layout_htoc_entry *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_htoc_entry_print(const struct image_layout_htoc_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_htoc_entry_size(void);
-#define IMAGE_LAYOUT_HTOC_ENTRY_SIZE    (0x8)
-void image_layout_htoc_entry_dump(const struct image_layout_htoc_entry *ptr_struct, FILE *fd);
-/* htoc_header */
-void image_layout_htoc_header_pack(const struct image_layout_htoc_header *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_htoc_header_unpack(struct image_layout_htoc_header *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_htoc_header_print(const struct image_layout_htoc_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_htoc_header_size(void);
-#define IMAGE_LAYOUT_HTOC_HEADER_SIZE    (0x10)
-void image_layout_htoc_header_dump(const struct image_layout_htoc_header *ptr_struct, FILE *fd);
-/* module_version */
-void image_layout_module_version_pack(const struct image_layout_module_version *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_module_version_unpack(struct image_layout_module_version *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_module_version_print(const struct image_layout_module_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_module_version_size(void);
-#define IMAGE_LAYOUT_MODULE_VERSION_SIZE    (0x4)
-void image_layout_module_version_dump(const struct image_layout_module_version *ptr_struct, FILE *fd);
-/* reset_capabilities */
-void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabilities *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_reset_capabilities_size(void);
-#define IMAGE_LAYOUT_RESET_CAPABILITIES_SIZE    (0x4)
-void image_layout_reset_capabilities_dump(const struct image_layout_reset_capabilities *ptr_struct, FILE *fd);
-/* reset_version */
-void image_layout_reset_version_pack(const struct image_layout_reset_version *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_reset_version_unpack(struct image_layout_reset_version *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_reset_version_print(const struct image_layout_reset_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_reset_version_size(void);
-#define IMAGE_LAYOUT_RESET_VERSION_SIZE    (0x4)
-void image_layout_reset_version_dump(const struct image_layout_reset_version *ptr_struct, FILE *fd);
-/* uid_entry */
-void image_layout_uid_entry_pack(const struct image_layout_uid_entry *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_uid_entry_unpack(struct image_layout_uid_entry *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_uid_entry_print(const struct image_layout_uid_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_uid_entry_size(void);
-#define IMAGE_LAYOUT_UID_ENTRY_SIZE    (0x10)
-void image_layout_uid_entry_dump(const struct image_layout_uid_entry *ptr_struct, FILE *fd);
-/* FW_VERSION */
-void image_layout_FW_VERSION_pack(const struct image_layout_FW_VERSION *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_FW_VERSION_unpack(struct image_layout_FW_VERSION *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_FW_VERSION_print(const struct image_layout_FW_VERSION *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_FW_VERSION_size(void);
-#define IMAGE_LAYOUT_FW_VERSION_SIZE    (0x10)
-void image_layout_FW_VERSION_dump(const struct image_layout_FW_VERSION *ptr_struct, FILE *fd);
-/* TRIPPLE_VERSION */
-void image_layout_TRIPPLE_VERSION_pack(const struct image_layout_TRIPPLE_VERSION *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_TRIPPLE_VERSION_unpack(struct image_layout_TRIPPLE_VERSION *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_TRIPPLE_VERSION_size(void);
-#define IMAGE_LAYOUT_TRIPPLE_VERSION_SIZE    (0x8)
-void image_layout_TRIPPLE_VERSION_dump(const struct image_layout_TRIPPLE_VERSION *ptr_struct, FILE *fd);
-/* guids */
-void image_layout_guids_pack(const struct image_layout_guids *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_guids_unpack(struct image_layout_guids *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_guids_print(const struct image_layout_guids *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_guids_size(void);
-#define IMAGE_LAYOUT_GUIDS_SIZE    (0x40)
-void image_layout_guids_dump(const struct image_layout_guids *ptr_struct, FILE *fd);
-/* hashes_table_header */
-void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_hashes_table_header_size(void);
-#define IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE    (0xc)
-void image_layout_hashes_table_header_dump(const struct image_layout_hashes_table_header *ptr_struct, FILE *fd);
-/* htoc */
-void image_layout_htoc_pack(const struct image_layout_htoc *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_htoc_unpack(struct image_layout_htoc *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_htoc_print(const struct image_layout_htoc *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_htoc_size(void);
-#define IMAGE_LAYOUT_HTOC_SIZE    (0xf0)
-void image_layout_htoc_dump(const struct image_layout_htoc *ptr_struct, FILE *fd);
-/* htoc_hash */
-void image_layout_htoc_hash_pack(const struct image_layout_htoc_hash *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_htoc_hash_unpack(struct image_layout_htoc_hash *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_htoc_hash_print(const struct image_layout_htoc_hash *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_htoc_hash_size(void);
-#define IMAGE_LAYOUT_HTOC_HASH_SIZE    (0x40)
-void image_layout_htoc_hash_dump(const struct image_layout_htoc_hash *ptr_struct, FILE *fd);
-/* hw_pointer_entry */
-void image_layout_hw_pointer_entry_pack(const struct image_layout_hw_pointer_entry *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_hw_pointer_entry_size(void);
-#define IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE    (0x8)
-void image_layout_hw_pointer_entry_dump(const struct image_layout_hw_pointer_entry *ptr_struct, FILE *fd);
-/* image_size */
-void image_layout_image_size_pack(const struct image_layout_image_size *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_image_size_unpack(struct image_layout_image_size *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_image_size_print(const struct image_layout_image_size *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_image_size_size(void);
-#define IMAGE_LAYOUT_IMAGE_SIZE_SIZE    (0x8)
-void image_layout_image_size_dump(const struct image_layout_image_size *ptr_struct, FILE *fd);
-/* module_versions */
-void image_layout_module_versions_pack(const struct image_layout_module_versions *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_module_versions_unpack(struct image_layout_module_versions *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_module_versions_print(const struct image_layout_module_versions *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_module_versions_size(void);
-#define IMAGE_LAYOUT_MODULE_VERSIONS_SIZE    (0x40)
-void image_layout_module_versions_dump(const struct image_layout_module_versions *ptr_struct, FILE *fd);
-/* operation_key */
-void image_layout_operation_key_pack(const struct image_layout_operation_key *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_operation_key_unpack(struct image_layout_operation_key *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_operation_key_print(const struct image_layout_operation_key *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_operation_key_size(void);
-#define IMAGE_LAYOUT_OPERATION_KEY_SIZE    (0x10)
-void image_layout_operation_key_dump(const struct image_layout_operation_key *ptr_struct, FILE *fd);
-/* version_vector */
-void image_layout_version_vector_pack(const struct image_layout_version_vector *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_version_vector_unpack(struct image_layout_version_vector *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_version_vector_print(const struct image_layout_version_vector *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_version_vector_size(void);
-#define IMAGE_LAYOUT_VERSION_VECTOR_SIZE    (0x30)
-void image_layout_version_vector_dump(const struct image_layout_version_vector *ptr_struct, FILE *fd);
-/* device_info */
-void image_layout_device_info_pack(const struct image_layout_device_info *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_device_info_unpack(struct image_layout_device_info *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_device_info_print(const struct image_layout_device_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_device_info_size(void);
-#define IMAGE_LAYOUT_DEVICE_INFO_SIZE    (0x200)
-void image_layout_device_info_dump(const struct image_layout_device_info *ptr_struct, FILE *fd);
-/* hashes_table */
-void image_layout_hashes_table_pack(const struct image_layout_hashes_table *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_hashes_table_unpack(struct image_layout_hashes_table *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_hashes_table_print(const struct image_layout_hashes_table *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_hashes_table_size(void);
-#define IMAGE_LAYOUT_HASHES_TABLE_SIZE    (0x804)
-void image_layout_hashes_table_dump(const struct image_layout_hashes_table *ptr_struct, FILE *fd);
-/* hw_pointers_carmel */
-void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_carmel *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_hw_pointers_carmel_size(void);
-#define IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE    (0x80)
-void image_layout_hw_pointers_carmel_dump(const struct image_layout_hw_pointers_carmel *ptr_struct, FILE *fd);
-/* image_info */
-void image_layout_image_info_pack(const struct image_layout_image_info *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_image_info_unpack(struct image_layout_image_info *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_image_info_print(const struct image_layout_image_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_image_info_size(void);
-#define IMAGE_LAYOUT_IMAGE_INFO_SIZE    (0x400)
-void image_layout_image_info_dump(const struct image_layout_image_info *ptr_struct, FILE *fd);
-/* itoc_entry */
-void image_layout_itoc_entry_pack(const struct image_layout_itoc_entry *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_itoc_entry_unpack(struct image_layout_itoc_entry *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_itoc_entry_print(const struct image_layout_itoc_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_itoc_entry_size(void);
-#define IMAGE_LAYOUT_ITOC_ENTRY_SIZE    (0x20)
-void image_layout_itoc_entry_dump(const struct image_layout_itoc_entry *ptr_struct, FILE *fd);
-/* itoc_header */
-void image_layout_itoc_header_pack(const struct image_layout_itoc_header *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_itoc_header_unpack(struct image_layout_itoc_header *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_itoc_header_print(const struct image_layout_itoc_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_itoc_header_size(void);
-#define IMAGE_LAYOUT_ITOC_HEADER_SIZE    (0x20)
-void image_layout_itoc_header_dump(const struct image_layout_itoc_header *ptr_struct, FILE *fd);
-/* tools_area */
-void image_layout_tools_area_pack(const struct image_layout_tools_area *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_tools_area_unpack(struct image_layout_tools_area *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_tools_area_print(const struct image_layout_tools_area *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_tools_area_size(void);
-#define IMAGE_LAYOUT_TOOLS_AREA_SIZE    (0x40)
-void image_layout_tools_area_dump(const struct image_layout_tools_area *ptr_struct, FILE *fd);
-/* image_layout_Nodes */
-void image_layout_image_layout_Nodes_pack(const union image_layout_image_layout_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int image_layout_image_layout_Nodes_size(void);
-#define IMAGE_LAYOUT_IMAGE_LAYOUT_NODES_SIZE    (0x804)
-void image_layout_image_layout_Nodes_dump(const union image_layout_image_layout_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 2052 */
+    union image_layout_image_layout_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct image_layout_tools_area tools_area;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct image_layout_itoc_entry itoc_entry;
+        /* Description -  */
+        /* 0x0.0 - 0x800.31 */
+        struct image_layout_hashes_table hashes_table;
+        /* Description -  */
+        /* 0x0.0 - 0x3fc.31 */
+        struct image_layout_image_info image_info;
+        /* Description -  */
+        /* 0x0.0 - 0x7c.31 */
+        struct image_layout_hw_pointers_carmel hw_pointers_carmel;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct image_layout_itoc_header itoc_header;
+        /* Description -  */
+        /* 0x0.0 - 0x1fc.31 */
+        struct image_layout_device_info device_info;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* uint64 */
+    void image_layout_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_uint64_size(void);
+#define IMAGE_LAYOUT_UINT64_SIZE (0x8)
+    void image_layout_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
+    /* htoc_entry */
+    void image_layout_htoc_entry_pack(const struct image_layout_htoc_entry* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_htoc_entry_unpack(struct image_layout_htoc_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_htoc_entry_print(const struct image_layout_htoc_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_htoc_entry_size(void);
+#define IMAGE_LAYOUT_HTOC_ENTRY_SIZE (0x8)
+    void image_layout_htoc_entry_dump(const struct image_layout_htoc_entry* ptr_struct, FILE* fd);
+    /* htoc_header */
+    void image_layout_htoc_header_pack(const struct image_layout_htoc_header* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_htoc_header_unpack(struct image_layout_htoc_header* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_htoc_header_print(const struct image_layout_htoc_header* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_htoc_header_size(void);
+#define IMAGE_LAYOUT_HTOC_HEADER_SIZE (0x10)
+    void image_layout_htoc_header_dump(const struct image_layout_htoc_header* ptr_struct, FILE* fd);
+    /* module_version */
+    void image_layout_module_version_pack(const struct image_layout_module_version* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_module_version_unpack(struct image_layout_module_version* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_module_version_print(const struct image_layout_module_version* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int image_layout_module_version_size(void);
+#define IMAGE_LAYOUT_MODULE_VERSION_SIZE (0x4)
+    void image_layout_module_version_dump(const struct image_layout_module_version* ptr_struct, FILE* fd);
+    /* reset_capabilities */
+    void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabilities* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int image_layout_reset_capabilities_size(void);
+#define IMAGE_LAYOUT_RESET_CAPABILITIES_SIZE (0x4)
+    void image_layout_reset_capabilities_dump(const struct image_layout_reset_capabilities* ptr_struct, FILE* fd);
+    /* reset_version */
+    void image_layout_reset_version_pack(const struct image_layout_reset_version* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_reset_version_unpack(struct image_layout_reset_version* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      image_layout_reset_version_print(const struct image_layout_reset_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_reset_version_size(void);
+#define IMAGE_LAYOUT_RESET_VERSION_SIZE (0x4)
+    void image_layout_reset_version_dump(const struct image_layout_reset_version* ptr_struct, FILE* fd);
+    /* uid_entry */
+    void image_layout_uid_entry_pack(const struct image_layout_uid_entry* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_uid_entry_unpack(struct image_layout_uid_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_uid_entry_print(const struct image_layout_uid_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_uid_entry_size(void);
+#define IMAGE_LAYOUT_UID_ENTRY_SIZE (0x10)
+    void image_layout_uid_entry_dump(const struct image_layout_uid_entry* ptr_struct, FILE* fd);
+    /* FW_VERSION */
+    void image_layout_FW_VERSION_pack(const struct image_layout_FW_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_FW_VERSION_unpack(struct image_layout_FW_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_FW_VERSION_print(const struct image_layout_FW_VERSION* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_FW_VERSION_size(void);
+#define IMAGE_LAYOUT_FW_VERSION_SIZE (0x10)
+    void image_layout_FW_VERSION_dump(const struct image_layout_FW_VERSION* ptr_struct, FILE* fd);
+    /* TRIPPLE_VERSION */
+    void image_layout_TRIPPLE_VERSION_pack(const struct image_layout_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_TRIPPLE_VERSION_unpack(struct image_layout_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int image_layout_TRIPPLE_VERSION_size(void);
+#define IMAGE_LAYOUT_TRIPPLE_VERSION_SIZE (0x8)
+    void image_layout_TRIPPLE_VERSION_dump(const struct image_layout_TRIPPLE_VERSION* ptr_struct, FILE* fd);
+    /* guids */
+    void image_layout_guids_pack(const struct image_layout_guids* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_guids_unpack(struct image_layout_guids* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_guids_print(const struct image_layout_guids* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_guids_size(void);
+#define IMAGE_LAYOUT_GUIDS_SIZE (0x40)
+    void image_layout_guids_dump(const struct image_layout_guids* ptr_struct, FILE* fd);
+    /* hashes_table_header */
+    void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int image_layout_hashes_table_header_size(void);
+#define IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE (0xc)
+    void image_layout_hashes_table_header_dump(const struct image_layout_hashes_table_header* ptr_struct, FILE* fd);
+    /* htoc */
+    void image_layout_htoc_pack(const struct image_layout_htoc* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_htoc_unpack(struct image_layout_htoc* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_htoc_print(const struct image_layout_htoc* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_htoc_size(void);
+#define IMAGE_LAYOUT_HTOC_SIZE (0xf0)
+    void image_layout_htoc_dump(const struct image_layout_htoc* ptr_struct, FILE* fd);
+    /* htoc_hash */
+    void image_layout_htoc_hash_pack(const struct image_layout_htoc_hash* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_htoc_hash_unpack(struct image_layout_htoc_hash* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_htoc_hash_print(const struct image_layout_htoc_hash* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_htoc_hash_size(void);
+#define IMAGE_LAYOUT_HTOC_HASH_SIZE (0x40)
+    void image_layout_htoc_hash_dump(const struct image_layout_htoc_hash* ptr_struct, FILE* fd);
+    /* hw_pointer_entry */
+    void image_layout_hw_pointer_entry_pack(const struct image_layout_hw_pointer_entry* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry* ptr_struct,
+                                              const u_int8_t* ptr_buff);
+    void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level);
+    unsigned int image_layout_hw_pointer_entry_size(void);
+#define IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE (0x8)
+    void image_layout_hw_pointer_entry_dump(const struct image_layout_hw_pointer_entry* ptr_struct, FILE* fd);
+    /* image_size */
+    void image_layout_image_size_pack(const struct image_layout_image_size* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_image_size_unpack(struct image_layout_image_size* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_image_size_print(const struct image_layout_image_size* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_image_size_size(void);
+#define IMAGE_LAYOUT_IMAGE_SIZE_SIZE (0x8)
+    void image_layout_image_size_dump(const struct image_layout_image_size* ptr_struct, FILE* fd);
+    /* module_versions */
+    void image_layout_module_versions_pack(const struct image_layout_module_versions* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_module_versions_unpack(struct image_layout_module_versions* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_module_versions_print(const struct image_layout_module_versions* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int image_layout_module_versions_size(void);
+#define IMAGE_LAYOUT_MODULE_VERSIONS_SIZE (0x40)
+    void image_layout_module_versions_dump(const struct image_layout_module_versions* ptr_struct, FILE* fd);
+    /* operation_key */
+    void image_layout_operation_key_pack(const struct image_layout_operation_key* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_operation_key_unpack(struct image_layout_operation_key* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      image_layout_operation_key_print(const struct image_layout_operation_key* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_operation_key_size(void);
+#define IMAGE_LAYOUT_OPERATION_KEY_SIZE (0x10)
+    void image_layout_operation_key_dump(const struct image_layout_operation_key* ptr_struct, FILE* fd);
+    /* version_vector */
+    void image_layout_version_vector_pack(const struct image_layout_version_vector* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_version_vector_unpack(struct image_layout_version_vector* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_version_vector_print(const struct image_layout_version_vector* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int image_layout_version_vector_size(void);
+#define IMAGE_LAYOUT_VERSION_VECTOR_SIZE (0x30)
+    void image_layout_version_vector_dump(const struct image_layout_version_vector* ptr_struct, FILE* fd);
+    /* device_info */
+    void image_layout_device_info_pack(const struct image_layout_device_info* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_device_info_unpack(struct image_layout_device_info* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_device_info_print(const struct image_layout_device_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_device_info_size(void);
+#define IMAGE_LAYOUT_DEVICE_INFO_SIZE (0x200)
+    void image_layout_device_info_dump(const struct image_layout_device_info* ptr_struct, FILE* fd);
+    /* hashes_table */
+    void image_layout_hashes_table_pack(const struct image_layout_hashes_table* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_hashes_table_unpack(struct image_layout_hashes_table* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_hashes_table_print(const struct image_layout_hashes_table* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_hashes_table_size(void);
+#define IMAGE_LAYOUT_HASHES_TABLE_SIZE (0x804)
+    void image_layout_hashes_table_dump(const struct image_layout_hashes_table* ptr_struct, FILE* fd);
+    /* hw_pointers_carmel */
+    void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_carmel* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int image_layout_hw_pointers_carmel_size(void);
+#define IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE (0x80)
+    void image_layout_hw_pointers_carmel_dump(const struct image_layout_hw_pointers_carmel* ptr_struct, FILE* fd);
+    /* image_info */
+    void image_layout_image_info_pack(const struct image_layout_image_info* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_image_info_unpack(struct image_layout_image_info* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_image_info_print(const struct image_layout_image_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_image_info_size(void);
+#define IMAGE_LAYOUT_IMAGE_INFO_SIZE (0x400)
+    void image_layout_image_info_dump(const struct image_layout_image_info* ptr_struct, FILE* fd);
+    /* itoc_entry */
+    void image_layout_itoc_entry_pack(const struct image_layout_itoc_entry* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_itoc_entry_unpack(struct image_layout_itoc_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_itoc_entry_print(const struct image_layout_itoc_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_itoc_entry_size(void);
+#define IMAGE_LAYOUT_ITOC_ENTRY_SIZE (0x20)
+    void image_layout_itoc_entry_dump(const struct image_layout_itoc_entry* ptr_struct, FILE* fd);
+    /* itoc_header */
+    void image_layout_itoc_header_pack(const struct image_layout_itoc_header* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_itoc_header_unpack(struct image_layout_itoc_header* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_itoc_header_print(const struct image_layout_itoc_header* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_itoc_header_size(void);
+#define IMAGE_LAYOUT_ITOC_HEADER_SIZE (0x20)
+    void image_layout_itoc_header_dump(const struct image_layout_itoc_header* ptr_struct, FILE* fd);
+    /* tools_area */
+    void image_layout_tools_area_pack(const struct image_layout_tools_area* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_tools_area_unpack(struct image_layout_tools_area* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_tools_area_print(const struct image_layout_tools_area* ptr_struct, FILE* fd, int indent_level);
+    unsigned int image_layout_tools_area_size(void);
+#define IMAGE_LAYOUT_TOOLS_AREA_SIZE (0x40)
+    void image_layout_tools_area_dump(const struct image_layout_tools_area* ptr_struct, FILE* fd);
+    /* image_layout_Nodes */
+    void image_layout_image_layout_Nodes_pack(const union image_layout_image_layout_Nodes* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Nodes* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int image_layout_image_layout_Nodes_size(void);
+#define IMAGE_LAYOUT_IMAGE_LAYOUT_NODES_SIZE (0x804)
+    void image_layout_image_layout_Nodes_dump(const union image_layout_image_layout_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/prm_adb_db.cpp b/tools_layouts/prm_adb_db.cpp
old mode 100755
new mode 100644
index 116d4d17..9fa7dd50
--- a/tools_layouts/prm_adb_db.cpp
+++ b/tools_layouts/prm_adb_db.cpp
@@ -44,8 +44,9 @@ using namespace std;
 
 string PrmAdbDB::prm_adb_db_ltrim(const string& s)
 {
-    const char *cs = s.c_str();
-    while (isspace(*cs)) {
+    const char* cs = s.c_str();
+    while (isspace(*cs))
+    {
         cs++;
     }
     return string(cs);
@@ -53,15 +54,18 @@ string PrmAdbDB::prm_adb_db_ltrim(const string& s)
 
 string PrmAdbDB::prm_adb_db_rtrim(const string& s)
 {
-    //todo rewrite it
+    // todo rewrite it
     unsigned int i = s.size();
-    if (i == 0) {
+    if (i == 0)
+    {
         return s;
     }
-    while (--i > 0 && isspace(s[i])) {
+    while (--i > 0 && isspace(s[i]))
+    {
         ;
     }
-    if (i == 0 && isspace(s[i])) {
+    if (i == 0 && isspace(s[i]))
+    {
         return "";
     }
     return s.substr(0, i + 1);
@@ -89,28 +93,36 @@ string PrmAdbDB::getDefaultDBName(bool isSwitch)
 #else
     char line[1024] = {0};
     string confFile = string(ROOT_PATH) + string("etc/mft/mft.conf");
-    FILE *fd = fopen(confFile.c_str(), "r");
-    if (!fd) {
+    FILE* fd = fopen(confFile.c_str(), "r");
+    if (!fd)
+    {
         throw PrmDBException("Failed to open conf file : %s\n", confFile.c_str());
     }
     string prefix = "", dataPath = "";
-    while ((fgets(line, 1024, fd))) {
+    while ((fgets(line, 1024, fd)))
+    {
         string l = line;
-        if (l.find(dbDirName) != string::npos) {
+        if (l.find(dbDirName) != string::npos)
+        {
             size_t eqPos = l.find("=");
-            if (eqPos != string::npos) {
+            if (eqPos != string::npos)
+            {
                 dataPath = l.substr(eqPos + 1);
                 dataPath = prm_adb_db_trim(dataPath);
             }
-        } else if (l.find("mft_prefix_location") != string::npos) {
+        }
+        else if (l.find("mft_prefix_location") != string::npos)
+        {
             size_t eqPos = l.find("=");
-            if (eqPos != string::npos) {
+            if (eqPos != string::npos)
+            {
                 prefix = l.substr(eqPos + 1);
                 prefix = prm_adb_db_trim(prefix);
             }
         }
     }
-    if (!prefix.empty() && !dataPath.empty()) {
+    if (!prefix.empty() && !dataPath.empty())
+    {
         dbPathName = prefix + dataPath + "/" + hcaOrSwitch + "/ext/" + dbFileName;
     }
     fclose(fd);
@@ -120,13 +132,13 @@ string PrmAdbDB::getDefaultDBName(bool isSwitch)
 
 /*************************** PrmDBException Implementation ***************************/
 
-PrmDBException::PrmDBException() {
-}
+PrmDBException::PrmDBException() {}
 
 /**
  * Function: PrmDBException::PrmDBException
  **/
-PrmDBException::PrmDBException(const char *fmt, ...) {
+PrmDBException::PrmDBException(const char* fmt, ...)
+{
     char tmp[1024];
     va_list args;
     va_start(args, fmt);
@@ -138,26 +150,25 @@ PrmDBException::PrmDBException(const char *fmt, ...) {
 /**
  * Function: PrmDBException::PrmDBException
  **/
-PrmDBException::PrmDBException(string msg) :
-    _msg(msg) {
-}
+PrmDBException::PrmDBException(string msg) : _msg(msg) {}
 
 /**
  * Function: PrmDBException::~PrmDBException
  **/
-PrmDBException::~PrmDBException() throw () {
-}
+PrmDBException::~PrmDBException() throw() {}
 
 /**
  * Function: PrmDBException::what
  **/
-const char* PrmDBException::what() const throw () {
+const char* PrmDBException::what() const throw()
+{
     return _msg.c_str();
 }
 
 /**
  * Function: PrmDBException::what_s
  **/
-string PrmDBException::what_s() const {
+string PrmDBException::what_s() const
+{
     return _msg;
 }
diff --git a/tools_layouts/prm_adb_db.h b/tools_layouts/prm_adb_db.h
old mode 100755
new mode 100644
index 24869b3c..811a31d7
--- a/tools_layouts/prm_adb_db.h
+++ b/tools_layouts/prm_adb_db.h
@@ -41,7 +41,8 @@
 #include <string>
 #include <exception>
 
-class PrmAdbDB {
+class PrmAdbDB
+{
 public:
     static std::string prm_adb_db_trim(const std::string& s);
     static std::string prm_adb_db_rtrim(const std::string& s);
@@ -49,14 +50,15 @@ class PrmAdbDB {
     static std::string getDefaultDBName(bool isSwitch);
 };
 
-class PrmDBException: public std::exception {
+class PrmDBException : public std::exception
+{
 public:
     // Methods
     PrmDBException();
-    PrmDBException(const char *msg, ...) __attribute__((format(__printf__, 2, 3)));
+    PrmDBException(const char* msg, ...) __attribute__((format(__printf__, 2, 3)));
     PrmDBException(std::string msg);
-    virtual ~PrmDBException() throw ();
-    virtual const char* what() const throw ();
+    virtual ~PrmDBException() throw();
+    virtual const char* what() const throw();
     virtual std::string what_s() const;
 
 private:
diff --git a/tools_layouts/reg_access_hca_layouts.c b/tools_layouts/reg_access_hca_layouts.c
index 223faee8..a79a5d98 100644
--- a/tools_layouts/reg_access_hca_layouts.c
+++ b/tools_layouts/reg_access_hca_layouts.c
@@ -30,3317 +30,3865 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2021-11-23 23:46:24"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/prm/hca/int/reg_access_hca.adb --file-prefix reg_access_hca --prefix reg_access_hca_ --no-adb-utils
-         ***/
+ *** This file was generated at "2021-11-23 23:46:24"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/prm/hca/int/reg_access_hca.adb --file-prefix reg_access_hca --prefix reg_access_hca_ --no-adb-utils
+ ***/
 #include "reg_access_hca_layouts.h"
 
-void reg_access_hca_lock_source_general_semaphore_pack(const struct reg_access_hca_lock_source_general_semaphore *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_general_semaphore_pack(
+  const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
 }
 
-void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_lock_source_general_semaphore *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_lock_source_general_semaphore_print(const struct reg_access_hca_lock_source_general_semaphore *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_lock_source_general_semaphore_print(
+  const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_lock_source_general_semaphore ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_lock_source_general_semaphore ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("QPC_GW") : ((ptr_struct->type == 1 ? ("CQE_GW") : ((ptr_struct->type == 2 ? ("EQE_GW") : ((ptr_struct->type == 3 ? ("MEM_GW") : ((ptr_struct->type == 4 ? ("IPC") : ("unknown")))))))))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
+            (ptr_struct->type == 0 ?
+               ("QPC_GW") :
+               ((ptr_struct->type == 1 ?
+                   ("CQE_GW") :
+                   ((ptr_struct->type == 2 ?
+                       ("EQE_GW") :
+                       ((ptr_struct->type == 3 ? ("MEM_GW") : ((ptr_struct->type == 4 ? ("IPC") : ("unknown")))))))))),
+            ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
 }
 
 unsigned int reg_access_hca_lock_source_general_semaphore_size(void)
 {
-	return REG_ACCESS_HCA_LOCK_SOURCE_GENERAL_SEMAPHORE_SIZE;
+    return REG_ACCESS_HCA_LOCK_SOURCE_GENERAL_SEMAPHORE_SIZE;
 }
 
-void reg_access_hca_lock_source_general_semaphore_dump(const struct reg_access_hca_lock_source_general_semaphore *ptr_struct, FILE *fd)
+void reg_access_hca_lock_source_general_semaphore_dump(
+  const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_lock_source_general_semaphore_print(ptr_struct, fd, 0);
+    reg_access_hca_lock_source_general_semaphore_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->gvmi);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->index);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->gvmi);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->index);
 }
 
-void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                    const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->gvmi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 72;
-	ptr_struct->index = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 24;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->gvmi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 72;
+    ptr_struct->index = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_lock_source_icm_resource ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_lock_source_icm_resource ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "gvmi                 : " UH_FMT "\n", ptr_struct->gvmi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "index                : " UH_FMT "\n", ptr_struct->index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "gvmi                 : " UH_FMT "\n", ptr_struct->gvmi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "index                : " UH_FMT "\n", ptr_struct->index);
 }
 
 unsigned int reg_access_hca_lock_source_icm_resource_size(void)
 {
-	return REG_ACCESS_HCA_LOCK_SOURCE_ICM_RESOURCE_SIZE;
+    return REG_ACCESS_HCA_LOCK_SOURCE_ICM_RESOURCE_SIZE;
 }
 
-void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource *ptr_struct, FILE *fd)
+void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                  FILE* fd)
 {
-	reg_access_hca_lock_source_icm_resource_print(ptr_struct, fd, 0);
+    reg_access_hca_lock_source_icm_resource_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                   u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->gvmi);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->index);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->gvmi);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->index);
 }
 
-void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                     const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->gvmi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 72;
-	ptr_struct->index = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 24;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->gvmi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 72;
+    ptr_struct->index = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                    FILE* fd,
+                                                    int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_lock_source_uapp_resource ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_lock_source_uapp_resource ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("UAPP_QP") : ((ptr_struct->type == 1 ? ("SRQ") : ((ptr_struct->type == 2 ? ("UAPP_SRQ_META") : ((ptr_struct->type == 3 ? ("UAPP_RES_CQ") : ((ptr_struct->type == 4 ? ("UAPP_REQ_CQ") : ((ptr_struct->type == 5 ? ("UAPP_EQ") : ((ptr_struct->type == 6 ? ("NSQ") : ((ptr_struct->type == 7 ? ("NCQ") : ("unknown")))))))))))))))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "gvmi                 : " UH_FMT "\n", ptr_struct->gvmi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "index                : " UH_FMT "\n", ptr_struct->index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "type                 : %s (" UH_FMT ")\n",
+      (ptr_struct->type == 0 ?
+         ("UAPP_QP") :
+         ((ptr_struct->type == 1 ?
+             ("SRQ") :
+             ((ptr_struct->type == 2 ?
+                 ("UAPP_SRQ_META") :
+                 ((ptr_struct->type == 3 ?
+                     ("UAPP_RES_CQ") :
+                     ((ptr_struct->type == 4 ?
+                         ("UAPP_REQ_CQ") :
+                         ((ptr_struct->type == 5 ?
+                             ("UAPP_EQ") :
+                             ((ptr_struct->type == 6 ? ("NSQ") :
+                                                       ((ptr_struct->type == 7 ? ("NCQ") : ("unknown")))))))))))))))),
+      ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "gvmi                 : " UH_FMT "\n", ptr_struct->gvmi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "index                : " UH_FMT "\n", ptr_struct->index);
 }
 
 unsigned int reg_access_hca_lock_source_uapp_resource_size(void)
 {
-	return REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE;
+    return REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE;
 }
 
-void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource *ptr_struct, FILE *fd)
+void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                   FILE* fd)
 {
-	reg_access_hca_lock_source_uapp_resource_print(ptr_struct, fd, 0);
+    reg_access_hca_lock_source_uapp_resource_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(
+  const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	reg_access_hca_lock_source_general_semaphore_pack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
+    reg_access_hca_lock_source_general_semaphore_pack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(
+  union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	reg_access_hca_lock_source_general_semaphore_unpack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
+    reg_access_hca_lock_source_general_semaphore_unpack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(
+  const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lock_source_general_semaphore:\n");
-	reg_access_hca_lock_source_general_semaphore_print(&(ptr_struct->lock_source_general_semaphore), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lock_source_icm_resource:\n");
-	reg_access_hca_lock_source_icm_resource_print(&(ptr_struct->lock_source_icm_resource), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lock_source_uapp_resource:\n");
-	reg_access_hca_lock_source_uapp_resource_print(&(ptr_struct->lock_source_uapp_resource), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lock_source_general_semaphore:\n");
+    reg_access_hca_lock_source_general_semaphore_print(&(ptr_struct->lock_source_general_semaphore), fd,
+                                                       indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lock_source_icm_resource:\n");
+    reg_access_hca_lock_source_icm_resource_print(&(ptr_struct->lock_source_icm_resource), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lock_source_uapp_resource:\n");
+    reg_access_hca_lock_source_uapp_resource_print(&(ptr_struct->lock_source_uapp_resource), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_size(void)
 {
-	return REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE;
+    return REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE;
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, FILE *fd)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(
+  const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(ptr_struct, fd, 0);
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
 }
 
-void reg_access_hca_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	*ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    *ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_uint64 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_uint64 ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t) *ptr_struct);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t)*ptr_struct);
 }
 
 unsigned int reg_access_hca_uint64_size(void)
 {
-	return REG_ACCESS_HCA_UINT64_SIZE;
+    return REG_ACCESS_HCA_UINT64_SIZE;
 }
 
-void reg_access_hca_uint64_dump(const u_int64_t *ptr_struct, FILE *fd)
+void reg_access_hca_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
 {
-	reg_access_hca_uint64_print(ptr_struct, fd, 0);
+    reg_access_hca_uint64_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_pack(const struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_irisc_hang_mini_flow_modifier_pack(
+  const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->irisc_hang_mask);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->irisc_hang_cap_mask);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->irisc_hang_mask);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->irisc_hang_cap_mask);
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->irisc_hang_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->irisc_hang_cap_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 0;
+    ptr_struct->irisc_hang_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->irisc_hang_cap_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_print(const struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_irisc_hang_mini_flow_modifier_print(
+  const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_irisc_hang_mini_flow_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_irisc_hang_mini_flow_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "irisc_hang_mask      : " U32H_FMT "\n", ptr_struct->irisc_hang_mask);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "irisc_hang_cap_mask  : " U32H_FMT "\n", ptr_struct->irisc_hang_cap_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "irisc_hang_mask      : " U32H_FMT "\n", ptr_struct->irisc_hang_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "irisc_hang_cap_mask  : " U32H_FMT "\n", ptr_struct->irisc_hang_cap_mask);
 }
 
 unsigned int reg_access_hca_irisc_hang_mini_flow_modifier_size(void)
 {
-	return REG_ACCESS_HCA_IRISC_HANG_MINI_FLOW_MODIFIER_SIZE;
+    return REG_ACCESS_HCA_IRISC_HANG_MINI_FLOW_MODIFIER_SIZE;
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_dump(const struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, FILE *fd)
+void reg_access_hca_irisc_hang_mini_flow_modifier_dump(
+  const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_irisc_hang_mini_flow_modifier_print(ptr_struct, fd, 0);
+    reg_access_hca_irisc_hang_mini_flow_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_pack(const struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_pack(
+  const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->category);
-	offset = 32;
-	reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(&(ptr_struct->category_modifier), ptr_buff + offset / 8);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->category);
+    offset = 32;
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(&(ptr_struct->category_modifier),
+                                                                                ptr_buff + offset / 8);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_unpack(struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_unpack(
+  struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->category = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(&(ptr_struct->category_modifier), ptr_buff + offset / 8);
+    offset = 0;
+    ptr_struct->category = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(&(ptr_struct->category_modifier),
+                                                                                  ptr_buff + offset / 8);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_print(const struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_lock_source_stop_toggle_modifier_print(
+  const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "category             : %s (" UH_FMT ")\n", (ptr_struct->category == 0 ? ("GENERAL_SEMAPHORE") : ((ptr_struct->category == 1 ? ("ICM_RESOURCE") : ((ptr_struct->category == 2 ? ("UAPP_RESOURCE") : ("unknown")))))), ptr_struct->category);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "category_modifier:\n");
-	reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(&(ptr_struct->category_modifier), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "category             : %s (" UH_FMT ")\n",
+            (ptr_struct->category == 0 ?
+               ("GENERAL_SEMAPHORE") :
+               ((ptr_struct->category == 1 ? ("ICM_RESOURCE") :
+                                             ((ptr_struct->category == 2 ? ("UAPP_RESOURCE") : ("unknown")))))),
+            ptr_struct->category);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "category_modifier:\n");
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(&(ptr_struct->category_modifier), fd,
+                                                                                 indent_level + 1);
 }
 
 unsigned int reg_access_hca_lock_source_stop_toggle_modifier_size(void)
 {
-	return REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_SIZE;
-}
-
-void reg_access_hca_lock_source_stop_toggle_modifier_dump(const struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, FILE *fd)
-{
-	reg_access_hca_lock_source_stop_toggle_modifier_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->all_hosts_sync);
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->auto_activate);
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_fw_reset);
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_server_reboot);
-	offset = 27;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_server_dc_power_cycle);
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_server_ac_power_cycle);
-	offset = 25;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->self_activation);
-}
-
-void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 31;
-	ptr_struct->all_hosts_sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 30;
-	ptr_struct->auto_activate = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 29;
-	ptr_struct->pending_fw_reset = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 28;
-	ptr_struct->pending_server_reboot = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 27;
-	ptr_struct->pending_server_dc_power_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 26;
-	ptr_struct->pending_server_ac_power_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 25;
-	ptr_struct->self_activation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqi_activation_method ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "all_hosts_sync       : " UH_FMT "\n", ptr_struct->all_hosts_sync);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "auto_activate        : " UH_FMT "\n", ptr_struct->auto_activate);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pending_fw_reset     : " UH_FMT "\n", ptr_struct->pending_fw_reset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pending_server_reboot : " UH_FMT "\n", ptr_struct->pending_server_reboot);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pending_server_dc_power_cycle : " UH_FMT "\n", ptr_struct->pending_server_dc_power_cycle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pending_server_ac_power_cycle : " UH_FMT "\n", ptr_struct->pending_server_ac_power_cycle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "self_activation      : " UH_FMT "\n", ptr_struct->self_activation);
+    return REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_SIZE;
+}
+
+void reg_access_hca_lock_source_stop_toggle_modifier_dump(
+  const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+  FILE* fd)
+{
+    reg_access_hca_lock_source_stop_toggle_modifier_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->all_hosts_sync);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->auto_activate);
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_fw_reset);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_server_reboot);
+    offset = 27;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_server_dc_power_cycle);
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pending_server_ac_power_cycle);
+    offset = 25;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->self_activation);
+}
+
+void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                  const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 31;
+    ptr_struct->all_hosts_sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->auto_activate = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 29;
+    ptr_struct->pending_fw_reset = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 28;
+    ptr_struct->pending_server_reboot = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 27;
+    ptr_struct->pending_server_dc_power_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 26;
+    ptr_struct->pending_server_ac_power_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 25;
+    ptr_struct->self_activation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqi_activation_method ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "all_hosts_sync       : " UH_FMT "\n", ptr_struct->all_hosts_sync);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "auto_activate        : " UH_FMT "\n", ptr_struct->auto_activate);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pending_fw_reset     : " UH_FMT "\n", ptr_struct->pending_fw_reset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pending_server_reboot : " UH_FMT "\n", ptr_struct->pending_server_reboot);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pending_server_dc_power_cycle : " UH_FMT "\n", ptr_struct->pending_server_dc_power_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pending_server_ac_power_cycle : " UH_FMT "\n", ptr_struct->pending_server_ac_power_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "self_activation      : " UH_FMT "\n", ptr_struct->self_activation);
 }
 
 unsigned int reg_access_hca_mcqi_activation_method_size(void)
 {
-	return REG_ACCESS_HCA_MCQI_ACTIVATION_METHOD_SIZE;
-}
-
-void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mcqi_activation_method_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcqi_cap_pack(const struct reg_access_hca_mcqi_cap *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_info_bitmask);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->component_size);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_component_size);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->mcda_max_write_size);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->log_mcda_word_size);
-	offset = 133;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->match_base_guid_mac);
-	offset = 132;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->check_user_timestamp);
-	offset = 131;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->match_psid);
-	offset = 130;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->match_chip_id);
-	offset = 129;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_updates_only);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rd_en);
-}
-
-void reg_access_hca_mcqi_cap_unpack(struct reg_access_hca_mcqi_cap *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	ptr_struct->supported_info_bitmask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->component_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->max_component_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 112;
-	ptr_struct->mcda_max_write_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 96;
-	ptr_struct->log_mcda_word_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 133;
-	ptr_struct->match_base_guid_mac = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 132;
-	ptr_struct->check_user_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 131;
-	ptr_struct->match_psid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 130;
-	ptr_struct->match_chip_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 129;
-	ptr_struct->signed_updates_only = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 128;
-	ptr_struct->rd_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void reg_access_hca_mcqi_cap_print(const struct reg_access_hca_mcqi_cap *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqi_cap ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "supported_info_bitmask : " U32H_FMT "\n", ptr_struct->supported_info_bitmask);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_size       : " U32H_FMT "\n", ptr_struct->component_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_component_size   : " U32H_FMT "\n", ptr_struct->max_component_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcda_max_write_size  : " UH_FMT "\n", ptr_struct->mcda_max_write_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_mcda_word_size   : " UH_FMT "\n", ptr_struct->log_mcda_word_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "match_base_guid_mac  : " UH_FMT "\n", ptr_struct->match_base_guid_mac);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "check_user_timestamp : " UH_FMT "\n", ptr_struct->check_user_timestamp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "match_psid           : " UH_FMT "\n", ptr_struct->match_psid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "match_chip_id        : " UH_FMT "\n", ptr_struct->match_chip_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_updates_only  : " UH_FMT "\n", ptr_struct->signed_updates_only);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rd_en                : " UH_FMT "\n", ptr_struct->rd_en);
+    return REG_ACCESS_HCA_MCQI_ACTIVATION_METHOD_SIZE;
+}
+
+void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                FILE* fd)
+{
+    reg_access_hca_mcqi_activation_method_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcqi_cap_pack(const struct reg_access_hca_mcqi_cap* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->supported_info_bitmask);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->component_size);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_component_size);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->mcda_max_write_size);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->log_mcda_word_size);
+    offset = 133;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->match_base_guid_mac);
+    offset = 132;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->check_user_timestamp);
+    offset = 131;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->match_psid);
+    offset = 130;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->match_chip_id);
+    offset = 129;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_updates_only);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rd_en);
+}
+
+void reg_access_hca_mcqi_cap_unpack(struct reg_access_hca_mcqi_cap* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    ptr_struct->supported_info_bitmask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->component_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->max_component_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 112;
+    ptr_struct->mcda_max_write_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 96;
+    ptr_struct->log_mcda_word_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 133;
+    ptr_struct->match_base_guid_mac = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 132;
+    ptr_struct->check_user_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 131;
+    ptr_struct->match_psid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 130;
+    ptr_struct->match_chip_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 129;
+    ptr_struct->signed_updates_only = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 128;
+    ptr_struct->rd_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void reg_access_hca_mcqi_cap_print(const struct reg_access_hca_mcqi_cap* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqi_cap ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "supported_info_bitmask : " U32H_FMT "\n", ptr_struct->supported_info_bitmask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_size       : " U32H_FMT "\n", ptr_struct->component_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_component_size   : " U32H_FMT "\n", ptr_struct->max_component_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcda_max_write_size  : " UH_FMT "\n", ptr_struct->mcda_max_write_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_mcda_word_size   : " UH_FMT "\n", ptr_struct->log_mcda_word_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "match_base_guid_mac  : " UH_FMT "\n", ptr_struct->match_base_guid_mac);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "check_user_timestamp : " UH_FMT "\n", ptr_struct->check_user_timestamp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "match_psid           : " UH_FMT "\n", ptr_struct->match_psid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "match_chip_id        : " UH_FMT "\n", ptr_struct->match_chip_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_updates_only  : " UH_FMT "\n", ptr_struct->signed_updates_only);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rd_en                : " UH_FMT "\n", ptr_struct->rd_en);
 }
 
 unsigned int reg_access_hca_mcqi_cap_size(void)
 {
-	return REG_ACCESS_HCA_MCQI_CAP_SIZE;
-}
-
-void reg_access_hca_mcqi_cap_dump(const struct reg_access_hca_mcqi_cap *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mcqi_cap_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_image_status_bitmap);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_image_info_bitmap);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_a_minor);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_a_major);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->image_a_subminor);
-	offset = 120;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_b_minor);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_b_major);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->image_b_subminor);
-	offset = 184;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->factory_image_minor);
-	offset = 176;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->factory_image_major);
-	offset = 208;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->factory_image_subminor);
-	offset = 250;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->management_interface_protocol);
-	offset = 242;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->activation_type);
-	offset = 272;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vendor_sn);
-}
-
-void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->fw_image_status_bitmap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->fw_image_info_bitmap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 56;
-	ptr_struct->image_a_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->image_a_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 80;
-	ptr_struct->image_a_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 120;
-	ptr_struct->image_b_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->image_b_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 144;
-	ptr_struct->image_b_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 184;
-	ptr_struct->factory_image_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 176;
-	ptr_struct->factory_image_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 208;
-	ptr_struct->factory_image_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 250;
-	ptr_struct->management_interface_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 242;
-	ptr_struct->activation_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 272;
-	ptr_struct->vendor_sn = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqi_linkx_properties ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_image_status_bitmap : " UH_FMT "\n", ptr_struct->fw_image_status_bitmap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_image_info_bitmap : " UH_FMT "\n", ptr_struct->fw_image_info_bitmap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_a_minor        : " UH_FMT "\n", ptr_struct->image_a_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_a_major        : " UH_FMT "\n", ptr_struct->image_a_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_a_subminor     : " UH_FMT "\n", ptr_struct->image_a_subminor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_b_minor        : " UH_FMT "\n", ptr_struct->image_b_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_b_major        : " UH_FMT "\n", ptr_struct->image_b_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_b_subminor     : " UH_FMT "\n", ptr_struct->image_b_subminor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "factory_image_minor  : " UH_FMT "\n", ptr_struct->factory_image_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "factory_image_major  : " UH_FMT "\n", ptr_struct->factory_image_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "factory_image_subminor : " UH_FMT "\n", ptr_struct->factory_image_subminor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "management_interface_protocol : " UH_FMT "\n", ptr_struct->management_interface_protocol);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "activation_type      : " UH_FMT "\n", ptr_struct->activation_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vendor_sn            : " UH_FMT "\n", ptr_struct->vendor_sn);
+    return REG_ACCESS_HCA_MCQI_CAP_SIZE;
+}
+
+void reg_access_hca_mcqi_cap_dump(const struct reg_access_hca_mcqi_cap* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mcqi_cap_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                               u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_image_status_bitmap);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_image_info_bitmap);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_a_minor);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_a_major);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->image_a_subminor);
+    offset = 120;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_b_minor);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->image_b_major);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->image_b_subminor);
+    offset = 184;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->factory_image_minor);
+    offset = 176;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->factory_image_major);
+    offset = 208;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->factory_image_subminor);
+    offset = 250;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->management_interface_protocol);
+    offset = 242;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->activation_type);
+    offset = 272;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vendor_sn);
+}
+
+void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                                 const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->fw_image_status_bitmap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->fw_image_info_bitmap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->image_a_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->image_a_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 80;
+    ptr_struct->image_a_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 120;
+    ptr_struct->image_b_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->image_b_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 144;
+    ptr_struct->image_b_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 184;
+    ptr_struct->factory_image_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 176;
+    ptr_struct->factory_image_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 208;
+    ptr_struct->factory_image_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 250;
+    ptr_struct->management_interface_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 242;
+    ptr_struct->activation_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 272;
+    ptr_struct->vendor_sn = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqi_linkx_properties ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_image_status_bitmap : " UH_FMT "\n", ptr_struct->fw_image_status_bitmap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_image_info_bitmap : " UH_FMT "\n", ptr_struct->fw_image_info_bitmap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_a_minor        : " UH_FMT "\n", ptr_struct->image_a_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_a_major        : " UH_FMT "\n", ptr_struct->image_a_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_a_subminor     : " UH_FMT "\n", ptr_struct->image_a_subminor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_b_minor        : " UH_FMT "\n", ptr_struct->image_b_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_b_major        : " UH_FMT "\n", ptr_struct->image_b_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_b_subminor     : " UH_FMT "\n", ptr_struct->image_b_subminor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "factory_image_minor  : " UH_FMT "\n", ptr_struct->factory_image_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "factory_image_major  : " UH_FMT "\n", ptr_struct->factory_image_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "factory_image_subminor : " UH_FMT "\n", ptr_struct->factory_image_subminor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "management_interface_protocol : " UH_FMT "\n", ptr_struct->management_interface_protocol);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "activation_type      : " UH_FMT "\n", ptr_struct->activation_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vendor_sn            : " UH_FMT "\n", ptr_struct->vendor_sn);
 }
 
 unsigned int reg_access_hca_mcqi_linkx_properties_size(void)
 {
-	return REG_ACCESS_HCA_MCQI_LINKX_PROPERTIES_SIZE;
-}
-
-void reg_access_hca_mcqi_linkx_properties_dump(const struct reg_access_hca_mcqi_linkx_properties *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mcqi_linkx_properties_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcqi_version_pack(const struct reg_access_hca_mcqi_version *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_string_length);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->user_defined_time_valid);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->build_time_valid);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->build_time);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->user_defined_time);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->build_tool_version);
-	for (i = 0; i < 92; ++i) {
-		offset = adb2c_calc_array_field_address(280, 8, i, 992, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_string[i]);
-	}
-}
-
-void reg_access_hca_mcqi_version_unpack(struct reg_access_hca_mcqi_version *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->version_string_length = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 3;
-	ptr_struct->user_defined_time_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->build_time_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->build_time = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
-	offset = 128;
-	ptr_struct->user_defined_time = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
-	offset = 192;
-	ptr_struct->build_tool_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	for (i = 0; i < 92; ++i) {
-		offset = adb2c_calc_array_field_address(280, 8, i, 992, 1);
-		ptr_struct->version_string[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-}
-
-void reg_access_hca_mcqi_version_print(const struct reg_access_hca_mcqi_version *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqi_version ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version_string_length : " UH_FMT "\n", ptr_struct->version_string_length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "user_defined_time_valid : " UH_FMT "\n", ptr_struct->user_defined_time_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "build_time_valid     : " UH_FMT "\n", ptr_struct->build_time_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " U32H_FMT "\n", ptr_struct->version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "build_time           : " U64H_FMT "\n", ptr_struct->build_time);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "user_defined_time    : " U64H_FMT "\n", ptr_struct->user_defined_time);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "build_tool_version   : " U32H_FMT "\n", ptr_struct->build_tool_version);
-	for (i = 0; i < 92; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "version_string_%03d  : " UH_FMT "\n", i, ptr_struct->version_string[i]);
-	}
+    return REG_ACCESS_HCA_MCQI_LINKX_PROPERTIES_SIZE;
+}
+
+void reg_access_hca_mcqi_linkx_properties_dump(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mcqi_linkx_properties_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcqi_version_pack(const struct reg_access_hca_mcqi_version* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_string_length);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->user_defined_time_valid);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->build_time_valid);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->build_time);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->user_defined_time);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->build_tool_version);
+    for (i = 0; i < 92; ++i)
+    {
+        offset = adb2c_calc_array_field_address(280, 8, i, 992, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_string[i]);
+    }
+}
+
+void reg_access_hca_mcqi_version_unpack(struct reg_access_hca_mcqi_version* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->version_string_length = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 3;
+    ptr_struct->user_defined_time_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->build_time_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->build_time = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 128;
+    ptr_struct->user_defined_time = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 192;
+    ptr_struct->build_tool_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    for (i = 0; i < 92; ++i)
+    {
+        offset = adb2c_calc_array_field_address(280, 8, i, 992, 1);
+        ptr_struct->version_string[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+}
+
+void reg_access_hca_mcqi_version_print(const struct reg_access_hca_mcqi_version* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqi_version ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version_string_length : " UH_FMT "\n", ptr_struct->version_string_length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "user_defined_time_valid : " UH_FMT "\n", ptr_struct->user_defined_time_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "build_time_valid     : " UH_FMT "\n", ptr_struct->build_time_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " U32H_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "build_time           : " U64H_FMT "\n", ptr_struct->build_time);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "user_defined_time    : " U64H_FMT "\n", ptr_struct->user_defined_time);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "build_tool_version   : " U32H_FMT "\n", ptr_struct->build_tool_version);
+    for (i = 0; i < 92; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "version_string_%03d  : " UH_FMT "\n", i, ptr_struct->version_string[i]);
+    }
 }
 
 unsigned int reg_access_hca_mcqi_version_size(void)
 {
-	return REG_ACCESS_HCA_MCQI_VERSION_SIZE;
+    return REG_ACCESS_HCA_MCQI_VERSION_SIZE;
 }
 
-void reg_access_hca_mcqi_version_dump(const struct reg_access_hca_mcqi_version *ptr_struct, FILE *fd)
+void reg_access_hca_mcqi_version_dump(const struct reg_access_hca_mcqi_version* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mcqi_version_print(ptr_struct, fd, 0);
+    reg_access_hca_mcqi_version_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_pack(const struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_packet_drop_mini_flow_modifier_pack(
+  const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_packets);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_packets);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_unpack(struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_packet_drop_mini_flow_modifier_unpack(
+  struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	ptr_struct->num_packets = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 0;
-	ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 28;
+    ptr_struct->num_packets = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 0;
+    ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_print(const struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_packet_drop_mini_flow_modifier_print(
+  const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_packet_drop_mini_flow_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_packet_drop_mini_flow_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_packets          : " UH_FMT "\n", ptr_struct->num_packets);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_packets          : " UH_FMT "\n", ptr_struct->num_packets);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
+            (ptr_struct->port_number == 1 ? ("port_number1") :
+                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+            ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_packet_drop_mini_flow_modifier_size(void)
 {
-	return REG_ACCESS_HCA_PACKET_DROP_MINI_FLOW_MODIFIER_SIZE;
+    return REG_ACCESS_HCA_PACKET_DROP_MINI_FLOW_MODIFIER_SIZE;
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_dump(const struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, FILE *fd)
+void reg_access_hca_packet_drop_mini_flow_modifier_dump(
+  const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_packet_drop_mini_flow_modifier_print(ptr_struct, fd, 0);
+    reg_access_hca_packet_drop_mini_flow_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_pack(const struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_pause_tx_stop_toggle_modifier_pack(
+  const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->sl_prio_mask);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->sl_prio_mask);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->sl_prio_mask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->sl_prio_mask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_print(const struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_pause_tx_stop_toggle_modifier_print(
+  const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_pause_tx_stop_toggle_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_pause_tx_stop_toggle_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sl_prio_mask         : %s (" UH_FMT ")\n", (ptr_struct->sl_prio_mask == 1 ? ("SL_PRIO_0") : ((ptr_struct->sl_prio_mask == 2 ? ("SL_PRIO_1") : ((ptr_struct->sl_prio_mask == 4 ? ("SL_PRIO_2") : ((ptr_struct->sl_prio_mask == 8 ? ("SL_PRIO_3") : ((ptr_struct->sl_prio_mask == 16 ? ("SL_PRIO_4") : ((ptr_struct->sl_prio_mask == 32 ? ("SL_PRIO_5") : ((ptr_struct->sl_prio_mask == 64 ? ("SL_PRIO_6") : ((ptr_struct->sl_prio_mask == 128 ? ("SL_PRIO_7") : ("unknown")))))))))))))))), ptr_struct->sl_prio_mask);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sl_prio_mask         : %s (" UH_FMT ")\n",
+            (ptr_struct->sl_prio_mask == 1 ?
+               ("SL_PRIO_0") :
+               ((ptr_struct->sl_prio_mask == 2 ?
+                   ("SL_PRIO_1") :
+                   ((ptr_struct->sl_prio_mask == 4 ?
+                       ("SL_PRIO_2") :
+                       ((ptr_struct->sl_prio_mask == 8 ?
+                           ("SL_PRIO_3") :
+                           ((ptr_struct->sl_prio_mask == 16 ?
+                               ("SL_PRIO_4") :
+                               ((ptr_struct->sl_prio_mask == 32 ?
+                                   ("SL_PRIO_5") :
+                                   ((ptr_struct->sl_prio_mask == 64 ?
+                                       ("SL_PRIO_6") :
+                                       ((ptr_struct->sl_prio_mask == 128 ? ("SL_PRIO_7") : ("unknown")))))))))))))))),
+            ptr_struct->sl_prio_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
+            (ptr_struct->port_number == 1 ? ("port_number1") :
+                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+            ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_pause_tx_stop_toggle_modifier_size(void)
 {
-	return REG_ACCESS_HCA_PAUSE_TX_STOP_TOGGLE_MODIFIER_SIZE;
+    return REG_ACCESS_HCA_PAUSE_TX_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_dump(const struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, FILE *fd)
+void reg_access_hca_pause_tx_stop_toggle_modifier_dump(
+  const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_pause_tx_stop_toggle_modifier_print(ptr_struct, fd, 0);
+    reg_access_hca_pause_tx_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_rom_version_pack(const struct reg_access_hca_rom_version *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_rom_version_pack(const struct reg_access_hca_rom_version* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->build);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->build);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
 }
 
-void reg_access_hca_rom_version_unpack(struct reg_access_hca_rom_version *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_rom_version_unpack(struct reg_access_hca_rom_version* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->build = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->build = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_rom_version_print(const struct reg_access_hca_rom_version *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_rom_version_print(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_rom_version ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_rom_version ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "build                : " UH_FMT "\n", ptr_struct->build);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "build                : " UH_FMT "\n", ptr_struct->build);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
 }
 
 unsigned int reg_access_hca_rom_version_size(void)
 {
-	return REG_ACCESS_HCA_ROM_VERSION_SIZE;
+    return REG_ACCESS_HCA_ROM_VERSION_SIZE;
 }
 
-void reg_access_hca_rom_version_dump(const struct reg_access_hca_rom_version *ptr_struct, FILE *fd)
+void reg_access_hca_rom_version_dump(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd)
 {
-	reg_access_hca_rom_version_print(ptr_struct, fd, 0);
+    reg_access_hca_rom_version_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(
+  const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vl_tc_mask);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vl_tc_mask);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->vl_tc_mask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->vl_tc_mask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_print(
+  const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_rxb_hang_stop_toggle_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_rxb_hang_stop_toggle_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n", (ptr_struct->vl_tc_mask == 1 ? ("VL_TC_0") : ((ptr_struct->vl_tc_mask == 2 ? ("VL_TC_1") : ((ptr_struct->vl_tc_mask == 4 ? ("VL_TC_2") : ((ptr_struct->vl_tc_mask == 8 ? ("VL_TC_3") : ((ptr_struct->vl_tc_mask == 16 ? ("VL_TC_4") : ((ptr_struct->vl_tc_mask == 32 ? ("VL_TC_5") : ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") : ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))), ptr_struct->vl_tc_mask);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
+      (ptr_struct->vl_tc_mask == 1 ?
+         ("VL_TC_0") :
+         ((ptr_struct->vl_tc_mask == 2 ?
+             ("VL_TC_1") :
+             ((ptr_struct->vl_tc_mask == 4 ?
+                 ("VL_TC_2") :
+                 ((ptr_struct->vl_tc_mask == 8 ?
+                     ("VL_TC_3") :
+                     ((ptr_struct->vl_tc_mask == 16 ?
+                         ("VL_TC_4") :
+                         ((ptr_struct->vl_tc_mask == 32 ?
+                             ("VL_TC_5") :
+                             ((ptr_struct->vl_tc_mask == 64 ?
+                                 ("VL_TC_6") :
+                                 ((ptr_struct->vl_tc_mask == 128 ?
+                                     ("VL_TC_7") :
+                                     ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
+      ptr_struct->vl_tc_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
+            (ptr_struct->port_number == 1 ? ("port_number1") :
+                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+            ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_rxb_hang_stop_toggle_modifier_size(void)
 {
-	return REG_ACCESS_HCA_RXB_HANG_STOP_TOGGLE_MODIFIER_SIZE;
-}
-
-void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, FILE *fd)
-{
-	reg_access_hca_rxb_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vl_tc_mask);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pnat);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
-}
-
-void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->vl_tc_mask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 14;
-	ptr_struct->pnat = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 0;
-	ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-}
-
-void reg_access_hca_rxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_rxp_hang_stop_toggle_modifier ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n", (ptr_struct->vl_tc_mask == 1 ? ("VL_TC_0") : ((ptr_struct->vl_tc_mask == 2 ? ("VL_TC_1") : ((ptr_struct->vl_tc_mask == 4 ? ("VL_TC_2") : ((ptr_struct->vl_tc_mask == 8 ? ("VL_TC_3") : ((ptr_struct->vl_tc_mask == 16 ? ("VL_TC_4") : ((ptr_struct->vl_tc_mask == 32 ? ("VL_TC_5") : ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") : ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))), ptr_struct->vl_tc_mask);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pnat                 : " UH_FMT "\n", ptr_struct->pnat);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
+    return REG_ACCESS_HCA_RXB_HANG_STOP_TOGGLE_MODIFIER_SIZE;
+}
+
+void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(
+  const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+  FILE* fd)
+{
+    reg_access_hca_rxb_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(
+  const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vl_tc_mask);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pnat);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
+}
+
+void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->vl_tc_mask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 14;
+    ptr_struct->pnat = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 0;
+    ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+}
+
+void reg_access_hca_rxp_hang_stop_toggle_modifier_print(
+  const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_rxp_hang_stop_toggle_modifier ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
+      (ptr_struct->vl_tc_mask == 1 ?
+         ("VL_TC_0") :
+         ((ptr_struct->vl_tc_mask == 2 ?
+             ("VL_TC_1") :
+             ((ptr_struct->vl_tc_mask == 4 ?
+                 ("VL_TC_2") :
+                 ((ptr_struct->vl_tc_mask == 8 ?
+                     ("VL_TC_3") :
+                     ((ptr_struct->vl_tc_mask == 16 ?
+                         ("VL_TC_4") :
+                         ((ptr_struct->vl_tc_mask == 32 ?
+                             ("VL_TC_5") :
+                             ((ptr_struct->vl_tc_mask == 64 ?
+                                 ("VL_TC_6") :
+                                 ((ptr_struct->vl_tc_mask == 128 ?
+                                     ("VL_TC_7") :
+                                     ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
+      ptr_struct->vl_tc_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pnat                 : " UH_FMT "\n", ptr_struct->pnat);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
+            (ptr_struct->port_number == 1 ? ("port_number1") :
+                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+            ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_rxp_hang_stop_toggle_modifier_size(void)
 {
-	return REG_ACCESS_HCA_RXP_HANG_STOP_TOGGLE_MODIFIER_SIZE;
+    return REG_ACCESS_HCA_RXP_HANG_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd)
+void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(
+  const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_rxp_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
+    reg_access_hca_rxp_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(
+  const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_print(
+  const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_sxp_hang_stop_toggle_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_sxp_hang_stop_toggle_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
+            (ptr_struct->port_number == 1 ? ("port_number1") :
+                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+            ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_sxp_hang_stop_toggle_modifier_size(void)
 {
-	return REG_ACCESS_HCA_SXP_HANG_STOP_TOGGLE_MODIFIER_SIZE;
+    return REG_ACCESS_HCA_SXP_HANG_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(
+  const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_sxp_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
+    reg_access_hca_sxp_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->counter_id);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sync);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->counter_id);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sync);
 }
 
-void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                  const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->counter_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->counter_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_diagnostic_cntr_layout ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_diagnostic_cntr_layout ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "counter_id           : " UH_FMT "\n", ptr_struct->counter_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sync                 : " UH_FMT "\n", ptr_struct->sync);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "counter_id           : " UH_FMT "\n", ptr_struct->counter_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sync                 : " UH_FMT "\n", ptr_struct->sync);
 }
 
 unsigned int reg_access_hca_diagnostic_cntr_layout_size(void)
 {
-	return REG_ACCESS_HCA_DIAGNOSTIC_CNTR_LAYOUT_SIZE;
+    return REG_ACCESS_HCA_DIAGNOSTIC_CNTR_LAYOUT_SIZE;
 }
 
-void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, FILE *fd)
+void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                FILE* fd)
 {
-	reg_access_hca_diagnostic_cntr_layout_print(ptr_struct, fd, 0);
+    reg_access_hca_diagnostic_cntr_layout_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
+                                            u_int8_t* ptr_buff)
 {
-	reg_access_hca_mcqi_cap_pack(&(ptr_struct->mcqi_cap), ptr_buff);
+    reg_access_hca_mcqi_cap_pack(&(ptr_struct->mcqi_cap), ptr_buff);
 }
 
-void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
+                                              const u_int8_t* ptr_buff)
 {
-	reg_access_hca_mcqi_cap_unpack(&(ptr_struct->mcqi_cap), ptr_buff);
+    reg_access_hca_mcqi_cap_unpack(&(ptr_struct->mcqi_cap), ptr_buff);
 }
 
-void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqi_reg_data_auto ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqi_reg_data_auto ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_cap:\n");
-	reg_access_hca_mcqi_cap_print(&(ptr_struct->mcqi_cap), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_version:\n");
-	reg_access_hca_mcqi_version_print(&(ptr_struct->mcqi_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_activation_method:\n");
-	reg_access_hca_mcqi_activation_method_print(&(ptr_struct->mcqi_activation_method), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_linkx_properties:\n");
-	reg_access_hca_mcqi_linkx_properties_print(&(ptr_struct->mcqi_linkx_properties), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_cap:\n");
+    reg_access_hca_mcqi_cap_print(&(ptr_struct->mcqi_cap), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_version:\n");
+    reg_access_hca_mcqi_version_print(&(ptr_struct->mcqi_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_activation_method:\n");
+    reg_access_hca_mcqi_activation_method_print(&(ptr_struct->mcqi_activation_method), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_linkx_properties:\n");
+    reg_access_hca_mcqi_linkx_properties_print(&(ptr_struct->mcqi_linkx_properties), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_mcqi_reg_data_auto_size(void)
 {
-	return REG_ACCESS_HCA_MCQI_REG_DATA_AUTO_SIZE;
+    return REG_ACCESS_HCA_MCQI_REG_DATA_AUTO_SIZE;
 }
 
-void reg_access_hca_mcqi_reg_data_auto_dump(const union reg_access_hca_mcqi_reg_data_auto *ptr_struct, FILE *fd)
+void reg_access_hca_mcqi_reg_data_auto_dump(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mcqi_reg_data_auto_print(ptr_struct, fd, 0);
+    reg_access_hca_mcqi_reg_data_auto_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mgir_dev_info_pack(const struct reg_access_hca_mgir_dev_info *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mgir_dev_info_pack(const struct reg_access_hca_mgir_dev_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 28; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 224, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->dev_branch_tag[i]);
-	}
+    for (i = 0; i < 28; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 224, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->dev_branch_tag[i]);
+    }
 }
 
-void reg_access_hca_mgir_dev_info_unpack(struct reg_access_hca_mgir_dev_info *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mgir_dev_info_unpack(struct reg_access_hca_mgir_dev_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 28; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 224, 1);
-		ptr_struct->dev_branch_tag[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+    for (i = 0; i < 28; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 224, 1);
+        ptr_struct->dev_branch_tag[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mgir_dev_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mgir_dev_info ========\n");
 
-	for (i = 0; i < 28; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "dev_branch_tag_%03d  : " UH_FMT "\n", i, ptr_struct->dev_branch_tag[i]);
-	}
+    for (i = 0; i < 28; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "dev_branch_tag_%03d  : " UH_FMT "\n", i, ptr_struct->dev_branch_tag[i]);
+    }
 }
 
 unsigned int reg_access_hca_mgir_dev_info_size(void)
 {
-	return REG_ACCESS_HCA_MGIR_DEV_INFO_SIZE;
-}
-
-void reg_access_hca_mgir_dev_info_dump(const struct reg_access_hca_mgir_dev_info *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mgir_dev_info_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mgir_fw_info_pack(const struct reg_access_hca_mgir_fw_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->sub_minor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secured);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dev);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->string_tlv);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dev_sc);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->build_id);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->year);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->day);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->month);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hour);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 256;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_version);
-	offset = 288;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_major);
-	offset = 320;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_minor);
-	offset = 352;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_sub_minor);
-	offset = 400;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->isfu_major);
-	offset = 384;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->disabled_tiles_bitmap);
-	offset = 446;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->life_cycle);
-	offset = 445;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sec_boot);
-	offset = 444;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->encryption);
-}
-
-void reg_access_hca_mgir_fw_info_unpack(struct reg_access_hca_mgir_fw_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->sub_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 7;
-	ptr_struct->secured = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->debug = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->dev = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->string_tlv = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->dev_sc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->build_id = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 72;
-	ptr_struct->day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->hour = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
-		ptr_struct->psid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-	offset = 256;
-	ptr_struct->ini_file_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 288;
-	ptr_struct->extended_major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 320;
-	ptr_struct->extended_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 352;
-	ptr_struct->extended_sub_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 400;
-	ptr_struct->isfu_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 384;
-	ptr_struct->disabled_tiles_bitmap = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 446;
-	ptr_struct->life_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 445;
-	ptr_struct->sec_boot = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 444;
-	ptr_struct->encryption = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void reg_access_hca_mgir_fw_info_print(const struct reg_access_hca_mgir_fw_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mgir_fw_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sub_minor            : " UH_FMT "\n", ptr_struct->sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "secured              : " UH_FMT "\n", ptr_struct->secured);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug                : " UH_FMT "\n", ptr_struct->debug);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dev                  : " UH_FMT "\n", ptr_struct->dev);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "string_tlv           : " UH_FMT "\n", ptr_struct->string_tlv);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dev_sc               : " UH_FMT "\n", ptr_struct->dev_sc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "build_id             : " U32H_FMT "\n", ptr_struct->build_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "year                 : " UH_FMT "\n", ptr_struct->year);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "day                  : " UH_FMT "\n", ptr_struct->day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "month                : " UH_FMT "\n", ptr_struct->month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hour                 : " UH_FMT "\n", ptr_struct->hour);
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "psid_%03d            : " UH_FMT "\n", i, ptr_struct->psid[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini_file_version     : " U32H_FMT "\n", ptr_struct->ini_file_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_major       : " U32H_FMT "\n", ptr_struct->extended_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_minor       : " U32H_FMT "\n", ptr_struct->extended_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_sub_minor   : " U32H_FMT "\n", ptr_struct->extended_sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "isfu_major           : " UH_FMT "\n", ptr_struct->isfu_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "disabled_tiles_bitmap : " UH_FMT "\n", ptr_struct->disabled_tiles_bitmap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "life_cycle           : " UH_FMT "\n", ptr_struct->life_cycle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sec_boot             : " UH_FMT "\n", ptr_struct->sec_boot);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "encryption           : " UH_FMT "\n", ptr_struct->encryption);
+    return REG_ACCESS_HCA_MGIR_DEV_INFO_SIZE;
+}
+
+void reg_access_hca_mgir_dev_info_dump(const struct reg_access_hca_mgir_dev_info* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mgir_dev_info_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mgir_fw_info_pack(const struct reg_access_hca_mgir_fw_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->sub_minor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secured);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dev);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->string_tlv);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dev_sc);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->build_id);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->year);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->day);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->month);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hour);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 256;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_version);
+    offset = 288;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_major);
+    offset = 320;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_minor);
+    offset = 352;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_sub_minor);
+    offset = 400;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->isfu_major);
+    offset = 384;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->disabled_tiles_bitmap);
+    offset = 446;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->life_cycle);
+    offset = 445;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sec_boot);
+    offset = 444;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->encryption);
+}
+
+void reg_access_hca_mgir_fw_info_unpack(struct reg_access_hca_mgir_fw_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->sub_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 7;
+    ptr_struct->secured = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->debug = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->dev = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->string_tlv = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->dev_sc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->build_id = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 72;
+    ptr_struct->day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->hour = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
+        ptr_struct->psid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    offset = 256;
+    ptr_struct->ini_file_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 288;
+    ptr_struct->extended_major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 320;
+    ptr_struct->extended_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 352;
+    ptr_struct->extended_sub_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 400;
+    ptr_struct->isfu_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 384;
+    ptr_struct->disabled_tiles_bitmap = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 446;
+    ptr_struct->life_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 445;
+    ptr_struct->sec_boot = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 444;
+    ptr_struct->encryption = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void reg_access_hca_mgir_fw_info_print(const struct reg_access_hca_mgir_fw_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mgir_fw_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sub_minor            : " UH_FMT "\n", ptr_struct->sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "secured              : " UH_FMT "\n", ptr_struct->secured);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug                : " UH_FMT "\n", ptr_struct->debug);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dev                  : " UH_FMT "\n", ptr_struct->dev);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "string_tlv           : " UH_FMT "\n", ptr_struct->string_tlv);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dev_sc               : " UH_FMT "\n", ptr_struct->dev_sc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "build_id             : " U32H_FMT "\n", ptr_struct->build_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "year                 : " UH_FMT "\n", ptr_struct->year);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "day                  : " UH_FMT "\n", ptr_struct->day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "month                : " UH_FMT "\n", ptr_struct->month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hour                 : " UH_FMT "\n", ptr_struct->hour);
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "psid_%03d            : " UH_FMT "\n", i, ptr_struct->psid[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini_file_version     : " U32H_FMT "\n", ptr_struct->ini_file_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_major       : " U32H_FMT "\n", ptr_struct->extended_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_minor       : " U32H_FMT "\n", ptr_struct->extended_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_sub_minor   : " U32H_FMT "\n", ptr_struct->extended_sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "isfu_major           : " UH_FMT "\n", ptr_struct->isfu_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "disabled_tiles_bitmap : " UH_FMT "\n", ptr_struct->disabled_tiles_bitmap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "life_cycle           : " UH_FMT "\n", ptr_struct->life_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sec_boot             : " UH_FMT "\n", ptr_struct->sec_boot);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "encryption           : " UH_FMT "\n", ptr_struct->encryption);
 }
 
 unsigned int reg_access_hca_mgir_fw_info_size(void)
 {
-	return REG_ACCESS_HCA_MGIR_FW_INFO_SIZE;
-}
-
-void reg_access_hca_mgir_fw_info_dump(const struct reg_access_hca_mgir_fw_info *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mgir_fw_info_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_id);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_hw_revision);
-	offset = 59;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->pvs);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->technology);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_ports);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->manufacturing_base_mac_47_32);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->module_base);
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->manufacturing_base_mac_31_0);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->associated_module_id_31_0);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uptime);
-}
-
-void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->device_hw_revision = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 59;
-	ptr_struct->pvs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 48;
-	ptr_struct->technology = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 40;
-	ptr_struct->num_ports = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 80;
-	ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 144;
-	ptr_struct->manufacturing_base_mac_47_32 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	ptr_struct->module_base = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 160;
-	ptr_struct->manufacturing_base_mac_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 192;
-	ptr_struct->associated_module_id_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 224;
-	ptr_struct->uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mgir_hardware_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_id            : " UH_FMT "\n", ptr_struct->device_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_hw_revision   : " UH_FMT "\n", ptr_struct->device_hw_revision);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pvs                  : " UH_FMT "\n", ptr_struct->pvs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "technology           : " UH_FMT "\n", ptr_struct->technology);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_ports            : " UH_FMT "\n", ptr_struct->num_ports);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_dev_id            : " UH_FMT "\n", ptr_struct->hw_dev_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "manufacturing_base_mac_47_32 : " UH_FMT "\n", ptr_struct->manufacturing_base_mac_47_32);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "module_base          : " UH_FMT "\n", ptr_struct->module_base);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "manufacturing_base_mac_31_0 : " U32H_FMT "\n", ptr_struct->manufacturing_base_mac_31_0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "associated_module_id_31_0 : " U32H_FMT "\n", ptr_struct->associated_module_id_31_0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uptime               : " U32H_FMT "\n", ptr_struct->uptime);
+    return REG_ACCESS_HCA_MGIR_FW_INFO_SIZE;
+}
+
+void reg_access_hca_mgir_fw_info_dump(const struct reg_access_hca_mgir_fw_info* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mgir_fw_info_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
+                                            u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_id);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_hw_revision);
+    offset = 59;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->pvs);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->technology);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_ports);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->manufacturing_base_mac_47_32);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->module_base);
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->manufacturing_base_mac_31_0);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->associated_module_id_31_0);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uptime);
+}
+
+void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info* ptr_struct,
+                                              const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->device_hw_revision = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 59;
+    ptr_struct->pvs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 48;
+    ptr_struct->technology = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 40;
+    ptr_struct->num_ports = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 80;
+    ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 144;
+    ptr_struct->manufacturing_base_mac_47_32 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    ptr_struct->module_base = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 160;
+    ptr_struct->manufacturing_base_mac_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 192;
+    ptr_struct->associated_module_id_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 224;
+    ptr_struct->uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mgir_hardware_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_id            : " UH_FMT "\n", ptr_struct->device_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_hw_revision   : " UH_FMT "\n", ptr_struct->device_hw_revision);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pvs                  : " UH_FMT "\n", ptr_struct->pvs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "technology           : " UH_FMT "\n", ptr_struct->technology);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_ports            : " UH_FMT "\n", ptr_struct->num_ports);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_dev_id            : " UH_FMT "\n", ptr_struct->hw_dev_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "manufacturing_base_mac_47_32 : " UH_FMT "\n", ptr_struct->manufacturing_base_mac_47_32);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "module_base          : " UH_FMT "\n", ptr_struct->module_base);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "manufacturing_base_mac_31_0 : " U32H_FMT "\n", ptr_struct->manufacturing_base_mac_31_0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "associated_module_id_31_0 : " U32H_FMT "\n", ptr_struct->associated_module_id_31_0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uptime               : " U32H_FMT "\n", ptr_struct->uptime);
 }
 
 unsigned int reg_access_hca_mgir_hardware_info_size(void)
 {
-	return REG_ACCESS_HCA_MGIR_HARDWARE_INFO_SIZE;
-}
-
-void reg_access_hca_mgir_hardware_info_dump(const struct reg_access_hca_mgir_hardware_info *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mgir_hardware_info_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mgir_sw_info_pack(const struct reg_access_hca_mgir_sw_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->sub_minor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
-	offset = 60;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_type);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_arch);
-	offset = 52;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_type);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_arch);
-	offset = 44;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_type);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_arch);
-	offset = 36;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_type);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_arch);
-	offset = 64;
-	reg_access_hca_rom_version_pack(&(ptr_struct->rom0_version), ptr_buff + offset / 8);
-	offset = 96;
-	reg_access_hca_rom_version_pack(&(ptr_struct->rom1_version), ptr_buff + offset / 8);
-	offset = 128;
-	reg_access_hca_rom_version_pack(&(ptr_struct->rom2_version), ptr_buff + offset / 8);
-	offset = 160;
-	reg_access_hca_rom_version_pack(&(ptr_struct->rom3_version), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_mgir_sw_info_unpack(struct reg_access_hca_mgir_sw_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->sub_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 60;
-	ptr_struct->rom3_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 56;
-	ptr_struct->rom3_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 52;
-	ptr_struct->rom2_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 48;
-	ptr_struct->rom2_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 44;
-	ptr_struct->rom1_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 40;
-	ptr_struct->rom1_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 36;
-	ptr_struct->rom0_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->rom0_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	reg_access_hca_rom_version_unpack(&(ptr_struct->rom0_version), ptr_buff + offset / 8);
-	offset = 96;
-	reg_access_hca_rom_version_unpack(&(ptr_struct->rom1_version), ptr_buff + offset / 8);
-	offset = 128;
-	reg_access_hca_rom_version_unpack(&(ptr_struct->rom2_version), ptr_buff + offset / 8);
-	offset = 160;
-	reg_access_hca_rom_version_unpack(&(ptr_struct->rom3_version), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_mgir_sw_info_print(const struct reg_access_hca_mgir_sw_info *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mgir_sw_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sub_minor            : " UH_FMT "\n", ptr_struct->sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom3_type            : " UH_FMT "\n", ptr_struct->rom3_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom3_arch            : " UH_FMT "\n", ptr_struct->rom3_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom2_type            : " UH_FMT "\n", ptr_struct->rom2_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom2_arch            : " UH_FMT "\n", ptr_struct->rom2_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom1_type            : " UH_FMT "\n", ptr_struct->rom1_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom1_arch            : " UH_FMT "\n", ptr_struct->rom1_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom0_type            : " UH_FMT "\n", ptr_struct->rom0_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom0_arch            : " UH_FMT "\n", ptr_struct->rom0_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom0_version:\n");
-	reg_access_hca_rom_version_print(&(ptr_struct->rom0_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom1_version:\n");
-	reg_access_hca_rom_version_print(&(ptr_struct->rom1_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom2_version:\n");
-	reg_access_hca_rom_version_print(&(ptr_struct->rom2_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom3_version:\n");
-	reg_access_hca_rom_version_print(&(ptr_struct->rom3_version), fd, indent_level + 1);
+    return REG_ACCESS_HCA_MGIR_HARDWARE_INFO_SIZE;
+}
+
+void reg_access_hca_mgir_hardware_info_dump(const struct reg_access_hca_mgir_hardware_info* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mgir_hardware_info_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mgir_sw_info_pack(const struct reg_access_hca_mgir_sw_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->sub_minor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
+    offset = 60;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_type);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_arch);
+    offset = 52;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_type);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_arch);
+    offset = 44;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_type);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_arch);
+    offset = 36;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_type);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_arch);
+    offset = 64;
+    reg_access_hca_rom_version_pack(&(ptr_struct->rom0_version), ptr_buff + offset / 8);
+    offset = 96;
+    reg_access_hca_rom_version_pack(&(ptr_struct->rom1_version), ptr_buff + offset / 8);
+    offset = 128;
+    reg_access_hca_rom_version_pack(&(ptr_struct->rom2_version), ptr_buff + offset / 8);
+    offset = 160;
+    reg_access_hca_rom_version_pack(&(ptr_struct->rom3_version), ptr_buff + offset / 8);
+}
+
+void reg_access_hca_mgir_sw_info_unpack(struct reg_access_hca_mgir_sw_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->sub_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 60;
+    ptr_struct->rom3_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 56;
+    ptr_struct->rom3_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 52;
+    ptr_struct->rom2_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 48;
+    ptr_struct->rom2_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 44;
+    ptr_struct->rom1_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 40;
+    ptr_struct->rom1_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 36;
+    ptr_struct->rom0_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->rom0_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    reg_access_hca_rom_version_unpack(&(ptr_struct->rom0_version), ptr_buff + offset / 8);
+    offset = 96;
+    reg_access_hca_rom_version_unpack(&(ptr_struct->rom1_version), ptr_buff + offset / 8);
+    offset = 128;
+    reg_access_hca_rom_version_unpack(&(ptr_struct->rom2_version), ptr_buff + offset / 8);
+    offset = 160;
+    reg_access_hca_rom_version_unpack(&(ptr_struct->rom3_version), ptr_buff + offset / 8);
+}
+
+void reg_access_hca_mgir_sw_info_print(const struct reg_access_hca_mgir_sw_info* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mgir_sw_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sub_minor            : " UH_FMT "\n", ptr_struct->sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom3_type            : " UH_FMT "\n", ptr_struct->rom3_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom3_arch            : " UH_FMT "\n", ptr_struct->rom3_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom2_type            : " UH_FMT "\n", ptr_struct->rom2_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom2_arch            : " UH_FMT "\n", ptr_struct->rom2_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom1_type            : " UH_FMT "\n", ptr_struct->rom1_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom1_arch            : " UH_FMT "\n", ptr_struct->rom1_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom0_type            : " UH_FMT "\n", ptr_struct->rom0_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom0_arch            : " UH_FMT "\n", ptr_struct->rom0_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom0_version:\n");
+    reg_access_hca_rom_version_print(&(ptr_struct->rom0_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom1_version:\n");
+    reg_access_hca_rom_version_print(&(ptr_struct->rom1_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom2_version:\n");
+    reg_access_hca_rom_version_print(&(ptr_struct->rom2_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom3_version:\n");
+    reg_access_hca_rom_version_print(&(ptr_struct->rom3_version), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_mgir_sw_info_size(void)
 {
-	return REG_ACCESS_HCA_MGIR_SW_INFO_SIZE;
+    return REG_ACCESS_HCA_MGIR_SW_INFO_SIZE;
 }
 
-void reg_access_hca_mgir_sw_info_dump(const struct reg_access_hca_mgir_sw_info *ptr_struct, FILE *fd)
+void reg_access_hca_mgir_sw_info_dump(const struct reg_access_hca_mgir_sw_info* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mgir_sw_info_print(ptr_struct, fd, 0);
+    reg_access_hca_mgir_sw_info_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_pack(const struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_smbus_failed_fault_inject_modifier_pack(
+  const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->smbus_gw);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->smbus_gw);
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(
+  struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->smbus_gw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->smbus_gw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_print(const struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_smbus_failed_fault_inject_modifier_print(
+  const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_smbus_failed_fault_inject_modifier ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_smbus_failed_fault_inject_modifier ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "smbus_gw             : " UH_FMT "\n", ptr_struct->smbus_gw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "smbus_gw             : " UH_FMT "\n", ptr_struct->smbus_gw);
 }
 
 unsigned int reg_access_hca_smbus_failed_fault_inject_modifier_size(void)
 {
-	return REG_ACCESS_HCA_SMBUS_FAILED_FAULT_INJECT_MODIFIER_SIZE;
+    return REG_ACCESS_HCA_SMBUS_FAILED_FAULT_INJECT_MODIFIER_SIZE;
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_dump(const struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, FILE *fd)
+void reg_access_hca_smbus_failed_fault_inject_modifier_dump(
+  const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_smbus_failed_fault_inject_modifier_print(ptr_struct, fd, 0);
+    reg_access_hca_smbus_failed_fault_inject_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters* ptr_struct,
+                                              u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->string_db_base_address);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->string_db_size);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->string_db_base_address);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->string_db_size);
 }
 
-void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters* ptr_struct,
+                                                const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->string_db_base_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 40;
-	ptr_struct->string_db_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 0;
+    ptr_struct->string_db_base_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 40;
+    ptr_struct->string_db_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_string_db_parameters ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_string_db_parameters ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "string_db_base_address : " U32H_FMT "\n", ptr_struct->string_db_base_address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "string_db_size       : " UH_FMT "\n", ptr_struct->string_db_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "string_db_base_address : " U32H_FMT "\n", ptr_struct->string_db_base_address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "string_db_size       : " UH_FMT "\n", ptr_struct->string_db_size);
 }
 
 unsigned int reg_access_hca_string_db_parameters_size(void)
 {
-	return REG_ACCESS_HCA_STRING_DB_PARAMETERS_SIZE;
+    return REG_ACCESS_HCA_STRING_DB_PARAMETERS_SIZE;
 }
 
-void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string_db_parameters *ptr_struct, FILE *fd)
+void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string_db_parameters* ptr_struct, FILE* fd)
 {
-	reg_access_hca_string_db_parameters_print(ptr_struct, fd, 0);
+    reg_access_hca_string_db_parameters_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(
+  const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	reg_access_hca_irisc_hang_mini_flow_modifier_pack(&(ptr_struct->irisc_hang_mini_flow_modifier), ptr_buff);
+    reg_access_hca_irisc_hang_mini_flow_modifier_pack(&(ptr_struct->irisc_hang_mini_flow_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(
+  union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	reg_access_hca_irisc_hang_mini_flow_modifier_unpack(&(ptr_struct->irisc_hang_mini_flow_modifier), ptr_buff);
+    reg_access_hca_irisc_hang_mini_flow_modifier_unpack(&(ptr_struct->irisc_hang_mini_flow_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(
+  const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "irisc_hang_mini_flow_modifier:\n");
-	reg_access_hca_irisc_hang_mini_flow_modifier_print(&(ptr_struct->irisc_hang_mini_flow_modifier), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "packet_drop_mini_flow_modifier:\n");
-	reg_access_hca_packet_drop_mini_flow_modifier_print(&(ptr_struct->packet_drop_mini_flow_modifier), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "irisc_hang_mini_flow_modifier:\n");
+    reg_access_hca_irisc_hang_mini_flow_modifier_print(&(ptr_struct->irisc_hang_mini_flow_modifier), fd,
+                                                       indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "packet_drop_mini_flow_modifier:\n");
+    reg_access_hca_packet_drop_mini_flow_modifier_print(&(ptr_struct->packet_drop_mini_flow_modifier), fd,
+                                                        indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_size(void)
 {
-	return REG_ACCESS_HCA_STRS_MINI_FLOW_REG_PER_TYPE_MODIFIER_AUTO_SIZE;
+    return REG_ACCESS_HCA_STRS_MINI_FLOW_REG_PER_TYPE_MODIFIER_AUTO_SIZE;
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, FILE *fd)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(
+  const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+  FILE* fd)
 {
-	reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(ptr_struct, fd, 0);
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(
+  const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	reg_access_hca_rxb_hang_stop_toggle_modifier_pack(&(ptr_struct->rxb_hang_stop_toggle_modifier), ptr_buff);
+    reg_access_hca_rxb_hang_stop_toggle_modifier_pack(&(ptr_struct->rxb_hang_stop_toggle_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(
+  union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(&(ptr_struct->rxb_hang_stop_toggle_modifier), ptr_buff);
+    reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(&(ptr_struct->rxb_hang_stop_toggle_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(
+  const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rxb_hang_stop_toggle_modifier:\n");
-	reg_access_hca_rxb_hang_stop_toggle_modifier_print(&(ptr_struct->rxb_hang_stop_toggle_modifier), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lock_source_stop_toggle_modifier:\n");
-	reg_access_hca_lock_source_stop_toggle_modifier_print(&(ptr_struct->lock_source_stop_toggle_modifier), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sxp_hang_stop_toggle_modifier:\n");
-	reg_access_hca_sxp_hang_stop_toggle_modifier_print(&(ptr_struct->sxp_hang_stop_toggle_modifier), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rxp_hang_stop_toggle_modifier:\n");
-	reg_access_hca_rxp_hang_stop_toggle_modifier_print(&(ptr_struct->rxp_hang_stop_toggle_modifier), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pause_tx_stop_toggle_modifier:\n");
-	reg_access_hca_pause_tx_stop_toggle_modifier_print(&(ptr_struct->pause_tx_stop_toggle_modifier), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rxb_hang_stop_toggle_modifier:\n");
+    reg_access_hca_rxb_hang_stop_toggle_modifier_print(&(ptr_struct->rxb_hang_stop_toggle_modifier), fd,
+                                                       indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lock_source_stop_toggle_modifier:\n");
+    reg_access_hca_lock_source_stop_toggle_modifier_print(&(ptr_struct->lock_source_stop_toggle_modifier), fd,
+                                                          indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sxp_hang_stop_toggle_modifier:\n");
+    reg_access_hca_sxp_hang_stop_toggle_modifier_print(&(ptr_struct->sxp_hang_stop_toggle_modifier), fd,
+                                                       indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rxp_hang_stop_toggle_modifier:\n");
+    reg_access_hca_rxp_hang_stop_toggle_modifier_print(&(ptr_struct->rxp_hang_stop_toggle_modifier), fd,
+                                                       indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pause_tx_stop_toggle_modifier:\n");
+    reg_access_hca_pause_tx_stop_toggle_modifier_print(&(ptr_struct->pause_tx_stop_toggle_modifier), fd,
+                                                       indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_size(void)
 {
-	return REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_PER_TYPE_MODIFIER_AUTO_SIZE;
-}
-
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, FILE *fd)
-{
-	reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_debug_cap_pack(const struct reg_access_hca_debug_cap *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_max_samples);
-	offset = 11;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_min_resource_dump_eq);
-	offset = 9;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->resource_dump);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_cr_dump_to_mem_size);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->core_dump_qp);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->core_dump_general);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_min_sample_period);
-	offset = 35;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->diag_counter_tracer_dump);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->health_mon_rx_activity);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->repetitive);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->single);
-}
-
-void reg_access_hca_debug_cap_unpack(struct reg_access_hca_debug_cap *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->log_max_samples = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 11;
-	ptr_struct->log_min_resource_dump_eq = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 9;
-	ptr_struct->resource_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->log_cr_dump_to_mem_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 1;
-	ptr_struct->core_dump_qp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->core_dump_general = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->log_min_sample_period = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 35;
-	ptr_struct->diag_counter_tracer_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 34;
-	ptr_struct->health_mon_rx_activity = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 33;
-	ptr_struct->repetitive = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->single = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void reg_access_hca_debug_cap_print(const struct reg_access_hca_debug_cap *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_debug_cap ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_max_samples      : " UH_FMT "\n", ptr_struct->log_max_samples);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_min_resource_dump_eq : " UH_FMT "\n", ptr_struct->log_min_resource_dump_eq);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "resource_dump        : " UH_FMT "\n", ptr_struct->resource_dump);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_cr_dump_to_mem_size : " UH_FMT "\n", ptr_struct->log_cr_dump_to_mem_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "core_dump_qp         : " UH_FMT "\n", ptr_struct->core_dump_qp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "core_dump_general    : " UH_FMT "\n", ptr_struct->core_dump_general);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_min_sample_period : " UH_FMT "\n", ptr_struct->log_min_sample_period);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "diag_counter_tracer_dump : " UH_FMT "\n", ptr_struct->diag_counter_tracer_dump);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "health_mon_rx_activity : " UH_FMT "\n", ptr_struct->health_mon_rx_activity);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "repetitive           : " UH_FMT "\n", ptr_struct->repetitive);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "single               : " UH_FMT "\n", ptr_struct->single);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "unlimited array subnode: (diagnostic_counter)\n");
+    return REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_PER_TYPE_MODIFIER_AUTO_SIZE;
+}
+
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(
+  const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+  FILE* fd)
+{
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_debug_cap_pack(const struct reg_access_hca_debug_cap* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_max_samples);
+    offset = 11;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_min_resource_dump_eq);
+    offset = 9;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->resource_dump);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_cr_dump_to_mem_size);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->core_dump_qp);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->core_dump_general);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_min_sample_period);
+    offset = 35;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->diag_counter_tracer_dump);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->health_mon_rx_activity);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->repetitive);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->single);
+}
+
+void reg_access_hca_debug_cap_unpack(struct reg_access_hca_debug_cap* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->log_max_samples = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 11;
+    ptr_struct->log_min_resource_dump_eq = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 9;
+    ptr_struct->resource_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->log_cr_dump_to_mem_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 1;
+    ptr_struct->core_dump_qp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->core_dump_general = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->log_min_sample_period = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 35;
+    ptr_struct->diag_counter_tracer_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 34;
+    ptr_struct->health_mon_rx_activity = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 33;
+    ptr_struct->repetitive = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->single = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void reg_access_hca_debug_cap_print(const struct reg_access_hca_debug_cap* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_debug_cap ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_max_samples      : " UH_FMT "\n", ptr_struct->log_max_samples);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_min_resource_dump_eq : " UH_FMT "\n", ptr_struct->log_min_resource_dump_eq);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "resource_dump        : " UH_FMT "\n", ptr_struct->resource_dump);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_cr_dump_to_mem_size : " UH_FMT "\n", ptr_struct->log_cr_dump_to_mem_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "core_dump_qp         : " UH_FMT "\n", ptr_struct->core_dump_qp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "core_dump_general    : " UH_FMT "\n", ptr_struct->core_dump_general);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_min_sample_period : " UH_FMT "\n", ptr_struct->log_min_sample_period);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "diag_counter_tracer_dump : " UH_FMT "\n", ptr_struct->diag_counter_tracer_dump);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "health_mon_rx_activity : " UH_FMT "\n", ptr_struct->health_mon_rx_activity);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "repetitive           : " UH_FMT "\n", ptr_struct->repetitive);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "single               : " UH_FMT "\n", ptr_struct->single);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "unlimited array subnode: (diagnostic_counter)\n");
 }
 
 unsigned int reg_access_hca_debug_cap_size(void)
 {
-	return REG_ACCESS_HCA_DEBUG_CAP_SIZE;
-}
-
-void reg_access_hca_debug_cap_dump(const struct reg_access_hca_debug_cap *ptr_struct, FILE *fd)
-{
-	reg_access_hca_debug_cap_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcc_reg_pack(const struct reg_access_hca_mcc_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->instruction);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->activation_delay_sec);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->time_elapsed_since_last_cmd);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->auto_update);
-	offset = 124;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->control_state);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->error_code);
-	offset = 105;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->control_progress);
-	offset = 100;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->handle_owner_host_id);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->handle_owner_type);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->component_size);
-	offset = 184;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type);
-	offset = 164;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
-	offset = 212;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index_size);
-	offset = 196;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->rejected_device_index);
-}
-
-void reg_access_hca_mcc_reg_unpack(struct reg_access_hca_mcc_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->instruction = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->activation_delay_sec = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 4;
-	ptr_struct->time_elapsed_since_last_cmd = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 48;
-	ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 72;
-	ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 64;
-	ptr_struct->auto_update = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 124;
-	ptr_struct->control_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 112;
-	ptr_struct->error_code = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 105;
-	ptr_struct->control_progress = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
-	offset = 100;
-	ptr_struct->handle_owner_host_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->handle_owner_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->component_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 184;
-	ptr_struct->device_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 164;
-	ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 212;
-	ptr_struct->device_index_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 196;
-	ptr_struct->rejected_device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-}
-
-void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcc_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "instruction          : %s (" UH_FMT ")\n", (ptr_struct->instruction == 1 ? ("LOCK_UPDATE_HANDLE") : ((ptr_struct->instruction == 2 ? ("RELEASE_UPDATE_HANDLE") : ((ptr_struct->instruction == 3 ? ("UPDATE_COMPONENT") : ((ptr_struct->instruction == 4 ? ("VERIFY_COMPONENT") : ((ptr_struct->instruction == 5 ? ("ACTIVATE_COMPONENET") : ((ptr_struct->instruction == 6 ? ("ACTIVATE") : ((ptr_struct->instruction == 7 ? ("READ_COMPONENT") : ((ptr_struct->instruction == 8 ? ("CANCEL") : ((ptr_struct->instruction == 9 ? ("CHECK_UPDATE_HANDLE") : ((ptr_struct->instruction == 10 ? ("FORCE_HANDLE_RELEASE") : ((ptr_struct->instruction == 11 ? ("READ_PENDING_COMPONENT") : ((ptr_struct->instruction == 12 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))))))), ptr_struct->instruction);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "activation_delay_sec : " UH_FMT "\n", ptr_struct->activation_delay_sec);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "time_elapsed_since_last_cmd : " UH_FMT "\n", ptr_struct->time_elapsed_since_last_cmd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "auto_update          : " UH_FMT "\n", ptr_struct->auto_update);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "control_state        : %s (" UH_FMT ")\n", (ptr_struct->control_state == 0 ? ("IDLE") : ((ptr_struct->control_state == 1 ? ("LOCKED") : ((ptr_struct->control_state == 2 ? ("INITIALIZE") : ((ptr_struct->control_state == 3 ? ("DOWNLOAD") : ((ptr_struct->control_state == 4 ? ("VERIFY") : ((ptr_struct->control_state == 5 ? ("APPLY") : ((ptr_struct->control_state == 6 ? ("ACTIVATE") : ((ptr_struct->control_state == 7 ? ("UPLOAD") : ((ptr_struct->control_state == 8 ? ("UPLOAD_PENDING") : ((ptr_struct->control_state == 9 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))), ptr_struct->control_state);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "error_code           : " UH_FMT "\n", ptr_struct->error_code);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "control_progress     : " UH_FMT "\n", ptr_struct->control_progress);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "handle_owner_host_id : " UH_FMT "\n", ptr_struct->handle_owner_host_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "handle_owner_type    : " UH_FMT "\n", ptr_struct->handle_owner_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_size       : " U32H_FMT "\n", ptr_struct->component_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_type          : %s (" UH_FMT ")\n", (ptr_struct->device_type == 0 ? ("Switch_or_NIC") : ((ptr_struct->device_type == 1 ? ("Gearbox") : ("unknown")))), ptr_struct->device_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index_size    : " UH_FMT "\n", ptr_struct->device_index_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rejected_device_index : " UH_FMT "\n", ptr_struct->rejected_device_index);
+    return REG_ACCESS_HCA_DEBUG_CAP_SIZE;
+}
+
+void reg_access_hca_debug_cap_dump(const struct reg_access_hca_debug_cap* ptr_struct, FILE* fd)
+{
+    reg_access_hca_debug_cap_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcc_reg_pack(const struct reg_access_hca_mcc_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->instruction);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->activation_delay_sec);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->time_elapsed_since_last_cmd);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->auto_update);
+    offset = 124;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->control_state);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->error_code);
+    offset = 105;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->control_progress);
+    offset = 100;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->handle_owner_host_id);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->handle_owner_type);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->component_size);
+    offset = 184;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type);
+    offset = 164;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
+    offset = 212;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index_size);
+    offset = 196;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->rejected_device_index);
+}
+
+void reg_access_hca_mcc_reg_unpack(struct reg_access_hca_mcc_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->instruction = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->activation_delay_sec = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 4;
+    ptr_struct->time_elapsed_since_last_cmd = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 48;
+    ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 72;
+    ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 64;
+    ptr_struct->auto_update = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 124;
+    ptr_struct->control_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 112;
+    ptr_struct->error_code = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 105;
+    ptr_struct->control_progress = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
+    offset = 100;
+    ptr_struct->handle_owner_host_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->handle_owner_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->component_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 184;
+    ptr_struct->device_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 164;
+    ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 212;
+    ptr_struct->device_index_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 196;
+    ptr_struct->rejected_device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+}
+
+void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcc_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "instruction          : %s (" UH_FMT ")\n",
+      (ptr_struct->instruction == 1 ?
+         ("LOCK_UPDATE_HANDLE") :
+         ((ptr_struct->instruction == 2 ?
+             ("RELEASE_UPDATE_HANDLE") :
+             ((ptr_struct->instruction == 3 ?
+                 ("UPDATE_COMPONENT") :
+                 ((ptr_struct->instruction == 4 ?
+                     ("VERIFY_COMPONENT") :
+                     ((ptr_struct->instruction == 5 ?
+                         ("ACTIVATE_COMPONENET") :
+                         ((ptr_struct->instruction == 6 ?
+                             ("ACTIVATE") :
+                             ((ptr_struct->instruction == 7 ?
+                                 ("READ_COMPONENT") :
+                                 ((ptr_struct->instruction == 8 ?
+                                     ("CANCEL") :
+                                     ((ptr_struct->instruction == 9 ?
+                                         ("CHECK_UPDATE_HANDLE") :
+                                         ((ptr_struct->instruction == 10 ?
+                                             ("FORCE_HANDLE_RELEASE") :
+                                             ((ptr_struct->instruction == 11 ?
+                                                 ("READ_PENDING_COMPONENT") :
+                                                 ((ptr_struct->instruction == 12 ? ("DOWNSRTEAM_DEVICE_TRANSFER") :
+                                                                                   ("unknown")))))))))))))))))))))))),
+      ptr_struct->instruction);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "activation_delay_sec : " UH_FMT "\n", ptr_struct->activation_delay_sec);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "time_elapsed_since_last_cmd : " UH_FMT "\n", ptr_struct->time_elapsed_since_last_cmd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "auto_update          : " UH_FMT "\n", ptr_struct->auto_update);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "control_state        : %s (" UH_FMT ")\n",
+            (ptr_struct->control_state == 0 ?
+               ("IDLE") :
+               ((ptr_struct->control_state == 1 ?
+                   ("LOCKED") :
+                   ((ptr_struct->control_state == 2 ?
+                       ("INITIALIZE") :
+                       ((ptr_struct->control_state == 3 ?
+                           ("DOWNLOAD") :
+                           ((ptr_struct->control_state == 4 ?
+                               ("VERIFY") :
+                               ((ptr_struct->control_state == 5 ?
+                                   ("APPLY") :
+                                   ((ptr_struct->control_state == 6 ?
+                                       ("ACTIVATE") :
+                                       ((ptr_struct->control_state == 7 ?
+                                           ("UPLOAD") :
+                                           ((ptr_struct->control_state == 8 ?
+                                               ("UPLOAD_PENDING") :
+                                               ((ptr_struct->control_state == 9 ? ("DOWNSRTEAM_DEVICE_TRANSFER") :
+                                                                                  ("unknown")))))))))))))))))))),
+            ptr_struct->control_state);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "error_code           : " UH_FMT "\n", ptr_struct->error_code);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "control_progress     : " UH_FMT "\n", ptr_struct->control_progress);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "handle_owner_host_id : " UH_FMT "\n", ptr_struct->handle_owner_host_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "handle_owner_type    : " UH_FMT "\n", ptr_struct->handle_owner_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_size       : " U32H_FMT "\n", ptr_struct->component_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "device_type          : %s (" UH_FMT ")\n",
+      (ptr_struct->device_type == 0 ? ("Switch_or_NIC") : ((ptr_struct->device_type == 1 ? ("Gearbox") : ("unknown")))),
+      ptr_struct->device_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index_size    : " UH_FMT "\n", ptr_struct->device_index_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rejected_device_index : " UH_FMT "\n", ptr_struct->rejected_device_index);
 }
 
 unsigned int reg_access_hca_mcc_reg_size(void)
 {
-	return REG_ACCESS_HCA_MCC_REG_SIZE;
+    return REG_ACCESS_HCA_MCC_REG_SIZE;
 }
 
-void reg_access_hca_mcc_reg_dump(const struct reg_access_hca_mcc_reg *ptr_struct, FILE *fd)
+void reg_access_hca_mcc_reg_dump(const struct reg_access_hca_mcc_reg* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mcc_reg_print(ptr_struct, fd, 0);
+    reg_access_hca_mcc_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mcda_reg_pack(const struct reg_access_hca_mcda_reg *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mcda_reg_pack(const struct reg_access_hca_mcda_reg* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->size);
-	for (i = 0; i < 32; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 1152, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
-	}
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->size);
+    for (i = 0; i < 32; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 1152, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void reg_access_hca_mcda_reg_unpack(struct reg_access_hca_mcda_reg *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mcda_reg_unpack(struct reg_access_hca_mcda_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 8;
-	ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 32;
-	ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 32; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 1152, 1);
-		ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    offset = 8;
+    ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 32;
+    ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 32; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 1152, 1);
+        ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void reg_access_hca_mcda_reg_print(const struct reg_access_hca_mcda_reg *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mcda_reg_print(const struct reg_access_hca_mcda_reg* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcda_reg ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcda_reg ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
-	for (i = 0; i < 32; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
+    for (i = 0; i < 32; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
 unsigned int reg_access_hca_mcda_reg_size(void)
 {
-	return REG_ACCESS_HCA_MCDA_REG_SIZE;
-}
-
-void reg_access_hca_mcda_reg_dump(const struct reg_access_hca_mcda_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mcda_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcqi_reg_pack(const struct reg_access_hca_mcqi_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->read_pending_component);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type);
-	offset = 91;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->info_type);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->info_size);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
-	offset = 176;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->data_size);
-	offset = 192;
-	switch (ptr_struct->info_type) {
-	case 0x0:
-		offset = 192;
-		reg_access_hca_mcqi_cap_pack(&(ptr_struct->data.mcqi_cap), ptr_buff + offset / 8);
-		break;
-	case 0x1:
-		offset = 192;
-		reg_access_hca_mcqi_version_pack(&(ptr_struct->data.mcqi_version), ptr_buff + offset / 8);
-		break;
-	case 0x5:
-		offset = 192;
-		reg_access_hca_mcqi_activation_method_pack(&(ptr_struct->data.mcqi_activation_method), ptr_buff + offset / 8);
-		break;
-	case 0x6:
-		offset = 192;
-		reg_access_hca_mcqi_linkx_properties_pack(&(ptr_struct->data.mcqi_linkx_properties), ptr_buff + offset / 8);
-		break;
-	default:
-		break;
-	}
-}
-
-void reg_access_hca_mcqi_reg_unpack(struct reg_access_hca_mcqi_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 4;
-	ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 0;
-	ptr_struct->read_pending_component = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->device_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 91;
-	ptr_struct->info_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 96;
-	ptr_struct->info_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 176;
-	ptr_struct->data_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 192;
-	switch (ptr_struct->info_type) {
-	case 0x0:
-		offset = 192;
-		reg_access_hca_mcqi_cap_unpack(&(ptr_struct->data.mcqi_cap), ptr_buff + offset / 8);
-		break;
-	case 0x1:
-		offset = 192;
-		reg_access_hca_mcqi_version_unpack(&(ptr_struct->data.mcqi_version), ptr_buff + offset / 8);
-		break;
-	case 0x5:
-		offset = 192;
-		reg_access_hca_mcqi_activation_method_unpack(&(ptr_struct->data.mcqi_activation_method), ptr_buff + offset / 8);
-		break;
-	case 0x6:
-		offset = 192;
-		reg_access_hca_mcqi_linkx_properties_unpack(&(ptr_struct->data.mcqi_linkx_properties), ptr_buff + offset / 8);
-		break;
-	default:
-		break;
-	}
-}
-
-void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqi_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_pending_component : " UH_FMT "\n", ptr_struct->read_pending_component);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "info_type            : %s (" UH_FMT ")\n", (ptr_struct->info_type == 0 ? ("CAPABILITIES") : ((ptr_struct->info_type == 1 ? ("VERSION") : ((ptr_struct->info_type == 5 ? ("ACTIVATION_METHOD") : ((ptr_struct->info_type == 6 ? ("LINKX_PROPERTIES") : ("unknown")))))))), ptr_struct->info_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "info_size            : " U32H_FMT "\n", ptr_struct->info_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data_size            : " UH_FMT "\n", ptr_struct->data_size);
-	switch (ptr_struct->info_type) {
-	case 0x0:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mcqi_cap:\n");
-		reg_access_hca_mcqi_cap_print(&(ptr_struct->data.mcqi_cap), fd, indent_level + 1);
-		break;
-	case 0x1:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mcqi_version:\n");
-		reg_access_hca_mcqi_version_print(&(ptr_struct->data.mcqi_version), fd, indent_level + 1);
-		break;
-	case 0x5:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mcqi_activation_method:\n");
-		reg_access_hca_mcqi_activation_method_print(&(ptr_struct->data.mcqi_activation_method), fd, indent_level + 1);
-		break;
-	case 0x6:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mcqi_linkx_properties:\n");
-		reg_access_hca_mcqi_linkx_properties_print(&(ptr_struct->data.mcqi_linkx_properties), fd, indent_level + 1);
-		break;
-	default:
-		break;
-	}
+    return REG_ACCESS_HCA_MCDA_REG_SIZE;
+}
+
+void reg_access_hca_mcda_reg_dump(const struct reg_access_hca_mcda_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mcda_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcqi_reg_pack(const struct reg_access_hca_mcqi_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->read_pending_component);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type);
+    offset = 91;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->info_type);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->info_size);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
+    offset = 176;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->data_size);
+    offset = 192;
+    switch (ptr_struct->info_type)
+    {
+        case 0x0:
+            offset = 192;
+            reg_access_hca_mcqi_cap_pack(&(ptr_struct->data.mcqi_cap), ptr_buff + offset / 8);
+            break;
+        case 0x1:
+            offset = 192;
+            reg_access_hca_mcqi_version_pack(&(ptr_struct->data.mcqi_version), ptr_buff + offset / 8);
+            break;
+        case 0x5:
+            offset = 192;
+            reg_access_hca_mcqi_activation_method_pack(&(ptr_struct->data.mcqi_activation_method),
+                                                       ptr_buff + offset / 8);
+            break;
+        case 0x6:
+            offset = 192;
+            reg_access_hca_mcqi_linkx_properties_pack(&(ptr_struct->data.mcqi_linkx_properties), ptr_buff + offset / 8);
+            break;
+        default:
+            break;
+    }
+}
+
+void reg_access_hca_mcqi_reg_unpack(struct reg_access_hca_mcqi_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 4;
+    ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 0;
+    ptr_struct->read_pending_component = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->device_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 91;
+    ptr_struct->info_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 96;
+    ptr_struct->info_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 176;
+    ptr_struct->data_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 192;
+    switch (ptr_struct->info_type)
+    {
+        case 0x0:
+            offset = 192;
+            reg_access_hca_mcqi_cap_unpack(&(ptr_struct->data.mcqi_cap), ptr_buff + offset / 8);
+            break;
+        case 0x1:
+            offset = 192;
+            reg_access_hca_mcqi_version_unpack(&(ptr_struct->data.mcqi_version), ptr_buff + offset / 8);
+            break;
+        case 0x5:
+            offset = 192;
+            reg_access_hca_mcqi_activation_method_unpack(&(ptr_struct->data.mcqi_activation_method),
+                                                         ptr_buff + offset / 8);
+            break;
+        case 0x6:
+            offset = 192;
+            reg_access_hca_mcqi_linkx_properties_unpack(&(ptr_struct->data.mcqi_linkx_properties),
+                                                        ptr_buff + offset / 8);
+            break;
+        default:
+            break;
+    }
+}
+
+void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqi_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_pending_component : " UH_FMT "\n", ptr_struct->read_pending_component);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "info_type            : %s (" UH_FMT ")\n",
+      (ptr_struct->info_type == 0 ?
+         ("CAPABILITIES") :
+         ((ptr_struct->info_type == 1 ?
+             ("VERSION") :
+             ((ptr_struct->info_type == 5 ? ("ACTIVATION_METHOD") :
+                                            ((ptr_struct->info_type == 6 ? ("LINKX_PROPERTIES") : ("unknown")))))))),
+      ptr_struct->info_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "info_size            : " U32H_FMT "\n", ptr_struct->info_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data_size            : " UH_FMT "\n", ptr_struct->data_size);
+    switch (ptr_struct->info_type)
+    {
+        case 0x0:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "mcqi_cap:\n");
+            reg_access_hca_mcqi_cap_print(&(ptr_struct->data.mcqi_cap), fd, indent_level + 1);
+            break;
+        case 0x1:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "mcqi_version:\n");
+            reg_access_hca_mcqi_version_print(&(ptr_struct->data.mcqi_version), fd, indent_level + 1);
+            break;
+        case 0x5:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "mcqi_activation_method:\n");
+            reg_access_hca_mcqi_activation_method_print(&(ptr_struct->data.mcqi_activation_method), fd,
+                                                        indent_level + 1);
+            break;
+        case 0x6:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "mcqi_linkx_properties:\n");
+            reg_access_hca_mcqi_linkx_properties_print(&(ptr_struct->data.mcqi_linkx_properties), fd, indent_level + 1);
+            break;
+        default:
+            break;
+    }
 }
 
 unsigned int reg_access_hca_mcqi_reg_size(void)
 {
-	return REG_ACCESS_HCA_MCQI_REG_SIZE;
-}
-
-void reg_access_hca_mcqi_reg_dump(const struct reg_access_hca_mcqi_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mcqi_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mcqs_reg_pack(const struct reg_access_hca_mcqs_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->last_index_flag);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->identifier);
-	offset = 92;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->component_update_state);
-	offset = 87;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->component_status);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->progress);
-	offset = 120;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type);
-	offset = 100;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->last_update_state_changer_host_id);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->last_update_state_changer_type);
-}
-
-void reg_access_hca_mcqs_reg_unpack(struct reg_access_hca_mcqs_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 4;
-	ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 0;
-	ptr_struct->last_index_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->identifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 92;
-	ptr_struct->component_update_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 87;
-	ptr_struct->component_status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 80;
-	ptr_struct->progress = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
-	offset = 120;
-	ptr_struct->device_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 100;
-	ptr_struct->last_update_state_changer_host_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->last_update_state_changer_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-}
-
-void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mcqs_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "last_index_flag      : " UH_FMT "\n", ptr_struct->last_index_flag);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "identifier           : %s (" UH_FMT ")\n", (ptr_struct->identifier == 1 ? ("BOOT_IMG") : ((ptr_struct->identifier == 4 ? ("OEM_NVCONFIG") : ((ptr_struct->identifier == 5 ? ("MLNX_NVCONFIG") : ((ptr_struct->identifier == 6 ? ("CS_TOKEN") : ((ptr_struct->identifier == 7 ? ("DBG_TOKEN") : ((ptr_struct->identifier == 10 ? ("Gearbox") : ((ptr_struct->identifier == 11 ? ("CC_ALGO") : ((ptr_struct->identifier == 12 ? ("LINKX_IMG") : ((ptr_struct->identifier == 13 ? ("CRYPTO_TO_COMMISSIONING") : ((ptr_struct->identifier == 14 ? ("RMCS_TOKEN") : ((ptr_struct->identifier == 15 ? ("RMDT_TOKEN") : ("unknown")))))))))))))))))))))), ptr_struct->identifier);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_update_state : %s (" UH_FMT ")\n", (ptr_struct->component_update_state == 0 ? ("IDLE") : ((ptr_struct->component_update_state == 1 ? ("IN_PROGRESS") : ((ptr_struct->component_update_state == 2 ? ("APPLIED") : ((ptr_struct->component_update_state == 3 ? ("ACTIVE") : ((ptr_struct->component_update_state == 4 ? ("ACTIVE_PENDING_RESET") : ((ptr_struct->component_update_state == 5 ? ("FAILED") : ((ptr_struct->component_update_state == 6 ? ("CANCELED") : ((ptr_struct->component_update_state == 7 ? ("BUSY") : ("unknown")))))))))))))))), ptr_struct->component_update_state);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_status     : %s (" UH_FMT ")\n", (ptr_struct->component_status == 0 ? ("NOT_PRESENT") : ((ptr_struct->component_status == 1 ? ("PRESENT") : ((ptr_struct->component_status == 2 ? ("IN_USE") : ("unknown")))))), ptr_struct->component_status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "progress             : " UH_FMT "\n", ptr_struct->progress);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "last_update_state_changer_host_id : " UH_FMT "\n", ptr_struct->last_update_state_changer_host_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "last_update_state_changer_type : %s (" UH_FMT ")\n", (ptr_struct->last_update_state_changer_type == 0 ? ("unspecified") : ((ptr_struct->last_update_state_changer_type == 1 ? ("Chassis_BMC") : ((ptr_struct->last_update_state_changer_type == 2 ? ("MAD") : ((ptr_struct->last_update_state_changer_type == 3 ? ("BMC") : ((ptr_struct->last_update_state_changer_type == 4 ? ("command_interface") : ((ptr_struct->last_update_state_changer_type == 5 ? ("ICMD") : ("unknown")))))))))))), ptr_struct->last_update_state_changer_type);
+    return REG_ACCESS_HCA_MCQI_REG_SIZE;
+}
+
+void reg_access_hca_mcqi_reg_dump(const struct reg_access_hca_mcqi_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mcqi_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mcqs_reg_pack(const struct reg_access_hca_mcqs_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->last_index_flag);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->identifier);
+    offset = 92;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->component_update_state);
+    offset = 87;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->component_status);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->progress);
+    offset = 120;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type);
+    offset = 100;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->last_update_state_changer_host_id);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->last_update_state_changer_type);
+}
+
+void reg_access_hca_mcqs_reg_unpack(struct reg_access_hca_mcqs_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 4;
+    ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 0;
+    ptr_struct->last_index_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->identifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 92;
+    ptr_struct->component_update_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 87;
+    ptr_struct->component_status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 80;
+    ptr_struct->progress = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
+    offset = 120;
+    ptr_struct->device_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 100;
+    ptr_struct->last_update_state_changer_host_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->last_update_state_changer_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+}
+
+void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mcqs_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "last_index_flag      : " UH_FMT "\n", ptr_struct->last_index_flag);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "identifier           : %s (" UH_FMT ")\n",
+            (ptr_struct->identifier == 1 ?
+               ("BOOT_IMG") :
+               ((ptr_struct->identifier == 4 ?
+                   ("OEM_NVCONFIG") :
+                   ((ptr_struct->identifier == 5 ?
+                       ("MLNX_NVCONFIG") :
+                       ((ptr_struct->identifier == 6 ?
+                           ("CS_TOKEN") :
+                           ((ptr_struct->identifier == 7 ?
+                               ("DBG_TOKEN") :
+                               ((ptr_struct->identifier == 10 ?
+                                   ("Gearbox") :
+                                   ((ptr_struct->identifier == 11 ?
+                                       ("CC_ALGO") :
+                                       ((ptr_struct->identifier == 12 ?
+                                           ("LINKX_IMG") :
+                                           ((ptr_struct->identifier == 13 ?
+                                               ("CRYPTO_TO_COMMISSIONING") :
+                                               ((ptr_struct->identifier == 14 ?
+                                                   ("RMCS_TOKEN") :
+                                                   ((ptr_struct->identifier == 15 ? ("RMDT_TOKEN") :
+                                                                                    ("unknown")))))))))))))))))))))),
+            ptr_struct->identifier);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "component_update_state : %s (" UH_FMT ")\n",
+      (ptr_struct->component_update_state == 0 ?
+         ("IDLE") :
+         ((ptr_struct->component_update_state == 1 ?
+             ("IN_PROGRESS") :
+             ((ptr_struct->component_update_state == 2 ?
+                 ("APPLIED") :
+                 ((ptr_struct->component_update_state == 3 ?
+                     ("ACTIVE") :
+                     ((ptr_struct->component_update_state == 4 ?
+                         ("ACTIVE_PENDING_RESET") :
+                         ((ptr_struct->component_update_state == 5 ?
+                             ("FAILED") :
+                             ((ptr_struct->component_update_state == 6 ?
+                                 ("CANCELED") :
+                                 ((ptr_struct->component_update_state == 7 ? ("BUSY") : ("unknown")))))))))))))))),
+      ptr_struct->component_update_state);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "component_status     : %s (" UH_FMT ")\n",
+      (ptr_struct->component_status == 0 ?
+         ("NOT_PRESENT") :
+         ((ptr_struct->component_status == 1 ? ("PRESENT") :
+                                               ((ptr_struct->component_status == 2 ? ("IN_USE") : ("unknown")))))),
+      ptr_struct->component_status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "progress             : " UH_FMT "\n", ptr_struct->progress);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "last_update_state_changer_host_id : " UH_FMT "\n", ptr_struct->last_update_state_changer_host_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "last_update_state_changer_type : %s (" UH_FMT ")\n",
+            (ptr_struct->last_update_state_changer_type == 0 ?
+               ("unspecified") :
+               ((ptr_struct->last_update_state_changer_type == 1 ?
+                   ("Chassis_BMC") :
+                   ((ptr_struct->last_update_state_changer_type == 2 ?
+                       ("MAD") :
+                       ((ptr_struct->last_update_state_changer_type == 3 ?
+                           ("BMC") :
+                           ((ptr_struct->last_update_state_changer_type == 4 ?
+                               ("command_interface") :
+                               ((ptr_struct->last_update_state_changer_type == 5 ? ("ICMD") : ("unknown")))))))))))),
+            ptr_struct->last_update_state_changer_type);
 }
 
 unsigned int reg_access_hca_mcqs_reg_size(void)
 {
-	return REG_ACCESS_HCA_MCQS_REG_SIZE;
+    return REG_ACCESS_HCA_MCQS_REG_SIZE;
 }
 
-void reg_access_hca_mcqs_reg_dump(const struct reg_access_hca_mcqs_reg *ptr_struct, FILE *fd)
+void reg_access_hca_mcqs_reg_dump(const struct reg_access_hca_mcqs_reg* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mcqs_reg_print(ptr_struct, fd, 0);
+    reg_access_hca_mcqs_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mfrl_reg_ext_pack(const struct reg_access_hca_mfrl_reg_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mfrl_reg_ext_pack(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->reset_trigger);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->reset_type);
-	offset = 37;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->rst_type_sel);
-	offset = 35;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pci_sync_for_fw_update_resp);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pci_sync_for_fw_update_start);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->reset_trigger);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->reset_type);
+    offset = 37;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->rst_type_sel);
+    offset = 35;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pci_sync_for_fw_update_resp);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pci_sync_for_fw_update_start);
 }
 
-void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 56;
-	ptr_struct->reset_trigger = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->reset_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 37;
-	ptr_struct->rst_type_sel = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 35;
-	ptr_struct->pci_sync_for_fw_update_resp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 34;
-	ptr_struct->pci_sync_for_fw_update_start = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->reset_trigger = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->reset_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 37;
+    ptr_struct->rst_type_sel = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 35;
+    ptr_struct->pci_sync_for_fw_update_resp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 34;
+    ptr_struct->pci_sync_for_fw_update_start = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mfrl_reg_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mfrl_reg_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reset_trigger        : " UH_FMT "\n", ptr_struct->reset_trigger);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reset_type           : " UH_FMT "\n", ptr_struct->reset_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rst_type_sel         : " UH_FMT "\n", ptr_struct->rst_type_sel);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_sync_for_fw_update_resp : %s (" UH_FMT ")\n", (ptr_struct->pci_sync_for_fw_update_resp == 1 ? ("Acknowledgment") : ((ptr_struct->pci_sync_for_fw_update_resp == 2 ? ("Dis") : ((ptr_struct->pci_sync_for_fw_update_resp == 3 ? ("Reserved") : ("unknown")))))), ptr_struct->pci_sync_for_fw_update_resp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_sync_for_fw_update_start : " UH_FMT "\n", ptr_struct->pci_sync_for_fw_update_start);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reset_trigger        : " UH_FMT "\n", ptr_struct->reset_trigger);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reset_type           : " UH_FMT "\n", ptr_struct->reset_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rst_type_sel         : " UH_FMT "\n", ptr_struct->rst_type_sel);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_sync_for_fw_update_resp : %s (" UH_FMT ")\n",
+            (ptr_struct->pci_sync_for_fw_update_resp == 1 ?
+               ("Acknowledgment") :
+               ((ptr_struct->pci_sync_for_fw_update_resp == 2 ?
+                   ("Dis") :
+                   ((ptr_struct->pci_sync_for_fw_update_resp == 3 ? ("Reserved") : ("unknown")))))),
+            ptr_struct->pci_sync_for_fw_update_resp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_sync_for_fw_update_start : " UH_FMT "\n", ptr_struct->pci_sync_for_fw_update_start);
 }
 
 unsigned int reg_access_hca_mfrl_reg_ext_size(void)
 {
-	return REG_ACCESS_HCA_MFRL_REG_EXT_SIZE;
+    return REG_ACCESS_HCA_MFRL_REG_EXT_SIZE;
 }
 
-void reg_access_hca_mfrl_reg_ext_dump(const struct reg_access_hca_mfrl_reg_ext *ptr_struct, FILE *fd)
+void reg_access_hca_mfrl_reg_ext_dump(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mfrl_reg_ext_print(ptr_struct, fd, 0);
+    reg_access_hca_mfrl_reg_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mfsv_reg_pack(const struct reg_access_hca_mfsv_reg *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mfsv_reg_pack(const struct reg_access_hca_mfsv_reg* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->efuses_prog_en);
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fw_sec_ver_stat);
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->efuses_prog_method);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->img_sec_ver);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->efuses_sec_ver);
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->efuses_prog_en);
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fw_sec_ver_stat);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->efuses_prog_method);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->img_sec_ver);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->efuses_sec_ver);
 }
 
-void reg_access_hca_mfsv_reg_unpack(struct reg_access_hca_mfsv_reg *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mfsv_reg_unpack(struct reg_access_hca_mfsv_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	ptr_struct->efuses_prog_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 29;
-	ptr_struct->fw_sec_ver_stat = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 28;
-	ptr_struct->efuses_prog_method = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->img_sec_ver = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->efuses_sec_ver = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 31;
+    ptr_struct->efuses_prog_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 29;
+    ptr_struct->fw_sec_ver_stat = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 28;
+    ptr_struct->efuses_prog_method = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->img_sec_ver = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->efuses_sec_ver = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_mfsv_reg_print(const struct reg_access_hca_mfsv_reg *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mfsv_reg_print(const struct reg_access_hca_mfsv_reg* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mfsv_reg ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mfsv_reg ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "efuses_prog_en       : " UH_FMT "\n", ptr_struct->efuses_prog_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_sec_ver_stat      : " UH_FMT "\n", ptr_struct->fw_sec_ver_stat);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "efuses_prog_method   : " UH_FMT "\n", ptr_struct->efuses_prog_method);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "img_sec_ver          : " U32H_FMT "\n", ptr_struct->img_sec_ver);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "efuses_sec_ver       : " U32H_FMT "\n", ptr_struct->efuses_sec_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "efuses_prog_en       : " UH_FMT "\n", ptr_struct->efuses_prog_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_sec_ver_stat      : " UH_FMT "\n", ptr_struct->fw_sec_ver_stat);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "efuses_prog_method   : " UH_FMT "\n", ptr_struct->efuses_prog_method);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "img_sec_ver          : " U32H_FMT "\n", ptr_struct->img_sec_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "efuses_sec_ver       : " U32H_FMT "\n", ptr_struct->efuses_sec_ver);
 }
 
 unsigned int reg_access_hca_mfsv_reg_size(void)
 {
-	return REG_ACCESS_HCA_MFSV_REG_SIZE;
+    return REG_ACCESS_HCA_MFSV_REG_SIZE;
 }
 
-void reg_access_hca_mfsv_reg_dump(const struct reg_access_hca_mfsv_reg *ptr_struct, FILE *fd)
+void reg_access_hca_mfsv_reg_dump(const struct reg_access_hca_mfsv_reg* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mfsv_reg_print(ptr_struct, fd, 0);
+    reg_access_hca_mfsv_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mgir_pack(const struct reg_access_hca_mgir *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mgir_pack(const struct reg_access_hca_mgir* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	reg_access_hca_mgir_hardware_info_pack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
-	offset = 256;
-	reg_access_hca_mgir_fw_info_pack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
-	offset = 768;
-	reg_access_hca_mgir_sw_info_pack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
-	offset = 1024;
-	reg_access_hca_mgir_dev_info_pack(&(ptr_struct->dev_info), ptr_buff + offset / 8);
+    offset = 0;
+    reg_access_hca_mgir_hardware_info_pack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
+    offset = 256;
+    reg_access_hca_mgir_fw_info_pack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
+    offset = 768;
+    reg_access_hca_mgir_sw_info_pack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
+    offset = 1024;
+    reg_access_hca_mgir_dev_info_pack(&(ptr_struct->dev_info), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_mgir_unpack(struct reg_access_hca_mgir *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mgir_unpack(struct reg_access_hca_mgir* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	reg_access_hca_mgir_hardware_info_unpack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
-	offset = 256;
-	reg_access_hca_mgir_fw_info_unpack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
-	offset = 768;
-	reg_access_hca_mgir_sw_info_unpack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
-	offset = 1024;
-	reg_access_hca_mgir_dev_info_unpack(&(ptr_struct->dev_info), ptr_buff + offset / 8);
+    offset = 0;
+    reg_access_hca_mgir_hardware_info_unpack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
+    offset = 256;
+    reg_access_hca_mgir_fw_info_unpack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
+    offset = 768;
+    reg_access_hca_mgir_sw_info_unpack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
+    offset = 1024;
+    reg_access_hca_mgir_dev_info_unpack(&(ptr_struct->dev_info), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_mgir_print(const struct reg_access_hca_mgir *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mgir_print(const struct reg_access_hca_mgir* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mgir ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mgir ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_info:\n");
-	reg_access_hca_mgir_hardware_info_print(&(ptr_struct->hw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_info:\n");
-	reg_access_hca_mgir_fw_info_print(&(ptr_struct->fw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sw_info:\n");
-	reg_access_hca_mgir_sw_info_print(&(ptr_struct->sw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dev_info:\n");
-	reg_access_hca_mgir_dev_info_print(&(ptr_struct->dev_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_info:\n");
+    reg_access_hca_mgir_hardware_info_print(&(ptr_struct->hw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_info:\n");
+    reg_access_hca_mgir_fw_info_print(&(ptr_struct->fw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sw_info:\n");
+    reg_access_hca_mgir_sw_info_print(&(ptr_struct->sw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dev_info:\n");
+    reg_access_hca_mgir_dev_info_print(&(ptr_struct->dev_info), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_mgir_size(void)
 {
-	return REG_ACCESS_HCA_MGIR_SIZE;
+    return REG_ACCESS_HCA_MGIR_SIZE;
 }
 
-void reg_access_hca_mgir_dump(const struct reg_access_hca_mgir *ptr_struct, FILE *fd)
+void reg_access_hca_mgir_dump(const struct reg_access_hca_mgir* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mgir_print(ptr_struct, fd, 0);
+    reg_access_hca_mgir_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mmdio_pack(const struct reg_access_hca_mmdio *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mmdio_pack(const struct reg_access_hca_mmdio* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->operation);
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->clause);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mdio_index);
-	offset = 59;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->reg_adr);
-	offset = 51;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->phy_adr);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->data);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->address);
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->operation);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->clause);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mdio_index);
+    offset = 59;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->reg_adr);
+    offset = 51;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->phy_adr);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->data);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->address);
 }
 
-void reg_access_hca_mmdio_unpack(struct reg_access_hca_mmdio *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mmdio_unpack(struct reg_access_hca_mmdio* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 29;
-	ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 22;
-	ptr_struct->clause = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 12;
-	ptr_struct->mdio_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 59;
-	ptr_struct->reg_adr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 51;
-	ptr_struct->phy_adr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 80;
-	ptr_struct->data = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->address = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 29;
+    ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 22;
+    ptr_struct->clause = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 12;
+    ptr_struct->mdio_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 59;
+    ptr_struct->reg_adr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 51;
+    ptr_struct->phy_adr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 80;
+    ptr_struct->data = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->address = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void reg_access_hca_mmdio_print(const struct reg_access_hca_mmdio *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mmdio_print(const struct reg_access_hca_mmdio* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mmdio ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mmdio ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clause               : " UH_FMT "\n", ptr_struct->clause);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mdio_index           : " UH_FMT "\n", ptr_struct->mdio_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reg_adr              : " UH_FMT "\n", ptr_struct->reg_adr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy_adr              : " UH_FMT "\n", ptr_struct->phy_adr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data                 : " UH_FMT "\n", ptr_struct->data);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "address              : " UH_FMT "\n", ptr_struct->address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clause               : " UH_FMT "\n", ptr_struct->clause);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mdio_index           : " UH_FMT "\n", ptr_struct->mdio_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reg_adr              : " UH_FMT "\n", ptr_struct->reg_adr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy_adr              : " UH_FMT "\n", ptr_struct->phy_adr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data                 : " UH_FMT "\n", ptr_struct->data);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "address              : " UH_FMT "\n", ptr_struct->address);
 }
 
 unsigned int reg_access_hca_mmdio_size(void)
 {
-	return REG_ACCESS_HCA_MMDIO_SIZE;
+    return REG_ACCESS_HCA_MMDIO_SIZE;
 }
 
-void reg_access_hca_mmdio_dump(const struct reg_access_hca_mmdio *ptr_struct, FILE *fd)
+void reg_access_hca_mmdio_dump(const struct reg_access_hca_mmdio* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mmdio_print(ptr_struct, fd, 0);
+    reg_access_hca_mmdio_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mpcir_ext_pack(const struct reg_access_hca_mpcir_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mpcir_ext_pack(const struct reg_access_hca_mpcir_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->all);
-	offset = 62;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->ports);
-	offset = 126;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->ports_stat);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->all);
+    offset = 62;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->ports);
+    offset = 126;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->ports_stat);
 }
 
-void reg_access_hca_mpcir_ext_unpack(struct reg_access_hca_mpcir_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mpcir_ext_unpack(struct reg_access_hca_mpcir_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->all = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 62;
-	ptr_struct->ports = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 126;
-	ptr_struct->ports_stat = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 0;
+    ptr_struct->all = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 62;
+    ptr_struct->ports = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 126;
+    ptr_struct->ports_stat = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void reg_access_hca_mpcir_ext_print(const struct reg_access_hca_mpcir_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mpcir_ext_print(const struct reg_access_hca_mpcir_ext* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mpcir_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mpcir_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "all                  : " UH_FMT "\n", ptr_struct->all);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ports                : " UH_FMT "\n", ptr_struct->ports);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ports_stat           : " UH_FMT "\n", ptr_struct->ports_stat);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "all                  : " UH_FMT "\n", ptr_struct->all);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ports                : " UH_FMT "\n", ptr_struct->ports);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ports_stat           : " UH_FMT "\n", ptr_struct->ports_stat);
 }
 
 unsigned int reg_access_hca_mpcir_ext_size(void)
 {
-	return REG_ACCESS_HCA_MPCIR_EXT_SIZE;
-}
-
-void reg_access_hca_mpcir_ext_dump(const struct reg_access_hca_mpcir_ext *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mpcir_ext_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mpegc_reg_pack(const struct reg_access_hca_mpegc_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->node);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->pcie_index);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->depth);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->field_select);
-	offset = 94;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->tx_lossy_overflow_oper);
-	offset = 66;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mark_cnp);
-	offset = 65;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mark_cqe);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->tx_overflow_sense);
-	offset = 121;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->outbound_stalled_writes_th);
-	offset = 113;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->outbound_stalled_reads_th);
-	offset = 140;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->operation);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
-}
-
-void reg_access_hca_mpegc_reg_unpack(struct reg_access_hca_mpegc_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->node = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->pcie_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 2;
-	ptr_struct->depth = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 48;
-	ptr_struct->field_select = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 94;
-	ptr_struct->tx_lossy_overflow_oper = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 66;
-	ptr_struct->mark_cnp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 65;
-	ptr_struct->mark_cqe = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->tx_overflow_sense = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 121;
-	ptr_struct->outbound_stalled_writes_th = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
-	offset = 113;
-	ptr_struct->outbound_stalled_reads_th = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
-	offset = 140;
-	ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-}
-
-void reg_access_hca_mpegc_reg_print(const struct reg_access_hca_mpegc_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mpegc_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "node                 : " UH_FMT "\n", ptr_struct->node);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pcie_index           : " UH_FMT "\n", ptr_struct->pcie_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "depth                : " UH_FMT "\n", ptr_struct->depth);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "field_select         : " UH_FMT "\n", ptr_struct->field_select);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tx_lossy_overflow_oper : " UH_FMT "\n", ptr_struct->tx_lossy_overflow_oper);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mark_cnp             : " UH_FMT "\n", ptr_struct->mark_cnp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mark_cqe             : " UH_FMT "\n", ptr_struct->mark_cqe);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tx_overflow_sense    : " UH_FMT "\n", ptr_struct->tx_overflow_sense);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "outbound_stalled_writes_th : " UH_FMT "\n", ptr_struct->outbound_stalled_writes_th);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "outbound_stalled_reads_th : " UH_FMT "\n", ptr_struct->outbound_stalled_reads_th);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
+    return REG_ACCESS_HCA_MPCIR_EXT_SIZE;
+}
+
+void reg_access_hca_mpcir_ext_dump(const struct reg_access_hca_mpcir_ext* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mpcir_ext_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mpegc_reg_pack(const struct reg_access_hca_mpegc_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->node);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->pcie_index);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->depth);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->field_select);
+    offset = 94;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->tx_lossy_overflow_oper);
+    offset = 66;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mark_cnp);
+    offset = 65;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mark_cqe);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->tx_overflow_sense);
+    offset = 121;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->outbound_stalled_writes_th);
+    offset = 113;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->outbound_stalled_reads_th);
+    offset = 140;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->operation);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
+}
+
+void reg_access_hca_mpegc_reg_unpack(struct reg_access_hca_mpegc_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->node = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->pcie_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 2;
+    ptr_struct->depth = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 48;
+    ptr_struct->field_select = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 94;
+    ptr_struct->tx_lossy_overflow_oper = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 66;
+    ptr_struct->mark_cnp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 65;
+    ptr_struct->mark_cqe = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->tx_overflow_sense = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 121;
+    ptr_struct->outbound_stalled_writes_th = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
+    offset = 113;
+    ptr_struct->outbound_stalled_reads_th = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
+    offset = 140;
+    ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+}
+
+void reg_access_hca_mpegc_reg_print(const struct reg_access_hca_mpegc_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mpegc_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "node                 : " UH_FMT "\n", ptr_struct->node);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pcie_index           : " UH_FMT "\n", ptr_struct->pcie_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "depth                : " UH_FMT "\n", ptr_struct->depth);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "field_select         : " UH_FMT "\n", ptr_struct->field_select);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tx_lossy_overflow_oper : " UH_FMT "\n", ptr_struct->tx_lossy_overflow_oper);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mark_cnp             : " UH_FMT "\n", ptr_struct->mark_cnp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mark_cqe             : " UH_FMT "\n", ptr_struct->mark_cqe);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tx_overflow_sense    : " UH_FMT "\n", ptr_struct->tx_overflow_sense);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "outbound_stalled_writes_th : " UH_FMT "\n", ptr_struct->outbound_stalled_writes_th);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "outbound_stalled_reads_th : " UH_FMT "\n", ptr_struct->outbound_stalled_reads_th);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
 }
 
 unsigned int reg_access_hca_mpegc_reg_size(void)
 {
-	return REG_ACCESS_HCA_MPEGC_REG_SIZE;
-}
-
-void reg_access_hca_mpegc_reg_dump(const struct reg_access_hca_mpegc_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mpegc_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mqis_reg_pack(const struct reg_access_hca_mqis_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->info_type);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->info_length);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->read_length);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->read_offset);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->info_string[i]);
-	}
-}
-
-void reg_access_hca_mqis_reg_unpack(struct reg_access_hca_mqis_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->info_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->info_length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 80;
-	ptr_struct->read_length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->read_offset = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 192, 1);
-		ptr_struct->info_string[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-}
-
-void reg_access_hca_mqis_reg_print(const struct reg_access_hca_mqis_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mqis_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "info_type            : %s (" UH_FMT ")\n", (ptr_struct->info_type == 1 ? ("MODEL_NAME") : ((ptr_struct->info_type == 2 ? ("MODEL_DESCRIPTION") : ((ptr_struct->info_type == 3 ? ("IMAGE_VSD") : ((ptr_struct->info_type == 4 ? ("DEVICE_VSD") : ((ptr_struct->info_type == 5 ? ("ROM_INFO") : ("unknown")))))))))), ptr_struct->info_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "info_length          : " UH_FMT "\n", ptr_struct->info_length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_length          : " UH_FMT "\n", ptr_struct->read_length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_offset          : " UH_FMT "\n", ptr_struct->read_offset);
-	for (i = 0; i < 8; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "info_string_%03d     : " UH_FMT "\n", i, ptr_struct->info_string[i]);
-	}
+    return REG_ACCESS_HCA_MPEGC_REG_SIZE;
+}
+
+void reg_access_hca_mpegc_reg_dump(const struct reg_access_hca_mpegc_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mpegc_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mqis_reg_pack(const struct reg_access_hca_mqis_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->info_type);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->info_length);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->read_length);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->read_offset);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->info_string[i]);
+    }
+}
+
+void reg_access_hca_mqis_reg_unpack(struct reg_access_hca_mqis_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->info_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->info_length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 80;
+    ptr_struct->read_length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->read_offset = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 192, 1);
+        ptr_struct->info_string[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+}
+
+void reg_access_hca_mqis_reg_print(const struct reg_access_hca_mqis_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mqis_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "info_type            : %s (" UH_FMT ")\n",
+      (ptr_struct->info_type == 1 ?
+         ("MODEL_NAME") :
+         ((ptr_struct->info_type == 2 ?
+             ("MODEL_DESCRIPTION") :
+             ((ptr_struct->info_type == 3 ?
+                 ("IMAGE_VSD") :
+                 ((ptr_struct->info_type == 4 ? ("DEVICE_VSD") :
+                                                ((ptr_struct->info_type == 5 ? ("ROM_INFO") : ("unknown")))))))))),
+      ptr_struct->info_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "info_length          : " UH_FMT "\n", ptr_struct->info_length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_length          : " UH_FMT "\n", ptr_struct->read_length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_offset          : " UH_FMT "\n", ptr_struct->read_offset);
+    for (i = 0; i < 8; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "info_string_%03d     : " UH_FMT "\n", i, ptr_struct->info_string[i]);
+    }
 }
 
 unsigned int reg_access_hca_mqis_reg_size(void)
 {
-	return REG_ACCESS_HCA_MQIS_REG_SIZE;
-}
-
-void reg_access_hca_mqis_reg_dump(const struct reg_access_hca_mqis_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mqis_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_string_db);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->trc_ver);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->trace_to_memory);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->trace_owner);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_string_trace);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->first_string_trace);
-	offset = 88;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_max_trace_buffer_size);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(128, 64, i, 1056, 1);
-		reg_access_hca_string_db_parameters_pack(&(ptr_struct->string_db_param[i]), ptr_buff + offset / 8);
-	}
-}
-
-void reg_access_hca_mtrc_cap_reg_unpack(struct reg_access_hca_mtrc_cap_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 28;
-	ptr_struct->num_string_db = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 6;
-	ptr_struct->trc_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 1;
-	ptr_struct->trace_to_memory = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->trace_owner = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 40;
-	ptr_struct->num_string_trace = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->first_string_trace = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 88;
-	ptr_struct->log_max_trace_buffer_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(128, 64, i, 1056, 1);
-		reg_access_hca_string_db_parameters_unpack(&(ptr_struct->string_db_param[i]), ptr_buff + offset / 8);
-	}
-}
-
-void reg_access_hca_mtrc_cap_reg_print(const struct reg_access_hca_mtrc_cap_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mtrc_cap_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_string_db        : " UH_FMT "\n", ptr_struct->num_string_db);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "trc_ver              : " UH_FMT "\n", ptr_struct->trc_ver);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "trace_to_memory      : " UH_FMT "\n", ptr_struct->trace_to_memory);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "trace_owner          : " UH_FMT "\n", ptr_struct->trace_owner);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_string_trace     : " UH_FMT "\n", ptr_struct->num_string_trace);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "first_string_trace   : " UH_FMT "\n", ptr_struct->first_string_trace);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_max_trace_buffer_size : " UH_FMT "\n", ptr_struct->log_max_trace_buffer_size);
-	for (i = 0; i < 8; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "string_db_param_%03d:\n", i);
-		reg_access_hca_string_db_parameters_print(&(ptr_struct->string_db_param[i]), fd, indent_level + 1);
-	}
+    return REG_ACCESS_HCA_MQIS_REG_SIZE;
+}
+
+void reg_access_hca_mqis_reg_dump(const struct reg_access_hca_mqis_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mqis_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_string_db);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->trc_ver);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->trace_to_memory);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->trace_owner);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_string_trace);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->first_string_trace);
+    offset = 88;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_max_trace_buffer_size);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 64, i, 1056, 1);
+        reg_access_hca_string_db_parameters_pack(&(ptr_struct->string_db_param[i]), ptr_buff + offset / 8);
+    }
+}
+
+void reg_access_hca_mtrc_cap_reg_unpack(struct reg_access_hca_mtrc_cap_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 28;
+    ptr_struct->num_string_db = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 6;
+    ptr_struct->trc_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 1;
+    ptr_struct->trace_to_memory = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->trace_owner = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 40;
+    ptr_struct->num_string_trace = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->first_string_trace = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 88;
+    ptr_struct->log_max_trace_buffer_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 64, i, 1056, 1);
+        reg_access_hca_string_db_parameters_unpack(&(ptr_struct->string_db_param[i]), ptr_buff + offset / 8);
+    }
+}
+
+void reg_access_hca_mtrc_cap_reg_print(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mtrc_cap_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_string_db        : " UH_FMT "\n", ptr_struct->num_string_db);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "trc_ver              : " UH_FMT "\n", ptr_struct->trc_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "trace_to_memory      : " UH_FMT "\n", ptr_struct->trace_to_memory);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "trace_owner          : " UH_FMT "\n", ptr_struct->trace_owner);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_string_trace     : " UH_FMT "\n", ptr_struct->num_string_trace);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "first_string_trace   : " UH_FMT "\n", ptr_struct->first_string_trace);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_max_trace_buffer_size : " UH_FMT "\n", ptr_struct->log_max_trace_buffer_size);
+    for (i = 0; i < 8; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "string_db_param_%03d:\n", i);
+        reg_access_hca_string_db_parameters_print(&(ptr_struct->string_db_param[i]), fd, indent_level + 1);
+    }
 }
 
 unsigned int reg_access_hca_mtrc_cap_reg_size(void)
 {
-	return REG_ACCESS_HCA_MTRC_CAP_REG_SIZE;
+    return REG_ACCESS_HCA_MTRC_CAP_REG_SIZE;
 }
 
-void reg_access_hca_mtrc_cap_reg_dump(const struct reg_access_hca_mtrc_cap_reg *ptr_struct, FILE *fd)
+void reg_access_hca_mtrc_cap_reg_dump(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, FILE* fd)
 {
-	reg_access_hca_mtrc_cap_reg_print(ptr_struct, fd, 0);
+    reg_access_hca_mtrc_cap_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mtrc_stdb_reg_pack(const struct reg_access_hca_mtrc_stdb_reg *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_mtrc_stdb_reg_pack(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->read_size);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->string_db_index);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->start_offset);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->read_size);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->string_db_index);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->start_offset);
 }
 
-void reg_access_hca_mtrc_stdb_reg_unpack(struct reg_access_hca_mtrc_stdb_reg *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_mtrc_stdb_reg_unpack(struct reg_access_hca_mtrc_stdb_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	ptr_struct->read_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 0;
-	ptr_struct->string_db_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->start_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 8;
+    ptr_struct->read_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 0;
+    ptr_struct->string_db_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->start_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_mtrc_stdb_reg ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_mtrc_stdb_reg ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_size            : " UH_FMT "\n", ptr_struct->read_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "string_db_index      : " UH_FMT "\n", ptr_struct->string_db_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "start_offset         : " U32H_FMT "\n", ptr_struct->start_offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "unlimited array: (string_db_data)\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_size            : " UH_FMT "\n", ptr_struct->read_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "string_db_index      : " UH_FMT "\n", ptr_struct->string_db_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "start_offset         : " U32H_FMT "\n", ptr_struct->start_offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "unlimited array: (string_db_data)\n");
 }
 
 unsigned int reg_access_hca_mtrc_stdb_reg_size(void)
 {
-	return REG_ACCESS_HCA_MTRC_STDB_REG_SIZE;
-}
-
-void reg_access_hca_mtrc_stdb_reg_dump(const struct reg_access_hca_mtrc_stdb_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_mtrc_stdb_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_pcnr_reg_pack(const struct reg_access_hca_pcnr_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->tuning_override);
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->force_fast_link_up);
-	offset = 18;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lp_msb);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->status);
-	offset = 63;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->keep_phy_setting);
-	offset = 62;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flot_cap);
-	offset = 61;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flot_invalidation);
-	offset = 60;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flu_disable);
-}
-
-void reg_access_hca_pcnr_reg_unpack(struct reg_access_hca_pcnr_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 31;
-	ptr_struct->tuning_override = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 30;
-	ptr_struct->force_fast_link_up = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 18;
-	ptr_struct->lp_msb = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 8;
-	ptr_struct->local_port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 63;
-	ptr_struct->keep_phy_setting = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 62;
-	ptr_struct->flot_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 61;
-	ptr_struct->flot_invalidation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 60;
-	ptr_struct->flu_disable = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void reg_access_hca_pcnr_reg_print(const struct reg_access_hca_pcnr_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_pcnr_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tuning_override      : " UH_FMT "\n", ptr_struct->tuning_override);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "force_fast_link_up   : " UH_FMT "\n", ptr_struct->force_fast_link_up);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lp_msb               : " UH_FMT "\n", ptr_struct->lp_msb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "local_port           : " UH_FMT "\n", ptr_struct->local_port);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "keep_phy_setting     : " UH_FMT "\n", ptr_struct->keep_phy_setting);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flot_cap             : " UH_FMT "\n", ptr_struct->flot_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flot_invalidation    : " UH_FMT "\n", ptr_struct->flot_invalidation);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flu_disable          : " UH_FMT "\n", ptr_struct->flu_disable);
+    return REG_ACCESS_HCA_MTRC_STDB_REG_SIZE;
+}
+
+void reg_access_hca_mtrc_stdb_reg_dump(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_mtrc_stdb_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_pcnr_reg_pack(const struct reg_access_hca_pcnr_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->tuning_override);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->force_fast_link_up);
+    offset = 18;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lp_msb);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->status);
+    offset = 63;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->keep_phy_setting);
+    offset = 62;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flot_cap);
+    offset = 61;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flot_invalidation);
+    offset = 60;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flu_disable);
+}
+
+void reg_access_hca_pcnr_reg_unpack(struct reg_access_hca_pcnr_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 31;
+    ptr_struct->tuning_override = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->force_fast_link_up = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 18;
+    ptr_struct->lp_msb = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 8;
+    ptr_struct->local_port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 63;
+    ptr_struct->keep_phy_setting = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 62;
+    ptr_struct->flot_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 61;
+    ptr_struct->flot_invalidation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 60;
+    ptr_struct->flu_disable = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void reg_access_hca_pcnr_reg_print(const struct reg_access_hca_pcnr_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_pcnr_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tuning_override      : " UH_FMT "\n", ptr_struct->tuning_override);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "force_fast_link_up   : " UH_FMT "\n", ptr_struct->force_fast_link_up);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lp_msb               : " UH_FMT "\n", ptr_struct->lp_msb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "local_port           : " UH_FMT "\n", ptr_struct->local_port);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "keep_phy_setting     : " UH_FMT "\n", ptr_struct->keep_phy_setting);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flot_cap             : " UH_FMT "\n", ptr_struct->flot_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flot_invalidation    : " UH_FMT "\n", ptr_struct->flot_invalidation);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flu_disable          : " UH_FMT "\n", ptr_struct->flu_disable);
 }
 
 unsigned int reg_access_hca_pcnr_reg_size(void)
 {
-	return REG_ACCESS_HCA_PCNR_REG_SIZE;
-}
-
-void reg_access_hca_pcnr_reg_dump(const struct reg_access_hca_pcnr_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_pcnr_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_resource_dump_pack(const struct reg_access_hca_resource_dump *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->segment_type);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->seq_num);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vhca_id_valid);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->inline_dump);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->more_dump);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vhca_id);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->index1);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->index2);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_obj2);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_obj1);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->device_opaque);
-	offset = 256;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mkey);
-	offset = 288;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->size);
-	offset = 320;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->address);
-	for (i = 0; i < 52; ++i) {
-		offset = adb2c_calc_array_field_address(384, 32, i, 2048, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->inline_data[i]);
-	}
-}
-
-void reg_access_hca_resource_dump_unpack(struct reg_access_hca_resource_dump *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 16;
-	ptr_struct->segment_type = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 12;
-	ptr_struct->seq_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 2;
-	ptr_struct->vhca_id_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->inline_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->more_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->vhca_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->index1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->index2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 144;
-	ptr_struct->num_of_obj2 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	ptr_struct->num_of_obj1 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 192;
-	ptr_struct->device_opaque = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
-	offset = 256;
-	ptr_struct->mkey = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 288;
-	ptr_struct->size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 320;
-	ptr_struct->address = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 52; ++i) {
-		offset = adb2c_calc_array_field_address(384, 32, i, 2048, 1);
-		ptr_struct->inline_data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-}
-
-void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_resource_dump ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "segment_type         : " UH_FMT "\n", ptr_struct->segment_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "seq_num              : " UH_FMT "\n", ptr_struct->seq_num);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vhca_id_valid        : " UH_FMT "\n", ptr_struct->vhca_id_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "inline_dump          : " UH_FMT "\n", ptr_struct->inline_dump);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "more_dump            : " UH_FMT "\n", ptr_struct->more_dump);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vhca_id              : " UH_FMT "\n", ptr_struct->vhca_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "index1               : " U32H_FMT "\n", ptr_struct->index1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "index2               : " U32H_FMT "\n", ptr_struct->index2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_obj2          : " UH_FMT "\n", ptr_struct->num_of_obj2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_obj1          : " UH_FMT "\n", ptr_struct->num_of_obj1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_opaque        : " U64H_FMT "\n", ptr_struct->device_opaque);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mkey                 : " U32H_FMT "\n", ptr_struct->mkey);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " U32H_FMT "\n", ptr_struct->size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "address              : " U64H_FMT "\n", ptr_struct->address);
-	for (i = 0; i < 52; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "inline_data_%03d     : " U32H_FMT "\n", i, ptr_struct->inline_data[i]);
-	}
+    return REG_ACCESS_HCA_PCNR_REG_SIZE;
+}
+
+void reg_access_hca_pcnr_reg_dump(const struct reg_access_hca_pcnr_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_pcnr_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_resource_dump_pack(const struct reg_access_hca_resource_dump* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->segment_type);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->seq_num);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vhca_id_valid);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->inline_dump);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->more_dump);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vhca_id);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->index1);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->index2);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_obj2);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_obj1);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->device_opaque);
+    offset = 256;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mkey);
+    offset = 288;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->size);
+    offset = 320;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->address);
+    for (i = 0; i < 52; ++i)
+    {
+        offset = adb2c_calc_array_field_address(384, 32, i, 2048, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->inline_data[i]);
+    }
+}
+
+void reg_access_hca_resource_dump_unpack(struct reg_access_hca_resource_dump* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 16;
+    ptr_struct->segment_type = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 12;
+    ptr_struct->seq_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 2;
+    ptr_struct->vhca_id_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->inline_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->more_dump = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->vhca_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->index1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->index2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 144;
+    ptr_struct->num_of_obj2 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    ptr_struct->num_of_obj1 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 192;
+    ptr_struct->device_opaque = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 256;
+    ptr_struct->mkey = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 288;
+    ptr_struct->size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 320;
+    ptr_struct->address = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 52; ++i)
+    {
+        offset = adb2c_calc_array_field_address(384, 32, i, 2048, 1);
+        ptr_struct->inline_data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+}
+
+void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_resource_dump ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "segment_type         : " UH_FMT "\n", ptr_struct->segment_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "seq_num              : " UH_FMT "\n", ptr_struct->seq_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vhca_id_valid        : " UH_FMT "\n", ptr_struct->vhca_id_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "inline_dump          : " UH_FMT "\n", ptr_struct->inline_dump);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "more_dump            : " UH_FMT "\n", ptr_struct->more_dump);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vhca_id              : " UH_FMT "\n", ptr_struct->vhca_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "index1               : " U32H_FMT "\n", ptr_struct->index1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "index2               : " U32H_FMT "\n", ptr_struct->index2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_obj2          : " UH_FMT "\n", ptr_struct->num_of_obj2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_obj1          : " UH_FMT "\n", ptr_struct->num_of_obj1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_opaque        : " U64H_FMT "\n", ptr_struct->device_opaque);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mkey                 : " U32H_FMT "\n", ptr_struct->mkey);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " U32H_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "address              : " U64H_FMT "\n", ptr_struct->address);
+    for (i = 0; i < 52; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "inline_data_%03d     : " U32H_FMT "\n", i, ptr_struct->inline_data[i]);
+    }
 }
 
 unsigned int reg_access_hca_resource_dump_size(void)
 {
-	return REG_ACCESS_HCA_RESOURCE_DUMP_SIZE;
-}
-
-void reg_access_hca_resource_dump_dump(const struct reg_access_hca_resource_dump *ptr_struct, FILE *fd)
-{
-	reg_access_hca_resource_dump_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_skip);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_repeat);
-	offset = 128;
-	reg_access_hca_smbus_failed_fault_inject_modifier_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 2;
-	ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 80;
-	ptr_struct->num_skip = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 112;
-	ptr_struct->num_repeat = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	reg_access_hca_smbus_failed_fault_inject_modifier_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_strs_fault_inject_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("ICM_ALLOC_REFUSE") : ((ptr_struct->type == 1 ? ("ICM_ALLOC_BUSY") : ((ptr_struct->type == 2 ? ("EQE_GW_BUSY") : ((ptr_struct->type == 3 ? ("CQE_GW_BUSY") : ((ptr_struct->type == 4 ? ("RX_FENCE_BUSY") : ((ptr_struct->type == 5 ? ("SX_FENCE_BUSY") : ((ptr_struct->type == 6 ? ("RXT_SLICE_FENCE_BUSY") : ((ptr_struct->type == 7 ? ("SXD_SLICE_FENCE_BUSY") : ((ptr_struct->type == 8 ? ("GENERAL_FENCE_BUSY") : ((ptr_struct->type == 9 ? ("SMBUS_FAILED") : ("unknown")))))))))))))))))))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_skip             : " UH_FMT "\n", ptr_struct->num_skip);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_repeat           : " UH_FMT "\n", ptr_struct->num_repeat);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "per_type_modifier:\n");
-	reg_access_hca_smbus_failed_fault_inject_modifier_print(&(ptr_struct->per_type_modifier), fd, indent_level + 1);
+    return REG_ACCESS_HCA_RESOURCE_DUMP_SIZE;
+}
+
+void reg_access_hca_resource_dump_dump(const struct reg_access_hca_resource_dump* ptr_struct, FILE* fd)
+{
+    reg_access_hca_resource_dump_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                               u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_skip);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_repeat);
+    offset = 128;
+    reg_access_hca_smbus_failed_fault_inject_modifier_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
+}
+
+void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                                 const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 2;
+    ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 80;
+    ptr_struct->num_skip = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 112;
+    ptr_struct->num_repeat = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    reg_access_hca_smbus_failed_fault_inject_modifier_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
+}
+
+void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_strs_fault_inject_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "type                 : %s (" UH_FMT ")\n",
+      (ptr_struct->type == 0 ?
+         ("ICM_ALLOC_REFUSE") :
+         ((ptr_struct->type == 1 ?
+             ("ICM_ALLOC_BUSY") :
+             ((ptr_struct->type == 2 ?
+                 ("EQE_GW_BUSY") :
+                 ((ptr_struct->type == 3 ?
+                     ("CQE_GW_BUSY") :
+                     ((ptr_struct->type == 4 ?
+                         ("RX_FENCE_BUSY") :
+                         ((ptr_struct->type == 5 ?
+                             ("SX_FENCE_BUSY") :
+                             ((ptr_struct->type == 6 ?
+                                 ("RXT_SLICE_FENCE_BUSY") :
+                                 ((ptr_struct->type == 7 ?
+                                     ("SXD_SLICE_FENCE_BUSY") :
+                                     ((ptr_struct->type == 8 ?
+                                         ("GENERAL_FENCE_BUSY") :
+                                         ((ptr_struct->type == 9 ? ("SMBUS_FAILED") : ("unknown")))))))))))))))))))),
+      ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_skip             : " UH_FMT "\n", ptr_struct->num_skip);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_repeat           : " UH_FMT "\n", ptr_struct->num_repeat);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "per_type_modifier:\n");
+    reg_access_hca_smbus_failed_fault_inject_modifier_print(&(ptr_struct->per_type_modifier), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_fault_inject_reg_size(void)
 {
-	return REG_ACCESS_HCA_STRS_FAULT_INJECT_REG_SIZE;
-}
-
-void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_fault_inject_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_strs_fault_inject_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->freq);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_repeat);
-	offset = 128;
-	reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 2;
-	ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 80;
-	ptr_struct->freq = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 112;
-	ptr_struct->num_repeat = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_strs_mini_flow_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("SX_FLICK_THROTTLE") : ((ptr_struct->type == 1 ? ("INVALIDATE_STEERING_CACHE") : ((ptr_struct->type == 2 ? ("INVALIDATE_RXT_QP_L0_CACHE") : ((ptr_struct->type == 3 ? ("INVALIDATE_DCT_L0_CACHE") : ((ptr_struct->type == 4 ? ("INVALIDATE_LDB_REQSL_CACHE") : ((ptr_struct->type == 5 ? ("INVALIDATE_RXC_CACHE") : ((ptr_struct->type == 6 ? ("INVALIDATE_SXDC_CACHE") : ((ptr_struct->type == 7 ? ("RECONSTRUCT_STEERING_BYPASS") : ((ptr_struct->type == 8 ? ("INVALIDATE_LDB_CACHE") : ((ptr_struct->type == 9 ? ("PCI_READ_ERROR") : ((ptr_struct->type == 10 ? ("INVALIDATE_ALL_RO_CACHES") : ((ptr_struct->type == 11 ? ("INVALIDATE_PKEY_CACHE") : ((ptr_struct->type == 12 ? ("INVALIDATE_GUID_CACHE") : ((ptr_struct->type == 13 ? ("INVALIDATE_PORT_INFO_CACHE") : ((ptr_struct->type == 14 ? ("INVALIDATE_QP_CACHE") : ((ptr_struct->type == 15 ? ("IRISC_HANG") : ((ptr_struct->type == 16 ? ("PACKET_DROP") : ("unknown")))))))))))))))))))))))))))))))))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "freq                 : " UH_FMT "\n", ptr_struct->freq);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_repeat           : " UH_FMT "\n", ptr_struct->num_repeat);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "per_type_modifier:\n");
-	reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd, indent_level + 1);
+    return REG_ACCESS_HCA_STRS_FAULT_INJECT_REG_SIZE;
+}
+
+void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_strs_fault_inject_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                            u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->freq);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_repeat);
+    offset = 128;
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier),
+                                                                  ptr_buff + offset / 8);
+}
+
+void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                              const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 2;
+    ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 80;
+    ptr_struct->freq = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 112;
+    ptr_struct->num_repeat = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier),
+                                                                    ptr_buff + offset / 8);
+}
+
+void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_strs_mini_flow_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "type                 : %s (" UH_FMT ")\n",
+      (ptr_struct->type == 0 ?
+         ("SX_FLICK_THROTTLE") :
+         ((ptr_struct->type == 1 ?
+             ("INVALIDATE_STEERING_CACHE") :
+             ((ptr_struct->type == 2 ?
+                 ("INVALIDATE_RXT_QP_L0_CACHE") :
+                 ((ptr_struct->type == 3 ?
+                     ("INVALIDATE_DCT_L0_CACHE") :
+                     ((ptr_struct->type == 4 ?
+                         ("INVALIDATE_LDB_REQSL_CACHE") :
+                         ((ptr_struct->type == 5 ?
+                             ("INVALIDATE_RXC_CACHE") :
+                             ((ptr_struct->type == 6 ?
+                                 ("INVALIDATE_SXDC_CACHE") :
+                                 ((ptr_struct->type == 7 ?
+                                     ("RECONSTRUCT_STEERING_BYPASS") :
+                                     ((ptr_struct->type == 8 ?
+                                         ("INVALIDATE_LDB_CACHE") :
+                                         ((ptr_struct->type == 9 ?
+                                             ("PCI_READ_ERROR") :
+                                             ((ptr_struct->type == 10 ?
+                                                 ("INVALIDATE_ALL_RO_CACHES") :
+                                                 ((ptr_struct->type == 11 ?
+                                                     ("INVALIDATE_PKEY_CACHE") :
+                                                     ((ptr_struct->type == 12 ?
+                                                         ("INVALIDATE_GUID_CACHE") :
+                                                         ((ptr_struct->type == 13 ?
+                                                             ("INVALIDATE_PORT_INFO_CACHE") :
+                                                             ((ptr_struct->type == 14 ?
+                                                                 ("INVALIDATE_QP_CACHE") :
+                                                                 ((ptr_struct->type == 15 ?
+                                                                     ("IRISC_HANG") :
+                                                                     ((ptr_struct->type == 16 ?
+                                                                         ("PACKET_DROP") :
+                                                                         ("unknown")))))))))))))))))))))))))))))))))),
+      ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "freq                 : " UH_FMT "\n", ptr_struct->freq);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_repeat           : " UH_FMT "\n", ptr_struct->num_repeat);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "per_type_modifier:\n");
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd,
+                                                                   indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_mini_flow_reg_size(void)
 {
-	return REG_ACCESS_HCA_STRS_MINI_FLOW_REG_SIZE;
+    return REG_ACCESS_HCA_STRS_MINI_FLOW_REG_SIZE;
 }
 
-void reg_access_hca_strs_mini_flow_reg_dump(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, FILE *fd)
+void reg_access_hca_strs_mini_flow_reg_dump(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, FILE* fd)
 {
-	reg_access_hca_strs_mini_flow_reg_print(ptr_struct, fd, 0);
+    reg_access_hca_strs_mini_flow_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reduce_percentage);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reduce_percentage);
 }
 
-void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 2;
-	ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->reduce_percentage = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 2;
+    ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->reduce_percentage = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg *ptr_struct, FILE *fd, int indent_level)
+void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_strs_resource_reg ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_strs_resource_reg ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("SX_SLICE") : ((ptr_struct->type == 1 ? ("RX_SLICE") : ("unknown")))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reduce_percentage    : " U32H_FMT "\n", ptr_struct->reduce_percentage);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
+            (ptr_struct->type == 0 ? ("SX_SLICE") : ((ptr_struct->type == 1 ? ("RX_SLICE") : ("unknown")))),
+            ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reduce_percentage    : " U32H_FMT "\n", ptr_struct->reduce_percentage);
 }
 
 unsigned int reg_access_hca_strs_resource_reg_size(void)
 {
-	return REG_ACCESS_HCA_STRS_RESOURCE_REG_SIZE;
-}
-
-void reg_access_hca_strs_resource_reg_dump(const struct reg_access_hca_strs_resource_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_strs_resource_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 91;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_stressor);
-	offset = 83;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_duty_cycle);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->polarity);
-	offset = 128;
-	reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 2;
-	ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 91;
-	ptr_struct->log_stressor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 83;
-	ptr_struct->log_duty_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 64;
-	ptr_struct->polarity = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 128;
-	reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
-}
-
-void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_strs_stop_toggle_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("DC_CNAK") : ((ptr_struct->type == 1 ? ("RXT_CHECKS") : ((ptr_struct->type == 2 ? ("TIMEOUT") : ((ptr_struct->type == 3 ? ("SX_ERROR") : ((ptr_struct->type == 4 ? ("RX_ERROR") : ((ptr_struct->type == 5 ? ("MX_ERROR") : ((ptr_struct->type == 6 ? ("MAD_TRAP") : ((ptr_struct->type == 7 ? ("RXT_SLICE") : ((ptr_struct->type == 8 ? ("QOS_ARBITER") : ((ptr_struct->type == 9 ? ("RXB_HANG") : ((ptr_struct->type == 10 ? ("FW_SCHED_Q") : ((ptr_struct->type == 11 ? ("LOCK_RESOURCE") : ((ptr_struct->type == 12 ? ("IRISC_HANG") : ((ptr_struct->type == 13 ? ("SXW_SLICE") : ((ptr_struct->type == 14 ? ("RXC_CQE") : ((ptr_struct->type == 15 ? ("RXC_EQE") : ((ptr_struct->type == 16 ? ("SXP_HANG") : ((ptr_struct->type == 17 ? ("SX_EXT_DB") : ((ptr_struct->type == 18 ? ("SX_INT_DB") : ((ptr_struct->type == 19 ? ("QPC_SLICE") : ((ptr_struct->type == 20 ? ("RXB_HOST_HANG") : ((ptr_struct->type == 21 ? ("PAUSE_TX") : ("unknown")))))))))))))))))))))))))))))))))))))))))))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_stressor         : " UH_FMT "\n", ptr_struct->log_stressor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_duty_cycle       : " UH_FMT "\n", ptr_struct->log_duty_cycle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "polarity             : %s (" UH_FMT ")\n", (ptr_struct->polarity == 0 ? ("FLOW_STOPPED") : ((ptr_struct->polarity == 1 ? ("FLOW_ACTIVE") : ("unknown")))), ptr_struct->polarity);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "per_type_modifier:\n");
-	reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd, indent_level + 1);
+    return REG_ACCESS_HCA_STRS_RESOURCE_REG_SIZE;
+}
+
+void reg_access_hca_strs_resource_reg_dump(const struct reg_access_hca_strs_resource_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_strs_resource_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                              u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->past_active);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->supported);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 91;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_stressor);
+    offset = 83;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_duty_cycle);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->polarity);
+    offset = 128;
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier),
+                                                                    ptr_buff + offset / 8);
+}
+
+void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                                const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 2;
+    ptr_struct->past_active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 91;
+    ptr_struct->log_stressor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 83;
+    ptr_struct->log_duty_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 64;
+    ptr_struct->polarity = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 128;
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier),
+                                                                      ptr_buff + offset / 8);
+}
+
+void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_strs_stop_toggle_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "past_active          : " UH_FMT "\n", ptr_struct->past_active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "type                 : %s (" UH_FMT ")\n",
+      (ptr_struct->type == 0 ?
+         ("DC_CNAK") :
+         ((ptr_struct->type == 1 ?
+             ("RXT_CHECKS") :
+             ((ptr_struct->type == 2 ?
+                 ("TIMEOUT") :
+                 ((ptr_struct->type == 3 ?
+                     ("SX_ERROR") :
+                     ((ptr_struct->type == 4 ?
+                         ("RX_ERROR") :
+                         ((ptr_struct->type == 5 ?
+                             ("MX_ERROR") :
+                             ((ptr_struct->type == 6 ?
+                                 ("MAD_TRAP") :
+                                 ((ptr_struct->type == 7 ?
+                                     ("RXT_SLICE") :
+                                     ((ptr_struct->type == 8 ?
+                                         ("QOS_ARBITER") :
+                                         ((ptr_struct->type == 9 ?
+                                             ("RXB_HANG") :
+                                             ((ptr_struct->type == 10 ?
+                                                 ("FW_SCHED_Q") :
+                                                 ((ptr_struct->type == 11 ?
+                                                     ("LOCK_RESOURCE") :
+                                                     ((ptr_struct->type == 12 ?
+                                                         ("IRISC_HANG") :
+                                                         ((ptr_struct->type == 13 ?
+                                                             ("SXW_SLICE") :
+                                                             ((ptr_struct->type == 14 ?
+                                                                 ("RXC_CQE") :
+                                                                 ((ptr_struct->type == 15 ?
+                                                                     ("RXC_EQE") :
+                                                                     ((ptr_struct->type == 16 ?
+                                                                         ("SXP_HANG") :
+                                                                         ((ptr_struct->type == 17 ?
+                                                                             ("SX_EXT_DB") :
+                                                                             ((ptr_struct->type == 18 ?
+                                                                                 ("SX_INT_DB") :
+                                                                                 ((ptr_struct->type == 19 ?
+                                                                                     ("QPC_SLICE") :
+                                                                                     ((ptr_struct->type == 20 ?
+                                                                                         ("RXB_HOST_HANG") :
+                                                                                         ((ptr_struct->type == 21 ?
+                                                                                             ("PAUSE_TX") :
+                                                                                             ("unknown")))))))))))))))))))))))))))))))))))))))))))),
+      ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_stressor         : " UH_FMT "\n", ptr_struct->log_stressor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_duty_cycle       : " UH_FMT "\n", ptr_struct->log_duty_cycle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "polarity             : %s (" UH_FMT ")\n",
+      (ptr_struct->polarity == 0 ? ("FLOW_STOPPED") : ((ptr_struct->polarity == 1 ? ("FLOW_ACTIVE") : ("unknown")))),
+      ptr_struct->polarity);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "per_type_modifier:\n");
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd,
+                                                                     indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_stop_toggle_reg_size(void)
 {
-	return REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_SIZE;
-}
-
-void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, FILE *fd)
-{
-	reg_access_hca_strs_stop_toggle_reg_print(ptr_struct, fd, 0);
-}
-
-void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes *ptr_struct, u_int8_t *ptr_buff)
-{
-	reg_access_hca_resource_dump_pack(&(ptr_struct->resource_dump), ptr_buff);
-}
-
-void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes *ptr_struct, const u_int8_t *ptr_buff)
-{
-	reg_access_hca_resource_dump_unpack(&(ptr_struct->resource_dump), ptr_buff);
-}
-
-void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_hca_reg_access_hca_Nodes ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqs_reg:\n");
-	reg_access_hca_mcqs_reg_print(&(ptr_struct->mcqs_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_linkx_properties:\n");
-	reg_access_hca_mcqi_linkx_properties_print(&(ptr_struct->mcqi_linkx_properties), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_activation_method:\n");
-	reg_access_hca_mcqi_activation_method_print(&(ptr_struct->mcqi_activation_method), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mtrc_stdb_reg:\n");
-	reg_access_hca_mtrc_stdb_reg_print(&(ptr_struct->mtrc_stdb_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "strs_fault_inject_reg:\n");
-	reg_access_hca_strs_fault_inject_reg_print(&(ptr_struct->strs_fault_inject_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "resource_dump:\n");
-	reg_access_hca_resource_dump_print(&(ptr_struct->resource_dump), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pcnr_reg:\n");
-	reg_access_hca_pcnr_reg_print(&(ptr_struct->pcnr_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mmdio:\n");
-	reg_access_hca_mmdio_print(&(ptr_struct->mmdio), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfsv_reg:\n");
-	reg_access_hca_mfsv_reg_print(&(ptr_struct->mfsv_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcda_reg:\n");
-	reg_access_hca_mcda_reg_print(&(ptr_struct->mcda_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mtrc_cap_reg:\n");
-	reg_access_hca_mtrc_cap_reg_print(&(ptr_struct->mtrc_cap_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mpegc_reg:\n");
-	reg_access_hca_mpegc_reg_print(&(ptr_struct->mpegc_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfrl_reg_ext:\n");
-	reg_access_hca_mfrl_reg_ext_print(&(ptr_struct->mfrl_reg_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_reg:\n");
-	reg_access_hca_mcqi_reg_print(&(ptr_struct->mcqi_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcc_reg:\n");
-	reg_access_hca_mcc_reg_print(&(ptr_struct->mcc_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "strs_mini_flow_reg:\n");
-	reg_access_hca_strs_mini_flow_reg_print(&(ptr_struct->strs_mini_flow_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_cap:\n");
-	reg_access_hca_mcqi_cap_print(&(ptr_struct->mcqi_cap), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mqis_reg:\n");
-	reg_access_hca_mqis_reg_print(&(ptr_struct->mqis_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mpcir_ext:\n");
-	reg_access_hca_mpcir_ext_print(&(ptr_struct->mpcir_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "strs_resource_reg:\n");
-	reg_access_hca_strs_resource_reg_print(&(ptr_struct->strs_resource_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug_cap:\n");
-	reg_access_hca_debug_cap_print(&(ptr_struct->debug_cap), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mgir:\n");
-	reg_access_hca_mgir_print(&(ptr_struct->mgir), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcqi_version:\n");
-	reg_access_hca_mcqi_version_print(&(ptr_struct->mcqi_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "strs_stop_toggle_reg:\n");
-	reg_access_hca_strs_stop_toggle_reg_print(&(ptr_struct->strs_stop_toggle_reg), fd, indent_level + 1);
+    return REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_SIZE;
+}
+
+void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, FILE* fd)
+{
+    reg_access_hca_strs_stop_toggle_reg_print(ptr_struct, fd, 0);
+}
+
+void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                              u_int8_t* ptr_buff)
+{
+    reg_access_hca_resource_dump_pack(&(ptr_struct->resource_dump), ptr_buff);
+}
+
+void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                                const u_int8_t* ptr_buff)
+{
+    reg_access_hca_resource_dump_unpack(&(ptr_struct->resource_dump), ptr_buff);
+}
+
+void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_hca_reg_access_hca_Nodes ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqs_reg:\n");
+    reg_access_hca_mcqs_reg_print(&(ptr_struct->mcqs_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_linkx_properties:\n");
+    reg_access_hca_mcqi_linkx_properties_print(&(ptr_struct->mcqi_linkx_properties), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_activation_method:\n");
+    reg_access_hca_mcqi_activation_method_print(&(ptr_struct->mcqi_activation_method), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mtrc_stdb_reg:\n");
+    reg_access_hca_mtrc_stdb_reg_print(&(ptr_struct->mtrc_stdb_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "strs_fault_inject_reg:\n");
+    reg_access_hca_strs_fault_inject_reg_print(&(ptr_struct->strs_fault_inject_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "resource_dump:\n");
+    reg_access_hca_resource_dump_print(&(ptr_struct->resource_dump), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pcnr_reg:\n");
+    reg_access_hca_pcnr_reg_print(&(ptr_struct->pcnr_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mmdio:\n");
+    reg_access_hca_mmdio_print(&(ptr_struct->mmdio), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfsv_reg:\n");
+    reg_access_hca_mfsv_reg_print(&(ptr_struct->mfsv_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcda_reg:\n");
+    reg_access_hca_mcda_reg_print(&(ptr_struct->mcda_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mtrc_cap_reg:\n");
+    reg_access_hca_mtrc_cap_reg_print(&(ptr_struct->mtrc_cap_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mpegc_reg:\n");
+    reg_access_hca_mpegc_reg_print(&(ptr_struct->mpegc_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfrl_reg_ext:\n");
+    reg_access_hca_mfrl_reg_ext_print(&(ptr_struct->mfrl_reg_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_reg:\n");
+    reg_access_hca_mcqi_reg_print(&(ptr_struct->mcqi_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcc_reg:\n");
+    reg_access_hca_mcc_reg_print(&(ptr_struct->mcc_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "strs_mini_flow_reg:\n");
+    reg_access_hca_strs_mini_flow_reg_print(&(ptr_struct->strs_mini_flow_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_cap:\n");
+    reg_access_hca_mcqi_cap_print(&(ptr_struct->mcqi_cap), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mqis_reg:\n");
+    reg_access_hca_mqis_reg_print(&(ptr_struct->mqis_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mpcir_ext:\n");
+    reg_access_hca_mpcir_ext_print(&(ptr_struct->mpcir_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "strs_resource_reg:\n");
+    reg_access_hca_strs_resource_reg_print(&(ptr_struct->strs_resource_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug_cap:\n");
+    reg_access_hca_debug_cap_print(&(ptr_struct->debug_cap), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mgir:\n");
+    reg_access_hca_mgir_print(&(ptr_struct->mgir), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcqi_version:\n");
+    reg_access_hca_mcqi_version_print(&(ptr_struct->mcqi_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "strs_stop_toggle_reg:\n");
+    reg_access_hca_strs_stop_toggle_reg_print(&(ptr_struct->strs_stop_toggle_reg), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_reg_access_hca_Nodes_size(void)
 {
-	return REG_ACCESS_HCA_REG_ACCESS_HCA_NODES_SIZE;
+    return REG_ACCESS_HCA_REG_ACCESS_HCA_NODES_SIZE;
 }
 
-void reg_access_hca_reg_access_hca_Nodes_dump(const union reg_access_hca_reg_access_hca_Nodes *ptr_struct, FILE *fd)
+void reg_access_hca_reg_access_hca_Nodes_dump(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct, FILE* fd)
 {
-	reg_access_hca_reg_access_hca_Nodes_print(ptr_struct, fd, 0);
+    reg_access_hca_reg_access_hca_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/reg_access_hca_layouts.h b/tools_layouts/reg_access_hca_layouts.h
index b136be7f..03199fc7 100644
--- a/tools_layouts/reg_access_hca_layouts.h
+++ b/tools_layouts/reg_access_hca_layouts.h
@@ -30,70 +30,73 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2022-01-26 16:01:32"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/prm/hca/int/reg_access_hca.adb --file-prefix reg_access_hca --prefix reg_access_hca_ --no-adb-utils
-         ***/
+ *** This file was generated at "2022-01-26 16:01:32"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/prm/hca/int/reg_access_hca.adb --file-prefix reg_access_hca --prefix reg_access_hca_ --no-adb-utils
+ ***/
 #ifndef REG_ACCESS_HCA_LAYOUTS_H
 #define REG_ACCESS_HCA_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 28 */
-struct reg_access_hca_lock_source_general_semaphore {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Resource type
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct reg_access_hca_lock_source_general_semaphore
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Resource type
 0x0: QPC_GW
 0x1: CQE_GW
 0x2: EQE_GW
 0x3: MEM_GW
 0x4: IPC
 Other values are reserved */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - While the stressor locks the resource, it will release it 
-shortly every 2^log_toggle_cycle, given in usec. Maximal 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - While the stressor locks the resource, it will release it
+shortly every 2^log_toggle_cycle, given in usec. Maximal
 value is 1 sec (0x14) */
-	/* 0x4.24 - 0x4.31 */
-	u_int8_t log_toggle_cycle;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct reg_access_hca_lock_source_icm_resource {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - ICM resource GVMI */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t gvmi;
-	/* Description - While the stressor locks the resource, it will release it 
-shortly every 2^log_toggle_cycle, given in usec. Maximal 
+        /* 0x4.24 - 0x4.31 */
+        u_int8_t log_toggle_cycle;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct reg_access_hca_lock_source_icm_resource
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - ICM resource GVMI */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t gvmi;
+        /* Description - While the stressor locks the resource, it will release it
+shortly every 2^log_toggle_cycle, given in usec. Maximal
 value is 1 sec (0x14) */
-	/* 0x4.24 - 0x4.31 */
-	u_int8_t log_toggle_cycle;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - ICM resource index */
-	/* 0x8.0 - 0x8.23 */
-	u_int32_t index;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct reg_access_hca_lock_source_uapp_resource {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0x0: UAPP_QP
+        /* 0x4.24 - 0x4.31 */
+        u_int8_t log_toggle_cycle;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - ICM resource index */
+        /* 0x8.0 - 0x8.23 */
+        u_int32_t index;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct reg_access_hca_lock_source_uapp_resource
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0x0: UAPP_QP
 0x1: SRQ
 0x2: UAPP_SRQ_META
 0x3: UAPP_RES_CQ
@@ -102,334 +105,344 @@ struct reg_access_hca_lock_source_uapp_resource {
 0x6: NSQ
 0x7: NCQ
 Other values are reserved */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - uApp resource GVMI */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t gvmi;
-	/* Description - While the stressor locks the resource, it will release it 
-shortly every 2^log_toggle_cycle, given in usec. Maximal 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - uApp resource GVMI */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t gvmi;
+        /* Description - While the stressor locks the resource, it will release it
+shortly every 2^log_toggle_cycle, given in usec. Maximal
 value is 1 sec (0x14) */
-	/* 0x4.24 - 0x4.31 */
-	u_int8_t log_toggle_cycle;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - uApp resource index:
+        /* 0x4.24 - 0x4.31 */
+        u_int8_t log_toggle_cycle;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - uApp resource index:
 for uapp QP enter QPN.
 for uapp SRQ, uapp SRQ meta, UAPP CQ enter the srq index
 for nvme SQ, nvme CQ enter the backend controller id */
-	/* 0x8.0 - 0x8.23 */
-	u_int32_t index;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct reg_access_hca_lock_source_general_semaphore lock_source_general_semaphore;
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct reg_access_hca_lock_source_icm_resource lock_source_icm_resource;
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct reg_access_hca_lock_source_uapp_resource lock_source_uapp_resource;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct reg_access_hca_uint64 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int64_t uint64;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_irisc_hang_mini_flow_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Bit per Irisc. When set, IRISC will hang (The miniflow does 
+        /* 0x8.0 - 0x8.23 */
+        u_int32_t index;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct reg_access_hca_lock_source_general_semaphore lock_source_general_semaphore;
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct reg_access_hca_lock_source_icm_resource lock_source_icm_resource;
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct reg_access_hca_lock_source_uapp_resource lock_source_uapp_resource;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct reg_access_hca_uint64
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int64_t uint64;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_irisc_hang_mini_flow_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Bit per Irisc. When set, IRISC will hang (The miniflow does
 not release the Irisc when done) */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t irisc_hang_mask;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Bit per Irisc. When set, the device supports causing the 
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t irisc_hang_mask;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Bit per Irisc. When set, the device supports causing the
 respective Irisc to hang using this miniflow. */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t irisc_hang_cap_mask;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_lock_source_stop_toggle_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Resource type category
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t irisc_hang_cap_mask;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_lock_source_stop_toggle_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Resource type category
 0x0: GENERAL_SEMAPHORE
 0x1: ICM_RESOURCE
 0x2: UAPP_RESOURCE
 Other values are reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t category;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - LOCK_RESOURCE Modifier according to category field
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t category;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - LOCK_RESOURCE Modifier according to category field
 For GENERAL_SEMAPHORE Table  1102, "GENERAL_SEMA
 PHORE Category Layout," on page  1388
-For ICM_RESOURCE Table  1104, "ICM_RESOURCE Category 
+For ICM_RESOURCE Table  1104, "ICM_RESOURCE Category
 Layout," on page  1389
 For UAPP_RESOURCE Table  1106, "UAPP_RESOURCE Cate
 gory Layout," on page  1389 */
-	/* 0x4.0 - 0x1c.31 */
-	union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto category_modifier;
-};
-
-/* Description -   */
-/* Size in bytes - 124 */
-struct reg_access_hca_mcqi_activation_method {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - When set, the operation needed to move the compo
-nent form ACTIVE_PENDING_RESET to ACTIVE should 
+        /* 0x4.0 - 0x1c.31 */
+        union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto category_modifier;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 124 */
+    struct reg_access_hca_mcqi_activation_method
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - When set, the operation needed to move the compo
+nent form ACTIVE_PENDING_RESET to ACTIVE should
 happen simultaneously on all hosts. */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t all_hosts_sync;
-	/* Description - This component will be ACTIVE or ACTIVE_PEND
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t all_hosts_sync;
+        /* Description - This component will be ACTIVE or ACTIVE_PEND
 ING_RESET after the APPLY state. */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t auto_activate;
-	/* Description - This component goes to ACTIVE_PENDING_RESET 
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t auto_activate;
+        /* Description - This component goes to ACTIVE_PENDING_RESET
 after activation.
 A FW reset will move it to ACTIVE state. */
-	/* 0x0.2 - 0x0.2 */
-	u_int8_t pending_fw_reset;
-	/* Description - This component goes to ACTIVE_PENDING_RESET 
+        /* 0x0.2 - 0x0.2 */
+        u_int8_t pending_fw_reset;
+        /* Description - This component goes to ACTIVE_PENDING_RESET
 state after activation.
-A server reset (PCIe PERST#), will move it ACTIVE 
+A server reset (PCIe PERST#), will move it ACTIVE
 state. */
-	/* 0x0.3 - 0x0.3 */
-	u_int8_t pending_server_reboot;
-	/* Description - This component goes to ACTIVE_PENDING_RESET 
+        /* 0x0.3 - 0x0.3 */
+        u_int8_t pending_server_reboot;
+        /* Description - This component goes to ACTIVE_PENDING_RESET
 state after activation.
-DC power cycle (power cycle of PCI power rails), will 
+DC power cycle (power cycle of PCI power rails), will
 move it ACTIVE state. */
-	/* 0x0.4 - 0x0.4 */
-	u_int8_t pending_server_dc_power_cycle;
-	/* Description - This component goes to ACTIVE_PENDING_RESET 
+        /* 0x0.4 - 0x0.4 */
+        u_int8_t pending_server_dc_power_cycle;
+        /* Description - This component goes to ACTIVE_PENDING_RESET
 state after activation.
-AC power cycle (power cycle for both PCI power rails 
+AC power cycle (power cycle for both PCI power rails
 and AUX power), will move it ACTIVE state. */
-	/* 0x0.5 - 0x0.5 */
-	u_int8_t pending_server_ac_power_cycle;
-	/* Description - When set, the component supports self activation. For 
+        /* 0x0.5 - 0x0.5 */
+        u_int8_t pending_server_ac_power_cycle;
+        /* Description - When set, the component supports self activation. For
 cables, please refer to activation_type in LINKX_PROP
 ERTIES data for more details. */
-	/* 0x0.6 - 0x0.6 */
-	u_int8_t self_activation;
-};
-
-/* Description -   */
-/* Size in bytes - 124 */
-struct reg_access_hca_mcqi_cap {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Bitmask indicating which info_type(s) are supported 
-for this component. Set bit indicates the property set is 
+        /* 0x0.6 - 0x0.6 */
+        u_int8_t self_activation;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 124 */
+    struct reg_access_hca_mcqi_cap
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Bitmask indicating which info_type(s) are supported
+for this component. Set bit indicates the property set is
 supported
 bit 1: VERSION
 bit 5: ACTIVATION_METHOD
-Other bits are reserved. CAPABILITIES set is always 
+Other bits are reserved. CAPABILITIES set is always
 supported. */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t supported_info_bitmask;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The size of the component given in bytes. Value 0x0 
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t supported_info_bitmask;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The size of the component given in bytes. Value 0x0
 indicates that the size in unknown.
-For some components, size may only be available in 
+For some components, size may only be available in
 the READ_COMPONENT state. */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t component_size;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Maximum size for this component, given in bytes. */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t max_component_size;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Maximal write size for MCDA */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t mcda_max_write_size;
-	/* Description - Log 2 of the access word size in bytes.
-Read and write access must be aligned to the word 
-size. Write access must be done for an integer number 
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t component_size;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Maximum size for this component, given in bytes. */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t max_component_size;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Maximal write size for MCDA */
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t mcda_max_write_size;
+        /* Description - Log 2 of the access word size in bytes.
+Read and write access must be aligned to the word
+size. Write access must be done for an integer number
 of words. */
-	/* 0xc.28 - 0xc.31 */
-	u_int8_t log_mcda_word_size;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The device only accepts updates for this component 
+        /* 0xc.28 - 0xc.31 */
+        u_int8_t log_mcda_word_size;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The device only accepts updates for this component
 that explicitly lists its base MAC and/or base GUID */
-	/* 0x10.26 - 0x10.26 */
-	u_int8_t match_base_guid_mac;
-	/* Description - A user defined timestamp (MVTS) is active for this 
+        /* 0x10.26 - 0x10.26 */
+        u_int8_t match_base_guid_mac;
+        /* Description - A user defined timestamp (MVTS) is active for this
 component. */
-	/* 0x10.27 - 0x10.27 */
-	u_int8_t check_user_timestamp;
-	/* Description - PSID is validated for this component update. */
-	/* 0x10.28 - 0x10.28 */
-	u_int8_t match_psid;
-	/* Description - Chip ID (device_hw_revision) is validated for this com
+        /* 0x10.27 - 0x10.27 */
+        u_int8_t check_user_timestamp;
+        /* Description - PSID is validated for this component update. */
+        /* 0x10.28 - 0x10.28 */
+        u_int8_t match_psid;
+        /* Description - Chip ID (device_hw_revision) is validated for this com
 ponent update. */
-	/* 0x10.29 - 0x10.29 */
-	u_int8_t match_chip_id;
-	/* Description - Only signed components are accepted. */
-	/* 0x10.30 - 0x10.30 */
-	u_int8_t signed_updates_only;
-	/* Description - When set, this components may be read, see 
+        /* 0x10.29 - 0x10.29 */
+        u_int8_t match_chip_id;
+        /* Description - Only signed components are accepted. */
+        /* 0x10.30 - 0x10.30 */
+        u_int8_t signed_updates_only;
+        /* Description - When set, this components may be read, see
 Section 10.3.4, "Read Flow", on page 829. */
-	/* 0x10.31 - 0x10.31 */
-	u_int8_t rd_en;
-};
-
-/* Description -   */
-/* Size in bytes - 124 */
-struct reg_access_hca_mcqi_linkx_properties {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Bit 0: Image A is running
-Bit 1: Image A is committed, module boots from image 
+        /* 0x10.31 - 0x10.31 */
+        u_int8_t rd_en;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 124 */
+    struct reg_access_hca_mcqi_linkx_properties
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Bit 0: Image A is running
+Bit 1: Image A is committed, module boots from image
 A
 Bit 2: Image A is erased / empty
 Bit 3: Reserved
 Bit 4: Image B is running
-Bit 5: Image B is committed, module boots from image 
+Bit 5: Image B is committed, module boots from image
 B
 Bit 6: Image B is erased / empty
 Bit 7: Reserved */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t fw_image_status_bitmap;
-	/* Description - Bit 0: FW image A is present 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t fw_image_status_bitmap;
+        /* Description - Bit 0: FW image A is present
 Bit 1: FW image B is present
 Bit 2: Factory / boot image is present
 Bits 3-7: Reserved */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t fw_image_info_bitmap;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Image A FW minor version */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t image_a_minor;
-	/* Description - Image A FW major version */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t image_a_major;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Image A FW subminor number */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t image_a_subminor;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Image B FW minor version */
-	/* 0xc.0 - 0xc.7 */
-	u_int8_t image_b_minor;
-	/* Description - Image B FW major version */
-	/* 0xc.8 - 0xc.15 */
-	u_int8_t image_b_major;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Image B FW subminor number */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t image_b_subminor;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Factory / boot image FW minor version */
-	/* 0x14.0 - 0x14.7 */
-	u_int8_t factory_image_minor;
-	/* Description - Factory / boot image FW major version */
-	/* 0x14.8 - 0x14.15 */
-	u_int8_t factory_image_major;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Factory / boot image FW subminor number */
-	/* 0x18.0 - 0x18.15 */
-	u_int16_t factory_image_subminor;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - 0: Does not support either one of the FW update proce
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t fw_image_info_bitmap;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Image A FW minor version */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t image_a_minor;
+        /* Description - Image A FW major version */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t image_a_major;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Image A FW subminor number */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t image_a_subminor;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Image B FW minor version */
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t image_b_minor;
+        /* Description - Image B FW major version */
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t image_b_major;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Image B FW subminor number */
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t image_b_subminor;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Factory / boot image FW minor version */
+        /* 0x14.0 - 0x14.7 */
+        u_int8_t factory_image_minor;
+        /* Description - Factory / boot image FW major version */
+        /* 0x14.8 - 0x14.15 */
+        u_int8_t factory_image_major;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Factory / boot image FW subminor number */
+        /* 0x18.0 - 0x18.15 */
+        u_int16_t factory_image_subminor;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - 0: Does not support either one of the FW update proce
 dures defined below
-1: SFF-8636 management interface and pseudo-CMIS 
+1: SFF-8636 management interface and pseudo-CMIS
 FW. Update is supported
 2: CMIS 4.0 is implemented */
-	/* 0x1c.0 - 0x1c.5 */
-	u_int8_t management_interface_protocol;
-	/* Description - 0: HW reset is required. Host should be prepared to 
+        /* 0x1c.0 - 0x1c.5 */
+        u_int8_t management_interface_protocol;
+        /* Description - 0: HW reset is required. Host should be prepared to
 power cycle a cable after sending a RunFWImage com
 mand.
 1: Self-activation with HW reset contained in the RunF
-WImage command. No additional actions required 
+WImage command. No additional actions required
 from the host.
-2:Self-activation with hitless reset contained in the 
-RunFWImage command. No additional actions 
+2:Self-activation with hitless reset contained in the
+RunFWImage command. No additional actions
 required from the host.
 3-15: Reserved */
-	/* 0x1c.10 - 0x1c.13 */
-	u_int8_t activation_type;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - Vendor Serial Number */
-	/* 0x20.0 - 0x20.15 */
-	u_int16_t vendor_sn;
-};
-
-/* Description -   */
-/* Size in bytes - 124 */
-struct reg_access_hca_mcqi_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t version_string_length;
-	/* Description - When set, the component has a valid user-defined ver
+        /* 0x1c.10 - 0x1c.13 */
+        u_int8_t activation_type;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - Vendor Serial Number */
+        /* 0x20.0 - 0x20.15 */
+        u_int16_t vendor_sn;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 124 */
+    struct reg_access_hca_mcqi_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t version_string_length;
+        /* Description - When set, the component has a valid user-defined ver
 sion time-stamp in user_defined_time */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t user_defined_time_valid;
-	/* Description - When set, the component has a valid creation time-
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t user_defined_time_valid;
+        /* Description - When set, the component has a valid creation time-
 stamp in build_time */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t build_time_valid;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Version number */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t version;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Time of component creation. Valid only if build_
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t build_time_valid;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Version number */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t version;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Time of component creation. Valid only if build_
 time_valid is set. See Table 1873, "Date-Time Lay
 out," on page 2336 */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t build_time;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - User-defined time assigned to the component version. 
-Valid only if user_defined_time_valid is set. See 
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t build_time;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - User-defined time assigned to the component version.
+Valid only if user_defined_time_valid is set. See
 Table 1873, "Date-Time Layout," on page 2336 */
-	/* 0x10.0 - 0x14.31 */
-	u_int64_t user_defined_time;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Build tool version number.
+        /* 0x10.0 - 0x14.31 */
+        u_int64_t user_defined_time;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Build tool version number.
 Valid only when not equal to 0 */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t build_tool_version;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - NULL terminated string representing the version. */
-	/* 0x20.24 - 0x7c.23 */
-	u_int8_t version_string[92];
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_packet_drop_mini_flow_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The number of dropped packets when the Miniflow is acti
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t build_tool_version;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - NULL terminated string representing the version. */
+        /* 0x20.24 - 0x7c.23 */
+        u_int8_t version_string[92];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_packet_drop_mini_flow_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The number of dropped packets when the Miniflow is acti
 vated */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t num_packets;
-	/* Description - Physical Port Number
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t num_packets;
+        /* Description - Physical Port Number
 1: port_number1
 2: port_number2
 Other values are reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t port_number;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_pause_tx_stop_toggle_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - bitmap per Virtual Lane/Traffic Class
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t port_number;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_pause_tx_stop_toggle_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - bitmap per Virtual Lane/Traffic Class
 bit 0: SL_PRIO_0
 bit 1: SL_PRIO_1
 bit 2: SL_PRIO_2
@@ -439,36 +452,38 @@ bit 5: SL_PRIO_5
 bit 6: SL_PRIO_6
 bit 7: SL_PRIO_7
 Other bits are reserved */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t sl_prio_mask;
-	/* Description - Physical Port Number
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t sl_prio_mask;
+        /* Description - Physical Port Number
 1: port_number1
 2: port_number2
 Other values are reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t port_number;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct reg_access_hca_rom_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Build version */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t build;
-	/* Description - Minor version */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t minor;
-	/* Description - Major version */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t major;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_rxb_hang_stop_toggle_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - bitmap per Virtual Lane/Traffic Class
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t port_number;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct reg_access_hca_rom_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Build version */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t build;
+        /* Description - Minor version */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t minor;
+        /* Description - Major version */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t major;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_rxb_hang_stop_toggle_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - bitmap per Virtual Lane/Traffic Class
 bit 0: VL_TC_0
 bit 1: VL_TC_1
 bit 2: VL_TC_2
@@ -479,21 +494,22 @@ bit 6: VL_TC_6
 bit 7: VL_TC_7
 bit 15: VL_TC_15
 Other bits are reserved */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t vl_tc_mask;
-	/* Description - Physical Port Number
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t vl_tc_mask;
+        /* Description - Physical Port Number
 1: port_number1
 2: port_number2
 Other values are reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t port_number;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_rxp_hang_stop_toggle_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - bitmap per Virtual Lane/Traffic Class
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t port_number;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_rxp_hang_stop_toggle_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - bitmap per Virtual Lane/Traffic Class
 bit 0: VL_TC_0
 bit 1: VL_TC_1
 bit 2: VL_TC_2
@@ -504,109 +520,114 @@ bit 6: VL_TC_6
 bit 7: VL_TC_7
 bit 15: VL_TC_15
 Other bits are reserved */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t vl_tc_mask;
-	/* Description - Port number access type. must be set to 0x2  */
-	/* 0x0.16 - 0x0.17 */
-	u_int8_t pnat;
-	/* Description - Physical Port Number
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t vl_tc_mask;
+        /* Description - Port number access type. must be set to 0x2  */
+        /* 0x0.16 - 0x0.17 */
+        u_int8_t pnat;
+        /* Description - Physical Port Number
 1: port_number1
 2: port_number2
 Other values are reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t port_number;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_sxp_hang_stop_toggle_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Physical Port Number
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t port_number;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_sxp_hang_stop_toggle_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Physical Port Number
 1: port_number1
 2: port_number2
 Other values are reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t port_number;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct reg_access_hca_diagnostic_cntr_layout {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Diagnostic counter identifier. */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t counter_id;
-	/* Description - The counter might be used as Synced Start Diagnostics 
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t port_number;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct reg_access_hca_diagnostic_cntr_layout
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Diagnostic counter identifier. */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t counter_id;
+        /* Description - The counter might be used as Synced Start Diagnostics
 Counters */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t sync;
-};
-
-/* Description -   */
-/* Size in bytes - 124 */
-union reg_access_hca_mcqi_reg_data_auto {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_cap mcqi_cap;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_version mcqi_version;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_activation_method mcqi_activation_method;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_linkx_properties mcqi_linkx_properties;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct reg_access_hca_mgir_dev_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - [Internal]: The tag for the dev branch should be <fea
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t sync;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 124 */
+    union reg_access_hca_mcqi_reg_data_auto
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_cap mcqi_cap;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_version mcqi_version;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_activation_method mcqi_activation_method;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_linkx_properties mcqi_linkx_properties;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct reg_access_hca_mgir_dev_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - [Internal]: The tag for the dev branch should be <fea
 ture>_YYYY.
 The format of the string represented by ASCII. */
-	/* 0x0.24 - 0x1c.23 */
-	u_int8_t dev_branch_tag[28];
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct reg_access_hca_mgir_fw_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Sub-minor firmware version number.
-Deprecated and returns '0'. 
+        /* 0x0.24 - 0x1c.23 */
+        u_int8_t dev_branch_tag[28];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct reg_access_hca_mgir_fw_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Sub-minor firmware version number.
+Deprecated and returns '0'.
 Refer to extended_sub_minor. */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t sub_minor;
-	/* Description - Minor firmware version number.
-Deprecated and returns '0'. 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t sub_minor;
+        /* Description - Minor firmware version number.
+Deprecated and returns '0'.
 Refer to extended_minor. */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t minor;
-	/* Description - Major firmware version number.
-Deprecated and returns '0'. 
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t minor;
+        /* Description - Major firmware version number.
+Deprecated and returns '0'.
 Refer to extended_major. */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t major;
-	/* Description - When set, the device is running firmware with 
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t major;
+        /* Description - When set, the device is running firmware with
 secure-firmware updates capabilities. */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t secured;
-	/* Description - When set the device is running a signed FW binaries. */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t signed_fw;
-	/* Description - When set, the device is running a debug firmware. 
-'debug' binary can only be installed on specific 
-devices (identified by their 'Factory base MAC'), 
-which currently run a specific firmware version. 
-These restrictions are expressed by a signed 'debug' 
-token that must be loaded to the device before 
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t secured;
+        /* Description - When set the device is running a signed FW binaries. */
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t signed_fw;
+        /* Description - When set, the device is running a debug firmware.
+'debug' binary can only be installed on specific
+devices (identified by their 'Factory base MAC'),
+which currently run a specific firmware version.
+These restrictions are expressed by a signed 'debug'
+token that must be loaded to the device before
 installing the debug binary. */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t debug;
-	/* Description - *NOTE* this field has diff meaning for Switch vs. NIC 
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t debug;
+        /* Description - *NOTE* this field has diff meaning for Switch vs. NIC
 
 
 NIC:
@@ -618,121 +639,122 @@ The device is running:
 The device is running:
 0: regular FW branch
 1: development branch */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t dev;
-	/* Description - When set, string-TLV is supported. */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t string_tlv;
-	/* Description - *NOTE* for NICs same as dev field
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t dev;
+        /* Description - When set, string-TLV is supported. */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t string_tlv;
+        /* Description - *NOTE* for NICs same as dev field
 Development-secure:
 The device is running:
 0: a regular-secure firmware version
 1: a development-secure firmware version */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t dev_sc;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Firmware Build ID. Optional. . */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t build_id;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Firmware installation date. 
-
-For example: 3 May 2004 will be coded as Month= 
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t dev_sc;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Firmware Build ID. Optional. . */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t build_id;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Firmware installation date.
+
+For example: 3 May 2004 will be coded as Month=
 0x05, Day= 0x03, and Year= 0x04 */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t year;
-	/* Description - Firmware installation date. 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t year;
+        /* Description - Firmware installation date.
 
-For example: 3 May 2004 will be coded as Month= 
+For example: 3 May 2004 will be coded as Month=
 0x05, Day= 0x03, and Year= 0x04 */
-	/* 0x8.16 - 0x8.23 */
-	u_int8_t day;
-	/* Description - Firmware installation date. 
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t day;
+        /* Description - Firmware installation date.
 
-For example: 3 May 2004 will be coded as Month= 
+For example: 3 May 2004 will be coded as Month=
 0x05, Day= 0x03, and Year= 0x04 */
-	/* 0x8.24 - 0x8.31 */
-	u_int8_t month;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Firmware installation hour.
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t month;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Firmware installation hour.
 For example 17:43 will be coded as 0x1743 */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t hour;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - To be defined later. */
-	/* 0x10.24 - 0x20.23 */
-	u_int8_t psid[16];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - User-configured version number of the current INI 
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t hour;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - To be defined later. */
+        /* 0x10.24 - 0x20.23 */
+        u_int8_t psid[16];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - User-configured version number of the current INI
 file. */
-	/* 0x20.0 - 0x20.31 */
-	u_int32_t ini_file_version;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description - FW version's Major field in extended (32b) format. */
-	/* 0x24.0 - 0x24.31 */
-	u_int32_t extended_major;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description - FW version's Minor field in extended (32b) format. */
-	/* 0x28.0 - 0x28.31 */
-	u_int32_t extended_minor;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description - FW version's SubMinor field in extended (32b) for
+        /* 0x20.0 - 0x20.31 */
+        u_int32_t ini_file_version;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description - FW version's Major field in extended (32b) format. */
+        /* 0x24.0 - 0x24.31 */
+        u_int32_t extended_major;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description - FW version's Minor field in extended (32b) format. */
+        /* 0x28.0 - 0x28.31 */
+        u_int32_t extended_minor;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description - FW version's SubMinor field in extended (32b) for
 mat. */
-	/* 0x2c.0 - 0x2c.31 */
-	u_int32_t extended_sub_minor;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description -  */
-	/* 0x30.0 - 0x30.15 */
-	u_int16_t isfu_major;
-	/* Description - Bitmap representing the disabled tiles in the ASIC. 
-Tile '0' is represented by the msb bit. 
-If a bit is set to '1', the corresponding tile is disabled. 
-The total number of tiles can be derived through 
+        /* 0x2c.0 - 0x2c.31 */
+        u_int32_t extended_sub_minor;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description -  */
+        /* 0x30.0 - 0x30.15 */
+        u_int16_t isfu_major;
+        /* Description - Bitmap representing the disabled tiles in the ASIC.
+Tile '0' is represented by the msb bit.
+If a bit is set to '1', the corresponding tile is disabled.
+The total number of tiles can be derived through
 MGPIR register. */
-	/* 0x30.16 - 0x30.31 */
-	u_int16_t disabled_tiles_bitmap;
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-	/* Description - 0: Production
+        /* 0x30.16 - 0x30.31 */
+        u_int16_t disabled_tiles_bitmap;
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description - 0: Production
 1: GA Secured
 2: GA Non-Secured
 3: RMA */
-	/* 0x34.0 - 0x34.1 */
-	u_int8_t life_cycle;
-	/* Description - 0: Disable
+        /* 0x34.0 - 0x34.1 */
+        u_int8_t life_cycle;
+        /* Description - 0: Disable
 1: Enable */
-	/* 0x34.2 - 0x34.2 */
-	u_int8_t sec_boot;
-	/* Description - 0: Disable
+        /* 0x34.2 - 0x34.2 */
+        u_int8_t sec_boot;
+        /* Description - 0: Disable
 1: Enable */
-	/* 0x34.3 - 0x34.3 */
-	u_int8_t encryption;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_mgir_hardware_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - PCI device ID. */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t device_id;
-	/* Description - SwitchX Devices:
+        /* 0x34.3 - 0x34.3 */
+        u_int8_t encryption;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_mgir_hardware_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - PCI device ID. */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t device_id;
+        /* Description - SwitchX Devices:
 0x00A0: Device step A0, FCC package
 0x00A1: Device step A1, FCC package
 0x00A2: Device step A2, FCC package
 
 Switch-IB Devices:
 0x00A0: Switch-IB device step A0, FCC package
-0x0000 is a valid value for some devices not included 
+0x0000 is a valid value for some devices not included
 in PRM. */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t device_hw_revision;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Process Voltage Scaling
-Supported nominal V_CORE voltage (in 50mV units) 
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t device_hw_revision;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Process Voltage Scaling
+Supported nominal V_CORE voltage (in 50mV units)
 for the device. */
-	/* 0x4.0 - 0x4.4 */
-	u_int8_t pvs;
-	/* Description - Process technology
+        /* 0x4.0 - 0x4.4 */
+        u_int8_t pvs;
+        /* Description - Process technology
 0: N/A
 1: 40nm
 2: 28nm
@@ -740,278 +762,285 @@ for the device. */
 4: 7nm
 5: 5nm
 6-31: Reserved */
-	/* 0x4.11 - 0x4.15 */
-	u_int8_t technology;
-	/* Description - Number of physical port the device supports. */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t num_ports;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The PCI device-ID of the NIC/HCA in recovery (Live
+        /* 0x4.11 - 0x4.15 */
+        u_int8_t technology;
+        /* Description - Number of physical port the device supports. */
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t num_ports;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The PCI device-ID of the NIC/HCA in recovery (Live
 fish) mode. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t hw_dev_id;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - MSB of the "base" MAC address of the NIC that was 
-allocate during manufacturing. The NIC derives the 
-MAC addresses for the different PCI PFs from this 
-MAC address. This parameter can be used as a 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t hw_dev_id;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - MSB of the "base" MAC address of the NIC that was
+allocate during manufacturing. The NIC derives the
+MAC addresses for the different PCI PFs from this
+MAC address. This parameter can be used as a
 canonical unique identifier of the NIC.
-manufacturing_base_mac of value 0 means field is not 
+manufacturing_base_mac of value 0 means field is not
 supported. */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t manufacturing_base_mac_47_32;
-	/* Description - module base index
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t manufacturing_base_mac_47_32;
+        /* Description - module base index
 assiciated_module_id[0] = 32 * module_base */
-	/* 0x10.28 - 0x10.31 */
-	u_int8_t module_base;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - LSB of the "base" MAC address of the NIC that was 
-allocate during manufacturing. The NIC derives the 
-MAC addresses for the different PCI PFs from this 
-MAC address. This parameter can be used as a 
+        /* 0x10.28 - 0x10.31 */
+        u_int8_t module_base;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - LSB of the "base" MAC address of the NIC that was
+allocate during manufacturing. The NIC derives the
+MAC addresses for the different PCI PFs from this
+MAC address. This parameter can be used as a
 canonical unique identifier of the NIC.
-manufacturing_base_mac of value 0 means field is not 
+manufacturing_base_mac of value 0 means field is not
 supported. */
-	/* 0x14.0 - 0x14.31 */
-	u_int32_t manufacturing_base_mac_31_0;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - bitmask of associated module id. For each bit:
+        /* 0x14.0 - 0x14.31 */
+        u_int32_t manufacturing_base_mac_31_0;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - bitmask of associated module id. For each bit:
 0: module is not managed by ASIC
 1: module is managed by ASIC */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t associated_module_id_31_0;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Time (in secs.) since last reset0 */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t uptime;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_mgir_sw_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Sub-minor Driver version number.
- */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t sub_minor;
-	/* Description - Minor Driver version number.
- */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t minor;
-	/* Description - Major Driver version number.
- */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - ROM 3 type:
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t associated_module_id_31_0;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Time (in secs.) since last reset0 */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t uptime;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_mgir_sw_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Sub-minor Driver version number.
+         */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t sub_minor;
+        /* Description - Minor Driver version number.
+         */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t minor;
+        /* Description - Major Driver version number.
+         */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - ROM 3 type:
 0x0: none
 0x1: Flexboot
 0x2: UEFI
 0x3: UEFI-CLP */
-	/* 0x4.0 - 0x4.3 */
-	u_int8_t rom3_type;
-	/* Description - Arch type of ROM 3:
+        /* 0x4.0 - 0x4.3 */
+        u_int8_t rom3_type;
+        /* Description - Arch type of ROM 3:
 0x0: unspecified
 0x1: AMD64 - x86 64bit architecture
 0x2: AARCH64 - ARM Architecture 64 bits
-0x3: AMD64_AARCH64 - ROM code supporting 
+0x3: AMD64_AARCH64 - ROM code supporting
 both AMD64 and AARCH64 architectures
 0x4: IA32 - Intel Architecture 32 bits */
-	/* 0x4.4 - 0x4.7 */
-	u_int8_t rom3_arch;
-	/* Description - ROM 2type:
+        /* 0x4.4 - 0x4.7 */
+        u_int8_t rom3_arch;
+        /* Description - ROM 2type:
 0x0: none
 0x1: Flexboot
 0x2: UEFI
 0x3: UEFI-CLP */
-	/* 0x4.8 - 0x4.11 */
-	u_int8_t rom2_type;
-	/* Description - Arch type of ROM 2:
+        /* 0x4.8 - 0x4.11 */
+        u_int8_t rom2_type;
+        /* Description - Arch type of ROM 2:
 0x0: unspecified
 0x1: AMD64 - x86 64bit architecture
 0x2: AARCH64 - ARM Architecture 64 bits
-0x3: AMD64_AARCH64 - ROM code supporting 
+0x3: AMD64_AARCH64 - ROM code supporting
 both AMD64 and AARCH64 architectures
 0x4: IA32 - Intel Architecture 32 bits */
-	/* 0x4.12 - 0x4.15 */
-	u_int8_t rom2_arch;
-	/* Description - ROM 1type:
+        /* 0x4.12 - 0x4.15 */
+        u_int8_t rom2_arch;
+        /* Description - ROM 1type:
 0x0: none
 0x1: Flexboot
 0x2: UEFI
 0x3: UEFI-CLP */
-	/* 0x4.16 - 0x4.19 */
-	u_int8_t rom1_type;
-	/* Description - Arch type of ROM 1:
+        /* 0x4.16 - 0x4.19 */
+        u_int8_t rom1_type;
+        /* Description - Arch type of ROM 1:
 0x0: unspecified
 0x1: AMD64 - x86 64bit architecture
 0x2: AARCH64 - ARM Architecture 64 bits
-0x3: AMD64_AARCH64 - ROM code supporting 
+0x3: AMD64_AARCH64 - ROM code supporting
 both AMD64 and AARCH64 architectures
 0x4: IA32 - Intel Architecture 32 bits */
-	/* 0x4.20 - 0x4.23 */
-	u_int8_t rom1_arch;
-	/* Description - ROM 0 type:
+        /* 0x4.20 - 0x4.23 */
+        u_int8_t rom1_arch;
+        /* Description - ROM 0 type:
 0x0: none
 0x1: Flexboot
 0x2: UEFI
 0x3: UEFI-CLP */
-	/* 0x4.24 - 0x4.27 */
-	u_int8_t rom0_type;
-	/* Description - Arch type of ROM 0:
+        /* 0x4.24 - 0x4.27 */
+        u_int8_t rom0_type;
+        /* Description - Arch type of ROM 0:
 0x0: unspecified
 0x1: AMD64 - x86 64bit architecture
 0x2: AARCH64 - ARM Architecture 64 bits
-0x3: AMD64_AARCH64 - ROM code supporting 
+0x3: AMD64_AARCH64 - ROM code supporting
 both AMD64 and AARCH64 architectures
 0x4: IA32 - Intel Architecture 32 bits */
-	/* 0x4.28 - 0x4.31 */
-	u_int8_t rom0_arch;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - ROM 0 version. */
-	/* 0x8.0 - 0x8.31 */
-	struct reg_access_hca_rom_version rom0_version;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - ROM 1 version. */
-	/* 0xc.0 - 0xc.31 */
-	struct reg_access_hca_rom_version rom1_version;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - ROM 2version. */
-	/* 0x10.0 - 0x10.31 */
-	struct reg_access_hca_rom_version rom2_version;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - ROM 3 version. */
-	/* 0x14.0 - 0x14.31 */
-	struct reg_access_hca_rom_version rom3_version;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_smbus_failed_fault_inject_modifier {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - SMBUS GW identifier */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t smbus_gw;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct reg_access_hca_string_db_parameters {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Offset of the first string of the section, relative to the entire 
+        /* 0x4.28 - 0x4.31 */
+        u_int8_t rom0_arch;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - ROM 0 version. */
+        /* 0x8.0 - 0x8.31 */
+        struct reg_access_hca_rom_version rom0_version;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - ROM 1 version. */
+        /* 0xc.0 - 0xc.31 */
+        struct reg_access_hca_rom_version rom1_version;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - ROM 2version. */
+        /* 0x10.0 - 0x10.31 */
+        struct reg_access_hca_rom_version rom2_version;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - ROM 3 version. */
+        /* 0x14.0 - 0x14.31 */
+        struct reg_access_hca_rom_version rom3_version;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_smbus_failed_fault_inject_modifier
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - SMBUS GW identifier */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t smbus_gw;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct reg_access_hca_string_db_parameters
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Offset of the first string of the section, relative to the entire
 string data base, given in bytes. */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t string_db_base_address;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Size of string database section, given in bytes */
-	/* 0x4.0 - 0x4.23 */
-	u_int32_t string_db_size;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_irisc_hang_mini_flow_modifier irisc_hang_mini_flow_modifier;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_packet_drop_mini_flow_modifier packet_drop_mini_flow_modifier;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_rxb_hang_stop_toggle_modifier rxb_hang_stop_toggle_modifier;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_lock_source_stop_toggle_modifier lock_source_stop_toggle_modifier;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_sxp_hang_stop_toggle_modifier sxp_hang_stop_toggle_modifier;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_rxp_hang_stop_toggle_modifier rxp_hang_stop_toggle_modifier;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_pause_tx_stop_toggle_modifier pause_tx_stop_toggle_modifier;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct reg_access_hca_debug_cap {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The maximum number of samples that can be stored on 
-the device's sampling buffer is 2^ log_max_samples in 
-counters unit (i.e. 100 will represent the ability to store 
-100 samples of single counter, 50 samples of 2 counters, 
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t string_db_base_address;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Size of string database section, given in bytes */
+        /* 0x4.0 - 0x4.23 */
+        u_int32_t string_db_size;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_irisc_hang_mini_flow_modifier irisc_hang_mini_flow_modifier;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_packet_drop_mini_flow_modifier packet_drop_mini_flow_modifier;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_rxb_hang_stop_toggle_modifier rxb_hang_stop_toggle_modifier;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_lock_source_stop_toggle_modifier lock_source_stop_toggle_modifier;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_sxp_hang_stop_toggle_modifier sxp_hang_stop_toggle_modifier;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_rxp_hang_stop_toggle_modifier rxp_hang_stop_toggle_modifier;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_pause_tx_stop_toggle_modifier pause_tx_stop_toggle_modifier;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct reg_access_hca_debug_cap
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The maximum number of samples that can be stored on
+the device's sampling buffer is 2^ log_max_samples in
+counters unit (i.e. 100 will represent the ability to store
+100 samples of single counter, 50 samples of 2 counters,
 etc). */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t log_max_samples;
-	/* Description - Log(base 2) of the the recommended minimal size of eq to 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t log_max_samples;
+        /* Description - Log(base 2) of the the recommended minimal size of eq to
 handle the resource_dump_event */
-	/* 0x0.16 - 0x0.20 */
-	u_int8_t log_min_resource_dump_eq;
-	/* Description - If set, Resource_dump register is supported.
-See Table 1126, "RESOURCE_DUMP Register Layout," on 
+        /* 0x0.16 - 0x0.20 */
+        u_int8_t log_min_resource_dump_eq;
+        /* Description - If set, Resource_dump register is supported.
+See Table 1126, "RESOURCE_DUMP Register Layout," on
 page 1399 */
-	/* 0x0.22 - 0x0.22 */
-	u_int8_t resource_dump;
-	/* Description - Log(base 2) of the size in granularity of 4KB to be allo
+        /* 0x0.22 - 0x0.22 */
+        u_int8_t resource_dump;
+        /* Description - Log(base 2) of the size in granularity of 4KB to be allo
 cated by host in order to accommodate cr_dump.
 0 means feature is not supported.
-See Table 1124, "CORE_DUMP Register Layout," on 
+See Table 1124, "CORE_DUMP Register Layout," on
 page 1397 */
-	/* 0x0.23 - 0x0.27 */
-	u_int8_t log_cr_dump_to_mem_size;
-	/* Description - If set, Core dump of type of specific QP is supported.
- */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t core_dump_qp;
-	/* Description - If set, Core dump of type "General" is supported. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t core_dump_general;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The minimal sample period is 2^ log_min_smaple_period 
-in device clocks. Clock rate of the device is reported by 
+        /* 0x0.23 - 0x0.27 */
+        u_int8_t log_cr_dump_to_mem_size;
+        /* Description - If set, Core dump of type of specific QP is supported.
+         */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t core_dump_qp;
+        /* Description - If set, Core dump of type "General" is supported. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t core_dump_general;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The minimal sample period is 2^ log_min_smaple_period
+in device clocks. Clock rate of the device is reported by
 HCA_CAP.device_frequency_khz. */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t log_min_sample_period;
-	/* Description - If set, the device supports dumping the diagnostic count
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t log_min_sample_period;
+        /* Description - If set, the device supports dumping the diagnostic count
 ers reports into the tracer buffer. */
-	/* 0x4.28 - 0x4.28 */
-	u_int8_t diag_counter_tracer_dump;
-	/* Description - If set, health monitoring for rx path activity is supported.
+        /* 0x4.28 - 0x4.28 */
+        u_int8_t diag_counter_tracer_dump;
+        /* Description - If set, health monitoring for rx path activity is supported.
 See Section  26.5.1, "RX Path Activity," on page  988 */
-	/* 0x4.29 - 0x4.29 */
-	u_int8_t health_mon_rx_activity;
-	/* Description - Repetitive sampling mode is supported */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t repetitive;
-	/* Description - Single sampling mode is supported */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t single;
-/*---------------- DWORD[16] (Offset 0x40) ----------------*/
-	/* Description - List of counters supported. Number of counters reported 
+        /* 0x4.29 - 0x4.29 */
+        u_int8_t health_mon_rx_activity;
+        /* Description - Repetitive sampling mode is supported */
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t repetitive;
+        /* Description - Single sampling mode is supported */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t single;
+        /*---------------- DWORD[16] (Offset 0x40) ----------------*/
+        /* Description - List of counters supported. Number of counters reported
 by num_of_counters. */
-	/* 0x40.0 - 0x40.31 */
-	struct reg_access_hca_diagnostic_cntr_layout *diagnostic_counter;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_hca_mcc_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Command to be executed by the FSM
+        /* 0x40.0 - 0x40.31 */
+        struct reg_access_hca_diagnostic_cntr_layout* diagnostic_counter;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_hca_mcc_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Command to be executed by the FSM
 0x1: LOCK_UPDATE_HANDLE
-0x2: RELEASE_UPDATE_HANDLE 
+0x2: RELEASE_UPDATE_HANDLE
 0x3: UPDATE_COMPONENT
 0x4: VERIFY_COMPONENT
-0x5: ACTIVATE_COMPONENET 
+0x5: ACTIVATE_COMPONENET
 0x6: ACTIVATE
 0x7: READ_COMPONENT
 0x8: CANCEL
@@ -1021,39 +1050,39 @@ struct reg_access_hca_mcc_reg {
 0xC: DOWNSRTEAM_DEVICE_TRANSFER
 Other values are reserved. Applicable for write opera
 tion only. */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t instruction;
-	/* Description - This is a configuration that delays the activation of the 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t instruction;
+        /* Description - This is a configuration that delays the activation of the
 component in seconds. Relevant only for activate com
 mand.
 This configuration is volatile. */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t activation_delay_sec;
-	/* Description - The number of seconds elapsed since the update_han
-dle owner last issued a command. The time saturates 
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t activation_delay_sec;
+        /* Description - The number of seconds elapsed since the update_han
+dle owner last issued a command. The time saturates
 at 0xFFF. */
-	/* 0x0.16 - 0x0.27 */
-	u_int16_t time_elapsed_since_last_cmd;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Index of the accessed component. Valid for 
-UPDATE_COMPONENT, ACTIVATE_COMPONENET, 
+        /* 0x0.16 - 0x0.27 */
+        u_int16_t time_elapsed_since_last_cmd;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Index of the accessed component. Valid for
+UPDATE_COMPONENT, ACTIVATE_COMPONENET,
 READ_COMPONENT and READ_PENDING_COMPO
 NENT instructions. Otherwise, this field is reserved. */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t component_index;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Token representing the current flow executed by the 
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t component_index;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Token representing the current flow executed by the
 FSM.
-See Section 10.2.1, "Component Update State", on 
+See Section 10.2.1, "Component Update State", on
 page 826. */
-	/* 0x8.0 - 0x8.23 */
-	u_int32_t update_handle;
-	/* Description - Auto-update to all matching downstream devices is 
+        /* 0x8.0 - 0x8.23 */
+        u_int32_t update_handle;
+        /* Description - Auto-update to all matching downstream devices is
 requested. */
-	/* 0x8.31 - 0x8.31 */
-	u_int8_t auto_update;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Current Update FSM state, See Section 10.3.8, "FSM 
+        /* 0x8.31 - 0x8.31 */
+        u_int8_t auto_update;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Current Update FSM state, See Section 10.3.8, "FSM
 States", on page 830
 0x0: IDLE
 0x1: LOCKED
@@ -1066,10 +1095,10 @@ States", on page 830
 0x8: UPLOAD_PENDING
 0x9: DOWNSRTEAM_DEVICE_TRANSFER
 Other values are reserved */
-	/* 0xc.0 - 0xc.3 */
-	u_int8_t control_state;
-	/* Description - Indicates the successful completion of the instruction, 
-or the reason it failed. See Section 10.3.7, "Error 
+        /* 0xc.0 - 0xc.3 */
+        u_int8_t control_state;
+        /* Description - Indicates the successful completion of the instruction,
+or the reason it failed. See Section 10.3.7, "Error
 Handling", on page 829
 0x0: OK
 0x1: ERROR
@@ -1091,173 +1120,176 @@ Handling", on page 829
 0x11: REJECTED_REBURN_RUNNING_AND_RETRY
 0x12: REJECTED_LINKX_TYPE_NOT_SUPPORTED
 0x13: REJECTED_HOST_STORAGE_IN_USE
-0x14: REJECTED_LINKX_TRANSFER (see module 
+0x14: REJECTED_LINKX_TRANSFER (see module
 index in rejected_device_index)
-0x15: REJECTED_LINKX_ACTIVATE (see module index 
+0x15: REJECTED_LINKX_ACTIVATE (see module index
 in rejected_device_index)
 0x16: REJECTED_TOKEN_ALREADY_APPLIED
 Other values should be treated as an unknown error. */
-	/* 0xc.8 - 0xc.15 */
-	u_int8_t error_code;
-	/* Description - Indicates the estimated progress status of the current 
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t error_code;
+        /* Description - Indicates the estimated progress status of the current
 operation executed by the FSM. Valid values are 0..100.
-101 indicates that progress reporting is not supported 
+101 indicates that progress reporting is not supported
 for this update state. */
-	/* 0xc.16 - 0xc.22 */
-	u_int8_t control_progress;
-	/* Description - For handle_owner_type BMC, command-interface and 
-ICMD, indicates the identifier of the host of the handle 
+        /* 0xc.16 - 0xc.22 */
+        u_int8_t control_progress;
+        /* Description - For handle_owner_type BMC, command-interface and
+ICMD, indicates the identifier of the host of the handle
 owner.
 Otherwise reserved */
-	/* 0xc.24 - 0xc.27 */
-	u_int8_t handle_owner_host_id;
-	/* Description - Type of entity holding the update handle:
+        /* 0xc.24 - 0xc.27 */
+        u_int8_t handle_owner_host_id;
+        /* Description - Type of entity holding the update handle:
 0x0: unspecified
 0x1: Chassis BMC
 0x2: MAD
 0x3: BMC
 0x4: command interface
-0x5: ICMD 
+0x5: ICMD
 Other values are reserved. */
-	/* 0xc.28 - 0xc.31 */
-	u_int8_t handle_owner_type;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Component size in bytes. 
-Valid for UPDATE_COMPONENT instruction. Specifying 
+        /* 0xc.28 - 0xc.31 */
+        u_int8_t handle_owner_type;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Component size in bytes.
+Valid for UPDATE_COMPONENT instruction. Specifying
 the size may shorten the update time.
 Value 0x0 means that size is unspecified. */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t component_size;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Peripheral device type:
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t component_size;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Peripheral device type:
 0: Switch_or_NIC
 1: Gearbox */
-	/* 0x14.0 - 0x14.7 */
-	u_int8_t device_type;
-	/* Description - Device number.
-For gearboxes, the index represents the gearbox die. 
-For cables, the index represents the module index 
+        /* 0x14.0 - 0x14.7 */
+        u_int8_t device_type;
+        /* Description - Device number.
+For gearboxes, the index represents the gearbox die.
+For cables, the index represents the module index
 starting at index 1. Index 0 indicates the host device. */
-	/* 0x14.16 - 0x14.27 */
-	u_int16_t device_index;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - In multiple downstream devices action, the action will 
-be executed starting on device_index and ending on 
+        /* 0x14.16 - 0x14.27 */
+        u_int16_t device_index;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - In multiple downstream devices action, the action will
+be executed starting on device_index and ending on
 device_index + device_index_size - 1. */
-	/* 0x18.0 - 0x18.11 */
-	u_int16_t device_index_size;
-	/* Description - The device index that the action has been rejected to. */
-	/* 0x18.16 - 0x18.27 */
-	u_int16_t rejected_device_index;
-};
-
-/* Description -   */
-/* Size in bytes - 144 */
-struct reg_access_hca_mcda_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Update handle registered when the FSM was activated. */
-	/* 0x0.0 - 0x0.23 */
-	u_int32_t update_handle;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Offset of accessed address relative to component start. 
+        /* 0x18.0 - 0x18.11 */
+        u_int16_t device_index_size;
+        /* Description - The device index that the action has been rejected to. */
+        /* 0x18.16 - 0x18.27 */
+        u_int16_t rejected_device_index;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 144 */
+    struct reg_access_hca_mcda_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Update handle registered when the FSM was activated. */
+        /* 0x0.0 - 0x0.23 */
+        u_int32_t update_handle;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Offset of accessed address relative to component start.
 Accesses must be in accordance to log_mcda_word_
 size in Table 1869, "MCQI CAPABILITIES Info Lay
 out," on page 2333 */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t offset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Size of the data accessed, given in bytes */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t size;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Data block accessed */
-	/* 0x10.0 - 0x8c.31 */
-	u_int32_t data[32];
-};
-
-/* Description -   */
-/* Size in bytes - 148 */
-struct reg_access_hca_mcqi_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Component index gathered by "MCQS - Management 
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t offset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Size of the data accessed, given in bytes */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t size;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Data block accessed */
+        /* 0x10.0 - 0x8c.31 */
+        u_int32_t data[32];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 148 */
+    struct reg_access_hca_mcqi_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Component index gathered by "MCQS - Management
 Component Query Status" */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t component_index;
-	/* Description - Device number.
-For gearboxes, the index represents the gearbox die. 
-For cables, the index represents the module index 
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t component_index;
+        /* Description - Device number.
+For gearboxes, the index represents the gearbox die.
+For cables, the index represents the module index
 starting at index 1. Index 0 indicates the host device. */
-	/* 0x0.16 - 0x0.27 */
-	u_int16_t device_index;
-	/* Description - When set, the register will return information about 
+        /* 0x0.16 - 0x0.27 */
+        u_int16_t device_index;
+        /* Description - When set, the register will return information about
 the pending component (if available) */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t read_pending_component;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Peripheral device type:
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t read_pending_component;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Peripheral device type:
 0: Switch / NIC
 1: Gearbox */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t device_type;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Component properties set.
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t device_type;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Component properties set.
 0x0: CAPABILITIES
 0x1: VERSION
 0x5: ACTIVATION_METHOD
 0x6: LINKX_PROPERTIES
 Other values are reserved */
-	/* 0x8.0 - 0x8.4 */
-	u_int8_t info_type;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Properties set structure size, given in bytes. */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t info_size;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The requested/returned data offset from the section 
+        /* 0x8.0 - 0x8.4 */
+        u_int8_t info_type;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Properties set structure size, given in bytes. */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t info_size;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The requested/returned data offset from the section
 start, given in bytes.
 Must be DWORD aligned. */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t offset;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - The requested/returned data size, given in bytes.
-If data_size is not DWORD aligned, the last bytes are 
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t offset;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - The requested/returned data size, given in bytes.
+If data_size is not DWORD aligned, the last bytes are
 zero padded. */
-	/* 0x14.0 - 0x14.15 */
-	u_int16_t data_size;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Properties set structure according to info_type.
+        /* 0x14.0 - 0x14.15 */
+        u_int16_t data_size;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Properties set structure according to info_type.
 CAPABILITIES - See Table 1869, "MCQI CAPABILI
 TIES Info Layout," on page 2333
-VERSION - See Table 1871, "MCQI VERSION Info 
+VERSION - See Table 1871, "MCQI VERSION Info
 Layout," on page 2335
-ACTIVATION_METHOD - See Table 1875, "MCQI 
+ACTIVATION_METHOD - See Table 1875, "MCQI
 ACTIVATION_METHOD Info Layout," on page 2337
-LINKX_PREPERTIES - See Table 1877, "MCQI 
+LINKX_PREPERTIES - See Table 1877, "MCQI
 LINKX_PROPERTIES Info Layout," on page 2338 */
-	/* 0x18.0 - 0x90.31 */
-	union reg_access_hca_mcqi_reg_data_auto data;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct reg_access_hca_mcqs_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Component Index. Values range from 1 to the last 
+        /* 0x18.0 - 0x90.31 */
+        union reg_access_hca_mcqi_reg_data_auto data;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct reg_access_hca_mcqs_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Component Index. Values range from 1 to the last
 component indicated by last_index_flag. */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t component_index;
-	/* Description - Device number.
-For gearboxes, the index represents the gearbox die. 
-For cables, the index represents the module index 
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t component_index;
+        /* Description - Device number.
+For gearboxes, the index represents the gearbox die.
+For cables, the index represents the module index
 starting at index 1. Index 0 indicates the host device. */
-	/* 0x0.16 - 0x0.27 */
-	u_int16_t device_index;
-	/* Description - When set, this component is the last component (high
+        /* 0x0.16 - 0x0.27 */
+        u_int16_t device_index;
+        /* Description - When set, this component is the last component (high
 est component_index). */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t last_index_flag;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - This field uniquely identifies a specific component type. 
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t last_index_flag;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - This field uniquely identifies a specific component type.
 0x1: BOOT_IMG
 0x4: OEM_NVCONFIG
 0x5: MLNX_NVCONFIG
@@ -1270,50 +1302,50 @@ est component_index). */
 0xE: RMCS_TOKEN
 0xF: RMDT_TOKEN
 Other values are reserved */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t identifier;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Component state in update flow, see Section 10.2.1, 
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t identifier;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Component state in update flow, see Section 10.2.1,
 "Component Update State", on page 826:
 0x0: IDLE
 0x1: IN_PROGRESS
 0x2: APPLIED
-0x3: ACTIVE 
+0x3: ACTIVE
 0x4: ACTIVE_PENDING_RESET
 0x5: FAILED
 0x6: CANCELED
 0x7: BUSY
 
 Other values are reserved */
-	/* 0x8.0 - 0x8.3 */
-	u_int8_t component_update_state;
-	/* Description - The status of the component:
-0x0: NOT_PRESENT - The component is supported by 
+        /* 0x8.0 - 0x8.3 */
+        u_int8_t component_update_state;
+        /* Description - The status of the component:
+0x0: NOT_PRESENT - The component is supported by
 the device but, currently not present
 0x1: PRESENT - This component is present. For down
 stream devices link LinkX component, this is an indica
-tion that the binary image is present at the host device 
+tion that the binary image is present at the host device
 memory.
-0x2: IN_USE - The component is present and currently 
+0x2: IN_USE - The component is present and currently
 in use. */
-	/* 0x8.4 - 0x8.8 */
-	u_int8_t component_status;
-	/* Description - Progress in percentage (from 0 to 100). This field is 
+        /* 0x8.4 - 0x8.8 */
+        u_int8_t component_status;
+        /* Description - Progress in percentage (from 0 to 100). This field is
 only relevant for cables. */
-	/* 0x8.9 - 0x8.15 */
-	u_int8_t progress;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Peripheral device type:
+        /* 0x8.9 - 0x8.15 */
+        u_int8_t progress;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Peripheral device type:
 0: Switch_or_NIC
 1: Gearbox */
-	/* 0xc.0 - 0xc.7 */
-	u_int8_t device_type;
-	/* Description - For last_update_state_changer_type BMC, command-
-interface and ICMD, indicates the identifier of the host 
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t device_type;
+        /* Description - For last_update_state_changer_type BMC, command-
+interface and ICMD, indicates the identifier of the host
 of the handle owner. Otherwise reserved. */
-	/* 0xc.24 - 0xc.27 */
-	u_int8_t last_update_state_changer_host_id;
-	/* Description - Indicates which entity was the last to change the com
+        /* 0xc.24 - 0xc.27 */
+        u_int8_t last_update_state_changer_host_id;
+        /* Description - Indicates which entity was the last to change the com
 ponent_update_state of this component.
 0x0: unspecified
 0x1: Chassis_BMC
@@ -1323,287 +1355,294 @@ ponent_update_state of this component.
 0x5: ICMD
 
 Other values are reserved */
-	/* 0xc.28 - 0xc.31 */
-	u_int8_t last_update_state_changer_type;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct reg_access_hca_mfrl_reg_ext {
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The firmware reset trigger. 
+        /* 0xc.28 - 0xc.31 */
+        u_int8_t last_update_state_changer_type;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct reg_access_hca_mfrl_reg_ext
+    {
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The firmware reset trigger.
 Only a single bit may be set.
 Bit 0: TRIGGER0 (live-patch)
 Bit 3: TRIGGER3 (PCIe link toggle)
 Bit 6: TRIGGER6 (PERST)
 Other bits are reserved. */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t reset_trigger;
-	/* Description - Each bit represents a chip reset type.
-If set to '1', the reset is supported. 
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t reset_trigger;
+        /* Description - Each bit represents a chip reset type.
+If set to '1', the reset is supported.
 Bit 0: Full chip reset
 Bit 1: Keep network port active during reset
  */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t reset_type;
-	/* Description - The requested reset type. */
-	/* 0x4.24 - 0x4.26 */
-	u_int8_t rst_type_sel;
-	/* Description - Response of the driver for the reset request.
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t reset_type;
+        /* Description - The requested reset type. */
+        /* 0x4.24 - 0x4.26 */
+        u_int8_t rst_type_sel;
+        /* Description - Response of the driver for the reset request.
 1: Acknowledgment
 2: Dis-acknowledgment
 3: Reserved */
-	/* 0x4.27 - 0x4.28 */
-	u_int8_t pci_sync_for_fw_update_resp;
-	/* Description - Setting this bit to '1' will request a synced driver flow and '0' 
+        /* 0x4.27 - 0x4.28 */
+        u_int8_t pci_sync_for_fw_update_resp;
+        /* Description - Setting this bit to '1' will request a synced driver flow and '0'
 for the legacy flow.
-Synced driver flow will not require to issue MFRL command 
+Synced driver flow will not require to issue MFRL command
 from other hosts (x86 / ARM for SoC) */
-	/* 0x4.29 - 0x4.29 */
-	u_int8_t pci_sync_for_fw_update_start;
-};
-
-/* Description -   */
-/* Size in bytes - 48 */
-struct reg_access_hca_mfsv_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - When this bit is set, it indicates that it is allowed for the boot 
-FW to program the FW security version related EFUSEs if 
-needed. This bit is not relevant in case the FW operates in an 
-automatically EFUSEs programming approach (set in the INI 
-file). Once set to 1, this configuration will be relevant only for 
-the upcoming boot, thus this configuration will be set back to 
-0 upon next boot. In addition, once this bit was set to 1 there 
-is no option to clear it. option to clear it. In addition, once this 
+        /* 0x4.29 - 0x4.29 */
+        u_int8_t pci_sync_for_fw_update_start;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 48 */
+    struct reg_access_hca_mfsv_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - When this bit is set, it indicates that it is allowed for the boot
+FW to program the FW security version related EFUSEs if
+needed. This bit is not relevant in case the FW operates in an
+automatically EFUSEs programming approach (set in the INI
+file). Once set to 1, this configuration will be relevant only for
+the upcoming boot, thus this configuration will be set back to
+0 upon next boot. In addition, once this bit was set to 1 there
+is no option to clear it. option to clear it. In addition, once this
 bit was set to 1, there is no option to clear it. */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t efuses_prog_en;
-	/* Description - Firmware security version status.
-0: EFUSEs value is equal to the currently running FW image 
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t efuses_prog_en;
+        /* Description - Firmware security version status.
+0: EFUSEs value is equal to the currently running FW image
 value. No change is needed.
-1: EFUSEs value is smaller than the currently running FW 
+1: EFUSEs value is smaller than the currently running FW
 image value. An update to the EFUSEs is required.
 2-3: Reserved */
-	/* 0x0.1 - 0x0.2 */
-	u_int8_t fw_sec_ver_stat;
-	/* Description - EFUSEs programming method.
-0: manually. Upon boot, if FW indicates that 
-FW_sec_ver_stat is 1 and only if EFUSEs_prog_en is 1, it will 
+        /* 0x0.1 - 0x0.2 */
+        u_int8_t fw_sec_ver_stat;
+        /* Description - EFUSEs programming method.
+0: manually. Upon boot, if FW indicates that
+FW_sec_ver_stat is 1 and only if EFUSEs_prog_en is 1, it will
 program the EFUSEs as needed.
-1: automatically. Upon boot, if FW indicates that 
+1: automatically. Upon boot, if FW indicates that
 FW_sec_ver_stat is 1, it will program the EFUSEs as needed. */
-	/* 0x0.3 - 0x0.3 */
-	u_int8_t efuses_prog_method;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Image security version value */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t img_sec_ver;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - EFUSEs security version value */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t efuses_sec_ver;
-};
-
-/* Description -   */
-/* Size in bytes - 160 */
-struct reg_access_hca_mgir {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Hardware Information, see Table 1758, "Hardware Info 
+        /* 0x0.3 - 0x0.3 */
+        u_int8_t efuses_prog_method;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Image security version value */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t img_sec_ver;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - EFUSEs security version value */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t efuses_sec_ver;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 160 */
+    struct reg_access_hca_mgir
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Hardware Information, see Table 1758, "Hardware Info
 Layout," on page 2250 */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_mgir_hardware_info hw_info;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - Firmware Information, see Table 1760, "Firmware Info 
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_mgir_hardware_info hw_info;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - Firmware Information, see Table 1760, "Firmware Info
 Layout," on page 2252 */
-	/* 0x20.0 - 0x5c.31 */
-	struct reg_access_hca_mgir_fw_info fw_info;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description - Software Information, see Table 1762, "Software Info Lay
+        /* 0x20.0 - 0x5c.31 */
+        struct reg_access_hca_mgir_fw_info fw_info;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description - Software Information, see Table 1762, "Software Info Lay
 out," on page 2255
 This field indicates the oldest software version compati
 ble with the current firmware */
-	/* 0x60.0 - 0x7c.31 */
-	struct reg_access_hca_mgir_sw_info sw_info;
-/*---------------- DWORD[32] (Offset 0x80) ----------------*/
-	/* Description -  */
-	/* 0x80.0 - 0x98.31 */
-	struct reg_access_hca_mgir_dev_info dev_info;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct reg_access_hca_mmdio {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0 - NOP
+        /* 0x60.0 - 0x7c.31 */
+        struct reg_access_hca_mgir_sw_info sw_info;
+        /*---------------- DWORD[32] (Offset 0x80) ----------------*/
+        /* Description -  */
+        /* 0x80.0 - 0x98.31 */
+        struct reg_access_hca_mgir_dev_info dev_info;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct reg_access_hca_mmdio
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0 - NOP
 1 - Address (reserved for Clause 22)
 2 - Read
 3 - Write
 4 - Post Read Increment Address (reserved for Clause 22)
-6 - Address + Read - Generates Address cycle and then 
+6 - Address + Read - Generates Address cycle and then
 Read cycle in Clause 45 (reserved for Clause 22)
-7 - Address + Write - Generates Address cycle and then 
+7 - Address + Write - Generates Address cycle and then
 Write cycle in Clause 45 (reserved for Clause 22) */
-	/* 0x0.0 - 0x0.2 */
-	u_int8_t operation;
-	/* Description - MDIO Definition:
+        /* 0x0.0 - 0x0.2 */
+        u_int8_t operation;
+        /* Description - MDIO Definition:
 0 - Clause 22
 1 - Clause 45 */
-	/* 0x0.8 - 0x0.9 */
-	u_int8_t clause;
-	/* Description - Selection of the MDIO interface */
-	/* 0x0.16 - 0x0.19 */
-	u_int8_t mdio_index;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Reg Address (Clause 22) / Dev Type (Clause 45) */
-	/* 0x4.0 - 0x4.4 */
-	u_int8_t reg_adr;
-	/* Description - PHY Address (PHYAD) */
-	/* 0x4.8 - 0x4.12 */
-	u_int8_t phy_adr;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Data (Clause 22) / Address/Data (Clause 45) */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t data;
-	/* Description - Address (Clause 45)
-This field is only valid for Address + Read and Address + 
-Write operations, providing the address. For other Clause 45 
+        /* 0x0.8 - 0x0.9 */
+        u_int8_t clause;
+        /* Description - Selection of the MDIO interface */
+        /* 0x0.16 - 0x0.19 */
+        u_int8_t mdio_index;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Reg Address (Clause 22) / Dev Type (Clause 45) */
+        /* 0x4.0 - 0x4.4 */
+        u_int8_t reg_adr;
+        /* Description - PHY Address (PHYAD) */
+        /* 0x4.8 - 0x4.12 */
+        u_int8_t phy_adr;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Data (Clause 22) / Address/Data (Clause 45) */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t data;
+        /* Description - Address (Clause 45)
+This field is only valid for Address + Read and Address +
+Write operations, providing the address. For other Clause 45
 operations the data field provides the address when appro
 priate. */
-	/* 0x8.16 - 0x8.31 */
-	u_int16_t address;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct reg_access_hca_mpcir_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set to '01', activates the flow of preparation for FW ISSU, on 
-all services. The values in op-codes for "per-service" are 
+        /* 0x8.16 - 0x8.31 */
+        u_int16_t address;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct reg_access_hca_mpcir_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set to '01', activates the flow of preparation for FW ISSU, on
+all services. The values in op-codes for "per-service" are
 ignored.
-If set to '10', returns to operational state on all services. The 
+If set to '10', returns to operational state on all services. The
 values in op-codes for "per-service" are ignored.
 11 - Reserved */
-	/* 0x0.30 - 0x0.31 */
-	u_int8_t all;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - For each of the services, the following operations are avail
+        /* 0x0.30 - 0x0.31 */
+        u_int8_t all;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - For each of the services, the following operations are avail
 able:
 0: N/A (no action)
-1: start preparation flow for FW ISSU 
+1: start preparation flow for FW ISSU
 2: return to operational service (end of FW ISSU flow)
 3: get status
 
 When set to '3', the current status will appear in correspond
 ing _stat fields. */
-	/* 0x4.0 - 0x4.1 */
-	u_int8_t ports;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Status for each of the services. 
-0: not in FW ISSU flow state (FW ISSU flow is not initiated) 
+        /* 0x4.0 - 0x4.1 */
+        u_int8_t ports;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Status for each of the services.
+0: not in FW ISSU flow state (FW ISSU flow is not initiated)
 1: done with preparations for FW ISSU flow
-2: Preparation for FW ISSU flow started but FW still not done 
-service handling [Internal]: busy with some other critical 
+2: Preparation for FW ISSU flow started but FW still not done
+service handling [Internal]: busy with some other critical
 flow).
-For not implemented services on a particular system, the 
+For not implemented services on a particular system, the
 status should be '1'. */
-	/* 0xc.0 - 0xc.1 */
-	u_int8_t ports_stat;
-};
-
-/* Description -   */
-/* Size in bytes - 44 */
-struct reg_access_hca_mpegc_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - the node within each depth. */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t node;
-	/* Description - PCIe index number (Internal domain index)
+        /* 0xc.0 - 0xc.1 */
+        u_int8_t ports_stat;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 44 */
+    struct reg_access_hca_mpegc_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - the node within each depth. */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t node;
+        /* Description - PCIe index number (Internal domain index)
 Reserved when access is from the host */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t pcie_index;
-	/* Description - depth level of the DUT of some hierarchy */
-	/* 0x0.24 - 0x0.29 */
-	u_int8_t depth;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Field select indicated which writable fields to modify.
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t pcie_index;
+        /* Description - depth level of the DUT of some hierarchy */
+        /* 0x0.24 - 0x0.29 */
+        u_int8_t depth;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Field select indicated which writable fields to modify.
 Bit 0: tx_lossy_overflow_oper
 Bit 1 : outbound_stalled_reads_th
 Bit 2 :outbound_stalled_writes_th
 Bit 3 : tx_overflow_sense
 Bit 4 : mark_tx_action_cqe
 Bit 5 : mark_tx_action_cnp
-Bit 6: virtual_hot_plug_unplug (supported only for internal 
+Bit 6: virtual_hot_plug_unplug (supported only for internal
 host) */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t field_select;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - When overflow encountered for lossy packets, it will be 
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t field_select;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - When overflow encountered for lossy packets, it will be
 dropped or marked and will be counted in "tx_over
 flow_buffer_dropped_pkt" or "tx_over
 flow_buffer_marked_pkt" counter.
 00 - Disabled
-01 - drop - overflow traffic will be dropped.  
-10 - mark - overflow traffic will be marked in the CE field in the 
-CqE.  Supported only when MCAM.mark_tx_action_cqe or 
-MCAM.mark_tx_action_cnp are '1'. 
+01 - drop - overflow traffic will be dropped.
+10 - mark - overflow traffic will be marked in the CE field in the
+CqE.  Supported only when MCAM.mark_tx_action_cqe or
+MCAM.mark_tx_action_cnp are '1'.
  */
-	/* 0x8.0 - 0x8.1 */
-	u_int8_t tx_lossy_overflow_oper;
-	/* Description - When this bit is set, the marking action will be generating a 
+        /* 0x8.0 - 0x8.1 */
+        u_int8_t tx_lossy_overflow_oper;
+        /* Description - When this bit is set, the marking action will be generating a
 CNP for RoCE traffic. Supported only when MCAM.mark_tx
 _action_cnp is '1'. */
-	/* 0x8.29 - 0x8.29 */
-	u_int8_t mark_cnp;
-	/* Description - When this bit is set, the marking action will be set in the CqE 
+        /* 0x8.29 - 0x8.29 */
+        u_int8_t mark_cnp;
+        /* Description - When this bit is set, the marking action will be set in the CqE
 for TCP traffic. Supported only when MCAM.mark_tx_ac
 tion_cqe is '1'. */
-	/* 0x8.30 - 0x8.30 */
-	u_int8_t mark_cqe;
-	/* Description - Set the sensibility level of the tx overflow mechanism. 
+        /* 0x8.30 - 0x8.30 */
+        u_int8_t mark_cqe;
+        /* Description - Set the sensibility level of the tx overflow mechanism.
 0 - Aggressive 1 - Dynamic adjustment. When tx_lossy_over
-flow_oper is disabled, tx_overflow_sense must be disabled. 
+flow_oper is disabled, tx_overflow_sense must be disabled.
 Supported only when MCAM.dynamic_tx_oveflow is '1'. */
-	/* 0x8.31 - 0x8.31 */
-	u_int8_t tx_overflow_sense;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Each time that the counter outbound_stalled_writes will 
+        /* 0x8.31 - 0x8.31 */
+        u_int8_t tx_overflow_sense;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Each time that the counter outbound_stalled_writes will
 exceed this threshold, will be counted in the counter out
 bound_stalled_writes_events - range 0   100. */
-	/* 0xc.0 - 0xc.6 */
-	u_int8_t outbound_stalled_writes_th;
-	/* Description - Each time that the counter outbound_stalled_reads will 
+        /* 0xc.0 - 0xc.6 */
+        u_int8_t outbound_stalled_writes_th;
+        /* Description - Each time that the counter outbound_stalled_reads will
 exceed this threshold, will be counted in the counter out
 bound_stalled_reads_events - range 0   100. */
-	/* 0xc.8 - 0xc.14 */
-	u_int8_t outbound_stalled_reads_th;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Operation to perform
+        /* 0xc.8 - 0xc.14 */
+        u_int8_t outbound_stalled_reads_th;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Operation to perform
 0: Idle - no operation required (default)
 1: Emulate hot removal
 2: Emulate hot insertion
 3-15: Reserved */
-	/* 0x10.16 - 0x10.19 */
-	u_int8_t operation;
-	/* Description - Operation completion status
+        /* 0x10.16 - 0x10.19 */
+        u_int8_t operation;
+        /* Description - Operation completion status
 0: Operation in process
 1: Unplugged
 2: Plugged
 3: Warning - disconnecting an already disconnected bus can
 not be performed
-4: Warning - connecting an already connected bus cannot be 
+4: Warning - connecting an already connected bus cannot be
 performed
-5: Error - unknown bus number or no device installed on 
+5: Error - unknown bus number or no device installed on
 selected bus */
-	/* 0x10.24 - 0x10.31 */
-	u_int8_t status;
-};
-
-/* Description -   */
-/* Size in bytes - 24 */
-struct reg_access_hca_mqis_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Type of information string to be queried:
-0x0: VPD - Read the PCI Vital Product Data capability 
+        /* 0x10.24 - 0x10.31 */
+        u_int8_t status;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 24 */
+    struct reg_access_hca_mqis_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Type of information string to be queried:
+0x0: VPD - Read the PCI Vital Product Data capability
 content.
 0x1: MODEL_NAME
 0x2: MODEL_DESCRIPTION
@@ -1611,346 +1650,352 @@ content.
 0x4: DEVICE_VSD
 0x5: ROM_INFO
 other values are reserved. */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t info_type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Total size of the information string, according to info_
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t info_type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Total size of the information string, according to info_
 type. Value given in bytes. */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t info_length;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Number of bytes requested. The device returns the 
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t info_length;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Number of bytes requested. The device returns the
 number of bytes actually read. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t read_length;
-	/* Description - Offset in bytes of the first byte requested to read. */
-	/* 0x8.16 - 0x8.31 */
-	u_int16_t read_offset;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Information string accessed, according to info_type. If 
-the information is not available, a NULL string is 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t read_length;
+        /* Description - Offset in bytes of the first byte requested to read. */
+        /* 0x8.16 - 0x8.31 */
+        u_int16_t read_offset;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Information string accessed, according to info_type. If
+the information is not available, a NULL string is
 returned. */
-	/* 0x10.24 - 0x18.23 */
-	u_int8_t info_string[8];
-};
-
-/* Description -   */
-/* Size in bytes - 132 */
-struct reg_access_hca_mtrc_cap_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Number of different string sections building the database */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t num_string_db;
-	/* Description - Indicates the version of the tracing mechanism.
-See, Section 24.3.4.1, "Timestamp Event Traces", on 
+        /* 0x10.24 - 0x18.23 */
+        u_int8_t info_string[8];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 132 */
+    struct reg_access_hca_mtrc_cap_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Number of different string sections building the database */
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t num_string_db;
+        /* Description - Indicates the version of the tracing mechanism.
+See, Section 24.3.4.1, "Timestamp Event Traces", on
 page 1321
 0x0: VER_0
 0x1: VER_1
 other values are reserved */
-	/* 0x0.24 - 0x0.25 */
-	u_int8_t trc_ver;
-	/* Description - When set the device supports logging traces to memory */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t trace_to_memory;
-	/* Description - Write 0x1 to register for tracer ownership, write 0x0 to de-
+        /* 0x0.24 - 0x0.25 */
+        u_int8_t trc_ver;
+        /* Description - When set the device supports logging traces to memory */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t trace_to_memory;
+        /* Description - Write 0x1 to register for tracer ownership, write 0x0 to de-
 register.
 Read value 0x1 indicates tracer ownership is granted */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t trace_owner;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The number of consecutive event_id that should be inter
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t trace_owner;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The number of consecutive event_id that should be inter
 preted as a string trace */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t num_string_trace;
-	/* Description - The lowest event_id that should be interpreted as a string 
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t num_string_trace;
+        /* Description - The lowest event_id that should be interpreted as a string
 trace */
-	/* 0x4.24 - 0x4.31 */
-	u_int8_t first_string_trace;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Log 2 of the maximal size of the trace buffer given in units of 
+        /* 0x4.24 - 0x4.31 */
+        u_int8_t first_string_trace;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Log 2 of the maximal size of the trace buffer given in units of
 4KB */
-	/* 0x8.0 - 0x8.7 */
-	u_int8_t log_max_trace_buffer_size;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - String DB section parameters. */
-	/* 0x10.0 - 0x4c.31 */
-	struct reg_access_hca_string_db_parameters string_db_param[8];
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct reg_access_hca_mtrc_stdb_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The number of bytes to read from the String DB. The num
+        /* 0x8.0 - 0x8.7 */
+        u_int8_t log_max_trace_buffer_size;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - String DB section parameters. */
+        /* 0x10.0 - 0x4c.31 */
+        struct reg_access_hca_string_db_parameters string_db_param[8];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct reg_access_hca_mtrc_stdb_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The number of bytes to read from the String DB. The num
 ber of bytes must:
 Be a multiple of 64B
 Not exceed the String DB section (with start_offset)
-Not exceed the limitations defined by the medium carrying the 
+Not exceed the limitations defined by the medium carrying the
 Register. */
-	/* 0x0.0 - 0x0.23 */
-	u_int32_t read_size;
-	/* Description - The section of the String DB being accessed */
-	/* 0x0.28 - 0x0.31 */
-	u_int8_t string_db_index;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The offset in the String DB to read from, given in Bytes. The 
+        /* 0x0.0 - 0x0.23 */
+        u_int32_t read_size;
+        /* Description - The section of the String DB being accessed */
+        /* 0x0.28 - 0x0.31 */
+        u_int8_t string_db_index;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The offset in the String DB to read from, given in Bytes. The
 offset must:
 Be a multiple of 64B
 Not exceed the String DB section (with read_size) */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t start_offset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Strings from the database. The size of this field is defined by 
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t start_offset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Strings from the database. The size of this field is defined by
 read_size */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t *string_db_data;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct reg_access_hca_pcnr_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - When Set, port will override tuning process upon fol
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t* string_db_data;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct reg_access_hca_pcnr_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - When Set, port will override tuning process upon fol
 lowing link-up command (PAOS.admin_status = UP)
 Cleared by FW once PAOS.admin_status = UP com
 mand is set.
 
-The register can be set only when port operational 
-status is UP (PAOS.oper_status=0x1) 
+The register can be set only when port operational
+status is UP (PAOS.oper_status=0x1)
 
-NOTE: if physical environment was changed (i.e. 
-replacement of module, temp change, etc) there is a 
-possibility that link won't be established or will be 
+NOTE: if physical environment was changed (i.e.
+replacement of module, temp change, etc) there is a
+possibility that link won't be established or will be
 established with high BER */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t tuning_override;
-	/* Description - When set, a toggle of the link will force a fast link-up 
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t tuning_override;
+        /* Description - When set, a toggle of the link will force a fast link-up
 flow and no reset of the chip will be needed. The pur
 pose of that feature is for debug. */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t force_fast_link_up;
-	/* Description - Local port number [9:8] */
-	/* 0x0.12 - 0x0.13 */
-	u_int8_t lp_msb;
-	/* Description - Local port number. */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t local_port;
-	/* Description - 0 - Ready
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t force_fast_link_up;
+        /* Description - Local port number [9:8] */
+        /* 0x0.12 - 0x0.13 */
+        u_int8_t lp_msb;
+        /* Description - Local port number. */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t local_port;
+        /* Description - 0 - Ready
 1 - Phy characteristics store flow in progress */
-	/* 0x0.28 - 0x0.31 */
-	u_int8_t status;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - When Set, The port will keep the same phy setting 
-upon link down event that occurs only upon link down 
+        /* 0x0.28 - 0x0.31 */
+        u_int8_t status;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - When Set, The port will keep the same phy setting
+upon link down event that occurs only upon link down
 command of peer port. In the event of Down com
 mand/cable disconnect, entire link up flow will be ini
 tialized.
 
-NOTE: This mode can be configured only when 
-PTYS.an_disable_admin is set (i.e. AN is disabled). 
-NOTE: if physical environment was changed (i.e. 
-replacement of module, temp change, etc) there is a 
-possibility that link won't be established or will be 
+NOTE: This mode can be configured only when
+PTYS.an_disable_admin is set (i.e. AN is disabled).
+NOTE: if physical environment was changed (i.e.
+replacement of module, temp change, etc) there is a
+possibility that link won't be established or will be
 established with high BER */
-	/* 0x4.0 - 0x4.0 */
-	u_int8_t keep_phy_setting;
-	/* Description - Fast Link-up On Toggle capability.
-When set to '1', the system supports fast link-up (less 
-than 1 sec) in case of link toggle without unplugging 
-the cable. The enabling of that feature is possible 
+        /* 0x4.0 - 0x4.0 */
+        u_int8_t keep_phy_setting;
+        /* Description - Fast Link-up On Toggle capability.
+When set to '1', the system supports fast link-up (less
+than 1 sec) in case of link toggle without unplugging
+the cable. The enabling of that feature is possible
 through NV-Config. */
-	/* 0x4.1 - 0x4.1 */
-	u_int8_t flot_cap;
-	/* Description - Fast Link-up On Toggle Invalidation. 
+        /* 0x4.1 - 0x4.1 */
+        u_int8_t flot_cap;
+        /* Description - Fast Link-up On Toggle Invalidation.
 When set, on the next link toggle, the value in the NV-
-Config bit of Fast Link-up On Toggle feature will be 
+Config bit of Fast Link-up On Toggle feature will be
 neglected and a regular (long) link-up will be per
 formed. Used for debug. */
-	/* 0x4.2 - 0x4.2 */
-	u_int8_t flot_invalidation;
-	/* Description - Disable Force Fast Link-Up */
-	/* 0x4.3 - 0x4.3 */
-	u_int8_t flu_disable;
-};
-
-/* Description -   */
-/* Size in bytes - 256 */
-struct reg_access_hca_resource_dump {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - See Section 24.8, "Resource Dump", on page 1329. */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t segment_type;
-	/* Description - Sequence number. 0 on first call of dump and incre
+        /* 0x4.2 - 0x4.2 */
+        u_int8_t flot_invalidation;
+        /* Description - Disable Force Fast Link-Up */
+        /* 0x4.3 - 0x4.3 */
+        u_int8_t flu_disable;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 256 */
+    struct reg_access_hca_resource_dump
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - See Section 24.8, "Resource Dump", on page 1329. */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t segment_type;
+        /* Description - Sequence number. 0 on first call of dump and incre
 mented on each more dump. */
-	/* 0x0.16 - 0x0.19 */
-	u_int8_t seq_num;
-	/* Description - If set, then vhca_id field is valid. Otherwise dump 
+        /* 0x0.16 - 0x0.19 */
+        u_int8_t seq_num;
+        /* Description - If set, then vhca_id field is valid. Otherwise dump
 resources on my vhca_id. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t vhca_id_valid;
-	/* Description - If set, data is dumped in the register in inline_data 
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t vhca_id_valid;
+        /* Description - If set, data is dumped in the register in inline_data
 field. otherwise dump to mkey. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t inline_dump;
-	/* Description - If set, the device has additional information that has 
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t inline_dump;
+        /* Description - If set, the device has additional information that has
 not been dumped yet. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t more_dump;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - vhca_id where the resource is allocated. */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t vhca_id;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - First object index to be dumped when supported by 
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t more_dump;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - vhca_id where the resource is allocated. */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t vhca_id;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - First object index to be dumped when supported by
 the object.
-SW shall read this field upon command done and 
-shall provide it on the next call in case 
+SW shall read this field upon command done and
+shall provide it on the next call in case
 dump_more==1. */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t index1;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Second object index to be dumped when supported 
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t index1;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Second object index to be dumped when supported
 by the object.
-SW shall read this field upon command done and 
-shall provide it on the next call in case 
+SW shall read this field upon command done and
+shall provide it on the next call in case
 dump_more==1. */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t index2;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The amount of objects to dump starting for index 2.
-SW shall read this field upon command done and 
-shall provide it on the next call in case 
-dump_more==1. 
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t index2;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The amount of objects to dump starting for index 2.
+SW shall read this field upon command done and
+shall provide it on the next call in case
+dump_more==1.
 Range is 0..0xfff0. When the segment's num_of_
-obj2_supports_all is set, the special value of 0xffff 
+obj2_supports_all is set, the special value of 0xffff
 represents "all". When the segment's num_of_objx_
 supports_active is set, the special value of 0xfffe rep
-resents "active". The  value of 0x0 and 0x1 are 
+resents "active". The  value of 0x0 and 0x1 are
 allowed even if the supported_num_of_obj2 is "0". */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t num_of_obj2;
-	/* Description - The amount of objects to dump starting for index 1
-SW shall read this field upon command done and 
-shall provide it on the next call in case 
-dump_more==1. 
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t num_of_obj2;
+        /* Description - The amount of objects to dump starting for index 1
+SW shall read this field upon command done and
+shall provide it on the next call in case
+dump_more==1.
 Range is 0..0xfff0. When the segment's num_of_
-obj1_supports_all is set, the special value of 0xffff 
+obj1_supports_all is set, the special value of 0xffff
 represents "all". When the segment's num_of_objx_
 supports_active is set, the special value of 0xfffe rep
-resents "active". The  value of 0x0 and 0x1 are 
+resents "active". The  value of 0x0 and 0x1 are
 allowed even if the supported_num_of_obj1 is "0". */
-	/* 0x10.16 - 0x10.31 */
-	u_int16_t num_of_obj1;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - An opaque provided by the device. SW shall read the 
+        /* 0x10.16 - 0x10.31 */
+        u_int16_t num_of_obj1;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - An opaque provided by the device. SW shall read the
 device_opaque upon command done and shall pro
-vide it on the next call in case dump_more==1. On 
+vide it on the next call in case dump_more==1. On
 first call, device_opaque shall be 0. */
-	/* 0x18.0 - 0x1c.31 */
-	u_int64_t device_opaque;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - Memory key to dump to. 
+        /* 0x18.0 - 0x1c.31 */
+        u_int64_t device_opaque;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - Memory key to dump to.
 Valid when inline_dump==0. */
-	/* 0x20.0 - 0x20.31 */
-	u_int32_t mkey;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description - In write, the size of maximum allocated buffer that 
+        /* 0x20.0 - 0x20.31 */
+        u_int32_t mkey;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description - In write, the size of maximum allocated buffer that
 the device can use.
 In read, the actual written size.
 In granularity of Bytes. */
-	/* 0x24.0 - 0x24.31 */
-	u_int32_t size;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description - VA address (absolute address) of memory where to 
-start dumping. 
+        /* 0x24.0 - 0x24.31 */
+        u_int32_t size;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description - VA address (absolute address) of memory where to
+start dumping.
 Valid when inline_dump==0. */
-	/* 0x28.0 - 0x2c.31 */
-	u_int64_t address;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description - Data that is dumped in case of inline mode.
+        /* 0x28.0 - 0x2c.31 */
+        u_int64_t address;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description - Data that is dumped in case of inline mode.
 Valid when inline_dump==1. */
-	/* 0x30.0 - 0xfc.31 */
-	u_int32_t inline_data[52];
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct reg_access_hca_strs_fault_inject_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Stesser of this type is was active at some point in history */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t past_active;
-	/* Description - Stesser of this type is currently active */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t active;
-	/* Description - Stesser of this type is supported */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t supported;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Type of fault to activate
-0x0: ICM_ALLOC_REFUSE - cause FW to return FAIL on ICM 
+        /* 0x30.0 - 0xfc.31 */
+        u_int32_t inline_data[52];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct reg_access_hca_strs_fault_inject_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Stesser of this type is was active at some point in history */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t past_active;
+        /* Description - Stesser of this type is currently active */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t active;
+        /* Description - Stesser of this type is supported */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t supported;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Type of fault to activate
+0x0: ICM_ALLOC_REFUSE - cause FW to return FAIL on ICM
 allocation requests
-0x1: ICM_ALLOC_BUSY - cause FW to return BUSY on ICM 
+0x1: ICM_ALLOC_BUSY - cause FW to return BUSY on ICM
 allocation request
-0x2: EQE_GW_BUSY - cause FW to return busy when trying 
+0x2: EQE_GW_BUSY - cause FW to return busy when trying
 to access EQE GW
-0x3: CQE_GW_BUSY - cause FW to return busy when trying 
+0x3: CQE_GW_BUSY - cause FW to return busy when trying
 to access CQE GW
-0x4: RX_FENCE_BUSY - cause FW to return busy when 
+0x4: RX_FENCE_BUSY - cause FW to return busy when
 checking RX fences done
-0x5: SX_FENCE_BUSY - cause FW to return busy when 
+0x5: SX_FENCE_BUSY - cause FW to return busy when
 checking SX fences done
-0x6: RXT_SLICE_FENCE_BUSY - cause FW to return busy 
+0x6: RXT_SLICE_FENCE_BUSY - cause FW to return busy
 when checking RXT fences done
-0x7: SXD_SLICE_FENCE_BUSY - cause FW to return busy 
+0x7: SXD_SLICE_FENCE_BUSY - cause FW to return busy
 when checking SXD fences done
-0x8: GENERAL_FENCE_BUSY - cause FW to return busy 
+0x8: GENERAL_FENCE_BUSY - cause FW to return busy
 when checking other fences done
 0x9: SMBUS_FAILED - cause FW to indicate failure upon ini
 tiating SMBus transaction
 Other values are reserved */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t type;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The fault will be injected num_repeat consecutive times the 
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t type;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The fault will be injected num_repeat consecutive times the
 relevant flow is called, and will not be injected for the follow
 ing num_skip calls to the relevant flow.
-Value 0x0 for num_repeat indicates the Fault will not be 
+Value 0x0 for num_repeat indicates the Fault will not be
 injected. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t num_skip;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - The fault will be injected num_repeat consecutive times the 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t num_skip;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - The fault will be injected num_repeat consecutive times the
 relevant flow is called, and will not be injected for the follow
 ing num_skip calls to the relevant flow.
-Value 0x0 for num_repeat indicates the Fault will not be 
+Value 0x0 for num_repeat indicates the Fault will not be
 injected. */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t num_repeat;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - stressor Modifier according to type field.
-For SMBUS_FAILED,Table  1112, "SMBUS_FAILED Fault 
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t num_repeat;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - stressor Modifier according to type field.
+For SMBUS_FAILED,Table  1112, "SMBUS_FAILED Fault
 Inject Modifier Layout," on page  1393 */
-	/* 0x10.0 - 0x2c.31 */
-	struct reg_access_hca_smbus_failed_fault_inject_modifier per_type_modifier;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct reg_access_hca_strs_mini_flow_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Stesser of this type is was active at some point in history */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t past_active;
-	/* Description - Stesser of this type is currently active */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t active;
-	/* Description - Stesser of this type is supported */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t supported;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Type of Mini Flow to activate
-0x0: SX_FLICK_THROTTLE - enable / disable the SX flick 
+        /* 0x10.0 - 0x2c.31 */
+        struct reg_access_hca_smbus_failed_fault_inject_modifier per_type_modifier;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct reg_access_hca_strs_mini_flow_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Stesser of this type is was active at some point in history */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t past_active;
+        /* Description - Stesser of this type is currently active */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t active;
+        /* Description - Stesser of this type is supported */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t supported;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Type of Mini Flow to activate
+0x0: SX_FLICK_THROTTLE - enable / disable the SX flick
 mechanism
 0x1: INVALIDATE_STEERING_CACHE
 0x2: INVALIDATE_RXT_QP_L0_CACHE
@@ -1960,7 +2005,7 @@ mechanism
 0x6: INVALIDATE_SXDC_CACHE
 0x7: RECONSTRUCT_STEERING_BYPASS
 0x8: INVALIDATE_LDB_CACHE
-0x9: PCI_READ_ERROR - simulate a PCI error on Px polling 
+0x9: PCI_READ_ERROR - simulate a PCI error on Px polling
 machine read
 0xA: INVALIDATE_ALL_RO_CACHES
 0xB: INVALIDATE_PKEY_CACHE
@@ -1970,565 +2015,753 @@ machine read
 0xF: IRISC_HANG
 0x10: PACKET_DROP
 Other values are reserved */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t type;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The Mini flow will be injected num_repeat times, every 50 
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t type;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The Mini flow will be injected num_repeat times, every 50
 usec * freq.
 Value 0x0 for freq indicates the Mini Flow will not be injected. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t freq;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - The Mini flow will be injected num_repeat times, every 50 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t freq;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - The Mini flow will be injected num_repeat times, every 50
 usec * freq.
 Value 0x0 for freq indicates the Mini Flow will not be injected. */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t num_repeat;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - stressor Modifier according to type field.
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t num_repeat;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - stressor Modifier according to type field.
 For IRISC_HANG Table  1116, "IRISC_HANG Mini-Flow Modi
 fier Layout," on page  1394
-For PACKET_DROP Table  1118, "PACKET_DROP Mini-Flow 
+For PACKET_DROP Table  1118, "PACKET_DROP Mini-Flow
 Modifier Layout," on page  1395 */
-	/* 0x10.0 - 0x2c.31 */
-	union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto per_type_modifier;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct reg_access_hca_strs_resource_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Stesser of this type is was active at some point in history */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t past_active;
-	/* Description - Stesser of this type is currently active */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t active;
-	/* Description - Stesser of this type is supported */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t supported;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Type of resource to limit
+        /* 0x10.0 - 0x2c.31 */
+        union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto per_type_modifier;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct reg_access_hca_strs_resource_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Stesser of this type is was active at some point in history */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t past_active;
+        /* Description - Stesser of this type is currently active */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t active;
+        /* Description - Stesser of this type is supported */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t supported;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Type of resource to limit
 0x0: SX_SLICE
 0x1: RX_SLICE
 Other values are reserved */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t type;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Limit as a percentage of the available resources
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t type;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Limit as a percentage of the available resources
 Value of 100 (0x64) indicates return to full utilization */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t reduce_percentage;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct reg_access_hca_strs_stop_toggle_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Stesser of this type is was active at some point in history */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t past_active;
-	/* Description - Stesser of this type is currently active */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t active;
-	/* Description - Stesser of this type is supported */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t supported;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Type of mechanism to toggle
-0x0: DC_CNAK - stop FW machine which sends DC CNAK 
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t reduce_percentage;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct reg_access_hca_strs_stop_toggle_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Stesser of this type is was active at some point in history */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t past_active;
+        /* Description - Stesser of this type is currently active */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t active;
+        /* Description - Stesser of this type is supported */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t supported;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Type of mechanism to toggle
+0x0: DC_CNAK - stop FW machine which sends DC CNAK
 packets on DC LIFO empty
-0x1: RXT_CHECKS - stop FW machine which handles RX 
+0x1: RXT_CHECKS - stop FW machine which handles RX
 transport check traps
 0x2: TIMEOUT - stop FW machine which handles QP trans
 port timeout events
-0x3: SX_ERROR - stop FW machine which handles SX WQE 
+0x3: SX_ERROR - stop FW machine which handles SX WQE
 or data gather errors
-0x4: RX_ERROR - stop FW machine which handles all RX 
+0x4: RX_ERROR - stop FW machine which handles all RX
 errors apart from RXT checks
-0x5: MX_ERROR - stop FW machine which handles other 
+0x5: MX_ERROR - stop FW machine which handles other
 transport errors, such as data signature error
-0x6: MAD_TRAP - stop FW machine which sends MAD trap 
+0x6: MAD_TRAP - stop FW machine which sends MAD trap
 packets
-0x7: RXT_SLICE - stop HW which loads RXT unit from RX 
+0x7: RXT_SLICE - stop HW which loads RXT unit from RX
 buffers
-0x8: QOS_ARBITER - stop HW which servers schedule queue 
+0x8: QOS_ARBITER - stop HW which servers schedule queue
 pops / flicks
-0x9: RXB_HANG - stop HW which loads RX buffers - per port 
+0x9: RXB_HANG - stop HW which loads RX buffers - per port
 / VL configuration
-0xA: FW_SCHED_Q - stop FW machine which empties the 
+0xA: FW_SCHED_Q - stop FW machine which empties the
 FW schedule queue
-0xB: LOCK_RESOURCE - stop FW machines attempting to 
+0xB: LOCK_RESOURCE - stop FW machines attempting to
 take semaphores
 0xC: IRISC_HANG - stop all FW processing
-0xD: SXW_SLICE - stop HW SXW slices from executing WQE 
+0xD: SXW_SLICE - stop HW SXW slices from executing WQE
 requests
 0xE: RXC_CQE - stop HW posting CQEs
 0xF: RXC_EQE - stop HW posting EQEs
 0x10: SXP_HANG - stop HW SX from transmitting packets
 0x11: SX_EXT_DB - stop HW processing of external door
 bells (schedule queue push)
-0x12: SX_INT_DB - stop HW processing of internal doorbells 
+0x12: SX_INT_DB - stop HW processing of internal doorbells
 (responder ack / read response requests)
 0x13: QPC_SLICE - stop HW QP context read requests
 Other values are reserved
-0x14: RXB_HOST_HANG - Stop HW which loads RX buffers - 
-per host / VL configuration. When supported deprecates 
+0x14: RXB_HOST_HANG - Stop HW which loads RX buffers -
+per host / VL configuration. When supported deprecates
 RXB_HANG
 0x15 : PAUSE_TX - generates pause frames toward the net
 work - per port & SL/priority configuration. */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t type;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The Stressor will be active for 50usec * 2^log_stressor 
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t type;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The Stressor will be active for 50usec * 2^log_stressor
 period, once every 50usec * 2^log_duty_cycle. */
-	/* 0x8.0 - 0x8.4 */
-	u_int8_t log_stressor;
-	/* Description - The Stressor will be active for 50usec * 2^log_stressor 
+        /* 0x8.0 - 0x8.4 */
+        u_int8_t log_stressor;
+        /* Description - The Stressor will be active for 50usec * 2^log_stressor
 period, once every 50usec * 2^log_duty_cycle. */
-	/* 0x8.8 - 0x8.12 */
-	u_int8_t log_duty_cycle;
-	/* Description - Indicates how the Stressor affects the device during the 
-Stressor active time. 
+        /* 0x8.8 - 0x8.12 */
+        u_int8_t log_duty_cycle;
+        /* Description - Indicates how the Stressor affects the device during the
+Stressor active time.
 0x0: FLOW_STOPPED - HW/FW flow is stressed
 0x1: FLOW_ACTIVE - HW/FW is flow is working normally
-The Stressor will have the opposite behavior when it is not 
+The Stressor will have the opposite behavior when it is not
 active. */
-	/* 0x8.31 - 0x8.31 */
-	u_int8_t polarity;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - stressor Modifier according to type field.
+        /* 0x8.31 - 0x8.31 */
+        u_int8_t polarity;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - stressor Modifier according to type field.
 For RXB_HANG Table  1094, "RXB_HANG Stop Toggle Modi
 fier Layout," on page  1385
-For LOCK_RESOURCE Table  1100, "LOCK_RESOURCE Stop 
+For LOCK_RESOURCE Table  1100, "LOCK_RESOURCE Stop
 Toggle Modifier Layout," on page  1387
 For SXP_HANG Table  1096, "SXP_HANG Stop Toggle Modi
 fier Layout," on page  1386
-For RXB_HOST_HANG Table  1098, "RXB_HOST_HANG Stop 
+For RXB_HOST_HANG Table  1098, "RXB_HOST_HANG Stop
 Toggle Modifier Layout," on page  1387
 For PAUSE_TX See Table Table  1108, "PAUSE_TX Stop Tog
 gle Modifier Layout," on page  1390 */
-	/* 0x10.0 - 0x2c.31 */
-	union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto per_type_modifier;
-};
-
-/* Description -   */
-/* Size in bytes - 256 */
-union reg_access_hca_reg_access_hca_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct reg_access_hca_mcqs_reg mcqs_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_linkx_properties mcqi_linkx_properties;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_activation_method mcqi_activation_method;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct reg_access_hca_mtrc_stdb_reg mtrc_stdb_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct reg_access_hca_strs_fault_inject_reg strs_fault_inject_reg;
-	/* Description -  */
-	/* 0x0.0 - 0xfc.31 */
-	struct reg_access_hca_resource_dump resource_dump;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct reg_access_hca_pcnr_reg pcnr_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct reg_access_hca_mmdio mmdio;
-	/* Description -  */
-	/* 0x0.0 - 0x2c.31 */
-	struct reg_access_hca_mfsv_reg mfsv_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x8c.31 */
-	struct reg_access_hca_mcda_reg mcda_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x80.31 */
-	struct reg_access_hca_mtrc_cap_reg mtrc_cap_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x28.31 */
-	struct reg_access_hca_mpegc_reg mpegc_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct reg_access_hca_mfrl_reg_ext mfrl_reg_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x90.31 */
-	struct reg_access_hca_mcqi_reg mcqi_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_hca_mcc_reg mcc_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct reg_access_hca_strs_mini_flow_reg strs_mini_flow_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_cap mcqi_cap;
-	/* Description -  */
-	/* 0x0.0 - 0x14.31 */
-	struct reg_access_hca_mqis_reg mqis_reg;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct reg_access_hca_mpcir_ext mpcir_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct reg_access_hca_strs_resource_reg strs_resource_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x40.31 */
-	struct reg_access_hca_debug_cap debug_cap;
-	/* Description -  */
-	/* 0x0.0 - 0x9c.31 */
-	struct reg_access_hca_mgir mgir;
-	/* Description -  */
-	/* 0x0.0 - 0x78.31 */
-	struct reg_access_hca_mcqi_version mcqi_version;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct reg_access_hca_strs_stop_toggle_reg strs_stop_toggle_reg;
-};
-
-
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* lock_source_general_semaphore */
-void reg_access_hca_lock_source_general_semaphore_pack(const struct reg_access_hca_lock_source_general_semaphore *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_lock_source_general_semaphore *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_general_semaphore_print(const struct reg_access_hca_lock_source_general_semaphore *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_lock_source_general_semaphore_size(void);
-#define REG_ACCESS_HCA_LOCK_SOURCE_GENERAL_SEMAPHORE_SIZE    (0x1c)
-void reg_access_hca_lock_source_general_semaphore_dump(const struct reg_access_hca_lock_source_general_semaphore *ptr_struct, FILE *fd);
-/* lock_source_icm_resource */
-void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_lock_source_icm_resource_size(void);
-#define REG_ACCESS_HCA_LOCK_SOURCE_ICM_RESOURCE_SIZE    (0x1c)
-void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource *ptr_struct, FILE *fd);
-/* lock_source_uapp_resource */
-void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_lock_source_uapp_resource_size(void);
-#define REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE    (0x1c)
-void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource *ptr_struct, FILE *fd);
-/* lock_source_stop_toggle_modifier_category_modifier_auto */
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_size(void);
-#define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE    (0x1c)
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, FILE *fd);
-/* uint64 */
-void reg_access_hca_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_uint64_size(void);
-#define REG_ACCESS_HCA_UINT64_SIZE    (0x8)
-void reg_access_hca_uint64_dump(const u_int64_t *ptr_struct, FILE *fd);
-/* irisc_hang_mini_flow_modifier */
-void reg_access_hca_irisc_hang_mini_flow_modifier_pack(const struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_irisc_hang_mini_flow_modifier_print(const struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_irisc_hang_mini_flow_modifier_size(void);
-#define REG_ACCESS_HCA_IRISC_HANG_MINI_FLOW_MODIFIER_SIZE    (0x20)
-void reg_access_hca_irisc_hang_mini_flow_modifier_dump(const struct reg_access_hca_irisc_hang_mini_flow_modifier *ptr_struct, FILE *fd);
-/* lock_source_stop_toggle_modifier */
-void reg_access_hca_lock_source_stop_toggle_modifier_pack(const struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_stop_toggle_modifier_unpack(struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_lock_source_stop_toggle_modifier_print(const struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_lock_source_stop_toggle_modifier_size(void);
-#define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_SIZE    (0x20)
-void reg_access_hca_lock_source_stop_toggle_modifier_dump(const struct reg_access_hca_lock_source_stop_toggle_modifier *ptr_struct, FILE *fd);
-/* mcqi_activation_method */
-void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqi_activation_method_size(void);
-#define REG_ACCESS_HCA_MCQI_ACTIVATION_METHOD_SIZE    (0x7c)
-void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method *ptr_struct, FILE *fd);
-/* mcqi_cap */
-void reg_access_hca_mcqi_cap_pack(const struct reg_access_hca_mcqi_cap *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_cap_unpack(struct reg_access_hca_mcqi_cap *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_cap_print(const struct reg_access_hca_mcqi_cap *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqi_cap_size(void);
-#define REG_ACCESS_HCA_MCQI_CAP_SIZE    (0x7c)
-void reg_access_hca_mcqi_cap_dump(const struct reg_access_hca_mcqi_cap *ptr_struct, FILE *fd);
-/* mcqi_linkx_properties */
-void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqi_linkx_properties_size(void);
-#define REG_ACCESS_HCA_MCQI_LINKX_PROPERTIES_SIZE    (0x7c)
-void reg_access_hca_mcqi_linkx_properties_dump(const struct reg_access_hca_mcqi_linkx_properties *ptr_struct, FILE *fd);
-/* mcqi_version */
-void reg_access_hca_mcqi_version_pack(const struct reg_access_hca_mcqi_version *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_version_unpack(struct reg_access_hca_mcqi_version *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_version_print(const struct reg_access_hca_mcqi_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqi_version_size(void);
-#define REG_ACCESS_HCA_MCQI_VERSION_SIZE    (0x7c)
-void reg_access_hca_mcqi_version_dump(const struct reg_access_hca_mcqi_version *ptr_struct, FILE *fd);
-/* packet_drop_mini_flow_modifier */
-void reg_access_hca_packet_drop_mini_flow_modifier_pack(const struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_packet_drop_mini_flow_modifier_unpack(struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_packet_drop_mini_flow_modifier_print(const struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_packet_drop_mini_flow_modifier_size(void);
-#define REG_ACCESS_HCA_PACKET_DROP_MINI_FLOW_MODIFIER_SIZE    (0x20)
-void reg_access_hca_packet_drop_mini_flow_modifier_dump(const struct reg_access_hca_packet_drop_mini_flow_modifier *ptr_struct, FILE *fd);
-/* pause_tx_stop_toggle_modifier */
-void reg_access_hca_pause_tx_stop_toggle_modifier_pack(const struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_pause_tx_stop_toggle_modifier_print(const struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_pause_tx_stop_toggle_modifier_size(void);
-#define REG_ACCESS_HCA_PAUSE_TX_STOP_TOGGLE_MODIFIER_SIZE    (0x20)
-void reg_access_hca_pause_tx_stop_toggle_modifier_dump(const struct reg_access_hca_pause_tx_stop_toggle_modifier *ptr_struct, FILE *fd);
-/* rom_version */
-void reg_access_hca_rom_version_pack(const struct reg_access_hca_rom_version *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_rom_version_unpack(struct reg_access_hca_rom_version *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_rom_version_print(const struct reg_access_hca_rom_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_rom_version_size(void);
-#define REG_ACCESS_HCA_ROM_VERSION_SIZE    (0x4)
-void reg_access_hca_rom_version_dump(const struct reg_access_hca_rom_version *ptr_struct, FILE *fd);
-/* rxb_hang_stop_toggle_modifier */
-void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_rxb_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_rxb_hang_stop_toggle_modifier_size(void);
-#define REG_ACCESS_HCA_RXB_HANG_STOP_TOGGLE_MODIFIER_SIZE    (0x20)
-void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxb_hang_stop_toggle_modifier *ptr_struct, FILE *fd);
-/* rxp_hang_stop_toggle_modifier */
-void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_rxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_rxp_hang_stop_toggle_modifier_size(void);
-#define REG_ACCESS_HCA_RXP_HANG_STOP_TOGGLE_MODIFIER_SIZE    (0x20)
-void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd);
-/* sxp_hang_stop_toggle_modifier */
-void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_sxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_sxp_hang_stop_toggle_modifier_size(void);
-#define REG_ACCESS_HCA_SXP_HANG_STOP_TOGGLE_MODIFIER_SIZE    (0x20)
-void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_sxp_hang_stop_toggle_modifier *ptr_struct, FILE *fd);
-/* diagnostic_cntr_layout */
-void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_diagnostic_cntr_layout_size(void);
-#define REG_ACCESS_HCA_DIAGNOSTIC_CNTR_LAYOUT_SIZE    (0x4)
-void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout *ptr_struct, FILE *fd);
-/* mcqi_reg_data_auto */
-void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqi_reg_data_auto_size(void);
-#define REG_ACCESS_HCA_MCQI_REG_DATA_AUTO_SIZE    (0x7c)
-void reg_access_hca_mcqi_reg_data_auto_dump(const union reg_access_hca_mcqi_reg_data_auto *ptr_struct, FILE *fd);
-/* mgir_dev_info */
-void reg_access_hca_mgir_dev_info_pack(const struct reg_access_hca_mgir_dev_info *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mgir_dev_info_unpack(struct reg_access_hca_mgir_dev_info *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mgir_dev_info_size(void);
-#define REG_ACCESS_HCA_MGIR_DEV_INFO_SIZE    (0x1c)
-void reg_access_hca_mgir_dev_info_dump(const struct reg_access_hca_mgir_dev_info *ptr_struct, FILE *fd);
-/* mgir_fw_info */
-void reg_access_hca_mgir_fw_info_pack(const struct reg_access_hca_mgir_fw_info *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mgir_fw_info_unpack(struct reg_access_hca_mgir_fw_info *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mgir_fw_info_print(const struct reg_access_hca_mgir_fw_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mgir_fw_info_size(void);
-#define REG_ACCESS_HCA_MGIR_FW_INFO_SIZE    (0x40)
-void reg_access_hca_mgir_fw_info_dump(const struct reg_access_hca_mgir_fw_info *ptr_struct, FILE *fd);
-/* mgir_hardware_info */
-void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mgir_hardware_info_size(void);
-#define REG_ACCESS_HCA_MGIR_HARDWARE_INFO_SIZE    (0x20)
-void reg_access_hca_mgir_hardware_info_dump(const struct reg_access_hca_mgir_hardware_info *ptr_struct, FILE *fd);
-/* mgir_sw_info */
-void reg_access_hca_mgir_sw_info_pack(const struct reg_access_hca_mgir_sw_info *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mgir_sw_info_unpack(struct reg_access_hca_mgir_sw_info *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mgir_sw_info_print(const struct reg_access_hca_mgir_sw_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mgir_sw_info_size(void);
-#define REG_ACCESS_HCA_MGIR_SW_INFO_SIZE    (0x20)
-void reg_access_hca_mgir_sw_info_dump(const struct reg_access_hca_mgir_sw_info *ptr_struct, FILE *fd);
-/* smbus_failed_fault_inject_modifier */
-void reg_access_hca_smbus_failed_fault_inject_modifier_pack(const struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_smbus_failed_fault_inject_modifier_print(const struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_smbus_failed_fault_inject_modifier_size(void);
-#define REG_ACCESS_HCA_SMBUS_FAILED_FAULT_INJECT_MODIFIER_SIZE    (0x20)
-void reg_access_hca_smbus_failed_fault_inject_modifier_dump(const struct reg_access_hca_smbus_failed_fault_inject_modifier *ptr_struct, FILE *fd);
-/* string_db_parameters */
-void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_string_db_parameters_size(void);
-#define REG_ACCESS_HCA_STRING_DB_PARAMETERS_SIZE    (0x8)
-void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string_db_parameters *ptr_struct, FILE *fd);
-/* strs_mini_flow_reg_per_type_modifier_auto */
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_size(void);
-#define REG_ACCESS_HCA_STRS_MINI_FLOW_REG_PER_TYPE_MODIFIER_AUTO_SIZE    (0x20)
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto *ptr_struct, FILE *fd);
-/* strs_stop_toggle_reg_per_type_modifier_auto */
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_size(void);
-#define REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_PER_TYPE_MODIFIER_AUTO_SIZE    (0x20)
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto *ptr_struct, FILE *fd);
-/* debug_cap */
-void reg_access_hca_debug_cap_pack(const struct reg_access_hca_debug_cap *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_debug_cap_unpack(struct reg_access_hca_debug_cap *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_debug_cap_print(const struct reg_access_hca_debug_cap *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_debug_cap_size(void);
-#define REG_ACCESS_HCA_DEBUG_CAP_SIZE    (0x40)
-void reg_access_hca_debug_cap_dump(const struct reg_access_hca_debug_cap *ptr_struct, FILE *fd);
-/* mcc_reg */
-void reg_access_hca_mcc_reg_pack(const struct reg_access_hca_mcc_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcc_reg_unpack(struct reg_access_hca_mcc_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcc_reg_size(void);
-#define REG_ACCESS_HCA_MCC_REG_SIZE    (0x20)
-void reg_access_hca_mcc_reg_dump(const struct reg_access_hca_mcc_reg *ptr_struct, FILE *fd);
-/* mcda_reg */
-void reg_access_hca_mcda_reg_pack(const struct reg_access_hca_mcda_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcda_reg_unpack(struct reg_access_hca_mcda_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcda_reg_print(const struct reg_access_hca_mcda_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcda_reg_size(void);
-#define REG_ACCESS_HCA_MCDA_REG_SIZE    (0x90)
-void reg_access_hca_mcda_reg_dump(const struct reg_access_hca_mcda_reg *ptr_struct, FILE *fd);
-/* mcqi_reg */
-void reg_access_hca_mcqi_reg_pack(const struct reg_access_hca_mcqi_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_reg_unpack(struct reg_access_hca_mcqi_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqi_reg_size(void);
-#define REG_ACCESS_HCA_MCQI_REG_SIZE    (0x94)
-void reg_access_hca_mcqi_reg_dump(const struct reg_access_hca_mcqi_reg *ptr_struct, FILE *fd);
-/* mcqs_reg */
-void reg_access_hca_mcqs_reg_pack(const struct reg_access_hca_mcqs_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mcqs_reg_unpack(struct reg_access_hca_mcqs_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mcqs_reg_size(void);
-#define REG_ACCESS_HCA_MCQS_REG_SIZE    (0x10)
-void reg_access_hca_mcqs_reg_dump(const struct reg_access_hca_mcqs_reg *ptr_struct, FILE *fd);
-/* mfrl_reg_ext */
-void reg_access_hca_mfrl_reg_ext_pack(const struct reg_access_hca_mfrl_reg_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mfrl_reg_ext_size(void);
-#define REG_ACCESS_HCA_MFRL_REG_EXT_SIZE    (0x8)
-void reg_access_hca_mfrl_reg_ext_dump(const struct reg_access_hca_mfrl_reg_ext *ptr_struct, FILE *fd);
-/* mfsv_reg */
-void reg_access_hca_mfsv_reg_pack(const struct reg_access_hca_mfsv_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mfsv_reg_unpack(struct reg_access_hca_mfsv_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mfsv_reg_print(const struct reg_access_hca_mfsv_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mfsv_reg_size(void);
-#define REG_ACCESS_HCA_MFSV_REG_SIZE    (0x30)
-void reg_access_hca_mfsv_reg_dump(const struct reg_access_hca_mfsv_reg *ptr_struct, FILE *fd);
-/* mgir */
-void reg_access_hca_mgir_pack(const struct reg_access_hca_mgir *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mgir_unpack(struct reg_access_hca_mgir *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mgir_print(const struct reg_access_hca_mgir *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mgir_size(void);
-#define REG_ACCESS_HCA_MGIR_SIZE    (0xa0)
-void reg_access_hca_mgir_dump(const struct reg_access_hca_mgir *ptr_struct, FILE *fd);
-/* mmdio */
-void reg_access_hca_mmdio_pack(const struct reg_access_hca_mmdio *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mmdio_unpack(struct reg_access_hca_mmdio *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mmdio_print(const struct reg_access_hca_mmdio *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mmdio_size(void);
-#define REG_ACCESS_HCA_MMDIO_SIZE    (0xc)
-void reg_access_hca_mmdio_dump(const struct reg_access_hca_mmdio *ptr_struct, FILE *fd);
-/* mpcir_ext */
-void reg_access_hca_mpcir_ext_pack(const struct reg_access_hca_mpcir_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mpcir_ext_unpack(struct reg_access_hca_mpcir_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mpcir_ext_print(const struct reg_access_hca_mpcir_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mpcir_ext_size(void);
-#define REG_ACCESS_HCA_MPCIR_EXT_SIZE    (0x10)
-void reg_access_hca_mpcir_ext_dump(const struct reg_access_hca_mpcir_ext *ptr_struct, FILE *fd);
-/* mpegc_reg */
-void reg_access_hca_mpegc_reg_pack(const struct reg_access_hca_mpegc_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mpegc_reg_unpack(struct reg_access_hca_mpegc_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mpegc_reg_print(const struct reg_access_hca_mpegc_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mpegc_reg_size(void);
-#define REG_ACCESS_HCA_MPEGC_REG_SIZE    (0x2c)
-void reg_access_hca_mpegc_reg_dump(const struct reg_access_hca_mpegc_reg *ptr_struct, FILE *fd);
-/* mqis_reg */
-void reg_access_hca_mqis_reg_pack(const struct reg_access_hca_mqis_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mqis_reg_unpack(struct reg_access_hca_mqis_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mqis_reg_print(const struct reg_access_hca_mqis_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mqis_reg_size(void);
-#define REG_ACCESS_HCA_MQIS_REG_SIZE    (0x18)
-void reg_access_hca_mqis_reg_dump(const struct reg_access_hca_mqis_reg *ptr_struct, FILE *fd);
-/* mtrc_cap_reg */
-void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mtrc_cap_reg_unpack(struct reg_access_hca_mtrc_cap_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mtrc_cap_reg_print(const struct reg_access_hca_mtrc_cap_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mtrc_cap_reg_size(void);
-#define REG_ACCESS_HCA_MTRC_CAP_REG_SIZE    (0x84)
-void reg_access_hca_mtrc_cap_reg_dump(const struct reg_access_hca_mtrc_cap_reg *ptr_struct, FILE *fd);
-/* mtrc_stdb_reg */
-void reg_access_hca_mtrc_stdb_reg_pack(const struct reg_access_hca_mtrc_stdb_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_mtrc_stdb_reg_unpack(struct reg_access_hca_mtrc_stdb_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_mtrc_stdb_reg_size(void);
-#define REG_ACCESS_HCA_MTRC_STDB_REG_SIZE    (0x8)
-void reg_access_hca_mtrc_stdb_reg_dump(const struct reg_access_hca_mtrc_stdb_reg *ptr_struct, FILE *fd);
-/* pcnr_reg */
-void reg_access_hca_pcnr_reg_pack(const struct reg_access_hca_pcnr_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_pcnr_reg_unpack(struct reg_access_hca_pcnr_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_pcnr_reg_print(const struct reg_access_hca_pcnr_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_pcnr_reg_size(void);
-#define REG_ACCESS_HCA_PCNR_REG_SIZE    (0xc)
-void reg_access_hca_pcnr_reg_dump(const struct reg_access_hca_pcnr_reg *ptr_struct, FILE *fd);
-/* resource_dump */
-void reg_access_hca_resource_dump_pack(const struct reg_access_hca_resource_dump *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_resource_dump_unpack(struct reg_access_hca_resource_dump *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_resource_dump_size(void);
-#define REG_ACCESS_HCA_RESOURCE_DUMP_SIZE    (0x100)
-void reg_access_hca_resource_dump_dump(const struct reg_access_hca_resource_dump *ptr_struct, FILE *fd);
-/* strs_fault_inject_reg */
-void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_strs_fault_inject_reg_size(void);
-#define REG_ACCESS_HCA_STRS_FAULT_INJECT_REG_SIZE    (0x40)
-void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_fault_inject_reg *ptr_struct, FILE *fd);
-/* strs_mini_flow_reg */
-void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_strs_mini_flow_reg_size(void);
-#define REG_ACCESS_HCA_STRS_MINI_FLOW_REG_SIZE    (0x40)
-void reg_access_hca_strs_mini_flow_reg_dump(const struct reg_access_hca_strs_mini_flow_reg *ptr_struct, FILE *fd);
-/* strs_resource_reg */
-void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_strs_resource_reg_size(void);
-#define REG_ACCESS_HCA_STRS_RESOURCE_REG_SIZE    (0x40)
-void reg_access_hca_strs_resource_reg_dump(const struct reg_access_hca_strs_resource_reg *ptr_struct, FILE *fd);
-/* strs_stop_toggle_reg */
-void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_strs_stop_toggle_reg_size(void);
-#define REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_SIZE    (0x40)
-void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_stop_toggle_reg *ptr_struct, FILE *fd);
-/* reg_access_hca_Nodes */
-void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_hca_reg_access_hca_Nodes_size(void);
-#define REG_ACCESS_HCA_REG_ACCESS_HCA_NODES_SIZE    (0x100)
-void reg_access_hca_reg_access_hca_Nodes_dump(const union reg_access_hca_reg_access_hca_Nodes *ptr_struct, FILE *fd);
-
+        /* 0x10.0 - 0x2c.31 */
+        union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto per_type_modifier;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 256 */
+    union reg_access_hca_reg_access_hca_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct reg_access_hca_mcqs_reg mcqs_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_linkx_properties mcqi_linkx_properties;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_activation_method mcqi_activation_method;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct reg_access_hca_mtrc_stdb_reg mtrc_stdb_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct reg_access_hca_strs_fault_inject_reg strs_fault_inject_reg;
+        /* Description -  */
+        /* 0x0.0 - 0xfc.31 */
+        struct reg_access_hca_resource_dump resource_dump;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct reg_access_hca_pcnr_reg pcnr_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct reg_access_hca_mmdio mmdio;
+        /* Description -  */
+        /* 0x0.0 - 0x2c.31 */
+        struct reg_access_hca_mfsv_reg mfsv_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x8c.31 */
+        struct reg_access_hca_mcda_reg mcda_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x80.31 */
+        struct reg_access_hca_mtrc_cap_reg mtrc_cap_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x28.31 */
+        struct reg_access_hca_mpegc_reg mpegc_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct reg_access_hca_mfrl_reg_ext mfrl_reg_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x90.31 */
+        struct reg_access_hca_mcqi_reg mcqi_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_hca_mcc_reg mcc_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct reg_access_hca_strs_mini_flow_reg strs_mini_flow_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_cap mcqi_cap;
+        /* Description -  */
+        /* 0x0.0 - 0x14.31 */
+        struct reg_access_hca_mqis_reg mqis_reg;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct reg_access_hca_mpcir_ext mpcir_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct reg_access_hca_strs_resource_reg strs_resource_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x40.31 */
+        struct reg_access_hca_debug_cap debug_cap;
+        /* Description -  */
+        /* 0x0.0 - 0x9c.31 */
+        struct reg_access_hca_mgir mgir;
+        /* Description -  */
+        /* 0x0.0 - 0x78.31 */
+        struct reg_access_hca_mcqi_version mcqi_version;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct reg_access_hca_strs_stop_toggle_reg strs_stop_toggle_reg;
+    };
+
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* lock_source_general_semaphore */
+    void reg_access_hca_lock_source_general_semaphore_pack(
+      const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_general_semaphore_unpack(
+      struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_general_semaphore_print(
+      const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_lock_source_general_semaphore_size(void);
+#define REG_ACCESS_HCA_LOCK_SOURCE_GENERAL_SEMAPHORE_SIZE (0x1c)
+    void reg_access_hca_lock_source_general_semaphore_dump(
+      const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
+      FILE* fd);
+    /* lock_source_icm_resource */
+    void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                      u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                        const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                       FILE* fd,
+                                                       int indent_level);
+    unsigned int reg_access_hca_lock_source_icm_resource_size(void);
+#define REG_ACCESS_HCA_LOCK_SOURCE_ICM_RESOURCE_SIZE (0x1c)
+    void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
+                                                      FILE* fd);
+    /* lock_source_uapp_resource */
+    void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                       u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                         const u_int8_t* ptr_buff);
+    void
+      reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level);
+    unsigned int reg_access_hca_lock_source_uapp_resource_size(void);
+#define REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE (0x1c)
+    void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
+                                                       FILE* fd);
+    /* lock_source_stop_toggle_modifier_category_modifier_auto */
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(
+      const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(
+      union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(
+      const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_size(void);
+#define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE (0x1c)
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(
+      const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+      FILE* fd);
+    /* uint64 */
+    void reg_access_hca_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_uint64_size(void);
+#define REG_ACCESS_HCA_UINT64_SIZE (0x8)
+    void reg_access_hca_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
+    /* irisc_hang_mini_flow_modifier */
+    void reg_access_hca_irisc_hang_mini_flow_modifier_pack(
+      const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(
+      struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_irisc_hang_mini_flow_modifier_print(
+      const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_irisc_hang_mini_flow_modifier_size(void);
+#define REG_ACCESS_HCA_IRISC_HANG_MINI_FLOW_MODIFIER_SIZE (0x20)
+    void reg_access_hca_irisc_hang_mini_flow_modifier_dump(
+      const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
+      FILE* fd);
+    /* lock_source_stop_toggle_modifier */
+    void reg_access_hca_lock_source_stop_toggle_modifier_pack(
+      const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_unpack(
+      struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_print(
+      const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_lock_source_stop_toggle_modifier_size(void);
+#define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_SIZE (0x20)
+    void reg_access_hca_lock_source_stop_toggle_modifier_dump(
+      const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
+      FILE* fd);
+    /* mcqi_activation_method */
+    void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                    u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                      const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level);
+    unsigned int reg_access_hca_mcqi_activation_method_size(void);
+#define REG_ACCESS_HCA_MCQI_ACTIVATION_METHOD_SIZE (0x7c)
+    void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
+                                                    FILE* fd);
+    /* mcqi_cap */
+    void reg_access_hca_mcqi_cap_pack(const struct reg_access_hca_mcqi_cap* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_cap_unpack(struct reg_access_hca_mcqi_cap* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_cap_print(const struct reg_access_hca_mcqi_cap* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mcqi_cap_size(void);
+#define REG_ACCESS_HCA_MCQI_CAP_SIZE (0x7c)
+    void reg_access_hca_mcqi_cap_dump(const struct reg_access_hca_mcqi_cap* ptr_struct, FILE* fd);
+    /* mcqi_linkx_properties */
+    void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                                   u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                                     const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                                    FILE* fd,
+                                                    int indent_level);
+    unsigned int reg_access_hca_mcqi_linkx_properties_size(void);
+#define REG_ACCESS_HCA_MCQI_LINKX_PROPERTIES_SIZE (0x7c)
+    void reg_access_hca_mcqi_linkx_properties_dump(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
+                                                   FILE* fd);
+    /* mcqi_version */
+    void reg_access_hca_mcqi_version_pack(const struct reg_access_hca_mcqi_version* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_version_unpack(struct reg_access_hca_mcqi_version* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_version_print(const struct reg_access_hca_mcqi_version* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int reg_access_hca_mcqi_version_size(void);
+#define REG_ACCESS_HCA_MCQI_VERSION_SIZE (0x7c)
+    void reg_access_hca_mcqi_version_dump(const struct reg_access_hca_mcqi_version* ptr_struct, FILE* fd);
+    /* packet_drop_mini_flow_modifier */
+    void reg_access_hca_packet_drop_mini_flow_modifier_pack(
+      const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_packet_drop_mini_flow_modifier_unpack(
+      struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_packet_drop_mini_flow_modifier_print(
+      const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_packet_drop_mini_flow_modifier_size(void);
+#define REG_ACCESS_HCA_PACKET_DROP_MINI_FLOW_MODIFIER_SIZE (0x20)
+    void reg_access_hca_packet_drop_mini_flow_modifier_dump(
+      const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
+      FILE* fd);
+    /* pause_tx_stop_toggle_modifier */
+    void reg_access_hca_pause_tx_stop_toggle_modifier_pack(
+      const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(
+      struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_pause_tx_stop_toggle_modifier_print(
+      const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_pause_tx_stop_toggle_modifier_size(void);
+#define REG_ACCESS_HCA_PAUSE_TX_STOP_TOGGLE_MODIFIER_SIZE (0x20)
+    void reg_access_hca_pause_tx_stop_toggle_modifier_dump(
+      const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
+      FILE* fd);
+    /* rom_version */
+    void reg_access_hca_rom_version_pack(const struct reg_access_hca_rom_version* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_rom_version_unpack(struct reg_access_hca_rom_version* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      reg_access_hca_rom_version_print(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_rom_version_size(void);
+#define REG_ACCESS_HCA_ROM_VERSION_SIZE (0x4)
+    void reg_access_hca_rom_version_dump(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd);
+    /* rxb_hang_stop_toggle_modifier */
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(
+      const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(
+      struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_print(
+      const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_rxb_hang_stop_toggle_modifier_size(void);
+#define REG_ACCESS_HCA_RXB_HANG_STOP_TOGGLE_MODIFIER_SIZE (0x20)
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(
+      const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
+      FILE* fd);
+    /* rxp_hang_stop_toggle_modifier */
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(
+      const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(
+      struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_print(
+      const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_rxp_hang_stop_toggle_modifier_size(void);
+#define REG_ACCESS_HCA_RXP_HANG_STOP_TOGGLE_MODIFIER_SIZE (0x20)
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(
+      const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
+      FILE* fd);
+    /* sxp_hang_stop_toggle_modifier */
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(
+      const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(
+      struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_print(
+      const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_sxp_hang_stop_toggle_modifier_size(void);
+#define REG_ACCESS_HCA_SXP_HANG_STOP_TOGGLE_MODIFIER_SIZE (0x20)
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(
+      const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
+      FILE* fd);
+    /* diagnostic_cntr_layout */
+    void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                    u_int8_t* ptr_buff);
+    void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                      const u_int8_t* ptr_buff);
+    void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level);
+    unsigned int reg_access_hca_diagnostic_cntr_layout_size(void);
+#define REG_ACCESS_HCA_DIAGNOSTIC_CNTR_LAYOUT_SIZE (0x4)
+    void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
+                                                    FILE* fd);
+    /* mcqi_reg_data_auto */
+    void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
+                                                u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
+                                                  const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level);
+    unsigned int reg_access_hca_mcqi_reg_data_auto_size(void);
+#define REG_ACCESS_HCA_MCQI_REG_DATA_AUTO_SIZE (0x7c)
+    void reg_access_hca_mcqi_reg_data_auto_dump(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, FILE* fd);
+    /* mgir_dev_info */
+    void reg_access_hca_mgir_dev_info_pack(const struct reg_access_hca_mgir_dev_info* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_dev_info_unpack(struct reg_access_hca_mgir_dev_info* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int reg_access_hca_mgir_dev_info_size(void);
+#define REG_ACCESS_HCA_MGIR_DEV_INFO_SIZE (0x1c)
+    void reg_access_hca_mgir_dev_info_dump(const struct reg_access_hca_mgir_dev_info* ptr_struct, FILE* fd);
+    /* mgir_fw_info */
+    void reg_access_hca_mgir_fw_info_pack(const struct reg_access_hca_mgir_fw_info* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_fw_info_unpack(struct reg_access_hca_mgir_fw_info* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_fw_info_print(const struct reg_access_hca_mgir_fw_info* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int reg_access_hca_mgir_fw_info_size(void);
+#define REG_ACCESS_HCA_MGIR_FW_INFO_SIZE (0x40)
+    void reg_access_hca_mgir_fw_info_dump(const struct reg_access_hca_mgir_fw_info* ptr_struct, FILE* fd);
+    /* mgir_hardware_info */
+    void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
+                                                u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info* ptr_struct,
+                                                  const u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level);
+    unsigned int reg_access_hca_mgir_hardware_info_size(void);
+#define REG_ACCESS_HCA_MGIR_HARDWARE_INFO_SIZE (0x20)
+    void reg_access_hca_mgir_hardware_info_dump(const struct reg_access_hca_mgir_hardware_info* ptr_struct, FILE* fd);
+    /* mgir_sw_info */
+    void reg_access_hca_mgir_sw_info_pack(const struct reg_access_hca_mgir_sw_info* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_sw_info_unpack(struct reg_access_hca_mgir_sw_info* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_sw_info_print(const struct reg_access_hca_mgir_sw_info* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int reg_access_hca_mgir_sw_info_size(void);
+#define REG_ACCESS_HCA_MGIR_SW_INFO_SIZE (0x20)
+    void reg_access_hca_mgir_sw_info_dump(const struct reg_access_hca_mgir_sw_info* ptr_struct, FILE* fd);
+    /* smbus_failed_fault_inject_modifier */
+    void reg_access_hca_smbus_failed_fault_inject_modifier_pack(
+      const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(
+      struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_smbus_failed_fault_inject_modifier_print(
+      const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_smbus_failed_fault_inject_modifier_size(void);
+#define REG_ACCESS_HCA_SMBUS_FAILED_FAULT_INJECT_MODIFIER_SIZE (0x20)
+    void reg_access_hca_smbus_failed_fault_inject_modifier_dump(
+      const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
+      FILE* fd);
+    /* string_db_parameters */
+    void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
+    unsigned int reg_access_hca_string_db_parameters_size(void);
+#define REG_ACCESS_HCA_STRING_DB_PARAMETERS_SIZE (0x8)
+    void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string_db_parameters* ptr_struct,
+                                                  FILE* fd);
+    /* strs_mini_flow_reg_per_type_modifier_auto */
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(
+      const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(
+      union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(
+      const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_size(void);
+#define REG_ACCESS_HCA_STRS_MINI_FLOW_REG_PER_TYPE_MODIFIER_AUTO_SIZE (0x20)
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(
+      const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
+      FILE* fd);
+    /* strs_stop_toggle_reg_per_type_modifier_auto */
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(
+      const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(
+      union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(
+      const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_size(void);
+#define REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_PER_TYPE_MODIFIER_AUTO_SIZE (0x20)
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(
+      const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
+      FILE* fd);
+    /* debug_cap */
+    void reg_access_hca_debug_cap_pack(const struct reg_access_hca_debug_cap* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_debug_cap_unpack(struct reg_access_hca_debug_cap* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_debug_cap_print(const struct reg_access_hca_debug_cap* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_debug_cap_size(void);
+#define REG_ACCESS_HCA_DEBUG_CAP_SIZE (0x40)
+    void reg_access_hca_debug_cap_dump(const struct reg_access_hca_debug_cap* ptr_struct, FILE* fd);
+    /* mcc_reg */
+    void reg_access_hca_mcc_reg_pack(const struct reg_access_hca_mcc_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcc_reg_unpack(struct reg_access_hca_mcc_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mcc_reg_size(void);
+#define REG_ACCESS_HCA_MCC_REG_SIZE (0x20)
+    void reg_access_hca_mcc_reg_dump(const struct reg_access_hca_mcc_reg* ptr_struct, FILE* fd);
+    /* mcda_reg */
+    void reg_access_hca_mcda_reg_pack(const struct reg_access_hca_mcda_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcda_reg_unpack(struct reg_access_hca_mcda_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcda_reg_print(const struct reg_access_hca_mcda_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mcda_reg_size(void);
+#define REG_ACCESS_HCA_MCDA_REG_SIZE (0x90)
+    void reg_access_hca_mcda_reg_dump(const struct reg_access_hca_mcda_reg* ptr_struct, FILE* fd);
+    /* mcqi_reg */
+    void reg_access_hca_mcqi_reg_pack(const struct reg_access_hca_mcqi_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_reg_unpack(struct reg_access_hca_mcqi_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mcqi_reg_size(void);
+#define REG_ACCESS_HCA_MCQI_REG_SIZE (0x94)
+    void reg_access_hca_mcqi_reg_dump(const struct reg_access_hca_mcqi_reg* ptr_struct, FILE* fd);
+    /* mcqs_reg */
+    void reg_access_hca_mcqs_reg_pack(const struct reg_access_hca_mcqs_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqs_reg_unpack(struct reg_access_hca_mcqs_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mcqs_reg_size(void);
+#define REG_ACCESS_HCA_MCQS_REG_SIZE (0x10)
+    void reg_access_hca_mcqs_reg_dump(const struct reg_access_hca_mcqs_reg* ptr_struct, FILE* fd);
+    /* mfrl_reg_ext */
+    void reg_access_hca_mfrl_reg_ext_pack(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int reg_access_hca_mfrl_reg_ext_size(void);
+#define REG_ACCESS_HCA_MFRL_REG_EXT_SIZE (0x8)
+    void reg_access_hca_mfrl_reg_ext_dump(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, FILE* fd);
+    /* mfsv_reg */
+    void reg_access_hca_mfsv_reg_pack(const struct reg_access_hca_mfsv_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mfsv_reg_unpack(struct reg_access_hca_mfsv_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mfsv_reg_print(const struct reg_access_hca_mfsv_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mfsv_reg_size(void);
+#define REG_ACCESS_HCA_MFSV_REG_SIZE (0x30)
+    void reg_access_hca_mfsv_reg_dump(const struct reg_access_hca_mfsv_reg* ptr_struct, FILE* fd);
+    /* mgir */
+    void reg_access_hca_mgir_pack(const struct reg_access_hca_mgir* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_unpack(struct reg_access_hca_mgir* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_print(const struct reg_access_hca_mgir* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mgir_size(void);
+#define REG_ACCESS_HCA_MGIR_SIZE (0xa0)
+    void reg_access_hca_mgir_dump(const struct reg_access_hca_mgir* ptr_struct, FILE* fd);
+    /* mmdio */
+    void reg_access_hca_mmdio_pack(const struct reg_access_hca_mmdio* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mmdio_unpack(struct reg_access_hca_mmdio* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mmdio_print(const struct reg_access_hca_mmdio* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mmdio_size(void);
+#define REG_ACCESS_HCA_MMDIO_SIZE (0xc)
+    void reg_access_hca_mmdio_dump(const struct reg_access_hca_mmdio* ptr_struct, FILE* fd);
+    /* mpcir_ext */
+    void reg_access_hca_mpcir_ext_pack(const struct reg_access_hca_mpcir_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mpcir_ext_unpack(struct reg_access_hca_mpcir_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mpcir_ext_print(const struct reg_access_hca_mpcir_ext* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mpcir_ext_size(void);
+#define REG_ACCESS_HCA_MPCIR_EXT_SIZE (0x10)
+    void reg_access_hca_mpcir_ext_dump(const struct reg_access_hca_mpcir_ext* ptr_struct, FILE* fd);
+    /* mpegc_reg */
+    void reg_access_hca_mpegc_reg_pack(const struct reg_access_hca_mpegc_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mpegc_reg_unpack(struct reg_access_hca_mpegc_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mpegc_reg_print(const struct reg_access_hca_mpegc_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mpegc_reg_size(void);
+#define REG_ACCESS_HCA_MPEGC_REG_SIZE (0x2c)
+    void reg_access_hca_mpegc_reg_dump(const struct reg_access_hca_mpegc_reg* ptr_struct, FILE* fd);
+    /* mqis_reg */
+    void reg_access_hca_mqis_reg_pack(const struct reg_access_hca_mqis_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mqis_reg_unpack(struct reg_access_hca_mqis_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mqis_reg_print(const struct reg_access_hca_mqis_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_mqis_reg_size(void);
+#define REG_ACCESS_HCA_MQIS_REG_SIZE (0x18)
+    void reg_access_hca_mqis_reg_dump(const struct reg_access_hca_mqis_reg* ptr_struct, FILE* fd);
+    /* mtrc_cap_reg */
+    void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mtrc_cap_reg_unpack(struct reg_access_hca_mtrc_cap_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mtrc_cap_reg_print(const struct reg_access_hca_mtrc_cap_reg* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int reg_access_hca_mtrc_cap_reg_size(void);
+#define REG_ACCESS_HCA_MTRC_CAP_REG_SIZE (0x84)
+    void reg_access_hca_mtrc_cap_reg_dump(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, FILE* fd);
+    /* mtrc_stdb_reg */
+    void reg_access_hca_mtrc_stdb_reg_pack(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mtrc_stdb_reg_unpack(struct reg_access_hca_mtrc_stdb_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int reg_access_hca_mtrc_stdb_reg_size(void);
+#define REG_ACCESS_HCA_MTRC_STDB_REG_SIZE (0x8)
+    void reg_access_hca_mtrc_stdb_reg_dump(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, FILE* fd);
+    /* pcnr_reg */
+    void reg_access_hca_pcnr_reg_pack(const struct reg_access_hca_pcnr_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_pcnr_reg_unpack(struct reg_access_hca_pcnr_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_pcnr_reg_print(const struct reg_access_hca_pcnr_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_hca_pcnr_reg_size(void);
+#define REG_ACCESS_HCA_PCNR_REG_SIZE (0xc)
+    void reg_access_hca_pcnr_reg_dump(const struct reg_access_hca_pcnr_reg* ptr_struct, FILE* fd);
+    /* resource_dump */
+    void reg_access_hca_resource_dump_pack(const struct reg_access_hca_resource_dump* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_resource_dump_unpack(struct reg_access_hca_resource_dump* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int reg_access_hca_resource_dump_size(void);
+#define REG_ACCESS_HCA_RESOURCE_DUMP_SIZE (0x100)
+    void reg_access_hca_resource_dump_dump(const struct reg_access_hca_resource_dump* ptr_struct, FILE* fd);
+    /* strs_fault_inject_reg */
+    void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                                   u_int8_t* ptr_buff);
+    void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                                     const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                                    FILE* fd,
+                                                    int indent_level);
+    unsigned int reg_access_hca_strs_fault_inject_reg_size(void);
+#define REG_ACCESS_HCA_STRS_FAULT_INJECT_REG_SIZE (0x40)
+    void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
+                                                   FILE* fd);
+    /* strs_mini_flow_reg */
+    void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                                u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                                  const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level);
+    unsigned int reg_access_hca_strs_mini_flow_reg_size(void);
+#define REG_ACCESS_HCA_STRS_MINI_FLOW_REG_SIZE (0x40)
+    void reg_access_hca_strs_mini_flow_reg_dump(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, FILE* fd);
+    /* strs_resource_reg */
+    void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int reg_access_hca_strs_resource_reg_size(void);
+#define REG_ACCESS_HCA_STRS_RESOURCE_REG_SIZE (0x40)
+    void reg_access_hca_strs_resource_reg_dump(const struct reg_access_hca_strs_resource_reg* ptr_struct, FILE* fd);
+    /* strs_stop_toggle_reg */
+    void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
+    unsigned int reg_access_hca_strs_stop_toggle_reg_size(void);
+#define REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_SIZE (0x40)
+    void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
+                                                  FILE* fd);
+    /* reg_access_hca_Nodes */
+    void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
+    unsigned int reg_access_hca_reg_access_hca_Nodes_size(void);
+#define REG_ACCESS_HCA_REG_ACCESS_HCA_NODES_SIZE (0x100)
+    void reg_access_hca_reg_access_hca_Nodes_dump(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
+                                                  FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/reg_access_switch_layouts.c b/tools_layouts/reg_access_switch_layouts.c
index 6d5eab37..96a30b4e 100644
--- a/tools_layouts/reg_access_switch_layouts.c
+++ b/tools_layouts/reg_access_switch_layouts.c
@@ -29,1144 +29,1268 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2021-11-07 16:02:35"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/prm/switch/ext/reg_access_switch.adb --file-prefix reg_access_switch --prefix reg_access_switch_ --no-adb-utils
-         ***/
+ *** This file was generated at "2021-11-07 16:02:35"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/prm/switch/ext/reg_access_switch.adb --file-prefix reg_access_switch --prefix reg_access_switch_ --no-adb-utils
+ ***/
 #include "reg_access_switch_layouts.h"
 
-void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 65; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 2080, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
-	}
+    for (i = 0; i < 65; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 2080, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                  const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 65; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 2080, 1);
-		ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    for (i = 0; i < 65; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 2080, 1);
+        ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_command_payload_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_command_payload_ext ========\n");
 
-	for (i = 0; i < 65; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
-	}
+    for (i = 0; i < 65; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
 unsigned int reg_access_switch_command_payload_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_COMMAND_PAYLOAD_EXT_SIZE;
+    return REG_ACCESS_SWITCH_COMMAND_PAYLOAD_EXT_SIZE;
 }
 
-void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext *ptr_struct, FILE *fd)
+void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                FILE* fd)
 {
-	reg_access_switch_command_payload_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_command_payload_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_crspace_access_payload_ext_pack(const struct reg_access_switch_crspace_access_payload_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_crspace_access_payload_ext_pack(
+  const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->address);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
-	}
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->address);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switch_crspace_access_payload_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+                                                         const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	ptr_struct->address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
-		ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    offset = 0;
+    ptr_struct->address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
+        ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void reg_access_switch_crspace_access_payload_ext_print(const struct reg_access_switch_crspace_access_payload_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_crspace_access_payload_ext_print(
+  const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_crspace_access_payload_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_crspace_access_payload_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "address              : " U32H_FMT "\n", ptr_struct->address);
-	for (i = 0; i < 64; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "address              : " U32H_FMT "\n", ptr_struct->address);
+    for (i = 0; i < 64; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
 unsigned int reg_access_switch_crspace_access_payload_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_CRSPACE_ACCESS_PAYLOAD_EXT_SIZE;
-}
-
-void reg_access_switch_crspace_access_payload_ext_dump(const struct reg_access_switch_crspace_access_payload_ext *ptr_struct, FILE *fd)
-{
-	reg_access_switch_crspace_access_payload_ext_print(ptr_struct, fd, 0);
-}
-
-void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_index);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->flash_id);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lc_pwr_on);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->thermal_sd);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flash_owner);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->uses_flash);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_type);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_major);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_sub_minor);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_minor);
-	offset = 120;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->max_cmd_write_size_supp);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->max_cmd_read_size_supp);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 256, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type_name[i]);
-	}
-}
-
-void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->device_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->flash_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 3;
-	ptr_struct->lc_pwr_on = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->thermal_sd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->flash_owner = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->uses_flash = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->device_type = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->fw_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 80;
-	ptr_struct->fw_sub_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->fw_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 120;
-	ptr_struct->max_cmd_write_size_supp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->max_cmd_read_size_supp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 256, 1);
-		ptr_struct->device_type_name[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-}
-
-void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_device_info_ext ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_id             : " UH_FMT "\n", ptr_struct->flash_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lc_pwr_on            : " UH_FMT "\n", ptr_struct->lc_pwr_on);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "thermal_sd           : " UH_FMT "\n", ptr_struct->thermal_sd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_owner          : " UH_FMT "\n", ptr_struct->flash_owner);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uses_flash           : " UH_FMT "\n", ptr_struct->uses_flash);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_major             : " UH_FMT "\n", ptr_struct->fw_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_sub_minor         : " UH_FMT "\n", ptr_struct->fw_sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_minor             : " UH_FMT "\n", ptr_struct->fw_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_cmd_write_size_supp : " UH_FMT "\n", ptr_struct->max_cmd_write_size_supp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_cmd_read_size_supp : " UH_FMT "\n", ptr_struct->max_cmd_read_size_supp);
-	for (i = 0; i < 8; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "device_type_name_%03d : " UH_FMT "\n", i, ptr_struct->device_type_name[i]);
-	}
+    return REG_ACCESS_SWITCH_CRSPACE_ACCESS_PAYLOAD_EXT_SIZE;
+}
+
+void reg_access_switch_crspace_access_payload_ext_dump(
+  const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+  FILE* fd)
+{
+    reg_access_switch_crspace_access_payload_ext_print(ptr_struct, fd, 0);
+}
+
+void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext* ptr_struct,
+                                            u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_index);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->flash_id);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lc_pwr_on);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->thermal_sd);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->flash_owner);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->uses_flash);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_type);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_major);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_sub_minor);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_minor);
+    offset = 120;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->max_cmd_write_size_supp);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->max_cmd_read_size_supp);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 256, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_type_name[i]);
+    }
+}
+
+void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext* ptr_struct,
+                                              const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->device_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->flash_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 3;
+    ptr_struct->lc_pwr_on = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->thermal_sd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->flash_owner = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->uses_flash = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->device_type = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->fw_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 80;
+    ptr_struct->fw_sub_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->fw_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 120;
+    ptr_struct->max_cmd_write_size_supp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->max_cmd_read_size_supp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 256, 1);
+        ptr_struct->device_type_name[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+}
+
+void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_device_info_ext ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_id             : " UH_FMT "\n", ptr_struct->flash_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lc_pwr_on            : " UH_FMT "\n", ptr_struct->lc_pwr_on);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "thermal_sd           : " UH_FMT "\n", ptr_struct->thermal_sd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_owner          : " UH_FMT "\n", ptr_struct->flash_owner);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uses_flash           : " UH_FMT "\n", ptr_struct->uses_flash);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_major             : " UH_FMT "\n", ptr_struct->fw_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_sub_minor         : " UH_FMT "\n", ptr_struct->fw_sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_minor             : " UH_FMT "\n", ptr_struct->fw_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_cmd_write_size_supp : " UH_FMT "\n", ptr_struct->max_cmd_write_size_supp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_cmd_read_size_supp : " UH_FMT "\n", ptr_struct->max_cmd_read_size_supp);
+    for (i = 0; i < 8; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "device_type_name_%03d : " UH_FMT "\n", i, ptr_struct->device_type_name[i]);
+    }
 }
 
 unsigned int reg_access_switch_device_info_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_DEVICE_INFO_EXT_SIZE;
+    return REG_ACCESS_SWITCH_DEVICE_INFO_EXT_SIZE;
 }
 
-void reg_access_switch_device_info_ext_dump(const struct reg_access_switch_device_info_ext *ptr_struct, FILE *fd)
+void reg_access_switch_device_info_ext_dump(const struct reg_access_switch_device_info_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_device_info_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_device_info_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_switch_prm_register_payload_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+                                                     u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->register_id);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->method);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->register_data[i]);
-	}
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->register_id);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->method);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->register_data[i]);
+    }
 }
 
-void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+                                                       const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 16;
-	ptr_struct->register_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->method = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 0;
-	ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
-		ptr_struct->register_data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    offset = 16;
+    ptr_struct->register_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->method = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 0;
+    ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 2080, 1);
+        ptr_struct->register_data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void reg_access_switch_prm_register_payload_ext_print(const struct reg_access_switch_prm_register_payload_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_prm_register_payload_ext_print(
+  const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_prm_register_payload_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_prm_register_payload_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "register_id          : " UH_FMT "\n", ptr_struct->register_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "method               : " UH_FMT "\n", ptr_struct->method);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
-	for (i = 0; i < 64; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "register_data_%03d   : " U32H_FMT "\n", i, ptr_struct->register_data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "register_id          : " UH_FMT "\n", ptr_struct->register_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "method               : " UH_FMT "\n", ptr_struct->method);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
+    for (i = 0; i < 64; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "register_data_%03d   : " U32H_FMT "\n", i, ptr_struct->register_data[i]);
+    }
 }
 
 unsigned int reg_access_switch_prm_register_payload_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_PRM_REGISTER_PAYLOAD_EXT_SIZE;
+    return REG_ACCESS_SWITCH_PRM_REGISTER_PAYLOAD_EXT_SIZE;
 }
 
-void reg_access_switch_prm_register_payload_ext_dump(const struct reg_access_switch_prm_register_payload_ext *ptr_struct, FILE *fd)
+void reg_access_switch_prm_register_payload_ext_dump(const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+                                                     FILE* fd)
 {
-	reg_access_switch_prm_register_payload_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_prm_register_payload_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_info_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_info_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lc_ready);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sr_valid);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->provisioned);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->ini_file_version);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_revision);
-	offset = 88;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->card_type);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->active);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lc_ready);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sr_valid);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->provisioned);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->ini_file_version);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_revision);
+    offset = 88;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->card_type);
 }
 
-void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->lc_ready = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 1;
-	ptr_struct->sr_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->provisioned = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->ini_file_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->hw_revision = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 88;
-	ptr_struct->card_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 4;
+    ptr_struct->active = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->lc_ready = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 1;
+    ptr_struct->sr_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->provisioned = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->ini_file_version = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->hw_revision = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 88;
+    ptr_struct->card_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_slot_info_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_slot_info_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lc_ready             : " UH_FMT "\n", ptr_struct->lc_ready);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sr_valid             : " UH_FMT "\n", ptr_struct->sr_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "provisioned          : " UH_FMT "\n", ptr_struct->provisioned);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini_file_version     : " UH_FMT "\n", ptr_struct->ini_file_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_revision          : " UH_FMT "\n", ptr_struct->hw_revision);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "card_type            : " UH_FMT "\n", ptr_struct->card_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "active               : " UH_FMT "\n", ptr_struct->active);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lc_ready             : " UH_FMT "\n", ptr_struct->lc_ready);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sr_valid             : " UH_FMT "\n", ptr_struct->sr_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "provisioned          : " UH_FMT "\n", ptr_struct->provisioned);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini_file_version     : " UH_FMT "\n", ptr_struct->ini_file_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_revision          : " UH_FMT "\n", ptr_struct->hw_revision);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "card_type            : " UH_FMT "\n", ptr_struct->card_type);
 }
 
 unsigned int reg_access_switch_slot_info_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_SLOT_INFO_EXT_SIZE;
+    return REG_ACCESS_SWITCH_SLOT_INFO_EXT_SIZE;
 }
 
-void reg_access_switch_slot_info_ext_dump(const struct reg_access_switch_slot_info_ext *ptr_struct, FILE *fd)
+void reg_access_switch_slot_info_ext_dump(const struct reg_access_switch_slot_info_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_slot_info_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_slot_info_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_name_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_name_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 20; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 256, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->slot_ascii_name[i]);
-	}
+    for (i = 0; i < 20; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 256, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->slot_ascii_name[i]);
+    }
 }
 
-void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 20; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 256, 1);
-		ptr_struct->slot_ascii_name[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+    for (i = 0; i < 20; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 256, 1);
+        ptr_struct->slot_ascii_name[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_slot_name_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_slot_name_ext ========\n");
 
-	for (i = 0; i < 20; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "slot_ascii_name_%03d : " UH_FMT "\n", i, ptr_struct->slot_ascii_name[i]);
-	}
+    for (i = 0; i < 20; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "slot_ascii_name_%03d : " UH_FMT "\n", i, ptr_struct->slot_ascii_name[i]);
+    }
 }
 
 unsigned int reg_access_switch_slot_name_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_SLOT_NAME_EXT_SIZE;
+    return REG_ACCESS_SWITCH_SLOT_NAME_EXT_SIZE;
 }
 
-void reg_access_switch_slot_name_ext_dump(const struct reg_access_switch_slot_name_ext *ptr_struct, FILE *fd)
+void reg_access_switch_slot_name_ext_dump(const struct reg_access_switch_slot_name_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_slot_name_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_slot_name_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                               u_int8_t* ptr_buff)
 {
-	reg_access_switch_slot_info_ext_pack(&(ptr_struct->slot_info_ext), ptr_buff);
+    reg_access_switch_slot_info_ext_pack(&(ptr_struct->slot_info_ext), ptr_buff);
 }
 
-void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                                 const u_int8_t* ptr_buff)
 {
-	reg_access_switch_slot_info_ext_unpack(&(ptr_struct->slot_info_ext), ptr_buff);
+    reg_access_switch_slot_info_ext_unpack(&(ptr_struct->slot_info_ext), ptr_buff);
 }
 
-void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mddq_data_auto_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mddq_data_auto_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "slot_info_ext:\n");
-	reg_access_switch_slot_info_ext_print(&(ptr_struct->slot_info_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_info_ext:\n");
-	reg_access_switch_device_info_ext_print(&(ptr_struct->device_info_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "slot_name_ext:\n");
-	reg_access_switch_slot_name_ext_print(&(ptr_struct->slot_name_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "slot_info_ext:\n");
+    reg_access_switch_slot_info_ext_print(&(ptr_struct->slot_info_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_info_ext:\n");
+    reg_access_switch_device_info_ext_print(&(ptr_struct->device_info_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "slot_name_ext:\n");
+    reg_access_switch_slot_name_ext_print(&(ptr_struct->slot_name_ext), fd, indent_level + 1);
 }
 
 unsigned int reg_access_switch_mddq_data_auto_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MDDQ_DATA_AUTO_EXT_SIZE;
+    return REG_ACCESS_SWITCH_MDDQ_DATA_AUTO_EXT_SIZE;
 }
 
-void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mddq_data_auto_ext *ptr_struct, FILE *fd)
+void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mddq_data_auto_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_mddq_data_auto_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_mddq_data_auto_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_pack(const union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_mddt_reg_payload_auto_ext_pack(
+  const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->prm_register_payload_ext), ptr_buff);
+    reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->prm_register_payload_ext), ptr_buff);
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+                                                        const u_int8_t* ptr_buff)
 {
-	reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->prm_register_payload_ext), ptr_buff);
+    reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->prm_register_payload_ext), ptr_buff);
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_print(const union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_mddt_reg_payload_auto_ext_print(
+  const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mddt_reg_payload_auto_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mddt_reg_payload_auto_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "prm_register_payload_ext:\n");
-	reg_access_switch_prm_register_payload_ext_print(&(ptr_struct->prm_register_payload_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "command_payload_ext:\n");
-	reg_access_switch_command_payload_ext_print(&(ptr_struct->command_payload_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crspace_access_payload_ext:\n");
-	reg_access_switch_crspace_access_payload_ext_print(&(ptr_struct->crspace_access_payload_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "prm_register_payload_ext:\n");
+    reg_access_switch_prm_register_payload_ext_print(&(ptr_struct->prm_register_payload_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "command_payload_ext:\n");
+    reg_access_switch_command_payload_ext_print(&(ptr_struct->command_payload_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crspace_access_payload_ext:\n");
+    reg_access_switch_crspace_access_payload_ext_print(&(ptr_struct->crspace_access_payload_ext), fd, indent_level + 1);
 }
 
 unsigned int reg_access_switch_mddt_reg_payload_auto_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MDDT_REG_PAYLOAD_AUTO_EXT_SIZE;
+    return REG_ACCESS_SWITCH_MDDT_REG_PAYLOAD_AUTO_EXT_SIZE;
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_dump(const union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, FILE *fd)
+void reg_access_switch_mddt_reg_payload_auto_ext_dump(
+  const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+  FILE* fd)
 {
-	reg_access_switch_mddt_reg_payload_auto_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_mddt_reg_payload_auto_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
 }
 
-void reg_access_switch_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	*ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    *ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_switch_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_uint64 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_uint64 ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t) *ptr_struct);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t)*ptr_struct);
 }
 
 unsigned int reg_access_switch_uint64_size(void)
 {
-	return REG_ACCESS_SWITCH_UINT64_SIZE;
+    return REG_ACCESS_SWITCH_UINT64_SIZE;
 }
 
-void reg_access_switch_uint64_dump(const u_int64_t *ptr_struct, FILE *fd)
+void reg_access_switch_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
 {
-	reg_access_switch_uint64_print(ptr_struct, fd, 0);
+    reg_access_switch_uint64_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_icam_reg_ext_pack(const struct reg_access_switch_icam_reg_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_icam_reg_ext_pack(const struct reg_access_switch_icam_reg_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->access_reg_group);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(64, 32, i, 192, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->infr_access_reg_cap_mask[i]);
-	}
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->access_reg_group);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(64, 32, i, 192, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->infr_access_reg_cap_mask[i]);
+    }
 }
 
-void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 24;
-	ptr_struct->access_reg_group = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(64, 32, i, 192, 1);
-		ptr_struct->infr_access_reg_cap_mask[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    offset = 24;
+    ptr_struct->access_reg_group = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(64, 32, i, 192, 1);
+        ptr_struct->infr_access_reg_cap_mask[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_icam_reg_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_icam_reg_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "access_reg_group     : " UH_FMT "\n", ptr_struct->access_reg_group);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "infr_access_reg_cap_mask_%03d : " U32H_FMT "\n", i, ptr_struct->infr_access_reg_cap_mask[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "access_reg_group     : " UH_FMT "\n", ptr_struct->access_reg_group);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "infr_access_reg_cap_mask_%03d : " U32H_FMT "\n", i, ptr_struct->infr_access_reg_cap_mask[i]);
+    }
 }
 
 unsigned int reg_access_switch_icam_reg_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_ICAM_REG_EXT_SIZE;
+    return REG_ACCESS_SWITCH_ICAM_REG_EXT_SIZE;
 }
 
-void reg_access_switch_icam_reg_ext_dump(const struct reg_access_switch_icam_reg_ext *ptr_struct, FILE *fd)
+void reg_access_switch_icam_reg_ext_dump(const struct reg_access_switch_icam_reg_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_icam_reg_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_icam_reg_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_icsr_ext_pack(const struct reg_access_switch_icsr_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_icsr_ext_pack(const struct reg_access_switch_icsr_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->base_address);
-	offset = 87;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->num_reads);
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 8320, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
-	}
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->base_address);
+    offset = 87;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->num_reads);
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 8320, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void reg_access_switch_icsr_ext_unpack(struct reg_access_switch_icsr_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_icsr_ext_unpack(struct reg_access_switch_icsr_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 32;
-	ptr_struct->base_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 87;
-	ptr_struct->num_reads = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(128, 32, i, 8320, 1);
-		ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    offset = 32;
+    ptr_struct->base_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 87;
+    ptr_struct->num_reads = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(128, 32, i, 8320, 1);
+        ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void reg_access_switch_icsr_ext_print(const struct reg_access_switch_icsr_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_icsr_ext_print(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_icsr_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_icsr_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "base_address         : " U32H_FMT "\n", ptr_struct->base_address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_reads            : " UH_FMT "\n", ptr_struct->num_reads);
-	for (i = 0; i < 256; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "base_address         : " U32H_FMT "\n", ptr_struct->base_address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_reads            : " UH_FMT "\n", ptr_struct->num_reads);
+    for (i = 0; i < 256; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
 unsigned int reg_access_switch_icsr_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_ICSR_EXT_SIZE;
-}
-
-void reg_access_switch_icsr_ext_dump(const struct reg_access_switch_icsr_ext *ptr_struct, FILE *fd)
-{
-	reg_access_switch_icsr_ext_print(ptr_struct, fd, 0);
-}
-
-void reg_access_switch_mddq_ext_pack(const struct reg_access_switch_mddq_ext *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->slot_index);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->query_type);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sie);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->request_message_sequence);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->response_message_sequence);
-	offset = 88;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->query_index);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->data_valid);
-	offset = 128;
-	switch (ptr_struct->query_type) {
-	case 0x1:
-		offset = 128;
-		reg_access_switch_slot_info_ext_pack(&(ptr_struct->data.slot_info_ext), ptr_buff + offset / 8);
-		break;
-	case 0x2:
-		offset = 128;
-		reg_access_switch_device_info_ext_pack(&(ptr_struct->data.device_info_ext), ptr_buff + offset / 8);
-		break;
-	case 0x3:
-		offset = 128;
-		reg_access_switch_slot_name_ext_pack(&(ptr_struct->data.slot_name_ext), ptr_buff + offset / 8);
-		break;
-	default:
-		break;
-	}
-}
-
-void reg_access_switch_mddq_ext_unpack(struct reg_access_switch_mddq_ext *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 28;
-	ptr_struct->slot_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 8;
-	ptr_struct->query_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->sie = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->request_message_sequence = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 40;
-	ptr_struct->response_message_sequence = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 88;
-	ptr_struct->query_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->data_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 128;
-	switch (ptr_struct->query_type) {
-	case 0x1:
-		offset = 128;
-		reg_access_switch_slot_info_ext_unpack(&(ptr_struct->data.slot_info_ext), ptr_buff + offset / 8);
-		break;
-	case 0x2:
-		offset = 128;
-		reg_access_switch_device_info_ext_unpack(&(ptr_struct->data.device_info_ext), ptr_buff + offset / 8);
-		break;
-	case 0x3:
-		offset = 128;
-		reg_access_switch_slot_name_ext_unpack(&(ptr_struct->data.slot_name_ext), ptr_buff + offset / 8);
-		break;
-	default:
-		break;
-	}
-}
-
-void reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mddq_ext ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "query_type           : %s (" UH_FMT ")\n", (ptr_struct->query_type == 0 ? ("Reserved") : ((ptr_struct->query_type == 1 ? ("slot_info") : ((ptr_struct->query_type == 2 ? ("device_info") : ((ptr_struct->query_type == 3 ? ("slot_name") : ("unknown")))))))), ptr_struct->query_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sie                  : " UH_FMT "\n", ptr_struct->sie);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "request_message_sequence : " UH_FMT "\n", ptr_struct->request_message_sequence);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "response_message_sequence : " UH_FMT "\n", ptr_struct->response_message_sequence);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "query_index          : " UH_FMT "\n", ptr_struct->query_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data_valid           : " UH_FMT "\n", ptr_struct->data_valid);
-	switch (ptr_struct->query_type) {
-	case 0x1:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "slot_info_ext:\n");
-		reg_access_switch_slot_info_ext_print(&(ptr_struct->data.slot_info_ext), fd, indent_level + 1);
-		break;
-	case 0x2:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "device_info_ext:\n");
-		reg_access_switch_device_info_ext_print(&(ptr_struct->data.device_info_ext), fd, indent_level + 1);
-		break;
-	case 0x3:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "slot_name_ext:\n");
-		reg_access_switch_slot_name_ext_print(&(ptr_struct->data.slot_name_ext), fd, indent_level + 1);
-		break;
-	default:
-		break;
-	}
+    return REG_ACCESS_SWITCH_ICSR_EXT_SIZE;
+}
+
+void reg_access_switch_icsr_ext_dump(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd)
+{
+    reg_access_switch_icsr_ext_print(ptr_struct, fd, 0);
+}
+
+void reg_access_switch_mddq_ext_pack(const struct reg_access_switch_mddq_ext* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->slot_index);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->query_type);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sie);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->request_message_sequence);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->response_message_sequence);
+    offset = 88;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->query_index);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->data_valid);
+    offset = 128;
+    switch (ptr_struct->query_type)
+    {
+        case 0x1:
+            offset = 128;
+            reg_access_switch_slot_info_ext_pack(&(ptr_struct->data.slot_info_ext), ptr_buff + offset / 8);
+            break;
+        case 0x2:
+            offset = 128;
+            reg_access_switch_device_info_ext_pack(&(ptr_struct->data.device_info_ext), ptr_buff + offset / 8);
+            break;
+        case 0x3:
+            offset = 128;
+            reg_access_switch_slot_name_ext_pack(&(ptr_struct->data.slot_name_ext), ptr_buff + offset / 8);
+            break;
+        default:
+            break;
+    }
+}
+
+void reg_access_switch_mddq_ext_unpack(struct reg_access_switch_mddq_ext* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 28;
+    ptr_struct->slot_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 8;
+    ptr_struct->query_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->sie = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->request_message_sequence = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 40;
+    ptr_struct->response_message_sequence = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 88;
+    ptr_struct->query_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->data_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 128;
+    switch (ptr_struct->query_type)
+    {
+        case 0x1:
+            offset = 128;
+            reg_access_switch_slot_info_ext_unpack(&(ptr_struct->data.slot_info_ext), ptr_buff + offset / 8);
+            break;
+        case 0x2:
+            offset = 128;
+            reg_access_switch_device_info_ext_unpack(&(ptr_struct->data.device_info_ext), ptr_buff + offset / 8);
+            break;
+        case 0x3:
+            offset = 128;
+            reg_access_switch_slot_name_ext_unpack(&(ptr_struct->data.slot_name_ext), ptr_buff + offset / 8);
+            break;
+        default:
+            break;
+    }
+}
+
+void reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mddq_ext ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "query_type           : %s (" UH_FMT ")\n",
+            (ptr_struct->query_type == 0 ?
+               ("Reserved") :
+               ((ptr_struct->query_type == 1 ?
+                   ("slot_info") :
+                   ((ptr_struct->query_type == 2 ? ("device_info") :
+                                                   ((ptr_struct->query_type == 3 ? ("slot_name") : ("unknown")))))))),
+            ptr_struct->query_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sie                  : " UH_FMT "\n", ptr_struct->sie);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "request_message_sequence : " UH_FMT "\n", ptr_struct->request_message_sequence);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "response_message_sequence : " UH_FMT "\n", ptr_struct->response_message_sequence);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "query_index          : " UH_FMT "\n", ptr_struct->query_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data_valid           : " UH_FMT "\n", ptr_struct->data_valid);
+    switch (ptr_struct->query_type)
+    {
+        case 0x1:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "slot_info_ext:\n");
+            reg_access_switch_slot_info_ext_print(&(ptr_struct->data.slot_info_ext), fd, indent_level + 1);
+            break;
+        case 0x2:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "device_info_ext:\n");
+            reg_access_switch_device_info_ext_print(&(ptr_struct->data.device_info_ext), fd, indent_level + 1);
+            break;
+        case 0x3:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "slot_name_ext:\n");
+            reg_access_switch_slot_name_ext_print(&(ptr_struct->data.slot_name_ext), fd, indent_level + 1);
+            break;
+        default:
+            break;
+    }
 }
 
 unsigned int reg_access_switch_mddq_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MDDQ_EXT_SIZE;
-}
-
-void reg_access_switch_mddq_ext_dump(const struct reg_access_switch_mddq_ext *ptr_struct, FILE *fd)
-{
-	reg_access_switch_mddq_ext_print(ptr_struct, fd, 0);
-}
-
-void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg_ext *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_index);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->slot_index);
-	offset = 62;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->type);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->write_size);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->read_size);
-	offset = 96;
-	switch (ptr_struct->type) {
-	case 0x0:
-		offset = 96;
-		reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->payload.prm_register_payload_ext), ptr_buff + offset / 8);
-		break;
-	case 0x1:
-		offset = 96;
-		reg_access_switch_command_payload_ext_pack(&(ptr_struct->payload.command_payload_ext), ptr_buff + offset / 8);
-		break;
-	case 0x2:
-		offset = 96;
-		reg_access_switch_crspace_access_payload_ext_pack(&(ptr_struct->payload.crspace_access_payload_ext), ptr_buff + offset / 8);
-		break;
-	default:
-		break;
-	}
-}
-
-void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->device_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 20;
-	ptr_struct->slot_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 62;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 40;
-	ptr_struct->write_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->read_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 96;
-	switch (ptr_struct->type) {
-	case 0x0:
-		offset = 96;
-		reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->payload.prm_register_payload_ext), ptr_buff + offset / 8);
-		break;
-	case 0x1:
-		offset = 96;
-		reg_access_switch_command_payload_ext_unpack(&(ptr_struct->payload.command_payload_ext), ptr_buff + offset / 8);
-		break;
-	case 0x2:
-		offset = 96;
-		reg_access_switch_crspace_access_payload_ext_unpack(&(ptr_struct->payload.crspace_access_payload_ext), ptr_buff + offset / 8);
-		break;
-	default:
-		break;
-	}
-}
-
-void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mddt_reg_ext ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("PRM_Register") : ((ptr_struct->type == 1 ? ("Command") : ((ptr_struct->type == 2 ? ("CrSpace_access") : ("unknown")))))), ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "write_size           : " UH_FMT "\n", ptr_struct->write_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_size            : " UH_FMT "\n", ptr_struct->read_size);
-	switch (ptr_struct->type) {
-	case 0x0:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "prm_register_payload_ext:\n");
-		reg_access_switch_prm_register_payload_ext_print(&(ptr_struct->payload.prm_register_payload_ext), fd, indent_level + 1);
-		break;
-	case 0x1:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "command_payload_ext:\n");
-		reg_access_switch_command_payload_ext_print(&(ptr_struct->payload.command_payload_ext), fd, indent_level + 1);
-		break;
-	case 0x2:
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "crspace_access_payload_ext:\n");
-		reg_access_switch_crspace_access_payload_ext_print(&(ptr_struct->payload.crspace_access_payload_ext), fd, indent_level + 1);
-		break;
-	default:
-		break;
-	}
+    return REG_ACCESS_SWITCH_MDDQ_EXT_SIZE;
+}
+
+void reg_access_switch_mddq_ext_dump(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd)
+{
+    reg_access_switch_mddq_ext_print(ptr_struct, fd, 0);
+}
+
+void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg_ext* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->device_index);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->slot_index);
+    offset = 62;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->type);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->write_size);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->read_size);
+    offset = 96;
+    switch (ptr_struct->type)
+    {
+        case 0x0:
+            offset = 96;
+            reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->payload.prm_register_payload_ext),
+                                                            ptr_buff + offset / 8);
+            break;
+        case 0x1:
+            offset = 96;
+            reg_access_switch_command_payload_ext_pack(&(ptr_struct->payload.command_payload_ext),
+                                                       ptr_buff + offset / 8);
+            break;
+        case 0x2:
+            offset = 96;
+            reg_access_switch_crspace_access_payload_ext_pack(&(ptr_struct->payload.crspace_access_payload_ext),
+                                                              ptr_buff + offset / 8);
+            break;
+        default:
+            break;
+    }
+}
+
+void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->device_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 20;
+    ptr_struct->slot_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 62;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 40;
+    ptr_struct->write_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->read_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 96;
+    switch (ptr_struct->type)
+    {
+        case 0x0:
+            offset = 96;
+            reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->payload.prm_register_payload_ext),
+                                                              ptr_buff + offset / 8);
+            break;
+        case 0x1:
+            offset = 96;
+            reg_access_switch_command_payload_ext_unpack(&(ptr_struct->payload.command_payload_ext),
+                                                         ptr_buff + offset / 8);
+            break;
+        case 0x2:
+            offset = 96;
+            reg_access_switch_crspace_access_payload_ext_unpack(&(ptr_struct->payload.crspace_access_payload_ext),
+                                                                ptr_buff + offset / 8);
+            break;
+        default:
+            break;
+    }
+}
+
+void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mddt_reg_ext ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
+            (ptr_struct->type == 0 ?
+               ("PRM_Register") :
+               ((ptr_struct->type == 1 ? ("Command") : ((ptr_struct->type == 2 ? ("CrSpace_access") : ("unknown")))))),
+            ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "write_size           : " UH_FMT "\n", ptr_struct->write_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_size            : " UH_FMT "\n", ptr_struct->read_size);
+    switch (ptr_struct->type)
+    {
+        case 0x0:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "prm_register_payload_ext:\n");
+            reg_access_switch_prm_register_payload_ext_print(&(ptr_struct->payload.prm_register_payload_ext), fd,
+                                                             indent_level + 1);
+            break;
+        case 0x1:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "command_payload_ext:\n");
+            reg_access_switch_command_payload_ext_print(&(ptr_struct->payload.command_payload_ext), fd,
+                                                        indent_level + 1);
+            break;
+        case 0x2:
+            adb2c_add_indentation(fd, indent_level);
+            fprintf(fd, "crspace_access_payload_ext:\n");
+            reg_access_switch_crspace_access_payload_ext_print(&(ptr_struct->payload.crspace_access_payload_ext), fd,
+                                                               indent_level + 1);
+            break;
+        default:
+            break;
+    }
 }
 
 unsigned int reg_access_switch_mddt_reg_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MDDT_REG_EXT_SIZE;
+    return REG_ACCESS_SWITCH_MDDT_REG_EXT_SIZE;
 }
 
-void reg_access_switch_mddt_reg_ext_dump(const struct reg_access_switch_mddt_reg_ext *ptr_struct, FILE *fd)
+void reg_access_switch_mddt_reg_ext_dump(const struct reg_access_switch_mddt_reg_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_mddt_reg_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_mddt_reg_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_mdsr_reg_ext_pack(const struct reg_access_switch_mdsr_reg_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_mdsr_reg_ext_pack(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->status);
-	offset = 18;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->additional_info);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type_of_token);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->end);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->time_left);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->status);
+    offset = 18;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->additional_info);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type_of_token);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->end);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->time_left);
 }
 
-void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 18;
-	ptr_struct->additional_info = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 0;
-	ptr_struct->type_of_token = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->end = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->time_left = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 28;
+    ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 18;
+    ptr_struct->additional_info = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 0;
+    ptr_struct->type_of_token = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->end = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->time_left = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mdsr_reg_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mdsr_reg_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "additional_info      : " UH_FMT "\n", ptr_struct->additional_info);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type_of_token        : " UH_FMT "\n", ptr_struct->type_of_token);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "end                  : " UH_FMT "\n", ptr_struct->end);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "time_left            : " U32H_FMT "\n", ptr_struct->time_left);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "additional_info      : " UH_FMT "\n", ptr_struct->additional_info);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type_of_token        : " UH_FMT "\n", ptr_struct->type_of_token);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "end                  : " UH_FMT "\n", ptr_struct->end);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "time_left            : " U32H_FMT "\n", ptr_struct->time_left);
 }
 
 unsigned int reg_access_switch_mdsr_reg_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MDSR_REG_EXT_SIZE;
+    return REG_ACCESS_SWITCH_MDSR_REG_EXT_SIZE;
 }
 
-void reg_access_switch_mdsr_reg_ext_dump(const struct reg_access_switch_mdsr_reg_ext *ptr_struct, FILE *fd)
+void reg_access_switch_mdsr_reg_ext_dump(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_mdsr_reg_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_mdsr_reg_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_mkdc_reg_ext_pack(const struct reg_access_switch_mkdc_reg_ext *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_mkdc_reg_ext_pack(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->error_code);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->session_id);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->current_keep_alive_counter);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->next_keep_alive_counter);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->error_code);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->session_id);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->current_keep_alive_counter);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->next_keep_alive_counter);
 }
 
-void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	ptr_struct->error_code = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 0;
-	ptr_struct->session_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->current_keep_alive_counter = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->next_keep_alive_counter = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 28;
+    ptr_struct->error_code = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 0;
+    ptr_struct->session_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->current_keep_alive_counter = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->next_keep_alive_counter = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mkdc_reg_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mkdc_reg_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "error_code           : %s (" UH_FMT ")\n", (ptr_struct->error_code == 0 ? ("OK") : ((ptr_struct->error_code == 1 ? ("BAD_SESSION_ID") : ((ptr_struct->error_code == 2 ? ("BAD_KEEP_ALIVE_COUNTER") : ((ptr_struct->error_code == 3 ? ("BAD_SOURCE_ADDRESS") : ((ptr_struct->error_code == 4 ? ("SESSION_TIMEOUT") : ("unknown")))))))))), ptr_struct->error_code);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "session_id           : " UH_FMT "\n", ptr_struct->session_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "current_keep_alive_counter : " U32H_FMT "\n", ptr_struct->current_keep_alive_counter);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "next_keep_alive_counter : " U32H_FMT "\n", ptr_struct->next_keep_alive_counter);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "error_code           : %s (" UH_FMT ")\n",
+            (ptr_struct->error_code == 0 ?
+               ("OK") :
+               ((ptr_struct->error_code == 1 ?
+                   ("BAD_SESSION_ID") :
+                   ((ptr_struct->error_code == 2 ?
+                       ("BAD_KEEP_ALIVE_COUNTER") :
+                       ((ptr_struct->error_code == 3 ?
+                           ("BAD_SOURCE_ADDRESS") :
+                           ((ptr_struct->error_code == 4 ? ("SESSION_TIMEOUT") : ("unknown")))))))))),
+            ptr_struct->error_code);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "session_id           : " UH_FMT "\n", ptr_struct->session_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "current_keep_alive_counter : " U32H_FMT "\n", ptr_struct->current_keep_alive_counter);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "next_keep_alive_counter : " U32H_FMT "\n", ptr_struct->next_keep_alive_counter);
 }
 
 unsigned int reg_access_switch_mkdc_reg_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MKDC_REG_EXT_SIZE;
-}
-
-void reg_access_switch_mkdc_reg_ext_dump(const struct reg_access_switch_mkdc_reg_ext *ptr_struct, FILE *fd)
-{
-	reg_access_switch_mkdc_reg_ext_print(ptr_struct, fd, 0);
-}
-
-void reg_access_switch_mtcq_reg_ext_pack(const struct reg_access_switch_mtcq_reg_ext *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->token_opcode);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 896, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
-	}
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->base_mac);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(224, 32, i, 896, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 376;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_version_39_32);
-	offset = 384;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->fw_version_31_0);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(416, 32, i, 896, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->source_address[i]);
-	}
-	offset = 560;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->session_id);
-	offset = 544;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->challenge_version);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(576, 32, i, 896, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->challenge[i]);
-	}
-}
-
-void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 20;
-	ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 8;
-	ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->token_opcode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(32, 32, i, 896, 1);
-		ptr_struct->keypair_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	offset = 160;
-	ptr_struct->base_mac = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(224, 32, i, 896, 1);
-		ptr_struct->psid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	offset = 376;
-	ptr_struct->fw_version_39_32 = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 384;
-	ptr_struct->fw_version_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(416, 32, i, 896, 1);
-		ptr_struct->source_address[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	offset = 560;
-	ptr_struct->session_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 544;
-	ptr_struct->challenge_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 8; ++i) {
-		offset = adb2c_calc_array_field_address(576, 32, i, 896, 1);
-		ptr_struct->challenge[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-}
-
-void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_mtcq_reg_ext ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "token_opcode         : " UH_FMT "\n", ptr_struct->token_opcode);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "keypair_uuid_%03d    : " U32H_FMT "\n", i, ptr_struct->keypair_uuid[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "base_mac             : " U64H_FMT "\n", ptr_struct->base_mac);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "psid_%03d            : " U32H_FMT "\n", i, ptr_struct->psid[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_version_39_32     : " UH_FMT "\n", ptr_struct->fw_version_39_32);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_version_31_0      : " U32H_FMT "\n", ptr_struct->fw_version_31_0);
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "source_address_%03d  : " U32H_FMT "\n", i, ptr_struct->source_address[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "session_id           : " UH_FMT "\n", ptr_struct->session_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "challenge_version    : " UH_FMT "\n", ptr_struct->challenge_version);
-	for (i = 0; i < 8; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "challenge_%03d       : " U32H_FMT "\n", i, ptr_struct->challenge[i]);
-	}
+    return REG_ACCESS_SWITCH_MKDC_REG_EXT_SIZE;
+}
+
+void reg_access_switch_mkdc_reg_ext_dump(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, FILE* fd)
+{
+    reg_access_switch_mkdc_reg_ext_print(ptr_struct, fd, 0);
+}
+
+void reg_access_switch_mtcq_reg_ext_pack(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->device_index);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->token_opcode);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 896, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->keypair_uuid[i]);
+    }
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->base_mac);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(224, 32, i, 896, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 376;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_version_39_32);
+    offset = 384;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->fw_version_31_0);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(416, 32, i, 896, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->source_address[i]);
+    }
+    offset = 560;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->session_id);
+    offset = 544;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->challenge_version);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(576, 32, i, 896, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->challenge[i]);
+    }
+}
+
+void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 20;
+    ptr_struct->device_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 8;
+    ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->token_opcode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(32, 32, i, 896, 1);
+        ptr_struct->keypair_uuid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    offset = 160;
+    ptr_struct->base_mac = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(224, 32, i, 896, 1);
+        ptr_struct->psid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    offset = 376;
+    ptr_struct->fw_version_39_32 = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 384;
+    ptr_struct->fw_version_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(416, 32, i, 896, 1);
+        ptr_struct->source_address[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    offset = 560;
+    ptr_struct->session_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 544;
+    ptr_struct->challenge_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 8; ++i)
+    {
+        offset = adb2c_calc_array_field_address(576, 32, i, 896, 1);
+        ptr_struct->challenge[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+}
+
+void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_mtcq_reg_ext ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "token_opcode         : " UH_FMT "\n", ptr_struct->token_opcode);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "keypair_uuid_%03d    : " U32H_FMT "\n", i, ptr_struct->keypair_uuid[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "base_mac             : " U64H_FMT "\n", ptr_struct->base_mac);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "psid_%03d            : " U32H_FMT "\n", i, ptr_struct->psid[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_version_39_32     : " UH_FMT "\n", ptr_struct->fw_version_39_32);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_version_31_0      : " U32H_FMT "\n", ptr_struct->fw_version_31_0);
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "source_address_%03d  : " U32H_FMT "\n", i, ptr_struct->source_address[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "session_id           : " UH_FMT "\n", ptr_struct->session_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "challenge_version    : " UH_FMT "\n", ptr_struct->challenge_version);
+    for (i = 0; i < 8; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "challenge_%03d       : " U32H_FMT "\n", i, ptr_struct->challenge[i]);
+    }
 }
 
 unsigned int reg_access_switch_mtcq_reg_ext_size(void)
 {
-	return REG_ACCESS_SWITCH_MTCQ_REG_EXT_SIZE;
+    return REG_ACCESS_SWITCH_MTCQ_REG_EXT_SIZE;
 }
 
-void reg_access_switch_mtcq_reg_ext_dump(const struct reg_access_switch_mtcq_reg_ext *ptr_struct, FILE *fd)
+void reg_access_switch_mtcq_reg_ext_dump(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, FILE* fd)
 {
-	reg_access_switch_mtcq_reg_ext_print(ptr_struct, fd, 0);
+    reg_access_switch_mtcq_reg_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                    u_int8_t* ptr_buff)
 {
-	reg_access_switch_icsr_ext_pack(&(ptr_struct->icsr_ext), ptr_buff);
+    reg_access_switch_icsr_ext_pack(&(ptr_struct->icsr_ext), ptr_buff);
 }
 
-void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                      const u_int8_t* ptr_buff)
 {
-	reg_access_switch_icsr_ext_unpack(&(ptr_struct->icsr_ext), ptr_buff);
+    reg_access_switch_icsr_ext_unpack(&(ptr_struct->icsr_ext), ptr_buff);
 }
 
-void reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes *ptr_struct, FILE *fd, int indent_level)
+void reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== reg_access_switch_reg_access_switch_Nodes ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== reg_access_switch_reg_access_switch_Nodes ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mddt_reg_ext:\n");
-	reg_access_switch_mddt_reg_ext_print(&(ptr_struct->mddt_reg_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "icam_reg_ext:\n");
-	reg_access_switch_icam_reg_ext_print(&(ptr_struct->icam_reg_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mdsr_reg_ext:\n");
-	reg_access_switch_mdsr_reg_ext_print(&(ptr_struct->mdsr_reg_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mkdc_reg_ext:\n");
-	reg_access_switch_mkdc_reg_ext_print(&(ptr_struct->mkdc_reg_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mtcq_reg_ext:\n");
-	reg_access_switch_mtcq_reg_ext_print(&(ptr_struct->mtcq_reg_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mddq_ext:\n");
-	reg_access_switch_mddq_ext_print(&(ptr_struct->mddq_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "icsr_ext:\n");
-	reg_access_switch_icsr_ext_print(&(ptr_struct->icsr_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mddt_reg_ext:\n");
+    reg_access_switch_mddt_reg_ext_print(&(ptr_struct->mddt_reg_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "icam_reg_ext:\n");
+    reg_access_switch_icam_reg_ext_print(&(ptr_struct->icam_reg_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mdsr_reg_ext:\n");
+    reg_access_switch_mdsr_reg_ext_print(&(ptr_struct->mdsr_reg_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mkdc_reg_ext:\n");
+    reg_access_switch_mkdc_reg_ext_print(&(ptr_struct->mkdc_reg_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mtcq_reg_ext:\n");
+    reg_access_switch_mtcq_reg_ext_print(&(ptr_struct->mtcq_reg_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mddq_ext:\n");
+    reg_access_switch_mddq_ext_print(&(ptr_struct->mddq_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "icsr_ext:\n");
+    reg_access_switch_icsr_ext_print(&(ptr_struct->icsr_ext), fd, indent_level + 1);
 }
 
 unsigned int reg_access_switch_reg_access_switch_Nodes_size(void)
 {
-	return REG_ACCESS_SWITCH_REG_ACCESS_SWITCH_NODES_SIZE;
+    return REG_ACCESS_SWITCH_REG_ACCESS_SWITCH_NODES_SIZE;
 }
 
-void reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes *ptr_struct, FILE *fd)
+void reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                    FILE* fd)
 {
-	reg_access_switch_reg_access_switch_Nodes_print(ptr_struct, fd, 0);
+    reg_access_switch_reg_access_switch_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/reg_access_switch_layouts.h b/tools_layouts/reg_access_switch_layouts.h
index 7aacb8b3..ef69c2ae 100644
--- a/tools_layouts/reg_access_switch_layouts.h
+++ b/tools_layouts/reg_access_switch_layouts.h
@@ -29,434 +29,449 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2021-10-26 16:49:12"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/prm/switch/ext/reg_access_switch.adb --file-prefix reg_access_switch --prefix reg_access_switch_ --no-adb-utils
-         ***/
+ *** This file was generated at "2021-10-26 16:49:12"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/prm/switch/ext/reg_access_switch.adb --file-prefix reg_access_switch --prefix reg_access_switch_ --no-adb-utils
+ ***/
 #ifndef REG_ACCESS_SWITCH_LAYOUTS_H
 #define REG_ACCESS_SWITCH_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 260 */
-struct reg_access_switch_command_payload_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Command data. It may be a request or a response data. */
-	/* 0x0.0 - 0x100.31 */
-	u_int32_t data[65];
-};
+    /* Description -   */
+    /* Size in bytes - 260 */
+    struct reg_access_switch_command_payload_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Command data. It may be a request or a response data. */
+        /* 0x0.0 - 0x100.31 */
+        u_int32_t data[65];
+    };
 
-/* Description -   */
-/* Size in bytes - 260 */
-struct reg_access_switch_crspace_access_payload_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Starting address */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t address;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - CrSpace data */
-	/* 0x4.0 - 0x100.31 */
-	u_int32_t data[64];
-};
+    /* Description -   */
+    /* Size in bytes - 260 */
+    struct reg_access_switch_crspace_access_payload_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Starting address */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t address;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - CrSpace data */
+        /* 0x4.0 - 0x100.31 */
+        u_int32_t data[64];
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_switch_device_info_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Device index
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_switch_device_info_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Device index
 The first device should number 0 */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t device_index;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The flash ID that the device is using. */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t flash_id;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set to '1', the fields related to the device are valid since the 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t device_index;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The flash ID that the device is using. */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t flash_id;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set to '1', the fields related to the device are valid since the
 line-card is powered on and plugged and matching the INI ver
-sion. 
-Note: this bit is not an indication to validity of the fields related 
+sion.
+Note: this bit is not an indication to validity of the fields related
 to the specific FW capabilities and version. */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t lc_pwr_on;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Thermal Shutdown. If set, the device was shut down due to 
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t lc_pwr_on;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Thermal Shutdown. If set, the device was shut down due to
 thermal event. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t thermal_sd;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set to '1', the device is the flash owner. Otherwise, a shared 
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t thermal_sd;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set to '1', the device is the flash owner. Otherwise, a shared
 flash is used by this device (another device is the flash owner). */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t flash_owner;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set, the device uses a flash */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t uses_flash;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - 0: Amos Gearbox
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t flash_owner;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set, the device uses a flash */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t uses_flash;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - 0: Amos Gearbox
 1: Abir Gearbox */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t device_type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Major FW version number. Valid only after the FW is burnt. Oth
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t device_type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Major FW version number. Valid only after the FW is burnt. Oth
 erwise, the value should be '0'. */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t fw_major;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Sub-minor FW version number. Valid only after the FW is 
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t fw_major;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Sub-minor FW version number. Valid only after the FW is
 burnt. Otherwise, the value should be '0'. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t fw_sub_minor;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Minor FW version number. Valid only after the FW is burnt. 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t fw_sub_minor;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Minor FW version number. Valid only after the FW is burnt.
 Otherwise, the value should be '0'. */
-	/* 0x8.16 - 0x8.31 */
-	u_int16_t fw_minor;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Maximum write size (in D-Words) that the device supports for 
+        /* 0x8.16 - 0x8.31 */
+        u_int16_t fw_minor;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Maximum write size (in D-Words) that the device supports for
 its PRM commands. */
-	/* 0xc.0 - 0xc.7 */
-	u_int8_t max_cmd_write_size_supp;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Maximum read size (in D-Words) that the device supports for 
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t max_cmd_write_size_supp;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Maximum read size (in D-Words) that the device supports for
 its PRM commands. */
-	/* 0xc.8 - 0xc.15 */
-	u_int8_t max_cmd_read_size_supp;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Device type ASCII name. Up to 8 chars
- */
-	/* 0x10.24 - 0x18.23 */
-	u_int8_t device_type_name[8];
-};
+        /* 0xc.8 - 0xc.15 */
+        u_int8_t max_cmd_read_size_supp;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Device type ASCII name. Up to 8 chars
+         */
+        /* 0x10.24 - 0x18.23 */
+        u_int8_t device_type_name[8];
+    };
 
-/* Description -   */
-/* Size in bytes - 260 */
-struct reg_access_switch_prm_register_payload_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Register ID */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t register_id;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0: Query
+    /* Description -   */
+    /* Size in bytes - 260 */
+    struct reg_access_switch_prm_register_payload_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Register ID */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t register_id;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0: Query
 1: Write */
-	/* 0x0.22 - 0x0.23 */
-	u_int8_t method;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Return code of the Downstream Device to the register 
+        /* 0x0.22 - 0x0.23 */
+        u_int8_t method;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Return code of the Downstream Device to the register
 that was sent.
 0x0: OK - Operation was successfully executed
-0x1: BUSY 
-0x4: NOT_SUPP_REG - The Switch register requested 
+0x1: BUSY
+0x4: NOT_SUPP_REG - The Switch register requested
 is not supported on that device
-0x7: BAD_PARAM - Incomplete or erroneous parameter 
+0x7: BAD_PARAM - Incomplete or erroneous parameter
 set
 0x70: INTERNAL_ERR - Internal error */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t status;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Register data */
-	/* 0x4.0 - 0x100.31 */
-	u_int32_t register_data[64];
-};
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t status;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Register data */
+        /* 0x4.0 - 0x100.31 */
+        u_int32_t register_data[64];
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_switch_slot_info_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set, the FW has completed the MDDC.device_enable com
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_switch_slot_info_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set, the FW has completed the MDDC.device_enable com
 mand */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t active;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set, the LC is powered on, matching the INI version and a 
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t active;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set, the LC is powered on, matching the INI version and a
 new FW version can be burnt (if necessary)
 0: Not ready
 1: Ready
 2: Error
 3: Reserved */
-	/* 0x0.28 - 0x0.29 */
-	u_int8_t lc_ready;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set, Shift Register is valid (after being provisioned) and data 
-can be sent from the switch ASIC to the line-card CPLD over 
+        /* 0x0.28 - 0x0.29 */
+        u_int8_t lc_ready;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set, Shift Register is valid (after being provisioned) and data
+can be sent from the switch ASIC to the line-card CPLD over
 Shift-Register. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t sr_valid;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - If set, the INI file is ready and the card is provisioned */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t provisioned;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - User-configured version number of the current INI file.
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t sr_valid;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - If set, the INI file is ready and the card is provisioned */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t provisioned;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - User-configured version number of the current INI file.
 Valid only when active or lc_ready are '1'. */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t ini_file_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - HW revision of the line-card as it appears in the current INI file.
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t ini_file_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - HW revision of the line-card as it appears in the current INI file.
 Valid only when active or lc_ready are '1'. */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t hw_revision;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Card type
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t hw_revision;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Card type
 0x00: Buffalo 4x400G
 0x01: Buffalo 8x200G
 0x02: Buffalo 16x100G */
-	/* 0x8.0 - 0x8.7 */
-	u_int8_t card_type;
-};
+        /* 0x8.0 - 0x8.7 */
+        u_int8_t card_type;
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct reg_access_switch_slot_name_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Slot's ASCII name. Up to 20 chars
- */
-	/* 0x0.24 - 0x14.23 */
-	u_int8_t slot_ascii_name[20];
-};
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct reg_access_switch_slot_name_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Slot's ASCII name. Up to 20 chars
+         */
+        /* 0x0.24 - 0x14.23 */
+        u_int8_t slot_ascii_name[20];
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-union reg_access_switch_mddq_data_auto_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_switch_slot_info_ext slot_info_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_switch_device_info_ext device_info_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct reg_access_switch_slot_name_ext slot_name_ext;
-};
+    /* Description -   */
+    /* Size in bytes - 32 */
+    union reg_access_switch_mddq_data_auto_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_switch_slot_info_ext slot_info_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_switch_device_info_ext device_info_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct reg_access_switch_slot_name_ext slot_name_ext;
+    };
 
-/* Description -   */
-/* Size in bytes - 260 */
-union reg_access_switch_mddt_reg_payload_auto_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x100.31 */
-	struct reg_access_switch_prm_register_payload_ext prm_register_payload_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x100.31 */
-	struct reg_access_switch_command_payload_ext command_payload_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x100.31 */
-	struct reg_access_switch_crspace_access_payload_ext crspace_access_payload_ext;
-};
+    /* Description -   */
+    /* Size in bytes - 260 */
+    union reg_access_switch_mddt_reg_payload_auto_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x100.31 */
+        struct reg_access_switch_prm_register_payload_ext prm_register_payload_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x100.31 */
+        struct reg_access_switch_command_payload_ext command_payload_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x100.31 */
+        struct reg_access_switch_crspace_access_payload_ext crspace_access_payload_ext;
+    };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct reg_access_switch_uint64 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int64_t uint64;
-};
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct reg_access_switch_uint64
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int64_t uint64;
+    };
 
-/* Description -   */
-/* Size in bytes - 24 */
-struct reg_access_switch_icam_reg_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Access Register ID groups 
+    /* Description -   */
+    /* Size in bytes - 24 */
+    struct reg_access_switch_icam_reg_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Access Register ID groups
 0: REG_IDs 0x3800 to 0x387F
 1: REG_IDs 0x3880 to 0x38FF */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t access_reg_group;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Supported infrastructure's access register bitmask. Based on 
-access_reg_group index. 
-When bit is set to '1', The register is supported in the device. 
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t access_reg_group;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Supported infrastructure's access register bitmask. Based on
+access_reg_group index.
+When bit is set to '1', The register is supported in the device.
 For example, when access_reg_group == 1:
 Bit 112: ICSR
 Bit0 is at 08h.bit0
 Bit 127 is at 14h.bit31 */
-	/* 0x8.0 - 0x14.31 */
-	u_int32_t infr_access_reg_cap_mask[4];
-};
+        /* 0x8.0 - 0x14.31 */
+        u_int32_t infr_access_reg_cap_mask[4];
+    };
 
-/* Description -   */
-/* Size in bytes - 1040 */
-struct reg_access_switch_icsr_ext {
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Base cr-space address for reading */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t base_address;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Number of cr-space consecutive reads.
+    /* Description -   */
+    /* Size in bytes - 1040 */
+    struct reg_access_switch_icsr_ext
+    {
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Base cr-space address for reading */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t base_address;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Number of cr-space consecutive reads.
 Each read is 4B (DWord)
 Range 1..256 */
-	/* 0x8.0 - 0x8.8 */
-	u_int16_t num_reads;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The cr-space read data */
-	/* 0x10.0 - 0x40c.31 */
-	u_int32_t data[256];
-};
+        /* 0x8.0 - 0x8.8 */
+        u_int16_t num_reads;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The cr-space read data */
+        /* 0x10.0 - 0x40c.31 */
+        u_int32_t data[256];
+    };
 
-/* Description -   */
-/* Size in bytes - 48 */
-struct reg_access_switch_mddq_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Slot index
+    /* Description -   */
+    /* Size in bytes - 48 */
+    struct reg_access_switch_mddq_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Slot index
 0: Reserved */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t slot_index;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0: Reserved
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t slot_index;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0: Reserved
 1: slot_info
-2: device_info - If there are no devices on the slot, data_valid 
+2: device_info - If there are no devices on the slot, data_valid
 will be '0'.
 3: slot_name - Name of the slot (string) */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t query_type;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Slot info event enable
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t query_type;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Slot info event enable
 When set to '1', each change in the MDDQ.slot_info.provi
 sioned / sr_valid / active / ready will generate an event. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t sie;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Request message sequential number. 
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t sie;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Request message sequential number.
 The first message number should be 0 */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t request_message_sequence;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Response message sequential number. 
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t request_message_sequence;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Response message sequential number.
 For a specific request, the response message sequential num
-ber is the following one. 
+ber is the following one.
 In addition, the last message should be 0. */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t response_message_sequence;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Index related to the specific query_type. 
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t response_message_sequence;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Index related to the specific query_type.
 For query_type = 1,2,3 this field is neglected. */
-	/* 0x8.0 - 0x8.7 */
-	u_int8_t query_index;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - If set, the data in the data field is valid and contain the informa
-tion for the queried index. 
-Note: This field is not reflecting any validity of the data while 
-accessing a non-existing query entity. Querying with an out of 
+        /* 0x8.0 - 0x8.7 */
+        u_int8_t query_index;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - If set, the data in the data field is valid and contain the informa
+tion for the queried index.
+Note: This field is not reflecting any validity of the data while
+accessing a non-existing query entity. Querying with an out of
 range index will lead to BAD_PARAM status of the register. */
-	/* 0x8.31 - 0x8.31 */
-	u_int8_t data_valid;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Properties of that field are based on query_type.
-For slot information query_type data - see Table 539, 
+        /* 0x8.31 - 0x8.31 */
+        u_int8_t data_valid;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Properties of that field are based on query_type.
+For slot information query_type data - see Table 539,
 "slot_info Register Layout," on page 753
-For devices on slot query_type data - see Table 541, 
+For devices on slot query_type data - see Table 541,
 "device_info Register Layout," on page 754
-For slot name query_type data - see Table 543, "slot_name 
+For slot name query_type data - see Table 543, "slot_name
 Register Layout," on page 755 */
-	/* 0x10.0 - 0x2c.31 */
-	union reg_access_switch_mddq_data_auto_ext data;
-};
+        /* 0x10.0 - 0x2c.31 */
+        union reg_access_switch_mddq_data_auto_ext data;
+    };
 
-/* Description -   */
-/* Size in bytes - 272 */
-struct reg_access_switch_mddt_reg_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Device index */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t device_index;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Slot index */
-	/* 0x0.8 - 0x0.11 */
-	u_int8_t slot_index;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - 0: PRM_Register
+    /* Description -   */
+    /* Size in bytes - 272 */
+    struct reg_access_switch_mddt_reg_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Device index */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t device_index;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Slot index */
+        /* 0x0.8 - 0x0.11 */
+        u_int8_t slot_index;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - 0: PRM_Register
 1: Command
 2: CrSpace_access - [Internal] */
-	/* 0x4.0 - 0x4.1 */
-	u_int8_t type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Write size in D-Words. */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t write_size;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Read size in D-Words. */
-	/* 0x4.24 - 0x4.31 */
-	u_int8_t read_size;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Payload
-For PRM Register type payload- See Table 531, "PRM 
+        /* 0x4.0 - 0x4.1 */
+        u_int8_t type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Write size in D-Words. */
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t write_size;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Read size in D-Words. */
+        /* 0x4.24 - 0x4.31 */
+        u_int8_t read_size;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Payload
+For PRM Register type payload- See Table 531, "PRM
 Register Payload Layout," on page 750
 For Command type payload - See Table 533, "Com
 mand Payload Layout," on page 750
-For CrSpace type payload - See Table 535, "CrSpace 
+For CrSpace type payload - See Table 535, "CrSpace
 access Payload Layout," on page 751 */
-	/* 0xc.0 - 0x10c.31 */
-	union reg_access_switch_mddt_reg_payload_auto_ext payload;
-};
+        /* 0xc.0 - 0x10c.31 */
+        union reg_access_switch_mddt_reg_payload_auto_ext payload;
+    };
 
-/* Description -   */
-/* Size in bytes - 48 */
-struct reg_access_switch_mdsr_reg_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0: The debug session ended successfully
-1: Failed to execute the operation. See additional_info for 
+    /* Description -   */
+    /* Size in bytes - 48 */
+    struct reg_access_switch_mdsr_reg_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0: The debug session ended successfully
+1: Failed to execute the operation. See additional_info for
 more details.
 2: Debug session active. See type_of_token for more details.
 3: No token applied
 4: Challenge provided, no token installed yet, see type_of_to
 ken for details.
-5: Timeout before token installed, see type_of_token for 
+5: Timeout before token installed, see type_of_token for
 details
 6: Timeout of active token.
 7-15: Reserved
 
-Note: Status might be '0' even when debug query is not 
+Note: Status might be '0' even when debug query is not
 allowed and additional_info field will expose the reason. */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t status;
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0: No additional information available 
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t status;
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0: No additional information available
 1: There is no debug session in progress
 2: FW is not secured, debug session cannot be ended
-3: Fail - Debug end request cannot be accepted. 
+3: Fail - Debug end request cannot be accepted.
 4: Fail - Host is not allowed to query debug session
 5: Debug session active */
-	/* 0x0.8 - 0x0.13 */
-	u_int8_t additional_info;
-	/* Description - 0: Debug FW token 1: CS token 
-2: FRC token 
+        /* 0x0.8 - 0x0.13 */
+        u_int8_t additional_info;
+        /* Description - 0: Debug FW token 1: CS token
+2: FRC token
 3: RMCS token
-4: RMDS token 
-5: CRCS token 
+4: RMDS token
+5: CRCS token
 6: CRDT token */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t type_of_token;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Set to '1' to end debug session.
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t type_of_token;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Set to '1' to end debug session.
 Setting to '0' will not trigger any operation. */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t end;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Time left in seconds.
-In case that status is 2 (debug session active) - time left for 
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t end;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Time left in seconds.
+In case that status is 2 (debug session active) - time left for
 token operation
-In case that status is 4 (challenge provided, no token 
+In case that status is 4 (challenge provided, no token
 installed yet) - time left for token installation
 For any other status, field should be zero */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t time_left;
-};
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t time_left;
+    };
 
-/* Description -   */
-/* Size in bytes - 44 */
-struct reg_access_switch_mkdc_reg_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Indicates the successful completion of the instruction 
+    /* Description -   */
+    /* Size in bytes - 44 */
+    struct reg_access_switch_mkdc_reg_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Indicates the successful completion of the instruction
 or the reason it failed:
 0: OK
 1: BAD_SESSION_ID
@@ -464,245 +479,323 @@ or the reason it failed:
 3: BAD_SOURCE_ADDRESS
 4: SESSION_TIMEOUT
 Other values are Reserved. */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t error_code;
-	/* Description - Unique debug session identifier. */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t session_id;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Running counter that states the current sequence 
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t error_code;
+        /* Description - Unique debug session identifier. */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t session_id;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Running counter that states the current sequence
 number of each keep-alive session. */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t current_keep_alive_counter;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Running counter that states the expected next 
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t current_keep_alive_counter;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Running counter that states the expected next
 sequence number of each keep-alive session. */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t next_keep_alive_counter;
-};
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t next_keep_alive_counter;
+    };
 
-/* Description -   */
-/* Size in bytes - 112 */
-struct reg_access_switch_mtcq_reg_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Device number.
+    /* Description -   */
+    /* Size in bytes - 112 */
+    struct reg_access_switch_mtcq_reg_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Device number.
 For gearboxes, the index represents the gearbox die.
-For cables, the index represents the module index 
-starting at index 1 while index 0 indicates the host 
+For cables, the index represents the module index
+starting at index 1 while index 0 indicates the host
 device. */
-	/* 0x0.0 - 0x0.11 */
-	u_int16_t device_index;
-	/* Description - Indicates the status of the desired token we are gener
+        /* 0x0.0 - 0x0.11 */
+        u_int16_t device_index;
+        /* Description - Indicates the status of the desired token we are gener
 ating the challenge for.
 0x0 - OK
 0x1 - TOKEN_ALREADY_APPLIED
 0x2 - TOKEN_NOT_SUPPORTED
-0x3 - NO_KEY_CONFIGURED (there is no public_key 
-that can be used for this token) 
-0x4 - INTERFACE_NOT_ALLOWED (asking for local 
-token from remote interface, or remote token from 
+0x3 - NO_KEY_CONFIGURED (there is no public_key
+that can be used for this token)
+0x4 - INTERFACE_NOT_ALLOWED (asking for local
+token from remote interface, or remote token from
 local interface) */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t status;
-	/* Description - The token which a challenge is generated for.
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t status;
+        /* Description - The token which a challenge is generated for.
 0: RMCS
 1: RMDT
 
 Other: Reserved */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t token_opcode;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The UUID of the key used to generate the challenge. */
-	/* 0x4.0 - 0x10.31 */
-	u_int32_t keypair_uuid[4];
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Device base MAC address / unique identifier. */
-	/* 0x14.0 - 0x18.31 */
-	u_int64_t base_mac;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Device PSID */
-	/* 0x1c.0 - 0x28.31 */
-	u_int32_t psid[4];
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description - Device FW version */
-	/* 0x2c.0 - 0x2c.7 */
-	u_int8_t fw_version_39_32;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description - Device FW version */
-	/* 0x30.0 - 0x30.31 */
-	u_int32_t fw_version_31_0;
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-	/* Description - Source address of debug requester. DLID for Infini
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t token_opcode;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The UUID of the key used to generate the challenge. */
+        /* 0x4.0 - 0x10.31 */
+        u_int32_t keypair_uuid[4];
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Device base MAC address / unique identifier. */
+        /* 0x14.0 - 0x18.31 */
+        u_int64_t base_mac;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Device PSID */
+        /* 0x1c.0 - 0x28.31 */
+        u_int32_t psid[4];
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description - Device FW version */
+        /* 0x2c.0 - 0x2c.7 */
+        u_int8_t fw_version_39_32;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description - Device FW version */
+        /* 0x30.0 - 0x30.31 */
+        u_int32_t fw_version_31_0;
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description - Source address of debug requester. DLID for Infini
 band, ETH / IBg2 - TBD.
 Valid only for RMCS/RMDT. */
-	/* 0x34.0 - 0x40.31 */
-	u_int32_t source_address[4];
-/*---------------- DWORD[17] (Offset 0x44) ----------------*/
-	/* Description - Unique debug session identifier. 
+        /* 0x34.0 - 0x40.31 */
+        u_int32_t source_address[4];
+        /*---------------- DWORD[17] (Offset 0x44) ----------------*/
+        /* Description - Unique debug session identifier.
 See details in REMOTE_DEBUG_KEEP_ALIVE.
 Valid only for RMCS. */
-	/* 0x44.0 - 0x44.15 */
-	u_int16_t session_id;
-/*---------------- DWORD[17] (Offset 0x44) ----------------*/
-	/* Description - Version of the challenge format. */
-	/* 0x44.24 - 0x44.31 */
-	u_int8_t challenge_version;
-/*---------------- DWORD[18] (Offset 0x48) ----------------*/
-	/* Description - Random generated field. Used for randomness and 
+        /* 0x44.0 - 0x44.15 */
+        u_int16_t session_id;
+        /*---------------- DWORD[17] (Offset 0x44) ----------------*/
+        /* Description - Version of the challenge format. */
+        /* 0x44.24 - 0x44.31 */
+        u_int8_t challenge_version;
+        /*---------------- DWORD[18] (Offset 0x48) ----------------*/
+        /* Description - Random generated field. Used for randomness and
 replay-protection. */
-	/* 0x48.0 - 0x64.31 */
-	u_int32_t challenge[8];
-};
-
-/* Description -   */
-/* Size in bytes - 1040 */
-union reg_access_switch_reg_access_switch_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x10c.31 */
-	struct reg_access_switch_mddt_reg_ext mddt_reg_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x14.31 */
-	struct reg_access_switch_icam_reg_ext icam_reg_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x2c.31 */
-	struct reg_access_switch_mdsr_reg_ext mdsr_reg_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x28.31 */
-	struct reg_access_switch_mkdc_reg_ext mkdc_reg_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x6c.31 */
-	struct reg_access_switch_mtcq_reg_ext mtcq_reg_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x2c.31 */
-	struct reg_access_switch_mddq_ext mddq_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x40c.31 */
-	struct reg_access_switch_icsr_ext icsr_ext;
-};
-
+        /* 0x48.0 - 0x64.31 */
+        u_int32_t challenge[8];
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* command_payload_ext */
-void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_command_payload_ext_size(void);
-#define REG_ACCESS_SWITCH_COMMAND_PAYLOAD_EXT_SIZE    (0x104)
-void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext *ptr_struct, FILE *fd);
-/* crspace_access_payload_ext */
-void reg_access_switch_crspace_access_payload_ext_pack(const struct reg_access_switch_crspace_access_payload_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switch_crspace_access_payload_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_crspace_access_payload_ext_print(const struct reg_access_switch_crspace_access_payload_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_crspace_access_payload_ext_size(void);
-#define REG_ACCESS_SWITCH_CRSPACE_ACCESS_PAYLOAD_EXT_SIZE    (0x104)
-void reg_access_switch_crspace_access_payload_ext_dump(const struct reg_access_switch_crspace_access_payload_ext *ptr_struct, FILE *fd);
-/* device_info_ext */
-void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_device_info_ext_size(void);
-#define REG_ACCESS_SWITCH_DEVICE_INFO_EXT_SIZE    (0x20)
-void reg_access_switch_device_info_ext_dump(const struct reg_access_switch_device_info_ext *ptr_struct, FILE *fd);
-/* prm_register_payload_ext */
-void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_switch_prm_register_payload_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_prm_register_payload_ext_print(const struct reg_access_switch_prm_register_payload_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_prm_register_payload_ext_size(void);
-#define REG_ACCESS_SWITCH_PRM_REGISTER_PAYLOAD_EXT_SIZE    (0x104)
-void reg_access_switch_prm_register_payload_ext_dump(const struct reg_access_switch_prm_register_payload_ext *ptr_struct, FILE *fd);
-/* slot_info_ext */
-void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_info_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_slot_info_ext_size(void);
-#define REG_ACCESS_SWITCH_SLOT_INFO_EXT_SIZE    (0x20)
-void reg_access_switch_slot_info_ext_dump(const struct reg_access_switch_slot_info_ext *ptr_struct, FILE *fd);
-/* slot_name_ext */
-void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_name_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_slot_name_ext_size(void);
-#define REG_ACCESS_SWITCH_SLOT_NAME_EXT_SIZE    (0x20)
-void reg_access_switch_slot_name_ext_dump(const struct reg_access_switch_slot_name_ext *ptr_struct, FILE *fd);
-/* mddq_data_auto_ext */
-void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mddq_data_auto_ext_size(void);
-#define REG_ACCESS_SWITCH_MDDQ_DATA_AUTO_EXT_SIZE    (0x20)
-void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mddq_data_auto_ext *ptr_struct, FILE *fd);
-/* mddt_reg_payload_auto_ext */
-void reg_access_switch_mddt_reg_payload_auto_ext_pack(const union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mddt_reg_payload_auto_ext_print(const union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mddt_reg_payload_auto_ext_size(void);
-#define REG_ACCESS_SWITCH_MDDT_REG_PAYLOAD_AUTO_EXT_SIZE    (0x104)
-void reg_access_switch_mddt_reg_payload_auto_ext_dump(const union reg_access_switch_mddt_reg_payload_auto_ext *ptr_struct, FILE *fd);
-/* uint64 */
-void reg_access_switch_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_uint64_size(void);
-#define REG_ACCESS_SWITCH_UINT64_SIZE    (0x8)
-void reg_access_switch_uint64_dump(const u_int64_t *ptr_struct, FILE *fd);
-/* icam_reg_ext */
-void reg_access_switch_icam_reg_ext_pack(const struct reg_access_switch_icam_reg_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_icam_reg_ext_size(void);
-#define REG_ACCESS_SWITCH_ICAM_REG_EXT_SIZE    (0x18)
-void reg_access_switch_icam_reg_ext_dump(const struct reg_access_switch_icam_reg_ext *ptr_struct, FILE *fd);
-/* icsr_ext */
-void reg_access_switch_icsr_ext_pack(const struct reg_access_switch_icsr_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_icsr_ext_unpack(struct reg_access_switch_icsr_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_icsr_ext_print(const struct reg_access_switch_icsr_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_icsr_ext_size(void);
-#define REG_ACCESS_SWITCH_ICSR_EXT_SIZE    (0x410)
-void reg_access_switch_icsr_ext_dump(const struct reg_access_switch_icsr_ext *ptr_struct, FILE *fd);
-/* mddq_ext */
-void reg_access_switch_mddq_ext_pack(const struct reg_access_switch_mddq_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mddq_ext_unpack(struct reg_access_switch_mddq_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mddq_ext_size(void);
-#define REG_ACCESS_SWITCH_MDDQ_EXT_SIZE    (0x30)
-void reg_access_switch_mddq_ext_dump(const struct reg_access_switch_mddq_ext *ptr_struct, FILE *fd);
-/* mddt_reg_ext */
-void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mddt_reg_ext_size(void);
-#define REG_ACCESS_SWITCH_MDDT_REG_EXT_SIZE    (0x110)
-void reg_access_switch_mddt_reg_ext_dump(const struct reg_access_switch_mddt_reg_ext *ptr_struct, FILE *fd);
-/* mdsr_reg_ext */
-void reg_access_switch_mdsr_reg_ext_pack(const struct reg_access_switch_mdsr_reg_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mdsr_reg_ext_size(void);
-#define REG_ACCESS_SWITCH_MDSR_REG_EXT_SIZE    (0x30)
-void reg_access_switch_mdsr_reg_ext_dump(const struct reg_access_switch_mdsr_reg_ext *ptr_struct, FILE *fd);
-/* mkdc_reg_ext */
-void reg_access_switch_mkdc_reg_ext_pack(const struct reg_access_switch_mkdc_reg_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mkdc_reg_ext_size(void);
-#define REG_ACCESS_SWITCH_MKDC_REG_EXT_SIZE    (0x2c)
-void reg_access_switch_mkdc_reg_ext_dump(const struct reg_access_switch_mkdc_reg_ext *ptr_struct, FILE *fd);
-/* mtcq_reg_ext */
-void reg_access_switch_mtcq_reg_ext_pack(const struct reg_access_switch_mtcq_reg_ext *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_mtcq_reg_ext_size(void);
-#define REG_ACCESS_SWITCH_MTCQ_REG_EXT_SIZE    (0x70)
-void reg_access_switch_mtcq_reg_ext_dump(const struct reg_access_switch_mtcq_reg_ext *ptr_struct, FILE *fd);
-/* reg_access_switch_Nodes */
-void reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int reg_access_switch_reg_access_switch_Nodes_size(void);
-#define REG_ACCESS_SWITCH_REG_ACCESS_SWITCH_NODES_SIZE    (0x410)
-void reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 1040 */
+    union reg_access_switch_reg_access_switch_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x10c.31 */
+        struct reg_access_switch_mddt_reg_ext mddt_reg_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x14.31 */
+        struct reg_access_switch_icam_reg_ext icam_reg_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x2c.31 */
+        struct reg_access_switch_mdsr_reg_ext mdsr_reg_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x28.31 */
+        struct reg_access_switch_mkdc_reg_ext mkdc_reg_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x6c.31 */
+        struct reg_access_switch_mtcq_reg_ext mtcq_reg_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x2c.31 */
+        struct reg_access_switch_mddq_ext mddq_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x40c.31 */
+        struct reg_access_switch_icsr_ext icsr_ext;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* command_payload_ext */
+    void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                    u_int8_t* ptr_buff);
+    void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                      const u_int8_t* ptr_buff);
+    void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level);
+    unsigned int reg_access_switch_command_payload_ext_size(void);
+#define REG_ACCESS_SWITCH_COMMAND_PAYLOAD_EXT_SIZE (0x104)
+    void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext* ptr_struct,
+                                                    FILE* fd);
+    /* crspace_access_payload_ext */
+    void reg_access_switch_crspace_access_payload_ext_pack(
+      const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_switch_crspace_access_payload_ext_unpack(
+      struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void reg_access_switch_crspace_access_payload_ext_print(
+      const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_switch_crspace_access_payload_ext_size(void);
+#define REG_ACCESS_SWITCH_CRSPACE_ACCESS_PAYLOAD_EXT_SIZE (0x104)
+    void reg_access_switch_crspace_access_payload_ext_dump(
+      const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
+      FILE* fd);
+    /* device_info_ext */
+    void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext* ptr_struct,
+                                                u_int8_t* ptr_buff);
+    void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext* ptr_struct,
+                                                  const u_int8_t* ptr_buff);
+    void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level);
+    unsigned int reg_access_switch_device_info_ext_size(void);
+#define REG_ACCESS_SWITCH_DEVICE_INFO_EXT_SIZE (0x20)
+    void reg_access_switch_device_info_ext_dump(const struct reg_access_switch_device_info_ext* ptr_struct, FILE* fd);
+    /* prm_register_payload_ext */
+    void reg_access_switch_prm_register_payload_ext_pack(
+      const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+      u_int8_t* ptr_buff);
+    void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+                                                           const u_int8_t* ptr_buff);
+    void reg_access_switch_prm_register_payload_ext_print(
+      const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_switch_prm_register_payload_ext_size(void);
+#define REG_ACCESS_SWITCH_PRM_REGISTER_PAYLOAD_EXT_SIZE (0x104)
+    void reg_access_switch_prm_register_payload_ext_dump(
+      const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
+      FILE* fd);
+    /* slot_info_ext */
+    void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_info_ext* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int reg_access_switch_slot_info_ext_size(void);
+#define REG_ACCESS_SWITCH_SLOT_INFO_EXT_SIZE (0x20)
+    void reg_access_switch_slot_info_ext_dump(const struct reg_access_switch_slot_info_ext* ptr_struct, FILE* fd);
+    /* slot_name_ext */
+    void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_name_ext* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int reg_access_switch_slot_name_ext_size(void);
+#define REG_ACCESS_SWITCH_SLOT_NAME_EXT_SIZE (0x20)
+    void reg_access_switch_slot_name_ext_dump(const struct reg_access_switch_slot_name_ext* ptr_struct, FILE* fd);
+    /* mddq_data_auto_ext */
+    void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                                   u_int8_t* ptr_buff);
+    void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                                     const u_int8_t* ptr_buff);
+    void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                                    FILE* fd,
+                                                    int indent_level);
+    unsigned int reg_access_switch_mddq_data_auto_ext_size(void);
+#define REG_ACCESS_SWITCH_MDDQ_DATA_AUTO_EXT_SIZE (0x20)
+    void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
+                                                   FILE* fd);
+    /* mddt_reg_payload_auto_ext */
+    void reg_access_switch_mddt_reg_payload_auto_ext_pack(
+      const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+      u_int8_t* ptr_buff);
+    void
+      reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+                                                         const u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_payload_auto_ext_print(
+      const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int reg_access_switch_mddt_reg_payload_auto_ext_size(void);
+#define REG_ACCESS_SWITCH_MDDT_REG_PAYLOAD_AUTO_EXT_SIZE (0x104)
+    void reg_access_switch_mddt_reg_payload_auto_ext_dump(
+      const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
+      FILE* fd);
+    /* uint64 */
+    void reg_access_switch_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_switch_uint64_size(void);
+#define REG_ACCESS_SWITCH_UINT64_SIZE (0x8)
+    void reg_access_switch_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
+    /* icam_reg_ext */
+    void reg_access_switch_icam_reg_ext_pack(const struct reg_access_switch_icam_reg_ext* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int reg_access_switch_icam_reg_ext_size(void);
+#define REG_ACCESS_SWITCH_ICAM_REG_EXT_SIZE (0x18)
+    void reg_access_switch_icam_reg_ext_dump(const struct reg_access_switch_icam_reg_ext* ptr_struct, FILE* fd);
+    /* icsr_ext */
+    void reg_access_switch_icsr_ext_pack(const struct reg_access_switch_icsr_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_icsr_ext_unpack(struct reg_access_switch_icsr_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      reg_access_switch_icsr_ext_print(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_switch_icsr_ext_size(void);
+#define REG_ACCESS_SWITCH_ICSR_EXT_SIZE (0x410)
+    void reg_access_switch_icsr_ext_dump(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd);
+    /* mddq_ext */
+    void reg_access_switch_mddq_ext_pack(const struct reg_access_switch_mddq_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mddq_ext_unpack(struct reg_access_switch_mddq_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd, int indent_level);
+    unsigned int reg_access_switch_mddq_ext_size(void);
+#define REG_ACCESS_SWITCH_MDDQ_EXT_SIZE (0x30)
+    void reg_access_switch_mddq_ext_dump(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd);
+    /* mddt_reg_ext */
+    void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg_ext* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int reg_access_switch_mddt_reg_ext_size(void);
+#define REG_ACCESS_SWITCH_MDDT_REG_EXT_SIZE (0x110)
+    void reg_access_switch_mddt_reg_ext_dump(const struct reg_access_switch_mddt_reg_ext* ptr_struct, FILE* fd);
+    /* mdsr_reg_ext */
+    void reg_access_switch_mdsr_reg_ext_pack(const struct reg_access_switch_mdsr_reg_ext* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int reg_access_switch_mdsr_reg_ext_size(void);
+#define REG_ACCESS_SWITCH_MDSR_REG_EXT_SIZE (0x30)
+    void reg_access_switch_mdsr_reg_ext_dump(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, FILE* fd);
+    /* mkdc_reg_ext */
+    void reg_access_switch_mkdc_reg_ext_pack(const struct reg_access_switch_mkdc_reg_ext* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int reg_access_switch_mkdc_reg_ext_size(void);
+#define REG_ACCESS_SWITCH_MKDC_REG_EXT_SIZE (0x2c)
+    void reg_access_switch_mkdc_reg_ext_dump(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, FILE* fd);
+    /* mtcq_reg_ext */
+    void reg_access_switch_mtcq_reg_ext_pack(const struct reg_access_switch_mtcq_reg_ext* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int reg_access_switch_mtcq_reg_ext_size(void);
+#define REG_ACCESS_SWITCH_MTCQ_REG_EXT_SIZE (0x70)
+    void reg_access_switch_mtcq_reg_ext_dump(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, FILE* fd);
+    /* reg_access_switch_Nodes */
+    void
+      reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                     u_int8_t* ptr_buff);
+    void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                          const u_int8_t* ptr_buff);
+    void
+      reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                      FILE* fd,
+                                                      int indent_level);
+    unsigned int reg_access_switch_reg_access_switch_Nodes_size(void);
+#define REG_ACCESS_SWITCH_REG_ACCESS_SWITCH_NODES_SIZE (0x410)
+    void
+      reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
+                                                     FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/register_access_open_layouts.c b/tools_layouts/register_access_open_layouts.c
index 7d3260cf..596dc0b0 100644
--- a/tools_layouts/register_access_open_layouts.c
+++ b/tools_layouts/register_access_open_layouts.c
@@ -30,266 +30,272 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
- 
 
 /***
-         *** This file was generated at "2018-05-12 08:07:49"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/register_access_open/register_access_open.adb --file-prefix register_access_open --prefix register_access_
-         ***/
+ *** This file was generated at "2018-05-12 08:07:49"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/register_access_open/register_access_open.adb --file-prefix register_access_open --prefix register_access_
+ ***/
 #include "register_access_open_layouts.h"
 
-void register_access_mfba_pack(const struct register_access_mfba *ptr_struct, u_int8_t *ptr_buff)
+void register_access_mfba_pack(const struct register_access_mfba* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
-
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
-	offset = 55;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->size);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->address);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(96, 32, i, 2144, 0);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
-	}
+    u_int32_t offset;
+    int i;
+
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
+    offset = 55;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->size);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->address);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(96, 32, i, 2144, 0);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void register_access_mfba_unpack(struct register_access_mfba *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_mfba_unpack(struct register_access_mfba* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
-
-	offset = 26;
-	ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 23;
-	ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 55;
-	ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
-	offset = 64;
-	ptr_struct->address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(96, 32, i, 2144, 0);
-		ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    u_int32_t offset;
+    int i;
+
+    offset = 26;
+    ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 23;
+    ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 55;
+    ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
+    offset = 64;
+    ptr_struct->address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(96, 32, i, 2144, 0);
+        ptr_struct->data[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void register_access_mfba_print(const struct register_access_mfba *ptr_struct, FILE *fd, int indent_level)
+void register_access_mfba_print(const struct register_access_mfba* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_mfba ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "address              : " U32H_FMT "\n", ptr_struct->address);
-	for (i = 0; i < 64; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
-	}
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_mfba ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "address              : " U32H_FMT "\n", ptr_struct->address);
+    for (i = 0; i < 64; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " U32H_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
 unsigned int register_access_mfba_size(void)
 {
-	return REGISTER_ACCESS_MFBA_SIZE;
+    return REGISTER_ACCESS_MFBA_SIZE;
 }
 
-void register_access_mfba_dump(const struct register_access_mfba *ptr_struct, FILE *fd)
+void register_access_mfba_dump(const struct register_access_mfba* ptr_struct, FILE* fd)
 {
-	register_access_mfba_print(ptr_struct, fd, 0);
+    register_access_mfba_print(ptr_struct, fd, 0);
 }
 
-void register_access_mfbe_pack(const struct register_access_mfbe *ptr_struct, u_int8_t *ptr_buff)
+void register_access_mfbe_pack(const struct register_access_mfbe* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_64kb_erase);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_32kb_erase);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->address);
+    u_int32_t offset;
+
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_64kb_erase);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_32kb_erase);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->address);
 }
 
-void register_access_mfbe_unpack(struct register_access_mfbe *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_mfbe_unpack(struct register_access_mfbe* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 26;
-	ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 23;
-	ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->bulk_64kb_erase = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->bulk_32kb_erase = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    u_int32_t offset;
+
+    offset = 26;
+    ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 23;
+    ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->bulk_64kb_erase = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->bulk_32kb_erase = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void register_access_mfbe_print(const struct register_access_mfbe *ptr_struct, FILE *fd, int indent_level)
+void register_access_mfbe_print(const struct register_access_mfbe* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_mfbe ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bulk_64kb_erase      : " UH_FMT "\n", ptr_struct->bulk_64kb_erase);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bulk_32kb_erase      : " UH_FMT "\n", ptr_struct->bulk_32kb_erase);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "address              : " U32H_FMT "\n", ptr_struct->address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_mfbe ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bulk_64kb_erase      : " UH_FMT "\n", ptr_struct->bulk_64kb_erase);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bulk_32kb_erase      : " UH_FMT "\n", ptr_struct->bulk_32kb_erase);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "address              : " U32H_FMT "\n", ptr_struct->address);
 }
 
 unsigned int register_access_mfbe_size(void)
 {
-	return REGISTER_ACCESS_MFBE_SIZE;
+    return REGISTER_ACCESS_MFBE_SIZE;
 }
 
-void register_access_mfbe_dump(const struct register_access_mfbe *ptr_struct, FILE *fd)
+void register_access_mfbe_dump(const struct register_access_mfbe* ptr_struct, FILE* fd)
 {
-	register_access_mfbe_print(ptr_struct, fd, 0);
+    register_access_mfbe_print(ptr_struct, fd, 0);
 }
 
-void register_access_mfpa_pack(const struct register_access_mfpa *ptr_struct, u_int8_t *ptr_buff)
+void register_access_mfpa_pack(const struct register_access_mfpa* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->boot_address);
-	offset = 156;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->flash_num);
-	offset = 130;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_64kb_erase_en);
-	offset = 129;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_32kb_erase_en);
-	offset = 168;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->jedec_id);
-	offset = 214;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
-	offset = 200;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->capability_mask);
+    u_int32_t offset;
+
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->boot_address);
+    offset = 156;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->flash_num);
+    offset = 130;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_64kb_erase_en);
+    offset = 129;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_32kb_erase_en);
+    offset = 168;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->jedec_id);
+    offset = 214;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
+    offset = 200;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->capability_mask);
 }
 
-void register_access_mfpa_unpack(struct register_access_mfpa *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_mfpa_unpack(struct register_access_mfpa* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 26;
-	ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 23;
-	ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->boot_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 156;
-	ptr_struct->flash_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 130;
-	ptr_struct->bulk_64kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 129;
-	ptr_struct->bulk_32kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 168;
-	ptr_struct->jedec_id = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 214;
-	ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 200;
-	ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 224;
-	ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    u_int32_t offset;
+
+    offset = 26;
+    ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 23;
+    ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->boot_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 156;
+    ptr_struct->flash_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 130;
+    ptr_struct->bulk_64kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 129;
+    ptr_struct->bulk_32kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 168;
+    ptr_struct->jedec_id = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 214;
+    ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 200;
+    ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 224;
+    ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void register_access_mfpa_print(const struct register_access_mfpa *ptr_struct, FILE *fd, int indent_level)
+void register_access_mfpa_print(const struct register_access_mfpa* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_mfpa ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_address         : " U32H_FMT "\n", ptr_struct->boot_address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_num            : " UH_FMT "\n", ptr_struct->flash_num);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bulk_64kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_64kb_erase_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bulk_32kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_32kb_erase_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "jedec_id             : " UH_FMT "\n", ptr_struct->jedec_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sector_size          : " UH_FMT "\n", ptr_struct->sector_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "block_allignment     : " UH_FMT "\n", ptr_struct->block_allignment);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "capability_mask      : " U32H_FMT "\n", ptr_struct->capability_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_mfpa ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_address         : " U32H_FMT "\n", ptr_struct->boot_address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_num            : " UH_FMT "\n", ptr_struct->flash_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bulk_64kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_64kb_erase_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bulk_32kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_32kb_erase_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "jedec_id             : " UH_FMT "\n", ptr_struct->jedec_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sector_size          : " UH_FMT "\n", ptr_struct->sector_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "block_allignment     : " UH_FMT "\n", ptr_struct->block_allignment);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "capability_mask      : " U32H_FMT "\n", ptr_struct->capability_mask);
 }
 
 unsigned int register_access_mfpa_size(void)
 {
-	return REGISTER_ACCESS_MFPA_SIZE;
+    return REGISTER_ACCESS_MFPA_SIZE;
 }
 
-void register_access_mfpa_dump(const struct register_access_mfpa *ptr_struct, FILE *fd)
+void register_access_mfpa_dump(const struct register_access_mfpa* ptr_struct, FILE* fd)
 {
-	register_access_mfpa_print(ptr_struct, fd, 0);
+    register_access_mfpa_print(ptr_struct, fd, 0);
 }
 
-void register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes* ptr_struct,
+                                                     u_int8_t* ptr_buff)
 {
-	register_access_mfba_pack(&(ptr_struct->mfba), ptr_buff);
+    register_access_mfba_pack(&(ptr_struct->mfba), ptr_buff);
 }
 
-void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes* ptr_struct,
+                                                       const u_int8_t* ptr_buff)
 {
-	register_access_mfba_unpack(&(ptr_struct->mfba), ptr_buff);
+    register_access_mfba_unpack(&(ptr_struct->mfba), ptr_buff);
 }
 
-void register_access_register_access_open_Nodes_print(const union register_access_register_access_open_Nodes *ptr_struct, FILE *fd, int indent_level)
+void register_access_register_access_open_Nodes_print(const union register_access_register_access_open_Nodes* ptr_struct,
+                                                      FILE* fd,
+                                                      int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_register_access_open_Nodes ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfbe:\n");
-	register_access_mfbe_print(&(ptr_struct->mfbe), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfpa:\n");
-	register_access_mfpa_print(&(ptr_struct->mfpa), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfba:\n");
-	register_access_mfba_print(&(ptr_struct->mfba), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_register_access_open_Nodes ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfbe:\n");
+    register_access_mfbe_print(&(ptr_struct->mfbe), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfpa:\n");
+    register_access_mfpa_print(&(ptr_struct->mfpa), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfba:\n");
+    register_access_mfba_print(&(ptr_struct->mfba), fd, indent_level + 1);
 }
 
 unsigned int register_access_register_access_open_Nodes_size(void)
 {
-	return REGISTER_ACCESS_REGISTER_ACCESS_OPEN_NODES_SIZE;
+    return REGISTER_ACCESS_REGISTER_ACCESS_OPEN_NODES_SIZE;
 }
 
-void register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes *ptr_struct, FILE *fd)
+void register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes* ptr_struct,
+                                                     FILE* fd)
 {
-	register_access_register_access_open_Nodes_print(ptr_struct, fd, 0);
+    register_access_register_access_open_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/register_access_open_layouts.h b/tools_layouts/register_access_open_layouts.h
index b72f1cdf..64bf38cd 100644
--- a/tools_layouts/register_access_open_layouts.h
+++ b/tools_layouts/register_access_open_layouts.h
@@ -30,156 +30,165 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
- 
 
 /***
-         *** This file was generated at "2018-05-12 08:07:49"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/register_access_open/register_access_open.adb --file-prefix register_access_open --prefix register_access_
-         ***/
+ *** This file was generated at "2018-05-12 08:07:49"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/register_access_open/register_access_open.adb --file-prefix register_access_open --prefix register_access_
+ ***/
 #ifndef REGISTER_ACCESS_OPEN_LAYOUTS_H
 #define REGISTER_ACCESS_OPEN_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 268 */
-struct register_access_mfba {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Flash Select */
-	/* 0x0.4 - 0x0.5 */
-	u_int8_t fs;
-	/* Description - Parallel */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t p;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Transaction size */
-	/* 0x4.0 - 0x4.8 */
-	u_int16_t size;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - address in bytes */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t address;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - data */
-	/* 0xc.0 - 0x108.31 */
-	u_int32_t data[64];
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct register_access_mfbe {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Flash Select */
-	/* 0x0.4 - 0x0.5 */
-	u_int8_t fs;
-	/* Description - Parallel */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t p;
-	/* Description - Erase a 64KB flash area in one bulk operation. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t bulk_64kb_erase;
-	/* Description - Erase a 32KB flash area in one bulk operation. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t bulk_32kb_erase;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - address in bytes */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t address;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct register_access_mfpa {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Flash Select */
-	/* 0x0.4 - 0x0.5 */
-	u_int8_t fs;
-	/* Description - Parallel */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t p;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - address in bytes */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t boot_address;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - number of flash devices connected */
-	/* 0x10.0 - 0x10.3 */
-	u_int8_t flash_num;
-	/* Description - If set, MFBE register supports 64KB bulk erase operation. */
-	/* 0x10.29 - 0x10.29 */
-	u_int8_t bulk_64kb_erase_en;
-	/* Description - If set, MFBE register supports 32KB bulk erase operation. */
-	/* 0x10.30 - 0x10.30 */
-	u_int8_t bulk_32kb_erase_en;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Flash JEDEC ID */
-	/* 0x14.0 - 0x14.23 */
-	u_int32_t jedec_id;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Flash sectore size */
-	/* 0x18.0 - 0x18.9 */
-	u_int16_t sector_size;
-	/* Description -  */
-	/* 0x18.16 - 0x18.23 */
-	u_int8_t block_allignment;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - capability mask ;bit 0:Parallel flash Support;else:Reserved  */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t capability_mask;
-};
+    /* Description -   */
+    /* Size in bytes - 268 */
+    struct register_access_mfba
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Flash Select */
+        /* 0x0.4 - 0x0.5 */
+        u_int8_t fs;
+        /* Description - Parallel */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t p;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Transaction size */
+        /* 0x4.0 - 0x4.8 */
+        u_int16_t size;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - address in bytes */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t address;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - data */
+        /* 0xc.0 - 0x108.31 */
+        u_int32_t data[64];
+    };
 
-/* Description -   */
-/* Size in bytes - 268 */
-union register_access_register_access_open_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct register_access_mfbe mfbe;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct register_access_mfpa mfpa;
-	/* Description -  */
-	/* 0x0.0 - 0x108.31 */
-	struct register_access_mfba mfba;
-};
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct register_access_mfbe
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Flash Select */
+        /* 0x0.4 - 0x0.5 */
+        u_int8_t fs;
+        /* Description - Parallel */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t p;
+        /* Description - Erase a 64KB flash area in one bulk operation. */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t bulk_64kb_erase;
+        /* Description - Erase a 32KB flash area in one bulk operation. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t bulk_32kb_erase;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - address in bytes */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t address;
+    };
 
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct register_access_mfpa
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Flash Select */
+        /* 0x0.4 - 0x0.5 */
+        u_int8_t fs;
+        /* Description - Parallel */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t p;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - address in bytes */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t boot_address;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - number of flash devices connected */
+        /* 0x10.0 - 0x10.3 */
+        u_int8_t flash_num;
+        /* Description - If set, MFBE register supports 64KB bulk erase operation. */
+        /* 0x10.29 - 0x10.29 */
+        u_int8_t bulk_64kb_erase_en;
+        /* Description - If set, MFBE register supports 32KB bulk erase operation. */
+        /* 0x10.30 - 0x10.30 */
+        u_int8_t bulk_32kb_erase_en;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Flash JEDEC ID */
+        /* 0x14.0 - 0x14.23 */
+        u_int32_t jedec_id;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Flash sectore size */
+        /* 0x18.0 - 0x18.9 */
+        u_int16_t sector_size;
+        /* Description -  */
+        /* 0x18.16 - 0x18.23 */
+        u_int8_t block_allignment;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - capability mask ;bit 0:Parallel flash Support;else:Reserved  */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t capability_mask;
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* mfba */
-void register_access_mfba_pack(const struct register_access_mfba *ptr_struct, u_int8_t *ptr_buff);
-void register_access_mfba_unpack(struct register_access_mfba *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_mfba_print(const struct register_access_mfba *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_mfba_size(void);
-#define REGISTER_ACCESS_MFBA_SIZE    (0x10c)
-void register_access_mfba_dump(const struct register_access_mfba *ptr_struct, FILE *fd);
-/* mfbe */
-void register_access_mfbe_pack(const struct register_access_mfbe *ptr_struct, u_int8_t *ptr_buff);
-void register_access_mfbe_unpack(struct register_access_mfbe *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_mfbe_print(const struct register_access_mfbe *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_mfbe_size(void);
-#define REGISTER_ACCESS_MFBE_SIZE    (0xc)
-void register_access_mfbe_dump(const struct register_access_mfbe *ptr_struct, FILE *fd);
-/* mfpa */
-void register_access_mfpa_pack(const struct register_access_mfpa *ptr_struct, u_int8_t *ptr_buff);
-void register_access_mfpa_unpack(struct register_access_mfpa *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_mfpa_print(const struct register_access_mfpa *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_mfpa_size(void);
-#define REGISTER_ACCESS_MFPA_SIZE    (0x20)
-void register_access_mfpa_dump(const struct register_access_mfpa *ptr_struct, FILE *fd);
-/* register_access_open_Nodes */
-void register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_register_access_open_Nodes_print(const union register_access_register_access_open_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_register_access_open_Nodes_size(void);
-#define REGISTER_ACCESS_REGISTER_ACCESS_OPEN_NODES_SIZE    (0x10c)
-void register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 268 */
+    union register_access_register_access_open_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct register_access_mfbe mfbe;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct register_access_mfpa mfpa;
+        /* Description -  */
+        /* 0x0.0 - 0x108.31 */
+        struct register_access_mfba mfba;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* mfba */
+    void register_access_mfba_pack(const struct register_access_mfba* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_mfba_unpack(struct register_access_mfba* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_mfba_print(const struct register_access_mfba* ptr_struct, FILE* fd, int indent_level);
+    unsigned int register_access_mfba_size(void);
+#define REGISTER_ACCESS_MFBA_SIZE (0x10c)
+    void register_access_mfba_dump(const struct register_access_mfba* ptr_struct, FILE* fd);
+    /* mfbe */
+    void register_access_mfbe_pack(const struct register_access_mfbe* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_mfbe_unpack(struct register_access_mfbe* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_mfbe_print(const struct register_access_mfbe* ptr_struct, FILE* fd, int indent_level);
+    unsigned int register_access_mfbe_size(void);
+#define REGISTER_ACCESS_MFBE_SIZE (0xc)
+    void register_access_mfbe_dump(const struct register_access_mfbe* ptr_struct, FILE* fd);
+    /* mfpa */
+    void register_access_mfpa_pack(const struct register_access_mfpa* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_mfpa_unpack(struct register_access_mfpa* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_mfpa_print(const struct register_access_mfpa* ptr_struct, FILE* fd, int indent_level);
+    unsigned int register_access_mfpa_size(void);
+#define REGISTER_ACCESS_MFPA_SIZE (0x20)
+    void register_access_mfpa_dump(const struct register_access_mfpa* ptr_struct, FILE* fd);
+    /* register_access_open_Nodes */
+    void
+      register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes* ptr_struct,
+                                                      u_int8_t* ptr_buff);
+    void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes* ptr_struct,
+                                                           const u_int8_t* ptr_buff);
+    void register_access_register_access_open_Nodes_print(
+      const union register_access_register_access_open_Nodes* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int register_access_register_access_open_Nodes_size(void);
+#define REGISTER_ACCESS_REGISTER_ACCESS_OPEN_NODES_SIZE (0x10c)
+    void
+      register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes* ptr_struct,
+                                                      FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/register_access_sib_layouts.c b/tools_layouts/register_access_sib_layouts.c
index 9084f404..adf80ef6 100644
--- a/tools_layouts/register_access_sib_layouts.c
+++ b/tools_layouts/register_access_sib_layouts.c
@@ -29,587 +29,612 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2019-03-23 21:38:49"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/register_access/register_access_sib.adb --file-prefix register_access_sib --prefix register_access_sib_
-         ***/
+ *** This file was generated at "2019-03-23 21:38:49"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/register_access/register_access_sib.adb --file-prefix register_access_sib --prefix register_access_sib_
+ ***/
 #include "register_access_sib_layouts.h"
 
-void register_access_sib_IB_PSID__pack(const struct register_access_sib_IB_PSID_ *ptr_struct, u_int8_t *ptr_buff)
+void register_access_sib_IB_PSID__pack(const struct register_access_sib_IB_PSID_* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->PS_ID[i]);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->PS_ID[i]);
+    }
 }
 
-void register_access_sib_IB_PSID__unpack(struct register_access_sib_IB_PSID_ *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_sib_IB_PSID__unpack(struct register_access_sib_IB_PSID_* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 4; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
-		ptr_struct->PS_ID[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
+        ptr_struct->PS_ID[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_ *ptr_struct, FILE *fd, int indent_level)
+void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_IB_PSID_ ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_IB_PSID_ ========\n");
 
-	for (i = 0; i < 4; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "PS_ID_%03d           : " U32H_FMT "\n", i, ptr_struct->PS_ID[i]);
-	}
+    for (i = 0; i < 4; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "PS_ID_%03d           : " U32H_FMT "\n", i, ptr_struct->PS_ID[i]);
+    }
 }
 
 unsigned int register_access_sib_IB_PSID__size(void)
 {
-	return REGISTER_ACCESS_SIB_IB_PSID__SIZE;
+    return REGISTER_ACCESS_SIB_IB_PSID__SIZE;
 }
 
-void register_access_sib_IB_PSID__dump(const struct register_access_sib_IB_PSID_ *ptr_struct, FILE *fd)
+void register_access_sib_IB_PSID__dump(const struct register_access_sib_IB_PSID_* ptr_struct, FILE* fd)
 {
-	register_access_sib_IB_PSID__print(ptr_struct, fd, 0);
+    register_access_sib_IB_PSID__print(ptr_struct, fd, 0);
 }
 
-void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DEVInfo_ *ptr_struct, u_int8_t *ptr_buff)
+void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DEVInfo_* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 7; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 224, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->dev_branch_tag[i]);
-	}
+    for (i = 0; i < 7; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 224, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->dev_branch_tag[i]);
+    }
 }
 
-void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_ *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	for (i = 0; i < 7; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 224, 1);
-		ptr_struct->dev_branch_tag[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+    for (i = 0; i < 7; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 224, 1);
+        ptr_struct->dev_branch_tag[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_ *ptr_struct, FILE *fd, int indent_level)
+void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_IB_DEVInfo_ ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_IB_DEVInfo_ ========\n");
 
-	for (i = 0; i < 7; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "dev_branch_tag_%03d  : " U32H_FMT "\n", i, ptr_struct->dev_branch_tag[i]);
-	}
+    for (i = 0; i < 7; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "dev_branch_tag_%03d  : " U32H_FMT "\n", i, ptr_struct->dev_branch_tag[i]);
+    }
 }
 
 unsigned int register_access_sib_IB_DEVInfo__size(void)
 {
-	return REGISTER_ACCESS_SIB_IB_DEVINFO__SIZE;
-}
-
-void register_access_sib_IB_DEVInfo__dump(const struct register_access_sib_IB_DEVInfo_ *ptr_struct, FILE *fd)
-{
-	register_access_sib_IB_DEVInfo__print(ptr_struct, fd, 0);
-}
-
-void register_access_sib_IB_FWInfo__pack(const struct register_access_sib_IB_FWInfo_ *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->SubMinor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Minor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Major);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->BuildID);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Day);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Month);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Hour);
-	offset = 128;
-	register_access_sib_IB_PSID__pack(&(ptr_struct->PSID), ptr_buff + offset / 8);
-	offset = 256;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->INIFileNum);
-	offset = 288;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_major);
-	offset = 320;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_minor);
-	offset = 352;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_subminor);
-}
-
-void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_ *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->SubMinor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->Minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->Major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->BuildID = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 72;
-	ptr_struct->Day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->Month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->Hour = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	register_access_sib_IB_PSID__unpack(&(ptr_struct->PSID), ptr_buff + offset / 8);
-	offset = 256;
-	ptr_struct->INIFileNum = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 288;
-	ptr_struct->extended_major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 320;
-	ptr_struct->extended_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 352;
-	ptr_struct->extended_subminor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_ *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_IB_FWInfo_ ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "SubMinor             : " UH_FMT "\n", ptr_struct->SubMinor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Minor                : " UH_FMT "\n", ptr_struct->Minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Major                : " UH_FMT "\n", ptr_struct->Major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "BuildID              : " U32H_FMT "\n", ptr_struct->BuildID);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Year                 : " UH_FMT "\n", ptr_struct->Year);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Day                  : " UH_FMT "\n", ptr_struct->Day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Month                : " UH_FMT "\n", ptr_struct->Month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Hour                 : " UH_FMT "\n", ptr_struct->Hour);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "PSID:\n");
-	register_access_sib_IB_PSID__print(&(ptr_struct->PSID), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "INIFileNum           : " U32H_FMT "\n", ptr_struct->INIFileNum);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_major       : " U32H_FMT "\n", ptr_struct->extended_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_minor       : " U32H_FMT "\n", ptr_struct->extended_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_subminor    : " U32H_FMT "\n", ptr_struct->extended_subminor);
+    return REGISTER_ACCESS_SIB_IB_DEVINFO__SIZE;
+}
+
+void register_access_sib_IB_DEVInfo__dump(const struct register_access_sib_IB_DEVInfo_* ptr_struct, FILE* fd)
+{
+    register_access_sib_IB_DEVInfo__print(ptr_struct, fd, 0);
+}
+
+void register_access_sib_IB_FWInfo__pack(const struct register_access_sib_IB_FWInfo_* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->SubMinor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Minor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Major);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->BuildID);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Year);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Day);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->Month);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->Hour);
+    offset = 128;
+    register_access_sib_IB_PSID__pack(&(ptr_struct->PSID), ptr_buff + offset / 8);
+    offset = 256;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->INIFileNum);
+    offset = 288;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_major);
+    offset = 320;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_minor);
+    offset = 352;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_subminor);
+}
+
+void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->SubMinor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->Minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->Major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->BuildID = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->Year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 72;
+    ptr_struct->Day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->Month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->Hour = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    register_access_sib_IB_PSID__unpack(&(ptr_struct->PSID), ptr_buff + offset / 8);
+    offset = 256;
+    ptr_struct->INIFileNum = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 288;
+    ptr_struct->extended_major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 320;
+    ptr_struct->extended_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 352;
+    ptr_struct->extended_subminor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_IB_FWInfo_ ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "SubMinor             : " UH_FMT "\n", ptr_struct->SubMinor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Minor                : " UH_FMT "\n", ptr_struct->Minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Major                : " UH_FMT "\n", ptr_struct->Major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "BuildID              : " U32H_FMT "\n", ptr_struct->BuildID);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Year                 : " UH_FMT "\n", ptr_struct->Year);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Day                  : " UH_FMT "\n", ptr_struct->Day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Month                : " UH_FMT "\n", ptr_struct->Month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Hour                 : " UH_FMT "\n", ptr_struct->Hour);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "PSID:\n");
+    register_access_sib_IB_PSID__print(&(ptr_struct->PSID), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "INIFileNum           : " U32H_FMT "\n", ptr_struct->INIFileNum);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_major       : " U32H_FMT "\n", ptr_struct->extended_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_minor       : " U32H_FMT "\n", ptr_struct->extended_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_subminor    : " U32H_FMT "\n", ptr_struct->extended_subminor);
 }
 
 unsigned int register_access_sib_IB_FWInfo__size(void)
 {
-	return REGISTER_ACCESS_SIB_IB_FWINFO__SIZE;
+    return REGISTER_ACCESS_SIB_IB_FWINFO__SIZE;
 }
 
-void register_access_sib_IB_FWInfo__dump(const struct register_access_sib_IB_FWInfo_ *ptr_struct, FILE *fd)
+void register_access_sib_IB_FWInfo__dump(const struct register_access_sib_IB_FWInfo_* ptr_struct, FILE* fd)
 {
-	register_access_sib_IB_FWInfo__print(ptr_struct, fd, 0);
+    register_access_sib_IB_FWInfo__print(ptr_struct, fd, 0);
 }
 
-void register_access_sib_IB_HWInfo__pack(const struct register_access_sib_IB_HWInfo_ *ptr_struct, u_int8_t *ptr_buff)
+void register_access_sib_IB_HWInfo__pack(const struct register_access_sib_IB_HWInfo_* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->DEVID);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->REVID);
-	offset = 59;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->pvs);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->UpTime);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->DEVID);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->REVID);
+    offset = 59;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->pvs);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->UpTime);
 }
 
-void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_ *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->DEVID = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->REVID = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 59;
-	ptr_struct->pvs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 80;
-	ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 224;
-	ptr_struct->UpTime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 16;
+    ptr_struct->DEVID = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->REVID = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 59;
+    ptr_struct->pvs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 80;
+    ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 224;
+    ptr_struct->UpTime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_ *ptr_struct, FILE *fd, int indent_level)
+void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_IB_HWInfo_ ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_IB_HWInfo_ ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "DEVID                : " UH_FMT "\n", ptr_struct->DEVID);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "REVID                : " UH_FMT "\n", ptr_struct->REVID);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pvs                  : " UH_FMT "\n", ptr_struct->pvs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_dev_id            : " UH_FMT "\n", ptr_struct->hw_dev_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "UpTime               : " U32H_FMT "\n", ptr_struct->UpTime);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "DEVID                : " UH_FMT "\n", ptr_struct->DEVID);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "REVID                : " UH_FMT "\n", ptr_struct->REVID);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pvs                  : " UH_FMT "\n", ptr_struct->pvs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_dev_id            : " UH_FMT "\n", ptr_struct->hw_dev_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "UpTime               : " U32H_FMT "\n", ptr_struct->UpTime);
 }
 
 unsigned int register_access_sib_IB_HWInfo__size(void)
 {
-	return REGISTER_ACCESS_SIB_IB_HWINFO__SIZE;
+    return REGISTER_ACCESS_SIB_IB_HWINFO__SIZE;
 }
 
-void register_access_sib_IB_HWInfo__dump(const struct register_access_sib_IB_HWInfo_ *ptr_struct, FILE *fd)
+void register_access_sib_IB_HWInfo__dump(const struct register_access_sib_IB_HWInfo_* ptr_struct, FILE* fd)
 {
-	register_access_sib_IB_HWInfo__print(ptr_struct, fd, 0);
+    register_access_sib_IB_HWInfo__print(ptr_struct, fd, 0);
 }
 
-void register_access_sib_IB_SWInfo__pack(const struct register_access_sib_IB_SWInfo_ *ptr_struct, u_int8_t *ptr_buff)
+void register_access_sib_IB_SWInfo__pack(const struct register_access_sib_IB_SWInfo_* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->VerSubMinor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->VerMinor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->VerMajor);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->VerSubMinor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->VerMinor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->VerMajor);
 }
 
-void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_ *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->VerSubMinor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->VerMinor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->VerMajor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->VerSubMinor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->VerMinor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->VerMajor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_ *ptr_struct, FILE *fd, int indent_level)
+void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_IB_SWInfo_ ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_IB_SWInfo_ ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "VerSubMinor          : " UH_FMT "\n", ptr_struct->VerSubMinor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "VerMinor             : " UH_FMT "\n", ptr_struct->VerMinor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "VerMajor             : " UH_FMT "\n", ptr_struct->VerMajor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "VerSubMinor          : " UH_FMT "\n", ptr_struct->VerSubMinor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "VerMinor             : " UH_FMT "\n", ptr_struct->VerMinor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "VerMajor             : " UH_FMT "\n", ptr_struct->VerMajor);
 }
 
 unsigned int register_access_sib_IB_SWInfo__size(void)
 {
-	return REGISTER_ACCESS_SIB_IB_SWINFO__SIZE;
+    return REGISTER_ACCESS_SIB_IB_SWINFO__SIZE;
 }
 
-void register_access_sib_IB_SWInfo__dump(const struct register_access_sib_IB_SWInfo_ *ptr_struct, FILE *fd)
+void register_access_sib_IB_SWInfo__dump(const struct register_access_sib_IB_SWInfo_* ptr_struct, FILE* fd)
 {
-	register_access_sib_IB_SWInfo__print(ptr_struct, fd, 0);
+    register_access_sib_IB_SWInfo__print(ptr_struct, fd, 0);
 }
 
-void register_access_sib_mgir_pack(const struct register_access_sib_mgir *ptr_struct, u_int8_t *ptr_buff)
+void register_access_sib_mgir_pack(const struct register_access_sib_mgir* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	register_access_sib_IB_HWInfo__pack(&(ptr_struct->HWInfo), ptr_buff + offset / 8);
-	offset = 256;
-	register_access_sib_IB_FWInfo__pack(&(ptr_struct->FWInfo), ptr_buff + offset / 8);
-	offset = 768;
-	register_access_sib_IB_SWInfo__pack(&(ptr_struct->SWInfo), ptr_buff + offset / 8);
-	offset = 1024;
-	register_access_sib_IB_DEVInfo__pack(&(ptr_struct->DEVInfo), ptr_buff + offset / 8);
+    offset = 0;
+    register_access_sib_IB_HWInfo__pack(&(ptr_struct->HWInfo), ptr_buff + offset / 8);
+    offset = 256;
+    register_access_sib_IB_FWInfo__pack(&(ptr_struct->FWInfo), ptr_buff + offset / 8);
+    offset = 768;
+    register_access_sib_IB_SWInfo__pack(&(ptr_struct->SWInfo), ptr_buff + offset / 8);
+    offset = 1024;
+    register_access_sib_IB_DEVInfo__pack(&(ptr_struct->DEVInfo), ptr_buff + offset / 8);
 }
 
-void register_access_sib_mgir_unpack(struct register_access_sib_mgir *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_sib_mgir_unpack(struct register_access_sib_mgir* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	register_access_sib_IB_HWInfo__unpack(&(ptr_struct->HWInfo), ptr_buff + offset / 8);
-	offset = 256;
-	register_access_sib_IB_FWInfo__unpack(&(ptr_struct->FWInfo), ptr_buff + offset / 8);
-	offset = 768;
-	register_access_sib_IB_SWInfo__unpack(&(ptr_struct->SWInfo), ptr_buff + offset / 8);
-	offset = 1024;
-	register_access_sib_IB_DEVInfo__unpack(&(ptr_struct->DEVInfo), ptr_buff + offset / 8);
+    offset = 0;
+    register_access_sib_IB_HWInfo__unpack(&(ptr_struct->HWInfo), ptr_buff + offset / 8);
+    offset = 256;
+    register_access_sib_IB_FWInfo__unpack(&(ptr_struct->FWInfo), ptr_buff + offset / 8);
+    offset = 768;
+    register_access_sib_IB_SWInfo__unpack(&(ptr_struct->SWInfo), ptr_buff + offset / 8);
+    offset = 1024;
+    register_access_sib_IB_DEVInfo__unpack(&(ptr_struct->DEVInfo), ptr_buff + offset / 8);
 }
 
-void register_access_sib_mgir_print(const struct register_access_sib_mgir *ptr_struct, FILE *fd, int indent_level)
+void register_access_sib_mgir_print(const struct register_access_sib_mgir* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_mgir ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_mgir ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "HWInfo:\n");
-	register_access_sib_IB_HWInfo__print(&(ptr_struct->HWInfo), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "FWInfo:\n");
-	register_access_sib_IB_FWInfo__print(&(ptr_struct->FWInfo), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "SWInfo:\n");
-	register_access_sib_IB_SWInfo__print(&(ptr_struct->SWInfo), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "DEVInfo:\n");
-	register_access_sib_IB_DEVInfo__print(&(ptr_struct->DEVInfo), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "HWInfo:\n");
+    register_access_sib_IB_HWInfo__print(&(ptr_struct->HWInfo), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "FWInfo:\n");
+    register_access_sib_IB_FWInfo__print(&(ptr_struct->FWInfo), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "SWInfo:\n");
+    register_access_sib_IB_SWInfo__print(&(ptr_struct->SWInfo), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "DEVInfo:\n");
+    register_access_sib_IB_DEVInfo__print(&(ptr_struct->DEVInfo), fd, indent_level + 1);
 }
 
 unsigned int register_access_sib_mgir_size(void)
 {
-	return REGISTER_ACCESS_SIB_MGIR_SIZE;
-}
-
-void register_access_sib_mgir_dump(const struct register_access_sib_mgir *ptr_struct, FILE *fd)
-{
-	register_access_sib_mgir_print(ptr_struct, fd, 0);
-}
-
-void register_access_sib_mtmp_pack(const struct register_access_sib_mtmp *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->sensor_index);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->internal_diodes_query);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->temperature);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mss);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->max_temperture);
-	offset = 65;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mtr);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mte);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->temperature_threshold_hi);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->tee);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->temperature_threshold_lo);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->name_hi);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->name_lo);
-}
-
-void register_access_sib_mtmp_unpack(struct register_access_sib_mtmp *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 20;
-	ptr_struct->sensor_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 0;
-	ptr_struct->internal_diodes_query = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->temperature = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->mss = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 80;
-	ptr_struct->max_temperture = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 65;
-	ptr_struct->mtr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->mte = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 112;
-	ptr_struct->temperature_threshold_hi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 96;
-	ptr_struct->tee = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 144;
-	ptr_struct->temperature_threshold_lo = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 192;
-	ptr_struct->name_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 224;
-	ptr_struct->name_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void register_access_sib_mtmp_print(const struct register_access_sib_mtmp *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_mtmp ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sensor_index         : " UH_FMT "\n", ptr_struct->sensor_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "internal_diodes_query : " UH_FMT "\n", ptr_struct->internal_diodes_query);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "temperature          : " UH_FMT "\n", ptr_struct->temperature);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mss                  : " UH_FMT "\n", ptr_struct->mss);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_temperture       : " UH_FMT "\n", ptr_struct->max_temperture);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mtr                  : " UH_FMT "\n", ptr_struct->mtr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mte                  : " UH_FMT "\n", ptr_struct->mte);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "temperature_threshold_hi : " UH_FMT "\n", ptr_struct->temperature_threshold_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tee                  : " UH_FMT "\n", ptr_struct->tee);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "temperature_threshold_lo : " UH_FMT "\n", ptr_struct->temperature_threshold_lo);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "name_hi              : " U32H_FMT "\n", ptr_struct->name_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "name_lo              : " U32H_FMT "\n", ptr_struct->name_lo);
+    return REGISTER_ACCESS_SIB_MGIR_SIZE;
+}
+
+void register_access_sib_mgir_dump(const struct register_access_sib_mgir* ptr_struct, FILE* fd)
+{
+    register_access_sib_mgir_print(ptr_struct, fd, 0);
+}
+
+void register_access_sib_mtmp_pack(const struct register_access_sib_mtmp* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->sensor_index);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->internal_diodes_query);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->temperature);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mss);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->max_temperture);
+    offset = 65;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mtr);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mte);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->temperature_threshold_hi);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->tee);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->temperature_threshold_lo);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->name_hi);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->name_lo);
+}
+
+void register_access_sib_mtmp_unpack(struct register_access_sib_mtmp* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 20;
+    ptr_struct->sensor_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 0;
+    ptr_struct->internal_diodes_query = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->temperature = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->mss = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 80;
+    ptr_struct->max_temperture = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 65;
+    ptr_struct->mtr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->mte = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 112;
+    ptr_struct->temperature_threshold_hi = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 96;
+    ptr_struct->tee = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 144;
+    ptr_struct->temperature_threshold_lo = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 192;
+    ptr_struct->name_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 224;
+    ptr_struct->name_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void register_access_sib_mtmp_print(const struct register_access_sib_mtmp* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_mtmp ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sensor_index         : " UH_FMT "\n", ptr_struct->sensor_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "internal_diodes_query : " UH_FMT "\n", ptr_struct->internal_diodes_query);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "temperature          : " UH_FMT "\n", ptr_struct->temperature);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mss                  : " UH_FMT "\n", ptr_struct->mss);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_temperture       : " UH_FMT "\n", ptr_struct->max_temperture);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mtr                  : " UH_FMT "\n", ptr_struct->mtr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mte                  : " UH_FMT "\n", ptr_struct->mte);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "temperature_threshold_hi : " UH_FMT "\n", ptr_struct->temperature_threshold_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tee                  : " UH_FMT "\n", ptr_struct->tee);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "temperature_threshold_lo : " UH_FMT "\n", ptr_struct->temperature_threshold_lo);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "name_hi              : " U32H_FMT "\n", ptr_struct->name_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "name_lo              : " U32H_FMT "\n", ptr_struct->name_lo);
 }
 
 unsigned int register_access_sib_mtmp_size(void)
 {
-	return REGISTER_ACCESS_SIB_MTMP_SIZE;
-}
-
-void register_access_sib_mtmp_dump(const struct register_access_sib_mtmp *ptr_struct, FILE *fd)
-{
-	register_access_sib_mtmp_print(ptr_struct, fd, 0);
-}
-
-void register_access_sib_pmaos_pack(const struct register_access_sib_pmaos *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->oper_status);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->admin_status);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->module);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rst);
-	offset = 62;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->e);
-	offset = 52;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->error_type);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ee);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ase);
-}
-
-void register_access_sib_pmaos_unpack(struct register_access_sib_pmaos *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 28;
-	ptr_struct->oper_status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 20;
-	ptr_struct->admin_status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 8;
-	ptr_struct->module = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->rst = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 62;
-	ptr_struct->e = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 52;
-	ptr_struct->error_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 33;
-	ptr_struct->ee = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->ase = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void register_access_sib_pmaos_print(const struct register_access_sib_pmaos *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_pmaos ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "oper_status          : " UH_FMT "\n", ptr_struct->oper_status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "admin_status         : " UH_FMT "\n", ptr_struct->admin_status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "module               : " UH_FMT "\n", ptr_struct->module);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rst                  : " UH_FMT "\n", ptr_struct->rst);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "e                    : " UH_FMT "\n", ptr_struct->e);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "error_type           : " UH_FMT "\n", ptr_struct->error_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ee                   : " UH_FMT "\n", ptr_struct->ee);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ase                  : " UH_FMT "\n", ptr_struct->ase);
+    return REGISTER_ACCESS_SIB_MTMP_SIZE;
+}
+
+void register_access_sib_mtmp_dump(const struct register_access_sib_mtmp* ptr_struct, FILE* fd)
+{
+    register_access_sib_mtmp_print(ptr_struct, fd, 0);
+}
+
+void register_access_sib_pmaos_pack(const struct register_access_sib_pmaos* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->oper_status);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->admin_status);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->module);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rst);
+    offset = 62;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->e);
+    offset = 52;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->error_type);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ee);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ase);
+}
+
+void register_access_sib_pmaos_unpack(struct register_access_sib_pmaos* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 28;
+    ptr_struct->oper_status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 20;
+    ptr_struct->admin_status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 8;
+    ptr_struct->module = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->rst = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 62;
+    ptr_struct->e = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 52;
+    ptr_struct->error_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 33;
+    ptr_struct->ee = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->ase = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void register_access_sib_pmaos_print(const struct register_access_sib_pmaos* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_pmaos ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "oper_status          : " UH_FMT "\n", ptr_struct->oper_status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "admin_status         : " UH_FMT "\n", ptr_struct->admin_status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "module               : " UH_FMT "\n", ptr_struct->module);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rst                  : " UH_FMT "\n", ptr_struct->rst);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "e                    : " UH_FMT "\n", ptr_struct->e);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "error_type           : " UH_FMT "\n", ptr_struct->error_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ee                   : " UH_FMT "\n", ptr_struct->ee);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ase                  : " UH_FMT "\n", ptr_struct->ase);
 }
 
 unsigned int register_access_sib_pmaos_size(void)
 {
-	return REGISTER_ACCESS_SIB_PMAOS_SIZE;
+    return REGISTER_ACCESS_SIB_PMAOS_SIZE;
 }
 
-void register_access_sib_pmaos_dump(const struct register_access_sib_pmaos *ptr_struct, FILE *fd)
+void register_access_sib_pmaos_dump(const struct register_access_sib_pmaos* ptr_struct, FILE* fd)
 {
-	register_access_sib_pmaos_print(ptr_struct, fd, 0);
+    register_access_sib_pmaos_print(ptr_struct, fd, 0);
 }
 
-void register_access_sib_register_access_sib_Nodes_pack(const union register_access_sib_register_access_sib_Nodes *ptr_struct, u_int8_t *ptr_buff)
+void register_access_sib_register_access_sib_Nodes_pack(
+  const union register_access_sib_register_access_sib_Nodes* ptr_struct,
+  u_int8_t* ptr_buff)
 {
-	register_access_sib_mgir_pack(&(ptr_struct->mgir), ptr_buff);
+    register_access_sib_mgir_pack(&(ptr_struct->mgir), ptr_buff);
 }
 
-void register_access_sib_register_access_sib_Nodes_unpack(union register_access_sib_register_access_sib_Nodes *ptr_struct, const u_int8_t *ptr_buff)
+void register_access_sib_register_access_sib_Nodes_unpack(
+  union register_access_sib_register_access_sib_Nodes* ptr_struct,
+  const u_int8_t* ptr_buff)
 {
-	register_access_sib_mgir_unpack(&(ptr_struct->mgir), ptr_buff);
+    register_access_sib_mgir_unpack(&(ptr_struct->mgir), ptr_buff);
 }
 
-void register_access_sib_register_access_sib_Nodes_print(const union register_access_sib_register_access_sib_Nodes *ptr_struct, FILE *fd, int indent_level)
+void register_access_sib_register_access_sib_Nodes_print(
+  const union register_access_sib_register_access_sib_Nodes* ptr_struct,
+  FILE* fd,
+  int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== register_access_sib_register_access_sib_Nodes ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== register_access_sib_register_access_sib_Nodes ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mtmp:\n");
-	register_access_sib_mtmp_print(&(ptr_struct->mtmp), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pmaos:\n");
-	register_access_sib_pmaos_print(&(ptr_struct->pmaos), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mgir:\n");
-	register_access_sib_mgir_print(&(ptr_struct->mgir), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mtmp:\n");
+    register_access_sib_mtmp_print(&(ptr_struct->mtmp), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pmaos:\n");
+    register_access_sib_pmaos_print(&(ptr_struct->pmaos), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mgir:\n");
+    register_access_sib_mgir_print(&(ptr_struct->mgir), fd, indent_level + 1);
 }
 
 unsigned int register_access_sib_register_access_sib_Nodes_size(void)
 {
-	return REGISTER_ACCESS_SIB_REGISTER_ACCESS_SIB_NODES_SIZE;
+    return REGISTER_ACCESS_SIB_REGISTER_ACCESS_SIB_NODES_SIZE;
 }
 
-void register_access_sib_register_access_sib_Nodes_dump(const union register_access_sib_register_access_sib_Nodes *ptr_struct, FILE *fd)
+void register_access_sib_register_access_sib_Nodes_dump(
+  const union register_access_sib_register_access_sib_Nodes* ptr_struct,
+  FILE* fd)
 {
-	register_access_sib_register_access_sib_Nodes_print(ptr_struct, fd, 0);
+    register_access_sib_register_access_sib_Nodes_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/register_access_sib_layouts.h b/tools_layouts/register_access_sib_layouts.h
index 0d13e2be..e3a51b51 100644
--- a/tools_layouts/register_access_sib_layouts.h
+++ b/tools_layouts/register_access_sib_layouts.h
@@ -29,326 +29,361 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2019-03-23 21:38:49"
-         *** by:
-         ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input adb/register_access/register_access_sib.adb --file-prefix register_access_sib --prefix register_access_sib_
-         ***/
+ *** This file was generated at "2019-03-23 21:38:49"
+ *** by:
+ ***    > /mswg/release/tools/a-me/last_stable/adabe_plugins/adb2c/adb2pack.py --input
+ *adb/register_access/register_access_sib.adb --file-prefix register_access_sib --prefix register_access_sib_
+ ***/
 #ifndef REGISTER_ACCESS_SIB_LAYOUTS_H
 #define REGISTER_ACCESS_SIB_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 16 */
-struct register_access_sib_IB_PSID_ {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - PS - ID */
-	/* 0x0.0 - 0xc.31 */
-	u_int32_t PS_ID[4];
-};
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct register_access_sib_IB_PSID_
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - PS - ID */
+        /* 0x0.0 - 0xc.31 */
+        u_int32_t PS_ID[4];
+    };
 
-/* Description -  Development Info */
-/* Size in bytes - 28 */
-struct register_access_sib_IB_DEVInfo_ {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - FW version as string characters */
-	/* 0x0.0 - 0x18.31 */
-	u_int32_t dev_branch_tag[7];
-};
+    /* Description -  Development Info */
+    /* Size in bytes - 28 */
+    struct register_access_sib_IB_DEVInfo_
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - FW version as string characters */
+        /* 0x0.0 - 0x18.31 */
+        u_int32_t dev_branch_tag[7];
+    };
 
-/* Description -  FW Info */
-/* Size in bytes - 64 */
-struct register_access_sib_IB_FWInfo_ {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t SubMinor;
-	/* Description -  */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t Minor;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t Major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t BuildID;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t Year;
-	/* Description -  */
-	/* 0x8.16 - 0x8.23 */
-	u_int8_t Day;
-	/* Description -  */
-	/* 0x8.24 - 0x8.31 */
-	u_int8_t Month;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t Hour;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x1c.31 */
-	struct register_access_sib_IB_PSID_ PSID;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x20.31 */
-	u_int32_t INIFileNum;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.0 - 0x24.31 */
-	u_int32_t extended_major;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x28.31 */
-	u_int32_t extended_minor;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description -  */
-	/* 0x2c.0 - 0x2c.31 */
-	u_int32_t extended_subminor;
-};
+    /* Description -  FW Info */
+    /* Size in bytes - 64 */
+    struct register_access_sib_IB_FWInfo_
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t SubMinor;
+        /* Description -  */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t Minor;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t Major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t BuildID;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t Year;
+        /* Description -  */
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t Day;
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t Month;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t Hour;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x1c.31 */
+        struct register_access_sib_IB_PSID_ PSID;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x20.31 */
+        u_int32_t INIFileNum;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.0 - 0x24.31 */
+        u_int32_t extended_major;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x28.31 */
+        u_int32_t extended_minor;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description -  */
+        /* 0x2c.0 - 0x2c.31 */
+        u_int32_t extended_subminor;
+    };
 
-/* Description -  HW Info */
-/* Size in bytes - 32 */
-struct register_access_sib_IB_HWInfo_ {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t DEVID;
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t REVID;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Maximum supported V_CORE voltage for the device. (in 50mV increments). */
-	/* 0x4.0 - 0x4.4 */
-	u_int8_t pvs;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - the device_id in HW, used by tools */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t hw_dev_id;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Time (in sec) since last reset */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t UpTime;
-};
+    /* Description -  HW Info */
+    /* Size in bytes - 32 */
+    struct register_access_sib_IB_HWInfo_
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t DEVID;
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t REVID;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Maximum supported V_CORE voltage for the device. (in 50mV increments). */
+        /* 0x4.0 - 0x4.4 */
+        u_int8_t pvs;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - the device_id in HW, used by tools */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t hw_dev_id;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Time (in sec) since last reset */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t UpTime;
+    };
 
-/* Description -  SW Info */
-/* Size in bytes - 32 */
-struct register_access_sib_IB_SWInfo_ {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t VerSubMinor;
-	/* Description -  */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t VerMinor;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t VerMajor;
-};
+    /* Description -  SW Info */
+    /* Size in bytes - 32 */
+    struct register_access_sib_IB_SWInfo_
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t VerSubMinor;
+        /* Description -  */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t VerMinor;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t VerMajor;
+    };
 
-/* Description -   */
-/* Size in bytes - 160 */
-struct register_access_sib_mgir {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct register_access_sib_IB_HWInfo_ HWInfo;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x5c.31 */
-	struct register_access_sib_IB_FWInfo_ FWInfo;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description -  */
-	/* 0x60.0 - 0x7c.31 */
-	struct register_access_sib_IB_SWInfo_ SWInfo;
-/*---------------- DWORD[32] (Offset 0x80) ----------------*/
-	/* Description -  */
-	/* 0x80.0 - 0x98.31 */
-	struct register_access_sib_IB_DEVInfo_ DEVInfo;
-};
+    /* Description -   */
+    /* Size in bytes - 160 */
+    struct register_access_sib_mgir
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct register_access_sib_IB_HWInfo_ HWInfo;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x5c.31 */
+        struct register_access_sib_IB_FWInfo_ FWInfo;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description -  */
+        /* 0x60.0 - 0x7c.31 */
+        struct register_access_sib_IB_SWInfo_ SWInfo;
+        /*---------------- DWORD[32] (Offset 0x80) ----------------*/
+        /* Description -  */
+        /* 0x80.0 - 0x98.31 */
+        struct register_access_sib_IB_DEVInfo_ DEVInfo;
+    };
 
-/* Description -   */
-/* Size in bytes - 32 */
-struct register_access_sib_mtmp {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Sensors index to access */
-	/* 0x0.0 - 0x0.11 */
-	u_int16_t sensor_index;
-	/* Description - query the internal diodes */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t internal_diodes_query;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Temperature reading from the sensor. Reading in 0.125 Celsius degrees. */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t temperature;
-	/* Description - Module Sensor Supported:; 0: The module is not connected, or the module sensor is not supported; 1: The module sensor is supported */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t mss;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The highest measured temperature from the sensor. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t max_temperture;
-	/* Description - Max Temperature Reset - clears the value of the max temperature register */
-	/* 0x8.30 - 0x8.30 */
-	u_int8_t mtr;
-	/* Description - Max Temperature Enable - enables measuring the max temperature on a sensor */
-	/* 0x8.31 - 0x8.31 */
-	u_int8_t mte;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - If the sensor temperature measurement is above the threshold (and events are enabled), an event
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct register_access_sib_mtmp
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Sensors index to access */
+        /* 0x0.0 - 0x0.11 */
+        u_int16_t sensor_index;
+        /* Description - query the internal diodes */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t internal_diodes_query;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Temperature reading from the sensor. Reading in 0.125 Celsius degrees. */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t temperature;
+        /* Description - Module Sensor Supported:; 0: The module is not connected, or the module sensor is not
+         * supported; 1: The module sensor is supported */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t mss;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The highest measured temperature from the sensor. */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t max_temperture;
+        /* Description - Max Temperature Reset - clears the value of the max temperature register */
+        /* 0x8.30 - 0x8.30 */
+        u_int8_t mtr;
+        /* Description - Max Temperature Enable - enables measuring the max temperature on a sensor */
+        /* 0x8.31 - 0x8.31 */
+        u_int8_t mte;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - If the sensor temperature measurement is above the threshold (and events are enabled), an event
 will be generated */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t temperature_threshold_hi;
-	/* Description - Temperature Event Enable
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t temperature_threshold_hi;
+        /* Description - Temperature Event Enable
 00 - Do not generate event
 01 - Generate Event
 10 - Generate single event */
-	/* 0xc.30 - 0xc.31 */
-	u_int8_t tee;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t temperature_threshold_lo;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t name_hi;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t name_lo;
-};
+        /* 0xc.30 - 0xc.31 */
+        u_int8_t tee;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t temperature_threshold_lo;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t name_hi;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t name_lo;
+    };
 
-/* Description -   */
-/* Size in bytes - 12 */
-struct register_access_sib_pmaos {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Port operational state
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct register_access_sib_pmaos
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Port operational state
 0001 - up
 0010 - down */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t oper_status;
-	/* Description - Port administrative state (the desired state of the interface)
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t oper_status;
+        /* Description - Port administrative state (the desired state of the interface)
 0001 - up
 0010 - down by configuration (default) */
-	/* 0x0.8 - 0x0.11 */
-	u_int8_t admin_status;
-	/* Description - Local port number */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t module;
-	/* Description - Module Reset toggle */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t rst;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Event Generation on operational state change
+        /* 0x0.8 - 0x0.11 */
+        u_int8_t admin_status;
+        /* Description - Local port number */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t module;
+        /* Description - Module Reset toggle */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t rst;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Event Generation on operational state change
 00 - Do not generate event
-01 - Generate Unacknowledged Event 
+01 - Generate Unacknowledged Event
 10 - Generate Acknowledged Event */
-	/* 0x4.0 - 0x4.1 */
-	u_int8_t e;
-	/* Description - module error type. valid only when oper_status=0011 */
-	/* 0x4.8 - 0x4.11 */
-	u_int8_t error_type;
-	/* Description - Event Update Enable. If this bit is set, Event Generation will be 
+        /* 0x4.0 - 0x4.1 */
+        u_int8_t e;
+        /* Description - module error type. valid only when oper_status=0011 */
+        /* 0x4.8 - 0x4.11 */
+        u_int8_t error_type;
+        /* Description - Event Update Enable. If this bit is set, Event Generation will be
 updated based on the e field. Only relevant on Set operations */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t ee;
-	/* Description - Admin State Update Enable. If this bit is set, Admin State will be 
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t ee;
+        /* Description - Admin State Update Enable. If this bit is set, Admin State will be
 updated based on admin_state field. Only relevant on Set operations */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t ase;
-};
-
-/* Description -   */
-/* Size in bytes - 160 */
-union register_access_sib_register_access_sib_Nodes {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct register_access_sib_mtmp mtmp;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct register_access_sib_pmaos pmaos;
-	/* Description -  */
-	/* 0x0.0 - 0x9c.31 */
-	struct register_access_sib_mgir mgir;
-};
-
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t ase;
+    };
 
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* IB_PSID_ */
-void register_access_sib_IB_PSID__pack(const struct register_access_sib_IB_PSID_ *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_IB_PSID__unpack(struct register_access_sib_IB_PSID_ *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_ *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_IB_PSID__size(void);
-#define REGISTER_ACCESS_SIB_IB_PSID__SIZE    (0x10)
-void register_access_sib_IB_PSID__dump(const struct register_access_sib_IB_PSID_ *ptr_struct, FILE *fd);
-/* IB_DEVInfo_ */
-void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DEVInfo_ *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_ *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_ *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_IB_DEVInfo__size(void);
-#define REGISTER_ACCESS_SIB_IB_DEVINFO__SIZE    (0x1c)
-void register_access_sib_IB_DEVInfo__dump(const struct register_access_sib_IB_DEVInfo_ *ptr_struct, FILE *fd);
-/* IB_FWInfo_ */
-void register_access_sib_IB_FWInfo__pack(const struct register_access_sib_IB_FWInfo_ *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_ *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_ *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_IB_FWInfo__size(void);
-#define REGISTER_ACCESS_SIB_IB_FWINFO__SIZE    (0x40)
-void register_access_sib_IB_FWInfo__dump(const struct register_access_sib_IB_FWInfo_ *ptr_struct, FILE *fd);
-/* IB_HWInfo_ */
-void register_access_sib_IB_HWInfo__pack(const struct register_access_sib_IB_HWInfo_ *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_ *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_ *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_IB_HWInfo__size(void);
-#define REGISTER_ACCESS_SIB_IB_HWINFO__SIZE    (0x20)
-void register_access_sib_IB_HWInfo__dump(const struct register_access_sib_IB_HWInfo_ *ptr_struct, FILE *fd);
-/* IB_SWInfo_ */
-void register_access_sib_IB_SWInfo__pack(const struct register_access_sib_IB_SWInfo_ *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_ *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_ *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_IB_SWInfo__size(void);
-#define REGISTER_ACCESS_SIB_IB_SWINFO__SIZE    (0x20)
-void register_access_sib_IB_SWInfo__dump(const struct register_access_sib_IB_SWInfo_ *ptr_struct, FILE *fd);
-/* mgir */
-void register_access_sib_mgir_pack(const struct register_access_sib_mgir *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_mgir_unpack(struct register_access_sib_mgir *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_mgir_print(const struct register_access_sib_mgir *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_mgir_size(void);
-#define REGISTER_ACCESS_SIB_MGIR_SIZE    (0xa0)
-void register_access_sib_mgir_dump(const struct register_access_sib_mgir *ptr_struct, FILE *fd);
-/* mtmp */
-void register_access_sib_mtmp_pack(const struct register_access_sib_mtmp *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_mtmp_unpack(struct register_access_sib_mtmp *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_mtmp_print(const struct register_access_sib_mtmp *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_mtmp_size(void);
-#define REGISTER_ACCESS_SIB_MTMP_SIZE    (0x20)
-void register_access_sib_mtmp_dump(const struct register_access_sib_mtmp *ptr_struct, FILE *fd);
-/* pmaos */
-void register_access_sib_pmaos_pack(const struct register_access_sib_pmaos *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_pmaos_unpack(struct register_access_sib_pmaos *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_pmaos_print(const struct register_access_sib_pmaos *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_pmaos_size(void);
-#define REGISTER_ACCESS_SIB_PMAOS_SIZE    (0xc)
-void register_access_sib_pmaos_dump(const struct register_access_sib_pmaos *ptr_struct, FILE *fd);
-/* register_access_sib_Nodes */
-void register_access_sib_register_access_sib_Nodes_pack(const union register_access_sib_register_access_sib_Nodes *ptr_struct, u_int8_t *ptr_buff);
-void register_access_sib_register_access_sib_Nodes_unpack(union register_access_sib_register_access_sib_Nodes *ptr_struct, const u_int8_t *ptr_buff);
-void register_access_sib_register_access_sib_Nodes_print(const union register_access_sib_register_access_sib_Nodes *ptr_struct, FILE *fd, int indent_level);
-unsigned int register_access_sib_register_access_sib_Nodes_size(void);
-#define REGISTER_ACCESS_SIB_REGISTER_ACCESS_SIB_NODES_SIZE    (0xa0)
-void register_access_sib_register_access_sib_Nodes_dump(const union register_access_sib_register_access_sib_Nodes *ptr_struct, FILE *fd);
+    /* Description -   */
+    /* Size in bytes - 160 */
+    union register_access_sib_register_access_sib_Nodes
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct register_access_sib_mtmp mtmp;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct register_access_sib_pmaos pmaos;
+        /* Description -  */
+        /* 0x0.0 - 0x9c.31 */
+        struct register_access_sib_mgir mgir;
+    };
 
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* IB_PSID_ */
+    void register_access_sib_IB_PSID__pack(const struct register_access_sib_IB_PSID_* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_IB_PSID__unpack(struct register_access_sib_IB_PSID_* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int register_access_sib_IB_PSID__size(void);
+#define REGISTER_ACCESS_SIB_IB_PSID__SIZE (0x10)
+    void register_access_sib_IB_PSID__dump(const struct register_access_sib_IB_PSID_* ptr_struct, FILE* fd);
+    /* IB_DEVInfo_ */
+    void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DEVInfo_* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int register_access_sib_IB_DEVInfo__size(void);
+#define REGISTER_ACCESS_SIB_IB_DEVINFO__SIZE (0x1c)
+    void register_access_sib_IB_DEVInfo__dump(const struct register_access_sib_IB_DEVInfo_* ptr_struct, FILE* fd);
+    /* IB_FWInfo_ */
+    void register_access_sib_IB_FWInfo__pack(const struct register_access_sib_IB_FWInfo_* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int register_access_sib_IB_FWInfo__size(void);
+#define REGISTER_ACCESS_SIB_IB_FWINFO__SIZE (0x40)
+    void register_access_sib_IB_FWInfo__dump(const struct register_access_sib_IB_FWInfo_* ptr_struct, FILE* fd);
+    /* IB_HWInfo_ */
+    void register_access_sib_IB_HWInfo__pack(const struct register_access_sib_IB_HWInfo_* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int register_access_sib_IB_HWInfo__size(void);
+#define REGISTER_ACCESS_SIB_IB_HWINFO__SIZE (0x20)
+    void register_access_sib_IB_HWInfo__dump(const struct register_access_sib_IB_HWInfo_* ptr_struct, FILE* fd);
+    /* IB_SWInfo_ */
+    void register_access_sib_IB_SWInfo__pack(const struct register_access_sib_IB_SWInfo_* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int register_access_sib_IB_SWInfo__size(void);
+#define REGISTER_ACCESS_SIB_IB_SWINFO__SIZE (0x20)
+    void register_access_sib_IB_SWInfo__dump(const struct register_access_sib_IB_SWInfo_* ptr_struct, FILE* fd);
+    /* mgir */
+    void register_access_sib_mgir_pack(const struct register_access_sib_mgir* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_mgir_unpack(struct register_access_sib_mgir* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_mgir_print(const struct register_access_sib_mgir* ptr_struct, FILE* fd, int indent_level);
+    unsigned int register_access_sib_mgir_size(void);
+#define REGISTER_ACCESS_SIB_MGIR_SIZE (0xa0)
+    void register_access_sib_mgir_dump(const struct register_access_sib_mgir* ptr_struct, FILE* fd);
+    /* mtmp */
+    void register_access_sib_mtmp_pack(const struct register_access_sib_mtmp* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_mtmp_unpack(struct register_access_sib_mtmp* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_mtmp_print(const struct register_access_sib_mtmp* ptr_struct, FILE* fd, int indent_level);
+    unsigned int register_access_sib_mtmp_size(void);
+#define REGISTER_ACCESS_SIB_MTMP_SIZE (0x20)
+    void register_access_sib_mtmp_dump(const struct register_access_sib_mtmp* ptr_struct, FILE* fd);
+    /* pmaos */
+    void register_access_sib_pmaos_pack(const struct register_access_sib_pmaos* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_pmaos_unpack(struct register_access_sib_pmaos* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_pmaos_print(const struct register_access_sib_pmaos* ptr_struct, FILE* fd, int indent_level);
+    unsigned int register_access_sib_pmaos_size(void);
+#define REGISTER_ACCESS_SIB_PMAOS_SIZE (0xc)
+    void register_access_sib_pmaos_dump(const struct register_access_sib_pmaos* ptr_struct, FILE* fd);
+    /* register_access_sib_Nodes */
+    void register_access_sib_register_access_sib_Nodes_pack(
+      const union register_access_sib_register_access_sib_Nodes* ptr_struct,
+      u_int8_t* ptr_buff);
+    void register_access_sib_register_access_sib_Nodes_unpack(
+      union register_access_sib_register_access_sib_Nodes* ptr_struct,
+      const u_int8_t* ptr_buff);
+    void register_access_sib_register_access_sib_Nodes_print(
+      const union register_access_sib_register_access_sib_Nodes* ptr_struct,
+      FILE* fd,
+      int indent_level);
+    unsigned int register_access_sib_register_access_sib_Nodes_size(void);
+#define REGISTER_ACCESS_SIB_REGISTER_ACCESS_SIB_NODES_SIZE (0xa0)
+    void register_access_sib_register_access_sib_Nodes_dump(
+      const union register_access_sib_register_access_sib_Nodes* ptr_struct,
+      FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/tools_open_layouts.c b/tools_layouts/tools_open_layouts.c
index 41ebf23f..a1b33ee3 100644
--- a/tools_layouts/tools_open_layouts.c
+++ b/tools_layouts/tools_open_layouts.c
@@ -29,307 +29,307 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2021-03-31 03:07:49"
-         *** by:
-         ***    > /mswg/release/tools/a-me/a-me-1.0.122/adabe_plugins/adb2c/adb2pack.py --input adb/tools_open/tools_open.adb --file-prefix tools_open --prefix tools_open_ --no-adb-utils
-         ***/
+ *** This file was generated at "2021-03-31 03:07:49"
+ *** by:
+ ***    > /mswg/release/tools/a-me/a-me-1.0.122/adabe_plugins/adb2c/adb2pack.py --input adb/tools_open/tools_open.adb
+ *--file-prefix tools_open --prefix tools_open_ --no-adb-utils
+ ***/
 #include "tools_open_layouts.h"
 
-void tools_open_bmc_type_pack(const struct tools_open_bmc_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_bmc_type_pack(const struct tools_open_bmc_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 19;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 13, (u_int32_t)ptr_struct->param_idx);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->channel);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
+    offset = 19;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 13, (u_int32_t)ptr_struct->param_idx);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->channel);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
 }
 
-void tools_open_bmc_type_unpack(struct tools_open_bmc_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_bmc_type_unpack(struct tools_open_bmc_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 19;
-	ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 13);
-	offset = 14;
-	ptr_struct->channel = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 8;
-	ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 0;
-	ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 19;
+    ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 13);
+    offset = 14;
+    ptr_struct->channel = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 8;
+    ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 0;
+    ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_bmc_type_print(const struct tools_open_bmc_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_bmc_type_print(const struct tools_open_bmc_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_bmc_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_bmc_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "channel              : " UH_FMT "\n", ptr_struct->channel);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "channel              : " UH_FMT "\n", ptr_struct->channel);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
 }
 
 unsigned int tools_open_bmc_type_size(void)
 {
-	return TOOLS_OPEN_BMC_TYPE_SIZE;
+    return TOOLS_OPEN_BMC_TYPE_SIZE;
 }
 
-void tools_open_bmc_type_dump(const struct tools_open_bmc_type *ptr_struct, FILE *fd)
+void tools_open_bmc_type_dump(const struct tools_open_bmc_type* ptr_struct, FILE* fd)
 {
-	tools_open_bmc_type_print(ptr_struct, fd, 0);
+    tools_open_bmc_type_print(ptr_struct, fd, 0);
 }
 
-void tools_open_eswitch_type_pack(const struct tools_open_eswitch_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_eswitch_type_pack(const struct tools_open_eswitch_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->param_idx);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->port);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->param_idx);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->port);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
 }
 
-void tools_open_eswitch_type_unpack(struct tools_open_eswitch_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_eswitch_type_unpack(struct tools_open_eswitch_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 14;
-	ptr_struct->port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 8;
-	ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 0;
-	ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 14;
+    ptr_struct->port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 8;
+    ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 0;
+    ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_eswitch_type_print(const struct tools_open_eswitch_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_eswitch_type_print(const struct tools_open_eswitch_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_eswitch_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_eswitch_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port                 : " UH_FMT "\n", ptr_struct->port);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port                 : " UH_FMT "\n", ptr_struct->port);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
 }
 
 unsigned int tools_open_eswitch_type_size(void)
 {
-	return TOOLS_OPEN_ESWITCH_TYPE_SIZE;
+    return TOOLS_OPEN_ESWITCH_TYPE_SIZE;
 }
 
-void tools_open_eswitch_type_dump(const struct tools_open_eswitch_type *ptr_struct, FILE *fd)
+void tools_open_eswitch_type_dump(const struct tools_open_eswitch_type* ptr_struct, FILE* fd)
 {
-	tools_open_eswitch_type_print(ptr_struct, fd, 0);
+    tools_open_eswitch_type_print(ptr_struct, fd, 0);
 }
 
-void tools_open_global_type_pack(const struct tools_open_global_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_global_type_pack(const struct tools_open_global_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->param_idx);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->param_idx);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
 }
 
-void tools_open_global_type_unpack(struct tools_open_global_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_global_type_unpack(struct tools_open_global_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	ptr_struct->param_idx = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 0;
-	ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->param_idx = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 0;
+    ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_global_type_print(const struct tools_open_global_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_global_type_print(const struct tools_open_global_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_global_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_global_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
 }
 
 unsigned int tools_open_global_type_size(void)
 {
-	return TOOLS_OPEN_GLOBAL_TYPE_SIZE;
+    return TOOLS_OPEN_GLOBAL_TYPE_SIZE;
 }
 
-void tools_open_global_type_dump(const struct tools_open_global_type *ptr_struct, FILE *fd)
+void tools_open_global_type_dump(const struct tools_open_global_type* ptr_struct, FILE* fd)
 {
-	tools_open_global_type_print(ptr_struct, fd, 0);
+    tools_open_global_type_print(ptr_struct, fd, 0);
 }
 
-void tools_open_host_type_pack(const struct tools_open_host_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_host_type_pack(const struct tools_open_host_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 18, (u_int32_t)ptr_struct->param_idx);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 18, (u_int32_t)ptr_struct->param_idx);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
 }
 
-void tools_open_host_type_unpack(struct tools_open_host_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_host_type_unpack(struct tools_open_host_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 14;
-	ptr_struct->param_idx = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 18);
-	offset = 8;
-	ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 0;
-	ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 14;
+    ptr_struct->param_idx = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 18);
+    offset = 8;
+    ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 0;
+    ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_host_type_print(const struct tools_open_host_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_host_type_print(const struct tools_open_host_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_host_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_host_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
 }
 
 unsigned int tools_open_host_type_size(void)
 {
-	return TOOLS_OPEN_HOST_TYPE_SIZE;
+    return TOOLS_OPEN_HOST_TYPE_SIZE;
 }
 
-void tools_open_host_type_dump(const struct tools_open_host_type *ptr_struct, FILE *fd)
+void tools_open_host_type_dump(const struct tools_open_host_type* ptr_struct, FILE* fd)
 {
-	tools_open_host_type_print(ptr_struct, fd, 0);
+    tools_open_host_type_print(ptr_struct, fd, 0);
 }
 
-void tools_open_per_host_type_pack(const struct tools_open_per_host_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_per_host_type_pack(const struct tools_open_per_host_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->param_idx);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->function);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->param_idx);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->function);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->host);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
 }
 
-void tools_open_per_host_type_unpack(struct tools_open_per_host_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_per_host_type_unpack(struct tools_open_per_host_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 22;
-	ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 14;
-	ptr_struct->function = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 0;
-	ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 22;
+    ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 14;
+    ptr_struct->function = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->host = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 0;
+    ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_per_host_type_print(const struct tools_open_per_host_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_per_host_type_print(const struct tools_open_per_host_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_per_host_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_per_host_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "function             : " UH_FMT "\n", ptr_struct->function);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "function             : " UH_FMT "\n", ptr_struct->function);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "host                 : " UH_FMT "\n", ptr_struct->host);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
 }
 
 unsigned int tools_open_per_host_type_size(void)
 {
-	return TOOLS_OPEN_PER_HOST_TYPE_SIZE;
+    return TOOLS_OPEN_PER_HOST_TYPE_SIZE;
 }
 
-void tools_open_per_host_type_dump(const struct tools_open_per_host_type *ptr_struct, FILE *fd)
+void tools_open_per_host_type_dump(const struct tools_open_per_host_type* ptr_struct, FILE* fd)
 {
-	tools_open_per_host_type_print(ptr_struct, fd, 0);
+    tools_open_per_host_type_print(ptr_struct, fd, 0);
 }
 
-void tools_open_per_port_type_pack(const struct tools_open_per_port_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_per_port_type_pack(const struct tools_open_per_port_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->param_idx);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->param_idx);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->param_class);
 }
 
-void tools_open_per_port_type_unpack(struct tools_open_per_port_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_per_port_type_unpack(struct tools_open_per_port_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->param_idx = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->param_class = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_per_port_type_print(const struct tools_open_per_port_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_per_port_type_print(const struct tools_open_per_port_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_per_port_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_per_port_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port                 : " UH_FMT "\n", ptr_struct->port);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_idx            : " UH_FMT "\n", ptr_struct->param_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port                 : " UH_FMT "\n", ptr_struct->port);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "param_class          : " UH_FMT "\n", ptr_struct->param_class);
 }
 
 unsigned int tools_open_per_port_type_size(void)
 {
-	return TOOLS_OPEN_PER_PORT_TYPE_SIZE;
+    return TOOLS_OPEN_PER_PORT_TYPE_SIZE;
 }
 
-void tools_open_per_port_type_dump(const struct tools_open_per_port_type *ptr_struct, FILE *fd)
+void tools_open_per_port_type_dump(const struct tools_open_per_port_type* ptr_struct, FILE* fd)
 {
-	tools_open_per_port_type_print(ptr_struct, fd, 0);
+    tools_open_per_port_type_print(ptr_struct, fd, 0);
 }
 
 void tools_open_per_module_type_pack(const struct tools_open_per_module_type* ptr_struct, u_int8_t* ptr_buff)
@@ -372,6245 +372,6385 @@ void tools_open_per_module_type_dump(const struct tools_open_per_module_type* pt
 {
     tools_open_per_module_type_print(ptr_struct, fd, 0);
 }
-void tools_open_tlv_type_dw_pack(const struct tools_open_tlv_type_dw *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_tlv_type_dw_pack(const struct tools_open_tlv_type_dw* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->tlv_type_dw);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->tlv_type_dw);
 }
 
-void tools_open_tlv_type_dw_unpack(struct tools_open_tlv_type_dw *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_tlv_type_dw_unpack(struct tools_open_tlv_type_dw* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->tlv_type_dw = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 0;
+    ptr_struct->tlv_type_dw = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_tlv_type_dw_print(const struct tools_open_tlv_type_dw *ptr_struct, FILE *fd, int indent_level)
+void tools_open_tlv_type_dw_print(const struct tools_open_tlv_type_dw* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_tlv_type_dw ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_tlv_type_dw ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tlv_type_dw          : " U32H_FMT "\n", ptr_struct->tlv_type_dw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tlv_type_dw          : " U32H_FMT "\n", ptr_struct->tlv_type_dw);
 }
 
 unsigned int tools_open_tlv_type_dw_size(void)
 {
-	return TOOLS_OPEN_TLV_TYPE_DW_SIZE;
+    return TOOLS_OPEN_TLV_TYPE_DW_SIZE;
 }
 
-void tools_open_tlv_type_dw_dump(const struct tools_open_tlv_type_dw *ptr_struct, FILE *fd)
+void tools_open_tlv_type_dw_dump(const struct tools_open_tlv_type_dw* ptr_struct, FILE* fd)
 {
-	tools_open_tlv_type_dw_print(ptr_struct, fd, 0);
+    tools_open_tlv_type_dw_print(ptr_struct, fd, 0);
 }
 
-void tools_open_fw_version_pack(const struct tools_open_fw_version *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_fw_version_pack(const struct tools_open_fw_version* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_ver_major);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_ver_subminor);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_ver_minor);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_ver_major);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_ver_subminor);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->fw_ver_minor);
 }
 
-void tools_open_fw_version_unpack(struct tools_open_fw_version *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_fw_version_unpack(struct tools_open_fw_version* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->fw_ver_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 48;
-	ptr_struct->fw_ver_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->fw_ver_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->fw_ver_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 48;
+    ptr_struct->fw_ver_subminor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->fw_ver_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_fw_version_print(const struct tools_open_fw_version *ptr_struct, FILE *fd, int indent_level)
+void tools_open_fw_version_print(const struct tools_open_fw_version* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_fw_version ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_fw_version ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_ver_major         : " UH_FMT "\n", ptr_struct->fw_ver_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_ver_subminor      : " UH_FMT "\n", ptr_struct->fw_ver_subminor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_ver_minor         : " UH_FMT "\n", ptr_struct->fw_ver_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_ver_major         : " UH_FMT "\n", ptr_struct->fw_ver_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_ver_subminor      : " UH_FMT "\n", ptr_struct->fw_ver_subminor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_ver_minor         : " UH_FMT "\n", ptr_struct->fw_ver_minor);
 }
 
 unsigned int tools_open_fw_version_size(void)
 {
-	return TOOLS_OPEN_FW_VERSION_SIZE;
+    return TOOLS_OPEN_FW_VERSION_SIZE;
 }
 
-void tools_open_fw_version_dump(const struct tools_open_fw_version *ptr_struct, FILE *fd)
+void tools_open_fw_version_dump(const struct tools_open_fw_version* ptr_struct, FILE* fd)
 {
-	tools_open_fw_version_print(ptr_struct, fd, 0);
+    tools_open_fw_version_print(ptr_struct, fd, 0);
 }
 
-void tools_open_tlv_type_pack(const union tools_open_tlv_type *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_tlv_type_pack(const union tools_open_tlv_type* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_tlv_type_dw_pack(&(ptr_struct->tlv_type_dw), ptr_buff);
+    tools_open_tlv_type_dw_pack(&(ptr_struct->tlv_type_dw), ptr_buff);
 }
 
-void tools_open_tlv_type_unpack(union tools_open_tlv_type *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_tlv_type_unpack(union tools_open_tlv_type* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_tlv_type_dw_unpack(&(ptr_struct->tlv_type_dw), ptr_buff);
+    tools_open_tlv_type_dw_unpack(&(ptr_struct->tlv_type_dw), ptr_buff);
 }
 
-void tools_open_tlv_type_print(const union tools_open_tlv_type *ptr_struct, FILE *fd, int indent_level)
+void tools_open_tlv_type_print(const union tools_open_tlv_type* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_tlv_type ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_tlv_type ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "global:\n");
-	tools_open_global_type_print(&(ptr_struct->global), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "eswitch:\n");
-	tools_open_eswitch_type_print(&(ptr_struct->eswitch), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "per_host:\n");
-	tools_open_per_host_type_print(&(ptr_struct->per_host), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bmc:\n");
-	tools_open_bmc_type_print(&(ptr_struct->bmc), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "per_port:\n");
-	tools_open_per_port_type_print(&(ptr_struct->per_port), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "global:\n");
+    tools_open_global_type_print(&(ptr_struct->global), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "eswitch:\n");
+    tools_open_eswitch_type_print(&(ptr_struct->eswitch), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "per_host:\n");
+    tools_open_per_host_type_print(&(ptr_struct->per_host), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bmc:\n");
+    tools_open_bmc_type_print(&(ptr_struct->bmc), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "per_port:\n");
+    tools_open_per_port_type_print(&(ptr_struct->per_port), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "per_module:\n");
     tools_open_per_module_type_print(&(ptr_struct->per_module), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "host:\n");
-	tools_open_host_type_print(&(ptr_struct->host), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tlv_type_dw:\n");
-	tools_open_tlv_type_dw_print(&(ptr_struct->tlv_type_dw), fd, indent_level + 1);
+    fprintf(fd, "host:\n");
+    tools_open_host_type_print(&(ptr_struct->host), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tlv_type_dw:\n");
+    tools_open_tlv_type_dw_print(&(ptr_struct->tlv_type_dw), fd, indent_level + 1);
 }
 
 unsigned int tools_open_tlv_type_size(void)
 {
-	return TOOLS_OPEN_TLV_TYPE_SIZE;
+    return TOOLS_OPEN_TLV_TYPE_SIZE;
 }
 
-void tools_open_tlv_type_dump(const union tools_open_tlv_type *ptr_struct, FILE *fd)
+void tools_open_tlv_type_dump(const union tools_open_tlv_type* ptr_struct, FILE* fd)
 {
-	tools_open_tlv_type_print(ptr_struct, fd, 0);
+    tools_open_tlv_type_print(ptr_struct, fd, 0);
 }
 
-void tools_open_ts_entry_pack(const struct tools_open_ts_entry *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_ts_entry_pack(const struct tools_open_ts_entry* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_day);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_month);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->ts_year);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_seconds);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_minutes);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_hour);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_day);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_month);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->ts_year);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_seconds);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_minutes);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->ts_hour);
 }
 
-void tools_open_ts_entry_unpack(struct tools_open_ts_entry *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_ts_entry_unpack(struct tools_open_ts_entry* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->ts_day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->ts_month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->ts_year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 48;
-	ptr_struct->ts_seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 40;
-	ptr_struct->ts_minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->ts_hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->ts_day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->ts_month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->ts_year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 48;
+    ptr_struct->ts_seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 40;
+    ptr_struct->ts_minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->ts_hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_ts_entry_print(const struct tools_open_ts_entry *ptr_struct, FILE *fd, int indent_level)
+void tools_open_ts_entry_print(const struct tools_open_ts_entry* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_ts_entry ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_ts_entry ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_day               : " UH_FMT "\n", ptr_struct->ts_day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_month             : " UH_FMT "\n", ptr_struct->ts_month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_year              : " UH_FMT "\n", ptr_struct->ts_year);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_seconds           : " UH_FMT "\n", ptr_struct->ts_seconds);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_minutes           : " UH_FMT "\n", ptr_struct->ts_minutes);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_hour              : " UH_FMT "\n", ptr_struct->ts_hour);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_day               : " UH_FMT "\n", ptr_struct->ts_day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_month             : " UH_FMT "\n", ptr_struct->ts_month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_year              : " UH_FMT "\n", ptr_struct->ts_year);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_seconds           : " UH_FMT "\n", ptr_struct->ts_seconds);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_minutes           : " UH_FMT "\n", ptr_struct->ts_minutes);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_hour              : " UH_FMT "\n", ptr_struct->ts_hour);
 }
 
 unsigned int tools_open_ts_entry_size(void)
 {
-	return TOOLS_OPEN_TS_ENTRY_SIZE;
-}
-
-void tools_open_ts_entry_dump(const struct tools_open_ts_entry *ptr_struct, FILE *fd)
-{
-	tools_open_ts_entry_print(ptr_struct, fd, 0);
-}
-
-void tools_open_cap_mask_pack(const struct tools_open_cap_mask *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_sm);
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_notice_sup);
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_trap_sup);
-	offset = 27;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_optional_ipd_sup);
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_automatic_migration_sup);
-	offset = 25;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_sl_mapping_sup);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_mkey_nvram);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_pkey_nvram);
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_led_info_sup);
-	offset = 21;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_sm_disabled);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_system_image_guid_sup);
-	offset = 19;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_pkey_switch_external_port_trap_sup);
-	offset = 17;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_extended_speed_sup);
-	offset = 15;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_communication_management_sup);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_snmp_tunneling_sup);
-	offset = 13;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_reinit_sup);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_device_management_sup);
-	offset = 11;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_vendor_class_sup);
-	offset = 10;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_dr_notice_sup);
-	offset = 9;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_capability_mask_notice_sup);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_boot_management_sup);
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_link_round_trip_latency_sup);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_client_reregistration_sup);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_other_local_changes_notice_supported);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_link_speed_width_pairs_table_supported);
-}
-
-void tools_open_cap_mask_unpack(struct tools_open_cap_mask *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 30;
-	ptr_struct->is_sm = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 29;
-	ptr_struct->is_notice_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 28;
-	ptr_struct->is_trap_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 27;
-	ptr_struct->is_optional_ipd_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 26;
-	ptr_struct->is_automatic_migration_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 25;
-	ptr_struct->is_sl_mapping_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 24;
-	ptr_struct->is_mkey_nvram = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 23;
-	ptr_struct->is_pkey_nvram = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 22;
-	ptr_struct->is_led_info_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 21;
-	ptr_struct->is_sm_disabled = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 20;
-	ptr_struct->is_system_image_guid_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 19;
-	ptr_struct->is_pkey_switch_external_port_trap_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 17;
-	ptr_struct->is_extended_speed_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 15;
-	ptr_struct->is_communication_management_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 14;
-	ptr_struct->is_snmp_tunneling_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 13;
-	ptr_struct->is_reinit_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 12;
-	ptr_struct->is_device_management_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 11;
-	ptr_struct->is_vendor_class_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 10;
-	ptr_struct->is_dr_notice_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 9;
-	ptr_struct->is_capability_mask_notice_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 8;
-	ptr_struct->is_boot_management_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 7;
-	ptr_struct->is_link_round_trip_latency_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->is_client_reregistration_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->is_other_local_changes_notice_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->is_link_speed_width_pairs_table_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void tools_open_cap_mask_print(const struct tools_open_cap_mask *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_cap_mask ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_sm                : " UH_FMT "\n", ptr_struct->is_sm);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_notice_sup        : " UH_FMT "\n", ptr_struct->is_notice_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_trap_sup          : " UH_FMT "\n", ptr_struct->is_trap_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_optional_ipd_sup  : " UH_FMT "\n", ptr_struct->is_optional_ipd_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_automatic_migration_sup : " UH_FMT "\n", ptr_struct->is_automatic_migration_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_sl_mapping_sup    : " UH_FMT "\n", ptr_struct->is_sl_mapping_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_mkey_nvram        : " UH_FMT "\n", ptr_struct->is_mkey_nvram);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_pkey_nvram        : " UH_FMT "\n", ptr_struct->is_pkey_nvram);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_led_info_sup      : " UH_FMT "\n", ptr_struct->is_led_info_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_sm_disabled       : " UH_FMT "\n", ptr_struct->is_sm_disabled);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_system_image_guid_sup : " UH_FMT "\n", ptr_struct->is_system_image_guid_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_pkey_switch_external_port_trap_sup : " UH_FMT "\n", ptr_struct->is_pkey_switch_external_port_trap_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_extended_speed_sup : " UH_FMT "\n", ptr_struct->is_extended_speed_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_communication_management_sup : " UH_FMT "\n", ptr_struct->is_communication_management_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_snmp_tunneling_sup : " UH_FMT "\n", ptr_struct->is_snmp_tunneling_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_reinit_sup        : " UH_FMT "\n", ptr_struct->is_reinit_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_device_management_sup : " UH_FMT "\n", ptr_struct->is_device_management_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_vendor_class_sup  : " UH_FMT "\n", ptr_struct->is_vendor_class_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_dr_notice_sup     : " UH_FMT "\n", ptr_struct->is_dr_notice_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_capability_mask_notice_sup : " UH_FMT "\n", ptr_struct->is_capability_mask_notice_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_boot_management_sup : " UH_FMT "\n", ptr_struct->is_boot_management_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_link_round_trip_latency_sup : " UH_FMT "\n", ptr_struct->is_link_round_trip_latency_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_client_reregistration_sup : " UH_FMT "\n", ptr_struct->is_client_reregistration_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_other_local_changes_notice_supported : " UH_FMT "\n", ptr_struct->is_other_local_changes_notice_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "is_link_speed_width_pairs_table_supported : " UH_FMT "\n", ptr_struct->is_link_speed_width_pairs_table_supported);
-}
-
-unsigned int tools_open_cap_mask_size(void)
-{
-	return TOOLS_OPEN_CAP_MASK_SIZE;
-}
-
-void tools_open_cap_mask_dump(const struct tools_open_cap_mask *ptr_struct, FILE *fd)
-{
-	tools_open_cap_mask_print(ptr_struct, fd, 0);
-}
-
-void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsPrivateLinearForwardingSupported);
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsAdaptiveRoutingSupported);
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsAdaptiveRoutingRev1Supported);
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsRemotePortMirroringSupported);
-	offset = 27;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsTemperatureSensingSupported);
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsConfigSpaceAccessSupported);
-	offset = 25;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsCableInfoSupported);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsSMPEyeOpenSupported);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsLossyVLConfigSupported);
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsExtendedPortInfoSupported);
-	offset = 21;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsAccessRegisterSupported);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsInterProcessCommunicationSupported);
-	offset = 19;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsPortSLToPrivateLFTMapSupported);
-	offset = 18;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsExtendedSwitchInfoSupported);
-	offset = 17;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsASlaveVirtualSwitch);
-}
-
-void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 31;
-	ptr_struct->IsPrivateLinearForwardingSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 30;
-	ptr_struct->IsAdaptiveRoutingSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 29;
-	ptr_struct->IsAdaptiveRoutingRev1Supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 28;
-	ptr_struct->IsRemotePortMirroringSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 27;
-	ptr_struct->IsTemperatureSensingSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 26;
-	ptr_struct->IsConfigSpaceAccessSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 25;
-	ptr_struct->IsCableInfoSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 24;
-	ptr_struct->IsSMPEyeOpenSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 23;
-	ptr_struct->IsLossyVLConfigSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 22;
-	ptr_struct->IsExtendedPortInfoSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 21;
-	ptr_struct->IsAccessRegisterSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 20;
-	ptr_struct->IsInterProcessCommunicationSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 19;
-	ptr_struct->IsPortSLToPrivateLFTMapSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 18;
-	ptr_struct->IsExtendedSwitchInfoSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 17;
-	ptr_struct->IsASlaveVirtualSwitch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_capability_mask_smp ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsPrivateLinearForwardingSupported : " UH_FMT "\n", ptr_struct->IsPrivateLinearForwardingSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsAdaptiveRoutingSupported : " UH_FMT "\n", ptr_struct->IsAdaptiveRoutingSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsAdaptiveRoutingRev1Supported : " UH_FMT "\n", ptr_struct->IsAdaptiveRoutingRev1Supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsRemotePortMirroringSupported : " UH_FMT "\n", ptr_struct->IsRemotePortMirroringSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsTemperatureSensingSupported : " UH_FMT "\n", ptr_struct->IsTemperatureSensingSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsConfigSpaceAccessSupported : " UH_FMT "\n", ptr_struct->IsConfigSpaceAccessSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsCableInfoSupported : " UH_FMT "\n", ptr_struct->IsCableInfoSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsSMPEyeOpenSupported : " UH_FMT "\n", ptr_struct->IsSMPEyeOpenSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsLossyVLConfigSupported : " UH_FMT "\n", ptr_struct->IsLossyVLConfigSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsExtendedPortInfoSupported : " UH_FMT "\n", ptr_struct->IsExtendedPortInfoSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsAccessRegisterSupported : " UH_FMT "\n", ptr_struct->IsAccessRegisterSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsInterProcessCommunicationSupported : " UH_FMT "\n", ptr_struct->IsInterProcessCommunicationSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsPortSLToPrivateLFTMapSupported : " UH_FMT "\n", ptr_struct->IsPortSLToPrivateLFTMapSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsExtendedSwitchInfoSupported : " UH_FMT "\n", ptr_struct->IsExtendedSwitchInfoSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IsASlaveVirtualSwitch : " UH_FMT "\n", ptr_struct->IsASlaveVirtualSwitch);
-}
-
-unsigned int tools_open_capability_mask_smp_size(void)
-{
-	return TOOLS_OPEN_CAPABILITY_MASK_SMP_SIZE;
-}
-
-void tools_open_capability_mask_smp_dump(const struct tools_open_capability_mask_smp *ptr_struct, FILE *fd)
-{
-	tools_open_capability_mask_smp_print(ptr_struct, fd, 0);
-}
-
-void tools_open_fw_info_pack(const struct tools_open_fw_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->sub_minor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_fw);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dev_fw);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->build_id);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->year);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->day);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->month);
-	offset = 112;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hour);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 256;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_version);
-	offset = 288;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_major);
-	offset = 320;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_minor);
-	offset = 352;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_sub_minor);
-	offset = 400;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->isfu_major);
-}
-
-void tools_open_fw_info_unpack(struct tools_open_fw_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 24;
-	ptr_struct->sub_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 7;
-	ptr_struct->secure_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->debug_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->dev_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->build_id = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 72;
-	ptr_struct->day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 112;
-	ptr_struct->hour = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
-		ptr_struct->psid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-	offset = 256;
-	ptr_struct->ini_file_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 288;
-	ptr_struct->extended_major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 320;
-	ptr_struct->extended_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 352;
-	ptr_struct->extended_sub_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 400;
-	ptr_struct->isfu_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void tools_open_fw_info_print(const struct tools_open_fw_info *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_fw_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sub_minor            : " UH_FMT "\n", ptr_struct->sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "secure_fw            : " UH_FMT "\n", ptr_struct->secure_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "debug_fw             : " UH_FMT "\n", ptr_struct->debug_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dev_fw               : " UH_FMT "\n", ptr_struct->dev_fw);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "build_id             : " U32H_FMT "\n", ptr_struct->build_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "year                 : " UH_FMT "\n", ptr_struct->year);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "day                  : " UH_FMT "\n", ptr_struct->day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "month                : " UH_FMT "\n", ptr_struct->month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hour                 : " UH_FMT "\n", ptr_struct->hour);
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "psid_%03d            : " UH_FMT "\n", i, ptr_struct->psid[i]);
-	}
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ini_file_version     : " U32H_FMT "\n", ptr_struct->ini_file_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_major       : " U32H_FMT "\n", ptr_struct->extended_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_minor       : " U32H_FMT "\n", ptr_struct->extended_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_sub_minor   : " U32H_FMT "\n", ptr_struct->extended_sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "isfu_major           : " UH_FMT "\n", ptr_struct->isfu_major);
-}
-
-unsigned int tools_open_fw_info_size(void)
-{
-	return TOOLS_OPEN_FW_INFO_SIZE;
+    return TOOLS_OPEN_TS_ENTRY_SIZE;
 }
 
-void tools_open_fw_info_dump(const struct tools_open_fw_info *ptr_struct, FILE *fd)
+void tools_open_ts_entry_dump(const struct tools_open_ts_entry* ptr_struct, FILE* fd)
 {
-	tools_open_fw_info_print(ptr_struct, fd, 0);
+    tools_open_ts_entry_print(ptr_struct, fd, 0);
 }
 
-void tools_open_hw_info_pack(const struct tools_open_hw_info *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_cap_mask_pack(const struct tools_open_cap_mask* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_id);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_hw_revision);
-	offset = 59;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->pvs);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->manufacturing_base_mac_47_32);
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->manufacturing_base_mac_31_0);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uptime);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_sm);
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_notice_sup);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_trap_sup);
+    offset = 27;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_optional_ipd_sup);
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_automatic_migration_sup);
+    offset = 25;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_sl_mapping_sup);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_mkey_nvram);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_pkey_nvram);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_led_info_sup);
+    offset = 21;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_sm_disabled);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_system_image_guid_sup);
+    offset = 19;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_pkey_switch_external_port_trap_sup);
+    offset = 17;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_extended_speed_sup);
+    offset = 15;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_communication_management_sup);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_snmp_tunneling_sup);
+    offset = 13;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_reinit_sup);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_device_management_sup);
+    offset = 11;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_vendor_class_sup);
+    offset = 10;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_dr_notice_sup);
+    offset = 9;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_capability_mask_notice_sup);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_boot_management_sup);
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_link_round_trip_latency_sup);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_client_reregistration_sup);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_other_local_changes_notice_supported);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->is_link_speed_width_pairs_table_supported);
 }
 
-void tools_open_hw_info_unpack(struct tools_open_hw_info *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_cap_mask_unpack(struct tools_open_cap_mask* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->device_hw_revision = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 59;
-	ptr_struct->pvs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 80;
-	ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 144;
-	ptr_struct->manufacturing_base_mac_47_32 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 160;
-	ptr_struct->manufacturing_base_mac_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 224;
-	ptr_struct->uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 30;
+    ptr_struct->is_sm = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 29;
+    ptr_struct->is_notice_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 28;
+    ptr_struct->is_trap_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 27;
+    ptr_struct->is_optional_ipd_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 26;
+    ptr_struct->is_automatic_migration_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 25;
+    ptr_struct->is_sl_mapping_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 24;
+    ptr_struct->is_mkey_nvram = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 23;
+    ptr_struct->is_pkey_nvram = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 22;
+    ptr_struct->is_led_info_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 21;
+    ptr_struct->is_sm_disabled = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 20;
+    ptr_struct->is_system_image_guid_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 19;
+    ptr_struct->is_pkey_switch_external_port_trap_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 17;
+    ptr_struct->is_extended_speed_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 15;
+    ptr_struct->is_communication_management_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 14;
+    ptr_struct->is_snmp_tunneling_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 13;
+    ptr_struct->is_reinit_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 12;
+    ptr_struct->is_device_management_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 11;
+    ptr_struct->is_vendor_class_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 10;
+    ptr_struct->is_dr_notice_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 9;
+    ptr_struct->is_capability_mask_notice_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 8;
+    ptr_struct->is_boot_management_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 7;
+    ptr_struct->is_link_round_trip_latency_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->is_client_reregistration_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->is_other_local_changes_notice_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->is_link_speed_width_pairs_table_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_hw_info_print(const struct tools_open_hw_info *ptr_struct, FILE *fd, int indent_level)
+void tools_open_cap_mask_print(const struct tools_open_cap_mask* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_hw_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_cap_mask ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_id            : " UH_FMT "\n", ptr_struct->device_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_hw_revision   : " UH_FMT "\n", ptr_struct->device_hw_revision);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pvs                  : " UH_FMT "\n", ptr_struct->pvs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_dev_id            : " UH_FMT "\n", ptr_struct->hw_dev_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "manufacturing_base_mac_47_32 : " UH_FMT "\n", ptr_struct->manufacturing_base_mac_47_32);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "manufacturing_base_mac_31_0 : " U32H_FMT "\n", ptr_struct->manufacturing_base_mac_31_0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uptime               : " U32H_FMT "\n", ptr_struct->uptime);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_sm                : " UH_FMT "\n", ptr_struct->is_sm);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_notice_sup        : " UH_FMT "\n", ptr_struct->is_notice_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_trap_sup          : " UH_FMT "\n", ptr_struct->is_trap_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_optional_ipd_sup  : " UH_FMT "\n", ptr_struct->is_optional_ipd_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_automatic_migration_sup : " UH_FMT "\n", ptr_struct->is_automatic_migration_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_sl_mapping_sup    : " UH_FMT "\n", ptr_struct->is_sl_mapping_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_mkey_nvram        : " UH_FMT "\n", ptr_struct->is_mkey_nvram);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_pkey_nvram        : " UH_FMT "\n", ptr_struct->is_pkey_nvram);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_led_info_sup      : " UH_FMT "\n", ptr_struct->is_led_info_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_sm_disabled       : " UH_FMT "\n", ptr_struct->is_sm_disabled);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_system_image_guid_sup : " UH_FMT "\n", ptr_struct->is_system_image_guid_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_pkey_switch_external_port_trap_sup : " UH_FMT "\n",
+            ptr_struct->is_pkey_switch_external_port_trap_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_extended_speed_sup : " UH_FMT "\n", ptr_struct->is_extended_speed_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_communication_management_sup : " UH_FMT "\n", ptr_struct->is_communication_management_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_snmp_tunneling_sup : " UH_FMT "\n", ptr_struct->is_snmp_tunneling_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_reinit_sup        : " UH_FMT "\n", ptr_struct->is_reinit_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_device_management_sup : " UH_FMT "\n", ptr_struct->is_device_management_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_vendor_class_sup  : " UH_FMT "\n", ptr_struct->is_vendor_class_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_dr_notice_sup     : " UH_FMT "\n", ptr_struct->is_dr_notice_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_capability_mask_notice_sup : " UH_FMT "\n", ptr_struct->is_capability_mask_notice_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_boot_management_sup : " UH_FMT "\n", ptr_struct->is_boot_management_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_link_round_trip_latency_sup : " UH_FMT "\n", ptr_struct->is_link_round_trip_latency_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_client_reregistration_sup : " UH_FMT "\n", ptr_struct->is_client_reregistration_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_other_local_changes_notice_supported : " UH_FMT "\n",
+            ptr_struct->is_other_local_changes_notice_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "is_link_speed_width_pairs_table_supported : " UH_FMT "\n",
+            ptr_struct->is_link_speed_width_pairs_table_supported);
 }
 
-unsigned int tools_open_hw_info_size(void)
+unsigned int tools_open_cap_mask_size(void)
 {
-	return TOOLS_OPEN_HW_INFO_SIZE;
+    return TOOLS_OPEN_CAP_MASK_SIZE;
 }
 
-void tools_open_hw_info_dump(const struct tools_open_hw_info *ptr_struct, FILE *fd)
+void tools_open_cap_mask_dump(const struct tools_open_cap_mask* ptr_struct, FILE* fd)
 {
-	tools_open_hw_info_print(ptr_struct, fd, 0);
+    tools_open_cap_mask_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nv_hdr_pack(const struct tools_open_nv_hdr *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->type);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->length);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type_mod);
-	offset = 39;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->shadow);
-	offset = 37;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pad_cnt);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsPrivateLinearForwardingSupported);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsAdaptiveRoutingSupported);
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsAdaptiveRoutingRev1Supported);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsRemotePortMirroringSupported);
+    offset = 27;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsTemperatureSensingSupported);
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsConfigSpaceAccessSupported);
+    offset = 25;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsCableInfoSupported);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsSMPEyeOpenSupported);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsLossyVLConfigSupported);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsExtendedPortInfoSupported);
+    offset = 21;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsAccessRegisterSupported);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsInterProcessCommunicationSupported);
+    offset = 19;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsPortSLToPrivateLFTMapSupported);
+    offset = 18;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsExtendedSwitchInfoSupported);
+    offset = 17;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->IsASlaveVirtualSwitch);
 }
 
-void tools_open_nv_hdr_unpack(struct tools_open_nv_hdr *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->type = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 2;
-	ptr_struct->length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 40;
-	ptr_struct->type_mod = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 39;
-	ptr_struct->shadow = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 37;
-	ptr_struct->pad_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 32;
-	ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 31;
+    ptr_struct->IsPrivateLinearForwardingSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->IsAdaptiveRoutingSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 29;
+    ptr_struct->IsAdaptiveRoutingRev1Supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 28;
+    ptr_struct->IsRemotePortMirroringSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 27;
+    ptr_struct->IsTemperatureSensingSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 26;
+    ptr_struct->IsConfigSpaceAccessSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 25;
+    ptr_struct->IsCableInfoSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 24;
+    ptr_struct->IsSMPEyeOpenSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 23;
+    ptr_struct->IsLossyVLConfigSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 22;
+    ptr_struct->IsExtendedPortInfoSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 21;
+    ptr_struct->IsAccessRegisterSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 20;
+    ptr_struct->IsInterProcessCommunicationSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 19;
+    ptr_struct->IsPortSLToPrivateLFTMapSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 18;
+    ptr_struct->IsExtendedSwitchInfoSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 17;
+    ptr_struct->IsASlaveVirtualSwitch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_nv_hdr_print(const struct tools_open_nv_hdr *ptr_struct, FILE *fd, int indent_level)
+void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nv_hdr ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "length               : " UH_FMT "\n", ptr_struct->length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type_mod             : " UH_FMT "\n", ptr_struct->type_mod);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "shadow               : " UH_FMT "\n", ptr_struct->shadow);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pad_cnt              : " UH_FMT "\n", ptr_struct->pad_cnt);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_capability_mask_smp ========\n");
 
-unsigned int tools_open_nv_hdr_size(void)
-{
-	return TOOLS_OPEN_NV_HDR_SIZE;
-}
-
-void tools_open_nv_hdr_dump(const struct tools_open_nv_hdr *ptr_struct, FILE *fd)
-{
-	tools_open_nv_hdr_print(ptr_struct, fd, 0);
-}
-
-void tools_open_nv_hdr_fifth_gen_pack(const struct tools_open_nv_hdr_fifth_gen *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->length);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->writer_host_id);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
-	offset = 11;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->writer_id);
-	offset = 9;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->read_current);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_);
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rd_en);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->over_en);
-	offset = 32;
-	tools_open_tlv_type_pack(&(ptr_struct->type), ptr_buff + offset / 8);
-}
-
-void tools_open_nv_hdr_fifth_gen_unpack(struct tools_open_nv_hdr_fifth_gen *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 23;
-	ptr_struct->length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
-	offset = 20;
-	ptr_struct->writer_host_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 16;
-	ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 11;
-	ptr_struct->writer_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 9;
-	ptr_struct->read_current = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 8;
-	ptr_struct->default_ = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 7;
-	ptr_struct->rd_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->over_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	tools_open_tlv_type_unpack(&(ptr_struct->type), ptr_buff + offset / 8);
-}
-
-void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nv_hdr_fifth_gen ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "length               : " UH_FMT "\n", ptr_struct->length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "writer_host_id       : " UH_FMT "\n", ptr_struct->writer_host_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "writer_id            : %s (" UH_FMT ")\n", (ptr_struct->writer_id == 0 ? ("NV_WRITER_ID_UNSPECIFIED") : ((ptr_struct->writer_id == 1 ? ("NV_WRITER_ID_CHASSIS_BMC") : ((ptr_struct->writer_id == 2 ? ("NV_WRITER_ID_MAD") : ((ptr_struct->writer_id == 3 ? ("NV_WRITER_ID_BMC") : ((ptr_struct->writer_id == 4 ? ("NV_WRITER_ID_CMD_IF") : ((ptr_struct->writer_id == 5 ? ("NV_WRITER_ID_ICMD") : ((ptr_struct->writer_id == 6 ? ("NV_WRITER_ID_ICMD_UEFI_HII") : ((ptr_struct->writer_id == 7 ? ("NV_WRITER_ID_ICMD_UEFI_CLP") : ((ptr_struct->writer_id == 8 ? ("NV_WRITER_ID_ICMD_FLEXBOOT") : ((ptr_struct->writer_id == 9 ? ("NV_WRITER_ID_ICMD_MLXCONFIG") : ((ptr_struct->writer_id == 10 ? ("NV_WRITER_ID_ICMD_USER1") : ((ptr_struct->writer_id == 11 ? ("NV_WRITER_ID_ICMD_USER2") : ((ptr_struct->writer_id == 31 ? ("NV_WRITER_ID_OTHER") : ("unknown")))))))))))))))))))))))))), ptr_struct->writer_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_current         : " UH_FMT "\n", ptr_struct->read_current);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_             : " UH_FMT "\n", ptr_struct->default_);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rd_en                : " UH_FMT "\n", ptr_struct->rd_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "over_en              : " UH_FMT "\n", ptr_struct->over_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type:\n");
-	tools_open_tlv_type_print(&(ptr_struct->type), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsPrivateLinearForwardingSupported : " UH_FMT "\n", ptr_struct->IsPrivateLinearForwardingSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsAdaptiveRoutingSupported : " UH_FMT "\n", ptr_struct->IsAdaptiveRoutingSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsAdaptiveRoutingRev1Supported : " UH_FMT "\n", ptr_struct->IsAdaptiveRoutingRev1Supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsRemotePortMirroringSupported : " UH_FMT "\n", ptr_struct->IsRemotePortMirroringSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsTemperatureSensingSupported : " UH_FMT "\n", ptr_struct->IsTemperatureSensingSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsConfigSpaceAccessSupported : " UH_FMT "\n", ptr_struct->IsConfigSpaceAccessSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsCableInfoSupported : " UH_FMT "\n", ptr_struct->IsCableInfoSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsSMPEyeOpenSupported : " UH_FMT "\n", ptr_struct->IsSMPEyeOpenSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsLossyVLConfigSupported : " UH_FMT "\n", ptr_struct->IsLossyVLConfigSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsExtendedPortInfoSupported : " UH_FMT "\n", ptr_struct->IsExtendedPortInfoSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsAccessRegisterSupported : " UH_FMT "\n", ptr_struct->IsAccessRegisterSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsInterProcessCommunicationSupported : " UH_FMT "\n",
+            ptr_struct->IsInterProcessCommunicationSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsPortSLToPrivateLFTMapSupported : " UH_FMT "\n", ptr_struct->IsPortSLToPrivateLFTMapSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsExtendedSwitchInfoSupported : " UH_FMT "\n", ptr_struct->IsExtendedSwitchInfoSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IsASlaveVirtualSwitch : " UH_FMT "\n", ptr_struct->IsASlaveVirtualSwitch);
 }
 
-unsigned int tools_open_nv_hdr_fifth_gen_size(void)
+unsigned int tools_open_capability_mask_smp_size(void)
 {
-	return TOOLS_OPEN_NV_HDR_FIFTH_GEN_SIZE;
+    return TOOLS_OPEN_CAPABILITY_MASK_SMP_SIZE;
 }
 
-void tools_open_nv_hdr_fifth_gen_dump(const struct tools_open_nv_hdr_fifth_gen *ptr_struct, FILE *fd)
+void tools_open_capability_mask_smp_dump(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd)
 {
-	tools_open_nv_hdr_fifth_gen_print(ptr_struct, fd, 0);
+    tools_open_capability_mask_smp_print(ptr_struct, fd, 0);
 }
 
-void tools_open_pmdio_addr_data_pack(const struct tools_open_pmdio_addr_data *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_fw_info_pack(const struct tools_open_fw_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->data);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->addr);
-}
+    u_int32_t offset;
+    int i;
 
-void tools_open_pmdio_addr_data_unpack(struct tools_open_pmdio_addr_data *ptr_struct, const u_int8_t *ptr_buff)
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->sub_minor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->secure_fw);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->signed_fw);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->debug_fw);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dev_fw);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->build_id);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->year);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->day);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->month);
+    offset = 112;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hour);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 256;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ini_file_version);
+    offset = 288;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_major);
+    offset = 320;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_minor);
+    offset = 352;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->extended_sub_minor);
+    offset = 400;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->isfu_major);
+}
+
+void tools_open_fw_info_unpack(struct tools_open_fw_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->data = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->addr = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
+    u_int32_t offset;
+    int i;
 
-void tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_pmdio_addr_data ========\n");
+    offset = 24;
+    ptr_struct->sub_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 7;
+    ptr_struct->secure_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->signed_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->debug_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->dev_fw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->build_id = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 72;
+    ptr_struct->day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 112;
+    ptr_struct->hour = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(152, 8, i, 512, 1);
+        ptr_struct->psid[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    offset = 256;
+    ptr_struct->ini_file_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 288;
+    ptr_struct->extended_major = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 320;
+    ptr_struct->extended_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 352;
+    ptr_struct->extended_sub_minor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 400;
+    ptr_struct->isfu_major = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void tools_open_fw_info_print(const struct tools_open_fw_info* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data                 : " UH_FMT "\n", ptr_struct->data);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "addr                 : " UH_FMT "\n", ptr_struct->addr);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_fw_info ========\n");
 
-unsigned int tools_open_pmdio_addr_data_size(void)
-{
-	return TOOLS_OPEN_PMDIO_ADDR_DATA_SIZE;
-}
-
-void tools_open_pmdio_addr_data_dump(const struct tools_open_pmdio_addr_data *ptr_struct, FILE *fd)
-{
-	tools_open_pmdio_addr_data_print(ptr_struct, fd, 0);
-}
-
-void tools_open_sw_info_pack(const struct tools_open_sw_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->subminor);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
-	offset = 60;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_type);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_arch);
-	offset = 52;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_type);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_arch);
-	offset = 44;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_type);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_arch);
-	offset = 36;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_type);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_arch);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_version);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_version);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_version);
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_version);
-}
-
-void tools_open_sw_info_unpack(struct tools_open_sw_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->subminor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 60;
-	ptr_struct->rom3_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 56;
-	ptr_struct->rom3_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 52;
-	ptr_struct->rom2_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 48;
-	ptr_struct->rom2_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 44;
-	ptr_struct->rom1_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 40;
-	ptr_struct->rom1_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 36;
-	ptr_struct->rom0_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->rom0_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->rom0_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->rom1_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->rom2_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 160;
-	ptr_struct->rom3_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_sw_info_print(const struct tools_open_sw_info *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_sw_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "subminor             : " UH_FMT "\n", ptr_struct->subminor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom3_type            : " UH_FMT "\n", ptr_struct->rom3_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom3_arch            : " UH_FMT "\n", ptr_struct->rom3_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom2_type            : " UH_FMT "\n", ptr_struct->rom2_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom2_arch            : " UH_FMT "\n", ptr_struct->rom2_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom1_type            : " UH_FMT "\n", ptr_struct->rom1_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom1_arch            : " UH_FMT "\n", ptr_struct->rom1_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom0_type            : " UH_FMT "\n", ptr_struct->rom0_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom0_arch            : " UH_FMT "\n", ptr_struct->rom0_arch);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom0_version         : " U32H_FMT "\n", ptr_struct->rom0_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom1_version         : " U32H_FMT "\n", ptr_struct->rom1_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom2_version         : " U32H_FMT "\n", ptr_struct->rom2_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rom3_version         : " U32H_FMT "\n", ptr_struct->rom3_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sub_minor            : " UH_FMT "\n", ptr_struct->sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "secure_fw            : " UH_FMT "\n", ptr_struct->secure_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signed_fw            : " UH_FMT "\n", ptr_struct->signed_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "debug_fw             : " UH_FMT "\n", ptr_struct->debug_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dev_fw               : " UH_FMT "\n", ptr_struct->dev_fw);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "build_id             : " U32H_FMT "\n", ptr_struct->build_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "year                 : " UH_FMT "\n", ptr_struct->year);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "day                  : " UH_FMT "\n", ptr_struct->day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "month                : " UH_FMT "\n", ptr_struct->month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hour                 : " UH_FMT "\n", ptr_struct->hour);
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "psid_%03d            : " UH_FMT "\n", i, ptr_struct->psid[i]);
+    }
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ini_file_version     : " U32H_FMT "\n", ptr_struct->ini_file_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_major       : " U32H_FMT "\n", ptr_struct->extended_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_minor       : " U32H_FMT "\n", ptr_struct->extended_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_sub_minor   : " U32H_FMT "\n", ptr_struct->extended_sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "isfu_major           : " UH_FMT "\n", ptr_struct->isfu_major);
 }
 
-unsigned int tools_open_sw_info_size(void)
+unsigned int tools_open_fw_info_size(void)
 {
-	return TOOLS_OPEN_SW_INFO_SIZE;
+    return TOOLS_OPEN_FW_INFO_SIZE;
 }
 
-void tools_open_sw_info_dump(const struct tools_open_sw_info *ptr_struct, FILE *fd)
+void tools_open_fw_info_dump(const struct tools_open_fw_info* ptr_struct, FILE* fd)
 {
-	tools_open_sw_info_print(ptr_struct, fd, 0);
+    tools_open_fw_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_timestamp_pack(const struct tools_open_timestamp *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_hw_info_pack(const struct tools_open_hw_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_fw_version_pack(&(ptr_struct->fw_version), ptr_buff + offset / 8);
-	offset = 64;
-	tools_open_ts_entry_pack(&(ptr_struct->ts_entry), ptr_buff + offset / 8);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_id);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_hw_revision);
+    offset = 59;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->pvs);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->manufacturing_base_mac_47_32);
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->manufacturing_base_mac_31_0);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uptime);
 }
 
-void tools_open_timestamp_unpack(struct tools_open_timestamp *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_hw_info_unpack(struct tools_open_hw_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_fw_version_unpack(&(ptr_struct->fw_version), ptr_buff + offset / 8);
-	offset = 64;
-	tools_open_ts_entry_unpack(&(ptr_struct->ts_entry), ptr_buff + offset / 8);
+    offset = 16;
+    ptr_struct->device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->device_hw_revision = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 59;
+    ptr_struct->pvs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 80;
+    ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 144;
+    ptr_struct->manufacturing_base_mac_47_32 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 160;
+    ptr_struct->manufacturing_base_mac_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 224;
+    ptr_struct->uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_timestamp_print(const struct tools_open_timestamp *ptr_struct, FILE *fd, int indent_level)
+void tools_open_hw_info_print(const struct tools_open_hw_info* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_timestamp ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_hw_info ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_version:\n");
-	tools_open_fw_version_print(&(ptr_struct->fw_version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ts_entry:\n");
-	tools_open_ts_entry_print(&(ptr_struct->ts_entry), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_id            : " UH_FMT "\n", ptr_struct->device_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_hw_revision   : " UH_FMT "\n", ptr_struct->device_hw_revision);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pvs                  : " UH_FMT "\n", ptr_struct->pvs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_dev_id            : " UH_FMT "\n", ptr_struct->hw_dev_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "manufacturing_base_mac_47_32 : " UH_FMT "\n", ptr_struct->manufacturing_base_mac_47_32);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "manufacturing_base_mac_31_0 : " U32H_FMT "\n", ptr_struct->manufacturing_base_mac_31_0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uptime               : " U32H_FMT "\n", ptr_struct->uptime);
 }
 
-unsigned int tools_open_timestamp_size(void)
+unsigned int tools_open_hw_info_size(void)
 {
-	return TOOLS_OPEN_TIMESTAMP_SIZE;
+    return TOOLS_OPEN_HW_INFO_SIZE;
 }
 
-void tools_open_timestamp_dump(const struct tools_open_timestamp *ptr_struct, FILE *fd)
+void tools_open_hw_info_dump(const struct tools_open_hw_info* ptr_struct, FILE* fd)
 {
-	tools_open_timestamp_print(ptr_struct, fd, 0);
+    tools_open_hw_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_nv_hdr_pack(const struct tools_open_nv_hdr* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->type);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->length);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type_mod);
+    offset = 39;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->shadow);
+    offset = 37;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pad_cnt);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
 }
 
-void tools_open_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_nv_hdr_unpack(struct tools_open_nv_hdr* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	*ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->type = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 2;
+    ptr_struct->length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 40;
+    ptr_struct->type_mod = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 39;
+    ptr_struct->shadow = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 37;
+    ptr_struct->pad_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 32;
+    ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level)
+void tools_open_nv_hdr_print(const struct tools_open_nv_hdr* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_uint64 ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t) *ptr_struct);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nv_hdr ========\n");
 
-unsigned int tools_open_uint64_size(void)
-{
-	return TOOLS_OPEN_UINT64_SIZE;
-}
-
-void tools_open_uint64_dump(const u_int64_t *ptr_struct, FILE *fd)
-{
-	tools_open_uint64_print(ptr_struct, fd, 0);
-}
-
-void tools_open_aux_tlv_header_pack(const struct tools_open_aux_tlv_header *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->header_type);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->length);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved0);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved1);
-}
-
-void tools_open_aux_tlv_header_unpack(struct tools_open_aux_tlv_header *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->header_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->length = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 96;
-	ptr_struct->reserved0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->reserved1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_aux_tlv_header_print(const struct tools_open_aux_tlv_header *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_aux_tlv_header ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "header_type          : " UH_FMT "\n", ptr_struct->header_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "length               : " U32H_FMT "\n", ptr_struct->length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved0            : " U32H_FMT "\n", ptr_struct->reserved0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved1            : " U32H_FMT "\n", ptr_struct->reserved1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "length               : " UH_FMT "\n", ptr_struct->length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type_mod             : " UH_FMT "\n", ptr_struct->type_mod);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "shadow               : " UH_FMT "\n", ptr_struct->shadow);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pad_cnt              : " UH_FMT "\n", ptr_struct->pad_cnt);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
 }
 
-unsigned int tools_open_aux_tlv_header_size(void)
+unsigned int tools_open_nv_hdr_size(void)
 {
-	return TOOLS_OPEN_AUX_TLV_HEADER_SIZE;
+    return TOOLS_OPEN_NV_HDR_SIZE;
 }
 
-void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header *ptr_struct, FILE *fd)
+void tools_open_nv_hdr_dump(const struct tools_open_nv_hdr* ptr_struct, FILE* fd)
 {
-	tools_open_aux_tlv_header_print(ptr_struct, fd, 0);
+    tools_open_nv_hdr_print(ptr_struct, fd, 0);
 }
 
-void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_nv_hdr_fifth_gen_pack(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->StateChangeEnable);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->LinkSpeedSupported);
-	offset = 88;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->LinkSpeedEnabled);
-	offset = 120;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->LinkSpeedActive);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->CapMask);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ActiveCell);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 9, (u_int32_t)ptr_struct->length);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->writer_host_id);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
+    offset = 11;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->writer_id);
+    offset = 9;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->read_current);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_);
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->rd_en);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->over_en);
+    offset = 32;
+    tools_open_tlv_type_pack(&(ptr_struct->type), ptr_buff + offset / 8);
 }
 
-void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_nv_hdr_fifth_gen_unpack(struct tools_open_nv_hdr_fifth_gen* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->StateChangeEnable = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 56;
-	ptr_struct->LinkSpeedSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 88;
-	ptr_struct->LinkSpeedEnabled = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 120;
-	ptr_struct->LinkSpeedActive = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 144;
-	ptr_struct->CapMask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	ptr_struct->ActiveCell = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 23;
+    ptr_struct->length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 9);
+    offset = 20;
+    ptr_struct->writer_host_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 16;
+    ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 11;
+    ptr_struct->writer_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 9;
+    ptr_struct->read_current = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 8;
+    ptr_struct->default_ = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 7;
+    ptr_struct->rd_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->over_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    tools_open_tlv_type_unpack(&(ptr_struct->type), ptr_buff + offset / 8);
 }
 
-void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info *ptr_struct, FILE *fd, int indent_level)
+void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_extended_ib_port_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nv_hdr_fifth_gen ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "StateChangeEnable    : " UH_FMT "\n", ptr_struct->StateChangeEnable);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "LinkSpeedSupported   : " UH_FMT "\n", ptr_struct->LinkSpeedSupported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "LinkSpeedEnabled     : " UH_FMT "\n", ptr_struct->LinkSpeedEnabled);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "LinkSpeedActive      : " UH_FMT "\n", ptr_struct->LinkSpeedActive);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "CapMask              : " UH_FMT "\n", ptr_struct->CapMask);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ActiveCell           : " UH_FMT "\n", ptr_struct->ActiveCell);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "length               : " UH_FMT "\n", ptr_struct->length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "writer_host_id       : " UH_FMT "\n", ptr_struct->writer_host_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(
+      fd, "writer_id            : %s (" UH_FMT ")\n",
+      (ptr_struct->writer_id == 0 ?
+         ("NV_WRITER_ID_UNSPECIFIED") :
+         ((ptr_struct->writer_id == 1 ?
+             ("NV_WRITER_ID_CHASSIS_BMC") :
+             ((ptr_struct->writer_id == 2 ?
+                 ("NV_WRITER_ID_MAD") :
+                 ((ptr_struct->writer_id == 3 ?
+                     ("NV_WRITER_ID_BMC") :
+                     ((ptr_struct->writer_id == 4 ?
+                         ("NV_WRITER_ID_CMD_IF") :
+                         ((ptr_struct->writer_id == 5 ?
+                             ("NV_WRITER_ID_ICMD") :
+                             ((ptr_struct->writer_id == 6 ?
+                                 ("NV_WRITER_ID_ICMD_UEFI_HII") :
+                                 ((ptr_struct->writer_id == 7 ?
+                                     ("NV_WRITER_ID_ICMD_UEFI_CLP") :
+                                     ((ptr_struct->writer_id == 8 ?
+                                         ("NV_WRITER_ID_ICMD_FLEXBOOT") :
+                                         ((ptr_struct->writer_id == 9 ?
+                                             ("NV_WRITER_ID_ICMD_MLXCONFIG") :
+                                             ((ptr_struct->writer_id == 10 ?
+                                                 ("NV_WRITER_ID_ICMD_USER1") :
+                                                 ((ptr_struct->writer_id == 11 ?
+                                                     ("NV_WRITER_ID_ICMD_USER2") :
+                                                     ((ptr_struct->writer_id == 31 ? ("NV_WRITER_ID_OTHER") :
+                                                                                     ("unknown")))))))))))))))))))))))))),
+      ptr_struct->writer_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_current         : " UH_FMT "\n", ptr_struct->read_current);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_             : " UH_FMT "\n", ptr_struct->default_);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rd_en                : " UH_FMT "\n", ptr_struct->rd_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "over_en              : " UH_FMT "\n", ptr_struct->over_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type:\n");
+    tools_open_tlv_type_print(&(ptr_struct->type), fd, indent_level + 1);
+}
+
+unsigned int tools_open_nv_hdr_fifth_gen_size(void)
+{
+    return TOOLS_OPEN_NV_HDR_FIFTH_GEN_SIZE;
+}
+
+void tools_open_nv_hdr_fifth_gen_dump(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd)
+{
+    tools_open_nv_hdr_fifth_gen_print(ptr_struct, fd, 0);
+}
+
+void tools_open_pmdio_addr_data_pack(const struct tools_open_pmdio_addr_data* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->data);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->addr);
+}
+
+void tools_open_pmdio_addr_data_unpack(struct tools_open_pmdio_addr_data* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->data = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->addr = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_pmdio_addr_data ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data                 : " UH_FMT "\n", ptr_struct->data);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "addr                 : " UH_FMT "\n", ptr_struct->addr);
+}
+
+unsigned int tools_open_pmdio_addr_data_size(void)
+{
+    return TOOLS_OPEN_PMDIO_ADDR_DATA_SIZE;
+}
+
+void tools_open_pmdio_addr_data_dump(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd)
+{
+    tools_open_pmdio_addr_data_print(ptr_struct, fd, 0);
+}
+
+void tools_open_sw_info_pack(const struct tools_open_sw_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->subminor);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major);
+    offset = 60;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_type);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_arch);
+    offset = 52;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_type);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_arch);
+    offset = 44;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_type);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_arch);
+    offset = 36;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_type);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_arch);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom0_version);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom1_version);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom2_version);
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rom3_version);
+}
+
+void tools_open_sw_info_unpack(struct tools_open_sw_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->subminor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 60;
+    ptr_struct->rom3_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 56;
+    ptr_struct->rom3_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 52;
+    ptr_struct->rom2_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 48;
+    ptr_struct->rom2_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 44;
+    ptr_struct->rom1_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 40;
+    ptr_struct->rom1_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 36;
+    ptr_struct->rom0_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->rom0_arch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->rom0_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->rom1_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->rom2_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 160;
+    ptr_struct->rom3_version = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_sw_info_print(const struct tools_open_sw_info* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_sw_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "subminor             : " UH_FMT "\n", ptr_struct->subminor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor                : " UH_FMT "\n", ptr_struct->minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major                : " UH_FMT "\n", ptr_struct->major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom3_type            : " UH_FMT "\n", ptr_struct->rom3_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom3_arch            : " UH_FMT "\n", ptr_struct->rom3_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom2_type            : " UH_FMT "\n", ptr_struct->rom2_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom2_arch            : " UH_FMT "\n", ptr_struct->rom2_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom1_type            : " UH_FMT "\n", ptr_struct->rom1_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom1_arch            : " UH_FMT "\n", ptr_struct->rom1_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom0_type            : " UH_FMT "\n", ptr_struct->rom0_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom0_arch            : " UH_FMT "\n", ptr_struct->rom0_arch);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom0_version         : " U32H_FMT "\n", ptr_struct->rom0_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom1_version         : " U32H_FMT "\n", ptr_struct->rom1_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom2_version         : " U32H_FMT "\n", ptr_struct->rom2_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rom3_version         : " U32H_FMT "\n", ptr_struct->rom3_version);
+}
+
+unsigned int tools_open_sw_info_size(void)
+{
+    return TOOLS_OPEN_SW_INFO_SIZE;
+}
+
+void tools_open_sw_info_dump(const struct tools_open_sw_info* ptr_struct, FILE* fd)
+{
+    tools_open_sw_info_print(ptr_struct, fd, 0);
+}
+
+void tools_open_timestamp_pack(const struct tools_open_timestamp* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_fw_version_pack(&(ptr_struct->fw_version), ptr_buff + offset / 8);
+    offset = 64;
+    tools_open_ts_entry_pack(&(ptr_struct->ts_entry), ptr_buff + offset / 8);
+}
+
+void tools_open_timestamp_unpack(struct tools_open_timestamp* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_fw_version_unpack(&(ptr_struct->fw_version), ptr_buff + offset / 8);
+    offset = 64;
+    tools_open_ts_entry_unpack(&(ptr_struct->ts_entry), ptr_buff + offset / 8);
+}
+
+void tools_open_timestamp_print(const struct tools_open_timestamp* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_timestamp ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_version:\n");
+    tools_open_fw_version_print(&(ptr_struct->fw_version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ts_entry:\n");
+    tools_open_ts_entry_print(&(ptr_struct->ts_entry), fd, indent_level + 1);
+}
+
+unsigned int tools_open_timestamp_size(void)
+{
+    return TOOLS_OPEN_TIMESTAMP_SIZE;
+}
+
+void tools_open_timestamp_dump(const struct tools_open_timestamp* ptr_struct, FILE* fd)
+{
+    tools_open_timestamp_print(ptr_struct, fd, 0);
+}
+
+void tools_open_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, *ptr_struct);
+}
+
+void tools_open_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    *ptr_struct = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+}
+
+void tools_open_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_uint64 ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uint64               : " U64H_FMT "\n", (u_int64_t)*ptr_struct);
+}
+
+unsigned int tools_open_uint64_size(void)
+{
+    return TOOLS_OPEN_UINT64_SIZE;
+}
+
+void tools_open_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
+{
+    tools_open_uint64_print(ptr_struct, fd, 0);
+}
+
+void tools_open_aux_tlv_header_pack(const struct tools_open_aux_tlv_header* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->header_type);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->length);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved0);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved1);
+}
+
+void tools_open_aux_tlv_header_unpack(struct tools_open_aux_tlv_header* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->header_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->length = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 96;
+    ptr_struct->reserved0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->reserved1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_aux_tlv_header_print(const struct tools_open_aux_tlv_header* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_aux_tlv_header ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "header_type          : " UH_FMT "\n", ptr_struct->header_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "length               : " U32H_FMT "\n", ptr_struct->length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "crc                  : " UH_FMT "\n", ptr_struct->crc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved0            : " U32H_FMT "\n", ptr_struct->reserved0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved1            : " U32H_FMT "\n", ptr_struct->reserved1);
+}
+
+unsigned int tools_open_aux_tlv_header_size(void)
+{
+    return TOOLS_OPEN_AUX_TLV_HEADER_SIZE;
+}
+
+void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header* ptr_struct, FILE* fd)
+{
+    tools_open_aux_tlv_header_print(ptr_struct, fd, 0);
+}
+
+void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                           u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->StateChangeEnable);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->LinkSpeedSupported);
+    offset = 88;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->LinkSpeedEnabled);
+    offset = 120;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->LinkSpeedActive);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->CapMask);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ActiveCell);
+}
+
+void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct,
+                                             const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->StateChangeEnable = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->LinkSpeedSupported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 88;
+    ptr_struct->LinkSpeedEnabled = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 120;
+    ptr_struct->LinkSpeedActive = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 144;
+    ptr_struct->CapMask = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    ptr_struct->ActiveCell = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_extended_ib_port_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "StateChangeEnable    : " UH_FMT "\n", ptr_struct->StateChangeEnable);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "LinkSpeedSupported   : " UH_FMT "\n", ptr_struct->LinkSpeedSupported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "LinkSpeedEnabled     : " UH_FMT "\n", ptr_struct->LinkSpeedEnabled);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "LinkSpeedActive      : " UH_FMT "\n", ptr_struct->LinkSpeedActive);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "CapMask              : " UH_FMT "\n", ptr_struct->CapMask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ActiveCell           : " UH_FMT "\n", ptr_struct->ActiveCell);
+}
+
+unsigned int tools_open_extended_ib_port_info_size(void)
+{
+    return TOOLS_OPEN_EXTENDED_IB_PORT_INFO_SIZE;
+}
+
+void tools_open_extended_ib_port_info_dump(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd)
+{
+    tools_open_extended_ib_port_info_print(ptr_struct, fd, 0);
+}
+
+void tools_open_ib_port_info_pack(const struct tools_open_ib_port_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->m_key_hi);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->m_key_lo);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->gid_prefix_hi);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->gid_prefix_lo);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->master_sm_lid);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->lid);
+    offset = 160;
+    tools_open_cap_mask_pack(&(ptr_struct->cap_mask), ptr_buff + offset / 8);
+    offset = 208;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->m_key_lease);
+    offset = 192;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->diag_code);
+    offset = 248;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_width_act);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_width_sup);
+    offset = 232;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_width_ena);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port_num);
+    offset = 284;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_ena);
+    offset = 280;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_act);
+    offset = 277;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->lmc);
+    offset = 272;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->m_key_protec);
+    offset = 268;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->down_def_state);
+    offset = 264;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->phy_state);
+    offset = 260;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->port_state);
+    offset = 256;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_sup);
+    offset = 312;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vl_arb_high_cap);
+    offset = 304;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vl_high_limit);
+    offset = 300;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->init_type);
+    offset = 296;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->vl_cap);
+    offset = 292;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->master_sm_sl);
+    offset = 288;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->neighbor_mtu);
+    offset = 351;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->filter_raw_out);
+    offset = 350;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->filter_raw_in);
+    offset = 349;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->Part_enforce_out);
+    offset = 348;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->Part_enforce_in);
+    offset = 344;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->operational_vl);
+    offset = 339;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->HOQLife);
+    offset = 336;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->vl_stall_cnt);
+    offset = 332;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mtu_cap);
+    offset = 320;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vl_arb_low_cap);
+    offset = 368;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->p_key_violations);
+    offset = 352;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->m_key_violations);
+    offset = 411;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->subnet_to);
+    offset = 408;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->client_reregister);
+    offset = 400;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->guid_cap);
+    offset = 384;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->q_key_violations);
+    offset = 428;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->overrun_err);
+    offset = 424;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->local_phy_err);
+    offset = 419;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->resp_time_value);
+    offset = 507;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->link_speed_ext_ena);
+    offset = 500;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_ext_sup);
+    offset = 496;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_ext_act);
+}
+
+void tools_open_ib_port_info_unpack(struct tools_open_ib_port_info* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    ptr_struct->m_key_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->m_key_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->gid_prefix_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->gid_prefix_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 144;
+    ptr_struct->master_sm_lid = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 128;
+    ptr_struct->lid = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 160;
+    tools_open_cap_mask_unpack(&(ptr_struct->cap_mask), ptr_buff + offset / 8);
+    offset = 208;
+    ptr_struct->m_key_lease = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 192;
+    ptr_struct->diag_code = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 248;
+    ptr_struct->link_width_act = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 240;
+    ptr_struct->link_width_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 232;
+    ptr_struct->link_width_ena = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 224;
+    ptr_struct->local_port_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 284;
+    ptr_struct->link_speed_ena = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 280;
+    ptr_struct->link_speed_act = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 277;
+    ptr_struct->lmc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 272;
+    ptr_struct->m_key_protec = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 268;
+    ptr_struct->down_def_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 264;
+    ptr_struct->phy_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 260;
+    ptr_struct->port_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 256;
+    ptr_struct->link_speed_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 312;
+    ptr_struct->vl_arb_high_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 304;
+    ptr_struct->vl_high_limit = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 300;
+    ptr_struct->init_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 296;
+    ptr_struct->vl_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 292;
+    ptr_struct->master_sm_sl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 288;
+    ptr_struct->neighbor_mtu = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 351;
+    ptr_struct->filter_raw_out = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 350;
+    ptr_struct->filter_raw_in = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 349;
+    ptr_struct->Part_enforce_out = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 348;
+    ptr_struct->Part_enforce_in = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 344;
+    ptr_struct->operational_vl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 339;
+    ptr_struct->HOQLife = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 336;
+    ptr_struct->vl_stall_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 332;
+    ptr_struct->mtu_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 320;
+    ptr_struct->vl_arb_low_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 368;
+    ptr_struct->p_key_violations = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 352;
+    ptr_struct->m_key_violations = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 411;
+    ptr_struct->subnet_to = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 408;
+    ptr_struct->client_reregister = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 400;
+    ptr_struct->guid_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 384;
+    ptr_struct->q_key_violations = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 428;
+    ptr_struct->overrun_err = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 424;
+    ptr_struct->local_phy_err = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 419;
+    ptr_struct->resp_time_value = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 507;
+    ptr_struct->link_speed_ext_ena = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 500;
+    ptr_struct->link_speed_ext_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 496;
+    ptr_struct->link_speed_ext_act = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_ib_port_info_print(const struct tools_open_ib_port_info* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_ib_port_info ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "m_key_hi             : " U32H_FMT "\n", ptr_struct->m_key_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "m_key_lo             : " U32H_FMT "\n", ptr_struct->m_key_lo);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "gid_prefix_hi        : " U32H_FMT "\n", ptr_struct->gid_prefix_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "gid_prefix_lo        : " U32H_FMT "\n", ptr_struct->gid_prefix_lo);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "master_sm_lid        : " UH_FMT "\n", ptr_struct->master_sm_lid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lid                  : " UH_FMT "\n", ptr_struct->lid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cap_mask:\n");
+    tools_open_cap_mask_print(&(ptr_struct->cap_mask), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "m_key_lease          : " UH_FMT "\n", ptr_struct->m_key_lease);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "diag_code            : " UH_FMT "\n", ptr_struct->diag_code);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_width_act       : " UH_FMT "\n", ptr_struct->link_width_act);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_width_sup       : " UH_FMT "\n", ptr_struct->link_width_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_width_ena       : " UH_FMT "\n", ptr_struct->link_width_ena);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "local_port_num       : " UH_FMT "\n", ptr_struct->local_port_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_speed_ena       : " UH_FMT "\n", ptr_struct->link_speed_ena);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_speed_act       : " UH_FMT "\n", ptr_struct->link_speed_act);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lmc                  : " UH_FMT "\n", ptr_struct->lmc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "m_key_protec         : " UH_FMT "\n", ptr_struct->m_key_protec);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "down_def_state       : " UH_FMT "\n", ptr_struct->down_def_state);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy_state            : " UH_FMT "\n", ptr_struct->phy_state);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_state           : " UH_FMT "\n", ptr_struct->port_state);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_speed_sup       : " UH_FMT "\n", ptr_struct->link_speed_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vl_arb_high_cap      : " UH_FMT "\n", ptr_struct->vl_arb_high_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vl_high_limit        : " UH_FMT "\n", ptr_struct->vl_high_limit);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "init_type            : " UH_FMT "\n", ptr_struct->init_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vl_cap               : " UH_FMT "\n", ptr_struct->vl_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "master_sm_sl         : " UH_FMT "\n", ptr_struct->master_sm_sl);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "neighbor_mtu         : " UH_FMT "\n", ptr_struct->neighbor_mtu);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "filter_raw_out       : " UH_FMT "\n", ptr_struct->filter_raw_out);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "filter_raw_in        : " UH_FMT "\n", ptr_struct->filter_raw_in);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Part_enforce_out     : " UH_FMT "\n", ptr_struct->Part_enforce_out);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "Part_enforce_in      : " UH_FMT "\n", ptr_struct->Part_enforce_in);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "operational_vl       : " UH_FMT "\n", ptr_struct->operational_vl);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "HOQLife              : " UH_FMT "\n", ptr_struct->HOQLife);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vl_stall_cnt         : " UH_FMT "\n", ptr_struct->vl_stall_cnt);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mtu_cap              : " UH_FMT "\n", ptr_struct->mtu_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vl_arb_low_cap       : " UH_FMT "\n", ptr_struct->vl_arb_low_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "p_key_violations     : " UH_FMT "\n", ptr_struct->p_key_violations);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "m_key_violations     : " UH_FMT "\n", ptr_struct->m_key_violations);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "subnet_to            : " UH_FMT "\n", ptr_struct->subnet_to);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "client_reregister    : " UH_FMT "\n", ptr_struct->client_reregister);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guid_cap             : " UH_FMT "\n", ptr_struct->guid_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "q_key_violations     : " UH_FMT "\n", ptr_struct->q_key_violations);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "overrun_err          : " UH_FMT "\n", ptr_struct->overrun_err);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "local_phy_err        : " UH_FMT "\n", ptr_struct->local_phy_err);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "resp_time_value      : " UH_FMT "\n", ptr_struct->resp_time_value);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_speed_ext_ena   : " UH_FMT "\n", ptr_struct->link_speed_ext_ena);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_speed_ext_sup   : " UH_FMT "\n", ptr_struct->link_speed_ext_sup);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_speed_ext_act   : " UH_FMT "\n", ptr_struct->link_speed_ext_act);
+}
+
+unsigned int tools_open_ib_port_info_size(void)
+{
+    return TOOLS_OPEN_IB_PORT_INFO_SIZE;
+}
+
+void tools_open_ib_port_info_dump(const struct tools_open_ib_port_info* ptr_struct, FILE* fd)
+{
+    tools_open_ib_port_info_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mcam_pack(const struct tools_open_mcam* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->access_reg_group);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->feature_group);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(88, 8, i, 576, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->mng_access_reg_cap_mask[i]);
+    }
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(344, 8, i, 576, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->mng_feature_cap_mask[i]);
+    }
+}
+
+void tools_open_mcam_unpack(struct tools_open_mcam* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 24;
+    ptr_struct->access_reg_group = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->feature_group = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(88, 8, i, 576, 1);
+        ptr_struct->mng_access_reg_cap_mask[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(344, 8, i, 576, 1);
+        ptr_struct->mng_feature_cap_mask[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+}
+
+void tools_open_mcam_print(const struct tools_open_mcam* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mcam ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "access_reg_group     : " UH_FMT "\n", ptr_struct->access_reg_group);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "feature_group        : " UH_FMT "\n", ptr_struct->feature_group);
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "mng_access_reg_cap_mask_%03d : " UH_FMT "\n", i, ptr_struct->mng_access_reg_cap_mask[i]);
+    }
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "mng_feature_cap_mask_%03d : " UH_FMT "\n", i, ptr_struct->mng_feature_cap_mask[i]);
+    }
+}
+
+unsigned int tools_open_mcam_size(void)
+{
+    return TOOLS_OPEN_MCAM_SIZE;
+}
+
+void tools_open_mcam_dump(const struct tools_open_mcam* ptr_struct, FILE* fd)
+{
+    tools_open_mcam_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mfmc_pack(const struct tools_open_mfmc* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->wrp_block_count);
+    offset = 46;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->block_size);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wrp_en);
+    offset = 90;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->sub_sector_protect_size);
+    offset = 82;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->sector_protect_size);
+    offset = 135;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->quad_en);
+    offset = 220;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->dummy_clock_cycles);
+}
+
+void tools_open_mfmc_unpack(struct tools_open_mfmc* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 26;
+    ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 56;
+    ptr_struct->wrp_block_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 46;
+    ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 32;
+    ptr_struct->wrp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 90;
+    ptr_struct->sub_sector_protect_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 82;
+    ptr_struct->sector_protect_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 135;
+    ptr_struct->quad_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 220;
+    ptr_struct->dummy_clock_cycles = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_mfmc_print(const struct tools_open_mfmc* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mfmc ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "wrp_block_count      : " UH_FMT "\n", ptr_struct->wrp_block_count);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "block_size           : " UH_FMT "\n", ptr_struct->block_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "wrp_en               : " UH_FMT "\n", ptr_struct->wrp_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sub_sector_protect_size : " UH_FMT "\n", ptr_struct->sub_sector_protect_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sector_protect_size  : " UH_FMT "\n", ptr_struct->sector_protect_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "quad_en              : " UH_FMT "\n", ptr_struct->quad_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dummy_clock_cycles   : " UH_FMT "\n", ptr_struct->dummy_clock_cycles);
+}
+
+unsigned int tools_open_mfmc_size(void)
+{
+    return TOOLS_OPEN_MFMC_SIZE;
+}
+
+void tools_open_mfmc_dump(const struct tools_open_mfmc* ptr_struct, FILE* fd)
+{
+    tools_open_mfmc_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mfpa_pack(const struct tools_open_mfpa* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->boot_address);
+    offset = 156;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->flash_num);
+    offset = 143;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sub_sector_wrp_en);
+    offset = 142;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sector_wrp_en);
+    offset = 130;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_64kb_erase_en);
+    offset = 129;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_32kb_erase_en);
+    offset = 128;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wip);
+    offset = 168;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->jedec_id);
+    offset = 214;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
+    offset = 200;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
+    offset = 192;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->capability_mask);
+}
+
+void tools_open_mfpa_unpack(struct tools_open_mfpa* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 26;
+    ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 23;
+    ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->boot_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 156;
+    ptr_struct->flash_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 143;
+    ptr_struct->sub_sector_wrp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 142;
+    ptr_struct->sector_wrp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 130;
+    ptr_struct->bulk_64kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 129;
+    ptr_struct->bulk_32kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 128;
+    ptr_struct->wip = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 168;
+    ptr_struct->jedec_id = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 214;
+    ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 200;
+    ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 192;
+    ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 224;
+    ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_mfpa_print(const struct tools_open_mfpa* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mfpa ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_address         : " U32H_FMT "\n", ptr_struct->boot_address);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "flash_num            : " UH_FMT "\n", ptr_struct->flash_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sub_sector_wrp_en    : " UH_FMT "\n", ptr_struct->sub_sector_wrp_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sector_wrp_en        : " UH_FMT "\n", ptr_struct->sector_wrp_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bulk_64kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_64kb_erase_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bulk_32kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_32kb_erase_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "wip                  : " UH_FMT "\n", ptr_struct->wip);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "jedec_id             : " UH_FMT "\n", ptr_struct->jedec_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sector_size          : " UH_FMT "\n", ptr_struct->sector_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "block_allignment     : " UH_FMT "\n", ptr_struct->block_allignment);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "block_size           : " UH_FMT "\n", ptr_struct->block_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "capability_mask      : " U32H_FMT "\n", ptr_struct->capability_mask);
+}
+
+unsigned int tools_open_mfpa_size(void)
+{
+    return TOOLS_OPEN_MFPA_SIZE;
+}
+
+void tools_open_mfpa_dump(const struct tools_open_mfpa* ptr_struct, FILE* fd)
+{
+    tools_open_mfpa_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mgir_pack(const struct tools_open_mgir* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_hw_info_pack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
+    offset = 256;
+    tools_open_fw_info_pack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
+    offset = 768;
+    tools_open_sw_info_pack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
+}
+
+void tools_open_mgir_unpack(struct tools_open_mgir* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_hw_info_unpack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
+    offset = 256;
+    tools_open_fw_info_unpack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
+    offset = 768;
+    tools_open_sw_info_unpack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
+}
+
+void tools_open_mgir_print(const struct tools_open_mgir* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mgir ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_info:\n");
+    tools_open_hw_info_print(&(ptr_struct->hw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_info:\n");
+    tools_open_fw_info_print(&(ptr_struct->fw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sw_info:\n");
+    tools_open_sw_info_print(&(ptr_struct->sw_info), fd, indent_level + 1);
+}
+
+unsigned int tools_open_mgir_size(void)
+{
+    return TOOLS_OPEN_MGIR_SIZE;
+}
+
+void tools_open_mgir_dump(const struct tools_open_mgir* ptr_struct, FILE* fd)
+{
+    tools_open_mgir_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mgnle_pack(const struct tools_open_mgnle* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->le_pointer);
+    offset = 36;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->lost_events);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->synced_time);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->time_h);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->time_l);
+    offset = 128;
+    tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(376, 8, i, 1376, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_data[i]);
+    }
+}
+
+void tools_open_mgnle_unpack(struct tools_open_mgnle* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    ptr_struct->le_pointer = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 36;
+    ptr_struct->lost_events = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->synced_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->time_h = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->time_l = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(376, 8, i, 1376, 1);
+        ptr_struct->log_data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+}
+
+void tools_open_mgnle_print(const struct tools_open_mgnle* ptr_struct, FILE* fd, int indent_level)
+{
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mgnle ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "le_pointer           : " U32H_FMT "\n", ptr_struct->le_pointer);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lost_events          : " UH_FMT "\n", ptr_struct->lost_events);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "synced_time          : " UH_FMT "\n", ptr_struct->synced_time);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "time_h               : " U32H_FMT "\n", ptr_struct->time_h);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "time_l               : " U32H_FMT "\n", ptr_struct->time_l);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    for (i = 0; i < 128; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "log_data_%03d        : " UH_FMT "\n", i, ptr_struct->log_data[i]);
+    }
+}
+
+unsigned int tools_open_mgnle_size(void)
+{
+    return TOOLS_OPEN_MGNLE_SIZE;
+}
+
+void tools_open_mgnle_dump(const struct tools_open_mgnle* ptr_struct, FILE* fd)
+{
+    tools_open_mgnle_print(ptr_struct, fd, 0);
+}
 
-unsigned int tools_open_extended_ib_port_info_size(void)
+void tools_open_mlock_pack(const struct tools_open_mlock* ptr_struct, u_int8_t* ptr_buff)
 {
-	return TOOLS_OPEN_EXTENDED_IB_PORT_INFO_SIZE;
-}
-
-void tools_open_extended_ib_port_info_dump(const struct tools_open_extended_ib_port_info *ptr_struct, FILE *fd)
-{
-	tools_open_extended_ib_port_info_print(ptr_struct, fd, 0);
-}
-
-void tools_open_ib_port_info_pack(const struct tools_open_ib_port_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->m_key_hi);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->m_key_lo);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->gid_prefix_hi);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->gid_prefix_lo);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->master_sm_lid);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->lid);
-	offset = 160;
-	tools_open_cap_mask_pack(&(ptr_struct->cap_mask), ptr_buff + offset / 8);
-	offset = 208;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->m_key_lease);
-	offset = 192;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->diag_code);
-	offset = 248;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_width_act);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_width_sup);
-	offset = 232;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_width_ena);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port_num);
-	offset = 284;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_ena);
-	offset = 280;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_act);
-	offset = 277;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->lmc);
-	offset = 272;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->m_key_protec);
-	offset = 268;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->down_def_state);
-	offset = 264;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->phy_state);
-	offset = 260;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->port_state);
-	offset = 256;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_sup);
-	offset = 312;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vl_arb_high_cap);
-	offset = 304;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vl_high_limit);
-	offset = 300;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->init_type);
-	offset = 296;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->vl_cap);
-	offset = 292;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->master_sm_sl);
-	offset = 288;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->neighbor_mtu);
-	offset = 351;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->filter_raw_out);
-	offset = 350;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->filter_raw_in);
-	offset = 349;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->Part_enforce_out);
-	offset = 348;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->Part_enforce_in);
-	offset = 344;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->operational_vl);
-	offset = 339;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->HOQLife);
-	offset = 336;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->vl_stall_cnt);
-	offset = 332;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mtu_cap);
-	offset = 320;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->vl_arb_low_cap);
-	offset = 368;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->p_key_violations);
-	offset = 352;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->m_key_violations);
-	offset = 411;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->subnet_to);
-	offset = 408;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->client_reregister);
-	offset = 400;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->guid_cap);
-	offset = 384;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->q_key_violations);
-	offset = 428;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->overrun_err);
-	offset = 424;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->local_phy_err);
-	offset = 419;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->resp_time_value);
-	offset = 507;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->link_speed_ext_ena);
-	offset = 500;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_ext_sup);
-	offset = 496;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->link_speed_ext_act);
-}
-
-void tools_open_ib_port_info_unpack(struct tools_open_ib_port_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 0;
-	ptr_struct->m_key_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->m_key_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->gid_prefix_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->gid_prefix_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 144;
-	ptr_struct->master_sm_lid = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 128;
-	ptr_struct->lid = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 160;
-	tools_open_cap_mask_unpack(&(ptr_struct->cap_mask), ptr_buff + offset / 8);
-	offset = 208;
-	ptr_struct->m_key_lease = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 192;
-	ptr_struct->diag_code = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 248;
-	ptr_struct->link_width_act = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 240;
-	ptr_struct->link_width_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 232;
-	ptr_struct->link_width_ena = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 224;
-	ptr_struct->local_port_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 284;
-	ptr_struct->link_speed_ena = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 280;
-	ptr_struct->link_speed_act = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 277;
-	ptr_struct->lmc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 272;
-	ptr_struct->m_key_protec = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 268;
-	ptr_struct->down_def_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 264;
-	ptr_struct->phy_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 260;
-	ptr_struct->port_state = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 256;
-	ptr_struct->link_speed_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 312;
-	ptr_struct->vl_arb_high_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 304;
-	ptr_struct->vl_high_limit = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 300;
-	ptr_struct->init_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 296;
-	ptr_struct->vl_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 292;
-	ptr_struct->master_sm_sl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 288;
-	ptr_struct->neighbor_mtu = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 351;
-	ptr_struct->filter_raw_out = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 350;
-	ptr_struct->filter_raw_in = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 349;
-	ptr_struct->Part_enforce_out = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 348;
-	ptr_struct->Part_enforce_in = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 344;
-	ptr_struct->operational_vl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 339;
-	ptr_struct->HOQLife = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 336;
-	ptr_struct->vl_stall_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 332;
-	ptr_struct->mtu_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 320;
-	ptr_struct->vl_arb_low_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 368;
-	ptr_struct->p_key_violations = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 352;
-	ptr_struct->m_key_violations = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 411;
-	ptr_struct->subnet_to = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 408;
-	ptr_struct->client_reregister = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 400;
-	ptr_struct->guid_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 384;
-	ptr_struct->q_key_violations = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 428;
-	ptr_struct->overrun_err = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 424;
-	ptr_struct->local_phy_err = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 419;
-	ptr_struct->resp_time_value = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 507;
-	ptr_struct->link_speed_ext_ena = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 500;
-	ptr_struct->link_speed_ext_sup = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 496;
-	ptr_struct->link_speed_ext_act = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_ib_port_info_print(const struct tools_open_ib_port_info *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_ib_port_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "m_key_hi             : " U32H_FMT "\n", ptr_struct->m_key_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "m_key_lo             : " U32H_FMT "\n", ptr_struct->m_key_lo);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "gid_prefix_hi        : " U32H_FMT "\n", ptr_struct->gid_prefix_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "gid_prefix_lo        : " U32H_FMT "\n", ptr_struct->gid_prefix_lo);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "master_sm_lid        : " UH_FMT "\n", ptr_struct->master_sm_lid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lid                  : " UH_FMT "\n", ptr_struct->lid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cap_mask:\n");
-	tools_open_cap_mask_print(&(ptr_struct->cap_mask), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "m_key_lease          : " UH_FMT "\n", ptr_struct->m_key_lease);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "diag_code            : " UH_FMT "\n", ptr_struct->diag_code);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_width_act       : " UH_FMT "\n", ptr_struct->link_width_act);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_width_sup       : " UH_FMT "\n", ptr_struct->link_width_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_width_ena       : " UH_FMT "\n", ptr_struct->link_width_ena);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "local_port_num       : " UH_FMT "\n", ptr_struct->local_port_num);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_speed_ena       : " UH_FMT "\n", ptr_struct->link_speed_ena);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_speed_act       : " UH_FMT "\n", ptr_struct->link_speed_act);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lmc                  : " UH_FMT "\n", ptr_struct->lmc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "m_key_protec         : " UH_FMT "\n", ptr_struct->m_key_protec);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "down_def_state       : " UH_FMT "\n", ptr_struct->down_def_state);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy_state            : " UH_FMT "\n", ptr_struct->phy_state);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_state           : " UH_FMT "\n", ptr_struct->port_state);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_speed_sup       : " UH_FMT "\n", ptr_struct->link_speed_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_arb_high_cap      : " UH_FMT "\n", ptr_struct->vl_arb_high_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_high_limit        : " UH_FMT "\n", ptr_struct->vl_high_limit);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "init_type            : " UH_FMT "\n", ptr_struct->init_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_cap               : " UH_FMT "\n", ptr_struct->vl_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "master_sm_sl         : " UH_FMT "\n", ptr_struct->master_sm_sl);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "neighbor_mtu         : " UH_FMT "\n", ptr_struct->neighbor_mtu);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "filter_raw_out       : " UH_FMT "\n", ptr_struct->filter_raw_out);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "filter_raw_in        : " UH_FMT "\n", ptr_struct->filter_raw_in);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Part_enforce_out     : " UH_FMT "\n", ptr_struct->Part_enforce_out);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "Part_enforce_in      : " UH_FMT "\n", ptr_struct->Part_enforce_in);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "operational_vl       : " UH_FMT "\n", ptr_struct->operational_vl);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "HOQLife              : " UH_FMT "\n", ptr_struct->HOQLife);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_stall_cnt         : " UH_FMT "\n", ptr_struct->vl_stall_cnt);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mtu_cap              : " UH_FMT "\n", ptr_struct->mtu_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vl_arb_low_cap       : " UH_FMT "\n", ptr_struct->vl_arb_low_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "p_key_violations     : " UH_FMT "\n", ptr_struct->p_key_violations);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "m_key_violations     : " UH_FMT "\n", ptr_struct->m_key_violations);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "subnet_to            : " UH_FMT "\n", ptr_struct->subnet_to);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "client_reregister    : " UH_FMT "\n", ptr_struct->client_reregister);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guid_cap             : " UH_FMT "\n", ptr_struct->guid_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "q_key_violations     : " UH_FMT "\n", ptr_struct->q_key_violations);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "overrun_err          : " UH_FMT "\n", ptr_struct->overrun_err);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "local_phy_err        : " UH_FMT "\n", ptr_struct->local_phy_err);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "resp_time_value      : " UH_FMT "\n", ptr_struct->resp_time_value);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_speed_ext_ena   : " UH_FMT "\n", ptr_struct->link_speed_ext_ena);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_speed_ext_sup   : " UH_FMT "\n", ptr_struct->link_speed_ext_sup);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_speed_ext_act   : " UH_FMT "\n", ptr_struct->link_speed_ext_act);
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->operation);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
 }
 
-unsigned int tools_open_ib_port_info_size(void)
+void tools_open_mlock_unpack(struct tools_open_mlock* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+}
+
+void tools_open_mlock_print(const struct tools_open_mlock* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mlock ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
+}
+
+unsigned int tools_open_mlock_size(void)
 {
-	return TOOLS_OPEN_IB_PORT_INFO_SIZE;
+    return TOOLS_OPEN_MLOCK_SIZE;
 }
 
-void tools_open_ib_port_info_dump(const struct tools_open_ib_port_info *ptr_struct, FILE *fd)
+void tools_open_mlock_dump(const struct tools_open_mlock* ptr_struct, FILE* fd)
 {
-	tools_open_ib_port_info_print(ptr_struct, fd, 0);
+    tools_open_mlock_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mcam_pack(const struct tools_open_mcam *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mnva_pack(const struct tools_open_mnva* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->access_reg_group);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->feature_group);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(88, 8, i, 576, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->mng_access_reg_cap_mask[i]);
-	}
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(344, 8, i, 576, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->mng_feature_cap_mask[i]);
-	}
+    offset = 0;
+    tools_open_nv_hdr_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(88, 8, i, 2048, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void tools_open_mcam_unpack(struct tools_open_mcam *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_mnva_unpack(struct tools_open_mnva* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 24;
-	ptr_struct->access_reg_group = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->feature_group = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(88, 8, i, 576, 1);
-		ptr_struct->mng_access_reg_cap_mask[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(344, 8, i, 576, 1);
-		ptr_struct->mng_feature_cap_mask[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+    offset = 0;
+    tools_open_nv_hdr_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(88, 8, i, 2048, 1);
+        ptr_struct->data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void tools_open_mcam_print(const struct tools_open_mcam *ptr_struct, FILE *fd, int indent_level)
+void tools_open_mnva_print(const struct tools_open_mnva* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mcam ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mnva ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "access_reg_group     : " UH_FMT "\n", ptr_struct->access_reg_group);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "feature_group        : " UH_FMT "\n", ptr_struct->feature_group);
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mng_access_reg_cap_mask_%03d : " UH_FMT "\n", i, ptr_struct->mng_access_reg_cap_mask[i]);
-	}
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mng_feature_cap_mask_%03d : " UH_FMT "\n", i, ptr_struct->mng_feature_cap_mask[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    for (i = 0; i < 128; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " UH_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
-unsigned int tools_open_mcam_size(void)
+unsigned int tools_open_mnva_size(void)
 {
-	return TOOLS_OPEN_MCAM_SIZE;
-}
-
-void tools_open_mcam_dump(const struct tools_open_mcam *ptr_struct, FILE *fd)
-{
-	tools_open_mcam_print(ptr_struct, fd, 0);
-}
-
-void tools_open_mfmc_pack(const struct tools_open_mfmc *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->wrp_block_count);
-	offset = 46;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->block_size);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wrp_en);
-	offset = 90;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->sub_sector_protect_size);
-	offset = 82;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->sector_protect_size);
-	offset = 135;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->quad_en);
-	offset = 220;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->dummy_clock_cycles);
-}
-
-void tools_open_mfmc_unpack(struct tools_open_mfmc *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 26;
-	ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 56;
-	ptr_struct->wrp_block_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 46;
-	ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 32;
-	ptr_struct->wrp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 90;
-	ptr_struct->sub_sector_protect_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 82;
-	ptr_struct->sector_protect_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 135;
-	ptr_struct->quad_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 220;
-	ptr_struct->dummy_clock_cycles = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_mfmc_print(const struct tools_open_mfmc *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mfmc ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "wrp_block_count      : " UH_FMT "\n", ptr_struct->wrp_block_count);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "block_size           : " UH_FMT "\n", ptr_struct->block_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "wrp_en               : " UH_FMT "\n", ptr_struct->wrp_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sub_sector_protect_size : " UH_FMT "\n", ptr_struct->sub_sector_protect_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sector_protect_size  : " UH_FMT "\n", ptr_struct->sector_protect_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "quad_en              : " UH_FMT "\n", ptr_struct->quad_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dummy_clock_cycles   : " UH_FMT "\n", ptr_struct->dummy_clock_cycles);
+    return TOOLS_OPEN_MNVA_SIZE;
 }
 
-unsigned int tools_open_mfmc_size(void)
+void tools_open_mnva_dump(const struct tools_open_mnva* ptr_struct, FILE* fd)
 {
-	return TOOLS_OPEN_MFMC_SIZE;
-}
-
-void tools_open_mfmc_dump(const struct tools_open_mfmc *ptr_struct, FILE *fd)
-{
-	tools_open_mfmc_print(ptr_struct, fd, 0);
-}
-
-void tools_open_mfpa_pack(const struct tools_open_mfpa *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->fs);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->p);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->boot_address);
-	offset = 156;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->flash_num);
-	offset = 143;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sub_sector_wrp_en);
-	offset = 142;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sector_wrp_en);
-	offset = 130;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_64kb_erase_en);
-	offset = 129;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->bulk_32kb_erase_en);
-	offset = 128;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->wip);
-	offset = 168;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->jedec_id);
-	offset = 214;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->sector_size);
-	offset = 200;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_allignment);
-	offset = 192;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->block_size);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->capability_mask);
-}
-
-void tools_open_mfpa_unpack(struct tools_open_mfpa *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 26;
-	ptr_struct->fs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 23;
-	ptr_struct->p = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->boot_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 156;
-	ptr_struct->flash_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 143;
-	ptr_struct->sub_sector_wrp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 142;
-	ptr_struct->sector_wrp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 130;
-	ptr_struct->bulk_64kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 129;
-	ptr_struct->bulk_32kb_erase_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 128;
-	ptr_struct->wip = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 168;
-	ptr_struct->jedec_id = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 214;
-	ptr_struct->sector_size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 200;
-	ptr_struct->block_allignment = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 192;
-	ptr_struct->block_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 224;
-	ptr_struct->capability_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_mfpa_print(const struct tools_open_mfpa *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mfpa ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fs                   : " UH_FMT "\n", ptr_struct->fs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "p                    : " UH_FMT "\n", ptr_struct->p);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_address         : " U32H_FMT "\n", ptr_struct->boot_address);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "flash_num            : " UH_FMT "\n", ptr_struct->flash_num);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sub_sector_wrp_en    : " UH_FMT "\n", ptr_struct->sub_sector_wrp_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sector_wrp_en        : " UH_FMT "\n", ptr_struct->sector_wrp_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bulk_64kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_64kb_erase_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bulk_32kb_erase_en   : " UH_FMT "\n", ptr_struct->bulk_32kb_erase_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "wip                  : " UH_FMT "\n", ptr_struct->wip);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "jedec_id             : " UH_FMT "\n", ptr_struct->jedec_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sector_size          : " UH_FMT "\n", ptr_struct->sector_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "block_allignment     : " UH_FMT "\n", ptr_struct->block_allignment);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "block_size           : " UH_FMT "\n", ptr_struct->block_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "capability_mask      : " U32H_FMT "\n", ptr_struct->capability_mask);
+    tools_open_mnva_print(ptr_struct, fd, 0);
 }
 
-unsigned int tools_open_mfpa_size(void)
+void tools_open_mnvgn_pack(const struct tools_open_mnvgn* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->nv_pointer);
+    offset = 128;
+    tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(248, 8, i, 1248, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->nv_data[i]);
+    }
+}
+
+void tools_open_mnvgn_unpack(struct tools_open_mnvgn* ptr_struct, const u_int8_t* ptr_buff)
 {
-	return TOOLS_OPEN_MFPA_SIZE;
+    u_int32_t offset;
+    int i;
+
+    offset = 0;
+    ptr_struct->nv_pointer = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(248, 8, i, 1248, 1);
+        ptr_struct->nv_data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void tools_open_mfpa_dump(const struct tools_open_mfpa *ptr_struct, FILE *fd)
+void tools_open_mnvgn_print(const struct tools_open_mnvgn* ptr_struct, FILE* fd, int indent_level)
 {
-	tools_open_mfpa_print(ptr_struct, fd, 0);
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mnvgn ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_pointer           : " U32H_FMT "\n", ptr_struct->nv_pointer);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    for (i = 0; i < 128; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "nv_data_%03d         : " UH_FMT "\n", i, ptr_struct->nv_data[i]);
+    }
 }
 
-void tools_open_mgir_pack(const struct tools_open_mgir *ptr_struct, u_int8_t *ptr_buff)
+unsigned int tools_open_mnvgn_size(void)
 {
-	u_int32_t offset;
+    return TOOLS_OPEN_MNVGN_SIZE;
+}
 
-	offset = 0;
-	tools_open_hw_info_pack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
-	offset = 256;
-	tools_open_fw_info_pack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
-	offset = 768;
-	tools_open_sw_info_pack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
+void tools_open_mnvgn_dump(const struct tools_open_mnvgn* ptr_struct, FILE* fd)
+{
+    tools_open_mnvgn_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mgir_unpack(struct tools_open_mgir *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_mnvi_pack(const struct tools_open_mnvi* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_hw_info_unpack(&(ptr_struct->hw_info), ptr_buff + offset / 8);
-	offset = 256;
-	tools_open_fw_info_unpack(&(ptr_struct->fw_info), ptr_buff + offset / 8);
-	offset = 768;
-	tools_open_sw_info_unpack(&(ptr_struct->sw_info), ptr_buff + offset / 8);
+    offset = 0;
+    tools_open_nv_hdr_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
 }
 
-void tools_open_mgir_print(const struct tools_open_mgir *ptr_struct, FILE *fd, int indent_level)
+void tools_open_mnvi_unpack(struct tools_open_mnvi* ptr_struct, const u_int8_t* ptr_buff)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mgir ========\n");
+    u_int32_t offset;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_info:\n");
-	tools_open_hw_info_print(&(ptr_struct->hw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_info:\n");
-	tools_open_fw_info_print(&(ptr_struct->fw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sw_info:\n");
-	tools_open_sw_info_print(&(ptr_struct->sw_info), fd, indent_level + 1);
+    offset = 0;
+    tools_open_nv_hdr_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
 }
 
-unsigned int tools_open_mgir_size(void)
+void tools_open_mnvi_print(const struct tools_open_mnvi* ptr_struct, FILE* fd, int indent_level)
 {
-	return TOOLS_OPEN_MGIR_SIZE;
-}
-
-void tools_open_mgir_dump(const struct tools_open_mgir *ptr_struct, FILE *fd)
-{
-	tools_open_mgir_print(ptr_struct, fd, 0);
-}
-
-void tools_open_mgnle_pack(const struct tools_open_mgnle *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->le_pointer);
-	offset = 36;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->lost_events);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->synced_time);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->time_h);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->time_l);
-	offset = 128;
-	tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(376, 8, i, 1376, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_data[i]);
-	}
-}
-
-void tools_open_mgnle_unpack(struct tools_open_mgnle *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	ptr_struct->le_pointer = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 36;
-	ptr_struct->lost_events = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->synced_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->time_h = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->time_l = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(376, 8, i, 1376, 1);
-		ptr_struct->log_data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-}
-
-void tools_open_mgnle_print(const struct tools_open_mgnle *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mgnle ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "le_pointer           : " U32H_FMT "\n", ptr_struct->le_pointer);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lost_events          : " UH_FMT "\n", ptr_struct->lost_events);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "synced_time          : " UH_FMT "\n", ptr_struct->synced_time);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "time_h               : " U32H_FMT "\n", ptr_struct->time_h);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "time_l               : " U32H_FMT "\n", ptr_struct->time_l);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
-	for (i = 0; i < 128; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "log_data_%03d        : " UH_FMT "\n", i, ptr_struct->log_data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mnvi ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
 }
 
-unsigned int tools_open_mgnle_size(void)
+unsigned int tools_open_mnvi_size(void)
 {
-	return TOOLS_OPEN_MGNLE_SIZE;
+    return TOOLS_OPEN_MNVI_SIZE;
 }
 
-void tools_open_mgnle_dump(const struct tools_open_mgnle *ptr_struct, FILE *fd)
+void tools_open_mnvi_dump(const struct tools_open_mnvi* ptr_struct, FILE* fd)
 {
-	tools_open_mgnle_print(ptr_struct, fd, 0);
+    tools_open_mnvi_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mlock_pack(const struct tools_open_mlock *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mnvia_pack(const struct tools_open_mnvia* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->operation);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->key);
+    offset = 0;
+    tools_open_nv_hdr_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
 }
 
-void tools_open_mlock_unpack(struct tools_open_mlock *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_mnvia_unpack(struct tools_open_mnvia* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->key = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    tools_open_nv_hdr_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
 }
 
-void tools_open_mlock_print(const struct tools_open_mlock *ptr_struct, FILE *fd, int indent_level)
+void tools_open_mnvia_print(const struct tools_open_mnvia* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mlock ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mnvia ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "key                  : " U64H_FMT "\n", ptr_struct->key);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
 }
 
-unsigned int tools_open_mlock_size(void)
+unsigned int tools_open_mnvia_size(void)
+{
+    return TOOLS_OPEN_MNVIA_SIZE;
+}
+
+void tools_open_mnvia_dump(const struct tools_open_mnvia* ptr_struct, FILE* fd)
+{
+    tools_open_mnvia_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mvts_pack(const struct tools_open_mvts* ptr_struct, u_int8_t* ptr_buff)
 {
-	return TOOLS_OPEN_MLOCK_SIZE;
+    u_int32_t offset;
+
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->check_timestamp_flag);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->running_flag);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clear_all_ts_flag);
+    offset = 32;
+    tools_open_timestamp_pack(&(ptr_struct->timestamp), ptr_buff + offset / 8);
 }
 
-void tools_open_mlock_dump(const struct tools_open_mlock *ptr_struct, FILE *fd)
+void tools_open_mvts_unpack(struct tools_open_mvts* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_mlock_print(ptr_struct, fd, 0);
+    u_int32_t offset;
+
+    offset = 2;
+    ptr_struct->check_timestamp_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->running_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->clear_all_ts_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    tools_open_timestamp_unpack(&(ptr_struct->timestamp), ptr_buff + offset / 8);
 }
 
-void tools_open_mnva_pack(const struct tools_open_mnva *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mvts_print(const struct tools_open_mvts* ptr_struct, FILE* fd, int indent_level)
 {
-	u_int32_t offset;
-	int i;
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mvts ========\n");
 
-	offset = 0;
-	tools_open_nv_hdr_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(88, 8, i, 2048, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "check_timestamp_flag : " UH_FMT "\n", ptr_struct->check_timestamp_flag);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "running_flag         : " UH_FMT "\n", ptr_struct->running_flag);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clear_all_ts_flag    : " UH_FMT "\n", ptr_struct->clear_all_ts_flag);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "timestamp:\n");
+    tools_open_timestamp_print(&(ptr_struct->timestamp), fd, indent_level + 1);
 }
 
-void tools_open_mnva_unpack(struct tools_open_mnva *ptr_struct, const u_int8_t *ptr_buff)
+unsigned int tools_open_mvts_size(void)
 {
-	u_int32_t offset;
-	int i;
+    return TOOLS_OPEN_MVTS_SIZE;
+}
 
-	offset = 0;
-	tools_open_nv_hdr_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(88, 8, i, 2048, 1);
-		ptr_struct->data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+void tools_open_mvts_dump(const struct tools_open_mvts* ptr_struct, FILE* fd)
+{
+    tools_open_mvts_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mnva_print(const struct tools_open_mnva *ptr_struct, FILE *fd, int indent_level)
+void tools_open_node_info_pack(const struct tools_open_node_info* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_of_ports);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->node_type);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->class_version);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->base_version);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->system_image_guid_hi);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->system_image_guid_lo);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->node_guid_hi);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->node_guid_lo);
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->port_guid_hi);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->port_guid_lo);
+    offset = 240;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_id);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->partition_cap);
+    offset = 256;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->revision);
+    offset = 296;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->vendor_id);
+    offset = 288;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port_num);
+}
+
+void tools_open_node_info_unpack(struct tools_open_node_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	int i;
+    u_int32_t offset;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mnva ========\n");
+    offset = 24;
+    ptr_struct->num_of_ports = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->node_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 8;
+    ptr_struct->class_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->base_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->system_image_guid_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->system_image_guid_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->node_guid_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->node_guid_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 160;
+    ptr_struct->port_guid_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 192;
+    ptr_struct->port_guid_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 240;
+    ptr_struct->device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 224;
+    ptr_struct->partition_cap = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 256;
+    ptr_struct->revision = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 296;
+    ptr_struct->vendor_id = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 288;
+    ptr_struct->local_port_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+}
+
+void tools_open_node_info_print(const struct tools_open_node_info* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_node_info ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
-	for (i = 0; i < 128; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " UH_FMT "\n", i, ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_ports         : " UH_FMT "\n", ptr_struct->num_of_ports);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "node_type            : " UH_FMT "\n", ptr_struct->node_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "class_version        : " UH_FMT "\n", ptr_struct->class_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "base_version         : " UH_FMT "\n", ptr_struct->base_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "system_image_guid_hi : " U32H_FMT "\n", ptr_struct->system_image_guid_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "system_image_guid_lo : " U32H_FMT "\n", ptr_struct->system_image_guid_lo);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "node_guid_hi         : " U32H_FMT "\n", ptr_struct->node_guid_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "node_guid_lo         : " U32H_FMT "\n", ptr_struct->node_guid_lo);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_guid_hi         : " U32H_FMT "\n", ptr_struct->port_guid_hi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_guid_lo         : " U32H_FMT "\n", ptr_struct->port_guid_lo);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "device_id            : " UH_FMT "\n", ptr_struct->device_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "partition_cap        : " UH_FMT "\n", ptr_struct->partition_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "revision             : " U32H_FMT "\n", ptr_struct->revision);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vendor_id            : " UH_FMT "\n", ptr_struct->vendor_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "local_port_num       : " UH_FMT "\n", ptr_struct->local_port_num);
 }
 
-unsigned int tools_open_mnva_size(void)
+unsigned int tools_open_node_info_size(void)
 {
-	return TOOLS_OPEN_MNVA_SIZE;
+    return TOOLS_OPEN_NODE_INFO_SIZE;
 }
 
-void tools_open_mnva_dump(const struct tools_open_mnva *ptr_struct, FILE *fd)
+void tools_open_node_info_dump(const struct tools_open_node_info* ptr_struct, FILE* fd)
 {
-	tools_open_mnva_print(ptr_struct, fd, 0);
+    tools_open_node_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mnvgn_pack(const struct tools_open_mnvgn *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_nvda_pack(const struct tools_open_nvda* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->nv_pointer);
-	offset = 128;
-	tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(248, 8, i, 1248, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->nv_data[i]);
-	}
+    offset = 0;
+    tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(120, 8, i, 2144, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void tools_open_mnvgn_unpack(struct tools_open_mnvgn *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_nvda_unpack(struct tools_open_nvda* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	ptr_struct->nv_pointer = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(248, 8, i, 1248, 1);
-		ptr_struct->nv_data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+    offset = 0;
+    tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(120, 8, i, 2144, 1);
+        ptr_struct->data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void tools_open_mnvgn_print(const struct tools_open_mnvgn *ptr_struct, FILE *fd, int indent_level)
+void tools_open_nvda_print(const struct tools_open_nvda* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mnvgn ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nvda ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_pointer           : " U32H_FMT "\n", ptr_struct->nv_pointer);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
-	for (i = 0; i < 128; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "nv_data_%03d         : " UH_FMT "\n", i, ptr_struct->nv_data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    for (i = 0; i < 256; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " UH_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
-unsigned int tools_open_mnvgn_size(void)
+unsigned int tools_open_nvda_size(void)
+{
+    return TOOLS_OPEN_NVDA_SIZE;
+}
+
+void tools_open_nvda_dump(const struct tools_open_nvda* ptr_struct, FILE* fd)
+{
+    tools_open_nvda_print(ptr_struct, fd, 0);
+}
+
+void tools_open_nvdi_pack(const struct tools_open_nvdi* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+}
+
+void tools_open_nvdi_unpack(struct tools_open_nvdi* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+}
+
+void tools_open_nvdi_print(const struct tools_open_nvdi* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nvdi ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_hdr:\n");
+    tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+}
+
+unsigned int tools_open_nvdi_size(void)
+{
+    return TOOLS_OPEN_NVDI_SIZE;
+}
+
+void tools_open_nvdi_dump(const struct tools_open_nvdi* ptr_struct, FILE* fd)
+{
+    tools_open_nvdi_print(ptr_struct, fd, 0);
+}
+
+void tools_open_nvia_pack(const struct tools_open_nvia* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->target);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->writer_id);
+}
+
+void tools_open_nvia_unpack(struct tools_open_nvia* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 29;
+    ptr_struct->target = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 23;
+    ptr_struct->writer_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+}
+
+void tools_open_nvia_print(const struct tools_open_nvia* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nvia ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "target               : " UH_FMT "\n", ptr_struct->target);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "writer_id            : " UH_FMT "\n", ptr_struct->writer_id);
+}
+
+unsigned int tools_open_nvia_size(void)
+{
+    return TOOLS_OPEN_NVIA_SIZE;
+}
+
+void tools_open_nvia_dump(const struct tools_open_nvia* ptr_struct, FILE* fd)
+{
+    tools_open_nvia_print(ptr_struct, fd, 0);
+}
+
+void tools_open_nvqc_pack(const struct tools_open_nvqc* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_tlv_type_pack(&(ptr_struct->type), ptr_buff + offset / 8);
+    offset = 63;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->support_rd);
+    offset = 62;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->support_wr);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
+}
+
+void tools_open_nvqc_unpack(struct tools_open_nvqc* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 0;
+    tools_open_tlv_type_unpack(&(ptr_struct->type), ptr_buff + offset / 8);
+    offset = 63;
+    ptr_struct->support_rd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 62;
+    ptr_struct->support_wr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 56;
+    ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_nvqc_print(const struct tools_open_nvqc* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nvqc ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type:\n");
+    tools_open_tlv_type_print(&(ptr_struct->type), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "support_rd           : " UH_FMT "\n", ptr_struct->support_rd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "support_wr           : " UH_FMT "\n", ptr_struct->support_wr);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+}
+
+unsigned int tools_open_nvqc_size(void)
+{
+    return TOOLS_OPEN_NVQC_SIZE;
+}
+
+void tools_open_nvqc_dump(const struct tools_open_nvqc* ptr_struct, FILE* fd)
+{
+    tools_open_nvqc_print(ptr_struct, fd, 0);
+}
+
+void tools_open_nvqgc_pack(const struct tools_open_nvqgc* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->read_factory_settings_support);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nvda_read_current_settings);
+}
+
+void tools_open_nvqgc_unpack(struct tools_open_nvqgc* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 31;
+    ptr_struct->read_factory_settings_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->nvda_read_current_settings = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void tools_open_nvqgc_print(const struct tools_open_nvqgc* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nvqgc ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "read_factory_settings_support : " UH_FMT "\n", ptr_struct->read_factory_settings_support);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nvda_read_current_settings : " UH_FMT "\n", ptr_struct->nvda_read_current_settings);
+}
+
+unsigned int tools_open_nvqgc_size(void)
+{
+    return TOOLS_OPEN_NVQGC_SIZE;
+}
+
+void tools_open_nvqgc_dump(const struct tools_open_nvqgc* ptr_struct, FILE* fd)
+{
+    tools_open_nvqgc_print(ptr_struct, fd, 0);
+}
+
+void tools_open_pmdic_pack(const struct tools_open_pmdic* ptr_struct, u_int8_t* ptr_buff)
 {
-	return TOOLS_OPEN_MNVGN_SIZE;
+    u_int32_t offset;
+
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->operation_cap);
+    offset = 38;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->clause);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->mdio_preset);
+    offset = 88;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->misc_cap);
+}
+
+void tools_open_pmdic_unpack(struct tools_open_pmdic* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    ptr_struct->local_port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->operation_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 38;
+    ptr_struct->clause = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 32;
+    ptr_struct->mdio_preset = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 88;
+    ptr_struct->misc_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_mnvgn_dump(const struct tools_open_mnvgn *ptr_struct, FILE *fd)
+void tools_open_pmdic_print(const struct tools_open_pmdic* ptr_struct, FILE* fd, int indent_level)
 {
-	tools_open_mnvgn_print(ptr_struct, fd, 0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_pmdic ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "local_port           : " UH_FMT "\n", ptr_struct->local_port);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "operation_cap        : " UH_FMT "\n", ptr_struct->operation_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clause               : " UH_FMT "\n", ptr_struct->clause);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mdio_preset          : " UH_FMT "\n", ptr_struct->mdio_preset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "misc_cap             : " UH_FMT "\n", ptr_struct->misc_cap);
 }
 
-void tools_open_mnvi_pack(const struct tools_open_mnvi *ptr_struct, u_int8_t *ptr_buff)
+unsigned int tools_open_pmdic_size(void)
 {
-	u_int32_t offset;
+    return TOOLS_OPEN_PMDIC_SIZE;
+}
 
-	offset = 0;
-	tools_open_nv_hdr_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+void tools_open_pmdic_dump(const struct tools_open_pmdic* ptr_struct, FILE* fd)
+{
+    tools_open_pmdic_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mnvi_unpack(struct tools_open_mnvi *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_pmdio_pack(const struct tools_open_pmdio* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+    int i;
+
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->operation);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->clause);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lock);
+    offset = 59;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->reg_adr_mmd);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->last_op_idx);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_ops_done);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(64, 32, i, 2112, 1);
+        tools_open_pmdio_addr_data_pack(&(ptr_struct->mdio_trans[i]), ptr_buff + offset / 8);
+    }
+}
+
+void tools_open_pmdio_unpack(struct tools_open_pmdio* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	tools_open_nv_hdr_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    offset = 29;
+    ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 22;
+    ptr_struct->clause = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 8;
+    ptr_struct->local_port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->lock = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 59;
+    ptr_struct->reg_adr_mmd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 48;
+    ptr_struct->last_op_idx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 40;
+    ptr_struct->num_ops_done = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(64, 32, i, 2112, 1);
+        tools_open_pmdio_addr_data_unpack(&(ptr_struct->mdio_trans[i]), ptr_buff + offset / 8);
+    }
 }
 
-void tools_open_mnvi_print(const struct tools_open_mnvi *ptr_struct, FILE *fd, int indent_level)
+void tools_open_pmdio_print(const struct tools_open_pmdio* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mnvi ========\n");
+    int i;
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_pmdio ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clause               : " UH_FMT "\n", ptr_struct->clause);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "local_port           : " UH_FMT "\n", ptr_struct->local_port);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lock                 : " UH_FMT "\n", ptr_struct->lock);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reg_adr_mmd          : " UH_FMT "\n", ptr_struct->reg_adr_mmd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "last_op_idx          : " UH_FMT "\n", ptr_struct->last_op_idx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_ops_done         : " UH_FMT "\n", ptr_struct->num_ops_done);
+    for (i = 0; i < 64; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "mdio_trans_%03d:\n", i);
+        tools_open_pmdio_addr_data_print(&(ptr_struct->mdio_trans[i]), fd, indent_level + 1);
+    }
 }
 
-unsigned int tools_open_mnvi_size(void)
+unsigned int tools_open_pmdio_size(void)
 {
-	return TOOLS_OPEN_MNVI_SIZE;
+    return TOOLS_OPEN_PMDIO_SIZE;
 }
 
-void tools_open_mnvi_dump(const struct tools_open_mnvi *ptr_struct, FILE *fd)
+void tools_open_pmdio_dump(const struct tools_open_pmdio* ptr_struct, FILE* fd)
 {
-	tools_open_mnvi_print(ptr_struct, fd, 0);
+    tools_open_pmdio_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mnvia_pack(const struct tools_open_mnvia *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 0;
-	tools_open_nv_hdr_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    tools_open_capability_mask_smp_pack(&(ptr_struct->capability_mask_smp), ptr_buff);
 }
 
-void tools_open_mnvia_unpack(struct tools_open_mnvia *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 0;
-	tools_open_nv_hdr_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    tools_open_capability_mask_smp_unpack(&(ptr_struct->capability_mask_smp), ptr_buff);
 }
 
-void tools_open_mnvia_print(const struct tools_open_mnvia *ptr_struct, FILE *fd, int indent_level)
+void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mnvia ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_smp_vsp_general_info ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hw_info:\n");
+    tools_open_hw_info_print(&(ptr_struct->hw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_info:\n");
+    tools_open_fw_info_print(&(ptr_struct->fw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sw_info:\n");
+    tools_open_sw_info_print(&(ptr_struct->sw_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "capability_mask_smp:\n");
+    tools_open_capability_mask_smp_print(&(ptr_struct->capability_mask_smp), fd, indent_level + 1);
 }
 
-unsigned int tools_open_mnvia_size(void)
+unsigned int tools_open_smp_vsp_general_info_size(void)
 {
-	return TOOLS_OPEN_MNVIA_SIZE;
+    return TOOLS_OPEN_SMP_VSP_GENERAL_INFO_SIZE;
 }
 
-void tools_open_mnvia_dump(const struct tools_open_mnvia *ptr_struct, FILE *fd)
+void tools_open_smp_vsp_general_info_dump(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd)
 {
-	tools_open_mnvia_print(ptr_struct, fd, 0);
+    tools_open_smp_vsp_general_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mvts_pack(const struct tools_open_mvts *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_aux_data_hdr_pack(const struct tools_open_aux_data_hdr* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->check_timestamp_flag);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->running_flag);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clear_all_ts_flag);
-	offset = 32;
-	tools_open_timestamp_pack(&(ptr_struct->timestamp), ptr_buff + offset / 8);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
 }
 
-void tools_open_mvts_unpack(struct tools_open_mvts *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_aux_data_hdr_unpack(struct tools_open_aux_data_hdr* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 2;
-	ptr_struct->check_timestamp_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->running_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->clear_all_ts_flag = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	tools_open_timestamp_unpack(&(ptr_struct->timestamp), ptr_buff + offset / 8);
+    offset = 0;
+    ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_mvts_print(const struct tools_open_mvts *ptr_struct, FILE *fd, int indent_level)
+void tools_open_aux_data_hdr_print(const struct tools_open_aux_data_hdr* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mvts ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "check_timestamp_flag : " UH_FMT "\n", ptr_struct->check_timestamp_flag);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "running_flag         : " UH_FMT "\n", ptr_struct->running_flag);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clear_all_ts_flag    : " UH_FMT "\n", ptr_struct->clear_all_ts_flag);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "timestamp:\n");
-	tools_open_timestamp_print(&(ptr_struct->timestamp), fd, indent_level + 1);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_aux_data_hdr ========\n");
 
-unsigned int tools_open_mvts_size(void)
-{
-	return TOOLS_OPEN_MVTS_SIZE;
-}
-
-void tools_open_mvts_dump(const struct tools_open_mvts *ptr_struct, FILE *fd)
-{
-	tools_open_mvts_print(ptr_struct, fd, 0);
-}
-
-void tools_open_node_info_pack(const struct tools_open_node_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_of_ports);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->node_type);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->class_version);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->base_version);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->system_image_guid_hi);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->system_image_guid_lo);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->node_guid_hi);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->node_guid_lo);
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->port_guid_hi);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->port_guid_lo);
-	offset = 240;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->device_id);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->partition_cap);
-	offset = 256;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->revision);
-	offset = 296;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->vendor_id);
-	offset = 288;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port_num);
-}
-
-void tools_open_node_info_unpack(struct tools_open_node_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->num_of_ports = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->node_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 8;
-	ptr_struct->class_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->base_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->system_image_guid_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->system_image_guid_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->node_guid_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->node_guid_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 160;
-	ptr_struct->port_guid_hi = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 192;
-	ptr_struct->port_guid_lo = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 240;
-	ptr_struct->device_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 224;
-	ptr_struct->partition_cap = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 256;
-	ptr_struct->revision = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 296;
-	ptr_struct->vendor_id = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 288;
-	ptr_struct->local_port_num = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-}
-
-void tools_open_node_info_print(const struct tools_open_node_info *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_node_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_ports         : " UH_FMT "\n", ptr_struct->num_of_ports);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "node_type            : " UH_FMT "\n", ptr_struct->node_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "class_version        : " UH_FMT "\n", ptr_struct->class_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "base_version         : " UH_FMT "\n", ptr_struct->base_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "system_image_guid_hi : " U32H_FMT "\n", ptr_struct->system_image_guid_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "system_image_guid_lo : " U32H_FMT "\n", ptr_struct->system_image_guid_lo);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "node_guid_hi         : " U32H_FMT "\n", ptr_struct->node_guid_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "node_guid_lo         : " U32H_FMT "\n", ptr_struct->node_guid_lo);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_guid_hi         : " U32H_FMT "\n", ptr_struct->port_guid_hi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_guid_lo         : " U32H_FMT "\n", ptr_struct->port_guid_lo);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "device_id            : " UH_FMT "\n", ptr_struct->device_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "partition_cap        : " UH_FMT "\n", ptr_struct->partition_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "revision             : " U32H_FMT "\n", ptr_struct->revision);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vendor_id            : " UH_FMT "\n", ptr_struct->vendor_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "local_port_num       : " UH_FMT "\n", ptr_struct->local_port_num);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
 }
 
-unsigned int tools_open_node_info_size(void)
+unsigned int tools_open_aux_data_hdr_size(void)
 {
-	return TOOLS_OPEN_NODE_INFO_SIZE;
+    return TOOLS_OPEN_AUX_DATA_HDR_SIZE;
 }
 
-void tools_open_node_info_dump(const struct tools_open_node_info *ptr_struct, FILE *fd)
+void tools_open_aux_data_hdr_dump(const struct tools_open_aux_data_hdr* ptr_struct, FILE* fd)
 {
-	tools_open_node_info_print(ptr_struct, fd, 0);
+    tools_open_aux_data_hdr_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nvda_pack(const struct tools_open_nvda *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_aux_tlv_pack(const struct tools_open_aux_tlv* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(120, 8, i, 2144, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->data[i]);
-	}
+    offset = 0;
+    tools_open_aux_tlv_header_pack(&(ptr_struct->aux_tlv_header), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(184, 8, i, 2048, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->data[i]);
+    }
 }
 
-void tools_open_nvda_unpack(struct tools_open_nvda *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_aux_tlv_unpack(struct tools_open_aux_tlv* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 0;
-	tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(120, 8, i, 2144, 1);
-		ptr_struct->data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+    offset = 0;
+    tools_open_aux_tlv_header_unpack(&(ptr_struct->aux_tlv_header), ptr_buff + offset / 8);
+    for (i = 0; i < 128; ++i)
+    {
+        offset = adb2c_calc_array_field_address(184, 8, i, 2048, 1);
+        ptr_struct->data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void tools_open_nvda_print(const struct tools_open_nvda *ptr_struct, FILE *fd, int indent_level)
+void tools_open_aux_tlv_print(const struct tools_open_aux_tlv* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nvda ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_aux_tlv ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
-	for (i = 0; i < 256; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " UH_FMT "\n", i, ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "aux_tlv_header:\n");
+    tools_open_aux_tlv_header_print(&(ptr_struct->aux_tlv_header), fd, indent_level + 1);
+    for (i = 0; i < 128; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "data_%03d            : " UH_FMT "\n", i, ptr_struct->data[i]);
+    }
 }
 
-unsigned int tools_open_nvda_size(void)
+unsigned int tools_open_aux_tlv_size(void)
 {
-	return TOOLS_OPEN_NVDA_SIZE;
+    return TOOLS_OPEN_AUX_TLV_SIZE;
 }
 
-void tools_open_nvda_dump(const struct tools_open_nvda *ptr_struct, FILE *fd)
+void tools_open_aux_tlv_dump(const struct tools_open_aux_tlv* ptr_struct, FILE* fd)
 {
-	tools_open_nvda_print(ptr_struct, fd, 0);
+    tools_open_aux_tlv_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nvdi_pack(const struct tools_open_nvdi *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_bar_size_pack(const struct tools_open_bar_size* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_nv_hdr_fifth_gen_pack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->log_uar_bar_size);
 }
 
-void tools_open_nvdi_unpack(struct tools_open_nvdi *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_bar_size_unpack(struct tools_open_bar_size* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_nv_hdr_fifth_gen_unpack(&(ptr_struct->nv_hdr), ptr_buff + offset / 8);
+    offset = 0;
+    ptr_struct->log_uar_bar_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_nvdi_print(const struct tools_open_nvdi *ptr_struct, FILE *fd, int indent_level)
+void tools_open_bar_size_print(const struct tools_open_bar_size* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nvdi ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_bar_size ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_hdr:\n");
-	tools_open_nv_hdr_fifth_gen_print(&(ptr_struct->nv_hdr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_uar_bar_size     : " U32H_FMT "\n", ptr_struct->log_uar_bar_size);
 }
 
-unsigned int tools_open_nvdi_size(void)
+unsigned int tools_open_bar_size_size(void)
 {
-	return TOOLS_OPEN_NVDI_SIZE;
+    return TOOLS_OPEN_BAR_SIZE_SIZE;
 }
 
-void tools_open_nvdi_dump(const struct tools_open_nvdi *ptr_struct, FILE *fd)
+void tools_open_bar_size_dump(const struct tools_open_bar_size* ptr_struct, FILE* fd)
 {
-	tools_open_nvdi_print(ptr_struct, fd, 0);
+    tools_open_bar_size_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nvia_pack(const struct tools_open_nvia *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_boot_settings_pack(const struct tools_open_boot_settings* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->target);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->writer_id);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->boot_vlan);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->legacy_boot_protocol);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->boot_retry_conut);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_vlan_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_option_rom_en);
 }
 
-void tools_open_nvia_unpack(struct tools_open_nvia *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_boot_settings_unpack(struct tools_open_boot_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 29;
-	ptr_struct->target = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 23;
-	ptr_struct->writer_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 20;
+    ptr_struct->boot_vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 8;
+    ptr_struct->legacy_boot_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 5;
+    ptr_struct->boot_retry_conut = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 1;
+    ptr_struct->boot_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_nvia_print(const struct tools_open_nvia *ptr_struct, FILE *fd, int indent_level)
+void tools_open_boot_settings_print(const struct tools_open_boot_settings* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nvia ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_boot_settings ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "target               : " UH_FMT "\n", ptr_struct->target);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "writer_id            : " UH_FMT "\n", ptr_struct->writer_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_vlan            : " UH_FMT "\n", ptr_struct->boot_vlan);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "legacy_boot_protocol : " UH_FMT "\n", ptr_struct->legacy_boot_protocol);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_retry_conut     : " UH_FMT "\n", ptr_struct->boot_retry_conut);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_vlan_en         : " UH_FMT "\n", ptr_struct->boot_vlan_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_option_rom_en   : " UH_FMT "\n", ptr_struct->boot_option_rom_en);
 }
 
-unsigned int tools_open_nvia_size(void)
+unsigned int tools_open_boot_settings_size(void)
 {
-	return TOOLS_OPEN_NVIA_SIZE;
+    return TOOLS_OPEN_BOOT_SETTINGS_SIZE;
 }
 
-void tools_open_nvia_dump(const struct tools_open_nvia *ptr_struct, FILE *fd)
+void tools_open_boot_settings_dump(const struct tools_open_boot_settings* ptr_struct, FILE* fd)
 {
-	tools_open_nvia_print(ptr_struct, fd, 0);
+    tools_open_boot_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nvqc_pack(const struct tools_open_nvqc *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_boot_settings_ext_pack(const struct tools_open_boot_settings_ext* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_tlv_type_pack(&(ptr_struct->type), ptr_buff + offset / 8);
-	offset = 63;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->support_rd);
-	offset = 62;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->support_wr);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->version);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->ip_ver);
 }
 
-void tools_open_nvqc_unpack(struct tools_open_nvqc *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	tools_open_tlv_type_unpack(&(ptr_struct->type), ptr_buff + offset / 8);
-	offset = 63;
-	ptr_struct->support_rd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 62;
-	ptr_struct->support_wr = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 56;
-	ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 22;
+    ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void tools_open_nvqc_print(const struct tools_open_nvqc *ptr_struct, FILE *fd, int indent_level)
+void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nvqc ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_boot_settings_ext ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type:\n");
-	tools_open_tlv_type_print(&(ptr_struct->type), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "support_rd           : " UH_FMT "\n", ptr_struct->support_rd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "support_wr           : " UH_FMT "\n", ptr_struct->support_wr);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ip_ver               : " UH_FMT "\n", ptr_struct->ip_ver);
 }
 
-unsigned int tools_open_nvqc_size(void)
+unsigned int tools_open_boot_settings_ext_size(void)
 {
-	return TOOLS_OPEN_NVQC_SIZE;
+    return TOOLS_OPEN_BOOT_SETTINGS_EXT_SIZE;
 }
 
-void tools_open_nvqc_dump(const struct tools_open_nvqc *ptr_struct, FILE *fd)
+void tools_open_boot_settings_ext_dump(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd)
 {
-	tools_open_nvqc_print(ptr_struct, fd, 0);
+    tools_open_boot_settings_ext_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nvqgc_pack(const struct tools_open_nvqgc *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_common_header_pack(const struct tools_open_common_header* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->read_factory_settings_support);
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nvda_read_current_settings);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->length);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version);
 }
 
-void tools_open_nvqgc_unpack(struct tools_open_nvqgc *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_common_header_unpack(struct tools_open_common_header* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	ptr_struct->read_factory_settings_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 30;
-	ptr_struct->nvda_read_current_settings = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_nvqgc_print(const struct tools_open_nvqgc *ptr_struct, FILE *fd, int indent_level)
+void tools_open_common_header_print(const struct tools_open_common_header* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nvqgc ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_common_header ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "read_factory_settings_support : " UH_FMT "\n", ptr_struct->read_factory_settings_support);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nvda_read_current_settings : " UH_FMT "\n", ptr_struct->nvda_read_current_settings);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "length               : " UH_FMT "\n", ptr_struct->length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
 }
 
-unsigned int tools_open_nvqgc_size(void)
+unsigned int tools_open_common_header_size(void)
 {
-	return TOOLS_OPEN_NVQGC_SIZE;
+    return TOOLS_OPEN_COMMON_HEADER_SIZE;
 }
 
-void tools_open_nvqgc_dump(const struct tools_open_nvqgc *ptr_struct, FILE *fd)
+void tools_open_common_header_dump(const struct tools_open_common_header* ptr_struct, FILE* fd)
 {
-	tools_open_nvqgc_print(ptr_struct, fd, 0);
+    tools_open_common_header_print(ptr_struct, fd, 0);
 }
 
-void tools_open_pmdic_pack(const struct tools_open_pmdic *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->operation_cap);
-	offset = 38;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->clause);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->mdio_preset);
-	offset = 88;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->misc_cap);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->identifier);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pldm_classification);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_offset_h);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_offset_l);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->size);
 }
 
-void tools_open_pmdic_unpack(struct tools_open_pmdic *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 8;
-	ptr_struct->local_port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 56;
-	ptr_struct->operation_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 38;
-	ptr_struct->clause = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 32;
-	ptr_struct->mdio_preset = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 88;
-	ptr_struct->misc_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->identifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->pldm_classification = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->cb_offset_h = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->cb_offset_l = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_pmdic_print(const struct tools_open_pmdic *ptr_struct, FILE *fd, int indent_level)
+void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_pmdic ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_component_desciptor ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "local_port           : " UH_FMT "\n", ptr_struct->local_port);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "operation_cap        : " UH_FMT "\n", ptr_struct->operation_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clause               : " UH_FMT "\n", ptr_struct->clause);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mdio_preset          : " UH_FMT "\n", ptr_struct->mdio_preset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "misc_cap             : " UH_FMT "\n", ptr_struct->misc_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "identifier           : " UH_FMT "\n", ptr_struct->identifier);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pldm_classification  : " UH_FMT "\n", ptr_struct->pldm_classification);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_offset_h          : " U32H_FMT "\n", ptr_struct->cb_offset_h);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_offset_l          : " U32H_FMT "\n", ptr_struct->cb_offset_l);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " U32H_FMT "\n", ptr_struct->size);
 }
 
-unsigned int tools_open_pmdic_size(void)
+unsigned int tools_open_component_desciptor_size(void)
 {
-	return TOOLS_OPEN_PMDIC_SIZE;
-}
-
-void tools_open_pmdic_dump(const struct tools_open_pmdic *ptr_struct, FILE *fd)
-{
-	tools_open_pmdic_print(ptr_struct, fd, 0);
-}
-
-void tools_open_pmdio_pack(const struct tools_open_pmdio *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->operation);
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->clause);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->local_port);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lock);
-	offset = 59;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->reg_adr_mmd);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->last_op_idx);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_ops_done);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(64, 32, i, 2112, 1);
-		tools_open_pmdio_addr_data_pack(&(ptr_struct->mdio_trans[i]), ptr_buff + offset / 8);
-	}
-}
-
-void tools_open_pmdio_unpack(struct tools_open_pmdio *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 29;
-	ptr_struct->operation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 22;
-	ptr_struct->clause = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 8;
-	ptr_struct->local_port = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->lock = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 59;
-	ptr_struct->reg_adr_mmd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 48;
-	ptr_struct->last_op_idx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 40;
-	ptr_struct->num_ops_done = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(64, 32, i, 2112, 1);
-		tools_open_pmdio_addr_data_unpack(&(ptr_struct->mdio_trans[i]), ptr_buff + offset / 8);
-	}
-}
-
-void tools_open_pmdio_print(const struct tools_open_pmdio *ptr_struct, FILE *fd, int indent_level)
-{
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_pmdio ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "operation            : " UH_FMT "\n", ptr_struct->operation);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clause               : " UH_FMT "\n", ptr_struct->clause);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "local_port           : " UH_FMT "\n", ptr_struct->local_port);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lock                 : " UH_FMT "\n", ptr_struct->lock);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reg_adr_mmd          : " UH_FMT "\n", ptr_struct->reg_adr_mmd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "last_op_idx          : " UH_FMT "\n", ptr_struct->last_op_idx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_ops_done         : " UH_FMT "\n", ptr_struct->num_ops_done);
-	for (i = 0; i < 64; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "mdio_trans_%03d:\n", i);
-		tools_open_pmdio_addr_data_print(&(ptr_struct->mdio_trans[i]), fd, indent_level + 1);
-	}
+    return TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE;
 }
 
-unsigned int tools_open_pmdio_size(void)
+void tools_open_component_desciptor_dump(const struct tools_open_component_desciptor* ptr_struct, FILE* fd)
 {
-	return TOOLS_OPEN_PMDIO_SIZE;
+    tools_open_component_desciptor_print(ptr_struct, fd, 0);
 }
 
-void tools_open_pmdio_dump(const struct tools_open_pmdio *ptr_struct, FILE *fd)
+void tools_open_component_ptr_pack(const struct tools_open_component_ptr* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_pmdio_print(ptr_struct, fd, 0);
-}
+    u_int32_t offset;
 
-void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	tools_open_capability_mask_smp_pack(&(ptr_struct->capability_mask_smp), ptr_buff);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->storage_id);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->storage_address);
 }
 
-void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_component_ptr_unpack(struct tools_open_component_ptr* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_capability_mask_smp_unpack(&(ptr_struct->capability_mask_smp), ptr_buff);
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->storage_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->storage_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info *ptr_struct, FILE *fd, int indent_level)
+void tools_open_component_ptr_print(const struct tools_open_component_ptr* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_smp_vsp_general_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_component_ptr ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hw_info:\n");
-	tools_open_hw_info_print(&(ptr_struct->hw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_info:\n");
-	tools_open_fw_info_print(&(ptr_struct->fw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sw_info:\n");
-	tools_open_sw_info_print(&(ptr_struct->sw_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "capability_mask_smp:\n");
-	tools_open_capability_mask_smp_print(&(ptr_struct->capability_mask_smp), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "storage_id           : " UH_FMT "\n", ptr_struct->storage_id);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "storage_address      : " U32H_FMT "\n", ptr_struct->storage_address);
 }
 
-unsigned int tools_open_smp_vsp_general_info_size(void)
+unsigned int tools_open_component_ptr_size(void)
 {
-	return TOOLS_OPEN_SMP_VSP_GENERAL_INFO_SIZE;
+    return TOOLS_OPEN_COMPONENT_PTR_SIZE;
 }
 
-void tools_open_smp_vsp_general_info_dump(const union tools_open_smp_vsp_general_info *ptr_struct, FILE *fd)
+void tools_open_component_ptr_dump(const struct tools_open_component_ptr* ptr_struct, FILE* fd)
 {
-	tools_open_smp_vsp_general_info_print(ptr_struct, fd, 0);
+    tools_open_component_ptr_print(ptr_struct, fd, 0);
 }
 
-void tools_open_aux_data_hdr_pack(const struct tools_open_aux_data_hdr *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_external_port_pack(const struct tools_open_external_port* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature0);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature1);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature2);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->signature3);
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->port_owner);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->allow_rd_counters);
 }
 
-void tools_open_aux_data_hdr_unpack(struct tools_open_aux_data_hdr *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_external_port_unpack(struct tools_open_external_port* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->signature0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->signature1 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->signature2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->signature3 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 31;
+    ptr_struct->port_owner = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->allow_rd_counters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_aux_data_hdr_print(const struct tools_open_aux_data_hdr *ptr_struct, FILE *fd, int indent_level)
+void tools_open_external_port_print(const struct tools_open_external_port* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_aux_data_hdr ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_external_port ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature0           : " U32H_FMT "\n", ptr_struct->signature0);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature1           : " U32H_FMT "\n", ptr_struct->signature1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature2           : " U32H_FMT "\n", ptr_struct->signature2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "signature3           : " U32H_FMT "\n", ptr_struct->signature3);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_owner           : " UH_FMT "\n", ptr_struct->port_owner);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "allow_rd_counters    : " UH_FMT "\n", ptr_struct->allow_rd_counters);
 }
 
-unsigned int tools_open_aux_data_hdr_size(void)
+unsigned int tools_open_external_port_size(void)
 {
-	return TOOLS_OPEN_AUX_DATA_HDR_SIZE;
+    return TOOLS_OPEN_EXTERNAL_PORT_SIZE;
 }
 
-void tools_open_aux_data_hdr_dump(const struct tools_open_aux_data_hdr *ptr_struct, FILE *fd)
+void tools_open_external_port_dump(const struct tools_open_external_port* ptr_struct, FILE* fd)
 {
-	tools_open_aux_data_hdr_print(ptr_struct, fd, 0);
+    tools_open_external_port_print(ptr_struct, fd, 0);
 }
 
-void tools_open_aux_tlv_pack(const struct tools_open_aux_tlv *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_image_info_pack(const struct tools_open_image_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	tools_open_aux_tlv_header_pack(&(ptr_struct->aux_tlv_header), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(184, 8, i, 2048, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->data[i]);
-	}
-}
+    u_int32_t offset;
+    int i;
 
-void tools_open_aux_tlv_unpack(struct tools_open_aux_tlv *ptr_struct, const u_int8_t *ptr_buff)
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
+    }
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
+    }
+    for (i = 0; i < 96; ++i)
+    {
+        offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
+    }
+}
+
+void tools_open_image_info_unpack(struct tools_open_image_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
-
-	offset = 0;
-	tools_open_aux_tlv_header_unpack(&(ptr_struct->aux_tlv_header), ptr_buff + offset / 8);
-	for (i = 0; i < 128; ++i) {
-		offset = adb2c_calc_array_field_address(184, 8, i, 2048, 1);
-		ptr_struct->data[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-}
+    u_int32_t offset;
+    int i;
 
-void tools_open_aux_tlv_print(const struct tools_open_aux_tlv *ptr_struct, FILE *fd, int indent_level)
+    offset = 8;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->psid[16] = '\0';
+    for (i = 0; i < 256; ++i)
+    {
+        offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
+        ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->description[256] = '\0';
+    for (i = 0; i < 64; ++i)
+    {
+        offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
+        ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->name[64] = '\0';
+    for (i = 0; i < 96; ++i)
+    {
+        offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
+        ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->prs_name[96] = '\0';
+}
+
+void tools_open_image_info_print(const struct tools_open_image_info* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_aux_tlv ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_image_info ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "aux_tlv_header:\n");
-	tools_open_aux_tlv_header_print(&(ptr_struct->aux_tlv_header), fd, indent_level + 1);
-	for (i = 0; i < 128; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "data_%03d            : " UH_FMT "\n", i, ptr_struct->data[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
+    fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
+    fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
 }
 
-unsigned int tools_open_aux_tlv_size(void)
+unsigned int tools_open_image_info_size(void)
 {
-	return TOOLS_OPEN_AUX_TLV_SIZE;
+    return TOOLS_OPEN_IMAGE_INFO_SIZE;
 }
 
-void tools_open_aux_tlv_dump(const struct tools_open_aux_tlv *ptr_struct, FILE *fd)
+void tools_open_image_info_dump(const struct tools_open_image_info* ptr_struct, FILE* fd)
 {
-	tools_open_aux_tlv_print(ptr_struct, fd, 0);
+    tools_open_image_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_bar_size_pack(const struct tools_open_bar_size *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                              u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->log_uar_bar_size);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->boot_pkey);
 }
 
-void tools_open_bar_size_unpack(struct tools_open_bar_size *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->log_uar_bar_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 16;
+    ptr_struct->boot_pkey = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_bar_size_print(const struct tools_open_bar_size *ptr_struct, FILE *fd, int indent_level)
+void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_bar_size ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_infiniband_boot_settings ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_uar_bar_size     : " U32H_FMT "\n", ptr_struct->log_uar_bar_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_pkey            : " UH_FMT "\n", ptr_struct->boot_pkey);
 }
 
-unsigned int tools_open_bar_size_size(void)
+unsigned int tools_open_infiniband_boot_settings_size(void)
 {
-	return TOOLS_OPEN_BAR_SIZE_SIZE;
+    return TOOLS_OPEN_INFINIBAND_BOOT_SETTINGS_SIZE;
 }
 
-void tools_open_bar_size_dump(const struct tools_open_bar_size *ptr_struct, FILE *fd)
+void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd)
 {
-	tools_open_bar_size_print(ptr_struct, fd, 0);
+    tools_open_infiniband_boot_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_boot_settings_pack(const struct tools_open_boot_settings *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->boot_vlan);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->legacy_boot_protocol);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->boot_retry_conut);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_vlan_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_option_rom_en);
+    offset = 0;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->min_log_dcr_hash_table_size);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_log_dcr_hash_table_size);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->min_dcr_lifo_size);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_dcr_lifo_size);
 }
 
-void tools_open_boot_settings_unpack(struct tools_open_boot_settings *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                  const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 20;
-	ptr_struct->boot_vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 8;
-	ptr_struct->legacy_boot_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 5;
-	ptr_struct->boot_retry_conut = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 1;
-	ptr_struct->boot_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->min_log_dcr_hash_table_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 32;
+    ptr_struct->max_log_dcr_hash_table_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->min_dcr_lifo_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->max_dcr_lifo_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_boot_settings_print(const struct tools_open_boot_settings *ptr_struct, FILE *fd, int indent_level)
+void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_boot_settings ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_infiniband_dc_capabilities ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_vlan            : " UH_FMT "\n", ptr_struct->boot_vlan);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "legacy_boot_protocol : " UH_FMT "\n", ptr_struct->legacy_boot_protocol);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_retry_conut     : " UH_FMT "\n", ptr_struct->boot_retry_conut);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_vlan_en         : " UH_FMT "\n", ptr_struct->boot_vlan_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_option_rom_en   : " UH_FMT "\n", ptr_struct->boot_option_rom_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "min_log_dcr_hash_table_size : " U32H_FMT "\n", ptr_struct->min_log_dcr_hash_table_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_log_dcr_hash_table_size : " U32H_FMT "\n", ptr_struct->max_log_dcr_hash_table_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "min_dcr_lifo_size    : " U32H_FMT "\n", ptr_struct->min_dcr_lifo_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_dcr_lifo_size    : " U32H_FMT "\n", ptr_struct->max_dcr_lifo_size);
 }
 
-unsigned int tools_open_boot_settings_size(void)
+unsigned int tools_open_infiniband_dc_capabilities_size(void)
 {
-	return TOOLS_OPEN_BOOT_SETTINGS_SIZE;
+    return TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE;
 }
 
-void tools_open_boot_settings_dump(const struct tools_open_boot_settings *ptr_struct, FILE *fd)
+void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                FILE* fd)
 {
-	tools_open_boot_settings_print(ptr_struct, fd, 0);
+    tools_open_infiniband_dc_capabilities_print(ptr_struct, fd, 0);
 }
 
-void tools_open_boot_settings_ext_pack(const struct tools_open_boot_settings_ext *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                            u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->ip_ver);
+    offset = 27;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_dcr_hash_table_size);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->dcr_lifo_size);
 }
 
-void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct,
+                                              const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 22;
-	ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 27;
+    ptr_struct->log_dcr_hash_table_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 40;
+    ptr_struct->dcr_lifo_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext *ptr_struct, FILE *fd, int indent_level)
+void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_boot_settings_ext ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_infiniband_dc_settings ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ip_ver               : " UH_FMT "\n", ptr_struct->ip_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_dcr_hash_table_size : " UH_FMT "\n", ptr_struct->log_dcr_hash_table_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dcr_lifo_size        : " UH_FMT "\n", ptr_struct->dcr_lifo_size);
 }
 
-unsigned int tools_open_boot_settings_ext_size(void)
+unsigned int tools_open_infiniband_dc_settings_size(void)
 {
-	return TOOLS_OPEN_BOOT_SETTINGS_EXT_SIZE;
+    return TOOLS_OPEN_INFINIBAND_DC_SETTINGS_SIZE;
 }
 
-void tools_open_boot_settings_ext_dump(const struct tools_open_boot_settings_ext *ptr_struct, FILE *fd)
+void tools_open_infiniband_dc_settings_dump(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd)
 {
-	tools_open_boot_settings_ext_print(ptr_struct, fd, 0);
+    tools_open_infiniband_dc_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_common_header_pack(const struct tools_open_common_header *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_iscsi_settings_pack(const struct tools_open_iscsi_settings* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->length);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->type);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version);
+    offset = 10;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->target_as_first_hdd_en);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->boot_to_target);
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ipv6_auto_config_en);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vlan_en);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->tcp_timestamps_en);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->chap_mutual_auth_en);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->chap_auth_en);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dhcp_iscsi_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ipv4_dhcp_en);
+    offset = 52;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->vlan);
+    offset = 88;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->lun_busy_retry_count);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_up_delay_time);
 }
 
-void tools_open_common_header_unpack(struct tools_open_common_header *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_iscsi_settings_unpack(struct tools_open_iscsi_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 10;
+    ptr_struct->target_as_first_hdd_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 8;
+    ptr_struct->boot_to_target = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 7;
+    ptr_struct->ipv6_auto_config_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->tcp_timestamps_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->chap_mutual_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->chap_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->dhcp_iscsi_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->ipv4_dhcp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 52;
+    ptr_struct->vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 88;
+    ptr_struct->lun_busy_retry_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 80;
+    ptr_struct->link_up_delay_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_common_header_print(const struct tools_open_common_header *ptr_struct, FILE *fd, int indent_level)
+void tools_open_iscsi_settings_print(const struct tools_open_iscsi_settings* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_common_header ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_iscsi_settings ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "length               : " UH_FMT "\n", ptr_struct->length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "type                 : " UH_FMT "\n", ptr_struct->type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version              : " UH_FMT "\n", ptr_struct->version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "target_as_first_hdd_en : " UH_FMT "\n", ptr_struct->target_as_first_hdd_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_to_target       : " UH_FMT "\n", ptr_struct->boot_to_target);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ipv6_auto_config_en  : " UH_FMT "\n", ptr_struct->ipv6_auto_config_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vlan_en              : " UH_FMT "\n", ptr_struct->vlan_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tcp_timestamps_en    : " UH_FMT "\n", ptr_struct->tcp_timestamps_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "chap_mutual_auth_en  : " UH_FMT "\n", ptr_struct->chap_mutual_auth_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "chap_auth_en         : " UH_FMT "\n", ptr_struct->chap_auth_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dhcp_iscsi_en        : " UH_FMT "\n", ptr_struct->dhcp_iscsi_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ipv4_dhcp_en         : " UH_FMT "\n", ptr_struct->ipv4_dhcp_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vlan                 : " UH_FMT "\n", ptr_struct->vlan);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lun_busy_retry_count : " UH_FMT "\n", ptr_struct->lun_busy_retry_count);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "link_up_delay_time   : " UH_FMT "\n", ptr_struct->link_up_delay_time);
 }
 
-unsigned int tools_open_common_header_size(void)
+unsigned int tools_open_iscsi_settings_size(void)
 {
-	return TOOLS_OPEN_COMMON_HEADER_SIZE;
+    return TOOLS_OPEN_ISCSI_SETTINGS_SIZE;
 }
 
-void tools_open_common_header_dump(const struct tools_open_common_header *ptr_struct, FILE *fd)
+void tools_open_iscsi_settings_dump(const struct tools_open_iscsi_settings* ptr_struct, FILE* fd)
 {
-	tools_open_common_header_print(ptr_struct, fd, 0);
+    tools_open_iscsi_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->identifier);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->pldm_classification);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_offset_h);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_offset_l);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->size);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_dcbx);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_rx_mode);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_tx_mode);
 }
 
-void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->identifier = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->pldm_classification = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->cb_offset_h = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->cb_offset_l = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 4;
+    ptr_struct->lldp_nb_dcbx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->lldp_nb_rx_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 0;
+    ptr_struct->lldp_nb_tx_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void tools_open_component_desciptor_print(const struct tools_open_component_desciptor *ptr_struct, FILE *fd, int indent_level)
+void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_component_desciptor ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_lldp_client_settings ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "identifier           : " UH_FMT "\n", ptr_struct->identifier);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pldm_classification  : " UH_FMT "\n", ptr_struct->pldm_classification);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_offset_h          : " U32H_FMT "\n", ptr_struct->cb_offset_h);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_offset_l          : " U32H_FMT "\n", ptr_struct->cb_offset_l);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " U32H_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_dcbx         : " UH_FMT "\n", ptr_struct->lldp_nb_dcbx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_rx_mode      : " UH_FMT "\n", ptr_struct->lldp_nb_rx_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_tx_mode      : " UH_FMT "\n", ptr_struct->lldp_nb_tx_mode);
 }
 
-unsigned int tools_open_component_desciptor_size(void)
+unsigned int tools_open_lldp_client_settings_size(void)
 {
-	return TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE;
+    return TOOLS_OPEN_LLDP_CLIENT_SETTINGS_SIZE;
 }
 
-void tools_open_component_desciptor_dump(const struct tools_open_component_desciptor *ptr_struct, FILE *fd)
+void tools_open_lldp_client_settings_dump(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd)
 {
-	tools_open_component_desciptor_print(ptr_struct, fd, 0);
+    tools_open_lldp_client_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_component_ptr_pack(const struct tools_open_component_ptr *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_lldp_nb_pack(const struct tools_open_lldp_nb* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
+    int i;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->component_index);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->storage_id);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->storage_address);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_rx_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_tx_en);
+    offset = 84;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->lldp_msg_tx_interval);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(120, 8, i, 224, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->lldp_tx_tlv_mask[i]);
+    }
 }
 
-void tools_open_component_ptr_unpack(struct tools_open_component_ptr *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_lldp_nb_unpack(struct tools_open_lldp_nb* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
+    int i;
 
-	offset = 16;
-	ptr_struct->component_index = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->storage_id = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->storage_address = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 1;
+    ptr_struct->lldp_nb_rx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->lldp_nb_tx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 84;
+    ptr_struct->lldp_msg_tx_interval = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(120, 8, i, 224, 1);
+        ptr_struct->lldp_tx_tlv_mask[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
 }
 
-void tools_open_component_ptr_print(const struct tools_open_component_ptr *ptr_struct, FILE *fd, int indent_level)
+void tools_open_lldp_nb_print(const struct tools_open_lldp_nb* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_component_ptr ========\n");
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_index      : " UH_FMT "\n", ptr_struct->component_index);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "storage_id           : " UH_FMT "\n", ptr_struct->storage_id);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "storage_address      : " U32H_FMT "\n", ptr_struct->storage_address);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_lldp_nb ========\n");
 
-unsigned int tools_open_component_ptr_size(void)
-{
-	return TOOLS_OPEN_COMPONENT_PTR_SIZE;
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_rx_en        : " UH_FMT "\n", ptr_struct->lldp_nb_rx_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_tx_en        : " UH_FMT "\n", ptr_struct->lldp_nb_tx_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_msg_tx_interval : " UH_FMT "\n", ptr_struct->lldp_msg_tx_interval);
+    for (i = 0; i < 16; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "lldp_tx_tlv_mask_%03d : " UH_FMT "\n", i, ptr_struct->lldp_tx_tlv_mask[i]);
+    }
 }
 
-void tools_open_component_ptr_dump(const struct tools_open_component_ptr *ptr_struct, FILE *fd)
+unsigned int tools_open_lldp_nb_size(void)
 {
-	tools_open_component_ptr_print(ptr_struct, fd, 0);
+    return TOOLS_OPEN_LLDP_NB_SIZE;
 }
 
-void tools_open_external_port_pack(const struct tools_open_external_port *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_lldp_nb_dump(const struct tools_open_lldp_nb* ptr_struct, FILE* fd)
 {
-	u_int32_t offset;
-
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->port_owner);
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->allow_rd_counters);
+    tools_open_lldp_nb_print(ptr_struct, fd, 0);
 }
 
-void tools_open_external_port_unpack(struct tools_open_external_port *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_lldp_nb_cap_pack(const struct tools_open_lldp_nb_cap* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	ptr_struct->port_owner = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 30;
-	ptr_struct->allow_rd_counters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_dcbx_en);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_rx_cap);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_tx_cap);
 }
 
-void tools_open_external_port_print(const struct tools_open_external_port *ptr_struct, FILE *fd, int indent_level)
+void tools_open_lldp_nb_cap_unpack(struct tools_open_lldp_nb_cap* ptr_struct, const u_int8_t* ptr_buff)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_external_port ========\n");
+    u_int32_t offset;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_owner           : " UH_FMT "\n", ptr_struct->port_owner);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "allow_rd_counters    : " UH_FMT "\n", ptr_struct->allow_rd_counters);
+    offset = 4;
+    ptr_struct->lldp_nb_dcbx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->lldp_nb_rx_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 0;
+    ptr_struct->lldp_nb_tx_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-unsigned int tools_open_external_port_size(void)
+void tools_open_lldp_nb_cap_print(const struct tools_open_lldp_nb_cap* ptr_struct, FILE* fd, int indent_level)
 {
-	return TOOLS_OPEN_EXTERNAL_PORT_SIZE;
-}
-
-void tools_open_external_port_dump(const struct tools_open_external_port *ptr_struct, FILE *fd)
-{
-	tools_open_external_port_print(ptr_struct, fd, 0);
-}
-
-void tools_open_image_info_pack(const struct tools_open_image_info *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->description[i]);
-	}
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->name[i]);
-	}
-	for (i = 0; i < 96; ++i) {
-		offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->prs_name[i]);
-	}
-}
-
-void tools_open_image_info_unpack(struct tools_open_image_info *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-	int i;
-
-	offset = 8;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(312, 8, i, 8192, 1);
-		ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->psid[16] = '\0';
-	for (i = 0; i < 256; ++i) {
-		offset = adb2c_calc_array_field_address(3736, 8, i, 8192, 1);
-		ptr_struct->description[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->description[256] = '\0';
-	for (i = 0; i < 64; ++i) {
-		offset = adb2c_calc_array_field_address(6680, 8, i, 8192, 1);
-		ptr_struct->name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->name[64] = '\0';
-	for (i = 0; i < 96; ++i) {
-		offset = adb2c_calc_array_field_address(7192, 8, i, 8192, 1);
-		ptr_struct->prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->prs_name[96] = '\0';
-}
-
-void tools_open_image_info_print(const struct tools_open_image_info *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_image_info ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-		fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
-		fprintf(fd, "description          : \"%s\"\n", ptr_struct->description);
-		fprintf(fd, "name                 : \"%s\"\n", ptr_struct->name);
-		fprintf(fd, "prs_name             : \"%s\"\n", ptr_struct->prs_name);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_lldp_nb_cap ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_dcbx_en      : " UH_FMT "\n", ptr_struct->lldp_nb_dcbx_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_rx_cap       : " UH_FMT "\n", ptr_struct->lldp_nb_rx_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_tx_cap       : " UH_FMT "\n", ptr_struct->lldp_nb_tx_cap);
 }
 
-unsigned int tools_open_image_info_size(void)
+unsigned int tools_open_lldp_nb_cap_size(void)
 {
-	return TOOLS_OPEN_IMAGE_INFO_SIZE;
+    return TOOLS_OPEN_LLDP_NB_CAP_SIZE;
 }
 
-void tools_open_image_info_dump(const struct tools_open_image_info *ptr_struct, FILE *fd)
+void tools_open_lldp_nb_cap_dump(const struct tools_open_lldp_nb_cap* ptr_struct, FILE* fd)
 {
-	tools_open_image_info_print(ptr_struct, fd, 0);
+    tools_open_lldp_nb_cap_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_lldp_nb_dcbx_pack(const struct tools_open_lldp_nb_dcbx* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->boot_pkey);
+    offset = 31;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ieee_dcbx_en);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cee_dcbx_en);
+    offset = 29;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dcbx_willing);
 }
 
-void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_lldp_nb_dcbx_unpack(struct tools_open_lldp_nb_dcbx* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->boot_pkey = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 31;
+    ptr_struct->ieee_dcbx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->cee_dcbx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 29;
+    ptr_struct->dcbx_willing = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings *ptr_struct, FILE *fd, int indent_level)
+void tools_open_lldp_nb_dcbx_print(const struct tools_open_lldp_nb_dcbx* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_infiniband_boot_settings ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_lldp_nb_dcbx ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_pkey            : " UH_FMT "\n", ptr_struct->boot_pkey);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ieee_dcbx_en         : " UH_FMT "\n", ptr_struct->ieee_dcbx_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cee_dcbx_en          : " UH_FMT "\n", ptr_struct->cee_dcbx_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dcbx_willing         : " UH_FMT "\n", ptr_struct->dcbx_willing);
 }
 
-unsigned int tools_open_infiniband_boot_settings_size(void)
+unsigned int tools_open_lldp_nb_dcbx_size(void)
 {
-	return TOOLS_OPEN_INFINIBAND_BOOT_SETTINGS_SIZE;
+    return TOOLS_OPEN_LLDP_NB_DCBX_SIZE;
 }
 
-void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings *ptr_struct, FILE *fd)
+void tools_open_lldp_nb_dcbx_dump(const struct tools_open_lldp_nb_dcbx* ptr_struct, FILE* fd)
 {
-	tools_open_infiniband_boot_settings_print(ptr_struct, fd, 0);
+    tools_open_lldp_nb_dcbx_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mfg_info_pack(const struct tools_open_mfg_info* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 0;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->min_log_dcr_hash_table_size);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_log_dcr_hash_table_size);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->min_dcr_lifo_size);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_dcr_lifo_size);
-}
-
-void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities *ptr_struct, const u_int8_t *ptr_buff)
+    u_int32_t offset;
+    int i;
+
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
+    }
+    offset = 232;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
+    offset = 224;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
+    for (i = 0; i < 96; ++i)
+    {
+        offset = adb2c_calc_array_field_address(792, 8, i, 2560, 1);
+        adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->orig_prs_name[i]);
+    }
+}
+
+void tools_open_mfg_info_unpack(struct tools_open_mfg_info* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 0;
-	ptr_struct->min_log_dcr_hash_table_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 32;
-	ptr_struct->max_log_dcr_hash_table_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->min_dcr_lifo_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->max_dcr_lifo_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities *ptr_struct, FILE *fd, int indent_level)
+    u_int32_t offset;
+    int i;
+
+    for (i = 0; i < 16; ++i)
+    {
+        offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
+        ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->psid[16] = '\0';
+    offset = 232;
+    ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 224;
+    ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    for (i = 0; i < 96; ++i)
+    {
+        offset = adb2c_calc_array_field_address(792, 8, i, 2560, 1);
+        ptr_struct->orig_prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    }
+    ptr_struct->orig_prs_name[96] = '\0';
+}
+
+void tools_open_mfg_info_print(const struct tools_open_mfg_info* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_infiniband_dc_capabilities ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mfg_info ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "min_log_dcr_hash_table_size : " U32H_FMT "\n", ptr_struct->min_log_dcr_hash_table_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_log_dcr_hash_table_size : " U32H_FMT "\n", ptr_struct->max_log_dcr_hash_table_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "min_dcr_lifo_size    : " U32H_FMT "\n", ptr_struct->min_dcr_lifo_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_dcr_lifo_size    : " U32H_FMT "\n", ptr_struct->max_dcr_lifo_size);
+    fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
+    fprintf(fd, "orig_prs_name        : \"%s\"\n", ptr_struct->orig_prs_name);
 }
 
-unsigned int tools_open_infiniband_dc_capabilities_size(void)
+unsigned int tools_open_mfg_info_size(void)
 {
-	return TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE;
+    return TOOLS_OPEN_MFG_INFO_SIZE;
 }
 
-void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities *ptr_struct, FILE *fd)
+void tools_open_mfg_info_dump(const struct tools_open_mfg_info* ptr_struct, FILE* fd)
 {
-	tools_open_infiniband_dc_capabilities_print(ptr_struct, fd, 0);
+    tools_open_mfg_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mnv_cfg_pack(const union tools_open_mnv_cfg* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 27;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->log_dcr_hash_table_size);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->dcr_lifo_size);
+    tools_open_mlock_pack(&(ptr_struct->mlock), ptr_buff);
 }
 
-void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_mnv_cfg_unpack(union tools_open_mnv_cfg* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 27;
-	ptr_struct->log_dcr_hash_table_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 40;
-	ptr_struct->dcr_lifo_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    tools_open_mlock_unpack(&(ptr_struct->mlock), ptr_buff);
 }
 
-void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings *ptr_struct, FILE *fd, int indent_level)
+void tools_open_mnv_cfg_print(const union tools_open_mnv_cfg* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_infiniband_dc_settings ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_dcr_hash_table_size : " UH_FMT "\n", ptr_struct->log_dcr_hash_table_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dcr_lifo_size        : " UH_FMT "\n", ptr_struct->dcr_lifo_size);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mnv_cfg ========\n");
 
-unsigned int tools_open_infiniband_dc_settings_size(void)
-{
-	return TOOLS_OPEN_INFINIBAND_DC_SETTINGS_SIZE;
-}
-
-void tools_open_infiniband_dc_settings_dump(const struct tools_open_infiniband_dc_settings *ptr_struct, FILE *fd)
-{
-	tools_open_infiniband_dc_settings_print(ptr_struct, fd, 0);
-}
-
-void tools_open_iscsi_settings_pack(const struct tools_open_iscsi_settings *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 10;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->target_as_first_hdd_en);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->boot_to_target);
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ipv6_auto_config_en);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vlan_en);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->tcp_timestamps_en);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->chap_mutual_auth_en);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->chap_auth_en);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dhcp_iscsi_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ipv4_dhcp_en);
-	offset = 52;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->vlan);
-	offset = 88;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->lun_busy_retry_count);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->link_up_delay_time);
-}
-
-void tools_open_iscsi_settings_unpack(struct tools_open_iscsi_settings *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 10;
-	ptr_struct->target_as_first_hdd_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 8;
-	ptr_struct->boot_to_target = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 7;
-	ptr_struct->ipv6_auto_config_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->tcp_timestamps_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->chap_mutual_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->chap_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->dhcp_iscsi_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->ipv4_dhcp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 52;
-	ptr_struct->vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 88;
-	ptr_struct->lun_busy_retry_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 80;
-	ptr_struct->link_up_delay_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-}
-
-void tools_open_iscsi_settings_print(const struct tools_open_iscsi_settings *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_iscsi_settings ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "target_as_first_hdd_en : " UH_FMT "\n", ptr_struct->target_as_first_hdd_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_to_target       : " UH_FMT "\n", ptr_struct->boot_to_target);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ipv6_auto_config_en  : " UH_FMT "\n", ptr_struct->ipv6_auto_config_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vlan_en              : " UH_FMT "\n", ptr_struct->vlan_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tcp_timestamps_en    : " UH_FMT "\n", ptr_struct->tcp_timestamps_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "chap_mutual_auth_en  : " UH_FMT "\n", ptr_struct->chap_mutual_auth_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "chap_auth_en         : " UH_FMT "\n", ptr_struct->chap_auth_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dhcp_iscsi_en        : " UH_FMT "\n", ptr_struct->dhcp_iscsi_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ipv4_dhcp_en         : " UH_FMT "\n", ptr_struct->ipv4_dhcp_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vlan                 : " UH_FMT "\n", ptr_struct->vlan);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lun_busy_retry_count : " UH_FMT "\n", ptr_struct->lun_busy_retry_count);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "link_up_delay_time   : " UH_FMT "\n", ptr_struct->link_up_delay_time);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mnva:\n");
+    tools_open_mnva_print(&(ptr_struct->mnva), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mnvi:\n");
+    tools_open_mnvi_print(&(ptr_struct->mnvi), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mnvia:\n");
+    tools_open_mnvia_print(&(ptr_struct->mnvia), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nvqc:\n");
+    tools_open_nvqc_print(&(ptr_struct->nvqc), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nvia:\n");
+    tools_open_nvia_print(&(ptr_struct->nvia), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nvda:\n");
+    tools_open_nvda_print(&(ptr_struct->nvda), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nvdi:\n");
+    tools_open_nvdi_print(&(ptr_struct->nvdi), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nvqgc:\n");
+    tools_open_nvqgc_print(&(ptr_struct->nvqgc), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mvts:\n");
+    tools_open_mvts_print(&(ptr_struct->mvts), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mnvgn:\n");
+    tools_open_mnvgn_print(&(ptr_struct->mnvgn), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfmc:\n");
+    tools_open_mfmc_print(&(ptr_struct->mfmc), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfpa:\n");
+    tools_open_mfpa_print(&(ptr_struct->mfpa), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mgir:\n");
+    tools_open_mgir_print(&(ptr_struct->mgir), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcam:\n");
+    tools_open_mcam_print(&(ptr_struct->mcam), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mgnle:\n");
+    tools_open_mgnle_print(&(ptr_struct->mgnle), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mlock:\n");
+    tools_open_mlock_print(&(ptr_struct->mlock), fd, indent_level + 1);
 }
 
-unsigned int tools_open_iscsi_settings_size(void)
+unsigned int tools_open_mnv_cfg_size(void)
 {
-	return TOOLS_OPEN_ISCSI_SETTINGS_SIZE;
+    return TOOLS_OPEN_MNV_CFG_SIZE;
 }
 
-void tools_open_iscsi_settings_dump(const struct tools_open_iscsi_settings *ptr_struct, FILE *fd)
+void tools_open_mnv_cfg_dump(const union tools_open_mnv_cfg* ptr_struct, FILE* fd)
 {
-	tools_open_iscsi_settings_print(ptr_struct, fd, 0);
+    tools_open_mnv_cfg_print(ptr_struct, fd, 0);
 }
 
-void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_multi_part_pack(const struct tools_open_multi_part* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_dcbx);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_rx_mode);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_tx_mode);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->total_length);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->number_of_extensions);
 }
 
-void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_multi_part_unpack(struct tools_open_multi_part* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	ptr_struct->lldp_nb_dcbx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->lldp_nb_rx_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 0;
-	ptr_struct->lldp_nb_tx_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 16;
+    ptr_struct->total_length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->number_of_extensions = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings *ptr_struct, FILE *fd, int indent_level)
+void tools_open_multi_part_print(const struct tools_open_multi_part* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_lldp_client_settings ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_multi_part ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_dcbx         : " UH_FMT "\n", ptr_struct->lldp_nb_dcbx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_rx_mode      : " UH_FMT "\n", ptr_struct->lldp_nb_rx_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_tx_mode      : " UH_FMT "\n", ptr_struct->lldp_nb_tx_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "total_length         : " UH_FMT "\n", ptr_struct->total_length);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "number_of_extensions : " UH_FMT "\n", ptr_struct->number_of_extensions);
 }
 
-unsigned int tools_open_lldp_client_settings_size(void)
+unsigned int tools_open_multi_part_size(void)
 {
-	return TOOLS_OPEN_LLDP_CLIENT_SETTINGS_SIZE;
+    return TOOLS_OPEN_MULTI_PART_SIZE;
 }
 
-void tools_open_lldp_client_settings_dump(const struct tools_open_lldp_client_settings *ptr_struct, FILE *fd)
+void tools_open_multi_part_dump(const struct tools_open_multi_part* ptr_struct, FILE* fd)
 {
-	tools_open_lldp_client_settings_print(ptr_struct, fd, 0);
+    tools_open_multi_part_print(ptr_struct, fd, 0);
 }
 
-void tools_open_lldp_nb_pack(const struct tools_open_lldp_nb *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_nv_base_mac_guid_pack(const struct tools_open_nv_base_mac_guid* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_rx_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_tx_en);
-	offset = 84;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->lldp_msg_tx_interval);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(120, 8, i, 224, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->lldp_tx_tlv_mask[i]);
-	}
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->base_mac[i]);
+    }
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(64, 32, i, 128, 1);
+        adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->base_guid[i]);
+    }
 }
 
-void tools_open_lldp_nb_unpack(struct tools_open_lldp_nb *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_nv_base_mac_guid_unpack(struct tools_open_nv_base_mac_guid* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
+    int i;
 
-	offset = 1;
-	ptr_struct->lldp_nb_rx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->lldp_nb_tx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 84;
-	ptr_struct->lldp_msg_tx_interval = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(120, 8, i, 224, 1);
-		ptr_struct->lldp_tx_tlv_mask[i] = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
+        ptr_struct->base_mac[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
+    for (i = 0; i < 2; ++i)
+    {
+        offset = adb2c_calc_array_field_address(64, 32, i, 128, 1);
+        ptr_struct->base_guid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    }
 }
 
-void tools_open_lldp_nb_print(const struct tools_open_lldp_nb *ptr_struct, FILE *fd, int indent_level)
+void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd, int indent_level)
 {
-	int i;
+    int i;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_lldp_nb ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nv_base_mac_guid ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_rx_en        : " UH_FMT "\n", ptr_struct->lldp_nb_rx_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_tx_en        : " UH_FMT "\n", ptr_struct->lldp_nb_tx_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_msg_tx_interval : " UH_FMT "\n", ptr_struct->lldp_msg_tx_interval);
-	for (i = 0; i < 16; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "lldp_tx_tlv_mask_%03d : " UH_FMT "\n", i, ptr_struct->lldp_tx_tlv_mask[i]);
-	}
+    for (i = 0; i < 2; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "base_mac_%03d        : " U32H_FMT "\n", i, ptr_struct->base_mac[i]);
+    }
+    for (i = 0; i < 2; ++i)
+    {
+        adb2c_add_indentation(fd, indent_level);
+        fprintf(fd, "base_guid_%03d       : " U32H_FMT "\n", i, ptr_struct->base_guid[i]);
+    }
 }
 
-unsigned int tools_open_lldp_nb_size(void)
+unsigned int tools_open_nv_base_mac_guid_size(void)
 {
-	return TOOLS_OPEN_LLDP_NB_SIZE;
+    return TOOLS_OPEN_NV_BASE_MAC_GUID_SIZE;
 }
 
-void tools_open_lldp_nb_dump(const struct tools_open_lldp_nb *ptr_struct, FILE *fd)
+void tools_open_nv_base_mac_guid_dump(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd)
 {
-	tools_open_lldp_nb_print(ptr_struct, fd, 0);
+    tools_open_nv_base_mac_guid_print(ptr_struct, fd, 0);
 }
 
-void tools_open_lldp_nb_cap_pack(const struct tools_open_lldp_nb_cap *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->lldp_nb_dcbx_en);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_rx_cap);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_tx_cap);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->guid_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mac_en);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_allocated_macs);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_allocated_guids);
 }
 
-void tools_open_lldp_nb_cap_unpack(struct tools_open_lldp_nb_cap *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	ptr_struct->lldp_nb_dcbx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->lldp_nb_rx_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 0;
-	ptr_struct->lldp_nb_tx_cap = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 1;
+    ptr_struct->guid_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->mac_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->num_of_allocated_macs = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->num_of_allocated_guids = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_lldp_nb_cap_print(const struct tools_open_lldp_nb_cap *ptr_struct, FILE *fd, int indent_level)
+void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_lldp_nb_cap ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nv_base_mac_guid_cap ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_dcbx_en      : " UH_FMT "\n", ptr_struct->lldp_nb_dcbx_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_rx_cap       : " UH_FMT "\n", ptr_struct->lldp_nb_rx_cap);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_tx_cap       : " UH_FMT "\n", ptr_struct->lldp_nb_tx_cap);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "guid_en              : " UH_FMT "\n", ptr_struct->guid_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mac_en               : " UH_FMT "\n", ptr_struct->mac_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_allocated_macs : " UH_FMT "\n", ptr_struct->num_of_allocated_macs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_allocated_guids : " UH_FMT "\n", ptr_struct->num_of_allocated_guids);
 }
 
-unsigned int tools_open_lldp_nb_cap_size(void)
+unsigned int tools_open_nv_base_mac_guid_cap_size(void)
 {
-	return TOOLS_OPEN_LLDP_NB_CAP_SIZE;
+    return TOOLS_OPEN_NV_BASE_MAC_GUID_CAP_SIZE;
 }
 
-void tools_open_lldp_nb_cap_dump(const struct tools_open_lldp_nb_cap *ptr_struct, FILE *fd)
+void tools_open_nv_base_mac_guid_cap_dump(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd)
 {
-	tools_open_lldp_nb_cap_print(ptr_struct, fd, 0);
+    tools_open_nv_base_mac_guid_cap_print(ptr_struct, fd, 0);
 }
 
-void tools_open_lldp_nb_dcbx_pack(const struct tools_open_lldp_nb_dcbx *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_nv_cx3_global_conf_pack(const struct tools_open_nv_cx3_global_conf* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ieee_dcbx_en);
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cee_dcbx_en);
-	offset = 29;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->dcbx_willing);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clock_map_to_user);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->phy_param_mode);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->steer_force_vlan);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cq_timestamp);
 }
 
-void tools_open_lldp_nb_dcbx_unpack(struct tools_open_lldp_nb_dcbx *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 31;
-	ptr_struct->ieee_dcbx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 30;
-	ptr_struct->cee_dcbx_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 29;
-	ptr_struct->dcbx_willing = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->clock_map_to_user = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->phy_param_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 1;
+    ptr_struct->steer_force_vlan = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->cq_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_lldp_nb_dcbx_print(const struct tools_open_lldp_nb_dcbx *ptr_struct, FILE *fd, int indent_level)
+void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct,
+                                         FILE* fd,
+                                         int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_lldp_nb_dcbx ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nv_cx3_global_conf ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ieee_dcbx_en         : " UH_FMT "\n", ptr_struct->ieee_dcbx_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cee_dcbx_en          : " UH_FMT "\n", ptr_struct->cee_dcbx_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dcbx_willing         : " UH_FMT "\n", ptr_struct->dcbx_willing);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clock_map_to_user    : " UH_FMT "\n", ptr_struct->clock_map_to_user);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy_param_mode       : " UH_FMT "\n", ptr_struct->phy_param_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "steer_force_vlan     : " UH_FMT "\n", ptr_struct->steer_force_vlan);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cq_timestamp         : " UH_FMT "\n", ptr_struct->cq_timestamp);
 }
 
-unsigned int tools_open_lldp_nb_dcbx_size(void)
+unsigned int tools_open_nv_cx3_global_conf_size(void)
 {
-	return TOOLS_OPEN_LLDP_NB_DCBX_SIZE;
+    return TOOLS_OPEN_NV_CX3_GLOBAL_CONF_SIZE;
 }
 
-void tools_open_lldp_nb_dcbx_dump(const struct tools_open_lldp_nb_dcbx *ptr_struct, FILE *fd)
+void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd)
 {
-	tools_open_lldp_nb_dcbx_print(ptr_struct, fd, 0);
+    tools_open_nv_cx3_global_conf_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mfg_info_pack(const struct tools_open_mfg_info *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->psid[i]);
-	}
-	offset = 232;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minor_version);
-	offset = 224;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->major_version);
-	for (i = 0; i < 96; ++i) {
-		offset = adb2c_calc_array_field_address(792, 8, i, 2560, 1);
-		adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->orig_prs_name[i]);
-	}
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ip_ver);
 }
 
-void tools_open_mfg_info_unpack(struct tools_open_mfg_info *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-	int i;
+    u_int32_t offset;
 
-	for (i = 0; i < 16; ++i) {
-		offset = adb2c_calc_array_field_address(24, 8, i, 2560, 1);
-		ptr_struct->psid[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->psid[16] = '\0';
-	offset = 232;
-	ptr_struct->minor_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 224;
-	ptr_struct->major_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	for (i = 0; i < 96; ++i) {
-		offset = adb2c_calc_array_field_address(792, 8, i, 2560, 1);
-		ptr_struct->orig_prs_name[i] = (char)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	}
-		ptr_struct->orig_prs_name[96] = '\0';
+    offset = 0;
+    ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_mfg_info_print(const struct tools_open_mfg_info *ptr_struct, FILE *fd, int indent_level)
+void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mfg_info ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_option_rom_capability ========\n");
 
-		fprintf(fd, "psid                 : \"%s\"\n", ptr_struct->psid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minor_version        : " UH_FMT "\n", ptr_struct->minor_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "major_version        : " UH_FMT "\n", ptr_struct->major_version);
-		fprintf(fd, "orig_prs_name        : \"%s\"\n", ptr_struct->orig_prs_name);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "ip_ver               : " UH_FMT "\n", ptr_struct->ip_ver);
 }
 
-unsigned int tools_open_mfg_info_size(void)
+unsigned int tools_open_option_rom_capability_size(void)
 {
-	return TOOLS_OPEN_MFG_INFO_SIZE;
-}
-
-void tools_open_mfg_info_dump(const struct tools_open_mfg_info *ptr_struct, FILE *fd)
-{
-	tools_open_mfg_info_print(ptr_struct, fd, 0);
-}
-
-void tools_open_mnv_cfg_pack(const union tools_open_mnv_cfg *ptr_struct, u_int8_t *ptr_buff)
-{
-	tools_open_mlock_pack(&(ptr_struct->mlock), ptr_buff);
-}
-
-void tools_open_mnv_cfg_unpack(union tools_open_mnv_cfg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	tools_open_mlock_unpack(&(ptr_struct->mlock), ptr_buff);
-}
-
-void tools_open_mnv_cfg_print(const union tools_open_mnv_cfg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mnv_cfg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mnva:\n");
-	tools_open_mnva_print(&(ptr_struct->mnva), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mnvi:\n");
-	tools_open_mnvi_print(&(ptr_struct->mnvi), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mnvia:\n");
-	tools_open_mnvia_print(&(ptr_struct->mnvia), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nvqc:\n");
-	tools_open_nvqc_print(&(ptr_struct->nvqc), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nvia:\n");
-	tools_open_nvia_print(&(ptr_struct->nvia), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nvda:\n");
-	tools_open_nvda_print(&(ptr_struct->nvda), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nvdi:\n");
-	tools_open_nvdi_print(&(ptr_struct->nvdi), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nvqgc:\n");
-	tools_open_nvqgc_print(&(ptr_struct->nvqgc), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mvts:\n");
-	tools_open_mvts_print(&(ptr_struct->mvts), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mnvgn:\n");
-	tools_open_mnvgn_print(&(ptr_struct->mnvgn), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfmc:\n");
-	tools_open_mfmc_print(&(ptr_struct->mfmc), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfpa:\n");
-	tools_open_mfpa_print(&(ptr_struct->mfpa), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mgir:\n");
-	tools_open_mgir_print(&(ptr_struct->mgir), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcam:\n");
-	tools_open_mcam_print(&(ptr_struct->mcam), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mgnle:\n");
-	tools_open_mgnle_print(&(ptr_struct->mgnle), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mlock:\n");
-	tools_open_mlock_print(&(ptr_struct->mlock), fd, indent_level + 1);
+    return TOOLS_OPEN_OPTION_ROM_CAPABILITY_SIZE;
 }
 
-unsigned int tools_open_mnv_cfg_size(void)
+void tools_open_option_rom_capability_dump(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd)
 {
-	return TOOLS_OPEN_MNV_CFG_SIZE;
+    tools_open_option_rom_capability_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mnv_cfg_dump(const union tools_open_mnv_cfg *ptr_struct, FILE *fd)
+void tools_open_package_descriptor_pack(const struct tools_open_package_descriptor* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_mnv_cfg_print(ptr_struct, fd, 0);
-}
+    u_int32_t offset;
 
-void tools_open_multi_part_pack(const struct tools_open_multi_part *ptr_struct, u_int8_t *ptr_buff)
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_devices);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_components);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_offset);
+    offset = 64;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_archive_size);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_size_h);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_size_l);
+    offset = 160;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->cb_compression);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->user_data_offset);
+}
+
+void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->total_length);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->number_of_extensions);
-}
+    u_int32_t offset;
 
-void tools_open_multi_part_unpack(struct tools_open_multi_part *ptr_struct, const u_int8_t *ptr_buff)
+    offset = 16;
+    ptr_struct->num_of_devices = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->num_of_components = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 32;
+    ptr_struct->cb_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 64;
+    ptr_struct->cb_archive_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 96;
+    ptr_struct->cb_size_h = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->cb_size_l = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 160;
+    ptr_struct->cb_compression = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 192;
+    ptr_struct->user_data_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct,
+                                         FILE* fd,
+                                         int indent_level)
 {
-	u_int32_t offset;
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_package_descriptor ========\n");
 
-	offset = 16;
-	ptr_struct->total_length = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->number_of_extensions = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_devices       : " UH_FMT "\n", ptr_struct->num_of_devices);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_components    : " UH_FMT "\n", ptr_struct->num_of_components);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_offset            : " U32H_FMT "\n", ptr_struct->cb_offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_archive_size      : " U32H_FMT "\n", ptr_struct->cb_archive_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_size_h            : " U32H_FMT "\n", ptr_struct->cb_size_h);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_size_l            : " U32H_FMT "\n", ptr_struct->cb_size_l);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cb_compression       : " UH_FMT "\n", ptr_struct->cb_compression);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "user_data_offset     : " U32H_FMT "\n", ptr_struct->user_data_offset);
 }
 
-void tools_open_multi_part_print(const struct tools_open_multi_part *ptr_struct, FILE *fd, int indent_level)
+unsigned int tools_open_package_descriptor_size(void)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_multi_part ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "total_length         : " UH_FMT "\n", ptr_struct->total_length);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "number_of_extensions : " UH_FMT "\n", ptr_struct->number_of_extensions);
+    return TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE;
 }
 
-unsigned int tools_open_multi_part_size(void)
+void tools_open_package_descriptor_dump(const struct tools_open_package_descriptor* ptr_struct, FILE* fd)
 {
-	return TOOLS_OPEN_MULTI_PART_SIZE;
+    tools_open_package_descriptor_print(ptr_struct, fd, 0);
 }
 
-void tools_open_multi_part_dump(const struct tools_open_multi_part *ptr_struct, FILE *fd)
+void tools_open_pci_capabilities_pack(const struct tools_open_pci_capabilities* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_multi_part_print(ptr_struct, fd, 0);
-}
+    u_int32_t offset;
+
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pf_bar_size_supported);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vf_bar_size_supported);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pf_msix_supported);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_vf_msix_supported);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pfs_supported);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->max_total_bar_valid);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->max_total_msix_valid);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->max_vfs_per_pf_valid);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->max_vfs_per_pf);
+    offset = 44;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_num_pfs);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpp_support);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vf_qos_control_support);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_support);
+    offset = 90;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_max_pf_uar_bar_size1);
+    offset = 84;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_max_vf_uar_bar_size);
+    offset = 74;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->max_num_pf_msix);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->max_num_vf_msix);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_total_msix);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_total_bar);
+}
+
+void tools_open_pci_capabilities_unpack(struct tools_open_pci_capabilities* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
 
-void tools_open_nv_base_mac_guid_pack(const struct tools_open_nv_base_mac_guid *ptr_struct, u_int8_t *ptr_buff)
+    offset = 7;
+    ptr_struct->pf_bar_size_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->vf_bar_size_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->num_pf_msix_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->num_vf_msix_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->num_pfs_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->max_total_bar_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->max_total_msix_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->max_vfs_per_pf_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->max_vfs_per_pf = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 44;
+    ptr_struct->max_num_pfs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 34;
+    ptr_struct->fpp_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 33;
+    ptr_struct->vf_qos_control_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->sriov_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 90;
+    ptr_struct->log_max_pf_uar_bar_size1 = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 84;
+    ptr_struct->log_max_vf_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 74;
+    ptr_struct->max_num_pf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 64;
+    ptr_struct->max_num_vf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 96;
+    ptr_struct->max_total_msix = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->max_total_bar = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd, int indent_level)
 {
-	u_int32_t offset;
-	int i;
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_pci_capabilities ========\n");
 
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->base_mac[i]);
-	}
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(64, 32, i, 128, 1);
-		adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->base_guid[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pf_bar_size_supported : " UH_FMT "\n", ptr_struct->pf_bar_size_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vf_bar_size_supported : " UH_FMT "\n", ptr_struct->vf_bar_size_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_pf_msix_supported : " UH_FMT "\n", ptr_struct->num_pf_msix_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_vf_msix_supported : " UH_FMT "\n", ptr_struct->num_vf_msix_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_pfs_supported    : " UH_FMT "\n", ptr_struct->num_pfs_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_total_bar_valid  : " UH_FMT "\n", ptr_struct->max_total_bar_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_total_msix_valid : " UH_FMT "\n", ptr_struct->max_total_msix_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_vfs_per_pf_valid : " UH_FMT "\n", ptr_struct->max_vfs_per_pf_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_vfs_per_pf       : " UH_FMT "\n", ptr_struct->max_vfs_per_pf);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_num_pfs          : " UH_FMT "\n", ptr_struct->max_num_pfs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fpp_support          : " UH_FMT "\n", ptr_struct->fpp_support);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vf_qos_control_support : " UH_FMT "\n", ptr_struct->vf_qos_control_support);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sriov_support        : " UH_FMT "\n", ptr_struct->sriov_support);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_max_pf_uar_bar_size1 : " UH_FMT "\n", ptr_struct->log_max_pf_uar_bar_size1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_max_vf_uar_bar_size : " UH_FMT "\n", ptr_struct->log_max_vf_uar_bar_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_num_pf_msix      : " UH_FMT "\n", ptr_struct->max_num_pf_msix);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_num_vf_msix      : " UH_FMT "\n", ptr_struct->max_num_vf_msix);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_total_msix       : " U32H_FMT "\n", ptr_struct->max_total_msix);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_total_bar        : " U32H_FMT "\n", ptr_struct->max_total_bar);
 }
 
-void tools_open_nv_base_mac_guid_unpack(struct tools_open_nv_base_mac_guid *ptr_struct, const u_int8_t *ptr_buff)
+unsigned int tools_open_pci_capabilities_size(void)
 {
-	u_int32_t offset;
-	int i;
+    return TOOLS_OPEN_PCI_CAPABILITIES_SIZE;
+}
 
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(0, 32, i, 128, 1);
-		ptr_struct->base_mac[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
-	for (i = 0; i < 2; ++i) {
-		offset = adb2c_calc_array_field_address(64, 32, i, 128, 1);
-		ptr_struct->base_guid[i] = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	}
+void tools_open_pci_capabilities_dump(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd)
+{
+    tools_open_pci_capabilities_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid *ptr_struct, FILE *fd, int indent_level)
+void tools_open_pci_configuration_pack(const struct tools_open_pci_configuration* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 7;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pf_bar_size_valid);
+    offset = 6;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vf_bar_size_valid);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pfs_msix_valid);
+    offset = 4;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_vfs_msix_valid);
+    offset = 3;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pfs_valid);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpp_valid);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->full_vf_qos_valid);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_valid);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->total_vfs);
+    offset = 44;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_pfs);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpp_en);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->full_vf_qos);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
+    offset = 90;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_pf_uar_bar_size);
+    offset = 84;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_vf_uar_bar_size);
+    offset = 74;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->num_pf_msix);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->num_vf_msix);
+}
+
+void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration* ptr_struct, const u_int8_t* ptr_buff)
 {
-	int i;
+    u_int32_t offset;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nv_base_mac_guid ========\n");
+    offset = 7;
+    ptr_struct->pf_bar_size_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 6;
+    ptr_struct->vf_bar_size_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 5;
+    ptr_struct->num_pfs_msix_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 4;
+    ptr_struct->num_vfs_msix_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 3;
+    ptr_struct->num_pfs_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 2;
+    ptr_struct->fpp_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->full_vf_qos_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->sriov_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 48;
+    ptr_struct->total_vfs = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 44;
+    ptr_struct->num_pfs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 34;
+    ptr_struct->fpp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 33;
+    ptr_struct->full_vf_qos = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 90;
+    ptr_struct->log_pf_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 84;
+    ptr_struct->log_vf_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+    offset = 74;
+    ptr_struct->num_pf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 64;
+    ptr_struct->num_vf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+}
+
+void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_pci_configuration ========\n");
 
-	for (i = 0; i < 2; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "base_mac_%03d        : " U32H_FMT "\n", i, ptr_struct->base_mac[i]);
-	}
-	for (i = 0; i < 2; ++i) {
-		adb2c_add_indentation(fd, indent_level);
-		fprintf(fd, "base_guid_%03d       : " U32H_FMT "\n", i, ptr_struct->base_guid[i]);
-	}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pf_bar_size_valid    : " UH_FMT "\n", ptr_struct->pf_bar_size_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vf_bar_size_valid    : " UH_FMT "\n", ptr_struct->vf_bar_size_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_pfs_msix_valid   : " UH_FMT "\n", ptr_struct->num_pfs_msix_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_vfs_msix_valid   : " UH_FMT "\n", ptr_struct->num_vfs_msix_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_pfs_valid        : " UH_FMT "\n", ptr_struct->num_pfs_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fpp_valid            : " UH_FMT "\n", ptr_struct->fpp_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "full_vf_qos_valid    : " UH_FMT "\n", ptr_struct->full_vf_qos_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sriov_valid          : " UH_FMT "\n", ptr_struct->sriov_valid);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "total_vfs            : " UH_FMT "\n", ptr_struct->total_vfs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_pfs              : " UH_FMT "\n", ptr_struct->num_pfs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fpp_en               : " UH_FMT "\n", ptr_struct->fpp_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "full_vf_qos          : " UH_FMT "\n", ptr_struct->full_vf_qos);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sriov_en             : " UH_FMT "\n", ptr_struct->sriov_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_pf_uar_bar_size  : " UH_FMT "\n", ptr_struct->log_pf_uar_bar_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_vf_uar_bar_size  : " UH_FMT "\n", ptr_struct->log_vf_uar_bar_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_pf_msix          : " UH_FMT "\n", ptr_struct->num_pf_msix);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_vf_msix          : " UH_FMT "\n", ptr_struct->num_vf_msix);
 }
 
-unsigned int tools_open_nv_base_mac_guid_size(void)
+unsigned int tools_open_pci_configuration_size(void)
 {
-	return TOOLS_OPEN_NV_BASE_MAC_GUID_SIZE;
+    return TOOLS_OPEN_PCI_CONFIGURATION_SIZE;
 }
 
-void tools_open_nv_base_mac_guid_dump(const struct tools_open_nv_base_mac_guid *ptr_struct, FILE *fd)
+void tools_open_pci_configuration_dump(const struct tools_open_pci_configuration* ptr_struct, FILE* fd)
 {
-	tools_open_nv_base_mac_guid_print(ptr_struct, fd, 0);
+    tools_open_pci_configuration_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_phy_reg_pack(const union tools_open_phy_reg* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->guid_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->mac_en);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_allocated_macs);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_allocated_guids);
+    tools_open_pmdio_pack(&(ptr_struct->pmdio), ptr_buff);
 }
 
-void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_phy_reg_unpack(union tools_open_phy_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 1;
-	ptr_struct->guid_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->mac_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->num_of_allocated_macs = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->num_of_allocated_guids = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    tools_open_pmdio_unpack(&(ptr_struct->pmdio), ptr_buff);
 }
 
-void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap *ptr_struct, FILE *fd, int indent_level)
+void tools_open_phy_reg_print(const union tools_open_phy_reg* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nv_base_mac_guid_cap ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_phy_reg ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "guid_en              : " UH_FMT "\n", ptr_struct->guid_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mac_en               : " UH_FMT "\n", ptr_struct->mac_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_allocated_macs : " UH_FMT "\n", ptr_struct->num_of_allocated_macs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_allocated_guids : " UH_FMT "\n", ptr_struct->num_of_allocated_guids);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pmdic:\n");
+    tools_open_pmdic_print(&(ptr_struct->pmdic), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pmdio:\n");
+    tools_open_pmdio_print(&(ptr_struct->pmdio), fd, indent_level + 1);
 }
 
-unsigned int tools_open_nv_base_mac_guid_cap_size(void)
+unsigned int tools_open_phy_reg_size(void)
 {
-	return TOOLS_OPEN_NV_BASE_MAC_GUID_CAP_SIZE;
+    return TOOLS_OPEN_PHY_REG_SIZE;
 }
 
-void tools_open_nv_base_mac_guid_cap_dump(const struct tools_open_nv_base_mac_guid_cap *ptr_struct, FILE *fd)
+void tools_open_phy_reg_dump(const union tools_open_phy_reg* ptr_struct, FILE* fd)
 {
-	tools_open_nv_base_mac_guid_cap_print(ptr_struct, fd, 0);
+    tools_open_phy_reg_print(ptr_struct, fd, 0);
 }
 
-void tools_open_nv_cx3_global_conf_pack(const struct tools_open_nv_cx3_global_conf *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_port_boot_state_pack(const struct tools_open_port_boot_state* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clock_map_to_user);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->phy_param_mode);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->steer_force_vlan);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->cq_timestamp);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->aux_power_indication_gpio);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->aux_power_indication_gpio_en);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->standby_on_aux);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->power_up_on_aux);
 }
 
-void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_port_boot_state_unpack(struct tools_open_port_boot_state* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 4;
-	ptr_struct->clock_map_to_user = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->phy_param_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 1;
-	ptr_struct->steer_force_vlan = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->cq_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 24;
+    ptr_struct->aux_power_indication_gpio = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 2;
+    ptr_struct->aux_power_indication_gpio_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->standby_on_aux = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->power_up_on_aux = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf *ptr_struct, FILE *fd, int indent_level)
+void tools_open_port_boot_state_print(const struct tools_open_port_boot_state* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nv_cx3_global_conf ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_port_boot_state ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clock_map_to_user    : " UH_FMT "\n", ptr_struct->clock_map_to_user);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy_param_mode       : " UH_FMT "\n", ptr_struct->phy_param_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "steer_force_vlan     : " UH_FMT "\n", ptr_struct->steer_force_vlan);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cq_timestamp         : " UH_FMT "\n", ptr_struct->cq_timestamp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "aux_power_indication_gpio : " UH_FMT "\n", ptr_struct->aux_power_indication_gpio);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "aux_power_indication_gpio_en : " UH_FMT "\n", ptr_struct->aux_power_indication_gpio_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "standby_on_aux       : " UH_FMT "\n", ptr_struct->standby_on_aux);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "power_up_on_aux      : " UH_FMT "\n", ptr_struct->power_up_on_aux);
 }
 
-unsigned int tools_open_nv_cx3_global_conf_size(void)
+unsigned int tools_open_port_boot_state_size(void)
 {
-	return TOOLS_OPEN_NV_CX3_GLOBAL_CONF_SIZE;
+    return TOOLS_OPEN_PORT_BOOT_STATE_SIZE;
 }
 
-void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_conf *ptr_struct, FILE *fd)
+void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state* ptr_struct, FILE* fd)
 {
-	tools_open_nv_cx3_global_conf_print(ptr_struct, fd, 0);
+    tools_open_port_boot_state_print(ptr_struct, fd, 0);
 }
 
-void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ip_ver);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->boot_vlan);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->legacy_boot_protocol);
+    offset = 5;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->boot_retry_count);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_vlan_en);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_option_rom_en);
 }
 
-void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 20;
+    ptr_struct->boot_vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 8;
+    ptr_struct->legacy_boot_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 5;
+    ptr_struct->boot_retry_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 1;
+    ptr_struct->boot_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability *ptr_struct, FILE *fd, int indent_level)
+void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_option_rom_capability ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "ip_ver               : " UH_FMT "\n", ptr_struct->ip_ver);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_preboot_boot_settings ========\n");
 
-unsigned int tools_open_option_rom_capability_size(void)
-{
-	return TOOLS_OPEN_OPTION_ROM_CAPABILITY_SIZE;
-}
-
-void tools_open_option_rom_capability_dump(const struct tools_open_option_rom_capability *ptr_struct, FILE *fd)
-{
-	tools_open_option_rom_capability_print(ptr_struct, fd, 0);
-}
-
-void tools_open_package_descriptor_pack(const struct tools_open_package_descriptor *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_devices);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_components);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_offset);
-	offset = 64;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_archive_size);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_size_h);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->cb_size_l);
-	offset = 160;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->cb_compression);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->user_data_offset);
-}
-
-void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->num_of_devices = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->num_of_components = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 32;
-	ptr_struct->cb_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 64;
-	ptr_struct->cb_archive_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 96;
-	ptr_struct->cb_size_h = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->cb_size_l = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 160;
-	ptr_struct->cb_compression = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 192;
-	ptr_struct->user_data_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_package_descriptor_print(const struct tools_open_package_descriptor *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_package_descriptor ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_devices       : " UH_FMT "\n", ptr_struct->num_of_devices);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_components    : " UH_FMT "\n", ptr_struct->num_of_components);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_offset            : " U32H_FMT "\n", ptr_struct->cb_offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_archive_size      : " U32H_FMT "\n", ptr_struct->cb_archive_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_size_h            : " U32H_FMT "\n", ptr_struct->cb_size_h);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_size_l            : " U32H_FMT "\n", ptr_struct->cb_size_l);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cb_compression       : " UH_FMT "\n", ptr_struct->cb_compression);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "user_data_offset     : " U32H_FMT "\n", ptr_struct->user_data_offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_vlan            : " UH_FMT "\n", ptr_struct->boot_vlan);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "legacy_boot_protocol : " UH_FMT "\n", ptr_struct->legacy_boot_protocol);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_retry_count     : " UH_FMT "\n", ptr_struct->boot_retry_count);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_vlan_en         : " UH_FMT "\n", ptr_struct->boot_vlan_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_option_rom_en   : " UH_FMT "\n", ptr_struct->boot_option_rom_en);
 }
 
-unsigned int tools_open_package_descriptor_size(void)
+unsigned int tools_open_preboot_boot_settings_size(void)
 {
-	return TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE;
-}
-
-void tools_open_package_descriptor_dump(const struct tools_open_package_descriptor *ptr_struct, FILE *fd)
-{
-	tools_open_package_descriptor_print(ptr_struct, fd, 0);
-}
-
-void tools_open_pci_capabilities_pack(const struct tools_open_pci_capabilities *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pf_bar_size_supported);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vf_bar_size_supported);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pf_msix_supported);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_vf_msix_supported);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pfs_supported);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->max_total_bar_valid);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->max_total_msix_valid);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->max_vfs_per_pf_valid);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->max_vfs_per_pf);
-	offset = 44;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_num_pfs);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpp_support);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vf_qos_control_support);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_support);
-	offset = 90;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_max_pf_uar_bar_size1);
-	offset = 84;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_max_vf_uar_bar_size);
-	offset = 74;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->max_num_pf_msix);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->max_num_vf_msix);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_total_msix);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_total_bar);
-}
-
-void tools_open_pci_capabilities_unpack(struct tools_open_pci_capabilities *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 7;
-	ptr_struct->pf_bar_size_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->vf_bar_size_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->num_pf_msix_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->num_vf_msix_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->num_pfs_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->max_total_bar_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->max_total_msix_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->max_vfs_per_pf_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->max_vfs_per_pf = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 44;
-	ptr_struct->max_num_pfs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 34;
-	ptr_struct->fpp_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 33;
-	ptr_struct->vf_qos_control_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->sriov_support = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 90;
-	ptr_struct->log_max_pf_uar_bar_size1 = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 84;
-	ptr_struct->log_max_vf_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 74;
-	ptr_struct->max_num_pf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 64;
-	ptr_struct->max_num_vf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 96;
-	ptr_struct->max_total_msix = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->max_total_bar = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_pci_capabilities ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pf_bar_size_supported : " UH_FMT "\n", ptr_struct->pf_bar_size_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vf_bar_size_supported : " UH_FMT "\n", ptr_struct->vf_bar_size_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_pf_msix_supported : " UH_FMT "\n", ptr_struct->num_pf_msix_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_vf_msix_supported : " UH_FMT "\n", ptr_struct->num_vf_msix_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_pfs_supported    : " UH_FMT "\n", ptr_struct->num_pfs_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_total_bar_valid  : " UH_FMT "\n", ptr_struct->max_total_bar_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_total_msix_valid : " UH_FMT "\n", ptr_struct->max_total_msix_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_vfs_per_pf_valid : " UH_FMT "\n", ptr_struct->max_vfs_per_pf_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_vfs_per_pf       : " UH_FMT "\n", ptr_struct->max_vfs_per_pf);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_num_pfs          : " UH_FMT "\n", ptr_struct->max_num_pfs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fpp_support          : " UH_FMT "\n", ptr_struct->fpp_support);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vf_qos_control_support : " UH_FMT "\n", ptr_struct->vf_qos_control_support);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sriov_support        : " UH_FMT "\n", ptr_struct->sriov_support);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_max_pf_uar_bar_size1 : " UH_FMT "\n", ptr_struct->log_max_pf_uar_bar_size1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_max_vf_uar_bar_size : " UH_FMT "\n", ptr_struct->log_max_vf_uar_bar_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_num_pf_msix      : " UH_FMT "\n", ptr_struct->max_num_pf_msix);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_num_vf_msix      : " UH_FMT "\n", ptr_struct->max_num_vf_msix);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_total_msix       : " U32H_FMT "\n", ptr_struct->max_total_msix);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_total_bar        : " U32H_FMT "\n", ptr_struct->max_total_bar);
+    return TOOLS_OPEN_PREBOOT_BOOT_SETTINGS_SIZE;
 }
 
-unsigned int tools_open_pci_capabilities_size(void)
+void tools_open_preboot_boot_settings_dump(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd)
 {
-	return TOOLS_OPEN_PCI_CAPABILITIES_SIZE;
-}
-
-void tools_open_pci_capabilities_dump(const struct tools_open_pci_capabilities *ptr_struct, FILE *fd)
-{
-	tools_open_pci_capabilities_print(ptr_struct, fd, 0);
-}
-
-void tools_open_pci_configuration_pack(const struct tools_open_pci_configuration *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 7;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pf_bar_size_valid);
-	offset = 6;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->vf_bar_size_valid);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pfs_msix_valid);
-	offset = 4;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_vfs_msix_valid);
-	offset = 3;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->num_pfs_valid);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpp_valid);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->full_vf_qos_valid);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_valid);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->total_vfs);
-	offset = 44;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_pfs);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpp_en);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->full_vf_qos);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
-	offset = 90;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_pf_uar_bar_size);
-	offset = 84;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->log_vf_uar_bar_size);
-	offset = 74;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->num_pf_msix);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->num_vf_msix);
-}
-
-void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 7;
-	ptr_struct->pf_bar_size_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 6;
-	ptr_struct->vf_bar_size_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 5;
-	ptr_struct->num_pfs_msix_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 4;
-	ptr_struct->num_vfs_msix_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 3;
-	ptr_struct->num_pfs_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 2;
-	ptr_struct->fpp_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->full_vf_qos_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->sriov_valid = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 48;
-	ptr_struct->total_vfs = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 44;
-	ptr_struct->num_pfs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 34;
-	ptr_struct->fpp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 33;
-	ptr_struct->full_vf_qos = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 90;
-	ptr_struct->log_pf_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 84;
-	ptr_struct->log_vf_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-	offset = 74;
-	ptr_struct->num_pf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 64;
-	ptr_struct->num_vf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-}
-
-void tools_open_pci_configuration_print(const struct tools_open_pci_configuration *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_pci_configuration ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pf_bar_size_valid    : " UH_FMT "\n", ptr_struct->pf_bar_size_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vf_bar_size_valid    : " UH_FMT "\n", ptr_struct->vf_bar_size_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_pfs_msix_valid   : " UH_FMT "\n", ptr_struct->num_pfs_msix_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_vfs_msix_valid   : " UH_FMT "\n", ptr_struct->num_vfs_msix_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_pfs_valid        : " UH_FMT "\n", ptr_struct->num_pfs_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fpp_valid            : " UH_FMT "\n", ptr_struct->fpp_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "full_vf_qos_valid    : " UH_FMT "\n", ptr_struct->full_vf_qos_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sriov_valid          : " UH_FMT "\n", ptr_struct->sriov_valid);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "total_vfs            : " UH_FMT "\n", ptr_struct->total_vfs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_pfs              : " UH_FMT "\n", ptr_struct->num_pfs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fpp_en               : " UH_FMT "\n", ptr_struct->fpp_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "full_vf_qos          : " UH_FMT "\n", ptr_struct->full_vf_qos);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sriov_en             : " UH_FMT "\n", ptr_struct->sriov_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_pf_uar_bar_size  : " UH_FMT "\n", ptr_struct->log_pf_uar_bar_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_vf_uar_bar_size  : " UH_FMT "\n", ptr_struct->log_vf_uar_bar_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_pf_msix          : " UH_FMT "\n", ptr_struct->num_pf_msix);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_vf_msix          : " UH_FMT "\n", ptr_struct->num_vf_msix);
+    tools_open_preboot_boot_settings_print(ptr_struct, fd, 0);
 }
 
-unsigned int tools_open_pci_configuration_size(void)
+void tools_open_preboot_flow_ctrl_pack(const struct tools_open_preboot_flow_ctrl* ptr_struct, u_int8_t* ptr_buff)
 {
-	return TOOLS_OPEN_PCI_CONFIGURATION_SIZE;
-}
+    u_int32_t offset;
 
-void tools_open_pci_configuration_dump(const struct tools_open_pci_configuration *ptr_struct, FILE *fd)
-{
-	tools_open_pci_configuration_print(ptr_struct, fd, 0);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->pfcrx);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->pfctx);
+    offset = 2;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pfc_willing);
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pprx);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pptx);
 }
 
-void tools_open_phy_reg_pack(const union tools_open_phy_reg *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_pmdio_pack(&(ptr_struct->pmdio), ptr_buff);
-}
+    u_int32_t offset;
 
-void tools_open_phy_reg_unpack(union tools_open_phy_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	tools_open_pmdio_unpack(&(ptr_struct->pmdio), ptr_buff);
+    offset = 24;
+    ptr_struct->pfcrx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 16;
+    ptr_struct->pfctx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 2;
+    ptr_struct->pfc_willing = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 1;
+    ptr_struct->pprx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->pptx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_phy_reg_print(const union tools_open_phy_reg *ptr_struct, FILE *fd, int indent_level)
+void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_phy_reg ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_preboot_flow_ctrl ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pmdic:\n");
-	tools_open_pmdic_print(&(ptr_struct->pmdic), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pmdio:\n");
-	tools_open_pmdio_print(&(ptr_struct->pmdio), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pfcrx                : " UH_FMT "\n", ptr_struct->pfcrx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pfctx                : " UH_FMT "\n", ptr_struct->pfctx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pfc_willing          : " UH_FMT "\n", ptr_struct->pfc_willing);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pprx                 : " UH_FMT "\n", ptr_struct->pprx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pptx                 : " UH_FMT "\n", ptr_struct->pptx);
 }
 
-unsigned int tools_open_phy_reg_size(void)
+unsigned int tools_open_preboot_flow_ctrl_size(void)
 {
-	return TOOLS_OPEN_PHY_REG_SIZE;
+    return TOOLS_OPEN_PREBOOT_FLOW_CTRL_SIZE;
 }
 
-void tools_open_phy_reg_dump(const union tools_open_phy_reg *ptr_struct, FILE *fd)
+void tools_open_preboot_flow_ctrl_dump(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd)
 {
-	tools_open_phy_reg_print(ptr_struct, fd, 0);
+    tools_open_preboot_flow_ctrl_print(ptr_struct, fd, 0);
 }
 
-void tools_open_port_boot_state_pack(const struct tools_open_port_boot_state *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_qos_pack(const struct tools_open_qos* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->aux_power_indication_gpio);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->aux_power_indication_gpio_en);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->standby_on_aux);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->power_up_on_aux);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_of_vl);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_of_tc);
 }
 
-void tools_open_port_boot_state_unpack(struct tools_open_port_boot_state *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_qos_unpack(struct tools_open_qos* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->aux_power_indication_gpio = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 2;
-	ptr_struct->aux_power_indication_gpio_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->standby_on_aux = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->power_up_on_aux = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 28;
+    ptr_struct->num_of_vl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 24;
+    ptr_struct->num_of_tc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_port_boot_state_print(const struct tools_open_port_boot_state *ptr_struct, FILE *fd, int indent_level)
+void tools_open_qos_print(const struct tools_open_qos* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_port_boot_state ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_qos ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "aux_power_indication_gpio : " UH_FMT "\n", ptr_struct->aux_power_indication_gpio);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "aux_power_indication_gpio_en : " UH_FMT "\n", ptr_struct->aux_power_indication_gpio_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "standby_on_aux       : " UH_FMT "\n", ptr_struct->standby_on_aux);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "power_up_on_aux      : " UH_FMT "\n", ptr_struct->power_up_on_aux);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_vl            : " UH_FMT "\n", ptr_struct->num_of_vl);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_of_tc            : " UH_FMT "\n", ptr_struct->num_of_tc);
 }
 
-unsigned int tools_open_port_boot_state_size(void)
+unsigned int tools_open_qos_size(void)
 {
-	return TOOLS_OPEN_PORT_BOOT_STATE_SIZE;
+    return TOOLS_OPEN_QOS_SIZE;
 }
 
-void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state *ptr_struct, FILE *fd)
+void tools_open_qos_dump(const struct tools_open_qos* ptr_struct, FILE* fd)
 {
-	tools_open_port_boot_state_print(ptr_struct, fd, 0);
+    tools_open_qos_print(ptr_struct, fd, 0);
 }
 
-void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_qos_cap_pack(const struct tools_open_qos_cap* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->boot_vlan);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->legacy_boot_protocol);
-	offset = 5;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->boot_retry_count);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_vlan_en);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_option_rom_en);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_num_of_vl);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_num_of_tc);
 }
 
-void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_qos_cap_unpack(struct tools_open_qos_cap* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 20;
-	ptr_struct->boot_vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 8;
-	ptr_struct->legacy_boot_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 5;
-	ptr_struct->boot_retry_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 1;
-	ptr_struct->boot_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 28;
+    ptr_struct->max_num_of_vl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 24;
+    ptr_struct->max_num_of_tc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings *ptr_struct, FILE *fd, int indent_level)
+void tools_open_qos_cap_print(const struct tools_open_qos_cap* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_preboot_boot_settings ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_qos_cap ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_vlan            : " UH_FMT "\n", ptr_struct->boot_vlan);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "legacy_boot_protocol : " UH_FMT "\n", ptr_struct->legacy_boot_protocol);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_retry_count     : " UH_FMT "\n", ptr_struct->boot_retry_count);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_vlan_en         : " UH_FMT "\n", ptr_struct->boot_vlan_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_option_rom_en   : " UH_FMT "\n", ptr_struct->boot_option_rom_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_num_of_vl        : " UH_FMT "\n", ptr_struct->max_num_of_vl);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_num_of_tc        : " UH_FMT "\n", ptr_struct->max_num_of_tc);
 }
 
-unsigned int tools_open_preboot_boot_settings_size(void)
+unsigned int tools_open_qos_cap_size(void)
 {
-	return TOOLS_OPEN_PREBOOT_BOOT_SETTINGS_SIZE;
+    return TOOLS_OPEN_QOS_CAP_SIZE;
 }
 
-void tools_open_preboot_boot_settings_dump(const struct tools_open_preboot_boot_settings *ptr_struct, FILE *fd)
+void tools_open_qos_cap_dump(const struct tools_open_qos_cap* ptr_struct, FILE* fd)
 {
-	tools_open_preboot_boot_settings_print(ptr_struct, fd, 0);
+    tools_open_qos_cap_print(ptr_struct, fd, 0);
 }
 
-void tools_open_preboot_flow_ctrl_pack(const struct tools_open_preboot_flow_ctrl *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct,
+                                             u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->pfcrx);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->pfctx);
-	offset = 2;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pfc_willing);
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pprx);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pptx);
-}
+    u_int32_t offset;
 
-void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl *ptr_struct, const u_int8_t *ptr_buff)
+    offset = 17;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_clock_map_to_user);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_phy_param_mode);
+    offset = 15;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_steer_force_vlan_supported);
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_cq_timestamp_supported);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_default_config_payload_version);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_vfs);
+    offset = 52;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uar_bar_size);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_uar_bar_size);
+    offset = 42;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_ip_ver);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_phy_param_mode);
+    offset = 36;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_clock_map_to_user);
+    offset = 35;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_steer_force_vlan);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_cq_timestamp);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
+}
+
+void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct,
+                                               const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->pfcrx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 16;
-	ptr_struct->pfctx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 2;
-	ptr_struct->pfc_willing = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 1;
-	ptr_struct->pprx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->pptx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
+    u_int32_t offset;
 
-void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl *ptr_struct, FILE *fd, int indent_level)
+    offset = 17;
+    ptr_struct->nv_config_clock_map_to_user = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->nv_config_phy_param_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 15;
+    ptr_struct->nv_steer_force_vlan_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 14;
+    ptr_struct->nv_cq_timestamp_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->fw_default_config_payload_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->num_vfs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 52;
+    ptr_struct->uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 48;
+    ptr_struct->max_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 42;
+    ptr_struct->boot_ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 40;
+    ptr_struct->default_phy_param_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 36;
+    ptr_struct->default_clock_map_to_user = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 35;
+    ptr_struct->default_steer_force_vlan = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 34;
+    ptr_struct->default_cq_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+}
+
+void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_preboot_flow_ctrl ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_query_def_params_global ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pfcrx                : " UH_FMT "\n", ptr_struct->pfcrx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pfctx                : " UH_FMT "\n", ptr_struct->pfctx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pfc_willing          : " UH_FMT "\n", ptr_struct->pfc_willing);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pprx                 : " UH_FMT "\n", ptr_struct->pprx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pptx                 : " UH_FMT "\n", ptr_struct->pptx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_clock_map_to_user : " UH_FMT "\n", ptr_struct->nv_config_clock_map_to_user);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_phy_param_mode : " UH_FMT "\n", ptr_struct->nv_config_phy_param_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_steer_force_vlan_supported : " UH_FMT "\n", ptr_struct->nv_steer_force_vlan_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_cq_timestamp_supported : " UH_FMT "\n", ptr_struct->nv_cq_timestamp_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_default_config_payload_version : " UH_FMT "\n", ptr_struct->fw_default_config_payload_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "num_vfs              : " UH_FMT "\n", ptr_struct->num_vfs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "uar_bar_size         : " UH_FMT "\n", ptr_struct->uar_bar_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "max_uar_bar_size     : " UH_FMT "\n", ptr_struct->max_uar_bar_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_ip_ver          : " UH_FMT "\n", ptr_struct->boot_ip_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_phy_param_mode : " UH_FMT "\n", ptr_struct->default_phy_param_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_clock_map_to_user : " UH_FMT "\n", ptr_struct->default_clock_map_to_user);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_steer_force_vlan : " UH_FMT "\n", ptr_struct->default_steer_force_vlan);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_cq_timestamp : " UH_FMT "\n", ptr_struct->default_cq_timestamp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sriov_en             : " UH_FMT "\n", ptr_struct->sriov_en);
 }
 
-unsigned int tools_open_preboot_flow_ctrl_size(void)
+unsigned int tools_open_query_def_params_global_size(void)
 {
-	return TOOLS_OPEN_PREBOOT_FLOW_CTRL_SIZE;
+    return TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE;
 }
 
-void tools_open_preboot_flow_ctrl_dump(const struct tools_open_preboot_flow_ctrl *ptr_struct, FILE *fd)
+void tools_open_query_def_params_global_dump(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd)
 {
-	tools_open_preboot_flow_ctrl_print(ptr_struct, fd, 0);
+    tools_open_query_def_params_global_print(ptr_struct, fd, 0);
 }
 
-void tools_open_qos_pack(const struct tools_open_qos *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                               u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_of_vl);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->num_of_tc);
-}
+    u_int32_t offset;
 
-void tools_open_qos_unpack(struct tools_open_qos *ptr_struct, const u_int8_t *ptr_buff)
+    offset = 14;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_vpi_force_mode);
+    offset = 13;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_vpi);
+    offset = 12;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_wol);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_default_config_payload_version);
+    offset = 52;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->default_boot_vlan);
+    offset = 44;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->default_boot_protocol);
+    offset = 40;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->default_boot_retry_cnt);
+    offset = 37;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_network_link_type);
+    offset = 36;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_en_wol_magic);
+    offset = 35;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_boot_vlan_en);
+    offset = 34;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_boot_option_rom_en);
+    offset = 33;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_pprx);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_pptx);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->default_boot_pkey);
+    offset = 70;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->boot_ip_ver);
+    offset = 68;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_infiniband_dhcp_settings);
+    offset = 67;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_infiniband_boot_settings);
+    offset = 66;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_dhcp_iscsi_parameters);
+    offset = 65;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_iscsi_parameters);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_boot_parameters);
+    offset = 118;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_vpi_force_mode);
+    offset = 116;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_vpi_xfi_mode);
+    offset = 114;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_vpi_phy_type);
+    offset = 104;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->iscsi_boot_to_target);
+    offset = 101;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_vlan_en);
+    offset = 100;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_tcp_timestamps_en);
+    offset = 99;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_chap_mutual_auth_en);
+    offset = 98;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_chap_auth_en);
+    offset = 97;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_dhcp_params_en);
+    offset = 96;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_ipv4_dhcp_en);
+    offset = 152;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->iscsi_lun_busy_retry_cnt);
+    offset = 144;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->iscsi_link_up_delay_time);
+}
+
+void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct,
+                                                 const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 28;
-	ptr_struct->num_of_vl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 24;
-	ptr_struct->num_of_tc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-}
+    u_int32_t offset;
 
-void tools_open_qos_print(const struct tools_open_qos *ptr_struct, FILE *fd, int indent_level)
+    offset = 14;
+    ptr_struct->nv_config_vpi_force_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 13;
+    ptr_struct->nv_config_vpi = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 12;
+    ptr_struct->nv_config_wol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->fw_default_config_payload_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 52;
+    ptr_struct->default_boot_vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
+    offset = 44;
+    ptr_struct->default_boot_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 40;
+    ptr_struct->default_boot_retry_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 37;
+    ptr_struct->default_network_link_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 36;
+    ptr_struct->default_en_wol_magic = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 35;
+    ptr_struct->default_boot_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 34;
+    ptr_struct->default_boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 33;
+    ptr_struct->default_pprx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 32;
+    ptr_struct->default_pptx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 80;
+    ptr_struct->default_boot_pkey = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 70;
+    ptr_struct->boot_ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 68;
+    ptr_struct->nv_config_infiniband_dhcp_settings = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 67;
+    ptr_struct->nv_config_infiniband_boot_settings = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 66;
+    ptr_struct->nv_config_dhcp_iscsi_parameters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 65;
+    ptr_struct->nv_config_iscsi_parameters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 64;
+    ptr_struct->nv_config_boot_parameters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 118;
+    ptr_struct->default_vpi_force_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 116;
+    ptr_struct->default_vpi_xfi_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 114;
+    ptr_struct->default_vpi_phy_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 104;
+    ptr_struct->iscsi_boot_to_target = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 101;
+    ptr_struct->iscsi_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 100;
+    ptr_struct->iscsi_tcp_timestamps_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 99;
+    ptr_struct->iscsi_chap_mutual_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 98;
+    ptr_struct->iscsi_chap_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 97;
+    ptr_struct->iscsi_dhcp_params_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 96;
+    ptr_struct->iscsi_ipv4_dhcp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 152;
+    ptr_struct->iscsi_lun_busy_retry_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 144;
+    ptr_struct->iscsi_link_up_delay_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+}
+
+void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_qos ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_vl            : " UH_FMT "\n", ptr_struct->num_of_vl);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_of_tc            : " UH_FMT "\n", ptr_struct->num_of_tc);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_query_def_params_per_port ========\n");
 
-unsigned int tools_open_qos_size(void)
-{
-	return TOOLS_OPEN_QOS_SIZE;
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_vpi_force_mode : " UH_FMT "\n", ptr_struct->nv_config_vpi_force_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_vpi        : " UH_FMT "\n", ptr_struct->nv_config_vpi);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_wol        : " UH_FMT "\n", ptr_struct->nv_config_wol);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "fw_default_config_payload_version : " UH_FMT "\n", ptr_struct->fw_default_config_payload_version);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_boot_vlan    : " UH_FMT "\n", ptr_struct->default_boot_vlan);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_boot_protocol : " UH_FMT "\n", ptr_struct->default_boot_protocol);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_boot_retry_cnt : " UH_FMT "\n", ptr_struct->default_boot_retry_cnt);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_network_link_type : " UH_FMT "\n", ptr_struct->default_network_link_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_en_wol_magic : " UH_FMT "\n", ptr_struct->default_en_wol_magic);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_boot_vlan_en : " UH_FMT "\n", ptr_struct->default_boot_vlan_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_boot_option_rom_en : " UH_FMT "\n", ptr_struct->default_boot_option_rom_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_pprx         : " UH_FMT "\n", ptr_struct->default_pprx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_pptx         : " UH_FMT "\n", ptr_struct->default_pptx);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_boot_pkey    : " UH_FMT "\n", ptr_struct->default_boot_pkey);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_ip_ver          : " UH_FMT "\n", ptr_struct->boot_ip_ver);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_infiniband_dhcp_settings : " UH_FMT "\n", ptr_struct->nv_config_infiniband_dhcp_settings);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_infiniband_boot_settings : " UH_FMT "\n", ptr_struct->nv_config_infiniband_boot_settings);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_dhcp_iscsi_parameters : " UH_FMT "\n", ptr_struct->nv_config_dhcp_iscsi_parameters);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_iscsi_parameters : " UH_FMT "\n", ptr_struct->nv_config_iscsi_parameters);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_config_boot_parameters : " UH_FMT "\n", ptr_struct->nv_config_boot_parameters);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_vpi_force_mode : " UH_FMT "\n", ptr_struct->default_vpi_force_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_vpi_xfi_mode : " UH_FMT "\n", ptr_struct->default_vpi_xfi_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_vpi_phy_type : " UH_FMT "\n", ptr_struct->default_vpi_phy_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_boot_to_target : " UH_FMT "\n", ptr_struct->iscsi_boot_to_target);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_vlan_en        : " UH_FMT "\n", ptr_struct->iscsi_vlan_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_tcp_timestamps_en : " UH_FMT "\n", ptr_struct->iscsi_tcp_timestamps_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_chap_mutual_auth_en : " UH_FMT "\n", ptr_struct->iscsi_chap_mutual_auth_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_chap_auth_en   : " UH_FMT "\n", ptr_struct->iscsi_chap_auth_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_dhcp_params_en : " UH_FMT "\n", ptr_struct->iscsi_dhcp_params_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_ipv4_dhcp_en   : " UH_FMT "\n", ptr_struct->iscsi_ipv4_dhcp_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_lun_busy_retry_cnt : " UH_FMT "\n", ptr_struct->iscsi_lun_busy_retry_cnt);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_link_up_delay_time : " UH_FMT "\n", ptr_struct->iscsi_link_up_delay_time);
 }
 
-void tools_open_qos_dump(const struct tools_open_qos *ptr_struct, FILE *fd)
+unsigned int tools_open_query_def_params_per_port_size(void)
 {
-	tools_open_qos_print(ptr_struct, fd, 0);
+    return TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE;
 }
 
-void tools_open_qos_cap_pack(const struct tools_open_qos_cap *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd)
 {
-	u_int32_t offset;
-
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_num_of_vl);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_num_of_tc);
+    tools_open_query_def_params_per_port_print(ptr_struct, fd, 0);
 }
 
-void tools_open_qos_cap_unpack(struct tools_open_qos_cap *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_roce_cc_pack(const struct tools_open_roce_cc* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	ptr_struct->max_num_of_vl = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 24;
-	ptr_struct->max_num_of_tc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->roce_cc_enable_priority);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->roce_cc_algorithm);
 }
 
-void tools_open_qos_cap_print(const struct tools_open_qos_cap *ptr_struct, FILE *fd, int indent_level)
+void tools_open_roce_cc_unpack(struct tools_open_roce_cc* ptr_struct, const u_int8_t* ptr_buff)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_qos_cap ========\n");
+    u_int32_t offset;
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_num_of_vl        : " UH_FMT "\n", ptr_struct->max_num_of_vl);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_num_of_tc        : " UH_FMT "\n", ptr_struct->max_num_of_tc);
+    offset = 24;
+    ptr_struct->roce_cc_enable_priority = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->roce_cc_algorithm = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-unsigned int tools_open_qos_cap_size(void)
+void tools_open_roce_cc_print(const struct tools_open_roce_cc* ptr_struct, FILE* fd, int indent_level)
 {
-	return TOOLS_OPEN_QOS_CAP_SIZE;
-}
-
-void tools_open_qos_cap_dump(const struct tools_open_qos_cap *ptr_struct, FILE *fd)
-{
-	tools_open_qos_cap_print(ptr_struct, fd, 0);
-}
-
-void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 17;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_clock_map_to_user);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_phy_param_mode);
-	offset = 15;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_steer_force_vlan_supported);
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_cq_timestamp_supported);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_default_config_payload_version);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->num_vfs);
-	offset = 52;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uar_bar_size);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_uar_bar_size);
-	offset = 42;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_ip_ver);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_phy_param_mode);
-	offset = 36;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_clock_map_to_user);
-	offset = 35;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_steer_force_vlan);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_cq_timestamp);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
-}
-
-void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 17;
-	ptr_struct->nv_config_clock_map_to_user = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 16;
-	ptr_struct->nv_config_phy_param_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 15;
-	ptr_struct->nv_steer_force_vlan_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 14;
-	ptr_struct->nv_cq_timestamp_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->fw_default_config_payload_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 56;
-	ptr_struct->num_vfs = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 52;
-	ptr_struct->uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 48;
-	ptr_struct->max_uar_bar_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 42;
-	ptr_struct->boot_ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 40;
-	ptr_struct->default_phy_param_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 36;
-	ptr_struct->default_clock_map_to_user = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 35;
-	ptr_struct->default_steer_force_vlan = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 34;
-	ptr_struct->default_cq_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
-
-void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_query_def_params_global ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_clock_map_to_user : " UH_FMT "\n", ptr_struct->nv_config_clock_map_to_user);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_phy_param_mode : " UH_FMT "\n", ptr_struct->nv_config_phy_param_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_steer_force_vlan_supported : " UH_FMT "\n", ptr_struct->nv_steer_force_vlan_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_cq_timestamp_supported : " UH_FMT "\n", ptr_struct->nv_cq_timestamp_supported);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_default_config_payload_version : " UH_FMT "\n", ptr_struct->fw_default_config_payload_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "num_vfs              : " UH_FMT "\n", ptr_struct->num_vfs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "uar_bar_size         : " UH_FMT "\n", ptr_struct->uar_bar_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "max_uar_bar_size     : " UH_FMT "\n", ptr_struct->max_uar_bar_size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_ip_ver          : " UH_FMT "\n", ptr_struct->boot_ip_ver);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_phy_param_mode : " UH_FMT "\n", ptr_struct->default_phy_param_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_clock_map_to_user : " UH_FMT "\n", ptr_struct->default_clock_map_to_user);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_steer_force_vlan : " UH_FMT "\n", ptr_struct->default_steer_force_vlan);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_cq_timestamp : " UH_FMT "\n", ptr_struct->default_cq_timestamp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sriov_en             : " UH_FMT "\n", ptr_struct->sriov_en);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_roce_cc ========\n");
 
-unsigned int tools_open_query_def_params_global_size(void)
-{
-	return TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE;
-}
-
-void tools_open_query_def_params_global_dump(const struct tools_open_query_def_params_global *ptr_struct, FILE *fd)
-{
-	tools_open_query_def_params_global_print(ptr_struct, fd, 0);
-}
-
-void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 14;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_vpi_force_mode);
-	offset = 13;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_vpi);
-	offset = 12;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_wol);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->fw_default_config_payload_version);
-	offset = 52;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 12, (u_int32_t)ptr_struct->default_boot_vlan);
-	offset = 44;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->default_boot_protocol);
-	offset = 40;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->default_boot_retry_cnt);
-	offset = 37;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_network_link_type);
-	offset = 36;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_en_wol_magic);
-	offset = 35;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_boot_vlan_en);
-	offset = 34;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_boot_option_rom_en);
-	offset = 33;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_pprx);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_pptx);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->default_boot_pkey);
-	offset = 70;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->boot_ip_ver);
-	offset = 68;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_infiniband_dhcp_settings);
-	offset = 67;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_infiniband_boot_settings);
-	offset = 66;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_dhcp_iscsi_parameters);
-	offset = 65;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_iscsi_parameters);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->nv_config_boot_parameters);
-	offset = 118;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->default_vpi_force_mode);
-	offset = 116;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_vpi_xfi_mode);
-	offset = 114;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_vpi_phy_type);
-	offset = 104;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->iscsi_boot_to_target);
-	offset = 101;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_vlan_en);
-	offset = 100;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_tcp_timestamps_en);
-	offset = 99;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_chap_mutual_auth_en);
-	offset = 98;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_chap_auth_en);
-	offset = 97;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_dhcp_params_en);
-	offset = 96;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->iscsi_ipv4_dhcp_en);
-	offset = 152;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->iscsi_lun_busy_retry_cnt);
-	offset = 144;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->iscsi_link_up_delay_time);
-}
-
-void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 14;
-	ptr_struct->nv_config_vpi_force_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 13;
-	ptr_struct->nv_config_vpi = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 12;
-	ptr_struct->nv_config_wol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->fw_default_config_payload_version = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 52;
-	ptr_struct->default_boot_vlan = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 12);
-	offset = 44;
-	ptr_struct->default_boot_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 40;
-	ptr_struct->default_boot_retry_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 37;
-	ptr_struct->default_network_link_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 36;
-	ptr_struct->default_en_wol_magic = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 35;
-	ptr_struct->default_boot_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 34;
-	ptr_struct->default_boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 33;
-	ptr_struct->default_pprx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 32;
-	ptr_struct->default_pptx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 80;
-	ptr_struct->default_boot_pkey = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 70;
-	ptr_struct->boot_ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 68;
-	ptr_struct->nv_config_infiniband_dhcp_settings = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 67;
-	ptr_struct->nv_config_infiniband_boot_settings = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 66;
-	ptr_struct->nv_config_dhcp_iscsi_parameters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 65;
-	ptr_struct->nv_config_iscsi_parameters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 64;
-	ptr_struct->nv_config_boot_parameters = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 118;
-	ptr_struct->default_vpi_force_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 116;
-	ptr_struct->default_vpi_xfi_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 114;
-	ptr_struct->default_vpi_phy_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 104;
-	ptr_struct->iscsi_boot_to_target = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 101;
-	ptr_struct->iscsi_vlan_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 100;
-	ptr_struct->iscsi_tcp_timestamps_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 99;
-	ptr_struct->iscsi_chap_mutual_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 98;
-	ptr_struct->iscsi_chap_auth_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 97;
-	ptr_struct->iscsi_dhcp_params_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 96;
-	ptr_struct->iscsi_ipv4_dhcp_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 152;
-	ptr_struct->iscsi_lun_busy_retry_cnt = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 144;
-	ptr_struct->iscsi_link_up_delay_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-}
-
-void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_query_def_params_per_port ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_vpi_force_mode : " UH_FMT "\n", ptr_struct->nv_config_vpi_force_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_vpi        : " UH_FMT "\n", ptr_struct->nv_config_vpi);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_wol        : " UH_FMT "\n", ptr_struct->nv_config_wol);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "fw_default_config_payload_version : " UH_FMT "\n", ptr_struct->fw_default_config_payload_version);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_boot_vlan    : " UH_FMT "\n", ptr_struct->default_boot_vlan);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_boot_protocol : " UH_FMT "\n", ptr_struct->default_boot_protocol);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_boot_retry_cnt : " UH_FMT "\n", ptr_struct->default_boot_retry_cnt);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_network_link_type : " UH_FMT "\n", ptr_struct->default_network_link_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_en_wol_magic : " UH_FMT "\n", ptr_struct->default_en_wol_magic);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_boot_vlan_en : " UH_FMT "\n", ptr_struct->default_boot_vlan_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_boot_option_rom_en : " UH_FMT "\n", ptr_struct->default_boot_option_rom_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_pprx         : " UH_FMT "\n", ptr_struct->default_pprx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_pptx         : " UH_FMT "\n", ptr_struct->default_pptx);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_boot_pkey    : " UH_FMT "\n", ptr_struct->default_boot_pkey);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_ip_ver          : " UH_FMT "\n", ptr_struct->boot_ip_ver);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_infiniband_dhcp_settings : " UH_FMT "\n", ptr_struct->nv_config_infiniband_dhcp_settings);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_infiniband_boot_settings : " UH_FMT "\n", ptr_struct->nv_config_infiniband_boot_settings);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_dhcp_iscsi_parameters : " UH_FMT "\n", ptr_struct->nv_config_dhcp_iscsi_parameters);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_iscsi_parameters : " UH_FMT "\n", ptr_struct->nv_config_iscsi_parameters);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_config_boot_parameters : " UH_FMT "\n", ptr_struct->nv_config_boot_parameters);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_vpi_force_mode : " UH_FMT "\n", ptr_struct->default_vpi_force_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_vpi_xfi_mode : " UH_FMT "\n", ptr_struct->default_vpi_xfi_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_vpi_phy_type : " UH_FMT "\n", ptr_struct->default_vpi_phy_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_boot_to_target : " UH_FMT "\n", ptr_struct->iscsi_boot_to_target);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_vlan_en        : " UH_FMT "\n", ptr_struct->iscsi_vlan_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_tcp_timestamps_en : " UH_FMT "\n", ptr_struct->iscsi_tcp_timestamps_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_chap_mutual_auth_en : " UH_FMT "\n", ptr_struct->iscsi_chap_mutual_auth_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_chap_auth_en   : " UH_FMT "\n", ptr_struct->iscsi_chap_auth_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_dhcp_params_en : " UH_FMT "\n", ptr_struct->iscsi_dhcp_params_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_ipv4_dhcp_en   : " UH_FMT "\n", ptr_struct->iscsi_ipv4_dhcp_en);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_lun_busy_retry_cnt : " UH_FMT "\n", ptr_struct->iscsi_lun_busy_retry_cnt);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_link_up_delay_time : " UH_FMT "\n", ptr_struct->iscsi_link_up_delay_time);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "roce_cc_enable_priority : " UH_FMT "\n", ptr_struct->roce_cc_enable_priority);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "roce_cc_algorithm    : " UH_FMT "\n", ptr_struct->roce_cc_algorithm);
 }
 
-unsigned int tools_open_query_def_params_per_port_size(void)
+unsigned int tools_open_roce_cc_size(void)
 {
-	return TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE;
+    return TOOLS_OPEN_ROCE_CC_SIZE;
 }
 
-void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port *ptr_struct, FILE *fd)
+void tools_open_roce_cc_dump(const struct tools_open_roce_cc* ptr_struct, FILE* fd)
 {
-	tools_open_query_def_params_per_port_print(ptr_struct, fd, 0);
+    tools_open_roce_cc_print(ptr_struct, fd, 0);
 }
 
-void tools_open_roce_cc_pack(const struct tools_open_roce_cc *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_roce_cc_ecn_pack(const struct tools_open_roce_cc_ecn* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->roce_cc_enable_priority);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->roce_cc_algorithm);
-}
+    u_int32_t offset;
 
-void tools_open_roce_cc_unpack(struct tools_open_roce_cc *ptr_struct, const u_int8_t *ptr_buff)
+    offset = 1;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clamp_tgt_rate_after_time_inc);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clamp_tgt_rate);
+    offset = 47;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_time_reset);
+    offset = 81;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 15, (u_int32_t)ptr_struct->rpg_byte_reset);
+    offset = 123;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->rpg_threshold);
+    offset = 129;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 31, (u_int32_t)ptr_struct->rpg_max_rate);
+    offset = 175;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_ai_rate);
+    offset = 207;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_hai_rate);
+    offset = 252;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rpg_gd);
+    offset = 280;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->rpg_min_dec_fac);
+    offset = 303;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_min_rate);
+    offset = 335;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rate_to_set_on_first_cnp);
+    offset = 374;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->dce_tcp_g);
+    offset = 399;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->dce_tcp_rtt);
+    offset = 431;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rate_reduce_monitor_period);
+    offset = 470;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->initial_alpha_value);
+    offset = 495;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->min_time_between_cnps);
+    offset = 541;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->cnp_802p_prio);
+    offset = 530;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->cnp_dscp);
+}
+
+void tools_open_roce_cc_ecn_unpack(struct tools_open_roce_cc_ecn* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
-
-	offset = 24;
-	ptr_struct->roce_cc_enable_priority = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->roce_cc_algorithm = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-}
+    u_int32_t offset;
 
-void tools_open_roce_cc_print(const struct tools_open_roce_cc *ptr_struct, FILE *fd, int indent_level)
+    offset = 1;
+    ptr_struct->clamp_tgt_rate_after_time_inc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->clamp_tgt_rate = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 47;
+    ptr_struct->rpg_time_reset = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 81;
+    ptr_struct->rpg_byte_reset = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 15);
+    offset = 123;
+    ptr_struct->rpg_threshold = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
+    offset = 129;
+    ptr_struct->rpg_max_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 31);
+    offset = 175;
+    ptr_struct->rpg_ai_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 207;
+    ptr_struct->rpg_hai_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 252;
+    ptr_struct->rpg_gd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 280;
+    ptr_struct->rpg_min_dec_fac = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 303;
+    ptr_struct->rpg_min_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 335;
+    ptr_struct->rate_to_set_on_first_cnp = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 374;
+    ptr_struct->dce_tcp_g = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 399;
+    ptr_struct->dce_tcp_rtt = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 431;
+    ptr_struct->rate_reduce_monitor_period = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 470;
+    ptr_struct->initial_alpha_value = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
+    offset = 495;
+    ptr_struct->min_time_between_cnps = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
+    offset = 541;
+    ptr_struct->cnp_802p_prio = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
+    offset = 530;
+    ptr_struct->cnp_dscp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
+}
+
+void tools_open_roce_cc_ecn_print(const struct tools_open_roce_cc_ecn* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_roce_cc ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "roce_cc_enable_priority : " UH_FMT "\n", ptr_struct->roce_cc_enable_priority);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "roce_cc_algorithm    : " UH_FMT "\n", ptr_struct->roce_cc_algorithm);
-}
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_roce_cc_ecn ========\n");
 
-unsigned int tools_open_roce_cc_size(void)
-{
-	return TOOLS_OPEN_ROCE_CC_SIZE;
-}
-
-void tools_open_roce_cc_dump(const struct tools_open_roce_cc *ptr_struct, FILE *fd)
-{
-	tools_open_roce_cc_print(ptr_struct, fd, 0);
-}
-
-void tools_open_roce_cc_ecn_pack(const struct tools_open_roce_cc_ecn *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 1;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clamp_tgt_rate_after_time_inc);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->clamp_tgt_rate);
-	offset = 47;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_time_reset);
-	offset = 81;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 15, (u_int32_t)ptr_struct->rpg_byte_reset);
-	offset = 123;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 5, (u_int32_t)ptr_struct->rpg_threshold);
-	offset = 129;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 31, (u_int32_t)ptr_struct->rpg_max_rate);
-	offset = 175;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_ai_rate);
-	offset = 207;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_hai_rate);
-	offset = 252;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->rpg_gd);
-	offset = 280;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->rpg_min_dec_fac);
-	offset = 303;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rpg_min_rate);
-	offset = 335;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rate_to_set_on_first_cnp);
-	offset = 374;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->dce_tcp_g);
-	offset = 399;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->dce_tcp_rtt);
-	offset = 431;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->rate_reduce_monitor_period);
-	offset = 470;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 10, (u_int32_t)ptr_struct->initial_alpha_value);
-	offset = 495;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 17, (u_int32_t)ptr_struct->min_time_between_cnps);
-	offset = 541;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 3, (u_int32_t)ptr_struct->cnp_802p_prio);
-	offset = 530;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 6, (u_int32_t)ptr_struct->cnp_dscp);
-}
-
-void tools_open_roce_cc_ecn_unpack(struct tools_open_roce_cc_ecn *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 1;
-	ptr_struct->clamp_tgt_rate_after_time_inc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 0;
-	ptr_struct->clamp_tgt_rate = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 47;
-	ptr_struct->rpg_time_reset = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 81;
-	ptr_struct->rpg_byte_reset = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 15);
-	offset = 123;
-	ptr_struct->rpg_threshold = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 5);
-	offset = 129;
-	ptr_struct->rpg_max_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 31);
-	offset = 175;
-	ptr_struct->rpg_ai_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 207;
-	ptr_struct->rpg_hai_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 252;
-	ptr_struct->rpg_gd = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
-	offset = 280;
-	ptr_struct->rpg_min_dec_fac = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 303;
-	ptr_struct->rpg_min_rate = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 335;
-	ptr_struct->rate_to_set_on_first_cnp = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 374;
-	ptr_struct->dce_tcp_g = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 399;
-	ptr_struct->dce_tcp_rtt = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 431;
-	ptr_struct->rate_reduce_monitor_period = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 470;
-	ptr_struct->initial_alpha_value = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
-	offset = 495;
-	ptr_struct->min_time_between_cnps = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 17);
-	offset = 541;
-	ptr_struct->cnp_802p_prio = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 3);
-	offset = 530;
-	ptr_struct->cnp_dscp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 6);
-}
-
-void tools_open_roce_cc_ecn_print(const struct tools_open_roce_cc_ecn *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_roce_cc_ecn ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clamp_tgt_rate_after_time_inc : " UH_FMT "\n", ptr_struct->clamp_tgt_rate_after_time_inc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "clamp_tgt_rate       : " UH_FMT "\n", ptr_struct->clamp_tgt_rate);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_time_reset       : " UH_FMT "\n", ptr_struct->rpg_time_reset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_byte_reset       : " UH_FMT "\n", ptr_struct->rpg_byte_reset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_threshold        : " UH_FMT "\n", ptr_struct->rpg_threshold);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_max_rate         : " UH_FMT "\n", ptr_struct->rpg_max_rate);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_ai_rate          : " UH_FMT "\n", ptr_struct->rpg_ai_rate);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_hai_rate         : " UH_FMT "\n", ptr_struct->rpg_hai_rate);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_gd               : " UH_FMT "\n", ptr_struct->rpg_gd);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_min_dec_fac      : " UH_FMT "\n", ptr_struct->rpg_min_dec_fac);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rpg_min_rate         : " UH_FMT "\n", ptr_struct->rpg_min_rate);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rate_to_set_on_first_cnp : " UH_FMT "\n", ptr_struct->rate_to_set_on_first_cnp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dce_tcp_g            : " UH_FMT "\n", ptr_struct->dce_tcp_g);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "dce_tcp_rtt          : " UH_FMT "\n", ptr_struct->dce_tcp_rtt);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "rate_reduce_monitor_period : " UH_FMT "\n", ptr_struct->rate_reduce_monitor_period);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "initial_alpha_value  : " UH_FMT "\n", ptr_struct->initial_alpha_value);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "min_time_between_cnps : " UH_FMT "\n", ptr_struct->min_time_between_cnps);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cnp_802p_prio        : " UH_FMT "\n", ptr_struct->cnp_802p_prio);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "cnp_dscp             : " UH_FMT "\n", ptr_struct->cnp_dscp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clamp_tgt_rate_after_time_inc : " UH_FMT "\n", ptr_struct->clamp_tgt_rate_after_time_inc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "clamp_tgt_rate       : " UH_FMT "\n", ptr_struct->clamp_tgt_rate);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_time_reset       : " UH_FMT "\n", ptr_struct->rpg_time_reset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_byte_reset       : " UH_FMT "\n", ptr_struct->rpg_byte_reset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_threshold        : " UH_FMT "\n", ptr_struct->rpg_threshold);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_max_rate         : " UH_FMT "\n", ptr_struct->rpg_max_rate);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_ai_rate          : " UH_FMT "\n", ptr_struct->rpg_ai_rate);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_hai_rate         : " UH_FMT "\n", ptr_struct->rpg_hai_rate);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_gd               : " UH_FMT "\n", ptr_struct->rpg_gd);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_min_dec_fac      : " UH_FMT "\n", ptr_struct->rpg_min_dec_fac);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rpg_min_rate         : " UH_FMT "\n", ptr_struct->rpg_min_rate);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rate_to_set_on_first_cnp : " UH_FMT "\n", ptr_struct->rate_to_set_on_first_cnp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dce_tcp_g            : " UH_FMT "\n", ptr_struct->dce_tcp_g);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "dce_tcp_rtt          : " UH_FMT "\n", ptr_struct->dce_tcp_rtt);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "rate_reduce_monitor_period : " UH_FMT "\n", ptr_struct->rate_reduce_monitor_period);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "initial_alpha_value  : " UH_FMT "\n", ptr_struct->initial_alpha_value);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "min_time_between_cnps : " UH_FMT "\n", ptr_struct->min_time_between_cnps);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cnp_802p_prio        : " UH_FMT "\n", ptr_struct->cnp_802p_prio);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "cnp_dscp             : " UH_FMT "\n", ptr_struct->cnp_dscp);
 }
 
 unsigned int tools_open_roce_cc_ecn_size(void)
 {
-	return TOOLS_OPEN_ROCE_CC_ECN_SIZE;
+    return TOOLS_OPEN_ROCE_CC_ECN_SIZE;
 }
 
-void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn *ptr_struct, FILE *fd)
+void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn* ptr_struct, FILE* fd)
 {
-	tools_open_roce_cc_ecn_print(ptr_struct, fd, 0);
+    tools_open_roce_cc_ecn_print(ptr_struct, fd, 0);
 }
 
-void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                              u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->roce_over_ip_next_protocol);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->roce_over_ip_next_protocol);
 }
 
-void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->roce_over_ip_next_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 24;
+    ptr_struct->roce_over_ip_next_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol *ptr_struct, FILE *fd, int indent_level)
+void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_roce_v_1_5_next_protocol ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_roce_v_1_5_next_protocol ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "roce_over_ip_next_protocol : " UH_FMT "\n", ptr_struct->roce_over_ip_next_protocol);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "roce_over_ip_next_protocol : " UH_FMT "\n", ptr_struct->roce_over_ip_next_protocol);
 }
 
 unsigned int tools_open_roce_v_1_5_next_protocol_size(void)
 {
-	return TOOLS_OPEN_ROCE_V_1_5_NEXT_PROTOCOL_SIZE;
+    return TOOLS_OPEN_ROCE_V_1_5_NEXT_PROTOCOL_SIZE;
 }
 
-void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol *ptr_struct, FILE *fd)
+void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd)
 {
-	tools_open_roce_v_1_5_next_protocol_print(ptr_struct, fd, 0);
+    tools_open_roce_v_1_5_next_protocol_print(ptr_struct, fd, 0);
 }
 
-void tools_open_smp_data_pack(const union tools_open_smp_data *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_smp_data_pack(const union tools_open_smp_data* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_extended_ib_port_info_pack(&(ptr_struct->extended_port_info), ptr_buff);
+    tools_open_extended_ib_port_info_pack(&(ptr_struct->extended_port_info), ptr_buff);
 }
 
-void tools_open_smp_data_unpack(union tools_open_smp_data *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_smp_data_unpack(union tools_open_smp_data* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_extended_ib_port_info_unpack(&(ptr_struct->extended_port_info), ptr_buff);
+    tools_open_extended_ib_port_info_unpack(&(ptr_struct->extended_port_info), ptr_buff);
 }
 
-void tools_open_smp_data_print(const union tools_open_smp_data *ptr_struct, FILE *fd, int indent_level)
+void tools_open_smp_data_print(const union tools_open_smp_data* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_smp_data ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_smp_data ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "general_info:\n");
-	tools_open_smp_vsp_general_info_print(&(ptr_struct->general_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_info:\n");
-	tools_open_ib_port_info_print(&(ptr_struct->port_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "node_info:\n");
-	tools_open_node_info_print(&(ptr_struct->node_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "extended_port_info:\n");
-	tools_open_extended_ib_port_info_print(&(ptr_struct->extended_port_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "general_info:\n");
+    tools_open_smp_vsp_general_info_print(&(ptr_struct->general_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_info:\n");
+    tools_open_ib_port_info_print(&(ptr_struct->port_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "node_info:\n");
+    tools_open_node_info_print(&(ptr_struct->node_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "extended_port_info:\n");
+    tools_open_extended_ib_port_info_print(&(ptr_struct->extended_port_info), fd, indent_level + 1);
 }
 
 unsigned int tools_open_smp_data_size(void)
 {
-	return TOOLS_OPEN_SMP_DATA_SIZE;
+    return TOOLS_OPEN_SMP_DATA_SIZE;
 }
 
-void tools_open_smp_data_dump(const union tools_open_smp_data *ptr_struct, FILE *fd)
+void tools_open_smp_data_dump(const union tools_open_smp_data* ptr_struct, FILE* fd)
 {
-	tools_open_smp_data_print(ptr_struct, fd, 0);
+    tools_open_smp_data_print(ptr_struct, fd, 0);
 }
 
-void tools_open_sriov_pack(const struct tools_open_sriov *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_sriov_pack(const struct tools_open_sriov* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->total_vfs);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->total_vfs);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
 }
 
-void tools_open_sriov_unpack(struct tools_open_sriov *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_sriov_unpack(struct tools_open_sriov* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 16;
-	ptr_struct->total_vfs = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 0;
-	ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->total_vfs = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 0;
+    ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_sriov_print(const struct tools_open_sriov *ptr_struct, FILE *fd, int indent_level)
+void tools_open_sriov_print(const struct tools_open_sriov* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_sriov ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_sriov ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "total_vfs            : " UH_FMT "\n", ptr_struct->total_vfs);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sriov_en             : " UH_FMT "\n", ptr_struct->sriov_en);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "total_vfs            : " UH_FMT "\n", ptr_struct->total_vfs);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sriov_en             : " UH_FMT "\n", ptr_struct->sriov_en);
 }
 
 unsigned int tools_open_sriov_size(void)
 {
-	return TOOLS_OPEN_SRIOV_SIZE;
+    return TOOLS_OPEN_SRIOV_SIZE;
 }
 
-void tools_open_sriov_dump(const struct tools_open_sriov *ptr_struct, FILE *fd)
+void tools_open_sriov_dump(const struct tools_open_sriov* ptr_struct, FILE* fd)
 {
-	tools_open_sriov_print(ptr_struct, fd, 0);
+    tools_open_sriov_print(ptr_struct, fd, 0);
 }
 
-void tools_open_tpt_capabilities_pack(const struct tools_open_tpt_capabilities *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_tpt_capabilities_pack(const struct tools_open_tpt_capabilities* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->log_max_payload_size_supported);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->log_max_payload_size_supported);
 }
 
-void tools_open_tpt_capabilities_unpack(struct tools_open_tpt_capabilities *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_tpt_capabilities_unpack(struct tools_open_tpt_capabilities* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 0;
-	ptr_struct->log_max_payload_size_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 0;
+    ptr_struct->log_max_payload_size_supported = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities *ptr_struct, FILE *fd, int indent_level)
+void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_tpt_capabilities ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_tpt_capabilities ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_max_payload_size_supported : " UH_FMT "\n", ptr_struct->log_max_payload_size_supported);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_max_payload_size_supported : " UH_FMT "\n", ptr_struct->log_max_payload_size_supported);
 }
 
 unsigned int tools_open_tpt_capabilities_size(void)
 {
-	return TOOLS_OPEN_TPT_CAPABILITIES_SIZE;
+    return TOOLS_OPEN_TPT_CAPABILITIES_SIZE;
 }
 
-void tools_open_tpt_capabilities_dump(const struct tools_open_tpt_capabilities *ptr_struct, FILE *fd)
+void tools_open_tpt_capabilities_dump(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd)
 {
-	tools_open_tpt_capabilities_print(ptr_struct, fd, 0);
+    tools_open_tpt_capabilities_print(ptr_struct, fd, 0);
 }
 
-void tools_open_tpt_configuration_pack(const struct tools_open_tpt_configuration *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_tpt_configuration_pack(const struct tools_open_tpt_configuration* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->log_max_payload_size);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->log_max_payload_size);
 }
 
-void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 28;
-	ptr_struct->log_max_payload_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+    offset = 28;
+    ptr_struct->log_max_payload_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration *ptr_struct, FILE *fd, int indent_level)
+void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_tpt_configuration ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_tpt_configuration ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "log_max_payload_size : " UH_FMT "\n", ptr_struct->log_max_payload_size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "log_max_payload_size : " UH_FMT "\n", ptr_struct->log_max_payload_size);
 }
 
 unsigned int tools_open_tpt_configuration_size(void)
 {
-	return TOOLS_OPEN_TPT_CONFIGURATION_SIZE;
-}
-
-void tools_open_tpt_configuration_dump(const struct tools_open_tpt_configuration *ptr_struct, FILE *fd)
-{
-	tools_open_tpt_configuration_print(ptr_struct, fd, 0);
-}
-
-void tools_open_version_pack(const struct tools_open_version *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->version_sub_minor);
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_minor);
-	offset = 0;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_major);
-	offset = 56;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->day);
-	offset = 48;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->month);
-	offset = 32;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->year);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->seconds);
-	offset = 72;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minutes);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->hour);
-}
-
-void tools_open_version_unpack(struct tools_open_version *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 16;
-	ptr_struct->version_sub_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 8;
-	ptr_struct->version_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 0;
-	ptr_struct->version_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 56;
-	ptr_struct->day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 48;
-	ptr_struct->month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 80;
-	ptr_struct->seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 72;
-	ptr_struct->minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 64;
-	ptr_struct->hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-}
-
-void tools_open_version_print(const struct tools_open_version *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_version ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version_sub_minor    : " UH_FMT "\n", ptr_struct->version_sub_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version_minor        : " UH_FMT "\n", ptr_struct->version_minor);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version_major        : " UH_FMT "\n", ptr_struct->version_major);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "day                  : " UH_FMT "\n", ptr_struct->day);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "month                : " UH_FMT "\n", ptr_struct->month);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "year                 : " UH_FMT "\n", ptr_struct->year);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "seconds              : " UH_FMT "\n", ptr_struct->seconds);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "minutes              : " UH_FMT "\n", ptr_struct->minutes);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "hour                 : " UH_FMT "\n", ptr_struct->hour);
+    return TOOLS_OPEN_TPT_CONFIGURATION_SIZE;
+}
+
+void tools_open_tpt_configuration_dump(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd)
+{
+    tools_open_tpt_configuration_print(ptr_struct, fd, 0);
+}
+
+void tools_open_version_pack(const struct tools_open_version* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->version_sub_minor);
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_minor);
+    offset = 0;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_major);
+    offset = 56;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->day);
+    offset = 48;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->month);
+    offset = 32;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->year);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->seconds);
+    offset = 72;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->minutes);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->hour);
+}
+
+void tools_open_version_unpack(struct tools_open_version* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 16;
+    ptr_struct->version_sub_minor = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 8;
+    ptr_struct->version_minor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 0;
+    ptr_struct->version_major = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 56;
+    ptr_struct->day = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 48;
+    ptr_struct->month = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->year = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 80;
+    ptr_struct->seconds = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 72;
+    ptr_struct->minutes = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 64;
+    ptr_struct->hour = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+}
+
+void tools_open_version_print(const struct tools_open_version* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_version ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version_sub_minor    : " UH_FMT "\n", ptr_struct->version_sub_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version_minor        : " UH_FMT "\n", ptr_struct->version_minor);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version_major        : " UH_FMT "\n", ptr_struct->version_major);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "day                  : " UH_FMT "\n", ptr_struct->day);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "month                : " UH_FMT "\n", ptr_struct->month);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "year                 : " UH_FMT "\n", ptr_struct->year);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "seconds              : " UH_FMT "\n", ptr_struct->seconds);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "minutes              : " UH_FMT "\n", ptr_struct->minutes);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "hour                 : " UH_FMT "\n", ptr_struct->hour);
 }
 
 unsigned int tools_open_version_size(void)
 {
-	return TOOLS_OPEN_VERSION_SIZE;
+    return TOOLS_OPEN_VERSION_SIZE;
 }
 
-void tools_open_version_dump(const struct tools_open_version *ptr_struct, FILE *fd)
+void tools_open_version_dump(const struct tools_open_version* ptr_struct, FILE* fd)
 {
-	tools_open_version_print(ptr_struct, fd, 0);
+    tools_open_version_print(ptr_struct, fd, 0);
 }
 
-void tools_open_vpi_settings_pack(const struct tools_open_vpi_settings *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_vpi_settings_pack(const struct tools_open_vpi_settings* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 30;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->network_link_type);
-	offset = 28;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_link_type);
-	offset = 26;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->phy_type);
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->xfi_mode);
-	offset = 23;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->force_mode);
+    offset = 30;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->network_link_type);
+    offset = 28;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->default_link_type);
+    offset = 26;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->phy_type);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->xfi_mode);
+    offset = 23;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->force_mode);
 }
 
-void tools_open_vpi_settings_unpack(struct tools_open_vpi_settings *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_vpi_settings_unpack(struct tools_open_vpi_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 30;
-	ptr_struct->network_link_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 28;
-	ptr_struct->default_link_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 26;
-	ptr_struct->phy_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 24;
-	ptr_struct->xfi_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
-	offset = 23;
-	ptr_struct->force_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 30;
+    ptr_struct->network_link_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 28;
+    ptr_struct->default_link_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 26;
+    ptr_struct->phy_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 24;
+    ptr_struct->xfi_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
+    offset = 23;
+    ptr_struct->force_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_vpi_settings_print(const struct tools_open_vpi_settings *ptr_struct, FILE *fd, int indent_level)
+void tools_open_vpi_settings_print(const struct tools_open_vpi_settings* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_vpi_settings ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_vpi_settings ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "network_link_type    : " UH_FMT "\n", ptr_struct->network_link_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "default_link_type    : " UH_FMT "\n", ptr_struct->default_link_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "phy_type             : " UH_FMT "\n", ptr_struct->phy_type);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "xfi_mode             : " UH_FMT "\n", ptr_struct->xfi_mode);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "force_mode           : " UH_FMT "\n", ptr_struct->force_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "network_link_type    : " UH_FMT "\n", ptr_struct->network_link_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "default_link_type    : " UH_FMT "\n", ptr_struct->default_link_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "phy_type             : " UH_FMT "\n", ptr_struct->phy_type);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "xfi_mode             : " UH_FMT "\n", ptr_struct->xfi_mode);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "force_mode           : " UH_FMT "\n", ptr_struct->force_mode);
 }
 
 unsigned int tools_open_vpi_settings_size(void)
 {
-	return TOOLS_OPEN_VPI_SETTINGS_SIZE;
+    return TOOLS_OPEN_VPI_SETTINGS_SIZE;
 }
 
-void tools_open_vpi_settings_dump(const struct tools_open_vpi_settings *ptr_struct, FILE *fd)
+void tools_open_vpi_settings_dump(const struct tools_open_vpi_settings* ptr_struct, FILE* fd)
 {
-	tools_open_vpi_settings_print(ptr_struct, fd, 0);
+    tools_open_vpi_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_wol_pack(const struct tools_open_wol *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_wol_pack(const struct tools_open_wol* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 22;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_psswd_magic);
-	offset = 21;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_magic);
-	offset = 20;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_arp);
-	offset = 19;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_bc);
-	offset = 18;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_mc);
-	offset = 17;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_uc);
-	offset = 16;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_phy);
+    offset = 22;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_psswd_magic);
+    offset = 21;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_magic);
+    offset = 20;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_arp);
+    offset = 19;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_bc);
+    offset = 18;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_mc);
+    offset = 17;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_uc);
+    offset = 16;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->en_wol_phy);
 }
 
-void tools_open_wol_unpack(struct tools_open_wol *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_wol_unpack(struct tools_open_wol* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 22;
-	ptr_struct->en_wol_psswd_magic = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 21;
-	ptr_struct->en_wol_magic = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 20;
-	ptr_struct->en_wol_arp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 19;
-	ptr_struct->en_wol_bc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 18;
-	ptr_struct->en_wol_mc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 17;
-	ptr_struct->en_wol_uc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
-	offset = 16;
-	ptr_struct->en_wol_phy = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 22;
+    ptr_struct->en_wol_psswd_magic = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 21;
+    ptr_struct->en_wol_magic = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 20;
+    ptr_struct->en_wol_arp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 19;
+    ptr_struct->en_wol_bc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 18;
+    ptr_struct->en_wol_mc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 17;
+    ptr_struct->en_wol_uc = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+    offset = 16;
+    ptr_struct->en_wol_phy = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_wol_print(const struct tools_open_wol *ptr_struct, FILE *fd, int indent_level)
+void tools_open_wol_print(const struct tools_open_wol* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_wol ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_wol ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_psswd_magic   : " UH_FMT "\n", ptr_struct->en_wol_psswd_magic);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_magic         : " UH_FMT "\n", ptr_struct->en_wol_magic);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_arp           : " UH_FMT "\n", ptr_struct->en_wol_arp);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_bc            : " UH_FMT "\n", ptr_struct->en_wol_bc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_mc            : " UH_FMT "\n", ptr_struct->en_wol_mc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_uc            : " UH_FMT "\n", ptr_struct->en_wol_uc);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "en_wol_phy           : " UH_FMT "\n", ptr_struct->en_wol_phy);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_psswd_magic   : " UH_FMT "\n", ptr_struct->en_wol_psswd_magic);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_magic         : " UH_FMT "\n", ptr_struct->en_wol_magic);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_arp           : " UH_FMT "\n", ptr_struct->en_wol_arp);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_bc            : " UH_FMT "\n", ptr_struct->en_wol_bc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_mc            : " UH_FMT "\n", ptr_struct->en_wol_mc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_uc            : " UH_FMT "\n", ptr_struct->en_wol_uc);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "en_wol_phy           : " UH_FMT "\n", ptr_struct->en_wol_phy);
 }
 
 unsigned int tools_open_wol_size(void)
 {
-	return TOOLS_OPEN_WOL_SIZE;
+    return TOOLS_OPEN_WOL_SIZE;
 }
 
-void tools_open_wol_dump(const struct tools_open_wol *ptr_struct, FILE *fd)
+void tools_open_wol_dump(const struct tools_open_wol* ptr_struct, FILE* fd)
 {
-	tools_open_wol_print(ptr_struct, fd, 0);
+    tools_open_wol_print(ptr_struct, fd, 0);
 }
 
-void tools_open_IbMads_pack(const union tools_open_IbMads *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_IbMads_pack(const union tools_open_IbMads* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_smp_data_pack(&(ptr_struct->smp), ptr_buff);
+    tools_open_smp_data_pack(&(ptr_struct->smp), ptr_buff);
 }
 
-void tools_open_IbMads_unpack(union tools_open_IbMads *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_IbMads_unpack(union tools_open_IbMads* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_smp_data_unpack(&(ptr_struct->smp), ptr_buff);
+    tools_open_smp_data_unpack(&(ptr_struct->smp), ptr_buff);
 }
 
-void tools_open_IbMads_print(const union tools_open_IbMads *ptr_struct, FILE *fd, int indent_level)
+void tools_open_IbMads_print(const union tools_open_IbMads* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_IbMads ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_IbMads ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "smp:\n");
-	tools_open_smp_data_print(&(ptr_struct->smp), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "smp:\n");
+    tools_open_smp_data_print(&(ptr_struct->smp), fd, indent_level + 1);
 }
 
 unsigned int tools_open_IbMads_size(void)
 {
-	return TOOLS_OPEN_IBMADS_SIZE;
+    return TOOLS_OPEN_IBMADS_SIZE;
 }
 
-void tools_open_IbMads_dump(const union tools_open_IbMads *ptr_struct, FILE *fd)
+void tools_open_IbMads_dump(const union tools_open_IbMads* ptr_struct, FILE* fd)
 {
-	tools_open_IbMads_print(ptr_struct, fd, 0);
+    tools_open_IbMads_print(ptr_struct, fd, 0);
 }
 
-void tools_open_access_registers_pack(const union tools_open_access_registers *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_access_registers_pack(const union tools_open_access_registers* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_phy_reg_pack(&(ptr_struct->PhyReg), ptr_buff);
+    tools_open_phy_reg_pack(&(ptr_struct->PhyReg), ptr_buff);
 }
 
-void tools_open_access_registers_unpack(union tools_open_access_registers *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_access_registers_unpack(union tools_open_access_registers* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_phy_reg_unpack(&(ptr_struct->PhyReg), ptr_buff);
+    tools_open_phy_reg_unpack(&(ptr_struct->PhyReg), ptr_buff);
 }
 
-void tools_open_access_registers_print(const union tools_open_access_registers *ptr_struct, FILE *fd, int indent_level)
+void tools_open_access_registers_print(const union tools_open_access_registers* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_access_registers ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_access_registers ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MNVReg:\n");
-	tools_open_mnv_cfg_print(&(ptr_struct->MNVReg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "PhyReg:\n");
-	tools_open_phy_reg_print(&(ptr_struct->PhyReg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MNVReg:\n");
+    tools_open_mnv_cfg_print(&(ptr_struct->MNVReg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "PhyReg:\n");
+    tools_open_phy_reg_print(&(ptr_struct->PhyReg), fd, indent_level + 1);
 }
 
 unsigned int tools_open_access_registers_size(void)
 {
-	return TOOLS_OPEN_ACCESS_REGISTERS_SIZE;
+    return TOOLS_OPEN_ACCESS_REGISTERS_SIZE;
 }
 
-void tools_open_access_registers_dump(const union tools_open_access_registers *ptr_struct, FILE *fd)
+void tools_open_access_registers_dump(const union tools_open_access_registers* ptr_struct, FILE* fd)
 {
-	tools_open_access_registers_print(ptr_struct, fd, 0);
+    tools_open_access_registers_print(ptr_struct, fd, 0);
 }
 
-void tools_open_aux_img_data_pack(const union tools_open_aux_img_data *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_aux_img_data_pack(const union tools_open_aux_img_data* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_aux_tlv_pack(&(ptr_struct->aux_tlv), ptr_buff);
+    tools_open_aux_tlv_pack(&(ptr_struct->aux_tlv), ptr_buff);
 }
 
-void tools_open_aux_img_data_unpack(union tools_open_aux_img_data *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_aux_img_data_unpack(union tools_open_aux_img_data* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_aux_tlv_unpack(&(ptr_struct->aux_tlv), ptr_buff);
+    tools_open_aux_tlv_unpack(&(ptr_struct->aux_tlv), ptr_buff);
 }
 
-void tools_open_aux_img_data_print(const union tools_open_aux_img_data *ptr_struct, FILE *fd, int indent_level)
+void tools_open_aux_img_data_print(const union tools_open_aux_img_data* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_aux_img_data ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_aux_img_data ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "aux_data_hdr:\n");
-	tools_open_aux_data_hdr_print(&(ptr_struct->aux_data_hdr), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "aux_tlv:\n");
-	tools_open_aux_tlv_print(&(ptr_struct->aux_tlv), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "aux_data_hdr:\n");
+    tools_open_aux_data_hdr_print(&(ptr_struct->aux_data_hdr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "aux_tlv:\n");
+    tools_open_aux_tlv_print(&(ptr_struct->aux_tlv), fd, indent_level + 1);
 }
 
 unsigned int tools_open_aux_img_data_size(void)
 {
-	return TOOLS_OPEN_AUX_IMG_DATA_SIZE;
+    return TOOLS_OPEN_AUX_IMG_DATA_SIZE;
 }
 
-void tools_open_aux_img_data_dump(const union tools_open_aux_img_data *ptr_struct, FILE *fd)
+void tools_open_aux_img_data_dump(const union tools_open_aux_img_data* ptr_struct, FILE* fd)
 {
-	tools_open_aux_img_data_print(ptr_struct, fd, 0);
+    tools_open_aux_img_data_print(ptr_struct, fd, 0);
 }
 
-void tools_open_hcr_cmds_pack(const union tools_open_hcr_cmds *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_hcr_cmds_pack(const union tools_open_hcr_cmds* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_query_def_params_per_port_pack(&(ptr_struct->query_def_params_per_port), ptr_buff);
+    tools_open_query_def_params_per_port_pack(&(ptr_struct->query_def_params_per_port), ptr_buff);
 }
 
-void tools_open_hcr_cmds_unpack(union tools_open_hcr_cmds *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_hcr_cmds_unpack(union tools_open_hcr_cmds* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_query_def_params_per_port_unpack(&(ptr_struct->query_def_params_per_port), ptr_buff);
+    tools_open_query_def_params_per_port_unpack(&(ptr_struct->query_def_params_per_port), ptr_buff);
 }
 
-void tools_open_hcr_cmds_print(const union tools_open_hcr_cmds *ptr_struct, FILE *fd, int indent_level)
+void tools_open_hcr_cmds_print(const union tools_open_hcr_cmds* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_hcr_cmds ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_hcr_cmds ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "query_def_params_global:\n");
-	tools_open_query_def_params_global_print(&(ptr_struct->query_def_params_global), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "query_def_params_per_port:\n");
-	tools_open_query_def_params_per_port_print(&(ptr_struct->query_def_params_per_port), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "query_def_params_global:\n");
+    tools_open_query_def_params_global_print(&(ptr_struct->query_def_params_global), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "query_def_params_per_port:\n");
+    tools_open_query_def_params_per_port_print(&(ptr_struct->query_def_params_per_port), fd, indent_level + 1);
 }
 
 unsigned int tools_open_hcr_cmds_size(void)
 {
-	return TOOLS_OPEN_HCR_CMDS_SIZE;
-}
-
-void tools_open_hcr_cmds_dump(const union tools_open_hcr_cmds *ptr_struct, FILE *fd)
-{
-	tools_open_hcr_cmds_print(ptr_struct, fd, 0);
-}
-
-void tools_open_mcdd_descriptor_pack(const struct tools_open_mcdd_descriptor *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->size);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->reserved1);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved2);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_msb);
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_lsb);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_msb);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_lsb);
-	offset = 280;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
-	offset = 272;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->error);
-	offset = 256;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->reserved3);
-}
-
-void tools_open_mcdd_descriptor_unpack(struct tools_open_mcdd_descriptor *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 32;
-	ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->reserved1 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 96;
-	ptr_struct->reserved2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->data_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 160;
-	ptr_struct->data_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 192;
-	ptr_struct->mailbox_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 224;
-	ptr_struct->mailbox_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 280;
-	ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 272;
-	ptr_struct->error = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 256;
-	ptr_struct->reserved3 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-}
-
-void tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mcdd_descriptor ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved1            : " UH_FMT "\n", ptr_struct->reserved1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved2            : " U32H_FMT "\n", ptr_struct->reserved2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_msb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_lsb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mailbox_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_msb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mailbox_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_lsb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "error                : " UH_FMT "\n", ptr_struct->error);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved3            : " UH_FMT "\n", ptr_struct->reserved3);
+    return TOOLS_OPEN_HCR_CMDS_SIZE;
+}
+
+void tools_open_hcr_cmds_dump(const union tools_open_hcr_cmds* ptr_struct, FILE* fd)
+{
+    tools_open_hcr_cmds_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mcdd_descriptor_pack(const struct tools_open_mcdd_descriptor* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->size);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->reserved1);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved2);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_msb);
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_lsb);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_msb);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_lsb);
+    offset = 280;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status);
+    offset = 272;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->error);
+    offset = 256;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->reserved3);
+}
+
+void tools_open_mcdd_descriptor_unpack(struct tools_open_mcdd_descriptor* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 32;
+    ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->reserved1 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 96;
+    ptr_struct->reserved2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->data_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 160;
+    ptr_struct->data_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 192;
+    ptr_struct->mailbox_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 224;
+    ptr_struct->mailbox_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 280;
+    ptr_struct->status = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 272;
+    ptr_struct->error = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 256;
+    ptr_struct->reserved3 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+}
+
+void tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mcdd_descriptor ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved1            : " UH_FMT "\n", ptr_struct->reserved1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved2            : " U32H_FMT "\n", ptr_struct->reserved2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_msb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_lsb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mailbox_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_msb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mailbox_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_lsb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status               : " UH_FMT "\n", ptr_struct->status);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "error                : " UH_FMT "\n", ptr_struct->error);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved3            : " UH_FMT "\n", ptr_struct->reserved3);
 }
 
 unsigned int tools_open_mcdd_descriptor_size(void)
 {
-	return TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE;
-}
-
-void tools_open_mcdd_descriptor_dump(const struct tools_open_mcdd_descriptor *ptr_struct, FILE *fd)
-{
-	tools_open_mcdd_descriptor_print(ptr_struct, fd, 0);
-}
-
-void tools_open_mcdd_reg_pack(const struct tools_open_mcdd_reg *ptr_struct, u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
-	offset = 80;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->size);
-	offset = 64;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->reserved1);
-	offset = 96;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved2);
-	offset = 128;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_msb);
-	offset = 160;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_lsb);
-	offset = 192;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_msb);
-	offset = 224;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_lsb);
-}
-
-void tools_open_mcdd_reg_unpack(struct tools_open_mcdd_reg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	u_int32_t offset;
-
-	offset = 8;
-	ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
-	offset = 32;
-	ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 80;
-	ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 64;
-	ptr_struct->reserved1 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-	offset = 96;
-	ptr_struct->reserved2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 128;
-	ptr_struct->data_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 160;
-	ptr_struct->data_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 192;
-	ptr_struct->mailbox_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-	offset = 224;
-	ptr_struct->mailbox_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-}
-
-void tools_open_mcdd_reg_print(const struct tools_open_mcdd_reg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mcdd_reg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved1            : " UH_FMT "\n", ptr_struct->reserved1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved2            : " U32H_FMT "\n", ptr_struct->reserved2);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_msb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "data_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_lsb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mailbox_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_msb);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mailbox_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_lsb);
+    return TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE;
+}
+
+void tools_open_mcdd_descriptor_dump(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd)
+{
+    tools_open_mcdd_descriptor_print(ptr_struct, fd, 0);
+}
+
+void tools_open_mcdd_reg_pack(const struct tools_open_mcdd_reg* ptr_struct, u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->update_handle);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->offset);
+    offset = 80;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->size);
+    offset = 64;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->reserved1);
+    offset = 96;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved2);
+    offset = 128;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_msb);
+    offset = 160;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->data_page_phys_addr_lsb);
+    offset = 192;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_msb);
+    offset = 224;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->mailbox_page_phys_addr_lsb);
+}
+
+void tools_open_mcdd_reg_unpack(struct tools_open_mcdd_reg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    u_int32_t offset;
+
+    offset = 8;
+    ptr_struct->update_handle = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
+    offset = 32;
+    ptr_struct->offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 80;
+    ptr_struct->size = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 64;
+    ptr_struct->reserved1 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
+    offset = 96;
+    ptr_struct->reserved2 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 128;
+    ptr_struct->data_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 160;
+    ptr_struct->data_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 192;
+    ptr_struct->mailbox_page_phys_addr_msb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 224;
+    ptr_struct->mailbox_page_phys_addr_lsb = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+}
+
+void tools_open_mcdd_reg_print(const struct tools_open_mcdd_reg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mcdd_reg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "update_handle        : " UH_FMT "\n", ptr_struct->update_handle);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "offset               : " U32H_FMT "\n", ptr_struct->offset);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "size                 : " UH_FMT "\n", ptr_struct->size);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved1            : " UH_FMT "\n", ptr_struct->reserved1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved2            : " U32H_FMT "\n", ptr_struct->reserved2);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_msb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "data_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->data_page_phys_addr_lsb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mailbox_page_phys_addr_msb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_msb);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mailbox_page_phys_addr_lsb : " U32H_FMT "\n", ptr_struct->mailbox_page_phys_addr_lsb);
 }
 
 unsigned int tools_open_mcdd_reg_size(void)
 {
-	return TOOLS_OPEN_MCDD_REG_SIZE;
+    return TOOLS_OPEN_MCDD_REG_SIZE;
 }
 
-void tools_open_mcdd_reg_dump(const struct tools_open_mcdd_reg *ptr_struct, FILE *fd)
+void tools_open_mcdd_reg_dump(const struct tools_open_mcdd_reg* ptr_struct, FILE* fd)
 {
-	tools_open_mcdd_reg_print(ptr_struct, fd, 0);
+    tools_open_mcdd_reg_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mfa2_pack(const union tools_open_mfa2 *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mfa2_pack(const union tools_open_mfa2* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_component_ptr_pack(&(ptr_struct->component_ptr), ptr_buff);
+    tools_open_component_ptr_pack(&(ptr_struct->component_ptr), ptr_buff);
 }
 
-void tools_open_mfa2_unpack(union tools_open_mfa2 *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_mfa2_unpack(union tools_open_mfa2* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_component_ptr_unpack(&(ptr_struct->component_ptr), ptr_buff);
+    tools_open_component_ptr_unpack(&(ptr_struct->component_ptr), ptr_buff);
 }
 
-void tools_open_mfa2_print(const union tools_open_mfa2 *ptr_struct, FILE *fd, int indent_level)
+void tools_open_mfa2_print(const union tools_open_mfa2* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mfa2 ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mfa2 ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "common_header:\n");
-	tools_open_common_header_print(&(ptr_struct->common_header), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "multi_part:\n");
-	tools_open_multi_part_print(&(ptr_struct->multi_part), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "package_descriptor:\n");
-	tools_open_package_descriptor_print(&(ptr_struct->package_descriptor), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_desciptor:\n");
-	tools_open_component_desciptor_print(&(ptr_struct->component_desciptor), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "version:\n");
-	tools_open_version_print(&(ptr_struct->version), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "component_ptr:\n");
-	tools_open_component_ptr_print(&(ptr_struct->component_ptr), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "common_header:\n");
+    tools_open_common_header_print(&(ptr_struct->common_header), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "multi_part:\n");
+    tools_open_multi_part_print(&(ptr_struct->multi_part), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "package_descriptor:\n");
+    tools_open_package_descriptor_print(&(ptr_struct->package_descriptor), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_desciptor:\n");
+    tools_open_component_desciptor_print(&(ptr_struct->component_desciptor), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "version:\n");
+    tools_open_version_print(&(ptr_struct->version), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_ptr:\n");
+    tools_open_component_ptr_print(&(ptr_struct->component_ptr), fd, indent_level + 1);
 }
 
 unsigned int tools_open_mfa2_size(void)
 {
-	return TOOLS_OPEN_MFA2_SIZE;
+    return TOOLS_OPEN_MFA2_SIZE;
 }
 
-void tools_open_mfa2_dump(const union tools_open_mfa2 *ptr_struct, FILE *fd)
+void tools_open_mfa2_dump(const union tools_open_mfa2* ptr_struct, FILE* fd)
 {
-	tools_open_mfa2_print(ptr_struct, fd, 0);
+    tools_open_mfa2_print(ptr_struct, fd, 0);
 }
 
-void tools_open_mirc_reg_pack(const struct tools_open_mirc_reg *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_mirc_reg_pack(const struct tools_open_mirc_reg* ptr_struct, u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status_code);
-	offset = 32;
-	adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved);
+    offset = 24;
+    adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->status_code);
+    offset = 32;
+    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reserved);
 }
 
-void tools_open_mirc_reg_unpack(struct tools_open_mirc_reg *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_mirc_reg_unpack(struct tools_open_mirc_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
-	u_int32_t offset;
+    u_int32_t offset;
 
-	offset = 24;
-	ptr_struct->status_code = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
-	offset = 32;
-	ptr_struct->reserved = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
+    offset = 24;
+    ptr_struct->status_code = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
+    offset = 32;
+    ptr_struct->reserved = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_mirc_reg_print(const struct tools_open_mirc_reg *ptr_struct, FILE *fd, int indent_level)
+void tools_open_mirc_reg_print(const struct tools_open_mirc_reg* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_mirc_reg ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_mirc_reg ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "status_code          : " UH_FMT "\n", ptr_struct->status_code);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "reserved             : " U32H_FMT "\n", ptr_struct->reserved);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "status_code          : " UH_FMT "\n", ptr_struct->status_code);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "reserved             : " U32H_FMT "\n", ptr_struct->reserved);
 }
 
 unsigned int tools_open_mirc_reg_size(void)
 {
-	return TOOLS_OPEN_MIRC_REG_SIZE;
+    return TOOLS_OPEN_MIRC_REG_SIZE;
 }
 
-void tools_open_mirc_reg_dump(const struct tools_open_mirc_reg *ptr_struct, FILE *fd)
+void tools_open_mirc_reg_dump(const struct tools_open_mirc_reg* ptr_struct, FILE* fd)
 {
-	tools_open_mirc_reg_print(ptr_struct, fd, 0);
+    tools_open_mirc_reg_print(ptr_struct, fd, 0);
 }
 
-void tools_open_misc_structs_pack(const union tools_open_misc_structs *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_misc_structs_pack(const union tools_open_misc_structs* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_mfg_info_pack(&(ptr_struct->mfg_info), ptr_buff);
+    tools_open_mfg_info_pack(&(ptr_struct->mfg_info), ptr_buff);
 }
 
-void tools_open_misc_structs_unpack(union tools_open_misc_structs *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_misc_structs_unpack(union tools_open_misc_structs* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_mfg_info_unpack(&(ptr_struct->mfg_info), ptr_buff);
+    tools_open_mfg_info_unpack(&(ptr_struct->mfg_info), ptr_buff);
 }
 
-void tools_open_misc_structs_print(const union tools_open_misc_structs *ptr_struct, FILE *fd, int indent_level)
+void tools_open_misc_structs_print(const union tools_open_misc_structs* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_misc_structs ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_misc_structs ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "image_info:\n");
-	tools_open_image_info_print(&(ptr_struct->image_info), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfg_info:\n");
-	tools_open_mfg_info_print(&(ptr_struct->mfg_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "image_info:\n");
+    tools_open_image_info_print(&(ptr_struct->image_info), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfg_info:\n");
+    tools_open_mfg_info_print(&(ptr_struct->mfg_info), fd, indent_level + 1);
 }
 
 unsigned int tools_open_misc_structs_size(void)
 {
-	return TOOLS_OPEN_MISC_STRUCTS_SIZE;
-}
-
-void tools_open_misc_structs_dump(const union tools_open_misc_structs *ptr_struct, FILE *fd)
-{
-	tools_open_misc_structs_print(ptr_struct, fd, 0);
-}
-
-void tools_open_nv_cfg_pack(const union tools_open_nv_cfg *ptr_struct, u_int8_t *ptr_buff)
-{
-	tools_open_nv_cx3_global_conf_pack(&(ptr_struct->nv_cx3_global_conf), ptr_buff);
-}
-
-void tools_open_nv_cfg_unpack(union tools_open_nv_cfg *ptr_struct, const u_int8_t *ptr_buff)
-{
-	tools_open_nv_cx3_global_conf_unpack(&(ptr_struct->nv_cx3_global_conf), ptr_buff);
-}
-
-void tools_open_nv_cfg_print(const union tools_open_nv_cfg *ptr_struct, FILE *fd, int indent_level)
-{
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_nv_cfg ========\n");
-
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "wol:\n");
-	tools_open_wol_print(&(ptr_struct->wol), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "infiniband_dc_capabilities:\n");
-	tools_open_infiniband_dc_capabilities_print(&(ptr_struct->infiniband_dc_capabilities), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "infiniband_dc_settings:\n");
-	tools_open_infiniband_dc_settings_print(&(ptr_struct->infiniband_dc_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tpt_capabilities:\n");
-	tools_open_tpt_capabilities_print(&(ptr_struct->tpt_capabilities), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "tpt_configuration:\n");
-	tools_open_tpt_configuration_print(&(ptr_struct->tpt_configuration), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_capabilities:\n");
-	tools_open_pci_capabilities_print(&(ptr_struct->pci_capabilities), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "pci_configuration:\n");
-	tools_open_pci_configuration_print(&(ptr_struct->pci_configuration), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "port_boot_state:\n");
-	tools_open_port_boot_state_print(&(ptr_struct->port_boot_state), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "iscsi_settings:\n");
-	tools_open_iscsi_settings_print(&(ptr_struct->iscsi_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "infiniband_boot_settings:\n");
-	tools_open_infiniband_boot_settings_print(&(ptr_struct->infiniband_boot_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_settings:\n");
-	tools_open_boot_settings_print(&(ptr_struct->boot_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "preboot_boot_settings:\n");
-	tools_open_preboot_boot_settings_print(&(ptr_struct->preboot_boot_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "preboot_flow_ctrl:\n");
-	tools_open_preboot_flow_ctrl_print(&(ptr_struct->preboot_flow_ctrl), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "sriov:\n");
-	tools_open_sriov_print(&(ptr_struct->sriov), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "bar_size:\n");
-	tools_open_bar_size_print(&(ptr_struct->bar_size), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "vpi_settings:\n");
-	tools_open_vpi_settings_print(&(ptr_struct->vpi_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "roce_v_1_5_next_protocol:\n");
-	tools_open_roce_v_1_5_next_protocol_print(&(ptr_struct->roce_v_1_5_next_protocol), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "roce_cc:\n");
-	tools_open_roce_cc_print(&(ptr_struct->roce_cc), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "roce_cc_ecn:\n");
-	tools_open_roce_cc_ecn_print(&(ptr_struct->roce_cc_ecn), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb:\n");
-	tools_open_lldp_nb_print(&(ptr_struct->lldp_nb), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "external_port:\n");
-	tools_open_external_port_print(&(ptr_struct->external_port), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "boot_settings_ext:\n");
-	tools_open_boot_settings_ext_print(&(ptr_struct->boot_settings_ext), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "option_rom_capability:\n");
-	tools_open_option_rom_capability_print(&(ptr_struct->option_rom_capability), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "qos:\n");
-	tools_open_qos_print(&(ptr_struct->qos), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "qos_cap:\n");
-	tools_open_qos_cap_print(&(ptr_struct->qos_cap), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_client_settings:\n");
-	tools_open_lldp_client_settings_print(&(ptr_struct->lldp_client_settings), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_cap:\n");
-	tools_open_lldp_nb_cap_print(&(ptr_struct->lldp_nb_cap), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "lldp_nb_dcbx:\n");
-	tools_open_lldp_nb_dcbx_print(&(ptr_struct->lldp_nb_dcbx), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_base_mac_guid:\n");
-	tools_open_nv_base_mac_guid_print(&(ptr_struct->nv_base_mac_guid), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_base_mac_guid_cap:\n");
-	tools_open_nv_base_mac_guid_cap_print(&(ptr_struct->nv_base_mac_guid_cap), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "nv_cx3_global_conf:\n");
-	tools_open_nv_cx3_global_conf_print(&(ptr_struct->nv_cx3_global_conf), fd, indent_level + 1);
+    return TOOLS_OPEN_MISC_STRUCTS_SIZE;
+}
+
+void tools_open_misc_structs_dump(const union tools_open_misc_structs* ptr_struct, FILE* fd)
+{
+    tools_open_misc_structs_print(ptr_struct, fd, 0);
+}
+
+void tools_open_nv_cfg_pack(const union tools_open_nv_cfg* ptr_struct, u_int8_t* ptr_buff)
+{
+    tools_open_nv_cx3_global_conf_pack(&(ptr_struct->nv_cx3_global_conf), ptr_buff);
+}
+
+void tools_open_nv_cfg_unpack(union tools_open_nv_cfg* ptr_struct, const u_int8_t* ptr_buff)
+{
+    tools_open_nv_cx3_global_conf_unpack(&(ptr_struct->nv_cx3_global_conf), ptr_buff);
+}
+
+void tools_open_nv_cfg_print(const union tools_open_nv_cfg* ptr_struct, FILE* fd, int indent_level)
+{
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_nv_cfg ========\n");
+
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "wol:\n");
+    tools_open_wol_print(&(ptr_struct->wol), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "infiniband_dc_capabilities:\n");
+    tools_open_infiniband_dc_capabilities_print(&(ptr_struct->infiniband_dc_capabilities), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "infiniband_dc_settings:\n");
+    tools_open_infiniband_dc_settings_print(&(ptr_struct->infiniband_dc_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tpt_capabilities:\n");
+    tools_open_tpt_capabilities_print(&(ptr_struct->tpt_capabilities), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "tpt_configuration:\n");
+    tools_open_tpt_configuration_print(&(ptr_struct->tpt_configuration), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_capabilities:\n");
+    tools_open_pci_capabilities_print(&(ptr_struct->pci_capabilities), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "pci_configuration:\n");
+    tools_open_pci_configuration_print(&(ptr_struct->pci_configuration), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_boot_state:\n");
+    tools_open_port_boot_state_print(&(ptr_struct->port_boot_state), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "iscsi_settings:\n");
+    tools_open_iscsi_settings_print(&(ptr_struct->iscsi_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "infiniband_boot_settings:\n");
+    tools_open_infiniband_boot_settings_print(&(ptr_struct->infiniband_boot_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_settings:\n");
+    tools_open_boot_settings_print(&(ptr_struct->boot_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "preboot_boot_settings:\n");
+    tools_open_preboot_boot_settings_print(&(ptr_struct->preboot_boot_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "preboot_flow_ctrl:\n");
+    tools_open_preboot_flow_ctrl_print(&(ptr_struct->preboot_flow_ctrl), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "sriov:\n");
+    tools_open_sriov_print(&(ptr_struct->sriov), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "bar_size:\n");
+    tools_open_bar_size_print(&(ptr_struct->bar_size), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "vpi_settings:\n");
+    tools_open_vpi_settings_print(&(ptr_struct->vpi_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "roce_v_1_5_next_protocol:\n");
+    tools_open_roce_v_1_5_next_protocol_print(&(ptr_struct->roce_v_1_5_next_protocol), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "roce_cc:\n");
+    tools_open_roce_cc_print(&(ptr_struct->roce_cc), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "roce_cc_ecn:\n");
+    tools_open_roce_cc_ecn_print(&(ptr_struct->roce_cc_ecn), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb:\n");
+    tools_open_lldp_nb_print(&(ptr_struct->lldp_nb), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "external_port:\n");
+    tools_open_external_port_print(&(ptr_struct->external_port), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "boot_settings_ext:\n");
+    tools_open_boot_settings_ext_print(&(ptr_struct->boot_settings_ext), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "option_rom_capability:\n");
+    tools_open_option_rom_capability_print(&(ptr_struct->option_rom_capability), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "qos:\n");
+    tools_open_qos_print(&(ptr_struct->qos), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "qos_cap:\n");
+    tools_open_qos_cap_print(&(ptr_struct->qos_cap), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_client_settings:\n");
+    tools_open_lldp_client_settings_print(&(ptr_struct->lldp_client_settings), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_cap:\n");
+    tools_open_lldp_nb_cap_print(&(ptr_struct->lldp_nb_cap), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "lldp_nb_dcbx:\n");
+    tools_open_lldp_nb_dcbx_print(&(ptr_struct->lldp_nb_dcbx), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_base_mac_guid:\n");
+    tools_open_nv_base_mac_guid_print(&(ptr_struct->nv_base_mac_guid), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_base_mac_guid_cap:\n");
+    tools_open_nv_base_mac_guid_cap_print(&(ptr_struct->nv_base_mac_guid_cap), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "nv_cx3_global_conf:\n");
+    tools_open_nv_cx3_global_conf_print(&(ptr_struct->nv_cx3_global_conf), fd, indent_level + 1);
 }
 
 unsigned int tools_open_nv_cfg_size(void)
 {
-	return TOOLS_OPEN_NV_CFG_SIZE;
+    return TOOLS_OPEN_NV_CFG_SIZE;
 }
 
-void tools_open_nv_cfg_dump(const union tools_open_nv_cfg *ptr_struct, FILE *fd)
+void tools_open_nv_cfg_dump(const union tools_open_nv_cfg* ptr_struct, FILE* fd)
 {
-	tools_open_nv_cfg_print(ptr_struct, fd, 0);
+    tools_open_nv_cfg_print(ptr_struct, fd, 0);
 }
 
-void tools_open_tools_open_pack(const union tools_open_tools_open *ptr_struct, u_int8_t *ptr_buff)
+void tools_open_tools_open_pack(const union tools_open_tools_open* ptr_struct, u_int8_t* ptr_buff)
 {
-	tools_open_mirc_reg_pack(&(ptr_struct->mirc_reg), ptr_buff);
+    tools_open_mirc_reg_pack(&(ptr_struct->mirc_reg), ptr_buff);
 }
 
-void tools_open_tools_open_unpack(union tools_open_tools_open *ptr_struct, const u_int8_t *ptr_buff)
+void tools_open_tools_open_unpack(union tools_open_tools_open* ptr_struct, const u_int8_t* ptr_buff)
 {
-	tools_open_mirc_reg_unpack(&(ptr_struct->mirc_reg), ptr_buff);
+    tools_open_mirc_reg_unpack(&(ptr_struct->mirc_reg), ptr_buff);
 }
 
-void tools_open_tools_open_print(const union tools_open_tools_open *ptr_struct, FILE *fd, int indent_level)
+void tools_open_tools_open_print(const union tools_open_tools_open* ptr_struct, FILE* fd, int indent_level)
 {
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "======== tools_open_tools_open ========\n");
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "======== tools_open_tools_open ========\n");
 
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "NVConfig:\n");
-	tools_open_nv_cfg_print(&(ptr_struct->NVConfig), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "AceessRegisters:\n");
-	tools_open_access_registers_print(&(ptr_struct->AceessRegisters), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "HcrCmds:\n");
-	tools_open_hcr_cmds_print(&(ptr_struct->HcrCmds), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "AuxImgData:\n");
-	tools_open_aux_img_data_print(&(ptr_struct->AuxImgData), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "MiscStructs:\n");
-	tools_open_misc_structs_print(&(ptr_struct->MiscStructs), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "IbMads:\n");
-	tools_open_IbMads_print(&(ptr_struct->IbMads), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mfa2:\n");
-	tools_open_mfa2_print(&(ptr_struct->mfa2), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcdd_reg:\n");
-	tools_open_mcdd_reg_print(&(ptr_struct->mcdd_reg), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mcdd_descriptor:\n");
-	tools_open_mcdd_descriptor_print(&(ptr_struct->mcdd_descriptor), fd, indent_level + 1);
-	adb2c_add_indentation(fd, indent_level);
-	fprintf(fd, "mirc_reg:\n");
-	tools_open_mirc_reg_print(&(ptr_struct->mirc_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "NVConfig:\n");
+    tools_open_nv_cfg_print(&(ptr_struct->NVConfig), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "AceessRegisters:\n");
+    tools_open_access_registers_print(&(ptr_struct->AceessRegisters), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "HcrCmds:\n");
+    tools_open_hcr_cmds_print(&(ptr_struct->HcrCmds), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "AuxImgData:\n");
+    tools_open_aux_img_data_print(&(ptr_struct->AuxImgData), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "MiscStructs:\n");
+    tools_open_misc_structs_print(&(ptr_struct->MiscStructs), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "IbMads:\n");
+    tools_open_IbMads_print(&(ptr_struct->IbMads), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mfa2:\n");
+    tools_open_mfa2_print(&(ptr_struct->mfa2), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcdd_reg:\n");
+    tools_open_mcdd_reg_print(&(ptr_struct->mcdd_reg), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mcdd_descriptor:\n");
+    tools_open_mcdd_descriptor_print(&(ptr_struct->mcdd_descriptor), fd, indent_level + 1);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "mirc_reg:\n");
+    tools_open_mirc_reg_print(&(ptr_struct->mirc_reg), fd, indent_level + 1);
 }
 
 unsigned int tools_open_tools_open_size(void)
 {
-	return TOOLS_OPEN_TOOLS_OPEN_SIZE;
+    return TOOLS_OPEN_TOOLS_OPEN_SIZE;
 }
 
-void tools_open_tools_open_dump(const union tools_open_tools_open *ptr_struct, FILE *fd)
+void tools_open_tools_open_dump(const union tools_open_tools_open* ptr_struct, FILE* fd)
 {
-	tools_open_tools_open_print(ptr_struct, fd, 0);
+    tools_open_tools_open_print(ptr_struct, fd, 0);
 }
-
diff --git a/tools_layouts/tools_open_layouts.h b/tools_layouts/tools_open_layouts.h
index 0caf0518..e9d0f88c 100644
--- a/tools_layouts/tools_open_layouts.h
+++ b/tools_layouts/tools_open_layouts.h
@@ -29,102 +29,107 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
 
 /***
-         *** This file was generated at "2021-03-31 03:07:49"
-         *** by:
-         ***    > /mswg/release/tools/a-me/a-me-1.0.122/adabe_plugins/adb2c/adb2pack.py --input adb/tools_open/tools_open.adb --file-prefix tools_open --prefix tools_open_ --no-adb-utils
-         ***/
+ *** This file was generated at "2021-03-31 03:07:49"
+ *** by:
+ ***    > /mswg/release/tools/a-me/a-me-1.0.122/adabe_plugins/adb2c/adb2pack.py --input adb/tools_open/tools_open.adb
+ *--file-prefix tools_open --prefix tools_open_ --no-adb-utils
+ ***/
 #ifndef TOOLS_OPEN_LAYOUTS_H
 #define TOOLS_OPEN_LAYOUTS_H
 
-
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include "adb_to_c_utils.h"
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_bmc_type {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.12 */
-	u_int16_t param_idx;
-	/* Description -  */
-	/* 0x0.13 - 0x0.17 */
-	u_int8_t channel;
-	/* Description -  */
-	/* 0x0.18 - 0x0.23 */
-	u_int8_t host;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t param_class;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_eswitch_type {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t param_idx;
-	/* Description -  */
-	/* 0x0.16 - 0x0.17 */
-	u_int8_t port;
-	/* Description -  */
-	/* 0x0.18 - 0x0.23 */
-	u_int8_t host;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t param_class;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_global_type {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.23 */
-	u_int32_t param_idx;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t param_class;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_host_type {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.17 */
-	u_int32_t param_idx;
-	/* Description -  */
-	/* 0x0.18 - 0x0.23 */
-	u_int8_t host;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t param_class;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_per_host_type {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.9 */
-	u_int16_t param_idx;
-	/* Description -  */
-	/* 0x0.10 - 0x0.17 */
-	u_int8_t function;
-	/* Description -  */
-	/* 0x0.18 - 0x0.23 */
-	u_int8_t host;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t param_class;
-};
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_bmc_type
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.12 */
+        u_int16_t param_idx;
+        /* Description -  */
+        /* 0x0.13 - 0x0.17 */
+        u_int8_t channel;
+        /* Description -  */
+        /* 0x0.18 - 0x0.23 */
+        u_int8_t host;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t param_class;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_eswitch_type
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t param_idx;
+        /* Description -  */
+        /* 0x0.16 - 0x0.17 */
+        u_int8_t port;
+        /* Description -  */
+        /* 0x0.18 - 0x0.23 */
+        u_int8_t host;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t param_class;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_global_type
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.23 */
+        u_int32_t param_idx;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t param_class;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_host_type
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.17 */
+        u_int32_t param_idx;
+        /* Description -  */
+        /* 0x0.18 - 0x0.23 */
+        u_int8_t host;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t param_class;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_per_host_type
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.9 */
+        u_int16_t param_idx;
+        /* Description -  */
+        /* 0x0.10 - 0x0.17 */
+        u_int8_t function;
+        /* Description -  */
+        /* 0x0.18 - 0x0.23 */
+        u_int8_t host;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t param_class;
+    };
 
     /* Description -   */
     /* Size in bytes - 4 */
@@ -148,33 +153,35 @@ struct tools_open_per_host_type {
     {
         u_int16_t param_idx;
         u_int16_t module;
-	u_int8_t param_class;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_tlv_type_dw {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t tlv_type_dw;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_fw_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - fw_version_major */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t fw_ver_major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - fw version subminor */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t fw_ver_subminor;
-	/* Description - fw_version_minor */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t fw_ver_minor;
-};
+        u_int8_t param_class;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_tlv_type_dw
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t tlv_type_dw;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_fw_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - fw_version_major */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t fw_ver_major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - fw version subminor */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t fw_ver_subminor;
+        /* Description - fw_version_minor */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t fw_ver_minor;
+    };
 
     /* Description -   */
     /* Size in bytes - 4 */
@@ -207,3469 +214,3670 @@ struct tools_open_fw_version {
         struct tools_open_tlv_type_dw tlv_type_dw;
     };
 
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_ts_entry {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Timestamp day     - 2 packed BCD */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t ts_day;
-	/* Description - Timestamp month   - 2 packed BCD */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t ts_month;
-	/* Description - Timestamp year    - 4 packed BCD */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t ts_year;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Timestamp seconds - 2 packed BCD */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t ts_seconds;
-	/* Description - Timestamp minotes - 2 packed BCD */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t ts_minutes;
-	/* Description - Timestamp hour    - 2 packed BCD */
-	/* 0x4.24 - 0x4.31 */
-	u_int8_t ts_hour;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_cap_mask {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t is_sm;
-	/* Description -  */
-	/* 0x0.2 - 0x0.2 */
-	u_int8_t is_notice_sup;
-	/* Description -  */
-	/* 0x0.3 - 0x0.3 */
-	u_int8_t is_trap_sup;
-	/* Description -  */
-	/* 0x0.4 - 0x0.4 */
-	u_int8_t is_optional_ipd_sup;
-	/* Description -  */
-	/* 0x0.5 - 0x0.5 */
-	u_int8_t is_automatic_migration_sup;
-	/* Description -  */
-	/* 0x0.6 - 0x0.6 */
-	u_int8_t is_sl_mapping_sup;
-	/* Description -  */
-	/* 0x0.7 - 0x0.7 */
-	u_int8_t is_mkey_nvram;
-	/* Description -  */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t is_pkey_nvram;
-	/* Description -  */
-	/* 0x0.9 - 0x0.9 */
-	u_int8_t is_led_info_sup;
-	/* Description -  */
-	/* 0x0.10 - 0x0.10 */
-	u_int8_t is_sm_disabled;
-	/* Description -  */
-	/* 0x0.11 - 0x0.11 */
-	u_int8_t is_system_image_guid_sup;
-	/* Description -  */
-	/* 0x0.12 - 0x0.12 */
-	u_int8_t is_pkey_switch_external_port_trap_sup;
-	/* Description -  */
-	/* 0x0.14 - 0x0.14 */
-	u_int8_t is_extended_speed_sup;
-	/* Description -  */
-	/* 0x0.16 - 0x0.16 */
-	u_int8_t is_communication_management_sup;
-	/* Description -  */
-	/* 0x0.17 - 0x0.17 */
-	u_int8_t is_snmp_tunneling_sup;
-	/* Description -  */
-	/* 0x0.18 - 0x0.18 */
-	u_int8_t is_reinit_sup;
-	/* Description -  */
-	/* 0x0.19 - 0x0.19 */
-	u_int8_t is_device_management_sup;
-	/* Description -  */
-	/* 0x0.20 - 0x0.20 */
-	u_int8_t is_vendor_class_sup;
-	/* Description -  */
-	/* 0x0.21 - 0x0.21 */
-	u_int8_t is_dr_notice_sup;
-	/* Description -  */
-	/* 0x0.22 - 0x0.22 */
-	u_int8_t is_capability_mask_notice_sup;
-	/* Description -  */
-	/* 0x0.23 - 0x0.23 */
-	u_int8_t is_boot_management_sup;
-	/* Description -  */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t is_link_round_trip_latency_sup;
-	/* Description -  */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t is_client_reregistration_sup;
-	/* Description -  */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t is_other_local_changes_notice_supported;
-	/* Description -  */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t is_link_speed_width_pairs_table_supported;
-};
-
-/* Description -  CapabilityMaskSMP */
-/* Size in bytes - 64 */
-struct tools_open_capability_mask_smp {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Attributes PrivateLFTInfo, PrivateLFTDef, PrivateLFTMap, PrivateLFT are all supported */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t IsPrivateLinearForwardingSupported;
-	/* Description - Includes AdaptiveRoutingInfo, AdaptiveRoutingGroupTable, AdaptiveRoutingLinearForwardingTable attributes. Mutex with bit 2 */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t IsAdaptiveRoutingSupported;
-	/* Description - Support for SwitchX style AR. Includes AdaptiveRoutingInfo, AdaptiveRoutingGroupTable, AdaptiveRoutingLinearForwardingTableRev1. Mutex with bit 1 */
-	/* 0x0.2 - 0x0.2 */
-	u_int8_t IsAdaptiveRoutingRev1Supported;
-	/* Description - Includes PortMirrorRoute, PortMirrorFilter, PortMirrorPorts attributes */
-	/* 0x0.3 - 0x0.3 */
-	u_int8_t IsRemotePortMirroringSupported;
-	/* Description -  */
-	/* 0x0.4 - 0x0.4 */
-	u_int8_t IsTemperatureSensingSupported;
-	/* Description -  */
-	/* 0x0.5 - 0x0.5 */
-	u_int8_t IsConfigSpaceAccessSupported;
-	/* Description -  */
-	/* 0x0.6 - 0x0.6 */
-	u_int8_t IsCableInfoSupported;
-	/* Description -  */
-	/* 0x0.7 - 0x0.7 */
-	u_int8_t IsSMPEyeOpenSupported;
-	/* Description -  */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t IsLossyVLConfigSupported;
-	/* Description -  */
-	/* 0x0.9 - 0x0.9 */
-	u_int8_t IsExtendedPortInfoSupported;
-	/* Description -  */
-	/* 0x0.10 - 0x0.10 */
-	u_int8_t IsAccessRegisterSupported;
-	/* Description -  */
-	/* 0x0.11 - 0x0.11 */
-	u_int8_t IsInterProcessCommunicationSupported;
-	/* Description -  */
-	/* 0x0.12 - 0x0.12 */
-	u_int8_t IsPortSLToPrivateLFTMapSupported;
-	/* Description -  */
-	/* 0x0.13 - 0x0.13 */
-	u_int8_t IsExtendedSwitchInfoSupported;
-	/* Description -  */
-	/* 0x0.14 - 0x0.14 */
-	u_int8_t IsASlaveVirtualSwitch;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct tools_open_fw_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Sub-minor firmware version number. */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t sub_minor;
-	/* Description - Minor firmware version number. */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t minor;
-	/* Description - Major firmware version number. */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t major;
-	/* Description -  */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t secure_fw;
-	/* Description -  */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t signed_fw;
-	/* Description -  */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t debug_fw;
-	/* Description -  */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t dev_fw;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Firmware Build ID. */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t build_id;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Firmware installation date. 
-For example: 3 May 2004 will be coded as Month= 0x05, 
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_ts_entry
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Timestamp day     - 2 packed BCD */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t ts_day;
+        /* Description - Timestamp month   - 2 packed BCD */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t ts_month;
+        /* Description - Timestamp year    - 4 packed BCD */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t ts_year;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Timestamp seconds - 2 packed BCD */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t ts_seconds;
+        /* Description - Timestamp minotes - 2 packed BCD */
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t ts_minutes;
+        /* Description - Timestamp hour    - 2 packed BCD */
+        /* 0x4.24 - 0x4.31 */
+        u_int8_t ts_hour;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_cap_mask
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t is_sm;
+        /* Description -  */
+        /* 0x0.2 - 0x0.2 */
+        u_int8_t is_notice_sup;
+        /* Description -  */
+        /* 0x0.3 - 0x0.3 */
+        u_int8_t is_trap_sup;
+        /* Description -  */
+        /* 0x0.4 - 0x0.4 */
+        u_int8_t is_optional_ipd_sup;
+        /* Description -  */
+        /* 0x0.5 - 0x0.5 */
+        u_int8_t is_automatic_migration_sup;
+        /* Description -  */
+        /* 0x0.6 - 0x0.6 */
+        u_int8_t is_sl_mapping_sup;
+        /* Description -  */
+        /* 0x0.7 - 0x0.7 */
+        u_int8_t is_mkey_nvram;
+        /* Description -  */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t is_pkey_nvram;
+        /* Description -  */
+        /* 0x0.9 - 0x0.9 */
+        u_int8_t is_led_info_sup;
+        /* Description -  */
+        /* 0x0.10 - 0x0.10 */
+        u_int8_t is_sm_disabled;
+        /* Description -  */
+        /* 0x0.11 - 0x0.11 */
+        u_int8_t is_system_image_guid_sup;
+        /* Description -  */
+        /* 0x0.12 - 0x0.12 */
+        u_int8_t is_pkey_switch_external_port_trap_sup;
+        /* Description -  */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t is_extended_speed_sup;
+        /* Description -  */
+        /* 0x0.16 - 0x0.16 */
+        u_int8_t is_communication_management_sup;
+        /* Description -  */
+        /* 0x0.17 - 0x0.17 */
+        u_int8_t is_snmp_tunneling_sup;
+        /* Description -  */
+        /* 0x0.18 - 0x0.18 */
+        u_int8_t is_reinit_sup;
+        /* Description -  */
+        /* 0x0.19 - 0x0.19 */
+        u_int8_t is_device_management_sup;
+        /* Description -  */
+        /* 0x0.20 - 0x0.20 */
+        u_int8_t is_vendor_class_sup;
+        /* Description -  */
+        /* 0x0.21 - 0x0.21 */
+        u_int8_t is_dr_notice_sup;
+        /* Description -  */
+        /* 0x0.22 - 0x0.22 */
+        u_int8_t is_capability_mask_notice_sup;
+        /* Description -  */
+        /* 0x0.23 - 0x0.23 */
+        u_int8_t is_boot_management_sup;
+        /* Description -  */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t is_link_round_trip_latency_sup;
+        /* Description -  */
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t is_client_reregistration_sup;
+        /* Description -  */
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t is_other_local_changes_notice_supported;
+        /* Description -  */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t is_link_speed_width_pairs_table_supported;
+    };
+
+    /* Description -  CapabilityMaskSMP */
+    /* Size in bytes - 64 */
+    struct tools_open_capability_mask_smp
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Attributes PrivateLFTInfo, PrivateLFTDef, PrivateLFTMap, PrivateLFT are all supported */
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t IsPrivateLinearForwardingSupported;
+        /* Description - Includes AdaptiveRoutingInfo, AdaptiveRoutingGroupTable, AdaptiveRoutingLinearForwardingTable
+         * attributes. Mutex with bit 2 */
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t IsAdaptiveRoutingSupported;
+        /* Description - Support for SwitchX style AR. Includes AdaptiveRoutingInfo, AdaptiveRoutingGroupTable,
+         * AdaptiveRoutingLinearForwardingTableRev1. Mutex with bit 1 */
+        /* 0x0.2 - 0x0.2 */
+        u_int8_t IsAdaptiveRoutingRev1Supported;
+        /* Description - Includes PortMirrorRoute, PortMirrorFilter, PortMirrorPorts attributes */
+        /* 0x0.3 - 0x0.3 */
+        u_int8_t IsRemotePortMirroringSupported;
+        /* Description -  */
+        /* 0x0.4 - 0x0.4 */
+        u_int8_t IsTemperatureSensingSupported;
+        /* Description -  */
+        /* 0x0.5 - 0x0.5 */
+        u_int8_t IsConfigSpaceAccessSupported;
+        /* Description -  */
+        /* 0x0.6 - 0x0.6 */
+        u_int8_t IsCableInfoSupported;
+        /* Description -  */
+        /* 0x0.7 - 0x0.7 */
+        u_int8_t IsSMPEyeOpenSupported;
+        /* Description -  */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t IsLossyVLConfigSupported;
+        /* Description -  */
+        /* 0x0.9 - 0x0.9 */
+        u_int8_t IsExtendedPortInfoSupported;
+        /* Description -  */
+        /* 0x0.10 - 0x0.10 */
+        u_int8_t IsAccessRegisterSupported;
+        /* Description -  */
+        /* 0x0.11 - 0x0.11 */
+        u_int8_t IsInterProcessCommunicationSupported;
+        /* Description -  */
+        /* 0x0.12 - 0x0.12 */
+        u_int8_t IsPortSLToPrivateLFTMapSupported;
+        /* Description -  */
+        /* 0x0.13 - 0x0.13 */
+        u_int8_t IsExtendedSwitchInfoSupported;
+        /* Description -  */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t IsASlaveVirtualSwitch;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct tools_open_fw_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Sub-minor firmware version number. */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t sub_minor;
+        /* Description - Minor firmware version number. */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t minor;
+        /* Description - Major firmware version number. */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t major;
+        /* Description -  */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t secure_fw;
+        /* Description -  */
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t signed_fw;
+        /* Description -  */
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t debug_fw;
+        /* Description -  */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t dev_fw;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Firmware Build ID. */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t build_id;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Firmware installation date.
+For example: 3 May 2004 will be coded as Month= 0x05,
 Day= 0x03, and Year= 0x04 */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t year;
-	/* Description - Firmware installation date. 
-For example: 3 May 2004 will be coded as Month= 0x05, 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t year;
+        /* Description - Firmware installation date.
+For example: 3 May 2004 will be coded as Month= 0x05,
 Day= 0x03, and Year= 0x04 */
-	/* 0x8.16 - 0x8.23 */
-	u_int8_t day;
-	/* Description - Firmware installation date. 
-For example: 3 May 2004 will be coded as Month= 0x05, 
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t day;
+        /* Description - Firmware installation date.
+For example: 3 May 2004 will be coded as Month= 0x05,
 Day= 0x03, and Year= 0x04 */
-	/* 0x8.24 - 0x8.31 */
-	u_int8_t month;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Firmware installation hour.
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t month;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Firmware installation hour.
 For example 17:43 will be coded as 0x1743 */
-	/* 0xc.0 - 0xc.15 */
-	u_int16_t hour;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - To be defined later. */
-	/* 0x10.24 - 0x20.23 */
-	u_int8_t psid[16];
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - User-configured version number of the current INI file. */
-	/* 0x20.0 - 0x20.31 */
-	u_int32_t ini_file_version;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description - FW version's Major field in extended (32b) format. */
-	/* 0x24.0 - 0x24.31 */
-	u_int32_t extended_major;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description - FW version's Minor field in extended (32b) format. */
-	/* 0x28.0 - 0x28.31 */
-	u_int32_t extended_minor;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description - FW version's SubMinor field in extended (32b) format. */
-	/* 0x2c.0 - 0x2c.31 */
-	u_int32_t extended_sub_minor;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description - isfu_major. */
-	/* 0x30.0 - 0x30.15 */
-	u_int16_t isfu_major;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct tools_open_hw_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - For specific device IDs, see 
-Table 12, "Switch Supported 
+        /* 0xc.0 - 0xc.15 */
+        u_int16_t hour;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - To be defined later. */
+        /* 0x10.24 - 0x20.23 */
+        u_int8_t psid[16];
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - User-configured version number of the current INI file. */
+        /* 0x20.0 - 0x20.31 */
+        u_int32_t ini_file_version;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description - FW version's Major field in extended (32b) format. */
+        /* 0x24.0 - 0x24.31 */
+        u_int32_t extended_major;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description - FW version's Minor field in extended (32b) format. */
+        /* 0x28.0 - 0x28.31 */
+        u_int32_t extended_minor;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description - FW version's SubMinor field in extended (32b) format. */
+        /* 0x2c.0 - 0x2c.31 */
+        u_int32_t extended_sub_minor;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description - isfu_major. */
+        /* 0x30.0 - 0x30.15 */
+        u_int16_t isfu_major;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct tools_open_hw_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - For specific device IDs, see
+Table 12, "Switch Supported
 PCI Device IDs," on page 94 */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t device_id;
-	/* Description - SwitchX Devices:
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t device_id;
+        /* Description - SwitchX Devices:
 0x00A0: Device step A0, FCC package
 0x00A1: Device step A1, FCC package
 0x00A2: Device step A2, FCC package
 Switch-IB Devices:
 0x00A0: Switch-IB device step A0, FCC package */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t device_hw_revision;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Process Voltage Scaling
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t device_hw_revision;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Process Voltage Scaling
 Maximum supported V_CODE voltage (in 50mV incre
 ments) for the device. */
-	/* 0x4.0 - 0x4.4 */
-	u_int8_t pvs;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The PCI device-ID of the NIC/HCA in recovery (Live
+        /* 0x4.0 - 0x4.4 */
+        u_int8_t pvs;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The PCI device-ID of the NIC/HCA in recovery (Live
 fish) mode. */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t hw_dev_id;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - MSB of the "base" MAC address of the NIC that was allo
-cate during manufacturing. The NIC derives the MAC 
-addresses for the different PCI PFs from this MAC 
-address. This parameter can be used as a canonical unique 
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t hw_dev_id;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - MSB of the "base" MAC address of the NIC that was allo
+cate during manufacturing. The NIC derives the MAC
+addresses for the different PCI PFs from this MAC
+address. This parameter can be used as a canonical unique
 identifier of the NIC.
-manufacturing_base_mac of value 
+manufacturing_base_mac of value
 0 means field is not sup
 ported. */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t manufacturing_base_mac_47_32;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - LSB of the "base" MAC address of the NIC that was allo
-cate during manufacturing. The NIC derives the MAC 
-addresses for the different PCI PFs from this MAC 
-address. This parameter can be used as a canonical unique 
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t manufacturing_base_mac_47_32;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - LSB of the "base" MAC address of the NIC that was allo
+cate during manufacturing. The NIC derives the MAC
+addresses for the different PCI PFs from this MAC
+address. This parameter can be used as a canonical unique
 identifier of the NIC.
-manufacturing_base_mac of value 
+manufacturing_base_mac of value
 0 means field is not sup
 ported. */
-	/* 0x14.0 - 0x14.31 */
-	u_int32_t manufacturing_base_mac_31_0;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Time (in secs.) since last reset0 */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t uptime;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_nv_hdr {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Tlv type */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t type;
-	/* Description - size of tlv data in dwords (not including header) */
-	/* 0x0.18 - 0x0.29 */
-	u_int16_t length;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Type Modifier. E.G.: Port number when the config is port related */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t type_mod;
-	/* Description - Shadow: i.e if set the Fw will not update the tlv immediately but wait for a command */
-	/* 0x4.24 - 0x4.24 */
-	u_int8_t shadow;
-	/* Description - Pad count: for non dword alligned tlvs */
-	/* 0x4.25 - 0x4.26 */
-	u_int8_t pad_cnt;
-	/* Description - Data version can be set by caller or left as 0. */
-	/* 0x4.28 - 0x4.31 */
-	u_int8_t version;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_nv_hdr_fifth_gen {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Size of configuration item data in bytes between 0..256 */
-	/* 0x0.0 - 0x0.8 */
-	u_int16_t length;
-	/* Description - tlv writer host index */
-	/* 0x0.9 - 0x0.11 */
-	u_int8_t writer_host_id;
-	/* Description - Configuration item version */
-	/* 0x0.12 - 0x0.15 */
-	u_int8_t version;
-	/* Description - Writer ID */
-	/* 0x0.16 - 0x0.20 */
-	u_int8_t writer_id;
-	/* Description - Choose - read current values or user defined values: 0x0 - u ser defined values
+        /* 0x14.0 - 0x14.31 */
+        u_int32_t manufacturing_base_mac_31_0;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Time (in secs.) since last reset0 */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t uptime;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_nv_hdr
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Tlv type */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t type;
+        /* Description - size of tlv data in dwords (not including header) */
+        /* 0x0.18 - 0x0.29 */
+        u_int16_t length;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Type Modifier. E.G.: Port number when the config is port related */
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t type_mod;
+        /* Description - Shadow: i.e if set the Fw will not update the tlv immediately but wait for a command */
+        /* 0x4.24 - 0x4.24 */
+        u_int8_t shadow;
+        /* Description - Pad count: for non dword alligned tlvs */
+        /* 0x4.25 - 0x4.26 */
+        u_int8_t pad_cnt;
+        /* Description - Data version can be set by caller or left as 0. */
+        /* 0x4.28 - 0x4.31 */
+        u_int8_t version;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_nv_hdr_fifth_gen
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Size of configuration item data in bytes between 0..256 */
+        /* 0x0.0 - 0x0.8 */
+        u_int16_t length;
+        /* Description - tlv writer host index */
+        /* 0x0.9 - 0x0.11 */
+        u_int8_t writer_host_id;
+        /* Description - Configuration item version */
+        /* 0x0.12 - 0x0.15 */
+        u_int8_t version;
+        /* Description - Writer ID */
+        /* 0x0.16 - 0x0.20 */
+        u_int8_t writer_id;
+        /* Description - Choose - read current values or user defined values: 0x0 - u ser defined values
  0x1 - current values ( values that are loaded in last boot)
  */
-	/* 0x0.22 - 0x0.22 */
-	u_int8_t read_current;
-	/* Description - when set in query , will display the default configuration */
-	/* 0x0.23 - 0x0.23 */
-	u_int8_t default_;
-	/* Description - enables reading the TLV by lower priorities
+        /* 0x0.22 - 0x0.22 */
+        u_int8_t read_current;
+        /* Description - when set in query , will display the default configuration */
+        /* 0x0.23 - 0x0.23 */
+        u_int8_t default_;
+        /* Description - enables reading the TLV by lower priorities
 0 - TLV can be read by the subsequent lifecycle priorities.
 1 - TLV cannot be read by the subsequent lifecycle priorities.
  */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t rd_en;
-	/* Description - enables overwriting the TLV by lower priorities
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t rd_en;
+        /* Description - enables overwriting the TLV by lower priorities
 
 0 - Can only be overwritten by the current lifecycle priority
 1 - Allowed to be overwritten by subsequent lifecycle priorities
  */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t over_en;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	union tools_open_tlv_type type;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_pmdio_addr_data {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Data (Clause 22) / Address/Data (Clause 45) */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t data;
-	/* Description - Address (Clause 45)
-This field is only valid for Address + Read and Address + Write operations, providing the address. For other Clause 45 operations the data field provides the address when appropriate.
- */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t addr;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct tools_open_sw_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t subminor;
-	/* Description -  */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t minor;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.3 */
-	u_int8_t rom3_type;
-	/* Description -  */
-	/* 0x4.4 - 0x4.7 */
-	u_int8_t rom3_arch;
-	/* Description -  */
-	/* 0x4.8 - 0x4.11 */
-	u_int8_t rom2_type;
-	/* Description -  */
-	/* 0x4.12 - 0x4.15 */
-	u_int8_t rom2_arch;
-	/* Description -  */
-	/* 0x4.16 - 0x4.19 */
-	u_int8_t rom1_type;
-	/* Description -  */
-	/* 0x4.20 - 0x4.23 */
-	u_int8_t rom1_arch;
-	/* Description -  */
-	/* 0x4.24 - 0x4.27 */
-	u_int8_t rom0_type;
-	/* Description -  */
-	/* 0x4.28 - 0x4.31 */
-	u_int8_t rom0_arch;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t rom0_version;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t rom1_version;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t rom2_version;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x14.31 */
-	u_int32_t rom3_version;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_timestamp {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - fw_version */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_fw_version fw_version;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Timestamp */
-	/* 0x8.0 - 0xc.31 */
-	struct tools_open_ts_entry ts_entry;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_uint64 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int64_t uint64;
-};
-
-/* Description -   */
-/* Size in bytes - 20 */
-struct tools_open_aux_tlv_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t minor_version;
-	/* Description -  */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t major_version;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t type;
-	/* Description -  */
-	/* 0x0.28 - 0x0.31 */
-	u_int8_t header_type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t length;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t crc;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t reserved0;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t reserved1;
-};
-
-/* Description -   */
-/* Size in bytes - 60 */
-struct tools_open_extended_ib_port_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t StateChangeEnable;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t LinkSpeedSupported;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.7 */
-	u_int8_t LinkSpeedEnabled;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.7 */
-	u_int8_t LinkSpeedActive;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t CapMask;
-	/* Description -  */
-	/* 0x10.28 - 0x10.31 */
-	u_int8_t ActiveCell;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct tools_open_ib_port_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t m_key_hi;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t m_key_lo;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t gid_prefix_hi;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t gid_prefix_lo;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.15 */
-	u_int16_t master_sm_lid;
-	/* Description -  */
-	/* 0x10.16 - 0x10.31 */
-	u_int16_t lid;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x14.31 */
-	struct tools_open_cap_mask cap_mask;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.15 */
-	u_int16_t m_key_lease;
-	/* Description -  */
-	/* 0x18.16 - 0x18.31 */
-	u_int16_t diag_code;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.7 */
-	u_int8_t link_width_act;
-	/* Description -  */
-	/* 0x1c.8 - 0x1c.15 */
-	u_int8_t link_width_sup;
-	/* Description -  */
-	/* 0x1c.16 - 0x1c.23 */
-	u_int8_t link_width_ena;
-	/* Description -  */
-	/* 0x1c.24 - 0x1c.31 */
-	u_int8_t local_port_num;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x20.3 */
-	u_int8_t link_speed_ena;
-	/* Description -  */
-	/* 0x20.4 - 0x20.7 */
-	u_int8_t link_speed_act;
-	/* Description -  */
-	/* 0x20.8 - 0x20.10 */
-	u_int8_t lmc;
-	/* Description -  */
-	/* 0x20.14 - 0x20.15 */
-	u_int8_t m_key_protec;
-	/* Description -  */
-	/* 0x20.16 - 0x20.19 */
-	u_int8_t down_def_state;
-	/* Description -  */
-	/* 0x20.20 - 0x20.23 */
-	u_int8_t phy_state;
-	/* Description -  */
-	/* 0x20.24 - 0x20.27 */
-	u_int8_t port_state;
-	/* Description -  */
-	/* 0x20.28 - 0x20.31 */
-	u_int8_t link_speed_sup;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.0 - 0x24.7 */
-	u_int8_t vl_arb_high_cap;
-	/* Description -  */
-	/* 0x24.8 - 0x24.15 */
-	u_int8_t vl_high_limit;
-	/* Description -  */
-	/* 0x24.16 - 0x24.19 */
-	u_int8_t init_type;
-	/* Description -  */
-	/* 0x24.20 - 0x24.23 */
-	u_int8_t vl_cap;
-	/* Description -  */
-	/* 0x24.24 - 0x24.27 */
-	u_int8_t master_sm_sl;
-	/* Description -  */
-	/* 0x24.28 - 0x24.31 */
-	u_int8_t neighbor_mtu;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description -  */
-	/* 0x28.0 - 0x28.0 */
-	u_int8_t filter_raw_out;
-	/* Description -  */
-	/* 0x28.1 - 0x28.1 */
-	u_int8_t filter_raw_in;
-	/* Description -  */
-	/* 0x28.2 - 0x28.2 */
-	u_int8_t Part_enforce_out;
-	/* Description -  */
-	/* 0x28.3 - 0x28.3 */
-	u_int8_t Part_enforce_in;
-	/* Description -  */
-	/* 0x28.4 - 0x28.7 */
-	u_int8_t operational_vl;
-	/* Description -  */
-	/* 0x28.8 - 0x28.12 */
-	u_int8_t HOQLife;
-	/* Description -  */
-	/* 0x28.13 - 0x28.15 */
-	u_int8_t vl_stall_cnt;
-	/* Description -  */
-	/* 0x28.16 - 0x28.19 */
-	u_int8_t mtu_cap;
-	/* Description -  */
-	/* 0x28.24 - 0x28.31 */
-	u_int8_t vl_arb_low_cap;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description -  */
-	/* 0x2c.0 - 0x2c.15 */
-	u_int16_t p_key_violations;
-	/* Description -  */
-	/* 0x2c.16 - 0x2c.31 */
-	u_int16_t m_key_violations;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description -  */
-	/* 0x30.0 - 0x30.4 */
-	u_int8_t subnet_to;
-	/* Description -  */
-	/* 0x30.7 - 0x30.7 */
-	u_int8_t client_reregister;
-	/* Description -  */
-	/* 0x30.8 - 0x30.15 */
-	u_int8_t guid_cap;
-	/* Description -  */
-	/* 0x30.16 - 0x30.31 */
-	u_int16_t q_key_violations;
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-	/* Description -  */
-	/* 0x34.16 - 0x34.19 */
-	u_int8_t overrun_err;
-	/* Description -  */
-	/* 0x34.20 - 0x34.23 */
-	u_int8_t local_phy_err;
-	/* Description -  */
-	/* 0x34.24 - 0x34.28 */
-	u_int8_t resp_time_value;
-/*---------------- DWORD[15] (Offset 0x3c) ----------------*/
-	/* Description - 0: No State Change; valid only on Set(); 1: 14.0625 Gbps (FDR); 2: 25.78125 Gbps (EDR); 3: 14.0625 Gbps (FDR) or 25.78125 Gbps (EDR); 4-29: Reserved; 30: Disable extended link speeds/Extended link speeds disabled; 31: Set to LinkSpeedExtSupported value; response contains actual LinkSpeedExtSupported; */
-	/* 0x3c.0 - 0x3c.4 */
-	u_int8_t link_speed_ext_ena;
-	/* Description - 0: Reserved; 1: 14.0625 Gbps (FDR); 2: 25.78125 Gbps (EDR); 3: 14.0625 Gbps (FDR) or 25.78125 Gbps (EDR); 4-15: Reserved */
-	/* 0x3c.8 - 0x3c.11 */
-	u_int8_t link_speed_ext_sup;
-	/* Description - 0: No extended speed active; 1: 14.0625 Gbps (FDR); 2: 25.78125 Gbps (EDR); 3-15: Reserved */
-	/* 0x3c.12 - 0x3c.15 */
-	u_int8_t link_speed_ext_act;
-};
-
-/* Description -   */
-/* Size in bytes - 72 */
-struct tools_open_mcam {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Access Register ID groups 
-0 - First 128 REG_ID */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t access_reg_group;
-	/* Description - Feature list mask index : 
-0 - enhanced features */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t feature_group;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Supported management's access register bitmaks.
-Based on 
-access_reg_group 
-index.
- 
-When bit is set , The register is supported in the device. 
-For example:
-Bit 1 - MFCR (0x9001)
-Bit 2 - MFSC (0x9002)
-Bit 3 - MFSM (0x9003)
-Bit 4 - MFSL (0x9004)
-Bit 73 - MPPF (0x9049)
-Bit 127- MCAP (0x907F) */
-	/* 0x8.24 - 0x18.23 */
-	u_int8_t mng_access_reg_cap_mask[16];
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description - Supported port's enhanced features.
-Based on 
-feature_group
- 
-index.
-When bit is set , The feature is supported in the device: 
-Bit 0 - 
-MPCNT counter group: 
-PCIE performance counters supported */
-	/* 0x28.24 - 0x38.23 */
-	u_int8_t mng_feature_cap_mask[16];
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct tools_open_mfmc {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Flash Select */
-	/* 0x0.4 - 0x0.5 */
-	u_int8_t fs;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Power of 2 of the write protect block count
-0: 1 block
-1: 2 blocks
-2: 4 blocks, etc.
-Range 0..5
-Reserved when wrp_en = 0 */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t wrp_block_count;
-	/* Description - Block size
-0: write protect 4Kbyte blocks
-1: write protect 64Kbyte blocks.
-Reserved when wrp_en = 0
-Note that not all block sizes are supported on all flash device, need to check MFPA capabilities */
-	/* 0x4.16 - 0x4.17 */
-	u_int8_t block_size;
-	/* Description - Write protect enable
-Set write protect of flash device */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t wrp_en;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Power of 2 for sub_sector size in 4Kbytes.
-0: 4KB. 1: 8KB. 2: 16KB. 3: 32KB. 4:64KB. Etc.
-Reserved when MFPA.sub_sector_wrp_en = 0 */
-	/* 0x8.0 - 0x8.5 */
-	u_int8_t sub_sector_protect_size;
-	/* Description - Power of 2 for sector size in 4Kbytes.
-0: 4KB. 1: 8KB. 2: 16KB. 3: 32KB. 4:64KB. Etc.\Reserved when MFPA.sector_wrp_en = 0 */
-	/* 0x8.8 - 0x8.13 */
-	u_int8_t sector_protect_size;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Quad enable IO bit in the device status register */
-	/* 0x10.24 - 0x10.24 */
-	u_int8_t quad_en;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - The number of dummy clock cycles subsequent to all FAST READ commands.
-Reserved if not supported by the device */
-	/* 0x18.0 - 0x18.3 */
-	u_int8_t dummy_clock_cycles;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct tools_open_mfpa {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Flash Select */
-	/* 0x0.4 - 0x0.5 */
-	u_int8_t fs;
-	/* Description - Parallel */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t p;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - address in bytes */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t boot_address;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - number of flash devices connected */
-	/* 0x10.0 - 0x10.3 */
-	u_int8_t flash_num;
-	/* Description - If set, MFMC register supports setting write protect of subsector granularity  */
-	/* 0x10.16 - 0x10.16 */
-	u_int8_t sub_sector_wrp_en;
-	/* Description - If set, MFMC register supports setting write protect with sector granularity */
-	/* 0x10.17 - 0x10.17 */
-	u_int8_t sector_wrp_en;
-	/* Description - supports 64KB bulk erase operation */
-	/* 0x10.29 - 0x10.29 */
-	u_int8_t bulk_64kb_erase_en;
-	/* Description - supports 32KB bulk erase operation */
-	/* 0x10.30 - 0x10.30 */
-	u_int8_t bulk_32kb_erase_en;
-	/* Description - reflection of wip bit from flash */
-	/* 0x10.31 - 0x10.31 */
-	u_int8_t wip;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Flash JEDEC ID */
-	/* 0x14.0 - 0x14.23 */
-	u_int32_t jedec_id;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Flash sectore size */
-	/* 0x18.0 - 0x18.9 */
-	u_int16_t sector_size;
-	/* Description -  */
-	/* 0x18.16 - 0x18.23 */
-	u_int8_t block_allignment;
-	/* Description -  */
-	/* 0x18.24 - 0x18.31 */
-	u_int8_t block_size;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Bitmask indicates which capabilities are supported.
-Bit 0: Set write protect supported (register MFMC supports setting write protection)
-Bit 1: quad enable read write is supported (register MFMC supports setting quad enable)
-Bit 2: set dummy cycle supported (register MFMC supports setting dummy cycles) */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t capability_mask;
-};
-
-/* Description -   */
-/* Size in bytes - 128 */
-struct tools_open_mgir {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Hardware Information, see 
-Table 693, "
-Hardware Info Layout
-," 
-on page 746 */
-	/* 0x0.0 - 0x1c.31 */
-	struct tools_open_hw_info hw_info;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - Firmware Information, see 
-Table 695, "
-Firmware Info Layout
-," 
-on page 747 */
-	/* 0x20.0 - 0x5c.31 */
-	struct tools_open_fw_info fw_info;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description -  */
-	/* 0x60.0 - 0x7c.31 */
-	struct tools_open_sw_info sw_info;
-};
-
-/* Description -   */
-/* Size in bytes - 172 */
-struct tools_open_mgnle {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Pointer to the log entry (see description above for more 
-information) */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t le_pointer;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The number of events that the system failed to log since the 
-previous log entry.
-15 should be interpreted as '15 or more events were lost' */
-	/* 0x4.24 - 0x4.27 */
-	u_int8_t lost_events;
-	/* Description - 0x0: Boot - time is measured since NIC bootup.
-0x1: Synced - time was synced by the host. */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t synced_time;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - The 32 MSB of the 64bit timestamp. In microseconds
-When "time_synced" bit is set this is the time passed since the 
-1/1/1970 epoch.
-When "time_synced" is cleared this is the NIC uptime. */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t time_h;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - The 32 LSB of the 64bit timestamp. In microseconds */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t time_l;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x18.31 */
-	struct tools_open_nv_hdr_fifth_gen nv_hdr;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description -  */
-	/* 0x2c.24 - 0xac.23 */
-	u_int8_t log_data[128];
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_mlock {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - operation: 0 – unlocked, 1 – locked, other – RESERVED.  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t operation;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Key */
-	/* 0x8.0 - 0xc.31 */
-	u_int64_t key;
-};
-
-/* Description -   */
-/* Size in bytes - 256 */
-struct tools_open_mnva {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_nv_hdr nv_hdr;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.24 - 0x88.23 */
-	u_int8_t data[128];
-};
-
-/* Description -   */
-/* Size in bytes - 156 */
-struct tools_open_mnvgn {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Pointer to the NV parameter */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t nv_pointer;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x18.31 */
-	struct tools_open_nv_hdr_fifth_gen nv_hdr;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.24 - 0x9c.23 */
-	u_int8_t nv_data[128];
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_mnvi {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_nv_hdr nv_hdr;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_mnvia {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_nv_hdr nv_hdr;
-};
-
-/* Description -   */
-/* Size in bytes - 20 */
-struct tools_open_mvts {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - A SET operation with this flag set will only check if the new timestamp can be configured without upda ting NVRAM */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t check_timestamp_flag;
-	/* Description - A GET operation with this flag set, will return the running FW version instead */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t running_flag;
-	/* Description - A SET operation with this flag on will clear the running and other bank timestamps */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t clear_all_ts_flag;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Timestamp entry */
-	/* 0x4.0 - 0x10.31 */
-	struct tools_open_timestamp timestamp;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-struct tools_open_node_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t num_of_ports;
-	/* Description -  */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t node_type;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t class_version;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t base_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t system_image_guid_hi;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t system_image_guid_lo;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t node_guid_hi;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t node_guid_lo;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.0 - 0x14.31 */
-	u_int32_t port_guid_hi;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t port_guid_lo;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description -  */
-	/* 0x1c.0 - 0x1c.15 */
-	u_int16_t device_id;
-	/* Description -  */
-	/* 0x1c.16 - 0x1c.31 */
-	u_int16_t partition_cap;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description -  */
-	/* 0x20.0 - 0x20.31 */
-	u_int32_t revision;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.0 - 0x24.23 */
-	u_int32_t vendor_id;
-	/* Description -  */
-	/* 0x24.24 - 0x24.31 */
-	u_int8_t local_port_num;
-};
-
-/* Description -   */
-/* Size in bytes - 268 */
-struct tools_open_nvda {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_nv_hdr_fifth_gen nv_hdr;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.24 - 0x10c.23 */
-	u_int8_t data[256];
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_nvdi {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_nv_hdr_fifth_gen nv_hdr;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_nvia {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Information targeted for invalidation
-0: ALL - all NVRAM parameters.
- 
-All other values are reserved. */
-	/* 0x0.0 - 0x0.2 */
-	u_int8_t target;
-	/* Description - The entity which perform the invalidate.
-The encoding same as writer_id in Configuration Item reg
-ister (See       
-Table 872, "
-Configuration Item Layout
-," on 
-page 1027
-). */
-	/* 0x0.4 - 0x0.8 */
-	u_int8_t writer_id;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_nvqc {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	union tools_open_tlv_type type;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - the configuration item is supported and can be read */
-	/* 0x4.0 - 0x4.0 */
-	u_int8_t support_rd;
-	/* Description - the configuration item is supported and can be updated */
-	/* 0x4.1 - 0x4.1 */
-	u_int8_t support_wr;
-	/* Description - The maximum version of the configuration item currently supported by the firmware. */
-	/* 0x4.4 - 0x4.7 */
-	u_int8_t version;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_nvqgc {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - NVDA read factory settings. 0: Unsupported. 1: Supported. */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t read_factory_settings_support;
-	/* Description - NVDA read current settings, 0=unsupported, 1=supported */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t nvda_read_current_settings;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_pmdic {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Local port number */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t local_port;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Bit 0 - NOP
-Bit 1 - Address (reserved for Clause 22)
-Bit 2 - Read
-Bit 3 - Write
-Bit 4 - Post Read Increment Address (reserved for Clause 22)
-Bit 6 - Address + Read - Generates Address cycle and then Read cycle in Clause 45 (reserved for Clause 22)
-Bit 7- Address + Write - Generates Address cycle and then Write cycle in Clause 45 (reserved for Clause 22)
- */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t operation_cap;
-	/* Description - MDIO I/F definition:
-00 - Clause 22
-01 - Clause 45
- */
-	/* 0x4.24 - 0x4.25 */
-	u_int8_t clause;
-	/* Description - MDIO present:
-00 - MDIO not present
-01 - External MDIO present
- */
-	/* 0x4.30 - 0x4.31 */
-	u_int8_t mdio_preset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Bit 0 External Phy FW master
-Used for external Phy FW burning. When set, the MDIO I/F is used for an external phy FW burn
- */
-	/* 0x8.0 - 0x8.7 */
-	u_int8_t misc_cap;
-};
-
-/* Description -   */
-/* Size in bytes - 264 */
-struct tools_open_pmdio {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 000 - NOP
-001 - Address (reserved for Clause 22)
-010 - Read
-011 - Write
-100 - Post Read Increment Address (reserved for Clause 22)
-110 - Address + Read - Generates Address cycle and then Read cycle in Clause 45 (reserved for Clause 22)
-111 - Address + Write - Generates Address cycle and then Write cycle in Clause 45 (reserved for Clause 22)
- */
-	/* 0x0.0 - 0x0.2 */
-	u_int8_t operation;
-	/* Description - MDIO I/F definition:
-00 - Clause 22
-01 - Clause 45
- */
-	/* 0x0.8 - 0x0.9 */
-	u_int8_t clause;
-	/* Description - Local port number */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t local_port;
-	/* Description - Lock bit. Setting this bit will lock the access to port's MDIO
-Used for operations that requires continuous MDIO accesses.
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t over_en;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        union tools_open_tlv_type type;
+    };
 
-In order to guarantee atomicity of some operations, the port MDIO interface can be locked to a specific interface.
-When the lock bit is set, no MDIO accesses through another interface (FW/driver/tools) are allowed on the port.
-An attempt to set the lock bit while it is locked by another interface should return a RESOURCE/_BUSY status.
- */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t lock;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Reg Address (Clause 22) / MDIO Manageable Device address (Clause 45) */
-	/* 0x4.0 - 0x4.4 */
-	u_int8_t reg_adr_mmd;
-	/* Description - Index of last entry in the operations list. 0 means single operation (backward compatible).
-Valid values are 0..63
- */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t last_op_idx;
-	/* Description - Number of operations actually executed by FW. Driver write 0 to this field. FW increment the field with any execution of an entry in the operations list. */
-	/* 0x4.16 - 0x4.23 */
-	u_int8_t num_ops_done;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - addr/data entry */
-	/* 0x8.0 - 0x104.31 */
-	struct tools_open_pmdio_addr_data mdio_trans[64];
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-union tools_open_smp_vsp_general_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct tools_open_hw_info hw_info;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct tools_open_fw_info fw_info;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct tools_open_sw_info sw_info;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct tools_open_capability_mask_smp capability_mask_smp;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_aux_data_hdr {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0x544c563a : ascii for "TLV:"
- */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t signature0;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - 0x6548bc86 */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t signature1;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - 0x01020305 */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t signature2;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - 0x080d1522 */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t signature3;
-};
-
-/* Description -   */
-/* Size in bytes - 256 */
-struct tools_open_aux_tlv {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x10.31 */
-	struct tools_open_aux_tlv_header aux_tlv_header;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - tlv data */
-	/* 0x14.24 - 0x94.23 */
-	u_int8_t data[128];
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_bar_size {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Base 2 log of the size of the physical function��s first BAR, in MBs. E.g. for 8MB the value is 3. */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t log_uar_bar_size;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_boot_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - VLAN ID for network boot. */
-	/* 0x0.0 - 0x0.11 */
-	u_int16_t boot_vlan;
-	/* Description - 0 �� None �� disable legacy boot.
-1 �� PXE (DHCP/TFTP boot).
-2 �� iSCSI
-3 �� PXE + iSCSI
-4-255 �� Reserved
- */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t legacy_boot_protocol;
-	/* Description - Number of retries to attempt in case of boot failure.
-7 indicate indefinite retries.
- */
-	/* 0x0.24 - 0x0.26 */
-	u_int8_t boot_retry_conut;
-	/* Description - 1 �� Enable VLAN mode for network boot. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t boot_vlan_en;
-	/* Description - 0 �� disable boot option ROM: disables installation of the UNDI/16 driver. The option ROM is still required to expose CLP, UEFI and so on.
-1 �� enable boot option ROM
- */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t boot_option_rom_en;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_boot_settings_ext {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Select which IP protocol version will be used by flexboot */
-	/* 0x0.8 - 0x0.9 */
-	u_int8_t ip_ver;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_common_header {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t length;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t type;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t version;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_component_desciptor {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t identifier;
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t pldm_classification;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t cb_offset_h;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t cb_offset_l;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t size;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_component_ptr {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t component_index;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t storage_id;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t storage_address;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_external_port {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t port_owner;
-	/* Description -  */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t allow_rd_counters;
-};
-
-/* Description -   */
-/* Size in bytes - 1024 */
-struct tools_open_image_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - IMAGE_INFO section minor version */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t minor_version;
-	/* Description - IMAGE_INFO section major version */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t major_version;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description -  */
-	/* 0x24.24 - 0x34.23 */
-	char psid[17];
-/*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
-	/* Description - Product description */
-	/* 0x1d0.24 - 0x2d0.23 */
-	char description[257];
-/*---------------- DWORD[208] (Offset 0x340) ----------------*/
-	/* Description - Product name */
-	/* 0x340.24 - 0x380.23 */
-	char name[65];
-/*---------------- DWORD[224] (Offset 0x380) ----------------*/
-	/* Description - PRS used to generate the FW binary */
-	/* 0x380.24 - 0x3e0.23 */
-	char prs_name[97];
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_infiniband_boot_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - P_key to be used by PXE boot. */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t boot_pkey;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_infiniband_dc_capabilities {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	u_int32_t min_log_dcr_hash_table_size;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t max_log_dcr_hash_table_size;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t min_dcr_lifo_size;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t max_dcr_lifo_size;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_infiniband_dc_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Hash table size minus one */
-	/* 0x0.0 - 0x0.4 */
-	u_int8_t log_dcr_hash_table_size;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The amount of total DCRs available to join linked-lists after hash DCRs. This is a dynamic pool of DCRs that can be used to connect all incoming connections. */
-	/* 0x4.0 - 0x4.23 */
-	u_int32_t dcr_lifo_size;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_iscsi_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Enable or disable whether the iSCSI target will appear as the first hard disk drive in the system. Currently not supported. */
-	/* 0x0.21 - 0x0.21 */
-	u_int8_t target_as_first_hdd_en;
-	/* Description - Boot to iSCSI target after connection. 
-�� 0 �� Enabled
-�� 1 �� Disabled
-�� 2 - One time disabled
-�� 3 - Invalid setting
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_pmdio_addr_data
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Data (Clause 22) / Address/Data (Clause 45) */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t data;
+        /* Description - Address (Clause 45)
+This field is only valid for Address + Read and Address + Write operations, providing the address. For other Clause 45
+operations the data field provides the address when appropriate.
  */
-	/* 0x0.22 - 0x0.23 */
-	u_int8_t boot_to_target;
-	/* Description - Enable IPv6 auto-configuration through DHCP. Currently not supported. */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t ipv6_auto_config_en;
-	/* Description - Enable VLAN mode for iSCSI. */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t vlan_en;
-	/* Description - Enable the TCP timestamps option for iSCSI TCP connections. */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t tcp_timestamps_en;
-	/* Description - Authenticate the target to the initiator using CHAP. */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t chap_mutual_auth_en;
-	/* Description - Authenticate the initiator to the target using CHAP. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t chap_auth_en;
-	/* Description - Retrieve iSCSI parameters through DHCP. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t dhcp_iscsi_en;
-	/* Description - Retrieve IPv4 configuration for iSCSI through DHCP. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t ipv4_dhcp_en;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - VLAN number. Only valid when vlan_en is 1 */
-	/* 0x4.0 - 0x4.11 */
-	u_int16_t vlan;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Number of connection attempts to make if the iSCSI target is busy. Valid values are between 0 and 60. */
-	/* 0x8.0 - 0x8.7 */
-	u_int8_t lun_busy_retry_count;
-	/* Description - Number of seconds to wait after the link comes up before sending packets over the network. */
-	/* 0x8.8 - 0x8.15 */
-	u_int8_t link_up_delay_time;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_lldp_client_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t lldp_nb_dcbx;
-	/* Description -  */
-	/* 0x0.28 - 0x0.29 */
-	u_int8_t lldp_nb_rx_mode;
-	/* Description -  */
-	/* 0x0.30 - 0x0.31 */
-	u_int8_t lldp_nb_tx_mode;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct tools_open_lldp_nb {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Enable processing of incoming LLDB NB BPDUs
-Default: Disable
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t addr;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct tools_open_sw_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t subminor;
+        /* Description -  */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t minor;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.3 */
+        u_int8_t rom3_type;
+        /* Description -  */
+        /* 0x4.4 - 0x4.7 */
+        u_int8_t rom3_arch;
+        /* Description -  */
+        /* 0x4.8 - 0x4.11 */
+        u_int8_t rom2_type;
+        /* Description -  */
+        /* 0x4.12 - 0x4.15 */
+        u_int8_t rom2_arch;
+        /* Description -  */
+        /* 0x4.16 - 0x4.19 */
+        u_int8_t rom1_type;
+        /* Description -  */
+        /* 0x4.20 - 0x4.23 */
+        u_int8_t rom1_arch;
+        /* Description -  */
+        /* 0x4.24 - 0x4.27 */
+        u_int8_t rom0_type;
+        /* Description -  */
+        /* 0x4.28 - 0x4.31 */
+        u_int8_t rom0_arch;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t rom0_version;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t rom1_version;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t rom2_version;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x14.31 */
+        u_int32_t rom3_version;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_timestamp
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - fw_version */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_fw_version fw_version;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Timestamp */
+        /* 0x8.0 - 0xc.31 */
+        struct tools_open_ts_entry ts_entry;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_uint64
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int64_t uint64;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 20 */
+    struct tools_open_aux_tlv_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t minor_version;
+        /* Description -  */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t major_version;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t type;
+        /* Description -  */
+        /* 0x0.28 - 0x0.31 */
+        u_int8_t header_type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t length;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t crc;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t reserved0;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t reserved1;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 60 */
+    struct tools_open_extended_ib_port_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t StateChangeEnable;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t LinkSpeedSupported;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.7 */
+        u_int8_t LinkSpeedEnabled;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.7 */
+        u_int8_t LinkSpeedActive;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t CapMask;
+        /* Description -  */
+        /* 0x10.28 - 0x10.31 */
+        u_int8_t ActiveCell;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct tools_open_ib_port_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t m_key_hi;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t m_key_lo;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t gid_prefix_hi;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t gid_prefix_lo;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.15 */
+        u_int16_t master_sm_lid;
+        /* Description -  */
+        /* 0x10.16 - 0x10.31 */
+        u_int16_t lid;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x14.31 */
+        struct tools_open_cap_mask cap_mask;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.15 */
+        u_int16_t m_key_lease;
+        /* Description -  */
+        /* 0x18.16 - 0x18.31 */
+        u_int16_t diag_code;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.7 */
+        u_int8_t link_width_act;
+        /* Description -  */
+        /* 0x1c.8 - 0x1c.15 */
+        u_int8_t link_width_sup;
+        /* Description -  */
+        /* 0x1c.16 - 0x1c.23 */
+        u_int8_t link_width_ena;
+        /* Description -  */
+        /* 0x1c.24 - 0x1c.31 */
+        u_int8_t local_port_num;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x20.3 */
+        u_int8_t link_speed_ena;
+        /* Description -  */
+        /* 0x20.4 - 0x20.7 */
+        u_int8_t link_speed_act;
+        /* Description -  */
+        /* 0x20.8 - 0x20.10 */
+        u_int8_t lmc;
+        /* Description -  */
+        /* 0x20.14 - 0x20.15 */
+        u_int8_t m_key_protec;
+        /* Description -  */
+        /* 0x20.16 - 0x20.19 */
+        u_int8_t down_def_state;
+        /* Description -  */
+        /* 0x20.20 - 0x20.23 */
+        u_int8_t phy_state;
+        /* Description -  */
+        /* 0x20.24 - 0x20.27 */
+        u_int8_t port_state;
+        /* Description -  */
+        /* 0x20.28 - 0x20.31 */
+        u_int8_t link_speed_sup;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.0 - 0x24.7 */
+        u_int8_t vl_arb_high_cap;
+        /* Description -  */
+        /* 0x24.8 - 0x24.15 */
+        u_int8_t vl_high_limit;
+        /* Description -  */
+        /* 0x24.16 - 0x24.19 */
+        u_int8_t init_type;
+        /* Description -  */
+        /* 0x24.20 - 0x24.23 */
+        u_int8_t vl_cap;
+        /* Description -  */
+        /* 0x24.24 - 0x24.27 */
+        u_int8_t master_sm_sl;
+        /* Description -  */
+        /* 0x24.28 - 0x24.31 */
+        u_int8_t neighbor_mtu;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description -  */
+        /* 0x28.0 - 0x28.0 */
+        u_int8_t filter_raw_out;
+        /* Description -  */
+        /* 0x28.1 - 0x28.1 */
+        u_int8_t filter_raw_in;
+        /* Description -  */
+        /* 0x28.2 - 0x28.2 */
+        u_int8_t Part_enforce_out;
+        /* Description -  */
+        /* 0x28.3 - 0x28.3 */
+        u_int8_t Part_enforce_in;
+        /* Description -  */
+        /* 0x28.4 - 0x28.7 */
+        u_int8_t operational_vl;
+        /* Description -  */
+        /* 0x28.8 - 0x28.12 */
+        u_int8_t HOQLife;
+        /* Description -  */
+        /* 0x28.13 - 0x28.15 */
+        u_int8_t vl_stall_cnt;
+        /* Description -  */
+        /* 0x28.16 - 0x28.19 */
+        u_int8_t mtu_cap;
+        /* Description -  */
+        /* 0x28.24 - 0x28.31 */
+        u_int8_t vl_arb_low_cap;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description -  */
+        /* 0x2c.0 - 0x2c.15 */
+        u_int16_t p_key_violations;
+        /* Description -  */
+        /* 0x2c.16 - 0x2c.31 */
+        u_int16_t m_key_violations;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description -  */
+        /* 0x30.0 - 0x30.4 */
+        u_int8_t subnet_to;
+        /* Description -  */
+        /* 0x30.7 - 0x30.7 */
+        u_int8_t client_reregister;
+        /* Description -  */
+        /* 0x30.8 - 0x30.15 */
+        u_int8_t guid_cap;
+        /* Description -  */
+        /* 0x30.16 - 0x30.31 */
+        u_int16_t q_key_violations;
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description -  */
+        /* 0x34.16 - 0x34.19 */
+        u_int8_t overrun_err;
+        /* Description -  */
+        /* 0x34.20 - 0x34.23 */
+        u_int8_t local_phy_err;
+        /* Description -  */
+        /* 0x34.24 - 0x34.28 */
+        u_int8_t resp_time_value;
+        /*---------------- DWORD[15] (Offset 0x3c) ----------------*/
+        /* Description - 0: No State Change; valid only on Set(); 1: 14.0625 Gbps (FDR); 2: 25.78125 Gbps (EDR);
+         * 3: 14.0625 Gbps (FDR) or 25.78125 Gbps (EDR); 4-29: Reserved; 30: Disable extended link speeds/Extended link
+         * speeds disabled; 31: Set to LinkSpeedExtSupported value; response contains actual LinkSpeedExtSupported; */
+        /* 0x3c.0 - 0x3c.4 */
+        u_int8_t link_speed_ext_ena;
+        /* Description - 0: Reserved; 1: 14.0625 Gbps (FDR); 2: 25.78125 Gbps (EDR); 3: 14.0625 Gbps (FDR) or 25.78125
+         * Gbps (EDR); 4-15: Reserved */
+        /* 0x3c.8 - 0x3c.11 */
+        u_int8_t link_speed_ext_sup;
+        /* Description - 0: No extended speed active; 1: 14.0625 Gbps (FDR); 2: 25.78125 Gbps (EDR); 3-15: Reserved */
+        /* 0x3c.12 - 0x3c.15 */
+        u_int8_t link_speed_ext_act;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 72 */
+    struct tools_open_mcam
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Access Register ID groups
+0 - First 128 REG_ID */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t access_reg_group;
+        /* Description - Feature list mask index :
+0 - enhanced features */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t feature_group;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Supported management's access register bitmaks.
+Based on
+access_reg_group
+index.
+
+When bit is set , The register is supported in the device.
+For example:
+Bit 1 - MFCR (0x9001)
+Bit 2 - MFSC (0x9002)
+Bit 3 - MFSM (0x9003)
+Bit 4 - MFSL (0x9004)
+Bit 73 - MPPF (0x9049)
+Bit 127- MCAP (0x907F) */
+        /* 0x8.24 - 0x18.23 */
+        u_int8_t mng_access_reg_cap_mask[16];
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description - Supported port's enhanced features.
+Based on
+feature_group
+
+index.
+When bit is set , The feature is supported in the device:
+Bit 0 -
+MPCNT counter group:
+PCIE performance counters supported */
+        /* 0x28.24 - 0x38.23 */
+        u_int8_t mng_feature_cap_mask[16];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct tools_open_mfmc
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Flash Select */
+        /* 0x0.4 - 0x0.5 */
+        u_int8_t fs;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Power of 2 of the write protect block count
+0: 1 block
+1: 2 blocks
+2: 4 blocks, etc.
+Range 0..5
+Reserved when wrp_en = 0 */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t wrp_block_count;
+        /* Description - Block size
+0: write protect 4Kbyte blocks
+1: write protect 64Kbyte blocks.
+Reserved when wrp_en = 0
+Note that not all block sizes are supported on all flash device, need to check MFPA capabilities */
+        /* 0x4.16 - 0x4.17 */
+        u_int8_t block_size;
+        /* Description - Write protect enable
+Set write protect of flash device */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t wrp_en;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Power of 2 for sub_sector size in 4Kbytes.
+0: 4KB. 1: 8KB. 2: 16KB. 3: 32KB. 4:64KB. Etc.
+Reserved when MFPA.sub_sector_wrp_en = 0 */
+        /* 0x8.0 - 0x8.5 */
+        u_int8_t sub_sector_protect_size;
+        /* Description - Power of 2 for sector size in 4Kbytes.
+0: 4KB. 1: 8KB. 2: 16KB. 3: 32KB. 4:64KB. Etc.\Reserved when MFPA.sector_wrp_en = 0 */
+        /* 0x8.8 - 0x8.13 */
+        u_int8_t sector_protect_size;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Quad enable IO bit in the device status register */
+        /* 0x10.24 - 0x10.24 */
+        u_int8_t quad_en;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - The number of dummy clock cycles subsequent to all FAST READ commands.
+Reserved if not supported by the device */
+        /* 0x18.0 - 0x18.3 */
+        u_int8_t dummy_clock_cycles;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct tools_open_mfpa
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Flash Select */
+        /* 0x0.4 - 0x0.5 */
+        u_int8_t fs;
+        /* Description - Parallel */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t p;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - address in bytes */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t boot_address;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - number of flash devices connected */
+        /* 0x10.0 - 0x10.3 */
+        u_int8_t flash_num;
+        /* Description - If set, MFMC register supports setting write protect of subsector granularity  */
+        /* 0x10.16 - 0x10.16 */
+        u_int8_t sub_sector_wrp_en;
+        /* Description - If set, MFMC register supports setting write protect with sector granularity */
+        /* 0x10.17 - 0x10.17 */
+        u_int8_t sector_wrp_en;
+        /* Description - supports 64KB bulk erase operation */
+        /* 0x10.29 - 0x10.29 */
+        u_int8_t bulk_64kb_erase_en;
+        /* Description - supports 32KB bulk erase operation */
+        /* 0x10.30 - 0x10.30 */
+        u_int8_t bulk_32kb_erase_en;
+        /* Description - reflection of wip bit from flash */
+        /* 0x10.31 - 0x10.31 */
+        u_int8_t wip;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Flash JEDEC ID */
+        /* 0x14.0 - 0x14.23 */
+        u_int32_t jedec_id;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Flash sectore size */
+        /* 0x18.0 - 0x18.9 */
+        u_int16_t sector_size;
+        /* Description -  */
+        /* 0x18.16 - 0x18.23 */
+        u_int8_t block_allignment;
+        /* Description -  */
+        /* 0x18.24 - 0x18.31 */
+        u_int8_t block_size;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Bitmask indicates which capabilities are supported.
+Bit 0: Set write protect supported (register MFMC supports setting write protection)
+Bit 1: quad enable read write is supported (register MFMC supports setting quad enable)
+Bit 2: set dummy cycle supported (register MFMC supports setting dummy cycles) */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t capability_mask;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 128 */
+    struct tools_open_mgir
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Hardware Information, see
+Table 693, "
+Hardware Info Layout
+,"
+on page 746 */
+        /* 0x0.0 - 0x1c.31 */
+        struct tools_open_hw_info hw_info;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - Firmware Information, see
+Table 695, "
+Firmware Info Layout
+,"
+on page 747 */
+        /* 0x20.0 - 0x5c.31 */
+        struct tools_open_fw_info fw_info;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description -  */
+        /* 0x60.0 - 0x7c.31 */
+        struct tools_open_sw_info sw_info;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 172 */
+    struct tools_open_mgnle
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Pointer to the log entry (see description above for more
+information) */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t le_pointer;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The number of events that the system failed to log since the
+previous log entry.
+15 should be interpreted as '15 or more events were lost' */
+        /* 0x4.24 - 0x4.27 */
+        u_int8_t lost_events;
+        /* Description - 0x0: Boot - time is measured since NIC bootup.
+0x1: Synced - time was synced by the host. */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t synced_time;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - The 32 MSB of the 64bit timestamp. In microseconds
+When "time_synced" bit is set this is the time passed since the
+1/1/1970 epoch.
+When "time_synced" is cleared this is the NIC uptime. */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t time_h;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - The 32 LSB of the 64bit timestamp. In microseconds */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t time_l;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x18.31 */
+        struct tools_open_nv_hdr_fifth_gen nv_hdr;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description -  */
+        /* 0x2c.24 - 0xac.23 */
+        u_int8_t log_data[128];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_mlock
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - operation: 0 – unlocked, 1 – locked, other – RESERVED.  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t operation;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Key */
+        /* 0x8.0 - 0xc.31 */
+        u_int64_t key;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 256 */
+    struct tools_open_mnva
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_nv_hdr nv_hdr;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.24 - 0x88.23 */
+        u_int8_t data[128];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 156 */
+    struct tools_open_mnvgn
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Pointer to the NV parameter */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t nv_pointer;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x18.31 */
+        struct tools_open_nv_hdr_fifth_gen nv_hdr;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.24 - 0x9c.23 */
+        u_int8_t nv_data[128];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_mnvi
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_nv_hdr nv_hdr;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_mnvia
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_nv_hdr nv_hdr;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 20 */
+    struct tools_open_mvts
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - A SET operation with this flag set will only check if the new timestamp can be configured
+         * without upda ting NVRAM */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t check_timestamp_flag;
+        /* Description - A GET operation with this flag set, will return the running FW version instead */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t running_flag;
+        /* Description - A SET operation with this flag on will clear the running and other bank timestamps */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t clear_all_ts_flag;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Timestamp entry */
+        /* 0x4.0 - 0x10.31 */
+        struct tools_open_timestamp timestamp;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    struct tools_open_node_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t num_of_ports;
+        /* Description -  */
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t node_type;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t class_version;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t base_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t system_image_guid_hi;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t system_image_guid_lo;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t node_guid_hi;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t node_guid_lo;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.0 - 0x14.31 */
+        u_int32_t port_guid_hi;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t port_guid_lo;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description -  */
+        /* 0x1c.0 - 0x1c.15 */
+        u_int16_t device_id;
+        /* Description -  */
+        /* 0x1c.16 - 0x1c.31 */
+        u_int16_t partition_cap;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description -  */
+        /* 0x20.0 - 0x20.31 */
+        u_int32_t revision;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.0 - 0x24.23 */
+        u_int32_t vendor_id;
+        /* Description -  */
+        /* 0x24.24 - 0x24.31 */
+        u_int8_t local_port_num;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 268 */
+    struct tools_open_nvda
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_nv_hdr_fifth_gen nv_hdr;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.24 - 0x10c.23 */
+        u_int8_t data[256];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_nvdi
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_nv_hdr_fifth_gen nv_hdr;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_nvia
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Information targeted for invalidation
+0: ALL - all NVRAM parameters.
+
+All other values are reserved. */
+        /* 0x0.0 - 0x0.2 */
+        u_int8_t target;
+        /* Description - The entity which perform the invalidate.
+The encoding same as writer_id in Configuration Item reg
+ister (See
+Table 872, "
+Configuration Item Layout
+," on
+page 1027
+). */
+        /* 0x0.4 - 0x0.8 */
+        u_int8_t writer_id;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_nvqc
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        union tools_open_tlv_type type;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - the configuration item is supported and can be read */
+        /* 0x4.0 - 0x4.0 */
+        u_int8_t support_rd;
+        /* Description - the configuration item is supported and can be updated */
+        /* 0x4.1 - 0x4.1 */
+        u_int8_t support_wr;
+        /* Description - The maximum version of the configuration item currently supported by the firmware. */
+        /* 0x4.4 - 0x4.7 */
+        u_int8_t version;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_nvqgc
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - NVDA read factory settings. 0: Unsupported. 1: Supported. */
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t read_factory_settings_support;
+        /* Description - NVDA read current settings, 0=unsupported, 1=supported */
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t nvda_read_current_settings;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_pmdic
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Local port number */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t local_port;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Bit 0 - NOP
+Bit 1 - Address (reserved for Clause 22)
+Bit 2 - Read
+Bit 3 - Write
+Bit 4 - Post Read Increment Address (reserved for Clause 22)
+Bit 6 - Address + Read - Generates Address cycle and then Read cycle in Clause 45 (reserved for Clause 22)
+Bit 7- Address + Write - Generates Address cycle and then Write cycle in Clause 45 (reserved for Clause 22)
+ */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t operation_cap;
+        /* Description - MDIO I/F definition:
+00 - Clause 22
+01 - Clause 45
+ */
+        /* 0x4.24 - 0x4.25 */
+        u_int8_t clause;
+        /* Description - MDIO present:
+00 - MDIO not present
+01 - External MDIO present
+ */
+        /* 0x4.30 - 0x4.31 */
+        u_int8_t mdio_preset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Bit 0 External Phy FW master
+Used for external Phy FW burning. When set, the MDIO I/F is used for an external phy FW burn
+ */
+        /* 0x8.0 - 0x8.7 */
+        u_int8_t misc_cap;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 264 */
+    struct tools_open_pmdio
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 000 - NOP
+001 - Address (reserved for Clause 22)
+010 - Read
+011 - Write
+100 - Post Read Increment Address (reserved for Clause 22)
+110 - Address + Read - Generates Address cycle and then Read cycle in Clause 45 (reserved for Clause 22)
+111 - Address + Write - Generates Address cycle and then Write cycle in Clause 45 (reserved for Clause 22)
+ */
+        /* 0x0.0 - 0x0.2 */
+        u_int8_t operation;
+        /* Description - MDIO I/F definition:
+00 - Clause 22
+01 - Clause 45
+ */
+        /* 0x0.8 - 0x0.9 */
+        u_int8_t clause;
+        /* Description - Local port number */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t local_port;
+        /* Description - Lock bit. Setting this bit will lock the access to port's MDIO
+Used for operations that requires continuous MDIO accesses.
+
+In order to guarantee atomicity of some operations, the port MDIO interface can be locked to a specific interface.
+When the lock bit is set, no MDIO accesses through another interface (FW/driver/tools) are allowed on the port.
+An attempt to set the lock bit while it is locked by another interface should return a RESOURCE/_BUSY status.
+ */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t lock;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Reg Address (Clause 22) / MDIO Manageable Device address (Clause 45) */
+        /* 0x4.0 - 0x4.4 */
+        u_int8_t reg_adr_mmd;
+        /* Description - Index of last entry in the operations list. 0 means single operation (backward compatible).
+Valid values are 0..63
+ */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t last_op_idx;
+        /* Description - Number of operations actually executed by FW. Driver write 0 to this field. FW increment the
+         * field with any execution of an entry in the operations list. */
+        /* 0x4.16 - 0x4.23 */
+        u_int8_t num_ops_done;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - addr/data entry */
+        /* 0x8.0 - 0x104.31 */
+        struct tools_open_pmdio_addr_data mdio_trans[64];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    union tools_open_smp_vsp_general_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct tools_open_hw_info hw_info;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct tools_open_fw_info fw_info;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct tools_open_sw_info sw_info;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct tools_open_capability_mask_smp capability_mask_smp;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_aux_data_hdr
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0x544c563a : ascii for "TLV:"
+         */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t signature0;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - 0x6548bc86 */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t signature1;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - 0x01020305 */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t signature2;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - 0x080d1522 */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t signature3;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 256 */
+    struct tools_open_aux_tlv
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x10.31 */
+        struct tools_open_aux_tlv_header aux_tlv_header;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - tlv data */
+        /* 0x14.24 - 0x94.23 */
+        u_int8_t data[128];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_bar_size
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Base 2 log of the size of the physical function��s first BAR, in MBs. E.g. for 8MB the value
+         * is 3. */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t log_uar_bar_size;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_boot_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - VLAN ID for network boot. */
+        /* 0x0.0 - 0x0.11 */
+        u_int16_t boot_vlan;
+        /* Description - 0 �� None �� disable legacy boot.
+1 �� PXE (DHCP/TFTP boot).
+2 �� iSCSI
+3 �� PXE + iSCSI
+4-255 �� Reserved
+ */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t legacy_boot_protocol;
+        /* Description - Number of retries to attempt in case of boot failure.
+7 indicate indefinite retries.
+ */
+        /* 0x0.24 - 0x0.26 */
+        u_int8_t boot_retry_conut;
+        /* Description - 1 �� Enable VLAN mode for network boot. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t boot_vlan_en;
+        /* Description - 0 �� disable boot option ROM: disables installation of the UNDI/16 driver. The option ROM is
+still required to expose CLP, UEFI and so on. 1 �� enable boot option ROM
+ */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t boot_option_rom_en;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_boot_settings_ext
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Select which IP protocol version will be used by flexboot */
+        /* 0x0.8 - 0x0.9 */
+        u_int8_t ip_ver;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_common_header
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t length;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t type;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t version;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_component_desciptor
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t identifier;
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t pldm_classification;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t cb_offset_h;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t cb_offset_l;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t size;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_component_ptr
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t component_index;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t storage_id;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t storage_address;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_external_port
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t port_owner;
+        /* Description -  */
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t allow_rd_counters;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 1024 */
+    struct tools_open_image_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - IMAGE_INFO section minor version */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t minor_version;
+        /* Description - IMAGE_INFO section major version */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description -  */
+        /* 0x24.24 - 0x34.23 */
+        char psid[17];
+        /*---------------- DWORD[116] (Offset 0x1d0) ----------------*/
+        /* Description - Product description */
+        /* 0x1d0.24 - 0x2d0.23 */
+        char description[257];
+        /*---------------- DWORD[208] (Offset 0x340) ----------------*/
+        /* Description - Product name */
+        /* 0x340.24 - 0x380.23 */
+        char name[65];
+        /*---------------- DWORD[224] (Offset 0x380) ----------------*/
+        /* Description - PRS used to generate the FW binary */
+        /* 0x380.24 - 0x3e0.23 */
+        char prs_name[97];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_infiniband_boot_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - P_key to be used by PXE boot. */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t boot_pkey;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_infiniband_dc_capabilities
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        u_int32_t min_log_dcr_hash_table_size;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t max_log_dcr_hash_table_size;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t min_dcr_lifo_size;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t max_dcr_lifo_size;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_infiniband_dc_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Hash table size minus one */
+        /* 0x0.0 - 0x0.4 */
+        u_int8_t log_dcr_hash_table_size;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The amount of total DCRs available to join linked-lists after hash DCRs. This is a dynamic pool
+         * of DCRs that can be used to connect all incoming connections. */
+        /* 0x4.0 - 0x4.23 */
+        u_int32_t dcr_lifo_size;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_iscsi_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Enable or disable whether the iSCSI target will appear as the first hard disk drive in the
+         * system. Currently not supported. */
+        /* 0x0.21 - 0x0.21 */
+        u_int8_t target_as_first_hdd_en;
+        /* Description - Boot to iSCSI target after connection.
+�� 0 �� Enabled
+�� 1 �� Disabled
+�� 2 - One time disabled
+�� 3 - Invalid setting
+ */
+        /* 0x0.22 - 0x0.23 */
+        u_int8_t boot_to_target;
+        /* Description - Enable IPv6 auto-configuration through DHCP. Currently not supported. */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t ipv6_auto_config_en;
+        /* Description - Enable VLAN mode for iSCSI. */
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t vlan_en;
+        /* Description - Enable the TCP timestamps option for iSCSI TCP connections. */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t tcp_timestamps_en;
+        /* Description - Authenticate the target to the initiator using CHAP. */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t chap_mutual_auth_en;
+        /* Description - Authenticate the initiator to the target using CHAP. */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t chap_auth_en;
+        /* Description - Retrieve iSCSI parameters through DHCP. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t dhcp_iscsi_en;
+        /* Description - Retrieve IPv4 configuration for iSCSI through DHCP. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t ipv4_dhcp_en;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - VLAN number. Only valid when vlan_en is 1 */
+        /* 0x4.0 - 0x4.11 */
+        u_int16_t vlan;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Number of connection attempts to make if the iSCSI target is busy. Valid values are between 0
+         * and 60. */
+        /* 0x8.0 - 0x8.7 */
+        u_int8_t lun_busy_retry_count;
+        /* Description - Number of seconds to wait after the link comes up before sending packets over the network. */
+        /* 0x8.8 - 0x8.15 */
+        u_int8_t link_up_delay_time;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_lldp_client_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t lldp_nb_dcbx;
+        /* Description -  */
+        /* 0x0.28 - 0x0.29 */
+        u_int8_t lldp_nb_rx_mode;
+        /* Description -  */
+        /* 0x0.30 - 0x0.31 */
+        u_int8_t lldp_nb_tx_mode;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct tools_open_lldp_nb
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Enable processing of incoming LLDB NB BPDUs
+Default: Disable
  */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t lldp_nb_rx_en;
-	/* Description - Enable transmission of LLDP Next Bridge BPDUs
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t lldp_nb_rx_en;
+        /* Description - Enable transmission of LLDP Next Bridge BPDUs
 Default: Enabled
  */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t lldp_nb_tx_en;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Interval for sending LLDP NB PDUs in seconds
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t lldp_nb_tx_en;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Interval for sending LLDP NB PDUs in seconds
 Default: 30
  */
-	/* 0x8.0 - 0x8.11 */
-	u_int16_t lldp_msg_tx_interval;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - A bitmask saying which of the LLDP-TLV to send
+        /* 0x8.0 - 0x8.11 */
+        u_int16_t lldp_msg_tx_interval;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - A bitmask saying which of the LLDP-TLV to send
 Default: b1111  (only TLVs 0..3) �� according to the standard these are mandatory TLVs that must always be enabled
 
 An enabled TLV will not be send if a corresponding TLV is not defined
  */
-	/* 0xc.24 - 0x1c.23 */
-	u_int8_t lldp_tx_tlv_mask[16];
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_lldp_nb_cap {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t lldp_nb_dcbx_en;
-	/* Description -  */
-	/* 0x0.28 - 0x0.29 */
-	u_int8_t lldp_nb_rx_cap;
-	/* Description -  */
-	/* 0x0.30 - 0x0.31 */
-	u_int8_t lldp_nb_tx_cap;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_lldp_nb_dcbx {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.0 */
-	u_int8_t ieee_dcbx_en;
-	/* Description -  */
-	/* 0x0.1 - 0x0.1 */
-	u_int8_t cee_dcbx_en;
-	/* Description -  */
-	/* 0x0.2 - 0x0.2 */
-	u_int8_t dcbx_willing;
-};
-
-/* Description -   */
-/* Size in bytes - 320 */
-struct tools_open_mfg_info {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.24 - 0x10.23 */
-	char psid[17];
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - MFG_INFO section minor version */
-	/* 0x1c.16 - 0x1c.23 */
-	u_int8_t minor_version;
-	/* Description - MFG_INFO section major version */
-	/* 0x1c.24 - 0x1c.31 */
-	u_int8_t major_version;
-/*---------------- DWORD[24] (Offset 0x60) ----------------*/
-	/* Description - original PRS used to generate the FW binary */
-	/* 0x60.24 - 0xc0.23 */
-	char orig_prs_name[97];
-};
-
-/* Description -   */
-/* Size in bytes - 364 */
-union tools_open_mnv_cfg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0xfc.31 */
-	struct tools_open_mnva mnva;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_mnvi mnvi;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_mnvia mnvia;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_nvqc nvqc;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_nvia nvia;
-	/* Description -  */
-	/* 0x0.0 - 0x108.31 */
-	struct tools_open_nvda nvda;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_nvdi nvdi;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct tools_open_nvqgc nvqgc;
-	/* Description -  */
-	/* 0x0.0 - 0x10.31 */
-	struct tools_open_mvts mvts;
-	/* Description -  */
-	/* 0x0.0 - 0x98.31 */
-	struct tools_open_mnvgn mnvgn;
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct tools_open_mfmc mfmc;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct tools_open_mfpa mfpa;
-	/* Description -  */
-	/* 0x0.0 - 0x7c.31 */
-	struct tools_open_mgir mgir;
-	/* Description -  */
-	/* 0x0.0 - 0x44.31 */
-	struct tools_open_mcam mcam;
-	/* Description -  */
-	/* 0x0.0 - 0xa8.31 */
-	struct tools_open_mgnle mgnle;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct tools_open_mlock mlock;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_multi_part {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t total_length;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t number_of_extensions;
-};
-
-/* Description -   */
-/* Size in bytes - 16 */
-struct tools_open_nv_base_mac_guid {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	u_int32_t base_mac[2];
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0xc.31 */
-	u_int32_t base_guid[2];
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_nv_base_mac_guid_cap {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t guid_en;
-	/* Description -  */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t mac_en;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t num_of_allocated_macs;
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t num_of_allocated_guids;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct tools_open_nv_cx3_global_conf {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - When TRUE, driver will be indicated to expose internal clock directly to user space applications */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t clock_map_to_user;
-	/* Description - Defines the Port PHY parameters mode. 0x0: DEVICE_DEFAULT, 0x1: LEGACY, 0x2: ADVANCED */
-	/* 0x0.28 - 0x0.29 */
-	u_int8_t phy_param_mode;
-	/* Description - Force vlan steering, ignoring driver configuraiton. */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t steer_force_vlan;
-	/* Description - When set, IEE1588 (PTP) HW timestamping capability is reported to the device driver. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t cq_timestamp;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_option_rom_capability {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - flexboot supports configuration of PXE boot IP version defined in boot settings ext parameter */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t ip_ver;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct tools_open_package_descriptor {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t num_of_devices;
-	/* Description -  */
-	/* 0x0.16 - 0x0.31 */
-	u_int16_t num_of_components;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t cb_offset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.31 */
-	u_int32_t cb_archive_size;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t cb_size_h;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t cb_size_l;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description -  */
-	/* 0x14.24 - 0x14.31 */
-	u_int8_t cb_compression;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description -  */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t user_data_offset;
-};
-
-/* Description -   */
-/* Size in bytes - 20 */
-struct tools_open_pci_capabilities {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 1 when max_pf_uar_bar_size field is configurable and the log_max_pf_uar_bar_size field is valid */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t pf_bar_size_supported;
-	/* Description - 1 when max_vf_uar_bar_size field is configurable and the log_max_vf_uar_bar_size field is valid */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t vf_bar_size_supported;
-	/* Description - 1 when num_pf_msix field is configurable and the max_num_pf_msix field is valid */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t num_pf_msix_supported;
-	/* Description - 1 when the num_vf_msix field is configurable and max_num_pfs is valid */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t num_vf_msix_supported;
-	/* Description - 1 when the num_pfs field is configurable and max_num_pfs is valid */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t num_pfs_supported;
-	/* Description - 1 when the max_total_bar field is valid */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t max_total_bar_valid;
-	/* Description - 1 when the total_msix field is valid */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t max_total_msix_valid;
-	/* Description - 1 when max_vfs_per_pf fields is valid. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t max_vfs_per_pf_valid;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The maximum number of VFs that can be set in the total_vfs settings (per PF) */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t max_vfs_per_pf;
-	/* Description - Maximum number of PFs per port */
-	/* 0x4.16 - 0x4.19 */
-	u_int8_t max_num_pfs;
-	/* Description - 1 - function per port settings is configurable */
-	/* 0x4.29 - 0x4.29 */
-	u_int8_t fpp_support;
-	/* Description - 1 - the device supports controlling the VF QoS setting */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t vf_qos_control_support;
-	/* Description - 1 when SRIOV is configurable */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t sriov_support;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Log 2 of the maximum size of a PF's UAR BAR */
-	/* 0x8.0 - 0x8.5 */
-	u_int8_t log_max_pf_uar_bar_size1;
-	/* Description - Log 2 of the maximum size of a VF's UAR BAR */
-	/* 0x8.6 - 0x8.11 */
-	u_int8_t log_max_vf_uar_bar_size;
-	/* Description - Maximum number of MSI-X vectors and EQs per PF */
-	/* 0x8.12 - 0x8.21 */
-	u_int16_t max_num_pf_msix;
-	/* Description - Maximum number of MSI-X vectors and EQs per VF */
-	/* 0x8.22 - 0x8.31 */
-	u_int16_t max_num_vf_msix;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Maximum number of MSI-X for the aggregat of all PF and VFs */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t max_total_msix;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Maximum total of the MMIO space for all PFs and VFs combined, in megabytes. */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t max_total_bar;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_pci_configuration {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 1 when log_pf_uar_bar_size field is valid */
-	/* 0x0.24 - 0x0.24 */
-	u_int8_t pf_bar_size_valid;
-	/* Description - 1 when log_vf_uar_bar_size field is valid */
-	/* 0x0.25 - 0x0.25 */
-	u_int8_t vf_bar_size_valid;
-	/* Description - 1 when num_pfs_msix field is valid */
-	/* 0x0.26 - 0x0.26 */
-	u_int8_t num_pfs_msix_valid;
-	/* Description - 1 when num_vfs_msix field is valid */
-	/* 0x0.27 - 0x0.27 */
-	u_int8_t num_vfs_msix_valid;
-	/* Description - 1 when num_pfs field is valid */
-	/* 0x0.28 - 0x0.28 */
-	u_int8_t num_pfs_valid;
-	/* Description - 1 when fpp_en field is valid */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t fpp_valid;
-	/* Description - 1 when the full_vf_qos field below is valid */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t full_vf_qos_valid;
-	/* Description - 1 when the sriov_en and total_vfs field below are valid. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t sriov_valid;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - The total number of VFs that can be supported */
-	/* 0x4.0 - 0x4.15 */
-	u_int16_t total_vfs;
-	/* Description - Number of PFs per port */
-	/* 0x4.16 - 0x4.19 */
-	u_int8_t num_pfs;
-	/* Description - 0 - single PF for both ports
+        /* 0xc.24 - 0x1c.23 */
+        u_int8_t lldp_tx_tlv_mask[16];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_lldp_nb_cap
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t lldp_nb_dcbx_en;
+        /* Description -  */
+        /* 0x0.28 - 0x0.29 */
+        u_int8_t lldp_nb_rx_cap;
+        /* Description -  */
+        /* 0x0.30 - 0x0.31 */
+        u_int8_t lldp_nb_tx_cap;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_lldp_nb_dcbx
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.0 */
+        u_int8_t ieee_dcbx_en;
+        /* Description -  */
+        /* 0x0.1 - 0x0.1 */
+        u_int8_t cee_dcbx_en;
+        /* Description -  */
+        /* 0x0.2 - 0x0.2 */
+        u_int8_t dcbx_willing;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 320 */
+    struct tools_open_mfg_info
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.24 - 0x10.23 */
+        char psid[17];
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - MFG_INFO section minor version */
+        /* 0x1c.16 - 0x1c.23 */
+        u_int8_t minor_version;
+        /* Description - MFG_INFO section major version */
+        /* 0x1c.24 - 0x1c.31 */
+        u_int8_t major_version;
+        /*---------------- DWORD[24] (Offset 0x60) ----------------*/
+        /* Description - original PRS used to generate the FW binary */
+        /* 0x60.24 - 0xc0.23 */
+        char orig_prs_name[97];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 364 */
+    union tools_open_mnv_cfg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0xfc.31 */
+        struct tools_open_mnva mnva;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_mnvi mnvi;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_mnvia mnvia;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_nvqc nvqc;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_nvia nvia;
+        /* Description -  */
+        /* 0x0.0 - 0x108.31 */
+        struct tools_open_nvda nvda;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_nvdi nvdi;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct tools_open_nvqgc nvqgc;
+        /* Description -  */
+        /* 0x0.0 - 0x10.31 */
+        struct tools_open_mvts mvts;
+        /* Description -  */
+        /* 0x0.0 - 0x98.31 */
+        struct tools_open_mnvgn mnvgn;
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct tools_open_mfmc mfmc;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct tools_open_mfpa mfpa;
+        /* Description -  */
+        /* 0x0.0 - 0x7c.31 */
+        struct tools_open_mgir mgir;
+        /* Description -  */
+        /* 0x0.0 - 0x44.31 */
+        struct tools_open_mcam mcam;
+        /* Description -  */
+        /* 0x0.0 - 0xa8.31 */
+        struct tools_open_mgnle mgnle;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct tools_open_mlock mlock;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_multi_part
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t total_length;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t number_of_extensions;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 16 */
+    struct tools_open_nv_base_mac_guid
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        u_int32_t base_mac[2];
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0xc.31 */
+        u_int32_t base_guid[2];
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_nv_base_mac_guid_cap
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t guid_en;
+        /* Description -  */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t mac_en;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t num_of_allocated_macs;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t num_of_allocated_guids;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct tools_open_nv_cx3_global_conf
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - When TRUE, driver will be indicated to expose internal clock directly to user space
+         * applications */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t clock_map_to_user;
+        /* Description - Defines the Port PHY parameters mode. 0x0: DEVICE_DEFAULT, 0x1: LEGACY, 0x2: ADVANCED */
+        /* 0x0.28 - 0x0.29 */
+        u_int8_t phy_param_mode;
+        /* Description - Force vlan steering, ignoring driver configuraiton. */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t steer_force_vlan;
+        /* Description - When set, IEE1588 (PTP) HW timestamping capability is reported to the device driver. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t cq_timestamp;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_option_rom_capability
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - flexboot supports configuration of PXE boot IP version defined in boot settings ext parameter
+         */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t ip_ver;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct tools_open_package_descriptor
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t num_of_devices;
+        /* Description -  */
+        /* 0x0.16 - 0x0.31 */
+        u_int16_t num_of_components;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t cb_offset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.31 */
+        u_int32_t cb_archive_size;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t cb_size_h;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t cb_size_l;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description -  */
+        /* 0x14.24 - 0x14.31 */
+        u_int8_t cb_compression;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description -  */
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t user_data_offset;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 20 */
+    struct tools_open_pci_capabilities
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 1 when max_pf_uar_bar_size field is configurable and the log_max_pf_uar_bar_size field is valid
+         */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t pf_bar_size_supported;
+        /* Description - 1 when max_vf_uar_bar_size field is configurable and the log_max_vf_uar_bar_size field is valid
+         */
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t vf_bar_size_supported;
+        /* Description - 1 when num_pf_msix field is configurable and the max_num_pf_msix field is valid */
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t num_pf_msix_supported;
+        /* Description - 1 when the num_vf_msix field is configurable and max_num_pfs is valid */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t num_vf_msix_supported;
+        /* Description - 1 when the num_pfs field is configurable and max_num_pfs is valid */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t num_pfs_supported;
+        /* Description - 1 when the max_total_bar field is valid */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t max_total_bar_valid;
+        /* Description - 1 when the total_msix field is valid */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t max_total_msix_valid;
+        /* Description - 1 when max_vfs_per_pf fields is valid. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t max_vfs_per_pf_valid;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The maximum number of VFs that can be set in the total_vfs settings (per PF) */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t max_vfs_per_pf;
+        /* Description - Maximum number of PFs per port */
+        /* 0x4.16 - 0x4.19 */
+        u_int8_t max_num_pfs;
+        /* Description - 1 - function per port settings is configurable */
+        /* 0x4.29 - 0x4.29 */
+        u_int8_t fpp_support;
+        /* Description - 1 - the device supports controlling the VF QoS setting */
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t vf_qos_control_support;
+        /* Description - 1 when SRIOV is configurable */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t sriov_support;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Log 2 of the maximum size of a PF's UAR BAR */
+        /* 0x8.0 - 0x8.5 */
+        u_int8_t log_max_pf_uar_bar_size1;
+        /* Description - Log 2 of the maximum size of a VF's UAR BAR */
+        /* 0x8.6 - 0x8.11 */
+        u_int8_t log_max_vf_uar_bar_size;
+        /* Description - Maximum number of MSI-X vectors and EQs per PF */
+        /* 0x8.12 - 0x8.21 */
+        u_int16_t max_num_pf_msix;
+        /* Description - Maximum number of MSI-X vectors and EQs per VF */
+        /* 0x8.22 - 0x8.31 */
+        u_int16_t max_num_vf_msix;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Maximum number of MSI-X for the aggregat of all PF and VFs */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t max_total_msix;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Maximum total of the MMIO space for all PFs and VFs combined, in megabytes. */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t max_total_bar;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_pci_configuration
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 1 when log_pf_uar_bar_size field is valid */
+        /* 0x0.24 - 0x0.24 */
+        u_int8_t pf_bar_size_valid;
+        /* Description - 1 when log_vf_uar_bar_size field is valid */
+        /* 0x0.25 - 0x0.25 */
+        u_int8_t vf_bar_size_valid;
+        /* Description - 1 when num_pfs_msix field is valid */
+        /* 0x0.26 - 0x0.26 */
+        u_int8_t num_pfs_msix_valid;
+        /* Description - 1 when num_vfs_msix field is valid */
+        /* 0x0.27 - 0x0.27 */
+        u_int8_t num_vfs_msix_valid;
+        /* Description - 1 when num_pfs field is valid */
+        /* 0x0.28 - 0x0.28 */
+        u_int8_t num_pfs_valid;
+        /* Description - 1 when fpp_en field is valid */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t fpp_valid;
+        /* Description - 1 when the full_vf_qos field below is valid */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t full_vf_qos_valid;
+        /* Description - 1 when the sriov_en and total_vfs field below are valid. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t sriov_valid;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - The total number of VFs that can be supported */
+        /* 0x4.0 - 0x4.15 */
+        u_int16_t total_vfs;
+        /* Description - Number of PFs per port */
+        /* 0x4.16 - 0x4.19 */
+        u_int8_t num_pfs;
+        /* Description - 0 - single PF for both ports
 1 - function per-port */
-	/* 0x4.29 - 0x4.29 */
-	u_int8_t fpp_en;
-	/* Description - 0 - Use reduced QoS support level on VFs
+        /* 0x4.29 - 0x4.29 */
+        u_int8_t fpp_en;
+        /* Description - 0 - Use reduced QoS support level on VFs
 1 - Support full QoS on VFs */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t full_vf_qos;
-	/* Description - 1 when SRIOV is enabled: SRIOV capability will appear in the PCI configuration header */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t sriov_en;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Log 2 of the size of a PF's UAR BAR */
-	/* 0x8.0 - 0x8.5 */
-	u_int8_t log_pf_uar_bar_size;
-	/* Description - Log 2 of the size of a VF's UAR BAR */
-	/* 0x8.6 - 0x8.11 */
-	u_int8_t log_vf_uar_bar_size;
-	/* Description - Number of MSI-X vectors and EQs per PF */
-	/* 0x8.12 - 0x8.21 */
-	u_int16_t num_pf_msix;
-	/* Description - Number of MSI-X vectors and EQs per VF */
-	/* 0x8.22 - 0x8.31 */
-	u_int16_t num_vf_msix;
-};
-
-/* Description -   */
-/* Size in bytes - 264 */
-union tools_open_phy_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_pmdic pmdic;
-	/* Description -  */
-	/* 0x0.0 - 0x104.31 */
-	struct tools_open_pmdio pmdio;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_port_boot_state {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The number of the GPIO that is connected to the AUX power setting circuitry */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t aux_power_indication_gpio;
-	/* Description - 0  not present
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t full_vf_qos;
+        /* Description - 1 when SRIOV is enabled: SRIOV capability will appear in the PCI configuration header */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t sriov_en;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Log 2 of the size of a PF's UAR BAR */
+        /* 0x8.0 - 0x8.5 */
+        u_int8_t log_pf_uar_bar_size;
+        /* Description - Log 2 of the size of a VF's UAR BAR */
+        /* 0x8.6 - 0x8.11 */
+        u_int8_t log_vf_uar_bar_size;
+        /* Description - Number of MSI-X vectors and EQs per PF */
+        /* 0x8.12 - 0x8.21 */
+        u_int16_t num_pf_msix;
+        /* Description - Number of MSI-X vectors and EQs per VF */
+        /* 0x8.22 - 0x8.31 */
+        u_int16_t num_vf_msix;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 264 */
+    union tools_open_phy_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_pmdic pmdic;
+        /* Description -  */
+        /* 0x0.0 - 0x104.31 */
+        struct tools_open_pmdio pmdio;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_port_boot_state
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The number of the GPIO that is connected to the AUX power setting circuitry */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t aux_power_indication_gpio;
+        /* Description - 0  not present
  1 present
  if the NIC has a circuitry that can indicate when the device is working on AUX power. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t aux_power_indication_gpio_en;
-	/* Description - 0  disabled
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t aux_power_indication_gpio_en;
+        /* Description - 0  disabled
  1 enabled
- When enabled, the device will response to standby indication from PCI or GPIO (if configured) and reduce power consumption while keeping the SMBUS on. To meet the power requirement, the NIC will disable the network ports and cage power on standby mode (indicate with PCIe L2/L3 message sequence of with the GPIO */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t standby_on_aux;
-	/* Description - 0 Normal (admin-on)
+ When enabled, the device will response to standby indication from PCI or GPIO (if configured) and reduce power
+ consumption while keeping the SMBUS on. To meet the power requirement, the NIC will disable the network ports and cage
+ power on standby mode (indicate with PCIe L2/L3 message sequence of with the GPIO */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t standby_on_aux;
+        /* Description - 0 Normal (admin-on)
  1 low power
- When set to low-power the device will boot with minimal power until the GPIO detects that the PCIe power rails are active. The low power mode is effective ONLY when there is a circuitry to detect AUX power condition (with GPIO indication) */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t power_up_on_aux;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_preboot_boot_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - VLAN ID for network boot. */
-	/* 0x0.0 - 0x0.11 */
-	u_int16_t boot_vlan;
-	/* Description - 0  None disable legacy boot.
+ When set to low-power the device will boot with minimal power until the GPIO detects that the PCIe power rails are
+ active. The low power mode is effective ONLY when there is a circuitry to detect AUX power condition (with GPIO
+ indication) */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t power_up_on_aux;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_preboot_boot_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - VLAN ID for network boot. */
+        /* 0x0.0 - 0x0.11 */
+        u_int16_t boot_vlan;
+        /* Description - 0  None disable legacy boot.
 1  PXE (DHCP/TFTP boot).
 2  iSCSI
 
 3  PXE + iSCSI
 4-255  Reserved
  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t legacy_boot_protocol;
-	/* Description - Number of retries to attempt in case of boot failure.
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t legacy_boot_protocol;
+        /* Description - Number of retries to attempt in case of boot failure.
 7 indicate indefinite retries.
  */
-	/* 0x0.24 - 0x0.26 */
-	u_int8_t boot_retry_count;
-	/* Description - 1 Enable VLAN mode for network boot */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t boot_vlan_en;
-	/* Description - 0 disable boot option ROM: disables installation of the UNDI/16 driver. The option ROM is still required to expose CLP, UEFI and so on.
-1 enable boot option ROM
+        /* 0x0.24 - 0x0.26 */
+        u_int8_t boot_retry_count;
+        /* Description - 1 Enable VLAN mode for network boot */
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t boot_vlan_en;
+        /* Description - 0 disable boot option ROM: disables installation of the UNDI/16 driver. The option ROM is still
+required to expose CLP, UEFI and so on. 1 enable boot option ROM
  */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t boot_option_rom_en;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_preboot_flow_ctrl {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Per priority bit mask. For each priority:
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t boot_option_rom_en;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_preboot_flow_ctrl
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Per priority bit mask. For each priority:
 0 �� ignore incoming PFC frames regarding this priority.
 1 �� respect incoming PFC frames on this priority.
  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t pfcrx;
-	/* Description - Per priority bit mask. For each priority:
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t pfcrx;
+        /* Description - Per priority bit mask. For each priority:
 
 0 �� no PFC pause frames generation for this priority.
 1 �� generate PFC pause frames for this priority.
 PFC and global pauses are mutually exclusive.
  */
-	/* 0x0.8 - 0x0.15 */
-	u_int8_t pfctx;
-	/* Description - For future DCBX support. */
-	/* 0x0.29 - 0x0.29 */
-	u_int8_t pfc_willing;
-	/* Description - 0 �� ignore received pause frames
+        /* 0x0.8 - 0x0.15 */
+        u_int8_t pfctx;
+        /* Description - For future DCBX support. */
+        /* 0x0.29 - 0x0.29 */
+        u_int8_t pfc_willing;
+        /* Description - 0 �� ignore received pause frames
 1 �� respect received pause frames
  */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t pprx;
-	/* Description - 0 �� no pause frame generation.
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t pprx;
+        /* Description - 0 �� no pause frame generation.
 1 �� generate pause frames.
 PFC and global pauses are mutually exclusive.
  */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t pptx;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_qos {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t num_of_vl;
-	/* Description -  */
-	/* 0x0.4 - 0x0.7 */
-	u_int8_t num_of_tc;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_qos_cap {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t max_num_of_vl;
-	/* Description -  */
-	/* 0x0.4 - 0x0.7 */
-	u_int8_t max_num_of_tc;
-};
-
-/* Description -   */
-/* Size in bytes - 20 */
-struct tools_open_query_def_params_global {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - When set, indicating mapping of internal clock to user space can be configured by CX3_GLOBAL_CONF.clock_map_to_user */
-	/* 0x0.14 - 0x0.14 */
-	u_int8_t nv_config_clock_map_to_user;
-	/* Description - When set, PHY parameters mode can be configured by GLOBAL_CONF.phy_param_mode */
-	/* 0x0.15 - 0x0.15 */
-	u_int8_t nv_config_phy_param_mode;
-	/* Description - When set, CX3_GLOBAL_CONF.steer_force_vlan bit is supported */
-	/* 0x0.16 - 0x0.16 */
-	u_int8_t nv_steer_force_vlan_supported;
-	/* Description - When set, CX3_GLOBAL_CONF.cq_timestamp bit is supported */
-	/* 0x0.17 - 0x0.17 */
-	u_int8_t nv_cq_timestamp_supported;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t fw_default_config_payload_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - default number of virtual functions */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t num_vfs;
-	/* Description - default uar bar size (log2 format) */
-	/* 0x4.8 - 0x4.11 */
-	u_int8_t uar_bar_size;
-	/* Description - maximum value allowed for the uar bar size (log2 base) */
-	/* 0x4.12 - 0x4.15 */
-	u_int8_t max_uar_bar_size;
-	/* Description -  */
-	/* 0x4.21 - 0x4.21 */
-	u_int8_t boot_ip_ver;
-	/* Description - default value of phy_param_mode in GLOBAL_CONF */
-	/* 0x4.22 - 0x4.23 */
-	u_int8_t default_phy_param_mode;
-	/* Description - default value for clock_map_to_user in CX3_GLOBAL_CONF */
-	/* 0x4.27 - 0x4.27 */
-	u_int8_t default_clock_map_to_user;
-	/* Description - The value reported by QUERY_DEV_CAP.steer_force_vlan when a CX3_GLOBAL_CONF TLV is not present */
-	/* 0x4.28 - 0x4.28 */
-	u_int8_t default_steer_force_vlan;
-	/* Description - The value reported by QUERY_DEV_CAP.cq_timestamp when a CX3_GLOBAL_CONF TLV is not present */
-	/* 0x4.29 - 0x4.29 */
-	u_int8_t default_cq_timestamp;
-	/* Description - default value of sriov (enabled or disabled) */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t sriov_en;
-};
-
-/* Description -   */
-/* Size in bytes - 28 */
-struct tools_open_query_def_params_per_port {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.17 - 0x0.17 */
-	u_int8_t nv_config_vpi_force_mode;
-	/* Description - Firmware supports NV config settings 0x12 on the given port. */
-	/* 0x0.18 - 0x0.18 */
-	u_int8_t nv_config_vpi;
-	/* Description - Firmware supports NV config settings 0x10 on the given port. */
-	/* 0x0.19 - 0x0.19 */
-	u_int8_t nv_config_wol;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t fw_default_config_payload_version;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.11 */
-	u_int16_t default_boot_vlan;
-	/* Description -  */
-	/* 0x4.16 - 0x4.19 */
-	u_int8_t default_boot_protocol;
-	/* Description -  */
-	/* 0x4.20 - 0x4.23 */
-	u_int8_t default_boot_retry_cnt;
-	/* Description -  */
-	/* 0x4.25 - 0x4.26 */
-	u_int8_t default_network_link_type;
-	/* Description -  */
-	/* 0x4.27 - 0x4.27 */
-	u_int8_t default_en_wol_magic;
-	/* Description -  */
-	/* 0x4.28 - 0x4.28 */
-	u_int8_t default_boot_vlan_en;
-	/* Description -  */
-	/* 0x4.29 - 0x4.29 */
-	u_int8_t default_boot_option_rom_en;
-	/* Description -  */
-	/* 0x4.30 - 0x4.30 */
-	u_int8_t default_pprx;
-	/* Description -  */
-	/* 0x4.31 - 0x4.31 */
-	u_int8_t default_pptx;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t default_boot_pkey;
-	/* Description -  */
-	/* 0x8.24 - 0x8.25 */
-	u_int8_t boot_ip_ver;
-	/* Description - Legacy option ROM supports NV config setting 0x2023. */
-	/* 0x8.27 - 0x8.27 */
-	u_int8_t nv_config_infiniband_dhcp_settings;
-	/* Description - Legacy option ROM supports NV config setting 0x2022. */
-	/* 0x8.28 - 0x8.28 */
-	u_int8_t nv_config_infiniband_boot_settings;
-	/* Description -  */
-	/* 0x8.29 - 0x8.29 */
-	u_int8_t nv_config_dhcp_iscsi_parameters;
-	/* Description -  */
-	/* 0x8.30 - 0x8.30 */
-	u_int8_t nv_config_iscsi_parameters;
-	/* Description -  */
-	/* 0x8.31 - 0x8.31 */
-	u_int8_t nv_config_boot_parameters;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description -  */
-	/* 0xc.9 - 0xc.9 */
-	u_int8_t default_vpi_force_mode;
-	/* Description -  */
-	/* 0xc.10 - 0xc.11 */
-	u_int8_t default_vpi_xfi_mode;
-	/* Description -  */
-	/* 0xc.12 - 0xc.13 */
-	u_int8_t default_vpi_phy_type;
-	/* Description -  */
-	/* 0xc.22 - 0xc.23 */
-	u_int8_t iscsi_boot_to_target;
-	/* Description -  */
-	/* 0xc.26 - 0xc.26 */
-	u_int8_t iscsi_vlan_en;
-	/* Description -  */
-	/* 0xc.27 - 0xc.27 */
-	u_int8_t iscsi_tcp_timestamps_en;
-	/* Description -  */
-	/* 0xc.28 - 0xc.28 */
-	u_int8_t iscsi_chap_mutual_auth_en;
-	/* Description -  */
-	/* 0xc.29 - 0xc.29 */
-	u_int8_t iscsi_chap_auth_en;
-	/* Description -  */
-	/* 0xc.30 - 0xc.30 */
-	u_int8_t iscsi_dhcp_params_en;
-	/* Description -  */
-	/* 0xc.31 - 0xc.31 */
-	u_int8_t iscsi_ipv4_dhcp_en;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description -  */
-	/* 0x10.0 - 0x10.7 */
-	u_int8_t iscsi_lun_busy_retry_cnt;
-	/* Description -  */
-	/* 0x10.8 - 0x10.15 */
-	u_int8_t iscsi_link_up_delay_time;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_roce_cc {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Per priority enable disable (0..7)
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t pptx;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_qos
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t num_of_vl;
+        /* Description -  */
+        /* 0x0.4 - 0x0.7 */
+        u_int8_t num_of_tc;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_qos_cap
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t max_num_of_vl;
+        /* Description -  */
+        /* 0x0.4 - 0x0.7 */
+        u_int8_t max_num_of_tc;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 20 */
+    struct tools_open_query_def_params_global
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - When set, indicating mapping of internal clock to user space can be configured by
+         * CX3_GLOBAL_CONF.clock_map_to_user */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t nv_config_clock_map_to_user;
+        /* Description - When set, PHY parameters mode can be configured by GLOBAL_CONF.phy_param_mode */
+        /* 0x0.15 - 0x0.15 */
+        u_int8_t nv_config_phy_param_mode;
+        /* Description - When set, CX3_GLOBAL_CONF.steer_force_vlan bit is supported */
+        /* 0x0.16 - 0x0.16 */
+        u_int8_t nv_steer_force_vlan_supported;
+        /* Description - When set, CX3_GLOBAL_CONF.cq_timestamp bit is supported */
+        /* 0x0.17 - 0x0.17 */
+        u_int8_t nv_cq_timestamp_supported;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t fw_default_config_payload_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - default number of virtual functions */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t num_vfs;
+        /* Description - default uar bar size (log2 format) */
+        /* 0x4.8 - 0x4.11 */
+        u_int8_t uar_bar_size;
+        /* Description - maximum value allowed for the uar bar size (log2 base) */
+        /* 0x4.12 - 0x4.15 */
+        u_int8_t max_uar_bar_size;
+        /* Description -  */
+        /* 0x4.21 - 0x4.21 */
+        u_int8_t boot_ip_ver;
+        /* Description - default value of phy_param_mode in GLOBAL_CONF */
+        /* 0x4.22 - 0x4.23 */
+        u_int8_t default_phy_param_mode;
+        /* Description - default value for clock_map_to_user in CX3_GLOBAL_CONF */
+        /* 0x4.27 - 0x4.27 */
+        u_int8_t default_clock_map_to_user;
+        /* Description - The value reported by QUERY_DEV_CAP.steer_force_vlan when a CX3_GLOBAL_CONF TLV is not present
+         */
+        /* 0x4.28 - 0x4.28 */
+        u_int8_t default_steer_force_vlan;
+        /* Description - The value reported by QUERY_DEV_CAP.cq_timestamp when a CX3_GLOBAL_CONF TLV is not present */
+        /* 0x4.29 - 0x4.29 */
+        u_int8_t default_cq_timestamp;
+        /* Description - default value of sriov (enabled or disabled) */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t sriov_en;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 28 */
+    struct tools_open_query_def_params_per_port
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.17 - 0x0.17 */
+        u_int8_t nv_config_vpi_force_mode;
+        /* Description - Firmware supports NV config settings 0x12 on the given port. */
+        /* 0x0.18 - 0x0.18 */
+        u_int8_t nv_config_vpi;
+        /* Description - Firmware supports NV config settings 0x10 on the given port. */
+        /* 0x0.19 - 0x0.19 */
+        u_int8_t nv_config_wol;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t fw_default_config_payload_version;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.11 */
+        u_int16_t default_boot_vlan;
+        /* Description -  */
+        /* 0x4.16 - 0x4.19 */
+        u_int8_t default_boot_protocol;
+        /* Description -  */
+        /* 0x4.20 - 0x4.23 */
+        u_int8_t default_boot_retry_cnt;
+        /* Description -  */
+        /* 0x4.25 - 0x4.26 */
+        u_int8_t default_network_link_type;
+        /* Description -  */
+        /* 0x4.27 - 0x4.27 */
+        u_int8_t default_en_wol_magic;
+        /* Description -  */
+        /* 0x4.28 - 0x4.28 */
+        u_int8_t default_boot_vlan_en;
+        /* Description -  */
+        /* 0x4.29 - 0x4.29 */
+        u_int8_t default_boot_option_rom_en;
+        /* Description -  */
+        /* 0x4.30 - 0x4.30 */
+        u_int8_t default_pprx;
+        /* Description -  */
+        /* 0x4.31 - 0x4.31 */
+        u_int8_t default_pptx;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t default_boot_pkey;
+        /* Description -  */
+        /* 0x8.24 - 0x8.25 */
+        u_int8_t boot_ip_ver;
+        /* Description - Legacy option ROM supports NV config setting 0x2023. */
+        /* 0x8.27 - 0x8.27 */
+        u_int8_t nv_config_infiniband_dhcp_settings;
+        /* Description - Legacy option ROM supports NV config setting 0x2022. */
+        /* 0x8.28 - 0x8.28 */
+        u_int8_t nv_config_infiniband_boot_settings;
+        /* Description -  */
+        /* 0x8.29 - 0x8.29 */
+        u_int8_t nv_config_dhcp_iscsi_parameters;
+        /* Description -  */
+        /* 0x8.30 - 0x8.30 */
+        u_int8_t nv_config_iscsi_parameters;
+        /* Description -  */
+        /* 0x8.31 - 0x8.31 */
+        u_int8_t nv_config_boot_parameters;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description -  */
+        /* 0xc.9 - 0xc.9 */
+        u_int8_t default_vpi_force_mode;
+        /* Description -  */
+        /* 0xc.10 - 0xc.11 */
+        u_int8_t default_vpi_xfi_mode;
+        /* Description -  */
+        /* 0xc.12 - 0xc.13 */
+        u_int8_t default_vpi_phy_type;
+        /* Description -  */
+        /* 0xc.22 - 0xc.23 */
+        u_int8_t iscsi_boot_to_target;
+        /* Description -  */
+        /* 0xc.26 - 0xc.26 */
+        u_int8_t iscsi_vlan_en;
+        /* Description -  */
+        /* 0xc.27 - 0xc.27 */
+        u_int8_t iscsi_tcp_timestamps_en;
+        /* Description -  */
+        /* 0xc.28 - 0xc.28 */
+        u_int8_t iscsi_chap_mutual_auth_en;
+        /* Description -  */
+        /* 0xc.29 - 0xc.29 */
+        u_int8_t iscsi_chap_auth_en;
+        /* Description -  */
+        /* 0xc.30 - 0xc.30 */
+        u_int8_t iscsi_dhcp_params_en;
+        /* Description -  */
+        /* 0xc.31 - 0xc.31 */
+        u_int8_t iscsi_ipv4_dhcp_en;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description -  */
+        /* 0x10.0 - 0x10.7 */
+        u_int8_t iscsi_lun_busy_retry_cnt;
+        /* Description -  */
+        /* 0x10.8 - 0x10.15 */
+        u_int8_t iscsi_link_up_delay_time;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_roce_cc
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Per priority enable disable (0..7)
 Default: False
  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t roce_cc_enable_priority;
-	/* Description - 0 = ECN
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t roce_cc_enable_priority;
+        /* Description - 0 = ECN
 1 = QCN
  */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t roce_cc_algorithm;
-};
-
-/* Description -   */
-/* Size in bytes - 68 */
-struct tools_open_roce_cc_ecn {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Default: True
-When receiving an CNP, the target rate should be updated if the transmission rate was increased due to the timer, and not only due to the byte counter
- */
-	/* 0x0.30 - 0x0.30 */
-	u_int8_t clamp_tgt_rate_after_time_inc;
-	/* Description - default - False
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t roce_cc_algorithm;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 68 */
+    struct tools_open_roce_cc_ecn
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Default: True
+When receiving an CNP, the target rate should be updated if the transmission rate was increased due to the timer, and
+not only due to the byte counter
  */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t clamp_tgt_rate;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Time between rate increases if no CNPs are received. Given in u-seconds.
+        /* 0x0.30 - 0x0.30 */
+        u_int8_t clamp_tgt_rate_after_time_inc;
+        /* Description - default - False
+         */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t clamp_tgt_rate;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Time between rate increases if no CNPs are received. Given in u-seconds.
 Default: 2
  */
-	/* 0x4.0 - 0x4.16 */
-	u_int32_t rpg_time_reset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Transmitted data between rate increases if no CNPs are received. Given in Bytes.
+        /* 0x4.0 - 0x4.16 */
+        u_int32_t rpg_time_reset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Transmitted data between rate increases if no CNPs are received. Given in Bytes.
   0 == disabled  TBD: update the PRM
 Default: 150
  */
-	/* 0x8.0 - 0x8.14 */
-	u_int16_t rpg_byte_reset;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - The number of times rpByteStage or rpTimeStage can count before the RP rate control state machine advances states.
-Default: 5
+        /* 0x8.0 - 0x8.14 */
+        u_int16_t rpg_byte_reset;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - The number of times rpByteStage or rpTimeStage can count before the RP rate control state
+machine advances states. Default: 5
  */
-	/* 0xc.0 - 0xc.4 */
-	u_int8_t rpg_threshold;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - The maximum rate, in Mbits per second, at which an RP can transmit. Once this limit is reached, the RP rate limited is released and the flow is not rate limited any more.
-Default: 0 (Full port speed) �� TBD update PRM
+        /* 0xc.0 - 0xc.4 */
+        u_int8_t rpg_threshold;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - The maximum rate, in Mbits per second, at which an RP can transmit. Once this limit is reached,
+the RP rate limited is released and the flow is not rate limited any more. Default: 0 (Full port speed) �� TBD update
+PRM
  */
-	/* 0x10.0 - 0x10.30 */
-	u_int32_t rpg_max_rate;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - The rate, in Mbits per second, used to increase rpTargetRate in the RPR_ACTIVE_INCREASE.
+        /* 0x10.0 - 0x10.30 */
+        u_int32_t rpg_max_rate;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - The rate, in Mbits per second, used to increase rpTargetRate in the RPR_ACTIVE_INCREASE.
 Default:  10
  */
-	/* 0x14.0 - 0x14.16 */
-	u_int32_t rpg_ai_rate;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - The rate, in Mbits per second, used to increase rpTargetRate in the RPR_HYPER_INCREASE state
+        /* 0x14.0 - 0x14.16 */
+        u_int32_t rpg_ai_rate;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - The rate, in Mbits per second, used to increase rpTargetRate in the RPR_HYPER_INCREASE state
 Default: 50
  */
-	/* 0x18.0 - 0x18.16 */
-	u_int32_t rpg_hai_rate;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - -  If a CNP is received, the flow rate is reduced at the beginning of the next rate_reduce_monitor_period interval to (1-Alpha/Gd)*CurrentRate. rpg_gd is given as log2(Gd), where Gd may only be powers of 2.
-Default: 7 
+        /* 0x18.0 - 0x18.16 */
+        u_int32_t rpg_hai_rate;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - -  If a CNP is received, the flow rate is reduced at the beginning of the next
+rate_reduce_monitor_period interval to (1-Alpha/Gd)*CurrentRate. rpg_gd is given as log2(Gd), where Gd may only be
+powers of 2. Default: 7
  */
-	/* 0x1c.0 - 0x1c.3 */
-	u_int8_t rpg_gd;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - The minimum factor by which the current transmit rate can be changed when processing a CNP. Value is given as a percentage (1-100).
-Default: 50
+        /* 0x1c.0 - 0x1c.3 */
+        u_int8_t rpg_gd;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - The minimum factor by which the current transmit rate can be changed when processing a CNP.
+Value is given as a percentage (1-100). Default: 50
  */
-	/* 0x20.0 - 0x20.7 */
-	u_int8_t rpg_min_dec_fac;
-/*---------------- DWORD[9] (Offset 0x24) ----------------*/
-	/* Description - The minimum value, in Mb per second, for rate to limit.
+        /* 0x20.0 - 0x20.7 */
+        u_int8_t rpg_min_dec_fac;
+        /*---------------- DWORD[9] (Offset 0x24) ----------------*/
+        /* Description - The minimum value, in Mb per second, for rate to limit.
 Default: 2000
  */
-	/* 0x24.0 - 0x24.16 */
-	u_int32_t rpg_min_rate;
-/*---------------- DWORD[10] (Offset 0x28) ----------------*/
-	/* Description - The rate that is set for the flow when a rate limiter is allocated to it upon first CNP received, in Mbps
-Default: 0 Port speed (TBD update PRM)
+        /* 0x24.0 - 0x24.16 */
+        u_int32_t rpg_min_rate;
+        /*---------------- DWORD[10] (Offset 0x28) ----------------*/
+        /* Description - The rate that is set for the flow when a rate limiter is allocated to it upon first CNP
+received, in Mbps Default: 0 Port speed (TBD update PRM)
  */
-	/* 0x28.0 - 0x28.16 */
-	u_int32_t rate_to_set_on_first_cnp;
-/*---------------- DWORD[11] (Offset 0x2c) ----------------*/
-	/* Description - Used to update the congestion estimator (alpha) once every dce_tcp_rtt microseconds, according to the equation:
-Alpha = (cnp_received * dceTcpG) + (1 - dceTcpG) * alpha .
-dceTcpG is divided by 2^10.
-cnp_received is set to one if a CNP was received for this flow during period since the previous update and the current update
-Default: 64
+        /* 0x28.0 - 0x28.16 */
+        u_int32_t rate_to_set_on_first_cnp;
+        /*---------------- DWORD[11] (Offset 0x2c) ----------------*/
+        /* Description - Used to update the congestion estimator (alpha) once every dce_tcp_rtt microseconds, according
+to the equation: Alpha = (cnp_received * dceTcpG) + (1 - dceTcpG) * alpha . dceTcpG is divided by 2^10. cnp_received is
+set to one if a CNP was received for this flow during period since the previous update and the current update Default:
+64
  */
-	/* 0x2c.0 - 0x2c.9 */
-	u_int16_t dce_tcp_g;
-/*---------------- DWORD[12] (Offset 0x30) ----------------*/
-	/* Description - The time between updates of the alpha value, in microseconds.
+        /* 0x2c.0 - 0x2c.9 */
+        u_int16_t dce_tcp_g;
+        /*---------------- DWORD[12] (Offset 0x30) ----------------*/
+        /* Description - The time between updates of the alpha value, in microseconds.
 Default: 2
  */
-	/* 0x30.0 - 0x30.16 */
-	u_int32_t dce_tcp_rtt;
-/*---------------- DWORD[13] (Offset 0x34) ----------------*/
-	/* Description - The minimum time between 2 consecutive rate reductions for a single flow. Rate reduction will occur only if a CNP is received during the relevant time interval.
-Default: 2
+        /* 0x30.0 - 0x30.16 */
+        u_int32_t dce_tcp_rtt;
+        /*---------------- DWORD[13] (Offset 0x34) ----------------*/
+        /* Description - The minimum time between 2 consecutive rate reductions for a single flow. Rate reduction will
+occur only if a CNP is received during the relevant time interval. Default: 2
  */
-	/* 0x34.0 - 0x34.16 */
-	u_int32_t rate_reduce_monitor_period;
-/*---------------- DWORD[14] (Offset 0x38) ----------------*/
-	/* Description - The initial value of alpha to use when receiving the first CNP for a flow. Expressed in a fixed point fraction of 2^10.
-Default: TBD
+        /* 0x34.0 - 0x34.16 */
+        u_int32_t rate_reduce_monitor_period;
+        /*---------------- DWORD[14] (Offset 0x38) ----------------*/
+        /* Description - The initial value of alpha to use when receiving the first CNP for a flow. Expressed in a fixed
+point fraction of 2^10. Default: TBD
  */
-	/* 0x38.0 - 0x38.9 */
-	u_int16_t initial_alpha_value;
-/*---------------- DWORD[15] (Offset 0x3c) ----------------*/
-	/* Description - Minimum time between sending cnps from the port, in microseconds.
-Default: 0 
+        /* 0x38.0 - 0x38.9 */
+        u_int16_t initial_alpha_value;
+        /*---------------- DWORD[15] (Offset 0x3c) ----------------*/
+        /* Description - Minimum time between sending cnps from the port, in microseconds.
+Default: 0
  */
-	/* 0x3c.0 - 0x3c.16 */
-	u_int32_t min_time_between_cnps;
-/*---------------- DWORD[16] (Offset 0x40) ----------------*/
-	/* Description - The 802.1p priority value of the generated CNP for this port
+        /* 0x3c.0 - 0x3c.16 */
+        u_int32_t min_time_between_cnps;
+        /*---------------- DWORD[16] (Offset 0x40) ----------------*/
+        /* Description - The 802.1p priority value of the generated CNP for this port
 Default: 7
  */
-	/* 0x40.0 - 0x40.2 */
-	u_int8_t cnp_802p_prio;
-	/* Description - The DiffServ Code Point of the generated CNP for this port
+        /* 0x40.0 - 0x40.2 */
+        u_int8_t cnp_802p_prio;
+        /* Description - The DiffServ Code Point of the generated CNP for this port
 Default: 0
  */
-	/* 0x40.8 - 0x40.13 */
-	u_int8_t cnp_dscp;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_roce_v_1_5_next_protocol {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - the next protocol value set in the IPv4/IPv6
+        /* 0x40.8 - 0x40.13 */
+        u_int8_t cnp_dscp;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_roce_v_1_5_next_protocol
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - the next protocol value set in the IPv4/IPv6
 packets for RoCE v1.5
 default = 0xfe
  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t roce_over_ip_next_protocol;
-};
-
-/* Description -   */
-/* Size in bytes - 64 */
-union tools_open_smp_data {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	union tools_open_smp_vsp_general_info general_info;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct tools_open_ib_port_info port_info;
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	struct tools_open_node_info node_info;
-	/* Description -  */
-	/* 0x0.0 - 0x38.31 */
-	struct tools_open_extended_ib_port_info extended_port_info;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_sriov {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - The total number of VFs that can be supported. */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t total_vfs;
-	/* Description - 1 when SRIOV is enabled: SRIOV capability will appear on the PCI configuration header. */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t sriov_en;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_tpt_capabilities {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - 0 - value is R/O
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t roce_over_ip_next_protocol;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 64 */
+    union tools_open_smp_data
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        union tools_open_smp_vsp_general_info general_info;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct tools_open_ib_port_info port_info;
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        struct tools_open_node_info node_info;
+        /* Description -  */
+        /* 0x0.0 - 0x38.31 */
+        struct tools_open_extended_ib_port_info extended_port_info;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_sriov
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - The total number of VFs that can be supported. */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t total_vfs;
+        /* Description - 1 when SRIOV is enabled: SRIOV capability will appear on the PCI configuration header. */
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t sriov_en;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_tpt_capabilities
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - 0 - value is R/O
 1 - value is R/W */
-	/* 0x0.31 - 0x0.31 */
-	u_int8_t log_max_payload_size_supported;
-};
+        /* 0x0.31 - 0x0.31 */
+        u_int8_t log_max_payload_size_supported;
+    };
 
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_tpt_configuration {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Log2 of the maximum supported PCI burns size for TPT accesses to host memory
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_tpt_configuration
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Log2 of the maximum supported PCI burns size for TPT accesses to host memory
 
 0 - Automatically choose the burst length according to PCIe packet lenght
 12 - Burst length of 4KB
 
 Others - Reserved */
-	/* 0x0.0 - 0x0.3 */
-	u_int8_t log_max_payload_size;
-};
-
-/* Description -   */
-/* Size in bytes - 12 */
-struct tools_open_version {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.15 */
-	u_int16_t version_sub_minor;
-	/* Description -  */
-	/* 0x0.16 - 0x0.23 */
-	u_int8_t version_minor;
-	/* Description -  */
-	/* 0x0.24 - 0x0.31 */
-	u_int8_t version_major;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.7 */
-	u_int8_t day;
-	/* Description -  */
-	/* 0x4.8 - 0x4.15 */
-	u_int8_t month;
-	/* Description -  */
-	/* 0x4.16 - 0x4.31 */
-	u_int16_t year;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description -  */
-	/* 0x8.8 - 0x8.15 */
-	u_int8_t seconds;
-	/* Description -  */
-	/* 0x8.16 - 0x8.23 */
-	u_int8_t minutes;
-	/* Description -  */
-	/* 0x8.24 - 0x8.31 */
-	u_int8_t hour;
-};
-
-/* Description -   */
-/* Size in bytes - 4 */
-struct tools_open_vpi_settings {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Network link type:
+        /* 0x0.0 - 0x0.3 */
+        u_int8_t log_max_payload_size;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 12 */
+    struct tools_open_version
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.15 */
+        u_int16_t version_sub_minor;
+        /* Description -  */
+        /* 0x0.16 - 0x0.23 */
+        u_int8_t version_minor;
+        /* Description -  */
+        /* 0x0.24 - 0x0.31 */
+        u_int8_t version_major;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.7 */
+        u_int8_t day;
+        /* Description -  */
+        /* 0x4.8 - 0x4.15 */
+        u_int8_t month;
+        /* Description -  */
+        /* 0x4.16 - 0x4.31 */
+        u_int16_t year;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description -  */
+        /* 0x8.8 - 0x8.15 */
+        u_int8_t seconds;
+        /* Description -  */
+        /* 0x8.16 - 0x8.23 */
+        u_int8_t minutes;
+        /* Description -  */
+        /* 0x8.24 - 0x8.31 */
+        u_int8_t hour;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 4 */
+    struct tools_open_vpi_settings
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Network link type:
 0 - Reserved
 1 - InfiniBand
 2 - Ethernet
  */
-	/* 0x0.0 - 0x0.1 */
-	u_int8_t network_link_type;
-	/* Description - 0 - Reserved
+        /* 0x0.0 - 0x0.1 */
+        u_int8_t network_link_type;
+        /* Description - 0 - Reserved
 1 - Infiniband
 2 - Ethernet
 Valid for CX4 and above only
 when VPI network link type is selcted this field determines
 the default link type when no cable is connected */
-	/* 0x0.2 - 0x0.3 */
-	u_int8_t default_link_type;
-	/* Description -  */
-	/* 0x0.4 - 0x0.5 */
-	u_int8_t phy_type;
-	/* Description -  */
-	/* 0x0.6 - 0x0.7 */
-	u_int8_t xfi_mode;
-	/* Description -  */
-	/* 0x0.8 - 0x0.8 */
-	u_int8_t force_mode;
-};
-
-/* Description -   */
-/* Size in bytes - 8 */
-struct tools_open_wol {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Enable Wake on secure on password magic packet */
-	/* 0x0.9 - 0x0.9 */
-	u_int8_t en_wol_psswd_magic;
-	/* Description - Enable Wake on magic packet */
-	/* 0x0.10 - 0x0.10 */
-	u_int8_t en_wol_magic;
-	/* Description - Enable Wake on ARP */
-	/* 0x0.11 - 0x0.11 */
-	u_int8_t en_wol_arp;
-	/* Description - Enable Wake on broadcast message */
-	/* 0x0.12 - 0x0.12 */
-	u_int8_t en_wol_bc;
-	/* Description - Enable Wake on multicast message */
-	/* 0x0.13 - 0x0.13 */
-	u_int8_t en_wol_mc;
-	/* Description - Enable Wake on unicast message */
-	/* 0x0.14 - 0x0.14 */
-	u_int8_t en_wol_uc;
-	/* Description - Enable Wake on PHY activity */
-	/* 0x0.15 - 0x0.15 */
-	u_int8_t en_wol_phy;
-};
-
-/* Description -   */
-/* Size in bytes - 192 */
-union tools_open_IbMads {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x3c.31 */
-	union tools_open_smp_data smp;
-};
-
-/* Description -   */
-/* Size in bytes - 512 */
-union tools_open_access_registers {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Misc NV Registers, this is temporary untill we integrate with fw db */
-	/* 0x0.0 - 0x168.31 */
-	union tools_open_mnv_cfg MNVReg;
-	/* Description - Register for accessing FW managed external PHY */
-	/* 0x0.0 - 0x104.31 */
-	union tools_open_phy_reg PhyReg;
-};
-
-/* Description -   */
-/* Size in bytes - 256 */
-union tools_open_aux_img_data {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - image aux data section header */
-	/* 0x0.0 - 0xc.31 */
-	struct tools_open_aux_data_hdr aux_data_hdr;
-	/* Description - image tlv entry */
-	/* 0x0.0 - 0xfc.31 */
-	struct tools_open_aux_tlv aux_tlv;
-};
-
-/* Description -   */
-/* Size in bytes - 264 */
-union tools_open_hcr_cmds {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x10.31 */
-	struct tools_open_query_def_params_global query_def_params_global;
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct tools_open_query_def_params_per_port query_def_params_per_port;
-};
-
-/* Description -   */
-/* Size in bytes - 36 */
-struct tools_open_mcdd_descriptor {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Update handle registered when the FSM was activated. */
-	/* 0x0.0 - 0x0.23 */
-	u_int32_t update_handle;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Offset of accessed address relative to component start. */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t offset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Size of the data accessed, given in bytes */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t size;
-	/* Description - Reserved */
-	/* 0x8.16 - 0x8.31 */
-	u_int16_t reserved1;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Reserved */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t reserved2;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t data_page_phys_addr_msb;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x14.0 - 0x14.31 */
-	u_int32_t data_page_phys_addr_lsb;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t mailbox_page_phys_addr_msb;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t mailbox_page_phys_addr_lsb;
-/*---------------- DWORD[8] (Offset 0x20) ----------------*/
-	/* Description - Status of current operation that FW sends to host. */
-	/* 0x20.0 - 0x20.7 */
-	u_int8_t status;
-	/* Description - Last error index, if occured. */
-	/* 0x20.8 - 0x20.15 */
-	u_int8_t error;
-	/* Description - Reserved. */
-	/* 0x20.16 - 0x20.31 */
-	u_int16_t reserved3;
-};
-
-/* Description -   */
-/* Size in bytes - 32 */
-struct tools_open_mcdd_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Update handle registered when the FSM was activated. */
-	/* 0x0.0 - 0x0.23 */
-	u_int32_t update_handle;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description - Offset of accessed address relative to component start. */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t offset;
-/*---------------- DWORD[2] (Offset 0x8) ----------------*/
-	/* Description - Size of the data accessed, given in bytes */
-	/* 0x8.0 - 0x8.15 */
-	u_int16_t size;
-	/* Description - Reserved */
-	/* 0x8.16 - 0x8.31 */
-	u_int16_t reserved1;
-/*---------------- DWORD[3] (Offset 0xc) ----------------*/
-	/* Description - Reserved */
-	/* 0xc.0 - 0xc.31 */
-	u_int32_t reserved2;
-/*---------------- DWORD[4] (Offset 0x10) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x10.0 - 0x10.31 */
-	u_int32_t data_page_phys_addr_msb;
-/*---------------- DWORD[5] (Offset 0x14) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x14.0 - 0x14.31 */
-	u_int32_t data_page_phys_addr_lsb;
-/*---------------- DWORD[6] (Offset 0x18) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x18.0 - 0x18.31 */
-	u_int32_t mailbox_page_phys_addr_msb;
-/*---------------- DWORD[7] (Offset 0x1c) ----------------*/
-	/* Description - Physical address of the FW component data page */
-	/* 0x1c.0 - 0x1c.31 */
-	u_int32_t mailbox_page_phys_addr_lsb;
-};
-
-/* Description -  Mellanox Firmware Archiver 2 */
-/* Size in bytes - 32 */
-union tools_open_mfa2 {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_common_header common_header;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_multi_part multi_part;
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct tools_open_package_descriptor package_descriptor;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct tools_open_component_desciptor component_desciptor;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_version version;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_component_ptr component_ptr;
-};
-
-/* Description -  MIRC register */
-/* Size in bytes - 8 */
-struct tools_open_mirc_reg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Statuses: 0 – success, 1 – busy, etc.  */
-	/* 0x0.0 - 0x0.7 */
-	u_int8_t status_code;
-/*---------------- DWORD[1] (Offset 0x4) ----------------*/
-	/* Description -  */
-	/* 0x4.0 - 0x4.31 */
-	u_int32_t reserved;
-};
-
-/* Description -   */
-/* Size in bytes - 1024 */
-union tools_open_misc_structs {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x3fc.31 */
-	struct tools_open_image_info image_info;
-	/* Description -  */
-	/* 0x0.0 - 0x13c.31 */
-	struct tools_open_mfg_info mfg_info;
-};
-
-/* Description -   */
-/* Size in bytes - 256 */
-union tools_open_nv_cfg {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_wol wol;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct tools_open_infiniband_dc_capabilities infiniband_dc_capabilities;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_infiniband_dc_settings infiniband_dc_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_tpt_capabilities tpt_capabilities;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_tpt_configuration tpt_configuration;
-	/* Description -  */
-	/* 0x0.0 - 0x10.31 */
-	struct tools_open_pci_capabilities pci_capabilities;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_pci_configuration pci_configuration;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_port_boot_state port_boot_state;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_iscsi_settings iscsi_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_infiniband_boot_settings infiniband_boot_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_boot_settings boot_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_preboot_boot_settings preboot_boot_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_preboot_flow_ctrl preboot_flow_ctrl;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_sriov sriov;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_bar_size bar_size;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_vpi_settings vpi_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_roce_v_1_5_next_protocol roce_v_1_5_next_protocol;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_roce_cc roce_cc;
-	/* Description -  */
-	/* 0x0.0 - 0x40.31 */
-	struct tools_open_roce_cc_ecn roce_cc_ecn;
-	/* Description -  */
-	/* 0x0.0 - 0x18.31 */
-	struct tools_open_lldp_nb lldp_nb;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_external_port external_port;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_boot_settings_ext boot_settings_ext;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_option_rom_capability option_rom_capability;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_qos qos;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_qos_cap qos_cap;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_lldp_client_settings lldp_client_settings;
-	/* Description -  */
-	/* 0x0.0 - 0x8.31 */
-	struct tools_open_lldp_nb_cap lldp_nb_cap;
-	/* Description -  */
-	/* 0x0.0 - 0x0.31 */
-	struct tools_open_lldp_nb_dcbx lldp_nb_dcbx;
-	/* Description -  */
-	/* 0x0.0 - 0xc.31 */
-	struct tools_open_nv_base_mac_guid nv_base_mac_guid;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_nv_base_mac_guid_cap nv_base_mac_guid_cap;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct tools_open_nv_cx3_global_conf nv_cx3_global_conf;
-};
-
-/* Description -   */
-/* Size in bytes - 1048576 */
-union tools_open_tools_open {
-/*---------------- DWORD[0] (Offset 0x0) ----------------*/
-	/* Description - Non-Volatile Cfg Tlvs */
-	/* 0x0.0 - 0xfc.31 */
-	union tools_open_nv_cfg NVConfig;
-	/* Description - various registers in specific use by the tools */
-	/* 0x0.0 - 0x1fc.31 */
-	union tools_open_access_registers AceessRegisters;
-	/* Description - Tools HCR commands structs */
-	/* 0x0.0 - 0x104.31 */
-	union tools_open_hcr_cmds HcrCmds;
-	/* Description - aux image data layout */
-	/* 0x0.0 - 0xfc.31 */
-	union tools_open_aux_img_data AuxImgData;
-	/* Description - Misc structs needed for integration on new FW features */
-	/* 0x0.0 - 0x3fc.31 */
-	union tools_open_misc_structs MiscStructs;
-	/* Description - Ib Mads */
-	/* 0x0.0 - 0xbc.31 */
-	union tools_open_IbMads IbMads;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	union tools_open_mfa2 mfa2;
-	/* Description -  */
-	/* 0x0.0 - 0x1c.31 */
-	struct tools_open_mcdd_reg mcdd_reg;
-	/* Description -  */
-	/* 0x0.0 - 0x20.31 */
-	struct tools_open_mcdd_descriptor mcdd_descriptor;
-	/* Description -  */
-	/* 0x0.0 - 0x4.31 */
-	struct tools_open_mirc_reg mirc_reg;
-};
-
-
-/*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
-/* bmc_type */
-void tools_open_bmc_type_pack(const struct tools_open_bmc_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_bmc_type_unpack(struct tools_open_bmc_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_bmc_type_print(const struct tools_open_bmc_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_bmc_type_size(void);
-#define TOOLS_OPEN_BMC_TYPE_SIZE    (0x4)
-void tools_open_bmc_type_dump(const struct tools_open_bmc_type *ptr_struct, FILE *fd);
-/* eswitch_type */
-void tools_open_eswitch_type_pack(const struct tools_open_eswitch_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_eswitch_type_unpack(struct tools_open_eswitch_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_eswitch_type_print(const struct tools_open_eswitch_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_eswitch_type_size(void);
-#define TOOLS_OPEN_ESWITCH_TYPE_SIZE    (0x4)
-void tools_open_eswitch_type_dump(const struct tools_open_eswitch_type *ptr_struct, FILE *fd);
-/* global_type */
-void tools_open_global_type_pack(const struct tools_open_global_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_global_type_unpack(struct tools_open_global_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_global_type_print(const struct tools_open_global_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_global_type_size(void);
-#define TOOLS_OPEN_GLOBAL_TYPE_SIZE    (0x4)
-void tools_open_global_type_dump(const struct tools_open_global_type *ptr_struct, FILE *fd);
-/* host_type */
-void tools_open_host_type_pack(const struct tools_open_host_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_host_type_unpack(struct tools_open_host_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_host_type_print(const struct tools_open_host_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_host_type_size(void);
-#define TOOLS_OPEN_HOST_TYPE_SIZE    (0x4)
-void tools_open_host_type_dump(const struct tools_open_host_type *ptr_struct, FILE *fd);
-/* per_host_type */
-void tools_open_per_host_type_pack(const struct tools_open_per_host_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_per_host_type_unpack(struct tools_open_per_host_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_per_host_type_print(const struct tools_open_per_host_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_per_host_type_size(void);
-#define TOOLS_OPEN_PER_HOST_TYPE_SIZE    (0x4)
-void tools_open_per_host_type_dump(const struct tools_open_per_host_type *ptr_struct, FILE *fd);
-/* per_port_type */
-void tools_open_per_port_type_pack(const struct tools_open_per_port_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_per_port_type_unpack(struct tools_open_per_port_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_per_port_type_print(const struct tools_open_per_port_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_per_port_type_size(void);
-#define TOOLS_OPEN_PER_PORT_TYPE_SIZE    (0x4)
-void tools_open_per_port_type_dump(const struct tools_open_per_port_type *ptr_struct, FILE *fd);
+        /* 0x0.2 - 0x0.3 */
+        u_int8_t default_link_type;
+        /* Description -  */
+        /* 0x0.4 - 0x0.5 */
+        u_int8_t phy_type;
+        /* Description -  */
+        /* 0x0.6 - 0x0.7 */
+        u_int8_t xfi_mode;
+        /* Description -  */
+        /* 0x0.8 - 0x0.8 */
+        u_int8_t force_mode;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 8 */
+    struct tools_open_wol
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Enable Wake on secure on password magic packet */
+        /* 0x0.9 - 0x0.9 */
+        u_int8_t en_wol_psswd_magic;
+        /* Description - Enable Wake on magic packet */
+        /* 0x0.10 - 0x0.10 */
+        u_int8_t en_wol_magic;
+        /* Description - Enable Wake on ARP */
+        /* 0x0.11 - 0x0.11 */
+        u_int8_t en_wol_arp;
+        /* Description - Enable Wake on broadcast message */
+        /* 0x0.12 - 0x0.12 */
+        u_int8_t en_wol_bc;
+        /* Description - Enable Wake on multicast message */
+        /* 0x0.13 - 0x0.13 */
+        u_int8_t en_wol_mc;
+        /* Description - Enable Wake on unicast message */
+        /* 0x0.14 - 0x0.14 */
+        u_int8_t en_wol_uc;
+        /* Description - Enable Wake on PHY activity */
+        /* 0x0.15 - 0x0.15 */
+        u_int8_t en_wol_phy;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 192 */
+    union tools_open_IbMads
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x3c.31 */
+        union tools_open_smp_data smp;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 512 */
+    union tools_open_access_registers
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Misc NV Registers, this is temporary untill we integrate with fw db */
+        /* 0x0.0 - 0x168.31 */
+        union tools_open_mnv_cfg MNVReg;
+        /* Description - Register for accessing FW managed external PHY */
+        /* 0x0.0 - 0x104.31 */
+        union tools_open_phy_reg PhyReg;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 256 */
+    union tools_open_aux_img_data
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - image aux data section header */
+        /* 0x0.0 - 0xc.31 */
+        struct tools_open_aux_data_hdr aux_data_hdr;
+        /* Description - image tlv entry */
+        /* 0x0.0 - 0xfc.31 */
+        struct tools_open_aux_tlv aux_tlv;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 264 */
+    union tools_open_hcr_cmds
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x10.31 */
+        struct tools_open_query_def_params_global query_def_params_global;
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct tools_open_query_def_params_per_port query_def_params_per_port;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 36 */
+    struct tools_open_mcdd_descriptor
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Update handle registered when the FSM was activated. */
+        /* 0x0.0 - 0x0.23 */
+        u_int32_t update_handle;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Offset of accessed address relative to component start. */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t offset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Size of the data accessed, given in bytes */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t size;
+        /* Description - Reserved */
+        /* 0x8.16 - 0x8.31 */
+        u_int16_t reserved1;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Reserved */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t reserved2;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t data_page_phys_addr_msb;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x14.0 - 0x14.31 */
+        u_int32_t data_page_phys_addr_lsb;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t mailbox_page_phys_addr_msb;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t mailbox_page_phys_addr_lsb;
+        /*---------------- DWORD[8] (Offset 0x20) ----------------*/
+        /* Description - Status of current operation that FW sends to host. */
+        /* 0x20.0 - 0x20.7 */
+        u_int8_t status;
+        /* Description - Last error index, if occured. */
+        /* 0x20.8 - 0x20.15 */
+        u_int8_t error;
+        /* Description - Reserved. */
+        /* 0x20.16 - 0x20.31 */
+        u_int16_t reserved3;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 32 */
+    struct tools_open_mcdd_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Update handle registered when the FSM was activated. */
+        /* 0x0.0 - 0x0.23 */
+        u_int32_t update_handle;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description - Offset of accessed address relative to component start. */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t offset;
+        /*---------------- DWORD[2] (Offset 0x8) ----------------*/
+        /* Description - Size of the data accessed, given in bytes */
+        /* 0x8.0 - 0x8.15 */
+        u_int16_t size;
+        /* Description - Reserved */
+        /* 0x8.16 - 0x8.31 */
+        u_int16_t reserved1;
+        /*---------------- DWORD[3] (Offset 0xc) ----------------*/
+        /* Description - Reserved */
+        /* 0xc.0 - 0xc.31 */
+        u_int32_t reserved2;
+        /*---------------- DWORD[4] (Offset 0x10) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x10.0 - 0x10.31 */
+        u_int32_t data_page_phys_addr_msb;
+        /*---------------- DWORD[5] (Offset 0x14) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x14.0 - 0x14.31 */
+        u_int32_t data_page_phys_addr_lsb;
+        /*---------------- DWORD[6] (Offset 0x18) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x18.0 - 0x18.31 */
+        u_int32_t mailbox_page_phys_addr_msb;
+        /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
+        /* Description - Physical address of the FW component data page */
+        /* 0x1c.0 - 0x1c.31 */
+        u_int32_t mailbox_page_phys_addr_lsb;
+    };
+
+    /* Description -  Mellanox Firmware Archiver 2 */
+    /* Size in bytes - 32 */
+    union tools_open_mfa2
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_common_header common_header;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_multi_part multi_part;
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct tools_open_package_descriptor package_descriptor;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct tools_open_component_desciptor component_desciptor;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_version version;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_component_ptr component_ptr;
+    };
+
+    /* Description -  MIRC register */
+    /* Size in bytes - 8 */
+    struct tools_open_mirc_reg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Statuses: 0 – success, 1 – busy, etc.  */
+        /* 0x0.0 - 0x0.7 */
+        u_int8_t status_code;
+        /*---------------- DWORD[1] (Offset 0x4) ----------------*/
+        /* Description -  */
+        /* 0x4.0 - 0x4.31 */
+        u_int32_t reserved;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 1024 */
+    union tools_open_misc_structs
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x3fc.31 */
+        struct tools_open_image_info image_info;
+        /* Description -  */
+        /* 0x0.0 - 0x13c.31 */
+        struct tools_open_mfg_info mfg_info;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 256 */
+    union tools_open_nv_cfg
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_wol wol;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct tools_open_infiniband_dc_capabilities infiniband_dc_capabilities;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_infiniband_dc_settings infiniband_dc_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_tpt_capabilities tpt_capabilities;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_tpt_configuration tpt_configuration;
+        /* Description -  */
+        /* 0x0.0 - 0x10.31 */
+        struct tools_open_pci_capabilities pci_capabilities;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_pci_configuration pci_configuration;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_port_boot_state port_boot_state;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_iscsi_settings iscsi_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_infiniband_boot_settings infiniband_boot_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_boot_settings boot_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_preboot_boot_settings preboot_boot_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_preboot_flow_ctrl preboot_flow_ctrl;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_sriov sriov;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_bar_size bar_size;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_vpi_settings vpi_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_roce_v_1_5_next_protocol roce_v_1_5_next_protocol;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_roce_cc roce_cc;
+        /* Description -  */
+        /* 0x0.0 - 0x40.31 */
+        struct tools_open_roce_cc_ecn roce_cc_ecn;
+        /* Description -  */
+        /* 0x0.0 - 0x18.31 */
+        struct tools_open_lldp_nb lldp_nb;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_external_port external_port;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_boot_settings_ext boot_settings_ext;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_option_rom_capability option_rom_capability;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_qos qos;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_qos_cap qos_cap;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_lldp_client_settings lldp_client_settings;
+        /* Description -  */
+        /* 0x0.0 - 0x8.31 */
+        struct tools_open_lldp_nb_cap lldp_nb_cap;
+        /* Description -  */
+        /* 0x0.0 - 0x0.31 */
+        struct tools_open_lldp_nb_dcbx lldp_nb_dcbx;
+        /* Description -  */
+        /* 0x0.0 - 0xc.31 */
+        struct tools_open_nv_base_mac_guid nv_base_mac_guid;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_nv_base_mac_guid_cap nv_base_mac_guid_cap;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct tools_open_nv_cx3_global_conf nv_cx3_global_conf;
+    };
+
+    /* Description -   */
+    /* Size in bytes - 1048576 */
+    union tools_open_tools_open
+    {
+        /*---------------- DWORD[0] (Offset 0x0) ----------------*/
+        /* Description - Non-Volatile Cfg Tlvs */
+        /* 0x0.0 - 0xfc.31 */
+        union tools_open_nv_cfg NVConfig;
+        /* Description - various registers in specific use by the tools */
+        /* 0x0.0 - 0x1fc.31 */
+        union tools_open_access_registers AceessRegisters;
+        /* Description - Tools HCR commands structs */
+        /* 0x0.0 - 0x104.31 */
+        union tools_open_hcr_cmds HcrCmds;
+        /* Description - aux image data layout */
+        /* 0x0.0 - 0xfc.31 */
+        union tools_open_aux_img_data AuxImgData;
+        /* Description - Misc structs needed for integration on new FW features */
+        /* 0x0.0 - 0x3fc.31 */
+        union tools_open_misc_structs MiscStructs;
+        /* Description - Ib Mads */
+        /* 0x0.0 - 0xbc.31 */
+        union tools_open_IbMads IbMads;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        union tools_open_mfa2 mfa2;
+        /* Description -  */
+        /* 0x0.0 - 0x1c.31 */
+        struct tools_open_mcdd_reg mcdd_reg;
+        /* Description -  */
+        /* 0x0.0 - 0x20.31 */
+        struct tools_open_mcdd_descriptor mcdd_descriptor;
+        /* Description -  */
+        /* 0x0.0 - 0x4.31 */
+        struct tools_open_mirc_reg mirc_reg;
+    };
+
+    /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
+    /* bmc_type */
+    void tools_open_bmc_type_pack(const struct tools_open_bmc_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_bmc_type_unpack(struct tools_open_bmc_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_bmc_type_print(const struct tools_open_bmc_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_bmc_type_size(void);
+#define TOOLS_OPEN_BMC_TYPE_SIZE (0x4)
+    void tools_open_bmc_type_dump(const struct tools_open_bmc_type* ptr_struct, FILE* fd);
+    /* eswitch_type */
+    void tools_open_eswitch_type_pack(const struct tools_open_eswitch_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_eswitch_type_unpack(struct tools_open_eswitch_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_eswitch_type_print(const struct tools_open_eswitch_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_eswitch_type_size(void);
+#define TOOLS_OPEN_ESWITCH_TYPE_SIZE (0x4)
+    void tools_open_eswitch_type_dump(const struct tools_open_eswitch_type* ptr_struct, FILE* fd);
+    /* global_type */
+    void tools_open_global_type_pack(const struct tools_open_global_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_global_type_unpack(struct tools_open_global_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_global_type_print(const struct tools_open_global_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_global_type_size(void);
+#define TOOLS_OPEN_GLOBAL_TYPE_SIZE (0x4)
+    void tools_open_global_type_dump(const struct tools_open_global_type* ptr_struct, FILE* fd);
+    /* host_type */
+    void tools_open_host_type_pack(const struct tools_open_host_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_host_type_unpack(struct tools_open_host_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_host_type_print(const struct tools_open_host_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_host_type_size(void);
+#define TOOLS_OPEN_HOST_TYPE_SIZE (0x4)
+    void tools_open_host_type_dump(const struct tools_open_host_type* ptr_struct, FILE* fd);
+    /* per_host_type */
+    void tools_open_per_host_type_pack(const struct tools_open_per_host_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_per_host_type_unpack(struct tools_open_per_host_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_per_host_type_print(const struct tools_open_per_host_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_per_host_type_size(void);
+#define TOOLS_OPEN_PER_HOST_TYPE_SIZE (0x4)
+    void tools_open_per_host_type_dump(const struct tools_open_per_host_type* ptr_struct, FILE* fd);
+    /* per_port_type */
+    void tools_open_per_port_type_pack(const struct tools_open_per_port_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_per_port_type_unpack(struct tools_open_per_port_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_per_port_type_print(const struct tools_open_per_port_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_per_port_type_size(void);
+#define TOOLS_OPEN_PER_PORT_TYPE_SIZE (0x4)
+    void tools_open_per_port_type_dump(const struct tools_open_per_port_type* ptr_struct, FILE* fd);
     /* per_module_type */
     void tools_open_per_module_type_pack(const struct tools_open_per_module_type* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_per_module_type_unpack(struct tools_open_per_module_type* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_per_module_type_print(const struct tools_open_per_module_type* ptr_struct, FILE* fd, int indent_level);
+    void
+      tools_open_per_module_type_print(const struct tools_open_per_module_type* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_per_module_type_size(void);
 #define TOOLS_OPEN_PER_MODULE_TYPE_SIZE (0x4)
     void tools_open_per_module_type_dump(const struct tools_open_per_module_type* ptr_struct, FILE* fd);
-/* tlv_type_dw */
-void tools_open_tlv_type_dw_pack(const struct tools_open_tlv_type_dw *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_tlv_type_dw_unpack(struct tools_open_tlv_type_dw *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_tlv_type_dw_print(const struct tools_open_tlv_type_dw *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_tlv_type_dw_size(void);
-#define TOOLS_OPEN_TLV_TYPE_DW_SIZE    (0x4)
-void tools_open_tlv_type_dw_dump(const struct tools_open_tlv_type_dw *ptr_struct, FILE *fd);
-/* fw_version */
-void tools_open_fw_version_pack(const struct tools_open_fw_version *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_fw_version_unpack(struct tools_open_fw_version *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_fw_version_print(const struct tools_open_fw_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_fw_version_size(void);
-#define TOOLS_OPEN_FW_VERSION_SIZE    (0x8)
-void tools_open_fw_version_dump(const struct tools_open_fw_version *ptr_struct, FILE *fd);
-/* tlv_type */
-void tools_open_tlv_type_pack(const union tools_open_tlv_type *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_tlv_type_unpack(union tools_open_tlv_type *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_tlv_type_print(const union tools_open_tlv_type *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_tlv_type_size(void);
-#define TOOLS_OPEN_TLV_TYPE_SIZE    (0x4)
-void tools_open_tlv_type_dump(const union tools_open_tlv_type *ptr_struct, FILE *fd);
-/* ts_entry */
-void tools_open_ts_entry_pack(const struct tools_open_ts_entry *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_ts_entry_unpack(struct tools_open_ts_entry *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_ts_entry_print(const struct tools_open_ts_entry *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_ts_entry_size(void);
-#define TOOLS_OPEN_TS_ENTRY_SIZE    (0x8)
-void tools_open_ts_entry_dump(const struct tools_open_ts_entry *ptr_struct, FILE *fd);
-/* cap_mask */
-void tools_open_cap_mask_pack(const struct tools_open_cap_mask *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_cap_mask_unpack(struct tools_open_cap_mask *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_cap_mask_print(const struct tools_open_cap_mask *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_cap_mask_size(void);
-#define TOOLS_OPEN_CAP_MASK_SIZE    (0x4)
-void tools_open_cap_mask_dump(const struct tools_open_cap_mask *ptr_struct, FILE *fd);
-/* capability_mask_smp */
-void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_capability_mask_smp_size(void);
-#define TOOLS_OPEN_CAPABILITY_MASK_SMP_SIZE    (0x40)
-void tools_open_capability_mask_smp_dump(const struct tools_open_capability_mask_smp *ptr_struct, FILE *fd);
-/* fw_info */
-void tools_open_fw_info_pack(const struct tools_open_fw_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_fw_info_unpack(struct tools_open_fw_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_fw_info_print(const struct tools_open_fw_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_fw_info_size(void);
-#define TOOLS_OPEN_FW_INFO_SIZE    (0x40)
-void tools_open_fw_info_dump(const struct tools_open_fw_info *ptr_struct, FILE *fd);
-/* hw_info */
-void tools_open_hw_info_pack(const struct tools_open_hw_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_hw_info_unpack(struct tools_open_hw_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_hw_info_print(const struct tools_open_hw_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_hw_info_size(void);
-#define TOOLS_OPEN_HW_INFO_SIZE    (0x20)
-void tools_open_hw_info_dump(const struct tools_open_hw_info *ptr_struct, FILE *fd);
-/* nv_hdr */
-void tools_open_nv_hdr_pack(const struct tools_open_nv_hdr *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nv_hdr_unpack(struct tools_open_nv_hdr *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nv_hdr_print(const struct tools_open_nv_hdr *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nv_hdr_size(void);
-#define TOOLS_OPEN_NV_HDR_SIZE    (0x8)
-void tools_open_nv_hdr_dump(const struct tools_open_nv_hdr *ptr_struct, FILE *fd);
-/* nv_hdr_fifth_gen */
-void tools_open_nv_hdr_fifth_gen_pack(const struct tools_open_nv_hdr_fifth_gen *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nv_hdr_fifth_gen_unpack(struct tools_open_nv_hdr_fifth_gen *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nv_hdr_fifth_gen_size(void);
-#define TOOLS_OPEN_NV_HDR_FIFTH_GEN_SIZE    (0xc)
-void tools_open_nv_hdr_fifth_gen_dump(const struct tools_open_nv_hdr_fifth_gen *ptr_struct, FILE *fd);
-/* pmdio_addr_data */
-void tools_open_pmdio_addr_data_pack(const struct tools_open_pmdio_addr_data *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_pmdio_addr_data_unpack(struct tools_open_pmdio_addr_data *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_pmdio_addr_data_size(void);
-#define TOOLS_OPEN_PMDIO_ADDR_DATA_SIZE    (0x4)
-void tools_open_pmdio_addr_data_dump(const struct tools_open_pmdio_addr_data *ptr_struct, FILE *fd);
-/* sw_info */
-void tools_open_sw_info_pack(const struct tools_open_sw_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_sw_info_unpack(struct tools_open_sw_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_sw_info_print(const struct tools_open_sw_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_sw_info_size(void);
-#define TOOLS_OPEN_SW_INFO_SIZE    (0x20)
-void tools_open_sw_info_dump(const struct tools_open_sw_info *ptr_struct, FILE *fd);
-/* timestamp */
-void tools_open_timestamp_pack(const struct tools_open_timestamp *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_timestamp_unpack(struct tools_open_timestamp *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_timestamp_print(const struct tools_open_timestamp *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_timestamp_size(void);
-#define TOOLS_OPEN_TIMESTAMP_SIZE    (0x10)
-void tools_open_timestamp_dump(const struct tools_open_timestamp *ptr_struct, FILE *fd);
-/* uint64 */
-void tools_open_uint64_pack(const u_int64_t *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_uint64_unpack(u_int64_t *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_uint64_print(const u_int64_t *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_uint64_size(void);
-#define TOOLS_OPEN_UINT64_SIZE    (0x8)
-void tools_open_uint64_dump(const u_int64_t *ptr_struct, FILE *fd);
-/* aux_tlv_header */
-void tools_open_aux_tlv_header_pack(const struct tools_open_aux_tlv_header *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_aux_tlv_header_unpack(struct tools_open_aux_tlv_header *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_aux_tlv_header_print(const struct tools_open_aux_tlv_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_aux_tlv_header_size(void);
-#define TOOLS_OPEN_AUX_TLV_HEADER_SIZE    (0x14)
-void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header *ptr_struct, FILE *fd);
-/* extended_ib_port_info */
-void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_extended_ib_port_info_size(void);
-#define TOOLS_OPEN_EXTENDED_IB_PORT_INFO_SIZE    (0x3c)
-void tools_open_extended_ib_port_info_dump(const struct tools_open_extended_ib_port_info *ptr_struct, FILE *fd);
-/* ib_port_info */
-void tools_open_ib_port_info_pack(const struct tools_open_ib_port_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_ib_port_info_unpack(struct tools_open_ib_port_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_ib_port_info_print(const struct tools_open_ib_port_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_ib_port_info_size(void);
-#define TOOLS_OPEN_IB_PORT_INFO_SIZE    (0x40)
-void tools_open_ib_port_info_dump(const struct tools_open_ib_port_info *ptr_struct, FILE *fd);
-/* mcam */
-void tools_open_mcam_pack(const struct tools_open_mcam *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mcam_unpack(struct tools_open_mcam *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mcam_print(const struct tools_open_mcam *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mcam_size(void);
-#define TOOLS_OPEN_MCAM_SIZE    (0x48)
-void tools_open_mcam_dump(const struct tools_open_mcam *ptr_struct, FILE *fd);
-/* mfmc */
-void tools_open_mfmc_pack(const struct tools_open_mfmc *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mfmc_unpack(struct tools_open_mfmc *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mfmc_print(const struct tools_open_mfmc *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mfmc_size(void);
-#define TOOLS_OPEN_MFMC_SIZE    (0x1c)
-void tools_open_mfmc_dump(const struct tools_open_mfmc *ptr_struct, FILE *fd);
-/* mfpa */
-void tools_open_mfpa_pack(const struct tools_open_mfpa *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mfpa_unpack(struct tools_open_mfpa *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mfpa_print(const struct tools_open_mfpa *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mfpa_size(void);
-#define TOOLS_OPEN_MFPA_SIZE    (0x20)
-void tools_open_mfpa_dump(const struct tools_open_mfpa *ptr_struct, FILE *fd);
-/* mgir */
-void tools_open_mgir_pack(const struct tools_open_mgir *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mgir_unpack(struct tools_open_mgir *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mgir_print(const struct tools_open_mgir *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mgir_size(void);
-#define TOOLS_OPEN_MGIR_SIZE    (0x80)
-void tools_open_mgir_dump(const struct tools_open_mgir *ptr_struct, FILE *fd);
-/* mgnle */
-void tools_open_mgnle_pack(const struct tools_open_mgnle *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mgnle_unpack(struct tools_open_mgnle *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mgnle_print(const struct tools_open_mgnle *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mgnle_size(void);
-#define TOOLS_OPEN_MGNLE_SIZE    (0xac)
-void tools_open_mgnle_dump(const struct tools_open_mgnle *ptr_struct, FILE *fd);
-/* mlock */
-void tools_open_mlock_pack(const struct tools_open_mlock *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mlock_unpack(struct tools_open_mlock *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mlock_print(const struct tools_open_mlock *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mlock_size(void);
-#define TOOLS_OPEN_MLOCK_SIZE    (0x10)
-void tools_open_mlock_dump(const struct tools_open_mlock *ptr_struct, FILE *fd);
-/* mnva */
-void tools_open_mnva_pack(const struct tools_open_mnva *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mnva_unpack(struct tools_open_mnva *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mnva_print(const struct tools_open_mnva *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mnva_size(void);
-#define TOOLS_OPEN_MNVA_SIZE    (0x100)
-void tools_open_mnva_dump(const struct tools_open_mnva *ptr_struct, FILE *fd);
-/* mnvgn */
-void tools_open_mnvgn_pack(const struct tools_open_mnvgn *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mnvgn_unpack(struct tools_open_mnvgn *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mnvgn_print(const struct tools_open_mnvgn *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mnvgn_size(void);
-#define TOOLS_OPEN_MNVGN_SIZE    (0x9c)
-void tools_open_mnvgn_dump(const struct tools_open_mnvgn *ptr_struct, FILE *fd);
-/* mnvi */
-void tools_open_mnvi_pack(const struct tools_open_mnvi *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mnvi_unpack(struct tools_open_mnvi *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mnvi_print(const struct tools_open_mnvi *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mnvi_size(void);
-#define TOOLS_OPEN_MNVI_SIZE    (0x8)
-void tools_open_mnvi_dump(const struct tools_open_mnvi *ptr_struct, FILE *fd);
-/* mnvia */
-void tools_open_mnvia_pack(const struct tools_open_mnvia *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mnvia_unpack(struct tools_open_mnvia *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mnvia_print(const struct tools_open_mnvia *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mnvia_size(void);
-#define TOOLS_OPEN_MNVIA_SIZE    (0x8)
-void tools_open_mnvia_dump(const struct tools_open_mnvia *ptr_struct, FILE *fd);
-/* mvts */
-void tools_open_mvts_pack(const struct tools_open_mvts *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mvts_unpack(struct tools_open_mvts *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mvts_print(const struct tools_open_mvts *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mvts_size(void);
-#define TOOLS_OPEN_MVTS_SIZE    (0x14)
-void tools_open_mvts_dump(const struct tools_open_mvts *ptr_struct, FILE *fd);
-/* node_info */
-void tools_open_node_info_pack(const struct tools_open_node_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_node_info_unpack(struct tools_open_node_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_node_info_print(const struct tools_open_node_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_node_info_size(void);
-#define TOOLS_OPEN_NODE_INFO_SIZE    (0x40)
-void tools_open_node_info_dump(const struct tools_open_node_info *ptr_struct, FILE *fd);
-/* nvda */
-void tools_open_nvda_pack(const struct tools_open_nvda *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nvda_unpack(struct tools_open_nvda *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nvda_print(const struct tools_open_nvda *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nvda_size(void);
-#define TOOLS_OPEN_NVDA_SIZE    (0x10c)
-void tools_open_nvda_dump(const struct tools_open_nvda *ptr_struct, FILE *fd);
-/* nvdi */
-void tools_open_nvdi_pack(const struct tools_open_nvdi *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nvdi_unpack(struct tools_open_nvdi *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nvdi_print(const struct tools_open_nvdi *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nvdi_size(void);
-#define TOOLS_OPEN_NVDI_SIZE    (0xc)
-void tools_open_nvdi_dump(const struct tools_open_nvdi *ptr_struct, FILE *fd);
-/* nvia */
-void tools_open_nvia_pack(const struct tools_open_nvia *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nvia_unpack(struct tools_open_nvia *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nvia_print(const struct tools_open_nvia *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nvia_size(void);
-#define TOOLS_OPEN_NVIA_SIZE    (0x8)
-void tools_open_nvia_dump(const struct tools_open_nvia *ptr_struct, FILE *fd);
-/* nvqc */
-void tools_open_nvqc_pack(const struct tools_open_nvqc *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nvqc_unpack(struct tools_open_nvqc *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nvqc_print(const struct tools_open_nvqc *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nvqc_size(void);
-#define TOOLS_OPEN_NVQC_SIZE    (0x8)
-void tools_open_nvqc_dump(const struct tools_open_nvqc *ptr_struct, FILE *fd);
-/* nvqgc */
-void tools_open_nvqgc_pack(const struct tools_open_nvqgc *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nvqgc_unpack(struct tools_open_nvqgc *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nvqgc_print(const struct tools_open_nvqgc *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nvqgc_size(void);
-#define TOOLS_OPEN_NVQGC_SIZE    (0x10)
-void tools_open_nvqgc_dump(const struct tools_open_nvqgc *ptr_struct, FILE *fd);
-/* pmdic */
-void tools_open_pmdic_pack(const struct tools_open_pmdic *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_pmdic_unpack(struct tools_open_pmdic *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_pmdic_print(const struct tools_open_pmdic *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_pmdic_size(void);
-#define TOOLS_OPEN_PMDIC_SIZE    (0xc)
-void tools_open_pmdic_dump(const struct tools_open_pmdic *ptr_struct, FILE *fd);
-/* pmdio */
-void tools_open_pmdio_pack(const struct tools_open_pmdio *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_pmdio_unpack(struct tools_open_pmdio *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_pmdio_print(const struct tools_open_pmdio *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_pmdio_size(void);
-#define TOOLS_OPEN_PMDIO_SIZE    (0x108)
-void tools_open_pmdio_dump(const struct tools_open_pmdio *ptr_struct, FILE *fd);
-/* smp_vsp_general_info */
-void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_smp_vsp_general_info_size(void);
-#define TOOLS_OPEN_SMP_VSP_GENERAL_INFO_SIZE    (0x40)
-void tools_open_smp_vsp_general_info_dump(const union tools_open_smp_vsp_general_info *ptr_struct, FILE *fd);
-/* aux_data_hdr */
-void tools_open_aux_data_hdr_pack(const struct tools_open_aux_data_hdr *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_aux_data_hdr_unpack(struct tools_open_aux_data_hdr *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_aux_data_hdr_print(const struct tools_open_aux_data_hdr *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_aux_data_hdr_size(void);
-#define TOOLS_OPEN_AUX_DATA_HDR_SIZE    (0x10)
-void tools_open_aux_data_hdr_dump(const struct tools_open_aux_data_hdr *ptr_struct, FILE *fd);
-/* aux_tlv */
-void tools_open_aux_tlv_pack(const struct tools_open_aux_tlv *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_aux_tlv_unpack(struct tools_open_aux_tlv *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_aux_tlv_print(const struct tools_open_aux_tlv *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_aux_tlv_size(void);
-#define TOOLS_OPEN_AUX_TLV_SIZE    (0x100)
-void tools_open_aux_tlv_dump(const struct tools_open_aux_tlv *ptr_struct, FILE *fd);
-/* bar_size */
-void tools_open_bar_size_pack(const struct tools_open_bar_size *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_bar_size_unpack(struct tools_open_bar_size *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_bar_size_print(const struct tools_open_bar_size *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_bar_size_size(void);
-#define TOOLS_OPEN_BAR_SIZE_SIZE    (0x4)
-void tools_open_bar_size_dump(const struct tools_open_bar_size *ptr_struct, FILE *fd);
-/* boot_settings */
-void tools_open_boot_settings_pack(const struct tools_open_boot_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_boot_settings_unpack(struct tools_open_boot_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_boot_settings_print(const struct tools_open_boot_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_boot_settings_size(void);
-#define TOOLS_OPEN_BOOT_SETTINGS_SIZE    (0x4)
-void tools_open_boot_settings_dump(const struct tools_open_boot_settings *ptr_struct, FILE *fd);
-/* boot_settings_ext */
-void tools_open_boot_settings_ext_pack(const struct tools_open_boot_settings_ext *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_boot_settings_ext_size(void);
-#define TOOLS_OPEN_BOOT_SETTINGS_EXT_SIZE    (0x4)
-void tools_open_boot_settings_ext_dump(const struct tools_open_boot_settings_ext *ptr_struct, FILE *fd);
-/* common_header */
-void tools_open_common_header_pack(const struct tools_open_common_header *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_common_header_unpack(struct tools_open_common_header *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_common_header_print(const struct tools_open_common_header *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_common_header_size(void);
-#define TOOLS_OPEN_COMMON_HEADER_SIZE    (0x4)
-void tools_open_common_header_dump(const struct tools_open_common_header *ptr_struct, FILE *fd);
-/* component_desciptor */
-void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_component_desciptor_print(const struct tools_open_component_desciptor *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_component_desciptor_size(void);
-#define TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE    (0x10)
-void tools_open_component_desciptor_dump(const struct tools_open_component_desciptor *ptr_struct, FILE *fd);
-/* component_ptr */
-void tools_open_component_ptr_pack(const struct tools_open_component_ptr *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_component_ptr_unpack(struct tools_open_component_ptr *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_component_ptr_print(const struct tools_open_component_ptr *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_component_ptr_size(void);
-#define TOOLS_OPEN_COMPONENT_PTR_SIZE    (0x8)
-void tools_open_component_ptr_dump(const struct tools_open_component_ptr *ptr_struct, FILE *fd);
-/* external_port */
-void tools_open_external_port_pack(const struct tools_open_external_port *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_external_port_unpack(struct tools_open_external_port *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_external_port_print(const struct tools_open_external_port *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_external_port_size(void);
-#define TOOLS_OPEN_EXTERNAL_PORT_SIZE    (0x8)
-void tools_open_external_port_dump(const struct tools_open_external_port *ptr_struct, FILE *fd);
-/* image_info */
-void tools_open_image_info_pack(const struct tools_open_image_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_image_info_unpack(struct tools_open_image_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_image_info_print(const struct tools_open_image_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_image_info_size(void);
-#define TOOLS_OPEN_IMAGE_INFO_SIZE    (0x400)
-void tools_open_image_info_dump(const struct tools_open_image_info *ptr_struct, FILE *fd);
-/* infiniband_boot_settings */
-void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_infiniband_boot_settings_size(void);
-#define TOOLS_OPEN_INFINIBAND_BOOT_SETTINGS_SIZE    (0x4)
-void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings *ptr_struct, FILE *fd);
-/* infiniband_dc_capabilities */
-void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_infiniband_dc_capabilities_size(void);
-#define TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE    (0x10)
-void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities *ptr_struct, FILE *fd);
-/* infiniband_dc_settings */
-void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_infiniband_dc_settings_size(void);
-#define TOOLS_OPEN_INFINIBAND_DC_SETTINGS_SIZE    (0x8)
-void tools_open_infiniband_dc_settings_dump(const struct tools_open_infiniband_dc_settings *ptr_struct, FILE *fd);
-/* iscsi_settings */
-void tools_open_iscsi_settings_pack(const struct tools_open_iscsi_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_iscsi_settings_unpack(struct tools_open_iscsi_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_iscsi_settings_print(const struct tools_open_iscsi_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_iscsi_settings_size(void);
-#define TOOLS_OPEN_ISCSI_SETTINGS_SIZE    (0xc)
-void tools_open_iscsi_settings_dump(const struct tools_open_iscsi_settings *ptr_struct, FILE *fd);
-/* lldp_client_settings */
-void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_lldp_client_settings_size(void);
-#define TOOLS_OPEN_LLDP_CLIENT_SETTINGS_SIZE    (0xc)
-void tools_open_lldp_client_settings_dump(const struct tools_open_lldp_client_settings *ptr_struct, FILE *fd);
-/* lldp_nb */
-void tools_open_lldp_nb_pack(const struct tools_open_lldp_nb *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_lldp_nb_unpack(struct tools_open_lldp_nb *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_lldp_nb_print(const struct tools_open_lldp_nb *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_lldp_nb_size(void);
-#define TOOLS_OPEN_LLDP_NB_SIZE    (0x1c)
-void tools_open_lldp_nb_dump(const struct tools_open_lldp_nb *ptr_struct, FILE *fd);
-/* lldp_nb_cap */
-void tools_open_lldp_nb_cap_pack(const struct tools_open_lldp_nb_cap *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_lldp_nb_cap_unpack(struct tools_open_lldp_nb_cap *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_lldp_nb_cap_print(const struct tools_open_lldp_nb_cap *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_lldp_nb_cap_size(void);
-#define TOOLS_OPEN_LLDP_NB_CAP_SIZE    (0xc)
-void tools_open_lldp_nb_cap_dump(const struct tools_open_lldp_nb_cap *ptr_struct, FILE *fd);
-/* lldp_nb_dcbx */
-void tools_open_lldp_nb_dcbx_pack(const struct tools_open_lldp_nb_dcbx *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_lldp_nb_dcbx_unpack(struct tools_open_lldp_nb_dcbx *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_lldp_nb_dcbx_print(const struct tools_open_lldp_nb_dcbx *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_lldp_nb_dcbx_size(void);
-#define TOOLS_OPEN_LLDP_NB_DCBX_SIZE    (0x4)
-void tools_open_lldp_nb_dcbx_dump(const struct tools_open_lldp_nb_dcbx *ptr_struct, FILE *fd);
-/* mfg_info */
-void tools_open_mfg_info_pack(const struct tools_open_mfg_info *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mfg_info_unpack(struct tools_open_mfg_info *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mfg_info_print(const struct tools_open_mfg_info *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mfg_info_size(void);
-#define TOOLS_OPEN_MFG_INFO_SIZE    (0x140)
-void tools_open_mfg_info_dump(const struct tools_open_mfg_info *ptr_struct, FILE *fd);
-/* mnv_cfg */
-void tools_open_mnv_cfg_pack(const union tools_open_mnv_cfg *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mnv_cfg_unpack(union tools_open_mnv_cfg *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mnv_cfg_print(const union tools_open_mnv_cfg *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mnv_cfg_size(void);
-#define TOOLS_OPEN_MNV_CFG_SIZE    (0x16c)
-void tools_open_mnv_cfg_dump(const union tools_open_mnv_cfg *ptr_struct, FILE *fd);
-/* multi_part */
-void tools_open_multi_part_pack(const struct tools_open_multi_part *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_multi_part_unpack(struct tools_open_multi_part *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_multi_part_print(const struct tools_open_multi_part *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_multi_part_size(void);
-#define TOOLS_OPEN_MULTI_PART_SIZE    (0x4)
-void tools_open_multi_part_dump(const struct tools_open_multi_part *ptr_struct, FILE *fd);
-/* nv_base_mac_guid */
-void tools_open_nv_base_mac_guid_pack(const struct tools_open_nv_base_mac_guid *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nv_base_mac_guid_unpack(struct tools_open_nv_base_mac_guid *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nv_base_mac_guid_size(void);
-#define TOOLS_OPEN_NV_BASE_MAC_GUID_SIZE    (0x10)
-void tools_open_nv_base_mac_guid_dump(const struct tools_open_nv_base_mac_guid *ptr_struct, FILE *fd);
-/* nv_base_mac_guid_cap */
-void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nv_base_mac_guid_cap_size(void);
-#define TOOLS_OPEN_NV_BASE_MAC_GUID_CAP_SIZE    (0x8)
-void tools_open_nv_base_mac_guid_cap_dump(const struct tools_open_nv_base_mac_guid_cap *ptr_struct, FILE *fd);
-/* nv_cx3_global_conf */
-void tools_open_nv_cx3_global_conf_pack(const struct tools_open_nv_cx3_global_conf *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nv_cx3_global_conf_size(void);
-#define TOOLS_OPEN_NV_CX3_GLOBAL_CONF_SIZE    (0x20)
-void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_conf *ptr_struct, FILE *fd);
-/* option_rom_capability */
-void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_option_rom_capability_size(void);
-#define TOOLS_OPEN_OPTION_ROM_CAPABILITY_SIZE    (0x4)
-void tools_open_option_rom_capability_dump(const struct tools_open_option_rom_capability *ptr_struct, FILE *fd);
-/* package_descriptor */
-void tools_open_package_descriptor_pack(const struct tools_open_package_descriptor *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_package_descriptor_print(const struct tools_open_package_descriptor *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_package_descriptor_size(void);
-#define TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE    (0x1c)
-void tools_open_package_descriptor_dump(const struct tools_open_package_descriptor *ptr_struct, FILE *fd);
-/* pci_capabilities */
-void tools_open_pci_capabilities_pack(const struct tools_open_pci_capabilities *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_pci_capabilities_unpack(struct tools_open_pci_capabilities *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_pci_capabilities_size(void);
-#define TOOLS_OPEN_PCI_CAPABILITIES_SIZE    (0x14)
-void tools_open_pci_capabilities_dump(const struct tools_open_pci_capabilities *ptr_struct, FILE *fd);
-/* pci_configuration */
-void tools_open_pci_configuration_pack(const struct tools_open_pci_configuration *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_pci_configuration_print(const struct tools_open_pci_configuration *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_pci_configuration_size(void);
-#define TOOLS_OPEN_PCI_CONFIGURATION_SIZE    (0xc)
-void tools_open_pci_configuration_dump(const struct tools_open_pci_configuration *ptr_struct, FILE *fd);
-/* phy_reg */
-void tools_open_phy_reg_pack(const union tools_open_phy_reg *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_phy_reg_unpack(union tools_open_phy_reg *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_phy_reg_print(const union tools_open_phy_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_phy_reg_size(void);
-#define TOOLS_OPEN_PHY_REG_SIZE    (0x108)
-void tools_open_phy_reg_dump(const union tools_open_phy_reg *ptr_struct, FILE *fd);
-/* port_boot_state */
-void tools_open_port_boot_state_pack(const struct tools_open_port_boot_state *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_port_boot_state_unpack(struct tools_open_port_boot_state *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_port_boot_state_print(const struct tools_open_port_boot_state *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_port_boot_state_size(void);
-#define TOOLS_OPEN_PORT_BOOT_STATE_SIZE    (0x4)
-void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state *ptr_struct, FILE *fd);
-/* preboot_boot_settings */
-void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_preboot_boot_settings_size(void);
-#define TOOLS_OPEN_PREBOOT_BOOT_SETTINGS_SIZE    (0x4)
-void tools_open_preboot_boot_settings_dump(const struct tools_open_preboot_boot_settings *ptr_struct, FILE *fd);
-/* preboot_flow_ctrl */
-void tools_open_preboot_flow_ctrl_pack(const struct tools_open_preboot_flow_ctrl *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_preboot_flow_ctrl_size(void);
-#define TOOLS_OPEN_PREBOOT_FLOW_CTRL_SIZE    (0x4)
-void tools_open_preboot_flow_ctrl_dump(const struct tools_open_preboot_flow_ctrl *ptr_struct, FILE *fd);
-/* qos */
-void tools_open_qos_pack(const struct tools_open_qos *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_qos_unpack(struct tools_open_qos *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_qos_print(const struct tools_open_qos *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_qos_size(void);
-#define TOOLS_OPEN_QOS_SIZE    (0xc)
-void tools_open_qos_dump(const struct tools_open_qos *ptr_struct, FILE *fd);
-/* qos_cap */
-void tools_open_qos_cap_pack(const struct tools_open_qos_cap *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_qos_cap_unpack(struct tools_open_qos_cap *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_qos_cap_print(const struct tools_open_qos_cap *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_qos_cap_size(void);
-#define TOOLS_OPEN_QOS_CAP_SIZE    (0xc)
-void tools_open_qos_cap_dump(const struct tools_open_qos_cap *ptr_struct, FILE *fd);
-/* query_def_params_global */
-void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_query_def_params_global_size(void);
-#define TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE    (0x14)
-void tools_open_query_def_params_global_dump(const struct tools_open_query_def_params_global *ptr_struct, FILE *fd);
-/* query_def_params_per_port */
-void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_query_def_params_per_port_size(void);
-#define TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE    (0x1c)
-void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port *ptr_struct, FILE *fd);
-/* roce_cc */
-void tools_open_roce_cc_pack(const struct tools_open_roce_cc *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_roce_cc_unpack(struct tools_open_roce_cc *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_roce_cc_print(const struct tools_open_roce_cc *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_roce_cc_size(void);
-#define TOOLS_OPEN_ROCE_CC_SIZE    (0x4)
-void tools_open_roce_cc_dump(const struct tools_open_roce_cc *ptr_struct, FILE *fd);
-/* roce_cc_ecn */
-void tools_open_roce_cc_ecn_pack(const struct tools_open_roce_cc_ecn *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_roce_cc_ecn_unpack(struct tools_open_roce_cc_ecn *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_roce_cc_ecn_print(const struct tools_open_roce_cc_ecn *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_roce_cc_ecn_size(void);
-#define TOOLS_OPEN_ROCE_CC_ECN_SIZE    (0x44)
-void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn *ptr_struct, FILE *fd);
-/* roce_v_1_5_next_protocol */
-void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_roce_v_1_5_next_protocol_size(void);
-#define TOOLS_OPEN_ROCE_V_1_5_NEXT_PROTOCOL_SIZE    (0x4)
-void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol *ptr_struct, FILE *fd);
-/* smp_data */
-void tools_open_smp_data_pack(const union tools_open_smp_data *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_smp_data_unpack(union tools_open_smp_data *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_smp_data_print(const union tools_open_smp_data *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_smp_data_size(void);
-#define TOOLS_OPEN_SMP_DATA_SIZE    (0x40)
-void tools_open_smp_data_dump(const union tools_open_smp_data *ptr_struct, FILE *fd);
-/* sriov */
-void tools_open_sriov_pack(const struct tools_open_sriov *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_sriov_unpack(struct tools_open_sriov *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_sriov_print(const struct tools_open_sriov *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_sriov_size(void);
-#define TOOLS_OPEN_SRIOV_SIZE    (0x4)
-void tools_open_sriov_dump(const struct tools_open_sriov *ptr_struct, FILE *fd);
-/* tpt_capabilities */
-void tools_open_tpt_capabilities_pack(const struct tools_open_tpt_capabilities *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_tpt_capabilities_unpack(struct tools_open_tpt_capabilities *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_tpt_capabilities_size(void);
-#define TOOLS_OPEN_TPT_CAPABILITIES_SIZE    (0x4)
-void tools_open_tpt_capabilities_dump(const struct tools_open_tpt_capabilities *ptr_struct, FILE *fd);
-/* tpt_configuration */
-void tools_open_tpt_configuration_pack(const struct tools_open_tpt_configuration *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_tpt_configuration_size(void);
-#define TOOLS_OPEN_TPT_CONFIGURATION_SIZE    (0x4)
-void tools_open_tpt_configuration_dump(const struct tools_open_tpt_configuration *ptr_struct, FILE *fd);
-/* version */
-void tools_open_version_pack(const struct tools_open_version *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_version_unpack(struct tools_open_version *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_version_print(const struct tools_open_version *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_version_size(void);
-#define TOOLS_OPEN_VERSION_SIZE    (0xc)
-void tools_open_version_dump(const struct tools_open_version *ptr_struct, FILE *fd);
-/* vpi_settings */
-void tools_open_vpi_settings_pack(const struct tools_open_vpi_settings *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_vpi_settings_unpack(struct tools_open_vpi_settings *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_vpi_settings_print(const struct tools_open_vpi_settings *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_vpi_settings_size(void);
-#define TOOLS_OPEN_VPI_SETTINGS_SIZE    (0x4)
-void tools_open_vpi_settings_dump(const struct tools_open_vpi_settings *ptr_struct, FILE *fd);
-/* wol */
-void tools_open_wol_pack(const struct tools_open_wol *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_wol_unpack(struct tools_open_wol *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_wol_print(const struct tools_open_wol *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_wol_size(void);
-#define TOOLS_OPEN_WOL_SIZE    (0x8)
-void tools_open_wol_dump(const struct tools_open_wol *ptr_struct, FILE *fd);
-/* IbMads */
-void tools_open_IbMads_pack(const union tools_open_IbMads *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_IbMads_unpack(union tools_open_IbMads *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_IbMads_print(const union tools_open_IbMads *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_IbMads_size(void);
-#define TOOLS_OPEN_IBMADS_SIZE    (0xc0)
-void tools_open_IbMads_dump(const union tools_open_IbMads *ptr_struct, FILE *fd);
-/* access_registers */
-void tools_open_access_registers_pack(const union tools_open_access_registers *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_access_registers_unpack(union tools_open_access_registers *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_access_registers_print(const union tools_open_access_registers *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_access_registers_size(void);
-#define TOOLS_OPEN_ACCESS_REGISTERS_SIZE    (0x200)
-void tools_open_access_registers_dump(const union tools_open_access_registers *ptr_struct, FILE *fd);
-/* aux_img_data */
-void tools_open_aux_img_data_pack(const union tools_open_aux_img_data *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_aux_img_data_unpack(union tools_open_aux_img_data *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_aux_img_data_print(const union tools_open_aux_img_data *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_aux_img_data_size(void);
-#define TOOLS_OPEN_AUX_IMG_DATA_SIZE    (0x100)
-void tools_open_aux_img_data_dump(const union tools_open_aux_img_data *ptr_struct, FILE *fd);
-/* hcr_cmds */
-void tools_open_hcr_cmds_pack(const union tools_open_hcr_cmds *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_hcr_cmds_unpack(union tools_open_hcr_cmds *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_hcr_cmds_print(const union tools_open_hcr_cmds *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_hcr_cmds_size(void);
-#define TOOLS_OPEN_HCR_CMDS_SIZE    (0x108)
-void tools_open_hcr_cmds_dump(const union tools_open_hcr_cmds *ptr_struct, FILE *fd);
-/* mcdd_descriptor */
-void tools_open_mcdd_descriptor_pack(const struct tools_open_mcdd_descriptor *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mcdd_descriptor_unpack(struct tools_open_mcdd_descriptor *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mcdd_descriptor_size(void);
-#define TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE    (0x24)
-void tools_open_mcdd_descriptor_dump(const struct tools_open_mcdd_descriptor *ptr_struct, FILE *fd);
-/* mcdd_reg */
-void tools_open_mcdd_reg_pack(const struct tools_open_mcdd_reg *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mcdd_reg_unpack(struct tools_open_mcdd_reg *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mcdd_reg_print(const struct tools_open_mcdd_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mcdd_reg_size(void);
-#define TOOLS_OPEN_MCDD_REG_SIZE    (0x20)
-void tools_open_mcdd_reg_dump(const struct tools_open_mcdd_reg *ptr_struct, FILE *fd);
-/* mfa2 */
-void tools_open_mfa2_pack(const union tools_open_mfa2 *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mfa2_unpack(union tools_open_mfa2 *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mfa2_print(const union tools_open_mfa2 *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mfa2_size(void);
-#define TOOLS_OPEN_MFA2_SIZE    (0x20)
-void tools_open_mfa2_dump(const union tools_open_mfa2 *ptr_struct, FILE *fd);
-/* mirc_reg */
-void tools_open_mirc_reg_pack(const struct tools_open_mirc_reg *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_mirc_reg_unpack(struct tools_open_mirc_reg *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_mirc_reg_print(const struct tools_open_mirc_reg *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_mirc_reg_size(void);
-#define TOOLS_OPEN_MIRC_REG_SIZE    (0x8)
-void tools_open_mirc_reg_dump(const struct tools_open_mirc_reg *ptr_struct, FILE *fd);
-/* misc_structs */
-void tools_open_misc_structs_pack(const union tools_open_misc_structs *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_misc_structs_unpack(union tools_open_misc_structs *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_misc_structs_print(const union tools_open_misc_structs *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_misc_structs_size(void);
-#define TOOLS_OPEN_MISC_STRUCTS_SIZE    (0x400)
-void tools_open_misc_structs_dump(const union tools_open_misc_structs *ptr_struct, FILE *fd);
-/* nv_cfg */
-void tools_open_nv_cfg_pack(const union tools_open_nv_cfg *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_nv_cfg_unpack(union tools_open_nv_cfg *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_nv_cfg_print(const union tools_open_nv_cfg *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_nv_cfg_size(void);
-#define TOOLS_OPEN_NV_CFG_SIZE    (0x100)
-void tools_open_nv_cfg_dump(const union tools_open_nv_cfg *ptr_struct, FILE *fd);
-/* tools_open */
-void tools_open_tools_open_pack(const union tools_open_tools_open *ptr_struct, u_int8_t *ptr_buff);
-void tools_open_tools_open_unpack(union tools_open_tools_open *ptr_struct, const u_int8_t *ptr_buff);
-void tools_open_tools_open_print(const union tools_open_tools_open *ptr_struct, FILE *fd, int indent_level);
-unsigned int tools_open_tools_open_size(void);
-#define TOOLS_OPEN_TOOLS_OPEN_SIZE    (0x100000)
-void tools_open_tools_open_dump(const union tools_open_tools_open *ptr_struct, FILE *fd);
-
+    /* tlv_type_dw */
+    void tools_open_tlv_type_dw_pack(const struct tools_open_tlv_type_dw* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_tlv_type_dw_unpack(struct tools_open_tlv_type_dw* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_tlv_type_dw_print(const struct tools_open_tlv_type_dw* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_tlv_type_dw_size(void);
+#define TOOLS_OPEN_TLV_TYPE_DW_SIZE (0x4)
+    void tools_open_tlv_type_dw_dump(const struct tools_open_tlv_type_dw* ptr_struct, FILE* fd);
+    /* fw_version */
+    void tools_open_fw_version_pack(const struct tools_open_fw_version* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_fw_version_unpack(struct tools_open_fw_version* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_fw_version_print(const struct tools_open_fw_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_fw_version_size(void);
+#define TOOLS_OPEN_FW_VERSION_SIZE (0x8)
+    void tools_open_fw_version_dump(const struct tools_open_fw_version* ptr_struct, FILE* fd);
+    /* tlv_type */
+    void tools_open_tlv_type_pack(const union tools_open_tlv_type* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_tlv_type_unpack(union tools_open_tlv_type* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_tlv_type_print(const union tools_open_tlv_type* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_tlv_type_size(void);
+#define TOOLS_OPEN_TLV_TYPE_SIZE (0x4)
+    void tools_open_tlv_type_dump(const union tools_open_tlv_type* ptr_struct, FILE* fd);
+    /* ts_entry */
+    void tools_open_ts_entry_pack(const struct tools_open_ts_entry* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_ts_entry_unpack(struct tools_open_ts_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_ts_entry_print(const struct tools_open_ts_entry* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_ts_entry_size(void);
+#define TOOLS_OPEN_TS_ENTRY_SIZE (0x8)
+    void tools_open_ts_entry_dump(const struct tools_open_ts_entry* ptr_struct, FILE* fd);
+    /* cap_mask */
+    void tools_open_cap_mask_pack(const struct tools_open_cap_mask* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_cap_mask_unpack(struct tools_open_cap_mask* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_cap_mask_print(const struct tools_open_cap_mask* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_cap_mask_size(void);
+#define TOOLS_OPEN_CAP_MASK_SIZE (0x4)
+    void tools_open_cap_mask_dump(const struct tools_open_cap_mask* ptr_struct, FILE* fd);
+    /* capability_mask_smp */
+    void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int tools_open_capability_mask_smp_size(void);
+#define TOOLS_OPEN_CAPABILITY_MASK_SMP_SIZE (0x40)
+    void tools_open_capability_mask_smp_dump(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd);
+    /* fw_info */
+    void tools_open_fw_info_pack(const struct tools_open_fw_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_fw_info_unpack(struct tools_open_fw_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_fw_info_print(const struct tools_open_fw_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_fw_info_size(void);
+#define TOOLS_OPEN_FW_INFO_SIZE (0x40)
+    void tools_open_fw_info_dump(const struct tools_open_fw_info* ptr_struct, FILE* fd);
+    /* hw_info */
+    void tools_open_hw_info_pack(const struct tools_open_hw_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_hw_info_unpack(struct tools_open_hw_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_hw_info_print(const struct tools_open_hw_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_hw_info_size(void);
+#define TOOLS_OPEN_HW_INFO_SIZE (0x20)
+    void tools_open_hw_info_dump(const struct tools_open_hw_info* ptr_struct, FILE* fd);
+    /* nv_hdr */
+    void tools_open_nv_hdr_pack(const struct tools_open_nv_hdr* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nv_hdr_unpack(struct tools_open_nv_hdr* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nv_hdr_print(const struct tools_open_nv_hdr* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nv_hdr_size(void);
+#define TOOLS_OPEN_NV_HDR_SIZE (0x8)
+    void tools_open_nv_hdr_dump(const struct tools_open_nv_hdr* ptr_struct, FILE* fd);
+    /* nv_hdr_fifth_gen */
+    void tools_open_nv_hdr_fifth_gen_pack(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nv_hdr_fifth_gen_unpack(struct tools_open_nv_hdr_fifth_gen* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int tools_open_nv_hdr_fifth_gen_size(void);
+#define TOOLS_OPEN_NV_HDR_FIFTH_GEN_SIZE (0xc)
+    void tools_open_nv_hdr_fifth_gen_dump(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd);
+    /* pmdio_addr_data */
+    void tools_open_pmdio_addr_data_pack(const struct tools_open_pmdio_addr_data* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_pmdio_addr_data_unpack(struct tools_open_pmdio_addr_data* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_pmdio_addr_data_size(void);
+#define TOOLS_OPEN_PMDIO_ADDR_DATA_SIZE (0x4)
+    void tools_open_pmdio_addr_data_dump(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd);
+    /* sw_info */
+    void tools_open_sw_info_pack(const struct tools_open_sw_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_sw_info_unpack(struct tools_open_sw_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_sw_info_print(const struct tools_open_sw_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_sw_info_size(void);
+#define TOOLS_OPEN_SW_INFO_SIZE (0x20)
+    void tools_open_sw_info_dump(const struct tools_open_sw_info* ptr_struct, FILE* fd);
+    /* timestamp */
+    void tools_open_timestamp_pack(const struct tools_open_timestamp* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_timestamp_unpack(struct tools_open_timestamp* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_timestamp_print(const struct tools_open_timestamp* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_timestamp_size(void);
+#define TOOLS_OPEN_TIMESTAMP_SIZE (0x10)
+    void tools_open_timestamp_dump(const struct tools_open_timestamp* ptr_struct, FILE* fd);
+    /* uint64 */
+    void tools_open_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_uint64_print(const u_int64_t* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_uint64_size(void);
+#define TOOLS_OPEN_UINT64_SIZE (0x8)
+    void tools_open_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
+    /* aux_tlv_header */
+    void tools_open_aux_tlv_header_pack(const struct tools_open_aux_tlv_header* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_aux_tlv_header_unpack(struct tools_open_aux_tlv_header* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_aux_tlv_header_print(const struct tools_open_aux_tlv_header* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_aux_tlv_header_size(void);
+#define TOOLS_OPEN_AUX_TLV_HEADER_SIZE (0x14)
+    void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header* ptr_struct, FILE* fd);
+    /* extended_ib_port_info */
+    void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int tools_open_extended_ib_port_info_size(void);
+#define TOOLS_OPEN_EXTENDED_IB_PORT_INFO_SIZE (0x3c)
+    void tools_open_extended_ib_port_info_dump(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd);
+    /* ib_port_info */
+    void tools_open_ib_port_info_pack(const struct tools_open_ib_port_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_ib_port_info_unpack(struct tools_open_ib_port_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_ib_port_info_print(const struct tools_open_ib_port_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_ib_port_info_size(void);
+#define TOOLS_OPEN_IB_PORT_INFO_SIZE (0x40)
+    void tools_open_ib_port_info_dump(const struct tools_open_ib_port_info* ptr_struct, FILE* fd);
+    /* mcam */
+    void tools_open_mcam_pack(const struct tools_open_mcam* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mcam_unpack(struct tools_open_mcam* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mcam_print(const struct tools_open_mcam* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mcam_size(void);
+#define TOOLS_OPEN_MCAM_SIZE (0x48)
+    void tools_open_mcam_dump(const struct tools_open_mcam* ptr_struct, FILE* fd);
+    /* mfmc */
+    void tools_open_mfmc_pack(const struct tools_open_mfmc* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mfmc_unpack(struct tools_open_mfmc* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mfmc_print(const struct tools_open_mfmc* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mfmc_size(void);
+#define TOOLS_OPEN_MFMC_SIZE (0x1c)
+    void tools_open_mfmc_dump(const struct tools_open_mfmc* ptr_struct, FILE* fd);
+    /* mfpa */
+    void tools_open_mfpa_pack(const struct tools_open_mfpa* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mfpa_unpack(struct tools_open_mfpa* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mfpa_print(const struct tools_open_mfpa* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mfpa_size(void);
+#define TOOLS_OPEN_MFPA_SIZE (0x20)
+    void tools_open_mfpa_dump(const struct tools_open_mfpa* ptr_struct, FILE* fd);
+    /* mgir */
+    void tools_open_mgir_pack(const struct tools_open_mgir* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mgir_unpack(struct tools_open_mgir* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mgir_print(const struct tools_open_mgir* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mgir_size(void);
+#define TOOLS_OPEN_MGIR_SIZE (0x80)
+    void tools_open_mgir_dump(const struct tools_open_mgir* ptr_struct, FILE* fd);
+    /* mgnle */
+    void tools_open_mgnle_pack(const struct tools_open_mgnle* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mgnle_unpack(struct tools_open_mgnle* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mgnle_print(const struct tools_open_mgnle* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mgnle_size(void);
+#define TOOLS_OPEN_MGNLE_SIZE (0xac)
+    void tools_open_mgnle_dump(const struct tools_open_mgnle* ptr_struct, FILE* fd);
+    /* mlock */
+    void tools_open_mlock_pack(const struct tools_open_mlock* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mlock_unpack(struct tools_open_mlock* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mlock_print(const struct tools_open_mlock* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mlock_size(void);
+#define TOOLS_OPEN_MLOCK_SIZE (0x10)
+    void tools_open_mlock_dump(const struct tools_open_mlock* ptr_struct, FILE* fd);
+    /* mnva */
+    void tools_open_mnva_pack(const struct tools_open_mnva* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mnva_unpack(struct tools_open_mnva* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mnva_print(const struct tools_open_mnva* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mnva_size(void);
+#define TOOLS_OPEN_MNVA_SIZE (0x100)
+    void tools_open_mnva_dump(const struct tools_open_mnva* ptr_struct, FILE* fd);
+    /* mnvgn */
+    void tools_open_mnvgn_pack(const struct tools_open_mnvgn* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mnvgn_unpack(struct tools_open_mnvgn* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mnvgn_print(const struct tools_open_mnvgn* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mnvgn_size(void);
+#define TOOLS_OPEN_MNVGN_SIZE (0x9c)
+    void tools_open_mnvgn_dump(const struct tools_open_mnvgn* ptr_struct, FILE* fd);
+    /* mnvi */
+    void tools_open_mnvi_pack(const struct tools_open_mnvi* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mnvi_unpack(struct tools_open_mnvi* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mnvi_print(const struct tools_open_mnvi* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mnvi_size(void);
+#define TOOLS_OPEN_MNVI_SIZE (0x8)
+    void tools_open_mnvi_dump(const struct tools_open_mnvi* ptr_struct, FILE* fd);
+    /* mnvia */
+    void tools_open_mnvia_pack(const struct tools_open_mnvia* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mnvia_unpack(struct tools_open_mnvia* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mnvia_print(const struct tools_open_mnvia* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mnvia_size(void);
+#define TOOLS_OPEN_MNVIA_SIZE (0x8)
+    void tools_open_mnvia_dump(const struct tools_open_mnvia* ptr_struct, FILE* fd);
+    /* mvts */
+    void tools_open_mvts_pack(const struct tools_open_mvts* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mvts_unpack(struct tools_open_mvts* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mvts_print(const struct tools_open_mvts* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mvts_size(void);
+#define TOOLS_OPEN_MVTS_SIZE (0x14)
+    void tools_open_mvts_dump(const struct tools_open_mvts* ptr_struct, FILE* fd);
+    /* node_info */
+    void tools_open_node_info_pack(const struct tools_open_node_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_node_info_unpack(struct tools_open_node_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_node_info_print(const struct tools_open_node_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_node_info_size(void);
+#define TOOLS_OPEN_NODE_INFO_SIZE (0x40)
+    void tools_open_node_info_dump(const struct tools_open_node_info* ptr_struct, FILE* fd);
+    /* nvda */
+    void tools_open_nvda_pack(const struct tools_open_nvda* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nvda_unpack(struct tools_open_nvda* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nvda_print(const struct tools_open_nvda* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nvda_size(void);
+#define TOOLS_OPEN_NVDA_SIZE (0x10c)
+    void tools_open_nvda_dump(const struct tools_open_nvda* ptr_struct, FILE* fd);
+    /* nvdi */
+    void tools_open_nvdi_pack(const struct tools_open_nvdi* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nvdi_unpack(struct tools_open_nvdi* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nvdi_print(const struct tools_open_nvdi* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nvdi_size(void);
+#define TOOLS_OPEN_NVDI_SIZE (0xc)
+    void tools_open_nvdi_dump(const struct tools_open_nvdi* ptr_struct, FILE* fd);
+    /* nvia */
+    void tools_open_nvia_pack(const struct tools_open_nvia* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nvia_unpack(struct tools_open_nvia* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nvia_print(const struct tools_open_nvia* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nvia_size(void);
+#define TOOLS_OPEN_NVIA_SIZE (0x8)
+    void tools_open_nvia_dump(const struct tools_open_nvia* ptr_struct, FILE* fd);
+    /* nvqc */
+    void tools_open_nvqc_pack(const struct tools_open_nvqc* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nvqc_unpack(struct tools_open_nvqc* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nvqc_print(const struct tools_open_nvqc* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nvqc_size(void);
+#define TOOLS_OPEN_NVQC_SIZE (0x8)
+    void tools_open_nvqc_dump(const struct tools_open_nvqc* ptr_struct, FILE* fd);
+    /* nvqgc */
+    void tools_open_nvqgc_pack(const struct tools_open_nvqgc* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nvqgc_unpack(struct tools_open_nvqgc* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nvqgc_print(const struct tools_open_nvqgc* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nvqgc_size(void);
+#define TOOLS_OPEN_NVQGC_SIZE (0x10)
+    void tools_open_nvqgc_dump(const struct tools_open_nvqgc* ptr_struct, FILE* fd);
+    /* pmdic */
+    void tools_open_pmdic_pack(const struct tools_open_pmdic* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_pmdic_unpack(struct tools_open_pmdic* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_pmdic_print(const struct tools_open_pmdic* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_pmdic_size(void);
+#define TOOLS_OPEN_PMDIC_SIZE (0xc)
+    void tools_open_pmdic_dump(const struct tools_open_pmdic* ptr_struct, FILE* fd);
+    /* pmdio */
+    void tools_open_pmdio_pack(const struct tools_open_pmdio* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_pmdio_unpack(struct tools_open_pmdio* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_pmdio_print(const struct tools_open_pmdio* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_pmdio_size(void);
+#define TOOLS_OPEN_PMDIO_SIZE (0x108)
+    void tools_open_pmdio_dump(const struct tools_open_pmdio* ptr_struct, FILE* fd);
+    /* smp_vsp_general_info */
+    void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int tools_open_smp_vsp_general_info_size(void);
+#define TOOLS_OPEN_SMP_VSP_GENERAL_INFO_SIZE (0x40)
+    void tools_open_smp_vsp_general_info_dump(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd);
+    /* aux_data_hdr */
+    void tools_open_aux_data_hdr_pack(const struct tools_open_aux_data_hdr* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_aux_data_hdr_unpack(struct tools_open_aux_data_hdr* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_aux_data_hdr_print(const struct tools_open_aux_data_hdr* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_aux_data_hdr_size(void);
+#define TOOLS_OPEN_AUX_DATA_HDR_SIZE (0x10)
+    void tools_open_aux_data_hdr_dump(const struct tools_open_aux_data_hdr* ptr_struct, FILE* fd);
+    /* aux_tlv */
+    void tools_open_aux_tlv_pack(const struct tools_open_aux_tlv* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_aux_tlv_unpack(struct tools_open_aux_tlv* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_aux_tlv_print(const struct tools_open_aux_tlv* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_aux_tlv_size(void);
+#define TOOLS_OPEN_AUX_TLV_SIZE (0x100)
+    void tools_open_aux_tlv_dump(const struct tools_open_aux_tlv* ptr_struct, FILE* fd);
+    /* bar_size */
+    void tools_open_bar_size_pack(const struct tools_open_bar_size* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_bar_size_unpack(struct tools_open_bar_size* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_bar_size_print(const struct tools_open_bar_size* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_bar_size_size(void);
+#define TOOLS_OPEN_BAR_SIZE_SIZE (0x4)
+    void tools_open_bar_size_dump(const struct tools_open_bar_size* ptr_struct, FILE* fd);
+    /* boot_settings */
+    void tools_open_boot_settings_pack(const struct tools_open_boot_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_boot_settings_unpack(struct tools_open_boot_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_boot_settings_print(const struct tools_open_boot_settings* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_boot_settings_size(void);
+#define TOOLS_OPEN_BOOT_SETTINGS_SIZE (0x4)
+    void tools_open_boot_settings_dump(const struct tools_open_boot_settings* ptr_struct, FILE* fd);
+    /* boot_settings_ext */
+    void tools_open_boot_settings_ext_pack(const struct tools_open_boot_settings_ext* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int tools_open_boot_settings_ext_size(void);
+#define TOOLS_OPEN_BOOT_SETTINGS_EXT_SIZE (0x4)
+    void tools_open_boot_settings_ext_dump(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd);
+    /* common_header */
+    void tools_open_common_header_pack(const struct tools_open_common_header* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_common_header_unpack(struct tools_open_common_header* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_common_header_print(const struct tools_open_common_header* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_common_header_size(void);
+#define TOOLS_OPEN_COMMON_HEADER_SIZE (0x4)
+    void tools_open_common_header_dump(const struct tools_open_common_header* ptr_struct, FILE* fd);
+    /* component_desciptor */
+    void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
+    unsigned int tools_open_component_desciptor_size(void);
+#define TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE (0x10)
+    void tools_open_component_desciptor_dump(const struct tools_open_component_desciptor* ptr_struct, FILE* fd);
+    /* component_ptr */
+    void tools_open_component_ptr_pack(const struct tools_open_component_ptr* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_component_ptr_unpack(struct tools_open_component_ptr* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_component_ptr_print(const struct tools_open_component_ptr* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_component_ptr_size(void);
+#define TOOLS_OPEN_COMPONENT_PTR_SIZE (0x8)
+    void tools_open_component_ptr_dump(const struct tools_open_component_ptr* ptr_struct, FILE* fd);
+    /* external_port */
+    void tools_open_external_port_pack(const struct tools_open_external_port* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_external_port_unpack(struct tools_open_external_port* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_external_port_print(const struct tools_open_external_port* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_external_port_size(void);
+#define TOOLS_OPEN_EXTERNAL_PORT_SIZE (0x8)
+    void tools_open_external_port_dump(const struct tools_open_external_port* ptr_struct, FILE* fd);
+    /* image_info */
+    void tools_open_image_info_pack(const struct tools_open_image_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_image_info_unpack(struct tools_open_image_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_image_info_print(const struct tools_open_image_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_image_info_size(void);
+#define TOOLS_OPEN_IMAGE_INFO_SIZE (0x400)
+    void tools_open_image_info_dump(const struct tools_open_image_info* ptr_struct, FILE* fd);
+    /* infiniband_boot_settings */
+    void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
+    unsigned int tools_open_infiniband_boot_settings_size(void);
+#define TOOLS_OPEN_INFINIBAND_BOOT_SETTINGS_SIZE (0x4)
+    void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                  FILE* fd);
+    /* infiniband_dc_capabilities */
+    void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                    u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                      const u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level);
+    unsigned int tools_open_infiniband_dc_capabilities_size(void);
+#define TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE (0x10)
+    void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                    FILE* fd);
+    /* infiniband_dc_settings */
+    void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                                u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct,
+                                                  const u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level);
+    unsigned int tools_open_infiniband_dc_settings_size(void);
+#define TOOLS_OPEN_INFINIBAND_DC_SETTINGS_SIZE (0x8)
+    void tools_open_infiniband_dc_settings_dump(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd);
+    /* iscsi_settings */
+    void tools_open_iscsi_settings_pack(const struct tools_open_iscsi_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_iscsi_settings_unpack(struct tools_open_iscsi_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_iscsi_settings_print(const struct tools_open_iscsi_settings* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_iscsi_settings_size(void);
+#define TOOLS_OPEN_ISCSI_SETTINGS_SIZE (0xc)
+    void tools_open_iscsi_settings_dump(const struct tools_open_iscsi_settings* ptr_struct, FILE* fd);
+    /* lldp_client_settings */
+    void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int tools_open_lldp_client_settings_size(void);
+#define TOOLS_OPEN_LLDP_CLIENT_SETTINGS_SIZE (0xc)
+    void tools_open_lldp_client_settings_dump(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd);
+    /* lldp_nb */
+    void tools_open_lldp_nb_pack(const struct tools_open_lldp_nb* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_lldp_nb_unpack(struct tools_open_lldp_nb* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_lldp_nb_print(const struct tools_open_lldp_nb* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_lldp_nb_size(void);
+#define TOOLS_OPEN_LLDP_NB_SIZE (0x1c)
+    void tools_open_lldp_nb_dump(const struct tools_open_lldp_nb* ptr_struct, FILE* fd);
+    /* lldp_nb_cap */
+    void tools_open_lldp_nb_cap_pack(const struct tools_open_lldp_nb_cap* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_lldp_nb_cap_unpack(struct tools_open_lldp_nb_cap* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_lldp_nb_cap_print(const struct tools_open_lldp_nb_cap* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_lldp_nb_cap_size(void);
+#define TOOLS_OPEN_LLDP_NB_CAP_SIZE (0xc)
+    void tools_open_lldp_nb_cap_dump(const struct tools_open_lldp_nb_cap* ptr_struct, FILE* fd);
+    /* lldp_nb_dcbx */
+    void tools_open_lldp_nb_dcbx_pack(const struct tools_open_lldp_nb_dcbx* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_lldp_nb_dcbx_unpack(struct tools_open_lldp_nb_dcbx* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_lldp_nb_dcbx_print(const struct tools_open_lldp_nb_dcbx* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_lldp_nb_dcbx_size(void);
+#define TOOLS_OPEN_LLDP_NB_DCBX_SIZE (0x4)
+    void tools_open_lldp_nb_dcbx_dump(const struct tools_open_lldp_nb_dcbx* ptr_struct, FILE* fd);
+    /* mfg_info */
+    void tools_open_mfg_info_pack(const struct tools_open_mfg_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mfg_info_unpack(struct tools_open_mfg_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mfg_info_print(const struct tools_open_mfg_info* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mfg_info_size(void);
+#define TOOLS_OPEN_MFG_INFO_SIZE (0x140)
+    void tools_open_mfg_info_dump(const struct tools_open_mfg_info* ptr_struct, FILE* fd);
+    /* mnv_cfg */
+    void tools_open_mnv_cfg_pack(const union tools_open_mnv_cfg* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mnv_cfg_unpack(union tools_open_mnv_cfg* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mnv_cfg_print(const union tools_open_mnv_cfg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mnv_cfg_size(void);
+#define TOOLS_OPEN_MNV_CFG_SIZE (0x16c)
+    void tools_open_mnv_cfg_dump(const union tools_open_mnv_cfg* ptr_struct, FILE* fd);
+    /* multi_part */
+    void tools_open_multi_part_pack(const struct tools_open_multi_part* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_multi_part_unpack(struct tools_open_multi_part* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_multi_part_print(const struct tools_open_multi_part* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_multi_part_size(void);
+#define TOOLS_OPEN_MULTI_PART_SIZE (0x4)
+    void tools_open_multi_part_dump(const struct tools_open_multi_part* ptr_struct, FILE* fd);
+    /* nv_base_mac_guid */
+    void tools_open_nv_base_mac_guid_pack(const struct tools_open_nv_base_mac_guid* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_unpack(struct tools_open_nv_base_mac_guid* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int tools_open_nv_base_mac_guid_size(void);
+#define TOOLS_OPEN_NV_BASE_MAC_GUID_SIZE (0x10)
+    void tools_open_nv_base_mac_guid_dump(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd);
+    /* nv_base_mac_guid_cap */
+    void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
+    unsigned int tools_open_nv_base_mac_guid_cap_size(void);
+#define TOOLS_OPEN_NV_BASE_MAC_GUID_CAP_SIZE (0x8)
+    void tools_open_nv_base_mac_guid_cap_dump(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd);
+    /* nv_cx3_global_conf */
+    void tools_open_nv_cx3_global_conf_pack(const struct tools_open_nv_cx3_global_conf* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf* ptr_struct,
+                                              const u_int8_t* ptr_buff);
+    void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level);
+    unsigned int tools_open_nv_cx3_global_conf_size(void);
+#define TOOLS_OPEN_NV_CX3_GLOBAL_CONF_SIZE (0x20)
+    void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd);
+    /* option_rom_capability */
+    void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int tools_open_option_rom_capability_size(void);
+#define TOOLS_OPEN_OPTION_ROM_CAPABILITY_SIZE (0x4)
+    void tools_open_option_rom_capability_dump(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd);
+    /* package_descriptor */
+    void tools_open_package_descriptor_pack(const struct tools_open_package_descriptor* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor* ptr_struct,
+                                              const u_int8_t* ptr_buff);
+    void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level);
+    unsigned int tools_open_package_descriptor_size(void);
+#define TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE (0x1c)
+    void tools_open_package_descriptor_dump(const struct tools_open_package_descriptor* ptr_struct, FILE* fd);
+    /* pci_capabilities */
+    void tools_open_pci_capabilities_pack(const struct tools_open_pci_capabilities* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_pci_capabilities_unpack(struct tools_open_pci_capabilities* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int tools_open_pci_capabilities_size(void);
+#define TOOLS_OPEN_PCI_CAPABILITIES_SIZE (0x14)
+    void tools_open_pci_capabilities_dump(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd);
+    /* pci_configuration */
+    void tools_open_pci_configuration_pack(const struct tools_open_pci_configuration* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int tools_open_pci_configuration_size(void);
+#define TOOLS_OPEN_PCI_CONFIGURATION_SIZE (0xc)
+    void tools_open_pci_configuration_dump(const struct tools_open_pci_configuration* ptr_struct, FILE* fd);
+    /* phy_reg */
+    void tools_open_phy_reg_pack(const union tools_open_phy_reg* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_phy_reg_unpack(union tools_open_phy_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_phy_reg_print(const union tools_open_phy_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_phy_reg_size(void);
+#define TOOLS_OPEN_PHY_REG_SIZE (0x108)
+    void tools_open_phy_reg_dump(const union tools_open_phy_reg* ptr_struct, FILE* fd);
+    /* port_boot_state */
+    void tools_open_port_boot_state_pack(const struct tools_open_port_boot_state* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_port_boot_state_unpack(struct tools_open_port_boot_state* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      tools_open_port_boot_state_print(const struct tools_open_port_boot_state* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_port_boot_state_size(void);
+#define TOOLS_OPEN_PORT_BOOT_STATE_SIZE (0x4)
+    void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state* ptr_struct, FILE* fd);
+    /* preboot_boot_settings */
+    void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
+    unsigned int tools_open_preboot_boot_settings_size(void);
+#define TOOLS_OPEN_PREBOOT_BOOT_SETTINGS_SIZE (0x4)
+    void tools_open_preboot_boot_settings_dump(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd);
+    /* preboot_flow_ctrl */
+    void tools_open_preboot_flow_ctrl_pack(const struct tools_open_preboot_flow_ctrl* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int tools_open_preboot_flow_ctrl_size(void);
+#define TOOLS_OPEN_PREBOOT_FLOW_CTRL_SIZE (0x4)
+    void tools_open_preboot_flow_ctrl_dump(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd);
+    /* qos */
+    void tools_open_qos_pack(const struct tools_open_qos* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_qos_unpack(struct tools_open_qos* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_qos_print(const struct tools_open_qos* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_qos_size(void);
+#define TOOLS_OPEN_QOS_SIZE (0xc)
+    void tools_open_qos_dump(const struct tools_open_qos* ptr_struct, FILE* fd);
+    /* qos_cap */
+    void tools_open_qos_cap_pack(const struct tools_open_qos_cap* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_qos_cap_unpack(struct tools_open_qos_cap* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_qos_cap_print(const struct tools_open_qos_cap* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_qos_cap_size(void);
+#define TOOLS_OPEN_QOS_CAP_SIZE (0xc)
+    void tools_open_qos_cap_dump(const struct tools_open_qos_cap* ptr_struct, FILE* fd);
+    /* query_def_params_global */
+    void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct,
+                                                 u_int8_t* ptr_buff);
+    void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct,
+                                                   const u_int8_t* ptr_buff);
+    void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct,
+                                                  FILE* fd,
+                                                  int indent_level);
+    unsigned int tools_open_query_def_params_global_size(void);
+#define TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE (0x14)
+    void tools_open_query_def_params_global_dump(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd);
+    /* query_def_params_per_port */
+    void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                   u_int8_t* ptr_buff);
+    void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct,
+                                                     const u_int8_t* ptr_buff);
+    void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                    FILE* fd,
+                                                    int indent_level);
+    unsigned int tools_open_query_def_params_per_port_size(void);
+#define TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE (0x1c)
+    void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                   FILE* fd);
+    /* roce_cc */
+    void tools_open_roce_cc_pack(const struct tools_open_roce_cc* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_roce_cc_unpack(struct tools_open_roce_cc* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_roce_cc_print(const struct tools_open_roce_cc* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_roce_cc_size(void);
+#define TOOLS_OPEN_ROCE_CC_SIZE (0x4)
+    void tools_open_roce_cc_dump(const struct tools_open_roce_cc* ptr_struct, FILE* fd);
+    /* roce_cc_ecn */
+    void tools_open_roce_cc_ecn_pack(const struct tools_open_roce_cc_ecn* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_roce_cc_ecn_unpack(struct tools_open_roce_cc_ecn* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_roce_cc_ecn_print(const struct tools_open_roce_cc_ecn* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_roce_cc_ecn_size(void);
+#define TOOLS_OPEN_ROCE_CC_ECN_SIZE (0x44)
+    void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn* ptr_struct, FILE* fd);
+    /* roce_v_1_5_next_protocol */
+    void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
+    unsigned int tools_open_roce_v_1_5_next_protocol_size(void);
+#define TOOLS_OPEN_ROCE_V_1_5_NEXT_PROTOCOL_SIZE (0x4)
+    void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                  FILE* fd);
+    /* smp_data */
+    void tools_open_smp_data_pack(const union tools_open_smp_data* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_smp_data_unpack(union tools_open_smp_data* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_smp_data_print(const union tools_open_smp_data* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_smp_data_size(void);
+#define TOOLS_OPEN_SMP_DATA_SIZE (0x40)
+    void tools_open_smp_data_dump(const union tools_open_smp_data* ptr_struct, FILE* fd);
+    /* sriov */
+    void tools_open_sriov_pack(const struct tools_open_sriov* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_sriov_unpack(struct tools_open_sriov* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_sriov_print(const struct tools_open_sriov* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_sriov_size(void);
+#define TOOLS_OPEN_SRIOV_SIZE (0x4)
+    void tools_open_sriov_dump(const struct tools_open_sriov* ptr_struct, FILE* fd);
+    /* tpt_capabilities */
+    void tools_open_tpt_capabilities_pack(const struct tools_open_tpt_capabilities* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_tpt_capabilities_unpack(struct tools_open_tpt_capabilities* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int tools_open_tpt_capabilities_size(void);
+#define TOOLS_OPEN_TPT_CAPABILITIES_SIZE (0x4)
+    void tools_open_tpt_capabilities_dump(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd);
+    /* tpt_configuration */
+    void tools_open_tpt_configuration_pack(const struct tools_open_tpt_configuration* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
+    unsigned int tools_open_tpt_configuration_size(void);
+#define TOOLS_OPEN_TPT_CONFIGURATION_SIZE (0x4)
+    void tools_open_tpt_configuration_dump(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd);
+    /* version */
+    void tools_open_version_pack(const struct tools_open_version* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_version_unpack(struct tools_open_version* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_version_print(const struct tools_open_version* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_version_size(void);
+#define TOOLS_OPEN_VERSION_SIZE (0xc)
+    void tools_open_version_dump(const struct tools_open_version* ptr_struct, FILE* fd);
+    /* vpi_settings */
+    void tools_open_vpi_settings_pack(const struct tools_open_vpi_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_vpi_settings_unpack(struct tools_open_vpi_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_vpi_settings_print(const struct tools_open_vpi_settings* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_vpi_settings_size(void);
+#define TOOLS_OPEN_VPI_SETTINGS_SIZE (0x4)
+    void tools_open_vpi_settings_dump(const struct tools_open_vpi_settings* ptr_struct, FILE* fd);
+    /* wol */
+    void tools_open_wol_pack(const struct tools_open_wol* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_wol_unpack(struct tools_open_wol* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_wol_print(const struct tools_open_wol* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_wol_size(void);
+#define TOOLS_OPEN_WOL_SIZE (0x8)
+    void tools_open_wol_dump(const struct tools_open_wol* ptr_struct, FILE* fd);
+    /* IbMads */
+    void tools_open_IbMads_pack(const union tools_open_IbMads* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_IbMads_unpack(union tools_open_IbMads* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_IbMads_print(const union tools_open_IbMads* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_IbMads_size(void);
+#define TOOLS_OPEN_IBMADS_SIZE (0xc0)
+    void tools_open_IbMads_dump(const union tools_open_IbMads* ptr_struct, FILE* fd);
+    /* access_registers */
+    void tools_open_access_registers_pack(const union tools_open_access_registers* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_access_registers_unpack(union tools_open_access_registers* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_access_registers_print(const union tools_open_access_registers* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
+    unsigned int tools_open_access_registers_size(void);
+#define TOOLS_OPEN_ACCESS_REGISTERS_SIZE (0x200)
+    void tools_open_access_registers_dump(const union tools_open_access_registers* ptr_struct, FILE* fd);
+    /* aux_img_data */
+    void tools_open_aux_img_data_pack(const union tools_open_aux_img_data* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_aux_img_data_unpack(union tools_open_aux_img_data* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_aux_img_data_print(const union tools_open_aux_img_data* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_aux_img_data_size(void);
+#define TOOLS_OPEN_AUX_IMG_DATA_SIZE (0x100)
+    void tools_open_aux_img_data_dump(const union tools_open_aux_img_data* ptr_struct, FILE* fd);
+    /* hcr_cmds */
+    void tools_open_hcr_cmds_pack(const union tools_open_hcr_cmds* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_hcr_cmds_unpack(union tools_open_hcr_cmds* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_hcr_cmds_print(const union tools_open_hcr_cmds* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_hcr_cmds_size(void);
+#define TOOLS_OPEN_HCR_CMDS_SIZE (0x108)
+    void tools_open_hcr_cmds_dump(const union tools_open_hcr_cmds* ptr_struct, FILE* fd);
+    /* mcdd_descriptor */
+    void tools_open_mcdd_descriptor_pack(const struct tools_open_mcdd_descriptor* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mcdd_descriptor_unpack(struct tools_open_mcdd_descriptor* ptr_struct, const u_int8_t* ptr_buff);
+    void
+      tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mcdd_descriptor_size(void);
+#define TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE (0x24)
+    void tools_open_mcdd_descriptor_dump(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd);
+    /* mcdd_reg */
+    void tools_open_mcdd_reg_pack(const struct tools_open_mcdd_reg* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mcdd_reg_unpack(struct tools_open_mcdd_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mcdd_reg_print(const struct tools_open_mcdd_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mcdd_reg_size(void);
+#define TOOLS_OPEN_MCDD_REG_SIZE (0x20)
+    void tools_open_mcdd_reg_dump(const struct tools_open_mcdd_reg* ptr_struct, FILE* fd);
+    /* mfa2 */
+    void tools_open_mfa2_pack(const union tools_open_mfa2* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mfa2_unpack(union tools_open_mfa2* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mfa2_print(const union tools_open_mfa2* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mfa2_size(void);
+#define TOOLS_OPEN_MFA2_SIZE (0x20)
+    void tools_open_mfa2_dump(const union tools_open_mfa2* ptr_struct, FILE* fd);
+    /* mirc_reg */
+    void tools_open_mirc_reg_pack(const struct tools_open_mirc_reg* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_mirc_reg_unpack(struct tools_open_mirc_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_mirc_reg_print(const struct tools_open_mirc_reg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_mirc_reg_size(void);
+#define TOOLS_OPEN_MIRC_REG_SIZE (0x8)
+    void tools_open_mirc_reg_dump(const struct tools_open_mirc_reg* ptr_struct, FILE* fd);
+    /* misc_structs */
+    void tools_open_misc_structs_pack(const union tools_open_misc_structs* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_misc_structs_unpack(union tools_open_misc_structs* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_misc_structs_print(const union tools_open_misc_structs* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_misc_structs_size(void);
+#define TOOLS_OPEN_MISC_STRUCTS_SIZE (0x400)
+    void tools_open_misc_structs_dump(const union tools_open_misc_structs* ptr_struct, FILE* fd);
+    /* nv_cfg */
+    void tools_open_nv_cfg_pack(const union tools_open_nv_cfg* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nv_cfg_unpack(union tools_open_nv_cfg* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nv_cfg_print(const union tools_open_nv_cfg* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_nv_cfg_size(void);
+#define TOOLS_OPEN_NV_CFG_SIZE (0x100)
+    void tools_open_nv_cfg_dump(const union tools_open_nv_cfg* ptr_struct, FILE* fd);
+    /* tools_open */
+    void tools_open_tools_open_pack(const union tools_open_tools_open* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_tools_open_unpack(union tools_open_tools_open* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_tools_open_print(const union tools_open_tools_open* ptr_struct, FILE* fd, int indent_level);
+    unsigned int tools_open_tools_open_size(void);
+#define TOOLS_OPEN_TOOLS_OPEN_SIZE (0x100000)
+    void tools_open_tools_open_dump(const union tools_open_tools_open* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_res_mgmt/tools_res_mgmt.c b/tools_res_mgmt/tools_res_mgmt.c
index 610eff96..f697b794 100644
--- a/tools_res_mgmt/tools_res_mgmt.c
+++ b/tools_res_mgmt/tools_res_mgmt.c
@@ -53,16 +53,13 @@
 
 #define VSEC_SEM_NUM 10
 #define HW_SEM_NUM VSEC_SEM_NUM
-static const char *status_to_str[] =
-{
-    "Ok",
-    "Resource is busy",
-    "Tools resource management interface not available",
-    "Device not supported",
-    "Resource not supported",
-    "CR-Space access error",
-    "Memory allocation failed"
-};
+static const char* status_to_str[] = {"Ok",
+                                      "Resource is busy",
+                                      "Tools resource management interface not available",
+                                      "Device not supported",
+                                      "Resource not supported",
+                                      "CR-Space access error",
+                                      "Memory allocation failed"};
 
 struct device_sem_info
 {
@@ -76,188 +73,195 @@ static u_int32_t g_vsec_sem_addr[VSEC_SEM_NUM] = {0x0, 0x10};
 #define HW_SEM_ADDR_MASK 0xf
 
 static struct device_sem_info g_dev_sem_info_db[] = {
-    {
-        DeviceConnectX2,                    // dev_id
-        {0xf03bc},                          // hw_sem_addr
-        0,                                  // vsec_sem_supported
-    },
-    {
-        DeviceConnectX3,                    // dev_id
-        {0xf03bc, 0xf03a0},                 // hw_sem_addr
-        0,                                  // vsec_sem_supported
-    },
-    {
-        DeviceConnectX3Pro,                 // dev_id
-        {0xf03bc, 0xf03a0},                 // hw_sem_addr
-        0,                                  // vsec_sem_supported
-    },
-    {
-        DeviceInfiniScaleIV,                // dev_id
-        {0},                                // hw_sem_addr
-        0,                                  // vsec_sem_supported
-    },
-    {
-        DeviceSwitchX,                      // dev_id
-        {0},                                // hw_sem_addr
-        0,                                  // vsec_sem_supported
-    },
-    {
-        DeviceConnectIB,         // dev_id
-        {0xe27f8},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX4,         // dev_id
-        {0xe250c},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceSwitchIB,          // dev_id
-        {0xa24f8},               // hw_sem_addr
-        0,                       // vsec_sem_supported
-    },
-    {
-        DeviceSpectrum,          // dev_id
-        {0xa24f8},               // hw_sem_addr
-        0,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX4LX,         // dev_id
-        {0xe250c},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceSwitchIB2,          // dev_id
-        {0xa24f8},               // hw_sem_addr
-        0,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX5,         // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceBlueField,         // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceBlueField2,        // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceBlueField3,        // dev_id
-        {0xe5660},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceQuantum,          // dev_id
-        {0xa68f8},               // hw_sem_addr
-        0,                       // vsec_sem_supported
-    },
-    {
-        DeviceSpectrum2,          // dev_id
-        {0xa68f8},               // hw_sem_addr
-        0,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX6,         // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX6DX,       // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX6LX,       // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceConnectX7,         // dev_id
-        {0xe5660},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceGearBox,           // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceGearBoxManager,    // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceSpectrum3,         // dev_id
-        {0xa68f8},               // hw_sem_addr
-        0,                       // vsec_sem_supported
-    },
-    {
-        DeviceQuantum2,          // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceSpectrum4,         // dev_id
-        {0xa68f8},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
-    {
-        DeviceAbirGearBox,       // dev_id
-        {0xe74e0},               // hw_sem_addr
-        1,                       // vsec_sem_supported
-    },
+  {
+    DeviceConnectX2, // dev_id
+    {0xf03bc},       // hw_sem_addr
+    0,               // vsec_sem_supported
+  },
+  {
+    DeviceConnectX3,    // dev_id
+    {0xf03bc, 0xf03a0}, // hw_sem_addr
+    0,                  // vsec_sem_supported
+  },
+  {
+    DeviceConnectX3Pro, // dev_id
+    {0xf03bc, 0xf03a0}, // hw_sem_addr
+    0,                  // vsec_sem_supported
+  },
+  {
+    DeviceInfiniScaleIV, // dev_id
+    {0},                 // hw_sem_addr
+    0,                   // vsec_sem_supported
+  },
+  {
+    DeviceSwitchX, // dev_id
+    {0},           // hw_sem_addr
+    0,             // vsec_sem_supported
+  },
+  {
+    DeviceConnectIB, // dev_id
+    {0xe27f8},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceConnectX4, // dev_id
+    {0xe250c},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceSwitchIB, // dev_id
+    {0xa24f8},      // hw_sem_addr
+    0,              // vsec_sem_supported
+  },
+  {
+    DeviceSpectrum, // dev_id
+    {0xa24f8},      // hw_sem_addr
+    0,              // vsec_sem_supported
+  },
+  {
+    DeviceConnectX4LX, // dev_id
+    {0xe250c},         // hw_sem_addr
+    1,                 // vsec_sem_supported
+  },
+  {
+    DeviceSwitchIB2, // dev_id
+    {0xa24f8},       // hw_sem_addr
+    0,               // vsec_sem_supported
+  },
+  {
+    DeviceConnectX5, // dev_id
+    {0xe74e0},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceBlueField, // dev_id
+    {0xe74e0},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceBlueField2, // dev_id
+    {0xe74e0},        // hw_sem_addr
+    1,                // vsec_sem_supported
+  },
+  {
+    DeviceBlueField3, // dev_id
+    {0xe5660},        // hw_sem_addr
+    1,                // vsec_sem_supported
+  },
+  {
+    DeviceQuantum, // dev_id
+    {0xa68f8},     // hw_sem_addr
+    0,             // vsec_sem_supported
+  },
+  {
+    DeviceSpectrum2, // dev_id
+    {0xa68f8},       // hw_sem_addr
+    0,               // vsec_sem_supported
+  },
+  {
+    DeviceConnectX6, // dev_id
+    {0xe74e0},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceConnectX6DX, // dev_id
+    {0xe74e0},         // hw_sem_addr
+    1,                 // vsec_sem_supported
+  },
+  {
+    DeviceConnectX6LX, // dev_id
+    {0xe74e0},         // hw_sem_addr
+    1,                 // vsec_sem_supported
+  },
+  {
+    DeviceConnectX7, // dev_id
+    {0xe5660},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceGearBox, // dev_id
+    {0xe74e0},     // hw_sem_addr
+    1,             // vsec_sem_supported
+  },
+  {
+    DeviceGearBoxManager, // dev_id
+    {0xe74e0},            // hw_sem_addr
+    1,                    // vsec_sem_supported
+  },
+  {
+    DeviceSpectrum3, // dev_id
+    {0xa68f8},       // hw_sem_addr
+    0,               // vsec_sem_supported
+  },
+  {
+    DeviceQuantum2, // dev_id
+    {0xe74e0},      // hw_sem_addr
+    1,              // vsec_sem_supported
+  },
+  {
+    DeviceSpectrum4, // dev_id
+    {0xa68f8},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
+  {
+    DeviceAbirGearBox, // dev_id
+    {0xe74e0},         // hw_sem_addr
+    1,                 // vsec_sem_supported
+  },
 };
 
 #define MAX_SEMAPHORE_ADDRES 8
-#define FLASH_SEM_SLEEP      500
+#define FLASH_SEM_SLEEP 500
 
-
-struct mad_lock_info {
+struct mad_lock_info
+{
     u_int32_t lock_key;
     u_int32_t lease_time_ms;
     tt_ctx_t start_time;
 };
 
-struct trm_t {
-    mfile *mf;
-    const struct device_sem_info *dev_sem_info;
+struct trm_t
+{
+    mfile* mf;
+    const struct device_sem_info* dev_sem_info;
     struct mad_lock_info mad_lock[MAX_SEMAPHORE_ADDRES];
     int ib_semaphore_lock_is_supported;
 };
 
 /************************************
-* Function: lock_hw_semaphore
-************************************/
-static trm_sts lock_hw_semaphore(mfile *mf, u_int32_t addr, unsigned int max_retries, int sleep_t)
+ * Function: lock_hw_semaphore
+ ************************************/
+static trm_sts lock_hw_semaphore(mfile* mf, u_int32_t addr, unsigned int max_retries, int sleep_t)
 {
     u_int32_t val = 0;
     unsigned int cnt = 0;
     int rc;
 
-    while (((rc = mread4(mf, addr, &val)) == 4) && val == 1 && cnt < max_retries) {
+    while (((rc = mread4(mf, addr, &val)) == 4) && val == 1 && cnt < max_retries)
+    {
         cnt++;
         int sleep_time = sleep_t != 0 ? sleep_t : ((rand() % 5) + 1);
         msleep(sleep_time);
     }
 
-    if (rc != 4) {
+    if (rc != 4)
+    {
         return TRM_STS_CR_ACCESS_ERR;
-    } else if (val == 0) {
+    }
+    else if (val == 0)
+    {
         return TRM_STS_OK;
-    } else {
+    }
+    else
+    {
         return TRM_STS_RES_BUSY;
     }
 }
 
 /************************************
-* Function: unlock_hw_semaphore
-************************************/
-static trm_sts unlock_hw_semaphore(mfile *mf, u_int32_t addr)
+ * Function: unlock_hw_semaphore
+ ************************************/
+static trm_sts unlock_hw_semaphore(mfile* mf, u_int32_t addr)
 {
     int rc = mwrite4(mf, addr, 0) == 4 ? TRM_STS_OK : TRM_STS_CR_ACCESS_ERR;
     // give up the rest of the time slice
@@ -266,30 +270,36 @@ static trm_sts unlock_hw_semaphore(mfile *mf, u_int32_t addr)
 }
 
 /************************************
-* Function: lock_icommand_gateway_semaphore()
-************************************/
-static trm_sts lock_icommand_gateway_semaphore(mfile *mf, u_int32_t addr, unsigned int max_retries)
+ * Function: lock_icommand_gateway_semaphore()
+ ************************************/
+static trm_sts lock_icommand_gateway_semaphore(mfile* mf, u_int32_t addr, unsigned int max_retries)
 {
     static u_int32_t pid = 0;
     u_int32_t read_val = 0;
     unsigned cnt = 0;
 
-    if (!pid) {
+    if (!pid)
+    {
         pid = getpid();
     }
-    do {    // loop while the semaphore is taken by someone else
-        if (cnt++ > max_retries) {
+    do
+    { // loop while the semaphore is taken by someone else
+        if (cnt++ > max_retries)
+        {
             return TRM_STS_RES_BUSY;
         }
-        //write pid to semaphore
-        if(MWRITE4_SEMAPHORE(mf, addr, pid)) {
+        // write pid to semaphore
+        if (MWRITE4_SEMAPHORE(mf, addr, pid))
+        {
             return TRM_STS_CR_ACCESS_ERR;
         }
         // Read back
-        if(MREAD4_SEMAPHORE(mf, addr, &read_val)) {
+        if (MREAD4_SEMAPHORE(mf, addr, &read_val))
+        {
             return TRM_STS_CR_ACCESS_ERR;
         }
-        if (read_val == pid) {
+        if (read_val == pid)
+        {
             break;
         }
         msleep(((rand() % 5) + 1));
@@ -298,11 +308,12 @@ static trm_sts lock_icommand_gateway_semaphore(mfile *mf, u_int32_t addr, unsign
 }
 
 /************************************
-* Function: unlock_icommand_gateway_semaphore()
-************************************/
-static trm_sts unlock_icommand_gateway_semaphore(mfile *mf, u_int32_t addr)
+ * Function: unlock_icommand_gateway_semaphore()
+ ************************************/
+static trm_sts unlock_icommand_gateway_semaphore(mfile* mf, u_int32_t addr)
 {
-    if(MWRITE4_SEMAPHORE(mf, addr, 0)) {
+    if (MWRITE4_SEMAPHORE(mf, addr, 0))
+    {
         return TRM_STS_CR_ACCESS_ERR;
     }
     return TRM_STS_OK;
@@ -310,8 +321,8 @@ static trm_sts unlock_icommand_gateway_semaphore(mfile *mf, u_int32_t addr)
 
 #if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
 /************************************
-* Function: release_vs_mad_semaphore()
-************************************/
+ * Function: release_vs_mad_semaphore()
+ ************************************/
 #define GET_LEASE_TIME_MS(is_leaseable, lease_time_exp) ((is_leaseable) ? (50 * (1 << (lease_time_exp))) : 0)
 
 static trm_sts release_vs_mad_semaphore(trm_ctx trm, trm_resourse resource)
@@ -321,19 +332,27 @@ static trm_sts release_vs_mad_semaphore(trm_ctx trm, trm_resourse resource)
     int is_leaseable = 0;
 
     int rc = TRM_STS_OK;
-    if (!trm->mad_lock[resource].lock_key) {
+    if (!trm->mad_lock[resource].lock_key)
+    {
         return TRM_STS_OK;
     }
-    if (trm->ib_semaphore_lock_is_supported == 0) {
+    if (trm->ib_semaphore_lock_is_supported == 0)
+    {
         return TRM_STS_RES_NOT_SUPPORTED;
     }
-    rc = mib_semaphore_lock_vs_mad(trm->mf, SMP_SEM_RELEASE, g_vsec_sem_addr[resource],
-                                   trm->mad_lock[resource].lock_key, &lock_key, &is_leaseable, &new_lease_exponent, SEM_LOCK_SET);
-    if (rc == (int)ME_MAD_BUSY) {
+    rc =
+      mib_semaphore_lock_vs_mad(trm->mf, SMP_SEM_RELEASE, g_vsec_sem_addr[resource], trm->mad_lock[resource].lock_key,
+                                &lock_key, &is_leaseable, &new_lease_exponent, SEM_LOCK_SET);
+    if (rc == (int)ME_MAD_BUSY)
+    {
         return TRM_STS_RES_BUSY;
-    } else if (rc) {
+    }
+    else if (rc)
+    {
         return TRM_STS_RES_NOT_SUPPORTED;
-    } else if (lock_key != 0) {
+    }
+    else if (lock_key != 0)
+    {
         return TRM_STS_CR_ACCESS_ERR;
     }
     trm->mad_lock[resource].lock_key = 0;
@@ -342,9 +361,8 @@ static trm_sts release_vs_mad_semaphore(trm_ctx trm, trm_resourse resource)
 }
 
 /************************************
-* Function: lock_vs_mad_semaphore()
-************************************/
-
+ * Function: lock_vs_mad_semaphore()
+ ************************************/
 
 static trm_sts lock_vs_mad_semaphore(trm_ctx trm, trm_resourse resource, unsigned int max_retries)
 {
@@ -355,33 +373,41 @@ static trm_sts lock_vs_mad_semaphore(trm_ctx trm, trm_resourse resource, unsigne
     int rc = TRM_STS_OK;
     unsigned int cnt = 0;
 
-    if (trm->ib_semaphore_lock_is_supported == 0) {
+    if (trm->ib_semaphore_lock_is_supported == 0)
+    {
         return TRM_STS_RES_NOT_SUPPORTED;
     }
 
     // check if we got lock_key
-    if (trm->mad_lock[resource].lock_key) {
+    if (trm->mad_lock[resource].lock_key)
+    {
         // TODO: use threads to extend lock every ~20 seconds untill releasing the lock
         // check if extension is needed
-        if (trm->mad_lock[resource].lease_time_ms == 0) {
+        if (trm->mad_lock[resource].lease_time_ms == 0)
+        {
             // no need to extend lease is untill device reboot
             return TRM_STS_OK;
         }
 
         tt_get_time(&curr_time);
         double diff = tt_diff_in_ms(trm->mad_lock[resource].start_time, curr_time);
-        if (diff <= trm->mad_lock[resource].lease_time_ms * 0.6) {
+        if (diff <= trm->mad_lock[resource].lease_time_ms * 0.6)
+        {
             return TRM_STS_OK;
         }
         // extension needed try to extend
         rc = mib_semaphore_lock_vs_mad(trm->mf, SMP_SEM_EXTEND, g_vsec_sem_addr[resource],
-                                       trm->mad_lock[resource].lock_key, &new_lock_key, &is_leaseable, &new_lease_exponent, SEM_LOCK_SET);
-        if (rc == ME_OK && new_lock_key == trm->mad_lock[resource].lock_key) {
+                                       trm->mad_lock[resource].lock_key, &new_lock_key, &is_leaseable,
+                                       &new_lease_exponent, SEM_LOCK_SET);
+        if (rc == ME_OK && new_lock_key == trm->mad_lock[resource].lock_key)
+        {
             // extend OK
             trm->mad_lock[resource].lease_time_ms = GET_LEASE_TIME_MS(is_leaseable, new_lease_exponent);
             trm->mad_lock[resource].start_time = curr_time;
             return TRM_STS_OK;
-        } else {
+        }
+        else
+        {
             // extend failed try to re-lock the semaphore
             trm->mad_lock[resource].lock_key = 0;
             trm->mad_lock[resource].lease_time_ms = 0;
@@ -389,18 +415,22 @@ static trm_sts lock_vs_mad_semaphore(trm_ctx trm, trm_resourse resource, unsigne
         }
     }
     // if not or extend failed try to lock
-    do {
-        if (cnt++ > max_retries) {
+    do
+    {
+        if (cnt++ > max_retries)
+        {
             return TRM_STS_RES_BUSY;
         }
-        rc = mib_semaphore_lock_vs_mad(trm->mf, SMP_SEM_LOCK, g_vsec_sem_addr[resource],
-                                       0, &new_lock_key, &is_leaseable, &new_lease_exponent, SEM_LOCK_SET);
-        if (rc == (int)ME_MAD_BUSY || new_lock_key == 0) {
+        rc = mib_semaphore_lock_vs_mad(trm->mf, SMP_SEM_LOCK, g_vsec_sem_addr[resource], 0, &new_lock_key,
+                                       &is_leaseable, &new_lease_exponent, SEM_LOCK_SET);
+        if (rc == (int)ME_MAD_BUSY || new_lock_key == 0)
+        {
             msleep(((rand() % 5) + 1));
         }
     } while (rc == (int)ME_MAD_BUSY || new_lock_key == 0);
 
-    if (rc) {
+    if (rc)
+    {
         return TRM_STS_RES_NOT_SUPPORTED;
     }
     trm->mad_lock[resource].lock_key = new_lock_key;
@@ -410,13 +440,15 @@ static trm_sts lock_vs_mad_semaphore(trm_ctx trm, trm_resourse resource, unsigne
 }
 #endif
 /************************************
-* Function: get_device_sem_info
-************************************/
+ * Function: get_device_sem_info
+ ************************************/
 static struct device_sem_info* get_device_sem_info(dm_dev_id_t dev_id)
 {
     size_t i;
-    for (i = 0; i < sizeof(g_dev_sem_info_db) / sizeof(g_dev_sem_info_db[0]); i++) {
-        if (g_dev_sem_info_db[i].dev_id == dev_id) {
+    for (i = 0; i < sizeof(g_dev_sem_info_db) / sizeof(g_dev_sem_info_db[0]); i++)
+    {
+        if (g_dev_sem_info_db[i].dev_id == dev_id)
+        {
             return &g_dev_sem_info_db[i];
         }
     }
@@ -425,16 +457,17 @@ static struct device_sem_info* get_device_sem_info(dm_dev_id_t dev_id)
 }
 
 /************************************
-* Function: trm_create
-************************************/
-trm_sts trm_create(trm_ctx *trm_p, mfile *mf)
+ * Function: trm_create
+ ************************************/
+trm_sts trm_create(trm_ctx* trm_p, mfile* mf)
 {
     dm_dev_id_t dev_id = DeviceStartMarker;
     u_int32_t hw_dev_id;
     u_int32_t chip_rev;
 
-    *trm_p = (trm_ctx) malloc(sizeof(struct trm_t));
-    if (!(*trm_p)) {
+    *trm_p = (trm_ctx)malloc(sizeof(struct trm_t));
+    if (!(*trm_p))
+    {
         return TRM_STS_MEM_ERROR;
     }
     memset((*trm_p), 0, sizeof(struct trm_t));
@@ -442,14 +475,17 @@ trm_sts trm_create(trm_ctx *trm_p, mfile *mf)
 
 #if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
     u_int32_t dev_flags = 0;
-    if (!mget_mdevs_flags(mf, &dev_flags)) {
-        if ((dev_flags & MDEVS_IB) && mib_semaphore_lock_is_supported(mf) == 1) {
+    if (!mget_mdevs_flags(mf, &dev_flags))
+    {
+        if ((dev_flags & MDEVS_IB) && mib_semaphore_lock_is_supported(mf) == 1)
+        {
             (*trm_p)->ib_semaphore_lock_is_supported = 1;
         }
     }
 #endif
 
-    if (dm_get_device_id((*trm_p)->mf, &dev_id, &hw_dev_id, &chip_rev)) {
+    if (dm_get_device_id((*trm_p)->mf, &dev_id, &hw_dev_id, &chip_rev))
+    {
         free(*trm_p);
         *trm_p = (trm_ctx)NULL;
         return dev_id == DeviceUnknown ? TRM_STS_DEV_NOT_SUPPORTED : TRM_STS_CR_ACCESS_ERR;
@@ -458,7 +494,8 @@ trm_sts trm_create(trm_ctx *trm_p, mfile *mf)
     (*trm_p)->dev_sem_info = get_device_sem_info(dev_id);
 
     // Not supported device
-    if (!((*trm_p)->dev_sem_info)) {
+    if (!((*trm_p)->dev_sem_info))
+    {
         free(*trm_p);
         *trm_p = (trm_ctx)NULL;
         return TRM_STS_DEV_NOT_SUPPORTED;
@@ -468,135 +505,168 @@ trm_sts trm_create(trm_ctx *trm_p, mfile *mf)
 }
 
 /************************************
-* Function: trm_destroy
-************************************/
+ * Function: trm_destroy
+ ************************************/
 trm_sts trm_destroy(trm_ctx trm)
 {
-    if (trm) {
+    if (trm)
+    {
         free(trm);
     }
     return TRM_STS_OK;
 }
 
 /************************************
-* Function: trm_lock
-************************************/
+ * Function: trm_lock
+ ************************************/
 trm_sts trm_lock(trm_ctx trm, trm_resourse res, unsigned int max_retries)
 {
     u_int32_t dev_type = 0;
-    if (mget_mdevs_flags(trm->mf, &dev_type)) {
+    if (mget_mdevs_flags(trm->mf, &dev_type))
+    {
         return TRM_STS_DEV_NOT_SUPPORTED;
     }
     // lock resource on appropriate ifc if supported
-    switch ((int)res) {
-    case TRM_RES_ICMD:
-        if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
-            return lock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_ICMD], max_retries);
+    switch ((int)res)
+    {
+        case TRM_RES_ICMD:
+            if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf))
+            {
+                return lock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_ICMD], max_retries);
 #if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
-        } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
-            return lock_vs_mad_semaphore(trm, TRM_RES_ICMD, max_retries);
+            }
+            else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB))
+            {
+                return lock_vs_mad_semaphore(trm, TRM_RES_ICMD, max_retries);
 #endif
-        } else if (trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK]) { // lock hw semaphore
-            return lock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK], max_retries, 0);
-        }
-        break;
+            }
+            else if (trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK])
+            { // lock hw semaphore
+                return lock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK],
+                                         max_retries, 0);
+            }
+            break;
 
-    case TRM_RES_FLASH_PROGRAMING:
-        if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
-            return lock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_FLASH_PROGRAMING], max_retries);
+        case TRM_RES_FLASH_PROGRAMING:
+            if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf))
+            {
+                return lock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_FLASH_PROGRAMING], max_retries);
 #if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
-        } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
-            return lock_vs_mad_semaphore(trm, TRM_RES_FLASH_PROGRAMING, max_retries);
+            }
+            else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB))
+            {
+                return lock_vs_mad_semaphore(trm, TRM_RES_FLASH_PROGRAMING, max_retries);
 #endif
-        }
-        break;
+            }
+            break;
 
-    case TRM_RES_HCR_FLASH_PROGRAMING:
-        if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK]) { // lock hw semaphore
-            return lock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK], max_retries, FLASH_SEM_SLEEP);
-        }
-        break;
+        case TRM_RES_HCR_FLASH_PROGRAMING:
+            if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK])
+            { // lock hw semaphore
+                return lock_hw_semaphore(
+                  trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK], max_retries,
+                  FLASH_SEM_SLEEP);
+            }
+            break;
 
-    case TRM_RES_HW_TRACER:
-        if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK]) { // lock hw semaphore
-            return lock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK], max_retries, 0);
-        }
-        break;
+        case TRM_RES_HW_TRACER:
+            if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK])
+            { // lock hw semaphore
+                return lock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK],
+                                         max_retries, 0);
+            }
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
     return TRM_STS_RES_NOT_SUPPORTED;
 }
 
 /************************************
-* Function: trm_try_lock
-************************************/
+ * Function: trm_try_lock
+ ************************************/
 trm_sts trm_try_lock(trm_ctx trm, trm_resourse res)
 {
     return trm_lock(trm, res, 1);
 }
 
 /************************************
-* Function: trm_unlock
-************************************/
+ * Function: trm_unlock
+ ************************************/
 trm_sts trm_unlock(trm_ctx trm, trm_resourse res)
 {
     u_int32_t dev_type = 0;
-    if (mget_mdevs_flags(trm->mf, &dev_type)) {
+    if (mget_mdevs_flags(trm->mf, &dev_type))
+    {
         return TRM_STS_DEV_NOT_SUPPORTED;
     }
 
     // lock resource on appropriate ifc if supported
-    switch ((int)res) {
-    case TRM_RES_ICMD:
-        if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
-            return unlock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_ICMD]);
+    switch ((int)res)
+    {
+        case TRM_RES_ICMD:
+            if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf))
+            {
+                return unlock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_ICMD]);
 #if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
-        } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
-            return release_vs_mad_semaphore(trm, TRM_RES_ICMD);
+            }
+            else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB))
+            {
+                return release_vs_mad_semaphore(trm, TRM_RES_ICMD);
 #endif
-        } else if (trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK]) { // lock hw semaphore
-            return unlock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK]);
-        }
-        break;
+            }
+            else if (trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK])
+            { // lock hw semaphore
+                return unlock_hw_semaphore(trm->mf,
+                                           trm->dev_sem_info->hw_sem_addr[TRM_RES_MAIN_SEM & HW_SEM_ADDR_MASK]);
+            }
+            break;
 
-    case TRM_RES_FLASH_PROGRAMING:
-        if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf)) {
-            return unlock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_FLASH_PROGRAMING]);
+        case TRM_RES_FLASH_PROGRAMING:
+            if (trm->dev_sem_info->vsec_sem_supported && mget_vsec_supp(trm->mf))
+            {
+                return unlock_icommand_gateway_semaphore(trm->mf, g_vsec_sem_addr[TRM_RES_FLASH_PROGRAMING]);
 #if !defined(__FreeBSD__) && !defined(UEFI_BUILD)
-        } else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB)) {
-            return release_vs_mad_semaphore(trm, TRM_RES_FLASH_PROGRAMING);
+            }
+            else if (trm->dev_sem_info->vsec_sem_supported && (dev_type & MDEVS_IB))
+            {
+                return release_vs_mad_semaphore(trm, TRM_RES_FLASH_PROGRAMING);
 #endif
-        }
-        break;
+            }
+            break;
 
-    case TRM_RES_HCR_FLASH_PROGRAMING:
-        if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK]) { // lock hw semaphore
-            return unlock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK]);
-        }
-        break;
+        case TRM_RES_HCR_FLASH_PROGRAMING:
+            if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK])
+            { // lock hw semaphore
+                return unlock_hw_semaphore(
+                  trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HCR_FLASH_PROGRAMING & HW_SEM_ADDR_MASK]);
+            }
+            break;
 
-    case TRM_RES_HW_TRACER:
-        if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK]) { // lock hw semaphore
-            return unlock_hw_semaphore(trm->mf, trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK]);
-        }
-        break;
+        case TRM_RES_HW_TRACER:
+            if (trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK])
+            { // lock hw semaphore
+                return unlock_hw_semaphore(trm->mf,
+                                           trm->dev_sem_info->hw_sem_addr[TRM_RES_HW_TRACER & HW_SEM_ADDR_MASK]);
+            }
+            break;
 
-    default:
-        break;
+        default:
+            break;
     }
     return TRM_STS_RES_NOT_SUPPORTED;
 }
 
 /************************************
-* Function: trm_sts2str
-************************************/
+ * Function: trm_sts2str
+ ************************************/
 const char* trm_sts2str(trm_sts status)
 {
     size_t num_of_sts = sizeof(status_to_str) / sizeof(status_to_str[0]);
 
-    if ((size_t)status >= num_of_sts) {
+    if ((size_t)status >= num_of_sts)
+    {
         return "Unknown status code";
     }
 
diff --git a/tools_res_mgmt/tools_res_mgmt.h b/tools_res_mgmt/tools_res_mgmt.h
index dd70eea7..3f1fa2ba 100644
--- a/tools_res_mgmt/tools_res_mgmt.h
+++ b/tools_res_mgmt/tools_res_mgmt.h
@@ -36,81 +36,82 @@
 
 #include <mtcr.h>
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-typedef enum {
-    TRM_STS_OK = 0,
-    TRM_STS_RES_BUSY,
-    TRM_STS_IFC_NA,
-    TRM_STS_DEV_NOT_SUPPORTED,
-    TRM_STS_RES_NOT_SUPPORTED,
-    TRM_STS_CR_ACCESS_ERR,
-    TRM_STS_MEM_ERROR
-} trm_sts;
+    typedef enum
+    {
+        TRM_STS_OK = 0,
+        TRM_STS_RES_BUSY,
+        TRM_STS_IFC_NA,
+        TRM_STS_DEV_NOT_SUPPORTED,
+        TRM_STS_RES_NOT_SUPPORTED,
+        TRM_STS_CR_ACCESS_ERR,
+        TRM_STS_MEM_ERROR
+    } trm_sts;
 
-typedef enum {
-    // vsec semaphores
-    TRM_RES_ICMD = 0x0,
-    TRM_RES_FLASH_PROGRAMING     = 0x1,
-    // hw semaphores
-    TRM_RES_MAIN_SEM             = 0x10,
-    TRM_RES_HW_TRACER            = TRM_RES_MAIN_SEM,
-    TRM_RES_TOOLS_HCR            = TRM_RES_MAIN_SEM,
-    TRM_RES_HCR_FLASH_PROGRAMING = 0x11,
-    TRM_RES_ALL                  = 0xffff,
-} trm_resourse;
+    typedef enum
+    {
+        // vsec semaphores
+        TRM_RES_ICMD = 0x0,
+        TRM_RES_FLASH_PROGRAMING = 0x1,
+        // hw semaphores
+        TRM_RES_MAIN_SEM = 0x10,
+        TRM_RES_HW_TRACER = TRM_RES_MAIN_SEM,
+        TRM_RES_TOOLS_HCR = TRM_RES_MAIN_SEM,
+        TRM_RES_HCR_FLASH_PROGRAMING = 0x11,
+        TRM_RES_ALL = 0xffff,
+    } trm_resourse;
 
-typedef struct trm_t*trm_ctx;
+    typedef struct trm_t* trm_ctx;
 
+    /*
+     * Create tools resource context
+     * trm_p: trm_ctx pointer to be allocated
+     * Parameter (mf)  - an opened mst device handler
+     * Return TOOLS_STS_OK on success of creating the context, otherwise any other error code.
+     */
+    trm_sts trm_create(trm_ctx* trm_p, mfile* mf);
 
-/*
- * Create tools resource context
- * trm_p: trm_ctx pointer to be allocated
- * Parameter (mf)  - an opened mst device handler
- * Return TOOLS_STS_OK on success of creating the context, otherwise any other error code.
- */
-trm_sts trm_create(trm_ctx *trm_p, mfile *mf);
+    /*
+     * Destroy the context
+     * trm: trm_ctx to be destroyed
+     * Return TOOLS_STS_OK on success of destroying the context, otherwise any other error code.
+     */
+    trm_sts trm_destroy(trm_ctx trm);
 
+    /*
+     * Lock tools resource
+     * Parameter (mf)  - an opened mst device handler
+     * Parameter (res) - resource to acquire.
+     * Parameter (max_retry) - max retry count before declaring resource busy.
+     * Return TOOLS_STS_OK on success of locking all the desired resources, otherwise any other error code.
+     */
+    trm_sts trm_lock(trm_ctx trm, trm_resourse res, unsigned int max_retry);
 
-/*
- * Destroy the context
- * trm: trm_ctx to be destroyed
- * Return TOOLS_STS_OK on success of destroying the context, otherwise any other error code.
- */
-trm_sts trm_destroy(trm_ctx trm);
-
-/*
- * Lock tools resource
- * Parameter (mf)  - an opened mst device handler
- * Parameter (res) - resource to acquire.
- * Parameter (max_retry) - max retry count before declaring resource busy.
- * Return TOOLS_STS_OK on success of locking all the desired resources, otherwise any other error code.
- */
-trm_sts trm_lock(trm_ctx trm, trm_resourse res, unsigned int max_retry);
-
-/*
- * Try to lock tools resource (returns immediately if resource busy)
- * Parameter (mf)  - an opened mst device handler
- * Parameter (res) - resource to acquire.
- * Return TOOLS_STS_OK on success of locking all the desired resources, otherwise any other error code.
- */
-trm_sts trm_try_lock(trm_ctx trm, trm_resourse res);
+    /*
+     * Try to lock tools resource (returns immediately if resource busy)
+     * Parameter (mf)  - an opened mst device handler
+     * Parameter (res) - resource to acquire.
+     * Return TOOLS_STS_OK on success of locking all the desired resources, otherwise any other error code.
+     */
+    trm_sts trm_try_lock(trm_ctx trm, trm_resourse res);
 
-/*
- * Unlock tools resource
- * Parameter (mf)  - an opened mst device handler
- * Parameter (res) - resource to release.
- * Return TOOLS_STS_OK if all given resources were unlocked successfully.
- */
-trm_sts trm_unlock(trm_ctx trm, trm_resourse res);
+    /*
+     * Unlock tools resource
+     * Parameter (mf)  - an opened mst device handler
+     * Parameter (res) - resource to release.
+     * Return TOOLS_STS_OK if all given resources were unlocked successfully.
+     */
+    trm_sts trm_unlock(trm_ctx trm, trm_resourse res);
 
-/*
- * Translate tools_sem_mgmt_sts status code to a human readable string.
- * Parameter (status) - status code to translate.
- * Return descriptive string.
- */
-const char* trm_sts2str(trm_sts status);
+    /*
+     * Translate tools_sem_mgmt_sts status code to a human readable string.
+     * Parameter (status) - status code to translate.
+     * Return descriptive string.
+     */
+    const char* trm_sts2str(trm_sts status);
 
 #ifdef __cplusplus
 }
diff --git a/tools_res_mgmt/tools_time.c b/tools_res_mgmt/tools_time.c
index 44586558..560631f1 100644
--- a/tools_res_mgmt/tools_time.c
+++ b/tools_res_mgmt/tools_time.c
@@ -37,11 +37,10 @@
 
 #include "tools_time.h"
 
-
-
-void tt_get_time(tt_ctx_t *tt)
+void tt_get_time(tt_ctx_t* tt)
 {
-    if (!tt) {
+    if (!tt)
+    {
         return;
     }
     time(&(tt->now));
@@ -52,6 +51,3 @@ double tt_diff_in_ms(tt_ctx_t t1, tt_ctx_t t2)
 {
     return difftime(t2.now, t1.now) * 1000;
 }
-
-
-
diff --git a/tools_res_mgmt/tools_time.h b/tools_res_mgmt/tools_time.h
index d42a4c21..cda105ea 100644
--- a/tools_res_mgmt/tools_time.h
+++ b/tools_res_mgmt/tools_time.h
@@ -32,19 +32,21 @@
  */
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
 #include <time.h>
 
-typedef struct tt_ctx {
-    time_t now;
-} tt_ctx_t;
+    typedef struct tt_ctx
+    {
+        time_t now;
+    } tt_ctx_t;
 
-// update context with the current time
-void tt_get_time(tt_ctx_t *tt);
-// get diff in ms between the time t1 was created and t2
-double tt_diff_in_ms(tt_ctx_t t1, tt_ctx_t t2);
+    // update context with the current time
+    void tt_get_time(tt_ctx_t* tt);
+    // get diff in ms between the time t1 was created and t2
+    double tt_diff_in_ms(tt_ctx_t t1, tt_ctx_t t2);
 
 #ifdef __cplusplus
 }
diff --git a/tracers/fwtrace/fw_trace_utilities.py b/tracers/fwtrace/fw_trace_utilities.py
index e28a5ccc..c94e5c17 100755
--- a/tracers/fwtrace/fw_trace_utilities.py
+++ b/tracers/fwtrace/fw_trace_utilities.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 from __future__ import print_function
 import sys
@@ -41,9 +41,9 @@
 import time
 
 
-class FwTraceUtilities(object):    
+class FwTraceUtilities(object):
 
-    @classmethod    
+    @classmethod
     def _cmd_exec(self, cmd):
         """
         Execute a command line and return the state and the output
@@ -69,7 +69,7 @@ def _is_dev_dbdf_format(self, dev):
         if re.match(pat, dev):
             return True
         return False
-    
+
     @classmethod
     def _is_dev_bdf_format(self, dev):
         """
@@ -80,21 +80,21 @@ def _is_dev_bdf_format(self, dev):
         if re.match(pat, dev):
             return True
         return False
-    
+
     @classmethod
     def _add_domain_to_address(self, dev_addr):
         """
         Add the domain "0000:" to the given address
-        """  
-        if len(dev_addr.split(":")) == 2 :
+        """
+        if len(dev_addr.split(":")) == 2:
             return "0000:" + dev_addr
         return dev_addr
 
-    @staticmethod 
+    @staticmethod
     def get_dev_dbdf(device_name):
         """
         retrieve the BDF according to the device name
-        """ 
+        """
         if FwTraceUtilities._is_dev_dbdf_format(device_name):
             return device_name
         if FwTraceUtilities._is_dev_bdf_format(device_name):
@@ -109,7 +109,7 @@ def get_dev_dbdf(device_name):
         elif operatingSys == "Linux":
             cmd = "mdevices_info -vv"
             (rc, out, _) = FwTraceUtilities._cmd_exec(cmd)
-            if rc != 0 :
+            if rc != 0:
                 raise RuntimeError("Failed to get device PCI address")
             # extract bdf
             bdf = None
@@ -123,7 +123,7 @@ def get_dev_dbdf(device_name):
         elif operatingSys == "Windows":
             cmd = "mdevices status -vv"
             (rc, out, _) = FwTraceUtilities._cmd_exec(cmd)
-            if rc != 0 :
+            if rc != 0:
                 raise RuntimeError("Failed to get device PCI address")
             # extract bdf
             bdf = None
@@ -135,16 +135,16 @@ def get_dev_dbdf(device_name):
                 raise RuntimeError("Failed to get device PCI Address")
             return bdf
         else:
-            raise RuntimeError("Unsupported OS")       
-    
-    @staticmethod 
-    def is_driver_mem_mode_supported(): 
+            raise RuntimeError("Unsupported OS")
+
+    @staticmethod
+    def is_driver_mem_mode_supported():
         """
         Check if driver mem mode is suported
         If supported return True, otherwise return False
-        """   
+        """
         is_supported = False
-    
+
         if os.name == "nt":
             # future capability - windows
             pass
@@ -154,7 +154,7 @@ def is_driver_mem_mode_supported():
                 is_supported = True
 
         return is_supported
-    
+
     @staticmethod
     def is_secure_fw(mst_device):
         """
@@ -163,26 +163,26 @@ def is_secure_fw(mst_device):
         """
         is_secure = False
         if mst_device is None:
-            return  is_secure
+            return is_secure
 
         # in case that reg access fail, we cant determain a secure fw and return false
         try:
             reg_access_obj = regaccess.RegAccess(mst_device)
             is_secure = reg_access_obj.getSecureFWStatus()
-        except:
+        except BaseException:
             is_secure = False
 
         return is_secure
-    
+
     @staticmethod
     def ts_to_real_ts(ts, freq):
         """
         The method calculate a real time stamp
         and return is as [hh:mm:ss:nsec] format
-        """ 
+        """
         if freq <= 0:
             raise RuntimeError("device frequency is not above Zero - can't calc real time stamp")
-        
+
         nano_seconds = int(1000 / freq) * ts
         # calc hours
         time_in_seconds = int(nano_seconds / 1000000000)
@@ -192,33 +192,33 @@ def ts_to_real_ts(ts, freq):
         minutes = int(time_in_seconds / 60)
         # calc seconds
         time_in_seconds = time_in_seconds - (minutes * 60)
-        seconds = time_in_seconds        
+        seconds = time_in_seconds
         # calc the reminder in nano seconds
         nsecs = nano_seconds - int(nano_seconds / 1000000000) * 1000000000
-        
+
         return "{:02d}:{:02d}:{:02d}:{:09d}".format(hours, minutes, seconds, nsecs)
 
     @staticmethod
     def get_device_frequency(device):
         """
-        The method call mlxuptime, parse 
+        The method call mlxuptime, parse
         the device frequency and return it as integer
         (mlxuptime can take 1 sec)
-        """ 
+        """
         cmd = "mlxuptime -d" + device
         (rc, out, _) = FwTraceUtilities._cmd_exec(cmd)
         freq_num = 0
-        if rc != 0 :
+        if rc != 0:
             raise RuntimeError("Failed to get device frequency (necessary for real ts calculation)")
         else:
             for line in out.split('\n'):
                 if "Measured core frequency" in line:
                     freq_str = line.split(": ")[1].split(" ")[0]
-                    freq_num = int(round(float(freq_str))) 
+                    freq_num = int(round(float(freq_str)))
                     break
-               
+
         return freq_num
-        
+
 ##########################################
 
 
diff --git a/tracers/fwtrace/mstfwtrace.py b/tracers/fwtrace/mstfwtrace.py
index 2647593c..910d3863 100755
--- a/tracers/fwtrace/mstfwtrace.py
+++ b/tracers/fwtrace/mstfwtrace.py
@@ -1,24 +1,24 @@
 # Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-# 
+#
 # This software is available to you under a choice of one of two
 # licenses.  You may choose to be licensed under the terms of the GNU
 # General Public License (GPL) Version 2, available from the file
 # COPYING in the main directory of this source tree, or the
 # OpenIB.org BSD license below:
-# 
+#
 #     Redistribution and use in source and binary forms, with or
 #     without modification, are permitted provided that the following
 #     conditions are met:
-# 
+#
 #      - Redistributions of source code must retain the above
 #        copyright notice, this list of conditions and the following
 #        disclaimer.
-# 
+#
 #      - Redistributions in binary form must reproduce the above
 #        copyright notice, this list of conditions and the following
 #        disclaimer in the documentation and/or other materials
 #        provided with the distribution.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -54,16 +54,16 @@
 
 
 class UnbufferedStream(object):
-   def __init__(self, stream):
-       self.stream = stream
-   def write(self, data):
-       self.stream.write(data)
-       self.stream.flush()
-   def writelines(self, datas):
-       self.stream.writelines(datas)
-       self.stream.flush()
-   def __getattr__(self, attr):
-       return getattr(self.stream, attr)
+    def __init__(self, stream):
+        self.stream = stream
+    def write(self, data):
+        self.stream.write(data)
+        self.stream.flush()
+    def writelines(self, datas):
+        self.stream.writelines(datas)
+        self.stream.flush()
+    def __getattr__(self, attr):
+        return getattr(self.stream, attr)
 
 
 sys.stdout = UnbufferedStream(sys.stdout)
@@ -98,7 +98,7 @@ class TracerException(Exception):
     {
         "name": "ConnectIB",
         "dev_id": [0x1ff],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -107,7 +107,7 @@ class TracerException(Exception):
     {
         "name": "SwitchIB",
         "dev_id": [0x247],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -116,7 +116,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX4",
         "dev_id": [0x209],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -125,7 +125,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX5",
         "dev_id": [0x20d],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -134,7 +134,7 @@ class TracerException(Exception):
     {
         "name": "BlueField",
         "dev_id": [0x211],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -163,7 +163,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX6",
         "dev_id": [0x20f],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -172,7 +172,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX6DX",
         "dev_id": [0x212],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -181,7 +181,7 @@ class TracerException(Exception):
     {
         "name": "Spectrum",
         "dev_id": [0x249],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -190,7 +190,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX4LX",
         "dev_id": [0x20b],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -199,7 +199,7 @@ class TracerException(Exception):
     {
         "name": "SwitchIB2",
         "dev_id": [0x24B],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -208,7 +208,7 @@ class TracerException(Exception):
     {
         "name": "Quantum",
         "dev_id": [0x24D],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -217,7 +217,7 @@ class TracerException(Exception):
     {
         "name": "Spectrum2",
         "dev_id": [0x24E],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -226,7 +226,7 @@ class TracerException(Exception):
     {
         "name": "Spectrum3",
         "dev_id": [0x250],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -235,7 +235,7 @@ class TracerException(Exception):
     {
         "name": "Spectrum4",
         "dev_id": [0x254],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -244,7 +244,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX6LX",
         "dev_id": [0x216],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -253,7 +253,7 @@ class TracerException(Exception):
     {
         "name": "ConnectX7",
         "dev_id": [0x218],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -262,7 +262,7 @@ class TracerException(Exception):
     {
         "name": "Quantum2",
         "dev_id": [0x257],
-        "chip_rev":-1,
+        "chip_rev": -1,
         "maskable": True,
         "mask_addr": None,
         # list of (trace type name, start_bit)
@@ -298,11 +298,11 @@ def add_args():
     format_group = parser.add_argument_group('Format')
     format_group.add_argument("-i", "--irisc", dest="irisc", help="Irisc name [all]", default="all")
     format_group.add_argument("-s", "--stream", action="store_true", dest="stream", help="Run in streaming mode", default=False)
-    format_group.add_argument("-m", "--mask", dest="mask", help="Trace class mask, use \"+\" to enable multiple classes or use integer format, e.g: -m " \
-                                                          "class1+class2+... or 0xff00ff00", default=None)
+    format_group.add_argument("-m", "--mask", dest="mask", help="Trace class mask, use \"+\" to enable multiple classes or use integer format, e.g: -m "
+                              "class1+class2+... or 0xff00ff00", default=None)
     format_group.add_argument("-l", "--level", dest="level", help="Trace level", default=None)
     return parser
-    
+
 
 def parse_cmd_line_args():
     args = add_args().parse_args()
@@ -349,14 +349,13 @@ def check_secure_fw_args(devInfo):
 
 
 def get_device_info(dev):
-    #check if livefish mode before continue to work with the device
+    # check if livefish mode before continue to work with the device
     CMDIFDEV.getFwInfo()
 
     devIdChipRev = dev.read4(0xf0014)
     devId = devIdChipRev & 0xffff
     chipRev = (devIdChipRev >> 16) & 0xf
 
-
     for devInfo in DEV_INFO_DB:
         if devId in devInfo["dev_id"] and \
                 (devInfo["chip_rev"] == -1 or devInfo["chip_rev"] == chipRev):
@@ -387,7 +386,7 @@ def is_numaric(str):
     if str.startswith("0x") or str.startswith("0X") or str.isdigit():
         try:
             eval(str)
-        except:
+        except BaseException:
             return False
         return True
     return False
@@ -442,18 +441,18 @@ def start_tracer():
         MST_DEVICE = mtcr.MstDevice(DEV_NAME)
         CMDIFDEV = cmdif.CmdIf(MST_DEVICE)
         devInfo = get_device_info(MST_DEVICE)
-       
+
         if FwTraceUtilities.is_driver_mem_mode_supported():
             try:
-                check_secure_fw_args(devInfo)                
-                secure_fw_tracer = SecureFwTrace(MST_DEVICE, DEV_NAME, IGNORE_OLD_EVENTS, REAL_TS)               
-                open_mst_dev()           
+                check_secure_fw_args(devInfo)
+                secure_fw_tracer = SecureFwTrace(MST_DEVICE, DEV_NAME, IGNORE_OLD_EVENTS, REAL_TS)
+                open_mst_dev()
                 apply_mask(devInfo, MST_DEVICE, CMDIFDEV)
                 secure_fw_tracer.parse_driver_mem()
             except Exception as exp:
                 print("-E- %s" % exp)
         else:
-            raise TracerException("Driver mem mode is not supported")                   
+            raise TracerException("Driver mem mode is not supported")
 
     except Exception as exp:
         print("-E- %s" % exp)
@@ -479,7 +478,7 @@ def signal_handler(signal, frame):
     except Exception as exp:
         try:
             print("-E- %s" % str(exp))
-        except:
+        except BaseException:
             pass
         rc = 1
     sys.exit(rc)
diff --git a/tracers/fwtrace/secure_fw_trace.py b/tracers/fwtrace/secure_fw_trace.py
index 00f39eb5..6a772927 100755
--- a/tracers/fwtrace/secure_fw_trace.py
+++ b/tracers/fwtrace/secure_fw_trace.py
@@ -28,7 +28,7 @@
 # ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-#--
+# --
 
 from __future__ import print_function
 import sys
@@ -42,7 +42,7 @@ class SecureFwTrace(object):
     OPEN_CLOSE_FILE_DELAY_SEC = 1
     LINUX_TRACER_FILE = "/sys/kernel/debug/tracing/trace"
     WINDOWS_TRACER_FILE = ""
-    
+
     def __init__(self,
                  mst_device,
                  device_name,
@@ -55,18 +55,18 @@ def __init__(self,
         self._MAX_TIME_STAMP = 0
         self._TRACER_FILE = ""
         self._device_freq = 0
-        
+
         if os.name == "nt":
             # future capability - windows
             # self._TRACER_FILE = self.WINDOWS_TRACER_FILE
             pass
-        else:    
+        else:
             self._TRACER_FILE = self.LINUX_TRACER_FILE
-        
+
         if real_ts:
             self._device_freq = FwTraceUtilities.get_device_frequency(device_name)
 
-    def _prepare_and_print_event(self, event): 
+    def _prepare_and_print_event(self, event):
         """
         The method responsible for adjusting the event according
         the given flags (real_ts and future formating and flags)
@@ -78,21 +78,21 @@ def _prepare_and_print_event(self, event):
             event = "[{0}]{1}".format(event_prefix, event_suffix)
 
         print(event)
-                   
-    def _parse_driver_mem_line_to_event(self, line, bdf = "", print_event = True):
+
+    def _parse_driver_mem_line_to_event(self, line, bdf="", print_event=True):
         """
         The method responsible for checking filtering and parsing the events,
         store the max time stamp and sending the event for printing if needed
-        """  
+        """
         # check if the event line belong to the fw trace and contain the bdf address
-        if (("fw_tracer: " in line) or ("mlx5_fw: " in line)) and (bdf in line):
-            if "fw_tracer: " in line:
-                tracer_str = line.split("fw_tracer: ")[1]
-            else:
+        if (("fw_tracer: " in line) or ("mlx5_fw: " in line)) and (bdf in line):
+            if "fw_tracer: " in line:
+                tracer_str = line.split("fw_tracer: ")[1]
+            else:
                 tracer_str = line.split("mlx5_fw: ")[1]
             tracer_str = tracer_str.split("\n")[0]
             tracer_str = tracer_str[len(bdf + " "):]
-            
+
             # isolate the time stamp and store it for the next time we will
             # read the file (prevent duplication and present the most updated events)
             time_stamp = int(tracer_str.split("]")[0].replace("[", "").replace("]", ""), 16)
@@ -100,20 +100,20 @@ def _parse_driver_mem_line_to_event(self, line, bdf = "", print_event = True):
                 self._MAX_TIME_STAMP = time_stamp
                 if print_event:
                     self._prepare_and_print_event(tracer_str)
-            
+
     def parse_driver_mem(self):
         """
         The method responsible for parsing the events file that
         filled by the mellanox driver
-        """ 
-        self._MAX_TIME_STAMP = 0  
+        """
+        self._MAX_TIME_STAMP = 0
         first_run = True
-        second_run = False 
+        second_run = False
         print_event = True
-        
+
         if os.path.exists(self._TRACER_FILE):
             bdf = FwTraceUtilities.get_dev_dbdf(self._device_name)
-            try:  
+            try:
                 while True:
                     # first run is the first time we open the file.
                     # in that case we need to print that we read old event and
@@ -123,30 +123,30 @@ def parse_driver_mem(self):
                         second_run = True
                         if self._ignore_old_events:
                             print_event = False
-                        else: 
-                            print_event = True   
+                        else:
+                            print_event = True
                             print("Read old events:")
-                    # we need to print 'read new event' only one time and only 
+                    # we need to print 'read new event' only one time and only
                     # at the second time we open the file (new events arrive)
                     elif second_run:
                         print_event = True
                         second_run = False
                         print("Read new events:")
-                    
+
                     fd = open(self._TRACER_FILE, "rt")
                     # go over all the file lines on each iteration
                     # in order to overcome a case that the file has some
                     # corruptions while being written
                     for line in fd:
                         self._parse_driver_mem_line_to_event(line, bdf, print_event)
-                                                        
+
                     fd.close()
                     time.sleep(self.OPEN_CLOSE_FILE_DELAY_SEC)
             except KeyboardInterrupt:
-                print("\nStopping... ")        
+                print("\nStopping... ")
         else:
-            print("no trace file to parse")                
-    
+            print("no trace file to parse")
+
 ##########################################
 
 
diff --git a/xz_utils/xz_utils.c b/xz_utils/xz_utils.c
index 073280e6..a5d61797 100644
--- a/xz_utils/xz_utils.c
+++ b/xz_utils/xz_utils.c
@@ -40,7 +40,7 @@
 #include <lzma.h>
 #include "xz_utils.h"
 
-static int32_t init_encoder(lzma_stream *strm, u_int32_t preset, lzma_check check)
+static int32_t init_encoder(lzma_stream* strm, u_int32_t preset, lzma_check check)
 {
     // Initialize the encoder using a preset. Set the integrity to check
     // to CRC64, which is the default in the xz command line tool. If
@@ -49,7 +49,8 @@ static int32_t init_encoder(lzma_stream *strm, u_int32_t preset, lzma_check chec
     lzma_ret ret = lzma_easy_encoder(strm, preset, check);
 
     // Return successfully if the initialization went fine.
-    if (ret == LZMA_OK) {
+    if (ret == LZMA_OK)
+    {
         return 0;
     }
 
@@ -58,57 +59,57 @@ static int32_t init_encoder(lzma_stream *strm, u_int32_t preset, lzma_check chec
     // package or e.g. /usr/include/lzma/container.h depending on the
     // install prefix).
     // const char *msg;
-    switch (ret) {
-    case LZMA_MEM_ERROR:
-        return XZ_ERR_INTERNAL_MEM;
-
-    case LZMA_OPTIONS_ERROR:
-        return XZ_ERR_PRESET_NO_SUPP;
-        break;
-
-    case LZMA_UNSUPPORTED_CHECK:
-        return XZ_ERR_INTEGRITY_NOT_SUPP;
-
-    default:
-        // This is most likely LZMA_PROG_ERROR indicating a bug in
-        // this program or in liblzma. It is inconvenient to have a
-        // separate error message for errors that should be impossible
-        // to occur, but knowing the error code is important for
-        // debugging. That's why it is good to print the error code
-        // at least when there is no good error message to show.
-        return XZ_ERR_UNKNOWN;
+    switch (ret)
+    {
+        case LZMA_MEM_ERROR:
+            return XZ_ERR_INTERNAL_MEM;
+
+        case LZMA_OPTIONS_ERROR:
+            return XZ_ERR_PRESET_NO_SUPP;
+            break;
+
+        case LZMA_UNSUPPORTED_CHECK:
+            return XZ_ERR_INTEGRITY_NOT_SUPP;
+
+        default:
+            // This is most likely LZMA_PROG_ERROR indicating a bug in
+            // this program or in liblzma. It is inconvenient to have a
+            // separate error message for errors that should be impossible
+            // to occur, but knowing the error code is important for
+            // debugging. That's why it is good to print the error code
+            // at least when there is no good error message to show.
+            return XZ_ERR_UNKNOWN;
     }
 }
 
-
-static int32_t init_decoder(lzma_stream *strm)
+static int32_t init_decoder(lzma_stream* strm)
 {
-    lzma_ret ret = lzma_stream_decoder(
-        strm, UINT64_MAX, LZMA_CONCATENATED);
+    lzma_ret ret = lzma_stream_decoder(strm, UINT64_MAX, LZMA_CONCATENATED);
 
     // Return successfully if the initialization went fine.
-    if (ret == LZMA_OK) {
+    if (ret == LZMA_OK)
+    {
         return 0;
     }
 
     // const char *msg;
-    switch (ret) {
-    case LZMA_MEM_ERROR:
-        return XZ_ERR_INTERNAL_MEM;
-
-    default:
-        // This is most likely LZMA_PROG_ERROR indicating a bug in
-        // this program or in liblzma. It is inconvenient to have a
-        // separate error message for errors that should be impossible
-        // to occur, but knowing the error code is important for
-        // debugging. That's why it is good to print the error code
-        // at least when there is no good error message to show.
-        return XZ_ERR_UNKNOWN;
+    switch (ret)
+    {
+        case LZMA_MEM_ERROR:
+            return XZ_ERR_INTERNAL_MEM;
+
+        default:
+            // This is most likely LZMA_PROG_ERROR indicating a bug in
+            // this program or in liblzma. It is inconvenient to have a
+            // separate error message for errors that should be impossible
+            // to occur, but knowing the error code is important for
+            // debugging. That's why it is good to print the error code
+            // at least when there is no good error message to show.
+            return XZ_ERR_UNKNOWN;
     }
 }
 
-
-static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz)
+static int32_t xcompress(lzma_stream* strm, u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz)
 {
     // This will be LZMA_RUN until the end of the input file is reached.
     // This tells lzma_code() when there will be no more input.
@@ -128,14 +129,17 @@ static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_i
 
     // Loop until the file has been successfully compressed or until
     // an error occurs.
-    while (1) {
+    while (1)
+    {
         // Fill the input buffer if it is empty.
-        if (strm->avail_in == 0 && (rpos < insz)) {
+        if (strm->avail_in == 0 && (rpos < insz))
+        {
             strm->next_in = &inbuf[rpos];
             chunk_sz = insz - rpos;
             strm->avail_in = chunk_sz;
         }
-        if (rpos >= insz) {
+        if (rpos >= insz)
+        {
             action = LZMA_FINISH;
         }
 
@@ -144,11 +148,14 @@ static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_i
         // If the output buffer is full or if the compression finished
         // successfully, write the data from the output bufffer to
         // the output file.
-        if (((strm->avail_out == 0) && (ret == LZMA_OK)) || (ret == LZMA_STREAM_END)) {
+        if (((strm->avail_out == 0) && (ret == LZMA_OK)) || (ret == LZMA_STREAM_END))
+        {
             u_int32_t write_size = sizeof(obuf) - strm->avail_out;
 
-            if (outbuf) {
-                if (wpos + write_size > outsz) {
+            if (outbuf)
+            {
+                if (wpos + write_size > outsz)
+                {
                     return XZ_ERR_MEM_EXCEEDED;
                 }
 
@@ -162,14 +169,16 @@ static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_i
 
         // Normally the return value of lzma_code() will be LZMA_OK
         // until everything has been encoded.
-        if (ret != LZMA_OK) {
+        if (ret != LZMA_OK)
+        {
             // Once everything has been encoded successfully, the
             // return value of lzma_code() will be LZMA_STREAM_END.
             //
             // It is important to check for LZMA_STREAM_END. Do not
             // assume that getting ret != LZMA_OK would mean that
             // everything has gone well.
-            if (ret == LZMA_STREAM_END) {
+            if (ret == LZMA_STREAM_END)
+            {
                 break;
             }
 
@@ -181,38 +190,39 @@ static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_i
             // possible values. Most values listen in lzma_ret
             // enumeration aren't possible in this example.
             // const char *msg;
-            switch (ret) {
-            case LZMA_MEM_ERROR:
-                return XZ_ERR_INTERNAL_MEM;
-
-            case LZMA_DATA_ERROR:
-                // This error is returned if the compressed
-                // or uncompressed size get near 8 EiB
-                // (2^63 bytes) because that's where the .xz
-                // file format size limits currently are.
-                // That is, the possibility of this error
-                // is mostly theoretical unless you are doing
-                // something very unusual.
-                //
-                // Note that strm->total_in and strm->total_out
-                // have nothing to do with this error. Changing
-                // those variables won't increase or decrease
-                // the chance of getting this error.
-                return XZ_ERR_MEM_EXCEEDED;
-
-            default:
-                // This is most likely LZMA_PROG_ERROR, but
-                // if this program is buggy (or liblzma has
-                // a bug), it may be e.g. LZMA_BUF_ERROR or
-                // LZMA_OPTIONS_ERROR too.
-                //
-                // It is inconvenient to have a separate
-                // error message for errors that should be
-                // impossible to occur, but knowing the error
-                // code is important for debugging. That's why
-                // it is good to print the error code at least
-                // when there is no good error message to show.
-                return XZ_ERR_UNKNOWN;
+            switch (ret)
+            {
+                case LZMA_MEM_ERROR:
+                    return XZ_ERR_INTERNAL_MEM;
+
+                case LZMA_DATA_ERROR:
+                    // This error is returned if the compressed
+                    // or uncompressed size get near 8 EiB
+                    // (2^63 bytes) because that's where the .xz
+                    // file format size limits currently are.
+                    // That is, the possibility of this error
+                    // is mostly theoretical unless you are doing
+                    // something very unusual.
+                    //
+                    // Note that strm->total_in and strm->total_out
+                    // have nothing to do with this error. Changing
+                    // those variables won't increase or decrease
+                    // the chance of getting this error.
+                    return XZ_ERR_MEM_EXCEEDED;
+
+                default:
+                    // This is most likely LZMA_PROG_ERROR, but
+                    // if this program is buggy (or liblzma has
+                    // a bug), it may be e.g. LZMA_BUF_ERROR or
+                    // LZMA_OPTIONS_ERROR too.
+                    //
+                    // It is inconvenient to have a separate
+                    // error message for errors that should be
+                    // impossible to occur, but knowing the error
+                    // code is important for debugging. That's why
+                    // it is good to print the error code at least
+                    // when there is no good error message to show.
+                    return XZ_ERR_UNKNOWN;
             }
 
             return XZ_ERR_ENCODE_FAULT;
@@ -223,7 +233,8 @@ static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_i
     }
 
     // In case wpos is zero (for any lzma unknown reason, LZMA_STREAM_END reached immediately) perform clean up.
-    if (wpos == 0) {
+    if (wpos == 0)
+    {
         return XZ_ERR_ENCODE_FAULT;
     }
 
@@ -231,9 +242,13 @@ static int32_t xcompress(lzma_stream *strm, u_int8_t *inbuf, u_int32_t insz, u_i
     return wpos;
 }
 
-
-static int32_t xpress(int comp_decomp_, u_int32_t preset, u_int8_t *inbuf,
-                      u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz, lzma_check check)
+static int32_t xpress(int comp_decomp_,
+                      u_int32_t preset,
+                      u_int8_t* inbuf,
+                      u_int32_t insz,
+                      u_int8_t* outbuf,
+                      u_int32_t outsz,
+                      lzma_check check)
 {
     int32_t rc;
     u_int32_t sz;
@@ -241,13 +256,17 @@ static int32_t xpress(int comp_decomp_, u_int32_t preset, u_int8_t *inbuf,
     lzma_stream init_strm = LZMA_STREAM_INIT;
 
     strm = init_strm;
-    if (comp_decomp_) {
+    if (comp_decomp_)
+    {
         rc = init_decoder(&strm);
-    } else {
+    }
+    else
+    {
         rc = init_encoder(&strm, preset, check);
     }
 
-    if (rc) {
+    if (rc)
+    {
         return rc;
     }
 
@@ -261,39 +280,44 @@ int32_t xz_compress_crc32(u_int32_t preset, u_int8_t* inbuf, u_int32_t insz, u_i
     return xpress(0, preset, inbuf, insz, outbuf, outsz, LZMA_CHECK_CRC32);
 }
 
-int32_t xz_compress(u_int32_t preset, u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz)
+int32_t xz_compress(u_int32_t preset, u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz)
 {
     return xpress(0, preset, inbuf, insz, outbuf, outsz, LZMA_CHECK_CRC64);
 }
 
-
-int32_t xz_decompress(u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz)
+int32_t xz_decompress(u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz)
 {
     return xpress(1, 0, inbuf, insz, outbuf, outsz, LZMA_CHECK_CRC64);
 }
 
-int32_t xz_decompress_crc32(u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz)
+int32_t xz_decompress_crc32(u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz)
 {
     return xpress(1, 0, inbuf, insz, outbuf, outsz, LZMA_CHECK_CRC32);
 }
 const char* xz_get_error(int32_t error)
 {
-    if (error == XZ_ERR_MEM_EXCEEDED) {
+    if (error == XZ_ERR_MEM_EXCEEDED)
+    {
         return "XZ_ERR_MEM_EXCEEDED";
     }
-    else if (error == XZ_ERR_INTERNAL_MEM) {
+    else if (error == XZ_ERR_INTERNAL_MEM)
+    {
         return "XZ_ERR_INTERNAL_MEM";
     }
-    else if (error == XZ_ERR_PRESET_NO_SUPP) {
+    else if (error == XZ_ERR_PRESET_NO_SUPP)
+    {
         return "XZ_ERR_PRESET_NO_SUPP";
     }
-    else if (error == XZ_ERR_INTEGRITY_NOT_SUPP) {
+    else if (error == XZ_ERR_INTEGRITY_NOT_SUPP)
+    {
         return "XZ_ERR_INTEGRITY_NOT_SUPP";
     }
-    else if (error == XZ_ERR_ENCODE_FAULT) {
+    else if (error == XZ_ERR_ENCODE_FAULT)
+    {
         return "XZ_ERR_ENCODE_FAULT";
     }
-    else {
+    else
+    {
         return "UNKNOWN ERROR";
     }
 }
diff --git a/xz_utils/xz_utils.h b/xz_utils/xz_utils.h
old mode 100755
new mode 100644
index a8bbf2b6..edf2ef89
--- a/xz_utils/xz_utils.h
+++ b/xz_utils/xz_utils.h
@@ -37,24 +37,25 @@
 #include <common/compatibility.h>
 
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
 
-enum
-{
-    XZ_ERR_UNKNOWN              = -1,
-    XZ_ERR_MEM_EXCEEDED         = -2,
-    XZ_ERR_INTERNAL_MEM         = -3,
-    XZ_ERR_PRESET_NO_SUPP       = -4,
-    XZ_ERR_INTEGRITY_NOT_SUPP   = -5,
-    XZ_ERR_ENCODE_FAULT         = -6
-};
+    enum
+    {
+        XZ_ERR_UNKNOWN = -1,
+        XZ_ERR_MEM_EXCEEDED = -2,
+        XZ_ERR_INTERNAL_MEM = -3,
+        XZ_ERR_PRESET_NO_SUPP = -4,
+        XZ_ERR_INTEGRITY_NOT_SUPP = -5,
+        XZ_ERR_ENCODE_FAULT = -6
+    };
 
-int32_t   xz_compress(u_int32_t preset, u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz);
-int32_t   xz_decompress(u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz);
-int32_t   xz_compress_crc32(u_int32_t preset, u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz);
-int32_t   xz_decompress_crc32(u_int8_t *inbuf, u_int32_t insz, u_int8_t *outbuf, u_int32_t outsz);
-const char* xz_get_error(int32_t error);
+    int32_t xz_compress(u_int32_t preset, u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz);
+    int32_t xz_decompress(u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz);
+    int32_t xz_compress_crc32(u_int32_t preset, u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz);
+    int32_t xz_decompress_crc32(u_int8_t* inbuf, u_int32_t insz, u_int8_t* outbuf, u_int32_t outsz);
+    const char* xz_get_error(int32_t error);
 #ifdef __cplusplus
 }
 #endif

From 8482fa1c2189a878ec6cd2d8189ea8b114f33244 Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Sun, 10 Jul 2022 14:58:24 +0300
Subject: [PATCH 25/46] [MSTFLINT] mstflint build unused variables

Description: Removed unused variables in mlxconfig for building with "NO_OPEN_SSL" flag

Tested OS: Linux
Tested devices: N/A
Tested flows: Build

Known gaps (with RM ticket): N/A

Issue: 3115231
---
 mlxconfig/mlxcfg_generic_commander.cpp | 2 ++
 mlxconfig/mlxcfg_parser.cpp            | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mlxconfig/mlxcfg_generic_commander.cpp b/mlxconfig/mlxcfg_generic_commander.cpp
index b1edec14..9035d5eb 100644
--- a/mlxconfig/mlxcfg_generic_commander.cpp
+++ b/mlxconfig/mlxcfg_generic_commander.cpp
@@ -1642,6 +1642,8 @@ void GenericCommander::sign(vector<u_int32_t>& buff,
 #else
     (void)buff;
     (void)privateKeyFile;
+    (void)openssl_engine;
+    (void)openssl_key_identifier;
     throw MlxcfgException("Sign command is not implemented\n");
 #endif
 }
diff --git a/mlxconfig/mlxcfg_parser.cpp b/mlxconfig/mlxcfg_parser.cpp
index 4e3a3432..25e474c9 100644
--- a/mlxconfig/mlxcfg_parser.cpp
+++ b/mlxconfig/mlxcfg_parser.cpp
@@ -417,7 +417,6 @@ mlxCfgStatus MlxCfg::getNumberFromString(const char* str, u_int32_t& num)
 
 mlxCfgStatus MlxCfg::parseArgs(int argc, char* argv[])
 {
-    mlxCfgStatus status = MLX_CFG_OK;
     int i = 1;
     for (; i < argc; i++)
     {

From 1d9c1406b3815b5bf784d43e7e0f6f3588e8b6a2 Mon Sep 17 00:00:00 2001
From: Oded Burstein <oburstein@nvidia.com>
Date: Tue, 12 Jul 2022 14:34:46 +0300
Subject: [PATCH 26/46] removed deprecated device types

Description: mst_if, mdevs_if
---
 include/mtcr_ul/mtcr_com_defs.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/mtcr_ul/mtcr_com_defs.h b/include/mtcr_ul/mtcr_com_defs.h
index c33fad18..463ea805 100644
--- a/include/mtcr_ul/mtcr_com_defs.h
+++ b/include/mtcr_ul/mtcr_com_defs.h
@@ -242,7 +242,6 @@ typedef enum MType_t
     /*MST_CALBR,*/
     MST_USB = 0x20,
     MST_IB = 0x40,
-    MST_IF = 0x80,
     MST_PPC = 0x100,
     MST_USB_DIMAX = 0x200,
     MST_FWCTX = 0x400,
@@ -280,7 +279,6 @@ typedef enum Mdevs_t
     MDEVS_TAVOR_DDR = 0x08,     /*  Each device that maps to DDR */
     MDEVS_TAVOR_UAR = 0x10,     /*  Each device that maps to UAR */
     MDEVS_TAVOR_CR = 0x20,      /*  Each device that maps to CR */
-    MDEVS_IF = 0x40,            /*  Standard device  interface */
     MDEVS_REM = 0x80,           /*  Remote devices */
     MDEVS_PPC = 0x100,          /*  PPC devices */
     MDEVS_DEV_I2C = 0x200,      /* Generic linux kernel i2c device */

From 2be91b8cb31636d8f4d420b8d67d1436012f7fcc Mon Sep 17 00:00:00 2001
From: Oded Burstein <oburstein@nvidia.com>
Date: Tue, 12 Jul 2022 15:03:30 +0300
Subject: [PATCH 27/46] Descriptiobs | updated libjson

Description: updated jsoncpp library to latest version: 1.9.5.:
---
 configure.ac                         |    2 +-
 ext_libs/json/Makefile.am            |   10 +-
 ext_libs/json/json/allocator.h       |   88 +
 ext_libs/json/json/assertions.h      |   61 +
 ext_libs/json/json/autolink.h        |   24 -
 ext_libs/json/json/config.h          |  162 +-
 ext_libs/json/json/features.h        |   47 -
 ext_libs/json/json/forwards.h        |   26 +-
 ext_libs/json/json/json.h            |    8 +-
 ext_libs/json/json/json_features.h   |   61 +
 ext_libs/json/json/reader.h          |  533 +++--
 ext_libs/json/json/value.h           | 1650 ++++++++-------
 ext_libs/json/json/version.h         |   28 +
 ext_libs/json/json/writer.h          |  390 +++-
 ext_libs/json/json_batchallocator.h  |  126 --
 ext_libs/json/json_internalarray.inl |  453 -----
 ext_libs/json/json_internalmap.inl   |  612 ------
 ext_libs/json/json_reader.cpp        | 2522 +++++++++++++++++------
 ext_libs/json/json_tool.h            |  138 ++
 ext_libs/json/json_value.cpp         | 2773 +++++++++++++-------------
 ext_libs/json/json_valueiterator.inl |  323 +--
 ext_libs/json/json_writer.cpp        | 1796 +++++++++++------
 22 files changed, 6529 insertions(+), 5304 deletions(-)
 mode change 100644 => 100755 ext_libs/json/Makefile.am
 create mode 100644 ext_libs/json/json/allocator.h
 create mode 100644 ext_libs/json/json/assertions.h
 delete mode 100644 ext_libs/json/json/autolink.h
 mode change 100644 => 100755 ext_libs/json/json/config.h
 delete mode 100644 ext_libs/json/json/features.h
 mode change 100644 => 100755 ext_libs/json/json/forwards.h
 mode change 100644 => 100755 ext_libs/json/json/json.h
 create mode 100644 ext_libs/json/json/json_features.h
 mode change 100644 => 100755 ext_libs/json/json/reader.h
 mode change 100644 => 100755 ext_libs/json/json/value.h
 create mode 100644 ext_libs/json/json/version.h
 mode change 100644 => 100755 ext_libs/json/json/writer.h
 delete mode 100644 ext_libs/json/json_batchallocator.h
 delete mode 100644 ext_libs/json/json_internalarray.inl
 delete mode 100644 ext_libs/json/json_internalmap.inl
 create mode 100644 ext_libs/json/json_tool.h

diff --git a/configure.ac b/configure.ac
index 477da4c4..4d549ee4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,7 +283,7 @@ PKG_CHECK_MODULES([JSON], [jsoncpp], [JSON_SYSTEM_AVAILABLE="yes"],[
     JSON_SYSTEM_AVAILABLE="no"
     JSON_CFLAGS='-I$(top_srcdir)/ext_libs/json'
     AC_SUBST(JSON_CFLAGS)
-    JSON_LIBS='$(top_builddir)/ext_libs/json/libjson.a'
+    JSON_LIBS='$(top_builddir)/ext_libs/json/libjson.la'
     AC_SUBST(JSON_LIBS)
 ])
 AM_CONDITIONAL([USE_LOCAL_JSON], [test "$JSON_SYSTEM_AVAILABLE" = no])
diff --git a/ext_libs/json/Makefile.am b/ext_libs/json/Makefile.am
old mode 100644
new mode 100755
index 05aad0a9..1c60bad9
--- a/ext_libs/json/Makefile.am
+++ b/ext_libs/json/Makefile.am
@@ -35,11 +35,11 @@
 
 USER_DIR = ../
 INCLUDES =
-AM_CPPFLAGS = -W  -g -MP -MD ${COMPILER_FPIC}
-noinst_LTLIBRARIES = libjson.a
-libjson_a_SOURCES = json_reader.cpp  json_value.cpp  json_batchallocator.h  json_writer.cpp  json/*.h
+AM_CPPFLAGS = -W -Werror -g -MP -MD ${COMPILER_FPIC} -Wno-missing-field-initializers -Wno-unused-parameter
+noinst_LTLIBRARIES = libjson.la
+libjson_la_SOURCES = json_reader.cpp  json_value.cpp  json_tool.h  json_writer.cpp  json/*.h
 
-libjson_a_DEPENDENCIES =
-libjson_a_LIBADD =
+libjson_la_DEPENDENCIES =
+libjson_la_LIBADD =
 
 EXTRA_DIST = *.inl
diff --git a/ext_libs/json/json/allocator.h b/ext_libs/json/json/allocator.h
new file mode 100644
index 00000000..95ef8a5e
--- /dev/null
+++ b/ext_libs/json/json/allocator.h
@@ -0,0 +1,88 @@
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef JSON_ALLOCATOR_H_INCLUDED
+#define JSON_ALLOCATOR_H_INCLUDED
+
+#include <cstring>
+#include <memory>
+
+#pragma pack(push, 8)
+
+namespace Json {
+template <typename T> class SecureAllocator {
+public:
+  // Type definitions
+  using value_type = T;
+  using pointer = T*;
+  using const_pointer = const T*;
+  using reference = T&;
+  using const_reference = const T&;
+  using size_type = std::size_t;
+  using difference_type = std::ptrdiff_t;
+
+  /**
+   * Allocate memory for N items using the standard allocator.
+   */
+  pointer allocate(size_type n) {
+    // allocate using "global operator new"
+    return static_cast<pointer>(::operator new(n * sizeof(T)));
+  }
+
+  /**
+   * Release memory which was allocated for N items at pointer P.
+   *
+   * The memory block is filled with zeroes before being released.
+   */
+  void deallocate(pointer p, size_type n) {
+    // memset_s is used because memset may be optimized away by the compiler
+    memset_s(p, n * sizeof(T), 0, n * sizeof(T));
+    // free using "global operator delete"
+    ::operator delete(p);
+  }
+
+  /**
+   * Construct an item in-place at pointer P.
+   */
+  template <typename... Args> void construct(pointer p, Args&&... args) {
+    // construct using "placement new" and "perfect forwarding"
+    ::new (static_cast<void*>(p)) T(std::forward<Args>(args)...);
+  }
+
+  size_type max_size() const { return size_t(-1) / sizeof(T); }
+
+  pointer address(reference x) const { return std::addressof(x); }
+
+  const_pointer address(const_reference x) const { return std::addressof(x); }
+
+  /**
+   * Destroy an item in-place at pointer P.
+   */
+  void destroy(pointer p) {
+    // destroy using "explicit destructor"
+    p->~T();
+  }
+
+  // Boilerplate
+  SecureAllocator() {}
+  template <typename U> SecureAllocator(const SecureAllocator<U>&) {}
+  template <typename U> struct rebind { using other = SecureAllocator<U>; };
+};
+
+template <typename T, typename U>
+bool operator==(const SecureAllocator<T>&, const SecureAllocator<U>&) {
+  return true;
+}
+
+template <typename T, typename U>
+bool operator!=(const SecureAllocator<T>&, const SecureAllocator<U>&) {
+  return false;
+}
+
+} // namespace Json
+
+#pragma pack(pop)
+
+#endif // JSON_ALLOCATOR_H_INCLUDED
diff --git a/ext_libs/json/json/assertions.h b/ext_libs/json/json/assertions.h
new file mode 100644
index 00000000..666fa7f5
--- /dev/null
+++ b/ext_libs/json/json/assertions.h
@@ -0,0 +1,61 @@
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef JSON_ASSERTIONS_H_INCLUDED
+#define JSON_ASSERTIONS_H_INCLUDED
+
+#include <cstdlib>
+#include <sstream>
+
+#if !defined(JSON_IS_AMALGAMATION)
+#include "config.h"
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+/** It should not be possible for a maliciously designed file to
+ *  cause an abort() or seg-fault, so these macros are used only
+ *  for pre-condition violations and internal logic errors.
+ */
+#if JSON_USE_EXCEPTION
+
+// @todo <= add detail about condition in exception
+#define JSON_ASSERT(condition)                                                 \
+  do {                                                                         \
+    if (!(condition)) {                                                        \
+      Json::throwLogicError("assert json failed");                             \
+    }                                                                          \
+  } while (0)
+
+#define JSON_FAIL_MESSAGE(message)                                             \
+  do {                                                                         \
+    OStringStream oss;                                                         \
+    oss << message;                                                            \
+    Json::throwLogicError(oss.str());                                          \
+    abort();                                                                   \
+  } while (0)
+
+#else // JSON_USE_EXCEPTION
+
+#define JSON_ASSERT(condition) assert(condition)
+
+// The call to assert() will show the failure message in debug builds. In
+// release builds we abort, for a core-dump or debugger.
+#define JSON_FAIL_MESSAGE(message)                                             \
+  {                                                                            \
+    OStringStream oss;                                                         \
+    oss << message;                                                            \
+    assert(false && oss.str().c_str());                                        \
+    abort();                                                                   \
+  }
+
+#endif
+
+#define JSON_ASSERT_MESSAGE(condition, message)                                \
+  do {                                                                         \
+    if (!(condition)) {                                                        \
+      JSON_FAIL_MESSAGE(message);                                              \
+    }                                                                          \
+  } while (0)
+
+#endif // JSON_ASSERTIONS_H_INCLUDED
diff --git a/ext_libs/json/json/autolink.h b/ext_libs/json/json/autolink.h
deleted file mode 100644
index a38df5e8..00000000
--- a/ext_libs/json/json/autolink.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_AUTOLINK_H_INCLUDED
-#define JSON_AUTOLINK_H_INCLUDED
-
-#include "config.h"
-
-#ifdef JSON_IN_CPPTL
-#include <cpptl/cpptl_autolink.h>
-#endif
-
-#if !defined(JSON_NO_AUTOLINK) && !defined(JSON_DLL_BUILD) && !defined(JSON_IN_CPPTL)
-#define CPPTL_AUTOLINK_NAME "json"
-#undef CPPTL_AUTOLINK_DLL
-#ifdef JSON_DLL
-#define CPPTL_AUTOLINK_DLL
-#endif
-#include "autolink.h"
-#endif
-
-#endif // JSON_AUTOLINK_H_INCLUDED
diff --git a/ext_libs/json/json/config.h b/ext_libs/json/json/config.h
old mode 100644
new mode 100755
index c57273dd..6359273a
--- a/ext_libs/json/json/config.h
+++ b/ext_libs/json/json/config.h
@@ -1,48 +1,150 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 #ifndef JSON_CONFIG_H_INCLUDED
 #define JSON_CONFIG_H_INCLUDED
+#include <cstddef>
+#include <cstdint>
+#include <istream>
+#include <memory>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <type_traits>
 
-/// If defined, indicates that json library is embedded in CppTL library.
-//# define JSON_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-//#  define JSON_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of std::map
-/// as Value container.
-//#  define JSON_USE_CPPTL_SMALLMAP 1
-/// If defined, indicates that Json specific container should be used
-/// (hash table & simple deque container with customizable allocator).
-/// THIS FEATURE IS STILL EXPERIMENTAL!
-//#  define JSON_VALUE_USE_INTERNAL_MAP 1
-/// Force usage of standard new/malloc based allocator instead of memory pool based allocator.
-/// The memory pools allocator used optimization (initializing Value and ValueInternalLink
-/// as if it was a POD) that may cause some validation tool to report errors.
-/// Only has effects if JSON_VALUE_USE_INTERNAL_MAP is defined.
-//#  define JSON_USE_SIMPLE_INTERNAL_ALLOCATOR 1
-
-/// If defined, indicates that Json use exception to report invalid type manipulation
-/// instead of C assert macro.
+// If non-zero, the library uses exceptions to report bad input instead of C
+// assertion macros. The default is to use exceptions.
+#ifndef JSON_USE_EXCEPTION
 #define JSON_USE_EXCEPTION 1
-
-#ifdef JSON_IN_CPPTL
-#include <cpptl/config.h>
-#ifndef JSON_USE_CPPTL
-#define JSON_USE_CPPTL 1
 #endif
+
+// Temporary, tracked for removal with issue #982.
+#ifndef JSON_USE_NULLREF
+#define JSON_USE_NULLREF 1
 #endif
 
-#ifdef JSON_IN_CPPTL
-#define JSON_API CPPTL_API
-#elif defined(JSON_DLL_BUILD)
+/// If defined, indicates that the source file is amalgamated
+/// to prevent private header inclusion.
+/// Remarks: it is automatically defined in the generated amalgamated header.
+// #define JSON_IS_AMALGAMATION
+
+// Export macros for DLL visibility
+#if defined(JSON_DLL_BUILD)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #define JSON_API __declspec(dllexport)
+#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#elif defined(__GNUC__) || defined(__clang__)
+#define JSON_API __attribute__((visibility("default")))
+#endif // if defined(_MSC_VER)
+
 #elif defined(JSON_DLL)
+#if defined(_MSC_VER) || defined(__MINGW32__)
 #define JSON_API __declspec(dllimport)
-#else
+#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
+#endif // if defined(_MSC_VER)
+#endif // ifdef JSON_DLL_BUILD
+
+#if !defined(JSON_API)
 #define JSON_API
 #endif
 
+#if defined(_MSC_VER) && _MSC_VER < 1800
+#error                                                                         \
+    "ERROR:  Visual Studio 12 (2013) with _MSC_VER=1800 is the oldest supported compiler with sufficient C++11 capabilities"
+#endif
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+// As recommended at
+// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
+extern JSON_API int msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
+                                              const char* format, ...);
+#define jsoncpp_snprintf msvc_pre1900_c99_snprintf
+#else
+#define jsoncpp_snprintf std::snprintf
+#endif
+
+// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
+// integer
+// Storages, and 64 bits integer support is disabled.
+// #define JSON_NO_INT64 1
+
+// JSONCPP_OVERRIDE is maintained for backwards compatibility of external tools.
+// C++11 should be used directly in JSONCPP.
+#define JSONCPP_OVERRIDE override
+
+#ifdef __clang__
+#if __has_extension(attribute_deprecated_with_message)
+#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
+#endif
+#elif defined(__GNUC__) // not clang (gcc comes later since clang emulates gcc)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+#define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#define JSONCPP_DEPRECATED(message) __attribute__((__deprecated__))
+#endif                  // GNUC version
+#elif defined(_MSC_VER) // MSVC (after clang because clang on Windows emulates
+                        // MSVC)
+#define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
+#endif // __clang__ || __GNUC__ || _MSC_VER
+
+#if !defined(JSONCPP_DEPRECATED)
+#define JSONCPP_DEPRECATED(message)
+#endif // if !defined(JSONCPP_DEPRECATED)
+
+#if defined(__clang__) || (defined(__GNUC__) && (__GNUC__ >= 6))
+#define JSON_USE_INT64_DOUBLE_CONVERSION 1
+#endif
+
+#if !defined(JSON_IS_AMALGAMATION)
+
+#include "allocator.h"
+#include "version.h"
+
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+namespace Json {
+using Int = int;
+using UInt = unsigned int;
+#if defined(JSON_NO_INT64)
+using LargestInt = int;
+using LargestUInt = unsigned int;
+#undef JSON_HAS_INT64
+#else                 // if defined(JSON_NO_INT64)
+// For Microsoft Visual use specific types as long long is not supported
+#if defined(_MSC_VER) // Microsoft Visual Studio
+using Int64 = __int64;
+using UInt64 = unsigned __int64;
+#else                 // if defined(_MSC_VER) // Other platforms, use long long
+using Int64 = int64_t;
+using UInt64 = uint64_t;
+#endif                // if defined(_MSC_VER)
+using LargestInt = Int64;
+using LargestUInt = UInt64;
+#define JSON_HAS_INT64
+#endif // if defined(JSON_NO_INT64)
+
+template <typename T>
+using Allocator =
+    typename std::conditional<JSONCPP_USING_SECURE_MEMORY, SecureAllocator<T>,
+                              std::allocator<T>>::type;
+using String = std::basic_string<char, std::char_traits<char>, Allocator<char>>;
+using IStringStream =
+    std::basic_istringstream<String::value_type, String::traits_type,
+                             String::allocator_type>;
+using OStringStream =
+    std::basic_ostringstream<String::value_type, String::traits_type,
+                             String::allocator_type>;
+using IStream = std::istream;
+using OStream = std::ostream;
+} // namespace Json
+
+// Legacy names (formerly macros).
+using JSONCPP_STRING = Json::String;
+using JSONCPP_ISTRINGSTREAM = Json::IStringStream;
+using JSONCPP_OSTRINGSTREAM = Json::OStringStream;
+using JSONCPP_ISTREAM = Json::IStream;
+using JSONCPP_OSTREAM = Json::OStream;
+
 #endif // JSON_CONFIG_H_INCLUDED
diff --git a/ext_libs/json/json/features.h b/ext_libs/json/json/features.h
deleted file mode 100644
index d5de93d5..00000000
--- a/ext_libs/json/json/features.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-#define CPPTL_JSON_FEATURES_H_INCLUDED
-
-#include "forwards.h"
-
-namespace Json
-{
-/** \brief Configuration passed to reader and writer.
- * This configuration object can be used to force the Reader or Writer
- * to behave in a standard conforming way.
- */
-class JSON_API Features
-{
-public:
-    /** \brief A configuration that allows all features and assumes all strings are UTF-8.
-     * - C & C++ comments are allowed
-     * - Root object can be any JSON value
-     * - Assumes Value strings are encoded in UTF-8
-     */
-    static Features all();
-
-    /** \brief A configuration that is strictly compatible with the JSON specification.
-     * - Comments are forbidden.
-     * - Root object must be either an array or an object value.
-     * - Assumes Value strings are encoded in UTF-8
-     */
-    static Features strictMode();
-
-    /** \brief Initialize the configuration like JsonConfig::allFeatures;
-     */
-    Features();
-
-    /// \c true if comments are allowed. Default: \c true.
-    bool allowComments_;
-
-    /// \c true if root must be either an array or an object value. Default: \c false.
-    bool strictRoot_;
-};
-
-} // namespace Json
-
-#endif // CPPTL_JSON_FEATURES_H_INCLUDED
diff --git a/ext_libs/json/json/forwards.h b/ext_libs/json/json/forwards.h
old mode 100644
new mode 100755
index 04b96a0d..affe33a7
--- a/ext_libs/json/json/forwards.h
+++ b/ext_libs/json/json/forwards.h
@@ -1,4 +1,4 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
@@ -6,23 +6,30 @@
 #ifndef JSON_FORWARDS_H_INCLUDED
 #define JSON_FORWARDS_H_INCLUDED
 
+#if !defined(JSON_IS_AMALGAMATION)
 #include "config.h"
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+namespace Json {
 
-namespace Json
-{
 // writer.h
+class StreamWriter;
+class StreamWriterBuilder;
+class Writer;
 class FastWriter;
 class StyledWriter;
+class StyledStreamWriter;
 
 // reader.h
 class Reader;
+class CharReader;
+class CharReaderBuilder;
 
-// features.h
+// json_features.h
 class Features;
 
 // value.h
-typedef int Int;
-typedef unsigned int UInt;
+using ArrayIndex = unsigned int;
 class StaticString;
 class Path;
 class PathArgument;
@@ -30,13 +37,6 @@ class Value;
 class ValueIteratorBase;
 class ValueIterator;
 class ValueConstIterator;
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-class ValueAllocator;
-class ValueMapAllocator;
-class ValueInternalLink;
-class ValueInternalArray;
-class ValueInternalMap;
-#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
 
 } // namespace Json
 
diff --git a/ext_libs/json/json/json.h b/ext_libs/json/json/json.h
old mode 100644
new mode 100755
index 8f10ac2b..5c776a16
--- a/ext_libs/json/json/json.h
+++ b/ext_libs/json/json/json.h
@@ -1,4 +1,4 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
@@ -6,10 +6,10 @@
 #ifndef JSON_JSON_H_INCLUDED
 #define JSON_JSON_H_INCLUDED
 
-#include "autolink.h"
-#include "value.h"
+#include "config.h"
+#include "json_features.h"
 #include "reader.h"
+#include "value.h"
 #include "writer.h"
-#include "features.h"
 
 #endif // JSON_JSON_H_INCLUDED
diff --git a/ext_libs/json/json/json_features.h b/ext_libs/json/json/json_features.h
new file mode 100644
index 00000000..7c7e9f5d
--- /dev/null
+++ b/ext_libs/json/json/json_features.h
@@ -0,0 +1,61 @@
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef JSON_FEATURES_H_INCLUDED
+#define JSON_FEATURES_H_INCLUDED
+
+#if !defined(JSON_IS_AMALGAMATION)
+#include "forwards.h"
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+#pragma pack(push, 8)
+
+namespace Json {
+
+/** \brief Configuration passed to reader and writer.
+ * This configuration object can be used to force the Reader or Writer
+ * to behave in a standard conforming way.
+ */
+class JSON_API Features {
+public:
+  /** \brief A configuration that allows all features and assumes all strings
+   * are UTF-8.
+   * - C & C++ comments are allowed
+   * - Root object can be any JSON value
+   * - Assumes Value strings are encoded in UTF-8
+   */
+  static Features all();
+
+  /** \brief A configuration that is strictly compatible with the JSON
+   * specification.
+   * - Comments are forbidden.
+   * - Root object must be either an array or an object value.
+   * - Assumes Value strings are encoded in UTF-8
+   */
+  static Features strictMode();
+
+  /** \brief Initialize the configuration like JsonConfig::allFeatures;
+   */
+  Features();
+
+  /// \c true if comments are allowed. Default: \c true.
+  bool allowComments_{true};
+
+  /// \c true if root must be either an array or an object value. Default: \c
+  /// false.
+  bool strictRoot_{false};
+
+  /// \c true if dropped null placeholders are allowed. Default: \c false.
+  bool allowDroppedNullPlaceholders_{false};
+
+  /// \c true if numeric object key are allowed. Default: \c false.
+  bool allowNumericKeys_{false};
+};
+
+} // namespace Json
+
+#pragma pack(pop)
+
+#endif // JSON_FEATURES_H_INCLUDED
diff --git a/ext_libs/json/json/reader.h b/ext_libs/json/json/reader.h
old mode 100644
new mode 100755
index 8503280c..be0d7676
--- a/ext_libs/json/json/reader.h
+++ b/ext_libs/json/json/reader.h
@@ -1,180 +1,405 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#ifndef CPPTL_JSON_READER_H_INCLUDED
-#define CPPTL_JSON_READER_H_INCLUDED
+#ifndef JSON_READER_H_INCLUDED
+#define JSON_READER_H_INCLUDED
 
-#include "features.h"
+#if !defined(JSON_IS_AMALGAMATION)
+#include "json_features.h"
 #include "value.h"
+#endif // if !defined(JSON_IS_AMALGAMATION)
 #include <deque>
+#include <iosfwd>
+#include <istream>
 #include <stack>
 #include <string>
-#include <iostream>
 
-namespace Json
-{
-/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a Value.
+// Disable warning C4251: <data member>: <type> needs to have dll-interface to
+// be used by...
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+#pragma warning(push)
+#pragma warning(disable : 4251)
+#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+
+#pragma pack(push, 8)
+
+namespace Json {
+
+/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a
+ * Value.
  *
+ * \deprecated Use CharReader and CharReaderBuilder.
  */
-class JSON_API Reader
-{
+
+class JSON_API Reader {
 public:
-    typedef char Char;
-    typedef const Char* Location;
+  using Char = char;
+  using Location = const Char*;
 
-    /** \brief Constructs a Reader allowing all features
-     * for parsing.
-     */
-    Reader();
+  /** \brief An error tagged with where in the JSON text it was encountered.
+   *
+   * The offsets give the [start, limit) range of bytes within the text. Note
+   * that this is bytes, not codepoints.
+   */
+  struct StructuredError {
+    ptrdiff_t offset_start;
+    ptrdiff_t offset_limit;
+    String message;
+  };
 
-    /** \brief Constructs a Reader allowing the specified feature set
-     * for parsing.
-     */
-    Reader(const Features& features);
-
-    /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-     * \param document UTF-8 encoded string containing the document to read.
-     * \param root [out] Contains the root value of the document if it was
-     *             successfully parsed.
-     * \param collectComments \c true to collect comment and allow writing them back during
-     *                        serialization, \c false to discard comments.
-     *                        This parameter is ignored if Features::allowComments_
-     *                        is \c false.
-     * \return \c true if the document was successfully parsed, \c false if an error occurred.
-     */
-    bool parse(const std::string& document, Value& root, bool collectComments = true);
-
-    /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a> document.
-     * \param document UTF-8 encoded string containing the document to read.
-     * \param root [out] Contains the root value of the document if it was
-     *             successfully parsed.
-     * \param collectComments \c true to collect comment and allow writing them back during
-     *                        serialization, \c false to discard comments.
-     *                        This parameter is ignored if Features::allowComments_
-     *                        is \c false.
-     * \return \c true if the document was successfully parsed, \c false if an error occurred.
-     */
-    bool parse(const char* beginDoc, const char* endDoc, Value& root, bool collectComments = true);
+  /** \brief Constructs a Reader allowing all features for parsing.
+    * \deprecated Use CharReader and CharReaderBuilder.
+   */
+  Reader();
 
-    /// \brief Parse from input stream.
-    /// \see Json::operator>>(std::istream&, Json::Value&).
-    bool parse(std::istream& is, Value& root, bool collectComments = true);
+  /** \brief Constructs a Reader allowing the specified feature set for parsing.
+    * \deprecated Use CharReader and CharReaderBuilder.
+   */
+  Reader(const Features& features);
 
-    /** \brief Returns a user friendly string that list errors in the parsed document.
-     * \return Formatted error message with the list of errors with their location in
-     *         the parsed document. An empty string is returned if no error occurred
-     *         during parsing.
-     */
-    std::string getFormatedErrorMessages() const;
+  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
+   * document.
+   *
+   * \param      document        UTF-8 encoded string containing the document
+   *                             to read.
+   * \param[out] root            Contains the root value of the document if it
+   *                             was successfully parsed.
+   * \param      collectComments \c true to collect comment and allow writing
+   *                             them back during serialization, \c false to
+   *                             discard comments.  This parameter is ignored
+   *                             if Features::allowComments_ is \c false.
+   * \return \c true if the document was successfully parsed, \c false if an
+   * error occurred.
+   */
+  bool parse(const std::string& document, Value& root,
+             bool collectComments = true);
+
+  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
+   * document.
+   *
+   * \param      beginDoc        Pointer on the beginning of the UTF-8 encoded
+   *                             string of the document to read.
+   * \param      endDoc          Pointer on the end of the UTF-8 encoded string
+   *                             of the document to read.  Must be >= beginDoc.
+   * \param[out] root            Contains the root value of the document if it
+   *                             was successfully parsed.
+   * \param      collectComments \c true to collect comment and allow writing
+   *                             them back during serialization, \c false to
+   *                             discard comments.  This parameter is ignored
+   *                             if Features::allowComments_ is \c false.
+   * \return \c true if the document was successfully parsed, \c false if an
+   * error occurred.
+   */
+  bool parse(const char* beginDoc, const char* endDoc, Value& root,
+             bool collectComments = true);
+
+  /// \brief Parse from input stream.
+  /// \see Json::operator>>(std::istream&, Json::Value&).
+  bool parse(IStream& is, Value& root, bool collectComments = true);
+
+  /** \brief Returns a user friendly string that list errors in the parsed
+   * document.
+   *
+   * \return Formatted error message with the list of errors with their
+   * location in the parsed document. An empty string is returned if no error
+   * occurred during parsing.
+   * \deprecated Use getFormattedErrorMessages() instead (typo fix).
+   */
+  JSONCPP_DEPRECATED("Use getFormattedErrorMessages() instead.")
+  String getFormatedErrorMessages() const;
+
+  /** \brief Returns a user friendly string that list errors in the parsed
+   * document.
+   *
+   * \return Formatted error message with the list of errors with their
+   * location in the parsed document. An empty string is returned if no error
+   * occurred during parsing.
+   */
+  String getFormattedErrorMessages() const;
+
+  /** \brief Returns a vector of structured errors encountered while parsing.
+   *
+   * \return A (possibly empty) vector of StructuredError objects. Currently
+   * only one error can be returned, but the caller should tolerate multiple
+   * errors.  This can occur if the parser recovers from a non-fatal parse
+   * error and then encounters additional errors.
+   */
+  std::vector<StructuredError> getStructuredErrors() const;
+
+  /** \brief Add a semantic error message.
+   *
+   * \param value   JSON Value location associated with the error
+   * \param message The error message.
+   * \return \c true if the error was successfully added, \c false if the Value
+   * offset exceeds the document size.
+   */
+  bool pushError(const Value& value, const String& message);
+
+  /** \brief Add a semantic error message with extra context.
+   *
+   * \param value   JSON Value location associated with the error
+   * \param message The error message.
+   * \param extra   Additional JSON Value location to contextualize the error
+   * \return \c true if the error was successfully added, \c false if either
+   * Value offset exceeds the document size.
+   */
+  bool pushError(const Value& value, const String& message, const Value& extra);
+
+  /** \brief Return whether there are any errors.
+   *
+   * \return \c true if there are no errors to report \c false if errors have
+   * occurred.
+   */
+  bool good() const;
 
 private:
-    enum TokenType
-    {
-        tokenEndOfStream = 0,
-        tokenObjectBegin,
-        tokenObjectEnd,
-        tokenArrayBegin,
-        tokenArrayEnd,
-        tokenString,
-        tokenNumber,
-        tokenTrue,
-        tokenFalse,
-        tokenNull,
-        tokenArraySeparator,
-        tokenMemberSeparator,
-        tokenComment,
-        tokenError
-    };
-
-    class Token
-    {
-    public:
-        TokenType type_;
-        Location start_;
-        Location end_;
-    };
-
-    class ErrorInfo
-    {
-    public:
-        Token token_;
-        std::string message_;
-        Location extra_;
-    };
-
-    typedef std::deque<ErrorInfo> Errors;
-
-    bool expectToken(TokenType type, Token& token, const char* message);
-    bool readToken(Token& token);
-    void skipSpaces();
-    bool match(Location pattern, int patternLength);
-    bool readComment();
-    bool readCStyleComment();
-    bool readCppStyleComment();
-    bool readString();
-    void readNumber();
-    bool readValue();
-    bool readObject(Token& token);
-    bool readArray(Token& token);
-    bool decodeNumber(Token& token);
-    bool decodeString(Token& token);
-    bool decodeString(Token& token, std::string& decoded);
-    bool decodeDouble(Token& token);
-    bool decodeUnicodeCodePoint(Token& token, Location& current, Location end, unsigned int& unicode);
-    bool decodeUnicodeEscapeSequence(Token& token, Location& current, Location end, unsigned int& unicode);
-    bool addError(const std::string& message, Token& token, Location extra = 0);
-    bool recoverFromError(TokenType skipUntilToken);
-    bool addErrorAndRecover(const std::string& message, Token& token, TokenType skipUntilToken);
-    void skipUntilSpace();
-    Value& currentValue();
-    Char getNextChar();
-    void getLocationLineAndColumn(Location location, int& line, int& column) const;
-    std::string getLocationLineAndColumn(Location location) const;
-    void addComment(Location begin, Location end, CommentPlacement placement);
-    void skipCommentTokens(Token& token);
-
-    typedef std::stack<Value*> Nodes;
-    Nodes nodes_;
-    Errors errors_;
-    std::string document_;
-    Location begin_;
+  enum TokenType {
+    tokenEndOfStream = 0,
+    tokenObjectBegin,
+    tokenObjectEnd,
+    tokenArrayBegin,
+    tokenArrayEnd,
+    tokenString,
+    tokenNumber,
+    tokenTrue,
+    tokenFalse,
+    tokenNull,
+    tokenArraySeparator,
+    tokenMemberSeparator,
+    tokenComment,
+    tokenError
+  };
+
+  class Token {
+  public:
+    TokenType type_;
+    Location start_;
     Location end_;
-    Location current_;
-    Location lastValueEnd_;
-    Value* lastValue_;
-    std::string commentsBefore_;
-    Features features_;
-    bool collectComments_;
+  };
+
+  class ErrorInfo {
+  public:
+    Token token_;
+    String message_;
+    Location extra_;
+  };
+
+  using Errors = std::deque<ErrorInfo>;
+
+  bool readToken(Token& token);
+  void skipSpaces();
+  bool match(const Char* pattern, int patternLength);
+  bool readComment();
+  bool readCStyleComment();
+  bool readCppStyleComment();
+  bool readString();
+  void readNumber();
+  bool readValue();
+  bool readObject(Token& token);
+  bool readArray(Token& token);
+  bool decodeNumber(Token& token);
+  bool decodeNumber(Token& token, Value& decoded);
+  bool decodeString(Token& token);
+  bool decodeString(Token& token, String& decoded);
+  bool decodeDouble(Token& token);
+  bool decodeDouble(Token& token, Value& decoded);
+  bool decodeUnicodeCodePoint(Token& token, Location& current, Location end,
+                              unsigned int& unicode);
+  bool decodeUnicodeEscapeSequence(Token& token, Location& current,
+                                   Location end, unsigned int& unicode);
+  bool addError(const String& message, Token& token, Location extra = nullptr);
+  bool recoverFromError(TokenType skipUntilToken);
+  bool addErrorAndRecover(const String& message, Token& token,
+                          TokenType skipUntilToken);
+  void skipUntilSpace();
+  Value& currentValue();
+  Char getNextChar();
+  void getLocationLineAndColumn(Location location, int& line,
+                                int& column) const;
+  String getLocationLineAndColumn(Location location) const;
+  void addComment(Location begin, Location end, CommentPlacement placement);
+  void skipCommentTokens(Token& token);
+
+  static bool containsNewLine(Location begin, Location end);
+  static String normalizeEOL(Location begin, Location end);
+
+  using Nodes = std::stack<Value*>;
+  Nodes nodes_;
+  Errors errors_;
+  String document_;
+  Location begin_{};
+  Location end_{};
+  Location current_{};
+  Location lastValueEnd_{};
+  Value* lastValue_{};
+  String commentsBefore_;
+  Features features_;
+  bool collectComments_{};
+}; // Reader
+
+/** Interface for reading JSON from a char array.
+ */
+class JSON_API CharReader {
+public:
+  virtual ~CharReader() = default;
+  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
+   * document. The document must be a UTF-8 encoded string containing the
+   * document to read.
+   *
+   * \param      beginDoc Pointer on the beginning of the UTF-8 encoded string
+   *                      of the document to read.
+   * \param      endDoc   Pointer on the end of the UTF-8 encoded string of the
+   *                      document to read. Must be >= beginDoc.
+   * \param[out] root     Contains the root value of the document if it was
+   *                      successfully parsed.
+   * \param[out] errs     Formatted error messages (if not NULL) a user
+   *                      friendly string that lists errors in the parsed
+   *                      document.
+   * \return \c true if the document was successfully parsed, \c false if an
+   * error occurred.
+   */
+  virtual bool parse(char const* beginDoc, char const* endDoc, Value* root,
+                     String* errs) = 0;
+
+  class JSON_API Factory {
+  public:
+    virtual ~Factory() = default;
+    /** \brief Allocate a CharReader via operator new().
+     * \throw std::exception if something goes wrong (e.g. invalid settings)
+     */
+    virtual CharReader* newCharReader() const = 0;
+  }; // Factory
+};   // CharReader
+
+/** \brief Build a CharReader implementation.
+ *
+ * Usage:
+ *   \code
+ *   using namespace Json;
+ *   CharReaderBuilder builder;
+ *   builder["collectComments"] = false;
+ *   Value value;
+ *   String errs;
+ *   bool ok = parseFromStream(builder, std::cin, &value, &errs);
+ *   \endcode
+ */
+class JSON_API CharReaderBuilder : public CharReader::Factory {
+public:
+  // Note: We use a Json::Value so that we can add data-members to this class
+  // without a major version bump.
+  /** Configuration of this builder.
+   * These are case-sensitive.
+   * Available settings (case-sensitive):
+   * - `"collectComments": false or true`
+   *   - true to collect comment and allow writing them back during
+   *     serialization, false to discard comments.  This parameter is ignored
+   *     if allowComments is false.
+   * - `"allowComments": false or true`
+   *   - true if comments are allowed.
+   * - `"allowTrailingCommas": false or true`
+   *   - true if trailing commas in objects and arrays are allowed.
+   * - `"strictRoot": false or true`
+   *   - true if root must be either an array or an object value
+   * - `"allowDroppedNullPlaceholders": false or true`
+   *   - true if dropped null placeholders are allowed. (See
+   *     StreamWriterBuilder.)
+   * - `"allowNumericKeys": false or true`
+   *   - true if numeric object keys are allowed.
+   * - `"allowSingleQuotes": false or true`
+   *   - true if '' are allowed for strings (both keys and values)
+   * - `"stackLimit": integer`
+   *   - Exceeding stackLimit (recursive depth of `readValue()`) will cause an
+   *     exception.
+   *   - This is a security issue (seg-faults caused by deeply nested JSON), so
+   *     the default is low.
+   * - `"failIfExtra": false or true`
+   *   - If true, `parse()` returns false when extra non-whitespace trails the
+   *     JSON value in the input string.
+   * - `"rejectDupKeys": false or true`
+   *   - If true, `parse()` returns false when a key is duplicated within an
+   *     object.
+   * - `"allowSpecialFloats": false or true`
+   *   - If true, special float values (NaNs and infinities) are allowed and
+   *     their values are lossfree restorable.
+   * - `"skipBom": false or true`
+   *   - If true, if the input starts with the Unicode byte order mark (BOM),
+   *     it is skipped.
+   *
+   * You can examine 'settings_` yourself to see the defaults. You can also
+   * write and read them just like any JSON Value.
+   * \sa setDefaults()
+   */
+  Json::Value settings_;
+
+  CharReaderBuilder();
+  ~CharReaderBuilder() override;
+
+  CharReader* newCharReader() const override;
+
+  /** \return true if 'settings' are legal and consistent;
+   *   otherwise, indicate bad settings via 'invalid'.
+   */
+  bool validate(Json::Value* invalid) const;
+
+  /** A simple way to update a specific setting.
+   */
+  Value& operator[](const String& key);
+
+  /** Called by ctor, but you can use this to reset settings_.
+   * \pre 'settings' != NULL (but Json::null is fine)
+   * \remark Defaults:
+   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults
+   */
+  static void setDefaults(Json::Value* settings);
+  /** Same as old Features::strictMode().
+   * \pre 'settings' != NULL (but Json::null is fine)
+   * \remark Defaults:
+   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode
+   */
+  static void strictMode(Json::Value* settings);
 };
 
-/** \brief Read from 'sin' into 'root'.
+/** Consume entire stream and use its begin/end.
+ * Someday we might have a real StreamReader, but for now this
+ * is convenient.
+ */
+bool JSON_API parseFromStream(CharReader::Factory const&, IStream&, Value* root,
+                              String* errs);
 
- Always keep comments from the input JSON.
-
- This can be used to read a file into a particular sub-object.
- For example:
- \code
- Json::Value root;
- cin >> root["dir"]["file"];
- cout << root;
- \endcode
- Result:
- \verbatim
- {
-     "dir": {
-         "file": {
-             // The input stream JSON would be nested here.
-         }
-     }
- }
- \endverbatim
- \throw std::exception on parse error.
- \see Json::operator<<()
-*/
-std::istream& operator>>(std::istream&, Value&);
+/** \brief Read from 'sin' into 'root'.
+ *
+ * Always keep comments from the input JSON.
+ *
+ * This can be used to read a file into a particular sub-object.
+ * For example:
+ *   \code
+ *   Json::Value root;
+ *   cin >> root["dir"]["file"];
+ *   cout << root;
+ *   \endcode
+ * Result:
+ * \verbatim
+ * {
+ * "dir": {
+ *    "file": {
+ *    // The input stream JSON would be nested here.
+ *    }
+ * }
+ * }
+ * \endverbatim
+ * \throw std::exception on parse error.
+ * \see Json::operator<<()
+ */
+JSON_API IStream& operator>>(IStream&, Value&);
 
 } // namespace Json
 
-#endif // CPPTL_JSON_READER_H_INCLUDED
+#pragma pack(pop)
+
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+#pragma warning(pop)
+#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+
+#endif // JSON_READER_H_INCLUDED
diff --git a/ext_libs/json/json/value.h b/ext_libs/json/json/value.h
old mode 100644
new mode 100755
index a07a1a44..0edeb050
--- a/ext_libs/json/json/value.h
+++ b/ext_libs/json/json/value.h
@@ -1,58 +1,138 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#ifndef CPPTL_JSON_H_INCLUDED
-#define CPPTL_JSON_H_INCLUDED
+#ifndef JSON_H_INCLUDED
+#define JSON_H_INCLUDED
 
+#if !defined(JSON_IS_AMALGAMATION)
 #include "forwards.h"
-#include <string>
-#include <vector>
-
-#ifndef JSON_USE_CPPTL_SMALLMAP
-#include <map>
+#endif // if !defined(JSON_IS_AMALGAMATION)
+
+// Conditional NORETURN attribute on the throw functions would:
+// a) suppress false positives from static code analysis
+// b) possibly improve optimization opportunities.
+#if !defined(JSONCPP_NORETURN)
+#if defined(_MSC_VER) && _MSC_VER == 1800
+#define JSONCPP_NORETURN __declspec(noreturn)
 #else
-#include <cpptl/smallmap.h>
+#define JSONCPP_NORETURN [[noreturn]]
+#endif
+#endif
+
+// Support for '= delete' with template declarations was a late addition
+// to the c++11 standard and is rejected by clang 3.8 and Apple clang 8.2
+// even though these declare themselves to be c++11 compilers.
+#if !defined(JSONCPP_TEMPLATE_DELETE)
+#if defined(__clang__) && defined(__apple_build_version__)
+#if __apple_build_version__ <= 8000042
+#define JSONCPP_TEMPLATE_DELETE
+#endif
+#elif defined(__clang__)
+#if __clang_major__ == 3 && __clang_minor__ <= 8
+#define JSONCPP_TEMPLATE_DELETE
+#endif
+#endif
+#if !defined(JSONCPP_TEMPLATE_DELETE)
+#define JSONCPP_TEMPLATE_DELETE = delete
 #endif
-#ifdef JSON_USE_CPPTL
-#include <cpptl/forwards.h>
 #endif
 
+#include <array>
+#include <exception>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+// Disable warning C4251: <data member>: <type> needs to have dll-interface to
+// be used by...
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+#pragma warning(push)
+#pragma warning(disable : 4251 4275)
+#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+
+#pragma pack(push, 8)
+
 /** \brief JSON (JavaScript Object Notation).
  */
-namespace Json
-{
+namespace Json {
+
+#if JSON_USE_EXCEPTION
+/** Base class for all exceptions we throw.
+ *
+ * We use nothing but these internally. Of course, STL can throw others.
+ */
+class JSON_API Exception : public std::exception {
+public:
+  Exception(String msg);
+  ~Exception() noexcept override;
+  char const* what() const noexcept override;
+
+protected:
+  String msg_;
+};
+
+/** Exceptions which the user cannot easily avoid.
+ *
+ * E.g. out-of-memory (when we use malloc), stack-overflow, malicious input
+ *
+ * \remark derived from Json::Exception
+ */
+class JSON_API RuntimeError : public Exception {
+public:
+  RuntimeError(String const& msg);
+};
+
+/** Exceptions thrown by JSON_ASSERT/JSON_FAIL macros.
+ *
+ * These are precondition-violations (user bugs) and internal errors (our bugs).
+ *
+ * \remark derived from Json::Exception
+ */
+class JSON_API LogicError : public Exception {
+public:
+  LogicError(String const& msg);
+};
+#endif
+
+/// used internally
+JSONCPP_NORETURN void throwRuntimeError(String const& msg);
+/// used internally
+JSONCPP_NORETURN void throwLogicError(String const& msg);
+
 /** \brief Type of the value held by a Value object.
  */
-enum ValueType
-{
-    nullValue = 0, ///< 'null' value
-    intValue,      ///< signed integer value
-    uintValue,     ///< unsigned integer value
-    realValue,     ///< double value
-    stringValue,   ///< UTF-8 string value
-    booleanValue,  ///< bool value
-    arrayValue,    ///< array value (ordered list)
-    objectValue    ///< object value (collection of name/value pairs).
+enum ValueType {
+  nullValue = 0, ///< 'null' value
+  intValue,      ///< signed integer value
+  uintValue,     ///< unsigned integer value
+  realValue,     ///< double value
+  stringValue,   ///< UTF-8 string value
+  booleanValue,  ///< bool value
+  arrayValue,    ///< array value (ordered list)
+  objectValue    ///< object value (collection of name/value pairs).
 };
 
-enum CommentPlacement
-{
-    commentBefore = 0,      ///< a comment placed on the line before a value
-    commentAfterOnSameLine, ///< a comment just after a value on the same line
-    commentAfter,           ///< a comment on the line after a value (only make sense for root value)
-    numberOfCommentPlacement
+enum CommentPlacement {
+  commentBefore = 0,      ///< a comment placed on the line before a value
+  commentAfterOnSameLine, ///< a comment just after a value on the same line
+  commentAfter, ///< a comment on the line after a value (only make sense for
+  /// root value)
+  numberOfCommentPlacement
 };
 
-//# ifdef JSON_USE_CPPTL
-//   typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
-//   typedef CppTL::AnyEnumerator<const Value &> EnumValues;
-//# endif
+/** \brief Type of precision for formatting of real values.
+ */
+enum PrecisionType {
+  significantDigits = 0, ///< we set max number of significant digits in string
+  decimalPlaces          ///< we set max number of digits after "." in string
+};
 
 /** \brief Lightweight wrapper to tag static string.
  *
- * Value constructor and objectValue member assignement takes advantage of the
+ * Value constructor and objectValue member assignment takes advantage of the
  * StaticString and avoid the cost of string duplication when storing the
  * string or the member name.
  *
@@ -64,17 +144,16 @@ enum CommentPlacement
  * object[code] = 1234;
  * \endcode
  */
-class JSON_API StaticString
-{
+class JSON_API StaticString {
 public:
-    explicit StaticString(const char* czstring) : str_(czstring) {}
+  explicit StaticString(const char* czstring) : c_str_(czstring) {}
 
-    operator const char*() const { return str_; }
+  operator const char*() const { return c_str_; }
 
-    const char* c_str() const { return str_; }
+  const char* c_str() const { return c_str_; }
 
 private:
-    const char* str_;
+  const char* c_str_;
 };
 
 /** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
@@ -92,359 +171,536 @@ class JSON_API StaticString
  * The type of the held value is represented by a #ValueType and
  * can be obtained using type().
  *
- * values of an #objectValue or #arrayValue can be accessed using operator[]() methods.
- * Non const methods will automatically create the a #nullValue element
+ * Values of an #objectValue or #arrayValue can be accessed using operator[]()
+ * methods.
+ * Non-const methods will automatically create the a #nullValue element
  * if it does not exist.
- * The sequence of an #arrayValue will be automatically resize and initialized
+ * The sequence of an #arrayValue will be automatically resized and initialized
  * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
  *
- * The get() methods can be used to obtanis default value in the case the required element
- * does not exist.
+ * The get() methods can be used to obtain default value in the case the
+ * required element does not exist.
  *
- * It is possible to iterate over the list of a #objectValue values using
+ * It is possible to iterate over the list of member keys of an object using
  * the getMemberNames() method.
+ *
+ * \note #Value string-length fit in size_t, but keys must be < 2^30.
+ * (The reason is an implementation detail.) A #CharReader will raise an
+ * exception if a bound is exceeded to avoid security holes in your app,
+ * but the Value API does *not* check bounds. That is the responsibility
+ * of the caller.
  */
-class JSON_API Value
-{
-    friend class ValueIteratorBase;
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    friend class ValueInternalLink;
-    friend class ValueInternalMap;
-#endif
+class JSON_API Value {
+  friend class ValueIteratorBase;
+
 public:
-    typedef std::vector<std::string> Members;
-    typedef ValueIterator iterator;
-    typedef ValueConstIterator const_iterator;
-    typedef Json::UInt UInt;
-    typedef Json::Int Int;
-    typedef UInt ArrayIndex;
-
-    static const Value null;
-    static const Int minInt;
-    static const Int maxInt;
-    static const UInt maxUInt;
+  using Members = std::vector<String>;
+  using iterator = ValueIterator;
+  using const_iterator = ValueConstIterator;
+  using UInt = Json::UInt;
+  using Int = Json::Int;
+#if defined(JSON_HAS_INT64)
+  using UInt64 = Json::UInt64;
+  using Int64 = Json::Int64;
+#endif // defined(JSON_HAS_INT64)
+  using LargestInt = Json::LargestInt;
+  using LargestUInt = Json::LargestUInt;
+  using ArrayIndex = Json::ArrayIndex;
+
+  // Required for boost integration, e. g. BOOST_TEST
+  using value_type = std::string;
+
+#if JSON_USE_NULLREF
+  // Binary compatibility kludges, do not use.
+  static const Value& null;
+  static const Value& nullRef;
+#endif
 
+  // null and nullRef are deprecated, use this instead.
+  static Value const& nullSingleton();
+
+  /// Minimum signed integer value that can be stored in a Json::Value.
+  static constexpr LargestInt minLargestInt =
+      LargestInt(~(LargestUInt(-1) / 2));
+  /// Maximum signed integer value that can be stored in a Json::Value.
+  static constexpr LargestInt maxLargestInt = LargestInt(LargestUInt(-1) / 2);
+  /// Maximum unsigned integer value that can be stored in a Json::Value.
+  static constexpr LargestUInt maxLargestUInt = LargestUInt(-1);
+
+  /// Minimum signed int value that can be stored in a Json::Value.
+  static constexpr Int minInt = Int(~(UInt(-1) / 2));
+  /// Maximum signed int value that can be stored in a Json::Value.
+  static constexpr Int maxInt = Int(UInt(-1) / 2);
+  /// Maximum unsigned int value that can be stored in a Json::Value.
+  static constexpr UInt maxUInt = UInt(-1);
+
+#if defined(JSON_HAS_INT64)
+  /// Minimum signed 64 bits int value that can be stored in a Json::Value.
+  static constexpr Int64 minInt64 = Int64(~(UInt64(-1) / 2));
+  /// Maximum signed 64 bits int value that can be stored in a Json::Value.
+  static constexpr Int64 maxInt64 = Int64(UInt64(-1) / 2);
+  /// Maximum unsigned 64 bits int value that can be stored in a Json::Value.
+  static constexpr UInt64 maxUInt64 = UInt64(-1);
+#endif // defined(JSON_HAS_INT64)
+  /// Default precision for real value for string representation.
+  static constexpr UInt defaultRealPrecision = 17;
+  // The constant is hard-coded because some compiler have trouble
+  // converting Value::maxUInt64 to a double correctly (AIX/xlC).
+  // Assumes that UInt64 is a 64 bits integer.
+  static constexpr double maxUInt64AsDouble = 18446744073709551615.0;
+// Workaround for bug in the NVIDIAs CUDA 9.1 nvcc compiler
+// when using gcc and clang backend compilers.  CZString
+// cannot be defined as private.  See issue #486
+#ifdef __NVCC__
+public:
+#else
 private:
+#endif
 #ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    class CZString
-    {
-    public:
-        enum DuplicationPolicy
-        {
-            noDuplication = 0,
-            duplicate,
-            duplicateOnCopy
-        };
-        CZString(int index);
-        CZString(const char* cstr, DuplicationPolicy allocate);
-        CZString(const CZString& other);
-        ~CZString();
-        CZString& operator=(const CZString& other);
-        bool operator<(const CZString& other) const;
-        bool operator==(const CZString& other) const;
-        int index() const;
-        const char* c_str() const;
-        bool isStaticString() const;
-
-    private:
-        void swap(CZString& other);
-        const char* cstr_;
-        int index_;
+  class CZString {
+  public:
+    enum DuplicationPolicy { noDuplication = 0, duplicate, duplicateOnCopy };
+    CZString(ArrayIndex index);
+    CZString(char const* str, unsigned length, DuplicationPolicy allocate);
+    CZString(CZString const& other);
+    CZString(CZString&& other) noexcept;
+    ~CZString();
+    CZString& operator=(const CZString& other);
+    CZString& operator=(CZString&& other) noexcept;
+
+    bool operator<(CZString const& other) const;
+    bool operator==(CZString const& other) const;
+    ArrayIndex index() const;
+    // const char* c_str() const; ///< \deprecated
+    char const* data() const;
+    unsigned length() const;
+    bool isStaticString() const;
+
+  private:
+    void swap(CZString& other);
+
+    struct StringStorage {
+      unsigned policy_ : 2;
+      unsigned length_ : 30; // 1GB max
+    };
+
+    char const* cstr_; // actually, a prefixed string, unless policy is noDup
+    union {
+      ArrayIndex index_;
+      StringStorage storage_;
     };
+  };
 
 public:
-#ifndef JSON_USE_CPPTL_SMALLMAP
-    typedef std::map<CZString, Value> ObjectValues;
-#else
-    typedef CppTL::SmallMap<CZString, Value> ObjectValues;
-#endif // ifndef JSON_USE_CPPTL_SMALLMAP
-#endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
+  typedef std::map<CZString, Value> ObjectValues;
 #endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
 
 public:
-    /** \brief Create a default Value of the given type.
-
-      This is a very useful constructor.
-      To create an empty array, pass arrayValue.
-      To create an empty object, pass objectValue.
-      Another Value can then be set to this one by assignment.
-      This is useful since clear() and resize() will not alter types.
-
-      Examples:
-      \code
-      Json::Value null_value; // null
-      Json::Value arr_value(Json::arrayValue); // []
-      Json::Value obj_value(Json::objectValue); // {}
-      \endcode
-    */
-    Value(ValueType type = nullValue);
-    Value(Int value);
-    Value(UInt value);
-    Value(double value);
-    Value(const char* value);
-    Value(const char* beginValue, const char* endValue);
-    /** \brief Constructs a value from a static string.
-
-     * Like other value string constructor but do not duplicate the string for
-     * internal storage. The given string must remain alive after the call to this
-     * constructor.
-     * Example of usage:
-     * \code
-     * Json::Value aValue( StaticString("some text") );
-     * \endcode
-     */
-    Value(const StaticString& value);
-    Value(const std::string& value);
-#ifdef JSON_USE_CPPTL
-    Value(const CppTL::ConstString& value);
+  /**
+   * \brief Create a default Value of the given type.
+   *
+   * This is a very useful constructor.
+   * To create an empty array, pass arrayValue.
+   * To create an empty object, pass objectValue.
+   * Another Value can then be set to this one by assignment.
+   * This is useful since clear() and resize() will not alter types.
+   *
+   * Examples:
+   *   \code
+   *   Json::Value null_value; // null
+   *   Json::Value arr_value(Json::arrayValue); // []
+   *   Json::Value obj_value(Json::objectValue); // {}
+   *   \endcode
+   */
+  Value(ValueType type = nullValue);
+  Value(Int value);
+  Value(UInt value);
+#if defined(JSON_HAS_INT64)
+  Value(Int64 value);
+  Value(UInt64 value);
+#endif // if defined(JSON_HAS_INT64)
+  Value(double value);
+  Value(const char* value); ///< Copy til first 0. (NULL causes to seg-fault.)
+  Value(const char* begin, const char* end); ///< Copy all, incl zeroes.
+  /**
+   * \brief Constructs a value from a static string.
+   *
+   * Like other value string constructor but do not duplicate the string for
+   * internal storage. The given string must remain alive after the call to
+   * this constructor.
+   *
+   * \note This works only for null-terminated strings. (We cannot change the
+   * size of this class, so we have nowhere to store the length, which might be
+   * computed later for various operations.)
+   *
+   * Example of usage:
+   *   \code
+   *   static StaticString foo("some text");
+   *   Json::Value aValue(foo);
+   *   \endcode
+   */
+  Value(const StaticString& value);
+  Value(const String& value);
+  Value(bool value);
+  Value(std::nullptr_t ptr) = delete;
+  Value(const Value& other);
+  Value(Value&& other) noexcept;
+  ~Value();
+
+  /// \note Overwrite existing comments. To preserve comments, use
+  /// #swapPayload().
+  Value& operator=(const Value& other);
+  Value& operator=(Value&& other) noexcept;
+
+  /// Swap everything.
+  void swap(Value& other);
+  /// Swap values but leave comments and source offsets in place.
+  void swapPayload(Value& other);
+
+  /// copy everything.
+  void copy(const Value& other);
+  /// copy values but leave comments and source offsets in place.
+  void copyPayload(const Value& other);
+
+  ValueType type() const;
+
+  /// Compare payload only, not comments etc.
+  bool operator<(const Value& other) const;
+  bool operator<=(const Value& other) const;
+  bool operator>=(const Value& other) const;
+  bool operator>(const Value& other) const;
+  bool operator==(const Value& other) const;
+  bool operator!=(const Value& other) const;
+  int compare(const Value& other) const;
+
+  const char* asCString() const; ///< Embedded zeroes could cause you trouble!
+#if JSONCPP_USING_SECURE_MEMORY
+  unsigned getCStringLength() const; // Allows you to understand the length of
+                                     // the CString
 #endif
-    Value(bool value);
-    Value(const Value& other);
-    ~Value();
+  String asString() const; ///< Embedded zeroes are possible.
+  /** Get raw char* of string-value.
+   *  \return false if !string. (Seg-fault if str or end are NULL.)
+   */
+  bool getString(char const** begin, char const** end) const;
+  Int asInt() const;
+  UInt asUInt() const;
+#if defined(JSON_HAS_INT64)
+  Int64 asInt64() const;
+  UInt64 asUInt64() const;
+#endif // if defined(JSON_HAS_INT64)
+  LargestInt asLargestInt() const;
+  LargestUInt asLargestUInt() const;
+  float asFloat() const;
+  double asDouble() const;
+  bool asBool() const;
+
+  bool isNull() const;
+  bool isBool() const;
+  bool isInt() const;
+  bool isInt64() const;
+  bool isUInt() const;
+  bool isUInt64() const;
+  bool isIntegral() const;
+  bool isDouble() const;
+  bool isNumeric() const;
+  bool isString() const;
+  bool isArray() const;
+  bool isObject() const;
+
+  /// The `as<T>` and `is<T>` member function templates and specializations.
+  template <typename T> T as() const JSONCPP_TEMPLATE_DELETE;
+  template <typename T> bool is() const JSONCPP_TEMPLATE_DELETE;
+
+  bool isConvertibleTo(ValueType other) const;
+
+  /// Number of values in array or object
+  ArrayIndex size() const;
+
+  /// \brief Return true if empty array, empty object, or null;
+  /// otherwise, false.
+  bool empty() const;
+
+  /// Return !isNull()
+  explicit operator bool() const;
+
+  /// Remove all object members and array elements.
+  /// \pre type() is arrayValue, objectValue, or nullValue
+  /// \post type() is unchanged
+  void clear();
+
+  /// Resize the array to newSize elements.
+  /// New elements are initialized to null.
+  /// May only be called on nullValue or arrayValue.
+  /// \pre type() is arrayValue or nullValue
+  /// \post type() is arrayValue
+  void resize(ArrayIndex newSize);
+
+  //@{
+  /// Access an array element (zero based index). If the array contains less
+  /// than index element, then null value are inserted in the array so that
+  /// its size is index+1.
+  /// (You may need to say 'value[0u]' to get your compiler to distinguish
+  /// this from the operator[] which takes a string.)
+  Value& operator[](ArrayIndex index);
+  Value& operator[](int index);
+  //@}
+
+  //@{
+  /// Access an array element (zero based index).
+  /// (You may need to say 'value[0u]' to get your compiler to distinguish
+  /// this from the operator[] which takes a string.)
+  const Value& operator[](ArrayIndex index) const;
+  const Value& operator[](int index) const;
+  //@}
+
+  /// If the array contains at least index+1 elements, returns the element
+  /// value, otherwise returns defaultValue.
+  Value get(ArrayIndex index, const Value& defaultValue) const;
+  /// Return true if index < size().
+  bool isValidIndex(ArrayIndex index) const;
+  /// \brief Append value to array at the end.
+  ///
+  /// Equivalent to jsonvalue[jsonvalue.size()] = value;
+  Value& append(const Value& value);
+  Value& append(Value&& value);
+
+  /// \brief Insert value in array at specific index
+  bool insert(ArrayIndex index, const Value& newValue);
+  bool insert(ArrayIndex index, Value&& newValue);
+
+  /// Access an object value by name, create a null member if it does not exist.
+  /// \note Because of our implementation, keys are limited to 2^30 -1 chars.
+  /// Exceeding that will cause an exception.
+  Value& operator[](const char* key);
+  /// Access an object value by name, returns null if there is no member with
+  /// that name.
+  const Value& operator[](const char* key) const;
+  /// Access an object value by name, create a null member if it does not exist.
+  /// \param key may contain embedded nulls.
+  Value& operator[](const String& key);
+  /// Access an object value by name, returns null if there is no member with
+  /// that name.
+  /// \param key may contain embedded nulls.
+  const Value& operator[](const String& key) const;
+  /** \brief Access an object value by name, create a null member if it does not
+   * exist.
+   *
+   * If the object has no entry for that name, then the member name used to
+   * store the new entry is not duplicated.
+   * Example of use:
+   *   \code
+   *   Json::Value object;
+   *   static const StaticString code("code");
+   *   object[code] = 1234;
+   *   \endcode
+   */
+  Value& operator[](const StaticString& key);
+  /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
+  Value get(const char* key, const Value& defaultValue) const;
+  /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
+  /// \note key may contain embedded nulls.
+  Value get(const char* begin, const char* end,
+            const Value& defaultValue) const;
+  /// Return the member named key if it exist, defaultValue otherwise.
+  /// \note deep copy
+  /// \param key may contain embedded nulls.
+  Value get(const String& key, const Value& defaultValue) const;
+  /// Most general and efficient version of isMember()const, get()const,
+  /// and operator[]const
+  /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30
+  Value const* find(char const* begin, char const* end) const;
+  /// Most general and efficient version of object-mutators.
+  /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30
+  /// \return non-zero, but JSON_ASSERT if this is neither object nor nullValue.
+  Value* demand(char const* begin, char const* end);
+  /// \brief Remove and return the named member.
+  ///
+  /// Do nothing if it did not exist.
+  /// \pre type() is objectValue or nullValue
+  /// \post type() is unchanged
+  void removeMember(const char* key);
+  /// Same as removeMember(const char*)
+  /// \param key may contain embedded nulls.
+  void removeMember(const String& key);
+  /// Same as removeMember(const char* begin, const char* end, Value* removed),
+  /// but 'key' is null-terminated.
+  bool removeMember(const char* key, Value* removed);
+  /** \brief Remove the named map member.
+   *
+   *  Update 'removed' iff removed.
+   *  \param key may contain embedded nulls.
+   *  \return true iff removed (no exceptions)
+   */
+  bool removeMember(String const& key, Value* removed);
+  /// Same as removeMember(String const& key, Value* removed)
+  bool removeMember(const char* begin, const char* end, Value* removed);
+  /** \brief Remove the indexed array element.
+   *
+   *  O(n) expensive operations.
+   *  Update 'removed' iff removed.
+   *  \return true if removed (no exceptions)
+   */
+  bool removeIndex(ArrayIndex index, Value* removed);
+
+  /// Return true if the object has a member named key.
+  /// \note 'key' must be null-terminated.
+  bool isMember(const char* key) const;
+  /// Return true if the object has a member named key.
+  /// \param key may contain embedded nulls.
+  bool isMember(const String& key) const;
+  /// Same as isMember(String const& key)const
+  bool isMember(const char* begin, const char* end) const;
+
+  /// \brief Return a list of the member names.
+  ///
+  /// If null, return an empty list.
+  /// \pre type() is objectValue or nullValue
+  /// \post if type() was nullValue, it remains nullValue
+  Members getMemberNames() const;
+
+  /// \deprecated Always pass len.
+  JSONCPP_DEPRECATED("Use setComment(String const&) instead.")
+  void setComment(const char* comment, CommentPlacement placement) {
+    setComment(String(comment, strlen(comment)), placement);
+  }
+  /// Comments must be //... or /* ... */
+  void setComment(const char* comment, size_t len, CommentPlacement placement) {
+    setComment(String(comment, len), placement);
+  }
+  /// Comments must be //... or /* ... */
+  void setComment(String comment, CommentPlacement placement);
+  bool hasComment(CommentPlacement placement) const;
+  /// Include delimiters and embedded newlines.
+  String getComment(CommentPlacement placement) const;
+
+  String toStyledString() const;
+
+  const_iterator begin() const;
+  const_iterator end() const;
+
+  iterator begin();
+  iterator end();
+
+  // Accessors for the [start, limit) range of bytes within the JSON text from
+  // which this value was parsed, if any.
+  void setOffsetStart(ptrdiff_t start);
+  void setOffsetLimit(ptrdiff_t limit);
+  ptrdiff_t getOffsetStart() const;
+  ptrdiff_t getOffsetLimit() const;
 
-    Value& operator=(const Value& other);
-    /// Swap values.
-    /// \note Currently, comments are intentionally not swapped, for
-    /// both logic and efficiency.
-    void swap(Value& other);
+private:
+  void setType(ValueType v) {
+    bits_.value_type_ = static_cast<unsigned char>(v);
+  }
+  bool isAllocated() const { return bits_.allocated_; }
+  void setIsAllocated(bool v) { bits_.allocated_ = v; }
+
+  void initBasic(ValueType type, bool allocated = false);
+  void dupPayload(const Value& other);
+  void releasePayload();
+  void dupMeta(const Value& other);
+
+  Value& resolveReference(const char* key);
+  Value& resolveReference(const char* key, const char* end);
+
+  // struct MemberNamesTransform
+  //{
+  //   typedef const char *result_type;
+  //   const char *operator()( const CZString &name ) const
+  //   {
+  //      return name.c_str();
+  //   }
+  //};
+
+  union ValueHolder {
+    LargestInt int_;
+    LargestUInt uint_;
+    double real_;
+    bool bool_;
+    char* string_; // if allocated_, ptr to { unsigned, char[] }.
+    ObjectValues* map_;
+  } value_;
+
+  struct {
+    // Really a ValueType, but types should agree for bitfield packing.
+    unsigned int value_type_ : 8;
+    // Unless allocated_, string_ must be null-terminated.
+    unsigned int allocated_ : 1;
+  } bits_;
+
+  class Comments {
+  public:
+    Comments() = default;
+    Comments(const Comments& that);
+    Comments(Comments&& that) noexcept;
+    Comments& operator=(const Comments& that);
+    Comments& operator=(Comments&& that) noexcept;
+    bool has(CommentPlacement slot) const;
+    String get(CommentPlacement slot) const;
+    void set(CommentPlacement slot, String comment);
+
+  private:
+    using Array = std::array<String, numberOfCommentPlacement>;
+    std::unique_ptr<Array> ptr_;
+  };
+  Comments comments_;
+
+  // [start, limit) byte offsets in the source JSON text from which this Value
+  // was extracted.
+  ptrdiff_t start_;
+  ptrdiff_t limit_;
+};
 
-    ValueType type() const;
+template <> inline bool Value::as<bool>() const { return asBool(); }
+template <> inline bool Value::is<bool>() const { return isBool(); }
 
-    bool operator<(const Value& other) const;
-    bool operator<=(const Value& other) const;
-    bool operator>=(const Value& other) const;
-    bool operator>(const Value& other) const;
+template <> inline Int Value::as<Int>() const { return asInt(); }
+template <> inline bool Value::is<Int>() const { return isInt(); }
 
-    bool operator==(const Value& other) const;
-    bool operator!=(const Value& other) const;
+template <> inline UInt Value::as<UInt>() const { return asUInt(); }
+template <> inline bool Value::is<UInt>() const { return isUInt(); }
 
-    int compare(const Value& other);
+#if defined(JSON_HAS_INT64)
+template <> inline Int64 Value::as<Int64>() const { return asInt64(); }
+template <> inline bool Value::is<Int64>() const { return isInt64(); }
 
-    const char* asCString() const;
-    std::string asString() const;
-#ifdef JSON_USE_CPPTL
-    CppTL::ConstString asConstString() const;
+template <> inline UInt64 Value::as<UInt64>() const { return asUInt64(); }
+template <> inline bool Value::is<UInt64>() const { return isUInt64(); }
 #endif
-    Int asInt() const;
-    UInt asUInt() const;
-    double asDouble() const;
-    bool asBool() const;
-
-    bool isNull() const;
-    bool isBool() const;
-    bool isInt() const;
-    bool isUInt() const;
-    bool isIntegral() const;
-    bool isDouble() const;
-    bool isNumeric() const;
-    bool isString() const;
-    bool isArray() const;
-    bool isObject() const;
-
-    bool isConvertibleTo(ValueType other) const;
-
-    /// Number of values in array or object
-    UInt size() const;
-
-    /// \brief Return true if empty array, empty object, or null;
-    /// otherwise, false.
-    bool empty() const;
-
-    /// Return isNull()
-    bool operator!() const;
-
-    /// Remove all object members and array elements.
-    /// \pre type() is arrayValue, objectValue, or nullValue
-    /// \post type() is unchanged
-    void clear();
-
-    /// Resize the array to size elements.
-    /// New elements are initialized to null.
-    /// May only be called on nullValue or arrayValue.
-    /// \pre type() is arrayValue or nullValue
-    /// \post type() is arrayValue
-    void resize(UInt size);
-
-    /// Access an array element (zero based index ).
-    /// If the array contains less than index element, then null value are inserted
-    /// in the array so that its size is index+1.
-    /// (You may need to say 'value[0u]' to get your compiler to distinguish
-    ///  this from the operator[] which takes a string.)
-    Value& operator[](UInt index);
-    /// Access an array element (zero based index )
-    /// (You may need to say 'value[0u]' to get your compiler to distinguish
-    ///  this from the operator[] which takes a string.)
-    const Value& operator[](UInt index) const;
-    /// If the array contains at least index+1 elements, returns the element value,
-    /// otherwise returns defaultValue.
-    Value get(UInt index, const Value& defaultValue) const;
-    /// Return true if index < size().
-    bool isValidIndex(UInt index) const;
-    /// \brief Append value to array at the end.
-    ///
-    /// Equivalent to jsonvalue[jsonvalue.size()] = value;
-    Value& append(const Value& value);
-
-    /// Access an object value by name, create a null member if it does not exist.
-    Value& operator[](const char* key);
-    /// Access an object value by name, returns null if there is no member with that name.
-    const Value& operator[](const char* key) const;
-    /// Access an object value by name, create a null member if it does not exist.
-    Value& operator[](const std::string& key);
-    /// Access an object value by name, returns null if there is no member with that name.
-    const Value& operator[](const std::string& key) const;
-    /** \brief Access an object value by name, create a null member if it does not exist.
-
-     * If the object as no entry for that name, then the member name used to store
-     * the new entry is not duplicated.
-     * Example of use:
-     * \code
-     * Json::Value object;
-     * static const StaticString code("code");
-     * object[code] = 1234;
-     * \endcode
-     */
-    Value& operator[](const StaticString& key);
-#ifdef JSON_USE_CPPTL
-    /// Access an object value by name, create a null member if it does not exist.
-    Value& operator[](const CppTL::ConstString& key);
-    /// Access an object value by name, returns null if there is no member with that name.
-    const Value& operator[](const CppTL::ConstString& key) const;
-#endif
-    /// Return the member named key if it exist, defaultValue otherwise.
-    Value get(const char* key, const Value& defaultValue) const;
-    /// Return the member named key if it exist, defaultValue otherwise.
-    Value get(const std::string& key, const Value& defaultValue) const;
-#ifdef JSON_USE_CPPTL
-    /// Return the member named key if it exist, defaultValue otherwise.
-    Value get(const CppTL::ConstString& key, const Value& defaultValue) const;
-#endif
-    /// \brief Remove and return the named member.
-    ///
-    /// Do nothing if it did not exist.
-    /// \return the removed Value, or null.
-    /// \pre type() is objectValue or nullValue
-    /// \post type() is unchanged
-    Value removeMember(const char* key);
-    /// Same as removeMember(const char*)
-    Value removeMember(const std::string& key);
-
-    /// Return true if the object has a member named key.
-    bool isMember(const char* key) const;
-    /// Return true if the object has a member named key.
-    bool isMember(const std::string& key) const;
-#ifdef JSON_USE_CPPTL
-    /// Return true if the object has a member named key.
-    bool isMember(const CppTL::ConstString& key) const;
-#endif
-
-    /// \brief Return a list of the member names.
-    ///
-    /// If null, return an empty list.
-    /// \pre type() is objectValue or nullValue
-    /// \post if type() was nullValue, it remains nullValue
-    Members getMemberNames() const;
-
-    //# ifdef JSON_USE_CPPTL
-    //      EnumMemberNames enumMemberNames() const;
-    //      EnumValues enumValues() const;
-    //# endif
-
-    /// Comments must be //... or /* ... */
-    void setComment(const char* comment, CommentPlacement placement);
-    /// Comments must be //... or /* ... */
-    void setComment(const std::string& comment, CommentPlacement placement);
-    bool hasComment(CommentPlacement placement) const;
-    /// Include delimiters and embedded newlines.
-    std::string getComment(CommentPlacement placement) const;
 
-    std::string toStyledString() const;
+template <> inline double Value::as<double>() const { return asDouble(); }
+template <> inline bool Value::is<double>() const { return isDouble(); }
 
-    const_iterator begin() const;
-    const_iterator end() const;
+template <> inline String Value::as<String>() const { return asString(); }
+template <> inline bool Value::is<String>() const { return isString(); }
 
-    iterator begin();
-    iterator end();
-
-private:
-    Value& resolveReference(const char* key, bool isStatic);
-
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    inline bool isItemAvailable() const { return itemIsUsed_ == 0; }
-
-    inline void setItemUsed(bool isUsed = true) { itemIsUsed_ = isUsed ? 1 : 0; }
-
-    inline bool isMemberNameStatic() const { return memberNameIsStatic_ == 0; }
-
-    inline void setMemberNameIsStatic(bool isStatic) { memberNameIsStatic_ = isStatic ? 1 : 0; }
-#endif // # ifdef JSON_VALUE_USE_INTERNAL_MAP
-
-private:
-    struct CommentInfo
-    {
-        CommentInfo();
-        ~CommentInfo();
-
-        void setComment(const char* text);
-
-        char* comment_;
-    };
-
-    // struct MemberNamesTransform
-    //{
-    //   typedef const char *result_type;
-    //   const char *operator()( const CZString &name ) const
-    //   {
-    //      return name.c_str();
-    //   }
-    //};
-
-    union ValueHolder
-    {
-        Int int_;
-        UInt uint_;
-        double real_;
-        bool bool_;
-        char* string_;
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-        ValueInternalArray* array_;
-        ValueInternalMap* map_;
-#else
-        ObjectValues* map_;
-#endif
-    } value_;
-    ValueType type_ : 8;
-    int allocated_ : 1; // Notes: if declared as bool, bitfield is useless.
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    unsigned int itemIsUsed_ : 1; // used by the ValueInternalMap container.
-    int memberNameIsStatic_ : 1;  // used by the ValueInternalMap container.
-#endif
-    CommentInfo* comments_;
-};
+/// These `as` specializations are type conversions, and do not have a
+/// corresponding `is`.
+template <> inline float Value::as<float>() const { return asFloat(); }
+template <> inline const char* Value::as<const char*>() const {
+  return asCString();
+}
 
-/** \brief Experimental and untested: represents an element of the "path" to access a node.
+/** \brief Experimental and untested: represents an element of the "path" to
+ * access a node.
  */
-class PathArgument
-{
+class JSON_API PathArgument {
 public:
-    friend class Path;
+  friend class Path;
 
-    PathArgument();
-    PathArgument(UInt index);
-    PathArgument(const char* key);
-    PathArgument(const std::string& key);
+  PathArgument();
+  PathArgument(ArrayIndex index);
+  PathArgument(const char* key);
+  PathArgument(String key);
 
 private:
-    enum Kind
-    {
-        kindNone = 0,
-        kindIndex,
-        kindKey
-    };
-    std::string key_;
-    UInt index_;
-    Kind kind_;
+  enum Kind { kindNone = 0, kindIndex, kindKey };
+  String key_;
+  ArrayIndex index_{};
+  Kind kind_{kindNone};
 };
 
 /** \brief Experimental and untested: represents a "path" to access a node.
@@ -456,560 +712,224 @@ class PathArgument
  * - ".name1.name2.name3"
  * - ".[0][1][2].name1[3]"
  * - ".%" => member name is provided as parameter
- * - ".[%]" => index is provied as parameter
+ * - ".[%]" => index is provided as parameter
  */
-class Path
-{
+class JSON_API Path {
 public:
-    Path(const std::string& path,
-         const PathArgument& a1 = PathArgument(),
-         const PathArgument& a2 = PathArgument(),
-         const PathArgument& a3 = PathArgument(),
-         const PathArgument& a4 = PathArgument(),
-         const PathArgument& a5 = PathArgument());
-
-    const Value& resolve(const Value& root) const;
-    Value resolve(const Value& root, const Value& defaultValue) const;
-    /// Creates the "path" to access the specified node and returns a reference on the node.
-    Value& make(Value& root) const;
+  Path(const String& path, const PathArgument& a1 = PathArgument(),
+       const PathArgument& a2 = PathArgument(),
+       const PathArgument& a3 = PathArgument(),
+       const PathArgument& a4 = PathArgument(),
+       const PathArgument& a5 = PathArgument());
+
+  const Value& resolve(const Value& root) const;
+  Value resolve(const Value& root, const Value& defaultValue) const;
+  /// Creates the "path" to access the specified node and returns a reference on
+  /// the node.
+  Value& make(Value& root) const;
 
 private:
-    typedef std::vector<const PathArgument*> InArgs;
-    typedef std::vector<PathArgument> Args;
-
-    void makePath(const std::string& path, const InArgs& in);
-    void
-      addPathInArg(const std::string& path, const InArgs& in, InArgs::const_iterator& itInArg, PathArgument::Kind kind);
-    void invalidPath(const std::string& path, int location);
-
-    Args args_;
-};
-
-/** \brief Experimental do not use: Allocator to customize member name and string value memory management done by Value.
- *
- * - makeMemberName() and releaseMemberName() are called to respectively duplicate and
- *   free an Json::objectValue member name.
- * - duplicateStringValue() and releaseStringValue() are called similarly to
- *   duplicate and free a Json::stringValue value.
- */
-class ValueAllocator
-{
-public:
-    enum
-    {
-        unknown = (unsigned)-1
-    };
+  using InArgs = std::vector<const PathArgument*>;
+  using Args = std::vector<PathArgument>;
 
-    virtual ~ValueAllocator();
+  void makePath(const String& path, const InArgs& in);
+  void addPathInArg(const String& path, const InArgs& in,
+                    InArgs::const_iterator& itInArg, PathArgument::Kind kind);
+  static void invalidPath(const String& path, int location);
 
-    virtual char* makeMemberName(const char* memberName) = 0;
-    virtual void releaseMemberName(char* memberName) = 0;
-    virtual char* duplicateStringValue(const char* value, unsigned int length = unknown) = 0;
-    virtual void releaseStringValue(char* value) = 0;
+  Args args_;
 };
 
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-/** \brief Allocator to customize Value internal map.
- * Below is an example of a simple implementation (default implementation actually
- * use memory pool for speed).
- * \code
-   class DefaultValueMapAllocator : public ValueMapAllocator
-   {
-   public: // overridden from ValueMapAllocator
-      virtual ValueInternalMap *newMap()
-      {
-         return new ValueInternalMap();
-      }
-
-      virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-      {
-         return new ValueInternalMap( other );
-      }
-
-      virtual void destructMap( ValueInternalMap *map )
-      {
-         delete map;
-      }
-
-      virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-      {
-         return new ValueInternalLink[size];
-      }
-
-      virtual void releaseMapBuckets( ValueInternalLink *links )
-      {
-         delete [] links;
-      }
-
-      virtual ValueInternalLink *allocateMapLink()
-      {
-         return new ValueInternalLink();
-      }
-
-      virtual void releaseMapLink( ValueInternalLink *link )
-      {
-         delete link;
-      }
-   };
- * \endcode
- */
-class JSON_API ValueMapAllocator
-{
-public:
-    virtual ~ValueMapAllocator();
-    virtual ValueInternalMap* newMap() = 0;
-    virtual ValueInternalMap* newMapCopy(const ValueInternalMap& other) = 0;
-    virtual void destructMap(ValueInternalMap* map) = 0;
-    virtual ValueInternalLink* allocateMapBuckets(unsigned int size) = 0;
-    virtual void releaseMapBuckets(ValueInternalLink* links) = 0;
-    virtual ValueInternalLink* allocateMapLink() = 0;
-    virtual void releaseMapLink(ValueInternalLink* link) = 0;
-};
-
-/** \brief ValueInternalMap hash-map bucket chain link (for internal use only).
- * \internal previous_ & next_ allows for bidirectional traversal.
- */
-class JSON_API ValueInternalLink
-{
-public:
-    enum
-    {
-        itemPerLink = 6
-    }; // sizeof(ValueInternalLink) = 128 on 32 bits architecture.
-    enum InternalFlags
-    {
-        flagAvailable = 0,
-        flagUsed = 1
-    };
-
-    ValueInternalLink();
-
-    ~ValueInternalLink();
-
-    Value items_[itemPerLink];
-    char* keys_[itemPerLink];
-    ValueInternalLink* previous_;
-    ValueInternalLink* next_;
-};
-
-/** \brief A linked page based hash-table implementation used internally by Value.
- * \internal ValueInternalMap is a tradional bucket based hash-table, with a linked
- * list in each bucket to handle collision. There is an addional twist in that
- * each node of the collision linked list is a page containing a fixed amount of
- * value. This provides a better compromise between memory usage and speed.
+/** \brief base class for Value iterators.
  *
- * Each bucket is made up of a chained list of ValueInternalLink. The last
- * link of a given bucket can be found in the 'previous_' field of the following bucket.
- * The last link of the last bucket is stored in tailLink_ as it has no following bucket.
- * Only the last link of a bucket may contains 'available' item. The last link always
- * contains at least one element unless is it the bucket one very first link.
  */
-class JSON_API ValueInternalMap
-{
-    friend class ValueIteratorBase;
-    friend class Value;
-
+class JSON_API ValueIteratorBase {
 public:
-    typedef unsigned int HashKey;
-    typedef unsigned int BucketIndex;
-
-#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-    struct IteratorState
-    {
-        IteratorState() : map_(0), link_(0), itemIndex_(0), bucketIndex_(0) {}
-        ValueInternalMap* map_;
-        ValueInternalLink* link_;
-        BucketIndex itemIndex_;
-        BucketIndex bucketIndex_;
-    };
-#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-    ValueInternalMap();
-    ValueInternalMap(const ValueInternalMap& other);
-    ValueInternalMap& operator=(const ValueInternalMap& other);
-    ~ValueInternalMap();
-
-    void swap(ValueInternalMap& other);
-
-    BucketIndex size() const;
-
-    void clear();
-
-    bool reserveDelta(BucketIndex growth);
-
-    bool reserve(BucketIndex newItemCount);
-
-    const Value* find(const char* key) const;
-
-    Value* find(const char* key);
-
-    Value& resolveReference(const char* key, bool isStatic);
-
-    void remove(const char* key);
+  using iterator_category = std::bidirectional_iterator_tag;
+  using size_t = unsigned int;
+  using difference_type = int;
+  using SelfType = ValueIteratorBase;
+
+  bool operator==(const SelfType& other) const { return isEqual(other); }
+
+  bool operator!=(const SelfType& other) const { return !isEqual(other); }
+
+  difference_type operator-(const SelfType& other) const {
+    return other.computeDistance(*this);
+  }
+
+  /// Return either the index or the member name of the referenced value as a
+  /// Value.
+  Value key() const;
+
+  /// Return the index of the referenced Value, or -1 if it is not an
+  /// arrayValue.
+  UInt index() const;
+
+  /// Return the member name of the referenced Value, or "" if it is not an
+  /// objectValue.
+  /// \note Avoid `c_str()` on result, as embedded zeroes are possible.
+  String name() const;
+
+  /// Return the member name of the referenced Value. "" if it is not an
+  /// objectValue.
+  /// \deprecated This cannot be used for UTF-8 strings, since there can be
+  /// embedded nulls.
+  JSONCPP_DEPRECATED("Use `key = name();` instead.")
+  char const* memberName() const;
+  /// Return the member name of the referenced Value, or NULL if it is not an
+  /// objectValue.
+  /// \note Better version than memberName(). Allows embedded nulls.
+  char const* memberName(char const** end) const;
 
-    void doActualRemove(ValueInternalLink* link, BucketIndex index, BucketIndex bucketIndex);
+protected:
+  /*! Internal utility functions to assist with implementing
+   *   other iterator functions. The const and non-const versions
+   *   of the "deref" protected methods expose the protected
+   *   current_ member variable in a way that can often be
+   *   optimized away by the compiler.
+   */
+  const Value& deref() const;
+  Value& deref();
 
-    ValueInternalLink*& getLastLinkInBucket(BucketIndex bucketIndex);
+  void increment();
 
-    Value& setNewItem(const char* key, bool isStatic, ValueInternalLink* link, BucketIndex index);
+  void decrement();
 
-    Value& unsafeAdd(const char* key, bool isStatic, HashKey hashedKey);
+  difference_type computeDistance(const SelfType& other) const;
 
-    HashKey hash(const char* key) const;
+  bool isEqual(const SelfType& other) const;
 
-    int compare(const ValueInternalMap& other) const;
+  void copy(const SelfType& other);
 
 private:
-    void makeBeginIterator(IteratorState& it) const;
-    void makeEndIterator(IteratorState& it) const;
-    static bool equals(const IteratorState& x, const IteratorState& other);
-    static void increment(IteratorState& iterator);
-    static void incrementBucket(IteratorState& iterator);
-    static void decrement(IteratorState& iterator);
-    static const char* key(const IteratorState& iterator);
-    static const char* key(const IteratorState& iterator, bool& isStatic);
-    static Value& value(const IteratorState& iterator);
-    static int distance(const IteratorState& x, const IteratorState& y);
+  Value::ObjectValues::iterator current_;
+  // Indicates that iterator is for a null value.
+  bool isNull_{true};
 
-private:
-    ValueInternalLink* buckets_;
-    ValueInternalLink* tailLink_;
-    BucketIndex bucketsSize_;
-    BucketIndex itemCount_;
+public:
+  // For some reason, BORLAND needs these at the end, rather
+  // than earlier. No idea why.
+  ValueIteratorBase();
+  explicit ValueIteratorBase(const Value::ObjectValues::iterator& current);
 };
 
-/** \brief A simplified deque implementation used internally by Value.
- * \internal
- * It is based on a list of fixed "page", each page contains a fixed number of items.
- * Instead of using a linked-list, a array of pointer is used for fast item look-up.
- * Look-up for an element is as follow:
- * - compute page index: pageIndex = itemIndex / itemsPerPage
- * - look-up item in page: pages_[pageIndex][itemIndex % itemsPerPage]
+/** \brief const iterator for object and array value.
  *
- * Insertion is amortized constant time (only the array containing the index of pointers
- * need to be reallocated when items are appended).
  */
-class JSON_API ValueInternalArray
-{
-    friend class Value;
-    friend class ValueIteratorBase;
+class JSON_API ValueConstIterator : public ValueIteratorBase {
+  friend class Value;
 
 public:
-    enum
-    {
-        itemsPerPage = 8
-    }; // should be a power of 2 for fast divide and modulo.
-    typedef Value::ArrayIndex ArrayIndex;
-    typedef unsigned int PageIndex;
-
-#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-    struct IteratorState // Must be a POD
-    {
-        IteratorState() : array_(0), currentPageIndex_(0), currentItemIndex_(0) {}
-        ValueInternalArray* array_;
-        Value** currentPageIndex_;
-        unsigned int currentItemIndex_;
-    };
-#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-    ValueInternalArray();
-    ValueInternalArray(const ValueInternalArray& other);
-    ValueInternalArray& operator=(const ValueInternalArray& other);
-    ~ValueInternalArray();
-    void swap(ValueInternalArray& other);
-
-    void clear();
-    void resize(ArrayIndex newSize);
-
-    Value& resolveReference(ArrayIndex index);
+  using value_type = const Value;
+  // typedef unsigned int size_t;
+  // typedef int difference_type;
+  using reference = const Value&;
+  using pointer = const Value*;
+  using SelfType = ValueConstIterator;
 
-    Value* find(ArrayIndex index) const;
-
-    ArrayIndex size() const;
-
-    int compare(const ValueInternalArray& other) const;
+  ValueConstIterator();
+  ValueConstIterator(ValueIterator const& other);
 
 private:
-    static bool equals(const IteratorState& x, const IteratorState& other);
-    static void increment(IteratorState& iterator);
-    static void decrement(IteratorState& iterator);
-    static Value& dereference(const IteratorState& iterator);
-    static Value& unsafeDereference(const IteratorState& iterator);
-    static int distance(const IteratorState& x, const IteratorState& y);
-    static ArrayIndex indexOf(const IteratorState& iterator);
-    void makeBeginIterator(IteratorState& it) const;
-    void makeEndIterator(IteratorState& it) const;
-    void makeIterator(IteratorState& it, ArrayIndex index) const;
-
-    void makeIndexValid(ArrayIndex index);
-
-    Value** pages_;
-    ArrayIndex size_;
-    PageIndex pageCount_;
-};
-
-/** \brief Experimental: do not use. Allocator to customize Value internal array.
- * Below is an example of a simple implementation (actual implementation use
- * memory pool).
-   \code
-class DefaultValueArrayAllocator : public ValueArrayAllocator
-{
-public: // overridden from ValueArrayAllocator
-virtual ~DefaultValueArrayAllocator()
-{
-}
-
-virtual ValueInternalArray *newArray()
-{
-   return new ValueInternalArray();
-}
-
-virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-{
-   return new ValueInternalArray( other );
-}
-
-virtual void destruct( ValueInternalArray *array )
-{
-   delete array;
-}
+  /*! \internal Use by Value to create an iterator.
+   */
+  explicit ValueConstIterator(const Value::ObjectValues::iterator& current);
 
-virtual void reallocateArrayPageIndex( Value **&indexes,
-                                       ValueInternalArray::PageIndex &indexCount,
-                                       ValueInternalArray::PageIndex minNewIndexCount )
-{
-   ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-   if ( minNewIndexCount > newIndexCount )
-      newIndexCount = minNewIndexCount;
-   void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-   if ( !newIndexes )
-      throw std::bad_alloc();
-   indexCount = newIndexCount;
-   indexes = static_cast<Value **>( newIndexes );
-}
-virtual void releaseArrayPageIndex( Value **indexes,
-                                    ValueInternalArray::PageIndex indexCount )
-{
-   if ( indexes )
-      free( indexes );
-}
-
-virtual Value *allocateArrayPage()
-{
-   return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
-}
-
-virtual void releaseArrayPage( Value *value )
-{
-   if ( value )
-      free( value );
-}
-};
-   \endcode
- */
-class JSON_API ValueArrayAllocator
-{
 public:
-    virtual ~ValueArrayAllocator();
-    virtual ValueInternalArray* newArray() = 0;
-    virtual ValueInternalArray* newArrayCopy(const ValueInternalArray& other) = 0;
-    virtual void destructArray(ValueInternalArray* array) = 0;
-    /** \brief Reallocate array page index.
-     * Reallocates an array of pointer on each page.
-     * \param indexes [input] pointer on the current index. May be \c NULL.
-     *                [output] pointer on the new index of at least
-     *                         \a minNewIndexCount pages.
-     * \param indexCount [input] current number of pages in the index.
-     *                   [output] number of page the reallocated index can handle.
-     *                            \b MUST be >= \a minNewIndexCount.
-     * \param minNewIndexCount Minimum number of page the new index must be able to
-     *                         handle.
-     */
-    virtual void reallocateArrayPageIndex(Value**& indexes,
-                                          ValueInternalArray::PageIndex& indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount) = 0;
-    virtual void releaseArrayPageIndex(Value** indexes, ValueInternalArray::PageIndex indexCount) = 0;
-    virtual Value* allocateArrayPage() = 0;
-    virtual void releaseArrayPage(Value* value) = 0;
-};
-#endif // #ifdef JSON_VALUE_USE_INTERNAL_MAP
+  SelfType& operator=(const ValueIteratorBase& other);
 
-/** \brief base class for Value iterators.
- *
- */
-class ValueIteratorBase
-{
-public:
-    typedef unsigned int size_t;
-    typedef int difference_type;
-    typedef ValueIteratorBase SelfType;
-
-    ValueIteratorBase();
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    explicit ValueIteratorBase(const Value::ObjectValues::iterator& current);
-#else
-    ValueIteratorBase(const ValueInternalArray::IteratorState& state);
-    ValueIteratorBase(const ValueInternalMap::IteratorState& state);
-#endif
-
-    bool operator==(const SelfType& other) const { return isEqual(other); }
-
-    bool operator!=(const SelfType& other) const { return !isEqual(other); }
+  SelfType operator++(int) {
+    SelfType temp(*this);
+    ++*this;
+    return temp;
+  }
 
-    difference_type operator-(const SelfType& other) const { return computeDistance(other); }
-
-    /// Return either the index or the member name of the referenced value as a Value.
-    Value key() const;
-
-    /// Return the index of the referenced Value. -1 if it is not an arrayValue.
-    UInt index() const;
-
-    /// Return the member name of the referenced Value. "" if it is not an objectValue.
-    const char* memberName() const;
-
-protected:
-    Value& deref() const;
+  SelfType operator--(int) {
+    SelfType temp(*this);
+    --*this;
+    return temp;
+  }
 
-    void increment();
+  SelfType& operator--() {
+    decrement();
+    return *this;
+  }
 
-    void decrement();
+  SelfType& operator++() {
+    increment();
+    return *this;
+  }
 
-    difference_type computeDistance(const SelfType& other) const;
+  reference operator*() const { return deref(); }
 
-    bool isEqual(const SelfType& other) const;
-
-    void copy(const SelfType& other);
-
-private:
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    Value::ObjectValues::iterator current_;
-    // Indicates that iterator is for a null value.
-    bool isNull_;
-#else
-    union
-    {
-        ValueInternalArray::IteratorState array_;
-        ValueInternalMap::IteratorState map_;
-    } iterator_;
-    bool isArray_;
-#endif
+  pointer operator->() const { return &deref(); }
 };
 
-/** \brief const iterator for object and array value.
- *
+/** \brief Iterator for object and array value.
  */
-class ValueConstIterator : public ValueIteratorBase
-{
-    friend class Value;
+class JSON_API ValueIterator : public ValueIteratorBase {
+  friend class Value;
 
 public:
-    typedef unsigned int size_t;
-    typedef int difference_type;
-    typedef const Value& reference;
-    typedef const Value* pointer;
-    typedef ValueConstIterator SelfType;
+  using value_type = Value;
+  using size_t = unsigned int;
+  using difference_type = int;
+  using reference = Value&;
+  using pointer = Value*;
+  using SelfType = ValueIterator;
 
-    ValueConstIterator();
+  ValueIterator();
+  explicit ValueIterator(const ValueConstIterator& other);
+  ValueIterator(const ValueIterator& other);
 
 private:
-    /*! \internal Use by Value to create an iterator.
-     */
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    explicit ValueConstIterator(const Value::ObjectValues::iterator& current);
-#else
-    ValueConstIterator(const ValueInternalArray::IteratorState& state);
-    ValueConstIterator(const ValueInternalMap::IteratorState& state);
-#endif
+  /*! \internal Use by Value to create an iterator.
+   */
+  explicit ValueIterator(const Value::ObjectValues::iterator& current);
+
 public:
-    SelfType& operator=(const ValueIteratorBase& other);
-
-    SelfType operator++(int)
-    {
-        SelfType temp(*this);
-        ++*this;
-        return temp;
-    }
-
-    SelfType operator--(int)
-    {
-        SelfType temp(*this);
-        --*this;
-        return temp;
-    }
-
-    SelfType& operator--()
-    {
-        decrement();
-        return *this;
-    }
-
-    SelfType& operator++()
-    {
-        increment();
-        return *this;
-    }
-
-    reference operator*() const { return deref(); }
+  SelfType& operator=(const SelfType& other);
+
+  SelfType operator++(int) {
+    SelfType temp(*this);
+    ++*this;
+    return temp;
+  }
+
+  SelfType operator--(int) {
+    SelfType temp(*this);
+    --*this;
+    return temp;
+  }
+
+  SelfType& operator--() {
+    decrement();
+    return *this;
+  }
+
+  SelfType& operator++() {
+    increment();
+    return *this;
+  }
+
+  /*! The return value of non-const iterators can be
+   *  changed, so the these functions are not const
+   *  because the returned references/pointers can be used
+   *  to change state of the base class.
+   */
+  reference operator*() const { return const_cast<reference>(deref()); }
+  pointer operator->() const { return const_cast<pointer>(&deref()); }
 };
 
-/** \brief Iterator for object and array value.
- */
-class ValueIterator : public ValueIteratorBase
-{
-    friend class Value;
+inline void swap(Value& a, Value& b) { a.swap(b); }
 
-public:
-    typedef unsigned int size_t;
-    typedef int difference_type;
-    typedef Value& reference;
-    typedef Value* pointer;
-    typedef ValueIterator SelfType;
+} // namespace Json
 
-    ValueIterator();
-    ValueIterator(const ValueConstIterator& other);
-    ValueIterator(const ValueIterator& other);
+#pragma pack(pop)
 
-private:
-    /*! \internal Use by Value to create an iterator.
-     */
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    explicit ValueIterator(const Value::ObjectValues::iterator& current);
-#else
-    ValueIterator(const ValueInternalArray::IteratorState& state);
-    ValueIterator(const ValueInternalMap::IteratorState& state);
-#endif
-public:
-    SelfType& operator=(const SelfType& other);
-
-    SelfType operator++(int)
-    {
-        SelfType temp(*this);
-        ++*this;
-        return temp;
-    }
-
-    SelfType operator--(int)
-    {
-        SelfType temp(*this);
-        --*this;
-        return temp;
-    }
-
-    SelfType& operator--()
-    {
-        decrement();
-        return *this;
-    }
-
-    SelfType& operator++()
-    {
-        increment();
-        return *this;
-    }
-
-    reference operator*() const { return deref(); }
-};
-
-} // namespace Json
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+#pragma warning(pop)
+#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 
-#endif // CPPTL_JSON_H_INCLUDED
+#endif // JSON_H_INCLUDED
diff --git a/ext_libs/json/json/version.h b/ext_libs/json/json/version.h
new file mode 100644
index 00000000..e931d038
--- /dev/null
+++ b/ext_libs/json/json/version.h
@@ -0,0 +1,28 @@
+#ifndef JSON_VERSION_H_INCLUDED
+#define JSON_VERSION_H_INCLUDED
+
+// Note: version must be updated in three places when doing a release. This
+// annoying process ensures that amalgamate, CMake, and meson all report the
+// correct version.
+// 1. /meson.build
+// 2. /include/json/version.h
+// 3. /CMakeLists.txt
+// IMPORTANT: also update the SOVERSION!!
+
+#define JSONCPP_VERSION_STRING "1.9.5"
+#define JSONCPP_VERSION_MAJOR 1
+#define JSONCPP_VERSION_MINOR 9
+#define JSONCPP_VERSION_PATCH 5
+#define JSONCPP_VERSION_QUALIFIER
+#define JSONCPP_VERSION_HEXA                                                   \
+  ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) |             \
+   (JSONCPP_VERSION_PATCH << 8))
+
+#ifdef JSONCPP_USING_SECURE_MEMORY
+#undef JSONCPP_USING_SECURE_MEMORY
+#endif
+#define JSONCPP_USING_SECURE_MEMORY 0
+// If non-zero, the library zeroes any memory that it has allocated before
+// it frees its memory.
+
+#endif // JSON_VERSION_H_INCLUDED
diff --git a/ext_libs/json/json/writer.h b/ext_libs/json/json/writer.h
old mode 100644
new mode 100755
index 3f94cd58..155e7346
--- a/ext_libs/json/json/writer.h
+++ b/ext_libs/json/json/writer.h
@@ -1,4 +1,4 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
@@ -6,172 +6,364 @@
 #ifndef JSON_WRITER_H_INCLUDED
 #define JSON_WRITER_H_INCLUDED
 
+#if !defined(JSON_IS_AMALGAMATION)
 #include "value.h"
-#include <vector>
+#endif // if !defined(JSON_IS_AMALGAMATION)
+#include <ostream>
 #include <string>
-#include <iostream>
+#include <vector>
+
+// Disable warning C4251: <data member>: <type> needs to have dll-interface to
+// be used by...
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING) && defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4251)
+#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+
+#pragma pack(push, 8)
+
+namespace Json {
 
-namespace Json
-{
 class Value;
 
+/**
+ *
+ * Usage:
+ *  \code
+ *  using namespace Json;
+ *  void writeToStdout(StreamWriter::Factory const& factory, Value const& value)
+ * { std::unique_ptr<StreamWriter> const writer( factory.newStreamWriter());
+ *    writer->write(value, &std::cout);
+ *    std::cout << std::endl;  // add lf and flush
+ *  }
+ *  \endcode
+ */
+class JSON_API StreamWriter {
+protected:
+  OStream* sout_; // not owned; will not delete
+public:
+  StreamWriter();
+  virtual ~StreamWriter();
+  /** Write Value into document as configured in sub-class.
+   *   Do not take ownership of sout, but maintain a reference during function.
+   *   \pre sout != NULL
+   *   \return zero on success (For now, we always return zero, so check the
+   *   stream instead.) \throw std::exception possibly, depending on
+   * configuration
+   */
+  virtual int write(Value const& root, OStream* sout) = 0;
+
+  /** \brief A simple abstract factory.
+   */
+  class JSON_API Factory {
+  public:
+    virtual ~Factory();
+    /** \brief Allocate a CharReader via operator new().
+     * \throw std::exception if something goes wrong (e.g. invalid settings)
+     */
+    virtual StreamWriter* newStreamWriter() const = 0;
+  }; // Factory
+};   // StreamWriter
+
+/** \brief Write into stringstream, then return string, for convenience.
+ * A StreamWriter will be created from the factory, used, and then deleted.
+ */
+String JSON_API writeString(StreamWriter::Factory const& factory,
+                            Value const& root);
+
+/** \brief Build a StreamWriter implementation.
+
+* Usage:
+*   \code
+*   using namespace Json;
+*   Value value = ...;
+*   StreamWriterBuilder builder;
+*   builder["commentStyle"] = "None";
+*   builder["indentation"] = "   ";  // or whatever you like
+*   std::unique_ptr<Json::StreamWriter> writer(
+*      builder.newStreamWriter());
+*   writer->write(value, &std::cout);
+*   std::cout << std::endl;  // add lf and flush
+*   \endcode
+*/
+class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
+public:
+  // Note: We use a Json::Value so that we can add data-members to this class
+  // without a major version bump.
+  /** Configuration of this builder.
+   *  Available settings (case-sensitive):
+   *  - "commentStyle": "None" or "All"
+   *  - "indentation":  "<anything>".
+   *  - Setting this to an empty string also omits newline characters.
+   *  - "enableYAMLCompatibility": false or true
+   *  - slightly change the whitespace around colons
+   *  - "dropNullPlaceholders": false or true
+   *  - Drop the "null" string from the writer's output for nullValues.
+   *    Strictly speaking, this is not valid JSON. But when the output is being
+   *    fed to a browser's JavaScript, it makes for smaller output and the
+   *    browser can handle the output just fine.
+   *  - "useSpecialFloats": false or true
+   *  - If true, outputs non-finite floating point values in the following way:
+   *    NaN values as "NaN", positive infinity as "Infinity", and negative
+   *  infinity as "-Infinity".
+   *  - "precision": int
+   *  - Number of precision digits for formatting of real values.
+   *  - "precisionType": "significant"(default) or "decimal"
+   *  - Type of precision for formatting of real values.
+   *  - "emitUTF8": false or true
+   *  - If true, outputs raw UTF8 strings instead of escaping them.
+
+   *  You can examine 'settings_` yourself
+   *  to see the defaults. You can also write and read them just like any
+   *  JSON Value.
+   *  \sa setDefaults()
+   */
+  Json::Value settings_;
+
+  StreamWriterBuilder();
+  ~StreamWriterBuilder() override;
+
+  /**
+   * \throw std::exception if something goes wrong (e.g. invalid settings)
+   */
+  StreamWriter* newStreamWriter() const override;
+
+  /** \return true if 'settings' are legal and consistent;
+   *   otherwise, indicate bad settings via 'invalid'.
+   */
+  bool validate(Json::Value* invalid) const;
+  /** A simple way to update a specific setting.
+   */
+  Value& operator[](const String& key);
+
+  /** Called by ctor, but you can use this to reset settings_.
+   * \pre 'settings' != NULL (but Json::null is fine)
+   * \remark Defaults:
+   * \snippet src/lib_json/json_writer.cpp StreamWriterBuilderDefaults
+   */
+  static void setDefaults(Json::Value* settings);
+};
+
 /** \brief Abstract class for writers.
+ * \deprecated Use StreamWriter. (And really, this is an implementation detail.)
  */
-class JSON_API Writer
-{
+class JSON_API Writer {
 public:
-    virtual ~Writer();
+  virtual ~Writer();
 
-    virtual std::string write(const Value& root, bool noNewLine = false) = 0;
+  virtual String write(const Value& root) = 0;
 };
 
-/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format without formatting (not human friendly).
+/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format
+ *without formatting (not human friendly).
  *
- * The JSON document is written in a single line. It is not intended for 'human' consumption,
- * but may be usefull to support feature such as RPC where bandwith is limited.
+ * The JSON document is written in a single line. It is not intended for 'human'
+ *consumption,
+ * but may be useful to support feature such as RPC where bandwidth is limited.
  * \sa Reader, Value
+ * \deprecated Use StreamWriterBuilder.
  */
-class JSON_API FastWriter : public Writer
-{
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4996) // Deriving from deprecated class
+#endif
+class JSON_API FastWriter
+    : public Writer {
 public:
-    FastWriter();
-    virtual ~FastWriter() {}
+  FastWriter();
+  ~FastWriter() override = default;
+
+  void enableYAMLCompatibility();
+
+  /** \brief Drop the "null" string from the writer's output for nullValues.
+   * Strictly speaking, this is not valid JSON. But when the output is being
+   * fed to a browser's JavaScript, it makes for smaller output and the
+   * browser can handle the output just fine.
+   */
+  void dropNullPlaceholders();
 
-    void enableYAMLCompatibility();
+  void omitEndingLineFeed();
 
 public: // overridden from Writer
-    virtual std::string write(const Value& root, bool noNewLine = false);
+  String write(const Value& root) override;
 
 private:
-    void writeValue(const Value& value);
+  void writeValue(const Value& value);
 
-    std::string document_;
-    bool yamlCompatiblityEnabled_;
+  String document_;
+  bool yamlCompatibilityEnabled_{false};
+  bool dropNullPlaceholders_{false};
+  bool omitEndingLineFeed_{true};
 };
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
 
-/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way.
+/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
+ *human friendly way.
  *
  * The rules for line break and indent are as follow:
  * - Object value:
  *     - if empty then print {} without indent and line break
- *     - if not empty the print '{', line break & indent, print one value per line
+ *     - if not empty the print '{', line break & indent, print one value per
+ *line
  *       and then unindent and line break and print '}'.
  * - Array value:
  *     - if empty then print [] without indent and line break
- *     - if the array contains no object value, empty array or some other value types,
- *       and all the values fit on one lines, then print the array on a single line.
+ *     - if the array contains no object value, empty array or some other value
+ *types,
+ *       and all the values fit on one lines, then print the array on a single
+ *line.
  *     - otherwise, it the values do not fit on one line, or the array contains
  *       object or non empty array, then print one value per line.
  *
- * If the Value have comments then they are outputed according to their #CommentPlacement.
+ * If the Value have comments then they are outputed according to their
+ *#CommentPlacement.
  *
  * \sa Reader, Value, Value::setComment()
+ * \deprecated Use StreamWriterBuilder.
  */
-class JSON_API StyledWriter : public Writer
-{
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4996) // Deriving from deprecated class
+#endif
+class JSON_API
+    StyledWriter : public Writer {
 public:
-    StyledWriter();
-    virtual ~StyledWriter() {}
+  StyledWriter();
+  ~StyledWriter() override = default;
 
 public: // overridden from Writer
-    /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-     * \param root Value to serialize.
-     * \return String containing the JSON document that represents the root value.
-     */
-    virtual std::string write(const Value& root, bool noNewLine = false);
+  /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
+   * \param root Value to serialize.
+   * \return String containing the JSON document that represents the root value.
+   */
+  String write(const Value& root) override;
 
 private:
-    void writeValue(const Value& value);
-    void writeArrayValue(const Value& value);
-    bool isMultineArray(const Value& value);
-    void pushValue(const std::string& value);
-    void writeIndent();
-    void writeWithIndent(const std::string& value);
-    void indent();
-    void unindent();
-    void writeCommentBeforeValue(const Value& root);
-    void writeCommentAfterValueOnSameLine(const Value& root);
-    bool hasCommentForValue(const Value& value);
-    static std::string normalizeEOL(const std::string& text);
-
-    typedef std::vector<std::string> ChildValues;
-
-    ChildValues childValues_;
-    std::string document_;
-    std::string indentString_;
-    int rightMargin_;
-    int indentSize_;
-    bool addChildValues_;
+  void writeValue(const Value& value);
+  void writeArrayValue(const Value& value);
+  bool isMultilineArray(const Value& value);
+  void pushValue(const String& value);
+  void writeIndent();
+  void writeWithIndent(const String& value);
+  void indent();
+  void unindent();
+  void writeCommentBeforeValue(const Value& root);
+  void writeCommentAfterValueOnSameLine(const Value& root);
+  static bool hasCommentForValue(const Value& value);
+  static String normalizeEOL(const String& text);
+
+  using ChildValues = std::vector<String>;
+
+  ChildValues childValues_;
+  String document_;
+  String indentString_;
+  unsigned int rightMargin_{74};
+  unsigned int indentSize_{3};
+  bool addChildValues_{false};
 };
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
 
-/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a human friendly way,
+/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
+ human friendly way,
      to a stream rather than to a string.
  *
  * The rules for line break and indent are as follow:
  * - Object value:
  *     - if empty then print {} without indent and line break
- *     - if not empty the print '{', line break & indent, print one value per line
+ *     - if not empty the print '{', line break & indent, print one value per
+ line
  *       and then unindent and line break and print '}'.
  * - Array value:
  *     - if empty then print [] without indent and line break
- *     - if the array contains no object value, empty array or some other value types,
- *       and all the values fit on one lines, then print the array on a single line.
+ *     - if the array contains no object value, empty array or some other value
+ types,
+ *       and all the values fit on one lines, then print the array on a single
+ line.
  *     - otherwise, it the values do not fit on one line, or the array contains
  *       object or non empty array, then print one value per line.
  *
- * If the Value have comments then they are outputed according to their #CommentPlacement.
+ * If the Value have comments then they are outputed according to their
+ #CommentPlacement.
  *
- * \param indentation Each level will be indented by this amount extra.
  * \sa Reader, Value, Value::setComment()
+ * \deprecated Use StreamWriterBuilder.
  */
-class JSON_API StyledStreamWriter
-{
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4996) // Deriving from deprecated class
+#endif
+class JSON_API
+    StyledStreamWriter {
 public:
-    StyledStreamWriter(std::string indentation = "\t");
-    ~StyledStreamWriter() {}
+  /**
+   * \param indentation Each level will be indented by this amount extra.
+   */
+  StyledStreamWriter(String indentation = "\t");
+  ~StyledStreamWriter() = default;
 
 public:
-    /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-     * \param out Stream to write to. (Can be ostringstream, e.g.)
-     * \param root Value to serialize.
-     * \note There is no point in deriving from Writer, since write() should not return a value.
-     */
-    void write(std::ostream& out, const Value& root, bool noNewLine = false);
+  /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
+   * \param out Stream to write to. (Can be ostringstream, e.g.)
+   * \param root Value to serialize.
+   * \note There is no point in deriving from Writer, since write() should not
+   * return a value.
+   */
+  void write(OStream& out, const Value& root);
 
 private:
-    void writeValue(const Value& value);
-    void writeArrayValue(const Value& value);
-    bool isMultineArray(const Value& value);
-    void pushValue(const std::string& value);
-    void writeIndent();
-    void writeWithIndent(const std::string& value);
-    void indent();
-    void unindent();
-    void writeCommentBeforeValue(const Value& root);
-    void writeCommentAfterValueOnSameLine(const Value& root);
-    bool hasCommentForValue(const Value& value);
-    static std::string normalizeEOL(const std::string& text);
-
-    typedef std::vector<std::string> ChildValues;
-
-    ChildValues childValues_;
-    std::ostream* document_;
-    std::string indentString_;
-    int rightMargin_;
-    std::string indentation_;
-    bool addChildValues_;
+  void writeValue(const Value& value);
+  void writeArrayValue(const Value& value);
+  bool isMultilineArray(const Value& value);
+  void pushValue(const String& value);
+  void writeIndent();
+  void writeWithIndent(const String& value);
+  void indent();
+  void unindent();
+  void writeCommentBeforeValue(const Value& root);
+  void writeCommentAfterValueOnSameLine(const Value& root);
+  static bool hasCommentForValue(const Value& value);
+  static String normalizeEOL(const String& text);
+
+  using ChildValues = std::vector<String>;
+
+  ChildValues childValues_;
+  OStream* document_;
+  String indentString_;
+  unsigned int rightMargin_{74};
+  String indentation_;
+  bool addChildValues_ : 1;
+  bool indented_ : 1;
 };
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
 
-std::string JSON_API valueToString(Int value);
-std::string JSON_API valueToString(UInt value);
-std::string JSON_API valueToString(double value);
-std::string JSON_API valueToString(bool value);
-std::string JSON_API valueToQuotedString(const char* value);
+#if defined(JSON_HAS_INT64)
+String JSON_API valueToString(Int value);
+String JSON_API valueToString(UInt value);
+#endif // if defined(JSON_HAS_INT64)
+String JSON_API valueToString(LargestInt value);
+String JSON_API valueToString(LargestUInt value);
+String JSON_API valueToString(
+    double value, unsigned int precision = Value::defaultRealPrecision,
+    PrecisionType precisionType = PrecisionType::significantDigits);
+String JSON_API valueToString(bool value);
+String JSON_API valueToQuotedString(const char* value);
 
 /// \brief Output using the StyledStreamWriter.
 /// \see Json::operator>>()
-std::ostream& operator<<(std::ostream&, const Value& root);
+JSON_API OStream& operator<<(OStream&, const Value& root);
 
 } // namespace Json
 
+#pragma pack(pop)
+
+#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+#pragma warning(pop)
+#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
+
 #endif // JSON_WRITER_H_INCLUDED
diff --git a/ext_libs/json/json_batchallocator.h b/ext_libs/json/json_batchallocator.h
deleted file mode 100644
index 5e64f79f..00000000
--- a/ext_libs/json/json_batchallocator.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSONCPP_BATCHALLOCATOR_H_INCLUDED
-#define JSONCPP_BATCHALLOCATOR_H_INCLUDED
-
-#include <stdlib.h>
-#include <assert.h>
-
-#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-namespace Json
-{
-/* Fast memory allocator.
- *
- * This memory allocator allocates memory for a batch of object (specified by
- * the page size, the number of object in each page).
- *
- * It does not allow the destruction of a single object. All the allocated objects
- * can be destroyed at once. The memory can be either released or reused for future
- * allocation.
- *
- * The in-place new operator must be used to construct the object using the pointer
- * returned by allocate.
- */
-template<typename AllocatedType, const unsigned int objectPerAllocation>
-class BatchAllocator
-{
-public:
-    typedef AllocatedType Type;
-
-    BatchAllocator(unsigned int objectsPerPage = 255) : freeHead_(0), objectsPerPage_(objectsPerPage)
-    {
-        //      printf( "Size: %d => %s\n", sizeof(AllocatedType), typeid(AllocatedType).name() );
-        assert(sizeof(AllocatedType) * objectPerAllocation >=
-               sizeof(AllocatedType*)); // We must be able to store a slist in the object free space.
-        assert(objectsPerPage >= 16);
-        batches_ = allocateBatch(0); // allocated a dummy page
-        currentBatch_ = batches_;
-    }
-
-    ~BatchAllocator()
-    {
-        for (BatchInfo* batch = batches_; batch;)
-        {
-            BatchInfo* nextBatch = batch->next_;
-            free(batch);
-            batch = nextBatch;
-        }
-    }
-
-    /// allocate space for an array of objectPerAllocation object.
-    /// @warning it is the responsability of the caller to call objects constructors.
-    AllocatedType* allocate()
-    {
-        if (freeHead_) // returns node from free list.
-        {
-            AllocatedType* object = freeHead_;
-            freeHead_ = *(AllocatedType**)object;
-            return object;
-        }
-        if (currentBatch_->used_ == currentBatch_->end_)
-        {
-            currentBatch_ = currentBatch_->next_;
-            while (currentBatch_ && currentBatch_->used_ == currentBatch_->end_)
-                currentBatch_ = currentBatch_->next_;
-
-            if (!currentBatch_) // no free batch found, allocate a new one
-            {
-                currentBatch_ = allocateBatch(objectsPerPage_);
-                currentBatch_->next_ = batches_; // insert at the head of the list
-                batches_ = currentBatch_;
-            }
-        }
-        AllocatedType* allocated = currentBatch_->used_;
-        currentBatch_->used_ += objectPerAllocation;
-        return allocated;
-    }
-
-    /// Release the object.
-    /// @warning it is the responsability of the caller to actually destruct the object.
-    void release(AllocatedType* object)
-    {
-        assert(object != 0);
-        *(AllocatedType**)object = freeHead_;
-        freeHead_ = object;
-    }
-
-private:
-    struct BatchInfo
-    {
-        BatchInfo* next_;
-        AllocatedType* used_;
-        AllocatedType* end_;
-        AllocatedType buffer_[objectPerAllocation];
-    };
-
-    // disabled copy constructor and assignement operator.
-    BatchAllocator(const BatchAllocator&);
-    void operator=(const BatchAllocator&);
-
-    static BatchInfo* allocateBatch(unsigned int objectsPerPage)
-    {
-        const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType) * objectPerAllocation +
-                                        sizeof(AllocatedType) * objectPerAllocation * objectsPerPage;
-        BatchInfo* batch = static_cast<BatchInfo*>(malloc(mallocSize));
-        batch->next_ = 0;
-        batch->used_ = batch->buffer_;
-        batch->end_ = batch->buffer_ + objectsPerPage;
-        return batch;
-    }
-
-    BatchInfo* batches_;
-    BatchInfo* currentBatch_;
-    /// Head of a single linked list within the allocated space of freeed object
-    AllocatedType* freeHead_;
-    unsigned int objectsPerPage_;
-};
-
-} // namespace Json
-
-#endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
-
-#endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
diff --git a/ext_libs/json/json_internalarray.inl b/ext_libs/json/json_internalarray.inl
deleted file mode 100644
index 66d838ec..00000000
--- a/ext_libs/json/json_internalarray.inl
+++ /dev/null
@@ -1,453 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-// included by json_value.cpp
-// everything is within Json namespace
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueInternalArray
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueArrayAllocator::~ValueArrayAllocator()
-{
-}
-
-// //////////////////////////////////////////////////////////////////
-// class DefaultValueArrayAllocator
-// //////////////////////////////////////////////////////////////////
-#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-class DefaultValueArrayAllocator : public ValueArrayAllocator
-{
-public: // overridden from ValueArrayAllocator
-   virtual ~DefaultValueArrayAllocator()
-   {
-   }
-
-   virtual ValueInternalArray *newArray()
-   {
-      return new ValueInternalArray();
-   }
-
-   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-   {
-      return new ValueInternalArray( other );
-   }
-
-   virtual void destructArray( ValueInternalArray *array )
-   {
-      delete array;
-   }
-
-   virtual void reallocateArrayPageIndex( Value **&indexes, 
-                                          ValueInternalArray::PageIndex &indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount )
-   {
-      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-      if ( minNewIndexCount > newIndexCount )
-         newIndexCount = minNewIndexCount;
-      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-      if ( !newIndexes )
-         throw std::bad_alloc();
-      indexCount = newIndexCount;
-      indexes = static_cast<Value **>( newIndexes );
-   }
-   virtual void releaseArrayPageIndex( Value **indexes, 
-                                       ValueInternalArray::PageIndex indexCount )
-   {
-      if ( indexes )
-         free( indexes );
-   }
-
-   virtual Value *allocateArrayPage()
-   {
-      return static_cast<Value *>( malloc( sizeof(Value) * ValueInternalArray::itemsPerPage ) );
-   }
-
-   virtual void releaseArrayPage( Value *value )
-   {
-      if ( value )
-         free( value );
-   }
-};
-
-#else // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-/// @todo make this thread-safe (lock when accessign batch allocator)
-class DefaultValueArrayAllocator : public ValueArrayAllocator
-{
-public: // overridden from ValueArrayAllocator
-   virtual ~DefaultValueArrayAllocator()
-   {
-   }
-
-   virtual ValueInternalArray *newArray()
-   {
-      ValueInternalArray *array = arraysAllocator_.allocate();
-      new (array) ValueInternalArray(); // placement new
-      return array;
-   }
-
-   virtual ValueInternalArray *newArrayCopy( const ValueInternalArray &other )
-   {
-      ValueInternalArray *array = arraysAllocator_.allocate();
-      new (array) ValueInternalArray( other ); // placement new
-      return array;
-   }
-
-   virtual void destructArray( ValueInternalArray *array )
-   {
-      if ( array )
-      {
-         array->~ValueInternalArray();
-         arraysAllocator_.release( array );
-      }
-   }
-
-   virtual void reallocateArrayPageIndex( Value **&indexes, 
-                                          ValueInternalArray::PageIndex &indexCount,
-                                          ValueInternalArray::PageIndex minNewIndexCount )
-   {
-      ValueInternalArray::PageIndex newIndexCount = (indexCount*3)/2 + 1;
-      if ( minNewIndexCount > newIndexCount )
-         newIndexCount = minNewIndexCount;
-      void *newIndexes = realloc( indexes, sizeof(Value*) * newIndexCount );
-      if ( !newIndexes )
-         throw std::bad_alloc();
-      indexCount = newIndexCount;
-      indexes = static_cast<Value **>( newIndexes );
-   }
-   virtual void releaseArrayPageIndex( Value **indexes, 
-                                       ValueInternalArray::PageIndex indexCount )
-   {
-      if ( indexes )
-         free( indexes );
-   }
-
-   virtual Value *allocateArrayPage()
-   {
-      return static_cast<Value *>( pagesAllocator_.allocate() );
-   }
-
-   virtual void releaseArrayPage( Value *value )
-   {
-      if ( value )
-         pagesAllocator_.release( value );
-   }
-private:
-   BatchAllocator<ValueInternalArray,1> arraysAllocator_;
-   BatchAllocator<Value,ValueInternalArray::itemsPerPage> pagesAllocator_;
-};
-#endif // #ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-
-static ValueArrayAllocator *&arrayAllocator()
-{
-   static DefaultValueArrayAllocator defaultAllocator;
-   static ValueArrayAllocator *arrayAllocator = &defaultAllocator;
-   return arrayAllocator;
-}
-
-static struct DummyArrayAllocatorInitializer {
-   DummyArrayAllocatorInitializer() 
-   {
-      arrayAllocator();      // ensure arrayAllocator() statics are initialized before main().
-   }
-} dummyArrayAllocatorInitializer;
-
-// //////////////////////////////////////////////////////////////////
-// class ValueInternalArray
-// //////////////////////////////////////////////////////////////////
-bool 
-ValueInternalArray::equals( const IteratorState &x, 
-                            const IteratorState &other )
-{
-   return x.array_ == other.array_  
-          &&  x.currentItemIndex_ == other.currentItemIndex_  
-          &&  x.currentPageIndex_ == other.currentPageIndex_;
-}
-
-
-void 
-ValueInternalArray::increment( IteratorState &it )
-{
-   JSON_ASSERT_MESSAGE( it.array_  &&
-      (it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
-      != it.array_->size_,
-      "ValueInternalArray::increment(): moving iterator beyond end" );
-   ++(it.currentItemIndex_);
-   if ( it.currentItemIndex_ == itemsPerPage )
-   {
-      it.currentItemIndex_ = 0;
-      ++(it.currentPageIndex_);
-   }
-}
-
-
-void 
-ValueInternalArray::decrement( IteratorState &it )
-{
-   JSON_ASSERT_MESSAGE( it.array_  &&  it.currentPageIndex_ == it.array_->pages_ 
-                        &&  it.currentItemIndex_ == 0,
-      "ValueInternalArray::decrement(): moving iterator beyond end" );
-   if ( it.currentItemIndex_ == 0 )
-   {
-      it.currentItemIndex_ = itemsPerPage-1;
-      --(it.currentPageIndex_);
-   }
-   else
-   {
-      --(it.currentItemIndex_);
-   }
-}
-
-
-Value &
-ValueInternalArray::unsafeDereference( const IteratorState &it )
-{
-   return (*(it.currentPageIndex_))[it.currentItemIndex_];
-}
-
-
-Value &
-ValueInternalArray::dereference( const IteratorState &it )
-{
-   JSON_ASSERT_MESSAGE( it.array_  &&
-      (it.currentPageIndex_ - it.array_->pages_)*itemsPerPage + it.currentItemIndex_
-      < it.array_->size_,
-      "ValueInternalArray::dereference(): dereferencing invalid iterator" );
-   return unsafeDereference( it );
-}
-
-void 
-ValueInternalArray::makeBeginIterator( IteratorState &it ) const
-{
-   it.array_ = const_cast<ValueInternalArray *>( this );
-   it.currentItemIndex_ = 0;
-   it.currentPageIndex_ = pages_;
-}
-
-
-void 
-ValueInternalArray::makeIterator( IteratorState &it, ArrayIndex index ) const
-{
-   it.array_ = const_cast<ValueInternalArray *>( this );
-   it.currentItemIndex_ = index % itemsPerPage;
-   it.currentPageIndex_ = pages_ + index / itemsPerPage;
-}
-
-
-void 
-ValueInternalArray::makeEndIterator( IteratorState &it ) const
-{
-   makeIterator( it, size_ );
-}
-
-
-ValueInternalArray::ValueInternalArray()
-   : pages_( 0 )
-   , size_( 0 )
-   , pageCount_( 0 )
-{
-}
-
-
-ValueInternalArray::ValueInternalArray( const ValueInternalArray &other )
-   : pages_( 0 )
-   , pageCount_( 0 )
-   , size_( other.size_ )
-{
-   PageIndex minNewPages = other.size_ / itemsPerPage;
-   arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
-   JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, 
-                        "ValueInternalArray::reserve(): bad reallocation" );
-   IteratorState itOther;
-   other.makeBeginIterator( itOther );
-   Value *value;
-   for ( ArrayIndex index = 0; index < size_; ++index, increment(itOther) )
-   {
-      if ( index % itemsPerPage == 0 )
-      {
-         PageIndex pageIndex = index / itemsPerPage;
-         value = arrayAllocator()->allocateArrayPage();
-         pages_[pageIndex] = value;
-      }
-      new (value) Value( dereference( itOther ) );
-   }
-}
-
-
-ValueInternalArray &
-ValueInternalArray::operator =( const ValueInternalArray &other )
-{
-   ValueInternalArray temp( other );
-   swap( temp );
-   return *this;
-}
-
-
-ValueInternalArray::~ValueInternalArray()
-{
-   // destroy all constructed items
-   IteratorState it;
-   IteratorState itEnd;
-   makeBeginIterator( it);
-   makeEndIterator( itEnd );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      Value *value = &dereference(it);
-      value->~Value();
-   }
-   // release all pages
-   PageIndex lastPageIndex = size_ / itemsPerPage;
-   for ( PageIndex pageIndex = 0; pageIndex < lastPageIndex; ++pageIndex )
-      arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
-   // release pages index
-   arrayAllocator()->releaseArrayPageIndex( pages_, pageCount_ );
-}
-
-
-void 
-ValueInternalArray::swap( ValueInternalArray &other )
-{
-   Value **tempPages = pages_;
-   pages_ = other.pages_;
-   other.pages_ = tempPages;
-   ArrayIndex tempSize = size_;
-   size_ = other.size_;
-   other.size_ = tempSize;
-   PageIndex tempPageCount = pageCount_;
-   pageCount_ = other.pageCount_;
-   other.pageCount_ = tempPageCount;
-}
-
-void 
-ValueInternalArray::clear()
-{
-   ValueInternalArray dummy;
-   swap( dummy );
-}
-
-
-void 
-ValueInternalArray::resize( ArrayIndex newSize )
-{
-   if ( newSize == 0 )
-      clear();
-   else if ( newSize < size_ )
-   {
-      IteratorState it;
-      IteratorState itEnd;
-      makeIterator( it, newSize );
-      makeIterator( itEnd, size_ );
-      for ( ; !equals(it,itEnd); increment(it) )
-      {
-         Value *value = &dereference(it);
-         value->~Value();
-      }
-      PageIndex pageIndex = (newSize + itemsPerPage - 1) / itemsPerPage;
-      PageIndex lastPageIndex = size_ / itemsPerPage;
-      for ( ; pageIndex < lastPageIndex; ++pageIndex )
-         arrayAllocator()->releaseArrayPage( pages_[pageIndex] );
-      size_ = newSize;
-   }
-   else if ( newSize > size_ )
-      resolveReference( newSize );
-}
-
-
-void 
-ValueInternalArray::makeIndexValid( ArrayIndex index )
-{
-   // Need to enlarge page index ?
-   if ( index >= pageCount_ * itemsPerPage )
-   {
-      PageIndex minNewPages = (index + 1) / itemsPerPage;
-      arrayAllocator()->reallocateArrayPageIndex( pages_, pageCount_, minNewPages );
-      JSON_ASSERT_MESSAGE( pageCount_ >= minNewPages, "ValueInternalArray::reserve(): bad reallocation" );
-   }
-
-   // Need to allocate new pages ?
-   ArrayIndex nextPageIndex = 
-      (size_ % itemsPerPage) != 0 ? size_ - (size_%itemsPerPage) + itemsPerPage
-                                  : size_;
-   if ( nextPageIndex <= index )
-   {
-      PageIndex pageIndex = nextPageIndex / itemsPerPage;
-      PageIndex pageToAllocate = (index - nextPageIndex) / itemsPerPage + 1;
-      for ( ; pageToAllocate-- > 0; ++pageIndex )
-         pages_[pageIndex] = arrayAllocator()->allocateArrayPage();
-   }
-
-   // Initialize all new entries
-   IteratorState it;
-   IteratorState itEnd;
-   makeIterator( it, size_ );
-   size_ = index + 1;
-   makeIterator( itEnd, size_ );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      Value *value = &dereference(it);
-      new (value) Value(); // Construct a default value using placement new
-   }
-}
-
-Value &
-ValueInternalArray::resolveReference( ArrayIndex index )
-{
-   if ( index >= size_ )
-      makeIndexValid( index );
-   return pages_[index/itemsPerPage][index%itemsPerPage];
-}
-
-Value *
-ValueInternalArray::find( ArrayIndex index ) const
-{
-   if ( index >= size_ )
-      return 0;
-   return &(pages_[index/itemsPerPage][index%itemsPerPage]);
-}
-
-ValueInternalArray::ArrayIndex 
-ValueInternalArray::size() const
-{
-   return size_;
-}
-
-int 
-ValueInternalArray::distance( const IteratorState &x, const IteratorState &y )
-{
-   return indexOf(y) - indexOf(x);
-}
-
-
-ValueInternalArray::ArrayIndex 
-ValueInternalArray::indexOf( const IteratorState &iterator )
-{
-   if ( !iterator.array_ )
-      return ArrayIndex(-1);
-   return ArrayIndex(
-      (iterator.currentPageIndex_ - iterator.array_->pages_) * itemsPerPage 
-      + iterator.currentItemIndex_ );
-}
-
-
-int 
-ValueInternalArray::compare( const ValueInternalArray &other ) const
-{
-   int sizeDiff( size_ - other.size_ );
-   if ( sizeDiff != 0 )
-      return sizeDiff;
-   
-   for ( ArrayIndex index =0; index < size_; ++index )
-   {
-      int diff = pages_[index/itemsPerPage][index%itemsPerPage].compare( 
-         other.pages_[index/itemsPerPage][index%itemsPerPage] );
-      if ( diff != 0 )
-         return diff;
-   }
-   return 0;
-}
diff --git a/ext_libs/json/json_internalmap.inl b/ext_libs/json/json_internalmap.inl
deleted file mode 100644
index 82f4ce5f..00000000
--- a/ext_libs/json/json_internalmap.inl
+++ /dev/null
@@ -1,612 +0,0 @@
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-// included by json_value.cpp
-// everything is within Json namespace
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueInternalMap
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-/** \internal MUST be safely initialized using memset( this, 0, sizeof(ValueInternalLink) );
-   * This optimization is used by the fast allocator.
-   */
-ValueInternalLink::ValueInternalLink()
-   : previous_( 0 )
-   , next_( 0 )
-{
-}
-
-ValueInternalLink::~ValueInternalLink()
-{ 
-   for ( int index =0; index < itemPerLink; ++index )
-   {
-      if ( !items_[index].isItemAvailable() )
-      {
-         if ( !items_[index].isMemberNameStatic() )
-            free( keys_[index] );
-      }
-      else
-         break;
-   }
-}
-
-
-
-ValueMapAllocator::~ValueMapAllocator()
-{
-}
-
-#ifdef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-class DefaultValueMapAllocator : public ValueMapAllocator
-{
-public: // overridden from ValueMapAllocator
-   virtual ValueInternalMap *newMap()
-   {
-      return new ValueInternalMap();
-   }
-
-   virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-   {
-      return new ValueInternalMap( other );
-   }
-
-   virtual void destructMap( ValueInternalMap *map )
-   {
-      delete map;
-   }
-
-   virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-   {
-      return new ValueInternalLink[size];
-   }
-
-   virtual void releaseMapBuckets( ValueInternalLink *links )
-   {
-      delete [] links;
-   }
-
-   virtual ValueInternalLink *allocateMapLink()
-   {
-      return new ValueInternalLink();
-   }
-
-   virtual void releaseMapLink( ValueInternalLink *link )
-   {
-      delete link;
-   }
-};
-#else
-/// @todo make this thread-safe (lock when accessign batch allocator)
-class DefaultValueMapAllocator : public ValueMapAllocator
-{
-public: // overridden from ValueMapAllocator
-   virtual ValueInternalMap *newMap()
-   {
-      ValueInternalMap *map = mapsAllocator_.allocate();
-      new (map) ValueInternalMap(); // placement new
-      return map;
-   }
-
-   virtual ValueInternalMap *newMapCopy( const ValueInternalMap &other )
-   {
-      ValueInternalMap *map = mapsAllocator_.allocate();
-      new (map) ValueInternalMap( other ); // placement new
-      return map;
-   }
-
-   virtual void destructMap( ValueInternalMap *map )
-   {
-      if ( map )
-      {
-         map->~ValueInternalMap();
-         mapsAllocator_.release( map );
-      }
-   }
-
-   virtual ValueInternalLink *allocateMapBuckets( unsigned int size )
-   {
-      return new ValueInternalLink[size];
-   }
-
-   virtual void releaseMapBuckets( ValueInternalLink *links )
-   {
-      delete [] links;
-   }
-
-   virtual ValueInternalLink *allocateMapLink()
-   {
-      ValueInternalLink *link = linksAllocator_.allocate();
-      memset( link, 0, sizeof(ValueInternalLink) );
-      return link;
-   }
-
-   virtual void releaseMapLink( ValueInternalLink *link )
-   {
-      link->~ValueInternalLink();
-      linksAllocator_.release( link );
-   }
-private:
-   BatchAllocator<ValueInternalMap,1> mapsAllocator_;
-   BatchAllocator<ValueInternalLink,1> linksAllocator_;
-};
-#endif
-
-static ValueMapAllocator *&mapAllocator()
-{
-   static DefaultValueMapAllocator defaultAllocator;
-   static ValueMapAllocator *mapAllocator = &defaultAllocator;
-   return mapAllocator;
-}
-
-static struct DummyMapAllocatorInitializer {
-   DummyMapAllocatorInitializer() 
-   {
-      mapAllocator();      // ensure mapAllocator() statics are initialized before main().
-   }
-} dummyMapAllocatorInitializer;
-
-
-
-// h(K) = value * K >> w ; with w = 32 & K prime w.r.t. 2^32.
-
-/*
-use linked list hash map. 
-buckets array is a container.
-linked list element contains 6 key/values. (memory = (16+4) * 6 + 4 = 124)
-value have extra state: valid, available, deleted
-*/
-
-
-ValueInternalMap::ValueInternalMap()
-   : buckets_( 0 )
-   , tailLink_( 0 )
-   , bucketsSize_( 0 )
-   , itemCount_( 0 )
-{
-}
-
-
-ValueInternalMap::ValueInternalMap( const ValueInternalMap &other )
-   : buckets_( 0 )
-   , tailLink_( 0 )
-   , bucketsSize_( 0 )
-   , itemCount_( 0 )
-{
-   reserve( other.itemCount_ );
-   IteratorState it;
-   IteratorState itEnd;
-   other.makeBeginIterator( it );
-   other.makeEndIterator( itEnd );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      bool isStatic;
-      const char *memberName = key( it, isStatic );
-      const Value &aValue = value( it );
-      resolveReference(memberName, isStatic) = aValue;
-   }
-}
-
-
-ValueInternalMap &
-ValueInternalMap::operator =( const ValueInternalMap &other )
-{
-   ValueInternalMap dummy( other );
-   swap( dummy );
-   return *this;
-}
-
-
-ValueInternalMap::~ValueInternalMap()
-{
-   if ( buckets_ )
-   {
-      for ( BucketIndex bucketIndex =0; bucketIndex < bucketsSize_; ++bucketIndex )
-      {
-         ValueInternalLink *link = buckets_[bucketIndex].next_;
-         while ( link )
-         {
-            ValueInternalLink *linkToRelease = link;
-            link = link->next_;
-            mapAllocator()->releaseMapLink( linkToRelease );
-         }
-      }
-      mapAllocator()->releaseMapBuckets( buckets_ );
-   }
-}
-
-
-void 
-ValueInternalMap::swap( ValueInternalMap &other )
-{
-   ValueInternalLink *tempBuckets = buckets_;
-   buckets_ = other.buckets_;
-   other.buckets_ = tempBuckets;
-   ValueInternalLink *tempTailLink = tailLink_;
-   tailLink_ = other.tailLink_;
-   other.tailLink_ = tempTailLink;
-   BucketIndex tempBucketsSize = bucketsSize_;
-   bucketsSize_ = other.bucketsSize_;
-   other.bucketsSize_ = tempBucketsSize;
-   BucketIndex tempItemCount = itemCount_;
-   itemCount_ = other.itemCount_;
-   other.itemCount_ = tempItemCount;
-}
-
-
-void 
-ValueInternalMap::clear()
-{
-   ValueInternalMap dummy;
-   swap( dummy );
-}
-
-
-ValueInternalMap::BucketIndex 
-ValueInternalMap::size() const
-{
-   return itemCount_;
-}
-
-bool 
-ValueInternalMap::reserveDelta( BucketIndex growth )
-{
-   return reserve( itemCount_ + growth );
-}
-
-bool 
-ValueInternalMap::reserve( BucketIndex newItemCount )
-{
-   if ( !buckets_  &&  newItemCount > 0 )
-   {
-      buckets_ = mapAllocator()->allocateMapBuckets( 1 );
-      bucketsSize_ = 1;
-      tailLink_ = &buckets_[0];
-   }
-//   BucketIndex idealBucketCount = (newItemCount + ValueInternalLink::itemPerLink) / ValueInternalLink::itemPerLink;
-   return true;
-}
-
-
-const Value *
-ValueInternalMap::find( const char *key ) const
-{
-   if ( !bucketsSize_ )
-      return 0;
-   HashKey hashedKey = hash( key );
-   BucketIndex bucketIndex = hashedKey % bucketsSize_;
-   for ( const ValueInternalLink *current = &buckets_[bucketIndex]; 
-         current != 0; 
-         current = current->next_ )
-   {
-      for ( BucketIndex index=0; index < ValueInternalLink::itemPerLink; ++index )
-      {
-         if ( current->items_[index].isItemAvailable() )
-            return 0;
-         if ( strcmp( key, current->keys_[index] ) == 0 )
-            return &current->items_[index];
-      }
-   }
-   return 0;
-}
-
-
-Value *
-ValueInternalMap::find( const char *key )
-{
-   const ValueInternalMap *constThis = this;
-   return const_cast<Value *>( constThis->find( key ) );
-}
-
-
-Value &
-ValueInternalMap::resolveReference( const char *key,
-                                    bool isStatic )
-{
-   HashKey hashedKey = hash( key );
-   if ( bucketsSize_ )
-   {
-      BucketIndex bucketIndex = hashedKey % bucketsSize_;
-      ValueInternalLink **previous = 0;
-      BucketIndex index;
-      for ( ValueInternalLink *current = &buckets_[bucketIndex]; 
-            current != 0; 
-            previous = &current->next_, current = current->next_ )
-      {
-         for ( index=0; index < ValueInternalLink::itemPerLink; ++index )
-         {
-            if ( current->items_[index].isItemAvailable() )
-               return setNewItem( key, isStatic, current, index );
-            if ( strcmp( key, current->keys_[index] ) == 0 )
-               return current->items_[index];
-         }
-      }
-   }
-
-   reserveDelta( 1 );
-   return unsafeAdd( key, isStatic, hashedKey );
-}
-
-
-void 
-ValueInternalMap::remove( const char *key )
-{
-   HashKey hashedKey = hash( key );
-   if ( !bucketsSize_ )
-      return;
-   BucketIndex bucketIndex = hashedKey % bucketsSize_;
-   for ( ValueInternalLink *link = &buckets_[bucketIndex]; 
-         link != 0; 
-         link = link->next_ )
-   {
-      BucketIndex index;
-      for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
-      {
-         if ( link->items_[index].isItemAvailable() )
-            return;
-         if ( strcmp( key, link->keys_[index] ) == 0 )
-         {
-            doActualRemove( link, index, bucketIndex );
-            return;
-         }
-      }
-   }
-}
-
-void 
-ValueInternalMap::doActualRemove( ValueInternalLink *link, 
-                                  BucketIndex index,
-                                  BucketIndex bucketIndex )
-{
-   // find last item of the bucket and swap it with the 'removed' one.
-   // set removed items flags to 'available'.
-   // if last page only contains 'available' items, then desallocate it (it's empty)
-   ValueInternalLink *&lastLink = getLastLinkInBucket( index );
-   BucketIndex lastItemIndex = 1; // a link can never be empty, so start at 1
-   for ( ;   
-         lastItemIndex < ValueInternalLink::itemPerLink; 
-         ++lastItemIndex ) // may be optimized with dicotomic search
-   {
-      if ( lastLink->items_[lastItemIndex].isItemAvailable() )
-         break;
-   }
-   
-   BucketIndex lastUsedIndex = lastItemIndex - 1;
-   Value *valueToDelete = &link->items_[index];
-   Value *valueToPreserve = &lastLink->items_[lastUsedIndex];
-   if ( valueToDelete != valueToPreserve )
-      valueToDelete->swap( *valueToPreserve );
-   if ( lastUsedIndex == 0 )  // page is now empty
-   {  // remove it from bucket linked list and delete it.
-      ValueInternalLink *linkPreviousToLast = lastLink->previous_;
-      if ( linkPreviousToLast != 0 )   // can not deleted bucket link.
-      {
-         mapAllocator()->releaseMapLink( lastLink );
-         linkPreviousToLast->next_ = 0;
-         lastLink = linkPreviousToLast;
-      }
-   }
-   else
-   {
-      Value dummy;
-      valueToPreserve->swap( dummy ); // restore deleted to default Value.
-      valueToPreserve->setItemUsed( false );
-   }
-   --itemCount_;
-}
-
-
-ValueInternalLink *&
-ValueInternalMap::getLastLinkInBucket( BucketIndex bucketIndex )
-{
-   if ( bucketIndex == bucketsSize_ - 1 )
-      return tailLink_;
-   ValueInternalLink *&previous = buckets_[bucketIndex+1].previous_;
-   if ( !previous )
-      previous = &buckets_[bucketIndex];
-   return previous;
-}
-
-
-Value &
-ValueInternalMap::setNewItem( const char *key, 
-                              bool isStatic,
-                              ValueInternalLink *link, 
-                              BucketIndex index )
-{
-   char *duplicatedKey = valueAllocator()->makeMemberName( key );
-   ++itemCount_;
-   link->keys_[index] = duplicatedKey;
-   link->items_[index].setItemUsed();
-   link->items_[index].setMemberNameIsStatic( isStatic );
-   return link->items_[index]; // items already default constructed.
-}
-
-
-Value &
-ValueInternalMap::unsafeAdd( const char *key, 
-                             bool isStatic, 
-                             HashKey hashedKey )
-{
-   JSON_ASSERT_MESSAGE( bucketsSize_ > 0, "ValueInternalMap::unsafeAdd(): internal logic error." );
-   BucketIndex bucketIndex = hashedKey % bucketsSize_;
-   ValueInternalLink *&previousLink = getLastLinkInBucket( bucketIndex );
-   ValueInternalLink *link = previousLink;
-   BucketIndex index;
-   for ( index =0; index < ValueInternalLink::itemPerLink; ++index )
-   {
-      if ( link->items_[index].isItemAvailable() )
-         break;
-   }
-   if ( index == ValueInternalLink::itemPerLink ) // need to add a new page
-   {
-      ValueInternalLink *newLink = mapAllocator()->allocateMapLink();
-      index = 0;
-      link->next_ = newLink;
-      previousLink = newLink;
-      link = newLink;
-   }
-   return setNewItem( key, isStatic, link, index );
-}
-
-
-ValueInternalMap::HashKey 
-ValueInternalMap::hash( const char *key ) const
-{
-   HashKey hash = 0;
-   while ( *key )
-      hash += *key++ * 37;
-   return hash;
-}
-
-
-int 
-ValueInternalMap::compare( const ValueInternalMap &other ) const
-{
-   int sizeDiff( itemCount_ - other.itemCount_ );
-   if ( sizeDiff != 0 )
-      return sizeDiff;
-   // Strict order guaranty is required. Compare all keys FIRST, then compare values.
-   IteratorState it;
-   IteratorState itEnd;
-   makeBeginIterator( it );
-   makeEndIterator( itEnd );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      if ( !other.find( key( it ) ) )
-         return 1;
-   }
-
-   // All keys are equals, let's compare values
-   makeBeginIterator( it );
-   for ( ; !equals(it,itEnd); increment(it) )
-   {
-      const Value *otherValue = other.find( key( it ) );
-      int valueDiff = value(it).compare( *otherValue );
-      if ( valueDiff != 0 )
-         return valueDiff;
-   }
-   return 0;
-}
-
-
-void 
-ValueInternalMap::makeBeginIterator( IteratorState &it ) const
-{
-   it.map_ = const_cast<ValueInternalMap *>( this );
-   it.bucketIndex_ = 0;
-   it.itemIndex_ = 0;
-   it.link_ = buckets_;
-}
-
-
-void 
-ValueInternalMap::makeEndIterator( IteratorState &it ) const
-{
-   it.map_ = const_cast<ValueInternalMap *>( this );
-   it.bucketIndex_ = bucketsSize_;
-   it.itemIndex_ = 0;
-   it.link_ = 0;
-}
-
-
-bool 
-ValueInternalMap::equals( const IteratorState &x, const IteratorState &other )
-{
-   return x.map_ == other.map_  
-          &&  x.bucketIndex_ == other.bucketIndex_  
-          &&  x.link_ == other.link_
-          &&  x.itemIndex_ == other.itemIndex_;
-}
-
-
-void 
-ValueInternalMap::incrementBucket( IteratorState &iterator )
-{
-   ++iterator.bucketIndex_;
-   JSON_ASSERT_MESSAGE( iterator.bucketIndex_ <= iterator.map_->bucketsSize_,
-      "ValueInternalMap::increment(): attempting to iterate beyond end." );
-   if ( iterator.bucketIndex_ == iterator.map_->bucketsSize_ )
-      iterator.link_ = 0;
-   else
-      iterator.link_ = &(iterator.map_->buckets_[iterator.bucketIndex_]);
-   iterator.itemIndex_ = 0;
-}
-
-
-void 
-ValueInternalMap::increment( IteratorState &iterator )
-{
-   JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterator using invalid iterator." );
-   ++iterator.itemIndex_;
-   if ( iterator.itemIndex_ == ValueInternalLink::itemPerLink )
-   {
-      JSON_ASSERT_MESSAGE( iterator.link_ != 0,
-         "ValueInternalMap::increment(): attempting to iterate beyond end." );
-      iterator.link_ = iterator.link_->next_;
-      if ( iterator.link_ == 0 )
-         incrementBucket( iterator );
-   }
-   else if ( iterator.link_->items_[iterator.itemIndex_].isItemAvailable() )
-   {
-      incrementBucket( iterator );
-   }
-}
-
-
-void 
-ValueInternalMap::decrement( IteratorState &iterator )
-{
-   if ( iterator.itemIndex_ == 0 )
-   {
-      JSON_ASSERT_MESSAGE( iterator.map_, "Attempting to iterate using invalid iterator." );
-      if ( iterator.link_ == &iterator.map_->buckets_[iterator.bucketIndex_] )
-      {
-         JSON_ASSERT_MESSAGE( iterator.bucketIndex_ > 0, "Attempting to iterate beyond beginning." );
-         --(iterator.bucketIndex_);
-      }
-      iterator.link_ = iterator.link_->previous_;
-      iterator.itemIndex_ = ValueInternalLink::itemPerLink - 1;
-   }
-}
-
-
-const char *
-ValueInternalMap::key( const IteratorState &iterator )
-{
-   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
-   return iterator.link_->keys_[iterator.itemIndex_];
-}
-
-const char *
-ValueInternalMap::key( const IteratorState &iterator, bool &isStatic )
-{
-   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
-   isStatic = iterator.link_->items_[iterator.itemIndex_].isMemberNameStatic();
-   return iterator.link_->keys_[iterator.itemIndex_];
-}
-
-
-Value &
-ValueInternalMap::value( const IteratorState &iterator )
-{
-   JSON_ASSERT_MESSAGE( iterator.link_, "Attempting to iterate using invalid iterator." );
-   return iterator.link_->items_[iterator.itemIndex_];
-}
-
-
-int 
-ValueInternalMap::distance( const IteratorState &x, const IteratorState &y )
-{
-   int offset = 0;
-   IteratorState it = x;
-   while ( !equals( it, y ) )
-      increment( it );
-   return offset;
-}
diff --git a/ext_libs/json/json_reader.cpp b/ext_libs/json/json_reader.cpp
index c290bdff..a6a3f4e3 100644
--- a/ext_libs/json/json_reader.cpp
+++ b/ext_libs/json/json_reader.cpp
@@ -1,786 +1,1992 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2011 Baptiste Lepilleur and The JsonCpp Authors
+// Copyright (C) 2016 InfoTeCS JSC. All rights reserved.
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
+#if !defined(JSON_IS_AMALGAMATION)
+#include "json_tool.h"
+#include <json/assertions.h>
 #include <json/reader.h>
 #include <json/value.h>
-#include <utility>
-#include <cstdio>
+#endif // if !defined(JSON_IS_AMALGAMATION)
+#include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <iostream>
-#include <stdexcept>
+#include <istream>
+#include <limits>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <utility>
+
+#include <cstdio>
+#if __cplusplus >= 201103L
+
+#if !defined(sscanf)
+#define sscanf std::sscanf
+#endif
+
+#endif //__cplusplus
+
+#if defined(_MSC_VER)
+#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+#endif //_MSC_VER
+
+#if defined(_MSC_VER)
+// Disable warning about strdup being deprecated.
+#pragma warning(disable : 4996)
+#endif
+
+// Define JSONCPP_DEPRECATED_STACK_LIMIT as an appropriate integer at compile
+// time to change the stack limit
+#if !defined(JSONCPP_DEPRECATED_STACK_LIMIT)
+#define JSONCPP_DEPRECATED_STACK_LIMIT 1000
+#endif
+
+static size_t const stackLimit_g =
+    JSONCPP_DEPRECATED_STACK_LIMIT; // see readValue()
+
+namespace Json {
 
-#if _MSC_VER >= 1400            // VC++ 8.0
-#pragma warning(disable : 4996) // disable warning about strdup being deprecated.
+#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
+using CharReaderPtr = std::unique_ptr<CharReader>;
+#else
+using CharReaderPtr = std::auto_ptr<CharReader>;
 #endif
 
-namespace Json
-{
 // Implementation of class Features
 // ////////////////////////////////
 
-Features::Features() : allowComments_(true), strictRoot_(false) {}
+Features::Features() = default;
 
-Features Features::all()
-{
-    return Features();
-}
+Features Features::all() { return {}; }
 
-Features Features::strictMode()
-{
-    Features features;
-    features.allowComments_ = false;
-    features.strictRoot_ = true;
-    return features;
+Features Features::strictMode() {
+  Features features;
+  features.allowComments_ = false;
+  features.strictRoot_ = true;
+  features.allowDroppedNullPlaceholders_ = false;
+  features.allowNumericKeys_ = false;
+  return features;
 }
 
 // Implementation of class Reader
 // ////////////////////////////////
 
-static inline bool in(Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4)
-{
-    return c == c1 || c == c2 || c == c3 || c == c4;
+bool Reader::containsNewLine(Reader::Location begin, Reader::Location end) {
+  return std::any_of(begin, end, [](char b) { return b == '\n' || b == '\r'; });
 }
 
-static inline bool
-  in(Reader::Char c, Reader::Char c1, Reader::Char c2, Reader::Char c3, Reader::Char c4, Reader::Char c5)
-{
-    return c == c1 || c == c2 || c == c3 || c == c4 || c == c5;
-}
+// Class Reader
+// //////////////////////////////////////////////////////////////////
 
-static bool containsNewLine(Reader::Location begin, Reader::Location end)
-{
-    for (; begin < end; ++begin)
-        if (*begin == '\n' || *begin == '\r')
-            return true;
-    return false;
+Reader::Reader() : features_(Features::all()) {}
+
+Reader::Reader(const Features& features) : features_(features) {}
+
+bool Reader::parse(const std::string& document, Value& root,
+                   bool collectComments) {
+  document_.assign(document.begin(), document.end());
+  const char* begin = document_.c_str();
+  const char* end = begin + document_.length();
+  return parse(begin, end, root, collectComments);
 }
 
-static std::string codePointToUTF8(unsigned int cp)
-{
-    std::string result;
+bool Reader::parse(std::istream& is, Value& root, bool collectComments) {
+  // std::istream_iterator<char> begin(is);
+  // std::istream_iterator<char> end;
+  // Those would allow streamed input from a file, if parse() were a
+  // template function.
 
-    // based on description from http://en.wikipedia.org/wiki/UTF-8
+  // Since String is reference-counted, this at least does not
+  // create an extra copy.
+  String doc(std::istreambuf_iterator<char>(is), {});
+  return parse(doc.data(), doc.data() + doc.size(), root, collectComments);
+}
 
-    if (cp <= 0x7f)
-    {
-        result.resize(1);
-        result[0] = static_cast<char>(cp);
-    }
-    else if (cp <= 0x7FF)
-    {
-        result.resize(2);
-        result[1] = static_cast<char>(0x80 | (0x3f & cp));
-        result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
-    }
-    else if (cp <= 0xFFFF)
-    {
-        result.resize(3);
-        result[2] = static_cast<char>(0x80 | (0x3f & cp));
-        result[1] = 0x80 | static_cast<char>((0x3f & (cp >> 6)));
-        result[0] = 0xE0 | static_cast<char>((0xf & (cp >> 12)));
-    }
-    else if (cp <= 0x10FFFF)
-    {
-        result.resize(4);
-        result[3] = static_cast<char>(0x80 | (0x3f & cp));
-        result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-        result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
-        result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
+bool Reader::parse(const char* beginDoc, const char* endDoc, Value& root,
+                   bool collectComments) {
+  if (!features_.allowComments_) {
+    collectComments = false;
+  }
+
+  begin_ = beginDoc;
+  end_ = endDoc;
+  collectComments_ = collectComments;
+  current_ = begin_;
+  lastValueEnd_ = nullptr;
+  lastValue_ = nullptr;
+  commentsBefore_.clear();
+  errors_.clear();
+  while (!nodes_.empty())
+    nodes_.pop();
+  nodes_.push(&root);
+
+  bool successful = readValue();
+  Token token;
+  skipCommentTokens(token);
+  if (collectComments_ && !commentsBefore_.empty())
+    root.setComment(commentsBefore_, commentAfter);
+  if (features_.strictRoot_) {
+    if (!root.isArray() && !root.isObject()) {
+      // Set error location to start of doc, ideally should be first token found
+      // in doc
+      token.type_ = tokenError;
+      token.start_ = beginDoc;
+      token.end_ = endDoc;
+      addError(
+          "A valid JSON document must be either an array or an object value.",
+          token);
+      return false;
     }
+  }
+  return successful;
+}
 
-    return result;
+bool Reader::readValue() {
+  // readValue() may call itself only if it calls readObject() or ReadArray().
+  // These methods execute nodes_.push() just before and nodes_.pop)() just
+  // after calling readValue(). parse() executes one nodes_.push(), so > instead
+  // of >=.
+  if (nodes_.size() > stackLimit_g)
+    throwRuntimeError("Exceeded stackLimit in readValue().");
+
+  Token token;
+  skipCommentTokens(token);
+  bool successful = true;
+
+  if (collectComments_ && !commentsBefore_.empty()) {
+    currentValue().setComment(commentsBefore_, commentBefore);
+    commentsBefore_.clear();
+  }
+
+  switch (token.type_) {
+  case tokenObjectBegin:
+    successful = readObject(token);
+    currentValue().setOffsetLimit(current_ - begin_);
+    break;
+  case tokenArrayBegin:
+    successful = readArray(token);
+    currentValue().setOffsetLimit(current_ - begin_);
+    break;
+  case tokenNumber:
+    successful = decodeNumber(token);
+    break;
+  case tokenString:
+    successful = decodeString(token);
+    break;
+  case tokenTrue: {
+    Value v(true);
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenFalse: {
+    Value v(false);
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenNull: {
+    Value v;
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenArraySeparator:
+  case tokenObjectEnd:
+  case tokenArrayEnd:
+    if (features_.allowDroppedNullPlaceholders_) {
+      // "Un-read" the current token and mark the current value as a null
+      // token.
+      current_--;
+      Value v;
+      currentValue().swapPayload(v);
+      currentValue().setOffsetStart(current_ - begin_ - 1);
+      currentValue().setOffsetLimit(current_ - begin_);
+      break;
+    } // Else, fall through...
+  default:
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+    return addError("Syntax error: value, object or array expected.", token);
+  }
+
+  if (collectComments_) {
+    lastValueEnd_ = current_;
+    lastValue_ = &currentValue();
+  }
+
+  return successful;
 }
 
-// Class Reader
-// //////////////////////////////////////////////////////////////////
+void Reader::skipCommentTokens(Token& token) {
+  if (features_.allowComments_) {
+    do {
+      readToken(token);
+    } while (token.type_ == tokenComment);
+  } else {
+    readToken(token);
+  }
+}
 
-Reader::Reader() : features_(Features::all()) {}
+bool Reader::readToken(Token& token) {
+  skipSpaces();
+  token.start_ = current_;
+  Char c = getNextChar();
+  bool ok = true;
+  switch (c) {
+  case '{':
+    token.type_ = tokenObjectBegin;
+    break;
+  case '}':
+    token.type_ = tokenObjectEnd;
+    break;
+  case '[':
+    token.type_ = tokenArrayBegin;
+    break;
+  case ']':
+    token.type_ = tokenArrayEnd;
+    break;
+  case '"':
+    token.type_ = tokenString;
+    ok = readString();
+    break;
+  case '/':
+    token.type_ = tokenComment;
+    ok = readComment();
+    break;
+  case '0':
+  case '1':
+  case '2':
+  case '3':
+  case '4':
+  case '5':
+  case '6':
+  case '7':
+  case '8':
+  case '9':
+  case '-':
+    token.type_ = tokenNumber;
+    readNumber();
+    break;
+  case 't':
+    token.type_ = tokenTrue;
+    ok = match("rue", 3);
+    break;
+  case 'f':
+    token.type_ = tokenFalse;
+    ok = match("alse", 4);
+    break;
+  case 'n':
+    token.type_ = tokenNull;
+    ok = match("ull", 3);
+    break;
+  case ',':
+    token.type_ = tokenArraySeparator;
+    break;
+  case ':':
+    token.type_ = tokenMemberSeparator;
+    break;
+  case 0:
+    token.type_ = tokenEndOfStream;
+    break;
+  default:
+    ok = false;
+    break;
+  }
+  if (!ok)
+    token.type_ = tokenError;
+  token.end_ = current_;
+  return ok;
+}
 
-Reader::Reader(const Features& features) : features_(features) {}
+void Reader::skipSpaces() {
+  while (current_ != end_) {
+    Char c = *current_;
+    if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
+      ++current_;
+    else
+      break;
+  }
+}
 
-bool Reader::parse(const std::string& document, Value& root, bool collectComments)
-{
-    document_ = document;
-    const char* begin = document_.c_str();
-    const char* end = begin + document_.length();
-    return parse(begin, end, root, collectComments);
+bool Reader::match(const Char* pattern, int patternLength) {
+  if (end_ - current_ < patternLength)
+    return false;
+  int index = patternLength;
+  while (index--)
+    if (current_[index] != pattern[index])
+      return false;
+  current_ += patternLength;
+  return true;
 }
 
-bool Reader::parse(std::istream& sin, Value& root, bool collectComments)
-{
-    // std::istream_iterator<char> begin(sin);
-    // std::istream_iterator<char> end;
-    // Those would allow streamed input from a file, if parse() were a
-    // template function.
+bool Reader::readComment() {
+  Location commentBegin = current_ - 1;
+  Char c = getNextChar();
+  bool successful = false;
+  if (c == '*')
+    successful = readCStyleComment();
+  else if (c == '/')
+    successful = readCppStyleComment();
+  if (!successful)
+    return false;
+
+  if (collectComments_) {
+    CommentPlacement placement = commentBefore;
+    if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin)) {
+      if (c != '*' || !containsNewLine(commentBegin, current_))
+        placement = commentAfterOnSameLine;
+    }
 
-    // Since std::string is reference-counted, this at least does not
-    // create an extra copy.
-    std::string doc;
-    std::getline(sin, doc, (char)EOF);
-    return parse(doc, root, collectComments);
+    addComment(commentBegin, current_, placement);
+  }
+  return true;
 }
 
-bool Reader::parse(const char* beginDoc, const char* endDoc, Value& root, bool collectComments)
-{
-    if (!features_.allowComments_)
-    {
-        collectComments = false;
-    }
-
-    begin_ = beginDoc;
-    end_ = endDoc;
-    collectComments_ = collectComments;
-    current_ = begin_;
-    lastValueEnd_ = 0;
-    lastValue_ = 0;
-    commentsBefore_ = "";
-    errors_.clear();
-    while (!nodes_.empty())
-        nodes_.pop();
-    nodes_.push(&root);
-
-    bool successful = readValue();
-    Token token;
-    skipCommentTokens(token);
-    if (collectComments_ && !commentsBefore_.empty())
-        root.setComment(commentsBefore_, commentAfter);
-    if (features_.strictRoot_)
-    {
-        if (!root.isArray() && !root.isObject())
-        {
-            // Set error location to start of doc, ideally should be first token found in doc
-            token.type_ = tokenError;
-            token.start_ = beginDoc;
-            token.end_ = endDoc;
-            addError("A valid JSON document must be either an array or an object value.", token);
-            return false;
-        }
+String Reader::normalizeEOL(Reader::Location begin, Reader::Location end) {
+  String normalized;
+  normalized.reserve(static_cast<size_t>(end - begin));
+  Reader::Location current = begin;
+  while (current != end) {
+    char c = *current++;
+    if (c == '\r') {
+      if (current != end && *current == '\n')
+        // convert dos EOL
+        ++current;
+      // convert Mac EOL
+      normalized += '\n';
+    } else {
+      normalized += c;
     }
-    return successful;
+  }
+  return normalized;
 }
 
-bool Reader::readValue()
-{
-    Token token;
-    skipCommentTokens(token);
-    bool successful = true;
+void Reader::addComment(Location begin, Location end,
+                        CommentPlacement placement) {
+  assert(collectComments_);
+  const String& normalized = normalizeEOL(begin, end);
+  if (placement == commentAfterOnSameLine) {
+    assert(lastValue_ != nullptr);
+    lastValue_->setComment(normalized, placement);
+  } else {
+    commentsBefore_ += normalized;
+  }
+}
 
-    if (collectComments_ && !commentsBefore_.empty())
-    {
-        currentValue().setComment(commentsBefore_, commentBefore);
-        commentsBefore_ = "";
-    }
+bool Reader::readCStyleComment() {
+  while ((current_ + 1) < end_) {
+    Char c = getNextChar();
+    if (c == '*' && *current_ == '/')
+      break;
+  }
+  return getNextChar() == '/';
+}
 
-    switch (token.type_)
-    {
-        case tokenObjectBegin:
-            successful = readObject(token);
-            break;
-        case tokenArrayBegin:
-            successful = readArray(token);
-            break;
-        case tokenNumber:
-            successful = decodeNumber(token);
-            break;
-        case tokenString:
-            successful = decodeString(token);
-            break;
-        case tokenTrue:
-            currentValue() = true;
-            break;
-        case tokenFalse:
-            currentValue() = false;
-            break;
-        case tokenNull:
-            currentValue() = Value();
-            break;
-        default:
-            return addError("Syntax error: value, object or array expected.", token);
-    }
-
-    if (collectComments_)
-    {
-        lastValueEnd_ = current_;
-        lastValue_ = &currentValue();
+bool Reader::readCppStyleComment() {
+  while (current_ != end_) {
+    Char c = getNextChar();
+    if (c == '\n')
+      break;
+    if (c == '\r') {
+      // Consume DOS EOL. It will be normalized in addComment.
+      if (current_ != end_ && *current_ == '\n')
+        getNextChar();
+      // Break on Moc OS 9 EOL.
+      break;
     }
+  }
+  return true;
+}
 
-    return successful;
+void Reader::readNumber() {
+  Location p = current_;
+  char c = '0'; // stopgap for already consumed character
+  // integral part
+  while (c >= '0' && c <= '9')
+    c = (current_ = p) < end_ ? *p++ : '\0';
+  // fractional part
+  if (c == '.') {
+    c = (current_ = p) < end_ ? *p++ : '\0';
+    while (c >= '0' && c <= '9')
+      c = (current_ = p) < end_ ? *p++ : '\0';
+  }
+  // exponential part
+  if (c == 'e' || c == 'E') {
+    c = (current_ = p) < end_ ? *p++ : '\0';
+    if (c == '+' || c == '-')
+      c = (current_ = p) < end_ ? *p++ : '\0';
+    while (c >= '0' && c <= '9')
+      c = (current_ = p) < end_ ? *p++ : '\0';
+  }
 }
 
-void Reader::skipCommentTokens(Token& token)
-{
-    if (features_.allowComments_)
-    {
-        do
-        {
-            readToken(token);
-        } while (token.type_ == tokenComment);
+bool Reader::readString() {
+  Char c = '\0';
+  while (current_ != end_) {
+    c = getNextChar();
+    if (c == '\\')
+      getNextChar();
+    else if (c == '"')
+      break;
+  }
+  return c == '"';
+}
+
+bool Reader::readObject(Token& token) {
+  Token tokenName;
+  String name;
+  Value init(objectValue);
+  currentValue().swapPayload(init);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  while (readToken(tokenName)) {
+    bool initialTokenOk = true;
+    while (tokenName.type_ == tokenComment && initialTokenOk)
+      initialTokenOk = readToken(tokenName);
+    if (!initialTokenOk)
+      break;
+    if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
+      return true;
+    name.clear();
+    if (tokenName.type_ == tokenString) {
+      if (!decodeString(tokenName, name))
+        return recoverFromError(tokenObjectEnd);
+    } else if (tokenName.type_ == tokenNumber && features_.allowNumericKeys_) {
+      Value numberName;
+      if (!decodeNumber(tokenName, numberName))
+        return recoverFromError(tokenObjectEnd);
+      name = numberName.asString();
+    } else {
+      break;
     }
-    else
-    {
-        readToken(token);
+
+    Token colon;
+    if (!readToken(colon) || colon.type_ != tokenMemberSeparator) {
+      return addErrorAndRecover("Missing ':' after object member name", colon,
+                                tokenObjectEnd);
+    }
+    Value& value = currentValue()[name];
+    nodes_.push(&value);
+    bool ok = readValue();
+    nodes_.pop();
+    if (!ok) // error already set
+      return recoverFromError(tokenObjectEnd);
+
+    Token comma;
+    if (!readToken(comma) ||
+        (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator &&
+         comma.type_ != tokenComment)) {
+      return addErrorAndRecover("Missing ',' or '}' in object declaration",
+                                comma, tokenObjectEnd);
     }
+    bool finalizeTokenOk = true;
+    while (comma.type_ == tokenComment && finalizeTokenOk)
+      finalizeTokenOk = readToken(comma);
+    if (comma.type_ == tokenObjectEnd)
+      return true;
+  }
+  return addErrorAndRecover("Missing '}' or object member name", tokenName,
+                            tokenObjectEnd);
 }
 
-bool Reader::expectToken(TokenType type, Token& token, const char* message)
-{
-    readToken(token);
-    if (token.type_ != type)
-        return addError(message, token);
+bool Reader::readArray(Token& token) {
+  Value init(arrayValue);
+  currentValue().swapPayload(init);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  skipSpaces();
+  if (current_ != end_ && *current_ == ']') // empty array
+  {
+    Token endArray;
+    readToken(endArray);
     return true;
+  }
+  int index = 0;
+  for (;;) {
+    Value& value = currentValue()[index++];
+    nodes_.push(&value);
+    bool ok = readValue();
+    nodes_.pop();
+    if (!ok) // error already set
+      return recoverFromError(tokenArrayEnd);
+
+    Token currentToken;
+    // Accept Comment after last item in the array.
+    ok = readToken(currentToken);
+    while (currentToken.type_ == tokenComment && ok) {
+      ok = readToken(currentToken);
+    }
+    bool badTokenType = (currentToken.type_ != tokenArraySeparator &&
+                         currentToken.type_ != tokenArrayEnd);
+    if (!ok || badTokenType) {
+      return addErrorAndRecover("Missing ',' or ']' in array declaration",
+                                currentToken, tokenArrayEnd);
+    }
+    if (currentToken.type_ == tokenArrayEnd)
+      break;
+  }
+  return true;
 }
 
-bool Reader::readToken(Token& token)
-{
-    skipSpaces();
-    token.start_ = current_;
-    Char c = getNextChar();
-    bool ok = true;
-    switch (c)
-    {
-        case '{':
-            token.type_ = tokenObjectBegin;
-            break;
-        case '}':
-            token.type_ = tokenObjectEnd;
-            break;
-        case '[':
-            token.type_ = tokenArrayBegin;
-            break;
-        case ']':
-            token.type_ = tokenArrayEnd;
-            break;
-        case '"':
-            token.type_ = tokenString;
-            ok = readString();
-            break;
-        case '/':
-            token.type_ = tokenComment;
-            ok = readComment();
-            break;
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-        case '-':
-            token.type_ = tokenNumber;
-            readNumber();
-            break;
-        case 't':
-            token.type_ = tokenTrue;
-            ok = match("rue", 3);
-            break;
-        case 'f':
-            token.type_ = tokenFalse;
-            ok = match("alse", 4);
-            break;
-        case 'n':
-            token.type_ = tokenNull;
-            ok = match("ull", 3);
-            break;
-        case ',':
-            token.type_ = tokenArraySeparator;
-            break;
-        case ':':
-            token.type_ = tokenMemberSeparator;
-            break;
-        case 0:
-            token.type_ = tokenEndOfStream;
-            break;
-        default:
-            ok = false;
-            break;
-    }
-    if (!ok)
-        token.type_ = tokenError;
-    token.end_ = current_;
-    return true;
+bool Reader::decodeNumber(Token& token) {
+  Value decoded;
+  if (!decodeNumber(token, decoded))
+    return false;
+  currentValue().swapPayload(decoded);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  currentValue().setOffsetLimit(token.end_ - begin_);
+  return true;
 }
 
-void Reader::skipSpaces()
-{
-    while (current_ != end_)
-    {
-        Char c = *current_;
-        if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
-            ++current_;
-        else
-            break;
+bool Reader::decodeNumber(Token& token, Value& decoded) {
+  // Attempts to parse the number as an integer. If the number is
+  // larger than the maximum supported value of an integer then
+  // we decode the number as a double.
+  Location current = token.start_;
+  bool isNegative = *current == '-';
+  if (isNegative)
+    ++current;
+  // TODO: Help the compiler do the div and mod at compile time or get rid of
+  // them.
+  Value::LargestUInt maxIntegerValue =
+      isNegative ? Value::LargestUInt(Value::maxLargestInt) + 1
+                 : Value::maxLargestUInt;
+  Value::LargestUInt threshold = maxIntegerValue / 10;
+  Value::LargestUInt value = 0;
+  while (current < token.end_) {
+    Char c = *current++;
+    if (c < '0' || c > '9')
+      return decodeDouble(token, decoded);
+    auto digit(static_cast<Value::UInt>(c - '0'));
+    if (value >= threshold) {
+      // We've hit or exceeded the max value divided by 10 (rounded down). If
+      // a) we've only just touched the limit, b) this is the last digit, and
+      // c) it's small enough to fit in that rounding delta, we're okay.
+      // Otherwise treat this number as a double to avoid overflow.
+      if (value > threshold || current != token.end_ ||
+          digit > maxIntegerValue % 10) {
+        return decodeDouble(token, decoded);
+      }
     }
+    value = value * 10 + digit;
+  }
+  if (isNegative && value == maxIntegerValue)
+    decoded = Value::minLargestInt;
+  else if (isNegative)
+    decoded = -Value::LargestInt(value);
+  else if (value <= Value::LargestUInt(Value::maxInt))
+    decoded = Value::LargestInt(value);
+  else
+    decoded = value;
+  return true;
 }
 
-bool Reader::match(Location pattern, int patternLength)
-{
-    if (end_ - current_ < patternLength)
-        return false;
-    int index = patternLength;
-    while (index--)
-        if (current_[index] != pattern[index])
-            return false;
-    current_ += patternLength;
-    return true;
+bool Reader::decodeDouble(Token& token) {
+  Value decoded;
+  if (!decodeDouble(token, decoded))
+    return false;
+  currentValue().swapPayload(decoded);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  currentValue().setOffsetLimit(token.end_ - begin_);
+  return true;
 }
 
-bool Reader::readComment()
-{
-    Location commentBegin = current_ - 1;
-    Char c = getNextChar();
-    bool successful = false;
-    if (c == '*')
-        successful = readCStyleComment();
-    else if (c == '/')
-        successful = readCppStyleComment();
-    if (!successful)
-        return false;
+bool Reader::decodeDouble(Token& token, Value& decoded) {
+  double value = 0;
+  String buffer(token.start_, token.end_);
+  IStringStream is(buffer);
+  if (!(is >> value))
+    return addError(
+        "'" + String(token.start_, token.end_) + "' is not a number.", token);
+  decoded = value;
+  return true;
+}
 
-    if (collectComments_)
-    {
-        CommentPlacement placement = commentBefore;
-        if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin))
-        {
-            if (c != '*' || !containsNewLine(commentBegin, current_))
-                placement = commentAfterOnSameLine;
-        }
+bool Reader::decodeString(Token& token) {
+  String decoded_string;
+  if (!decodeString(token, decoded_string))
+    return false;
+  Value decoded(decoded_string);
+  currentValue().swapPayload(decoded);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  currentValue().setOffsetLimit(token.end_ - begin_);
+  return true;
+}
 
-        addComment(commentBegin, current_, placement);
+bool Reader::decodeString(Token& token, String& decoded) {
+  decoded.reserve(static_cast<size_t>(token.end_ - token.start_ - 2));
+  Location current = token.start_ + 1; // skip '"'
+  Location end = token.end_ - 1;       // do not include '"'
+  while (current != end) {
+    Char c = *current++;
+    if (c == '"')
+      break;
+    if (c == '\\') {
+      if (current == end)
+        return addError("Empty escape sequence in string", token, current);
+      Char escape = *current++;
+      switch (escape) {
+      case '"':
+        decoded += '"';
+        break;
+      case '/':
+        decoded += '/';
+        break;
+      case '\\':
+        decoded += '\\';
+        break;
+      case 'b':
+        decoded += '\b';
+        break;
+      case 'f':
+        decoded += '\f';
+        break;
+      case 'n':
+        decoded += '\n';
+        break;
+      case 'r':
+        decoded += '\r';
+        break;
+      case 't':
+        decoded += '\t';
+        break;
+      case 'u': {
+        unsigned int unicode;
+        if (!decodeUnicodeCodePoint(token, current, end, unicode))
+          return false;
+        decoded += codePointToUTF8(unicode);
+      } break;
+      default:
+        return addError("Bad escape sequence in string", token, current);
+      }
+    } else {
+      decoded += c;
     }
-    return true;
+  }
+  return true;
 }
 
-void Reader::addComment(Location begin, Location end, CommentPlacement placement)
-{
-    assert(collectComments_);
-    if (placement == commentAfterOnSameLine)
-    {
-        assert(lastValue_ != 0);
-        lastValue_->setComment(std::string(begin, end), placement);
-    }
+bool Reader::decodeUnicodeCodePoint(Token& token, Location& current,
+                                    Location end, unsigned int& unicode) {
+
+  if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
+    return false;
+  if (unicode >= 0xD800 && unicode <= 0xDBFF) {
+    // surrogate pairs
+    if (end - current < 6)
+      return addError(
+          "additional six characters expected to parse unicode surrogate pair.",
+          token, current);
+    if (*(current++) == '\\' && *(current++) == 'u') {
+      unsigned int surrogatePair;
+      if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair)) {
+        unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
+      } else
+        return false;
+    } else
+      return addError("expecting another \\u token to begin the second half of "
+                      "a unicode surrogate pair",
+                      token, current);
+  }
+  return true;
+}
+
+bool Reader::decodeUnicodeEscapeSequence(Token& token, Location& current,
+                                         Location end,
+                                         unsigned int& ret_unicode) {
+  if (end - current < 4)
+    return addError(
+        "Bad unicode escape sequence in string: four digits expected.", token,
+        current);
+  int unicode = 0;
+  for (int index = 0; index < 4; ++index) {
+    Char c = *current++;
+    unicode *= 16;
+    if (c >= '0' && c <= '9')
+      unicode += c - '0';
+    else if (c >= 'a' && c <= 'f')
+      unicode += c - 'a' + 10;
+    else if (c >= 'A' && c <= 'F')
+      unicode += c - 'A' + 10;
     else
-    {
-        if (!commentsBefore_.empty())
-            commentsBefore_ += "\n";
-        commentsBefore_ += std::string(begin, end);
-    }
+      return addError(
+          "Bad unicode escape sequence in string: hexadecimal digit expected.",
+          token, current);
+  }
+  ret_unicode = static_cast<unsigned int>(unicode);
+  return true;
 }
 
-bool Reader::readCStyleComment()
-{
-    while (current_ != end_)
-    {
-        Char c = getNextChar();
-        if (c == '*' && *current_ == '/')
-            break;
-    }
-    return getNextChar() == '/';
+bool Reader::addError(const String& message, Token& token, Location extra) {
+  ErrorInfo info;
+  info.token_ = token;
+  info.message_ = message;
+  info.extra_ = extra;
+  errors_.push_back(info);
+  return false;
 }
 
-bool Reader::readCppStyleComment()
-{
-    while (current_ != end_)
-    {
-        Char c = getNextChar();
-        if (c == '\r' || c == '\n')
-            break;
+bool Reader::recoverFromError(TokenType skipUntilToken) {
+  size_t const errorCount = errors_.size();
+  Token skip;
+  for (;;) {
+    if (!readToken(skip))
+      errors_.resize(errorCount); // discard errors caused by recovery
+    if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
+      break;
+  }
+  errors_.resize(errorCount);
+  return false;
+}
+
+bool Reader::addErrorAndRecover(const String& message, Token& token,
+                                TokenType skipUntilToken) {
+  addError(message, token);
+  return recoverFromError(skipUntilToken);
+}
+
+Value& Reader::currentValue() { return *(nodes_.top()); }
+
+Reader::Char Reader::getNextChar() {
+  if (current_ == end_)
+    return 0;
+  return *current_++;
+}
+
+void Reader::getLocationLineAndColumn(Location location, int& line,
+                                      int& column) const {
+  Location current = begin_;
+  Location lastLineStart = current;
+  line = 0;
+  while (current < location && current != end_) {
+    Char c = *current++;
+    if (c == '\r') {
+      if (*current == '\n')
+        ++current;
+      lastLineStart = current;
+      ++line;
+    } else if (c == '\n') {
+      lastLineStart = current;
+      ++line;
     }
-    return true;
+  }
+  // column & line start at 1
+  column = int(location - lastLineStart) + 1;
+  ++line;
 }
 
-void Reader::readNumber()
-{
-    while (current_ != end_)
-    {
-        if (!(*current_ >= '0' && *current_ <= '9') && !in(*current_, '.', 'e', 'E', '+', '-'))
-            break;
-        ++current_;
+String Reader::getLocationLineAndColumn(Location location) const {
+  int line, column;
+  getLocationLineAndColumn(location, line, column);
+  char buffer[18 + 16 + 16 + 1];
+  jsoncpp_snprintf(buffer, sizeof(buffer), "Line %d, Column %d", line, column);
+  return buffer;
+}
+
+// Deprecated. Preserved for backward compatibility
+String Reader::getFormatedErrorMessages() const {
+  return getFormattedErrorMessages();
+}
+
+String Reader::getFormattedErrorMessages() const {
+  String formattedMessage;
+  for (const auto& error : errors_) {
+    formattedMessage +=
+        "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
+    formattedMessage += "  " + error.message_ + "\n";
+    if (error.extra_)
+      formattedMessage +=
+          "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
+  }
+  return formattedMessage;
+}
+
+std::vector<Reader::StructuredError> Reader::getStructuredErrors() const {
+  std::vector<Reader::StructuredError> allErrors;
+  for (const auto& error : errors_) {
+    Reader::StructuredError structured;
+    structured.offset_start = error.token_.start_ - begin_;
+    structured.offset_limit = error.token_.end_ - begin_;
+    structured.message = error.message_;
+    allErrors.push_back(structured);
+  }
+  return allErrors;
+}
+
+bool Reader::pushError(const Value& value, const String& message) {
+  ptrdiff_t const length = end_ - begin_;
+  if (value.getOffsetStart() > length || value.getOffsetLimit() > length)
+    return false;
+  Token token;
+  token.type_ = tokenError;
+  token.start_ = begin_ + value.getOffsetStart();
+  token.end_ = begin_ + value.getOffsetLimit();
+  ErrorInfo info;
+  info.token_ = token;
+  info.message_ = message;
+  info.extra_ = nullptr;
+  errors_.push_back(info);
+  return true;
+}
+
+bool Reader::pushError(const Value& value, const String& message,
+                       const Value& extra) {
+  ptrdiff_t const length = end_ - begin_;
+  if (value.getOffsetStart() > length || value.getOffsetLimit() > length ||
+      extra.getOffsetLimit() > length)
+    return false;
+  Token token;
+  token.type_ = tokenError;
+  token.start_ = begin_ + value.getOffsetStart();
+  token.end_ = begin_ + value.getOffsetLimit();
+  ErrorInfo info;
+  info.token_ = token;
+  info.message_ = message;
+  info.extra_ = begin_ + extra.getOffsetStart();
+  errors_.push_back(info);
+  return true;
+}
+
+bool Reader::good() const { return errors_.empty(); }
+
+// Originally copied from the Features class (now deprecated), used internally
+// for features implementation.
+class OurFeatures {
+public:
+  static OurFeatures all();
+  bool allowComments_;
+  bool allowTrailingCommas_;
+  bool strictRoot_;
+  bool allowDroppedNullPlaceholders_;
+  bool allowNumericKeys_;
+  bool allowSingleQuotes_;
+  bool failIfExtra_;
+  bool rejectDupKeys_;
+  bool allowSpecialFloats_;
+  bool skipBom_;
+  size_t stackLimit_;
+}; // OurFeatures
+
+OurFeatures OurFeatures::all() { return {}; }
+
+// Implementation of class Reader
+// ////////////////////////////////
+
+// Originally copied from the Reader class (now deprecated), used internally
+// for implementing JSON reading.
+class OurReader {
+public:
+  using Char = char;
+  using Location = const Char*;
+  struct StructuredError {
+    ptrdiff_t offset_start;
+    ptrdiff_t offset_limit;
+    String message;
+  };
+
+  explicit OurReader(OurFeatures const& features);
+  bool parse(const char* beginDoc, const char* endDoc, Value& root,
+             bool collectComments = true);
+  String getFormattedErrorMessages() const;
+  std::vector<StructuredError> getStructuredErrors() const;
+
+private:
+  OurReader(OurReader const&);      // no impl
+  void operator=(OurReader const&); // no impl
+
+  enum TokenType {
+    tokenEndOfStream = 0,
+    tokenObjectBegin,
+    tokenObjectEnd,
+    tokenArrayBegin,
+    tokenArrayEnd,
+    tokenString,
+    tokenNumber,
+    tokenTrue,
+    tokenFalse,
+    tokenNull,
+    tokenNaN,
+    tokenPosInf,
+    tokenNegInf,
+    tokenArraySeparator,
+    tokenMemberSeparator,
+    tokenComment,
+    tokenError
+  };
+
+  class Token {
+  public:
+    TokenType type_;
+    Location start_;
+    Location end_;
+  };
+
+  class ErrorInfo {
+  public:
+    Token token_;
+    String message_;
+    Location extra_;
+  };
+
+  using Errors = std::deque<ErrorInfo>;
+
+  bool readToken(Token& token);
+  void skipSpaces();
+  void skipBom(bool skipBom);
+  bool match(const Char* pattern, int patternLength);
+  bool readComment();
+  bool readCStyleComment(bool* containsNewLineResult);
+  bool readCppStyleComment();
+  bool readString();
+  bool readStringSingleQuote();
+  bool readNumber(bool checkInf);
+  bool readValue();
+  bool readObject(Token& token);
+  bool readArray(Token& token);
+  bool decodeNumber(Token& token);
+  bool decodeNumber(Token& token, Value& decoded);
+  bool decodeString(Token& token);
+  bool decodeString(Token& token, String& decoded);
+  bool decodeDouble(Token& token);
+  bool decodeDouble(Token& token, Value& decoded);
+  bool decodeUnicodeCodePoint(Token& token, Location& current, Location end,
+                              unsigned int& unicode);
+  bool decodeUnicodeEscapeSequence(Token& token, Location& current,
+                                   Location end, unsigned int& unicode);
+  bool addError(const String& message, Token& token, Location extra = nullptr);
+  bool recoverFromError(TokenType skipUntilToken);
+  bool addErrorAndRecover(const String& message, Token& token,
+                          TokenType skipUntilToken);
+  void skipUntilSpace();
+  Value& currentValue();
+  Char getNextChar();
+  void getLocationLineAndColumn(Location location, int& line,
+                                int& column) const;
+  String getLocationLineAndColumn(Location location) const;
+  void addComment(Location begin, Location end, CommentPlacement placement);
+  void skipCommentTokens(Token& token);
+
+  static String normalizeEOL(Location begin, Location end);
+  static bool containsNewLine(Location begin, Location end);
+
+  using Nodes = std::stack<Value*>;
+
+  Nodes nodes_{};
+  Errors errors_{};
+  String document_{};
+  Location begin_ = nullptr;
+  Location end_ = nullptr;
+  Location current_ = nullptr;
+  Location lastValueEnd_ = nullptr;
+  Value* lastValue_ = nullptr;
+  bool lastValueHasAComment_ = false;
+  String commentsBefore_{};
+
+  OurFeatures const features_;
+  bool collectComments_ = false;
+}; // OurReader
+
+// complete copy of Read impl, for OurReader
+
+bool OurReader::containsNewLine(OurReader::Location begin,
+                                OurReader::Location end) {
+  return std::any_of(begin, end, [](char b) { return b == '\n' || b == '\r'; });
+}
+
+OurReader::OurReader(OurFeatures const& features) : features_(features) {}
+
+bool OurReader::parse(const char* beginDoc, const char* endDoc, Value& root,
+                      bool collectComments) {
+  if (!features_.allowComments_) {
+    collectComments = false;
+  }
+
+  begin_ = beginDoc;
+  end_ = endDoc;
+  collectComments_ = collectComments;
+  current_ = begin_;
+  lastValueEnd_ = nullptr;
+  lastValue_ = nullptr;
+  commentsBefore_.clear();
+  errors_.clear();
+  while (!nodes_.empty())
+    nodes_.pop();
+  nodes_.push(&root);
+
+  // skip byte order mark if it exists at the beginning of the UTF-8 text.
+  skipBom(features_.skipBom_);
+  bool successful = readValue();
+  nodes_.pop();
+  Token token;
+  skipCommentTokens(token);
+  if (features_.failIfExtra_ && (token.type_ != tokenEndOfStream)) {
+    addError("Extra non-whitespace after JSON value.", token);
+    return false;
+  }
+  if (collectComments_ && !commentsBefore_.empty())
+    root.setComment(commentsBefore_, commentAfter);
+  if (features_.strictRoot_) {
+    if (!root.isArray() && !root.isObject()) {
+      // Set error location to start of doc, ideally should be first token found
+      // in doc
+      token.type_ = tokenError;
+      token.start_ = beginDoc;
+      token.end_ = endDoc;
+      addError(
+          "A valid JSON document must be either an array or an object value.",
+          token);
+      return false;
     }
+  }
+  return successful;
 }
 
-bool Reader::readString()
-{
-    Char c = 0;
-    while (current_ != end_)
-    {
-        c = getNextChar();
-        if (c == '\\')
-            getNextChar();
-        else if (c == '"')
-            break;
-    }
-    return c == '"';
-}
-
-bool Reader::readObject(Token& tokenStart)
-{
-    Token tokenName;
-    std::string name;
-    currentValue() = Value(objectValue);
-    (void)tokenStart;
-    while (readToken(tokenName))
-    {
-        bool initialTokenOk = true;
-        while (tokenName.type_ == tokenComment && initialTokenOk)
-            initialTokenOk = readToken(tokenName);
-        if (!initialTokenOk)
-            break;
-        if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
-            return true;
-        if (tokenName.type_ != tokenString)
-            break;
-
-        name = "";
-        if (!decodeString(tokenName, name))
-            return recoverFromError(tokenObjectEnd);
-
-        Token colon;
-        if (!readToken(colon) || colon.type_ != tokenMemberSeparator)
-        {
-            return addErrorAndRecover("Missing ':' after object member name", colon, tokenObjectEnd);
-        }
-        Value& value = currentValue()[name];
-        nodes_.push(&value);
-        bool ok = readValue();
-        nodes_.pop();
-        if (!ok) // error already set
-            return recoverFromError(tokenObjectEnd);
-
-        Token comma;
-        if (!readToken(comma) ||
-            (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator && comma.type_ != tokenComment))
-        {
-            return addErrorAndRecover("Missing ',' or '}' in object declaration", comma, tokenObjectEnd);
-        }
-        bool finalizeTokenOk = true;
-        while (comma.type_ == tokenComment && finalizeTokenOk)
-            finalizeTokenOk = readToken(comma);
-        if (comma.type_ == tokenObjectEnd)
-            return true;
+bool OurReader::readValue() {
+  //  To preserve the old behaviour we cast size_t to int.
+  if (nodes_.size() > features_.stackLimit_)
+    throwRuntimeError("Exceeded stackLimit in readValue().");
+  Token token;
+  skipCommentTokens(token);
+  bool successful = true;
+
+  if (collectComments_ && !commentsBefore_.empty()) {
+    currentValue().setComment(commentsBefore_, commentBefore);
+    commentsBefore_.clear();
+  }
+
+  switch (token.type_) {
+  case tokenObjectBegin:
+    successful = readObject(token);
+    currentValue().setOffsetLimit(current_ - begin_);
+    break;
+  case tokenArrayBegin:
+    successful = readArray(token);
+    currentValue().setOffsetLimit(current_ - begin_);
+    break;
+  case tokenNumber:
+    successful = decodeNumber(token);
+    break;
+  case tokenString:
+    successful = decodeString(token);
+    break;
+  case tokenTrue: {
+    Value v(true);
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenFalse: {
+    Value v(false);
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenNull: {
+    Value v;
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenNaN: {
+    Value v(std::numeric_limits<double>::quiet_NaN());
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenPosInf: {
+    Value v(std::numeric_limits<double>::infinity());
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenNegInf: {
+    Value v(-std::numeric_limits<double>::infinity());
+    currentValue().swapPayload(v);
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+  } break;
+  case tokenArraySeparator:
+  case tokenObjectEnd:
+  case tokenArrayEnd:
+    if (features_.allowDroppedNullPlaceholders_) {
+      // "Un-read" the current token and mark the current value as a null
+      // token.
+      current_--;
+      Value v;
+      currentValue().swapPayload(v);
+      currentValue().setOffsetStart(current_ - begin_ - 1);
+      currentValue().setOffsetLimit(current_ - begin_);
+      break;
+    } // else, fall through ...
+  default:
+    currentValue().setOffsetStart(token.start_ - begin_);
+    currentValue().setOffsetLimit(token.end_ - begin_);
+    return addError("Syntax error: value, object or array expected.", token);
+  }
+
+  if (collectComments_) {
+    lastValueEnd_ = current_;
+    lastValueHasAComment_ = false;
+    lastValue_ = &currentValue();
+  }
+
+  return successful;
+}
+
+void OurReader::skipCommentTokens(Token& token) {
+  if (features_.allowComments_) {
+    do {
+      readToken(token);
+    } while (token.type_ == tokenComment);
+  } else {
+    readToken(token);
+  }
+}
+
+bool OurReader::readToken(Token& token) {
+  skipSpaces();
+  token.start_ = current_;
+  Char c = getNextChar();
+  bool ok = true;
+  switch (c) {
+  case '{':
+    token.type_ = tokenObjectBegin;
+    break;
+  case '}':
+    token.type_ = tokenObjectEnd;
+    break;
+  case '[':
+    token.type_ = tokenArrayBegin;
+    break;
+  case ']':
+    token.type_ = tokenArrayEnd;
+    break;
+  case '"':
+    token.type_ = tokenString;
+    ok = readString();
+    break;
+  case '\'':
+    if (features_.allowSingleQuotes_) {
+      token.type_ = tokenString;
+      ok = readStringSingleQuote();
+    } else {
+      // If we don't allow single quotes, this is a failure case.
+      ok = false;
+    }
+    break;
+  case '/':
+    token.type_ = tokenComment;
+    ok = readComment();
+    break;
+  case '0':
+  case '1':
+  case '2':
+  case '3':
+  case '4':
+  case '5':
+  case '6':
+  case '7':
+  case '8':
+  case '9':
+    token.type_ = tokenNumber;
+    readNumber(false);
+    break;
+  case '-':
+    if (readNumber(true)) {
+      token.type_ = tokenNumber;
+    } else {
+      token.type_ = tokenNegInf;
+      ok = features_.allowSpecialFloats_ && match("nfinity", 7);
     }
-    return addErrorAndRecover("Missing '}' or object member name", tokenName, tokenObjectEnd);
+    break;
+  case '+':
+    if (readNumber(true)) {
+      token.type_ = tokenNumber;
+    } else {
+      token.type_ = tokenPosInf;
+      ok = features_.allowSpecialFloats_ && match("nfinity", 7);
+    }
+    break;
+  case 't':
+    token.type_ = tokenTrue;
+    ok = match("rue", 3);
+    break;
+  case 'f':
+    token.type_ = tokenFalse;
+    ok = match("alse", 4);
+    break;
+  case 'n':
+    token.type_ = tokenNull;
+    ok = match("ull", 3);
+    break;
+  case 'N':
+    if (features_.allowSpecialFloats_) {
+      token.type_ = tokenNaN;
+      ok = match("aN", 2);
+    } else {
+      ok = false;
+    }
+    break;
+  case 'I':
+    if (features_.allowSpecialFloats_) {
+      token.type_ = tokenPosInf;
+      ok = match("nfinity", 7);
+    } else {
+      ok = false;
+    }
+    break;
+  case ',':
+    token.type_ = tokenArraySeparator;
+    break;
+  case ':':
+    token.type_ = tokenMemberSeparator;
+    break;
+  case 0:
+    token.type_ = tokenEndOfStream;
+    break;
+  default:
+    ok = false;
+    break;
+  }
+  if (!ok)
+    token.type_ = tokenError;
+  token.end_ = current_;
+  return ok;
 }
 
-bool Reader::readArray(Token& tokenStart)
-{
-    currentValue() = Value(arrayValue);
-    skipSpaces();
-    (void)tokenStart;
-    if (*current_ == ']') // empty array
-    {
-        Token endArray;
-        readToken(endArray);
-        return true;
+void OurReader::skipSpaces() {
+  while (current_ != end_) {
+    Char c = *current_;
+    if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
+      ++current_;
+    else
+      break;
+  }
+}
+
+void OurReader::skipBom(bool skipBom) {
+  // The default behavior is to skip BOM.
+  if (skipBom) {
+    if ((end_ - begin_) >= 3 && strncmp(begin_, "\xEF\xBB\xBF", 3) == 0) {
+      begin_ += 3;
+      current_ = begin_;
     }
-    int index = 0;
-    while (true)
-    {
-        Value& value = currentValue()[index++];
-        nodes_.push(&value);
-        bool ok = readValue();
-        nodes_.pop();
-        if (!ok) // error already set
-            return recoverFromError(tokenArrayEnd);
-
-        Token token;
-        // Accept Comment after last item in the array.
-        ok = readToken(token);
-        while (token.type_ == tokenComment && ok)
-        {
-            ok = readToken(token);
-        }
-        bool badTokenType = (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd);
-        if (!ok || badTokenType)
-        {
-            return addErrorAndRecover("Missing ',' or ']' in array declaration", token, tokenArrayEnd);
+  }
+}
+
+bool OurReader::match(const Char* pattern, int patternLength) {
+  if (end_ - current_ < patternLength)
+    return false;
+  int index = patternLength;
+  while (index--)
+    if (current_[index] != pattern[index])
+      return false;
+  current_ += patternLength;
+  return true;
+}
+
+bool OurReader::readComment() {
+  const Location commentBegin = current_ - 1;
+  const Char c = getNextChar();
+  bool successful = false;
+  bool cStyleWithEmbeddedNewline = false;
+
+  const bool isCStyleComment = (c == '*');
+  const bool isCppStyleComment = (c == '/');
+  if (isCStyleComment) {
+    successful = readCStyleComment(&cStyleWithEmbeddedNewline);
+  } else if (isCppStyleComment) {
+    successful = readCppStyleComment();
+  }
+
+  if (!successful)
+    return false;
+
+  if (collectComments_) {
+    CommentPlacement placement = commentBefore;
+
+    if (!lastValueHasAComment_) {
+      if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin)) {
+        if (isCppStyleComment || !cStyleWithEmbeddedNewline) {
+          placement = commentAfterOnSameLine;
+          lastValueHasAComment_ = true;
         }
-        if (token.type_ == tokenArrayEnd)
-            break;
+      }
     }
-    return true;
+
+    addComment(commentBegin, current_, placement);
+  }
+  return true;
 }
 
-bool Reader::decodeNumber(Token& token)
-{
-    bool isDouble = false;
-    for (Location inspect = token.start_; inspect != token.end_; ++inspect)
-    {
-        isDouble = isDouble || in(*inspect, '.', 'e', 'E', '+') || (*inspect == '-' && inspect != token.start_);
-    }
-    if (isDouble)
-        return decodeDouble(token);
-    Location current = token.start_;
-    bool isNegative = *current == '-';
-    if (isNegative)
+String OurReader::normalizeEOL(OurReader::Location begin,
+                               OurReader::Location end) {
+  String normalized;
+  normalized.reserve(static_cast<size_t>(end - begin));
+  OurReader::Location current = begin;
+  while (current != end) {
+    char c = *current++;
+    if (c == '\r') {
+      if (current != end && *current == '\n')
+        // convert dos EOL
         ++current;
-    Value::UInt threshold = (isNegative ? Value::UInt(-Value::minInt) : Value::maxUInt) / 10;
-    Value::UInt value = 0;
-    while (current < token.end_)
-    {
-        Char c = *current++;
-        if (c < '0' || c > '9')
-            return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token);
-        if (value >= threshold)
-            return decodeDouble(token);
-        value = value * 10 + Value::UInt(c - '0');
-    }
-    if (isNegative)
-        currentValue() = -Value::Int(value);
-    else if (value <= Value::UInt(Value::maxInt))
-        currentValue() = Value::Int(value);
-    else
-        currentValue() = value;
-    return true;
+      // convert Mac EOL
+      normalized += '\n';
+    } else {
+      normalized += c;
+    }
+  }
+  return normalized;
 }
 
-bool Reader::decodeDouble(Token& token)
-{
-    double value = 0;
-    const int bufferSize = 32;
-    int count;
-    int length = int(token.end_ - token.start_);
-    if (length <= bufferSize)
-    {
-        Char buffer[bufferSize];
-        memcpy(buffer, token.start_, length);
-        buffer[length] = 0;
-        count = sscanf(buffer, "%lf", &value);
-    }
-    else
-    {
-        std::string buffer(token.start_, token.end_);
-        count = sscanf(buffer.c_str(), "%lf", &value);
+void OurReader::addComment(Location begin, Location end,
+                           CommentPlacement placement) {
+  assert(collectComments_);
+  const String& normalized = normalizeEOL(begin, end);
+  if (placement == commentAfterOnSameLine) {
+    assert(lastValue_ != nullptr);
+    lastValue_->setComment(normalized, placement);
+  } else {
+    commentsBefore_ += normalized;
+  }
+}
+
+bool OurReader::readCStyleComment(bool* containsNewLineResult) {
+  *containsNewLineResult = false;
+
+  while ((current_ + 1) < end_) {
+    Char c = getNextChar();
+    if (c == '*' && *current_ == '/')
+      break;
+    if (c == '\n')
+      *containsNewLineResult = true;
+  }
+
+  return getNextChar() == '/';
+}
+
+bool OurReader::readCppStyleComment() {
+  while (current_ != end_) {
+    Char c = getNextChar();
+    if (c == '\n')
+      break;
+    if (c == '\r') {
+      // Consume DOS EOL. It will be normalized in addComment.
+      if (current_ != end_ && *current_ == '\n')
+        getNextChar();
+      // Break on Moc OS 9 EOL.
+      break;
     }
+  }
+  return true;
+}
 
-    if (count != 1)
-        return addError("'" + std::string(token.start_, token.end_) + "' is not a number.", token);
-    currentValue() = value;
-    return true;
+bool OurReader::readNumber(bool checkInf) {
+  Location p = current_;
+  if (checkInf && p != end_ && *p == 'I') {
+    current_ = ++p;
+    return false;
+  }
+  char c = '0'; // stopgap for already consumed character
+  // integral part
+  while (c >= '0' && c <= '9')
+    c = (current_ = p) < end_ ? *p++ : '\0';
+  // fractional part
+  if (c == '.') {
+    c = (current_ = p) < end_ ? *p++ : '\0';
+    while (c >= '0' && c <= '9')
+      c = (current_ = p) < end_ ? *p++ : '\0';
+  }
+  // exponential part
+  if (c == 'e' || c == 'E') {
+    c = (current_ = p) < end_ ? *p++ : '\0';
+    if (c == '+' || c == '-')
+      c = (current_ = p) < end_ ? *p++ : '\0';
+    while (c >= '0' && c <= '9')
+      c = (current_ = p) < end_ ? *p++ : '\0';
+  }
+  return true;
+}
+bool OurReader::readString() {
+  Char c = 0;
+  while (current_ != end_) {
+    c = getNextChar();
+    if (c == '\\')
+      getNextChar();
+    else if (c == '"')
+      break;
+  }
+  return c == '"';
 }
 
-bool Reader::decodeString(Token& token)
-{
-    std::string decoded;
-    if (!decodeString(token, decoded))
-        return false;
-    currentValue() = decoded;
-    return true;
+bool OurReader::readStringSingleQuote() {
+  Char c = 0;
+  while (current_ != end_) {
+    c = getNextChar();
+    if (c == '\\')
+      getNextChar();
+    else if (c == '\'')
+      break;
+  }
+  return c == '\'';
 }
 
-bool Reader::decodeString(Token& token, std::string& decoded)
-{
-    decoded.reserve(token.end_ - token.start_ - 2);
-    Location current = token.start_ + 1; // skip '"'
-    Location end = token.end_ - 1;       // do not include '"'
-    while (current != end)
-    {
-        Char c = *current++;
-        if (c == '"')
-            break;
-        else if (c == '\\')
-        {
-            if (current == end)
-                return addError("Empty escape sequence in string", token, current);
-            Char escape = *current++;
-            switch (escape)
-            {
-                case '"':
-                    decoded += '"';
-                    break;
-                case '/':
-                    decoded += '/';
-                    break;
-                case '\\':
-                    decoded += '\\';
-                    break;
-                case 'b':
-                    decoded += '\b';
-                    break;
-                case 'f':
-                    decoded += '\f';
-                    break;
-                case 'n':
-                    decoded += '\n';
-                    break;
-                case 'r':
-                    decoded += '\r';
-                    break;
-                case 't':
-                    decoded += '\t';
-                    break;
-                case 'u':
-                {
-                    unsigned int unicode;
-                    if (!decodeUnicodeCodePoint(token, current, end, unicode))
-                        return false;
-                    decoded += codePointToUTF8(unicode);
-                }
-                break;
-                default:
-                    return addError("Bad escape sequence in string", token, current);
-            }
-        }
-        else
-        {
-            decoded += c;
-        }
+bool OurReader::readObject(Token& token) {
+  Token tokenName;
+  String name;
+  Value init(objectValue);
+  currentValue().swapPayload(init);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  while (readToken(tokenName)) {
+    bool initialTokenOk = true;
+    while (tokenName.type_ == tokenComment && initialTokenOk)
+      initialTokenOk = readToken(tokenName);
+    if (!initialTokenOk)
+      break;
+    if (tokenName.type_ == tokenObjectEnd &&
+        (name.empty() ||
+         features_.allowTrailingCommas_)) // empty object or trailing comma
+      return true;
+    name.clear();
+    if (tokenName.type_ == tokenString) {
+      if (!decodeString(tokenName, name))
+        return recoverFromError(tokenObjectEnd);
+    } else if (tokenName.type_ == tokenNumber && features_.allowNumericKeys_) {
+      Value numberName;
+      if (!decodeNumber(tokenName, numberName))
+        return recoverFromError(tokenObjectEnd);
+      name = numberName.asString();
+    } else {
+      break;
     }
-    return true;
+    if (name.length() >= (1U << 30))
+      throwRuntimeError("keylength >= 2^30");
+    if (features_.rejectDupKeys_ && currentValue().isMember(name)) {
+      String msg = "Duplicate key: '" + name + "'";
+      return addErrorAndRecover(msg, tokenName, tokenObjectEnd);
+    }
+
+    Token colon;
+    if (!readToken(colon) || colon.type_ != tokenMemberSeparator) {
+      return addErrorAndRecover("Missing ':' after object member name", colon,
+                                tokenObjectEnd);
+    }
+    Value& value = currentValue()[name];
+    nodes_.push(&value);
+    bool ok = readValue();
+    nodes_.pop();
+    if (!ok) // error already set
+      return recoverFromError(tokenObjectEnd);
+
+    Token comma;
+    if (!readToken(comma) ||
+        (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator &&
+         comma.type_ != tokenComment)) {
+      return addErrorAndRecover("Missing ',' or '}' in object declaration",
+                                comma, tokenObjectEnd);
+    }
+    bool finalizeTokenOk = true;
+    while (comma.type_ == tokenComment && finalizeTokenOk)
+      finalizeTokenOk = readToken(comma);
+    if (comma.type_ == tokenObjectEnd)
+      return true;
+  }
+  return addErrorAndRecover("Missing '}' or object member name", tokenName,
+                            tokenObjectEnd);
 }
 
-bool Reader::decodeUnicodeCodePoint(Token& token, Location& current, Location end, unsigned int& unicode)
-{
-    if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
-        return false;
-    if (unicode >= 0xD800 && unicode <= 0xDBFF)
+bool OurReader::readArray(Token& token) {
+  Value init(arrayValue);
+  currentValue().swapPayload(init);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  int index = 0;
+  for (;;) {
+    skipSpaces();
+    if (current_ != end_ && *current_ == ']' &&
+        (index == 0 ||
+         (features_.allowTrailingCommas_ &&
+          !features_.allowDroppedNullPlaceholders_))) // empty array or trailing
+                                                      // comma
     {
-        // surrogate pairs
-        if (end - current < 6)
-            return addError("additional six characters expected to parse unicode surrogate pair.", token, current);
-        unsigned int surrogatePair;
-        if (*(current++) == '\\' && *(current++) == 'u')
-        {
-            if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair))
-            {
-                unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
-            }
-            else
-                return false;
-        }
-        else
-            return addError("expecting another \\u token to begin the second half of a unicode surrogate pair", token,
-                            current);
+      Token endArray;
+      readToken(endArray);
+      return true;
     }
-    return true;
+    Value& value = currentValue()[index++];
+    nodes_.push(&value);
+    bool ok = readValue();
+    nodes_.pop();
+    if (!ok) // error already set
+      return recoverFromError(tokenArrayEnd);
+
+    Token currentToken;
+    // Accept Comment after last item in the array.
+    ok = readToken(currentToken);
+    while (currentToken.type_ == tokenComment && ok) {
+      ok = readToken(currentToken);
+    }
+    bool badTokenType = (currentToken.type_ != tokenArraySeparator &&
+                         currentToken.type_ != tokenArrayEnd);
+    if (!ok || badTokenType) {
+      return addErrorAndRecover("Missing ',' or ']' in array declaration",
+                                currentToken, tokenArrayEnd);
+    }
+    if (currentToken.type_ == tokenArrayEnd)
+      break;
+  }
+  return true;
 }
 
-bool Reader::decodeUnicodeEscapeSequence(Token& token, Location& current, Location end, unsigned int& unicode)
-{
-    if (end - current < 4)
-        return addError("Bad unicode escape sequence in string: four digits expected.", token, current);
-    unicode = 0;
-    for (int index = 0; index < 4; ++index)
-    {
-        Char c = *current++;
-        unicode *= 16;
-        if (c >= '0' && c <= '9')
-            unicode += c - '0';
-        else if (c >= 'a' && c <= 'f')
-            unicode += c - 'a' + 10;
-        else if (c >= 'A' && c <= 'F')
-            unicode += c - 'A' + 10;
-        else
-            return addError("Bad unicode escape sequence in string: hexadecimal digit expected.", token, current);
+bool OurReader::decodeNumber(Token& token) {
+  Value decoded;
+  if (!decodeNumber(token, decoded))
+    return false;
+  currentValue().swapPayload(decoded);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  currentValue().setOffsetLimit(token.end_ - begin_);
+  return true;
+}
+
+bool OurReader::decodeNumber(Token& token, Value& decoded) {
+  // Attempts to parse the number as an integer. If the number is
+  // larger than the maximum supported value of an integer then
+  // we decode the number as a double.
+  Location current = token.start_;
+  const bool isNegative = *current == '-';
+  if (isNegative) {
+    ++current;
+  }
+
+  // We assume we can represent the largest and smallest integer types as
+  // unsigned integers with separate sign. This is only true if they can fit
+  // into an unsigned integer.
+  static_assert(Value::maxLargestInt <= Value::maxLargestUInt,
+                "Int must be smaller than UInt");
+
+  // We need to convert minLargestInt into a positive number. The easiest way
+  // to do this conversion is to assume our "threshold" value of minLargestInt
+  // divided by 10 can fit in maxLargestInt when absolute valued. This should
+  // be a safe assumption.
+  static_assert(Value::minLargestInt <= -Value::maxLargestInt,
+                "The absolute value of minLargestInt must be greater than or "
+                "equal to maxLargestInt");
+  static_assert(Value::minLargestInt / 10 >= -Value::maxLargestInt,
+                "The absolute value of minLargestInt must be only 1 magnitude "
+                "larger than maxLargest Int");
+
+  static constexpr Value::LargestUInt positive_threshold =
+      Value::maxLargestUInt / 10;
+  static constexpr Value::UInt positive_last_digit = Value::maxLargestUInt % 10;
+
+  // For the negative values, we have to be more careful. Since typically
+  // -Value::minLargestInt will cause an overflow, we first divide by 10 and
+  // then take the inverse. This assumes that minLargestInt is only a single
+  // power of 10 different in magnitude, which we check above. For the last
+  // digit, we take the modulus before negating for the same reason.
+  static constexpr auto negative_threshold =
+      Value::LargestUInt(-(Value::minLargestInt / 10));
+  static constexpr auto negative_last_digit =
+      Value::UInt(-(Value::minLargestInt % 10));
+
+  const Value::LargestUInt threshold =
+      isNegative ? negative_threshold : positive_threshold;
+  const Value::UInt max_last_digit =
+      isNegative ? negative_last_digit : positive_last_digit;
+
+  Value::LargestUInt value = 0;
+  while (current < token.end_) {
+    Char c = *current++;
+    if (c < '0' || c > '9')
+      return decodeDouble(token, decoded);
+
+    const auto digit(static_cast<Value::UInt>(c - '0'));
+    if (value >= threshold) {
+      // We've hit or exceeded the max value divided by 10 (rounded down). If
+      // a) we've only just touched the limit, meaing value == threshold,
+      // b) this is the last digit, or
+      // c) it's small enough to fit in that rounding delta, we're okay.
+      // Otherwise treat this number as a double to avoid overflow.
+      if (value > threshold || current != token.end_ ||
+          digit > max_last_digit) {
+        return decodeDouble(token, decoded);
+      }
     }
-    return true;
+    value = value * 10 + digit;
+  }
+
+  if (isNegative) {
+    // We use the same magnitude assumption here, just in case.
+    const auto last_digit = static_cast<Value::UInt>(value % 10);
+    decoded = -Value::LargestInt(value / 10) * 10 - last_digit;
+  } else if (value <= Value::LargestUInt(Value::maxLargestInt)) {
+    decoded = Value::LargestInt(value);
+  } else {
+    decoded = value;
+  }
+
+  return true;
 }
 
-bool Reader::addError(const std::string& message, Token& token, Location extra)
-{
-    ErrorInfo info;
-    info.token_ = token;
-    info.message_ = message;
-    info.extra_ = extra;
-    errors_.push_back(info);
+bool OurReader::decodeDouble(Token& token) {
+  Value decoded;
+  if (!decodeDouble(token, decoded))
     return false;
+  currentValue().swapPayload(decoded);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  currentValue().setOffsetLimit(token.end_ - begin_);
+  return true;
 }
 
-bool Reader::recoverFromError(TokenType skipUntilToken)
-{
-    int errorCount = int(errors_.size());
-    Token skip;
-    while (true)
-    {
-        if (!readToken(skip))
-            errors_.resize(errorCount); // discard errors caused by recovery
-        if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
-            break;
+bool OurReader::decodeDouble(Token& token, Value& decoded) {
+  double value = 0;
+  const String buffer(token.start_, token.end_);
+  IStringStream is(buffer);
+  if (!(is >> value)) {
+    return addError(
+        "'" + String(token.start_, token.end_) + "' is not a number.", token);
+  }
+  decoded = value;
+  return true;
+}
+
+bool OurReader::decodeString(Token& token) {
+  String decoded_string;
+  if (!decodeString(token, decoded_string))
+    return false;
+  Value decoded(decoded_string);
+  currentValue().swapPayload(decoded);
+  currentValue().setOffsetStart(token.start_ - begin_);
+  currentValue().setOffsetLimit(token.end_ - begin_);
+  return true;
+}
+
+bool OurReader::decodeString(Token& token, String& decoded) {
+  decoded.reserve(static_cast<size_t>(token.end_ - token.start_ - 2));
+  Location current = token.start_ + 1; // skip '"'
+  Location end = token.end_ - 1;       // do not include '"'
+  while (current != end) {
+    Char c = *current++;
+    if (c == '"')
+      break;
+    if (c == '\\') {
+      if (current == end)
+        return addError("Empty escape sequence in string", token, current);
+      Char escape = *current++;
+      switch (escape) {
+      case '"':
+        decoded += '"';
+        break;
+      case '/':
+        decoded += '/';
+        break;
+      case '\\':
+        decoded += '\\';
+        break;
+      case 'b':
+        decoded += '\b';
+        break;
+      case 'f':
+        decoded += '\f';
+        break;
+      case 'n':
+        decoded += '\n';
+        break;
+      case 'r':
+        decoded += '\r';
+        break;
+      case 't':
+        decoded += '\t';
+        break;
+      case 'u': {
+        unsigned int unicode;
+        if (!decodeUnicodeCodePoint(token, current, end, unicode))
+          return false;
+        decoded += codePointToUTF8(unicode);
+      } break;
+      default:
+        return addError("Bad escape sequence in string", token, current);
+      }
+    } else {
+      decoded += c;
     }
-    errors_.resize(errorCount);
+  }
+  return true;
+}
+
+bool OurReader::decodeUnicodeCodePoint(Token& token, Location& current,
+                                       Location end, unsigned int& unicode) {
+
+  if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
     return false;
+  if (unicode >= 0xD800 && unicode <= 0xDBFF) {
+    // surrogate pairs
+    if (end - current < 6)
+      return addError(
+          "additional six characters expected to parse unicode surrogate pair.",
+          token, current);
+    if (*(current++) == '\\' && *(current++) == 'u') {
+      unsigned int surrogatePair;
+      if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair)) {
+        unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
+      } else
+        return false;
+    } else
+      return addError("expecting another \\u token to begin the second half of "
+                      "a unicode surrogate pair",
+                      token, current);
+  }
+  return true;
 }
 
-bool Reader::addErrorAndRecover(const std::string& message, Token& token, TokenType skipUntilToken)
-{
-    addError(message, token);
-    return recoverFromError(skipUntilToken);
+bool OurReader::decodeUnicodeEscapeSequence(Token& token, Location& current,
+                                            Location end,
+                                            unsigned int& ret_unicode) {
+  if (end - current < 4)
+    return addError(
+        "Bad unicode escape sequence in string: four digits expected.", token,
+        current);
+  int unicode = 0;
+  for (int index = 0; index < 4; ++index) {
+    Char c = *current++;
+    unicode *= 16;
+    if (c >= '0' && c <= '9')
+      unicode += c - '0';
+    else if (c >= 'a' && c <= 'f')
+      unicode += c - 'a' + 10;
+    else if (c >= 'A' && c <= 'F')
+      unicode += c - 'A' + 10;
+    else
+      return addError(
+          "Bad unicode escape sequence in string: hexadecimal digit expected.",
+          token, current);
+  }
+  ret_unicode = static_cast<unsigned int>(unicode);
+  return true;
 }
 
-Value& Reader::currentValue()
-{
-    return *(nodes_.top());
+bool OurReader::addError(const String& message, Token& token, Location extra) {
+  ErrorInfo info;
+  info.token_ = token;
+  info.message_ = message;
+  info.extra_ = extra;
+  errors_.push_back(info);
+  return false;
 }
 
-Reader::Char Reader::getNextChar()
-{
-    if (current_ == end_)
-        return 0;
-    return *current_++;
+bool OurReader::recoverFromError(TokenType skipUntilToken) {
+  size_t errorCount = errors_.size();
+  Token skip;
+  for (;;) {
+    if (!readToken(skip))
+      errors_.resize(errorCount); // discard errors caused by recovery
+    if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
+      break;
+  }
+  errors_.resize(errorCount);
+  return false;
 }
 
-void Reader::getLocationLineAndColumn(Location location, int& line, int& column) const
-{
-    Location current = begin_;
-    Location lastLineStart = current;
-    line = 0;
-    while (current < location && current != end_)
-    {
-        Char c = *current++;
-        if (c == '\r')
-        {
-            if (*current == '\n')
-                ++current;
-            lastLineStart = current;
-            ++line;
-        }
-        else if (c == '\n')
-        {
-            lastLineStart = current;
-            ++line;
-        }
+bool OurReader::addErrorAndRecover(const String& message, Token& token,
+                                   TokenType skipUntilToken) {
+  addError(message, token);
+  return recoverFromError(skipUntilToken);
+}
+
+Value& OurReader::currentValue() { return *(nodes_.top()); }
+
+OurReader::Char OurReader::getNextChar() {
+  if (current_ == end_)
+    return 0;
+  return *current_++;
+}
+
+void OurReader::getLocationLineAndColumn(Location location, int& line,
+                                         int& column) const {
+  Location current = begin_;
+  Location lastLineStart = current;
+  line = 0;
+  while (current < location && current != end_) {
+    Char c = *current++;
+    if (c == '\r') {
+      if (*current == '\n')
+        ++current;
+      lastLineStart = current;
+      ++line;
+    } else if (c == '\n') {
+      lastLineStart = current;
+      ++line;
     }
-    // column & line start at 1
-    column = int(location - lastLineStart) + 1;
-    ++line;
+  }
+  // column & line start at 1
+  column = int(location - lastLineStart) + 1;
+  ++line;
 }
 
-std::string Reader::getLocationLineAndColumn(Location location) const
-{
-    int line, column;
-    getLocationLineAndColumn(location, line, column);
-    char buffer[18 + 16 + 16 + 1];
-    sprintf(buffer, "Line %d, Column %d", line, column);
-    return buffer;
+String OurReader::getLocationLineAndColumn(Location location) const {
+  int line, column;
+  getLocationLineAndColumn(location, line, column);
+  char buffer[18 + 16 + 16 + 1];
+  jsoncpp_snprintf(buffer, sizeof(buffer), "Line %d, Column %d", line, column);
+  return buffer;
 }
 
-std::string Reader::getFormatedErrorMessages() const
-{
-    std::string formattedMessage;
-    for (Errors::const_iterator itError = errors_.begin(); itError != errors_.end(); ++itError)
-    {
-        const ErrorInfo& error = *itError;
-        formattedMessage += "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
-        formattedMessage += "  " + error.message_ + "\n";
-        if (error.extra_)
-            formattedMessage += "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
-    }
-    return formattedMessage;
-}
-
-std::istream& operator>>(std::istream& sin, Value& root)
-{
-    Json::Reader reader;
-    bool ok = reader.parse(sin, root, true);
-    // JSON_ASSERT( ok );
-    if (!ok)
-        throw std::runtime_error(reader.getFormatedErrorMessages());
-    return sin;
+String OurReader::getFormattedErrorMessages() const {
+  String formattedMessage;
+  for (const auto& error : errors_) {
+    formattedMessage +=
+        "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
+    formattedMessage += "  " + error.message_ + "\n";
+    if (error.extra_)
+      formattedMessage +=
+          "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
+  }
+  return formattedMessage;
+}
+
+std::vector<OurReader::StructuredError> OurReader::getStructuredErrors() const {
+  std::vector<OurReader::StructuredError> allErrors;
+  for (const auto& error : errors_) {
+    OurReader::StructuredError structured;
+    structured.offset_start = error.token_.start_ - begin_;
+    structured.offset_limit = error.token_.end_ - begin_;
+    structured.message = error.message_;
+    allErrors.push_back(structured);
+  }
+  return allErrors;
+}
+
+class OurCharReader : public CharReader {
+  bool const collectComments_;
+  OurReader reader_;
+
+public:
+  OurCharReader(bool collectComments, OurFeatures const& features)
+      : collectComments_(collectComments), reader_(features) {}
+  bool parse(char const* beginDoc, char const* endDoc, Value* root,
+             String* errs) override {
+    bool ok = reader_.parse(beginDoc, endDoc, *root, collectComments_);
+    if (errs) {
+      *errs = reader_.getFormattedErrorMessages();
+    }
+    return ok;
+  }
+};
+
+CharReaderBuilder::CharReaderBuilder() { setDefaults(&settings_); }
+CharReaderBuilder::~CharReaderBuilder() = default;
+CharReader* CharReaderBuilder::newCharReader() const {
+  bool collectComments = settings_["collectComments"].asBool();
+  OurFeatures features = OurFeatures::all();
+  features.allowComments_ = settings_["allowComments"].asBool();
+  features.allowTrailingCommas_ = settings_["allowTrailingCommas"].asBool();
+  features.strictRoot_ = settings_["strictRoot"].asBool();
+  features.allowDroppedNullPlaceholders_ =
+      settings_["allowDroppedNullPlaceholders"].asBool();
+  features.allowNumericKeys_ = settings_["allowNumericKeys"].asBool();
+  features.allowSingleQuotes_ = settings_["allowSingleQuotes"].asBool();
+
+  // Stack limit is always a size_t, so we get this as an unsigned int
+  // regardless of it we have 64-bit integer support enabled.
+  features.stackLimit_ = static_cast<size_t>(settings_["stackLimit"].asUInt());
+  features.failIfExtra_ = settings_["failIfExtra"].asBool();
+  features.rejectDupKeys_ = settings_["rejectDupKeys"].asBool();
+  features.allowSpecialFloats_ = settings_["allowSpecialFloats"].asBool();
+  features.skipBom_ = settings_["skipBom"].asBool();
+  return new OurCharReader(collectComments, features);
+}
+
+bool CharReaderBuilder::validate(Json::Value* invalid) const {
+  static const auto& valid_keys = *new std::set<String>{
+      "collectComments",
+      "allowComments",
+      "allowTrailingCommas",
+      "strictRoot",
+      "allowDroppedNullPlaceholders",
+      "allowNumericKeys",
+      "allowSingleQuotes",
+      "stackLimit",
+      "failIfExtra",
+      "rejectDupKeys",
+      "allowSpecialFloats",
+      "skipBom",
+  };
+  for (auto si = settings_.begin(); si != settings_.end(); ++si) {
+    auto key = si.name();
+    if (valid_keys.count(key))
+      continue;
+    if (invalid)
+      (*invalid)[key] = *si;
+    else
+      return false;
+  }
+  return invalid ? invalid->empty() : true;
+}
+
+Value& CharReaderBuilder::operator[](const String& key) {
+  return settings_[key];
+}
+// static
+void CharReaderBuilder::strictMode(Json::Value* settings) {
+  //! [CharReaderBuilderStrictMode]
+  (*settings)["allowComments"] = false;
+  (*settings)["allowTrailingCommas"] = false;
+  (*settings)["strictRoot"] = true;
+  (*settings)["allowDroppedNullPlaceholders"] = false;
+  (*settings)["allowNumericKeys"] = false;
+  (*settings)["allowSingleQuotes"] = false;
+  (*settings)["stackLimit"] = 1000;
+  (*settings)["failIfExtra"] = true;
+  (*settings)["rejectDupKeys"] = true;
+  (*settings)["allowSpecialFloats"] = false;
+  (*settings)["skipBom"] = true;
+  //! [CharReaderBuilderStrictMode]
+}
+// static
+void CharReaderBuilder::setDefaults(Json::Value* settings) {
+  //! [CharReaderBuilderDefaults]
+  (*settings)["collectComments"] = true;
+  (*settings)["allowComments"] = true;
+  (*settings)["allowTrailingCommas"] = true;
+  (*settings)["strictRoot"] = false;
+  (*settings)["allowDroppedNullPlaceholders"] = false;
+  (*settings)["allowNumericKeys"] = false;
+  (*settings)["allowSingleQuotes"] = false;
+  (*settings)["stackLimit"] = 1000;
+  (*settings)["failIfExtra"] = false;
+  (*settings)["rejectDupKeys"] = false;
+  (*settings)["allowSpecialFloats"] = false;
+  (*settings)["skipBom"] = true;
+  //! [CharReaderBuilderDefaults]
+}
+
+//////////////////////////////////
+// global functions
+
+bool parseFromStream(CharReader::Factory const& fact, IStream& sin, Value* root,
+                     String* errs) {
+  OStringStream ssin;
+  ssin << sin.rdbuf();
+  String doc = ssin.str();
+  char const* begin = doc.data();
+  char const* end = begin + doc.size();
+  // Note that we do not actually need a null-terminator.
+  CharReaderPtr const reader(fact.newCharReader());
+  return reader->parse(begin, end, root, errs);
+}
+
+IStream& operator>>(IStream& sin, Value& root) {
+  CharReaderBuilder b;
+  String errs;
+  bool ok = parseFromStream(b, sin, &root, &errs);
+  if (!ok) {
+    throwRuntimeError(errs);
+  }
+  return sin;
 }
 
 } // namespace Json
diff --git a/ext_libs/json/json_tool.h b/ext_libs/json/json_tool.h
new file mode 100644
index 00000000..b952c191
--- /dev/null
+++ b/ext_libs/json/json_tool.h
@@ -0,0 +1,138 @@
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
+// Distributed under MIT license, or public domain if desired and
+// recognized in your jurisdiction.
+// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
+
+#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
+#define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
+
+#if !defined(JSON_IS_AMALGAMATION)
+#include <json/config.h>
+#endif
+
+// Also support old flag NO_LOCALE_SUPPORT
+#ifdef NO_LOCALE_SUPPORT
+#define JSONCPP_NO_LOCALE_SUPPORT
+#endif
+
+#ifndef JSONCPP_NO_LOCALE_SUPPORT
+#include <clocale>
+#endif
+
+/* This header provides common string manipulation support, such as UTF-8,
+ * portable conversion from/to string...
+ *
+ * It is an internal header that must not be exposed.
+ */
+
+namespace Json {
+static inline char getDecimalPoint() {
+#ifdef JSONCPP_NO_LOCALE_SUPPORT
+  return '\0';
+#else
+  struct lconv* lc = localeconv();
+  return lc ? *(lc->decimal_point) : '\0';
+#endif
+}
+
+/// Converts a unicode code-point to UTF-8.
+static inline String codePointToUTF8(unsigned int cp) {
+  String result;
+
+  // based on description from http://en.wikipedia.org/wiki/UTF-8
+
+  if (cp <= 0x7f) {
+    result.resize(1);
+    result[0] = static_cast<char>(cp);
+  } else if (cp <= 0x7FF) {
+    result.resize(2);
+    result[1] = static_cast<char>(0x80 | (0x3f & cp));
+    result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
+  } else if (cp <= 0xFFFF) {
+    result.resize(3);
+    result[2] = static_cast<char>(0x80 | (0x3f & cp));
+    result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
+    result[0] = static_cast<char>(0xE0 | (0xf & (cp >> 12)));
+  } else if (cp <= 0x10FFFF) {
+    result.resize(4);
+    result[3] = static_cast<char>(0x80 | (0x3f & cp));
+    result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
+    result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
+    result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
+  }
+
+  return result;
+}
+
+enum {
+  /// Constant that specify the size of the buffer that must be passed to
+  /// uintToString.
+  uintToStringBufferSize = 3 * sizeof(LargestUInt) + 1
+};
+
+// Defines a char buffer for use with uintToString().
+using UIntToStringBuffer = char[uintToStringBufferSize];
+
+/** Converts an unsigned integer to string.
+ * @param value Unsigned integer to convert to string
+ * @param current Input/Output string buffer.
+ *        Must have at least uintToStringBufferSize chars free.
+ */
+static inline void uintToString(LargestUInt value, char*& current) {
+  *--current = 0;
+  do {
+    *--current = static_cast<char>(value % 10U + static_cast<unsigned>('0'));
+    value /= 10;
+  } while (value != 0);
+}
+
+/** Change ',' to '.' everywhere in buffer.
+ *
+ * We had a sophisticated way, but it did not work in WinCE.
+ * @see https://github.com/open-source-parsers/jsoncpp/pull/9
+ */
+template <typename Iter> Iter fixNumericLocale(Iter begin, Iter end) {
+  for (; begin != end; ++begin) {
+    if (*begin == ',') {
+      *begin = '.';
+    }
+  }
+  return begin;
+}
+
+template <typename Iter> void fixNumericLocaleInput(Iter begin, Iter end) {
+  char decimalPoint = getDecimalPoint();
+  if (decimalPoint == '\0' || decimalPoint == '.') {
+    return;
+  }
+  for (; begin != end; ++begin) {
+    if (*begin == '.') {
+      *begin = decimalPoint;
+    }
+  }
+}
+
+/**
+ * Return iterator that would be the new end of the range [begin,end), if we
+ * were to delete zeros in the end of string, but not the last zero before '.'.
+ */
+template <typename Iter>
+Iter fixZerosInTheEnd(Iter begin, Iter end, unsigned int precision) {
+  for (; begin != end; --end) {
+    if (*(end - 1) != '0') {
+      return end;
+    }
+    // Don't delete the last zero before the decimal point.
+    if (begin != (end - 1) && begin != (end - 2) && *(end - 2) == '.') {
+      if (precision) {
+        return end;
+      }
+      return end - 2;
+    }
+  }
+  return end;
+}
+
+} // namespace Json
+
+#endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED
diff --git a/ext_libs/json/json_value.cpp b/ext_libs/json/json_value.cpp
index 6f03ee23..aa2b744c 100644
--- a/ext_libs/json/json_value.cpp
+++ b/ext_libs/json/json_value.cpp
@@ -1,110 +1,189 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
-#include <iostream>
+#if !defined(JSON_IS_AMALGAMATION)
+#include <json/assertions.h>
 #include <json/value.h>
 #include <json/writer.h>
-#include <utility>
-#include <stdexcept>
-#include <cstring>
+#endif // if !defined(JSON_IS_AMALGAMATION)
+#include <algorithm>
 #include <cassert>
-#ifdef JSON_USE_CPPTL
-#include <cpptl/conststring.h>
+#include <cmath>
+#include <cstddef>
+#include <cstring>
+#include <iostream>
+#include <sstream>
+#include <utility>
+
+// Provide implementation equivalent of std::snprintf for older _MSC compilers
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#include <stdarg.h>
+static int msvc_pre1900_c99_vsnprintf(char* outBuf, size_t size,
+                                      const char* format, va_list ap) {
+  int count = -1;
+  if (size != 0)
+    count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
+  if (count == -1)
+    count = _vscprintf(format, ap);
+  return count;
+}
+
+int JSON_API msvc_pre1900_c99_snprintf(char* outBuf, size_t size,
+                                       const char* format, ...) {
+  va_list ap;
+  va_start(ap, format);
+  const int count = msvc_pre1900_c99_vsnprintf(outBuf, size, format, ap);
+  va_end(ap);
+  return count;
+}
+#endif
+
+// Disable warning C4702 : unreachable code
+#if defined(_MSC_VER)
+#pragma warning(disable : 4702)
 #endif
-#include <cstddef> // size_t
-#ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
-#include "json_batchallocator.h"
-#endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
 
 #define JSON_ASSERT_UNREACHABLE assert(false)
-#define JSON_ASSERT(condition) assert(condition); // @todo <= change this into an exception throw
-#define JSON_ASSERT_MESSAGE(condition, message) \
-    if (!(condition))                           \
-        throw std::runtime_error(message);
-
-namespace Json
-{
-const Value Value::null;
-const Int Value::minInt = Int(~(UInt(-1) / 2));
-const Int Value::maxInt = Int(UInt(-1) / 2);
-const UInt Value::maxUInt = UInt(-1);
-
-// A "safe" implementation of strdup. Allow null pointer to be passed.
-// Also avoid warning on msvc80.
-//
-// inline char *safeStringDup( const char *czstring )
-//{
-//   if ( czstring )
-//   {
-//      const size_t length = (unsigned int)( strlen(czstring) + 1 );
-//      char *newString = static_cast<char *>( malloc( length ) );
-//      memcpy( newString, czstring, length );
-//      return newString;
-//   }
-//   return 0;
-//}
-//
-// inline char *safeStringDup( const std::string &str )
-//{
-//   if ( !str.empty() )
-//   {
-//      const size_t length = str.length();
-//      char *newString = static_cast<char *>( malloc( length + 1 ) );
-//      memcpy( newString, str.c_str(), length );
-//      newString[length] = 0;
-//      return newString;
-//   }
-//   return 0;
-//}
-
-ValueAllocator::~ValueAllocator() {}
-
-class DefaultValueAllocator : public ValueAllocator
-{
-public:
-    virtual ~DefaultValueAllocator() {}
-
-    virtual char* makeMemberName(const char* memberName) { return duplicateStringValue(memberName); }
-
-    virtual void releaseMemberName(char* memberName) { releaseStringValue(memberName); }
-
-    virtual char* duplicateStringValue(const char* value, unsigned int length = unknown)
-    {
-        //@todo invesgate this old optimization
-        // if ( !value  ||  value[0] == 0 )
-        //   return 0;
-
-        if (length == unknown)
-            length = (unsigned int)strlen(value);
-        char* newString = static_cast<char*>(malloc(length + 1));
-        memcpy(newString, value, length);
-        newString[length] = 0;
-        return newString;
-    }
 
-    virtual void releaseStringValue(char* value)
-    {
-        if (value)
-            free(value);
-    }
-};
+namespace Json {
+template <typename T>
+static std::unique_ptr<T> cloneUnique(const std::unique_ptr<T>& p) {
+  std::unique_ptr<T> r;
+  if (p) {
+    r = std::unique_ptr<T>(new T(*p));
+  }
+  return r;
+}
+
+// This is a walkaround to avoid the static initialization of Value::null.
+// kNull must be word-aligned to avoid crashing on ARM.  We use an alignment of
+// 8 (instead of 4) as a bit of future-proofing.
+#if defined(__ARMEL__)
+#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
+#else
+#define ALIGNAS(byte_alignment)
+#endif
 
-static ValueAllocator*& valueAllocator()
-{
-    static DefaultValueAllocator defaultAllocator;
-    static ValueAllocator* valueAllocator = &defaultAllocator;
-    return valueAllocator;
+// static
+Value const& Value::nullSingleton() {
+  static Value const nullStatic;
+  return nullStatic;
 }
 
-static struct DummyValueAllocatorInitializer
-{
-    DummyValueAllocatorInitializer()
-    {
-        valueAllocator(); // ensure valueAllocator() statics are initialized before main().
-    }
-} dummyValueAllocatorInitializer;
+#if JSON_USE_NULLREF
+// for backwards compatibility, we'll leave these global references around, but
+// DO NOT use them in JSONCPP library code any more!
+// static
+Value const& Value::null = Value::nullSingleton();
+
+// static
+Value const& Value::nullRef = Value::nullSingleton();
+#endif
+
+#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+template <typename T, typename U>
+static inline bool InRange(double d, T min, U max) {
+  // The casts can lose precision, but we are looking only for
+  // an approximate range. Might fail on edge cases though. ~cdunn
+  return d >= static_cast<double>(min) && d <= static_cast<double>(max);
+}
+#else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+static inline double integerToDouble(Json::UInt64 value) {
+  return static_cast<double>(Int64(value / 2)) * 2.0 +
+         static_cast<double>(Int64(value & 1));
+}
+
+template <typename T> static inline double integerToDouble(T value) {
+  return static_cast<double>(value);
+}
+
+template <typename T, typename U>
+static inline bool InRange(double d, T min, U max) {
+  return d >= integerToDouble(min) && d <= integerToDouble(max);
+}
+#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+
+/** Duplicates the specified string value.
+ * @param value Pointer to the string to duplicate. Must be zero-terminated if
+ *              length is "unknown".
+ * @param length Length of the value. if equals to unknown, then it will be
+ *               computed using strlen(value).
+ * @return Pointer on the duplicate instance of string.
+ */
+static inline char* duplicateStringValue(const char* value, size_t length) {
+  // Avoid an integer overflow in the call to malloc below by limiting length
+  // to a sane value.
+  if (length >= static_cast<size_t>(Value::maxInt))
+    length = Value::maxInt - 1;
+
+  auto newString = static_cast<char*>(malloc(length + 1));
+  if (newString == nullptr) {
+    throwRuntimeError("in Json::Value::duplicateStringValue(): "
+                      "Failed to allocate string value buffer");
+  }
+  memcpy(newString, value, length);
+  newString[length] = 0;
+  return newString;
+}
+
+/* Record the length as a prefix.
+ */
+static inline char* duplicateAndPrefixStringValue(const char* value,
+                                                  unsigned int length) {
+  // Avoid an integer overflow in the call to malloc below by limiting length
+  // to a sane value.
+  JSON_ASSERT_MESSAGE(length <= static_cast<unsigned>(Value::maxInt) -
+                                    sizeof(unsigned) - 1U,
+                      "in Json::Value::duplicateAndPrefixStringValue(): "
+                      "length too big for prefixing");
+  size_t actualLength = sizeof(length) + length + 1;
+  auto newString = static_cast<char*>(malloc(actualLength));
+  if (newString == nullptr) {
+    throwRuntimeError("in Json::Value::duplicateAndPrefixStringValue(): "
+                      "Failed to allocate string value buffer");
+  }
+  *reinterpret_cast<unsigned*>(newString) = length;
+  memcpy(newString + sizeof(unsigned), value, length);
+  newString[actualLength - 1U] =
+      0; // to avoid buffer over-run accidents by users later
+  return newString;
+}
+inline static void decodePrefixedString(bool isPrefixed, char const* prefixed,
+                                        unsigned* length, char const** value) {
+  if (!isPrefixed) {
+    *length = static_cast<unsigned>(strlen(prefixed));
+    *value = prefixed;
+  } else {
+    *length = *reinterpret_cast<unsigned const*>(prefixed);
+    *value = prefixed + sizeof(unsigned);
+  }
+}
+/** Free the string duplicated by
+ * duplicateStringValue()/duplicateAndPrefixStringValue().
+ */
+#if JSONCPP_USING_SECURE_MEMORY
+static inline void releasePrefixedStringValue(char* value) {
+  unsigned length = 0;
+  char const* valueDecoded;
+  decodePrefixedString(true, value, &length, &valueDecoded);
+  size_t const size = sizeof(unsigned) + length + 1U;
+  memset(value, 0, size);
+  free(value);
+}
+static inline void releaseStringValue(char* value, unsigned length) {
+  // length==0 => we allocated the strings memory
+  size_t size = (length == 0) ? strlen(value) : length;
+  memset(value, 0, size);
+  free(value);
+}
+#else  // !JSONCPP_USING_SECURE_MEMORY
+static inline void releasePrefixedStringValue(char* value) { free(value); }
+static inline void releaseStringValue(char* value, unsigned) { free(value); }
+#endif // JSONCPP_USING_SECURE_MEMORY
+
+} // namespace Json
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -113,38 +192,35 @@ static struct DummyValueAllocatorInitializer
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-#include "json_internalarray.inl"
-#include "json_internalmap.inl"
-#endif // JSON_VALUE_USE_INTERNAL_MAP
+#if !defined(JSON_IS_AMALGAMATION)
 
 #include "json_valueiterator.inl"
+#endif // if !defined(JSON_IS_AMALGAMATION)
 
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::CommentInfo
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-Value::CommentInfo::CommentInfo() : comment_(0) {}
+namespace Json {
 
-Value::CommentInfo::~CommentInfo()
-{
-    if (comment_)
-        valueAllocator()->releaseStringValue(comment_);
+#if JSON_USE_EXCEPTION
+Exception::Exception(String msg) : msg_(std::move(msg)) {}
+Exception::~Exception() noexcept = default;
+char const* Exception::what() const noexcept { return msg_.c_str(); }
+RuntimeError::RuntimeError(String const& msg) : Exception(msg) {}
+LogicError::LogicError(String const& msg) : Exception(msg) {}
+JSONCPP_NORETURN void throwRuntimeError(String const& msg) {
+  throw RuntimeError(msg);
 }
-
-void Value::CommentInfo::setComment(const char* text)
-{
-    if (comment_)
-        valueAllocator()->releaseStringValue(comment_);
-    JSON_ASSERT(text);
-    JSON_ASSERT_MESSAGE(text[0] == '\0' || text[0] == '/', "Comments must start with /");
-    // It seems that /**/ style comments are acceptable as well.
-    comment_ = valueAllocator()->duplicateStringValue(text);
+JSONCPP_NORETURN void throwLogicError(String const& msg) {
+  throw LogicError(msg);
+}
+#else // !JSON_USE_EXCEPTION
+JSONCPP_NORETURN void throwRuntimeError(String const& msg) {
+  std::cerr << msg << std::endl;
+  abort();
+}
+JSONCPP_NORETURN void throwLogicError(String const& msg) {
+  std::cerr << msg << std::endl;
+  abort();
 }
+#endif
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -153,75 +229,109 @@ void Value::CommentInfo::setComment(const char* text)
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
 
-// Notes: index_ indicates if the string was allocated when
+// Notes: policy_ indicates if the string was allocated when
 // a string is stored.
 
-Value::CZString::CZString(int index) : cstr_(0), index_(index) {}
+Value::CZString::CZString(ArrayIndex index) : cstr_(nullptr), index_(index) {}
 
-Value::CZString::CZString(const char* cstr, DuplicationPolicy allocate) :
-    cstr_(allocate == duplicate ? valueAllocator()->makeMemberName(cstr) : cstr), index_(allocate)
-{
+Value::CZString::CZString(char const* str, unsigned length,
+                          DuplicationPolicy allocate)
+    : cstr_(str) {
+  // allocate != duplicate
+  storage_.policy_ = allocate & 0x3;
+  storage_.length_ = length & 0x3FFFFFFF;
 }
 
-Value::CZString::CZString(const CZString& other) :
-    cstr_(other.index_ != noDuplication && other.cstr_ != 0 ? valueAllocator()->makeMemberName(other.cstr_) :
-                                                              other.cstr_),
-    index_(other.cstr_ ? (other.index_ == noDuplication ? noDuplication : duplicate) : other.index_)
-{
+Value::CZString::CZString(const CZString& other) {
+  cstr_ = (other.storage_.policy_ != noDuplication && other.cstr_ != nullptr
+               ? duplicateStringValue(other.cstr_, other.storage_.length_)
+               : other.cstr_);
+  storage_.policy_ =
+      static_cast<unsigned>(
+          other.cstr_
+              ? (static_cast<DuplicationPolicy>(other.storage_.policy_) ==
+                         noDuplication
+                     ? noDuplication
+                     : duplicate)
+              : static_cast<DuplicationPolicy>(other.storage_.policy_)) &
+      3U;
+  storage_.length_ = other.storage_.length_;
 }
 
-Value::CZString::~CZString()
-{
-    if (cstr_ && index_ == duplicate)
-        valueAllocator()->releaseMemberName(const_cast<char*>(cstr_));
+Value::CZString::CZString(CZString&& other) noexcept
+    : cstr_(other.cstr_), index_(other.index_) {
+  other.cstr_ = nullptr;
 }
 
-void Value::CZString::swap(CZString& other)
-{
-    std::swap(cstr_, other.cstr_);
-    std::swap(index_, other.index_);
+Value::CZString::~CZString() {
+  if (cstr_ && storage_.policy_ == duplicate) {
+    releaseStringValue(const_cast<char*>(cstr_),
+                       storage_.length_ + 1U); // +1 for null terminating
+                                               // character for sake of
+                                               // completeness but not actually
+                                               // necessary
+  }
 }
 
-Value::CZString& Value::CZString::operator=(const CZString& other)
-{
-    CZString temp(other);
-    swap(temp);
-    return *this;
+void Value::CZString::swap(CZString& other) {
+  std::swap(cstr_, other.cstr_);
+  std::swap(index_, other.index_);
 }
 
-bool Value::CZString::operator<(const CZString& other) const
-{
-    if (cstr_)
-        return strcmp(cstr_, other.cstr_) < 0;
-    return index_ < other.index_;
+Value::CZString& Value::CZString::operator=(const CZString& other) {
+  cstr_ = other.cstr_;
+  index_ = other.index_;
+  return *this;
 }
 
-bool Value::CZString::operator==(const CZString& other) const
-{
-    if (cstr_)
-        return strcmp(cstr_, other.cstr_) == 0;
-    return index_ == other.index_;
+Value::CZString& Value::CZString::operator=(CZString&& other) noexcept {
+  cstr_ = other.cstr_;
+  index_ = other.index_;
+  other.cstr_ = nullptr;
+  return *this;
 }
 
-int Value::CZString::index() const
-{
-    return index_;
+bool Value::CZString::operator<(const CZString& other) const {
+  if (!cstr_)
+    return index_ < other.index_;
+  // return strcmp(cstr_, other.cstr_) < 0;
+  // Assume both are strings.
+  unsigned this_len = this->storage_.length_;
+  unsigned other_len = other.storage_.length_;
+  unsigned min_len = std::min<unsigned>(this_len, other_len);
+  JSON_ASSERT(this->cstr_ && other.cstr_);
+  int comp = memcmp(this->cstr_, other.cstr_, min_len);
+  if (comp < 0)
+    return true;
+  if (comp > 0)
+    return false;
+  return (this_len < other_len);
+}
+
+bool Value::CZString::operator==(const CZString& other) const {
+  if (!cstr_)
+    return index_ == other.index_;
+  // return strcmp(cstr_, other.cstr_) == 0;
+  // Assume both are strings.
+  unsigned this_len = this->storage_.length_;
+  unsigned other_len = other.storage_.length_;
+  if (this_len != other_len)
+    return false;
+  JSON_ASSERT(this->cstr_ && other.cstr_);
+  int comp = memcmp(this->cstr_, other.cstr_, this_len);
+  return comp == 0;
 }
 
-const char* Value::CZString::c_str() const
-{
-    return cstr_;
-}
+ArrayIndex Value::CZString::index() const { return index_; }
 
-bool Value::CZString::isStaticString() const
-{
-    return index_ == noDuplication;
+// const char* Value::CZString::c_str() const { return cstr_; }
+const char* Value::CZString::data() const { return cstr_; }
+unsigned Value::CZString::length() const { return storage_.length_; }
+bool Value::CZString::isStaticString() const {
+  return storage_.policy_ == noDuplication;
 }
 
-#endif // ifndef JSON_VALUE_USE_INTERNAL_MAP
-
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -234,1292 +344,1291 @@ bool Value::CZString::isStaticString() const
  * memset( this, 0, sizeof(Value) )
  * This optimization is used in ValueInternalMap fast allocator.
  */
-Value::Value(ValueType type) :
-    type_(type),
-    allocated_(0),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    switch (type)
-    {
-        case nullValue:
-            break;
-        case intValue:
-        case uintValue:
-            value_.int_ = 0;
-            break;
-        case realValue:
-            value_.real_ = 0.0;
-            break;
-        case stringValue:
-            value_.string_ = 0;
-            break;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-        case objectValue:
-            value_.map_ = new ObjectValues();
-            break;
-#else
-        case arrayValue:
-            value_.array_ = arrayAllocator()->newArray();
-            break;
-        case objectValue:
-            value_.map_ = mapAllocator()->newMap();
-            break;
-#endif
-        case booleanValue:
-            value_.bool_ = false;
-            break;
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
+Value::Value(ValueType type) {
+  static char const emptyString[] = "";
+  initBasic(type);
+  switch (type) {
+  case nullValue:
+    break;
+  case intValue:
+  case uintValue:
+    value_.int_ = 0;
+    break;
+  case realValue:
+    value_.real_ = 0.0;
+    break;
+  case stringValue:
+    // allocated_ == false, so this is safe.
+    value_.string_ = const_cast<char*>(static_cast<char const*>(emptyString));
+    break;
+  case arrayValue:
+  case objectValue:
+    value_.map_ = new ObjectValues();
+    break;
+  case booleanValue:
+    value_.bool_ = false;
+    break;
+  default:
+    JSON_ASSERT_UNREACHABLE;
+  }
 }
 
-Value::Value(Int value) :
-    type_(intValue),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.int_ = value;
+Value::Value(Int value) {
+  initBasic(intValue);
+  value_.int_ = value;
 }
 
-Value::Value(UInt value) :
-    type_(uintValue),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.uint_ = value;
+Value::Value(UInt value) {
+  initBasic(uintValue);
+  value_.uint_ = value;
 }
-
-Value::Value(double value) :
-    type_(realValue),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.real_ = value;
+#if defined(JSON_HAS_INT64)
+Value::Value(Int64 value) {
+  initBasic(intValue);
+  value_.int_ = value;
 }
-
-Value::Value(const char* value) :
-    type_(stringValue),
-    allocated_(true),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.string_ = valueAllocator()->duplicateStringValue(value);
+Value::Value(UInt64 value) {
+  initBasic(uintValue);
+  value_.uint_ = value;
 }
+#endif // defined(JSON_HAS_INT64)
 
-Value::Value(const char* beginValue, const char* endValue) :
-    type_(stringValue),
-    allocated_(true),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.string_ = valueAllocator()->duplicateStringValue(beginValue, UInt(endValue - beginValue));
+Value::Value(double value) {
+  initBasic(realValue);
+  value_.real_ = value;
 }
 
-Value::Value(const std::string& value) :
-    type_(stringValue),
-    allocated_(true),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.string_ = valueAllocator()->duplicateStringValue(value.c_str(), (unsigned int)value.length());
+Value::Value(const char* value) {
+  initBasic(stringValue, true);
+  JSON_ASSERT_MESSAGE(value != nullptr,
+                      "Null Value Passed to Value Constructor");
+  value_.string_ = duplicateAndPrefixStringValue(
+      value, static_cast<unsigned>(strlen(value)));
 }
 
-Value::Value(const StaticString& value) :
-    type_(stringValue),
-    allocated_(false),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.string_ = const_cast<char*>(value.c_str());
-}
-
-#ifdef JSON_USE_CPPTL
-Value::Value(const CppTL::ConstString& value) :
-    type_(stringValue),
-    allocated_(true),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.string_ = valueAllocator()->duplicateStringValue(value, value.length());
+Value::Value(const char* begin, const char* end) {
+  initBasic(stringValue, true);
+  value_.string_ =
+      duplicateAndPrefixStringValue(begin, static_cast<unsigned>(end - begin));
 }
-#endif
 
-Value::Value(bool value) :
-    type_(booleanValue),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    value_.bool_ = value;
+Value::Value(const String& value) {
+  initBasic(stringValue, true);
+  value_.string_ = duplicateAndPrefixStringValue(
+      value.data(), static_cast<unsigned>(value.length()));
 }
 
-Value::Value(const Value& other) :
-    type_(other.type_),
-    comments_(0)
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-    ,
-    itemIsUsed_(0)
-#endif
-{
-    switch (type_)
-    {
-        case nullValue:
-        case intValue:
-        case uintValue:
-        case realValue:
-        case booleanValue:
-            value_ = other.value_;
-            break;
-        case stringValue:
-            if (other.value_.string_)
-            {
-                value_.string_ = valueAllocator()->duplicateStringValue(other.value_.string_);
-                allocated_ = true;
-            }
-            else
-                value_.string_ = 0;
-            break;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-        case objectValue:
-            value_.map_ = new ObjectValues(*other.value_.map_);
-            break;
-#else
-        case arrayValue:
-            value_.array_ = arrayAllocator()->newArrayCopy(*other.value_.array_);
-            break;
-        case objectValue:
-            value_.map_ = mapAllocator()->newMapCopy(*other.value_.map_);
-            break;
-#endif
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    if (other.comments_)
-    {
-        comments_ = new CommentInfo[numberOfCommentPlacement];
-        for (int comment = 0; comment < numberOfCommentPlacement; ++comment)
-        {
-            const CommentInfo& otherComment = other.comments_[comment];
-            if (otherComment.comment_)
-                comments_[comment].setComment(otherComment.comment_);
-        }
-    }
+Value::Value(const StaticString& value) {
+  initBasic(stringValue);
+  value_.string_ = const_cast<char*>(value.c_str());
 }
 
-Value::~Value()
-{
-    switch (type_)
-    {
-        case nullValue:
-        case intValue:
-        case uintValue:
-        case realValue:
-        case booleanValue:
-            break;
-        case stringValue:
-            if (allocated_)
-                valueAllocator()->releaseStringValue(value_.string_);
-            break;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-        case objectValue:
-            delete value_.map_;
-            break;
-#else
-        case arrayValue:
-            arrayAllocator()->destructArray(value_.array_);
-            break;
-        case objectValue:
-            mapAllocator()->destructMap(value_.map_);
-            break;
-#endif
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-
-    if (comments_)
-        delete[] comments_;
-}
-
-Value& Value::operator=(const Value& other)
-{
-    Value temp(other);
-    swap(temp);
-    return *this;
-}
-
-void Value::swap(Value& other)
-{
-    ValueType temp = type_;
-    type_ = other.type_;
-    other.type_ = temp;
-    std::swap(value_, other.value_);
-    int temp2 = allocated_;
-    allocated_ = other.allocated_;
-    other.allocated_ = temp2;
-}
-
-ValueType Value::type() const
-{
-    return type_;
-}
-
-int Value::compare(const Value& other)
-{
-    /*
-    int typeDelta = other.type_ - type_;
-    switch ( type_ )
-    {
-    case nullValue:
-
-       return other.type_ == type_;
-    case intValue:
-       if ( other.type_.isNumeric()
-    case uintValue:
-    case realValue:
-    case booleanValue:
-       break;
-    case stringValue,
-       break;
-    case arrayValue:
-       delete value_.array_;
-       break;
-    case objectValue:
-       delete value_.map_;
-    default:
-       JSON_ASSERT_UNREACHABLE;
-    }
-    */
-    (void)other;
-    return 0; // unreachable
-}
-
-bool Value::operator<(const Value& other) const
-{
-    int typeDelta = type_ - other.type_;
-    if (typeDelta)
-        return typeDelta < 0 ? true : false;
-    switch (type_)
-    {
-        case nullValue:
-            return false;
-        case intValue:
-            return value_.int_ < other.value_.int_;
-        case uintValue:
-            return value_.uint_ < other.value_.uint_;
-        case realValue:
-            return value_.real_ < other.value_.real_;
-        case booleanValue:
-            return value_.bool_ < other.value_.bool_;
-        case stringValue:
-            return (value_.string_ == 0 && other.value_.string_) ||
-                   (other.value_.string_ && value_.string_ && strcmp(value_.string_, other.value_.string_) < 0);
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-        case objectValue:
-        {
-            int delta = int(value_.map_->size() - other.value_.map_->size());
-            if (delta)
-                return delta < 0;
-            return (*value_.map_) < (*other.value_.map_);
-        }
-#else
-        case arrayValue:
-            return value_.array_->compare(*(other.value_.array_)) < 0;
-        case objectValue:
-            return value_.map_->compare(*(other.value_.map_)) < 0;
-#endif
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return 0; // unreachable
-}
-
-bool Value::operator<=(const Value& other) const
-{
-    return !(other > *this);
-}
-
-bool Value::operator>=(const Value& other) const
-{
-    return !(*this < other);
-}
-
-bool Value::operator>(const Value& other) const
-{
-    return other < *this;
-}
-
-bool Value::operator==(const Value& other) const
-{
-    // if ( type_ != other.type_ )
-    // GCC 2.95.3 says:
-    // attempt to take address of bit-field structure member `Json::Value::type_'
-    // Beats me, but a temp solves the problem.
-    int temp = other.type_;
-    if (type_ != temp)
-        return false;
-    switch (type_)
-    {
-        case nullValue:
-            return true;
-        case intValue:
-            return value_.int_ == other.value_.int_;
-        case uintValue:
-            return value_.uint_ == other.value_.uint_;
-        case realValue:
-            return value_.real_ == other.value_.real_;
-        case booleanValue:
-            return value_.bool_ == other.value_.bool_;
-        case stringValue:
-            return (value_.string_ == other.value_.string_) ||
-                   (other.value_.string_ && value_.string_ && strcmp(value_.string_, other.value_.string_) == 0);
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-        case objectValue:
-            return value_.map_->size() == other.value_.map_->size() && (*value_.map_) == (*other.value_.map_);
-#else
-        case arrayValue:
-            return value_.array_->compare(*(other.value_.array_)) == 0;
-        case objectValue:
-            return value_.map_->compare(*(other.value_.map_)) == 0;
-#endif
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return 0; // unreachable
-}
-
-bool Value::operator!=(const Value& other) const
-{
-    return !(*this == other);
-}
-
-const char* Value::asCString() const
-{
-    JSON_ASSERT(type_ == stringValue);
-    return value_.string_;
-}
-
-std::string Value::asString() const
-{
-    switch (type_)
-    {
-        case nullValue:
-            return "";
-        case stringValue:
-            return value_.string_ ? value_.string_ : "";
-        case booleanValue:
-            return value_.bool_ ? "true" : "false";
-        case intValue:
-        case uintValue:
-        case realValue:
-        case arrayValue:
-        case objectValue:
-            JSON_ASSERT_MESSAGE(false, "Type is not convertible to string");
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return ""; // unreachable
+Value::Value(bool value) {
+  initBasic(booleanValue);
+  value_.bool_ = value;
 }
 
-#ifdef JSON_USE_CPPTL
-CppTL::ConstString Value::asConstString() const
-{
-    return CppTL::ConstString(asString().c_str());
+Value::Value(const Value& other) {
+  dupPayload(other);
+  dupMeta(other);
 }
-#endif
 
-Value::Int Value::asInt() const
-{
-    switch (type_)
-    {
-        case nullValue:
-            return 0;
-        case intValue:
-            return value_.int_;
-        case uintValue:
-            JSON_ASSERT_MESSAGE(value_.uint_ < (unsigned)maxInt, "integer out of signed integer range");
-            return value_.uint_;
-        case realValue:
-            JSON_ASSERT_MESSAGE(value_.real_ >= minInt && value_.real_ <= maxInt, "Real out of signed integer range");
-            return Int(value_.real_);
-        case booleanValue:
-            return value_.bool_ ? 1 : 0;
-        case stringValue:
-        case arrayValue:
-        case objectValue:
-            JSON_ASSERT_MESSAGE(false, "Type is not convertible to int");
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return 0; // unreachable;
-}
-
-Value::UInt Value::asUInt() const
-{
-    switch (type_)
-    {
-        case nullValue:
-            return 0;
-        case intValue:
-            JSON_ASSERT_MESSAGE(value_.int_ >= 0, "Negative integer can not be converted to unsigned integer");
-            return value_.int_;
-        case uintValue:
-            return value_.uint_;
-        case realValue:
-            JSON_ASSERT_MESSAGE(value_.real_ >= 0 && value_.real_ <= maxUInt, "Real out of unsigned integer range");
-            return UInt(value_.real_);
-        case booleanValue:
-            return value_.bool_ ? 1 : 0;
-        case stringValue:
-        case arrayValue:
-        case objectValue:
-            JSON_ASSERT_MESSAGE(false, "Type is not convertible to uint");
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return 0; // unreachable;
-}
-
-double Value::asDouble() const
-{
-    switch (type_)
-    {
-        case nullValue:
-            return 0.0;
-        case intValue:
-            return value_.int_;
-        case uintValue:
-            return value_.uint_;
-        case realValue:
-            return value_.real_;
-        case booleanValue:
-            return value_.bool_ ? 1.0 : 0.0;
-        case stringValue:
-        case arrayValue:
-        case objectValue:
-            JSON_ASSERT_MESSAGE(false, "Type is not convertible to double");
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return 0; // unreachable;
-}
-
-bool Value::asBool() const
-{
-    switch (type_)
-    {
-        case nullValue:
-            return false;
-        case intValue:
-        case uintValue:
-            return value_.int_ != 0;
-        case realValue:
-            return value_.real_ != 0.0;
-        case booleanValue:
-            return value_.bool_;
-        case stringValue:
-            return value_.string_ && value_.string_[0] != 0;
-        case arrayValue:
-        case objectValue:
-            return value_.map_->size() != 0;
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return false; // unreachable;
-}
-
-bool Value::isConvertibleTo(ValueType other) const
-{
-    switch (type_)
-    {
-        case nullValue:
-            return true;
-        case intValue:
-            return (other == nullValue && value_.int_ == 0) || other == intValue ||
-                   (other == uintValue && value_.int_ >= 0) || other == realValue || other == stringValue ||
-                   other == booleanValue;
-        case uintValue:
-            return (other == nullValue && value_.uint_ == 0) ||
-                   (other == intValue && value_.uint_ <= (unsigned)maxInt) || other == uintValue ||
-                   other == realValue || other == stringValue || other == booleanValue;
-        case realValue:
-            return (other == nullValue && value_.real_ == 0.0) ||
-                   (other == intValue && value_.real_ >= minInt && value_.real_ <= maxInt) ||
-                   (other == uintValue && value_.real_ >= 0 && value_.real_ <= maxUInt) || other == realValue ||
-                   other == stringValue || other == booleanValue;
-        case booleanValue:
-            return (other == nullValue && value_.bool_ == false) || other == intValue || other == uintValue ||
-                   other == realValue || other == stringValue || other == booleanValue;
-        case stringValue:
-            return other == stringValue || (other == nullValue && (!value_.string_ || value_.string_[0] == 0));
-        case arrayValue:
-            return other == arrayValue || (other == nullValue && value_.map_->size() == 0);
-        case objectValue:
-            return other == objectValue || (other == nullValue && value_.map_->size() == 0);
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return false; // unreachable;
+Value::Value(Value&& other) noexcept {
+  initBasic(nullValue);
+  swap(other);
 }
 
-/// Number of values in array or object
-Value::UInt Value::size() const
-{
-    switch (type_)
-    {
-        case nullValue:
-        case intValue:
-        case uintValue:
-        case realValue:
-        case booleanValue:
-        case stringValue:
-            return 0;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue: // size of the array is highest index + 1
-            if (!value_.map_->empty())
-            {
-                ObjectValues::const_iterator itLast = value_.map_->end();
-                --itLast;
-                return (*itLast).first.index() + 1;
-            }
-            return 0;
-        case objectValue:
-            return Int(value_.map_->size());
-#else
-        case arrayValue:
-            return Int(value_.array_->size());
-        case objectValue:
-            return Int(value_.map_->size());
-#endif
-        default:
-            JSON_ASSERT_UNREACHABLE;
-    }
-    return 0; // unreachable;
+Value::~Value() {
+  releasePayload();
+  value_.uint_ = 0;
 }
 
-bool Value::empty() const
-{
-    if (isNull() || isArray() || isObject())
-        return size() == 0u;
-    else
-        return false;
+Value& Value::operator=(const Value& other) {
+  Value(other).swap(*this);
+  return *this;
 }
 
-bool Value::operator!() const
-{
-    return isNull();
+Value& Value::operator=(Value&& other) noexcept {
+  other.swap(*this);
+  return *this;
 }
 
-void Value::clear()
-{
-    JSON_ASSERT(type_ == nullValue || type_ == arrayValue || type_ == objectValue);
-
-    switch (type_)
-    {
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-        case objectValue:
-            value_.map_->clear();
-            break;
-#else
-        case arrayValue:
-            value_.array_->clear();
-            break;
-        case objectValue:
-            value_.map_->clear();
-            break;
-#endif
-        default:
-            break;
-    }
+void Value::swapPayload(Value& other) {
+  std::swap(bits_, other.bits_);
+  std::swap(value_, other.value_);
 }
 
-void Value::resize(UInt newSize)
-{
-    JSON_ASSERT(type_ == nullValue || type_ == arrayValue);
-    if (type_ == nullValue)
-        *this = Value(arrayValue);
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    UInt oldSize = size();
-    if (newSize == 0)
-        clear();
-    else if (newSize > oldSize)
-        (*this)[newSize - 1];
-    else
-    {
-        for (UInt index = newSize; index < oldSize; ++index)
-            value_.map_->erase(index);
-        assert(size() == newSize);
-    }
-#else
-    value_.array_->resize(newSize);
-#endif
+void Value::copyPayload(const Value& other) {
+  releasePayload();
+  dupPayload(other);
 }
 
-Value& Value::operator[](UInt index)
-{
-    JSON_ASSERT(type_ == nullValue || type_ == arrayValue);
-    if (type_ == nullValue)
-        *this = Value(arrayValue);
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    CZString key(index);
-    ObjectValues::iterator it = value_.map_->lower_bound(key);
-    if (it != value_.map_->end() && (*it).first == key)
-        return (*it).second;
+void Value::swap(Value& other) {
+  swapPayload(other);
+  std::swap(comments_, other.comments_);
+  std::swap(start_, other.start_);
+  std::swap(limit_, other.limit_);
+}
 
-    ObjectValues::value_type defaultValue(key, null);
-    it = value_.map_->insert(it, defaultValue);
-    return (*it).second;
-#else
-    return value_.array_->resolveReference(index);
-#endif
+void Value::copy(const Value& other) {
+  copyPayload(other);
+  dupMeta(other);
 }
 
-const Value& Value::operator[](UInt index) const
-{
-    JSON_ASSERT(type_ == nullValue || type_ == arrayValue);
-    if (type_ == nullValue)
-        return null;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    CZString key(index);
-    ObjectValues::const_iterator it = value_.map_->find(key);
-    if (it == value_.map_->end())
-        return null;
-    return (*it).second;
-#else
-    Value* value = value_.array_->find(index);
-    return value ? *value : null;
-#endif
+ValueType Value::type() const {
+  return static_cast<ValueType>(bits_.value_type_);
 }
 
-Value& Value::operator[](const char* key)
-{
-    return resolveReference(key, false);
+int Value::compare(const Value& other) const {
+  if (*this < other)
+    return -1;
+  if (*this > other)
+    return 1;
+  return 0;
 }
 
-Value& Value::resolveReference(const char* key, bool isStatic)
-{
-    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
-    if (type_ == nullValue)
-        *this = Value(objectValue);
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    CZString actualKey(key, isStatic ? CZString::noDuplication : CZString::duplicateOnCopy);
-    ObjectValues::iterator it = value_.map_->lower_bound(actualKey);
-    if (it != value_.map_->end() && (*it).first == actualKey)
-        return (*it).second;
+bool Value::operator<(const Value& other) const {
+  int typeDelta = type() - other.type();
+  if (typeDelta)
+    return typeDelta < 0;
+  switch (type()) {
+  case nullValue:
+    return false;
+  case intValue:
+    return value_.int_ < other.value_.int_;
+  case uintValue:
+    return value_.uint_ < other.value_.uint_;
+  case realValue:
+    return value_.real_ < other.value_.real_;
+  case booleanValue:
+    return value_.bool_ < other.value_.bool_;
+  case stringValue: {
+    if ((value_.string_ == nullptr) || (other.value_.string_ == nullptr)) {
+      return other.value_.string_ != nullptr;
+    }
+    unsigned this_len;
+    unsigned other_len;
+    char const* this_str;
+    char const* other_str;
+    decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len,
+                         &this_str);
+    decodePrefixedString(other.isAllocated(), other.value_.string_, &other_len,
+                         &other_str);
+    unsigned min_len = std::min<unsigned>(this_len, other_len);
+    JSON_ASSERT(this_str && other_str);
+    int comp = memcmp(this_str, other_str, min_len);
+    if (comp < 0)
+      return true;
+    if (comp > 0)
+      return false;
+    return (this_len < other_len);
+  }
+  case arrayValue:
+  case objectValue: {
+    auto thisSize = value_.map_->size();
+    auto otherSize = other.value_.map_->size();
+    if (thisSize != otherSize)
+      return thisSize < otherSize;
+    return (*value_.map_) < (*other.value_.map_);
+  }
+  default:
+    JSON_ASSERT_UNREACHABLE;
+  }
+  return false; // unreachable
+}
+
+bool Value::operator<=(const Value& other) const { return !(other < *this); }
+
+bool Value::operator>=(const Value& other) const { return !(*this < other); }
+
+bool Value::operator>(const Value& other) const { return other < *this; }
+
+bool Value::operator==(const Value& other) const {
+  if (type() != other.type())
+    return false;
+  switch (type()) {
+  case nullValue:
+    return true;
+  case intValue:
+    return value_.int_ == other.value_.int_;
+  case uintValue:
+    return value_.uint_ == other.value_.uint_;
+  case realValue:
+    return value_.real_ == other.value_.real_;
+  case booleanValue:
+    return value_.bool_ == other.value_.bool_;
+  case stringValue: {
+    if ((value_.string_ == nullptr) || (other.value_.string_ == nullptr)) {
+      return (value_.string_ == other.value_.string_);
+    }
+    unsigned this_len;
+    unsigned other_len;
+    char const* this_str;
+    char const* other_str;
+    decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len,
+                         &this_str);
+    decodePrefixedString(other.isAllocated(), other.value_.string_, &other_len,
+                         &other_str);
+    if (this_len != other_len)
+      return false;
+    JSON_ASSERT(this_str && other_str);
+    int comp = memcmp(this_str, other_str, this_len);
+    return comp == 0;
+  }
+  case arrayValue:
+  case objectValue:
+    return value_.map_->size() == other.value_.map_->size() &&
+           (*value_.map_) == (*other.value_.map_);
+  default:
+    JSON_ASSERT_UNREACHABLE;
+  }
+  return false; // unreachable
+}
+
+bool Value::operator!=(const Value& other) const { return !(*this == other); }
+
+const char* Value::asCString() const {
+  JSON_ASSERT_MESSAGE(type() == stringValue,
+                      "in Json::Value::asCString(): requires stringValue");
+  if (value_.string_ == nullptr)
+    return nullptr;
+  unsigned this_len;
+  char const* this_str;
+  decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len,
+                       &this_str);
+  return this_str;
+}
+
+#if JSONCPP_USING_SECURE_MEMORY
+unsigned Value::getCStringLength() const {
+  JSON_ASSERT_MESSAGE(type() == stringValue,
+                      "in Json::Value::asCString(): requires stringValue");
+  if (value_.string_ == 0)
+    return 0;
+  unsigned this_len;
+  char const* this_str;
+  decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len,
+                       &this_str);
+  return this_len;
+}
+#endif
 
-    ObjectValues::value_type defaultValue(actualKey, null);
-    it = value_.map_->insert(it, defaultValue);
-    Value& value = (*it).second;
-    return value;
+bool Value::getString(char const** begin, char const** end) const {
+  if (type() != stringValue)
+    return false;
+  if (value_.string_ == nullptr)
+    return false;
+  unsigned length;
+  decodePrefixedString(this->isAllocated(), this->value_.string_, &length,
+                       begin);
+  *end = *begin + length;
+  return true;
+}
+
+String Value::asString() const {
+  switch (type()) {
+  case nullValue:
+    return "";
+  case stringValue: {
+    if (value_.string_ == nullptr)
+      return "";
+    unsigned this_len;
+    char const* this_str;
+    decodePrefixedString(this->isAllocated(), this->value_.string_, &this_len,
+                         &this_str);
+    return String(this_str, this_len);
+  }
+  case booleanValue:
+    return value_.bool_ ? "true" : "false";
+  case intValue:
+    return valueToString(value_.int_);
+  case uintValue:
+    return valueToString(value_.uint_);
+  case realValue:
+    return valueToString(value_.real_);
+  default:
+    JSON_FAIL_MESSAGE("Type is not convertible to string");
+  }
+}
+
+Value::Int Value::asInt() const {
+  switch (type()) {
+  case intValue:
+    JSON_ASSERT_MESSAGE(isInt(), "LargestInt out of Int range");
+    return Int(value_.int_);
+  case uintValue:
+    JSON_ASSERT_MESSAGE(isInt(), "LargestUInt out of Int range");
+    return Int(value_.uint_);
+  case realValue:
+    JSON_ASSERT_MESSAGE(InRange(value_.real_, minInt, maxInt),
+                        "double out of Int range");
+    return Int(value_.real_);
+  case nullValue:
+    return 0;
+  case booleanValue:
+    return value_.bool_ ? 1 : 0;
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to Int.");
+}
+
+Value::UInt Value::asUInt() const {
+  switch (type()) {
+  case intValue:
+    JSON_ASSERT_MESSAGE(isUInt(), "LargestInt out of UInt range");
+    return UInt(value_.int_);
+  case uintValue:
+    JSON_ASSERT_MESSAGE(isUInt(), "LargestUInt out of UInt range");
+    return UInt(value_.uint_);
+  case realValue:
+    JSON_ASSERT_MESSAGE(InRange(value_.real_, 0, maxUInt),
+                        "double out of UInt range");
+    return UInt(value_.real_);
+  case nullValue:
+    return 0;
+  case booleanValue:
+    return value_.bool_ ? 1 : 0;
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to UInt.");
+}
+
+#if defined(JSON_HAS_INT64)
+
+Value::Int64 Value::asInt64() const {
+  switch (type()) {
+  case intValue:
+    return Int64(value_.int_);
+  case uintValue:
+    JSON_ASSERT_MESSAGE(isInt64(), "LargestUInt out of Int64 range");
+    return Int64(value_.uint_);
+  case realValue:
+    JSON_ASSERT_MESSAGE(InRange(value_.real_, minInt64, maxInt64),
+                        "double out of Int64 range");
+    return Int64(value_.real_);
+  case nullValue:
+    return 0;
+  case booleanValue:
+    return value_.bool_ ? 1 : 0;
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to Int64.");
+}
+
+Value::UInt64 Value::asUInt64() const {
+  switch (type()) {
+  case intValue:
+    JSON_ASSERT_MESSAGE(isUInt64(), "LargestInt out of UInt64 range");
+    return UInt64(value_.int_);
+  case uintValue:
+    return UInt64(value_.uint_);
+  case realValue:
+    JSON_ASSERT_MESSAGE(InRange(value_.real_, 0, maxUInt64),
+                        "double out of UInt64 range");
+    return UInt64(value_.real_);
+  case nullValue:
+    return 0;
+  case booleanValue:
+    return value_.bool_ ? 1 : 0;
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to UInt64.");
+}
+#endif // if defined(JSON_HAS_INT64)
+
+LargestInt Value::asLargestInt() const {
+#if defined(JSON_NO_INT64)
+  return asInt();
 #else
-    return value_.map_->resolveReference(key, isStatic);
+  return asInt64();
 #endif
 }
 
-Value Value::get(UInt index, const Value& defaultValue) const
-{
-    const Value* value = &((*this)[index]);
-    return value == &null ? defaultValue : *value;
+LargestUInt Value::asLargestUInt() const {
+#if defined(JSON_NO_INT64)
+  return asUInt();
+#else
+  return asUInt64();
+#endif
 }
 
-bool Value::isValidIndex(UInt index) const
-{
-    return index < size();
+double Value::asDouble() const {
+  switch (type()) {
+  case intValue:
+    return static_cast<double>(value_.int_);
+  case uintValue:
+#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+    return static_cast<double>(value_.uint_);
+#else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+    return integerToDouble(value_.uint_);
+#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+  case realValue:
+    return value_.real_;
+  case nullValue:
+    return 0.0;
+  case booleanValue:
+    return value_.bool_ ? 1.0 : 0.0;
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to double.");
+}
+
+float Value::asFloat() const {
+  switch (type()) {
+  case intValue:
+    return static_cast<float>(value_.int_);
+  case uintValue:
+#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+    return static_cast<float>(value_.uint_);
+#else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+    // This can fail (silently?) if the value is bigger than MAX_FLOAT.
+    return static_cast<float>(integerToDouble(value_.uint_));
+#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
+  case realValue:
+    return static_cast<float>(value_.real_);
+  case nullValue:
+    return 0.0;
+  case booleanValue:
+    return value_.bool_ ? 1.0F : 0.0F;
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to float.");
+}
+
+bool Value::asBool() const {
+  switch (type()) {
+  case booleanValue:
+    return value_.bool_;
+  case nullValue:
+    return false;
+  case intValue:
+    return value_.int_ != 0;
+  case uintValue:
+    return value_.uint_ != 0;
+  case realValue: {
+    // According to JavaScript language zero or NaN is regarded as false
+    const auto value_classification = std::fpclassify(value_.real_);
+    return value_classification != FP_ZERO && value_classification != FP_NAN;
+  }
+  default:
+    break;
+  }
+  JSON_FAIL_MESSAGE("Value is not convertible to bool.");
+}
+
+bool Value::isConvertibleTo(ValueType other) const {
+  switch (other) {
+  case nullValue:
+    return (isNumeric() && asDouble() == 0.0) ||
+           (type() == booleanValue && !value_.bool_) ||
+           (type() == stringValue && asString().empty()) ||
+           (type() == arrayValue && value_.map_->empty()) ||
+           (type() == objectValue && value_.map_->empty()) ||
+           type() == nullValue;
+  case intValue:
+    return isInt() ||
+           (type() == realValue && InRange(value_.real_, minInt, maxInt)) ||
+           type() == booleanValue || type() == nullValue;
+  case uintValue:
+    return isUInt() ||
+           (type() == realValue && InRange(value_.real_, 0, maxUInt)) ||
+           type() == booleanValue || type() == nullValue;
+  case realValue:
+    return isNumeric() || type() == booleanValue || type() == nullValue;
+  case booleanValue:
+    return isNumeric() || type() == booleanValue || type() == nullValue;
+  case stringValue:
+    return isNumeric() || type() == booleanValue || type() == stringValue ||
+           type() == nullValue;
+  case arrayValue:
+    return type() == arrayValue || type() == nullValue;
+  case objectValue:
+    return type() == objectValue || type() == nullValue;
+  }
+  JSON_ASSERT_UNREACHABLE;
+  return false;
 }
 
-const Value& Value::operator[](const char* key) const
-{
-    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
-    if (type_ == nullValue)
-        return null;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    CZString actualKey(key, CZString::noDuplication);
-    ObjectValues::const_iterator it = value_.map_->find(actualKey);
-    if (it == value_.map_->end())
-        return null;
+/// Number of values in array or object
+ArrayIndex Value::size() const {
+  switch (type()) {
+  case nullValue:
+  case intValue:
+  case uintValue:
+  case realValue:
+  case booleanValue:
+  case stringValue:
+    return 0;
+  case arrayValue: // size of the array is highest index + 1
+    if (!value_.map_->empty()) {
+      ObjectValues::const_iterator itLast = value_.map_->end();
+      --itLast;
+      return (*itLast).first.index() + 1;
+    }
+    return 0;
+  case objectValue:
+    return ArrayIndex(value_.map_->size());
+  }
+  JSON_ASSERT_UNREACHABLE;
+  return 0; // unreachable;
+}
+
+bool Value::empty() const {
+  if (isNull() || isArray() || isObject())
+    return size() == 0U;
+  return false;
+}
+
+Value::operator bool() const { return !isNull(); }
+
+void Value::clear() {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue ||
+                          type() == objectValue,
+                      "in Json::Value::clear(): requires complex value");
+  start_ = 0;
+  limit_ = 0;
+  switch (type()) {
+  case arrayValue:
+  case objectValue:
+    value_.map_->clear();
+    break;
+  default:
+    break;
+  }
+}
+
+void Value::resize(ArrayIndex newSize) {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue,
+                      "in Json::Value::resize(): requires arrayValue");
+  if (type() == nullValue)
+    *this = Value(arrayValue);
+  ArrayIndex oldSize = size();
+  if (newSize == 0)
+    clear();
+  else if (newSize > oldSize)
+    for (ArrayIndex i = oldSize; i < newSize; ++i)
+      (*this)[i];
+  else {
+    for (ArrayIndex index = newSize; index < oldSize; ++index) {
+      value_.map_->erase(index);
+    }
+    JSON_ASSERT(size() == newSize);
+  }
+}
+
+Value& Value::operator[](ArrayIndex index) {
+  JSON_ASSERT_MESSAGE(
+      type() == nullValue || type() == arrayValue,
+      "in Json::Value::operator[](ArrayIndex): requires arrayValue");
+  if (type() == nullValue)
+    *this = Value(arrayValue);
+  CZString key(index);
+  auto it = value_.map_->lower_bound(key);
+  if (it != value_.map_->end() && (*it).first == key)
     return (*it).second;
-#else
-    const Value* value = value_.map_->find(key);
-    return value ? *value : null;
-#endif
-}
 
-Value& Value::operator[](const std::string& key)
-{
-    return (*this)[key.c_str()];
-}
+  ObjectValues::value_type defaultValue(key, nullSingleton());
+  it = value_.map_->insert(it, defaultValue);
+  return (*it).second;
+}
+
+Value& Value::operator[](int index) {
+  JSON_ASSERT_MESSAGE(
+      index >= 0,
+      "in Json::Value::operator[](int index): index cannot be negative");
+  return (*this)[ArrayIndex(index)];
+}
+
+const Value& Value::operator[](ArrayIndex index) const {
+  JSON_ASSERT_MESSAGE(
+      type() == nullValue || type() == arrayValue,
+      "in Json::Value::operator[](ArrayIndex)const: requires arrayValue");
+  if (type() == nullValue)
+    return nullSingleton();
+  CZString key(index);
+  ObjectValues::const_iterator it = value_.map_->find(key);
+  if (it == value_.map_->end())
+    return nullSingleton();
+  return (*it).second;
+}
+
+const Value& Value::operator[](int index) const {
+  JSON_ASSERT_MESSAGE(
+      index >= 0,
+      "in Json::Value::operator[](int index) const: index cannot be negative");
+  return (*this)[ArrayIndex(index)];
+}
+
+void Value::initBasic(ValueType type, bool allocated) {
+  setType(type);
+  setIsAllocated(allocated);
+  comments_ = Comments{};
+  start_ = 0;
+  limit_ = 0;
+}
+
+void Value::dupPayload(const Value& other) {
+  setType(other.type());
+  setIsAllocated(false);
+  switch (type()) {
+  case nullValue:
+  case intValue:
+  case uintValue:
+  case realValue:
+  case booleanValue:
+    value_ = other.value_;
+    break;
+  case stringValue:
+    if (other.value_.string_ && other.isAllocated()) {
+      unsigned len;
+      char const* str;
+      decodePrefixedString(other.isAllocated(), other.value_.string_, &len,
+                           &str);
+      value_.string_ = duplicateAndPrefixStringValue(str, len);
+      setIsAllocated(true);
+    } else {
+      value_.string_ = other.value_.string_;
+    }
+    break;
+  case arrayValue:
+  case objectValue:
+    value_.map_ = new ObjectValues(*other.value_.map_);
+    break;
+  default:
+    JSON_ASSERT_UNREACHABLE;
+  }
+}
+
+void Value::releasePayload() {
+  switch (type()) {
+  case nullValue:
+  case intValue:
+  case uintValue:
+  case realValue:
+  case booleanValue:
+    break;
+  case stringValue:
+    if (isAllocated())
+      releasePrefixedStringValue(value_.string_);
+    break;
+  case arrayValue:
+  case objectValue:
+    delete value_.map_;
+    break;
+  default:
+    JSON_ASSERT_UNREACHABLE;
+  }
+}
+
+void Value::dupMeta(const Value& other) {
+  comments_ = other.comments_;
+  start_ = other.start_;
+  limit_ = other.limit_;
+}
+
+// Access an object value by name, create a null member if it does not exist.
+// @pre Type of '*this' is object or null.
+// @param key is null-terminated.
+Value& Value::resolveReference(const char* key) {
+  JSON_ASSERT_MESSAGE(
+      type() == nullValue || type() == objectValue,
+      "in Json::Value::resolveReference(): requires objectValue");
+  if (type() == nullValue)
+    *this = Value(objectValue);
+  CZString actualKey(key, static_cast<unsigned>(strlen(key)),
+                     CZString::noDuplication); // NOTE!
+  auto it = value_.map_->lower_bound(actualKey);
+  if (it != value_.map_->end() && (*it).first == actualKey)
+    return (*it).second;
 
-const Value& Value::operator[](const std::string& key) const
-{
-    return (*this)[key.c_str()];
-}
+  ObjectValues::value_type defaultValue(actualKey, nullSingleton());
+  it = value_.map_->insert(it, defaultValue);
+  Value& value = (*it).second;
+  return value;
+}
+
+// @param key is not null-terminated.
+Value& Value::resolveReference(char const* key, char const* end) {
+  JSON_ASSERT_MESSAGE(
+      type() == nullValue || type() == objectValue,
+      "in Json::Value::resolveReference(key, end): requires objectValue");
+  if (type() == nullValue)
+    *this = Value(objectValue);
+  CZString actualKey(key, static_cast<unsigned>(end - key),
+                     CZString::duplicateOnCopy);
+  auto it = value_.map_->lower_bound(actualKey);
+  if (it != value_.map_->end() && (*it).first == actualKey)
+    return (*it).second;
 
-Value& Value::operator[](const StaticString& key)
-{
-    return resolveReference(key, true);
+  ObjectValues::value_type defaultValue(actualKey, nullSingleton());
+  it = value_.map_->insert(it, defaultValue);
+  Value& value = (*it).second;
+  return value;
 }
 
-#ifdef JSON_USE_CPPTL
-Value& Value::operator[](const CppTL::ConstString& key)
-{
-    return (*this)[key.c_str()];
+Value Value::get(ArrayIndex index, const Value& defaultValue) const {
+  const Value* value = &((*this)[index]);
+  return value == &nullSingleton() ? defaultValue : *value;
 }
 
-const Value& Value::operator[](const CppTL::ConstString& key) const
-{
-    return (*this)[key.c_str()];
-}
-#endif
+bool Value::isValidIndex(ArrayIndex index) const { return index < size(); }
 
-Value& Value::append(const Value& value)
-{
-    return (*this)[size()] = value;
+Value const* Value::find(char const* begin, char const* end) const {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue,
+                      "in Json::Value::find(begin, end): requires "
+                      "objectValue or nullValue");
+  if (type() == nullValue)
+    return nullptr;
+  CZString actualKey(begin, static_cast<unsigned>(end - begin),
+                     CZString::noDuplication);
+  ObjectValues::const_iterator it = value_.map_->find(actualKey);
+  if (it == value_.map_->end())
+    return nullptr;
+  return &(*it).second;
 }
-
-Value Value::get(const char* key, const Value& defaultValue) const
-{
-    const Value* value = &((*this)[key]);
-    return value == &null ? defaultValue : *value;
+Value* Value::demand(char const* begin, char const* end) {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue,
+                      "in Json::Value::demand(begin, end): requires "
+                      "objectValue or nullValue");
+  return &resolveReference(begin, end);
 }
-
-Value Value::get(const std::string& key, const Value& defaultValue) const
-{
-    return get(key.c_str(), defaultValue);
+const Value& Value::operator[](const char* key) const {
+  Value const* found = find(key, key + strlen(key));
+  if (!found)
+    return nullSingleton();
+  return *found;
 }
-
-Value Value::removeMember(const char* key)
-{
-    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
-    if (type_ == nullValue)
-        return null;
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    CZString actualKey(key, CZString::noDuplication);
-    ObjectValues::iterator it = value_.map_->find(actualKey);
-    if (it == value_.map_->end())
-        return null;
-    Value old(it->second);
-    value_.map_->erase(it);
-    return old;
+Value const& Value::operator[](const String& key) const {
+  Value const* found = find(key.data(), key.data() + key.length());
+  if (!found)
+    return nullSingleton();
+  return *found;
+}
+
+Value& Value::operator[](const char* key) {
+  return resolveReference(key, key + strlen(key));
+}
+
+Value& Value::operator[](const String& key) {
+  return resolveReference(key.data(), key.data() + key.length());
+}
+
+Value& Value::operator[](const StaticString& key) {
+  return resolveReference(key.c_str());
+}
+
+Value& Value::append(const Value& value) { return append(Value(value)); }
+
+Value& Value::append(Value&& value) {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue,
+                      "in Json::Value::append: requires arrayValue");
+  if (type() == nullValue) {
+    *this = Value(arrayValue);
+  }
+  return this->value_.map_->emplace(size(), std::move(value)).first->second;
+}
+
+bool Value::insert(ArrayIndex index, const Value& newValue) {
+  return insert(index, Value(newValue));
+}
+
+bool Value::insert(ArrayIndex index, Value&& newValue) {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == arrayValue,
+                      "in Json::Value::insert: requires arrayValue");
+  ArrayIndex length = size();
+  if (index > length) {
+    return false;
+  }
+  for (ArrayIndex i = length; i > index; i--) {
+    (*this)[i] = std::move((*this)[i - 1]);
+  }
+  (*this)[index] = std::move(newValue);
+  return true;
+}
+
+Value Value::get(char const* begin, char const* end,
+                 Value const& defaultValue) const {
+  Value const* found = find(begin, end);
+  return !found ? defaultValue : *found;
+}
+Value Value::get(char const* key, Value const& defaultValue) const {
+  return get(key, key + strlen(key), defaultValue);
+}
+Value Value::get(String const& key, Value const& defaultValue) const {
+  return get(key.data(), key.data() + key.length(), defaultValue);
+}
+
+bool Value::removeMember(const char* begin, const char* end, Value* removed) {
+  if (type() != objectValue) {
+    return false;
+  }
+  CZString actualKey(begin, static_cast<unsigned>(end - begin),
+                     CZString::noDuplication);
+  auto it = value_.map_->find(actualKey);
+  if (it == value_.map_->end())
+    return false;
+  if (removed)
+    *removed = std::move(it->second);
+  value_.map_->erase(it);
+  return true;
+}
+bool Value::removeMember(const char* key, Value* removed) {
+  return removeMember(key, key + strlen(key), removed);
+}
+bool Value::removeMember(String const& key, Value* removed) {
+  return removeMember(key.data(), key.data() + key.length(), removed);
+}
+void Value::removeMember(const char* key) {
+  JSON_ASSERT_MESSAGE(type() == nullValue || type() == objectValue,
+                      "in Json::Value::removeMember(): requires objectValue");
+  if (type() == nullValue)
+    return;
+
+  CZString actualKey(key, unsigned(strlen(key)), CZString::noDuplication);
+  value_.map_->erase(actualKey);
+}
+void Value::removeMember(const String& key) { removeMember(key.c_str()); }
+
+bool Value::removeIndex(ArrayIndex index, Value* removed) {
+  if (type() != arrayValue) {
+    return false;
+  }
+  CZString key(index);
+  auto it = value_.map_->find(key);
+  if (it == value_.map_->end()) {
+    return false;
+  }
+  if (removed)
+    *removed = it->second;
+  ArrayIndex oldSize = size();
+  // shift left all items left, into the place of the "removed"
+  for (ArrayIndex i = index; i < (oldSize - 1); ++i) {
+    CZString keey(i);
+    (*value_.map_)[keey] = (*this)[i + 1];
+  }
+  // erase the last one ("leftover")
+  CZString keyLast(oldSize - 1);
+  auto itLast = value_.map_->find(keyLast);
+  value_.map_->erase(itLast);
+  return true;
+}
+
+bool Value::isMember(char const* begin, char const* end) const {
+  Value const* value = find(begin, end);
+  return nullptr != value;
+}
+bool Value::isMember(char const* key) const {
+  return isMember(key, key + strlen(key));
+}
+bool Value::isMember(String const& key) const {
+  return isMember(key.data(), key.data() + key.length());
+}
+
+Value::Members Value::getMemberNames() const {
+  JSON_ASSERT_MESSAGE(
+      type() == nullValue || type() == objectValue,
+      "in Json::Value::getMemberNames(), value must be objectValue");
+  if (type() == nullValue)
+    return Value::Members();
+  Members members;
+  members.reserve(value_.map_->size());
+  ObjectValues::const_iterator it = value_.map_->begin();
+  ObjectValues::const_iterator itEnd = value_.map_->end();
+  for (; it != itEnd; ++it) {
+    members.push_back(String((*it).first.data(), (*it).first.length()));
+  }
+  return members;
+}
+
+static bool IsIntegral(double d) {
+  double integral_part;
+  return modf(d, &integral_part) == 0.0;
+}
+
+bool Value::isNull() const { return type() == nullValue; }
+
+bool Value::isBool() const { return type() == booleanValue; }
+
+bool Value::isInt() const {
+  switch (type()) {
+  case intValue:
+#if defined(JSON_HAS_INT64)
+    return value_.int_ >= minInt && value_.int_ <= maxInt;
 #else
-    Value* value = value_.map_->find(key);
-    if (value)
-    {
-        Value old(*value);
-        value_.map_.remove(key);
-        return old;
-    }
-    else
-    {
-        return null;
-    }
+    return true;
 #endif
+  case uintValue:
+    return value_.uint_ <= UInt(maxInt);
+  case realValue:
+    return value_.real_ >= minInt && value_.real_ <= maxInt &&
+           IsIntegral(value_.real_);
+  default:
+    break;
+  }
+  return false;
+}
+
+bool Value::isUInt() const {
+  switch (type()) {
+  case intValue:
+#if defined(JSON_HAS_INT64)
+    return value_.int_ >= 0 && LargestUInt(value_.int_) <= LargestUInt(maxUInt);
+#else
+    return value_.int_ >= 0;
+#endif
+  case uintValue:
+#if defined(JSON_HAS_INT64)
+    return value_.uint_ <= maxUInt;
+#else
+    return true;
+#endif
+  case realValue:
+    return value_.real_ >= 0 && value_.real_ <= maxUInt &&
+           IsIntegral(value_.real_);
+  default:
+    break;
+  }
+  return false;
+}
+
+bool Value::isInt64() const {
+#if defined(JSON_HAS_INT64)
+  switch (type()) {
+  case intValue:
+    return true;
+  case uintValue:
+    return value_.uint_ <= UInt64(maxInt64);
+  case realValue:
+    // Note that maxInt64 (= 2^63 - 1) is not exactly representable as a
+    // double, so double(maxInt64) will be rounded up to 2^63. Therefore we
+    // require the value to be strictly less than the limit.
+    return value_.real_ >= double(minInt64) &&
+           value_.real_ < double(maxInt64) && IsIntegral(value_.real_);
+  default:
+    break;
+  }
+#endif // JSON_HAS_INT64
+  return false;
+}
+
+bool Value::isUInt64() const {
+#if defined(JSON_HAS_INT64)
+  switch (type()) {
+  case intValue:
+    return value_.int_ >= 0;
+  case uintValue:
+    return true;
+  case realValue:
+    // Note that maxUInt64 (= 2^64 - 1) is not exactly representable as a
+    // double, so double(maxUInt64) will be rounded up to 2^64. Therefore we
+    // require the value to be strictly less than the limit.
+    return value_.real_ >= 0 && value_.real_ < maxUInt64AsDouble &&
+           IsIntegral(value_.real_);
+  default:
+    break;
+  }
+#endif // JSON_HAS_INT64
+  return false;
+}
+
+bool Value::isIntegral() const {
+  switch (type()) {
+  case intValue:
+  case uintValue:
+    return true;
+  case realValue:
+#if defined(JSON_HAS_INT64)
+    // Note that maxUInt64 (= 2^64 - 1) is not exactly representable as a
+    // double, so double(maxUInt64) will be rounded up to 2^64. Therefore we
+    // require the value to be strictly less than the limit.
+    return value_.real_ >= double(minInt64) &&
+           value_.real_ < maxUInt64AsDouble && IsIntegral(value_.real_);
+#else
+    return value_.real_ >= minInt && value_.real_ <= maxUInt &&
+           IsIntegral(value_.real_);
+#endif // JSON_HAS_INT64
+  default:
+    break;
+  }
+  return false;
 }
 
-Value Value::removeMember(const std::string& key)
-{
-    return removeMember(key.c_str());
+bool Value::isDouble() const {
+  return type() == intValue || type() == uintValue || type() == realValue;
 }
 
-#ifdef JSON_USE_CPPTL
-Value Value::get(const CppTL::ConstString& key, const Value& defaultValue) const
-{
-    return get(key.c_str(), defaultValue);
-}
-#endif
+bool Value::isNumeric() const { return isDouble(); }
 
-bool Value::isMember(const char* key) const
-{
-    const Value* value = &((*this)[key]);
-    return value != &null;
-}
+bool Value::isString() const { return type() == stringValue; }
 
-bool Value::isMember(const std::string& key) const
-{
-    return isMember(key.c_str());
-}
+bool Value::isArray() const { return type() == arrayValue; }
 
-#ifdef JSON_USE_CPPTL
-bool Value::isMember(const CppTL::ConstString& key) const
-{
-    return isMember(key.c_str());
-}
-#endif
+bool Value::isObject() const { return type() == objectValue; }
 
-Value::Members Value::getMemberNames() const
-{
-    JSON_ASSERT(type_ == nullValue || type_ == objectValue);
-    if (type_ == nullValue)
-        return Value::Members();
-    Members members;
-    members.reserve(value_.map_->size());
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-    ObjectValues::const_iterator it = value_.map_->begin();
-    ObjectValues::const_iterator itEnd = value_.map_->end();
-    for (; it != itEnd; ++it)
-        members.push_back(std::string((*it).first.c_str()));
-#else
-    ValueInternalMap::IteratorState it;
-    ValueInternalMap::IteratorState itEnd;
-    value_.map_->makeBeginIterator(it);
-    value_.map_->makeEndIterator(itEnd);
-    for (; !ValueInternalMap::equals(it, itEnd); ValueInternalMap::increment(it))
-        members.push_back(std::string(ValueInternalMap::key(it)));
-#endif
-    return members;
-}
-//
-//# ifdef JSON_USE_CPPTL
-// EnumMemberNames
-// Value::enumMemberNames() const
-//{
-//   if ( type_ == objectValue )
-//   {
-//      return CppTL::Enum::any(  CppTL::Enum::transform(
-//         CppTL::Enum::keys( *(value_.map_), CppTL::Type<const CZString &>() ),
-//         MemberNamesTransform() ) );
-//   }
-//   return EnumMemberNames();
-//}
-//
-//
-// EnumValues
-// Value::enumValues() const
-//{
-//   if ( type_ == objectValue  ||  type_ == arrayValue )
-//      return CppTL::Enum::anyValues( *(value_.map_),
-//                                     CppTL::Type<const Value &>() );
-//   return EnumValues();
-//}
-//
-//# endif
+Value::Comments::Comments(const Comments& that)
+    : ptr_{cloneUnique(that.ptr_)} {}
 
-bool Value::isNull() const
-{
-    return type_ == nullValue;
-}
+Value::Comments::Comments(Comments&& that) noexcept
+    : ptr_{std::move(that.ptr_)} {}
 
-bool Value::isBool() const
-{
-    return type_ == booleanValue;
+Value::Comments& Value::Comments::operator=(const Comments& that) {
+  ptr_ = cloneUnique(that.ptr_);
+  return *this;
 }
 
-bool Value::isInt() const
-{
-    return type_ == intValue;
+Value::Comments& Value::Comments::operator=(Comments&& that) noexcept {
+  ptr_ = std::move(that.ptr_);
+  return *this;
 }
 
-bool Value::isUInt() const
-{
-    return type_ == uintValue;
+bool Value::Comments::has(CommentPlacement slot) const {
+  return ptr_ && !(*ptr_)[slot].empty();
 }
 
-bool Value::isIntegral() const
-{
-    return type_ == intValue || type_ == uintValue || type_ == booleanValue;
+String Value::Comments::get(CommentPlacement slot) const {
+  if (!ptr_)
+    return {};
+  return (*ptr_)[slot];
 }
 
-bool Value::isDouble() const
-{
-    return type_ == realValue;
+void Value::Comments::set(CommentPlacement slot, String comment) {
+  if (slot >= CommentPlacement::numberOfCommentPlacement)
+    return;
+  if (!ptr_)
+    ptr_ = std::unique_ptr<Array>(new Array());
+  (*ptr_)[slot] = std::move(comment);
 }
 
-bool Value::isNumeric() const
-{
-    return isIntegral() || isDouble();
+void Value::setComment(String comment, CommentPlacement placement) {
+  if (!comment.empty() && (comment.back() == '\n')) {
+    // Always discard trailing newline, to aid indentation.
+    comment.pop_back();
+  }
+  JSON_ASSERT(!comment.empty());
+  JSON_ASSERT_MESSAGE(
+      comment[0] == '\0' || comment[0] == '/',
+      "in Json::Value::setComment(): Comments must start with /");
+  comments_.set(placement, std::move(comment));
 }
 
-bool Value::isString() const
-{
-    return type_ == stringValue;
+bool Value::hasComment(CommentPlacement placement) const {
+  return comments_.has(placement);
 }
 
-bool Value::isArray() const
-{
-    return type_ == nullValue || type_ == arrayValue;
+String Value::getComment(CommentPlacement placement) const {
+  return comments_.get(placement);
 }
 
-bool Value::isObject() const
-{
-    return type_ == nullValue || type_ == objectValue;
-}
+void Value::setOffsetStart(ptrdiff_t start) { start_ = start; }
+
+void Value::setOffsetLimit(ptrdiff_t limit) { limit_ = limit; }
+
+ptrdiff_t Value::getOffsetStart() const { return start_; }
 
-void Value::setComment(const char* comment, CommentPlacement placement)
-{
-    if (!comments_)
-        comments_ = new CommentInfo[numberOfCommentPlacement];
-    comments_[placement].setComment(comment);
+ptrdiff_t Value::getOffsetLimit() const { return limit_; }
+
+String Value::toStyledString() const {
+  StreamWriterBuilder builder;
+
+  String out = this->hasComment(commentBefore) ? "\n" : "";
+  out += Json::writeString(builder, *this);
+  out += '\n';
+
+  return out;
 }
 
-void Value::setComment(const std::string& comment, CommentPlacement placement)
-{
-    setComment(comment.c_str(), placement);
+Value::const_iterator Value::begin() const {
+  switch (type()) {
+  case arrayValue:
+  case objectValue:
+    if (value_.map_)
+      return const_iterator(value_.map_->begin());
+    break;
+  default:
+    break;
+  }
+  return {};
 }
 
-bool Value::hasComment(CommentPlacement placement) const
-{
-    return comments_ != 0 && comments_[placement].comment_ != 0;
+Value::const_iterator Value::end() const {
+  switch (type()) {
+  case arrayValue:
+  case objectValue:
+    if (value_.map_)
+      return const_iterator(value_.map_->end());
+    break;
+  default:
+    break;
+  }
+  return {};
 }
 
-std::string Value::getComment(CommentPlacement placement) const
-{
-    if (hasComment(placement))
-        return comments_[placement].comment_;
-    return "";
+Value::iterator Value::begin() {
+  switch (type()) {
+  case arrayValue:
+  case objectValue:
+    if (value_.map_)
+      return iterator(value_.map_->begin());
+    break;
+  default:
+    break;
+  }
+  return iterator();
 }
 
-std::string Value::toStyledString() const
-{
-    StyledWriter writer;
-    return writer.write(*this);
-}
-
-Value::const_iterator Value::begin() const
-{
-    switch (type_)
-    {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-            if (value_.array_)
-            {
-                ValueInternalArray::IteratorState it;
-                value_.array_->makeBeginIterator(it);
-                return const_iterator(it);
-            }
-            break;
-        case objectValue:
-            if (value_.map_)
-            {
-                ValueInternalMap::IteratorState it;
-                value_.map_->makeBeginIterator(it);
-                return const_iterator(it);
-            }
-            break;
-#else
-        case arrayValue:
-        case objectValue:
-            if (value_.map_)
-                return const_iterator(value_.map_->begin());
-            break;
-#endif
-        default:
-            break;
-    }
-    return const_iterator();
-}
-
-Value::const_iterator Value::end() const
-{
-    switch (type_)
-    {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-            if (value_.array_)
-            {
-                ValueInternalArray::IteratorState it;
-                value_.array_->makeEndIterator(it);
-                return const_iterator(it);
-            }
-            break;
-        case objectValue:
-            if (value_.map_)
-            {
-                ValueInternalMap::IteratorState it;
-                value_.map_->makeEndIterator(it);
-                return const_iterator(it);
-            }
-            break;
-#else
-        case arrayValue:
-        case objectValue:
-            if (value_.map_)
-                return const_iterator(value_.map_->end());
-            break;
-#endif
-        default:
-            break;
-    }
-    return const_iterator();
-}
-
-Value::iterator Value::begin()
-{
-    switch (type_)
-    {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-            if (value_.array_)
-            {
-                ValueInternalArray::IteratorState it;
-                value_.array_->makeBeginIterator(it);
-                return iterator(it);
-            }
-            break;
-        case objectValue:
-            if (value_.map_)
-            {
-                ValueInternalMap::IteratorState it;
-                value_.map_->makeBeginIterator(it);
-                return iterator(it);
-            }
-            break;
-#else
-        case arrayValue:
-        case objectValue:
-            if (value_.map_)
-                return iterator(value_.map_->begin());
-            break;
-#endif
-        default:
-            break;
-    }
-    return iterator();
-}
-
-Value::iterator Value::end()
-{
-    switch (type_)
-    {
-#ifdef JSON_VALUE_USE_INTERNAL_MAP
-        case arrayValue:
-            if (value_.array_)
-            {
-                ValueInternalArray::IteratorState it;
-                value_.array_->makeEndIterator(it);
-                return iterator(it);
-            }
-            break;
-        case objectValue:
-            if (value_.map_)
-            {
-                ValueInternalMap::IteratorState it;
-                value_.map_->makeEndIterator(it);
-                return iterator(it);
-            }
-            break;
-#else
-        case arrayValue:
-        case objectValue:
-            if (value_.map_)
-                return iterator(value_.map_->end());
-            break;
-#endif
-        default:
-            break;
-    }
-    return iterator();
+Value::iterator Value::end() {
+  switch (type()) {
+  case arrayValue:
+  case objectValue:
+    if (value_.map_)
+      return iterator(value_.map_->end());
+    break;
+  default:
+    break;
+  }
+  return iterator();
 }
 
 // class PathArgument
 // //////////////////////////////////////////////////////////////////
 
-PathArgument::PathArgument() : kind_(kindNone) {}
+PathArgument::PathArgument() = default;
 
-PathArgument::PathArgument(Value::UInt index) : index_(index), kind_(kindIndex) {}
+PathArgument::PathArgument(ArrayIndex index)
+    : index_(index), kind_(kindIndex) {}
 
 PathArgument::PathArgument(const char* key) : key_(key), kind_(kindKey) {}
 
-PathArgument::PathArgument(const std::string& key) : key_(key.c_str()), kind_(kindKey) {}
+PathArgument::PathArgument(String key) : key_(std::move(key)), kind_(kindKey) {}
 
 // class Path
 // //////////////////////////////////////////////////////////////////
 
-Path::Path(const std::string& path,
-           const PathArgument& a1,
-           const PathArgument& a2,
-           const PathArgument& a3,
-           const PathArgument& a4,
-           const PathArgument& a5)
-{
-    InArgs in;
-    in.push_back(&a1);
-    in.push_back(&a2);
-    in.push_back(&a3);
-    in.push_back(&a4);
-    in.push_back(&a5);
-    makePath(path, in);
-}
-
-void Path::makePath(const std::string& path, const InArgs& in)
-{
-    const char* current = path.c_str();
-    const char* end = current + path.length();
-    InArgs::const_iterator itInArg = in.begin();
-    while (current != end)
-    {
-        if (*current == '[')
-        {
-            ++current;
-            if (*current == '%')
-                addPathInArg(path, in, itInArg, PathArgument::kindIndex);
-            else
-            {
-                Value::UInt index = 0;
-                for (; current != end && *current >= '0' && *current <= '9'; ++current)
-                    index = index * 10 + Value::UInt(*current - '0');
-                args_.push_back(index);
-            }
-            if (current == end || *current++ != ']')
-                invalidPath(path, int(current - path.c_str()));
-        }
-        else if (*current == '%')
-        {
-            addPathInArg(path, in, itInArg, PathArgument::kindKey);
-            ++current;
-        }
-        else if (*current == '.')
-        {
-            ++current;
-        }
-        else
-        {
-            const char* beginName = current;
-            while (current != end && !strchr("[.", *current))
-                ++current;
-            args_.push_back(std::string(beginName, current));
-        }
+Path::Path(const String& path, const PathArgument& a1, const PathArgument& a2,
+           const PathArgument& a3, const PathArgument& a4,
+           const PathArgument& a5) {
+  InArgs in;
+  in.reserve(5);
+  in.push_back(&a1);
+  in.push_back(&a2);
+  in.push_back(&a3);
+  in.push_back(&a4);
+  in.push_back(&a5);
+  makePath(path, in);
+}
+
+void Path::makePath(const String& path, const InArgs& in) {
+  const char* current = path.c_str();
+  const char* end = current + path.length();
+  auto itInArg = in.begin();
+  while (current != end) {
+    if (*current == '[') {
+      ++current;
+      if (*current == '%')
+        addPathInArg(path, in, itInArg, PathArgument::kindIndex);
+      else {
+        ArrayIndex index = 0;
+        for (; current != end && *current >= '0' && *current <= '9'; ++current)
+          index = index * 10 + ArrayIndex(*current - '0');
+        args_.push_back(index);
+      }
+      if (current == end || *++current != ']')
+        invalidPath(path, int(current - path.c_str()));
+    } else if (*current == '%') {
+      addPathInArg(path, in, itInArg, PathArgument::kindKey);
+      ++current;
+    } else if (*current == '.' || *current == ']') {
+      ++current;
+    } else {
+      const char* beginName = current;
+      while (current != end && !strchr("[.", *current))
+        ++current;
+      args_.push_back(String(beginName, current));
     }
+  }
 }
 
-void Path::addPathInArg(const std::string& path,
-                        const InArgs& in,
+void Path::addPathInArg(const String& /*path*/, const InArgs& in,
                         InArgs::const_iterator& itInArg,
-                        PathArgument::Kind kind)
-{
-    (void)path;
-    if (itInArg == in.end())
-    {
-        // Error: missing argument %d
-    }
-    else if ((*itInArg)->kind_ != kind)
-    {
-        // Error: bad argument type
-    }
-    else
-    {
-        args_.push_back(**itInArg);
-    }
-}
-
-void Path::invalidPath(const std::string& path, int location)
-{
-    // Error: invalid path.
-    (void)path;
-    (void)location;
-}
-
-const Value& Path::resolve(const Value& root) const
-{
-    const Value* node = &root;
-    for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it)
-    {
-        const PathArgument& arg = *it;
-        if (arg.kind_ == PathArgument::kindIndex)
-        {
-            if (!node->isArray() || node->isValidIndex(arg.index_))
-            {
-                // Error: unable to resolve path (array value expected at position...
-            }
-            node = &((*node)[arg.index_]);
-        }
-        else if (arg.kind_ == PathArgument::kindKey)
-        {
-            if (!node->isObject())
-            {
-                // Error: unable to resolve path (object value expected at position...)
-            }
-            node = &((*node)[arg.key_]);
-            if (node == &Value::null)
-            {
-                // Error: unable to resolve path (object has no member named '' at position...)
-            }
-        }
+                        PathArgument::Kind kind) {
+  if (itInArg == in.end()) {
+    // Error: missing argument %d
+  } else if ((*itInArg)->kind_ != kind) {
+    // Error: bad argument type
+  } else {
+    args_.push_back(**itInArg++);
+  }
+}
+
+void Path::invalidPath(const String& /*path*/, int /*location*/) {
+  // Error: invalid path.
+}
+
+const Value& Path::resolve(const Value& root) const {
+  const Value* node = &root;
+  for (const auto& arg : args_) {
+    if (arg.kind_ == PathArgument::kindIndex) {
+      if (!node->isArray() || !node->isValidIndex(arg.index_)) {
+        // Error: unable to resolve path (array value expected at position... )
+        return Value::nullSingleton();
+      }
+      node = &((*node)[arg.index_]);
+    } else if (arg.kind_ == PathArgument::kindKey) {
+      if (!node->isObject()) {
+        // Error: unable to resolve path (object value expected at position...)
+        return Value::nullSingleton();
+      }
+      node = &((*node)[arg.key_]);
+      if (node == &Value::nullSingleton()) {
+        // Error: unable to resolve path (object has no member named '' at
+        // position...)
+        return Value::nullSingleton();
+      }
     }
-    return *node;
-}
-
-Value Path::resolve(const Value& root, const Value& defaultValue) const
-{
-    const Value* node = &root;
-    for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it)
-    {
-        const PathArgument& arg = *it;
-        if (arg.kind_ == PathArgument::kindIndex)
-        {
-            if (!node->isArray() || node->isValidIndex(arg.index_))
-                return defaultValue;
-            node = &((*node)[arg.index_]);
-        }
-        else if (arg.kind_ == PathArgument::kindKey)
-        {
-            if (!node->isObject())
-                return defaultValue;
-            node = &((*node)[arg.key_]);
-            if (node == &Value::null)
-                return defaultValue;
-        }
+  }
+  return *node;
+}
+
+Value Path::resolve(const Value& root, const Value& defaultValue) const {
+  const Value* node = &root;
+  for (const auto& arg : args_) {
+    if (arg.kind_ == PathArgument::kindIndex) {
+      if (!node->isArray() || !node->isValidIndex(arg.index_))
+        return defaultValue;
+      node = &((*node)[arg.index_]);
+    } else if (arg.kind_ == PathArgument::kindKey) {
+      if (!node->isObject())
+        return defaultValue;
+      node = &((*node)[arg.key_]);
+      if (node == &Value::nullSingleton())
+        return defaultValue;
     }
-    return *node;
-}
-
-Value& Path::make(Value& root) const
-{
-    Value* node = &root;
-    for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it)
-    {
-        const PathArgument& arg = *it;
-        if (arg.kind_ == PathArgument::kindIndex)
-        {
-            if (!node->isArray())
-            {
-                // Error: node is not an array at position ...
-            }
-            node = &((*node)[arg.index_]);
-        }
-        else if (arg.kind_ == PathArgument::kindKey)
-        {
-            if (!node->isObject())
-            {
-                // Error: node is not an object at position...
-            }
-            node = &((*node)[arg.key_]);
-        }
+  }
+  return *node;
+}
+
+Value& Path::make(Value& root) const {
+  Value* node = &root;
+  for (const auto& arg : args_) {
+    if (arg.kind_ == PathArgument::kindIndex) {
+      if (!node->isArray()) {
+        // Error: node is not an array at position ...
+      }
+      node = &((*node)[arg.index_]);
+    } else if (arg.kind_ == PathArgument::kindKey) {
+      if (!node->isObject()) {
+        // Error: node is not an object at position...
+      }
+      node = &((*node)[arg.key_]);
     }
-    return *node;
+  }
+  return *node;
 }
 
 } // namespace Json
diff --git a/ext_libs/json/json_valueiterator.inl b/ext_libs/json/json_valueiterator.inl
index bd7c8d20..d6128b8e 100644
--- a/ext_libs/json/json_valueiterator.inl
+++ b/ext_libs/json/json_valueiterator.inl
@@ -1,11 +1,11 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2007-2010 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
 // included by json_value.cpp
-// everything is within Json namespace
 
+namespace Json {
 
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -15,202 +15,96 @@
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-ValueIteratorBase::ValueIteratorBase()
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   : current_()
-   , isNull_( true )
-{
-}
-#else
-   : isArray_( true )
-   , isNull_( true )
-{
-   iterator_.array_ = ValueInternalArray::IteratorState();
-}
-#endif
+ValueIteratorBase::ValueIteratorBase() : current_() {}
 
+ValueIteratorBase::ValueIteratorBase(
+    const Value::ObjectValues::iterator& current)
+    : current_(current), isNull_(false) {}
 
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueIteratorBase::ValueIteratorBase( const Value::ObjectValues::iterator &current )
-   : current_( current )
-   , isNull_( false )
-{
-}
-#else
-ValueIteratorBase::ValueIteratorBase( const ValueInternalArray::IteratorState &state )
-   : isArray_( true )
-{
-   iterator_.array_ = state;
-}
-
+Value& ValueIteratorBase::deref() { return current_->second; }
+const Value& ValueIteratorBase::deref() const { return current_->second; }
 
-ValueIteratorBase::ValueIteratorBase( const ValueInternalMap::IteratorState &state )
-   : isArray_( false )
-{
-   iterator_.map_ = state;
-}
-#endif
+void ValueIteratorBase::increment() { ++current_; }
 
-Value &
-ValueIteratorBase::deref() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   return current_->second;
-#else
-   if ( isArray_ )
-      return ValueInternalArray::dereference( iterator_.array_ );
-   return ValueInternalMap::value( iterator_.map_ );
-#endif
-}
+void ValueIteratorBase::decrement() { --current_; }
 
+ValueIteratorBase::difference_type
+ValueIteratorBase::computeDistance(const SelfType& other) const {
+  // Iterator for null value are initialized using the default
+  // constructor, which initialize current_ to the default
+  // std::map::iterator. As begin() and end() are two instance
+  // of the default std::map::iterator, they can not be compared.
+  // To allow this, we handle this comparison specifically.
+  if (isNull_ && other.isNull_) {
+    return 0;
+  }
 
-void 
-ValueIteratorBase::increment()
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   ++current_;
-#else
-   if ( isArray_ )
-      ValueInternalArray::increment( iterator_.array_ );
-   ValueInternalMap::increment( iterator_.map_ );
-#endif
+  // Usage of std::distance is not portable (does not compile with Sun Studio 12
+  // RogueWave STL,
+  // which is the one used by default).
+  // Using a portable hand-made version for non random iterator instead:
+  //   return difference_type( std::distance( current_, other.current_ ) );
+  difference_type myDistance = 0;
+  for (Value::ObjectValues::iterator it = current_; it != other.current_;
+       ++it) {
+    ++myDistance;
+  }
+  return myDistance;
 }
 
-
-void 
-ValueIteratorBase::decrement()
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   --current_;
-#else
-   if ( isArray_ )
-      ValueInternalArray::decrement( iterator_.array_ );
-   ValueInternalMap::decrement( iterator_.map_ );
-#endif
+bool ValueIteratorBase::isEqual(const SelfType& other) const {
+  if (isNull_) {
+    return other.isNull_;
+  }
+  return current_ == other.current_;
 }
 
-
-ValueIteratorBase::difference_type 
-ValueIteratorBase::computeDistance( const SelfType &other ) const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-# ifdef JSON_USE_CPPTL_SMALLMAP
-   return current_ - other.current_;
-# else
-   // Iterator for null value are initialized using the default
-   // constructor, which initialize current_ to the default
-   // std::map::iterator. As begin() and end() are two instance 
-   // of the default std::map::iterator, they can not be compared.
-   // To allow this, we handle this comparison specifically.
-   if ( isNull_  &&  other.isNull_ )
-   {
-      return 0;
-   }
-
-
-   // Usage of std::distance is not portable (does not compile with Sun Studio 12 RogueWave STL,
-   // which is the one used by default).
-   // Using a portable hand-made version for non random iterator instead:
-   //   return difference_type( std::distance( current_, other.current_ ) );
-   difference_type myDistance = 0;
-   for ( Value::ObjectValues::iterator it = current_; it != other.current_; ++it )
-   {
-      ++myDistance;
-   }
-   return myDistance;
-# endif
-#else
-   if ( isArray_ )
-      return ValueInternalArray::distance( iterator_.array_, other.iterator_.array_ );
-   return ValueInternalMap::distance( iterator_.map_, other.iterator_.map_ );
-#endif
+void ValueIteratorBase::copy(const SelfType& other) {
+  current_ = other.current_;
+  isNull_ = other.isNull_;
 }
 
-
-bool 
-ValueIteratorBase::isEqual( const SelfType &other ) const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   if ( isNull_ )
-   {
-      return other.isNull_;
-   }
-   return current_ == other.current_;
-#else
-   if ( isArray_ )
-      return ValueInternalArray::equals( iterator_.array_, other.iterator_.array_ );
-   return ValueInternalMap::equals( iterator_.map_, other.iterator_.map_ );
-#endif
+Value ValueIteratorBase::key() const {
+  const Value::CZString czstring = (*current_).first;
+  if (czstring.data()) {
+    if (czstring.isStaticString())
+      return Value(StaticString(czstring.data()));
+    return Value(czstring.data(), czstring.data() + czstring.length());
+  }
+  return Value(czstring.index());
 }
 
-
-void 
-ValueIteratorBase::copy( const SelfType &other )
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   current_ = other.current_;
-#else
-   if ( isArray_ )
-      iterator_.array_ = other.iterator_.array_;
-   iterator_.map_ = other.iterator_.map_;
-#endif
+UInt ValueIteratorBase::index() const {
+  const Value::CZString czstring = (*current_).first;
+  if (!czstring.data())
+    return czstring.index();
+  return Value::UInt(-1);
 }
 
-
-Value 
-ValueIteratorBase::key() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const Value::CZString czstring = (*current_).first;
-   if ( czstring.c_str() )
-   {
-      if ( czstring.isStaticString() )
-         return Value( StaticString( czstring.c_str() ) );
-      return Value( czstring.c_str() );
-   }
-   return Value( czstring.index() );
-#else
-   if ( isArray_ )
-      return Value( ValueInternalArray::indexOf( iterator_.array_ ) );
-   bool isStatic;
-   const char *memberName = ValueInternalMap::key( iterator_.map_, isStatic );
-   if ( isStatic )
-      return Value( StaticString( memberName ) );
-   return Value( memberName );
-#endif
+String ValueIteratorBase::name() const {
+  char const* keey;
+  char const* end;
+  keey = memberName(&end);
+  if (!keey)
+    return String();
+  return String(keey, end);
 }
 
-
-UInt 
-ValueIteratorBase::index() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const Value::CZString czstring = (*current_).first;
-   if ( !czstring.c_str() )
-      return czstring.index();
-   return Value::UInt( -1 );
-#else
-   if ( isArray_ )
-      return Value::UInt( ValueInternalArray::indexOf( iterator_.array_ ) );
-   return Value::UInt( -1 );
-#endif
+char const* ValueIteratorBase::memberName() const {
+  const char* cname = (*current_).first.data();
+  return cname ? cname : "";
 }
 
-
-const char *
-ValueIteratorBase::memberName() const
-{
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-   const char *name = (*current_).first.c_str();
-   return name ? name : "";
-#else
-   if ( !isArray_ )
-      return ValueInternalMap::key( iterator_.map_ );
-   return "";
-#endif
+char const* ValueIteratorBase::memberName(char const** end) const {
+  const char* cname = (*current_).first.data();
+  if (!cname) {
+    *end = nullptr;
+    return nullptr;
+  }
+  *end = cname + (*current_).first.length();
+  return cname;
 }
 
-
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -219,36 +113,21 @@ ValueIteratorBase::memberName() const
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-ValueConstIterator::ValueConstIterator()
-{
-}
+ValueConstIterator::ValueConstIterator() = default;
 
+ValueConstIterator::ValueConstIterator(
+    const Value::ObjectValues::iterator& current)
+    : ValueIteratorBase(current) {}
 
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueConstIterator::ValueConstIterator( const Value::ObjectValues::iterator &current )
-   : ValueIteratorBase( current )
-{
-}
-#else
-ValueConstIterator::ValueConstIterator( const ValueInternalArray::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-
-ValueConstIterator::ValueConstIterator( const ValueInternalMap::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-#endif
+ValueConstIterator::ValueConstIterator(ValueIterator const& other)
+    : ValueIteratorBase(other) {}
 
-ValueConstIterator &
-ValueConstIterator::operator =( const ValueIteratorBase &other )
-{
-   copy( other );
-   return *this;
+ValueConstIterator& ValueConstIterator::
+operator=(const ValueIteratorBase& other) {
+  copy(other);
+  return *this;
 }
 
-
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
@@ -257,41 +136,21 @@ ValueConstIterator::operator =( const ValueIteratorBase &other )
 // //////////////////////////////////////////////////////////////////
 // //////////////////////////////////////////////////////////////////
 
-ValueIterator::ValueIterator()
-{
-}
+ValueIterator::ValueIterator() = default;
 
+ValueIterator::ValueIterator(const Value::ObjectValues::iterator& current)
+    : ValueIteratorBase(current) {}
 
-#ifndef JSON_VALUE_USE_INTERNAL_MAP
-ValueIterator::ValueIterator( const Value::ObjectValues::iterator &current )
-   : ValueIteratorBase( current )
-{
-}
-#else
-ValueIterator::ValueIterator( const ValueInternalArray::IteratorState &state )
-   : ValueIteratorBase( state )
-{
+ValueIterator::ValueIterator(const ValueConstIterator& other)
+    : ValueIteratorBase(other) {
+  throwRuntimeError("ConstIterator to Iterator should never be allowed.");
 }
 
-ValueIterator::ValueIterator( const ValueInternalMap::IteratorState &state )
-   : ValueIteratorBase( state )
-{
-}
-#endif
+ValueIterator::ValueIterator(const ValueIterator& other) = default;
 
-ValueIterator::ValueIterator( const ValueConstIterator &other )
-   : ValueIteratorBase( other )
-{
+ValueIterator& ValueIterator::operator=(const SelfType& other) {
+  copy(other);
+  return *this;
 }
 
-ValueIterator::ValueIterator( const ValueIterator &other )
-   : ValueIteratorBase( other )
-{
-}
-
-ValueIterator &
-ValueIterator::operator =( const SelfType &other )
-{
-   copy( other );
-   return *this;
-}
+} // namespace Json
diff --git a/ext_libs/json/json_writer.cpp b/ext_libs/json/json_writer.cpp
index a74afaf5..0dd160e4 100644
--- a/ext_libs/json/json_writer.cpp
+++ b/ext_libs/json/json_writer.cpp
@@ -1,761 +1,1259 @@
-// Copyright 2007-2010 Baptiste Lepilleur
+// Copyright 2011 Baptiste Lepilleur and The JsonCpp Authors
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
+#if !defined(JSON_IS_AMALGAMATION)
+#include "json_tool.h"
 #include <json/writer.h>
-#include <utility>
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <iostream>
-#include <sstream>
+#endif // if !defined(JSON_IS_AMALGAMATION)
+#include <algorithm>
+#include <cassert>
+#include <cctype>
+#include <cstring>
 #include <iomanip>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <utility>
+
+#if __cplusplus >= 201103L
+#include <cmath>
+#include <cstdio>
 
-#if _MSC_VER >= 1400            // VC++ 8.0
-#pragma warning(disable : 4996) // disable warning about strdup being deprecated.
+#if !defined(isnan)
+#define isnan std::isnan
 #endif
 
-namespace Json
-{
-static bool isControlCharacter(char ch)
-{
-    return ch > 0 && ch <= 0x1F;
-}
+#if !defined(isfinite)
+#define isfinite std::isfinite
+#endif
 
-static bool containsControlCharacter(const char* str)
-{
-    while (*str)
-    {
-        if (isControlCharacter(*(str++)))
-            return true;
-    }
-    return false;
-}
-static void uintToString(unsigned int value, char*& current)
-{
-    *--current = 0;
-    do
-    {
-        *--current = (value % 10) + '0';
-        value /= 10;
-    } while (value != 0);
-}
-
-std::string valueToString(Int value)
-{
-    char buffer[32];
-    char* current = buffer + sizeof(buffer);
-    bool isNegative = value < 0;
-    if (isNegative)
-        value = -value;
-    uintToString(UInt(value), current);
-    if (isNegative)
-        *--current = '-';
-    assert(current >= buffer);
-    return current;
-}
-
-std::string valueToString(UInt value)
-{
-    char buffer[32];
-    char* current = buffer + sizeof(buffer);
-    uintToString(value, current);
-    assert(current >= buffer);
-    return current;
-}
-
-std::string valueToString(double value)
-{
-    char buffer[32];
-#if defined(_MSC_VER) && defined(__STDC_SECURE_LIB__) // Use secure version with visual studio 2005 to avoid warning.
-    sprintf_s(buffer, sizeof(buffer), "%#.16g", value);
 #else
-    sprintf(buffer, "%#.16g", value);
+#include <cmath>
+#include <cstdio>
+
+#if defined(_MSC_VER)
+#if !defined(isnan)
+#include <float.h>
+#define isnan _isnan
 #endif
-    char* ch = buffer + strlen(buffer) - 1;
-    if (*ch != '0')
-        return buffer; // nothing to truncate, so save time
-    while (ch > buffer && *ch == '0')
-    {
-        --ch;
+
+#if !defined(isfinite)
+#include <float.h>
+#define isfinite _finite
+#endif
+
+#if !defined(_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES)
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+#endif //_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES
+
+#endif //_MSC_VER
+
+#if defined(__sun) && defined(__SVR4) // Solaris
+#if !defined(isfinite)
+#include <ieeefp.h>
+#define isfinite finite
+#endif
+#endif
+
+#if defined(__hpux)
+#if !defined(isfinite)
+#if defined(__ia64) && !defined(finite)
+#define isfinite(x)                                                            \
+  ((sizeof(x) == sizeof(float) ? _Isfinitef(x) : _IsFinite(x)))
+#endif
+#endif
+#endif
+
+#if !defined(isnan)
+// IEEE standard states that NaN values will not compare to themselves
+#define isnan(x) ((x) != (x))
+#endif
+
+#if !defined(__APPLE__)
+#if !defined(isfinite)
+#define isfinite finite
+#endif
+#endif
+#endif
+
+#if defined(_MSC_VER)
+// Disable warning about strdup being deprecated.
+#pragma warning(disable : 4996)
+#endif
+
+namespace Json {
+
+#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
+using StreamWriterPtr = std::unique_ptr<StreamWriter>;
+#else
+using StreamWriterPtr = std::auto_ptr<StreamWriter>;
+#endif
+
+String valueToString(LargestInt value) {
+  UIntToStringBuffer buffer;
+  char* current = buffer + sizeof(buffer);
+  if (value == Value::minLargestInt) {
+    uintToString(LargestUInt(Value::maxLargestInt) + 1, current);
+    *--current = '-';
+  } else if (value < 0) {
+    uintToString(LargestUInt(-value), current);
+    *--current = '-';
+  } else {
+    uintToString(LargestUInt(value), current);
+  }
+  assert(current >= buffer);
+  return current;
+}
+
+String valueToString(LargestUInt value) {
+  UIntToStringBuffer buffer;
+  char* current = buffer + sizeof(buffer);
+  uintToString(value, current);
+  assert(current >= buffer);
+  return current;
+}
+
+#if defined(JSON_HAS_INT64)
+
+String valueToString(Int value) { return valueToString(LargestInt(value)); }
+
+String valueToString(UInt value) { return valueToString(LargestUInt(value)); }
+
+#endif // # if defined(JSON_HAS_INT64)
+
+namespace {
+String valueToString(double value, bool useSpecialFloats,
+                     unsigned int precision, PrecisionType precisionType) {
+  // Print into the buffer. We need not request the alternative representation
+  // that always has a decimal point because JSON doesn't distinguish the
+  // concepts of reals and integers.
+  if (!isfinite(value)) {
+    static const char* const reps[2][3] = {{"NaN", "-Infinity", "Infinity"},
+                                           {"null", "-1e+9999", "1e+9999"}};
+    return reps[useSpecialFloats ? 0 : 1]
+               [isnan(value) ? 0 : (value < 0) ? 1 : 2];
+  }
+
+  String buffer(size_t(36), '\0');
+  while (true) {
+    int len = jsoncpp_snprintf(
+        &*buffer.begin(), buffer.size(),
+        (precisionType == PrecisionType::significantDigits) ? "%.*g" : "%.*f",
+        precision, value);
+    assert(len >= 0);
+    auto wouldPrint = static_cast<size_t>(len);
+    if (wouldPrint >= buffer.size()) {
+      buffer.resize(wouldPrint + 1);
+      continue;
     }
-    char* last_nonzero = ch;
-    while (ch >= buffer)
-    {
-        switch (*ch)
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                --ch;
-                continue;
-            case '.':
-                // Truncate zeroes to save bytes in output, but keep one.
-                *(last_nonzero + 2) = '\0';
-                return buffer;
-            default:
-                return buffer;
+    buffer.resize(wouldPrint);
+    break;
+  }
+
+  buffer.erase(fixNumericLocale(buffer.begin(), buffer.end()), buffer.end());
+
+  // try to ensure we preserve the fact that this was given to us as a double on
+  // input
+  if (buffer.find('.') == buffer.npos && buffer.find('e') == buffer.npos) {
+    buffer += ".0";
+  }
+
+  // strip the zero padding from the right
+  if (precisionType == PrecisionType::decimalPlaces) {
+    buffer.erase(fixZerosInTheEnd(buffer.begin(), buffer.end(), precision),
+                 buffer.end());
+  }
+
+  return buffer;
+}
+} // namespace
+
+String valueToString(double value, unsigned int precision,
+                     PrecisionType precisionType) {
+  return valueToString(value, false, precision, precisionType);
+}
+
+String valueToString(bool value) { return value ? "true" : "false"; }
+
+static bool doesAnyCharRequireEscaping(char const* s, size_t n) {
+  assert(s || !n);
+
+  return std::any_of(s, s + n, [](unsigned char c) {
+    return c == '\\' || c == '"' || c < 0x20 || c > 0x7F;
+  });
+}
+
+static unsigned int utf8ToCodepoint(const char*& s, const char* e) {
+  const unsigned int REPLACEMENT_CHARACTER = 0xFFFD;
+
+  unsigned int firstByte = static_cast<unsigned char>(*s);
+
+  if (firstByte < 0x80)
+    return firstByte;
+
+  if (firstByte < 0xE0) {
+    if (e - s < 2)
+      return REPLACEMENT_CHARACTER;
+
+    unsigned int calculated =
+        ((firstByte & 0x1F) << 6) | (static_cast<unsigned int>(s[1]) & 0x3F);
+    s += 1;
+    // oversized encoded characters are invalid
+    return calculated < 0x80 ? REPLACEMENT_CHARACTER : calculated;
+  }
+
+  if (firstByte < 0xF0) {
+    if (e - s < 3)
+      return REPLACEMENT_CHARACTER;
+
+    unsigned int calculated = ((firstByte & 0x0F) << 12) |
+                              ((static_cast<unsigned int>(s[1]) & 0x3F) << 6) |
+                              (static_cast<unsigned int>(s[2]) & 0x3F);
+    s += 2;
+    // surrogates aren't valid codepoints itself
+    // shouldn't be UTF-8 encoded
+    if (calculated >= 0xD800 && calculated <= 0xDFFF)
+      return REPLACEMENT_CHARACTER;
+    // oversized encoded characters are invalid
+    return calculated < 0x800 ? REPLACEMENT_CHARACTER : calculated;
+  }
+
+  if (firstByte < 0xF8) {
+    if (e - s < 4)
+      return REPLACEMENT_CHARACTER;
+
+    unsigned int calculated = ((firstByte & 0x07) << 18) |
+                              ((static_cast<unsigned int>(s[1]) & 0x3F) << 12) |
+                              ((static_cast<unsigned int>(s[2]) & 0x3F) << 6) |
+                              (static_cast<unsigned int>(s[3]) & 0x3F);
+    s += 3;
+    // oversized encoded characters are invalid
+    return calculated < 0x10000 ? REPLACEMENT_CHARACTER : calculated;
+  }
+
+  return REPLACEMENT_CHARACTER;
+}
+
+static const char hex2[] = "000102030405060708090a0b0c0d0e0f"
+                           "101112131415161718191a1b1c1d1e1f"
+                           "202122232425262728292a2b2c2d2e2f"
+                           "303132333435363738393a3b3c3d3e3f"
+                           "404142434445464748494a4b4c4d4e4f"
+                           "505152535455565758595a5b5c5d5e5f"
+                           "606162636465666768696a6b6c6d6e6f"
+                           "707172737475767778797a7b7c7d7e7f"
+                           "808182838485868788898a8b8c8d8e8f"
+                           "909192939495969798999a9b9c9d9e9f"
+                           "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+                           "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+                           "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+                           "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
+                           "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
+                           "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff";
+
+static String toHex16Bit(unsigned int x) {
+  const unsigned int hi = (x >> 8) & 0xff;
+  const unsigned int lo = x & 0xff;
+  String result(4, ' ');
+  result[0] = hex2[2 * hi];
+  result[1] = hex2[2 * hi + 1];
+  result[2] = hex2[2 * lo];
+  result[3] = hex2[2 * lo + 1];
+  return result;
+}
+
+static void appendRaw(String& result, unsigned ch) {
+  result += static_cast<char>(ch);
+}
+
+static void appendHex(String& result, unsigned ch) {
+  result.append("\\u").append(toHex16Bit(ch));
+}
+
+static String valueToQuotedStringN(const char* value, size_t length,
+                                   bool emitUTF8 = false) {
+  if (value == nullptr)
+    return "";
+
+  if (!doesAnyCharRequireEscaping(value, length))
+    return String("\"") + value + "\"";
+  // We have to walk value and escape any special characters.
+  // Appending to String is not efficient, but this should be rare.
+  // (Note: forward slashes are *not* rare, but I am not escaping them.)
+  String::size_type maxsize = length * 2 + 3; // allescaped+quotes+NULL
+  String result;
+  result.reserve(maxsize); // to avoid lots of mallocs
+  result += "\"";
+  char const* end = value + length;
+  for (const char* c = value; c != end; ++c) {
+    switch (*c) {
+    case '\"':
+      result += "\\\"";
+      break;
+    case '\\':
+      result += "\\\\";
+      break;
+    case '\b':
+      result += "\\b";
+      break;
+    case '\f':
+      result += "\\f";
+      break;
+    case '\n':
+      result += "\\n";
+      break;
+    case '\r':
+      result += "\\r";
+      break;
+    case '\t':
+      result += "\\t";
+      break;
+    // case '/':
+    // Even though \/ is considered a legal escape in JSON, a bare
+    // slash is also legal, so I see no reason to escape it.
+    // (I hope I am not misunderstanding something.)
+    // blep notes: actually escaping \/ may be useful in javascript to avoid </
+    // sequence.
+    // Should add a flag to allow this compatibility mode and prevent this
+    // sequence from occurring.
+    default: {
+      if (emitUTF8) {
+        unsigned codepoint = static_cast<unsigned char>(*c);
+        if (codepoint < 0x20) {
+          appendHex(result, codepoint);
+        } else {
+          appendRaw(result, codepoint);
         }
-    }
-    return buffer;
-}
-
-std::string valueToString(bool value)
-{
-    return value ? "true" : "false";
-}
-
-std::string valueToQuotedString(const char* value)
-{
-    // Not sure how to handle unicode...
-    if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter(value))
-        return std::string("\"") + value + "\"";
-    // We have to walk value and escape any special characters.
-    // Appending to std::string is not efficient, but this should be rare.
-    // (Note: forward slashes are *not* rare, but I am not escaping them.)
-    unsigned maxsize = strlen(value) * 2 + 3; // allescaped+quotes+NULL
-    std::string result;
-    result.reserve(maxsize); // to avoid lots of mallocs
-    result += "\"";
-    for (const char* c = value; *c != 0; ++c)
-    {
-        switch (*c)
-        {
-            case '\"':
-                result += "\\\"";
-                break;
-            case '\\':
-                result += "\\\\";
-                break;
-            case '\b':
-                result += "\\b";
-                break;
-            case '\f':
-                result += "\\f";
-                break;
-            case '\n':
-                result += "\\n";
-                break;
-            case '\r':
-                result += "\\r";
-                break;
-            case '\t':
-                result += "\\t";
-                break;
-            // case '/':
-            // Even though \/ is considered a legal escape in JSON, a bare
-            // slash is also legal, so I see no reason to escape it.
-            // (I hope I am not misunderstanding something.
-            // blep notes: actually escaping \/ may be useful in javascript to avoid </
-            // sequence.
-            // Should add a flag to allow this compatibility mode and prevent this
-            // sequence from occurring.
-            default:
-                if (isControlCharacter(*c))
-                {
-                    std::ostringstream oss;
-                    oss << "\\u" << std::hex << std::uppercase << std::setfill('0') << std::setw(4)
-                        << static_cast<int>(*c);
-                    result += oss.str();
-                }
-                else
-                {
-                    result += *c;
-                }
-                break;
+      } else {
+        unsigned codepoint = utf8ToCodepoint(c, end); // modifies `c`
+        if (codepoint < 0x20) {
+          appendHex(result, codepoint);
+        } else if (codepoint < 0x80) {
+          appendRaw(result, codepoint);
+        } else if (codepoint < 0x10000) {
+          // Basic Multilingual Plane
+          appendHex(result, codepoint);
+        } else {
+          // Extended Unicode. Encode 20 bits as a surrogate pair.
+          codepoint -= 0x10000;
+          appendHex(result, 0xd800 + ((codepoint >> 10) & 0x3ff));
+          appendHex(result, 0xdc00 + (codepoint & 0x3ff));
         }
+      }
+    } break;
     }
-    result += "\"";
-    return result;
+  }
+  result += "\"";
+  return result;
+}
+
+String valueToQuotedString(const char* value) {
+  return valueToQuotedStringN(value, strlen(value));
 }
 
 // Class Writer
 // //////////////////////////////////////////////////////////////////
-Writer::~Writer() {}
+Writer::~Writer() = default;
 
 // Class FastWriter
 // //////////////////////////////////////////////////////////////////
 
-FastWriter::FastWriter() : yamlCompatiblityEnabled_(false) {}
+FastWriter::FastWriter()
 
-void FastWriter::enableYAMLCompatibility()
-{
-    yamlCompatiblityEnabled_ = true;
-}
+    = default;
 
-std::string FastWriter::write(const Value& root, bool noNewLine)
-{
-    document_ = "";
-    writeValue(root);
-    if (!noNewLine)
-    {
-        document_ += "\n";
-    }
-    return document_;
+void FastWriter::enableYAMLCompatibility() { yamlCompatibilityEnabled_ = true; }
+
+void FastWriter::dropNullPlaceholders() { dropNullPlaceholders_ = true; }
+
+void FastWriter::omitEndingLineFeed() { omitEndingLineFeed_ = true; }
+
+String FastWriter::write(const Value& root) {
+  document_.clear();
+  writeValue(root);
+  if (!omitEndingLineFeed_)
+    document_ += '\n';
+  return document_;
 }
 
-void FastWriter::writeValue(const Value& value)
-{
-    switch (value.type())
-    {
-        case nullValue:
-            document_ += "null";
-            break;
-        case intValue:
-            document_ += valueToString(value.asInt());
-            break;
-        case uintValue:
-            document_ += valueToString(value.asUInt());
-            break;
-        case realValue:
-            document_ += valueToString(value.asDouble());
-            break;
-        case stringValue:
-            document_ += valueToQuotedString(value.asCString());
-            break;
-        case booleanValue:
-            document_ += valueToString(value.asBool());
-            break;
-        case arrayValue:
-        {
-            document_ += "[";
-            int size = value.size();
-            for (int index = 0; index < size; ++index)
-            {
-                if (index > 0)
-                    document_ += ",";
-                writeValue(value[index]);
-            }
-            document_ += "]";
-        }
-        break;
-        case objectValue:
-        {
-            Value::Members members(value.getMemberNames());
-            document_ += "{";
-            for (Value::Members::iterator it = members.begin(); it != members.end(); ++it)
-            {
-                const std::string& name = *it;
-                if (it != members.begin())
-                    document_ += ",";
-                document_ += valueToQuotedString(name.c_str());
-                document_ += yamlCompatiblityEnabled_ ? ": " : ":";
-                writeValue(value[name]);
-            }
-            document_ += "}";
-        }
-        break;
+void FastWriter::writeValue(const Value& value) {
+  switch (value.type()) {
+  case nullValue:
+    if (!dropNullPlaceholders_)
+      document_ += "null";
+    break;
+  case intValue:
+    document_ += valueToString(value.asLargestInt());
+    break;
+  case uintValue:
+    document_ += valueToString(value.asLargestUInt());
+    break;
+  case realValue:
+    document_ += valueToString(value.asDouble());
+    break;
+  case stringValue: {
+    // Is NULL possible for value.string_? No.
+    char const* str;
+    char const* end;
+    bool ok = value.getString(&str, &end);
+    if (ok)
+      document_ += valueToQuotedStringN(str, static_cast<size_t>(end - str));
+    break;
+  }
+  case booleanValue:
+    document_ += valueToString(value.asBool());
+    break;
+  case arrayValue: {
+    document_ += '[';
+    ArrayIndex size = value.size();
+    for (ArrayIndex index = 0; index < size; ++index) {
+      if (index > 0)
+        document_ += ',';
+      writeValue(value[index]);
+    }
+    document_ += ']';
+  } break;
+  case objectValue: {
+    Value::Members members(value.getMemberNames());
+    document_ += '{';
+    for (auto it = members.begin(); it != members.end(); ++it) {
+      const String& name = *it;
+      if (it != members.begin())
+        document_ += ',';
+      document_ += valueToQuotedStringN(name.data(), name.length());
+      document_ += yamlCompatibilityEnabled_ ? ": " : ":";
+      writeValue(value[name]);
     }
+    document_ += '}';
+  } break;
+  }
 }
 
 // Class StyledWriter
 // //////////////////////////////////////////////////////////////////
 
-StyledWriter::StyledWriter() : rightMargin_(74), indentSize_(3) {}
+StyledWriter::StyledWriter() = default;
 
-std::string StyledWriter::write(const Value& root, bool noNewLine)
-{
-    document_ = "";
-    addChildValues_ = false;
-    indentString_ = "";
-    writeCommentBeforeValue(root);
-    writeValue(root);
-    writeCommentAfterValueOnSameLine(root);
-    if (!noNewLine)
-    {
-        document_ += "\n";
-    }
-    return document_;
+String StyledWriter::write(const Value& root) {
+  document_.clear();
+  addChildValues_ = false;
+  indentString_.clear();
+  writeCommentBeforeValue(root);
+  writeValue(root);
+  writeCommentAfterValueOnSameLine(root);
+  document_ += '\n';
+  return document_;
 }
 
-void StyledWriter::writeValue(const Value& value)
-{
-    switch (value.type())
-    {
-        case nullValue:
-            pushValue("null");
-            break;
-        case intValue:
-            pushValue(valueToString(value.asInt()));
-            break;
-        case uintValue:
-            pushValue(valueToString(value.asUInt()));
-            break;
-        case realValue:
-            pushValue(valueToString(value.asDouble()));
-            break;
-        case stringValue:
-            pushValue(valueToQuotedString(value.asCString()));
-            break;
-        case booleanValue:
-            pushValue(valueToString(value.asBool()));
-            break;
-        case arrayValue:
-            writeArrayValue(value);
-            break;
-        case objectValue:
-        {
-            Value::Members members(value.getMemberNames());
-            if (members.empty())
-                pushValue("{}");
-            else
-            {
-                writeWithIndent("{");
-                indent();
-                Value::Members::iterator it = members.begin();
-                while (true)
-                {
-                    const std::string& name = *it;
-                    const Value& childValue = value[name];
-                    writeCommentBeforeValue(childValue);
-                    writeWithIndent(valueToQuotedString(name.c_str()));
-                    document_ += " : ";
-                    writeValue(childValue);
-                    if (++it == members.end())
-                    {
-                        writeCommentAfterValueOnSameLine(childValue);
-                        break;
-                    }
-                    document_ += ",";
-                    writeCommentAfterValueOnSameLine(childValue);
-                }
-                unindent();
-                writeWithIndent("}");
-            }
-        }
-        break;
-    }
-}
-
-void StyledWriter::writeArrayValue(const Value& value)
-{
-    unsigned size = value.size();
-    if (size == 0)
-        pushValue("[]");
+void StyledWriter::writeValue(const Value& value) {
+  switch (value.type()) {
+  case nullValue:
+    pushValue("null");
+    break;
+  case intValue:
+    pushValue(valueToString(value.asLargestInt()));
+    break;
+  case uintValue:
+    pushValue(valueToString(value.asLargestUInt()));
+    break;
+  case realValue:
+    pushValue(valueToString(value.asDouble()));
+    break;
+  case stringValue: {
+    // Is NULL possible for value.string_? No.
+    char const* str;
+    char const* end;
+    bool ok = value.getString(&str, &end);
+    if (ok)
+      pushValue(valueToQuotedStringN(str, static_cast<size_t>(end - str)));
     else
-    {
-        bool isArrayMultiLine = isMultineArray(value);
-        if (isArrayMultiLine)
-        {
-            writeWithIndent("[");
-            indent();
-            bool hasChildValue = !childValues_.empty();
-            unsigned index = 0;
-            while (true)
-            {
-                const Value& childValue = value[index];
-                writeCommentBeforeValue(childValue);
-                if (hasChildValue)
-                    writeWithIndent(childValues_[index]);
-                else
-                {
-                    writeIndent();
-                    writeValue(childValue);
-                }
-                if (++index == size)
-                {
-                    writeCommentAfterValueOnSameLine(childValue);
-                    break;
-                }
-                document_ += ",";
-                writeCommentAfterValueOnSameLine(childValue);
-            }
-            unindent();
-            writeWithIndent("]");
-        }
-        else // output on a single line
-        {
-            assert(childValues_.size() == size);
-            document_ += "[ ";
-            for (unsigned index = 0; index < size; ++index)
-            {
-                if (index > 0)
-                    document_ += ", ";
-                document_ += childValues_[index];
-            }
-            document_ += " ]";
+      pushValue("");
+    break;
+  }
+  case booleanValue:
+    pushValue(valueToString(value.asBool()));
+    break;
+  case arrayValue:
+    writeArrayValue(value);
+    break;
+  case objectValue: {
+    Value::Members members(value.getMemberNames());
+    if (members.empty())
+      pushValue("{}");
+    else {
+      writeWithIndent("{");
+      indent();
+      auto it = members.begin();
+      for (;;) {
+        const String& name = *it;
+        const Value& childValue = value[name];
+        writeCommentBeforeValue(childValue);
+        writeWithIndent(valueToQuotedString(name.c_str()));
+        document_ += " : ";
+        writeValue(childValue);
+        if (++it == members.end()) {
+          writeCommentAfterValueOnSameLine(childValue);
+          break;
         }
+        document_ += ',';
+        writeCommentAfterValueOnSameLine(childValue);
+      }
+      unindent();
+      writeWithIndent("}");
     }
+  } break;
+  }
 }
 
-bool StyledWriter::isMultineArray(const Value& value)
-{
-    int size = value.size();
-    bool isMultiLine = size * 3 >= rightMargin_;
-    childValues_.clear();
-    for (int index = 0; index < size && !isMultiLine; ++index)
-    {
+void StyledWriter::writeArrayValue(const Value& value) {
+  size_t size = value.size();
+  if (size == 0)
+    pushValue("[]");
+  else {
+    bool isArrayMultiLine = isMultilineArray(value);
+    if (isArrayMultiLine) {
+      writeWithIndent("[");
+      indent();
+      bool hasChildValue = !childValues_.empty();
+      ArrayIndex index = 0;
+      for (;;) {
         const Value& childValue = value[index];
-        isMultiLine = isMultiLine || ((childValue.isArray() || childValue.isObject()) && childValue.size() > 0);
-    }
-    if (!isMultiLine) // check if line length > max line length
-    {
-        childValues_.reserve(size);
-        addChildValues_ = true;
-        int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
-        for (int index = 0; index < size && !isMultiLine; ++index)
-        {
-            writeValue(value[index]);
-            lineLength += int(childValues_[index].length());
-            isMultiLine = isMultiLine && hasCommentForValue(value[index]);
+        writeCommentBeforeValue(childValue);
+        if (hasChildValue)
+          writeWithIndent(childValues_[index]);
+        else {
+          writeIndent();
+          writeValue(childValue);
         }
-        addChildValues_ = false;
-        isMultiLine = isMultiLine || lineLength >= rightMargin_;
+        if (++index == size) {
+          writeCommentAfterValueOnSameLine(childValue);
+          break;
+        }
+        document_ += ',';
+        writeCommentAfterValueOnSameLine(childValue);
+      }
+      unindent();
+      writeWithIndent("]");
+    } else // output on a single line
+    {
+      assert(childValues_.size() == size);
+      document_ += "[ ";
+      for (size_t index = 0; index < size; ++index) {
+        if (index > 0)
+          document_ += ", ";
+        document_ += childValues_[index];
+      }
+      document_ += " ]";
     }
-    return isMultiLine;
-}
-
-void StyledWriter::pushValue(const std::string& value)
-{
-    if (addChildValues_)
-        childValues_.push_back(value);
-    else
-        document_ += value;
+  }
 }
 
-void StyledWriter::writeIndent()
-{
-    if (!document_.empty())
-    {
-        char last = document_[document_.length() - 1];
-        if (last == ' ') // already indented
-            return;
-        if (last != '\n') // Comments may add new-line
-            document_ += '\n';
+bool StyledWriter::isMultilineArray(const Value& value) {
+  ArrayIndex const size = value.size();
+  bool isMultiLine = size * 3 >= rightMargin_;
+  childValues_.clear();
+  for (ArrayIndex index = 0; index < size && !isMultiLine; ++index) {
+    const Value& childValue = value[index];
+    isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
+                   !childValue.empty());
+  }
+  if (!isMultiLine) // check if line length > max line length
+  {
+    childValues_.reserve(size);
+    addChildValues_ = true;
+    ArrayIndex lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
+    for (ArrayIndex index = 0; index < size; ++index) {
+      if (hasCommentForValue(value[index])) {
+        isMultiLine = true;
+      }
+      writeValue(value[index]);
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
-    document_ += indentString_;
+    addChildValues_ = false;
+    isMultiLine = isMultiLine || lineLength >= rightMargin_;
+  }
+  return isMultiLine;
 }
 
-void StyledWriter::writeWithIndent(const std::string& value)
-{
-    writeIndent();
+void StyledWriter::pushValue(const String& value) {
+  if (addChildValues_)
+    childValues_.push_back(value);
+  else
     document_ += value;
 }
 
-void StyledWriter::indent()
-{
-    indentString_ += std::string(indentSize_, ' ');
+void StyledWriter::writeIndent() {
+  if (!document_.empty()) {
+    char last = document_[document_.length() - 1];
+    if (last == ' ') // already indented
+      return;
+    if (last != '\n') // Comments may add new-line
+      document_ += '\n';
+  }
+  document_ += indentString_;
 }
 
-void StyledWriter::unindent()
-{
-    assert(int(indentString_.size()) >= indentSize_);
-    indentString_.resize(indentString_.size() - indentSize_);
+void StyledWriter::writeWithIndent(const String& value) {
+  writeIndent();
+  document_ += value;
 }
 
-void StyledWriter::writeCommentBeforeValue(const Value& root)
-{
-    if (!root.hasComment(commentBefore))
-        return;
-    document_ += normalizeEOL(root.getComment(commentBefore));
-    document_ += "\n";
+void StyledWriter::indent() { indentString_ += String(indentSize_, ' '); }
+
+void StyledWriter::unindent() {
+  assert(indentString_.size() >= indentSize_);
+  indentString_.resize(indentString_.size() - indentSize_);
 }
 
-void StyledWriter::writeCommentAfterValueOnSameLine(const Value& root)
-{
-    if (root.hasComment(commentAfterOnSameLine))
-        document_ += " " + normalizeEOL(root.getComment(commentAfterOnSameLine));
+void StyledWriter::writeCommentBeforeValue(const Value& root) {
+  if (!root.hasComment(commentBefore))
+    return;
 
-    if (root.hasComment(commentAfter))
-    {
-        document_ += "\n";
-        document_ += normalizeEOL(root.getComment(commentAfter));
-        document_ += "\n";
-    }
+  document_ += '\n';
+  writeIndent();
+  const String& comment = root.getComment(commentBefore);
+  String::const_iterator iter = comment.begin();
+  while (iter != comment.end()) {
+    document_ += *iter;
+    if (*iter == '\n' && ((iter + 1) != comment.end() && *(iter + 1) == '/'))
+      writeIndent();
+    ++iter;
+  }
+
+  // Comments are stripped of trailing newlines, so add one here
+  document_ += '\n';
 }
 
-bool StyledWriter::hasCommentForValue(const Value& value)
-{
-    return value.hasComment(commentBefore) || value.hasComment(commentAfterOnSameLine) ||
-           value.hasComment(commentAfter);
+void StyledWriter::writeCommentAfterValueOnSameLine(const Value& root) {
+  if (root.hasComment(commentAfterOnSameLine))
+    document_ += " " + root.getComment(commentAfterOnSameLine);
+
+  if (root.hasComment(commentAfter)) {
+    document_ += '\n';
+    document_ += root.getComment(commentAfter);
+    document_ += '\n';
+  }
 }
 
-std::string StyledWriter::normalizeEOL(const std::string& text)
-{
-    std::string normalized;
-    normalized.reserve(text.length());
-    const char* begin = text.c_str();
-    const char* end = begin + text.length();
-    const char* current = begin;
-    while (current != end)
-    {
-        char c = *current++;
-        if (c == '\r') // mac or dos EOL
-        {
-            if (*current == '\n') // convert dos EOL
-                ++current;
-            normalized += '\n';
-        }
-        else // handle unix EOL & other char
-            normalized += c;
-    }
-    return normalized;
+bool StyledWriter::hasCommentForValue(const Value& value) {
+  return value.hasComment(commentBefore) ||
+         value.hasComment(commentAfterOnSameLine) ||
+         value.hasComment(commentAfter);
 }
 
 // Class StyledStreamWriter
 // //////////////////////////////////////////////////////////////////
 
-StyledStreamWriter::StyledStreamWriter(std::string indentation) :
-    document_(NULL), rightMargin_(74), indentation_(indentation)
-{
+StyledStreamWriter::StyledStreamWriter(String indentation)
+    : document_(nullptr), indentation_(std::move(indentation)),
+      addChildValues_(), indented_(false) {}
+
+void StyledStreamWriter::write(OStream& out, const Value& root) {
+  document_ = &out;
+  addChildValues_ = false;
+  indentString_.clear();
+  indented_ = true;
+  writeCommentBeforeValue(root);
+  if (!indented_)
+    writeIndent();
+  indented_ = true;
+  writeValue(root);
+  writeCommentAfterValueOnSameLine(root);
+  *document_ << "\n";
+  document_ = nullptr; // Forget the stream, for safety.
 }
 
-void StyledStreamWriter::write(std::ostream& out, const Value& root, bool noNewLine)
-{
-    document_ = &out;
-    addChildValues_ = false;
-    indentString_ = "";
-    writeCommentBeforeValue(root);
-    writeValue(root);
-    writeCommentAfterValueOnSameLine(root);
-    if (!noNewLine)
-    {
-        *document_ << "\n";
+void StyledStreamWriter::writeValue(const Value& value) {
+  switch (value.type()) {
+  case nullValue:
+    pushValue("null");
+    break;
+  case intValue:
+    pushValue(valueToString(value.asLargestInt()));
+    break;
+  case uintValue:
+    pushValue(valueToString(value.asLargestUInt()));
+    break;
+  case realValue:
+    pushValue(valueToString(value.asDouble()));
+    break;
+  case stringValue: {
+    // Is NULL possible for value.string_? No.
+    char const* str;
+    char const* end;
+    bool ok = value.getString(&str, &end);
+    if (ok)
+      pushValue(valueToQuotedStringN(str, static_cast<size_t>(end - str)));
+    else
+      pushValue("");
+    break;
+  }
+  case booleanValue:
+    pushValue(valueToString(value.asBool()));
+    break;
+  case arrayValue:
+    writeArrayValue(value);
+    break;
+  case objectValue: {
+    Value::Members members(value.getMemberNames());
+    if (members.empty())
+      pushValue("{}");
+    else {
+      writeWithIndent("{");
+      indent();
+      auto it = members.begin();
+      for (;;) {
+        const String& name = *it;
+        const Value& childValue = value[name];
+        writeCommentBeforeValue(childValue);
+        writeWithIndent(valueToQuotedString(name.c_str()));
+        *document_ << " : ";
+        writeValue(childValue);
+        if (++it == members.end()) {
+          writeCommentAfterValueOnSameLine(childValue);
+          break;
+        }
+        *document_ << ",";
+        writeCommentAfterValueOnSameLine(childValue);
+      }
+      unindent();
+      writeWithIndent("}");
     }
-    document_ = NULL; // Forget the stream, for safety.
+  } break;
+  }
 }
 
-void StyledStreamWriter::writeValue(const Value& value)
-{
-    switch (value.type())
-    {
-        case nullValue:
-            pushValue("null");
-            break;
-        case intValue:
-            pushValue(valueToString(value.asInt()));
-            break;
-        case uintValue:
-            pushValue(valueToString(value.asUInt()));
-            break;
-        case realValue:
-            pushValue(valueToString(value.asDouble()));
-            break;
-        case stringValue:
-            pushValue(valueToQuotedString(value.asCString()));
-            break;
-        case booleanValue:
-            pushValue(valueToString(value.asBool()));
-            break;
-        case arrayValue:
-            writeArrayValue(value);
-            break;
-        case objectValue:
-        {
-            Value::Members members(value.getMemberNames());
-            if (members.empty())
-                pushValue("{}");
-            else
-            {
-                writeWithIndent("{");
-                indent();
-                Value::Members::iterator it = members.begin();
-                while (true)
-                {
-                    const std::string& name = *it;
-                    const Value& childValue = value[name];
-                    writeCommentBeforeValue(childValue);
-                    writeWithIndent(valueToQuotedString(name.c_str()));
-                    *document_ << " : ";
-                    writeValue(childValue);
-                    if (++it == members.end())
-                    {
-                        writeCommentAfterValueOnSameLine(childValue);
-                        break;
-                    }
-                    *document_ << ",";
-                    writeCommentAfterValueOnSameLine(childValue);
-                }
-                unindent();
-                writeWithIndent("}");
-            }
+void StyledStreamWriter::writeArrayValue(const Value& value) {
+  unsigned size = value.size();
+  if (size == 0)
+    pushValue("[]");
+  else {
+    bool isArrayMultiLine = isMultilineArray(value);
+    if (isArrayMultiLine) {
+      writeWithIndent("[");
+      indent();
+      bool hasChildValue = !childValues_.empty();
+      unsigned index = 0;
+      for (;;) {
+        const Value& childValue = value[index];
+        writeCommentBeforeValue(childValue);
+        if (hasChildValue)
+          writeWithIndent(childValues_[index]);
+        else {
+          if (!indented_)
+            writeIndent();
+          indented_ = true;
+          writeValue(childValue);
+          indented_ = false;
         }
-        break;
+        if (++index == size) {
+          writeCommentAfterValueOnSameLine(childValue);
+          break;
+        }
+        *document_ << ",";
+        writeCommentAfterValueOnSameLine(childValue);
+      }
+      unindent();
+      writeWithIndent("]");
+    } else // output on a single line
+    {
+      assert(childValues_.size() == size);
+      *document_ << "[ ";
+      for (unsigned index = 0; index < size; ++index) {
+        if (index > 0)
+          *document_ << ", ";
+        *document_ << childValues_[index];
+      }
+      *document_ << " ]";
+    }
+  }
+}
+
+bool StyledStreamWriter::isMultilineArray(const Value& value) {
+  ArrayIndex const size = value.size();
+  bool isMultiLine = size * 3 >= rightMargin_;
+  childValues_.clear();
+  for (ArrayIndex index = 0; index < size && !isMultiLine; ++index) {
+    const Value& childValue = value[index];
+    isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
+                   !childValue.empty());
+  }
+  if (!isMultiLine) // check if line length > max line length
+  {
+    childValues_.reserve(size);
+    addChildValues_ = true;
+    ArrayIndex lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
+    for (ArrayIndex index = 0; index < size; ++index) {
+      if (hasCommentForValue(value[index])) {
+        isMultiLine = true;
+      }
+      writeValue(value[index]);
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
+    addChildValues_ = false;
+    isMultiLine = isMultiLine || lineLength >= rightMargin_;
+  }
+  return isMultiLine;
+}
+
+void StyledStreamWriter::pushValue(const String& value) {
+  if (addChildValues_)
+    childValues_.push_back(value);
+  else
+    *document_ << value;
 }
 
-void StyledStreamWriter::writeArrayValue(const Value& value)
-{
-    unsigned size = value.size();
-    if (size == 0)
-        pushValue("[]");
+void StyledStreamWriter::writeIndent() {
+  // blep intended this to look at the so-far-written string
+  // to determine whether we are already indented, but
+  // with a stream we cannot do that. So we rely on some saved state.
+  // The caller checks indented_.
+  *document_ << '\n' << indentString_;
+}
+
+void StyledStreamWriter::writeWithIndent(const String& value) {
+  if (!indented_)
+    writeIndent();
+  *document_ << value;
+  indented_ = false;
+}
+
+void StyledStreamWriter::indent() { indentString_ += indentation_; }
+
+void StyledStreamWriter::unindent() {
+  assert(indentString_.size() >= indentation_.size());
+  indentString_.resize(indentString_.size() - indentation_.size());
+}
+
+void StyledStreamWriter::writeCommentBeforeValue(const Value& root) {
+  if (!root.hasComment(commentBefore))
+    return;
+
+  if (!indented_)
+    writeIndent();
+  const String& comment = root.getComment(commentBefore);
+  String::const_iterator iter = comment.begin();
+  while (iter != comment.end()) {
+    *document_ << *iter;
+    if (*iter == '\n' && ((iter + 1) != comment.end() && *(iter + 1) == '/'))
+      // writeIndent();  // would include newline
+      *document_ << indentString_;
+    ++iter;
+  }
+  indented_ = false;
+}
+
+void StyledStreamWriter::writeCommentAfterValueOnSameLine(const Value& root) {
+  if (root.hasComment(commentAfterOnSameLine))
+    *document_ << ' ' << root.getComment(commentAfterOnSameLine);
+
+  if (root.hasComment(commentAfter)) {
+    writeIndent();
+    *document_ << root.getComment(commentAfter);
+  }
+  indented_ = false;
+}
+
+bool StyledStreamWriter::hasCommentForValue(const Value& value) {
+  return value.hasComment(commentBefore) ||
+         value.hasComment(commentAfterOnSameLine) ||
+         value.hasComment(commentAfter);
+}
+
+//////////////////////////
+// BuiltStyledStreamWriter
+
+/// Scoped enums are not available until C++11.
+struct CommentStyle {
+  /// Decide whether to write comments.
+  enum Enum {
+    None, ///< Drop all comments.
+    Most, ///< Recover odd behavior of previous versions (not implemented yet).
+    All   ///< Keep all comments.
+  };
+};
+
+struct BuiltStyledStreamWriter : public StreamWriter {
+  BuiltStyledStreamWriter(String indentation, CommentStyle::Enum cs,
+                          String colonSymbol, String nullSymbol,
+                          String endingLineFeedSymbol, bool useSpecialFloats,
+                          bool emitUTF8, unsigned int precision,
+                          PrecisionType precisionType);
+  int write(Value const& root, OStream* sout) override;
+
+private:
+  void writeValue(Value const& value);
+  void writeArrayValue(Value const& value);
+  bool isMultilineArray(Value const& value);
+  void pushValue(String const& value);
+  void writeIndent();
+  void writeWithIndent(String const& value);
+  void indent();
+  void unindent();
+  void writeCommentBeforeValue(Value const& root);
+  void writeCommentAfterValueOnSameLine(Value const& root);
+  static bool hasCommentForValue(const Value& value);
+
+  using ChildValues = std::vector<String>;
+
+  ChildValues childValues_;
+  String indentString_;
+  unsigned int rightMargin_;
+  String indentation_;
+  CommentStyle::Enum cs_;
+  String colonSymbol_;
+  String nullSymbol_;
+  String endingLineFeedSymbol_;
+  bool addChildValues_ : 1;
+  bool indented_ : 1;
+  bool useSpecialFloats_ : 1;
+  bool emitUTF8_ : 1;
+  unsigned int precision_;
+  PrecisionType precisionType_;
+};
+BuiltStyledStreamWriter::BuiltStyledStreamWriter(
+    String indentation, CommentStyle::Enum cs, String colonSymbol,
+    String nullSymbol, String endingLineFeedSymbol, bool useSpecialFloats,
+    bool emitUTF8, unsigned int precision, PrecisionType precisionType)
+    : rightMargin_(74), indentation_(std::move(indentation)), cs_(cs),
+      colonSymbol_(std::move(colonSymbol)), nullSymbol_(std::move(nullSymbol)),
+      endingLineFeedSymbol_(std::move(endingLineFeedSymbol)),
+      addChildValues_(false), indented_(false),
+      useSpecialFloats_(useSpecialFloats), emitUTF8_(emitUTF8),
+      precision_(precision), precisionType_(precisionType) {}
+int BuiltStyledStreamWriter::write(Value const& root, OStream* sout) {
+  sout_ = sout;
+  addChildValues_ = false;
+  indented_ = true;
+  indentString_.clear();
+  writeCommentBeforeValue(root);
+  if (!indented_)
+    writeIndent();
+  indented_ = true;
+  writeValue(root);
+  writeCommentAfterValueOnSameLine(root);
+  *sout_ << endingLineFeedSymbol_;
+  sout_ = nullptr;
+  return 0;
+}
+void BuiltStyledStreamWriter::writeValue(Value const& value) {
+  switch (value.type()) {
+  case nullValue:
+    pushValue(nullSymbol_);
+    break;
+  case intValue:
+    pushValue(valueToString(value.asLargestInt()));
+    break;
+  case uintValue:
+    pushValue(valueToString(value.asLargestUInt()));
+    break;
+  case realValue:
+    pushValue(valueToString(value.asDouble(), useSpecialFloats_, precision_,
+                            precisionType_));
+    break;
+  case stringValue: {
+    // Is NULL is possible for value.string_? No.
+    char const* str;
+    char const* end;
+    bool ok = value.getString(&str, &end);
+    if (ok)
+      pushValue(
+          valueToQuotedStringN(str, static_cast<size_t>(end - str), emitUTF8_));
     else
-    {
-        bool isArrayMultiLine = isMultineArray(value);
-        if (isArrayMultiLine)
-        {
-            writeWithIndent("[");
-            indent();
-            bool hasChildValue = !childValues_.empty();
-            unsigned index = 0;
-            while (true)
-            {
-                const Value& childValue = value[index];
-                writeCommentBeforeValue(childValue);
-                if (hasChildValue)
-                    writeWithIndent(childValues_[index]);
-                else
-                {
-                    writeIndent();
-                    writeValue(childValue);
-                }
-                if (++index == size)
-                {
-                    writeCommentAfterValueOnSameLine(childValue);
-                    break;
-                }
-                *document_ << ",";
-                writeCommentAfterValueOnSameLine(childValue);
-            }
-            unindent();
-            writeWithIndent("]");
-        }
-        else // output on a single line
-        {
-            assert(childValues_.size() == size);
-            *document_ << "[ ";
-            for (unsigned index = 0; index < size; ++index)
-            {
-                if (index > 0)
-                    *document_ << ", ";
-                *document_ << childValues_[index];
-            }
-            *document_ << " ]";
+      pushValue("");
+    break;
+  }
+  case booleanValue:
+    pushValue(valueToString(value.asBool()));
+    break;
+  case arrayValue:
+    writeArrayValue(value);
+    break;
+  case objectValue: {
+    Value::Members members(value.getMemberNames());
+    if (members.empty())
+      pushValue("{}");
+    else {
+      writeWithIndent("{");
+      indent();
+      auto it = members.begin();
+      for (;;) {
+        String const& name = *it;
+        Value const& childValue = value[name];
+        writeCommentBeforeValue(childValue);
+        writeWithIndent(
+            valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
+        *sout_ << colonSymbol_;
+        writeValue(childValue);
+        if (++it == members.end()) {
+          writeCommentAfterValueOnSameLine(childValue);
+          break;
         }
+        *sout_ << ",";
+        writeCommentAfterValueOnSameLine(childValue);
+      }
+      unindent();
+      writeWithIndent("}");
     }
+  } break;
+  }
 }
 
-bool StyledStreamWriter::isMultineArray(const Value& value)
-{
-    int size = value.size();
-    bool isMultiLine = size * 3 >= rightMargin_;
-    childValues_.clear();
-    for (int index = 0; index < size && !isMultiLine; ++index)
+void BuiltStyledStreamWriter::writeArrayValue(Value const& value) {
+  unsigned size = value.size();
+  if (size == 0)
+    pushValue("[]");
+  else {
+    bool isMultiLine = (cs_ == CommentStyle::All) || isMultilineArray(value);
+    if (isMultiLine) {
+      writeWithIndent("[");
+      indent();
+      bool hasChildValue = !childValues_.empty();
+      unsigned index = 0;
+      for (;;) {
+        Value const& childValue = value[index];
+        writeCommentBeforeValue(childValue);
+        if (hasChildValue)
+          writeWithIndent(childValues_[index]);
+        else {
+          if (!indented_)
+            writeIndent();
+          indented_ = true;
+          writeValue(childValue);
+          indented_ = false;
+        }
+        if (++index == size) {
+          writeCommentAfterValueOnSameLine(childValue);
+          break;
+        }
+        *sout_ << ",";
+        writeCommentAfterValueOnSameLine(childValue);
+      }
+      unindent();
+      writeWithIndent("]");
+    } else // output on a single line
     {
-        const Value& childValue = value[index];
-        isMultiLine = isMultiLine || ((childValue.isArray() || childValue.isObject()) && childValue.size() > 0);
+      assert(childValues_.size() == size);
+      *sout_ << "[";
+      if (!indentation_.empty())
+        *sout_ << " ";
+      for (unsigned index = 0; index < size; ++index) {
+        if (index > 0)
+          *sout_ << ((!indentation_.empty()) ? ", " : ",");
+        *sout_ << childValues_[index];
+      }
+      if (!indentation_.empty())
+        *sout_ << " ";
+      *sout_ << "]";
     }
-    if (!isMultiLine) // check if line length > max line length
-    {
-        childValues_.reserve(size);
-        addChildValues_ = true;
-        int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
-        for (int index = 0; index < size && !isMultiLine; ++index)
-        {
-            writeValue(value[index]);
-            lineLength += int(childValues_[index].length());
-            isMultiLine = isMultiLine && hasCommentForValue(value[index]);
-        }
-        addChildValues_ = false;
-        isMultiLine = isMultiLine || lineLength >= rightMargin_;
+  }
+}
+
+bool BuiltStyledStreamWriter::isMultilineArray(Value const& value) {
+  ArrayIndex const size = value.size();
+  bool isMultiLine = size * 3 >= rightMargin_;
+  childValues_.clear();
+  for (ArrayIndex index = 0; index < size && !isMultiLine; ++index) {
+    Value const& childValue = value[index];
+    isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
+                   !childValue.empty());
+  }
+  if (!isMultiLine) // check if line length > max line length
+  {
+    childValues_.reserve(size);
+    addChildValues_ = true;
+    ArrayIndex lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
+    for (ArrayIndex index = 0; index < size; ++index) {
+      if (hasCommentForValue(value[index])) {
+        isMultiLine = true;
+      }
+      writeValue(value[index]);
+      lineLength += static_cast<ArrayIndex>(childValues_[index].length());
     }
-    return isMultiLine;
+    addChildValues_ = false;
+    isMultiLine = isMultiLine || lineLength >= rightMargin_;
+  }
+  return isMultiLine;
 }
 
-void StyledStreamWriter::pushValue(const std::string& value)
-{
-    if (addChildValues_)
-        childValues_.push_back(value);
-    else
-        *document_ << value;
+void BuiltStyledStreamWriter::pushValue(String const& value) {
+  if (addChildValues_)
+    childValues_.push_back(value);
+  else
+    *sout_ << value;
 }
 
-void StyledStreamWriter::writeIndent()
-{
-    /*
-      Some comments in this method would have been nice. ;-)
+void BuiltStyledStreamWriter::writeIndent() {
+  // blep intended this to look at the so-far-written string
+  // to determine whether we are already indented, but
+  // with a stream we cannot do that. So we rely on some saved state.
+  // The caller checks indented_.
 
-     if ( !document_.empty() )
-     {
-        char last = document_[document_.length()-1];
-        if ( last == ' ' )     // already indented
-           return;
-        if ( last != '\n' )    // Comments may add new-line
-           *document_ << '\n';
-     }
-    */
-    *document_ << '\n' << indentString_;
+  if (!indentation_.empty()) {
+    // In this case, drop newlines too.
+    *sout_ << '\n' << indentString_;
+  }
 }
 
-void StyledStreamWriter::writeWithIndent(const std::string& value)
-{
+void BuiltStyledStreamWriter::writeWithIndent(String const& value) {
+  if (!indented_)
     writeIndent();
-    *document_ << value;
+  *sout_ << value;
+  indented_ = false;
 }
 
-void StyledStreamWriter::indent()
-{
-    indentString_ += indentation_;
+void BuiltStyledStreamWriter::indent() { indentString_ += indentation_; }
+
+void BuiltStyledStreamWriter::unindent() {
+  assert(indentString_.size() >= indentation_.size());
+  indentString_.resize(indentString_.size() - indentation_.size());
 }
 
-void StyledStreamWriter::unindent()
-{
-    assert(indentString_.size() >= indentation_.size());
-    indentString_.resize(indentString_.size() - indentation_.size());
+void BuiltStyledStreamWriter::writeCommentBeforeValue(Value const& root) {
+  if (cs_ == CommentStyle::None)
+    return;
+  if (!root.hasComment(commentBefore))
+    return;
+
+  if (!indented_)
+    writeIndent();
+  const String& comment = root.getComment(commentBefore);
+  String::const_iterator iter = comment.begin();
+  while (iter != comment.end()) {
+    *sout_ << *iter;
+    if (*iter == '\n' && ((iter + 1) != comment.end() && *(iter + 1) == '/'))
+      // writeIndent();  // would write extra newline
+      *sout_ << indentString_;
+    ++iter;
+  }
+  indented_ = false;
 }
 
-void StyledStreamWriter::writeCommentBeforeValue(const Value& root)
-{
-    if (!root.hasComment(commentBefore))
-        return;
-    *document_ << normalizeEOL(root.getComment(commentBefore));
-    *document_ << "\n";
+void BuiltStyledStreamWriter::writeCommentAfterValueOnSameLine(
+    Value const& root) {
+  if (cs_ == CommentStyle::None)
+    return;
+  if (root.hasComment(commentAfterOnSameLine))
+    *sout_ << " " + root.getComment(commentAfterOnSameLine);
+
+  if (root.hasComment(commentAfter)) {
+    writeIndent();
+    *sout_ << root.getComment(commentAfter);
+  }
 }
 
-void StyledStreamWriter::writeCommentAfterValueOnSameLine(const Value& root)
-{
-    if (root.hasComment(commentAfterOnSameLine))
-        *document_ << " " + normalizeEOL(root.getComment(commentAfterOnSameLine));
+// static
+bool BuiltStyledStreamWriter::hasCommentForValue(const Value& value) {
+  return value.hasComment(commentBefore) ||
+         value.hasComment(commentAfterOnSameLine) ||
+         value.hasComment(commentAfter);
+}
 
-    if (root.hasComment(commentAfter))
-    {
-        *document_ << "\n";
-        *document_ << normalizeEOL(root.getComment(commentAfter));
-        *document_ << "\n";
-    }
+///////////////
+// StreamWriter
+
+StreamWriter::StreamWriter() : sout_(nullptr) {}
+StreamWriter::~StreamWriter() = default;
+StreamWriter::Factory::~Factory() = default;
+StreamWriterBuilder::StreamWriterBuilder() { setDefaults(&settings_); }
+StreamWriterBuilder::~StreamWriterBuilder() = default;
+StreamWriter* StreamWriterBuilder::newStreamWriter() const {
+  const String indentation = settings_["indentation"].asString();
+  const String cs_str = settings_["commentStyle"].asString();
+  const String pt_str = settings_["precisionType"].asString();
+  const bool eyc = settings_["enableYAMLCompatibility"].asBool();
+  const bool dnp = settings_["dropNullPlaceholders"].asBool();
+  const bool usf = settings_["useSpecialFloats"].asBool();
+  const bool emitUTF8 = settings_["emitUTF8"].asBool();
+  unsigned int pre = settings_["precision"].asUInt();
+  CommentStyle::Enum cs = CommentStyle::All;
+  if (cs_str == "All") {
+    cs = CommentStyle::All;
+  } else if (cs_str == "None") {
+    cs = CommentStyle::None;
+  } else {
+    throwRuntimeError("commentStyle must be 'All' or 'None'");
+  }
+  PrecisionType precisionType(significantDigits);
+  if (pt_str == "significant") {
+    precisionType = PrecisionType::significantDigits;
+  } else if (pt_str == "decimal") {
+    precisionType = PrecisionType::decimalPlaces;
+  } else {
+    throwRuntimeError("precisionType must be 'significant' or 'decimal'");
+  }
+  String colonSymbol = " : ";
+  if (eyc) {
+    colonSymbol = ": ";
+  } else if (indentation.empty()) {
+    colonSymbol = ":";
+  }
+  String nullSymbol = "null";
+  if (dnp) {
+    nullSymbol.clear();
+  }
+  if (pre > 17)
+    pre = 17;
+  String endingLineFeedSymbol;
+  return new BuiltStyledStreamWriter(indentation, cs, colonSymbol, nullSymbol,
+                                     endingLineFeedSymbol, usf, emitUTF8, pre,
+                                     precisionType);
 }
 
-bool StyledStreamWriter::hasCommentForValue(const Value& value)
-{
-    return value.hasComment(commentBefore) || value.hasComment(commentAfterOnSameLine) ||
-           value.hasComment(commentAfter);
+bool StreamWriterBuilder::validate(Json::Value* invalid) const {
+  static const auto& valid_keys = *new std::set<String>{
+      "indentation",
+      "commentStyle",
+      "enableYAMLCompatibility",
+      "dropNullPlaceholders",
+      "useSpecialFloats",
+      "emitUTF8",
+      "precision",
+      "precisionType",
+  };
+  for (auto si = settings_.begin(); si != settings_.end(); ++si) {
+    auto key = si.name();
+    if (valid_keys.count(key))
+      continue;
+    if (invalid)
+      (*invalid)[key] = *si;
+    else
+      return false;
+  }
+  return invalid ? invalid->empty() : true;
 }
 
-std::string StyledStreamWriter::normalizeEOL(const std::string& text)
-{
-    std::string normalized;
-    normalized.reserve(text.length());
-    const char* begin = text.c_str();
-    const char* end = begin + text.length();
-    const char* current = begin;
-    while (current != end)
-    {
-        char c = *current++;
-        if (c == '\r') // mac or dos EOL
-        {
-            if (*current == '\n') // convert dos EOL
-                ++current;
-            normalized += '\n';
-        }
-        else // handle unix EOL & other char
-            normalized += c;
-    }
-    return normalized;
+Value& StreamWriterBuilder::operator[](const String& key) {
+  return settings_[key];
+}
+// static
+void StreamWriterBuilder::setDefaults(Json::Value* settings) {
+  //! [StreamWriterBuilderDefaults]
+  (*settings)["commentStyle"] = "All";
+  (*settings)["indentation"] = "\t";
+  (*settings)["enableYAMLCompatibility"] = false;
+  (*settings)["dropNullPlaceholders"] = false;
+  (*settings)["useSpecialFloats"] = false;
+  (*settings)["emitUTF8"] = false;
+  (*settings)["precision"] = 17;
+  (*settings)["precisionType"] = "significant";
+  //! [StreamWriterBuilderDefaults]
+}
+
+String writeString(StreamWriter::Factory const& factory, Value const& root) {
+  OStringStream sout;
+  StreamWriterPtr const writer(factory.newStreamWriter());
+  writer->write(root, &sout);
+  return sout.str();
 }
 
-std::ostream& operator<<(std::ostream& sout, const Value& root)
-{
-    Json::StyledStreamWriter writer;
-    writer.write(sout, root);
-    return sout;
+OStream& operator<<(OStream& sout, Value const& root) {
+  StreamWriterBuilder builder;
+  StreamWriterPtr const writer(builder.newStreamWriter());
+  writer->write(root, &sout);
+  return sout;
 }
 
 } // namespace Json

From 8e08c36df1c29085ee290f4d2edec08fdfd83d57 Mon Sep 17 00:00:00 2001
From: Oded Burstein <oburstein@nvidia.com>
Date: Tue, 12 Jul 2022 17:10:31 +0300
Subject: [PATCH 28/46] deprecation of legacy devices

Description:
CX
CX-2
SwitchX
BridgeX
Infiniscale
Infinihost
---
 dev_mgt/tools_dev_types.c       | 46 +++++----------------------------
 dev_mgt/tools_dev_types.h       | 17 ------------
 flint/subcommands.cpp           |  9 +------
 fw_comps_mgr/fw_comps_mgr.cpp   |  2 +-
 mflash/mflash.c                 | 38 +++++----------------------
 mflash/mflash_dev_capability.c  |  9 -------
 mflash/mflash_pack_layer.h      |  2 --
 mlxfwops/lib/flint_io.cpp       |  2 +-
 mlxfwops/lib/fs2_ops.cpp        |  4 ---
 mlxfwops/lib/fw_ops.cpp         | 22 +---------------
 mlxfwops/lib/mlxfwops_com.h     |  2 --
 mlxfwupdate/mlnx_dev.cpp        |  1 -
 mlxfwupdate/mlxfwmanager.cpp    | 15 ++---------
 mlxreg/mlxreg_lib.cpp           |  3 +--
 mtcr_freebsd/mtcr_ul.c          |  4 ---
 mtcr_ul/mtcr_ul_com.c           |  7 -----
 small_utils/mstfwreset.py       |  2 --
 tools_res_mgmt/tools_res_mgmt.c | 15 -----------
 18 files changed, 21 insertions(+), 179 deletions(-)

diff --git a/dev_mgt/tools_dev_types.c b/dev_mgt/tools_dev_types.c
index 8145ca4d..be163106 100644
--- a/dev_mgt/tools_dev_types.c
+++ b/dev_mgt/tools_dev_types.c
@@ -110,33 +110,6 @@ enum dm_dev_type getCableType(u_int8_t id)
 #endif
 
 static struct device_info g_devs_info[] = {{
-                                             DeviceInfiniScaleIV, // dm_id
-                                             0x01b3,              // hw_dev_id
-                                             -1,                  // hw_rev_id
-                                             -1,                  // sw_dev_id
-                                             "InfiniScaleIV",     // name
-                                             36,                  // port_num
-                                             DM_SWITCH            // dev_type
-                                           },
-                                           {
-                                             DeviceSwitchX, // dm_id
-                                             0x0245,        // hw_dev_id
-                                             -1,            // hw_rev_id
-                                             -1,            // sw_dev_id
-                                             "SwitchX",     // name
-                                             64,            // port_num
-                                             DM_SWITCH      // dev_type
-                                           },
-                                           {
-                                             DeviceConnectX2, // dm_id
-                                             0x190,           // hw_dev_id
-                                             0xb0,            // hw_rev_id
-                                             -1,              // sw_dev_id
-                                             "ConnectX2",     // name
-                                             2,               // port_num
-                                             DM_HCA           // dev_type
-                                           },
-                                           {
                                              DeviceConnectX3, // dm_id
                                              0x1f5,           // hw_dev_id
                                              -1,              // hw_rev_id
@@ -631,17 +604,17 @@ static int dm_get_device_id_inner(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32
         // mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
         if (rc)
         {
-            dword = get_entry(DeviceSwitchX)->hw_dev_id;
+            dword = get_entry(DeviceSwitchIB)->hw_dev_id;
             *ptr_hw_rev = 0;
-            *ptr_hw_dev_id = get_entry(DeviceSwitchX)->hw_dev_id;
+            *ptr_hw_dev_id = get_entry(DeviceSwitchIB)->hw_dev_id;
         }
         else
         {
             dword = mgir.hw_info.hw_dev_id;
             if (dword == 0)
             {
-                dword = get_entry(DeviceSwitchX)->hw_dev_id;
-                *ptr_hw_dev_id = get_entry(DeviceSwitchX)->hw_dev_id;
+                dword = get_entry(DeviceSwitchIB)->hw_dev_id;
+                *ptr_hw_dev_id = get_entry(DeviceSwitchIB)->hw_dev_id;
                 *ptr_hw_rev = mgir.hw_info.device_hw_revision & 0xf;
             }
             else
@@ -838,7 +811,7 @@ int dm_is_livefish_mode(mfile* mf)
     }
     u_int32_t swid = mf->dinfo->pci.dev_id;
     // printf("-D- swid: %#x, devid: %#x\n", swid, devid);
-    if (dm_is_4th_gen(devid_t) || dm_is_switchx(devid_t))
+    if (dm_is_4th_gen(devid_t))
     {
         return (devid == swid - 1);
     }
@@ -852,7 +825,7 @@ int dm_is_livefish_mode(mfile* mf)
 
 int dm_is_4th_gen(dm_dev_id_t type)
 {
-    return (type == DeviceConnectX2 || type == DeviceConnectX3 || type == DeviceConnectX3Pro);
+    return (type == DeviceConnectX3 || type == DeviceConnectX3Pro);
 }
 
 int dm_is_5th_gen_hca(dm_dev_id_t type)
@@ -865,14 +838,9 @@ int dm_is_connectib(dm_dev_id_t type)
     return (type == DeviceConnectIB);
 }
 
-int dm_is_switchx(dm_dev_id_t type)
-{
-    return (type == DeviceSwitchX);
-}
-
 int dm_is_new_gen_switch(dm_dev_id_t type)
 {
-    return (dm_dev_is_switch(type) && !dm_is_switchx(type));
+    return (dm_dev_is_switch(type));
 }
 
 int dm_dev_is_raven_family_switch(dm_dev_id_t type)
diff --git a/dev_mgt/tools_dev_types.h b/dev_mgt/tools_dev_types.h
index 98674504..f2c6bec8 100644
--- a/dev_mgt/tools_dev_types.h
+++ b/dev_mgt/tools_dev_types.h
@@ -58,18 +58,6 @@ extern "C"
         DeviceStartMarker = 0, // Dummy Device - Marker for first device
                                // to let user iterate from DeviceStartMarker to DeviceEndMarker
                                // Note: Call dm_is_device_supported() to see if a device is supported by the lib.
-
-        DeviceInfiniScale = 0,    // UnSupported
-        DeviceInfiniHost,         // UnSupported
-        DeviceInfiniHostIIIEx,    // UnSupported
-        DeviceInfiniHostIIIEx_MF, // UnSupported
-        DeviceInfiniScaleIII,     // UnSupported
-        DeviceInfiniHostIIILx,    // UnSupported
-        DeviceConnectX,           // UnSupported
-        DeviceConnectX2,
-        DeviceInfiniScaleIV,
-        DeviceBridgeX, // UnSupported
-        DeviceSwitchX,
         DeviceConnectX3,
         DeviceConnectIB,
         DeviceConnectX3Pro,
@@ -114,9 +102,6 @@ extern "C"
 
     enum hw_dev_id
     {
-        DeviceInfiniScale_HwId = 0x01b3,
-        DeviceSwitchX_HwId = 0x0245,
-        DeviceConnectX2_HwId = 0x190,
         DeviceConnectX3_HwId = 0x1f5,
         DeviceConnectIB_HwId = 0x1ff,
         DeviceConnectX3Pro_HwId = 0x1f7,
@@ -242,8 +227,6 @@ extern "C"
 
     int dm_is_connectib(dm_dev_id_t type);
 
-    int dm_is_switchx(dm_dev_id_t type);
-
     int dm_is_new_gen_switch(dm_dev_id_t type);
 
     int dm_dev_is_raven_family_switch(dm_dev_id_t type);
diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
index 8e52009a..19e3c087 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
@@ -3793,7 +3793,7 @@ bool QuerySubCommand::displayFs2Uids(const fw_info_t& fwInfo)
                               ethDev);
     // setDevFlags(fwInfo, ibDev, ethDev);
     int numPorts = 2;
-    if ((fwInfo.fw_info.chip_type == CT_IS4 || fwInfo.fw_info.chip_type == CT_SWITCHX))
+    if (fwInfo.fw_info.chip_type == CT_IS4)
     {
         numPorts = 0;
     }
@@ -3837,10 +3837,6 @@ bool QuerySubCommand::displayFs2Uids(const fw_info_t& fwInfo)
             {
                 printf("Description:  %s    Port1            Port2\n", mac_indent);
             }
-            else if (fwInfo.fw_info.chip_type == CT_SWITCHX)
-            {
-                printf("\nDescription:           Base             Switch\n");
-            }
             else
             {
                 printf("\n");
@@ -4784,14 +4780,11 @@ bool SwResetSubCommand::IsDeviceSupported(dm_dev_id_t dev_id)
 {
     switch (dev_id)
     {
-        case DeviceInfiniScaleIV:
-        case DeviceSwitchX:
         case DeviceSwitchIB:
         case DeviceSwitchIB2:
         case DeviceQuantum:
         case DeviceQuantum2:
             return true;
-        case DeviceConnectX2:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
         case DeviceConnectIB:
diff --git a/fw_comps_mgr/fw_comps_mgr.cpp b/fw_comps_mgr/fw_comps_mgr.cpp
index 54c9e84b..f619ee94 100644
--- a/fw_comps_mgr/fw_comps_mgr.cpp
+++ b/fw_comps_mgr/fw_comps_mgr.cpp
@@ -1541,7 +1541,7 @@ u_int32_t FwCompsMgr::getFwSupport()
     /*
      * If 4TH gen nic or switch with no MCAM reg return not supported
      */
-    if (devid == CX2_HW_ID || devid == CX3_HW_ID || devid == CX3_PRO_HW_ID || devid == SWITCHX_HW_ID ||
+    if (devid == CX2_HW_ID || devid == CX3_HW_ID || devid == CX3_PRO_HW_ID ||
         devid == IS4_HW_ID || devid == SWITCH_IB_HW_ID || devid == SWITCH_IB2_HW_ID)
     {
         _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
diff --git a/mflash/mflash.c b/mflash/mflash.c
index 1d07fef7..5b0aea16 100644
--- a/mflash/mflash.c
+++ b/mflash/mflash.c
@@ -1172,7 +1172,7 @@ int spi_update_num_of_banks(mflash* mfl, int prev_num_of_flashes)
     num_of_banks = spi_get_num_of_flashes(prev_num_of_flashes);
     if (num_of_banks == -1)
     {
-        if (IS_SX(mfl->attr.hw_dev_id) || IS_SIB(mfl->attr.hw_dev_id) || IS_SEN(mfl->attr.hw_dev_id) ||
+        if (IS_SIB(mfl->attr.hw_dev_id) || IS_SEN(mfl->attr.hw_dev_id) ||
             IS_SIB2(mfl->attr.hw_dev_id))
         {
             mfl->opts[MFO_NUM_OF_BANKS] = 2;
@@ -1578,24 +1578,8 @@ int connectib_flash_lock(mflash* mfl, int lock_state)
 
 int sx_init_cs_support(mflash* mfl)
 {
-    if (IS_SX(mfl->attr.hw_dev_id))
-    {
-        u_int8_t cs_support_mask = 0;
-        u_int32_t data = 0;
-        if (mfl->opts[MFO_USER_BANKS_NUM] == 0)
-        {
-            // We assume we have only 2 flashes on SX
-            mfl->opts[MFO_NUM_OF_BANKS] = 2;
-        }
-        // Prepare the bit mask of the banks number
-        cs_support_mask = (1 << mfl->opts[MFO_NUM_OF_BANKS]) - 1;
-
-        // Read Modify write the cs support field
-        MREAD4(SX_CS_SUPPORT_ADDR, &data);
-        data = MERGE(data, cs_support_mask, 0, 4);
-        MWRITE4(SX_CS_SUPPORT_ADDR, data);
-    }
-    return 0;
+    (void)mfl;
+    return MFE_NOT_IMPLEMENTED;
 }
 
 #define HW_DEV_ID 0xf0014
@@ -2397,17 +2381,17 @@ int get_dev_info(mflash* mfl)
         // mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
         if (rc)
         {
-            dev_id = SWITCHX_HW_ID;
+            dev_id = SWITCH_IB_HW_ID;
             mfl->attr.rev_id = 0;
-            mfl->attr.hw_dev_id = SWITCHX_HW_ID;
+            mfl->attr.hw_dev_id = SWITCH_IB_HW_ID;
         }
         else
         {
             dev_id = mgir.hw_info.hw_dev_id;
             if (dev_id == 0)
             {
-                dev_id = SWITCHX_HW_ID;
-                mfl->attr.hw_dev_id = SWITCHX_HW_ID;
+                dev_id = SWITCH_IB_HW_ID;
+                mfl->attr.hw_dev_id = SWITCH_IB_HW_ID;
                 mfl->attr.rev_id = mgir.hw_info.device_hw_revision & 0xf;
             }
             else
@@ -2744,10 +2728,6 @@ int mf_open_fw(mflash* mfl, flash_params_t* flash_params, int num_of_banks)
         {
             rc = is4_flash_init(mfl, flash_params);
         }
-        else if (IS_SX(mfl->attr.hw_dev_id))
-        {
-            rc = sx_flash_init(mfl, flash_params);
-        }
         else if (icmdif_supported)
         {
             if (!is7NmSuppported)
@@ -3215,8 +3195,6 @@ int mf_set_reset_flash_on_warm_reboot(mflash* mfl)
     u_int32_t set_reset_bit_dword;
     switch (mfl->dm_dev_id)
     {
-        case DeviceConnectX2:
-        case DeviceSwitchX:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
         case DeviceConnectIB:
@@ -3267,8 +3245,6 @@ int mf_update_boot_addr(mflash* mfl, u_int32_t boot_addr)
 
     switch (mfl->dm_dev_id)
     {
-        case DeviceConnectX2:
-        case DeviceSwitchX:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
         case DeviceConnectIB:
diff --git a/mflash/mflash_dev_capability.c b/mflash/mflash_dev_capability.c
index c3491e45..ec03a4c3 100644
--- a/mflash/mflash_dev_capability.c
+++ b/mflash/mflash_dev_capability.c
@@ -48,9 +48,6 @@ int is_four_byte_address_needed(mflash* mfl, MfError* status)
 
     switch (mfl->dm_dev_id)
     {
-        case DeviceConnectX2:
-        case DeviceInfiniScaleIV:
-        case DeviceSwitchX:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
         case DeviceConnectIB:
@@ -92,11 +89,8 @@ int is_flash_enable_needed(mflash* mfl, MfError* status)
 
     switch (mfl->dm_dev_id)
     {
-        case DeviceConnectX2:
-        case DeviceInfiniScaleIV:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
-        case DeviceSwitchX:
             return 1;
         case DeviceConnectIB:
         case DeviceSwitchIB:
@@ -136,11 +130,8 @@ int is_icmdif_supported(mflash* mfl, MfError* status, int* is7NmSuppported)
 
     switch (mfl->dm_dev_id)
     {
-        case DeviceConnectX2:
-        case DeviceInfiniScaleIV:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
-        case DeviceSwitchX:
         case DeviceSecureHost:
             return 0;
         case DeviceConnectIB:
diff --git a/mflash/mflash_pack_layer.h b/mflash/mflash_pack_layer.h
index d0f7cacd..26357958 100644
--- a/mflash/mflash_pack_layer.h
+++ b/mflash/mflash_pack_layer.h
@@ -83,7 +83,6 @@ typedef void* trm_ctx;
 #endif
 
 #define IS4_HW_ID 0x1b3
-#define SWITCHX_HW_ID 0x245
 #define CONNECTX_HW_ID 0x190
 #define CX3_PRO_HW_ID 0x1F7
 #define CX3_HW_ID 0x1F5
@@ -113,7 +112,6 @@ typedef void* trm_ctx;
 #define IS_CONNECTX_4TH_GEN_FAMILY(dev_id) \
     (((dev_id) == CONNECTX_HW_ID) || ((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID))
 #define IS_IS4_FAMILY(dev_id) (((dev_id) == IS4_HW_ID))
-#define IS_SX(dev_id) ((dev_id) == SWITCHX_HW_ID)
 #define IS_SIB(dev_id) ((dev_id) == SWITCH_IB_HW_ID)
 #define IS_SIB2(dev_id) ((dev_id) == SWITCH_IB2_HW_ID)
 #define IS_SEN(dev_id) ((dev_id) == SPECTRUM_HW_ID)
diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
index 69764280..ecae44fb 100644
--- a/mlxfwops/lib/flint_io.cpp
+++ b/mlxfwops/lib/flint_io.cpp
@@ -421,7 +421,7 @@ bool Flash::open_com_checks(const char* device, int rc, bool force_lock)
         return errmsg("Failed setting no flash verify on device: %s", mf_err2str(rc));
     }
 
-    if (_attr.hw_dev_id == IS4_HW_ID || _attr.hw_dev_id == SWITCHX_HW_ID)
+    if (_attr.hw_dev_id == IS4_HW_ID)
     {
         _port_num = 0;
     }
diff --git a/mlxfwops/lib/fs2_ops.cpp b/mlxfwops/lib/fs2_ops.cpp
index 7c351492..8b0d177b 100644
--- a/mlxfwops/lib/fs2_ops.cpp
+++ b/mlxfwops/lib/fs2_ops.cpp
@@ -933,10 +933,6 @@ bool Fs2Operations::getRunningFwVer()
             fwVerBaseAddr = CX3_FW_VER_CR_ADDR;
             break;
 
-        case CT_SWITCHX:
-            fwVerBaseAddr = SX_FW_VER_CR_ADDR;
-            break;
-
         default:
             return errmsg("Unsupported chip type.");
     }
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index 907f8f84..549cfccc 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
@@ -1357,13 +1357,6 @@ FwOperations::HwDevData FwOperations::getInfoFromChipType(chip_type_t chipT) con
 // TODO:combine both databases(hwDevData and hwDev2Str) and remove old unsupporded devices i.e infinihost
 // infinihost_iii_ex infinihost_iii_lx
 const FwOperations::HwDevData FwOperations::hwDevData[] = {
-  {"ConnectX",
-   CX2_HW_ID,
-   CT_CONNECTX,
-   CFT_HCA,
-   2,
-   {25408, 25418, 26418, 26438, 26428, 25448, 26448, 26468, 25458, 26458, 26478, 26488, 4097, 4098, 0},
-   {{UNKNOWN_BIN, {0}}}},
   {"ConnectX-3",
    CX3_HW_ID,
    CT_CONNECTX,
@@ -1379,8 +1372,6 @@ const FwOperations::HwDevData FwOperations::hwDevData[] = {
    2,
    {CONNECT_IB_SW_ID, 4114, 4115, 4116, 4117, 4118, 4119, 4120, 4121, 4122, 4123, 4124, 0},
    {{UNKNOWN_BIN, {0}}}},
-  {"InfiniScale IV", IS4_HW_ID, CT_IS4, CFT_SWITCH, 0, {48436, 48437, 48438, 0}, {{UNKNOWN_BIN, {0}}}},
-  {"SwitchX", SWITCHX_HW_ID, CT_SWITCHX, CFT_SWITCH, 0, {51000, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Switch_IB", SWITCH_IB_HW_ID, CT_SWITCH_IB, CFT_SWITCH, 0, {52000, 0}, {{UNKNOWN_BIN, {0}}}},
   {"ConnectX-4", CX4_HW_ID, CT_CONNECTX4, CFT_HCA, 0, {4115, 0}, {{UNKNOWN_BIN, {0}}}},
   {"ConnectX-4LX", CX4LX_HW_ID, CT_CONNECTX4_LX, CFT_HCA, 0, {4117, 0}, {{UNKNOWN_BIN, {0}}}},
@@ -1413,7 +1404,6 @@ const FwOperations::HwDevData FwOperations::hwDevData[] = {
 };
 
 const FwOperations::HwDev2Str FwOperations::hwDev2Str[] = {
-  {"ConnectX-2", CX2_HW_ID, 0xB0},          {"ConnectIB", CONNECT_IB_HW_ID, 0x00},
   {"ConnectX-3 A0", CX3_HW_ID, 0x00},       {"ConnectX-3 A1", CX3_HW_ID, 0x01},
   {"ConnectX-3Pro", CX3_PRO_HW_ID, 0x00},   {"ConnectX-4", CX4_HW_ID, 0x00},
   {"ConnectX-4LX", CX4LX_HW_ID, 0x00},      {"ConnectX-5", CX5_HW_ID, 0x00},
@@ -1421,8 +1411,6 @@ const FwOperations::HwDev2Str FwOperations::hwDev2Str[] = {
   {"ConnectX-6LX", CX6LX_HW_ID, 0x00},      {"ConnectX-7", CX7_HW_ID, 0x00},
   {"ConnectX-8", CX8_HW_ID, 0x00},          {"BlueField", BF_HW_ID, 0x00},
   {"BlueField2", BF2_HW_ID, 0x00},          {"BlueField3", BF3_HW_ID, 0x00},
-  {"SwitchX A0", SWITCHX_HW_ID, 0x00},      {"SwitchX A1", SWITCHX_HW_ID, 0x01},
-  {"InfiniScale IV A0", IS4_HW_ID, 0xA0},   {"InfiniScale IV A1", IS4_HW_ID, 0xA1},
   {"SwitchIB A0", SWITCH_IB_HW_ID, 0x00},   {"Spectrum A0", SPECTRUM_HW_ID, 0x00},
   {"SwitchIB2 A0", SWITCH_IB2_HW_ID, 0x00}, {"Quantum A0", QUANTUM_HW_ID, 0x00},
   {"Spectrum A1", SPECTRUM_HW_ID, 0x01},    {"Spectrum2 A0", SPECTRUM2_HW_ID, 0x00},
@@ -1434,8 +1422,6 @@ chip_type FwOperations::GetChipType(string chip)
 {
     if (chip == "CT_CONNECTX")
         return CT_CONNECTX;
-    else if (chip == "CT_SWITCHX")
-        return CT_SWITCHX;
     else if (chip == "CT_IS4")
         return CT_IS4;
     else if (chip == "CT_CONNECT_IB")
@@ -2127,11 +2113,6 @@ void FwOperations::SetDevFlags(chip_type_t chipType, u_int32_t devType, fw_img_t
         ibDev = true;
         ethDev = false;
     }
-    else if (chipType == CT_SWITCHX)
-    {
-        ibDev = true;
-        ethDev = true;
-    }
     else
     {
         ibDev = (fwType == FIT_FS3 && chipType != CT_SPECTRUM) || (chipType == CT_CONNECTX && !CntxEthOnly(devType));
@@ -2577,8 +2558,7 @@ bool FwOperations::FwReadBlock(u_int32_t addr, u_int32_t size, std::vector<u_int
 
 u_int8_t FwOperations::GetFwFormatFromHwDevID(u_int32_t hwDevId)
 {
-    if ((hwDevId == CX2_HW_ID) || (hwDevId == CX3_HW_ID) || (hwDevId == IS4_HW_ID) || (hwDevId == SWITCHX_HW_ID) ||
-        (hwDevId == CX3_PRO_HW_ID))
+    if ((hwDevId == CX3_HW_ID) || (hwDevId == CX3_PRO_HW_ID))
     {
         return FS_FS2_GEN;
     }
diff --git a/mlxfwops/lib/mlxfwops_com.h b/mlxfwops/lib/mlxfwops_com.h
index b6893828..be42afe7 100644
--- a/mlxfwops/lib/mlxfwops_com.h
+++ b/mlxfwops/lib/mlxfwops_com.h
@@ -60,7 +60,6 @@
 #endif
 
 #define CONNECTX_HW_ID 400
-#define SWITCHX_HW_ID 581
 #define SWITCH_IB_HW_ID 583
 #define SPECTRUM_HW_ID 585
 #define SWITCH_IB2_HW_ID 587
@@ -287,7 +286,6 @@ typedef enum chip_type
 {
     CT_UNKNOWN = 0,
     CT_CONNECTX,
-    CT_SWITCHX,
     CT_IS4,
     CT_CONNECT_IB,
     CT_SWITCH_IB,
diff --git a/mlxfwupdate/mlnx_dev.cpp b/mlxfwupdate/mlnx_dev.cpp
index bd41d84c..b861d55b 100644
--- a/mlxfwupdate/mlnx_dev.cpp
+++ b/mlxfwupdate/mlnx_dev.cpp
@@ -391,7 +391,6 @@ void MlnxDev::setDeviceType(void)
             portTwoType = PORT_IB;
             break;
 
-        case DeviceConnectX2:
         case DeviceConnectX3:
         case DeviceConnectX3Pro:
             u_int32_t mac;
diff --git a/mlxfwupdate/mlxfwmanager.cpp b/mlxfwupdate/mlxfwmanager.cpp
index a87d7e0e..969a41c2 100644
--- a/mlxfwupdate/mlxfwmanager.cpp
+++ b/mlxfwupdate/mlxfwmanager.cpp
@@ -2882,19 +2882,8 @@ int generateProductionName(string& targetFile, PsidQueryItem ri)
     }
     else
     {
-        switch (devType)
-        {
-            case DeviceInfiniScaleIV:
-                IC_code_name = "IS4";
-                break;
-
-            case DeviceSwitchX:
-                IC_code_name = "SX";
-                break;
-
-            default:
-                IC_code_name = dm_dev_type2str(devType);
-        }
+        
+        IC_code_name = dm_dev_type2str(devType);
     }
 
     ImgVersion* fwImgVer = (ImgVersion*)ri.findImageVersion("FW");
diff --git a/mlxreg/mlxreg_lib.cpp b/mlxreg/mlxreg_lib.cpp
index 04886b2c..6e3edfe6 100644
--- a/mlxreg/mlxreg_lib.cpp
+++ b/mlxreg/mlxreg_lib.cpp
@@ -141,8 +141,7 @@ dm_dev_id_t MlxRegLib::getDevId(mfile* mf)
 bool MlxRegLib::isDeviceSupported(mfile* mf)
 {
     dm_dev_id_t devID = getDevId(mf);
-    return devID != DeviceConnectX2 && devID != DeviceConnectX3 && devID != DeviceConnectX3Pro &&
-           devID != DeviceSwitchX;
+    return devID != DeviceConnectX3 && devID != DeviceConnectX3Pro;
 }
 
 void MlxRegLib::initAdb(string extAdbFile)
diff --git a/mtcr_freebsd/mtcr_ul.c b/mtcr_freebsd/mtcr_ul.c
index 36800d5f..8ba4119b 100644
--- a/mtcr_freebsd/mtcr_ul.c
+++ b/mtcr_freebsd/mtcr_ul.c
@@ -2339,8 +2339,6 @@ static int mreg_send_raw(mfile* mf,
 
 #define CONNECTX3_HW_ID 0x1f5
 #define CONNECTX3_PRO_HW_ID 0x1f7
-#define SWITCHX_HW_ID 0x245
-#define INFINISCALE4_HW_ID 0x1b3
 
 static int supports_icmd(mfile* mf)
 {
@@ -2353,10 +2351,8 @@ static int supports_icmd(mfile* mf)
     }
     switch (dev_id & 0xffff)
     { // that the hw device id
-        case INFINISCALE4_HW_ID:
         case CONNECTX3_HW_ID:
         case CONNECTX3_PRO_HW_ID:
-        case SWITCHX_HW_ID:
             return 0;
 
         default:
diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c
index 4a2d2827..96bee036 100644
--- a/mtcr_ul/mtcr_ul_com.c
+++ b/mtcr_ul/mtcr_ul_com.c
@@ -1841,7 +1841,6 @@ static long supported_dev_ids[] = {
   0x101d, // Connect-X6DX
   0x101f, // Connect-X6LX
   0x1021, // Connect-X7
-  0xc738, // SwitchX
   0xcb20, // Switch-IB
   0xcb84, // Spectrum
   0xcf08, // Switch-IB2
@@ -3440,10 +3439,7 @@ static int mreg_send_raw(mfile* mf,
 
 // needed device HW IDs
 #define CONNECTX3_PRO_HW_ID 0x1f7
-#define CONNECTX2_HW_ID 0x190
 #define CONNECTX3_HW_ID 0x1f5
-#define SWITCHX_HW_ID 0x245
-#define INFINISCALE4_HW_ID 0x1b3
 
 #define HW_ID_ADDR 0xf0014
 
@@ -3457,11 +3453,8 @@ static int supports_icmd(mfile* mf)
     }
     switch (dev_id & 0xffff)
     { // that the hw device id
-        case CONNECTX2_HW_ID:
         case CONNECTX3_HW_ID:
         case CONNECTX3_PRO_HW_ID:
-        case INFINISCALE4_HW_ID:
-        case SWITCHX_HW_ID:
             return 0;
 
         default:
diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index 8353e397..bdadbfae 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -91,7 +91,6 @@ class SyncOwner():
 
 
 MLNX_DEVICES = [
-    dict(name="ConnectX2", devid=0x190),
     dict(name="ConnectX3Pro", devid=0x1f7),
     dict(name="ConnectIB", devid=0x1ff, status_config_not_done=(0xb0004, 31)),
     dict(name="ConnectX4", devid=0x209, status_config_not_done=(0xb0004, 31)),
@@ -107,7 +106,6 @@ class SyncOwner():
     dict(name="ConnectX7", devid=0x218, status_config_not_done=(0xb5f04, 31)),
     dict(name="ConnectX8", devid=0x21e, status_config_not_done=(0xb5f04, 31)),
     dict(name="ConnectX3", devid=0x1f5),
-    dict(name="SwitchX", devid=0x245),
     dict(name="IS4", devid=0x1b3),
 ]
 
diff --git a/tools_res_mgmt/tools_res_mgmt.c b/tools_res_mgmt/tools_res_mgmt.c
index f697b794..48078c2e 100644
--- a/tools_res_mgmt/tools_res_mgmt.c
+++ b/tools_res_mgmt/tools_res_mgmt.c
@@ -73,11 +73,6 @@ static u_int32_t g_vsec_sem_addr[VSEC_SEM_NUM] = {0x0, 0x10};
 #define HW_SEM_ADDR_MASK 0xf
 
 static struct device_sem_info g_dev_sem_info_db[] = {
-  {
-    DeviceConnectX2, // dev_id
-    {0xf03bc},       // hw_sem_addr
-    0,               // vsec_sem_supported
-  },
   {
     DeviceConnectX3,    // dev_id
     {0xf03bc, 0xf03a0}, // hw_sem_addr
@@ -88,16 +83,6 @@ static struct device_sem_info g_dev_sem_info_db[] = {
     {0xf03bc, 0xf03a0}, // hw_sem_addr
     0,                  // vsec_sem_supported
   },
-  {
-    DeviceInfiniScaleIV, // dev_id
-    {0},                 // hw_sem_addr
-    0,                   // vsec_sem_supported
-  },
-  {
-    DeviceSwitchX, // dev_id
-    {0},           // hw_sem_addr
-    0,             // vsec_sem_supported
-  },
   {
     DeviceConnectIB, // dev_id
     {0xe27f8},       // hw_sem_addr

From fd3ab9dfccd16c4885164dcd17f713adf409909b Mon Sep 17 00:00:00 2001
From: Oded Burstein <oburstein@nvidia.com>
Date: Wed, 13 Jul 2022 11:49:47 +0300
Subject: [PATCH 29/46] Dev_mgt | changing tools device-related switch-cases to
 dev_mgt functions

---
 dev_mgt/tools_dev_types.c      |  5 ++++
 dev_mgt/tools_dev_types.h      |  5 ++++
 flint/subcommands.cpp          | 37 ++++------------------------
 mflash/mflash_dev_capability.c | 45 ++++++++++------------------------
 4 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/dev_mgt/tools_dev_types.c b/dev_mgt/tools_dev_types.c
index be163106..62898e54 100644
--- a/dev_mgt/tools_dev_types.c
+++ b/dev_mgt/tools_dev_types.c
@@ -854,3 +854,8 @@ int dm_dev_is_ib_switch(dm_dev_id_t type)
     return (dm_dev_is_switch(type) &&
             (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSwitchIB || type == DeviceSwitchIB2));
 }
+
+int dm_dev_is_gearbox(dm_dev_id_t type)
+{
+    return (get_entry(type)->dev_type == DM_GEARBOX);
+}
diff --git a/dev_mgt/tools_dev_types.h b/dev_mgt/tools_dev_types.h
index f2c6bec8..0f41ae17 100644
--- a/dev_mgt/tools_dev_types.h
+++ b/dev_mgt/tools_dev_types.h
@@ -237,6 +237,11 @@ extern "C"
      */
     int dm_is_livefish_mode(mfile* mf);
 
+    /**
+     * A predicate returning if the device is gearbox
+     */
+    int dm_dev_is_gearbox(dm_dev_id_t type);
+
 #ifdef __cplusplus
 } /* end of 'extern "C"' */
 #endif
diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
index 19e3c087..7f32bc9a 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
@@ -4778,40 +4778,13 @@ FlintStatus SwResetSubCommand::executeCommand()
 
 bool SwResetSubCommand::IsDeviceSupported(dm_dev_id_t dev_id)
 {
-    switch (dev_id)
+    if (dm_dev_is_ib_switch(dev_id))
     {
-        case DeviceSwitchIB:
-        case DeviceSwitchIB2:
-        case DeviceQuantum:
-        case DeviceQuantum2:
-            return true;
-        case DeviceConnectX3:
-        case DeviceConnectX3Pro:
-        case DeviceConnectIB:
-        case DeviceSpectrum:
-        case DeviceConnectX4:
-        case DeviceConnectX4LX:
-        case DeviceConnectX5:
-        case DeviceBlueField:
-        case DeviceBlueField2:
-        case DeviceBlueField3:
-        case DeviceConnectX6:
-        case DeviceConnectX6DX:
-        case DeviceConnectX6LX:
-        case DeviceConnectX7:
-        case DeviceSpectrum2:
-        case DeviceSpectrum3:
-        case DeviceSpectrum4:
-        case DeviceSecureHost:
-        case DeviceGearBox:
-        case DeviceGearBoxManager:
-        case DeviceAbirGearBox:
-            reportErr(true, "Device %s doesn't support swreset command.\n", dm_dev_type2str(dev_id));
-            return false;
-        default:
-            reportErr(true, "Unknown device type - %d.\n", dev_id);
-            return false;
+        return true;
     }
+
+    reportErr(true, "Device %s doesn't support swreset command.\n", dm_dev_type2str(dev_id));
+    return false;
 }
 
 /***********************
diff --git a/mflash/mflash_dev_capability.c b/mflash/mflash_dev_capability.c
index ec03a4c3..8c3e1063 100644
--- a/mflash/mflash_dev_capability.c
+++ b/mflash/mflash_dev_capability.c
@@ -87,39 +87,20 @@ int is_flash_enable_needed(mflash* mfl, MfError* status)
 {
     *status = MFE_OK;
 
-    switch (mfl->dm_dev_id)
+    if (dm_is_4th_gen(mfl->dm_dev_id))
     {
-        case DeviceConnectX3:
-        case DeviceConnectX3Pro:
-            return 1;
-        case DeviceConnectIB:
-        case DeviceSwitchIB:
-        case DeviceSwitchIB2:
-        case DeviceSpectrum:
-        case DeviceConnectX4:
-        case DeviceConnectX4LX:
-        case DeviceConnectX5:
-        case DeviceBlueField:
-        case DeviceBlueField2:
-        case DeviceBlueField3:
-        case DeviceQuantum:
-        case DeviceConnectX6:
-        case DeviceConnectX7:
-        case DeviceConnectX6DX:
-        case DeviceConnectX6LX:
-        case DeviceSpectrum2:
-        case DeviceSpectrum3:
-        case DeviceQuantum2:
-        case DeviceSpectrum4:
-        case DeviceSecureHost:
-        case DeviceGearBox:
-        case DeviceGearBoxManager:
-        case DeviceAbirGearBox:
-            return 0;
-        default:
-            *status = MFE_UNSUPPORTED_DEVICE;
-            fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
-            return 0;
+        return 1;
+    }
+    else if ((mfl->dm_dev_id == DeviceSecureHost) || (dm_is_5th_gen_hca(mfl->dm_dev_id)) ||
+             (dm_dev_is_gearbox(mfl->dm_dev_id)) || (dm_is_new_gen_switch(mfl->dm_dev_id)))
+    {
+        return 0;
+    }
+    else
+    {
+        *status = MFE_UNSUPPORTED_DEVICE;
+        fprintf(stderr, "The device type %d is not supported.\n", mfl->dm_dev_id);
+        return 0;
     }
 }
 

From c1b3cda43b098b1b337858a7959ec673383bc2da Mon Sep 17 00:00:00 2001
From: ssela <ssela@nvidia.com>
Date: Mon, 2 May 2022 09:43:22 +0300
Subject: [PATCH 30/46] added --op flag to mlxreg.

Description:added the abbility to set/get OP fields when using mlxreg.

Tested OS:linux
Tested devices:/dev/mst/mt4119_pciconf0
Tested flows: 1.--get with --op 2.--set with --op 3.--get without --op 4. --set without --op

Known gaps (with RM ticket):N/A

Issue: 2944041
Change-Id: I7168547e33de4d58d30f4983a2464ad350aba9d8
Signed-off-by: ssela <ssela@nvidia.com>
---
 mlxlink/modules/mlxlink_reg_parser.cpp |   2 +-
 mlxreg/mlxreg_parser.cpp               | 150 ++++++++++++++++---------
 mlxreg/mlxreg_parser.h                 |  29 ++---
 mlxreg/mlxreg_ui.cpp                   | 113 ++++++++++---------
 mlxreg/mlxreg_ui.h                     |   1 +
 5 files changed, 176 insertions(+), 119 deletions(-)

diff --git a/mlxlink/modules/mlxlink_reg_parser.cpp b/mlxlink/modules/mlxlink_reg_parser.cpp
index 2baf52ec..89e305a5 100644
--- a/mlxlink/modules/mlxlink_reg_parser.cpp
+++ b/mlxlink/modules/mlxlink_reg_parser.cpp
@@ -34,7 +34,7 @@
 
 #include "mlxlink_reg_parser.h"
 
-MlxlinkRegParser::MlxlinkRegParser() : RegAccessParser("", "", NULL, 0)
+MlxlinkRegParser::MlxlinkRegParser() : RegAccessParser("", "", "", NULL, 0)
 {
     _mf = NULL;
     _regLib = NULL;
diff --git a/mlxreg/mlxreg_parser.cpp b/mlxreg/mlxreg_parser.cpp
index 455c3257..7713136f 100644
--- a/mlxreg/mlxreg_parser.cpp
+++ b/mlxreg/mlxreg_parser.cpp
@@ -41,17 +41,14 @@
 using namespace mlxreg;
 
 /************************************
- * Function: RegParser
- ************************************/
-RegAccessParser::RegAccessParser(string data,
-                                 string indexes,
-                                 AdbInstance* regNode,
-                                 std::vector<u_int32_t> buffer,
-                                 bool ignore_ro)
+* Function: RegParser
+************************************/
+RegAccessParser::RegAccessParser(string data, string indexes, string ops, AdbInstance *regNode, std::vector<u_int32_t> buffer, bool ignore_ro)
 {
-    _data = data;
-    _indexes = indexes;
-    _regNode = regNode;
+    _data      = data;
+    _indexes   = indexes;
+    _ops = ops;
+    _regNode   = regNode;
     _ignore_ro = ignore_ro;
     output_file = "";
     if (!regNode)
@@ -75,13 +72,14 @@ RegAccessParser::RegAccessParser(string data,
     }
 }
 /************************************
- * Function: RegParser
- ************************************/
-RegAccessParser::RegAccessParser(string data, string indexes, AdbInstance* regNode, u_int32_t len, bool ignore_ro)
+* Function: RegParser
+************************************/
+RegAccessParser::RegAccessParser(string data, string indexes, string ops, AdbInstance *regNode, u_int32_t len, bool ignore_ro)
 {
-    _data = data;
-    _indexes = indexes;
-    _regNode = regNode;
+    _data      = data;
+    _indexes   = indexes;
+    _ops = ops;
+    _regNode   = regNode;
     _ignore_ro = ignore_ro;
     output_file = "";
     _len = len;
@@ -125,6 +123,8 @@ std::vector<u_int32_t> RegAccessParser::genBuff()
 std::vector<u_int32_t> RegAccessParser::genBuffKnown()
 {
     parseIndexes();
+    parseOps();
+
     // Update buffer with data values
     if (_data != "")
     {
@@ -157,49 +157,81 @@ std::vector<u_int32_t> RegAccessParser::genBuffUnknown()
  ************************************/
 void RegAccessParser::parseIndexes()
 {
-    std::vector<string> idxTokens = strSplit(_indexes, ',', false);
-    std::vector<string> expectedIdxs = getAllIndexes(_regNode);
-    std::vector<string> foundIdxs;
-    // Update buffer with indexes values
-    for (std::vector<std::string>::size_type i = 0; i != idxTokens.size(); i++)
-    {
-        std::vector<std::string> idx = strSplit(idxTokens[i], '=', true);
-        string idxName = idx[0];
-        string idxVal = idx[1];
+    std::vector<string> tokens = strSplit(_indexes, ',', false);
+    std::vector<string> valid_tokens = getAllIndexes(_regNode);
+    parseAccessType(tokens, valid_tokens, INDEX);
+}
+
+/************************************
+* Function: parseOps
+************************************/
+void RegAccessParser::parseOps()
+{
+    std::vector<string> tokens = strSplit(_ops, ',', false);
+    std::vector<string> valid_tokens = getAllOps(_regNode);
+    parseAccessType(tokens, valid_tokens, OP);
+}
+
+/************************************
+* Helper function: to_string
+************************************/
+const string& RegAccessParser::access_type_to_string(access_type_t accessType)
+{
+    static map<access_type_t, string> access_type_map;
+    if (access_type_map.size() == 0) {
+        access_type_map.insert(pair<access_type_t, string>(INDEX, "INDEX"));
+        access_type_map.insert(pair<access_type_t, string>(OP, "OP"));
+    }
+    map<access_type_t, string>::iterator itr = access_type_map.find(accessType);
+    if (itr != access_type_map.end()) {
+        return itr->second;
+    }
+    return NULL; //should not get here
+}
+
+/************************************
+* Function: parseAccessType
+************************************/
+void RegAccessParser::parseAccessType(std::vector<string> tokens, std::vector<string> validTokens, access_type_t accessType)
+{
+    std::vector<string> foundTokens;
+
+    // Update buffer with values (indexes/ops)
+    for (std::vector<std::string>::size_type i = 0; i != tokens.size(); i++) {
+        std::vector<std::string> tokenPair = strSplit(tokens[i], '=', true);
+        string name = tokenPair[0];
+        string val  = tokenPair[1];
         u_int32_t uintVal;
-        strToUint32((char*)idxVal.c_str(), uintVal);
-        AdbInstance* field = getField(idxName);
-        // Make sure that the field is INDEX
-        if (std::find(expectedIdxs.begin(), expectedIdxs.end(), idxName) != expectedIdxs.end())
-        {
-            if (std::find(foundIdxs.begin(), foundIdxs.end(), idxName) != foundIdxs.end())
-            {
-                throw MlxRegException("You wrote field: %s twice", idxName.c_str());
+        strToUint32((char*)val.c_str(), uintVal);
+        AdbInstance *field = getField(name);
+        // Make sure that the given field name is valid
+        if (std::find(validTokens.begin(), validTokens.end(), name) != validTokens.end()) {
+            if (std::find(foundTokens.begin(), foundTokens.end(), name) != foundTokens.end()) {
+                throw MlxRegException("Field: %s appears twice.", name.c_str());
             }
-            foundIdxs.push_back(idxName);
+            foundTokens.push_back(name);
         }
-        else
-        {
-            throw MlxRegException("Field: %s is not an index.", idxName.c_str());
+        else {
+            throw MlxRegException("Field: %s is not a %s.", name.c_str(), this->access_type_to_string(accessType).c_str());
         }
         updateBuffer(field->offset, field->size, uintVal);
     }
-    // Make sure that all the indexes are set
-    for (std::vector<std::string>::size_type i = 0; i != expectedIdxs.size(); i++)
-    {
-        bool idxFound = false;
-        for (std::vector<std::string>::size_type j = 0; j != foundIdxs.size(); j++)
-        {
-            if (expectedIdxs[i] == foundIdxs[j])
-            {
-                idxFound = true;
+
+    if (accessType == INDEX) {
+        // Make sure that all the indexes are set
+        for (std::vector<std::string>::size_type i = 0; i != validTokens.size(); i++) {
+            bool idxFound = false;
+            for (std::vector<std::string>::size_type j = 0; j != foundTokens.size(); j++) {
+                if (validTokens[i] == foundTokens[j]) {
+                    idxFound = true;
+                }
+            }
+            if (!idxFound) {
+                throw MlxRegException("Index: %s was not provided", validTokens[i].c_str());
             }
-        }
-        if (!idxFound)
-        {
-            throw MlxRegException("Index: %s was not provided", expectedIdxs[i].c_str());
         }
     }
+
 }
 
 /************************************
@@ -433,6 +465,11 @@ bool RegAccessParser::isIndex(AdbInstance* field)
     return checkAccess(field, "INDEX");
 }
 
+bool RegAccessParser::isOP(AdbInstance *field)
+{
+    return checkAccess(field, "OP");
+}
+
 /************************************
  * Function: getAllIndexes
  ************************************/
@@ -450,6 +487,19 @@ std::vector<string> RegAccessParser::getAllIndexes(AdbInstance* node)
     return indexes;
 }
 
+
+std::vector<string> RegAccessParser::getAllOps(AdbInstance *node)
+{
+    std::vector<string> ops;
+    std::vector<AdbInstance*> subItems = node->getLeafFields(true);
+    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++) {
+        if (isOP(subItems[i])) {
+            ops.push_back(subItems[i]->name);
+        }
+    }
+    return ops;
+}
+
 void RegAccessParser::updateField(string field_name, u_int32_t value)
 {
     AdbInstance* field = getField(field_name);
diff --git a/mlxreg/mlxreg_parser.h b/mlxreg/mlxreg_parser.h
index 122778ce..54cf0534 100644
--- a/mlxreg/mlxreg_parser.h
+++ b/mlxreg/mlxreg_parser.h
@@ -53,20 +53,17 @@ typedef enum
 class RegAccessParser
 {
 public:
-    RegAccessParser(string data,
-                    string indexes,
-                    AdbInstance* regNode,
-                    std::vector<u_int32_t> buffer,
-                    bool ignore_ro = false);
-    RegAccessParser(string data, string indexes, AdbInstance* regNode, u_int32_t len, bool ignore_ro = false);
+    RegAccessParser(string data, string indexes, string ops, AdbInstance *regNode, std::vector<u_int32_t> buffer, bool ignore_ro = false);
+    RegAccessParser(string data, string indexes, string ops, AdbInstance *regNode, u_int32_t len, bool ignore_ro = false);
     std::vector<u_int32_t> genBuff();
-    u_int32_t getDataLen() { return _len; };
-    static void strToUint32(char* str, u_int32_t& uint);
-    static string getAccess(const AdbInstance* field);
-
+    u_int32_t getDataLen() {return _len;};
+    static void strToUint32(char *str, u_int32_t &uint);
+    static string getAccess(const AdbInstance *field);
+    enum access_type_t {INDEX, OP};
 protected:
     string _data;
     string _indexes;
+    string _ops;
     u_int32_t _len;
     AdbInstance* _regNode;
     parseMode _parseMode;
@@ -75,7 +72,9 @@ class RegAccessParser
     bool _ignore_ro;
     std::vector<u_int32_t> genBuffUnknown();
     std::vector<u_int32_t> genBuffKnown();
+    void parseAccessType(std::vector<string> tokens, std::vector<string> validTokens, access_type_t accessType);
     void parseIndexes();
+    void parseOps();
     void parseData();
     void parseUnknown();
     bool checkFieldWithPath(AdbInstance* field, u_int32_t idx, std::vector<string>& fieldsChain);
@@ -85,10 +84,12 @@ class RegAccessParser
     void updateBufferUnknwon(std::vector<string> fieldTokens);
     void updateField(string field_name, u_int32_t value);
     u_int32_t getFieldValue(string field_name, std::vector<u_int32_t>& buff);
-    bool isRO(AdbInstance* field);
-    bool isIndex(AdbInstance* field);
-    std::vector<string> getAllIndexes(AdbInstance* node);
-
+    bool isRO(AdbInstance *field);
+    bool isIndex(AdbInstance *field);
+    bool isOP(AdbInstance *field);
+    std::vector<string> getAllIndexes(AdbInstance *node);
+    std::vector<string> getAllOps(AdbInstance *node);
+    const std::string& access_type_to_string(access_type_t accessType);
 private:
     bool checkAccess(const AdbInstance* field, const string accessStr);
 };
diff --git a/mlxreg/mlxreg_ui.cpp b/mlxreg/mlxreg_ui.cpp
index bbd63389..0b9e1ce6 100644
--- a/mlxreg/mlxreg_ui.cpp
+++ b/mlxreg/mlxreg_ui.cpp
@@ -85,33 +85,35 @@
     printf("\n");
 
 /************************************
- * FLAGS Constants
- ************************************/
-#define DEVICE_FLAG "device"
-#define DEVICE_FLAG_SHORT 'd'
-#define HELP_FLAG "help"
-#define HELP_FLAG_SHORT 'h'
-#define VERSION_FLAG "version"
-#define VERSION_FLAG_SHORT 'v'
-#define ADB_FILE_FLAG "adb_file"
-#define ADB_FILE_FLAG_SHORT 'a'
-#define REG_NAME_FLAG "reg_name"
-#define REG_NAME_FLAG_SHORT ' '
-#define REG_ID_FLAG "reg_id"
-#define REG_ID_FLAG_SHORT ' '
-#define IDXES_FLAG "indexes"
-#define IDXES_FLAG_SHORT 'i'
-#define REG_LEN_FLAG "reg_len"
-#define REG_LEN_FLAG_SHORT ' '
-#define OP_GET_FLAG "get"
-#define OP_GET_FLAG_SHORT 'g'
-#define OP_SET_FLAG "set"
-#define OP_SET_FLAG_SHORT 's'
-#define OP_SHOW_REG_FLAG "show_reg"
-#define OP_SHOW_REG_FLAG_SHORT ' '
-#define OP_SHOW_REGS_FLAG "show_regs"
-#define OP_SHOW_REGS_FLAG_SHORT ' '
-#define OP_SHOW_ALL_REGS_FLAG "show_all_regs"
+* FLAGS Constants
+************************************/
+#define DEVICE_FLAG                 "device"
+#define DEVICE_FLAG_SHORT           'd'
+#define HELP_FLAG                   "help"
+#define HELP_FLAG_SHORT             'h'
+#define VERSION_FLAG                "version"
+#define VERSION_FLAG_SHORT          'v'
+#define ADB_FILE_FLAG               "adb_file"
+#define ADB_FILE_FLAG_SHORT         'a'
+#define REG_NAME_FLAG               "reg_name"
+#define REG_NAME_FLAG_SHORT         ' '
+#define REG_ID_FLAG                 "reg_id"
+#define REG_ID_FLAG_SHORT           ' '
+#define IDXES_FLAG                  "indexes"
+#define IDXES_FLAG_SHORT            'i'
+#define OPS_FLAG                    "op"
+#define OPS_FLAG_SHORT              'o'
+#define REG_LEN_FLAG                "reg_len"
+#define REG_LEN_FLAG_SHORT          ' '
+#define OP_GET_FLAG                 "get"
+#define OP_GET_FLAG_SHORT           'g'
+#define OP_SET_FLAG                 "set"
+#define OP_SET_FLAG_SHORT           's'
+#define OP_SHOW_REG_FLAG            "show_reg"
+#define OP_SHOW_REG_FLAG_SHORT      ' '
+#define OP_SHOW_REGS_FLAG           "show_regs"
+#define OP_SHOW_REGS_FLAG_SHORT     ' '
+#define OP_SHOW_ALL_REGS_FLAG       "show_all_regs"
 #define OP_SHOW_ALL_REGS_FLAG_SHORT ' '
 #define IGNORE_CAP_CHECK_FLAG "ignore_cap_check"
 #define IGNORE_CAP_CHECK_FLAG_SHORT ' '
@@ -177,14 +179,15 @@ MlxRegUi::~MlxRegUi()
  ************************************/
 void MlxRegUi::initCmdParser()
 {
-    AddOptions(DEVICE_FLAG, DEVICE_FLAG_SHORT, "MstDevice", "Mellanox mst device name");
-    AddOptions(HELP_FLAG, HELP_FLAG_SHORT, "", "Show help message and exit");
-    AddOptions(VERSION_FLAG, VERSION_FLAG_SHORT, "", "Show version and exit");
-    AddOptions(ADB_FILE_FLAG, ADB_FILE_FLAG_SHORT, "AdbFile", "External ADB file");
-    AddOptions(REG_NAME_FLAG, REG_NAME_FLAG_SHORT, "RegisterName", "Access register name");
-    AddOptions(REG_ID_FLAG, REG_ID_FLAG_SHORT, "RegisterID", "Access register ID");
-    AddOptions(IDXES_FLAG, IDXES_FLAG_SHORT, "RegisterData", "Register data");
-    AddOptions(REG_LEN_FLAG, REG_LEN_FLAG_SHORT, "RegisterDataLen", "Register data length");
+    AddOptions(DEVICE_FLAG,       DEVICE_FLAG_SHORT, "MstDevice", "Mellanox mst device name");
+    AddOptions(HELP_FLAG,         HELP_FLAG_SHORT, "", "Show help message and exit");
+    AddOptions(VERSION_FLAG,      VERSION_FLAG_SHORT, "", "Show version and exit");
+    AddOptions(ADB_FILE_FLAG,     ADB_FILE_FLAG_SHORT, "AdbFile", "External ADB file");
+    AddOptions(REG_NAME_FLAG,     REG_NAME_FLAG_SHORT, "RegisterName", "Access register name");
+    AddOptions(REG_ID_FLAG,       REG_ID_FLAG_SHORT, "RegisterID", "Access register ID");
+    AddOptions(IDXES_FLAG,        IDXES_FLAG_SHORT, "RegisterData", "Register data");
+    AddOptions(OPS_FLAG,          OPS_FLAG_SHORT, "RegisterData", "Register data");
+    AddOptions(REG_LEN_FLAG,      REG_LEN_FLAG_SHORT, "RegisterDataLen", "Register data length");
     AddOptions(IGNORE_CAP_CHECK_FLAG, IGNORE_CAP_CHECK_FLAG_SHORT, "", "");
     AddOptions(IGNORE_REG_CHECK_FLAG, IGNORE_REG_CHECK_FLAG_SHORT, "", "");
     AddOptions(OP_GET_FLAG, OP_GET_FLAG_SHORT, "", "Register access GET");
@@ -240,20 +243,20 @@ void MlxRegUi::printHelp()
     // print options
     printf("\n");
     printf(IDENT "OPTIONS:\n");
-    printFlagLine(HELP_FLAG_SHORT, HELP_FLAG, "", "Display help message.");
-    printFlagLine(VERSION_FLAG_SHORT, VERSION_FLAG, "", "Display version info.");
-    printFlagLine(DEVICE_FLAG_SHORT, DEVICE_FLAG, "device", "Perform operation for a specified mst device.");
-    printFlagLine(ADB_FILE_FLAG_SHORT, ADB_FILE_FLAG, "adb_file", "An external ADB file");
-    printFlagLine(REG_NAME_FLAG_SHORT, REG_NAME_FLAG, "reg_name", "Known access register name");
-    printFlagLine(REG_ID_FLAG_SHORT, REG_ID_FLAG, "reg_ID", "Access register ID");
-    printFlagLine(REG_LEN_FLAG_SHORT, REG_LEN_FLAG, "reg_length", "Access register layout length (bytes)");
-    printFlagLine(IDXES_FLAG_SHORT, IDXES_FLAG, "idxs_vals", "Register indexes");
-    printFlagLine(OP_GET_FLAG_SHORT, OP_GET_FLAG, "", "Register access GET");
-    printFlagLine(OP_SET_FLAG_SHORT, OP_SET_FLAG, "reg_dataStr", "Register access SET");
-    printFlagLine(OP_SHOW_REG_FLAG_SHORT, OP_SHOW_REG_FLAG, "reg_name",
-                  "Print the fields of a given reg access (must have reg_name)");
-    printFlagLine(OP_SHOW_REGS_FLAG_SHORT, OP_SHOW_REGS_FLAG, "", "Print all available reg access'");
-    printFlagLine(FORCE_FLAG_SHORT, FORCE_FLAG, "", "Non-interactive mode, answer yes to all questions");
+    printFlagLine(HELP_FLAG_SHORT,          HELP_FLAG,         "", "Display help message.");
+    printFlagLine(VERSION_FLAG_SHORT,       VERSION_FLAG,      "", "Display version info.");
+    printFlagLine(DEVICE_FLAG_SHORT,        DEVICE_FLAG,       "device", "Perform operation for a specified mst device.");
+    printFlagLine(ADB_FILE_FLAG_SHORT,      ADB_FILE_FLAG,     "adb_file", "An external ADB file");
+    printFlagLine(REG_NAME_FLAG_SHORT,      REG_NAME_FLAG,     "reg_name", "Known access register name");
+    printFlagLine(REG_ID_FLAG_SHORT,        REG_ID_FLAG,       "reg_ID", "Access register ID");
+    printFlagLine(REG_LEN_FLAG_SHORT,       REG_LEN_FLAG,      "reg_length", "Access register layout length (bytes)");
+    printFlagLine(IDXES_FLAG_SHORT,         IDXES_FLAG,        "idxs_vals", "Register indexes");
+    printFlagLine(OPS_FLAG_SHORT,           OPS_FLAG,          "ops_vals", "Register optional fields");
+    printFlagLine(OP_GET_FLAG_SHORT,        OP_GET_FLAG,       "", "Register access GET");
+    printFlagLine(OP_SET_FLAG_SHORT,        OP_SET_FLAG,       "reg_dataStr", "Register access SET");
+    printFlagLine(OP_SHOW_REG_FLAG_SHORT,   OP_SHOW_REG_FLAG,  "reg_name", "Print the fields of a given reg access (must have reg_name)");
+    printFlagLine(OP_SHOW_REGS_FLAG_SHORT,  OP_SHOW_REGS_FLAG, "", "Print all available reg access'");
+    printFlagLine(FORCE_FLAG_SHORT,         FORCE_FLAG,        "", "Non-interactive mode, answer yes to all questions");
 
     // print usage examples
     printf("\n");
@@ -412,9 +415,11 @@ ParseStatus MlxRegUi::HandleOption(string name, string value)
     {
         _indexesStr = value;
         return PARSE_OK;
+    } else if (name == OPS_FLAG) {
+        _opsStr = value;
+        return PARSE_OK;
     }
-    else if (name == REG_NAME_FLAG)
-    {
+    else if (name == REG_NAME_FLAG) {
         CHECK_UNIQUE_UINT(_regID);
         CHECK_UNIQUE_UINT(_dataLen);
         _regName = value;
@@ -684,7 +689,7 @@ void MlxRegUi::run(int argc, char** argv)
             {
                 regNode = _mlxRegLib->findAdbNode(_regName);
             }
-            RegAccessParser parser(_dataStr, _indexesStr, regNode, _dataLen);
+            RegAccessParser parser(_dataStr, _indexesStr, _opsStr, regNode, _dataLen);
             buff = parser.genBuff();
             printf("Sending access register...\n\n");
             if (_regName != "")
@@ -714,7 +719,7 @@ void MlxRegUi::run(int argc, char** argv)
                 regNode = _mlxRegLib->findAdbNode(_regName);
             }
             // Read current register data into buffer
-            RegAccessParser parserGet(_dataStr, _indexesStr, regNode, _dataLen, _ignore_ro);
+            RegAccessParser parserGet(_dataStr, _indexesStr, _opsStr, regNode, _dataLen, _ignore_ro);
             buff = parserGet.genBuff();
             if (_regName != "")
             { // Known mode
@@ -725,7 +730,7 @@ void MlxRegUi::run(int argc, char** argv)
                 _mlxRegLib->sendRegister(_regID, MACCESS_REG_METHOD_GET, buff);
             }
             // Update the register buffer with user inputs
-            RegAccessParser parser(_dataStr, _indexesStr, regNode, buff, _ignore_ro);
+            RegAccessParser parser(_dataStr, _indexesStr, _opsStr, regNode, buff, _ignore_ro);
             buff = parser.genBuff();
             if (_output_file != "")
             {
diff --git a/mlxreg/mlxreg_ui.h b/mlxreg/mlxreg_ui.h
index fda029dd..74ec84b6 100644
--- a/mlxreg/mlxreg_ui.h
+++ b/mlxreg/mlxreg_ui.h
@@ -88,6 +88,7 @@ class MlxRegUi : public CommandLineRequester
     u_int32_t _regID;
     string _dataStr;
     string _indexesStr;
+    string _opsStr;
     u_int32_t _dataLen;
     bool _ignoreCapCheck;
     MlxRegOper _op;

From 6f4a188d2bb07847209a33b346633236fce8431a Mon Sep 17 00:00:00 2001
From: Alon Strutsovsky <astrutsovsky@nvidia.com>
Date: Wed, 13 Jul 2022 17:11:34 +0300
Subject: [PATCH 31/46] [dev_mgt] rebased from mft 4.21

Description:

Tested OS: None
Tested devices: None
Tested flows: None

Known gaps (with RM ticket):

Issue: None
---
 dev_mgt/dev_mgt.py        |  85 +++++++++++++-
 dev_mgt/tools_dev_types.c | 231 +++++++++++++++++++++++++++++++++-----
 dev_mgt/tools_dev_types.h |  41 +++++--
 3 files changed, 318 insertions(+), 39 deletions(-)

diff --git a/dev_mgt/dev_mgt.py b/dev_mgt/dev_mgt.py
index 712369af..24e1af67 100755
--- a/dev_mgt/dev_mgt.py
+++ b/dev_mgt/dev_mgt.py
@@ -63,19 +63,100 @@ class DevMgtException(Exception):
 if DEV_MGT:
     class DevMgt:
         ##########################
-        def __init__(self, dev):
+        def __init__(self, dev, i2c_secondary= -1):
             self.mf = 0
             self._isLivefishModeFunc = DEV_MGT.dm_is_livefish_mode  # dm_is_livefish_mode(mfile* mf)
+            self._getDeviceIdFunc = DEV_MGT.dm_get_device_id
             if isinstance(dev, (mtcr.MstDevice)):
                 self._mstdev = dev
             else:
-                self._mstdev = mtcr.MstDevice(dev)
+                self._mstdev = mtcr.MstDevice(dev, i2c_secondary)
                 if not self._mstdev:
                     raise DevMgtException("Failed to open device (%s): %s" % (dev, os.strerror(ctypes.get_errno())))
+            DEV_MGT.mft_core_init_device_dev_mgt(self._mstdev.mdev)
 
         ##########################
         def isLivefishMode(self):
             rc = self._isLivefishModeFunc(self._mstdev.mf)
             return not (rc == 0)
+
+        ##########################
+        def getHwId(self):
+            dm_dev_id = ctypes.c_uint16()
+            hw_dev_id = ctypes.c_uint32()
+            hw_rev = ctypes.c_uint32()
+
+            rc = DEV_MGT.dm_get_device_id(self._mstdev.mf, ctypes.byref(dm_dev_id), ctypes.byref(hw_dev_id), ctypes.byref(hw_rev))
+            return {"return_code": rc, "dm_device_id": dm_dev_id, "hw_device_id": hw_dev_id, "hw_revision": hw_rev}
+
+        @classmethod
+        def getDevIdOffline(cls, hw_dev_id):
+            dm_dev_id = ctypes.c_uint16()
+            rc = DEV_MGT.dm_get_device_id_offline(hw_dev_id, -1, ctypes.byref(dm_dev_id))
+            return {"return_code": rc, "dm_device_id": dm_dev_id, "hw_device_id": hw_dev_id, "hw_revision": -1}
+
+        @classmethod
+        def str2hwId(cls, name):
+            name_char_p = ctypes.c_char_p(name.lower().encode('utf-8'))
+            dm_dev_id = ctypes.c_uint16()
+            hw_dev_id = ctypes.c_uint32()
+            hw_rev = ctypes.c_uint32()
+
+            dm_dev_id = DEV_MGT.dm_dev_aproxstr2type(name_char_p)
+
+            rc = 0
+            hw_dev_id = DEV_MGT.dm_get_hw_dev_id(dm_dev_id)
+            hw_rev = DEV_MGT.dm_get_hw_rev_id(dm_dev_id)
+
+            if (hw_dev_id == 0 or hw_rev == 0):
+                rc = 1
+
+            return {"return_code": rc, "dm_device_id": dm_dev_id, "hw_device_id": hw_dev_id, "hw_revision": hw_rev}
+
+        @classmethod
+        def type2str(cls, dm_dev_id):
+            DEV_MGT.dm_dev_type2str.restype = ctypes.c_char_p
+            return DEV_MGT.dm_dev_type2str(dm_dev_id).decode("utf-8")
+
+        @classmethod
+        def is_ib_switch(cls, dm_dev_id):
+            return DEV_MGT.dm_dev_is_ib_switch(dm_dev_id)
+
+        @classmethod
+        def is_connectib(cls, dm_dev_id):
+            return DEV_MGT.dm_is_connectib(dm_dev_id)
+
+        @classmethod
+        def is_gb100(cls, dm_dev_id):
+            return DEV_MGT.dm_is_gb100(dm_dev_id)
+
+        @classmethod
+        def is_cx7(cls, dm_dev_id):
+            return DEV_MGT.dm_is_cx7(dm_dev_id)
+
+        @classmethod
+        def is_fs3(cls, dm_dev_id):
+            return DEV_MGT.dm_dev_is_fs3(dm_dev_id)
+
+        @classmethod
+        def is_fs4(cls, dm_dev_id):
+            return DEV_MGT.dm_dev_is_fs4(dm_dev_id)
+
+        @classmethod
+        def is_4th_gen(cls, dm_dev_id):
+            return DEV_MGT.dm_is_4th_gen(dm_dev_id)
+
+        @classmethod
+        def sw_id2hw_id(cls, sw_dev_id):
+            dm_dev_id = DEV_MGT.dm_dev_sw_id2type(sw_dev_id)
+            rc = 0
+            hw_dev_id = DEV_MGT.dm_get_hw_dev_id(dm_dev_id)
+            hw_rev = DEV_MGT.dm_get_hw_rev_id(dm_dev_id)
+
+            if (hw_dev_id == 0 or hw_rev == 0):
+                rc = 1
+
+            return {"return_code": rc, "dm_device_id": dm_dev_id, "hw_device_id": hw_dev_id, "hw_revision": hw_rev}
+
 else:
     raise DevMgtException("Failed to load c_dev_mgt.so/libdev_mgt.dll")
diff --git a/dev_mgt/tools_dev_types.c b/dev_mgt/tools_dev_types.c
index 62898e54..2807ea84 100644
--- a/dev_mgt/tools_dev_types.c
+++ b/dev_mgt/tools_dev_types.c
@@ -85,6 +85,9 @@ struct device_info
 #define MENHIT_DEVID_VER0 0x6f
 #define MENHIT_DEVID_VER1 0x72
 #define MENHIT_DEVID_VER2 0x73
+#define ARCUS_P_TC_DEVID 0x7f
+#define ARCUS_P_REV0_DEVID 0x80
+#define ARCUS_E_REV0_DEVID 0x81
 
 #ifdef CABLES_SUPP
 enum dm_dev_type getCableType(u_int8_t id)
@@ -122,7 +125,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectIB, // dm_id
                                              0x1ff,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             4113,            // sw_dev_id
                                              "ConnectIB",     // name
                                              2,               // port_num
                                              DM_HCA           // dev_type
@@ -131,7 +134,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX3Pro, // dm_id
                                              0x1f7,              // hw_dev_id
                                              -1,                 // hw_rev_id
-                                             -1,                 // sw_dev_id
+                                             4103,               // sw_dev_id
                                              "ConnectX3Pro",     // name
                                              2,                  // port_num
                                              DM_HCA              // dev_type
@@ -140,7 +143,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceSwitchIB, // dm_id
                                              0x247,          // hw_dev_id
                                              -1,             // hw_rev_id
-                                             -1,             // sw_dev_id
+                                             52000,          // sw_dev_id
                                              "SwitchIB",     // name
                                              36,             // port_num
                                              DM_SWITCH       // dev_type
@@ -149,7 +152,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceSpectrum, // dm_id
                                              0x249,          // hw_dev_id
                                              -1,             // hw_rev_id
-                                             -1,             // sw_dev_id
+                                             52100,          // sw_dev_id
                                              "Spectrum",     // name
                                              64,             // port_num
                                              DM_SWITCH       // dev_type
@@ -158,7 +161,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX4, // dm_id
                                              0x209,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             4115,            // sw_dev_id
                                              "ConnectX4",     // name
                                              2,               // port_num
                                              DM_HCA           // dev_type
@@ -167,7 +170,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX4LX, // dm_id
                                              0x20b,             // hw_dev_id
                                              -1,                // hw_rev_id
-                                             -1,                // sw_dev_id
+                                             4117,              // sw_dev_id
                                              "ConnectX4LX",     // name
                                              2,                 // port_num
                                              DM_HCA             // dev_type
@@ -176,7 +179,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX5, // dm_id
                                              0x20d,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             4119,            // sw_dev_id
                                              "ConnectX5",     // name
                                              2,               // port_num
                                              DM_HCA           // dev_type
@@ -185,7 +188,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX6, // dm_id
                                              0x20f,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             4123,            // sw_dev_id
                                              "ConnectX6",     // name
                                              2,               // port_num
                                              DM_HCA           // dev_type
@@ -194,7 +197,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX6DX, // dm_id
                                              0x212,             // hw_dev_id
                                              -1,                // hw_rev_id
-                                             -1,                // sw_dev_id
+                                             4125,              // sw_dev_id
                                              "ConnectX6DX",     // name
                                              2,                 // port_num
                                              DM_HCA             // dev_type
@@ -203,7 +206,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX6LX, // dm_id
                                              0x216,             // hw_dev_id
                                              -1,                // hw_rev_id
-                                             -1,                // sw_dev_id
+                                             4127,              // sw_dev_id
                                              "ConnectX6LX",     // name
                                              2,                 // port_num
                                              DM_HCA             // dev_type
@@ -212,16 +215,25 @@ static struct device_info g_devs_info[] = {{
                                              DeviceConnectX7, // dm_id
                                              0x218,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             4129,            // sw_dev_id
                                              "ConnectX7",     // name
                                              4,               // port_num
                                              DM_HCA           // dev_type
                                            },
+                                           {
+                                             DeviceConnectX8, // dm_id
+                                             0x21e,           // hw_dev_id
+                                             -1,              // hw_rev_id
+                                             -1,              // sw_dev_id
+                                             "ConnectX8",     // name
+                                             4,               // port_num
+                                             DM_HCA           // dev_type
+                                           },
                                            {
                                              DeviceBlueField, // dm_id
                                              0x211,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             41682,           // sw_dev_id
                                              "BlueField",     // name
                                              2,               // port_num
                                              DM_HCA           // dev_type
@@ -230,7 +242,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceBlueField2, // dm_id
                                              0x214,            // hw_dev_id
                                              -1,               // hw_rev_id
-                                             -1,               // sw_dev_id
+                                             41686,            // sw_dev_id
                                              "BlueField2",     // name
                                              2,                // port_num
                                              DM_HCA            // dev_type
@@ -239,16 +251,25 @@ static struct device_info g_devs_info[] = {{
                                              DeviceBlueField3, // dm_id
                                              0x21c,            // hw_dev_id
                                              -1,               // hw_rev_id
-                                             -1,               // sw_dev_id
+                                             41692,            // sw_dev_id
                                              "BlueField3",     // name
                                              4,                // port_num
                                              DM_HCA            // dev_type
                                            },
+                                           {
+                                             DeviceBlueField4, // dm_id
+                                             0x220,            // hw_dev_id
+                                             -1,               // hw_rev_id
+                                             41694,            // sw_dev_id
+                                             "BlueField4",     // name
+                                             4,                // port_num
+                                             DM_HCA            // dev_type
+                                           },
                                            {
                                              DeviceSwitchIB2, // dm_id
                                              0x24b,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             53000,           // sw_dev_id
                                              "SwitchIB2",     // name
                                              36,              // port_num
                                              DM_SWITCH        // dev_type
@@ -320,7 +341,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceSpectrum2, // dm_id
                                              0x24e,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             53100,           // sw_dev_id
                                              "Spectrum2",     // name
                                              128,             // port_num
                                              DM_SWITCH        // dev_type
@@ -338,7 +359,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceQuantum, // dm_id
                                              0x24d,         // hw_dev_id
                                              -1,            // hw_rev_id
-                                             -1,            // sw_dev_id
+                                             54000,         // sw_dev_id
                                              "Quantum",     // name
                                              80,            // port_num
                                              DM_SWITCH      // dev_type
@@ -370,6 +391,33 @@ static struct device_info g_devs_info[] = {{
                                              -1,           // port_num
                                              DM_LINKX      // dev_type
                                            },
+                                           {
+                                             DeviceArcusPTC,     // dm_id
+                                             0x7f,               // hw_dev_id
+                                             -1,                 // hw_rev_id
+                                             -1,                 // sw_dev_id
+                                             "ArcusP Test-Chip", // name
+                                             -1,                 // port_num
+                                             DM_LINKX            // dev_type
+                                           },
+                                           {
+                                             DeviceArcusP, // dm_id
+                                             0x80,         // hw_dev_id (other versions 0x6f,0x73)
+                                             -1,           // hw_rev_id
+                                             -1,           // sw_dev_id
+                                             "ArcusP",     // name
+                                             -1,           // port_num
+                                             DM_LINKX      // dev_type
+                                           },
+                                           {
+                                             DeviceArcusE, // dm_id
+                                             0x81,         // hw_dev_id (other versions 0x6f,0x73)
+                                             -1,           // hw_rev_id
+                                             -1,           // sw_dev_id
+                                             "ArcusE",     // name
+                                             -1,           // port_num
+                                             DM_LINKX      // dev_type
+                                           },
                                            {
                                              DeviceSecureHost, // dm_id
                                              0xcafe,           // hw_dev_id
@@ -383,7 +431,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceSpectrum3, // dm_id
                                              0x250,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             53104,           // sw_dev_id
                                              "Spectrum3",     // name
                                              128,             // port_num NEED_CHECK
                                              DM_SWITCH        // dev_type
@@ -392,7 +440,7 @@ static struct device_info g_devs_info[] = {{
                                              DeviceSpectrum4, // dm_id
                                              0x254,           // hw_dev_id
                                              -1,              // hw_rev_id
-                                             -1,              // sw_dev_id
+                                             53120,           // sw_dev_id
                                              "Spectrum4",     // name
                                              128,             // port_num NEED_CHECK
                                              DM_SWITCH        // dev_type
@@ -401,16 +449,34 @@ static struct device_info g_devs_info[] = {{
                                              DeviceQuantum2, // dm_id
                                              0x257,          // hw_dev_id
                                              -1,             // hw_rev_id
-                                             -1,             // sw_dev_id
+                                             54002,          // sw_dev_id
                                              "Quantum2",     // name
                                              128,            // port_num NEED_CHECK
                                              DM_SWITCH       // dev_type
                                            },
+                                           {
+                                             DeviceQuantum3, // dm_id
+                                             0x25b,         // hw_dev_id
+                                             -1,             // hw_rev_id
+                                             54004,          // sw_dev_id
+                                             "Quantum3",     // name
+                                             128,            // port_num NEED_CHECK
+                                             DM_SWITCH       // dev_type
+                                           },
+                                           {
+                                             DeviceGB100, // dm_id
+                                             0x2900,      // hw_dev_id
+                                             -1,          // hw_rev_id
+                                             10496,       // sw_dev_id
+                                             "GB100",     // name
+                                             128,         // port_num NEED_CHECK
+                                             DM_SWITCH    // dev_type
+                                           },
                                            {
                                              DeviceGearBox, // dm_id
                                              0x252,         // hw_dev_id
                                              -1,            // hw_rev_id
-                                             -1,            // sw_dev_id
+                                             53108,         // sw_dev_id
                                              "AmosGearBox", // name
                                              128,           // port_num NEED_CHECK
                                              DM_GEARBOX     // dev_type
@@ -507,6 +573,15 @@ static int dm_get_device_id_inner(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32
             case MENHIT_DEVID_VER2:
                 *ptr_dm_dev_id = DeviceMenhit;
                 break;
+            case ARCUS_P_TC_DEVID:
+                *ptr_dm_dev_id = DeviceArcusPTC;
+                break;
+            case ARCUS_P_REV0_DEVID:
+                *ptr_dm_dev_id = DeviceArcusP;
+                break;
+            case ARCUS_E_REV0_DEVID:
+                *ptr_dm_dev_id = DeviceArcusE;
+                break;
             default:
                 return GET_DEV_ID_ERROR;
                 break;
@@ -527,6 +602,7 @@ static int dm_get_device_id_inner(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32
         *ptr_hw_dev_id = 0xffff;
         u_int8_t id = EXTRACT(dword, 0, 8);
         enum dm_dev_type cbl_type = getCableType(id);
+        *ptr_hw_dev_id = id;
         u_int8_t paging;
         if (cbl_type == DM_QSFP_CABLE)
         {
@@ -626,7 +702,7 @@ static int dm_get_device_id_inner(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32
     }
     else
     {
-        if (mread4(mf, DEVID_ADDR, &dword) != 4)
+        if (read_device_id(mf, &dword) != 4)
         {
             return CRSPACE_READ_ERROR;
         }
@@ -716,6 +792,53 @@ dm_dev_id_t dm_dev_str2type(const char* str)
     return DeviceUnknown;
 }
 
+dm_dev_id_t dm_dev_aproxstr2type(const char* str)
+{
+    const struct device_info* p = g_devs_info;
+    char d_str[256];
+    if (!str)
+    {
+        return DeviceUnknown;
+    }
+    while (p->dm_id != DeviceUnknown)
+    {
+        // to lowercase
+        unsigned short i;
+        for (i = 0; i <= strlen(p->name); ++i)
+        {
+            if ((p->name)[i] >= 'A' && (p->name)[i] <= 'Z')
+            {
+                d_str[i] = (p->name)[i] + 'a' - 'A';
+            }
+            else
+            {
+                d_str[i] = (p->name)[i];
+            }
+        }
+
+        if (strncmp(str, d_str, strlen(d_str)) == 0)
+        {
+            return p->dm_id;
+        }
+        p++;
+    }
+    return DeviceUnknown;
+}
+
+dm_dev_id_t dm_dev_sw_id2type(int sw_dev_id)
+{
+    const struct device_info* p = g_devs_info;
+    while (p->dm_id != DeviceUnknown)
+    {
+        if (sw_dev_id == p->sw_dev_id)
+        {
+            return p->dm_id;
+        }
+        p++;
+    }
+    return DeviceUnknown;
+}
+
 int dm_get_hw_ports_num(dm_dev_id_t type)
 {
     return get_entry(type)->port_num;
@@ -723,7 +846,22 @@ int dm_get_hw_ports_num(dm_dev_id_t type)
 
 int dm_dev_is_hca(dm_dev_id_t type)
 {
-    return get_entry(type)->dev_type == DM_HCA;
+    return (!dm_dev_is_dummy(type)) && (get_entry(type)->dev_type == DM_HCA);
+}
+
+int dm_dev_is_dummy(dm_dev_id_t type)
+{
+    return type == DeviceDummy;
+}
+
+int dm_dev_is_gearbox(dm_dev_id_t type)
+{
+    return (get_entry(type)->dev_type == DM_GEARBOX);
+}
+
+int dm_is_menhit(dm_dev_id_t type)
+{
+    return type == DeviceMenhit || type == DeviceArcusPTC || type == DeviceArcusP || type == DeviceArcusE;
 }
 
 int dm_dev_is_200g_speed_supported_hca(dm_dev_id_t type)
@@ -765,7 +903,8 @@ int dm_dev_is_cmis_cable(dm_dev_id_t type)
 
 int dm_dev_is_cable(dm_dev_id_t type)
 {
-    return (dm_dev_is_qsfp_cable(type) || dm_dev_is_sfp_cable(type) || dm_dev_is_cmis_cable(type));
+    return (type == DeviceCable || dm_dev_is_qsfp_cable(type) || dm_dev_is_sfp_cable(type) ||
+            dm_dev_is_cmis_cable(type));
 }
 
 u_int32_t dm_get_hw_dev_id(dm_dev_id_t type)
@@ -838,24 +977,56 @@ int dm_is_connectib(dm_dev_id_t type)
     return (type == DeviceConnectIB);
 }
 
+int dm_is_gb100(dm_dev_id_t type)
+{
+    return (type == DeviceGB100);
+}
+
+int dm_is_cx7(dm_dev_id_t type)
+{
+    return (type == DeviceConnectX7);
+}
+
 int dm_is_new_gen_switch(dm_dev_id_t type)
 {
-    return (dm_dev_is_switch(type));
+    return dm_dev_is_switch(type);
 }
 
 int dm_dev_is_raven_family_switch(dm_dev_id_t type)
 {
-    return (dm_dev_is_switch(type) && (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSpectrum2 ||
-                                       type == DeviceSpectrum3 || type == DeviceSpectrum4));
+    return (dm_dev_is_switch(type) &&
+            (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceQuantum3 || type == DeviceGB100 ||
+             type == DeviceSpectrum2 || type == DeviceSpectrum3 || type == DeviceSpectrum4));
 }
 
 int dm_dev_is_ib_switch(dm_dev_id_t type)
+{
+    return (dm_dev_is_switch(type) && (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceQuantum3 ||
+                                       type == DeviceGB100 || type == DeviceSwitchIB || type == DeviceSwitchIB2));
+}
+
+int dm_dev_is_eth_switch(dm_dev_id_t type)
 {
     return (dm_dev_is_switch(type) &&
-            (type == DeviceQuantum || type == DeviceQuantum2 || type == DeviceSwitchIB || type == DeviceSwitchIB2));
+            (type == DeviceSpectrum || type == DeviceSpectrum2 || type == DeviceSpectrum3 || type == DeviceSpectrum4));
 }
 
-int dm_dev_is_gearbox(dm_dev_id_t type)
+int dm_dev_is_fs3(dm_dev_id_t type)
 {
-    return (get_entry(type)->dev_type == DM_GEARBOX);
+    return type == DeviceConnectIB || type == DeviceSwitchIB || type == DeviceConnectX4 || type == DeviceConnectX4LX ||
+           type == DeviceSpectrum || type == DeviceSwitchIB2;
+}
+
+int dm_dev_is_fs4(dm_dev_id_t type)
+{
+    return type == DeviceConnectX5 || type == DeviceConnectX6 || type == DeviceConnectX6DX ||
+           type == DeviceConnectX6LX || type == DeviceConnectX7 || type == DeviceBlueField ||
+           type == DeviceBlueField2 || type == DeviceBlueField3 || type == DeviceQuantum || type == DeviceQuantum2 ||
+           type == DeviceSpectrum4 || type == DeviceSpectrum2 || type == DeviceSpectrum3 || type == DeviceGearBox ||
+           type == DeviceGearBoxManager;
+}
+
+void mft_core_init_device_dev_mgt(char* dev_name)
+{
+    mft_core_init_device(dev_name);
 }
diff --git a/dev_mgt/tools_dev_types.h b/dev_mgt/tools_dev_types.h
index 0f41ae17..33dfe15f 100644
--- a/dev_mgt/tools_dev_types.h
+++ b/dev_mgt/tools_dev_types.h
@@ -58,6 +58,7 @@ extern "C"
         DeviceStartMarker = 0, // Dummy Device - Marker for first device
                                // to let user iterate from DeviceStartMarker to DeviceEndMarker
                                // Note: Call dm_is_device_supported() to see if a device is supported by the lib.
+
         DeviceConnectX3,
         DeviceConnectIB,
         DeviceConnectX3Pro,
@@ -71,9 +72,8 @@ extern "C"
         DeviceBlueField,
         DeviceBlueField2,
         DeviceBlueField3,
-        DeviceFPGA, // UnSupported
+        DeviceBlueField4,
         DeviceSwitchIB2,
-        DeviceFPGANewton, // Unsupported
         DeviceCable,
         DeviceCableQSFP,
         DeviceCableQSFPaging,
@@ -89,14 +89,20 @@ extern "C"
         DeviceConnectX6DX,
         DeviceConnectX6LX,
         DeviceConnectX7,
+        DeviceConnectX8,
         DeviceSpectrum3, // Firebird
         DeviceSpectrum4, // Albatross
         DeviceQuantum2,  // Blackbird
+        DeviceQuantum3,  // Sunbird
         DeviceGearBox,
         DeviceGearBoxManager,
         DeviceAbirGearBox,
         DeviceCableCMIS,
         DeviceCableCMISPaging,
+        DeviceGB100,    // Blackwell
+        DeviceArcusPTC, // ArcusP Test Chip
+        DeviceArcusP,
+        DeviceArcusE,
         DeviceEndMarker // Dummy Device - Marker for indicating end of devices when iterating
     };
 
@@ -114,9 +120,11 @@ extern "C"
         DeviceConnectX6DX_HwId = 0x212,
         DeviceConnectX6LX_HwId = 0x216,
         DeviceConnectX7_HwId = 0x218,
+        DeviceConnectX8_HwId = 0x21e,
         DeviceBlueField_HwId = 0x211,
         DeviceBlueField2_HwId = 0x214,
         DeviceBlueField3_HwId = 0x21c,
+        DeviceBlueField4_HwId = 0x220,
         DeviceSwitchIB2_HwId = 0x24b,
         DeviceCableQSFP_HwId = 0x0d,
         DeviceCableQSFPaging_HwId = 0x11,
@@ -128,6 +136,8 @@ extern "C"
         DeviceSpectrum2_HwId = 0x24e,
         DeviceQuantum_HwId = 0x24d,
         DeviceQuantum2_HwId = 0x257,
+        DeviceQuantum3_HwId = 0x25b,
+        DeviceGB100_HwId = 0x2900,
         DeviceArdbeg_HwId = 0x6e,
         DeviceBaritone_HwId = 0x6b,
         DeviceMenhit_HwId = 0x72,
@@ -136,7 +146,10 @@ extern "C"
         DeviceSpectrum4_HwId = 0x254,
         DeviceGearBox_HwId = 0x252,
         DeviceGearBoxManager_HwId = 0x253,
-        DeviceAbirGearBox_HwId = 0x256
+        DeviceAbirGearBox_HwId = 0x256,
+        DeviceArcusPTC_HwId = 0x7f, // ArcusP Test Chip
+        DeviceArcusP_HwId = 0x80,
+        DeviceArcusE_HwId = 0x81,
     };
     typedef enum dm_dev_id dm_dev_id_t;
 
@@ -175,6 +188,21 @@ extern "C"
      */
     int dm_dev_is_hca(dm_dev_id_t type);
 
+    /**
+     * A predicate returning if the device is gearbox
+     */
+    int dm_dev_is_gearbox(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the device is menhit
+     */
+    int dm_is_menhit(dm_dev_id_t type);
+
+    /**
+     * A predicate returning if the device is dummy
+     */
+    int dm_dev_is_dummy(dm_dev_id_t type);
+
     /**
      * A predicate returning if the hca supports 200G speed and above
      */
@@ -232,15 +260,14 @@ extern "C"
     int dm_dev_is_raven_family_switch(dm_dev_id_t type);
 
     int dm_dev_is_ib_switch(dm_dev_id_t type);
+
+    int dm_dev_is_eth_switch(dm_dev_id_t type);
     /*
      * A predicate returning if the device is in LiveFish mode
      */
     int dm_is_livefish_mode(mfile* mf);
 
-    /**
-     * A predicate returning if the device is gearbox
-     */
-    int dm_dev_is_gearbox(dm_dev_id_t type);
+    void mft_core_init_device_dev_mgt(char* dev_name);
 
 #ifdef __cplusplus
 } /* end of 'extern "C"' */

From 31bfefe2c9036f3b91daced5d52c4f18606c0cd9 Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Thu, 14 Jul 2022 11:24:34 +0300
Subject: [PATCH 32/46] [mlxfwreset] Enable reset-level 4 (warm-boot) on UEFI
 secure boot setup

Description: In case of reset-level 4 we now allow to continue with the
reset flow

Tested OS: Linux UEFI secure boot
Tested devices: CX7
Tested flows: mstfwreset -d <dev> -l 4 r

Known gaps (with RM ticket): N/A

Issue: 3123275
---
 small_utils/mstfwreset.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index bdadbfae..ba90a2ec 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -1675,8 +1675,9 @@ def check_positive_float(val):
     global DevDBDF
     global FWResetStatusChecker
 
-    if args.reset_sync == SyncOwner.TOOL and command == "reset" and is_uefi_secureboot():   # The tool is using sysfs to access PCI config
-        raise RuntimeError("The tool is not supported on UEFI Secure Boot")                 # and it's restricted on UEFI secure boot
+    if args.reset_sync == SyncOwner.TOOL and command == "reset" and is_uefi_secureboot() \
+            and args.reset_level != CmdRegMfrl.WARM_REBOOT:                                 # The tool is using sysfs to access PCI config
+        raise RuntimeError("The tool supports only reset-level 4 on UEFI Secure Boot")  # and it's restricted on UEFI secure boot
 
     # Exit in case of virtual-machine (not implemented for FreeBSD and Windows)
     if command == "reset" and platform.system() == "Linux" and "ppc64" not in platform.machine():

From 71165da9fa74d123fcf5a8f8322011bbbf9f0a4c Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Wed, 6 Jul 2022 12:46:03 +0300
Subject: [PATCH 33/46] Use MCC flow in case of GB via switch device

Description: Since verify command usually works with MFBA/Direct-Access
unless the device is secured (then MCC) flint tried to access the GB via
switch directly (MFBA/Direct-Access) but that's not possible, and the
only access we have to this kind of device is via MCC

Tested OS: Linux
Tested devices: /dev/mst/gbox/switch_mt53104_pciconf0_gbox53108_ln8_0
Tested flows: flint_oem -d
/dev/mst/gbox/switch_mt53104_pciconf0_gbox53108_ln8_0 v

Known gaps (with RM ticket): N/A

Issue: 3129988
Change-Id: I384c9341ffd0626a30412b4a759e3e55070dc2a8

Signed-off-by: ashargorodsk <ashargorodsk@nvidia.com>
---
 fw_comps_mgr/fw_comps_mgr.cpp | 7 ++-----
 mlxfwops/lib/fw_ops.cpp       | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fw_comps_mgr/fw_comps_mgr.cpp b/fw_comps_mgr/fw_comps_mgr.cpp
index f619ee94..bcd31ffe 100644
--- a/fw_comps_mgr/fw_comps_mgr.cpp
+++ b/fw_comps_mgr/fw_comps_mgr.cpp
@@ -629,11 +629,8 @@ bool FwCompsMgr::controlFsm(fsm_command_t command,
     {
         reg_access_timeout = MAX_TOUT;
     }
-    if (currentState != FSMST_NA || expectedState != FSMST_NA)
-    {
-        DPRINTF(("controlFsm : command %s current state %s expected state %s\n", CommandsName[command],
-                 StateNames[currentState], StateNames[expectedState]));
-    }
+    DPRINTF(("controlFsm : command %s current state %s expected state %s\n", CommandsName[command],
+             StateNames[currentState], StateNames[expectedState]));
     unsigned int count = 0;
     do
     {
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index 549cfccc..09d830b0 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
@@ -975,8 +975,10 @@ FwOperations* FwOperations::FwOperationsCreate(fw_ops_params_t& fwParams)
                     fwCompsAccess->forceRelease();
                 }
 
-                if (fwParams.mccUnsupported && fwCompsAccess->queryFwInfo(&fwInfo) == true &&
-                    fwInfo.security_type.secure_fw == 0)
+                // In case MCC is not preferable (e.g verify command) but the device is secured or GB via switch
+                // We'll stay with MCC flow because we can't use MFBA/Direct-Access
+                if (fwParams.mccUnsupported && !fwCompsAccess->getMfileObj()->gb_info.is_gearbox &&
+                    fwCompsAccess->queryFwInfo(&fwInfo) == true && fwInfo.security_type.secure_fw == 0)
                 {
                     delete fwCompsAccess;
                     fwCompsAccess = (FwCompsMgr*)NULL;

From 667018f0a7310bd8a9a923083d4d0a77feb33f89 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Thu, 7 Jul 2022 09:55:44 +0300
Subject: [PATCH 34/46] Failed to extract images stored at offset > int_max_val
 in mfa file

Description: MFA files now crosses ~4.2GB due to increased number of
images. As a result, offset variable needs to be extended to type larger
than 32bit. mlx_mfa_gen will use a reserved 16bit field in toc entry for
the offset MSB bits crossing the 32bits max. In addition libmfa aligned
to this change and parse this reserved field as data_offset_msb

Tested OS: Linux
Tested devices: N/A
Tested flows: mlx_mfa_gen -p /tmp/resv.mfa -s /mswg/tmp/BINS_TEST/
/mswg/tmp/BINS_TEST/ includes 164+ images
mlxfwmanager -i /tmp/resv.mfa -extract -psid MT_0000000800
when MT_0000000800 is the psid related to the last image in
/tmp/resv.mfa

Known gaps (with RM ticket): N/A

Issue: 3131735
Change-Id: Id1ba4609463d451e09366f326f7de1a8288b1ca6

Signed-off-by: ashargorodsk <ashargorodsk@nvidia.com>
---
 libmfa/mfa.c         | 9 +++++++--
 libmfa/mfa_section.c | 3 ++-
 libmfa/mfa_section.h | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/libmfa/mfa.c b/libmfa/mfa.c
index f90d12b8..4ff3bac1 100644
--- a/libmfa/mfa.c
+++ b/libmfa/mfa.c
@@ -565,8 +565,13 @@ ssize_t mfa_get_image(mfa_desc* mfa_d, char* board_type_id, u_int8_t type, char*
         {
             continue;
         }
-        int rc = mfasec_get_data_chunk(mfa_d->data_ptr, (mfa_d->buffer + mfa_d->bufsz) - mfa_d->data_ptr,
-                                       toce_ar[i]->data_offset, toce_ar[i]->data_size, &((*buffer)[accum_size]));
+        // Since toce_ar[i]->data_offset is only 32bits we can't reach images on larger offsets so we
+        // make use of another 16bits from toce_ar[i]->data_offset_msb field
+        u_int64_t data_offset = toce_ar[i]->data_offset_msb;
+        data_offset = data_offset << 32;
+        data_offset += toce_ar[i]->data_offset;
+        int rc = mfasec_get_data_chunk(mfa_d->data_ptr, (mfa_d->buffer + mfa_d->bufsz) - mfa_d->data_ptr, data_offset,
+                                       toce_ar[i]->data_size, &((*buffer)[accum_size]));
         if (rc < 0)
         {
             res = _ERR_STR(mfa_d, -rc, "Failed to get image");
diff --git a/libmfa/mfa_section.c b/libmfa/mfa_section.c
index dee474d0..0bbd4a10 100644
--- a/libmfa/mfa_section.c
+++ b/libmfa/mfa_section.c
@@ -195,6 +195,7 @@ ssize_t mfasec_get_toc(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf)
         {
             toc_e->version[i] = __be16_to_cpu(toc_e->version[i]);
         }
+        toc_e->data_offset_msb = __be16_to_cpu(toc_e->data_offset_msb);
         toc_e->metadata_size = __be16_to_cpu(toc_e->metadata_size);
         pos += sizeof(toc_entry);
         pos += toc_e->metadata_size;
@@ -213,7 +214,7 @@ enum read_states
 
 int mfasec_get_data_chunk(u_int8_t* data_sec_ptr,
                           size_t data_sec_len,
-                          size_t chunk_offset,
+                          u_int64_t chunk_offset,
                           size_t length,
                           u_int8_t* outbuf)
 {
diff --git a/libmfa/mfa_section.h b/libmfa/mfa_section.h
index 256fa6a0..9b799bd8 100644
--- a/libmfa/mfa_section.h
+++ b/libmfa/mfa_section.h
@@ -113,7 +113,7 @@ typedef struct toc_entry
     u_int8_t reserved0;
     u_int8_t num_ver_fields;
     u_int16_t version[4];
-    u_int16_t reserved1;
+    u_int16_t data_offset_msb;
     u_int16_t metadata_size;
 } toc_entry;
 
@@ -137,7 +137,7 @@ ssize_t mfasec_get_map(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf);
 ssize_t mfasec_get_toc(u_int8_t* inbuf, size_t inbufsz, u_int8_t** outbuf);
 int mfasec_get_data_chunk(u_int8_t* data_sec_ptr,
                           size_t data_sec_len,
-                          size_t chunk_offset,
+                          u_int64_t chunk_offset,
                           size_t length,
                           u_int8_t* outbuf);
 char* mfasec_get_sub_image_type_str(int t);

From 4825774976feba5a739928d6ce24a6a97c9ed2fc Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Thu, 14 Jul 2022 11:40:44 +0300
Subject: [PATCH 35/46] [mlxfwops] Remove unsued code

Description: N/A

Tested OS: N/A
Tested devices: N/A
Tested flows: N/A

Known gaps (with RM ticket): N/A

Issue: 3042393
---
 mlxfwops/lib/fsctrl_ops.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mlxfwops/lib/fsctrl_ops.cpp b/mlxfwops/lib/fsctrl_ops.cpp
index 8cec12b6..d8562295 100644
--- a/mlxfwops/lib/fsctrl_ops.cpp
+++ b/mlxfwops/lib/fsctrl_ops.cpp
@@ -1140,10 +1140,6 @@ bool FsCtrlOperations::IsSecurityVersionViolated(u_int32_t image_security_versio
     {
         deviceEfuseSecurityVersion = _fsCtrlImgInfo.device_security_version_mfsv.efuses_sec_ver;
     }
-    else if (_fsCtrlImgInfo.device_security_version_access_method == DIRECT_ACCESS)
-    { // matanel - this case is relevant to fsctrl?
-        deviceEfuseSecurityVersion = _fsCtrlImgInfo.device_security_version_gw;
-    }
     else
     {
         deviceEfuseSecurityVersion = 0;

From f543cc14f397b94af9a6b8b94500bfdf7fa85886 Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Thu, 14 Jul 2022 11:57:54 +0300
Subject: [PATCH 36/46] [mlxfwreset][regaccess.py] Support new
 pci_rescan_required field in MFRL

Description: In case chosen reset level includes reset-trigger 3 for
MFRL we'll check if MFRL.pci_rescan_required is set and in case it does,
we'll print a warning message to the user accordingly. In addition we
also check if the new field is supported using MCAM

Tested OS: N/A
Tested devices: N/A
Tested flows: N/A

Known gaps (with RM ticket): new field in MFRL and MCAM to be moved to
external, and update MFRL in tools_layouts

Issue: 3124465
---
 reg_access/regaccess.py                   |  2 +-
 small_utils/mlxfwresetlib/cmd_reg_mcam.py | 21 +++++++++++++++++++--
 small_utils/mlxfwresetlib/cmd_reg_mfrl.py | 19 +++++++++++++++++--
 small_utils/mstfwreset.py                 |  3 +++
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/reg_access/regaccess.py b/reg_access/regaccess.py
index 6bdb5f40..a9d89f59 100644
--- a/reg_access/regaccess.py
+++ b/reg_access/regaccess.py
@@ -425,7 +425,7 @@ def sendMFRL(self, method, resetLevel=None, reset_type=None, reset_sync=None):
                 raise RegAccException("Failed to send Register MFRL: %s (%d)" % (self._err2str(rc), rc))
 
             if method == REG_ACCESS_METHOD_GET:
-                return mfrlRegisterP.contents.reset_trigger, mfrlRegisterP.contents.reset_type
+                return mfrlRegisterP.contents.reset_trigger, mfrlRegisterP.contents.reset_type, mfrlRegisterP.contents.pci_rescan_required
 
         ##########################
         def getMCAM(self):
diff --git a/small_utils/mlxfwresetlib/cmd_reg_mcam.py b/small_utils/mlxfwresetlib/cmd_reg_mcam.py
index b88cc1a1..0bcbda47 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mcam.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mcam.py
@@ -43,17 +43,34 @@ class CmdRegMcam():
     def __init__(self, reg_access):
 
         self._reg_access = reg_access
+        self._mcam_get_result = None
+
+    def get_mcam(self):
+        if self._mcam_get_result is None:
+            self._mcam_get_result = self._reg_access.getMCAM()
+        return self._mcam_get_result
+
+    def is_pci_rescan_required_supported(self):
+        """
+        Read MCAM and check if the feature "PCI rescan required" is supported
+        """
+        try:
+            mcam_get_result = self.get_mcam()
+        except BaseException:
+            pci_rescan_required_sup = 0
+        else:
+            pci_rescan_required_sup = mcam_get_result["mng_feature_cap_mask"][45]
+        return True if pci_rescan_required_sup == 1 else False
 
     def is_reset_by_fw_driver_sync_supported(self):
         """
         Read MCAM and check if the feature "reset by fw-driver sync" is supported
         """
         try:
-            mcam_get_result = self._reg_access.getMCAM()
+            mcam_get_result = self.get_mcam()
         except RegAccException as e:
             pci_sync_for_fw_update_sup = 0
         else:
-            # print(mcam_get_result)
             pci_sync_for_fw_update_sup = mcam_get_result["mng_feature_cap_mask"][19]
         return True if pci_sync_for_fw_update_sup == 1 else False
 
diff --git a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
index 039b34f5..9b83ea1d 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
@@ -92,6 +92,14 @@ def reset_type_description(cls, reset_type):
     def is_phy_less_reset(cls, reset_type):
         return reset_type == cls.PHY_LESS
 
+    @classmethod
+    def is_reset_level_trigger_is_pci_link(cls, reset_level):
+        for reset_level_ii in cls.reset_levels_db:
+            if reset_level_ii['level'] == reset_level:
+                return True if (reset_level_ii['mask'] & 0x8) == 1 else False
+        else:
+            raise RuntimeError("Reset-level {0} doesn't exist in reset-levels !".format(reset_level))
+
     def __init__(self, reg_access):
 
         self._reg_access = reg_access
@@ -102,6 +110,9 @@ def __init__(self, reg_access):
         # Read register ('get' command) from device
         reg = self._read_reg()
 
+        # Update 'pci_rescan_required' field
+        self._pci_rescan_required = reg['pci_rescan_required']
+
         # Update 'supported' field in reset_levels
         reset_level = reg['reset_level']
         for reset_level_ii in self._reset_levels:
@@ -114,15 +125,19 @@ def __init__(self, reg_access):
                 reset_type_ii['supported'] = (reset_type & reset_type_ii['mask']) != 0
 
     def _read_reg(self):
-        reset_level, reset_type = self._reg_access.sendMFRL(self._reg_access.GET)
+        reset_level, reset_type, pci_rescan_required = self._reg_access.sendMFRL(self._reg_access.GET)
         return {
             'reset_level': reset_level,
-            'reset_type': reset_type
+            'reset_type': reset_type,
+            'pci_rescan_required': pci_rescan_required
         }
 
     def _write_reg(self, reset_level, reset_type, reset_sync):
         self._reg_access.sendMFRL(self._reg_access.SET, reset_level, reset_type, reset_sync)
 
+    def is_pci_rescan_required(self):
+        return True if self._pci_rescan_required == 1 else False
+
     def query_text(self):
         'return the text for the query operation in mlxfwreset'
         # Reset levels
diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index ba90a2ec..c3fd11dd 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -1803,6 +1803,9 @@ def check_positive_float(val):
         print("{0} reset level for device, {1}:\n".format(minimal_or_requested, device))
         print("{0}: {1}".format(reset_level, mfrl.reset_level_description(reset_level)))
 
+        if CmdRegMfrl.is_reset_level_trigger_is_pci_link(reset_level) and mcam.is_pci_rescan_required_supported() and mfrl.is_pci_rescan_required():
+            print("-W- PCI rescan is required after device reset.")
+
         AskUser("Continue with reset", yes)
         execResLvl(device, devicesSD, reset_level, reset_type, reset_sync, args, mfrl)
         if FWResetStatusChecker.GetStatus() == FirmwareResetStatusChecker.FirmwareResetStatusFailed:

From 4dc08fe3fff7be58eb0b7f15ec2e9c3aa74bd571 Mon Sep 17 00:00:00 2001
From: ashargorodsk <ashargorodsk@nvidia.com>
Date: Thu, 14 Jul 2022 11:58:59 +0300
Subject: [PATCH 37/46] [mlxfwreset] fix is_reset_level_trigger_is_pci_link
 method

Description: Wrong compare for check if bit 3 is set

Tested OS: Linux
Tested devices: CX6DX
Tested flows: mlxfwreset -l3

Known gaps (with RM ticket): N/A

Issue: 3124465
---
 small_utils/mlxfwresetlib/cmd_reg_mfrl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
index 9b83ea1d..73db0670 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
@@ -96,7 +96,7 @@ def is_phy_less_reset(cls, reset_type):
     def is_reset_level_trigger_is_pci_link(cls, reset_level):
         for reset_level_ii in cls.reset_levels_db:
             if reset_level_ii['level'] == reset_level:
-                return True if (reset_level_ii['mask'] & 0x8) == 1 else False
+                return True if (reset_level_ii['mask'] & 0x8) else False
         else:
             raise RuntimeError("Reset-level {0} doesn't exist in reset-levels !".format(reset_level))
 

From 721a8de95f0b91759c3e3ed238aab20544656996 Mon Sep 17 00:00:00 2001
From: ssela <ssela@nvidia.com>
Date: Sun, 17 Jul 2022 11:33:39 +0300
Subject: [PATCH 38/46] added optional flag --op to mlxreg.

Description:

Tested OS:
Tested devices:
Tested flows:

Known gaps (with RM ticket):

Issue:
---
 mlxlink/modules/mlxlink_reg_parser.cpp |   2 +-
 mlxreg/mlxreg_parser.cpp               | 127 +++++++++++++++++++------
 mlxreg/mlxreg_parser.h                 |  14 ++-
 mlxreg/mlxreg_ui.cpp                   | 119 ++++++++++++-----------
 mlxreg/mlxreg_ui.h                     |   1 +
 5 files changed, 176 insertions(+), 87 deletions(-)

diff --git a/mlxlink/modules/mlxlink_reg_parser.cpp b/mlxlink/modules/mlxlink_reg_parser.cpp
index 2baf52ec..89e305a5 100644
--- a/mlxlink/modules/mlxlink_reg_parser.cpp
+++ b/mlxlink/modules/mlxlink_reg_parser.cpp
@@ -34,7 +34,7 @@
 
 #include "mlxlink_reg_parser.h"
 
-MlxlinkRegParser::MlxlinkRegParser() : RegAccessParser("", "", NULL, 0)
+MlxlinkRegParser::MlxlinkRegParser() : RegAccessParser("", "", "", NULL, 0)
 {
     _mf = NULL;
     _regLib = NULL;
diff --git a/mlxreg/mlxreg_parser.cpp b/mlxreg/mlxreg_parser.cpp
index 455c3257..390cac35 100644
--- a/mlxreg/mlxreg_parser.cpp
+++ b/mlxreg/mlxreg_parser.cpp
@@ -45,12 +45,14 @@ using namespace mlxreg;
  ************************************/
 RegAccessParser::RegAccessParser(string data,
                                  string indexes,
+                                 string ops,
                                  AdbInstance* regNode,
                                  std::vector<u_int32_t> buffer,
                                  bool ignore_ro)
 {
     _data = data;
     _indexes = indexes;
+    _ops = ops;
     _regNode = regNode;
     _ignore_ro = ignore_ro;
     output_file = "";
@@ -77,10 +79,16 @@ RegAccessParser::RegAccessParser(string data,
 /************************************
  * Function: RegParser
  ************************************/
-RegAccessParser::RegAccessParser(string data, string indexes, AdbInstance* regNode, u_int32_t len, bool ignore_ro)
+RegAccessParser::RegAccessParser(string data,
+                                 string indexes,
+                                 string ops,
+                                 AdbInstance* regNode,
+                                 u_int32_t len,
+                                 bool ignore_ro)
 {
     _data = data;
     _indexes = indexes;
+    _ops = ops;
     _regNode = regNode;
     _ignore_ro = ignore_ro;
     output_file = "";
@@ -125,6 +133,8 @@ std::vector<u_int32_t> RegAccessParser::genBuff()
 std::vector<u_int32_t> RegAccessParser::genBuffKnown()
 {
     parseIndexes();
+    parseOps();
+
     // Update buffer with data values
     if (_data != "")
     {
@@ -157,47 +167,91 @@ std::vector<u_int32_t> RegAccessParser::genBuffUnknown()
  ************************************/
 void RegAccessParser::parseIndexes()
 {
-    std::vector<string> idxTokens = strSplit(_indexes, ',', false);
-    std::vector<string> expectedIdxs = getAllIndexes(_regNode);
-    std::vector<string> foundIdxs;
-    // Update buffer with indexes values
-    for (std::vector<std::string>::size_type i = 0; i != idxTokens.size(); i++)
+    std::vector<string> tokens = strSplit(_indexes, ',', false);
+    std::vector<string> valid_tokens = getAllIndexes(_regNode);
+    parseAccessType(tokens, valid_tokens, INDEX);
+}
+
+/************************************
+ * Function: parseOps
+ ************************************/
+void RegAccessParser::parseOps()
+{
+    std::vector<string> tokens = strSplit(_ops, ',', false);
+    std::vector<string> valid_tokens = getAllOps(_regNode);
+    parseAccessType(tokens, valid_tokens, OP);
+}
+
+/************************************
+ * Function: accessTypeToString
+ ************************************/
+const string RegAccessParser::accessTypeToString(access_type_t accessType)
+{
+    static map<access_type_t, string> access_type_map;
+    if (access_type_map.size() == 0)
     {
-        std::vector<std::string> idx = strSplit(idxTokens[i], '=', true);
-        string idxName = idx[0];
-        string idxVal = idx[1];
+        access_type_map.insert(pair<access_type_t, string>(INDEX, "INDEX"));
+        access_type_map.insert(pair<access_type_t, string>(OP, "OP"));
+    }
+    map<access_type_t, string>::iterator itr = access_type_map.find(accessType);
+    if (itr != access_type_map.end())
+    {
+        return itr->second;
+    }
+    return string("Unknown"); // should not get here
+}
+
+/************************************
+ * Function: parseAccessType
+ ************************************/
+void RegAccessParser::parseAccessType(std::vector<string> tokens,
+                                      std::vector<string> validTokens,
+                                      access_type_t accessType)
+{
+    std::vector<string> foundTokens;
+
+    // Update buffer with values (indexes/ops)
+    for (std::vector<std::string>::size_type i = 0; i != tokens.size(); i++)
+    {
+        std::vector<std::string> tokenPair = strSplit(tokens[i], '=', true);
+        string name = tokenPair[0];
+        string val = tokenPair[1];
         u_int32_t uintVal;
-        strToUint32((char*)idxVal.c_str(), uintVal);
-        AdbInstance* field = getField(idxName);
-        // Make sure that the field is INDEX
-        if (std::find(expectedIdxs.begin(), expectedIdxs.end(), idxName) != expectedIdxs.end())
+        strToUint32((char*)val.c_str(), uintVal);
+        AdbInstance* field = getField(name);
+        // Make sure that the given field name is valid
+        if (std::find(validTokens.begin(), validTokens.end(), name) != validTokens.end())
         {
-            if (std::find(foundIdxs.begin(), foundIdxs.end(), idxName) != foundIdxs.end())
+            if (std::find(foundTokens.begin(), foundTokens.end(), name) != foundTokens.end())
             {
-                throw MlxRegException("You wrote field: %s twice", idxName.c_str());
+                throw MlxRegException("Field: %s appears twice.", name.c_str());
             }
-            foundIdxs.push_back(idxName);
+            foundTokens.push_back(name);
         }
         else
         {
-            throw MlxRegException("Field: %s is not an index.", idxName.c_str());
+            throw MlxRegException("Field: %s is not a %s.", name.c_str(), this->accessTypeToString(accessType).c_str());
         }
         updateBuffer(field->offset, field->size, uintVal);
     }
-    // Make sure that all the indexes are set
-    for (std::vector<std::string>::size_type i = 0; i != expectedIdxs.size(); i++)
+
+    if (accessType == INDEX)
     {
-        bool idxFound = false;
-        for (std::vector<std::string>::size_type j = 0; j != foundIdxs.size(); j++)
+        // Make sure that all the indexes are set
+        for (std::vector<std::string>::size_type i = 0; i != validTokens.size(); i++)
         {
-            if (expectedIdxs[i] == foundIdxs[j])
+            bool idxFound = false;
+            for (std::vector<std::string>::size_type j = 0; j != foundTokens.size(); j++)
             {
-                idxFound = true;
+                if (validTokens[i] == foundTokens[j])
+                {
+                    idxFound = true;
+                }
+            }
+            if (!idxFound)
+            {
+                throw MlxRegException("Index: %s was not provided", validTokens[i].c_str());
             }
-        }
-        if (!idxFound)
-        {
-            throw MlxRegException("Index: %s was not provided", expectedIdxs[i].c_str());
         }
     }
 }
@@ -433,6 +487,11 @@ bool RegAccessParser::isIndex(AdbInstance* field)
     return checkAccess(field, "INDEX");
 }
 
+bool RegAccessParser::isOP(AdbInstance* field)
+{
+    return checkAccess(field, "OP");
+}
+
 /************************************
  * Function: getAllIndexes
  ************************************/
@@ -450,6 +509,20 @@ std::vector<string> RegAccessParser::getAllIndexes(AdbInstance* node)
     return indexes;
 }
 
+std::vector<string> RegAccessParser::getAllOps(AdbInstance* node)
+{
+    std::vector<string> ops;
+    std::vector<AdbInstance*> subItems = node->getLeafFields(true);
+    for (std::vector<AdbInstance*>::size_type i = 0; i != subItems.size(); i++)
+    {
+        if (isOP(subItems[i]))
+        {
+            ops.push_back(subItems[i]->name);
+        }
+    }
+    return ops;
+}
+
 void RegAccessParser::updateField(string field_name, u_int32_t value)
 {
     AdbInstance* field = getField(field_name);
diff --git a/mlxreg/mlxreg_parser.h b/mlxreg/mlxreg_parser.h
index 122778ce..b7dd130b 100644
--- a/mlxreg/mlxreg_parser.h
+++ b/mlxreg/mlxreg_parser.h
@@ -55,18 +55,25 @@ class RegAccessParser
 public:
     RegAccessParser(string data,
                     string indexes,
+                    string ops,
                     AdbInstance* regNode,
                     std::vector<u_int32_t> buffer,
                     bool ignore_ro = false);
-    RegAccessParser(string data, string indexes, AdbInstance* regNode, u_int32_t len, bool ignore_ro = false);
+    RegAccessParser(string data, string indexes, string ops, AdbInstance* regNode, u_int32_t len, bool ignore_ro = false);
     std::vector<u_int32_t> genBuff();
     u_int32_t getDataLen() { return _len; };
     static void strToUint32(char* str, u_int32_t& uint);
     static string getAccess(const AdbInstance* field);
+    enum access_type_t
+    {
+        INDEX,
+        OP
+    };
 
 protected:
     string _data;
     string _indexes;
+    string _ops;
     u_int32_t _len;
     AdbInstance* _regNode;
     parseMode _parseMode;
@@ -75,7 +82,9 @@ class RegAccessParser
     bool _ignore_ro;
     std::vector<u_int32_t> genBuffUnknown();
     std::vector<u_int32_t> genBuffKnown();
+    void parseAccessType(std::vector<string> tokens, std::vector<string> validTokens, access_type_t accessType);
     void parseIndexes();
+    void parseOps();
     void parseData();
     void parseUnknown();
     bool checkFieldWithPath(AdbInstance* field, u_int32_t idx, std::vector<string>& fieldsChain);
@@ -87,7 +96,10 @@ class RegAccessParser
     u_int32_t getFieldValue(string field_name, std::vector<u_int32_t>& buff);
     bool isRO(AdbInstance* field);
     bool isIndex(AdbInstance* field);
+    bool isOP(AdbInstance* field);
     std::vector<string> getAllIndexes(AdbInstance* node);
+    std::vector<string> getAllOps(AdbInstance* node);
+    const std::string accessTypeToString(access_type_t accessType);
 
 private:
     bool checkAccess(const AdbInstance* field, const string accessStr);
diff --git a/mlxreg/mlxreg_ui.cpp b/mlxreg/mlxreg_ui.cpp
index bbd63389..d18d4ad9 100644
--- a/mlxreg/mlxreg_ui.cpp
+++ b/mlxreg/mlxreg_ui.cpp
@@ -85,33 +85,35 @@
     printf("\n");
 
 /************************************
- * FLAGS Constants
- ************************************/
-#define DEVICE_FLAG "device"
-#define DEVICE_FLAG_SHORT 'd'
-#define HELP_FLAG "help"
-#define HELP_FLAG_SHORT 'h'
-#define VERSION_FLAG "version"
-#define VERSION_FLAG_SHORT 'v'
-#define ADB_FILE_FLAG "adb_file"
-#define ADB_FILE_FLAG_SHORT 'a'
-#define REG_NAME_FLAG "reg_name"
-#define REG_NAME_FLAG_SHORT ' '
-#define REG_ID_FLAG "reg_id"
-#define REG_ID_FLAG_SHORT ' '
-#define IDXES_FLAG "indexes"
-#define IDXES_FLAG_SHORT 'i'
-#define REG_LEN_FLAG "reg_len"
-#define REG_LEN_FLAG_SHORT ' '
-#define OP_GET_FLAG "get"
-#define OP_GET_FLAG_SHORT 'g'
-#define OP_SET_FLAG "set"
-#define OP_SET_FLAG_SHORT 's'
-#define OP_SHOW_REG_FLAG "show_reg"
-#define OP_SHOW_REG_FLAG_SHORT ' '
-#define OP_SHOW_REGS_FLAG "show_regs"
-#define OP_SHOW_REGS_FLAG_SHORT ' '
-#define OP_SHOW_ALL_REGS_FLAG "show_all_regs"
+* FLAGS Constants
+************************************/
+#define DEVICE_FLAG                 "device"
+#define DEVICE_FLAG_SHORT           'd'
+#define HELP_FLAG                   "help"
+#define HELP_FLAG_SHORT             'h'
+#define VERSION_FLAG                "version"
+#define VERSION_FLAG_SHORT          'v'
+#define ADB_FILE_FLAG               "adb_file"
+#define ADB_FILE_FLAG_SHORT         'a'
+#define REG_NAME_FLAG               "reg_name"
+#define REG_NAME_FLAG_SHORT         ' '
+#define REG_ID_FLAG                 "reg_id"
+#define REG_ID_FLAG_SHORT           ' '
+#define IDXES_FLAG                  "indexes"
+#define IDXES_FLAG_SHORT            'i'
+#define OPS_FLAG                    "op"
+#define OPS_FLAG_SHORT              'o'
+#define REG_LEN_FLAG                "reg_len"
+#define REG_LEN_FLAG_SHORT          ' '
+#define OP_GET_FLAG                 "get"
+#define OP_GET_FLAG_SHORT           'g'
+#define OP_SET_FLAG                 "set"
+#define OP_SET_FLAG_SHORT           's'
+#define OP_SHOW_REG_FLAG            "show_reg"
+#define OP_SHOW_REG_FLAG_SHORT      ' '
+#define OP_SHOW_REGS_FLAG           "show_regs"
+#define OP_SHOW_REGS_FLAG_SHORT     ' '
+#define OP_SHOW_ALL_REGS_FLAG       "show_all_regs"
 #define OP_SHOW_ALL_REGS_FLAG_SHORT ' '
 #define IGNORE_CAP_CHECK_FLAG "ignore_cap_check"
 #define IGNORE_CAP_CHECK_FLAG_SHORT ' '
@@ -177,14 +179,15 @@ MlxRegUi::~MlxRegUi()
  ************************************/
 void MlxRegUi::initCmdParser()
 {
-    AddOptions(DEVICE_FLAG, DEVICE_FLAG_SHORT, "MstDevice", "Mellanox mst device name");
-    AddOptions(HELP_FLAG, HELP_FLAG_SHORT, "", "Show help message and exit");
-    AddOptions(VERSION_FLAG, VERSION_FLAG_SHORT, "", "Show version and exit");
-    AddOptions(ADB_FILE_FLAG, ADB_FILE_FLAG_SHORT, "AdbFile", "External ADB file");
-    AddOptions(REG_NAME_FLAG, REG_NAME_FLAG_SHORT, "RegisterName", "Access register name");
-    AddOptions(REG_ID_FLAG, REG_ID_FLAG_SHORT, "RegisterID", "Access register ID");
-    AddOptions(IDXES_FLAG, IDXES_FLAG_SHORT, "RegisterData", "Register data");
-    AddOptions(REG_LEN_FLAG, REG_LEN_FLAG_SHORT, "RegisterDataLen", "Register data length");
+    AddOptions(DEVICE_FLAG,       DEVICE_FLAG_SHORT, "MstDevice", "Mellanox mst device name");
+    AddOptions(HELP_FLAG,         HELP_FLAG_SHORT, "", "Show help message and exit");
+    AddOptions(VERSION_FLAG,      VERSION_FLAG_SHORT, "", "Show version and exit");
+    AddOptions(ADB_FILE_FLAG,     ADB_FILE_FLAG_SHORT, "AdbFile", "External ADB file");
+    AddOptions(REG_NAME_FLAG,     REG_NAME_FLAG_SHORT, "RegisterName", "Access register name");
+    AddOptions(REG_ID_FLAG,       REG_ID_FLAG_SHORT, "RegisterID", "Access register ID");
+    AddOptions(IDXES_FLAG,        IDXES_FLAG_SHORT, "RegisterData", "Register data");
+    AddOptions(OPS_FLAG,          OPS_FLAG_SHORT, "RegisterData", "Register data");
+    AddOptions(REG_LEN_FLAG,      REG_LEN_FLAG_SHORT, "RegisterDataLen", "Register data length");
     AddOptions(IGNORE_CAP_CHECK_FLAG, IGNORE_CAP_CHECK_FLAG_SHORT, "", "");
     AddOptions(IGNORE_REG_CHECK_FLAG, IGNORE_REG_CHECK_FLAG_SHORT, "", "");
     AddOptions(OP_GET_FLAG, OP_GET_FLAG_SHORT, "", "Register access GET");
@@ -240,20 +243,20 @@ void MlxRegUi::printHelp()
     // print options
     printf("\n");
     printf(IDENT "OPTIONS:\n");
-    printFlagLine(HELP_FLAG_SHORT, HELP_FLAG, "", "Display help message.");
-    printFlagLine(VERSION_FLAG_SHORT, VERSION_FLAG, "", "Display version info.");
-    printFlagLine(DEVICE_FLAG_SHORT, DEVICE_FLAG, "device", "Perform operation for a specified mst device.");
-    printFlagLine(ADB_FILE_FLAG_SHORT, ADB_FILE_FLAG, "adb_file", "An external ADB file");
-    printFlagLine(REG_NAME_FLAG_SHORT, REG_NAME_FLAG, "reg_name", "Known access register name");
-    printFlagLine(REG_ID_FLAG_SHORT, REG_ID_FLAG, "reg_ID", "Access register ID");
-    printFlagLine(REG_LEN_FLAG_SHORT, REG_LEN_FLAG, "reg_length", "Access register layout length (bytes)");
-    printFlagLine(IDXES_FLAG_SHORT, IDXES_FLAG, "idxs_vals", "Register indexes");
-    printFlagLine(OP_GET_FLAG_SHORT, OP_GET_FLAG, "", "Register access GET");
-    printFlagLine(OP_SET_FLAG_SHORT, OP_SET_FLAG, "reg_dataStr", "Register access SET");
-    printFlagLine(OP_SHOW_REG_FLAG_SHORT, OP_SHOW_REG_FLAG, "reg_name",
-                  "Print the fields of a given reg access (must have reg_name)");
-    printFlagLine(OP_SHOW_REGS_FLAG_SHORT, OP_SHOW_REGS_FLAG, "", "Print all available reg access'");
-    printFlagLine(FORCE_FLAG_SHORT, FORCE_FLAG, "", "Non-interactive mode, answer yes to all questions");
+    printFlagLine(HELP_FLAG_SHORT,          HELP_FLAG,         "", "Display help message.");
+    printFlagLine(VERSION_FLAG_SHORT,       VERSION_FLAG,      "", "Display version info.");
+    printFlagLine(DEVICE_FLAG_SHORT,        DEVICE_FLAG,       "device", "Perform operation for a specified mst device.");
+    printFlagLine(ADB_FILE_FLAG_SHORT,      ADB_FILE_FLAG,     "adb_file", "An external ADB file");
+    printFlagLine(REG_NAME_FLAG_SHORT,      REG_NAME_FLAG,     "reg_name", "Known access register name");
+    printFlagLine(REG_ID_FLAG_SHORT,        REG_ID_FLAG,       "reg_ID", "Access register ID");
+    printFlagLine(REG_LEN_FLAG_SHORT,       REG_LEN_FLAG,      "reg_length", "Access register layout length (bytes)");
+    printFlagLine(IDXES_FLAG_SHORT,         IDXES_FLAG,        "idxs_vals", "Register indexes");
+    printFlagLine(OPS_FLAG_SHORT,           OPS_FLAG,          "ops_vals", "Register optional fields");
+    printFlagLine(OP_GET_FLAG_SHORT,        OP_GET_FLAG,       "", "Register access GET");
+    printFlagLine(OP_SET_FLAG_SHORT,        OP_SET_FLAG,       "reg_dataStr", "Register access SET");
+    printFlagLine(OP_SHOW_REG_FLAG_SHORT,   OP_SHOW_REG_FLAG,  "reg_name", "Print the fields of a given reg access (must have reg_name)");
+    printFlagLine(OP_SHOW_REGS_FLAG_SHORT,  OP_SHOW_REGS_FLAG, "", "Print all available reg access'");
+    printFlagLine(FORCE_FLAG_SHORT,         FORCE_FLAG,        "", "Non-interactive mode, answer yes to all questions");
 
     // print usage examples
     printf("\n");
@@ -412,9 +415,11 @@ ParseStatus MlxRegUi::HandleOption(string name, string value)
     {
         _indexesStr = value;
         return PARSE_OK;
+    } else if (name == OPS_FLAG) {
+        _opsStr = value;
+        return PARSE_OK;
     }
-    else if (name == REG_NAME_FLAG)
-    {
+    else if (name == REG_NAME_FLAG) {
         CHECK_UNIQUE_UINT(_regID);
         CHECK_UNIQUE_UINT(_dataLen);
         _regName = value;
@@ -551,8 +556,7 @@ void MlxRegUi::paramValidate()
 
 void MlxRegUi::readFromFile(string file_name, vector<u_int32_t>& buff, int len)
 {
-    ifstream file;
-    file.open(file_name.c_str(), ios::binary);
+    ifstream file(file_name.c_str(), ios::binary);
 
     for (int idx = 0; idx < (len / 4); idx++)
     {
@@ -570,8 +574,7 @@ void MlxRegUi::readFromFile(string file_name, vector<u_int32_t>& buff, int len)
 
 void MlxRegUi::writeToFile(string file_name, vector<u_int32_t> buff)
 {
-    ofstream file;
-    file.open(file_name.c_str(), ios::binary | ios::in | ios::out); // Overwrite the file (in/out)
+    ofstream file(file_name.c_str(), ios::binary | ios::in | ios::out);// Overwrite the file (in/out)
     for (unsigned int idx = 0; idx < buff.size(); idx++)
     {
         u_int32_t data = __cpu_to_be32(buff[idx]);
@@ -684,7 +687,7 @@ void MlxRegUi::run(int argc, char** argv)
             {
                 regNode = _mlxRegLib->findAdbNode(_regName);
             }
-            RegAccessParser parser(_dataStr, _indexesStr, regNode, _dataLen);
+            RegAccessParser parser(_dataStr, _indexesStr, _opsStr, regNode, _dataLen);
             buff = parser.genBuff();
             printf("Sending access register...\n\n");
             if (_regName != "")
@@ -714,7 +717,7 @@ void MlxRegUi::run(int argc, char** argv)
                 regNode = _mlxRegLib->findAdbNode(_regName);
             }
             // Read current register data into buffer
-            RegAccessParser parserGet(_dataStr, _indexesStr, regNode, _dataLen, _ignore_ro);
+            RegAccessParser parserGet(_dataStr, _indexesStr, _opsStr, regNode, _dataLen, _ignore_ro);
             buff = parserGet.genBuff();
             if (_regName != "")
             { // Known mode
@@ -725,7 +728,7 @@ void MlxRegUi::run(int argc, char** argv)
                 _mlxRegLib->sendRegister(_regID, MACCESS_REG_METHOD_GET, buff);
             }
             // Update the register buffer with user inputs
-            RegAccessParser parser(_dataStr, _indexesStr, regNode, buff, _ignore_ro);
+            RegAccessParser parser(_dataStr, _indexesStr, _opsStr, regNode, buff, _ignore_ro);
             buff = parser.genBuff();
             if (_output_file != "")
             {
diff --git a/mlxreg/mlxreg_ui.h b/mlxreg/mlxreg_ui.h
index fda029dd..74ec84b6 100644
--- a/mlxreg/mlxreg_ui.h
+++ b/mlxreg/mlxreg_ui.h
@@ -88,6 +88,7 @@ class MlxRegUi : public CommandLineRequester
     u_int32_t _regID;
     string _dataStr;
     string _indexesStr;
+    string _opsStr;
     u_int32_t _dataLen;
     bool _ignoreCapCheck;
     MlxRegOper _op;

From 644c0fbfcf4725529ce55b9e5e6e8e31d39d2063 Mon Sep 17 00:00:00 2001
From: Oded Burstein <oburstein@nvidia.com>
Date: Sun, 17 Jul 2022 12:01:52 +0300
Subject: [PATCH 39/46] fixed compilation issue in dev_mgt

---
 dev_mgt/dev_mgt.py        | 1 -
 dev_mgt/tools_dev_types.c | 9 ++-------
 dev_mgt/tools_dev_types.h | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dev_mgt/dev_mgt.py b/dev_mgt/dev_mgt.py
index 24e1af67..4700c254 100755
--- a/dev_mgt/dev_mgt.py
+++ b/dev_mgt/dev_mgt.py
@@ -73,7 +73,6 @@ def __init__(self, dev, i2c_secondary= -1):
                 self._mstdev = mtcr.MstDevice(dev, i2c_secondary)
                 if not self._mstdev:
                     raise DevMgtException("Failed to open device (%s): %s" % (dev, os.strerror(ctypes.get_errno())))
-            DEV_MGT.mft_core_init_device_dev_mgt(self._mstdev.mdev)
 
         ##########################
         def isLivefishMode(self):
diff --git a/dev_mgt/tools_dev_types.c b/dev_mgt/tools_dev_types.c
index 2807ea84..fb34d7ed 100644
--- a/dev_mgt/tools_dev_types.c
+++ b/dev_mgt/tools_dev_types.c
@@ -702,7 +702,7 @@ static int dm_get_device_id_inner(mfile* mf, dm_dev_id_t* ptr_dm_dev_id, u_int32
     }
     else
     {
-        if (read_device_id(mf, &dword) != 4)
+        if (mread4(mf, DEVID_ADDR, &dword) != 4)
         {
             return CRSPACE_READ_ERROR;
         }
@@ -1024,9 +1024,4 @@ int dm_dev_is_fs4(dm_dev_id_t type)
            type == DeviceBlueField2 || type == DeviceBlueField3 || type == DeviceQuantum || type == DeviceQuantum2 ||
            type == DeviceSpectrum4 || type == DeviceSpectrum2 || type == DeviceSpectrum3 || type == DeviceGearBox ||
            type == DeviceGearBoxManager;
-}
-
-void mft_core_init_device_dev_mgt(char* dev_name)
-{
-    mft_core_init_device(dev_name);
-}
+}
\ No newline at end of file
diff --git a/dev_mgt/tools_dev_types.h b/dev_mgt/tools_dev_types.h
index 33dfe15f..00737229 100644
--- a/dev_mgt/tools_dev_types.h
+++ b/dev_mgt/tools_dev_types.h
@@ -267,8 +267,6 @@ extern "C"
      */
     int dm_is_livefish_mode(mfile* mf);
 
-    void mft_core_init_device_dev_mgt(char* dev_name);
-
 #ifdef __cplusplus
 } /* end of 'extern "C"' */
 #endif

From f73951932b428dae200bf37e1af821fe99c37fc8 Mon Sep 17 00:00:00 2001
From: Harel Karni <hkarni@nvidia.com>
Date: Mon, 18 Jul 2022 15:35:04 +0300
Subject: [PATCH 40/46] [resourceparse] adding support for union selectors

Description:
for US nodes, show only the selected field

Tested OS: Linux64
Tested devices:
Tested flows:

Known gaps (with RM ticket):

Issue: 3127046
---
 resourceparse/parsers/AdbParser.py | 171 ++++++++++++++++++++++++-----
 resourceparse/parsers/Parser.py    |  29 +++--
 resourceparse/utils/constants.py   |   2 +
 3 files changed, 163 insertions(+), 39 deletions(-)

diff --git a/resourceparse/parsers/AdbParser.py b/resourceparse/parsers/AdbParser.py
index b3dc611a..6ee7176d 100755
--- a/resourceparse/parsers/AdbParser.py
+++ b/resourceparse/parsers/AdbParser.py
@@ -40,6 +40,7 @@
 #
 #######################################################
 import xml.etree.ElementTree as ET
+import utils.constants as CONST
 
 
 class AdbParser:
@@ -56,8 +57,71 @@ def __init__(self, adb_path):
             self._build_nodes_with_seg_id()
             # fix the offset since subnode should contain the offset with the addition of his parent.
             self._fix_nodes_offset(self.segment_id_nodes_dict)
+            # update the union dict in the layout item if it has union_selector attribute
+            self._update_union_dict()
         except Exception as _:
-            raise Exception("Fail to parse the ADB file")
+            raise Exception("Failed to parse the ADB file")
+
+    def _update_union(self, layout_item):
+        """This method go over all the subitems and perform union dict updating
+            to all items recursively.
+        """
+        if layout_item.uSelector and layout_item.uSelector.selector_full_path:
+            selector_field, full_path, offset = self._get_explicit_field_path_and_offset(layout_item.parent, layout_item.uSelector.selector_full_path)
+            self.set_union_properties(self._get_enum_dict_from_field(selector_field), full_path, offset)
+        for item in layout_item.subItems:
+            self._update_union(item)
+
+    def _update_union_dict(self):
+        """This method go over all the segments in the dictionary and
+        send them to union dict update.
+        """
+        for seg in self.segment_id_nodes_dict.values():
+            self._update_union(seg)
+
+    def _get_enum_dict_from_field(self, selector_field: ET.Element):
+        """This method gets field that contains enums for union_selector and build a dictionary with
+        it's values and enums.
+        """
+        selector_dict = {}
+        enum_lst = selector_field.attrs['enum'].split(',')
+        if len(enum_lst) == 0:
+            raise Exception("Error - enum attribute for field {0} is empty!".format(selector_field['name']))
+
+        for enum in enum_lst:
+            enum = enum.split('=')
+            if len(enum) != 2:
+                raise Exception("Error - Failed to parse enum attribute {0} for field {1}".format(str(enum), selector_field['name']))
+            selector_dict[int(enum[1], 0)] = enum[0]
+
+        return selector_dict
+
+    def _get_explicit_field_path_and_offset(self, layout_item, relative_path: str):
+        """This method gets a node's name and a relative path and returns the full path to the field, the
+        explicit field to the enum related to the union selector and it's offset.
+        """
+        path = relative_path.split('.')
+        if len(path) == 0:
+            raise Exception("Error - wrong relative path {0} for node {1}".format(layout_item.name, relative_path))
+        full_path = path
+        if path[0] in CONST.PARENT_LST:
+            current_node = layout_item
+            full_path[0] = layout_item.name
+        else:
+            current_node = self._retrieve_layout_item_by_name(path[0])
+        try:
+            if current_node is None:
+                raise Exception("Failed to find node: {0}".format(current_node.name))
+            for child in path[1:]:
+                for item in current_node.subItems:
+                    if item.name == child:
+                        current_node = item
+                        break
+                if current_node is None:
+                    raise Exception("Error - Failed to find field {0} in node {1}, wrong path {2}".format(child, current_node.name, relative_path))
+            return current_node, full_path, current_node.offset
+        except Exception as _:
+            raise Exception("Failed to get the explicit field")
 
     def _build_xml_elements_dict(self):
         self._node_xml_elements = {}
@@ -170,7 +234,7 @@ def _build_nodes_with_seg_id(self):
                 adb_layout_item = self._node_to_AdbLayoutItem(node)
                 self.segment_id_nodes_dict[node.attrib["segment_id"]] = adb_layout_item
 
-    def _retrieve_node_by_name(self, node_name):
+    def _retrieve_node_by_name(self, node_name: str):
         """This method return the node with the
         wanted name, if not found return None.
         """
@@ -179,8 +243,21 @@ def _retrieve_node_by_name(self, node_name):
         else:  # Missing-nodes feature
             return None
 
-    def _build_subitems(self, node):
-        """This method build the subitems of the specific node
+    def _retrieve_layout_item_by_name(self, name):
+        """This method return the layout item with the wanted name,
+        if it wasn't found returns None
+        """
+        for seg in self.segment_id_nodes_dict.values():
+            if seg.name == name:
+                return seg
+            for subItem in seg.subItems:
+                if subItem.name == name:
+                    return subItem
+        return None
+
+    def _build_subitems(self, node: ET.Element, parent):
+        """This method build the subitems of the specific node.
+        :param node: always field element except from the root which is node.
         """
         sub_items = []
         counter = 0
@@ -194,16 +271,23 @@ def _build_subitems(self, node):
                 if not self._check_expressions(item.attrib['inst_if']):
                     continue
             if "low_bound" in item.attrib and "high_bound" in item.attrib:
-                self._extract_array_to_list(counter, item, sub_items)
+                self._extract_array_to_list(node, counter, item, sub_items, parent)
             else:
                 adb_layout_item = self._node_to_AdbLayoutItem(item)
                 if adb_layout_item:
+                    adb_layout_item.parent = parent
+                    adb_layout_item.attrs = item.attrib
+                    if 'union_selector' in item.attrib:
+                        adb_layout_item.uSelector = AdbUnionSelector()
+                        adb_layout_item.uSelector.selector_full_path = item.attrib['union_selector']
                     sub_items.insert(counter, adb_layout_item)
                     counter += 1
         return sub_items
 
-    def _extract_array_to_list(self, index, item, subitems_list):
+    def _extract_array_to_list(self, node: ET.Element, index, item, subitems_list, parent):
         """This method build insert array items to a list form a specific index.
+        :param node: always field element except from the root which is node.
+        :param parent: layout item representing the parent of the array.
         """
         name = item.attrib["name"]
         start_index = int(item.attrib["low_bound"], 10)
@@ -220,35 +304,45 @@ def _extract_array_to_list(self, index, item, subitems_list):
 
         for i in range(start_index, end_index):
             adb_layout_item = AdbLayoutItem()
+            # adb_layout_item.attrs = node.attrib
+            adb_layout_item.parent = parent
             adb_layout_item.nodeDesc = self._node_to_node_desc(item)
             adb_layout_item.name = name + "[" + str(i) + "]"
             adb_layout_item.size = calculated_size
             adb_layout_item.offset = current_offset
-            if "subnode" in item.attrib:
-                sub_node = self._retrieve_node_by_name(item.attrib["subnode"])
-                if sub_node:
-                    if "attr_is_union" in sub_node.attrib:
-                        adb_layout_item.nodeDesc.isUnion = self._parse_union(sub_node.attrib["attr_is_union"])
-                    adb_layout_item.subItems = self._build_subitems(sub_node)  # List of the child items (for nodes only)
+            try:
+                if "subnode" in item.attrib:
+                    sub_node = self._retrieve_node_by_name(item.attrib["subnode"])
+                    if sub_node:
+                        if "attr_is_union" in sub_node.attrib:
+                            adb_layout_item.nodeDesc.isUnion = self._parse_union(sub_node.attrib["attr_is_union"])
+                        adb_layout_item.subItems = self._build_subitems(sub_node, parent)  # List of the child items (for nodes only)
+            except Exception as _:
+                raise Exception("Failed to extract array to list from node {0}".format(node['name']))
             subitems_list.insert(index, adb_layout_item)
             current_offset += calculated_size
             index += 1
 
-    def _node_to_AdbLayoutItem(self, node):
+    def _node_to_AdbLayoutItem(self, node: ET.Element):
         """This method build adb layout field from a given node.
+        :param node: always field element except from the root which is node.
         """
         adb_layout_item = AdbLayoutItem()
         # adb_layout_item.fieldDesc = None  # Reference to "AdbFieldDesc" object, always != None
         # adb_layout_item.parent = None  # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
         adb_layout_item.name = node.attrib["name"]
+        adb_layout_item.attrs = node.attrib
         adb_layout_item.nodeDesc = self._node_to_node_desc(node)  # For leafs must be None
-        if "subnode" in node.attrib:
-            sub_node = self._retrieve_node_by_name(node.attrib["subnode"])
-            if "attr_is_union" in sub_node.attrib:
-                adb_layout_item.nodeDesc.isUnion = self._parse_union(sub_node.attrib["attr_is_union"])
-            adb_layout_item.subItems = self._build_subitems(sub_node)  # List of the child items (for nodes only)
-        else:
-            adb_layout_item.subItems = self._build_subitems(node)
+        try:
+            if "subnode" in node.attrib:
+                sub_node = self._retrieve_node_by_name(node.attrib["subnode"])
+                if "attr_is_union" in sub_node.attrib:
+                    adb_layout_item.nodeDesc.isUnion = self._parse_union(sub_node.attrib["attr_is_union"])
+                adb_layout_item.subItems = self._build_subitems(sub_node, adb_layout_item)  # List of the child items (for nodes only)
+            else:
+                adb_layout_item.subItems = self._build_subitems(node, adb_layout_item)
+        except Exception as _:
+            raise Exception("Failed to create a valid layout from node {0}".format(node['name']))
 
         if "offset" in node.attrib:
             adb_layout_item.offset = self._parse_node_size(node.attrib["offset"])
@@ -259,7 +353,7 @@ def _node_to_AdbLayoutItem(self, node):
         # adb_layout_item.vars = {}  # all variable relevant to this item after evaluation
         return adb_layout_item
 
-    def _node_to_node_desc(self, node):
+    def _node_to_node_desc(self, node: ET.Element):
         """This method build adb desc field from a given node.
         """
         node_description = AdbNodeDesc()
@@ -308,15 +402,16 @@ class AdbLayoutItem(object):
     ##########################
     def __init__(self):
         self.fieldDesc = None        # Reference to "AdbFieldDesc" object, always != None
-        self.nodeDesc = None        # For leafs must be None
-        self.parent = None        # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
-        self.name = ""          # The instance name
-        self.subItems = []          # List of the child items (for nodes only)
-        self.offset = 0           # Global offset (relative to the 0 address)
-        self.size = 0           # Element size in bits
-        self.attrs = {}          # Attributes after evaluations and array expanding
-        self.arrayIdx = -1          # in case of being part of an array this will hold the array index, -1 means not part of array
-        self.vars = {}          # all variable relevant to this item after evaluation
+        self.nodeDesc = None         # For leafs must be None
+        self.parent = None           # Reference to parent "AdbLayoutItem" object, always != None (expect of the root)
+        self.name = ""               # The instance name
+        self.subItems = []           # List of the child items (for nodes only)
+        self.offset = 0              # Global offset (relative to the 0 address)
+        self.size = 0                # Element size in bits
+        self.attrs = {}              # Attributes after evaluations and array expanding
+        self.arrayIdx = -1           # in case of being part of an array this will hold the array index, -1 means not part of array
+        self.vars = {}               # all variable relevant to this item after evaluation
+        self.uSelector = None        # data structure that represent the unopn-selector properties
 
 
 ####################################################################
@@ -355,3 +450,19 @@ def __init__(self):
         # defined in
         self.fileName = ""
         self.lineNumber = -1
+
+
+####################################################################
+class AdbUnionSelector(object):
+    """ Represents an ADABE union-selector descriptor, objects of this type are immutable """
+
+    ##########################
+    def __init__(self):
+        self.dict = None               # mapping between the value and the enum, None if empty
+        self.full_path = None          # full path to the selector field, None if empty
+        self.offset = None             # absolute offset from the begining of the segment until the selector field (by layout)
+
+    def set_union_properties(self, union_dict, full_path, offset):
+        self.dict = union_dict
+        self.full_path = full_path
+        self.offset = offset
diff --git a/resourceparse/parsers/Parser.py b/resourceparse/parsers/Parser.py
index a26743ab..5b314692 100755
--- a/resourceparse/parsers/Parser.py
+++ b/resourceparse/parsers/Parser.py
@@ -44,7 +44,7 @@
 import math
 import re
 
-from parsers.AdbParser import AdbParser
+from parsers.AdbParser import AdbNodeDesc, AdbParser
 from utils import constants as cs
 from resource_data.RawData import RawData
 from resource_data.DataPrinter import DataPrinter
@@ -122,7 +122,7 @@ def parse(self):
             for seg in self._dumped_segment_db:
                 seg_parsed_counter += 1
                 self._parse_segment(seg)
-        except Exception as _:
+        except Exception as e:
             raise Exception("Fail to parse segments, failure occur at segment number {}".format(seg_parsed_counter))
 
         # print all segments
@@ -146,8 +146,8 @@ def _parse_segment(self, seg):
         """
         seg_for_parse = False
         if seg.get_type() in self._segment_map:
-            segment_name = self._build_union_prefix(self._segment_map[seg.get_type()].nodeDesc) + self._segment_map[
-                seg.get_type()].name
+            segment_name = self._build_union_prefix(self._segment_map[seg.get_type()].nodeDesc) \
+                + self._segment_map[seg.get_type()].name
             if not self._is_seg_size_match_adb_seg_size(len(seg.get_data()), seg.get_type()):
                 seg.add_parsed_data("Warning[{}]".format(self._get_next_warning_counter()),
                                     cs.WARNING_SIZE_DOESNT_MATCH.format(
@@ -161,9 +161,8 @@ def _parse_segment(self, seg):
             else:
                 segment_name = "UNKNOWN"
 
-        seg.add_parsed_data(20 * " " + "Segment", "{0} ({1})".format(segment_name, seg.get_type()))
+        seg.add_parsed_data(20 * " " + "Segment", "{0} ({1}){2}".format(segment_name, seg.get_type(), seg.additional_title_info()))
 
-        # in case of a resource segment the offset of the adb doesnt consider the header so we need to pass it
         if self._is_resource_segment(seg.get_type()):
             data_start_position = cs.RESOURCE_SEGMENT_START_OFFSET_IN_BYTES
         else:
@@ -176,13 +175,25 @@ def _parse_segment(self, seg):
 
         if seg_for_parse:
             for field in self._segment_map[seg.get_type()].subItems:
-                prefix = self._build_union_prefix(field.nodeDesc)
-                self._parse_seg_field(field, prefix + field.name, seg)
+                if field.nodeDesc.isUnion and field.uSelector:
+                    self._parse_union_selector_field(field, seg)
+                else:
+                    prefix = self._build_union_prefix(field.nodeDesc)
+                    self._parse_seg_field(field, prefix + field.name, seg)
             if self._raw:
                 self._build_and_add_raw_data(seg)
         else:  # if segment not for parse, need to set raw data
             self._build_and_add_raw_data(seg)
 
+    def _parse_union_selector_field(self, field, seg):
+        """This method parse union field and present only the relevant field
+        (selected by the selector)"""
+        selected_field_enum = field.uSelector.dict[int(self._current_bit_array[field.uSelector.offset:field.uSelector.offset + field.size], 2)]
+        for item in field.subItems:
+            if item.attrs['selected_by'] == selected_field_enum:
+                prefix = self._build_union_prefix(field.nodeDesc)
+                self._parse_seg_field(item, prefix + item.name, seg)
+
     def _parse_seg_field(self, field, field_str, seg):
         """This method is a recursive method that build the inner fields
         """
@@ -247,7 +258,7 @@ def _retrieve_dumped_segment_db(cls, dumped_file_path):
         return RawData(dumped_file_path).to_segments()
 
     @classmethod
-    def _build_union_prefix(cls, node_desc):
+    def _build_union_prefix(cls, node_desc: AdbNodeDesc):
         """This method build the prefix for the struct in order to give the user
         information indicate if the node is a union
         """
diff --git a/resourceparse/utils/constants.py b/resourceparse/utils/constants.py
index aaf94428..4640499c 100755
--- a/resourceparse/utils/constants.py
+++ b/resourceparse/utils/constants.py
@@ -126,3 +126,5 @@
 DATA_PRINTER_SEPARATOR = 80 * "-"
 
 WARNING_SIZE_DOESNT_MATCH = " Segment size({0} DWs) doesn't match the adb segment size({1} DWs)"
+
+PARENT_LST = ["#(parent)", "$(parent)"]

From 94591be7cc70890564e0d82120185b1c96c7637d Mon Sep 17 00:00:00 2001
From: Harel Karni <hkarni@nvidia.com>
Date: Mon, 18 Jul 2022 16:20:13 +0300
Subject: [PATCH 41/46] [resourceparse] Add index1 and index2 fields to parsed
 segment's title

Description:
When printing segments with index field in it, the index will be presented next to the segment name.

Tested OS: Linux64
Tested devices: cx6, cx6lx
Tested flows: varios segments

Known gaps (with RM ticket):

Issue: 3090820
---
 resourceparse/segments/CommandSegment.py  | 7 +++++++
 resourceparse/segments/RefSegment.py      | 5 +++++
 resourceparse/segments/ResourceSegment.py | 7 +++++++
 resourceparse/segments/Segment.py         | 5 +++++
 4 files changed, 24 insertions(+)

diff --git a/resourceparse/segments/CommandSegment.py b/resourceparse/segments/CommandSegment.py
index ea92eb6e..3c659612 100755
--- a/resourceparse/segments/CommandSegment.py
+++ b/resourceparse/segments/CommandSegment.py
@@ -54,6 +54,13 @@ def __init__(self, data):
         """
         super().__init__()
         self.raw_data = data
+        self.index1 = self.raw_data[2]
+        self.index2 = self.raw_data[3]
+    
+    def additional_title_info(self):
+        """return index1 and index2 if exists in the segment.
+        """
+        return " ; index1 = {0}, index2 = {1}".format(hex(self.index1), hex(self.index2))
 
     def get_data(self):
         """get the general segment data.
diff --git a/resourceparse/segments/RefSegment.py b/resourceparse/segments/RefSegment.py
index 336cddda..59b37db2 100755
--- a/resourceparse/segments/RefSegment.py
+++ b/resourceparse/segments/RefSegment.py
@@ -60,6 +60,11 @@ def __init__(self, data):
         self.index2 = int('{:0b}'.format(data[3]).zfill(32)[0:32], 2)
         self.num_of_obj1 = int('{:0b}'.format(data[4]).zfill(32)[0:16], 2)
         self.num_of_obj2 = int('{:0b}'.format(data[4]).zfill(32)[16:32], 2)
+    
+    def additional_title_info(self):
+        """return index1 and index2 if exists in the segment.
+        """
+        return " ; index1 = {0}, index2 = {1}".format(hex(self.index1), hex(self.index2))
 
     def get_data(self):
         """get the reference segment data.
diff --git a/resourceparse/segments/ResourceSegment.py b/resourceparse/segments/ResourceSegment.py
index 02d4bc86..2999c70a 100755
--- a/resourceparse/segments/ResourceSegment.py
+++ b/resourceparse/segments/ResourceSegment.py
@@ -54,6 +54,13 @@ def __init__(self, data):
         super().__init__()
         self.raw_data = data
         self.resource_type = constants.RESOURCE_DUMP_SEGMENT_TYPE_RESOURCE
+        self.index1 = self.raw_data[2]
+        self.index2 = self.raw_data[3]
+    
+    def additional_title_info(self):
+        """return index1 and index2 if exists in the segment.
+        """
+        return " ; index1 = {0}, index2 = {1}".format(hex(self.index1), hex(self.index2))
 
     def get_data(self):
         """get the general segment data.
diff --git a/resourceparse/segments/Segment.py b/resourceparse/segments/Segment.py
index 70829f24..c40f9910 100755
--- a/resourceparse/segments/Segment.py
+++ b/resourceparse/segments/Segment.py
@@ -53,6 +53,11 @@ def __init__(self):
         self.size = 0
         self._parsed_data = OrderedDict()
 
+    def additional_title_info(self):
+        """return index1 and index2 if exists in the segment.
+        """
+        return ""
+
     def get_size(self):
         return self.size
 

From d89e6068515e66e692ad15a6471c51a912419145 Mon Sep 17 00:00:00 2001
From: Jack German <jgerman@nvidia.com>
Date: Tue, 19 Jul 2022 17:33:37 +0300
Subject: [PATCH 42/46] apply clang-format with 200 column count

---
 .clang-format                                |   2 +-
 tools_layouts/adb_to_c_utils.c               |   6 +-
 tools_layouts/adb_to_c_utils.h               |  21 +-
 tools_layouts/icmd_layouts.c                 |  29 +-
 tools_layouts/icmd_layouts.h                 |  44 +-
 tools_layouts/image_layout_layouts.c         |  40 +-
 tools_layouts/image_layout_layouts.h         |  69 +-
 tools_layouts/reg_access_hca_layouts.c       | 860 +++++++------------
 tools_layouts/reg_access_hca_layouts.h       | 401 +++------
 tools_layouts/reg_access_switch_layouts.c    | 170 ++--
 tools_layouts/reg_access_switch_layouts.h    | 178 ++--
 tools_layouts/register_access_open_layouts.c |  13 +-
 tools_layouts/register_access_open_layouts.h |  16 +-
 tools_layouts/register_access_sib_layouts.c  |  40 +-
 tools_layouts/register_access_sib_layouts.h  |  61 +-
 tools_layouts/tools_open_layouts.c           | 168 ++--
 tools_layouts/tools_open_layouts.h           | 214 ++---
 17 files changed, 714 insertions(+), 1618 deletions(-)

diff --git a/.clang-format b/.clang-format
index f90db87e..bb5c30c8 100755
--- a/.clang-format
+++ b/.clang-format
@@ -38,7 +38,7 @@ BraceWrapping:
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
 CommentPragmas:  '^ ignore_styling:'
-ColumnLimit: 120
+ColumnLimit: 200
 DerivePointerBinding: true
 DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: true
diff --git a/tools_layouts/adb_to_c_utils.c b/tools_layouts/adb_to_c_utils.c
index 6be685eb..f3e2cbc9 100644
--- a/tools_layouts/adb_to_c_utils.c
+++ b/tools_layouts/adb_to_c_utils.c
@@ -40,11 +40,7 @@
 /************************************
  * Function: adb2c_calc_array_field_address
  ************************************/
-u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset,
-                                         u_int32_t arr_elemnt_size,
-                                         int arr_idx,
-                                         u_int32_t parent_node_size,
-                                         int is_big_endian_arr)
+u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset, u_int32_t arr_elemnt_size, int arr_idx, u_int32_t parent_node_size, int is_big_endian_arr)
 {
     u_int32_t offs;
 
diff --git a/tools_layouts/adb_to_c_utils.h b/tools_layouts/adb_to_c_utils.h
index f3061eee..15b4f131 100644
--- a/tools_layouts/adb_to_c_utils.h
+++ b/tools_layouts/adb_to_c_utils.h
@@ -107,20 +107,16 @@ extern "C"
 #define ADB2C_CPU_TO_BE16(x) htons(x)
 #define ADB2C_BE16_TO_CPU(x) ntohs(x)
 #ifdef _LITTLE_ENDIANESS
-#define ADB2C_CPU_TO_BE64(x) \
-    (((u_int64_t)htonl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)htonl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_CPU_TO_BE64(x) (((u_int64_t)htonl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)htonl((u_int32_t)((x >> 32) & 0xffffffff))))
 
-#define ADB2C_BE64_TO_CPU(x) \
-    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_BE64_TO_CPU(x) (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
 #define ADB2C_LE64_TO_CPU(x) (x)
 #define ADB2C_CPU_TO_LE64(x) (x)
 #else
 #define ADB2C_CPU_TO_BE64(x) (x)
 #define ADB2C_BE64_TO_CPU(x) (x)
-#define ADB2C_LE64_TO_CPU(x) \
-    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
-#define ADB2C_CPU_TO_LE64(x) \
-    (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_LE64_TO_CPU(x) (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
+#define ADB2C_CPU_TO_LE64(x) (((u_int64_t)ntohl((u_int32_t)((x)&0xffffffff)) << 32) | ((u_int64_t)ntohl((u_int32_t)((x >> 32) & 0xffffffff))))
 
 #endif
 
@@ -177,8 +173,7 @@ extern "C"
 #define U16H_FMT "0x%04x"
 #define U8H_FMT "0x%02x"
 
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || \
-  defined(ARCH_hppa)
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_m68k) || defined(ARCH_hppa)
 #if defined(__MINGW32__) || defined(__MINGW64__)
 #include <inttypes.h>
 #define U64D_FMT "0x%" PRId64
@@ -267,11 +262,7 @@ typedef unsigned __int64 u_int64_t;
     /************************************/
     /************************************/
     /************************************/
-    u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset,
-                                             u_int32_t arr_elemnt_size,
-                                             int arr_idx,
-                                             u_int32_t parent_node_size,
-                                             int is_big_endian_arr);
+    u_int32_t adb2c_calc_array_field_address(u_int32_t start_bit_offset, u_int32_t arr_elemnt_size, int arr_idx, u_int32_t parent_node_size, int is_big_endian_arr);
     /* Big Endian Functions */
     void adb2c_push_integer_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t byte_size, u_int64_t field_value);
     void adb2c_push_bits_to_buff(u_int8_t* buff, u_int32_t bit_offset, u_int32_t field_size, u_int32_t field_value);
diff --git a/tools_layouts/icmd_layouts.c b/tools_layouts/icmd_layouts.c
index e39d1ce0..ad7d7182 100644
--- a/tools_layouts/icmd_layouts.c
+++ b/tools_layouts/icmd_layouts.c
@@ -462,8 +462,7 @@ void connectx4_icmd_mh_sync_dump(const struct connectx4_icmd_mh_sync* ptr_struct
     connectx4_icmd_mh_sync_print(ptr_struct, file, 0);
 }
 
-void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -509,8 +508,7 @@ void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->fpga);
 }
 
-void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general* ptr_struct,
-                                             const u_int8_t* ptr_buff)
+void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -556,9 +554,7 @@ void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_gen
     ptr_struct->fpga = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level)
+void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== connectx4_icmd_query_cap_general ========\n");
@@ -578,8 +574,7 @@ void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_ca
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "mh_sync              : " UH_FMT "\n", ptr_struct->mh_sync);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "allow_icmd_access_reg_on_all_registers : " UH_FMT "\n",
-            ptr_struct->allow_icmd_access_reg_on_all_registers);
+    fprintf(fd, "allow_icmd_access_reg_on_all_registers : " UH_FMT "\n", ptr_struct->allow_icmd_access_reg_on_all_registers);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "fw_info_psid         : " UH_FMT "\n", ptr_struct->fw_info_psid);
     adb2c_add_indentation(fd, indent_level);
@@ -646,8 +641,7 @@ void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_s
     adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->sniffer_qpn);
 }
 
-void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i = 0;
@@ -730,8 +724,7 @@ unsigned int connectx4_secure_boot_signatures_size(void)
     return CONNECTX4_SECURE_BOOT_SIGNATURES_SIZE;
 }
 
-void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -753,9 +746,7 @@ void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_si
     }
 }
 
-void connectx4_component_authentication_configuration_pack(
-  const struct connectx4_component_authentication_configuration* ptr_struct,
-  u_int8_t* ptr_buff)
+void connectx4_component_authentication_configuration_pack(const struct connectx4_component_authentication_configuration* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -791,8 +782,7 @@ void connectx4_file_public_keys_3_pack(const struct connectx4_file_public_keys_3
         adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->key[i]);
     }
     offset = 4256;
-    connectx4_component_authentication_configuration_pack(&(ptr_struct->component_authentication_configuration),
-                                                          ptr_buff + offset / 8);
+    connectx4_component_authentication_configuration_pack(&(ptr_struct->component_authentication_configuration), ptr_buff + offset / 8);
 }
 
 void connectx4_public_keys_3_pack(const struct connectx4_public_keys_3* ptr_struct, u_int8_t* ptr_buff)
@@ -866,8 +856,7 @@ void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_g
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_diagnostic_counters);
 }
 
-void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
diff --git a/tools_layouts/icmd_layouts.h b/tools_layouts/icmd_layouts.h
index a97afe2e..916e5c7e 100644
--- a/tools_layouts/icmd_layouts.h
+++ b/tools_layouts/icmd_layouts.h
@@ -610,9 +610,7 @@ NVQC */
     /* icmd_get_fw_info */
     void connectib_icmd_get_fw_info_pack(const struct connectib_icmd_get_fw_info* ptr_struct, u_int8_t* ptr_buff);
     void connectib_icmd_get_fw_info_unpack(struct connectib_icmd_get_fw_info* ptr_struct, const u_int8_t* ptr_buff);
-    void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info* ptr_struct,
-                                          FILE* file,
-                                          int indent_level);
+    void connectib_icmd_get_fw_info_print(const struct connectib_icmd_get_fw_info* ptr_struct, FILE* file, int indent_level);
     int connectib_icmd_get_fw_info_size(void);
 #define CONNECTIB_ICMD_GET_FW_INFO_SIZE (0x24)
     void connectib_icmd_get_fw_info_dump(const struct connectib_icmd_get_fw_info* ptr_struct, FILE* file);
@@ -638,19 +636,13 @@ NVQC */
 #define CONNECTX4_ICMD_MH_SYNC_SIZE (0x10)
     void connectx4_icmd_mh_sync_dump(const struct connectx4_icmd_mh_sync* ptr_struct, FILE* file);
     /* icmd_query_cap_general */
-    void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void connectx4_icmd_query_cap_general_pack(const struct connectx4_icmd_query_cap_general* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_icmd_query_cap_general_unpack(struct connectx4_icmd_query_cap_general* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_icmd_query_cap_general_print(const struct connectx4_icmd_query_cap_general* ptr_struct, FILE* fd, int indent_level);
     unsigned int connectx4_icmd_query_cap_general_size(void);
     int connectib_icmd_set_port_sniffer_size(void);
-    void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_sniffer* ptr_struct,
-                                              u_int8_t* ptr_buff);
+    void connectib_icmd_set_port_sniffer_unpack(struct connectib_icmd_set_port_sniffer* ptr_struct, const u_int8_t* ptr_buff);
+    void connectib_icmd_set_port_sniffer_pack(const struct connectib_icmd_set_port_sniffer* ptr_struct, u_int8_t* ptr_buff);
 #define CONNECTX4_ICMD_QUERY_CAP_GENERAL_SIZE (0x8)
     void connectx4_icmd_query_cap_general_dump(const struct connectx4_icmd_query_cap_general* ptr_struct, FILE* fd);
 
@@ -661,39 +653,29 @@ NVQC */
 #define CONNECTX4_PUBLIC_KEYS_3_SIZE (0x1100)
     void connectx4_public_keys_3_dump(const struct connectx4_public_keys_3* ptr_struct, FILE* fd);
     /* secure_boot_signatures */
-    void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void connectx4_secure_boot_signatures_unpack(struct connectx4_secure_boot_signatures* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void connectx4_secure_boot_signatures_print(const struct connectx4_secure_boot_signatures* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void connectx4_secure_boot_signatures_pack(const struct connectx4_secure_boot_signatures* ptr_struct, u_int8_t* ptr_buff);
+    void connectx4_secure_boot_signatures_unpack(struct connectx4_secure_boot_signatures* ptr_struct, const u_int8_t* ptr_buff);
+    void connectx4_secure_boot_signatures_print(const struct connectx4_secure_boot_signatures* ptr_struct, FILE* fd, int indent_level);
     unsigned int connectx4_secure_boot_signatures_size(void);
 #define CONNECTX4_SECURE_BOOT_SIGNATURES_SIZE (0x600)
     void connectx4_secure_boot_signatures_dump(const struct connectx4_secure_boot_signatures* ptr_struct, FILE* fd);
     /* file_public_keys_3 */
     void connectx4_file_public_keys_3_pack(const struct connectx4_file_public_keys_3* ptr_struct, u_int8_t* ptr_buff);
     void connectx4_file_public_keys_3_unpack(struct connectx4_file_public_keys_3* ptr_struct, const u_int8_t* ptr_buff);
-    void connectx4_file_public_keys_3_print(const struct connectx4_file_public_keys_3* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void connectx4_file_public_keys_3_print(const struct connectx4_file_public_keys_3* ptr_struct, FILE* fd, int indent_level);
     unsigned int connectx4_file_public_keys_3_size(void);
 #define CONNECTX4_FILE_PUBLIC_KEYS_3_SIZE (0x220)
     void connectx4_file_public_keys_3_dump(const struct connectx4_file_public_keys_3* ptr_struct, FILE* fd);
     void connectx4_hw_pointers_arava_pack(const struct connectx4_hw_pointers_arava* ptr_struct, u_int8_t* ptr_buff);
     void connectx4_hw_pointers_arava_unpack(struct connectx4_hw_pointers_arava* ptr_struct, const u_int8_t* ptr_buff);
-    void connectx4_hw_pointers_arava_print(const struct connectx4_hw_pointers_arava* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void connectx4_hw_pointers_arava_print(const struct connectx4_hw_pointers_arava* ptr_struct, FILE* fd, int indent_level);
     unsigned int connectx4_hw_pointers_arava_size(void);
 #define CONNECTX4_HW_POINTERS_ARAVA_SIZE (0x80)
     void connectx4_hw_pointers_arava_dump(const struct connectx4_hw_pointers_arava* ptr_struct, FILE* fd);
     unsigned int icmd_hca_icmd_query_cap_general_size(void);
 #define ICMD_HCA_ICMD_QUERY_CAP_GENERAL_SIZE (0x8)
-    void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_general* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general* ptr_struct,
-                                                const u_int8_t* ptr_buff);
+    void icmd_hca_icmd_query_cap_general_pack(const struct icmd_hca_icmd_query_cap_general* ptr_struct, u_int8_t* ptr_buff);
+    void icmd_hca_icmd_query_cap_general_unpack(struct icmd_hca_icmd_query_cap_general* ptr_struct, const u_int8_t* ptr_buff);
 
 #define CONNECTX5_NV_DATA_SIZE (0x10000)
 
diff --git a/tools_layouts/image_layout_layouts.c b/tools_layouts/image_layout_layouts.c
index 34b16d1a..b2a130c5 100644
--- a/tools_layouts/image_layout_layouts.c
+++ b/tools_layouts/image_layout_layouts.c
@@ -224,8 +224,7 @@ void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabi
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->version_vector_ver);
 }
 
-void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -235,9 +234,7 @@ void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabiliti
     ptr_struct->version_vector_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_reset_capabilities ========\n");
@@ -459,9 +456,7 @@ void image_layout_TRIPPLE_VERSION_unpack(struct image_layout_TRIPPLE_VERSION* pt
     ptr_struct->MINOR = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_TRIPPLE_VERSION ========\n");
@@ -527,8 +522,7 @@ void image_layout_guids_dump(const struct image_layout_guids* ptr_struct, FILE*
     image_layout_guids_print(ptr_struct, fd, 0);
 }
 
-void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -540,8 +534,7 @@ void image_layout_hashes_table_header_pack(const struct image_layout_hashes_tabl
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->crc);
 }
 
-void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header* ptr_struct,
-                                             const u_int8_t* ptr_buff)
+void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -553,9 +546,7 @@ void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_he
     ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level)
+void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_hashes_table_header ========\n");
@@ -702,9 +693,7 @@ void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry*
     ptr_struct->crc = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry* ptr_struct,
-                                         FILE* fd,
-                                         int indent_level)
+void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_hw_pointer_entry ========\n");
@@ -808,9 +797,7 @@ void image_layout_module_versions_unpack(struct image_layout_module_versions* pt
     image_layout_module_version_unpack(&(ptr_struct->mad), ptr_buff + offset / 8);
 }
 
-void image_layout_module_versions_print(const struct image_layout_module_versions* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void image_layout_module_versions_print(const struct image_layout_module_versions* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_module_versions ========\n");
@@ -1222,8 +1209,7 @@ void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_
     image_layout_hw_pointer_entry_pack(&(ptr_struct->hashes_table_pointer), ptr_buff + offset / 8);
 }
 
-void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1261,9 +1247,7 @@ void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carm
     image_layout_hw_pointer_entry_unpack(&(ptr_struct->hashes_table_pointer), ptr_buff + offset / 8);
 }
 
-void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_hw_pointers_carmel ========\n");
@@ -1874,9 +1858,7 @@ void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Node
     image_layout_hashes_table_unpack(&(ptr_struct->hashes_table), ptr_buff);
 }
 
-void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== image_layout_image_layout_Nodes ========\n");
diff --git a/tools_layouts/image_layout_layouts.h b/tools_layouts/image_layout_layouts.h
index c22bb15e..ad90ace9 100644
--- a/tools_layouts/image_layout_layouts.h
+++ b/tools_layouts/image_layout_layouts.h
@@ -902,28 +902,21 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
     /* module_version */
     void image_layout_module_version_pack(const struct image_layout_module_version* ptr_struct, u_int8_t* ptr_buff);
     void image_layout_module_version_unpack(struct image_layout_module_version* ptr_struct, const u_int8_t* ptr_buff);
-    void image_layout_module_version_print(const struct image_layout_module_version* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void image_layout_module_version_print(const struct image_layout_module_version* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_module_version_size(void);
 #define IMAGE_LAYOUT_MODULE_VERSION_SIZE (0x4)
     void image_layout_module_version_dump(const struct image_layout_module_version* ptr_struct, FILE* fd);
     /* reset_capabilities */
-    void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabilities* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void image_layout_reset_capabilities_pack(const struct image_layout_reset_capabilities* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_reset_capabilities_unpack(struct image_layout_reset_capabilities* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_reset_capabilities_print(const struct image_layout_reset_capabilities* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_reset_capabilities_size(void);
 #define IMAGE_LAYOUT_RESET_CAPABILITIES_SIZE (0x4)
     void image_layout_reset_capabilities_dump(const struct image_layout_reset_capabilities* ptr_struct, FILE* fd);
     /* reset_version */
     void image_layout_reset_version_pack(const struct image_layout_reset_version* ptr_struct, u_int8_t* ptr_buff);
     void image_layout_reset_version_unpack(struct image_layout_reset_version* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      image_layout_reset_version_print(const struct image_layout_reset_version* ptr_struct, FILE* fd, int indent_level);
+    void image_layout_reset_version_print(const struct image_layout_reset_version* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_reset_version_size(void);
 #define IMAGE_LAYOUT_RESET_VERSION_SIZE (0x4)
     void image_layout_reset_version_dump(const struct image_layout_reset_version* ptr_struct, FILE* fd);
@@ -944,9 +937,7 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
     /* TRIPPLE_VERSION */
     void image_layout_TRIPPLE_VERSION_pack(const struct image_layout_TRIPPLE_VERSION* ptr_struct, u_int8_t* ptr_buff);
     void image_layout_TRIPPLE_VERSION_unpack(struct image_layout_TRIPPLE_VERSION* ptr_struct, const u_int8_t* ptr_buff);
-    void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void image_layout_TRIPPLE_VERSION_print(const struct image_layout_TRIPPLE_VERSION* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_TRIPPLE_VERSION_size(void);
 #define IMAGE_LAYOUT_TRIPPLE_VERSION_SIZE (0x8)
     void image_layout_TRIPPLE_VERSION_dump(const struct image_layout_TRIPPLE_VERSION* ptr_struct, FILE* fd);
@@ -958,13 +949,9 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
 #define IMAGE_LAYOUT_GUIDS_SIZE (0x40)
     void image_layout_guids_dump(const struct image_layout_guids* ptr_struct, FILE* fd);
     /* hashes_table_header */
-    void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void image_layout_hashes_table_header_pack(const struct image_layout_hashes_table_header* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_hashes_table_header_unpack(struct image_layout_hashes_table_header* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_hashes_table_header_print(const struct image_layout_hashes_table_header* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_hashes_table_header_size(void);
 #define IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE (0xc)
     void image_layout_hashes_table_header_dump(const struct image_layout_hashes_table_header* ptr_struct, FILE* fd);
@@ -984,11 +971,8 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
     void image_layout_htoc_hash_dump(const struct image_layout_htoc_hash* ptr_struct, FILE* fd);
     /* hw_pointer_entry */
     void image_layout_hw_pointer_entry_pack(const struct image_layout_hw_pointer_entry* ptr_struct, u_int8_t* ptr_buff);
-    void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry* ptr_struct,
-                                              const u_int8_t* ptr_buff);
-    void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level);
+    void image_layout_hw_pointer_entry_unpack(struct image_layout_hw_pointer_entry* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_hw_pointer_entry_print(const struct image_layout_hw_pointer_entry* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_hw_pointer_entry_size(void);
 #define IMAGE_LAYOUT_HW_POINTER_ENTRY_SIZE (0x8)
     void image_layout_hw_pointer_entry_dump(const struct image_layout_hw_pointer_entry* ptr_struct, FILE* fd);
@@ -1002,26 +986,21 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
     /* module_versions */
     void image_layout_module_versions_pack(const struct image_layout_module_versions* ptr_struct, u_int8_t* ptr_buff);
     void image_layout_module_versions_unpack(struct image_layout_module_versions* ptr_struct, const u_int8_t* ptr_buff);
-    void image_layout_module_versions_print(const struct image_layout_module_versions* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void image_layout_module_versions_print(const struct image_layout_module_versions* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_module_versions_size(void);
 #define IMAGE_LAYOUT_MODULE_VERSIONS_SIZE (0x40)
     void image_layout_module_versions_dump(const struct image_layout_module_versions* ptr_struct, FILE* fd);
     /* operation_key */
     void image_layout_operation_key_pack(const struct image_layout_operation_key* ptr_struct, u_int8_t* ptr_buff);
     void image_layout_operation_key_unpack(struct image_layout_operation_key* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      image_layout_operation_key_print(const struct image_layout_operation_key* ptr_struct, FILE* fd, int indent_level);
+    void image_layout_operation_key_print(const struct image_layout_operation_key* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_operation_key_size(void);
 #define IMAGE_LAYOUT_OPERATION_KEY_SIZE (0x10)
     void image_layout_operation_key_dump(const struct image_layout_operation_key* ptr_struct, FILE* fd);
     /* version_vector */
     void image_layout_version_vector_pack(const struct image_layout_version_vector* ptr_struct, u_int8_t* ptr_buff);
     void image_layout_version_vector_unpack(struct image_layout_version_vector* ptr_struct, const u_int8_t* ptr_buff);
-    void image_layout_version_vector_print(const struct image_layout_version_vector* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void image_layout_version_vector_print(const struct image_layout_version_vector* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_version_vector_size(void);
 #define IMAGE_LAYOUT_VERSION_VECTOR_SIZE (0x30)
     void image_layout_version_vector_dump(const struct image_layout_version_vector* ptr_struct, FILE* fd);
@@ -1040,13 +1019,9 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
 #define IMAGE_LAYOUT_HASHES_TABLE_SIZE (0x804)
     void image_layout_hashes_table_dump(const struct image_layout_hashes_table* ptr_struct, FILE* fd);
     /* hw_pointers_carmel */
-    void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_carmel* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void image_layout_hw_pointers_carmel_pack(const struct image_layout_hw_pointers_carmel* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_hw_pointers_carmel_unpack(struct image_layout_hw_pointers_carmel* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_hw_pointers_carmel_print(const struct image_layout_hw_pointers_carmel* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_hw_pointers_carmel_size(void);
 #define IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE (0x80)
     void image_layout_hw_pointers_carmel_dump(const struct image_layout_hw_pointers_carmel* ptr_struct, FILE* fd);
@@ -1079,13 +1054,9 @@ dtoc_header: Represents the layout version depicted by the dTOC: 1. */
 #define IMAGE_LAYOUT_TOOLS_AREA_SIZE (0x40)
     void image_layout_tools_area_dump(const struct image_layout_tools_area* ptr_struct, FILE* fd);
     /* image_layout_Nodes */
-    void image_layout_image_layout_Nodes_pack(const union image_layout_image_layout_Nodes* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Nodes* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void image_layout_image_layout_Nodes_pack(const union image_layout_image_layout_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void image_layout_image_layout_Nodes_unpack(union image_layout_image_layout_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void image_layout_image_layout_Nodes_print(const union image_layout_image_layout_Nodes* ptr_struct, FILE* fd, int indent_level);
     unsigned int image_layout_image_layout_Nodes_size(void);
 #define IMAGE_LAYOUT_IMAGE_LAYOUT_NODES_SIZE (0x804)
     void image_layout_image_layout_Nodes_dump(const union image_layout_image_layout_Nodes* ptr_struct, FILE* fd);
diff --git a/tools_layouts/reg_access_hca_layouts.c b/tools_layouts/reg_access_hca_layouts.c
index a79a5d98..e157ec4a 100644
--- a/tools_layouts/reg_access_hca_layouts.c
+++ b/tools_layouts/reg_access_hca_layouts.c
@@ -39,9 +39,7 @@
  ***/
 #include "reg_access_hca_layouts.h"
 
-void reg_access_hca_lock_source_general_semaphore_pack(
-  const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_general_semaphore_pack(const struct reg_access_hca_lock_source_general_semaphore* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -51,8 +49,7 @@ void reg_access_hca_lock_source_general_semaphore_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->log_toggle_cycle);
 }
 
-void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_lock_source_general_semaphore* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -62,10 +59,7 @@ void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_l
     ptr_struct->log_toggle_cycle = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_lock_source_general_semaphore_print(
-  const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_lock_source_general_semaphore_print(const struct reg_access_hca_lock_source_general_semaphore* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_lock_source_general_semaphore ========\n");
@@ -74,11 +68,7 @@ void reg_access_hca_lock_source_general_semaphore_print(
     fprintf(fd, "type                 : %s (" UH_FMT ")\n",
             (ptr_struct->type == 0 ?
                ("QPC_GW") :
-               ((ptr_struct->type == 1 ?
-                   ("CQE_GW") :
-                   ((ptr_struct->type == 2 ?
-                       ("EQE_GW") :
-                       ((ptr_struct->type == 3 ? ("MEM_GW") : ((ptr_struct->type == 4 ? ("IPC") : ("unknown")))))))))),
+               ((ptr_struct->type == 1 ? ("CQE_GW") : ((ptr_struct->type == 2 ? ("EQE_GW") : ((ptr_struct->type == 3 ? ("MEM_GW") : ((ptr_struct->type == 4 ? ("IPC") : ("unknown")))))))))),
             ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
@@ -89,15 +79,12 @@ unsigned int reg_access_hca_lock_source_general_semaphore_size(void)
     return REG_ACCESS_HCA_LOCK_SOURCE_GENERAL_SEMAPHORE_SIZE;
 }
 
-void reg_access_hca_lock_source_general_semaphore_dump(
-  const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-  FILE* fd)
+void reg_access_hca_lock_source_general_semaphore_dump(const struct reg_access_hca_lock_source_general_semaphore* ptr_struct, FILE* fd)
 {
     reg_access_hca_lock_source_general_semaphore_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                  u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -111,8 +98,7 @@ void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lo
     adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->index);
 }
 
-void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                    const u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -126,9 +112,7 @@ void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_s
     ptr_struct->index = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                   FILE* fd,
-                                                   int indent_level)
+void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_lock_source_icm_resource ========\n");
@@ -148,14 +132,12 @@ unsigned int reg_access_hca_lock_source_icm_resource_size(void)
     return REG_ACCESS_HCA_LOCK_SOURCE_ICM_RESOURCE_SIZE;
 }
 
-void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                  FILE* fd)
+void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource* ptr_struct, FILE* fd)
 {
     reg_access_hca_lock_source_icm_resource_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                   u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -169,8 +151,7 @@ void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_l
     adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->index);
 }
 
-void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                     const u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -184,31 +165,24 @@ void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_
     ptr_struct->index = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                    FILE* fd,
-                                                    int indent_level)
+void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_lock_source_uapp_resource ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "type                 : %s (" UH_FMT ")\n",
-      (ptr_struct->type == 0 ?
-         ("UAPP_QP") :
-         ((ptr_struct->type == 1 ?
-             ("SRQ") :
-             ((ptr_struct->type == 2 ?
-                 ("UAPP_SRQ_META") :
-                 ((ptr_struct->type == 3 ?
-                     ("UAPP_RES_CQ") :
-                     ((ptr_struct->type == 4 ?
-                         ("UAPP_REQ_CQ") :
-                         ((ptr_struct->type == 5 ?
-                             ("UAPP_EQ") :
-                             ((ptr_struct->type == 6 ? ("NSQ") :
-                                                       ((ptr_struct->type == 7 ? ("NCQ") : ("unknown")))))))))))))))),
-      ptr_struct->type);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
+            (ptr_struct->type == 0 ?
+               ("UAPP_QP") :
+               ((ptr_struct->type == 1 ?
+                   ("SRQ") :
+                   ((ptr_struct->type == 2 ?
+                       ("UAPP_SRQ_META") :
+                       ((ptr_struct->type == 3 ?
+                           ("UAPP_RES_CQ") :
+                           ((ptr_struct->type == 4 ? ("UAPP_REQ_CQ") :
+                                                     ((ptr_struct->type == 5 ? ("UAPP_EQ") : ((ptr_struct->type == 6 ? ("NSQ") : ((ptr_struct->type == 7 ? ("NCQ") : ("unknown")))))))))))))))),
+            ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "gvmi                 : " UH_FMT "\n", ptr_struct->gvmi);
     adb2c_add_indentation(fd, indent_level);
@@ -222,38 +196,31 @@ unsigned int reg_access_hca_lock_source_uapp_resource_size(void)
     return REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE;
 }
 
-void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                   FILE* fd)
+void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, FILE* fd)
 {
     reg_access_hca_lock_source_uapp_resource_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(
-  const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_hca_lock_source_general_semaphore_pack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(
-  union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-  const u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_hca_lock_source_general_semaphore_unpack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(
-  const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+                                                                                  FILE* fd,
+                                                                                  int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto ========\n");
 
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "lock_source_general_semaphore:\n");
-    reg_access_hca_lock_source_general_semaphore_print(&(ptr_struct->lock_source_general_semaphore), fd,
-                                                       indent_level + 1);
+    reg_access_hca_lock_source_general_semaphore_print(&(ptr_struct->lock_source_general_semaphore), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "lock_source_icm_resource:\n");
     reg_access_hca_lock_source_icm_resource_print(&(ptr_struct->lock_source_icm_resource), fd, indent_level + 1);
@@ -267,9 +234,7 @@ unsigned int reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_a
     return REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE;
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(
-  const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-  FILE* fd)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct, FILE* fd)
 {
     reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(ptr_struct, fd, 0);
 }
@@ -309,9 +274,7 @@ void reg_access_hca_uint64_dump(const u_int64_t* ptr_struct, FILE* fd)
     reg_access_hca_uint64_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_pack(
-  const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_irisc_hang_mini_flow_modifier_pack(const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -321,8 +284,7 @@ void reg_access_hca_irisc_hang_mini_flow_modifier_pack(
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->irisc_hang_cap_mask);
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -332,10 +294,7 @@ void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_i
     ptr_struct->irisc_hang_cap_mask = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_print(
-  const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_irisc_hang_mini_flow_modifier_print(const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_irisc_hang_mini_flow_modifier ========\n");
@@ -351,58 +310,43 @@ unsigned int reg_access_hca_irisc_hang_mini_flow_modifier_size(void)
     return REG_ACCESS_HCA_IRISC_HANG_MINI_FLOW_MODIFIER_SIZE;
 }
 
-void reg_access_hca_irisc_hang_mini_flow_modifier_dump(
-  const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_irisc_hang_mini_flow_modifier_dump(const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_irisc_hang_mini_flow_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_pack(
-  const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_pack(const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
     offset = 0;
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->category);
     offset = 32;
-    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(&(ptr_struct->category_modifier),
-                                                                                ptr_buff + offset / 8);
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(&(ptr_struct->category_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_unpack(
-  struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-  const u_int8_t* ptr_buff)
+void reg_access_hca_lock_source_stop_toggle_modifier_unpack(struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
     offset = 0;
     ptr_struct->category = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
     offset = 32;
-    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(&(ptr_struct->category_modifier),
-                                                                                  ptr_buff + offset / 8);
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(&(ptr_struct->category_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_print(
-  const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_lock_source_stop_toggle_modifier_print(const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "category             : %s (" UH_FMT ")\n",
-            (ptr_struct->category == 0 ?
-               ("GENERAL_SEMAPHORE") :
-               ((ptr_struct->category == 1 ? ("ICM_RESOURCE") :
-                                             ((ptr_struct->category == 2 ? ("UAPP_RESOURCE") : ("unknown")))))),
+            (ptr_struct->category == 0 ? ("GENERAL_SEMAPHORE") : ((ptr_struct->category == 1 ? ("ICM_RESOURCE") : ((ptr_struct->category == 2 ? ("UAPP_RESOURCE") : ("unknown")))))),
             ptr_struct->category);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "category_modifier:\n");
-    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(&(ptr_struct->category_modifier), fd,
-                                                                                 indent_level + 1);
+    reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(&(ptr_struct->category_modifier), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_lock_source_stop_toggle_modifier_size(void)
@@ -410,15 +354,12 @@ unsigned int reg_access_hca_lock_source_stop_toggle_modifier_size(void)
     return REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_dump(
-  const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_lock_source_stop_toggle_modifier_dump(const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_lock_source_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                u_int8_t* ptr_buff)
+void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -438,8 +379,7 @@ void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->self_activation);
 }
 
-void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                  const u_int8_t* ptr_buff)
+void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -459,9 +399,7 @@ void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_act
     ptr_struct->self_activation = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level)
+void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_mcqi_activation_method ========\n");
@@ -487,8 +425,7 @@ unsigned int reg_access_hca_mcqi_activation_method_size(void)
     return REG_ACCESS_HCA_MCQI_ACTIVATION_METHOD_SIZE;
 }
 
-void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                FILE* fd)
+void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method* ptr_struct, FILE* fd)
 {
     reg_access_hca_mcqi_activation_method_print(ptr_struct, fd, 0);
 }
@@ -588,8 +525,7 @@ void reg_access_hca_mcqi_cap_dump(const struct reg_access_hca_mcqi_cap* ptr_stru
     reg_access_hca_mcqi_cap_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                               u_int8_t* ptr_buff)
+void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -623,8 +559,7 @@ void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->vendor_sn);
 }
 
-void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                                 const u_int8_t* ptr_buff)
+void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -658,9 +593,7 @@ void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_link
     ptr_struct->vendor_sn = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level)
+void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_mcqi_linkx_properties ========\n");
@@ -795,9 +728,7 @@ void reg_access_hca_mcqi_version_dump(const struct reg_access_hca_mcqi_version*
     reg_access_hca_mcqi_version_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_pack(
-  const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_packet_drop_mini_flow_modifier_pack(const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -807,9 +738,7 @@ void reg_access_hca_packet_drop_mini_flow_modifier_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_unpack(
-  struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-  const u_int8_t* ptr_buff)
+void reg_access_hca_packet_drop_mini_flow_modifier_unpack(struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -819,10 +748,7 @@ void reg_access_hca_packet_drop_mini_flow_modifier_unpack(
     ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_print(
-  const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_packet_drop_mini_flow_modifier_print(const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_packet_drop_mini_flow_modifier ========\n");
@@ -830,9 +756,7 @@ void reg_access_hca_packet_drop_mini_flow_modifier_print(
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "num_packets          : " UH_FMT "\n", ptr_struct->num_packets);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
-            (ptr_struct->port_number == 1 ? ("port_number1") :
-                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
             ptr_struct->port_number);
 }
 
@@ -841,16 +765,12 @@ unsigned int reg_access_hca_packet_drop_mini_flow_modifier_size(void)
     return REG_ACCESS_HCA_PACKET_DROP_MINI_FLOW_MODIFIER_SIZE;
 }
 
-void reg_access_hca_packet_drop_mini_flow_modifier_dump(
-  const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_packet_drop_mini_flow_modifier_dump(const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_packet_drop_mini_flow_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_pack(
-  const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_pause_tx_stop_toggle_modifier_pack(const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -860,8 +780,7 @@ void reg_access_hca_pause_tx_stop_toggle_modifier_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -871,10 +790,7 @@ void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_p
     ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_print(
-  const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_pause_tx_stop_toggle_modifier_print(const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_pause_tx_stop_toggle_modifier ========\n");
@@ -891,16 +807,11 @@ void reg_access_hca_pause_tx_stop_toggle_modifier_print(
                            ("SL_PRIO_3") :
                            ((ptr_struct->sl_prio_mask == 16 ?
                                ("SL_PRIO_4") :
-                               ((ptr_struct->sl_prio_mask == 32 ?
-                                   ("SL_PRIO_5") :
-                                   ((ptr_struct->sl_prio_mask == 64 ?
-                                       ("SL_PRIO_6") :
-                                       ((ptr_struct->sl_prio_mask == 128 ? ("SL_PRIO_7") : ("unknown")))))))))))))))),
+                               ((ptr_struct->sl_prio_mask == 32 ? ("SL_PRIO_5") :
+                                                                  ((ptr_struct->sl_prio_mask == 64 ? ("SL_PRIO_6") : ((ptr_struct->sl_prio_mask == 128 ? ("SL_PRIO_7") : ("unknown")))))))))))))))),
             ptr_struct->sl_prio_mask);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
-            (ptr_struct->port_number == 1 ? ("port_number1") :
-                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
             ptr_struct->port_number);
 }
 
@@ -909,9 +820,7 @@ unsigned int reg_access_hca_pause_tx_stop_toggle_modifier_size(void)
     return REG_ACCESS_HCA_PAUSE_TX_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_pause_tx_stop_toggle_modifier_dump(
-  const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_pause_tx_stop_toggle_modifier_dump(const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_pause_tx_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
@@ -963,9 +872,7 @@ void reg_access_hca_rom_version_dump(const struct reg_access_hca_rom_version* pt
     reg_access_hca_rom_version_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(
-  const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -975,8 +882,7 @@ void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -986,39 +892,30 @@ void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_r
     ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_print(
-  const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_rxb_hang_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
-      (ptr_struct->vl_tc_mask == 1 ?
-         ("VL_TC_0") :
-         ((ptr_struct->vl_tc_mask == 2 ?
-             ("VL_TC_1") :
-             ((ptr_struct->vl_tc_mask == 4 ?
-                 ("VL_TC_2") :
-                 ((ptr_struct->vl_tc_mask == 8 ?
-                     ("VL_TC_3") :
-                     ((ptr_struct->vl_tc_mask == 16 ?
-                         ("VL_TC_4") :
-                         ((ptr_struct->vl_tc_mask == 32 ?
-                             ("VL_TC_5") :
-                             ((ptr_struct->vl_tc_mask == 64 ?
-                                 ("VL_TC_6") :
-                                 ((ptr_struct->vl_tc_mask == 128 ?
-                                     ("VL_TC_7") :
-                                     ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
-      ptr_struct->vl_tc_mask);
-    adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
-            (ptr_struct->port_number == 1 ? ("port_number1") :
-                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+    fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
+            (ptr_struct->vl_tc_mask == 1 ?
+               ("VL_TC_0") :
+               ((ptr_struct->vl_tc_mask == 2 ?
+                   ("VL_TC_1") :
+                   ((ptr_struct->vl_tc_mask == 4 ?
+                       ("VL_TC_2") :
+                       ((ptr_struct->vl_tc_mask == 8 ?
+                           ("VL_TC_3") :
+                           ((ptr_struct->vl_tc_mask == 16 ?
+                               ("VL_TC_4") :
+                               ((ptr_struct->vl_tc_mask == 32 ?
+                                   ("VL_TC_5") :
+                                   ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") :
+                                                                    ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
+            ptr_struct->vl_tc_mask);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
             ptr_struct->port_number);
 }
 
@@ -1027,16 +924,12 @@ unsigned int reg_access_hca_rxb_hang_stop_toggle_modifier_size(void)
     return REG_ACCESS_HCA_RXB_HANG_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(
-  const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_rxb_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(
-  const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1048,8 +941,7 @@ void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1061,41 +953,32 @@ void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_r
     ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_rxp_hang_stop_toggle_modifier_print(
-  const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_rxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_rxp_hang_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
-      (ptr_struct->vl_tc_mask == 1 ?
-         ("VL_TC_0") :
-         ((ptr_struct->vl_tc_mask == 2 ?
-             ("VL_TC_1") :
-             ((ptr_struct->vl_tc_mask == 4 ?
-                 ("VL_TC_2") :
-                 ((ptr_struct->vl_tc_mask == 8 ?
-                     ("VL_TC_3") :
-                     ((ptr_struct->vl_tc_mask == 16 ?
-                         ("VL_TC_4") :
-                         ((ptr_struct->vl_tc_mask == 32 ?
-                             ("VL_TC_5") :
-                             ((ptr_struct->vl_tc_mask == 64 ?
-                                 ("VL_TC_6") :
-                                 ((ptr_struct->vl_tc_mask == 128 ?
-                                     ("VL_TC_7") :
-                                     ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
-      ptr_struct->vl_tc_mask);
+    fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
+            (ptr_struct->vl_tc_mask == 1 ?
+               ("VL_TC_0") :
+               ((ptr_struct->vl_tc_mask == 2 ?
+                   ("VL_TC_1") :
+                   ((ptr_struct->vl_tc_mask == 4 ?
+                       ("VL_TC_2") :
+                       ((ptr_struct->vl_tc_mask == 8 ?
+                           ("VL_TC_3") :
+                           ((ptr_struct->vl_tc_mask == 16 ?
+                               ("VL_TC_4") :
+                               ((ptr_struct->vl_tc_mask == 32 ?
+                                   ("VL_TC_5") :
+                                   ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") :
+                                                                    ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
+            ptr_struct->vl_tc_mask);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pnat                 : " UH_FMT "\n", ptr_struct->pnat);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
-            (ptr_struct->port_number == 1 ? ("port_number1") :
-                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
             ptr_struct->port_number);
 }
 
@@ -1104,16 +987,12 @@ unsigned int reg_access_hca_rxp_hang_stop_toggle_modifier_size(void)
     return REG_ACCESS_HCA_RXP_HANG_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(
-  const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_rxp_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(
-  const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1121,8 +1000,7 @@ void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->port_number);
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1130,18 +1008,13 @@ void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_s
     ptr_struct->port_number = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_print(
-  const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_sxp_hang_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n",
-            (ptr_struct->port_number == 1 ? ("port_number1") :
-                                            ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
+    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
             ptr_struct->port_number);
 }
 
@@ -1150,15 +1023,12 @@ unsigned int reg_access_hca_sxp_hang_stop_toggle_modifier_size(void)
     return REG_ACCESS_HCA_SXP_HANG_STOP_TOGGLE_MODIFIER_SIZE;
 }
 
-void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(
-  const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_sxp_hang_stop_toggle_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                u_int8_t* ptr_buff)
+void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1168,8 +1038,7 @@ void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diag
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sync);
 }
 
-void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                  const u_int8_t* ptr_buff)
+void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1179,9 +1048,7 @@ void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnost
     ptr_struct->sync = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level)
+void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_diagnostic_cntr_layout ========\n");
@@ -1197,27 +1064,22 @@ unsigned int reg_access_hca_diagnostic_cntr_layout_size(void)
     return REG_ACCESS_HCA_DIAGNOSTIC_CNTR_LAYOUT_SIZE;
 }
 
-void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                FILE* fd)
+void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, FILE* fd)
 {
     reg_access_hca_diagnostic_cntr_layout_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
-                                            u_int8_t* ptr_buff)
+void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_hca_mcqi_cap_pack(&(ptr_struct->mcqi_cap), ptr_buff);
 }
 
-void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
-                                              const u_int8_t* ptr_buff)
+void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_hca_mcqi_cap_unpack(&(ptr_struct->mcqi_cap), ptr_buff);
 }
 
-void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level)
+void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_mcqi_reg_data_auto ========\n");
@@ -1270,9 +1132,7 @@ void reg_access_hca_mgir_dev_info_unpack(struct reg_access_hca_mgir_dev_info* pt
     }
 }
 
-void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -1482,8 +1342,7 @@ void reg_access_hca_mgir_fw_info_dump(const struct reg_access_hca_mgir_fw_info*
     reg_access_hca_mgir_fw_info_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
-                                            u_int8_t* ptr_buff)
+void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1511,8 +1370,7 @@ void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_har
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uptime);
 }
 
-void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info* ptr_struct,
-                                              const u_int8_t* ptr_buff)
+void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1540,9 +1398,7 @@ void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardwar
     ptr_struct->uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level)
+void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_mgir_hardware_info ========\n");
@@ -1704,9 +1560,7 @@ void reg_access_hca_mgir_sw_info_dump(const struct reg_access_hca_mgir_sw_info*
     reg_access_hca_mgir_sw_info_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_pack(
-  const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_smbus_failed_fault_inject_modifier_pack(const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1714,9 +1568,7 @@ void reg_access_hca_smbus_failed_fault_inject_modifier_pack(
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->smbus_gw);
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(
-  struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-  const u_int8_t* ptr_buff)
+void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1724,10 +1576,7 @@ void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(
     ptr_struct->smbus_gw = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_print(
-  const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_smbus_failed_fault_inject_modifier_print(const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_smbus_failed_fault_inject_modifier ========\n");
@@ -1741,15 +1590,12 @@ unsigned int reg_access_hca_smbus_failed_fault_inject_modifier_size(void)
     return REG_ACCESS_HCA_SMBUS_FAILED_FAULT_INJECT_MODIFIER_SIZE;
 }
 
-void reg_access_hca_smbus_failed_fault_inject_modifier_dump(
-  const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-  FILE* fd)
+void reg_access_hca_smbus_failed_fault_inject_modifier_dump(const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, FILE* fd)
 {
     reg_access_hca_smbus_failed_fault_inject_modifier_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters* ptr_struct,
-                                              u_int8_t* ptr_buff)
+void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1759,8 +1605,7 @@ void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string
     adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->string_db_size);
 }
 
-void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters* ptr_struct,
-                                                const u_int8_t* ptr_buff)
+void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1770,9 +1615,7 @@ void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_
     ptr_struct->string_db_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level)
+void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_string_db_parameters ========\n");
@@ -1793,36 +1636,27 @@ void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string
     reg_access_hca_string_db_parameters_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(
-  const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_hca_irisc_hang_mini_flow_modifier_pack(&(ptr_struct->irisc_hang_mini_flow_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(
-  union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-  const u_int8_t* ptr_buff)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_hca_irisc_hang_mini_flow_modifier_unpack(&(ptr_struct->irisc_hang_mini_flow_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(
-  const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto ========\n");
 
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "irisc_hang_mini_flow_modifier:\n");
-    reg_access_hca_irisc_hang_mini_flow_modifier_print(&(ptr_struct->irisc_hang_mini_flow_modifier), fd,
-                                                       indent_level + 1);
+    reg_access_hca_irisc_hang_mini_flow_modifier_print(&(ptr_struct->irisc_hang_mini_flow_modifier), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "packet_drop_mini_flow_modifier:\n");
-    reg_access_hca_packet_drop_mini_flow_modifier_print(&(ptr_struct->packet_drop_mini_flow_modifier), fd,
-                                                        indent_level + 1);
+    reg_access_hca_packet_drop_mini_flow_modifier_print(&(ptr_struct->packet_drop_mini_flow_modifier), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_size(void)
@@ -1830,55 +1664,41 @@ unsigned int reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_size(void)
     return REG_ACCESS_HCA_STRS_MINI_FLOW_REG_PER_TYPE_MODIFIER_AUTO_SIZE;
 }
 
-void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(
-  const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-  FILE* fd)
+void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, FILE* fd)
 {
     reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(
-  const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_hca_rxb_hang_stop_toggle_modifier_pack(&(ptr_struct->rxb_hang_stop_toggle_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(
-  union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-  const u_int8_t* ptr_buff)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(&(ptr_struct->rxb_hang_stop_toggle_modifier), ptr_buff);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(
-  const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto ========\n");
 
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "rxb_hang_stop_toggle_modifier:\n");
-    reg_access_hca_rxb_hang_stop_toggle_modifier_print(&(ptr_struct->rxb_hang_stop_toggle_modifier), fd,
-                                                       indent_level + 1);
+    reg_access_hca_rxb_hang_stop_toggle_modifier_print(&(ptr_struct->rxb_hang_stop_toggle_modifier), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "lock_source_stop_toggle_modifier:\n");
-    reg_access_hca_lock_source_stop_toggle_modifier_print(&(ptr_struct->lock_source_stop_toggle_modifier), fd,
-                                                          indent_level + 1);
+    reg_access_hca_lock_source_stop_toggle_modifier_print(&(ptr_struct->lock_source_stop_toggle_modifier), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "sxp_hang_stop_toggle_modifier:\n");
-    reg_access_hca_sxp_hang_stop_toggle_modifier_print(&(ptr_struct->sxp_hang_stop_toggle_modifier), fd,
-                                                       indent_level + 1);
+    reg_access_hca_sxp_hang_stop_toggle_modifier_print(&(ptr_struct->sxp_hang_stop_toggle_modifier), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "rxp_hang_stop_toggle_modifier:\n");
-    reg_access_hca_rxp_hang_stop_toggle_modifier_print(&(ptr_struct->rxp_hang_stop_toggle_modifier), fd,
-                                                       indent_level + 1);
+    reg_access_hca_rxp_hang_stop_toggle_modifier_print(&(ptr_struct->rxp_hang_stop_toggle_modifier), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pause_tx_stop_toggle_modifier:\n");
-    reg_access_hca_pause_tx_stop_toggle_modifier_print(&(ptr_struct->pause_tx_stop_toggle_modifier), fd,
-                                                       indent_level + 1);
+    reg_access_hca_pause_tx_stop_toggle_modifier_print(&(ptr_struct->pause_tx_stop_toggle_modifier), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_size(void)
@@ -1886,9 +1706,7 @@ unsigned int reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_size(voi
     return REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_PER_TYPE_MODIFIER_AUTO_SIZE;
 }
 
-void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(
-  const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-  FILE* fd)
+void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, FILE* fd)
 {
     reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(ptr_struct, fd, 0);
 }
@@ -2072,33 +1890,30 @@ void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struc
     fprintf(fd, "======== reg_access_hca_mcc_reg ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "instruction          : %s (" UH_FMT ")\n",
-      (ptr_struct->instruction == 1 ?
-         ("LOCK_UPDATE_HANDLE") :
-         ((ptr_struct->instruction == 2 ?
-             ("RELEASE_UPDATE_HANDLE") :
-             ((ptr_struct->instruction == 3 ?
-                 ("UPDATE_COMPONENT") :
-                 ((ptr_struct->instruction == 4 ?
-                     ("VERIFY_COMPONENT") :
-                     ((ptr_struct->instruction == 5 ?
-                         ("ACTIVATE_COMPONENET") :
-                         ((ptr_struct->instruction == 6 ?
-                             ("ACTIVATE") :
-                             ((ptr_struct->instruction == 7 ?
-                                 ("READ_COMPONENT") :
-                                 ((ptr_struct->instruction == 8 ?
-                                     ("CANCEL") :
-                                     ((ptr_struct->instruction == 9 ?
-                                         ("CHECK_UPDATE_HANDLE") :
-                                         ((ptr_struct->instruction == 10 ?
-                                             ("FORCE_HANDLE_RELEASE") :
-                                             ((ptr_struct->instruction == 11 ?
-                                                 ("READ_PENDING_COMPONENT") :
-                                                 ((ptr_struct->instruction == 12 ? ("DOWNSRTEAM_DEVICE_TRANSFER") :
-                                                                                   ("unknown")))))))))))))))))))))))),
-      ptr_struct->instruction);
+    fprintf(fd, "instruction          : %s (" UH_FMT ")\n",
+            (ptr_struct->instruction == 1 ?
+               ("LOCK_UPDATE_HANDLE") :
+               ((ptr_struct->instruction == 2 ?
+                   ("RELEASE_UPDATE_HANDLE") :
+                   ((ptr_struct->instruction == 3 ?
+                       ("UPDATE_COMPONENT") :
+                       ((ptr_struct->instruction == 4 ?
+                           ("VERIFY_COMPONENT") :
+                           ((ptr_struct->instruction == 5 ?
+                               ("ACTIVATE_COMPONENET") :
+                               ((ptr_struct->instruction == 6 ?
+                                   ("ACTIVATE") :
+                                   ((ptr_struct->instruction == 7 ?
+                                       ("READ_COMPONENT") :
+                                       ((ptr_struct->instruction == 8 ?
+                                           ("CANCEL") :
+                                           ((ptr_struct->instruction == 9 ?
+                                               ("CHECK_UPDATE_HANDLE") :
+                                               ((ptr_struct->instruction == 10 ?
+                                                   ("FORCE_HANDLE_RELEASE") :
+                                                   ((ptr_struct->instruction == 11 ? ("READ_PENDING_COMPONENT") :
+                                                                                     ((ptr_struct->instruction == 12 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))))))),
+            ptr_struct->instruction);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "activation_delay_sec : " UH_FMT "\n", ptr_struct->activation_delay_sec);
     adb2c_add_indentation(fd, indent_level);
@@ -2127,10 +1942,7 @@ void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struc
                                        ("ACTIVATE") :
                                        ((ptr_struct->control_state == 7 ?
                                            ("UPLOAD") :
-                                           ((ptr_struct->control_state == 8 ?
-                                               ("UPLOAD_PENDING") :
-                                               ((ptr_struct->control_state == 9 ? ("DOWNSRTEAM_DEVICE_TRANSFER") :
-                                                                                  ("unknown")))))))))))))))))))),
+                                           ((ptr_struct->control_state == 8 ? ("UPLOAD_PENDING") : ((ptr_struct->control_state == 9 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))),
             ptr_struct->control_state);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "error_code           : " UH_FMT "\n", ptr_struct->error_code);
@@ -2143,10 +1955,7 @@ void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struc
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "component_size       : " U32H_FMT "\n", ptr_struct->component_size);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "device_type          : %s (" UH_FMT ")\n",
-      (ptr_struct->device_type == 0 ? ("Switch_or_NIC") : ((ptr_struct->device_type == 1 ? ("Gearbox") : ("unknown")))),
-      ptr_struct->device_type);
+    fprintf(fd, "device_type          : %s (" UH_FMT ")\n", (ptr_struct->device_type == 0 ? ("Switch_or_NIC") : ((ptr_struct->device_type == 1 ? ("Gearbox") : ("unknown")))), ptr_struct->device_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "device_index         : " UH_FMT "\n", ptr_struct->device_index);
     adb2c_add_indentation(fd, indent_level);
@@ -2264,8 +2073,7 @@ void reg_access_hca_mcqi_reg_pack(const struct reg_access_hca_mcqi_reg* ptr_stru
             break;
         case 0x5:
             offset = 192;
-            reg_access_hca_mcqi_activation_method_pack(&(ptr_struct->data.mcqi_activation_method),
-                                                       ptr_buff + offset / 8);
+            reg_access_hca_mcqi_activation_method_pack(&(ptr_struct->data.mcqi_activation_method), ptr_buff + offset / 8);
             break;
         case 0x6:
             offset = 192;
@@ -2309,13 +2117,11 @@ void reg_access_hca_mcqi_reg_unpack(struct reg_access_hca_mcqi_reg* ptr_struct,
             break;
         case 0x5:
             offset = 192;
-            reg_access_hca_mcqi_activation_method_unpack(&(ptr_struct->data.mcqi_activation_method),
-                                                         ptr_buff + offset / 8);
+            reg_access_hca_mcqi_activation_method_unpack(&(ptr_struct->data.mcqi_activation_method), ptr_buff + offset / 8);
             break;
         case 0x6:
             offset = 192;
-            reg_access_hca_mcqi_linkx_properties_unpack(&(ptr_struct->data.mcqi_linkx_properties),
-                                                        ptr_buff + offset / 8);
+            reg_access_hca_mcqi_linkx_properties_unpack(&(ptr_struct->data.mcqi_linkx_properties), ptr_buff + offset / 8);
             break;
         default:
             break;
@@ -2336,15 +2142,11 @@ void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg* ptr_str
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "info_type            : %s (" UH_FMT ")\n",
-      (ptr_struct->info_type == 0 ?
-         ("CAPABILITIES") :
-         ((ptr_struct->info_type == 1 ?
-             ("VERSION") :
-             ((ptr_struct->info_type == 5 ? ("ACTIVATION_METHOD") :
-                                            ((ptr_struct->info_type == 6 ? ("LINKX_PROPERTIES") : ("unknown")))))))),
-      ptr_struct->info_type);
+    fprintf(fd, "info_type            : %s (" UH_FMT ")\n",
+            (ptr_struct->info_type == 0 ?
+               ("CAPABILITIES") :
+               ((ptr_struct->info_type == 1 ? ("VERSION") : ((ptr_struct->info_type == 5 ? ("ACTIVATION_METHOD") : ((ptr_struct->info_type == 6 ? ("LINKX_PROPERTIES") : ("unknown")))))))),
+            ptr_struct->info_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "info_size            : " U32H_FMT "\n", ptr_struct->info_size);
     adb2c_add_indentation(fd, indent_level);
@@ -2366,8 +2168,7 @@ void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg* ptr_str
         case 0x5:
             adb2c_add_indentation(fd, indent_level);
             fprintf(fd, "mcqi_activation_method:\n");
-            reg_access_hca_mcqi_activation_method_print(&(ptr_struct->data.mcqi_activation_method), fd,
-                                                        indent_level + 1);
+            reg_access_hca_mcqi_activation_method_print(&(ptr_struct->data.mcqi_activation_method), fd, indent_level + 1);
             break;
         case 0x6:
             adb2c_add_indentation(fd, indent_level);
@@ -2472,38 +2273,28 @@ void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg* ptr_str
                                            ("LINKX_IMG") :
                                            ((ptr_struct->identifier == 13 ?
                                                ("CRYPTO_TO_COMMISSIONING") :
-                                               ((ptr_struct->identifier == 14 ?
-                                                   ("RMCS_TOKEN") :
-                                                   ((ptr_struct->identifier == 15 ? ("RMDT_TOKEN") :
-                                                                                    ("unknown")))))))))))))))))))))),
+                                               ((ptr_struct->identifier == 14 ? ("RMCS_TOKEN") : ((ptr_struct->identifier == 15 ? ("RMDT_TOKEN") : ("unknown")))))))))))))))))))))),
             ptr_struct->identifier);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "component_update_state : %s (" UH_FMT ")\n",
-      (ptr_struct->component_update_state == 0 ?
-         ("IDLE") :
-         ((ptr_struct->component_update_state == 1 ?
-             ("IN_PROGRESS") :
-             ((ptr_struct->component_update_state == 2 ?
-                 ("APPLIED") :
-                 ((ptr_struct->component_update_state == 3 ?
-                     ("ACTIVE") :
-                     ((ptr_struct->component_update_state == 4 ?
-                         ("ACTIVE_PENDING_RESET") :
-                         ((ptr_struct->component_update_state == 5 ?
-                             ("FAILED") :
-                             ((ptr_struct->component_update_state == 6 ?
-                                 ("CANCELED") :
-                                 ((ptr_struct->component_update_state == 7 ? ("BUSY") : ("unknown")))))))))))))))),
-      ptr_struct->component_update_state);
-    adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "component_status     : %s (" UH_FMT ")\n",
-      (ptr_struct->component_status == 0 ?
-         ("NOT_PRESENT") :
-         ((ptr_struct->component_status == 1 ? ("PRESENT") :
-                                               ((ptr_struct->component_status == 2 ? ("IN_USE") : ("unknown")))))),
-      ptr_struct->component_status);
+    fprintf(fd, "component_update_state : %s (" UH_FMT ")\n",
+            (ptr_struct->component_update_state == 0 ?
+               ("IDLE") :
+               ((ptr_struct->component_update_state == 1 ?
+                   ("IN_PROGRESS") :
+                   ((ptr_struct->component_update_state == 2 ?
+                       ("APPLIED") :
+                       ((ptr_struct->component_update_state == 3 ?
+                           ("ACTIVE") :
+                           ((ptr_struct->component_update_state == 4 ?
+                               ("ACTIVE_PENDING_RESET") :
+                               ((ptr_struct->component_update_state == 5 ?
+                                   ("FAILED") :
+                                   ((ptr_struct->component_update_state == 6 ? ("CANCELED") : ((ptr_struct->component_update_state == 7 ? ("BUSY") : ("unknown")))))))))))))))),
+            ptr_struct->component_update_state);
+    adb2c_add_indentation(fd, indent_level);
+    fprintf(fd, "component_status     : %s (" UH_FMT ")\n",
+            (ptr_struct->component_status == 0 ? ("NOT_PRESENT") : ((ptr_struct->component_status == 1 ? ("PRESENT") : ((ptr_struct->component_status == 2 ? ("IN_USE") : ("unknown")))))),
+            ptr_struct->component_status);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "progress             : " UH_FMT "\n", ptr_struct->progress);
     adb2c_add_indentation(fd, indent_level);
@@ -2520,9 +2311,7 @@ void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg* ptr_str
                        ("MAD") :
                        ((ptr_struct->last_update_state_changer_type == 3 ?
                            ("BMC") :
-                           ((ptr_struct->last_update_state_changer_type == 4 ?
-                               ("command_interface") :
-                               ((ptr_struct->last_update_state_changer_type == 5 ? ("ICMD") : ("unknown")))))))))))),
+                           ((ptr_struct->last_update_state_changer_type == 4 ? ("command_interface") : ((ptr_struct->last_update_state_changer_type == 5 ? ("ICMD") : ("unknown")))))))))))),
             ptr_struct->last_update_state_changer_type);
 }
 
@@ -2581,11 +2370,8 @@ void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext*
     fprintf(fd, "rst_type_sel         : " UH_FMT "\n", ptr_struct->rst_type_sel);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pci_sync_for_fw_update_resp : %s (" UH_FMT ")\n",
-            (ptr_struct->pci_sync_for_fw_update_resp == 1 ?
-               ("Acknowledgment") :
-               ((ptr_struct->pci_sync_for_fw_update_resp == 2 ?
-                   ("Dis") :
-                   ((ptr_struct->pci_sync_for_fw_update_resp == 3 ? ("Reserved") : ("unknown")))))),
+            (ptr_struct->pci_sync_for_fw_update_resp == 1 ? ("Acknowledgment") :
+                                                            ((ptr_struct->pci_sync_for_fw_update_resp == 2 ? ("Dis") : ((ptr_struct->pci_sync_for_fw_update_resp == 3 ? ("Reserved") : ("unknown")))))),
             ptr_struct->pci_sync_for_fw_update_resp);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pci_sync_for_fw_update_start : " UH_FMT "\n", ptr_struct->pci_sync_for_fw_update_start);
@@ -2984,17 +2770,13 @@ void reg_access_hca_mqis_reg_print(const struct reg_access_hca_mqis_reg* ptr_str
     fprintf(fd, "======== reg_access_hca_mqis_reg ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "info_type            : %s (" UH_FMT ")\n",
-      (ptr_struct->info_type == 1 ?
-         ("MODEL_NAME") :
-         ((ptr_struct->info_type == 2 ?
-             ("MODEL_DESCRIPTION") :
-             ((ptr_struct->info_type == 3 ?
-                 ("IMAGE_VSD") :
-                 ((ptr_struct->info_type == 4 ? ("DEVICE_VSD") :
-                                                ((ptr_struct->info_type == 5 ? ("ROM_INFO") : ("unknown")))))))))),
-      ptr_struct->info_type);
+    fprintf(fd, "info_type            : %s (" UH_FMT ")\n",
+            (ptr_struct->info_type == 1 ?
+               ("MODEL_NAME") :
+               ((ptr_struct->info_type == 2 ?
+                   ("MODEL_DESCRIPTION") :
+                   ((ptr_struct->info_type == 3 ? ("IMAGE_VSD") : ((ptr_struct->info_type == 4 ? ("DEVICE_VSD") : ((ptr_struct->info_type == 5 ? ("ROM_INFO") : ("unknown")))))))))),
+            ptr_struct->info_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "info_length          : " UH_FMT "\n", ptr_struct->info_length);
     adb2c_add_indentation(fd, indent_level);
@@ -3133,9 +2915,7 @@ void reg_access_hca_mtrc_stdb_reg_unpack(struct reg_access_hca_mtrc_stdb_reg* pt
     ptr_struct->start_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_mtrc_stdb_reg ========\n");
@@ -3323,9 +3103,7 @@ void reg_access_hca_resource_dump_unpack(struct reg_access_hca_resource_dump* pt
     }
 }
 
-void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -3377,8 +3155,7 @@ void reg_access_hca_resource_dump_dump(const struct reg_access_hca_resource_dump
     reg_access_hca_resource_dump_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                               u_int8_t* ptr_buff)
+void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3398,8 +3175,7 @@ void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_
     reg_access_hca_smbus_failed_fault_inject_modifier_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                                 const u_int8_t* ptr_buff)
+void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3419,9 +3195,7 @@ void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_faul
     reg_access_hca_smbus_failed_fault_inject_modifier_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level)
+void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_strs_fault_inject_reg ========\n");
@@ -3433,28 +3207,24 @@ void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "type                 : %s (" UH_FMT ")\n",
-      (ptr_struct->type == 0 ?
-         ("ICM_ALLOC_REFUSE") :
-         ((ptr_struct->type == 1 ?
-             ("ICM_ALLOC_BUSY") :
-             ((ptr_struct->type == 2 ?
-                 ("EQE_GW_BUSY") :
-                 ((ptr_struct->type == 3 ?
-                     ("CQE_GW_BUSY") :
-                     ((ptr_struct->type == 4 ?
-                         ("RX_FENCE_BUSY") :
-                         ((ptr_struct->type == 5 ?
-                             ("SX_FENCE_BUSY") :
-                             ((ptr_struct->type == 6 ?
-                                 ("RXT_SLICE_FENCE_BUSY") :
-                                 ((ptr_struct->type == 7 ?
-                                     ("SXD_SLICE_FENCE_BUSY") :
-                                     ((ptr_struct->type == 8 ?
-                                         ("GENERAL_FENCE_BUSY") :
-                                         ((ptr_struct->type == 9 ? ("SMBUS_FAILED") : ("unknown")))))))))))))))))))),
-      ptr_struct->type);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
+            (ptr_struct->type == 0 ?
+               ("ICM_ALLOC_REFUSE") :
+               ((ptr_struct->type == 1 ?
+                   ("ICM_ALLOC_BUSY") :
+                   ((ptr_struct->type == 2 ?
+                       ("EQE_GW_BUSY") :
+                       ((ptr_struct->type == 3 ?
+                           ("CQE_GW_BUSY") :
+                           ((ptr_struct->type == 4 ?
+                               ("RX_FENCE_BUSY") :
+                               ((ptr_struct->type == 5 ?
+                                   ("SX_FENCE_BUSY") :
+                                   ((ptr_struct->type == 6 ?
+                                       ("RXT_SLICE_FENCE_BUSY") :
+                                       ((ptr_struct->type == 7 ? ("SXD_SLICE_FENCE_BUSY") :
+                                                                 ((ptr_struct->type == 8 ? ("GENERAL_FENCE_BUSY") : ((ptr_struct->type == 9 ? ("SMBUS_FAILED") : ("unknown")))))))))))))))))))),
+            ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "num_skip             : " UH_FMT "\n", ptr_struct->num_skip);
     adb2c_add_indentation(fd, indent_level);
@@ -3474,8 +3244,7 @@ void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_
     reg_access_hca_strs_fault_inject_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
-                                            u_int8_t* ptr_buff)
+void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3492,12 +3261,10 @@ void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_min
     offset = 112;
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_repeat);
     offset = 128;
-    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier),
-                                                                  ptr_buff + offset / 8);
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
-                                              const u_int8_t* ptr_buff)
+void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3514,13 +3281,10 @@ void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_fl
     offset = 112;
     ptr_struct->num_repeat = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
     offset = 128;
-    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier),
-                                                                    ptr_buff + offset / 8);
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level)
+void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_strs_mini_flow_reg ========\n");
@@ -3564,11 +3328,7 @@ void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mi
                                                              ("INVALIDATE_PORT_INFO_CACHE") :
                                                              ((ptr_struct->type == 14 ?
                                                                  ("INVALIDATE_QP_CACHE") :
-                                                                 ((ptr_struct->type == 15 ?
-                                                                     ("IRISC_HANG") :
-                                                                     ((ptr_struct->type == 16 ?
-                                                                         ("PACKET_DROP") :
-                                                                         ("unknown")))))))))))))))))))))))))))))))))),
+                                                                 ((ptr_struct->type == 15 ? ("IRISC_HANG") : ((ptr_struct->type == 16 ? ("PACKET_DROP") : ("unknown")))))))))))))))))))))))))))))))))),
       ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "freq                 : " UH_FMT "\n", ptr_struct->freq);
@@ -3576,8 +3336,7 @@ void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mi
     fprintf(fd, "num_repeat           : " UH_FMT "\n", ptr_struct->num_repeat);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "per_type_modifier:\n");
-    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd,
-                                                                   indent_level + 1);
+    reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_mini_flow_reg_size(void)
@@ -3590,8 +3349,7 @@ void reg_access_hca_strs_mini_flow_reg_dump(const struct reg_access_hca_strs_min
     reg_access_hca_strs_mini_flow_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3607,8 +3365,7 @@ void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_reso
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->reduce_percentage);
 }
 
-void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg* ptr_struct,
-                                             const u_int8_t* ptr_buff)
+void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3624,9 +3381,7 @@ void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource
     ptr_struct->reduce_percentage = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level)
+void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_strs_resource_reg ========\n");
@@ -3638,9 +3393,7 @@ void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_res
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ? ("SX_SLICE") : ((ptr_struct->type == 1 ? ("RX_SLICE") : ("unknown")))),
-            ptr_struct->type);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("SX_SLICE") : ((ptr_struct->type == 1 ? ("RX_SLICE") : ("unknown")))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "reduce_percentage    : " U32H_FMT "\n", ptr_struct->reduce_percentage);
 }
@@ -3655,8 +3408,7 @@ void reg_access_hca_strs_resource_reg_dump(const struct reg_access_hca_strs_reso
     reg_access_hca_strs_resource_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                              u_int8_t* ptr_buff)
+void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3675,12 +3427,10 @@ void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_s
     offset = 64;
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->polarity);
     offset = 128;
-    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier),
-                                                                    ptr_buff + offset / 8);
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                                const u_int8_t* ptr_buff)
+void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3699,13 +3449,10 @@ void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_
     offset = 64;
     ptr_struct->polarity = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
     offset = 128;
-    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier),
-                                                                      ptr_buff + offset / 8);
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(&(ptr_struct->per_type_modifier), ptr_buff + offset / 8);
 }
 
-void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level)
+void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_strs_stop_toggle_reg ========\n");
@@ -3717,67 +3464,60 @@ void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "type                 : %s (" UH_FMT ")\n",
-      (ptr_struct->type == 0 ?
-         ("DC_CNAK") :
-         ((ptr_struct->type == 1 ?
-             ("RXT_CHECKS") :
-             ((ptr_struct->type == 2 ?
-                 ("TIMEOUT") :
-                 ((ptr_struct->type == 3 ?
-                     ("SX_ERROR") :
-                     ((ptr_struct->type == 4 ?
-                         ("RX_ERROR") :
-                         ((ptr_struct->type == 5 ?
-                             ("MX_ERROR") :
-                             ((ptr_struct->type == 6 ?
-                                 ("MAD_TRAP") :
-                                 ((ptr_struct->type == 7 ?
-                                     ("RXT_SLICE") :
-                                     ((ptr_struct->type == 8 ?
-                                         ("QOS_ARBITER") :
-                                         ((ptr_struct->type == 9 ?
-                                             ("RXB_HANG") :
-                                             ((ptr_struct->type == 10 ?
-                                                 ("FW_SCHED_Q") :
-                                                 ((ptr_struct->type == 11 ?
-                                                     ("LOCK_RESOURCE") :
-                                                     ((ptr_struct->type == 12 ?
-                                                         ("IRISC_HANG") :
-                                                         ((ptr_struct->type == 13 ?
-                                                             ("SXW_SLICE") :
-                                                             ((ptr_struct->type == 14 ?
-                                                                 ("RXC_CQE") :
-                                                                 ((ptr_struct->type == 15 ?
-                                                                     ("RXC_EQE") :
-                                                                     ((ptr_struct->type == 16 ?
-                                                                         ("SXP_HANG") :
-                                                                         ((ptr_struct->type == 17 ?
-                                                                             ("SX_EXT_DB") :
-                                                                             ((ptr_struct->type == 18 ?
-                                                                                 ("SX_INT_DB") :
-                                                                                 ((ptr_struct->type == 19 ?
-                                                                                     ("QPC_SLICE") :
-                                                                                     ((ptr_struct->type == 20 ?
-                                                                                         ("RXB_HOST_HANG") :
-                                                                                         ((ptr_struct->type == 21 ?
-                                                                                             ("PAUSE_TX") :
-                                                                                             ("unknown")))))))))))))))))))))))))))))))))))))))))))),
-      ptr_struct->type);
+    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
+            (ptr_struct->type == 0 ?
+               ("DC_CNAK") :
+               ((ptr_struct->type == 1 ?
+                   ("RXT_CHECKS") :
+                   ((ptr_struct->type == 2 ?
+                       ("TIMEOUT") :
+                       ((ptr_struct->type == 3 ?
+                           ("SX_ERROR") :
+                           ((ptr_struct->type == 4 ?
+                               ("RX_ERROR") :
+                               ((ptr_struct->type == 5 ?
+                                   ("MX_ERROR") :
+                                   ((ptr_struct->type == 6 ?
+                                       ("MAD_TRAP") :
+                                       ((ptr_struct->type == 7 ?
+                                           ("RXT_SLICE") :
+                                           ((ptr_struct->type == 8 ?
+                                               ("QOS_ARBITER") :
+                                               ((ptr_struct->type == 9 ?
+                                                   ("RXB_HANG") :
+                                                   ((ptr_struct->type == 10 ?
+                                                       ("FW_SCHED_Q") :
+                                                       ((ptr_struct->type == 11 ?
+                                                           ("LOCK_RESOURCE") :
+                                                           ((ptr_struct->type == 12 ?
+                                                               ("IRISC_HANG") :
+                                                               ((ptr_struct->type == 13 ?
+                                                                   ("SXW_SLICE") :
+                                                                   ((ptr_struct->type == 14 ?
+                                                                       ("RXC_CQE") :
+                                                                       ((ptr_struct->type == 15 ?
+                                                                           ("RXC_EQE") :
+                                                                           ((ptr_struct->type == 16 ?
+                                                                               ("SXP_HANG") :
+                                                                               ((ptr_struct->type == 17 ?
+                                                                                   ("SX_EXT_DB") :
+                                                                                   ((ptr_struct->type == 18 ?
+                                                                                       ("SX_INT_DB") :
+                                                                                       ((ptr_struct->type == 19 ?
+                                                                                           ("QPC_SLICE") :
+                                                                                           ((ptr_struct->type == 20 ?
+                                                                                               ("RXB_HOST_HANG") :
+                                                                                               ((ptr_struct->type == 21 ? ("PAUSE_TX") : ("unknown")))))))))))))))))))))))))))))))))))))))))))),
+            ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "log_stressor         : " UH_FMT "\n", ptr_struct->log_stressor);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "log_duty_cycle       : " UH_FMT "\n", ptr_struct->log_duty_cycle);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "polarity             : %s (" UH_FMT ")\n",
-      (ptr_struct->polarity == 0 ? ("FLOW_STOPPED") : ((ptr_struct->polarity == 1 ? ("FLOW_ACTIVE") : ("unknown")))),
-      ptr_struct->polarity);
+    fprintf(fd, "polarity             : %s (" UH_FMT ")\n", (ptr_struct->polarity == 0 ? ("FLOW_STOPPED") : ((ptr_struct->polarity == 1 ? ("FLOW_ACTIVE") : ("unknown")))), ptr_struct->polarity);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "per_type_modifier:\n");
-    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd,
-                                                                     indent_level + 1);
+    reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(&(ptr_struct->per_type_modifier), fd, indent_level + 1);
 }
 
 unsigned int reg_access_hca_strs_stop_toggle_reg_size(void)
@@ -3790,21 +3530,17 @@ void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_s
     reg_access_hca_strs_stop_toggle_reg_print(ptr_struct, fd, 0);
 }
 
-void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                              u_int8_t* ptr_buff)
+void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_hca_resource_dump_pack(&(ptr_struct->resource_dump), ptr_buff);
 }
 
-void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                                const u_int8_t* ptr_buff)
+void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_hca_resource_dump_unpack(&(ptr_struct->resource_dump), ptr_buff);
 }
 
-void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level)
+void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_reg_access_hca_Nodes ========\n");
diff --git a/tools_layouts/reg_access_hca_layouts.h b/tools_layouts/reg_access_hca_layouts.h
index 03199fc7..d609acda 100644
--- a/tools_layouts/reg_access_hca_layouts.h
+++ b/tools_layouts/reg_access_hca_layouts.h
@@ -2240,62 +2240,37 @@ gle Modifier Layout," on page  1390 */
 
     /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
     /* lock_source_general_semaphore */
-    void reg_access_hca_lock_source_general_semaphore_pack(
-      const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_general_semaphore_unpack(
-      struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_general_semaphore_print(
-      const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_lock_source_general_semaphore_pack(const struct reg_access_hca_lock_source_general_semaphore* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_general_semaphore_unpack(struct reg_access_hca_lock_source_general_semaphore* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_general_semaphore_print(const struct reg_access_hca_lock_source_general_semaphore* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_lock_source_general_semaphore_size(void);
 #define REG_ACCESS_HCA_LOCK_SOURCE_GENERAL_SEMAPHORE_SIZE (0x1c)
-    void reg_access_hca_lock_source_general_semaphore_dump(
-      const struct reg_access_hca_lock_source_general_semaphore* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_lock_source_general_semaphore_dump(const struct reg_access_hca_lock_source_general_semaphore* ptr_struct, FILE* fd);
     /* lock_source_icm_resource */
-    void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                      u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                        const u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                       FILE* fd,
-                                                       int indent_level);
+    void reg_access_hca_lock_source_icm_resource_pack(const struct reg_access_hca_lock_source_icm_resource* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_icm_resource_unpack(struct reg_access_hca_lock_source_icm_resource* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_icm_resource_print(const struct reg_access_hca_lock_source_icm_resource* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_lock_source_icm_resource_size(void);
 #define REG_ACCESS_HCA_LOCK_SOURCE_ICM_RESOURCE_SIZE (0x1c)
-    void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource* ptr_struct,
-                                                      FILE* fd);
+    void reg_access_hca_lock_source_icm_resource_dump(const struct reg_access_hca_lock_source_icm_resource* ptr_struct, FILE* fd);
     /* lock_source_uapp_resource */
-    void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                       u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                         const u_int8_t* ptr_buff);
-    void
-      reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                     FILE* fd,
-                                                     int indent_level);
+    void reg_access_hca_lock_source_uapp_resource_pack(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_uapp_resource_unpack(struct reg_access_hca_lock_source_uapp_resource* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_lock_source_uapp_resource_size(void);
 #define REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE (0x1c)
-    void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct,
-                                                       FILE* fd);
+    void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, FILE* fd);
     /* lock_source_stop_toggle_modifier_category_modifier_auto */
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(
-      const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(
-      union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(
-      const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+                                                                                     u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+                                                                                       const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
+                                                                                      FILE* fd,
+                                                                                      int indent_level);
     unsigned int reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_size(void);
 #define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE (0x1c)
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(
-      const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct, FILE* fd);
     /* uint64 */
     void reg_access_hca_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
@@ -2304,49 +2279,26 @@ gle Modifier Layout," on page  1390 */
 #define REG_ACCESS_HCA_UINT64_SIZE (0x8)
     void reg_access_hca_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
     /* irisc_hang_mini_flow_modifier */
-    void reg_access_hca_irisc_hang_mini_flow_modifier_pack(
-      const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(
-      struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_irisc_hang_mini_flow_modifier_print(
-      const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_irisc_hang_mini_flow_modifier_pack(const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_irisc_hang_mini_flow_modifier_unpack(struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_irisc_hang_mini_flow_modifier_print(const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_irisc_hang_mini_flow_modifier_size(void);
 #define REG_ACCESS_HCA_IRISC_HANG_MINI_FLOW_MODIFIER_SIZE (0x20)
-    void reg_access_hca_irisc_hang_mini_flow_modifier_dump(
-      const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_irisc_hang_mini_flow_modifier_dump(const struct reg_access_hca_irisc_hang_mini_flow_modifier* ptr_struct, FILE* fd);
     /* lock_source_stop_toggle_modifier */
-    void reg_access_hca_lock_source_stop_toggle_modifier_pack(
-      const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_stop_toggle_modifier_unpack(
-      struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_stop_toggle_modifier_print(
-      const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_lock_source_stop_toggle_modifier_pack(const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_unpack(struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_lock_source_stop_toggle_modifier_print(const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_lock_source_stop_toggle_modifier_size(void);
 #define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_SIZE (0x20)
-    void reg_access_hca_lock_source_stop_toggle_modifier_dump(
-      const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_lock_source_stop_toggle_modifier_dump(const struct reg_access_hca_lock_source_stop_toggle_modifier* ptr_struct, FILE* fd);
     /* mcqi_activation_method */
-    void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                    u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                      const u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                     FILE* fd,
-                                                     int indent_level);
+    void reg_access_hca_mcqi_activation_method_pack(const struct reg_access_hca_mcqi_activation_method* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_activation_method_unpack(struct reg_access_hca_mcqi_activation_method* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_activation_method_print(const struct reg_access_hca_mcqi_activation_method* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mcqi_activation_method_size(void);
 #define REG_ACCESS_HCA_MCQI_ACTIVATION_METHOD_SIZE (0x7c)
-    void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method* ptr_struct,
-                                                    FILE* fd);
+    void reg_access_hca_mcqi_activation_method_dump(const struct reg_access_hca_mcqi_activation_method* ptr_struct, FILE* fd);
     /* mcqi_cap */
     void reg_access_hca_mcqi_cap_pack(const struct reg_access_hca_mcqi_cap* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mcqi_cap_unpack(struct reg_access_hca_mcqi_cap* ptr_struct, const u_int8_t* ptr_buff);
@@ -2355,235 +2307,131 @@ gle Modifier Layout," on page  1390 */
 #define REG_ACCESS_HCA_MCQI_CAP_SIZE (0x7c)
     void reg_access_hca_mcqi_cap_dump(const struct reg_access_hca_mcqi_cap* ptr_struct, FILE* fd);
     /* mcqi_linkx_properties */
-    void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                                   u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                                     const u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                                    FILE* fd,
-                                                    int indent_level);
+    void reg_access_hca_mcqi_linkx_properties_pack(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_linkx_properties_unpack(struct reg_access_hca_mcqi_linkx_properties* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_linkx_properties_print(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mcqi_linkx_properties_size(void);
 #define REG_ACCESS_HCA_MCQI_LINKX_PROPERTIES_SIZE (0x7c)
-    void reg_access_hca_mcqi_linkx_properties_dump(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct,
-                                                   FILE* fd);
+    void reg_access_hca_mcqi_linkx_properties_dump(const struct reg_access_hca_mcqi_linkx_properties* ptr_struct, FILE* fd);
     /* mcqi_version */
     void reg_access_hca_mcqi_version_pack(const struct reg_access_hca_mcqi_version* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mcqi_version_unpack(struct reg_access_hca_mcqi_version* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_version_print(const struct reg_access_hca_mcqi_version* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void reg_access_hca_mcqi_version_print(const struct reg_access_hca_mcqi_version* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mcqi_version_size(void);
 #define REG_ACCESS_HCA_MCQI_VERSION_SIZE (0x7c)
     void reg_access_hca_mcqi_version_dump(const struct reg_access_hca_mcqi_version* ptr_struct, FILE* fd);
     /* packet_drop_mini_flow_modifier */
-    void reg_access_hca_packet_drop_mini_flow_modifier_pack(
-      const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_packet_drop_mini_flow_modifier_unpack(
-      struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_packet_drop_mini_flow_modifier_print(
-      const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_packet_drop_mini_flow_modifier_pack(const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_packet_drop_mini_flow_modifier_unpack(struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_packet_drop_mini_flow_modifier_print(const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_packet_drop_mini_flow_modifier_size(void);
 #define REG_ACCESS_HCA_PACKET_DROP_MINI_FLOW_MODIFIER_SIZE (0x20)
-    void reg_access_hca_packet_drop_mini_flow_modifier_dump(
-      const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_packet_drop_mini_flow_modifier_dump(const struct reg_access_hca_packet_drop_mini_flow_modifier* ptr_struct, FILE* fd);
     /* pause_tx_stop_toggle_modifier */
-    void reg_access_hca_pause_tx_stop_toggle_modifier_pack(
-      const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(
-      struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_pause_tx_stop_toggle_modifier_print(
-      const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_pause_tx_stop_toggle_modifier_pack(const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_pause_tx_stop_toggle_modifier_unpack(struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_pause_tx_stop_toggle_modifier_print(const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_pause_tx_stop_toggle_modifier_size(void);
 #define REG_ACCESS_HCA_PAUSE_TX_STOP_TOGGLE_MODIFIER_SIZE (0x20)
-    void reg_access_hca_pause_tx_stop_toggle_modifier_dump(
-      const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_pause_tx_stop_toggle_modifier_dump(const struct reg_access_hca_pause_tx_stop_toggle_modifier* ptr_struct, FILE* fd);
     /* rom_version */
     void reg_access_hca_rom_version_pack(const struct reg_access_hca_rom_version* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_rom_version_unpack(struct reg_access_hca_rom_version* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      reg_access_hca_rom_version_print(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd, int indent_level);
+    void reg_access_hca_rom_version_print(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_rom_version_size(void);
 #define REG_ACCESS_HCA_ROM_VERSION_SIZE (0x4)
     void reg_access_hca_rom_version_dump(const struct reg_access_hca_rom_version* ptr_struct, FILE* fd);
     /* rxb_hang_stop_toggle_modifier */
-    void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(
-      const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(
-      struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_rxb_hang_stop_toggle_modifier_print(
-      const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_rxb_hang_stop_toggle_modifier_size(void);
 #define REG_ACCESS_HCA_RXB_HANG_STOP_TOGGLE_MODIFIER_SIZE (0x20)
-    void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(
-      const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_rxb_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxb_hang_stop_toggle_modifier* ptr_struct, FILE* fd);
     /* rxp_hang_stop_toggle_modifier */
-    void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(
-      const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(
-      struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_rxp_hang_stop_toggle_modifier_print(
-      const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_rxp_hang_stop_toggle_modifier_size(void);
 #define REG_ACCESS_HCA_RXP_HANG_STOP_TOGGLE_MODIFIER_SIZE (0x20)
-    void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(
-      const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_rxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_rxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd);
     /* sxp_hang_stop_toggle_modifier */
-    void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(
-      const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(
-      struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_sxp_hang_stop_toggle_modifier_print(
-      const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_pack(const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_unpack(struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_print(const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_sxp_hang_stop_toggle_modifier_size(void);
 #define REG_ACCESS_HCA_SXP_HANG_STOP_TOGGLE_MODIFIER_SIZE (0x20)
-    void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(
-      const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_sxp_hang_stop_toggle_modifier_dump(const struct reg_access_hca_sxp_hang_stop_toggle_modifier* ptr_struct, FILE* fd);
     /* diagnostic_cntr_layout */
-    void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                    u_int8_t* ptr_buff);
-    void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                      const u_int8_t* ptr_buff);
-    void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                     FILE* fd,
-                                                     int indent_level);
+    void reg_access_hca_diagnostic_cntr_layout_pack(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_diagnostic_cntr_layout_unpack(struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_diagnostic_cntr_layout_print(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_diagnostic_cntr_layout_size(void);
 #define REG_ACCESS_HCA_DIAGNOSTIC_CNTR_LAYOUT_SIZE (0x4)
-    void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct,
-                                                    FILE* fd);
+    void reg_access_hca_diagnostic_cntr_layout_dump(const struct reg_access_hca_diagnostic_cntr_layout* ptr_struct, FILE* fd);
     /* mcqi_reg_data_auto */
-    void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
-                                                u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
-                                                  const u_int8_t* ptr_buff);
-    void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level);
+    void reg_access_hca_mcqi_reg_data_auto_pack(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_reg_data_auto_unpack(union reg_access_hca_mcqi_reg_data_auto* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mcqi_reg_data_auto_print(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mcqi_reg_data_auto_size(void);
 #define REG_ACCESS_HCA_MCQI_REG_DATA_AUTO_SIZE (0x7c)
     void reg_access_hca_mcqi_reg_data_auto_dump(const union reg_access_hca_mcqi_reg_data_auto* ptr_struct, FILE* fd);
     /* mgir_dev_info */
     void reg_access_hca_mgir_dev_info_pack(const struct reg_access_hca_mgir_dev_info* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mgir_dev_info_unpack(struct reg_access_hca_mgir_dev_info* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void reg_access_hca_mgir_dev_info_print(const struct reg_access_hca_mgir_dev_info* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mgir_dev_info_size(void);
 #define REG_ACCESS_HCA_MGIR_DEV_INFO_SIZE (0x1c)
     void reg_access_hca_mgir_dev_info_dump(const struct reg_access_hca_mgir_dev_info* ptr_struct, FILE* fd);
     /* mgir_fw_info */
     void reg_access_hca_mgir_fw_info_pack(const struct reg_access_hca_mgir_fw_info* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mgir_fw_info_unpack(struct reg_access_hca_mgir_fw_info* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mgir_fw_info_print(const struct reg_access_hca_mgir_fw_info* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void reg_access_hca_mgir_fw_info_print(const struct reg_access_hca_mgir_fw_info* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mgir_fw_info_size(void);
 #define REG_ACCESS_HCA_MGIR_FW_INFO_SIZE (0x40)
     void reg_access_hca_mgir_fw_info_dump(const struct reg_access_hca_mgir_fw_info* ptr_struct, FILE* fd);
     /* mgir_hardware_info */
-    void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
-                                                u_int8_t* ptr_buff);
-    void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info* ptr_struct,
-                                                  const u_int8_t* ptr_buff);
-    void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level);
+    void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_hardware_info* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardware_info* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_hardware_info* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mgir_hardware_info_size(void);
 #define REG_ACCESS_HCA_MGIR_HARDWARE_INFO_SIZE (0x20)
     void reg_access_hca_mgir_hardware_info_dump(const struct reg_access_hca_mgir_hardware_info* ptr_struct, FILE* fd);
     /* mgir_sw_info */
     void reg_access_hca_mgir_sw_info_pack(const struct reg_access_hca_mgir_sw_info* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mgir_sw_info_unpack(struct reg_access_hca_mgir_sw_info* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mgir_sw_info_print(const struct reg_access_hca_mgir_sw_info* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void reg_access_hca_mgir_sw_info_print(const struct reg_access_hca_mgir_sw_info* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mgir_sw_info_size(void);
 #define REG_ACCESS_HCA_MGIR_SW_INFO_SIZE (0x20)
     void reg_access_hca_mgir_sw_info_dump(const struct reg_access_hca_mgir_sw_info* ptr_struct, FILE* fd);
     /* smbus_failed_fault_inject_modifier */
-    void reg_access_hca_smbus_failed_fault_inject_modifier_pack(
-      const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(
-      struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_smbus_failed_fault_inject_modifier_print(
-      const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_smbus_failed_fault_inject_modifier_pack(const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_smbus_failed_fault_inject_modifier_unpack(struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_smbus_failed_fault_inject_modifier_print(const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_smbus_failed_fault_inject_modifier_size(void);
 #define REG_ACCESS_HCA_SMBUS_FAILED_FAULT_INJECT_MODIFIER_SIZE (0x20)
-    void reg_access_hca_smbus_failed_fault_inject_modifier_dump(
-      const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_smbus_failed_fault_inject_modifier_dump(const struct reg_access_hca_smbus_failed_fault_inject_modifier* ptr_struct, FILE* fd);
     /* string_db_parameters */
-    void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters* ptr_struct,
-                                                  u_int8_t* ptr_buff);
-    void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters* ptr_struct,
-                                                    const u_int8_t* ptr_buff);
-    void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters* ptr_struct,
-                                                   FILE* fd,
-                                                   int indent_level);
+    void reg_access_hca_string_db_parameters_pack(const struct reg_access_hca_string_db_parameters* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_string_db_parameters_unpack(struct reg_access_hca_string_db_parameters* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_string_db_parameters_print(const struct reg_access_hca_string_db_parameters* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_string_db_parameters_size(void);
 #define REG_ACCESS_HCA_STRING_DB_PARAMETERS_SIZE (0x8)
-    void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string_db_parameters* ptr_struct,
-                                                  FILE* fd);
+    void reg_access_hca_string_db_parameters_dump(const struct reg_access_hca_string_db_parameters* ptr_struct, FILE* fd);
     /* strs_mini_flow_reg_per_type_modifier_auto */
-    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(
-      const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(
-      union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(
-      const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_size(void);
 #define REG_ACCESS_HCA_STRS_MINI_FLOW_REG_PER_TYPE_MODIFIER_AUTO_SIZE (0x20)
-    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(
-      const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_mini_flow_reg_per_type_modifier_auto* ptr_struct, FILE* fd);
     /* strs_stop_toggle_reg_per_type_modifier_auto */
-    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(
-      const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(
-      union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(
-      const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_pack(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_unpack(union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_print(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_size(void);
 #define REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_PER_TYPE_MODIFIER_AUTO_SIZE (0x20)
-    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(
-      const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct,
-      FILE* fd);
+    void reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto_dump(const union reg_access_hca_strs_stop_toggle_reg_per_type_modifier_auto* ptr_struct, FILE* fd);
     /* debug_cap */
     void reg_access_hca_debug_cap_pack(const struct reg_access_hca_debug_cap* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_debug_cap_unpack(struct reg_access_hca_debug_cap* ptr_struct, const u_int8_t* ptr_buff);
@@ -2622,9 +2470,7 @@ gle Modifier Layout," on page  1390 */
     /* mfrl_reg_ext */
     void reg_access_hca_mfrl_reg_ext_pack(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mfrl_reg_ext_size(void);
 #define REG_ACCESS_HCA_MFRL_REG_EXT_SIZE (0x8)
     void reg_access_hca_mfrl_reg_ext_dump(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, FILE* fd);
@@ -2673,18 +2519,14 @@ gle Modifier Layout," on page  1390 */
     /* mtrc_cap_reg */
     void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mtrc_cap_reg_unpack(struct reg_access_hca_mtrc_cap_reg* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mtrc_cap_reg_print(const struct reg_access_hca_mtrc_cap_reg* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void reg_access_hca_mtrc_cap_reg_print(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mtrc_cap_reg_size(void);
 #define REG_ACCESS_HCA_MTRC_CAP_REG_SIZE (0x84)
     void reg_access_hca_mtrc_cap_reg_dump(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, FILE* fd);
     /* mtrc_stdb_reg */
     void reg_access_hca_mtrc_stdb_reg_pack(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mtrc_stdb_reg_unpack(struct reg_access_hca_mtrc_stdb_reg* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void reg_access_hca_mtrc_stdb_reg_print(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_mtrc_stdb_reg_size(void);
 #define REG_ACCESS_HCA_MTRC_STDB_REG_SIZE (0x8)
     void reg_access_hca_mtrc_stdb_reg_dump(const struct reg_access_hca_mtrc_stdb_reg* ptr_struct, FILE* fd);
@@ -2698,70 +2540,45 @@ gle Modifier Layout," on page  1390 */
     /* resource_dump */
     void reg_access_hca_resource_dump_pack(const struct reg_access_hca_resource_dump* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_resource_dump_unpack(struct reg_access_hca_resource_dump* ptr_struct, const u_int8_t* ptr_buff);
-    void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void reg_access_hca_resource_dump_print(const struct reg_access_hca_resource_dump* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_resource_dump_size(void);
 #define REG_ACCESS_HCA_RESOURCE_DUMP_SIZE (0x100)
     void reg_access_hca_resource_dump_dump(const struct reg_access_hca_resource_dump* ptr_struct, FILE* fd);
     /* strs_fault_inject_reg */
-    void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                                   u_int8_t* ptr_buff);
-    void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                                     const u_int8_t* ptr_buff);
-    void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                                    FILE* fd,
-                                                    int indent_level);
+    void reg_access_hca_strs_fault_inject_reg_pack(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_strs_fault_inject_reg_unpack(struct reg_access_hca_strs_fault_inject_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_strs_fault_inject_reg_size(void);
 #define REG_ACCESS_HCA_STRS_FAULT_INJECT_REG_SIZE (0x40)
-    void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct,
-                                                   FILE* fd);
+    void reg_access_hca_strs_fault_inject_reg_dump(const struct reg_access_hca_strs_fault_inject_reg* ptr_struct, FILE* fd);
     /* strs_mini_flow_reg */
-    void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
-                                                u_int8_t* ptr_buff);
-    void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
-                                                  const u_int8_t* ptr_buff);
-    void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level);
+    void reg_access_hca_strs_mini_flow_reg_pack(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_unpack(struct reg_access_hca_strs_mini_flow_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_strs_mini_flow_reg_size(void);
 #define REG_ACCESS_HCA_STRS_MINI_FLOW_REG_SIZE (0x40)
     void reg_access_hca_strs_mini_flow_reg_dump(const struct reg_access_hca_strs_mini_flow_reg* ptr_struct, FILE* fd);
     /* strs_resource_reg */
-    void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void reg_access_hca_strs_resource_reg_pack(const struct reg_access_hca_strs_resource_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_strs_resource_reg_unpack(struct reg_access_hca_strs_resource_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_resource_reg_print(const struct reg_access_hca_strs_resource_reg* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_strs_resource_reg_size(void);
 #define REG_ACCESS_HCA_STRS_RESOURCE_REG_SIZE (0x40)
     void reg_access_hca_strs_resource_reg_dump(const struct reg_access_hca_strs_resource_reg* ptr_struct, FILE* fd);
     /* strs_stop_toggle_reg */
-    void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                                  u_int8_t* ptr_buff);
-    void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                                    const u_int8_t* ptr_buff);
-    void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                                   FILE* fd,
-                                                   int indent_level);
+    void reg_access_hca_strs_stop_toggle_reg_pack(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_unpack(struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_strs_stop_toggle_reg_size(void);
 #define REG_ACCESS_HCA_STRS_STOP_TOGGLE_REG_SIZE (0x40)
-    void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct,
-                                                  FILE* fd);
+    void reg_access_hca_strs_stop_toggle_reg_dump(const struct reg_access_hca_strs_stop_toggle_reg* ptr_struct, FILE* fd);
     /* reg_access_hca_Nodes */
-    void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                                  u_int8_t* ptr_buff);
-    void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                                    const u_int8_t* ptr_buff);
-    void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                                   FILE* fd,
-                                                   int indent_level);
+    void reg_access_hca_reg_access_hca_Nodes_pack(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_hca_reg_access_hca_Nodes_unpack(union reg_access_hca_reg_access_hca_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_hca_reg_access_hca_Nodes_size(void);
 #define REG_ACCESS_HCA_REG_ACCESS_HCA_NODES_SIZE (0x100)
-    void reg_access_hca_reg_access_hca_Nodes_dump(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct,
-                                                  FILE* fd);
+    void reg_access_hca_reg_access_hca_Nodes_dump(const union reg_access_hca_reg_access_hca_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/reg_access_switch_layouts.c b/tools_layouts/reg_access_switch_layouts.c
index 96a30b4e..f885682f 100644
--- a/tools_layouts/reg_access_switch_layouts.c
+++ b/tools_layouts/reg_access_switch_layouts.c
@@ -38,8 +38,7 @@
  ***/
 #include "reg_access_switch_layouts.h"
 
-void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                u_int8_t* ptr_buff)
+void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -51,8 +50,7 @@ void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_c
     }
 }
 
-void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                  const u_int8_t* ptr_buff)
+void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -64,9 +62,7 @@ void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_comma
     }
 }
 
-void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level)
+void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -85,15 +81,12 @@ unsigned int reg_access_switch_command_payload_ext_size(void)
     return REG_ACCESS_SWITCH_COMMAND_PAYLOAD_EXT_SIZE;
 }
 
-void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                FILE* fd)
+void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext* ptr_struct, FILE* fd)
 {
     reg_access_switch_command_payload_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_crspace_access_payload_ext_pack(
-  const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_switch_crspace_access_payload_ext_pack(const struct reg_access_switch_crspace_access_payload_ext* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -107,8 +100,7 @@ void reg_access_switch_crspace_access_payload_ext_pack(
     }
 }
 
-void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-                                                         const u_int8_t* ptr_buff)
+void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switch_crspace_access_payload_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -122,10 +114,7 @@ void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switc
     }
 }
 
-void reg_access_switch_crspace_access_payload_ext_print(
-  const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_switch_crspace_access_payload_ext_print(const struct reg_access_switch_crspace_access_payload_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -146,15 +135,12 @@ unsigned int reg_access_switch_crspace_access_payload_ext_size(void)
     return REG_ACCESS_SWITCH_CRSPACE_ACCESS_PAYLOAD_EXT_SIZE;
 }
 
-void reg_access_switch_crspace_access_payload_ext_dump(
-  const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-  FILE* fd)
+void reg_access_switch_crspace_access_payload_ext_dump(const struct reg_access_switch_crspace_access_payload_ext* ptr_struct, FILE* fd)
 {
     reg_access_switch_crspace_access_payload_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext* ptr_struct,
-                                            u_int8_t* ptr_buff)
+void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -190,8 +176,7 @@ void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_devic
     }
 }
 
-void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext* ptr_struct,
-                                              const u_int8_t* ptr_buff)
+void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -227,9 +212,7 @@ void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_in
     }
 }
 
-void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level)
+void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -277,8 +260,7 @@ void reg_access_switch_device_info_ext_dump(const struct reg_access_switch_devic
     reg_access_switch_device_info_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-                                                     u_int8_t* ptr_buff)
+void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_switch_prm_register_payload_ext* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -296,8 +278,7 @@ void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_swi
     }
 }
 
-void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-                                                       const u_int8_t* ptr_buff)
+void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -315,10 +296,7 @@ void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_
     }
 }
 
-void reg_access_switch_prm_register_payload_ext_print(
-  const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_switch_prm_register_payload_ext_print(const struct reg_access_switch_prm_register_payload_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -343,8 +321,7 @@ unsigned int reg_access_switch_prm_register_payload_ext_size(void)
     return REG_ACCESS_SWITCH_PRM_REGISTER_PAYLOAD_EXT_SIZE;
 }
 
-void reg_access_switch_prm_register_payload_ext_dump(const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-                                                     FILE* fd)
+void reg_access_switch_prm_register_payload_ext_dump(const struct reg_access_switch_prm_register_payload_ext* ptr_struct, FILE* fd)
 {
     reg_access_switch_prm_register_payload_ext_print(ptr_struct, fd, 0);
 }
@@ -369,8 +346,7 @@ void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_in
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->card_type);
 }
 
-void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -390,9 +366,7 @@ void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_e
     ptr_struct->card_type = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_slot_info_ext ========\n");
@@ -435,8 +409,7 @@ void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_na
     }
 }
 
-void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -448,9 +421,7 @@ void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_e
     }
 }
 
-void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -474,21 +445,17 @@ void reg_access_switch_slot_name_ext_dump(const struct reg_access_switch_slot_na
     reg_access_switch_slot_name_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                               u_int8_t* ptr_buff)
+void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_switch_slot_info_ext_pack(&(ptr_struct->slot_info_ext), ptr_buff);
 }
 
-void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                                 const u_int8_t* ptr_buff)
+void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_switch_slot_info_ext_unpack(&(ptr_struct->slot_info_ext), ptr_buff);
 }
 
-void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level)
+void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_mddq_data_auto_ext ========\n");
@@ -514,23 +481,17 @@ void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mdd
     reg_access_switch_mddq_data_auto_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_pack(
-  const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-  u_int8_t* ptr_buff)
+void reg_access_switch_mddt_reg_payload_auto_ext_pack(const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->prm_register_payload_ext), ptr_buff);
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-                                                        const u_int8_t* ptr_buff)
+void reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->prm_register_payload_ext), ptr_buff);
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_print(
-  const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void reg_access_switch_mddt_reg_payload_auto_ext_print(const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_mddt_reg_payload_auto_ext ========\n");
@@ -551,9 +512,7 @@ unsigned int reg_access_switch_mddt_reg_payload_auto_ext_size(void)
     return REG_ACCESS_SWITCH_MDDT_REG_PAYLOAD_AUTO_EXT_SIZE;
 }
 
-void reg_access_switch_mddt_reg_payload_auto_ext_dump(
-  const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-  FILE* fd)
+void reg_access_switch_mddt_reg_payload_auto_ext_dump(const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, FILE* fd)
 {
     reg_access_switch_mddt_reg_payload_auto_ext_print(ptr_struct, fd, 0);
 }
@@ -621,9 +580,7 @@ void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext
     }
 }
 
-void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -796,10 +753,7 @@ void reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext* p
     fprintf(fd, "query_type           : %s (" UH_FMT ")\n",
             (ptr_struct->query_type == 0 ?
                ("Reserved") :
-               ((ptr_struct->query_type == 1 ?
-                   ("slot_info") :
-                   ((ptr_struct->query_type == 2 ? ("device_info") :
-                                                   ((ptr_struct->query_type == 3 ? ("slot_name") : ("unknown")))))))),
+               ((ptr_struct->query_type == 1 ? ("slot_info") : ((ptr_struct->query_type == 2 ? ("device_info") : ((ptr_struct->query_type == 3 ? ("slot_name") : ("unknown")))))))),
             ptr_struct->query_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "sie                  : " UH_FMT "\n", ptr_struct->sie);
@@ -862,18 +816,15 @@ void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg
     {
         case 0x0:
             offset = 96;
-            reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->payload.prm_register_payload_ext),
-                                                            ptr_buff + offset / 8);
+            reg_access_switch_prm_register_payload_ext_pack(&(ptr_struct->payload.prm_register_payload_ext), ptr_buff + offset / 8);
             break;
         case 0x1:
             offset = 96;
-            reg_access_switch_command_payload_ext_pack(&(ptr_struct->payload.command_payload_ext),
-                                                       ptr_buff + offset / 8);
+            reg_access_switch_command_payload_ext_pack(&(ptr_struct->payload.command_payload_ext), ptr_buff + offset / 8);
             break;
         case 0x2:
             offset = 96;
-            reg_access_switch_crspace_access_payload_ext_pack(&(ptr_struct->payload.crspace_access_payload_ext),
-                                                              ptr_buff + offset / 8);
+            reg_access_switch_crspace_access_payload_ext_pack(&(ptr_struct->payload.crspace_access_payload_ext), ptr_buff + offset / 8);
             break;
         default:
             break;
@@ -899,27 +850,22 @@ void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext
     {
         case 0x0:
             offset = 96;
-            reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->payload.prm_register_payload_ext),
-                                                              ptr_buff + offset / 8);
+            reg_access_switch_prm_register_payload_ext_unpack(&(ptr_struct->payload.prm_register_payload_ext), ptr_buff + offset / 8);
             break;
         case 0x1:
             offset = 96;
-            reg_access_switch_command_payload_ext_unpack(&(ptr_struct->payload.command_payload_ext),
-                                                         ptr_buff + offset / 8);
+            reg_access_switch_command_payload_ext_unpack(&(ptr_struct->payload.command_payload_ext), ptr_buff + offset / 8);
             break;
         case 0x2:
             offset = 96;
-            reg_access_switch_crspace_access_payload_ext_unpack(&(ptr_struct->payload.crspace_access_payload_ext),
-                                                                ptr_buff + offset / 8);
+            reg_access_switch_crspace_access_payload_ext_unpack(&(ptr_struct->payload.crspace_access_payload_ext), ptr_buff + offset / 8);
             break;
         default:
             break;
     }
 }
 
-void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_mddt_reg_ext ========\n");
@@ -930,10 +876,7 @@ void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_re
     fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ?
-               ("PRM_Register") :
-               ((ptr_struct->type == 1 ? ("Command") : ((ptr_struct->type == 2 ? ("CrSpace_access") : ("unknown")))))),
-            ptr_struct->type);
+            (ptr_struct->type == 0 ? ("PRM_Register") : ((ptr_struct->type == 1 ? ("Command") : ((ptr_struct->type == 2 ? ("CrSpace_access") : ("unknown")))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "write_size           : " UH_FMT "\n", ptr_struct->write_size);
     adb2c_add_indentation(fd, indent_level);
@@ -943,20 +886,17 @@ void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_re
         case 0x0:
             adb2c_add_indentation(fd, indent_level);
             fprintf(fd, "prm_register_payload_ext:\n");
-            reg_access_switch_prm_register_payload_ext_print(&(ptr_struct->payload.prm_register_payload_ext), fd,
-                                                             indent_level + 1);
+            reg_access_switch_prm_register_payload_ext_print(&(ptr_struct->payload.prm_register_payload_ext), fd, indent_level + 1);
             break;
         case 0x1:
             adb2c_add_indentation(fd, indent_level);
             fprintf(fd, "command_payload_ext:\n");
-            reg_access_switch_command_payload_ext_print(&(ptr_struct->payload.command_payload_ext), fd,
-                                                        indent_level + 1);
+            reg_access_switch_command_payload_ext_print(&(ptr_struct->payload.command_payload_ext), fd, indent_level + 1);
             break;
         case 0x2:
             adb2c_add_indentation(fd, indent_level);
             fprintf(fd, "crspace_access_payload_ext:\n");
-            reg_access_switch_crspace_access_payload_ext_print(&(ptr_struct->payload.crspace_access_payload_ext), fd,
-                                                               indent_level + 1);
+            reg_access_switch_crspace_access_payload_ext_print(&(ptr_struct->payload.crspace_access_payload_ext), fd, indent_level + 1);
             break;
         default:
             break;
@@ -1005,9 +945,7 @@ void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext
     ptr_struct->time_left = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_mdsr_reg_ext ========\n");
@@ -1062,9 +1000,7 @@ void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext
     ptr_struct->next_keep_alive_counter = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_mkdc_reg_ext ========\n");
@@ -1075,11 +1011,8 @@ void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_re
                ("OK") :
                ((ptr_struct->error_code == 1 ?
                    ("BAD_SESSION_ID") :
-                   ((ptr_struct->error_code == 2 ?
-                       ("BAD_KEEP_ALIVE_COUNTER") :
-                       ((ptr_struct->error_code == 3 ?
-                           ("BAD_SOURCE_ADDRESS") :
-                           ((ptr_struct->error_code == 4 ? ("SESSION_TIMEOUT") : ("unknown")))))))))),
+                   ((ptr_struct->error_code == 2 ? ("BAD_KEEP_ALIVE_COUNTER") :
+                                                   ((ptr_struct->error_code == 3 ? ("BAD_SOURCE_ADDRESS") : ((ptr_struct->error_code == 4 ? ("SESSION_TIMEOUT") : ("unknown")))))))))),
             ptr_struct->error_code);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "session_id           : " UH_FMT "\n", ptr_struct->session_id);
@@ -1185,9 +1118,7 @@ void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext
     }
 }
 
-void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -1242,21 +1173,17 @@ void reg_access_switch_mtcq_reg_ext_dump(const struct reg_access_switch_mtcq_reg
     reg_access_switch_mtcq_reg_ext_print(ptr_struct, fd, 0);
 }
 
-void reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                    u_int8_t* ptr_buff)
+void reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
     reg_access_switch_icsr_ext_pack(&(ptr_struct->icsr_ext), ptr_buff);
 }
 
-void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                      const u_int8_t* ptr_buff)
+void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
     reg_access_switch_icsr_ext_unpack(&(ptr_struct->icsr_ext), ptr_buff);
 }
 
-void reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                     FILE* fd,
-                                                     int indent_level)
+void reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_switch_reg_access_switch_Nodes ========\n");
@@ -1289,8 +1216,7 @@ unsigned int reg_access_switch_reg_access_switch_Nodes_size(void)
     return REG_ACCESS_SWITCH_REG_ACCESS_SWITCH_NODES_SIZE;
 }
 
-void reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                    FILE* fd)
+void reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct, FILE* fd)
 {
     reg_access_switch_reg_access_switch_Nodes_print(ptr_struct, fd, 0);
 }
diff --git a/tools_layouts/reg_access_switch_layouts.h b/tools_layouts/reg_access_switch_layouts.h
index ef69c2ae..e423ec03 100644
--- a/tools_layouts/reg_access_switch_layouts.h
+++ b/tools_layouts/reg_access_switch_layouts.h
@@ -600,109 +600,61 @@ replay-protection. */
 
     /*================= PACK/UNPACK/PRINT FUNCTIONS ======================*/
     /* command_payload_ext */
-    void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                    u_int8_t* ptr_buff);
-    void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                      const u_int8_t* ptr_buff);
-    void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                     FILE* fd,
-                                                     int indent_level);
+    void reg_access_switch_command_payload_ext_pack(const struct reg_access_switch_command_payload_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_command_payload_ext_unpack(struct reg_access_switch_command_payload_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_command_payload_ext_print(const struct reg_access_switch_command_payload_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_command_payload_ext_size(void);
 #define REG_ACCESS_SWITCH_COMMAND_PAYLOAD_EXT_SIZE (0x104)
-    void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext* ptr_struct,
-                                                    FILE* fd);
+    void reg_access_switch_command_payload_ext_dump(const struct reg_access_switch_command_payload_ext* ptr_struct, FILE* fd);
     /* crspace_access_payload_ext */
-    void reg_access_switch_crspace_access_payload_ext_pack(
-      const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_switch_crspace_access_payload_ext_unpack(
-      struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void reg_access_switch_crspace_access_payload_ext_print(
-      const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_switch_crspace_access_payload_ext_pack(const struct reg_access_switch_crspace_access_payload_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_crspace_access_payload_ext_unpack(struct reg_access_switch_crspace_access_payload_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_crspace_access_payload_ext_print(const struct reg_access_switch_crspace_access_payload_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_crspace_access_payload_ext_size(void);
 #define REG_ACCESS_SWITCH_CRSPACE_ACCESS_PAYLOAD_EXT_SIZE (0x104)
-    void reg_access_switch_crspace_access_payload_ext_dump(
-      const struct reg_access_switch_crspace_access_payload_ext* ptr_struct,
-      FILE* fd);
+    void reg_access_switch_crspace_access_payload_ext_dump(const struct reg_access_switch_crspace_access_payload_ext* ptr_struct, FILE* fd);
     /* device_info_ext */
-    void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext* ptr_struct,
-                                                u_int8_t* ptr_buff);
-    void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext* ptr_struct,
-                                                  const u_int8_t* ptr_buff);
-    void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level);
+    void reg_access_switch_device_info_ext_pack(const struct reg_access_switch_device_info_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_device_info_ext_unpack(struct reg_access_switch_device_info_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_device_info_ext_print(const struct reg_access_switch_device_info_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_device_info_ext_size(void);
 #define REG_ACCESS_SWITCH_DEVICE_INFO_EXT_SIZE (0x20)
     void reg_access_switch_device_info_ext_dump(const struct reg_access_switch_device_info_ext* ptr_struct, FILE* fd);
     /* prm_register_payload_ext */
-    void reg_access_switch_prm_register_payload_ext_pack(
-      const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-      u_int8_t* ptr_buff);
-    void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-                                                           const u_int8_t* ptr_buff);
-    void reg_access_switch_prm_register_payload_ext_print(
-      const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_switch_prm_register_payload_ext_pack(const struct reg_access_switch_prm_register_payload_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_prm_register_payload_ext_unpack(struct reg_access_switch_prm_register_payload_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_prm_register_payload_ext_print(const struct reg_access_switch_prm_register_payload_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_prm_register_payload_ext_size(void);
 #define REG_ACCESS_SWITCH_PRM_REGISTER_PAYLOAD_EXT_SIZE (0x104)
-    void reg_access_switch_prm_register_payload_ext_dump(
-      const struct reg_access_switch_prm_register_payload_ext* ptr_struct,
-      FILE* fd);
+    void reg_access_switch_prm_register_payload_ext_dump(const struct reg_access_switch_prm_register_payload_ext* ptr_struct, FILE* fd);
     /* slot_info_ext */
-    void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_info_ext* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void reg_access_switch_slot_info_ext_pack(const struct reg_access_switch_slot_info_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_slot_info_ext_unpack(struct reg_access_switch_slot_info_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_slot_info_ext_print(const struct reg_access_switch_slot_info_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_slot_info_ext_size(void);
 #define REG_ACCESS_SWITCH_SLOT_INFO_EXT_SIZE (0x20)
     void reg_access_switch_slot_info_ext_dump(const struct reg_access_switch_slot_info_ext* ptr_struct, FILE* fd);
     /* slot_name_ext */
-    void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_name_ext* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void reg_access_switch_slot_name_ext_pack(const struct reg_access_switch_slot_name_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_slot_name_ext_unpack(struct reg_access_switch_slot_name_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_slot_name_ext_print(const struct reg_access_switch_slot_name_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_slot_name_ext_size(void);
 #define REG_ACCESS_SWITCH_SLOT_NAME_EXT_SIZE (0x20)
     void reg_access_switch_slot_name_ext_dump(const struct reg_access_switch_slot_name_ext* ptr_struct, FILE* fd);
     /* mddq_data_auto_ext */
-    void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                                   u_int8_t* ptr_buff);
-    void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                                     const u_int8_t* ptr_buff);
-    void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                                    FILE* fd,
-                                                    int indent_level);
+    void reg_access_switch_mddq_data_auto_ext_pack(const union reg_access_switch_mddq_data_auto_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mddq_data_auto_ext_unpack(union reg_access_switch_mddq_data_auto_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_mddq_data_auto_ext_print(const union reg_access_switch_mddq_data_auto_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mddq_data_auto_ext_size(void);
 #define REG_ACCESS_SWITCH_MDDQ_DATA_AUTO_EXT_SIZE (0x20)
-    void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mddq_data_auto_ext* ptr_struct,
-                                                   FILE* fd);
+    void reg_access_switch_mddq_data_auto_ext_dump(const union reg_access_switch_mddq_data_auto_ext* ptr_struct, FILE* fd);
     /* mddt_reg_payload_auto_ext */
-    void reg_access_switch_mddt_reg_payload_auto_ext_pack(
-      const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-      u_int8_t* ptr_buff);
-    void
-      reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-                                                         const u_int8_t* ptr_buff);
-    void reg_access_switch_mddt_reg_payload_auto_ext_print(
-      const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void reg_access_switch_mddt_reg_payload_auto_ext_pack(const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_payload_auto_ext_unpack(union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_payload_auto_ext_print(const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mddt_reg_payload_auto_ext_size(void);
 #define REG_ACCESS_SWITCH_MDDT_REG_PAYLOAD_AUTO_EXT_SIZE (0x104)
-    void reg_access_switch_mddt_reg_payload_auto_ext_dump(
-      const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct,
-      FILE* fd);
+    void reg_access_switch_mddt_reg_payload_auto_ext_dump(const union reg_access_switch_mddt_reg_payload_auto_ext* ptr_struct, FILE* fd);
     /* uint64 */
     void reg_access_switch_uint64_pack(const u_int64_t* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_switch_uint64_unpack(u_int64_t* ptr_struct, const u_int8_t* ptr_buff);
@@ -711,91 +663,61 @@ replay-protection. */
 #define REG_ACCESS_SWITCH_UINT64_SIZE (0x8)
     void reg_access_switch_uint64_dump(const u_int64_t* ptr_struct, FILE* fd);
     /* icam_reg_ext */
-    void reg_access_switch_icam_reg_ext_pack(const struct reg_access_switch_icam_reg_ext* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void reg_access_switch_icam_reg_ext_pack(const struct reg_access_switch_icam_reg_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_icam_reg_ext_unpack(struct reg_access_switch_icam_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_icam_reg_ext_print(const struct reg_access_switch_icam_reg_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_icam_reg_ext_size(void);
 #define REG_ACCESS_SWITCH_ICAM_REG_EXT_SIZE (0x18)
     void reg_access_switch_icam_reg_ext_dump(const struct reg_access_switch_icam_reg_ext* ptr_struct, FILE* fd);
     /* icsr_ext */
     void reg_access_switch_icsr_ext_pack(const struct reg_access_switch_icsr_ext* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_switch_icsr_ext_unpack(struct reg_access_switch_icsr_ext* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      reg_access_switch_icsr_ext_print(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd, int indent_level);
+    void reg_access_switch_icsr_ext_print(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_icsr_ext_size(void);
 #define REG_ACCESS_SWITCH_ICSR_EXT_SIZE (0x410)
     void reg_access_switch_icsr_ext_dump(const struct reg_access_switch_icsr_ext* ptr_struct, FILE* fd);
     /* mddq_ext */
     void reg_access_switch_mddq_ext_pack(const struct reg_access_switch_mddq_ext* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_switch_mddq_ext_unpack(struct reg_access_switch_mddq_ext* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd, int indent_level);
+    void reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mddq_ext_size(void);
 #define REG_ACCESS_SWITCH_MDDQ_EXT_SIZE (0x30)
     void reg_access_switch_mddq_ext_dump(const struct reg_access_switch_mddq_ext* ptr_struct, FILE* fd);
     /* mddt_reg_ext */
-    void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg_ext* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void reg_access_switch_mddt_reg_ext_pack(const struct reg_access_switch_mddt_reg_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_ext_unpack(struct reg_access_switch_mddt_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_reg_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mddt_reg_ext_size(void);
 #define REG_ACCESS_SWITCH_MDDT_REG_EXT_SIZE (0x110)
     void reg_access_switch_mddt_reg_ext_dump(const struct reg_access_switch_mddt_reg_ext* ptr_struct, FILE* fd);
     /* mdsr_reg_ext */
-    void reg_access_switch_mdsr_reg_ext_pack(const struct reg_access_switch_mdsr_reg_ext* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void reg_access_switch_mdsr_reg_ext_pack(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mdsr_reg_ext_unpack(struct reg_access_switch_mdsr_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_mdsr_reg_ext_print(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mdsr_reg_ext_size(void);
 #define REG_ACCESS_SWITCH_MDSR_REG_EXT_SIZE (0x30)
     void reg_access_switch_mdsr_reg_ext_dump(const struct reg_access_switch_mdsr_reg_ext* ptr_struct, FILE* fd);
     /* mkdc_reg_ext */
-    void reg_access_switch_mkdc_reg_ext_pack(const struct reg_access_switch_mkdc_reg_ext* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void reg_access_switch_mkdc_reg_ext_pack(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mkdc_reg_ext_unpack(struct reg_access_switch_mkdc_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mkdc_reg_ext_size(void);
 #define REG_ACCESS_SWITCH_MKDC_REG_EXT_SIZE (0x2c)
     void reg_access_switch_mkdc_reg_ext_dump(const struct reg_access_switch_mkdc_reg_ext* ptr_struct, FILE* fd);
     /* mtcq_reg_ext */
-    void reg_access_switch_mtcq_reg_ext_pack(const struct reg_access_switch_mtcq_reg_ext* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void reg_access_switch_mtcq_reg_ext_pack(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_mtcq_reg_ext_unpack(struct reg_access_switch_mtcq_reg_ext* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_mtcq_reg_ext_print(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_mtcq_reg_ext_size(void);
 #define REG_ACCESS_SWITCH_MTCQ_REG_EXT_SIZE (0x70)
     void reg_access_switch_mtcq_reg_ext_dump(const struct reg_access_switch_mtcq_reg_ext* ptr_struct, FILE* fd);
     /* reg_access_switch_Nodes */
-    void
-      reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                     u_int8_t* ptr_buff);
-    void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                          const u_int8_t* ptr_buff);
-    void
-      reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                      FILE* fd,
-                                                      int indent_level);
+    void reg_access_switch_reg_access_switch_Nodes_pack(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void reg_access_switch_reg_access_switch_Nodes_unpack(union reg_access_switch_reg_access_switch_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void reg_access_switch_reg_access_switch_Nodes_print(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct, FILE* fd, int indent_level);
     unsigned int reg_access_switch_reg_access_switch_Nodes_size(void);
 #define REG_ACCESS_SWITCH_REG_ACCESS_SWITCH_NODES_SIZE (0x410)
-    void
-      reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct,
-                                                     FILE* fd);
+    void reg_access_switch_reg_access_switch_Nodes_dump(const union reg_access_switch_reg_access_switch_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/register_access_open_layouts.c b/tools_layouts/register_access_open_layouts.c
index 596dc0b0..01bdc41f 100644
--- a/tools_layouts/register_access_open_layouts.c
+++ b/tools_layouts/register_access_open_layouts.c
@@ -259,21 +259,17 @@ void register_access_mfpa_dump(const struct register_access_mfpa* ptr_struct, FI
     register_access_mfpa_print(ptr_struct, fd, 0);
 }
 
-void register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes* ptr_struct,
-                                                     u_int8_t* ptr_buff)
+void register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
     register_access_mfba_pack(&(ptr_struct->mfba), ptr_buff);
 }
 
-void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes* ptr_struct,
-                                                       const u_int8_t* ptr_buff)
+void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
     register_access_mfba_unpack(&(ptr_struct->mfba), ptr_buff);
 }
 
-void register_access_register_access_open_Nodes_print(const union register_access_register_access_open_Nodes* ptr_struct,
-                                                      FILE* fd,
-                                                      int indent_level)
+void register_access_register_access_open_Nodes_print(const union register_access_register_access_open_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== register_access_register_access_open_Nodes ========\n");
@@ -294,8 +290,7 @@ unsigned int register_access_register_access_open_Nodes_size(void)
     return REGISTER_ACCESS_REGISTER_ACCESS_OPEN_NODES_SIZE;
 }
 
-void register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes* ptr_struct,
-                                                     FILE* fd)
+void register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes* ptr_struct, FILE* fd)
 {
     register_access_register_access_open_Nodes_print(ptr_struct, fd, 0);
 }
diff --git a/tools_layouts/register_access_open_layouts.h b/tools_layouts/register_access_open_layouts.h
index 64bf38cd..011e85d9 100644
--- a/tools_layouts/register_access_open_layouts.h
+++ b/tools_layouts/register_access_open_layouts.h
@@ -175,20 +175,12 @@ extern "C"
 #define REGISTER_ACCESS_MFPA_SIZE (0x20)
     void register_access_mfpa_dump(const struct register_access_mfpa* ptr_struct, FILE* fd);
     /* register_access_open_Nodes */
-    void
-      register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes* ptr_struct,
-                                                      u_int8_t* ptr_buff);
-    void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes* ptr_struct,
-                                                           const u_int8_t* ptr_buff);
-    void register_access_register_access_open_Nodes_print(
-      const union register_access_register_access_open_Nodes* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void register_access_register_access_open_Nodes_pack(const union register_access_register_access_open_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_register_access_open_Nodes_unpack(union register_access_register_access_open_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_register_access_open_Nodes_print(const union register_access_register_access_open_Nodes* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_register_access_open_Nodes_size(void);
 #define REGISTER_ACCESS_REGISTER_ACCESS_OPEN_NODES_SIZE (0x10c)
-    void
-      register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes* ptr_struct,
-                                                      FILE* fd);
+    void register_access_register_access_open_Nodes_dump(const union register_access_register_access_open_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/register_access_sib_layouts.c b/tools_layouts/register_access_sib_layouts.c
index adf80ef6..719a35dc 100644
--- a/tools_layouts/register_access_sib_layouts.c
+++ b/tools_layouts/register_access_sib_layouts.c
@@ -62,9 +62,7 @@ void register_access_sib_IB_PSID__unpack(struct register_access_sib_IB_PSID_* pt
     }
 }
 
-void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -100,8 +98,7 @@ void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DE
     }
 }
 
-void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
     int i;
@@ -113,9 +110,7 @@ void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInf
     }
 }
 
-void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_* ptr_struct, FILE* fd, int indent_level)
 {
     int i;
 
@@ -203,9 +198,7 @@ void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_
     ptr_struct->extended_subminor = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== register_access_sib_IB_FWInfo_ ========\n");
@@ -281,9 +274,7 @@ void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_
     ptr_struct->UpTime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== register_access_sib_IB_HWInfo_ ========\n");
@@ -334,9 +325,7 @@ void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_
     ptr_struct->VerMajor = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== register_access_sib_IB_SWInfo_ ========\n");
@@ -594,24 +583,17 @@ void register_access_sib_pmaos_dump(const struct register_access_sib_pmaos* ptr_
     register_access_sib_pmaos_print(ptr_struct, fd, 0);
 }
 
-void register_access_sib_register_access_sib_Nodes_pack(
-  const union register_access_sib_register_access_sib_Nodes* ptr_struct,
-  u_int8_t* ptr_buff)
+void register_access_sib_register_access_sib_Nodes_pack(const union register_access_sib_register_access_sib_Nodes* ptr_struct, u_int8_t* ptr_buff)
 {
     register_access_sib_mgir_pack(&(ptr_struct->mgir), ptr_buff);
 }
 
-void register_access_sib_register_access_sib_Nodes_unpack(
-  union register_access_sib_register_access_sib_Nodes* ptr_struct,
-  const u_int8_t* ptr_buff)
+void register_access_sib_register_access_sib_Nodes_unpack(union register_access_sib_register_access_sib_Nodes* ptr_struct, const u_int8_t* ptr_buff)
 {
     register_access_sib_mgir_unpack(&(ptr_struct->mgir), ptr_buff);
 }
 
-void register_access_sib_register_access_sib_Nodes_print(
-  const union register_access_sib_register_access_sib_Nodes* ptr_struct,
-  FILE* fd,
-  int indent_level)
+void register_access_sib_register_access_sib_Nodes_print(const union register_access_sib_register_access_sib_Nodes* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== register_access_sib_register_access_sib_Nodes ========\n");
@@ -632,9 +614,7 @@ unsigned int register_access_sib_register_access_sib_Nodes_size(void)
     return REGISTER_ACCESS_SIB_REGISTER_ACCESS_SIB_NODES_SIZE;
 }
 
-void register_access_sib_register_access_sib_Nodes_dump(
-  const union register_access_sib_register_access_sib_Nodes* ptr_struct,
-  FILE* fd)
+void register_access_sib_register_access_sib_Nodes_dump(const union register_access_sib_register_access_sib_Nodes* ptr_struct, FILE* fd)
 {
     register_access_sib_register_access_sib_Nodes_print(ptr_struct, fd, 0);
 }
diff --git a/tools_layouts/register_access_sib_layouts.h b/tools_layouts/register_access_sib_layouts.h
index e3a51b51..0b543a46 100644
--- a/tools_layouts/register_access_sib_layouts.h
+++ b/tools_layouts/register_access_sib_layouts.h
@@ -297,53 +297,35 @@ updated based on admin_state field. Only relevant on Set operations */
     /* IB_PSID_ */
     void register_access_sib_IB_PSID__pack(const struct register_access_sib_IB_PSID_* ptr_struct, u_int8_t* ptr_buff);
     void register_access_sib_IB_PSID__unpack(struct register_access_sib_IB_PSID_* ptr_struct, const u_int8_t* ptr_buff);
-    void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void register_access_sib_IB_PSID__print(const struct register_access_sib_IB_PSID_* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_sib_IB_PSID__size(void);
 #define REGISTER_ACCESS_SIB_IB_PSID__SIZE (0x10)
     void register_access_sib_IB_PSID__dump(const struct register_access_sib_IB_PSID_* ptr_struct, FILE* fd);
     /* IB_DEVInfo_ */
-    void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DEVInfo_* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void register_access_sib_IB_DEVInfo__pack(const struct register_access_sib_IB_DEVInfo_* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_IB_DEVInfo__unpack(struct register_access_sib_IB_DEVInfo_* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_IB_DEVInfo__print(const struct register_access_sib_IB_DEVInfo_* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_sib_IB_DEVInfo__size(void);
 #define REGISTER_ACCESS_SIB_IB_DEVINFO__SIZE (0x1c)
     void register_access_sib_IB_DEVInfo__dump(const struct register_access_sib_IB_DEVInfo_* ptr_struct, FILE* fd);
     /* IB_FWInfo_ */
-    void register_access_sib_IB_FWInfo__pack(const struct register_access_sib_IB_FWInfo_* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void register_access_sib_IB_FWInfo__pack(const struct register_access_sib_IB_FWInfo_* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_IB_FWInfo__unpack(struct register_access_sib_IB_FWInfo_* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_IB_FWInfo__print(const struct register_access_sib_IB_FWInfo_* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_sib_IB_FWInfo__size(void);
 #define REGISTER_ACCESS_SIB_IB_FWINFO__SIZE (0x40)
     void register_access_sib_IB_FWInfo__dump(const struct register_access_sib_IB_FWInfo_* ptr_struct, FILE* fd);
     /* IB_HWInfo_ */
-    void register_access_sib_IB_HWInfo__pack(const struct register_access_sib_IB_HWInfo_* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void register_access_sib_IB_HWInfo__pack(const struct register_access_sib_IB_HWInfo_* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_IB_HWInfo__unpack(struct register_access_sib_IB_HWInfo_* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_IB_HWInfo__print(const struct register_access_sib_IB_HWInfo_* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_sib_IB_HWInfo__size(void);
 #define REGISTER_ACCESS_SIB_IB_HWINFO__SIZE (0x20)
     void register_access_sib_IB_HWInfo__dump(const struct register_access_sib_IB_HWInfo_* ptr_struct, FILE* fd);
     /* IB_SWInfo_ */
-    void register_access_sib_IB_SWInfo__pack(const struct register_access_sib_IB_SWInfo_* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void register_access_sib_IB_SWInfo__pack(const struct register_access_sib_IB_SWInfo_* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_IB_SWInfo__unpack(struct register_access_sib_IB_SWInfo_* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_IB_SWInfo__print(const struct register_access_sib_IB_SWInfo_* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_sib_IB_SWInfo__size(void);
 #define REGISTER_ACCESS_SIB_IB_SWINFO__SIZE (0x20)
     void register_access_sib_IB_SWInfo__dump(const struct register_access_sib_IB_SWInfo_* ptr_struct, FILE* fd);
@@ -369,21 +351,12 @@ updated based on admin_state field. Only relevant on Set operations */
 #define REGISTER_ACCESS_SIB_PMAOS_SIZE (0xc)
     void register_access_sib_pmaos_dump(const struct register_access_sib_pmaos* ptr_struct, FILE* fd);
     /* register_access_sib_Nodes */
-    void register_access_sib_register_access_sib_Nodes_pack(
-      const union register_access_sib_register_access_sib_Nodes* ptr_struct,
-      u_int8_t* ptr_buff);
-    void register_access_sib_register_access_sib_Nodes_unpack(
-      union register_access_sib_register_access_sib_Nodes* ptr_struct,
-      const u_int8_t* ptr_buff);
-    void register_access_sib_register_access_sib_Nodes_print(
-      const union register_access_sib_register_access_sib_Nodes* ptr_struct,
-      FILE* fd,
-      int indent_level);
+    void register_access_sib_register_access_sib_Nodes_pack(const union register_access_sib_register_access_sib_Nodes* ptr_struct, u_int8_t* ptr_buff);
+    void register_access_sib_register_access_sib_Nodes_unpack(union register_access_sib_register_access_sib_Nodes* ptr_struct, const u_int8_t* ptr_buff);
+    void register_access_sib_register_access_sib_Nodes_print(const union register_access_sib_register_access_sib_Nodes* ptr_struct, FILE* fd, int indent_level);
     unsigned int register_access_sib_register_access_sib_Nodes_size(void);
 #define REGISTER_ACCESS_SIB_REGISTER_ACCESS_SIB_NODES_SIZE (0xa0)
-    void register_access_sib_register_access_sib_Nodes_dump(
-      const union register_access_sib_register_access_sib_Nodes* ptr_struct,
-      FILE* fd);
+    void register_access_sib_register_access_sib_Nodes_dump(const union register_access_sib_register_access_sib_Nodes* ptr_struct, FILE* fd);
 
 #ifdef __cplusplus
 }
diff --git a/tools_layouts/tools_open_layouts.c b/tools_layouts/tools_open_layouts.c
index a1b33ee3..100c899f 100644
--- a/tools_layouts/tools_open_layouts.c
+++ b/tools_layouts/tools_open_layouts.c
@@ -710,8 +710,7 @@ void tools_open_cap_mask_print(const struct tools_open_cap_mask* ptr_struct, FIL
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "is_system_image_guid_sup : " UH_FMT "\n", ptr_struct->is_system_image_guid_sup);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "is_pkey_switch_external_port_trap_sup : " UH_FMT "\n",
-            ptr_struct->is_pkey_switch_external_port_trap_sup);
+    fprintf(fd, "is_pkey_switch_external_port_trap_sup : " UH_FMT "\n", ptr_struct->is_pkey_switch_external_port_trap_sup);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "is_extended_speed_sup : " UH_FMT "\n", ptr_struct->is_extended_speed_sup);
     adb2c_add_indentation(fd, indent_level);
@@ -735,11 +734,9 @@ void tools_open_cap_mask_print(const struct tools_open_cap_mask* ptr_struct, FIL
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "is_client_reregistration_sup : " UH_FMT "\n", ptr_struct->is_client_reregistration_sup);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "is_other_local_changes_notice_supported : " UH_FMT "\n",
-            ptr_struct->is_other_local_changes_notice_supported);
+    fprintf(fd, "is_other_local_changes_notice_supported : " UH_FMT "\n", ptr_struct->is_other_local_changes_notice_supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "is_link_speed_width_pairs_table_supported : " UH_FMT "\n",
-            ptr_struct->is_link_speed_width_pairs_table_supported);
+    fprintf(fd, "is_link_speed_width_pairs_table_supported : " UH_FMT "\n", ptr_struct->is_link_speed_width_pairs_table_supported);
 }
 
 unsigned int tools_open_cap_mask_size(void)
@@ -824,9 +821,7 @@ void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp
     ptr_struct->IsASlaveVirtualSwitch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_capability_mask_smp ========\n");
@@ -854,8 +849,7 @@ void tools_open_capability_mask_smp_print(const struct tools_open_capability_mas
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "IsAccessRegisterSupported : " UH_FMT "\n", ptr_struct->IsAccessRegisterSupported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "IsInterProcessCommunicationSupported : " UH_FMT "\n",
-            ptr_struct->IsInterProcessCommunicationSupported);
+    fprintf(fd, "IsInterProcessCommunicationSupported : " UH_FMT "\n", ptr_struct->IsInterProcessCommunicationSupported);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "IsPortSLToPrivateLFTMapSupported : " UH_FMT "\n", ptr_struct->IsPortSLToPrivateLFTMapSupported);
     adb2c_add_indentation(fd, indent_level);
@@ -1240,14 +1234,11 @@ void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen*
                                      ("NV_WRITER_ID_ICMD_UEFI_CLP") :
                                      ((ptr_struct->writer_id == 8 ?
                                          ("NV_WRITER_ID_ICMD_FLEXBOOT") :
-                                         ((ptr_struct->writer_id == 9 ?
-                                             ("NV_WRITER_ID_ICMD_MLXCONFIG") :
-                                             ((ptr_struct->writer_id == 10 ?
-                                                 ("NV_WRITER_ID_ICMD_USER1") :
-                                                 ((ptr_struct->writer_id == 11 ?
-                                                     ("NV_WRITER_ID_ICMD_USER2") :
-                                                     ((ptr_struct->writer_id == 31 ? ("NV_WRITER_ID_OTHER") :
-                                                                                     ("unknown")))))))))))))))))))))))))),
+                                         ((ptr_struct->writer_id == 9 ? ("NV_WRITER_ID_ICMD_MLXCONFIG") :
+                                                                        ((ptr_struct->writer_id == 10 ?
+                                                                            ("NV_WRITER_ID_ICMD_USER1") :
+                                                                            ((ptr_struct->writer_id == 11 ? ("NV_WRITER_ID_ICMD_USER2") :
+                                                                                                            ((ptr_struct->writer_id == 31 ? ("NV_WRITER_ID_OTHER") : ("unknown")))))))))))))))))))))))))),
       ptr_struct->writer_id);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "read_current         : " UH_FMT "\n", ptr_struct->read_current);
@@ -1587,8 +1578,7 @@ void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header* ptr_
     tools_open_aux_tlv_header_print(ptr_struct, fd, 0);
 }
 
-void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1606,8 +1596,7 @@ void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_p
     adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ActiveCell);
 }
 
-void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct,
-                                             const u_int8_t* ptr_buff)
+void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1625,9 +1614,7 @@ void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_
     ptr_struct->ActiveCell = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level)
+void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_extended_ib_port_info ========\n");
@@ -3163,9 +3150,7 @@ void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_inf
     tools_open_capability_mask_smp_unpack(&(ptr_struct->capability_mask_smp), ptr_buff);
 }
 
-void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_smp_vsp_general_info ========\n");
@@ -3412,9 +3397,7 @@ void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext* pt
     ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_boot_settings_ext ========\n");
@@ -3512,9 +3495,7 @@ void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor
     ptr_struct->size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct,
-                                          FILE* fd,
-                                          int indent_level)
+void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_component_desciptor ========\n");
@@ -3720,8 +3701,7 @@ void tools_open_image_info_dump(const struct tools_open_image_info* ptr_struct,
     tools_open_image_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct,
-                                              u_int8_t* ptr_buff)
+void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3729,8 +3709,7 @@ void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->boot_pkey);
 }
 
-void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct,
-                                                const u_int8_t* ptr_buff)
+void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3738,9 +3717,7 @@ void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boo
     ptr_struct->boot_pkey = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level)
+void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_infiniband_boot_settings ========\n");
@@ -3759,8 +3736,7 @@ void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband
     tools_open_infiniband_boot_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3774,8 +3750,7 @@ void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniba
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_dcr_lifo_size);
 }
 
-void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                  const u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3789,9 +3764,7 @@ void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_d
     ptr_struct->max_dcr_lifo_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level)
+void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_infiniband_dc_capabilities ========\n");
@@ -3811,14 +3784,12 @@ unsigned int tools_open_infiniband_dc_capabilities_size(void)
     return TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE;
 }
 
-void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                FILE* fd)
+void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd)
 {
     tools_open_infiniband_dc_capabilities_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct,
-                                            u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3828,8 +3799,7 @@ void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_d
     adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->dcr_lifo_size);
 }
 
-void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct,
-                                              const u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3839,9 +3809,7 @@ void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_se
     ptr_struct->dcr_lifo_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level)
+void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_infiniband_dc_settings ========\n");
@@ -3975,8 +3943,7 @@ void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_se
     adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_tx_mode);
 }
 
-void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3988,9 +3955,7 @@ void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settin
     ptr_struct->lldp_nb_tx_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_lldp_client_settings ========\n");
@@ -4433,8 +4398,7 @@ void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_gu
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_allocated_guids);
 }
 
-void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct,
-                                            const u_int8_t* ptr_buff)
+void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4448,9 +4412,7 @@ void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_c
     ptr_struct->num_of_allocated_guids = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level)
+void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_nv_base_mac_guid_cap ========\n");
@@ -4503,9 +4465,7 @@ void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf*
     ptr_struct->cq_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct,
-                                         FILE* fd,
-                                         int indent_level)
+void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_nv_cx3_global_conf ========\n");
@@ -4530,8 +4490,7 @@ void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_co
     tools_open_nv_cx3_global_conf_print(ptr_struct, fd, 0);
 }
 
-void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4539,8 +4498,7 @@ void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_ca
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ip_ver);
 }
 
-void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct,
-                                             const u_int8_t* ptr_buff)
+void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4548,9 +4506,7 @@ void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capabi
     ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level)
+void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_option_rom_capability ========\n");
@@ -4613,9 +4569,7 @@ void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor*
     ptr_struct->user_data_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct,
-                                         FILE* fd,
-                                         int indent_level)
+void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_package_descriptor ========\n");
@@ -4871,9 +4825,7 @@ void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration* pt
     ptr_struct->num_vf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
 }
 
-void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_pci_configuration ========\n");
@@ -5010,8 +4962,7 @@ void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state* pt
     tools_open_port_boot_state_print(ptr_struct, fd, 0);
 }
 
-void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct,
-                                           u_int8_t* ptr_buff)
+void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5027,8 +4978,7 @@ void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_option_rom_en);
 }
 
-void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct,
-                                             const u_int8_t* ptr_buff)
+void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5044,9 +4994,7 @@ void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_sett
     ptr_struct->boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level)
+void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_preboot_boot_settings ========\n");
@@ -5105,9 +5053,7 @@ void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl* pt
     ptr_struct->pptx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_preboot_flow_ctrl ========\n");
@@ -5216,8 +5162,7 @@ void tools_open_qos_cap_dump(const struct tools_open_qos_cap* ptr_struct, FILE*
     tools_open_qos_cap_print(ptr_struct, fd, 0);
 }
 
-void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct,
-                                             u_int8_t* ptr_buff)
+void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5251,8 +5196,7 @@ void tools_open_query_def_params_global_pack(const struct tools_open_query_def_p
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
 }
 
-void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct,
-                                               const u_int8_t* ptr_buff)
+void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5286,9 +5230,7 @@ void tools_open_query_def_params_global_unpack(struct tools_open_query_def_param
     ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level)
+void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_query_def_params_global ========\n");
@@ -5333,8 +5275,7 @@ void tools_open_query_def_params_global_dump(const struct tools_open_query_def_p
     tools_open_query_def_params_global_print(ptr_struct, fd, 0);
 }
 
-void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct,
-                                               u_int8_t* ptr_buff)
+void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5404,8 +5345,7 @@ void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->iscsi_link_up_delay_time);
 }
 
-void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct,
-                                                 const u_int8_t* ptr_buff)
+void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5475,9 +5415,7 @@ void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_par
     ptr_struct->iscsi_link_up_delay_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level)
+void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_query_def_params_per_port ========\n");
@@ -5742,8 +5680,7 @@ void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn* ptr_struct
     tools_open_roce_cc_ecn_print(ptr_struct, fd, 0);
 }
 
-void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                              u_int8_t* ptr_buff)
+void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5751,8 +5688,7 @@ void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->roce_over_ip_next_protocol);
 }
 
-void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                                const u_int8_t* ptr_buff)
+void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct, const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5760,9 +5696,7 @@ void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_nex
     ptr_struct->roce_over_ip_next_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level)
+void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_roce_v_1_5_next_protocol ========\n");
@@ -5912,9 +5846,7 @@ void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration* pt
     ptr_struct->log_max_payload_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct,
-                                        FILE* fd,
-                                        int indent_level)
+void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_tpt_configuration ========\n");
diff --git a/tools_layouts/tools_open_layouts.h b/tools_layouts/tools_open_layouts.h
index e9d0f88c..f07ea83d 100644
--- a/tools_layouts/tools_open_layouts.h
+++ b/tools_layouts/tools_open_layouts.h
@@ -3128,8 +3128,7 @@ the default link type when no cable is connected */
     /* per_module_type */
     void tools_open_per_module_type_pack(const struct tools_open_per_module_type* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_per_module_type_unpack(struct tools_open_per_module_type* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      tools_open_per_module_type_print(const struct tools_open_per_module_type* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_per_module_type_print(const struct tools_open_per_module_type* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_per_module_type_size(void);
 #define TOOLS_OPEN_PER_MODULE_TYPE_SIZE (0x4)
     void tools_open_per_module_type_dump(const struct tools_open_per_module_type* ptr_struct, FILE* fd);
@@ -3169,13 +3168,9 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_CAP_MASK_SIZE (0x4)
     void tools_open_cap_mask_dump(const struct tools_open_cap_mask* ptr_struct, FILE* fd);
     /* capability_mask_smp */
-    void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_capability_mask_smp_size(void);
 #define TOOLS_OPEN_CAPABILITY_MASK_SMP_SIZE (0x40)
     void tools_open_capability_mask_smp_dump(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd);
@@ -3203,17 +3198,14 @@ the default link type when no cable is connected */
     /* nv_hdr_fifth_gen */
     void tools_open_nv_hdr_fifth_gen_pack(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_nv_hdr_fifth_gen_unpack(struct tools_open_nv_hdr_fifth_gen* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_nv_hdr_fifth_gen_size(void);
 #define TOOLS_OPEN_NV_HDR_FIFTH_GEN_SIZE (0xc)
     void tools_open_nv_hdr_fifth_gen_dump(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd);
     /* pmdio_addr_data */
     void tools_open_pmdio_addr_data_pack(const struct tools_open_pmdio_addr_data* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_pmdio_addr_data_unpack(struct tools_open_pmdio_addr_data* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_pmdio_addr_data_size(void);
 #define TOOLS_OPEN_PMDIO_ADDR_DATA_SIZE (0x4)
     void tools_open_pmdio_addr_data_dump(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd);
@@ -3246,13 +3238,9 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_AUX_TLV_HEADER_SIZE (0x14)
     void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header* ptr_struct, FILE* fd);
     /* extended_ib_port_info */
-    void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_extended_ib_port_info_size(void);
 #define TOOLS_OPEN_EXTENDED_IB_PORT_INFO_SIZE (0x3c)
     void tools_open_extended_ib_port_info_dump(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd);
@@ -3397,13 +3385,9 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_PMDIO_SIZE (0x108)
     void tools_open_pmdio_dump(const struct tools_open_pmdio* ptr_struct, FILE* fd);
     /* smp_vsp_general_info */
-    void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_smp_vsp_general_info_size(void);
 #define TOOLS_OPEN_SMP_VSP_GENERAL_INFO_SIZE (0x40)
     void tools_open_smp_vsp_general_info_dump(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd);
@@ -3438,9 +3422,7 @@ the default link type when no cable is connected */
     /* boot_settings_ext */
     void tools_open_boot_settings_ext_pack(const struct tools_open_boot_settings_ext* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_boot_settings_ext_size(void);
 #define TOOLS_OPEN_BOOT_SETTINGS_EXT_SIZE (0x4)
     void tools_open_boot_settings_ext_dump(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd);
@@ -3452,13 +3434,9 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_COMMON_HEADER_SIZE (0x4)
     void tools_open_common_header_dump(const struct tools_open_common_header* ptr_struct, FILE* fd);
     /* component_desciptor */
-    void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor* ptr_struct,
-                                             u_int8_t* ptr_buff);
-    void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor* ptr_struct,
-                                               const u_int8_t* ptr_buff);
-    void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct,
-                                              FILE* fd,
-                                              int indent_level);
+    void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_component_desciptor_size(void);
 #define TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE (0x10)
     void tools_open_component_desciptor_dump(const struct tools_open_component_desciptor* ptr_struct, FILE* fd);
@@ -3484,37 +3462,23 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_IMAGE_INFO_SIZE (0x400)
     void tools_open_image_info_dump(const struct tools_open_image_info* ptr_struct, FILE* fd);
     /* infiniband_boot_settings */
-    void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct,
-                                                  u_int8_t* ptr_buff);
-    void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct,
-                                                    const u_int8_t* ptr_buff);
-    void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct,
-                                                   FILE* fd,
-                                                   int indent_level);
+    void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_infiniband_boot_settings_size(void);
 #define TOOLS_OPEN_INFINIBAND_BOOT_SETTINGS_SIZE (0x4)
-    void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings* ptr_struct,
-                                                  FILE* fd);
+    void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd);
     /* infiniband_dc_capabilities */
-    void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                    u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                      const u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                     FILE* fd,
-                                                     int indent_level);
+    void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_infiniband_dc_capabilities_size(void);
 #define TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE (0x10)
-    void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
-                                                    FILE* fd);
+    void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd);
     /* infiniband_dc_settings */
-    void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct,
-                                                u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct,
-                                                  const u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct,
-                                                 FILE* fd,
-                                                 int indent_level);
+    void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_infiniband_dc_settings_size(void);
 #define TOOLS_OPEN_INFINIBAND_DC_SETTINGS_SIZE (0x8)
     void tools_open_infiniband_dc_settings_dump(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd);
@@ -3526,13 +3490,9 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_ISCSI_SETTINGS_SIZE (0xc)
     void tools_open_iscsi_settings_dump(const struct tools_open_iscsi_settings* ptr_struct, FILE* fd);
     /* lldp_client_settings */
-    void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_lldp_client_settings_size(void);
 #define TOOLS_OPEN_LLDP_CLIENT_SETTINGS_SIZE (0xc)
     void tools_open_lldp_client_settings_dump(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd);
@@ -3581,69 +3541,49 @@ the default link type when no cable is connected */
     /* nv_base_mac_guid */
     void tools_open_nv_base_mac_guid_pack(const struct tools_open_nv_base_mac_guid* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_nv_base_mac_guid_unpack(struct tools_open_nv_base_mac_guid* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_nv_base_mac_guid_size(void);
 #define TOOLS_OPEN_NV_BASE_MAC_GUID_SIZE (0x10)
     void tools_open_nv_base_mac_guid_dump(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd);
     /* nv_base_mac_guid_cap */
-    void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
-                                              u_int8_t* ptr_buff);
-    void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct,
-                                                const u_int8_t* ptr_buff);
-    void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
-                                               FILE* fd,
-                                               int indent_level);
+    void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_nv_base_mac_guid_cap_size(void);
 #define TOOLS_OPEN_NV_BASE_MAC_GUID_CAP_SIZE (0x8)
     void tools_open_nv_base_mac_guid_cap_dump(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd);
     /* nv_cx3_global_conf */
     void tools_open_nv_cx3_global_conf_pack(const struct tools_open_nv_cx3_global_conf* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf* ptr_struct,
-                                              const u_int8_t* ptr_buff);
-    void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level);
+    void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_nv_cx3_global_conf_size(void);
 #define TOOLS_OPEN_NV_CX3_GLOBAL_CONF_SIZE (0x20)
     void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd);
     /* option_rom_capability */
-    void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_option_rom_capability_size(void);
 #define TOOLS_OPEN_OPTION_ROM_CAPABILITY_SIZE (0x4)
     void tools_open_option_rom_capability_dump(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd);
     /* package_descriptor */
     void tools_open_package_descriptor_pack(const struct tools_open_package_descriptor* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor* ptr_struct,
-                                              const u_int8_t* ptr_buff);
-    void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct,
-                                             FILE* fd,
-                                             int indent_level);
+    void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_package_descriptor_size(void);
 #define TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE (0x1c)
     void tools_open_package_descriptor_dump(const struct tools_open_package_descriptor* ptr_struct, FILE* fd);
     /* pci_capabilities */
     void tools_open_pci_capabilities_pack(const struct tools_open_pci_capabilities* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_pci_capabilities_unpack(struct tools_open_pci_capabilities* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_pci_capabilities_size(void);
 #define TOOLS_OPEN_PCI_CAPABILITIES_SIZE (0x14)
     void tools_open_pci_capabilities_dump(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd);
     /* pci_configuration */
     void tools_open_pci_configuration_pack(const struct tools_open_pci_configuration* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_pci_configuration_size(void);
 #define TOOLS_OPEN_PCI_CONFIGURATION_SIZE (0xc)
     void tools_open_pci_configuration_dump(const struct tools_open_pci_configuration* ptr_struct, FILE* fd);
@@ -3657,28 +3597,21 @@ the default link type when no cable is connected */
     /* port_boot_state */
     void tools_open_port_boot_state_pack(const struct tools_open_port_boot_state* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_port_boot_state_unpack(struct tools_open_port_boot_state* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      tools_open_port_boot_state_print(const struct tools_open_port_boot_state* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_port_boot_state_print(const struct tools_open_port_boot_state* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_port_boot_state_size(void);
 #define TOOLS_OPEN_PORT_BOOT_STATE_SIZE (0x4)
     void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state* ptr_struct, FILE* fd);
     /* preboot_boot_settings */
-    void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct,
-                                               u_int8_t* ptr_buff);
-    void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct,
-                                                 const u_int8_t* ptr_buff);
-    void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct,
-                                                FILE* fd,
-                                                int indent_level);
+    void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_preboot_boot_settings_size(void);
 #define TOOLS_OPEN_PREBOOT_BOOT_SETTINGS_SIZE (0x4)
     void tools_open_preboot_boot_settings_dump(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd);
     /* preboot_flow_ctrl */
     void tools_open_preboot_flow_ctrl_pack(const struct tools_open_preboot_flow_ctrl* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_preboot_flow_ctrl_size(void);
 #define TOOLS_OPEN_PREBOOT_FLOW_CTRL_SIZE (0x4)
     void tools_open_preboot_flow_ctrl_dump(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd);
@@ -3697,28 +3630,19 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_QOS_CAP_SIZE (0xc)
     void tools_open_qos_cap_dump(const struct tools_open_qos_cap* ptr_struct, FILE* fd);
     /* query_def_params_global */
-    void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct,
-                                                 u_int8_t* ptr_buff);
-    void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct,
-                                                   const u_int8_t* ptr_buff);
-    void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct,
-                                                  FILE* fd,
-                                                  int indent_level);
+    void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_query_def_params_global_size(void);
 #define TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE (0x14)
     void tools_open_query_def_params_global_dump(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd);
     /* query_def_params_per_port */
-    void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct,
-                                                   u_int8_t* ptr_buff);
-    void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct,
-                                                     const u_int8_t* ptr_buff);
-    void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct,
-                                                    FILE* fd,
-                                                    int indent_level);
+    void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_query_def_params_per_port_size(void);
 #define TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE (0x1c)
-    void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port* ptr_struct,
-                                                   FILE* fd);
+    void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd);
     /* roce_cc */
     void tools_open_roce_cc_pack(const struct tools_open_roce_cc* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_roce_cc_unpack(struct tools_open_roce_cc* ptr_struct, const u_int8_t* ptr_buff);
@@ -3734,17 +3658,12 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_ROCE_CC_ECN_SIZE (0x44)
     void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn* ptr_struct, FILE* fd);
     /* roce_v_1_5_next_protocol */
-    void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                                  u_int8_t* ptr_buff);
-    void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                                    const u_int8_t* ptr_buff);
-    void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                                   FILE* fd,
-                                                   int indent_level);
+    void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, u_int8_t* ptr_buff);
+    void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct, const u_int8_t* ptr_buff);
+    void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_roce_v_1_5_next_protocol_size(void);
 #define TOOLS_OPEN_ROCE_V_1_5_NEXT_PROTOCOL_SIZE (0x4)
-    void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
-                                                  FILE* fd);
+    void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd);
     /* smp_data */
     void tools_open_smp_data_pack(const union tools_open_smp_data* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_smp_data_unpack(union tools_open_smp_data* ptr_struct, const u_int8_t* ptr_buff);
@@ -3762,18 +3681,14 @@ the default link type when no cable is connected */
     /* tpt_capabilities */
     void tools_open_tpt_capabilities_pack(const struct tools_open_tpt_capabilities* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_tpt_capabilities_unpack(struct tools_open_tpt_capabilities* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_tpt_capabilities_size(void);
 #define TOOLS_OPEN_TPT_CAPABILITIES_SIZE (0x4)
     void tools_open_tpt_capabilities_dump(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd);
     /* tpt_configuration */
     void tools_open_tpt_configuration_pack(const struct tools_open_tpt_configuration* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct,
-                                            FILE* fd,
-                                            int indent_level);
+    void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_tpt_configuration_size(void);
 #define TOOLS_OPEN_TPT_CONFIGURATION_SIZE (0x4)
     void tools_open_tpt_configuration_dump(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd);
@@ -3808,9 +3723,7 @@ the default link type when no cable is connected */
     /* access_registers */
     void tools_open_access_registers_pack(const union tools_open_access_registers* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_access_registers_unpack(union tools_open_access_registers* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_access_registers_print(const union tools_open_access_registers* ptr_struct,
-                                           FILE* fd,
-                                           int indent_level);
+    void tools_open_access_registers_print(const union tools_open_access_registers* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_access_registers_size(void);
 #define TOOLS_OPEN_ACCESS_REGISTERS_SIZE (0x200)
     void tools_open_access_registers_dump(const union tools_open_access_registers* ptr_struct, FILE* fd);
@@ -3831,8 +3744,7 @@ the default link type when no cable is connected */
     /* mcdd_descriptor */
     void tools_open_mcdd_descriptor_pack(const struct tools_open_mcdd_descriptor* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_mcdd_descriptor_unpack(struct tools_open_mcdd_descriptor* ptr_struct, const u_int8_t* ptr_buff);
-    void
-      tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_mcdd_descriptor_size(void);
 #define TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE (0x24)
     void tools_open_mcdd_descriptor_dump(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd);

From ec48df7528e9c3fba9438d1b2995c76273cf5ae0 Mon Sep 17 00:00:00 2001
From: Alon Strutsovsky <astrutsovsky@nvidia.com>
Date: Tue, 19 Jul 2022 18:21:14 +0300
Subject: [PATCH 43/46] [resourcedump] port changes from mft 4.21

Description:
1) fast-mode feature
2) mem-mode bugfixes

Tested OS: None
Tested devices: None
Tested flows: None

Known gaps (with RM ticket):

Issue: None
---
 resourcedump/commands/DumpCommand.py         |  8 +++-
 resourcedump/fetchers/ResourceDumpFetcher.py | 45 +++++++++++++++-----
 resourcedump/resource_data/DataPrinter.py    |  4 ++
 resourcedump/resource_data/DumpData.py       |  3 +-
 resourcedump/resource_data/QueryData.py      |  2 +-
 5 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/resourcedump/commands/DumpCommand.py b/resourcedump/commands/DumpCommand.py
index 1d5254bd..3b351fc5 100755
--- a/resourcedump/commands/DumpCommand.py
+++ b/resourcedump/commands/DumpCommand.py
@@ -67,6 +67,8 @@ def __init__(self, **kwargs):
         self.mem = kwargs[cs.UI_ARG_MEM]
         self.data = None
 
+        self._fast_mode = self.bin and not self.depth
+
     def get_data(self):
         """call the QueryData for getting the dump data.
         """
@@ -79,13 +81,15 @@ def get_data(self):
                                       numOfObj2=self.numOfObj2,
                                       depth=self.depth,
                                       bin=self.bin,
-                                      mem=self.mem)
+                                      mem=self.mem,
+                                      fast_mode=self._fast_mode)
 
     def print_data(self):
         """call the data printer with the right configuration for print the dump data to
         screen or in a binary format (choosed by the user).
         """
-        DataPrinter.print_dump_data(self.data, self.bin)
+        if not self._fast_mode:
+            DataPrinter.print_dump_data(self.data, self.bin)
 
     def validate(self):
         """call the capability validator and check if the core dump supported by the FW.
diff --git a/resourcedump/fetchers/ResourceDumpFetcher.py b/resourcedump/fetchers/ResourceDumpFetcher.py
index 616f6ecb..d30d0aa9 100755
--- a/resourcedump/fetchers/ResourceDumpFetcher.py
+++ b/resourcedump/fetchers/ResourceDumpFetcher.py
@@ -41,6 +41,7 @@
 #
 #######################################################
 
+from resource_data.DataPrinter import DataPrinter
 from segments.SegmentCreator import SegmentCreator
 from utils import constants
 from utils import constants as cs
@@ -65,7 +66,7 @@
     import pyverbs.providers.mlx5.mlx5_enums as dve
     from pyverbs.providers.mlx5.mlx5dv import Mlx5Context, Mlx5DVContextAttr
     from pyverbs.providers.mlx5.mlx5dv import Mlx5UMEM
-    from pyverbs.mem_alloc import read32
+    from pyverbs.mem_alloc import read32, read
     import resource
     PYVERVBS_SUPPORT = True
 except Exception as _:
@@ -278,9 +279,10 @@ class ResourceDumpFetcher:
     # very big number that represent the inf number 2^32 - 1 (we will not reach that number)
     INF_DEPTH = 4294967295
 
-    def __init__(self, device_name):
+    def __init__(self, device_name, bin_file=None):
         self._sequence_number = ResourceDumpFetcher._sequence_incrementor()
         self._device_name = device_name
+        self._bin_file = bin_file
         self._start_seq_number = 0
         try:
             mst_device = mtcr.MstDevice(self._device_name)
@@ -290,6 +292,17 @@ def __init__(self, device_name):
         except Exception as e:
             raise Exception("{0}".format(e))
 
+        self._bin_file_h = None
+        if self._bin_file:
+            try:
+                self._bin_file_h = open(self._bin_file, "wb")
+            except Exception as e:
+                raise Exception("Failed to create binary file, {0}".format(e))
+
+    def __del__(self):
+        if self._bin_file_h:
+            self._bin_file_h.close()
+
     @staticmethod
     def _create_segments(segments_data):
         """convert the data into a list of segments by calling the SegmentCreator.
@@ -307,6 +320,9 @@ def fetch_data(self, **kwargs):
         # read the inline data from the resource dump register and split it to segments list
         self._start_seq_number = 0
         inline_data = self._retrieve_resource_dump_inline_data(kwargs[cs.UI_ARG_SEGMENT], **kwargs)
+        if kwargs["fast_mode"]:
+            return []
+
         segments_list = self._create_segments(inline_data)
         segments_list_last_position = 0
 
@@ -324,7 +340,7 @@ def fetch_data(self, **kwargs):
                     inner_inline_data.extend(
                         self._retrieve_resource_dump_inline_data(seg.reference_type, index1=seg.index1,
                                                                  index2=seg.index2, numOfObj1=seg.num_of_obj1,
-                                                                 numOfObj2=seg.num_of_obj2, vHCAid=kwargs["vHCAid"], mem=kwargs["mem"]))
+                                                                 numOfObj2=seg.num_of_obj2, vHCAid=kwargs["vHCAid"], mem=kwargs["mem"], fast_mode=kwargs["fast_mode"]))
 
             segments_list_last_position = len(segments_list)
             segments_list.extend(self._create_segments(inner_inline_data))
@@ -372,7 +388,7 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
         if kwargs["vHCAid"] is None:
             vhca_id = 0
         else:
-            vhca_id = int(kwargs["vHCAid"])
+            vhca_id = int(kwargs["vHCAid"], 0)
             vhca_id_valid = 1
 
         if kwargs["mem"] is not None:
@@ -417,14 +433,21 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
             device_opaque = results["device_opaque"]
             size = int(math.ceil(results["size"] / 4))
 
+            bin_data = None
             if kwargs["mem"] is not None:
-                # Read all dwords and change endianness
-                my_data = []
-                for i in range(size):
-                    my_data.append(struct.unpack("<I", struct.pack(">I", read32(self.umem.umem_addr, i)))[0])
-                inline_data.extend(my_data)
+                if not kwargs["fast_mode"] or segment_type == cs.RESOURCE_DUMP_SEGMENT_TYPE_MENU:
+                    # Read all dwords and change endianness
+                    for i in range(size):
+                        inline_data.append(struct.unpack("<I", struct.pack(">I", read32(self.umem.umem_addr, i)))[0])
+                else:
+                    bin_data = read(self.umem.umem_addr, results["size"])
             else:
-                inline_data.extend(results["inline_data"][:size])
+                if not kwargs["fast_mode"] or segment_type == cs.RESOURCE_DUMP_SEGMENT_TYPE_MENU:
+                    inline_data.extend(results["inline_data"][:size])
+                else:
+                    bin_data = struct.pack(">{}I".format(size), *results["inline_data"][:size])
+            if bin_data:
+                DataPrinter.append_binary_data_to_file(bin_data, self._bin_file_h)
 
             if not self._validate_sequence_number(seg_number):
                 raise Exception("E - wrong sequence number while calling resource dump register with seq num = {0}"
@@ -447,7 +470,7 @@ def _retrieve_resource_dump_inline_data(self, segment_type, **kwargs):
         def _create_umem(self, ctx, size,
                          access=e.IBV_ACCESS_LOCAL_WRITE,
                          alignment=resource.getpagesize()):
-            return Mlx5UMEM(ctx, size=size, alignment=alignment, access=access)
+            return Mlx5UMEM(ctx, size=size, alignment=alignment, access=access, pgsz_bitmap=alignment)
 
         def _create_mr_devx(self, rdma_device, buf_size):
             """This method create mkey and memory buffer using devx (part of ofed driver).
diff --git a/resourcedump/resource_data/DataPrinter.py b/resourcedump/resource_data/DataPrinter.py
index 9259f0cd..e72cf753 100755
--- a/resourcedump/resource_data/DataPrinter.py
+++ b/resourcedump/resource_data/DataPrinter.py
@@ -93,3 +93,7 @@ def _write_to_file(cls, data, path):
                     binary_file.write(four_bytes)
 
         print("write to file: ", path)
+
+    @classmethod
+    def append_binary_data_to_file(cls, data, file_h):
+        file_h.write(data)
diff --git a/resourcedump/resource_data/DumpData.py b/resourcedump/resource_data/DumpData.py
index c804b5d9..232d5123 100755
--- a/resourcedump/resource_data/DumpData.py
+++ b/resourcedump/resource_data/DumpData.py
@@ -69,7 +69,8 @@ def get_dump(cls, **kwargs):
         if rc:
             # segment type can be name, this method will convert the name (if needed) to seg number in hex (str)
             kwargs[cs.UI_ARG_SEGMENT] = res.get_segment_type_by_segment_name(kwargs[cs.UI_ARG_SEGMENT])
-            dump_segments = ResourceDumpFetcher(kwargs["device_name"]).fetch_data(**kwargs)
+            bin_file = kwargs["bin"] if kwargs["fast_mode"] else None
+            dump_segments = ResourceDumpFetcher(kwargs["device_name"], bin_file).fetch_data(**kwargs)
         else:
             raise Exception("not supported or missing argument")
 
diff --git a/resourcedump/resource_data/QueryData.py b/resourcedump/resource_data/QueryData.py
index f067409e..416ca33d 100755
--- a/resourcedump/resource_data/QueryData.py
+++ b/resourcedump/resource_data/QueryData.py
@@ -56,7 +56,7 @@ def get_query(cls, device_name, vhca_id, mem=None):
         """
         try:
             query_kwargs = {'segment': constants.RESOURCE_DUMP_SEGMENT_TYPE_MENU,
-                            'vHCAid': vhca_id, 'index1': 0, 'index2': 0, 'numOfObj1': 0, 'numOfObj2': 0, 'depth': 0, 'mem': mem}
+                            'vHCAid': vhca_id, 'index1': 0, 'index2': 0, 'numOfObj1': 0, 'numOfObj2': 0, 'depth': 0, 'mem': mem, 'fast_mode': False}
             query_segments = ResourceDumpFetcher(device_name).fetch_data(**query_kwargs)
             res = SegmentsFilter.get_segments(query_segments, constants.RESOURCE_DUMP_SEGMENT_TYPE_MENU)
             try:

From 6656354e7062aabf1b0d706e901bcf8a7bb8d27e Mon Sep 17 00:00:00 2001
From: Tomer Tubi <ttubi@nvidia.com>
Date: Wed, 20 Jul 2022 09:13:22 +0300
Subject: [PATCH 44/46] Align mstflint with mft 4.21.0 For main changes, please
 refer to the release notes and user manual

---
 adb_parser/adb_db.cpp                         |     6 +-
 adb_parser/adb_parser.cpp                     |    65 +-
 adb_parser/adb_parser.h                       |     5 +
 adb_parser/adb_progress.cpp                   |    33 +
 adb_parser/adb_progress.h                     |    44 +
 adb_parser/expr.cpp                           |     1 +
 cmdif/icmd_cif_macros.h                       |     2 +-
 cmdparser/cmdparser.cpp                       |     5 +-
 fw_comps_mgr/fw_comps_mgr.cpp                 |     9 +-
 include/mtcr_ul/mtcr_com_defs.h               |     8 +-
 libmfa/mfa.c                                  |     9 +
 mflash/mflash.c                               |    62 +-
 mflash/mflash_dev_capability.c                |     6 +
 mflash/mflash_gw.c                            |     2 +-
 mflash/mflash_pack_layer.h                    |    13 +-
 mft_utils/hsmclient/inc/hsmlunaclient.h       |     1 +
 mft_utils/hsmclient/src/burnprivatekey.cpp    |     6 +-
 mft_utils/hsmclient/src/hex64.cpp             |     1 -
 .../hsmclient/src/hsmcreatersasignature.cpp   |     6 +
 mft_utils/hsmclient/src/hsmlunaclientinit.cpp |     4 +
 mlxarchive/mlxarchive_mfa2_builder.cpp        |     3 +-
 mlxarchive/mlxarchive_mfa2_descriptor.cpp     |     1 +
 mlxarchive/mlxarchive_mfa2_extension.cpp      |     4 +-
 mlxconfig/mlxcfg_generic_commander.cpp        |    16 +-
 mlxconfig/mlxcfg_generic_commander.h          |     2 +-
 mlxconfig/mlxcfg_param_lib.cpp                |     2 +-
 mlxconfig/mlxcfg_view.h                       |     1 +
 mlxconfig/mlxconfig_dbs/mlxconfig_host.db     |   Bin 285696 -> 293888 bytes
 mlxconfig/mlxconfig_dbs/mlxconfig_switch.db   |   Bin 36864 -> 36864 bytes
 mlxfwops/lib/flint_base.h                     |     2 +-
 mlxfwops/lib/flint_io.cpp                     |     8 +-
 mlxfwops/lib/fs2_ops.cpp                      |    41 +-
 mlxfwops/lib/fs2_ops.h                        |     1 -
 mlxfwops/lib/fs3_ops.cpp                      |    33 +-
 mlxfwops/lib/fs3_ops.h                        |     5 +-
 mlxfwops/lib/fs4_ops.cpp                      |    42 +-
 mlxfwops/lib/fs_checks.cpp                    |     3 +-
 mlxfwops/lib/fsctrl_ops.cpp                   |    12 +-
 mlxfwops/lib/fw_ops.cpp                       |   110 +-
 mlxfwops/lib/mlxfwops_com.h                   |    10 +-
 mlxfwops/lib/signature_manager_factory.h      |     5 +-
 mlxfwupdate/cmd_line_parser.cpp               |    27 +-
 mlxfwupdate/image_access.cpp                  |     3 +-
 mlxfwupdate/mlnx_dev.cpp                      |   130 +-
 mlxfwupdate/mlxfwmanager.cpp                  |     4 +-
 mlxfwupdate/output_fmts.cpp                   |    12 +-
 mlxreg/mlxreg_lib.cpp                         |     5 +-
 mlxreg/mlxreg_parser.cpp                      |     1 -
 mlxsign_lib/mlxsign_lib.cpp                   |     8 +-
 mstdump/crd_lib/crdump.c                      |     3 +-
 mstdump/crd_main/mstdump.c                    |     2 +-
 mstdump/mstdump_dbs/BlueField3.csv            | 11748 +---------------
 mstdump/mstdump_dbs/ConnectX4LX.csv           |     2 +-
 mstdump/mstdump_dbs/ConnectX6.csv             |     1 +
 mstdump/mstdump_dbs/Quantum.csv               |     4 +-
 mstdump/mstdump_dbs/Spectrum2.csv             |    11 +-
 mstdump/mstdump_dbs/SwitchIB.csv              |     4 -
 mtcr_freebsd/mtcr_ul.c                        |    18 +-
 mtcr_ul/mtcr_ul_com.c                         |    65 +-
 mtcr_ul/mtcr_ul_icmd_cif.c                    |    14 +
 reg_access/reg_access.c                       |     2 +
 reg_access/regaccess.py                       |    73 +-
 small_utils/mlxfwresetlib/cmd_reg_mfrl.py     |     2 +-
 small_utils/mlxfwresetlib/pci_device.py       |     8 +-
 small_utils/mstfwreset.py                     |     1 -
 small_utils/mtserver.c                        |     6 +-
 small_utils/tcp.c                             |     4 +-
 .../adb/prm/hca/ext/register_access_table.adb |   857 +-
 .../prm/switch/ext/register_access_table.adb  |  2435 ++--
 tools_layouts/reg_access_hca_layouts.c        |   380 +-
 tools_layouts/reg_access_hca_layouts.h        |    62 +-
 tools_layouts/reg_access_switch_layouts.c     |    18 +-
 tools_layouts/tools_open_layouts.c            |   165 +-
 tools_layouts/tools_open_layouts.h            |   211 +-
 tools_res_mgmt/tools_res_mgmt.c               |    20 +
 75 files changed, 2940 insertions(+), 13955 deletions(-)
 create mode 100755 adb_parser/adb_progress.cpp
 create mode 100755 adb_parser/adb_progress.h

diff --git a/adb_parser/adb_db.cpp b/adb_parser/adb_db.cpp
index ccc01086..4957bca9 100644
--- a/adb_parser/adb_db.cpp
+++ b/adb_parser/adb_db.cpp
@@ -73,7 +73,7 @@ adb_db_t* db_create()
  */
 int db_load(adb_db_t* db, const char* adb_file_path, int add_reserved)
 {
-    if (!((Adb*)db)->load(adb_file_path, add_reserved, false))
+    if (!((Adb*)db)->load(adb_file_path, add_reserved, NULL, false))
     {
         sprintf(err, "Failed to load adabe project: %s", ((Adb*)db)->getLastError().c_str());
         return 1;
@@ -87,7 +87,7 @@ int db_load(adb_db_t* db, const char* adb_file_path, int add_reserved)
  */
 int db_load_from_str(adb_db_t* db, const char* adb_data, int add_reserved)
 {
-    if (!((Adb*)db)->loadFromString(adb_data, add_reserved, false))
+    if (!((Adb*)db)->loadFromString(adb_data, add_reserved, NULL, false))
     {
         sprintf(err, "Failed to load adabe project: %s", ((Adb*)db)->getLastError().c_str());
         return 1;
@@ -159,7 +159,7 @@ void db_destroy_limits_map(adb_limits_map_t* limits)
 adb_node_t* db_get_node(adb_db_t* db, const char* node_name)
 {
     Adb* adb = (Adb*)db;
-    AdbInstance* node = adb->createLayout(node_name, false);
+    AdbInstance* node = adb->createLayout(node_name, false, NULL);
     if (!node)
     {
         sprintf(err, "Failed to create node %s: %s", node_name, adb->getLastError().c_str());
diff --git a/adb_parser/adb_parser.cpp b/adb_parser/adb_parser.cpp
index 49357a12..d3dbe59a 100644
--- a/adb_parser/adb_parser.cpp
+++ b/adb_parser/adb_parser.cpp
@@ -62,6 +62,7 @@ class AdbParser
     AdbParser(string fileName,
               Adb* adbCtxt,
               bool addReserved = false,
+              AdbProgress* progressObj = NULL,
               bool strict = true,
               string includePath = "",
               bool enforceExtraChecks = false,
@@ -120,6 +121,7 @@ class AdbParser
     string _lastError;
     bool _addReserved;
     int _progressCnt;
+    AdbProgress* _progressObj;
     bool _strict;
     bool _checkDsAlign;
     bool skipNode;
@@ -185,6 +187,7 @@ const string AdbParser::TAG_ATTR_DEFINE_PATTERN = "([A-Za-z_]\\w*)=(\\w+)";
 AdbParser::AdbParser(string fileName,
                      Adb* adbCtxt,
                      bool addReserved,
+                     AdbProgress* progressObj,
                      bool strict,
                      string includePath,
                      bool enforceExtraChecks,
@@ -194,6 +197,7 @@ AdbParser::AdbParser(string fileName,
     _fileName(fileName),
     _addReserved(addReserved),
     _progressCnt(0),
+    _progressObj(progressObj),
     _strict(strict),
     _checkDsAlign(_checkDsAlign),
     skipNode(false),
@@ -741,8 +745,8 @@ void AdbParser::includeFile(AdbParser* adbParser, string fileName, int lineNumbe
         adbParser->_adbCtxt->includedFiles[fileName] = info;
 
         // parse the included file
-        AdbParser p(filePath, adbParser->_adbCtxt, adbParser->_addReserved, adbParser->_strict, "",
-                    adbParser->_enforceExtraChecks);
+        AdbParser p(filePath, adbParser->_adbCtxt, adbParser->_addReserved, adbParser->_progressObj, adbParser->_strict,
+                    "", adbParser->_enforceExtraChecks);
         if (!p.load())
         {
             throw AdbException(p.getError());
@@ -1673,7 +1677,7 @@ void AdbParser::startFieldElement(const XML_Char** atts, AdbParser* adbParser, c
             // check if all mandatory attributes were supplied
             for (unsigned int i = 0; i < adbParser->field_mand_attr.size(); i++)
             {
-                if (attrValue(atts, adbParser->field_mand_attr[i].c_str()) == "")
+                if (!checkAttrExist(atts, adbParser->field_mand_attr[i].c_str()))
                 {
                     expFound = raiseException(
                       allowMultipleExceptions,
@@ -2067,6 +2071,12 @@ void AdbParser::endElement(void* _adbParser, const XML_Char* name)
             adbParser->_adbCtxt->nodesMap.insert(
               pair<string, AdbNode*>(adbParser->_currentNode->name, adbParser->_currentNode));
             adbParser->_currentNode = 0;
+
+            // Call progress_func callback
+            if (adbParser->_progressObj && !(adbParser->_progressCnt++ % PROGRESS_NODE_CNT))
+            {
+                adbParser->_progressObj->progress(); // TODO - call with real parameters
+            }
         }
     }
     /*
@@ -2375,6 +2385,7 @@ string Adb::printAdbExceptionMap()
  **/
 bool Adb::load(string fname,
                bool addReserved,
+               AdbProgress* progressObj,
                bool strict,
                string includePath,
                string includeDir,
@@ -2393,7 +2404,8 @@ bool Adb::load(string fname,
             AdbParser::setAllowMultipleExceptionsTrue();
         }
         _logFile->init(logFileStr, allowMultipleExceptions);
-        AdbParser p(fname, this, addReserved, strict, includePath, enforceExtraChecks, checkDsAlign, enforceGuiChecks);
+        AdbParser p(fname, this, addReserved, progressObj, strict, includePath, enforceExtraChecks, checkDsAlign,
+                    enforceGuiChecks);
         _checkDsAlign = checkDsAlign;
         _enforceGuiChecks = enforceGuiChecks;
         if (!p.load())
@@ -2440,11 +2452,15 @@ bool Adb::load(string fname,
 /**
  * Function: Adb::loadFromString
  **/
-bool Adb::loadFromString(const char* adbContents, bool addReserved, bool strict, bool enforceExtraChecks)
+bool Adb::loadFromString(const char* adbContents,
+                         bool addReserved,
+                         AdbProgress* progressObj,
+                         bool strict,
+                         bool enforceExtraChecks)
 {
     try
     {
-        AdbParser p(string(), this, addReserved, strict, "", enforceExtraChecks);
+        AdbParser p(string(), this, addReserved, progressObj, strict, "", enforceExtraChecks);
         mainFileName = OS_PATH_SEP;
         if (!p.loadFromString(adbContents))
         {
@@ -2638,6 +2654,7 @@ void Adb::cleanInstAttrs()
  **/
 AdbInstance* Adb::createLayout(string rootNodeName,
                                bool isExprEval,
+                               AdbProgress* progressObj,
                                int depth,
                                bool ignoreMissingNodes,
                                bool allowMultipleExceptions)
@@ -2675,8 +2692,8 @@ AdbInstance* Adb::createLayout(string rootNodeName,
         for (size_t i = 0; (depth == -1 || depth > 0) && i < nodeDesc->fields.size(); i++)
         {
             vector<AdbInstance*> subItems =
-              createInstance(nodeDesc->fields[i], rootItem, emptyVars, isExprEval, depth == -1 ? -1 : depth - 1,
-                             ignoreMissingNodes, allowMultipleExceptions);
+              createInstance(nodeDesc->fields[i], rootItem, emptyVars, isExprEval, progressObj,
+                             depth == -1 ? -1 : depth - 1, ignoreMissingNodes, allowMultipleExceptions);
             rootItem->subItems.insert(rootItem->subItems.end(), subItems.begin(), subItems.end());
         }
 
@@ -2886,11 +2903,16 @@ vector<AdbInstance*> Adb::createInstance(AdbField* field,
                                          AdbInstance* parent,
                                          map<string, string> vars,
                                          bool isExprEval,
+                                         AdbProgress* progressObj,
                                          int depth,
                                          bool ignoreMissingNodes,
                                          bool allowMultipleExceptions)
 {
     static const regex EXP_PATTERN("\\s*([a-zA-Z0-9_]+)=((\\$\\(.*?\\)|\\S+|$)*)\\s*");
+    if (progressObj)
+    {
+        progressObj->progress();
+    }
 
     // if array create instance for each item. else - create 1
     vector<AdbInstance*> instList;
@@ -2910,6 +2932,7 @@ vector<AdbInstance*> Adb::createInstance(AdbField* field,
                 raiseException(allowMultipleExceptions,
                                "Can't find the definition for subnode: " + field->subNode + " of field: " + field->name,
                                ExceptionHolder::ERROR_EXCEPTION);
+                return instList;
             }
             else
             {
@@ -2917,10 +2940,13 @@ vector<AdbInstance*> Adb::createInstance(AdbField* field,
             }
         }
 
-        inst->name = field->name;
-        inst->arrIdx = 0;
-        inst->size = field->eSize();
-        inst->parent = parent;
+        if (inst)
+        {
+            inst->name = field->name;
+            inst->arrIdx = 0;
+            inst->size = field->eSize();
+            inst->parent = parent;
+        }
 
         if (field->offset == 0xffffffff)
         {
@@ -3063,12 +3089,15 @@ vector<AdbInstance*> Adb::createInstance(AdbField* field,
             {
                 map<string, string> varsCopy = vars;
                 vector<AdbInstance*> subItems =
-                  createInstance(*it, inst, vars, isExprEval, depth == -1 ? -1 : depth - 1, ignoreMissingNodes,
-                                 allowMultipleExceptions);
-                inst->subItems.insert(inst->subItems.end(), subItems.begin(), subItems.end());
-                if (subItems[0]->maxLeafSize > inst->maxLeafSize)
+                  createInstance(*it, inst, vars, isExprEval, progressObj, depth == -1 ? -1 : depth - 1,
+                                 ignoreMissingNodes, allowMultipleExceptions);
+                if (subItems.size() > 0)
                 {
-                    inst->maxLeafSize = subItems[0]->maxLeafSize;
+                    inst->subItems.insert(inst->subItems.end(), subItems.begin(), subItems.end());
+                    if (subItems[0]->maxLeafSize > inst->maxLeafSize)
+                    {
+                        inst->maxLeafSize = subItems[0]->maxLeafSize;
+                    }
                 }
             }
             inst->nodeDesc->inLayout = false;
@@ -3082,7 +3111,7 @@ vector<AdbInstance*> Adb::createInstance(AdbField* field,
                                ExceptionHolder::ERROR_EXCEPTION);
             }
 
-            if (!inst->isUnion())
+            if (!inst->isUnion() && inst->subItems.size() > 0)
             {
                 stable_sort(inst->subItems.begin(), inst->subItems.end(), compareFieldsPtr<AdbInstance>);
 
diff --git a/adb_parser/adb_parser.h b/adb_parser/adb_parser.h
index c7af067c..917270e9 100644
--- a/adb_parser/adb_parser.h
+++ b/adb_parser/adb_parser.h
@@ -57,6 +57,7 @@ class LogFile;
 #include "adb_exceptionHolder.h"
 #include "adb_logfile.h"
 #include "adb_config.h"
+#include "adb_progress.h"
 #include "adb_instance.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -134,10 +135,12 @@ class Adb
     //   3- check node size vs instance size
     bool loadFromString(const char* adbContents,
                         bool addReserved = false,
+                        AdbProgress* progressObj = NULL,
                         bool strict = true,
                         bool enforceExtraChecks = false);
     bool load(string fname,
               bool addReserved = false,
+              AdbProgress* progressObj = NULL,
               bool strict = true,
               string includePath = "",
               string includeDir = "",
@@ -154,6 +157,7 @@ class Adb
     AdbInstance* addMissingNodes(int depth, bool allowMultipleExceptions);
     AdbInstance* createLayout(string rootNodeName,
                               bool isExprEval = false,
+                              AdbProgress* progressObj = NULL,
                               int depth = -1, /* -1 means instantiate full tree */
                               bool ignoreMissingNodes = false,
                               bool getAllExceptions = false);
@@ -194,6 +198,7 @@ class Adb
                                         AdbInstance* parent,
                                         map<string, string> vars,
                                         bool isExprEval,
+                                        AdbProgress* progressObj,
                                         int depth,
                                         bool ignoreMissingNodes = false,
                                         bool getAllExceptions = false);
diff --git a/adb_parser/adb_progress.cpp b/adb_parser/adb_progress.cpp
new file mode 100755
index 00000000..7a6c84df
--- /dev/null
+++ b/adb_parser/adb_progress.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2010-2021 NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ *  Version: $Id$
+ */
diff --git a/adb_parser/adb_progress.h b/adb_parser/adb_progress.h
new file mode 100755
index 00000000..928ca95f
--- /dev/null
+++ b/adb_parser/adb_progress.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2021 NVIDIA CORPORATION & AFFILIATES. ALL RIGHTS RESERVED.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ *  Version: $Id$
+ */
+/*************************** AdbProgress ***************************/
+class AdbProgress
+{
+public:
+    virtual ~AdbProgress(){};
+    virtual void progress(int prog = 0, int total = 0)
+    {
+        (void)prog;
+        (void)total;
+    };
+};
diff --git a/adb_parser/expr.cpp b/adb_parser/expr.cpp
index c63c3546..89f4ba54 100644
--- a/adb_parser/expr.cpp
+++ b/adb_parser/expr.cpp
@@ -485,6 +485,7 @@ void Expr::GetToken(token* pt)
             }
     } while ((old_str != str) && *str);
 
+    pt->value = 0;
     pt->beg = str;
     pt->sta = state;
     switch (state)
diff --git a/cmdif/icmd_cif_macros.h b/cmdif/icmd_cif_macros.h
index ada19b91..31172553 100644
--- a/cmdif/icmd_cif_macros.h
+++ b/cmdif/icmd_cif_macros.h
@@ -94,7 +94,7 @@ int convert_rc(int rc);
         free(_data);                                                                   \
         return convert_rc(_rc);                                                        \
     }                                                                                  \
-    struct_name##_unpack(cmd_struct, _data);                                           \
+    struct_name##_out_unpack(&(cmd_struct->out), _data);                               \
     free(_data);                                                                       \
     return GCIF_STATUS_SUCCESS
 
diff --git a/cmdparser/cmdparser.cpp b/cmdparser/cmdparser.cpp
index c9c29bef..ddb8c905 100644
--- a/cmdparser/cmdparser.cpp
+++ b/cmdparser/cmdparser.cpp
@@ -375,12 +375,13 @@ string CommandLineRequester::GetUsageOptionalSection(vector<struct optional_help
 /* private methods */
 void CommandLineParser::SetLastError(const char* fmt, ...)
 {
-    char buff[1024];
+    const int MAX_BUFF = 1024;
+    char buff[MAX_BUFF];
     va_list args;
 
     memset(buff, 0, sizeof(buff));
     va_start(args, fmt);
-    vsprintf(buff, fmt, args);
+    vsnprintf(buff, MAX_BUFF, fmt, args);
     va_end(args);
 
     this->last_error.assign(buff);
diff --git a/fw_comps_mgr/fw_comps_mgr.cpp b/fw_comps_mgr/fw_comps_mgr.cpp
index bcd31ffe..45ad5043 100644
--- a/fw_comps_mgr/fw_comps_mgr.cpp
+++ b/fw_comps_mgr/fw_comps_mgr.cpp
@@ -808,9 +808,9 @@ bool FwCompsMgr::runMCQI(u_int32_t componentIndex,
     _currCompInfo.component_index = componentIndex;
     _currCompInfo.device_index = _deviceIndex;
     _currCompInfo.device_type = _deviceType;
-    DPRINTF(
-      ("-D- MCQI: read_pending_component %u infoType %u offset %u dataSize %u, componentIndex %u _deviceIndex %u \n",
-       readPending, infoType, offset, dataSize, componentIndex, _deviceIndex));
+    DPRINTF(("-D- MCQI: read_pending_component %u infoType %u offset %u dataSize %u, componentIndex %u _deviceIndex %u "
+             "\n",
+             readPending, infoType, offset, dataSize, componentIndex, _deviceIndex));
     reg_access_status_t rc = reg_access_mcqi(_mf, REG_ACCESS_METHOD_GET, &_currCompInfo);
     deal_with_signal();
     if (rc)
@@ -1538,8 +1538,7 @@ u_int32_t FwCompsMgr::getFwSupport()
     /*
      * If 4TH gen nic or switch with no MCAM reg return not supported
      */
-    if (devid == CX2_HW_ID || devid == CX3_HW_ID || devid == CX3_PRO_HW_ID ||
-        devid == IS4_HW_ID || devid == SWITCH_IB_HW_ID || devid == SWITCH_IB2_HW_ID)
+    if (devid == CX3_HW_ID || devid == CX3_PRO_HW_ID || devid == SWITCH_IB_HW_ID || devid == SWITCH_IB2_HW_ID)
     {
         _lastError = FWCOMPS_UNSUPPORTED_DEVICE;
         return 0;
diff --git a/include/mtcr_ul/mtcr_com_defs.h b/include/mtcr_ul/mtcr_com_defs.h
index 463ea805..4151c668 100644
--- a/include/mtcr_ul/mtcr_com_defs.h
+++ b/include/mtcr_ul/mtcr_com_defs.h
@@ -250,9 +250,9 @@ typedef enum MType_t
     MST_DEV_I2C = 0x1000,
 #endif
     MST_CALBR = 0x2000,
-    MST_FPGA_ICMD = 0x4000,
+    MST_FPGA_ICMD = 0x4000, // Unsupported
     MST_CABLE = 0x8000,
-    MST_FPGA_DRIVER = 0x10000,
+    MST_FPGA_DRIVER = 0x10000, // Unsupported
     MST_SOFTWARE = 0x20000,
     MST_DRIVER_CONF = 0x40000,
     MST_DRIVER_CR = 0x80000,
@@ -286,8 +286,8 @@ typedef enum Mdevs_t
     MDEVS_MLNX_OS = 0x800,      /* access by CmdIf in MlnxOS */
     MDEVS_FWCTX = 0x900,        /* access by func/context (like UEFI) */
     MDEVS_LPC = 0x1000,         /* Access LPC region */
-    MDEVS_FPGA = 0x2000,        /* Access LPC region */
-    MDEVS_FPGA_NEWTON = 0x4000, /* Access LPC region */
+    MDEVS_FPGA = 0x2000,        /* Access LPC region - DEPRECATED */
+    MDEVS_FPGA_NEWTON = 0x4000, /* Access LPC region - DEPRECATED */
     MDEVS_CABLE = 0x8000,
     MDEVS_SOFTWARE = 0x10000, /* Software system char dev */
     MDEVS_LINKX_CHIP = 0x200000,
diff --git a/libmfa/mfa.c b/libmfa/mfa.c
index 4ff3bac1..ebc87583 100644
--- a/libmfa/mfa.c
+++ b/libmfa/mfa.c
@@ -307,6 +307,10 @@ int mfa_read_map(struct mfa_desc* mfa_d)
     mfa_d->map = buf;
 
 clean_up:
+    if (res < 0)
+    {
+        free(buf);
+    }
     return res;
 }
 
@@ -330,6 +334,10 @@ int mfa_read_toc(struct mfa_desc* mfa_d)
     mfa_d->toc = buf;
 
 clean_up:
+    if (res < 0)
+    {
+        free(buf);
+    }
     return res;
 }
 
@@ -556,6 +564,7 @@ ssize_t mfa_get_image(mfa_desc* mfa_d, char* board_type_id, u_int8_t type, char*
             res = _ERR_STR(mfa_d, MFA_ERR_MEM_ALLOC, "Failed to allocate %u memory", (unsigned)total_size);
             goto clean_up;
         }
+        memset(*buffer, 0, total_size * sizeof(u_int8_t));
     }
 
     accum_size = 0;
diff --git a/mflash/mflash.c b/mflash/mflash.c
index 5b0aea16..87c433c9 100644
--- a/mflash/mflash.c
+++ b/mflash/mflash.c
@@ -379,7 +379,7 @@ int write_chunks(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data)
 
             if (mfl->opts[MFO_NO_VERIFY] == 0)
             {
-                u_int8_t verify_buffer[MAX_WRITE_BUFFER_SIZE];
+                u_int8_t verify_buffer[MAX_WRITE_BUFFER_SIZE] = {0};
                 rc = mfl->f_reset(mfl);
                 CHECK_RC(rc);
                 rc = mfl->f_read(mfl, addr, data_size, verify_buffer, false);
@@ -724,7 +724,7 @@ int get_flash_params(mflash* mfl, flash_params_t* flash_params, flash_info_t* fl
 
     for (spi_sel = 0; spi_sel < num_of_flashes; spi_sel++)
     {
-        int log2size;
+        int log2size = 0;
         u_int8_t no_flash = 0;
         const char* type_name;
         rc = set_bank(mfl, spi_sel);
@@ -916,7 +916,7 @@ int read_chunks(mflash* mfl, u_int32_t addr, u_int32_t len, u_int8_t* data, bool
     u_int32_t block_mask = 0;
 
     // TODO - Check MAX_WRITE_BUFFER_SIZE against block_size in open (or here)
-    u_int8_t tmp_buff[MAX_WRITE_BUFFER_SIZE];
+    u_int8_t tmp_buff[MAX_WRITE_BUFFER_SIZE] = {0};
 
     block_mask = ~(block_size - 1);
     u_int32_t perc = 0xffffffff;
@@ -1172,8 +1172,7 @@ int spi_update_num_of_banks(mflash* mfl, int prev_num_of_flashes)
     num_of_banks = spi_get_num_of_flashes(prev_num_of_flashes);
     if (num_of_banks == -1)
     {
-        if (IS_SIB(mfl->attr.hw_dev_id) || IS_SEN(mfl->attr.hw_dev_id) ||
-            IS_SIB2(mfl->attr.hw_dev_id))
+        if (IS_SIB(mfl->attr.hw_dev_id) || IS_SEN(mfl->attr.hw_dev_id) || IS_SIB2(mfl->attr.hw_dev_id))
         {
             mfl->opts[MFO_NUM_OF_BANKS] = 2;
         }
@@ -1576,12 +1575,6 @@ int connectib_flash_lock(mflash* mfl, int lock_state)
 
 #define SX_CS_SUPPORT_ADDR 0xF0420
 
-int sx_init_cs_support(mflash* mfl)
-{
-    (void)mfl;
-    return MFE_NOT_IMPLEMENTED;
-}
-
 #define HW_DEV_ID 0xf0014
 #define CX5_EFUSE_ADDR 0xf0c0c
 
@@ -1619,7 +1612,8 @@ int check_cache_replacement_guard(mflash* mfl, u_int8_t* needs_cache_replacement
         }
 
         // Read the Cache replacement offset and cmd fields
-        if (devid_t == DeviceQuantum2 || devid_t == DeviceSpectrum4 || devid_t == DeviceConnectX7)
+        if (devid_t == DeviceQuantum2 || devid_t == DeviceQuantum3 || devid_t == DeviceSpectrum4 ||
+            devid_t == DeviceConnectX7 || devid_t == DeviceConnectX8)
         {
             MREAD4(CACHE_REP_OFF_NEW_GW_ADDR, &data);
             off = data;
@@ -1753,7 +1747,7 @@ int gen6_flash_init_com(mflash* mfl, flash_params_t* flash_params)
 //
 // TODO: Unify fith ConnectX inif function
 
-int gen4_flash_init_com(mflash* mfl, flash_params_t* flash_params, u_int8_t init_cs_support)
+int gen4_flash_init_com(mflash* mfl, flash_params_t* flash_params)
 {
     int rc = 0;
     FLASH_ACCESS_DPRINTF(("gen4_flash_init_com(): Flash init to use direct-access\n"));
@@ -1771,14 +1765,6 @@ int gen4_flash_init_com(mflash* mfl, flash_params_t* flash_params, u_int8_t init
     mfl->f_sst_spi_block_write_ex = cntx_sst_spi_block_write_ex;
     mfl->f_st_spi_block_read_ex = cntx_st_spi_block_read_ex;
     mfl->f_spi_write_status_reg = cntx_spi_write_status_reg;
-
-    if (init_cs_support)
-    {
-        // Update the chip_select_support according to the banks number of cs.
-        rc = sx_init_cs_support(mfl);
-        CHECK_RC(rc);
-    }
-
     mfl->f_spi_status = cntx_st_spi_get_status;
     mfl->supp_sr_mod = 1;
     rc = st_spi_fill_attr(mfl, flash_params);
@@ -1818,7 +1804,7 @@ int is4_flash_init(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->opts[MFO_FW_ACCESS_TYPE_BY_MFILE] = ATBM_NO;
     mfl->f_lock = is4_flash_lock;
-    return gen4_flash_init_com(mfl, flash_params, 0);
+    return gen4_flash_init_com(mfl, flash_params);
 }
 
 static void flash_update_amos_gearbox_gw(mflash* mfl)
@@ -1835,7 +1821,7 @@ static void flash_update_amos_gearbox_gw(mflash* mfl)
 int sx_flash_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->f_lock = is4_flash_lock;
-    return gen4_flash_init_com(mfl, flash_params, 1);
+    return gen4_flash_init_com(mfl, flash_params);
 }
 
 int sixth_gen_init_direct_access(mflash* mfl, flash_params_t* flash_params)
@@ -1850,7 +1836,7 @@ int sixth_gen_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 int fifth_gen_init_direct_access(mflash* mfl, flash_params_t* flash_params)
 {
     mfl->f_lock = connectib_flash_lock;
-    return gen4_flash_init_com(mfl, flash_params, 0);
+    return gen4_flash_init_com(mfl, flash_params);
 }
 
 int sx_get_flash_info(mflash* mfl, flash_info_t* f_info, int* log2size, u_int8_t* no_flash)
@@ -2381,17 +2367,17 @@ int get_dev_info(mflash* mfl)
         // mgir.HWInfo.DEVID, mgir.HWInfo.hw_dev_id);
         if (rc)
         {
-            dev_id = SWITCH_IB_HW_ID;
+            dev_id = DeviceSwitchIB_HwId;
             mfl->attr.rev_id = 0;
-            mfl->attr.hw_dev_id = SWITCH_IB_HW_ID;
+            mfl->attr.hw_dev_id = DeviceSwitchIB_HwId;
         }
         else
         {
             dev_id = mgir.hw_info.hw_dev_id;
             if (dev_id == 0)
             {
-                dev_id = SWITCH_IB_HW_ID;
-                mfl->attr.hw_dev_id = SWITCH_IB_HW_ID;
+                dev_id = DeviceSwitchIB_HwId;
+                mfl->attr.hw_dev_id = DeviceSwitchIB_HwId;
                 mfl->attr.rev_id = mgir.hw_info.device_hw_revision & 0xf;
             }
             else
@@ -2647,21 +2633,21 @@ bool force_flash_out_of_hold_state(mflash* mfl)
             case DeviceConnectX6:
             case DeviceConnectX6DX:
             {
-                gpio_toggle_conf_cx6 gpio_toggle_conf;
+                gpio_toggle_conf_cx6 gpio_toggle_conf = {0};
                 set_gpio_toggle_conf_cx6(&gpio_toggle_conf);
                 res = toggle_flash_io3_gpio_cx6(mfl->mf, gpio_toggle_conf);
                 break;
             }
             case DeviceBlueField2:
             {
-                gpio_toggle_conf_cx6 gpio_toggle_conf;
+                gpio_toggle_conf_cx6 gpio_toggle_conf = {0};
                 set_gpio_toggle_conf_bf2(&gpio_toggle_conf);
                 res = toggle_flash_io3_gpio_cx6(mfl->mf, gpio_toggle_conf);
                 break;
             }
             case DeviceConnectX7:
             {
-                gpio_toggle_conf_cx7 gpio_toggle_conf;
+                gpio_toggle_conf_cx7 gpio_toggle_conf = {0};
                 set_gpio_toggle_conf_cx7(&gpio_toggle_conf);
                 res = toggle_flash_io3_gpio_cx7(mfl->mf, gpio_toggle_conf);
                 break;
@@ -2724,10 +2710,6 @@ int mf_open_fw(mflash* mfl, flash_params_t* flash_params, int num_of_banks)
         {
             rc = cntx_flash_init(mfl, flash_params);
         }
-        else if (IS_IS4_FAMILY(mfl->attr.hw_dev_id))
-        {
-            rc = is4_flash_init(mfl, flash_params);
-        }
         else if (icmdif_supported)
         {
             if (!is7NmSuppported)
@@ -3190,9 +3172,9 @@ int mf_cr_write(mflash* mfl, u_int32_t cr_addr, u_int32_t data)
 int mf_set_reset_flash_on_warm_reboot(mflash* mfl)
 {
     int rc;
-    u_int32_t set_reset_bit_dword_addr;
+    u_int32_t set_reset_bit_dword_addr = 0;
     int set_reset_bit_offset;
-    u_int32_t set_reset_bit_dword;
+    u_int32_t set_reset_bit_dword = 0;
     switch (mfl->dm_dev_id)
     {
         case DeviceConnectX3:
@@ -3202,8 +3184,11 @@ int mf_set_reset_flash_on_warm_reboot(mflash* mfl)
         case DeviceSwitchIB2:
         case DeviceQuantum:
         case DeviceQuantum2:
+        case DeviceQuantum3:
         case DeviceConnectX7:
         case DeviceBlueField3:
+        case DeviceConnectX8:
+        case DeviceBlueField4:
         case DeviceSpectrum4:
         case DeviceAbirGearBox:
             return MFE_OK;
@@ -3279,11 +3264,14 @@ int mf_update_boot_addr(mflash* mfl, u_int32_t boot_addr)
             break;
         case DeviceSpectrum4:
         case DeviceQuantum2:
+        case DeviceQuantum3:
             boot_cr_space_address = 0xf1000;
             offset_in_address = 0;
             break;
         case DeviceConnectX7:
         case DeviceBlueField3:
+        case DeviceConnectX8:
+        case DeviceBlueField4:
             boot_cr_space_address = 0xf2000;
             offset_in_address = 0;
             break;
diff --git a/mflash/mflash_dev_capability.c b/mflash/mflash_dev_capability.c
index 8c3e1063..6f6b558f 100644
--- a/mflash/mflash_dev_capability.c
+++ b/mflash/mflash_dev_capability.c
@@ -63,14 +63,17 @@ int is_four_byte_address_needed(mflash* mfl, MfError* status)
         case DeviceQuantum:
         case DeviceConnectX6:
         case DeviceConnectX7:
+        case DeviceConnectX8:
         case DeviceConnectX6DX:
         case DeviceConnectX6LX:
         case DeviceSpectrum2:
         case DeviceSpectrum3:
         case DeviceQuantum2:
+        case DeviceQuantum3:
         case DeviceSpectrum4:
         case DeviceBlueField2:
         case DeviceBlueField3:
+        case DeviceBlueField4:
         case DeviceGearBox:
         case DeviceGearBoxManager:
         case DeviceAbirGearBox:
@@ -135,9 +138,12 @@ int is_icmdif_supported(mflash* mfl, MfError* status, int* is7NmSuppported)
             *is7NmSuppported = 0;
             return 1;
         case DeviceQuantum2:
+        case DeviceQuantum3:
         case DeviceSpectrum4:
         case DeviceConnectX7:
+        case DeviceConnectX8:
         case DeviceBlueField3:
+        case DeviceBlueField4:
         case DeviceAbirGearBox:
             *is7NmSuppported = 1;
             return 1;
diff --git a/mflash/mflash_gw.c b/mflash/mflash_gw.c
index d8d5207a..f296700d 100644
--- a/mflash/mflash_gw.c
+++ b/mflash/mflash_gw.c
@@ -385,7 +385,7 @@ int cntx_st_spi_block_write_ex(mflash* mfl,
     u_int32_t offs = 0;
     u_int32_t gw_cmd = 0;
     u_int32_t gw_addr = 0;
-    u_int32_t buff[4];
+    u_int32_t buff[4] = {0};
 
     if (blk_addr & ((u_int32_t)mfl->attr.block_write - 1))
     {
diff --git a/mflash/mflash_pack_layer.h b/mflash/mflash_pack_layer.h
index 26357958..e9539145 100644
--- a/mflash/mflash_pack_layer.h
+++ b/mflash/mflash_pack_layer.h
@@ -82,8 +82,6 @@ typedef void* trm_ctx;
 #define MFLASH_ERR_STR_SIZE 4
 #endif
 
-#define IS4_HW_ID 0x1b3
-#define CONNECTX_HW_ID 0x190
 #define CX3_PRO_HW_ID 0x1F7
 #define CX3_HW_ID 0x1F5
 #define CX4_HW_ID 0x209
@@ -91,10 +89,13 @@ typedef void* trm_ctx;
 #define CX5_HW_ID 0x20d
 #define CX6_HW_ID 0x20f
 #define CX7_HW_ID 0x218
+#define CX8_HW_ID 0x21e
 #define CX6DX_HW_ID 0x212
 #define CX6LX_HW_ID 0x216
 #define BLUEFIELD_HW_ID 0x211
 #define BLUEFIELD2_HW_ID 0x214
+#define BLUEFIELD3_HW_ID 0x21c
+#define BLUEFIELD4_HW_ID 0x220
 #define CONNECT_IB_HW_ID 0x1FF
 #define SWITCH_IB_HW_ID 0x247
 #define SPECTRUM_HW_ID 0x249
@@ -103,15 +104,14 @@ typedef void* trm_ctx;
 #define SPECTRUM2_HW_ID 0x24e
 #define SPECTRUM3_HW_ID 0x250
 #define QUANTUM2_HW_ID 0x257
+#define QUANTUM3_HW_ID 0x25b
 #define SPECTRUM4_HW_ID 0x254
 #define INBAND_MAX_REG_SIZE 44
 
 /*
  * Device IDs Macros:
  */
-#define IS_CONNECTX_4TH_GEN_FAMILY(dev_id) \
-    (((dev_id) == CONNECTX_HW_ID) || ((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID))
-#define IS_IS4_FAMILY(dev_id) (((dev_id) == IS4_HW_ID))
+#define IS_CONNECTX_4TH_GEN_FAMILY(dev_id) (((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID))
 #define IS_SIB(dev_id) ((dev_id) == SWITCH_IB_HW_ID)
 #define IS_SIB2(dev_id) ((dev_id) == SWITCH_IB2_HW_ID)
 #define IS_SEN(dev_id) ((dev_id) == SPECTRUM_HW_ID)
@@ -121,6 +121,7 @@ typedef void* trm_ctx;
 #define IS_CONNECTX4LX(dev_id) ((dev_id) == CX4LX_HW_ID)
 #define IS_CONNECTX5(dev_id) ((dev_id) == CX5_HW_ID)
 #define IS_CONNECTX7(dev_id) ((dev_id) == CX7_HW_ID)
+#define IS_CONNECTX8(dev_id) ((dev_id) == CX8_HW_ID)
 #define IS_CONNECTX6(dev_id) ((dev_id) == CX6_HW_ID)
 #define IS_CONNECTX6DX(dev_id) ((dev_id) == CX6DX_HW_ID)
 #define IS_CONNECTX6LX(dev_id) ((dev_id) == CX6LX_HW_ID)
@@ -130,7 +131,9 @@ typedef void* trm_ctx;
 #define IS_BLUEFEILD(dev_id) ((dev_id) == BLUEFIELD_HW_ID)
 #define IS_BLUEFEILD2(dev_id) ((dev_id) == BLUEFIELD2_HW_ID)
 #define IS_BLUEFEILD3(dev_id) ((dev_id) == BLUEFIELD3_HW_ID)
+#define IS_BLUEFEILD4(dev_id) ((dev_id) == BLUEFIELD4_HW_ID)
 #define IS_QUANTUM2(dev_id) ((dev_id) == QUANTUM2_HW_ID)
+#define IS_QUANTUM3(dev_id) ((dev_id) == QUANTUM3_HW_ID)
 #define IS_SPECTRUM4(dev_id) ((dev_id) == SPECTRUM4_HW_ID)
 
 #define HAS_TOOLS_CMDIF(dev_id) ((((dev_id) == CX3_HW_ID) || ((dev_id) == CX3_PRO_HW_ID)))
diff --git a/mft_utils/hsmclient/inc/hsmlunaclient.h b/mft_utils/hsmclient/inc/hsmlunaclient.h
index 114506d7..49ba6086 100644
--- a/mft_utils/hsmclient/inc/hsmlunaclient.h
+++ b/mft_utils/hsmclient/inc/hsmlunaclient.h
@@ -99,6 +99,7 @@ class HSMLunaClient
         LibHandle(NULL),
         P11Functions(NULL),
         SfntFunctions(NULL),
+        m_hSession(0),
         hSymKey(0),
         m_ckSlot(0xffff),
         pLibraryPath("/usr/safenet/lunaclient/lib"),
diff --git a/mft_utils/hsmclient/src/burnprivatekey.cpp b/mft_utils/hsmclient/src/burnprivatekey.cpp
index e7ef57fb..e55cf042 100644
--- a/mft_utils/hsmclient/src/burnprivatekey.cpp
+++ b/mft_utils/hsmclient/src/burnprivatekey.cpp
@@ -42,7 +42,7 @@ CK_RV HSMLunaClient::CreatePublicKey(string publicKeyLabel, unsigned char* Publi
     CK_BBOOL bTrue = 1;
     CK_BBOOL bSign = bTrue, bToken = bTrue, bPrivate = bTrue, bDecrypt = bTrue, bWrap = bTrue;
     // CK_BBOOL bToken = bTrue, bDecrypt = bTrue, bSign = bTrue, bWrap = bTrue;
-    CK_OBJECT_HANDLE hPublicRSAKey;
+    CK_OBJECT_HANDLE hPublicRSAKey = 0;
     CK_RV rv = CKR_TOKEN_NOT_PRESENT;
     unsigned int publicLabelSize = publicKeyLabel.size() + 1;
     CK_BYTE* pLabelPub = new CK_BYTE[publicLabelSize];
@@ -135,7 +135,7 @@ CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabe
 {
     protectedInfo_T protectedInfo;
     CK_RV rv = CKR_TOKEN_NOT_PRESENT;
-    CK_OBJECT_HANDLE hPrivateRSAKey;
+    CK_OBJECT_HANDLE hPrivateRSAKey = 0;
     char* pbWrappedKey;
     unsigned long ulWrappedKeySize;
     CK_OBJECT_CLASS privateKey = CKO_PRIVATE_KEY;
@@ -203,6 +203,7 @@ CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabe
                 "Error 0x"
              << hex << rv;
         cout << " generating the DES3 Key.\n";
+        delete[] pLabelPub;
         return -11;
     }
 
@@ -276,6 +277,7 @@ CK_RV HSMLunaClient::BurnPrivateKey(string privateKeyLabel, string publicKeyLabe
     if (rv != CKR_OK)
     {
         cout << "C_UnwrapKey FAILED...rv = " << hex << rv << endl;
+        delete[] pEncryptedData;
         return -1;
     }
     else
diff --git a/mft_utils/hsmclient/src/hex64.cpp b/mft_utils/hsmclient/src/hex64.cpp
index 0606ba36..eea51d9e 100644
--- a/mft_utils/hsmclient/src/hex64.cpp
+++ b/mft_utils/hsmclient/src/hex64.cpp
@@ -33,7 +33,6 @@
 #include "hex64.h"
 #include <stdio.h>
 #include <string.h>
-#include <stdlib.h>
 using namespace std;
 static const char* base64_chars[2] = {"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
                                       "abcdefghijklmnopqrstuvwxyz"
diff --git a/mft_utils/hsmclient/src/hsmcreatersasignature.cpp b/mft_utils/hsmclient/src/hsmcreatersasignature.cpp
index 885c400a..3cbf1428 100644
--- a/mft_utils/hsmclient/src/hsmcreatersasignature.cpp
+++ b/mft_utils/hsmclient/src/hsmcreatersasignature.cpp
@@ -112,6 +112,7 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector<CK_BYTE> data,
         return rv;
     }
     signature = new CK_BYTE[signatureLength];
+    memset(signature, 0, signatureLength * sizeof(CK_BYTE));
     rv = P11Functions->C_Sign(m_hSession, &data[0], dataLength, signature, &signatureLength);
     if (rv != CKR_OK)
     {
@@ -148,6 +149,7 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector<CK_BYTE> data,
             if (rv != CKR_OK)
             {
                 delete[] pPublicLabel;
+                delete[] pLabel;
                 return rv;
             }
             rv = P11Functions->C_FindObjects(m_hSession, handles, MAX_NUM_OF_HANDLES, &numHandles);
@@ -160,6 +162,7 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector<CK_BYTE> data,
         if (numHandles == 0)
         {
             cout << "Public key not found!" << endl;
+            delete[] pPublicLabel;
             return CKR_FUNCTION_FAILED;
         }
         pub_key = handles[0];
@@ -169,6 +172,7 @@ CK_RV HSMLunaClient::RSA_CreateSignature(vector<CK_BYTE> data,
         if (rv != CKR_OK)
         {
             cout << "Signature C_VerifyInit failed. Error is " << hex << rv << endl;
+            delete[] signature;
             return rv;
         }
         rv = P11Functions->C_Verify(m_hSession, &data[0], dataLength, signature, signatureLength);
@@ -256,6 +260,7 @@ CK_RV HSMLunaClient::RSA_EncryptDataTest(string privateKeyLabel, string publicKe
             return rv;
         }
         CK_BYTE* decipher = new CK_BYTE[decipher_len];
+        memset(decipher, 0, decipher_len * sizeof(CK_BYTE));
         rv = P11Functions->C_Decrypt(m_hSession, cipher, cipher_len, decipher, &decipher_len);
         if (rv != CKR_OK)
         {
@@ -266,6 +271,7 @@ CK_RV HSMLunaClient::RSA_EncryptDataTest(string privateKeyLabel, string publicKe
         if (rv != CKR_OK)
         {
             cout << "C_DestroyObject public " << hex << rv << endl;
+            delete[] decipher;
             return rv;
         }
 
diff --git a/mft_utils/hsmclient/src/hsmlunaclientinit.cpp b/mft_utils/hsmclient/src/hsmlunaclientinit.cpp
index 58c8e7e1..38a91530 100644
--- a/mft_utils/hsmclient/src/hsmlunaclientinit.cpp
+++ b/mft_utils/hsmclient/src/hsmlunaclientinit.cpp
@@ -151,15 +151,19 @@ CK_RV HSMLunaClient::FindFirstSlot(CK_SLOT_ID& pckSlot)
         }
     }
     pSlotList = (CK_SLOT_ID_PTR) new CK_SLOT_ID[ulCount * sizeof(CK_SLOT_ID)];
+
     if (pSlotList == NULL)
     {
         printf("Memory allocation error. ulCount = %u\n", (unsigned int)ulCount);
         return retCode;
     }
+    memset(pSlotList, 0, ulCount * sizeof(CK_SLOT_ID) * sizeof(CK_SLOT_ID));
+
 
     retCode = P11Functions->C_GetSlotList(CK_TRUE, pSlotList, &ulCount);
     if (retCode != CKR_OK)
     {
+        delete[] pSlotList;
         return retCode;
     }
     pckSlot = pSlotList[0];
diff --git a/mlxarchive/mlxarchive_mfa2_builder.cpp b/mlxarchive/mlxarchive_mfa2_builder.cpp
index 2266cf8a..34558c33 100644
--- a/mlxarchive/mlxarchive_mfa2_builder.cpp
+++ b/mlxarchive/mlxarchive_mfa2_builder.cpp
@@ -75,7 +75,8 @@ FWDirectoryBuilder::FWDirectoryBuilder(const string& version, string directory)
         {
             fprintf(
               stderr,
-              "Exception: '%s' was catched.\nPlease try to add the following line into your /etc/profile file and retry:\nexport LC_ALL=C; unset LANGUAGE\n"
+              "Exception: '%s' was catched.\nPlease try to add the following line into your /etc/profile file and "
+              "retry:\nexport LC_ALL=C; unset LANGUAGE\n"
               "Please note, you need to reload the .profile file, after editing. \nsource /etc/profile might help.\n",
               e.what());
             exit(1);
diff --git a/mlxarchive/mlxarchive_mfa2_descriptor.cpp b/mlxarchive/mlxarchive_mfa2_descriptor.cpp
index 54d4a83b..c5da1510 100644
--- a/mlxarchive/mlxarchive_mfa2_descriptor.cpp
+++ b/mlxarchive/mlxarchive_mfa2_descriptor.cpp
@@ -113,6 +113,7 @@ PackageDescriptor::PackageDescriptor(u_int16_t deviceDescriptorsCount,
     _deviceDescriptorsCount(deviceDescriptorsCount),
     _componentsCount(componentsCount),
     _version(version),
+    _componentsBlockOffset(0x0),
     _componentsBlockArchiveSize(0x0),
     _componentsBlockSize(0x0),
     _SHA256Extension(SHA256Extension::SHA256Scope_All),
diff --git a/mlxarchive/mlxarchive_mfa2_extension.cpp b/mlxarchive/mlxarchive_mfa2_extension.cpp
index 16864ab9..e56711ff 100644
--- a/mlxarchive/mlxarchive_mfa2_extension.cpp
+++ b/mlxarchive/mlxarchive_mfa2_extension.cpp
@@ -181,14 +181,14 @@ string VersionExtension::getVersion(bool pad_sub_minor) const
 
 string VersionExtension::getDateAndTime() const
 {
-    tm tm_obj;
+    tm tm_obj = tm();
     tm_obj.tm_sec = _seconds;
     tm_obj.tm_min = _minutes;
     tm_obj.tm_hour = _hours;
     tm_obj.tm_mday = _day;
     tm_obj.tm_mon = _month;
     tm_obj.tm_year = _year - 1900;
-    char buffer[64];
+    char buffer[64] = {0};
     strftime(buffer, 64, "%Y-%m-%d %H:%M:%S", &tm_obj);
     return string(buffer);
 }
diff --git a/mlxconfig/mlxcfg_generic_commander.cpp b/mlxconfig/mlxcfg_generic_commander.cpp
index 9035d5eb..b53cb50c 100644
--- a/mlxconfig/mlxcfg_generic_commander.cpp
+++ b/mlxconfig/mlxcfg_generic_commander.cpp
@@ -37,13 +37,13 @@
  *      Author: ahmads
  */
 
-#include <set>
-#include <mtcr.h>
-#include <mft_sig_handler.h>
-#include <tools_dev_types.h>
-#include <mft_utils.h>
 #include <algorithm>
 #include <memory>
+#include <mft_sig_handler.h>
+#include <mft_utils.h>
+#include <mtcr.h>
+#include <set>
+#include <tools_dev_types.h>
 
 #if !defined(NO_OPEN_SSL)
 #include <mlxsign_lib/mlxsign_lib.h>
@@ -51,11 +51,11 @@
 #include <mlxsign_lib/mlxsign_openssl_engine.h>
 #endif
 #endif
+#include "mlxcfg_expression.h"
 #include "mlxcfg_generic_commander.h"
-#include "mlxcfg_utils.h"
-#include "mlxcfg_tlv.h"
 #include "mlxcfg_status.h"
-#include "mlxcfg_expression.h"
+#include "mlxcfg_tlv.h"
+#include "mlxcfg_utils.h"
 
 #if !defined(DISABLE_XML2)
 #include <libxml/parser.h>
diff --git a/mlxconfig/mlxcfg_generic_commander.h b/mlxconfig/mlxcfg_generic_commander.h
index 1016d3c9..4e4c1d27 100644
--- a/mlxconfig/mlxcfg_generic_commander.h
+++ b/mlxconfig/mlxcfg_generic_commander.h
@@ -89,7 +89,7 @@ class GenericCommander : public Commander
     void getConfigViews(std::vector<TLVConfView>& confs, const std::string& configName = "");
 
     void genTLVsList(vector<string>& tlvs);
-    void genXMLTemplate(vector<string> tlvs, string& xml, bool allAttrs);
+    void genXMLTemplate(vector<string> tlvs, string& xmlTemplate, bool allAttrs);
     void XML2TLVConf(const string& xmlContent, vector<TLVConf*>& tlvs);
     void binTLV2XML(const vector<u_int32_t>& binTLV, string& xml);
     void binTLV2TLVConf(const vector<u_int32_t>& binTLV, TLVConf*& tlv);
diff --git a/mlxconfig/mlxcfg_param_lib.cpp b/mlxconfig/mlxcfg_param_lib.cpp
index eccb0586..9abc3315 100644
--- a/mlxconfig/mlxcfg_param_lib.cpp
+++ b/mlxconfig/mlxcfg_param_lib.cpp
@@ -1611,7 +1611,7 @@ bool VpiParams4thGen::hardLimitCheck()
     {
         if (_phyType < 1 || _phyType > 3)
         {
-            errmsg("illegal Phy Type value (shold be 1|2|3)");
+            errmsg("illegal Phy Type value (should be 1|2|3)");
             return false;
         }
 
diff --git a/mlxconfig/mlxcfg_view.h b/mlxconfig/mlxcfg_view.h
index a3b4eb6b..22cb36d5 100644
--- a/mlxconfig/mlxcfg_view.h
+++ b/mlxconfig/mlxcfg_view.h
@@ -83,6 +83,7 @@ typedef struct ParamView
         type(BOOLEAN_TYPE),
         val(MLXCFG_UNKNOWN),
         port(0),
+        module(-1),
         strVal(""),
         setVal(""),
         rule(""),
diff --git a/mlxconfig/mlxconfig_dbs/mlxconfig_host.db b/mlxconfig/mlxconfig_dbs/mlxconfig_host.db
index e9cd7cd6955d9d18a8c4081b0745e4855db3d053..f1077d6070c612ca4d13cc6c3962f6e881ece7a7 100644
GIT binary patch
delta 26629
zcmb5X2Ygh;_da~jnVU^W0tC|grV&Cq9YPB!5J@A2Ca{DQh@_E(DiAiiK~bc*kii0i
zz0s9bY}geWsGz7Q*b#dd1>R@wQmo(q@8y%v*?Z^C+&lHmInOy~SpHCt<-hh=8|o%B
zjUv~XNA?g}@`nj-8vf~uXkDC9#d;j?G0&bu*Xv#szQ<dCL4<i*15l!iwF|O*yA0&z
zCXffFfHXV4bq^)?J>DLhg#LJp$dl_n;?O-WcxCD0QE}S!KBu`#9H4|pZ0^jnwXPi9
z10@fO4Wd7v;+J_W*K@Q8;h#jY_>k9&ZO*7a#5tm$<;HtOl-m!;TrWqy#i3m{^FGa}
z?#Iz$jQp;v?kAJG>0WN9k>v*Yh@S|{*)J+IF+z;cdLr%OKiq5D^bj$KGqbYFOESxH
zEM=1{rCDQhvdi;xO0*C0I0ya09FHrfY&%Kjsb|sXp8g`4^Gk{>`9)(aWqAcTMdf8_
zv>urfRCekRbN~7!JkhkJp<)OZXXRN&mzNH(l;o6_mE>iWSu#tD3uveiTeVony6!RI
zz11tUE#iIgzUFNd)NrL~FQOk=en;#lAK5{kzEtFT=%Q+<u997+ad7uljB65y)q`8a
z;Y+=J2ld|EOYaxY^%V;(O%;`Ms#`5}wKdhPwe{5v^DVVAEmf74%EpEoHti16!v+Rx
zSE1S3G4j@~qJC6Ct7#{_OTVxm_vK=4;f?$le<`|%-eQcX7FUT|#FOG<G@`&UYH%ur
zJ5~>lGkut%=ftsmw2FGWYhU%!2gR`5GF10>oEhxJ!qee7B$+;U3?7o?enXTVna&mR
zl>r>$K{xf$`=#P8yqseq=$2637tflTP|xPZdP`OH%z3jcb=C8$>-bKGbx0@+ax@JN
zCqKvLArG4>!t|Ipa=f}B(9t?{S#ZxlJv54EHrCWzsvFL~p|+ux>KtAfQMAI5oDof%
z9K{)-saJWT)BLqZHT?ZZp){ImX)W!eW9-H$Je8O7R(_tp5rHB@REU+1w5o-UE!_hg
zTQdexo8xFkFH>+YJ-#2yCqHI0bBN>6uwE4E_!TtF5ji}8UU%dTkES;qb;IN7Rmb|_
zy=kB0vEj*d*l}vOnO=5ykBFf|j<gXsP>SQgh&Vdn_;y6RDJ?-y#!FMyaEuqd9IHnS
z;F<GU(qz=96vCA3m^Ct<Ufey(<kxeoMq{ao)}ziJvNxymWJkoXJ&xjGOWor21oaL(
zM=`zRcyDA3^^rRoInMN4ydFP*rR7P&lO)F#<q4)2jBm)b4^aeDg5%-xczV`xqCD0!
z(Rd3!p6)m?D}tVPq)dqM92lp^^;0$K>sU82%=2~Qea7vss(8oU6Qbx%$AJm4j)>|m
zj$bB3nhv?%{^~mv;kcsO(~&(f(({cNJ<@1ZKgW&{A=G#GB$Ic_Hci{69VZX!kJ-1D
z9;dH3goj}qtb8}W#^*$k=qJiWi*Ses#8F4)utjqJHQd+qO}w6%&T>bJYU|Z9^jiKz
zo@?M_N81vNitgCD<f#zfAl)~St11>@Le$jORa<JSEcJB_3+X|}(xoBvm}BG8D7xIS
zZ)rG<aJ;=V(lpYn$H%igu~Y=QsYT-M2woOTTOA{o#dqzBX(OmW6W59Wl0AaNFtAIV
zge|vx&(MbFh+E1W*Ubr&56$5SxnUiJIO^uy=wa9RMk>+lsQCOnQFQ?<+AAmQ*;89d
z9_ocXv?-dyqbX8ctxdtIO5>y+j%%BeIN8T>c~kNpXH$V!|6uJt4Sz3br^t&EsgUN<
zHS{RfXgKGCgI>q?@l*VPa1(t*u4q8@wu_hLsAt%WX<O<RsmGy3kN?O)9u*vZ@h;e%
zd%127o;DsuUc3ut?(LZKm|0YC1b(9_-m&_zpuqX*dTJ)muBdHps%@}TRkT)E>KZHO
z$esH*Q0{z|^}z3j>RBWICCBCmIL4iRiqqpUU=3~*>3Hd}@wCVh{&*x+I)*<U9^M|H
z2S@Sj+S<P^-i9zeIGLq&qX=NW#j)n`I8$q^J|K#vIh-ThX<n!vgPT#_?9Wu;`1$d8
zn&F6eB8(O~GM<R0nU3jCgj1Dc$rC|g3qtfL*B9nD{p~B$b}!e1lKiy$HT-=*K9oZ?
zIzS(@hN(4zXYjSWoe%P_!e0y)GsJ4~7zT5R<CQ1+$+zn{-L1c#(~sn?Rl?V?{q1n`
za6K!BXE(Ms)q#D@uWfFvZM3vDS2VQL;;NydPVR`I;5f`K^2pUEX8o_Mj_=L{%12|U
zJ9#-?dOJ9LU#RY%iURYR|1_cJS2t8OHq%oMI%<yS2Cf*xvzsa_Ewv4;uHL+G2Od1~
zXcWzLR2=O?^Bk*=X0dR0G`t;;se0%r*lQQZxVNLh#J)b-%Uzg~^)cw%4+iPs(rc;k
zbQi%XdO{{k&+XjXoxUBdmyTq4bO*;cZh9w#e%pPsuIr1akLL9Dp`L`f=d)+n)~-Y!
zJBn}Z-==+M?0MfCn<pC-GZq`EZcsOanhfe`P%nde8#KV6fd&mSXs|&;3>s_DID_^w
zXuLs<U6#s?Ye$#cesR5hxs2#Rfn?u(yB?I{ua#@~Tc+Kv?bp7i02)Y@bR9iS-*F_w
zlLp?*ukddoT{MfW;&rum%j7HgW|Mo29)r33-2jT9J)N~2Np|PgS8xxa$#P#4`0bQb
zz26X)*Dj<4FYWgfJ$(o_%&)JObBROc7AtjO?X=u_nMj1N^U7snpgYkhec~XNVOLR{
zOdTfzOq`<kL&DB$u&a_OO&^3C%eB<Ui`<g+)bsDl)Hy_UvyrKDoN(K{Uk~clgDN#N
zLej%@gwApwF6CvsjSukG!b=Pljo=Tv#F0HcW)C69C-3y59~{B&M$u$P#=Bwkv}4k{
z@s#OU{%)CRWgk5qP24t`W0@SXp^j5%r~Gy{h0z1DYc0jlNts@Yy9Z@qEv3-=a%nAi
z_&aiUEoGXf#_EZQEJKEf2<B-r_zFs(>AT-EnNuv9b}e?^uPBlx(F%HiKH^}`<tkpq
z+cXQ-*^k03@<o$aE1cp3ba|qq=8ryJ!aGeLaK6z|n<?CAwBpgEIUf8Y&GbjQJ_sGY
z%u0!@opl7A8BAv!<Ig0M?q~!3#j)*73jOAI@5}%aj-F=|nb|S&Y&Zourkx#YS`w|N
zLTFiQ*29>8bKH40n$hS3XZtW~j-Ssan$E@O@!&*jYru4Amm~LFBsm;4=L+dz$Ajn0
z^w9&P`{)a3pyu@Pp>AsSn_W|Pg)#lEl7&6!C3;-?^`sa%yeHk<_JQ%>xIs@C^h1Mw
zWYCWd`h`JH8T3noer3?F4f>Noe>UhZ2L08bzZvwjL4P;s9|k?EC>v{!J>(U>)EQx<
zL>n~5pvGEaV=Zy7y?&&7n|!oYnzl-Mn5i8TZxH50Q#|?0Vxpez+P(etF{wsMfP5&7
zg5+0bvd}tN5Je;DUU{ARxnI5#MI-d>dHP&=Fp3i7;Ajfhw_UuwcP581-6yw1Qy;oc
zz7&nwv{s&urX*9B{`zo?YH}W>$SE<{_`IDj$55xQ$r`OEBtX(>5@GJVJYG-5;LMmQ
zqL}B)?Sm+d7K3w<nNI8-Os7I)e0;Iez%%O`tL8xrXlbgeZS7%f=-M2OpJq304rbak
z-4<Y-;Y=>4P8whxYPIxCj}H#?Z_$R&>1zD*@MvzeG&QwY8t1h_KCP*kSJ#TSHZ?A&
zZZ@Q9xiyabWYcV+*PB~sSDTBAOD#|w%nNGk>dZ5%%@vicweu@ltE<e74Q8X5d0taV
znMLKxDa;(5pObAVDl9IVm{U?-+&lKtyDOSf{`qN3%e<zh#%8?E`NRaQBbw>FZ8De`
zRXF!eQBqyCJUW%WqAL0PG`fi@ot4vR5YsH@O*5#5sm95bq*G9cCQLkyUWaV+x)uVV
z1plo4t@ZMrD%wkRaz-^>Nps|T)zseG-Fk&@P8>SL>h8)2`ft4=iyJ6JI?Fh?pV1mi
zR#9Q@zcj&I+hU%Yp%jwZS@W7JX4X|(<E*u^qK59K+0t_s{oGRxlN<IGv5L>4n)g#5
zFs~pIZPsSFwVv8(u8eJf*3u*oH_(<YjlKm&{oLeh(<n;b(nu9zuC+n-ucEnqmFOR!
zfdx4X78FYb)J(U~3-lwn+*oepoA^ooO!$f+VkQ{n1DZt^ALnGb^cyHg@5wvgqIhN@
zUwezvWl22`a_g-R$0m8KPz1?$N`xo#74oYu!FYd=&wK?I*)Bi-ih9vT+5Kx8kKw5J
zn&M3LiFziO%{Nm-h@3N&y{TEH2gq?#L^pSC=&dJXjm^#EXr}d&zoFi=K_=qI)aiP(
zB}YAya@RK$)6F%Bn>AidqqJt(V<A<G%dGR{=X2>5YIW{yrprigZ?LvF)9R>!I$KHK
zqi-2Tz1Y|u+0bUWkFod@4Vq-oWP_&2oOzT`pKsh07_`u!MFuT3XqiEceU>K}*Aopo
z$)K|gI@_SN2ED?da}3&S&=!NX8g!m~Z5{=-Ei-PG8`Nr0gOl=A#`V<(U1`v340^3W
z*BErILDv~{y+Jn^w9}x{pf?+Ii$NbY=sttKWYE{;%K2m~KWW?;T$oQ8*9I46gA234
zh4~vJ{ab??G7cLu4*y`J{Af^vQ?tRT`4?HSfWq6ls|Uizpgj!Q)1bZv^)slyK?4kG
z2tUFQeuN?X2t)W03e;f{X3%hh8q8Z5f{-u-Az_TPFh*MRQ4>bjJjVho;UtRC#)9z;
z)~zMhMbf;O4%0&C&x^?ubEcbhfzz*vAk)m3z2?&6om<G{d4nbrcrvZfZh#EDQn%Jx
zm&)vR`jVE&bQ`^<Tl1|~%0&z5H89}3Mf8TT;{3IzHK;AMw2B_2&)5^t!c^^PUcq<q
zAwW_ei)1kc+x>2=vF_rqBfV^$n^_N6^3`)dhxj3xwhTMNjWVK*V#3yh=#eqp+*ny{
zscdbo1B;wpS>b{-R>>=uP>pF#x}J$W>FP30G|?T{C=%s$ODRGQTuN<)i7`C4u>}J8
zyp~o=ODlLW-k?$pP^2b79~t%c442sKg{&1#JSRoZ#0IqA1B>`^AGL5tCF#SFva+k_
z#XMYIzKoLGJ{_Q!#!1UE@Io-e0M@>fk1wMraF655DB6@}03b4X0>=i>t*(*r(L`?!
zCyVCOKCYddzjS~{al0mSucCc=ySuf`S+N}BL(62HmEP>MlgaB7P0Zj|IUn$p%zTC;
zrFkmt6^ZR8x#=3(PHr;)T6#dVwd-=U9sE+rXYI6(SWfJqo6ir>Ne!a!B=Gso^aOnZ
z^k*nrw3F10uLl0}4n*KoV086jop?~Zg#mKPv8yPSB4zz5ibvN*tVW~8%2BH+n)<7s
z2)DVF4V)`itfrWZ^mzW~=5=Xr1M}BDFd(FV<}$j?q<s;mC#K3nt08ynUrlT1cUim!
zqUS@hehnn>{c_bBnqZn5rbi}_<5*fCndJV#V3HMq>bLPclbopWOZ0~}5feU7w?(yg
zaayjYt<={#uHC~oD@Sc=1GGHXPT$qT<Nu|?IYxdTC=bqJlU$xiUUF(by=&?DGUmn_
zb56m$sTp;~UjJw9&paWoq%5z<Tva{4wz9g#b!W*bD9_JCa-n5xQCV?*IUvW9%)-+4
z^mcdW?3I*GKCa2}wkGEBF`llyjX`+9$Hwhl{c=>z+Y2(sTVv$$%@pVyzLxw*j^9AZ
za@-~gaUVWBJz+_^w=7#nOVj+?y?Rc}GNc+X0^{HRZ0ZFSw43}X38IZ^Z_@wh8MU8Z
zluE4b?Vj?@b#&GF0m#s}f);5R7=UEGeQ3Ln^V;<^oT$5eaRYtqV+(EXcD^;UCSPcc
ze64^JoPTseP`T73`3K+=sc(dM;wvB7NN1?0^WhtSj!+Nhvp3SSBm#X4WYcYAmfLQ|
zqz;e?o9G>Hf8WfU(BN=uf>zK~bycW*_Z-CWg3ZuF{G4xYroQAkQ4?42W;$j}lQF7?
zL;u>tdnr&}b|<9RnzeLLI`>jHd2lOrmE-SG{rw<?c&Pri4sQ>UC$`f5F2TN8S%LUy
zwM@rg$lm8DUY@!Y%P>eb+(w=KgS0XYe;wL`+NaP<$I={Nu#W+KAWq|QUc~EoAAcf(
z#Q;$z7K!!ZVe!Gb%rIHD6DV=<Ya*2SQF(VWr_$3ZEzR^qn%*x1pvfx&+RNi|uS$C+
zT2F_ZvfW2X+BMR17e~`9nY;@+-3xN+F76d^AWV;o;(66IwLo=dwOqnsDl3}EF1M(x
zFUr?;aV$8`kGnV~*lHlI^BSuD2B$R2wB6jBHp|JoxsR!_pFSSK&e_Q#+7Na;S`3(X
zUbB2+Dfvf6=n430bFF1&V`HnOxw^GkVRZ`rRp9NF@`v3V8@AZMZsxTpA-mF5v!>?8
zS-7ERWWPOp8Euiv_OQA82QF#o@AE9edF|b5o`uU7?{Uquu)oeTHKt=))I7V_m}eJ;
zvQQ1Bk{P44QySnm6GXb9G>)#IC3HRALr>C2^c#2MIL_b_Kyg>|?feA4%Rh^rB2i?D
ziBPv!h?~W3aX=gsUt-N}m0K22FhFtn$N~y$`#eCTa%O&h(L_s0He}@T!m^x_Qog}Q
z#BgTWMV&xUgc!-0<z+<{mo#0PIU&cApI11}l3g^hkSltKI38V8RA$K@Jw{n9c&jpB
z{5i#vSyIe*s?Yr?RUUtn-Ggrr6zP9X9b?HJn^ioJ@8~?tQEhww@uuvO34E`gNc?M=
zykdUfZ?7L?$t#{PkRSZV8w#_F`R;#YE>thRPuXhzT*WPi*$XP<y2BjMB|B#VZ&M}~
z8S$V(NVcoYa_)BF&wQ6WdzeFMhYUHwA#M*DxwhV=fWzD5_#+$?==?`DO3RA*R=NBL
z`v>p-M<0}B6{AUe<n|*Rki7FBWy{foUH?oi$>V$EcSksI&}%(KysIJknOVh_?7UJw
z*iA&bl8VRWOy)OyAxjxeEy*b>nQX}_EaO)@Hv-m=l8@{JQ!_gs-ldpYr1RO`imAmZ
zruK+pY7c;^#ma;S=^d|_OH57f+5)b!>Rk~p3-*GiMLXZzOLq}?)&94!FE}28C_%mD
ziHE_K;xDl!@GN=k9TYmX4{WKIY<PsO@4TIKb2sgfrX2zxdKm!Ghv|Dx=4xn2M??=%
z0D0{N%;#-#;GHzW6gos7p2Zt>aX+Rax#Lb6Y$_a}56Hsc{6?uvm&u5`Xs|wMsGcdK
z?!rFOa2LgxCJxevAj@E#)7`1mmHz}Y^5@I>Ej*OU<k>%HsHr$Z&qTfoHy+?lC8PBs
z*G-UYGI6XsjUS|E0GBkM#wy-)2l;jWMkb~S^4l{sh{o-Gl=9suNftaw8z@mOdzk{9
zzdZ?757S8cCluiLcw~rN{v@QNPp{%`&c>(d7*UF|;92q|N_JK}M?W#8IVZjd(S}l;
ziw~e<3lvWX(#C4|s{x#~S9=czj1-zeiy%-ugA!)W=4QT`Uxy*78w?l~!Y=L?M_e23
zB^s_rCX%C|A&APIxBe`qlRR7pM7fVX9QL%RH=vZVw>-3vqrKQOS<i~&dO+{;yH`0%
zhYac=V-|4&jg|$Ac!24rFg+BI+t>3rfazhmWf4cvlk$m0;Mmv5j~8*W+YUn(u2>BF
zME}LSwDV<JO8uPZk+DR5jn0tAUI9}}cg>f*uhJr>fvyL+hwxy4eBxV7q{!DH&CA$#
zu&>(QprxH}LuMS}#2l+48Z6`9fxi0TG2}b+4qeGKOcoqN*JqsX`eW#N`Road)yE@s
z^!zb$b5?u+I~<L4<!~HVInq8sj`vRBqr+Vveegpt-t*Gxt*|0%XCZlx$2zzjitf(_
zTsxO<1eS9gxN?8&l`Yz>Vv{%mJ*CNU^oG9FYtMDdT1fA$r=~jwPmQHK$F_|Pbh{($
zhFBounKz_Ri=*j=NNRGdy&;0`aO}7tfubDVH_l8ptKp8+c4*pj+SlX_QFoNKgJ#ft
z*x>d6Jotcq=O7*cYs_r!ki9=An>_qEaG2lZmXoOD8TrCV3J>^AvCP5=1-X{u%&eRe
zOF>a~4%GPH@yw02NRcVeo}_^Ai6wbuIdo33mf}o^ikbP!j+|2ld`SC97JotG!`3O*
zdEUyLcG1dAX$H^31P(A!N|=BQu>T<nG*Pl~{p4|U=-MFeDnnpLk`H}B-aXPU7IvAa
z`$)?v4C<*bsHeQ*6!nnZPLX%-z87=R;6K^7FD1JQ50pDjQJ5?Y#+2QsK2aUaJ-z!~
zD%{_(BOp|6$17#$YvdyjoT9D-8wyJK^uLsCl+ldH4^a`%5LCDGBjk-&SCdYV4`Z5~
z3*rD8w)bPee3<-L#BWiiYs#8G1&fohK=P&SGtA6yVNc9)V$xO<Wy`ql)y(`!&CKuB
z%p5BVe!|QgbAD$2q?kgkYr2pAg+8Tm&V*k9X@h%B|Ba4Qo^#}B%*XY-iHbIC=Dl8p
zz8P7;5bb=mF*4H&R<QZRH+dBxRSA3-Q!~zjS5E{oN%_uKnI{mHI^%SRNK_&V-S}r3
z@60i=PE_o?%$)}kO_Ej*evBr{kzM!&FftEMzFsf)9hWKR-iASZ(37oTjf1>Uv_htM
zb1u!0^SpTqS>!=)o=($cYFDnNX>vnX9!FE<iLSuSE|(*_aT86EJG=26G}$?!J7*JQ
z!Gk?G$hilCAyKsxH~k2Bq3#Q9vQm!s<wBY%xA^jme6<FmVI|QH0=xIb8W;|Cw*a#0
zz4Sb!RRLZ#hAVhEZ-Cu)KflSJ^6#Rnhy#>XDrSi*#VWB`JR%N>kG1_+ldV48fz}om
z0sMpnlT*SQWl=B($ajOdr<@YZJ>=OS_U=9K(!3b^r@412*){ia<t@QzL5}(fh?tm{
zT{f1+{Ara8y7ZcC`E4+4Fq_ph4Gh6|9#L1FKd7mdC38bK!Y$7%u*2+dP^gKzz~RKW
z_LsMWa2Ily_k?f(VCr8&cmZ|D#!yalvq3s%$J|f+<epIWA7)n@dvUI%G}kgZv&2%G
zHzkMLl}LxQvZ6Aq=+aznQ!-oe*vS?{tSihJ!}E=G`o!fFn5dmF)<2%+=44rlCghZq
z<bhi(R5FDsV>q%DWR{NOMe@W{4vk!(hR2J_G%5pAdYRp^|19IZ`~zHKmWoG!m<}Xa
zaTaKNx!igd`(k%_^eklA5b1Z0hEcE_e~yM=U&b>(c?+~6EdHnQ#N>aOZb4@Z+eF!n
zRrN>#kATK=x`2n9e6#iOIV@k>h~n6Z!{xUH=%AjRe#p`&NBZ$t(a<wk`h-JK+3d$@
zR4-ri<0`6?{rwqwj$G=`#dL*yRo&IfzyQ7+m~V^vndO?6p9OF*b%ycHfS@*oVfN0G
z-NLzyT4iN8&!!gnayZ`r__QX1O8^5u9Kp9zlXGgMn#@b&A~P?63h}cUfYoAI9L0?U
z-+?GzPYY#vG#{V^PIC;`65C*?i{%^GMzU8N>`*pMJ`l%0P@BBF7w?3=GdZ3!X{qz3
zc&tjyfXNBG0}w-(K0Fd)LtY=gi*)&2AHIrhLM~3^6)9>oe6>$C%A(m&>u!WXz8{Va
zzI++C!@cB1Xb6GO4{F3s;vsBN>17W&iZ>=xZ^yEYDW>>XJs$Yg>H<B&UBtM+thJGp
z==kNvc#3vJ-joC@cm7RrZg~UsymZI5n}QsxZ<-5h%bg7zPkUvTOp%069+(MfQvl`3
z6bZmhteGO#^tEBDcC_tDmG5MVaMQAIJuZgj*15vZ6EF-fP0$BGhPZASN16;ri9MZ3
zyofyI;v{~Nx;V3wc_NXA^X3%(ouKq?OyhfDlgUcw`-r@p-}Hr@5!`y;0Dg$NJ6i^_
zi7;Ch58@S_!*~F+^nt_JU1{kfhBGu=e>pvqqh-K1<m;R?irolmI8ufZ?r#{)KQLJJ
zbvc|tn0ZFdkt*leT&P?W?ChGyIYdFu(#v=oorf4^Yn(@`wb_6ers(a_wlHV>c<8!;
z)<L$=o{{OmJ(g<2D=%1c3`e9enXO~LgVDz1lUY^K1Pe{IxdaxT+J;%O$3XUrn400T
zvZRz0W#w2hvonj!@}Pf}z_OE92-ZK41Hvkrp_nTB#U-@RJbbu0-PX?*;w&g(Ck42}
z^dJ_C9=r;+mU!(}Ex_twi;=6#`C5vWArsiH>=n?hAmLv&k@p5!$rkC`FI53kfJx8)
z^YAbnrg}>~0>b{mGVX~@psAcgM2#&%4l2fk4wqYtxxF)AH+kQpi7WXt?g|%_TflX%
z)2*qt-ty7Oyc;k?;}qTpdB4x)d_=eU*y7~8GIn6E>Qc_u32F+*Yx6bj4($=}{BL2^
zOoE^|4XW>rv<t?}4`DR%hB-8yhjS4)|9q&wH}MV>Sp}oHQi8jQ1o%)DiaAgg?gn!B
zn)npsVwNkXvOloHTc&bQQiQ?iO5kJ%X{R*DGNvT6c&uhsveNjXQovy4rDc}VGC1yW
zjT}A=miAF{+B5*9!{wFuaa(Ih3n_y*Ae7dqQYAUyr7)sdvc_f>j>+L0mFg^aRZ{RE
z?bC2Eod0zYAzjf;YQr#|W@TA2^T!lH5*u5<>7CO#xX+nCKP)cEE3z2uH%)PISDB*1
zvXY{FUL~`pbMKtNY7ZzW9%C6j89s-G1jhrsM6i)ICYy&E1@U}rW}d;$dB}y7g3L*-
zltFUmboQH+aq&T3q3gjgwGXJ5myN}n#}?&h^S}$=Q@)Dlzt`Vr?tfSpwGZT3R1{{j
zcnkOK^@;jOSw75_nA`=}vFLmC5x|g2R(07X`6k(B0dKut-fV$ZakG5V!hzj>@CF7|
zo&~o`^x<`KtDo?V7@a>ZuZW*geO8{6n`g<+84XNRxl)cU;3rj{;2zJrAkE#H@BsgB
z)pmmo-l|(i*plS-3Vss0TGLE^qe~y(X~qgDl94kYVpUf1Cf(X<OOVe@;vYw-SsJR%
z)3iIax3nK9T$_h&Y$6QBS3xg0VE8d+@&aDZyZ8<MLxhS^Fg3J_HR4|Jyy3?<NX~c$
z0NGn<dLC4+t<wNzPiY|U2<_WYJt~G<7PYii*ISxfm7VvZBh5)Uq8W<U7joS*fE;$q
zZO?GHX-}{o35+eXE7&|luuq=hzHpcbdY0qB=SDmWV~d}h^DMfrSzfK~zLyU^3!Zpd
zo>GZz(&IV&bjY~pfM?w#o1TOE<|EfUhmP(cUww`P;f`fi7r}!PLiEshZf&ug_XL`c
z%b67ob1W4c_g{}@a*B+29$$!6KOy~Qa&o91ZoH+wv7vP~n)j#IM5(bc!AgorTuUcu
zu=cU$0RLzcg|@yjxd!`ox?EO+tvF4-QG?wuRoZ6pQr$YtmLdaZ@Dsp7-<rWL^G|>_
zQ`79)R_z_A(6zLij=-}jOq&V5F_qi+4s3_NiN0bspt9S=(=x40q)GcijslkR@?s7P
ze|)e$Jd^8TYp=C5Rn`I}Y=H+9>_08DE1D&3<IrUKW{f^<<bUO<w#-zXYT)OtA~PQ0
z&=mSPSHJv!6lrK|a22!Ez~xOIe3nC!e;un^{!c}WnyJq){UT2;<``NnyI#o&(d!KK
zv!UwWoLujA8ND`b6Cv(=SA-r63s~Du5yX6-bX<vD?0&iTO3bEh^1UnZ#_e)z9j7_>
zr3rWHul#}iv|>>0P5i9Xb{mjHUudbT;Lh{|Aj)b89?!wJ9U{hwx#CW75WF~&x;yGJ
z`n$b`az2hVBV*lCaTVaWdSYC+SK(nCbioz0zoThngxgU(yu<NzO`MzZR=!tuUIY8_
z$G8k}R4<D+$}Vv<-q_bI4r#09sL>+P^AWrzB3aLg;m#C2K-MMeJ-m$F>{Nzc0oh~j
z8WAqPStGj2>#~Hm8$7I)o+^2;2j20OSq~f{do*x}yJcn~63mXBPlPLX^!OA#Bb6QB
zyp!PhBW?#J=@}4Q?inF^dBJj}QD~H&0Kdmk<q+bv<H)f?+744Xe5fI^Eq{x8DR1hj
z^3883F?WKi_cD>9eWGP*GqiT_lOuqFv%pC@vDbaa5fI(3;9K|&A;d`0A)Zp1|NL*h
z+_f0M<6fj~l24|K2=#&8vg;LWR*NYuQBOSYzEt!syaf(k0}0Y+F6(Z;;^`>Ik#h-M
zzQ$GFP`xx&9*luxUOSgBbNdo$pUWvr$n3Thmld+U&1i*oTp8WMyHvx>HV_Z0BwWH0
zRL{H?uMa@W!OHwPr%~5lXp*Mg^q-4;CilVfr{v~yoaTnX(&orp_He4(7r1;L?h_)>
zZ8a{>%2Dr%L7tK5zpj~jK^Du+4^W1Q)JV^jz0cBMw*p*VEteMZ5dR<-{}`q5LTvRf
zQ=7I9ZCuwq3H)QQOqtK)X^>n#pT7jWRKEba<^Z{G0q2@#*!uU3OO%1jxR;z$#Y6Re
zz5^2F(q)|Le7g!Ve&=%5yPLE(H2Anqg%nj!(VC-&c_#d=rknC@BYFm=%BBUdfZn{6
zVUF$Tn<^h$0L|q7CG07GSjuLgQGUyy8)rBdFXI(tDzXjj>7OX4+klDPHxD|>5c%Fb
zF6y+i-p!42G|`<O1*+pmIZ&bck!~Gl%aYf%^D8u3UT))301rECJl<4n8`U#3Ri@A9
zD7nOjk5w(fN*yV$S;AkrJXo|i4Z_tO5X6>iaqBXD#U$HUX<Gqh2LTP6p!xo^0@7Hn
zeDZqsm(O0s8M^ffTaHX#jZH6aIUk{Hr`ZZ-eBKhcUE}Z30I6-qwz*liR@?Gr=o<b+
zx6ZMRlc9G03a~|&4z2@iF~5U7sdGKM`BRJr)$ZTC$G3E!AlHo4V?9S+TJp;K`(63o
zNF7!WIaRrlA35(vevIIBJ<M^iDuLd1oUV$cA&$uEc+bOz(>J`r2gr2?l-qiSqpmvM
z^p@fGEl2)B;a-$`!I6BRawMk@9q*&ySi|`p1qV8!Mw;O=npP9*nRB5g0~Pb36ON@w
z9CImARqrFmftnZ^-FY)6M~UjYQn&Gb3H^d)`fB!-Ne+G!{ah^XUxj`ya`kh>b?E0p
zS3iG!9dy+K)yZFUZeiWWq*ZGoh2Nl0=z3rs)tIv5@q$V6$c=cxMAr+(-oy`yV%r4Q
zD`v07E6QEt^!Qpn3}j~gI%F<&Wj0;U521ElWS6zjOs2caytNr+rn$-_E1ojRHdW5r
zh*FokN*&#ZI!<wAzUKxW;WqhFqt4yHZ>q||{>d|e)f~AM<toot?KY!oGtXD;W|XYB
zRPyngF^y)(4VzE^DDozLHBHG+e%c2bji4HM-#>^b2!_vS33TGy`9*j`d+`|&DMmwP
zQjs6;W3ug#E3f86Iw~K$n)`abeIXEFki$A5g0daMW+j-8yPW^SKUGd>nT~5`#hZ?~
zl3x8D@c>(DJRQepMbZZ{t&w}n&#wkMm?DR+<i)1$F2BBM?gEaOzy?=xI-qIKYq$@+
zDF<A`Q88IzdUyg?HZ)nPS}I-JsB#5?T@aiwCrXcp560;r5!#Kj6%!H=KA;t>mOfKO
z$+}`)xA(Tqa=v{B_h#K1Y^#ygTlr@1>Yf8)f&;@VwE^=oWz$yRL%nb1`;3Kaf&#>+
z0b87+aoSJPXDtE|3T*W<`(7@Bmc9O70D5!ese55GzCvDeAJ5mVJ#Dpe*zLT5W;<WM
z9gd`(X>4+ztBEvTuE`#EbCquQvNbt>+Qwd-zB1O<7%)5&O5Tb@YeJ@NvQkbv>fwO!
zKO~;Ww)DPf3)52i<rJ0|WW#9NP~Bpl-MGMfK{jeJS2S0ft7=<Xn`>vzQx1nUjm;OF
z4*ukEcm9F#sbmOOW_XQPquaJy^KA{j$q9jh!R;})cm4D5s77Dotrc?ZJ-jPfr8d`8
zz>mS)yE<i7in%}uX~|<7TUwLwkx~d<)vf02+UDxYRv4j9!{S*8&1`gjQPwz1Zf0JI
zIr(ojR<c&zB9yIYX{nvnfa<k2nyVXH;X7a5GBqP@Vc((VORp#$n^}^R{g0P4Rlw=K
zqVBKnsc5J&H&sBAcRf)O8s0v$x^+Qyb;Dmi(Ql~Ps3CNF%YS^~eCeqfe=jf7nNlWR
zs-bG+@U(^LNtcpbuS8<sq`!RzY5m{`QkG{?;660FqVf^|4ypj^(mPg#S_Jn``Hy)~
zZTYLnYQPT(<|Rwa=SvR!zmz=RG6h}yxoq2im;H-ujV?8c_Ky9pTB_%1=U@H5@}!%4
z^)eeCu+_~qjq;&=++)IjSK_~${=dG_*Z79ft&{#Q@BU}!{I9q7yY%+U|NHI#+I@;G
z_k=b}Mbrub^eI3sW(tQpNE?LsXZbtf2UxvYTrIX4{&L^R_H!bgj>#owMJ$~HiYua^
zmOgzJUeB+{Z_eV`av60FcV}e5Inkfa$_LH?6)ckPpF_@Kd0jmeigG#jO~e<K%GNjG
zn>NAa!9OEGdGL>ykE%yy@^d`GKInBA-d`m$?J$k^VK*0_J)sG2I<1|+7V(DO?r&>x
zp4toH4~~SkX6Hxub2mz`HreL-r7B)$P1J^4#RVMhKZ1%<w<7@SxzBwZmXA%-=Cwe7
zGb=p~b4+omX2jB%>#OS<n->|(O}zw2U2TK8WV~60Cz)r?tEs7ORxU{{Xs!xaOGz<6
zl<ds1OoV9W<^tMKyvVh(dZzrN9**x$`FqdM_($;nhsaZ#0fC@!gteD#q3`7*RWtlu
zj1lxd`Sst|rJ8Qx@}5NYkvpde_qP9B@XC?O1wFQy;kaJ?C&s7PinWhzfv?4=MezT>
zTDYdMa=^pVlC_UO_<T5)jc#uHZ~pT?s^em5*50=HzSE2f1^!<u^tYLB)JM*Ggo7Np
z+XE{8e^lgeY}D#)o7Xc-)#J)PRpTFH3k3$k$H^-4Py4TVVXmxbP;UE|Jk+bJ+C6No
z&JP}B1T3mm8UWu`{GHIwQ8;DLWSGQm#(Mn;p`>L1L?7Uf;Z2?@F2ibFDef`M(QD)f
z>EbMXCg1NX`qEdjM?W!`zLb~s6LIv3Z0aZaVF};f53BW4d9a^Ia~y(ZF{&0wQ<a=r
z%OO#fh6`-Nyn0Jxjb*-afxYO!I@1-HRMZBy)KPO_RNO7i2v72|CFz4wSruuLQ3C-t
ze^|?j=M|GN8r(;>z-c{68-w{hK(|)dmdg7c=8s`SS-X$#fe~fsBmA5~cNWXG2Y~J@
zk|Q7FoA*A-Cf(zGO|)~WrbNSodV7IgbIy1Y_z<-@cRd9WNnB}LCX*iKEBzIl&=K({
zbi^G5;i6sGb!U$kf%~&vID-yAKxRA3%9j+xx6n?qYCr$l`3&p%u|UgVrYeCo<yKk-
z3)eOnb`Q~~aFX-obnRR1bsnwl<C(k!_MmQ%I`5`reh9$QaqvnXks|Woyn2neL+lsF
z(ZmwD=za<u^s93EIX};oA#%dltW1EIyjtO=1;x3gmhvp{hoa)qnUGiD!J`5+xIw<M
zox)S=mHiUZm!${>{oE|BQqDc+@5{2d@=v!D@_D8_zK#5+Zcu3V-=fO<Qs=*<BBD^G
zDl8b0>nex@0zqcBb`;^TMk<^L#=$EfKQA{&LB4Q99lV`NeMc)Cw*c-%0G=&{nFTp;
z{@9HA_AU3p^n%X;!rm>V#rb(<6X0@iq4obFZqPUK)OH&0HX*lEyIVHy0IK@Ce0~R<
z6;2yoS6k<jKWjfb-V2O|k;gDy?rMTN=GqBDH)-dLJnOC`f0OpBagB$_|BD=XQYi(R
zw49_!pFdo4qFm#5=vD0~q~qS4t6Md@hdl8z6u5=2AST1^E>FI~-?w?#O}_o&0|Ud`
z>$QHatwTx4|Bpa-B_<D6WMFw=Y2KK^oa};%g|+qb5TJvYcw^_NfM94ys*p8Xn=9s5
zH@6^Er(uzD<5f{Sd81ROW|WjQX5}Db>+F^kbD1iNou<CFvbnLP8ouLIEoz^ss&0n$
z2*Nfz7{N9Ar=$%TXollrrMZu}?{qboe;YPQV*q!pDHPoT|K(|WwB615{;NRgdydz{
z5`Yo6!XUa9VLEHI@tDU$#4x*$%sB*Yvb(e&;?Xd+J%0#B%C55Gb(kaV-m=>p@Uypj
z$<8<U3UP(qQ?|U!b!_jV`geJN>V9`^8hl=X^>2o+Sb?@)n}#=!5&i9f@|t7ZzngV{
zJ-{z8LG5<FRyX<LG0sgmFNwS4_=%SCV(h3nDiN}?kvO&pW}B?sF|zyn9N0VQuNe*5
z_b=I$<U7&sFB9H}7lWU)zYo_2UwP#RY}X$fW$!8L4ssS?@SO+wdT%$>c_zIAs$J*w
z{*upd+YDS!v;t+;CRvsCGTAx{bc(ee^m1!6=rk*A1e(RV2y}*3A!#$)3AD1^1X|s$
zfU}x*)g80ieL!co`-0ZCtBvf6_E6Be_6X31_9)QCb_IJiwI_hKv?sOUr?ou=bY6QJ
z=z{ispbOg-F1M(C2<YPWVW3yGj|5%TJ{q*GJqL7oJABAAYx_9R_VyxBTYD*}y?qjB
zM|%b6iuM}NmF<n7*R;bRr(N5=1ay@RVQZ*6-Ku_IPaEY!k9)(;ybnQ@+Yvu?D>(A2
zZ4|a57LP+#DCjPD1>(CXU<DdS{wvU2@>`*B)-^V@m#wv_4p?VX9dNx(oulEfDFJ7_
zO?ATtn-ViRZDF9&rj){sw%(vO+LAzTw)F+wVjB#))iwh3R$CTm+if=0#M^E8pm*9z
zK<~1t#@%h34tkHR3iLjk8n63pYP`1Dnm~8jT0nQ%7J}}vsquQy4x;U~>!1(WRiz)c
ztBUTktI9oLSC!juSCxCxjs|N_+f}umX|t!}=UMvz(C6%GEMBk=2R&dP1^SX*jlwJT
z%RpbXtNuS|9}jxSUJm-YT~+iAyQ=6ByBdqP?3JKz+tr91wO;}Hj$KvyUAwCEdv-O+
zj@cK0zHe7m|G?h17(XXEK(r4#RNX)7P;>3m4sX!UI#dfzcBroYqQejL%MR6!uRByb
zzUjb_Y2S53gMQx;2l_*Y>hK>s6cYYZhnjG|bg1V2+R-2Mw~j%er#mu0fA3IJ?T?PE
z8TdKVF$VNp2U<y52L^(uqY#ukFxN<Qpsl2LOa(P{pq1p&Q4Q+Zf%cJC2U<qmIxz33
zd&eSBpAHNM^;kimzAN1Be4F*X$JtGHC$lEX$qb+raijKhd$9AhPhcI^t?~9CdHg-T
z>%5JAlg1y=<Ju<Jlh)|%;r1}O{bP=FbQ$g^e>w@=5<X(MmpCHkta=>c#BDfre$Kj|
zhjzIprt!n@|9T2u*gbJ{$>rcySz@w1R>BoKUcUSj_lHkEJOZac%9;8z{1u|4&uQSv
z@B9ob$t=Bpfz>KfR{X-Z=vK2mLeBUdrm=fI=XtQ3BQ;bGJ<0a-j)oY#`?VM0!GRqP
zo;4fjRrcWiknCFFYPgq=3NLN35mdd^FsF=lOV<a$?{4jzfSmYwxmFq6V$@HFn8``<
z04~C!FPP{SRadAu{)=X}nVcx=nt2fHtNZ`pQFOPYGdvh()}d#3h-qu0J^)@JTgzd}
zq1)t^GcbkEmHXAtb@KQbjtk%H@~r<?+tMx>eU_t5)vo$oc}UgoDY@V*y!xM%Z=Xe<
z?U!B8p@W{4BhMl6G1+jAQ-hyV48a2dld#{rA$a3)qto|k7GsN;WKU8Z9WU*_!EG#2
z^>&;*_8aV;eN>lEgyS)KJ65hb4Pd>u>fA*6`DwUK#j8%=qFW>Fy)JgSk38}tT;$^5
zlgH%>fA8w1oz!3v%!dQYLkMj8oYn*8&jti<PnTOsyb9Z66N~+@J*Erz7L?mlRM|NB
z>aVClvYHN))qA{k?O}~SN28W#4}&G%qgzMX2gt*2;wi)`Z8V8pa6-JyUF_A{{p@`o
zTq*phQx_)Bb`^*vC|7I8L~YisqwGWE^e*CQxVT1pibrXX^8-&P&$_kDK2V;~#hd5n
zj0L7I?Fj@=1yD8&6cR3jr{I!13g)AA{0vN;@uEbth~+RrA4WGO%WoS*3e1GB?LjYn
zC)4XiplqrWT{~OY&Fxf@9#|w#)Csd3>94z+_?u)saQwvtw=PW!s`%U9df*r%&8==;
z1Alet9j1ng`fC3APYKGCg}+n@32vYE(F4cHbR8!=eAQF;VE#;{M|GKnsHFuJi}*w1
zRyO@6@ZsaV^uR2Y88OzMNNNy$-9GBC2U=X^x0Bw}#2*`#GhTR%bT1R1Fus85`^x<h
zD#!O1s_!djG>UGrd$8`N*H-b*t}3duE~*VbUMh$*U$>wBa^Ee$XvPm}cIsNbk{&;&
zF<L&lbC_;jU>`2$cNM2$>zUh4Y=P%-&+g)D9m3R5=U@*JO`|+fE&^^X_&Wk`MmNNe
z4WeS$rmgU8xepuYVGLOpj=?!J<6-?-hJoA7hYhE#;ZWpOIZ}pQ*`}o0zd1MLOvouL
zE9GbZ#qS}vlpj;-#@|Ye$;#&Elt}-#^t{5nGJfP=9^@BgX7i(XKrDN_B7B*jkoEo|
zDERSzd3$ML9zQKN<MFU(l>edek+FGsO3ArJDJVt)+%ih}z{Tb$FO33#B&BE#JYXjC
z3$n>i_#^t~1%DA9+NgXT%S(Zr6vJz$B(tDEX+@T-EPAFhKm@_i9UK7F^#+*}Ao9Rc
z*94%)qh&*Y2=-9wQE@J~ue$S6cN20cB2E;@xd9?Tb`2EXdQ7|+@45|~D7xuky+o1g
zws9AEyHV7|$13WIv01DO6!CFpb#m7K4yGfIP9L$BMmg8{03?HLZf_593ypA2=qc`{
z&LB|?_tEh|Vgnq7KMN8^;SBm@FlNtaIWt7;rA%jVs3>)VQLWyLVtKM_lsHFYW!Gr&
z2rPInMvJ>C*V!B+x)Wfv_E<3=Hm2WVMLWz(OX9?9@cqs2C3+H#la_d~wU?TL-RUlk
zM?)OHi5~-l3ZauYXe&jOh&o8(uZSDO%h*e;BySwdanVkLySKFdo9Do-Y5F*r(%-j;
zNJraIZ}>+>4&``LQ-VGOmf#b!AWJt5;U1>XTnBX_AxyqjPu{G3FLw>$DAQV3AZl1S
z<FJq0<yoY;xx5gq8Ssd?X(&7$;hQ^@lT4PrdS*I1)|^a|<rzG1Z*P%L@L(=T5Z}Xt
zS&m8+r+_3TC5bBtVWLSuIDjY~NEWN8#5plV+=GxekxG-CY5j#S!tHz$lxAUDV3Avr
zgundtO*jX(3=r__p5VNFpjbz+nGGB)4#HgKJ_O@1RX#pMya+ql)kDQ5SdDsRptmMV
zM~0|3_-}xQJ^M+(1&iTs(h~s!OK1zdid_ocO}rS#nZ3+kAbuqo;jE3~c9~Wu60oa8
z%5Rn+Y*%>6z@;K0<kuiQJc{cpRIu5+dhF2`0@7w9h*)6W$+wq^Xl5_@$5N5Ru<rF)
zhDyzrKQ6<<oFsd<!MAc&FT|{}JU0YF#~dV3tz6kAGI4CmOKpH)J*8(ow$7rTMgOjM
zs@V{z{QwCM-Rw~&K9k1+MYLO?Qqhg`;2Z}7-Q6yW67aV@;l)8p%XV`sH6E*b53H*E
z3wI$V8W$_Z895^vpzUMjBG#=K%gpsIdB%;sO;lodHXDb{nI{NO%+tgPqL)4%&d-u2
ziU2Q{(-(DDNA9Tvc@V0-@nzlbLM9{49bfP9=M;C{M=k0Lg-q_2g3`Q6aDzHKLB#9b
z)RH!yjhraDVs0WeSk_>*qhsey6!BHY;d>ME(+6AtX$=?ZY6UV(D1}3G&ZOe<{8AMz
zo2}0D!-e*f!aXJy<-;v+OdfI+@=}H3Ov%9!eq}}FSz|3_<%P<kbG}tSb`BHo!gKPy
zVHmg>^3LJn8?rb%M_}4^W{W#;SjL^%;wz$=&h@#NVcu%15!y&igu(60$4;rRCAQh(
z?KOUhupIi^qpYck7cq(djxbk1MEbysrn|f<W!tKOZOZ@}>M9liuQp=S0U`j6sH|uP
zx;?(JG&Q#l*1arvYBe|30a>VRfIZJtU!jhaQiiqQw*EuSE@w&QQxB6EPzMEOG_=&$
zw&JLf=2oSi54e~qtN47L3Hh0YDaE)&E$XUNrhykSWtU#el~<f%++EBx=+Bv8uWI|p
z`xeZGU2ST{g_1x=8X8d(SSZnEMDpdqw3VHcn+g0I>VI0&rP|}R|ApJEV%!Zlf2XQ|
z+kt<&#iv!$Am6`vi?*lOtDRpL!14jq)LbM!h8Xyn2HVLndQAIF_DIv;7A5v8<c<>Y
zCRV1sR4mc0ZuZ%-PrkUCW;yrdi$NDgJx{}lZ^NZezCJ`*kgZMjdg*hy_*S=-+v}W1
zip3FXtFh1V9T^21a=X&CT>m^g{x%UV`37IWY%7{B&4~UN0IJcot@RZxa{w?^)mCDN
zVfR=tyS8$+VFhqmb}z<Q8vxeSjJ64d7S#jBF)M%jDy)>40%;cpOwA8hQu@WDtYTLR
ztgEhJP(AHR0-|#%N%gjCC2ZA1Al!Pko^PsSaM>!|I>p{3ds)Ogy3Nnt=v*^NNTLQA
zKSg}fIaQdv4rz#8AAzImMrktrYMz863ulWu`#ib6Qq+k>_EuRvRa^<T{u5KNZ#K)S
zX<{?Yb&BaCk~(JyNT_r~gD3S7XAgC*sBWERUm)jHh~qThnLktH(DgfYr(Pw#C7fdM
zQ#InB;rDNzEf&xs=SF-<M0aOD4Tl>H<Oy(Bz5%X1Z}IoQ=lkP;!TI7w@woUv9YOjv
z$<1wuaJfzHZ^JQFgXMAcbD8{RE}ZZNsGo=ob-clt5Is17o111?W>p!R#3e_Bq5u9!
zmCBdhucI(G<*qP9U78^hjK7dFNL`vuc`<q-{2126i4aefG2`NWICFt~_d@nz>e5Vw
zolQ6>qeGKnO`;OO`|>96Rm3f<o{NohskAhUTLI;Bi&#ikI<IUIU7-5waz(57hC76F
z!8~{natAw?&xh{A9V9y!h~3=LMP9a0Y~l_Nd2%6w;yc`B`66)}cbMeqMdD`eaC2^4
z4Az)!hRY%TKGJ@oE|i22lLD$jAml2@()Z9K@WOqUzJ|wsBD};aAxm%MoqPzgbch&+
zk)02Bik;$Zs9388Tnvv@Jc(ac9Nh?yRkw<xA5uQfS^1d-#g?)$z{8bOct5%JEsk#M
ztDKdy3X3g+)A|-eGKKeXR#y>jB&oT~kVaFDJDAmt=dSp>Y~?bZH6HS7Q9&^tsZE8h
zHeOaTx!8!e&d<x53~dxI%g!1-$&!_m!&6jEjk~-Y+)nP1jj9^=6Z7&BmOX|qcjdro
zvxxm2!y}aRoehSkZcEC_c%=G7b{5Q!dAUWd2qAZQQ#U;lW}!zQ^<qnUyPG~JtWJsL
z*^>d}V^f=uYwV+zG9_^fmOkC};Na_(+@F($(4ykZF@W~VivjK<p2{Idch_s(t~F$a
zM^f}K6Q47#-%i%UB7|lXn}pgFK_;J+bADeGZU&P7L|;9Sg^<U*b({;R%gtSN6~~C5
zu%v~92cFN&XO-O2l@2550uDpZ3LR1J1+Y{frr&U4-YRjo!^d2SQ!-0P9?ge^`CWM?
zpL>~(AO;hX(YNhNhPqaT9{I@~>j|Q#kNmEXGfjabbabmsSxbW%GC@HB3SASW$Ka5!
z-xsPA53ZJ-1sofCRj}@#$memCzZ~%Cl&gwhFndDYUBrF5{FtQ2kL1Ozt;*&X!}Q1A
z<>C-#y0`NUtFaio<ooSn0e5&hC)z{=p&s+?;yQrpdWUG@j&5>(hguO`oqbk-*`F8Q
zuht+`=ELN)g<pYJXab!RS)z%K(bcp|+$LUu@II5|BQJ{Hz(YQM5lT^l^f>^?AXXN?
zB;rgPd+Et&QI{Hl14|dm$p;`8FOe$`h#1({wjB^jZVLwJ1&MOk0U!cHX9`bw?tt)t
zG0q32L+cH9bG5PmT}Z8!^IsB4rd56QEcEhAeF15`TFgD%X_Mh)=XhdY3~N^T&|L1f
z_iC{o=eRjHtQ4QCu$*P;Y*UQJhE-xCB5hKx6R&e`HOM`nD8u~L4zJid5z_ja_6PmS
zNieu|LZJR#B#9ZKQ<`swQ}PQXdK>~%=9KDvVA%-7k0~Hk9~Y(Ee<M4ybQ~n<8>6Q~
zT{)YkhqG{#Uzh0d?n3m|GmtnuSI23h={gP$)@9lTgpMt5fP7sOt0Tt$j7(b(+xcgu
zdJu-_!qZ5&Ga!9{sYi-F2CqoZ(tYK(@wzT2#OpoW`E;6I5OpcJt8ttqi>~Sg;c{v(
z_2%Ez8~o&`EWL|_({oojy^g(LO+l7^^vA`Ao-(4B?yXwEqI)NzS`hkn&ssoHL2}_b
zaetRU-^ofEw8qJU*Tc#8{wxvO=|B@3t`|6%O}=owxTcH0?;;~ll-#sR^p>mFK=_@0
zz349QbBOZ6s<VT%$$<T}$F-jkQ$7=@qZ1m;8ErC-BhBY|2xf5dQ5=)#CkBd1unOG?
ztEM_AF-mqx(37AMr!{b}Bl!7n)>f$N!A62CO3*t@FGcC8=!>a+I5e0#j8j)@>YH3=
zYFtoq=E!b+^zke_WJMng;>~hZAHBEt<%UCgO_Rzj)90|S^Nl`wGRdwD9I2ZxxM>SZ
zMO5c{@eCBqXV*jP4V4=<KwS=T4(JqE%h3EcVtb8{({2zSQn+)}jpCRaMLQ$5VA4~R
zbM#igeK_}E&22yuD9(BJ?dmty`Q#l?7AeMg_)e^%&Yi*}P4|oO)Z01fex)kLJ6CQ4
z*g(CUZ){gGN1}7iPB97*{?7Y%!M08b&QEqDxE^8s*$;?eDy-l7AoP7oa=yM7*jwk_
zLLU*X{RRjfyM7+c#tOb22Od0&<2`-`bl0E9!3?<?=j=YsAM!840}x&&_O1ouI>fZ@
z1NNwn_HfFt6_@;7{e;PH;xI?}4|#ugeWY&0D6Ji!2V@ElKaoti#bYvEai1kQ3eag$
zfkC;&#o(*jHl?=wmqP;Z!Q6YqD&2@_DlF22BSn;A*oL|7ynz}=gj@)!1!}nVZpdjd
z^6tAuL}Iks?2N3~ASYPz0r2FDShY2cEryLbuTTY<)91#^U%QioP4t-pd*s|(+0R6u
z7(0Wy?xM1Ns=z6^?soP~pp(i}oj1Aw!MK*fqO!c)$;ctx)tgmnR%Wq+oCMV5dqha6
zFsXXvjlK{-=h}(q8n54auL$!0QSI}2S*jooYBwI!x1A4RwWT}nc}UHOH0M(f3mh4c
z>U@8nI84;v`M{$py`S@y#}xnW>-_R@U_HQSm+lAqrGd^npA@5s1~^YXr7(pInerMA
zq}lY0*aO$*@z08z;Q0O3v(NztJC8kwx!C!Pnqx1EYk(82ds)0kBh*ifym2Ro$opQw
zlpZd}y^1+J%!xPE640WJ2QlAA%h`v-QO``@)QrGD|9UM|&OHQIj8$i$voC#JZ1fuC
zm!Y2E_{0pk^&po1muETBIq3~G|HsHBZ;J2W1Kw~LizG)*J0jkoY?=O+c%yeuZ9nW=
z5V1mlDmTH$<V6H^1mWP+Mpz<Vz~Qa|2(()%p2I|3uRsMid9V@t$z9U3h2!Lux5XJi
za+8jVWYZSo6hX(9&!gqGqmZ4$<?46DP`&psJxi{82N=ww_uz1)gZl`<EAi6wt{6hm
zo$o=2zRbDsJ%Jd_Jh|+c!oHl#-WNv&&gz)-A)bzN9{f<$5EVKHeT==33Y-<6h~o_K
zXY}XdDmaTB_*|@{@v`isSPq=%@JY0-$a&8f;z^=%=bSGE0!quAv%ZE_4v;77Tfl0U
z%X8m~27o*b-(gixmZtB;QlKmL?}Z&cXkC85C`^#|{2(s(gHcAqGR4VF{H_ScxjRxE
zREOe+vD*MWV>mk=dp*_p`C)+ZbYthQ7}W}S?XTiNNLiV`i5<!r`Zs)Nx}0%Z`~ak>
z?02#AL0u2gsoEK->zkAg`Iwvjyk6-Wc)84X*OTOaFWpBzW76$F2=d&ac69n6-xYGR
zkA499WNi<92k@Zap8D+wW`4Y<zL{#A(|q+I<k8eKaC~rZ@H9C$Q17EqeK+}vpFRp9
z)7|{_h0vF-^4C`)R=P)kzNJf@Z(v?<V6e5)mD@i;?<GA0_31RnSsMr!@Bp=6xWoAc
zIAR+g0Dd?Ia@TXN{}5nZvAbOOt{7&DIUmIRAZ0V8kA5xC!ouX4+iAESg&^+EJHV%n
z2=4vwVB$30iO3hTTz&@)G4&dvXFw9$ayQ{*mx#_VeGo#i2Z!m4yUg<q9EWCD-Q~zI
zJyAaFkKmp^!t~JqA4i7kw{~e!&r$Pgxem&UM9n*((%lrH->lE|4V);q`sm5d*^xT<
z`Xc8Nv;L4$+6F}HWkd_)H8J{5C@$%}^yrKG|7#GAkdP<~HXuS`MvAUG?*G(F9>BrB
za!sn<O&*BTYaksV&uQp=N%8udok{w36(q4UNngh+G}$XfkCW3%bfdVNY){s2L*N}!
zKZLS$;bX7};@z?!Ro`Rm#=*2nqfIz!>@A#t(}fdoPUsA%G3)t$co@CPAHhK$Lb@0a
z5vUpeLBh>ApzDYn^*L>Dj4C@AuDGNE^VK;Xnfb+IGc6M`^UHHM(+qvp(RN>${NY~l
z7_F4M?h}C}4z&^F6<dJ3^Crbq$K~W;S123nI_#;un5Qb<X{3UI8Ye&@ahhV&M&kJt
z75}PKC!Q`(+z->GMV?hZ$K|^FDR|H;N;xrdmQ60s;Z&t)<>zM?TM9>8lorFq>LV9Y
zN+!7&^msXb8~H_-C_b%h1WJ1un^_8A%`gBM5S>eV*j37bNpz!9aSUSu++N0)=b+JG
zQmIA~f<=o<3oR4#3UPiFZR||bzu*;a^2;>+2411dtJ3vHd4*8FkxKLnmP`BUb~v&)
zML+!r@rwVis%s00A_~LKnSZUBO|gtb*Gy8|XrZ9Q%T&we>Y903qS{^Uq0D6s9YWlv
z(z1FOySR}}&JR5lMnt^`La+}Bp;Sb4kqCO&0(<CjsplT5@2D&EG{ae#%h@^q`Tp<x
z-*?uhGqrRAC+m1`9eoj2e%f76Ni-Dj<p%j@Z{Xra8WWbA?>16OSUOi3G%YMG{n{Wy
zaRMY+@!tV_5UBu}5P;)+5;Z0hhcJ$d<iW?|A;Q3Dq9`%}G;Ejna18>+g;luLx{4a_
z2kA_i9Fm#{<smrVLazH+WZ`HXg9iG|+OTxB(s>|NXy582_Hzp{#T5=DkIy*Zh^n%=
zWdb^3_9oB%kIe?s7adWoRLFa{#j!lNdyhat`4%)r33O?Fm;z?i%*uVhYZuuwQLp_V
zqVfEMsB|lfIf2f;<$WdWY((cqKW)o@zar0=d<S`k5!Km3qy90sUjv+5{AG4Fq46g_
zZH348FF$$h{r#F!EA=}1*W6`mSGTJ;=rq$QNZ3v{(*;1}Ofy{rM2@%6C~|`DEeHi$
zxIaYWpoD*h(CwS~N-NC)9{LX>d{(5jHX4?GZKFr%HX>C)I}IU3U23PR)$+{?QS*n&
zf;N!=ZSe>+&Nt*=KKP6zLE_A-OOnJXfGhQYa>G?pNi{xu_GmeK29+P$vf-TB+c(71
z)nI~P)nohty|f6md<TGLX9qAX@X|;p&0y7PR~Iqr2Nt^M2_oWPn5G^dCn}fEpo;@}
zSRagIcYp<CK&3F+7*HRsOgoi=%_f+yUY8jjJ|MMJKZlK2dgJk7Ve#`Owa#_3fx>(E
z1%6_bFL;!v><eOz;10J1flM8~7gXzAEOnFYHz5HF@1~7H{AI(0)88g1MlX?6zKYQp
ilFF8Dbnj07(2WlDa-;{-#|~cVLBH0>gNIWmDfth?@y@FN

delta 22448
zcmZ|12YgNU|37|SulM`jOeC`R77>xe-VqUmEEzUe5IYfji{vKV6qmeIQMys8v~H=k
zbXTj@rB!XwR;RXfPyWwyLdW;>`{$9z>z?;G?{nVkHJ-26`>guaf7RpuYa?vhFeqeQ
zY?i+^Iuxz28TdmM{=5$O`>j>$wGRa!@YOG=NRPT;)Kzs}DEwk2$V)XK`$mJ*xGs4_
z5FPOK+^Y1U1eGW2e&L7%FZtwX^`!b8EnQUYQ16J-&isnu%NrC@r<6;T@VhD<$%)FY
z-s9bBE}vJAqW%<4LB%-KYW_ReS|xK%$*AJ8B1dsieqPQf`V}S1B2*8S*!L+ok~;98
zhVS+I_|3H`gSiK;Hp%OgIJo<Mm1ubXUE%96)rE)V<`z5h^9qML%8MOEg^vD3MP)op
zjWv7>5d7nBybOJWqLa#SnPN6ctJHSGZlDLGeN-3^EG~BB78-j{exq!Q;K<hJaM{+Z
zYHY_9{sPx!2iRVSQQ0h)Z5${ahA9u*Korc9yfYl{XIy0@NS!b%Z&fES0M97<mJYgG
z7ji9KmO`WUN9xFa;YL5hSYteDd}8z?Z|Y8!RA<!CHabFQS!2XT@&ew#2lx&CLHVdO
zRjg*I9qP2%YPud8=kn_jEU|^!TlP-T-d?I@lunN0iutbX-GgnmB%PV;I^R9O^;-9q
zbl&x0_YU;6%eP082mg_#vy)jKo=D-+Z7Q{3<8xO<kM?wn>r9V`c!|^r320@Wqq4eU
z;;hQa)e9XplcqZ+&90up-$&_~RM(cCVXmT{Td2%+vFGM6TZoQ`<B7AURN)R(o;$nB
zF}->^O>^DVD~{@2$9l!bt%=YHW}Vsd9n)(Z3oGYdt2e2lhMb-Cpmf*K-qCW}uKk&h
zx{mbjM$243_HGm7Yff;G@rHr_Unz$2XcldtC+TbU<qRG!;cNMTtAC$1)Y3H_w3TaZ
zpA>r5b+}JFJ?HwcPcl92vh{6CyImdnrqK(ov3+CdN!N<L3G|F>N8dZBovT+?5^7dt
zB~yFX%~>hlFC^-?E<AC;ybOu^nZjM^!@XVSvSR32Sv{W<T`Pur$s?;dn(290O?d*f
z+279|nAqQ-{xkzGc8JciojY&|FXruhoWD~cs<)b~Zc=+C<08#<#roavI$WOY-8Mz1
zbuu55>53Z>i?{I|o=8cq%;Dx6kHU4bYvu4{?_&u%#(JBMuGp+_>gYN?Jc(X)T|%|a
zuFw%F-mhJM-Hz7l`cP)FPO%#9=sKSjO|Q6aACc(Y>7UGD<<WG)^}&b)>L3T_bCUg~
zWS!iFWz|`VW6F?a<8=xh-#^ms+wMWbc+fa${ElHCWDWb{^bvZO!R5Sy??&&wRe|W;
z6m_esL+{0McpWEucfa1RE>^$Z6yNonNL?gzJtx!aGRjPKla)x>->~{7Syw5FslOaw
z&q?%wTtboefa|SvHCyri=z1r+Uh8D`_5O6VI(bHJcX6V3&Of<kFF%wIT%16C#diTG
zNuT?;t?YAXFY0E!+558gKHSsi`aRvOmfn>Q&D^Yia?w(&(=D(F740+Btty!IVK?7R
zs(w=Wfvwe(i075LR?m!db)NaAXPm*^jPHy%u!jQ;vw~SU2M#|_JpBdoG+XdDMv=?2
zCPv+CjB@$=rE{9U>z0}{WwiHmjjd^az+F?|(=pVjHSoW~IA(lCEvPe1rWLe_4%2(|
zD~EAkuH@Bxkk2YF)k%$2jpo9-jq+UKQ(~EZb@iU|4B1^*r-a5m9IgY>d2+=P?6fJ<
zXH`0;PsYBho;-Ulx#M(FD$AWiR75TpVn?U&<Vlr|`IBlKQ>}f8#H2}%%1PCn8KV>a
zDV;li{{JcO7^{=PN-llC;Y`1~9-W#<>s_a(CfkyAdK$~xmMV@pUgmsDL9X4S1KfXI
zq@lEbl@84aHi``}*;B?<ill6+p|$idoyNA#<=I$WFB--Co3T>GsC+e7?NsO2Wk<?q
zojHxdB(Mv2pir~XYT790zNJL_=?*$Cj^%6;xAmaeF*+5A*~uK{L9?QDSSHJn=Ts<j
zlg#^$QmD1ueUUm+h;03iCX&CbUBDgf!HGIKon=jxj`mQ2nK~PZwK0?`o4R1_2FTGa
z+@4D1n=YJW%k8T3GNrI9he~=^o<n!;-=ei!&!^sWpu-L?^7zCO7hkx#-`%;E3`@+A
zMcJatqS~S!7WK4fYl{Y0G|-|!77ey&tVQE28gJ1AizZrhm_<u0T58cUi@Gk{{n!3`
zb!g8B;|2r&4;U{QUyvuYrNK0l*3biVg8t+v?!#kvF5k|N@%#L<idMbUc(q(@RQuEk
ztk%JD_JE2rNeoX+b?sgrLw>GTK*L;LgSK}0tcalqSK*3SRl)xFjR*6bvm(?!H%TXB
z{Htvg<BC{0j25`6R>qLSwR&Y#)XHET7RS@3Pyesrm=USNuz2boSHa9{U1wJ&*=rJY
z7ffkv5=VQ`97~u;KR*s)8s{2Vn@nR})wPi{-*szkJdJnlt&O4yu2*YABj<(dxaKD;
ztoc7r870RTa+K?#O`Y~1)uGsULk*+Jc*VFtMDdhG6?7XtY*f=5#!&i}gLweY!^XRy
z!Z0!;)hhLnWUQhfTfEN1i^WXUk*r#{PHs*nAD7=9U2I`G2zzXflLLI{(Fh%s&eLWu
zm@CId>wxu}V~JdGn<MFCSKrNXG|@F-b32;ix^;6-BL8ZM-{}*p9FUFIUiokF`+KtP
zk-!pNq_M4jaZR{0jl5lJ?(9Hcx}LnVKYb%#FXRqB-*?iv={$WhHoaV0$SHK$C8y&k
z-*xD8r2WZc-6@5oeX6-LJG-u&F0(hb)0vo}JwrH=>Gu5}*kjvIF^tE+fI?{))zTjN
zfLn7GkK;yTy)lLF2k-w`#jAnf{j1eurey2va{Sqj`7hU=EAjM|>&TxO;0E9PnMr@T
zV*cuGhsKfFjiuriN@il$4S%KCf9jw!q3byoQ`=U?FI{wYH?Ce-Rq3d#S|D?xDM(JX
zWN%q@3wbgIE9^>YEd3m%Bhq;Gq<NG7Sua*<_N0ju*~c~c%3xaTI(a3Y=_gn0)gYJG
zRV<JnahXa#xbm+iKo6+78bb}PwO0#im+S1+So_B*x>pj*j+vCe#>GcT`*|*-XoI3D
z@qp*{)|6rGp*oA!ThwXMO%}bwqMI#xr$x6&e}8&K0$QVm=cIjW+EM$dRdB(gpIP*C
zi+*9zZ!G$)MZdG?C5wJ<(Vs2)heiLi=wBASV$rK6WsAMA#a`HAFKn?Fw%7~Xe631$
zi+aew0NQdekhHIEWgIrdI~EFBtY3y4{ZZLuT`b1k9SIiuO)NQRwG_l*Bit*i&7b?_
zL>%?i59aAPax#umq<cI?=?DH!)+0&x$@X|^M=Rx(c<MlP@_RhBx7$1GKA7sXJm?&w
z6KD>3x?fG8rU3igc%6c^*kKi{5uVd5GG3o+F3hR2w;N^9OgY<)V(Hw$?(}s;oPU5y
zB?zFZ*^?JwZO^NjHGRIHDOs6P41ShUAeo~`JA>;S?%8G3MDAyYLzAWo_dTO1m}r9g
z@MwbSHd#)OrEh4Gyf}{Tq>1iH<Eb0d6!)DIXbMxMn<tSb-%LZ<c^u^KIO9H--^Ca;
zr*4+qK9lC?y3TboC3-R)q#5$gWLiekWmqNEtE9SVQZa=dq^aUPm45DQ>aM}YCBwJ`
zNuEiCkmUR6HTn^9Jcn!eCcclK<4^bx6{-5G8EU=SuTF#29&zn?Ka%cq9e+Q8-gkYA
z>-$|kXFAwl@2tCJfi1Ss9bk32W}nHXBG)5l5~<jA>P!j^ljuc|P$iN%L*HWaj)jbO
zJu)m(KA52|v^Gb{X0$h8kiEgNw9RP0E<0S;SJ%yPub&Gss%q<MByBp?(`?x{o%T_+
zRLr35UR41FNns&DbvAi@9K}iMOsWVp+tP-g!Tae`iZ}e~Th=XbXDlUuqWRK)89k-z
zhSbfIg*6Z?bKL{x&=6{xPr7!l@ryyND2O5`j*=;jI#Ca-t6XRV!)OGJqe(QKX43);
zXdT^1tI0)o&|P#N?WRY_4W<8CdYN9QcjyeAr_V8gKhSS<m2K?9{u}}cmH?9}ox5-^
z&gMZ}z@<Ej9Z;BN@*G~owJX@kH$%W}<U4r>KfrrnSsmi1`FVZ?gYqtah`IQZzvG`U
zBcwc33l#unAES~~s>)Q|R3DY2@>G#3S7TI#nyRYQJhepCk{2oCFXI>JV%yad>OJ)x
z#^?H<x$9JfMRUTfpD>Gtnv{E5w3kJDTeOcw`&u;1qWvtIZPETRWdWtsj<OP?Ejq@c
zV=X$#qLVFJY0)VbooUfo7Ok@AY>UpZ=v<2~vgl%qF0trRi!QV1a*M9AXk9Zyv6vw@
zO6)=ksa<WAth4AYi|)4Q5sN-+(dRAtf<<4n=t~xT*`miS`iezgwde_pzGl(aEqc<T
zZ&>tAi@s&iw`J2pT2cO|m9Y3DTl|qN{-`Yes4V`dEdHo0{-`YesBGq4%3_Z&;>~MI
z6;oc;wYSVzL{T1={-r`(CxgRn=ff35*_;9$G=l$#R9I{ShG!S%<PHFkF(S9bQJPy;
zmRC5a)c8CYP)K%ue$fa=$pA-AQF&omZb>QM;-?ZgyQ~x-Lw5iC+yVT3^M+br@b?@^
zxyAzUfJ$ALU$;cYt;B*~ENQj$mS<f_-J*cZ9wCxh3*~p(Vi=nX-SJCI;J{=wp$3qf
z(Z(|9Fo%qfDUiB>gWpUC=xtW8*~Wm~JjLgff@aqrOLv<(s?Om-@wQl<1_fqMx~ai0
zk-|EfV!yRn`@J%rQ|)vYm~^U4sHbT0s;62N1y$klXDXa|r@T=QF5juiN$p`ee!2>r
z|5iyu%66fPE=`h5ClH1Yrc*E*-^p4h#n}^^)uq>4s7UPBa2=Dtb7!08#{9Xnz}crw
zs%XX;R!FNlN}yHpjuVY;k<CjuQvz42IQs_6B9T=YDp-nZmA0q;oe|cW`!tW`I76jz
zKbmHYLl+Bly+_>&ciasaDq1e>Z=|<%-SoO;vUNFKq@{Ap3VOZiCbIix8LB^+N-1ow
zEZmo-YU^2wZlQWF3drtevOy2Id=mxAx3|y&FC$<C@}j^Rkryfh8$q_*N|SZ{(7IZ8
zU;`Bp*R7OEjdZxlkF~d=$%Y!tchKYm{(i$r*Jsw-+^?^PV9<4`^;*8XiS~M_fNtGF
z!lLTRn;Z3d26of8Pub<In`ud3bDATJ!G^KXc-(l)_!i7G1FUl{B;8>!#XkW{^y5i<
z19;mB{vH*pR0J@iDs`KBMtve@Z^LByNz2ugY;V;pc~APOFxwp1c|GOGN)_HFEnJ7C
z@Z6fIj;SW>(>yhk9A=Fy2$bd`2)Q5?<jd{<mE%~cg6(~+42jKDA<a|M?(d9n5AL0y
zQz7iHMyV*~4zjscB~U*(TdN|i%9L(i$5OVuzJyKn0zXmKyY-S~t0~%Mnxo0)Wjyte
zZL29krKXeXk<>uf?d^P}#~O0dck<*KinQ&I))DD)Yz+l?UbA=)%WrFFIE|Fz+bOC|
z^BM^;cnqDSVMfR`W?kR4-YXzC7xP?SkUgx0%-KvK?yDQHmDKWjPpN3470RRDLzW2L
zsGV{3cK4XIw1a%j=9F=x!F%X=@e9<8))i}A-?QG=owbSj5c$Z8JLuC^^+omG*P5R?
zYFG<5njb(-TQGI4<cTfx7qxUB+Dbk|E!@v<qvuHl1QbZk0~9NJwnHSgmXsazzOR2k
zc5Va~NQzO={DyKo8pBd>H{H;}FR)i`SXfj&8H4J`dVLug&506m4}I-@kD+GpHu})G
z2TR-43Y`u4PiOa{vn%gKXLVhl`d~SKA071y3dqSZS7W7Q?!Zny7sXm??jTP&c|UE%
zKB#_xnxb1k_!)muFIt7J{K#E_Sw75PfX$46MspkwJ7epkb8=Z;f0Vj;P}BfDtT_=T
zHQpR0t9}6w2DV6%a$6_egW}}{{Mf^@bwLixw#TU#L-Tm!DD{QG?sp72!%!J=jJn&0
zbkSW<V-7*+(?B_7=9Tr-+1V^v#Np;k2FlTA$pcn<+B4Km7vToUcm}!4pP}d$ga7{~
zF5I2<kU4Q-vSLs3#D)H6;`U<VMwpwit+B)~&Kp;Zb<k<r!T29WQ?LxTgX<orbM!O&
z8cR5yyK^3og${BXZ{s6;!g$u$&0j+X#Y3&g#s;0BX2YHo^`LrDiT_O)fxF-1kZxa^
zh<1MNpzNGc7Le^IE-5N2$|=g{r$SUF7nJ9h<w53@lsSeE&dG*2;o2zGhvli6Ce-1O
zzXs|^sDt5ybY%Y7may9`V7zQpaW2REt0d0PA5iQl?C%(m(|;uA1gg}(b4o@!3W^5g
z@_>J5mR-xtl`VsGgq?mfWuH7Uf<tPl$%OOsiv~FgvPU|GmFJe{(l4g;GqZ4CacQAr
zL|);5q7k$q2%I^;q{v|v<rU->m6v7E+W$vxCawE_<aVU>|C4JgFY81uS$Ud+WzT6Y
z4e4TbuV82{#%+|NFuNd^ZirG@<oatySnJ__Dv8j$^88#!X>opDS-D(#kE3Y3Onje*
zbt)d1!z0YWDl9K>6b*Eg<?!%Uut=^YhYu_@9{gAF@O&<p$KU4>^qcsdK{LNfhcg^b
zKUy0*N}hNW8#~f{=rMC+N4TFqXm0E{b7MbkZtTagv129W5H@zqe>OIDqqI3pds;;Q
zcTb!7@Bg9_-4RdF1fnE4dX7R|fx{zY)yt&a`;UOdQ=*)I61z9ypWS;1yLam^Dp|gM
z3MziQR6kAY4?aivHfk#cFVjX!mX+^Ou=}@{0gF)^$@~e4{;!ZXQ#*IT2?`)eaaX)X
zKQXm;k9Y$tm{Q$K-=rI;={;CA>2BOTm|)(SH_C^n=@_M1ujW4ZJ}qJD*jzC1Llk7n
z)4zh(#C!yU2wFq+Sz4cNZl*v}vJE!o8)6&*K;;A3HWHiZQThsUZ47UPXDI}mWtF-g
zn<SCKY^k~j5S9<KG1oj$E+6K2dtRbWMc#xyDw=tK^mu|(X^>Pt!SOUiZh8XXbFS=p
zf`>7tYr!JUv~|(F`mpQCH`CqIT5BO{l3k0qjjgRthK`s14mL0SB1dLXX45%(n!30#
z+>=SF&Z3t+KZbg;;yrZbjgM&=OXA1KoOl75hd)N<Zx_s=?0Rh|Kc}7~A74Pe>kH&d
z>gSlq55B~3^k^QA$G(CYbnr)X8i+MU@m=cEJb<x3Ly@4~QvD09Z)=WIl<|&XT!ht;
z2;<2CcxF4jM4!<g9B#bBJ-L{xd9}2^L{8ZC?d0K0uzbIgsxus^|AOW!HD@@`qj;e4
z^Yw%tKG66{j-J6N8&~Aq8IA#T^ILGN{xew(bNv|{E=4QIi;X|z+e;J`{ENvG3WpaA
zbQEXjK;1PN1^py(mrWS|N9lJN?t&j=!eu~XA6x8bEkiL{f0??pSZ%U|;+#B3|MJod
z$^IVW_0?tav$eB0$<ZSeVy6`A`q&p3p6%aL3*SsfNp5LbNnTDFmTLa@;InOH+V>RM
zCCRLKt+9V9fz1pk8%)XndQ!)KTIei?&_auj|GKrK6#f9o)AR{6qoqGk3km;$d@?hd
z7vyt>@tpAuwZ=eCgLmgS`hr`*x~$+EVLF~x48yQYtx%7sw;|>>VAb@2CVgdsif0}x
z1yyv4zLvyl=&|!;a5c4|4KlkLGGe40tEMFT_*9(@FfX=Jg(F}2Fi$cIf+cIFYU#m_
zwmJ=}_MAL(5w4Yqvw_&IlUwm)U*BA`y}&GTiDMQ_=@atdY=VlVd!@P_u1==%reEnP
z%64P3Rbs{df_8iU4jG-*ywl(K-CDE1BYWas=9>MTux9@<*Jj2~82tWMv8Dz+mcpG0
zvUNQ1Im&fsF(0FNb8K2b=owcaix<%2bcx$yOm<*I0@X11NS?)Ld|>OTvml+v`EX~Z
zeDQx48bYBIJPS`*fvkNN=1GaXWd012o0oBSdtR0v3dy~<CHL^4Vcm2$C<*KCpiGAT
z^lB9M)WN-Vj=UblL4T_t5jG0yp?gVPG&09VLu>StmC@Wyx9F|2n{!`-{zLvvnzur0
z*rxfQ&yav#IZ%@70*pbD-HJnG+%YiB%{E@-lZPTx-TAv{%Q8-s5q4fkgWa#$c{ov#
zJIRyV5_(eT#n_qdTyNGy`R*Y;+?A+I>U{Z0=o?ur_$74Evn8+B!vcn8%bW)=sE@Ve
zIx3cKt#Io&>EOo$X{;>p<IyxmPWth98ZGJmTuGy3qdyPDIyvtT1Zsq2wdNWcF8f;Z
zeN^rq9>4>LCd$bm4s{<0gv|(q3yDrZxI~9=J~?Dq2p2-6Z4coIO|je;Kw4HT4^}f;
zhlyVjJl5M{IRmiO>#;nUrb*{G9!yhZMI0B?6nV`|RZ2)a^yA4g&-|Ix{IJjCIgCb{
z^PgmlH1NLwc<@f+dE;Yvae}dSir^=70<$?nr?D!0fyWF4{&EBF<Y)O~{zZ91=jo~j
zt8vhHZd7-w$JEQ}L-j2h#Gg2RpkR;E;@sQ;kRC`xMyCI3A9wy|ANRJx1Y*8|VM#sZ
zVRHjt3}s(AjJ+#x;kSmzaWB}5f0w`Sab%Yk7l0j~48?eLF@J)^^9O3}+x71%G(h6Q
zI6`)Yp{c=P><?RHbQnj5=KSj|y8TnVpR6&f@BM*%<&H4+k)vU3mshSQ+cmSItZ0>G
z@hNCOh2Uhl*#*r?8<M#tlpCwCOLjwnw39tv4Psg5GC8SD28DA0fYgoQyoeS`iwI7&
z%{Mhd*PIK1GAx3Fx-SS&DO^0zQ997kKO4Y9-soJOXQB(pD=R9?&PNH?n7UB$;8Bk3
za>QB`<__YiO^LjP=E~MYtg1QEGKtHmMkXckG=P7vCc#3jmMLwxgsS9F8@`)nxyL4(
zi)^thY0JxLk^J12N8y!<Qy6HS98KX30RGC`@o}2xj!ot1#PuuX*7ke{*RPN^Y0!J?
zm&>DR`~xkM2RraS*xaLljL;JIo$1&uq-0bkKTIrM9XX3g@;dSZWXR=?;Is9$va}Q5
z(A1rmkX@E`=a<Rm9?$~{7u20CJ^2qJFWJ<acL7w+>BGB;Jlx;)g@Xc<ayXkGCm;8`
z{%j}mmZdp-!!=BHvtb-HJ|#P)L&vBGy!aMf;TV91i=k&6<1@x)<*5>3!Q842s87Mp
zrpN<5pf^4!>u#snx~)#>=JM^BXb(-%J>dR4KNbGL(LI$veI~Pdst$BX?(C`J=r(z>
zr)p>47OPFrWV|PZv+=Nm_f*NYiVQt8L85yC#h6j0f;_mg+5K483ph*rUeH#(WL7WL
z9-QGs4<LxHjygM2PWDoPuDibsljFTqSNK@F;Nd&QQDD<JYT;pgnxXTOtc++GGo5^+
zjc+4#TmsKqGH-rmm802vJFNz;-Rafy>64}b+yzEw*8%Kd8l8P}`BR27bUXx(ESyaN
z?vaDpM&##4PEVp%?mLF?4~+cP1>B2ZkXkkGGHYHb<d#f9?iRy1mnhI(S^{I(5)}T%
zX@j1i-(du;U^ib@ouJOl2V#+kg1->Iq1^J$IzR!h%5Upb8+uV<*Q>Vn<!y8-{I4@a
z#WF9GR2N2bi4?e0B9>v_7;rRiSrNm1bSs#XvML7q&@v`tH<G6Zwd|q$U{}>WK%E%Y
zUfz1u!|r>{p4?8oJSd>A&V_urw1K)ul9%PGTT)qJ2Blngl~>KGUQCb3Z7vl-hvY$*
zYDX94EthKF>QXa&(AnTTN-(xcY<nFDRjaj{;)H8@43>YWtQ^Djx<1|+;+|Co-BUX|
zIfLB=!`V%Kc4LmA1_FW(rd!Bn%)#Osr|bNjG4l0zc46{s9bBjDJe^SzK9X+*YrB6W
zH&BG6j=~}jms6wopyl+?Si-6e&!oqVqiAHGuAA>n5Z|f%qpnML#>+ip0no?E@Ns+?
zHirLrJ~iCr+{wnx2H>ODV7LASw?r}w-Epu&?x4qDvwq12V8BecC&utBUS(OV`v8!?
z%U|KPyZDOoRmmz#jYc3+t=giFsnhB+JiL=EoWMa4zqd``(Arj}g=Vsxfw?)3qT#tE
zC3!F=r<*pSnOl-wmJ36%bSTd-`S^db{;59Aw7M+o)?$==v&s94OY({wW!Zzkgol;q
zl>l?iEu@>Q$Cbd;EY2<|&2@MTD#<P$Y}Cog3D9Lb$)yRf%QB>81%7Um_7xlve5<L%
zmgIsPno(jogR=_<<?^jEu7aaOFPPlEq$nrXk(1-d&L31%l2<mk0E)mP6&%*?^1n;1
z*Rgt%U~<{!n~Dm{N?@a}kRL0!ZEmW`qf3eh!4gHUq08o$aa%LY%*-1!05Krujkq41
zoo9^<x4)ia+S2A&aXYD)$bmgO{9TY&*j$iq4yk!_*<iFhxF~-Br(Azt8Eoro&r6mQ
z6QQ(J$j=kGW1COSX3FwQ9Yw{c1DQcznaz}ySn7N;D9yJ?;Uw_<H8OJ&6ey9klQ<;n
zYhM+?<vB3uG3wTQl;;l2a}3DsUp~mP=lkam%`4&q<_57D0fy?wvuGEP$^fITx3jHO
zRrAxZG}C7DTfTLDooxcfrJJB?sjRBxRQYl;uYp0kxRT$3LY6;;k64~2y8&2s6~E5Q
zxSesg1<a<Z3C<1@x)Of6H23nA*d40S*<PAvL48S;&u2lNwUgde5Gg5gv5Hr8u(WwH
z4C+T?X%Vf5OYtCm!Yw$Bhx2mY1j%I}nkho%s%2`Y8BlWwJ37o2{A3IS+|4g?Ow@df
zlU6UNa?GCMsF^YetYXgWdCg$;2uXhtHve!Lf**T%f=&RpUmXrHZtRzxFY*XmjE=};
zSD)X**x2bRKeEMcYp!&;3q{)xwAbCh>#C!vjjQ6x&w7=c!Gl3YSM%qDdPnV6^$0j<
z&wuc1d^fVEaeMZnw~ZN)TQ|dq&Llgc<F=yq8**}yPKV>dFuJ)`zTd%n7q0F~*S+xY
z+Rsw##vMpsk>}o_Of$0boW*3TDi+J7E)?NeQDeM~+~smCUxnHx<8q;VGYhyG2F{Qj
zhdIFp3*8ta$7bqi8^V-~4A<FBnPxF`9|VTr%D7)*$LKKEiAQ~01;<)@8;vLp>ZFGy
zNX9M|CYN%wmR)(;-;<l&WXZClD<|6?z^$=Xn2?P7mIBR|?s0unnPy&uOS}8IEfy8|
zCFvw9xUGvkJ)a|6o<u3acA5kBI$6PCttbtde^&(9fQq)G$ZO?_=+h<*!Hy_44uTpR
z@N*9S$U(p{9z{rDYnac|_+EYw!K>+rI(h`0Z8hEL8vIm}Z8++`<+}CHbh~N!82#k7
zSnA-3tGu4NG+j<6fHk*S!b5CdA@2t{ahK|32G&ma8)uKSb6aFgHZ_QNp9&LnzCA^E
zN#&-!oM5L<k=`$nHr36x2A4<WB!ZCS@I@7F=SPvTM~;Q5kft!zLRQ6To7V@(`yf%L
zrAqWqD%REt$zM#6G*CY3sM~plB0U2ZSTo!?wiU<wP%-jW4bcur#>^&cjXfQ8pg>^S
zLJ)*$d5G<FqoLfuiI)R6IZfgps25@*Tv0{N&f;+LFmTgHoLq$M)=_enBb_N5m-9uP
z(K;kmPOst^xpxJ(1C;;z3LbdPE!BWUf%W+l%-{kG9DSNT#ZY%aILVFt2*1i-!qeJK
zl^P9dJ|c(@st+*i`7*JF<Lukp=|0eCGCnpVQ?5$vDGVL`m8Nr&xN3T}LoR>BaT;&`
zhs-^NxUMd;<rH;^{vlFFq?#2L%&(mHe`Wds`R){AGoFx^?;>vOhBVy+d+$mWBQRyB
zRJ==f^$FJ@xO;Z>{AvI9-hGieB>jJiuK5@qPtchOEH~YuqCB`ZMP~sESa%P!ajtKg
z%Mo;kM9zileUtQ=%h7OYjhze4V5`*5Mcm^yxo<8f1l?tFPP@^`;DxY0UZ6z?*Xo4P
zh*8DPp7Qh!T<X;$ASgX7EUbPWyjQ@ux4V>Gdfmv+t9)m7IkgH_UpGmr;~_A0YU;RB
zcM0f{F10H;-R)TqzSy*ibxWJk!B7vWk$f{n8XXW=r|V`ovt;MZ{0;SW%Pml0blp&A
zAIWRv6M&vV@L=jCGjHHwO%1F=>~NW=J$!~&!S`e)45MzQGgt0hjRpqD&1=B+bKF0#
zVQ*3+o&BZlO)w#|<?=?@T$^u#I?_*$ZG*`^<7V!aY4YYEQz!X?!T^#vaQPTK|Bumo
z?2Sb-g6DG+A4LFkgc^heau2}2S!$%5y%$ULxcJ<M$i0^{bT0%}f3qe;s_*A6_5!ek
zZsdx(Jw{%-A67fUvmO9A*d|jCG96H@RjLOkwbSXHU~GBoMCRw^t_Oe~bd_TdK<IUs
zkC3u;Gj)5{Ba=hq60~bJK5^}t+>yR<otvDD2qMqQ>p>Me4HbeIt5c-G+x`6nT^=GE
zH=@gVW|vRW;O5@G+XSt3kOT{VrRyr417-hhe4%Lz?5yJE3cKz=g(CU#4!#I{;nZfd
zP|!SRgYV?Wu>|s)>rLB$dPC)b4g7V}TDGMc8Q{dm6nF(+K(KBG0LsmD%JKzHhR(eY
zzL;3ZkG1M0nAj6`gRAu0rMyf|+(M4-Qa%`-S9hrnwy!gEL7bf2r9x#_u?}FqBJFoW
zUB77F)Y*ftnp_;LV}uS9MEwLZe`A(JNmSo!E!mA;x&l?^Jb>Kq9ssKvw@CZi8wcqn
z&ADA={9Y61x<S^A)^W5~_KnsF;Ri!?R2)y4RWWbcKXF}V0QnU6H;9&_W{Gm?d5F^+
zt!ue!pNeVP&Ql<AH*Cc)!CPvsE&DdCtuk|vN&&$H-32GhNN0&m+k`5^nyb9Oi66(9
zdx_TusPAK&2XyBS4Com7Vh5J*XgPH^s*k!h@b_2)55Ue`uhX`m-UxYM3xCzLi4j6Y
z6^7~nb>#|G9PsxWhFufpoFMCW!Mt`z`fh#$&mS*Sx1+&v%?+O3Zap8~V57SM8UC8l
z9c!kYu50a_B-8ftMua0>*~?72p{=vRJ>@|_Yt6ws1he5r{+!praGrywIq<Z6C$O6X
z{HiK&PL&5A;v%3ozdnQ&Unxa<;Ov_$-|pdsmV=Uwvj$x@&f;lr>H3z=8SX1ja!WkM
z$2r}-U>{;=x|usM)WErjGDz)%#^-RCr$Jvb{aLTWu@{Ocf>GSSkMrBujiCrX9;sHU
zyDTt1O3EID=y~};inQ;`(4F8Is{2wQAn;)c*-07p$C};#djVE4kgJ(H;X#-rYj(n0
zaY&xrNo}H^h}21Oyr6Q*bjPgOQ_ZsnV7}%_0`r8xDxqDddKfwcQ17KuzKasVR#?Xl
z7F19EKXIKiW!)}dq_;PVjyI~Xp7%~yz8*ZGc>yCQjd`+!?WTy>&CxmqkDWW+VVzBw
zTRDHO88ChQ2*V;N+f9j)3#};91@kKBT5-|ltJTb%JrxOhN;d39fYUlTyPINdC)0IE
zxy%Vu0Wz+e_CcJSZb4^cO{mK7|JY>i8UY&oIh^&qjAfXLnHq|5wcL9gigA@peucN_
zdQayp_pi^eCn5xboHN}Qj=->L8fh)J6hn38+Yqs9M!JQOTIQT9jc@TXU030pBST-}
zPXXj)yv#cR<h=hfzi{wXwrl$Y(=$C*{El+5>6xxu>|7w8@A9uL>kFLo12Q{>ghV+#
zj4bK%CWo0JlkV_0IFx|pbb1pjs_8w}eWHvBhOrK0j~O6q{DHtwV2X4T*!0)z$w@#?
zY7klVC^XbBtPm43M0P%S&K`B#a%slMf@we;Uy`Wl9AUpFN{2v2KL4Q#@!)&IbPPmg
zwm%0jw%?rT+|heSk`Bt@`O~W^<*5@K!R#r=r*r!R4{MdopT2PRtm%$L75}UflU-D|
z*Gbtd{!eimhRY*+26yT8ZKRG$;rX-YSIlzEn_|uzwD;?WS!(`OxbXiLE|f=RK#bld
zf6jooRuVB2hLDziGXa4Hm_H$EB1a-1kV91khng4R_P9tLlgt}yRImq!T)z%N#aJm^
z%3-J&XkJ86lsu$WB*1t4grhu05T9f=6l7k6w}MyQJaW*&P!0~H7Fa4*b-i*fb_cx;
zOop9{+>!5qfw6O;Og+V0o3yt3))@RgT>ww|5C^#Y{l=>q&K1)76BzQ&<+AD%UZv{{
z=Q0`f0oSv0seJeWf3M=5OWYrQ1mn<ex&h_O8~F6Ih`#G@JS2V@s#NuBut~emIR`zj
z{+!pV-VI91&VdcGxXy8ZfOV(N0m3t6!+B_P&RU837;vw1rQG*1&nPiDN)iBK{67H|
z@C!1q@4G_{oJ>n;9X&)Z(kB4k!Xf8}@eJS%O}rOq!x_LtUI>az1=27EfsxCxkPfI9
z)Z6N7^lQWj(||Qkb~y(0x9m=~T*Cj(ab%YivzVs(e{u&5&MD@Nrt|!Nvb*AJz_CXt
zuKfchn(*J^lHq)(2^jn*H?NrQla~7_IPd=dxubAEG2ih&PcIyRhPIf|WB+N$%y#4y
z4B)L&wV%Rm+bnQ9`V9os@LkQZX2(?!^Co$EKips2<&0Ttr&Vjmiz+yiH-H)cx6RVB
z?6UGwe(-<ZthB6{U6Or(g2L|kpK&P5DMqjEmDvX<xOT_?+*^)b-TlA0C3(F0@22w1
z7`Kx0V$4lmDIYa~1*^09**V2l)-lt0Ze<n2KhMvZaD|mD$t^1x<;W>4<EPE8xr&2B
zy59bG<>C3+h5Y2-6K^KXfQM(y+jH`>3yK|OgUXsgkv8JBTE!P8na|ECEOvCy=va)<
z2>=saTOjnv%o<RNb<o|MATtH%#42x&dFW=&bj~oKKSc$_C@Re>Dx`+{FR{J`M|@zY
zMOdnB;9a}XFm08WbX{_TkBs_*A5fheyk)|t+}WqH!K-yh3gC_GUUK)R@K5_+0LK{7
z;3>ry;P3H}-51~lvdi6{0lsh_{E=<i!`NleE5<G~xlPwcHMEc&e{zhgeV;%Hz6zzW
zA+y2Po%kEzxeW@+hq1`uvv`RJV-fC{s_SAK{N+hj_W*{gQ0gwTiB@hj5lhsvxv5e#
z_0wPcm9Kd&bRwMqHEwhJe!+intpnF1>MB4-)=dT-RfjVG#^}0PpkwRifR3wM0P3hi
z%!^S`w*quxy=hHPsyCaftT*l5DfK3>Fty&aN2k>XfKIPB?Sq;1;h<IZQJ~fJ<~h*W
z^+}*}>P@3~ZhbowPMBBU9&~<vI_QG>j-ZR`yMQjP?+&`8z8C1y`o5qm>a#&t)(-%!
ztsewhSC8WxMtyw|sI%TY+}Th+4z#g;BIphEGeK{vp9^|({bJBt>Q{o^>Qv1`@u>L&
z51sEteh#DgSuF+L5QLn78~i|9-{6Dd)lRdAYn)~e*E(B*u5<c>u6LUKbU9Jq*ys!c
zZF0tdiZcQ94yW0}&CU*>+nk+2w>x`+?r>&--tEi<z1KMe^ggF)p+Dd>p@!NAo#tWH
zoz4lMyPT6icRQznKIEJMy4P6^`modN&m&HAS`IkPUOnnGr{%E*vp0`7m@j>}!IUIV
zG?*{?RD=0)PdAvuf2<)1^qGbf&}SRcK%Z-X9br7*&<XU#+6HsTUvB6Fdc2`O=qnB8
zV87Zh81%IUbFg1;7zTQ>!5r*28_c(UyJ0lwI}PT*zuPbY^u2~k(9;d(tH0kc9rR3t
zITar^m@Dd|2J_X=HY^1_-(bG_$BhK~Nn@?T&!>%MKQ1(yV&t<%vmc)~Vmgd38_fa#
zsxcV!Vx!roZyF;(zil*!{kz6^&`XVG|1LM0ga3V_xvqX}H2e2cqd5gXH=5o1wb5Kr
zzcrej{Jqhfjz1dBPX5_A&|Ld}H5PzgZ7jhG;70V1Y>i_;?Tr<no{dvMy&5qc<lTtr
zAm2tz2eoKi2->m{yM$UbVv&*m4cdHnPn^7h<I@Y6$0%3~cheB#0W7uKbzMwDn7Lz9
zrL&J(2=75rE0rWCeN=`T)ey3Ayc$En8xO0|IGgdLCrWyf>Ih}Kiqr^bB2`{0QNARV
z0f!74iI5Myl%M3Xnjg~q)cbMn8FB8F+ydI#XrNavf6v=hc|)A}oDmd@2PDgDtyD)f
zvLOb~NtT;EVfICv4;ukR1<z?Cy}VQ=ToHI!8C((9pK~KXFL0a=;__B=Q_X2=4X1>0
z6ep;9!pXCpj?y`t7>&o7zC}1S^d5koELDxzV>5tfqwc32=@M&Gv67mLvp#3XvcCu2
z-CY+zH(XW59T~tg;=g;)o#JU%srIeS=lWi4W1j1)vM^QI-J8RF=;kDylFkbz&0j1#
z#z0>L*s|FU&&}O((5~Wve4n=C{SU|v6I6@w0I0S<Q+I)tvi1_VJwGlzJyd77duDr}
z+Cj5g2Uw?o;L^!0)k`_U{!p`3ll`@7*P8d3BdcL0K~<PVTa8A{;{shD*pTGD*jkw(
zltUX5<r`o18YRe)7V0QMu2!^EuQvrMyZ3LV`)31=mHmdhzSMPP4Jpz-L?I?QtD&tt
z>8G9nM!w2lJ%UJ=j;+-}^CnMtn-HJ__1N?_N$da)Q1K0E?vJ9;J6+eWp}pJ?sGbG-
zJtRmSLCls%FdSx0z1ikPa}Cv!t7z^4f4|A7yQm>UiX+wU0O^KCsqKi_x)`OtZAw&Y
zsgrwMA{=ap);gG^?xIZh@HT1}4L0XB&cK@A0WI!5;|JJ<@zjgTs0z60Hgcor1{_;Q
z5E8scVL1Jq3-3`i%z^#<7XJwKw!fOL)~Q2MjFT@(rbxHk1_%Hw<tI#i;(F2nS5g0>
z(p)|)hvQVZ?U3p65x>g{Si|G4P536jBl1M73J*PKithj8dl*>CdvR<@g<!_&;#7b=
zuQ0ESA8NkNFUlUkd#r1T{ZeV>eO4m6xCpMAhfVe6|1?)xn8%NrbwXP|X1dg^;=y@&
zrq;1mzK&B-wh7kj9lezUBj_np1sk55Q&v>s$jQ#nF?Ag?x}R>5-tjoKv{9zTt2`YB
z55M$FP{ERsptP(lQ8sL}b@4#P%?w>U5WDMo(r%;hBvtTteP4=^J_#yWhqh5g&AGE5
zBVWcIMRu4>DOD{Y!X8BxigY~^l3*KZ1r*>D1qdh@($rQJ1KS$bR&4}E_<37(+625(
zumrlu#CGZ+b#{lPs!|&Q&#E#o{k^3{rn(B;uSG}o1i~y{?x-H59`3oFR4bzXQr{W8
zDqDW*tm=X1E$^aUr!04VSJm1KU~_a+I}Y|%`9uTU1%1@_L^;wgOMMM2tbIQ<g9f>!
zAD9>-i;icj+bGvPqQBZn9nF;%jALo|{{e9BAVe-T&^-u}J4=6ISHtU%;9?gLh>w)N
z8lq~{y^^8T5J1#@ZQXTII=i0!JWgWf@p&DEQ@^fkN0_a@bv1i@n4Ei#&)d#-)PquG
z`|~igUVDf`?euwfU3x9Uv5Q+t)C=qfH-3i~a5nyIC!L3I!tC8J+p1pRaD4$GTax(#
zu%^d%u|Lx}dGrO&Xc_=MG1Q$gKn0NZkbo3Z?Q<@2$o76JNEST7{_c6X;LnujzIUKn
zN5G=G4pt`t`+4MH*o)+;JoPdVzng}rtw8+R3{|rbFy$Jms<46WVlPwg0M+`S43$dd
z{&MvlmAIRRV-(w29GAQxhNvq}P}R}>Ko)+*SyedR@ZpFjVBn?V$Wpc1?8-Qjgkd@?
zFL%Wmv2pTqSA;w84-(Q1(4}3nyK$oZi_SV1akRAu(q(fuj<U~=(n-MWcGRgrZ}Zy^
z)t0+LZePg>9<(P_cL8vYM9lRd`^TjBLY-_|+D50PNxy|U%)7dBzN2FD<hi^^Ze6Im
z+HN!_Np44xoL#6R=pOlFp^hS_ge}s=bR*8%=x+9#(sV8!JFZ-Z%F~OqA6;r1sqUlU
z?)yioZ-~m>8{mDWaI^1T+~45-IJLZkPavLppjv?7(6_<p+On(qsdW0ywe6`6I2C{5
zsZ<;T{p~5Z)ULWRpYCTjI_ORa@ci>8Y73~%wd3gwZ<VIgdss(MCEJt3aq7aG{*qmb
zIo1E?W_I7kfW`im@vzZmU3Rdpvo(yCeiPMAG|K(*MAZ#&O^1e&?r+CIf&e6pb*N9h
zl<}sa>Ug)|$~=;Y;oqU1<qhN9*_G-Psgj1V^7RDuHju}o6>7Ps*`XlnYKU*K`W%%9
z={SWLh4ZZdE|`qMR%Cr}#7ujFPYk}E3b)gsL^af^8N*mrPYzRwwtR4oYhNe%%Zq*O
zRCt{iKzx)aZ-CROC8~`sK>U$VsS5UK_WY8M$)d~*IazXzMQOk5m8?8Ok5Y?&=Xhve
zlTTg0$?oAOD9sy*P?9Sp;8xxyx3bEzN>vMLW#(RER$j88R3+E8G=;$M{LC&03>`So
zJVIqgGL1B&G>4ZWgdlfhae2OJhdBn6!y%3f;|J3e98r{yID$cWs8Pt(X0Yk#Ttt?a
z6_w`<c9fMD;uIE2EH-@6oI+*XYA9b$z|X(`T+x0t+8Nj|!R?%`5CiN0)}t=yx|)XZ
zQZQLvYMQ0&z7q{d+N(6d_{f+Dxm~Q5G*n7Xm0AXn_30|`z)8{{nhoIF^VKQ_a&~k>
zh1@qyz28)$%(FjJ4Yke;vcuvWh0<{i)8zd*>KsjVKQUM3lA6^pMc$sJW*wZbek7Xi
z{%HZ=Q-tlsE>??ZhI`XuL|k+TGDg8LgS36r_z=e$GHDDX@IHDUXR15%bQXSwFX6yq
z9-z0o)GK(+WZhne6q$fztYoEV4?CYr(;>tD&aipaESk*c+v<=(R-SFvf@=QgZ&#ze
zx}vI*&;FCHnLT$te`uytZ11+yAwwk-7@B<3Mtd^9XXeLwO|6(;xu{|Zzhxz*Cdhp3
z8*Ow*j#(LJdr!%_aMjWFc4r;pXuf}Mm~L(7cdS>l8vHO!``GzS>j@T`dbF!q<CE(z
zkFPOw)h(q}nzrfbllgOTghFHc!g^7w$jj`=h5y{&QeKb1F8b`hnRcs7pUS&S;ZM57
zJO<sFb~LTR@wSFJ61hrEq8j(ARam!xRM*sjYgdb-Ufm6}mYr%bV&j%Ml^1ct0=c0<
zea8*+-HRHP2QuclSKR<rkQ?So(~W9BH!PJQH>s`MummT);9_l9Eaf+=d$?hd{C>0A
z!VL@En{EMPYZrhoh){^}9awrbj^4kAb6xH5L76&ua!x^=Y6~`3rEZ4*&Ya+5vNT_{
ziQ_+`b#ek%Ra93@t*ol7o)4VU1Us)IonOlP`DzDXy5$8bp6QBgFF-&6{VA^%K&p(E
zO@+|-hsvvkDhjTTuL^MvZj7WAscekt>>><_$H5Ki4RmIO`>l;uf0xTgO~64KmbpiW
ziiW~33pc6No<{3VagcshvUeoM$)0<ZkL>J((8&IGsE*uFD+}*1hhn9>-Da@BgWJ^x
zME|)r?oeM4v3un`Dwq)Yxba@K3DJEW?o)4a(?ifYyk+M@(51a(@gDV%muJAJ1T$^~
zHqu^z`^y*U#HNRFdcAtD8U<kGrM>DFFMGfet4^G3y;rrBH4lL0!1vTjc0a7jn;uoq
zA=3N#N1?O$%Erf_?D)9598}#I&`I^<3J2?C+#&TbwRHD8tUk0Mz%BYHLe!|WyZ<qj
zk03es?awMe<iYL-@mUd~AosE7A^Q>d_Rb4X_L|;SdPoA0ei}%lXbB1JHC{A6GuGmJ
zI?L!yM4mAGAU({3Wn@n6RCrZ3@nK6_Zl&5_f-4bKekbC}Uq<+ciFu~wo2b;_qS7)G
zsT%Ic&mEqduYydy)yll4Z8}Oy2j>;2Kr`g@Kl#^!d#p$*_$Fqb!j!d^HK$Z$TYpo#
z&FfzPwYAvNZhtqqv6+!w>L@HK%Nsb#WUs%<ws)~9_!s%)9d%ofdDGxx1V{n!Lot19
zK2pZ*<giFOZ|cQ=7n%TD8Q?%bZgf_%--Qf4C*$8$p~0V+eah?aD8UgRlT}+sjwZ_M
zs1o$O3GC(Nm~WLc7|~+pA%ibnZGz+IvTV)Op|;Mk;F_-5-H~!CS3g<YXbwdlzWD_c
z!ZCcL2@jgFV|2S2YK44c^BS{b))&HZ%LZTnN*EWJZ(-%)Rjz$HjEkFIg6$jT9{G}~
zw}rZIep%%a0_5L<H-jkBJ@Zx7&pglb&<WL@DBOMFH8q|n#y#Mq>P-~wu6qNzHbuGL
zd=qR5Z9$8B4@@K8z4JYDy~MenISuQSV%;CT59N-M+>d@><|n#Od}wZ_1oy>{V2@E-
z_lk20(dNnS`_E%bQXBV|ADaqfd+G4CikGdQssk|jhFws1BH-zp3(yQx+#i01m1?fQ
z=$7<^0V8@84!!T;_mv+auZz_}upB=GWPWOWkLp0IUoy!}Tk((xd1NcrZn%876{cg5
zByB@9=5)#52HmzwmTyC=Gi3WVM5IoW6Wdf5`>Z704St*Ru^bag(=8{C$xGprSy1&a
z7h0uU-HOQBn<eKi+<TMM+@(6&H(4Keay@+*AKj>H`T~8;kab_E4`7tyCqe#r5HGU(
zOKi*zGW09##56a0Je{bsY`TbD+exN<qfUEw3`p-40&ZiZ%bagixWsyZAFTLRZSu(s
z>}8hJc^JK9$3<-ZLJt+=9{HWQi@VG6OX@Ogpz6!m>Rn~r_v$U!K$$<Nx4?XXV2w5!
zjD5xj(5gGpNJ!X+Az?jX*AC}3{4!#L`l-e0G3?6r68@9=3$|V8&nnHn**cWr+Wtkn
zRQ(Lej%WU&dg?^;*ut=1U<uUhF;7kcuw|eEFZ=>rBU(I`aW@Qo|Bkvhth?HddI-ff
z{R)xa%f0wl7>BUCR{jPntcQE$?})X8Z8q`>N_)FcUQttsvL5TEQ($npD@dPX#9s8*
z`bOAV$F;s0Hd>iYuY!&Cj!nNs{oFh4`WQ?u_e@WXsOenyRBwHTU~uI4>L*}uT=mt}
zkO9>#wBWFmy`^3O9kHRMZh+C|)k@!m*oB>~^q62DE;6_XEDIlLf`JjL2EawrB!xe6
zFD$3usrgePCyTIdw#(qR@llZB?kR86cxnpNx8O{~t%3S6m_XS<`e7)mmxJ)sBAF1Z
ze}D;87NYls`*2SKkyxV<g|q|b2EJ2qssJHykE)Lj`1?h&oSUg*=$I5OLdeEhDLMqd
z+?O){5K<3G(;*yLe=1WKVP#e;SP*9qaiD#9s!qiRNXEYePbC;g>|va0`Cg(9aVEVc
z<%eMc^_SYiXdnl%2+<lZ922Rx!q$){qx6fqEFffz<j3gtax_8v$#c;dlTvqH48Hg@
zz|`8K;opLBItUA78i1~w5ZwC&zsG-42sT|iz#o%fC6rM|9F+JSirY3?h~VFE=>=1U
z8#^rqU#TsB&e{TvPagdy<8L>;KR;V%p=byqZulqb`e|H8@sFlgXuv2OY=r7Ne4wRm
zBPtef11!4Ux2ss@%MyM&w(%v2dk6gf>)WA;e0S}-w;9{<t(i#12ZQhvDPQ%~-pm(W
zbAsb1eQi2P%p;+W9E3<0m~f4i%F9JE-&DJ;<cPd{Fv~$)*jynO2PKOggE-R^3<D55
zYbL?>83<M~GD^T&2Nqe1J^e1<u7-;InY3I3VNfcmYhXQ%la*^!SeVn~<GDFFz)+k$
z2nRIFi*ZB~yt_g6tx?l$H=1I`wem3Rhj&zbP@qbqfyINeo6k0s<eD(gyrx7<-5A-H
zsE<RlnVy7YHcG<U=zD3TJk>^TqY>_L_>2;HR<sTohES?;GAC8HGu308oM@~2(FAFk
zq8GyqxG@F0XuSBh)7!nq1%%{<g@n~jYOWpBRksoER6U-?x~HdV(M|X`3y#oq@2r=4
zO$i7YiiYbvB&)Mdl|v~ySpMv+`y(tPtBbzdYqD96wkl;^FO;LLMwkzGcGX+-#DI_y
zvIB8_vM*G%a4+bladcsZdwF;LxM>x1>8Z;I4EUB_+WbUIW?vm|M)S0g8NKx@VAIG*
zmHUA+xgPq=M~>&|ZgP7L6y@W6^c0$97XJ>LqJ5TryZMBhi5-|~=H2+J$}b4v?}LMW
z6^QzN3^5+R;NvHqalUP#+N6$HQQoIz)IRWV-{v5kR*$Gg`;j=Ej;%JfBS(Z$o%K1d
zDOEN9^~+C{*B(*B%w-+7A7S*XC4WEU%?S5`{c0#R_0xN~ajxv^r`K`g9BI>ECrQhN
zfM+K3$Ar{p>w6H>fZUIvfM4&g6}@D|kp@XYjy}*dSbxQh3+3WqeFrx#kQ?*#5pJAs
z{>I4TJHdOc##Ro|PHvp%RzvkEAo@$(XYzG9E*4A2Lj5i`E^_-6>3PUlDXWUj*I6L}
z!*ne-E|(3%^lENgCJ7~a2RANtzfhukl4Y{{a;D)9UJG;`+%J;k_;{Ucf6)p`m38k?
zv=60U|C(SYm-$`7mnF-g6TEv~k7ey_g{a!!zV;o)Ul6l@ZXMw8Lk@&Uosu&SohTXW
z5wi5fe2%fd)!g#hFCaXYuSbMkXRFb7q-GsHcG$J4OizWc{`WGB;_5Oz3xNx`UPmmq
zm75&R{7IF(T`ELo4cB8}5g-F=XaqhY8r@g>HjU7exv}<I?ryBC$Smz8+eYY#O%t>O
zfxZ(a=%rA|&rHxaK_Q=9p_fCdov*+W_K>L)A${!f-9$XmCUuka5h&DsCu1YFa(h+k
zxuzp>`4qht%6E&Yx&|w0<y2kYG}c79X6b>@qYGx~H0aT?tV-{NbE91~gi&jGrdmG;
zIAP{&y)n{cxZXU_z{#@th}C@waoZtau`^YZIu7~Jj%^lx)YKoFZdSI&_e3w7QPCmh
zaD;d$-5jNPWw6FqD1Mex4?;KblKXdpOYx7Ayb}x5LteL%KgpjDs&+Qd>(R?m<}O2f
z-~Js%7e{n|jn++z^>Yy7&o9=sP+M}BU}VDNwIvvfP#L}yJS0TUEya)on?Dh<dYPX0
F{{iZ~HI@JX

diff --git a/mlxconfig/mlxconfig_dbs/mlxconfig_switch.db b/mlxconfig/mlxconfig_dbs/mlxconfig_switch.db
index 1c97abf38484a1ada1ea5f1f980292771f071d70..71c53ca25c880e9b07aebf9c99a95fa8316017ba 100644
GIT binary patch
delta 275
zcmZozz|^pSX@WE(^F$eEL1qTsN1Ch*K)?bb7&tczvP@v!#G=o_oyg?NB*6Hc$(l)H
zW8qxJ$=5ksCg*dpN(u`zYcuAR#pmXyl;)(y7vz_x770l*n=?)hEEL_`$K}t({EG4B
z<Od=@MFp5u8GZd-LVaB0g9Cg#L(*lL?HMQEua(@)E_T{VK3$eYUYjvDu>xWUnwe>v
zKL#Atk|-|7$t+><^K>>4;Dnf^05)s#xoR;ju;mO5!Qq}E&K?FFFa-hr;jTfvK<_X!
q=rb^xGhAfQpIE3kIj(*Yb5nBq=HIo+jLgk$X`78|jxjE35C8y$Hc~(U

delta 252
zcmZozz|^pSX@WE(%S0JxK^6u*|5{cCAYcIz44j(<Stc-VV$o;e_GL<B5@7t!WX+_p
zv2ZTq<m;R*lk>S)C545VwHfou;&by;N^?@<iwklxON1nu%^4>L7K(1}<MQWXzRCD~
z@&l2dlV6F-3Z@G%t1|lfyM+3<#s>%Zc!q3d7dvgmmL|(0ugy5ww@!jFee=hFqgoOL
z`Q@oaEPkHO1{|Ca^$G$0;jTfG&sB?Qfo)-E2oCoQarQ6}fGGeQ$P08gGlM<@;|~UX
j=D3N4ip<S!>6@+UjxjPfC8uq^Qj^R$S-)n{q6Pr~fR9Lu

diff --git a/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h
index 0d418bde..ec5b4e11 100644
--- a/mlxfwops/lib/flint_base.h
+++ b/mlxfwops/lib/flint_base.h
@@ -261,7 +261,7 @@ using namespace std;
 #define READALLOCBUF(f, o, d, l, p)                              \
     do                                                           \
     {                                                            \
-        d = (u_int8_t*)malloc(sizeof(u_int8_t) * l);             \
+        d = (u_int8_t*)calloc(l, sizeof(u_int8_t));              \
         if (!f.read(o, d, l))                                    \
         {                                                        \
             free(d);                                             \
diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
index ecae44fb..eab3b5ed 100644
--- a/mlxfwops/lib/flint_io.cpp
+++ b/mlxfwops/lib/flint_io.cpp
@@ -237,9 +237,9 @@ bool FImage::read(u_int32_t addr, void* data, int len, bool verbose, const char*
 ////////////////////////////////////////////////////////////////////////
 u_int32_t FImage::get_sector_size()
 {
-    u_int32_t log2_sector_sz_ptr;
-    u_int32_t log2_sector_sz;
-    u_int32_t signature;
+    u_int32_t log2_sector_sz_ptr = 0;
+    u_int32_t log2_sector_sz = 0;
+    u_int32_t signature = 0;
 
     read(0x24, &signature);
     TOCPU1(signature);
@@ -748,7 +748,7 @@ bool Flash::write(u_int32_t addr, void* data, int cnt, bool noerase)
 ////////////////////////////////////////////////////////////////////////
 bool Flash::write(u_int32_t addr, u_int32_t data)
 {
-    u_int32_t word;
+    u_int32_t word = 0;
 
     if (!_mfl)
     {
diff --git a/mlxfwops/lib/fs2_ops.cpp b/mlxfwops/lib/fs2_ops.cpp
index 8b0d177b..bebbb1a4 100644
--- a/mlxfwops/lib/fs2_ops.cpp
+++ b/mlxfwops/lib/fs2_ops.cpp
@@ -348,7 +348,7 @@ bool Fs2Operations::checkGen(u_int32_t beg,
     const char* sect_name;
 
     u_int32_t size = 0;
-    GPH gph;
+    GPH gph = GPH();
     bool is_sect_to_read = false;
     // GPH
     sprintf(pr, "%s /0x%08x/ (GeneralHeader)", pref, offs + beg);
@@ -550,7 +550,7 @@ bool Fs2Operations::Fs2Verify(VerifyCallBack verifyCallBackFunc,
     {
         bool fs_en = false;
         u_int32_t log2chunk_size = 0;
-        u_int32_t buff[FS2_BOOT_START / 4];
+        u_int32_t buff[FS2_BOOT_START / 4] = {0};
 
         _ioAccess->get_image_crc().clear();
 
@@ -714,17 +714,22 @@ bool Fs2Operations::FwReadData(void* image, u_int32_t* image_size, bool verbose)
 
 bool Fs2Operations::Fs2Query()
 {
-    u_int32_t guid_ptr, nguids;
+    u_int32_t guid_ptr = 0, nguids = 0;
     guid_t guids[MAX_GUIDS];
+    int i = 0;
+    for (i = 0; i < MAX_GUIDS; i++)
+    {
+        guids[i] = guid_t();
+    }
     /*
        if (_fwImgInfo.wasQueried == true) {
         return true;
        }
      */
     // FW ID
-    u_int32_t fw_id;
-    u_int32_t fw_id_offs;
-    u_int32_t fw_size;
+    u_int32_t fw_id = 0;
+    u_int32_t fw_id_offs = 0;
+    u_int32_t fw_size = 0;
     u_int32_t im_start = _fwImgInfo.imgStart;
 
     if (_fwImgInfo.ext_info.is_failsafe && _fwImgInfo.actuallyFailsafe)
@@ -769,7 +774,7 @@ bool Fs2Operations::Fs2Query()
     READBUF((*_ioAccess), guid_ptr, guids, nguids * sizeof(u_int64_t), "GUIDS");
     TOCPUBY64(guids);
 
-    u_int32_t guids_crc;
+    u_int32_t guids_crc = 0;
     READ4((*_ioAccess), guid_ptr + nguids * sizeof(u_int64_t), &guids_crc, "GUIDS CRC");
     guids_crc = __be32_to_cpu(guids_crc);
 
@@ -797,8 +802,8 @@ bool Fs2Operations::Fs2Query()
 
     // Read Info:
     u_int32_ba info_ptr_ba;
-    u_int32_t info_ptr;
-    u_int32_t info_size;
+    u_int32_t info_ptr = 0;
+    u_int32_t info_size = 0;
     u_int8_t info_ptr_cs = 0;
     READ4((*_ioAccess), im_start + fw_id_offs + 0xC, &info_ptr, "INFO PTR");
     TOCPU1(info_ptr);
@@ -812,10 +817,10 @@ bool Fs2Operations::Fs2Query()
 
     if (info_ptr_cs)
     {
-        return errmsg(
-          MLXFW_BAD_CHECKSUM_ERR,
-          "Failed to read Info Section - Bad checksum for Info section pointer (%08x). Probably the image is corrupted.",
-          info_ptr);
+        return errmsg(MLXFW_BAD_CHECKSUM_ERR,
+                      "Failed to read Info Section - Bad checksum for Info section pointer (%08x). Probably the image "
+                      "is corrupted.",
+                      info_ptr);
     }
 
     info_ptr = info_ptr_ba.range(23, 0);
@@ -964,7 +969,6 @@ u_int32_t Fs2Operations::getDefaultSectorSz()
     u_int32_t devid = _ioAccess->get_dev_id();
     switch (devid)
     {
-        case CX2_HW_ID:
         case CX3_HW_ID:
         case CX3_PRO_HW_ID:
             return CX_DFLT_SECTOR_SIZE;
@@ -1710,15 +1714,6 @@ bool Fs2Operations::Fs2Burn(Fs2Operations& imageOps, ExtBurnParams& burnParams)
     return Fs2FailSafeBurn(imageOps, burnParams);
 }
 
-bool Fs2Operations::Fs2IsMacAvailable()
-{
-    if (_fwImgInfo.ext_info.chip_type == CT_IS4)
-    {
-        return false;
-    }
-    return true;
-}
-
 bool Fs2Operations::FwBurn(FwOperations* imageOps, u_int8_t forceVersion, ProgressCallBack progressFunc)
 {
     if (imageOps == NULL)
diff --git a/mlxfwops/lib/fs2_ops.h b/mlxfwops/lib/fs2_ops.h
index bd4a9e8d..c1dbad74 100644
--- a/mlxfwops/lib/fs2_ops.h
+++ b/mlxfwops/lib/fs2_ops.h
@@ -214,7 +214,6 @@ class Fs2Operations : public FwOperations
 
     bool ModifyKeySection(guid_t access_key, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
     void PatchKeySect(u_int32_t* buff, u_int32_t keyOff, guid_t hw_key);
-    bool Fs2IsMacAvailable();
 
     bool ModifyVSDSection(const char* vsd, ProgressCallBack callBackFunc = (ProgressCallBack)NULL);
     bool
diff --git a/mlxfwops/lib/fs3_ops.cpp b/mlxfwops/lib/fs3_ops.cpp
index 6c5a5f71..37ccf514 100644
--- a/mlxfwops/lib/fs3_ops.cpp
+++ b/mlxfwops/lib/fs3_ops.cpp
@@ -266,6 +266,7 @@ bool Fs3Operations::GetMfgInfo(u_int8_t* buff)
         memset(&tools_mfg_info, 0, sizeof(tools_mfg_info));
         tools_open_mfg_info_unpack(&tools_mfg_info, buff);
         strncpy(_fs3ImgInfo.ext_info.orig_prs_name, tools_mfg_info.orig_prs_name, FS3_PRS_NAME_LEN);
+        _fs3ImgInfo.ext_info.orig_prs_name[FS3_PRS_NAME_LEN - 1] = '\0';
     }
     return true;
 }
@@ -351,7 +352,9 @@ bool Fs3Operations::GetImageInfo(u_int8_t* buff)
     {
         strncpy(_fs3ImgInfo.ext_info.name, image_info.name, NAME_LEN);
         strncpy(_fs3ImgInfo.ext_info.description, image_info.description, DESCRIPTION_LEN);
+        _fs3ImgInfo.ext_info.description[DESCRIPTION_LEN - 1] = '\0';
         strncpy(_fs3ImgInfo.ext_info.prs_name, image_info.prs_name, FS3_PRS_NAME_LEN);
+        _fs3ImgInfo.ext_info.prs_name[FS3_PRS_NAME_LEN - 1] = '\0';
     }
 
     _fs3ImgInfo.ext_info.mcc_en = image_info.mcc_en;
@@ -683,9 +686,9 @@ bool Fs3Operations::VerifyTOC(u_int32_t dtoc_addr,
                                 if (!GetImageInfoFromSection(buff, toc_entry.type, toc_entry.size * 4))
                                 {
                                     ret_val = false;
-                                    errmsg(
-                                      "Failed to get info from section %d, check the supported_hw_id section in MLX file!\n",
-                                      toc_entry.type);
+                                    errmsg("Failed to get info from section %d, check the supported_hw_id section in "
+                                           "MLX file!\n",
+                                           toc_entry.type);
                                 }
                             }
                             else if (toc_entry.type == FS3_DBG_FW_INI)
@@ -1396,13 +1399,13 @@ bool Fs3Operations::FsBurnAux(FwOperations* imgops, ExtBurnParams& burnParams)
             // we will take device data section from device: perform some checks
             if (_fs3ImgInfo.itocAddr == 0)
             {
-                return errmsg(
-                  "Cannot extract device data sections: invalid ITOC section. please ignore extracting device data sections.");
+                return errmsg("Cannot extract device data sections: invalid ITOC section. please ignore extracting "
+                              "device data sections.");
             }
             if (_badDevDataSections)
             {
-                return errmsg(
-                  "Cannot integrate device data sections: device data sections are corrupted. please ignore extracting device data sections.");
+                return errmsg("Cannot integrate device data sections: device data sections are corrupted. please "
+                              "ignore extracting device data sections.");
             }
         }
         else
@@ -1528,7 +1531,7 @@ bool Fs3Operations::ReBurnCurrentImage(ProgressCallBack progressFunc)
     vector<u_int8_t> newImageData(size);
     _imageCache.get(newImageData, 0x0, size);
 
-    FwOperations* newImageOps;
+    FwOperations* newImageOps = NULL;
     ExtBurnParams newBurnParams;
 
     if (!CreateBasicImageFromData((u_int32_t*)newImageData.data(), size, &newImageOps))
@@ -2935,7 +2938,10 @@ bool Fs3Operations::reburnItocSection(PrintCallBack callBackFunc, bool burnFails
     for (int i = 0; i < _fs3ImgInfo.numOfItocs; i++)
     {
         struct toc_info* curr_itoc = &_fs3ImgInfo.tocArr[i];
-        memcpy(p + CIBFW_ITOC_HEADER_SIZE + i * CIBFW_ITOC_ENTRY_SIZE, curr_itoc->data, CIBFW_ITOC_ENTRY_SIZE);
+        if ((u_int32_t)(CIBFW_ITOC_HEADER_SIZE + (i + 1) * CIBFW_ITOC_ENTRY_SIZE) <= itocSize)
+        {
+            memcpy(p + CIBFW_ITOC_HEADER_SIZE + i * CIBFW_ITOC_ENTRY_SIZE, curr_itoc->data, CIBFW_ITOC_ENTRY_SIZE);
+        }
     }
     memset(&p[itocSize] - CIBFW_ITOC_ENTRY_SIZE, FS3_END, CIBFW_ITOC_ENTRY_SIZE);
 
@@ -3550,6 +3556,7 @@ bool Fs3Operations::RemoveWriteProtection()
         if (rc != MFE_OK)
         {
             errmsg("Failed to disable flash write protection: %s", mf_err2str(rc));
+            delete[] attr.type_str;
             return false;
         }
     }
@@ -4058,7 +4065,7 @@ Tlv_Status_t Fs3Operations::GetTsObj(TimeStampIFC** tsObj)
 
 bool Fs3Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer)
 {
-    TimeStampIFC* tsObj;
+    TimeStampIFC* tsObj = NULL;
     Tlv_Status_t rc;
 
     if (!_ioAccess->is_flash() && !FsIntQueryAux(false, true))
@@ -4094,7 +4101,7 @@ bool Fs3Operations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct
 
 bool Fs3Operations::FwResetTimeStamp()
 {
-    TimeStampIFC* tsObj;
+    TimeStampIFC* tsObj = NULL;
     Tlv_Status_t rc;
 
     if (!_ioAccess->is_flash() && !FsIntQueryAux(false, true))
@@ -4118,7 +4125,7 @@ bool Fs3Operations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
                                      struct tools_open_fw_version& fwVer,
                                      bool queryRunning)
 {
-    TimeStampIFC* tsObj;
+    TimeStampIFC* tsObj = NULL;
     Tlv_Status_t rc;
     if (!_ioAccess->is_flash())
     {
@@ -4179,7 +4186,7 @@ bool Fs3Operations::DeviceTimestampEnabled()
     Tlv_Status_t rc;
     Tlv_Status_t queryNextTsRc;
     Tlv_Status_t queryRunningTsRc;
-    TimeStampIFC* devTsObj;
+    TimeStampIFC* devTsObj = NULL;
     struct tools_open_ts_entry devTs;
     struct tools_open_fw_version devFwVer;
     memset(&devTs, 0, sizeof(devTs));
diff --git a/mlxfwops/lib/fs3_ops.h b/mlxfwops/lib/fs3_ops.h
index 4f4e8d2d..88f0c25c 100644
--- a/mlxfwops/lib/fs3_ops.h
+++ b/mlxfwops/lib/fs3_ops.h
@@ -66,8 +66,9 @@
 #define SUPPORTS_ISFU(chip_type)                                                                \
     (chip_type == CT_CONNECT_IB || chip_type == CT_CONNECTX4 || chip_type == CT_CONNECTX4_LX || \
      chip_type == CT_CONNECTX5 || chip_type == CT_CONNECTX6 || chip_type == CT_CONNECTX6DX ||   \
-     chip_type == CT_CONNECTX6LX || chip_type == CT_CONNECTX7 || chip_type == CT_BLUEFIELD ||   \
-     chip_type == CT_BLUEFIELD2 || chip_type == CT_BLUEFIELD3)
+     chip_type == CT_CONNECTX6LX || chip_type == CT_CONNECTX7 || chip_type == CT_CONNECTX8 ||   \
+     chip_type == CT_BLUEFIELD || chip_type == CT_BLUEFIELD2 || chip_type == CT_BLUEFIELD3 ||   \
+     chip_type == CT_BLUEFIELD4)
 
 #define FAIL_NO_OCR(str)                                                                        \
     do                                                                                          \
diff --git a/mlxfwops/lib/fs4_ops.cpp b/mlxfwops/lib/fs4_ops.cpp
index fc15cfac..fc35b6d0 100644
--- a/mlxfwops/lib/fs4_ops.cpp
+++ b/mlxfwops/lib/fs4_ops.cpp
@@ -141,8 +141,9 @@ bool Fs4Operations::IsEncryptedDevice(bool& is_encrypted)
 bool Fs4Operations::IsEncryptedImage(bool& is_encrypted)
 {
     DPRINTF(("Fs4Operations::IsEncryptedImage\n"));
-    struct image_layout_itoc_header itocHeader;
+    struct image_layout_itoc_header itocHeader = image_layout_itoc_header();
     u_int8_t buffer[TOC_HEADER_SIZE];
+    memset(buffer, 0, TOC_HEADER_SIZE * sizeof(u_int8_t));
 
     is_encrypted = false;
 
@@ -252,7 +253,7 @@ bool Fs4Operations::getExtendedHWAravaPtrs(VerifyCallBack verifyCallBackFunc,
     return errmsg("Operation not supported");
 #else
     const unsigned int s = IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE / 4;
-    u_int32_t buff[s];
+    u_int32_t buff[s] = {0};
     struct image_layout_hw_pointers_carmel hw_pointers;
     u_int32_t physAddr = FS4_HW_PTR_START;
     if (!IsBurningProcess)
@@ -345,7 +346,7 @@ bool Fs4Operations::getExtendedHWPtrs(VerifyCallBack verifyCallBackFunc, FBase*
     }*/
 
     const unsigned int s = IMAGE_LAYOUT_HW_POINTERS_CARMEL_SIZE / 4;
-    u_int32_t buff[s];
+    u_int32_t buff[s] = {0};
     struct cx6fw_hw_pointers hw_pointers;
     u_int32_t physAddr = FS4_HW_PTR_START;
     if (!IsBurningProcess)
@@ -391,7 +392,7 @@ bool Fs4Operations::getExtendedHWPtrs(VerifyCallBack verifyCallBackFunc, FBase*
 bool Fs4Operations::verifyToolsArea(VerifyCallBack verifyCallBackFunc)
 {
     DPRINTF(("Fs4Operations::verifyToolsArea\n"));
-    u_int32_t buff[IMAGE_LAYOUT_TOOLS_AREA_SIZE / 4];
+    u_int32_t buff[IMAGE_LAYOUT_TOOLS_AREA_SIZE / 4] = {0};
     u_int8_t binVerMajor = 0;
     u_int8_t binVerMinor = 0;
     u_int32_t calculatedToolsAreaCRC;
@@ -579,7 +580,8 @@ bool Fs4Operations::GetImageDataForSign(MlxSign::SHAType shaType, vector<u_int8_
         RemoveCRCsFromMainSection(img);
         //* In case of devices after Carmel we'll ignore boot-record CRC for fw-update signature same as secure-boot
         // signature
-        if (getChipType(_fwImgInfo.supportedHwId[0]) != CT_CONNECTX7)
+        if (getChipType(_fwImgInfo.supportedHwId[0]) != CT_CONNECTX7 &&
+            getChipType(_fwImgInfo.supportedHwId[0]) != CT_CONNECTX8)
         {
             if (!MaskBootRecordCRC(img))
             {
@@ -814,9 +816,9 @@ bool Fs4Operations::verifyTocEntries(u_int32_t tocAddr,
                                     if (!GetImageInfoFromSection(section_buff, tocEntry.type, tocEntry.size * 4))
                                     {
                                         retVal = false;
-                                        errmsg(
-                                          "Failed to get info from section %d, check the supported_hw_id section in MLX file!\n",
-                                          tocEntry.type);
+                                        errmsg("Failed to get info from section %d, check the supported_hw_id section "
+                                               "in MLX file!\n",
+                                               tocEntry.type);
                                     }
                                 }
                                 else if (tocEntry.type == FS3_DBG_FW_INI)
@@ -2296,7 +2298,7 @@ bool Fs4Operations::readFS4Log2ChunkSizeFromImage(u_int32_t& log2_chunk_size)
 
     //* Reading begin_area.tools_area.log2_img_slot_size from image
     // TODO - read begin_area.hw_pointers.tools_ptr then read begin_area.tools_area.log2_img_slot_size
-    u_int8_t buff[FS3_BOOT_START];
+    u_int8_t buff[FS3_BOOT_START] = {0};
     _ioAccess->set_address_convertor(0, 0);
     READBUF((*_ioAccess), _fwImgInfo.imgStart, buff, FS3_BOOT_START, "Image header");
     TOCPUn(buff, FS3_BOOT_START_IN_DW);
@@ -2419,7 +2421,8 @@ bool Fs4Operations::burnEncryptedImage(FwOperations* imageOps, ExtBurnParams& bu
         is_curr_image_on_second_partition = 1;
         new_image_start_addr = 0;
     }
-    DPRINTF(("Fs4Operations::burnEncryptedImage - is_curr_image_on_second_partition = %d, new_image_start_addr = 0x%x\n",
+    DPRINTF(("Fs4Operations::burnEncryptedImage - is_curr_image_on_second_partition = %d, new_image_start_addr = "
+             "0x%x\n",
              is_curr_image_on_second_partition, new_image_start_addr));
 
     //* Extract encrypted image
@@ -3184,7 +3187,7 @@ bool Fs4Operations::UpdateCertChainSection(struct fs4_toc_info* curr_toc,
 
     newSectionData.resize(cert_chain_0_section_size, 0); // Init section data with 0x0
     memcpy(newSectionData.data(), cert_chain_buff, cert_chain_buff_size);
-
+    delete[] cert_chain_buff;
     return true;
 }
 
@@ -3316,7 +3319,7 @@ bool Fs4Operations::UpdateSectionHashInHashesTable(u_int32_t addr, u_int32_t siz
 bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u_int8_t> hash)
 {
     //* Init HTOC
-    vector<u_int8_t> img;
+    vector<u_int8_t> img = {0};
     FwInit();
     _imageCache.clear();
     if (!FwExtract4MBImage(img, true))
@@ -3324,21 +3327,21 @@ bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u
         return false;
     }
     const u_int32_t htoc_address = _hashes_table_ptr + IMAGE_LAYOUT_HASHES_TABLE_HEADER_SIZE;
-    HTOC* htoc = new HTOC(img, htoc_address);
+    HTOC htoc = HTOC(img, htoc_address);
 
     // TODO - move below logic to HTOC
     //* Get hash addr in hashes_table
     struct image_layout_htoc_entry htoc_entry;
-    if (!htoc->GetEntryBySectionType(section_type, htoc_entry))
+    if (!htoc.GetEntryBySectionType(section_type, htoc_entry))
     {
         DPRINTF(("Fs4Operations::UpdateHashInHashesTable Can't find section type 0x%x in htoc\n", section_type));
-        if (!htoc->AddNewEntry(_ioAccess, section_type, htoc_entry))
+        if (!htoc.AddNewEntry(_ioAccess, section_type, htoc_entry))
         {
             return errmsg("Failed to add new entry of section type 0x%x to htoc", section_type);
         }
     }
     u_int32_t hash_addr = htoc_address + htoc_entry.hash_offset;
-    u_int32_t hash_size = htoc->header.hash_size;
+    u_int32_t hash_size = htoc.header.hash_size;
 
     //* Insert hash (SHA512) to hashes_table
     if (!_ioAccess->write(hash_addr, hash.data(), hash_size))
@@ -3354,6 +3357,7 @@ bool Fs4Operations::UpdateHashInHashesTable(fs3_section_t section_type, vector<u
     u_int8_t* hashes_table_data;
     READALLOCBUF((*_ioAccess), _hashes_table_ptr, hashes_table_data, hashes_table_size, "HASHES TABLE");
     u_int32_t hashes_table_crc = CalcImageCRC((u_int32_t*)hashes_table_data, (hashes_table_size / 4) - 1);
+    free(hashes_table_data);
     CPUTO1(hashes_table_crc);
 
     //* Insert calculated CRC to last DWORD in hashes_table
@@ -3624,6 +3628,7 @@ bool Fs4Operations::FwSetCertChain(char* certFileStr, u_int32_t certIndex, Print
             return false;
         }
     }
+
     // on image verify that image is OK after modification (we skip this on device for performance reasons)
     if (!_ioAccess->is_flash() && !VerifyImageAfterModifications())
     {
@@ -3641,7 +3646,6 @@ bool Fs4Operations::UpdateSection(void* new_info,
     struct fs4_toc_info* curr_toc = (fs4_toc_info*)NULL;
     struct fs4_toc_info* old_toc = (fs4_toc_info*)NULL;
     std::vector<u_int8_t> newSection;
-    u_int32_t newSectionAddr;
     const char* type_msg;
     struct fs4_toc_info* tocArr;
     u_int32_t numOfTocs;
@@ -4316,7 +4320,7 @@ bool Fs4Operations::FwSignSection(const vector<u_int8_t>& section, const string
 
 int Fs4Operations::getBoot2Size(u_int32_t address)
 {
-    u_int32_t num_of_dwords;
+    u_int32_t num_of_dwords = 0;
 
     // Read the num of DWs for the second dword
     READBUF((*_ioAccess), address + 4, &num_of_dwords, 4, "num of DWs");
@@ -4971,7 +4975,7 @@ bool Fs4Operations::FwSignWithHmac(const char* keyFile)
 
 bool Fs4Operations::updateHwPointer(u_int32_t addr, u_int32_t val)
 {
-    struct image_layout_hw_pointer_entry hw_pointer;
+    struct image_layout_hw_pointer_entry hw_pointer = image_layout_hw_pointer_entry();
     hw_pointer.ptr = TOCPU1(val);
 
     //* Calculate CRC
diff --git a/mlxfwops/lib/fs_checks.cpp b/mlxfwops/lib/fs_checks.cpp
index 970d1fc6..e980bd97 100644
--- a/mlxfwops/lib/fs_checks.cpp
+++ b/mlxfwops/lib/fs_checks.cpp
@@ -163,7 +163,8 @@ void FsChecks::UpdateContext(FwOperations** devFwOps, FwOperations::ExtBurnParam
 #if !defined(UEFI_BUILD)
 string AddIdentToString(const string& ident, const string& s)
 {
-    std::stringstream ss(s);
+    std::stringstream ss;
+    ss << s;
     vector<string> lines;
 
     while (ss.good())
diff --git a/mlxfwops/lib/fsctrl_ops.cpp b/mlxfwops/lib/fsctrl_ops.cpp
index d8562295..f9d4d63b 100644
--- a/mlxfwops/lib/fsctrl_ops.cpp
+++ b/mlxfwops/lib/fsctrl_ops.cpp
@@ -709,9 +709,9 @@ bool FsCtrlOperations::FwBurnAdvanced(FwOperations* imageOps, ExtBurnParams& bur
     }
     if (fw_query.fs3_info.security_mode == SM_NONE)
     {
-        return errmsg(
-          MLXFW_MISSING_IMAGE_SIGNATURE,
-          "This is an old image format that does not have a signature or does not support FW control commands.\n-E- please retry with --no_fw_ctrl flag\n");
+        return errmsg(MLXFW_MISSING_IMAGE_SIGNATURE,
+                      "This is an old image format that does not have a signature or does not support FW control "
+                      "commands.\n-E- please retry with --no_fw_ctrl flag\n");
     }
     // Check TimeStamp
     if (!TestAndSetTimeStamp(imageOps))
@@ -1048,7 +1048,7 @@ Tlv_Status_t FsCtrlOperations::GetTsObj(TimeStampIFC** tsObj)
 
 bool FsCtrlOperations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, struct tools_open_fw_version& fwVer)
 {
-    TimeStampIFC* tsObj;
+    TimeStampIFC* tsObj = NULL;
     Tlv_Status_t rc;
 
     if (GetTsObj(&tsObj))
@@ -1067,7 +1067,7 @@ bool FsCtrlOperations::FwSetTimeStamp(struct tools_open_ts_entry& timestamp, str
 
 bool FsCtrlOperations::FwResetTimeStamp()
 {
-    TimeStampIFC* tsObj;
+    TimeStampIFC* tsObj = NULL;
     Tlv_Status_t rc;
 
     if (GetTsObj(&tsObj))
@@ -1087,7 +1087,7 @@ bool FsCtrlOperations::FwQueryTimeStamp(struct tools_open_ts_entry& timestamp,
                                         struct tools_open_fw_version& fwVer,
                                         bool queryRunning)
 {
-    TimeStampIFC* tsObj;
+    TimeStampIFC* tsObj = NULL;
     Tlv_Status_t rc;
 
     if (GetTsObj(&tsObj))
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index 09d830b0..15097224 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
@@ -324,6 +324,7 @@ bool FwOperations::checkBoot2(u_int32_t beg,
     {
         Crc16 crc;
         u_int32_t* buff = new u_int32_t[size + 4];
+        memset(buff, 0, (size + 4) * sizeof(u_int32_t));
         bool rc = readBufAux((*_ioAccess), offs + beg, buff, size * 4 + 16, pr);
         if (!rc)
         {
@@ -415,7 +416,7 @@ bool FwOperations::FindMagicPattern(FBase* ioAccess, u_int32_t addr, u_int32_t c
     }
     for (int i = 0; i < 4; i++)
     {
-        u_int32_t w;
+        u_int32_t w = 0;
         READ4_NOERRMSG((*ioAccess), addr + i * 4, &w);
         TOCPU1(w);
         if (w != cntx_magic_pattern[i])
@@ -631,7 +632,7 @@ bool FwOperations::FwAccessCreate(fw_ops_params_t& fwParams, FBase** ioAccessP)
 u_int8_t FwOperations::IsFS4Image(FBase& f, u_int32_t* found_images)
 {
     DPRINTF(("FwOperations::IsFS4Image\n"));
-    u_int32_t data;
+    u_int32_t data = 0;
     u_int8_t image_version;
     u_int32_t image_start[CNTX_START_POS_SIZE] = {0};
 
@@ -660,7 +661,7 @@ u_int8_t FwOperations::IsFS4Image(FBase& f, u_int32_t* found_images)
 
 u_int8_t FwOperations::IsFS3OrFS2Image(FBase& f, u_int32_t* found_images)
 {
-    u_int32_t data;
+    u_int32_t data = 0;
     u_int8_t image_version;
     u_int32_t image_start[CNTX_START_POS_SIZE] = {0};
     FindAllImageStart(&f, image_start, found_images, _cntx_magic_pattern);
@@ -826,6 +827,7 @@ bool FwOperations::imageDevOperationsCreate(fw_ops_params_t& devParams,
     memset(&imgQuery, 0, sizeof(fw_info_t));
     if (!(*imgFwOps)->FwQuery(&imgQuery, true, false, true, ignoreDToc))
     {
+        delete *imgFwOps;
         *imgFwOps = NULL;
         return false;
     }
@@ -1002,8 +1004,8 @@ FwOperations* FwOperations::FwOperationsCreate(fw_ops_params_t& fwParams)
                                 {
                                     if (fwInfo.security_type.secure_fw == 0)
                                     {
-                                        FLASH_ACCESS_DPRINTF((
-                                          "Non secured BB device, deleting fw comps mgr object and setting no_fw_ctrl mode\n"));
+                                        FLASH_ACCESS_DPRINTF(("Non secured BB device, deleting fw comps mgr object and "
+                                                              "setting no_fw_ctrl mode\n"));
                                         delete fwCompsAccess;
                                         fwCompsAccess = (FwCompsMgr*)NULL;
                                         fwParams.noFwCtrl = 1;
@@ -1070,6 +1072,7 @@ FwOperations* FwOperations::FwOperationsCreate(fw_ops_params_t& fwParams)
             {
                 if (!fwCompsAccess)
                 {
+                    delete ioAccess;
                     return (FwOperations*)NULL;
                 }
                 DPRINTF(("FSCTRL ops created for %s\n", file_handle_type_to_str(fwParams.hndlType)));
@@ -1103,6 +1106,7 @@ FwOperations* FwOperations::FwOperationsCreate(fw_ops_params_t& fwParams)
         if (!fwops->CreateSignatureManager())
         {
             WriteToErrBuff(fwParams.errBuff, (char*)"Cannot create signature manager!", fwParams.errBuffSize);
+            fwops->err_clear();
             delete fwops; // will also delete the fwCompsAccess! no memory leak here
             return NULL;
         }
@@ -1392,12 +1396,14 @@ const FwOperations::HwDevData FwOperations::hwDevData[] = {
   {"BlueField", BF_HW_ID, CT_BLUEFIELD, CFT_HCA, 0, {41680, 41681, 41682, 0}, {{UNKNOWN_BIN, {0}}}},
   {"BlueField2", BF2_HW_ID, CT_BLUEFIELD2, CFT_HCA, 0, {41684, 41685, 41686, 0}, {{UNKNOWN_BIN, {0}}}},
   {"BlueField3", BF3_HW_ID, CT_BLUEFIELD3, CFT_HCA, 0, {41690, 41691, 41692, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"BlueField4", BF4_HW_ID, CT_BLUEFIELD4, CFT_HCA, 0, {41694, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Spectrum", SPECTRUM_HW_ID, CT_SPECTRUM, CFT_SWITCH, 0, {52100, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Switch_IB2", SWITCH_IB2_HW_ID, CT_SWITCH_IB2, CFT_SWITCH, 0, {53000, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Quantum", QUANTUM_HW_ID, CT_QUANTUM, CFT_SWITCH, 0, {54000, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Spectrum2", SPECTRUM2_HW_ID, CT_SPECTRUM2, CFT_SWITCH, 0, {53100, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Spectrum3", SPECTRUM3_HW_ID, CT_SPECTRUM3, CFT_SWITCH, 0, {53104, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Quantum2", QUANTUM2_HW_ID, CT_QUANTUM2, CFT_SWITCH, 0, {54002, 0}, {{UNKNOWN_BIN, {0}}}},
+  {"Quantum3", QUANTUM3_HW_ID, CT_QUANTUM3, CFT_SWITCH, 0, {54004, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Spectrum4", SPECTRUM4_HW_ID, CT_SPECTRUM4, CFT_SWITCH, 0, {53120, 0}, {{UNKNOWN_BIN, {0}}}},
   {"Gearbox", GEARBOX_HW_ID, CT_GEARBOX, CFT_GEARBOX, 0, {0, 0}, {{UNKNOWN_BIN, {0}}}},
   {"GearboxManager", GB_MANAGER_HW_ID, CT_GEARBOX_MGR, CFT_GEARBOX, 0, {0, 0}, {{UNKNOWN_BIN, {0}}}},
@@ -1406,26 +1412,39 @@ const FwOperations::HwDevData FwOperations::hwDevData[] = {
 };
 
 const FwOperations::HwDev2Str FwOperations::hwDev2Str[] = {
-  {"ConnectX-3 A0", CX3_HW_ID, 0x00},       {"ConnectX-3 A1", CX3_HW_ID, 0x01},
-  {"ConnectX-3Pro", CX3_PRO_HW_ID, 0x00},   {"ConnectX-4", CX4_HW_ID, 0x00},
-  {"ConnectX-4LX", CX4LX_HW_ID, 0x00},      {"ConnectX-5", CX5_HW_ID, 0x00},
-  {"ConnectX-6", CX6_HW_ID, 0x00},          {"ConnectX-6DX", CX6DX_HW_ID, 0x00},
-  {"ConnectX-6LX", CX6LX_HW_ID, 0x00},      {"ConnectX-7", CX7_HW_ID, 0x00},
-  {"ConnectX-8", CX8_HW_ID, 0x00},          {"BlueField", BF_HW_ID, 0x00},
-  {"BlueField2", BF2_HW_ID, 0x00},          {"BlueField3", BF3_HW_ID, 0x00},
-  {"SwitchIB A0", SWITCH_IB_HW_ID, 0x00},   {"Spectrum A0", SPECTRUM_HW_ID, 0x00},
-  {"SwitchIB2 A0", SWITCH_IB2_HW_ID, 0x00}, {"Quantum A0", QUANTUM_HW_ID, 0x00},
-  {"Spectrum A1", SPECTRUM_HW_ID, 0x01},    {"Spectrum2 A0", SPECTRUM2_HW_ID, 0x00},
-  {"Spectrum3 A0", SPECTRUM3_HW_ID, 0x00},  {"Quantum2 A0", QUANTUM2_HW_ID, 0x00},
-  {"Spectrum4 A0", SPECTRUM4_HW_ID, 0x00},  {(char*)NULL, (u_int32_t)0, (u_int8_t)0x00}, // zero device ID terminator
+  {"ConnectIB", CONNECT_IB_HW_ID, 0x00},
+  {"ConnectX-3 A0", CX3_HW_ID, 0x00},
+  {"ConnectX-3 A1", CX3_HW_ID, 0x01},
+  {"ConnectX-3Pro", CX3_PRO_HW_ID, 0x00},
+  {"ConnectX-4", CX4_HW_ID, 0x00},
+  {"ConnectX-4LX", CX4LX_HW_ID, 0x00},
+  {"ConnectX-5", CX5_HW_ID, 0x00},
+  {"ConnectX-6", CX6_HW_ID, 0x00},
+  {"ConnectX-6DX", CX6DX_HW_ID, 0x00},
+  {"ConnectX-6LX", CX6LX_HW_ID, 0x00},
+  {"ConnectX-7", CX7_HW_ID, 0x00},
+  {"ConnectX-8", CX8_HW_ID, 0x00},
+  {"BlueField", BF_HW_ID, 0x00},
+  {"BlueField2", BF2_HW_ID, 0x00},
+  {"BlueField3", BF3_HW_ID, 0x00},
+  {"BlueField4", BF4_HW_ID, 0x00},
+  {"SwitchIB A0", SWITCH_IB_HW_ID, 0x00},
+  {"Spectrum A0", SPECTRUM_HW_ID, 0x00},
+  {"SwitchIB2 A0", SWITCH_IB2_HW_ID, 0x00},
+  {"Quantum A0", QUANTUM_HW_ID, 0x00},
+  {"Spectrum A1", SPECTRUM_HW_ID, 0x01},
+  {"Spectrum2 A0", SPECTRUM2_HW_ID, 0x00},
+  {"Spectrum3 A0", SPECTRUM3_HW_ID, 0x00},
+  {"Quantum2 A0", QUANTUM2_HW_ID, 0x00},
+  {"Quantum3 A0", QUANTUM3_HW_ID, 0x00},
+  {"Spectrum4 A0", SPECTRUM4_HW_ID, 0x00},
+  {(char*)NULL, (u_int32_t)0, (u_int8_t)0x00}, // zero device ID terminator
 };
 
 chip_type FwOperations::GetChipType(string chip)
 {
     if (chip == "CT_CONNECTX")
         return CT_CONNECTX;
-    else if (chip == "CT_IS4")
-        return CT_IS4;
     else if (chip == "CT_CONNECT_IB")
         return CT_CONNECT_IB;
     else if (chip == "CT_SWITCH_IB")
@@ -1462,10 +1481,14 @@ chip_type FwOperations::GetChipType(string chip)
         return CT_BLUEFIELD2;
     else if (chip == "CT_BLUEFIELD3")
         return CT_BLUEFIELD3;
+    else if (chip == "CT_BLUEFIELD4")
+        return CT_BLUEFIELD4;
     else if (chip == "CT_CONNECTX3")
         return CT_CONNECTX3;
     else if (chip == "CT_QUANTUM2")
         return CT_QUANTUM2;
+    else if (chip == "CT_QUANTUM3")
+        return CT_QUANTUM3;
     else if (chip == "CT_SPECTRUM4")
         return CT_SPECTRUM4;
     else if (chip == "CT_GEARBOX")
@@ -2110,21 +2133,14 @@ bool FwOperations::ReadBinFile(const char* fimage, u_int8_t*& file_data, int& fi
 void FwOperations::SetDevFlags(chip_type_t chipType, u_int32_t devType, fw_img_type_t fwType, bool& ibDev, bool& ethDev)
 {
     (void)devType;
-    if (chipType == CT_IS4)
-    {
-        ibDev = true;
-        ethDev = false;
-    }
-    else
-    {
-        ibDev = (fwType == FIT_FS3 && chipType != CT_SPECTRUM) || (chipType == CT_CONNECTX && !CntxEthOnly(devType));
-        ethDev = (chipType == CT_CONNECTX) || (chipType == CT_CONNECTX4) || (chipType == CT_CONNECTX4_LX) ||
-                 (chipType == CT_CONNECTX5) || (chipType == CT_CONNECTX6) || (chipType == CT_CONNECTX6DX) ||
-                 (chipType == CT_CONNECTX6LX) || (chipType == CT_SPECTRUM) || (chipType == CT_SPECTRUM2) ||
-                 (chipType == CT_SPECTRUM3) || (chipType == CT_CONNECTX7) || (chipType == CT_QUANTUM2) ||
-                 (chipType == CT_SPECTRUM4) || (chipType == CT_BLUEFIELD) || (chipType == CT_BLUEFIELD2) ||
-                 (chipType == CT_BLUEFIELD3) || (chipType == CT_CONNECTX8);
-    }
+    ibDev = (fwType == FIT_FS3 && chipType != CT_SPECTRUM) || (chipType == CT_CONNECTX && !CntxEthOnly(devType));
+    ethDev = (chipType == CT_CONNECTX) || (chipType == CT_CONNECTX4) || (chipType == CT_CONNECTX4_LX) ||
+             (chipType == CT_CONNECTX5) || (chipType == CT_CONNECTX6) || (chipType == CT_CONNECTX6DX) ||
+             (chipType == CT_CONNECTX6LX) || (chipType == CT_SPECTRUM) || (chipType == CT_SPECTRUM2) ||
+             (chipType == CT_SPECTRUM3) || (chipType == CT_CONNECTX7) || (chipType == CT_QUANTUM2) ||
+             (chipType == CT_QUANTUM3) || (chipType == CT_SPECTRUM4) || (chipType == CT_BLUEFIELD) ||
+             (chipType == CT_BLUEFIELD2) || (chipType == CT_BLUEFIELD3) || (chipType == CT_CONNECTX8) ||
+             (chipType == CT_BLUEFIELD4);
 
     if ((!ibDev && !ethDev) || chipType == CT_UNKNOWN)
     {
@@ -2243,7 +2259,7 @@ bool FwOperations::FwBurnData(burnDataParamsT& burnDataParams)
     u_int32_t* data = burnDataParams.data;
     u_int32_t dataSize = burnDataParams.dataSize;
     ProgressCallBack progressFunc = burnDataParams.progressFunc;
-    FwOperations* newImgOps;
+    FwOperations* newImgOps = NULL;
     ExtBurnParams burnParams = ExtBurnParams();
 
     if (!CreateBasicImageFromData(data, dataSize, &newImgOps))
@@ -2571,9 +2587,10 @@ u_int8_t FwOperations::GetFwFormatFromHwDevID(u_int32_t hwDevId)
     }
     else if (hwDevId == CX5_HW_ID || hwDevId == CX6_HW_ID || hwDevId == CX6DX_HW_ID || hwDevId == CX6LX_HW_ID ||
              hwDevId == CX7_HW_ID || hwDevId == CX8_HW_ID || hwDevId == BF_HW_ID || hwDevId == BF2_HW_ID ||
-             hwDevId == BF3_HW_ID || hwDevId == QUANTUM_HW_ID || hwDevId == QUANTUM2_HW_ID ||
-             hwDevId == SPECTRUM4_HW_ID || hwDevId == SPECTRUM2_HW_ID || hwDevId == SPECTRUM3_HW_ID ||
-             hwDevId == GEARBOX_HW_ID || hwDevId == GB_MANAGER_HW_ID || hwDevId == ABIR_GB_HW_ID)
+             hwDevId == BF3_HW_ID || hwDevId == BF4_HW_ID || hwDevId == QUANTUM_HW_ID || hwDevId == QUANTUM2_HW_ID ||
+             hwDevId == QUANTUM3_HW_ID || hwDevId == SPECTRUM4_HW_ID || hwDevId == SPECTRUM2_HW_ID ||
+             hwDevId == SPECTRUM3_HW_ID || hwDevId == GEARBOX_HW_ID || hwDevId == GB_MANAGER_HW_ID ||
+             hwDevId == ABIR_GB_HW_ID)
     {
         return FS_FS4_GEN;
     }
@@ -2594,8 +2611,8 @@ bool FwOperations::TestAndSetTimeStamp(FwOperations* imageOps)
     Tlv_Status_t rc;
     Tlv_Status_t devTsQueryRc;
     bool retRc = true;
-    TimeStampIFC* imgTsObj;
-    TimeStampIFC* devTsObj;
+    TimeStampIFC* imgTsObj = NULL;
+    TimeStampIFC* devTsObj = NULL;
     bool tsFoundOnImage = false;
     struct tools_open_ts_entry imgTs;
     struct tools_open_fw_version imgFwVer;
@@ -2680,8 +2697,8 @@ bool FwOperations::TestAndSetTimeStamp(FwOperations* imageOps)
             if (devTsQueryRc == TS_OK)
             {
                 // we got running timestamp return error
-                retRc = errmsg(
-                  "No valid timestamp detected. please set a valid timestamp on image/device or reset timestamps on device.");
+                retRc = errmsg("No valid timestamp detected. please set a valid timestamp on image/device or reset "
+                               "timestamps on device.");
             }
             else if (devTsQueryRc == TS_NO_VALID_TIMESTAMP)
             {
@@ -2895,8 +2912,11 @@ life_cycle_t CRSpaceRegisters::getLifeCycle()
             bitLen = 2;
             break;
         case CT_CONNECTX7:
+        case CT_CONNECTX8:
         case CT_QUANTUM2:
+        case CT_QUANTUM3:
         case CT_BLUEFIELD3:
+        case CT_BLUEFIELD4:
             lifeCycleAddress = 0xf0000;
             firstBit = 4;
             bitLen = 2;
@@ -2919,11 +2939,14 @@ int CRSpaceRegisters::getGlobalImageStatus()
         case CT_CONNECTX6DX:
         case CT_CONNECTX6LX:
         case CT_CONNECTX7:
+        case CT_CONNECTX8:
         case CT_BLUEFIELD2:
         case CT_BLUEFIELD3:
+        case CT_BLUEFIELD4:
             global_image_status_address = 0xE3044;
             break;
         case CT_QUANTUM2:
+        case CT_QUANTUM3:
             global_image_status_address = 0xa1844;
             break;
         default:
@@ -2943,6 +2966,7 @@ u_int32_t CRSpaceRegisters::getSecurityVersion()
     switch (_chip_type)
     {
         case CT_QUANTUM2:
+        case CT_QUANTUM3:
             rollbackMSB = getRegister(0xf3248);
             rollbackLSB = getRegister(0xf324c);
             minimalSecurityVersion = getConsecutiveBits(getRegister(0xf3238), 3, 8);
@@ -2988,7 +3012,7 @@ u_int32_t CRSpaceRegisters::getConsecutiveBits(u_int32_t data, u_int8_t firstBit
 
 u_int32_t CRSpaceRegisters::getRegister(u_int32_t address)
 {
-    u_int32_t crSpaceReg;
+    u_int32_t crSpaceReg = 0;
     int rc = mread4(_mf, address, &crSpaceReg);
     if (rc != 4)
     {
diff --git a/mlxfwops/lib/mlxfwops_com.h b/mlxfwops/lib/mlxfwops_com.h
index be42afe7..8348bb80 100644
--- a/mlxfwops/lib/mlxfwops_com.h
+++ b/mlxfwops/lib/mlxfwops_com.h
@@ -59,7 +59,6 @@
 #define EFIAPI
 #endif
 
-#define CONNECTX_HW_ID 400
 #define SWITCH_IB_HW_ID 583
 #define SPECTRUM_HW_ID 585
 #define SWITCH_IB2_HW_ID 587
@@ -67,6 +66,7 @@
 #define SPECTRUM2_HW_ID 590
 #define SPECTRUM3_HW_ID 592
 #define QUANTUM2_HW_ID 599
+#define QUANTUM3_HW_ID 603
 #define SPECTRUM4_HW_ID 596
 #define GEARBOX_HW_ID 594
 #define GB_MANAGER_HW_ID 595
@@ -82,10 +82,9 @@
 #define BF_HW_ID 529
 #define BF2_HW_ID 532
 #define BF3_HW_ID 540
-#define CX2_HW_ID 400
+#define BF4_HW_ID 544
 #define CX3_HW_ID 501
 #define CX3_PRO_HW_ID 503
-#define IS4_HW_ID 435
 #define CONNECT_IB_HW_ID 511
 
 #define INBAND_MAX_REG_SIZE 44
@@ -286,7 +285,6 @@ typedef enum chip_type
 {
     CT_UNKNOWN = 0,
     CT_CONNECTX,
-    CT_IS4,
     CT_CONNECT_IB,
     CT_SWITCH_IB,
     CT_SPECTRUM,
@@ -305,8 +303,10 @@ typedef enum chip_type
     CT_SPECTRUM3,
     CT_BLUEFIELD2,
     CT_BLUEFIELD3,
+    CT_BLUEFIELD4,
     CT_CONNECTX3,
     CT_QUANTUM2,
+    CT_QUANTUM3,
     CT_SPECTRUM4,
     CT_GEARBOX,
     CT_GEARBOX_MGR,
@@ -318,7 +318,7 @@ typedef enum chip_type
      ((chipType) == CT_CONNECTX4_LX) || ((chipType) == CT_CONNECTX5) || ((chipType) == CT_CONNECTX6) ||  \
      ((chipType) == CT_CONNECTX6DX) || ((chipType) == CT_CONNECTX6LX) || ((chipType) == CT_CONNECTX7) || \
      ((chipType) == CT_CONNECTX8) || ((chipType) == CT_BLUEFIELD) || ((chipType) == CT_BLUEFIELD2) ||    \
-     ((chipType) == CT_BLUEFIELD3))
+     ((chipType) == CT_BLUEFIELD3) || ((chipType) == CT_BLUEFIELD4))
 
 typedef enum chip_family_type
 {
diff --git a/mlxfwops/lib/signature_manager_factory.h b/mlxfwops/lib/signature_manager_factory.h
index e7fea429..d6eb6937 100644
--- a/mlxfwops/lib/signature_manager_factory.h
+++ b/mlxfwops/lib/signature_manager_factory.h
@@ -86,7 +86,8 @@ class SignatureManagerFactory
         {
             return new RavenSwitchSignatureManager();
         }
-        else if (deviceId == DeviceQuantum2 || deviceId == DeviceSpectrum4)
+        else if (deviceId == DeviceQuantum2 || deviceId == DeviceQuantum3 ||
+                 deviceId == DeviceSpectrum4)
         {
             return new SecuredSwitchSignatureManager();
         }
@@ -134,7 +135,7 @@ class SignatureManagerFactory
         {
             return new RavenSwitchSignatureManager();
         }
-        else if (chip == CT_QUANTUM2 || chip == CT_SPECTRUM4)
+        else if (chip == CT_QUANTUM2 || chip == CT_QUANTUM3 || chip == CT_SPECTRUM4)
         {
             return new SecuredSwitchSignatureManager();
         }
diff --git a/mlxfwupdate/cmd_line_parser.cpp b/mlxfwupdate/cmd_line_parser.cpp
index dfa5f33d..a518c076 100644
--- a/mlxfwupdate/cmd_line_parser.cpp
+++ b/mlxfwupdate/cmd_line_parser.cpp
@@ -291,18 +291,19 @@ void CmdLineParser::initOptions()
     AddDescription(TOOL_DESC);
 
 #ifdef ONLY_PCI_FORMAT
-    this->AddOptions(
-      DEVICE_L,
-      DEVICE_S,
-      "DeviceName",
-      "Perform operation for specified PCI (using the format <Bus>:<Device>.<Function>) or IB device(s)."
-      " Multiple devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
+    this->AddOptions(DEVICE_L,
+                     DEVICE_S,
+                     "DeviceName",
+                     "Perform operation for specified PCI (using the format <Bus>:<Device>.<Function>) or IB device(s)."
+                     " Multiple devices can be specified delimited by semicolons. A device list containing semicolons "
+                     "must be quoted.");
 #else
     this->AddOptions(
       DEVICE_L,
       DEVICE_S,
       "DeviceName",
-      "Perform operation for specified mst device(s). Run 'mst status' command to list the available devices. Multiple devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
+      "Perform operation for specified mst device(s). Run 'mst status' command to list the available devices. Multiple "
+      "devices can be specified delimited by semicolons. A device list containing semicolons must be quoted.");
 #endif
 
     this->AddOptions(NUM_OF_RETRIALS_L, NUM_OF_RETRIALS_S, "NumOfRetrials", "Number of download retrials default is 5",
@@ -349,12 +350,12 @@ void CmdLineParser::initOptions()
     this->AddOptions(FFV_L, FFV_S, "", "Compare Firmware family version",
                      true); // Hidden
 
-    this->AddOptions(
-      CLEAR_SEM_L,
-      CLEAR_SEM_S,
-      "",
-      "Force clear the flash semaphore on the device, No command is allowed when this flag is used. "
-      "NOTE: May result in system instability or flash corruption if the device or another application is currently using the flash. Exercise caution.");
+    this->AddOptions(CLEAR_SEM_L,
+                     CLEAR_SEM_S,
+                     "",
+                     "Force clear the flash semaphore on the device, No command is allowed when this flag is used. "
+                     "NOTE: May result in system instability or flash corruption if the device or another application "
+                     "is currently using the flash. Exercise caution.");
 
     this->AddOptions(EXE_REL_PATH_L, EXE_REL_PATH_S, "", "Use paths relative to the location of the executable", false);
 
diff --git a/mlxfwupdate/image_access.cpp b/mlxfwupdate/image_access.cpp
index 6dcb3db8..c3350561 100644
--- a/mlxfwupdate/image_access.cpp
+++ b/mlxfwupdate/image_access.cpp
@@ -615,7 +615,7 @@ bool ImageAccess::extract_pldm_image_info(const u_int8_t* buff, u_int32_t size,
     static const u_int32_t sector_size = FS3_DEFAULT_SECTOR_SIZE;
     u_int32_t offset = 0;
     offset = (offset % sector_size == 0) ? offset : (offset + sector_size - offset % 0x1000);
-    u_int8_t buffer[TOC_HEADER_SIZE], entry_buffer[TOC_ENTRY_SIZE];
+    u_int8_t buffer[TOC_HEADER_SIZE] = {0}, entry_buffer[TOC_ENTRY_SIZE] = {0};
     struct connectx4_itoc_header itoc_header;
     while (offset < fimage.get_size())
     {
@@ -641,6 +641,7 @@ bool ImageAccess::extract_pldm_image_info(const u_int8_t* buff, u_int32_t size,
                 u_int32_t flash_addr = toc_entry.flash_addr << 2;
                 u_int32_t entry_size_in_bytes = toc_entry.size * 4;
                 u_int8_t* buff = new u_int8_t[entry_size_in_bytes];
+                memset(buff, 0, entry_size_in_bytes);
                 fimage.read(flash_addr, buff, entry_size_in_bytes);
                 // read image info
                 struct connectx4_image_info image_info;
diff --git a/mlxfwupdate/mlnx_dev.cpp b/mlxfwupdate/mlnx_dev.cpp
index b861d55b..0dc28bde 100644
--- a/mlxfwupdate/mlnx_dev.cpp
+++ b/mlxfwupdate/mlnx_dev.cpp
@@ -375,80 +375,64 @@ void MlnxDev::setDeviceType(void)
         return;
     }
 
-    switch (ptr_dm_dev_id)
-    {
-        case DeviceSpectrum:
-        case DeviceSpectrum2:
-        case DeviceSpectrum3:
-        case DeviceSpectrum4:
-            portOneType = PORT_ETH;
-            portTwoType = PORT_ETH;
-            isOnlyBase = true;
-            break;
-
-        case DeviceConnectIB:
-            portOneType = PORT_IB;
-            portTwoType = PORT_IB;
-            break;
-
-        case DeviceConnectX3:
-        case DeviceConnectX3Pro:
-            u_int32_t mac;
-            if ((mread4(mf, 0x1f148, &mac)) == 4)
-            { // port1
-                portOneType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
-            }
-            if ((mread4(mf, 0x1f164, &mac)) == 4)
-            { // port2
-                portTwoType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
-            }
-            break;
-
-        case DeviceSwitchIB:
-        case DeviceSwitchIB2:
-        case DeviceQuantum:
-        case DeviceQuantum2:
-            portOneType = PORT_IB;
-            portTwoType = PORT_IB;
-            isOnlyBase = true;
-            break;
-
-        case DeviceConnectX4LX:
-            portOneType = PORT_ETH;
-            portTwoType = PORT_ETH;
-            isOnlyBase = true;
-            break;
-
-        case DeviceConnectX4:
-        case DeviceConnectX5:
-        case DeviceConnectX6:
-        case DeviceConnectX6DX:
-        case DeviceConnectX6LX:
-        case DeviceConnectX7:
-        case DeviceBlueField:
-        case DeviceBlueField2:
-        case DeviceBlueField3:
-            try
-            {
-                _commander = Commander::create(mf, getDevName(), "");
-            }
-            catch (MlxcfgException& e)
-            {
-                _commander = NULL;
-            }
-            isOnlyBase = true;
-            portOneType = findPortType(1);
-            portTwoType = findPortType(2);
-            if (_commander)
-            {
-                delete _commander;
-            }
+    if (dm_dev_is_eth_switch(ptr_dm_dev_id))
+    {
+        portOneType = PORT_ETH;
+        portTwoType = PORT_ETH;
+        isOnlyBase = true;
+    }
+    else if (dm_is_connectib(ptr_dm_dev_id))
+    {
+        portOneType = PORT_IB;
+        portTwoType = PORT_IB;
+    }
+    else if (dm_is_4th_gen(ptr_dm_dev_id))
+    {
+        u_int32_t mac;
+        if ((mread4(mf, 0x1f148, &mac)) == 4)
+        { // port1
+            portOneType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
+        }
+        if ((mread4(mf, 0x1f164, &mac)) == 4)
+        { // port2
+            portTwoType = EXT(mac, 30, 29) != 1 ? PORT_ETH : PORT_IB;
+        }
+    }
+    else if (dm_dev_is_ib_switch(ptr_dm_dev_id))
+    {
+        portOneType = PORT_IB;
+        portTwoType = PORT_IB;
+        isOnlyBase = true;
+    }
+    else if (ptr_dm_dev_id == DeviceConnectX4LX)
+    {
+        portOneType = PORT_ETH;
+        portTwoType = PORT_ETH;
+        isOnlyBase = true;
+    }
+    else if (dm_is_5th_gen_hca(ptr_dm_dev_id))
+    {
+        try
+        {
+            _commander = Commander::create(mf, getDevName(), "");
+        }
+        catch (MlxcfgException& e)
+        {
             _commander = NULL;
-            break;
-
-        default:
-            portOneType = PORT_NA;
-            portTwoType = PORT_NA;
+        }
+        isOnlyBase = true;
+        portOneType = findPortType(1);
+        portTwoType = findPortType(2);
+        if (_commander)
+        {
+            delete _commander;
+        }
+        _commander = NULL;
+    }
+    else
+    {
+        portOneType = PORT_NA;
+        portTwoType = PORT_NA;
     }
     if (mf)
     {
diff --git a/mlxfwupdate/mlxfwmanager.cpp b/mlxfwupdate/mlxfwmanager.cpp
index 969a41c2..a90c9d03 100644
--- a/mlxfwupdate/mlxfwmanager.cpp
+++ b/mlxfwupdate/mlxfwmanager.cpp
@@ -326,8 +326,8 @@ int mainEntry(int argc, char* argv[])
 #if defined(ONLY_PCI_FORMAT) || defined(__WIN__)
                 print_err("-E- No devices found or specified\n");
 #else
-                print_err(
-                  "-E- No devices found or specified, mst might be stopped, run 'mst start' to load MST modules\n");
+                print_err("-E- No devices found or specified, mst might be stopped, run 'mst start' to load MST "
+                          "modules\n");
 #endif
             }
             goto clean_up;
diff --git a/mlxfwupdate/output_fmts.cpp b/mlxfwupdate/output_fmts.cpp
index 49b83eb2..fb4269e4 100644
--- a/mlxfwupdate/output_fmts.cpp
+++ b/mlxfwupdate/output_fmts.cpp
@@ -122,8 +122,8 @@ int OutputFmts::createInventoryXML(vector<MlnxDev*>& devs,
     }
     else
     {
-        xmlChar* doc_txt_ptr;
-        int doc_txt_len;
+        xmlChar* doc_txt_ptr = NULL;
+        int doc_txt_len = 0;
 
         xmlDocDumpFormatMemoryEnc(doc, &doc_txt_ptr, &doc_txt_len, "UTF-8", 1);
         if (doc_txt_len)
@@ -258,8 +258,8 @@ int OutputFmts::createBurnXML(vector<MlnxDev*>& devs,
     }
     else
     {
-        xmlChar* doc_txt_ptr;
-        int doc_txt_len;
+        xmlChar* doc_txt_ptr = NULL;
+        int doc_txt_len = 0;
 
         xmlDocDumpFormatMemoryEnc(doc, &doc_txt_ptr, &doc_txt_len, "UTF-8", 1);
         if (doc_txt_len)
@@ -318,8 +318,8 @@ int OutputFmts::createFailXML(int result, int update_query_, string& buffer, int
     }
     else
     {
-        xmlChar* doc_txt_ptr;
-        int doc_txt_len;
+        xmlChar* doc_txt_ptr = NULL;
+        int doc_txt_len = 0;
 
         xmlDocDumpFormatMemoryEnc(doc, &doc_txt_ptr, &doc_txt_len, "UTF-8", 1);
         if (doc_txt_len)
diff --git a/mlxreg/mlxreg_lib.cpp b/mlxreg/mlxreg_lib.cpp
index 6e3edfe6..a8db5110 100644
--- a/mlxreg/mlxreg_lib.cpp
+++ b/mlxreg/mlxreg_lib.cpp
@@ -141,7 +141,7 @@ dm_dev_id_t MlxRegLib::getDevId(mfile* mf)
 bool MlxRegLib::isDeviceSupported(mfile* mf)
 {
     dm_dev_id_t devID = getDevId(mf);
-    return devID != DeviceConnectX3 && devID != DeviceConnectX3Pro;
+    return !dm_is_4th_gen(devID);
 }
 
 void MlxRegLib::initAdb(string extAdbFile)
@@ -149,7 +149,7 @@ void MlxRegLib::initAdb(string extAdbFile)
     _adb = new Adb();
     if (extAdbFile != "")
     {
-        if (!_adb->load(extAdbFile, false, false))
+        if (!_adb->load(extAdbFile, false, NULL, false))
         {
             throw MlxRegException("Failure in loading Adabe file. %s", _adb->getLastError().c_str());
         }
@@ -337,5 +337,6 @@ MlxRegLibStatus MlxRegLib::dumpRegisterData(string output_file_name, std::vector
     {
         throw MlxRegException("Failed to open file");
     }
+    fclose(outputFile);
     return MRLS_SUCCESS;
 }
diff --git a/mlxreg/mlxreg_parser.cpp b/mlxreg/mlxreg_parser.cpp
index 724bb7fe..390cac35 100644
--- a/mlxreg/mlxreg_parser.cpp
+++ b/mlxreg/mlxreg_parser.cpp
@@ -254,7 +254,6 @@ void RegAccessParser::parseAccessType(std::vector<string> tokens,
             }
         }
     }
-
 }
 
 /************************************
diff --git a/mlxsign_lib/mlxsign_lib.cpp b/mlxsign_lib/mlxsign_lib.cpp
index 8c9ac5d7..3a31d8c2 100644
--- a/mlxsign_lib/mlxsign_lib.cpp
+++ b/mlxsign_lib/mlxsign_lib.cpp
@@ -62,9 +62,10 @@ MlxSignSHA::MlxSignSHA(u_int32_t digestLength)
 
 int MlxSignSHA::getDigest(std::string& digest)
 {
-    int rc;
+    int rc = 0;
     std::vector<u_int8_t> digestVec;
     char* digestStr = new char[_digestLength * 2 + 1];
+    digestStr = (char*)memset(digestStr, 0, (_digestLength * 2 + 1));
 
     rc = getDigest(digestVec);
     if (rc != MlxSign::MLX_SIGN_SUCCESS)
@@ -308,15 +309,14 @@ int MlxSignRSA::createRSAFromPEMFileName(const std::string& fname, bool isPrivat
     {
         return MlxSign::MLX_SIGN_RSA_FILE_OPEN_ERROR;
     }
-    rsa = RSA_new();
     if (isPrivateKey)
     {
-        rsa = PEM_read_RSAPrivateKey(fp, &rsa, NULL, NULL);
+        rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
         REPLACE_RSA_CTX(_privCtx, rsa);
     }
     else
     {
-        rsa = PEM_read_RSA_PUBKEY(fp, &rsa, NULL, NULL);
+        rsa = PEM_read_RSA_PUBKEY(fp, NULL, NULL, NULL);
         REPLACE_RSA_CTX(_pubCtx, rsa);
     }
 
diff --git a/mstdump/crd_lib/crdump.c b/mstdump/crd_lib/crdump.c
index 0b9ac81e..7f86cd45 100644
--- a/mstdump/crd_lib/crdump.c
+++ b/mstdump/crd_lib/crdump.c
@@ -524,7 +524,7 @@ static int crd_set_tlv_blocks(IN mfile* mf, OUT crd_parsed_csv_t blocks[], IN u_
 
 static int crd_get_tlv_from_address(IN mfile* mf, IN u_int32_t address, OUT crd_sp2_tlv_t* crd_sp2_tlv)
 {
-    u_int32_t data;
+    u_int32_t data = 0;
 
     // read signature
     if (mread4(mf, address, &data) != sizeof(u_int32_t))
@@ -564,7 +564,6 @@ static int crd_get_tlv_from_address(IN mfile* mf, IN u_int32_t address, OUT crd_
     {
         crd_sp2_tlv->address = data;
     }
-
     return CRD_OK;
 }
 
diff --git a/mstdump/crd_main/mstdump.c b/mstdump/crd_main/mstdump.c
index 89940c6d..26486ec9 100644
--- a/mstdump/crd_main/mstdump.c
+++ b/mstdump/crd_main/mstdump.c
@@ -69,7 +69,7 @@ int main(int argc, char* argv[])
     int rc;
     int full = 0;
     int cause_addr = -1, cause_off = -1;
-    crd_ctxt_t* context;
+    crd_ctxt_t* context = NULL;
     u_int32_t arr_size = 0;
     char* endptr;
     u_int8_t new_i2c_slave = 0;
diff --git a/mstdump/mstdump_dbs/BlueField3.csv b/mstdump/mstdump_dbs/BlueField3.csv
index 6ba1846d..46b67f9b 100644
--- a/mstdump/mstdump_dbs/BlueField3.csv
+++ b/mstdump/mstdump_dbs/BlueField3.csv
@@ -7621,7 +7621,6 @@
 0x269080,23,
 0x280000,20,
 0x280080,12,
-0x2b0000,8448,
 0x300000,19,
 0x300050,8,
 0x300080,12,
@@ -8642,7 +8641,8 @@
 0x340ec0,5,
 0x340ee0,5,
 0x340f00,17,
-0x341000,179,
+0x341000,112,
+0x341200,51,
 0x341400,5,
 0x341800,3,
 0x341810,3,
@@ -10393,7 +10393,8 @@
 0x3c0ec0,5,
 0x3c0ee0,5,
 0x3c0f00,17,
-0x3c1000,179,
+0x3c1000,112,
+0x3c1200,51,
 0x3c1400,5,
 0x3c1800,3,
 0x3c1810,3,
@@ -12144,7 +12145,8 @@
 0x440ec0,5,
 0x440ee0,5,
 0x440f00,17,
-0x441000,179,
+0x441000,112,
+0x441200,51,
 0x441400,5,
 0x441800,3,
 0x441810,3,
@@ -13848,6 +13850,64 @@
 0x600da0,3,
 0x600e00,2,
 0x600e10,4,
+0x700000,20,
+0x700800,10,
+0x700880,3,
+0x700900,2,
+0x700910,4,
+0x700980,1,
+0x701000,20,
+0x701800,10,
+0x701880,3,
+0x701900,2,
+0x701910,4,
+0x701980,1,
+0x702000,20,
+0x702800,10,
+0x702880,3,
+0x702900,2,
+0x702910,4,
+0x702980,1,
+0x703000,20,
+0x703800,10,
+0x703880,3,
+0x703900,2,
+0x703910,4,
+0x703980,1,
+0x704000,10,
+0x704080,3,
+0x704100,2,
+0x704110,4,
+0x704180,2,
+0x7041a0,8,
+0x704200,1,
+0x705000,20,
+0x705080,20,
+0x705100,4,
+0x705800,1,
+0x706000,10,
+0x706080,3,
+0x706100,2,
+0x706110,4,
+0x706180,2,
+0x7061a0,8,
+0x706200,1,
+0x707000,20,
+0x707080,20,
+0x707100,4,
+0x707800,1,
+0x708000,20,
+0x708080,20,
+0x708100,4,
+0x708800,10,
+0x708880,3,
+0x7088a0,1,
+0x709000,20,
+0x709080,20,
+0x709100,4,
+0x709800,10,
+0x709880,3,
+0x7098a0,1,
 0x70a000,10,
 0x70a080,3,
 0x70a200,2,
@@ -14278,6 +14338,43 @@
 0x76b000,20,
 0x76b800,10,
 0x76b880,1,
+0x76c000,20,
+0x76c100,20,
+0x76c200,36,
+0x76c300,4,
+0x76c800,10,
+0x76c880,3,
+0x76c900,2,
+0x76c910,4,
+0x76c984,5,
+0x76c9a0,3,
+0x76ca04,5,
+0x76ca20,3,
+0x76ca84,5,
+0x76caa0,3,
+0x76cb04,5,
+0x76cb20,3,
+0x76cb84,5,
+0x76cba0,3,
+0x76cc04,5,
+0x76cc20,3,
+0x76cc84,5,
+0x76cca0,3,
+0x76cd04,5,
+0x76cd20,3,
+0x76cd80,1,
+0x76d000,36,
+0x76d100,36,
+0x76d200,4,
+0x76d800,10,
+0x76d884,5,
+0x76d8a0,3,
+0x76d904,5,
+0x76d920,3,
+0x76d980,1,
+0x76e000,1,
+0x76f000,20,
+0x76f800,1,
 0x770000,20,
 0x770800,10,
 0x770880,3,
@@ -18063,11646 +18160,3 @@
 0x9e0000,1,
 0x9e0008,18,
 0x9e0080,29,
-0x1000004,3,
-0x1000014,3,
-0x1000024,1,
-0x10000bc,1,
-0x10000c4,1,
-0x10000cc,1,
-0x10000d4,1,
-0x10000dc,1,
-0x10000e4,1,
-0x10000ec,1,
-0x10000f4,1,
-0x10000fc,1,
-0x1000104,1,
-0x100010c,1,
-0x1000114,1,
-0x100011c,1,
-0x1000124,1,
-0x100012c,1,
-0x1000134,1,
-0x100013c,1,
-0x1000144,37,
-0x10001dc,1,
-0x10001e4,1,
-0x10001ec,1,
-0x10001f4,1,
-0x10001fc,1,
-0x1000204,1,
-0x100020c,1,
-0x1000214,1,
-0x100021c,1,
-0x1000224,1,
-0x100022c,1,
-0x1000234,1,
-0x100023c,1,
-0x1000244,1,
-0x100024c,1,
-0x1000254,1,
-0x100025c,1,
-0x1000264,39,
-0x1000400,4,
-0x1000414,1,
-0x100041c,1,
-0x100051c,1,
-0x1000524,1,
-0x100052c,1,
-0x1000534,1,
-0x100053c,1,
-0x1000544,5,
-0x100055c,1,
-0x1000564,5,
-0x1000580,2,
-0x1000604,1,
-0x1000800,27,
-0x1000880,4,
-0x10008c0,25,
-0x1000940,6,
-0x1000960,2,
-0x100096c,3,
-0x100097c,1,
-0x1000a00,1,
-0x1000a10,6,
-0x11d0000,2,
-0x11d000c,1,
-0x11d0014,1,
-0x11d001c,5,
-0x11d0044,1,
-0x11d0080,4,
-0x11d00a0,6,
-0x11d00c0,4,
-0x11d00e0,6,
-0x11d0100,4,
-0x11d0200,4,
-0x11d0280,24,
-0x11d0300,4,
-0x11d0380,24,
-0x11d0400,4,
-0x11d0420,20,
-0x11d0480,4,
-0x11d04a0,5,
-0x11d04c0,4,
-0x11d04e0,5,
-0x11d0500,4,
-0x11d0540,4,
-0x11d0560,6,
-0x11d0580,4,
-0x11d05a0,6,
-0x11d05c0,4,
-0x11d1000,2,
-0x11d100c,1,
-0x11d1014,1,
-0x11d101c,1,
-0x11d1024,1,
-0x11d102c,1,
-0x11d1034,1,
-0x11d103c,1,
-0x11d1044,1,
-0x11d104c,1,
-0x11d1054,1,
-0x11d105c,1,
-0x11d1064,1,
-0x11d106c,1,
-0x11d1074,1,
-0x11d107c,1,
-0x11d1084,1,
-0x11d108c,1,
-0x11d1094,1,
-0x11d3000,2,
-0x11d300c,1,
-0x11d3014,1,
-0x11d301c,1,
-0x11d3024,1,
-0x11d302c,1,
-0x11d3034,1,
-0x11d303c,1,
-0x11d3044,1,
-0x11d304c,1,
-0x11d3054,1,
-0x11d305c,1,
-0x11d3064,1,
-0x11d306c,1,
-0x11d3074,1,
-0x11d307c,1,
-0x11d3084,1,
-0x11d308c,1,
-0x11d3094,1,
-0x11d309c,1,
-0x11d30a4,1,
-0x11d30ac,1,
-0x11d30b4,1,
-0x11d30bc,1,
-0x11d30c4,1,
-0x11d30cc,1,
-0x11d30d4,1,
-0x11d30dc,1,
-0x11d30e4,1,
-0x11d30ec,1,
-0x11d30f4,1,
-0x11d30fc,1,
-0x11d3104,1,
-0x11d310c,1,
-0x11d3114,1,
-0x11d311c,1,
-0x11d3124,1,
-0x11d312c,1,
-0x11d3134,1,
-0x11d313c,1,
-0x11d3144,1,
-0x11d314c,1,
-0x11d3154,1,
-0x11d315c,1,
-0x11d3164,1,
-0x11d316c,1,
-0x11d3174,1,
-0x11d317c,1,
-0x11d3184,1,
-0x11d318c,1,
-0x11d3194,1,
-0x11d319c,1,
-0x11d31a4,1,
-0x11d31ac,1,
-0x11d31b4,1,
-0x11d31bc,1,
-0x11d31c4,1,
-0x11d31cc,1,
-0x11d31d4,1,
-0x11d31dc,1,
-0x11d31e4,1,
-0x11d31ec,1,
-0x11d31f4,1,
-0x11d31fc,1,
-0x11d3204,1,
-0x11d320c,1,
-0x11d3214,1,
-0x11d321c,1,
-0x11d3224,1,
-0x11d322c,1,
-0x11d3234,1,
-0x11d323c,1,
-0x11d3244,1,
-0x11d324c,1,
-0x11d3254,1,
-0x11d325c,1,
-0x11d3264,1,
-0x11d326c,1,
-0x11d3274,1,
-0x11d327c,1,
-0x11d3284,1,
-0x11d328c,1,
-0x11d3294,1,
-0x11d329c,1,
-0x11d32a4,1,
-0x11d32ac,1,
-0x11d32b4,1,
-0x11d32bc,1,
-0x11d32c4,1,
-0x11d32cc,1,
-0x11d32d4,1,
-0x11d32dc,1,
-0x11d32e4,1,
-0x11d32ec,1,
-0x11d32f4,1,
-0x11d32fc,1,
-0x11d3304,1,
-0x11d330c,1,
-0x11d3314,1,
-0x11d331c,1,
-0x11d3324,1,
-0x11d332c,1,
-0x11d3334,1,
-0x11d333c,1,
-0x11d3344,1,
-0x11d334c,1,
-0x11d3354,1,
-0x11d335c,1,
-0x11d3364,1,
-0x11d336c,1,
-0x11d3374,1,
-0x11d337c,1,
-0x11d3384,1,
-0x11d338c,1,
-0x11d3394,1,
-0x11d339c,1,
-0x11d33a4,1,
-0x11d33ac,1,
-0x11d33b4,1,
-0x11d33bc,1,
-0x11d33c4,1,
-0x11d33cc,1,
-0x11d33d4,1,
-0x11d33dc,1,
-0x11d33e4,1,
-0x11d33ec,1,
-0x11d33f4,1,
-0x11d33fc,1,
-0x11d3404,1,
-0x11d4000,12,
-0x11d4040,12,
-0x11d4800,36,
-0x11d4900,2,
-0x11d490c,1,
-0x11d4914,1,
-0x11d491c,1,
-0x11d4924,1,
-0x11d492c,1,
-0x11d4934,1,
-0x11d493c,1,
-0x11d4944,1,
-0x11d494c,1,
-0x11d4954,1,
-0x11d4964,1,
-0x11d496c,1,
-0x11d4974,1,
-0x11d497c,1,
-0x11d4984,1,
-0x11d498c,1,
-0x11d4994,1,
-0x11d499c,1,
-0x11d49a4,1,
-0x11d5000,2,
-0x11d500c,1,
-0x11d5200,27,
-0x11d5280,4,
-0x11d52c0,25,
-0x11d5340,6,
-0x11d5360,2,
-0x11d536c,3,
-0x11d5384,10,
-0x11d5400,2,
-0x11d5440,12,
-0x11df800,50,
-0x11df8d0,2,
-0x11df8dc,1,
-0x11df900,4,
-0x1200004,3,
-0x1200014,3,
-0x1200024,1,
-0x12000bc,1,
-0x12000c4,1,
-0x12000cc,1,
-0x12000d4,1,
-0x12000dc,1,
-0x12000e4,1,
-0x12000ec,1,
-0x12000f4,1,
-0x12000fc,1,
-0x1200104,1,
-0x120010c,1,
-0x1200114,1,
-0x120011c,1,
-0x1200124,1,
-0x120012c,1,
-0x1200134,1,
-0x120013c,1,
-0x1200144,37,
-0x12001dc,1,
-0x12001e4,1,
-0x12001ec,1,
-0x12001f4,1,
-0x12001fc,1,
-0x1200204,1,
-0x120020c,1,
-0x1200214,1,
-0x120021c,1,
-0x1200224,1,
-0x120022c,1,
-0x1200234,1,
-0x120023c,1,
-0x1200244,1,
-0x120024c,1,
-0x1200254,1,
-0x120025c,1,
-0x1200264,39,
-0x1200400,4,
-0x1200414,1,
-0x120041c,1,
-0x120051c,1,
-0x1200524,1,
-0x120052c,1,
-0x1200534,1,
-0x120053c,1,
-0x1200544,5,
-0x120055c,1,
-0x1200564,5,
-0x1200580,2,
-0x1200604,1,
-0x1200800,27,
-0x1200880,4,
-0x12008c0,25,
-0x1200940,6,
-0x1200960,2,
-0x120096c,3,
-0x120097c,1,
-0x1200a00,1,
-0x1200a10,6,
-0x13d0000,2,
-0x13d000c,1,
-0x13d0014,1,
-0x13d001c,5,
-0x13d0044,1,
-0x13d0080,4,
-0x13d00a0,6,
-0x13d00c0,4,
-0x13d00e0,6,
-0x13d0100,4,
-0x13d0200,4,
-0x13d0280,24,
-0x13d0300,4,
-0x13d0380,24,
-0x13d0400,4,
-0x13d0420,20,
-0x13d0480,4,
-0x13d04a0,5,
-0x13d04c0,4,
-0x13d04e0,5,
-0x13d0500,4,
-0x13d0540,4,
-0x13d0560,6,
-0x13d0580,4,
-0x13d05a0,6,
-0x13d05c0,4,
-0x13d1000,2,
-0x13d100c,1,
-0x13d1014,1,
-0x13d101c,1,
-0x13d1024,1,
-0x13d102c,1,
-0x13d1034,1,
-0x13d103c,1,
-0x13d1044,1,
-0x13d104c,1,
-0x13d1054,1,
-0x13d105c,1,
-0x13d1064,1,
-0x13d106c,1,
-0x13d1074,1,
-0x13d107c,1,
-0x13d1084,1,
-0x13d108c,1,
-0x13d1094,1,
-0x13d3000,2,
-0x13d300c,1,
-0x13d3014,1,
-0x13d301c,1,
-0x13d3024,1,
-0x13d302c,1,
-0x13d3034,1,
-0x13d303c,1,
-0x13d3044,1,
-0x13d304c,1,
-0x13d3054,1,
-0x13d305c,1,
-0x13d3064,1,
-0x13d306c,1,
-0x13d3074,1,
-0x13d307c,1,
-0x13d3084,1,
-0x13d308c,1,
-0x13d3094,1,
-0x13d309c,1,
-0x13d30a4,1,
-0x13d30ac,1,
-0x13d30b4,1,
-0x13d30bc,1,
-0x13d30c4,1,
-0x13d30cc,1,
-0x13d30d4,1,
-0x13d30dc,1,
-0x13d30e4,1,
-0x13d30ec,1,
-0x13d30f4,1,
-0x13d30fc,1,
-0x13d3104,1,
-0x13d310c,1,
-0x13d3114,1,
-0x13d311c,1,
-0x13d3124,1,
-0x13d312c,1,
-0x13d3134,1,
-0x13d313c,1,
-0x13d3144,1,
-0x13d314c,1,
-0x13d3154,1,
-0x13d315c,1,
-0x13d3164,1,
-0x13d316c,1,
-0x13d3174,1,
-0x13d317c,1,
-0x13d3184,1,
-0x13d318c,1,
-0x13d3194,1,
-0x13d319c,1,
-0x13d31a4,1,
-0x13d31ac,1,
-0x13d31b4,1,
-0x13d31bc,1,
-0x13d31c4,1,
-0x13d31cc,1,
-0x13d31d4,1,
-0x13d31dc,1,
-0x13d31e4,1,
-0x13d31ec,1,
-0x13d31f4,1,
-0x13d31fc,1,
-0x13d3204,1,
-0x13d320c,1,
-0x13d3214,1,
-0x13d321c,1,
-0x13d3224,1,
-0x13d322c,1,
-0x13d3234,1,
-0x13d323c,1,
-0x13d3244,1,
-0x13d324c,1,
-0x13d3254,1,
-0x13d325c,1,
-0x13d3264,1,
-0x13d326c,1,
-0x13d3274,1,
-0x13d327c,1,
-0x13d3284,1,
-0x13d328c,1,
-0x13d3294,1,
-0x13d329c,1,
-0x13d32a4,1,
-0x13d32ac,1,
-0x13d32b4,1,
-0x13d32bc,1,
-0x13d32c4,1,
-0x13d32cc,1,
-0x13d32d4,1,
-0x13d32dc,1,
-0x13d32e4,1,
-0x13d32ec,1,
-0x13d32f4,1,
-0x13d32fc,1,
-0x13d3304,1,
-0x13d330c,1,
-0x13d3314,1,
-0x13d331c,1,
-0x13d3324,1,
-0x13d332c,1,
-0x13d3334,1,
-0x13d333c,1,
-0x13d3344,1,
-0x13d334c,1,
-0x13d3354,1,
-0x13d335c,1,
-0x13d3364,1,
-0x13d336c,1,
-0x13d3374,1,
-0x13d337c,1,
-0x13d3384,1,
-0x13d338c,1,
-0x13d3394,1,
-0x13d339c,1,
-0x13d33a4,1,
-0x13d33ac,1,
-0x13d33b4,1,
-0x13d33bc,1,
-0x13d33c4,1,
-0x13d33cc,1,
-0x13d33d4,1,
-0x13d33dc,1,
-0x13d33e4,1,
-0x13d33ec,1,
-0x13d33f4,1,
-0x13d33fc,1,
-0x13d3404,1,
-0x13d4000,12,
-0x13d4040,12,
-0x13d4800,36,
-0x13d4900,2,
-0x13d490c,1,
-0x13d4914,1,
-0x13d491c,1,
-0x13d4924,1,
-0x13d492c,1,
-0x13d4934,1,
-0x13d493c,1,
-0x13d4944,1,
-0x13d494c,1,
-0x13d4954,1,
-0x13d4964,1,
-0x13d496c,1,
-0x13d4974,1,
-0x13d497c,1,
-0x13d4984,1,
-0x13d498c,1,
-0x13d4994,1,
-0x13d499c,1,
-0x13d49a4,1,
-0x13d5000,2,
-0x13d500c,1,
-0x13d5200,27,
-0x13d5280,4,
-0x13d52c0,25,
-0x13d5340,6,
-0x13d5360,2,
-0x13d536c,3,
-0x13d5384,10,
-0x13d5400,2,
-0x13d5440,12,
-0x13df800,50,
-0x13df8d0,2,
-0x13df8dc,1,
-0x13df900,4,
-0x1400004,3,
-0x1400014,3,
-0x1400024,1,
-0x14000bc,1,
-0x14000c4,1,
-0x14000cc,1,
-0x14000d4,1,
-0x14000dc,1,
-0x14000e4,1,
-0x14000ec,1,
-0x14000f4,1,
-0x14000fc,1,
-0x1400104,1,
-0x140010c,1,
-0x1400114,1,
-0x140011c,1,
-0x1400124,1,
-0x140012c,1,
-0x1400134,1,
-0x140013c,1,
-0x1400144,37,
-0x14001dc,1,
-0x14001e4,1,
-0x14001ec,1,
-0x14001f4,1,
-0x14001fc,1,
-0x1400204,1,
-0x140020c,1,
-0x1400214,1,
-0x140021c,1,
-0x1400224,1,
-0x140022c,1,
-0x1400234,1,
-0x140023c,1,
-0x1400244,1,
-0x140024c,1,
-0x1400254,1,
-0x140025c,1,
-0x1400264,39,
-0x1400400,4,
-0x1400414,1,
-0x140041c,1,
-0x140051c,1,
-0x1400524,1,
-0x140052c,1,
-0x1400534,1,
-0x140053c,1,
-0x1400544,5,
-0x140055c,1,
-0x1400564,5,
-0x1400580,2,
-0x1400604,1,
-0x1400800,27,
-0x1400880,4,
-0x14008c0,25,
-0x1400940,6,
-0x1400960,2,
-0x140096c,3,
-0x140097c,1,
-0x1400a00,1,
-0x1400a10,6,
-0x15d0000,2,
-0x15d000c,1,
-0x15d0014,1,
-0x15d001c,5,
-0x15d0044,1,
-0x15d0080,4,
-0x15d00a0,6,
-0x15d00c0,4,
-0x15d00e0,6,
-0x15d0100,4,
-0x15d0200,4,
-0x15d0280,24,
-0x15d0300,4,
-0x15d0380,24,
-0x15d0400,4,
-0x15d0420,20,
-0x15d0480,4,
-0x15d04a0,5,
-0x15d04c0,4,
-0x15d04e0,5,
-0x15d0500,4,
-0x15d0540,4,
-0x15d0560,6,
-0x15d0580,4,
-0x15d05a0,6,
-0x15d05c0,4,
-0x15d1000,2,
-0x15d100c,1,
-0x15d1014,1,
-0x15d101c,1,
-0x15d1024,1,
-0x15d102c,1,
-0x15d1034,1,
-0x15d103c,1,
-0x15d1044,1,
-0x15d104c,1,
-0x15d1054,1,
-0x15d105c,1,
-0x15d1064,1,
-0x15d106c,1,
-0x15d1074,1,
-0x15d107c,1,
-0x15d1084,1,
-0x15d108c,1,
-0x15d1094,1,
-0x15d3000,2,
-0x15d300c,1,
-0x15d3014,1,
-0x15d301c,1,
-0x15d3024,1,
-0x15d302c,1,
-0x15d3034,1,
-0x15d303c,1,
-0x15d3044,1,
-0x15d304c,1,
-0x15d3054,1,
-0x15d305c,1,
-0x15d3064,1,
-0x15d306c,1,
-0x15d3074,1,
-0x15d307c,1,
-0x15d3084,1,
-0x15d308c,1,
-0x15d3094,1,
-0x15d309c,1,
-0x15d30a4,1,
-0x15d30ac,1,
-0x15d30b4,1,
-0x15d30bc,1,
-0x15d30c4,1,
-0x15d30cc,1,
-0x15d30d4,1,
-0x15d30dc,1,
-0x15d30e4,1,
-0x15d30ec,1,
-0x15d30f4,1,
-0x15d30fc,1,
-0x15d3104,1,
-0x15d310c,1,
-0x15d3114,1,
-0x15d311c,1,
-0x15d3124,1,
-0x15d312c,1,
-0x15d3134,1,
-0x15d313c,1,
-0x15d3144,1,
-0x15d314c,1,
-0x15d3154,1,
-0x15d315c,1,
-0x15d3164,1,
-0x15d316c,1,
-0x15d3174,1,
-0x15d317c,1,
-0x15d3184,1,
-0x15d318c,1,
-0x15d3194,1,
-0x15d319c,1,
-0x15d31a4,1,
-0x15d31ac,1,
-0x15d31b4,1,
-0x15d31bc,1,
-0x15d31c4,1,
-0x15d31cc,1,
-0x15d31d4,1,
-0x15d31dc,1,
-0x15d31e4,1,
-0x15d31ec,1,
-0x15d31f4,1,
-0x15d31fc,1,
-0x15d3204,1,
-0x15d320c,1,
-0x15d3214,1,
-0x15d321c,1,
-0x15d3224,1,
-0x15d322c,1,
-0x15d3234,1,
-0x15d323c,1,
-0x15d3244,1,
-0x15d324c,1,
-0x15d3254,1,
-0x15d325c,1,
-0x15d3264,1,
-0x15d326c,1,
-0x15d3274,1,
-0x15d327c,1,
-0x15d3284,1,
-0x15d328c,1,
-0x15d3294,1,
-0x15d329c,1,
-0x15d32a4,1,
-0x15d32ac,1,
-0x15d32b4,1,
-0x15d32bc,1,
-0x15d32c4,1,
-0x15d32cc,1,
-0x15d32d4,1,
-0x15d32dc,1,
-0x15d32e4,1,
-0x15d32ec,1,
-0x15d32f4,1,
-0x15d32fc,1,
-0x15d3304,1,
-0x15d330c,1,
-0x15d3314,1,
-0x15d331c,1,
-0x15d3324,1,
-0x15d332c,1,
-0x15d3334,1,
-0x15d333c,1,
-0x15d3344,1,
-0x15d334c,1,
-0x15d3354,1,
-0x15d335c,1,
-0x15d3364,1,
-0x15d336c,1,
-0x15d3374,1,
-0x15d337c,1,
-0x15d3384,1,
-0x15d338c,1,
-0x15d3394,1,
-0x15d339c,1,
-0x15d33a4,1,
-0x15d33ac,1,
-0x15d33b4,1,
-0x15d33bc,1,
-0x15d33c4,1,
-0x15d33cc,1,
-0x15d33d4,1,
-0x15d33dc,1,
-0x15d33e4,1,
-0x15d33ec,1,
-0x15d33f4,1,
-0x15d33fc,1,
-0x15d3404,1,
-0x15d4000,12,
-0x15d4040,12,
-0x15d4800,36,
-0x15d4900,2,
-0x15d490c,1,
-0x15d4914,1,
-0x15d491c,1,
-0x15d4924,1,
-0x15d492c,1,
-0x15d4934,1,
-0x15d493c,1,
-0x15d4944,1,
-0x15d494c,1,
-0x15d4954,1,
-0x15d4964,1,
-0x15d496c,1,
-0x15d4974,1,
-0x15d497c,1,
-0x15d4984,1,
-0x15d498c,1,
-0x15d4994,1,
-0x15d499c,1,
-0x15d49a4,1,
-0x15d5000,2,
-0x15d500c,1,
-0x15d5200,27,
-0x15d5280,4,
-0x15d52c0,25,
-0x15d5340,6,
-0x15d5360,2,
-0x15d536c,3,
-0x15d5384,10,
-0x15d5400,2,
-0x15d5440,12,
-0x15df800,50,
-0x15df8d0,2,
-0x15df8dc,1,
-0x15df900,4,
-0x1600004,3,
-0x1600014,3,
-0x1600024,1,
-0x16000bc,1,
-0x16000c4,1,
-0x16000cc,1,
-0x16000d4,1,
-0x16000dc,1,
-0x16000e4,1,
-0x16000ec,1,
-0x16000f4,1,
-0x16000fc,1,
-0x1600104,1,
-0x160010c,1,
-0x1600114,1,
-0x160011c,1,
-0x1600124,1,
-0x160012c,1,
-0x1600134,1,
-0x160013c,1,
-0x1600144,37,
-0x16001dc,1,
-0x16001e4,1,
-0x16001ec,1,
-0x16001f4,1,
-0x16001fc,1,
-0x1600204,1,
-0x160020c,1,
-0x1600214,1,
-0x160021c,1,
-0x1600224,1,
-0x160022c,1,
-0x1600234,1,
-0x160023c,1,
-0x1600244,1,
-0x160024c,1,
-0x1600254,1,
-0x160025c,1,
-0x1600264,39,
-0x1600400,4,
-0x1600414,1,
-0x160041c,1,
-0x160051c,1,
-0x1600524,1,
-0x160052c,1,
-0x1600534,1,
-0x160053c,1,
-0x1600544,5,
-0x160055c,1,
-0x1600564,5,
-0x1600580,2,
-0x1600604,1,
-0x1600800,27,
-0x1600880,4,
-0x16008c0,25,
-0x1600940,6,
-0x1600960,2,
-0x160096c,3,
-0x160097c,1,
-0x1600a00,1,
-0x1600a10,6,
-0x17d0000,2,
-0x17d000c,1,
-0x17d0014,1,
-0x17d001c,5,
-0x17d0044,1,
-0x17d0080,4,
-0x17d00a0,6,
-0x17d00c0,4,
-0x17d00e0,6,
-0x17d0100,4,
-0x17d0200,4,
-0x17d0280,24,
-0x17d0300,4,
-0x17d0380,24,
-0x17d0400,4,
-0x17d0420,20,
-0x17d0480,4,
-0x17d04a0,5,
-0x17d04c0,4,
-0x17d04e0,5,
-0x17d0500,4,
-0x17d0540,4,
-0x17d0560,6,
-0x17d0580,4,
-0x17d05a0,6,
-0x17d05c0,4,
-0x17d1000,2,
-0x17d100c,1,
-0x17d1014,1,
-0x17d101c,1,
-0x17d1024,1,
-0x17d102c,1,
-0x17d1034,1,
-0x17d103c,1,
-0x17d1044,1,
-0x17d104c,1,
-0x17d1054,1,
-0x17d105c,1,
-0x17d1064,1,
-0x17d106c,1,
-0x17d1074,1,
-0x17d107c,1,
-0x17d1084,1,
-0x17d108c,1,
-0x17d1094,1,
-0x17d3000,2,
-0x17d300c,1,
-0x17d3014,1,
-0x17d301c,1,
-0x17d3024,1,
-0x17d302c,1,
-0x17d3034,1,
-0x17d303c,1,
-0x17d3044,1,
-0x17d304c,1,
-0x17d3054,1,
-0x17d305c,1,
-0x17d3064,1,
-0x17d306c,1,
-0x17d3074,1,
-0x17d307c,1,
-0x17d3084,1,
-0x17d308c,1,
-0x17d3094,1,
-0x17d309c,1,
-0x17d30a4,1,
-0x17d30ac,1,
-0x17d30b4,1,
-0x17d30bc,1,
-0x17d30c4,1,
-0x17d30cc,1,
-0x17d30d4,1,
-0x17d30dc,1,
-0x17d30e4,1,
-0x17d30ec,1,
-0x17d30f4,1,
-0x17d30fc,1,
-0x17d3104,1,
-0x17d310c,1,
-0x17d3114,1,
-0x17d311c,1,
-0x17d3124,1,
-0x17d312c,1,
-0x17d3134,1,
-0x17d313c,1,
-0x17d3144,1,
-0x17d314c,1,
-0x17d3154,1,
-0x17d315c,1,
-0x17d3164,1,
-0x17d316c,1,
-0x17d3174,1,
-0x17d317c,1,
-0x17d3184,1,
-0x17d318c,1,
-0x17d3194,1,
-0x17d319c,1,
-0x17d31a4,1,
-0x17d31ac,1,
-0x17d31b4,1,
-0x17d31bc,1,
-0x17d31c4,1,
-0x17d31cc,1,
-0x17d31d4,1,
-0x17d31dc,1,
-0x17d31e4,1,
-0x17d31ec,1,
-0x17d31f4,1,
-0x17d31fc,1,
-0x17d3204,1,
-0x17d320c,1,
-0x17d3214,1,
-0x17d321c,1,
-0x17d3224,1,
-0x17d322c,1,
-0x17d3234,1,
-0x17d323c,1,
-0x17d3244,1,
-0x17d324c,1,
-0x17d3254,1,
-0x17d325c,1,
-0x17d3264,1,
-0x17d326c,1,
-0x17d3274,1,
-0x17d327c,1,
-0x17d3284,1,
-0x17d328c,1,
-0x17d3294,1,
-0x17d329c,1,
-0x17d32a4,1,
-0x17d32ac,1,
-0x17d32b4,1,
-0x17d32bc,1,
-0x17d32c4,1,
-0x17d32cc,1,
-0x17d32d4,1,
-0x17d32dc,1,
-0x17d32e4,1,
-0x17d32ec,1,
-0x17d32f4,1,
-0x17d32fc,1,
-0x17d3304,1,
-0x17d330c,1,
-0x17d3314,1,
-0x17d331c,1,
-0x17d3324,1,
-0x17d332c,1,
-0x17d3334,1,
-0x17d333c,1,
-0x17d3344,1,
-0x17d334c,1,
-0x17d3354,1,
-0x17d335c,1,
-0x17d3364,1,
-0x17d336c,1,
-0x17d3374,1,
-0x17d337c,1,
-0x17d3384,1,
-0x17d338c,1,
-0x17d3394,1,
-0x17d339c,1,
-0x17d33a4,1,
-0x17d33ac,1,
-0x17d33b4,1,
-0x17d33bc,1,
-0x17d33c4,1,
-0x17d33cc,1,
-0x17d33d4,1,
-0x17d33dc,1,
-0x17d33e4,1,
-0x17d33ec,1,
-0x17d33f4,1,
-0x17d33fc,1,
-0x17d3404,1,
-0x17d4000,12,
-0x17d4040,12,
-0x17d4800,36,
-0x17d4900,2,
-0x17d490c,1,
-0x17d4914,1,
-0x17d491c,1,
-0x17d4924,1,
-0x17d492c,1,
-0x17d4934,1,
-0x17d493c,1,
-0x17d4944,1,
-0x17d494c,1,
-0x17d4954,1,
-0x17d4964,1,
-0x17d496c,1,
-0x17d4974,1,
-0x17d497c,1,
-0x17d4984,1,
-0x17d498c,1,
-0x17d4994,1,
-0x17d499c,1,
-0x17d49a4,1,
-0x17d5000,2,
-0x17d500c,1,
-0x17d5200,27,
-0x17d5280,4,
-0x17d52c0,25,
-0x17d5340,6,
-0x17d5360,2,
-0x17d536c,3,
-0x17d5384,10,
-0x17d5400,2,
-0x17d5440,12,
-0x17df800,50,
-0x17df8d0,2,
-0x17df8dc,1,
-0x17df900,4,
-0x1800004,3,
-0x1800014,3,
-0x1800024,1,
-0x18000bc,1,
-0x18000c4,1,
-0x18000cc,1,
-0x18000d4,1,
-0x18000dc,1,
-0x18000e4,1,
-0x18000ec,1,
-0x18000f4,1,
-0x18000fc,1,
-0x1800104,1,
-0x180010c,1,
-0x1800114,1,
-0x180011c,1,
-0x1800124,1,
-0x180012c,1,
-0x1800134,1,
-0x180013c,1,
-0x1800144,37,
-0x18001dc,1,
-0x18001e4,1,
-0x18001ec,1,
-0x18001f4,1,
-0x18001fc,1,
-0x1800204,1,
-0x180020c,1,
-0x1800214,1,
-0x180021c,1,
-0x1800224,1,
-0x180022c,1,
-0x1800234,1,
-0x180023c,1,
-0x1800244,1,
-0x180024c,1,
-0x1800254,1,
-0x180025c,1,
-0x1800264,39,
-0x1800400,4,
-0x1800414,1,
-0x180041c,1,
-0x180051c,1,
-0x1800524,1,
-0x180052c,1,
-0x1800534,1,
-0x180053c,1,
-0x1800544,5,
-0x180055c,1,
-0x1800564,5,
-0x1800580,2,
-0x1800604,1,
-0x1800800,27,
-0x1800880,4,
-0x18008c0,25,
-0x1800940,6,
-0x1800960,2,
-0x180096c,3,
-0x180097c,1,
-0x1800a00,1,
-0x1800a10,6,
-0x19d0000,2,
-0x19d000c,1,
-0x19d0014,1,
-0x19d001c,5,
-0x19d0044,1,
-0x19d0080,4,
-0x19d00a0,6,
-0x19d00c0,4,
-0x19d00e0,6,
-0x19d0100,4,
-0x19d0200,4,
-0x19d0280,24,
-0x19d0300,4,
-0x19d0380,24,
-0x19d0400,4,
-0x19d0420,20,
-0x19d0480,4,
-0x19d04a0,5,
-0x19d04c0,4,
-0x19d04e0,5,
-0x19d0500,4,
-0x19d0540,4,
-0x19d0560,6,
-0x19d0580,4,
-0x19d05a0,6,
-0x19d05c0,4,
-0x19d1000,2,
-0x19d100c,1,
-0x19d1014,1,
-0x19d101c,1,
-0x19d1024,1,
-0x19d102c,1,
-0x19d1034,1,
-0x19d103c,1,
-0x19d1044,1,
-0x19d104c,1,
-0x19d1054,1,
-0x19d105c,1,
-0x19d1064,1,
-0x19d106c,1,
-0x19d1074,1,
-0x19d107c,1,
-0x19d1084,1,
-0x19d108c,1,
-0x19d1094,1,
-0x19d3000,2,
-0x19d300c,1,
-0x19d3014,1,
-0x19d301c,1,
-0x19d3024,1,
-0x19d302c,1,
-0x19d3034,1,
-0x19d303c,1,
-0x19d3044,1,
-0x19d304c,1,
-0x19d3054,1,
-0x19d305c,1,
-0x19d3064,1,
-0x19d306c,1,
-0x19d3074,1,
-0x19d307c,1,
-0x19d3084,1,
-0x19d308c,1,
-0x19d3094,1,
-0x19d309c,1,
-0x19d30a4,1,
-0x19d30ac,1,
-0x19d30b4,1,
-0x19d30bc,1,
-0x19d30c4,1,
-0x19d30cc,1,
-0x19d30d4,1,
-0x19d30dc,1,
-0x19d30e4,1,
-0x19d30ec,1,
-0x19d30f4,1,
-0x19d30fc,1,
-0x19d3104,1,
-0x19d310c,1,
-0x19d3114,1,
-0x19d311c,1,
-0x19d3124,1,
-0x19d312c,1,
-0x19d3134,1,
-0x19d313c,1,
-0x19d3144,1,
-0x19d314c,1,
-0x19d3154,1,
-0x19d315c,1,
-0x19d3164,1,
-0x19d316c,1,
-0x19d3174,1,
-0x19d317c,1,
-0x19d3184,1,
-0x19d318c,1,
-0x19d3194,1,
-0x19d319c,1,
-0x19d31a4,1,
-0x19d31ac,1,
-0x19d31b4,1,
-0x19d31bc,1,
-0x19d31c4,1,
-0x19d31cc,1,
-0x19d31d4,1,
-0x19d31dc,1,
-0x19d31e4,1,
-0x19d31ec,1,
-0x19d31f4,1,
-0x19d31fc,1,
-0x19d3204,1,
-0x19d320c,1,
-0x19d3214,1,
-0x19d321c,1,
-0x19d3224,1,
-0x19d322c,1,
-0x19d3234,1,
-0x19d323c,1,
-0x19d3244,1,
-0x19d324c,1,
-0x19d3254,1,
-0x19d325c,1,
-0x19d3264,1,
-0x19d326c,1,
-0x19d3274,1,
-0x19d327c,1,
-0x19d3284,1,
-0x19d328c,1,
-0x19d3294,1,
-0x19d329c,1,
-0x19d32a4,1,
-0x19d32ac,1,
-0x19d32b4,1,
-0x19d32bc,1,
-0x19d32c4,1,
-0x19d32cc,1,
-0x19d32d4,1,
-0x19d32dc,1,
-0x19d32e4,1,
-0x19d32ec,1,
-0x19d32f4,1,
-0x19d32fc,1,
-0x19d3304,1,
-0x19d330c,1,
-0x19d3314,1,
-0x19d331c,1,
-0x19d3324,1,
-0x19d332c,1,
-0x19d3334,1,
-0x19d333c,1,
-0x19d3344,1,
-0x19d334c,1,
-0x19d3354,1,
-0x19d335c,1,
-0x19d3364,1,
-0x19d336c,1,
-0x19d3374,1,
-0x19d337c,1,
-0x19d3384,1,
-0x19d338c,1,
-0x19d3394,1,
-0x19d339c,1,
-0x19d33a4,1,
-0x19d33ac,1,
-0x19d33b4,1,
-0x19d33bc,1,
-0x19d33c4,1,
-0x19d33cc,1,
-0x19d33d4,1,
-0x19d33dc,1,
-0x19d33e4,1,
-0x19d33ec,1,
-0x19d33f4,1,
-0x19d33fc,1,
-0x19d3404,1,
-0x19d4000,12,
-0x19d4040,12,
-0x19d4800,36,
-0x19d4900,2,
-0x19d490c,1,
-0x19d4914,1,
-0x19d491c,1,
-0x19d4924,1,
-0x19d492c,1,
-0x19d4934,1,
-0x19d493c,1,
-0x19d4944,1,
-0x19d494c,1,
-0x19d4954,1,
-0x19d4964,1,
-0x19d496c,1,
-0x19d4974,1,
-0x19d497c,1,
-0x19d4984,1,
-0x19d498c,1,
-0x19d4994,1,
-0x19d499c,1,
-0x19d49a4,1,
-0x19d5000,2,
-0x19d500c,1,
-0x19d5200,27,
-0x19d5280,4,
-0x19d52c0,25,
-0x19d5340,6,
-0x19d5360,2,
-0x19d536c,3,
-0x19d5384,10,
-0x19d5400,2,
-0x19d5440,12,
-0x19df800,50,
-0x19df8d0,2,
-0x19df8dc,1,
-0x19df900,4,
-0x1a00004,3,
-0x1a00014,3,
-0x1a00024,1,
-0x1a000bc,1,
-0x1a000c4,1,
-0x1a000cc,1,
-0x1a000d4,1,
-0x1a000dc,1,
-0x1a000e4,1,
-0x1a000ec,1,
-0x1a000f4,1,
-0x1a000fc,1,
-0x1a00104,1,
-0x1a0010c,1,
-0x1a00114,1,
-0x1a0011c,1,
-0x1a00124,1,
-0x1a0012c,1,
-0x1a00134,1,
-0x1a0013c,1,
-0x1a00144,37,
-0x1a001dc,1,
-0x1a001e4,1,
-0x1a001ec,1,
-0x1a001f4,1,
-0x1a001fc,1,
-0x1a00204,1,
-0x1a0020c,1,
-0x1a00214,1,
-0x1a0021c,1,
-0x1a00224,1,
-0x1a0022c,1,
-0x1a00234,1,
-0x1a0023c,1,
-0x1a00244,1,
-0x1a0024c,1,
-0x1a00254,1,
-0x1a0025c,1,
-0x1a00264,39,
-0x1a00400,4,
-0x1a00414,1,
-0x1a0041c,1,
-0x1a0051c,1,
-0x1a00524,1,
-0x1a0052c,1,
-0x1a00534,1,
-0x1a0053c,1,
-0x1a00544,5,
-0x1a0055c,1,
-0x1a00564,5,
-0x1a00580,2,
-0x1a00604,1,
-0x1a00800,27,
-0x1a00880,4,
-0x1a008c0,25,
-0x1a00940,6,
-0x1a00960,2,
-0x1a0096c,3,
-0x1a0097c,1,
-0x1a00a00,1,
-0x1a00a10,6,
-0x1bd0000,2,
-0x1bd000c,1,
-0x1bd0014,1,
-0x1bd001c,5,
-0x1bd0044,1,
-0x1bd0080,4,
-0x1bd00a0,6,
-0x1bd00c0,4,
-0x1bd00e0,6,
-0x1bd0100,4,
-0x1bd0200,4,
-0x1bd0280,24,
-0x1bd0300,4,
-0x1bd0380,24,
-0x1bd0400,4,
-0x1bd0420,20,
-0x1bd0480,4,
-0x1bd04a0,5,
-0x1bd04c0,4,
-0x1bd04e0,5,
-0x1bd0500,4,
-0x1bd0540,4,
-0x1bd0560,6,
-0x1bd0580,4,
-0x1bd05a0,6,
-0x1bd05c0,4,
-0x1bd1000,2,
-0x1bd100c,1,
-0x1bd1014,1,
-0x1bd101c,1,
-0x1bd1024,1,
-0x1bd102c,1,
-0x1bd1034,1,
-0x1bd103c,1,
-0x1bd1044,1,
-0x1bd104c,1,
-0x1bd1054,1,
-0x1bd105c,1,
-0x1bd1064,1,
-0x1bd106c,1,
-0x1bd1074,1,
-0x1bd107c,1,
-0x1bd1084,1,
-0x1bd108c,1,
-0x1bd1094,1,
-0x1bd3000,2,
-0x1bd300c,1,
-0x1bd3014,1,
-0x1bd301c,1,
-0x1bd3024,1,
-0x1bd302c,1,
-0x1bd3034,1,
-0x1bd303c,1,
-0x1bd3044,1,
-0x1bd304c,1,
-0x1bd3054,1,
-0x1bd305c,1,
-0x1bd3064,1,
-0x1bd306c,1,
-0x1bd3074,1,
-0x1bd307c,1,
-0x1bd3084,1,
-0x1bd308c,1,
-0x1bd3094,1,
-0x1bd309c,1,
-0x1bd30a4,1,
-0x1bd30ac,1,
-0x1bd30b4,1,
-0x1bd30bc,1,
-0x1bd30c4,1,
-0x1bd30cc,1,
-0x1bd30d4,1,
-0x1bd30dc,1,
-0x1bd30e4,1,
-0x1bd30ec,1,
-0x1bd30f4,1,
-0x1bd30fc,1,
-0x1bd3104,1,
-0x1bd310c,1,
-0x1bd3114,1,
-0x1bd311c,1,
-0x1bd3124,1,
-0x1bd312c,1,
-0x1bd3134,1,
-0x1bd313c,1,
-0x1bd3144,1,
-0x1bd314c,1,
-0x1bd3154,1,
-0x1bd315c,1,
-0x1bd3164,1,
-0x1bd316c,1,
-0x1bd3174,1,
-0x1bd317c,1,
-0x1bd3184,1,
-0x1bd318c,1,
-0x1bd3194,1,
-0x1bd319c,1,
-0x1bd31a4,1,
-0x1bd31ac,1,
-0x1bd31b4,1,
-0x1bd31bc,1,
-0x1bd31c4,1,
-0x1bd31cc,1,
-0x1bd31d4,1,
-0x1bd31dc,1,
-0x1bd31e4,1,
-0x1bd31ec,1,
-0x1bd31f4,1,
-0x1bd31fc,1,
-0x1bd3204,1,
-0x1bd320c,1,
-0x1bd3214,1,
-0x1bd321c,1,
-0x1bd3224,1,
-0x1bd322c,1,
-0x1bd3234,1,
-0x1bd323c,1,
-0x1bd3244,1,
-0x1bd324c,1,
-0x1bd3254,1,
-0x1bd325c,1,
-0x1bd3264,1,
-0x1bd326c,1,
-0x1bd3274,1,
-0x1bd327c,1,
-0x1bd3284,1,
-0x1bd328c,1,
-0x1bd3294,1,
-0x1bd329c,1,
-0x1bd32a4,1,
-0x1bd32ac,1,
-0x1bd32b4,1,
-0x1bd32bc,1,
-0x1bd32c4,1,
-0x1bd32cc,1,
-0x1bd32d4,1,
-0x1bd32dc,1,
-0x1bd32e4,1,
-0x1bd32ec,1,
-0x1bd32f4,1,
-0x1bd32fc,1,
-0x1bd3304,1,
-0x1bd330c,1,
-0x1bd3314,1,
-0x1bd331c,1,
-0x1bd3324,1,
-0x1bd332c,1,
-0x1bd3334,1,
-0x1bd333c,1,
-0x1bd3344,1,
-0x1bd334c,1,
-0x1bd3354,1,
-0x1bd335c,1,
-0x1bd3364,1,
-0x1bd336c,1,
-0x1bd3374,1,
-0x1bd337c,1,
-0x1bd3384,1,
-0x1bd338c,1,
-0x1bd3394,1,
-0x1bd339c,1,
-0x1bd33a4,1,
-0x1bd33ac,1,
-0x1bd33b4,1,
-0x1bd33bc,1,
-0x1bd33c4,1,
-0x1bd33cc,1,
-0x1bd33d4,1,
-0x1bd33dc,1,
-0x1bd33e4,1,
-0x1bd33ec,1,
-0x1bd33f4,1,
-0x1bd33fc,1,
-0x1bd3404,1,
-0x1bd4000,12,
-0x1bd4040,12,
-0x1bd4800,36,
-0x1bd4900,2,
-0x1bd490c,1,
-0x1bd4914,1,
-0x1bd491c,1,
-0x1bd4924,1,
-0x1bd492c,1,
-0x1bd4934,1,
-0x1bd493c,1,
-0x1bd4944,1,
-0x1bd494c,1,
-0x1bd4954,1,
-0x1bd4964,1,
-0x1bd496c,1,
-0x1bd4974,1,
-0x1bd497c,1,
-0x1bd4984,1,
-0x1bd498c,1,
-0x1bd4994,1,
-0x1bd499c,1,
-0x1bd49a4,1,
-0x1bd5000,2,
-0x1bd500c,1,
-0x1bd5200,27,
-0x1bd5280,4,
-0x1bd52c0,25,
-0x1bd5340,6,
-0x1bd5360,2,
-0x1bd536c,3,
-0x1bd5384,10,
-0x1bd5400,2,
-0x1bd5440,12,
-0x1bdf800,50,
-0x1bdf8d0,2,
-0x1bdf8dc,1,
-0x1bdf900,4,
-0x1c00004,3,
-0x1c00014,3,
-0x1c00024,1,
-0x1c000bc,1,
-0x1c000c4,1,
-0x1c000cc,1,
-0x1c000d4,1,
-0x1c000dc,1,
-0x1c000e4,1,
-0x1c000ec,1,
-0x1c000f4,1,
-0x1c000fc,1,
-0x1c00104,1,
-0x1c0010c,1,
-0x1c00114,1,
-0x1c0011c,1,
-0x1c00124,1,
-0x1c0012c,1,
-0x1c00134,1,
-0x1c0013c,1,
-0x1c00144,37,
-0x1c001dc,1,
-0x1c001e4,1,
-0x1c001ec,1,
-0x1c001f4,1,
-0x1c001fc,1,
-0x1c00204,1,
-0x1c0020c,1,
-0x1c00214,1,
-0x1c0021c,1,
-0x1c00224,1,
-0x1c0022c,1,
-0x1c00234,1,
-0x1c0023c,1,
-0x1c00244,1,
-0x1c0024c,1,
-0x1c00254,1,
-0x1c0025c,1,
-0x1c00264,39,
-0x1c00400,4,
-0x1c00414,1,
-0x1c0041c,1,
-0x1c0051c,1,
-0x1c00524,1,
-0x1c0052c,1,
-0x1c00534,1,
-0x1c0053c,1,
-0x1c00544,5,
-0x1c0055c,1,
-0x1c00564,5,
-0x1c00580,2,
-0x1c00604,1,
-0x1c00800,27,
-0x1c00880,4,
-0x1c008c0,25,
-0x1c00940,6,
-0x1c00960,2,
-0x1c0096c,3,
-0x1c0097c,1,
-0x1c00a00,1,
-0x1c00a10,6,
-0x1dd0000,2,
-0x1dd000c,1,
-0x1dd0014,1,
-0x1dd001c,5,
-0x1dd0044,1,
-0x1dd0080,4,
-0x1dd00a0,6,
-0x1dd00c0,4,
-0x1dd00e0,6,
-0x1dd0100,4,
-0x1dd0200,4,
-0x1dd0280,24,
-0x1dd0300,4,
-0x1dd0380,24,
-0x1dd0400,4,
-0x1dd0420,20,
-0x1dd0480,4,
-0x1dd04a0,5,
-0x1dd04c0,4,
-0x1dd04e0,5,
-0x1dd0500,4,
-0x1dd0540,4,
-0x1dd0560,6,
-0x1dd0580,4,
-0x1dd05a0,6,
-0x1dd05c0,4,
-0x1dd1000,2,
-0x1dd100c,1,
-0x1dd1014,1,
-0x1dd101c,1,
-0x1dd1024,1,
-0x1dd102c,1,
-0x1dd1034,1,
-0x1dd103c,1,
-0x1dd1044,1,
-0x1dd104c,1,
-0x1dd1054,1,
-0x1dd105c,1,
-0x1dd1064,1,
-0x1dd106c,1,
-0x1dd1074,1,
-0x1dd107c,1,
-0x1dd1084,1,
-0x1dd108c,1,
-0x1dd1094,1,
-0x1dd3000,2,
-0x1dd300c,1,
-0x1dd3014,1,
-0x1dd301c,1,
-0x1dd3024,1,
-0x1dd302c,1,
-0x1dd3034,1,
-0x1dd303c,1,
-0x1dd3044,1,
-0x1dd304c,1,
-0x1dd3054,1,
-0x1dd305c,1,
-0x1dd3064,1,
-0x1dd306c,1,
-0x1dd3074,1,
-0x1dd307c,1,
-0x1dd3084,1,
-0x1dd308c,1,
-0x1dd3094,1,
-0x1dd309c,1,
-0x1dd30a4,1,
-0x1dd30ac,1,
-0x1dd30b4,1,
-0x1dd30bc,1,
-0x1dd30c4,1,
-0x1dd30cc,1,
-0x1dd30d4,1,
-0x1dd30dc,1,
-0x1dd30e4,1,
-0x1dd30ec,1,
-0x1dd30f4,1,
-0x1dd30fc,1,
-0x1dd3104,1,
-0x1dd310c,1,
-0x1dd3114,1,
-0x1dd311c,1,
-0x1dd3124,1,
-0x1dd312c,1,
-0x1dd3134,1,
-0x1dd313c,1,
-0x1dd3144,1,
-0x1dd314c,1,
-0x1dd3154,1,
-0x1dd315c,1,
-0x1dd3164,1,
-0x1dd316c,1,
-0x1dd3174,1,
-0x1dd317c,1,
-0x1dd3184,1,
-0x1dd318c,1,
-0x1dd3194,1,
-0x1dd319c,1,
-0x1dd31a4,1,
-0x1dd31ac,1,
-0x1dd31b4,1,
-0x1dd31bc,1,
-0x1dd31c4,1,
-0x1dd31cc,1,
-0x1dd31d4,1,
-0x1dd31dc,1,
-0x1dd31e4,1,
-0x1dd31ec,1,
-0x1dd31f4,1,
-0x1dd31fc,1,
-0x1dd3204,1,
-0x1dd320c,1,
-0x1dd3214,1,
-0x1dd321c,1,
-0x1dd3224,1,
-0x1dd322c,1,
-0x1dd3234,1,
-0x1dd323c,1,
-0x1dd3244,1,
-0x1dd324c,1,
-0x1dd3254,1,
-0x1dd325c,1,
-0x1dd3264,1,
-0x1dd326c,1,
-0x1dd3274,1,
-0x1dd327c,1,
-0x1dd3284,1,
-0x1dd328c,1,
-0x1dd3294,1,
-0x1dd329c,1,
-0x1dd32a4,1,
-0x1dd32ac,1,
-0x1dd32b4,1,
-0x1dd32bc,1,
-0x1dd32c4,1,
-0x1dd32cc,1,
-0x1dd32d4,1,
-0x1dd32dc,1,
-0x1dd32e4,1,
-0x1dd32ec,1,
-0x1dd32f4,1,
-0x1dd32fc,1,
-0x1dd3304,1,
-0x1dd330c,1,
-0x1dd3314,1,
-0x1dd331c,1,
-0x1dd3324,1,
-0x1dd332c,1,
-0x1dd3334,1,
-0x1dd333c,1,
-0x1dd3344,1,
-0x1dd334c,1,
-0x1dd3354,1,
-0x1dd335c,1,
-0x1dd3364,1,
-0x1dd336c,1,
-0x1dd3374,1,
-0x1dd337c,1,
-0x1dd3384,1,
-0x1dd338c,1,
-0x1dd3394,1,
-0x1dd339c,1,
-0x1dd33a4,1,
-0x1dd33ac,1,
-0x1dd33b4,1,
-0x1dd33bc,1,
-0x1dd33c4,1,
-0x1dd33cc,1,
-0x1dd33d4,1,
-0x1dd33dc,1,
-0x1dd33e4,1,
-0x1dd33ec,1,
-0x1dd33f4,1,
-0x1dd33fc,1,
-0x1dd3404,1,
-0x1dd4000,12,
-0x1dd4040,12,
-0x1dd4800,36,
-0x1dd4900,2,
-0x1dd490c,1,
-0x1dd4914,1,
-0x1dd491c,1,
-0x1dd4924,1,
-0x1dd492c,1,
-0x1dd4934,1,
-0x1dd493c,1,
-0x1dd4944,1,
-0x1dd494c,1,
-0x1dd4954,1,
-0x1dd4964,1,
-0x1dd496c,1,
-0x1dd4974,1,
-0x1dd497c,1,
-0x1dd4984,1,
-0x1dd498c,1,
-0x1dd4994,1,
-0x1dd499c,1,
-0x1dd49a4,1,
-0x1dd5000,2,
-0x1dd500c,1,
-0x1dd5200,27,
-0x1dd5280,4,
-0x1dd52c0,25,
-0x1dd5340,6,
-0x1dd5360,2,
-0x1dd536c,3,
-0x1dd5384,10,
-0x1dd5400,2,
-0x1dd5440,12,
-0x1ddf800,50,
-0x1ddf8d0,2,
-0x1ddf8dc,1,
-0x1ddf900,4,
-0x1e00004,3,
-0x1e00014,3,
-0x1e00024,1,
-0x1e000bc,1,
-0x1e000c4,1,
-0x1e000cc,1,
-0x1e000d4,1,
-0x1e000dc,1,
-0x1e000e4,1,
-0x1e000ec,1,
-0x1e000f4,1,
-0x1e000fc,1,
-0x1e00104,1,
-0x1e0010c,1,
-0x1e00114,1,
-0x1e0011c,1,
-0x1e00124,1,
-0x1e0012c,1,
-0x1e00134,1,
-0x1e0013c,1,
-0x1e00144,37,
-0x1e001dc,1,
-0x1e001e4,1,
-0x1e001ec,1,
-0x1e001f4,1,
-0x1e001fc,1,
-0x1e00204,1,
-0x1e0020c,1,
-0x1e00214,1,
-0x1e0021c,1,
-0x1e00224,1,
-0x1e0022c,1,
-0x1e00234,1,
-0x1e0023c,1,
-0x1e00244,1,
-0x1e0024c,1,
-0x1e00254,1,
-0x1e0025c,1,
-0x1e00264,39,
-0x1e00400,4,
-0x1e00414,1,
-0x1e0041c,1,
-0x1e0051c,1,
-0x1e00524,1,
-0x1e0052c,1,
-0x1e00534,1,
-0x1e0053c,1,
-0x1e00544,5,
-0x1e0055c,1,
-0x1e00564,5,
-0x1e00580,2,
-0x1e00604,1,
-0x1e00800,27,
-0x1e00880,4,
-0x1e008c0,25,
-0x1e00940,6,
-0x1e00960,2,
-0x1e0096c,3,
-0x1e0097c,1,
-0x1e00a00,1,
-0x1e00a10,6,
-0x1fd0000,2,
-0x1fd000c,1,
-0x1fd0014,1,
-0x1fd001c,5,
-0x1fd0044,1,
-0x1fd0080,4,
-0x1fd00a0,6,
-0x1fd00c0,4,
-0x1fd00e0,6,
-0x1fd0100,4,
-0x1fd0200,4,
-0x1fd0280,24,
-0x1fd0300,4,
-0x1fd0380,24,
-0x1fd0400,4,
-0x1fd0420,20,
-0x1fd0480,4,
-0x1fd04a0,5,
-0x1fd04c0,4,
-0x1fd04e0,5,
-0x1fd0500,4,
-0x1fd0540,4,
-0x1fd0560,6,
-0x1fd0580,4,
-0x1fd05a0,6,
-0x1fd05c0,4,
-0x1fd1000,2,
-0x1fd100c,1,
-0x1fd1014,1,
-0x1fd101c,1,
-0x1fd1024,1,
-0x1fd102c,1,
-0x1fd1034,1,
-0x1fd103c,1,
-0x1fd1044,1,
-0x1fd104c,1,
-0x1fd1054,1,
-0x1fd105c,1,
-0x1fd1064,1,
-0x1fd106c,1,
-0x1fd1074,1,
-0x1fd107c,1,
-0x1fd1084,1,
-0x1fd108c,1,
-0x1fd1094,1,
-0x1fd3000,2,
-0x1fd300c,1,
-0x1fd3014,1,
-0x1fd301c,1,
-0x1fd3024,1,
-0x1fd302c,1,
-0x1fd3034,1,
-0x1fd303c,1,
-0x1fd3044,1,
-0x1fd304c,1,
-0x1fd3054,1,
-0x1fd305c,1,
-0x1fd3064,1,
-0x1fd306c,1,
-0x1fd3074,1,
-0x1fd307c,1,
-0x1fd3084,1,
-0x1fd308c,1,
-0x1fd3094,1,
-0x1fd309c,1,
-0x1fd30a4,1,
-0x1fd30ac,1,
-0x1fd30b4,1,
-0x1fd30bc,1,
-0x1fd30c4,1,
-0x1fd30cc,1,
-0x1fd30d4,1,
-0x1fd30dc,1,
-0x1fd30e4,1,
-0x1fd30ec,1,
-0x1fd30f4,1,
-0x1fd30fc,1,
-0x1fd3104,1,
-0x1fd310c,1,
-0x1fd3114,1,
-0x1fd311c,1,
-0x1fd3124,1,
-0x1fd312c,1,
-0x1fd3134,1,
-0x1fd313c,1,
-0x1fd3144,1,
-0x1fd314c,1,
-0x1fd3154,1,
-0x1fd315c,1,
-0x1fd3164,1,
-0x1fd316c,1,
-0x1fd3174,1,
-0x1fd317c,1,
-0x1fd3184,1,
-0x1fd318c,1,
-0x1fd3194,1,
-0x1fd319c,1,
-0x1fd31a4,1,
-0x1fd31ac,1,
-0x1fd31b4,1,
-0x1fd31bc,1,
-0x1fd31c4,1,
-0x1fd31cc,1,
-0x1fd31d4,1,
-0x1fd31dc,1,
-0x1fd31e4,1,
-0x1fd31ec,1,
-0x1fd31f4,1,
-0x1fd31fc,1,
-0x1fd3204,1,
-0x1fd320c,1,
-0x1fd3214,1,
-0x1fd321c,1,
-0x1fd3224,1,
-0x1fd322c,1,
-0x1fd3234,1,
-0x1fd323c,1,
-0x1fd3244,1,
-0x1fd324c,1,
-0x1fd3254,1,
-0x1fd325c,1,
-0x1fd3264,1,
-0x1fd326c,1,
-0x1fd3274,1,
-0x1fd327c,1,
-0x1fd3284,1,
-0x1fd328c,1,
-0x1fd3294,1,
-0x1fd329c,1,
-0x1fd32a4,1,
-0x1fd32ac,1,
-0x1fd32b4,1,
-0x1fd32bc,1,
-0x1fd32c4,1,
-0x1fd32cc,1,
-0x1fd32d4,1,
-0x1fd32dc,1,
-0x1fd32e4,1,
-0x1fd32ec,1,
-0x1fd32f4,1,
-0x1fd32fc,1,
-0x1fd3304,1,
-0x1fd330c,1,
-0x1fd3314,1,
-0x1fd331c,1,
-0x1fd3324,1,
-0x1fd332c,1,
-0x1fd3334,1,
-0x1fd333c,1,
-0x1fd3344,1,
-0x1fd334c,1,
-0x1fd3354,1,
-0x1fd335c,1,
-0x1fd3364,1,
-0x1fd336c,1,
-0x1fd3374,1,
-0x1fd337c,1,
-0x1fd3384,1,
-0x1fd338c,1,
-0x1fd3394,1,
-0x1fd339c,1,
-0x1fd33a4,1,
-0x1fd33ac,1,
-0x1fd33b4,1,
-0x1fd33bc,1,
-0x1fd33c4,1,
-0x1fd33cc,1,
-0x1fd33d4,1,
-0x1fd33dc,1,
-0x1fd33e4,1,
-0x1fd33ec,1,
-0x1fd33f4,1,
-0x1fd33fc,1,
-0x1fd3404,1,
-0x1fd4000,12,
-0x1fd4040,12,
-0x1fd4800,36,
-0x1fd4900,2,
-0x1fd490c,1,
-0x1fd4914,1,
-0x1fd491c,1,
-0x1fd4924,1,
-0x1fd492c,1,
-0x1fd4934,1,
-0x1fd493c,1,
-0x1fd4944,1,
-0x1fd494c,1,
-0x1fd4954,1,
-0x1fd4964,1,
-0x1fd496c,1,
-0x1fd4974,1,
-0x1fd497c,1,
-0x1fd4984,1,
-0x1fd498c,1,
-0x1fd4994,1,
-0x1fd499c,1,
-0x1fd49a4,1,
-0x1fd5000,2,
-0x1fd500c,1,
-0x1fd5200,27,
-0x1fd5280,4,
-0x1fd52c0,25,
-0x1fd5340,6,
-0x1fd5360,2,
-0x1fd536c,3,
-0x1fd5384,10,
-0x1fd5400,2,
-0x1fd5440,12,
-0x1fdf800,50,
-0x1fdf8d0,2,
-0x1fdf8dc,1,
-0x1fdf900,4,
-0x2000000,2,
-0x2000400,2,
-0x2001000,2,
-0x2001400,2,
-0x2002000,32,
-0x2002400,1,
-0x2002800,5,
-0x2020000,3,
-0x2020800,16,
-0x2021000,16,
-0x2030000,3,
-0x2030800,16,
-0x2031000,16,
-0x2040000,5,
-0x2040800,16,
-0x2041000,16,
-0x2042000,5,
-0x2042800,16,
-0x2043000,16,
-0x2044000,5,
-0x2044800,16,
-0x2045000,16,
-0x2046000,5,
-0x2046800,16,
-0x2047000,16,
-0x2048000,5,
-0x2048800,16,
-0x2049000,16,
-0x204a000,5,
-0x204a800,16,
-0x204b000,16,
-0x204c000,5,
-0x204c800,16,
-0x204d000,16,
-0x204e000,5,
-0x204e800,16,
-0x204f000,16,
-0x2050000,5,
-0x2050800,16,
-0x2051000,16,
-0x2052000,5,
-0x2052800,16,
-0x2053000,16,
-0x2054000,5,
-0x2054800,16,
-0x2055000,16,
-0x2056000,5,
-0x2056800,16,
-0x2057000,16,
-0x2058000,5,
-0x2058800,16,
-0x2059000,16,
-0x205a000,5,
-0x205a800,16,
-0x205b000,16,
-0x205c000,5,
-0x205c800,16,
-0x205d000,16,
-0x205e000,5,
-0x205e800,16,
-0x205f000,16,
-0x2060000,3,
-0x2060800,16,
-0x2061000,16,
-0x2070000,3,
-0x2070800,16,
-0x2071000,16,
-0x2080000,3,
-0x2080800,16,
-0x2081000,16,
-0x2090000,3,
-0x2090800,16,
-0x2091000,16,
-0x20a0000,3,
-0x20a0800,16,
-0x20a1000,16,
-0x20b0000,3,
-0x20b0800,16,
-0x20b1000,16,
-0x20c0000,3,
-0x20c0800,16,
-0x20c1000,16,
-0x20d0000,3,
-0x20d0800,16,
-0x20d1000,16,
-0x2200000,5,
-0x2200018,5,
-0x2200080,4,
-0x2200100,16,
-0x2200180,4,
-0x2200200,4,
-0x2200280,4,
-0x2200300,4,
-0x2200380,5,
-0x2200f00,4,
-0x2200f80,4,
-0x220f000,1,
-0x220ff00,1,
-0x220ff08,2,
-0x220ff14,3,
-0x220ff30,1,
-0x220ff38,3,
-0x220ff48,1,
-0x2210000,11,
-0x2210030,5,
-0x2220000,11,
-0x2220030,5,
-0x2230000,11,
-0x2230030,5,
-0x2240000,11,
-0x2240030,5,
-0x2290000,6,
-0x229f000,6,
-0x22a0000,4,
-0x22b0000,4,
-0x22c0000,4,
-0x22d0000,4,
-0x22e0000,6,
-0x22f0000,17,
-0x22f0100,7,
-0x2300000,5,
-0x2310000,7,
-0x2310020,3,
-0x2310060,2,
-0x2310088,3,
-0x23100b8,3,
-0x23100c8,21,
-0x2311000,13,
-0x2311038,1,
-0x23110bc,6,
-0x23110ec,4,
-0x2311110,11,
-0x2312000,13,
-0x2312038,1,
-0x23120bc,6,
-0x23120ec,4,
-0x2312110,11,
-0x2314000,15,
-0x231407c,63,
-0x231f000,1,
-0x231f008,2,
-0x231f014,3,
-0x231f030,1,
-0x231f038,3,
-0x231f048,1,
-0x231f060,1,
-0x231f068,3,
-0x231f078,1,
-0x2320000,1,
-0x2320100,4,
-0x2320114,1,
-0x232011c,1,
-0x232012c,1,
-0x2320134,4,
-0x2320148,2,
-0x2320800,8,
-0x2320860,9,
-0x2324004,4,
-0x2324040,35,
-0x2324200,192,
-0x2324800,704,
-0x2325800,32,
-0x2330000,2,
-0x2330010,1,
-0x2330020,3,
-0x2330060,5,
-0x2330080,5,
-0x23300d0,5,
-0x23300f0,3,
-0x2331000,1,
-0x2331010,1,
-0x2331020,16,
-0x2331080,1,
-0x23310f0,2,
-0x2360000,17,
-0x2370000,1,
-0x2370008,6,
-0x2370030,1,
-0x2370038,3,
-0x2370048,1,
-0x2370060,1,
-0x2370068,3,
-0x2370078,1,
-0x2390000,10,
-0x2390068,8,
-0x23900c8,5,
-0x239011c,4,
-0x239016c,21,
-0x2396000,1,
-0x2398000,42,
-0x2398148,10,
-0x239e000,3,
-0x23a0000,32,
-0x23a0100,1,
-0x23a0108,1,
-0x23a0110,1,
-0x23a1000,2,
-0x23ae000,1,
-0x23ae008,2,
-0x23ae014,3,
-0x23ae030,1,
-0x23ae038,3,
-0x23ae048,1,
-0x23b0000,9,
-0x23b1000,2,
-0x23b1020,2,
-0x23b1040,2,
-0x23b1060,2,
-0x23b1080,4,
-0x23b2000,4,
-0x23c0000,1,
-0x23c0008,1,
-0x23c0010,5,
-0x23c0028,1,
-0x23c0030,5,
-0x23c0048,1,
-0x23c0050,5,
-0x23c0068,1,
-0x23c0070,5,
-0x23c0088,1,
-0x23c0090,5,
-0x23c00a8,1,
-0x23c00b0,5,
-0x23c00c8,1,
-0x23c00d0,5,
-0x23c00e8,1,
-0x23c00f0,4,
-0x23c0800,1,
-0x23c0808,1,
-0x23c0810,1,
-0x23c0820,1,
-0x23c0828,1,
-0x23c0830,1,
-0x23c0840,1,
-0x23c0848,1,
-0x23c0850,1,
-0x23c0860,1,
-0x23c0868,1,
-0x23c0870,1,
-0x23c0880,1,
-0x23c0888,1,
-0x23c0890,1,
-0x23c08a0,1,
-0x23c08a8,1,
-0x23c08b0,1,
-0x23c08c0,1,
-0x23c08c8,1,
-0x23c08d0,1,
-0x23c08e0,1,
-0x23c08e8,1,
-0x23c08f0,1,
-0x23c0900,1,
-0x23c0908,1,
-0x23c0910,1,
-0x23c0920,1,
-0x23c0928,1,
-0x23c0930,1,
-0x23c0940,1,
-0x23c0948,1,
-0x23c0950,1,
-0x23c0960,1,
-0x23c0968,1,
-0x23c0970,1,
-0x23c0980,1,
-0x23c0988,1,
-0x23c0990,1,
-0x23c09a0,1,
-0x23c09a8,1,
-0x23c09b0,1,
-0x23c09c0,1,
-0x23c09c8,1,
-0x23c09d0,1,
-0x23c09e0,1,
-0x23c09e8,1,
-0x23c09f0,1,
-0x23c0a00,1,
-0x23c0a08,1,
-0x23c0a10,1,
-0x23c0a20,1,
-0x23c0a28,1,
-0x23c0a30,1,
-0x23c0a40,1,
-0x23c0a48,1,
-0x23c0a50,1,
-0x23c0a60,1,
-0x23c0a68,1,
-0x23c0a70,1,
-0x23c0a80,1,
-0x23c0a88,1,
-0x23c0a90,1,
-0x23c0aa0,1,
-0x23c0aa8,1,
-0x23c0ab0,1,
-0x23c0ac0,1,
-0x23c0ac8,1,
-0x23c0ad0,1,
-0x23c0ae0,1,
-0x23c0ae8,1,
-0x23c0af0,1,
-0x23c0b00,1,
-0x23c0b08,1,
-0x23c0b10,1,
-0x23c0b20,1,
-0x23c0b28,1,
-0x23c0b30,1,
-0x23c0b40,1,
-0x23c0b48,1,
-0x23c0b50,1,
-0x23c0b60,1,
-0x23c0b68,1,
-0x23c0b70,1,
-0x23c0b80,1,
-0x23c0b88,1,
-0x23c0b90,1,
-0x23c0ba0,1,
-0x23c0ba8,1,
-0x23c0bb0,1,
-0x23c0bc0,1,
-0x23c0bc8,1,
-0x23c0bd0,1,
-0x23c0be0,1,
-0x23c0be8,1,
-0x23c0bf0,1,
-0x23c0c00,1,
-0x23c0c08,1,
-0x23c0c10,1,
-0x23c0c20,1,
-0x23c0c28,1,
-0x23c0c30,1,
-0x23c0c40,1,
-0x23c0c48,1,
-0x23c0c50,1,
-0x23c0c60,1,
-0x23c0c68,1,
-0x23c0c70,1,
-0x23c0c80,1,
-0x23c0c88,1,
-0x23c0c90,1,
-0x23c0ca0,1,
-0x23c0ca8,1,
-0x23c0cb0,1,
-0x23c0cc0,1,
-0x23c0cc8,1,
-0x23c0cd0,1,
-0x23c0ce0,1,
-0x23c0ce8,1,
-0x23c0cf0,1,
-0x23c0d00,1,
-0x23c0d08,1,
-0x23c0d10,1,
-0x23c4000,1,
-0x23c4008,1,
-0x23c4010,5,
-0x23c4028,1,
-0x23c4030,5,
-0x23c4048,1,
-0x23c4050,5,
-0x23c4068,1,
-0x23c4070,5,
-0x23c4088,1,
-0x23c4090,5,
-0x23c40a8,1,
-0x23c40b0,5,
-0x23c40c8,1,
-0x23c40d0,5,
-0x23c40e8,1,
-0x23c40f0,4,
-0x23c4800,1,
-0x23c4808,1,
-0x23c4810,1,
-0x23c4820,1,
-0x23c4828,1,
-0x23c4830,1,
-0x23c4840,1,
-0x23c4848,1,
-0x23c4850,1,
-0x23c4860,1,
-0x23c4868,1,
-0x23c4870,1,
-0x23c4880,1,
-0x23c4888,1,
-0x23c4890,1,
-0x23c48a0,1,
-0x23c48a8,1,
-0x23c48b0,1,
-0x23c48c0,1,
-0x23c48c8,1,
-0x23c48d0,1,
-0x23c48e0,1,
-0x23c48e8,1,
-0x23c48f0,1,
-0x23c4900,1,
-0x23c4908,1,
-0x23c4910,1,
-0x23c4920,1,
-0x23c4928,1,
-0x23c4930,1,
-0x23c4940,1,
-0x23c4948,1,
-0x23c4950,1,
-0x23c4960,1,
-0x23c4968,1,
-0x23c4970,1,
-0x23c4980,1,
-0x23c4988,1,
-0x23c4990,1,
-0x23c49a0,1,
-0x23c49a8,1,
-0x23c49b0,1,
-0x23c8000,1,
-0x23c8008,1,
-0x23c8010,5,
-0x23c8028,1,
-0x23c8030,5,
-0x23c8048,1,
-0x23c8050,5,
-0x23c8068,1,
-0x23c8070,5,
-0x23c8088,1,
-0x23c8090,5,
-0x23c80a8,1,
-0x23c80b0,5,
-0x23c80c8,1,
-0x23c80d0,5,
-0x23c80e8,1,
-0x23c80f0,4,
-0x23d0000,1,
-0x23d02c4,2,
-0x23d02ec,5,
-0x23d0400,2,
-0x23d0800,2,
-0x23d0c00,1,
-0x23d0c20,2,
-0x23d1000,1,
-0x23d12c4,2,
-0x23d12ec,5,
-0x23d1400,1,
-0x23d1800,1,
-0x23d1c00,1,
-0x23d1c20,1,
-0x23e0000,1,
-0x23e0008,6,
-0x23e0030,1,
-0x23e0038,3,
-0x23e0048,1,
-0x23e0060,1,
-0x23e0068,3,
-0x23e0078,1,
-0x23e0090,1,
-0x23e0098,3,
-0x23e00a8,1,
-0x23e00c0,1,
-0x23e00c8,3,
-0x23e00d8,1,
-0x23e00f0,1,
-0x23e00f8,3,
-0x23e0108,1,
-0x23e0120,1,
-0x23e0128,3,
-0x23e0138,1,
-0x23e0150,1,
-0x23e0158,3,
-0x23e0168,1,
-0x23e0180,1,
-0x23e0188,3,
-0x23e0198,1,
-0x23e01b0,1,
-0x23e01b8,3,
-0x23e01c8,1,
-0x23e01e0,1,
-0x23e01e8,3,
-0x23e01f8,1,
-0x23e1000,1,
-0x23e1008,2,
-0x23e1014,3,
-0x23e1030,1,
-0x23e1038,3,
-0x23e1048,1,
-0x23f0000,2,
-0x23f0100,1,
-0x23f0200,4,
-0x23f0300,7,
-0x23f1000,2,
-0x23f1100,1,
-0x23f1200,4,
-0x23f1300,7,
-0x23f2000,2,
-0x23f2100,1,
-0x23f2200,4,
-0x23f2300,7,
-0x23f3000,1,
-0x23f3200,4,
-0x23f4000,1,
-0x23f4200,4,
-0x23f5000,1,
-0x23f5200,4,
-0x23f6000,1,
-0x23f7000,3,
-0x23f8000,3,
-0x23f9000,3,
-0x23fa000,3,
-0x23fb000,1,
-0x23fb020,1,
-0x23fb040,1,
-0x23fb060,1,
-0x23fb080,2,
-0x2800000,3,
-0x2800020,2,
-0x2800084,30,
-0x2800104,30,
-0x2800184,30,
-0x2800204,30,
-0x2800284,30,
-0x2800304,30,
-0x2800384,30,
-0x2800420,240,
-0x2800c08,60,
-0x2800d04,30,
-0x2800e08,60,
-0x2806100,1920,
-0x280e008,60,
-0x280e104,30,
-0x280f000,2,
-0x280ffd0,1,
-0x280ffe0,8,
-0x2820004,1,
-0x282000c,1,
-0x2820014,7,
-0x2820044,1,
-0x282004c,1,
-0x2820054,1,
-0x2820060,4,
-0x2820084,1,
-0x282008c,1,
-0x2820094,1,
-0x28200a0,4,
-0x28200c4,1,
-0x28200cc,1,
-0x28200d4,1,
-0x28200e0,4,
-0x2820104,1,
-0x282010c,1,
-0x2820114,1,
-0x2820120,4,
-0x2820144,1,
-0x282014c,1,
-0x2820154,1,
-0x2820160,4,
-0x2820184,1,
-0x282018c,1,
-0x2820194,1,
-0x28201a0,4,
-0x28201c4,1,
-0x28201cc,1,
-0x28201d4,1,
-0x28201e0,4,
-0x2820204,1,
-0x282020c,1,
-0x2820214,1,
-0x2820220,4,
-0x2820244,1,
-0x282024c,1,
-0x2820254,1,
-0x2820260,4,
-0x2820284,1,
-0x282028c,1,
-0x2820294,1,
-0x28202a0,4,
-0x28202c4,1,
-0x28202cc,1,
-0x28202d4,1,
-0x28202e0,4,
-0x2820304,1,
-0x282030c,1,
-0x2820314,1,
-0x2820320,4,
-0x2820344,1,
-0x282034c,1,
-0x2820354,1,
-0x2820360,4,
-0x282e000,2,
-0x282e804,1,
-0x282e80c,1,
-0x282ffbc,1,
-0x282ffc8,1,
-0x282ffd0,1,
-0x282ffe0,13,
-0x2830400,5,
-0x2830600,5,
-0x2830a00,5,
-0x2830c04,1,
-0x2830c24,1,
-0x2830c44,1,
-0x2830c64,1,
-0x2830c84,1,
-0x2830cc4,1,
-0x2830e00,2,
-0x2830e50,1,
-0x2830fb8,2,
-0x2830fcc,2,
-0x2830fe0,8,
-0x2840000,4,
-0x2840020,1,
-0x2840028,4,
-0x2840080,2,
-0x284008c,1,
-0x2840094,1,
-0x2840100,4,
-0x284f000,1,
-0x284ffd0,1,
-0x284ffe0,8,
-0x2860000,4,
-0x2860014,1,
-0x2860020,3,
-0x2860070,4,
-0x286ffd0,1,
-0x286ffe0,8,
-0x2870080,1,
-0x2870100,1,
-0x2870180,1,
-0x2870200,1,
-0x2870280,1,
-0x2870300,1,
-0x2870380,1,
-0x2870400,8,
-0x2870c00,2,
-0x2870d00,1,
-0x2870e00,1,
-0x287c000,1,
-0x287c008,1,
-0x287c010,2,
-0x287f000,2,
-0x2880000,4,
-0x2880014,1,
-0x2880020,3,
-0x2880070,4,
-0x288ffd0,1,
-0x288ffe0,8,
-0x2890080,1,
-0x2890100,1,
-0x2890180,1,
-0x2890200,1,
-0x2890280,1,
-0x2890300,1,
-0x2890380,1,
-0x2890400,8,
-0x2890c00,2,
-0x2890d00,1,
-0x2890e00,1,
-0x289c000,1,
-0x289c008,1,
-0x289c010,2,
-0x289f000,2,
-0x28a0000,4,
-0x28a0014,1,
-0x28a0020,3,
-0x28a0070,4,
-0x28affd0,1,
-0x28affe0,8,
-0x28b0080,1,
-0x28b0100,1,
-0x28b0180,1,
-0x28b0200,1,
-0x28b0280,1,
-0x28b0300,1,
-0x28b0380,1,
-0x28b0400,8,
-0x28b0c00,2,
-0x28b0d00,1,
-0x28b0e00,1,
-0x28bc000,1,
-0x28bc008,1,
-0x28bc010,2,
-0x28bf000,2,
-0x28c0000,4,
-0x28c0014,1,
-0x28c0020,3,
-0x28c0070,4,
-0x28cffd0,1,
-0x28cffe0,8,
-0x28d0080,1,
-0x28d0100,1,
-0x28d0180,1,
-0x28d0200,1,
-0x28d0280,1,
-0x28d0300,1,
-0x28d0380,1,
-0x28d0400,8,
-0x28d0c00,2,
-0x28d0d00,1,
-0x28d0e00,1,
-0x28dc000,1,
-0x28dc008,1,
-0x28dc010,2,
-0x28df000,2,
-0x28e0000,4,
-0x28e0014,1,
-0x28e0020,3,
-0x28e0070,4,
-0x28effd0,1,
-0x28effe0,8,
-0x28f0080,1,
-0x28f0100,1,
-0x28f0180,1,
-0x28f0200,1,
-0x28f0280,1,
-0x28f0300,1,
-0x28f0380,1,
-0x28f0400,8,
-0x28f0c00,2,
-0x28f0d00,1,
-0x28f0e00,1,
-0x28fc000,1,
-0x28fc008,1,
-0x28fc010,2,
-0x28ff000,2,
-0x2900000,4,
-0x2900014,1,
-0x2900020,3,
-0x2900070,4,
-0x290ffd0,1,
-0x290ffe0,8,
-0x2910080,1,
-0x2910100,1,
-0x2910180,1,
-0x2910200,1,
-0x2910280,1,
-0x2910300,1,
-0x2910380,1,
-0x2910400,8,
-0x2910c00,2,
-0x2910d00,1,
-0x2910e00,1,
-0x291c000,1,
-0x291c008,1,
-0x291c010,2,
-0x291f000,2,
-0x2920000,4,
-0x2920014,1,
-0x2920020,3,
-0x2920070,4,
-0x292ffd0,1,
-0x292ffe0,8,
-0x2930080,1,
-0x2930100,1,
-0x2930180,1,
-0x2930200,1,
-0x2930280,1,
-0x2930300,1,
-0x2930380,1,
-0x2930400,8,
-0x2930c00,2,
-0x2930d00,1,
-0x2930e00,1,
-0x293c000,1,
-0x293c008,1,
-0x293c010,2,
-0x293f000,2,
-0x2940000,4,
-0x2940014,1,
-0x2940020,3,
-0x2940070,4,
-0x294ffd0,1,
-0x294ffe0,8,
-0x2950080,1,
-0x2950100,1,
-0x2950180,1,
-0x2950200,1,
-0x2950280,1,
-0x2950300,1,
-0x2950380,1,
-0x2950400,8,
-0x2950c00,2,
-0x2950d00,1,
-0x2950e00,1,
-0x295c000,1,
-0x295c008,1,
-0x295c010,2,
-0x295f000,2,
-0x2960000,4,
-0x2960014,1,
-0x2960020,3,
-0x2960070,4,
-0x296ffd0,1,
-0x296ffe0,8,
-0x2970080,1,
-0x2970100,1,
-0x2970180,1,
-0x2970200,1,
-0x2970280,1,
-0x2970300,1,
-0x2970380,1,
-0x2970400,8,
-0x2970c00,2,
-0x2970d00,1,
-0x2970e00,1,
-0x297c000,1,
-0x297c008,1,
-0x297c010,2,
-0x297f000,2,
-0x2980000,4,
-0x2980014,1,
-0x2980020,3,
-0x2980070,4,
-0x298ffd0,1,
-0x298ffe0,8,
-0x2990080,1,
-0x2990100,1,
-0x2990180,1,
-0x2990200,1,
-0x2990280,1,
-0x2990300,1,
-0x2990380,1,
-0x2990400,8,
-0x2990c00,2,
-0x2990d00,1,
-0x2990e00,1,
-0x299c000,1,
-0x299c008,1,
-0x299c010,2,
-0x299f000,2,
-0x29a0000,4,
-0x29a0014,1,
-0x29a0020,3,
-0x29a0070,4,
-0x29affd0,1,
-0x29affe0,8,
-0x29b0080,1,
-0x29b0100,1,
-0x29b0180,1,
-0x29b0200,1,
-0x29b0280,1,
-0x29b0300,1,
-0x29b0380,1,
-0x29b0400,8,
-0x29b0c00,2,
-0x29b0d00,1,
-0x29b0e00,1,
-0x29bc000,1,
-0x29bc008,1,
-0x29bc010,2,
-0x29bf000,2,
-0x29c0000,4,
-0x29c0014,1,
-0x29c0020,3,
-0x29c0070,4,
-0x29cffd0,1,
-0x29cffe0,8,
-0x29d0080,1,
-0x29d0100,1,
-0x29d0180,1,
-0x29d0200,1,
-0x29d0280,1,
-0x29d0300,1,
-0x29d0380,1,
-0x29d0400,8,
-0x29d0c00,2,
-0x29d0d00,1,
-0x29d0e00,1,
-0x29dc000,1,
-0x29dc008,1,
-0x29dc010,2,
-0x29df000,2,
-0x29e0000,4,
-0x29e0014,1,
-0x29e0020,3,
-0x29e0070,4,
-0x29effd0,1,
-0x29effe0,8,
-0x29f0080,1,
-0x29f0100,1,
-0x29f0180,1,
-0x29f0200,1,
-0x29f0280,1,
-0x29f0300,1,
-0x29f0380,1,
-0x29f0400,8,
-0x29f0c00,2,
-0x29f0d00,1,
-0x29f0e00,1,
-0x29fc000,1,
-0x29fc008,1,
-0x29fc010,2,
-0x29ff000,2,
-0x2a00000,4,
-0x2a00014,1,
-0x2a00020,3,
-0x2a00070,4,
-0x2a0ffd0,1,
-0x2a0ffe0,8,
-0x2a10080,1,
-0x2a10100,1,
-0x2a10180,1,
-0x2a10200,1,
-0x2a10280,1,
-0x2a10300,1,
-0x2a10380,1,
-0x2a10400,8,
-0x2a10c00,2,
-0x2a10d00,1,
-0x2a10e00,1,
-0x2a1c000,1,
-0x2a1c008,1,
-0x2a1c010,2,
-0x2a1f000,2,
-0x2a20000,4,
-0x2a20014,1,
-0x2a20020,3,
-0x2a20070,4,
-0x2a2ffd0,1,
-0x2a2ffe0,8,
-0x2a30080,1,
-0x2a30100,1,
-0x2a30180,1,
-0x2a30200,1,
-0x2a30280,1,
-0x2a30300,1,
-0x2a30380,1,
-0x2a30400,8,
-0x2a30c00,2,
-0x2a30d00,1,
-0x2a30e00,1,
-0x2a3c000,1,
-0x2a3c008,1,
-0x2a3c010,2,
-0x2a3f000,2,
-0x2a40000,4,
-0x2a40014,1,
-0x2a40020,3,
-0x2a40070,4,
-0x2a4ffd0,1,
-0x2a4ffe0,8,
-0x2a50080,1,
-0x2a50100,1,
-0x2a50180,1,
-0x2a50200,1,
-0x2a50280,1,
-0x2a50300,1,
-0x2a50380,1,
-0x2a50400,8,
-0x2a50c00,2,
-0x2a50d00,1,
-0x2a50e00,1,
-0x2a5c000,1,
-0x2a5c008,1,
-0x2a5c010,2,
-0x2a5f000,2,
-0x2a60000,3,
-0x2a60020,2,
-0x2a60084,30,
-0x2a60104,30,
-0x2a60184,30,
-0x2a60204,30,
-0x2a60284,30,
-0x2a60304,30,
-0x2a60384,30,
-0x2a60420,240,
-0x2a60c08,60,
-0x2a60d04,30,
-0x2a60e08,60,
-0x2a66100,1920,
-0x2a6e008,60,
-0x2a6e104,30,
-0x2a6f000,2,
-0x2a6ffd0,1,
-0x2a6ffe0,8,
-0x2c00004,1,
-0x2c0000c,1,
-0x2c00014,1,
-0x2c0001c,1,
-0x2c00024,1,
-0x2c0002c,1,
-0x2c00034,1,
-0x2c0003c,1,
-0x2c00044,1,
-0x2c0004c,1,
-0x2c00054,1,
-0x2c0005c,1,
-0x2c00064,1,
-0x2c0006c,1,
-0x2c00074,1,
-0x2c0007c,1,
-0x2c00084,1,
-0x2c0008c,1,
-0x2c00094,1,
-0x2c0009c,1,
-0x2c000a4,1,
-0x2c000ac,1,
-0x2c000b4,1,
-0x2c000bc,1,
-0x2c000c4,1,
-0x2c000cc,1,
-0x2c000d4,1,
-0x2c000dc,1,
-0x2c000e4,1,
-0x2c000ec,1,
-0x2c000f4,1,
-0x2c000fc,1,
-0x2c00104,1,
-0x2c0010c,1,
-0x2c00114,1,
-0x2c0011c,1,
-0x2c00124,1,
-0x2c0012c,1,
-0x2c00134,1,
-0x2c0013c,1,
-0x2c00144,1,
-0x2c0014c,1,
-0x2c00154,1,
-0x2c0015c,1,
-0x2c00164,1,
-0x2c0016c,1,
-0x2c00174,1,
-0x2c0017c,1,
-0x2c00184,1,
-0x2c0018c,1,
-0x2c00194,1,
-0x2c0019c,1,
-0x2c001a4,1,
-0x2c001ac,1,
-0x2c001b4,1,
-0x2c001bc,1,
-0x2c001c4,1,
-0x2c001cc,1,
-0x2c001d4,1,
-0x2c001dc,1,
-0x2c001e4,1,
-0x2c001ec,1,
-0x2c001f4,1,
-0x2c001fc,1,
-0x2c00208,2,
-0x3000020,2,
-0x3000114,1,
-0x300020c,1,
-0x300031c,1,
-0x3000388,2,
-0x3000500,1,
-0x3000510,4,
-0x300052c,1,
-0x3000534,1,
-0x300053c,3,
-0x300054c,1,
-0x3000554,1,
-0x300055c,1,
-0x3000564,1,
-0x3000574,1,
-0x300057c,1,
-0x3000584,3,
-0x3000594,3,
-0x3000604,1,
-0x3000610,2,
-0x3000620,2,
-0x300062c,5,
-0x3000650,2,
-0x3000700,4,
-0x3000714,1,
-0x3000720,4,
-0x3000734,1,
-0x3000740,4,
-0x3000754,1,
-0x3000804,3,
-0x3000814,1,
-0x300081c,1,
-0x3000824,17,
-0x3000904,1,
-0x3000914,1,
-0x300091c,1,
-0x3000924,1,
-0x300092c,1,
-0x3000934,1,
-0x300093c,1,
-0x3000944,1,
-0x300094c,1,
-0x3000954,1,
-0x300095c,1,
-0x3000964,1,
-0x300096c,1,
-0x3000974,1,
-0x300097c,1,
-0x3000984,1,
-0x300098c,1,
-0x3000994,1,
-0x300099c,1,
-0x30009b4,1,
-0x30009bc,1,
-0x30009c4,1,
-0x3000c04,3,
-0x3000c40,14,
-0x3000dc4,1,
-0x3000e00,2,
-0x3000f04,3,
-0x3000f14,33,
-0x3001004,1,
-0x3002000,2,
-0x3004000,2,
-0x3005000,2,
-0x3006004,3,
-0x3006104,3,
-0x3006204,1,
-0x300620c,1,
-0x3006214,1,
-0x300621c,1,
-0x3006224,1,
-0x300622c,1,
-0x3006234,1,
-0x300623c,1,
-0x3006284,1,
-0x300628c,1,
-0x3006294,1,
-0x300629c,1,
-0x30062a4,1,
-0x30062ac,1,
-0x30062b4,1,
-0x30062bc,1,
-0x30062c4,3,
-0x3006304,1,
-0x300630c,1,
-0x3006314,1,
-0x300631c,1,
-0x3006324,1,
-0x300632c,1,
-0x3006334,1,
-0x300633c,1,
-0x3006344,1,
-0x300634c,1,
-0x3006354,1,
-0x300635c,1,
-0x3006364,1,
-0x300636c,1,
-0x3006374,1,
-0x300637c,1,
-0x3006384,1,
-0x3008000,32,
-0x3008280,384,
-0x3008884,7,
-0x30088a4,1,
-0x30088ac,3,
-0x30088bc,1,
-0x30088c4,1,
-0x30088cc,1,
-0x30088d4,1,
-0x30088dc,3,
-0x30088ec,1,
-0x30088f4,1,
-0x30088fc,1,
-0x3008904,1,
-0x300890c,1,
-0x3008914,1,
-0x300891c,1,
-0x3008924,7,
-0x3008944,7,
-0x3009004,1,
-0x300909c,1,
-0x30090a4,1,
-0x30090ac,1,
-0x30090b4,1,
-0x30090bc,1,
-0x30090c4,1,
-0x30090cc,1,
-0x30090d4,1,
-0x30090dc,1,
-0x30090e4,1,
-0x30090ec,1,
-0x30090f4,1,
-0x30090fc,1,
-0x3009104,1,
-0x300910c,1,
-0x3009114,1,
-0x300911c,1,
-0x3009124,37,
-0x30091bc,1,
-0x30091c4,1,
-0x30091cc,1,
-0x30091d4,1,
-0x30091dc,1,
-0x30091e4,1,
-0x30091ec,1,
-0x30091f4,1,
-0x30091fc,1,
-0x3009204,1,
-0x300920c,1,
-0x3009214,1,
-0x300921c,1,
-0x3009224,1,
-0x300922c,1,
-0x3009234,1,
-0x300923c,1,
-0x3009244,39,
-0x3009404,1,
-0x300940c,1,
-0x3009414,1,
-0x300941c,1,
-0x3009424,1,
-0x300942c,1,
-0x3009434,1,
-0x300943c,1,
-0x3009444,1,
-0x3009484,47,
-0x3010000,2,
-0x3010018,1,
-0x3010020,11,
-0x3010fe0,10,
-0x3011018,1,
-0x3011020,11,
-0x3011fe0,8,
-0x3012020,2,
-0x3012104,1,
-0x301210c,3,
-0x3012134,1,
-0x3012144,1,
-0x301214c,1,
-0x3012154,1,
-0x301215c,1,
-0x3012164,1,
-0x301220c,1,
-0x3012400,4,
-0x3012414,1,
-0x3020000,1,
-0x3020008,1,
-0x3020010,2,
-0x3020fcc,1,
-0x3020fe8,1,
-0x3030fcc,1,
-0x3040000,1,
-0x3040008,1,
-0x3040010,2,
-0x3040fcc,1,
-0x3040fe8,1,
-0x3050fcc,1,
-0x3060000,11,
-0x3060030,3,
-0x3060040,3,
-0x3060050,3,
-0x3060060,3,
-0x3060070,3,
-0x3060080,3,
-0x3060090,3,
-0x30600a0,3,
-0x3060100,17,
-0x3060180,3,
-0x3060190,5,
-0x30601b0,5,
-0x30601d0,5,
-0x30601f0,5,
-0x3060210,5,
-0x3060230,18,
-0x3060400,6,
-0x3060800,2,
-0x3060820,8,
-0x3060900,9,
-0x3060940,9,
-0x3060980,1,
-0x3060a00,3,
-0x3060a10,3,
-0x3060a20,1,
-0x3060a80,7,
-0x3060aa0,7,
-0x3060ac0,1,
-0x3060b00,9,
-0x3060b40,9,
-0x3060b80,1,
-0x3060c00,27,
-0x3060c80,9,
-0x3060cc0,6,
-0x3060ce0,4,
-0x3060cf4,1,
-0x3060d00,1,
-0x3068000,5,
-0x3068020,6,
-0x3068040,2,
-0x3068080,2,
-0x30680a0,6,
-0x30680c0,2,
-0x3068100,6,
-0x3068120,14,
-0x3069000,17,
-0x3069080,3,
-0x3069090,3,
-0x30690a0,3,
-0x30690b0,3,
-0x30690c0,3,
-0x30690d0,3,
-0x30690e0,3,
-0x30690f0,3,
-0x3069100,1,
-0x3069400,144,
-0x3069800,10,
-0x306a000,10,
-0x306a040,3,
-0x306b000,1,
-0x306b100,36,
-0x306b200,2,
-0x306b240,9,
-0x306b280,8,
-0x306b300,6,
-0x306b320,6,
-0x306b340,1,
-0x306b400,4,
-0x306b480,20,
-0x306b500,3,
-0x306b520,2,
-0x306b52c,2,
-0x306b540,3,
-0x306b550,3,
-0x306b560,1,
-0x306b600,4,
-0x306b680,17,
-0x306b700,3,
-0x306b720,2,
-0x306b72c,2,
-0x306b800,27,
-0x306b880,4,
-0x306b8c0,25,
-0x306b940,6,
-0x306b960,2,
-0x306b96c,3,
-0x306b984,8,
-0x3070000,1,
-0x3080000,4,
-0x3080020,2,
-0x3080fd0,1,
-0x3081000,16,
-0x3081080,16,
-0x30810c4,2,
-0x30810d0,4,
-0x30a0000,2,
-0x30a0fd0,1,
-0x30a1004,1,
-0x30a100c,1,
-0x30a1014,1,
-0x30a1020,2,
-0x30a102c,1,
-0x30a1034,1,
-0x30a103c,1,
-0x30a1044,1,
-0x30a1200,2,
-0x30a120c,5,
-0x30a1224,3,
-0x30a1234,1,
-0x30a123c,11,
-0x30a1304,1,
-0x30a130c,1,
-0x30a1314,1,
-0x30a131c,1,
-0x30a1324,1,
-0x30a132c,1,
-0x30a1334,1,
-0x30a1344,1,
-0x30a134c,1,
-0x30a1354,1,
-0x30a135c,1,
-0x30a1364,1,
-0x30a136c,1,
-0x30a1374,1,
-0x30a138c,3,
-0x30a139c,1,
-0x30a1520,4,
-0x30a1534,1,
-0x30a1540,14,
-0x30a157c,1,
-0x30a1584,3,
-0x30a1594,1,
-0x30a159c,7,
-0x30a15bc,1,
-0x30a15c4,1,
-0x30a15d4,5,
-0x30a15ec,1,
-0x30a8000,12,
-0x30a8040,3,
-0x30aa000,8,
-0x30aa024,6,
-0x30aa040,8,
-0x30aa080,7,
-0x30aa0a0,7,
-0x30aa0c0,7,
-0x30aa0e0,7,
-0x30aa800,381,
-0x30aae00,10,
-0x30ab000,40,
-0x30ab100,1,
-0x30ab110,2,
-0x30ab200,8,
-0x30ab240,12,
-0x30ab400,27,
-0x30ab480,9,
-0x30ab4c0,6,
-0x30ab4e0,4,
-0x30ab504,4,
-0x30ab800,218,
-0x30ac000,1,
-0x30ac040,13,
-0x30ac080,5,
-0x30c0000,2,
-0x30c0010,3,
-0x30c0020,10,
-0x30c0080,2,
-0x30c00a0,11,
-0x30c0100,1,
-0x30c0204,1,
-0x30c020c,1,
-0x30c0240,28,
-0x30c0300,14,
-0x30c0340,2,
-0x30c0400,5,
-0x30c0418,2,
-0x30c0440,9,
-0x30c0480,3,
-0x30c04a0,12,
-0x30e0000,1,
-0x30e1000,977,
-0x30e2000,161,
-0x30e3000,977,
-0x30e4000,977,
-0x30e5000,161,
-0x30e6000,13,
-0x30e6040,14,
-0x30e6080,20,
-0x30e6104,1,
-0x30e610c,3,
-0x30e6200,13,
-0x30e6240,14,
-0x30e6280,20,
-0x30e6304,1,
-0x30e630c,3,
-0x30e6400,13,
-0x30e6440,14,
-0x30e6480,20,
-0x30e6504,1,
-0x30e650c,3,
-0x30e6600,17,
-0x30e6650,2,
-0x30e6660,4,
-0x30e6800,1,
-0x30e6814,1,
-0x30e681c,10,
-0x30e6860,9,
-0x30e6894,1,
-0x30e689c,10,
-0x30e68e0,15,
-0x30e6a00,6,
-0x30e6a40,9,
-0x30e6a80,6,
-0x3100000,1,
-0x3100014,3,
-0x3100024,1,
-0x310002c,2,
-0x3101000,28,
-0x3101074,3,
-0x31010e4,2,
-0x31010fc,1,
-0x3101184,1,
-0x3101500,3,
-0x3101510,1,
-0x310152c,3,
-0x3101540,2,
-0x3101f6c,1,
-0x3102000,23,
-0x3102080,4,
-0x3102100,7,
-0x3102120,7,
-0x3102140,1,
-0x3102180,4,
-0x31021a0,7,
-0x31021c0,9,
-0x3102200,8,
-0x3102280,7,
-0x31022a0,7,
-0x31022c0,1,
-0x3102300,4,
-0x3102320,7,
-0x3102340,3,
-0x3102360,7,
-0x3102380,3,
-0x31023a0,2,
-0x31023ac,2,
-0x31023c0,3,
-0x3104000,10,
-0x3400000,189,
-0x3400400,8,
-0x3400600,27,
-0x3400680,3,
-0x3400804,1,
-0x3400944,175,
-0x3401000,56,
-0x3401128,8,
-0x34011a8,8,
-0x3401228,8,
-0x34012a8,8,
-0x3401328,8,
-0x34013a8,8,
-0x3401428,8,
-0x34014a8,8,
-0x3401528,8,
-0x34015a8,8,
-0x3401628,8,
-0x34016a8,8,
-0x3401728,8,
-0x34017a8,8,
-0x3401828,8,
-0x34018a8,8,
-0x3401928,8,
-0x34019a8,8,
-0x3401a00,3,
-0x3401a10,3,
-0x3401a20,13,
-0x3401c00,148,
-0x3402000,56,
-0x3402400,2,
-0x3402410,3,
-0x3402420,3,
-0x3402430,3,
-0x3402440,3,
-0x3402450,3,
-0x3402460,3,
-0x3402470,3,
-0x3402480,3,
-0x3402490,3,
-0x34024a0,3,
-0x34024b0,3,
-0x34024c0,3,
-0x34024d0,3,
-0x34024e0,3,
-0x34024f0,3,
-0x3402500,3,
-0x3402600,3,
-0x3402610,3,
-0x3402800,8,
-0x3402900,2,
-0x3402910,3,
-0x3402920,3,
-0x3402930,3,
-0x3402940,3,
-0x3402950,3,
-0x3402960,3,
-0x3402970,3,
-0x3402980,3,
-0x3402a00,3,
-0x3403000,23,
-0x3403080,23,
-0x3403100,4,
-0x3403180,23,
-0x3403200,2,
-0x3403280,23,
-0x3403300,23,
-0x3403380,2,
-0x3403400,23,
-0x3403480,23,
-0x3403500,2,
-0x3403580,23,
-0x3403600,2,
-0x3403640,15,
-0x3403680,1,
-0x3403800,3,
-0x3403814,1,
-0x340381c,1,
-0x3403824,3,
-0x3403834,3,
-0x3403844,1,
-0x340384c,1,
-0x3403880,9,
-0x3403900,6,
-0x3403920,7,
-0x3403940,6,
-0x3403960,7,
-0x3403980,3,
-0x3403990,1,
-0x3403a00,2,
-0x3403a20,9,
-0x3404004,1,
-0x3404080,34,
-0x3404110,10,
-0x340413c,3,
-0x3404204,1,
-0x3404280,36,
-0x3404314,1,
-0x3404400,20,
-0x3404480,9,
-0x3404804,1,
-0x3404880,34,
-0x3404910,10,
-0x340493c,3,
-0x3404a04,1,
-0x3404a80,36,
-0x3404b14,1,
-0x3404c00,20,
-0x3404c80,9,
-0x3405004,1,
-0x3405080,34,
-0x3405110,10,
-0x340513c,3,
-0x3405204,1,
-0x3405280,36,
-0x3405314,1,
-0x3405400,20,
-0x3405480,9,
-0x3405804,1,
-0x3405880,34,
-0x3405910,10,
-0x340593c,3,
-0x3405a04,1,
-0x3405a80,36,
-0x3405b14,1,
-0x3405c00,20,
-0x3405c80,9,
-0x3406004,1,
-0x3406080,34,
-0x3406110,10,
-0x340613c,3,
-0x3406204,1,
-0x3406280,36,
-0x3406314,1,
-0x3406400,20,
-0x3406480,9,
-0x3406804,1,
-0x3406880,34,
-0x3406910,10,
-0x340693c,3,
-0x3406a04,1,
-0x3406a80,36,
-0x3406b14,1,
-0x3406c00,20,
-0x3406c80,9,
-0x3407000,20,
-0x3407084,1,
-0x340708c,1,
-0x34070c0,12,
-0x3407100,3,
-0x3407200,20,
-0x3407284,1,
-0x340728c,1,
-0x34072c0,12,
-0x3407300,3,
-0x3407400,20,
-0x3407484,1,
-0x340748c,1,
-0x34074c0,12,
-0x3407500,3,
-0x3407600,20,
-0x3407684,1,
-0x340768c,1,
-0x34076c0,12,
-0x3407700,3,
-0x3407800,20,
-0x3407884,1,
-0x340788c,1,
-0x34078c0,12,
-0x3407900,3,
-0x3407a00,20,
-0x3407a84,1,
-0x3407a8c,1,
-0x3407ac0,12,
-0x3407b00,3,
-0x3407c00,12,
-0x3407c40,8,
-0x3408000,2,
-0x3408010,3,
-0x3408020,3,
-0x3408030,3,
-0x3408040,3,
-0x3408050,3,
-0x3408060,3,
-0x3408070,3,
-0x3408080,3,
-0x3408090,3,
-0x34080a0,3,
-0x34080b0,3,
-0x34080c0,3,
-0x34080d0,3,
-0x34080e0,3,
-0x34080f0,3,
-0x3408100,3,
-0x3408204,1,
-0x3408210,54,
-0x34082f0,3,
-0x3408300,3,
-0x3408310,3,
-0x3408340,9,
-0x3408380,9,
-0x34083c0,9,
-0x3408400,9,
-0x3408440,9,
-0x3408480,9,
-0x34084c0,9,
-0x3408500,9,
-0x3408540,9,
-0x3408580,9,
-0x34085c0,9,
-0x3408600,9,
-0x3408640,9,
-0x3408680,9,
-0x34086c0,20,
-0x3408720,16,
-0x3408800,3,
-0x3408840,131,
-0x3408a80,128,
-0x3409000,8,
-0x3409080,27,
-0x3409100,1,
-0x3409800,309,
-0x3600000,22,
-0x3600060,6,
-0x3600080,6,
-0x36000a0,6,
-0x36000c0,6,
-0x3600400,6,
-0x3600424,1,
-0x3600434,5,
-0x3600600,128,
-0x3600804,1,
-0x3600828,86,
-0x3600984,1,
-0x3600c00,1,
-0x3600c80,1,
-0x3600c90,2,
-0x3600d00,20,
-0x3600d80,1,
-0x3600da0,3,
-0x3600e00,2,
-0x3600e10,4,
-0x370a000,10,
-0x370a080,3,
-0x370a200,2,
-0x370a240,9,
-0x370a400,2,
-0x370a420,8,
-0x370a480,1,
-0x370b000,10,
-0x370b080,1,
-0x370b100,2,
-0x370b110,4,
-0x370b180,5,
-0x370b1a0,7,
-0x370b1c0,1,
-0x370b200,1,
-0x370c000,10,
-0x370c080,2,
-0x370c090,4,
-0x370c100,1,
-0x370d000,10,
-0x370d080,2,
-0x370d090,4,
-0x370d100,1,
-0x370e000,10,
-0x370e080,3,
-0x370e200,2,
-0x370e240,9,
-0x370e400,2,
-0x370e420,8,
-0x370e480,1,
-0x370f000,10,
-0x370f080,1,
-0x370f100,2,
-0x370f110,4,
-0x370f180,5,
-0x370f1a0,7,
-0x370f1c0,1,
-0x370f200,1,
-0x3710000,10,
-0x3710080,2,
-0x3710090,4,
-0x3710100,1,
-0x3711000,10,
-0x3711080,2,
-0x3711090,4,
-0x3711100,1,
-0x3712000,10,
-0x3712080,3,
-0x3712200,2,
-0x3712240,9,
-0x3712400,2,
-0x3712420,8,
-0x3712480,1,
-0x3713000,10,
-0x3713080,1,
-0x3713100,2,
-0x3713110,4,
-0x3713180,5,
-0x37131a0,7,
-0x37131c0,1,
-0x3713200,1,
-0x3714000,10,
-0x3714080,2,
-0x3714090,4,
-0x3714100,1,
-0x3715000,10,
-0x3715080,2,
-0x3715090,4,
-0x3715100,1,
-0x3716000,10,
-0x3716080,3,
-0x3716200,2,
-0x3716240,9,
-0x3716400,2,
-0x3716420,8,
-0x3716480,1,
-0x3717000,10,
-0x3717080,1,
-0x3717100,2,
-0x3717110,4,
-0x3717180,5,
-0x37171a0,7,
-0x37171c0,1,
-0x3717200,1,
-0x3718000,10,
-0x3718080,2,
-0x3718090,4,
-0x3718100,1,
-0x3719000,10,
-0x3719080,2,
-0x3719090,4,
-0x3719100,1,
-0x371a000,10,
-0x371a080,3,
-0x371a200,2,
-0x371a240,9,
-0x371a400,2,
-0x371a420,8,
-0x371a480,1,
-0x371b000,10,
-0x371b080,1,
-0x371b100,2,
-0x371b110,4,
-0x371b180,5,
-0x371b1a0,7,
-0x371b1c0,1,
-0x371b200,1,
-0x371c000,10,
-0x371c080,2,
-0x371c090,4,
-0x371c100,1,
-0x371d000,10,
-0x371d080,2,
-0x371d090,4,
-0x371d100,1,
-0x371e000,10,
-0x371e080,3,
-0x371e200,2,
-0x371e240,9,
-0x371e400,2,
-0x371e420,8,
-0x371e480,1,
-0x371f000,10,
-0x371f080,1,
-0x371f100,2,
-0x371f110,4,
-0x371f180,5,
-0x371f1a0,7,
-0x371f1c0,1,
-0x371f200,1,
-0x3720000,10,
-0x3720080,2,
-0x3720090,4,
-0x3720100,1,
-0x3721000,10,
-0x3721080,2,
-0x3721090,4,
-0x3721100,1,
-0x3722000,10,
-0x3722080,3,
-0x3722200,2,
-0x3722240,9,
-0x3722400,2,
-0x3722420,8,
-0x3722480,1,
-0x3723000,10,
-0x3723080,1,
-0x3723100,2,
-0x3723110,4,
-0x3723180,5,
-0x37231a0,7,
-0x37231c0,1,
-0x3723200,1,
-0x3724000,10,
-0x3724080,2,
-0x3724090,4,
-0x3724100,1,
-0x3725000,10,
-0x3725080,2,
-0x3725090,4,
-0x3725100,1,
-0x3726000,10,
-0x3726080,3,
-0x3726200,2,
-0x3726240,9,
-0x3726400,2,
-0x3726420,8,
-0x3726480,1,
-0x3727000,10,
-0x3727080,1,
-0x3727100,2,
-0x3727110,4,
-0x3727180,5,
-0x37271a0,7,
-0x37271c0,1,
-0x3727200,1,
-0x3728000,10,
-0x3728080,2,
-0x3728090,4,
-0x3728100,1,
-0x3729000,10,
-0x3729080,2,
-0x3729090,4,
-0x3729100,1,
-0x372a000,10,
-0x372a080,2,
-0x372a0a0,8,
-0x372a100,1,
-0x372b000,36,
-0x372b800,10,
-0x372b880,3,
-0x372b8a0,1,
-0x372b900,2,
-0x372b910,4,
-0x372b980,1,
-0x372c000,20,
-0x372c800,1,
-0x372d000,20,
-0x372d800,1,
-0x372e000,10,
-0x372e080,2,
-0x372e0a0,8,
-0x372e100,1,
-0x372f000,36,
-0x372f800,10,
-0x372f880,3,
-0x372f8a0,1,
-0x372f900,2,
-0x372f910,4,
-0x372f980,1,
-0x3730000,20,
-0x3730800,1,
-0x3731000,20,
-0x3731800,1,
-0x3732000,10,
-0x3732080,2,
-0x37320a0,8,
-0x3732100,1,
-0x3733000,36,
-0x3733800,10,
-0x3733880,3,
-0x37338a0,1,
-0x3733900,2,
-0x3733910,4,
-0x3733980,1,
-0x3734000,20,
-0x3734800,1,
-0x3735000,20,
-0x3735800,1,
-0x3736000,10,
-0x3736080,2,
-0x37360a0,8,
-0x3736100,1,
-0x3737000,36,
-0x3737800,10,
-0x3737880,3,
-0x37378a0,1,
-0x3737900,2,
-0x3737910,4,
-0x3737980,1,
-0x3738000,20,
-0x3738800,1,
-0x3739000,20,
-0x3739800,1,
-0x373a000,10,
-0x373a080,2,
-0x373a0a0,8,
-0x373a100,1,
-0x373b000,36,
-0x373b800,10,
-0x373b880,3,
-0x373b8a0,1,
-0x373b900,2,
-0x373b910,4,
-0x373b980,1,
-0x373c000,20,
-0x373c800,1,
-0x373d000,20,
-0x373d800,1,
-0x373e000,10,
-0x373e080,2,
-0x373e0a0,8,
-0x373e100,1,
-0x373f000,36,
-0x373f800,10,
-0x373f880,3,
-0x373f8a0,1,
-0x373f900,2,
-0x373f910,4,
-0x373f980,1,
-0x3740000,20,
-0x3740800,1,
-0x3741000,20,
-0x3741800,1,
-0x3742000,10,
-0x3742080,2,
-0x37420a0,8,
-0x3742100,1,
-0x3743000,36,
-0x3743800,10,
-0x3743880,3,
-0x37438a0,1,
-0x3743900,2,
-0x3743910,4,
-0x3743980,1,
-0x3744000,20,
-0x3744800,1,
-0x3745000,20,
-0x3745800,1,
-0x3746000,10,
-0x3746080,2,
-0x37460a0,8,
-0x3746100,1,
-0x3747000,36,
-0x3747800,10,
-0x3747880,3,
-0x37478a0,1,
-0x3747900,2,
-0x3747910,4,
-0x3747980,1,
-0x3748000,20,
-0x3748800,1,
-0x3749000,20,
-0x3749800,1,
-0x374a000,10,
-0x374a080,3,
-0x374a100,2,
-0x374a110,4,
-0x374a180,1,
-0x374b000,10,
-0x374b080,3,
-0x374b100,2,
-0x374b110,4,
-0x374b180,1,
-0x374c000,10,
-0x374c080,3,
-0x374c100,2,
-0x374c110,4,
-0x374c180,1,
-0x374d000,20,
-0x374d800,10,
-0x374d880,1,
-0x374e000,20,
-0x374e800,10,
-0x374e880,1,
-0x374f000,20,
-0x374f800,10,
-0x374f880,1,
-0x3750000,20,
-0x3750080,20,
-0x3750100,20,
-0x3750180,4,
-0x3750800,10,
-0x3750880,3,
-0x3750900,2,
-0x3750910,4,
-0x3750980,1,
-0x3751000,10,
-0x3751080,3,
-0x3751100,2,
-0x3751110,4,
-0x3751180,9,
-0x37511c0,8,
-0x3751200,1,
-0x3752000,20,
-0x3752800,10,
-0x3752880,1,
-0x3753000,20,
-0x3753800,10,
-0x3753880,1,
-0x3754000,20,
-0x3754800,10,
-0x3754880,1,
-0x3755000,20,
-0x3755800,10,
-0x3755880,1,
-0x3756000,20,
-0x3756800,10,
-0x3756880,1,
-0x3757000,20,
-0x3757800,10,
-0x3757880,1,
-0x3758000,20,
-0x3758800,10,
-0x3758880,1,
-0x3759000,20,
-0x3759800,10,
-0x3759880,1,
-0x375a000,10,
-0x375a080,3,
-0x375a100,2,
-0x375a110,4,
-0x375a180,9,
-0x375a1c0,8,
-0x375a200,1,
-0x375b000,20,
-0x375b800,10,
-0x375b880,1,
-0x375c000,20,
-0x375c800,10,
-0x375c880,1,
-0x375d000,20,
-0x375d800,10,
-0x375d880,1,
-0x375e000,20,
-0x375e800,10,
-0x375e880,1,
-0x375f000,20,
-0x375f800,10,
-0x375f880,1,
-0x3760000,20,
-0x3760800,10,
-0x3760880,1,
-0x3761000,20,
-0x3761800,10,
-0x3761880,1,
-0x3762000,20,
-0x3762800,10,
-0x3762880,1,
-0x3763000,10,
-0x3763080,3,
-0x3763100,2,
-0x3763110,4,
-0x3763180,9,
-0x37631c0,8,
-0x3763200,1,
-0x3764000,20,
-0x3764800,10,
-0x3764880,1,
-0x3765000,20,
-0x3765800,10,
-0x3765880,1,
-0x3766000,20,
-0x3766800,10,
-0x3766880,1,
-0x3767000,20,
-0x3767800,10,
-0x3767880,1,
-0x3768000,20,
-0x3768800,10,
-0x3768880,1,
-0x3769000,20,
-0x3769800,10,
-0x3769880,1,
-0x376a000,20,
-0x376a800,10,
-0x376a880,1,
-0x376b000,20,
-0x376b800,10,
-0x376b880,1,
-0x3770000,20,
-0x3770800,10,
-0x3770880,3,
-0x3770900,2,
-0x3770910,4,
-0x3770980,1,
-0x3771000,20,
-0x3771800,1,
-0x3772000,20,
-0x3772800,10,
-0x3772880,3,
-0x37728a0,1,
-0x3773000,100,
-0x3773800,10,
-0x3773880,1,
-0x3774000,20,
-0x3774800,10,
-0x3774880,1,
-0x3775000,20,
-0x3775800,10,
-0x3775880,1,
-0x3776000,20,
-0x3776800,10,
-0x3776880,1,
-0x3777000,20,
-0x3777800,10,
-0x3777880,1,
-0x3778000,20,
-0x3778800,10,
-0x3778880,1,
-0x3779000,20,
-0x3779800,10,
-0x3779880,1,
-0x377a000,20,
-0x377a800,10,
-0x377a880,3,
-0x377a900,2,
-0x377a910,4,
-0x377a980,1,
-0x377b000,20,
-0x377b800,1,
-0x377c000,20,
-0x377c800,10,
-0x377c880,3,
-0x377c8a0,1,
-0x377d000,100,
-0x377d800,10,
-0x377d880,1,
-0x377e000,20,
-0x377e800,10,
-0x377e880,1,
-0x377f000,20,
-0x377f800,10,
-0x377f880,1,
-0x3780000,20,
-0x3780800,10,
-0x3780880,1,
-0x3781000,20,
-0x3781800,10,
-0x3781880,1,
-0x3782000,20,
-0x3782800,10,
-0x3782880,1,
-0x3783000,20,
-0x3783800,10,
-0x3783880,1,
-0x3784000,36,
-0x3784800,10,
-0x3784880,3,
-0x3784900,2,
-0x3784910,4,
-0x3784980,1,
-0x3785000,20,
-0x3785800,1,
-0x3786000,36,
-0x3786800,10,
-0x3786880,3,
-0x3786900,2,
-0x3786910,4,
-0x3786980,1,
-0x3787000,20,
-0x3787800,1,
-0x3788000,36,
-0x3788800,10,
-0x3788880,3,
-0x3788900,2,
-0x3788910,4,
-0x3788980,1,
-0x3789000,20,
-0x3789800,10,
-0x3789880,3,
-0x3789900,2,
-0x3789910,4,
-0x3789980,1,
-0x378a000,68,
-0x378a800,10,
-0x378a880,3,
-0x378a900,2,
-0x378a910,4,
-0x378a980,1,
-0x378b000,20,
-0x378b800,10,
-0x378b880,3,
-0x378b900,2,
-0x378b910,4,
-0x378b980,1,
-0x378c000,20,
-0x378c800,1,
-0x378d000,20,
-0x378d800,1,
-0x378e000,52,
-0x378e800,10,
-0x378e880,3,
-0x378e900,2,
-0x378e910,4,
-0x378e980,1,
-0x378f000,20,
-0x378f800,1,
-0x3790000,36,
-0x3790800,10,
-0x3790880,3,
-0x3790900,2,
-0x3790910,4,
-0x3790980,1,
-0x3791000,36,
-0x3791800,10,
-0x3791880,3,
-0x3791900,2,
-0x3791910,4,
-0x3791980,1,
-0x3792000,36,
-0x3792800,10,
-0x3792880,3,
-0x3792900,2,
-0x3792910,4,
-0x3792980,1,
-0x3793000,36,
-0x3793800,10,
-0x3793880,3,
-0x3793900,2,
-0x3793910,4,
-0x3793980,1,
-0x3794000,36,
-0x3794800,10,
-0x3794880,3,
-0x3794900,2,
-0x3794910,4,
-0x3794980,1,
-0x3795000,20,
-0x3795800,10,
-0x3795880,3,
-0x3795900,2,
-0x3795910,4,
-0x3795980,1,
-0x3796000,36,
-0x3796800,10,
-0x3796880,3,
-0x3796900,2,
-0x3796910,4,
-0x3796980,1,
-0x3797000,20,
-0x3797800,10,
-0x3797880,3,
-0x3797900,2,
-0x3797910,4,
-0x3797980,1,
-0x3798000,20,
-0x3798800,1,
-0x3799000,20,
-0x3799800,10,
-0x3799880,3,
-0x3799900,2,
-0x3799910,4,
-0x3799980,1,
-0x379a000,20,
-0x379a800,10,
-0x379a880,3,
-0x379a900,2,
-0x379a910,4,
-0x379a980,1,
-0x379b000,36,
-0x379b800,10,
-0x379b880,3,
-0x379b900,2,
-0x379b910,4,
-0x379b980,1,
-0x379c000,36,
-0x379c800,10,
-0x379c880,3,
-0x379c900,2,
-0x379c910,4,
-0x379c980,1,
-0x379d000,36,
-0x379d800,10,
-0x379d880,3,
-0x379d900,2,
-0x379d910,4,
-0x379d980,1,
-0x379e000,36,
-0x379e800,10,
-0x379e880,3,
-0x379e900,2,
-0x379e910,4,
-0x379e980,1,
-0x379f000,20,
-0x379f800,10,
-0x379f880,3,
-0x379f900,2,
-0x379f910,4,
-0x379f980,1,
-0x37a0000,20,
-0x37a0800,10,
-0x37a0880,3,
-0x37a0900,2,
-0x37a0910,4,
-0x37a0980,1,
-0x37a1000,20,
-0x37a1800,10,
-0x37a1880,3,
-0x37a1900,2,
-0x37a1910,4,
-0x37a1980,1,
-0x37a2000,36,
-0x37a2800,10,
-0x37a2880,3,
-0x37a2900,2,
-0x37a2910,4,
-0x37a2980,1,
-0x37a3000,36,
-0x37a3800,10,
-0x37a3880,3,
-0x37a3900,2,
-0x37a3910,4,
-0x37a3980,1,
-0x37a4000,20,
-0x37a4800,10,
-0x37a4880,3,
-0x37a4900,2,
-0x37a4910,4,
-0x37a4980,1,
-0x37a5000,20,
-0x37a5800,10,
-0x37a5880,3,
-0x37a5900,2,
-0x37a5910,4,
-0x37a5980,1,
-0x37a6000,20,
-0x37a6080,20,
-0x37a6100,4,
-0x37a6800,10,
-0x37a6880,3,
-0x37a6900,2,
-0x37a6910,4,
-0x37a6980,1,
-0x37a7000,20,
-0x37a7080,20,
-0x37a7100,4,
-0x37a7800,10,
-0x37a7880,3,
-0x37a7900,2,
-0x37a7910,4,
-0x37a7980,1,
-0x37a8000,20,
-0x37a8080,20,
-0x37a8100,4,
-0x37a8800,10,
-0x37a8880,3,
-0x37a8900,2,
-0x37a8910,4,
-0x37a8980,1,
-0x37a9000,36,
-0x37a9800,10,
-0x37a9880,3,
-0x37a98a0,1,
-0x37a9900,2,
-0x37a9910,4,
-0x37a9980,1,
-0x37aa000,20,
-0x37aa800,10,
-0x37aa880,3,
-0x37aa900,2,
-0x37aa910,4,
-0x37aa980,1,
-0x37ab000,36,
-0x37ab800,10,
-0x37ab880,3,
-0x37ab900,2,
-0x37ab910,4,
-0x37ab984,5,
-0x37ab9a0,3,
-0x37aba00,1,
-0x37ac000,36,
-0x37ac800,10,
-0x37ac880,3,
-0x37ac900,2,
-0x37ac910,4,
-0x37ac980,1,
-0x37ad000,52,
-0x37ad800,10,
-0x37ad880,3,
-0x37ad900,2,
-0x37ad910,4,
-0x37ad980,1,
-0x37ae000,36,
-0x37ae800,1,
-0x37af000,36,
-0x37af800,1,
-0x37b0000,36,
-0x37b0800,1,
-0x37b1000,36,
-0x37b1800,1,
-0x37b2000,36,
-0x37b2800,1,
-0x37b3000,36,
-0x37b3800,1,
-0x37b4000,36,
-0x37b4800,1,
-0x37b5000,36,
-0x37b5800,1,
-0x37b6000,36,
-0x37b6800,1,
-0x37b7000,36,
-0x37b7800,1,
-0x37b8000,36,
-0x37b8800,1,
-0x37b9000,36,
-0x37b9800,1,
-0x37ba000,36,
-0x37ba800,1,
-0x37bb000,36,
-0x37bb800,1,
-0x37bc000,36,
-0x37bc800,1,
-0x37bd000,36,
-0x37bd800,1,
-0x37be000,20,
-0x37be800,10,
-0x37be880,3,
-0x37be900,2,
-0x37be910,4,
-0x37be980,1,
-0x37c0000,10,
-0x37c0080,3,
-0x37c0100,2,
-0x37c0110,4,
-0x37c0800,1,
-0x37c0810,3,
-0x37c0820,3,
-0x37c0830,3,
-0x37c0840,3,
-0x37c0850,3,
-0x37c0860,3,
-0x37c0870,3,
-0x37c0880,3,
-0x37c0890,32,
-0x37c0940,10,
-0x37c0980,10,
-0x37c09c0,10,
-0x37c0a00,10,
-0x37c0a40,10,
-0x37c0a80,10,
-0x37c0ac0,10,
-0x37c0b00,10,
-0x37c0b40,11,
-0x37c0b70,2,
-0x37c1000,1,
-0x37c4000,10,
-0x37c4080,3,
-0x37c4100,2,
-0x37c4110,4,
-0x37c4200,1,
-0x37c4210,3,
-0x37c4220,3,
-0x37c4230,8,
-0x37c4280,10,
-0x37c42c0,10,
-0x37c4300,2,
-0x37c4310,3,
-0x37c4320,2,
-0x37c4400,1,
-0x37c8000,10,
-0x37c8080,3,
-0x37c8100,2,
-0x37c8110,4,
-0x37c9000,1,
-0x37c9010,3,
-0x37c9020,3,
-0x37c9030,3,
-0x37c9040,3,
-0x37c9050,3,
-0x37c9060,3,
-0x37c9070,3,
-0x37c9080,3,
-0x37c9090,3,
-0x37c90a0,3,
-0x37c90b0,3,
-0x37c90c0,3,
-0x37c90d0,3,
-0x37c90e0,3,
-0x37c90f0,3,
-0x37c9100,3,
-0x37c9110,64,
-0x37c9240,10,
-0x37c9280,10,
-0x37c92c0,10,
-0x37c9300,10,
-0x37c9340,10,
-0x37c9380,10,
-0x37c93c0,10,
-0x37c9400,10,
-0x37c9440,10,
-0x37c9480,10,
-0x37c94c0,10,
-0x37c9500,10,
-0x37c9540,10,
-0x37c9580,10,
-0x37c95c0,10,
-0x37c9600,10,
-0x37c9640,19,
-0x37c9690,3,
-0x37c96a0,3,
-0x37c96b0,3,
-0x37c96c0,8,
-0x37ca000,1,
-0x37cc000,10,
-0x37cc080,3,
-0x37cc100,2,
-0x37cc110,4,
-0x37cd000,1,
-0x37cd010,3,
-0x37cd020,3,
-0x37cd030,3,
-0x37cd040,3,
-0x37cd050,3,
-0x37cd060,3,
-0x37cd070,3,
-0x37cd080,3,
-0x37cd090,3,
-0x37cd0a0,3,
-0x37cd0b0,3,
-0x37cd0c0,3,
-0x37cd0d0,3,
-0x37cd0e0,3,
-0x37cd0f0,3,
-0x37cd100,3,
-0x37cd110,64,
-0x37cd240,10,
-0x37cd280,10,
-0x37cd2c0,10,
-0x37cd300,10,
-0x37cd340,10,
-0x37cd380,10,
-0x37cd3c0,10,
-0x37cd400,10,
-0x37cd440,10,
-0x37cd480,10,
-0x37cd4c0,10,
-0x37cd500,10,
-0x37cd540,10,
-0x37cd580,10,
-0x37cd5c0,10,
-0x37cd600,10,
-0x37cd640,19,
-0x37cd690,3,
-0x37cd6a0,3,
-0x37cd6b0,3,
-0x37cd6c0,8,
-0x37ce000,1,
-0x37d0000,10,
-0x37d0080,3,
-0x37d0100,2,
-0x37d0110,4,
-0x37d0200,1,
-0x37d0210,3,
-0x37d0220,3,
-0x37d0230,8,
-0x37d0280,10,
-0x37d02c0,10,
-0x37d0300,2,
-0x37d0310,3,
-0x37d0320,2,
-0x37d0400,1,
-0x37d4000,36,
-0x37d4800,10,
-0x37d4880,3,
-0x37d4900,2,
-0x37d4910,4,
-0x37d4980,1,
-0x37d5000,10,
-0x3800000,4,
-0x3800014,7,
-0x3800044,1,
-0x3800050,2,
-0x3800060,6,
-0x3800080,3,
-0x3800090,6,
-0x38000b0,6,
-0x38000d0,4,
-0x3800fd0,1,
-0x3800fe0,8,
-0x3802400,4,
-0x3802a00,1,
-0x3802c00,1,
-0x3802c20,1,
-0x3802c40,1,
-0x3802c60,1,
-0x3802df8,1,
-0x3802e00,2,
-0x3802e20,4,
-0x3802e50,2,
-0x3802e70,1,
-0x3802fb8,2,
-0x3802fcc,2,
-0x3802fe0,8,
-0x3808000,2,
-0x380800c,1,
-0x3808020,4,
-0x380803c,1,
-0x3808044,1,
-0x3808050,2,
-0x3808060,6,
-0x3808080,3,
-0x3808090,12,
-0x3808e00,3,
-0x3808e10,1,
-0x3808e18,1,
-0x3808e80,1,
-0x3808e88,1,
-0x3808e90,1,
-0x3808ec0,1,
-0x3809000,62,
-0x3809400,62,
-0x38100a8,2,
-0x38100c8,2,
-0x3822000,4,
-0x3822600,4,
-0x3822c80,1,
-0x3822cc0,1,
-0x3840fd0,1,
-0x3840fe0,8,
-0x3842400,4,
-0x3842a00,1,
-0x3842c00,1,
-0x3842c20,1,
-0x3842c40,1,
-0x3842c60,1,
-0x3842df8,1,
-0x3842e00,2,
-0x3842e20,4,
-0x3842e50,2,
-0x3842e70,1,
-0x3842fb8,2,
-0x3842fcc,2,
-0x3842fe0,8,
-0x3848e00,1,
-0x3848e18,1,
-0x3848e80,1,
-0x3848e88,1,
-0x3848e90,1,
-0x3848ec0,1,
-0x3852000,4,
-0x3852600,4,
-0x3852c80,1,
-0x3852cc0,1,
-0x3860fd0,1,
-0x3860fe0,8,
-0x3862400,4,
-0x3862a00,1,
-0x3862c00,1,
-0x3862c20,1,
-0x3862c40,1,
-0x3862c60,1,
-0x3862df8,1,
-0x3862e00,2,
-0x3862e20,4,
-0x3862e50,2,
-0x3862e70,1,
-0x3862fb8,2,
-0x3862fcc,2,
-0x3862fe0,8,
-0x3868e00,1,
-0x3868e18,1,
-0x3868e80,1,
-0x3868e88,1,
-0x3868e90,1,
-0x3868ec0,1,
-0x3872000,4,
-0x3872600,4,
-0x3872c80,1,
-0x3872cc0,1,
-0x3880fd0,1,
-0x3880fe0,8,
-0x3882400,4,
-0x3882a00,1,
-0x3882c00,1,
-0x3882c20,1,
-0x3882c40,1,
-0x3882c60,1,
-0x3882df8,1,
-0x3882e00,2,
-0x3882e20,4,
-0x3882e50,2,
-0x3882e70,1,
-0x3882fb8,2,
-0x3882fcc,2,
-0x3882fe0,8,
-0x3888e00,1,
-0x3888e18,1,
-0x3888e80,1,
-0x3888e88,1,
-0x3888e90,1,
-0x3888ec0,1,
-0x3892000,4,
-0x3892600,4,
-0x3892c80,1,
-0x3892cc0,1,
-0x38a0fd0,1,
-0x38a0fe0,8,
-0x38a2400,4,
-0x38a2a00,1,
-0x38a2c00,1,
-0x38a2c20,1,
-0x38a2c40,1,
-0x38a2c60,1,
-0x38a2df8,1,
-0x38a2e00,2,
-0x38a2e20,4,
-0x38a2e50,2,
-0x38a2e70,1,
-0x38a2fb8,2,
-0x38a2fcc,2,
-0x38a2fe0,8,
-0x38a8e00,1,
-0x38a8e18,1,
-0x38a8e80,1,
-0x38a8e88,1,
-0x38a8e90,1,
-0x38a8ec0,1,
-0x38b2000,4,
-0x38b2600,4,
-0x38b2c80,1,
-0x38b2cc0,1,
-0x38c0fd0,1,
-0x38c0fe0,8,
-0x38c2400,4,
-0x38c2a00,1,
-0x38c2c00,1,
-0x38c2c20,1,
-0x38c2c40,1,
-0x38c2c60,1,
-0x38c2df8,1,
-0x38c2e00,2,
-0x38c2e20,4,
-0x38c2e50,2,
-0x38c2e70,1,
-0x38c2fb8,2,
-0x38c2fcc,2,
-0x38c2fe0,8,
-0x38c8e00,1,
-0x38c8e18,1,
-0x38c8e80,1,
-0x38c8e88,1,
-0x38c8e90,1,
-0x38c8ec0,1,
-0x38d2000,4,
-0x38d2600,4,
-0x38d2c80,1,
-0x38d2cc0,1,
-0x38e0fd0,1,
-0x38e0fe0,8,
-0x38e2400,4,
-0x38e2a00,1,
-0x38e2c00,1,
-0x38e2c20,1,
-0x38e2c40,1,
-0x38e2c60,1,
-0x38e2df8,1,
-0x38e2e00,2,
-0x38e2e20,4,
-0x38e2e50,2,
-0x38e2e70,1,
-0x38e2fb8,2,
-0x38e2fcc,2,
-0x38e2fe0,8,
-0x38e8e00,1,
-0x38e8e18,1,
-0x38e8e80,1,
-0x38e8e88,1,
-0x38e8e90,1,
-0x38e8ec0,1,
-0x38f2000,4,
-0x38f2600,4,
-0x38f2c80,1,
-0x38f2cc0,1,
-0x3900fd0,1,
-0x3900fe0,8,
-0x3902400,4,
-0x3902a00,1,
-0x3902c00,1,
-0x3902c20,1,
-0x3902c40,1,
-0x3902c60,1,
-0x3902df8,1,
-0x3902e00,2,
-0x3902e20,4,
-0x3902e50,2,
-0x3902e70,1,
-0x3902fb8,2,
-0x3902fcc,2,
-0x3902fe0,8,
-0x3908e00,1,
-0x3908e18,1,
-0x3908e80,1,
-0x3908e88,1,
-0x3908e90,1,
-0x3908ec0,1,
-0x3912000,4,
-0x3912600,4,
-0x3912c80,1,
-0x3912cc0,1,
-0x3920fd0,1,
-0x3920fe0,8,
-0x3922400,4,
-0x3922a00,1,
-0x3922c00,1,
-0x3922c20,1,
-0x3922c40,1,
-0x3922c60,1,
-0x3922df8,1,
-0x3922e00,2,
-0x3922e20,4,
-0x3922e50,2,
-0x3922e70,1,
-0x3922fb8,2,
-0x3922fcc,2,
-0x3922fe0,8,
-0x3928e00,1,
-0x3928e18,1,
-0x3928e80,1,
-0x3928e88,1,
-0x3928e90,1,
-0x3928ec0,1,
-0x3932000,4,
-0x3932600,4,
-0x3932c80,1,
-0x3932cc0,1,
-0x3940fd0,1,
-0x3940fe0,8,
-0x3942400,4,
-0x3942a00,1,
-0x3942c00,1,
-0x3942c20,1,
-0x3942c40,1,
-0x3942c60,1,
-0x3942df8,1,
-0x3942e00,2,
-0x3942e20,4,
-0x3942e50,2,
-0x3942e70,1,
-0x3942fb8,2,
-0x3942fcc,2,
-0x3942fe0,8,
-0x3948e00,1,
-0x3948e18,1,
-0x3948e80,1,
-0x3948e88,1,
-0x3948e90,1,
-0x3948ec0,1,
-0x3952000,4,
-0x3952600,4,
-0x3952c80,1,
-0x3952cc0,1,
-0x3a00000,10,
-0x3a80000,11,
-0x3a80034,3,
-0x3a80050,3,
-0x3a80420,2,
-0x3a8042c,1,
-0x3a80434,2,
-0x3a80440,1,
-0x3a80460,3,
-0x3a80470,69,
-0x3a80880,2,
-0x3a80890,8,
-0x3a8c100,36,
-0x3a8c19c,1,
-0x3a8c200,1,
-0x3a8c280,1,
-0x3a8c2c0,1,
-0x3a8c300,4,
-0x3a8c380,3,
-0x3a8c400,4,
-0x3a8c600,1,
-0x3a8c60c,2,
-0x3a8c618,2,
-0x3a8c624,1,
-0x3a8c630,1,
-0x3a8c640,1,
-0x3a8c700,6,
-0x3a8c720,1,
-0x3a8c800,32,
-0x3a8ca00,1,
-0x3a8d000,1,
-0x3a8d020,3,
-0x3a8d800,1,
-0x3b00004,1,
-0x3b0000c,2,
-0x3b00140,5,
-0x3b00158,8,
-0x3b00180,3,
-0x3b001a0,2,
-0x3b001ac,2,
-0x3b001c0,1,
-0x3b00400,145,
-0x3b00800,34,
-0x3b00900,14,
-0x3b00980,7,
-0x3b009a0,7,
-0x3b009c0,1,
-0x3b00a00,4,
-0x3b00a20,7,
-0x3b00a40,3,
-0x3b00a50,3,
-0x3b00a60,1,
-0x3b00a80,7,
-0x3b00b00,7,
-0x3b00b20,7,
-0x3b00b40,1,
-0x3b00b80,4,
-0x3b00ba0,7,
-0x3b00bc0,3,
-0x3b00be0,6,
-0x3b00c00,3,
-0x3b00c20,2,
-0x3b00c2c,2,
-0x3b00c40,9,
-0x3b00c80,8,
-0x3b00cc0,9,
-0x3b00d00,8,
-0x3b00d40,3,
-0x3b00d50,3,
-0x3b00d60,1,
-0x3b00d80,7,
-0x3b00da0,5,
-0x3b00dc0,6,
-0x3b00de0,8,
-0x3c00000,8,
-0x3c00804,1,
-0x3c0080c,4,
-0x3c00820,3,
-0x3c00a00,103,
-0x3c00c00,1,
-0x3c01004,1,
-0x3c01010,6,
-0x3c01040,14,
-0x3c01080,2,
-0x3c0108c,2,
-0x3c010a0,9,
-0x3c010c8,6,
-0x3c01100,36,
-0x3c01200,6,
-0x3fd0000,2,
-0x3fd000c,1,
-0x3fd0014,1,
-0x3fd001c,5,
-0x3fd0044,1,
-0x3fd0080,4,
-0x3fd00a0,6,
-0x3fd00c0,4,
-0x3fd00e0,6,
-0x3fd0100,4,
-0x3fd0200,4,
-0x3fd0280,24,
-0x3fd0300,4,
-0x3fd0380,24,
-0x3fd0400,4,
-0x3fd0420,20,
-0x3fd0480,4,
-0x3fd04a0,5,
-0x3fd04c0,4,
-0x3fd04e0,5,
-0x3fd0500,4,
-0x3fd0540,4,
-0x3fd0560,6,
-0x3fd0580,4,
-0x3fd05a0,6,
-0x3fd05c0,4,
-0x3fd1000,2,
-0x3fd100c,1,
-0x3fd1014,1,
-0x3fd101c,1,
-0x3fd1024,1,
-0x3fd102c,1,
-0x3fd1034,1,
-0x3fd103c,1,
-0x3fd1044,1,
-0x3fd104c,1,
-0x3fd1054,1,
-0x3fd105c,1,
-0x3fd1064,1,
-0x3fd106c,1,
-0x3fd1074,1,
-0x3fd107c,1,
-0x3fd1084,1,
-0x3fd108c,1,
-0x3fd1094,1,
-0x3fd1800,2,
-0x3fd180c,1,
-0x3fd1814,1,
-0x3fd181c,1,
-0x3fd1824,1,
-0x3fd182c,1,
-0x3fd1834,1,
-0x3fd183c,1,
-0x3fd1844,1,
-0x3fd184c,1,
-0x3fd1854,1,
-0x3fd185c,1,
-0x3fd1864,1,
-0x3fd186c,1,
-0x3fd1874,1,
-0x3fd187c,1,
-0x3fd1884,1,
-0x3fd188c,1,
-0x3fd1894,1,
-0x3fd2000,2,
-0x3fd200c,1,
-0x3fd2014,1,
-0x3fd201c,1,
-0x3fd2024,1,
-0x3fd202c,1,
-0x3fd2034,1,
-0x3fd203c,1,
-0x3fd2044,1,
-0x3fd204c,1,
-0x3fd2054,1,
-0x3fd205c,1,
-0x3fd2064,1,
-0x3fd206c,1,
-0x3fd2074,1,
-0x3fd207c,1,
-0x3fd2084,1,
-0x3fd208c,1,
-0x3fd2094,1,
-0x3fd2800,2,
-0x3fd280c,1,
-0x3fd2814,1,
-0x3fd281c,1,
-0x3fd2824,1,
-0x3fd282c,1,
-0x3fd2834,1,
-0x3fd283c,1,
-0x3fd2844,1,
-0x3fd284c,1,
-0x3fd2854,1,
-0x3fd285c,1,
-0x3fd2864,1,
-0x3fd286c,1,
-0x3fd2874,1,
-0x3fd287c,1,
-0x3fd2884,1,
-0x3fd288c,1,
-0x3fd2894,1,
-0x3fd3000,2,
-0x3fd300c,1,
-0x3fd3014,1,
-0x3fd301c,1,
-0x3fd3024,1,
-0x3fd302c,1,
-0x3fd3034,1,
-0x3fd303c,1,
-0x3fd3044,1,
-0x3fd304c,1,
-0x3fd3054,1,
-0x3fd305c,1,
-0x3fd3064,1,
-0x3fd306c,1,
-0x3fd3074,1,
-0x3fd307c,1,
-0x3fd3084,1,
-0x3fd308c,1,
-0x3fd3094,1,
-0x3fd309c,1,
-0x3fd30a4,1,
-0x3fd30ac,1,
-0x3fd30b4,1,
-0x3fd30bc,1,
-0x3fd30c4,1,
-0x3fd30cc,1,
-0x3fd30d4,1,
-0x3fd30dc,1,
-0x3fd30e4,1,
-0x3fd30ec,1,
-0x3fd30f4,1,
-0x3fd30fc,1,
-0x3fd3104,1,
-0x3fd310c,1,
-0x3fd3114,1,
-0x3fd311c,1,
-0x3fd3124,1,
-0x3fd312c,1,
-0x3fd3134,1,
-0x3fd313c,1,
-0x3fd3144,1,
-0x3fd314c,1,
-0x3fd3154,1,
-0x3fd315c,1,
-0x3fd3164,1,
-0x3fd316c,1,
-0x3fd3174,1,
-0x3fd317c,1,
-0x3fd3184,1,
-0x3fd318c,1,
-0x3fd3194,1,
-0x3fd319c,1,
-0x3fd31a4,1,
-0x3fd31ac,1,
-0x3fd31b4,1,
-0x3fd31bc,1,
-0x3fd31c4,1,
-0x3fd31cc,1,
-0x3fd31d4,1,
-0x3fd31dc,1,
-0x3fd31e4,1,
-0x3fd31ec,1,
-0x3fd31f4,1,
-0x3fd31fc,1,
-0x3fd3204,1,
-0x3fd320c,1,
-0x3fd3214,1,
-0x3fd321c,1,
-0x3fd3224,1,
-0x3fd322c,1,
-0x3fd3234,1,
-0x3fd323c,1,
-0x3fd3244,1,
-0x3fd324c,1,
-0x3fd3254,1,
-0x3fd325c,1,
-0x3fd3264,1,
-0x3fd326c,1,
-0x3fd3274,1,
-0x3fd327c,1,
-0x3fd3284,1,
-0x3fd328c,1,
-0x3fd3294,1,
-0x3fd329c,1,
-0x3fd32a4,1,
-0x3fd32ac,1,
-0x3fd32b4,1,
-0x3fd32bc,1,
-0x3fd32c4,1,
-0x3fd32cc,1,
-0x3fd32d4,1,
-0x3fd32dc,1,
-0x3fd32e4,1,
-0x3fd32ec,1,
-0x3fd32f4,1,
-0x3fd32fc,1,
-0x3fd3304,1,
-0x3fd330c,1,
-0x3fd3314,1,
-0x3fd331c,1,
-0x3fd3324,1,
-0x3fd332c,1,
-0x3fd3334,1,
-0x3fd333c,1,
-0x3fd3344,1,
-0x3fd334c,1,
-0x3fd3354,1,
-0x3fd335c,1,
-0x3fd3364,1,
-0x3fd336c,1,
-0x3fd3374,1,
-0x3fd337c,1,
-0x3fd3384,1,
-0x3fd338c,1,
-0x3fd3394,1,
-0x3fd339c,1,
-0x3fd33a4,1,
-0x3fd33ac,1,
-0x3fd33b4,1,
-0x3fd33bc,1,
-0x3fd33c4,1,
-0x3fd33cc,1,
-0x3fd33d4,1,
-0x3fd33dc,1,
-0x3fd33e4,1,
-0x3fd33ec,1,
-0x3fd33f4,1,
-0x3fd33fc,1,
-0x3fd3404,1,
-0x3fd4800,36,
-0x3fd4900,2,
-0x3fd490c,1,
-0x3fd4914,1,
-0x3fd491c,1,
-0x3fd4924,1,
-0x3fd492c,1,
-0x3fd4934,1,
-0x3fd493c,1,
-0x3fd4944,1,
-0x3fd494c,1,
-0x3fd4954,1,
-0x3fd4964,1,
-0x3fd496c,1,
-0x3fd4974,1,
-0x3fd497c,1,
-0x3fd4984,1,
-0x3fd498c,1,
-0x3fd4994,1,
-0x3fd499c,1,
-0x3fd49a4,1,
-0x3fd5000,2,
-0x3fd500c,1,
-0x3fd5200,27,
-0x3fd5280,4,
-0x3fd52c0,25,
-0x3fd5340,6,
-0x3fd5360,2,
-0x3fd536c,3,
-0x3fd5384,13,
-0x3fd5400,2,
-0x3fd5440,12,
-0x3fd5800,3,
-0x3fd5810,3,
-0x3fd5820,3,
-0x3fd5830,3,
-0x3fd5840,3,
-0x3fd5850,3,
-0x3fd5860,3,
-0x3fd5870,3,
-0x3fd5880,3,
-0x3fd5890,3,
-0x3fd58a0,3,
-0x3fd58b0,3,
-0x3fd58c0,3,
-0x3fd58d0,3,
-0x3fd58e0,3,
-0x3fd58f0,3,
-0x3fd5900,1,
-0x3fd5a00,4,
-0x5fd0000,2,
-0x5fd000c,1,
-0x5fd0014,1,
-0x5fd001c,5,
-0x5fd0044,1,
-0x5fd0080,4,
-0x5fd00a0,6,
-0x5fd00c0,4,
-0x5fd00e0,6,
-0x5fd0100,4,
-0x5fd0200,4,
-0x5fd0280,24,
-0x5fd0300,4,
-0x5fd0380,24,
-0x5fd0400,4,
-0x5fd0420,20,
-0x5fd0480,4,
-0x5fd04a0,5,
-0x5fd04c0,4,
-0x5fd04e0,5,
-0x5fd0500,4,
-0x5fd0540,4,
-0x5fd0560,6,
-0x5fd0580,4,
-0x5fd05a0,6,
-0x5fd05c0,4,
-0x5fd5000,2,
-0x5fd500c,1,
-0x5fd5200,27,
-0x5fd5280,4,
-0x5fd52c0,25,
-0x5fd5340,6,
-0x5fd5360,2,
-0x5fd536c,3,
-0x5fd5384,10,
-0x5fd5400,2,
-0x5fd5440,12,
-0x5fd5800,4,
-0x5fd8000,1,
-0x5fd8010,4,
-0x7fd0000,2,
-0x7fd000c,1,
-0x7fd0014,1,
-0x7fd001c,5,
-0x7fd0044,1,
-0x7fd0080,4,
-0x7fd00a0,6,
-0x7fd00c0,4,
-0x7fd00e0,6,
-0x7fd0100,4,
-0x7fd0200,4,
-0x7fd0280,24,
-0x7fd0300,4,
-0x7fd0380,24,
-0x7fd0400,4,
-0x7fd0420,20,
-0x7fd0480,4,
-0x7fd04a0,5,
-0x7fd04c0,4,
-0x7fd04e0,5,
-0x7fd0500,4,
-0x7fd0540,4,
-0x7fd0560,6,
-0x7fd0580,4,
-0x7fd05a0,6,
-0x7fd05c0,4,
-0x7fd5000,2,
-0x7fd500c,1,
-0x7fd5200,27,
-0x7fd5280,4,
-0x7fd52c0,25,
-0x7fd5340,6,
-0x7fd5360,2,
-0x7fd536c,3,
-0x7fd5384,10,
-0x7fd5400,2,
-0x7fd5440,12,
-0x7fd5800,4,
-0x7fd8000,1,
-0x7fd8010,4,
-0x9fd0000,2,
-0x9fd000c,1,
-0x9fd0014,1,
-0x9fd001c,5,
-0x9fd0044,1,
-0x9fd0080,4,
-0x9fd00a0,6,
-0x9fd00c0,4,
-0x9fd00e0,6,
-0x9fd0100,4,
-0x9fd0200,4,
-0x9fd0280,24,
-0x9fd0300,4,
-0x9fd0380,24,
-0x9fd0400,4,
-0x9fd0420,20,
-0x9fd0480,4,
-0x9fd04a0,5,
-0x9fd04c0,4,
-0x9fd04e0,5,
-0x9fd0500,4,
-0x9fd0540,4,
-0x9fd0560,6,
-0x9fd0580,4,
-0x9fd05a0,6,
-0x9fd05c0,4,
-0x9fd5000,2,
-0x9fd500c,1,
-0x9fd5200,27,
-0x9fd5280,4,
-0x9fd52c0,25,
-0x9fd5340,6,
-0x9fd5360,2,
-0x9fd536c,3,
-0x9fd5384,10,
-0x9fd5400,2,
-0x9fd5440,12,
-0x9fd5800,4,
-0x9fd8000,1,
-0x9fd8010,4,
-0xa000000,9,
-0xa000028,4,
-0xa000040,1,
-0xa000048,1,
-0xa000050,12,
-0xa000108,1,
-0xa000128,2,
-0xa000140,3,
-0xa000154,7,
-0xa000184,1,
-0xa00018c,5,
-0xa000200,4,
-0xa000260,1,
-0xa000270,1,
-0xa00027c,2,
-0xa000288,2,
-0xa000400,7,
-0xa000480,7,
-0xa0004a0,7,
-0xa0004c0,1,
-0xa000500,4,
-0xa000520,7,
-0xa000540,8,
-0xa000800,2,
-0xa000900,4,
-0xa000980,25,
-0xa000a00,25,
-0xa000a80,25,
-0xa000b00,4,
-0xa000b80,19,
-0xa000c00,19,
-0xa000c80,19,
-0xa001000,1,
-0xa001020,7,
-0xa001040,7,
-0xa001080,3,
-0xa001090,10,
-0xa002000,8,
-0xa002400,1,
-0xa002408,32,
-0xa002500,2,
-0xa002520,1,
-0xa002530,4,
-0xa002544,3,
-0xa002554,5,
-0xa002600,13,
-0xa002640,13,
-0xa002680,1,
-0xa002700,4,
-0xa002740,13,
-0xa002780,2,
-0xa002800,1,
-0xa002820,7,
-0xa002840,3,
-0xa002850,3,
-0xa002860,1,
-0xa002880,20,
-0xa003000,8,
-0xa003400,1,
-0xa003408,32,
-0xa003500,2,
-0xa003520,1,
-0xa003530,4,
-0xa003544,3,
-0xa003554,5,
-0xa003600,13,
-0xa003640,13,
-0xa003680,1,
-0xa003700,4,
-0xa003740,13,
-0xa003780,2,
-0xa003800,1,
-0xa003820,7,
-0xa003840,3,
-0xa003850,3,
-0xa003860,1,
-0xa003880,20,
-0xa004000,8,
-0xa004400,1,
-0xa004408,32,
-0xa004500,2,
-0xa004520,1,
-0xa004530,4,
-0xa004544,3,
-0xa004554,5,
-0xa004600,13,
-0xa004640,13,
-0xa004680,1,
-0xa004700,4,
-0xa004740,13,
-0xa004780,2,
-0xa004800,1,
-0xa004820,7,
-0xa004840,3,
-0xa004850,3,
-0xa004860,1,
-0xa004880,20,
-0xa005000,8,
-0xa005400,1,
-0xa005408,32,
-0xa005500,2,
-0xa005520,1,
-0xa005530,4,
-0xa005544,3,
-0xa005554,5,
-0xa005600,13,
-0xa005640,13,
-0xa005680,1,
-0xa005700,4,
-0xa005740,13,
-0xa005780,2,
-0xa005800,1,
-0xa005820,7,
-0xa005840,3,
-0xa005850,3,
-0xa005860,1,
-0xa005880,20,
-0xa006000,36,
-0xa008000,1,
-0xa008400,27,
-0xa008480,4,
-0xa0084c0,25,
-0xa008540,6,
-0xa008560,2,
-0xa00856c,3,
-0xa008604,73,
-0xa008800,28,
-0xa008880,1,
-0xa008890,4,
-0xa010000,56,
-0xa010400,1,
-0xa010480,3,
-0xa010490,20,
-0xa010500,6,
-0xa010520,6,
-0xa010540,16,
-0xa010600,10,
-0xa010640,10,
-0xa010680,1,
-0xa010700,36,
-0xa010800,1,
-0xa010808,82,
-0xa010a00,11,
-0xa010a40,11,
-0xa010a80,1,
-0xa010b00,1,
-0xa010b08,32,
-0xa010c00,17,
-0xa010c48,35,
-0xa010d00,3,
-0xa011000,3,
-0xa011404,1,
-0xa01140c,1,
-0xa011414,1,
-0xa01141c,4,
-0xa011440,35,
-0xa011504,1,
-0xa01153c,19,
-0xa011604,1,
-0xa01163c,19,
-0xa011700,4,
-0xa011800,35,
-0xa011890,64,
-0xa011a00,4,
-0xa011a80,18,
-0xa011b00,4,
-0xa011b80,19,
-0xa011c00,35,
-0xa012000,6,
-0xa014000,1,
-0xa014080,1,
-0xa014088,18,
-0xa014100,6,
-0xa014120,6,
-0xa014140,16,
-0xa014200,10,
-0xa014240,10,
-0xa014280,1,
-0xa014300,62,
-0xa014800,9,
-0xa014828,4,
-0xa014900,11,
-0xa014940,11,
-0xa014980,1,
-0xa014a00,31,
-0xa014b00,17,
-0xa014b48,35,
-0xa014c00,2,
-0xa014c10,5,
-0xa014c28,16,
-0xa014c70,5,
-0xa014c88,7,
-0xa014ca8,7,
-0xa014cc8,7,
-0xa014ce8,7,
-0xa014d08,7,
-0xa014d28,7,
-0xa014d48,7,
-0xa014d68,7,
-0xa014d88,7,
-0xa014da8,7,
-0xa014dc8,7,
-0xa014de8,7,
-0xa014e08,10,
-0xa015000,89,
-0xa015200,5,
-0xa016000,10,
-0xa016040,6,
-0xa016060,1,
-0xa016068,3,
-0xa016080,3,
-0xa018000,22,
-0xa018080,22,
-0xa018100,1,
-0xa018200,2,
-0xa01820c,2,
-0xa018280,4,
-0xa0182c0,9,
-0xa018300,4,
-0xa018340,11,
-0xa018380,4,
-0xa0183c0,9,
-0xa018400,4,
-0xa018480,23,
-0xa018800,27,
-0xa018880,4,
-0xa0188c0,25,
-0xa018940,6,
-0xa018960,2,
-0xa01896c,3,
-0xa018a04,43,
-0xa018c00,84,
-0xa018e00,4,
-0xa018e80,25,
-0xa018f00,4,
-0xa018f80,25,
-0xa019000,4,
-0xa019080,19,
-0xa019100,4,
-0xa019180,19,
-0xa019200,6,
-0xa019220,6,
-0xa019300,4,
-0xa019380,22,
-0xa019400,1,
-0xa019480,4,
-0xa0194c0,11,
-0xa019500,4,
-0xa019580,22,
-0xa019600,6,
-0xa019620,1,
-0xa01a000,1,
-0xa01a100,3,
-0xa01a110,3,
-0xa01a120,3,
-0xa01a130,3,
-0xa01a140,15,
-0xa01a180,2,
-0xa01a200,12,
-0xa020000,5,
-0xa020018,8,
-0xa020080,5,
-0xa0200a0,5,
-0xa0200c0,1,
-0xa020100,5,
-0xa020118,8,
-0xa020180,5,
-0xa0201a0,5,
-0xa0201c0,1,
-0xa020400,15,
-0xa020480,5,
-0xa0204a0,5,
-0xa0204c0,1,
-0xa020500,99,
-0xa020690,3,
-0xa0206a0,13,
-0xa020800,4,
-0xa020a00,27,
-0xa020a80,4,
-0xa020ac0,25,
-0xa020b40,6,
-0xa020b60,2,
-0xa020b6c,3,
-0xa020b84,5,
-0xa020c00,28,
-0xa020c84,1,
-0xa020cb0,25,
-0xa020d40,4,
-0xa020d60,7,
-0xa020d80,4,
-0xa020da0,7,
-0xa020dc0,6,
-0xa020de0,6,
-0xa020e00,6,
-0xa020e20,6,
-0xa022000,117,
-0xa0221e4,2,
-0xa0221f0,3,
-0xa022200,27,
-0xa022280,4,
-0xa0222c0,25,
-0xa022340,6,
-0xa022360,2,
-0xa02236c,3,
-0xa022384,8,
-0xa022400,1,
-0xa022500,4,
-0xa022580,18,
-0xa022600,4,
-0xa022680,18,
-0xa022700,4,
-0xa022780,18,
-0xa022800,4,
-0xa022880,18,
-0xa022900,4,
-0xa022940,14,
-0xa022980,4,
-0xa024000,117,
-0xa0241e4,2,
-0xa0241f0,3,
-0xa024200,27,
-0xa024280,4,
-0xa0242c0,25,
-0xa024340,6,
-0xa024360,2,
-0xa02436c,3,
-0xa024384,8,
-0xa024400,1,
-0xa024500,4,
-0xa024580,18,
-0xa024600,4,
-0xa024680,18,
-0xa024700,4,
-0xa024780,18,
-0xa024800,4,
-0xa024880,18,
-0xa024900,4,
-0xa024940,14,
-0xa024980,4,
-0xa026000,117,
-0xa0261e4,2,
-0xa0261f0,3,
-0xa026200,27,
-0xa026280,4,
-0xa0262c0,25,
-0xa026340,6,
-0xa026360,2,
-0xa02636c,3,
-0xa026384,8,
-0xa026400,1,
-0xa026500,4,
-0xa026580,18,
-0xa026600,4,
-0xa026680,18,
-0xa026700,4,
-0xa026780,18,
-0xa026800,4,
-0xa026880,18,
-0xa026900,4,
-0xa026940,14,
-0xa026980,4,
-0xa028000,117,
-0xa0281e4,2,
-0xa0281f0,3,
-0xa028200,27,
-0xa028280,4,
-0xa0282c0,25,
-0xa028340,6,
-0xa028360,2,
-0xa02836c,3,
-0xa028384,8,
-0xa028400,1,
-0xa028500,4,
-0xa028580,18,
-0xa028600,4,
-0xa028680,18,
-0xa028700,4,
-0xa028780,18,
-0xa028800,4,
-0xa028880,18,
-0xa028900,4,
-0xa028940,14,
-0xa028980,4,
-0xa030004,1,
-0xa03007c,69,
-0xa030200,2,
-0xa030224,1,
-0xa030234,4,
-0xa030260,1,
-0xa030268,4,
-0xa030280,6,
-0xa0302a0,1,
-0xa0302c0,2,
-0xa0302cc,2,
-0xa0302e0,11,
-0xa030320,3,
-0xa030330,3,
-0xa030340,7,
-0xa030380,1,
-0xa0303a0,1,
-0xa0303b0,4,
-0xa030400,3,
-0xa030420,3,
-0xa030430,3,
-0xa030440,7,
-0xa030484,1,
-0xa030498,10,
-0xa030500,20,
-0xa030600,27,
-0xa030680,4,
-0xa0306c0,25,
-0xa030740,6,
-0xa030760,2,
-0xa03076c,3,
-0xa030780,8,
-0xa0307a4,9,
-0xa030800,2,
-0xa030820,13,
-0xa030900,2,
-0xa03090c,2,
-0xa030920,2,
-0xa03092c,2,
-0xa030940,6,
-0xa030984,1,
-0xa03099c,9,
-0xa031004,1,
-0xa031018,15,
-0xa031060,3,
-0xa031070,6,
-0xa032004,1,
-0xa032014,32,
-0xa032400,3,
-0xa032444,1,
-0xa032450,14,
-0xa0324a0,6,
-0xa0324c0,3,
-0xa032800,36,
-0xa032900,4,
-0xa032a00,27,
-0xa032a80,9,
-0xa032ac0,6,
-0xa032ae0,4,
-0xa032b04,4,
-0xa032c00,3,
-0xa038000,10,
-0xa038104,1,
-0xa038140,16,
-0xa038184,1,
-0xa038190,6,
-0xa038204,1,
-0xa03823c,19,
-0xa038400,10,
-0xa038504,1,
-0xa038540,16,
-0xa038584,1,
-0xa038590,6,
-0xa038604,1,
-0xa03863c,19,
-0xa038800,10,
-0xa038904,1,
-0xa038940,16,
-0xa038984,1,
-0xa038990,6,
-0xa038a04,1,
-0xa038a3c,19,
-0xa038c00,10,
-0xa038d04,1,
-0xa038d40,16,
-0xa038d84,1,
-0xa038d90,6,
-0xa038e04,1,
-0xa038e3c,19,
-0xa039000,2,
-0xa039040,3,
-0xa039050,3,
-0xa039060,1,
-0xa039080,5,
-0xa0390a0,5,
-0xa0390c0,3,
-0xa0390d0,3,
-0xa039100,3,
-0xa039110,3,
-0xa039120,1,
-0xa039200,4,
-0xa039280,18,
-0xa039300,4,
-0xa039380,19,
-0xa039400,4,
-0xa039480,18,
-0xa039500,4,
-0xa039580,18,
-0xa039600,4,
-0xa039640,15,
-0xa039700,4,
-0xa039780,18,
-0xa039800,4,
-0xa039a00,27,
-0xa039a80,4,
-0xa039ac0,25,
-0xa039b40,6,
-0xa039b60,2,
-0xa039b6c,3,
-0xa039b84,8,
-0xa039c00,10,
-0xa03a000,3,
-0xa03a010,4,
-0xa03a080,28,
-0xa03a100,1,
-0xa040000,2,
-0xa04000c,1,
-0xa040014,1,
-0xa04001c,5,
-0xa040044,1,
-0xa040080,4,
-0xa0400a0,6,
-0xa0400c0,4,
-0xa0400e0,6,
-0xa040100,4,
-0xa040200,4,
-0xa040280,24,
-0xa040300,4,
-0xa040380,24,
-0xa040400,4,
-0xa040420,20,
-0xa040480,4,
-0xa0404a0,5,
-0xa0404c0,4,
-0xa0404e0,5,
-0xa040500,4,
-0xa040540,4,
-0xa040560,6,
-0xa040580,4,
-0xa0405a0,6,
-0xa0405c0,4,
-0xa041000,2,
-0xa04100c,1,
-0xa041014,1,
-0xa04101c,1,
-0xa041024,1,
-0xa04102c,1,
-0xa041034,1,
-0xa04103c,1,
-0xa041044,1,
-0xa04104c,1,
-0xa041054,1,
-0xa04105c,1,
-0xa041064,1,
-0xa04106c,1,
-0xa041074,1,
-0xa04107c,1,
-0xa041084,1,
-0xa04108c,1,
-0xa041094,1,
-0xa044020,12,
-0xa044800,36,
-0xa044900,2,
-0xa04490c,1,
-0xa044914,1,
-0xa04491c,1,
-0xa044924,1,
-0xa04492c,1,
-0xa044934,1,
-0xa04493c,1,
-0xa044944,1,
-0xa04494c,1,
-0xa044954,1,
-0xa044964,1,
-0xa04496c,1,
-0xa044974,1,
-0xa04497c,1,
-0xa044984,1,
-0xa04498c,1,
-0xa044994,1,
-0xa04499c,1,
-0xa0449a4,1,
-0xa045000,2,
-0xa04500c,1,
-0xa045200,27,
-0xa045280,4,
-0xa0452c0,25,
-0xa045340,6,
-0xa045360,2,
-0xa04536c,3,
-0xa045384,10,
-0xa045400,2,
-0xa045440,12,
-0xa045800,5,
-0xa200000,9,
-0xa200028,4,
-0xa200040,1,
-0xa200048,1,
-0xa200050,12,
-0xa200108,1,
-0xa200128,2,
-0xa200140,3,
-0xa200154,7,
-0xa200184,1,
-0xa20018c,5,
-0xa200200,4,
-0xa200260,1,
-0xa200270,1,
-0xa20027c,2,
-0xa200288,2,
-0xa200400,7,
-0xa200480,7,
-0xa2004a0,7,
-0xa2004c0,1,
-0xa200500,4,
-0xa200520,7,
-0xa200540,8,
-0xa200800,2,
-0xa200900,4,
-0xa200980,25,
-0xa200a00,25,
-0xa200a80,25,
-0xa200b00,4,
-0xa200b80,19,
-0xa200c00,19,
-0xa200c80,19,
-0xa201000,1,
-0xa201020,7,
-0xa201040,7,
-0xa201080,3,
-0xa201090,10,
-0xa202000,8,
-0xa202400,1,
-0xa202408,32,
-0xa202500,2,
-0xa202520,1,
-0xa202530,4,
-0xa202544,3,
-0xa202554,5,
-0xa202600,13,
-0xa202640,13,
-0xa202680,1,
-0xa202700,4,
-0xa202740,13,
-0xa202780,2,
-0xa202800,1,
-0xa202820,7,
-0xa202840,3,
-0xa202850,3,
-0xa202860,1,
-0xa202880,20,
-0xa203000,8,
-0xa203400,1,
-0xa203408,32,
-0xa203500,2,
-0xa203520,1,
-0xa203530,4,
-0xa203544,3,
-0xa203554,5,
-0xa203600,13,
-0xa203640,13,
-0xa203680,1,
-0xa203700,4,
-0xa203740,13,
-0xa203780,2,
-0xa203800,1,
-0xa203820,7,
-0xa203840,3,
-0xa203850,3,
-0xa203860,1,
-0xa203880,20,
-0xa204000,8,
-0xa204400,1,
-0xa204408,32,
-0xa204500,2,
-0xa204520,1,
-0xa204530,4,
-0xa204544,3,
-0xa204554,5,
-0xa204600,13,
-0xa204640,13,
-0xa204680,1,
-0xa204700,4,
-0xa204740,13,
-0xa204780,2,
-0xa204800,1,
-0xa204820,7,
-0xa204840,3,
-0xa204850,3,
-0xa204860,1,
-0xa204880,20,
-0xa205000,8,
-0xa205400,1,
-0xa205408,32,
-0xa205500,2,
-0xa205520,1,
-0xa205530,4,
-0xa205544,3,
-0xa205554,5,
-0xa205600,13,
-0xa205640,13,
-0xa205680,1,
-0xa205700,4,
-0xa205740,13,
-0xa205780,2,
-0xa205800,1,
-0xa205820,7,
-0xa205840,3,
-0xa205850,3,
-0xa205860,1,
-0xa205880,20,
-0xa206000,36,
-0xa208000,1,
-0xa208400,27,
-0xa208480,4,
-0xa2084c0,25,
-0xa208540,6,
-0xa208560,2,
-0xa20856c,3,
-0xa208604,73,
-0xa208800,28,
-0xa208880,1,
-0xa208890,4,
-0xa210000,56,
-0xa210400,1,
-0xa210480,3,
-0xa210490,20,
-0xa210500,6,
-0xa210520,6,
-0xa210540,16,
-0xa210600,10,
-0xa210640,10,
-0xa210680,1,
-0xa210700,36,
-0xa210800,1,
-0xa210808,82,
-0xa210a00,11,
-0xa210a40,11,
-0xa210a80,1,
-0xa210b00,1,
-0xa210b08,32,
-0xa210c00,17,
-0xa210c48,35,
-0xa210d00,3,
-0xa211000,3,
-0xa211404,1,
-0xa21140c,1,
-0xa211414,1,
-0xa21141c,4,
-0xa211440,35,
-0xa211504,1,
-0xa21153c,19,
-0xa211604,1,
-0xa21163c,19,
-0xa211700,4,
-0xa211800,35,
-0xa211890,64,
-0xa211a00,4,
-0xa211a80,18,
-0xa211b00,4,
-0xa211b80,19,
-0xa211c00,35,
-0xa212000,6,
-0xa214000,1,
-0xa214080,1,
-0xa214088,18,
-0xa214100,6,
-0xa214120,6,
-0xa214140,16,
-0xa214200,10,
-0xa214240,10,
-0xa214280,1,
-0xa214300,62,
-0xa214800,9,
-0xa214828,4,
-0xa214900,11,
-0xa214940,11,
-0xa214980,1,
-0xa214a00,31,
-0xa214b00,17,
-0xa214b48,35,
-0xa214c00,2,
-0xa214c10,5,
-0xa214c28,16,
-0xa214c70,5,
-0xa214c88,7,
-0xa214ca8,7,
-0xa214cc8,7,
-0xa214ce8,7,
-0xa214d08,7,
-0xa214d28,7,
-0xa214d48,7,
-0xa214d68,7,
-0xa214d88,7,
-0xa214da8,7,
-0xa214dc8,7,
-0xa214de8,7,
-0xa214e08,10,
-0xa215000,89,
-0xa215200,5,
-0xa216000,10,
-0xa216040,6,
-0xa216060,1,
-0xa216068,3,
-0xa216080,3,
-0xa218000,22,
-0xa218080,22,
-0xa218100,1,
-0xa218200,2,
-0xa21820c,2,
-0xa218280,4,
-0xa2182c0,9,
-0xa218300,4,
-0xa218340,11,
-0xa218380,4,
-0xa2183c0,9,
-0xa218400,4,
-0xa218480,23,
-0xa218800,27,
-0xa218880,4,
-0xa2188c0,25,
-0xa218940,6,
-0xa218960,2,
-0xa21896c,3,
-0xa218a04,43,
-0xa218c00,84,
-0xa218e00,4,
-0xa218e80,25,
-0xa218f00,4,
-0xa218f80,25,
-0xa219000,4,
-0xa219080,19,
-0xa219100,4,
-0xa219180,19,
-0xa219200,6,
-0xa219220,6,
-0xa219300,4,
-0xa219380,22,
-0xa219400,1,
-0xa219480,4,
-0xa2194c0,11,
-0xa219500,4,
-0xa219580,22,
-0xa219600,6,
-0xa219620,1,
-0xa21a000,1,
-0xa21a100,3,
-0xa21a110,3,
-0xa21a120,3,
-0xa21a130,3,
-0xa21a140,15,
-0xa21a180,2,
-0xa21a200,12,
-0xa220000,5,
-0xa220018,8,
-0xa220080,5,
-0xa2200a0,5,
-0xa2200c0,1,
-0xa220100,5,
-0xa220118,8,
-0xa220180,5,
-0xa2201a0,5,
-0xa2201c0,1,
-0xa220400,15,
-0xa220480,5,
-0xa2204a0,5,
-0xa2204c0,1,
-0xa220500,99,
-0xa220690,3,
-0xa2206a0,13,
-0xa220800,4,
-0xa220a00,27,
-0xa220a80,4,
-0xa220ac0,25,
-0xa220b40,6,
-0xa220b60,2,
-0xa220b6c,3,
-0xa220b84,5,
-0xa220c00,28,
-0xa220c84,1,
-0xa220cb0,25,
-0xa220d40,4,
-0xa220d60,7,
-0xa220d80,4,
-0xa220da0,7,
-0xa220dc0,6,
-0xa220de0,6,
-0xa220e00,6,
-0xa220e20,6,
-0xa222000,117,
-0xa2221e4,2,
-0xa2221f0,3,
-0xa222200,27,
-0xa222280,4,
-0xa2222c0,25,
-0xa222340,6,
-0xa222360,2,
-0xa22236c,3,
-0xa222384,8,
-0xa222400,1,
-0xa222500,4,
-0xa222580,18,
-0xa222600,4,
-0xa222680,18,
-0xa222700,4,
-0xa222780,18,
-0xa222800,4,
-0xa222880,18,
-0xa222900,4,
-0xa222940,14,
-0xa222980,4,
-0xa224000,117,
-0xa2241e4,2,
-0xa2241f0,3,
-0xa224200,27,
-0xa224280,4,
-0xa2242c0,25,
-0xa224340,6,
-0xa224360,2,
-0xa22436c,3,
-0xa224384,8,
-0xa224400,1,
-0xa224500,4,
-0xa224580,18,
-0xa224600,4,
-0xa224680,18,
-0xa224700,4,
-0xa224780,18,
-0xa224800,4,
-0xa224880,18,
-0xa224900,4,
-0xa224940,14,
-0xa224980,4,
-0xa226000,117,
-0xa2261e4,2,
-0xa2261f0,3,
-0xa226200,27,
-0xa226280,4,
-0xa2262c0,25,
-0xa226340,6,
-0xa226360,2,
-0xa22636c,3,
-0xa226384,8,
-0xa226400,1,
-0xa226500,4,
-0xa226580,18,
-0xa226600,4,
-0xa226680,18,
-0xa226700,4,
-0xa226780,18,
-0xa226800,4,
-0xa226880,18,
-0xa226900,4,
-0xa226940,14,
-0xa226980,4,
-0xa228000,117,
-0xa2281e4,2,
-0xa2281f0,3,
-0xa228200,27,
-0xa228280,4,
-0xa2282c0,25,
-0xa228340,6,
-0xa228360,2,
-0xa22836c,3,
-0xa228384,8,
-0xa228400,1,
-0xa228500,4,
-0xa228580,18,
-0xa228600,4,
-0xa228680,18,
-0xa228700,4,
-0xa228780,18,
-0xa228800,4,
-0xa228880,18,
-0xa228900,4,
-0xa228940,14,
-0xa228980,4,
-0xa230004,1,
-0xa23007c,69,
-0xa230200,2,
-0xa230224,1,
-0xa230234,4,
-0xa230260,1,
-0xa230268,4,
-0xa230280,6,
-0xa2302a0,1,
-0xa2302c0,2,
-0xa2302cc,2,
-0xa2302e0,11,
-0xa230320,3,
-0xa230330,3,
-0xa230340,7,
-0xa230380,1,
-0xa2303a0,1,
-0xa2303b0,4,
-0xa230400,3,
-0xa230420,3,
-0xa230430,3,
-0xa230440,7,
-0xa230484,1,
-0xa230498,10,
-0xa230500,20,
-0xa230600,27,
-0xa230680,4,
-0xa2306c0,25,
-0xa230740,6,
-0xa230760,2,
-0xa23076c,3,
-0xa230780,8,
-0xa2307a4,9,
-0xa230800,2,
-0xa230820,13,
-0xa230900,2,
-0xa23090c,2,
-0xa230920,2,
-0xa23092c,2,
-0xa230940,6,
-0xa230984,1,
-0xa23099c,9,
-0xa231004,1,
-0xa231018,15,
-0xa231060,3,
-0xa231070,6,
-0xa232004,1,
-0xa232014,32,
-0xa232400,3,
-0xa232444,1,
-0xa232450,14,
-0xa2324a0,6,
-0xa2324c0,3,
-0xa232800,36,
-0xa232900,4,
-0xa232a00,27,
-0xa232a80,9,
-0xa232ac0,6,
-0xa232ae0,4,
-0xa232b04,4,
-0xa232c00,3,
-0xa238000,10,
-0xa238104,1,
-0xa238140,16,
-0xa238184,1,
-0xa238190,6,
-0xa238204,1,
-0xa23823c,19,
-0xa238400,10,
-0xa238504,1,
-0xa238540,16,
-0xa238584,1,
-0xa238590,6,
-0xa238604,1,
-0xa23863c,19,
-0xa238800,10,
-0xa238904,1,
-0xa238940,16,
-0xa238984,1,
-0xa238990,6,
-0xa238a04,1,
-0xa238a3c,19,
-0xa238c00,10,
-0xa238d04,1,
-0xa238d40,16,
-0xa238d84,1,
-0xa238d90,6,
-0xa238e04,1,
-0xa238e3c,19,
-0xa239000,2,
-0xa239040,3,
-0xa239050,3,
-0xa239060,1,
-0xa239080,5,
-0xa2390a0,5,
-0xa2390c0,3,
-0xa2390d0,3,
-0xa239100,3,
-0xa239110,3,
-0xa239120,1,
-0xa239200,4,
-0xa239280,18,
-0xa239300,4,
-0xa239380,19,
-0xa239400,4,
-0xa239480,18,
-0xa239500,4,
-0xa239580,18,
-0xa239600,4,
-0xa239640,15,
-0xa239700,4,
-0xa239780,18,
-0xa239800,4,
-0xa239a00,27,
-0xa239a80,4,
-0xa239ac0,25,
-0xa239b40,6,
-0xa239b60,2,
-0xa239b6c,3,
-0xa239b84,8,
-0xa239c00,10,
-0xa23a000,3,
-0xa23a010,4,
-0xa23a080,28,
-0xa23a100,1,
-0xa240000,2,
-0xa24000c,1,
-0xa240014,1,
-0xa24001c,5,
-0xa240044,1,
-0xa240080,4,
-0xa2400a0,6,
-0xa2400c0,4,
-0xa2400e0,6,
-0xa240100,4,
-0xa240200,4,
-0xa240280,24,
-0xa240300,4,
-0xa240380,24,
-0xa240400,4,
-0xa240420,20,
-0xa240480,4,
-0xa2404a0,5,
-0xa2404c0,4,
-0xa2404e0,5,
-0xa240500,4,
-0xa240540,4,
-0xa240560,6,
-0xa240580,4,
-0xa2405a0,6,
-0xa2405c0,4,
-0xa241000,2,
-0xa24100c,1,
-0xa241014,1,
-0xa24101c,1,
-0xa241024,1,
-0xa24102c,1,
-0xa241034,1,
-0xa24103c,1,
-0xa241044,1,
-0xa24104c,1,
-0xa241054,1,
-0xa24105c,1,
-0xa241064,1,
-0xa24106c,1,
-0xa241074,1,
-0xa24107c,1,
-0xa241084,1,
-0xa24108c,1,
-0xa241094,1,
-0xa244020,12,
-0xa244800,36,
-0xa244900,2,
-0xa24490c,1,
-0xa244914,1,
-0xa24491c,1,
-0xa244924,1,
-0xa24492c,1,
-0xa244934,1,
-0xa24493c,1,
-0xa244944,1,
-0xa24494c,1,
-0xa244954,1,
-0xa244964,1,
-0xa24496c,1,
-0xa244974,1,
-0xa24497c,1,
-0xa244984,1,
-0xa24498c,1,
-0xa244994,1,
-0xa24499c,1,
-0xa2449a4,1,
-0xa245000,2,
-0xa24500c,1,
-0xa245200,27,
-0xa245280,4,
-0xa2452c0,25,
-0xa245340,6,
-0xa245360,2,
-0xa24536c,3,
-0xa245384,10,
-0xa245400,2,
-0xa245440,12,
-0xa245800,5,
-0xa400004,1,
-0xa40000c,1,
-0xa400014,1,
-0xa40001c,1,
-0xa400024,1,
-0xa40002c,1,
-0xa400034,1,
-0xa40003c,1,
-0xa400044,1,
-0xa400064,3,
-0xa400074,1,
-0xa40007c,1,
-0xa400084,1,
-0xa400404,1,
-0xa40040c,1,
-0xa400414,1,
-0xa40041c,1,
-0xa400424,1,
-0xa400480,2,
-0xa400504,1,
-0xa40050c,1,
-0xa400514,1,
-0xa40051c,1,
-0xa400524,1,
-0xa40052c,1,
-0xa400534,1,
-0xa40053c,1,
-0xa400544,1,
-0xa400604,1,
-0xa40060c,1,
-0xa400614,1,
-0xa40061c,1,
-0xa400624,1,
-0xa40062c,1,
-0xa400634,1,
-0xa40063c,1,
-0xa400704,1,
-0xa40070c,1,
-0xa400800,4,
-0xa400820,4,
-0xa400834,1,
-0xa400840,11,
-0xa400880,2,
-0xa4008a4,1,
-0xa4008ac,1,
-0xa4008b4,3,
-0xa401000,18,
-0xa401100,18,
-0xa401200,18,
-0xa401300,9,
-0xa401400,27,
-0xa401480,4,
-0xa4014c0,25,
-0xa401540,6,
-0xa401560,2,
-0xa40156c,3,
-0xa401584,2,
-0xa401800,2,
-0xa401a00,3,
-0xa401a10,3,
-0xa401a20,3,
-0xa401a30,3,
-0xa401a40,3,
-0xa401a50,3,
-0xa401a60,3,
-0xa401a70,3,
-0xa401a80,3,
-0xa401a90,3,
-0xa401aa0,3,
-0xa401ab0,3,
-0xa401ac0,3,
-0xa401ad0,3,
-0xa401ae0,3,
-0xa401af0,3,
-0xa401b00,1,
-0xa401c00,10,
-0xa5d0000,2,
-0xa5d000c,1,
-0xa5d0014,1,
-0xa5d001c,5,
-0xa5d0044,1,
-0xa5d0080,4,
-0xa5d00a0,6,
-0xa5d00c0,4,
-0xa5d00e0,6,
-0xa5d0100,4,
-0xa5d0200,4,
-0xa5d0280,24,
-0xa5d0300,4,
-0xa5d0380,24,
-0xa5d0400,4,
-0xa5d0420,20,
-0xa5d0480,4,
-0xa5d04a0,5,
-0xa5d04c0,4,
-0xa5d04e0,5,
-0xa5d0500,4,
-0xa5d0540,4,
-0xa5d0560,6,
-0xa5d0580,4,
-0xa5d05a0,6,
-0xa5d05c0,4,
-0xa5d1000,2,
-0xa5d100c,1,
-0xa5d1014,1,
-0xa5d101c,1,
-0xa5d1024,1,
-0xa5d102c,1,
-0xa5d1034,1,
-0xa5d103c,1,
-0xa5d1044,1,
-0xa5d104c,1,
-0xa5d1054,1,
-0xa5d105c,1,
-0xa5d1064,1,
-0xa5d106c,1,
-0xa5d1074,1,
-0xa5d107c,1,
-0xa5d1084,1,
-0xa5d108c,1,
-0xa5d1094,1,
-0xa5d3000,2,
-0xa5d300c,1,
-0xa5d3014,1,
-0xa5d301c,1,
-0xa5d3024,1,
-0xa5d302c,1,
-0xa5d3034,1,
-0xa5d303c,1,
-0xa5d3044,1,
-0xa5d304c,1,
-0xa5d3054,1,
-0xa5d305c,1,
-0xa5d3064,1,
-0xa5d306c,1,
-0xa5d3074,1,
-0xa5d307c,1,
-0xa5d3084,1,
-0xa5d308c,1,
-0xa5d3094,1,
-0xa5d309c,1,
-0xa5d30a4,1,
-0xa5d30ac,1,
-0xa5d30b4,1,
-0xa5d30bc,1,
-0xa5d30c4,1,
-0xa5d30cc,1,
-0xa5d30d4,1,
-0xa5d30dc,1,
-0xa5d30e4,1,
-0xa5d30ec,1,
-0xa5d30f4,1,
-0xa5d30fc,1,
-0xa5d3104,1,
-0xa5d310c,1,
-0xa5d3114,1,
-0xa5d311c,1,
-0xa5d3124,1,
-0xa5d312c,1,
-0xa5d3134,1,
-0xa5d313c,1,
-0xa5d3144,1,
-0xa5d314c,1,
-0xa5d3154,1,
-0xa5d315c,1,
-0xa5d3164,1,
-0xa5d316c,1,
-0xa5d3174,1,
-0xa5d317c,1,
-0xa5d3184,1,
-0xa5d318c,1,
-0xa5d3194,1,
-0xa5d319c,1,
-0xa5d31a4,1,
-0xa5d31ac,1,
-0xa5d31b4,1,
-0xa5d31bc,1,
-0xa5d31c4,1,
-0xa5d31cc,1,
-0xa5d31d4,1,
-0xa5d31dc,1,
-0xa5d31e4,1,
-0xa5d31ec,1,
-0xa5d31f4,1,
-0xa5d31fc,1,
-0xa5d3204,1,
-0xa5d320c,1,
-0xa5d3214,1,
-0xa5d321c,1,
-0xa5d3224,1,
-0xa5d322c,1,
-0xa5d3234,1,
-0xa5d323c,1,
-0xa5d3244,1,
-0xa5d324c,1,
-0xa5d3254,1,
-0xa5d325c,1,
-0xa5d3264,1,
-0xa5d326c,1,
-0xa5d3274,1,
-0xa5d327c,1,
-0xa5d3284,1,
-0xa5d328c,1,
-0xa5d3294,1,
-0xa5d329c,1,
-0xa5d32a4,1,
-0xa5d32ac,1,
-0xa5d32b4,1,
-0xa5d32bc,1,
-0xa5d32c4,1,
-0xa5d32cc,1,
-0xa5d32d4,1,
-0xa5d32dc,1,
-0xa5d32e4,1,
-0xa5d32ec,1,
-0xa5d32f4,1,
-0xa5d32fc,1,
-0xa5d3304,1,
-0xa5d330c,1,
-0xa5d3314,1,
-0xa5d331c,1,
-0xa5d3324,1,
-0xa5d332c,1,
-0xa5d3334,1,
-0xa5d333c,1,
-0xa5d3344,1,
-0xa5d334c,1,
-0xa5d3354,1,
-0xa5d335c,1,
-0xa5d3364,1,
-0xa5d336c,1,
-0xa5d3374,1,
-0xa5d337c,1,
-0xa5d3384,1,
-0xa5d338c,1,
-0xa5d3394,1,
-0xa5d339c,1,
-0xa5d33a4,1,
-0xa5d33ac,1,
-0xa5d33b4,1,
-0xa5d33bc,1,
-0xa5d33c4,1,
-0xa5d33cc,1,
-0xa5d33d4,1,
-0xa5d33dc,1,
-0xa5d33e4,1,
-0xa5d33ec,1,
-0xa5d33f4,1,
-0xa5d33fc,1,
-0xa5d3404,1,
-0xa5d3800,52,
-0xa5d38e0,8,
-0xa5d4800,36,
-0xa5d4900,2,
-0xa5d490c,1,
-0xa5d4914,1,
-0xa5d491c,1,
-0xa5d4924,1,
-0xa5d492c,1,
-0xa5d4934,1,
-0xa5d493c,1,
-0xa5d4944,1,
-0xa5d494c,1,
-0xa5d4954,1,
-0xa5d4964,1,
-0xa5d496c,1,
-0xa5d4974,1,
-0xa5d497c,1,
-0xa5d4984,1,
-0xa5d498c,1,
-0xa5d4994,1,
-0xa5d499c,1,
-0xa5d49a4,1,
-0xa5d5000,2,
-0xa5d500c,1,
-0xa5d5200,27,
-0xa5d5280,4,
-0xa5d52c0,25,
-0xa5d5340,6,
-0xa5d5360,2,
-0xa5d536c,3,
-0xa5d5384,10,
-0xa5d5400,2,
-0xa5d5440,12,
-0xa5d8000,2,
-0xa5d800c,1,
-0xa5d8014,1,
-0xa5d801c,5,
-0xa5d8044,1,
-0xa5d8080,4,
-0xa5d80a0,6,
-0xa5d80c0,4,
-0xa5d80e0,6,
-0xa5d8100,4,
-0xa5d8200,4,
-0xa5d8280,24,
-0xa5d8300,4,
-0xa5d8380,24,
-0xa5d8400,4,
-0xa5d8420,20,
-0xa5d8480,4,
-0xa5d84a0,5,
-0xa5d84c0,4,
-0xa5d84e0,5,
-0xa5d8500,4,
-0xa5d8540,4,
-0xa5d8560,6,
-0xa5d8580,4,
-0xa5d85a0,6,
-0xa5d85c0,4,
-0xa5d9000,2,
-0xa5d900c,1,
-0xa5d9014,1,
-0xa5d901c,1,
-0xa5d9024,1,
-0xa5d902c,1,
-0xa5d9034,1,
-0xa5d903c,1,
-0xa5d9044,1,
-0xa5d904c,1,
-0xa5d9054,1,
-0xa5d905c,1,
-0xa5d9064,1,
-0xa5d906c,1,
-0xa5d9074,1,
-0xa5d907c,1,
-0xa5d9084,1,
-0xa5d908c,1,
-0xa5d9094,1,
-0xa5d9800,2,
-0xa5d980c,1,
-0xa5d9814,1,
-0xa5d981c,1,
-0xa5d9824,1,
-0xa5d982c,1,
-0xa5d9834,1,
-0xa5d983c,1,
-0xa5d9844,1,
-0xa5d984c,1,
-0xa5d9854,1,
-0xa5d985c,1,
-0xa5d9864,1,
-0xa5d986c,1,
-0xa5d9874,1,
-0xa5d987c,1,
-0xa5d9884,1,
-0xa5d988c,1,
-0xa5d9894,1,
-0xa5dd000,2,
-0xa5dd00c,1,
-0xa5dd200,27,
-0xa5dd280,4,
-0xa5dd2c0,25,
-0xa5dd340,6,
-0xa5dd360,2,
-0xa5dd36c,3,
-0xa5dd384,5,
-0xa5dd400,2,
-0xa5dd440,12,
-0xa5df800,62,
-0xa5df8fc,5,
-0xa600004,1,
-0xa60000c,1,
-0xa600014,1,
-0xa60001c,1,
-0xa600024,1,
-0xa60002c,1,
-0xa600034,1,
-0xa60003c,1,
-0xa600044,1,
-0xa600064,3,
-0xa600074,1,
-0xa60007c,1,
-0xa600084,1,
-0xa600404,1,
-0xa60040c,1,
-0xa600414,1,
-0xa60041c,1,
-0xa600424,1,
-0xa600480,2,
-0xa600504,1,
-0xa60050c,1,
-0xa600514,1,
-0xa60051c,1,
-0xa600524,1,
-0xa60052c,1,
-0xa600534,1,
-0xa60053c,1,
-0xa600544,1,
-0xa600604,1,
-0xa60060c,1,
-0xa600614,1,
-0xa60061c,1,
-0xa600624,1,
-0xa60062c,1,
-0xa600634,1,
-0xa60063c,1,
-0xa600704,1,
-0xa60070c,1,
-0xa600800,4,
-0xa600820,4,
-0xa600834,1,
-0xa600840,11,
-0xa600880,2,
-0xa6008a4,1,
-0xa6008ac,1,
-0xa6008b4,3,
-0xa601000,18,
-0xa601100,18,
-0xa601200,18,
-0xa601300,9,
-0xa601400,27,
-0xa601480,4,
-0xa6014c0,25,
-0xa601540,6,
-0xa601560,2,
-0xa60156c,3,
-0xa601584,2,
-0xa601800,2,
-0xa601a00,3,
-0xa601a10,3,
-0xa601a20,3,
-0xa601a30,3,
-0xa601a40,3,
-0xa601a50,3,
-0xa601a60,3,
-0xa601a70,3,
-0xa601a80,3,
-0xa601a90,3,
-0xa601aa0,3,
-0xa601ab0,3,
-0xa601ac0,3,
-0xa601ad0,3,
-0xa601ae0,3,
-0xa601af0,3,
-0xa601b00,1,
-0xa601c00,10,
-0xa7d0000,2,
-0xa7d000c,1,
-0xa7d0014,1,
-0xa7d001c,5,
-0xa7d0044,1,
-0xa7d0080,4,
-0xa7d00a0,6,
-0xa7d00c0,4,
-0xa7d00e0,6,
-0xa7d0100,4,
-0xa7d0200,4,
-0xa7d0280,24,
-0xa7d0300,4,
-0xa7d0380,24,
-0xa7d0400,4,
-0xa7d0420,20,
-0xa7d0480,4,
-0xa7d04a0,5,
-0xa7d04c0,4,
-0xa7d04e0,5,
-0xa7d0500,4,
-0xa7d0540,4,
-0xa7d0560,6,
-0xa7d0580,4,
-0xa7d05a0,6,
-0xa7d05c0,4,
-0xa7d1000,2,
-0xa7d100c,1,
-0xa7d1014,1,
-0xa7d101c,1,
-0xa7d1024,1,
-0xa7d102c,1,
-0xa7d1034,1,
-0xa7d103c,1,
-0xa7d1044,1,
-0xa7d104c,1,
-0xa7d1054,1,
-0xa7d105c,1,
-0xa7d1064,1,
-0xa7d106c,1,
-0xa7d1074,1,
-0xa7d107c,1,
-0xa7d1084,1,
-0xa7d108c,1,
-0xa7d1094,1,
-0xa7d3000,2,
-0xa7d300c,1,
-0xa7d3014,1,
-0xa7d301c,1,
-0xa7d3024,1,
-0xa7d302c,1,
-0xa7d3034,1,
-0xa7d303c,1,
-0xa7d3044,1,
-0xa7d304c,1,
-0xa7d3054,1,
-0xa7d305c,1,
-0xa7d3064,1,
-0xa7d306c,1,
-0xa7d3074,1,
-0xa7d307c,1,
-0xa7d3084,1,
-0xa7d308c,1,
-0xa7d3094,1,
-0xa7d309c,1,
-0xa7d30a4,1,
-0xa7d30ac,1,
-0xa7d30b4,1,
-0xa7d30bc,1,
-0xa7d30c4,1,
-0xa7d30cc,1,
-0xa7d30d4,1,
-0xa7d30dc,1,
-0xa7d30e4,1,
-0xa7d30ec,1,
-0xa7d30f4,1,
-0xa7d30fc,1,
-0xa7d3104,1,
-0xa7d310c,1,
-0xa7d3114,1,
-0xa7d311c,1,
-0xa7d3124,1,
-0xa7d312c,1,
-0xa7d3134,1,
-0xa7d313c,1,
-0xa7d3144,1,
-0xa7d314c,1,
-0xa7d3154,1,
-0xa7d315c,1,
-0xa7d3164,1,
-0xa7d316c,1,
-0xa7d3174,1,
-0xa7d317c,1,
-0xa7d3184,1,
-0xa7d318c,1,
-0xa7d3194,1,
-0xa7d319c,1,
-0xa7d31a4,1,
-0xa7d31ac,1,
-0xa7d31b4,1,
-0xa7d31bc,1,
-0xa7d31c4,1,
-0xa7d31cc,1,
-0xa7d31d4,1,
-0xa7d31dc,1,
-0xa7d31e4,1,
-0xa7d31ec,1,
-0xa7d31f4,1,
-0xa7d31fc,1,
-0xa7d3204,1,
-0xa7d320c,1,
-0xa7d3214,1,
-0xa7d321c,1,
-0xa7d3224,1,
-0xa7d322c,1,
-0xa7d3234,1,
-0xa7d323c,1,
-0xa7d3244,1,
-0xa7d324c,1,
-0xa7d3254,1,
-0xa7d325c,1,
-0xa7d3264,1,
-0xa7d326c,1,
-0xa7d3274,1,
-0xa7d327c,1,
-0xa7d3284,1,
-0xa7d328c,1,
-0xa7d3294,1,
-0xa7d329c,1,
-0xa7d32a4,1,
-0xa7d32ac,1,
-0xa7d32b4,1,
-0xa7d32bc,1,
-0xa7d32c4,1,
-0xa7d32cc,1,
-0xa7d32d4,1,
-0xa7d32dc,1,
-0xa7d32e4,1,
-0xa7d32ec,1,
-0xa7d32f4,1,
-0xa7d32fc,1,
-0xa7d3304,1,
-0xa7d330c,1,
-0xa7d3314,1,
-0xa7d331c,1,
-0xa7d3324,1,
-0xa7d332c,1,
-0xa7d3334,1,
-0xa7d333c,1,
-0xa7d3344,1,
-0xa7d334c,1,
-0xa7d3354,1,
-0xa7d335c,1,
-0xa7d3364,1,
-0xa7d336c,1,
-0xa7d3374,1,
-0xa7d337c,1,
-0xa7d3384,1,
-0xa7d338c,1,
-0xa7d3394,1,
-0xa7d339c,1,
-0xa7d33a4,1,
-0xa7d33ac,1,
-0xa7d33b4,1,
-0xa7d33bc,1,
-0xa7d33c4,1,
-0xa7d33cc,1,
-0xa7d33d4,1,
-0xa7d33dc,1,
-0xa7d33e4,1,
-0xa7d33ec,1,
-0xa7d33f4,1,
-0xa7d33fc,1,
-0xa7d3404,1,
-0xa7d3800,52,
-0xa7d38e0,8,
-0xa7d4800,36,
-0xa7d4900,2,
-0xa7d490c,1,
-0xa7d4914,1,
-0xa7d491c,1,
-0xa7d4924,1,
-0xa7d492c,1,
-0xa7d4934,1,
-0xa7d493c,1,
-0xa7d4944,1,
-0xa7d494c,1,
-0xa7d4954,1,
-0xa7d4964,1,
-0xa7d496c,1,
-0xa7d4974,1,
-0xa7d497c,1,
-0xa7d4984,1,
-0xa7d498c,1,
-0xa7d4994,1,
-0xa7d499c,1,
-0xa7d49a4,1,
-0xa7d5000,2,
-0xa7d500c,1,
-0xa7d5200,27,
-0xa7d5280,4,
-0xa7d52c0,25,
-0xa7d5340,6,
-0xa7d5360,2,
-0xa7d536c,3,
-0xa7d5384,10,
-0xa7d5400,2,
-0xa7d5440,12,
-0xa7d8000,2,
-0xa7d800c,1,
-0xa7d8014,1,
-0xa7d801c,5,
-0xa7d8044,1,
-0xa7d8080,4,
-0xa7d80a0,6,
-0xa7d80c0,4,
-0xa7d80e0,6,
-0xa7d8100,4,
-0xa7d8200,4,
-0xa7d8280,24,
-0xa7d8300,4,
-0xa7d8380,24,
-0xa7d8400,4,
-0xa7d8420,20,
-0xa7d8480,4,
-0xa7d84a0,5,
-0xa7d84c0,4,
-0xa7d84e0,5,
-0xa7d8500,4,
-0xa7d8540,4,
-0xa7d8560,6,
-0xa7d8580,4,
-0xa7d85a0,6,
-0xa7d85c0,4,
-0xa7d9000,2,
-0xa7d900c,1,
-0xa7d9014,1,
-0xa7d901c,1,
-0xa7d9024,1,
-0xa7d902c,1,
-0xa7d9034,1,
-0xa7d903c,1,
-0xa7d9044,1,
-0xa7d904c,1,
-0xa7d9054,1,
-0xa7d905c,1,
-0xa7d9064,1,
-0xa7d906c,1,
-0xa7d9074,1,
-0xa7d907c,1,
-0xa7d9084,1,
-0xa7d908c,1,
-0xa7d9094,1,
-0xa7d9800,2,
-0xa7d980c,1,
-0xa7d9814,1,
-0xa7d981c,1,
-0xa7d9824,1,
-0xa7d982c,1,
-0xa7d9834,1,
-0xa7d983c,1,
-0xa7d9844,1,
-0xa7d984c,1,
-0xa7d9854,1,
-0xa7d985c,1,
-0xa7d9864,1,
-0xa7d986c,1,
-0xa7d9874,1,
-0xa7d987c,1,
-0xa7d9884,1,
-0xa7d988c,1,
-0xa7d9894,1,
-0xa7dd000,2,
-0xa7dd00c,1,
-0xa7dd200,27,
-0xa7dd280,4,
-0xa7dd2c0,25,
-0xa7dd340,6,
-0xa7dd360,2,
-0xa7dd36c,3,
-0xa7dd384,5,
-0xa7dd400,2,
-0xa7dd440,12,
-0xa7df800,62,
-0xa7df8fc,5,
-0xa800004,1,
-0xa80000c,1,
-0xa800014,1,
-0xa80001c,1,
-0xa800024,1,
-0xa80002c,1,
-0xa800034,1,
-0xa80003c,1,
-0xa800044,1,
-0xa800064,3,
-0xa800074,1,
-0xa80007c,1,
-0xa800084,1,
-0xa800404,1,
-0xa80040c,1,
-0xa800414,1,
-0xa80041c,1,
-0xa800424,1,
-0xa800480,2,
-0xa800504,1,
-0xa80050c,1,
-0xa800514,1,
-0xa80051c,1,
-0xa800524,1,
-0xa80052c,1,
-0xa800534,1,
-0xa80053c,1,
-0xa800544,1,
-0xa800604,1,
-0xa80060c,1,
-0xa800614,1,
-0xa80061c,1,
-0xa800624,1,
-0xa80062c,1,
-0xa800634,1,
-0xa80063c,1,
-0xa800704,1,
-0xa80070c,1,
-0xa800800,4,
-0xa800820,4,
-0xa800834,1,
-0xa800840,11,
-0xa800880,2,
-0xa8008a4,1,
-0xa8008ac,1,
-0xa8008b4,3,
-0xa801000,18,
-0xa801100,18,
-0xa801200,18,
-0xa801300,9,
-0xa801400,27,
-0xa801480,4,
-0xa8014c0,25,
-0xa801540,6,
-0xa801560,2,
-0xa80156c,3,
-0xa801584,2,
-0xa801800,2,
-0xa801a00,3,
-0xa801a10,3,
-0xa801a20,3,
-0xa801a30,3,
-0xa801a40,3,
-0xa801a50,3,
-0xa801a60,3,
-0xa801a70,3,
-0xa801a80,3,
-0xa801a90,3,
-0xa801aa0,3,
-0xa801ab0,3,
-0xa801ac0,3,
-0xa801ad0,3,
-0xa801ae0,3,
-0xa801af0,3,
-0xa801b00,1,
-0xa801c00,10,
-0xa9d0000,2,
-0xa9d000c,1,
-0xa9d0014,1,
-0xa9d001c,5,
-0xa9d0044,1,
-0xa9d0080,4,
-0xa9d00a0,6,
-0xa9d00c0,4,
-0xa9d00e0,6,
-0xa9d0100,4,
-0xa9d0200,4,
-0xa9d0280,24,
-0xa9d0300,4,
-0xa9d0380,24,
-0xa9d0400,4,
-0xa9d0420,20,
-0xa9d0480,4,
-0xa9d04a0,5,
-0xa9d04c0,4,
-0xa9d04e0,5,
-0xa9d0500,4,
-0xa9d0540,4,
-0xa9d0560,6,
-0xa9d0580,4,
-0xa9d05a0,6,
-0xa9d05c0,4,
-0xa9d1000,2,
-0xa9d100c,1,
-0xa9d1014,1,
-0xa9d101c,1,
-0xa9d1024,1,
-0xa9d102c,1,
-0xa9d1034,1,
-0xa9d103c,1,
-0xa9d1044,1,
-0xa9d104c,1,
-0xa9d1054,1,
-0xa9d105c,1,
-0xa9d1064,1,
-0xa9d106c,1,
-0xa9d1074,1,
-0xa9d107c,1,
-0xa9d1084,1,
-0xa9d108c,1,
-0xa9d1094,1,
-0xa9d3000,2,
-0xa9d300c,1,
-0xa9d3014,1,
-0xa9d301c,1,
-0xa9d3024,1,
-0xa9d302c,1,
-0xa9d3034,1,
-0xa9d303c,1,
-0xa9d3044,1,
-0xa9d304c,1,
-0xa9d3054,1,
-0xa9d305c,1,
-0xa9d3064,1,
-0xa9d306c,1,
-0xa9d3074,1,
-0xa9d307c,1,
-0xa9d3084,1,
-0xa9d308c,1,
-0xa9d3094,1,
-0xa9d309c,1,
-0xa9d30a4,1,
-0xa9d30ac,1,
-0xa9d30b4,1,
-0xa9d30bc,1,
-0xa9d30c4,1,
-0xa9d30cc,1,
-0xa9d30d4,1,
-0xa9d30dc,1,
-0xa9d30e4,1,
-0xa9d30ec,1,
-0xa9d30f4,1,
-0xa9d30fc,1,
-0xa9d3104,1,
-0xa9d310c,1,
-0xa9d3114,1,
-0xa9d311c,1,
-0xa9d3124,1,
-0xa9d312c,1,
-0xa9d3134,1,
-0xa9d313c,1,
-0xa9d3144,1,
-0xa9d314c,1,
-0xa9d3154,1,
-0xa9d315c,1,
-0xa9d3164,1,
-0xa9d316c,1,
-0xa9d3174,1,
-0xa9d317c,1,
-0xa9d3184,1,
-0xa9d318c,1,
-0xa9d3194,1,
-0xa9d319c,1,
-0xa9d31a4,1,
-0xa9d31ac,1,
-0xa9d31b4,1,
-0xa9d31bc,1,
-0xa9d31c4,1,
-0xa9d31cc,1,
-0xa9d31d4,1,
-0xa9d31dc,1,
-0xa9d31e4,1,
-0xa9d31ec,1,
-0xa9d31f4,1,
-0xa9d31fc,1,
-0xa9d3204,1,
-0xa9d320c,1,
-0xa9d3214,1,
-0xa9d321c,1,
-0xa9d3224,1,
-0xa9d322c,1,
-0xa9d3234,1,
-0xa9d323c,1,
-0xa9d3244,1,
-0xa9d324c,1,
-0xa9d3254,1,
-0xa9d325c,1,
-0xa9d3264,1,
-0xa9d326c,1,
-0xa9d3274,1,
-0xa9d327c,1,
-0xa9d3284,1,
-0xa9d328c,1,
-0xa9d3294,1,
-0xa9d329c,1,
-0xa9d32a4,1,
-0xa9d32ac,1,
-0xa9d32b4,1,
-0xa9d32bc,1,
-0xa9d32c4,1,
-0xa9d32cc,1,
-0xa9d32d4,1,
-0xa9d32dc,1,
-0xa9d32e4,1,
-0xa9d32ec,1,
-0xa9d32f4,1,
-0xa9d32fc,1,
-0xa9d3304,1,
-0xa9d330c,1,
-0xa9d3314,1,
-0xa9d331c,1,
-0xa9d3324,1,
-0xa9d332c,1,
-0xa9d3334,1,
-0xa9d333c,1,
-0xa9d3344,1,
-0xa9d334c,1,
-0xa9d3354,1,
-0xa9d335c,1,
-0xa9d3364,1,
-0xa9d336c,1,
-0xa9d3374,1,
-0xa9d337c,1,
-0xa9d3384,1,
-0xa9d338c,1,
-0xa9d3394,1,
-0xa9d339c,1,
-0xa9d33a4,1,
-0xa9d33ac,1,
-0xa9d33b4,1,
-0xa9d33bc,1,
-0xa9d33c4,1,
-0xa9d33cc,1,
-0xa9d33d4,1,
-0xa9d33dc,1,
-0xa9d33e4,1,
-0xa9d33ec,1,
-0xa9d33f4,1,
-0xa9d33fc,1,
-0xa9d3404,1,
-0xa9d3800,52,
-0xa9d38e0,8,
-0xa9d4800,36,
-0xa9d4900,2,
-0xa9d490c,1,
-0xa9d4914,1,
-0xa9d491c,1,
-0xa9d4924,1,
-0xa9d492c,1,
-0xa9d4934,1,
-0xa9d493c,1,
-0xa9d4944,1,
-0xa9d494c,1,
-0xa9d4954,1,
-0xa9d4964,1,
-0xa9d496c,1,
-0xa9d4974,1,
-0xa9d497c,1,
-0xa9d4984,1,
-0xa9d498c,1,
-0xa9d4994,1,
-0xa9d499c,1,
-0xa9d49a4,1,
-0xa9d5000,2,
-0xa9d500c,1,
-0xa9d5200,27,
-0xa9d5280,4,
-0xa9d52c0,25,
-0xa9d5340,6,
-0xa9d5360,2,
-0xa9d536c,3,
-0xa9d5384,10,
-0xa9d5400,2,
-0xa9d5440,12,
-0xa9d8000,2,
-0xa9d800c,1,
-0xa9d8014,1,
-0xa9d801c,5,
-0xa9d8044,1,
-0xa9d8080,4,
-0xa9d80a0,6,
-0xa9d80c0,4,
-0xa9d80e0,6,
-0xa9d8100,4,
-0xa9d8200,4,
-0xa9d8280,24,
-0xa9d8300,4,
-0xa9d8380,24,
-0xa9d8400,4,
-0xa9d8420,20,
-0xa9d8480,4,
-0xa9d84a0,5,
-0xa9d84c0,4,
-0xa9d84e0,5,
-0xa9d8500,4,
-0xa9d8540,4,
-0xa9d8560,6,
-0xa9d8580,4,
-0xa9d85a0,6,
-0xa9d85c0,4,
-0xa9d9000,2,
-0xa9d900c,1,
-0xa9d9014,1,
-0xa9d901c,1,
-0xa9d9024,1,
-0xa9d902c,1,
-0xa9d9034,1,
-0xa9d903c,1,
-0xa9d9044,1,
-0xa9d904c,1,
-0xa9d9054,1,
-0xa9d905c,1,
-0xa9d9064,1,
-0xa9d906c,1,
-0xa9d9074,1,
-0xa9d907c,1,
-0xa9d9084,1,
-0xa9d908c,1,
-0xa9d9094,1,
-0xa9d9800,2,
-0xa9d980c,1,
-0xa9d9814,1,
-0xa9d981c,1,
-0xa9d9824,1,
-0xa9d982c,1,
-0xa9d9834,1,
-0xa9d983c,1,
-0xa9d9844,1,
-0xa9d984c,1,
-0xa9d9854,1,
-0xa9d985c,1,
-0xa9d9864,1,
-0xa9d986c,1,
-0xa9d9874,1,
-0xa9d987c,1,
-0xa9d9884,1,
-0xa9d988c,1,
-0xa9d9894,1,
-0xa9dd000,2,
-0xa9dd00c,1,
-0xa9dd200,27,
-0xa9dd280,4,
-0xa9dd2c0,25,
-0xa9dd340,6,
-0xa9dd360,2,
-0xa9dd36c,3,
-0xa9dd384,5,
-0xa9dd400,2,
-0xa9dd440,12,
-0xa9df800,62,
-0xa9df8fc,5,
-0xae00000,9,
-0xae00040,9,
-0xae00080,10,
-0xae01004,1,
-0xae0100c,5,
-0xae01024,1,
-0xae0102c,5,
-0xae01044,1,
-0xae0104c,5,
-0xae01064,1,
-0xae0106c,5,
-0xae01084,1,
-0xae0108c,5,
-0xae010a4,1,
-0xae010ac,5,
-0xae010c4,1,
-0xae010cc,5,
-0xae010e4,1,
-0xae010ec,5,
-0xae01400,3,
-0xae01410,3,
-0xae01420,3,
-0xae01430,3,
-0xae01440,3,
-0xae01450,3,
-0xae01460,3,
-0xae01470,3,
-0xae01480,3,
-0xae01490,3,
-0xae014a0,3,
-0xae014b0,3,
-0xae014c0,3,
-0xae014d0,3,
-0xae014e0,3,
-0xae014f0,3,
-0xae01500,17,
-0xae01560,5,
-0xae01580,5,
-0xae015a0,5,
-0xae015c0,5,
-0xae015e0,5,
-0xae01600,5,
-0xae01620,5,
-0xae01640,5,
-0xae01660,2,
-0xae01800,5,
-0xae01820,7,
-0xae01a00,5,
-0xae01a20,1,
-0xae01a28,3,
-0xae01a80,5,
-0xae01aa0,5,
-0xae01ac0,1,
-0xae01b00,5,
-0xae01b40,4,
-0xae01b60,5,
-0xae01b80,6,
-0xae01c00,2,
-0xae02000,3,
-0xae02010,3,
-0xae02040,9,
-0xae02080,11,
-0xae020c0,3,
-0xae02104,1,
-0xae02200,22,
-0xae02280,22,
-0xae02300,1,
-0xae02400,4,
-0xae02480,22,
-0xae02500,36,
-0xae02600,27,
-0xae02680,4,
-0xae026c0,25,
-0xae02740,6,
-0xae02760,2,
-0xae0276c,3,
-0xae02784,3,
-0xae02800,3,
-0xae04000,7,
-0xae04200,27,
-0xae04280,4,
-0xae042c0,25,
-0xae04340,6,
-0xae04360,2,
-0xae0436c,3,
-0xae0437c,1,
-0xae04400,3,
-0xae08000,103,
-0xae081a0,2,
-0xae081ac,2,
-0xae081c0,3,
-0xae081e0,2,
-0xae081ec,2,
-0xae08200,2,
-0xae08800,1,
-0xae08808,259,
-0xae09000,10,
-0xae09200,23,
-0xae09280,23,
-0xae09300,1,
-0xae09400,4,
-0xae09480,23,
-0xae09500,2,
-0xae0950c,3,
-0xae09520,2,
-0xae0952c,3,
-0xae09540,7,
-0xae09800,1,
-0xae0a000,4,
-0xae0a100,9,
-0xae0a140,9,
-0xae0a180,1,
-0xae0a200,4,
-0xae0a240,9,
-0xae0a800,4,
-0xae0a900,11,
-0xae0a940,11,
-0xae0a980,1,
-0xae0aa00,4,
-0xae0aa40,11,
-0xae0aa80,1,
-0xae0ac00,11,
-0xae0ac40,11,
-0xae0ac80,1,
-0xae0ad00,4,
-0xae0ad40,11,
-0xae0c000,4,
-0xae0c100,4,
-0xae0c180,23,
-0xae0c200,23,
-0xae0c280,23,
-0xae0c300,1,
-0xae0c400,1,
-0xae0c480,6,
-0xae0c4a0,6,
-0xae0c4c0,21,
-0xae0c600,11,
-0xae0c640,11,
-0xae0c680,1,
-0xae0c700,4,
-0xae0c740,11,
-0xae0c780,5,
-0xae0c800,1,
-0xae0c808,11,
-0xae0c880,5,
-0xae0c8a0,5,
-0xae0c8c0,1,
-0xae0c900,3,
-0xae0c910,3,
-0xae0c920,1,
-0xae0c980,7,
-0xae0c9a0,7,
-0xae0c9c0,1,
-0xae0ca00,4,
-0xae0ca20,5,
-0xae0ca40,7,
-0xae0ca80,4,
-0xae0caa0,7,
-0xae0cc00,68,
-0xae0ce00,10,
-0xae0ce40,10,
-0xae0ce80,1,
-0xae0cf00,4,
-0xae0cf40,10,
-0xae0d000,9,
-0xae0d040,9,
-0xae0d080,1,
-0xae0d100,4,
-0xae0d140,9,
-0xae0d180,3,
-0xae10000,2,
-0xae10200,27,
-0xae10280,4,
-0xae102c0,25,
-0xae10340,6,
-0xae10360,2,
-0xae1036c,3,
-0xae10384,9,
-0xae10400,36,
-0xae10500,7,
-0xafd0000,2,
-0xafd000c,1,
-0xafd0014,1,
-0xafd001c,5,
-0xafd0044,1,
-0xafd0080,4,
-0xafd00a0,6,
-0xafd00c0,4,
-0xafd00e0,6,
-0xafd0100,4,
-0xafd0200,4,
-0xafd0280,24,
-0xafd0300,4,
-0xafd0380,24,
-0xafd0400,4,
-0xafd0420,20,
-0xafd0480,4,
-0xafd04a0,5,
-0xafd04c0,4,
-0xafd04e0,5,
-0xafd0500,4,
-0xafd0540,4,
-0xafd0560,6,
-0xafd0580,4,
-0xafd05a0,6,
-0xafd05c0,4,
-0xafd1000,2,
-0xafd100c,1,
-0xafd1014,1,
-0xafd101c,1,
-0xafd1024,1,
-0xafd102c,1,
-0xafd1034,1,
-0xafd103c,1,
-0xafd1044,1,
-0xafd104c,1,
-0xafd1054,1,
-0xafd105c,1,
-0xafd1064,1,
-0xafd106c,1,
-0xafd1074,1,
-0xafd107c,1,
-0xafd1084,1,
-0xafd108c,1,
-0xafd1094,1,
-0xafd3000,2,
-0xafd300c,1,
-0xafd3014,1,
-0xafd301c,1,
-0xafd3024,1,
-0xafd302c,1,
-0xafd3034,1,
-0xafd303c,1,
-0xafd3044,1,
-0xafd304c,1,
-0xafd3054,1,
-0xafd305c,1,
-0xafd3064,1,
-0xafd306c,1,
-0xafd3074,1,
-0xafd307c,1,
-0xafd3084,1,
-0xafd308c,1,
-0xafd3094,1,
-0xafd309c,1,
-0xafd30a4,1,
-0xafd30ac,1,
-0xafd30b4,1,
-0xafd30bc,1,
-0xafd30c4,1,
-0xafd30cc,1,
-0xafd30d4,1,
-0xafd30dc,1,
-0xafd30e4,1,
-0xafd30ec,1,
-0xafd30f4,1,
-0xafd30fc,1,
-0xafd3104,1,
-0xafd310c,1,
-0xafd3114,1,
-0xafd311c,1,
-0xafd3124,1,
-0xafd312c,1,
-0xafd3134,1,
-0xafd313c,1,
-0xafd3144,1,
-0xafd314c,1,
-0xafd3154,1,
-0xafd315c,1,
-0xafd3164,1,
-0xafd316c,1,
-0xafd3174,1,
-0xafd317c,1,
-0xafd3184,1,
-0xafd318c,1,
-0xafd3194,1,
-0xafd319c,1,
-0xafd31a4,1,
-0xafd31ac,1,
-0xafd31b4,1,
-0xafd31bc,1,
-0xafd31c4,1,
-0xafd31cc,1,
-0xafd31d4,1,
-0xafd31dc,1,
-0xafd31e4,1,
-0xafd31ec,1,
-0xafd31f4,1,
-0xafd31fc,1,
-0xafd3204,1,
-0xafd320c,1,
-0xafd3214,1,
-0xafd321c,1,
-0xafd3224,1,
-0xafd322c,1,
-0xafd3234,1,
-0xafd323c,1,
-0xafd3244,1,
-0xafd324c,1,
-0xafd3254,1,
-0xafd325c,1,
-0xafd3264,1,
-0xafd326c,1,
-0xafd3274,1,
-0xafd327c,1,
-0xafd3284,1,
-0xafd328c,1,
-0xafd3294,1,
-0xafd329c,1,
-0xafd32a4,1,
-0xafd32ac,1,
-0xafd32b4,1,
-0xafd32bc,1,
-0xafd32c4,1,
-0xafd32cc,1,
-0xafd32d4,1,
-0xafd32dc,1,
-0xafd32e4,1,
-0xafd32ec,1,
-0xafd32f4,1,
-0xafd32fc,1,
-0xafd3304,1,
-0xafd330c,1,
-0xafd3314,1,
-0xafd331c,1,
-0xafd3324,1,
-0xafd332c,1,
-0xafd3334,1,
-0xafd333c,1,
-0xafd3344,1,
-0xafd334c,1,
-0xafd3354,1,
-0xafd335c,1,
-0xafd3364,1,
-0xafd336c,1,
-0xafd3374,1,
-0xafd337c,1,
-0xafd3384,1,
-0xafd338c,1,
-0xafd3394,1,
-0xafd339c,1,
-0xafd33a4,1,
-0xafd33ac,1,
-0xafd33b4,1,
-0xafd33bc,1,
-0xafd33c4,1,
-0xafd33cc,1,
-0xafd33d4,1,
-0xafd33dc,1,
-0xafd33e4,1,
-0xafd33ec,1,
-0xafd33f4,1,
-0xafd33fc,1,
-0xafd3404,1,
-0xafd4800,36,
-0xafd4900,2,
-0xafd490c,1,
-0xafd4914,1,
-0xafd491c,1,
-0xafd4924,1,
-0xafd492c,1,
-0xafd4934,1,
-0xafd493c,1,
-0xafd4944,1,
-0xafd494c,1,
-0xafd4954,1,
-0xafd4964,1,
-0xafd496c,1,
-0xafd4974,1,
-0xafd497c,1,
-0xafd4984,1,
-0xafd498c,1,
-0xafd4994,1,
-0xafd499c,1,
-0xafd49a4,1,
-0xafd5000,2,
-0xafd500c,1,
-0xafd5200,27,
-0xafd5280,4,
-0xafd52c0,25,
-0xafd5340,6,
-0xafd5360,2,
-0xafd536c,3,
-0xafd5384,10,
-0xafd5400,2,
-0xafd5440,12,
-0xafd5800,2,
-0xafdf800,50,
-0xafdf8d0,2,
-0xafdf8dc,1,
-0xafdf900,4,
-0xb020000,2,
-0xb020020,2,
-0xb020030,2,
-0xb020040,2,
-0xb020204,1,
-0xb020304,1,
-0xb02030c,1,
-0xb020314,1,
-0xb02031c,1,
-0xb020324,1,
-0xb02032c,1,
-0xb020334,1,
-0xb02033c,1,
-0xb020344,1,
-0xb02034c,1,
-0xb020354,1,
-0xb02035c,1,
-0xb020364,1,
-0xb02036c,1,
-0xb020374,1,
-0xb02037c,1,
-0xb020f04,15,
-0xb020f44,4,
-0xb020f58,1,
-0xb060000,2,
-0xb060020,2,
-0xb060030,2,
-0xb060040,2,
-0xb060204,1,
-0xb060304,1,
-0xb06030c,1,
-0xb060314,1,
-0xb06031c,1,
-0xb060324,1,
-0xb06032c,1,
-0xb060334,1,
-0xb06033c,1,
-0xb060344,1,
-0xb06034c,1,
-0xb060354,1,
-0xb06035c,1,
-0xb060364,1,
-0xb06036c,1,
-0xb060374,1,
-0xb06037c,1,
-0xb060f04,15,
-0xb060f44,4,
-0xb060f58,1,
-0xb080000,11,
-0xb080030,3,
-0xb080040,3,
-0xb080050,3,
-0xb080060,3,
-0xb080070,3,
-0xb080080,3,
-0xb080090,3,
-0xb0800a0,3,
-0xb080100,17,
-0xb080180,3,
-0xb080190,5,
-0xb0801b0,5,
-0xb0801d0,5,
-0xb0801f0,5,
-0xb080210,5,
-0xb080230,18,
-0xb080400,1,
-0xb080408,4,
-0xb080800,2,
-0xb080820,8,
-0xb080900,9,
-0xb080940,9,
-0xb080980,1,
-0xb080a00,3,
-0xb080a10,3,
-0xb080a20,1,
-0xb080a80,7,
-0xb080aa0,7,
-0xb080ac0,1,
-0xb080b00,9,
-0xb080b40,9,
-0xb080b80,1,
-0xb080c00,27,
-0xb080c80,9,
-0xb080cc0,6,
-0xb080ce0,4,
-0xb080cf4,1,
-0xb080d00,1,
-0xb088000,2,
-0xb088080,2,
-0xb0880a0,6,
-0xb0880c0,1,
-0xb088100,6,
-0xb088120,14,
-0xb089000,17,
-0xb089080,3,
-0xb089090,3,
-0xb0890a0,3,
-0xb0890b0,3,
-0xb0890c0,3,
-0xb0890d0,3,
-0xb0890e0,3,
-0xb0890f0,3,
-0xb089100,1,
-0xb089400,144,
-0xb089800,10,
-0xb08a000,10,
-0xb08a040,3,
-0xb08b000,1,
-0xb08b100,36,
-0xb08b200,2,
-0xb08b280,6,
-0xb08b2a0,6,
-0xb08b2c0,1,
-0xb08b300,4,
-0xb08b320,6,
-0xb08b400,10,
-0xb08b440,10,
-0xb08b480,1,
-0xb08b500,4,
-0xb08b580,24,
-0xb08b600,6,
-0xb08b620,6,
-0xb08b640,1,
-0xb08b680,4,
-0xb08b6a0,6,
-0xb08b6c0,3,
-0xb08b6d0,3,
-0xb08b6e0,1,
-0xb08b700,4,
-0xb08b780,17,
-0xb08b800,3,
-0xb08b810,3,
-0xb08b820,1,
-0xb08b840,7,
-0xb08ba00,27,
-0xb08ba80,4,
-0xb08bac0,25,
-0xb08bb40,6,
-0xb08bb60,2,
-0xb08bb6c,3,
-0xb08bb84,8,
-0xb090000,1,
-0xb0a0000,11,
-0xb0a0030,3,
-0xb0a0040,3,
-0xb0a0050,3,
-0xb0a0060,3,
-0xb0a0070,3,
-0xb0a0080,3,
-0xb0a0090,3,
-0xb0a00a0,3,
-0xb0a0100,17,
-0xb0a0180,3,
-0xb0a0190,5,
-0xb0a01b0,5,
-0xb0a01d0,5,
-0xb0a01f0,5,
-0xb0a0210,5,
-0xb0a0230,18,
-0xb0a0400,1,
-0xb0a0408,4,
-0xb0a0800,2,
-0xb0a0820,8,
-0xb0a0900,9,
-0xb0a0940,9,
-0xb0a0980,1,
-0xb0a0a00,3,
-0xb0a0a10,3,
-0xb0a0a20,1,
-0xb0a0a80,7,
-0xb0a0aa0,7,
-0xb0a0ac0,1,
-0xb0a0b00,9,
-0xb0a0b40,9,
-0xb0a0b80,1,
-0xb0a0c00,27,
-0xb0a0c80,9,
-0xb0a0cc0,6,
-0xb0a0ce0,4,
-0xb0a0cf4,1,
-0xb0a0d00,1,
-0xb0a8000,2,
-0xb0a8080,2,
-0xb0a80a0,6,
-0xb0a80c0,1,
-0xb0a8100,6,
-0xb0a8120,14,
-0xb0a9000,17,
-0xb0a9080,3,
-0xb0a9090,3,
-0xb0a90a0,3,
-0xb0a90b0,3,
-0xb0a90c0,3,
-0xb0a90d0,3,
-0xb0a90e0,3,
-0xb0a90f0,3,
-0xb0a9100,1,
-0xb0a9400,144,
-0xb0a9800,10,
-0xb0aa000,10,
-0xb0aa040,3,
-0xb0ab000,1,
-0xb0ab100,36,
-0xb0ab200,2,
-0xb0ab280,6,
-0xb0ab2a0,6,
-0xb0ab2c0,1,
-0xb0ab300,4,
-0xb0ab320,6,
-0xb0ab400,10,
-0xb0ab440,10,
-0xb0ab480,1,
-0xb0ab500,4,
-0xb0ab580,24,
-0xb0ab600,6,
-0xb0ab620,6,
-0xb0ab640,1,
-0xb0ab680,4,
-0xb0ab6a0,6,
-0xb0ab6c0,3,
-0xb0ab6d0,3,
-0xb0ab6e0,1,
-0xb0ab700,4,
-0xb0ab780,17,
-0xb0ab800,3,
-0xb0ab810,3,
-0xb0ab820,1,
-0xb0ab840,7,
-0xb0aba00,27,
-0xb0aba80,4,
-0xb0abac0,25,
-0xb0abb40,6,
-0xb0abb60,2,
-0xb0abb6c,3,
-0xb0abb84,8,
-0xb0b0000,1,
-0xb0c0000,7,
-0xb0c0020,8,
-0xb0c0080,6,
-0xb0c00a0,6,
-0xb0c00c0,1,
-0xb0c0100,7,
-0xb0c0120,8,
-0xb0c0180,6,
-0xb0c01a0,6,
-0xb0c01c0,1,
-0xb0c0400,15,
-0xb0c0480,6,
-0xb0c04a0,6,
-0xb0c04c0,1,
-0xb0c0500,148,
-0xb0c0780,11,
-0xb0c07c0,1,
-0xb0c0800,51,
-0xb0c0900,4,
-0xb0c0980,41,
-0xb0c0a40,6,
-0xb0c0a60,2,
-0xb0c0a6c,3,
-0xb0c0a84,6,
-0xb0c0c00,27,
-0xb0c0c80,4,
-0xb0c0cc0,25,
-0xb0c0d40,6,
-0xb0c0d60,2,
-0xb0c0d6c,3,
-0xb0c0d84,3,
-0xb0c0e00,36,
-0xb0c0f04,1,
-0xb0c0f30,26,
-0xb0c0fa0,7,
-0xb100000,1,
-0xb100010,4,
-0xb1d0000,2,
-0xb1d000c,1,
-0xb1d0014,1,
-0xb1d001c,5,
-0xb1d0044,1,
-0xb1d0080,4,
-0xb1d00a0,6,
-0xb1d00c0,4,
-0xb1d00e0,6,
-0xb1d0100,4,
-0xb1d0200,4,
-0xb1d0280,24,
-0xb1d0300,4,
-0xb1d0380,24,
-0xb1d0400,4,
-0xb1d0420,20,
-0xb1d0480,4,
-0xb1d04a0,5,
-0xb1d04c0,4,
-0xb1d04e0,5,
-0xb1d0500,4,
-0xb1d0540,4,
-0xb1d0560,6,
-0xb1d0580,4,
-0xb1d05a0,6,
-0xb1d05c0,4,
-0xb1d1000,2,
-0xb1d100c,1,
-0xb1d1014,1,
-0xb1d101c,1,
-0xb1d1024,1,
-0xb1d102c,1,
-0xb1d1034,1,
-0xb1d103c,1,
-0xb1d1044,1,
-0xb1d104c,1,
-0xb1d1054,1,
-0xb1d105c,1,
-0xb1d1064,1,
-0xb1d106c,1,
-0xb1d1074,1,
-0xb1d107c,1,
-0xb1d1084,1,
-0xb1d108c,1,
-0xb1d1094,1,
-0xb1d1800,2,
-0xb1d180c,1,
-0xb1d1814,1,
-0xb1d181c,1,
-0xb1d1824,1,
-0xb1d182c,1,
-0xb1d1834,1,
-0xb1d183c,1,
-0xb1d1844,1,
-0xb1d184c,1,
-0xb1d1854,1,
-0xb1d185c,1,
-0xb1d1864,1,
-0xb1d186c,1,
-0xb1d1874,1,
-0xb1d187c,1,
-0xb1d1884,1,
-0xb1d188c,1,
-0xb1d1894,1,
-0xb1d2000,2,
-0xb1d200c,1,
-0xb1d2014,1,
-0xb1d201c,1,
-0xb1d2024,1,
-0xb1d202c,1,
-0xb1d2034,1,
-0xb1d203c,1,
-0xb1d2044,1,
-0xb1d204c,1,
-0xb1d2054,1,
-0xb1d205c,1,
-0xb1d2064,1,
-0xb1d206c,1,
-0xb1d2074,1,
-0xb1d207c,1,
-0xb1d2084,1,
-0xb1d208c,1,
-0xb1d2094,1,
-0xb1d2800,2,
-0xb1d280c,1,
-0xb1d2814,1,
-0xb1d281c,1,
-0xb1d2824,1,
-0xb1d282c,1,
-0xb1d2834,1,
-0xb1d283c,1,
-0xb1d2844,1,
-0xb1d284c,1,
-0xb1d2854,1,
-0xb1d285c,1,
-0xb1d2864,1,
-0xb1d286c,1,
-0xb1d2874,1,
-0xb1d287c,1,
-0xb1d2884,1,
-0xb1d288c,1,
-0xb1d2894,1,
-0xb1d5000,2,
-0xb1d500c,1,
-0xb1d5200,27,
-0xb1d5280,4,
-0xb1d52c0,25,
-0xb1d5340,6,
-0xb1d5360,2,
-0xb1d536c,3,
-0xb1d5384,10,
-0xb1d5400,2,
-0xb1d5440,12,
-0xb1d8000,2,
-0xb1d800c,1,
-0xb1d8014,1,
-0xb1d801c,5,
-0xb1d8044,1,
-0xb1d8080,4,
-0xb1d80a0,6,
-0xb1d80c0,4,
-0xb1d80e0,6,
-0xb1d8100,4,
-0xb1d8200,4,
-0xb1d8280,24,
-0xb1d8300,4,
-0xb1d8380,24,
-0xb1d8400,4,
-0xb1d8420,20,
-0xb1d8480,4,
-0xb1d84a0,5,
-0xb1d84c0,4,
-0xb1d84e0,5,
-0xb1d8500,4,
-0xb1d8540,4,
-0xb1d8560,6,
-0xb1d8580,4,
-0xb1d85a0,6,
-0xb1d85c0,4,
-0xb1dd000,2,
-0xb1dd00c,1,
-0xb1dd200,27,
-0xb1dd280,4,
-0xb1dd2c0,25,
-0xb1dd340,6,
-0xb1dd360,2,
-0xb1dd36c,3,
-0xb1dd384,5,
-0xb1dd400,2,
-0xb1dd440,12,
-0xb1df800,62,
-0xb1df8fc,5,
-0xb220000,2,
-0xb220020,2,
-0xb220030,2,
-0xb220040,2,
-0xb220204,1,
-0xb220304,1,
-0xb22030c,1,
-0xb220314,1,
-0xb22031c,1,
-0xb220324,1,
-0xb22032c,1,
-0xb220334,1,
-0xb22033c,1,
-0xb220344,1,
-0xb22034c,1,
-0xb220354,1,
-0xb22035c,1,
-0xb220364,1,
-0xb22036c,1,
-0xb220374,1,
-0xb22037c,1,
-0xb220f04,15,
-0xb220f44,4,
-0xb220f58,1,
-0xb260000,2,
-0xb260020,2,
-0xb260030,2,
-0xb260040,2,
-0xb260204,1,
-0xb260304,1,
-0xb26030c,1,
-0xb260314,1,
-0xb26031c,1,
-0xb260324,1,
-0xb26032c,1,
-0xb260334,1,
-0xb26033c,1,
-0xb260344,1,
-0xb26034c,1,
-0xb260354,1,
-0xb26035c,1,
-0xb260364,1,
-0xb26036c,1,
-0xb260374,1,
-0xb26037c,1,
-0xb260f04,15,
-0xb260f44,4,
-0xb260f58,1,
-0xb280000,11,
-0xb280030,3,
-0xb280040,3,
-0xb280050,3,
-0xb280060,3,
-0xb280070,3,
-0xb280080,3,
-0xb280090,3,
-0xb2800a0,3,
-0xb280100,17,
-0xb280180,3,
-0xb280190,5,
-0xb2801b0,5,
-0xb2801d0,5,
-0xb2801f0,5,
-0xb280210,5,
-0xb280230,18,
-0xb280400,1,
-0xb280408,4,
-0xb280800,2,
-0xb280820,8,
-0xb280900,9,
-0xb280940,9,
-0xb280980,1,
-0xb280a00,3,
-0xb280a10,3,
-0xb280a20,1,
-0xb280a80,7,
-0xb280aa0,7,
-0xb280ac0,1,
-0xb280b00,9,
-0xb280b40,9,
-0xb280b80,1,
-0xb280c00,27,
-0xb280c80,9,
-0xb280cc0,6,
-0xb280ce0,4,
-0xb280cf4,1,
-0xb280d00,1,
-0xb288000,2,
-0xb288080,2,
-0xb2880a0,6,
-0xb2880c0,1,
-0xb288100,6,
-0xb288120,14,
-0xb289000,17,
-0xb289080,3,
-0xb289090,3,
-0xb2890a0,3,
-0xb2890b0,3,
-0xb2890c0,3,
-0xb2890d0,3,
-0xb2890e0,3,
-0xb2890f0,3,
-0xb289100,1,
-0xb289400,144,
-0xb289800,10,
-0xb28a000,10,
-0xb28a040,3,
-0xb28b000,1,
-0xb28b100,36,
-0xb28b200,2,
-0xb28b280,6,
-0xb28b2a0,6,
-0xb28b2c0,1,
-0xb28b300,4,
-0xb28b320,6,
-0xb28b400,10,
-0xb28b440,10,
-0xb28b480,1,
-0xb28b500,4,
-0xb28b580,24,
-0xb28b600,6,
-0xb28b620,6,
-0xb28b640,1,
-0xb28b680,4,
-0xb28b6a0,6,
-0xb28b6c0,3,
-0xb28b6d0,3,
-0xb28b6e0,1,
-0xb28b700,4,
-0xb28b780,17,
-0xb28b800,3,
-0xb28b810,3,
-0xb28b820,1,
-0xb28b840,7,
-0xb28ba00,27,
-0xb28ba80,4,
-0xb28bac0,25,
-0xb28bb40,6,
-0xb28bb60,2,
-0xb28bb6c,3,
-0xb28bb84,8,
-0xb290000,1,
-0xb2a0000,11,
-0xb2a0030,3,
-0xb2a0040,3,
-0xb2a0050,3,
-0xb2a0060,3,
-0xb2a0070,3,
-0xb2a0080,3,
-0xb2a0090,3,
-0xb2a00a0,3,
-0xb2a0100,17,
-0xb2a0180,3,
-0xb2a0190,5,
-0xb2a01b0,5,
-0xb2a01d0,5,
-0xb2a01f0,5,
-0xb2a0210,5,
-0xb2a0230,18,
-0xb2a0400,1,
-0xb2a0408,4,
-0xb2a0800,2,
-0xb2a0820,8,
-0xb2a0900,9,
-0xb2a0940,9,
-0xb2a0980,1,
-0xb2a0a00,3,
-0xb2a0a10,3,
-0xb2a0a20,1,
-0xb2a0a80,7,
-0xb2a0aa0,7,
-0xb2a0ac0,1,
-0xb2a0b00,9,
-0xb2a0b40,9,
-0xb2a0b80,1,
-0xb2a0c00,27,
-0xb2a0c80,9,
-0xb2a0cc0,6,
-0xb2a0ce0,4,
-0xb2a0cf4,1,
-0xb2a0d00,1,
-0xb2a8000,2,
-0xb2a8080,2,
-0xb2a80a0,6,
-0xb2a80c0,1,
-0xb2a8100,6,
-0xb2a8120,14,
-0xb2a9000,17,
-0xb2a9080,3,
-0xb2a9090,3,
-0xb2a90a0,3,
-0xb2a90b0,3,
-0xb2a90c0,3,
-0xb2a90d0,3,
-0xb2a90e0,3,
-0xb2a90f0,3,
-0xb2a9100,1,
-0xb2a9400,144,
-0xb2a9800,10,
-0xb2aa000,10,
-0xb2aa040,3,
-0xb2ab000,1,
-0xb2ab100,36,
-0xb2ab200,2,
-0xb2ab280,6,
-0xb2ab2a0,6,
-0xb2ab2c0,1,
-0xb2ab300,4,
-0xb2ab320,6,
-0xb2ab400,10,
-0xb2ab440,10,
-0xb2ab480,1,
-0xb2ab500,4,
-0xb2ab580,24,
-0xb2ab600,6,
-0xb2ab620,6,
-0xb2ab640,1,
-0xb2ab680,4,
-0xb2ab6a0,6,
-0xb2ab6c0,3,
-0xb2ab6d0,3,
-0xb2ab6e0,1,
-0xb2ab700,4,
-0xb2ab780,17,
-0xb2ab800,3,
-0xb2ab810,3,
-0xb2ab820,1,
-0xb2ab840,7,
-0xb2aba00,27,
-0xb2aba80,4,
-0xb2abac0,25,
-0xb2abb40,6,
-0xb2abb60,2,
-0xb2abb6c,3,
-0xb2abb84,8,
-0xb2b0000,1,
-0xb2c0000,7,
-0xb2c0020,8,
-0xb2c0080,6,
-0xb2c00a0,6,
-0xb2c00c0,1,
-0xb2c0100,7,
-0xb2c0120,8,
-0xb2c0180,6,
-0xb2c01a0,6,
-0xb2c01c0,1,
-0xb2c0400,15,
-0xb2c0480,6,
-0xb2c04a0,6,
-0xb2c04c0,1,
-0xb2c0500,148,
-0xb2c0780,11,
-0xb2c07c0,1,
-0xb2c0800,51,
-0xb2c0900,4,
-0xb2c0980,41,
-0xb2c0a40,6,
-0xb2c0a60,2,
-0xb2c0a6c,3,
-0xb2c0a84,6,
-0xb2c0c00,27,
-0xb2c0c80,4,
-0xb2c0cc0,25,
-0xb2c0d40,6,
-0xb2c0d60,2,
-0xb2c0d6c,3,
-0xb2c0d84,3,
-0xb2c0e00,36,
-0xb2c0f04,1,
-0xb2c0f30,26,
-0xb2c0fa0,7,
-0xb300000,1,
-0xb300010,4,
-0xb3d0000,2,
-0xb3d000c,1,
-0xb3d0014,1,
-0xb3d001c,5,
-0xb3d0044,1,
-0xb3d0080,4,
-0xb3d00a0,6,
-0xb3d00c0,4,
-0xb3d00e0,6,
-0xb3d0100,4,
-0xb3d0200,4,
-0xb3d0280,24,
-0xb3d0300,4,
-0xb3d0380,24,
-0xb3d0400,4,
-0xb3d0420,20,
-0xb3d0480,4,
-0xb3d04a0,5,
-0xb3d04c0,4,
-0xb3d04e0,5,
-0xb3d0500,4,
-0xb3d0540,4,
-0xb3d0560,6,
-0xb3d0580,4,
-0xb3d05a0,6,
-0xb3d05c0,4,
-0xb3d1000,2,
-0xb3d100c,1,
-0xb3d1014,1,
-0xb3d101c,1,
-0xb3d1024,1,
-0xb3d102c,1,
-0xb3d1034,1,
-0xb3d103c,1,
-0xb3d1044,1,
-0xb3d104c,1,
-0xb3d1054,1,
-0xb3d105c,1,
-0xb3d1064,1,
-0xb3d106c,1,
-0xb3d1074,1,
-0xb3d107c,1,
-0xb3d1084,1,
-0xb3d108c,1,
-0xb3d1094,1,
-0xb3d1800,2,
-0xb3d180c,1,
-0xb3d1814,1,
-0xb3d181c,1,
-0xb3d1824,1,
-0xb3d182c,1,
-0xb3d1834,1,
-0xb3d183c,1,
-0xb3d1844,1,
-0xb3d184c,1,
-0xb3d1854,1,
-0xb3d185c,1,
-0xb3d1864,1,
-0xb3d186c,1,
-0xb3d1874,1,
-0xb3d187c,1,
-0xb3d1884,1,
-0xb3d188c,1,
-0xb3d1894,1,
-0xb3d2000,2,
-0xb3d200c,1,
-0xb3d2014,1,
-0xb3d201c,1,
-0xb3d2024,1,
-0xb3d202c,1,
-0xb3d2034,1,
-0xb3d203c,1,
-0xb3d2044,1,
-0xb3d204c,1,
-0xb3d2054,1,
-0xb3d205c,1,
-0xb3d2064,1,
-0xb3d206c,1,
-0xb3d2074,1,
-0xb3d207c,1,
-0xb3d2084,1,
-0xb3d208c,1,
-0xb3d2094,1,
-0xb3d2800,2,
-0xb3d280c,1,
-0xb3d2814,1,
-0xb3d281c,1,
-0xb3d2824,1,
-0xb3d282c,1,
-0xb3d2834,1,
-0xb3d283c,1,
-0xb3d2844,1,
-0xb3d284c,1,
-0xb3d2854,1,
-0xb3d285c,1,
-0xb3d2864,1,
-0xb3d286c,1,
-0xb3d2874,1,
-0xb3d287c,1,
-0xb3d2884,1,
-0xb3d288c,1,
-0xb3d2894,1,
-0xb3d5000,2,
-0xb3d500c,1,
-0xb3d5200,27,
-0xb3d5280,4,
-0xb3d52c0,25,
-0xb3d5340,6,
-0xb3d5360,2,
-0xb3d536c,3,
-0xb3d5384,10,
-0xb3d5400,2,
-0xb3d5440,12,
-0xb3d8000,2,
-0xb3d800c,1,
-0xb3d8014,1,
-0xb3d801c,5,
-0xb3d8044,1,
-0xb3d8080,4,
-0xb3d80a0,6,
-0xb3d80c0,4,
-0xb3d80e0,6,
-0xb3d8100,4,
-0xb3d8200,4,
-0xb3d8280,24,
-0xb3d8300,4,
-0xb3d8380,24,
-0xb3d8400,4,
-0xb3d8420,20,
-0xb3d8480,4,
-0xb3d84a0,5,
-0xb3d84c0,4,
-0xb3d84e0,5,
-0xb3d8500,4,
-0xb3d8540,4,
-0xb3d8560,6,
-0xb3d8580,4,
-0xb3d85a0,6,
-0xb3d85c0,4,
-0xb3dd000,2,
-0xb3dd00c,1,
-0xb3dd200,27,
-0xb3dd280,4,
-0xb3dd2c0,25,
-0xb3dd340,6,
-0xb3dd360,2,
-0xb3dd36c,3,
-0xb3dd384,5,
-0xb3dd400,2,
-0xb3dd440,12,
-0xb3df800,62,
-0xb3df8fc,5,
-0xb420000,2,
-0xb420020,2,
-0xb420030,2,
-0xb420040,2,
-0xb420204,1,
-0xb420304,1,
-0xb42030c,1,
-0xb420314,1,
-0xb42031c,1,
-0xb420324,1,
-0xb42032c,1,
-0xb420334,1,
-0xb42033c,1,
-0xb420344,1,
-0xb42034c,1,
-0xb420354,1,
-0xb42035c,1,
-0xb420364,1,
-0xb42036c,1,
-0xb420374,1,
-0xb42037c,1,
-0xb420f04,15,
-0xb420f44,4,
-0xb420f58,1,
-0xb460000,2,
-0xb460020,2,
-0xb460030,2,
-0xb460040,2,
-0xb460204,1,
-0xb460304,1,
-0xb46030c,1,
-0xb460314,1,
-0xb46031c,1,
-0xb460324,1,
-0xb46032c,1,
-0xb460334,1,
-0xb46033c,1,
-0xb460344,1,
-0xb46034c,1,
-0xb460354,1,
-0xb46035c,1,
-0xb460364,1,
-0xb46036c,1,
-0xb460374,1,
-0xb46037c,1,
-0xb460f04,15,
-0xb460f44,4,
-0xb460f58,1,
-0xb480000,11,
-0xb480030,3,
-0xb480040,3,
-0xb480050,3,
-0xb480060,3,
-0xb480070,3,
-0xb480080,3,
-0xb480090,3,
-0xb4800a0,3,
-0xb480100,17,
-0xb480180,3,
-0xb480190,5,
-0xb4801b0,5,
-0xb4801d0,5,
-0xb4801f0,5,
-0xb480210,5,
-0xb480230,18,
-0xb480400,1,
-0xb480408,4,
-0xb480800,2,
-0xb480820,8,
-0xb480900,9,
-0xb480940,9,
-0xb480980,1,
-0xb480a00,3,
-0xb480a10,3,
-0xb480a20,1,
-0xb480a80,7,
-0xb480aa0,7,
-0xb480ac0,1,
-0xb480b00,9,
-0xb480b40,9,
-0xb480b80,1,
-0xb480c00,27,
-0xb480c80,9,
-0xb480cc0,6,
-0xb480ce0,4,
-0xb480cf4,1,
-0xb480d00,1,
-0xb488000,2,
-0xb488080,2,
-0xb4880a0,6,
-0xb4880c0,1,
-0xb488100,6,
-0xb488120,14,
-0xb489000,17,
-0xb489080,3,
-0xb489090,3,
-0xb4890a0,3,
-0xb4890b0,3,
-0xb4890c0,3,
-0xb4890d0,3,
-0xb4890e0,3,
-0xb4890f0,3,
-0xb489100,1,
-0xb489400,144,
-0xb489800,10,
-0xb48a000,10,
-0xb48a040,3,
-0xb48b000,1,
-0xb48b100,36,
-0xb48b200,2,
-0xb48b280,6,
-0xb48b2a0,6,
-0xb48b2c0,1,
-0xb48b300,4,
-0xb48b320,6,
-0xb48b400,10,
-0xb48b440,10,
-0xb48b480,1,
-0xb48b500,4,
-0xb48b580,24,
-0xb48b600,6,
-0xb48b620,6,
-0xb48b640,1,
-0xb48b680,4,
-0xb48b6a0,6,
-0xb48b6c0,3,
-0xb48b6d0,3,
-0xb48b6e0,1,
-0xb48b700,4,
-0xb48b780,17,
-0xb48b800,3,
-0xb48b810,3,
-0xb48b820,1,
-0xb48b840,7,
-0xb48ba00,27,
-0xb48ba80,4,
-0xb48bac0,25,
-0xb48bb40,6,
-0xb48bb60,2,
-0xb48bb6c,3,
-0xb48bb84,8,
-0xb490000,1,
-0xb4a0000,11,
-0xb4a0030,3,
-0xb4a0040,3,
-0xb4a0050,3,
-0xb4a0060,3,
-0xb4a0070,3,
-0xb4a0080,3,
-0xb4a0090,3,
-0xb4a00a0,3,
-0xb4a0100,17,
-0xb4a0180,3,
-0xb4a0190,5,
-0xb4a01b0,5,
-0xb4a01d0,5,
-0xb4a01f0,5,
-0xb4a0210,5,
-0xb4a0230,18,
-0xb4a0400,1,
-0xb4a0408,4,
-0xb4a0800,2,
-0xb4a0820,8,
-0xb4a0900,9,
-0xb4a0940,9,
-0xb4a0980,1,
-0xb4a0a00,3,
-0xb4a0a10,3,
-0xb4a0a20,1,
-0xb4a0a80,7,
-0xb4a0aa0,7,
-0xb4a0ac0,1,
-0xb4a0b00,9,
-0xb4a0b40,9,
-0xb4a0b80,1,
-0xb4a0c00,27,
-0xb4a0c80,9,
-0xb4a0cc0,6,
-0xb4a0ce0,4,
-0xb4a0cf4,1,
-0xb4a0d00,1,
-0xb4a8000,2,
-0xb4a8080,2,
-0xb4a80a0,6,
-0xb4a80c0,1,
-0xb4a8100,6,
-0xb4a8120,14,
-0xb4a9000,17,
-0xb4a9080,3,
-0xb4a9090,3,
-0xb4a90a0,3,
-0xb4a90b0,3,
-0xb4a90c0,3,
-0xb4a90d0,3,
-0xb4a90e0,3,
-0xb4a90f0,3,
-0xb4a9100,1,
-0xb4a9400,144,
-0xb4a9800,10,
-0xb4aa000,10,
-0xb4aa040,3,
-0xb4ab000,1,
-0xb4ab100,36,
-0xb4ab200,2,
-0xb4ab280,6,
-0xb4ab2a0,6,
-0xb4ab2c0,1,
-0xb4ab300,4,
-0xb4ab320,6,
-0xb4ab400,10,
-0xb4ab440,10,
-0xb4ab480,1,
-0xb4ab500,4,
-0xb4ab580,24,
-0xb4ab600,6,
-0xb4ab620,6,
-0xb4ab640,1,
-0xb4ab680,4,
-0xb4ab6a0,6,
-0xb4ab6c0,3,
-0xb4ab6d0,3,
-0xb4ab6e0,1,
-0xb4ab700,4,
-0xb4ab780,17,
-0xb4ab800,3,
-0xb4ab810,3,
-0xb4ab820,1,
-0xb4ab840,7,
-0xb4aba00,27,
-0xb4aba80,4,
-0xb4abac0,25,
-0xb4abb40,6,
-0xb4abb60,2,
-0xb4abb6c,3,
-0xb4abb84,8,
-0xb4b0000,1,
-0xb4c0000,7,
-0xb4c0020,8,
-0xb4c0080,6,
-0xb4c00a0,6,
-0xb4c00c0,1,
-0xb4c0100,7,
-0xb4c0120,8,
-0xb4c0180,6,
-0xb4c01a0,6,
-0xb4c01c0,1,
-0xb4c0400,15,
-0xb4c0480,6,
-0xb4c04a0,6,
-0xb4c04c0,1,
-0xb4c0500,148,
-0xb4c0780,11,
-0xb4c07c0,1,
-0xb4c0800,51,
-0xb4c0900,4,
-0xb4c0980,41,
-0xb4c0a40,6,
-0xb4c0a60,2,
-0xb4c0a6c,3,
-0xb4c0a84,6,
-0xb4c0c00,27,
-0xb4c0c80,4,
-0xb4c0cc0,25,
-0xb4c0d40,6,
-0xb4c0d60,2,
-0xb4c0d6c,3,
-0xb4c0d84,3,
-0xb4c0e00,36,
-0xb4c0f04,1,
-0xb4c0f30,26,
-0xb4c0fa0,7,
-0xb500000,1,
-0xb500010,4,
-0xb5d0000,2,
-0xb5d000c,1,
-0xb5d0014,1,
-0xb5d001c,5,
-0xb5d0044,1,
-0xb5d0080,4,
-0xb5d00a0,6,
-0xb5d00c0,4,
-0xb5d00e0,6,
-0xb5d0100,4,
-0xb5d0200,4,
-0xb5d0280,24,
-0xb5d0300,4,
-0xb5d0380,24,
-0xb5d0400,4,
-0xb5d0420,20,
-0xb5d0480,4,
-0xb5d04a0,5,
-0xb5d04c0,4,
-0xb5d04e0,5,
-0xb5d0500,4,
-0xb5d0540,4,
-0xb5d0560,6,
-0xb5d0580,4,
-0xb5d05a0,6,
-0xb5d05c0,4,
-0xb5d1000,2,
-0xb5d100c,1,
-0xb5d1014,1,
-0xb5d101c,1,
-0xb5d1024,1,
-0xb5d102c,1,
-0xb5d1034,1,
-0xb5d103c,1,
-0xb5d1044,1,
-0xb5d104c,1,
-0xb5d1054,1,
-0xb5d105c,1,
-0xb5d1064,1,
-0xb5d106c,1,
-0xb5d1074,1,
-0xb5d107c,1,
-0xb5d1084,1,
-0xb5d108c,1,
-0xb5d1094,1,
-0xb5d1800,2,
-0xb5d180c,1,
-0xb5d1814,1,
-0xb5d181c,1,
-0xb5d1824,1,
-0xb5d182c,1,
-0xb5d1834,1,
-0xb5d183c,1,
-0xb5d1844,1,
-0xb5d184c,1,
-0xb5d1854,1,
-0xb5d185c,1,
-0xb5d1864,1,
-0xb5d186c,1,
-0xb5d1874,1,
-0xb5d187c,1,
-0xb5d1884,1,
-0xb5d188c,1,
-0xb5d1894,1,
-0xb5d2000,2,
-0xb5d200c,1,
-0xb5d2014,1,
-0xb5d201c,1,
-0xb5d2024,1,
-0xb5d202c,1,
-0xb5d2034,1,
-0xb5d203c,1,
-0xb5d2044,1,
-0xb5d204c,1,
-0xb5d2054,1,
-0xb5d205c,1,
-0xb5d2064,1,
-0xb5d206c,1,
-0xb5d2074,1,
-0xb5d207c,1,
-0xb5d2084,1,
-0xb5d208c,1,
-0xb5d2094,1,
-0xb5d2800,2,
-0xb5d280c,1,
-0xb5d2814,1,
-0xb5d281c,1,
-0xb5d2824,1,
-0xb5d282c,1,
-0xb5d2834,1,
-0xb5d283c,1,
-0xb5d2844,1,
-0xb5d284c,1,
-0xb5d2854,1,
-0xb5d285c,1,
-0xb5d2864,1,
-0xb5d286c,1,
-0xb5d2874,1,
-0xb5d287c,1,
-0xb5d2884,1,
-0xb5d288c,1,
-0xb5d2894,1,
-0xb5d5000,2,
-0xb5d500c,1,
-0xb5d5200,27,
-0xb5d5280,4,
-0xb5d52c0,25,
-0xb5d5340,6,
-0xb5d5360,2,
-0xb5d536c,3,
-0xb5d5384,10,
-0xb5d5400,2,
-0xb5d5440,12,
-0xb5d8000,2,
-0xb5d800c,1,
-0xb5d8014,1,
-0xb5d801c,5,
-0xb5d8044,1,
-0xb5d8080,4,
-0xb5d80a0,6,
-0xb5d80c0,4,
-0xb5d80e0,6,
-0xb5d8100,4,
-0xb5d8200,4,
-0xb5d8280,24,
-0xb5d8300,4,
-0xb5d8380,24,
-0xb5d8400,4,
-0xb5d8420,20,
-0xb5d8480,4,
-0xb5d84a0,5,
-0xb5d84c0,4,
-0xb5d84e0,5,
-0xb5d8500,4,
-0xb5d8540,4,
-0xb5d8560,6,
-0xb5d8580,4,
-0xb5d85a0,6,
-0xb5d85c0,4,
-0xb5dd000,2,
-0xb5dd00c,1,
-0xb5dd200,27,
-0xb5dd280,4,
-0xb5dd2c0,25,
-0xb5dd340,6,
-0xb5dd360,2,
-0xb5dd36c,3,
-0xb5dd384,5,
-0xb5dd400,2,
-0xb5dd440,12,
-0xb5df800,62,
-0xb5df8fc,5,
-0xb620000,2,
-0xb620020,2,
-0xb620030,2,
-0xb620040,2,
-0xb620204,1,
-0xb620304,1,
-0xb62030c,1,
-0xb620314,1,
-0xb62031c,1,
-0xb620324,1,
-0xb62032c,1,
-0xb620334,1,
-0xb62033c,1,
-0xb620344,1,
-0xb62034c,1,
-0xb620354,1,
-0xb62035c,1,
-0xb620364,1,
-0xb62036c,1,
-0xb620374,1,
-0xb62037c,1,
-0xb620f04,15,
-0xb620f44,4,
-0xb620f58,1,
-0xb660000,2,
-0xb660020,2,
-0xb660030,2,
-0xb660040,2,
-0xb660204,1,
-0xb660304,1,
-0xb66030c,1,
-0xb660314,1,
-0xb66031c,1,
-0xb660324,1,
-0xb66032c,1,
-0xb660334,1,
-0xb66033c,1,
-0xb660344,1,
-0xb66034c,1,
-0xb660354,1,
-0xb66035c,1,
-0xb660364,1,
-0xb66036c,1,
-0xb660374,1,
-0xb66037c,1,
-0xb660f04,15,
-0xb660f44,4,
-0xb660f58,1,
-0xb680000,11,
-0xb680030,3,
-0xb680040,3,
-0xb680050,3,
-0xb680060,3,
-0xb680070,3,
-0xb680080,3,
-0xb680090,3,
-0xb6800a0,3,
-0xb680100,17,
-0xb680180,3,
-0xb680190,5,
-0xb6801b0,5,
-0xb6801d0,5,
-0xb6801f0,5,
-0xb680210,5,
-0xb680230,18,
-0xb680400,1,
-0xb680408,4,
-0xb680800,2,
-0xb680820,8,
-0xb680900,9,
-0xb680940,9,
-0xb680980,1,
-0xb680a00,3,
-0xb680a10,3,
-0xb680a20,1,
-0xb680a80,7,
-0xb680aa0,7,
-0xb680ac0,1,
-0xb680b00,9,
-0xb680b40,9,
-0xb680b80,1,
-0xb680c00,27,
-0xb680c80,9,
-0xb680cc0,6,
-0xb680ce0,4,
-0xb680cf4,1,
-0xb680d00,1,
-0xb688000,2,
-0xb688080,2,
-0xb6880a0,6,
-0xb6880c0,1,
-0xb688100,6,
-0xb688120,14,
-0xb689000,17,
-0xb689080,3,
-0xb689090,3,
-0xb6890a0,3,
-0xb6890b0,3,
-0xb6890c0,3,
-0xb6890d0,3,
-0xb6890e0,3,
-0xb6890f0,3,
-0xb689100,1,
-0xb689400,144,
-0xb689800,10,
-0xb68a000,10,
-0xb68a040,3,
-0xb68b000,1,
-0xb68b100,36,
-0xb68b200,2,
-0xb68b280,6,
-0xb68b2a0,6,
-0xb68b2c0,1,
-0xb68b300,4,
-0xb68b320,6,
-0xb68b400,10,
-0xb68b440,10,
-0xb68b480,1,
-0xb68b500,4,
-0xb68b580,24,
-0xb68b600,6,
-0xb68b620,6,
-0xb68b640,1,
-0xb68b680,4,
-0xb68b6a0,6,
-0xb68b6c0,3,
-0xb68b6d0,3,
-0xb68b6e0,1,
-0xb68b700,4,
-0xb68b780,17,
-0xb68b800,3,
-0xb68b810,3,
-0xb68b820,1,
-0xb68b840,7,
-0xb68ba00,27,
-0xb68ba80,4,
-0xb68bac0,25,
-0xb68bb40,6,
-0xb68bb60,2,
-0xb68bb6c,3,
-0xb68bb84,8,
-0xb690000,1,
-0xb6a0000,11,
-0xb6a0030,3,
-0xb6a0040,3,
-0xb6a0050,3,
-0xb6a0060,3,
-0xb6a0070,3,
-0xb6a0080,3,
-0xb6a0090,3,
-0xb6a00a0,3,
-0xb6a0100,17,
-0xb6a0180,3,
-0xb6a0190,5,
-0xb6a01b0,5,
-0xb6a01d0,5,
-0xb6a01f0,5,
-0xb6a0210,5,
-0xb6a0230,18,
-0xb6a0400,1,
-0xb6a0408,4,
-0xb6a0800,2,
-0xb6a0820,8,
-0xb6a0900,9,
-0xb6a0940,9,
-0xb6a0980,1,
-0xb6a0a00,3,
-0xb6a0a10,3,
-0xb6a0a20,1,
-0xb6a0a80,7,
-0xb6a0aa0,7,
-0xb6a0ac0,1,
-0xb6a0b00,9,
-0xb6a0b40,9,
-0xb6a0b80,1,
-0xb6a0c00,27,
-0xb6a0c80,9,
-0xb6a0cc0,6,
-0xb6a0ce0,4,
-0xb6a0cf4,1,
-0xb6a0d00,1,
-0xb6a8000,2,
-0xb6a8080,2,
-0xb6a80a0,6,
-0xb6a80c0,1,
-0xb6a8100,6,
-0xb6a8120,14,
-0xb6a9000,17,
-0xb6a9080,3,
-0xb6a9090,3,
-0xb6a90a0,3,
-0xb6a90b0,3,
-0xb6a90c0,3,
-0xb6a90d0,3,
-0xb6a90e0,3,
-0xb6a90f0,3,
-0xb6a9100,1,
-0xb6a9400,144,
-0xb6a9800,10,
-0xb6aa000,10,
-0xb6aa040,3,
-0xb6ab000,1,
-0xb6ab100,36,
-0xb6ab200,2,
-0xb6ab280,6,
-0xb6ab2a0,6,
-0xb6ab2c0,1,
-0xb6ab300,4,
-0xb6ab320,6,
-0xb6ab400,10,
-0xb6ab440,10,
-0xb6ab480,1,
-0xb6ab500,4,
-0xb6ab580,24,
-0xb6ab600,6,
-0xb6ab620,6,
-0xb6ab640,1,
-0xb6ab680,4,
-0xb6ab6a0,6,
-0xb6ab6c0,3,
-0xb6ab6d0,3,
-0xb6ab6e0,1,
-0xb6ab700,4,
-0xb6ab780,17,
-0xb6ab800,3,
-0xb6ab810,3,
-0xb6ab820,1,
-0xb6ab840,7,
-0xb6aba00,27,
-0xb6aba80,4,
-0xb6abac0,25,
-0xb6abb40,6,
-0xb6abb60,2,
-0xb6abb6c,3,
-0xb6abb84,8,
-0xb6b0000,1,
-0xb6c0000,7,
-0xb6c0020,8,
-0xb6c0080,6,
-0xb6c00a0,6,
-0xb6c00c0,1,
-0xb6c0100,7,
-0xb6c0120,8,
-0xb6c0180,6,
-0xb6c01a0,6,
-0xb6c01c0,1,
-0xb6c0400,15,
-0xb6c0480,6,
-0xb6c04a0,6,
-0xb6c04c0,1,
-0xb6c0500,148,
-0xb6c0780,11,
-0xb6c07c0,1,
-0xb6c0800,51,
-0xb6c0900,4,
-0xb6c0980,41,
-0xb6c0a40,6,
-0xb6c0a60,2,
-0xb6c0a6c,3,
-0xb6c0a84,6,
-0xb6c0c00,27,
-0xb6c0c80,4,
-0xb6c0cc0,25,
-0xb6c0d40,6,
-0xb6c0d60,2,
-0xb6c0d6c,3,
-0xb6c0d84,3,
-0xb6c0e00,36,
-0xb6c0f04,1,
-0xb6c0f30,26,
-0xb6c0fa0,7,
-0xb700000,1,
-0xb700010,4,
-0xb7d0000,2,
-0xb7d000c,1,
-0xb7d0014,1,
-0xb7d001c,5,
-0xb7d0044,1,
-0xb7d0080,4,
-0xb7d00a0,6,
-0xb7d00c0,4,
-0xb7d00e0,6,
-0xb7d0100,4,
-0xb7d0200,4,
-0xb7d0280,24,
-0xb7d0300,4,
-0xb7d0380,24,
-0xb7d0400,4,
-0xb7d0420,20,
-0xb7d0480,4,
-0xb7d04a0,5,
-0xb7d04c0,4,
-0xb7d04e0,5,
-0xb7d0500,4,
-0xb7d0540,4,
-0xb7d0560,6,
-0xb7d0580,4,
-0xb7d05a0,6,
-0xb7d05c0,4,
-0xb7d1000,2,
-0xb7d100c,1,
-0xb7d1014,1,
-0xb7d101c,1,
-0xb7d1024,1,
-0xb7d102c,1,
-0xb7d1034,1,
-0xb7d103c,1,
-0xb7d1044,1,
-0xb7d104c,1,
-0xb7d1054,1,
-0xb7d105c,1,
-0xb7d1064,1,
-0xb7d106c,1,
-0xb7d1074,1,
-0xb7d107c,1,
-0xb7d1084,1,
-0xb7d108c,1,
-0xb7d1094,1,
-0xb7d1800,2,
-0xb7d180c,1,
-0xb7d1814,1,
-0xb7d181c,1,
-0xb7d1824,1,
-0xb7d182c,1,
-0xb7d1834,1,
-0xb7d183c,1,
-0xb7d1844,1,
-0xb7d184c,1,
-0xb7d1854,1,
-0xb7d185c,1,
-0xb7d1864,1,
-0xb7d186c,1,
-0xb7d1874,1,
-0xb7d187c,1,
-0xb7d1884,1,
-0xb7d188c,1,
-0xb7d1894,1,
-0xb7d2000,2,
-0xb7d200c,1,
-0xb7d2014,1,
-0xb7d201c,1,
-0xb7d2024,1,
-0xb7d202c,1,
-0xb7d2034,1,
-0xb7d203c,1,
-0xb7d2044,1,
-0xb7d204c,1,
-0xb7d2054,1,
-0xb7d205c,1,
-0xb7d2064,1,
-0xb7d206c,1,
-0xb7d2074,1,
-0xb7d207c,1,
-0xb7d2084,1,
-0xb7d208c,1,
-0xb7d2094,1,
-0xb7d2800,2,
-0xb7d280c,1,
-0xb7d2814,1,
-0xb7d281c,1,
-0xb7d2824,1,
-0xb7d282c,1,
-0xb7d2834,1,
-0xb7d283c,1,
-0xb7d2844,1,
-0xb7d284c,1,
-0xb7d2854,1,
-0xb7d285c,1,
-0xb7d2864,1,
-0xb7d286c,1,
-0xb7d2874,1,
-0xb7d287c,1,
-0xb7d2884,1,
-0xb7d288c,1,
-0xb7d2894,1,
-0xb7d5000,2,
-0xb7d500c,1,
-0xb7d5200,27,
-0xb7d5280,4,
-0xb7d52c0,25,
-0xb7d5340,6,
-0xb7d5360,2,
-0xb7d536c,3,
-0xb7d5384,10,
-0xb7d5400,2,
-0xb7d5440,12,
-0xb7d8000,2,
-0xb7d800c,1,
-0xb7d8014,1,
-0xb7d801c,5,
-0xb7d8044,1,
-0xb7d8080,4,
-0xb7d80a0,6,
-0xb7d80c0,4,
-0xb7d80e0,6,
-0xb7d8100,4,
-0xb7d8200,4,
-0xb7d8280,24,
-0xb7d8300,4,
-0xb7d8380,24,
-0xb7d8400,4,
-0xb7d8420,20,
-0xb7d8480,4,
-0xb7d84a0,5,
-0xb7d84c0,4,
-0xb7d84e0,5,
-0xb7d8500,4,
-0xb7d8540,4,
-0xb7d8560,6,
-0xb7d8580,4,
-0xb7d85a0,6,
-0xb7d85c0,4,
-0xb7dd000,2,
-0xb7dd00c,1,
-0xb7dd200,27,
-0xb7dd280,4,
-0xb7dd2c0,25,
-0xb7dd340,6,
-0xb7dd360,2,
-0xb7dd36c,3,
-0xb7dd384,5,
-0xb7dd400,2,
-0xb7dd440,12,
-0xb7df800,62,
-0xb7df8fc,5,
-0xb820000,2,
-0xb820020,2,
-0xb820030,2,
-0xb820040,2,
-0xb820204,1,
-0xb820304,1,
-0xb82030c,1,
-0xb820314,1,
-0xb82031c,1,
-0xb820324,1,
-0xb82032c,1,
-0xb820334,1,
-0xb82033c,1,
-0xb820344,1,
-0xb82034c,1,
-0xb820354,1,
-0xb82035c,1,
-0xb820364,1,
-0xb82036c,1,
-0xb820374,1,
-0xb82037c,1,
-0xb820f04,15,
-0xb820f44,4,
-0xb820f58,1,
-0xb860000,2,
-0xb860020,2,
-0xb860030,2,
-0xb860040,2,
-0xb860204,1,
-0xb860304,1,
-0xb86030c,1,
-0xb860314,1,
-0xb86031c,1,
-0xb860324,1,
-0xb86032c,1,
-0xb860334,1,
-0xb86033c,1,
-0xb860344,1,
-0xb86034c,1,
-0xb860354,1,
-0xb86035c,1,
-0xb860364,1,
-0xb86036c,1,
-0xb860374,1,
-0xb86037c,1,
-0xb860f04,15,
-0xb860f44,4,
-0xb860f58,1,
-0xb880000,11,
-0xb880030,3,
-0xb880040,3,
-0xb880050,3,
-0xb880060,3,
-0xb880070,3,
-0xb880080,3,
-0xb880090,3,
-0xb8800a0,3,
-0xb880100,17,
-0xb880180,3,
-0xb880190,5,
-0xb8801b0,5,
-0xb8801d0,5,
-0xb8801f0,5,
-0xb880210,5,
-0xb880230,18,
-0xb880400,1,
-0xb880408,4,
-0xb880800,2,
-0xb880820,8,
-0xb880900,9,
-0xb880940,9,
-0xb880980,1,
-0xb880a00,3,
-0xb880a10,3,
-0xb880a20,1,
-0xb880a80,7,
-0xb880aa0,7,
-0xb880ac0,1,
-0xb880b00,9,
-0xb880b40,9,
-0xb880b80,1,
-0xb880c00,27,
-0xb880c80,9,
-0xb880cc0,6,
-0xb880ce0,4,
-0xb880cf4,1,
-0xb880d00,1,
-0xb888000,2,
-0xb888080,2,
-0xb8880a0,6,
-0xb8880c0,1,
-0xb888100,6,
-0xb888120,14,
-0xb889000,17,
-0xb889080,3,
-0xb889090,3,
-0xb8890a0,3,
-0xb8890b0,3,
-0xb8890c0,3,
-0xb8890d0,3,
-0xb8890e0,3,
-0xb8890f0,3,
-0xb889100,1,
-0xb889400,144,
-0xb889800,10,
-0xb88a000,10,
-0xb88a040,3,
-0xb88b000,1,
-0xb88b100,36,
-0xb88b200,2,
-0xb88b280,6,
-0xb88b2a0,6,
-0xb88b2c0,1,
-0xb88b300,4,
-0xb88b320,6,
-0xb88b400,10,
-0xb88b440,10,
-0xb88b480,1,
-0xb88b500,4,
-0xb88b580,24,
-0xb88b600,6,
-0xb88b620,6,
-0xb88b640,1,
-0xb88b680,4,
-0xb88b6a0,6,
-0xb88b6c0,3,
-0xb88b6d0,3,
-0xb88b6e0,1,
-0xb88b700,4,
-0xb88b780,17,
-0xb88b800,3,
-0xb88b810,3,
-0xb88b820,1,
-0xb88b840,7,
-0xb88ba00,27,
-0xb88ba80,4,
-0xb88bac0,25,
-0xb88bb40,6,
-0xb88bb60,2,
-0xb88bb6c,3,
-0xb88bb84,8,
-0xb890000,1,
-0xb8a0000,11,
-0xb8a0030,3,
-0xb8a0040,3,
-0xb8a0050,3,
-0xb8a0060,3,
-0xb8a0070,3,
-0xb8a0080,3,
-0xb8a0090,3,
-0xb8a00a0,3,
-0xb8a0100,17,
-0xb8a0180,3,
-0xb8a0190,5,
-0xb8a01b0,5,
-0xb8a01d0,5,
-0xb8a01f0,5,
-0xb8a0210,5,
-0xb8a0230,18,
-0xb8a0400,1,
-0xb8a0408,4,
-0xb8a0800,2,
-0xb8a0820,8,
-0xb8a0900,9,
-0xb8a0940,9,
-0xb8a0980,1,
-0xb8a0a00,3,
-0xb8a0a10,3,
-0xb8a0a20,1,
-0xb8a0a80,7,
-0xb8a0aa0,7,
-0xb8a0ac0,1,
-0xb8a0b00,9,
-0xb8a0b40,9,
-0xb8a0b80,1,
-0xb8a0c00,27,
-0xb8a0c80,9,
-0xb8a0cc0,6,
-0xb8a0ce0,4,
-0xb8a0cf4,1,
-0xb8a0d00,1,
-0xb8a8000,2,
-0xb8a8080,2,
-0xb8a80a0,6,
-0xb8a80c0,1,
-0xb8a8100,6,
-0xb8a8120,14,
-0xb8a9000,17,
-0xb8a9080,3,
-0xb8a9090,3,
-0xb8a90a0,3,
-0xb8a90b0,3,
-0xb8a90c0,3,
-0xb8a90d0,3,
-0xb8a90e0,3,
-0xb8a90f0,3,
-0xb8a9100,1,
-0xb8a9400,144,
-0xb8a9800,10,
-0xb8aa000,10,
-0xb8aa040,3,
-0xb8ab000,1,
-0xb8ab100,36,
-0xb8ab200,2,
-0xb8ab280,6,
-0xb8ab2a0,6,
-0xb8ab2c0,1,
-0xb8ab300,4,
-0xb8ab320,6,
-0xb8ab400,10,
-0xb8ab440,10,
-0xb8ab480,1,
-0xb8ab500,4,
-0xb8ab580,24,
-0xb8ab600,6,
-0xb8ab620,6,
-0xb8ab640,1,
-0xb8ab680,4,
-0xb8ab6a0,6,
-0xb8ab6c0,3,
-0xb8ab6d0,3,
-0xb8ab6e0,1,
-0xb8ab700,4,
-0xb8ab780,17,
-0xb8ab800,3,
-0xb8ab810,3,
-0xb8ab820,1,
-0xb8ab840,7,
-0xb8aba00,27,
-0xb8aba80,4,
-0xb8abac0,25,
-0xb8abb40,6,
-0xb8abb60,2,
-0xb8abb6c,3,
-0xb8abb84,8,
-0xb8b0000,1,
-0xb8c0000,7,
-0xb8c0020,8,
-0xb8c0080,6,
-0xb8c00a0,6,
-0xb8c00c0,1,
-0xb8c0100,7,
-0xb8c0120,8,
-0xb8c0180,6,
-0xb8c01a0,6,
-0xb8c01c0,1,
-0xb8c0400,15,
-0xb8c0480,6,
-0xb8c04a0,6,
-0xb8c04c0,1,
-0xb8c0500,148,
-0xb8c0780,11,
-0xb8c07c0,1,
-0xb8c0800,51,
-0xb8c0900,4,
-0xb8c0980,41,
-0xb8c0a40,6,
-0xb8c0a60,2,
-0xb8c0a6c,3,
-0xb8c0a84,6,
-0xb8c0c00,27,
-0xb8c0c80,4,
-0xb8c0cc0,25,
-0xb8c0d40,6,
-0xb8c0d60,2,
-0xb8c0d6c,3,
-0xb8c0d84,3,
-0xb8c0e00,36,
-0xb8c0f04,1,
-0xb8c0f30,26,
-0xb8c0fa0,7,
-0xb900000,1,
-0xb900010,4,
-0xb9d0000,2,
-0xb9d000c,1,
-0xb9d0014,1,
-0xb9d001c,5,
-0xb9d0044,1,
-0xb9d0080,4,
-0xb9d00a0,6,
-0xb9d00c0,4,
-0xb9d00e0,6,
-0xb9d0100,4,
-0xb9d0200,4,
-0xb9d0280,24,
-0xb9d0300,4,
-0xb9d0380,24,
-0xb9d0400,4,
-0xb9d0420,20,
-0xb9d0480,4,
-0xb9d04a0,5,
-0xb9d04c0,4,
-0xb9d04e0,5,
-0xb9d0500,4,
-0xb9d0540,4,
-0xb9d0560,6,
-0xb9d0580,4,
-0xb9d05a0,6,
-0xb9d05c0,4,
-0xb9d1000,2,
-0xb9d100c,1,
-0xb9d1014,1,
-0xb9d101c,1,
-0xb9d1024,1,
-0xb9d102c,1,
-0xb9d1034,1,
-0xb9d103c,1,
-0xb9d1044,1,
-0xb9d104c,1,
-0xb9d1054,1,
-0xb9d105c,1,
-0xb9d1064,1,
-0xb9d106c,1,
-0xb9d1074,1,
-0xb9d107c,1,
-0xb9d1084,1,
-0xb9d108c,1,
-0xb9d1094,1,
-0xb9d1800,2,
-0xb9d180c,1,
-0xb9d1814,1,
-0xb9d181c,1,
-0xb9d1824,1,
-0xb9d182c,1,
-0xb9d1834,1,
-0xb9d183c,1,
-0xb9d1844,1,
-0xb9d184c,1,
-0xb9d1854,1,
-0xb9d185c,1,
-0xb9d1864,1,
-0xb9d186c,1,
-0xb9d1874,1,
-0xb9d187c,1,
-0xb9d1884,1,
-0xb9d188c,1,
-0xb9d1894,1,
-0xb9d2000,2,
-0xb9d200c,1,
-0xb9d2014,1,
-0xb9d201c,1,
-0xb9d2024,1,
-0xb9d202c,1,
-0xb9d2034,1,
-0xb9d203c,1,
-0xb9d2044,1,
-0xb9d204c,1,
-0xb9d2054,1,
-0xb9d205c,1,
-0xb9d2064,1,
-0xb9d206c,1,
-0xb9d2074,1,
-0xb9d207c,1,
-0xb9d2084,1,
-0xb9d208c,1,
-0xb9d2094,1,
-0xb9d2800,2,
-0xb9d280c,1,
-0xb9d2814,1,
-0xb9d281c,1,
-0xb9d2824,1,
-0xb9d282c,1,
-0xb9d2834,1,
-0xb9d283c,1,
-0xb9d2844,1,
-0xb9d284c,1,
-0xb9d2854,1,
-0xb9d285c,1,
-0xb9d2864,1,
-0xb9d286c,1,
-0xb9d2874,1,
-0xb9d287c,1,
-0xb9d2884,1,
-0xb9d288c,1,
-0xb9d2894,1,
-0xb9d5000,2,
-0xb9d500c,1,
-0xb9d5200,27,
-0xb9d5280,4,
-0xb9d52c0,25,
-0xb9d5340,6,
-0xb9d5360,2,
-0xb9d536c,3,
-0xb9d5384,10,
-0xb9d5400,2,
-0xb9d5440,12,
-0xb9d8000,2,
-0xb9d800c,1,
-0xb9d8014,1,
-0xb9d801c,5,
-0xb9d8044,1,
-0xb9d8080,4,
-0xb9d80a0,6,
-0xb9d80c0,4,
-0xb9d80e0,6,
-0xb9d8100,4,
-0xb9d8200,4,
-0xb9d8280,24,
-0xb9d8300,4,
-0xb9d8380,24,
-0xb9d8400,4,
-0xb9d8420,20,
-0xb9d8480,4,
-0xb9d84a0,5,
-0xb9d84c0,4,
-0xb9d84e0,5,
-0xb9d8500,4,
-0xb9d8540,4,
-0xb9d8560,6,
-0xb9d8580,4,
-0xb9d85a0,6,
-0xb9d85c0,4,
-0xb9dd000,2,
-0xb9dd00c,1,
-0xb9dd200,27,
-0xb9dd280,4,
-0xb9dd2c0,25,
-0xb9dd340,6,
-0xb9dd360,2,
-0xb9dd36c,3,
-0xb9dd384,5,
-0xb9dd400,2,
-0xb9dd440,12,
-0xb9df800,62,
-0xb9df8fc,5,
-0xba20000,2,
-0xba20020,2,
-0xba20030,2,
-0xba20040,2,
-0xba20204,1,
-0xba20304,1,
-0xba2030c,1,
-0xba20314,1,
-0xba2031c,1,
-0xba20324,1,
-0xba2032c,1,
-0xba20334,1,
-0xba2033c,1,
-0xba20344,1,
-0xba2034c,1,
-0xba20354,1,
-0xba2035c,1,
-0xba20364,1,
-0xba2036c,1,
-0xba20374,1,
-0xba2037c,1,
-0xba20f04,15,
-0xba20f44,4,
-0xba20f58,1,
-0xba60000,2,
-0xba60020,2,
-0xba60030,2,
-0xba60040,2,
-0xba60204,1,
-0xba60304,1,
-0xba6030c,1,
-0xba60314,1,
-0xba6031c,1,
-0xba60324,1,
-0xba6032c,1,
-0xba60334,1,
-0xba6033c,1,
-0xba60344,1,
-0xba6034c,1,
-0xba60354,1,
-0xba6035c,1,
-0xba60364,1,
-0xba6036c,1,
-0xba60374,1,
-0xba6037c,1,
-0xba60f04,15,
-0xba60f44,4,
-0xba60f58,1,
-0xba80000,11,
-0xba80030,3,
-0xba80040,3,
-0xba80050,3,
-0xba80060,3,
-0xba80070,3,
-0xba80080,3,
-0xba80090,3,
-0xba800a0,3,
-0xba80100,17,
-0xba80180,3,
-0xba80190,5,
-0xba801b0,5,
-0xba801d0,5,
-0xba801f0,5,
-0xba80210,5,
-0xba80230,18,
-0xba80400,1,
-0xba80408,4,
-0xba80800,2,
-0xba80820,8,
-0xba80900,9,
-0xba80940,9,
-0xba80980,1,
-0xba80a00,3,
-0xba80a10,3,
-0xba80a20,1,
-0xba80a80,7,
-0xba80aa0,7,
-0xba80ac0,1,
-0xba80b00,9,
-0xba80b40,9,
-0xba80b80,1,
-0xba80c00,27,
-0xba80c80,9,
-0xba80cc0,6,
-0xba80ce0,4,
-0xba80cf4,1,
-0xba80d00,1,
-0xba88000,2,
-0xba88080,2,
-0xba880a0,6,
-0xba880c0,1,
-0xba88100,6,
-0xba88120,14,
-0xba89000,17,
-0xba89080,3,
-0xba89090,3,
-0xba890a0,3,
-0xba890b0,3,
-0xba890c0,3,
-0xba890d0,3,
-0xba890e0,3,
-0xba890f0,3,
-0xba89100,1,
-0xba89400,144,
-0xba89800,10,
-0xba8a000,10,
-0xba8a040,3,
-0xba8b000,1,
-0xba8b100,36,
-0xba8b200,2,
-0xba8b280,6,
-0xba8b2a0,6,
-0xba8b2c0,1,
-0xba8b300,4,
-0xba8b320,6,
-0xba8b400,10,
-0xba8b440,10,
-0xba8b480,1,
-0xba8b500,4,
-0xba8b580,24,
-0xba8b600,6,
-0xba8b620,6,
-0xba8b640,1,
-0xba8b680,4,
-0xba8b6a0,6,
-0xba8b6c0,3,
-0xba8b6d0,3,
-0xba8b6e0,1,
-0xba8b700,4,
-0xba8b780,17,
-0xba8b800,3,
-0xba8b810,3,
-0xba8b820,1,
-0xba8b840,7,
-0xba8ba00,27,
-0xba8ba80,4,
-0xba8bac0,25,
-0xba8bb40,6,
-0xba8bb60,2,
-0xba8bb6c,3,
-0xba8bb84,8,
-0xba90000,1,
-0xbaa0000,11,
-0xbaa0030,3,
-0xbaa0040,3,
-0xbaa0050,3,
-0xbaa0060,3,
-0xbaa0070,3,
-0xbaa0080,3,
-0xbaa0090,3,
-0xbaa00a0,3,
-0xbaa0100,17,
-0xbaa0180,3,
-0xbaa0190,5,
-0xbaa01b0,5,
-0xbaa01d0,5,
-0xbaa01f0,5,
-0xbaa0210,5,
-0xbaa0230,18,
-0xbaa0400,1,
-0xbaa0408,4,
-0xbaa0800,2,
-0xbaa0820,8,
-0xbaa0900,9,
-0xbaa0940,9,
-0xbaa0980,1,
-0xbaa0a00,3,
-0xbaa0a10,3,
-0xbaa0a20,1,
-0xbaa0a80,7,
-0xbaa0aa0,7,
-0xbaa0ac0,1,
-0xbaa0b00,9,
-0xbaa0b40,9,
-0xbaa0b80,1,
-0xbaa0c00,27,
-0xbaa0c80,9,
-0xbaa0cc0,6,
-0xbaa0ce0,4,
-0xbaa0cf4,1,
-0xbaa0d00,1,
-0xbaa8000,2,
-0xbaa8080,2,
-0xbaa80a0,6,
-0xbaa80c0,1,
-0xbaa8100,6,
-0xbaa8120,14,
-0xbaa9000,17,
-0xbaa9080,3,
-0xbaa9090,3,
-0xbaa90a0,3,
-0xbaa90b0,3,
-0xbaa90c0,3,
-0xbaa90d0,3,
-0xbaa90e0,3,
-0xbaa90f0,3,
-0xbaa9100,1,
-0xbaa9400,144,
-0xbaa9800,10,
-0xbaaa000,10,
-0xbaaa040,3,
-0xbaab000,1,
-0xbaab100,36,
-0xbaab200,2,
-0xbaab280,6,
-0xbaab2a0,6,
-0xbaab2c0,1,
-0xbaab300,4,
-0xbaab320,6,
-0xbaab400,10,
-0xbaab440,10,
-0xbaab480,1,
-0xbaab500,4,
-0xbaab580,24,
-0xbaab600,6,
-0xbaab620,6,
-0xbaab640,1,
-0xbaab680,4,
-0xbaab6a0,6,
-0xbaab6c0,3,
-0xbaab6d0,3,
-0xbaab6e0,1,
-0xbaab700,4,
-0xbaab780,17,
-0xbaab800,3,
-0xbaab810,3,
-0xbaab820,1,
-0xbaab840,7,
-0xbaaba00,27,
-0xbaaba80,4,
-0xbaabac0,25,
-0xbaabb40,6,
-0xbaabb60,2,
-0xbaabb6c,3,
-0xbaabb84,8,
-0xbab0000,1,
-0xbac0000,7,
-0xbac0020,8,
-0xbac0080,6,
-0xbac00a0,6,
-0xbac00c0,1,
-0xbac0100,7,
-0xbac0120,8,
-0xbac0180,6,
-0xbac01a0,6,
-0xbac01c0,1,
-0xbac0400,15,
-0xbac0480,6,
-0xbac04a0,6,
-0xbac04c0,1,
-0xbac0500,148,
-0xbac0780,11,
-0xbac07c0,1,
-0xbac0800,51,
-0xbac0900,4,
-0xbac0980,41,
-0xbac0a40,6,
-0xbac0a60,2,
-0xbac0a6c,3,
-0xbac0a84,6,
-0xbac0c00,27,
-0xbac0c80,4,
-0xbac0cc0,25,
-0xbac0d40,6,
-0xbac0d60,2,
-0xbac0d6c,3,
-0xbac0d84,3,
-0xbac0e00,36,
-0xbac0f04,1,
-0xbac0f30,26,
-0xbac0fa0,7,
-0xbb00000,1,
-0xbb00010,4,
-0xbbd0000,2,
-0xbbd000c,1,
-0xbbd0014,1,
-0xbbd001c,5,
-0xbbd0044,1,
-0xbbd0080,4,
-0xbbd00a0,6,
-0xbbd00c0,4,
-0xbbd00e0,6,
-0xbbd0100,4,
-0xbbd0200,4,
-0xbbd0280,24,
-0xbbd0300,4,
-0xbbd0380,24,
-0xbbd0400,4,
-0xbbd0420,20,
-0xbbd0480,4,
-0xbbd04a0,5,
-0xbbd04c0,4,
-0xbbd04e0,5,
-0xbbd0500,4,
-0xbbd0540,4,
-0xbbd0560,6,
-0xbbd0580,4,
-0xbbd05a0,6,
-0xbbd05c0,4,
-0xbbd1000,2,
-0xbbd100c,1,
-0xbbd1014,1,
-0xbbd101c,1,
-0xbbd1024,1,
-0xbbd102c,1,
-0xbbd1034,1,
-0xbbd103c,1,
-0xbbd1044,1,
-0xbbd104c,1,
-0xbbd1054,1,
-0xbbd105c,1,
-0xbbd1064,1,
-0xbbd106c,1,
-0xbbd1074,1,
-0xbbd107c,1,
-0xbbd1084,1,
-0xbbd108c,1,
-0xbbd1094,1,
-0xbbd1800,2,
-0xbbd180c,1,
-0xbbd1814,1,
-0xbbd181c,1,
-0xbbd1824,1,
-0xbbd182c,1,
-0xbbd1834,1,
-0xbbd183c,1,
-0xbbd1844,1,
-0xbbd184c,1,
-0xbbd1854,1,
-0xbbd185c,1,
-0xbbd1864,1,
-0xbbd186c,1,
-0xbbd1874,1,
-0xbbd187c,1,
-0xbbd1884,1,
-0xbbd188c,1,
-0xbbd1894,1,
-0xbbd2000,2,
-0xbbd200c,1,
-0xbbd2014,1,
-0xbbd201c,1,
-0xbbd2024,1,
-0xbbd202c,1,
-0xbbd2034,1,
-0xbbd203c,1,
-0xbbd2044,1,
-0xbbd204c,1,
-0xbbd2054,1,
-0xbbd205c,1,
-0xbbd2064,1,
-0xbbd206c,1,
-0xbbd2074,1,
-0xbbd207c,1,
-0xbbd2084,1,
-0xbbd208c,1,
-0xbbd2094,1,
-0xbbd2800,2,
-0xbbd280c,1,
-0xbbd2814,1,
-0xbbd281c,1,
-0xbbd2824,1,
-0xbbd282c,1,
-0xbbd2834,1,
-0xbbd283c,1,
-0xbbd2844,1,
-0xbbd284c,1,
-0xbbd2854,1,
-0xbbd285c,1,
-0xbbd2864,1,
-0xbbd286c,1,
-0xbbd2874,1,
-0xbbd287c,1,
-0xbbd2884,1,
-0xbbd288c,1,
-0xbbd2894,1,
-0xbbd5000,2,
-0xbbd500c,1,
-0xbbd5200,27,
-0xbbd5280,4,
-0xbbd52c0,25,
-0xbbd5340,6,
-0xbbd5360,2,
-0xbbd536c,3,
-0xbbd5384,10,
-0xbbd5400,2,
-0xbbd5440,12,
-0xbbd8000,2,
-0xbbd800c,1,
-0xbbd8014,1,
-0xbbd801c,5,
-0xbbd8044,1,
-0xbbd8080,4,
-0xbbd80a0,6,
-0xbbd80c0,4,
-0xbbd80e0,6,
-0xbbd8100,4,
-0xbbd8200,4,
-0xbbd8280,24,
-0xbbd8300,4,
-0xbbd8380,24,
-0xbbd8400,4,
-0xbbd8420,20,
-0xbbd8480,4,
-0xbbd84a0,5,
-0xbbd84c0,4,
-0xbbd84e0,5,
-0xbbd8500,4,
-0xbbd8540,4,
-0xbbd8560,6,
-0xbbd8580,4,
-0xbbd85a0,6,
-0xbbd85c0,4,
-0xbbdd000,2,
-0xbbdd00c,1,
-0xbbdd200,27,
-0xbbdd280,4,
-0xbbdd2c0,25,
-0xbbdd340,6,
-0xbbdd360,2,
-0xbbdd36c,3,
-0xbbdd384,5,
-0xbbdd400,2,
-0xbbdd440,12,
-0xbbdf800,62,
-0xbbdf8fc,5,
-0xbc20000,2,
-0xbc20020,2,
-0xbc20030,2,
-0xbc20040,2,
-0xbc20204,1,
-0xbc20304,1,
-0xbc2030c,1,
-0xbc20314,1,
-0xbc2031c,1,
-0xbc20324,1,
-0xbc2032c,1,
-0xbc20334,1,
-0xbc2033c,1,
-0xbc20344,1,
-0xbc2034c,1,
-0xbc20354,1,
-0xbc2035c,1,
-0xbc20364,1,
-0xbc2036c,1,
-0xbc20374,1,
-0xbc2037c,1,
-0xbc20f04,15,
-0xbc20f44,4,
-0xbc20f58,1,
-0xbc60000,2,
-0xbc60020,2,
-0xbc60030,2,
-0xbc60040,2,
-0xbc60204,1,
-0xbc60304,1,
-0xbc6030c,1,
-0xbc60314,1,
-0xbc6031c,1,
-0xbc60324,1,
-0xbc6032c,1,
-0xbc60334,1,
-0xbc6033c,1,
-0xbc60344,1,
-0xbc6034c,1,
-0xbc60354,1,
-0xbc6035c,1,
-0xbc60364,1,
-0xbc6036c,1,
-0xbc60374,1,
-0xbc6037c,1,
-0xbc60f04,15,
-0xbc60f44,4,
-0xbc60f58,1,
-0xbc80000,11,
-0xbc80030,3,
-0xbc80040,3,
-0xbc80050,3,
-0xbc80060,3,
-0xbc80070,3,
-0xbc80080,3,
-0xbc80090,3,
-0xbc800a0,3,
-0xbc80100,17,
-0xbc80180,3,
-0xbc80190,5,
-0xbc801b0,5,
-0xbc801d0,5,
-0xbc801f0,5,
-0xbc80210,5,
-0xbc80230,18,
-0xbc80400,1,
-0xbc80408,4,
-0xbc80800,2,
-0xbc80820,8,
-0xbc80900,9,
-0xbc80940,9,
-0xbc80980,1,
-0xbc80a00,3,
-0xbc80a10,3,
-0xbc80a20,1,
-0xbc80a80,7,
-0xbc80aa0,7,
-0xbc80ac0,1,
-0xbc80b00,9,
-0xbc80b40,9,
-0xbc80b80,1,
-0xbc80c00,27,
-0xbc80c80,9,
-0xbc80cc0,6,
-0xbc80ce0,4,
-0xbc80cf4,1,
-0xbc80d00,1,
-0xbc88000,2,
-0xbc88080,2,
-0xbc880a0,6,
-0xbc880c0,1,
-0xbc88100,6,
-0xbc88120,14,
-0xbc89000,17,
-0xbc89080,3,
-0xbc89090,3,
-0xbc890a0,3,
-0xbc890b0,3,
-0xbc890c0,3,
-0xbc890d0,3,
-0xbc890e0,3,
-0xbc890f0,3,
-0xbc89100,1,
-0xbc89400,144,
-0xbc89800,10,
-0xbc8a000,10,
-0xbc8a040,3,
-0xbc8b000,1,
-0xbc8b100,36,
-0xbc8b200,2,
-0xbc8b280,6,
-0xbc8b2a0,6,
-0xbc8b2c0,1,
-0xbc8b300,4,
-0xbc8b320,6,
-0xbc8b400,10,
-0xbc8b440,10,
-0xbc8b480,1,
-0xbc8b500,4,
-0xbc8b580,24,
-0xbc8b600,6,
-0xbc8b620,6,
-0xbc8b640,1,
-0xbc8b680,4,
-0xbc8b6a0,6,
-0xbc8b6c0,3,
-0xbc8b6d0,3,
-0xbc8b6e0,1,
-0xbc8b700,4,
-0xbc8b780,17,
-0xbc8b800,3,
-0xbc8b810,3,
-0xbc8b820,1,
-0xbc8b840,7,
-0xbc8ba00,27,
-0xbc8ba80,4,
-0xbc8bac0,25,
-0xbc8bb40,6,
-0xbc8bb60,2,
-0xbc8bb6c,3,
-0xbc8bb84,8,
-0xbc90000,1,
-0xbca0000,11,
-0xbca0030,3,
-0xbca0040,3,
-0xbca0050,3,
-0xbca0060,3,
-0xbca0070,3,
-0xbca0080,3,
-0xbca0090,3,
-0xbca00a0,3,
-0xbca0100,17,
-0xbca0180,3,
-0xbca0190,5,
-0xbca01b0,5,
-0xbca01d0,5,
-0xbca01f0,5,
-0xbca0210,5,
-0xbca0230,18,
-0xbca0400,1,
-0xbca0408,4,
-0xbca0800,2,
-0xbca0820,8,
-0xbca0900,9,
-0xbca0940,9,
-0xbca0980,1,
-0xbca0a00,3,
-0xbca0a10,3,
-0xbca0a20,1,
-0xbca0a80,7,
-0xbca0aa0,7,
-0xbca0ac0,1,
-0xbca0b00,9,
-0xbca0b40,9,
-0xbca0b80,1,
-0xbca0c00,27,
-0xbca0c80,9,
-0xbca0cc0,6,
-0xbca0ce0,4,
-0xbca0cf4,1,
-0xbca0d00,1,
-0xbca8000,2,
-0xbca8080,2,
-0xbca80a0,6,
-0xbca80c0,1,
-0xbca8100,6,
-0xbca8120,14,
-0xbca9000,17,
-0xbca9080,3,
-0xbca9090,3,
-0xbca90a0,3,
-0xbca90b0,3,
-0xbca90c0,3,
-0xbca90d0,3,
-0xbca90e0,3,
-0xbca90f0,3,
-0xbca9100,1,
-0xbca9400,144,
-0xbca9800,10,
-0xbcaa000,10,
-0xbcaa040,3,
-0xbcab000,1,
-0xbcab100,36,
-0xbcab200,2,
-0xbcab280,6,
-0xbcab2a0,6,
-0xbcab2c0,1,
-0xbcab300,4,
-0xbcab320,6,
-0xbcab400,10,
-0xbcab440,10,
-0xbcab480,1,
-0xbcab500,4,
-0xbcab580,24,
-0xbcab600,6,
-0xbcab620,6,
-0xbcab640,1,
-0xbcab680,4,
-0xbcab6a0,6,
-0xbcab6c0,3,
-0xbcab6d0,3,
-0xbcab6e0,1,
-0xbcab700,4,
-0xbcab780,17,
-0xbcab800,3,
-0xbcab810,3,
-0xbcab820,1,
-0xbcab840,7,
-0xbcaba00,27,
-0xbcaba80,4,
-0xbcabac0,25,
-0xbcabb40,6,
-0xbcabb60,2,
-0xbcabb6c,3,
-0xbcabb84,8,
-0xbcb0000,1,
-0xbcc0000,7,
-0xbcc0020,8,
-0xbcc0080,6,
-0xbcc00a0,6,
-0xbcc00c0,1,
-0xbcc0100,7,
-0xbcc0120,8,
-0xbcc0180,6,
-0xbcc01a0,6,
-0xbcc01c0,1,
-0xbcc0400,15,
-0xbcc0480,6,
-0xbcc04a0,6,
-0xbcc04c0,1,
-0xbcc0500,148,
-0xbcc0780,11,
-0xbcc07c0,1,
-0xbcc0800,51,
-0xbcc0900,4,
-0xbcc0980,41,
-0xbcc0a40,6,
-0xbcc0a60,2,
-0xbcc0a6c,3,
-0xbcc0a84,6,
-0xbcc0c00,27,
-0xbcc0c80,4,
-0xbcc0cc0,25,
-0xbcc0d40,6,
-0xbcc0d60,2,
-0xbcc0d6c,3,
-0xbcc0d84,3,
-0xbcc0e00,36,
-0xbcc0f04,1,
-0xbcc0f30,26,
-0xbcc0fa0,7,
-0xbd00000,1,
-0xbd00010,4,
-0xbdd0000,2,
-0xbdd000c,1,
-0xbdd0014,1,
-0xbdd001c,5,
-0xbdd0044,1,
-0xbdd0080,4,
-0xbdd00a0,6,
-0xbdd00c0,4,
-0xbdd00e0,6,
-0xbdd0100,4,
-0xbdd0200,4,
-0xbdd0280,24,
-0xbdd0300,4,
-0xbdd0380,24,
-0xbdd0400,4,
-0xbdd0420,20,
-0xbdd0480,4,
-0xbdd04a0,5,
-0xbdd04c0,4,
-0xbdd04e0,5,
-0xbdd0500,4,
-0xbdd0540,4,
-0xbdd0560,6,
-0xbdd0580,4,
-0xbdd05a0,6,
-0xbdd05c0,4,
-0xbdd1000,2,
-0xbdd100c,1,
-0xbdd1014,1,
-0xbdd101c,1,
-0xbdd1024,1,
-0xbdd102c,1,
-0xbdd1034,1,
-0xbdd103c,1,
-0xbdd1044,1,
-0xbdd104c,1,
-0xbdd1054,1,
-0xbdd105c,1,
-0xbdd1064,1,
-0xbdd106c,1,
-0xbdd1074,1,
-0xbdd107c,1,
-0xbdd1084,1,
-0xbdd108c,1,
-0xbdd1094,1,
-0xbdd1800,2,
-0xbdd180c,1,
-0xbdd1814,1,
-0xbdd181c,1,
-0xbdd1824,1,
-0xbdd182c,1,
-0xbdd1834,1,
-0xbdd183c,1,
-0xbdd1844,1,
-0xbdd184c,1,
-0xbdd1854,1,
-0xbdd185c,1,
-0xbdd1864,1,
-0xbdd186c,1,
-0xbdd1874,1,
-0xbdd187c,1,
-0xbdd1884,1,
-0xbdd188c,1,
-0xbdd1894,1,
-0xbdd2000,2,
-0xbdd200c,1,
-0xbdd2014,1,
-0xbdd201c,1,
-0xbdd2024,1,
-0xbdd202c,1,
-0xbdd2034,1,
-0xbdd203c,1,
-0xbdd2044,1,
-0xbdd204c,1,
-0xbdd2054,1,
-0xbdd205c,1,
-0xbdd2064,1,
-0xbdd206c,1,
-0xbdd2074,1,
-0xbdd207c,1,
-0xbdd2084,1,
-0xbdd208c,1,
-0xbdd2094,1,
-0xbdd2800,2,
-0xbdd280c,1,
-0xbdd2814,1,
-0xbdd281c,1,
-0xbdd2824,1,
-0xbdd282c,1,
-0xbdd2834,1,
-0xbdd283c,1,
-0xbdd2844,1,
-0xbdd284c,1,
-0xbdd2854,1,
-0xbdd285c,1,
-0xbdd2864,1,
-0xbdd286c,1,
-0xbdd2874,1,
-0xbdd287c,1,
-0xbdd2884,1,
-0xbdd288c,1,
-0xbdd2894,1,
-0xbdd5000,2,
-0xbdd500c,1,
-0xbdd5200,27,
-0xbdd5280,4,
-0xbdd52c0,25,
-0xbdd5340,6,
-0xbdd5360,2,
-0xbdd536c,3,
-0xbdd5384,10,
-0xbdd5400,2,
-0xbdd5440,12,
-0xbdd8000,2,
-0xbdd800c,1,
-0xbdd8014,1,
-0xbdd801c,5,
-0xbdd8044,1,
-0xbdd8080,4,
-0xbdd80a0,6,
-0xbdd80c0,4,
-0xbdd80e0,6,
-0xbdd8100,4,
-0xbdd8200,4,
-0xbdd8280,24,
-0xbdd8300,4,
-0xbdd8380,24,
-0xbdd8400,4,
-0xbdd8420,20,
-0xbdd8480,4,
-0xbdd84a0,5,
-0xbdd84c0,4,
-0xbdd84e0,5,
-0xbdd8500,4,
-0xbdd8540,4,
-0xbdd8560,6,
-0xbdd8580,4,
-0xbdd85a0,6,
-0xbdd85c0,4,
-0xbddd000,2,
-0xbddd00c,1,
-0xbddd200,27,
-0xbddd280,4,
-0xbddd2c0,25,
-0xbddd340,6,
-0xbddd360,2,
-0xbddd36c,3,
-0xbddd384,5,
-0xbddd400,2,
-0xbddd440,12,
-0xbddf800,62,
-0xbddf8fc,5,
-0xbe20000,2,
-0xbe20020,2,
-0xbe20030,2,
-0xbe20040,2,
-0xbe20204,1,
-0xbe20304,1,
-0xbe2030c,1,
-0xbe20314,1,
-0xbe2031c,1,
-0xbe20324,1,
-0xbe2032c,1,
-0xbe20334,1,
-0xbe2033c,1,
-0xbe20344,1,
-0xbe2034c,1,
-0xbe20354,1,
-0xbe2035c,1,
-0xbe20364,1,
-0xbe2036c,1,
-0xbe20374,1,
-0xbe2037c,1,
-0xbe20f04,15,
-0xbe20f44,4,
-0xbe20f58,1,
-0xbe60000,2,
-0xbe60020,2,
-0xbe60030,2,
-0xbe60040,2,
-0xbe60204,1,
-0xbe60304,1,
-0xbe6030c,1,
-0xbe60314,1,
-0xbe6031c,1,
-0xbe60324,1,
-0xbe6032c,1,
-0xbe60334,1,
-0xbe6033c,1,
-0xbe60344,1,
-0xbe6034c,1,
-0xbe60354,1,
-0xbe6035c,1,
-0xbe60364,1,
-0xbe6036c,1,
-0xbe60374,1,
-0xbe6037c,1,
-0xbe60f04,15,
-0xbe60f44,4,
-0xbe60f58,1,
-0xbe80000,11,
-0xbe80030,3,
-0xbe80040,3,
-0xbe80050,3,
-0xbe80060,3,
-0xbe80070,3,
-0xbe80080,3,
-0xbe80090,3,
-0xbe800a0,3,
-0xbe80100,17,
-0xbe80180,3,
-0xbe80190,5,
-0xbe801b0,5,
-0xbe801d0,5,
-0xbe801f0,5,
-0xbe80210,5,
-0xbe80230,18,
-0xbe80400,1,
-0xbe80408,4,
-0xbe80800,2,
-0xbe80820,8,
-0xbe80900,9,
-0xbe80940,9,
-0xbe80980,1,
-0xbe80a00,3,
-0xbe80a10,3,
-0xbe80a20,1,
-0xbe80a80,7,
-0xbe80aa0,7,
-0xbe80ac0,1,
-0xbe80b00,9,
-0xbe80b40,9,
-0xbe80b80,1,
-0xbe80c00,27,
-0xbe80c80,9,
-0xbe80cc0,6,
-0xbe80ce0,4,
-0xbe80cf4,1,
-0xbe80d00,1,
-0xbe88000,2,
-0xbe88080,2,
-0xbe880a0,6,
-0xbe880c0,1,
-0xbe88100,6,
-0xbe88120,14,
-0xbe89000,17,
-0xbe89080,3,
-0xbe89090,3,
-0xbe890a0,3,
-0xbe890b0,3,
-0xbe890c0,3,
-0xbe890d0,3,
-0xbe890e0,3,
-0xbe890f0,3,
-0xbe89100,1,
-0xbe89400,144,
-0xbe89800,10,
-0xbe8a000,10,
-0xbe8a040,3,
-0xbe8b000,1,
-0xbe8b100,36,
-0xbe8b200,2,
-0xbe8b280,6,
-0xbe8b2a0,6,
-0xbe8b2c0,1,
-0xbe8b300,4,
-0xbe8b320,6,
-0xbe8b400,10,
-0xbe8b440,10,
-0xbe8b480,1,
-0xbe8b500,4,
-0xbe8b580,24,
-0xbe8b600,6,
-0xbe8b620,6,
-0xbe8b640,1,
-0xbe8b680,4,
-0xbe8b6a0,6,
-0xbe8b6c0,3,
-0xbe8b6d0,3,
-0xbe8b6e0,1,
-0xbe8b700,4,
-0xbe8b780,17,
-0xbe8b800,3,
-0xbe8b810,3,
-0xbe8b820,1,
-0xbe8b840,7,
-0xbe8ba00,27,
-0xbe8ba80,4,
-0xbe8bac0,25,
-0xbe8bb40,6,
-0xbe8bb60,2,
-0xbe8bb6c,3,
-0xbe8bb84,8,
-0xbe90000,1,
-0xbea0000,11,
-0xbea0030,3,
-0xbea0040,3,
-0xbea0050,3,
-0xbea0060,3,
-0xbea0070,3,
-0xbea0080,3,
-0xbea0090,3,
-0xbea00a0,3,
-0xbea0100,17,
-0xbea0180,3,
-0xbea0190,5,
-0xbea01b0,5,
-0xbea01d0,5,
-0xbea01f0,5,
-0xbea0210,5,
-0xbea0230,18,
-0xbea0400,1,
-0xbea0408,4,
-0xbea0800,2,
-0xbea0820,8,
-0xbea0900,9,
-0xbea0940,9,
-0xbea0980,1,
-0xbea0a00,3,
-0xbea0a10,3,
-0xbea0a20,1,
-0xbea0a80,7,
-0xbea0aa0,7,
-0xbea0ac0,1,
-0xbea0b00,9,
-0xbea0b40,9,
-0xbea0b80,1,
-0xbea0c00,27,
-0xbea0c80,9,
-0xbea0cc0,6,
-0xbea0ce0,4,
-0xbea0cf4,1,
-0xbea0d00,1,
-0xbea8000,2,
-0xbea8080,2,
-0xbea80a0,6,
-0xbea80c0,1,
-0xbea8100,6,
-0xbea8120,14,
-0xbea9000,17,
-0xbea9080,3,
-0xbea9090,3,
-0xbea90a0,3,
-0xbea90b0,3,
-0xbea90c0,3,
-0xbea90d0,3,
-0xbea90e0,3,
-0xbea90f0,3,
-0xbea9100,1,
-0xbea9400,144,
-0xbea9800,10,
-0xbeaa000,10,
-0xbeaa040,3,
-0xbeab000,1,
-0xbeab100,36,
-0xbeab200,2,
-0xbeab280,6,
-0xbeab2a0,6,
-0xbeab2c0,1,
-0xbeab300,4,
-0xbeab320,6,
-0xbeab400,10,
-0xbeab440,10,
-0xbeab480,1,
-0xbeab500,4,
-0xbeab580,24,
-0xbeab600,6,
-0xbeab620,6,
-0xbeab640,1,
-0xbeab680,4,
-0xbeab6a0,6,
-0xbeab6c0,3,
-0xbeab6d0,3,
-0xbeab6e0,1,
-0xbeab700,4,
-0xbeab780,17,
-0xbeab800,3,
-0xbeab810,3,
-0xbeab820,1,
-0xbeab840,7,
-0xbeaba00,27,
-0xbeaba80,4,
-0xbeabac0,25,
-0xbeabb40,6,
-0xbeabb60,2,
-0xbeabb6c,3,
-0xbeabb84,8,
-0xbeb0000,1,
-0xbec0000,7,
-0xbec0020,8,
-0xbec0080,6,
-0xbec00a0,6,
-0xbec00c0,1,
-0xbec0100,7,
-0xbec0120,8,
-0xbec0180,6,
-0xbec01a0,6,
-0xbec01c0,1,
-0xbec0400,15,
-0xbec0480,6,
-0xbec04a0,6,
-0xbec04c0,1,
-0xbec0500,148,
-0xbec0780,11,
-0xbec07c0,1,
-0xbec0800,51,
-0xbec0900,4,
-0xbec0980,41,
-0xbec0a40,6,
-0xbec0a60,2,
-0xbec0a6c,3,
-0xbec0a84,6,
-0xbec0c00,27,
-0xbec0c80,4,
-0xbec0cc0,25,
-0xbec0d40,6,
-0xbec0d60,2,
-0xbec0d6c,3,
-0xbec0d84,3,
-0xbec0e00,36,
-0xbec0f04,1,
-0xbec0f30,26,
-0xbec0fa0,7,
-0xbf00000,1,
-0xbf00010,4,
-0xbfd0000,2,
-0xbfd000c,1,
-0xbfd0014,1,
-0xbfd001c,5,
-0xbfd0044,1,
-0xbfd0080,4,
-0xbfd00a0,6,
-0xbfd00c0,4,
-0xbfd00e0,6,
-0xbfd0100,4,
-0xbfd0200,4,
-0xbfd0280,24,
-0xbfd0300,4,
-0xbfd0380,24,
-0xbfd0400,4,
-0xbfd0420,20,
-0xbfd0480,4,
-0xbfd04a0,5,
-0xbfd04c0,4,
-0xbfd04e0,5,
-0xbfd0500,4,
-0xbfd0540,4,
-0xbfd0560,6,
-0xbfd0580,4,
-0xbfd05a0,6,
-0xbfd05c0,4,
-0xbfd1000,2,
-0xbfd100c,1,
-0xbfd1014,1,
-0xbfd101c,1,
-0xbfd1024,1,
-0xbfd102c,1,
-0xbfd1034,1,
-0xbfd103c,1,
-0xbfd1044,1,
-0xbfd104c,1,
-0xbfd1054,1,
-0xbfd105c,1,
-0xbfd1064,1,
-0xbfd106c,1,
-0xbfd1074,1,
-0xbfd107c,1,
-0xbfd1084,1,
-0xbfd108c,1,
-0xbfd1094,1,
-0xbfd1800,2,
-0xbfd180c,1,
-0xbfd1814,1,
-0xbfd181c,1,
-0xbfd1824,1,
-0xbfd182c,1,
-0xbfd1834,1,
-0xbfd183c,1,
-0xbfd1844,1,
-0xbfd184c,1,
-0xbfd1854,1,
-0xbfd185c,1,
-0xbfd1864,1,
-0xbfd186c,1,
-0xbfd1874,1,
-0xbfd187c,1,
-0xbfd1884,1,
-0xbfd188c,1,
-0xbfd1894,1,
-0xbfd2000,2,
-0xbfd200c,1,
-0xbfd2014,1,
-0xbfd201c,1,
-0xbfd2024,1,
-0xbfd202c,1,
-0xbfd2034,1,
-0xbfd203c,1,
-0xbfd2044,1,
-0xbfd204c,1,
-0xbfd2054,1,
-0xbfd205c,1,
-0xbfd2064,1,
-0xbfd206c,1,
-0xbfd2074,1,
-0xbfd207c,1,
-0xbfd2084,1,
-0xbfd208c,1,
-0xbfd2094,1,
-0xbfd2800,2,
-0xbfd280c,1,
-0xbfd2814,1,
-0xbfd281c,1,
-0xbfd2824,1,
-0xbfd282c,1,
-0xbfd2834,1,
-0xbfd283c,1,
-0xbfd2844,1,
-0xbfd284c,1,
-0xbfd2854,1,
-0xbfd285c,1,
-0xbfd2864,1,
-0xbfd286c,1,
-0xbfd2874,1,
-0xbfd287c,1,
-0xbfd2884,1,
-0xbfd288c,1,
-0xbfd2894,1,
-0xbfd5000,2,
-0xbfd500c,1,
-0xbfd5200,27,
-0xbfd5280,4,
-0xbfd52c0,25,
-0xbfd5340,6,
-0xbfd5360,2,
-0xbfd536c,3,
-0xbfd5384,10,
-0xbfd5400,2,
-0xbfd5440,12,
-0xbfd8000,2,
-0xbfd800c,1,
-0xbfd8014,1,
-0xbfd801c,5,
-0xbfd8044,1,
-0xbfd8080,4,
-0xbfd80a0,6,
-0xbfd80c0,4,
-0xbfd80e0,6,
-0xbfd8100,4,
-0xbfd8200,4,
-0xbfd8280,24,
-0xbfd8300,4,
-0xbfd8380,24,
-0xbfd8400,4,
-0xbfd8420,20,
-0xbfd8480,4,
-0xbfd84a0,5,
-0xbfd84c0,4,
-0xbfd84e0,5,
-0xbfd8500,4,
-0xbfd8540,4,
-0xbfd8560,6,
-0xbfd8580,4,
-0xbfd85a0,6,
-0xbfd85c0,4,
-0xbfdd000,2,
-0xbfdd00c,1,
-0xbfdd200,27,
-0xbfdd280,4,
-0xbfdd2c0,25,
-0xbfdd340,6,
-0xbfdd360,2,
-0xbfdd36c,3,
-0xbfdd384,5,
-0xbfdd400,2,
-0xbfdd440,12,
-0xbfdf800,62,
-0xbfdf8fc,5,
diff --git a/mstdump/mstdump_dbs/ConnectX4LX.csv b/mstdump/mstdump_dbs/ConnectX4LX.csv
index cd674340..0ca990ac 100644
--- a/mstdump/mstdump_dbs/ConnectX4LX.csv
+++ b/mstdump/mstdump_dbs/ConnectX4LX.csv
@@ -798,7 +798,7 @@
 0x050dd0,1,
 0x050de0,1,
 0x050e00,64,
-0x052000,192,
+0x052000,193,
 0x052800,2,
 0x053000,51,
 0x053400,3,
diff --git a/mstdump/mstdump_dbs/ConnectX6.csv b/mstdump/mstdump_dbs/ConnectX6.csv
index d4d2b6b4..5c548998 100644
--- a/mstdump/mstdump_dbs/ConnectX6.csv
+++ b/mstdump/mstdump_dbs/ConnectX6.csv
@@ -3105,6 +3105,7 @@
 0x0f0c50,52,
 0x0f0d50,20,
 0x0f0dd0,2,
+0x0f0de0,1,
 0x0f0ffc,4,
 0x0f1030,2,
 0x0f1040,10,
diff --git a/mstdump/mstdump_dbs/Quantum.csv b/mstdump/mstdump_dbs/Quantum.csv
index 92913627..b5bbe805 100644
--- a/mstdump/mstdump_dbs/Quantum.csv
+++ b/mstdump/mstdump_dbs/Quantum.csv
@@ -900,7 +900,7 @@
 0x084580,268,
 0x0849c0,268,
 0x084e00,268,
-0x085240,302,
+0x085240,430,
 0x090000,19,
 0x090080,16,
 0x090100,4,
@@ -2202,7 +2202,7 @@
 0x0fc11c,12,
 0x0fc15c,3,
 0x0fc180,8,
-0x100000,75776,
+0x100000,87040,
 0x180000,7,
 0x180100,7,
 0x180124,4,
diff --git a/mstdump/mstdump_dbs/Spectrum2.csv b/mstdump/mstdump_dbs/Spectrum2.csv
index 1be49adb..f46371ab 100644
--- a/mstdump/mstdump_dbs/Spectrum2.csv
+++ b/mstdump/mstdump_dbs/Spectrum2.csv
@@ -508,10 +508,13 @@
 0x050cc0,2572,
 0x053500,524,
 0x053d40,524,
-0x054580,268,
-0x0549c0,256,
-0x054e00,268,
-0x055240,302,
+0x054580,270,
+0x0549c0,12,
+0x054a00,270,
+0x054e40,12,
+0x054e80,3084,
+0x057ec0,3340,
+0x05b300,302,
 0x060000,32,
 0x060200,64,
 0x060400,96,
diff --git a/mstdump/mstdump_dbs/SwitchIB.csv b/mstdump/mstdump_dbs/SwitchIB.csv
index efb70ae8..294131de 100644
--- a/mstdump/mstdump_dbs/SwitchIB.csv
+++ b/mstdump/mstdump_dbs/SwitchIB.csv
@@ -3099,8 +3099,6 @@
 0x0d9480,6,
 0x0d9500,6,
 0x0d9520,6,
-0x0d9540,1,
-0x0d9558,2,
 0x0d9600,17,
 0x0d9800,410,
 0x0da100,4,
@@ -3121,8 +3119,6 @@
 0x0da460,3,
 0x0da480,6,
 0x0da500,6,
-0x0da540,1,
-0x0da558,2,
 0x0da800,410,
 0x0db800,5,
 0x0db818,1,
diff --git a/mtcr_freebsd/mtcr_ul.c b/mtcr_freebsd/mtcr_ul.c
index 8ba4119b..1b9b618c 100644
--- a/mtcr_freebsd/mtcr_ul.c
+++ b/mtcr_freebsd/mtcr_ul.c
@@ -77,6 +77,7 @@
 #define PCI_VPD_ADDR 0x2
 #define PCI_CAP_ID_VPD 0x3
 #define PCI_VPD_DATA 0x4
+#define HW_ID_ADDR 0xf0014
 
 #define _PATH_DEVPCI "/dev/pci"
 
@@ -174,11 +175,16 @@ void mtcr_connectx_flush(void* ptr, int fdlock)
     }
 }
 
+int read_device_id(mfile* mf, u_int32_t* device_id)
+{
+    return mread4(mf, HW_ID_ADDR, device_id);
+}
+
 int mtcr_check_signature(mfile* mf)
 {
     unsigned signature;
     int rc;
-    rc = mread4(mf, 0xF0014, &signature);
+    rc = read_device_id(mf, &signature);
     if (rc != 4)
     {
         if (!errno)
@@ -341,13 +347,12 @@ int write_config(mfile* mf, unsigned int reg, uint32_t data, int width)
 }
 
 #define WO_REG_ADDR_DATA 0xbadacce5
-#define DEVID_OFFSET 0xf0014
 #define PCICONF_ADDR_OFF 0x58
 #define PCICONF_DATA_OFF 0x5c
 
 static int is_wo_pciconf_gw(mfile* mf)
 {
-    unsigned offset = DEVID_OFFSET;
+    unsigned offset = HW_ID_ADDR;
     u_int32_t data = 0;
     int lock_rc;
     lock_rc = _flock_int(mf->fdlock, LOCK_EX);
@@ -1392,6 +1397,7 @@ static int get_device_ids(const char* dev_name, dev_info* dinfo)
     }
     dinfo->pci.vend_id = EXTRACT(buf, 0, 16);
     dinfo->pci.dev_id = EXTRACT(buf, 16, 16);
+
     rc = read_config(mf, PCI_CLASS_OFFS, &buf, 4);
     if (rc)
     {
@@ -2335,7 +2341,7 @@ static int mreg_send_raw(mfile* mf,
     return ME_OK;
 }
 
-#define HW_ID_ADDR 0xf0014
+
 
 #define CONNECTX3_HW_ID 0x1f5
 #define CONNECTX3_PRO_HW_ID 0x1f7
@@ -2344,7 +2350,7 @@ static int supports_icmd(mfile* mf)
 {
     u_int32_t dev_id;
 
-    if (mread4(mf, HW_ID_ADDR, &dev_id) != 4)
+    if (read_device_id(mf, &dev_id) != 4)
     {
         // cr might be locked and retured 0xbad0cafe but we dont care we search for device that supports icmd
         return 0;
@@ -2365,7 +2371,7 @@ static int supports_tools_cmdif_reg(mfile* mf)
 {
     u_int32_t dev_id;
 
-    if (mread4(mf, HW_ID_ADDR, &dev_id) != 4)
+    if (read_device_id(mf, &dev_id) != 4)
     {
         return 0;
     }
diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c
index 96bee036..edb1a1b7 100644
--- a/mtcr_ul/mtcr_ul_com.c
+++ b/mtcr_ul/mtcr_ul_com.c
@@ -1257,7 +1257,7 @@ int mtcr_pciconf_rw(mfile* mf, unsigned int offset, u_int32_t* data, int rw)
     if (EXTRACT(address, 30, 2))
     {
         if (errno == EEXIST)
-        { // not sure if it's OK to change errno in all cases
+        {
             errno = EINVAL;
         }
         return ME_BAD_PARAMS;
@@ -1826,34 +1826,34 @@ int mhca_reset_ul(mfile* mf)
     return -1;
 }
 
-static long supported_dev_ids[] = {
-  /* CX2 */
-  0x6340, 0x634a, 0x6368, 0x6372, 0x6732, 0x673c, 0x6750, 0x675a, 0x676e, 0x6746, 0x6764,
-  /*****/
-  0x1003, // Connect-X3
-  0x1007, // Connect-X3Pro
-  0x1011, // Connect-IB
-  0x1013, // Connect-X4
-  0x1015, // Connect-X4Lx
-  0x1017, // Connect-X5
-  0x1019, // Connect-X5Ex
-  0x101b, // Connect-X6
-  0x101d, // Connect-X6DX
-  0x101f, // Connect-X6LX
-  0x1021, // Connect-X7
-  0xcb20, // Switch-IB
-  0xcb84, // Spectrum
-  0xcf08, // Switch-IB2
-  0xd2f0, // Quantum
-  0xd2f2, // Quantum2
-  0xcf6c, // Spectrum2
-  0xa2d2, // MT416842 Family BlueField integrated ConnectX-5 network controller
-  0xa2d6, // MT42822 Family BlueField2 integrated ConnectX-6DX network controller
-  0xa2dc, // MT43244 Family BlueField3 integrated ConnectX-7 network controller
-  0xcf70, // Spectrum3
-  0xcf80, // Spectrum4
-  0x1976, // Schrodinger
-  -1};
+static long supported_dev_ids[] = {0x1003, // Connect-X3
+                                   0x1007, // Connect-X3Pro
+                                   0x1011, // Connect-IB
+                                   0x1013, // Connect-X4
+                                   0x1015, // Connect-X4Lx
+                                   0x1017, // Connect-X5
+                                   0x1019, // Connect-X5Ex
+                                   0x101b, // Connect-X6
+                                   0x101d, // Connect-X6DX
+                                   0x101f, // Connect-X6LX
+                                   0x1021, // Connect-X7
+                                   0x1023, // Connect-X8
+                                   0xcb20, // Switch-IB
+                                   0xcb84, // Spectrum
+                                   0xcf08, // Switch-IB2
+                                   0xd2f0, // Quantum
+                                   0xd2f2, // Quantum2
+                                   0xcf6c, // Spectrum2
+                                   0xa2d2, // MT416842 Family BlueField integrated ConnectX-5 network controller
+                                   0xa2d6, // MT42822 Family BlueField2 integrated ConnectX-6DX network controller
+                                   0xa2dc, // MT43244 Family BlueField3 integrated ConnectX-7 network controller
+                                   0xa2de, // BF4 Family BlueField4 integrated ConnectX-8 network controller
+                                   0xcf70, // Spectrum3
+                                   0xcf80, // Spectrum4
+                                   0x1976, // Schrodinger
+                                   0x2900, // GB-100
+                                   0xd2f4, // Sunbird 0x25b
+                                   -1};
 
 static long live_fish_id_database[] = {0x191, 0x246, 0x249, 0x24b, 0x24d, 0x24e, 0x1F6, 0x1F8,
                                        0x1FF, 0x247, 0x209, 0x20b, 0x20d, 0x20f, 0x211,
@@ -1861,10 +1861,13 @@ static long live_fish_id_database[] = {0x191, 0x246, 0x249, 0x24b, 0x24d, 0x24e,
                                        0x212, // Connect-X6DX
                                        0x216, // Connect-X6LX
                                        0x218, // Connect-X7
+                                       0x21e, // Connect-X8
                                        0x21C, // BlueField3
+                                       0x220, // BlueField4
                                        0x250, // Spectrum3
                                        0x254, // Spectrum4
                                        0x257, // Quantum2
+                                       0x25b, // Quantum3 
                                        -1};
 
 int is_supported_devid(long devid)
@@ -2716,8 +2719,8 @@ mfile* mopen_ul_int(const char* name, u_int32_t adv_opt)
 
 int init_dev_info_ul(mfile* mf, const char* dev_name, unsigned domain, unsigned bus, unsigned dev, unsigned func)
 {
-    int i;
-    int devs_len;
+    int i = 0;
+    int devs_len = 0;
     int ret = 0;
     dev_info* devs = mdevices_info_v_ul(0xffffffff, &devs_len, 1);
     for (i = 0; i < devs_len; i++)
diff --git a/mtcr_ul/mtcr_ul_icmd_cif.c b/mtcr_ul/mtcr_ul_icmd_cif.c
index db874845..b07e6320 100644
--- a/mtcr_ul/mtcr_ul_icmd_cif.c
+++ b/mtcr_ul/mtcr_ul_icmd_cif.c
@@ -73,6 +73,8 @@
 #define SEMAPHORE_ADDR_SW_IB 0xa24f8 // sem 62
 #define SEMAPHORE_ADDR_QUANTUM 0xa68f8
 #define SEMAPHORE_ADDR_QUANTUM2 0xa52f8
+#define SEMAPHORE_ADDR_QUANTUM3 0xa52f8 // 0x25b
+#define SEMAPHORE_ADDR_GB100 0xa52f8
 #define SEMAPHORE_ADDR_CX5 0xe74e0
 #define SEMAPHORE_ADDR_CX7 0xe5660
 #define HCR_ADDR_CIB 0x0
@@ -278,9 +280,11 @@ enum
 #define CX6DX_HW_ID 530
 #define CX6LX_HW_ID 534
 #define CX7_HW_ID 536
+#define CX8_HW_ID 542
 #define BF_HW_ID 529
 #define BF2_HW_ID 532
 #define BF3_HW_ID 540
+#define BF4_HW_ID 544
 #define SW_IB_HW_ID 583
 #define SW_EN_HW_ID 585
 #define SW_IB2_HW_ID 587
@@ -288,6 +292,8 @@ enum
 #define SPECTRUM2_HW_ID 590
 #define SPECTRUM3_HW_ID 592
 #define QUANTUM2_HW_ID 599
+#define QUANTUM3_HW_ID 603 // 0x25b
+#define GB100_HW_ID 0x2900
 #define SPECTRUM4_HW_ID 596
 #define AMOS_GBOX_HW_ID 594
 
@@ -1010,6 +1016,8 @@ static int icmd_init_cr(mfile* mf)
             break;
 
         case (QUANTUM2_HW_ID):
+        case (QUANTUM3_HW_ID):
+        case (GB100_HW_ID):
         case (SPECTRUM4_HW_ID):
             cmd_ptr_addr = CMD_PTR_ADDR_QUANTUM;
             hcr_address = HCR_ADDR_QUANTUM;
@@ -1031,6 +1039,8 @@ static int icmd_init_cr(mfile* mf)
 
         case (CX7_HW_ID):
         case (BF3_HW_ID):
+        case (CX8_HW_ID):
+        case (BF4_HW_ID):
             cmd_ptr_addr = CMD_PTR_ADDR_CX7;
             hcr_address = HCR_ADDR_CX7;
             mf->icmd.semaphore_addr = SEMAPHORE_ADDR_CX7;
@@ -1136,6 +1146,8 @@ static int icmd_init_vcr_crspace_addr(mfile* mf)
         case (SPECTRUM2_HW_ID):
         case (SPECTRUM3_HW_ID):
         case (QUANTUM2_HW_ID):
+        case (QUANTUM3_HW_ID):
+        case (GB100_HW_ID):
         case (SPECTRUM4_HW_ID):
             mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_QUANTUM;
             mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_SW_IB;
@@ -1147,6 +1159,8 @@ static int icmd_init_vcr_crspace_addr(mfile* mf)
         case (BF2_HW_ID):
         case (BF3_HW_ID):
         case (CX7_HW_ID):
+        case (BF4_HW_ID):
+        case (CX8_HW_ID):
             mf->icmd.static_cfg_not_done_addr = STAT_CFG_NOT_DONE_ADDR_CX6;
             mf->icmd.static_cfg_not_done_offs = STAT_CFG_NOT_DONE_BITOFF_CX5; // same bit offset as CX5
             break;
diff --git a/reg_access/reg_access.c b/reg_access/reg_access.c
index a0710cad..8b9751bb 100644
--- a/reg_access/reg_access.c
+++ b/reg_access/reg_access.c
@@ -40,6 +40,7 @@
 #define REG_ID_PMAOS 0x5012
 #define REG_ID_MCIA 0x9014
 #define REG_ID_MTMP 0x900a
+#define REG_ID_MTCAP 0x9009
 #define REG_ID_MIRC 0x9162
 #define REG_ID_MGIR 0x9020
 #define REG_ID_PMLP 0x5002
@@ -140,6 +141,7 @@
     u_int32_t t_offset = size_func();                                                                                 \
     u_int32_t r_size_reg = reg_size;                                                                                  \
     u_int32_t w_size_reg = reg_size;                                                                                  \
+    int wrapper_needed = 0;                                                                                           \
     if (method == REG_ACCESS_METHOD_GET)                                                                              \
     {                                                                                                                 \
         w_size_reg -= data_struct->data_size_name;                                                                    \
diff --git a/reg_access/regaccess.py b/reg_access/regaccess.py
index a9d89f59..ae836395 100644
--- a/reg_access/regaccess.py
+++ b/reg_access/regaccess.py
@@ -139,7 +139,8 @@ class MFRL_ST(Structure):
             ("reset_type", c_uint8),
             ("rst_type_sel", c_uint8),
             ("pci_sync_for_fw_update_resp", c_uint8),
-            ("pci_sync_for_fw_update_start", c_uint8)
+            ("pci_sync_for_fw_update_start", c_uint8),
+            ("pci_rescan_required", c_uint8)
         ]
 
     class MPCIR_ST(Structure):
@@ -173,9 +174,7 @@ class MGIR_ST(Structure):
                     ("num_ports", c_uint8),
                     ("hw_dev_id", c_uint16),
                     ("manufacturing_base_mac_47_32", c_uint16),
-                    ("module_base", c_uint8),
                     ("manufacturing_base_mac_31_0", c_uint32),
-                    ("associated_module_id_31_0", c_uint32),
                     ("uptime", c_uint32),
                     ("sub_minor", c_uint8),
                     ("minor", c_uint8),
@@ -224,24 +223,32 @@ class MDDQ_SLOT_INFO(Structure):
                     ("lc_ready", c_uint8),
                     ("sr_valid", c_uint8),
                     ("provisioned", c_uint8),
-                    ("minor_ini_file_version", c_uint16),
-                    ("major_ini_file_version", c_uint16),
+                    ("ini_file_version", c_uint16),
+                    ("hw_revision", c_uint16),
                     ("card_type", c_uint8)]
 
     class MDDQ_DEVICE_INFO(Structure):
         _fields_ = [("device_index", c_uint8),
                     ("flash_id", c_uint8),
+                    ("lc_pwr_on", c_uint8),
                     ("thermal_sd", c_uint8),
                     ("flash_owner", c_uint8),
                     ("uses_flash", c_uint8),
                     ("device_type", c_uint16),
                     ("fw_major", c_uint16),
                     ("fw_sub_minor", c_uint16),
-                    ("fw_minor", c_uint16)]
+                    ("fw_minor", c_uint16),
+                    ("max_cmd_write_size_supp", c_uint8),
+                    ("max_cmd_read_size_supp", c_uint8),
+                    ("device_type_name", c_uint8 * 8)]
+
+    class MDDQ_SLOT_NAME(Structure):
+        _fields_ = [("slot_ascii_name", c_uint8 * 20)]
 
     class MDDQ_DATA_UN(Union):
-        _fields_ = [("mddq_slot_info_ext", MDDQ_SLOT_INFO),
-                    ("mddq_device_info_ext", MDDQ_DEVICE_INFO)]
+        _fields_ = [("slot_info_ext", MDDQ_SLOT_INFO),
+                    ("device_info_ext", MDDQ_DEVICE_INFO),
+                    ("slot_name_ext", MDDQ_SLOT_NAME)]
 
     class MDDQ_ST(Structure):
         _fields_ = [("slot_index", c_uint8),
@@ -253,6 +260,14 @@ class MDDQ_ST(Structure):
                     ("data_valid", c_uint8),
                     ("data", MDDQ_DATA_UN)]
 
+    class MDSR(Structure):
+        _fields_ = [("type_of_token", c_uint8),
+                    ("additional_info", c_uint8),
+                    ("status", c_uint8),
+                    ("end", c_uint8),
+                    ("time_left", c_uint32)]
+
+
     class RegAccess:
         GET = REG_ACCESS_METHOD_GET
         SET = REG_ACCESS_METHOD_SET
@@ -271,6 +286,7 @@ def __init__(self, dev=None, pci_device=None):
             self._reg_access_res_dump = REG_ACCESS.reg_access_res_dump
             self._reg_access_debug_cap = REG_ACCESS.reg_access_debug_cap
             self._reg_access_mddq = REG_ACCESS.reg_access_mddq
+            self._reg_access_mdsr = REG_ACCESS.reg_access_mdsr
 
         def _err2str(self, rc):
             err2str = REG_ACCESS.reg_access_err2str
@@ -286,6 +302,14 @@ def __del__(self):
             if self._mstDev:
                 self.close()
 
+        def isCsTokenApplied(self):
+            mdsrRegP = pointer(MDSR())
+            rc = self._reg_access_mdsr(self._mstDev.mf, c_uint(REG_ACCESS_METHOD_GET), mdsrRegP)
+            if rc:
+                return False  # if if mdsr not support (or other fail), assume no token
+
+            return (mdsrRegP.contents.type_of_token == 1 and mdsrRegP.contents.status == 2)  # CS token and debug session active
+
         def sendMtrcCapTakeOwnership(self):
 
             mcamRegP = pointer(MCAM_REG_ST())
@@ -526,23 +550,28 @@ def sendMddq(self, query_type, request_message_sequence, slot_index, query_index
             data = {}
             if query_type == 1:
                 data.update({
-                    "active": mddqRegisterP.contents.data.mddq_slot_info_ext.active,
-                    "lc_ready": mddqRegisterP.contents.data.mddq_slot_info_ext.lc_ready,
-                    "sr_valid": mddqRegisterP.contents.data.mddq_slot_info_ext.sr_valid,
-                    "provisioned": mddqRegisterP.contents.data.mddq_slot_info_ext.provisioned,
-                    "minor_ini_file_version": mddqRegisterP.contents.data.mddq_slot_info_ext.minor_ini_file_version,
-                    "major_ini_file_version": mddqRegisterP.contents.data.mddq_slot_info_ext.major_ini_file_version
+                    "active": mddqRegisterP.contents.data.slot_info_ext.active,
+                    "lc_ready": mddqRegisterP.contents.data.slot_info_ext.lc_ready,
+                    "sr_valid": mddqRegisterP.contents.data.slot_info_ext.sr_valid,
+                    "provisioned": mddqRegisterP.contents.data.slot_info_ext.provisioned,
+                    "ini_file_version": mddqRegisterP.contents.data.slot_info_ext.ini_file_version,
+                    "hw_revision": mddqRegisterP.contents.data.slot_info_ext.hw_revision,
+                    "card_type": mddqRegisterP.contents.data.slot_info_ext.card_type
                 })
             elif query_type == 2:
+                device_type_name = "".join(chr(val) for val in mddqRegisterP.contents.data.device_info_ext.device_type_name if val != 0)
                 data.update({
-                    "device_index": mddqRegisterP.contents.data.mddq_device_info_ext.device_index,
-                    "flash_id": mddqRegisterP.contents.data.mddq_device_info_ext.flash_id,
-                    "flash_owner": mddqRegisterP.contents.data.mddq_device_info_ext.flash_owner,
-                    "uses_flash": mddqRegisterP.contents.data.mddq_device_info_ext.uses_flash,
-                    "device_type": mddqRegisterP.contents.data.mddq_device_info_ext.device_type,
-                    "fw_major": mddqRegisterP.contents.data.mddq_device_info_ext.fw_major,
-                    "fw_sub_minor": mddqRegisterP.contents.data.mddq_device_info_ext.fw_sub_minor,
-                    "fw_minor": mddqRegisterP.contents.data.mddq_device_info_ext.fw_minor
+                    "device_index": mddqRegisterP.contents.data.device_info_ext.device_index,
+                    "flash_id": mddqRegisterP.contents.data.device_info_ext.flash_id,
+                    "flash_owner": mddqRegisterP.contents.data.device_info_ext.flash_owner,
+                    "uses_flash": mddqRegisterP.contents.data.device_info_ext.uses_flash,
+                    "device_type": mddqRegisterP.contents.data.device_info_ext.device_type,
+                    "fw_major": mddqRegisterP.contents.data.device_info_ext.fw_major,
+                    "fw_sub_minor": mddqRegisterP.contents.data.device_info_ext.fw_sub_minor,
+                    "fw_minor": mddqRegisterP.contents.data.device_info_ext.fw_minor,
+                    "max_cmd_write_size_supp": mddqRegisterP.contents.data.device_info_ext.max_cmd_write_size_supp,
+                    "max_cmd_read_size_supp": mddqRegisterP.contents.data.device_info_ext.max_cmd_read_size_supp,
+                    "device_type_name": device_type_name
                 })
             return ({"slot_index": mddqRegisterP.contents.slot_index,
                      "query_type": mddqRegisterP.contents.query_type,
diff --git a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
index 73db0670..f9e77897 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
@@ -39,7 +39,7 @@ class CmdRegMfrl():
     reset_levels_db = [
         {'level': LIVE_PATCH, 'description': 'Driver, PCI link, network link will remain up ("live-Patch")', 'mask': 0x1, 'support_reset_type': False},
         {'level': PCI_RESET, 'description': 'Driver restart and PCI reset', 'mask': 0x8, 'support_reset_type': True},
-        {'level': WARM_REBOOT, 'description': 'Warm Reboot', 'mask': 0x40, 'support_reset_type': True},
+        {'level': WARM_REBOOT, 'description': 'Warm Reboot', 'mask': 0x48, 'support_reset_type': True},
     ]
 
     FULL_CHIP, PHY_LESS, NIC_ONLY = 0, 1, 2
diff --git a/small_utils/mlxfwresetlib/pci_device.py b/small_utils/mlxfwresetlib/pci_device.py
index 34d6679e..cb36d5bb 100644
--- a/small_utils/mlxfwresetlib/pci_device.py
+++ b/small_utils/mlxfwresetlib/pci_device.py
@@ -36,16 +36,16 @@
 """
 
 from __future__ import print_function
+
+from mtcr import MstDevice
+from .mcra import Mcra
 # TODO fix it latter - need to import the function from mlxfwreset.py
 import sys
 import os
 mlxfwreset_dir = os.path.dirname(os.path.dirname(__file__))
 sys.path.append(mlxfwreset_dir)
-
-from .mcra import Mcra
-from mtcr import MstDevice
-from regaccess import RegAccess
 from dev_mgt import DevMgt
+from regaccess import RegAccess
 
 
 class PciDevice(object):
diff --git a/small_utils/mstfwreset.py b/small_utils/mstfwreset.py
index c3fd11dd..6591d7b2 100644
--- a/small_utils/mstfwreset.py
+++ b/small_utils/mstfwreset.py
@@ -106,7 +106,6 @@ class SyncOwner():
     dict(name="ConnectX7", devid=0x218, status_config_not_done=(0xb5f04, 31)),
     dict(name="ConnectX8", devid=0x21e, status_config_not_done=(0xb5f04, 31)),
     dict(name="ConnectX3", devid=0x1f5),
-    dict(name="IS4", devid=0x1b3),
 ]
 
 # Supported devices.
diff --git a/small_utils/mtserver.c b/small_utils/mtserver.c
index ee9bddfa..d75ec2e2 100644
--- a/small_utils/mtserver.c
+++ b/small_utils/mtserver.c
@@ -202,7 +202,7 @@ void write_ok(int con)
 #include <unistd.h>
 
 #define FILE_PATH "/tmp/mmap.log"
-#define NUM_INTS (0x2000000)
+#define NUM_INTS (0x20000000)
 #define FILE_SIZE (NUM_INTS * sizeof(int))
 
 u_int32_t* cr_space;
@@ -550,7 +550,7 @@ void get_devices_list(int con)
 #ifndef MST_UL
     dev_info* mdevs_inf = NULL;
     int devs_num = -1, i = 0;
-    mdevs_inf = mdevices_info(MDEVS_ALL, &devs_num);
+    mdevs_inf = mdevices_info_v(MDEVS_ALL, &devs_num, 1);
 
     if (devs_num < 0 || !mdevs_inf)
     {
@@ -1123,7 +1123,7 @@ int main(int ac, char* av[])
                             writes_deb(con, "E Invalid size");
                         }
 
-                        for (i = 0; i<(size + 3)> > 2; i++)
+                        for (i = 0; i < ((size + 3) >> 2); i++)
                         {
                             ((u_int32_t*)buf_data)[i] = strtoul(end, &end, 0);
 
diff --git a/small_utils/tcp.c b/small_utils/tcp.c
index d3d68a8a..4c63997a 100644
--- a/small_utils/tcp.c
+++ b/small_utils/tcp.c
@@ -413,7 +413,7 @@ INSIDE_MTCR int open_cli_connection(const char* host, const int port, proto_type
         my_addr.sin_port = (short)(htons((short)port));
 
         /*  Bind our local address so that the client can send to us. */
-        if (bind(SockFD, (struct sockaddr*)&my_addr, sizeof(my_addr)) < 0)
+        if (bind(SockFD, (const struct sockaddr*)&my_addr, (socklen_t)sizeof(my_addr)) < 0)
         {
             COMP_CLOSE(SockFD);
             perror("bind failed\n");
@@ -459,7 +459,7 @@ INSIDE_MTCR int open_serv_connection(const int port)
     serv_addr.sin_family = AF_INET;
     serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
     serv_addr.sin_port = (short)(htons((short)port));
-    if (bind(SockFD, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0)
+    if (bind(SockFD, (const struct sockaddr*)&serv_addr, (socklen_t)sizeof(serv_addr)) < 0)
     {
 #ifdef __WIN__
         errno = WSAGetLastError();
diff --git a/tools_layouts/adb/prm/hca/ext/register_access_table.adb b/tools_layouts/adb/prm/hca/ext/register_access_table.adb
index 69d93bc4..4cc9e66d 100644
--- a/tools_layouts/adb/prm/hca/ext/register_access_table.adb
+++ b/tools_layouts/adb/prm/hca/ext/register_access_table.adb
@@ -93,8 +93,40 @@
 	<field name="port_xmit_wait" descr="For counter description please refer to the InfiniBand \;specification" access="RO" offset="0x24.0" size="0x4.0" />
 </node>
 
+<node name="MSECQ_reg_ext" descr="" size="0x40.0" >
+	<field name="local_enhanced_ssm_code" descr="The enhanced SSM code to be delivered when on holdover." access="RO" offset="0x4.0" size="0x0.8" />
+	<field name="local_ssm_code" descr="The SSM code to be delivered when on holdover." access="RO" offset="0x4.8" size="0x0.4" />
+	<field name="network_option" descr="The network option of this device (as defined in ITU-T G.781).\;1: Network option 1\;2: Network option 2" access="RO" offset="0x4.12" size="0x0.2" />
+	<field name="local_clock_identity" descr="The SyncE clock identity of the device." subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
+</node>
+
+<node name="MSEES_reg_ext" descr="" size="0x40.0" >
+	<field name="lp_msb" descr="2-bit expansion of the local port. Represents the \;local_port[9:8] bits" access="INDEX" offset="0x0.12" size="0x0.2" />
+	<field name="pnat" descr="Port number access type, determines the way local_port is \;interpreted:\;0: Local port number\;1: Label port number\;3: Out of band or PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
+	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="field_select" descr="Field select indicates which fields to modify in write opera\;tion to this register. \;Bit 0: enable field_select\;Bit 1: admin_status\;Bit 2: admin_freq_measure\;Bits 3-31: Reserved" access="WO" offset="0x4.0" size="0x4.0" />
+	<field name="failure_reason" descr="0: undefined error \;1: port down\;2: too high frequency_diff\;3: network synchronizer device error\;4: lack of resources for tracking \;5-255: reserved for future use \;\;Note: Reserved when oper_status is different than 4" access="RO" offset="0x8.0" size="0x0.9" />
+	<field name="oper_freq_measure" descr="0: frequency_diff field is not valid\;1: frequency_diff field is valid" access="RO" offset="0x8.9" size="0x0.1" />
+	<field name="admin_freq_measure" descr="0: don&apos;t measure frequency_diff\;1: measure frequency_diff" access="RW" offset="0x8.10" size="0x0.1" />
+	<field name="ho_acq" descr="Holdover acquired.\;0: The device does not have enough data to go into holdover.\;1: The device has enough data to go into holdover." access="RO" offset="0x8.23" size="0x0.1" />
+	<field name="oper_status" descr="0: free running - the device is using internal oscillator as \;timing source \;1: self track - the device is in sync with this timing source\;2: other track - the device is in sync with other timing source\;3: holdover - the device is using the internal oscillator and \;past information as a timing source.\;4: Holdover due to failure (see field failure_reason)\;5: Free running due to failure (see field failure_reason)." access="RO" offset="0x8.24" size="0x0.4" />
+	<field name="admin_status" descr="0: holdover/free running - the device will use internal oscil\;lator as timing source. \;Free running is the default value.\;Device holdover / free running will take place only if admin \;status = 0 across all other ports.\;1: track - the device will sync to this timing source. When \;writing admin status = 1 to a port, all other ports will move \;to admin status = 0." access="RW" offset="0x8.28" size="0x0.4" />
+	<field name="frequency_diff" descr="The FFO (Fractional Frequency Offset) between the rx and tx \;symbol rate: (rx_frequency- tx_frequency) /rx_frequency.\;Value is in ppt (2&apos;s compliment).\;Any value larger than 0x7FFFFFFF represented as \;0x7FFFFFFF. \;Any value smaller than 0x8000000 represented as \;0x8000000.\;\;Note: Reserved when oper_freq is different than &apos;1&apos;." access="RO" offset="0xC.0" size="0x4.0" />
+</node>
+
+<node name="MSPI_ext" descr="" size="0x18.0" >
+	<field name="vendor_id" descr="0: SiTime\;1: Renesas \;2: TI\;\;Reserved when synce_support = 0" access="RO" offset="0x0.0" size="0x0.4" />
+	<field name="synce_support" descr="0: SyncE is not supported by FW\;1: SyncE is supported by FW" access="RO" offset="0x0.31" size="0x0.1" />
+	<field name="config_version_id" descr="Configuration version id\;\;Reserved when synce_support = 0" access="RO" offset="0x4.0" size="0x0.16" />
+	<field name="bcc" descr="burned configuration count\;Counts how many times the configuration was burned to the \;clock sync&apos;\;\;Reserved when synce_support = 0" access="RO" offset="0x8.0" size="0x0.8" />
+	<field name="obs_temperature" descr="On Board Sensor Temperature \;Units of 0.125 Celsius degrees.\;For negative values 2&apos;s complement is used (for example: -\;3.25 Celsius will read as 0xFFE6)" access="RO" offset="0x10.0" size="0x0.16" />
+	<field name="obtv" descr="On Board Temperature validity\;0: temperature data is not valid\;1: temperature data is valid" access="RO" offset="0x10.31" size="0x0.1" />
+	<field name="bis_temperature" descr="Built In Sensor Temperature \;Units of 0.125 Celsius degrees.\;For negative values 2&apos;s complement is used (for example: -\;3.25 Celsius will read as 0xFFE6)" access="RO" offset="0x14.0" size="0x0.16" />
+	<field name="bitv" descr="Built In OCXO sensor Temperature validity\;0: temperature data is not valid\;1: temperature data is valid\;" access="RO" offset="0x14.31" size="0x0.1" />
+</node>
+
 <node name="access_reg_summary_ctrl_ext" descr="" attr_is_union="1" size="0x4.0" >
-	<field name="id" descr="" subnode="enum_entry" enum="UNIT_PERF_COUNTERS_=0x100,MISC_COUNTERS=0x104,Loopback_Control_Register=0x700,DB_TRESHOLD=0x701,DCBX_PARAM=0x4020,DCBX_APPLICATION=0x4021,QPTS=0x4002,QETCR=0x4005,QSHR=0x4030,QPDP=0x4007,QPRT=0x4008,QTCT=0x400a,QSPIP=0x400e,QSPCP=0x401e,QHLL=0x4016,QCAM=0x4019,ROCE_ACCL=0x402c,PCAM=0x507f,PCAP=0x5001,PTYS=0x5004,PAOS=0x5006,PLTC=0x5046,PPCNT=0x5008,PGMR=0x5039,PTER=0x5055,PREI=0x5058,PGUID=0x5066,PPCC=0x506e,PMLP=0x5002,PMAOS=0x5012,PMMP=0x5044,PMCR=0x5045,PMPT=0x5064,PMPD=0x5065,PPLR=0x5018,PPLM=0x5023,SLTP=0x5027,SLRG=0x5028,PDDR=0x5031,PPTT=0x5036,PPRT=0x5037,PPHCR=0x503e,PPAOS=0x5040,SLRED=0x505a,PMTU=0x5003,PPAD=0x5005,PFCC=0x5007,PPTB=0x500b,PBMC=0x500c,PVLC=0x500f,PBSR=0x5038,PCMR=0x5041,PVLS=0x504b,SET_NODE=0x6001,POWER_SETTINGS=0x7001,FP_SL_MAP=0x7002,HOST_ENDIANNESS=0x7004,MFCR=0x9001,MFSC=0x9002,MFSM=0x9003,MFSL=0x9004,FORE=0x9007,MFNR=0x903b,MTCAP=0x9009,MTECR=0x9109,MTMP=0x900a,MTWE=0x900b,MTEWE=0x910b,MVCAP=0x902e,MVCR=0x900c,MSPS=0x900d,MCPP=0x900e,MTBR=0x900f,MFPA=0x9010,MFBA=0x9011,MFBE=0x9012,MFMC=0x9013,MCIA=0x9014,MCION=0x9052,MMIA=0x9016,MMDIO=0x2339,MPGR=0x9019,MFM=0x901d,MHSR=0x901e,MJTAG=0x901f,MSGI=0x9021,MSCI=0x902a,MPCIR=0x905a,MRTC=0x902d,MGIR=0x9020,MGPIR=0x9100,MDIR=0x911a,MSSIR=0x9105,MHMPR=0x905d,MPFM=0x9022,MRSR=0x9023,MPGO=0x9058,MNVDA=0x9024,MNVDI=0x9025,MNVQC=0x9030,MNVIA=0x9033,MNVGC=0x9034,MNVGN=0x9035,MGNLE=0x9036,MTRC_CAP=0x9040,MTRC_CONF=0x9041,MTRC_STDB=0x9042,MTRC_CTRL=0x9043,MLCR=0x902b,MGCR=0x903a,MERR=0x903c,MPEIN=0x9050,MPCNT=0x9051,MTPPS=0x9053,MTPTP=0x9153,MTUTC=0x9055,MPIR=0x9059,MPECS=0x905b,MCQS=0x9060,MCQI=0x9061,MCC=0x9062,MCDA=0x9063,MTCQ=0x9065,MKDC=0x9066,MBCT=0x9120,MQIS=0x9064,MIRC=0x9162,MCDD=0x905c,MDFCR=0x9101,MDCR=0x9111,MDDT=0x9160,MDDQ=0x9161,MDDC=0x9163,MDRCR=0x9102,MDSR=0x9110,MFSV=0x9115,MQDIK=0x9116,MRPR=0x9117,MCAM=0x907f,MFRL=0x9028,MMHI=0x904a,CWGCR=0x2801,CWTP=0x2802,CWPP=0x2804,CWTPM=0x2803,CPQE=0x2806,CHLTR=0x2810,CHLTM=0x2811,CHLMM=0x2812,CNCT=0x2030,CPCS=0x2031,CPID=0x2032,CNMC=0x2033,CWCAM=0x281f,SBGCR=0xb000,SBPR=0xb001,SBCM=0xb002,SBPM=0xb003,SBMM=0xb004,SBME=0xb00e,SBSR=0xb005,SBIB=0xb006,SBDCC=0xb007,SBDCM=0xb008,SBDCR=0xb019,SBHBR=0xb00a,SBHRR=0xb00b,SBHBR_V2=0xb011,SBHRR_V2=0xb012,SBCTC=0xb00c,SBCTR=0xb00d,SBCTS=0xb00f,SBHPC=0xb013,SBSNT=0xb020,SBSNS=0xb021,SBSNTE=0xb022,SBCAM=0xb01f,NCFG=0xc001,CRYPTO_OPERATIONAL=0xc002,IMPORT_KEK_HANDLE=0xc004,CREDENTIAL_HANDLE=0xc005,ZTT=0xc006,VHCA_TRUST_LEVEL=0xc007,PORT_STATE_BEHAVIOR=0xc008,HCA_CMD_ENCAP=0xc009,NVMF_TARGET_PACER_DEFAULTS=0xc00a" offset="0x0.0" size="0x4.0" />
+	<field name="id" descr="" subnode="enum_entry" enum="UNIT_PERF_COUNTERS_=0x100,MISC_COUNTERS=0x104,Loopback_Control_Register=0x700,DB_TRESHOLD=0x701,DCBX_PARAM=0x4020,DCBX_APPLICATION=0x4021,QPTS=0x4002,QETCR=0x4005,QSHR=0x4030,QEEC=0x400d,QPDP=0x4007,QPRT=0x4008,QTCT=0x400a,QSPIP=0x400e,QSPCP=0x401e,QHLL=0x4016,QCAM=0x4019,ROCE_ACCL=0x402c,PCAM=0x507f,PCAP=0x5001,PTYS=0x5004,PAOS=0x5006,PLTC=0x5046,PPCNT=0x5008,PGMR=0x5039,PTER=0x5055,PREI=0x5058,PGUID=0x5066,PMLP=0x5002,PMAOS=0x5012,PMMP=0x5044,PMCR=0x5045,PMPT=0x5064,PMPD=0x5065,PPLR=0x5018,PPLM=0x5023,SLTP=0x5027,SLRG=0x5028,PDDR=0x5031,PPTT=0x5036,PPRT=0x5037,PPHCR=0x503e,PPAOS=0x5040,SLRED=0x505a,PMTU=0x5003,PPAD=0x5005,PFCC=0x5007,PPTB=0x500b,PBMC=0x500c,PVLC=0x500f,PBSR=0x5038,PCMR=0x5041,PVLS=0x504b,PPCC=0x506e,SET_NODE=0x6001,POWER_SETTINGS=0x7001,FP_SL_MAP=0x7002,HOST_ENDIANNESS=0x7004,MMDIO=0x9017,MLCR=0x902b,MGCR=0x903a,MHMPR=0x905d,MJTAG=0x901f,MFM=0x901d,MHSR=0x901e,MTPPS=0x9053,MTPTP=0x9153,MTUTC=0x9055,MRTC=0x902d,MPGO=0x9058,MSECQ=0x9155,MSEES=0x9156,MSPI=0x9029,MCIA=0x9014,MCION=0x9052,MDDT=0x9160,MDDQ=0x9161,MDDC=0x9163,MGPIR=0x9100,MDRCR=0x9102,MDFCR=0x9101,MTCAP=0x9009,MTECR=0x9109,MTMP=0x900a,MTWE=0x900b,MTEWE=0x910b,MTBR=0x900f,MPGR=0x9019,MVCAP=0x902e,MVCR=0x900c,MSPS=0x900d,MCPP=0x900e,MRSR=0x9023,MFRL=0x9028,MCQS=0x9060,MCQI=0x9061,MCC=0x9062,MCDA=0x9063,MCDD=0x905c,MIRC=0x9162,MQIS=0x9064,MGIR=0x9020,MSGI=0x9021,MDIR=0x911a,MSSIR=0x9105,MMIA=0x9016,MINI=0x905e,MCAM=0x907f,MECCC=0x905f,MBCT=0x9120,MDSR=0x9110,MFSV=0x9115,MTCQ=0x9065,MQDIK=0x9116,MKDC=0x9066,MSPMER=0x9067,MNVDA=0x9024,MNVDI=0x9025,MNVQC=0x9030,MNVIA=0x9033,MNVGC=0x9034,MNVGN=0x9035,MGNLE=0x9036,MTRC_CAP=0x9040,MTRC_CONF=0x9041,MTRC_STDB=0x9042,MTRC_CTRL=0x9043,MFPA=0x9010,MFBA=0x9011,MFBE=0x9012,MFMC=0x9013,MFCR=0x9001,MFSC=0x9002,MFSM=0x9003,MFSL=0x9004,FORE=0x9007,MFNR=0x903b,MPCIR=0x905a,MERR=0x903c,MRPR=0x9117,MDCR=0x9111,MPFM=0x9022,MPEIN=0x9050,MPCNT=0x9051,MPIR=0x9059,MPECS=0x905b,MMHI=0x904a,CWGCR=0x2801,CWTP=0x2802,CWPP=0x2804,CWTPM=0x2803,CPQE=0x2806,CHLTR=0x2810,CHLTM=0x2811,CHLMM=0x2812,CNCT=0x2030,CPCS=0x2031,CPID=0x2032,CNMC=0x2033,CWCAM=0x281f,SBGCR=0xb000,SBPR=0xb001,SBCM=0xb002,SBPM=0xb003,SBMM=0xb004,SBME=0xb00e,SBSR=0xb005,SBIB=0xb006,SBDCC=0xb007,SBDCM=0xb008,SBDCR=0xb019,SBHBR=0xb00a,SBHRR=0xb00b,SBHBR_V2=0xb011,SBHRR_V2=0xb012,SBCTC=0xb00c,SBCTR=0xb00d,SBCTS=0xb00f,SBHPC=0xb013,SBSNT=0xb020,SBSNS=0xb021,SBSNTE=0xb022,SBCAM=0xb01f,NCFG=0xc001,CRYPTO_OPERATIONAL=0xc002,IMPORT_KEK_HANDLE=0xc004,CREDENTIAL_HANDLE=0xc005,ZTT=0xc006,VHCA_TRUST_LEVEL=0xc007,PORT_STATE_BEHAVIOR=0xc008,HCA_CMD_ENCAP=0xc009,NVMF_TARGET_PACER_DEFAULTS=0xc00a" offset="0x0.0" size="0x4.0" />
 </node>
 
 <node name="access_reg_summary_ext" descr="" attr_is_union="1" size="0x420" >
@@ -107,6 +139,7 @@
 	<field name="qpts" descr="" subnode="qpts_ext" capability="0" offset="0x0.0" selected_by="QPTS" size="0x8" />
 	<field name="qetcr" descr="" subnode="qetcr_ext" capability="0" offset="0x0.0" selected_by="QETCR" size="0x50" />
 	<field name="qshr" descr="" subnode="qshr_ext" capability="0" offset="0x0.0" selected_by="QSHR" size="0x50" />
+	<field name="qeec" descr="" subnode="qeec_ext" capability="0" offset="0x0.0" selected_by="QEEC" size="0x20" />
 	<field name="qpdp" descr="" subnode="qpdp_ext" capability="0" offset="0x0.0" selected_by="QPDP" size="0x8" />
 	<field name="qprt" descr="" subnode="qprt_ext" capability="0" offset="0x0.0" selected_by="QPRT" size="0x8" />
 	<field name="qtct" descr="" subnode="qtct_ext" capability="0" offset="0x0.0" selected_by="QTCT" size="0x8" />
@@ -121,11 +154,10 @@
 	<field name="paos_reg" descr="" subnode="paos_reg_ext" capability="0" offset="0x0.0" selected_by="PAOS" size="0x10" />
 	<field name="pltc_reg" descr="" subnode="pltc_reg_ext" capability="0" offset="0x0.0" selected_by="PLTC" size="0x10" />
 	<field name="ppcnt_reg" descr="" subnode="ppcnt_reg_ext" capability="0" offset="0x0.0" selected_by="PPCNT" size="0x100" />
-	<field name="pgmr" descr="" subnode="pgmr_ext" capability="0" offset="0x0.0" selected_by="PGMR" size="0x18" />
+	<field name="pgmr" descr="" subnode="pgmr_ext" capability="0" offset="0x0.0" selected_by="PGMR" size="0x2c" />
 	<field name="pter_reg" descr="" subnode="pter_reg_ext" capability="0" offset="0x0.0" selected_by="PTER" size="0x20" />
 	<field name="prei_reg" descr="" subnode="prei_reg_ext" capability="0" offset="0x0.0" selected_by="PREI" size="0x18" />
 	<field name="pguid_reg" descr="" subnode="pguid_reg_ext" capability="0" offset="0x0.0" selected_by="PGUID" size="0x60" />
-	<field name="ppcc_reg" descr="" subnode="ppcc_reg_ext" capability="0" offset="0x0.0" selected_by="PPCC" size="0xfc" />
 	<field name="pmlp_reg" descr="" subnode="pmlp_reg_ext" capability="0" offset="0x0.0" selected_by="PMLP" size="0x40" />
 	<field name="pmaos_reg" descr="" subnode="pmaos_reg_ext" capability="0" offset="0x0.0" selected_by="PMAOS" size="0x10" />
 	<field name="pmmp_reg" descr="" subnode="pmmp_reg_ext" capability="0" offset="0x0.0" selected_by="PMMP" size="0x28" />
@@ -150,51 +182,70 @@
 	<field name="pvlc_reg" descr="" subnode="pvlc_reg_ext" capability="0" offset="0x0.0" selected_by="PVLC" size="0x10" />
 	<field name="pbsr_reg" descr="" subnode="pbsr_reg_ext" capability="0" offset="0x0.0" selected_by="PBSR" size="0x64" />
 	<field name="pcmr_reg" descr="" subnode="pcmr_reg_ext" capability="0" offset="0x0.0" selected_by="PCMR" size="0xc" />
-	<field name="pvls" descr="" subnode="pvls_ext" capability="0" offset="0x0.0" selected_by="PVLS" size="0x8" />
+	<field name="pvls" descr="" subnode="pvls_ext" capability="0" offset="0x0.0" selected_by="PVLS" size="0x20" />
+	<field name="ppcc_reg" descr="" subnode="ppcc_reg_ext" capability="0" offset="0x0.0" selected_by="PPCC" size="0xfc" />
 	<field name="set_node_in" descr="" subnode="set_node_in_ext" capability="0" offset="0x0.0" selected_by="SET_NODE" size="0x40" />
 	<field name="register_power_settings" descr="" subnode="register_power_settings_ext" capability="0" offset="0x0.0" selected_by="POWER_SETTINGS" size="0x10" />
 	<field name="fp_sl_map_arg" descr="" subnode="fp_sl_map_arg_ext" capability="0" offset="0x0.0" selected_by="FP_SL_MAP" size="0x4" />
 	<field name="register_host_endianness" descr="" subnode="register_host_endianness_ext" capability="0" offset="0x0.0" selected_by="HOST_ENDIANNESS" size="0x10" />
-	<field name="mfcr" descr="" subnode="mfcr_ext" capability="0" offset="0x0.0" selected_by="MFCR" size="0x8" />
-	<field name="mfsc" descr="" subnode="mfsc_ext" capability="0" offset="0x0.0" selected_by="MFSC" size="0x8" />
-	<field name="mfsm" descr="" subnode="mfsm_ext" capability="0" offset="0x0.0" selected_by="MFSM" size="0x8" />
-	<field name="mfsl" descr="" subnode="mfsl_ext" capability="0" offset="0x0.0" selected_by="MFSL" size="0xc" />
-	<field name="fore" descr="" subnode="fore_ext" capability="0" offset="0x0.0" selected_by="FORE" size="0xc" />
-	<field name="mfnr" descr="" subnode="mfnr_ext" capability="0" offset="0x0.0" selected_by="MFNR" size="0x30" />
+	<field name="mmdio" descr="" subnode="mmdio_ext" capability="0" offset="0x0.0" selected_by="MMDIO" size="0xc" />
+	<field name="mlcr" descr="" subnode="mlcr_ext" capability="0" offset="0x0.0" selected_by="MLCR" size="0xc" />
+	<field name="mgcr_reg" descr="" subnode="mgcr_reg_ext" capability="0" offset="0x0.0" selected_by="MGCR" size="0x20" />
+	<field name="mhmpr_reg" descr="" subnode="mhmpr_reg_ext" capability="0" offset="0x0.0" selected_by="MHMPR" size="0x14" />
+	<field name="mjtag" descr="" subnode="mjtag_ext" capability="0" offset="0x0.0" selected_by="MJTAG" size="0x30" />
+	<field name="mfm" descr="" subnode="mfm_ext" capability="0" offset="0x0.0" selected_by="MFM" size="0x18" />
+	<field name="mhsr" descr="" subnode="mhsr_ext" capability="0" offset="0x0.0" selected_by="MHSR" size="0x8" />
+	<field name="mtpps_reg" descr="" subnode="mtpps_reg_ext" capability="0" offset="0x0.0" selected_by="MTPPS" size="0x38" />
+	<field name="mtptp" descr="" subnode="mtptp_ext" capability="0" offset="0x0.0" selected_by="MTPTP" size="0x40" />
+	<field name="mtutc_reg" descr="" subnode="mtutc_reg_ext" capability="0" offset="0x0.0" selected_by="MTUTC" size="0x1c" />
+	<field name="mrtc_reg" descr="" subnode="mrtc_reg_ext" capability="0" offset="0x0.0" selected_by="MRTC" size="0x10" />
+	<field name="mpgo_reg" descr="" subnode="mpgo_reg_ext" capability="0" offset="0x0.0" selected_by="MPGO" size="0x14" />
+	<field name="MSECQ_reg" descr="" subnode="MSECQ_reg_ext" capability="0" offset="0x0.0" selected_by="MSECQ" size="0x40" />
+	<field name="MSEES_reg" descr="" subnode="MSEES_reg_ext" capability="0" offset="0x0.0" selected_by="MSEES" size="0x40" />
+	<field name="MSPI" descr="" subnode="MSPI_ext" capability="0" offset="0x0.0" selected_by="MSPI" size="0x18" />
+	<field name="mcia" descr="" subnode="mcia_ext" capability="0" offset="0x0.0" selected_by="MCIA" size="0x94" />
+	<field name="mcion" descr="" subnode="mcion_ext" capability="0" offset="0x0.0" selected_by="MCION" size="0xc" />
+	<field name="mddt_reg" descr="" subnode="mddt_reg_ext" capability="0" offset="0x0.0" selected_by="MDDT" size="0x110" />
+	<field name="mddq" descr="" subnode="mddq_ext" capability="0" offset="0x0.0" selected_by="MDDQ" size="0x30" />
+	<field name="mddc" descr="" subnode="mddc_ext" capability="0" offset="0x0.0" selected_by="MDDC" size="0x30" />
+	<field name="mgpir" descr="" subnode="mgpir_ext" capability="0" offset="0x0.0" selected_by="MGPIR" size="0xa0" />
+	<field name="mdrcr" descr="" subnode="mdrcr_ext" capability="0" offset="0x0.0" selected_by="MDRCR" size="0x30" />
+	<field name="mdfcr_reg" descr="" subnode="mdfcr_reg_ext" capability="0" offset="0x0.0" selected_by="MDFCR" size="0x60" />
 	<field name="mtcap" descr="" subnode="mtcap_ext" capability="0" offset="0x0.0" selected_by="MTCAP" size="0x10" />
 	<field name="mtecr" descr="" subnode="mtecr_ext" capability="0" offset="0x0.0" selected_by="MTECR" size="0x60" />
 	<field name="mtmp" descr="" subnode="mtmp_ext" capability="0" offset="0x0.0" selected_by="MTMP" size="0x20" />
 	<field name="mtwe" descr="" subnode="mtwe_ext" capability="0" offset="0x0.0" selected_by="MTWE" size="0x10" />
 	<field name="mtewe" descr="" subnode="mtewe_ext" capability="0" offset="0x0.0" selected_by="MTEWE" size="0x5c" />
+	<field name="mtbr_reg" descr="" subnode="mtbr_reg_ext" capability="0" offset="0x0.0" selected_by="MTBR" size="0x18" />
+	<field name="mpgr" descr="" subnode="mpgr_ext" capability="0" offset="0x0.0" selected_by="MPGR" size="0x20" />
 	<field name="mvcap_reg" descr="" subnode="mvcap_reg_ext" capability="0" offset="0x0.0" selected_by="MVCAP" size="0x10" />
 	<field name="mvcr" descr="" subnode="mvcr_ext" capability="0" offset="0x0.0" selected_by="MVCR" size="0x18" />
 	<field name="msps" descr="" subnode="msps_ext" capability="0" offset="0x0.0" selected_by="MSPS" size="0xa0" />
 	<field name="mcpp_reg" descr="" subnode="mcpp_reg_ext" capability="0" offset="0x0.0" selected_by="MCPP" size="0x10" />
-	<field name="mtbr_reg" descr="" subnode="mtbr_reg_ext" capability="0" offset="0x0.0" selected_by="MTBR" size="0x18" />
-	<field name="mfpa_reg" descr="" subnode="mfpa_reg_ext" capability="0" offset="0x0.0" selected_by="MFPA" size="0x20" />
-	<field name="mfba_reg" descr="" subnode="mfba_reg_ext" capability="0" offset="0x0.0" selected_by="MFBA" size="0x10c" />
-	<field name="mfbe_reg" descr="" subnode="mfbe_reg_ext" capability="0" offset="0x0.0" selected_by="MFBE" size="0xc" />
-	<field name="mfmc_reg" descr="" subnode="mfmc_reg_ext" capability="0" offset="0x0.0" selected_by="MFMC" size="0x1c" />
-	<field name="mcia" descr="" subnode="mcia_ext" capability="0" offset="0x0.0" selected_by="MCIA" size="0x90" />
-	<field name="mcion" descr="" subnode="mcion_ext" capability="0" offset="0x0.0" selected_by="MCION" size="0xc" />
-	<field name="mmia" descr="" subnode="mmia_ext" capability="0" offset="0x0.0" selected_by="MMIA" size="0xc" />
-	<field name="mmdio" descr="" subnode="mmdio_ext" capability="0" offset="0x0.0" selected_by="MMDIO" size="0xc" />
-	<field name="mpgr" descr="" subnode="mpgr_ext" capability="0" offset="0x0.0" selected_by="MPGR" size="0x20" />
-	<field name="mfm" descr="" subnode="mfm_ext" capability="0" offset="0x0.0" selected_by="MFM" size="0x18" />
-	<field name="mhsr" descr="" subnode="mhsr_ext" capability="0" offset="0x0.0" selected_by="MHSR" size="0x8" />
-	<field name="mjtag" descr="" subnode="mjtag_ext" capability="0" offset="0x0.0" selected_by="MJTAG" size="0x30" />
-	<field name="msgi" descr="" subnode="msgi_ext" capability="0" offset="0x0.0" selected_by="MSGI" size="0x80" />
-	<field name="msci" descr="" subnode="msci_ext" capability="0" offset="0x0.0" selected_by="MSCI" size="0xc" />
-	<field name="mpcir" descr="" subnode="mpcir_ext" capability="0" offset="0x0.0" selected_by="MPCIR" size="0x10" />
-	<field name="mrtc_reg" descr="" subnode="mrtc_reg_ext" capability="0" offset="0x0.0" selected_by="MRTC" size="0x10" />
+	<field name="mrsr" descr="" subnode="mrsr_ext" capability="0" offset="0x0.0" selected_by="MRSR" size="0x8" />
+	<field name="mfrl_reg" descr="" subnode="mfrl_reg_ext" capability="0" offset="0x0.0" selected_by="MFRL" size="0x8" />
+	<field name="mcqs_reg" descr="" subnode="mcqs_reg_ext" capability="0" offset="0x0.0" selected_by="MCQS" size="0x10" />
+	<field name="mcqi_reg" descr="" subnode="mcqi_reg_ext" capability="0" offset="0x0.0" selected_by="MCQI" size="0x94" />
+	<field name="mcc_reg" descr="" subnode="mcc_reg_ext" capability="0" offset="0x0.0" selected_by="MCC" size="0x20" />
+	<field name="mcda_reg" descr="" subnode="mcda_reg_ext" capability="0" offset="0x0.0" selected_by="MCDA" size="0x90" />
+	<field name="mcdd_reg" descr="" subnode="mcdd_reg_ext" capability="0" offset="0x0.0" selected_by="MCDD" size="0x20" />
+	<field name="mirc_reg" descr="" subnode="mirc_reg_ext" capability="0" offset="0x0.0" selected_by="MIRC" size="0x8" />
+	<field name="mqis_reg" descr="" subnode="mqis_reg_ext" capability="0" offset="0x0.0" selected_by="MQIS" size="0x18" />
 	<field name="mgir" descr="" subnode="mgir_ext" capability="0" offset="0x0.0" selected_by="MGIR" size="0xa0" />
-	<field name="mgpir" descr="" subnode="mgpir_ext" capability="0" offset="0x0.0" selected_by="MGPIR" size="0xa0" />
+	<field name="msgi" descr="" subnode="msgi_ext" capability="0" offset="0x0.0" selected_by="MSGI" size="0x80" />
 	<field name="mdir_reg" descr="" subnode="mdir_reg_ext" capability="0" offset="0x0.0" selected_by="MDIR" size="0x40" />
-	<field name="mssir_reg" descr="" subnode="mssir_reg_ext" capability="0" offset="0x0.0" selected_by="MSSIR" size="0x80" />
-	<field name="mhmpr_reg" descr="" subnode="mhmpr_reg_ext" capability="0" offset="0x0.0" selected_by="MHMPR" size="0x14" />
-	<field name="mpfm" descr="" subnode="mpfm_ext" capability="0" offset="0x0.0" selected_by="MPFM" size="0x8" />
-	<field name="mrsr" descr="" subnode="mrsr_ext" capability="0" offset="0x0.0" selected_by="MRSR" size="0x8" />
-	<field name="mpgo_reg" descr="" subnode="mpgo_reg_ext" capability="0" offset="0x0.0" selected_by="MPGO" size="0x14" />
+	<field name="mssir_reg" descr="" subnode="mssir_reg_ext" capability="0" offset="0x0.0" selected_by="MSSIR" size="0x88" />
+	<field name="mmia" descr="" subnode="mmia_ext" capability="0" offset="0x0.0" selected_by="MMIA" size="0xc" />
+	<field name="mini" descr="" subnode="mini_ext" capability="0" offset="0x0.0" selected_by="MINI" size="0x30" />
+	<field name="mcam_reg" descr="" subnode="mcam_reg_ext" capability="0" offset="0x0.0" selected_by="MCAM" size="0x48" />
+	<field name="meccc" descr="" subnode="meccc_ext" capability="0" offset="0x0.0" selected_by="MECCC" size="0x14" />
+	<field name="mbct" descr="" subnode="mbct_ext" capability="0" offset="0x0.0" selected_by="MBCT" size="0x420" />
+	<field name="mdsr_reg" descr="" subnode="mdsr_reg_ext" capability="0" offset="0x0.0" selected_by="MDSR" size="0x30" />
+	<field name="mfsv_reg" descr="" subnode="mfsv_reg_ext" capability="0" offset="0x0.0" selected_by="MFSV" size="0x30" />
+	<field name="mtcq_reg" descr="" subnode="mtcq_reg_ext" capability="0" offset="0x0.0" selected_by="MTCQ" size="0x70" />
+	<field name="mqdik_reg" descr="" subnode="mqdik_reg_ext" capability="0" offset="0x0.0" selected_by="MQDIK" size="0x208" />
+	<field name="mkdc_reg" descr="" subnode="mkdc_reg_ext" capability="0" offset="0x0.0" selected_by="MKDC" size="0x2c" />
+	<field name="mspmer" descr="" subnode="mspmer_ext" capability="0" offset="0x0.0" selected_by="MSPMER" size="0x8" />
 	<field name="mnvda_reg" descr="" subnode="mnvda_reg_ext" capability="0" offset="0x0.0" selected_by="MNVDA" size="0x10" />
 	<field name="mnvdi_reg" descr="" subnode="mnvdi_reg_ext" capability="0" offset="0x0.0" selected_by="MNVDI" size="0xc" />
 	<field name="mnvqc_reg" descr="" subnode="mnvqc_reg_ext" capability="0" offset="0x0.0" selected_by="MNVQC" size="0x8" />
@@ -206,38 +257,25 @@
 	<field name="mtrc_conf_reg" descr="" subnode="mtrc_conf_reg_ext" capability="0" offset="0x0.0" selected_by="MTRC_CONF" size="0x80" />
 	<field name="mtrc_stdb_reg" descr="" subnode="mtrc_stdb_reg_ext" capability="0" offset="0x0.0" selected_by="MTRC_STDB" size="0xc" />
 	<field name="mtrc_ctrl_reg" descr="" subnode="mtrc_ctrl_reg_ext" capability="0" offset="0x0.0" selected_by="MTRC_CTRL" size="0x40" />
-	<field name="mlcr" descr="" subnode="mlcr_ext" capability="0" offset="0x0.0" selected_by="MLCR" size="0xc" />
-	<field name="mgcr_reg" descr="" subnode="mgcr_reg_ext" capability="0" offset="0x0.0" selected_by="MGCR" size="0x20" />
+	<field name="mfpa_reg" descr="" subnode="mfpa_reg_ext" capability="0" offset="0x0.0" selected_by="MFPA" size="0x20" />
+	<field name="mfba_reg" descr="" subnode="mfba_reg_ext" capability="0" offset="0x0.0" selected_by="MFBA" size="0x10c" />
+	<field name="mfbe_reg" descr="" subnode="mfbe_reg_ext" capability="0" offset="0x0.0" selected_by="MFBE" size="0xc" />
+	<field name="mfmc_reg" descr="" subnode="mfmc_reg_ext" capability="0" offset="0x0.0" selected_by="MFMC" size="0x1c" />
+	<field name="mfcr" descr="" subnode="mfcr_ext" capability="0" offset="0x0.0" selected_by="MFCR" size="0x8" />
+	<field name="mfsc" descr="" subnode="mfsc_ext" capability="0" offset="0x0.0" selected_by="MFSC" size="0x8" />
+	<field name="mfsm" descr="" subnode="mfsm_ext" capability="0" offset="0x0.0" selected_by="MFSM" size="0x8" />
+	<field name="mfsl" descr="" subnode="mfsl_ext" capability="0" offset="0x0.0" selected_by="MFSL" size="0xc" />
+	<field name="fore" descr="" subnode="fore_ext" capability="0" offset="0x0.0" selected_by="FORE" size="0xc" />
+	<field name="mfnr" descr="" subnode="mfnr_ext" capability="0" offset="0x0.0" selected_by="MFNR" size="0x30" />
+	<field name="mpcir" descr="" subnode="mpcir_ext" capability="0" offset="0x0.0" selected_by="MPCIR" size="0x10" />
 	<field name="merr" descr="" subnode="merr_ext" capability="0" offset="0x0.0" selected_by="MERR" size="0x14" />
+	<field name="mrpr_reg" descr="" subnode="mrpr_reg_ext" capability="0" offset="0x0.0" selected_by="MRPR" size="0x108" />
+	<field name="mdcr" descr="" subnode="mdcr_ext" capability="0" offset="0x0.0" selected_by="MDCR" size="0x60" />
+	<field name="mpfm" descr="" subnode="mpfm_ext" capability="0" offset="0x0.0" selected_by="MPFM" size="0x8" />
 	<field name="mpein_reg" descr="" subnode="mpein_reg_ext" capability="0" offset="0x0.0" selected_by="MPEIN" size="0x30" />
 	<field name="mpcnt_reg" descr="" subnode="mpcnt_reg_ext" capability="0" offset="0x0.0" selected_by="MPCNT" size="0x100" />
-	<field name="mtpps_reg" descr="" subnode="mtpps_reg_ext" capability="0" offset="0x0.0" selected_by="MTPPS" size="0x38" />
-	<field name="mtptp" descr="" subnode="mtptp_ext" capability="0" offset="0x0.0" selected_by="MTPTP" size="0x40" />
-	<field name="mtutc_reg" descr="" subnode="mtutc_reg_ext" capability="0" offset="0x0.0" selected_by="MTUTC" size="0x1c" />
 	<field name="mpir" descr="" subnode="mpir_ext" capability="0" offset="0x0.0" selected_by="MPIR" size="0x10" />
 	<field name="mpecs_reg" descr="" subnode="mpecs_reg_ext" capability="0" offset="0x0.0" selected_by="MPECS" size="0x20" />
-	<field name="mcqs_reg" descr="" subnode="mcqs_reg_ext" capability="0" offset="0x0.0" selected_by="MCQS" size="0x10" />
-	<field name="mcqi_reg" descr="" subnode="mcqi_reg_ext" capability="0" offset="0x0.0" selected_by="MCQI" size="0x94" />
-	<field name="mcc_reg" descr="" subnode="mcc_reg_ext" capability="0" offset="0x0.0" selected_by="MCC" size="0x20" />
-	<field name="mcda_reg" descr="" subnode="mcda_reg_ext" capability="0" offset="0x0.0" selected_by="MCDA" size="0x90" />
-	<field name="mtcq_reg" descr="" subnode="mtcq_reg_ext" capability="0" offset="0x0.0" selected_by="MTCQ" size="0x70" />
-	<field name="mkdc_reg" descr="" subnode="mkdc_reg_ext" capability="0" offset="0x0.0" selected_by="MKDC" size="0x2c" />
-	<field name="mbct" descr="" subnode="mbct_ext" capability="0" offset="0x0.0" selected_by="MBCT" size="0x420" />
-	<field name="mqis_reg" descr="" subnode="mqis_reg_ext" capability="0" offset="0x0.0" selected_by="MQIS" size="0x18" />
-	<field name="mirc_reg" descr="" subnode="mirc_reg_ext" capability="0" offset="0x0.0" selected_by="MIRC" size="0x8" />
-	<field name="mcdd_reg" descr="" subnode="mcdd_reg_ext" capability="0" offset="0x0.0" selected_by="MCDD" size="0x20" />
-	<field name="mdfcr_reg" descr="" subnode="mdfcr_reg_ext" capability="0" offset="0x0.0" selected_by="MDFCR" size="0x60" />
-	<field name="mdcr" descr="" subnode="mdcr_ext" capability="0" offset="0x0.0" selected_by="MDCR" size="0x60" />
-	<field name="mddt_reg" descr="" subnode="mddt_reg_ext" capability="0" offset="0x0.0" selected_by="MDDT" size="0x110" />
-	<field name="mddq" descr="" subnode="mddq_ext" capability="0" offset="0x0.0" selected_by="MDDQ" size="0x30" />
-	<field name="mddc" descr="" subnode="mddc_ext" capability="0" offset="0x0.0" selected_by="MDDC" size="0x30" />
-	<field name="mdrcr" descr="" subnode="mdrcr_ext" capability="0" offset="0x0.0" selected_by="MDRCR" size="0x30" />
-	<field name="mdsr_reg" descr="" subnode="mdsr_reg_ext" capability="0" offset="0x0.0" selected_by="MDSR" size="0x30" />
-	<field name="mfsv_reg" descr="" subnode="mfsv_reg_ext" capability="0" offset="0x0.0" selected_by="MFSV" size="0x30" />
-	<field name="mqdik_reg" descr="" subnode="mqdik_reg_ext" capability="0" offset="0x0.0" selected_by="MQDIK" size="0x208" />
-	<field name="mrpr_reg" descr="" subnode="mrpr_reg_ext" capability="0" offset="0x0.0" selected_by="MRPR" size="0x108" />
-	<field name="mcam_reg" descr="" subnode="mcam_reg_ext" capability="0" offset="0x0.0" selected_by="MCAM" size="0x48" />
-	<field name="mfrl_reg" descr="" subnode="mfrl_reg_ext" capability="0" offset="0x0.0" selected_by="MFRL" size="0x8" />
 	<field name="mmhi_reg" descr="" subnode="mmhi_reg_ext" capability="0" offset="0x0.0" selected_by="MMHI" size="0x80" />
 	<field name="cwgcr" descr="" subnode="cwgcr_ext" capability="0" offset="0x0.0" selected_by="CWGCR" size="0x14" />
 	<field name="cwtp" descr="" subnode="cwtp_ext" capability="0" offset="0x0.0" selected_by="CWTP" size="0x40" />
@@ -294,15 +332,15 @@
 <node name="application_prio_entry_ext" descr="" size="0x4.0" >
 	<field name="protocol_id" descr="According to 802.1Q application priority TLV" access="RO" offset="0x0.0" size="0x0.16" />
 	<field name="sel" descr="According to 802.1Q application priority TLV" access="RO" offset="0x0.16" size="0x0.3" />
-	<field name="priority" descr="This field is reserved when HCA_CAP.num_ports ==1. \;Table  1954, &quot;QUERY_HCA_CAP Input Structure Layout,&quot; on \;page  2438. According to 802.1Q application priority TLV" access="RO" offset="0x0.21" size="0x0.3" />
+	<field name="priority" descr="This field is reserved when HCA_CAP.num_ports ==1. \;Table  2044, &quot;QUERY_HCA_CAP Input Structure Layout,&quot; on \;page  2333. According to 802.1Q application priority TLV" access="RO" offset="0x0.21" size="0x0.3" />
 </node>
 
 <node name="bufferx_reg_ext" descr="" size="0x8.0" >
-	<field name="size" descr="The part of the packet buffer array is allocated for the spe\;cific buffer.\;Units are represented in cells.\;For shared_headroom_pool, this field represents the maxi\;mum load from the shared headroom pool and it can be set \;only when port_shared_buffer is enabled. \;" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="size" descr="The part of the packet buffer array is allocated for the spe\;cific buffer.\;Units are represented in cells.\;For shared_headroom_pool, this field represents the max\;imum load from the shared headroom pool and it can be \;set only when port_shared_buffer is enabled. \;" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="epsb" descr="Eligible for Port Shared buffer.\;If epsb is set, packets assigned to bufferX are allowed to \;insert the port shared buffer.\;For port_shared_buffer, this field is reserved.\;For shared_headroom_pool, this field is reserved.\;When lossy==1 this field is reserved.\;The field is reserved for Switch-X/-2." access="RW" offset="0x0.24" size="0x0.1" />
 	<field name="lossy" descr="The field indicates if the buffer is lossy.\;0: Lossless\;1: Lossy\;\;The field is reserved for Switch-X/-2.\;For port_shared_buffer, this field is reserved.\;For shared_headroom_pool, this field is reserved.\;NOTE: This field does NOT affect the pause control. Pause \;control is configured using PFCC register." access="RW" offset="0x0.25" size="0x0.1" />
-	<field name="xon_threshold" descr="When the amount of data in the buffer goes below this value, \;device stops sending pause frames for the Prios associated \;with the buffer. Units are represented in cells.\;In Spectrum xon_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="xoff_threshold" descr="Once the amount of data in the buffer goes above this value, \;device starts sending Pause frames for all Prios associated \;with the buffer. Units are represented in cells.\;In Spectrum xoff_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.16" size="0x0.16" />
+	<field name="xon_threshold" descr="When the amount of data in the buffer goes below this \;value, device stops sending pause frames for the Prios \;associated with the buffer. Units are represented in cells.\;In Spectrum xon_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="xoff_threshold" descr="Once the amount of data in the buffer goes above this \;value, device starts sending Pause frames for all Prios \;associated with the buffer. Units are represented in cells.\;In Spectrum xoff_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.16" size="0x0.16" />
 </node>
 
 <node name="chlmm_ext" descr="" size="0x14.0" >
@@ -344,7 +382,7 @@
 	<field name="version" descr="Configuration item version - defines the data structure follow\;ing the header (together with the type field)." access="RW" offset="0x0.12" size="0x0.4" />
 	<field name="writer_id" descr="The entity which configured this parameter\;0x0: UNSPECIFIED\;0x1: CHASSIS_BMC\;0x2: MAD\;0x3: BMC\;0x4: COMMAND_INTERFACE\;0x5: ICMD - with unspecified source\;0x6: ICMD_UEFI_HII - configured by the NIC&apos;s UEFI expansion \;ROM&quot;s HII menu.\;0x7: ICMD_UEFI_CLP - configured by the NIC&apos;s expansion \;ROM&quot;s CLP.\;0x8: ICMD_Flexboot - configured by the NIC&quot;s legacy expansion \;ROM.\;0x9: ICMD_mlxconfig - configured by Mellanox mlxconfig tool\;0xA: ICMD_USER1 - value available for customer created tools \;that uses the ICMD interface for writing TLVs.\;0xB: ICMD_USER2 - value available for customer created tools \;that uses the ICMD interface for writing TLVs.\;0xC: ICMD_MLXCONFIG_SET_RAW - configures by\;mlxconfig set raw operation.\;0xD: ICMD_FLEXBOOT_CLP - configured by Legacy Expansion \;ROM CLP\;0x10: BMC_APP1 - Configuration was done over the BMC by \;application #1 (application name is OEM specific)\;0x11: BMC_APP2 - Configuration was done over the BMC by \;application #2 (application name is OEM specific)\;0x12: BMP_APP3 - Configuration was done over the BMC by \;application #3 (application name is OEM specific)\;0x1F: OTHER - the parameter was written by the NIC due to \;other reasons. \;\;Note - This field is writeable only when using the ICMD inter\;face. The only value that are valid for writes are 0x6 through \;0xB. Other values will be replaced by 0x5ICMD." access="RO" enum="UNSPECIFIED=0x0,CHASSIS_BMC=0x1,MAD=0x2,BMC=0x3,COMMAND_INTERFACE=0x4,ICMD=0x5,ICMD_UEFI_HII=0x6,ICMD_UEFI_CLP=0x7,ICMD_Flexboot=0x8,ICMD_mlxconfig=0x9,ICMD_USER1=0xa,ICMD_USER2=0xb,ICMD_MLXCONFIG_SET_RAW=0xc,ICMD_FLEXBOOT_CLP=0xd,BMC_APP1=0x10,BMC_APP2=0x11,BMP_APP3=0x12,OTHER=0x1f" offset="0x0.16" size="0x0.5" />
 	<field name="access_mode" descr="Defines which value of the Configuration Item will be accessed.\;0: NEXT - Next value to be applied \;1: CURRENT - Currently set values (only valid for Query \;operation) Supported only if NVGC.nvda_read_current_set\;tings==1.\;2: FACTORY - Default factory values (only valid for Query opera\;tion). Supported only if NVGC.nvda_read_factory_settings==1." access="INDEX" enum="NEXT=0x0,CURRENT=0x1,FACTORY=0x2" offset="0x0.22" size="0x0.2" />
-	<field name="type_index" descr="Configuration item index according to its type_class. \;Table 1798, &quot;Configuration Item Data Type Class Global \;Layout,&quot; on page 2278\;Table 1800, &quot;Configuration Item Data Type Class Physical \;Port Layout,&quot; on page 2279\;Table 1802, &quot;Configuration Item Data Type Class Per \;Host-PF Layout,&quot; on page 2279\;Table 1804, &quot;Configuration Item Data Type Class Log Lay\;out,&quot; on page 2280\;Table 1806, &quot;Configuration Item Data Type Class File Lay\;out,&quot; on page 2280\;Table 1808, &quot;Configuration Item Data Type Class Host \;Layout,&quot; on page 2281\;" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="type_index" descr="Configuration item index according to its type_class. \;Table 1937, &quot;Configuration Item Data Type Class Global \;Layout,&quot; on page 2237\;Table 1939, &quot;Configuration Item Data Type Class Physical \;Port Layout,&quot; on page 2237\;Table 1941, &quot;Configuration Item Data Type Class Per \;Host-PF Layout,&quot; on page 2238\;Table 1943, &quot;Configuration Item Data Type Class Log Lay\;out,&quot; on page 2238\;Table 1945, &quot;Configuration Item Data Type Class File Lay\;out,&quot; on page 2239\;Table 1947, &quot;Configuration Item Data Type Class Host \;Layout,&quot; on page 2239\;\;Table 1951, &quot;Configuration Item Data Type Class Module \;Layout,&quot; on page 2240" access="INDEX" offset="0x4.0" size="0x0.24" />
 	<field name="type_class" descr="Type Class:\;0: Global\;1: Port\;2: BMC\;3: Host_PF\;6: File\;7: Host\;\;9: Module" access="INDEX" enum="Global=0x0,Port=0x1,BMC=0x2,Host_PF=0x3,File=0x6,Host=0x7,Module=0x9" offset="0x4.24" size="0x0.8" />
 </node>
 
@@ -369,7 +407,7 @@
 
 <node name="cpqe_ext" descr="" size="0xc.0" >
 	<field name="local_port" descr="Egress Local Port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="marking_percent" descr="ECN Marking percentage when the local_port rate is \;above the phantom queue rate as configured by phan\;tom_queue_rate in QEEC, see Section 19.3.4, &quot;QEEC - \;QoS ETS Element Configuration&quot;, on page 1166\;Range is 0..100, units of integer percentage" access="RW" offset="0x8.16" size="0x0.7" />
+	<field name="marking_percent" descr="ECN Marking percentage when the local_port rate is \;above the phantom queue rate as configured by phan\;tom_queue_rate in QEEC, see Table 969, &quot;QEEC - QoS \;ETS Element Configuration Register Layout,&quot; on \;page 1193.\;Range is 0..100, units of integer percentage" access="RW" offset="0x8.16" size="0x0.7" />
 </node>
 
 <node name="credential_handle_ext" descr="" size="0x300.0" >
@@ -381,7 +419,7 @@
 
 <node name="credential_obj_ext" descr="" size="0x100.0" >
 	<field name="modify_field_select" descr="Field select indicates in QUERY which fields are modi\;fiable (1 means modifiable), and in MODIFY which \;fields to modify." subnode="uint64" offset="0x0.0" size="0x8.0" />
-	<field name="credential_role" descr="0x0: role_officer - Officer role. \;0x1: role_user - User role." enum="role_officer=0x0,role_user=0x1" offset="0x8.0" size="0x0.8" />
+	<field name="credential_role" descr="0x0: role_officer - Officer role\;0x1: role_user - User role" enum="role_officer=0x0,role_user=0x1" offset="0x8.0" size="0x0.8" />
 	<field name="state" descr="Credential state, Valid for Query command only.\;0x0: READY - the Credential state when first created\;0x1: ERROR - Credential unusable, need to destroy and \;re-create this credential." enum="READY=0x0,ERROR=0x1" offset="0x8.24" size="0x0.8" />
 	<field name="credential" descr="The actual secret. Should be wrapped by import_KEK \;since\;credentials are only used in wrapped import method. \;Size includes\;8 bytes IV for wrapping." high_bound="11" low_bound="0" offset="0x40.0" size="0x30.0" />
 </node>
@@ -416,7 +454,7 @@
 
 <node name="cwgcr_ext" descr="" size="0x14.0" >
 	<field name="aqs_time" descr="Average queue size time\;Time from current_queue_size to previous_aqs\;The time is 2^aqs_time * 64nSec\;Valid range is 0..24" access="RW" offset="0x0.0" size="0x0.8" />
-	<field name="aqs_weight" descr="Average queue size weight.\;The average queue size (aqs) is calculated by:\;aqs = ((current_queue_size)*2^-w) + ((previous_aqs)*(1-2^-w)) \;where w is aqs_weight\;The time between current_queue_size and previous_aqs is con\;figured by aqs_time\;Note: when mode=percentage then there is no moving average \;(the aqs_weight is effectively 0). See Section 25.31.2, &quot;CWTP - \;Congestion WRED ECN TClass Profile Register&quot;, on page 1889" access="RW" offset="0x0.8" size="0x0.4" />
+	<field name="aqs_weight" descr="Average queue size weight.\;The average queue size (aqs) is calculated by:\;aqs = ((current_queue_size)*2^-w) + ((previous_aqs)*(1-2^-w)) \;where w is aqs_weight\;The time between current_queue_size and previous_aqs is con\;figured by aqs_time\;Note: when mode=percentage then there is no moving average \;(the aqs_weight is effectively 0). See Section 25.31.2, &quot;CWTP - \;Congestion WRED ECN TClass Profile Register&quot;, on page 1972" access="RW" offset="0x0.8" size="0x0.4" />
 	<field name="scd" descr="Enable ECN Source Congestion Detection only. Don&apos;t mark vic\;tim packets.\;" access="RW" offset="0x0.16" size="0x0.1" />
 	<field name="en" descr="enable bits:\;bit2: WRED drop enable\;" access="RW" offset="0x0.24" size="0x0.4" />
 	<field name="cece" descr="Count ECN for Congestion Experienced\;0: do not count &quot;ECN mark&quot; for a packet which has Congestion \;Experienced (ECN=11 at ingress) \;1: do count ECN mark for a packet which has Congestion Expe\;rienced (ECN=11 at ingress) and experiences congestion in the \;switch (default)\;In any case, a packet coming with ECN=00 is not counted as \;ECN." access="RW" offset="0x4.0" size="0x0.1" />
@@ -441,7 +479,7 @@
 	<field name="local_port" descr="Local port number\;CPU port is not supported" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="traffic_class" descr="Traffic Class\;Range is 0..cap_max_tclass_sb-1" access="INDEX" offset="0x20.0" size="0x0.8" />
 	<field name="mode" descr="Mode of thresholds for WRED and ECN:\;0: Fixed\;1: Percentage" access="RW" enum="Fixed=0x0,Percentage=0x1" offset="0x24.24" size="0x0.1" />
-	<field name="profile1_min" descr="Minimum Average Queue Size of the profile number &lt;i&gt;\;When mode is Fixed:\;Cells. Valid inputs are 1..cap_total_buffer_size/cap_\;cell_size.\;For Spectrum: must be a multiple of 64\;Note: for Spectrum, must be larger than 2^aqs_weight \;cells, see Section 25.31.1, &quot;CWGCR - Congestion WRED \;ECN General Configuration Register&quot;, on page 1887\;When mode is Percentage:\;Percentage of the quota of local_port,traffic_class. \;Range is 0..100, units of integer percentage. When ECN \;Source Congestion Detection is enabled then congestion \;occurs when there are at least 256 cells in the buffer\;" access="RW" offset="0x28.0" size="0x0.20" />
+	<field name="profile1_min" descr="Minimum Average Queue Size of the profile number &lt;i&gt;\;When mode is Fixed:\;Cells. Valid inputs are 1..cap_total_buffer_size/cap_\;cell_size.\;For Spectrum: must be a multiple of 64\;Note: for Spectrum, must be larger than 2^aqs_weight \;cells, see Section 25.31.1, &quot;CWGCR - Congestion WRED \;ECN General Configuration Register&quot;, on page 1970\;When mode is Percentage:\;Percentage of the quota of local_port,traffic_class. \;Range is 0..100, units of integer percentage. When ECN \;Source Congestion Detection is enabled then congestion \;occurs when there are at least 256 cells in the buffer\;" access="RW" offset="0x28.0" size="0x0.20" />
 	<field name="profile1_max" descr="Maximum Average Queue Size of the profile number &lt;i&gt;\;When mode is Fixed:\;Cells. Valid inputs are 1..cap_total_buffer_size/cap_\;cell_size\;For Spectrum: must be a multiple of 64\;When mode is Percentage:\;Percentage of the quota of local_port,traffic_class. \;Range is 0..100, units of integer percentage.\;profile&lt;i&gt;_max must always be equal or greater than \;profile&lt;i&gt;_min" access="RW" offset="0x2C.0" size="0x0.20" />
 	<field name="profile1_percent" descr="Percentage of WRED and ECN marking for Maximum \;Average Queue Size of the profile number &lt;i&gt;\;Range is 0..100, units of integer percentage\;Default is 0" access="RW" offset="0x2C.24" size="0x0.7" />
 	<field name="profile2_min" descr="Same as above." access="RW" offset="0x30.0" size="0x0.20" />
@@ -466,14 +504,14 @@
 </node>
 
 <node name="dcbx_app_reg_ext" descr="" size="0x14.0" >
-	<field name="port_number" descr="Physical port number.\;This field is reserved when HCA_CAP.num_ports ==1. \;Table  1954, &quot;QUERY_HCA_CAP Input Structure Layout,&quot; on \;page  2438" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="port_number" descr="Physical port number.\;This field is reserved when HCA_CAP.num_ports ==1. \;Table  2044, &quot;QUERY_HCA_CAP Input Structure Layout,&quot; on \;page  2333" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="num_app_prio" descr="" access="RO" offset="0x4.0" size="0x0.6" />
 	<field name="app_prio" descr="Application priority entry. \;" subnode="application_prio_entry_ext" access="RO" high_bound="VARIABLE" low_bound="0" offset="0x10.0" size="0x4.0" />
 </node>
 
 <node name="dcbx_param_reg_ext" descr="" size="0x40.0" >
 	<field name="max_application_table_size" descr="The maximum size of DCBX application table." access="RO" offset="0x0.0" size="0x0.6" />
-	<field name="port_number" descr="Physical port number.\;This field is reserved when HCA_CAP.num_ports ==1. \;Table  1954, &quot;QUERY_HCA_CAP Input Structure Layout,&quot; on \;page  2438" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="port_number" descr="Physical port number.\;This field is reserved when HCA_CAP.num_ports ==1. \;Table  2044, &quot;QUERY_HCA_CAP Input Structure Layout,&quot; on \;page  2333" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="dcbx_standby_cap" descr="If set, device supports DCBX on standby mode (aux power)." access="RO" offset="0x0.29" size="0x0.1" />
 	<field name="dcbx_ieee_cap" descr="If set, DCBX IEEE version is supported." access="RO" offset="0x0.30" size="0x0.1" />
 	<field name="dcbx_cee_cap" descr="If set, DCBX CEE version is supported." access="RO" offset="0x0.31" size="0x0.1" />
@@ -530,8 +568,8 @@
 	<field name="ether_stats_fragments_low" descr="The total number of packets received that \;were less than 64 octets in length (excluding \;framing bits but including FCS octets) and \;had either a bad FCS with an integral num\;ber of octets (FCS error) or a bad FCS with a \;non-integral number of octets (alignment \;error).\;" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="ether_stats_jabbers_high" descr="The total number of packets received that \;were longer than MTU octets (excluding \;framing bits, but including FCS octets), and \;had either a bad FCS with an integral num\;ber of octets (FCS error) or a bad FCS with a \;non-integral number of octets (alignment \;error).\;" access="RO" offset="0x48.0" size="0x4.0" />
 	<field name="ether_stats_jabbers_low" descr="The total number of packets received that \;were longer than MTU octets (excluding \;framing bits, but including FCS octets), and \;had either a bad FCS with an integral num\;ber of octets (FCS error) or a bad FCS with a \;non-integral number of octets (alignment \;error).\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="ether_stats_collisions_high" descr="The best estimate of the total number of \;collisions on this Ethernet segment.\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="ether_stats_collisions_low" descr="The best estimate of the total number of \;collisions on this Ethernet segment.\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="ether_stats_collisions_high" descr="The best estimate of the total number of col\;lisions on this Ethernet segment.\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="ether_stats_collisions_low" descr="The best estimate of the total number of col\;lisions on this Ethernet segment.\;" access="RO" offset="0x54.0" size="0x4.0" />
 	<field name="ether_stats_pkts64octets_high" descr="The total number of packets (including bad \;packets) received that were 64 octets in \;length (excluding framing bits but including \;FCS octets)." access="RO" offset="0x58.0" size="0x4.0" />
 	<field name="ether_stats_pkts64octets_low" descr="The total number of packets (including bad \;packets) received that were 64 octets in \;length (excluding framing bits but including \;FCS octets)." access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="ether_stats_pkts65to127octets_high" descr="The total number of packets (including bad \;packets) received that were between 65 and \;127 octets in length (excluding framing bits \;but including FCS octets)." access="RO" offset="0x60.0" size="0x4.0" />
@@ -555,10 +593,10 @@
 </node>
 
 <node name="eth_2863_cntrs_grp_data_layout_ext" descr="" size="0xf8.0" >
-	<field name="if_in_octets_high" descr="The total number of octets received, including \;framing characters. Including MAC control frames.\;\;" access="RO" offset="0x0.0" size="0x4.0" />
-	<field name="if_in_octets_low" descr="The total number of octets received, including \;framing characters. Including MAC control frames.\;\;" access="RO" offset="0x4.0" size="0x4.0" />
-	<field name="if_in_ucast_pkts_high" descr="The number of packets successfully received, \;which were not addressed to a multicast or broad\;cast MAC address.\;" access="RO" offset="0x8.0" size="0x4.0" />
-	<field name="if_in_ucast_pkts_low" descr="The number of packets successfully received, \;which were not addressed to a multicast or broad\;cast MAC address.\;" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="if_in_octets_high" descr="The total number of octets received, including fram\;ing characters. Including MAC control frames.\;\;" access="RO" offset="0x0.0" size="0x4.0" />
+	<field name="if_in_octets_low" descr="The total number of octets received, including fram\;ing characters. Including MAC control frames.\;\;" access="RO" offset="0x4.0" size="0x4.0" />
+	<field name="if_in_ucast_pkts_high" descr="The number of packets successfully received, which \;were not addressed to a multicast or broadcast \;MAC address.\;" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="if_in_ucast_pkts_low" descr="The number of packets successfully received, which \;were not addressed to a multicast or broadcast \;MAC address.\;" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="if_in_discards_high" descr="The number of inbound packets which were chosen \;to be discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;\;\;\;\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="if_in_discards_low" descr="The number of inbound packets which were chosen \;to be discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;\;\;\;\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="if_in_errors_high" descr="The number of inbound packets that contained \;errors preventing them from being deliverable to a \;higher-layer protocol. \;" access="RO" offset="0x18.0" size="0x4.0" />
@@ -567,20 +605,20 @@
 	<field name="if_in_unknown_protos_low" descr="The number of packets received via the interface \;which were discarded because of an unknown or \;unsupported protocol.\;" access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="if_out_octets_high" descr="The total number of octets transmitted out of the \;interface, including framing characters.\;" access="RO" offset="0x28.0" size="0x4.0" />
 	<field name="if_out_octets_low" descr="The total number of octets transmitted out of the \;interface, including framing characters.\;" access="RO" offset="0x2C.0" size="0x4.0" />
-	<field name="if_out_ucast_pkts_high" descr="The total number of packets that higher-level pro\;tocols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x30.0" size="0x4.0" />
-	<field name="if_out_ucast_pkts_low" descr="The total number of packets that higher-level pro\;tocols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x34.0" size="0x4.0" />
+	<field name="if_out_ucast_pkts_high" descr="The total number of packets that higher-level proto\;cols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x30.0" size="0x4.0" />
+	<field name="if_out_ucast_pkts_low" descr="The total number of packets that higher-level proto\;cols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="if_out_discards_high" descr="The number of outbound packets which were cho\;sen to be discarded, even though no errors had \;been detected to prevent their being transmitted. \;" access="RO" offset="0x38.0" size="0x4.0" />
 	<field name="if_out_discards_low" descr="The number of outbound packets which were cho\;sen to be discarded, even though no errors had \;been detected to prevent their being transmitted. \;" access="RO" offset="0x3C.0" size="0x4.0" />
 	<field name="if_out_errors_high" descr="The number of outbound packets that could not be \;transmitted because of errors.\;" access="RO" offset="0x40.0" size="0x4.0" />
 	<field name="if_out_errors_low" descr="The number of outbound packets that could not be \;transmitted because of errors.\;" access="RO" offset="0x44.0" size="0x4.0" />
-	<field name="if_in_multicast_pkts_high" descr="The number of packets successfully received, \;which were addressed to a multicast MAC address.\;" access="RO" offset="0x48.0" size="0x4.0" />
-	<field name="if_in_multicast_pkts_low" descr="The number of packets successfully received, \;which were addressed to a multicast MAC address.\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="if_in_broadcast_pkts_high" descr="The number of packets successfully received, \;which were addressed to a broadcast MAC address.\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="if_in_broadcast_pkts_low" descr="The number of packets successfully received, \;which were addressed to a broadcast MAC address.\;" access="RO" offset="0x54.0" size="0x4.0" />
-	<field name="if_out_multicast_pkts_high" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x58.0" size="0x4.0" />
-	<field name="if_out_multicast_pkts_low" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x5C.0" size="0x4.0" />
-	<field name="if_out_broadcast_pkts_high" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x60.0" size="0x4.0" />
-	<field name="if_out_broadcast_pkts_low" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x64.0" size="0x4.0" />
+	<field name="if_in_multicast_pkts_high" descr="The number of packets successfully received, which \;were addressed to a multicast MAC address.\;" access="RO" offset="0x48.0" size="0x4.0" />
+	<field name="if_in_multicast_pkts_low" descr="The number of packets successfully received, which \;were addressed to a multicast MAC address.\;" access="RO" offset="0x4C.0" size="0x4.0" />
+	<field name="if_in_broadcast_pkts_high" descr="The number of packets successfully received, which \;were addressed to a broadcast MAC address.\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="if_in_broadcast_pkts_low" descr="The number of packets successfully received, which \;were addressed to a broadcast MAC address.\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="if_out_multicast_pkts_high" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x58.0" size="0x4.0" />
+	<field name="if_out_multicast_pkts_low" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x5C.0" size="0x4.0" />
+	<field name="if_out_broadcast_pkts_high" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x60.0" size="0x4.0" />
+	<field name="if_out_broadcast_pkts_low" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x64.0" size="0x4.0" />
 </node>
 
 <node name="eth_3635_cntrs_grp_data_layout_ext" descr="" size="0xf8.0" >
@@ -588,28 +626,28 @@
 	<field name="dot3stats_alignment_errors_low" descr="A count of frames received that are not an inte\;gral number of octets in length and do not pass \;the FCS check.\;" access="RW" offset="0x4.0" size="0x4.0" />
 	<field name="dot3stats_fcs_errors_high" descr="A count of frames received that are an integral \;number of octets in length but do not pass the \;FCS check. This count does not include frames \;received with frame-too-long or frame-too-\;short errors.\;" access="RW" offset="0x8.0" size="0x4.0" />
 	<field name="dot3stats_fcs_errors_low" descr="A count of frames received that are an integral \;number of octets in length but do not pass the \;FCS check. This count does not include frames \;received with frame-too-long or frame-too-\;short errors.\;" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="dot3stats_single_collision_frames_high" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted \;successfully.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x10.0" size="0x4.0" />
-	<field name="dot3stats_single_collision_frames_low" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted \;successfully.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x14.0" size="0x4.0" />
-	<field name="dot3stats_multiple_collision_frames_high" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x18.0" size="0x4.0" />
-	<field name="dot3stats_multiple_collision_frames_low" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x1C.0" size="0x4.0" />
+	<field name="dot3stats_single_collision_frames_high" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted suc\;cessfully.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x10.0" size="0x4.0" />
+	<field name="dot3stats_single_collision_frames_low" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted suc\;cessfully.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x14.0" size="0x4.0" />
+	<field name="dot3stats_multiple_collision_frames_high" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x18.0" size="0x4.0" />
+	<field name="dot3stats_multiple_collision_frames_low" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x1C.0" size="0x4.0" />
 	<field name="dot3stats_sqe_test_errors_high" descr="A count of times that the SQE TEST ERROR is \;received on a particular interface.\;This counter does not increment on interfaces \;operating at speeds greater than 10 Mb/s, or on \;interfaces operating in full-duplex mode. \;" access="RW" offset="0x20.0" size="0x4.0" />
 	<field name="dot3stats_sqe_test_errors_low" descr="A count of times that the SQE TEST ERROR is \;received on a particular interface.\;This counter does not increment on interfaces \;operating at speeds greater than 10 Mb/s, or on \;interfaces operating in full-duplex mode. \;" access="RW" offset="0x24.0" size="0x4.0" />
-	<field name="dot3stats_deferred_transmissions_high" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x28.0" size="0x4.0" />
-	<field name="dot3stats_deferred_transmissions_low" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x2C.0" size="0x4.0" />
-	<field name="dot3stats_late_collisions_high" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x30.0" size="0x4.0" />
-	<field name="dot3stats_late_collisions_low" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x34.0" size="0x4.0" />
-	<field name="dot3stats_excessive_collisions_high" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x38.0" size="0x4.0" />
-	<field name="dot3stats_excessive_collisions_low" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x3C.0" size="0x4.0" />
+	<field name="dot3stats_deferred_transmissions_high" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x28.0" size="0x4.0" />
+	<field name="dot3stats_deferred_transmissions_low" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x2C.0" size="0x4.0" />
+	<field name="dot3stats_late_collisions_high" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x30.0" size="0x4.0" />
+	<field name="dot3stats_late_collisions_low" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x34.0" size="0x4.0" />
+	<field name="dot3stats_excessive_collisions_high" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x38.0" size="0x4.0" />
+	<field name="dot3stats_excessive_collisions_low" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x3C.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_transmit_errors_high" descr="A count of frames for which transmission failed \;and were discarded even though no errors had \;been detected to prevent their being deliverable \;to a higher-layer protocol.\;" access="RW" offset="0x40.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_transmit_errors_low" descr="A count of frames for which transmission failed \;and were discarded even though no errors had \;been detected to prevent their being deliverable \;to a higher-layer protocol.\;" access="RW" offset="0x44.0" size="0x4.0" />
-	<field name="dot3stats_carrier_sense_errors_high" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular \;interface. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x48.0" size="0x4.0" />
-	<field name="dot3stats_carrier_sense_errors_low" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular \;interface. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x4C.0" size="0x4.0" />
+	<field name="dot3stats_carrier_sense_errors_high" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular interface. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x48.0" size="0x4.0" />
+	<field name="dot3stats_carrier_sense_errors_low" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular interface. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x4C.0" size="0x4.0" />
 	<field name="dot3stats_frame_too_longs_high" descr="A count of frames received that exceed the max\;imum permitted frame size.\;" access="RW" offset="0x50.0" size="0x4.0" />
 	<field name="dot3stats_frame_too_longs_low" descr="A count of frames received that exceed the max\;imum permitted frame size.\;" access="RW" offset="0x54.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_receive_errors_high" descr="A count of frames for which reception failed and \;were discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;" access="RW" offset="0x58.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_receive_errors_low" descr="A count of frames for which reception failed and \;were discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;" access="RW" offset="0x5C.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_high" descr="The number of times the receiving media is \;non-idle (a carrier event) for a period of time \;equal to or greater than minFrameSize, and \;during which there was at least one occurrence \;of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;\;" access="RW" offset="0x60.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_low" descr="The number of times the receiving media is \;non-idle (a carrier event) for a period of time \;equal to or greater than minFrameSize, and \;during which there was at least one occurrence \;of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;\;" access="RW" offset="0x64.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_high" descr="The number of times the receiving media is non-\;idle (a carrier event) for a period of time equal to \;or greater than minFrameSize, and during \;which there was at least one occurrence of an \;event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;\;" access="RW" offset="0x60.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_low" descr="The number of times the receiving media is non-\;idle (a carrier event) for a period of time equal to \;or greater than minFrameSize, and during \;which there was at least one occurrence of an \;event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;\;" access="RW" offset="0x64.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_high" descr="A count of MAC Control frames received that \;contain an opcode that is not supported.\;" access="RW" offset="0x68.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_low" descr="A count of MAC Control frames received that \;contain an opcode that is not supported.\;" access="RW" offset="0x6C.0" size="0x4.0" />
 	<field name="dot3in_pause_frames_high" descr="A count of MAC Control frames received with an \;opcode indicating the PAUSE operation.\;\;" access="RW" offset="0x70.0" size="0x4.0" />
@@ -621,8 +659,8 @@
 <node name="eth_802_3_cntrs_grp_data_layout_ext" descr="" size="0xf8.0" >
 	<field name="a_frames_transmitted_ok_high" descr="A count of frames that are successfully trans\;mitted. \;" access="RO" offset="0x0.0" size="0x4.0" />
 	<field name="a_frames_transmitted_ok_low" descr="A count of frames that are successfully trans\;mitted. \;" access="RO" offset="0x4.0" size="0x4.0" />
-	<field name="a_frames_received_ok_high" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, \;or frames lost due to other MAC errors.\;\;" access="RO" offset="0x8.0" size="0x4.0" />
-	<field name="a_frames_received_ok_low" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, \;or frames lost due to other MAC errors.\;\;" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="a_frames_received_ok_high" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, or \;frames lost due to other MAC errors.\;\;" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="a_frames_received_ok_low" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, or \;frames lost due to other MAC errors.\;\;" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="a_frame_check_sequence_errors_high" descr="A count of receive frames that are an integral \;number of octets in length and do not pass the \;FCS check. This does not include frames \;received with frame-too-long, or frame-too-\;short (frame fragment) errors.\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="a_frame_check_sequence_errors_low" descr="A count of receive frames that are an integral \;number of octets in length and do not pass the \;FCS check. This does not include frames \;received with frame-too-long, or frame-too-\;short (frame fragment) errors.\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="a_alignment_errors_high" descr="A count of frames that are not an integral \;number of octets in length and do not pass the \;FCS check.\;" access="RO" offset="0x18.0" size="0x4.0" />
@@ -639,8 +677,8 @@
 	<field name="a_multicast_frames_received_ok_low" descr="A count of frames that are successfully \;received and directed to an active nonbroad\;cast group address. This does not include \;frames received with frame-too-long, FCS, \;length or alignment errors, or frames lost due \;to internal MAC sublayer error. \;  \;\;\;" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="a_broadcast_frames_received_ok_high" descr="A count of the frames that were successfully \;transmitted to the broadcast address. Frames \;transmitted to multicast addresses are not \;broadcast frames and are excluded. \;\;" access="RO" offset="0x48.0" size="0x4.0" />
 	<field name="a_broadcast_frames_received_ok_low" descr="A count of the frames that were successfully \;transmitted to the broadcast address. Frames \;transmitted to multicast addresses are not \;broadcast frames and are excluded. \;\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="a_in_range_length_errors_high" descr="A count of frames with a length/type field \;value between the minimum unpadded MAC \;client data size and the maximum allowed \;MAC client data size, inclusive, that does not \;match the number of MAC client data octets \;received. The counter also increments for \;frames whose length/type field value is less \;than the minimum allowed unpadded MAC cli\;ent data size and the number of MAC client \;data octets received is greater than the mini\;mum unpadded MAC client data size.\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="a_in_range_length_errors_low" descr="A count of frames with a length/type field \;value between the minimum unpadded MAC \;client data size and the maximum allowed \;MAC client data size, inclusive, that does not \;match the number of MAC client data octets \;received. The counter also increments for \;frames whose length/type field value is less \;than the minimum allowed unpadded MAC cli\;ent data size and the number of MAC client \;data octets received is greater than the mini\;mum unpadded MAC client data size.\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="a_in_range_length_errors_high" descr="A count of frames with a length/type field value \;between the minimum unpadded MAC client \;data size and the maximum allowed MAC cli\;ent data size, inclusive, that does not match \;the number of MAC client data octets received. \;The counter also increments for frames whose \;length/type field value is less than the mini\;mum allowed unpadded MAC client data size \;and the number of MAC client data octets \;received is greater than the minimum unpad\;ded MAC client data size.\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="a_in_range_length_errors_low" descr="A count of frames with a length/type field value \;between the minimum unpadded MAC client \;data size and the maximum allowed MAC cli\;ent data size, inclusive, that does not match \;the number of MAC client data octets received. \;The counter also increments for frames whose \;length/type field value is less than the mini\;mum allowed unpadded MAC client data size \;and the number of MAC client data octets \;received is greater than the minimum unpad\;ded MAC client data size.\;" access="RO" offset="0x54.0" size="0x4.0" />
 	<field name="a_out_of_range_length_field_high" descr="A count of frames with a length field value \;greater than the maximum allowed LLC data \;size. \;" access="RO" offset="0x58.0" size="0x4.0" />
 	<field name="a_out_of_range_length_field_low" descr="A count of frames with a length field value \;greater than the maximum allowed LLC data \;size. \;" access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="a_frame_too_long_errors_high" descr="A count of frames received that exceed the \;maximum permitted frame size by IEEE 802.3 \;(MTU size).\;" access="RO" offset="0x60.0" size="0x4.0" />
@@ -717,8 +755,8 @@
 	<field name="tx_stats_pkts128to255octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 128 and 255 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x64.0" size="0x4.0" />
 	<field name="tx_stats_pkts256to511octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 256 and 511 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x68.0" size="0x4.0" />
 	<field name="tx_stats_pkts256to511octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 256 and 511 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x6C.0" size="0x4.0" />
-	<field name="tx_stats_pkts512to1023octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x70.0" size="0x4.0" />
-	<field name="tx_stats_pkts512to1023octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x74.0" size="0x4.0" />
+	<field name="tx_stats_pkts512to1023octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x70.0" size="0x4.0" />
+	<field name="tx_stats_pkts512to1023octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x74.0" size="0x4.0" />
 	<field name="tx_stats_pkts1024to1518octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 1024 and 1518 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x78.0" size="0x4.0" />
 	<field name="tx_stats_pkts1024to1518octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 1024 and 1518 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x7C.0" size="0x4.0" />
 	<field name="tx_stats_pkts1519to2047octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 1519 and 2047 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x80.0" size="0x4.0" />
@@ -727,10 +765,12 @@
 	<field name="tx_stats_pkts2048to4095octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 2048 and 4095 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x8C.0" size="0x4.0" />
 	<field name="tx_stats_pkts4096to8191octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 4096 and 8191 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x90.0" size="0x4.0" />
 	<field name="tx_stats_pkts4096to8191octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 4096 and 8191 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x94.0" size="0x4.0" />
-	<field name="tx_stats_pkts8192to10239octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 \;octets in length (excluding framing bits but including \;FCS octets).transmitted\;" access="RO" offset="0x98.0" size="0x4.0" />
-	<field name="tx_stats_pkts8192to10239octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 \;octets in length (excluding framing bits but including \;FCS octets).transmitted\;" access="RO" offset="0x9C.0" size="0x4.0" />
+	<field name="tx_stats_pkts8192to10239octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 octets \;in length (excluding framing bits but including FCS \;octets).transmitted\;" access="RO" offset="0x98.0" size="0x4.0" />
+	<field name="tx_stats_pkts8192to10239octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 octets \;in length (excluding framing bits but including FCS \;octets).transmitted\;" access="RO" offset="0x9C.0" size="0x4.0" />
 	<field name="ece_marked_high" descr="A count of packets marked as ECE or potentially \;marked as ECE." access="RO" offset="0xA0.0" size="0x4.0" />
 	<field name="ece_marked_low" descr="A count of packets marked as ECE or potentially \;marked as ECE." access="RO" offset="0xA4.0" size="0x4.0" />
+	<field name="tx_int_cksm_err_high" descr="Counter is incremented upon packet payload internal \;checksum error" access="RO" offset="0xA8.0" size="0x4.0" />
+	<field name="tx_int_cksm_err_low" descr="Counter is incremented upon packet payload internal \;checksum error" access="RO" offset="0xAC.0" size="0x4.0" />
 </node>
 
 <node name="eth_oob_port_cntrs_ext" descr="" size="0xf8.0" >
@@ -742,16 +782,16 @@
 	<field name="if_in_discards_low" descr="The number of inbound packets which were chosen to be \;discarded even though no errors had been detected to pre\;vent their being deliverable to a higher-layer protocol.\;\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="if_in_errors_high" descr="The number of inbound packets that contained errors pre\;venting them from being deliverable to a higher-layer proto\;col. \;" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="if_in_errors_low" descr="The number of inbound packets that contained errors pre\;venting them from being deliverable to a higher-layer proto\;col. \;" access="RO" offset="0x1C.0" size="0x4.0" />
-	<field name="ether_stats_crc_align_errors_high" descr="e total number of packets received that had a length \;(excluding framing bits, but including FCS octets) of \;between 64 and MTU octets, inclusive, but had either a bad \;frame check sequence (FCS) with an integral number of \;octets (FCS error) or a bad FCS with a non-integral number \;of octets (alignment error).\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="ether_stats_crc_align_errors_low" descr="e total number of packets received that had a length \;(excluding framing bits, but including FCS octets) of \;between 64 and MTU octets, inclusive, but had either a bad \;frame check sequence (FCS) with an integral number of \;octets (FCS error) or a bad FCS with a non-integral number \;of octets (alignment error).\;" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="ether_stats_undersize_pkts_high" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS \;octets) and were otherwise well formed.\;" access="RO" offset="0x28.0" size="0x4.0" />
-	<field name="ether_stats_undersize_pkts_low" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS \;octets) and were otherwise well formed.\;" access="RO" offset="0x2C.0" size="0x4.0" />
+	<field name="ether_stats_crc_align_errors_high" descr="e total number of packets received that had a length (exclud\;ing framing bits, but including FCS octets) of between 64 and \;MTU octets, inclusive, but had either a bad frame check \;sequence (FCS) with an integral number of octets (FCS \;error) or a bad FCS with a non-integral number of octets \;(alignment error).\;" access="RO" offset="0x20.0" size="0x4.0" />
+	<field name="ether_stats_crc_align_errors_low" descr="e total number of packets received that had a length (exclud\;ing framing bits, but including FCS octets) of between 64 and \;MTU octets, inclusive, but had either a bad frame check \;sequence (FCS) with an integral number of octets (FCS \;error) or a bad FCS with a non-integral number of octets \;(alignment error).\;" access="RO" offset="0x24.0" size="0x4.0" />
+	<field name="ether_stats_undersize_pkts_high" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS octets) \;and were otherwise well formed.\;" access="RO" offset="0x28.0" size="0x4.0" />
+	<field name="ether_stats_undersize_pkts_low" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS octets) \;and were otherwise well formed.\;" access="RO" offset="0x2C.0" size="0x4.0" />
 	<field name="ether_stats_oversize_pkts_high" descr="The total number of packets received that were longer than \;MTU octets (excluding framing bits, but including FCS \;octets) but were otherwise well formed.\;" access="RO" offset="0x30.0" size="0x4.0" />
 	<field name="ether_stats_oversize_pkts_low" descr="The total number of packets received that were longer than \;MTU octets (excluding framing bits, but including FCS \;octets) but were otherwise well formed.\;" access="RO" offset="0x34.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_high" descr="he number of times the receiving media is non-idle (a car\;rier event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one \;occurrence of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;" access="RO" offset="0x38.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_low" descr="he number of times the receiving media is non-idle (a car\;rier event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one \;occurrence of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;" access="RO" offset="0x3C.0" size="0x4.0" />
-	<field name="dot3in_pause_frames_high" descr="A count of MAC Control frames received with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x40.0" size="0x4.0" />
-	<field name="dot3in_pause_frames_low" descr="A count of MAC Control frames received with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x44.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_high" descr="he number of times the receiving media is non-idle (a carrier \;event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one occur\;rence of an event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;" access="RO" offset="0x38.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_low" descr="he number of times the receiving media is non-idle (a carrier \;event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one occur\;rence of an event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;" access="RO" offset="0x3C.0" size="0x4.0" />
+	<field name="dot3in_pause_frames_high" descr="A count of MAC Control frames received with an opcode indi\;cating the PAUSE operation.\;" access="RO" offset="0x40.0" size="0x4.0" />
+	<field name="dot3in_pause_frames_low" descr="A count of MAC Control frames received with an opcode indi\;cating the PAUSE operation.\;" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_high" descr="A count of MAC Control frames received that contain an \;opcode that is not supported.\;" access="RO" offset="0x48.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_low" descr="A count of MAC Control frames received that contain an \;opcode that is not supported.\;" access="RO" offset="0x4C.0" size="0x4.0" />
 	<field name="if_out_ucast_pkts_high" descr="The total number of packets that higher-level protocols \;requested be transmitted and were not addressed to a mul\;ticast or broadcast MAC address, including those that were \;discarded or not sent.\;\;" access="RO" offset="0x50.0" size="0x4.0" />
@@ -760,8 +800,8 @@
 	<field name="if_out_octets_low" descr="The total number of octets transmitted out of the interface, \;including framing characters.\;" access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="dot3out_pause_frames_high" descr="A count of MAC Control frames transmitted with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x60.0" size="0x4.0" />
 	<field name="dot3out_pause_frames_low" descr="A count of MAC Control frames transmitted with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x64.0" size="0x4.0" />
-	<field name="if_out_errors_high" descr="The number of outbound packets that could not be trans\;mitted because of errors.\;" access="RO" offset="0x68.0" size="0x4.0" />
-	<field name="if_out_errors_low" descr="The number of outbound packets that could not be trans\;mitted because of errors.\;" access="RO" offset="0x6C.0" size="0x4.0" />
+	<field name="if_out_errors_high" descr="The number of outbound packets that could not be transmit\;ted because of errors.\;" access="RO" offset="0x68.0" size="0x4.0" />
+	<field name="if_out_errors_low" descr="The number of outbound packets that could not be transmit\;ted because of errors.\;" access="RO" offset="0x6C.0" size="0x4.0" />
 	<field name="phy_time_since_last_clear_high" descr="The time passed since the last phy counters clear event in \;msec." access="RO" offset="0x70.0" size="0x4.0" />
 	<field name="phy_time_since_last_clear_low" descr="The time passed since the last phy counters clear event in \;msec." access="RO" offset="0x74.0" size="0x4.0" />
 	<field name="phy_received_bits_high" descr="This counter provides information on the total amount of \;traffic (bits) received." access="RO" offset="0x78.0" size="0x4.0" />
@@ -773,8 +813,8 @@
 <node name="eth_per_prio_grp_data_layout_ext" descr="" size="0xf8.0" >
 	<field name="rx_octets_high" descr="The total number of octets received, including framing char\;acters.\;" access="RO" offset="0x0.0" size="0x4.0" />
 	<field name="rx_octets_low" descr="The total number of octets received, including framing char\;acters.\;" access="RO" offset="0x4.0" size="0x4.0" />
-	<field name="rx_frames_high" descr="The total number of packets received for this priority \;(including control frames).\;\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="rx_frames_low" descr="The total number of packets received for this priority \;(including control frames).\;\;" access="RO" offset="0x24.0" size="0x4.0" />
+	<field name="rx_frames_high" descr="The total number of packets received for this priority (includ\;ing control frames).\;\;" access="RO" offset="0x20.0" size="0x4.0" />
+	<field name="rx_frames_low" descr="The total number of packets received for this priority (includ\;ing control frames).\;\;" access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="tx_octets_high" descr="The total number of octets transmitted, including framing \;characters.\;\;\;" access="RO" offset="0x28.0" size="0x4.0" />
 	<field name="tx_octets_low" descr="The total number of octets transmitted, including framing \;characters.\;\;\;" access="RO" offset="0x2C.0" size="0x4.0" />
 	<field name="tx_frames_high" descr="The total number of packets transmitted.\;\;\;" access="RO" offset="0x48.0" size="0x4.0" />
@@ -833,10 +873,10 @@
 </node>
 
 <node name="fore_ext" descr="" size="0xc.0" >
-	<field name="fan_under_limit" descr="Fan speed is below the low limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is below the threshold." access="RO" offset="0x0.16" size="0x0.10" />
-	<field name="fan_under_limit_msb" descr="6 MSB indexes of the tachometers. \;Fan speed is below the low limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is below the threshold." access="RO" offset="0x0.26" size="0x0.6" />
-	<field name="fan_over_limit" descr="Fan speed is above the high limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is above the threshold." access="RO" offset="0x4.16" size="0x0.10" />
-	<field name="fan_over_limit_msb" descr="6 MSB indexes of the tachometers. \;Fan speed is above the high limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is above the threshold." access="RO" offset="0x4.26" size="0x0.6" />
+	<field name="fan_under_limit" descr="Fan speed is below the low limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is below the threshold.\;Bitmask, per bit:\;0: not_under_thr\;1: under_thr" access="RO" offset="0x0.16" size="0x0.10" />
+	<field name="fan_under_limit_msb" descr="Fan speed is below the low limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is below the threshold.\;Bitmask, per bit:\;0: not_under_thr\;1: under_thr" access="RO" offset="0x0.26" size="0x0.6" />
+	<field name="fan_over_limit" descr="Fan speed is above the high limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is above the threshold.\;Bitmask, per bit:\;0: not_over_limit\;1: over_limit" access="RO" offset="0x4.16" size="0x0.10" />
+	<field name="fan_over_limit_msb" descr="Fan speed is above the high limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is above the threshold.\;Bitmask, per bit:\;0: not_over_limit\;1: over_limit" access="RO" offset="0x4.26" size="0x0.6" />
 </node>
 
 <node name="fp_sl_map_arg_ext" descr="" size="0x4.0" >
@@ -861,7 +901,7 @@
 	<field name="modify_field_select" descr="Field select indicates in QUERY which fields are mod\;ifiable (1 means modifiable), and in MODIFY which \;fields to modify." subnode="uint64" offset="0x0.0" size="0x8.0" />
 	<field name="key_size" descr="Key size\;0x0: SIZE_128\;0x1: SIZE_256" enum="SIZE_128=0x0,SIZE_256=0x1" offset="0x8.8" size="0x0.4" />
 	<field name="state" descr="Key state, Valid for Query command only.\;0x0: READY - the key state when first created\;0x1: ERROR - key unusable, need to destroy and re-\;create this key" enum="READY=0x0,ERROR=0x1" offset="0x8.24" size="0x0.8" />
-	<field name="key" descr="Actual size and layout of this field described in \;Table 349, &quot;IMPORT_KEK Field Construction \;Summary,&quot; on page 572 below. Note that the layout \;explained in following table should be used from the \;MSBs and on." high_bound="31" low_bound="0" offset="0x40.0" size="0x80.0" />
+	<field name="key" descr="Actual size and layout of this field described in \;Table 353, &quot;IMPORT_KEK Field Construction \;Summary,&quot; on page 589 below. Note that the layout \;explained in following table should be used from the \;MSBs and on." high_bound="31" low_bound="0" offset="0x40.0" size="0x80.0" />
 </node>
 
 <node name="lane_2_module_mapping_ext" descr="" size="0x4.0" >
@@ -878,8 +918,8 @@
 	<field name="llr_rx_error_low" descr="The total number of bad cells received (including CRC \;error).\;" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="llr_rx_crc_error_high" descr="The total number of cells received with CRC error.\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="llr_rx_crc_error_low" descr="The total number of cells received with CRC error.\;" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="llr_tx_cells_high" descr="The total number of cells transmitted (including retrans\;mitted cells)." access="RO" offset="0x18.0" size="0x4.0" />
-	<field name="llr_tx_cells_low" descr="The total number of cells transmitted (including retrans\;mitted cells)." access="RO" offset="0x1C.0" size="0x4.0" />
+	<field name="llr_tx_cells_high" descr="The total number of cells transmitted (including retransmit\;ted cells)." access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="llr_tx_cells_low" descr="The total number of cells transmitted (including retransmit\;ted cells)." access="RO" offset="0x1C.0" size="0x4.0" />
 	<field name="llr_tx_ret_cells_high" descr="The total number of cells retransmitted." access="RO" offset="0x20.0" size="0x4.0" />
 	<field name="llr_tx_ret_cells_low" descr="The total number of cells retransmitted." access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="llr_tx_ret_events_high" descr="The total number of retransmission events." access="RO" offset="0x28.0" size="0x4.0" />
@@ -902,18 +942,18 @@
 	<field name="access_reg_group" descr="Access Register ID groups \;0: First_128_REG_ID - Register IDs 0x9001 - 0x907F)\;1: Register_IDs_0x9080 - 0x90FF (bit 0 in mng_access_reg_cap_mask \;represent register ID 0x9080 while bit 127 represents register ID \;0x90FF).\;2: Register_IDs_0x9100 - 0x917F (bit 0 in mng_access_reg_cap_mask \;represent register ID 0x9100 while bit 127 represents register ID \;0x917F)." access="INDEX" enum="First_128_REG_ID=0x0,Register_IDs_0x9080=0x1,Register_IDs_0x9100=0x2" offset="0x0.0" size="0x0.8" />
 	<field name="feature_group" descr="Feature list mask index: \;0: enhanced_features" access="INDEX" enum="enhanced_features=0x0" offset="0x0.16" size="0x0.8" />
 	<field name="mng_access_reg_cap_mask" descr="Supported management&apos;s access register bitmaks.Based on \;access_reg_group index. \;When bit is set, the register is supported in the device. \;For example:\;Bit 1: MFCR_0x9001\;Bit 2: MFSC_0x9002\;Bit 3: MFSM_0x9003\;Bit 4: MFSL_0x9004\;Bit 58: MGCR_0x903A\;Bit 73: MPPF_0x9049\;Bit 127: MCAP_0x907F" access="RO" enum="MFCR_0x9001=0x2,MFSC_0x9002=0x4,MFSM_0x9003=0x8,MFSL_0x9004=0x10,MGCR_0x903A=0x4000000,MPPF_0x9049=0x200,MCAP_0x907F=0x80000000" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
-	<field name="mng_feature_cap_mask" descr="Supported port&apos;s enhanced features.Based on feature_group index.\;When bit is set, The feature is supported in the device: \;Bit 0: MPCNT counter group- PCIE performance counters supported\;Bit 1: mtpps_fs - If set, field_select field in MTPPS register is supported.\;Bit 2: mtpps_enhanced_out_periodic_adjustment - If set, enhanced_out_periodic_ad\;justment field in MTPPS register is supported.\;Bit 3: tx_lossy_overflow_oper - If set, tx_overflow_buffer_pkt counter in MPCNT regis\;ter is supported.\;Bit 4: pcie_outbound_stalled - if set, outbound_stalled_reads, out\;bound_stalled_writes, outbound_stalled_reads_events and out\;bound_stalled_writes_events counters in MPCNT are supported.\;Bit 5: Management pass through is supported\;Bit 6: sensor_map - If set, sensor_map is supported in MTCAP register.\;Bit 7 - if set, module_status bit 8 (Module Low Power) in MCION register is supported. \;Bit 8 - beacon_capability_disable - If set, beacon feature, as appears in MLCR register, \;in not supported by the device. \;Bit 9 - dynamic_tx_overflow - If set, tx_overflow_sense field is supported in MPEGC reg\;ister. \;Bit 10 - mark_tx_action_cqe is supported if set to &apos;1&apos;.\;Bit 11 - mark_tx_action_cnp is supported if set to &apos;1&apos;.\;Bit 12 - dev_info is supported in  register is set to &apos;1&apos;.\;Bit 13 - sensor_count field is 12bit size in MTMP and MTBR\;Bit 14 - cs_tokens_supported is supported \;Bit 15 - debug_fw_tokens_supported is \;Bit 16 - long_keys is supported \;Bit 17 - pwr_status and pci_power are supported in MPEIN\;Bit 18 - If set, accessing through device_type and device_index is supported in MCC, \;MCQI and MCQS\;Bit 19 - pcie_sync_for_fw_update_supported is set to &apos;1&apos;\;Bit 20 - ptpCyc2Realtime_modify - If set, the cycle to realtime translation offload is sup\;ported\;Bit 21 - If set to &apos;1&apos;, reset_state in MFRL is supported\;Bit 22 - If set to &apos;1&apos;, link_peer_max_speed is supported in MPEIN Register\;Bit 23 - If set to &apos;1&apos;, slot_index field is supported in: MCIA, MCAS, MCION, MQSP, \;MTCAP, MTECR, MTMP, MTEWE, MTBR, MVCAP, MVCR, MGPIR, MDDT, MDCR.\;Bit 24 - If set, transceiver burn flow is supported in MCC, MCQI and MCQS.\;\;Bit 26: If set, progress field is supported in MCQS\;\;Bit 28: If set, number_of_slots field is supported in MGPIR.\;Bit 29: If set, virtual hot plug / unplug is supported in MPEGC.\;Bit 30: If set, my_pf_number is supported in MPPF.\;Bit 31: If set, sdee is supported in MTMP\;Bit 32: If set, npps_period is supported in MTPPS.\;Bit 33: If set, out_pulse_duration_ns is supported in MTPPS.\;Bit 34: If set, MCIA supports 32 D-words. Otherwise, 12 D-words.\;Bit 35: If set, MGIR.hw_info.technology is supported. \;\;Bit 37: If set, lp_msb is supported for MLCR, MPIR \;\;Bit 39: If set, MRCS and RMDT tokens are supported in MCQS\;Bit 40: If set, &apos;encryption&apos; field in MGIR is supported\;\;Bit 42: If set, operation 5, ts_correction_admin_status and ts_correction_oper_status \;are supported in MTUTC.\;Bit 43: If set, MFCR supports tacho_active_msb field\;Bit 44: If set, FORE supports fan_under_limit_msb and fan_over_limit_msb fields\;" access="RO" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
+	<field name="mng_feature_cap_mask" descr="Supported port&apos;s enhanced features.Based on feature_group index.\;When bit is set, The feature is supported in the device: \;Bit 0: MPCNT counter group- PCIE performance counters supported\;Bit 1: mtpps_fs - If set, field_select field in MTPPS register is supported.\;Bit 2: mtpps_enhanced_out_periodic_adjustment - If set, enhanced_out_periodic_ad\;justment field in MTPPS register is supported.\;Bit 3: tx_lossy_overflow_oper - If set, tx_overflow_buffer_pkt counter in MPCNT regis\;ter is supported.\;Bit 4: pcie_outbound_stalled - if set, outbound_stalled_reads, out\;bound_stalled_writes, outbound_stalled_reads_events and out\;bound_stalled_writes_events counters in MPCNT are supported.\;Bit 5: Management pass through is supported\;Bit 6: sensor_map - If set, sensor_map is supported in MTCAP register.\;Bit 7 - if set, module_status bit 8 (Module Low Power) in MCION register is supported. \;Bit 8 - beacon_capability_disable - If set, beacon feature, as appears in MLCR register, \;in not supported by the device. \;Bit 9 - dynamic_tx_overflow - If set, tx_overflow_sense field is supported in MPEGC reg\;ister. \;Bit 10 - mark_tx_action_cqe is supported if set to &apos;1&apos;.\;Bit 11 - mark_tx_action_cnp is supported if set to &apos;1&apos;.\;Bit 12 - dev_info is supported in  register is set to &apos;1&apos;.\;Bit 13 - sensor_count field is 12bit size in MTMP and MTBR\;Bit 14 - cs_tokens_supported is supported \;Bit 15 - debug_fw_tokens_supported is \;Bit 16 - long_keys is supported \;Bit 17 - pwr_status and pci_power are supported in MPEIN\;Bit 18 - If set, accessing through device_type and device_index is supported in MCC, \;MCQI and MCQS\;Bit 19 - pcie_sync_for_fw_update_supported is set to &apos;1&apos;\;Bit 20 - ptpCyc2Realtime_modify - If set, the cycle to realtime translation offload is sup\;ported\;Bit 21 - If set to &apos;1&apos;, reset_state in MFRL is supported\;Bit 22 - If set to &apos;1&apos;, link_peer_max_speed is supported in MPEIN Register\;Bit 23 - If set to &apos;1&apos;, slot_index field is supported in: MCIA, MCAS, MCION, MQSP, \;MTCAP, MTECR, MTMP, MTEWE, MTBR, MVCAP, MVCR, MGPIR, MDDT, MDCR.\;Bit 24 - If set, transceiver burn flow is supported in MCC, MCQI and MCQS.\;\;Bit 26: If set, progress field is supported in MCQS\;\;Bit 28: If set, number_of_slots field is supported in MGPIR.\;Bit 29: If set, virtual hot plug / unplug is supported in MPEGC.\;Bit 30: If set, my_pf_number is supported in MPPF.\;Bit 31: If set, sdee is supported in MTMP\;Bit 32: If set, npps_period is supported in MTPPS.\;Bit 33: If set, out_pulse_duration_ns is supported in MTPPS.\;Bit 34: If set, MCIA supports 32 D-words. Otherwise, 12 D-words.\;Bit 35: If set, MGIR.hw_info.technology is supported. \;\;Bit 37: If set, lp_msb is supported for MLCR, MPIR \;\;Bit 39: If set, MRCS and RMDT tokens are supported in MCQS\;Bit 40: If set, &apos;encryption&apos; field in MGIR is supported\;\;Bit 42: If set, operation 5, ts_correction_admin_status and ts_correction_oper_status \;are supported in MTUTC.\;Bit 43: If set, MFCR supports tacho_active_msb field\;Bit 44: If set, FORE supports fan_under_limit_msb and fan_over_limit_msb fields\;Bit 45: If set, MFRL.pci_rescan_required is supported" access="RO" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
 </node>
 
 <node name="mcc_reg_ext" descr="" size="0x20.0" >
 	<field name="instruction" descr="Command to be executed by the FSM\;0x1: LOCK_UPDATE_HANDLE\;0x2: RELEASE_UPDATE_HANDLE \;0x3: UPDATE_COMPONENT\;0x4: VERIFY_COMPONENT\;0x5: ACTIVATE_COMPONENET \;0x6: ACTIVATE\;0x7: READ_COMPONENT\;0x8: CANCEL\;0x9: CHECK_UPDATE_HANDLE\;0xA: FORCE_HANDLE_RELEASE\;0xB: READ_PENDING_COMPONENT\;0xC: DOWNSRTEAM_DEVICE_TRANSFER\;Other values are reserved. Applicable for write opera\;tion only." access="RW" enum="LOCK_UPDATE_HANDLE=0x1,RELEASE_UPDATE_HANDLE=0x2,UPDATE_COMPONENT=0x3,VERIFY_COMPONENT=0x4,ACTIVATE_COMPONENET=0x5,ACTIVATE=0x6,READ_COMPONENT=0x7,CANCEL=0x8,CHECK_UPDATE_HANDLE=0x9,FORCE_HANDLE_RELEASE=0xa,READ_PENDING_COMPONENT=0xb,DOWNSRTEAM_DEVICE_TRANSFER=0xc" offset="0x0.0" size="0x0.8" />
 	<field name="activation_delay_sec" descr="This is a configuration that delays the activation of the \;component in seconds. Relevant only for activate com\;mand.\;This configuration is volatile." access="RW" offset="0x0.8" size="0x0.8" />
 	<field name="time_elapsed_since_last_cmd" descr="The number of seconds elapsed since the update_han\;dle owner last issued a command. The time saturates \;at 0xFFF." access="RO" offset="0x0.16" size="0x0.12" />
-	<field name="component_index" descr="Index of the accessed component. Valid for \;UPDATE_COMPONENT, ACTIVATE_COMPONENET, \;READ_COMPONENT and READ_PENDING_COMPO\;NENT instructions. Otherwise, this field is reserved." access="INDEX" offset="0x4.0" size="0x0.16" />
-	<field name="update_handle" descr="Token representing the current flow executed by the \;FSM.\;See Section 10.2.1, &quot;Component Update State&quot;, on \;page 826." access="RW" offset="0x8.0" size="0x0.24" />
+	<field name="component_index" descr="Index of the accessed component. \;Value from MCQS.component_index\;Valid for \;UPDATE_COMPONENT, ACTIVATE_COMPONENET, \;READ_COMPONENT and READ_PENDING_COMPO\;NENT instructions. Otherwise, this field is reserved." access="INDEX" offset="0x4.0" size="0x0.16" />
+	<field name="update_handle" descr="Token representing the current flow executed by the \;FSM.\;See Section 10.2.1, &quot;Component Update State&quot;, on \;page 850." access="RW" offset="0x8.0" size="0x0.24" />
 	<field name="auto_update" descr="Auto-update to all matching downstream devices is \;requested." access="WO" offset="0x8.31" size="0x0.1" />
-	<field name="control_state" descr="Current Update FSM state, See Section 10.3.8, &quot;FSM \;States&quot;, on page 830\;0x0: IDLE\;0x1: LOCKED\;0x2: INITIALIZE\;0x3: DOWNLOAD\;0x4: VERIFY\;0x5: APPLY\;0x6: ACTIVATE\;0x7: UPLOAD\;0x8: UPLOAD_PENDING\;0x9: DOWNSRTEAM_DEVICE_TRANSFER\;Other values are reserved" access="RO" enum="IDLE=0x0,LOCKED=0x1,INITIALIZE=0x2,DOWNLOAD=0x3,VERIFY=0x4,APPLY=0x5,ACTIVATE=0x6,UPLOAD=0x7,UPLOAD_PENDING=0x8,DOWNSRTEAM_DEVICE_TRANSFER=0x9" offset="0xC.0" size="0x0.4" />
-	<field name="error_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. See Section 10.3.7, &quot;Error \;Handling&quot;, on page 829\;0x0: OK\;0x1: ERROR\;0x2: REJECTED_DIGEST_ERR\;0x3: REJECTED_NOT_APPLICABLE\;0x4: REJECTED_UNKNOWN_KEY\;0x5: REJECTED_AUTH_FAILED\;0x6: REJECTED_UNSIGNED\;0x7: REJECTED_KEY_NOT_APPLICABLE\;0x8: REJECTED_BAD_FORMAT\;0x9: BLOCKED_PENDING_RESET\;0xA: REJECTED_NOT_A_SECURED_FW\;0xB: REJECTED_MFG_BASE_MAC_NOT_LISTED\;0xC: REJECTED_NO_DEBUG_TOKEN\;0xD: REJECTED_VERSION_NUM_MISMATCH\;0xE: REJECTED_USER_TIMESTAMP_MISMATCH\;0xF: REJECTED_FORBIDDEN_VERSION\;0x10: FLASH_ERASE_ERROR\;0x11: REJECTED_REBURN_RUNNING_AND_RETRY\;0x12: REJECTED_LINKX_TYPE_NOT_SUPPORTED\;0x13: REJECTED_HOST_STORAGE_IN_USE\;0x14: REJECTED_LINKX_TRANSFER (see module \;index in rejected_device_index)\;0x15: REJECTED_LINKX_ACTIVATE (see module index \;in rejected_device_index)\;0x16: REJECTED_TOKEN_ALREADY_APPLIED\;Other values should be treated as an unknown error." access="RO" offset="0xC.8" size="0x0.8" />
+	<field name="control_state" descr="Current Update FSM state, See Section 10.3.8, &quot;FSM \;States&quot;, on page 854\;0x0: IDLE\;0x1: LOCKED\;0x2: INITIALIZE\;0x3: DOWNLOAD\;0x4: VERIFY\;0x5: APPLY\;0x6: ACTIVATE\;0x7: UPLOAD\;0x8: UPLOAD_PENDING\;0x9: DOWNSRTEAM_DEVICE_TRANSFER\;Other values are reserved" access="RO" enum="IDLE=0x0,LOCKED=0x1,INITIALIZE=0x2,DOWNLOAD=0x3,VERIFY=0x4,APPLY=0x5,ACTIVATE=0x6,UPLOAD=0x7,UPLOAD_PENDING=0x8,DOWNSRTEAM_DEVICE_TRANSFER=0x9" offset="0xC.0" size="0x0.4" />
+	<field name="error_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. See Section 10.3.7, &quot;Error \;Handling&quot;, on page 853\;0x0: OK\;0x1: ERROR\;0x2: REJECTED_DIGEST_ERR\;0x3: REJECTED_NOT_APPLICABLE\;0x4: REJECTED_UNKNOWN_KEY\;0x5: REJECTED_AUTH_FAILED\;0x6: REJECTED_UNSIGNED\;0x7: REJECTED_KEY_NOT_APPLICABLE\;0x8: REJECTED_BAD_FORMAT\;0x9: BLOCKED_PENDING_RESET\;0xA: REJECTED_NOT_A_SECURED_FW\;0xB: REJECTED_MFG_BASE_MAC_NOT_LISTED\;0xC: REJECTED_NO_DEBUG_TOKEN\;0xD: REJECTED_VERSION_NUM_MISMATCH\;0xE: REJECTED_USER_TIMESTAMP_MISMATCH\;0xF: REJECTED_FORBIDDEN_VERSION\;0x10: FLASH_ERASE_ERROR\;0x11: REJECTED_REBURN_RUNNING_AND_RETRY\;0x12: REJECTED_LINKX_TYPE_NOT_SUPPORTED\;0x13: REJECTED_HOST_STORAGE_IN_USE\;0x14: REJECTED_LINKX_TRANSFER (see module \;index in rejected_device_index)\;0x15: REJECTED_LINKX_ACTIVATE (see module index \;in rejected_device_index)\;0x16: REJECTED_INCOMPATIBLE_FLASH\;0x17: REJECTED_TOKEN_ALREADY_APPLIED\;Other values should be treated as an unknown error." access="RO" offset="0xC.8" size="0x0.8" />
 	<field name="control_progress" descr="Indicates the estimated progress status of the current \;operation executed by the FSM. Valid values are 0..100.\;101 indicates that progress reporting is not supported \;for this update state." access="RO" offset="0xC.16" size="0x0.7" />
 	<field name="handle_owner_host_id" descr="For handle_owner_type BMC, command-interface and \;ICMD, indicates the identifier of the host of the handle \;owner.\;Otherwise reserved" access="RO" offset="0xC.24" size="0x0.4" />
 	<field name="handle_owner_type" descr="Type of entity holding the update handle:\;0x0: unspecified\;0x1: Chassis BMC\;0x2: MAD\;0x3: BMC\;0x4: command interface\;0x5: ICMD \;Other values are reserved." access="RO" offset="0xC.28" size="0x0.4" />
@@ -926,7 +966,7 @@
 
 <node name="mcda_reg_ext" descr="" size="0x90.0" >
 	<field name="update_handle" descr="Update handle registered when the FSM was activated." access="RW" offset="0x0.0" size="0x0.24" />
-	<field name="offset" descr="Offset of accessed address relative to component start. \;Accesses must be in accordance to log_mcda_word_\;size in Table 1869, &quot;MCQI CAPABILITIES Info Lay\;out,&quot; on page 2333" access="RW" offset="0x4.0" size="0x4.0" />
+	<field name="offset" descr="Offset of accessed address relative to component start. \;Accesses must be in accordance to log_mcda_word_\;size in Table 1863, &quot;MCQI CAPABILITIES Info Lay\;out,&quot; on page 2182" access="RW" offset="0x4.0" size="0x4.0" />
 	<field name="size" descr="Size of the data accessed, given in bytes" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="data" descr="Data block accessed" access="RW" high_bound="31" low_bound="0" offset="0x10.0" size="0x80.0" />
 </node>
@@ -941,7 +981,7 @@
 	<field name="mailbox_page_phys_addr_lsb" descr="Physical address of the mailbox page." access="RW" offset="0x1C.0" size="0x4.0" />
 </node>
 
-<node name="mcia_ext" descr="" size="0x90.0" >
+<node name="mcia_ext" descr="" size="0x94.0" >
 	<field name="status" descr="Module Status\;0h - GOOD\;1h - NO_EEPROM_MODULE. No response from module&apos;s \;EPROM.\;2h - MODULE_NOT_SUPPORTED. Module type not sup\;ported by the device. \;3h - MODULE_NOT_CONNECTED. No module present indi\;cation. \;9h - I2C_ERROR. Error occurred while trying to access the \;module&apos;s EPROM using I2C.\;10h - MODULE_DISABLED - module is disabled \;[Internal] 11h - Page Access Failed - page not supported or \;trying to access a protected page with bad password." access="RO" offset="0x0.0" size="0x0.8" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.12" size="0x0.4" />
 	<field name="module" descr="Module number" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -951,7 +991,9 @@
 	<field name="i2c_device_address" descr="I2C device address" access="INDEX" offset="0x4.24" size="0x0.8" />
 	<field name="size" descr="Number of bytes to read/write (up to 128 bytes)" access="INDEX" offset="0x8.0" size="0x0.16" />
 	<field name="bank_number" descr="Bank number" access="INDEX" offset="0x8.16" size="0x0.8" />
+	<field name="password" descr="The password that is written to the module password field.\;This field is reserved if passwd_cap is not set to 1." access="OP" offset="0xC.0" size="0x4.0" />
 	<field name="dword" descr="Bytes to read/write" access="RW" high_bound="31" low_bound="0" offset="0x10.0" size="0x80.0" />
+	<field name="password_msb" descr="password msb" access="RW" offset="0x90.0" size="0x4.0" />
 </node>
 
 <node name="mcion_ext" descr="" size="0xc.0" >
@@ -991,7 +1033,7 @@
 	<field name="check_user_timestamp" descr="A user defined timestamp (MVTS) is active for this \;component." access="RW" offset="0x10.27" size="0x0.1" />
 	<field name="match_psid" descr="PSID is validated for this component update." access="RW" offset="0x10.28" size="0x0.1" />
 	<field name="match_chip_id" descr="Chip ID (device_hw_revision) is validated for this com\;ponent update." access="RW" offset="0x10.29" size="0x0.1" />
-	<field name="rd_en" descr="When set, this components may be read, see \;Section 10.3.4, &quot;Read Flow&quot;, on page 829." access="RO" offset="0x10.31" size="0x0.1" />
+	<field name="rd_en" descr="When set, this components may be read, see \;Section 10.3.4, &quot;Read Flow&quot;, on page 853." access="RO" offset="0x10.31" size="0x0.1" />
 </node>
 
 <node name="mcqi_linkx_properties_ext" descr="" size="0x7c.0" >
@@ -1027,7 +1069,7 @@
 	<field name="info_size" descr="Properties set structure size, given in bytes." access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="offset" descr="The requested/returned data offset from the section \;start, given in bytes.\;Must be DWORD aligned." access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="data_size" descr="The requested/returned data size, given in bytes.\;If data_size is not DWORD aligned, the last bytes are \;zero padded." access="RW" offset="0x14.0" size="0x0.16" />
-	<field name="data" descr="Properties set structure according to info_type.\;CAPABILITIES - See Table 1869, &quot;MCQI CAPABILI\;TIES Info Layout,&quot; on page 2333\;VERSION - See Table 1871, &quot;MCQI VERSION Info \;Layout,&quot; on page 2335\;ACTIVATION_METHOD - See Table 1875, &quot;MCQI \;ACTIVATION_METHOD Info Layout,&quot; on page 2337\;LINKX_PREPERTIES - See Table 1877, &quot;MCQI \;LINKX_PROPERTIES Info Layout,&quot; on page 2338" subnode="mcqi_reg_data_auto_ext" access="RO" offset="0x18.0" size="0x7c.0" union_selector="$(parent).info_type" />
+	<field name="data" descr="Properties set structure according to info_type.\;CAPABILITIES - See Table 1863, &quot;MCQI CAPABILI\;TIES Info Layout,&quot; on page 2182\;VERSION - See Table 1865, &quot;MCQI VERSION Info \;Layout,&quot; on page 2184\;ACTIVATION_METHOD - See Table 1869, &quot;MCQI \;ACTIVATION_METHOD Info Layout,&quot; on page 2186\;LINKX_PREPERTIES - See Table 1871, &quot;MCQI \;LINKX_PROPERTIES Info Layout,&quot; on page 2187" subnode="mcqi_reg_data_auto_ext" access="RO" offset="0x18.0" size="0x7c.0" union_selector="$(parent).info_type" />
 </node>
 
 <node name="mcqi_version_ext" descr="" size="0x7c.0" >
@@ -1035,8 +1077,8 @@
 	<field name="user_defined_time_valid" descr="When set, the component has a valid user-defined ver\;sion time-stamp in user_defined_time" access="RW" offset="0x0.28" size="0x0.1" />
 	<field name="build_time_valid" descr="When set, the component has a valid creation time-\;stamp in build_time" access="RW" offset="0x0.29" size="0x0.1" />
 	<field name="version" descr="Version number" access="RW" offset="0x4.0" size="0x4.0" />
-	<field name="build_time" descr="Time of component creation. Valid only if build_\;time_valid is set. See Table 1873, &quot;Date-Time Lay\;out,&quot; on page 2336" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
-	<field name="user_defined_time" descr="User-defined time assigned to the component version. \;Valid only if user_defined_time_valid is set. See \;Table 1873, &quot;Date-Time Layout,&quot; on page 2336" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
+	<field name="build_time" descr="Time of component creation. Valid only if build_\;time_valid is set. See Table 1867, &quot;Date-Time Lay\;out,&quot; on page 2185" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
+	<field name="user_defined_time" descr="User-defined time assigned to the component version. \;Valid only if user_defined_time_valid is set. See \;Table 1867, &quot;Date-Time Layout,&quot; on page 2185" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
 	<field name="build_tool_version" descr="Build tool version number.\;Valid only when not equal to 0" access="RW" offset="0x18.0" size="0x4.0" />
 	<field name="version_string" descr="NULL terminated string representing the version." access="RW" high_bound="91" low_bound="0" offset="0x20.24" size="0x5c.0" />
 </node>
@@ -1046,7 +1088,7 @@
 	<field name="device_index" descr="Device number.\;For gearboxes, the index represents the gearbox die. \;For cables, the index represents the module index \;starting at index 1. Index 0 indicates the host device." access="INDEX" offset="0x0.16" size="0x0.12" />
 	<field name="last_index_flag" descr="When set, this component is the last component (high\;est component_index)." access="RO" offset="0x0.31" size="0x0.1" />
 	<field name="identifier" descr="This field uniquely identifies a specific component type. \;0x1: BOOT_IMG\;0x4: OEM_NVCONFIG\;0x5: MLNX_NVCONFIG\;0x6: CS_TOKEN\;0x7: DBG_TOKEN\;0xA: Gearbox\;0xB: CC_ALGO - Congestion Control Algorithm\;0xC: LINKX_IMG\;0xD: CRYPTO_TO_COMMISSIONING\;0xE: RMCS_TOKEN\;0xF: RMDT_TOKEN\;Other values are reserved" access="RO" enum="BOOT_IMG=0x1,OEM_NVCONFIG=0x4,MLNX_NVCONFIG=0x5,CS_TOKEN=0x6,DBG_TOKEN=0x7,Gearbox=0xa,CC_ALGO=0xb,LINKX_IMG=0xc,CRYPTO_TO_COMMISSIONING=0xd,RMCS_TOKEN=0xe,RMDT_TOKEN=0xf" offset="0x4.0" size="0x0.16" />
-	<field name="component_update_state" descr="Component state in update flow, see Section 10.2.1, \;&quot;Component Update State&quot;, on page 826:\;0x0: IDLE\;0x1: IN_PROGRESS\;0x2: APPLIED\;0x3: ACTIVE \;0x4: ACTIVE_PENDING_RESET\;0x5: FAILED\;0x6: CANCELED\;0x7: BUSY\;\;Other values are reserved" access="RO" enum="IDLE=0x0,IN_PROGRESS=0x1,APPLIED=0x2,ACTIVE=0x3,ACTIVE_PENDING_RESET=0x4,FAILED=0x5,CANCELED=0x6,BUSY=0x7" offset="0x8.0" size="0x0.4" />
+	<field name="component_update_state" descr="Component state in update flow, see Section 10.2.1, \;&quot;Component Update State&quot;, on page 850:\;0x0: IDLE\;0x1: IN_PROGRESS\;0x2: APPLIED\;0x3: ACTIVE \;0x4: ACTIVE_PENDING_RESET\;0x5: FAILED\;0x6: CANCELED\;0x7: BUSY\;\;Other values are reserved" access="RO" enum="IDLE=0x0,IN_PROGRESS=0x1,APPLIED=0x2,ACTIVE=0x3,ACTIVE_PENDING_RESET=0x4,FAILED=0x5,CANCELED=0x6,BUSY=0x7" offset="0x8.0" size="0x0.4" />
 	<field name="component_status" descr="The status of the component:\;0x0: NOT_PRESENT - The component is supported by \;the device but, currently not present\;0x1: PRESENT - This component is present. For down\;stream devices link LinkX component, this is an indica\;tion that the binary image is present at the host device \;memory.\;0x2: IN_USE - The component is present and currently \;in use." access="RO" enum="NOT_PRESENT=0x0,PRESENT=0x1,IN_USE=0x2" offset="0x8.4" size="0x0.5" />
 	<field name="progress" descr="Progress in percentage (from 0 to 100). This field is \;only relevant for cables." access="RO" offset="0x8.9" size="0x0.7" />
 	<field name="device_type" descr="Peripheral device type:\;0: Switch_or_NIC\;1: Gearbox" access="INDEX" offset="0xC.0" size="0x0.8" />
@@ -1058,7 +1100,7 @@
 	<field name="device_type" descr="Peripheral device type\;1: XM" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="device_index" descr="Device number \;For gearboxes, the index represents the gearbox die." access="INDEX" offset="0x4.0" size="0x0.12" />
-	<field name="device_status_data" descr="Device initialization Data. \;For XM status, see Table 1899, &quot;MDCR - XM Data Layout,&quot; \;on page 2357" subnode="mdcr_xm_data_ext" access="RO" offset="0x10.0" size="0x50.0" />
+	<field name="device_status_data" descr="Device initialization Data. \;For XM status, see Table 2005, &quot;MDCR - XM Data Layout,&quot; \;on page 2272" subnode="mdcr_xm_data_ext" access="RO" offset="0x10.0" size="0x50.0" />
 </node>
 
 <node name="mdcr_xm_data_ext" descr="" size="0x50.0" >
@@ -1092,7 +1134,7 @@
 	<field name="response_message_sequence" descr="Response message sequential number. \;For a specific request, the response message sequential num\;ber is the following one. \;In addition, the last message should be 0." access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="query_index" descr="Index related to the specific query_type. \;For query_type = 1,2,3 this field is neglected." access="INDEX" offset="0x8.0" size="0x0.8" />
 	<field name="data_valid" descr="If set, the data in the data field is valid and contain the informa\;tion for the queried index. \;Note: This field is not reflecting any validity of the data while \;accessing a non-existing query entity. Querying with an out of \;range index will lead to BAD_PARAM status of the register." access="RO" offset="0x8.31" size="0x0.1" />
-	<field name="data" descr="Properties of that field are based on query_type.\;For slot information query_type data - see Table 1911, \;&quot;slot_info Register Layout,&quot; on page 2363\;For devices on slot query_type data - see Table 1913, \;&quot;device_info Register Layout,&quot; on page 2364\;For slot name query_type data - see Table 1915, &quot;slot_name \;Register Layout,&quot; on page 2365" subnode="mddq_data_auto_ext" access="RO" offset="0x10.0" size="0x20.0" union_selector="$(parent).query_type" />
+	<field name="data" descr="Properties of that field are based on query_type.\;For slot information query_type data - see Table 1811, \;&quot;MDDQ slot_info Layout,&quot; on page 2142\;For devices on slot query_type data - see Table 1813, &quot;MDDQ \;device_info Register Layout,&quot; on page 2143\;For slot name query_type data - see Table 1815, &quot;MDDQ \;slot_name Layout,&quot; on page 2145" subnode="mddq_data_auto_ext" access="RO" offset="0x10.0" size="0x20.0" union_selector="$(parent).query_type" />
 </node>
 
 <node name="mddt_reg_ext" descr="" size="0x110.0" >
@@ -1101,7 +1143,7 @@
 	<field name="type" descr="0: PRM_Register\;1: Command\;2: CrSpace_access - [Internal]" access="OP" enum="PRM_Register=0x0,Command=0x1,CrSpace_access=0x2" offset="0x4.0" size="0x0.2" />
 	<field name="write_size" descr="Write size in D-Words." access="OP" offset="0x4.16" size="0x0.8" />
 	<field name="read_size" descr="Read size in D-Words." access="OP" offset="0x4.24" size="0x0.8" />
-	<field name="payload" descr="Payload\;For PRM Register type payload- See Table 1903, \;&quot;PRM Register Payload Layout,&quot; on page 2360\;For Command type payload - See Table 1905, &quot;Com\;mand Payload Layout,&quot; on page 2360\;For CrSpace type payload - See Table 1907, \;&quot;CrSpace access Payload Layout,&quot; on page 2361" subnode="mddt_reg_payload_auto_ext" access="RW" offset="0xC.0" size="0x104.0" union_selector="$(parent).type" />
+	<field name="payload" descr="Payload\;For PRM Register type payload- See Table 1803, \;&quot;PRM Register Payload Layout,&quot; on page 2138\;For Command type payload - See Table 1805, &quot;Com\;mand Payload Layout,&quot; on page 2138\;For CrSpace type payload - See Table 1807, \;&quot;CrSpace access Payload Layout,&quot; on page 2139" subnode="mddt_reg_payload_auto_ext" access="RW" offset="0xC.0" size="0x104.0" union_selector="$(parent).type" />
 </node>
 
 <node name="mddt_reg_payload_auto_ext" descr="" attr_is_union="1" size="0x104.0" >
@@ -1144,6 +1186,14 @@
 	<field name="time_left" descr="Time left in seconds.\;In case that status is 2 (debug session active) - time left for \;token operation\;In case that status is 4 (challenge provided, no token \;installed yet) - time left for token installation\;For any other status, field should be zero" access="RO" offset="0x8.0" size="0x4.0" />
 </node>
 
+<node name="meccc_ext" descr="" size="0x14.0" >
+	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="device_index" descr="Device index\;For gearboxes, the index represents the gearbox die" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="clr" descr="Clear counters\;" access="OP" offset="0x4.0" size="0x0.1" />
+	<field name="ecc_crt_cnt" descr="ECC Correctable Counter\;Counter increments 1 time per each SRAM (including \;TCAM) which had 1 or more ECC correctable events. \;Cleared at: (1) reset (including soft_reset), (2) clear bit\;Counts from: (1) main, (2) all tiles" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="ecc_ucrt_cnt" descr="ECC Uncorrectable Counter\;Cleared at: (1) reset (including soft_reset), (2) clear bit\;" access="RO" offset="0x10.0" size="0x0.8" />
+</node>
+
 <node name="merr_ext" descr="" size="0x14.0" >
 	<field name="ent_type" descr="Entity type.\;0: Reserved\;1: QSFP Module (the relevant signals are: present, reset, \;interrupt, power enable, low power mode, power good, mod\;sel, QSFP LEDs)" access="INDEX" offset="0x0.0" size="0x0.4" />
 	<field name="current_index" descr="Current entity index" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -1169,8 +1219,8 @@
 <node name="mfcr_ext" descr="" size="0x8.0" >
 	<field name="pwm_frequency" descr="Controls the frequency of the PWM signal.\;Supported frequencies are:\;0x0: 11Hz \;0x1: 14.7Hz\;0x2: 22.1Hz\;0x3 - 0111111: Reserved\;0x40: 1.4KHz\;0x41: 5KHz\;0x42: 20KHz\;0x43: 22.5KHz\;0x44: 25KHz\;0x45 - 0x7F: Reserved" access="RW" offset="0x0.0" size="0x0.7" />
 	<field name="pwm_active" descr="Indicates which of the PWM control is active (bit per PWM)" access="RO" offset="0x4.0" size="0x0.5" />
-	<field name="tacho_active" descr="Indicates which of the tachometer is active (bit per tachome\;ter)" access="RO" offset="0x4.16" size="0x0.10" />
-	<field name="tacho_active_msb" descr="6 MSB indexes of the tachometers. \;Indicates which of the tachometer is active (bit per tachome\;ter)" access="RO" offset="0x4.26" size="0x0.6" />
+	<field name="tacho_active" descr="Indicates which of the tachometer is active (bit per tachome\;ter)\;Bitmask, per bit:\;0: not active\;1: active" access="RO" offset="0x4.16" size="0x0.10" />
+	<field name="tacho_active_msb" descr="Indicates which of the tachometer is active (bit per tachome\;ter)\;Bitmask, per bit:\;0: not active\;1: active" access="RO" offset="0x4.26" size="0x0.6" />
 </node>
 
 <node name="mfm_ext" descr="" size="0x18.0" >
@@ -1193,7 +1243,7 @@
 </node>
 
 <node name="mfnr_ext" descr="" size="0x30.0" >
-	<field name="fan_index" descr="Fan tachometer index." access="INDEX" offset="0x0.0" size="0x0.5" />
+	<field name="fan_index" descr="Fan tachometer index.\;" access="INDEX" offset="0x0.0" size="0x0.5" />
 	<field name="serial_number" descr="Fan serial number (ASCII string)\;Value of &apos;0&apos;: Some error (Fan not present, disconnected etc.)" access="RO" high_bound="5" low_bound="0" offset="0x4.0" size="0x18.0" />
 	<field name="part_number" descr="Fan part number (ASCII string)\;Value of &apos;0&apos;: Some error (Fan not present, disconnected etc.)" access="RO" high_bound="4" low_bound="0" offset="0x1C.0" size="0x14.0" />
 </node>
@@ -1221,6 +1271,7 @@
 	<field name="rst_type_sel" descr="The requested reset type." access="RW" offset="0x4.24" size="0x0.3" />
 	<field name="pci_sync_for_fw_update_resp" descr="Response of the driver for the reset request.\;1: Acknowledgment\;2: Dis-acknowledgment\;3: Reserved" access="WO" enum="Acknowledgment=0x1,Dis=0x2,Reserved=0x3" offset="0x4.27" size="0x0.2" />
 	<field name="pci_sync_for_fw_update_start" descr="Setting this bit to &apos;1&apos; will request a synced driver flow and &apos;0&apos; \;for the legacy flow.\;Synced driver flow will not require to issue MFRL command \;from other hosts (x86 / ARM for SoC)" access="WO" offset="0x4.29" size="0x0.1" />
+	<field name="pci_rescan_required" descr="Setting this bit to 1 indicates a need of rescan for the corre\;sponding PCI slot" access="RO" offset="0x4.31" size="0x0.1" />
 </node>
 
 <node name="mfsc_ext" descr="" size="0x8.0" >
@@ -1230,7 +1281,7 @@
 
 <node name="mfsl_ext" descr="" size="0xc.0" >
 	<field name="ie" descr="Interrupt Enable. If the ie bit is set and the Tachometer reading \;is out of range as defined by tach_min and tach_max, the \;FERR# will be asserted." access="RW" offset="0x0.0" size="0x0.1" />
-	<field name="ee" descr="Event Enable.\;0 - Do not generate event\;1 - Generate Event \;2 - Generate single event\;For Fan Error Evet details refer to Section  25.37.5, &quot;FORE - Fan \;Out of Range Event&quot;." access="RW" offset="0x0.2" size="0x0.2" />
+	<field name="ee" descr="Event Enable.\;0 - Do not generate event\;1 - Generate Event \;2 - Generate single event\;For Fan Error Evet details refer to Section  25.37, &quot;PPS and PTP \;Registers&quot;." access="RW" offset="0x0.2" size="0x0.2" />
 	<field name="tacho" descr="Fan tachometer index" access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="tach_min" descr="Tachometer minimum value (minimum RPM)." access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="tach_max" descr="Tachometer maximum value (maximum RPM)." access="RW" offset="0x8.0" size="0x0.16" />
@@ -1263,9 +1314,9 @@
 </node>
 
 <node name="mgir_ext" descr="" size="0xa0.0" >
-	<field name="hw_info" descr="Hardware Information, see Table 1758, &quot;Hardware Info \;Layout,&quot; on page 2250" subnode="mgir_hardware_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
-	<field name="fw_info" descr="Firmware Information, see Table 1760, &quot;Firmware Info \;Layout,&quot; on page 2252" subnode="mgir_fw_info_ext" access="RW" offset="0x20.0" size="0x40.0" />
-	<field name="sw_info" descr="Software Information, see Table 1762, &quot;Software Info Lay\;out,&quot; on page 2255\;This field indicates the oldest software version compati\;ble with the current firmware" subnode="mgir_sw_info_ext" access="RW" offset="0x60.0" size="0x20.0" />
+	<field name="hw_info" descr="Hardware Information, see Table 1885, &quot;Hardware Info \;Layout,&quot; on page 2200" subnode="mgir_hardware_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
+	<field name="fw_info" descr="Firmware Information, see Table 1887, &quot;Firmware Info \;Layout,&quot; on page 2202" subnode="mgir_fw_info_ext" access="RW" offset="0x20.0" size="0x40.0" />
+	<field name="sw_info" descr="Software Information, see Table 1889, &quot;Software Info Lay\;out,&quot; on page 2204\;This field indicates the oldest software version compati\;ble with the current firmware" subnode="mgir_sw_info_ext" access="RW" offset="0x60.0" size="0x20.0" />
 </node>
 
 <node name="mgir_fw_info_ext" descr="" size="0x40.0" >
@@ -1302,9 +1353,7 @@
 	<field name="num_ports" descr="Number of physical port the device supports." access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="hw_dev_id" descr="The PCI device-ID of the NIC/HCA in recovery (Live\;fish) mode." access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="manufacturing_base_mac_47_32" descr="MSB of the &quot;base&quot; MAC address of the NIC that was \;allocate during manufacturing. The NIC derives the \;MAC addresses for the different PCI PFs from this \;MAC address. This parameter can be used as a \;canonical unique identifier of the NIC.\;manufacturing_base_mac of value 0 means field is not \;supported." access="RO" offset="0x10.0" size="0x0.16" />
-	<field name="module_base" descr="module base index\;assiciated_module_id[0] = 32 * module_base" access="OP" offset="0x10.28" size="0x0.4" />
 	<field name="manufacturing_base_mac_31_0" descr="LSB of the &quot;base&quot; MAC address of the NIC that was \;allocate during manufacturing. The NIC derives the \;MAC addresses for the different PCI PFs from this \;MAC address. This parameter can be used as a \;canonical unique identifier of the NIC.\;manufacturing_base_mac of value 0 means field is not \;supported." access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="associated_module_id_31_0" descr="bitmask of associated module id. For each bit:\;0: module is not managed by ASIC\;1: module is managed by ASIC" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="uptime" descr="Time (in secs.) since last reset0" access="RO" offset="0x1C.0" size="0x4.0" />
 </node>
 
@@ -1337,7 +1386,7 @@
 </node>
 
 <node name="mgpir_ext" descr="" size="0xa0.0" >
-	<field name="hw_info" descr="Hardware Information, see Table 1770, &quot;Hardware Info \;Layout,&quot; on page 2260" subnode="mgpir_hw_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
+	<field name="hw_info" descr="Hardware Information, see Table 1821, &quot;Hardware Info \;Layout,&quot; on page 2147" subnode="mgpir_hw_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
 </node>
 
 <node name="mgpir_hw_info_ext" descr="" size="0x20.0" >
@@ -1358,15 +1407,35 @@
 	<field name="health" descr="Software health state:\;0 - Failure\;1 - Reserved\;2 - Normal Operation\;3 - Boot / Init (default state)" access="WO" offset="0x0.0" size="0x0.4" />
 </node>
 
+<node name="mini_data_auto_ext" descr="" attr_is_union="1" size="0x20.0" >
+	<field name="mini_module_parameters_ext" descr="" subnode="mini_module_parameters_ext" offset="0x0.0" selected_by="module_parameters" size="0x8.0" />
+	<field name="mini_module_primary_ext" descr="" subnode="mini_module_primary_ext" offset="0x0.0" selected_by="module_primary" size="0x20.0" />
+</node>
+
+<node name="mini_ext" descr="" size="0x30.0" >
+	<field name="type" descr="Type:\;1: module_parameters\;2: module_primary" access="INDEX" enum="module_parameters=0x1,module_primary=0x2" offset="0x0.0" size="0x0.8" />
+	<field name="valid" descr="Valid:\;0: the relevant type is not supported by this Firmware version\;1: the relevant type is valid" access="RO" offset="0x4.0" size="0x0.1" />
+	<field name="data" descr="This field takes meaning per type\;For module_parameters see Table  1907, &quot;MINI type mod\;ule_parameters Layout,&quot; on page  2215\;For module_primary see Table  1909, &quot;MINI type module_pri\;mary Layout,&quot; on page  2215" subnode="mini_data_auto_ext" access="RW" offset="0x10.0" size="0x20.0" union_selector="$(parent).type" />
+</node>
+
+<node name="mini_module_parameters_ext" descr="" size="0x8.0" >
+	<field name="module_index" descr="Module Index" access="INDEX" offset="0x0.0" size="0x0.8" />
+	<field name="owner" descr="Owner \;0: not owner\;1: owner\;Informative: for devices where a module has only one ASIC \;owner (99% of the devices) then the owner is set" access="RO" offset="0x4.0" size="0x0.1" />
+</node>
+
+<node name="mini_module_primary_ext" descr="" size="0x20.0" >
+	<field name="owner_vector" descr="Owner vector\;Each bit represents module_index\;\;Per bit:\;0: not owner\;1: owner\;Informative: for devices where a module has only one ASIC \;owner (99% of the devices) then the owner is set" access="RO" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
+</node>
+
 <node name="mirc_reg_ext" descr="" size="0x8.0" >
-	<field name="status_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. See Section 10.3.7, &quot;Error \;Handling&quot;, on page 829\;0x0: OK\;0x1: BUSY\;0x2: PROHIBITED_FW_VER_ERR\;0x3: FIRST_PAGE_COPY_FAILED\;0x4: FIRST_PAGE_ERASE_FAILED\;0x5: FIRST_PAGE_RESTORE_FAILED\;0x6: CANDIDATE_FW_DEACTIVATION_FAILED\;0x7: FW_ALREADY_ACTIVATED\;0x8: ERROR_DEVICE_RESET_REQUIRED\;0x9: ERROR_FW_PROGRAMMING_NEEDED\;Other values should be treated as an unknown error." access="RO" offset="0x0.0" size="0x0.8" />
+	<field name="status_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. See Section 10.3.7, &quot;Error \;Handling&quot;, on page 853\;0x0: OK\;0x1: BUSY\;0x2: PROHIBITED_FW_VER_ERR\;0x3: FIRST_PAGE_COPY_FAILED\;0x4: FIRST_PAGE_ERASE_FAILED\;0x5: FIRST_PAGE_RESTORE_FAILED\;0x6: CANDIDATE_FW_DEACTIVATION_FAILED\;0x7: FW_ALREADY_ACTIVATED\;0x8: ERROR_DEVICE_RESET_REQUIRED\;0x9: ERROR_FW_PROGRAMMING_NEEDED\;Other values should be treated as an unknown error." access="RO" offset="0x0.0" size="0x0.8" />
 </node>
 
 <node name="mjtag_ext" descr="" size="0x30.0" >
 	<field name="size" descr="Size of operation - relevant for JTAG interface access com\;mands only, indicating the number of transaction bytes to \;execute. Maximum size supported is 40.\;Note: when size=0, no operation is performed (clock is not \;toggled). The tdo is sampled and provided in the response \;at jtag_transaction_set_0." access="WO" offset="0x0.0" size="0x0.8" />
 	<field name="sequence_number" descr="Command sequence number - to prevent re-execution of \;the same command due to command retransmission, this \;command includes a sequence number.\;The enable and disable commands MUST be issues with \;sequence_number = 0 while any JTAG access command \;must increase the sequence_number by 1 (the first JTAG \;access command should start at sequence_number = 1)." access="WO" offset="0x0.24" size="0x0.4" />
 	<field name="cmd" descr="Command\;0 - JTAG interface disable - JTAG interface is disabled\;1 - JTAG interface enable - enabling JTAG interface\;2 - JTAG interface access" access="RW" offset="0x0.30" size="0x0.2" />
-	<field name="jtag_transaction_set" descr="See Table 1748, &quot;JTAG Transaction Set Byte Layout,&quot; \;on page 2244" access="RW" high_bound="43" low_bound="0" offset="0x4.24" size="0x2c.0" />
+	<field name="jtag_transaction_set" descr="See Table 1769, &quot;JTAG Transaction Set Byte Layout,&quot; \;on page 2108" access="RW" high_bound="43" low_bound="0" offset="0x4.24" size="0x2c.0" />
 </node>
 
 <node name="mkdc_reg_ext" descr="" size="0x2c.0" >
@@ -1430,17 +1499,18 @@
 
 <node name="mnvia_reg_ext" descr="" size="0x8.0" >
 	<field name="target" descr="Information targeted for invalidation\;0: ALL - all NVRAM parameters.\; All other values are reserved." access="WO" offset="0x0.0" size="0x0.3" />
-	<field name="writer_id" descr="The entity which perform the invalidate.\;The encoding same as writer_id in Configuration Item \;register (See Table 1796, &quot;Configuration Item \;Header Layout,&quot; on page 2276)." access="RW" offset="0x0.4" size="0x0.5" />
+	<field name="writer_id" descr="The entity which perform the invalidate.\;The encoding same as writer_id in Configuration Item \;register (See Table 1935, &quot;Configuration Item \;Header Layout,&quot; on page 2234)." access="RW" offset="0x0.4" size="0x0.5" />
 </node>
 
 <node name="mnvqc_reg_ext" descr="" size="0x8.0" >
-	<field name="type" descr="Configuration item type. \;Table 1798, &quot;Configuration Item Data Type \;Class Global Layout,&quot; on page 2278\;Table 1800, &quot;Configuration Item Data Type \;Class Physical Port Layout,&quot; on page 2279\;Table 1802, &quot;Configuration Item Data Type \;Class Per Host-PF Layout,&quot; on page 2279" access="INDEX" offset="0x0.0" size="0x4.0" />
+	<field name="type" descr="Configuration item type. \;Table 1937, &quot;Configuration Item Data Type \;Class Global Layout,&quot; on page 2237\;Table 1939, &quot;Configuration Item Data Type \;Class Physical Port Layout,&quot; on page 2237\;Table 1941, &quot;Configuration Item Data Type \;Class Per Host-PF Layout,&quot; on page 2238" access="INDEX" offset="0x0.0" size="0x4.0" />
 	<field name="support_rd" descr="The configuration item is supported and can be read" access="RO" offset="0x4.0" size="0x0.1" />
 	<field name="support_wr" descr="The configuration item is supported and can be \;updated" access="RO" offset="0x4.1" size="0x0.1" />
 	<field name="version" descr="The maximal version of the configuration item sup\;ported by the device" access="RO" offset="0x4.4" size="0x0.4" />
 </node>
 
 <node name="module_latched_flag_info_ext" descr="" size="0xf8.0" >
+	<field name="rx_los_cap" descr="when set, indicates modules supports rx los indication" access="RO" offset="0x0.0" size="0x0.1" />
 	<field name="dp_fw_fault" descr="Valid for CMIS based modules only\;Latched modules Datapath fw fault flag" access="RO" offset="0x0.22" size="0x0.1" />
 	<field name="mod_fw_fault" descr="Valid for CMIS based modules only\;Latched module fw fault flag" access="RO" offset="0x0.23" size="0x0.1" />
 	<field name="vcc_flags" descr="Latched VCC flags of module\;Bit 0: high_vcc_alarm\;Bit 1: low_vcc_alarm\;Bit 2: high_vcc_warning\;Bit 3: low_vcc_warning" access="RO" enum="high_vcc_alarm=0x1,low_vcc_alarm=0x2,high_vcc_warning=0x4,low_vcc_warning=0x8" offset="0x0.24" size="0x0.4" />
@@ -1485,7 +1555,7 @@
 	<field name="pcie_index" descr="PCIe index number (Internal domain index)\;Reserved when access is from the host" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="depth" descr="depth level of the DUT of some hierarchy" access="INDEX" offset="0x0.24" size="0x0.6" />
 	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter value \;for all counters in the counter group. This bit can be set for \;both Set() and Get() operation." access="WO" offset="0x4.31" size="0x0.1" />
-	<field name="counter_set" descr="Counter set as described in\;Table 1839, &quot;PCIe Performance Counters Data Layout,&quot; \;on page 2302\;Table 1843, &quot;PCIE lanes counters Data Layout,&quot; on \;page 2306 - [Internal] \;Table 1841, &quot;PCIE timers and states Data Layout,&quot; on \;page 2304 - [Internal]" subnode="mpcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
+	<field name="counter_set" descr="Counter set as described in\;Table 2013, &quot;PCIe Performance Counters Data Layout,&quot; \;on page 2282\;Table 2017, &quot;PCIE lanes counters Data Layout,&quot; on \;page 2286 - [Internal] \;Table 2015, &quot;PCIE timers and states Data Layout,&quot; on \;page 2284 - [Internal]" subnode="mpcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
 </node>
 
 <node name="mpecs_reg_ext" descr="" size="0x20.0" >
@@ -1580,7 +1650,7 @@
 </node>
 
 <node name="mrsr_ext" descr="" size="0x8.0" >
-	<field name="command" descr="Reset/shutdown command\;0: do nothing\;1: software reset (switch soft reset)\;2: hardware reset\;3: enclosure reset (requires system support)\;4: shutdown (requires system support)\;5: fast reset \;" access="WO" offset="0x0.0" size="0x0.4" />
+	<field name="command" descr="Reset/shutdown command\;0: clear state of reset_at_pci_disable\;1: software reset (switch soft reset)\;2: hardware reset\;6: reset_at_pci_disable - reset will be done at PCI_DISABLE" access="WO" offset="0x0.0" size="0x0.4" />
 </node>
 
 <node name="mrtc_reg_ext" descr="" size="0x10.0" >
@@ -1589,11 +1659,6 @@
 	<field name="time_l" descr="LSB of timestemp depnding on time_synced" access="RW" offset="0xC.0" size="0x4.0" />
 </node>
 
-<node name="msci_ext" descr="" size="0xc.0" >
-	<field name="index" descr="CPLD index" access="INDEX" offset="0x0.0" size="0x0.4" />
-	<field name="version" descr="CPLD version" access="RO" offset="0x4.0" size="0x4.0" />
-</node>
-
 <node name="msgi_ext" descr="" size="0x80.0" >
 	<field name="serial_number" descr="System serial number (ASCII string)" access="RO" high_bound="5" low_bound="0" offset="0x0.0" size="0x18.0" />
 	<field name="part_number" descr="System part number (ASCII string)" access="RO" high_bound="4" low_bound="0" offset="0x20.0" size="0x14.0" />
@@ -1601,30 +1666,28 @@
 	<field name="product_name" descr="Product Name (ASCII string)" access="RO" high_bound="15" low_bound="0" offset="0x40.0" size="0x40.0" />
 </node>
 
+<node name="mspmer_ext" descr="" size="0x8.0" >
+	<field name="clr" descr="Clear all counters" access="RO" offset="0x0.0" size="0x0.1" />
+	<field name="fmon_ctr" descr="Frequency Monitor Counter\;\;\;Stuck at 0xF, cleared only at hard reset (RST_) or \;power down or clr bit." access="RO" offset="0x4.0" size="0x0.4" />
+	<field name="vmon_ctr" descr="Voltage Monitor Counter\;\;\;Stuck at 0xF, cleared only at hard reset (RST_) or \;power down or clr bit." access="RO" offset="0x4.4" size="0x0.4" />
+	<field name="scpm_ctr" descr="Security Canary Path Monitor Counter\;A circuit macro used to flag timing slack violations as \;part of mitigations for physical security attacks.\;\;Stuck at 0xF, cleared only at hard reset (RST_) or \;power down or clr bit." access="RO" offset="0x4.8" size="0x0.4" />
+</node>
+
 <node name="msps_ext" descr="" size="0xa0.0" >
 	<field name="psu0" descr="System Power Supply 0 Status" access="RO" high_bound="19" low_bound="0" offset="0x0.0" size="0x50.0" />
 	<field name="psu1" descr="System Power Supply 1 Status" access="RO" high_bound="19" low_bound="0" offset="0x50.0" size="0x50.0" />
 </node>
 
-<node name="mssir_reg_ext" descr="" size="0x80.0" >
-	<field name="crc" descr="Each bit represent whether a CRC error occured on \;the management interface to the tile number." access="RO" offset="0x0.0" size="0x0.8" />
-	<field name="bypass" descr="Each bit represent whether a bypass clock is run on \;the corresponding tile." access="RO" offset="0x4.0" size="0x0.8" />
-	<field name="fatal_dft" descr="" access="RO" offset="0x8.0" size="0x0.8" />
-	<field name="freq0" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.0" size="0x0.5" />
-	<field name="freq1" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.5" size="0x0.5" />
-	<field name="freq2" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.10" size="0x0.5" />
-	<field name="freq3" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.15" size="0x0.5" />
-	<field name="freq4" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.20" size="0x0.5" />
-	<field name="freq5" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.25" size="0x0.5" />
-	<field name="freq6" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0x10.0" size="0x0.5" />
-	<field name="freq7" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0x10.5" size="0x0.5" />
+<node name="mssir_reg_ext" descr="" size="0x88.0" >
+	<field name="sys_indx" descr="System Identifier\;0: Firebird\;" access="INDEX" enum="Firebird=0x0" offset="0x0.0" size="0x0.4" />
+	<field name="sys_info" descr="Firebird System Information, see Table 1885, &quot;Hardware \;Info Layout,&quot; on page 2200" access="RW" high_bound="31" low_bound="0" offset="0x8.0" size="0x80.0" />
 </node>
 
 <node name="mtbr_reg_ext" descr="" size="0x18.0" >
 	<field name="base_sensor_index" descr="Base sensor index\;Sensors are read starting from base_sensor_index\;Sensor 0 is the ASIC sensor, sensors 1-63 are ambient sen\;sors and sensors 64-127 are mapped to the SFP+/QSFP \;modules sequentially (module 0 is mapped to sensor 64, \;module 1 to sensor 65 and so on). Gearbox sensors starts \;from 256 index." access="INDEX" offset="0x0.0" size="0x0.12" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="num_rec" descr="Number of records to read\;Range 1..255" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="temperature_record" descr="Temperature record\;See Table 1708, &quot;MTBR - Temperature Record Layout,&quot; \;on page 2218" subnode="mtbr_temp_record_ext" access="RO" high_bound="1" low_bound="0" offset="0x10.0" size="0x8.0" />
+	<field name="temperature_record" descr="Temperature record\;See Table 1841, &quot;MTBR - Temperature Record Layout,&quot; \;on page 2166" subnode="mtbr_temp_record_ext" access="RO" high_bound="1" low_bound="0" offset="0x10.0" size="0x8.0" />
 </node>
 
 <node name="mtbr_temp_record_ext" descr="" size="0x4.0" >
@@ -1633,9 +1696,10 @@
 </node>
 
 <node name="mtcap_ext" descr="" size="0x10.0" >
-	<field name="sensor_count" descr="Number of sensors supported by the device\;This includes the ASIC and the ambient sensors. QSFP module \;sensors are not included." access="RO" offset="0x0.0" size="0x0.7" />
+	<field name="sensor_count" descr="Number of ASIC+platform sensors supported by the device \;This includes the ASIC and the ambient sensors. QSFP module \;sensors are not included." access="RO" offset="0x0.0" size="0x0.7" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
-	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Only ASIC \;and ambient sensors are supported. Each bit represents a sen\;sor.\;0: Not_connected_or_not_supported\;1: Supports_temperature_measurements" subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
+	<field name="internal_sensor_count" descr="Number of sensors supported by the device that are on the \;ASIC." access="RO" offset="0x4.0" size="0x0.7" />
+	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Only ASIC \;and ambient sensors are supported. Each bit represents a sen\;sor.\;Per bit:\;0: Not_connected_or_not_supported\;1: Supports_temperature_measurements" subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
 </node>
 
 <node name="mtcq_reg_ext" descr="" size="0x70.0" >
@@ -1652,17 +1716,18 @@
 </node>
 
 <node name="mtecr_ext" descr="" size="0x60.0" >
-	<field name="sensor_count" descr="Number of sensors supported by the device\;This includes the ASIC, ambient sensors, Gearboxes etc. QSFP \;module sensors are not included." access="RO" offset="0x0.0" size="0x0.12" />
+	<field name="sensor_count" descr="Number of sensors supported by the ASIC+platform\;This includes the ASIC, ambient sensors, Gearboxes etc. QSFP \;module sensors are not included." access="RO" offset="0x0.0" size="0x0.12" />
 	<field name="last_sensor" descr="Last sensor index that is available in the system to read from.\;" access="RO" offset="0x0.16" size="0x0.12" />
+	<field name="internal_sensor_count" descr="Number of sensors supported by the device that are on the \;ASIC." access="RO" offset="0x4.0" size="0x0.7" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x4.28" size="0x0.4" />
-	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Each bit \;represents a sensor.\;This field is size variable based on the last_sensor field and in \;granularity of 32bits.\;0: Not connected or not supported\;1: Supports temperature measurements" access="RO" high_bound="21" low_bound="0" offset="0x8.0" size="0x58.0" />
+	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Each bit \;represents a sensor.\;This field is size variable based on the last_sensor field and in \;granularity of 32bits.\;Per bit:\;0: Not connected or not supported\;1: Supports temperature measurements\;\;In case of last_sensor = 704 (22*32):\;sensor_warning[0] bit31 is sensor_warning[703]\;sensor_warning[0] bit0 is sensor_warning[703-31]\;sensor_warning[21] bit31 is sensor_warning[31]\;sensor_warning[21] bit0 is sensor_warning[0]\;\;In case if last_sensor = 259 (22*32):\;Note: roundup(259,32)=288\;sensor_warning[0] bit31 is sensor_warning[287]\;sensor_warning[0] bit0 is sensor_warning[287-31=256]\;sensor_warning[8] bit31 is sensor_warning[31]\;sensor_warning[8] bit0 is sensor_warning[0]\;sensor_warning[9..21] are not used" access="RO" high_bound="21" low_bound="0" offset="0x8.0" size="0x58.0" />
 </node>
 
 <node name="mtewe_ext" descr="" size="0x5c.0" >
 	<field name="sensor_count" descr="Number of sensors supported by the device\;This includes the ASIC, ambient sensors, Gearboxes etc. \;QSFP module sensors are not included." access="RO" offset="0x0.0" size="0x0.12" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.12" size="0x0.4" />
 	<field name="last_sensor" descr="Last sensor index that is available in the system to read \;from." access="RO" offset="0x0.16" size="0x0.12" />
-	<field name="sensor_warning" descr="Bit vector indicating which of the sensor reading is above \;threshold.\;This field is size dependent and based on last_sensor field \;and in granularity of 32bits." access="RO" high_bound="21" low_bound="0" offset="0x4.0" size="0x58.0" />
+	<field name="sensor_warning" descr="Bit vector indicating which of the sensor reading is above \;threshold.\;This field is size dependent and based on last_sensor field \;and in granularity of 32bits.\;\;In case of last_sensor = 704 (22*32):\;sensor_warning[0] bit31 is sensor_warning[703]\;sensor_warning[0] bit0 is sensor_warning[703-31]\;sensor_warning[21] bit31 is sensor_warning[31]\;sensor_warning[21] bit0 is sensor_warning[0]\;\;In case if last_sensor = 259 (22*32):\;Note: roundup(259,32)=288\;sensor_warning[0] bit31 is sensor_warning[287]\;sensor_warning[0] bit0 is sensor_warning[287-31=256]\;sensor_warning[8] bit31 is sensor_warning[31]\;sensor_warning[8] bit0 is sensor_warning[0]\;sensor_warning[9..21] are not used" access="RO" high_bound="21" low_bound="0" offset="0x4.0" size="0x58.0" />
 </node>
 
 <node name="mtmp_ext" descr="" size="0x20.0" >
@@ -1694,17 +1759,18 @@
 	<field name="cap_pin_5_mode" descr="Capability of PPS pin #5\;Bit0: support_pps_in\;Bit1: support_pps_out\;Bit2: support_virtual_pin" access="RO" enum="support_pps_in=0x1,support_pps_out=0x2,support_virtual_pin=0x4" offset="0xC.8" size="0x0.4" />
 	<field name="cap_pin_6_mode" descr="Capability of PPS pin #6\;Bit0: support_pps_in\;Bit1: support_pps_out\;Bit2: support_virtual_pin" access="RO" enum="support_pps_in=0x1,support_pps_out=0x2,support_virtual_pin=0x4" offset="0xC.16" size="0x0.4" />
 	<field name="cap_pin_7_mode" descr="Capability of PPS pin #7\;Bit0: support_pps_in\;Bit1: support_pps_out\;Bit2: support_virtual_pin" access="RO" enum="support_pps_in=0x1,support_pps_out=0x2,support_virtual_pin=0x4" offset="0xC.24" size="0x0.4" />
-	<field name="field_select" descr="Field select indicates which fields to modify in write operation to \;this register. This field selector supported only when \;MCAM.mtpps_fs==1. if MCAM.mtpps_fs==0 then SW should \;ensure that all the WO/RW fields are valid. \;Bit 0: enable\;Bit 1: Reserved\;\;Bit 2: pattern\;Bit 3: pin_mode\;Bit 4: time_stamp\;Bit 5: out_pulse_duration\;Bit 6: out_periodic_adjustment\;Bit 7: enhanced_out_periodic_adjustment\;Bit 8: npps\;Bit 9: npps_period\;Bit 10: out_pulse_duration_ns" access="WO" enum="enable=0x1,Reserved=0x2,pattern=0x4,pin_mode=0x8,time_stamp=0x10,out_pulse_duration=0x20,out_periodic_adjustment=0x40,enhanced_out_periodic_adjustment=0x80,npps=0x100,npps_period=0x200,out_pulse_duration_ns=0x400" offset="0x10.0" size="0x4.0" />
-	<field name="npps_period" descr="Period between periodical pps signal. The generated period \;depends on device capability and might be rounded.\;&apos;0&apos; disables periodic pps.\;Supported only when pin_mode = 0x01 and \;MCAM.mtpps_npps_period is set.\;Supported only when MTUTC.time_stamp_mode is \;REAL_TIME." subnode="uint64" access="RW" offset="0x14.0" size="0x8.0" />
+	<field name="field_select" descr="Field select indicates which fields to modify in write \;operation to this register. This field selector supported only \;when MCAM.mtpps_fs==1. if MCAM.mtpps_fs==0 then SW \;should ensure that all the WO/RW fields are valid. \;Bit 0: enable\;Bit 1: Reserved\;\;Bit 2: pattern\;Bit 3: pin_mode\;Bit 4: time_stamp\;Bit 5: out_pulse_duration\;Bit 6: out_periodic_adjustment\;Bit 7: enhanced_out_periodic_adjustment\;Bit 8: npps\;Bit 9: npps_period\;Bit 10: out_pulse_duration_ns" access="WO" enum="enable=0x1,Reserved=0x2,pattern=0x4,pin_mode=0x8,time_stamp=0x10,out_pulse_duration=0x20,out_periodic_adjustment=0x40,enhanced_out_periodic_adjustment=0x80,npps=0x100,npps_period=0x200,out_pulse_duration_ns=0x400" offset="0x10.0" size="0x4.0" />
+	<field name="npps_period" descr="Period between periodical pps signal. The generated period \;depends on device capability and might be rounded.\;&apos;0&apos; disables periodic pps.\;Supported only when pin_mode = 0x01 and \;MCAM.mtpps_npps_period is set.\;Supported only when MTUTC.time_stamp_mode is \;REAL_TIME." subnode="uint64" access="RW" offset="0x18.0" size="0x8.0" />
 	<field name="pin" descr="Pin to be configured or queried out of the supported pins." access="INDEX" offset="0x20.0" size="0x0.8" />
-	<field name="pin_mode" descr="Pin mode to be used. The mode must comply with the supported \;modes of the requested pin.\;0x0: pps_in\;0x1: pps_out\;0x2: virtual_pin\;0x3: pps_out_and_virtual_pin\;\;Operation will fail if pin does not support the required mode." access="RW" enum="pps_in=0x0,pps_out=0x1,virtual_pin=0x2,pps_out_and_virtual_pin=0x3" offset="0x20.8" size="0x0.4" />
-	<field name="pattern" descr="When pin_mode = pps_in:\;0x0: Rising edge \;0x1: Falling edge \;\;When pin_mode = pps_out:\;0x0: Pulse - (one shot) The device will generate a pulse at \;time_stamp time with a duration of out_pulse_duration. \;0x1: Periodic - the device will generate periodical pulses with \;pulse duration  of  out_pulse_duration every 1 second according \;to internal clock. The 1st pulse will be generated at time_stamp \;time.\;Reserved when pin_mode = 0x2 virtual_pin\;\;" access="RW" offset="0x20.16" size="0x0.4" />
+	<field name="pin_mode" descr="Pin mode to be used. The mode must comply with the \;supported modes of the requested pin.\;0x0: pps_in\;0x1: pps_out\;0x2: virtual_pin\;0x3: pps_out_and_virtual_pin\;\;Operation will fail if pin does not support the required mode." access="RW" enum="pps_in=0x0,pps_out=0x1,virtual_pin=0x2,pps_out_and_virtual_pin=0x3" offset="0x20.8" size="0x0.4" />
+	<field name="pattern" descr="When pin_mode = pps_in:\;0x0: Rising edge \;0x1: Falling edge \;\;When pin_mode = pps_out:\;0x0: Pulse - (one shot) The device will generate a pulse at \;time_stamp time with a duration of out_pulse_duration. \;0x1: Periodic - the device will generate periodical pulses \;with pulse duration  of  out_pulse_duration every 1 second \;according to internal clock. The 1st pulse will be generated \;at time_stamp time.\;Reserved when pin_mode = 0x2 virtual_pin\;\;" access="RW" offset="0x20.16" size="0x0.4" />
+	<field name="utc_mode" descr="UTC time:\;0x0: FREE_RUNNING - time_stamp is by free running clock\;0x1: UTC - time_stamp is UTC" access="RW" enum="FREE_RUNNING=0x0,UTC=0x1" offset="0x20.30" size="0x0.1" />
 	<field name="enable" descr="Enables the PPS functionality the specific pin.\;0x0: Disable \;0x1: Enable" access="RW" enum="Disable=0x0,Enable=0x1" offset="0x20.31" size="0x0.1" />
 	<field name="out_pulse_duration_ns" descr="Output pulse duration in units of nSec. The generated dura\;tion depends on device capability and might be rounded.\;Default values will be used if set to 0.\;Reserved when pin_mode != ptp_out. This field is mutual \;exclusive with out_pulse_duration. Supported only when \;MCAM.out_pulse_duration_ns is set." access="RW" offset="0x24.0" size="0x0.30" />
-	<field name="time_stamp" descr="When pin_mode = pps_in, the latched device time when it was \;triggered from the external GPIO pin. \;When pin_mode = pps_out or virtual_pin or \;pps_out_and_virtual_pin, the target time to generate \;next output signal. \;\;When time_stamp_mode in MTUTC register is \;REAL_TIME, Bits 29:0 are nSec, bits 47:30 are Sec. \;Otherwise, time is in units of device clock. \;" subnode="uint64" access="RW" offset="0x28.0" size="0x8.0" />
+	<field name="time_stamp" descr="When pin_mode = pps_in, the latched device time when it \;was triggered from the external GPIO pin. \;When pin_mode = pps_out or virtual_pin or \;pps_out_and_virtual_pin, the target time to \;generate next output signal. \;\;When time_stamp_mode in MTUTC register is \;REAL_TIME, Bits 29:0 are nSec, bits 47:30 are Sec. \;Otherwise, time is in units of device clock. \;" subnode="uint64" access="RW" offset="0x28.0" size="0x8.0" />
 	<field name="out_periodic_adjustment" descr="Frequency adjustment: Every PPS the HW frequency will be \;adjusted by this value. Units of HW clock, where HW counts \;10^9 HW clocks for 1 HW second.\;Range is from -32768 to +32767\;The hardware does consecutive frequency adjustment \;Reserved when pin_mode != ptp_out\;Reserved when switches\;" access="RW" offset="0x30.0" size="0x0.16" />
 	<field name="out_pulse_duration" descr="Output pulse duration in units of mSec. \;Range is 1 to 1000. \;Reserved when pin_mode != ptp_out\;In case the set value is 0, device default will be used." access="RW" offset="0x30.16" size="0x0.16" />
-	<field name="enhanced_out_periodic_adjustment" descr="Same as out_periodic_adjustment field, but supports a wider \;range.\;supported only when \;MCAM.mtpps_enhanced_out_periodic_adjustment==1.\;mutual exclusive with out_periodic_adjustment, i.e. when \;enhanced_out_periodic_adjustment!=0, out_periodic_adjustment \;is invalid.\;Reserved when switches" access="RW" offset="0x34.0" size="0x4.0" />
+	<field name="enhanced_out_periodic_adjustment" descr="Same as out_periodic_adjustment field, but supports a \;wider range.\;supported only when \;MCAM.mtpps_enhanced_out_periodic_adjustment==1.\;mutual exclusive with out_periodic_adjustment, i.e. when \;enhanced_out_periodic_adjustment!=0, \;out_periodic_adjustment is invalid.\;Reserved when switches" access="RW" offset="0x34.0" size="0x4.0" />
 </node>
 
 <node name="mtptp_ext" descr="" size="0x40.0" >
@@ -1722,7 +1788,7 @@
 
 <node name="mtrc_cap_reg_ext" descr="" size="0x84.0" >
 	<field name="num_string_db" descr="Number of different string sections building the database" access="RO" offset="0x0.0" size="0x0.4" />
-	<field name="trc_ver" descr="Indicates the version of the tracing mechanism.\;See, Section 24.3.4.1, &quot;Timestamp Event Traces&quot;, on \;page 1321\;0x0: VER_0\;0x1: VER_1\;other values are reserved" access="RO" offset="0x0.24" size="0x0.2" />
+	<field name="trc_ver" descr="Indicates the version of the tracing mechanism.\;See, Section 24.3.4.1, &quot;Timestamp Event Traces&quot;, on \;page 1348\;0x0: VER_0\;0x1: VER_1\;other values are reserved" access="RO" offset="0x0.24" size="0x0.2" />
 	<field name="trace_to_memory" descr="When set the device supports logging traces to memory" access="RO" offset="0x0.30" size="0x0.1" />
 	<field name="trace_owner" descr="Write 0x1 to register for tracer ownership, write 0x0 to de-\;register.\;Read value 0x1 indicates tracer ownership is granted" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="num_string_trace" descr="The number of consecutive event_id that should be inter\;preted as a string trace" access="RO" offset="0x4.16" size="0x0.8" />
@@ -1774,7 +1840,7 @@
 </node>
 
 <node name="mvcr_ext" descr="" size="0x18.0" >
-	<field name="sensor_index" descr="Sensors index to access\;Mapping of system sensors to index is system specific, and \;detail can be found in the system specification. 64-127 of \;sensor_index are mapped to the SFP+/QSFP modules \;sequentially (module 0 is mapped to sensor_index 64, mod\;ule 1 to sensor_index 65 and so on)." access="INDEX" offset="0x0.0" size="0x0.7" />
+	<field name="sensor_index" descr="Sensors:\;- 0..max_system_sensors-1 are ambient sensors on the \;system (max_system_sensors from INI)\;- 64..127 are mapped to modules by 1:1 e.g. module 1 is \;index 65" access="INDEX" offset="0x0.0" size="0x0.7" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="voltage_sensor_value" descr="Voltage reading from the sensor. \;Voltage units are 0.01V." access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="current_sensor_value" descr="Current reading from the sensor." access="RO" offset="0x8.0" size="0x0.16" />
@@ -1818,13 +1884,13 @@
 <node name="pbmc_reg_ext" descr="" size="0x6c.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="xoff_refresh" descr="The time before a new pause frame should be sent to \;refresh the pause state. Using the same units as xoff_tim\;er_value above." access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="xoff_timer_value" descr="When device generates a pause frame, it uses this value as \;the pause timer.\;The pause timer is measured in units of pause &quot;quanta&quot;, \;where each unit is equal to 512 bit times." access="RW" offset="0x4.16" size="0x0.16" />
+	<field name="xoff_refresh" descr="The time before a new pause frame should be sent to \;refresh the pause state. Using the same units as xoff_\;timer_value above." access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="xoff_timer_value" descr="When device generates a pause frame, it uses this value \;as the pause timer.\;The pause timer is measured in units of pause &quot;quanta&quot;, \;where each unit is equal to 512 bit times." access="RW" offset="0x4.16" size="0x0.16" />
 	<field name="port_buffer_size" descr="Total packet buffer array available for the port. The sum of \;buffer array allocated to bufferX must not exceed \;port_buffer_size.\;In Spectrum and above- Max supported Headroom buffer \;for port. \;" access="RO" offset="0x8.0" size="0x0.16" />
-	<field name="fullness_threshold" descr="Almost full threshold configuration.\;Percentage of buffer fullness which indicates &quot;almost full&quot; \;occurrence\;Range: 0-100%\;Reserved for Switches." access="RW" offset="0x8.16" size="0x0.7" />
+	<field name="fullness_threshold" descr="Almost full threshold configuration.\;Percentage of buffer fullness which indicates &quot;almost \;full&quot; occurrence\;Range: 0-100%\;Reserved for Switches." access="RW" offset="0x8.16" size="0x0.7" />
 	<field name="buffer" descr="Configuring per-buffer parameters. i=0..9\;" subnode="bufferx_reg_ext" access="RW" high_bound="9" low_bound="0" offset="0xC.0" size="0x50.0" />
-	<field name="shared_headroom_pool" descr="Configuring shared haeadroom pool parameters. Using the \;same layout as in BufferX, for details see Table 1526, \;&quot;bufferX Register Layout,&quot; on page 1859.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_support \;bit)." subnode="uint64" access="RW" offset="0x5C.0" size="0x8.0" />
-	<field name="port_shared_buffer" descr="Configuring port shared buffer parameters. Using the same \;layout as in BufferX, for details see Table 1526, &quot;bufferX \;Register Layout,&quot; on page 1859.\;Not supported in SwitchX and SwitchX-2\;Valid for HCA when pbmc_port_shared_buffer is set in \;PCAM." subnode="uint64" access="RW" offset="0x64.0" size="0x8.0" />
+	<field name="shared_headroom_pool" descr="Configuring shared haeadroom pool parameters. Using \;the same layout as in BufferX, for details see Table 1592, \;&quot;bufferX Register Layout,&quot; on page 1934.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_sup\;port bit)." subnode="uint64" access="RW" offset="0x5C.0" size="0x8.0" />
+	<field name="port_shared_buffer" descr="Configuring port shared buffer parameters. Using the \;same layout as in BufferX, for details see Table 1592, \;&quot;bufferX Register Layout,&quot; on page 1934.\;Not supported in SwitchX and SwitchX-2\;Valid for HCA when pbmc_port_shared_buffer is set in \;PCAM." subnode="uint64" access="RW" offset="0x64.0" size="0x8.0" />
 </node>
 
 <node name="pbsr_reg_ext" descr="" size="0x64.0" >
@@ -1834,15 +1900,15 @@
 	<field name="clear_wm_buff_mask" descr="Each bit represents a stat_buffer\;per bit:\;0: do not clear watermark\;1: clear watermark\;Reserved when clear_wm = 1" access="OP" offset="0x4.0" size="0x0.10" />
 	<field name="used_shared_headroom_buffer" descr="Number of currently used shared headroom buffer cells." access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="clear_wm" descr="Clear watermarks for all PGs" access="OP" offset="0x8.31" size="0x0.1" />
-	<field name="stat_buffer" descr="status per-buffer parameters. i=0..9\;" subnode="stat_bufferx_reg_ext" access="RW" high_bound="9" low_bound="0" offset="0xC.0" size="0x50.0" />
-	<field name="stat_shared_headroom_pool" descr="status of shared haeadroom pool parameters. Using the \;same layout as in stat_BufferX, for details see Table 1543, \;&quot;stat_bufferX Register Layout,&quot; on page 1870.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_support \;bit)." subnode="stat_bufferx_reg_ext" access="RW" offset="0x5C.0" size="0x8.0" />
+	<field name="stat_buffer" descr="status per-buffer parameters. i=0..9\;" subnode="stat_bufferx_reg_ext" access="RO" high_bound="9" low_bound="0" offset="0xC.0" size="0x50.0" />
+	<field name="stat_shared_headroom_pool" descr="status of shared headroom pool parameters. Using the \;same layout as in stat_BufferX, for details see \;Table 1611, &quot;stat_bufferX Register Layout,&quot; on \;page 1947.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_sup\;port bit)." subnode="stat_bufferx_reg_ext" access="RO" offset="0x5C.0" size="0x8.0" />
 </node>
 
 <node name="pcam_reg_ext" descr="" size="0x50.0" >
 	<field name="access_reg_group" descr="Access Register ID groups\;0: RegID_0x5000_to_0x507F\;Values 1-255 are Reserved" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="feature_group" descr="Feature list mask index: \;0: enhanced_features \;Values 1 - 255 are Reserved" access="INDEX" enum="enhanced_features=0x0" offset="0x0.16" size="0x0.8" />
 	<field name="port_access_reg_cap_mask" descr="Supported port&apos;s access register bitmaks. Based on \;access_reg_group index.\;When bit is set , The register is supported in the device. \;When access_reg_group == 0 :\;Bit_0: 0x5000 \;Bit_1: 0x5001 (PCAP)\;Bit_2: 0x5002 (PMLP)\;Bit_3: 0x5003 (PMTU)\;Bit_4: 0x5004 (PTYS)\;.\;.\;Bit_127: 0x507F (PCAM)\;" access="RO" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
-	<field name="feature_cap_mask" descr="Supported port&apos;s enhanced features. Based on feature_group index.\;When bit is set, The feature is supported in the device: \;Bit 0: PPCNT_counter_group_Phy_statistical_counter_group \;Bit 1 - PPCNT_counter_group_Discard_counter_group\;Bit 9: PFCC - support of stall mask and global rx,tx mask. \;Bit 10: PMCR - support of tx_disable override.\;Bit 11: PPCNT_counter_group - IB Extended port counter group\;Bit 12: PPCNT_Extended_Ethernet_group - tx packet size histograms\;Bit 13: PTYS_extended_Ethernet_support\;Bit 14: PMAOS_reset_toggle_support\;Bit 15: Set_Module_low_power_supported \;Bit 16: Module_power_optimization_is_supported_in_PPSC\;Bit 17: Support_of_IB_force_state_machine_in_PTYS - (an_disable)\;Bit 18: PPCNT_Extended_Ethernet_group_icrc_counter\;Bit 19: cm2_en_is_supported_in_PCAP\;Bit 20: time_tolink_up_is_supported_in_PDDR\;Bit 21: gearbox_die_num_field_is_supported_in_PMDR\;Bit 22: force_entropy_entropy_calc_entropy_gre_calc - and capability bits are supported \;in PCMR\;Bit 23: FEC_override_support_for_50G_per_lane_is_supported_in_PPLM\;Bit 25: PTYS_allow_both_extended_and_legacy_protocol_masks\;Bit 26: PPCNT_eth_per_tc_cong_group_supported\;Bit 27: pnat_sup_host - the device supports pnat = 2 (host) when set to &apos;1&apos;\;Bit 28: ppcnt_no_buffer_discard_uc - this counter is supported in PPCNT when set to &apos;1&apos;\;Bit 29: pbmc_port_shared_buffer - supported in PBMC.\;Bit 30: PLR_max_retry_window_support - PPCNT group 0x22 max retry per window\;\;Bit 32: PDDR_ext_eth_proto_support\;Bit 40: PAOS - support of admin_status opcode 5: &quot;up_lowest_rate&quot;\;Bit 41: PMAOS - support of &quot;opertional_notifcation&quot; field\;Bit 42: PRBS_polarity_support - support of polarity bits in PPTT and PPRT \;Bit 43: PDDR_register_is_supported\;Bit 44: pfcc_buffer_onwership - PFCC buffer ownership is supported. \;Bit 45: force_down - supported in PAOS reg.\;Bit 46: pmlp_lane_mapping_off - Support of m_lane_m field in PMLP. \;Bit 51: ppcnt_symobl_ber\;Bit 52: shp_pbmc_pbsr_support\;\;Bit 54: ppcnt_effective_error_counter\;Bit 55: FEC_override_support_for_100G_per_lane_is_supported_in_PPLM\;\;Bit 57: PMECR_option_to_not_generate_events_upon_PMLP_set\;Bit 64: Local_port_MSB - bits [9:8] supported\;Bit 65: PDDR_moule_latched_info_page_supported\;Bit 66: PDDR_module_info_ext_supported\;Bit 67: PMDR.pll_index_supported\;Bit 68: PPCNT.raw_ber_per_lane_supported\;Bit 69: PMMP.sticky_bit_supported\;Bit 70: SLTP_tx_policy_supported\;Bit 71: pmcr_capability_bits_supported\;Bit 72: pmtu_max_admin_mtu_supported\;Bit 73: PPCNT_grp_profile_supported\;" access="RO" enum="PPCNT_counter_group_Phy_statistical_counter_group=0x1,PFCC=0x200,PMCR=0x400,PPCNT_counter_group=0x800,PPCNT_Extended_Ethernet_group=0x1000,PTYS_extended_Ethernet_support=0x2000,PMAOS_reset_toggle_support=0x4000,Set_Module_low_power_supported=0x8000,Module_power_optimization_is_supported_in_PPSC=0x10000,Support_of_IB_force_state_machine_in_PTYS=0x20000,PPCNT_Extended_Ethernet_group_icrc_counter=0x40000,cm2_en_is_supported_in_PCAP=0x80000,time_tolink_up_is_supported_in_PDDR=0x100000,gearbox_die_num_field_is_supported_in_PMDR=0x200000,force_entropy_entropy_calc_entropy_gre_calc=0x400000,FEC_override_support_for_50G_per_lane_is_supported_in_PPLM=0x800000,PTYS_allow_both_extended_and_legacy_protocol_masks=0x2000000,PPCNT_eth_per_tc_cong_group_supported=0x4000000,pnat_sup_host=0x8000000,ppcnt_no_buffer_discard_uc=0x10000000,pbmc_port_shared_buffer=0x20000000,PLR_max_retry_window_support=0x40000000,PDDR_ext_eth_proto_support=0x1,PAOS=0x100,PMAOS=0x200,PRBS_polarity_support=0x400,PDDR_register_is_supported=0x800,pfcc_buffer_onwership=0x1000,force_down=0x2000,pmlp_lane_mapping_off=0x4000,ppcnt_symobl_ber=0x80000,shp_pbmc_pbsr_support=0x100000,ppcnt_effective_error_counter=0x400000,FEC_override_support_for_100G_per_lane_is_supported_in_PPLM=0x800000,PMECR_option_to_not_generate_events_upon_PMLP_set=0x2000000,Local_port_MSB=0x1,PDDR_moule_latched_info_page_supported=0x2,PDDR_module_info_ext_supported=0x4,PMDR_pll_index_supported=0x8,PPCNT_raw_ber_per_lane_supported=0x10,PMMP_sticky_bit_supported=0x20,SLTP_tx_policy_supported=0x40,pmcr_capability_bits_supported=0x80,pmtu_max_admin_mtu_supported=0x100,PPCNT_grp_profile_supported=0x200" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
+	<field name="feature_cap_mask" descr="Supported port&apos;s enhanced features. Based on feature_group index.\;When bit is set, The feature is supported in the device: \;Bit 0: PPCNT_counter_group_Phy_statistical_counter_group \;Bit 1 - PPCNT_counter_group_Discard_counter_group\;Bit 9: PFCC - support of stall mask and global rx,tx mask. \;Bit 10: PMCR - support of tx_disable override.\;Bit 11: PPCNT_counter_group - IB Extended port counter group\;Bit 12: PPCNT_Extended_Ethernet_group - tx packet size histograms\;Bit 13: PTYS_extended_Ethernet_support\;Bit 14: PMAOS_reset_toggle_support\;Bit 15: Set_Module_low_power_supported \;Bit 16: Module_power_optimization_is_supported_in_PPSC\;Bit 17: Support_of_IB_force_state_machine_in_PTYS - (an_disable)\;Bit 18: PPCNT_Extended_Ethernet_group_icrc_counter\;Bit 19: cm2_en_is_supported_in_PCAP\;Bit 20: time_tolink_up_is_supported_in_PDDR\;Bit 21: gearbox_die_num_field_is_supported_in_PMDR\;Bit 22: force_entropy_entropy_calc_entropy_gre_calc - and capability bits are supported \;in PCMR\;Bit 23: FEC_override_support_for_50G_per_lane_is_supported_in_PPLM\;Bit 25: PTYS_allow_both_extended_and_legacy_protocol_masks\;Bit 26: PPCNT_eth_per_tc_cong_group_supported\;Bit 27: pnat_sup_host - the device supports pnat = 2 (host) when set to &apos;1&apos;\;Bit 28: ppcnt_no_buffer_discard_uc - this counter is supported in PPCNT when set to &apos;1&apos;\;Bit 29: pbmc_port_shared_buffer - supported in PBMC.\;Bit 30: PLR_max_retry_window_support - PPCNT group 0x22 max retry per window\;\;Bit 32: PDDR_ext_eth_proto_support\;Bit 40: PAOS - support of admin_status opcode 5: &quot;up_lowest_rate&quot;\;Bit 41: PMAOS - support of &quot;opertional_notifcation&quot; field\;Bit 42: PRBS_polarity_support - support of polarity bits in PPTT and PPRT \;Bit 43: PDDR_register_is_supported\;Bit 44: pfcc_buffer_onwership - PFCC buffer ownership is supported. \;Bit 45: force_down - supported in PAOS reg.\;Bit 46: pmlp_lane_mapping_off - Support of m_lane_m field in PMLP. \;Bit 51: ppcnt_symobl_ber\;Bit 52: shp_pbmc_pbsr_support\;\;Bit 54: ppcnt_effective_error_counter\;Bit 55: FEC_override_support_for_100G_per_lane_is_supported_in_PPLM\;\;Bit 57: PMECR_option_to_not_generate_events_upon_PMLP_set\;Bit 64: Local_port_MSB - bits [9:8] supported\;Bit 65: PDDR_moule_latched_info_page_supported\;Bit 66: PDDR_module_info_ext_supported\;Bit 67: PMDR.pll_index_supported\;Bit 68: PPCNT.raw_ber_per_lane_supported\;Bit 69: PMMP.sticky_bit_supported\;Bit 70: SLTP_tx_policy_supported\;Bit 71: pmcr_capability_bits_supported\;Bit 72: pmtu_max_admin_mtu_supported\;Bit 73: PPCNT_grp_profile_supported\;Bit 74: PPCNT_InfiniBand_General_Counters.port_rcv_data_qword\;Bit 75: PPCNT_InfiniBand_General_Counters.port_xmit_data_qword\;Bit 76: PPCNT_InfiniBand_General_Counters.rq_general_error\;Bit 77: PPCNT.physical_layer_counters_RS_FEC_8_lanes_supported\;Bit 78: PMMP.app0_disabled_supported\;" access="RO" enum="PPCNT_counter_group_Phy_statistical_counter_group=0x1,PFCC=0x200,PMCR=0x400,PPCNT_counter_group=0x800,PPCNT_Extended_Ethernet_group=0x1000,PTYS_extended_Ethernet_support=0x2000,PMAOS_reset_toggle_support=0x4000,Set_Module_low_power_supported=0x8000,Module_power_optimization_is_supported_in_PPSC=0x10000,Support_of_IB_force_state_machine_in_PTYS=0x20000,PPCNT_Extended_Ethernet_group_icrc_counter=0x40000,cm2_en_is_supported_in_PCAP=0x80000,time_tolink_up_is_supported_in_PDDR=0x100000,gearbox_die_num_field_is_supported_in_PMDR=0x200000,force_entropy_entropy_calc_entropy_gre_calc=0x400000,FEC_override_support_for_50G_per_lane_is_supported_in_PPLM=0x800000,PTYS_allow_both_extended_and_legacy_protocol_masks=0x2000000,PPCNT_eth_per_tc_cong_group_supported=0x4000000,pnat_sup_host=0x8000000,ppcnt_no_buffer_discard_uc=0x10000000,pbmc_port_shared_buffer=0x20000000,PLR_max_retry_window_support=0x40000000,PDDR_ext_eth_proto_support=0x1,PAOS=0x100,PMAOS=0x200,PRBS_polarity_support=0x400,PDDR_register_is_supported=0x800,pfcc_buffer_onwership=0x1000,force_down=0x2000,pmlp_lane_mapping_off=0x4000,ppcnt_symobl_ber=0x80000,shp_pbmc_pbsr_support=0x100000,ppcnt_effective_error_counter=0x400000,FEC_override_support_for_100G_per_lane_is_supported_in_PPLM=0x800000,PMECR_option_to_not_generate_events_upon_PMLP_set=0x2000000,Local_port_MSB=0x1,PDDR_moule_latched_info_page_supported=0x2,PDDR_module_info_ext_supported=0x4,PMDR_pll_index_supported=0x8,PPCNT_raw_ber_per_lane_supported=0x10,PMMP_sticky_bit_supported=0x20,SLTP_tx_policy_supported=0x40,pmcr_capability_bits_supported=0x80,pmtu_max_admin_mtu_supported=0x100,PPCNT_grp_profile_supported=0x200,PPCNT_InfiniBand_General_Counters_port_rcv_data_qword=0x400,PPCNT_InfiniBand_General_Counters_port_xmit_data_qword=0x800,PPCNT_InfiniBand_General_Counters_rq_general_error=0x1000,PPCNT_physical_layer_counters_RS_FEC_8_lanes_supported=0x2000,PMMP_app0_disabled_supported=0x4000" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
 </node>
 
 <node name="pcap_reg_ext" descr="" size="0x14.0" >
@@ -1913,22 +1979,22 @@
 <node name="pcmr_reg_ext" descr="" size="0xc.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="fcs_cap" descr="Specifies the check enable/disable capabilities of the local port. A bit \;set to 1 for affirmation of supported enable/disable capability: \;FCS check disable/enable capability" access="RO" offset="0x4.1" size="0x0.1" />
-	<field name="rx_ts_over_crc_cap" descr="Specifies the ingress timestamps enable/disable capabilities of the \;local port. A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.13" size="0x0.1" />
-	<field name="rx_fcs_drop_cap" descr="Specifies the ingress drop enable/disable capabilities of the local \;port. A bit set to 1 for affirmation of supported enable/disable capa\;bility:" access="RO" offset="0x4.14" size="0x0.1" />
-	<field name="tx_fcs_recalc_cap" descr="Specifies the egress drop enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capability:" access="RO" offset="0x4.15" size="0x0.1" />
-	<field name="tx_ts_over_crc_cap" descr="Specifies the egress timestamps enable/disable capabilities of the \;local port. A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.16" size="0x0.1" />
-	<field name="entropy_gre_calc_cap" descr="Specifies the egress GRE tunnel protocol entropy calculation enable/\;disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capability:" access="RO" offset="0x4.29" size="0x0.1" />
-	<field name="entropy_calc_cap" descr="Specifies the egress tunnel protocol entropy calculation enable/dis\;able capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capability:" access="RO" offset="0x4.30" size="0x0.1" />
-	<field name="force_entropy_cap" descr="Specifies the egress tunnel protocol entropy calculation force capa\;bilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capability:" access="RO" offset="0x4.31" size="0x0.1" />
+	<field name="fcs_cap" descr="Specifies the check enable/disable capabilities of the local \;port. A bit set to 1 for affirmation of supported enable/dis\;able capability: \;FCS check disable/enable capability" access="RO" offset="0x4.1" size="0x0.1" />
+	<field name="rx_ts_over_crc_cap" descr="Specifies the ingress timestamps enable/disable capabilities \;of the local port. A bit set to 1 for affirmation of supported \;enable/disable capability:" access="RO" offset="0x4.13" size="0x0.1" />
+	<field name="rx_fcs_drop_cap" descr="Specifies the ingress drop enable/disable capabilities of the \;local port. A bit set to 1 for affirmation of supported enable/\;disable capability:" access="RO" offset="0x4.14" size="0x0.1" />
+	<field name="tx_fcs_recalc_cap" descr="Specifies the egress drop enable/disable capabilities of the \;local port. A bit set to 1 for affirmation of supported enable/\;disable capability:" access="RO" offset="0x4.15" size="0x0.1" />
+	<field name="tx_ts_over_crc_cap" descr="Specifies the egress timestamps enable/disable capabilities \;of the local port. A bit set to 1 for affirmation of supported \;enable/disable capability:" access="RO" offset="0x4.16" size="0x0.1" />
+	<field name="entropy_gre_calc_cap" descr="Specifies the egress GRE tunnel protocol entropy calculation \;enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.29" size="0x0.1" />
+	<field name="entropy_calc_cap" descr="Specifies the egress tunnel protocol entropy calculation \;enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.30" size="0x0.1" />
+	<field name="force_entropy_cap" descr="Specifies the egress tunnel protocol entropy calculation \;force capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.31" size="0x0.1" />
 	<field name="fcs_chk" descr="FCS check\;Values:\;0: disable check. \;1: perform check\;Note: when disabling a check, it will also affects the relevant count\;ers." access="RW" offset="0x8.1" size="0x0.1" />
-	<field name="rx_ts_over_crc" descr="RX TimeStamp over FCS\;0: no TS over FCS\;1: TS over FCS" access="RW" offset="0x8.13" size="0x0.1" />
-	<field name="rx_fcs_drop" descr="RX FCS drop control:\;0: ingress port will drop a packet with bad FCS (Default)\;1: ingress port will not drop a packet with bad FCS\;NOTE: All FCS counters (PPCNT) are valid for both drop modes.\;NOTE: Reserved when PCMR.fcs_cap=1 &amp; PCMR.fcs_chk=0" access="RW" offset="0x8.14" size="0x0.1" />
-	<field name="tx_fcs_recalc" descr="TX FCS drop control:\;0: egress port will recalculate and overwrite FCS value (Default) \;1: egress port will not overwrite FCS value \;NOTE: when this bit is set, any modification of the packet will result in \;a bad FCS." access="RW" offset="0x8.15" size="0x0.1" />
+	<field name="rx_ts_over_crc" descr="RX TimeStamp over FCS\;0: no TS over FCS\;1: TS over FCS\;Note: \;1. If this filed is changed while traffic is passing then some \;packets may be dropped due to incorrect FCS.\;2. Default value is (1) - TS over FCS" access="RW" offset="0x8.13" size="0x0.1" />
+	<field name="rx_fcs_drop" descr="RX FCS drop control:\;0: ingress port will drop a packet with bad FCS (Default)\;1: ingress port will not drop a packet with bad FCS\;NOTE: All FCS counters (PPCNT) are valid for both drop \;modes.\;NOTE: Reserved when PCMR.fcs_cap=1 &amp; PCMR.fcs_chk=0" access="RW" offset="0x8.14" size="0x0.1" />
+	<field name="tx_fcs_recalc" descr="TX FCS recalculation:\;0: egress port will recalculate and overwrite FCS value \;(Default) \;1: egress port will not overwrite FCS value \;NOTE: when this bit is set, any modification of the packet will \;result in a bad FCS." access="RW" offset="0x8.15" size="0x0.1" />
 	<field name="tx_ts_over_crc" descr="TX TimeStamp over FCS\;0: no TS over FCS\;1: TS over FCS\;Reserved when tx_fcs_recalc is set" access="RW" offset="0x8.16" size="0x0.1" />
-	<field name="entropy_gre_calc" descr="0: DISABLE - entropy calculation is disabled for GRE tunneling proto\;col.\;1: ENABLE - entropy calculation is enabled for GRE tunneling proto\;col, if entropy_calc is enabled as well. valid only if force_entropy is \;activated." access="RW" offset="0x8.29" size="0x0.1" />
-	<field name="entropy_calc" descr="0: DISABLE - entropy calculation is disabled for all supported tunnel\;ing protocols.\;1: ENABLE - entropy calculation is enabled for all supported tunnel\;ing protocols. GRE also depends on the entropy_gre_calc valid only if \;force_entropy is activated." access="RW" offset="0x8.30" size="0x0.1" />
-	<field name="force_entropy" descr="0: DEFAULT - use device defaults for tunnel entropy calculation. This \;mode should be used if entropy calculation requirement is unknown.\;1: FORCE - force the entropy calculation according to entropy_calc \;and entropy_gre_calc." access="RW" offset="0x8.31" size="0x0.1" />
+	<field name="entropy_gre_calc" descr="0: DISABLE - entropy calculation is disabled for GRE tunnel\;ing protocol.\;1: ENABLE - entropy calculation is enabled for GRE tunnel\;ing protocol, if entropy_calc is enabled as well. valid only if \;force_entropy is activated." access="RW" offset="0x8.29" size="0x0.1" />
+	<field name="entropy_calc" descr="0: DISABLE - entropy calculation is disabled for all sup\;ported tunneling protocols.\;1: ENABLE - entropy calculation is enabled for all supported \;tunneling protocols. GRE also depends on the entropy_gre_\;calc valid only if force_entropy is activated." access="RW" offset="0x8.30" size="0x0.1" />
+	<field name="force_entropy" descr="0: DEFAULT - use device defaults for tunnel entropy calcula\;tion. This mode should be used if entropy calculation \;requirement is unknown.\;1: FORCE - force the entropy calculation according to entro\;py_calc and entropy_gre_calc." access="RW" offset="0x8.31" size="0x0.1" />
 </node>
 
 <node name="pddr_advanced_opcode_ext" descr="" size="0x4.0" >
@@ -1990,7 +2056,7 @@
 	<field name="pwr_governor_err_sv" descr="" access="RO" offset="0x18.17" size="0x0.1" />
 	<field name="uc_crspace_timeout" descr="uC crspace timeout event. See uc_scrspace_timeout_cl and \;uc_scrspace_timeout_lane for location of last event" access="RO" offset="0x18.24" size="0x0.1" />
 	<field name="uc_stack_overflow" descr="uC stack overflow event. See uc_stack_overflow_cl and \;uc_stack_overflow_lane for location of last event" access="RO" offset="0x18.25" size="0x0.1" />
-	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to off\;set 00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the \;mask is set, the event will be cleared" access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to offset \;00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the mask \;is set, the event will be cleared" access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="main_irisc_address" descr="" access="RO" offset="0x40.0" size="0x4.0" />
 	<field name="main_irisc_ip" descr="" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="tile_irisc_address" descr="" access="RO" offset="0x48.0" size="0x4.0" />
@@ -2074,8 +2140,8 @@
 	<field name="fast_link_up_status" descr="Indicates if fast link-up was performed in the link: \;0: Unknown\;1: Fast Link-UP was performed. \;2: Regular link-up flow was performed due to changes in \;cable\;3: Regular link-up flow was performed due to changes in pro\;tocol (speed or FEC)\;4: Regular link-up flow was performed due to a non-fastboot\;able FW version (PCNR is not supported)\;5: Regular link-up performed due to MLPN flow\;6: Regular link-up performed due to PCNR.tuning_override \;configuration while port was in &quot;down&quot; state.\;7: Invalid fastboot data struct (0xCAFECAFE magic value is \;not present. For example, SW reset was executed before fin\;ish saving data during PCNR flow)\;8 - fast link-up timeout\;9 - fast link-up flaps issue\;10 - fast link-up failed during link-up" access="RO" offset="0x8.0" size="0x0.4" />
 	<field name="time_to_link_up_phy_up_to_active" descr="Time in msec to link up from phy up until active state.\;While the phy manager did not reach active state the timer \;will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode." access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="time_to_link_up_sd_to_phy_up" descr="Time in msec to link up from signal detect until phy up state.\;While the phy manager did not reach phy up state the timer \;will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode." access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="time_to_link_up_disable_to_sd" descr="Time in msec to link up from disable until signal detect state.\;While the phy manager did not reach signal detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return \;the same value." access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="time_to_link_up_disable_to_pd" descr="Time in msec to link up from disable until protocol detect \;state.\;While the phy manager did not reach protocol detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return \;the same value." access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="time_to_link_up_disable_to_sd" descr="Time in msec to link up from disable until signal detect state.\;While the phy manager did not reach signal detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return the \;same value." access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="time_to_link_up_disable_to_pd" descr="Time in msec to link up from disable until protocol detect \;state.\;While the phy manager did not reach protocol detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return the \;same value." access="RO" offset="0x18.0" size="0x4.0" />
 </node>
 
 <node name="pddr_mng_debug_page_ext" descr="" size="0xf8.0" >
@@ -2104,6 +2170,8 @@
 	<field name="dpsm_apply_state_lane5" descr="DPSM state that was applied in per lane\;\;" access="RO" offset="0xC.20" size="0x0.4" />
 	<field name="dpsm_apply_state_lane6" descr="DPSM state that was applied in per lane\;\;" access="RO" offset="0xC.24" size="0x0.4" />
 	<field name="dpsm_apply_state_lane7" descr="DPSM state that was applied in per lane\;\;" access="RO" offset="0xC.28" size="0x0.4" />
+	<field name="timer_left_for_high_pwrt_transition" descr="FW timer left for transition from DP state of DPDeactivated \;state to DPActivated" access="RO" offset="0x10.0" size="0x0.8" />
+	<field name="timer_left_for_dp_active_transition" descr="FW timer left for transition from module state of low power to \;high power" access="RO" offset="0x10.16" size="0x0.8" />
 </node>
 
 <node name="pddr_module_info_ext" descr="" size="0xf8.0" >
@@ -2113,7 +2181,7 @@
 	<field name="cable_technology" descr="QSFP: \;Byte 147 per SFF-8636.\;\;SFP:\;SFP+ Cable Technology: \;byte8 per SFF-8472:\;Bit 3 - Active Cable\;Bit 2 - Passive Cable\;\;CMIS based (QSFP-DD / OSFP/ SFP-DD):\;Byte 212" access="RW" offset="0x0.24" size="0x0.8" />
 	<field name="cable_power_class" descr="Module maximum power consumption for SFP/QSFP:\;0: Power_Class_0 - (1.0 W max)\;1: Power_Class_1 - (1.5 W max)\;2: Power_Class_2 - (2.0 W max)\;3: Power_Class_3 - (2.5 W max)\;4: Power_Class_4 - (3.5 W max)\;5: Power_Class_5 - (4.0 W max)\;6: Power_Class_6 - (4.5 W max)\;7: Power_Class_7 - (5.0 W max)\;8: Power_Class_8 - (power from max_power field)\;\;Module maximum power consumption for SFP-DD:\;0: Power_Class_0 - (0.5 W max)\;1: Power_Class_1 - (1.0 W max)\;2: Power_Class_2 - (1.5 W max)\;3: Power_Class_3 - (2.0 W max)\;4: Power_Class_4 - (3.5 W max)\;5: Power_Class_5 - (5.0 W max)\;6: reserved\;7: reserved\;8: Power_Class_8 - (power from max_power field)\;\;Module maximum power consumption for QSFP-DD/OSFP:\;1 - Power_Class_1 - (1.5 W max)\;2 - Power_Class_2 - (3.5 W max)\;3 - Power_Class_3 - (7.0 W max)\;4 - Power_Class_4 - (8.0 W max)\;5 - Power_Class_5 - (10 W max)\;6 - Power_Class_6 - (12 W max)\;7 - Power_Class_7 - (14 W max)\;8 - Power_Class_8 - (power from max_power field)" access="RO" offset="0x4.0" size="0x0.8" />
 	<field name="cable_identifier" descr="0: QSFP28\;1: QSFP_Plus\;2: SFP28_or_SFP_Plus\;3: QSA - (QSFP-&gt;SFP)\;4: Backplane\;5: SFP_DD\;6: QSFP_DD\;7: QSFP_CMIS\;8: OSFP\;9: C2C\;10: DSFP\;11: QSFP_Split_Cable\;\;identifiers that are CMIS compliant are: 5,6,7,8,10" access="RO" offset="0x4.8" size="0x0.8" />
-	<field name="cable_length" descr="Cable length in 1m units.\;\;For CMIS modules:\;bits 6:7 represent cable_length_multiplier for calculating \;cable length\;00 - 0.1 multiplier (0.1 to 6.3m)\;01- 1 multiplier (1 to 63m)\;10 - 10 multiplier (10 to 630m)\;11 - 100 multiplier (100 to 6300m)\;\;bits 0:5 represent cable_length_value for calculating cable \;length.\;length is calculated with cable_length_value * \;cable_length_multiplier" access="RO" offset="0x4.16" size="0x0.8" />
+	<field name="cable_length" descr="Cable length in 1m units.\;\;For CMIS modules:\;bits 6:7 represent cable_length_multiplier for calculating \;cable length\;00 - 0.1 multiplier (0.1 to 6.3m)\;01- 1 multiplier (1 to 63m)\;10 - 10 multiplier (10 to 630m)\;11 - 100 multiplier (100 to 6300m)\;\;bits 0:5 represent cable_length_value for calculating cable \;length.\;length is calculated with cable_length_value * cable_length_\;multiplier" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="cable_vendor" descr="Cable vendor:\;0: Other\;1: Mellanox\;2: Known_OUI\;3: NVIDIA\;" access="RO" enum="Other=0x0,Mellanox=0x1,Known_OUI=0x2,NVIDIA=0x3" offset="0x4.24" size="0x0.4" />
 	<field name="cable_type" descr="Cable/module type:\;0: Unidentified\;1: Active_cable - (active copper / optics)\;2: Optical_Module - (separated)\;3: Passive_copper_cable\;4: Cable_unplugged\;5: Twisted_pair\;" access="RO" enum="Unidentified=0x0,Active_cable=0x1,Optical_Module=0x2,Passive_copper_cable=0x3,Cable_unplugged=0x4,Twisted_pair=0x5" offset="0x4.28" size="0x0.4" />
 	<field name="cable_tx_equalization" descr="" access="RO" offset="0x8.0" size="0x0.8" />
@@ -2130,7 +2198,7 @@
 	<field name="rx_cdr_cap" descr="0 - No CDR\;1 - Build-in CDR with on/off control \;2 - Build-in CDR without on/off control" access="RO" offset="0x10.20" size="0x0.4" />
 	<field name="cable_rx_post_emphasis" descr="Valid only for CMIS (QSFP-DD/ SFP-DD/ OSFP)\;Rx post-emphasis." access="RO" offset="0x10.24" size="0x0.8" />
 	<field name="vendor_name" descr="ASCII Vendor name left-aligned and padded on the right with\;ASCII spaces (20h)" access="RO" high_bound="3" low_bound="0" offset="0x14.0" size="0x10.0" />
-	<field name="vendor_pn" descr="Vendor Part Number left-aligned and padded on the right \;with ASCII spaces (20h)" access="RO" high_bound="3" low_bound="0" offset="0x24.0" size="0x10.0" />
+	<field name="vendor_pn" descr="Vendor Part Number left-aligned and padded on the right with \;ASCII spaces (20h)" access="RO" high_bound="3" low_bound="0" offset="0x24.0" size="0x10.0" />
 	<field name="vendor_rev" descr="ASCII Vendor revision aligned to right padded with 0h on the \;left" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="fw_version" descr="If information is not available by the module: set to 0" access="RO" offset="0x38.0" size="0x4.0" />
 	<field name="vendor_sn" descr="Vendor Serial Number" access="RO" high_bound="3" low_bound="0" offset="0x3C.0" size="0x10.0" />
@@ -2172,6 +2240,7 @@
 	<field name="tx_bias_high_th" descr="Alarm high TX Bias current threshold in 2 uA." access="RO" offset="0x90.16" size="0x0.16" />
 	<field name="wavelength" descr="Nominal laser wavelength in nm" access="RO" offset="0x94.0" size="0x0.16" />
 	<field name="smf_length" descr="SMF link length\;SFP per byte 14,15.\;QSFP per byte 142\;for CMIS based modules, per byte 132\;\;bit 9:8 - 00 length base in 1 km units\;bit 9:8 - 01 length base in 100m units\;bits 7:0 - length base" access="RO" offset="0x94.16" size="0x0.10" />
+	<field name="rx_output_valid_cap" descr="when set, indicates rx_output_valid is supported by the mod\;ule" access="RW" offset="0x94.26" size="0x0.1" />
 	<field name="did_cap" descr="set in case of Linear Direct Drive module" access="RO" offset="0x94.27" size="0x0.1" />
 	<field name="rx_power_type" descr="rx power measurement type\;0: OMA\;1: Average_power" access="RO" enum="OMA=0x0,Average_power=0x1" offset="0x94.28" size="0x0.1" />
 	<field name="module_st" descr="Valid for CMIS modules only.\;Module state:\;0: reserved\;1: LowPwr_state\;2: PwrUp_state\;3: Ready_state\;4: PwrDn_state\;5: Fault_state" access="RO" enum="reserved=0x0,LowPwr_state=0x1,PwrUp_state=0x2,Ready_state=0x3,PwrDn_state=0x4,Fault_state=0x5" offset="0x94.29" size="0x0.3" />
@@ -2202,14 +2271,13 @@
 	<field name="vendor_oui" descr="vendor oui" access="RO" offset="0xB8.0" size="0x0.24" />
 	<field name="connector_type" descr="connector type based on SFF-8024" access="RO" offset="0xB8.24" size="0x0.8" />
 	<field name="rx_output_valid" descr="Rx output status indication per lane" access="RO" offset="0xBC.0" size="0x0.8" />
-	<field name="rx_input_valid" descr="Rx input status indication per lane" access="RO" offset="0xBC.8" size="0x0.8" />
 	<field name="tx_input_freq_sync" descr="Defines which Tx input lanes must be frequency synchronous.\;0: Tx_input_lanes_1_8\;1: Tx_input_lanes_1_4_and_5-8\;2: Tx_input_lanes_1_2_and_3_4_and_5_6_and_7_8\;3: Lanes_may_be_asynchronous_in_frequency" access="RO" enum="Tx_input_lanes_1_8=0x0,Tx_input_lanes_1_4_and_5=0x1,Tx_input_lanes_1_2_and_3_4_and_5_6_and_7_8=0x2,Lanes_may_be_asynchronous_in_frequency=0x3" offset="0xBC.16" size="0x0.2" />
 	<field name="error_code" descr="Relevant for CMIS modules only\;Error Code response for ConrolSet configuration of DataPath.\;0x0: ConfigUndefined\;0x1: ConfigSuccess\;0x2: ConfigRejected\;0x3: ConfigRejectedInvalidAppSel\;0x4: ConfigRejectedInvalidDataPath\;0x5: ConfigRejectedInvalidSI\;0x6: ConfigRejectedLanesInUse\;0x7: ConfigRejectedPartialDataPath\;0xC: ConfigInProgress" access="RO" enum="ConfigUndefined=0x0,ConfigSuccess=0x1,ConfigRejected=0x2,ConfigRejectedInvalidAppSel=0x3,ConfigRejectedInvalidDataPath=0x4,ConfigRejectedInvalidSI=0x5,ConfigRejectedLanesInUse=0x6,ConfigRejectedPartialDataPath=0x7,ConfigInProgress=0xc" offset="0xC0.0" size="0x0.4" />
 	<field name="max_fiber_length" descr="Maximum length of allowed fiber in meters" access="RO" offset="0xC0.16" size="0x0.16" />
 </node>
 
 <node name="pddr_monitor_opcode_ext" descr="" size="0x4.0" >
-	<field name="monitor_opcode" descr="Status opcode: \;\;PHY FW indication (0 - 1023):\;0 - No issue observed\;1 - Port is close by command (see PAOS).\;2,3,4,38,39 - AN failure \;5,6,7,8 - Link training failure. \;9,10,11,12,13 - Logical mismatch between link partners\;14 - Remote fault received\;15,42,17 - Bad signal integrity \;16,24-32 - Cable compliance code mismatch (protocol mis\;match between cable and port) \;23,22,19,18- Internal error\;34,35 - Speed degradation\;56 - module_lanes_frequency_not_synced\;128 - Troubleshooting in process\;1023- Info not available\;\;MNG FW issues (1024 - 2047):\;1024 - Cable is unplugged\;1025 - Long Range for non Mellanox cable/module .\;1026 - Bus stuck (I2C Data or clock shorted) \;1027 - Bad/unsupported EEPROM \;1028 - Part number list\;1029 - Unsupported cable.\;1030 - Module temperature shutdown\;1031 - Shorted cable\;1032 - Power budget exceeded\;1033 - Management forced down the port\;1034 - Module is disabled by command\;1036 - Module&apos;s PMD type is not enabled (see PMTPS).\;1040 - pcie system power slot Exceeded\;1042 - Module state machine fault\;1043,1044,1045,1046 - Module&apos;s stamping speed \;degeneration\;1047, 1048 - Modules DataPath FSM fault\;\;Core/Driver (2048 - 3071):" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="monitor_opcode" descr="Status opcode: \;\;PHY FW indication (0 - 1023):\;0 - No issue observed\;1 - Port is close by command (see PAOS).\;2,3,4,38,39 - AN failure \;5,6,7,8 - Link training failure. \;9,10,11,12,13 - Logical mismatch between link partners\;14 - Remote fault received\;15,42,17 - Bad signal integrity \;16,24-32 - Cable compliance code mismatch (protocol mis\;match between cable and port) \;23,22,19,18- Internal error\;34,35 - Speed degradation\;56 - module_lanes_frequency_not_synced\;128 - Troubleshooting in process\;1023- Info not available\;\;MNG FW issues (1024 - 2047):\;1024 - Cable is unplugged\;1025 - Long Range for non Mellanox cable/module .\;1026 - Bus stuck (I2C Data or clock shorted) \;1027 - Bad/unsupported EEPROM \;1028 - Part number list\;1029 - Unsupported cable.\;1030 - Module temperature shutdown\;1031 - Shorted cable\;1032 - Power budget exceeded\;1033 - Management forced down the port\;1034 - Module is disabled by command\;1036 - Module&apos;s PMD type is not enabled (see PMTPS).\;1040 - pcie system power slot Exceeded\;1042 - Module state machine fault\;1043,1044,1045,1046 - Module&apos;s stamping speed \;degeneration\;1047, 1048 - Modules DataPath FSM fault\;\;Core/Driver (2048 - 3071):\;2048 - MPR Violation (Under 64 bytes between two starts)." access="RW" offset="0x0.0" size="0x0.16" />
 </node>
 
 <node name="pddr_operation_info_page_cable_proto_cap_auto_ext" descr="" attr_is_union="1" size="0x4.0" >
@@ -2227,15 +2295,17 @@
 	<field name="ib_phy_fsm_state" descr="FW IB state machine:\;0x0: IB_AN_FSM_DISABLED\;0x1: IB_AN_FSM_INITIALY\;0x2: IB_AN_FSM_RCVR_CFG\;0x3: IB_AN_FSM_CFG_TEST\;0x4: IB_AN_FSM_WAIT_RMT_TEST\;0x5: IB_AN_FSM_WAIT_CFG_ENHANCED\;0x6: IB_AN_FSM_CFG_IDLE\;0x7: IB_AN_FSM_LINK_UP\;0x8: IB_AN_FSM_POLLING\;0x9: IB_AN_FSM_SYNC_CHECK - [Internal]" access="RO" enum="IB_AN_FSM_DISABLED=0x0,IB_AN_FSM_INITIALY=0x1,IB_AN_FSM_RCVR_CFG=0x2,IB_AN_FSM_CFG_TEST=0x3,IB_AN_FSM_WAIT_RMT_TEST=0x4,IB_AN_FSM_WAIT_CFG_ENHANCED=0x5,IB_AN_FSM_CFG_IDLE=0x6,IB_AN_FSM_LINK_UP=0x7,IB_AN_FSM_POLLING=0x8,IB_AN_FSM_SYNC_CHECK=0x9" offset="0x4.8" size="0x0.8" />
 	<field name="eth_an_fsm_state" descr="Ethernet (CL73) Auto-negotiation FSM state:\;0x0: ETH_AN_FSM_ENABLE\;0x1: ETH_AN_FSM_XMIT_DISABLE\;0x2: ETH_AN_FSM_ABILITY_DETECT\;0x3: ETH_AN_FSM_ACK_DETECT\;0x4: ETH_AN_FSM_COMPLETE_ACK\;0x5: ETH_AN_FSM_AN_GOOD_CHECK\;0x6: ETH_AN_FSM_AN_GOOD\;0x7: ETH_AN_FSM_NEXT_PAGE_WAIT\;0x8: ETH_AN_FSM_LINK_STAT_CHECK - [Internal] \;0x9: ETH_AN_FSM_EXTRA_TUNE - [Internal] \;0xa: ETH_AN_FSM_FIX_REVERSALS - [Internal] \;0xb: ETH_AN_FSM_IB_FAIL - [Internal] \;0xc: ETH_AN_FSM_POST_LOCK_TUNE - [Internal] \;\;NDR gen - \;0x0: ETH_AN_FSM_ENABLE\;0x1: ETH_AN_FSM_XMIT_DISABLE\;0x2: ETH_AN_FSM_ABILITY_DETECT\;0x3: ETH_AN_FSM_ACK_DETECT\;0x4: ETH_AN_FSM_COMPLETE_ACK\;0x5: ETH_AN_FSM_AN_GOOD_CHECK\;0x6: ETH_AN_FSM_AN_GOOD\;0x7: ETH_AN_FSM_NEXT_PAGE_WAIT\;0x8: ETH_AN_FSM_FIX_REVERSALS - [Internal] \;0x9: ETH_AN_FSM_SUBFSM_FAIL - [Internal] \;0xa: ETH_AN_FSM_HCD_TX_TAPS - [Internal]" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="phy_mngr_fsm_state" descr="FW Phy Manager FSM state:\;0: Disabled \;1: Open_port\;2: Polling\;3: Active_or_Linkup\;4: Close_port\;5: Phy_up\;7: Rx_disable" access="RO" enum="Disabled=0x0,Open_port=0x1,Polling=0x2,Active_or_Linkup=0x3,Close_port=0x4,Phy_up=0x5,Rx_disable=0x7" offset="0x4.24" size="0x0.8" />
-	<field name="phy_manager_link_enabled" descr="For IB: Table  1379, &quot;PDDR - Phy manager link enabled IB lay\;out,&quot; on page  1689\;For Ethernet: Table  1381, &quot;PDDR - Phy manager link enabled \;Eth layout,&quot; on page  1689\;" subnode="pddr_operation_info_page_phy_manager_link_enabled_auto_ext" access="RO" offset="0x8.0" size="0x4.0" />
-	<field name="core_to_phy_link_enabled" descr="For IB: Table  1383, &quot;PDDR - core2phy link enabled IB layout,&quot; \;on page  1690\;For Ethernet: Table  1385, &quot;PDDR - Core2Phy link enabled Eth \;layout,&quot; on page  1691" subnode="pddr_operation_info_page_core_to_phy_link_enabled_auto_ext" access="RO" offset="0xC.0" size="0x4.0" />
-	<field name="cable_proto_cap" descr="For IB: Table  1387, &quot;PDDR - cable cap IB layout,&quot; on \;page  1692\;For Ethernet: Table  1389, &quot;PDDR - cable cap Eth layout,&quot; on \;page  1693\;" subnode="pddr_operation_info_page_cable_proto_cap_auto_ext" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="link_active" descr="For IB: Table  1391, &quot;PDDR - Link Active IB layout,&quot; on \;page  1694\;For Ethernet: Table  1393, &quot;PDDR - Link Active Eth layout,&quot; on \;page  1694" subnode="pddr_operation_info_page_link_active_auto_ext" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="loopback_mode" descr="0: No_loopback_active\;1: Phy_remote_loopback \;2: Phy_local_loopback -When set the port&apos;s egress traffic is \;looped back to the receiver and the port transmitter is dis\;abled. \;4: External_local_loopback -Enables the port&apos;s transmitter to \;link with the port&apos;s receiver using an external loopback con\;nector. \;8: Near_end_analog_loopback - [Internal]\;16: Near_end_digital_loopback - [Internal]\;128: LL_local_loopback - [Internal]" access="RO" enum="No_loopback_active=0x0,Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80" offset="0x18.0" size="0x0.8" />
-	<field name="fec_mode_request" descr="FEC mode request\;See fec_mode_active\;for supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" offset="0x1C.0" size="0x0.16" />
-	<field name="fec_mode_active" descr="FEC mode active\;0: No_FEC\;1: Firecode_FEC\;2: Standard_RS_FEC - RS(528,514)\;3: Standard_LL_RS_FEC - RS(271,257)\;4: Reserved - [Internal]\;5: reserved - [Internal]\;6: Interleaved_Standard_RS-FEC - (544,514)\;7: Standard_RS-FEC - (544,514)\;8: Zero_Latency_FEC - [Internal]\;9: Ethernet_Consortium_LL_50G_RS_FEC- (272,257+1)\;10: Interleaved_Ethernet_Consortium_LL_50G_RS_FEC - \;(272,257+1)\;11: Interleaved_Standard_RS_FEC_PLR - (544,514)- [Inter\;nal]\;12: RS-FEC - (544,514) + PLR- [Internal]\;13: LL-FEC - (271,257) + PLR- [Internal]\;14: Ethernet_Consortium_LL_50G_RS_FEC_PLR - \;(272,257+1) [Internal] \;15: Interleaved_Ethernet_Consor\;tium_LL_50G_RS_FEC_PLR - (272,257+1) [Internal]\;\;For supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" enum="No_FEC=0x0,Firecode_FEC=0x1,Standard_RS_FEC=0x2,Standard_LL_RS_FEC=0x3,Reserved=0x4,Interleaved_Standard_RS=0x6,Standard_RS=0x7,Zero_Latency_FEC=0x8,Ethernet_Consortium_LL_50G_RS_FEC=0x9,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC=0xa,Interleaved_Standard_RS_FEC_PLR=0xb,RS=0xc,LL=0xd,Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xe,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xf" offset="0x1C.16" size="0x0.16" />
+	<field name="phy_manager_link_enabled" descr="For IB: Table 1403, &quot;PDDR - Phy manager link enabled IB \;layout,&quot; on page 1723\;For Ethernet: Table 1405, &quot;PDDR - Phy manager link \;enabled Eth layout,&quot; on page 1723\;" subnode="pddr_operation_info_page_phy_manager_link_enabled_auto_ext" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="core_to_phy_link_enabled" descr="For IB: Table 1407, &quot;PDDR - core2phy link enabled IB lay\;out,&quot; on page 1724\;For Ethernet: Table 1409, &quot;PDDR - Core2Phy link enabled \;Eth layout,&quot; on page 1725" subnode="pddr_operation_info_page_core_to_phy_link_enabled_auto_ext" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="cable_proto_cap" descr="For IB: Table 1411, &quot;PDDR - cable cap IB layout,&quot; on \;page 1726\;For Ethernet: Table 1413, &quot;PDDR - cable cap Eth layout,&quot; \;on page 1727\;" subnode="pddr_operation_info_page_cable_proto_cap_auto_ext" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="link_active" descr="For IB: Table 1415, &quot;PDDR - Link Active IB layout,&quot; on \;page 1728\;For Ethernet: Table 1417, &quot;PDDR - Link Active Eth lay\;out,&quot; on page 1728" subnode="pddr_operation_info_page_link_active_auto_ext" access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="loopback_mode" descr="0: No_loopback_active\;1: Phy_remote_loopback \;2: Phy_local_loopback -When set the port&apos;s egress traffic is \;looped back to the receiver and the port transmitter is dis\;abled. \;4: External_local_loopback -Enables the port&apos;s transmitter to \;link with the port&apos;s receiver using an external loopback con\;nector. \;8: Near_end_analog_loopback - [Internal]\;16: Near_end_digital_loopback - [Internal]\;128: LL_local_loopback - [Internal]\;256: GLoop - [internal]" access="RO" enum="No_loopback_active=0x0,Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80,GLoop=0x100" offset="0x18.0" size="0x0.12" />
+	<field name="fec_mode_request" descr="FEC mode request\;See fec_mode_active\;for supported retransmission mode see PPLM.fec_mode_capa\;bility" access="RO" offset="0x1C.0" size="0x0.16" />
+	<field name="fec_mode_active" descr="FEC mode active\;0: No_FEC\;1: Firecode_FEC\;2: Standard_RS_FEC - RS(528,514)\;3: Standard_LL_RS_FEC - RS(271,257)\;4: Reserved - [Internal]\;5: reserved - [Internal]\;6: Interleaved_Standard_RS-FEC - (544,514)\;7: Standard_RS-FEC - (544,514)\;8: Zero_Latency_FEC - [Internal]\;9: Ethernet_Consortium_LL_50G_RS_FEC- (272,257+1)\;10: Interleaved_Ethernet_Consortium_LL_50G_RS_FEC - \;(272,257+1)\;11: Interleaved_Standard_RS_FEC_PLR - (544,514)- [Internal]\;12: RS-FEC - (544,514) + PLR- [Internal]\;13: LL-FEC - (271,257) + PLR- [Internal]\;14: Ethernet_Consortium_LL_50G_RS_FEC_PLR - \;(272,257+1) [Internal] \;15: Interleaved_Ethernet_Consor\;tium_LL_50G_RS_FEC_PLR - (272,257+1) [Internal]\;\;For supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" enum="No_FEC=0x0,Firecode_FEC=0x1,Standard_RS_FEC=0x2,Standard_LL_RS_FEC=0x3,Reserved=0x4,Interleaved_Standard_RS=0x6,Standard_RS=0x7,Zero_Latency_FEC=0x8,Ethernet_Consortium_LL_50G_RS_FEC=0x9,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC=0xa,Interleaved_Standard_RS_FEC_PLR=0xb,RS=0xc,LL=0xd,Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xe,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xf" offset="0x1C.16" size="0x0.16" />
 	<field name="eth_100g_fec_support" descr="FEC 100G (25Gb/s per lane) supported FEC include override \;masking , should reflect current phy configuration\;Bit 0 - No FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;" access="RO" offset="0x20.0" size="0x0.4" />
 	<field name="eth_25g_50g_fec_support" descr="FEC 25G/50G (25Gb/s per lane) supported FEC include over\;ride masking , should reflect current phy configuration\;Bit 0 - No FEC\;Bit 1 - Firecode FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;" access="RO" offset="0x20.4" size="0x0.4" />
+	<field name="rtt_measure_valid" descr="when set, indicates the Round Trip Time measurement stated \;rtt_measured field is valid" access="RO" offset="0x20.8" size="0x0.1" />
+	<field name="rtt_measured" descr="Valid only when rtt_measure_valid is set.\;Round Trip Time measurement in 1nS resolution." access="RO" offset="0x38.0" size="0x4.0" />
 </node>
 
 <node name="pddr_operation_info_page_link_active_auto_ext" descr="" attr_is_union="1" size="0x4.0" >
@@ -2277,7 +2347,7 @@
 	<field name="pcs_phy_state" descr="PCS HW state:\;Bits 0-7: Block lock\;Bits 8-15: AM lock\;Bits 16-23: FEC lock\;Bits 24: Align_status\;Bits 25: Hi_BER\;Bits 26: Hi_SER" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="lp_proto_enabled" descr="IB ports : \;Link partner advertised speeds (first TS3)\;See ib_link_speed_enabled encoding.\;\;Ethernet ports:\;Link partner advertised Ethernet protocols active state: see \;PTYS.lp_advertise" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="lp_fec_mode_request" descr="Reserved when negotiation wasn&apos;t performed according to \;port_notifications.Link partner advertised capabilities value.\;Advertised link partner FEC mode request" access="RO" offset="0x14.0" size="0x0.16" />
-	<field name="lp_fec_mode_support" descr="Reserved when negotiation wasn&apos;t performed according to \;port_notifications.Link partner advertised capabilities value.\;\;Advertised link partner FEC mode support\;Bit 0 - No FEC\;Bit 1 - Firecode FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;Bit 3 - Standard LL RS-FEC - RS(271,257)\;Bit 4 - Mellanox Strong RS-FEC - RS(277,257)\;Bit 5 - Mellanox LL RS-FEC - RS(163,155)\;Bit 6 - Reserved\;Bit 7 - Standard RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;\;for supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" offset="0x14.16" size="0x0.16" />
+	<field name="lp_fec_mode_support" descr="Reserved when negotiation wasn&apos;t performed according to \;port_notifications.Link partner advertised capabilities value.\;\;Advertised link partner FEC mode support\;Bit 0 - No FEC\;Bit 1 - Firecode FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;Bit 3 - Standard LL RS-FEC - RS(271,257)\;Bit 4 - Mellanox Strong RS-FEC - RS(277,257)\;Bit 5 - Mellanox LL RS-FEC - RS(163,155)\;Bit 6 - Reserved\;Bit 7 - Standard RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;\;for supported retransmission mode see PPLM.fec_mode_capa\;bility" access="RO" offset="0x14.16" size="0x0.16" />
 	<field name="ib_last_link_down_reason" descr="Bit 0 - heartbeat_ack_received\;Bit 1 - heartbeat_send_received\;Bit 2 - heartbeat_err\;Bit 3 - tx_width_reduction_done_1x\;Bit 4 - tx_width_reduction_done_full\;Bit 5 - rx_width_reduction_done_1x\;Bit 6 - rx_width_reduction_done_full\;Bit 7 - width_reduction_timeout\;Bit 8 - ibl_link_retrain\;Bit 9 - rx_comskp_timeout\;Bit 10 - fifo_full_err\;Bit 11 - ts_at_linkup\;Bit 12 - minor_threshold_reached\;Bit 13 - link_fail\;Bit 14 - rx_eb_full_r\;Bit 15 - rx_8_10_lane_err\;Bit 16 - llr_link_retrain_set\;Bit 17 - fc_timeout\;Bit 18 - phy_error\;Bit 19 - lli_err\;Bit 20 - excessive_buffer_err\;Bit 21 - remote_init\;Bit 22 - plr_retry_expired\;Bit 23 - port_didnt_exit_plr_sync\;Bit 24 - eq_failed\;Bits 31-24 - Reserved" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="eth_last_link_down_lane" descr="Bit 0 - block_lock_failed\;Bit 1 - skip_detected\;Bit 2 - fec_sync_failed\;Bit 3 - fec_block_sync\;Bit 4 - fec_block_sync_lost" access="RO" high_bound="3" low_bound="0" offset="0x1C.24" size="0x4.0" />
 	<field name="speed_deg_db" descr="Bit 0 - Speed degradation database Valid\;Bit 1 - Speed degradation Serdes Rx database valid\;BIts 3-2 - reserved\;Bit 4 - rx_reversal\;Bit 5 - tx_reversal\;Bit 7-6 - reserved\;Bits 11:8 - failed_qdr/fdr10 - bit per lane.\;Bits 15:12 - failed_fdr - bit per lane.\;Bits 19:16- failed_edr - bit per lane.\;Bits 24:20 - peer_failed_test\;Bits 26-25 - reserved\;Bit 27 - first_test_speed" access="RO" offset="0x24.0" size="0x4.0" />
@@ -2291,9 +2361,9 @@
 	<field name="num_of_presets_tested_lane0" descr="presets tested in TX tuning flow counter or in KR Startup" access="RO" offset="0x44.24" size="0x0.5" />
 	<field name="kr_startup_fsm_lane" descr="Per lane KR startup state:\;0 - KR_FSM_INITIALIZE\;1 - KR_FSM_SEND_TRAINING\;2 - KR_FSM_TRAIN_LOCAL_TX\;3 - KR_FSM_TRAIN_LOCAL_RX\;4 - KR_FSM_TRAIN_REMOTE\;5 - KR_FSM_LINK_READY\;6 - KR_FSM_SEND_DATA" access="RO" high_bound="3" low_bound="0" offset="0x48.24" size="0x4.0" />
 	<field name="eth_an_debug_indication" descr="eth_an_debug bit mask:\;Bit 0 - Force link up\;Bit 1 - No HCD\;Bit 2 - Entered ACK_detect\;Bit 3 - Entered Good\;Bit 4 - Entered Good_Check\;Bit 5 - Entered Extra_tune\;Bit 6 - Entered Fix_Reversals\;Bit 7 - Entered Next_Page\;Bit 8 - Entered Sub-FSM Fail\;Bit 9 - Tuning timeout\;Bit 10 - No markers detected (during Good check)\;Bit 11 - Do KR-startup\;Bits 15:18 - KR startup failure mask" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="ib_phy_fsm_state_trace" descr="FW IB state machine:\;HDR Gen\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_INITIALY\;Bit 2 - entered IB_AN_FSM_RCVR_CFG\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_LINK_UP\;Bit 8 - Failed from CFG_IDLE\;\;NDR Gen:\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_POLLING\;Bit 2 - entered IB_AN_FSM_INITIALY\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_SYNC_CHECK\;Bit 8 - entered IB_AN_FSM_LINK_UP\;Bit 9 - Failed from CFG_IDLE\;Bit 10 - peer requested KR\;Bit 11 - speed degradation needed - &quot;best_grade&quot; didn&quot;t \;reach threshold\;\;" access="RO" offset="0x54.0" size="0x0.16" />
+	<field name="ib_phy_fsm_state_trace" descr="FW IB state machine:\;HDR Gen\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_INITIALY\;Bit 2 - entered IB_AN_FSM_RCVR_CFG\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_LINK_UP\;Bit 8 - Failed from CFG_IDLE\;\;NDR Gen:\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_POLLING\;Bit 2 - entered IB_AN_FSM_INITIALY\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_SYNC_CHECK\;Bit 8 - entered IB_AN_FSM_LINK_UP\;Bit 9 - Failed from CFG_IDLE\;Bit 10 - peer requested KR\;Bit 11 - speed degradation needed - &quot;best_grade&quot; didn&quot;t reach \;threshold\;\;" access="RO" offset="0x54.0" size="0x0.16" />
 	<field name="rounds_waited_for_peer_to_end_test" descr="" access="RO" offset="0x54.16" size="0x0.5" />
-	<field name="eth_an_watchdog_cnt" descr="counts ETH Watchdog was performed (and closed the IB \;fsm)." access="RO" offset="0x54.21" size="0x0.2" />
+	<field name="eth_an_watchdog_cnt" descr="counts ETH Watchdog was performed (and closed the IB fsm)." access="RO" offset="0x54.21" size="0x0.2" />
 	<field name="fall_from_cfg_idle_cdr_cnt" descr="count falls from Cfg_idle (before linkup) due cdr not lock" access="RO" offset="0x54.23" size="0x0.3" />
 	<field name="fall_from_cfg_idle_cnt" descr="count falls from Cfg_idle (before linkup) due amps lock on \;PLU" access="RO" offset="0x54.26" size="0x0.3" />
 	<field name="cdr_not_locked_cnt" descr="count the cdr not locked after EQ" access="RO" offset="0x54.29" size="0x0.3" />
@@ -2305,7 +2375,7 @@
 	<field name="irisc_status" descr="" access="RO" offset="0x68.0" size="0x0.4" />
 	<field name="stamping_reason" descr="Bit 0 - com_codes_is_zero \;Bit 1- rx_cdr_check_force_mode \;Bit 2- com_code_complaince \;Bit 3- eth_56g_stamped\;Bit 4- non_mlx_qsfp_tranciver\;Bit 5- non_mlx_sfp_tranciver\;Bit 6-ib_comp_codes\;Bit 7-edr_comp\;Bit 8-fdr_comp" access="RO" offset="0x6C.0" size="0x4.0" />
 	<field name="kr_frame_lock_tuning_failure_events_count" descr="Number of times that fast tuning (50ms) for KR lock failed to \;achieve frame lock." access="RO" offset="0x70.0" size="0x4.0" />
-	<field name="kr_full_tuning_failure_count" descr="Number of times that full tuning (0.5sec/3sec) for KR full \;tuning flow failed to achieve desire SI performance" access="RO" offset="0x74.0" size="0x4.0" />
+	<field name="kr_full_tuning_failure_count" descr="Number of times that full tuning (0.5sec/3sec) for KR full tun\;ing flow failed to achieve desire SI performance" access="RO" offset="0x74.0" size="0x4.0" />
 	<field name="pm_debug_indication" descr="Bit 0: phy_test_mode\;Bit 1: force_mode_en" access="RO" enum="phy_test_mode=0x1,force_mode_en=0x2" offset="0x78.0" size="0x0.16" />
 	<field name="ib_debug_indication" descr="Bit 0: cause_plr_tx_max_outstanding_cells" access="RW" enum="cause_plr_tx_max_outstanding_cells=0x1" offset="0x78.16" size="0x0.16" />
 	<field name="pd_debug_indication" descr="Bit 0: speed_change_high_speed_module\;Bit 1: False_positive_signal_detect\;Bit 2: Nv2nv_force\;Bit 3: bad_kr_mask \;Bit 4: kr_mlx_peer\;Bit 5: entered_signal_detect\;Bit 6: entered_rate_config\;Bit 7: entered_activate_sunfsm\;Bit 8: entered_done\;Bit 9: entered_subfsm_fail" access="RO" enum="speed_change_high_speed_module=0x1,False_positive_signal_detect=0x2,Nv2nv_force=0x4,bad_kr_mask=0x8,kr_mlx_peer=0x10,entered_signal_detect=0x20,entered_rate_config=0x40,entered_activate_sunfsm=0x80,entered_done=0x100,entered_subfsm_fail=0x200" offset="0x80.0" size="0x4.0" />
@@ -2314,6 +2384,12 @@
 	<field name="hst_mismatch_reason" descr="0: speed\;1: FEC\;2: precoding\;3: Gray coding" access="RO" offset="0x84.16" size="0x0.2" />
 	<field name="psi_collision2" descr="FSM 2 to call sub fsm of PSI that caused collision\;see fsm_mask in debug page for FSM numbering" access="RO" offset="0x84.22" size="0x0.5" />
 	<field name="psi_collision1" descr="FSM 1 to call sub fsm of PSI that caused collision\;see fsm_mask in debug page for FSM numbering" access="RO" offset="0x84.27" size="0x0.5" />
+	<field name="phy2mod_speed_req" descr="phy 2 module requested speed, aka speed_apsel_value\;bitmask according to PTYS.ext_ethernet_protocl for ETH \;speeds\;or ib_ext_protocols for IB speeds" access="RO" offset="0x8C.0" size="0x4.0" />
+	<field name="phy2mod_deactivate_lanes" descr="Bitmask per lane for phy2mod deactivate request status.\;0 - allow DP activation\;1 - Deactivate module DP" access="RO" offset="0x90.0" size="0x0.8" />
+	<field name="phy2mod_ack_lanes" descr="Bitmask per lane for phy2mod request status.\;0 - ack\;1 - nack" access="RO" offset="0x90.8" size="0x0.8" />
+	<field name="one_pll_mod" descr="indicates module has one pll for all lanes of the module." access="RO" offset="0x90.29" size="0x0.1" />
+	<field name="no_dme_mod" descr="no_dme_module indicates module doesn&apos;t support low speed \;signaling such as 312.5 MB/s for DME ETH AN signaling or \;SDR (2.5 GB/s) for IB low speed AN." access="RO" offset="0x90.30" size="0x0.1" />
+	<field name="eeprom_prsnt" descr="eeprom present indication" access="RO" offset="0x90.31" size="0x0.1" />
 </node>
 
 <node name="pddr_phy_manager_link_enabed_eth_ext" descr="" size="0x4.0" >
@@ -2353,7 +2429,7 @@
 	<field name="mono_reach_high_limit_sv" descr="mono_reach_high_limit severity\;0 - misconfiguration\;1 - fatal" access="RO" offset="0x10.7" size="0x0.1" />
 	<field name="mono_reach_low_limit" descr="" access="RO" offset="0x10.8" size="0x0.1" />
 	<field name="mono_reach_low_limit_sv" descr="mono_reach_low_limit severity\;0 - misconfiguration\;1 - fatal" access="RO" offset="0x10.9" size="0x0.1" />
-	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to off\;set 00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the \;mask is set, the event will be cleared. \;For example: To clear the kr_false_ready need set PDDR.clr , \;select the &quot;port event page&quot; and set bit 48 in clr_mask." access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to offset \;00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the mask \;is set, the event will be cleared. \;For example: To clear the kr_false_ready need set PDDR.clr , \;select the &quot;port event page&quot; and set bit 48 in clr_mask." access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 </node>
 
 <node name="pddr_reg_ext" descr="" size="0x100.0" >
@@ -2363,7 +2439,7 @@
 	<field name="local_port" descr="Local port number.\;If dev is set to 1, device index number.\;0: main die\;1-8: tile index number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="page_select" descr="page select index:\;0: Operational_info_page\;1: Troubleshooting_info_page\;2: Phy_info_page - [Internal]\;3: Module_info_page\;4: port_events_page - [internal]\;5: device_events_page - [internal]\;6: link_down_info - [EMC only]\;7: link_down_events - [internal]\;8: Link_up_info - [Internal]\;9: Module_latched_flag_info_page\;10: link_down_info_ext\;11: link_partner_info_page\;0xFE: mng_debug_page\;0xFF: phy_debug_page" access="INDEX" enum="Operational_info_page=0x0,Troubleshooting_info_page=0x1,Phy_info_page=0x2,Module_info_page=0x3,port_events_page=0x4,device_events_page=0x5,link_down_info=0x6,link_down_events=0x7,Link_up_info=0x8,Module_latched_flag_info_page=0x9,link_down_info_ext=0xa,link_partner_info_page=0xb,mng_debug_page=0xfe,phy_debug_page=0xff" offset="0x4.0" size="0x0.8" />
 	<field name="module_info_ext" descr="Module info extended configurations.\;resolution for rx_power and tx_power in module info page\;0: dbm\;1: uW" access="RW" enum="dbm=0x0,uW=0x1" offset="0x4.29" size="0x0.2" />
-	<field name="page_data" descr="Table  1371, &quot;Operation Info Page Layout,&quot; on page  1667\;Table  1413, &quot;Troubleshooting info Page layout,&quot; on page  1725\;Table  1405, &quot;Phy info page layout,&quot; on page  1698\;Table  1411, &quot;Module Info Page Layout,&quot; on page  1712\;Table  1419, &quot;Port events Page Layout,&quot; on page  1729\;Table  1421, &quot;Device events Page Layout,&quot; on page  1733\;Table  1407, &quot;Link Down Info Page layout,&quot; on page  1708\;Table  1409, &quot;Link down events page layout,&quot; on page  1711\;Table  1423, &quot;Link Up Info Page Layout,&quot; on page  1739\;Table  1425, &quot;Module Latched Flag Info Page Layout,&quot; on \;page  1742\;Table  1427, &quot;phy debug page layout,&quot; on page  1745\;Table  1429, &quot;Mng debug page layout,&quot; on page  1747\;Table  1433, &quot;link down info ext for 16nm LR layout,&quot; on \;page  1752" subnode="pddr_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).page_select" />
+	<field name="page_data" descr="Table 1395, &quot;Operation Info Page Layout,&quot; on page 1700\;Table 1437, &quot;Troubleshooting info Page layout,&quot; on \;page 1760\;Table 1429, &quot;Phy info page layout,&quot; on page 1732\;Table 1435, &quot;Module Info Page Layout,&quot; on page 1747\;Table 1443, &quot;Port events Page Layout,&quot; on page 1764\;Table 1445, &quot;Device events Page Layout,&quot; on page 1768\;Table 1431, &quot;Link Down Info Page layout,&quot; on page 1743\;Table 1433, &quot;Link down events page layout,&quot; on \;page 1746\;Table 1447, &quot;Link Up Info Page Layout,&quot; on page 1774\;Table 1449, &quot;Module Latched Flag Info Page Layout,&quot; on \;page 1777\;Table 1451, &quot;phy debug page layout,&quot; on page 1780\;Table 1453, &quot;Mng debug page layout,&quot; on page 1782\;Table 1457, &quot;link down info ext for 16nm LR layout,&quot; on \;page 1787" subnode="pddr_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).page_select" />
 </node>
 
 <node name="pddr_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0xf8.0" >
@@ -2384,7 +2460,7 @@
 
 <node name="pddr_troubleshooting_page_ext" descr="" size="0xf8.0" >
 	<field name="group_opcode" descr="0: Monitor_opcodes\;1: Advanced_debug_opcodes - [Internal]" access="INDEX" enum="Monitor_opcodes=0x0,Advanced_debug_opcodes=0x1" offset="0x0.0" size="0x0.16" />
-	<field name="status_opcode" descr="Status opcode described in:\;Table  1415, &quot;PDDR - Monitor opcodes layout,&quot; on page  1726\;Table  1417, &quot;PDDR - Advanced opcodes layout,&quot; on page  1727" subnode="pddr_troubleshooting_page_status_opcode_auto_ext" access="RO" offset="0x4.0" size="0x4.0" union_selector="$(parent).group_opcode" />
+	<field name="status_opcode" descr="Status opcode described in:\;Table 1439, &quot;PDDR - Monitor opcodes layout,&quot; on \;page 1761\;Table 1441, &quot;PDDR - Advanced opcodes layout,&quot; on \;page 1762" subnode="pddr_troubleshooting_page_status_opcode_auto_ext" access="RO" offset="0x4.0" size="0x4.0" union_selector="$(parent).group_opcode" />
 	<field name="status_message" descr="ASCII code message\;All Messages are terminated by a Null character &apos;\0&apos;" access="RO" high_bound="58" low_bound="0" offset="0xC.0" size="0xec.0" />
 </node>
 
@@ -2394,37 +2470,37 @@
 </node>
 
 <node name="pfcc_reg_ext" descr="" size="0x20.0" >
-	<field name="shl_opr" descr="Send to higher layers operation:\;0: Pause and PFC are handled by the port (default)\;1: Pause and PFC are handled by the port and are also been \;send to higher layers.\;Only valid if shl_cap = 1." access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="shl_opr" descr="Send to higher layers operation:\;0: Pause and PFC are handled by the port (default)\;1: Pause and PFC are handled by the port and are also \;been send to higher layers.\;Only valid if shl_cap = 1." access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="shl_cap" descr="Send to higher layers capabilities:\;0: No capability of sending Pause and PFC to higher layers\;1: Device has capability of send Pause and PFC to higher \;layers\;NOTE: This relates to IEEE 802.3 PAUSE and IEEE 802.3 \;PFC." access="RO" offset="0x0.1" size="0x0.1" />
-	<field name="critical_stall_mask" descr="Valid only on HCAs.\;Mask bit indicating if device_stall_critical_watermark \;should be updated.\;If set to &quot;1&quot;, device_stall_critical_watermark will be updated" access="WO" offset="0x0.2" size="0x0.1" />
-	<field name="minor_stall_mask" descr="Valid only on HCAs.\;Mask bit indicating if device_stall_minor_watermark should \;be updated.\;If set to &quot;1&quot;, device_stall_minor_watermark will be updated" access="WO" offset="0x0.3" size="0x0.1" />
+	<field name="critical_stall_mask" descr="Valid only on HCAs.\;Mask bit indicating if device_stall_critical_watermark \;should be updated.\;If set to &quot;1&quot;, device_stall_critical_watermark will be \;updated" access="WO" offset="0x0.2" size="0x0.1" />
+	<field name="minor_stall_mask" descr="Valid only on HCAs.\;Mask bit indicating if device_stall_minor_watermark \;should be updated.\;If set to &quot;1&quot;, device_stall_minor_watermark will be updated" access="WO" offset="0x0.3" size="0x0.1" />
 	<field name="ppan_mask_n" descr="Valid only on HCAs.\;Mask bit (negative polarity) indicating if ppan should be \;updated.\;If set to &quot;0&quot;, ppan will be updated" access="WO" offset="0x0.4" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
-	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0: Local port number\;1: IB / label port number\;[Internal] 3: Out of band / PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
+	<field name="pnat" descr="Port number access type. determines the way local_port \;is interpreted:\;0: Local port number\;1: IB / label port number\;[Internal] 3: Out of band / PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="set_buf_ownership" descr="Supported by HCA only, see PCAM.feature_cap_mask bit 44.\;\;Buffer ownership configuration. when this bits are set to a \;value other than 0, device will ignore all other fields pfcc \;register\;0: unknown \;1: device owned, all buffer configuration will return to its \;defaults." access="WO" offset="0x0.24" size="0x0.2" />
-	<field name="buf_ownership" descr="Supported by HCA only, see PCAM.feature_cap_mask bit 44.\;Current status of buffer ownership\;0: unknown\;1: device owned\;2: software owned" access="RO" offset="0x0.26" size="0x0.2" />
+	<field name="set_buf_ownership" descr="Supported by HCA only, see PCAM.feature_cap_mask bit \;44.\;\;Buffer ownership configuration. when this bits are set to a \;value other than 0, device will ignore all other fields pfcc \;register\;0: unknown \;1: device owned, all buffer configuration will return to its \;defaults." access="WO" offset="0x0.24" size="0x0.2" />
+	<field name="buf_ownership" descr="Supported by HCA only, see PCAM.feature_cap_mask bit \;44.\;Current status of buffer ownership\;0: unknown\;1: device owned\;2: software owned" access="RO" offset="0x0.26" size="0x0.2" />
 	<field name="cap_remote_admin" descr="Indicates if operation of remote admin parameters (dcx\;b_operation_type 0x2) is supported. \;" access="RO" offset="0x0.28" size="0x0.1" />
 	<field name="cap_local_admin" descr="Indicates if operation of local admin parameters (dcxb_op\;eration_type 0x1) is supported. \;" access="RO" offset="0x0.29" size="0x0.1" />
-	<field name="dcbx_operation_type" descr="The Operation type, valid only on HCAs.\;0: local_operative_parameters\;1: local_admin_parameters - supported only when cap_lo\;cal_admin==1.\;2: remote_admin_parameters - supported only when \;cap_remote_admin==1.\;Only pfctx and pfcrx are supported on remote device" access="INDEX" enum="local_operative_parameters=0x0,local_admin_parameters=0x1,remote_admin_parameters=0x2" offset="0x0.30" size="0x0.2" />
+	<field name="dcbx_operation_type" descr="The Operation type, valid only on HCAs.\;0: local_operative_parameters\;1: local_admin_parameters - supported only when \;cap_local_admin==1.\;2: remote_admin_parameters - supported only when \;cap_remote_admin==1.\;Only pfctx and pfcrx are supported on remote device" access="INDEX" enum="local_operative_parameters=0x0,local_admin_parameters=0x1,remote_admin_parameters=0x2" offset="0x0.30" size="0x0.2" />
 	<field name="prio_mask_rx" descr="Bit per prio indicating if RX flow control policy should be \;updated based on bit pfcrx ." access="WO" offset="0x4.0" size="0x0.8" />
 	<field name="prio_mask_tx" descr="Bit per prio indicating if TX flow control policy should be \;updated based on bit pfctx ." access="WO" offset="0x4.16" size="0x0.8" />
-	<field name="ppan" descr="Pause policy auto negotiation\;0: disabled - generate and ignore pause frames based on \;pptx, pprx\;1: enabled - when auto-negotiation is performed, set the \;pause policy based on the auto-negotiation resolution.\;" access="RW" enum="disabled=0x0,enabled=0x1" offset="0x4.28" size="0x0.4" />
-	<field name="fctx_disabled" descr="Valid only on HCAs.\;The bit is set if the device has passed the device_stall_criti\;cal_watermark ( for global flow control or any priority when \;using priority flow control) and has become stalled. \;When fctx_disabled is set, the device will not send flow con\;trol and priority flow control (PFC) packets." access="RO" offset="0x8.8" size="0x0.1" />
-	<field name="pfctx" descr="Priority based flow control policy on TX[7:0]. Per priority bit \;mask:\;0: never generate pause frames on the specified priority \;(default)\;1: generate pause frames according to RX buffer threshold \;on the specified priority\;pfctx, pptx must be mutually exclusive (for example, only one \;of them at most can be set)." access="RW" offset="0x8.16" size="0x0.8" />
+	<field name="ppan" descr="Pause policy auto negotiation\;0: disabled - generate and ignore pause frames based on \;pptx, pprx\;1: enabled - when auto-negotiation is performed, set the \;pause policy based on the auto-negotiation resolution.\;\;" access="RW" enum="disabled=0x0,enabled=0x1" offset="0x4.28" size="0x0.4" />
+	<field name="fctx_disabled" descr="Valid only on HCAs.\;The bit is set if the device has passed the device_stall_crit\;ical_watermark ( for global flow control or any priority \;when using priority flow control) and has become stalled. \;When fctx_disabled is set, the device will not send flow \;control and priority flow control (PFC) packets." access="RO" offset="0x8.8" size="0x0.1" />
+	<field name="pfctx" descr="Priority based flow control policy on TX[7:0]. Per priority bit \;mask:\;0: never generate pause frames on the specified priority \;(default)\;1: generate pause frames according to RX buffer threshold \;on the specified priority\;pfctx, pptx must be mutually exclusive (for example, only \;one of them at most can be set)." access="RW" offset="0x8.16" size="0x0.8" />
 	<field name="pptx_mask_n" descr="Valid only on HCAs.\;Mask bit (negative polarity) indicating if pptx should be \;updated.\;If set to &quot;0&quot;, pptx will be updated" access="WO" offset="0x8.29" size="0x0.1" />
 	<field name="aptx" descr="Active (operational) pause policy on TX\;0: do not generate pause frames\;1: generate pause frames according to RX buffer threshold" access="RO" offset="0x8.30" size="0x0.1" />
 	<field name="pptx" descr="Admin pause policy on TX (see also pfctx):\;0: never generate pause frames (default)\;1: generate pause frames according to RX buffer threshold" access="RW" offset="0x8.31" size="0x0.1" />
-	<field name="pfcrx" descr="Priority based flow control policy on RX[7:0]. Per priority bit \;mask:\;0: ignore incoming pause frames on the specified priority \;(default)\;1: respect incoming pause frames on the specified priority" access="RW" offset="0xC.16" size="0x0.8" />
+	<field name="pfcrx" descr="Priority based flow control policy on RX[7:0]. Per priority \;bit mask:\;0: ignore incoming pause frames on the specified priority \;(default)\;1: respect incoming pause frames on the specified priority" access="RW" offset="0xC.16" size="0x0.8" />
 	<field name="pprx_mask_n" descr="Valid only on HCAs.\;Mask bit (negative polarity) indicating if pprx should be \;updated.\;If set to &quot;0&quot;, pprx will be updated" access="WO" offset="0xC.29" size="0x0.1" />
 	<field name="aprx" descr="Active (operational) pause policy on RX\;0: ignore received pause frames\;1: respect received pause frames" access="RO" offset="0xC.30" size="0x0.1" />
 	<field name="pprx" descr="Admin pause policy on RX (see also pfcrx):\;0: ignore received pause frames (default)\;1: respect received pause frames" access="RW" offset="0xC.31" size="0x0.1" />
-	<field name="device_stall_critical_watermark" descr="Valid only on HCAs (When health_mon_rx_activity is set).\;The maximum period for a single received packet process\;ing, if the packet was not processed during this time, the \;device will be declared as stalled and will increase the \;device_stall_critical_watermark_cnt (PPCNT) counter. Value \;given in mSec, The maximum period is 8 sec. \;The special value of 0, indicates that the device_stall_criti\;cal_watermark is inactive.\;Range: 0x0050 - 0x1F40 \;see also critical_stall_mask" access="RW" offset="0x10.0" size="0x0.16" />
-	<field name="device_stall_minor_watermark" descr="Valid only on HCAs (When health_mon_rx_activity is set).\;The maximum period for a single received packet process\;ing, if the packet was not processed during this time, the \;device will increase the device_stall_minor_watermark_cnt \;(PPCNT). Value given in mSec, The maximum period is 8 \;sec. \;The special value of 0, indicates that the device_stall_mi\;nor_watermark is inactive.\;Range: 0x0050 - 0x1F40 \;see also critical_stall_mask" access="RW" offset="0x10.16" size="0x0.16" />
+	<field name="device_stall_critical_watermark" descr="Valid only on HCAs (When health_mon_rx_activity is set).\;The maximum period for a single received packet process\;ing, if the packet was not processed during this time, the \;device will be declared as stalled and will increase the \;device_stall_critical_watermark_cnt (PPCNT) counter. \;Value given in mSec, The maximum period is 8 sec. \;The special value of 0, indicates that the device_stall_criti\;cal_watermark is inactive.\;Range: 0x0050 - 0x1F40 \;see also critical_stall_mask" access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="device_stall_minor_watermark" descr="Valid only on HCAs (When health_mon_rx_activity is set).\;The maximum period for a single received packet process\;ing, if the packet was not processed during this time, the \;device will increase the device_stall_minor_water\;mark_cnt (PPCNT). Value given in mSec, The maximum \;period is 8 sec. \;The special value of 0, indicates that the device_stall_mi\;nor_watermark is inactive.\;Range: 0x0050 - 0x1F40 \;see also critical_stall_mask" access="RW" offset="0x10.16" size="0x0.16" />
 </node>
 
-<node name="pgmr_ext" descr="" size="0x18.0" >
-	<field name="pg_sel" descr="Selection between an operation on a local port or a group, \;for &apos;set&apos; and &apos;get&apos; operations. \;0 - local port (group field is neglected even if set)\;1 - group (local_port field is neglected even if set)" access="OP" offset="0x0.0" size="0x0.1" />
+<node name="pgmr_ext" descr="" size="0x2c.0" >
+	<field name="pg_sel" descr="Selection between an operation on a local port or a group, for \;&apos;set&apos; and &apos;get&apos; operations. \;0 - local port (group field is neglected even if set)\;1 - group (local_port field is neglected even if set)" access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main\;5 - USR Tile\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="group" descr="Group number" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
@@ -2433,7 +2509,7 @@
 	<field name="version" descr="0 - 16nm products" access="RO" offset="0x0.24" size="0x0.4" />
 	<field name="status" descr="0 - Invalid\;1 - Valid" access="RO" offset="0x0.28" size="0x0.4" />
 	<field name="group_of_port" descr="The corresponding group number for the local_port" access="RW" offset="0x4.4" size="0x0.4" />
-	<field name="ports_mapping_of_group" descr="A bit map of all available local ports in the system (each bit \;represents a local port). \;The corresponding bits which represent the local ports for \;the specific group in the group field, are set to &apos;1&apos;.\;If set to &apos;0&apos; - not in that specific group or not available." access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
+	<field name="ports_mapping_of_group" descr="A bit map of all available local ports in the system (each bit \;represents a local port). \;The corresponding bits which represent the local ports for \;the specific group in the group field, are set to &apos;1&apos;.\;If set to &apos;0&apos; - not in that specific group or not available.\;Bit 0 - local_port 1\;Bit 1 - local_port 2\;..." access="RW" high_bound="8" low_bound="0" offset="0x8.0" size="0x24.0" />
 </node>
 
 <node name="pguid_reg_ext" descr="" size="0x60.0" >
@@ -2477,8 +2553,8 @@
 	<field name="fc_fec_uncorrectable_blocks_lane2_low" descr="Perf.PortExtendedSpeedsCounters(FECCor\;rectableBlockCounterLane2)\;[Internal] supported in USR - ZL FEC" access="RO" offset="0x6C.0" size="0x4.0" />
 	<field name="fc_fec_uncorrectable_blocks_lane3_high" descr="Perf.PortExtendedSpeedsCounters(FECCor\;rectableBlockCounterLane3)\;[Internal] supported in USR - ZL FEC" access="RO" offset="0x70.0" size="0x4.0" />
 	<field name="fc_fec_uncorrectable_blocks_lane3_low" descr="Perf.PortExtendedSpeedsCounters(FECCor\;rectableBlockCounterLane3)\;[Internal] supported in USR - ZL FEC" access="RO" offset="0x74.0" size="0x4.0" />
-	<field name="rs_fec_corrected_blocks_high" descr="Perf.PortExtendedSpeedsCounters(FECCor\;recableBlockCounter)" access="RO" offset="0x78.0" size="0x4.0" />
-	<field name="rs_fec_corrected_blocks_low" descr="Perf.PortExtendedSpeedsCounters(FECCor\;recableBlockCounter)" access="RO" offset="0x7C.0" size="0x4.0" />
+	<field name="rs_fec_corrected_blocks_high" descr="Perf.PortExtendedSpeedsCounters(FECCorre\;cableBlockCounter)" access="RO" offset="0x78.0" size="0x4.0" />
+	<field name="rs_fec_corrected_blocks_low" descr="Perf.PortExtendedSpeedsCounters(FECCorre\;cableBlockCounter)" access="RO" offset="0x7C.0" size="0x4.0" />
 	<field name="rs_fec_uncorrectable_blocks_high" descr="Perf.PortExtendedSpeedsCounters(FEUncor\;recableBlockCounter)" access="RO" offset="0x80.0" size="0x4.0" />
 	<field name="rs_fec_uncorrectable_blocks_low" descr="Perf.PortExtendedSpeedsCounters(FEUncor\;recableBlockCounter)" access="RO" offset="0x84.0" size="0x4.0" />
 	<field name="rs_fec_no_errors_blocks_high" descr="The number of RS-FEC blocks received that \;had no errors.\;Note: Total rs_fec blocks received = \;rs_fec_corrected_blocks + rs_fec_uncorrect\;able_blocks + rs_fec_no_errors_blocks" access="RO" offset="0x88.0" size="0x4.0" />
@@ -2493,6 +2569,14 @@
 	<field name="rs_fec_corrected_symbols_lane2_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane2)" access="RO" offset="0xB4.0" size="0x4.0" />
 	<field name="rs_fec_corrected_symbols_lane3_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane3)" access="RO" offset="0xB8.0" size="0x4.0" />
 	<field name="rs_fec_corrected_symbols_lane3_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane3)" access="RO" offset="0xBC.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane4_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane4)" access="RO" offset="0xC8.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane4_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane4)" access="RO" offset="0xCC.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane5_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane5)" access="RO" offset="0xD0.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane5_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane5)" access="RO" offset="0xD4.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane6_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane6)" access="RO" offset="0xD8.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane6_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane6)" access="RO" offset="0xDC.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane7_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane7)" access="RO" offset="0xE0.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane7_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane7)" access="RO" offset="0xE4.0" size="0x4.0" />
 </node>
 
 <node name="phys_layer_stat_cntrs_ext" descr="" size="0xf8.0" >
@@ -2500,34 +2584,34 @@
 	<field name="time_since_last_clear_low" descr="The time passed since the last counters clear \;event in msec.\;" access="RO" offset="0x4.0" size="0x4.0" />
 	<field name="phy_received_bits_high" descr="This counter provides information on the total \;amount of traffic (bits) received.\;" access="RO" offset="0x8.0" size="0x4.0" />
 	<field name="phy_received_bits_low" descr="This counter provides information on the total \;amount of traffic (bits) received.\;" access="RO" offset="0xC.0" size="0x4.0" />
-	<field name="phy_symbol_errors_high" descr="This counter provides information on error \;bits that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="phy_symbol_errors_low" descr="This counter provides information on error \;bits that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="phy_symbol_errors_high" descr="This counter provides information on error bits \;that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="phy_symbol_errors_low" descr="This counter provides information on error bits \;that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="phy_corrected_bits_high" descr="Corrected bits by FEC engine. \;" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="phy_corrected_bits_low" descr="Corrected bits by FEC engine. \;" access="RO" offset="0x1C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane0_high" descr="This counter provides information on error \;bits that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane0_low" descr="This counter provides information on error \;bits that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane1_high" descr="This counter provides information on error \;bits that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x28.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane1_low" descr="This counter provides information on error \;bits that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x2C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane2_high" descr="This counter provides information on error \;bits that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x30.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane2_low" descr="This counter provides information on error \;bits that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x34.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane3_high" descr="This counter provides information on error \;bits that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x38.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane3_low" descr="This counter provides information on error \;bits that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x3C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane4_high" descr="This counter provides information on error \;bits that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x40.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane4_low" descr="This counter provides information on error \;bits that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x44.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane5_high" descr="This counter provides information on error \;bits that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x48.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane5_low" descr="This counter provides information on error \;bits that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane6_high" descr="This counter provides information on error \;bits that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane6_low" descr="This counter provides information on error \;bits that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x54.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane7_high" descr="This counter provides information on error \;bits that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x58.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane7_low" descr="This counter provides information on error \;bits that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x5C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane0_high" descr="This counter provides information on error bits \;that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x20.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane0_low" descr="This counter provides information on error bits \;that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x24.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane1_high" descr="This counter provides information on error bits \;that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x28.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane1_low" descr="This counter provides information on error bits \;that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x2C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane2_high" descr="This counter provides information on error bits \;that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x30.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane2_low" descr="This counter provides information on error bits \;that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x34.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane3_high" descr="This counter provides information on error bits \;that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x38.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane3_low" descr="This counter provides information on error bits \;that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x3C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane4_high" descr="This counter provides information on error bits \;that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x40.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane4_low" descr="This counter provides information on error bits \;that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x44.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane5_high" descr="This counter provides information on error bits \;that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x48.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane5_low" descr="This counter provides information on error bits \;that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x4C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane6_high" descr="This counter provides information on error bits \;that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane6_low" descr="This counter provides information on error bits \;that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane7_high" descr="This counter provides information on error bits \;that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x58.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane7_low" descr="This counter provides information on error bits \;that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="raw_ber_coef" descr="Raw_BER = raw_ber_coef*10^(-raw_ber_\;magnitude)\;" access="RO" offset="0x60.0" size="0x0.4" />
 	<field name="raw_ber_magnitude" descr="Raw_BER = raw_ber_coef*10^(-raw_ber_\;magnitude)\;" access="RO" offset="0x60.8" size="0x0.8" />
-	<field name="effective_ber_coef" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_mag\;nitude)\;" access="RO" offset="0x64.0" size="0x0.4" />
-	<field name="effective_ber_magnitude" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_mag\;nitude)\;" access="RO" offset="0x64.8" size="0x0.8" />
+	<field name="effective_ber_coef" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_magni\;tude)\;" access="RO" offset="0x64.0" size="0x0.4" />
+	<field name="effective_ber_magnitude" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_magni\;tude)\;" access="RO" offset="0x64.8" size="0x0.8" />
 	<field name="symbol_fec_ber_coef" descr="Symbol_BER = \;symbol_ber_coef*10^(-symbol_ber_magni\;tude)" access="RO" offset="0x68.0" size="0x0.4" />
 	<field name="symbol_ber_magnitude" descr="Symbol_BER = \;symbol_ber_coef*10^(-symbol_ber_magni\;tude)" access="RO" offset="0x68.8" size="0x0.8" />
-	<field name="phy_effective_errors_high" descr="This counter provides information on error \;bits that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x7C.0" size="0x4.0" />
-	<field name="phy_effective_errors_low" descr="This counter provides information on error \;bits that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x80.0" size="0x4.0" />
+	<field name="phy_effective_errors_high" descr="This counter provides information on error bits \;that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x7C.0" size="0x4.0" />
+	<field name="phy_effective_errors_low" descr="This counter provides information on error bits \;that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x80.0" size="0x4.0" />
 </node>
 
 <node name="pltc_reg_ext" descr="" size="0x10.0" >
@@ -2543,7 +2627,7 @@
 </node>
 
 <node name="pmaos_reg_ext" descr="" size="0x10.0" >
-	<field name="oper_status" descr="Module state (reserved while admin_status is dis\;abled):\;0: initializing\;1: plugged_enabled\;2: unplugged\;3: module_plugged_with_error - (details in error_\;type).\;4: plugged_disabled" access="RO" enum="initializing=0x0,plugged_enabled=0x1,unplugged=0x2,module_plugged_with_error=0x3,plugged_disabled=0x4" offset="0x0.0" size="0x0.4" />
+	<field name="oper_status" descr="Module state (reserved while admin_status is dis\;abled):\;0: initializing\;1: plugged_enabled\;2: unplugged\;3: module_plugged_with_error - (details in error_\;type).\;4: plugged_disabled\;5: unknown" access="RO" enum="initializing=0x0,plugged_enabled=0x1,unplugged=0x2,module_plugged_with_error=0x3,plugged_disabled=0x4,unknown=0x5" offset="0x0.0" size="0x0.4" />
 	<field name="admin_status" descr="Module administrative state (the desired state of the \;module):\;1: enabled\;2: disabled_by_configuration\;3: enabled_once - if the module is active and then \;unplugged, or module experienced an error event, the \;operational status should go to &quot;disabled&quot; and can \;only be enabled upon explicit enable command.\;\;Note - To disable a module, all ports associated with \;the port must be disabled first.\;" access="RW" enum="enabled=0x1,disabled_by_configuration=0x2,enabled_once=0x3" offset="0x0.8" size="0x0.4" />
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is \;available." access="INDEX" offset="0x0.24" size="0x0.4" />
@@ -2567,7 +2651,7 @@
 	<field name="tx_disable_override_value" descr="Valid only in case TX_DISABLE is configured to override mode \;by tx_disable_override_cntl: \;0 - TX_DISABLE is low (i.e. TX is enabled)\;1 - TX_DISABLE is high (i.e. TX is disabled)" access="RW" offset="0x4.24" size="0x0.2" />
 	<field name="rx_amp_override_cntl" descr="Module RX amplitude override control:\;0 - Auto (default)\;1 - Keep the module configuration\;2 - Override" access="RW" offset="0x8.0" size="0x0.2" />
 	<field name="rx_amp_override_cap" descr="Module rx_amp override control capability." access="RO" offset="0x8.2" size="0x0.1" />
-	<field name="rx_amp_override_value" descr="Valid only in case RX amplitude is configured to override \;mode by rx_amp_override_cntl" access="RW" offset="0x8.8" size="0x0.4" />
+	<field name="rx_amp_override_value" descr="Valid only in case RX amplitude is configured to override mode \;by rx_amp_override_cntl" access="RW" offset="0x8.8" size="0x0.4" />
 	<field name="rx_amp_override_value_cap" descr="Module rx_amp bitmask of allowed values." access="RO" offset="0x8.12" size="0x0.4" />
 	<field name="rx_los_override_cntl" descr="Valid only in case RX _LOS is configured to override mode by \;rx_los_override_admin" access="RW" offset="0x8.16" size="0x0.2" />
 	<field name="rx_los_override_cap" descr="Module RX_LOS override control capability." access="RO" offset="0x8.18" size="0x0.1" />
@@ -2597,7 +2681,7 @@
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="m_lane_m" descr="Module lane mapping: \;0 - Local to Module mapping include module lanes mapping\;1 - Local to Module mapping only, without lane mapping\;\;When this operational is set (&apos;1&apos;), the following fields are \;ignored in SET command and should return the value &quot;0&quot; in \;GET commands: \;PMLP.rxtx\;PMLP.lane&lt;i&gt;_module_mapping.tx_lane\;PMLP.lane&lt;i&gt;_module_mapping.rx_lane" access="OP" offset="0x0.28" size="0x0.1" />
 	<field name="rxtx" descr="Use different configuration for RX and TX.\;If this bit is cleared, the TX value is used for both RX and TX. \;When set, the RX configuration is taken from the separate \;field. This is to enable backward compatible implementation." access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="lane_module_mapping" descr="Module SerDes for lane &lt;i&gt;\;Up to 8 SerDeses in a module can be mapped to a local port. \;See Table 1243, &quot;Lane to Module Mapping Layout,&quot; on \;page 1536." subnode="lane_2_module_mapping_ext" access="RW" high_bound="7" low_bound="0" offset="0x4.0" size="0x20.0" />
+	<field name="lane_module_mapping" descr="Module SerDes for lane &lt;i&gt;\;Up to 8 SerDeses in a module can be mapped to a local port. \;See Table 1263, &quot;Lane to Module Mapping Layout,&quot; on \;page 1567." subnode="lane_2_module_mapping_ext" access="RW" high_bound="7" low_bound="0" offset="0x4.0" size="0x20.0" />
 </node>
 
 <node name="pmmp_cmis_protocol_override_layout_ext" descr="" size="0xc.0" >
@@ -2608,24 +2692,24 @@
 	<field name="dp_tx_off_maxDuration" descr="Data path turn off maximum duration. coded according to \;table 8-29 of CMIS 4.0." access="RW" offset="0x4.16" size="0x0.4" />
 	<field name="dp_tx_on_maxDuration" descr="Data path turn on maximum duration. coded according to \;table 8-29 of CMIS 4.0." access="RW" offset="0x4.20" size="0x0.4" />
 	<field name="dp_init_maxDuration" descr="Data path init maximum duration. coded according to table \;8-29 of CMIS 4.0." access="RW" offset="0x4.28" size="0x0.4" />
-	<field name="cmis_override_mask" descr="bitmask of override from CMIS protocol bytes page.\;Relevant only when Bit 9 is set in eeprom_override field.\;inverse polarity.\;0 - override\;1 - don&apos;t override\;\;Bit 0 - cable_breakout\;Bit 1 -host_electrical_compliance\;Bit 2 - module_media_type\;Bit 3 - media_compliance\;Bit 4 - mod_pwrup_maxDuration\;Bit 5 - dp_init_maxDuration\;Bit 6 - dp_tx_on_maxDuration\;Bit 7 - dp_tx_off_maxDuration" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="cmis_override_mask" descr="bitmask of override from CMIS protocol bytes page.\;Relevant only when Bit 9 is set in eeprom_override field.\;inverse polarity.\;0 - override\;1 - don&apos;t override\;\;Bit 0 - cable_breakout\;Bit 1 -host_electrical_compliance\;Bit 2 - module_media_type\;Bit 3 - media_compliance\;Bit 4 - mod_pwrup_maxDuration\;Bit 5 - dp_init_maxDuration\;Bit 6 - dp_tx_on_maxDuration\;Bit 7 - dp_tx_off_maxDuration\;Bit 8 - app0_support" access="RW" offset="0x8.0" size="0x0.16" />
 </node>
 
 <node name="pmmp_qsfp_protocol_override_layout_ext" descr="" size="0xc.0" >
 	<field name="ethernet_compliance_code" descr="Ethernet Compliance Codes bit mask (10/40G/100G)\;Override byte131 per SFF-8636:\;Bit 7 - Extended Specification Compliance valid\;Bit 6 - 10GBASE-LRM\;Bit 5 - 10GBASE-LR\;Bit 4 - 10GBASE-SR\;Bit 3 - 40GBASE-CR4\;Bit 2 - 40GBASE-SR4\;Bit 1 - 40GBASE-LR4\;Bit 0 - 40G Active Cable (XLPPI)" access="RW" offset="0x0.0" size="0x0.8" />
 	<field name="cable_breakout" descr="Override of byte113 per SFF-8636:\;Bit 6-4 (Far End):\;0 - Far end is unspecified\;1 - Cable with single far end with 4 channels implemented, \;or separable module with 4-channel connector\;2 - Cable with single far end with 2 channels implemented, \;or separable module with 2-channel connector\;3 - Cable with single far end with 1 channel implemented, \;or separable module with 1-channel connector\;4 - 4 far ends with 1 channel implemented in each (i.e. 4x1 \;break out)\;5 - 2 far ends with 2 channels implemented in each (i.e. 2x2 \;break out)\;6 - 2 far ends with 1 channel implemented in each (i.e. 2x1 \;break out)\;\;Bit 3-0 (Near End)\;Bit 0 - Channel 1 implementation \;Bit 1 - Channel 2 implementation\;Bit 2 - Channel 3 implementation\;Bit 3 - Channel 4 implementation\;\;for each channel:\;0 - Channel implemented \;1 - Channel not - implemented\;" access="RW" offset="0x0.8" size="0x0.8" />
 	<field name="giga_ethernet_compliance_code" descr="Gigabit Ethernet Compliance Codes \;Override byte134 per SFF-8636:\;Bit 3 - 1000BASE-T\;Bit 2 - 1000BASE-CX\;Bit 1 - 1000BASE-LX\;Bit 0 - 1000BASE-SX" access="RW" offset="0x4.0" size="0x0.8" />
-	<field name="ext_ethernet_compliance_code" descr="Extended Specification Compliance Codes \;Override byte192 per SFF-8636:\;0 - Unspecified\;1 - 100G AOC (Active Optical Cable) or 25GAUI C2M AOC \;with FEC\;2 - 100GBASE-SR4 or 25GBASE-SR\;3 - 100GBASE-LR4 or 25GBASE-LR\;4 - 100GBASE-ER4 or 25GBASE-ER\;5 - 100GBASE-SR10\;6 - 100G CWDM4\;7 - 100G PSM4 Parallel SMF\;8 - 100G ACC (Active Copper Cable) or 25GAUI C2M ACC. \;with FEC\;11 - 100GBASE-CR4 or 25GBASE-CR CA-L\;12 - 25GBASE-CR CA-S\;13 - 25GBASE-CR CA-N\;16 - 40GBASE-ER4\;17 - 4 x 10GBASE-SR\;18 - 40G PSM4 Parallel SMF\;19 - G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm \;SM)\;20 - G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm \;SM)\;21 - G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm \;SM)\;22 - 10GBASE-T with SFI electrical interface\;23 - 100G CLR4\;24 - 100G AOC or 25GAUI C2M AOC. No FEC\;25 - 100G ACC or 25GAUI C2M ACC. No FEC" access="RW" offset="0x4.8" size="0x0.8" />
+	<field name="ext_ethernet_compliance_code" descr="Extended Specification Compliance Codes \;Override byte192 per SFF-8636:\;0 - Unspecified\;1 - 100G AOC (Active Optical Cable) or 25GAUI C2M AOC \;with FEC\;2 - 100GBASE-SR4 or 25GBASE-SR\;3 - 100GBASE-LR4 or 25GBASE-LR\;4 - 100GBASE-ER4 or 25GBASE-ER\;5 - 100GBASE-SR10\;6 - 100G CWDM4\;7 - 100G PSM4 Parallel SMF\;8 - 100G ACC (Active Copper Cable) or 25GAUI C2M ACC. \;with FEC\;11 - 100GBASE-CR4 or 25GBASE-CR CA-L\;12 - 25GBASE-CR CA-S\;13 - 25GBASE-CR CA-N\;16 - 40GBASE-ER4\;17 - 4 x 10GBASE-SR\;18 - 40G PSM4 Parallel SMF\;19 - G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm SM)\;20 - G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm \;SM)\;21 - G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm \;SM)\;22 - 10GBASE-T with SFI electrical interface\;23 - 100G CLR4\;24 - 100G AOC or 25GAUI C2M AOC. No FEC\;25 - 100G ACC or 25GAUI C2M ACC. No FEC" access="RW" offset="0x4.8" size="0x0.8" />
 </node>
 
 <node name="pmmp_reg_ext" descr="" size="0x28.0" >
 	<field name="sticky" descr="When set will keep eeprom_override values after plug out \;event" access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is avail\;able." access="INDEX" offset="0x0.24" size="0x0.4" />
+	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is available." access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="eeprom_override" descr="Override/ignore EEPROM advertisement properties bitmask: \;Bit 0: Override_cable_protocols_and_technology_for_QSFP\;Bit 1: Override_cable_protocols_and_technology_for_SFP\;Bit 2: Ignore_Power_Class - set high power\;Bit 3: Override_Cable_Length \;Bit 4: Override_Attenuation\;Bit 8: Set_Module_to_Low_Power\;Bit 9: Override_cable_protocols_and_technology_for_CMIS - \;based modules QSFP-DD/ OSFP/ DSFP/ SFP-DD" access="RW" enum="Override_cable_protocols_and_technology_for_QSFP=0x1,Override_cable_protocols_and_technology_for_SFP=0x2,Ignore_Power_Class=0x4,Override_Cable_Length=0x8,Override_Attenuation=0x10,Set_Module_to_Low_Power=0x100,Override_cable_protocols_and_technology_for_CMIS=0x200" offset="0x4.0" size="0x0.16" />
 	<field name="eeprom_override_mask" descr="Write Mask bit (negative polarity):\;0 - allow write\;1 - ignore write\;On write commands, indicates which of the bits from \;eeprom_override field are updated.\;Reserved on read operations." access="WO" offset="0x4.16" size="0x0.16" />
-	<field name="qsfp_cable_protocol_technology" descr="Protocol technology override for QSFP cable or CMIS based \;cable (QSFP-DD/OSFP)\;Valid only when the protocols and technology for QSFP is \;overridden as indicated by eeprom_override\;Table  1267, &quot;PMMP - QSFP Protocol Bytes Override Layout,&quot; \;on page  1554\;Table  1271, &quot;PMMP - CMIS Protocol Bytes Override Layout,&quot; \;on page  1559" subnode="pmmp_reg_qsfp_cable_protocol_technology_auto_ext" access="RW" offset="0x8.0" size="0xc.0" union_selector="$(parent).eeprom_override" />
-	<field name="sfp_cable_protocol_technology" descr="Valid only when the protocols and technology is overridden as \;indicated by eeprom_override\;Table  1269, &quot;PMMP - SFP Protocol Bytes Override Layout,&quot; \;on page  1557" access="RW" high_bound="2" low_bound="0" offset="0x14.0" size="0xc.0" />
+	<field name="qsfp_cable_protocol_technology" descr="Protocol technology override for QSFP cable or CMIS based \;cable (QSFP-DD/OSFP)\;Valid only when the protocols and technology for QSFP is \;overridden as indicated by eeprom_override\;Table 1287, &quot;PMMP - QSFP Protocol Bytes Override Lay\;out,&quot; on page 1585\;Table 1291, &quot;PMMP - CMIS Protocol Bytes Override Lay\;out,&quot; on page 1590" subnode="pmmp_reg_qsfp_cable_protocol_technology_auto_ext" access="RW" offset="0x8.0" size="0xc.0" union_selector="$(parent).eeprom_override" />
+	<field name="sfp_cable_protocol_technology" descr="Valid only when the protocols and technology is overridden as \;indicated by eeprom_override\;Table 1289, &quot;PMMP - SFP Protocol Bytes Override Lay\;out,&quot; on page 1588" access="RW" high_bound="2" low_bound="0" offset="0x14.0" size="0xc.0" />
 	<field name="cable_length" descr="Length of cable assembly, units of 1 m for non CMIS cables.\;\;for CMIS cables, represents cable length field:\;bits 6:7 represent cable_length_multiplier for calculating \;cable length\;00 - 0.1 multiplier (0.1 to 6.3m)\;01- 1 multiplier (1 to 63m)\;10 - 10 multiplier (10 to 630m)\;11 - 100 multiplier (100 to 6300m)\;\;Valid only when the cable length is overridden as indicated by \;eeprom_override." access="RW" offset="0x20.0" size="0x0.8" />
 	<field name="attenuation_5g" descr="Valid only when the attenuation is overridden as indicated by \;eeprom_override.\;Attenuation - total channel attenuation @ 5GHz in db." access="RW" offset="0x24.0" size="0x0.8" />
 	<field name="attenuation_7g" descr="Valid only when the attenuation is overridden as indicated by \;eeprom_override.\;Attenuation - total channel attenuation @ 7GHz in db." access="RW" offset="0x24.8" size="0x0.8" />
@@ -2665,7 +2749,7 @@
 	<field name="swap_cap" descr="PAM4 MSB&lt;-&gt; LSB swapping is supported by the module" access="RO" offset="0x0.14" size="0x0.1" />
 	<field name="module" descr="module index" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is avail\;able." access="INDEX" offset="0x0.24" size="0x0.4" />
-	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PMPT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for \;get operations" access="OP" offset="0x0.29" size="0x0.1" />
+	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PMPT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for get \;operations" access="OP" offset="0x0.29" size="0x0.1" />
 	<field name="ls" descr="Per Lane configuration support/capability: \;0 - No support of per lane configuration\;1 - Support of per lane configuration" access="RO" offset="0x0.30" size="0x0.1" />
 	<field name="e" descr="Enable PRBS test mode bit:\;0 - PRBS is disabled.\;1 - PRBS is enabled." access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="prbs_modes_cap" descr="Supported module&apos;s PRBS capability (bitmask)\;Bit 0 - PRBS31 (x^31 + x^28 + 1)\;Bit 1 - PRBS23 (x^23 + x^18 + 1)\;Bit 5 - PRBS7 (x^7 + x^6 + 1)\;Bit 6 - PRBS11 (x^11 + x^9 + 1)\;Bit 11 - PRBS9 (x^9 + x^5 + 1)\;Bit 17 - PRBS13 (x^13 + x^12 + x^2+ x + 1)\;Bit 21 - SSPR\;Bit 22 - SSPRQ" access="RO" offset="0x4.0" size="0x4.0" />
@@ -2679,11 +2763,13 @@
 </node>
 
 <node name="pmtu_reg_ext" descr="" size="0x10.0" >
+	<field name="itre" descr="Ingress Truncation enable, the admin_mtu is used as \;truncation:\;0: disable\;1: enable\;Reserved when NICs (NICs use only &apos;0&apos;)\;Reserved when SwitchX/-2 and IB Switches (use only &apos;0&apos;)\;Reserved when i_e = 0 or 2" access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="i_e" descr="Ingress/Egress:\;0: applies for both ingress and for egress, read from \;egress\;1: applies only for ingress\;2: applies only for egress\;Reserved when NICs (NICs use only &apos;0&apos;)\;Reserved when SwitchX/-2 and IB Switches (use only &apos;0&apos;)" access="INDEX" offset="0x0.4" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
-	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="max_mtu" descr="Maximum MTU supported on the port (Read Only).\;MTU depends on the port type. When port type (Eth/IB/FC) is \;configured, the relevant MTU is reported. When the port type \;is not configured, the minimum between the max_mtu for \;the different types (Eth/IB/FC) is reported." access="RO" offset="0x4.16" size="0x0.16" />
-	<field name="admin_mtu" descr="Administratively configured MTU on the port. Must be \;smaller or equal to max_mtu." access="RW" offset="0x8.16" size="0x0.16" />
-	<field name="oper_mtu" descr="Operational MTU. This is the actual MTU configured on the \;ports. Packets exceeding this size will be dropped.\;Note: In Ethernet or FC, oper_mtu is equal to admin_mtu. In \;InfiniBand, the actual operational MTU is reported which \;may be smaller than admin_mtu." access="RO" offset="0xC.16" size="0x0.16" />
+	<field name="local_port" descr="Local port number\;Not including CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="max_mtu" descr="Maximum MTU supported on the port (Read Only).\;MTU depends on the port type. When port type (Eth/IB/FC) \;is configured, the relevant MTU is reported. When the port \;type is not configured, the minimum between the max\;_mtu for the different types (Eth/IB/FC) is reported." access="RO" offset="0x4.16" size="0x0.16" />
+	<field name="admin_mtu" descr="Administratively configured MTU on the port. Must be \;smaller or equal to max_mtu.\;When itre=1 then must be at least 128B and granularity is \;8B" access="RW" offset="0x8.16" size="0x0.16" />
+	<field name="oper_mtu" descr="Operational MTU. This is the actual MTU configured on the \;ports. Packets exceeding this size will be dropped.\;Note: For NICs and for IB the actual operational MTU is \;reported which may be smaller than admin_mtu.\;For NICs: when PCAM.max_admin_mtu capability is set \;then oper_mtu will be the max of all admin_mtu" access="RO" offset="0xC.16" size="0x0.16" />
 </node>
 
 <node name="port_state_behavior_ext" descr="" size="0x10.0" >
@@ -2691,30 +2777,30 @@
 </node>
 
 <node name="ppad_reg_ext" descr="" size="0x10.0" >
-	<field name="mac_47_32" descr="If single_base_mac = 0 - base MAC address, \;\;For HCA mac[7:0] is reserved \;If single_base_mac = 1 - the per port MAC address" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="mac_47_32" descr="If single_base_mac = 0 - base MAC address\;For HCA mac[7:0] is reserved \;If single_base_mac = 1 - the per port MAC address" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="local_port" descr="Port number\;Reserved when single_base_mac = 0" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.24" size="0x0.2" />
-	<field name="single_base_mac" descr="0: base_mac, local_port should be 0 and mac[6:0]and mac \;[5:0] are reserved in Spectrum-2 and Spectrum accor\;dantly.HW will set incremental \;1: single_mac - mac of the local_port\;Reserved for SwitchX/-2." access="OP" offset="0x0.28" size="0x0.1" />
-	<field name="mac_31_0" descr="If single_base_mac = 0 - base MAC address, \;\;For HCA mac[7:0] is reserved \;If single_base_mac = 1 - the per port MAC address" access="RW" offset="0x4.0" size="0x4.0" />
+	<field name="single_base_mac" descr="0: base_mac - Switch global MAC address. FW will set \;incremental MAC per port starting from the base_mac.\;1: single_mac - mac of the local_port\;Reserved for SwitchX/-2." access="OP" offset="0x0.28" size="0x0.1" />
+	<field name="mac_31_0" descr="If single_base_mac = 0 - base MAC address\;For HCA mac[7:0] is reserved \;If single_base_mac = 1 - the per port MAC address" access="RW" offset="0x4.0" size="0x4.0" />
 </node>
 
 <node name="ppaos_reg_ext" descr="" size="0x10.0" >
 	<field name="phy_test_mode_status" descr="Port extended down status:\;0: regular_operation - (port down/up according to \;PAOS) \;1: phy_test_mode\;phy test mode can be valid only when PAOS.admin\;_status=2 and PAOS.oper_status=2 (i.e port is down)." access="RO" enum="regular_operation=0x0,phy_test_mode=0x1" offset="0x0.0" size="0x0.4" />
 	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main\;5 - USR Tile\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
-	<field name="phy_test_mode_admin" descr="Port extended administrative down status:\;0: regular_operation (port down/up according to \;PAOS) \;1: phy_test_mode \;\;The phy test mode (1) can be set only when \;PAOS.admin_status=2 (i.e port configuration is down)." access="RW" offset="0x0.8" size="0x0.4" />
+	<field name="phy_test_mode_admin" descr="Port extended administrative down status:\;0: regular_operation (port down/up according to PAOS) \;1: phy_test_mode \;\;The phy test mode (1) can be set only when \;PAOS.admin_status=2 (i.e port configuration is down)." access="RW" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="swid" descr="For HCA: must always be 0.\;Switch partition ID with which to associate the port.\;Switch partitions are numbered from 0 to 7 inclusively.\;The swid field is only valid when the local_port is the \;router port. In this case, the swid indicates which of \;the router ports to configure/query." access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="phy_status" descr="rx phy status:\;0: rx_phy_down\;1: rx_phy_up\;2: rx_phy_down_by_command\;\;Note: The phy up indication is according to protocol \;(up == align_status=true)\;i.g. In PRBS test mode phy up is when PRB is lock \;(up== prbs lock)" access="RO" offset="0x4.0" size="0x0.4" />
+	<field name="phy_status" descr="rx phy status:\;0: rx_phy_down\;1: rx_phy_up\;2: rx_phy_down_by_command\;\;Note: The phy up indication is according to protocol (up \;== align_status=true)\;i.g. In PRBS test mode phy up is when PRB is lock \;(up== prbs lock)" access="RO" offset="0x4.0" size="0x0.4" />
 	<field name="phy_status_admin" descr="rx phy port admin. Controls phy entities operational \;port status.\;valid for port_type &lt;&gt; &apos;0&apos;.\;to operate link status for port_type &apos;0&apos; use \;PAOS.admin_status.\;0: rx_phy_down\;1: rx_phy_up\;" access="RW" offset="0x4.8" size="0x0.4" />
 </node>
 
 <node name="ppcc_reg_ext" descr="" size="0xfc.0" >
-	<field name="cmd_type" descr="0x0- get algo info\;0x1- enable algo\;0x2- disable algo\;0x3- get algo enabling status\;0x4- get num of params\;0x5- get param info\;0x6- get param\;0x7- get &amp; clear param\;0x8- set param\;\;0xA- bulk get. Reserved when method = Set\;0xB- bulk set. Reserved when method = Get\;0xC- bulk get counters. Reserved when method = Set\;0xD- bulk get and clear counters \;0xE- get num of counters. Reserved when method = Set\;0xF- get counter info. Reserved when method = Set" access="OP" offset="0x0.0" size="0x0.8" />
+	<field name="cmd_type" descr="0x0- get algo info\;0x1- enable algo\;0x2- disable algo\;0x3- get algo enabling status\;0x4- get num of params\;0x5- get param info\;0x6- get param\;0x7- get &amp; clear param\;0x8- set param\;\;0xA- bulk get. Reserved when method = Set\;0xB- bulk set. Reserved when method = Get\;0xC- bulk get counters. Reserved when method = Set\;0xD- bulk get and clear counters \;0xE- get num of counters. Reserved when method = Set\;0xF- get counter info. Reserved when method = Set\;0x10 - get algo info array" access="OP" offset="0x0.0" size="0x0.8" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB port number" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="local_port number" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="algo_index" descr="Selects the algo to operate on (0 - algo at bit #0, 1 - algo at bit \;#1, etc). \;For command types other than 0 (get algo info), must point to \;a present algo (an algo with a non-zero algo number - as \;returned via Command type 0)" access="INDEX" offset="0x4.0" size="0x0.4" />
+	<field name="algo_slot" descr="Selects the algo to operate on (0 - algo at bit #0, 1 - algo at bit \;#1, etc). \;For command types other than 0 (get algo info), must point to \;a present algo (an algo with a non-zero algo number - as \;returned via Command type 0)" access="INDEX" offset="0x4.0" size="0x0.4" />
 	<field name="algo_param_index" descr="Selects the specific param to get/set (if applicable, 0 if not). \;Index is zero-based. Must be smaller than value returned in \;get_num_of_params / get_num_of_counters. \;\;Reserved when command type != 0x5, 0x6, 0x7, 0x8, 0xF" access="INDEX" offset="0x4.16" size="0x0.16" />
 	<field name="value" descr="The layout of this field varies based on command type:\;For cmd_type = 0x0: returns 32-bit algo_num or 0 if no algo is \;available at this index\;For cmd_type = 0x3: returns 1 if enabled, 0 otherwise\;For cmd_type = 0x4: returns num of params algo has\;For cmd_type = 0x6:: returns value of param (selected by \;param index)\;For cmd_type = 0x7: returns value of param (selected by \;param index) and clears param\;For cmd_type = 0x8: The value to write to param (selected by \;param index). Set by the user. Set command is silently ignored \;if value outside min..max values (comparison is unsigned) or \;if param permission is not read-write.\;For cmd_type = 0xE: returns num of counters algo has\;\;All the rest: returns 0" access="RW" offset="0x8.0" size="0x4.0" />
 	<field name="param_value1" descr="For cmd_type = 0x5: return default value of param\;\;\;\;Reserved for other commands" access="RO" offset="0xC.0" size="0x4.0" />
@@ -2723,8 +2809,19 @@
 	<field name="sl_bitmask" descr="This field allows to apply to specific SLs based on the bitmask. \;When a bit is set, it&apos;s index SL shall be configured." access="RW" offset="0x18.0" size="0x0.16" />
 	<field name="prm" descr="When cmd_type = 0x5 / 0xF:\;0-param / counter is read-only\;1-param / counter is read-write\;2-param / counter is read-only but may also be accessed and \;cleared via &quot;get &amp; clear&quot; command\;Reserved for other commands" access="RO" offset="0x1C.0" size="0x0.2" />
 	<field name="sl_bitmask_support" descr="Indicates whether the device supports sl_bitmask logic" access="RO" offset="0x1C.2" size="0x0.1" />
+	<field name="counter_en" descr="when set, enables PPC algo specific counters, else disabled.\;Each port supports one set of counters, e.g The counters are \;supported only on one specific set of [algo_slot, sl_bitmap],\;" access="RW" offset="0x1C.3" size="0x0.1" />
+	<field name="trace_en" descr="when set, indicates algorithm trace mechanism is enabled. \;Else, trace is disabled" access="RW" offset="0x1C.4" size="0x0.1" />
 	<field name="text_length" descr="Length in bytes of text field\;Valid when cmd_type = 0x0 / 0x5 \;Reserved for other commands" access="RO" offset="0x1C.8" size="0x0.8" />
-	<field name="text" descr="The layout of this field varies based on command type:\;0x0: algo name, comma,  algo description (ASCII string) \;[Internal] e.g &quot;RPG_time_reset, the time between RPG \;resets&quot;\;0x5: param name, comma,  param description (ASCII string)\;[Internal]0x9: algo-specific binary diagnostics data\;0xA: Array of 32 bits parameters, starting from parameter \;index 0 up to (text_len/4 -1)\;0xB: Array of 32 bits parameters, starting from parameter \;index 0 up to (text_len/4 -1)\;0xC: Array of 32 bits counters, starting from parameter index \;0 up to (text_len/4 -1)\;0xD: Array of 32 bits counters, starting from parameter index \;0 up to (text_len/4 -1)\;0xF: counter name, comma,  counter description (ASCII \;string)\;All commands are limited by text_len" access="RO" high_bound="54" low_bound="0" offset="0x20.0" size="0xdc.0" />
+	<field name="text" descr="The layout of this field varies based on command type:\;0x0: algo name, comma,  algo description (ASCII string) \;[Internal] e.g &quot;RPG_time_reset, the time between RPG \;resets&quot;\;0x5: param name, comma,  param description (ASCII string)\;[Internal]0x9: algo-specific binary diagnostics data\;0xA: Array of 32 bits parameters, starting from parameter \;index 0 up to (text_len/4 -1)\;0xB: Array of 32 bits parameters, starting from parameter \;index 0 up to (text_len/4 -1)\;0xC: Array of 32 bits counters, starting from parameter index \;0 up to (text_len/4 -1)\;0xD: Array of 32 bits counters, starting from parameter index \;0 up to (text_len/4 -1)\;0xF: counter name, comma,  counter description (ASCII \;string)\;0x10: array of 32bit Algo info, up to 16 entries, representing \;which algo id is present per slot. Zero value means algo id is \;irrelevant.\;Algo Info: algo_id[31:16], algo_major_ver[15:8] algo_mi\;nor_ver[7:0]\;All commands are limited by text_len" access="RO" high_bound="54" low_bound="0" offset="0x20.0" size="0xdc.0" />
+</node>
+
+<node name="ppcnt_infiniband_general_counter_ext" descr="" size="0xf8.0" >
+	<field name="port_rcv_data_qword_high" descr="Total number of data in Qword (8 Bytes), \;received on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0x0.0" size="0x4.0" />
+	<field name="port_rcv_data_qword_low" descr="Total number of data in Qword (8 Bytes), \;received on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0x4.0" size="0x4.0" />
+	<field name="port_xmit_data_qword_high" descr="Total number of data in Qword (8 Bytes), trans\;mitted on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="port_xmit_data_qword_low" descr="Total number of data in Qword (8 Bytes), trans\;mitted on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="rq_general_error_high" descr="The total number of packets that were dropped \;since it contained errors. Reasons for this \;include:\;1. dropped due to MPR mismatch.\;Supported only when indicated by PCAM." access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="rq_general_error_low" descr="The total number of packets that were dropped \;since it contained errors. Reasons for this \;include:\;1. dropped due to MPR mismatch.\;Supported only when indicated by PCAM." access="RO" offset="0x14.0" size="0x4.0" />
 </node>
 
 <node name="ppcnt_infiniband_packets_counter_ext" descr="" size="0xf8.0" >
@@ -2771,8 +2868,8 @@
 	<field name="plr_sync_events_low" descr="The number of sync events" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="hi_retransmission_rate_high" descr="High retransmission rate\;The number of the retransmission rate has \;crossed the retransmission rate threshold\;" access="RO" offset="0x38.0" size="0x4.0" />
 	<field name="hi_retransmission_rate_low" descr="High retransmission rate\;The number of the retransmission rate has \;crossed the retransmission rate threshold\;" access="RO" offset="0x3C.0" size="0x4.0" />
-	<field name="plr_xmit_retry_codes_within_t_sec_max_high" descr="The maximum number of retransmitted \;events in t sec window\;" access="RO" offset="0x40.0" size="0x4.0" />
-	<field name="plr_xmit_retry_codes_within_t_sec_max_low" descr="The maximum number of retransmitted \;events in t sec window\;" access="RO" offset="0x44.0" size="0x4.0" />
+	<field name="plr_xmit_retry_codes_within_t_sec_max_high" descr="The maximum number of retransmitted events \;in t sec window\;" access="RO" offset="0x40.0" size="0x4.0" />
+	<field name="plr_xmit_retry_codes_within_t_sec_max_low" descr="The maximum number of retransmitted events \;in t sec window\;" access="RO" offset="0x44.0" size="0x4.0" />
 </node>
 
 <node name="ppcnt_reg_counter_set_auto_ext" descr="" attr_is_union="1" size="0xf8.0" >
@@ -2795,20 +2892,22 @@
 	<field name="ppcnt_plr_counters_ext" descr="" subnode="ppcnt_plr_counters_ext" offset="0x0.0" selected_by="PLR_counters_group" size="0xf8.0" />
 	<field name="ppcnt_rs_fec_histograms_counters_ext" descr="" subnode="ppcnt_rs_fec_histograms_counters_ext" offset="0x0.0" selected_by="RS_FEC_Histogram_group" size="0xf8.0" />
 	<field name="usr_xsr_physical_layer_ext" descr="" subnode="usr_xsr_physical_layer_ext" offset="0x0.0" selected_by="USR_XSR_Physical_layer_counters_group" size="0xf8.0" />
-	<field name="ppcnt_infiniband_packets_counter_ext" descr="" subnode="ppcnt_infiniband_packets_counter_ext" offset="0x0.0" selected_by="Infiniband_pkts_counters" size="0xf8.0" />
+	<field name="ppcnt_infiniband_packets_counter_ext" descr="" subnode="ppcnt_infiniband_packets_counter_ext" offset="0x0.0" selected_by="InfiniBand_pkts_counters" size="0xf8.0" />
+	<field name="ppcnt_infiniband_general_counter_ext" descr="" subnode="ppcnt_infiniband_general_counter_ext" offset="0x0.0" selected_by="InfiniBand_General_Counters" size="0xf8.0" />
 </node>
 
 <node name="ppcnt_reg_ext" descr="" size="0x100.0" >
-	<field name="grp" descr="Performance counter group.\;Group 63 indicates all groups (include all per priority/TC/Receive Buffer \;counters). Only valid on Set() operation with clr bit set.\;0x0: IEEE_802_3_Counters\;0x1: RFC_2863_Counters\;0x2: RFC_2819_Counters\;0x3: RFC_3635_Counters\;0x5: Ethernet_Extended_Counters\;0x6: Ethernet_Discard_Counters \;0x8: Link_Level_Retransmission_Counters - [Internal]\;0x10: Per_Priority_Counters - \;0x11: Per_Traffic_Class_Counters - \;0x12: Physical_Layer_Counters\;0x13: Per_Traffic_Class_Congestion_Counters\;0x15: Per_Receive_Buffer_Counters - [Internal]\;0x16: Physical_Layer_Statistical_Counters\;0x19: Out_of_Band_Port_Counters - Note: This group is valid only for OOB \;ports - [Internal]\;0x20: InfiniBand_Port_Counters\;0x21: InfiniBand_Extended_Port_Counters\;0x22: PLR_counters_group\;0x23: RS_FEC_Histogram_group\;0x24: USR_XSR_Physical_layer_counters_group - [Internal]\;0x25: Infiniband_pkts_counters - [Internal]\;" access="INDEX" enum="IEEE_802_3_Counters=0x0,RFC_2863_Counters=0x1,RFC_2819_Counters=0x2,RFC_3635_Counters=0x3,Ethernet_Extended_Counters=0x5,Ethernet_Discard_Counters=0x6,Link_Level_Retransmission_Counters=0x8,Per_Priority_Counters=0x10,Per_Traffic_Class_Counters=0x11,Physical_Layer_Counters=0x12,Per_Traffic_Class_Congestion_Counters=0x13,Per_Receive_Buffer_Counters=0x15,Physical_Layer_Statistical_Counters=0x16,Out_of_Band_Port_Counters=0x19,InfiniBand_Port_Counters=0x20,InfiniBand_Extended_Port_Counters=0x21,PLR_counters_group=0x22,RS_FEC_Histogram_group=0x23,USR_XSR_Physical_layer_counters_group=0x24,Infiniband_pkts_counters=0x25" offset="0x0.0" size="0x0.6" />
+	<field name="grp" descr="Performance counter group.\;Group 63 indicates all groups (include all per priority/TC/Receive Buffer count\;ers). Only valid on Set() operation with clr bit set.\;0x0: IEEE_802_3_Counters\;0x1: RFC_2863_Counters\;0x2: RFC_2819_Counters\;0x3: RFC_3635_Counters\;0x5: Ethernet_Extended_Counters\;0x6: Ethernet_Discard_Counters \;0x8: Link_Level_Retransmission_Counters - [Internal]\;0x10: Per_Priority_Counters - \;0x11: Per_Traffic_Class_Counters - \;0x12: Physical_Layer_Counters\;0x13: Per_Traffic_Class_Congestion_Counters\;0x15: Per_Receive_Buffer_Counters - [Internal]\;0x16: Physical_Layer_Statistical_Counters\;0x19: Out_of_Band_Port_Counters - Note: This group is valid only for OOB \;ports - [Internal]\;0x20: InfiniBand_Port_Counters\;0x21: InfiniBand_Extended_Port_Counters\;0x22: PLR_counters_group\;0x23: RS_FEC_Histogram_group\;0x24: USR_XSR_Physical_layer_counters_group - [Internal]\;0x25: InfiniBand_pkts_counters - [Internal]\;0x26: InfiniBand_General_Counters\;" access="INDEX" enum="IEEE_802_3_Counters=0x0,RFC_2863_Counters=0x1,RFC_2819_Counters=0x2,RFC_3635_Counters=0x3,Ethernet_Extended_Counters=0x5,Ethernet_Discard_Counters=0x6,Link_Level_Retransmission_Counters=0x8,Per_Priority_Counters=0x10,Per_Traffic_Class_Counters=0x11,Physical_Layer_Counters=0x12,Per_Traffic_Class_Congestion_Counters=0x13,Per_Receive_Buffer_Counters=0x15,Physical_Layer_Statistical_Counters=0x16,Out_of_Band_Port_Counters=0x19,InfiniBand_Port_Counters=0x20,InfiniBand_Extended_Port_Counters=0x21,PLR_counters_group=0x22,RS_FEC_Histogram_group=0x23,USR_XSR_Physical_layer_counters_group=0x24,InfiniBand_pkts_counters=0x25,InfiniBand_General_Counters=0x26" offset="0x0.0" size="0x0.6" />
 	<field name="port_type" descr="Supported only when indicated by PCAM on FPGA based NICs:\;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type:\;0: Local_port_number\;1: IB_port_number\;2: host_port_number\;3: OOB_port_number - Internal\;\;Note - pnat=2 is supported for &quot;Per Traffic Class Congestion \;Counters&quot; and &quot;Per Traffic Class Counters&quot; groups." access="INDEX" enum="Local_port_number=0x0,IB_port_number=0x1,host_port_number=0x2,OOB_port_number=0x3" offset="0x0.14" size="0x0.2" />
-	<field name="local_port" descr="Local port number. \;Note:\;when lp_gl = 0, 255 indicates all ports on the device, and is \;only allowed for Set() operation.\;when lp_gl = 1, the index is global port number" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="local_port" descr="Local port number. \;Note:\;when lp_gl = 0, 255 indicates all ports on the device, and is only \;allowed for Set() operation.\;when lp_gl = 1, the index is global port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="swid" descr="For HCA: must be always 0.\;Switch partition ID to associate port with.\;Switch partitions are numbered from 0 to 7 inclusively.\;Switch partition 254 indicates stacking ports.\;Switch partition 255 indicates all switch partitions.\;Only valid on Set() operation with local_port=255." access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="prio_tc" descr="Priority index for per priority counter sets, valid values: 0-7\;For Spectrum-2 and on at tx side range can be 0 .. cap_max_t\;class_data-1, see QGCR.tx_cnt_tclass\;\;Traffic class index for per traffic class counter set, valid val\;ues: \;For Switches, valid values: 0 .. cap_max_tclass_data-1 \;\;For HCA, valid values: 0.. HCA_CAP.max_tc\;\;Otherwise must be 0." access="INDEX" offset="0x4.0" size="0x0.5" />
+	<field name="grp_profile" descr="Supported only when indicated by PCAM: PPCNT_grp_pro\;file_supported (bit 73).\;The group profile index. Relevant only if the clr bit is set.\;0: Will reset the counter value for all counters in the counter \;group.\;Else: Will point to the corresponding bit-map profile in the \;PPCGP register. The bit map will return the specific counters \;that will be reset in the group.\;\;NOTE: The grp_profile index is not supported for the following \;counters groups:\;1. 0x12: Physical_Layer_Counters\;2. 0x16: Physical_Layer_Statistical_Counters\;3. 0x22: PLR_counters_group\;" access="INDEX" offset="0x4.5" size="0x0.3" />
 	<field name="lp_gl" descr="Local Port global variable\;0: local_port port 255 = all ports of the device.\;1: local_port index indicates Local port number." access="OP" offset="0x4.30" size="0x0.1" />
-	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter value \;for all counters in the counter group. This bit can be set for \;both Set() and Get() operation.\;\;" access="OP" offset="0x4.31" size="0x0.1" />
-	<field name="counter_set" descr="Counter set as described in\;Table  1175, &quot;Ethernet IEEE 802.3 Counters Group Data Lay\;out,&quot; on page  1457\;Table  1177, &quot;Ethernet RFC 2863 Counter Group Data Layout,&quot; \;on page  1462\;Table  1179, &quot;Ethernet RFC 2819 Counter Group Data Layout,&quot; \;on page  1465\;Table  1181, &quot;Ethernet RFC 3635 Counter Group Data Layout,&quot; \;on page  1470\;Table  1183, &quot;Ethernet Extended Counter Group Data Layout,&quot; \;on page  1474\;Table  1186, &quot;Ethernet Discard Counter Group Fields,&quot; on \;page  1479\;Table  1197, &quot;Link Level Retransmission Counter Group Data \;Layout,&quot; on page  1492\;Table  1187, &quot;Ethernet Per Priority Group Data Layout,&quot; on \;page  1481\;Table  1191, &quot;Ethernet Per Traffic Class Group data layout,&quot; on \;page  1489\;Table  1203, &quot;Physical Layer Counters Data Layout,&quot; on \;page  1500\;Table  1193, &quot;Ethernet Per Traffic Class Congestion Group data \;layout,&quot; on page  1490\;Table  1195, &quot;Ethernet Per Receive Buffer Group data layout,&quot; \;on page  1491\;Table  1207, &quot;Physical Layer Statistical Counters Data Layout,&quot; \;on page  1509 \;Table  1189, &quot;Ethernet OOB Port Counters Data Layout,&quot; on \;page  1485 - [Internal]\;Table  1199, &quot;InfiniBand PortCounters Attribute Group Data \;Layout,&quot; on page  1494\;Table  1201, &quot;InfiniBand Extended PortCounters Attribute \;Group Data Layout,&quot; on page  1496\;Table  1209, &quot;PLR Counters Data Layout,&quot; on page  1514 - \;[Internal]\;Table  1211, &quot;RS-Histograms Data Layout,&quot; on page  1516 \;Table  1205, &quot;USR_XSR Physical Layer Counters Data Layout,&quot; \;on page  1505\;Table  1213, &quot;Infiniband Packets Counters Data Layout,&quot; on \;page  1517" subnode="ppcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
+	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter value \;for all counters in the counter group. This bit can be set for \;both Set() and Get() operation.\;\;\;NOTE: Clearing a certain group&apos;s counters can influence \;another group&apos;s counters value." access="OP" offset="0x4.31" size="0x0.1" />
+	<field name="counter_set" descr="Counter set as described in\;Table 1195, &quot;Ethernet IEEE 802.3 Counters Group Data \;Layout,&quot; on page 1488\;Table 1197, &quot;Ethernet RFC 2863 Counter Group Data Lay\;out,&quot; on page 1493\;Table 1199, &quot;Ethernet RFC 2819 Counter Group Data Lay\;out,&quot; on page 1496\;Table 1201, &quot;Ethernet RFC 3635 Counter Group Data Lay\;out,&quot; on page 1501\;Table 1203, &quot;Ethernet Extended Counter Group Data Lay\;out,&quot; on page 1505\;Table 1206, &quot;Ethernet Discard Counter Group Fields,&quot; on \;page 1510\;Table 1217, &quot;Link Level Retransmission Counter Group \;Data Layout,&quot; on page 1523\;Table 1207, &quot;Ethernet Per Priority Group Data Layout,&quot; \;on page 1512\;Table 1211, &quot;Ethernet Per Traffic Class Group data lay\;out,&quot; on page 1520\;Table 1223, &quot;Physical Layer Counters Data Layout,&quot; on \;page 1531\;Table 1213, &quot;Ethernet Per Traffic Class Congestion Group \;data layout,&quot; on page 1521\;Table 1215, &quot;Ethernet Per Receive Buffer Group data lay\;out,&quot; on page 1522\;Table 1227, &quot;Physical Layer Statistical Counters Data \;Layout,&quot; on page 1541 \;Table 1209, &quot;Ethernet OOB Port Counters Data Layout,&quot; \;on page 1516 - [Internal]\;Table 1219, &quot;InfiniBand PortCounters Attribute Group \;Data Layout,&quot; on page 1525\;Table 1221, &quot;InfiniBand Extended PortCounters Attribute \;Group Data Layout,&quot; on page 1527\;Table 1229, &quot;PLR Counters Data Layout,&quot; on page 1546 \;Table 1231, &quot;RS-Histograms Data Layout,&quot; on page 1548 \;Table 1225, &quot;USR_XSR Physical Layer Counters Data \;Layout,&quot; on page 1537\;Table 1233, &quot;InfiniBand Packets Counters Data Layout,&quot; \;on page 1549\;Table 1235, &quot;InfiniBand General Counters Data Layout,&quot; \;on page 1551" subnode="ppcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
 </node>
 
 <node name="ppcnt_rs_fec_histograms_counters_ext" descr="" size="0xf8.0" >
@@ -2826,16 +2925,16 @@
 	<field name="pnat" descr="Port number access type:\;0: Local_port_number\;1: IB_port_number" access="INDEX" enum="Local_port_number=0x0,IB_port_number=0x1" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="local_port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="active_hist_type" descr="0 - invalid (Link down / unsupported) \;1 - KP4 RS-FEC (544,514) errors \;2 - LL RS-FEC (271,257) / (272,257+1) errors\;3 - KR4 RS-FEC (528,514) errors" access="RO" offset="0x0.28" size="0x0.4" />
-	<field name="hist_type" descr="0: According to active link\;1: KP4 RS-FEC (544,514) errors \;2: LL RS-FEC (271,257) / (272,257+1) errors\;3: KR4 RS-FEC (528,514) errors" access="INDEX" offset="0x4.0" size="0x0.4" />
+	<field name="hist_type" descr="0: According to active link\;\;[internal] - supported only for active links.\;for future use:\;1: KP4 RS-FEC (544,514) errors \;2: LL RS-FEC (271,257) / (272,257+1) errors\;3: KR4 RS-FEC (528,514) errors" access="INDEX" offset="0x4.0" size="0x0.4" />
 	<field name="num_of_bins" descr="Available number of bins \;" access="RO" offset="0x4.16" size="0x0.8" />
-	<field name="hist_min_measurement" descr="Lowest measurement/low limit of the histogram \;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors(= 0)\;In case of hist_type = 2, represent LL RS FEC symbol \;errors ( = 0)\;" access="RO" offset="0x8.0" size="0x0.8" />
-	<field name="hist_max_measurement" descr="Highest measurement/high limit of the histogram:\;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors ( = 15)\;In case of hist_type = 2, represent LL RS FEC symbol \;errors ( = 7)" access="RO" offset="0x8.16" size="0x0.8" />
-	<field name="bin_range_write_mask" descr="Valid only if we (write enable) = 1 \;Ignored on GET \;Write mask for the bin_range array. \;If bit X is set, bin_range [X] write should be execute\;Else if bit X is clear, ignored value in written to bin_range \;[X]" access="WO" offset="0xC.0" size="0x0.16" />
-	<field name="bin_range" descr="Write to bin_range[x] is applicable only if we = 1 &amp; the cor\;responding bits in bin_range_write_mask is set.\;Mapping of measurement units to a bin\;See Table 1447, &quot;PPHCR - Port Phy Bin Range Histogram \;Configuration Layout,&quot; on page 1773" subnode="pphcr_bin_range_ext" access="RW" high_bound="15" low_bound="0" offset="0x10.0" size="0x40.0" />
+	<field name="hist_min_measurement" descr="Lowest measurement/low limit of the histogram \;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors(= 0)\;In case of hist_type = 2, represent LL RS FEC symbol errors \;( = 0)\;" access="RO" offset="0x8.0" size="0x0.8" />
+	<field name="hist_max_measurement" descr="Highest measurement/high limit of the histogram:\;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors ( = 15)\;In case of hist_type = 2, represent LL RS FEC symbol errors \;( = 7)" access="RO" offset="0x8.16" size="0x0.8" />
+	<field name="bin_range_write_mask" descr="Valid only if we (write enable) = 1 \;Ignored on GET \;Write mask for the bin_range array. \;If bit X is set, bin_range [X] write should be execute\;Else if bit X is clear, ignored value in written to bin_range [X]" access="WO" offset="0xC.0" size="0x0.16" />
+	<field name="bin_range" descr="Write to bin_range[x] is applicable only if we = 1 &amp; the cor\;responding bits in bin_range_write_mask is set.\;Mapping of measurement units to a bin\;See Table 1471, &quot;PPHCR - Port Phy Bin Range Histo\;gram Configuration Layout,&quot; on page 1809" subnode="pphcr_bin_range_ext" access="RW" high_bound="15" low_bound="0" offset="0x10.0" size="0x40.0" />
 </node>
 
 <node name="pplm_reg_ext" descr="" size="0x50.0" >
-	<field name="port_type" descr="Supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Gearbox - Host side)\;2 - Internal IC Port \;3 - Far-End Port (For Gearbox - Line side)\;Other values are reserved.\;\;Using port_type &apos;0&apos; will override all different parts of the link \;structure\;Using port_type &apos;1&apos; will configure also port_type &apos;2&apos; accord\;ingly and vise versa" access="INDEX" offset="0x0.8" size="0x0.4" />
+	<field name="port_type" descr="Supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Gearbox - Host side)\;2 - Internal IC Port \;3 - Far-End Port (For Gearbox - Line side)\;4 - Main Die to Die (USR / SCC)\;5 - Tile Die to Die (USR / SCC)\;\;Other values are reserved.\;\;Using port_type &apos;0&apos; will override all different parts of the link \;structure\;Using port_type &apos;1&apos; will configure also port_type &apos;2&apos; accordingly \;and vise versa\;Using port_type &apos;4&apos; will configure also port_type &apos;5&apos; accordingly \;and vise versa" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. \;0 - Local port number\;1 - IB / label port number\;[Internal] 3 - Out of band" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -2847,16 +2946,16 @@
 	<field name="fec_override_cap_56g" descr="56GE Ethernet FEC override capability bitmask:\;0: No-FEC\;1: Firecode_FEC\;2: Reserved2\;3: Reserved3" access="RO" enum="No=0x0,Firecode_FEC=0x1,Reserved2=0x2,Reserved3=0x3" offset="0x10.16" size="0x0.4" />
 	<field name="rs_fec_correction_bypass_cap" descr="RS-FEC correction bypass override capability:\;0: NO_correction_bypass\;1: RS-FEC_correction_bypass" access="RO" enum="NO_correction_bypass=0x0,RS=0x1" offset="0x10.28" size="0x0.4" />
 	<field name="fec_override_admin_10g_40g" descr="10GE/40GE Ethernet FEC override admin, see \;10g_40g_fec_override_cap.\;(one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;\;" access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2" offset="0x14.0" size="0x0.4" />
-	<field name="fec_override_admin_25g" descr="25GE Ethernet FEC override admin, see 25g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_ad\;min must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.4" size="0x0.4" />
-	<field name="fec_override_admin_50g" descr="50GE Ethernet FEC override admin, see 50g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_ad\;min must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.8" size="0x0.4" />
-	<field name="fec_override_admin_100g" descr="100GE Ethernet FEC override admin, see 100g_fec_over\;ride_cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;4: RS-FEC" access="RW" enum="auto_mode=0x0,No_FEC=0x1,RS=0x4" offset="0x14.12" size="0x0.4" />
+	<field name="fec_override_admin_25g" descr="25GE Ethernet FEC override admin, see 25g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_admin \;must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.4" size="0x0.4" />
+	<field name="fec_override_admin_50g" descr="50GE Ethernet FEC override admin, see 50g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_admin \;must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.8" size="0x0.4" />
+	<field name="fec_override_admin_100g" descr="100GE Ethernet FEC override admin, see 100g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;4: RS-FEC" access="RW" enum="auto_mode=0x0,No_FEC=0x1,RS=0x4" offset="0x14.12" size="0x0.4" />
 	<field name="fec_override_admin_56g" descr="56GE Ethernet FEC override admin, see 56g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC" access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2" offset="0x14.16" size="0x0.4" />
 	<field name="rs_fec_correction_bypass_admin" descr="RS-FEC correction bypass override admin: (one-hot setting): \;0: auto_mode - no override \;1: NO_correction_bypass\;2: RS-FEC_correction_bypass" access="RW" enum="auto_mode=0x0,NO_correction_bypass=0x1,RS=0x2" offset="0x14.28" size="0x0.4" />
 	<field name="fec_override_cap_200g_4x" descr="200GE FEC override capability bitmask:\;Bit 0 - Reserved \;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved \;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium LL RS-FEC (272,257+1)\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;[Internal] Bit 14 - ELL (272,257+1) + PLR\;" access="RO" offset="0x18.0" size="0x0.16" />
 	<field name="fec_override_cap_400g_8x" descr="400GE FEC override capability bitmask:\;Bit 0 - Reserved \;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved\;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium LL RS-FEC (272,257+1)\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;[Internal] Bit 14 - ELL (272,257+1) + PLR\;" access="RO" offset="0x18.16" size="0x0.16" />
 	<field name="fec_override_cap_50g_1x" descr="50GE single lane override capability bitmask:\;Bit 0 - Reserved \;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved \;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium LL RS-FEC (272,257+1)\;[Internal] Bit 12 - RS-FEC - (544,514) + PLR\;[Internal] Bit 13 - LL-FEC - (271,257) + PLR\;[Internal] Bit 14 - ELL - (272,257+1) + PLR" access="RO" offset="0x1C.0" size="0x0.16" />
 	<field name="fec_override_cap_100g_2x" descr="100GE over 2 lanes, FEC override capability bitmask:\;Bit 0 - Reserved\;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved \;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium Low Latency RS-FEC \;(272,257+1)\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;[Internal] Bit 14 - ELL (272,257+1) + PLR\;" access="RO" offset="0x1C.16" size="0x0.16" />
-	<field name="fec_override_admin_200g_4x" descr="200GE FEC override admin bitmask (one-hot setting) \;Bit 0: Auto_mode\;Bit 7: RS_FEC_544_514 - (544,514)\;Bit 8: Zero_Latency_FEC - [Internal] \;Bit 9: RS_FEC_272_257_plus_1 - (272,257+1)\;Bit 12: RS_FEC_544_514_PLR - (544,514) + PLR [Internal]\;Bit 13: LL_FEC_271_257_PLR - (271,257) + PLR [Internal]\;Bit 14: LL_FEC_272_257_plus_1 - (272,257+1) + PLR [Inter\;nal]" access="RW" enum="Auto_mode=0x1,RS_FEC_544_514=0x80,Zero_Latency_FEC=0x100,RS_FEC_272_257_plus_1=0x200,RS_FEC_544_514_PLR=0x1000,LL_FEC_271_257_PLR=0x2000,LL_FEC_272_257_plus_1=0x4000" offset="0x20.0" size="0x0.16" />
+	<field name="fec_override_admin_200g_4x" descr="200GE FEC override admin bitmask (one-hot setting) \;Bit 0: Auto_mode\;Bit 7: RS_FEC_544_514 - (544,514)\;Bit 8: Zero_Latency_FEC - [Internal] \;Bit 9: RS_FEC_272_257_plus_1 - (272,257+1)\;Bit 12: RS_FEC_544_514_PLR - (544,514) + PLR [Internal]\;Bit 13: LL_FEC_271_257_PLR - (271,257) + PLR [Internal]\;Bit 14: LL_FEC_272_257_plus_1 - (272,257+1) + PLR [Internal]" access="RW" enum="Auto_mode=0x1,RS_FEC_544_514=0x80,Zero_Latency_FEC=0x100,RS_FEC_272_257_plus_1=0x200,RS_FEC_544_514_PLR=0x1000,LL_FEC_271_257_PLR=0x2000,LL_FEC_272_257_plus_1=0x4000" offset="0x20.0" size="0x0.16" />
 	<field name="fec_override_admin_400g_8x" descr="400GE FEC override admin bitmast (one-hot setting): \;0: Auto_mode\;7: RS-FEC_(544,514)\;8: Zero_Latency_FEC \;9: RS-FEC_(272,257+1)\;12: RS-FEC_(544,514) - + PLR [Internal]\;13: LL-FEC_(271,257) - + PLR [Internal]\;14: LL-FEC_(272,257+1) - + PLR [Internal]" access="RW" offset="0x20.16" size="0x0.16" />
 	<field name="fec_override_admin_50g_1x" descr="50GE, 1lanes FEC override admin bitmask (one-hot setting)\;0 - Auto mode\;Bit 7 is set- RS-FEC (544,514)\;[Internal] Bit 8 is set - Zero Latency FEC \;Bit 9 is set - RS-FEC (272,257+1)\;[Internal] Bit 12 is set - RS-FEC (544,514) + PLR\;[Internal] Bit 13 is set - LL-FEC (271,257) + PLR \;[Internal] Bit 14 is set - LL-FEC (272,257+1) + PLR" access="RW" offset="0x24.0" size="0x0.16" />
 	<field name="fec_override_admin_100g_2x" descr="100GE, 2 lanes FEC override admin bitmask (one-hot setting):\;0: Auto_mode\;Bit 0 is set - Reserved\;Bit 2 is set - Reserved \;Bit 7 is set- RS-FEC (544,514)\;[Internal] Bit 8 is set - Zero Latency FEC \;Bit 9 is set - RS-FEC (272,257+1)\;[Internal] Bit 12 is set - RS-FEC (544,514) + PLR\;[Internal] Bit 13 is set - LL-FEC (271,257) + PLR \;[Internal] Bit 14 is set - LL-FEC (272,257+1) + PLR" access="RW" offset="0x24.16" size="0x0.16" />
@@ -2875,12 +2974,12 @@
 	<field name="op_mod" descr="operational mode for link configurations for phy_ local_loop\;back mode.\;0 - link will operate in optimal latency performance mode\;1 - link will operate in same configurations as operational \;port.\;\;Note: for FEC override via PPLM register, chosen FEC will be \;according to the PPLM configuration that was set and this bit \;will be ignored for FEC purposes" access="OP" offset="0x0.8" size="0x0.1" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="lb_en" descr="Loopback enable - One-hot key.\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback\;Bit 2: External_local_loopback\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback" access="RW" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80" offset="0x4.0" size="0x0.8" />
-	<field name="lb_cap" descr="Loopback capability - bitmask\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback - When set the port&apos;s egress traffic \;is looped back to the receiver and the port transmitter is dis\;abled.\;Bit 2: External_local_loopback - Enables the port&apos;s transmit\;ter to link with the port&apos;s receiver using an external loopback \;connector.\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback - When set the port&apos;s egress Link \;layer traffic is looped back to the receiver. Physical port in \;this loopback mode is down.\;\;Note - Phy remote loopback can be supported only for lane \;rate higher than 25Gbuad in the 16nm devices.\;" access="RO" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80" offset="0x4.16" size="0x0.8" />
+	<field name="lb_en" descr="Loopback enable - One-hot key.\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback\;Bit 2: External_local_loopback\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback\;Bit 8: GLoop - [internal]" access="RW" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80,GLoop=0x100" offset="0x4.0" size="0x0.12" />
+	<field name="lb_cap" descr="Loopback capability - bitmask\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback - When set the port&apos;s egress traffic \;is looped back to the receiver and the port transmitter is dis\;abled.\;Bit 2: External_local_loopback - Enables the port&apos;s transmit\;ter to link with the port&apos;s receiver using an external loopback \;connector.\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback - When set the port&apos;s egress Link \;layer traffic is looped back to the receiver. Physical port in this \;loopback mode is down.\;Bit 8: GLoop - [internal]\;\;Note - Phy remote loopback can be supported only for lane \;rate higher than 25Gbuad in the 16nm devices.\;" access="RO" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80,GLoop=0x100" offset="0x4.16" size="0x0.12" />
 </node>
 
 <node name="pprt_reg_ext" descr="" size="0x24.0" >
-	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPRT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for \;get operations." access="OP" offset="0x0.0" size="0x0.1" />
+	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPRT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for get \;operations." access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="ls" descr="Per Lane configuration support: \;0 - No support of per lane configuration\;1 - Support of per lane configuration" access="RO" offset="0x0.1" size="0x0.1" />
 	<field name="port_type" descr="Supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR main\;5 - USR tail\;Other values are reserved.\;" access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Reserved when (le=0 or ls = 0)\;Logical lane number\;[internal] Mapping to physical lane number can be queried \;in PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
@@ -2906,11 +3005,11 @@
 
 <node name="pptb_reg_ext" descr="" size="0xc.0" >
 	<field name="pm" descr="prioX_buff mask - enables update of the prioX_buff field.\;Bit i is a flag for updating the mapping for switch priority i." access="WO" offset="0x0.0" size="0x0.8" />
-	<field name="um" descr="untagged_buff mask - enables update of the untagged_buff \;field.\;Reserved for Spectrum family.\;Reserved for HCA devices." access="WO" offset="0x0.8" size="0x0.1" />
-	<field name="cm" descr="ctrl_buff mask - enables update of the ctrl_buff field.\;NOTE: This field is ignored by the device, and control traffic \;is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2) \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="WO" offset="0x0.9" size="0x0.1" />
+	<field name="um" descr="untagged_buff mask - enables update of the \;untagged_buff field.\;Reserved for Spectrum family.\;Reserved for HCA devices." access="WO" offset="0x0.8" size="0x0.1" />
+	<field name="cm" descr="ctrl_buff mask - enables update of the ctrl_buff field.\;NOTE: This field is ignored by the device, and control traf\;fic is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2) \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="WO" offset="0x0.9" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="mm" descr="Mapping mode\;0: Mapping both Unicast and Multicast packets to the same \;buffer\;In get operation, 0 means Unicast only.\;1: Mapping Unicast only\;2: Mapping Multicast only\;This field is reserved for HCA devices\;SwitchX/-2 support &apos;0&apos; only" access="INDEX" offset="0x0.28" size="0x0.2" />
+	<field name="mm" descr="Mapping mode\;0: Mapping both Unicast and Multicast packets to the \;same buffer\;In get operation, 0 means Unicast only.\;1: Mapping Unicast only\;2: Mapping Multicast only\;This field is reserved for HCA devices\;SwitchX/-2 support &apos;0&apos; only" access="INDEX" offset="0x0.28" size="0x0.2" />
 	<field name="prio0buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.0" size="0x0.4" />
 	<field name="prio1buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.4" size="0x0.4" />
 	<field name="prio2buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.8" size="0x0.4" />
@@ -2919,13 +3018,13 @@
 	<field name="prio5buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.20" size="0x0.4" />
 	<field name="prio6buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.24" size="0x0.4" />
 	<field name="prio7buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.28" size="0x0.4" />
-	<field name="untagged_buff" descr="Mapping of untagged frames to one of the allocated receive \;port buffers.\;NOTE: In SwitchX/-2, this field must be mapped to a buffer \;8.\;\;Reserved for Spectrum. Spectrum maps untagged packets \;based on the Switch Priority.\;Reserved for HCA devices" access="RW" offset="0x8.0" size="0x0.4" />
-	<field name="ctrl_buff" descr="Mapping of control frames to one of the allocated receive \;port buffers.\;NOTE: This field is ignored by the device, and control traffic \;is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2), \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="RW" offset="0x8.4" size="0x0.4" />
-	<field name="pm_msb" descr="prioX_buff mask - enables update of the prioX_buff field.\;Bit i is a flag for updating the mapping for switch priority i+8.\;Reserved for HCA device" access="WO" offset="0x8.24" size="0x0.8" />
+	<field name="untagged_buff" descr="Mapping of untagged frames to one of the allocated \;receive port buffers.\;NOTE: In SwitchX/-2, this field must be mapped to a buffer \;8.\;\;Reserved for Spectrum. Spectrum maps untagged pack\;ets based on the Switch Priority.\;Reserved for HCA devices" access="RW" offset="0x8.0" size="0x0.4" />
+	<field name="ctrl_buff" descr="Mapping of control frames to one of the allocated receive \;port buffers.\;NOTE: This field is ignored by the device, and control traf\;fic is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2), \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="RW" offset="0x8.4" size="0x0.4" />
+	<field name="pm_msb" descr="prioX_buff mask - enables update of the prioX_buff field.\;Bit i is a flag for updating the mapping for switch priority \;i+8.\;Reserved for HCA device" access="WO" offset="0x8.24" size="0x0.8" />
 </node>
 
 <node name="pptt_reg_ext" descr="" size="0x1c.0" >
-	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPTT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for \;get operations" access="OP" offset="0x0.0" size="0x0.1" />
+	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPTT con\;figurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for get \;operations" access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="ls" descr="Per Lane configuration support/capability: \;0 - No support of per lane configuration\;1 - Support of per lane configuration" access="RO" offset="0x0.1" size="0x0.1" />
 	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main [internal] \;5 - USR Tail [internal] \;Other values are reserved.\;Note: PRBS can be enabled only for two entities that \;directly connected to each other.\;For non MCM and no Retimer/Gearbox only 0 allowed.\;For non MCM and with Retimer/Gearbox 2-1 or 3 or 0.\;For MCM without Retimer/Gearbox 4-5 or 2 or 0.\;For MCM with Retimer/Gearbox 4-5 or 2-1 or 3 or 0.\;all the port will be in test mode when PRBS is enabled." access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Reserved when (le=0 or ls = 0)\;Logical lane number\;[internal] Mapping to physical lane number can be queried \;in PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
@@ -2959,7 +3058,7 @@
 	<field name="ber_mantissa" descr="Desired Raw BER for injection.\;BER = ber_mantissa * 10^(-ber_exp)\;Valid BER mantissa are 1,5" access="RW" offset="0x4.8" size="0x0.4" />
 	<field name="en" descr="1 - start the error injection process" access="WO" offset="0x4.31" size="0x0.1" />
 	<field name="lane_rate_cap" descr="Per lane rate capability for feature (bitmask)\;Bit 0 - 1GE (1.25 Gb/s)\;Bit 1 - SDR (2.5 Gb/s) \;Bit 2 - XAUI/2.5GE (3.125 Gb/s)\;Bit 3- DDR (5 Gb/s) \;Bit 4- QDR (10 Gb/s) \;Bit 5- FDR10 / 10GE/40GE (10.3125 Gb/s) \;Bit 6- FDR (14.0625 Gb/s) \;Bit 7- EDR / 25GE / 50GE / 100GE (25.78125 Gb/s) \;Bit 8 - 50GE-KR4 (12.89 Gb/s) \;Bit 9 - HDR /50GE / 100GE / 200GE / 400GE (26.5625Gbd / \;53.125Gb/s)" access="RO" offset="0x8.16" size="0x0.16" />
-	<field name="page_data" descr="Table  1233, &quot;PREI - Port Receive Error Injection Register Lay\;out for 28nm,&quot; on page  1529" subnode="prei_reg_28nm_ext" access="RW" offset="0x10.0" size="0x8.0" />
+	<field name="page_data" descr="Table 1255, &quot;PREI - Port Receive Error Injection Register \;Layout for 28nm,&quot; on page 1563" subnode="prei_reg_28nm_ext" access="RW" offset="0x10.0" size="0x8.0" />
 </node>
 
 <node name="prm_register_payload_ext" descr="" size="0x104.0" >
@@ -2975,7 +3074,7 @@
 	<field name="error_type_oper" descr="Error injection opertional status\;0x0 - No error injection\;0x1 - Performing error injection" access="RO" offset="0x0.24" size="0x0.4" />
 	<field name="ber_exp" descr="BER for injection.\;BER = ber_mantissa * 10^(-ber_exp)" access="RW" offset="0x4.0" size="0x0.8" />
 	<field name="ber_mantissa" descr="BER for injection.\;BER = ber_mantissa * 10^(-ber_exp)" access="RW" offset="0x4.8" size="0x0.4" />
-	<field name="error_injection_time" descr="Duration in 10 msec the port will generate errors.\;Reading this field will return the time left for errors to inject \;in msec\;\;\;0x0000 indicates no generation of errors.\;When set to 0xFFFF - No decremental operation, meaning \;the errors will be injected continuously without stop condi\;tion.\;" access="RW" offset="0x4.12" size="0x0.16" />
+	<field name="error_injection_time" descr="Duration in 10 msec the port will generate errors.\;Reading this field will return the time left for errors to inject in \;msec\;\;\;0x0000 indicates no generation of errors.\;When set to 0xFFFF - No decremental operation, meaning the \;errors will be injected continuously without stop condition.\;" access="RW" offset="0x4.12" size="0x0.16" />
 </node>
 
 <node name="pter_port_page_reg_ext" descr="" size="0x1c.0" >
@@ -2990,7 +3089,7 @@
 	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="error_page" descr="Error_page selection: \;0: Injection_of_Phy_Errors\;1: Injection_of_Port_Errors" access="INDEX" enum="Injection_of_Phy_Errors=0x0,Injection_of_Port_Errors=0x1" offset="0x0.24" size="0x0.4" />
-	<field name="page_data" descr="error injection page data: \;Table  1227, &quot;PTER- Port Transmit Errors Register Phy Level \;Layout,&quot; on page  1525\;Table  1229, &quot;PTER- Port Transmit Errors Register Port Level \;Fields,&quot; on page  1526" subnode="pter_reg_page_data_auto_ext" access="RW" offset="0x4.0" size="0x1c.0" union_selector="$(parent).error_page" />
+	<field name="page_data" descr="error injection page data: \;Table 1249, &quot;PTER- Port Transmit Errors Register Phy \;Level Layout,&quot; on page 1559\;Table 1251, &quot;PTER- Port Transmit Errors Register Port \;Level Fields,&quot; on page 1560" subnode="pter_reg_page_data_auto_ext" access="RW" offset="0x4.0" size="0x1c.0" union_selector="$(parent).error_page" />
 </node>
 
 <node name="pter_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0x1c.0" >
@@ -3005,9 +3104,9 @@
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="force_tx_aba_param" descr="When AN is disabled, use aba TX set. \;" access="RW" offset="0x0.24" size="0x0.1" />
 	<field name="an_disable_cap" descr="Auto Negotiation disable capability:\;0 - Device does not support AN disable\;1 - Device Supports  AN disable" access="RO" offset="0x0.29" size="0x0.1" />
-	<field name="an_disable_admin" descr="Auto Negotiation disable:\;0 - Normal operation \;1 - Disable AN.\;Note: In Ethernet port, when Disabling AN, the &quot;eth_pro\;to_admin&quot; bit mask must comply to single speed rate set.\;In IB port, when Disabling AN, the &quot;ib_proto_admin&quot; bit \;mask must comply to single speed rate set.\;It&apos;s recommended to validate the FEC override bits in PPLM \;when operating with AN. \;\;" access="RW" offset="0x0.30" size="0x0.1" />
+	<field name="an_disable_admin" descr="Auto Negotiation disable:\;0 - Normal operation \;1 - Disable AN.\;Note: In Ethernet port, when Disabling AN, the &quot;eth_pro\;to_admin&quot; bit mask must comply to single speed rate set.\;In IB port, when Disabling AN, the &quot;ib_proto_admin&quot; bit mask \;must comply to single speed rate set.\;It&apos;s recommended to validate the FEC override bits in PPLM \;when operating with AN. \;\;" access="RW" offset="0x0.30" size="0x0.1" />
 	<field name="reserved_high" descr="THIS BIT MUST BE TIED TO 1!\;This is old capability bit that address AN_DISABLE capability \;with only one enabled protocol." access="RO" offset="0x0.31" size="0x0.1" />
-	<field name="data_rate_oper" descr="Port data rate in resolution of 100 Mb/s (data_rate_oper * \;100 Mb/s)\;Value 0x0 indicates this field is not supported." access="RO" offset="0x4.0" size="0x0.16" />
+	<field name="data_rate_oper" descr="Port data rate in resolution of 100 Mb/s (data_rate_oper * 100 \;Mb/s)\;Value 0x0 indicates this field is not supported." access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="max_port_rate" descr="Port maxium data rate in resolution of 1 Gb/s \;(data_rate_oper * 1 Gb/s)\;Value 0x0 indicates this field is not supported.\;" access="RO" offset="0x4.16" size="0x0.12" />
 	<field name="an_status" descr="Auto Negotiation status: \;0: Status_is_unavailable\;1: AN_completed_successfully \;2: AN_performed_but_failed\;3: AN_was_not_performed_link_is_up \;4: AN_was_not_performed_link_is_down" access="RO" enum="Status_is_unavailable=0x0,AN_completed_successfully=0x1,AN_performed_but_failed=0x2,AN_was_not_performed_link_is_up=0x3,AN_was_not_performed_link_is_down=0x4" offset="0x4.28" size="0x0.4" />
 	<field name="ext_eth_proto_capability" descr="For HCA: See also PCAM.feature_cap_mask bit 13 for \;Extended Ethernet protocol support.\;Extended Ethernet port speed/protocols supported (bit\;mask):\;Bit 0: SGMII_100M\;Bit 1: 1000BASE-X / SGMII\;Bit 3: 5GBASE-R\;Bit 4: XFI / XAUI-1 // 10G\;Bit 5: XLAUI-4/XLPPI-4 // 40G \;Bit 6: 25GAUI-1/ 25GBASE-CR / KR \;Bit 7: 50GAUI-2 / LAUI-2/ 50GBASE-CR2/KR2 \;Bit 8: 50GAUI-1 /50GBASE-CR / KR\;Bit 9: CAUI-4 / 100GBASE-CR4 / KR4\;Bit 10: 100GAUI-2 / 100GBASE-CR2 / KR2 \;Bit 11: 100GAUI-1 / 100GBASE-CR / KR\;Bit 12: 200GAUI-4 / 200GBASE-CR4/KR4\;Bit 13: 200GAUI-2 / 200GBASE-CR2/KR2\;Bit 14: Reserved [internal] Placeholder for 200GAUI-1\;Bit 15: 400GAUI-8/ 400GBASE-CR8\;Bit 16: 400GAUI-4/ 400GBASE-CR4\;Bit 17: Reserved [internal] Placeholder for 400GAUI-2\;Bit 18: Reserved [internal] Placeholder for 400GAUI-1\;Bit 19: 800GAUI-8/ 800GBASE-CR8\;Bit 31: SGMII_10M\;Other - Reserved" access="RO" offset="0x8.0" size="0x4.0" />
@@ -3023,10 +3122,10 @@
 	<field name="ib_proto_oper" descr="InfiniBand port speed bitmask" access="RO" offset="0x28.0" size="0x0.16" />
 	<field name="ib_link_width_oper" descr="InfiniBand port link width bitmask\;" access="RO" offset="0x28.16" size="0x0.16" />
 	<field name="connector_type" descr="Connector type indication\;0: No_connector_or_unknown \;1: PORT_NONE - None\;2: PORT_TP - Twisted Pair\;3: PORT_AUI - AUI\;4: PORT_BNC - BNC\;5: PORT_MII - MII\;6: PORT_FIBRE - FIBRE\;7: PORT_DA - Direct Attach Copper\;8: PORT_OTHER - Other" access="RO" enum="No_connector_or_unknown=0x0,PORT_NONE=0x1,PORT_TP=0x2,PORT_AUI=0x3,PORT_BNC=0x4,PORT_MII=0x5,PORT_FIBRE=0x6,PORT_DA=0x7,PORT_OTHER=0x8" offset="0x2C.0" size="0x0.4" />
-	<field name="force_kr_frames_admin" descr="Ethernet Force mode options when AN disable is set.\;0 - auto, keep normal operation\;1 - Do Force KR Startup LT flow\;2 - Do not do Force KR Startup LT flow\;\;Note: Ignored when an_disable_admin is not set\;Force KR Flow is possible for PAM4 links only" access="RW" offset="0x2C.28" size="0x0.2" />
-	<field name="force_kr_frames_cap" descr="0 - device does not support Force KR Startup LT flow\;1 - device supports Force KR Startup LT flow\;\;Note: Ignored when an_disable_admin is not set\;Force KR Flow is possible for PAM4 links only" access="RO" offset="0x2C.30" size="0x0.1" />
+	<field name="force_lt_frames_admin" descr="Ethernet Force mode options when AN disable is set.\;0 - auto, keep normal operation\;1 - Do Force LT (KR Startup) flow\;2 - Do not do LT (KR Startup) flow\;\;Note: Ignored when an_disable_admin is not set\;In Ethernet port, when setting force LT flow, the &quot;eth_pro\;to_ext_admin&quot; bit mask must comply to single speed rate \;set.\;Force LT Flow is possible for PAM4 links only" access="RW" offset="0x2C.28" size="0x0.2" />
+	<field name="force_lt_frames_cap" descr="0 - device does not support Force LT (KR Startup) flow\;1 - device supports Force LT (KR Startup) flow\;\;Note: Ignored when an_disable_admin is not set\;Force KR Flow is possible for PAM4 links only" access="RO" offset="0x2C.30" size="0x0.1" />
 	<field name="eth_proto_lp_valid" descr="If set indicates that eth_proto_lp_advertise has valid adver\;tisement" access="RO" offset="0x2C.31" size="0x0.1" />
-	<field name="eth_proto_lp_advertise" descr="Ethernet port&apos;s link partner advertised protocols according \;to PTYS.ext_eth_proto_capability mask. \;Returns the protocols that were advertised by the link part\;ner during auto-negotiation.\;Valid only if eth_proto_lp_valid is set" access="RO" offset="0x30.0" size="0x4.0" />
+	<field name="eth_proto_lp_advertise" descr="Ethernet port&apos;s link partner advertised protocols according to \;PTYS.ext_eth_proto_capability mask. \;Returns the protocols that were advertised by the link part\;ner during auto-negotiation.\;Valid only if eth_proto_lp_valid is set" access="RO" offset="0x30.0" size="0x4.0" />
 </node>
 
 <node name="pvlc_reg_ext" descr="" size="0x10.0" >
@@ -3036,7 +3135,7 @@
 	<field name="vl_operational" descr="Operational VLs as configured by the SM on this port:\;0: No change; valid only on Set()\;1: VL0\;2: VL0, VL1\;4: VL0 - VL3\;\;8: VL0 - VL7\;15: VL0 - VL14\;Changing vl_operational in certain PortStates may cause in \;flow control update errors which may initiate Link/PHY \;retraining.\;vl_operational value is valid only when link state is UP." access="RO" offset="0xC.0" size="0x0.4" />
 </node>
 
-<node name="pvls_ext" descr="" size="0x8.0" >
+<node name="pvls_ext" descr="" size="0x20.0" >
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="vl_suspend" descr="VL suspend, bitmap per VL\;Per bit:\;0: VL enabled (default)\;1: VL disabled" access="RW" offset="0x4.0" size="0x0.16" />
 </node>
@@ -3048,13 +3147,34 @@
 	<field name="qos_feature_cap_mask" descr="Supported QoS enhanced features based on feature_group \;index.\;When bit is set, the feature is supported in the device\;Bit 0: QPTS_TRUST_BOTH - trust_both is supported in QPTS \;register" access="RO" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
 </node>
 
+<node name="qeec_ext" descr="" size="0x20.0" >
+	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
+	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0: Local_port_number\;2: Host_port_number\;Reserved when Switches" access="INDEX" enum="Local_port_number=0x0,Host_port_number=0x2" offset="0x0.14" size="0x0.2" />
+	<field name="local_port" descr="Local port number\;CPU port supported." access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="element_index" descr="The index of the element in the hierarchy." access="INDEX" offset="0x4.0" size="0x0.8" />
+	<field name="element_hierarchy" descr="The hierarchy of the element\;0: Port\;1: Group\;2: Sub_Group\;3: Traffic_Class" access="INDEX" enum="Port=0x0,Group=0x1,Sub_Group=0x2,Traffic_Class=0x3" offset="0x4.16" size="0x0.4" />
+	<field name="next_element_index" descr="The index of the element in the lower hierarchy.\;reserved when element_heirarchy  &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="min_shaper_rate" descr="Min shaper information rate\;For all hierarchies at Non-CPU port, and for port-hierarchy \;on CPU ports:\;bps mode, Units of 1000bps\;Granularity is 200mbps\;Error is up to 3% from configuration (for example: when rate \;is configured to 200mbps, actual rate may be 206mbps)\;Reading reveals the actual rate (e.g. 206 in the above exam\;ple)\;Note: for rates lower than 10,000bps or lower than 100 pack\;ets per sec, error is up to 10%\;Reserved when ptps = 1\;Reserved when element_hierarchy is 0 or 1" access="RW" offset="0xC.0" size="0x0.28" />
+	<field name="pb" descr="Packets or Bytes mode\;0: bytes mode\;1: packets mode\;Applies to both min shaper and max shaper\;For Spectrum family packets mode is supported only for \;TClasses of CPU port.\;Reserved when ptps = 1\;" access="RW" offset="0xC.28" size="0x0.1" />
+	<field name="ptps" descr="PTP shaper\;0: regular shaper mode\;1: PTP oriented shaper\;Allowed only for hierarchy 0\;Not supported for CPU port\;Note that ptps mode may effect the shaper rates of all hierar\;chies\;Reserved when Spectrum-2\;\;" access="RW" offset="0xC.29" size="0x0.1" />
+	<field name="mise" descr="Min shaper configuration enable. Enables configuration of \;min_shaper_rate, min_shaper_bs on this ETS element\;0: disable\;1: enable\;Reserved when element_hierarchy is 0 or 1" access="RW" enum="disable=0x0,enable=0x1" offset="0xC.31" size="0x0.1" />
+	<field name="max_shaper_rate" descr="Max shaper information rate\;For all hierarchies at Non-CPU port, and for port-hierarchy \;on CPU ports:\;bps mode, Units of 1000bps\;Granularity is 200mbps\;Error is up to 3% from configuration (for example: when rate \;is configured to 200mbps, actual rate may be 206mbps)\;Reading reveals the actual rate (e.g. 206 in the above exam\;ple)\;\;For Tclass of CPU ports:\;bps mode:\;- Granularity is 1000bps\;- Error is up to 1% from configuration\;packet per sec mode:\;- Granularity is 10 packet per sec\;- Error is up to 1% from configuration\;Note: for rates lower than 10,000bps or lower than 100 pack\;ets per sec, error is up to 10%\;Reserved when ptps = 1\;Reserved when element_hierarchy is 1\;\;Value of 0x7FFF_FFFF means &quot;all allowed&quot; or &quot;shaper dis\;abled&quot;\;" access="RW" offset="0x10.0" size="0x0.31" />
+	<field name="mase" descr="Max shaper configuration enable. Enables configuration of \;max_shaper_rate, max_shaper_bs on this ETS element\;0: disable\;1: enable\;Reserved when element_hierarchy is 1" access="RW" enum="disable=0x0,enable=0x1" offset="0x10.31" size="0x0.1" />
+	<field name="phantom_queue_rate" descr="Phantom queue rate\;Units of 1000bps, bps only\;Granularity is 200mbps\;Error is up to 3% from configuration (for example: at \;100Gbps, rate is configured to 200mbps, actual rate may be \;206mbps)\;ECN marking is done when the rate is above phantom_\;queue_rate\;For Spectrum family: When phantom queue is enabled then \;max shaper must be disabled. Disabling is done by setting \;the relevant rate to its max value. By default the phantom \;queue is disabled.\;Reserved when ptps = 1\;" access="RW" offset="0x14.0" size="0x0.31" />
+	<field name="pqe" descr="Phantom queue configuration enable. Enables configuration \;of the phantom queue rate\;0: disable\;1: enable\;Allowed only for hierarchy 0\;Not supported for CPU port\;Reserved when ptps = 1" access="RW" offset="0x14.31" size="0x0.1" />
+	<field name="dwrr_weight" descr="dwrr weight on the link going down from the ETS element:\;The percentage of bandwidth guaranteed to a ETS within its \;hierarchy.\;The sum of dwrr_weight value across all ETS elements within \;one hierarchy should equal 100.\;This field is reserved when dwrr is strict priority." access="RW" offset="0x18.0" size="0x0.8" />
+	<field name="dwrr" descr="dwrr or strict priority on the link going down from the ETS \;element:\;0: strict priority\;1: DWRR" access="RW" offset="0x18.15" size="0x0.1" />
+	<field name="max_shaper_bs" descr="Max shaper Burst size\;Burst size is 2^max_shaper_bs * 512 [bits]\;For Spectrum: Range is: 5..25\;For Spectrum-2: Range is: 11..25\;Value of 0 is configured as minimum\;Reserved when ptps = 1" access="RW" offset="0x1C.0" size="0x0.6" />
+	<field name="min_shaper_bs" descr="Min shaper Burst size\;Burst size is 2^min_shaper_bs * 512 [bits]\;For Spectrum: Range is: 5..25\;For Spectrum-2: Range is: 11..25\;\;Value of 0 is configured as minimum\;Reserved when ptps = 1" access="RW" offset="0x1C.16" size="0x0.6" />
+</node>
+
 <node name="qetcr_ext" descr="" size="0x50.0" >
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="cap_remote_admin" descr="Indicates if operation_type==remote_admin_parameters \;is supported\;NIC only, Reserved for Switches" access="RO" offset="0x0.28" size="0x0.1" />
 	<field name="cap_local_admin" descr="Indicates if operation_type==local_admin_parameters is \;supported\;NIC only, Reserved for Switches" access="RO" offset="0x0.29" size="0x0.1" />
 	<field name="operation_type" descr="Operation type.\;0x0: local operative parameters.\;0x1: local admin parameters. Supported only when \;cap_local_admin==1.\;0x2: remote admin parameters. Supported only when \;cap_remote_admin==1. \;NIC only, Reserved for Switches" access="INDEX" offset="0x0.30" size="0x0.2" />
-	<field name="tc_configuration" descr="Per-tclass configuration. For details, refer to Table 943, \;&quot;ETS tcN Configuration Register Layout&quot;." subnode="ets_ext" access="RW" high_bound="7" low_bound="0" offset="0x8.0" size="0x40.0" />
-	<field name="global_configuration" descr="Global configuration. For details, refer to Table 945, &quot;ETS \;Global Configuration Register Layout&quot;.\;Reserved for NICs" subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
+	<field name="tc_configuration" descr="Per-tclass configuration. For details, refer to Table 963, \;&quot;ETS tcN Configuration Register Layout&quot;." subnode="ets_ext" access="RW" high_bound="7" low_bound="0" offset="0x8.0" size="0x40.0" />
+	<field name="global_configuration" descr="Global configuration. For details, refer to Table 965, &quot;ETS \;Global Configuration Register Layout&quot;.\;Reserved for NICs" subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
 </node>
 
 <node name="qhll_ext" descr="" size="0xc.0" >
@@ -3091,7 +3211,7 @@
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="fr" descr="Fast Response - the device will shape the rate to its mini\;mum value upon receive of WQE LWM (Low WaterMark) \;event \;0: disable\;1: enable" access="RW" offset="0x0.25" size="0x0.1" />
 	<field name="ch" descr="Connected host:\;0: The configuration will be applied on the host calling \;QSHR. \;1: The configuration will be applied on the host connected \;to the function calling the QSHR." access="INDEX" offset="0x0.27" size="0x0.1" />
-	<field name="global_configuration" descr="Global configuration. For details, refer to Table 945, &quot;ETS \;Global Configuration Register Layout&quot;." subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
+	<field name="global_configuration" descr="Global configuration. For details, refer to Table 965, &quot;ETS \;Global Configuration Register Layout&quot;." subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
 </node>
 
 <node name="qspcp_ext" descr="" size="0xc.0" >
@@ -3145,10 +3265,16 @@
 	<field name="roce_tx_window_field_select" descr="In Query, indicates whether roce_tx_window mode \;is supported.\;If set, indicates roce_tx_window_enfield is valid." access="RW" offset="0x0.1" size="0x0.1" />
 	<field name="roce_slow_restart_field_select" descr="In Query, indicates whether roce_slow_restart \;mode is supported.\;If set, indicates roce_slow_restart_en field is \;valid." access="RW" offset="0x0.2" size="0x0.1" />
 	<field name="roce_slow_restart_idle_field_select" descr="In Query, indicates whether roce_slow_restart_idle \;mode is supported. If set, indicates roce_slow_re\;start_idle_en field is valid" access="RW" offset="0x0.3" size="0x0.1" />
+	<field name="min_ack_timeout_limit_disabled_field_select" descr="In Query, indicates whether min_ack_timeout_lim\;it_disabled mode is supported. If set, indicates \;min_ack_timeout_limit_disabled field is valid" access="RW" offset="0x0.4" size="0x0.1" />
+	<field name="adaptive_routing_forced_en_field_select" descr="In Query, indicates whether adaptive_routing_forced \;mode is supported. If set, indicates adaptive_routing_\;forced_en field is valid." access="RW" offset="0x0.5" size="0x0.1" />
+	<field name="selective_repeat_forced_en_field_select" descr="In Query, indicates whether selective_repeat_forced \;mode is supported. \;If set, indicates selective_repeat_forced_en field is valid" access="RW" offset="0x0.6" size="0x0.1" />
 	<field name="roce_adp_retrans_en" descr="If set, the adaptive retransmission window function\;ality is enabled.\;Valid only when roce_adp_retrans_field_select \;== 1." access="RW" offset="0x4.0" size="0x0.1" />
 	<field name="roce_tx_window_en" descr="If set, the Transmission window functionality is \;enabled. \;Valid only when roce_tx_window_field_select == \;1." access="RW" offset="0x4.1" size="0x0.1" />
 	<field name="roce_slow_restart_en" descr="If set, the Slow restart functionality is enabled.\;When used, slow restart is initiated when conges\;tion is identified on the network.\;Valid only when roce_slow_restart_field_select \;== 1." access="RW" offset="0x4.2" size="0x0.1" />
 	<field name="roce_slow_restart_idle_en" descr="If set, the Slow restart after idle functionality is \;enabled. When used, slow restart is initiated when \;qp was idling. Valid only when roce_slow_re\;start_idle_field_select ==1" access="RW" offset="0x4.3" size="0x0.1" />
+	<field name="min_ack_timeout_limit_disabled" descr="If set, min_ack_timeout_limit enforcement is dis\;abled. \;Valid only when min_ack_timeout_limit_disabled_\;field_select ==1" access="RW" offset="0x4.4" size="0x0.1" />
+	<field name="adaptive_routing_forced_en" descr="If adaptive_routing_forced_en = 1, all the Qps will be \;created with adaptive_routing enabled. \;If adaptive_routing_forced_en = 0, all the Qps will be \;created with adaptive_routing disabled. \;Valid only when adaptive_routing_forced_en_field_se\;lect ==1." access="RW" offset="0x4.5" size="0x0.1" />
+	<field name="selective_repeat_forced_en" descr="If selective_repeat_forced_en= 1, all the Qps will be \;created with selective_repeat enabled. \;If selective_repeat_forced_en= 0, all the Qps will be \;created with selective_repeat disabled. \;Valid only when selective_repeat_forced_en_field_select \;==1." access="RW" offset="0x4.6" size="0x0.1" />
 </node>
 
 <node name="rom_version_ext" descr="" size="0x4.0" >
@@ -3218,7 +3344,7 @@
 
 <node name="sbdcc_ext" descr="" size="0x210.0" >
 	<field name="clr" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="no_buffer_discard_cpu_tclass" descr="Count the number of unicast packets to CPU dropped due \;to lack of shared buffer resources\;For tclass i\;Range is 0.. cap_max_cpu_ingress_tclass-1\;See Table 1613, &quot;SBDCC - counter Layout,&quot; on page 1935" subnode="uint64" access="RO" high_bound="63" low_bound="0" offset="0x10.0" size="0x200.0" />
+	<field name="no_buffer_discard_cpu_tclass" descr="Count the number of unicast packets to CPU dropped due \;to lack of shared buffer resources\;For tclass i\;Range is 0.. cap_max_cpu_ingress_tclass-1\;See Table 1683, &quot;SBDCC - counter Layout,&quot; on page 2018" subnode="uint64" access="RO" high_bound="63" low_bound="0" offset="0x10.0" size="0x200.0" />
 </node>
 
 <node name="sbdcm_ext" descr="" size="0x14.0" >
@@ -3240,8 +3366,8 @@
 	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="RW" offset="0x0.16" size="0x0.8" />
 	<field name="opcode" descr="Opcode:\;0: Bind a hist_id\;1: Unbind a hist_id (default)" access="RW" offset="0x0.28" size="0x0.4" />
 	<field name="hist_id" descr="Histogram id to bind\;from 0 to cap_max_queue_hist_id - 1" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;See Table 1621, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 1940" access="RW" offset="0x8.0" size="0x0.16" />
-	<field name="hist_parameters" descr="According to hist_type\;See Table 1621, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 1940" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;See Table 1691, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 2023" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="hist_parameters" descr="According to hist_type\;See Table 1691, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 2023" access="RW" offset="0xC.0" size="0x4.0" />
 	<field name="hist_min_value" descr="Min value for histogram main range\;Units according to the units of the hist_type" access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="hist_max_value" descr="Max value for histogram main range\;Note: for Spectrum device, hist_group=1 this rule must be \;meet:\;hist_max_value = hist_min_value + 2^n, n &gt;= 3\;Units according to the units of the hist_type" access="RW" offset="0x14.0" size="0x4.0" />
 	<field name="sample_time" descr="Sample time interval. \;Allowed range:\;time = 2^sample_time * 128nSec\;sample_time range is 0..cap_max_sample_time-1\;Note: for Spectrum the sample_time is global for all ports \;and all tclass \;For Spectrum-2 the sample_time is per port.tclass." access="RW" offset="0x18.0" size="0x0.6" />
@@ -3252,7 +3378,7 @@
 	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class, hist_type of Queue_Depth_Traffic_Class: \;range is 0..cap_max_tclass - 1\;For traffic class, hist_type of Queue_Latency: range is \;0..cap_max_tclass_data - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;For Spectrum: no admission on Tx.Tclass, so when traffic \;class is in MC aware mode then the traffic classes which \;are MC aware must not be configured, but can be read. \;Spectrum-2 has admission on Tx.Tclass so all traffic \;classes can be configured also for MC aware mode. \;" access="INDEX" offset="0x0.8" size="0x0.6" />
 	<field name="local_port" descr="Local port number.\;For Ingress: excludes CPU port and Router port\;For Egress: excludes IP Router\;For Egress hist_type of Queue_Latency: exludes also CPU \;port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="en" descr="When hist_type = Queue_Depth_Traffic_Class:\;Enable the histogram\;When hist_type = Queue_Latency:\;This is a WO for clearing the histograms and the counters" access="RW" offset="0x4.0" size="0x0.1" />
-	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;0x1002: Queue_Latency\;See Table 1621, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 1940" access="INDEX" offset="0x8.0" size="0x0.16" />
+	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;0x1002: Queue_Latency\;See Table 1691, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 2023" access="INDEX" offset="0x8.0" size="0x0.16" />
 	<field name="mode" descr="mode\;0: Linear histogram\;1: Exponential histogram" access="RW" offset="0x8.28" size="0x0.3" />
 	<field name="hist_min_value" descr="Min value for histogram main range\;Units according to the units of the hist_type" access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="hist_max_value" descr="Max value for histogram main range\;When mode=0 (linear), then this rule must be meet:\;hist_max_value = hist_min_value + 2^n, n &gt;= 3\;When mode=1 (exponential), then this rule must be meet:\;hist_max_value = hist_min_value + 255*2^n, n &gt;= 0\;Units according to the units of the hist_type" access="RW" offset="0x14.0" size="0x4.0" />
@@ -3267,7 +3393,7 @@
 <node name="sbhrr_ext" descr="" size="0x60.0" >
 	<field name="clr" descr="Clear:\;0: Read the data in the histogram agent\;1: Read and clear the data in the histogram agent" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="hist_id" descr="see SBHBR" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When \;any bin is saturated all bins stop incrementing.\;See Table 1626, &quot;SBHRR - Bin Layout,&quot; on page 1942" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x10.0" size="0x50.0" />
+	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When \;any bin is saturated all bins stop incrementing.\;See Table 1696, &quot;SBHRR - Bin Layout,&quot; on page 2025" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x10.0" size="0x50.0" />
 </node>
 
 <node name="sbhrr_v2_ext" descr="" size="0x90.0" >
@@ -3275,12 +3401,12 @@
 	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class: range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;" access="INDEX" offset="0x0.8" size="0x0.6" />
 	<field name="local_port" descr="Local port number.\;For Ingress: excludes CPU port\;For Egress: includes CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="clr" descr="Clear:\;0: Read the data in the histogram agent\;1: Read and clear the data in the histogram agent" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;0x1002: Queue_Latency\;See Table 1621, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 1940" access="INDEX" offset="0x8.0" size="0x0.16" />
+	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;0x1002: Queue_Latency\;See Table 1691, &quot;SBHBR - Histograms Hist-type for queue \;histograms,&quot; on page 2023" access="INDEX" offset="0x8.0" size="0x0.16" />
 	<field name="min_sampled_high" descr="min_sampled\;Cleared when clr = 1, cleared to 0xffff_ffff_ffff_ffff\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="min_sampled_low" descr="min_sampled\;Cleared when clr = 1, cleared to 0xffff_ffff_ffff_ffff\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="max_sampled_high" descr="max_sampled\;Cleared when clr = 1, cleared to 0\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="max_sampled_low" descr="max_sampled\;Cleared when clr = 1, cleared to 0\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x1C.0" size="0x4.0" />
-	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins.\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When \;any bin is saturated all bins stop incrementing.\;See Table 1632, &quot;SBHRR_V2 - Bin Layout,&quot; on page 1948" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x40.0" size="0x50.0" />
+	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins.\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When \;any bin is saturated all bins stop incrementing.\;See Table 1702, &quot;SBHRR_V2 - Bin Layout,&quot; on page 2031" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x40.0" size="0x50.0" />
 </node>
 
 <node name="sbib_ext" descr="" size="0x10.0" >
@@ -3366,7 +3492,7 @@
 	<field name="pg_buff_mask" descr="Bit vector for all priority groups.\;Indicates which of the priorities (for which the relevant bit \;is set) are affected by the set operation. Configuration of \;any other priority does not change.\;Range is 0..cap_max_pg_buffers - 1\;Reserved when ports = 1" access="INDEX" offset="0x30.0" size="0x0.10" />
 	<field name="egress_port_mask" descr="Bit vector for all egress network port.\;Indicates which of the ports (for which the relevant bit is \;set) are affected by the set operation. Configuration of \;any other port does not change." access="INDEX" high_bound="7" low_bound="0" offset="0x34.0" size="0x20.0" />
 	<field name="tclass_mask" descr="Bit vector for all traffic classes.\;Indicates which of the traffic classes (for which the rele\;vant bit is set) are affected by the set operation. Configu\;ration of any other priority does not change.\;Range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max\;_cpu_ingress_tclass- 1\;Reserved when ports = 1" subnode="uint64" access="INDEX" offset="0x54.0" size="0x8.0" />
-	<field name="shared_buffer_status" descr="Shared Buffer Properties, see Table 1608, &quot;Shared Buffer \;Status Fields,&quot; on page 1933\;This field is a collection of all the statuses of the \;requested quotas, while i=0..min{requested quotas, \;cap_sbsr_stat_size-1}\;The ith status refers a quota as follows;\;The occurrences of the masked ingress quotas are writ\;ten before the masked egress quotas.\;All the occurrences associated to port are written \;together from the smallest masked port index. In each \;port, the occurrences of the masked priority groups/ traf\;fic classes are written from the lowest to the highest." subnode="shared_buffer_status_ext" access="RO" high_bound="19" low_bound="0" offset="0x5C.0" size="0xa0.0" />
+	<field name="shared_buffer_status" descr="Shared Buffer Properties, see Table 1678, &quot;Shared Buffer \;Status Fields,&quot; on page 2016\;This field is a collection of all the statuses of the \;requested quotas, while i=0..min{requested quotas, \;cap_sbsr_stat_size-1}\;The ith status refers a quota as follows;\;The occurrences of the masked ingress quotas are writ\;ten before the masked egress quotas.\;All the occurrences associated to port are written \;together from the smallest masked port index. In each \;port, the occurrences of the masked priority groups/ traf\;fic classes are written from the lowest to the highest." subnode="shared_buffer_status_ext" access="RO" high_bound="19" low_bound="0" offset="0x5C.0" size="0xa0.0" />
 </node>
 
 <node name="set_node_in_ext" descr="" size="0x40.0" >
@@ -3385,7 +3511,7 @@
 	<field name="provisioned" descr="If set, the INI file is ready and the card is provisioned" access="RO" offset="0x0.31" size="0x0.1" />
 	<field name="ini_file_version" descr="User-configured version number of the current INI file.\;Valid only when active or lc_ready are &apos;1&apos;." access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="hw_revision" descr="HW revision of the line-card as it appears in the current INI file.\;Valid only when active or lc_ready are &apos;1&apos;." access="RO" offset="0x4.16" size="0x0.16" />
-	<field name="card_type" descr="Card type\;0x00: Buffalo 4x400G\;0x01: Buffalo 8x200G\;0x02: Buffalo 16x100G" access="RO" offset="0x8.0" size="0x0.8" />
+	<field name="card_type" descr="Card type\;0x00: Buffalo 4x400G\;0x01: Buffalo 8x200G\;0x02: Buffalo 16x100G\;" access="RO" offset="0x8.0" size="0x0.8" />
 </node>
 
 <node name="slot_name_ext" descr="" size="0x20.0" >
@@ -3397,12 +3523,12 @@
 	<field name="ps_ticks_res" descr="resolution for each tick in the phase axis in units of 0.01ps" access="RO" offset="0x0.16" size="0x0.16" />
 	<field name="mv_center_pos" descr="center position of eye in 0.1mV" access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="ps_center_pos" descr="center position of eye in 0.01ps" access="RO" offset="0x4.16" size="0x0.16" />
-	<field name="margin" descr="The margin that the lane received based on a specific config\;uration." access="RO" offset="0x8.0" size="0x0.24" />
+	<field name="margin" descr="The margin that the lane received based on a specific configu\;ration." access="RO" offset="0x8.0" size="0x0.24" />
 	<field name="margin_version" descr="[internal] 0 - no margin available\;[internal] 1 - Figure of Merit" access="RO" offset="0x8.24" size="0x0.8" />
 	<field name="height_eo_neg" descr="Voltage offset from eye center to the negative side of the \;upper eye in 0.1mV." access="RO" offset="0xC.0" size="0x0.16" />
-	<field name="height_eo_pos" descr="Voltage offset from eye center to the positive side of the \;upper eye in 0.1mV." access="RO" offset="0xC.16" size="0x0.16" />
+	<field name="height_eo_pos" descr="Voltage offset from eye center to the positive side of the upper \;eye in 0.1mV." access="RO" offset="0xC.16" size="0x0.16" />
 	<field name="phase_eo_neg" descr="The offset from the eye center to the negative (left) side of the \;upper eye in 0.01ps." access="RO" offset="0x10.0" size="0x0.16" />
-	<field name="phase_eo_pos" descr="The offset from the eye center to the positive (right) side of \;the upper eye in 0.01ps." access="RO" offset="0x10.16" size="0x0.16" />
+	<field name="phase_eo_pos" descr="The offset from the eye center to the positive (right) side of the \;upper eye in 0.01ps." access="RO" offset="0x10.16" size="0x0.16" />
 </node>
 
 <node name="slred_page_data_ext" descr="" size="0xa0.0" >
@@ -3427,7 +3553,7 @@
 	<field name="destructive_ctrl" descr="0 - non destructive scan\;1 - destructive scan\;Note: if non destructive scan is not supported this field is \;ignored and a destructive scan will be operated" access="RW" offset="0x4.29" size="0x0.1" />
 	<field name="last_scan" descr="set to &apos;1&apos; when performing last eye scan for lane.\;For example: when scanning 3 eyes in the order of up, mid, \;down. field should be set when scanning down eye.\;If scanning only 1 eye, field should be set." access="WO" offset="0x4.30" size="0x0.1" />
 	<field name="en" descr="start eye scan" access="WO" offset="0x4.31" size="0x0.1" />
-	<field name="page_data" descr="page data for index page_data_sel\;page 0 will contain info page data.\;Table  1479, &quot;SLRED - Serdes Lane Receive Eye Diagram Reg\;ister Layout for info page,&quot; on page  1808\;the page data 1-7 will contain the err_val for each index in \;ascending order.\;Table  1481, &quot;SLRED - Serdes Lane Receive Eye Diagram Reg\;ister Layout for page_data,&quot; on page  1810\;Each err_val[i] represents the bit errors of row floor(i / \;width_dim)\;and column i mod width_dim.\;Matrix is built starting from the left bottom corner.\;each err_val indicates the number of bit errors for one tick" subnode="slred_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xa0.0" />
+	<field name="page_data" descr="page data for index page_data_sel\;page 0 will contain info page data.\;Table 1503, &quot;SLRED - Serdes Lane Receive Eye Diagram \;Register Layout for info page,&quot; on page 1843\;the page data 1-7 will contain the err_val for each index in \;ascending order.\;Table 1505, &quot;SLRED - Serdes Lane Receive Eye Diagram \;Register Layout for page_data,&quot; on page 1845\;Each err_val[i] represents the bit errors of row floor(i / \;width_dim)\;and column i mod width_dim.\;Matrix is built starting from the left bottom corner.\;each err_val indicates the number of bit errors for one tick" subnode="slred_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xa0.0" />
 </node>
 
 <node name="slred_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0xa0.0" >
@@ -3440,17 +3566,17 @@
 	<field name="grade" descr="The grade that the lane received based on a specific configu\;ration.\;" access="RO" offset="0x4.0" size="0x0.24" />
 	<field name="grade_version" descr="" access="RO" offset="0x4.24" size="0x0.8" />
 	<field name="height_eo_neg_up" descr="Voltage offset from eye center to the negative side of the \;upper eye. Only applicable for PAM4 signal." access="RO" offset="0x8.0" size="0x0.16" />
-	<field name="height_eo_pos_up" descr="Voltage offset from eye center to the positive side of the \;upper eye.\;Only applicable for PAM4 signal." access="RO" offset="0x8.16" size="0x0.16" />
+	<field name="height_eo_pos_up" descr="Voltage offset from eye center to the positive side of the upper \;eye.\;Only applicable for PAM4 signal." access="RO" offset="0x8.16" size="0x0.16" />
 	<field name="height_eo_pos_mid" descr="Voltage offset from eye center to the positive side of the mid\;dle eye." access="RO" offset="0xC.0" size="0x0.16" />
 	<field name="phase_eo_neg_up" descr="The offset from the eye center to the negative (left) side of the \;upper eye. Only applicable for PAM4 signal." access="RO" offset="0xC.16" size="0x0.8" />
-	<field name="phase_eo_pos_up" descr="The offset from the eye center to the positive (right) side of \;the upper eye. Only applicable for PAM4 signal." access="RO" offset="0xC.24" size="0x0.8" />
+	<field name="phase_eo_pos_up" descr="The offset from the eye center to the positive (right) side of the \;upper eye. Only applicable for PAM4 signal." access="RO" offset="0xC.24" size="0x0.8" />
 	<field name="phase_eo_neg_mid" descr="The offset from the eye center to the negative (left) side of the \;middle eye." access="RO" offset="0x10.0" size="0x0.8" />
-	<field name="phase_eo_pos_mid" descr="The offset from the eye center to the positive (right) side of \;the middle eye." access="RO" offset="0x10.8" size="0x0.8" />
+	<field name="phase_eo_pos_mid" descr="The offset from the eye center to the positive (right) side of the \;middle eye." access="RO" offset="0x10.8" size="0x0.8" />
 	<field name="height_eo_neg_mid" descr="Voltage offset from eye center to the negative side of the mid\;dle eye." access="RO" offset="0x10.16" size="0x0.16" />
-	<field name="height_eo_neg_low" descr="Voltage offset from eye center to the negative side of the \;lower eye. Only applicable for PAM4 signal." access="RO" offset="0x14.0" size="0x0.16" />
+	<field name="height_eo_neg_low" descr="Voltage offset from eye center to the negative side of the lower \;eye. Only applicable for PAM4 signal." access="RO" offset="0x14.0" size="0x0.16" />
 	<field name="height_eo_pos_low" descr="Voltage offset from eye center to the positive side of the lower \;eye. Only applicable for PAM4 signal." access="RO" offset="0x14.16" size="0x0.16" />
 	<field name="phase_eo_neg_low" descr="The offset from the eye center to the negative (left) side of the \;lower eye. Only applicable for PAM4 signal." access="RO" offset="0x18.16" size="0x0.8" />
-	<field name="phase_eo_pos_low" descr="The offset from the eye center to the positive (right) side of \;the lower eye. Only applicable for PAM4 signal." access="RO" offset="0x18.24" size="0x0.8" />
+	<field name="phase_eo_pos_low" descr="The offset from the eye center to the positive (right) side of the \;lower eye. Only applicable for PAM4 signal." access="RO" offset="0x18.24" size="0x0.8" />
 	<field name="up_eye_grade" descr="upper eye grade" access="RO" offset="0x1C.0" size="0x0.16" />
 	<field name="mid_eye_grade" descr="middle eye grade" access="RO" offset="0x1C.16" size="0x0.16" />
 	<field name="dn_eye_grade" descr="lower eye grade" access="RO" offset="0x20.0" size="0x0.16" />
@@ -3466,6 +3592,14 @@
 	<field name="phase_eo_pos" descr="The offset from the eye center to the positive side." access="RO" offset="0x1C.16" size="0x0.8" />
 </node>
 
+<node name="slrg_5nm_scc_ext" descr="" size="0x18.0" >
+	<field name="lanes_in_use" descr="number of lanes (IO) in use for the Half Slice" access="RO" offset="0x0.0" size="0x0.4" />
+	<field name="grade_threshold" descr="Threshold for grades.\;Grade that is above this threshold will set the cause bit" access="RW" offset="0x0.8" size="0x0.8" />
+	<field name="lanes_mask_cause" descr="Bitmask of lanes. Bit 16 is for dbi lane\;For grade_lane[i] &gt; grade_threshold bit will be set." access="RO" offset="0x4.0" size="0x0.17" />
+	<field name="grade_dbi" descr="grade for dbi lane" access="RO" offset="0x4.24" size="0x0.8" />
+	<field name="grade_lane" descr="measured grade for lane &lt;i&gt; from initialization of the link." access="RO" high_bound="15" low_bound="0" offset="0x8.24" size="0x10.0" />
+</node>
+
 <node name="slrg_7nm_ext" descr="" size="0x18.0" >
 	<field name="fom_measurment" descr="Bitmask for measurement activation\;Bit 0 - Upper eye\;Bit 1 - Middle eye\;Bit 2 - Lower eye\;Bit 3- Composite eye\;Note: NRZ only Bit 3 is valid" access="OP" offset="0x0.0" size="0x0.4" />
 	<field name="initial_fom" descr="measured EOM status after FEQ.\;valid only when SLRG.status is &apos;1&apos;" access="RO" offset="0x4.0" size="0x0.8" />
@@ -3479,7 +3613,7 @@
 <node name="slrg_7nm_testing_ext" descr="" size="0x1c.0" >
 	<field name="iterations" descr="Number of iterations to run FOM\;0 - fw default" access="OP" offset="0x0.0" size="0x0.10" />
 	<field name="status" descr="0 - measure not preformed\;1 - measuring in progress\;2 - measuring done" access="RO" offset="0x0.16" size="0x0.3" />
-	<field name="lane_meas_info" descr="FOM measurements info for lane &lt;i&gt;\;See Table 1337, &quot;Lane Measure Info layout,&quot; on page 1641." subnode="slrg_lane_measure_info_ext" access="RO" offset="0x4.0" size="0x18.0" />
+	<field name="lane_meas_info" descr="FOM measurements info for lane &lt;i&gt;\;See Table 1359, &quot;Lane Measure Info layout,&quot; on \;page 1673." subnode="slrg_lane_measure_info_ext" access="RO" offset="0x4.0" size="0x18.0" />
 </node>
 
 <node name="slrg_lane_measure_info_ext" descr="" size="0x18.0" >
@@ -3502,14 +3636,14 @@
 </node>
 
 <node name="slrg_reg_ext" descr="" size="0x28.0" >
-	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main\;5 - USR Tile\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
+	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - Main Die to Die (USR / SCC)\;5 - Tile Die to Die (USR / SCC)\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Logical lane number\;[internal] Mapping to physical lane number can be queried in \;PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. \;0 - Local port number\;1 - IB / label port number\;" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="version" descr="0 - 40nm products\;1 - 28nm products\;3 - 16nm products\;4 - 7nm products" access="RO" offset="0x0.24" size="0x0.4" />
+	<field name="version" descr="0 - 40nm products\;1 - 28nm products\;3 - 16nm products\;4 - 7nm products\;5 - 5nm products" access="RO" offset="0x0.24" size="0x0.4" />
 	<field name="status" descr="0 - Invalid\;1 - Valid\;" access="RO" offset="0x0.28" size="0x0.4" />
-	<field name="page_data" descr="Table 1329, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 40nm and 28nm,&quot; on page 1636\;Table 1331, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 16nm,&quot; on page 1637\;Table 1333, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 7nm,&quot; on page 1639\;Table 1335, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 7nm Testing,&quot; on page 1640" subnode="slrg_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x24.0" />
+	<field name="page_data" descr="Table 1351, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 40nm and 28nm,&quot; on page 1668\;Table 1353, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 16nm,&quot; on page 1669\;Table 1355, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 7nm,&quot; on page 1671\;Table 1357, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 7nm Testing,&quot; on page 1672\;Table 1361, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 5nm SCC,&quot; on page 1674" subnode="slrg_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x24.0" />
 </node>
 
 <node name="slrg_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0x24.0" >
@@ -3517,6 +3651,7 @@
 	<field name="slrg_16nm_ext" descr="" subnode="slrg_16nm_ext" offset="0x0.0" size="0x24.0" />
 	<field name="slrg_7nm_ext" descr="" subnode="slrg_7nm_ext" offset="0x0.0" size="0x18.0" />
 	<field name="slrg_7nm_testing_ext" descr="" subnode="slrg_7nm_testing_ext" offset="0x0.0" size="0x1c.0" />
+	<field name="slrg_5nm_scc_ext" descr="" subnode="slrg_5nm_scc_ext" offset="0x0.0" size="0x18.0" />
 </node>
 
 <node name="sltp_16nm_ext" descr="" size="0x18.0" >
@@ -3628,12 +3763,12 @@
 	<field name="lane_speed" descr="Reserved for PCIe.\;The lane speed for TX settings:\;0 - SDR / Gen1 (PCIe)\;1 - DDR / Gen2 (PCIe) / 5GBASE-R\;2 - QDR / Gen3 (PCIe)\;3 - FDR10 (10GE / 40GE)\;4 - FDR (56GE) / Gen4 (PCIe)\;5 - EDR (25GE / 50GE / 100GE) / Gen5 (PCIe)\;6 - HDR (50GE / 200GE / 400GE)\;7 - NDR /100GE / 200GE / 400GE / 800GE (53.125 Gbd / \;106.25Gb/s)\;8-9 - Reserved\;10 - 1GE\;11 - 2.5GE (XAUI)\;12 - 50GE-KR4\;13-15 - Reserved" access="RW" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Logical lane number\;[internal] Mapping to physical lane number can be queried in \;PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="tx_policy" descr="Configures Tx parameter set policy\;0 - Tx parameters will be set according to best possible con\;figuration chosen by the system\;1 - Tx parameters will be set according to Data Base only and \;will not be overridden by link training (e.g KR-Startup)" access="RW" offset="0x0.13" size="0x0.1" />
-	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;3 - PCI / Out of Band" access="INDEX" offset="0x0.14" size="0x0.2" />
+	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number [7:0]" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="version" descr="0: prod_40nm\;1: prod_28nm\;3: prod_16nm\;4: prod_7nm\;7: prod_lut_7nm" access="RO" enum="prod_40nm=0x0,prod_28nm=0x1,prod_16nm=0x3,prod_7nm=0x4,prod_lut_7nm=0x7" offset="0x0.24" size="0x0.4" />
 	<field name="status" descr="0 - Invalid\;1 - Valid" access="RO" offset="0x0.28" size="0x0.2" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.30" size="0x0.2" />
-	<field name="page_data" descr="Table  1317, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for 28nm and 40nm,&quot; on page  1626\;Table  1319, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for 16nm,&quot; on page  1627\;Table  1323, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for 7nm,&quot; on page  1629\;Table  1325, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for LUT 7nm,&quot; on page  1630" subnode="sltp_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x48.0" union_selector="$(parent).version" />
+	<field name="page_data" descr="Table 1339, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for 28nm and 40nm,&quot; on page 1658\;Table 1341, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for 16nm,&quot; on page 1659\;Table 1345, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for 7nm,&quot; on page 1661\;Table 1347, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for LUT 7nm,&quot; on page 1662" subnode="sltp_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x48.0" union_selector="$(parent).version" />
 </node>
 
 <node name="sltp_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0x48.0" >
@@ -3645,7 +3780,7 @@
 
 <node name="stat_bufferx_reg_ext" descr="" size="0x8.0" >
 	<field name="watermark" descr="Watermark in cells (max buffer usage since last clear)\;For stat_shared_headroom_pool, this field is reserved." access="RO" offset="0x0.0" size="0x0.16" />
-	<field name="used_buffer" descr="Number of used buffer cells." access="RO" offset="0x4.0" size="0x0.16" />
+	<field name="used_buffer" descr="Number of used buffer cells.\;For stat_port_shared_headroom_pool this field is reserved." access="RO" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="string_db_parameters_ext" descr="" size="0x8.0" >
@@ -3697,9 +3832,9 @@
 </node>
 
 <node name="vhca_trust_level_ext" descr="" size="0x10.0" >
-	<field name="vhca_id" descr="Valid only when all_vhca==0" access="RO" offset="0x0.0" size="0x0.16" />
-	<field name="all_vhca" descr="If set, set turst_level to all vHCAs that belong to this \;vport_group_manager." access="WO" offset="0x0.31" size="0x0.1" />
-	<field name="trust_level" descr="Bitmask indicates trust levels supported for a vhca\;Bit 0x0: FULL_TRUST" access="WO" enum="FULL_TRUST=0x1" offset="0x4.0" size="0x4.0" />
+	<field name="vhca_id" descr="Valid only when all_vhca==0" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="all_vhca" descr="If set, set turst_level to all vHCAs that belong to this \;vport_group_manager." access="INDEX" offset="0x0.31" size="0x0.1" />
+	<field name="trust_level" descr="Bitmask indicates trust levels supported for a vhca\;Bit 0x0: FULL_TRUST" access="RW" enum="FULL_TRUST=0x1" offset="0x4.0" size="0x4.0" />
 </node>
 
 <node name="ztt_ext" descr="" size="0x10.0" >
diff --git a/tools_layouts/adb/prm/switch/ext/register_access_table.adb b/tools_layouts/adb/prm/switch/ext/register_access_table.adb
index 539de75e..13250ce9 100644
--- a/tools_layouts/adb/prm/switch/ext/register_access_table.adb
+++ b/tools_layouts/adb/prm/switch/ext/register_access_table.adb
@@ -35,26 +35,32 @@
 <config  field_attr="capability" type="ascii" />
 <config  field_attr="target" type="ascii" />
 <config  field_attr="version" type="ascii" />
-<info source_doc_name="" source_doc_version="Rev 1.55.067" />
-<node name="FSDB_ext" descr="" size="0x4c.0" >
+<info source_doc_name="" source_doc_version="Rev 1.55.078" />
+<node name="FMQC_ext" descr="" size="0xc.0" >
+	<field name="lp" descr="local port" access="INDEX" offset="0x0.0" size="0x0.10" />
+	<field name="s" descr="status\;0: failure \;1: success" access="RO" offset="0x0.16" size="0x0.1" />
+	<field name="modifier_cluster" descr="modifier cluster\;Reserved when status != success" access="RO" offset="0x4.0" size="0x0.11" />
+</node>
+
+<node name="FSDB_ext" descr="" size="0x74.0" >
 	<field name="acl_group_id" descr="ACL Group Identifier \;Range of 0 .. (cap_max_acl_groups-1)" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="sem_op" descr="0: nop (no operation)\;1: unlock\;2: lock semaphore\;\;Note: Reserved when db_op is remove/remove all" access="RW" offset="0x4.0" size="0x0.2" />
-	<field name="db_op" descr="0: nop\;1: read 64bit value \;2: write data\;3: remove entry w/o failure indication\;4: remove entry with failure indication\;5: remove all partition entries\;\;Note: \;- remove must be set with sem_op = unlock\;- write can&quot;t be set with sem_op = lock\;- when db_op = remove_all (5), only partition_id relevant\;\;" access="RW" offset="0x4.4" size="0x0.2" />
+	<field name="sem_op" descr="0: nop (no operation)\;1: lock semaphore\;2: unlock\;Note: Reserved when db_op is remove/remove all or when \;EMAD query operation." access="OP" offset="0x4.0" size="0x0.2" />
+	<field name="db_op" descr="0: nop\;1: read 64bit value \;2: write data\;3: remove entry with failure indication\;4: remove entry w/o failure indication\;5: remove all partition entries\;\;Note: \;- remove must be set with sem_op = unlock\;- write can&quot;t be set with sem_op = lock\;- when db_op = remove_all (5), only partition_id relevant\;\;Reserved when EMAD query operation.\;\;" access="OP" offset="0x4.4" size="0x0.3" />
 	<field name="partition_id" descr="Valid values 0..(cap_max_sf_db_parititions-1). \;Indicates to which partition to associate the entry" access="INDEX" offset="0x4.8" size="0x0.3" />
-	<field name="fr" descr="Failure Reason\;0: db overflow\;1: max semaphore counter\;2: unlock invalid entry\;3: remove invalid entry\;4: insertion failure\;5-7: reserved\;\;\;\;\;Reserved when s = success (1)or when db_op = remove all \;entries (5)" access="RO" offset="0x4.16" size="0x0.3" />
-	<field name="sem_lock_cnt" descr="counter of retries of semaphore locks, stuck at max value\;\;Valid when \;(db_op != remove (3-5) AND rsd=1 AND sem_op = nop)" access="RO" offset="0x8.0" size="0x0.16" />
+	<field name="fr" descr="Failure Reason\;0: db overflow\;1: max semaphore counter\;2: unlock invalid entry\;3: remove invalid entry\;4: insertion failure\;5-7: reserved\;\;\;\;\;Reserved when s = success (1) or when db_op = remove all \;entries (5) or on EMAD query" access="RO" offset="0x4.16" size="0x0.3" />
+	<field name="sem_lock_cnt" descr="counter of retries of semaphore locks, stuck at max value\;\;Reserved when EMAD write operation." access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="sem_val" descr="Last semaphore value for the read entry\;0: semaphore is unlocked\;1: semaphore is locked\;\;reserved when db_op = remove (3-5)" access="RO" offset="0x8.24" size="0x0.1" />
-	<field name="a" descr="activity bit indication\;0: no activity\;1: active\;\;Reserved when db_op != (1)" access="RO" offset="0x8.25" size="0x0.1" />
-	<field name="hit" descr="hit indication\;0: entry was not found in db \;1: entry was in db \;\;" access="RO" offset="0x8.26" size="0x0.1" />
-	<field name="s" descr="Status bit\;0: operation failure\;1: operation success" access="RO" offset="0x8.31" size="0x0.1" />
+	<field name="a" descr="activity bit indication\;0: no activity\;1: active\;\;Reserved when EMAD write operation.\;\;" access="RO" offset="0x8.25" size="0x0.1" />
+	<field name="hit" descr="hit indication\;0: entry was not found in db \;1: entry was in db \;\;Note: Reserved when db_op is remove all (5).\;" access="RO" offset="0x8.26" size="0x0.1" />
+	<field name="s" descr="Status bit\;0: operation failure\;1: operation success\;\;Reserved when EMAD query operation." access="RO" offset="0x8.31" size="0x0.1" />
 	<field name="data" descr="read/write data\;Reserved when db_op = remove or remove_all" subnode="uint64" access="RW" offset="0xc.0" size="0x8.0" />
-	<field name="key_data" descr="key data used for lookup. See Table 1588, &quot;Flex2 Key \;Layout,&quot; on page 2234" access="INDEX" high_bound="13" low_bound="0" offset="0x14.0" size="0x38.0" />
+	<field name="key_data" descr="ACL Key data as described in Section 10.6.2, &quot;Flex2 ACL \;Key Blocks Layout&quot;, on page 1993\;The key must be masked according to the ERP (if ERPs \;exist for the region) or according to master_mask (if no \;ERPs for the region)" access="INDEX" high_bound="23" low_bound="0" offset="0x14.0" size="0x60.0" />
 </node>
 
-<node name="FSED_ext" descr="" size="0x2dd0.0" >
-	<field name="num_pages" descr="Number of pages dumped\;Range for response is 0..172" access="RO" offset="0x0.16" size="0x0.9" />
+<node name="FSED_ext" descr="" size="0x3d8.0" >
+	<field name="num_pages" descr="Number of pages dumped\;Range for response is 0..14" access="RO" offset="0x0.16" size="0x0.9" />
 	<field name="page_mode_bitmap" descr="0: mode_0 - 54B\;1: mode_1 - 9B/18B" access="RO" enum="mode_0=0x0,mode_1=0x1" high_bound="6" low_bound="0" offset="0x4.0" size="0x1c.0" />
-	<field name="sf_dump_page" descr="dumped entries list\;See Table 2553, &quot;SF Page Dump Mode 0 Layout,&quot; on \;page 3134\;See Table 2555, &quot;SF Page Dump Mode 1 Layout,&quot; on \;page 3135" subnode="FSED_sf_dump_page_auto_ext" access="RO" high_bound="171" low_bound="0" offset="0x20.0" size="0x2db0.0" union_selector="$(parent).page_mode_bitmap" />
+	<field name="sf_dump_page" descr="dumped entries list\;See Table 2779, &quot;SF Page Dump Mode 0 Layout,&quot; on \;page 2937\;See Table 2781, &quot;SF Page Dump Mode 1 Layout,&quot; on \;page 2939" subnode="FSED_sf_dump_page_auto_ext" access="RO" high_bound="13" low_bound="0" offset="0x20.0" size="0x3b8.0" union_selector="$(parent).page_mode_bitmap" />
 </node>
 
 <node name="FSED_sf_dump_page_auto_ext" descr="" attr_is_union="1" size="0x44.0" >
@@ -62,22 +68,15 @@
 	<field name="SF_PAGE_DUMP_MODE_1_ext" descr="" subnode="SF_PAGE_DUMP_MODE_1_ext" offset="0x0.0" selected_by="mode_1" size="0x44.0" />
 </node>
 
-<node name="FSFH_action_info_auto_ext" descr="" attr_is_union="1" size="0x10.0" >
-	<field name="Trap_Action_without_Cookie_ext" descr="" subnode="Trap_Action_without_Cookie_ext" offset="0x0.0" selected_by="Trap_action_no_cookie" size="0x10.0" />
-	<field name="Trap_Action_with_Cookie_ext" descr="" subnode="Trap_Action_with_Cookie_ext" offset="0x0.0" selected_by="Trap_action_with_cookie" size="0x10.0" />
-	<field name="flex_goto_action_ext" descr="" subnode="flex_goto_action_ext" offset="0x0.0" selected_by="Next_Pointer_Action" size="0x4.0" />
-</node>
-
-<node name="FSFH_ext" descr="" size="0x14.0" >
+<node name="FSFH_ext" descr="" size="0xac.0" >
 	<field name="failure_reason" descr="0: db overflow\;1: max semaphore counter\;2: unlock invalid entry \;3: remove invalid entry \;4: insertion failure\;5-7: reserved" access="INDEX" offset="0x0.0" size="0x0.3" />
-	<field name="action_type" descr="0: Trap_action_no_cookie\;1: Trap_action_with_cookie\;2: Next_Pointer_Action" access="RW" enum="Trap_action_no_cookie=0x0,Trap_action_with_cookie=0x1,Next_Pointer_Action=0x2" offset="0x0.8" size="0x0.3" />
-	<field name="action_info" descr="action information\;See Table 2563, &quot;Trap Action without Cookie Layout,&quot; \;on page 3139\;See Table 2565, &quot;Trap Action with Cookie Layout,&quot; on \;page 3141\;See Table 2567, &quot;Next Pointer Action Layout,&quot; on \;page 3143" subnode="FSFH_action_info_auto_ext" access="RW" offset="0x4.0" size="0x10.0" union_selector="$(parent).action_type" />
+	<field name="action_info" descr="Action-set to perform when rule is matched.\;See Section 1990, &quot;Flexible Action Set: Supported \;Actions&quot;, on page 2156.\;Must be zero padded if action set is shorter." access="RW" high_bound="41" low_bound="0" offset="0x4.0" size="0xa8.0" />
 </node>
 
 <node name="FSGCR_ext" descr="" size="0xc.0" >
-	<field name="sem_lock_protection_en" descr="Semaphore Lock Protection:\;0: disable semaphore lock protection\;1: enable semaphore lock protection\;\;Can be changed on the fly" access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="sem_lock_protection_en" descr="Semaphore Lock Counter Protection:\;0: disable semaphore lock protection\;1: enable semaphore lock protection. Can trigger \;FSFH.failure_reason of type &quot;max semaphore counter&quot; in \;case of num of lock retries violates sem_poll_max_retries.\;\;Can be changed on the fly\;\;" access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="failure_on_invalid_lock" descr="0: ignore failure on unlocking an invalid entry\;1: Treat unlocking of invalid entry as a failure\;\;Can be changed on the fly" access="RW" offset="0x0.1" size="0x0.1" />
-	<field name="sem_poll_max_retries" descr="Polling retry counter\;valid values: 1-255\;" access="RW" offset="0x4.0" size="0x0.8" />
+	<field name="sem_poll_max_retries" descr="Polling retry counter\;valid values: 1-255\;\;Can be changed on the fly.\;" access="RW" offset="0x4.0" size="0x0.8" />
 	<field name="ticket_cb_index" descr="valid values: 0..(cap_max_custom_byte_sets-1).\;when ticket machine is enabled on rx port, HW is storing \;ticket info in the specified cb index\;\;Can&apos;t be changed on the fly nor during traffic" access="RW" offset="0x4.16" size="0x0.4" />
 	<field name="linear_group_id" descr="valid values: 0 .. (cap_max_acl_groups-1)\;Used to indicate the group id allocated for the linear key\; \;\;" access="RW" offset="0x8.0" size="0x0.16" />
 </node>
@@ -118,7 +117,7 @@
 
 <node name="FSTM_ext" descr="" size="0x20c.0" >
 	<field name="record_num" descr="number of valid port configuration records" access="OP" offset="0x0.0" size="0x0.9" />
-	<field name="port_ticket_info" descr="list of port_ticket_info * 260 which indicates per port \;whether ticket machine should be enabled or disabled.\;See Table 2549, &quot;Port Ticket Info Layout,&quot; on \;page 3132" access="RW" high_bound="259" low_bound="0" offset="0x4.16" size="0x208.0" />
+	<field name="port_ticket_info" descr="list of port_ticket_info * 260 which indicates per port \;whether ticket machine should be enabled or disabled.\;See Table 2775, &quot;Port Ticket Info Layout,&quot; on \;page 2934" access="RW" high_bound="259" low_bound="0" offset="0x4.16" size="0x208.0" />
 </node>
 
 <node name="IB_long_portcntrs_attribute_grp_data_ext" descr="" size="0xf8.0" >
@@ -178,63 +177,91 @@
 	<field name="port_xmit_wait" descr="For counter description please refer to the InfiniBand \;specification" access="RO" offset="0x24.0" size="0x4.0" />
 </node>
 
+<node name="ITGCR_reg_ext" descr="" size="0x8.0" >
+	<field name="l4_validity" descr="0: use layer 4 offset as post layer 3 (valid L4 header is not \;mandatory). Hence, L3 offset + L3 header size.\;1: packet must have a valid (and known) parsed L4 header" access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="def_masking_size" descr="Default masking size in case of no match\;Units of 1B\;Granularity of 2B\;Min value: 48B\;Max value: 512B" access="RW" offset="0x4.0" size="0x0.9" />
+</node>
+
+<node name="ITPR_reg_ext" descr="" size="0x14.0" >
+	<field name="trunc_prof" descr="Truncation profile\;Default mapping:\;0..7: Mirror agents profiles\;8: ARN\;9: CNP\;\;12-15: ACL" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="tr_size" descr="truncation size\;Units of 1B\;Granularity of 4B\;Min value: 64B\;\;Note: \;when mode = (2), max size is 512B\;" access="RW" offset="0x4.0" size="0x0.14" />
+	<field name="mode" descr="mode:\;0: disable \;1: static truncation only\;2: static truncation + parsing based masking\;\;Note: mode = (2) is valid only for trunc_prof = 0..7\;\;\;" access="RW" offset="0x8.0" size="0x0.2" />
+	<field name="dd" descr="default disable\;In case packet has no matching header found to at least one \;of the selected headers in masking_label_en:\;0: use default masking size (ITGCR.def_masking_size)\;1: no truncation and no masking are applied\;Reserved when mode != (2)" access="RW" offset="0x8.8" size="0x0.1" />
+	<field name="masking_label_en" descr="Bitmask use the following headers as base for packet mask\;ing:\;0: cb_set 0\;1: cb_set 1\;2: payload \;3: inner L4 header \;4: inner L3 header\;5: inner L2 header\;6: outer L4 header\;7: outer L3 header\;8: outer L2 header\;\;\;Notes: \;1. When a packet has a match to multiple labels enabled, the \;header with max offset will be selected\;2. When cb_set 0/1 are used together with truncation labels, \;the max offset will be used\;3. cb_set 0/1 can&apos;t be set by ALU \;4. The packet will be masked from the beginning of the \;matching label. For example, if L3 was selected, packet will \;be masked post L2 header.\;\;Reserved when mode != (2)" access="RW" offset="0xC.0" size="0x0.9" />
+	<field name="addition_masking_offset_en" descr="Bitmask defines per label whether addition_masking_offset \;should be added to the label in case of masking:\;0: cb_set 0\;1: cb_set 1\;2: payload \;3: inner L4 header \;4: inner L3 header\;5: inner L2 header\;6: outer L4 header\;7: outer L3 header\;8: outer L2 header\;\;Reserved when mode != (2)" access="RW" offset="0x10.0" size="0x0.9" />
+	<field name="addition_masking_offset" descr="number of bytes to be added on top of the matching label \;upon masking is applied\;\;Units of 1B\;Granularity of 2B\;Max value: 512 Bytes\;\;Reserved when mode != (2)" access="RW" offset="0x10.16" size="0x0.9" />
+</node>
+
+<node name="MSECQ_reg_ext" descr="" size="0x40.0" >
+	<field name="local_enhanced_ssm_code" descr="The enhanced SSM code to be delivered when on holdover." access="RO" offset="0x4.0" size="0x0.8" />
+	<field name="local_ssm_code" descr="The SSM code to be delivered when on holdover." access="RO" offset="0x4.8" size="0x0.4" />
+	<field name="network_option" descr="The network option of this device (as defined in ITU-T G.781).\;1: Network option 1\;2: Network option 2" access="RO" offset="0x4.12" size="0x0.2" />
+	<field name="local_clock_identity" descr="The SyncE clock identity of the device." subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
+</node>
+
+<node name="MSEES_reg_ext" descr="" size="0x40.0" >
+	<field name="lp_msb" descr="2-bit expansion of the local port. Represents the \;local_port[9:8] bits" access="INDEX" offset="0x0.12" size="0x0.2" />
+	<field name="pnat" descr="Port number access type, determines the way local_port is \;interpreted:\;0: Local port number\;1: Label port number\;3: Out of band or PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
+	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="field_select" descr="Field select indicates which fields to modify in write opera\;tion to this register. \;Bit 0: enable field_select\;Bit 1: admin_status\;Bit 2: admin_freq_measure\;Bits 3-31: Reserved" access="WO" offset="0x4.0" size="0x4.0" />
+	<field name="failure_reason" descr="0: undefined error \;1: port down\;2: too high frequency_diff\;3: network synchronizer device error\;4: lack of resources for tracking \;5-255: reserved for future use \;\;Note: Reserved when oper_status is different than 4" access="RO" offset="0x8.0" size="0x0.9" />
+	<field name="oper_freq_measure" descr="0: frequency_diff field is not valid\;1: frequency_diff field is valid" access="RO" offset="0x8.9" size="0x0.1" />
+	<field name="admin_freq_measure" descr="0: don&apos;t measure frequency_diff\;1: measure frequency_diff" access="RW" offset="0x8.10" size="0x0.1" />
+	<field name="ho_acq" descr="Holdover acquired.\;0: The device does not have enough data to go into holdover.\;1: The device has enough data to go into holdover." access="RO" offset="0x8.23" size="0x0.1" />
+	<field name="oper_status" descr="0: free running - the device is using internal oscillator as \;timing source \;1: self track - the device is in sync with this timing source\;2: other track - the device is in sync with other timing source\;3: holdover - the device is using the internal oscillator and \;past information as a timing source.\;4: Holdover due to failure (see field failure_reason)\;5: Free running due to failure (see field failure_reason)." access="RO" offset="0x8.24" size="0x0.4" />
+	<field name="admin_status" descr="0: holdover/free running - the device will use internal oscil\;lator as timing source. \;Free running is the default value.\;Device holdover / free running will take place only if admin \;status = 0 across all other ports.\;1: track - the device will sync to this timing source. When \;writing admin status = 1 to a port, all other ports will move \;to admin status = 0." access="RW" offset="0x8.28" size="0x0.4" />
+	<field name="frequency_diff" descr="The FFO (Fractional Frequency Offset) between the rx and tx \;symbol rate: (rx_frequency- tx_frequency) /rx_frequency.\;Value is in ppt (2&apos;s compliment).\;Any value larger than 0x7FFFFFFF represented as \;0x7FFFFFFF. \;Any value smaller than 0x8000000 represented as \;0x8000000.\;\;Note: Reserved when oper_freq is different than &apos;1&apos;." access="RO" offset="0xC.0" size="0x4.0" />
+</node>
+
+<node name="MSPI_ext" descr="" size="0x18.0" >
+	<field name="vendor_id" descr="0: SiTime\;1: Renesas \;2: TI\;\;Reserved when synce_support = 0" access="RO" offset="0x0.0" size="0x0.4" />
+	<field name="synce_support" descr="0: SyncE is not supported by FW\;1: SyncE is supported by FW" access="RO" offset="0x0.31" size="0x0.1" />
+	<field name="config_version_id" descr="Configuration version id\;\;Reserved when synce_support = 0" access="RO" offset="0x4.0" size="0x0.16" />
+	<field name="bcc" descr="burned configuration count\;Counts how many times the configuration was burned to the \;clock sync&apos;\;\;Reserved when synce_support = 0" access="RO" offset="0x8.0" size="0x0.8" />
+	<field name="obs_temperature" descr="On Board Sensor Temperature \;Units of 0.125 Celsius degrees.\;For negative values 2&apos;s complement is used (for example: -\;3.25 Celsius will read as 0xFFE6)" access="RO" offset="0x10.0" size="0x0.16" />
+	<field name="obtv" descr="On Board Temperature validity\;0: temperature data is not valid\;1: temperature data is valid" access="RO" offset="0x10.31" size="0x0.1" />
+	<field name="bis_temperature" descr="Built In Sensor Temperature \;Units of 0.125 Celsius degrees.\;For negative values 2&apos;s complement is used (for example: -\;3.25 Celsius will read as 0xFFE6)" access="RO" offset="0x14.0" size="0x0.16" />
+	<field name="bitv" descr="Built In OCXO sensor Temperature validity\;0: temperature data is not valid\;1: temperature data is valid\;" access="RO" offset="0x14.31" size="0x0.1" />
+</node>
+
 <node name="SF_PAGE_DUMP_MODE_0_ext" descr="" size="0x44.0" >
-	<field name="key_54B_msb" descr="See Table 1588, &quot;Flex2 Key Layout,&quot; on page 2234" access="RO" offset="0x0.0" size="0x0.16" />
+	<field name="key_54B_msb" descr="See Table 1727, &quot;Flex2 Key Layout,&quot; on page 1994" access="RO" offset="0x0.0" size="0x0.16" />
 	<field name="a" descr="Activity bit\;0: inactive\;1: active" access="RO" offset="0x0.16" size="0x0.1" />
 	<field name="sem_s" descr="semaphore state\;0: unlocked\;1: locked" access="RO" offset="0x0.19" size="0x0.1" />
 	<field name="partition" descr="Partition id" access="RO" offset="0x0.20" size="0x0.3" />
 	<field name="key_size" descr="3: key size is 54 bytes" access="RO" offset="0x0.28" size="0x0.2" />
 	<field name="valid" descr="0: page is not valid\;1: page is valid" access="RO" offset="0x0.31" size="0x0.1" />
-	<field name="key_54B" descr="See Table 1588, &quot;Flex2 Key Layout,&quot; on page 2234" access="RO" high_bound="12" low_bound="0" offset="0x4.0" size="0x34.0" />
+	<field name="key_54B" descr="See Table 1727, &quot;Flex2 Key Layout,&quot; on page 1994" access="RO" high_bound="12" low_bound="0" offset="0x4.0" size="0x34.0" />
 	<field name="data" descr="" subnode="uint64" access="RO" offset="0x38.0" size="0x8.0" />
 	<field name="region_id" descr="region id" access="RO" offset="0x40.0" size="0x0.16" />
 	<field name="sem_count" descr="semaphore count" access="RO" offset="0x40.16" size="0x0.16" />
 </node>
 
 <node name="SF_PAGE_DUMP_MODE_1_ext" descr="" size="0x44.0" >
-	<field name="record_0" descr="See Table 2557, &quot;SF Record Type 1 Layout,&quot; on \;page 3135" access="RO" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
-	<field name="record_1" descr="See Table 2557, &quot;SF Record Type 1 Layout,&quot; on \;page 3135" access="RO" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="record_0" descr="See Table 2783, &quot;SF Record Type 1 Layout,&quot; on \;page 2939" access="RO" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
+	<field name="record_1" descr="See Table 2783, &quot;SF Record Type 1 Layout,&quot; on \;page 2939" access="RO" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 </node>
 
 <node name="SLCRV2_ext" descr="" size="0x50.0" >
-	<field name="type" descr="Hash type\;0: CRC (default)\;1: XOR \;2: Random\;3: CRC2, For Spectrum-2 and on\;4: XOR2 - this is a always symmetric hash function, always \;symmetric also for inner fields (L2, L3,L4). When enabled the \;sh is reserved. For Spectrum-2 and on. Currently not Sup\;ported by FW.  \;" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="sh" descr="Symmetric hash \;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: When this bit is set, enabling addresses in outer_head\;er_fields_enables and inner_header_fields_enables\;For SwitchX/-2 must be in couples - both source and destina\;tion. This includes the following sets:\;- SMAC, DMAC\;- SIP, DIP\;- TCP/UDP source port, TCP/UDP destination port\;- SID, DID, for SwitchX/-2 only\;" access="RW" offset="0x0.8" size="0x0.1" />
+	<field name="type" descr="Hash type\;0: CRC (default)\;1: XOR \;2: Random\;3: CRC2, For Spectrum-2 and on\;\; \;" access="RW" offset="0x0.0" size="0x0.4" />
+	<field name="sh" descr="Symmetric hash \;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: When this bit is set, enabling addresses in outer_\;header_fields_enables and inner_header_fields_enables\;For SwitchX/-2 must be in couples - both source and desti\;nation. This includes the following sets:\;- SMAC, DMAC\;- SIP, DIP\;- TCP/UDP source port, TCP/UDP destination port\;- SID, DID, for SwitchX/-2 only\;" access="RW" offset="0x0.8" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Ingress Local port number\;Supported from CPU port\;Not supported from router port\;Reserved when pp = Global Configuration" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="pp" descr="Per Port Configuration\;0: Global Configuration (for all ports)\;1: Per port configuration, based on local_port field.\;Note: SW must not read as global if last write was not global." access="INDEX" offset="0x0.24" size="0x0.1" />
-	<field name="seed" descr="LAG seed value\;The seed is the same for all ports (latest configuration config\;ures the seed for all ports)." access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="general_fields" descr="This is a bit mask, in which each bit enables a specific field to \;be included in the hash calculation. \;Bit 0: Ingress port\;Bit 1: custom_bytes are set by cbsets field.\;Bit i: custom_bytes i-2\;i = 2 .. 2 + (cap_max_custom_byte_sets_for_hash * cap_cus\;tom_byte_entry_size - 1). Reserved when Bit1 = 1.\;See Section 10.3.14, &quot;Custom Bytes&quot;, on page 2138" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="outer_header_enables" descr="Outer header enables. Each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
-	<field name="outer_header_fields_enable" descr="Layer2 fields, subject to outer_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;Bit 3: Outer VID\;Bit 4: Outer PCP\;Bit 5: Outer DEI\;Bit 6: Inner VID\;Bit 7: Inner PCP\;Bit 8: Inner DEI\;\;IPv4 fields, subject to outer_header_enables:\;Bits 12:9: IPv4 SIP 0-3 enable per byte. For ARP all bytes are \;used\;Bits 16:13: IPv4 DIP 0-3 enable per byte. For ARP all bytes are \;used\;Bit 17: IPv4 Protocol\;Bit 18: IPv4 DSCP\;Bit 19: IPv4 ECN\;Bit 20: IPv4 IP L3 Length - length field bits [13:10]\;\;IPv6 fields, subject to outer_header_enables:\;Bits 21: IPv6 enable bytes of SIP 0-7. For ARP all bytes are \;used\;Bits 28:22 reserved\;Bits 36:29: IPv6 SIP 8-15 enable per byte. For ARP all bytes are \;used\;Bits 37: IPv6 enable bytes of DIP 0-7. For ARP all bytes are \;used\;Bits 44:38 reserved\;Bits 52:45: IPv6 DIP 8-15 enable per byte. For ARP all bytes \;are used\;Bit 53: IPv6 Next Header\;Bit 54: IPv6 DSCP\;Bit 55: IPv6 ECN\;Bit 56: IPv6 IP L3 Length - length field bits [13:10]\;Bit 57: IPv6 Flow label\;\;RoCE v1 fields: [TBD]\;Bit 58: [TBD] GRH SIP\;Bit 59: [TBD] GRH DIP\;Bit 60: [TBD] GRH Next Protocol\;Bit 61: [TBD] GRH DSCP\;Bit 62: [TBD] GRH ECN\;Bit 63: [TBD] GRH L3 Length\;Bit 64: [TBD] GRH Flow label" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
-	<field name="inner_header_enables" descr="Inner header enables. Each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable inner Layer2 fields if inner packet is not IPv4/6\;Bit 1: Enable inner Layer2 fields if inner packet is IPv4\;Bit 2: Enable inner Layer2 fields if inner packet is IPv6\;Bit 3: Enable inner IPv4 fields if inner packet is not TCP and \;not UDP\;Bit 4: Enable inner IPv4 fields if inner packet is either TCP or \;UDP\;Bit 5: Enable inner IPv6 fields if inner packet is not TCP and \;not UDP\;Bit 6: Enable inner IPv6 fields if inner packet is either TCP or \;UDP\;Bit 7: Enable inner TCP/UDP header fields if inner packet is \;IPv4\;Bit 8: Enable inner TCP/UDP header fields if inner packet is \;IPv6\;others: reserved" access="RW" offset="0x2C.0" size="0x0.16" />
+	<field name="pp" descr="Per Port Configuration\;0: Global Configuration (for all ports)\;1: Per port configuration, based on local_port field.\;Note: SW must not read as global if last write was not \;global." access="INDEX" offset="0x0.24" size="0x0.1" />
+	<field name="seed" descr="LAG seed value\;The seed is the same for all ports (latest configuration con\;figures the seed for all ports)." access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="general_fields" descr="This is a bit mask, in which each bit enables a specific field \;to be included in the hash calculation. \;Bit 0: Ingress port\;Bit 1: custom_bytes are set by cbsets field.\;Bit i: custom_bytes i-2\;i = 2 .. 2 + (cap_max_custom_byte_sets_for_hash * cap_cus\;tom_byte_entry_size - 1). Reserved when Bit1 = 1.\;See Section 10.3.14, &quot;Custom Bytes&quot;, on page 1888" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="outer_header_enables" descr="Outer header enables. Each bit enables a specific layer field \;to be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="outer_header_fields_enable" descr="Layer2 fields, subject to outer_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;Bit 3: Outer VID\;Bit 4: Outer PCP\;Bit 5: Outer DEI\;Bit 6: Inner VID\;Bit 7: Inner PCP\;Bit 8: Inner DEI\;\;IPv4 fields, subject to outer_header_enables:\;Bits 12:9: IPv4 SIP 0-3 enable per byte. For ARP all bytes are \;used\;Bits 16:13: IPv4 DIP 0-3 enable per byte. For ARP all bytes \;are used\;Bit 17: IPv4 Protocol\;Bit 18: IPv4 DSCP\;Bit 19: IPv4 ECN\;Bit 20: IPv4 IP L3 Length - length field bits [13:10]\;\;IPv6 fields, subject to outer_header_enables:\;Bits 21: IPv6 enable bytes of SIP 0-7. For ARP all bytes are \;used\;Bits 28:22 reserved\;Bits 36:29: IPv6 SIP 8-15 enable per byte. For ARP all bytes \;are used\;Bits 37: IPv6 enable bytes of DIP 0-7. For ARP all bytes are \;used\;Bits 44:38 reserved\;Bits 52:45: IPv6 DIP 8-15 enable per byte. For ARP all bytes \;are used\;Bit 53: IPv6 Next Header\;Bit 54: IPv6 DSCP\;Bit 55: IPv6 ECN\;Bit 56: IPv6 IP L3 Length - length field bits [13:10]\;Bit 57: IPv6 Flow label\;\;RoCE v1 fields: [TBD]\;Bit 58: [TBD] GRH SIP\;Bit 59: [TBD] GRH DIP\;Bit 60: [TBD] GRH Next Protocol\;Bit 61: [TBD] GRH DSCP\;Bit 62: [TBD] GRH ECN\;Bit 63: [TBD] GRH L3 Length\;Bit 64: [TBD] GRH Flow label" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
+	<field name="inner_header_enables" descr="Inner header enables. Each bit enables a specific layer field \;to be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable inner Layer2 fields if inner packet is not IPv4/6\;Bit 1: Enable inner Layer2 fields if inner packet is IPv4\;Bit 2: Enable inner Layer2 fields if inner packet is IPv6\;Bit 3: Enable inner IPv4 fields if inner packet is not TCP and \;not UDP\;Bit 4: Enable inner IPv4 fields if inner packet is either TCP or \;UDP\;Bit 5: Enable inner IPv6 fields if inner packet is not TCP and \;not UDP\;Bit 6: Enable inner IPv6 fields if inner packet is either TCP or \;UDP\;Bit 7: Enable inner TCP/UDP header fields if inner packet is \;IPv4\;Bit 8: Enable inner TCP/UDP header fields if inner packet is \;IPv6\;others: reserved" access="RW" offset="0x2C.0" size="0x0.16" />
 	<field name="inner_header_fields_enable" descr="Inner header fields enable.\;\;Inner Layer2 fields, subject to inner_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;\;Inner IPv4 fields, subject to inner_header_enables:\;Bits 6:3: IPv4 SIP 0-3 enable per byte\;Bits 10:7: IPv4 DIP 0- 3 enable per byte\;Bit 11: IPv4 Protocol\;\;Inner IPv6 fields, subject to inner_header_enables:\;Bits 12: IPv6 enable bytes of SIP 0-7\;Bits 19:13 reserved\;Bits 27:20: IPv6 SIP 8-15 enable per byte\;Bits 28: IPv6 enable bytes of DIP 0-7\;Bits 35:29 reserved\;Bits 43:36: IPv6 DIP 8-15 enable per byte\;Bit 44: IPv6 Next Header\;Bit 45: IPv6 Flow label\;\;Inner TCP /UDP header fields, subject to inner_header_en\;ables:\;Bit 46: TCP/UDP source port\;Bit 47: TCP/UDP destination port\;others: reserved" subnode="uint64" access="RW" offset="0x30.0" size="0x8.0" />
-	<field name="cbsets" descr="Custom Byte Sets.\;For more details refer to Table 930, &quot;cbsets Layout&quot;.\;Reserved when general_fields.Bit1 = 0.\;Reserved when Spectrum\;Reserved up to cap_max_custom_byte_sets-1" access="RW" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
-</node>
-
-<node name="Trap_Action_with_Cookie_ext" descr="" size="0x10.0" >
-	<field name="forward_action" descr="Forward Action\;\;\;3: DISCARD - hard drop in HW \;4: DISCARD_ERROR - hard drop error, drop will be \;counted" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="trap_action" descr="Trap Action\;0: NOP \;1: CLEAR_TRAP_STATE\;2: TRAP \;3: NO_TRAP, note that this can be overran by \;CLEAR_TRAP_STATE" access="RW" offset="0x0.24" size="0x0.4" />
-	<field name="trap_id" descr="Trap ID, see Section 2.8.3, &quot;Trap Identifier (Trap-ID)&quot;, \;on page 332.\;Reserved when trap_action is NOP, CLEAR_TRAP_STATE \;or NO_TRAP" access="RW" offset="0x4.0" size="0x0.10" />
-	<field name="mirror_enable" descr="mirror enable\;Note that for iACL, irifACL, erifACL the mirror is ingress \;mirror\;For eACL the mirror is egress mirror" access="RW" offset="0x8.24" size="0x0.1" />
-	<field name="mirror_agent" descr="mirror agent" access="RW" offset="0x8.29" size="0x0.3" />
-	<field name="user_def_val" descr="Value for the SW usage\;Can be used to pass information of which rule has caused \;a trap. This may be overwritten by later traps. This field \;does a set on the packet&apos;s user_def_val only if this is the \;first trap_id or if the trap_id has replaced the previous \;packet&apos;s trap_id\;Default value is 0\;" access="RW" offset="0xC.0" size="0x0.20" />
-	<field name="defer" descr="Defer\;0: action will be applied immediately\;1: action will be written to action set" access="RW" offset="0xC.31" size="0x0.1" />
-</node>
-
-<node name="Trap_Action_without_Cookie_ext" descr="" size="0x10.0" >
-	<field name="forward_action" descr="Forward Action\;\;\;3: DISCARD - hard drop in HW \;4: DISCARD_ERROR - hard drop error, drop will be \;counted" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="trap_action" descr="Trap Action\;0: NOP \;1: CLEAR_TRAP_STATE\;2: TRAP \;3: NO_TRAP, note that this can be overran by \;CLEAR_TRAP_STATE" access="RW" offset="0x0.24" size="0x0.4" />
-	<field name="trap_id" descr="Trap ID, see Section 2.8.3, &quot;Trap Identifier (Trap-ID)&quot;, \;on page 332.\;Reserved when trap_action is NOP, CLEAR_TRAP_STATE \;or NO_TRAP" access="RW" offset="0x4.0" size="0x0.10" />
-	<field name="mirror_enable" descr="mirror enable\;Note that for iACL, irifACL, erifACL the mirror is ingress \;mirror\;For eACL the mirror is egress mirror" access="RW" offset="0x8.24" size="0x0.1" />
-	<field name="mirror_agent" descr="mirror agent" access="RW" offset="0x8.29" size="0x0.3" />
-	<field name="defer" descr="Defer\;0: action will be applied immediately\;1: action will be written to action set" access="RW" offset="0xC.31" size="0x0.1" />
+	<field name="cbsets" descr="Custom Byte Sets.\;For more details refer to Table 1045, &quot;cbsets Layout&quot;.\;Reserved when general_fields.Bit1 = 0.\;Reserved when Spectrum\;Reserved up to cap_max_custom_byte_sets-1" access="RW" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
 </node>
 
 <node name="access_reg_summary_ctrl_ext" descr="" attr_is_union="1" size="0x4.0" >
-	<field name="id" descr="" subnode="enum_entry" enum="HGCR=0x7000,HCAP=0x7001,HPKT=0x7003,HTGT=0x7002,HOPF=0x7081,HMCB=0x7082,HMON=0x7084,HRWC=0x7088,HCTR=0x7083,HTAC=0x7085,HCOT=0x7087,HETT=0x7089,HCAM=0x707f,MOGCR=0x9086,MPRS=0x9083,MDRI=0x9084,MRRR=0x9087,MONI=0x90f4,MOLP=0x90f9,MPAT=0x901a,MPAR=0x901b,MPAGR=0x9089,MOMTE=0x908d,MOCMI=0x9098,MPSC=0x9080,MGPC=0x9081,MGPCB=0x9096,MOCS=0x9095,MAFCR=0x908a,MAFTI=0x908b,MAFRI=0x908c,MAFBI=0x9097,MTPPPC=0x9090,MTPPTR=0x9091,MTPTPT=0x9092,MTPCPC=0x9093,MTPSPU=0x9094,MFGD=0x90f0,MODCR=0x9099,MFDE=0x9200,SGCR=0x2000,SPAD=0x2002,SFDAT=0x2009,SFD=0x200a,SFN=0x200b,SFDD=0x2024,SFDB=0x2028,SFDB_V2=0x202d,SPGT=0x200c,SMID=0x2007,SMID_V2=0x2034,SMPU=0x2006,SSPR=0x2008,SPMS=0x200d,SPMS_V2=0x2032,SPVID=0x200e,SPEVET=0x202a,SPVTR=0x201d,SPVM=0x200f,SPAFT=0x2010,SFGC=0x2011,SFTR=0x2012,SFTR_V2=0x202f,SVFA=0x201c,SFDF=0x2013,SLCR=0x2015,SLCR_V2=0x2021,SFDT=0x2022,SFDT_V2=0x202e,SLCOR=0x2016,SLECR=0x2017,SPMLR=0x2018,SVMLR=0x2019,SPVMLR=0x2020,SVPE=0x201e,SFMR=0x201f,SVER=0x2025,SPVC=0x2026,SPFSR=0x2023,SFFP=0x2029,SMPE=0x202b,SMPEB=0x202c,SMHT=0x2035,SVPCN=0x2036,PTYS=0x5004,PAOS=0x5006,PLTC=0x5046,PPCNT=0x5008,PUDE=0x5009,PLIB=0x500a,PSPA=0x500d,PIPG=0x5017,PGMR=0x5039,PTER=0x5055,PREI=0x5058,PMLP=0x5002,PMAOS=0x5012,PMPR=0x5013,PMTDB=0x501a,PMECR=0x501b,PMLPE=0x501c,PMSC=0x501d,PMPC=0x501f,PMPE=0x5024,PMMP=0x5044,PMCR=0x5045,PEPC=0x5056,PMPT=0x5064,PMPD=0x5065,PMTM=0x5067,PPSC=0x5011,PPLR=0x5018,PPLM=0x5023,SLTP=0x5027,SLRG=0x5028,PDDR=0x5031,PPTT=0x5036,PPRT=0x5037,PPHCR=0x503e,PPAOS=0x5040,PPBMP=0x5051,PPBMC=0x5052,PPBME=0x5053,SLRED=0x505a,PMTU=0x5003,PPAD=0x5005,PFCC=0x5007,PPTB=0x500b,PBMC=0x500c,PVLC=0x500f,PLBF=0x5015,PIFR=0x5016,PIFR_V2=0x50e0,PHBR=0x5034,PHRR=0x5035,PBSR=0x5038,PHCR=0x503a,PCMR=0x5041,PFSC=0x5043,PLLP=0x504a,MFCR=0x9001,MFSC=0x9002,MFSM=0x9003,MFSL=0x9004,FORE=0x9007,MFNR=0x903b,MTCAP=0x9009,MTECR=0x9109,MTMP=0x900a,MTWE=0x900b,MTEWE=0x910b,MVCAP=0x902e,MVCR=0x900c,MSPS=0x900d,MCPP=0x900e,MTBR=0x900f,MFPA=0x9010,MFBA=0x9011,MFBE=0x9012,MFMC=0x9013,MCIA=0x9014,MCION=0x9052,MMIA=0x9016,MMDIO=0x2339,MPGR=0x9019,MFM=0x901d,MHSR=0x901e,MJTAG=0x901f,MSGI=0x9021,MSCI=0x902a,MPCIR=0x905a,MRTC=0x902d,MGIR=0x9020,MGPIR=0x9100,MDIR=0x911a,MSSIR=0x9105,MHMPR=0x905d,MPFM=0x9022,MRSR=0x9023,MPGO=0x9058,MNVDA=0x9024,MNVDI=0x9025,MNVQC=0x9030,MNVIA=0x9033,MNVGC=0x9034,MNVGN=0x9035,MGNLE=0x9036,MTRC_CAP=0x9040,MTRC_CONF=0x9041,MTRC_STDB=0x9042,MTRC_CTRL=0x9043,MLCR=0x902b,MGCR=0x903a,MERR=0x903c,MPEIN=0x9050,MPCNT=0x9051,MTPPS=0x9053,MTPTP=0x9153,MTPPST=0x9057,MTUTC=0x9055,MPIR=0x9059,MPECS=0x905b,MCQS=0x9060,MCQI=0x9061,MCC=0x9062,MCDA=0x9063,MTCQ=0x9065,MKDC=0x9066,MBCT=0x9120,MQIS=0x9064,MIRC=0x9162,MCDD=0x905c,MDFCR=0x9101,MDCR=0x9111,MDDT=0x9160,MDDQ=0x9161,MDDC=0x9163,MDRCR=0x9102,MDSR=0x9110,MFSV=0x9115,MQDIK=0x9116,MRPR=0x9117,MCAM=0x907f,MFRL=0x9028,IGCR=0x3801,IDDD=0x3802,IDDDS=0x3803,IEDR=0x3804,IEDS=0x3805,IFBO=0x3810,IICR=0x3811,IPAC=0x3812,IPSR=0x3815,IPER=0x3816,IHSR=0x3813,ICSR=0x38f0,IRQR=0x3870,ICAM=0x387f,SPZR=0x6002,IBFMR=0x6003,IBFMRC=0x6004,SBGCR=0xb000,SBPR=0xb001,SBCM=0xb002,SBPM=0xb003,SBMM=0xb004,SBME=0xb00e,SBSR=0xb005,SBSRD=0xb015,SBIB=0xb006,SBDCC=0xb007,SBDCM=0xb008,SBDCR=0xb019,SBHBR=0xb00a,SBHRR=0xb00b,SBHBR_V2=0xb011,SBHRR_V2=0xb012,SBCTC=0xb00c,SBCTR=0xb00d,SBCTS=0xb00f,SBHPC=0xb013,SBSNT=0xb020,SBSNS=0xb021,SBSNTE=0xb022,SBCAM=0xb01f,MPGCR=0x8801,MPILM=0x8802,MPIBE=0x8803,MPNHLFE=0x8804,MPNHLFEB=0x8805,MPFT=0x8806,MPEPM=0x8810,MPQDR=0x8811,MPILEM=0x8812,MPELEM=0x8813,TNGCR=0xa001,TNPC=0xa020,TNGEE=0xa021,TNCR=0xa002,TNCR_V2=0xa004,TNUMT=0xa003,TNQCR=0xa010,TNQDR=0xa011,TNEEM=0xa012,TNDEM=0xa013,TNIFR=0xa014,TNIFR_V2=0xa017,TNIPSD=0xa015,TIGCR=0xa801,TIQCR=0xa810,TIQDR=0xa811,TIEEM=0xa812,TIDEM=0xa813,RCAP=0x8000,RGCR=0x8001,RITR=0x8002,RIGR=0x8003,RIGR_V2=0x8023,RTAR=0x8004,RECR=0x8005,RECR_V2=0x8025,RUFT=0x8006,RUHT=0x800c,RMFT=0x8007,RMFT_V2=0x8027,RMFTAD=0x8028,RRCR=0x800f,RATR=0x8008,RATRB=0x8024,RATRAD=0x8022,RTDP=0x8020,RIPS=0x8021,RDPM=0x8009,RICA=0x800a,RICNT=0x800b,RALTA=0x8010,RALST=0x8011,RALTB=0x8012,RALUE=0x8013,RAUHT=0x8014,RAUHTD=0x8018,RALEU=0x8015,RALBU=0x8016,RALCM=0x8017,RMID=0x8030,RMID_V2=0x8036,RMPE=0x8031,RMPU=0x8032,RMEIR=0x8033,REIV=0x8034,RXLTE=0x8050,RXLTM=0x8051,RXLTCC=0x8052,RLPMCE=0x8056,RLCME=0x8053,RLCMLE=0x8054,RLCMLD=0x8055,RARGCR=0x806a,RARPC=0x8060,RARSR=0x8069,RARPR=0x8061,RARCL=0x8062,RARLU=0x8068,RARFT=0x8064,RARLPGT=0x8065,RARCC=0x8067,RSNH=0x8066,RTCA=0x800d,RTPS=0x800e,RIVA=0x8044,RNGCR=0x8045,CWGCR=0x2801,CWTP=0x2802,CWPP=0x2804,CWTPM=0x2803,CPQE=0x2806,CHLTR=0x2810,CHLTM=0x2811,CHLMM=0x2812,CEGCR=0x2820,CEPC=0x2821,CEDR=0x2822,CEER=0x2823,CNCT=0x2030,CPCS=0x2031,CPID=0x2032,CNMC=0x2033,QGCR=0x4000,QCAP=0x4001,QPTS=0x4002,QDPM=0x4003,QPDPM=0x4013,QEPM=0x4014,QPCR=0x4004,QPBR=0x400c,QETCR=0x4005,QEGCS=0x4006,QSHR=0x4030,QEEC=0x400d,QPDP=0x4007,QPDPC=0x4017,QPRT=0x4008,QTCT=0x400a,QTCTM=0x401a,QSPTC=0x4009,QSTCT=0x400b,QSPIP=0x400e,QSPCP=0x401e,QRWE=0x400f,QPEM=0x4010,QPDSM=0x4011,QPPM=0x4012,QSLL=0x4015,QHLL=0x4016,QSIPG=0x4018,QCAM=0x4019,QTTTL=0x4040,QTQCR=0x4041,QTQDR=0x4042,QTEEM=0x4043,QTDEM=0x4044,PGCR=0x3001,PPBT=0x3002,PEVPB=0x302e,PVGT=0x3009,PVBT=0x3003,PRBT=0x3013,PEMRBT=0x3014,PERB=0x3040,PERBRG=0x3041,PERBEG=0x3042,PACL=0x3004,PAGT=0x3005,PTAR=0x3006,PERAR=0x3026,PERCR=0x302a,PERERP=0x302b,PERD=0x302c,PTCE=0x3007,PTCE_V2=0x3017,PTCE_V3=0x3027,PTCEAD=0x3028,PEFA=0x300f,PEFAAD=0x3029,PRCR=0x300d,PPRR=0x3008,PFCA=0x300a,PFCNT=0x300b,PPBS=0x300c,PUET=0x300e,PPBMI=0x3012,PECB=0x3010,PERPT=0x3021,PEABFE=0x3022,PEAPBL=0x3024,PEAPBM=0x3025,PEAPS=0x302d,PECNRE=0x3030,PECNRR=0x3031,PECNEE=0x3032,PECNER=0x3033,PECKC=0x3034,XGCR=0x7801,XLTQ=0x7802,XMDR=0x7803,XLKBU=0x7804,XRMT=0x7810,XRALTA=0x7811,XRALST=0x7812,XRALTB=0x7813,FGCR=0x4800,FPUMS=0x4801,FPHHC=0x4880,FPPC=0x4881,FPFTT=0x4882,FPHTT=0x4883,FPTS=0x4884,FMTC=0x4901,FMTE=0x4902,FMTM=0x4903,FMEP=0x4904,FSGCR=0x4920,FSDB=0x4921,FSPT=0x4922,FSPS=0x4923,FSTM=0x4924,FSED=0x4925,FSHE=0x4926,FSFH=0x4927,UGCAP=0x6400,UPCAP=0x6401,UGCR=0x6402,UPCON=0x6403,UMTU=0x6404,UVER=0x6410,UPVC=0x6411,UPAFT=0x6412,UPVID=0x6413,UTAR=0x6428,UPBT=0x6420,UTCE=0x6422,URCR=0x6423,USADB=0x6424,USAK=0x6425,USACN=0x6426,UTCC=0x6427,UPCNT=0x6430,UPRR=0x6440,UCCR=0x6450,UTFD=0x6451,UTFC=0x6452,UTER=0x6453" offset="0x0.0" size="0x4.0" />
+	<field name="id" descr="" subnode="enum_entry" enum="HGCR=0x7000,HCAP=0x7001,HPKT=0x7003,HTGT=0x7002,HOPF=0x7081,HMCB=0x7082,HMON=0x7084,HRWC=0x7088,HCTR=0x7083,HTAC=0x7085,HCOT=0x7087,HETT=0x7089,HCAM=0x707f,MOGCR=0x9086,MPRS=0x9083,MDRI=0x9084,MRRR=0x9087,MONI=0x90f4,MOLP=0x90f9,MPAT=0x901a,MPAR=0x901b,MPAGR=0x9089,MOMTE=0x908d,MOCMI=0x9098,MPSC=0x9080,MGPC=0x9081,MGPCB=0x9096,MOCS=0x9095,MAFCR=0x908a,MAFTI=0x908b,MAFRI=0x908c,MAFBI=0x9097,MOPCE=0x90e2,MTPPPC=0x9090,MTPPTR=0x9091,MTPTPT=0x9092,MTPCPC=0x9093,MTPSPU=0x9094,MFGD=0x90f0,MODCR=0x9099,MFDE=0x9200,SGCR=0x2000,SPAD=0x2002,SFDAT=0x2009,SFD=0x200a,SFN=0x200b,SFDD=0x2024,SFDB=0x2028,SFDB_V2=0x202d,SPGT=0x200c,SMID=0x2007,SMID_V2=0x2034,SMPU=0x2006,SSPR=0x2008,SPMS=0x200d,SPMS_V2=0x2032,SPVID=0x200e,SPEVET=0x202a,SPVTR=0x201d,SPVM=0x200f,SPAFT=0x2010,SFGC=0x2011,SFTR=0x2012,SFTR_V2=0x202f,SVFA=0x201c,SFDF=0x2013,SLCR=0x2015,SLCR_V2=0x2021,SFDT=0x2022,SFDT_V2=0x202e,SLCOR=0x2016,SLECR=0x2017,SPMLR=0x2018,SVMLR=0x2019,SPVMLR=0x2020,SVPE=0x201e,SFMR=0x201f,SVER=0x2025,SPVC=0x2026,SPFSR=0x2023,SFFP=0x2029,SMPE=0x202b,SMPEB=0x202c,SMHT=0x2035,SVPCN=0x2036,PTYS=0x5004,PAOS=0x5006,PLTC=0x5046,PPCNT=0x5008,PUDE=0x5009,PLIB=0x500a,PSPA=0x500d,PIPG=0x5017,PGMR=0x5039,PTER=0x5055,PREI=0x5058,PMLP=0x5002,PMAOS=0x5012,PMPR=0x5013,PMTDB=0x501a,PMECR=0x501b,PMLPE=0x501c,PMSC=0x501d,PMPC=0x501f,PMPE=0x5024,PMMP=0x5044,PMCR=0x5045,PEPC=0x5056,PMPT=0x5064,PMPD=0x5065,PMTM=0x5067,PPSC=0x5011,PPLR=0x5018,PPLM=0x5023,SLTP=0x5027,SLRG=0x5028,PDDR=0x5031,PPTT=0x5036,PPRT=0x5037,PPHCR=0x503e,PPAOS=0x5040,PPBMP=0x5051,PPBMC=0x5052,PPBME=0x5053,SLRED=0x505a,PMTU=0x5003,PPAD=0x5005,PFCC=0x5007,PPTB=0x500b,PBMC=0x500c,PVLC=0x500f,PLBF=0x5015,PIFR=0x5016,PIFR_V2=0x50e0,PHBR=0x5034,PHRR=0x5035,PBSR=0x5038,PHCR=0x503a,PCMR=0x5041,PFSC=0x5043,PLLP=0x504a,MMDIO=0x9017,MLCR=0x902b,MGCR=0x903a,MHMPR=0x905d,MJTAG=0x901f,MFM=0x901d,MHSR=0x901e,MTPPS=0x9053,MTPTP=0x9153,MTUTC=0x9055,MRTC=0x902d,MPGO=0x9058,MTPPST=0x9057,MSECQ=0x9155,MSEES=0x9156,MSPI=0x9029,MCIA=0x9014,MCION=0x9052,MDDT=0x9160,MDDQ=0x9161,MDDC=0x9163,MGPIR=0x9100,MDRCR=0x9102,MDFCR=0x9101,MTCAP=0x9009,MTECR=0x9109,MTMP=0x900a,MTWE=0x900b,MTEWE=0x910b,MTBR=0x900f,MPGR=0x9019,MVCAP=0x902e,MVCR=0x900c,MSPS=0x900d,MCPP=0x900e,MRSR=0x9023,MFRL=0x9028,MCQS=0x9060,MCQI=0x9061,MCC=0x9062,MCDA=0x9063,MCDD=0x905c,MIRC=0x9162,MQIS=0x9064,MGIR=0x9020,MSGI=0x9021,MDIR=0x911a,MSSIR=0x9105,MMIA=0x9016,MINI=0x905e,MCAM=0x907f,MECCC=0x905f,MBCT=0x9120,MDSR=0x9110,MFSV=0x9115,MTCQ=0x9065,MQDIK=0x9116,MKDC=0x9066,MSPMER=0x9067,MNVDA=0x9024,MNVDI=0x9025,MNVQC=0x9030,MNVIA=0x9033,MNVGC=0x9034,MNVGN=0x9035,MGNLE=0x9036,MTRC_CAP=0x9040,MTRC_CONF=0x9041,MTRC_STDB=0x9042,MTRC_CTRL=0x9043,MFPA=0x9010,MFBA=0x9011,MFBE=0x9012,MFMC=0x9013,MFCR=0x9001,MFSC=0x9002,MFSM=0x9003,MFSL=0x9004,FORE=0x9007,MFNR=0x903b,MPCIR=0x905a,MERR=0x903c,MRPR=0x9117,MDCR=0x9111,MPFM=0x9022,MPEIN=0x9050,MPCNT=0x9051,MPIR=0x9059,MPECS=0x905b,IGCR=0x3801,IDDD=0x3802,IDDDS=0x3803,IEDR=0x3804,IEDS=0x3805,IFBO=0x3810,IICR=0x3811,IPAC=0x3812,IPSR=0x3815,IPER=0x3816,IHSR=0x3813,ICSR=0x38f0,IRQR=0x3870,ICAM=0x387f,ITPR=0x3820,ITGCR=0x3821,IPCR=0x3823,SPZR=0x6002,IBFMR=0x6003,IBFMRC=0x6004,IBSNI=0x6005,SBGCR=0xb000,SBPR=0xb001,SBCM=0xb002,SBPM=0xb003,SBMM=0xb004,SBME=0xb00e,SBSR=0xb005,SBSRD=0xb015,SBIB=0xb006,SBDCC=0xb007,SBDCM=0xb008,SBDCR=0xb019,SBHBR=0xb00a,SBHRR=0xb00b,SBHBR_V2=0xb011,SBHRR_V2=0xb012,SBCTC=0xb00c,SBCTR=0xb00d,SBCTS=0xb00f,SBHPC=0xb013,SBSNT=0xb020,SBSNS=0xb021,SBSNTE=0xb022,SBCAM=0xb01f,MPGCR=0x8801,MPILM=0x8802,MPIBE=0x8803,MPNHLFE=0x8804,MPNHLFEB=0x8805,MPFT=0x8806,MPEPM=0x8810,MPQDR=0x8811,MPILEM=0x8812,MPELEM=0x8813,TNGCR=0xa001,TNPC=0xa020,TNGEE=0xa021,TNCR=0xa002,TNCR_V2=0xa004,TNUMT=0xa003,TNQCR=0xa010,TNQDR=0xa011,TNEEM=0xa012,TNDEM=0xa013,TNIFR=0xa014,TNIFR_V2=0xa017,TNIPSD=0xa015,TIGCR=0xa801,TIQCR=0xa810,TIQDR=0xa811,TIEEM=0xa812,TIDEM=0xa813,RCAP=0x8000,RGCR=0x8001,RITR=0x8002,RIGR=0x8003,RIGR_V2=0x8023,RTAR=0x8004,RECR=0x8005,RECR_V2=0x8025,RUFT=0x8006,RUHT=0x800c,RMFT=0x8007,RMFT_V2=0x8027,RMFTAD=0x8028,RRCR=0x800f,RATR=0x8008,RATRB=0x8024,RATRAD=0x8022,RTDP=0x8020,RIPS=0x8021,RDPM=0x8009,RICA=0x800a,RICNT=0x800b,RALTA=0x8010,RALST=0x8011,RALTB=0x8012,RALUE=0x8013,RAUHT=0x8014,RAUHTD=0x8018,RALEU=0x8015,RALBU=0x8016,RALCM=0x8017,RMID=0x8030,RMID_V2=0x8036,RMPE=0x8031,RMPU=0x8032,RMEIR=0x8033,REIV=0x8034,RNGCR=0x8045,RXLTE=0x8050,RXLTM=0x8051,RXLTCC=0x8052,RLPMCE=0x8056,RLCME=0x8053,RLCMLE=0x8054,RLCMLD=0x8055,RARGCR=0x806a,RARPC=0x8060,RARSR=0x8069,RARPR=0x8061,RARCL=0x8062,RARLU=0x8068,RARFT=0x8064,RARLPGT=0x8065,RARCC=0x8067,RSNH=0x8066,RTCA=0x800d,RTPS=0x800e,RIVA=0x8044,CWGCR=0x2801,CWTP=0x2802,CWPP=0x2804,CWTPM=0x2803,CPQE=0x2806,CHLTR=0x2810,CHLTM=0x2811,CHLMM=0x2812,CEGCR=0x2820,CEPC=0x2821,CEDR=0x2822,CEER=0x2823,CNCT=0x2030,CPCS=0x2031,CPID=0x2032,CNMC=0x2033,QGCR=0x4000,QCAP=0x4001,QPTS=0x4002,QDPM=0x4003,QPDPM=0x4013,QEPM=0x4014,QPCR=0x4004,QPBR=0x400c,QETCR=0x4005,QEGCS=0x4006,QSHR=0x4030,QEEC=0x400d,QPDP=0x4007,QPDPC=0x4017,QPRT=0x4008,QTCT=0x400a,QTCTM=0x401a,QSPTC=0x4009,QSTCT=0x400b,QSPIP=0x400e,QSPCP=0x401e,QRWE=0x400f,QPEM=0x4010,QPDSM=0x4011,QPPM=0x4012,QSLL=0x4015,QHLL=0x4016,QSIPG=0x4018,QCAM=0x4019,QTTTL=0x4040,QTQCR=0x4041,QTQDR=0x4042,QTEEM=0x4043,QTDEM=0x4044,PGCR=0x3001,PPBT=0x3002,PEVPB=0x302e,PVGT=0x3009,PVBT=0x3003,PRBT=0x3013,PEMRBT=0x3014,PERB=0x3040,PERBRG=0x3041,PERBEG=0x3042,PACL=0x3004,PAGT=0x3005,PTAR=0x3006,PERAR=0x3026,PERCR=0x302a,PERERP=0x302b,PERD=0x302c,PTCE=0x3007,PTCE_V2=0x3017,PTCE_V3=0x3027,PTCEAD=0x3028,PEFA=0x300f,PEFAAD=0x3029,PRCR=0x300d,PPRR=0x3008,PFCA=0x300a,PFCNT=0x300b,PPBS=0x300c,PUET=0x300e,PPBMI=0x3012,PECB=0x3010,PERPT=0x3021,PEABFE=0x3022,PEAPBL=0x3024,PEAPBM=0x3025,PEAPS=0x302d,PECNRE=0x3030,PECNRR=0x3031,PECNEE=0x3032,PECNER=0x3033,PECKC=0x3034,FGCR=0x4800,FPUMS=0x4801,FPHHC=0x4880,FPPC=0x4881,FPFTT=0x4882,FPHTT=0x4883,FPTS=0x4884,FMTC=0x4901,FMTE=0x4902,FMTM=0x4903,FMEP=0x4904,FMQC=0x4905,FSGCR=0x4920,FSDB=0x4921,FSPT=0x4922,FSPS=0x4923,FSTM=0x4924,FSED=0x4925,FSHE=0x4926,FSFH=0x4927,FMTPC=0x4928,FMTPA=0x4929,FMTB=0x492a,FRAR=0x492b,UGCAP=0x6400,UPCAP=0x6401,UGCR=0x6402,UPCON=0x6403,UMTU=0x6404,UVER=0x6410,UPVC=0x6411,UPAFT=0x6412,UPVID=0x6413,UTAR=0x6428,UPBT=0x6420,UTCE=0x6422,URCR=0x6423,USADB=0x6424,USAK=0x6425,USACN=0x6426,UTCC=0x6427,UPCNT=0x6430,UPRR=0x6440,UCCR=0x6450,UTFD=0x6451,UTFC=0x6452,UTER=0x6453" offset="0x0.0" size="0x4.0" />
 </node>
 
-<node name="access_reg_summary_ext" descr="" attr_is_union="1" size="0x2dd0" >
+<node name="access_reg_summary_ext" descr="" attr_is_union="1" size="0x4d0" >
 	<field name="hgcr" descr="" subnode="hgcr_ext" capability="0" offset="0x0.0" selected_by="HGCR" size="0x1c" />
 	<field name="hcap" descr="" subnode="hcap_ext" capability="0" offset="0x0.0" selected_by="HCAP" size="0x14" />
 	<field name="hpkt" descr="" subnode="hpkt_ext" capability="0" offset="0x0.0" selected_by="HPKT" size="0x10" />
@@ -254,7 +281,7 @@
 	<field name="mrrr" descr="" subnode="mrrr_ext" capability="0" offset="0x0.0" selected_by="MRRR" size="0x8" />
 	<field name="moni" descr="" subnode="moni_ext" capability="0" offset="0x0.0" selected_by="MONI" size="0x8" />
 	<field name="molp" descr="" subnode="molp_ext" capability="0" offset="0x0.0" selected_by="MOLP" size="0x8" />
-	<field name="mpat_reg" descr="" subnode="mpat_reg_ext" capability="0" offset="0x0.0" selected_by="MPAT" size="0x70" />
+	<field name="mpat_reg" descr="" subnode="mpat_reg_ext" capability="0" offset="0x0.0" selected_by="MPAT" size="0x7c" />
 	<field name="mpar" descr="" subnode="mpar_ext" capability="0" offset="0x0.0" selected_by="MPAR" size="0xc" />
 	<field name="mpagr" descr="" subnode="mpagr_ext" capability="0" offset="0x0.0" selected_by="MPAGR" size="0xc" />
 	<field name="momte" descr="" subnode="momte_ext" capability="0" offset="0x0.0" selected_by="MOMTE" size="0x10" />
@@ -262,11 +289,12 @@
 	<field name="mpsc" descr="" subnode="mpsc_ext" capability="0" offset="0x0.0" selected_by="MPSC" size="0x14" />
 	<field name="mgpc" descr="" subnode="mgpc_ext" capability="0" offset="0x0.0" selected_by="MGPC" size="0x18" />
 	<field name="mgpcb" descr="" subnode="mgpcb_ext" capability="0" offset="0x0.0" selected_by="MGPCB" size="0x410" />
-	<field name="mocs" descr="" subnode="mocs_ext" capability="0" offset="0x0.0" selected_by="MOCS" size="0x78" />
+	<field name="mocs" descr="" subnode="mocs_ext" capability="0" offset="0x0.0" selected_by="MOCS" size="0xc0" />
 	<field name="mafcr" descr="" subnode="mafcr_ext" capability="0" offset="0x0.0" selected_by="MAFCR" size="0xc" />
 	<field name="mafti" descr="" subnode="mafti_ext" capability="0" offset="0x0.0" selected_by="MAFTI" size="0x308" />
 	<field name="mafri" descr="" subnode="mafri_ext" capability="0" offset="0x0.0" selected_by="MAFRI" size="0x410" />
 	<field name="mafbi" descr="" subnode="mafbi_ext" capability="0" offset="0x0.0" selected_by="MAFBI" size="0x308" />
+	<field name="mopce" descr="" subnode="mopce_ext" capability="0" offset="0x0.0" selected_by="MOPCE" size="0x4d0" />
 	<field name="mtpppc" descr="" subnode="mtpppc_ext" capability="0" offset="0x0.0" selected_by="MTPPPC" size="0x10" />
 	<field name="mtpptr" descr="" subnode="mtpptr_ext" capability="0" offset="0x0.0" selected_by="MTPPTR" size="0x50" />
 	<field name="mtptpt" descr="" subnode="mtptpt_ext" capability="0" offset="0x0.0" selected_by="MTPTPT" size="0x8" />
@@ -275,7 +303,7 @@
 	<field name="mfgd" descr="" subnode="mfgd_ext" capability="0" offset="0x0.0" selected_by="MFGD" size="0x4" />
 	<field name="modcr" descr="" subnode="modcr_ext" capability="0" offset="0x0.0" selected_by="MODCR" size="0x14" />
 	<field name="mfde" descr="" subnode="mfde_ext" capability="0" offset="0x0.0" selected_by="MFDE" size="0xb0" />
-	<field name="sgcr" descr="" subnode="sgcr_ext" capability="0" offset="0x0.0" selected_by="SGCR" size="0x50" />
+	<field name="sgcr" descr="" subnode="sgcr_ext" capability="0" offset="0x0.0" selected_by="SGCR" size="0x10" />
 	<field name="spad" descr="" subnode="spad_ext" capability="0" offset="0x0.0" selected_by="SPAD" size="0x10" />
 	<field name="sfdat" descr="" subnode="sfdat_ext" capability="0" offset="0x0.0" selected_by="SFDAT" size="0x8" />
 	<field name="sfd" descr="" subnode="sfd_ext" capability="0" offset="0x0.0" selected_by="SFD" size="0x410" />
@@ -314,7 +342,7 @@
 	<field name="sver" descr="" subnode="sver_ext" capability="0" offset="0x0.0" selected_by="SVER" size="0x10" />
 	<field name="spvc" descr="" subnode="spvc_ext" capability="0" offset="0x0.0" selected_by="SPVC" size="0xc" />
 	<field name="spfsr" descr="" subnode="spfsr_ext" capability="0" offset="0x0.0" selected_by="SPFSR" size="0x8" />
-	<field name="sffp" descr="" subnode="sffp_ext" capability="0" offset="0x0.0" selected_by="SFFP" size="0x8" />
+	<field name="sffp" descr="" subnode="sffp_ext" capability="0" offset="0x0.0" selected_by="SFFP" size="0xc" />
 	<field name="smpe" descr="" subnode="smpe_ext" capability="0" offset="0x0.0" selected_by="SMPE" size="0xc" />
 	<field name="smpeb" descr="" subnode="smpeb_ext" capability="0" offset="0x0.0" selected_by="SMPEB" size="0x420" />
 	<field name="smht" descr="" subnode="smht_ext" capability="0" offset="0x0.0" selected_by="SMHT" size="0xa0" />
@@ -327,7 +355,7 @@
 	<field name="plib_reg" descr="" subnode="plib_reg_ext" capability="0" offset="0x0.0" selected_by="PLIB" size="0x10" />
 	<field name="pspa_reg" descr="" subnode="pspa_reg_ext" capability="0" offset="0x0.0" selected_by="PSPA" size="0x8" />
 	<field name="pipg_reg" descr="" subnode="pipg_reg_ext" capability="0" offset="0x0.0" selected_by="PIPG" size="0x8" />
-	<field name="pgmr" descr="" subnode="pgmr_ext" capability="0" offset="0x0.0" selected_by="PGMR" size="0x18" />
+	<field name="pgmr" descr="" subnode="pgmr_ext" capability="0" offset="0x0.0" selected_by="PGMR" size="0x2c" />
 	<field name="pter_reg" descr="" subnode="pter_reg_ext" capability="0" offset="0x0.0" selected_by="PTER" size="0x20" />
 	<field name="prei_reg" descr="" subnode="prei_reg_ext" capability="0" offset="0x0.0" selected_by="PREI" size="0x18" />
 	<field name="pmlp_reg" descr="" subnode="pmlp_reg_ext" capability="0" offset="0x0.0" selected_by="PMLP" size="0x40" />
@@ -375,46 +403,65 @@
 	<field name="pcmr_reg" descr="" subnode="pcmr_reg_ext" capability="0" offset="0x0.0" selected_by="PCMR" size="0xc" />
 	<field name="pfsc_reg" descr="" subnode="pfsc_reg_ext" capability="0" offset="0x0.0" selected_by="PFSC" size="0x10" />
 	<field name="pllp_reg" descr="" subnode="pllp_reg_ext" capability="0" offset="0x0.0" selected_by="PLLP" size="0x10" />
-	<field name="mfcr" descr="" subnode="mfcr_ext" capability="0" offset="0x0.0" selected_by="MFCR" size="0x8" />
-	<field name="mfsc" descr="" subnode="mfsc_ext" capability="0" offset="0x0.0" selected_by="MFSC" size="0x8" />
-	<field name="mfsm" descr="" subnode="mfsm_ext" capability="0" offset="0x0.0" selected_by="MFSM" size="0x8" />
-	<field name="mfsl" descr="" subnode="mfsl_ext" capability="0" offset="0x0.0" selected_by="MFSL" size="0xc" />
-	<field name="fore" descr="" subnode="fore_ext" capability="0" offset="0x0.0" selected_by="FORE" size="0xc" />
-	<field name="mfnr" descr="" subnode="mfnr_ext" capability="0" offset="0x0.0" selected_by="MFNR" size="0x30" />
+	<field name="mmdio" descr="" subnode="mmdio_ext" capability="0" offset="0x0.0" selected_by="MMDIO" size="0xc" />
+	<field name="mlcr" descr="" subnode="mlcr_ext" capability="0" offset="0x0.0" selected_by="MLCR" size="0xc" />
+	<field name="mgcr_reg" descr="" subnode="mgcr_reg_ext" capability="0" offset="0x0.0" selected_by="MGCR" size="0x20" />
+	<field name="mhmpr_reg" descr="" subnode="mhmpr_reg_ext" capability="0" offset="0x0.0" selected_by="MHMPR" size="0x14" />
+	<field name="mjtag" descr="" subnode="mjtag_ext" capability="0" offset="0x0.0" selected_by="MJTAG" size="0x30" />
+	<field name="mfm" descr="" subnode="mfm_ext" capability="0" offset="0x0.0" selected_by="MFM" size="0x18" />
+	<field name="mhsr" descr="" subnode="mhsr_ext" capability="0" offset="0x0.0" selected_by="MHSR" size="0x8" />
+	<field name="mtpps_reg" descr="" subnode="mtpps_reg_ext" capability="0" offset="0x0.0" selected_by="MTPPS" size="0x38" />
+	<field name="mtptp" descr="" subnode="mtptp_ext" capability="0" offset="0x0.0" selected_by="MTPTP" size="0x40" />
+	<field name="mtutc_reg" descr="" subnode="mtutc_reg_ext" capability="0" offset="0x0.0" selected_by="MTUTC" size="0x1c" />
+	<field name="mrtc_reg" descr="" subnode="mrtc_reg_ext" capability="0" offset="0x0.0" selected_by="MRTC" size="0x10" />
+	<field name="mpgo_reg" descr="" subnode="mpgo_reg_ext" capability="0" offset="0x0.0" selected_by="MPGO" size="0x14" />
+	<field name="mtppst" descr="" subnode="mtppst_ext" capability="0" offset="0x0.0" selected_by="MTPPST" size="0x10" />
+	<field name="MSECQ_reg" descr="" subnode="MSECQ_reg_ext" capability="0" offset="0x0.0" selected_by="MSECQ" size="0x40" />
+	<field name="MSEES_reg" descr="" subnode="MSEES_reg_ext" capability="0" offset="0x0.0" selected_by="MSEES" size="0x40" />
+	<field name="MSPI" descr="" subnode="MSPI_ext" capability="0" offset="0x0.0" selected_by="MSPI" size="0x18" />
+	<field name="mcia" descr="" subnode="mcia_ext" capability="0" offset="0x0.0" selected_by="MCIA" size="0x94" />
+	<field name="mcion" descr="" subnode="mcion_ext" capability="0" offset="0x0.0" selected_by="MCION" size="0xc" />
+	<field name="mddt_reg" descr="" subnode="mddt_reg_ext" capability="0" offset="0x0.0" selected_by="MDDT" size="0x110" />
+	<field name="mddq" descr="" subnode="mddq_ext" capability="0" offset="0x0.0" selected_by="MDDQ" size="0x30" />
+	<field name="mddc" descr="" subnode="mddc_ext" capability="0" offset="0x0.0" selected_by="MDDC" size="0x30" />
+	<field name="mgpir" descr="" subnode="mgpir_ext" capability="0" offset="0x0.0" selected_by="MGPIR" size="0xa0" />
+	<field name="mdrcr" descr="" subnode="mdrcr_ext" capability="0" offset="0x0.0" selected_by="MDRCR" size="0x30" />
+	<field name="mdfcr_reg" descr="" subnode="mdfcr_reg_ext" capability="0" offset="0x0.0" selected_by="MDFCR" size="0x60" />
 	<field name="mtcap" descr="" subnode="mtcap_ext" capability="0" offset="0x0.0" selected_by="MTCAP" size="0x10" />
 	<field name="mtecr" descr="" subnode="mtecr_ext" capability="0" offset="0x0.0" selected_by="MTECR" size="0x60" />
 	<field name="mtmp" descr="" subnode="mtmp_ext" capability="0" offset="0x0.0" selected_by="MTMP" size="0x20" />
 	<field name="mtwe" descr="" subnode="mtwe_ext" capability="0" offset="0x0.0" selected_by="MTWE" size="0x10" />
 	<field name="mtewe" descr="" subnode="mtewe_ext" capability="0" offset="0x0.0" selected_by="MTEWE" size="0x5c" />
+	<field name="mtbr_reg" descr="" subnode="mtbr_reg_ext" capability="0" offset="0x0.0" selected_by="MTBR" size="0x18" />
+	<field name="mpgr" descr="" subnode="mpgr_ext" capability="0" offset="0x0.0" selected_by="MPGR" size="0x20" />
 	<field name="mvcap_reg" descr="" subnode="mvcap_reg_ext" capability="0" offset="0x0.0" selected_by="MVCAP" size="0x10" />
 	<field name="mvcr" descr="" subnode="mvcr_ext" capability="0" offset="0x0.0" selected_by="MVCR" size="0x18" />
 	<field name="msps" descr="" subnode="msps_ext" capability="0" offset="0x0.0" selected_by="MSPS" size="0xa0" />
 	<field name="mcpp_reg" descr="" subnode="mcpp_reg_ext" capability="0" offset="0x0.0" selected_by="MCPP" size="0x10" />
-	<field name="mtbr_reg" descr="" subnode="mtbr_reg_ext" capability="0" offset="0x0.0" selected_by="MTBR" size="0x18" />
-	<field name="mfpa_reg" descr="" subnode="mfpa_reg_ext" capability="0" offset="0x0.0" selected_by="MFPA" size="0x20" />
-	<field name="mfba_reg" descr="" subnode="mfba_reg_ext" capability="0" offset="0x0.0" selected_by="MFBA" size="0x10c" />
-	<field name="mfbe_reg" descr="" subnode="mfbe_reg_ext" capability="0" offset="0x0.0" selected_by="MFBE" size="0xc" />
-	<field name="mfmc_reg" descr="" subnode="mfmc_reg_ext" capability="0" offset="0x0.0" selected_by="MFMC" size="0x1c" />
-	<field name="mcia" descr="" subnode="mcia_ext" capability="0" offset="0x0.0" selected_by="MCIA" size="0x90" />
-	<field name="mcion" descr="" subnode="mcion_ext" capability="0" offset="0x0.0" selected_by="MCION" size="0xc" />
-	<field name="mmia" descr="" subnode="mmia_ext" capability="0" offset="0x0.0" selected_by="MMIA" size="0xc" />
-	<field name="mmdio" descr="" subnode="mmdio_ext" capability="0" offset="0x0.0" selected_by="MMDIO" size="0xc" />
-	<field name="mpgr" descr="" subnode="mpgr_ext" capability="0" offset="0x0.0" selected_by="MPGR" size="0x20" />
-	<field name="mfm" descr="" subnode="mfm_ext" capability="0" offset="0x0.0" selected_by="MFM" size="0x18" />
-	<field name="mhsr" descr="" subnode="mhsr_ext" capability="0" offset="0x0.0" selected_by="MHSR" size="0x8" />
-	<field name="mjtag" descr="" subnode="mjtag_ext" capability="0" offset="0x0.0" selected_by="MJTAG" size="0x30" />
-	<field name="msgi" descr="" subnode="msgi_ext" capability="0" offset="0x0.0" selected_by="MSGI" size="0x80" />
-	<field name="msci" descr="" subnode="msci_ext" capability="0" offset="0x0.0" selected_by="MSCI" size="0xc" />
-	<field name="mpcir" descr="" subnode="mpcir_ext" capability="0" offset="0x0.0" selected_by="MPCIR" size="0x10" />
-	<field name="mrtc_reg" descr="" subnode="mrtc_reg_ext" capability="0" offset="0x0.0" selected_by="MRTC" size="0x10" />
+	<field name="mrsr" descr="" subnode="mrsr_ext" capability="0" offset="0x0.0" selected_by="MRSR" size="0x8" />
+	<field name="mfrl_reg" descr="" subnode="mfrl_reg_ext" capability="0" offset="0x0.0" selected_by="MFRL" size="0x8" />
+	<field name="mcqs_reg" descr="" subnode="mcqs_reg_ext" capability="0" offset="0x0.0" selected_by="MCQS" size="0x10" />
+	<field name="mcqi_reg" descr="" subnode="mcqi_reg_ext" capability="0" offset="0x0.0" selected_by="MCQI" size="0x94" />
+	<field name="mcc_reg" descr="" subnode="mcc_reg_ext" capability="0" offset="0x0.0" selected_by="MCC" size="0x20" />
+	<field name="mcda_reg" descr="" subnode="mcda_reg_ext" capability="0" offset="0x0.0" selected_by="MCDA" size="0x90" />
+	<field name="mcdd_reg" descr="" subnode="mcdd_reg_ext" capability="0" offset="0x0.0" selected_by="MCDD" size="0x20" />
+	<field name="mirc_reg" descr="" subnode="mirc_reg_ext" capability="0" offset="0x0.0" selected_by="MIRC" size="0x8" />
+	<field name="mqis_reg" descr="" subnode="mqis_reg_ext" capability="0" offset="0x0.0" selected_by="MQIS" size="0x18" />
 	<field name="mgir" descr="" subnode="mgir_ext" capability="0" offset="0x0.0" selected_by="MGIR" size="0xa0" />
-	<field name="mgpir" descr="" subnode="mgpir_ext" capability="0" offset="0x0.0" selected_by="MGPIR" size="0xa0" />
+	<field name="msgi" descr="" subnode="msgi_ext" capability="0" offset="0x0.0" selected_by="MSGI" size="0x80" />
 	<field name="mdir_reg" descr="" subnode="mdir_reg_ext" capability="0" offset="0x0.0" selected_by="MDIR" size="0x40" />
-	<field name="mssir_reg" descr="" subnode="mssir_reg_ext" capability="0" offset="0x0.0" selected_by="MSSIR" size="0x80" />
-	<field name="mhmpr_reg" descr="" subnode="mhmpr_reg_ext" capability="0" offset="0x0.0" selected_by="MHMPR" size="0x14" />
-	<field name="mpfm" descr="" subnode="mpfm_ext" capability="0" offset="0x0.0" selected_by="MPFM" size="0x8" />
-	<field name="mrsr" descr="" subnode="mrsr_ext" capability="0" offset="0x0.0" selected_by="MRSR" size="0x8" />
-	<field name="mpgo_reg" descr="" subnode="mpgo_reg_ext" capability="0" offset="0x0.0" selected_by="MPGO" size="0x14" />
+	<field name="mssir_reg" descr="" subnode="mssir_reg_ext" capability="0" offset="0x0.0" selected_by="MSSIR" size="0x88" />
+	<field name="mmia" descr="" subnode="mmia_ext" capability="0" offset="0x0.0" selected_by="MMIA" size="0xc" />
+	<field name="mini" descr="" subnode="mini_ext" capability="0" offset="0x0.0" selected_by="MINI" size="0x30" />
+	<field name="mcam_reg" descr="" subnode="mcam_reg_ext" capability="0" offset="0x0.0" selected_by="MCAM" size="0x48" />
+	<field name="meccc" descr="" subnode="meccc_ext" capability="0" offset="0x0.0" selected_by="MECCC" size="0x14" />
+	<field name="mbct" descr="" subnode="mbct_ext" capability="0" offset="0x0.0" selected_by="MBCT" size="0x420" />
+	<field name="mdsr_reg" descr="" subnode="mdsr_reg_ext" capability="0" offset="0x0.0" selected_by="MDSR" size="0x30" />
+	<field name="mfsv_reg" descr="" subnode="mfsv_reg_ext" capability="0" offset="0x0.0" selected_by="MFSV" size="0x30" />
+	<field name="mtcq_reg" descr="" subnode="mtcq_reg_ext" capability="0" offset="0x0.0" selected_by="MTCQ" size="0x70" />
+	<field name="mqdik_reg" descr="" subnode="mqdik_reg_ext" capability="0" offset="0x0.0" selected_by="MQDIK" size="0x208" />
+	<field name="mkdc_reg" descr="" subnode="mkdc_reg_ext" capability="0" offset="0x0.0" selected_by="MKDC" size="0x2c" />
+	<field name="mspmer" descr="" subnode="mspmer_ext" capability="0" offset="0x0.0" selected_by="MSPMER" size="0x8" />
 	<field name="mnvda_reg" descr="" subnode="mnvda_reg_ext" capability="0" offset="0x0.0" selected_by="MNVDA" size="0x10" />
 	<field name="mnvdi_reg" descr="" subnode="mnvdi_reg_ext" capability="0" offset="0x0.0" selected_by="MNVDI" size="0xc" />
 	<field name="mnvqc_reg" descr="" subnode="mnvqc_reg_ext" capability="0" offset="0x0.0" selected_by="MNVQC" size="0x8" />
@@ -426,39 +473,25 @@
 	<field name="mtrc_conf_reg" descr="" subnode="mtrc_conf_reg_ext" capability="0" offset="0x0.0" selected_by="MTRC_CONF" size="0x80" />
 	<field name="mtrc_stdb_reg" descr="" subnode="mtrc_stdb_reg_ext" capability="0" offset="0x0.0" selected_by="MTRC_STDB" size="0xc" />
 	<field name="mtrc_ctrl_reg" descr="" subnode="mtrc_ctrl_reg_ext" capability="0" offset="0x0.0" selected_by="MTRC_CTRL" size="0x40" />
-	<field name="mlcr" descr="" subnode="mlcr_ext" capability="0" offset="0x0.0" selected_by="MLCR" size="0xc" />
-	<field name="mgcr_reg" descr="" subnode="mgcr_reg_ext" capability="0" offset="0x0.0" selected_by="MGCR" size="0x20" />
+	<field name="mfpa_reg" descr="" subnode="mfpa_reg_ext" capability="0" offset="0x0.0" selected_by="MFPA" size="0x20" />
+	<field name="mfba_reg" descr="" subnode="mfba_reg_ext" capability="0" offset="0x0.0" selected_by="MFBA" size="0x10c" />
+	<field name="mfbe_reg" descr="" subnode="mfbe_reg_ext" capability="0" offset="0x0.0" selected_by="MFBE" size="0xc" />
+	<field name="mfmc_reg" descr="" subnode="mfmc_reg_ext" capability="0" offset="0x0.0" selected_by="MFMC" size="0x1c" />
+	<field name="mfcr" descr="" subnode="mfcr_ext" capability="0" offset="0x0.0" selected_by="MFCR" size="0x8" />
+	<field name="mfsc" descr="" subnode="mfsc_ext" capability="0" offset="0x0.0" selected_by="MFSC" size="0x8" />
+	<field name="mfsm" descr="" subnode="mfsm_ext" capability="0" offset="0x0.0" selected_by="MFSM" size="0x8" />
+	<field name="mfsl" descr="" subnode="mfsl_ext" capability="0" offset="0x0.0" selected_by="MFSL" size="0xc" />
+	<field name="fore" descr="" subnode="fore_ext" capability="0" offset="0x0.0" selected_by="FORE" size="0xc" />
+	<field name="mfnr" descr="" subnode="mfnr_ext" capability="0" offset="0x0.0" selected_by="MFNR" size="0x30" />
+	<field name="mpcir" descr="" subnode="mpcir_ext" capability="0" offset="0x0.0" selected_by="MPCIR" size="0x10" />
 	<field name="merr" descr="" subnode="merr_ext" capability="0" offset="0x0.0" selected_by="MERR" size="0x14" />
+	<field name="mrpr_reg" descr="" subnode="mrpr_reg_ext" capability="0" offset="0x0.0" selected_by="MRPR" size="0x108" />
+	<field name="mdcr" descr="" subnode="mdcr_ext" capability="0" offset="0x0.0" selected_by="MDCR" size="0x60" />
+	<field name="mpfm" descr="" subnode="mpfm_ext" capability="0" offset="0x0.0" selected_by="MPFM" size="0x8" />
 	<field name="mpein_reg" descr="" subnode="mpein_reg_ext" capability="0" offset="0x0.0" selected_by="MPEIN" size="0x30" />
 	<field name="mpcnt_reg" descr="" subnode="mpcnt_reg_ext" capability="0" offset="0x0.0" selected_by="MPCNT" size="0x100" />
-	<field name="mtpps_reg" descr="" subnode="mtpps_reg_ext" capability="0" offset="0x0.0" selected_by="MTPPS" size="0x38" />
-	<field name="mtptp" descr="" subnode="mtptp_ext" capability="0" offset="0x0.0" selected_by="MTPTP" size="0x40" />
-	<field name="mtppst" descr="" subnode="mtppst_ext" capability="0" offset="0x0.0" selected_by="MTPPST" size="0x10" />
-	<field name="mtutc_reg" descr="" subnode="mtutc_reg_ext" capability="0" offset="0x0.0" selected_by="MTUTC" size="0x1c" />
 	<field name="mpir" descr="" subnode="mpir_ext" capability="0" offset="0x0.0" selected_by="MPIR" size="0x10" />
 	<field name="mpecs_reg" descr="" subnode="mpecs_reg_ext" capability="0" offset="0x0.0" selected_by="MPECS" size="0x20" />
-	<field name="mcqs_reg" descr="" subnode="mcqs_reg_ext" capability="0" offset="0x0.0" selected_by="MCQS" size="0x10" />
-	<field name="mcqi_reg" descr="" subnode="mcqi_reg_ext" capability="0" offset="0x0.0" selected_by="MCQI" size="0x94" />
-	<field name="mcc_reg" descr="" subnode="mcc_reg_ext" capability="0" offset="0x0.0" selected_by="MCC" size="0x20" />
-	<field name="mcda_reg" descr="" subnode="mcda_reg_ext" capability="0" offset="0x0.0" selected_by="MCDA" size="0x90" />
-	<field name="mtcq_reg" descr="" subnode="mtcq_reg_ext" capability="0" offset="0x0.0" selected_by="MTCQ" size="0x70" />
-	<field name="mkdc_reg" descr="" subnode="mkdc_reg_ext" capability="0" offset="0x0.0" selected_by="MKDC" size="0x2c" />
-	<field name="mbct" descr="" subnode="mbct_ext" capability="0" offset="0x0.0" selected_by="MBCT" size="0x420" />
-	<field name="mqis_reg" descr="" subnode="mqis_reg_ext" capability="0" offset="0x0.0" selected_by="MQIS" size="0x18" />
-	<field name="mirc_reg" descr="" subnode="mirc_reg_ext" capability="0" offset="0x0.0" selected_by="MIRC" size="0x8" />
-	<field name="mcdd_reg" descr="" subnode="mcdd_reg_ext" capability="0" offset="0x0.0" selected_by="MCDD" size="0x20" />
-	<field name="mdfcr_reg" descr="" subnode="mdfcr_reg_ext" capability="0" offset="0x0.0" selected_by="MDFCR" size="0x60" />
-	<field name="mdcr" descr="" subnode="mdcr_ext" capability="0" offset="0x0.0" selected_by="MDCR" size="0x60" />
-	<field name="mddt_reg" descr="" subnode="mddt_reg_ext" capability="0" offset="0x0.0" selected_by="MDDT" size="0x110" />
-	<field name="mddq" descr="" subnode="mddq_ext" capability="0" offset="0x0.0" selected_by="MDDQ" size="0x30" />
-	<field name="mddc" descr="" subnode="mddc_ext" capability="0" offset="0x0.0" selected_by="MDDC" size="0x30" />
-	<field name="mdrcr" descr="" subnode="mdrcr_ext" capability="0" offset="0x0.0" selected_by="MDRCR" size="0x30" />
-	<field name="mdsr_reg" descr="" subnode="mdsr_reg_ext" capability="0" offset="0x0.0" selected_by="MDSR" size="0x30" />
-	<field name="mfsv_reg" descr="" subnode="mfsv_reg_ext" capability="0" offset="0x0.0" selected_by="MFSV" size="0x30" />
-	<field name="mqdik_reg" descr="" subnode="mqdik_reg_ext" capability="0" offset="0x0.0" selected_by="MQDIK" size="0x208" />
-	<field name="mrpr_reg" descr="" subnode="mrpr_reg_ext" capability="0" offset="0x0.0" selected_by="MRPR" size="0x108" />
-	<field name="mcam_reg" descr="" subnode="mcam_reg_ext" capability="0" offset="0x0.0" selected_by="MCAM" size="0x48" />
-	<field name="mfrl_reg" descr="" subnode="mfrl_reg_ext" capability="0" offset="0x0.0" selected_by="MFRL" size="0x8" />
 	<field name="igcr" descr="" subnode="igcr_ext" capability="0" offset="0x0.0" selected_by="IGCR" size="0x10" />
 	<field name="iddd" descr="" subnode="iddd_ext" capability="0" offset="0x0.0" selected_by="IDDD" size="0x8" />
 	<field name="iddds" descr="" subnode="iddds_ext" capability="0" offset="0x0.0" selected_by="IDDDS" size="0x440" />
@@ -473,9 +506,13 @@
 	<field name="icsr" descr="" subnode="icsr_ext" capability="0" offset="0x0.0" selected_by="ICSR" size="0x410" />
 	<field name="irqr" descr="" subnode="irqr_ext" capability="0" offset="0x0.0" selected_by="IRQR" size="0xc" />
 	<field name="icam_reg" descr="" subnode="icam_reg_ext" capability="0" offset="0x0.0" selected_by="ICAM" size="0x18" />
+	<field name="ITPR_reg" descr="" subnode="ITPR_reg_ext" capability="0" offset="0x0.0" selected_by="ITPR" size="0x14" />
+	<field name="ITGCR_reg" descr="" subnode="ITGCR_reg_ext" capability="0" offset="0x0.0" selected_by="ITGCR" size="0x8" />
+	<field name="ipcr" descr="" subnode="ipcr_ext" capability="0" offset="0x0.0" selected_by="IPCR" size="0xc" />
 	<field name="spzr" descr="" subnode="spzr_ext" capability="0" offset="0x0.0" selected_by="SPZR" size="0x100" />
 	<field name="ibfmr" descr="" subnode="ibfmr_ext" capability="0" offset="0x0.0" selected_by="IBFMR" size="0x10" />
 	<field name="ibfmrc" descr="" subnode="ibfmrc_ext" capability="0" offset="0x0.0" selected_by="IBFMRC" size="0x4" />
+	<field name="ibsni" descr="" subnode="ibsni_ext" capability="0" offset="0x0.0" selected_by="IBSNI" size="0xc8" />
 	<field name="sbgcr" descr="" subnode="sbgcr_ext" capability="0" offset="0x0.0" selected_by="SBGCR" size="0xc" />
 	<field name="sbpr" descr="" subnode="sbpr_ext" capability="0" offset="0x0.0" selected_by="SBPR" size="0x18" />
 	<field name="sbcm" descr="" subnode="sbcm_ext" capability="0" offset="0x0.0" selected_by="SBCM" size="0x28" />
@@ -565,6 +602,7 @@
 	<field name="rmpu" descr="" subnode="rmpu_ext" capability="0" offset="0x0.0" selected_by="RMPU" size="0x110" />
 	<field name="rmeir" descr="" subnode="rmeir_ext" capability="0" offset="0x0.0" selected_by="RMEIR" size="0x210" />
 	<field name="reiv" descr="" subnode="reiv_ext" capability="0" offset="0x0.0" selected_by="REIV" size="0x420" />
+	<field name="rngcr" descr="" subnode="rngcr_ext" capability="0" offset="0x0.0" selected_by="RNGCR" size="0xc" />
 	<field name="rxlte" descr="" subnode="rxlte_ext" capability="0" offset="0x0.0" selected_by="RXLTE" size="0xc" />
 	<field name="rxltm" descr="" subnode="rxltm_ext" capability="0" offset="0x0.0" selected_by="RXLTM" size="0x14" />
 	<field name="rxltcc" descr="" subnode="rxltcc_ext" capability="0" offset="0x0.0" selected_by="RXLTCC" size="0x68" />
@@ -585,7 +623,6 @@
 	<field name="rtca" descr="" subnode="rtca_ext" capability="0" offset="0x0.0" selected_by="RTCA" size="0x14" />
 	<field name="rtps" descr="" subnode="rtps_ext" capability="0" offset="0x0.0" selected_by="RTPS" size="0x8" />
 	<field name="riva" descr="" subnode="riva_ext" capability="0" offset="0x0.0" selected_by="RIVA" size="0x10" />
-	<field name="riva" descr="" subnode="riva_ext" capability="0" offset="0x0.0" selected_by="RNGCR" size="0x10" />
 	<field name="cwgcr" descr="" subnode="cwgcr_ext" capability="0" offset="0x0.0" selected_by="CWGCR" size="0x14" />
 	<field name="cwtp" descr="" subnode="cwtp_ext" capability="0" offset="0x0.0" selected_by="CWTP" size="0x40" />
 	<field name="cwpp" descr="" subnode="cwpp_ext" capability="0" offset="0x0.0" selected_by="CWPP" size="0x20" />
@@ -677,14 +714,6 @@
 	<field name="pecnee" descr="" subnode="pecnee_ext" capability="0" offset="0x0.0" selected_by="PECNEE" size="0x18" />
 	<field name="pecner" descr="" subnode="pecner_ext" capability="0" offset="0x0.0" selected_by="PECNER" size="0x38" />
 	<field name="peckc" descr="" subnode="peckc_ext" capability="0" offset="0x0.0" selected_by="PECKC" size="0x30" />
-	<field name="xgcr" descr="" subnode="xgcr_ext" capability="0" offset="0x0.0" selected_by="XGCR" size="0x8" />
-	<field name="xltq" descr="" subnode="xltq_ext" capability="0" offset="0x0.0" selected_by="XLTQ" size="0x2c" />
-	<field name="xmdr" descr="" subnode="xmdr_ext" capability="0" offset="0x0.0" selected_by="XMDR" size="0xa0" />
-	<field name="xlkbu" descr="" subnode="xlkbu_ext" capability="0" offset="0x0.0" selected_by="XLKBU" size="0x140" />
-	<field name="xrmt" descr="" subnode="xrmt_ext" capability="0" offset="0x0.0" selected_by="XRMT" size="0x14" />
-	<field name="xralta" descr="" subnode="xralta_ext" capability="0" offset="0x0.0" selected_by="XRALTA" size="0x8" />
-	<field name="xralst" descr="" subnode="xralst_ext" capability="0" offset="0x0.0" selected_by="XRALST" size="0x108" />
-	<field name="xraltb" descr="" subnode="xraltb_ext" capability="0" offset="0x0.0" selected_by="XRALTB" size="0x8" />
 	<field name="fgcr" descr="" subnode="fgcr_ext" capability="0" offset="0x0.0" selected_by="FGCR" size="0x10" />
 	<field name="fpums" descr="" subnode="fpums_ext" capability="0" offset="0x0.0" selected_by="FPUMS" size="0x50" />
 	<field name="fphhc" descr="" subnode="fphhc_ext" capability="0" offset="0x0.0" selected_by="FPHHC" size="0xc" />
@@ -692,18 +721,23 @@
 	<field name="fpftt" descr="" subnode="fpftt_ext" capability="0" offset="0x0.0" selected_by="FPFTT" size="0x14" />
 	<field name="fphtt" descr="" subnode="fphtt_ext" capability="0" offset="0x0.0" selected_by="FPHTT" size="0x8" />
 	<field name="fpts" descr="" subnode="fpts_ext" capability="0" offset="0x0.0" selected_by="FPTS" size="0xc" />
-	<field name="fmtc" descr="" subnode="fmtc_ext" capability="0" offset="0x0.0" selected_by="FMTC" size="0x44" />
+	<field name="fmtc" descr="" subnode="fmtc_ext" capability="0" offset="0x0.0" selected_by="FMTC" size="0x4c" />
 	<field name="fmte" descr="" subnode="fmte_ext" capability="0" offset="0x0.0" selected_by="FMTE" size="0x14" />
 	<field name="fmtm" descr="" subnode="fmtm_ext" capability="0" offset="0x0.0" selected_by="FMTM" size="0x8" />
 	<field name="fmep" descr="" subnode="fmep_ext" capability="0" offset="0x0.0" selected_by="FMEP" size="0x8" />
+	<field name="FMQC" descr="" subnode="FMQC_ext" capability="0" offset="0x0.0" selected_by="FMQC" size="0xc" />
 	<field name="FSGCR" descr="" subnode="FSGCR_ext" capability="0" offset="0x0.0" selected_by="FSGCR" size="0xc" />
-	<field name="FSDB" descr="" subnode="FSDB_ext" capability="0" offset="0x0.0" selected_by="FSDB" size="0x4c" />
+	<field name="FSDB" descr="" subnode="FSDB_ext" capability="0" offset="0x0.0" selected_by="FSDB" size="0x74" />
 	<field name="FSPT" descr="" subnode="FSPT_ext" capability="0" offset="0x0.0" selected_by="FSPT" size="0x44" />
 	<field name="FSPS" descr="" subnode="FSPS_ext" capability="0" offset="0x0.0" selected_by="FSPS" size="0x10" />
 	<field name="FSTM" descr="" subnode="FSTM_ext" capability="0" offset="0x0.0" selected_by="FSTM" size="0x20c" />
-	<field name="FSED" descr="" subnode="FSED_ext" capability="0" offset="0x0.0" selected_by="FSED" size="0x2dd0" />
+	<field name="FSED" descr="" subnode="FSED_ext" capability="0" offset="0x0.0" selected_by="FSED" size="0x3d8" />
 	<field name="FSHE" descr="" subnode="FSHE_ext" capability="0" offset="0x0.0" selected_by="FSHE" size="0x8" />
-	<field name="FSFH" descr="" subnode="FSFH_ext" capability="0" offset="0x0.0" selected_by="FSFH" size="0x14" />
+	<field name="FSFH" descr="" subnode="FSFH_ext" capability="0" offset="0x0.0" selected_by="FSFH" size="0xac" />
+	<field name="fmtpc" descr="" subnode="fmtpc_ext" capability="0" offset="0x0.0" selected_by="FMTPC" size="0x14" />
+	<field name="fmtpa" descr="" subnode="fmtpa_ext" capability="0" offset="0x0.0" selected_by="FMTPA" size="0xc" />
+	<field name="fmtb" descr="" subnode="fmtb_ext" capability="0" offset="0x0.0" selected_by="FMTB" size="0x1c" />
+	<field name="frar_info" descr="" subnode="frar_info_ext" capability="0" offset="0x0.0" selected_by="FRAR" size="0x10" />
 	<field name="ugcap" descr="" subnode="ugcap_ext" capability="0" offset="0x0.0" selected_by="UGCAP" size="0x18" />
 	<field name="upcap" descr="" subnode="upcap_ext" capability="0" offset="0x0.0" selected_by="UPCAP" size="0x8" />
 	<field name="ugcr" descr="" subnode="ugcr_ext" capability="0" offset="0x0.0" selected_by="UGCR" size="0x10" />
@@ -717,7 +751,7 @@
 	<field name="upbt" descr="" subnode="upbt_ext" capability="0" offset="0x0.0" selected_by="UPBT" size="0x1c" />
 	<field name="utce" descr="" subnode="utce_ext" capability="0" offset="0x0.0" selected_by="UTCE" size="0x84" />
 	<field name="urcr" descr="" subnode="urcr_ext" capability="0" offset="0x0.0" selected_by="URCR" size="0x10" />
-	<field name="usadb" descr="" subnode="usadb_ext" capability="0" offset="0x0.0" selected_by="USADB" size="0x30" />
+	<field name="usadb" descr="" subnode="usadb_ext" capability="0" offset="0x0.0" selected_by="USADB" size="0x34" />
 	<field name="usak" descr="" subnode="usak_ext" capability="0" offset="0x0.0" selected_by="USAK" size="0x24" />
 	<field name="usacn" descr="" subnode="usacn_ext" capability="0" offset="0x0.0" selected_by="USACN" size="0x28" />
 	<field name="utcc" descr="" subnode="utcc_ext" capability="0" offset="0x0.0" selected_by="UTCC" size="0x88" />
@@ -725,12 +759,12 @@
 	<field name="uprr" descr="" subnode="uprr_ext" capability="0" offset="0x0.0" selected_by="UPRR" size="0xc" />
 	<field name="uccr" descr="" subnode="uccr_ext" capability="0" offset="0x0.0" selected_by="UCCR" size="0x8" />
 	<field name="utfd" descr="" subnode="utfd_ext" capability="0" offset="0x0.0" selected_by="UTFD" size="0xf8" />
-	<field name="utfc" descr="" subnode="utfc_ext" capability="0" offset="0x0.0" selected_by="UTFC" size="0xc" />
+	<field name="utfc" descr="" subnode="utfc_ext" capability="0" offset="0x0.0" selected_by="UTFC" size="0x10" />
 	<field name="uter" descr="" subnode="uter_ext" capability="0" offset="0x0.0" selected_by="UTER" size="0x30" />
 </node>
 
-<node name="access_reg_summary_selector_ext" descr="" attr_is_union="1" size="0x2dd0" >
-	<field name="access_reg_summary" descr="" subnode="access_reg_summary_ext" offset="0x0.0" size="0x2dd0" union_selector="$(parent).ctrl.id" />
+<node name="access_reg_summary_selector_ext" descr="" attr_is_union="1" size="0x4d0" >
+	<field name="access_reg_summary" descr="" subnode="access_reg_summary_ext" offset="0x0.0" size="0x4d0" union_selector="$(parent).ctrl.id" />
 	<field name="ctrl" descr="" subnode="access_reg_summary_ctrl_ext" offset="0x0.0" size="0x4.0" />
 </node>
 
@@ -749,11 +783,11 @@
 </node>
 
 <node name="bufferx_reg_ext" descr="" size="0x8.0" >
-	<field name="size" descr="The part of the packet buffer array is allocated for the spe\;cific buffer.\;Units are represented in cells.\;For shared_headroom_pool, this field represents the maxi\;mum load from the shared headroom pool and it can be set \;only when port_shared_buffer is enabled. \;" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="size" descr="The part of the packet buffer array is allocated for the spe\;cific buffer.\;Units are represented in cells.\;For shared_headroom_pool, this field represents the max\;imum load from the shared headroom pool and it can be \;set only when port_shared_buffer is enabled. \;" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="epsb" descr="Eligible for Port Shared buffer.\;If epsb is set, packets assigned to bufferX are allowed to \;insert the port shared buffer.\;For port_shared_buffer, this field is reserved.\;For shared_headroom_pool, this field is reserved.\;When lossy==1 this field is reserved.\;The field is reserved for Switch-X/-2." access="RW" offset="0x0.24" size="0x0.1" />
 	<field name="lossy" descr="The field indicates if the buffer is lossy.\;0: Lossless\;1: Lossy\;\;The field is reserved for Switch-X/-2.\;For port_shared_buffer, this field is reserved.\;For shared_headroom_pool, this field is reserved.\;NOTE: This field does NOT affect the pause control. Pause \;control is configured using PFCC register." access="RW" offset="0x0.25" size="0x0.1" />
-	<field name="xon_threshold" descr="When the amount of data in the buffer goes below this value, \;device stops sending pause frames for the Prios associated \;with the buffer. Units are represented in cells.\;In Spectrum xon_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="xoff_threshold" descr="Once the amount of data in the buffer goes above this value, \;device starts sending Pause frames for all Prios associated \;with the buffer. Units are represented in cells.\;In Spectrum xoff_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.16" size="0x0.16" />
+	<field name="xon_threshold" descr="When the amount of data in the buffer goes below this \;value, device stops sending pause frames for the Prios \;associated with the buffer. Units are represented in cells.\;In Spectrum xon_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="xoff_threshold" descr="Once the amount of data in the buffer goes above this \;value, device starts sending Pause frames for all Prios \;associated with the buffer. Units are represented in cells.\;In Spectrum xoff_threshold is reserved for buffer[9].\;For Spectrum, if lossy is set on, this field is reserved.\;For shared_headroom_pool, this field is reserved." access="RW" offset="0x4.16" size="0x0.16" />
 </node>
 
 <node name="cedr_ext" descr="" size="0x20.0" >
@@ -796,7 +830,7 @@
 	<field name="sport" descr="Reserved when l4_type is not one of: TCP, UDP" access="RO" offset="0x3C.16" size="0x0.16" />
 	<field name="sip" descr="Reserved when l3_type is not one of: IPv4, IPv6, GRH\;For l3_type of IPV4, only bits [31:0] are relevant" access="RO" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
 	<field name="dip" descr="Reserved when l3_type is not one of: IPv4, IPv6, GRH\;For l3_type of IPV4, only bits [31:0] are relevant" access="RO" high_bound="3" low_bound="0" offset="0x50.0" size="0x10.0" />
-	<field name="extra_data" descr="When extra_data_type is TUNNEL:\;Table 2181, &quot;CEER - extra_fields tunnel Layout,&quot; on \;page 2683\;When extra_data_type is MPLS:\;Table 2183, &quot;CEER - extra_fields MPLS Layout,&quot; on \;page 2685\;When extra_data_type is NONE: Reserved Table 2185, &quot;CEER \;- extra_fields NONE Layout,&quot; on page 2687\;\;When used as trap and extra_data_type=0 then the CEER \;length is shorter (not having the extra_data field)" subnode="ceer_extra_data_auto_ext" access="RW" offset="0x60.0" size="0x40.0" union_selector="$(parent).extra_data_type" />
+	<field name="extra_data" descr="When extra_data_type is TUNNEL:\;Table 2362, &quot;CEER - extra_fields tunnel Layout,&quot; on \;page 2471\;When extra_data_type is MPLS:\;Table 2364, &quot;CEER - extra_fields MPLS Layout,&quot; on \;page 2473\;When extra_data_type is NONE: Reserved Table 2366, &quot;CEER \;- extra_fields NONE Layout,&quot; on page 2475\;\;When used as trap and extra_data_type=0 then the CEER \;length is shorter (not having the extra_data field)" subnode="ceer_extra_data_auto_ext" access="RW" offset="0x60.0" size="0x40.0" union_selector="$(parent).extra_data_type" />
 </node>
 
 <node name="ceer_extra_data_auto_ext" descr="" attr_is_union="1" size="0x40.0" >
@@ -900,7 +934,7 @@
 	<field name="version" descr="Configuration item version - defines the data structure follow\;ing the header (together with the type field)." access="RW" offset="0x0.12" size="0x0.4" />
 	<field name="writer_id" descr="The entity which configured this parameter\;0x0: UNSPECIFIED\;0x1: CHASSIS_BMC\;0x2: MAD\;0x3: BMC\;0x4: COMMAND_INTERFACE\;0x5: ICMD - with unspecified source\;0x6: ICMD_UEFI_HII - configured by the NIC&apos;s UEFI expansion \;ROM&quot;s HII menu.\;0x7: ICMD_UEFI_CLP - configured by the NIC&apos;s expansion \;ROM&quot;s CLP.\;0x8: ICMD_Flexboot - configured by the NIC&quot;s legacy expansion \;ROM.\;0x9: ICMD_mlxconfig - configured by Mellanox mlxconfig tool\;0xA: ICMD_USER1 - value available for customer created tools \;that uses the ICMD interface for writing TLVs.\;0xB: ICMD_USER2 - value available for customer created tools \;that uses the ICMD interface for writing TLVs.\;0xC: ICMD_MLXCONFIG_SET_RAW - configures by\;mlxconfig set raw operation.\;0xD: ICMD_FLEXBOOT_CLP - configured by Legacy Expansion \;ROM CLP\;0x10: BMC_APP1 - Configuration was done over the BMC by \;application #1 (application name is OEM specific)\;0x11: BMC_APP2 - Configuration was done over the BMC by \;application #2 (application name is OEM specific)\;0x12: BMP_APP3 - Configuration was done over the BMC by \;application #3 (application name is OEM specific)\;0x1F: OTHER - the parameter was written by the NIC due to \;other reasons. \;\;Note - This field is writeable only when using the ICMD inter\;face. The only value that are valid for writes are 0x6 through \;0xB. Other values will be replaced by 0x5ICMD." access="RO" enum="UNSPECIFIED=0x0,CHASSIS_BMC=0x1,MAD=0x2,BMC=0x3,COMMAND_INTERFACE=0x4,ICMD=0x5,ICMD_UEFI_HII=0x6,ICMD_UEFI_CLP=0x7,ICMD_Flexboot=0x8,ICMD_mlxconfig=0x9,ICMD_USER1=0xa,ICMD_USER2=0xb,ICMD_MLXCONFIG_SET_RAW=0xc,ICMD_FLEXBOOT_CLP=0xd,BMC_APP1=0x10,BMC_APP2=0x11,BMP_APP3=0x12,OTHER=0x1f" offset="0x0.16" size="0x0.5" />
 	<field name="access_mode" descr="Defines which value of the Configuration Item will be accessed.\;0: NEXT - Next value to be applied \;1: CURRENT - Currently set values (only valid for Query \;operation) Supported only if NVGC.nvda_read_current_set\;tings==1.\;2: FACTORY - Default factory values (only valid for Query opera\;tion). Supported only if NVGC.nvda_read_factory_settings==1." access="INDEX" enum="NEXT=0x0,CURRENT=0x1,FACTORY=0x2" offset="0x0.22" size="0x0.2" />
-	<field name="type_index" descr="Configuration item index according to its type_class. \;Table 427, &quot;Configuration Item Data Type Class Global \;Layout,&quot; on page 918\;Table 429, &quot;Configuration Item Data Type Class Physical \;Port Layout,&quot; on page 919\;Table 431, &quot;Configuration Item Data Type Class Per Host-\;PF Layout,&quot; on page 919\;Table 433, &quot;Configuration Item Data Type Class Log Lay\;out,&quot; on page 920\;Table 435, &quot;Configuration Item Data Type Class File Lay\;out,&quot; on page 920\;Table 437, &quot;Configuration Item Data Type Class Host Lay\;out,&quot; on page 921\;Table 439, &quot;Configuration Item Data Type Class Switch \;Global Layout,&quot; on page 921" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="type_index" descr="Configuration item index according to its type_class. \;Table 540, &quot;Configuration Item Data Type Class Global \;Layout,&quot; on page 750\;Table 542, &quot;Configuration Item Data Type Class Physical \;Port Layout,&quot; on page 750\;Table 544, &quot;Configuration Item Data Type Class Per Host-\;PF Layout,&quot; on page 751\;Table 546, &quot;Configuration Item Data Type Class Log Lay\;out,&quot; on page 751\;Table 548, &quot;Configuration Item Data Type Class File Lay\;out,&quot; on page 752\;Table 550, &quot;Configuration Item Data Type Class Host Lay\;out,&quot; on page 752\;Table 552, &quot;Configuration Item Data Type Class Switch \;Global Layout,&quot; on page 753\;Table 554, &quot;Configuration Item Data Type Class Module \;Layout,&quot; on page 753" access="INDEX" offset="0x4.0" size="0x0.24" />
 	<field name="type_class" descr="Type Class:\;\;6: File\;8: Switch_Global\;9: Module" access="INDEX" enum="File=0x6,Switch_Global=0x8,Module=0x9" offset="0x4.24" size="0x0.8" />
 </node>
 
@@ -926,7 +960,7 @@
 <node name="cpqe_ext" descr="" size="0xc.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Egress Local Port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="marking_percent" descr="ECN Marking percentage when the local_port rate is \;above the phantom queue rate as configured by phan\;tom_queue_rate in QEEC, see Section 11.14.12, &quot;QEEC \;- QoS ETS Element Configuration&quot;, on page 2608\;Range is 0..100, units of integer percentage" access="RW" offset="0x8.16" size="0x0.7" />
+	<field name="marking_percent" descr="ECN Marking percentage when the local_port rate is \;above the phantom queue rate as configured by phan\;tom_queue_rate in QEEC, see Section 11.14.12, &quot;QEEC \;- QoS ETS Element Configuration&quot;, on page 2396\;Range is 0..100, units of integer percentage" access="RW" offset="0x8.16" size="0x0.7" />
 </node>
 
 <node name="crspace_access_payload_ext" descr="" size="0x104.0" >
@@ -943,9 +977,9 @@
 
 <node name="cwgcr_ext" descr="" size="0x14.0" >
 	<field name="aqs_time" descr="Average queue size time\;Time from current_queue_size to previous_aqs\;The time is 2^aqs_time * 64nSec\;Valid range is 0..24" access="RW" offset="0x0.0" size="0x0.8" />
-	<field name="aqs_weight" descr="Average queue size weight.\;The average queue size (aqs) is calculated by:\;aqs = ((current_queue_size)*2^-w) + ((previous_aqs)*(1-2^-w)) \;where w is aqs_weight\;The time between current_queue_size and previous_aqs is con\;figured by aqs_time\;Note: when mode=percentage then there is no moving average \;(the aqs_weight is effectively 0). See Section 12.7.2, &quot;CWTP - \;Congestion WRED ECN TClass Profile Register&quot;, on \;page 2664\;" access="RW" offset="0x0.8" size="0x0.4" />
+	<field name="aqs_weight" descr="Average queue size weight.\;The average queue size (aqs) is calculated by:\;aqs = ((current_queue_size)*2^-w) + ((previous_aqs)*(1-2^-w)) \;where w is aqs_weight\;The time between current_queue_size and previous_aqs is con\;figured by aqs_time\;Note: when mode=percentage then there is no moving average \;(the aqs_weight is effectively 0). See Section 12.7.2, &quot;CWTP - \;Congestion WRED ECN TClass Profile Register&quot;, on \;page 2452\;" access="RW" offset="0x0.8" size="0x0.4" />
 	<field name="scd" descr="Enable ECN Source Congestion Detection only. Don&apos;t mark vic\;tim packets.\;" access="RW" offset="0x0.16" size="0x0.1" />
-	<field name="en" descr="enable bits:\;bit2: WRED drop enable\;For Spectrum, ingress mirror of WRED can utilize this configu\;ration, see Section 4.13.2, &quot;MPAR - Monitoring Port Ana\;lyzer Register&quot;, on page 1148" access="RW" offset="0x0.24" size="0x0.4" />
+	<field name="en" descr="enable bits:\;bit2: WRED drop enable\;For Spectrum, ingress mirror of WRED can utilize this configu\;ration, see Section 4.13.2, &quot;MPAR - Monitoring Port Ana\;lyzer Register&quot;, on page 915" access="RW" offset="0x0.24" size="0x0.4" />
 	<field name="cece" descr="Count ECN for Congestion Experienced\;0: do not count &quot;ECN mark&quot; for a packet which has Congestion \;Experienced (ECN=11 at ingress) \;1: do count ECN mark for a packet which has Congestion Experi\;enced (ECN=11 at ingress) and experiences congestion in the \;switch (default)\;In any case, a packet coming with ECN=00 is not counted as \;ECN." access="RW" offset="0x4.0" size="0x0.1" />
 	<field name="mece" descr="Mirror ECN for Congestion Experienced\;0: do not ecn-mirror a packet which has Congestion Experienced \;(ECN=11 at ingress)\;1: do ecn-mirror for a packet which has Congestion Experienced \;(ECN=11 at ingress) and experiences congestion in the switch \;(default)\;In any case, a packet coming with ECN=00 is not ecn-mirrored\;Reserved when Spectrum\;Reserved when Quantum which always does ecn-mirror regard\;less of fecn in the packet" access="RW" offset="0x4.1" size="0x0.1" />
 	<field name="ece_inner_en" descr="[Spectrum-4]\;Only for Eth Switches:\;When ECE is event then:\;0: OUTER - only for outer TCP (if exists)\;1: OUTER_OR_INNER - for either outer (if exists) or inner TCP (if \;exists)\;Reserved when Spectrum/-2/-3" access="RW" offset="0x4.4" size="0x0.1" />
@@ -970,7 +1004,7 @@
 	<field name="local_port" descr="Local port number\;CPU port is not supported" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="traffic_class" descr="Traffic Class\;Range is 0..cap_max_tclass_data-1" access="INDEX" offset="0x20.0" size="0x0.8" />
 	<field name="mode" descr="Mode of thresholds for WRED and ECN:\;0: Fixed\;1: Percentage" access="RW" enum="Fixed=0x0,Percentage=0x1" offset="0x24.24" size="0x0.1" />
-	<field name="profile1_min" descr="Minimum Average Queue Size of the profile number &lt;i&gt;\;When mode is Fixed:\;Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size.\;For Spectrum: must be a multiple of 64\;Note: for Spectrum, must be larger than 2^aqs_weight \;cells, see Section 12.7.1, &quot;CWGCR - Congestion \;WRED ECN General Configuration Register&quot;, on \;page 2661\;When mode is Percentage:\;Percentage of the quota of local_port,traffic_class. Range \;is 0..100, units of integer percentage. When ECN Source \;Congestion Detection is enabled then congestion occurs \;when there are at least 256 cells in the buffer\;" access="RW" offset="0x28.0" size="0x0.20" />
+	<field name="profile1_min" descr="Minimum Average Queue Size of the profile number &lt;i&gt;\;When mode is Fixed:\;Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size.\;For Spectrum: must be a multiple of 64\;Note: for Spectrum, must be larger than 2^aqs_weight \;cells, see Section 12.7.1, &quot;CWGCR - Congestion \;WRED ECN General Configuration Register&quot;, on \;page 2449\;When mode is Percentage:\;Percentage of the quota of local_port,traffic_class. Range \;is 0..100, units of integer percentage. When ECN Source \;Congestion Detection is enabled then congestion occurs \;when there are at least 256 cells in the buffer\;" access="RW" offset="0x28.0" size="0x0.20" />
 	<field name="profile1_max" descr="Maximum Average Queue Size of the profile number &lt;i&gt;\;When mode is Fixed:\;Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size\;For Spectrum: must be a multiple of 64\;When mode is Percentage:\;Percentage of the quota of local_port,traffic_class. Range \;is 0..100, units of integer percentage.\;profile&lt;i&gt;_max must always be equal or greater than pro\;file&lt;i&gt;_min" access="RW" offset="0x2C.0" size="0x0.20" />
 	<field name="profile1_percent" descr="Percentage of WRED and ECN marking for Maximum \;Average Queue Size of the profile number &lt;i&gt;\;Range is 0..100, units of integer percentage\;Default is 0" access="RW" offset="0x2C.24" size="0x0.7" />
 	<field name="profile2_min" descr="Same as above." access="RW" offset="0x30.0" size="0x0.20" />
@@ -1014,9 +1048,9 @@
 </node>
 
 <node name="ecn_ext" descr="" size="0x4.0" >
-	<field name="color2" descr="The EXP mapping for color k, where k=0..2, see Table 2121, \;&quot;color&lt;k&gt;Layout,&quot; on page 2625" access="RW" offset="0x0.8" size="0x0.8" />
-	<field name="color1" descr="The EXP mapping for color k, where k=0..2, see Table 2121, \;&quot;color&lt;k&gt;Layout,&quot; on page 2625" access="RW" offset="0x0.16" size="0x0.8" />
-	<field name="color0" descr="The EXP mapping for color k, where k=0..2, see Table 2121, \;&quot;color&lt;k&gt;Layout,&quot; on page 2625" access="RW" offset="0x0.24" size="0x0.8" />
+	<field name="color2" descr="The EXP mapping for color k, where k=0..2, see Table 2296, \;&quot;color&lt;k&gt;Layout,&quot; on page 2413" access="RW" offset="0x0.8" size="0x0.8" />
+	<field name="color1" descr="The EXP mapping for color k, where k=0..2, see Table 2296, \;&quot;color&lt;k&gt;Layout,&quot; on page 2413" access="RW" offset="0x0.16" size="0x0.8" />
+	<field name="color0" descr="The EXP mapping for color k, where k=0..2, see Table 2296, \;&quot;color&lt;k&gt;Layout,&quot; on page 2413" access="RW" offset="0x0.24" size="0x0.8" />
 </node>
 
 <node name="elport_record_ext" descr="" size="0x4.0" >
@@ -1048,8 +1082,8 @@
 	<field name="ether_stats_fragments_low" descr="The total number of packets received that \;were less than 64 octets in length (excluding \;framing bits but including FCS octets) and \;had either a bad FCS with an integral num\;ber of octets (FCS error) or a bad FCS with a \;non-integral number of octets (alignment \;error).\;" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="ether_stats_jabbers_high" descr="The total number of packets received that \;were longer than MTU octets (excluding \;framing bits, but including FCS octets), and \;had either a bad FCS with an integral num\;ber of octets (FCS error) or a bad FCS with a \;non-integral number of octets (alignment \;error).\;" access="RO" offset="0x48.0" size="0x4.0" />
 	<field name="ether_stats_jabbers_low" descr="The total number of packets received that \;were longer than MTU octets (excluding \;framing bits, but including FCS octets), and \;had either a bad FCS with an integral num\;ber of octets (FCS error) or a bad FCS with a \;non-integral number of octets (alignment \;error).\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="ether_stats_collisions_high" descr="The best estimate of the total number of \;collisions on this Ethernet segment.\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="ether_stats_collisions_low" descr="The best estimate of the total number of \;collisions on this Ethernet segment.\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="ether_stats_collisions_high" descr="The best estimate of the total number of col\;lisions on this Ethernet segment.\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="ether_stats_collisions_low" descr="The best estimate of the total number of col\;lisions on this Ethernet segment.\;" access="RO" offset="0x54.0" size="0x4.0" />
 	<field name="ether_stats_pkts64octets_high" descr="The total number of packets (including bad \;packets) received that were 64 octets in \;length (excluding framing bits but including \;FCS octets)." access="RO" offset="0x58.0" size="0x4.0" />
 	<field name="ether_stats_pkts64octets_low" descr="The total number of packets (including bad \;packets) received that were 64 octets in \;length (excluding framing bits but including \;FCS octets)." access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="ether_stats_pkts65to127octets_high" descr="The total number of packets (including bad \;packets) received that were between 65 and \;127 octets in length (excluding framing bits \;but including FCS octets)." access="RO" offset="0x60.0" size="0x4.0" />
@@ -1073,10 +1107,10 @@
 </node>
 
 <node name="eth_2863_cntrs_grp_data_layout_ext" descr="" size="0xf8.0" >
-	<field name="if_in_octets_high" descr="The total number of octets received, including \;framing characters. Including MAC control frames.\;\;" access="RO" offset="0x0.0" size="0x4.0" />
-	<field name="if_in_octets_low" descr="The total number of octets received, including \;framing characters. Including MAC control frames.\;\;" access="RO" offset="0x4.0" size="0x4.0" />
-	<field name="if_in_ucast_pkts_high" descr="The number of packets successfully received, \;which were not addressed to a multicast or broad\;cast MAC address.\;" access="RO" offset="0x8.0" size="0x4.0" />
-	<field name="if_in_ucast_pkts_low" descr="The number of packets successfully received, \;which were not addressed to a multicast or broad\;cast MAC address.\;" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="if_in_octets_high" descr="The total number of octets received, including fram\;ing characters. Including MAC control frames.\;\;" access="RO" offset="0x0.0" size="0x4.0" />
+	<field name="if_in_octets_low" descr="The total number of octets received, including fram\;ing characters. Including MAC control frames.\;\;" access="RO" offset="0x4.0" size="0x4.0" />
+	<field name="if_in_ucast_pkts_high" descr="The number of packets successfully received, which \;were not addressed to a multicast or broadcast \;MAC address.\;" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="if_in_ucast_pkts_low" descr="The number of packets successfully received, which \;were not addressed to a multicast or broadcast \;MAC address.\;" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="if_in_discards_high" descr="The number of inbound packets which were chosen \;to be discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;\;\;\;\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="if_in_discards_low" descr="The number of inbound packets which were chosen \;to be discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;\;\;\;\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="if_in_errors_high" descr="The number of inbound packets that contained \;errors preventing them from being deliverable to a \;higher-layer protocol. \;" access="RO" offset="0x18.0" size="0x4.0" />
@@ -1085,20 +1119,20 @@
 	<field name="if_in_unknown_protos_low" descr="The number of packets received via the interface \;which were discarded because of an unknown or \;unsupported protocol.\;" access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="if_out_octets_high" descr="The total number of octets transmitted out of the \;interface, including framing characters.\;" access="RO" offset="0x28.0" size="0x4.0" />
 	<field name="if_out_octets_low" descr="The total number of octets transmitted out of the \;interface, including framing characters.\;" access="RO" offset="0x2C.0" size="0x4.0" />
-	<field name="if_out_ucast_pkts_high" descr="The total number of packets that higher-level pro\;tocols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x30.0" size="0x4.0" />
-	<field name="if_out_ucast_pkts_low" descr="The total number of packets that higher-level pro\;tocols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x34.0" size="0x4.0" />
+	<field name="if_out_ucast_pkts_high" descr="The total number of packets that higher-level proto\;cols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x30.0" size="0x4.0" />
+	<field name="if_out_ucast_pkts_low" descr="The total number of packets that higher-level proto\;cols requested be transmitted and were not \;addressed to a multicast or broadcast MAC \;address, including those that were discarded or not \;sent.\;" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="if_out_discards_high" descr="The number of outbound packets which were cho\;sen to be discarded, even though no errors had \;been detected to prevent their being transmitted. \;" access="RO" offset="0x38.0" size="0x4.0" />
 	<field name="if_out_discards_low" descr="The number of outbound packets which were cho\;sen to be discarded, even though no errors had \;been detected to prevent their being transmitted. \;" access="RO" offset="0x3C.0" size="0x4.0" />
 	<field name="if_out_errors_high" descr="The number of outbound packets that could not be \;transmitted because of errors.\;" access="RO" offset="0x40.0" size="0x4.0" />
 	<field name="if_out_errors_low" descr="The number of outbound packets that could not be \;transmitted because of errors.\;" access="RO" offset="0x44.0" size="0x4.0" />
-	<field name="if_in_multicast_pkts_high" descr="The number of packets successfully received, \;which were addressed to a multicast MAC address.\;" access="RO" offset="0x48.0" size="0x4.0" />
-	<field name="if_in_multicast_pkts_low" descr="The number of packets successfully received, \;which were addressed to a multicast MAC address.\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="if_in_broadcast_pkts_high" descr="The number of packets successfully received, \;which were addressed to a broadcast MAC address.\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="if_in_broadcast_pkts_low" descr="The number of packets successfully received, \;which were addressed to a broadcast MAC address.\;" access="RO" offset="0x54.0" size="0x4.0" />
-	<field name="if_out_multicast_pkts_high" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x58.0" size="0x4.0" />
-	<field name="if_out_multicast_pkts_low" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x5C.0" size="0x4.0" />
-	<field name="if_out_broadcast_pkts_high" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x60.0" size="0x4.0" />
-	<field name="if_out_broadcast_pkts_low" descr="The total number of packets that higher-level pro\;tocols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x64.0" size="0x4.0" />
+	<field name="if_in_multicast_pkts_high" descr="The number of packets successfully received, which \;were addressed to a multicast MAC address.\;" access="RO" offset="0x48.0" size="0x4.0" />
+	<field name="if_in_multicast_pkts_low" descr="The number of packets successfully received, which \;were addressed to a multicast MAC address.\;" access="RO" offset="0x4C.0" size="0x4.0" />
+	<field name="if_in_broadcast_pkts_high" descr="The number of packets successfully received, which \;were addressed to a broadcast MAC address.\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="if_in_broadcast_pkts_low" descr="The number of packets successfully received, which \;were addressed to a broadcast MAC address.\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="if_out_multicast_pkts_high" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x58.0" size="0x4.0" />
+	<field name="if_out_multicast_pkts_low" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a multicast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x5C.0" size="0x4.0" />
+	<field name="if_out_broadcast_pkts_high" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x60.0" size="0x4.0" />
+	<field name="if_out_broadcast_pkts_low" descr="The total number of packets that higher-level proto\;cols requested be transmitted, and which were \;addressed to a broadcast MAC address, including \;those that were discarded or not sent.\;" access="RO" offset="0x64.0" size="0x4.0" />
 </node>
 
 <node name="eth_3635_cntrs_grp_data_layout_ext" descr="" size="0xf8.0" >
@@ -1106,28 +1140,28 @@
 	<field name="dot3stats_alignment_errors_low" descr="A count of frames received that are not an inte\;gral number of octets in length and do not pass \;the FCS check.\;" access="RW" offset="0x4.0" size="0x4.0" />
 	<field name="dot3stats_fcs_errors_high" descr="A count of frames received that are an integral \;number of octets in length but do not pass the \;FCS check. This count does not include frames \;received with frame-too-long or frame-too-\;short errors.\;" access="RW" offset="0x8.0" size="0x4.0" />
 	<field name="dot3stats_fcs_errors_low" descr="A count of frames received that are an integral \;number of octets in length but do not pass the \;FCS check. This count does not include frames \;received with frame-too-long or frame-too-\;short errors.\;" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="dot3stats_single_collision_frames_high" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted \;successfully.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x10.0" size="0x4.0" />
-	<field name="dot3stats_single_collision_frames_low" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted \;successfully.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x14.0" size="0x4.0" />
-	<field name="dot3stats_multiple_collision_frames_high" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x18.0" size="0x4.0" />
-	<field name="dot3stats_multiple_collision_frames_low" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x1C.0" size="0x4.0" />
+	<field name="dot3stats_single_collision_frames_high" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted suc\;cessfully.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x10.0" size="0x4.0" />
+	<field name="dot3stats_single_collision_frames_low" descr="A count of frames that are involved in a single \;collision, and are subsequently transmitted suc\;cessfully.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x14.0" size="0x4.0" />
+	<field name="dot3stats_multiple_collision_frames_high" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x18.0" size="0x4.0" />
+	<field name="dot3stats_multiple_collision_frames_low" descr="A count of frames that are involved in more than \;one collision and are subsequently transmitted \;successfully. \;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x1C.0" size="0x4.0" />
 	<field name="dot3stats_sqe_test_errors_high" descr="A count of times that the SQE TEST ERROR is \;received on a particular interface.\;This counter does not increment on interfaces \;operating at speeds greater than 10 Mb/s, or on \;interfaces operating in full-duplex mode. \;" access="RW" offset="0x20.0" size="0x4.0" />
 	<field name="dot3stats_sqe_test_errors_low" descr="A count of times that the SQE TEST ERROR is \;received on a particular interface.\;This counter does not increment on interfaces \;operating at speeds greater than 10 Mb/s, or on \;interfaces operating in full-duplex mode. \;" access="RW" offset="0x24.0" size="0x4.0" />
-	<field name="dot3stats_deferred_transmissions_high" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x28.0" size="0x4.0" />
-	<field name="dot3stats_deferred_transmissions_low" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x2C.0" size="0x4.0" />
-	<field name="dot3stats_late_collisions_high" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x30.0" size="0x4.0" />
-	<field name="dot3stats_late_collisions_low" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x34.0" size="0x4.0" />
-	<field name="dot3stats_excessive_collisions_high" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x38.0" size="0x4.0" />
-	<field name="dot3stats_excessive_collisions_low" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the \;interface is operating in full-duplex mode.\;" access="RW" offset="0x3C.0" size="0x4.0" />
+	<field name="dot3stats_deferred_transmissions_high" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x28.0" size="0x4.0" />
+	<field name="dot3stats_deferred_transmissions_low" descr="A count of frames for which the first transmis\;sion attempt on a particular interface is delayed \;because the medium is busy. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x2C.0" size="0x4.0" />
+	<field name="dot3stats_late_collisions_high" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x30.0" size="0x4.0" />
+	<field name="dot3stats_late_collisions_low" descr="The number of times that a collision is detected \;on a particular interface later than one slotTime \;into the transmission of a packet.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x34.0" size="0x4.0" />
+	<field name="dot3stats_excessive_collisions_high" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x38.0" size="0x4.0" />
+	<field name="dot3stats_excessive_collisions_low" descr="A count of frames for which transmission on a \;particular interface fails due to excessive colli\;sions.\;This counter does not increment when the inter\;face is operating in full-duplex mode.\;" access="RW" offset="0x3C.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_transmit_errors_high" descr="A count of frames for which transmission failed \;and were discarded even though no errors had \;been detected to prevent their being deliverable \;to a higher-layer protocol.\;" access="RW" offset="0x40.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_transmit_errors_low" descr="A count of frames for which transmission failed \;and were discarded even though no errors had \;been detected to prevent their being deliverable \;to a higher-layer protocol.\;" access="RW" offset="0x44.0" size="0x4.0" />
-	<field name="dot3stats_carrier_sense_errors_high" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular \;interface. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x48.0" size="0x4.0" />
-	<field name="dot3stats_carrier_sense_errors_low" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular \;interface. \;This counter does not increment when the \;interface is operating in full-duplex mode. \;" access="RW" offset="0x4C.0" size="0x4.0" />
+	<field name="dot3stats_carrier_sense_errors_high" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular interface. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x48.0" size="0x4.0" />
+	<field name="dot3stats_carrier_sense_errors_low" descr="The number of times that the carrier sense con\;dition was lost or never asserted when attempt\;ing to transmit a frame on a particular interface. \;This counter does not increment when the inter\;face is operating in full-duplex mode. \;" access="RW" offset="0x4C.0" size="0x4.0" />
 	<field name="dot3stats_frame_too_longs_high" descr="A count of frames received that exceed the max\;imum permitted frame size.\;" access="RW" offset="0x50.0" size="0x4.0" />
 	<field name="dot3stats_frame_too_longs_low" descr="A count of frames received that exceed the max\;imum permitted frame size.\;" access="RW" offset="0x54.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_receive_errors_high" descr="A count of frames for which reception failed and \;were discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;" access="RW" offset="0x58.0" size="0x4.0" />
 	<field name="dot3stats_internal_mac_receive_errors_low" descr="A count of frames for which reception failed and \;were discarded even though no errors had been \;detected to prevent their being deliverable to a \;higher-layer protocol.\;" access="RW" offset="0x5C.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_high" descr="The number of times the receiving media is \;non-idle (a carrier event) for a period of time \;equal to or greater than minFrameSize, and \;during which there was at least one occurrence \;of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;\;" access="RW" offset="0x60.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_low" descr="The number of times the receiving media is \;non-idle (a carrier event) for a period of time \;equal to or greater than minFrameSize, and \;during which there was at least one occurrence \;of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;\;" access="RW" offset="0x64.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_high" descr="The number of times the receiving media is non-\;idle (a carrier event) for a period of time equal to \;or greater than minFrameSize, and during \;which there was at least one occurrence of an \;event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;\;" access="RW" offset="0x60.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_low" descr="The number of times the receiving media is non-\;idle (a carrier event) for a period of time equal to \;or greater than minFrameSize, and during \;which there was at least one occurrence of an \;event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;\;" access="RW" offset="0x64.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_high" descr="A count of MAC Control frames received that \;contain an opcode that is not supported.\;" access="RW" offset="0x68.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_low" descr="A count of MAC Control frames received that \;contain an opcode that is not supported.\;" access="RW" offset="0x6C.0" size="0x4.0" />
 	<field name="dot3in_pause_frames_high" descr="A count of MAC Control frames received with an \;opcode indicating the PAUSE operation.\;\;" access="RW" offset="0x70.0" size="0x4.0" />
@@ -1139,8 +1173,8 @@
 <node name="eth_802_3_cntrs_grp_data_layout_ext" descr="" size="0xf8.0" >
 	<field name="a_frames_transmitted_ok_high" descr="A count of frames that are successfully trans\;mitted. \;" access="RO" offset="0x0.0" size="0x4.0" />
 	<field name="a_frames_transmitted_ok_low" descr="A count of frames that are successfully trans\;mitted. \;" access="RO" offset="0x4.0" size="0x4.0" />
-	<field name="a_frames_received_ok_high" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, \;or frames lost due to other MAC errors.\;\;" access="RO" offset="0x8.0" size="0x4.0" />
-	<field name="a_frames_received_ok_low" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, \;or frames lost due to other MAC errors.\;\;" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="a_frames_received_ok_high" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, or \;frames lost due to other MAC errors.\;\;" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="a_frames_received_ok_low" descr="A count of frames that are successfully \;received. This does not include frames \;received with frame-too-long, frame check \;sequence (FCS), length or alignment errors, or \;frames lost due to other MAC errors.\;\;" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="a_frame_check_sequence_errors_high" descr="A count of receive frames that are an integral \;number of octets in length and do not pass the \;FCS check. This does not include frames \;received with frame-too-long, or frame-too-\;short (frame fragment) errors.\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="a_frame_check_sequence_errors_low" descr="A count of receive frames that are an integral \;number of octets in length and do not pass the \;FCS check. This does not include frames \;received with frame-too-long, or frame-too-\;short (frame fragment) errors.\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="a_alignment_errors_high" descr="A count of frames that are not an integral \;number of octets in length and do not pass the \;FCS check.\;" access="RO" offset="0x18.0" size="0x4.0" />
@@ -1157,8 +1191,8 @@
 	<field name="a_multicast_frames_received_ok_low" descr="A count of frames that are successfully \;received and directed to an active nonbroad\;cast group address. This does not include \;frames received with frame-too-long, FCS, \;length or alignment errors, or frames lost due \;to internal MAC sublayer error. \;  \;\;\;" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="a_broadcast_frames_received_ok_high" descr="A count of the frames that were successfully \;transmitted to the broadcast address. Frames \;transmitted to multicast addresses are not \;broadcast frames and are excluded. \;\;" access="RO" offset="0x48.0" size="0x4.0" />
 	<field name="a_broadcast_frames_received_ok_low" descr="A count of the frames that were successfully \;transmitted to the broadcast address. Frames \;transmitted to multicast addresses are not \;broadcast frames and are excluded. \;\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="a_in_range_length_errors_high" descr="A count of frames with a length/type field \;value between the minimum unpadded MAC \;client data size and the maximum allowed \;MAC client data size, inclusive, that does not \;match the number of MAC client data octets \;received. The counter also increments for \;frames whose length/type field value is less \;than the minimum allowed unpadded MAC cli\;ent data size and the number of MAC client \;data octets received is greater than the mini\;mum unpadded MAC client data size.\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="a_in_range_length_errors_low" descr="A count of frames with a length/type field \;value between the minimum unpadded MAC \;client data size and the maximum allowed \;MAC client data size, inclusive, that does not \;match the number of MAC client data octets \;received. The counter also increments for \;frames whose length/type field value is less \;than the minimum allowed unpadded MAC cli\;ent data size and the number of MAC client \;data octets received is greater than the mini\;mum unpadded MAC client data size.\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="a_in_range_length_errors_high" descr="A count of frames with a length/type field value \;between the minimum unpadded MAC client \;data size and the maximum allowed MAC cli\;ent data size, inclusive, that does not match \;the number of MAC client data octets received. \;The counter also increments for frames whose \;length/type field value is less than the mini\;mum allowed unpadded MAC client data size \;and the number of MAC client data octets \;received is greater than the minimum unpad\;ded MAC client data size.\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="a_in_range_length_errors_low" descr="A count of frames with a length/type field value \;between the minimum unpadded MAC client \;data size and the maximum allowed MAC cli\;ent data size, inclusive, that does not match \;the number of MAC client data octets received. \;The counter also increments for frames whose \;length/type field value is less than the mini\;mum allowed unpadded MAC client data size \;and the number of MAC client data octets \;received is greater than the minimum unpad\;ded MAC client data size.\;" access="RO" offset="0x54.0" size="0x4.0" />
 	<field name="a_out_of_range_length_field_high" descr="A count of frames with a length field value \;greater than the maximum allowed LLC data \;size. \;" access="RO" offset="0x58.0" size="0x4.0" />
 	<field name="a_out_of_range_length_field_low" descr="A count of frames with a length field value \;greater than the maximum allowed LLC data \;size. \;" access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="a_frame_too_long_errors_high" descr="A count of frames received that exceed the \;maximum permitted frame size by IEEE 802.3 \;(MTU size).\;" access="RO" offset="0x60.0" size="0x4.0" />
@@ -1240,8 +1274,8 @@
 	<field name="tx_stats_pkts128to255octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 128 and 255 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x64.0" size="0x4.0" />
 	<field name="tx_stats_pkts256to511octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 256 and 511 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x68.0" size="0x4.0" />
 	<field name="tx_stats_pkts256to511octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 256 and 511 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x6C.0" size="0x4.0" />
-	<field name="tx_stats_pkts512to1023octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x70.0" size="0x4.0" />
-	<field name="tx_stats_pkts512to1023octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x74.0" size="0x4.0" />
+	<field name="tx_stats_pkts512to1023octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x70.0" size="0x4.0" />
+	<field name="tx_stats_pkts512to1023octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 512 and 1023 octets in \;length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x74.0" size="0x4.0" />
 	<field name="tx_stats_pkts1024to1518octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 1024 and 1518 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x78.0" size="0x4.0" />
 	<field name="tx_stats_pkts1024to1518octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 1024 and 1518 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x7C.0" size="0x4.0" />
 	<field name="tx_stats_pkts1519to2047octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 1519 and 2047 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x80.0" size="0x4.0" />
@@ -1250,14 +1284,16 @@
 	<field name="tx_stats_pkts2048to4095octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 2048 and 4095 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x8C.0" size="0x4.0" />
 	<field name="tx_stats_pkts4096to8191octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 4096 and 8191 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x90.0" size="0x4.0" />
 	<field name="tx_stats_pkts4096to8191octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 4096 and 8191 octets \;in length (excluding framing bits but including FCS \;octets)." access="RO" offset="0x94.0" size="0x4.0" />
-	<field name="tx_stats_pkts8192to10239octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 \;octets in length (excluding framing bits but including \;FCS octets).transmitted\;" access="RO" offset="0x98.0" size="0x4.0" />
-	<field name="tx_stats_pkts8192to10239octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 \;octets in length (excluding framing bits but including \;FCS octets).transmitted\;" access="RO" offset="0x9C.0" size="0x4.0" />
+	<field name="tx_stats_pkts8192to10239octets_high" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 octets \;in length (excluding framing bits but including FCS \;octets).transmitted\;" access="RO" offset="0x98.0" size="0x4.0" />
+	<field name="tx_stats_pkts8192to10239octets_low" descr="The total number of packets (including bad packets) \;transmitted that were between 8192 and 10239 octets \;in length (excluding framing bits but including FCS \;octets).transmitted\;" access="RO" offset="0x9C.0" size="0x4.0" />
 	<field name="ece_marked_high" descr="A count of packets marked as ECE or potentially \;marked as ECE." access="RO" offset="0xA0.0" size="0x4.0" />
 	<field name="ece_marked_low" descr="A count of packets marked as ECE or potentially \;marked as ECE." access="RO" offset="0xA4.0" size="0x4.0" />
+	<field name="tx_int_cksm_err_high" descr="Counter is incremented upon packet payload internal \;checksum error" access="RO" offset="0xA8.0" size="0x4.0" />
+	<field name="tx_int_cksm_err_low" descr="Counter is incremented upon packet payload internal \;checksum error" access="RO" offset="0xAC.0" size="0x4.0" />
 </node>
 
 <node name="eth_only_router_ext" descr="" size="0x3f8.0" >
-	<field name="router_interface_list" descr="Router Interface List.\;Encoding of this field depends on the type field.\;For Ethernet Only, \;If (type==Ethernet Only), each bit in the bit vector indi\;cates if the router interface indexed by the bit location \;is a member of the group\;If (type==Ethernet and IPoIB), each DWORD might \;include a single router interface number with a pointer \;to the Adjacency table used for Multicast Adjacency for \;IPoIB Multicast" access="RW" high_bound="127" low_bound="0" offset="0x0.0" size="0x200.0" />
+	<field name="router_interface_list" descr="Router Interface List.\;Encoding of this field depends on the type field.\;For Ethernet Only, \;If (type==Ethernet Only), each bit in the bit vector \;indicates if the router interface indexed by the bit \;location is a member of the group\;If (type==Ethernet and IPoIB), each DWORD might \;include a single router interface number with a \;pointer to the Adjacency table used for Multicast \;Adjacency for IPoIB Multicast" access="RW" high_bound="127" low_bound="0" offset="0x0.0" size="0x200.0" />
 </node>
 
 <node name="eth_oob_port_cntrs_ext" descr="" size="0xf8.0" >
@@ -1269,16 +1305,16 @@
 	<field name="if_in_discards_low" descr="The number of inbound packets which were chosen to be \;discarded even though no errors had been detected to pre\;vent their being deliverable to a higher-layer protocol.\;\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="if_in_errors_high" descr="The number of inbound packets that contained errors pre\;venting them from being deliverable to a higher-layer proto\;col. \;" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="if_in_errors_low" descr="The number of inbound packets that contained errors pre\;venting them from being deliverable to a higher-layer proto\;col. \;" access="RO" offset="0x1C.0" size="0x4.0" />
-	<field name="ether_stats_crc_align_errors_high" descr="e total number of packets received that had a length \;(excluding framing bits, but including FCS octets) of \;between 64 and MTU octets, inclusive, but had either a bad \;frame check sequence (FCS) with an integral number of \;octets (FCS error) or a bad FCS with a non-integral number \;of octets (alignment error).\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="ether_stats_crc_align_errors_low" descr="e total number of packets received that had a length \;(excluding framing bits, but including FCS octets) of \;between 64 and MTU octets, inclusive, but had either a bad \;frame check sequence (FCS) with an integral number of \;octets (FCS error) or a bad FCS with a non-integral number \;of octets (alignment error).\;" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="ether_stats_undersize_pkts_high" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS \;octets) and were otherwise well formed.\;" access="RO" offset="0x28.0" size="0x4.0" />
-	<field name="ether_stats_undersize_pkts_low" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS \;octets) and were otherwise well formed.\;" access="RO" offset="0x2C.0" size="0x4.0" />
+	<field name="ether_stats_crc_align_errors_high" descr="e total number of packets received that had a length (exclud\;ing framing bits, but including FCS octets) of between 64 and \;MTU octets, inclusive, but had either a bad frame check \;sequence (FCS) with an integral number of octets (FCS \;error) or a bad FCS with a non-integral number of octets \;(alignment error).\;" access="RO" offset="0x20.0" size="0x4.0" />
+	<field name="ether_stats_crc_align_errors_low" descr="e total number of packets received that had a length (exclud\;ing framing bits, but including FCS octets) of between 64 and \;MTU octets, inclusive, but had either a bad frame check \;sequence (FCS) with an integral number of octets (FCS \;error) or a bad FCS with a non-integral number of octets \;(alignment error).\;" access="RO" offset="0x24.0" size="0x4.0" />
+	<field name="ether_stats_undersize_pkts_high" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS octets) \;and were otherwise well formed.\;" access="RO" offset="0x28.0" size="0x4.0" />
+	<field name="ether_stats_undersize_pkts_low" descr="The total number of packets received that were less than 64 \;octets long (excluding framing bits, but including FCS octets) \;and were otherwise well formed.\;" access="RO" offset="0x2C.0" size="0x4.0" />
 	<field name="ether_stats_oversize_pkts_high" descr="The total number of packets received that were longer than \;MTU octets (excluding framing bits, but including FCS \;octets) but were otherwise well formed.\;" access="RO" offset="0x30.0" size="0x4.0" />
 	<field name="ether_stats_oversize_pkts_low" descr="The total number of packets received that were longer than \;MTU octets (excluding framing bits, but including FCS \;octets) but were otherwise well formed.\;" access="RO" offset="0x34.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_high" descr="he number of times the receiving media is non-idle (a car\;rier event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one \;occurrence of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;" access="RO" offset="0x38.0" size="0x4.0" />
-	<field name="dot3stats_symbol_errors_low" descr="he number of times the receiving media is non-idle (a car\;rier event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one \;occurrence of an event that causes the PHY to indicate \;&quot;Receive Error&quot;.\;" access="RO" offset="0x3C.0" size="0x4.0" />
-	<field name="dot3in_pause_frames_high" descr="A count of MAC Control frames received with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x40.0" size="0x4.0" />
-	<field name="dot3in_pause_frames_low" descr="A count of MAC Control frames received with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x44.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_high" descr="he number of times the receiving media is non-idle (a carrier \;event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one occur\;rence of an event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;" access="RO" offset="0x38.0" size="0x4.0" />
+	<field name="dot3stats_symbol_errors_low" descr="he number of times the receiving media is non-idle (a carrier \;event) for a period of time equal to or greater than min\;FrameSize, and during which there was at least one occur\;rence of an event that causes the PHY to indicate &quot;Receive \;Error&quot;.\;" access="RO" offset="0x3C.0" size="0x4.0" />
+	<field name="dot3in_pause_frames_high" descr="A count of MAC Control frames received with an opcode indi\;cating the PAUSE operation.\;" access="RO" offset="0x40.0" size="0x4.0" />
+	<field name="dot3in_pause_frames_low" descr="A count of MAC Control frames received with an opcode indi\;cating the PAUSE operation.\;" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_high" descr="A count of MAC Control frames received that contain an \;opcode that is not supported.\;" access="RO" offset="0x48.0" size="0x4.0" />
 	<field name="dot3control_in_unknown_opcodes_low" descr="A count of MAC Control frames received that contain an \;opcode that is not supported.\;" access="RO" offset="0x4C.0" size="0x4.0" />
 	<field name="if_out_ucast_pkts_high" descr="The total number of packets that higher-level protocols \;requested be transmitted and were not addressed to a mul\;ticast or broadcast MAC address, including those that were \;discarded or not sent.\;\;" access="RO" offset="0x50.0" size="0x4.0" />
@@ -1287,8 +1323,8 @@
 	<field name="if_out_octets_low" descr="The total number of octets transmitted out of the interface, \;including framing characters.\;" access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="dot3out_pause_frames_high" descr="A count of MAC Control frames transmitted with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x60.0" size="0x4.0" />
 	<field name="dot3out_pause_frames_low" descr="A count of MAC Control frames transmitted with an opcode \;indicating the PAUSE operation.\;" access="RO" offset="0x64.0" size="0x4.0" />
-	<field name="if_out_errors_high" descr="The number of outbound packets that could not be trans\;mitted because of errors.\;" access="RO" offset="0x68.0" size="0x4.0" />
-	<field name="if_out_errors_low" descr="The number of outbound packets that could not be trans\;mitted because of errors.\;" access="RO" offset="0x6C.0" size="0x4.0" />
+	<field name="if_out_errors_high" descr="The number of outbound packets that could not be transmit\;ted because of errors.\;" access="RO" offset="0x68.0" size="0x4.0" />
+	<field name="if_out_errors_low" descr="The number of outbound packets that could not be transmit\;ted because of errors.\;" access="RO" offset="0x6C.0" size="0x4.0" />
 	<field name="phy_time_since_last_clear_high" descr="The time passed since the last phy counters clear event in \;msec." access="RO" offset="0x70.0" size="0x4.0" />
 	<field name="phy_time_since_last_clear_low" descr="The time passed since the last phy counters clear event in \;msec." access="RO" offset="0x74.0" size="0x4.0" />
 	<field name="phy_received_bits_high" descr="This counter provides information on the total amount of \;traffic (bits) received." access="RO" offset="0x78.0" size="0x4.0" />
@@ -1300,8 +1336,8 @@
 <node name="eth_per_prio_grp_data_layout_ext" descr="" size="0xf8.0" >
 	<field name="rx_octets_high" descr="The total number of octets received, including framing char\;acters.\;" access="RO" offset="0x0.0" size="0x4.0" />
 	<field name="rx_octets_low" descr="The total number of octets received, including framing char\;acters.\;" access="RO" offset="0x4.0" size="0x4.0" />
-	<field name="rx_frames_high" descr="The total number of packets received for this priority \;(including control frames).\;\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="rx_frames_low" descr="The total number of packets received for this priority \;(including control frames).\;\;" access="RO" offset="0x24.0" size="0x4.0" />
+	<field name="rx_frames_high" descr="The total number of packets received for this priority (includ\;ing control frames).\;\;" access="RO" offset="0x20.0" size="0x4.0" />
+	<field name="rx_frames_low" descr="The total number of packets received for this priority (includ\;ing control frames).\;\;" access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="tx_octets_high" descr="The total number of octets transmitted, including framing \;characters.\;\;\;" access="RO" offset="0x28.0" size="0x4.0" />
 	<field name="tx_octets_low" descr="The total number of octets transmitted, including framing \;characters.\;\;\;" access="RO" offset="0x2C.0" size="0x4.0" />
 	<field name="tx_frames_high" descr="The total number of packets transmitted.\;\;\;" access="RO" offset="0x48.0" size="0x4.0" />
@@ -1367,20 +1403,58 @@
 </node>
 
 <node name="fgcr_ext" descr="" size="0x10.0" >
+	<field name="flat_offset" descr="Indicates Primary-Secondary lines offset in General Pur\;pose SRAM when using atomic option.\;Default value is 8 .\;Supported from Spectrum-4 and above." access="RW" offset="0x0.0" size="0x0.8" />
 </node>
 
 <node name="fid_router_ext" descr="" size="0x18.0" >
-	<field name="fid" descr="FID\;Used to connect a bridge to the router. \;When ubridge = 0 only FIDs from the vFID range are \;supported\;Note: when ubridge = 1 this is the egress-fid for \;router to bridge\;" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="fid" descr="FID\;Used to connect a bridge to the router. \;When ubridge = 0 only FIDs from the vFID range \;are supported\;Note: when ubridge = 1 this is the egress-fid for \;router to bridge\;" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="swid" descr="Switch Partition ID" access="RW" offset="0x0.24" size="0x0.8" />
-	<field name="router_interface_mac_47_32" descr="Router interface MAC address.\;Note: in SwitchX silicon family, all router interfaces \;on the same switch partition MUST have the same \;MAC address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses must have \;the same 36 MSBits" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="router_interface_mac_47_32" descr="Router interface MAC address.\;Note: in SwitchX silicon family, all router interfaces \;on the same switch partition MUST have the same \;MAC address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses must \;have the same 36 MSBits" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="mac_profile_id" descr="MAC msb profile ID\;range 0 .. cap_max_rif_mac_profile-1\;Reserved when Spectrum" access="RW" offset="0x8.16" size="0x0.4" />
-	<field name="router_interface_mac_31_0" descr="Router interface MAC address.\;Note: in SwitchX silicon family, all router interfaces \;on the same switch partition MUST have the same \;MAC address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses must have \;the same 36 MSBits" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="vrrp_id_ipv4" descr="VRRP ID for IPv4\;Reserved when SwitchX/-2. The MAD address should \;be entered to the FDB" access="RW" offset="0x14.0" size="0x0.8" />
-	<field name="vrrp_id_ipv6" descr="VRRP ID for IPv6\;Reserved when SwitchX/-2. The MAD address should \;be entered to the FDB" access="RW" offset="0x14.8" size="0x0.8" />
+	<field name="router_interface_mac_31_0" descr="Router interface MAC address.\;Note: in SwitchX silicon family, all router interfaces \;on the same switch partition MUST have the same \;MAC address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses must \;have the same 36 MSBits" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="vrrp_id_ipv4" descr="VRRP ID for IPv4\;Reserved when SwitchX/-2. The MAD address \;should be entered to the FDB" access="RW" offset="0x14.0" size="0x0.8" />
+	<field name="vrrp_id_ipv6" descr="VRRP ID for IPv6\;Reserved when SwitchX/-2. The MAD address \;should be entered to the FDB" access="RW" offset="0x14.8" size="0x0.8" />
+</node>
+
+<node name="flush_mc_dmac_uc_and_fid_ext" descr="" size="0x8.0" >
+	<field name="fid" descr="When ubridge = 0, for router sub-port interface, FID is cap_\;fid + rif \;Otherwise, valid range is 1..cap_fid-1" access="INDEX" offset="0x4.0" size="0x0.16" />
+</node>
+
+<node name="flush_per_fid_ext" descr="" size="0x8.0" >
+	<field name="fid" descr="When ubridge = 0, for router sub-port interface, FID is cap_\;fid + rif \;Otherwise, valid range is 1..cap_fid-1" access="INDEX" offset="0x4.0" size="0x0.16" />
+</node>
+
+<node name="flush_per_lag_and_fid_ext" descr="" size="0x8.0" >
+	<field name="lag_id" descr="" access="INDEX" offset="0x0.0" size="0x0.10" />
+	<field name="fid" descr="" access="INDEX" offset="0x4.0" size="0x0.16" />
 </node>
 
-<node name="flex_goto_action_ext" descr="" size="0x4.0" >
-	<field name="next_action_set_ptr" descr="Pointer to KVH Linear\;range is 0 .. (cap_max_kvd_action_sets-1)" access="RW" offset="0x0.0" size="0x0.24" />
+<node name="flush_per_lag_ext" descr="" size="0x8.0" >
+	<field name="lag_id" descr="" access="INDEX" offset="0x4.0" size="0x0.10" />
+</node>
+
+<node name="flush_per_nve_and_fid_ext" descr="" size="0x8.0" >
+	<field name="fid" descr="When ubridge = 0, for router sub-port interface, FID is cap_\;fid + rif \;Otherwise, valid range is 1..cap_fid-1" access="INDEX" offset="0x4.0" size="0x0.16" />
+</node>
+
+<node name="flush_per_port_and_fid_ext" descr="" size="0x8.0" >
+	<field name="system_port" descr="" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="fid" descr="" access="INDEX" offset="0x4.0" size="0x0.16" />
+</node>
+
+<node name="flush_per_port_ext" descr="" size="0x8.0" >
+	<field name="system_port" descr="" access="INDEX" offset="0x4.0" size="0x0.16" />
+</node>
+
+<node name="flush_per_tunnel_port_ext" descr="" size="0x8.0" >
+	<field name="tport" descr="bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="tport_mask" descr="When bit i is set, the tport[i] will be matched, otherwise \;ignored\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1" access="INDEX" offset="0x0.16" size="0x0.4" />
+</node>
+
+<node name="flush_per_tunnel_port_fid_ext" descr="" size="0x8.0" >
+	<field name="tport" descr="bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="tport_mask" descr="When bit i is set, the tport[i] will be matched, otherwise \;ignored\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1" access="INDEX" offset="0x0.16" size="0x0.4" />
+	<field name="fid" descr="fid" access="INDEX" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="fmep_ext" descr="" size="0x8.0" >
@@ -1390,16 +1464,31 @@
 	<field name="ext_mod_parsing" descr="Extended parsing for modifier.\;Units of 1B.\;Granularity of 2B.\;Default 0.\;" access="RW" offset="0x4.0" size="0x0.9" />
 </node>
 
-<node name="fmtc_ext" descr="" size="0x44.0" >
+<node name="fmtb_ext" descr="" size="0x1c.0" >
+	<field name="prog_idx" descr="program id" access="INDEX" offset="0x0.0" size="0x0.2" />
+	<field name="enable" descr="0: Program is not active \;1: Program is active \;\;Note:\;In order to program to run we need to enable \;FMTB.enable &amp; FMTPA.e" access="RW" offset="0x4.0" size="0x0.1" />
+	<field name="type" descr="0: EMT\;1: RAM" access="RW" enum="EMT=0x0,RAM=0x1" offset="0x10.0" size="0x0.2" />
+	<field name="bind_info" descr="See Table 2753, &quot;BINDING INFO layout,&quot; on \;page 2916\;See Table 2755, &quot;RAM BINDING INFO layout,&quot; on \;page 2916" subnode="uint64" access="RW" offset="0x14.0" size="0x8.0" />
+</node>
+
+<node name="fmtc_ext" descr="" size="0x4c.0" >
 	<field name="emt_index" descr="EMT (Egress Modifier Template) index\;Range 0 .. cap_max_emts - 1" access="INDEX" offset="0x0.0" size="0x0.8" />
+	<field name="length_cb_mask" descr="Bit mask on Custom Byte chosen by length_cb\;Note: the mask does not have to have serial 0&quot;s or serial \;1&quot;s\;Supported from Spectrum-4 an on" access="RW" offset="0x4.0" size="0x0.8" />
+	<field name="length_cb" descr="Custom Byte used for length calculation\;Range 0..2*cap_max_custom_byte_sets_for_hash - 1\;Supported from Spectrum-4 an on" access="RW" offset="0x4.8" size="0x0.8" />
 	<field name="length" descr="Length of template (constant add)\;Units of words (word = 2Bytes)\;Range 0.. cap_max_emt_size - 1" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="length_math_shift" descr="Value for shifting (multiplying/dividing) of Length\;Range 0 .. 7\;Supported from Spectrum-4 an on" access="RW" offset="0x8.16" size="0x0.3" />
+	<field name="length_math_shift_left" descr="Length shift left:\;0: shift left (multiply)\;1: shift right (division)\;Supported from Spectrum-4 an on" access="RW" offset="0x8.20" size="0x0.1" />
+	<field name="length_math_add_pos" descr="length_math_add adds or subtract:\;0: add length\;1: subtract length\;Applies both to non-bitmap and bitmap modes\;Supported from Spectrum-4 an on" access="RW" offset="0x8.24" size="0x0.1" />
+	<field name="length_math_bitmap" descr="Length is bitmap mode:\;0: length packet field holds a value\;1: length packet field is a bitmap\;Supported from Spectrum-4 an on" access="RW" offset="0x8.28" size="0x0.1" />
 	<field name="update_ipv4_length" descr="Has effect only when the template is bound as a push tem\;plate" access="RW" offset="0x10.0" size="0x0.1" />
 	<field name="update_ipv6_length" descr="Has effect only when the template is bound as a push tem\;plate" access="RW" offset="0x10.1" size="0x0.1" />
 	<field name="update_hbh_length" descr="Has effect only when the template is bound as a push tem\;plate" access="RW" offset="0x10.2" size="0x0.1" />
+	<field name="update_ipv4_ihl" descr="Update IPv4 length\;Supported from Spectrum-4 an on" access="RW" offset="0x10.3" size="0x0.1" />
 	<field name="update_udp_tcp_length" descr="Has effect only when the template is bound as a push tem\;plate\;" access="RW" offset="0x10.4" size="0x0.1" />
 	<field name="update_geneve_length" descr="Has effect only when the template is bound as a push tem\;plate" access="RW" offset="0x10.8" size="0x0.1" />
 	<field name="clear_udp_cs" descr="Clear UDP checksum\;0: UDP checksum not set to 0\;1: UDP checksum set to 0" access="RW" offset="0x14.0" size="0x0.1" />
 	<field name="update_udp_tcp_cs" descr="Update UDP or TCP checksum" access="RW" offset="0x14.4" size="0x0.1" />
+	<field name="update_ipv4_cs" descr="Update IPv4 checksum\;Supported from Spectrum-4 an on" access="RW" offset="0x14.5" size="0x0.1" />
 	<field name="max_latency" descr="Latency is invalid if:\;packet_latency (nSec) &gt; (max_latency * 2^24) or \;packet_latency (nSec) &gt; 4Sec\;Range 1..256\;" access="RW" offset="0x20.0" size="0x0.9" />
 	<field name="latency_invalid_value" descr="When latency is invalid the value is latency_invalid_value" access="RW" offset="0x24.0" size="0x4.0" />
 	<field name="buffer_fill_level_invalid_value" descr="When buffer_fill_level is invalid the value is buffer_\;fill_level_invalid_value\;Valid values:\;0xFFFF_FFFF \;Or\;0x7FFF_FFFF \;" access="RW" offset="0x28.0" size="0x4.0" />
@@ -1410,14 +1499,20 @@
 	<field name="enc_next_header" descr="For L2 and for L3 flex gen_enc:\;Next header field (a.k.a. protocol in IPv4" access="RW" offset="0x3C.16" size="0x0.8" />
 	<field name="enc_fl_suffix" descr="For L2, L3 Tunnel Encapsulation: Flow Label Suffix\;For Tunnel encapsulation the 8 least significant bits are \;calculated as follow:\;enc_flh=0: 8 lsb = enc_fl_suffix\;enc_flh=1: 8 lsb = enc_fl_suffix | hash [7:0] (bitwise OR)\;Reserved when enc_flh = 1" access="RW" offset="0x40.0" size="0x0.8" />
 	<field name="enc_fl_prefix" descr="For L2, L3 Tunnel Encapsulation: Flow Label Prefix\;For Tunnel encapsulation: Constant 12 most significant \;bits of the flow label." access="RW" offset="0x40.8" size="0x0.12" />
-	<field name="enc_flh" descr="For L2, L3 Tunnel Encapsulation: Flow Label Hash\;For Tunnel encapsulation:\;0: Flow Label is static, by {enc_fl_prefix, enc_fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash bitwise OR with enc_fl_suffix, and 12msb are \;configured by enc_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configu\;ration Register&quot;, on page 2766, Section 13.11.8, \;&quot;RECR_V2 - Router ECMP Configuration Version 2 \;Register&quot;, on page 2768" access="RW" offset="0x40.24" size="0x0.1" />
+	<field name="enc_flh" descr="For L2, L3 Tunnel Encapsulation: Flow Label Hash\;For Tunnel encapsulation:\;0: Flow Label is static, by {enc_fl_prefix, enc_fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash bitwise OR with enc_fl_suffix, and 12msb are \;configured by enc_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configu\;ration Register&quot;, on page 2554, Section 13.11.8, \;&quot;RECR_V2 - Router ECMP Configuration Version 2 \;Register&quot;, on page 2556" access="RW" offset="0x40.24" size="0x0.1" />
 	<field name="enc_flc" descr="For L2, L3 Tunnel encapsulation: Flow Label Copy from \;inner \;0: Calculate flow label using enc_flh.\;1: If packet is IPv6 and encapsulation is IPv6, copy the \;whole flow label from the packet header. Otherwise, cal\;culate flow label using enc_flh." access="RW" offset="0x40.25" size="0x0.1" />
+	<field name="s0_base_address" descr="SRAM 0 Base Address\;Range 0 .. (max_cap_gp_sram_size-1)\;Supported from Spectrum-4 and above." access="RW" offset="0x44.0" size="0x0.9" />
+	<field name="s0_sel_mode" descr="SRAM 0 Selected By Mode\;0: Flat\;\;\;Supported from Spectrum-4 and above." access="RW" offset="0x44.16" size="0x0.3" />
+	<field name="s0_eg_tc_cnt" descr="SRAM 0 Egress Traffic Class Count\;Supported from Spectrum-4 and above.\;Reserved when s0_sel_mode != (3)." access="RW" offset="0x44.24" size="0x0.4" />
+	<field name="s1_base_address" descr="SRAM 1 Base Address\;Range 0 .. (max_cap_gp_sram_size-1)\;Supported from Spectrum-4 and above." access="RW" offset="0x48.0" size="0x0.9" />
+	<field name="s1_sel_mode" descr="SRAM 1 Selected By Mode\;0: Flat\;\;\;Supported from Spectrum-4 and above." access="RW" offset="0x48.16" size="0x0.3" />
+	<field name="s1_eg_tc_cnt" descr="SRAM 1 Egress Traffic Class Count\;Supported from Spectrum-4 and above.\;Reserved when s1_sel_mode != (3)." access="RW" offset="0x48.24" size="0x0.4" />
 </node>
 
 <node name="fmte_ext" descr="" size="0x14.0" >
 	<field name="emt_index" descr="EMT (Egress Modifier Template) index\;Range 0 .. cap_max_emts - 1" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="entry_index" descr="Entry index in the EMT\;Range 0 .. cap_max_emt_size - 1\;Note that entry_index&apos;s which are larger than the emt \;length have no significance" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="cmd_id" descr="Command ID\;See Table 2505, &quot;EMT Commands,&quot; on page 3083\;Reserved when edit_en = 0" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="cmd_id" descr="Command ID\;See Table 2718, &quot;EMT Commands,&quot; on page 2877\;Reserved when edit_en = 0" access="RW" offset="0x8.0" size="0x0.8" />
 	<field name="imm" descr="Immediate\;Reserved when edit_en = 0" access="RW" offset="0xC.0" size="0x0.16" />
 	<field name="edit_en" descr="Edit enable:\;0: Skip this word in the packet\;1: Edit this word in the packet\;Has effect only when the template is bound as an edit \;template.\;Note that edit_en for words after FMTC.length must be set \;to &apos;0&apos;" access="RW" offset="0x10.0" size="0x0.1" />
 </node>
@@ -1427,6 +1522,24 @@
 	<field name="emt_index_in" descr="EMT (Egress Modifier Template) \;Range 0 .. cap_max_emts - 1\;Note: there is only 1 mapper! The emt_index_in is not an \;Index\;Default 0" access="RW" offset="0x4.16" size="0x0.8" />
 </node>
 
+<node name="fmtpa_ext" descr="" size="0xc.0" >
+	<field name="prog_idx" descr="Program index" access="INDEX" offset="0x0.0" size="0x0.2" />
+	<field name="lp_msb" descr="Local port [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
+	<field name="local_port" descr="Local port" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="bound_emt" descr="EMT associated to this program\;" access="RW" offset="0x4.0" size="0x0.3" />
+	<field name="e" descr="Enable\;0: Program is not active (on that port)\;1: Program is active (on that port)\;\;Can be changed on the fly" access="RW" offset="0x4.31" size="0x0.1" />
+	<field name="reg0" descr="global registert 0" access="RW" offset="0x8.0" size="0x0.16" />
+</node>
+
+<node name="fmtpc_ext" descr="" size="0x14.0" >
+	<field name="pc" descr="Program counter" access="INDEX" offset="0x0.0" size="0x0.6" />
+	<field name="prog_idx" descr="Program index" access="INDEX" offset="0x0.16" size="0x0.2" />
+	<field name="op_code" descr="operation code. See Table 2748, &quot;Op Codes and \;Params,&quot; on page 2912" access="RW" offset="0x4.0" size="0x0.8" />
+	<field name="operand0" descr="operand 0. See Table 2748, &quot;Op Codes and Params,&quot; \;on page 2912" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="operand1" descr="operand 1. See Table 2748, &quot;Op Codes and Params,&quot; \;on page 2912" access="RW" offset="0xC.0" size="0x0.16" />
+	<field name="operand2" descr="operand 2. See Table 2748, &quot;Op Codes and Params,&quot; \;on page 2912" access="RW" offset="0x10.0" size="0x0.16" />
+</node>
+
 <node name="fore_ext" descr="" size="0xc.0" >
 	<field name="fan_under_limit" descr="Fan speed is below the low limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is below the threshold.\;Bitmask, per bit:\;0: not_under_thr\;1: under_thr" access="RO" offset="0x0.16" size="0x0.10" />
 	<field name="fan_under_limit_msb" descr="Fan speed is below the low limit defined in MFSL register. \;Each bit relates to a single tachometer and indicates the spe\;cific tachometer reading is below the threshold.\;Bitmask, per bit:\;0: not_under_thr\;1: under_thr" access="RO" offset="0x0.26" size="0x0.6" />
@@ -1437,21 +1550,21 @@
 <node name="fpftt_ext" descr="" size="0x14.0" >
 	<field name="entry_index" descr="Entry Index\;Range 0 .. cap_max_flex_transition_table_size -1" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="tran_en" descr="Transition enabled\;default 0" access="RW" offset="0x4.0" size="0x0.1" />
-	<field name="cur_ph" descr="Lookup on current parser header \;See ph_id in table Table 2495, &quot;Parser Headers (PH&apos;s),&quot; \;on page 3050\;Reserved when tran_en = 0\;At least one of cur_ph, next_ph must be of type FPH" access="RW" offset="0x8.0" size="0x0.8" />
-	<field name="next_protocol_value" descr="Lookup on next protocol field for the current parser \;header\;See &quot;next_protocol field&quot; and &quot;next_protocol width (bits)&quot; \;columns in table Table 2495, &quot;Parser Headers (PH&apos;s),&quot; \;on page 3050\;The msb after the allowed width (bits) must be &apos;0&apos;\;Reserved when tran_en = 0" access="RW" offset="0xC.0" size="0x0.16" />
-	<field name="next_ph" descr="Next parser header\;See ph_id in table Table 2495, &quot;Parser Headers (PH&apos;s),&quot; \;on page 3050\;Reserved when tran_en = 0" access="RW" offset="0x10.0" size="0x0.8" />
+	<field name="cur_ph" descr="Lookup on current parser header \;See ph_id in table Table 2708, &quot;Parser Headers (PH&apos;s),&quot; \;on page 2844\;Reserved when tran_en = 0\;At least one of cur_ph, next_ph must be of type FPH" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="next_protocol_value" descr="Lookup on next protocol field for the current parser \;header\;See &quot;next_protocol field&quot; and &quot;next_protocol width (bits)&quot; \;columns in table Table 2708, &quot;Parser Headers (PH&apos;s),&quot; \;on page 2844\;The msb after the allowed width (bits) must be &apos;0&apos;\;Reserved when tran_en = 0" access="RW" offset="0xC.0" size="0x0.16" />
+	<field name="next_ph" descr="Next parser header\;See ph_id in table Table 2708, &quot;Parser Headers (PH&apos;s),&quot; \;on page 2844\;Reserved when tran_en = 0" access="RW" offset="0x10.0" size="0x0.8" />
 	<field name="next_ph_inner" descr="Next header fields and fields of all subsequent header are \;inner fields\;Reserved when tran_en = 0\;" access="RW" offset="0x10.16" size="0x0.1" />
 </node>
 
 <node name="fphhc_ext" descr="" size="0xc.0" >
-	<field name="hph" descr="Hard Parser Header (HPH)\;See Table 2495, &quot;Parser Headers (PH&apos;s),&quot; on \;page 3050\;Reserved when PHs are &quot;is FPH&quot;" access="INDEX" offset="0x0.0" size="0x0.8" />
+	<field name="hph" descr="Hard Parser Header (HPH)\;See Table 2708, &quot;Parser Headers (PH&apos;s),&quot; on \;page 2844\;Reserved when PHs are &quot;is FPH&quot;" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="my_ftlv_fpp" descr="Flex Parser Program (FPP) which will parse the FTLV of \;current HPH\;Range 0 .. cap_max_flex_fpp - 1\;Reserved when my_ftlv_outer_en=0 AND my_ftlv_in\;ner_en=0" access="RW" offset="0x8.0" size="0x0.8" />
 	<field name="my_ftlv_inner_en" descr="Enable flex tlv from current HPH when inner\;Reserved when PHs are not &quot;can have my_ftlv&quot;\;" access="RW" offset="0x8.30" size="0x0.1" />
 	<field name="my_ftlv_outer_en" descr="Enable flex tlv from current HPH when outer\;Reserved when PHs are not &quot;can have my_ftlv&quot;" access="RW" offset="0x8.31" size="0x0.1" />
 </node>
 
 <node name="fphtt_ext" descr="" size="0x8.0" >
-	<field name="entry_index" descr="Entry Index\;Must be from the Hard Transition Table\;See Table 2497, &quot;Hard Transition Table,&quot; on \;page 3056" access="INDEX" offset="0x0.0" size="0x0.8" />
+	<field name="entry_index" descr="Entry Index\;Must be from the Hard Transition Table\;See Table 2710, &quot;Hard Transition Table,&quot; on \;page 2850" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="tran_en" descr="Transition enabled\;0: Disabled\;1: Enabled\;Defaults are defined in the hard transition table" access="RW" offset="0x4.0" size="0x0.1" />
 </node>
 
@@ -1459,11 +1572,11 @@
 	<field name="fpp" descr="Flex Parser Program (FPP)\;Range 0 .. cap_max_flex_fpp - 1" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="as_ftlv" descr="Flex Parser Header function:\;0: FPH\;1: FTLV\;When FPH: FPH index = fpp. e.g. if fpp = 2 then FPH2" access="RW" offset="0x0.28" size="0x0.1" />
 	<field name="empty_fph" descr="FPH is empty\;When empty: \;- header_length value is 0\;- no flex extraction points\;- no my_tlv from this FPH\;- next_protocol may be extracted\;Reserved when as_ftlv = 1" access="RW" offset="0x4.0" size="0x0.1" />
-	<field name="protocol" descr="Protocol:\;When as_ftlv = 0: next_protocol\;When as_ftlv = 1: tlv_type\;See Table 2515, &quot;Protocol Union Layout,&quot; on \;page 3103" subnode="fppc_protocol_union_ext" access="RW" offset="0x10.0" size="0x10.0" />
-	<field name="header_length" descr="FPH or FTLV length\;See Table 2517, &quot;Header_length Union Layout,&quot; on \;page 3104\;Reserved when empty_fph = 1" subnode="fppc_header_length_ext" access="RW" offset="0x20.0" size="0x10.0" />
-	<field name="fexp_st" descr="Flexible extraction points from start of header\;See Table 2519, &quot;fexp_st Union Layout,&quot; on page 3106\;Reserved when empty_fph = 1" subnode="fppc_fexp_st_ext" access="RW" offset="0x30.0" size="0x10.0" />
-	<field name="fexp_of" descr="Flexible extraction points in an offset in the header\;See Table 2521, &quot;fexp_of Union Layout,&quot; on page 3107\;Reserved when empty_fph = 1" subnode="fppc_fexp_of_ext" access="RW" offset="0x40.0" size="0x10.0" />
-	<field name="my_tlv" descr="My TLV\;See Table 2523, &quot;My_TLV Union Layout,&quot; on \;page 3109\;Reserved when as_ftlv = 1\;Reserved when empty_fph = 1" subnode="fppc_my_tlv_ext" access="RW" offset="0x50.0" size="0x10.0" />
+	<field name="protocol" descr="Protocol:\;When as_ftlv = 0: next_protocol\;When as_ftlv = 1: tlv_type\;See Table 2728, &quot;Protocol Union Layout,&quot; on \;page 2899" subnode="fppc_protocol_union_ext" access="RW" offset="0x10.0" size="0x10.0" />
+	<field name="header_length" descr="FPH or FTLV length\;See Table 2730, &quot;Header_length Union Layout,&quot; on \;page 2900\;Reserved when empty_fph = 1" subnode="fppc_header_length_ext" access="RW" offset="0x20.0" size="0x10.0" />
+	<field name="fexp_st" descr="Flexible extraction points from start of header\;See Table 2732, &quot;fexp_st Union Layout,&quot; on page 2902\;Reserved when empty_fph = 1" subnode="fppc_fexp_st_ext" access="RW" offset="0x30.0" size="0x10.0" />
+	<field name="fexp_of" descr="Flexible extraction points in an offset in the header\;See Table 2734, &quot;fexp_of Union Layout,&quot; on page 2903\;Reserved when empty_fph = 1" subnode="fppc_fexp_of_ext" access="RW" offset="0x40.0" size="0x10.0" />
+	<field name="my_tlv" descr="My TLV\;See Table 2736, &quot;My_TLV Union Layout,&quot; on \;page 2905\;Reserved when as_ftlv = 1\;Reserved when empty_fph = 1" subnode="fppc_my_tlv_ext" access="RW" offset="0x50.0" size="0x10.0" />
 </node>
 
 <node name="fppc_fexp_of_ext" descr="" size="0x10.0" >
@@ -1515,7 +1628,7 @@
 	<field name="local_port" descr="Receive local port\;Reserved when global = 1" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="global" descr="Configure all ports:\;0: per port\;1: global\;When read from global then read from local_port 1\;" access="INDEX" offset="0x0.31" size="0x0.1" />
 	<field name="tran_type" descr="Transition type:\;0: Start parsing MAC - default\;1: Start parsing Flex" access="RW" offset="0x4.0" size="0x0.4" />
-	<field name="next_ph" descr="Next parser header, must be FPH\;See ph_id in table Table 2495, &quot;Parser Headers (PH&apos;s),&quot; \;on page 3050\;Reserved when tran_type = 0" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="next_ph" descr="Next parser header, must be FPH\;See ph_id in table Table 2708, &quot;Parser Headers (PH&apos;s),&quot; \;on page 2844\;Reserved when tran_type = 0" access="RW" offset="0x8.0" size="0x0.8" />
 </node>
 
 <node name="fpums_ext" descr="" size="0x50.0" >
@@ -1527,6 +1640,13 @@
 	<field name="port_mask" descr="Port mask:\;List of local_port to set\;per bit:\;0: don&apos;t set\;1: set\;Reserved when global != 2\;Reserved when get" access="INDEX" high_bound="15" low_bound="0" offset="0x10.0" size="0x40.0" />
 </node>
 
+<node name="frar_info_ext" descr="" size="0x10.0" >
+	<field name="sram_id" descr="0: SRAM 0\;1: SRAM 1\;2-3: Reserved" access="INDEX" offset="0x0.0" size="0x0.2" />
+	<field name="sram_base_offset" descr="SRAM Base Offset" access="INDEX" offset="0x0.8" size="0x0.9" />
+	<field name="size" descr="size bitmask \;Granularity of 2B (word) per bit" access="OP" offset="0x4.0" size="0x0.4" />
+	<field name="data" descr="Data to store to SRAM" access="RW" high_bound="3" low_bound="0" offset="0x8.16" size="0x8.0" />
+</node>
+
 <node name="fw_assert_ext" descr="" size="0xa0.0" >
 	<field name="assert_var0" descr="This is the 1st variable passed to assert" access="RO" offset="0x0.0" size="0x4.0" />
 	<field name="assert_var1" descr="This is the 2nd variable passed to assert" access="RO" offset="0x4.0" size="0x4.0" />
@@ -1559,8 +1679,8 @@
 <node name="hcot_ext" descr="" size="0x30.0" >
 	<field name="trap_id" descr="Trap_id\;Allowed trap_id&apos;s:\;240h..243h: CONFT_SWITCH_0..3\;250h..253h: CONFT_ROUTER_0..3\;260h..263h: CONFT_SWITCH_ENC_0..3\;270h..273h: CONFT_SWITCH_DEC_0..3 // overlay switch" access="INDEX" offset="0x0.0" size="0x0.10" />
 	<field name="key_type" descr="Key types:\;0: ethertype\;1: next_proto\;2: layer4_port\;3: icmp_igmp_type" access="RW" enum="ethertype=0x0,next_proto=0x1,layer4_port=0x2,icmp_igmp_type=0x3" offset="0x4.0" size="0x0.8" />
-	<field name="key" descr="Used bits according to key_type.\;E.g. when key_type=0 then only 16 lsb are used\;if key_type=0 then the key is explained in Table 242, \;&quot;HCOT Key_type Ethertype Layout,&quot; on page 484\;if key_type=1 then the key is explained in Table 244, \;&quot;HCOT Key_type Next_proto Layout,&quot; on page 485\;if key_type=2 then the key is explained in Table 246, \;&quot;HCOT Key_type layer4_port Layout,&quot; on page 486\;if key_type=3 then the key is explained in Table 248, \;&quot;HCOT Key_type Icmp_Igmp_Type Layout,&quot; on \;page 487\;" subnode="hcot_key_auto_ext" access="RW" offset="0x10.0" size="0x10.0" union_selector="$(parent).key_type" />
-	<field name="mask" descr="Note: all fields must have a mask with the same value for \;the whole field. Example etherype field which is 16bits \;must have all 16bits with same mask value\;if key_type=0 then the mask is explained in Table 242, \;&quot;HCOT Key_type Ethertype Layout,&quot; on page 484\;if key_type=1 then the mask is explained in Table 244, \;&quot;HCOT Key_type Next_proto Layout,&quot; on page 485\;if key_type=2 then the mask is explained in Table 246, \;&quot;HCOT Key_type layer4_port Layout,&quot; on page 486\;if key_type=3 then the mask is explained in Table 248, \;&quot;HCOT Key_type Icmp_Igmp_Type Layout,&quot; on \;page 487" subnode="hcot_mask_auto_ext" access="RW" offset="0x20.0" size="0x10.0" union_selector="$(parent).key_type" />
+	<field name="key" descr="Used bits according to key_type.\;E.g. when key_type=0 then only 16 lsb are used\;if key_type=0 then the key is explained in Table 292, \;&quot;HCOT Key_type Ethertype Layout,&quot; on page 537\;if key_type=1 then the key is explained in Table 294, \;&quot;HCOT Key_type Next_proto Layout,&quot; on page 538\;if key_type=2 then the key is explained in Table 296, \;&quot;HCOT Key_type layer4_port Layout,&quot; on page 539\;if key_type=3 then the key is explained in Table 298, \;&quot;HCOT Key_type Icmp_Igmp_Type Layout,&quot; on \;page 540\;" subnode="hcot_key_auto_ext" access="RW" offset="0x10.0" size="0x10.0" union_selector="$(parent).key_type" />
+	<field name="mask" descr="Note: all fields must have a mask with the same value for \;the whole field. Example etherype field which is 16bits \;must have all 16bits with same mask value\;if key_type=0 then the mask is explained in Table 292, \;&quot;HCOT Key_type Ethertype Layout,&quot; on page 537\;if key_type=1 then the mask is explained in Table 294, \;&quot;HCOT Key_type Next_proto Layout,&quot; on page 538\;if key_type=2 then the mask is explained in Table 296, \;&quot;HCOT Key_type layer4_port Layout,&quot; on page 539\;if key_type=3 then the mask is explained in Table 298, \;&quot;HCOT Key_type Icmp_Igmp_Type Layout,&quot; on \;page 540" subnode="hcot_mask_auto_ext" access="RW" offset="0x20.0" size="0x10.0" union_selector="$(parent).key_type" />
 </node>
 
 <node name="hcot_key_auto_ext" descr="" attr_is_union="1" size="0x10.0" >
@@ -1628,7 +1748,7 @@
 </node>
 
 <node name="hmcb_ext" descr="" size="0x10.0" >
-	<field name="mc_index" descr="Index to the start point in the database where there are \;pointers to multicast identifiers.\;For Spectrum: index to KVD Central Database, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; (page 3375)" access="RW" offset="0x4.0" size="0x0.24" />
+	<field name="mc_index" descr="Index to the start point in the database where there are \;pointers to multicast identifiers.\;For Spectrum: index to KVD Central Database, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; (page 3097)" access="RW" offset="0x4.0" size="0x0.24" />
 </node>
 
 <node name="hmon_ext" descr="" size="0x220.0" >
@@ -1638,7 +1758,7 @@
 	<field name="wqe_of_wrap" descr="WQE overflow wrap around. The wqe_overflow had a wrap \;around\;Reserved when Spectrum-2 and on\;" access="RO" offset="0x4.31" size="0x0.1" />
 	<field name="wqe_overflow_high" descr="WQE overflow for sum of all RDQs\;Spectrum: 8bit rolling counter\;Reserved when Spectrum-2 and on\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="wqe_overflow_low" descr="WQE overflow for sum of all RDQs\;Spectrum: 8bit rolling counter\;Reserved when Spectrum-2 and on\;" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="wqe_overflow_rdq" descr="See Table 232, &quot;HMON - wqe_overflow_rdq Layout,&quot; \;on page 476\;Entries above cap_max_num_rdq are not valid\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum" subnode="uint64" access="RW" high_bound="63" low_bound="0" offset="0x20.0" size="0x200.0" />
+	<field name="wqe_overflow_rdq" descr="See Table 280, &quot;HMON - wqe_overflow_rdq Layout,&quot; \;on page 528\;Entries above cap_max_num_rdq are not valid\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum" subnode="uint64" access="RW" high_bound="63" low_bound="0" offset="0x20.0" size="0x200.0" />
 </node>
 
 <node name="hopf_ext" descr="" size="0x14.0" >
@@ -1658,19 +1778,19 @@
 </node>
 
 <node name="hpkt_ext" descr="" size="0x10.0" >
-	<field name="trap_id" descr="Trap ID to configure. See Table 94, &quot;TRAP IDs,&quot; on page 332.\;Note: A trap_id can only be associated with a single trap_group. \;The SwitchX will associate the trap_id with the last trap_group \;configured.\;Note: for SwitchX/-2, Switch-IB/2 and Spectrum the range is \;0..255." access="INDEX" offset="0x0.0" size="0x0.10" />
+	<field name="trap_id" descr="Trap ID to configure. See Table 124, &quot;TRAP IDs,&quot; on \;page 355.\;Note: A trap_id can only be associated with a single trap_group. \;The SwitchX will associate the trap_id with the last trap_group \;configured.\;Note: for SwitchX/-2, Switch-IB/2 and Spectrum the range is \;0..255." access="INDEX" offset="0x0.0" size="0x0.10" />
 	<field name="trap_group" descr="Trap group configured for trap_id\;Range 0.. cap_max_num_trap_groups - 1\;For Switch-X/2: Range 0.. HCAP.max_num_trap_groups -1\;Reserved when ((action is NOP) and (trap_id is not Soure trap) \;and (trap_id is not Event trap))" access="RW" offset="0x0.12" size="0x0.6" />
-	<field name="action" descr="Action to perform on trap_id\;0: NOP - packet will be forwarded by the switch based on nor\;mal switching rules. The packet may get other traps \;1: TRAP - CPU receives the sole copy\;2: MIRROR_TO_CPU - CPU receives a replica of the packet, \;Reserved when Switch-IB/2 and Quantum. Note that this is not \;a mirror, it is actually &quot;trap and forward&quot;\;3: DISCARD_ERROR\;4: SOFT_DISCARD_ERROR - allows other traps and allows Pol\;icy Engine to set Forward rule. \;Not supported by SwitchX/-2\;5: TRAP_AND_SOFT_DISCARD_ERROR - allows other traps to \;overwrite this trap and allows Policy Engine to set Forward rule. \;Not supported by SwitchX/-2, Switch-IB/2 and Quantum\;6: EXCEPTION_TRAP - CPU receives the sole copy and an error \;is counted. Not supported by SwitchX/-2, Switch-IB/2 and \;Quantum\;7: FWD_DISCARD_ERROR - same as DISCARD_ERROR but \;allows previous traps (if were). \;15: SET_FW_DEFAULT - set the FW_Default value. Must not be \;used for trap_ids which do not have a FW_Default. This value is \;a WO.\;\;This field is reserved when trap_id&apos;s are Source traps, see \;Source trap column in Table 94, &quot;TRAP IDs,&quot; on page 332\;When Event traps - allow only NOP and TRAP, see Event trap \;column in Table 94, &quot;TRAP IDs,&quot; on page 332" access="RW" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,DISCARD_ERROR=0x3,SOFT_DISCARD_ERROR=0x4,TRAP_AND_SOFT_DISCARD_ERROR=0x5,EXCEPTION_TRAP=0x6,FWD_DISCARD_ERROR=0x7,SET_FW_DEFAULT=0xf" offset="0x0.20" size="0x0.4" />
+	<field name="action" descr="Action to perform on trap_id\;0: NOP - packet will be forwarded by the switch based on nor\;mal switching rules. The packet may get other traps \;1: TRAP - CPU receives the sole copy\;2: MIRROR_TO_CPU - CPU receives a replica of the packet, \;Reserved when Switch-IB/2 and Quantum. Note that this is not \;a mirror, it is actually &quot;trap and forward&quot;\;3: DISCARD_ERROR\;4: SOFT_DISCARD_ERROR - allows other traps and allows Pol\;icy Engine to set Forward rule. \;Not supported by SwitchX/-2\;5: TRAP_AND_SOFT_DISCARD_ERROR - allows other traps to \;overwrite this trap and allows Policy Engine to set Forward rule. \;Not supported by SwitchX/-2, Switch-IB/2 and Quantum\;6: EXCEPTION_TRAP - CPU receives the sole copy and an error \;is counted. Not supported by SwitchX/-2, Switch-IB/2 and \;Quantum\;7: FWD_DISCARD_ERROR - same as DISCARD_ERROR but \;allows previous traps (if were). \;15: SET_FW_DEFAULT - set the FW_Default value. Must not be \;used for trap_ids which do not have a FW_Default. This value is \;a WO.\;\;This field is reserved when trap_id&apos;s are Source traps, see \;Source trap column in Table 124, &quot;TRAP IDs,&quot; on page 355\;When Event traps - allow only NOP and TRAP, see Event trap \;column in Table 124, &quot;TRAP IDs,&quot; on page 355" access="RW" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,DISCARD_ERROR=0x3,SOFT_DISCARD_ERROR=0x4,TRAP_AND_SOFT_DISCARD_ERROR=0x5,EXCEPTION_TRAP=0x6,FWD_DISCARD_ERROR=0x7,SET_FW_DEFAULT=0xf" offset="0x0.20" size="0x0.4" />
 	<field name="tr_en" descr="Truncation enabled\;0: no truncation\;1: truncation enabled\;Truncation size is according to HGCR.truncation_size\;Reserved when SwitchX/-2, Switch-IB/2 and Spectrum" access="RW" offset="0x4.0" size="0x0.1" />
-	<field name="tr_prof" descr="[Spectrum-4]\;truncation_profile, values 0,1,2\;reserved when tr_en = 0\;Reserved when devices before Spectrum-4 and before Quan\;tum-2\;" access="RW" offset="0x4.8" size="0x0.2" />
-	<field name="ctrl" descr="Control Packet\;Packets configured as control traffic will use dedicated buffer \;resources. For more details see Section 9.3, &quot;Packet to Buf\;fer Classification&quot;, on page 1997\;0: Keep factory defaults\;1: Do not use control buffer for this Trap-ID\;2: Use control buffer for the Trap-ID\;Note that not all Trap-IDs can use the control buffer. See the \;Control Packet column in Table 94, &quot;TRAP IDs,&quot; on \;page 332Reserved when SwitchX/-2 and Switch-IB/2" access="RW" offset="0x4.16" size="0x0.2" />
+	<field name="tr_prof" descr="[Spectrum-4]\;Host truncation_profile, values 0,1,2. Configured using HGCR. \;See Table 254, &quot;HGCR - Host Global Configuration Regis\;ter Fields,&quot; on page 510\;reserved when tr_en = 0\;Reserved when devices before Spectrum-4 and before Quan\;tum-2\;" access="RW" offset="0x4.8" size="0x0.2" />
+	<field name="ctrl" descr="Control Packet\;Packets configured as control traffic will use dedicated buffer \;resources. For more details see Section 9.3, &quot;Packet to Buf\;fer Classification&quot;, on page 1792\;0: Keep factory defaults\;1: Do not use control buffer for this Trap-ID\;2: Use control buffer for the Trap-ID\;Note that not all Trap-IDs can use the control buffer. See the \;Control Packet column in Table 124, &quot;TRAP IDs,&quot; on \;page 355Reserved when SwitchX/-2 and Switch-IB/2" access="RW" offset="0x4.16" size="0x0.2" />
 </node>
 
 <node name="hrwc_ext" descr="" size="0x220.0" >
 	<field name="crdq" descr="Clear RDQ\;Range 0.. cap_max_num_rdq - 1\;Reserved when clr = 0\;Reserved when cprdq = 0\;Note: all counters are read regardless of cprdq and crdq" access="INDEX" offset="0x0.0" size="0x0.6" />
 	<field name="cprdq" descr="Per RDQ:\;0: CLEAR_ALL: clear all counters of all RDQs\;1: CLEAR_PER_RDQ: clear counter of RQD crdq\;Reserved when clr = 0" access="INDEX" offset="0x0.30" size="0x0.1" />
 	<field name="clr" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="rdq_wqe_counter" descr="See Table 234, &quot;HRWC - Host RDQ WQE Counter Reg\;ister Layout,&quot; on page 478\;Entries above cap_max_num_rdq are not valid" subnode="uint64" access="RW" high_bound="63" low_bound="0" offset="0x20.0" size="0x200.0" />
+	<field name="rdq_wqe_counter" descr="See Table 282, &quot;HRWC - Host RDQ WQE Counter Reg\;ister Layout,&quot; on page 530\;Entries above cap_max_num_rdq are not valid" subnode="uint64" access="RW" high_bound="63" low_bound="0" offset="0x20.0" size="0x200.0" />
 </node>
 
 <node name="htac_ext" descr="" size="0x30.0" >
@@ -1684,11 +1804,11 @@
 	<field name="type" descr="Type:\;0: LOCAL - used for locally attached CPU \;15: NULL - trap group disabled" access="RW" enum="LOCAL=0x0,NULL=0xf" offset="0x0.8" size="0x0.4" />
 	<field name="swid" descr="Switch Partition ID\;Note that event traps have swid value of &apos;254&apos; (all-\;swid)Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="pid" descr="Policer ID for trap group trap_group.\;Host Interface Policers should be allocated out of the Global \;Policers.\;Range is 0..(cap_max_policers_cpu-1)\;Note: the policer affects only packets which are trapped to \;CPU, mirrored packets on trap_group are not subject to \;policer." access="RW" offset="0x4.0" size="0x0.14" />
-	<field name="pide" descr="Policer enable\;For more details about policers, refer to Section 10.7.6, \;&quot;Policer&quot;, on page 2382.\;Note: must not be set for MIRROR_SESSION trap_ids\;" access="RW" offset="0x4.15" size="0x0.1" />
-	<field name="mirror_agent" descr="Mirroring port analyzer ID (pa_id), see Section 4.12.1, \;&quot;MOGCR - Monitoring Global Configuration Register&quot;, \;on page 1120\;Reserved when mirror_action is TRAP_TO_CPU" access="RW" offset="0x8.0" size="0x0.3" />
+	<field name="pide" descr="Policer enable\;For more details about policers, refer to Section 10.7.6, \;&quot;Policer&quot;, on page 2143.\;Note: must not be set for MIRROR_SESSION trap_ids\;" access="RW" offset="0x4.15" size="0x0.1" />
+	<field name="mirror_agent" descr="Mirroring port analyzer ID (pa_id), see Section 4.12.1, \;&quot;MOGCR - Monitoring Global Configuration Register&quot;, \;on page 885\;Reserved when mirror_action is TRAP_TO_CPU" access="RW" offset="0x8.0" size="0x0.3" />
 	<field name="mirror_action" descr="Trap Mirror Action\;0: TRAP_TO_CPU (packet is forwarded to the CPU based on \;the path configured) \;1: TRAP_TO_CPU_AND_MIRROR, trap to CPU and Mirror to \;a mirroring agent\;2: TRAP_TO_MIRROR, mirror to mirroring agent and do not \;trap to the CPU.\;Reserved when SwitchX/-2, Switch-IB/2 and Quantum" access="RW" offset="0x8.8" size="0x0.2" />
 	<field name="priority" descr="Trap Group Priority\;In case a packet matches multiple classification rules, the \;packet will only be trapped once, based on the Trap-ID asso\;ciated with the group with the highest priority value. Higher \;values mean higher priority.\;Range is 0..cap_max_trap_group_priorities-1\;Reserved when SwitchX/-2, Switch-IB/2 and Quantum. For \;these devices the priority value equals the trap_group value." access="RW" offset="0xC.0" size="0x0.4" />
-	<field name="path" descr="Path to designated CPU\;Reserved when type != 0\;See Table 224, &quot;LOCAL Path Layout,&quot; on page 470" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+	<field name="path" descr="Path to designated CPU\;Reserved when type != 0\;See Table 261, &quot;LOCAL Path Layout,&quot; on page 518" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
 	<field name="mirror_probability_rate" descr="For mirroring: sampling rate = 1 out of rate packets \;Valid values are: 1 to 3.5*10^9\;Values of 0 behaves like 1\;Default 1\;Note: high values are round by HW to: 10^9 * {4.3, 2.15, 1.43, \;1.08, 0.86, 0.72, 0.61, 0.54}. \;Reserved when mirror_action is TRAP_TO_CPU\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum, Quan\;tum.\;" access="RW" offset="0x40.0" size="0x4.0" />
 </node>
 
@@ -1709,9 +1829,24 @@
 	<field name="attr_id_en" descr="Attribute ID enable:\;bit0: 0x0019: LinearForwardingTable\;bit1: 0x001B: MulticastForwardingTable\;" access="RW" offset="0x0.0" size="0x4.0" />
 </node>
 
+<node name="ibsni_ext" descr="" size="0xc8.0" >
+	<field name="ipv4_record" descr="See Table 1109, &quot;IBNSI - IPv4 record Layout,&quot; on \;page 1279\;Entry 0 refer to out-of-band interfaces (e.g, box, alias or \;physical). \;Entry 1 refers to IPoIB interface\;Note: currently only 2 (TBD) entries are supported" subnode="ibsni_ipv4_ext" access="RW" high_bound="3" low_bound="0" offset="0x28.0" size="0x20.0" />
+	<field name="ipv6_record" descr="See Table 1111, &quot;IBSNI - IPv6 record Layout,&quot; on \;page 1279\;Entry 0 refer to out-of-band interfaces (e.g, box, alias or \;physical). \;Entry 1 refers to IPoIB interface\;Note: currently only 2 (TBD) entries are supported" subnode="ibsni_ipv6_ext" access="RW" high_bound="3" low_bound="0" offset="0x48.0" size="0x80.0" />
+</node>
+
+<node name="ibsni_ipv4_ext" descr="" size="0x8.0" >
+	<field name="ipv4" descr="IPv4 address" access="RW" offset="0x0.0" size="0x4.0" />
+	<field name="netmask" descr="Netmask" access="RW" offset="0x4.0" size="0x4.0" />
+</node>
+
+<node name="ibsni_ipv6_ext" descr="" size="0x20.0" >
+	<field name="ipv6" descr="IPv6 address" access="RW" high_bound="3" low_bound="0" offset="0x0.0" size="0x10.0" />
+	<field name="netmask" descr="Netmask" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+</node>
+
 <node name="icam_reg_ext" descr="" size="0x18.0" >
 	<field name="access_reg_group" descr="Access Register ID groups \;0: REG_IDs 0x3800 to 0x387F\;1: REG_IDs 0x3880 to 0x38FF" access="INDEX" offset="0x0.0" size="0x0.8" />
-	<field name="infr_access_reg_cap_mask" descr="Supported infrastructure&apos;s access register bitmask. Based on \;access_reg_group index. \;When bit is set to &apos;1&apos;, The register is supported in the device. \;For example, when access_reg_group == 1:\;Bit 112: ICSR\;Bit0 is at 08h.bit0\;Bit 127 is at 14h.bit31" access="RO" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
+	<field name="infr_access_reg_cap_mask" descr="Supported infrastructure&apos;s access register bitmask. Based \;on access_reg_group index. \;When bit is set to &apos;1&apos;, The register is supported in the device. \;For example, when access_reg_group == 1:\;Bit 112: ICSR\;Bit0 is at 08h.bit0\;Bit 127 is at 14h.bit31" access="RO" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
 </node>
 
 <node name="icsr_ext" descr="" size="0x410.0" >
@@ -1721,60 +1856,61 @@
 </node>
 
 <node name="iddd_ext" descr="" size="0x8.0" >
-	<field name="entry_type" descr="Entry type\;For Spectrum-2 hash entries see Appendix A.4.1.1, &quot;KVD Cen\;tral Database Hash-based&quot; (page 3382)\;For Spectrum-2 linear entries see Appendix A.4.1.2, &quot;KVD \;Central Database Linear Entries&quot; (page 3384)" access="INDEX" offset="0x0.0" size="0x0.8" />
+	<field name="entry_type" descr="Entry type\;For Spectrum-2 hash entries see Appendix A.4.1.1, &quot;KVD \;Central Database Hash-based&quot; (page 3104)\;For Spectrum-2 linear entries see Appendix A.4.1.2, &quot;KVD \;Central Database Linear Entries&quot; (page 3106)" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="duplication" descr="Duplication\;Valid values:\;1, 2, 4, 8, 16\;Default is 1\;\;" access="RW" offset="0x4.0" size="0x0.5" />
 </node>
 
 <node name="iddds_ext" descr="" size="0x440.0" >
-	<field name="pipe" descr="Pipe\;See Table 778, &quot;IDDDS - pipe entry Layout,&quot; on page 1260" subnode="iddds_pipeline_entry_ext" access="RW" high_bound="15" low_bound="0" offset="0x40.0" size="0x400.0" />
+	<field name="pipe" descr="Pipe\;See Table 877, &quot;IDDDS - pipe entry Layout,&quot; on \;page 1042" subnode="iddds_pipeline_entry_ext" access="RW" high_bound="15" low_bound="0" offset="0x40.0" size="0x400.0" />
 </node>
 
 <node name="iddds_pipeline_entry_ext" descr="" size="0x40.0" >
-	<field name="entry_type" descr="Entry type\;Per entry type: read percentage of utilization (lookups/time) in \;database\;Range 0..100\;For Spectrum-2 hash entries see Appendix A.4.1.1, &quot;KVD Cen\;tral Database Hash-based&quot; (page 3382)\;For Spectrum-2 linear entries see Appendix A.4.1.2, &quot;KVD \;Central Database Linear Entries&quot; (page 3384)" access="RO" high_bound="63" low_bound="0" offset="0x0.24" size="0x40.0" />
+	<field name="entry_type" descr="Entry type\;Per entry type: read percentage of utilization (lookups/time) \;in database\;Range 0..100\;For Spectrum-2 hash entries see Appendix A.4.1.1, &quot;KVD \;Central Database Hash-based&quot; (page 3104)\;For Spectrum-2 linear entries see Appendix A.4.1.2, &quot;KVD \;Central Database Linear Entries&quot; (page 3106)" access="RO" high_bound="63" low_bound="0" offset="0x0.24" size="0x40.0" />
 </node>
 
 <node name="iedr_ext" descr="" size="0x210.0" >
 	<field name="num_rec" descr="Number of records\;Range 1..64\;When bg=1 the num_rec =1 and this field is reserved" access="OP" offset="0x0.0" size="0x0.8" />
-	<field name="bg" descr="Background delete:\;0: immediate delete operation (a.k.a. sync)\;1: background delete operation (a.k.a. async). SW must poll for \;IEDS.ed_status=0 before attempting new deletes" access="OP" offset="0x0.24" size="0x0.1" />
-	<field name="record" descr="See Table 782, &quot;IEDR record Layout,&quot; on page 1262" subnode="iedr_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x10.0" size="0x200.0" />
+	<field name="bg" descr="Background delete:\;0: immediate delete operation (a.k.a. sync)\;1: background delete operation (a.k.a. async). SW must poll \;for IEDS.ed_status=0 before attempting new deletes" access="OP" offset="0x0.24" size="0x0.1" />
+	<field name="record" descr="See Table 881, &quot;IEDR record Layout,&quot; on page 1045" subnode="iedr_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x10.0" size="0x200.0" />
 </node>
 
 <node name="iedr_record_ext" descr="" size="0x8.0" >
 	<field name="size" descr="Size of entries do be deleted.\;The unit is 1 entry, regardless of entry type\;Range 1..4096" access="OP" offset="0x0.0" size="0x0.13" />
-	<field name="type" descr="Resource type\;For Spectrum-2, see Section A.4.1.2, &quot;KVD Central Data\;base Linear Entries&quot;, on page 3384" access="OP" offset="0x0.24" size="0x0.8" />
+	<field name="type" descr="Resource type\;For Spectrum-2, see Section A.4.1.2, &quot;KVD Central Data\;base Linear Entries&quot;, on page 3106" access="OP" offset="0x0.24" size="0x0.8" />
 	<field name="index_start" descr="Resource index start" access="OP" offset="0x4.0" size="0x0.24" />
 </node>
 
 <node name="ieds_ext" descr="" size="0x8.0" >
-	<field name="edpr" descr="Entry Delete Priority\;When set FW will give higher priority for the current ongoing \;entry delete process. Can be set also while entry delete pro\;cess is ongoing. Affects only current process. By default all \;process start as low prio\;" access="OP" offset="0x0.0" size="0x0.1" />
+	<field name="edpr" descr="Entry Delete Priority\;When set FW will give higher priority for the current ongo\;ing entry delete process. Can be set also while entry \;delete process is ongoing. Affects only current process. By \;default all process start as low prio\;" access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="ed_status" descr="Entry delete status:\;0: No entry delete process is ongoing\;1: Entry delete process is ongoing" access="RO" offset="0x4.0" size="0x0.4" />
 </node>
 
 <node name="ifbo_ext" descr="" size="0x28.0" >
 	<field name="type" descr="Hash type\;2: Random\;3: CRC2\;4: XOR2 - this is a always symmetric hash function, always \;symmetric also for inner fields (L2, L3,L4). \;\;" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="outer_header_enables" descr="Outer header enables. Each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
-	<field name="outer_header_fields_enable" descr="By defaults, all fields are &apos;0&apos;\;Layer2 fields, subject to outer_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;Bit 3: Outer VID\;Bit 4: Outer PCP\;Bit 5: Outer DEI\;Bit 6: Inner VID\;Bit 7: Inner PCP\;Bit 8: Inner DEI\;\;IPv4 fields, subject to outer_header_enables:\;Bits 12:9: IPv4 SIP 0-3 enable per byte. For ARP all bytes are \;used\;Bits 16:13: IPv4 DIP 0-3 enable per byte. For ARP all bytes are \;used\;Bit 17: IPv4 Protocol\;Bit 18: IPv4 DSCP\;Bit 19: IPv4 ECN\;Bit 20: IPv4 IP L3 Length - length field bits [13:10]\;\;IPv6 fields, subject to outer_header_enables:\;Bits 21: IPv6 enable bytes of SIP 0. For ARP all bytes are used\;Bits 28:22 reserved\;Bits 36:29: IPv6 SIP 8-15 enable per byte. For ARP all bytes are \;used\;Bits 37: IPv6 enable bytes of DIP 0. For ARP all bytes are used\;Bits 44:38 reserved\;Bits 52:45: IPv6 DIP 8-15 enable per byte. For ARP all bytes \;are used\;Bit 53: IPv6 Next Header\;Bit 54: IPv6 DSCP\;Bit 55: IPv6 ECN\;Bit 56: IPv6 IP L3 Length - length field bits [13:10]\;Bit 57: IPv6 Flow label\;\;RoCE v1 fields: [TBD]\;Bit 58: [TBD] GRH SIP\;Bit 59: [TBD] GRH DIP\;Bit 60: [TBD] GRH Next Protocol\;Bit 61: [TBD] GRH DSCP\;Bit 62: [TBD] GRH ECN\;Bit 63: [TBD] GRH L3 Length\;Bit 64: [TBD] GRH Flow label" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
+	<field name="outer_header_enables" descr="Outer header enables. Each bit enables a specific layer field \;to be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="outer_header_fields_enable" descr="By defaults, all fields are &apos;0&apos;\;Layer2 fields, subject to outer_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;Bit 3: Outer VID\;Bit 4: Outer PCP\;Bit 5: Outer DEI\;Bit 6: Inner VID\;Bit 7: Inner PCP\;Bit 8: Inner DEI\;\;IPv4 fields, subject to outer_header_enables:\;Bits 12:9: IPv4 SIP 0-3 enable per byte. For ARP all bytes are \;used\;Bits 16:13: IPv4 DIP 0-3 enable per byte. For ARP all bytes \;are used\;Bit 17: IPv4 Protocol\;Bit 18: IPv4 DSCP\;Bit 19: IPv4 ECN\;Bit 20: IPv4 IP L3 Length - length field bits [13:10]\;\;IPv6 fields, subject to outer_header_enables:\;Bits 21: IPv6 enable bytes of SIP 0. For ARP all bytes are \;used\;Bits 28:22 reserved\;Bits 36:29: IPv6 SIP 8-15 enable per byte. For ARP all bytes \;are used\;Bits 37: IPv6 enable bytes of DIP 0. For ARP all bytes are \;used\;Bits 44:38 reserved\;Bits 52:45: IPv6 DIP 8-15 enable per byte. For ARP all bytes \;are used\;Bit 53: IPv6 Next Header\;Bit 54: IPv6 DSCP\;Bit 55: IPv6 ECN\;Bit 56: IPv6 IP L3 Length - length field bits [13:10]\;Bit 57: IPv6 Flow label\;\;RoCE v1 fields: [TBD]\;Bit 58: [TBD] GRH SIP\;Bit 59: [TBD] GRH DIP\;Bit 60: [TBD] GRH Next Protocol\;Bit 61: [TBD] GRH DSCP\;Bit 62: [TBD] GRH ECN\;Bit 63: [TBD] GRH L3 Length\;Bit 64: [TBD] GRH Flow label" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
 </node>
 
 <node name="igcr_ext" descr="" size="0x10.0" >
-	<field name="ddd_lpm_high_ipv4" descr="For DDD for IPv4 LPM\;LPM_High is for routes with prefixes from ddd_lpm_high_ipv4 \;.. 32\;LPM_Low is for routes with prefixes from 1 to  ddd_lp\;m_high_ipv4-1\;Range: 1..32, default: 9\;Note: can only be changed when the router is disabled\;" access="RW" offset="0x0.0" size="0x0.8" />
-	<field name="ddd_lpm_high_ipv6" descr="For DDD for IPv6 LPM\;LPM_High is for routes with prefixes from ddd_lpm_high_ipv6 \;.. 128\;LPM_Low is for routes with prefixes from 1 to ddd_lp\;m_high_ipv6-1\;Range: 1..128, default: 33\;Note: can only be changed when the router is disabled" access="RW" offset="0x0.16" size="0x0.8" />
-	<field name="ddd_pe_actions_priority" descr="For DDD on ACL actions\;ACL actions which are pointed by a rule with priority equal to \;or smaller than this value will have DDD\;For example if the value is 0 then only default actions will have \;DDD\;Default 0" access="RW" offset="0x8.0" size="0x0.24" />
-	<field name="pisbo" descr="Port isolation bridge only:\;0: port isolation also after router\;1: port isolation does not work if packet was routed\;Note that the NVE isolation (TNIFR) is orthogonal to this con\;figuration\;Reserved when Spectrum-1\;" access="RW" offset="0xC.0" size="0x0.1" />
+	<field name="ddd_lpm_high_ipv4" descr="For DDD for IPv4 LPM\;LPM_High is for routes with prefixes from ddd_lp\;m_high_ipv4 .. 32\;LPM_Low is for routes with prefixes from 1 to  ddd_lp\;m_high_ipv4-1\;Range: 1..32, default: 9\;Note: can only be changed when the router is disabled\;" access="RW" offset="0x0.0" size="0x0.8" />
+	<field name="ddd_lpm_high_ipv6" descr="For DDD for IPv6 LPM\;LPM_High is for routes with prefixes from ddd_lp\;m_high_ipv6 .. 128\;LPM_Low is for routes with prefixes from 1 to ddd_lp\;m_high_ipv6-1\;Range: 1..128, default: 33\;Note: can only be changed when the router is disabled" access="RW" offset="0x0.16" size="0x0.8" />
+	<field name="ddd_pe_actions_priority" descr="For DDD on ACL actions\;ACL actions which are pointed by a rule with priority equal to \;or smaller than this value will have DDD\;For example if the value is 0 then only default actions will \;have DDD\;Default 0" access="RW" offset="0x8.0" size="0x0.24" />
+	<field name="pisbo" descr="Port isolation bridge only:\;0: port isolation also after router\;1: port isolation does not work if packet was routed\;Note that the NVE isolation (TNIFR) is orthogonal to this \;configuration\;Reserved when Spectrum-1\;" access="RW" offset="0xC.0" size="0x0.1" />
+	<field name="ddd_lag_mode" descr="0: entry is duplicated by 8 times\;1: no entry duplication (DDD disabled)\;\;Note:\;Can be changed only when there is no LAG configuration \;applied" access="RW" offset="0xC.8" size="0x0.4" />
 </node>
 
 <node name="ihsr_ext" descr="" size="0x38.0" >
 	<field name="type" descr="Hash type\;0: CRC\;1: XOR" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="sh" descr="Symmetric hash\;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: When this bit is set, enabling addresses in outer_head\;er_fields_enables and inner_header_fields_enables\;For SwitchX/-2 must be in couples - both source and destina\;tion. This includes the following sets:\;- SMAC, DMAC\;- SIP, DIP\;- TCP/UDP source port, TCP/UDP destination port\;- SID, DID, for SwitchX/-2 only\;" access="RW" offset="0x0.8" size="0x0.1" />
-	<field name="general_fields" descr="This is a bit mask, in which each bit enables a specific field to \;be included in the hash calculation. \;Bit 0: Ingress port\;Bit i: custom_bytes i-2\;i = 2 .. 2 + (cap_max_custom_byte_sets_for_hash * cap_cus\;tom_byte_entry_size - 1)\;See Section 10.3.14, &quot;Custom Bytes&quot;, on page 2138" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="outer_header_enables" descr="Outer header enables. Each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
-	<field name="outer_header_fields_enable" descr="Layer2 fields, subject to outer_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;Bit 3: Outer VID\;Bit 4: Outer PCP\;Bit 5: Outer DEI\;Bit 6: Inner VID\;Bit 7: Inner PCP\;Bit 8: Inner DEI\;\;IPv4 fields, subject to outer_header_enables:\;Bits 12:9: IPv4 SIP 0-3 enable per byte. For ARP all bytes are \;used\;Bits 16:13: IPv4 DIP 0-3 enable per byte. For ARP all bytes are \;used\;Bit 17: IPv4 Protocol\;Bit 18: IPv4 DSCP\;Bit 19: IPv4 ECN\;Bit 20: IPv4 IP L3 Length - length field bits [13:10]\;\;IPv6 fields, subject to outer_header_enables:\;Bits 21: IPv6 enable bytes of SIP 0-7. For ARP all bytes are \;used\;Bits 28:22 reserved\;Bits 36:29: IPv6 SIP 8-15 enable per byte. For ARP all bytes are \;used\;Bits 37: IPv6 enable bytes of DIP 0-7. For ARP all bytes are \;used\;Bits 44:38 reserved\;Bits 52:45: IPv6 DIP 8-15 enable per byte. For ARP all bytes \;are used\;Bit 53: IPv6 Next Header\;Bit 54: IPv6 DSCP\;Bit 55: IPv6 ECN\;Bit 56: IPv6 IP L3 Length - length field bits [13:10]\;Bit 57: IPv6 Flow label\;\;RoCE v1 fields: [TBD]\;Bit 58: [TBD] GRH SIP\;Bit 59: [TBD] GRH DIP\;Bit 60: [TBD] GRH Next Protocol\;Bit 61: [TBD] GRH DSCP\;Bit 62: [TBD] GRH ECN\;Bit 63: [TBD] GRH L3 Length\;Bit 64: [TBD] GRH Flow label" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
-	<field name="inner_header_enables" descr="Inner header enables. Each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable inner Layer2 fields if inner packet is not IPv4/6\;Bit 1: Enable inner Layer2 fields if inner packet is IPv4\;Bit 2: Enable inner Layer2 fields if inner packet is IPv6\;Bit 3: Enable inner IPv4 fields if inner packet is not TCP and \;not UDP\;Bit 4: Enable inner IPv4 fields if inner packet is either TCP or \;UDP\;Bit 5: Enable inner IPv6 fields if inner packet is not TCP and \;not UDP\;Bit 6: Enable inner IPv6 fields if inner packet is either TCP or \;UDP\;Bit 7: Enable inner TCP/UDP header fields if inner packet is \;IPv4\;Bit 8: Enable inner TCP/UDP header fields if inner packet is \;IPv6\;others: reserved" access="RW" offset="0x2C.0" size="0x0.16" />
+	<field name="sh" descr="Symmetric hash\;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: When this bit is set, enabling addresses in outer_\;header_fields_enables and inner_header_fields_enables\;For SwitchX/-2 must be in couples - both source and desti\;nation. This includes the following sets:\;- SMAC, DMAC\;- SIP, DIP\;- TCP/UDP source port, TCP/UDP destination port\;- SID, DID, for SwitchX/-2 only\;" access="RW" offset="0x0.8" size="0x0.1" />
+	<field name="general_fields" descr="This is a bit mask, in which each bit enables a specific field \;to be included in the hash calculation. \;Bit 0: Ingress port\;Bit i: custom_bytes i-2\;i = 2 .. 2 + (cap_max_custom_byte_sets_for_hash * cap_cus\;tom_byte_entry_size - 1)\;See Section 10.3.14, &quot;Custom Bytes&quot;, on page 1888" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="outer_header_enables" descr="Outer header enables. Each bit enables a specific layer field \;to be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="outer_header_fields_enable" descr="Layer2 fields, subject to outer_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;Bit 3: Outer VID\;Bit 4: Outer PCP\;Bit 5: Outer DEI\;Bit 6: Inner VID\;Bit 7: Inner PCP\;Bit 8: Inner DEI\;\;IPv4 fields, subject to outer_header_enables:\;Bits 12:9: IPv4 SIP 0-3 enable per byte. For ARP all bytes are \;used\;Bits 16:13: IPv4 DIP 0-3 enable per byte. For ARP all bytes \;are used\;Bit 17: IPv4 Protocol\;Bit 18: IPv4 DSCP\;Bit 19: IPv4 ECN\;Bit 20: IPv4 IP L3 Length - length field bits [13:10]\;\;IPv6 fields, subject to outer_header_enables:\;Bits 21: IPv6 enable bytes of SIP 0-7. For ARP all bytes are \;used\;Bits 28:22 reserved\;Bits 36:29: IPv6 SIP 8-15 enable per byte. For ARP all bytes \;are used\;Bits 37: IPv6 enable bytes of DIP 0-7. For ARP all bytes are \;used\;Bits 44:38 reserved\;Bits 52:45: IPv6 DIP 8-15 enable per byte. For ARP all bytes \;are used\;Bit 53: IPv6 Next Header\;Bit 54: IPv6 DSCP\;Bit 55: IPv6 ECN\;Bit 56: IPv6 IP L3 Length - length field bits [13:10]\;Bit 57: IPv6 Flow label\;\;RoCE v1 fields: [TBD]\;Bit 58: [TBD] GRH SIP\;Bit 59: [TBD] GRH DIP\;Bit 60: [TBD] GRH Next Protocol\;Bit 61: [TBD] GRH DSCP\;Bit 62: [TBD] GRH ECN\;Bit 63: [TBD] GRH L3 Length\;Bit 64: [TBD] GRH Flow label" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
+	<field name="inner_header_enables" descr="Inner header enables. Each bit enables a specific layer field \;to be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable inner Layer2 fields if inner packet is not IPv4/6\;Bit 1: Enable inner Layer2 fields if inner packet is IPv4\;Bit 2: Enable inner Layer2 fields if inner packet is IPv6\;Bit 3: Enable inner IPv4 fields if inner packet is not TCP and \;not UDP\;Bit 4: Enable inner IPv4 fields if inner packet is either TCP or \;UDP\;Bit 5: Enable inner IPv6 fields if inner packet is not TCP and \;not UDP\;Bit 6: Enable inner IPv6 fields if inner packet is either TCP or \;UDP\;Bit 7: Enable inner TCP/UDP header fields if inner packet is \;IPv4\;Bit 8: Enable inner TCP/UDP header fields if inner packet is \;IPv6\;others: reserved" access="RW" offset="0x2C.0" size="0x0.16" />
 	<field name="inner_header_fields_enable" descr="Inner header fields enable.\;\;Inner Layer2 fields, subject to inner_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;\;Inner IPv4 fields, subject to inner_header_enables:\;Bits 6:3: IPv4 SIP 0-3 enable per byte\;Bits 10:7: IPv4 DIP 0- 3 enable per byte\;Bit 11: IPv4 Protocol\;\;Inner IPv6 fields, subject to inner_header_enables:\;Bits 12: IPv6 enable bytes of SIP 0-7\;Bits 19:13 reserved\;Bits 27:20: IPv6 SIP 8-15 enable per byte\;Bits 28: IPv6 enable bytes of DIP 0-7\;Bits 35:29 reserved\;Bits 43:36: IPv6 DIP 8-15 enable per byte\;Bit 44: IPv6 Next Header\;Bit 45: IPv6 Flow label\;\;Inner TCP /UDP header fields, subject to inner_header_en\;ables:\;Bit 46: TCP/UDP source port\;Bit 47: TCP/UDP destination port\;others: reserved" subnode="uint64" access="RW" offset="0x30.0" size="0x8.0" />
 </node>
 
 <node name="iicr_ext" descr="" size="0x24.0" >
-	<field name="kvh_mark_clear" descr="KVH mark and clear\;0: Nop \;1: Mark all KVH entries (e.g. before FW-ISSU)\;2: Clear (delete) all marked KVH entries (e.g. after FW-ISSU)\;Spectrum: mark/delete only KVH hash entries\;Spectrum-2: mark/delete KVH hash and KVH linear entries\;Note: dump sessions must not be ongoing between mark \;and clear. e.g. SFN, SFDD, RAUHTD, PEFAAD, MPNHLFED, \;TNIPSN" access="OP" offset="0x8.0" size="0x0.4" />
+	<field name="kvh_mark_clear" descr="KVH mark and clear\;0: Nop \;1: Mark all KVH entries (e.g. before FW-ISSU)\;2: Clear (delete) all marked KVH entries (e.g. after FW-\;ISSU)\;Spectrum: mark/delete only KVH hash entries\;Spectrum-2: mark/delete KVH hash and KVH linear \;entries\;Note: dump sessions must not be ongoing between mark \;and clear. e.g. SFN, SFDD, RAUHTD, PEFAAD, \;MPNHLFED, TNIPSN" access="OP" offset="0x8.0" size="0x0.4" />
 	<field name="clear_mc_rtr_tcam_mask" descr="For Spectrum only:\;clear (deallocate) Multicast Router TCAM regions if: \;(1) group[bit] = clear_pe_regions_value[bit] \;(2) and clear_mc_rtr_tcam_mask[bit]=1\;Note: a used TCAM region must not be cleared (if traffic is \;passing through this region). An ACL may point to this \;unused TCAM region\;For the 2 Mc Router groups see RTAR.key_type.\;If mask=0 then this is a Nop" access="OP" offset="0xC.0" size="0x0.2" />
 	<field name="clear_mc_rtr_tcam_value" descr="For Spectrum only:\;clear (deallocate) Multicast Router TCAM regions if: \;(1) group[bit] = clear_pe_regions_value[bit] \;(2) and clear_mc_rtr_tcam_mask[bit]=1\;Note: a used TCAM region must not be cleared (if traffic is \;passing through this region). An ACL may point to this \;unused TCAM region\;For the 2 Mc Router groups see RTAR.key_type.\;If mask=0 then this is a Nop" access="OP" offset="0xC.4" size="0x0.2" />
 	<field name="clear_pe_regions_value" descr="clear (deallocate) policy engine TCAM regions if: \;(1) region[bit] = clear_pe_regions_value[bit] \;(2) and clear_pe_regions_mask[bit]=1\;Note: a used TCAM region must not be cleared (if traffic is \;passing through this region). An ACL may point to this \;unused TCAM region.\;If mask=0 then this is a Nop" access="OP" offset="0x10.0" size="0x0.16" />
@@ -1790,32 +1926,37 @@
 
 <node name="ip2me_ext" descr="" size="0x14.0" >
 	<field name="trap_action" descr="Trap Action\;0: NOP\;3: MIRROR. Note that if the packet is trapped as IP2ME (see \;description in v) then it will not be trapped as MIRROR.\;Reserved when v = 0" access="RW" offset="0x0.28" size="0x0.4" />
-	<field name="tunnel_ptr" descr="Tunnel Pointer for NVE or IPinIP tunnel decapsulation. See \;Section 13.11.18, &quot;RTDP - Routing Tunnel Decap Proper\;ties Register&quot;, on page 2809\;For Spectrum, pointer to KVD Linear, see Section A.3.1.2, \;&quot;KVD Central Database Linear Entries&quot;, on page 3375\;" access="RW" offset="0x4.0" size="0x0.24" />
-	<field name="v" descr="Valid bit for the tunnel_ptr field\;If valid = 0 then trap to CPU as IP2ME trap id\;If valid = 1 and the packet format allows NVE or IPinIP tunnel \;decapsulation then tunnel decapsulation is done\;If valid = 1 and packet format does not allow NVE or IPinIP tun\;nel decapsulation then trap as IP2ME trap id" access="RW" offset="0x4.31" size="0x0.1" />
+	<field name="tunnel_ptr" descr="Tunnel Pointer for NVE or IPinIP tunnel decapsulation. See \;Section 13.11.18, &quot;RTDP - Routing Tunnel Decap Prop\;erties Register&quot;, on page 2597\;For Spectrum, pointer to KVD Linear, see Section A.3.1.2, \;&quot;KVD Central Database Linear Entries&quot;, on page 3097\;" access="RW" offset="0x4.0" size="0x0.24" />
+	<field name="v" descr="Valid bit for the tunnel_ptr field\;If valid = 0 then trap to CPU as IP2ME trap id\;If valid = 1 and the packet format allows NVE or IPinIP tunnel \;decapsulation then tunnel decapsulation is done\;If valid = 1 and packet format does not allow NVE or IPinIP \;tunnel decapsulation then trap as IP2ME trap id" access="RW" offset="0x4.31" size="0x0.1" />
 </node>
 
 <node name="ip_gw_adjacency_ext" descr="" size="0x14.0" >
 	<field name="irif" descr="RIF post NAT operation" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="new_header_type" descr="new IP header type:\;0: Build IPv4, set by new_ipv4_udip\;1: Build IPv6, set by new_ipv6_ptr\;Note: the type field (IPv4 or IPv6) must match the config\;uration of the router interface, see protocol field in \;Table 2220, &quot;Loopback USIP Router Interface Prop\;erties Layout,&quot; on page 2748" access="RW" offset="0x0.24" size="0x0.4" />
-	<field name="erif" descr="RIF pre NAT operation" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="new_header_type" descr="new IP header type:\;0: Build IPv4, set by new_ipv4_udip\;1: Build IPv6, set by new_ipv6_ptr\;Note: the type field (IPv4 or IPv6) must match the con\;figuration of the router interface, see protocol field in \;Table 2401, &quot;Loopback USIP Router Interface \;Properties Layout,&quot; on page 2536" access="RW" offset="0x0.24" size="0x0.4" />
 	<field name="qos_profile" descr="qos profile\;valid values 0..(cap_max_tqos_profile-1)" access="RW" offset="0x4.24" size="0x0.4" />
 	<field name="new_ipv4_udip" descr="New IPv4 dip\;Reserved when nat_type is IPv6" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="new_ipv6_ptr" descr="Pointer to IPv6 dip\;See Section 13.11.19, &quot;RIPS - Router IP version Six \;Register&quot;, on page 2817\;Pointer to KVD linear space, see A.3.1.2 &quot;KVD Central \;Database Linear Entries,&quot; on page 3375\;Reserved when nat_type is IPv4" access="RW" offset="0xC.0" size="0x0.24" />
+	<field name="new_ipv6_ptr" descr="Pointer to IPv6 dip\;See Section 13.11.19, &quot;RIPS - Router IP version \;Six Register&quot;, on page 2605\;Pointer to KVD linear space, see A.3.1.2 &quot;KVD Cen\;tral Database Linear Entries,&quot; on page 3097\;Reserved when nat_type is IPv4" access="RW" offset="0xC.0" size="0x0.24" />
 	<field name="exp_l3" descr="Expected Layer 3 Header:\;0: Any \;1: IPv4\;2: IPv6" access="RW" offset="0x10.0" size="0x0.2" />
 </node>
 
 <node name="ipac_ext" descr="" size="0xb0.0" >
 	<field name="profile_index" descr="Profile Index\;Range 0..cap_max_infra_profiles-1" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="status" descr="Status:\;0: IDLE\;1: BUSY\;2: CANCELED - After the trap the status moves to IDLE\;3: ERROR - After the trap the status moves to IDLE\;" access="RO" enum="IDLE=0x0,BUSY=0x1,CANCELED=0x2,ERROR=0x3" offset="0x4.0" size="0x0.2" />
-	<field name="opcode" descr="Opcode\;0: START a session. Per session rejected when status = \;BUSY.\;1: CANCEL the session, see explanation above.\;2: CANCEL_AND_CLEAR cancel session and clear the pro\;file.\;Note that a session is per type, thus multi sessions are \;allowed for different types.\;Opcode START cannot be set when a session is BUSY" access="WO" offset="0x4.8" size="0x0.2" />
-	<field name="port_mask" descr="Local port\;Each bit represents a local port. Refer to Section 8.3, &quot;Port \;Numbering&quot;, on page 1512 for port numbering scheme.\;CPU port is supported\;Router port is not supported" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
+	<field name="opcode" descr="Opcode\;0: START a session. Per session rejected when status = \;BUSY.\;1: CANCEL the session, see explanation above.\;2: CANCEL_AND_CLEAR cancel session and clear the \;profile.\;Note that a session is per type, thus multi sessions are \;allowed for different types.\;Opcode START cannot be set when a session is BUSY" access="WO" offset="0x4.8" size="0x0.2" />
+	<field name="port_mask" descr="Local port\;Each bit represents a local port. Refer to Section 8.3, \;&quot;Port Numbering&quot;, on page 1293 for port numbering \;scheme.\;CPU port is supported\;Router port is not supported" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
 	<field name="log_op_time" descr="Log: how long the operation took in background\;Units of mSec" access="RO" offset="0xA0.0" size="0x0.16" />
 	<field name="log_op_registers" descr="Log: how many &quot;PRM registers&quot; were configured, e.g. if \;PMTU was done for 128 ports then reveal 128." access="RO" offset="0xA4.0" size="0x4.0" />
 	<field name="error_register_id" descr="When status = ERROR:\;register_id on which there was an error" access="RO" offset="0xA8.0" size="0x0.16" />
 	<field name="error_local_port" descr="When status = ERROR:\;local_port on which there was an error" access="RO" offset="0xA8.16" size="0x0.8" />
 	<field name="error_lp_msb" descr="error_local_port[9:8]" access="RO" offset="0xA8.24" size="0x0.2" />
 	<field name="error_entry_index" descr="When status = ERROR:\;Index of the entry in the profile that had an error" access="RO" offset="0xAC.0" size="0x0.16" />
-	<field name="error_status" descr="When status = ERROR:\;Returned status.\;See Table 125, &quot;EMADs Return Status Summary,&quot; on \;page 390" access="RW" offset="0xAC.16" size="0x0.7" />
+	<field name="error_status" descr="When status = ERROR:\;Returned status.\;See Table 161, &quot;EMADs Return Status Summary,&quot; on \;page 427" access="RW" offset="0xAC.16" size="0x0.7" />
+</node>
+
+<node name="ipcr_ext" descr="" size="0xc.0" >
+	<field name="dest_pgt_ptr" descr="Destination PGT address pointer" access="OP" offset="0x0.0" size="0x0.16" />
+	<field name="source_pgt_ptr" descr="Source PGT address pointer" access="OP" offset="0x4.0" size="0x0.16" />
+	<field name="size" descr="Number of entries to copy\;Range 1 .. 2K" access="OP" offset="0x8.0" size="0x0.15" />
 </node>
 
 <node name="iper_ext" descr="" size="0x20.0" >
@@ -1827,13 +1968,13 @@
 </node>
 
 <node name="ipinip_encap_adjacency_ext" descr="" size="0x18.0" >
-	<field name="ipip_type" descr="Underlay destination ip type:\;0: IPv4, set by ipv4_udip\;1: IPv6, set by ipv6_ptr\;\;Note: the type field (IPv4 or IPv6) must match the config\;uration of the router interface, see protocol field in \;Table 2222, &quot;Loopback IPinIP Overlay Router Interface \;Properties Layout&quot;" access="RW" offset="0x0.16" size="0x0.4" />
+	<field name="ipip_type" descr="Underlay destination ip type:\;0: IPv4, set by ipv4_udip\;1: IPv6, set by ipv6_ptr\;Note: the type field (IPv4 or IPv6) must match the con\;figuration of the router interface, see protocol field in \;Table 2403, &quot;Loopback IPinIP Overlay Router Interface \;Properties Layout&quot;" access="RW" offset="0x0.16" size="0x0.4" />
 	<field name="uirif" descr="Underlay Ingress RIF\;Reserved when Spectrum (Gen-1)" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="uirif_v" descr="uirif is valid\;Note: if set then overwrite the RITR uirif for this ECMP \;entry\;Reserved when Spectrum (Gen-1)" access="RW" offset="0x4.16" size="0x0.1" />
 	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile\;Reserved when Spectrum-1" access="RW" offset="0x4.24" size="0x0.4" />
-	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2579\;1: Use tqos_profile_id" access="OP" offset="0x4.31" size="0x0.1" />
+	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2368\;1: Use tqos_profile_id" access="OP" offset="0x4.31" size="0x0.1" />
 	<field name="ipv4_udip" descr="Underlay ipv4 dip\;Reserved when ipip_type is IPv6" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="ipv6_ptr" descr="Pointer to IPv6 underlay destination ip address\;See Section 13.11.19, &quot;RIPS - Router IP version Six \;Register&quot;, on page 2817\;For Spectrum: Pointer to KVD linear space, see Appen\;dix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="RW" offset="0xC.0" size="0x0.24" />
+	<field name="ipv6_ptr" descr="Pointer to IPv6 underlay destination ip address\;See Section 13.11.19, &quot;RIPS - Router IP version \;Six Register&quot;, on page 2605\;For Spectrum: Pointer to KVD linear space, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot; (page 3097)" access="RW" offset="0xC.0" size="0x0.24" />
 </node>
 
 <node name="ipoib_multicast_adjacency_ext" descr="" size="0x18.0" >
@@ -1847,18 +1988,18 @@
 	<field name="swid" descr="Switch partition ID" access="RW" offset="0x0.24" size="0x0.8" />
 	<field name="scope" descr="Multicast GID scope" access="RW" offset="0x4.0" size="0x0.4" />
 	<field name="qkey" descr="Queue key\;Note: All router interfaces must share the same qkey." access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="qpn" descr="Local QP used for the IPoIB router interface.\;Note: In SwitchX devices, the QPn allocation must follow the \;following rules:\;1. QPn used for router interfaces must be allocated sequen\;tially where QPn for Router Interface #n must be calculated by\;2. QPn = QPn_base + Router Interface Index" access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="qpn" descr="Local QP used for the IPoIB router interface.\;Note: In SwitchX devices, the QPn allocation must follow the \;following rules:\;1. QPn used for router interfaces must be allocated sequen\;tially where QPn for Router Interface #n must be calculated \;by\;2. QPn = QPn_base + Router Interface Index" access="RW" offset="0x10.0" size="0x0.24" />
 </node>
 
 <node name="ipoib_router_inter_ext" descr="" size="0x3f8.0" >
 	<field name="size" descr="Size - the number of valid entries in the list following this \;field." access="RW" offset="0x0.0" size="0x0.8" />
-	<field name="rif_entry" descr="Rif Entry\;For more details, see Table 2232, &quot;rif_entry Layout,&quot; on \;page 2755" access="RW" high_bound="252" low_bound="0" offset="0x4.0" size="0x3f4.0" />
+	<field name="rif_entry" descr="Rif Entry\;For more details, see Table 2413, &quot;rif_entry Layout,&quot; \;on page 2543" access="RW" high_bound="252" low_bound="0" offset="0x4.0" size="0x3f4.0" />
 </node>
 
 <node name="ipoib_unicast_with_grh_adjacency_ext" descr="" size="0x18.0" >
 	<field name="dlid" descr="Destination local ID" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="sl" descr="Service level" access="RW" offset="0x0.20" size="0x0.4" />
-	<field name="my_lid" descr="LID path bits, to be masked by the interface LMC and added \;to the SLID base configured for the router port." access="RW" offset="0x0.24" size="0x0.7" />
+	<field name="my_lid" descr="LID path bits, to be masked by the interface LMC and \;added to the SLID base configured for the router port." access="RW" offset="0x0.24" size="0x0.7" />
 	<field name="dqpn" descr="Destination queue pair number" access="RW" offset="0x4.0" size="0x0.24" />
 	<field name="dgid" descr="Destination global ID" access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
 </node>
@@ -1867,7 +2008,7 @@
 	<field name="dlid" descr="Destination local ID" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="sl" descr="Service level" access="RW" offset="0x0.20" size="0x0.4" />
 	<field name="dqpn" descr="Destination queue pair number" access="RW" offset="0x4.0" size="0x0.24" />
-	<field name="my_lid" descr="LID path bits, to be masked by the interface LMC and added \;to the SLID base configured for the router port." access="RW" offset="0x8.0" size="0x0.7" />
+	<field name="my_lid" descr="LID path bits, to be masked by the interface LMC and \;added to the SLID base configured for the router port." access="RW" offset="0x8.0" size="0x0.7" />
 </node>
 
 <node name="ipsr_ext" descr="" size="0x14.0" >
@@ -1878,7 +2019,7 @@
 </node>
 
 <node name="irqr_ext" descr="" size="0xc.0" >
-	<field name="resource_id" descr="Resource ID as described by Device Resources, see Appen\;dix A, &quot;Device Resources&quot; (page 3369)" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="resource_id" descr="Resource ID as described by Device Resources, see \;Appendix A, &quot;Device Resources&quot; (page 3091)" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="resource_value_39_32" descr="Resources capability of this resource_id" access="RO" offset="0x4.0" size="0x0.8" />
 	<field name="v" descr="valid:\;0: resource_id has no valid value\;1: resource_id is valid" access="RO" offset="0x4.31" size="0x0.1" />
 	<field name="resource_value_31_0" descr="Resources capability of this resource_id" access="RO" offset="0x8.0" size="0x4.0" />
@@ -1891,11 +2032,11 @@
 
 <node name="l3_generic_encap_adjacency_ext" descr="" size="0x18.0" >
 	<field name="emt_pointer" descr="EMT pointer\;Range: 0 .. cap_max_emts - 1\;See FMTC, FMTE" access="RW" offset="0x0.0" size="0x0.8" />
-	<field name="u_ip_ver" descr="Underlay ip version:\;0: IPv4, set by ipv4_udip\;1: IPv6, set by ipv6_ptr\;Note: the u_ip_ver field (IPv4 or IPv6) must match the \;configuration of the router interface, see protocol field in \;Table 2222, &quot;Loopback IPinIP Overlay Router Interface \;Properties Layout&quot;" access="RW" offset="0x0.16" size="0x0.4" />
+	<field name="u_ip_ver" descr="Underlay ip version:\;0: IPv4, set by ipv4_udip\;1: IPv6, set by ipv6_ptr\;Note: the u_ip_ver field (IPv4 or IPv6) must match the \;configuration of the router interface, see protocol field \;in Table 2403, &quot;Loopback IPinIP Overlay Router Inter\;face Properties Layout&quot;" access="RW" offset="0x0.16" size="0x0.4" />
 	<field name="uirif" descr="Underlay Ingress RIF" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile \;Reserved when Spectrum" access="RW" offset="0x4.24" size="0x0.4" />
 	<field name="ipv4_udip" descr="Underlay ipv4 dip\;Reserved when ipip_type is IPv6" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="ipv6_ptr" descr="Pointer to IPv6 underlay destination ip address\;See Section 13.11.19, &quot;RIPS - Router IP version Six \;Register&quot;, on page 2817\;For Spectrum: Pointer to KVD linear space, see \;Section A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot;, on page 3375\;Reserved when ipip_type is IPv4" access="RW" offset="0xC.0" size="0x0.24" />
+	<field name="ipv6_ptr" descr="Pointer to IPv6 underlay destination ip address\;See Section 13.11.19, &quot;RIPS - Router IP version \;Six Register&quot;, on page 2605\;For Spectrum: Pointer to KVD linear space, see \;Section A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot;, on page 3097\;Reserved when ipip_type is IPv4" access="RW" offset="0xC.0" size="0x0.24" />
 	<field name="cbset_y_set_en" descr="Enable setting value on cbset_y" access="RW" offset="0x10.0" size="0x0.1" />
 	<field name="cbset_x_set_en" descr="Enable setting value on cbset_x" access="RW" offset="0x10.1" size="0x0.1" />
 	<field name="cbset_y_select" descr="Select cbset_y:\;Spectrum-2: Range 0..7\;" access="RW" offset="0x10.16" size="0x0.3" />
@@ -1918,8 +2059,8 @@
 	<field name="llr_rx_error_low" descr="The total number of bad cells received (including CRC \;error).\;" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="llr_rx_crc_error_high" descr="The total number of cells received with CRC error.\;" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="llr_rx_crc_error_low" descr="The total number of cells received with CRC error.\;" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="llr_tx_cells_high" descr="The total number of cells transmitted (including retrans\;mitted cells)." access="RO" offset="0x18.0" size="0x4.0" />
-	<field name="llr_tx_cells_low" descr="The total number of cells transmitted (including retrans\;mitted cells)." access="RO" offset="0x1C.0" size="0x4.0" />
+	<field name="llr_tx_cells_high" descr="The total number of cells transmitted (including retransmit\;ted cells)." access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="llr_tx_cells_low" descr="The total number of cells transmitted (including retransmit\;ted cells)." access="RO" offset="0x1C.0" size="0x4.0" />
 	<field name="llr_tx_ret_cells_high" descr="The total number of cells retransmitted." access="RO" offset="0x20.0" size="0x4.0" />
 	<field name="llr_tx_ret_cells_low" descr="The total number of cells retransmitted." access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="llr_tx_ret_events_high" descr="The total number of retransmission events." access="RO" offset="0x28.0" size="0x4.0" />
@@ -1933,7 +2074,7 @@
 </node>
 
 <node name="local_span_ext" descr="" size="0x10.0" >
-	<field name="tclass" descr="Traffic Class on which the mirrored packet is queued\;For Spectrum: Switch Priority\;Reserved when qos is QoS maintain\;Reserved when system_port is to CPU since HTGT.cpu_tclass is \;used" access="RW" offset="0xC.0" size="0x0.4" />
+	<field name="tclass" descr="Traffic Class on which the mirrored packet is queued\;For Spectrum: Switch Priority\;Reserved when qos is QoS maintain\;Reserved when system_port is to CPU since HTGT.cpu_tclass \;is used" access="RW" offset="0xC.0" size="0x0.4" />
 </node>
 
 <node name="loopback_generic_router_interface_ext" descr="" size="0x4.0" >
@@ -1941,7 +2082,7 @@
 
 <node name="loopback_ipinip_router_interface_ext" descr="" size="0x1c.0" >
 	<field name="uvr" descr="Underlay Virtual Router\;Range is 0..cap_max_virtual_routers-1\;Reserved when Spectrum-2" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="options" descr="When type is IP_IN_GRE_KEY_IN_IP:\;0: The key is defined by gre_key\;1: The 24msbs of the key are set by ipip_gre_key_for_hash, see \;TIGCR. The 8 lsbs of the key are based on a hash value config\;ured by RECR or RECR_V2.\;See Section 16.5.1, &quot;TIGCR - Tunneling IPinIP General \;Configuration Register&quot;, on page 3038, Section 13.11.7, \;&quot;RECR - Router ECMP Configuration Register&quot;, on \;page 2766, Section 13.11.8, &quot;RECR_V2 - Router ECMP \;Configuration Version 2 Register&quot;, on page 2768" access="RW" offset="0x0.20" size="0x0.4" />
+	<field name="options" descr="When type is IP_IN_GRE_KEY_IN_IP:\;0: The key is defined by gre_key\;1: The 24msbs of the key are set by ipip_gre_key_for_hash, \;see TIGCR. The 8 lsbs of the key are based on a hash value \;configured by RECR or RECR_V2.\;See Section 16.5.1, &quot;TIGCR - Tunneling IPinIP General \;Configuration Register&quot;, on page 2832, Section 13.11.7, \;&quot;RECR - Router ECMP Configuration Register&quot;, on \;page 2554, Section 13.11.8, &quot;RECR_V2 - Router ECMP \;Configuration Version 2 Register&quot;, on page 2556" access="RW" offset="0x0.20" size="0x0.4" />
 	<field name="ipip_type" descr="Encapsulation Type\;0: IP_IN_IP: Tunnel is IPinIP \;1: IP_IN_GRE_IN_IP: Tunnel is GRE, no key\;2: IP_IN_GRE_KEY_IN_IP: Tunnel is GRE, with a key" access="RW" offset="0x0.24" size="0x0.4" />
 	<field name="underlay_router_interface" descr="Underlay ingress router interface (uirif)Reserved when Spec\;trum-1\;\;" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="ig_uirif" descr="Ignore uirif\;0: use uirif field in this RIF\;1: ignore uirif field of the RIF, use RIF by the RATR\;Reserved when Spectrum-1" access="RW" offset="0x4.16" size="0x0.1" />
@@ -1951,7 +2092,7 @@
 
 <node name="loopback_router_interface_ext" descr="" size="0x24.0" >
 	<field name="protocol" descr="Protocol\;0: IPIP_IPV4 - overlay RIF with underlay of IPinIP IPv4\;1: IPIP_IPV6 - overlay RIF with underlay of IPinIP IPv6\;2: GENERIC \;3: USIP_IPV4\;4: USIP_IPV6\;\;" access="RW" enum="IPIP_IPV4=0x0,IPIP_IPV6=0x1,GENERIC=0x2,USIP_IPV4=0x3,USIP_IPV6=0x4" offset="0x0.28" size="0x0.4" />
-	<field name="rif_loopback_parameters" descr="For protocol = IPIP_IPV4 or protocol = IPIP_IPV6 See \;Table 2222, &quot;Loopback IPinIP Overlay Router Interface \;Properties Layout,&quot; on page 2749\;For protocol = USIP_IPV4 or protocol = USIP_IPV6 See \;Table 2220, &quot;Loopback USIP Router Interface Properties \;Layout,&quot; on page 2748\;For protocol = GENERIC See Table 2218, &quot;Loopback Generic \;Router Interface Properties Layout,&quot; on page 2747" subnode="loopback_router_interface_rif_loopback_parameters_auto_ext" access="RW" offset="0x8.0" size="0x1c.0" union_selector="$(parent).protocol" />
+	<field name="rif_loopback_parameters" descr="For protocol = IPIP_IPV4 or protocol = IPIP_IPV6 See \;Table 2403, &quot;Loopback IPinIP Overlay Router Interface \;Properties Layout,&quot; on page 2537\;For protocol = USIP_IPV4 or protocol = USIP_IPV6 See \;Table 2401, &quot;Loopback USIP Router Interface Proper\;ties Layout,&quot; on page 2536\;For protocol = GENERIC See Table 2399, &quot;Loopback \;Generic Router Interface Properties Layout,&quot; on \;page 2535" subnode="loopback_router_interface_rif_loopback_parameters_auto_ext" access="RW" offset="0x8.0" size="0x1c.0" union_selector="$(parent).protocol" />
 </node>
 
 <node name="loopback_router_interface_rif_loopback_parameters_auto_ext" descr="" attr_is_union="1" size="0x1c.0" >
@@ -1961,7 +2102,7 @@
 </node>
 
 <node name="loopback_usip_router_interface_ext" descr="" size="0x18.0" >
-	<field name="usip" descr="Encapsulation Underlay source IP, used for encap of L2/L3 flex \;gen_enc\;Reserved when protocol is IPv4" access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
+	<field name="usip" descr="Encapsulation Underlay source IP, used for encap of L2/L3 \;flex gen_enc\;Reserved when protocol is IPv4" access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
 </node>
 
 <node name="mafbi_entry_auto_ext" descr="" attr_is_union="1" size="0x300.0" >
@@ -1969,18 +2110,18 @@
 </node>
 
 <node name="mafbi_entry_type0_ext" descr="" size="0x300.0" >
-	<field name="record" descr="See Table 706, &quot;MAFTI - record Layout,&quot; on page 1175" subnode="mafti_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x0.0" size="0x300.0" />
+	<field name="record" descr="See Table 778, &quot;MAFTI - record Layout,&quot; on page 943" subnode="mafti_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x0.0" size="0x300.0" />
 </node>
 
 <node name="mafbi_ext" descr="" size="0x308.0" >
 	<field name="num_rec" descr="Number of records\;Range 1..64\;\;" access="RO" offset="0x0.0" size="0x0.8" />
 	<field name="type" descr="Type:\;0: entry_type0 - Looks like MAFTI w/o bank_id" access="RO" enum="entry_type0=0x0" offset="0x0.24" size="0x0.2" />
-	<field name="entry" descr="See Table 710, &quot;MAFBI - entry_type0 Layout,&quot; on \;page 1177" subnode="mafbi_entry_auto_ext" access="RW" offset="0x8.0" size="0x300.0" union_selector="$(parent).type" />
+	<field name="entry" descr="See Table 782, &quot;MAFBI - entry_type0 Layout,&quot; on \;page 945" subnode="mafbi_entry_auto_ext" access="RW" offset="0x8.0" size="0x300.0" union_selector="$(parent).type" />
 </node>
 
 <node name="mafcr_ext" descr="" size="0xc.0" >
 	<field name="clear" descr="Clear counter_accu_overflow counter" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="counter_accu_overflow" descr="Counter of accuflow overflow.\;When system behaves &quot;well&quot; then this counter will always \;be 0.\;If ((FW polling is too slow) or (HW increment is too high)) \;then the HW accuflow becomes overflowed. In this case new \;accuflow counter increments are not counted.\;This counter is stuck at 0xF...FF" access="RO" offset="0x4.0" size="0x4.0" />
+	<field name="counter_accu_overflow" descr="Counter of accuflow overflow.\;When system behaves &quot;well&quot; then this counter will always \;be 0.\;If ((FW polling is too slow) or (HW increment is too high)) \;then the HW accuflow becomes overflowed. In this case \;new accuflow counter increments are not counted.\;This counter is stuck at 0xF...FF" access="RO" offset="0x4.0" size="0x4.0" />
 	<field name="bytes_inc_units" descr="Bytes inc units\;Units of 1 byte\;Note: this value will change only after boot/ISSU \;\;\;" access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="packets_inc_units" descr="Backets inc units\;Units of 1 packet\;Note: this value will change only after boot/ISSU \;\;" access="RO" offset="0x8.16" size="0x0.16" />
 </node>
@@ -1988,10 +2129,10 @@
 <node name="mafri_ext" descr="" size="0x410.0" >
 	<field name="num_rec" descr="Number of records to read\;Range 1..128" access="OP" offset="0x0.0" size="0x0.8" />
 	<field name="event" descr="Event generation:\;0: NO_EVENT - Do not generate MAFRI event\;1: EVENTS - Generate MAFRI event\;Note: return of EMAD must be after the MAFRI event!" access="OP" offset="0x0.16" size="0x0.1" />
-	<field name="fsf" descr="Flush spill fifo\;0: NO_FLUSH_SPILL\;1: FLUSH_SPILL - will trigger MAFTI events for all relevant \;spill -fifos\;Note: return of EMAD must be after the MAFTI event!" access="OP" offset="0x0.24" size="0x0.1" />
-	<field name="counter_index_base" descr="Counter Index base\;Counters will be read starting at counter_index_base\;Range: cap_start_accuflow .. cap_start_accuflow+cap_max\;_accuflow - 1\;Note: counter_index_base + num_rec must be equal or \;lower than cap_max_accuflow" access="OP" offset="0x4.0" size="0x0.24" />
+	<field name="fsf" descr="Flush spill fifo\;0: NO_FLUSH_SPILL\;1: FLUSH_SPILL - will trigger MAFTI events for all rele\;vant spill -fifos\;Note: return of EMAD must be after the MAFTI event!" access="OP" offset="0x0.24" size="0x0.1" />
+	<field name="counter_index_base" descr="Counter Index base\;Counters will be read starting at counter_index_base\;Range: cap_start_accuflow .. cap_start_accuflow+cap_\;max_accuflow - 1\;Note: counter_index_base + num_rec must be equal or \;lower than cap_max_accuflow" access="OP" offset="0x4.0" size="0x0.24" />
 	<field name="user_val" descr="User val:\;Opaque field to be returned on MAFRI trap" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="record" descr="See Table 714, &quot;MAFRI - record Layout,&quot; on page 1179" subnode="mafri_record_ext" access="RW" high_bound="127" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="record" descr="See Table 786, &quot;MAFRI - record Layout,&quot; on page 947" subnode="mafri_record_ext" access="RW" high_bound="127" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="mafri_record_ext" descr="" size="0x8.0" >
@@ -2001,11 +2142,11 @@
 
 <node name="mafti_ext" descr="" size="0x308.0" >
 	<field name="num_rec" descr="Number of records\;Range 1..64\;\;" access="RO" offset="0x0.0" size="0x0.8" />
-	<field name="record" descr="See Table 706, &quot;MAFTI - record Layout,&quot; on page 1175" subnode="mafti_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x8.0" size="0x300.0" />
+	<field name="record" descr="See Table 778, &quot;MAFTI - record Layout,&quot; on page 943" subnode="mafti_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x8.0" size="0x300.0" />
 </node>
 
 <node name="mafti_record_ext" descr="" size="0xc.0" >
-	<field name="counter_index" descr="Counter Index for flow counters.\;Note: different MAFTI records may have the exact same \;counter_index.\;For Spectrum-2 see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059" access="RO" offset="0x0.0" size="0x0.24" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;Note: different MAFTI records may have the exact same \;counter_index.\;For Spectrum-2 see Section 4.2, &quot;Flow Counters&quot;, on \;page 821" access="RO" offset="0x0.0" size="0x0.24" />
 	<field name="bytes_inc" descr="Bytes to increment to bytes counter\;Unit of MAFCR.bytes_inc_units\;Note that user needs to add 64B for each packet\;\;" access="RO" offset="0x4.0" size="0x4.0" />
 	<field name="packets_inc" descr="Packets to increment to packets counter\;Unit is MAFCR.packets_inc_units\;" access="RO" offset="0x8.0" size="0x4.0" />
 </node>
@@ -2033,11 +2174,11 @@
 	<field name="instruction" descr="Command to be executed by the FSM\;0x1: LOCK_UPDATE_HANDLE\;0x2: RELEASE_UPDATE_HANDLE \;0x3: UPDATE_COMPONENT\;0x4: VERIFY_COMPONENT\;0x5: ACTIVATE_COMPONENET \;0x6: ACTIVATE\;0x7: READ_COMPONENT\;0x8: CANCEL\;0x9: CHECK_UPDATE_HANDLE\;0xA: FORCE_HANDLE_RELEASE\;0xB: READ_PENDING_COMPONENT\;0xC: DOWNSRTEAM_DEVICE_TRANSFER\;Other values are reserved. Applicable for write opera\;tion only." access="RW" enum="LOCK_UPDATE_HANDLE=0x1,RELEASE_UPDATE_HANDLE=0x2,UPDATE_COMPONENT=0x3,VERIFY_COMPONENT=0x4,ACTIVATE_COMPONENET=0x5,ACTIVATE=0x6,READ_COMPONENT=0x7,CANCEL=0x8,CHECK_UPDATE_HANDLE=0x9,FORCE_HANDLE_RELEASE=0xa,READ_PENDING_COMPONENT=0xb,DOWNSRTEAM_DEVICE_TRANSFER=0xc" offset="0x0.0" size="0x0.8" />
 	<field name="activation_delay_sec" descr="This is a configuration that delays the activation of the \;component in seconds. Relevant only for activate com\;mand.\;This configuration is volatile." access="RW" offset="0x0.8" size="0x0.8" />
 	<field name="time_elapsed_since_last_cmd" descr="The number of seconds elapsed since the update_han\;dle owner last issued a command. The time saturates \;at 0xFFF." access="RO" offset="0x0.16" size="0x0.12" />
-	<field name="component_index" descr="Index of the accessed component. Valid for \;UPDATE_COMPONENT, ACTIVATE_COMPONENET, \;READ_COMPONENT and READ_PENDING_COMPO\;NENT instructions. Otherwise, this field is reserved." access="INDEX" offset="0x4.0" size="0x0.16" />
+	<field name="component_index" descr="Index of the accessed component. \;Value from MCQS.component_index\;Valid for \;UPDATE_COMPONENT, ACTIVATE_COMPONENET, \;READ_COMPONENT and READ_PENDING_COMPO\;NENT instructions. Otherwise, this field is reserved." access="INDEX" offset="0x4.0" size="0x0.16" />
 	<field name="update_handle" descr="Token representing the current flow executed by the \;FSM.\;" access="RW" offset="0x8.0" size="0x0.24" />
 	<field name="auto_update" descr="Auto-update to all matching downstream devices is \;requested." access="WO" offset="0x8.31" size="0x0.1" />
 	<field name="control_state" descr="Current Update FSM state\;0x0: IDLE\;0x1: LOCKED\;0x2: INITIALIZE\;0x3: DOWNLOAD\;0x4: VERIFY\;0x5: APPLY\;0x6: ACTIVATE\;0x7: UPLOAD\;0x8: UPLOAD_PENDING\;0x9: DOWNSRTEAM_DEVICE_TRANSFER\;Other values are reserved" access="RO" enum="IDLE=0x0,LOCKED=0x1,INITIALIZE=0x2,DOWNLOAD=0x3,VERIFY=0x4,APPLY=0x5,ACTIVATE=0x6,UPLOAD=0x7,UPLOAD_PENDING=0x8,DOWNSRTEAM_DEVICE_TRANSFER=0x9" offset="0xC.0" size="0x0.4" />
-	<field name="error_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. \;0x0: OK\;0x1: ERROR\;0x2: REJECTED_DIGEST_ERR\;0x3: REJECTED_NOT_APPLICABLE\;0x4: REJECTED_UNKNOWN_KEY\;0x5: REJECTED_AUTH_FAILED\;0x6: REJECTED_UNSIGNED\;0x7: REJECTED_KEY_NOT_APPLICABLE\;0x8: REJECTED_BAD_FORMAT\;0x9: BLOCKED_PENDING_RESET\;0xA: REJECTED_NOT_A_SECURED_FW\;0xB: REJECTED_MFG_BASE_MAC_NOT_LISTED\;0xC: REJECTED_NO_DEBUG_TOKEN\;0xD: REJECTED_VERSION_NUM_MISMATCH\;0xE: REJECTED_USER_TIMESTAMP_MISMATCH\;0xF: REJECTED_FORBIDDEN_VERSION\;0x10: FLASH_ERASE_ERROR\;0x11: REJECTED_REBURN_RUNNING_AND_RETRY\;0x12: REJECTED_LINKX_TYPE_NOT_SUPPORTED\;0x13: REJECTED_HOST_STORAGE_IN_USE\;0x14: REJECTED_LINKX_TRANSFER (see module \;index in rejected_device_index)\;0x15: REJECTED_LINKX_ACTIVATE (see module index \;in rejected_device_index)\;0x16: REJECTED_TOKEN_ALREADY_APPLIED\;Other values should be treated as an unknown error." access="RO" offset="0xC.8" size="0x0.8" />
+	<field name="error_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. \;0x0: OK\;0x1: ERROR\;0x2: REJECTED_DIGEST_ERR\;0x3: REJECTED_NOT_APPLICABLE\;0x4: REJECTED_UNKNOWN_KEY\;0x5: REJECTED_AUTH_FAILED\;0x6: REJECTED_UNSIGNED\;0x7: REJECTED_KEY_NOT_APPLICABLE\;0x8: REJECTED_BAD_FORMAT\;0x9: BLOCKED_PENDING_RESET\;0xA: REJECTED_NOT_A_SECURED_FW\;0xB: REJECTED_MFG_BASE_MAC_NOT_LISTED\;0xC: REJECTED_NO_DEBUG_TOKEN\;0xD: REJECTED_VERSION_NUM_MISMATCH\;0xE: REJECTED_USER_TIMESTAMP_MISMATCH\;0xF: REJECTED_FORBIDDEN_VERSION\;0x10: FLASH_ERASE_ERROR\;0x11: REJECTED_REBURN_RUNNING_AND_RETRY\;0x12: REJECTED_LINKX_TYPE_NOT_SUPPORTED\;0x13: REJECTED_HOST_STORAGE_IN_USE\;0x14: REJECTED_LINKX_TRANSFER (see module \;index in rejected_device_index)\;0x15: REJECTED_LINKX_ACTIVATE (see module index \;in rejected_device_index)\;0x16: REJECTED_INCOMPATIBLE_FLASH\;0x17: REJECTED_TOKEN_ALREADY_APPLIED\;Other values should be treated as an unknown error." access="RO" offset="0xC.8" size="0x0.8" />
 	<field name="control_progress" descr="Indicates the estimated progress status of the current \;operation executed by the FSM. Valid values are 0..100.\;101 indicates that progress reporting is not supported \;for this update state." access="RO" offset="0xC.16" size="0x0.7" />
 	<field name="handle_owner_host_id" descr="For handle_owner_type BMC, command-interface and \;ICMD, indicates the identifier of the host of the handle \;owner.\;Otherwise reserved" access="RO" offset="0xC.24" size="0x0.4" />
 	<field name="handle_owner_type" descr="Type of entity holding the update handle:\;0x0: unspecified\;0x1: Chassis BMC\;0x2: MAD\;0x3: BMC\;0x4: command interface\;0x5: ICMD \;Other values are reserved." access="RO" offset="0xC.28" size="0x0.4" />
@@ -2050,7 +2191,7 @@
 
 <node name="mcda_reg_ext" descr="" size="0x90.0" >
 	<field name="update_handle" descr="Update handle registered when the FSM was activated." access="RW" offset="0x0.0" size="0x0.24" />
-	<field name="offset" descr="Offset of accessed address relative to component start. \;Accesses must be in accordance to log_mcda_word_\;size in Table 500, &quot;MCQI CAPABILITIES Info Lay\;out,&quot; on page 974" access="RW" offset="0x4.0" size="0x4.0" />
+	<field name="offset" descr="Offset of accessed address relative to component start. \;Accesses must be in accordance to log_mcda_word_\;size in Table 466, &quot;MCQI CAPABILITIES Info Lay\;out,&quot; on page 695" access="RW" offset="0x4.0" size="0x4.0" />
 	<field name="size" descr="Size of the data accessed, given in bytes" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="data" descr="Data block accessed" access="RW" high_bound="31" low_bound="0" offset="0x10.0" size="0x80.0" />
 </node>
@@ -2065,7 +2206,7 @@
 	<field name="mailbox_page_phys_addr_lsb" descr="Physical address of the mailbox page." access="RW" offset="0x1C.0" size="0x4.0" />
 </node>
 
-<node name="mcia_ext" descr="" size="0x90.0" >
+<node name="mcia_ext" descr="" size="0x94.0" >
 	<field name="status" descr="Module Status\;0h - GOOD\;1h - NO_EEPROM_MODULE. No response from module&apos;s \;EPROM.\;2h - MODULE_NOT_SUPPORTED. Module type not sup\;ported by the device. \;3h - MODULE_NOT_CONNECTED. No module present indi\;cation. \;9h - I2C_ERROR. Error occurred while trying to access the \;module&apos;s EPROM using I2C.\;10h - MODULE_DISABLED - module is disabled \;[Internal] 11h - Page Access Failed - page not supported or \;trying to access a protected page with bad password." access="RO" offset="0x0.0" size="0x0.8" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.12" size="0x0.4" />
 	<field name="module" descr="Module number" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -2075,7 +2216,9 @@
 	<field name="i2c_device_address" descr="I2C device address" access="INDEX" offset="0x4.24" size="0x0.8" />
 	<field name="size" descr="Number of bytes to read/write (up to 128 bytes)" access="INDEX" offset="0x8.0" size="0x0.16" />
 	<field name="bank_number" descr="Bank number" access="INDEX" offset="0x8.16" size="0x0.8" />
+	<field name="password" descr="The password that is written to the module password field.\;This field is reserved if passwd_cap is not set to 1." access="OP" offset="0xC.0" size="0x4.0" />
 	<field name="dword" descr="Bytes to read/write" access="RW" high_bound="31" low_bound="0" offset="0x10.0" size="0x80.0" />
+	<field name="password_msb" descr="password msb" access="RW" offset="0x90.0" size="0x4.0" />
 </node>
 
 <node name="mcion_ext" descr="" size="0xc.0" >
@@ -2151,7 +2294,7 @@
 	<field name="info_size" descr="Properties set structure size, given in bytes." access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="offset" descr="The requested/returned data offset from the section \;start, given in bytes.\;Must be DWORD aligned." access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="data_size" descr="The requested/returned data size, given in bytes.\;If data_size is not DWORD aligned, the last bytes are \;zero padded." access="RW" offset="0x14.0" size="0x0.16" />
-	<field name="data" descr="Properties set structure according to info_type.\;CAPABILITIES - See Table 500, &quot;MCQI CAPABILI\;TIES Info Layout,&quot; on page 974\;VERSION - See Table 502, &quot;MCQI VERSION Info \;Layout,&quot; on page 976\;ACTIVATION_METHOD - See Table 506, &quot;MCQI ACTI\;VATION_METHOD Info Layout,&quot; on page 978\;LINKX_PREPERTIES - See Table 508, &quot;MCQI LINKX\;_PROPERTIES Info Layout,&quot; on page 979" subnode="mcqi_reg_data_auto_ext" access="RO" offset="0x18.0" size="0x7c.0" union_selector="$(parent).info_type" />
+	<field name="data" descr="Properties set structure according to info_type.\;CAPABILITIES - See Table 466, &quot;MCQI CAPABILI\;TIES Info Layout,&quot; on page 695\;VERSION - See Table 468, &quot;MCQI VERSION Info \;Layout,&quot; on page 697\;ACTIVATION_METHOD - See Table 472, &quot;MCQI ACTI\;VATION_METHOD Info Layout,&quot; on page 699\;LINKX_PREPERTIES - See Table 474, &quot;MCQI LINKX\;_PROPERTIES Info Layout,&quot; on page 700" subnode="mcqi_reg_data_auto_ext" access="RO" offset="0x18.0" size="0x7c.0" union_selector="$(parent).info_type" />
 </node>
 
 <node name="mcqi_version_ext" descr="" size="0x7c.0" >
@@ -2159,8 +2302,8 @@
 	<field name="user_defined_time_valid" descr="When set, the component has a valid user-defined ver\;sion time-stamp in user_defined_time" access="RW" offset="0x0.28" size="0x0.1" />
 	<field name="build_time_valid" descr="When set, the component has a valid creation time-\;stamp in build_time" access="RW" offset="0x0.29" size="0x0.1" />
 	<field name="version" descr="Version number" access="RW" offset="0x4.0" size="0x4.0" />
-	<field name="build_time" descr="Time of component creation. Valid only if build_\;time_valid is set. See Table 504, &quot;Date-Time Lay\;out,&quot; on page 977" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
-	<field name="user_defined_time" descr="User-defined time assigned to the component version. \;Valid only if user_defined_time_valid is set. See \;Table 504, &quot;Date-Time Layout,&quot; on page 977" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
+	<field name="build_time" descr="Time of component creation. Valid only if build_\;time_valid is set. See Table 470, &quot;Date-Time Lay\;out,&quot; on page 698" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
+	<field name="user_defined_time" descr="User-defined time assigned to the component version. \;Valid only if user_defined_time_valid is set. See \;Table 470, &quot;Date-Time Layout,&quot; on page 698" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
 	<field name="build_tool_version" descr="Build tool version number.\;Valid only when not equal to 0" access="RW" offset="0x18.0" size="0x4.0" />
 	<field name="version_string" descr="NULL terminated string representing the version." access="RW" high_bound="91" low_bound="0" offset="0x20.24" size="0x5c.0" />
 </node>
@@ -2182,7 +2325,7 @@
 	<field name="device_type" descr="Peripheral device type\;1: XM" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="device_index" descr="Device number \;For gearboxes, the index represents the gearbox die." access="INDEX" offset="0x4.0" size="0x0.12" />
-	<field name="device_status_data" descr="Device initialization Data. \;For XM status, see Table 530, &quot;MDCR - XM Data Layout,&quot; \;on page 997" subnode="mdcr_xm_data_ext" access="RO" offset="0x10.0" size="0x50.0" />
+	<field name="device_status_data" descr="Device initialization Data. \;For XM status, see Table 608, &quot;MDCR - XM Data Layout,&quot; \;on page 785" subnode="mdcr_xm_data_ext" access="RO" offset="0x10.0" size="0x50.0" />
 </node>
 
 <node name="mdcr_xm_data_ext" descr="" size="0x50.0" >
@@ -2216,7 +2359,7 @@
 	<field name="response_message_sequence" descr="Response message sequential number. \;For a specific request, the response message sequential num\;ber is the following one. \;In addition, the last message should be 0." access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="query_index" descr="Index related to the specific query_type. \;For query_type = 1,2,3 this field is neglected." access="INDEX" offset="0x8.0" size="0x0.8" />
 	<field name="data_valid" descr="If set, the data in the data field is valid and contain the informa\;tion for the queried index. \;Note: This field is not reflecting any validity of the data while \;accessing a non-existing query entity. Querying with an out of \;range index will lead to BAD_PARAM status of the register." access="RO" offset="0x8.31" size="0x0.1" />
-	<field name="data" descr="Properties of that field are based on query_type.\;For slot information query_type data - see Table 542, \;&quot;slot_info Register Layout,&quot; on page 1003\;For devices on slot query_type data - see Table 544, \;&quot;device_info Register Layout,&quot; on page 1004\;For slot name query_type data - see Table 546, &quot;slot_name \;Register Layout,&quot; on page 1005" subnode="mddq_data_auto_ext" access="RO" offset="0x10.0" size="0x20.0" union_selector="$(parent).query_type" />
+	<field name="data" descr="Properties of that field are based on query_type.\;For slot information query_type data - see Table 414, &quot;MDDQ \;slot_info Layout,&quot; on page 656\;For devices on slot query_type data - see Table 416, &quot;MDDQ \;device_info Register Layout,&quot; on page 657\;For slot name query_type data - see Table 418, &quot;MDDQ \;slot_name Layout,&quot; on page 659" subnode="mddq_data_auto_ext" access="RO" offset="0x10.0" size="0x20.0" union_selector="$(parent).query_type" />
 </node>
 
 <node name="mddt_reg_ext" descr="" size="0x110.0" >
@@ -2225,7 +2368,7 @@
 	<field name="type" descr="0: PRM_Register\;1: Command\;2: CrSpace_access - [Internal]" access="OP" enum="PRM_Register=0x0,Command=0x1,CrSpace_access=0x2" offset="0x4.0" size="0x0.2" />
 	<field name="write_size" descr="Write size in D-Words." access="OP" offset="0x4.16" size="0x0.8" />
 	<field name="read_size" descr="Read size in D-Words." access="OP" offset="0x4.24" size="0x0.8" />
-	<field name="payload" descr="Payload\;For PRM Register type payload- See Table 534, &quot;PRM \;Register Payload Layout,&quot; on page 1000\;For Command type payload - See Table 536, &quot;Com\;mand Payload Layout,&quot; on page 1000\;For CrSpace type payload - See Table 538, &quot;CrSpace \;access Payload Layout,&quot; on page 1001" subnode="mddt_reg_payload_auto_ext" access="RW" offset="0xC.0" size="0x104.0" union_selector="$(parent).type" />
+	<field name="payload" descr="Payload\;For PRM Register type payload- See Table 406, &quot;PRM \;Register Payload Layout,&quot; on page 652\;For Command type payload - See Table 408, &quot;Com\;mand Payload Layout,&quot; on page 652\;For CrSpace type payload - See Table 410, &quot;CrSpace \;access Payload Layout,&quot; on page 653" subnode="mddt_reg_payload_auto_ext" access="RW" offset="0xC.0" size="0x104.0" union_selector="$(parent).type" />
 </node>
 
 <node name="mddt_reg_payload_auto_ext" descr="" attr_is_union="1" size="0x104.0" >
@@ -2263,13 +2406,13 @@
 <node name="mdri_ext" descr="" size="0x120.0" >
 	<field name="clear" descr="Per bit:\;Bit 0: clear global_reasons\;Bit 1: clear port_reasons\;Bit 2: clear buffer_reasons\;Bit 3: clear ethernet_reasons\;Bit 4: clear ip_reasons\;Bit 5: clear mpls_reasons\;Bit 6: clear tunnel_reasons\;Bit 7: clear host_reasons" access="OP" offset="0x0.0" size="0x0.8" />
 	<field name="read" descr="Per bit:\;Bit 0: read global_reasons\;Bit 1: read port_reasons\;Bit 2: read buffer_reasons\;Bit 3: read ethernet_reasons\;Bit 4: read ip_reasons\;Bit 5: read mpls_reasons\;Bit 6: read tunnel_reasons\;Bit 7: read host_reasons" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="global_reasons" descr="Bit0: TCAM ECC Error (had a correctable ECC error)\;Bit1: no egress port (e.g. MC group is empty, port-isolation)\;\;Bit3: MAFCR.counter_accu_overflow was incremented (this is \;not a discard, but it&apos;s a bad behavior)" access="RO" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="global_reasons" descr="Bit0: TCAM ECC Error (had a correctable ECC error)\;Bit1: no egress port (e.g. MC group is empty, port-isolation)\;\;Bit3: MAFCR.counter_accu_overflow was incremented (this \;is not a discard, but it&apos;s a bad behavior)" access="RO" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="port_reasons" descr="Bit0: receive buffer overflow\;\;Bit1: egress mtu error" access="RO" high_bound="7" low_bound="0" offset="0x40.0" size="0x20.0" />
 	<field name="buffer_reasons" descr="Bit0: sll" access="RO" high_bound="7" low_bound="0" offset="0x60.0" size="0x20.0" />
 	<field name="ethernet_reasons" descr="Bit0: smac is mc\;Bit1: smac equal dmac\;Bit2: invalid ethertype (0x05DC &lt; ethertype &lt; 0x600)Bit3: \;ingress spanning tree\;Bit4: fdb_miss, same as trap_id FDB_MISS\;Bit5: fdb_mismatch, same as trap_id FDB_MISMATCH\;Bit6: fid miss, same as trap_id FID_MISS" access="RO" high_bound="7" low_bound="0" offset="0x80.0" size="0x20.0" />
-	<field name="ip_reasons" descr="Bit0: packet to router is not ip/mpls/arp (no ip header)\;Bit1: disabled irif \;Bit2: uc dip over mc or bc mac\;Bit3: dip is loopback address \;for ipv6: (dip==::1/128) || (dip==0:0:0:0:0:ffff:7f00:0/104)\;for ipv4: dip==127.0.0.0/8\;Bit4: sip is mc \;for ipv6: (SIP == FF00::/8)\;for ipv4: (SIP == 224.0.0.0: 239.255.255.255 aka 224.0.0.0/4)\;Bit5: sip is in class e\;(pkt is ipv4) &amp;&amp; (sip == 240.0.0.0/4) &amp;&amp; (sip != 255.255.255.255)\;Bit6: sip is loopback\;for ipv6: sip == ::1/128\;for ipv4: sip == 127.0.0.0/8\;Bit7: sip is unspecified\;for ipv6: sip == ::0\;for ipv4: sip == 0.0.0.0/32\;Bit8: ip header not okay (IPVer, checksum, IHL)Bit9: mc mac \;mismatch\;\;Bit10: sip equal dip\;Bit11: ipv4 sip is limited broadcast\;Bit12: lpm no route uc ipv4\;Bit13: lpm no route uc ipv6\;Bit14: uc dip is link local, same as trap_id&apos;s DIS\;CARD_ING_ROUTER_DIP_LINK_LOCAL, IPV6_LINK_LO\;CAL_DEST\;Bit15: sip is link local, same as trap_id&apos;s DISCARD_ING_ROUT\;ER_SIP_LINK_LOCAL, IPV6_LINK_LOCAL_SRC\;Bit16: mc egress mtu aggregated\;Bit17: mc RPF \;Bit18: uc RPF Bit20: IPv4 dip is limited broadcast (dip==bc)\;Bit21: IPv4 dip is local network (dip == 0.0.0.0/8)\;Bit22: NVE packet to overlay router \;\;Bit23: mc dip over uc mac\;Bit24: mc dip is link local, same as trap_id: LOCALNETWORK, \;IPV6_MC_LINK_LOCALDEST\;Bit25: ingress MTU (this check is configured as forward)\;Bit26: mc egress mtu, (both for UC and for MC, MPLS)\;Bit29: ttl_error, same as trap_id TTLERROR\;Bit30: disabled erif \;\;Bit31: host miss ipv4, same as trap_id HOST_MISS_IPV4\;Bit32: host miss ipv6, same as trap_id HOST_MISS_IPV6\;Bit33: loopback error, same as trap_id LBERROR\;Bit34: ipv6 dip is unspecified, dip==::0/128, same as trap_id" access="RO" high_bound="7" low_bound="0" offset="0xA0.0" size="0x20.0" />
-	<field name="mpls_reasons" descr="Bit0: outer label is not valid\;\;Bit1: no IP after decap (or after php)\;\;Bit3: mpls uc Ethertype (0x8847) over mc or bc mac\;Bit4: mpls mc Ethertype over not allowed mac\;Bit5: MPLS min ingress label allowed (label too low)\;Bit6: MPLS max ingress label allowed (label too high)\;Bit7: ReservedBit8: php decap and no ip header or ip header is \;not okay\;\;Bit9: ilm miss, same as trap_id MPLS_ILM_MISS\;Bit10: mpls loopback filter" access="RO" high_bound="7" low_bound="0" offset="0xC0.0" size="0x20.0" />
-	<field name="tunnel_reasons" descr="Bit0: decap_encap_prevention - same as trap_id DECAP_EN\;CAP\;Bit1: ipip_tunnel_loop \;\;Bit2: reserved\;\;Bit3: ipip_decap_error - same as trap_id IPIP_DECAP_ERROR\;Bit4: ipip_error - same as trap_id IPIP_ERROR. For Spectrum-\;2 catches nothing \;Bit7: nve_decap_frag_error - same as trap_id NVE_DECAP_\;FRAG_ERROR\;Bit8: overlay_port_isolation - see TNIFR\;\;Bit10: overlay_smac_is_mc\;Bit11: overlay_smac_equal_dmac\;Bit12: overlay_is_too_short - (decap remains with short \;packet) - also catches VLAN removal. Only for Spectrum-1/2/3. \;Bit13: decap_underlay_is_too_long - (decap of more than 126 \;bytes)\;\;Bit14: nve_decap_error - same as trap_id NVE_DECAP \;_TAG_ERROR\;Bit15: decap_ecn - same as trap_id DECAP_ECN0, \;DECAP_ECN1\;" access="RO" high_bound="7" low_bound="0" offset="0xE0.0" size="0x20.0" />
+	<field name="ip_reasons" descr="Bit0: packet to router is not ip/mpls/arp (no ip header)\;Bit1: disabled irif \;Bit2: uc dip over mc or bc mac\;Bit3: dip is loopback address \;for ipv6: (dip==::1/128) || (dip==0:0:0:0:0:ffff:7f00:0/104)\;for ipv4: dip==127.0.0.0/8\;Bit4: sip is mc \;for ipv6: (SIP == FF00::/8)\;for ipv4: (SIP == 224.0.0.0: 239.255.255.255 aka 224.0.0.0/4)\;Bit5: sip is in class e\;(pkt is ipv4) &amp;&amp; (sip == 240.0.0.0/4) &amp;&amp; (sip != \;255.255.255.255)\;Bit6: sip is loopback\;for ipv6: sip == ::1/128\;for ipv4: sip == 127.0.0.0/8\;Bit7: sip is unspecified\;for ipv6: sip == ::0\;for ipv4: sip == 0.0.0.0/32\;Bit8: ip header not okay (IPVer, checksum, IHL)Bit9: mc mac \;mismatch\;\;Bit10: sip equal dip\;Bit11: ipv4 sip is limited broadcast\;Bit12: lpm no route uc ipv4\;Bit13: lpm no route uc ipv6\;Bit14: uc dip is link local, same as trap_id&apos;s DIS\;CARD_ING_ROUTER_DIP_LINK_LOCAL, IPV6_LINK_LO\;CAL_DEST\;Bit15: sip is link local, same as trap_id&apos;s DIS\;CARD_ING_ROUTER_SIP_LINK_LOCAL, IPV6_LINK_LO\;CAL_SRC\;Bit16: mc egress mtu aggregated\;Bit17: mc RPF \;Bit18: uc RPF Bit20: IPv4 dip is limited broadcast (dip==bc)\;Bit21: IPv4 dip is local network (dip == 0.0.0.0/8)\;Bit22: NVE packet to overlay router \;\;Bit23: mc dip over uc mac\;Bit24: mc dip is link local, same as trap_id: LOCALNET\;WORK, IPV6_MC_LINK_LOCALDEST\;Bit25: ingress MTU (this check is configured as forward)\;Bit26: mc egress mtu, (both for UC and for MC, MPLS)\;Bit29: ttl_error, same as trap_id TTLERROR\;Bit30: disabled erif \;\;Bit31: host miss ipv4, same as trap_id HOST_MISS_IPV4\;Bit32: host miss ipv6, same as trap_id HOST_MISS_IPV6\;Bit33: loopback error, same as trap_id LBERROR\;Bit34: ipv6 dip is unspecified, dip==::0/128, same as trap_id" access="RO" high_bound="7" low_bound="0" offset="0xA0.0" size="0x20.0" />
+	<field name="mpls_reasons" descr="Bit0: outer label is not valid\;\;Bit1: no IP after decap (or after php)\;\;Bit3: mpls uc Ethertype (0x8847) over mc or bc mac\;Bit4: mpls mc Ethertype over not allowed mac\;Bit5: MPLS min ingress label allowed (label too low)\;Bit6: MPLS max ingress label allowed (label too high)\;Bit7: ReservedBit8: php decap and no ip header or ip header \;is not okay\;\;Bit9: ilm miss, same as trap_id MPLS_ILM_MISS\;Bit10: mpls loopback filter" access="RO" high_bound="7" low_bound="0" offset="0xC0.0" size="0x20.0" />
+	<field name="tunnel_reasons" descr="Bit0: decap_encap_prevention - same as trap_id DECAP_EN\;CAP\;Bit1: ipip_tunnel_loop \;\;Bit2: reserved\;\;Bit3: ipip_decap_error - same as trap_id IPIP_DECAP_ER\;ROR\;Bit4: ipip_error - same as trap_id IPIP_ERROR. For Spec\;trum-2 catches nothing \;Bit7: nve_decap_frag_error - same as trap_id NVE_DECAP_\;FRAG_ERROR\;Bit8: overlay_port_isolation - see TNIFR\;\;Bit10: overlay_smac_is_mc\;Bit11: overlay_smac_equal_dmac\;Bit12: overlay_is_too_short - (decap remains with short \;packet) - also catches VLAN removal. Only for Spectrum-1/2/\;3. \;Bit13: decap_underlay_is_too_long - (decap of more than 126 \;bytes)\;\;Bit14: nve_decap_error - same as trap_id NVE_DECAP \;_TAG_ERROR\;Bit15: decap_ecn - same as trap_id DECAP_ECN0, \;DECAP_ECN1\;" access="RO" high_bound="7" low_bound="0" offset="0xE0.0" size="0x20.0" />
 	<field name="host_reasons" descr="Bit0: tx_base_header_is_wrong - (version or base type)\;Bit1: tx_base_header_system_port_is_out_of_range" access="RO" high_bound="7" low_bound="0" offset="0x100.0" size="0x20.0" />
 </node>
 
@@ -2281,6 +2424,14 @@
 	<field name="time_left" descr="Time left in seconds.\;In case that status is 2 (debug session active) - time left for \;token operation\;In case that status is 4 (challenge provided, no token \;installed yet) - time left for token installation\;For any other status, field should be zero" access="RO" offset="0x8.0" size="0x4.0" />
 </node>
 
+<node name="meccc_ext" descr="" size="0x14.0" >
+	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="device_index" descr="Device index\;For gearboxes, the index represents the gearbox die" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="clr" descr="Clear counters\;" access="OP" offset="0x4.0" size="0x0.1" />
+	<field name="ecc_crt_cnt" descr="ECC Correctable Counter\;Counter increments 1 time per each SRAM (including \;TCAM) which had 1 or more ECC correctable events. \;Cleared at: (1) reset (including soft_reset), (2) clear bit\;Counts from: (1) main, (2) all tiles" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="ecc_ucrt_cnt" descr="ECC Uncorrectable Counter\;Cleared at: (1) reset (including soft_reset), (2) clear bit\;" access="RO" offset="0x10.0" size="0x0.8" />
+</node>
+
 <node name="merr_ext" descr="" size="0x14.0" >
 	<field name="ent_type" descr="Entity type.\;0: Reserved\;1: QSFP Module (the relevant signals are: present, reset, \;interrupt, power enable, low power mode, power good, mod\;sel, QSFP LEDs)" access="INDEX" offset="0x0.0" size="0x0.4" />
 	<field name="current_index" descr="Current entity index" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -2320,14 +2471,14 @@
 
 <node name="mfde_ext" descr="" size="0xb0.0" >
 	<field name="event_id" descr="1: crspace_timeout\;2: kvd_im_stop - KVD insertion machine stopped\;3: test\;4: fw_assert\;5: fatal_cause" access="RO" enum="crspace_timeout=0x1,kvd_im_stop=0x2,test=0x3,fw_assert=0x4,fatal_cause=0x5" offset="0x0.0" size="0x0.16" />
-	<field name="severity" descr="Severity:\;2: FATL - (fatal) Unrecoverable switch behavior\;3: NRML - (normal) Unexpected state with possible sys\;temic Failure\;5: INTR - (debug) Unexpected state without systemic Failure" access="RO" enum="FATL=0x2,NRML=0x3,INTR=0x5" offset="0x0.16" size="0x0.8" />
+	<field name="severity" descr="Severity:\;2: FATL - (fatal) Unrecoverable switch behavior\;3: NRML - (normal) Unexpected state with possible sys\;temic Failure\;5: INTR - (debug) Unexpected state without systemic Fail\;ure" access="RO" enum="FATL=0x2,NRML=0x3,INTR=0x5" offset="0x0.16" size="0x0.8" />
 	<field name="irisc_id" descr="Which irisc triggered the event" access="RO" offset="0x0.24" size="0x0.8" />
 	<field name="reg_attr_id" descr="When command_type = 0 (MAD):\;attribute id\;When command_type = 1 (EMAD):\;register id" access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="mgmt_class" descr="reserved when command_type !=0 (MAD)" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="command_type" descr="0: MAD\;1: EMAD\;2: CMDIF\;3: INTERNAL_FW_FLOW" access="RO" offset="0x4.24" size="0x0.2" />
 	<field name="long_process" descr="indicates if the command is in long_process mode" access="RO" offset="0x4.28" size="0x0.1" />
 	<field name="method" descr="0: Query\;1: Write" access="RO" offset="0x4.29" size="0x0.1" />
-	<field name="event_params" descr="event parameters - layout is according to event_id value:\;See Table 753, &quot;Event_params crspace_timeout Lay\;out,&quot; on page 1211\;See Table 755, &quot;Event_params kvd_im_stop Layout,&quot; \;on page 1212\;See Table 757, &quot;Event_params test Layout,&quot; on \;page 1213\;See Table 759, &quot;Event_params fw_assert Layout,&quot; on \;page 1214\;See Table 761, &quot;Event_params fatal_cause Layout,&quot; on \;page 1216" subnode="mfde_event_params_auto_ext" access="RW" offset="0x10.0" size="0xa0.0" union_selector="$(parent).event_id" />
+	<field name="event_params" descr="event parameters - layout is according to event_id value:\;See Table 832, &quot;Event_params crspace_timeout Lay\;out,&quot; on page 988\;See Table 834, &quot;Event_params kvd_im_stop Layout,&quot; \;on page 989\;See Table 836, &quot;Event_params test Layout,&quot; on \;page 990\;See Table 838, &quot;Event_params fw_assert Layout,&quot; on \;page 991\;See Table 840, &quot;Event_params fatal_cause Layout,&quot; \;on page 993" subnode="mfde_event_params_auto_ext" access="RW" offset="0x10.0" size="0xa0.0" union_selector="$(parent).event_id" />
 </node>
 
 <node name="mfgd_ext" descr="" size="0x4.0" >
@@ -2393,7 +2544,7 @@
 
 <node name="mfsl_ext" descr="" size="0xc.0" >
 	<field name="ie" descr="Interrupt Enable. If the ie bit is set and the Tachometer reading \;is out of range as defined by tach_min and tach_max, the \;FERR# will be asserted." access="RW" offset="0x0.0" size="0x0.1" />
-	<field name="ee" descr="Event Enable.\;0 - Do not generate event\;1 - Generate Event \;2 - Generate single event\;For Fan Error Evet details refer to Section  3.13.5, &quot;FORE - Fan \;Out of Range Event&quot;." access="RW" offset="0x0.2" size="0x0.2" />
+	<field name="ee" descr="Event Enable.\;0 - Do not generate event\;1 - Generate Event \;2 - Generate single event\;For Fan Error Evet details refer to Section  3.14, &quot;PPS and PTP \;Registers&quot;." access="RW" offset="0x0.2" size="0x0.2" />
 	<field name="tacho" descr="Fan tachometer index" access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="tach_min" descr="Tachometer minimum value (minimum RPM)." access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="tach_max" descr="Tachometer maximum value (maximum RPM)." access="RW" offset="0x8.0" size="0x0.16" />
@@ -2426,9 +2577,9 @@
 </node>
 
 <node name="mgir_ext" descr="" size="0xa0.0" >
-	<field name="hw_info" descr="Hardware Information, see Table 387, &quot;Hardware Info \;Layout,&quot; on page 890" subnode="mgir_hardware_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
-	<field name="fw_info" descr="Firmware Information, see Table 389, &quot;Firmware Info \;Layout,&quot; on page 892" subnode="mgir_fw_info_ext" access="RW" offset="0x20.0" size="0x40.0" />
-	<field name="sw_info" descr="Software Information, see Table 391, &quot;Software Info Lay\;out,&quot; on page 895\;This field indicates the oldest software version compati\;ble with the current firmware" subnode="mgir_sw_info_ext" access="RW" offset="0x60.0" size="0x20.0" />
+	<field name="hw_info" descr="Hardware Information, see Table 488, &quot;Hardware Info \;Layout,&quot; on page 713" subnode="mgir_hardware_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
+	<field name="fw_info" descr="Firmware Information, see Table 490, &quot;Firmware Info \;Layout,&quot; on page 715" subnode="mgir_fw_info_ext" access="RW" offset="0x20.0" size="0x40.0" />
+	<field name="sw_info" descr="Software Information, see Table 492, &quot;Software Info Lay\;out,&quot; on page 717\;This field indicates the oldest software version compati\;ble with the current firmware" subnode="mgir_sw_info_ext" access="RW" offset="0x60.0" size="0x20.0" />
 </node>
 
 <node name="mgir_fw_info_ext" descr="" size="0x40.0" >
@@ -2458,16 +2609,14 @@
 </node>
 
 <node name="mgir_hardware_info_ext" descr="" size="0x20.0" >
-	<field name="device_id" descr="PCI device ID. For specific device IDs, see Table 10, \;&quot;Switch Supported PCI Device IDs,&quot; on page 247" access="RO" offset="0x0.0" size="0x0.16" />
+	<field name="device_id" descr="PCI device ID. For specific device IDs, see Table 12, \;&quot;Switch Supported PCI Device IDs,&quot; on page 235" access="RO" offset="0x0.0" size="0x0.16" />
 	<field name="device_hw_revision" descr="SwitchX Devices:\;0x00A0: Device step A0, FCC package\;0x00A1: Device step A1, FCC package\;0x00A2: Device step A2, FCC package\;\;Switch-IB Devices:\;0x00A0: Switch-IB device step A0, FCC package\;0x0000 is a valid value for some devices not included \;in PRM." access="RO" offset="0x0.16" size="0x0.16" />
 	<field name="pvs" descr="Process Voltage Scaling\;Supported nominal V_CORE voltage (in 50mV units) \;for the device." access="RO" offset="0x4.0" size="0x0.5" />
 	<field name="technology" descr="Process technology\;0: N/A\;1: 40nm\;2: 28nm\;3: 16nm\;4: 7nm\;5: 5nm\;6-31: Reserved" access="RO" offset="0x4.11" size="0x0.5" />
 	<field name="num_ports" descr="Number of physical port the device supports." access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="hw_dev_id" descr="The PCI device-ID of the NIC/HCA in recovery (Live\;fish) mode." access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="manufacturing_base_mac_47_32" descr="MSB of the &quot;base&quot; MAC address of the NIC that was \;allocate during manufacturing. The NIC derives the \;MAC addresses for the different PCI PFs from this \;MAC address. This parameter can be used as a \;canonical unique identifier of the NIC.\;manufacturing_base_mac of value 0 means field is not \;supported." access="RO" offset="0x10.0" size="0x0.16" />
-	<field name="module_base" descr="Module base index. \;Used only for associated_module_id field\;assiciated_module_id[0] = 32 * module_base" access="INDEX" offset="0x10.28" size="0x0.4" />
 	<field name="manufacturing_base_mac_31_0" descr="LSB of the &quot;base&quot; MAC address of the NIC that was \;allocate during manufacturing. The NIC derives the \;MAC addresses for the different PCI PFs from this \;MAC address. This parameter can be used as a \;canonical unique identifier of the NIC.\;manufacturing_base_mac of value 0 means field is not \;supported." access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="associated_module_id_31_0" descr="bitmask of associated module id. For each bit:\;0: module is managed by ASIC\;1: module is NOT managed by ASIC\;Based on module_base" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="uptime" descr="Time (in secs.) since last reset0" access="RO" offset="0x1C.0" size="0x4.0" />
 </node>
 
@@ -2500,8 +2649,8 @@
 </node>
 
 <node name="mgpc_ext" descr="" size="0x18.0" >
-	<field name="counter_index" descr="counter index\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Range 0 .. cap_shared_counter_pool_size - 1" access="INDEX" offset="0x0.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060" access="OP" offset="0x0.24" size="0x0.8" />
+	<field name="counter_index" descr="counter index\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Range 0 .. cap_shared_counter_pool_size - 1" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 822" access="OP" offset="0x0.24" size="0x0.8" />
 	<field name="opcode" descr="0: Nop\;\;2: Flush Counters - when counter set is un-bound, flush \;ensures counters will not be updated due to packets in the \;pipe. Valid only on Write operation\;8: Clear counters. Setting the clr bit will reset the counter \;value for all counters of the specified Router Interface.\;" access="OP" offset="0x4.28" size="0x0.4" />
 	<field name="byte_counter" descr="Byte counter value" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
 	<field name="packet_counter" descr="Packet counter value\;Spectrum HW has 58bits for packet counters" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
@@ -2511,7 +2660,7 @@
 	<field name="counter_index_base" descr="Counter Index base\;Range 0..cap_shared_counter_pool_size - 1\;Supported only for counter_set_type = 0x3 Packets and \;Byte" access="OP" offset="0x0.0" size="0x0.24" />
 	<field name="num_rec" descr="Number of valid records\;Range 1..64" access="OP" offset="0x4.0" size="0x0.8" />
 	<field name="opcode" descr="0: Nop\;8: Clear counters" access="OP" offset="0x8.0" size="0x0.4" />
-	<field name="record" descr="See Table 678, &quot;MGPCB - record Layout,&quot; on \;page 1158\;" subnode="mgpcb_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="record" descr="See Table 750, &quot;MGPCB - record Layout,&quot; on \;page 926\;" subnode="mgpcb_record_ext" access="RW" high_bound="63" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="mgpcb_record_ext" descr="" size="0x10.0" >
@@ -2520,7 +2669,7 @@
 </node>
 
 <node name="mgpir_ext" descr="" size="0xa0.0" >
-	<field name="hw_info" descr="Hardware Information, see Table 399, &quot;Hardware Info \;Layout,&quot; on page 900" subnode="mgpir_hw_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
+	<field name="hw_info" descr="Hardware Information, see Table 424, &quot;Hardware Info \;Layout,&quot; on page 661" subnode="mgpir_hw_info_ext" access="RW" offset="0x0.0" size="0x20.0" />
 </node>
 
 <node name="mgpir_hw_info_ext" descr="" size="0x20.0" >
@@ -2545,6 +2694,26 @@
 	<field name="mid" descr="" offset="0x0.0" size="0x0.16" />
 </node>
 
+<node name="mini_data_auto_ext" descr="" attr_is_union="1" size="0x20.0" >
+	<field name="mini_module_parameters_ext" descr="" subnode="mini_module_parameters_ext" offset="0x0.0" selected_by="module_parameters" size="0x8.0" />
+	<field name="mini_module_primary_ext" descr="" subnode="mini_module_primary_ext" offset="0x0.0" selected_by="module_primary" size="0x20.0" />
+</node>
+
+<node name="mini_ext" descr="" size="0x30.0" >
+	<field name="type" descr="Type:\;1: module_parameters\;2: module_primary" access="INDEX" enum="module_parameters=0x1,module_primary=0x2" offset="0x0.0" size="0x0.8" />
+	<field name="valid" descr="Valid:\;0: the relevant type is not supported by this Firmware version\;1: the relevant type is valid" access="RO" offset="0x4.0" size="0x0.1" />
+	<field name="data" descr="This field takes meaning per type\;For module_parameters see Table  510, &quot;MINI type mod\;ule_parameters Layout,&quot; on page  728\;For module_primary see Table  512, &quot;MINI type module_pri\;mary Layout,&quot; on page  728" subnode="mini_data_auto_ext" access="RW" offset="0x10.0" size="0x20.0" union_selector="$(parent).type" />
+</node>
+
+<node name="mini_module_parameters_ext" descr="" size="0x8.0" >
+	<field name="module_index" descr="Module Index" access="INDEX" offset="0x0.0" size="0x0.8" />
+	<field name="owner" descr="Owner \;0: not owner\;1: owner\;Informative: for devices where a module has only one ASIC \;owner (99% of the devices) then the owner is set" access="RO" offset="0x4.0" size="0x0.1" />
+</node>
+
+<node name="mini_module_primary_ext" descr="" size="0x20.0" >
+	<field name="owner_vector" descr="Owner vector\;Each bit represents module_index\;\;Per bit:\;0: not owner\;1: owner\;Informative: for devices where a module has only one ASIC \;owner (99% of the devices) then the owner is set" access="RO" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
+</node>
+
 <node name="mirc_reg_ext" descr="" size="0x8.0" >
 	<field name="status_code" descr="Indicates the successful completion of the instruction, \;or the reason it failed. \;0x0: OK\;0x1: BUSY\;0x2: PROHIBITED_FW_VER_ERR\;0x3: FIRST_PAGE_COPY_FAILED\;0x4: FIRST_PAGE_ERASE_FAILED\;0x5: FIRST_PAGE_RESTORE_FAILED\;0x6: CANDIDATE_FW_DEACTIVATION_FAILED\;0x7: FW_ALREADY_ACTIVATED\;0x8: ERROR_DEVICE_RESET_REQUIRED\;0x9: ERROR_FW_PROGRAMMING_NEEDED\;Other values should be treated as an unknown error." access="RO" offset="0x0.0" size="0x0.8" />
 </node>
@@ -2553,7 +2722,7 @@
 	<field name="size" descr="Size of operation - relevant for JTAG interface access com\;mands only, indicating the number of transaction bytes to \;execute. Maximum size supported is 40.\;Note: when size=0, no operation is performed (clock is not \;toggled). The tdo is sampled and provided in the response \;at jtag_transaction_set_0." access="WO" offset="0x0.0" size="0x0.8" />
 	<field name="sequence_number" descr="Command sequence number - to prevent re-execution of \;the same command due to command retransmission, this \;command includes a sequence number.\;The enable and disable commands MUST be issues with \;sequence_number = 0 while any JTAG access command \;must increase the sequence_number by 1 (the first JTAG \;access command should start at sequence_number = 1)." access="WO" offset="0x0.24" size="0x0.4" />
 	<field name="cmd" descr="Command\;0 - JTAG interface disable - JTAG interface is disabled\;1 - JTAG interface enable - enabling JTAG interface\;2 - JTAG interface access" access="RW" offset="0x0.30" size="0x0.2" />
-	<field name="jtag_transaction_set" descr="See Table 377, &quot;JTAG Transaction Set Byte Layout,&quot; on \;page 883" access="RW" high_bound="43" low_bound="0" offset="0x4.24" size="0x2c.0" />
+	<field name="jtag_transaction_set" descr="See Table 370, &quot;JTAG Transaction Set Byte Layout,&quot; on \;page 621" access="RW" high_bound="43" low_bound="0" offset="0x4.24" size="0x2c.0" />
 </node>
 
 <node name="mkdc_reg_ext" descr="" size="0x2c.0" >
@@ -2612,11 +2781,11 @@
 
 <node name="mnvia_reg_ext" descr="" size="0x8.0" >
 	<field name="target" descr="Information targeted for invalidation\;0: ALL - all NVRAM parameters.\; All other values are reserved." access="WO" offset="0x0.0" size="0x0.3" />
-	<field name="writer_id" descr="The entity which perform the invalidate.\;The encoding same as writer_id in Configuration Item \;register (See Table 425, &quot;Configuration Item \;Header Layout,&quot; on page 916)." access="RW" offset="0x0.4" size="0x0.5" />
+	<field name="writer_id" descr="The entity which perform the invalidate.\;The encoding same as writer_id in Configuration Item \;register (See Table 538, &quot;Configuration Item \;Header Layout,&quot; on page 747)." access="RW" offset="0x0.4" size="0x0.5" />
 </node>
 
 <node name="mnvqc_reg_ext" descr="" size="0x8.0" >
-	<field name="type" descr="Configuration item type. \;Table 427, &quot;Configuration Item Data Type Class \;Global Layout,&quot; on page 918\;Table 429, &quot;Configuration Item Data Type Class \;Physical Port Layout,&quot; on page 919\;Table 431, &quot;Configuration Item Data Type Class \;Per Host-PF Layout,&quot; on page 919" access="INDEX" offset="0x0.0" size="0x4.0" />
+	<field name="type" descr="Configuration item type. \;Table 540, &quot;Configuration Item Data Type Class \;Global Layout,&quot; on page 750\;Table 542, &quot;Configuration Item Data Type Class \;Physical Port Layout,&quot; on page 750\;Table 544, &quot;Configuration Item Data Type Class \;Per Host-PF Layout,&quot; on page 751" access="INDEX" offset="0x0.0" size="0x4.0" />
 	<field name="support_rd" descr="The configuration item is supported and can be read" access="RO" offset="0x4.0" size="0x0.1" />
 	<field name="support_wr" descr="The configuration item is supported and can be \;updated" access="RO" offset="0x4.1" size="0x0.1" />
 	<field name="version" descr="The maximal version of the configuration item sup\;ported by the device" access="RO" offset="0x4.4" size="0x0.4" />
@@ -2625,16 +2794,16 @@
 <node name="mocmi_ext" descr="" size="0x10.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number (Rx ports)\;Not supported from CPU port\;Not supported from router port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="cond_nelp" descr="Conditional mirroring:\;Disables a dynamic mirror trigger per ingress local_port\;For non-Elephant packets only\;\;Bitwise vector, value per mirror trigger (e.g. bit 3 for trigger \;0x3 Tail drop mirror)\;Value per bit:\;0: Enable mirror trigger \;1: Disable mirror trigger\;\;Notes: \;1. the enable does not trigger the mirror, it just allows the mir\;ror\;2. applies only to dynamic mirror triggers\;Bits of static mirror triggers are reserved\;" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="cond_nelp" descr="Conditional mirroring:\;Disables a dynamic mirror trigger per ingress local_port\;For non-Elephant packets only\;\;Bitwise vector, value per mirror trigger (e.g. bit 3 for trigger \;0x3 Tail drop mirror)\;Value per bit:\;0: Enable mirror trigger \;1: Disable mirror trigger\;\;Notes: \;1. the enable does not trigger the mirror, it just allows the \;mirror\;2. applies only to dynamic mirror triggers\;Bits of static mirror triggers are reserved\;" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="cond_elp" descr="Conditional mirroring:\;Disables a dynamic mirror trigger per ingress local_port\;Same logic as for cond_nelp\;For Elephant packets only" access="RW" offset="0xC.0" size="0x0.16" />
 </node>
 
 <node name="mocs_ceer_ext" descr="" size="0x40.0" >
-	<field name="port_mask" descr="Local port .\;Each bit represents a local port.Refer to Section 8.3, &quot;Port \;Numbering&quot;, on page 1512 for port numbering scheme.\;CPU port is not supported.\;Router port is not supported.\;\;The device will report information only about flows that were \;identified as elephant flows (thus the CEER.detection_entry \;will be chosen by the device). \;When MOCS.clear is set then for the trap the CEER.clear=1. \;Endianity example: local_port 1 is at 3Ch bit1" access="RW" high_bound="15" low_bound="0" offset="0x0.0" size="0x40.0" />
+	<field name="port_mask" descr="Local port .\;Each bit represents a local port.Refer to Section 8.3, \;&quot;Port Numbering&quot;, on page 1293 for port numbering \;scheme.\;CPU port is not supported.\;Router port is not supported.\;\;The device will report information only about flows that \;were identified as elephant flows (thus the CEER.detec\;tion_entry will be chosen by the device). \;When MOCS.clear is set then for the trap the \;CEER.clear=1. \;Endianity example: local_port 1 is at 3Ch bit1" access="RW" high_bound="15" low_bound="0" offset="0x0.0" size="0x40.0" />
 </node>
 
-<node name="mocs_entry_auto_ext" descr="" attr_is_union="1" size="0x58.0" >
-	<field name="mocs_ppcnt_ext" descr="" subnode="mocs_ppcnt_ext" offset="0x0.0" selected_by="PPCNT_SES1" size="0x58.0" />
+<node name="mocs_entry_auto_ext" descr="" attr_is_union="1" size="0xa0.0" >
+	<field name="mocs_ppcnt_ext" descr="" subnode="mocs_ppcnt_ext" offset="0x0.0" selected_by="PPCNT_SES1" size="0xa0.0" />
 	<field name="mocs_mgpcb_ext" descr="" subnode="mocs_mgpcb_ext" offset="0x0.0" selected_by="MGPCB" size="0x8.0" />
 	<field name="mocs_pbsr_ext" descr="" subnode="mocs_pbsr_ext" offset="0x0.0" selected_by="PBSR" size="0x40.0" />
 	<field name="mocs_sbsrd_ext" descr="" subnode="mocs_sbsrd_ext" offset="0x0.0" selected_by="SBSRD" size="0x4.0" />
@@ -2646,23 +2815,23 @@
 	<field name="mocs_upcnt_ext" descr="" subnode="mocs_upcnt_ext" offset="0x0.0" selected_by="UPCNT" size="0x40.0" />
 </node>
 
-<node name="mocs_ext" descr="" size="0x78.0" >
+<node name="mocs_ext" descr="" size="0xc0.0" >
 	<field name="type" descr="Session type:\;1: PPCNT_SES1 - (provides PPCNT traps)\;2: MGPCB\;3: PBSR\;4: SBSRD\;5: CEER\;6: MAFBI\;7: MOPCE - from Spectrum-1 and on\;8: FSED - from Spectrum-4 and on\;10: USACN - from Spectrum-4 and on\;11: UTCC - from Spectrum-4 and on\;12: UPCNT - from Spectrum-4 and on\;" access="INDEX" enum="PPCNT_SES1=0x1,MGPCB=0x2,PBSR=0x3,SBSRD=0x4,CEER=0x5,MAFBI=0x6,MOPCE=0x7,FSED=0x8,USACN=0xa,UTCC=0xb,UPCNT=0xc" offset="0x0.0" size="0x0.8" />
 	<field name="status" descr="Status:\;0: IDLE\;1: BUSY\;2: CANCELED" access="RO" enum="IDLE=0x0,BUSY=0x1,CANCELED=0x2" offset="0x4.0" size="0x0.2" />
 	<field name="opcode" descr="Opcode\;0: START a session. Per session rejected when status = \;BUSY.\;1: CANCEL the session, see explanation above.\;Note that a session is per type, thus multi sessions are \;allowed for different types.\;Opcode START cannot be set when a session is BUSY" access="WO" offset="0x4.8" size="0x0.1" />
-	<field name="clear" descr="Clear the counters:\;0: READ_NO_CLEAR\;1: READ_AND_CLEAR\;2: CLEAR_ONLY - no read, for faster operation. Will provide \;only MOCS_DONE trap when finished.\;\;Reserved when type = (7) or type = (8)" access="RW" offset="0x4.16" size="0x0.2" />
+	<field name="clear" descr="Clear the counters:\;0: READ_NO_CLEAR\;1: READ_AND_CLEAR\;2: CLEAR_ONLY - no read, for faster operation. Will pro\;vide only MOCS_DONE trap when finished.\;\;Reserved when type = (7) or when type = 8" access="RW" offset="0x4.16" size="0x0.2" />
 	<field name="event_tid" descr="Transaction ID to be returned in the event EMADs\;Example: \;- MOCS had tid=3 and event_tid=17\;- MOCS returned with tid=3 and event_tid=17\;- PPCNT returned with tid=17\;- MOCS_DONE returned with tid=17 and event_tid=17" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
-	<field name="entry" descr="See Table 682, &quot;MOCS entry - PPCNT Layout,&quot; on \;page 1162\;See Table 684, &quot;MOCS entry - MGPCB Layout,&quot; on \;page 1163\;See Table 686, &quot;MOCS entry - PBSR Layout,&quot; on \;page 1164\;See Table 688, &quot;MOCS entry - SBSRD Layout,&quot; on \;page 1165\;See Table 690, &quot;MOCS entry - CEER Layout,&quot; on \;page 1165\;See Table 692, &quot;MOCS entry - MAFBI Layout,&quot; on \;page 1167\;See Table 694, &quot;MOCS entry - FSED Layout,&quot; on \;page 1168\;See Table 696, &quot;MOCS entry - USACN Layout,&quot; on \;page 1170\;See Table 698, &quot;MOCS entry - UTCC Layout,&quot; on \;page 1171\;See Table 700, &quot;MOCS entry - UPCNT Layout,&quot; on \;page 1172" subnode="mocs_entry_auto_ext" access="RW" offset="0x20.0" size="0x58.0" union_selector="$(parent).type" />
+	<field name="entry" descr="See Table 754, &quot;MOCS entry - PPCNT Layout,&quot; on \;page 930\;See Table 756, &quot;MOCS entry - MGPCB Layout,&quot; on \;page 931\;See Table 758, &quot;MOCS entry - PBSR Layout,&quot; on \;page 932\;See Table 760, &quot;MOCS entry - SBSRD Layout,&quot; on \;page 933\;See Table 762, &quot;MOCS entry - CEER Layout,&quot; on \;page 934\;See Table 764, &quot;MOCS entry - MAFBI Layout,&quot; on \;page 935\;See Table 766, &quot;MOCS entry - FSED Layout,&quot; on \;page 936\;See Table 768, &quot;MOCS entry - USACN Layout,&quot; on \;page 938\;See Table 770, &quot;MOCS entry - UTCC Layout,&quot; on \;page 939\;See Table 772, &quot;MOCS entry - UPCNT Layout,&quot; on \;page 940" subnode="mocs_entry_auto_ext" access="RW" offset="0x20.0" size="0xa0.0" union_selector="$(parent).type" />
 </node>
 
 <node name="mocs_fsed_ext" descr="" size="0x10.0" >
-	<field name="filter_fields" descr="filter fields:\;If a bit is &apos;0&apos; then the relevant field is ignored and dump is\;done regardless of the field value\;\;0: partition id\;1: activity\;2: semaphore state\;3: group id\;\;All set filters are relevant (there is AND between the filters)" access="OP" offset="0x0.0" size="0x0.4" />
-	<field name="op" descr="Operation\;0: Dump entries \;1: Clear activity for all entries which were dumped" access="OP" offset="0x0.8" size="0x0.2" />
+	<field name="filter_fields" descr="filter fields:\;If a bit is &apos;0&apos; then the relevant field is ignored and dump is\;done regardless of the field value\;\;0: partition id\;1: activity\;2: semaphore state\;3: group id\;\;All set filters are relevant (there is AND between the fil\;ters)" access="OP" offset="0x0.0" size="0x0.4" />
+	<field name="op" descr="Operation\;0: Dump entries \;1: Clear activity for all entries which were dumped \;2: Clear activity only (no dump)\;" access="OP" offset="0x0.8" size="0x0.2" />
 	<field name="entry_partition_id" descr="Dump only if entry partition has value of entry_parition\;Reserved when filter_fields bit0 is &apos;0&apos;" access="INDEX" offset="0x4.0" size="0x0.3" />
 	<field name="entry_activity" descr="Dump only if activity has value of entry_activity\;Reserved when filter_fields bit1 is &apos;0&apos;" access="INDEX" offset="0x4.8" size="0x0.1" />
 	<field name="entry_sem_s" descr="Dump only if semaphore state has value of entry_sem_s\;Reserved when filter_fields bit2 is &apos;0&apos;" access="OP" offset="0x4.9" size="0x0.1" />
 	<field name="group_id" descr="Dump only if Group id equals to the value mentioned\;Reserved when filter_fields bit3 is &apos;0&apos;" access="INDEX" offset="0x4.16" size="0x0.16" />
-	<field name="num_rec" descr="Number of records to read\;Range 0 .. (cap_kvd_size-1)" access="RW" offset="0x8.0" size="0x0.20" />
+	<field name="num_rec" descr="Number of records to read\;Range 0 .. (cap_kvd_size-1)\;\;Reserved when op = Clear only (2)" access="RW" offset="0x8.0" size="0x0.20" />
 	<field name="nt" descr="New transaction\;0: continue from last transaction\;1: start new transaction" access="OP" offset="0xC.0" size="0x0.1" />
 </node>
 
@@ -2670,20 +2839,20 @@
 	<field name="num_rec" descr="Number of records to read\;Must have a value of 32*N \;Range: 32.. cap_max_accuflow - 1" access="RW" offset="0x0.0" size="0x0.24" />
 	<field name="type" descr="type" access="RW" offset="0x0.28" size="0x0.2" />
 	<field name="flush" descr="Flush:\;0: do not flush the counters, read immediately\;1: flush the counters" access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="counter_index_base" descr="Counter Index base\;Must have a value of 32*N \;Range: cap_start_accuflow .. cap_start_accuflow+cap_max\;_accuflow - 1" access="RW" offset="0x4.0" size="0x0.24" />
+	<field name="counter_index_base" descr="Counter Index base\;Must have a value of 32*N \;Range: cap_start_accuflow .. cap_start_accuflow+cap_\;max_accuflow - 1" access="RW" offset="0x4.0" size="0x0.24" />
 </node>
 
 <node name="mocs_mgpcb_ext" descr="" size="0x8.0" >
 	<field name="num_rec" descr="Number of records to read\;Range 1..cap_shared_counter_pool_size - 1" access="RW" offset="0x0.0" size="0x0.24" />
 	<field name="flush" descr="Flush:\;0: do not flush the counters, read immediately\;1: flush the counters\;" access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="counter_index_base" descr="Counter Index base\;Range 0..cap_shared_counter_pool_size - 1\;Supported only for counter_set_type = 0x3 Packets and Byte" access="RW" offset="0x4.0" size="0x0.24" />
+	<field name="counter_index_base" descr="Counter Index base\;Range 0..cap_shared_counter_pool_size - 1\;Supported only for counter_set_type = 0x3 Packets and \;Byte" access="RW" offset="0x4.0" size="0x0.24" />
 </node>
 
 <node name="mocs_pbsr_ext" descr="" size="0x40.0" >
-	<field name="port_mask" descr="Local port\;Each bit represents a local port. Refer to Section 8.3, &quot;Port \;Numbering&quot;, on page 1512 for port numbering scheme.\;CPU port is supported\;Router port is not supported\;Endianity example: local_port 1 is at 3Ch bit1" access="RW" high_bound="15" low_bound="0" offset="0x0.0" size="0x40.0" />
+	<field name="port_mask" descr="Local port\;Each bit represents a local port. Refer to Section 8.3, \;&quot;Port Numbering&quot;, on page 1293 for port numbering \;scheme.\;CPU port is supported\;Router port is not supported\;Endianity example: local_port 1 is at 3Ch bit1" access="RW" high_bound="15" low_bound="0" offset="0x0.0" size="0x40.0" />
 </node>
 
-<node name="mocs_ppcnt_ext" descr="" size="0x58.0" >
+<node name="mocs_ppcnt_ext" descr="" size="0xa0.0" >
 	<field name="port_mask" descr="Local port\;Each bit represents a PPCNT.local_port\;Endianity example: local_port 1 is at 3Ch bit1" access="RW" high_bound="15" low_bound="0" offset="0x0.0" size="0x40.0" />
 	<field name="grp_mask" descr="PPCNT Group mask\;Each bit represents a PPCNT.grp" access="RW" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
 	<field name="tc_mask" descr="PPCNT tclass mask - valid only for relevant groups\;Each bit represents a PPCNT.prio_tc" access="RW" offset="0x50.0" size="0x4.0" />
@@ -2724,6 +2893,7 @@
 </node>
 
 <node name="module_latched_flag_info_ext" descr="" size="0xf8.0" >
+	<field name="rx_los_cap" descr="when set, indicates modules supports rx los indication" access="RO" offset="0x0.0" size="0x0.1" />
 	<field name="dp_fw_fault" descr="Valid for CMIS based modules only\;Latched modules Datapath fw fault flag" access="RO" offset="0x0.22" size="0x0.1" />
 	<field name="mod_fw_fault" descr="Valid for CMIS based modules only\;Latched module fw fault flag" access="RO" offset="0x0.23" size="0x0.1" />
 	<field name="vcc_flags" descr="Latched VCC flags of module\;Bit 0: high_vcc_alarm\;Bit 1: low_vcc_alarm\;Bit 2: high_vcc_warning\;Bit 3: low_vcc_warning" access="RO" enum="high_vcc_alarm=0x1,low_vcc_alarm=0x2,high_vcc_warning=0x4,low_vcc_warning=0x8" offset="0x0.24" size="0x0.4" />
@@ -2751,20 +2921,20 @@
 </node>
 
 <node name="mogcr_ext" descr="" size="0x20.0" >
-	<field name="ptp_eftc" descr="PTP Egress FIFO Trap Clear\;The PTP_EGR_FIFO trap provides MTPPTR with clr accord\;ing to this value. Default 0.\;Reserved when IB switches and when SwitchX/-2, Spec\;trum-2" access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="ptp_eftc" descr="PTP Egress FIFO Trap Clear\;The PTP_EGR_FIFO trap provides MTPPTR with clr \;according to this value. Default 0.\;Reserved when IB switches and when SwitchX/-2, Spec\;trum-2" access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="ptp_iftc" descr="PTP Ingress FIFO Trap Clear\;The PTP_ING_FIFO trap provides MTPPTR with clr accord\;ing to this value. Default 0.\;Reserved when IB switches and when SwitchX/-2, Spec\;trum-2" access="RW" offset="0x0.1" size="0x0.1" />
 	<field name="tele_managed" descr="Telemetry is managed:\;0: telemetery is unmanged (default for IB switches)\;1: telemetery is manged (default for Eth switches)\;When unmanaged - the events are by VS-MADs\;When managed - the events are by EMADs\;Reserved when Ethernet switches" access="RW" offset="0x0.8" size="0x0.1" />
 	<field name="sid" descr="Sample ingress discards:\;0: ingress discards are not sampled\;1: ingress discards are sampled\;Reserved when Switch-IB/2, Quantum, \;Spectrum-2 TBD" access="RW" offset="0x8.0" size="0x0.1" />
 	<field name="mirroring_pid_base" descr="Base policer id for mirroring policers.\;Must have an even value (e.g. 1000, not 1001).\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum and \;Quantum/-2" access="RW" offset="0xC.0" size="0x0.14" />
-	<field name="mirror_latency_units" descr="Units of mirror header latency\;Units of nSec\;For Spectrum-2/3: values are 1,2,4..32768nSec\;Default 64nSec\;See Table 589, &quot;ETH-ERSPAN Mirror Header TLV \;LATENCY Frame Layout,&quot; on page 1081\;Reserved when Spectrum" access="RW" offset="0x14.0" size="0x0.16" />
-	<field name="latency_histogram_units" descr="Units of latency histograms\;Units of nSec\;For Spectrum-2/3: values are 1,2,4..32768nSec\;Default 64nSec\;See Section 9.6.4.1, &quot;Latency Histograms&quot;, on \;page 2000\;Reserved when Spectrum\;" access="RW" offset="0x18.0" size="0x0.16" />
+	<field name="mirror_latency_units" descr="Units of mirror header latency\;Units of nSec\;For Spectrum-2/3: values are 1,2,4..32768nSec\;Default 64nSec\;See Table 661, &quot;ETH-ERSPAN Mirror Header TLV \;LATENCY Frame Layout,&quot; on page 843\;Reserved when Spectrum" access="RW" offset="0x14.0" size="0x0.16" />
+	<field name="latency_histogram_units" descr="Units of latency histograms\;Units of nSec\;For Spectrum-2/3: values are 1,2,4..32768nSec\;Default 64nSec\;See Section 9.6.4.1, &quot;Latency Histograms&quot;, on \;page 1795\;Reserved when Spectrum\;" access="RW" offset="0x18.0" size="0x0.16" />
 	<field name="toc_fmt" descr="Timestamp over CRC format:\;0: Free_Running_Clock\;1: UTC" access="RW" enum="Free_Running_Clock=0x0,UTC=0x1" offset="0x1C.24" size="0x0.1" />
 </node>
 
 <node name="molp_ext" descr="" size="0x8.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local Port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="label_port" descr="Label on the front panel.\;Used for mirror header and for EMT (Egress Modifier Tem\;plate)." access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="label_port" descr="Label on the front panel.\;Used for mirror header and for EMT (Egress Modifier \;Template)." access="RW" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="momte_ext" descr="" size="0x10.0" >
@@ -2772,7 +2942,7 @@
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="If (mngr_type == &quot;Hypervisor&quot;)\;Unique port identifier for the final destination of the packet\;If (mngr_type == &quot;Local Network Manager&quot;) and the port \;from which the command came from is InfiniBand: \;ib port number\;If (mngr_type == &quot;Local Network Manager&quot;) and the port \;from which the command came from is Ethernet: \;Local Port\;\;For Quantum:\;- Supported to/from Aggregation Node\;- Not supported to/from IB Router port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="swid" descr="Switch Partition ID\;Reserved when mngr_type = LNM\;Reserved when Ethernet switches" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="type" descr="Type:\;0x20: WRED, egress, no CPU port\;0x31: SHARED_BUFFER_TClass, egress\;0x32: Shared-buffer-TClass-descriptors, egress [advanced]\;\;0x33: SHARED_BUFFER_Egress_Port, egress\;0x40: ING_CONG, ingress\;0x50: EGR_CONG, egress\;0x60: ECN, egress, no CPU port\;0x70: HIGH_LATENCY, egress, no CPU port\;See Section 574, &quot;Mirror triggers&quot;, on page 1068" access="INDEX" offset="0x4.0" size="0x0.8" />
+	<field name="type" descr="Type:\;0x20: WRED, egress, no CPU port\;0x31: SHARED_BUFFER_TClass, egress\;0x32: Shared-buffer-TClass-descriptors, egress \;[advanced]\;\;0x33: SHARED_BUFFER_Egress_Port, egress\;0x40: ING_CONG, ingress\;0x50: EGR_CONG, egress\;0x60: ECN, egress, no CPU port\;0x70: HIGH_LATENCY, egress, no CPU port\;See Section 646, &quot;Mirror triggers&quot;, on page 830" access="INDEX" offset="0x4.0" size="0x0.8" />
 	<field name="tclass_en_high" descr="TClass/PG mirror enable (for IB switches this is VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;When type = 0x33: only bit0 is used, representing the port\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0x8.0" size="0x4.0" />
 	<field name="tclass_en_low" descr="TClass/PG mirror enable (for IB switches this is VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;When type = 0x33: only bit0 is used, representing the port\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0xC.0" size="0x4.0" />
 </node>
@@ -2783,9 +2953,14 @@
 	<field name="en" descr="Enable monitoring on network interface:\;0: disable (default)\;1: enable" access="RW" offset="0x4.0" size="0x0.1" />
 </node>
 
+<node name="mopce_ext" descr="" size="0x4d0.0" >
+	<field name="num_rec" descr="On Query: Number of records to read\;On Response: Number of valid records \;0 .. cap_max_perf_cnt_records" access="RW" offset="0x0.0" size="0x0.7" />
+	<field name="performance_counter_info" descr="Table 796, &quot;Performance Counters Info Register Lay\;out,&quot; on page 961" subnode="performance_counter_info_ext" access="RO" high_bound="75" low_bound="0" offset="0x10.0" size="0x4c0.0" />
+</node>
+
 <node name="mpagr_ext" descr="" size="0xc.0" >
-	<field name="trigger" descr="Mirror trigger \;See Table 574, &quot;Mirror triggers,&quot; on page 1068\;Reserved when the mirror binding is not Global" access="INDEX" offset="0x0.0" size="0x0.4" />
-	<field name="mngr_type" descr="Manager Type\;0: HYPERVISOR - config all ports\;1: LNM - local network manager - config all ports of the SWID\;Reserved when Ethernet switches" access="OP" enum="HYPERVISOR=0x0,LNM=0x1" offset="0x0.8" size="0x0.4" />
+	<field name="trigger" descr="Mirror trigger \;See Table 646, &quot;Mirror triggers,&quot; on page 830\;Reserved when the mirror binding is not Global" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="mngr_type" descr="Manager Type\;0: HYPERVISOR - config all ports\;1: LNM - local network manager - config all ports of the \;SWID\;Reserved when Ethernet switches" access="OP" enum="HYPERVISOR=0x0,LNM=0x1" offset="0x0.8" size="0x0.4" />
 	<field name="swid" descr="Switch Partition ID\;Reserved when mngr_type = LNM\;Reserved when Ethernet switches" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="pa_id" descr="Port analyzer ID" access="RW" offset="0x4.0" size="0x0.4" />
 	<field name="enable" descr="Enable mirroring \;By default, port mirroring is disabled for all ports.\;Reserved when Quantum and Spectrum-2." access="RW" offset="0x4.31" size="0x0.1" />
@@ -2793,13 +2968,13 @@
 </node>
 
 <node name="mpar_ext" descr="" size="0xc.0" >
-	<field name="i_e" descr="Ingress/egress\;See Table 574, &quot;Mirror triggers,&quot; on page 1068\;Reserved when the mirror binding is not per Rx or per Tx" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="i_e" descr="Ingress/egress\;See Table 646, &quot;Mirror triggers,&quot; on page 830\;Reserved when the mirror binding is not per Rx or per Tx" access="INDEX" offset="0x0.0" size="0x0.4" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.4" size="0x0.2" />
 	<field name="local_port" descr="When Ethernet: always Local Port\;\;When IB:\;If (mngr_type == &quot;Hypervisor&quot;):\;Unique port identifier\;If (mngr_type == &quot;Local Network Manager&quot;):\;ib port number\;\;For SwitchX/-2 and Spectrum family:\;- Supported from CPU port\;For Switch-IB/2, Quantum/-2:\;- Supported to/from CPU port\;- Supported to/from Aggregation Node\;- Not supported to/from IB Router port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="mngr_type" descr="Manager Type\;0: HYPERVISOR\;1: LNM - local network manager\;Reserved when Spectrum family" access="OP" enum="HYPERVISOR=0x0,LNM=0x1" offset="0x0.24" size="0x0.4" />
 	<field name="pa_id" descr="Port Analyzer ID (a.k.a mirror-agent)\;Reserved when enable=0" access="RW" offset="0x4.0" size="0x0.4" />
 	<field name="enable" descr="Enable mirroring \;By default, port mirroring is disabled for all ports." access="RW" offset="0x4.31" size="0x0.1" />
-	<field name="probability_rate" descr="Sampling rate = 1 out of rate packets \;Valid values are: 1 to 4.3*10^9\;Values of 0 behaves like 1\;Default 1\;Note: high values are round by HW to: 10^9 * {4.3, 2.15, 1.43, \;1.08, 0.86, 0.72, 0.61, 0.54}. \;Reserved when SwitchX/-2, Switch-IB/2 and Spectrum\;Supported for Quantum and Spectrum-2 and on" access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="probability_rate" descr="Sampling rate = 1 out of rate packets \;Valid values are: 1 to 4.3*10^9\;Values of 0 behaves like 1\;Default 1\;Note: high values are round by HW to: 10^9 * {4.3, 2.15, \;1.43, 1.08, 0.86, 0.72, 0.61, 0.54}. \;Reserved when SwitchX/-2, Switch-IB/2 and Spectrum\;Supported for Quantum and Spectrum-2 and on" access="RW" offset="0x8.0" size="0x4.0" />
 </node>
 
 <node name="mpat_encap_localib_ext" descr="" size="0x10.0" >
@@ -2808,12 +2983,12 @@
 
 <node name="mpat_encap_remoteib_ext" descr="" size="0x4c.0" >
 	<field name="dlid" descr="Destination LID. \;Note that the analyzer port is configured by the system_port \;field and not by forwarding the packet based on the dlid field." access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="dpa" descr="Dynamic port analyzer. When set to dynamic mode, the analyzer \;port is set based on the forwarding information for the {swid, \;dlid} on private-LFT 0 instead of the system_port field. In static \;mode, the packet is transmitted to the configured system_port \;regardless of the forwarding database.\;0: static analyzer port\;1: dynamic analyzer port" access="RW" offset="0x0.16" size="0x0.2" />
+	<field name="dpa" descr="Dynamic port analyzer. When set to dynamic mode, the ana\;lyzer port is set based on the forwarding information for the \;{swid, dlid} on private-LFT 0 instead of the system_port field. \;In static mode, the packet is transmitted to the configured sys\;tem_port regardless of the forwarding database.\;0: static analyzer port\;1: dynamic analyzer port" access="RW" offset="0x0.16" size="0x0.2" />
 	<field name="sl" descr="Service Level" access="RW" offset="0x0.20" size="0x0.4" />
 	<field name="we" descr="Write enable:\;0: write all fields\;1: write only psn_init_val" access="WO" offset="0x0.24" size="0x0.8" />
 	<field name="slid" descr="Source LID (LID of the sending device)" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="version" descr="Remote SPAN InfiniBand encapsulation header version\;1: V1 - Mirror Header Version 1\;2: V2 - Mirror Header Version 2\;" access="RW" offset="0x4.20" size="0x0.4" />
-	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set the \;analyzer port based on the desired forwarding table (the one that \;belong to the swid)." access="RW" offset="0x4.24" size="0x0.8" />
+	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set the \;analyzer port based on the desired forwarding table (the one \;that belong to the swid)." access="RW" offset="0x4.24" size="0x0.8" />
 	<field name="vl" descr="Virtual Lane on which the mirrored packet is queued.\;Mirrored packets cannot be queued on VL-15." access="RW" offset="0xC.0" size="0x0.4" />
 	<field name="flow_label" descr="GRH FlowLabel" access="RW" offset="0x10.0" size="0x0.20" />
 	<field name="tclass" descr="GRH TClass" access="RW" offset="0x10.20" size="0x0.8" />
@@ -2824,7 +2999,7 @@
 	<field name="m" descr="BTH m" access="RW" offset="0x38.22" size="0x0.1" />
 	<field name="se" descr="BTH se" access="RW" offset="0x38.23" size="0x0.1" />
 	<field name="dest_qp" descr="BTH dest QP" access="RW" offset="0x3C.0" size="0x0.24" />
-	<field name="psn_init_val" descr="BTH packet sequence number initial value\;Note: when reading, HW will reveal the current packet sequence \;number" access="RW" offset="0x40.0" size="0x0.24" />
+	<field name="psn_init_val" descr="BTH packet sequence number initial value\;Note: when reading, HW will reveal the current packet \;sequence number" access="RW" offset="0x40.0" size="0x0.24" />
 	<field name="ar" descr="BTH MLNX adaptive routing enable flag" access="RW" offset="0x40.30" size="0x0.1" />
 	<field name="qkey" descr="DETH QKey" access="RW" offset="0x44.0" size="0x4.0" />
 	<field name="src_qp" descr="DETH source QP" access="RW" offset="0x48.0" size="0x0.24" />
@@ -2832,7 +3007,7 @@
 
 <node name="mpat_encap_rmtethl2_ext" descr="" size="0x10.0" >
 	<field name="mac_47_32" descr="Destination MAC address" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="dpa" descr="Dynamic port analyzer. \;When set to dynamic mode, the analyzer port is set based on \;the forwarding information for the {mac, vid} combination and \;not based on the system_port field. In static mode, the packet \;is transmitted to the configured system_port regardless of the \;forwarding database. Note that in Dynamic mode, if the switch \;FDB does not hold a filtering entry for the {mac, vid}, the mir\;roring copy is not flooded - it is discarded.\;0: STATIC_ANALYZER - static analyzer port\;1: DYNAMIC_ANALYZER - dynamic analyzer port\;Reserved when ubridge=1" access="RW" enum="STATIC_ANALYZER=0x0,DYNAMIC_ANALYZER=0x1" offset="0x0.16" size="0x0.2" />
+	<field name="dpa" descr="Dynamic port analyzer. \;When set to dynamic mode, the analyzer port is set based \;on the forwarding information for the {mac, vid} combination \;and not based on the system_port field. In static mode, the \;packet is transmitted to the configured system_port regard\;less of the forwarding database. Note that in Dynamic mode, \;if the switch FDB does not hold a filtering entry for the {mac, \;vid}, the mirroring copy is not flooded - it is discarded.\;0: STATIC_ANALYZER - static analyzer port\;1: DYNAMIC_ANALYZER - dynamic analyzer port\;Reserved when ubridge=1" access="RW" enum="STATIC_ANALYZER=0x0,DYNAMIC_ANALYZER=0x1" offset="0x0.16" size="0x0.2" />
 	<field name="version" descr="ERSPAN mirror header version.\;0: V0 - Mirror Header Version 0\;1: V1 - Mirror Header Version 1. Reserved when SwitchX/-2\;2: V2 - Mirror Header Version 2. Reserved when SwitchX/-2 \;and for Spectrum\;\;15: NO_HEADER - No Mirror header" access="RW" enum="V0=0x0,V1=0x1,V2=0x2,NO_HEADER=0xf" offset="0x0.18" size="0x0.4" />
 	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set \;the Analyzer port based on the desired forwarding table (the \;one that belong to the swid).\;Reserved when Spectrum/-2" access="RW" offset="0x0.24" size="0x0.8" />
 	<field name="mac_31_0" descr="Destination MAC address" access="RW" offset="0x4.0" size="0x4.0" />
@@ -2841,15 +3016,15 @@
 	<field name="pcp" descr="Encapsulation header PCP. \;Reserved when qos is QoS maintain\;Reserved when tp = 0" access="RW" offset="0x8.13" size="0x0.3" />
 	<field name="tp" descr="Tag Packet. Indicates the mirroring header should be VLAN \;tagged.\;0: Mirror packet is un-tagged\;1: Mirror packet is tagged" access="RW" offset="0x8.16" size="0x0.1" />
 	<field name="tclass" descr="Traffic Class\;For Spectrum: Switch Priority\;Reserved when qos is QoS maintain" access="RW" offset="0xC.0" size="0x0.4" />
-	<field name="vlan_et_id" descr="Encapsulation header VLAN Ethertype ID\;Default is &apos;0&apos;\;Ethertype IDs are configured by SVER, see Section 6.12.38, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on page 1436\;Reserved when SwitchX/-2" access="RW" offset="0xC.16" size="0x0.2" />
+	<field name="vlan_et_id" descr="Encapsulation header VLAN Ethertype ID\;Default is &apos;0&apos;\;Ethertype IDs are configured by SVER, see Section 6.12.39, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on \;page 1237\;Reserved when SwitchX/-2" access="RW" offset="0xC.16" size="0x0.2" />
 	<field name="fid_msb" descr="FID msb\;Reserved when dpa=0" access="RW" offset="0xC.24" size="0x0.4" />
 </node>
 
 <node name="mpat_encap_rmtethl3gre_ext" descr="" size="0x50.0" >
 	<field name="mac_47_32" descr="Destination MAC address" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="dpa" descr="Dynamic port analyzer. \;When set to dynamic mode, the analyzer port is set based on \;the forwarding information for the {mac, vid} combination and \;not based on the system_port field. In static mode, the packet \;is transmitted to the configured system_port regardless of the \;forwarding database. Note that in Dynamic mode, if the switch \;FDB does not hold a filtering entry for the {mac, vid}, the mir\;roring copy is not flooded - it is discarded.\;0: STATIC_ANALYZER - static analyzer port\;1: DYNAMIC_ANALYZER - dynamic analyzer port\;Reserved when ubridge=1" access="RW" offset="0x0.16" size="0x0.2" />
+	<field name="dpa" descr="Dynamic port analyzer. \;When set to dynamic mode, the analyzer port is set based on \;the forwarding information for the {mac, vid} combination \;and not based on the system_port field. In static mode, the \;packet is transmitted to the configured system_port regard\;less of the forwarding database. Note that in Dynamic mode, \;if the switch FDB does not hold a filtering entry for the {mac, \;vid}, the mirroring copy is not flooded - it is discarded.\;0: STATIC_ANALYZER - static analyzer port\;1: DYNAMIC_ANALYZER - dynamic analyzer port\;Reserved when ubridge=1" access="RW" offset="0x0.16" size="0x0.2" />
 	<field name="version" descr="ERSPAN mirror header version.\;\;1: V1 - Mirror Header Version 1. Reserved when SwitchX/-2\;2: V2 - Mirror Header Version 2. Reserved when SwitchX/-2 \;and for Spectrum\;\;15: NO_HEADER - No Mirror header" access="RW" offset="0x0.18" size="0x0.4" />
-	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set the \;Analyzer port based on the desired forwarding table (the one \;that belong to the swid).\;Reserved when Spectrum/-2" access="RW" offset="0x0.24" size="0x0.8" />
+	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set \;the Analyzer port based on the desired forwarding table (the \;one that belong to the swid).\;Reserved when Spectrum/-2" access="RW" offset="0x0.24" size="0x0.8" />
 	<field name="mac_31_0" descr="Destination MAC address" access="RW" offset="0x4.0" size="0x4.0" />
 	<field name="vid" descr="When dpa = 0: Encapsulation header VLAN ID\;When dpa = 1 and fid &lt; 4K (fid_msb = 0) then: VLAN ID\;When dpa = 1 and fid &gt;=4K (fid_msb != 0) then: FID lsb" access="RW" offset="0x8.0" size="0x0.12" />
 	<field name="dei" descr="Encapsulation header DEI. \;Reserved when qos is QoS maintain\;Reserved when tp = 0\;Reserved when SwitchX/-2" access="RW" offset="0x8.12" size="0x0.1" />
@@ -2860,7 +3035,7 @@
 	<field name="tclass" descr="Traffic Class\;For Spectrum: Switch Priority\;Reserved when qos is QoS maintain" access="RW" offset="0xC.0" size="0x0.4" />
 	<field name="ttl" descr="Encapsulation header Time-to-Live/HopLimit" access="RW" offset="0xC.4" size="0x0.8" />
 	<field name="ecn" descr="Encapsulation header ECN" access="RW" offset="0xC.12" size="0x0.2" />
-	<field name="vlan_et_id" descr="Encapsulation header VLAN Ethertype ID\;Default is &apos;0&apos;\;Ethertype IDs are configured by SVER, see Section 6.12.38, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on page 1436\;Reserved when SwitchX/-2" access="RW" offset="0xC.16" size="0x0.2" />
+	<field name="vlan_et_id" descr="Encapsulation header VLAN Ethertype ID\;Default is &apos;0&apos;\;Ethertype IDs are configured by SVER, see Section 6.12.39, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on \;page 1237\;Reserved when SwitchX/-2" access="RW" offset="0xC.16" size="0x0.2" />
 	<field name="fid_msb" descr="FID msb\;Reserved when dpa=0" access="RW" offset="0xC.24" size="0x0.4" />
 	<field name="smac_47_32" descr="Source MAC address" access="RW" offset="0x10.0" size="0x0.16" />
 	<field name="smac_31_0" descr="Source MAC address" access="RW" offset="0x14.0" size="0x4.0" />
@@ -2873,7 +3048,7 @@
 	<field name="dei" descr="Encapsulation header DEI\;Reserved when qos is QoS maintain\;Reserved when SwitchX/-2" access="RW" offset="0x8.12" size="0x0.1" />
 	<field name="pcp" descr="Encapsulation header PCP\;Reserved when qos is QoS maintain" access="RW" offset="0x8.13" size="0x0.3" />
 	<field name="tclass" descr="Traffic Class.\;For Spectrum: Switch Priority\;Reserved when qos is QoS maintain" access="RW" offset="0xC.0" size="0x0.4" />
-	<field name="vlan_et_id" descr="Encapsulation header VLAN Ethertype ID\;Default is &apos;0&apos;\;Ethertype IDs are configured by SVER, see Section 6.12.38, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on page 1436\;Reserved when SwitchX/-2" access="RW" offset="0xC.16" size="0x0.2" />
+	<field name="vlan_et_id" descr="Encapsulation header VLAN Ethertype ID\;Default is &apos;0&apos;\;Ethertype IDs are configured by SVER, see Section 6.12.39, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on \;page 1237\;Reserved when SwitchX/-2" access="RW" offset="0xC.16" size="0x0.2" />
 </node>
 
 <node name="mpat_reg_encapsulation_auto_ext" descr="" attr_is_union="1" size="0x50.0" >
@@ -2886,26 +3061,27 @@
 	<field name="mpat_encap_remoteib_ext" descr="" subnode="mpat_encap_remoteib_ext" offset="0x0.0" selected_by="REMOTE_IB_GLOBAL_UD" size="0x4c.0" />
 </node>
 
-<node name="mpat_reg_ext" descr="" size="0x70.0" >
-	<field name="system_port" descr="If (mngr_type == &quot;Hypervisor&quot;)\;Unique port identifier for the final destination of the packet\;If (mngr_type == &quot;Local Network Manager&quot;) and the port from \;which the command came from is InfiniBand: \;ib port number\;If (mngr_type == &quot;Local Network Manager&quot;) and the port from \;which the command came from is Ethernet: \;Local Port\;For SwitchX/-2, Switch-IB/2 and Spectrum: CPU port is not sup\;ported\;For Quantum/-2: CPU port is supported\;For Spectrum-2: CPU port is supported\;Note: when CPU port:\;1. span_type must be LOCAL_ETH or LOCAL_IB\;2. tr is reserved (no truncation)\;Reserved when dpa = 1" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="mngr_type" descr="Manager Type\;0: HYPERVISOR\;1: LOCAL_NETWORK_MANAGER\;For more details regarding Manager Type, refer to Section 2.14, \;&quot;Management Security Hierarchy&quot;, on page 407." access="OP" enum="HYPERVISOR=0x0,LOCAL_NETWORK_MANAGER=0x1" offset="0x0.16" size="0x0.4" />
+<node name="mpat_reg_ext" descr="" size="0x7c.0" >
+	<field name="system_port" descr="If (mngr_type == &quot;Hypervisor&quot;)\;Unique port identifier for the final destination of the packet\;If (mngr_type == &quot;Local Network Manager&quot;) and the port from \;which the command came from is InfiniBand: \;ib port number\;If (mngr_type == &quot;Local Network Manager&quot;) and the port from \;which the command came from is Ethernet: \;Local Port\;For SwitchX/-2, Switch-IB/2 and Spectrum: CPU port is not \;supported\;For Quantum/-2: CPU port is supported\;For Spectrum-2: CPU port is supported\;Note: when CPU port:\;1. span_type must be LOCAL_ETH or LOCAL_IB\;2. tr is reserved (no truncation)\;Reserved when dpa = 1" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="mngr_type" descr="Manager Type\;0: HYPERVISOR\;1: LOCAL_NETWORK_MANAGER\;For more details regarding Manager Type, refer to \;Section 2.14, &quot;Management Security Hierarchy&quot;, on \;page 447." access="OP" enum="HYPERVISOR=0x0,LOCAL_NETWORK_MANAGER=0x1" offset="0x0.16" size="0x0.4" />
 	<field name="session_id" descr="Mirror Session ID.\;Used for MIRROR_SESSION&lt;i&gt; trap\;Reserved when SwitchX/-2, Switch-IB/2 and Spectrum" access="RW" offset="0x0.24" size="0x0.4" />
 	<field name="pa_id" descr="Port Analyzer ID (a.k.a mirror-agent)\;Range 0 .. cap_max_span_analyzers - 1" access="INDEX" offset="0x0.28" size="0x0.4" />
-	<field name="span_type" descr="See Table 649, &quot;Span Types,&quot; on page 1136\;0x0: LOCAL_ETH\;0x1: REMOTE_ETH\;0x2: REMOTE_ETH_L2\;0x3: REMOTE_ETH_L3\;0x4: LOCAL_IB\;0xA: REMOTE_IB_LOCAL_UD\;0xB: REMOTE_IB_GLOBAL_UD" access="RW" enum="LOCAL_ETH=0x0,REMOTE_ETH=0x1,REMOTE_ETH_L2=0x2,REMOTE_ETH_L3=0x3,LOCAL_IB=0x4,REMOTE_IB_LOCAL_UD=0xa,REMOTE_IB_GLOBAL_UD=0xb" offset="0x4.0" size="0x0.4" />
-	<field name="stclass" descr="Stacking TClass. TClass to be used if the packet is transmitted on \;a stacking port to be transmitted on a port in a different device.\;Reserved from Switch-IB/2, Quantum and Spectrum" access="RW" offset="0x4.13" size="0x0.3" />
-	<field name="tr" descr="Truncate. Indicates all packets mirrored to this Analyzer port will \;be truncated.\;Truncation size is defined by truncation_size\;For Spectrum, packets from CPU to a truncation-enabled agent \;will not be mirrored. \;For Spectrum-2, packets from CPU to a truncation-enabled agent \;will be mirrored\;Reserved when system_port is to CPU\;Reserved when trunc_prof_v is 1" access="RW" offset="0x4.24" size="0x0.1" />
-	<field name="be" descr="Best Effort. Indicates mirroring traffic should not cause packet \;drop or back pressure but will discard the mirroring packets. Mir\;roring packets will be forwarded on a best effort manner.\;0: NOT_DISCARD - Do not discard mirrored packets\;1: DISCARD - Discard mirrored packets if causing congestion\;Relevant both for ingress mirror and egress mirror" access="RW" enum="NOT_DISCARD=0x0,DISCARD=0x1" offset="0x4.25" size="0x0.1" />
-	<field name="qos" descr="Quality of Service mode\;0: CONFIGURED - QoS parameters (Switch Priority, and encapsu\;lation PCP, DEI, DSCP or VL) are configured\;1: MAINTAIN - QoS parameters (Switch Priority, Color) are the \;same as in the original packet that has triggered the mirroring. \;For SPAN also the pcp,dei are maintained. Reserved when Spec\;trum.\;For SPAN packets the PCP, DEI is as mirrored packet\;For SwitchX/-2: this field is reserved.\;" access="RW" enum="CONFIGURED=0x0,MAINTAIN=0x1" offset="0x4.26" size="0x0.1" />
+	<field name="span_type" descr="See Table 721, &quot;Span Types,&quot; on page 901\;0x0: LOCAL_ETH\;0x1: REMOTE_ETH\;0x2: REMOTE_ETH_L2\;0x3: REMOTE_ETH_L3\;0x4: LOCAL_IB\;0xA: REMOTE_IB_LOCAL_UD\;0xB: REMOTE_IB_GLOBAL_UD" access="RW" enum="LOCAL_ETH=0x0,REMOTE_ETH=0x1,REMOTE_ETH_L2=0x2,REMOTE_ETH_L3=0x3,LOCAL_IB=0x4,REMOTE_IB_LOCAL_UD=0xa,REMOTE_IB_GLOBAL_UD=0xb" offset="0x4.0" size="0x0.4" />
+	<field name="stclass" descr="Stacking TClass. TClass to be used if the packet is transmitted \;on a stacking port to be transmitted on a port in a different \;device.\;Reserved from Switch-IB/2, Quantum and Spectrum" access="RW" offset="0x4.13" size="0x0.3" />
+	<field name="tr" descr="Truncate. Indicates all packets mirrored to this Analyzer port \;will be truncated.\;Truncation size is defined by truncation_size\;For Spectrum, packets from CPU to a truncation-enabled agent \;will not be mirrored. \;For Spectrum-2, packets from CPU to a truncation-enabled \;agent will be mirrored\;Reserved when system_port is to CPU\;Reserved when trunc_prof_v is 1" access="RW" offset="0x4.24" size="0x0.1" />
+	<field name="be" descr="Best Effort. Indicates mirroring traffic should not cause packet \;drop or back pressure but will discard the mirroring packets. \;Mirroring packets will be forwarded in a best effort manner.\;0: NOT_DISCARD - Do not discard mirrored packets\;1: DISCARD - Discard mirrored packets if causing congestion\;Relevant both for ingress mirror and egress mirror\;\;" access="RW" enum="NOT_DISCARD=0x0,DISCARD=0x1" offset="0x4.25" size="0x0.1" />
+	<field name="qos" descr="Quality of Service mode\;0: CONFIGURED - QoS parameters (Switch Priority, and encap\;sulation PCP, DEI, DSCP or VL) are configured\;1: MAINTAIN - QoS parameters (Switch Priority, Color) are the \;same as in the original packet that has triggered the mirroring. \;For SPAN also the pcp,dei are maintained. Reserved when \;Spectrum.\;For SPAN packets the PCP, DEI is as mirrored packet\;For SwitchX/-2: this field is reserved.\;" access="RW" enum="CONFIGURED=0x0,MAINTAIN=0x1" offset="0x4.26" size="0x0.1" />
 	<field name="c" descr="Clear counters\;Clears the buffer_drop and be_drop counters" access="OP" offset="0x4.28" size="0x0.1" />
-	<field name="e" descr="Enable. Indicating the Port Analyzer is enabled\;Note: For SwitchX/-2 and Switch-IB/2 before disabling a port ana\;lyzer, software should make sure no port / rule is associated with \;the Port Analyzer to be disabled." access="RW" offset="0x4.31" size="0x0.1" />
-	<field name="truncation_size" descr="Truncation Size.\;Sets the truncation size in case truncation is enabled. \;Unit is 1 byte.\;Granularity is 4 bytes. \;For Switch-IB/2 and Spectrum-1: minimum value is 32B\;For Quantum and Spectrum-2/3: minimum value is 48B\;For Spectrum-4: minimum value is 64B. \;For Switch-IB/2, all port analyzers must have the same trunca\;tion size.\;For SwitchX/-2, this value is set to 64 bytes and can not be \;changed in current FW version. For more details, contact NVIDIA \;Support.\;Reserved when span_type is LOCALIB\;Reserved when trunc_prof_v is 1" access="RW" offset="0x8.0" size="0x0.13" />
-	<field name="pid" descr="Policer ID\;Range MOGCR.mirroring_pid_base .. (MOGCR.mirror\;ing_pid_base + cap_max_span_analyzers - 1)\;See pid in QPCR, Section 11.14.7, &quot;QPCR - QoS Policer Con\;figuration Register&quot;, on page 2595\;Note: the policer takes packet length prior to truncation. The \;policer must have color_aware=not, type=srDCM, violate_ac\;tion=discard.\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum and Quantum/\;-2" access="RW" offset="0xC.0" size="0x0.14" />
-	<field name="pide" descr="Policer enable\;For more details about policers, refer to Section 10.7.6, \;&quot;Policer&quot;, on page 2382\;Note: for mirror to CPU: MPAT.pid is enabled then the trap-\;group-policer will not police\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum and Quantum/\;-2" access="RW" offset="0xC.15" size="0x0.1" />
-	<field name="encapsulation" descr="Remote SPAN encapsulation. The encapsulation information is \;based on the span_type field. The following tables provide a refer\;ence to the encapsulation fields for the different SPAN types: \;Table 650, &quot;Local SPAN Layout,&quot; on page 1137.\;Table 652, &quot;Remote SPAN Ethernet VLAN Layout,&quot; on \;page 1138.\;Table 654, &quot;Encapsulated Remote SPAN Ethernet L2 Lay\;out,&quot; on page 1139.\;Table 656, &quot;Encapsulated Remote SPAN Ethernet L3 Lay\;out,&quot; on page 1141.\;Table 658, &quot;Local SPAN InfiniBand Layout,&quot; on page 1143.\;Table 660, &quot;Remote SPAN InfiniBand Local UD Layout,&quot; on \;page 1144.\;Table 662, &quot;Remote SPAN InfiniBand Global UD Layout,&quot; on \;page 1146." subnode="mpat_reg_encapsulation_auto_ext" access="RW" offset="0x10.0" size="0x50.0" union_selector="$(parent).span_type" />
-	<field name="buffer_drop_high" descr="Counter:\;Number of packet drops on the analyzer agent due to buffer size\;Not supported when SwitchX/-2, Switch-IB and Quantum" access="RO" offset="0x60.0" size="0x4.0" />
-	<field name="buffer_drop_low" descr="Counter:\;Number of packet drops on the analyzer agent due to buffer size\;Not supported when SwitchX/-2, Switch-IB and Quantum" access="RO" offset="0x64.0" size="0x4.0" />
-	<field name="be_drop_high" descr="Counter:\;Number of packet drops on the analyzer agent due to Best Effort \;when be is enabled\;Not supported for SwitchX/2 and Switch-IB and Quantum" access="RO" offset="0x68.0" size="0x4.0" />
-	<field name="be_drop_low" descr="Counter:\;Number of packet drops on the analyzer agent due to Best Effort \;when be is enabled\;Not supported for SwitchX/2 and Switch-IB and Quantum" access="RO" offset="0x6C.0" size="0x4.0" />
+	<field name="e" descr="Enable. Indicating the Port Analyzer is enabled\;Note: For SwitchX/-2 and Switch-IB/2 before disabling a port \;analyzer, software should make sure no port / rule is associated \;with the Port Analyzer to be disabled." access="RW" offset="0x4.31" size="0x0.1" />
+	<field name="truncation_size" descr="Truncation Size.\;Sets the truncation size in case truncation is enabled. \;Unit is 1 byte.\;Granularity is 4 bytes. \;For Switch-IB/2 and Spectrum-1: minimum value is 32B\;For Quantum and Spectrum-2/3: minimum value is 48B\;For Spectrum-4: minimum value is 64B. \;For Switch-IB/2, all port analyzers must have the same trunca\;tion size.\;For SwitchX/-2, this value is set to 64 bytes and can not be \;changed in current FW version. For more details, contact \;NVIDIA Support.\;Reserved when span_type is LOCALIB\;Reserved when trunc_prof_v is 1" access="RW" offset="0x8.0" size="0x0.13" />
+	<field name="pid" descr="Policer ID\;Range MOGCR.mirroring_pid_base .. (MOGCR.mirror\;ing_pid_base + cap_max_span_analyzers - 1)\;See pid in QPCR, Section 11.14.7, &quot;QPCR - QoS Policer \;Configuration Register&quot;, on page 2383\;Note: the policer takes packet length prior to truncation. The \;policer must have color_aware=not, type=srDCM, violate_ac\;tion=discard.\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum and Quan\;tum/-2" access="RW" offset="0xC.0" size="0x0.14" />
+	<field name="pide" descr="Policer enable\;For more details about policers, refer to Section 10.7.6, \;&quot;Policer&quot;, on page 2143\;Note: for mirror to CPU: MPAT.pid is enabled then the trap-\;group-policer will not police\;Reserved when SwitchX/-2, Switch-IB/2, Spectrum and Quan\;tum/-2" access="RW" offset="0xC.15" size="0x0.1" />
+	<field name="encapsulation" descr="Remote SPAN encapsulation. The encapsulation information is \;based on the span_type field. The following tables provide a ref\;erence to the encapsulation fields for the different SPAN types: \;Table 722, &quot;Local SPAN Layout,&quot; on page 902.\;Table 724, &quot;Remote SPAN Ethernet VLAN Layout,&quot; on \;page 903.\;Table 726, &quot;Encapsulated Remote SPAN Ethernet L2 Lay\;out,&quot; on page 904.\;Table 728, &quot;Encapsulated Remote SPAN Ethernet L3 Lay\;out,&quot; on page 906.\;Table 730, &quot;Local SPAN InfiniBand Layout,&quot; on page 909.\;Table 732, &quot;Remote SPAN InfiniBand Local UD Layout,&quot; \;on page 910.\;Table 734, &quot;Remote SPAN InfiniBand Global UD Layout,&quot; \;on page 912." subnode="mpat_reg_encapsulation_auto_ext" access="RW" offset="0x10.0" size="0x50.0" union_selector="$(parent).span_type" />
+	<field name="buffer_drop_high" descr="Counter:\;Number of packet drops on the analyzer agent due to buffer \;size\;Not supported when SwitchX/-2, Switch-IB and Quantum" access="RO" offset="0x60.0" size="0x4.0" />
+	<field name="buffer_drop_low" descr="Counter:\;Number of packet drops on the analyzer agent due to buffer \;size\;Not supported when SwitchX/-2, Switch-IB and Quantum" access="RO" offset="0x64.0" size="0x4.0" />
+	<field name="be_drop_high" descr="Counter:\;Number of packet drops on the analyzer agent due to Best \;Effort when be is enabled\;Not supported for SwitchX/2 and Switch-IB and Quantum" access="RO" offset="0x68.0" size="0x4.0" />
+	<field name="be_drop_low" descr="Counter:\;Number of packet drops on the analyzer agent due to Best \;Effort when be is enabled\;Not supported for SwitchX/2 and Switch-IB and Quantum" access="RO" offset="0x6C.0" size="0x4.0" />
+	<field name="pc" descr="Pad Count\;0: No_padding\;1: 2Bytes_padding\;\;Supported from Spectrum-4 and above." access="RW" offset="0x78.0" size="0x0.2" />
 </node>
 
 <node name="mpcir_ext" descr="" size="0x10.0" >
@@ -2942,7 +3118,7 @@
 	<field name="pcie_index" descr="PCIe index number (Internal domain index)\;Reserved when access is from the host" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="depth" descr="depth level of the DUT of some hierarchy" access="INDEX" offset="0x0.24" size="0x0.6" />
 	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter value \;for all counters in the counter group. This bit can be set for \;both Set() and Get() operation." access="WO" offset="0x4.31" size="0x0.1" />
-	<field name="counter_set" descr="Counter set as described in\;Table 468, &quot;PCIe Performance Counters Data Layout,&quot; on \;page 942\;Table 472, &quot;PCIE lanes counters Data Layout,&quot; on \;page 946 - [Internal] \;Table 470, &quot;PCIE timers and states Data Layout,&quot; on \;page 944 - [Internal]" subnode="mpcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
+	<field name="counter_set" descr="Counter set as described in\;Table 616, &quot;PCIe Performance Counters Data Layout,&quot; on \;page 795\;Table 620, &quot;PCIE lanes counters Data Layout,&quot; on \;page 799 - [Internal] \;Table 618, &quot;PCIE timers and states Data Layout,&quot; on \;page 797 - [Internal]" subnode="mpcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
 </node>
 
 <node name="mpecs_reg_ext" descr="" size="0x20.0" >
@@ -2981,15 +3157,15 @@
 </node>
 
 <node name="mpelem_ext" descr="" size="0xc.0" >
-	<field name="eip_ecn" descr="Egress IP ECN\;ECN field of the IP header of the packet which goes out from \;the LER or LSR that implements PHP and decapsulates the \;MPLS header" access="RW" offset="0x4.8" size="0x0.2" />
-	<field name="ip_ecn" descr="IP ECN\;ECN field of the IP header of the packet that has entered the \;Egress LER or LSR that implements PHP and decapsulates \;the MPLS header" access="INDEX" offset="0x4.16" size="0x0.2" />
-	<field name="mpls_ecn" descr="MPLS ECN\;ECN field of the MPLS header of the packet that has entered \;the Egress LER or LSR that implements PHP and decapsu\;lates the MPLS header" access="INDEX" offset="0x4.24" size="0x0.2" />
+	<field name="eip_ecn" descr="Egress IP ECN\;ECN field of the IP header of the packet which goes out \;from the LER or LSR that implements PHP and decapsu\;lates the MPLS header" access="RW" offset="0x4.8" size="0x0.2" />
+	<field name="ip_ecn" descr="IP ECN\;ECN field of the IP header of the packet that has entered \;the Egress LER or LSR that implements PHP and decap\;sulates the MPLS header" access="INDEX" offset="0x4.16" size="0x0.2" />
+	<field name="mpls_ecn" descr="MPLS ECN\;ECN field of the MPLS header of the packet that has \;entered the Egress LER or LSR that implements PHP and \;decapsulates the MPLS header" access="INDEX" offset="0x4.24" size="0x0.2" />
 	<field name="trap_id" descr="Trap ID\;Trap-ID is DECAP_ECN0 or DECAP_ECN1.\;Reserved when trap_en is &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.9" />
-	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet Trap&quot;, \;on page 465" access="RW" offset="0x8.28" size="0x0.4" />
+	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet \;Trap&quot;, on page 513" access="RW" offset="0x8.28" size="0x0.4" />
 </node>
 
 <node name="mpepm_ext" descr="" size="0x14.0" >
-	<field name="exp" descr="EXP entry is the EXP to Switch Priority mapping.\;For more details, refer to Section 2437, &quot;exp&lt;i&gt; Layout&quot;, \;on page 2970" access="RW" high_bound="7" low_bound="0" offset="0x4.16" size="0x10.0" />
+	<field name="exp" descr="EXP entry is the EXP to Switch Priority mapping.\;For more details, refer to Section 2644, &quot;exp&lt;i&gt; Lay\;out&quot;, on page 2762" access="RW" high_bound="7" low_bound="0" offset="0x4.16" size="0x10.0" />
 </node>
 
 <node name="mpfm_ext" descr="" size="0x8.0" >
@@ -2998,23 +3174,23 @@
 
 <node name="mpft_ext" descr="" size="0x8.0" >
 	<field name="rif" descr="Router Interface to be bypassed by FRR" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="av" descr="label action valid:\;0 - set label_action to &apos;0&apos;: no php, no push\;1 - keep the label_action as is\;See Section 14.8.4.1, &quot;MPNHLFE Parameters - For\;ward to Ethernet&quot;, on page 2955" access="WO" offset="0x4.0" size="0x0.1" />
+	<field name="av" descr="label action valid:\;0 - set label_action to &apos;0&apos;: no php, no push\;1 - keep the label_action as is\;See Section 14.8.4.1, &quot;MPNHLFE Parameters - For\;ward to Ethernet&quot;, on page 2747" access="WO" offset="0x4.0" size="0x0.1" />
 </node>
 
 <node name="mpgcr_ext" descr="" size="0x24.0" >
 	<field name="ler_exp_rw" descr="Ingress LER EXP Re-write Enable\;Initial value for exp_rewrite_en for ingress LER:\;2: Disable the exp_rewrite_en\;3: Enable the exp_rewrite_en" access="RW" offset="0x0.20" size="0x0.2" />
 	<field name="mpls_pcp_rw" descr="LSR and LER PCP Re-write Enable\;Indicates how the MPLS handles the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Disable the pcp_rewrite_en\;3: Enable the pcp_rewrite_en\;Note: for ingress LER the RGCR may set the pcp_rw, and \;then the mpls will set it again." access="RW" offset="0x0.22" size="0x0.2" />
-	<field name="mpls_et" descr="At ingress: MPLS Ethertype accepted for LSR and egress \;LER:\;1: Ethertype 0x8847\;2: Ethertype 0x8848\;3: Ethertype 0x8847 or Ethertype 0x8848\;If Ethertype not allowed then the packet is discarded at iRIF. \;" access="RW" offset="0x0.28" size="0x0.2" />
-	<field name="ingress_ler_ttl_value" descr="Ingress LER TTL Value\;The value used in MPLS encapsulation when pushing a new \;label over IP packet in ingress LER. This value will not be \;decremented.\;Reserved when ingress_ler_ttl is 0\;Reserved when Spectrum-2, See QTTTL.enc_ttlc_uc" access="RW" offset="0x4.0" size="0x0.8" />
-	<field name="lsr_egress_ttl" descr="Egress LSR TTL (also for LSR PHP to Labels)\;Configures how the TTL of the exposed labels are set at LSR \;egress:\;1: COPY - The TTL is taken from the first popped label \;2: MINIMUM - The TTL is the minimum value between all \;popped labels\;Note: &quot;exposed labels&quot; are the labels pushed by NHLFE\;Note: the decrement of the TTL is done after the new value \;is set" access="RW" offset="0x4.16" size="0x0.2" />
-	<field name="egress_ler_ttl" descr="Configures the TTL of IP header when IP packet is exposed\;\;0: PRESERVE - The TTL is taken from the IP header\;If the packet goes to IP router then the IP router will decre\;ment the TTL\;\;1: COPY - The TTL is taken from the first popped label\;If the packet goes to IP router then the IP router will decre\;ment the TTL\;If the packet is forwarded to outgoing interface then the TTL \;will be decremented\;\;2: MINIMUM - The TTL is the minimum value between all \;popped labels and the IP header\;If the packet goes to IP router then the IP router may decre\;ment the TTL\;If the packet is forwarded to outgoing interface and TTL is \;taken from IP header then the TTL is not decremented\;If the packet is forwarded to outgoing interface and TTL is \;taken from Labels then the TTL is decremented\;Reserved when Spectrum-2, See QTTTL.decap_ttl" access="RW" offset="0x4.20" size="0x0.2" />
+	<field name="mpls_et" descr="At ingress: MPLS Ethertype accepted for LSR and egress \;LER:\;1: Ethertype 0x8847\;2: Ethertype 0x8848\;3: Ethertype 0x8847 or Ethertype 0x8848\;If Ethertype not allowed then the packet is discarded at \;iRIF. \;" access="RW" offset="0x0.28" size="0x0.2" />
+	<field name="ingress_ler_ttl_value" descr="Ingress LER TTL Value\;The value used in MPLS encapsulation when pushing a \;new label over IP packet in ingress LER. This value will not \;be decremented.\;Reserved when ingress_ler_ttl is 0\;Reserved when Spectrum-2, See QTTTL.enc_ttlc_uc" access="RW" offset="0x4.0" size="0x0.8" />
+	<field name="lsr_egress_ttl" descr="Egress LSR TTL (also for LSR PHP to Labels)\;Configures how the TTL of the exposed labels are set at \;LSR egress:\;1: COPY - The TTL is taken from the first popped label \;2: MINIMUM - The TTL is the minimum value between all \;popped labels\;Note: &quot;exposed labels&quot; are the labels pushed by NHLFE\;Note: the decrement of the TTL is done after the new value \;is set" access="RW" offset="0x4.16" size="0x0.2" />
+	<field name="egress_ler_ttl" descr="Configures the TTL of IP header when IP packet is \;exposed\;\;0: PRESERVE - The TTL is taken from the IP header\;If the packet goes to IP router then the IP router will dec\;rement the TTL\;\;1: COPY - The TTL is taken from the first popped label\;If the packet goes to IP router then the IP router will dec\;rement the TTL\;If the packet is forwarded to outgoing interface then the \;TTL will be decremented\;\;2: MINIMUM - The TTL is the minimum value between all \;popped labels and the IP header\;If the packet goes to IP router then the IP router may dec\;rement the TTL\;If the packet is forwarded to outgoing interface and TTL is \;taken from IP header then the TTL is not decremented\;If the packet is forwarded to outgoing interface and TTL is \;taken from Labels then the TTL is decremented\;Reserved when Spectrum-2, See QTTTL.decap_ttl" access="RW" offset="0x4.20" size="0x0.2" />
 	<field name="ingress_ler_ttl" descr="Ingress LER TTL\;This flag indicates which value of TTL is written in the new \;pushed label in ingress LER: \;0: TTL is taken from the IP header\;1: TTL is configured by ingress_ler_ttl_value\;Note that the IP TTL was already decremented by the IP \;router. At ingress LER flow the LSR does not decremented \;the MPLS TTL.\;\;\;Reserved when Spectrum-2, See QTTTL.enc_ttlc" access="RW" offset="0x4.22" size="0x0.1" />
 	<field name="hrlsn" descr="High Reserved Label ID Space Number\;Label IDs from 0 to hrlsn (inclusive) are accepted" access="RW" offset="0xC.0" size="0x0.8" />
 	<field name="label_id_min" descr="Label IDs from label_id_min to label_id_max (inclusive \;both) are accepted" access="RW" offset="0x10.0" size="0x0.20" />
 	<field name="label_id_max" descr="Label IDs from label_id_min to label_id_max (inclusive \;both) are accepted" access="RW" offset="0x14.0" size="0x0.20" />
 	<field name="default_label_space" descr="Default label_space (default is 0)\;Range 0..cap_mpls_label_space-1\;" access="RW" offset="0x1C.0" size="0x0.16" />
 	<field name="irif_vr_en" descr="irif virtual router enable\;0: use default_label_space or ACL based label space\;1: label_space is same as virtual_router" access="RW" offset="0x1C.16" size="0x0.1" />
-	<field name="activity_dis_mpnhlfe" descr="Disable activity bit in MPNHLFE:\;0: enable - activity will be set when an entries are hit\;(default)\;1: disable - activity will not be set when an entries are hit\;See Section 14.8.4, &quot;MPNHLFE - MPLS NHLFE Table \;Register&quot;, on page 2953" access="RW" offset="0x20.0" size="0x0.1" />
+	<field name="activity_dis_mpnhlfe" descr="Disable activity bit in MPNHLFE:\;0: enable - activity will be set when an entries are hit\;(default)\;1: disable - activity will not be set when an entries are hit\;See Section 14.8.4, &quot;MPNHLFE - MPLS NHLFE Table \;Register&quot;, on page 2745" access="RW" offset="0x20.0" size="0x0.1" />
 </node>
 
 <node name="mpgo_reg_ext" descr="" size="0x14.0" >
@@ -3045,15 +3221,15 @@
 
 <node name="mpilm_ext" descr="" size="0x18.0" >
 	<field name="label_space" descr="Label Space\;Range 0 .. cap_mpls_label_space - 1" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="op" descr="Operation\;For Write:\;0: Write or over-write operation. \;1: Reserved \;2: Reserved \;3: Delete operation. Used to delete an existing entry. If entry \;doesn&apos;t exist, the operation fails.\;For Query:\;0: Read operation. If entry doesn&apos;t exist, the operation fails.\;" access="OP" offset="0x0.28" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: Write or over-write operation. \;1: Reserved \;2: Reserved \;3: Delete operation. Used to delete an existing entry. If \;entry doesn&apos;t exist, the operation fails.\;For Query:\;0: Read operation. If entry doesn&apos;t exist, the operation \;fails.\;" access="OP" offset="0x0.28" size="0x0.3" />
 	<field name="label_id" descr="Label ID" access="INDEX" offset="0x4.0" size="0x0.20" />
-	<field name="nhlfe_ptr" descr="Pointer to NHLFE.\;When using ECMP, points to the first entry in the ECMP list\;For Spectrum family, the index is to the KVD linear." access="RW" offset="0x8.0" size="0x0.24" />
-	<field name="ecmp_size" descr="The amount of sequential entries starting from the nhlfe_ptr \;(the number of ECMPs)\;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2: 1-128, 256, 512, 1024, 2048 and 4096." access="RW" offset="0xC.0" size="0x0.13" />
+	<field name="nhlfe_ptr" descr="Pointer to NHLFE.\;When using ECMP, points to the first entry in the ECMP \;list\;For Spectrum family, the index is to the KVD linear." access="RW" offset="0x8.0" size="0x0.24" />
+	<field name="ecmp_size" descr="The amount of sequential entries starting from the \;nhlfe_ptr (the number of ECMPs)\;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2: 1-128, 256, 512, 1024, 2048 and 4096." access="RW" offset="0xC.0" size="0x0.13" />
 	<field name="npop" descr="Number of labels to pop from the label stack.\;Range from 0 to cap_mpls_ilm_entry_pop" access="RW" offset="0xC.24" size="0x0.2" />
 	<field name="trap_id" descr="Trap ID to be reported to CPU\;For Spectrum Trap-ID is MPLS_ILM0 or MPLS_ILM1\;For Spectrum-2/3 Trap-ID is MPLS_ILM0 .. MPLS_ILM3\;For trap_action of NOP, MIRROR and DISCARD_ERROR, \;trap_id is reserved" access="RW" offset="0x10.0" size="0x0.9" />
 	<field name="trap_action" descr="Trap Action\;0: NOP\;1: TRAP\;2: MIRROR_TO_CPU\;3: MIRROR\;4: DISCARD_ERROR" access="RW" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,MIRROR=0x3,DISCARD_ERROR=0x4" offset="0x10.28" size="0x0.4" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x14.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x14.24" size="0x0.8" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x14.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x14.24" size="0x0.8" />
 </node>
 
 <node name="mpir_ext" descr="" size="0x10.0" >
@@ -3081,16 +3257,16 @@
 </node>
 
 <node name="mpnhlfe_ext" descr="" size="0x5c.0" >
-	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit on \;the specific entry. \;To clear the a bit, use &quot;clear activity&quot; ca operation.\;Enabled by activity_dis in MPGCR, see Section 14.8.1, \;&quot;MPGCR - MPLS General Configuration Register&quot;, on \;page 2946" access="RO" offset="0x0.16" size="0x0.1" />
+	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit \;on the specific entry. \;To clear the a bit, use &quot;clear activity&quot; ca operation.\;Enabled by activity_dis in MPGCR, see Section 14.8.1, \;&quot;MPGCR - MPLS General Configuration Register&quot;, on \;page 2738" access="RO" offset="0x0.16" size="0x0.1" />
 	<field name="ca" descr="Clear activity, valid only for read access:\;0: do not clear activity\;1: clear activity" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="nhlfe_ptr" descr="NHLFE Index\;For Spectrum, the index is to the KVD linear, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; (page 3375)" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="nhlfe_ptr" descr="NHLFE Index\;For Spectrum, the index is to the KVD linear, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)" access="INDEX" offset="0x4.0" size="0x0.24" />
 	<field name="v" descr="Valid indication\;" access="RW" offset="0x4.31" size="0x0.1" />
-	<field name="forward_action" descr="NHLFE Action\;0: Forward_to_Ethernet\;1: Forward_to_IP_Router\;2: Continue_Lookups - if there is another label then lookup \;ILM, else Forward to IP Router\;3: Next_NHLFE\;" access="RW" enum="Forward_to_Ethernet=0x0,Forward_to_IP_Router=0x1,Continue_Lookups=0x2,Next_NHLFE=0x3" offset="0x8.0" size="0x0.4" />
-	<field name="trap_id" descr="Trap ID to be reported to CPU\;For Spectrum Trap-ID is MPLS_NHLFE0 or MPLS_NHLFE1\;For Spectrum-2/3 Trap-ID is MPLS_NHLFE0 .. MPLS_N\;HLFE3\;For trap_action of NOP, MIRROR and DISCARD__ERROR \;trap_id is reserved" access="RW" offset="0xC.0" size="0x0.9" />
+	<field name="forward_action" descr="NHLFE Action\;0: Forward_to_Ethernet\;1: Forward_to_IP_Router\;2: Continue_Lookups - if there is another label then \;lookup ILM, else Forward to IP Router\;3: Next_NHLFE\;" access="RW" enum="Forward_to_Ethernet=0x0,Forward_to_IP_Router=0x1,Continue_Lookups=0x2,Next_NHLFE=0x3" offset="0x8.0" size="0x0.4" />
+	<field name="trap_id" descr="Trap ID to be reported to CPU\;For Spectrum Trap-ID is MPLS_NHLFE0 or MPLS_N\;HLFE1\;For Spectrum-2/3 Trap-ID is MPLS_NHLFE0 .. MPLS_N\;HLFE3\;For trap_action of NOP, MIRROR and DISCARD__ERROR \;trap_id is reserved" access="RW" offset="0xC.0" size="0x0.9" />
 	<field name="trap_action" descr="Trap Action\;0: NOP\;1: TRAP\;2: MIRROR_TO_CPU\;3: MIRROR\;4: DISCARD_ERROR, see DISCARD_LSR3 trap_id" access="RW" offset="0xC.28" size="0x0.4" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x10.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x10.24" size="0x0.8" />
-	<field name="nhlfe_parameters" descr="The fields in parameters are depended on forward_action as \;follows:\;Table 2421, &quot;Parameters - Forward to Ethernet Lay\;out,&quot; on page 2955\;Table 2423, &quot;Parameters - Forward to IP Router Lay\;out,&quot; on page 2958\;Table 2425, &quot;Parameters - Continue Lookups Layout,&quot; \;on page 2961\;Table 2427, &quot;Parameters - Next NHLFE Layout,&quot; on \;page 2964\;" subnode="mpnhlfe_nhlfe_parameters_auto_ext" access="RW" offset="0x30.0" size="0x2c.0" union_selector="$(parent).forward_action" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x10.24" size="0x0.8" />
+	<field name="nhlfe_parameters" descr="The fields in parameters are depended on forward_action \;as follows:\;Table 2628, &quot;Parameters - Forward to Ethernet Lay\;out,&quot; on page 2747\;Table 2630, &quot;Parameters - Forward to IP Router Lay\;out,&quot; on page 2750\;Table 2632, &quot;Parameters - Continue Lookups Lay\;out,&quot; on page 2753\;Table 2634, &quot;Parameters - Next NHLFE Layout,&quot; on \;page 2756\;" subnode="mpnhlfe_nhlfe_parameters_auto_ext" access="RW" offset="0x30.0" size="0x2c.0" union_selector="$(parent).forward_action" />
 </node>
 
 <node name="mpnhlfe_nhlfe_parameters_auto_ext" descr="" attr_is_union="1" size="0x2c.0" >
@@ -3105,8 +3281,8 @@
 	<field name="exp" descr="EXP value for set_exp\;Ignored by the device when protection_active = 1" access="RW" offset="0x0.16" size="0x0.3" />
 	<field name="set_exp" descr="Set the packet EXP with exp value\;Ignored by the device when protection_active = 1" access="RW" offset="0x0.19" size="0x0.1" />
 	<field name="exp_rw" descr="EXP Re-write\;0: Preserve the value of the rewrite_enable\;1: Set the rewrite_enable\;2: Clear the rewrite_enable\;Ignored by the device when protection_active = 1" access="RW" offset="0x0.20" size="0x0.2" />
-	<field name="usp_exp" descr="Update Switch Priority and Packet Color based on EXP\;Forces recalculation of the Switch Priority and Packet Color \;based on the packet&apos;s EXP field as configured by MPEPM. \;Relevant for packets within the MPLS domain.\;Note: the function of set_exp is done prior to the function of \;usp_exp\;Ignored by the device when protection_active = 1\;See Section 14.8.7, &quot;MPEPM - MPLS EXP to Priority \;Mapping Register&quot;, on page 2970." access="RW" offset="0x0.24" size="0x0.1" />
-	<field name="usp_dscp" descr="Update Switch Priority and Packet Color based on DSCP\;Forces recalculation of the Switch Priority and Packet Color \;based on the packet&apos;s DSCP field as configured by RDPM. \;Reserved when label_action != 1 (PHP)\;Ignored by the device when protection_active = 1\;See Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2818\;" access="RW" offset="0x0.25" size="0x0.1" />
+	<field name="usp_exp" descr="Update Switch Priority and Packet Color based on EXP\;Forces recalculation of the Switch Priority and Packet \;Color based on the packet&apos;s EXP field as configured by \;MPEPM. Relevant for packets within the MPLS domain.\;Note: the function of set_exp is done prior to the function \;of usp_exp\;Ignored by the device when protection_active = 1\;See Section 14.8.7, &quot;MPEPM - MPLS EXP to Priority \;Mapping Register&quot;, on page 2762." access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="usp_dscp" descr="Update Switch Priority and Packet Color based on DSCP\;Forces recalculation of the Switch Priority and Packet \;Color based on the packet&apos;s DSCP field as configured by \;RDPM. \;Reserved when label_action != 1 (PHP)\;Ignored by the device when protection_active = 1\;See Section 13.11.20, &quot;RDPM - Router DSCP to Prior\;ity Mapping Register&quot;, on page 2606\;" access="RW" offset="0x0.25" size="0x0.1" />
 	<field name="uecn_exp" descr="Update ECN from EXP.\;Forces recalculation of the ECN based on the packet&apos;s EXP \;field as configured by QEPM of the ingress port.\;Reserved when Spectrum" access="RW" offset="0x0.26" size="0x0.1" />
 	<field name="dscp_rw" descr="DSCP Re-write Enable.\;Controlling the rewrite_enable for DSCP:\;0: Preserve the value of the rewrite_enable bit\;1: Set the rewrite_enable bit\;2: Clear the rewrite_enable bit\;Reserved when label_action != 1 (PHP)\;Ignored by the device when protection_active = 1\;" access="RW" offset="0x0.28" size="0x0.2" />
 	<field name="label_id" descr="Label id to push to the label stack\;Reserved when label_action is &apos;0&apos;, &apos;1&apos;" access="RW" offset="0x4.0" size="0x0.20" />
@@ -3118,14 +3294,14 @@
 
 <node name="mpnhlfe_param_iprouter_ext" descr="" size="0x2c.0" >
 	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile \;Reserved when Spectrum" access="RW" offset="0x0.16" size="0x0.4" />
-	<field name="usp_exp" descr="Update Switch Priority and Packet Color based on EXP\;Forces recalculation of the Switch Priority and Packet Color \;based on the packet&apos;s EXP field as configured by MPEPM. \;Relevant for packets within the MPLS domain.\;Note: the function of set_exp is done prior to the function of \;usp_exp\;Ignored by the device when protection_active = 1\;See Section 14.8.7, &quot;MPEPM - MPLS EXP to Priority \;Mapping Register&quot;, on page 2970.\;Reserved when Spectrum" access="RW" offset="0x0.24" size="0x0.1" />
-	<field name="usp_dscp" descr="Update Switch Priority and Packet Color based on DSCP\;Forces recalculation of the Switch Priority and Packet Color \;based on the packet&apos;s DSCP field as configured by RDPM. \;Note that this field is takes effect only if the IP header tis \;exposed as a result of this NHLFE action. See \;Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2818\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.25" size="0x0.1" />
+	<field name="usp_exp" descr="Update Switch Priority and Packet Color based on EXP\;Forces recalculation of the Switch Priority and Packet \;Color based on the packet&apos;s EXP field as configured by \;MPEPM. Relevant for packets within the MPLS domain.\;Note: the function of set_exp is done prior to the function \;of usp_exp\;Ignored by the device when protection_active = 1\;See Section 14.8.7, &quot;MPEPM - MPLS EXP to Priority \;Mapping Register&quot;, on page 2762.\;Reserved when Spectrum" access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="usp_dscp" descr="Update Switch Priority and Packet Color based on DSCP\;Forces recalculation of the Switch Priority and Packet \;Color based on the packet&apos;s DSCP field as configured by \;RDPM. Note that this field is takes effect only if the IP \;header tis exposed as a result of this NHLFE action. See \;Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2606\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.25" size="0x0.1" />
 	<field name="uecn_exp" descr="Update ECN from EXP.\;Forces recalculation of the ECN based on the packet&apos;s EXP \;field as configured by QEPM of the ingress port.\;Reserved when Spectrum" access="RW" offset="0x0.26" size="0x0.1" />
 	<field name="dscp_rw" descr="DSCP Re-write Enable\;Controlling the rewrite_enable for DSCP:\;0: Preserve the value of the rewrite_enable bit\;1: Set the rewrite_enable bit\;2: Clear the rewrite_enable bit\;Note that this field takes effect only if the IP header is \;exposed as a result of this NHLFE action.\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.28" size="0x0.2" />
 	<field name="irif" descr="Ingress Router Interface used for forwarding the packet to \;the router. \;Reserved when irifv = &apos;0&apos;" access="RW" offset="0xC.0" size="0x0.16" />
-	<field name="irifv" descr="irif is valid \;Indicates that the irif, dscp_rw, usp_dscp are field is valid. \;Useful for the case that Continue Lookups have a valid irif. If \;multiple NHLFE lookups are performed, the device will use \;the last valid iri. SW must make sure that at least 1 irif is \;valid otherwise the packet will be discarded\;" access="RW" offset="0xC.24" size="0x0.1" />
+	<field name="irifv" descr="irif is valid \;Indicates that the irif, dscp_rw, usp_dscp are field is valid. \;Useful for the case that Continue Lookups have a valid irif. \;If multiple NHLFE lookups are performed, the device will \;use the last valid iri. SW must make sure that at least 1 irif \;is valid otherwise the packet will be discarded\;" access="RW" offset="0xC.24" size="0x0.1" />
 	<field name="egress_router_interface" descr="Egress RIF \;Reserved when erifv = &apos;0&apos;\;Reserved when Spectrum" access="RW" offset="0x10.0" size="0x0.16" />
-	<field name="erifv" descr="egress_router_interface is valid\;Erif is needed as MPLS erif when forward to IP router. If \;another lookup is done then the erif is stored for this packet \;for later use.\;SW must make sure that at least 1 erif is valid otherwise the \;packet will be discarded\;Reserved when Spectrum" access="RW" offset="0x10.24" size="0x0.1" />
+	<field name="erifv" descr="egress_router_interface is valid\;Erif is needed as MPLS erif when forward to IP router. If \;another lookup is done then the erif is stored for this \;packet for later use.\;SW must make sure that at least 1 erif is valid otherwise \;the packet will be discarded\;Reserved when Spectrum" access="RW" offset="0x10.24" size="0x0.1" />
 	<field name="cbset_select" descr="Select cbset:\;Spectrum-2: Range 0..7\;" access="RW" offset="0x18.0" size="0x0.3" />
 	<field name="cbset_val" descr="Value for setting cbset\;Reserved when Spectrum" access="RW" offset="0x1C.0" size="0x0.16" />
 	<field name="cbset_mask" descr="Mask for setting cbset_val\;Per bit:\;0: do not update\;1: update\;Reserved when Spectrum" access="RW" offset="0x20.0" size="0x0.16" />
@@ -3134,14 +3310,14 @@
 <node name="mpnhlfe_param_lookups_ext" descr="" size="0x2c.0" >
 	<field name="bos_check" descr="Check BoS field:\;0: Do not check BoS field\;1: BoS field must be &apos;0&apos;, do not forward to IP Router\;2: Bos Field must be &apos;1&apos;, note: behaves like &quot;Forward to IP \;Router&quot;\;Reserved when Spectrum" access="RW" offset="0x0.0" size="0x0.2" />
 	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile \;Reserved when Spectrum" access="RW" offset="0x0.16" size="0x0.4" />
-	<field name="usp_exp" descr="Update Switch Priority and Packet Color based on EXP\;Forces recalculation of the Switch Priority and Packet Color \;based on the packet&apos;s EXP field as configured by MPEPM. \;Relevant for packets within the MPLS domain.\;Note: the function of set_exp is done prior to the function of \;usp_exp\;Ignored by the device when protection_active = 1\;See Section 14.8.7, &quot;MPEPM - MPLS EXP to Priority \;Mapping Register&quot;, on page 2970.\;Reserved when Spectrum" access="RW" offset="0x0.24" size="0x0.1" />
-	<field name="usp_dscp" descr="Update Switch Priority and Packet Color based on DSCP\;Forces recalculation of the Switch Priority and Packet Color \;based on the packet&apos;s DSCP field as configured by RDPM. \;This field is ignored by the device when lookup on next label \;is done\;See Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2818\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.25" size="0x0.1" />
+	<field name="usp_exp" descr="Update Switch Priority and Packet Color based on EXP\;Forces recalculation of the Switch Priority and Packet \;Color based on the packet&apos;s EXP field as configured by \;MPEPM. Relevant for packets within the MPLS domain.\;Note: the function of set_exp is done prior to the function \;of usp_exp\;Ignored by the device when protection_active = 1\;See Section 14.8.7, &quot;MPEPM - MPLS EXP to Priority \;Mapping Register&quot;, on page 2762.\;Reserved when Spectrum" access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="usp_dscp" descr="Update Switch Priority and Packet Color based on DSCP\;Forces recalculation of the Switch Priority and Packet \;Color based on the packet&apos;s DSCP field as configured by \;RDPM. \;This field is ignored by the device when lookup on next \;label is done\;See Section 13.11.20, &quot;RDPM - Router DSCP to Prior\;ity Mapping Register&quot;, on page 2606\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.25" size="0x0.1" />
 	<field name="uecn_exp" descr="Update ECN from EXP.\;Forces recalculation of the ECN based on the packet&apos;s EXP \;field as configured by QEPM of the ingress port.\;Reserved when Spectrum" access="RW" offset="0x0.26" size="0x0.1" />
-	<field name="dscp_rw" descr="DSCP Re-write Enable\;Controlling the rewrite_enable for DSCP:\;0: Preserve the value of the rewrite_enable bit\;1: Set the rewrite_enable bit\;2: Clear the rewrite_enable bit\;This field is ignored by the device when lookup on next label \;is done\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.28" size="0x0.2" />
+	<field name="dscp_rw" descr="DSCP Re-write Enable\;Controlling the rewrite_enable for DSCP:\;0: Preserve the value of the rewrite_enable bit\;1: Set the rewrite_enable bit\;2: Clear the rewrite_enable bit\;This field is ignored by the device when lookup on next \;label is done\;When Spectrum-2 then reserved when irifv = &apos;0&apos;\;" access="RW" offset="0x0.28" size="0x0.2" />
 	<field name="irif" descr="Ingress Router Interface used for forwarding the packet to \;the router. \;Reserved when irifv = &apos;0&apos;" access="RW" offset="0xC.0" size="0x0.16" />
-	<field name="irifv" descr="irif is valid\;Indicates that the irif, dscp_rw, usp_dscp are field is valid. \;Irif is needed for forward to IP router. If another lookup is \;done then the irif is stored for this packet for later use.\;SW must make sure that at least 1 irif is valid otherwise the \;packet will be discarded\;" access="RW" offset="0xC.24" size="0x0.1" />
+	<field name="irifv" descr="irif is valid\;Indicates that the irif, dscp_rw, usp_dscp are field is valid. \;Irif is needed for forward to IP router. If another lookup is \;done then the irif is stored for this packet for later use.\;SW must make sure that at least 1 irif is valid otherwise \;the packet will be discarded\;" access="RW" offset="0xC.24" size="0x0.1" />
 	<field name="egress_router_interface" descr="Egress RIF \;Reserved when erifv = &apos;0&apos;\;Reserved when Spectrum" access="RW" offset="0x10.0" size="0x0.16" />
-	<field name="erifv" descr="egress_router_interface is valid\;Erif is needed as MPLS erif when forward to IP router. If \;another lookup is done then the erif is stored for this packet \;for later use.\;SW must make sure that at least 1 erif is valid otherwise the \;packet will be discarded\;Reserved when Spectrum" access="RW" offset="0x10.24" size="0x0.1" />
+	<field name="erifv" descr="egress_router_interface is valid\;Erif is needed as MPLS erif when forward to IP router. If \;another lookup is done then the erif is stored for this \;packet for later use.\;SW must make sure that at least 1 erif is valid otherwise \;the packet will be discarded\;Reserved when Spectrum" access="RW" offset="0x10.24" size="0x0.1" />
 	<field name="cbset_select" descr="Select cbset:\;Spectrum-2: Range 0..7\;" access="RW" offset="0x18.0" size="0x0.3" />
 	<field name="cbset_val" descr="Value for setting cbset" access="RW" offset="0x1C.0" size="0x0.16" />
 	<field name="cbset_mask" descr="Mask for setting cbset_val\;Per bit:\;0: do not update\;1: update" access="RW" offset="0x20.0" size="0x0.16" />
@@ -3149,19 +3325,19 @@
 
 <node name="mpnhlfeb_ext" descr="" size="0x410.0" >
 	<field name="v" descr="Valid\;0: Remove ecmp entries\;1: Write ecmp entries" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="nhlfe_ptr" descr="Index in the NHLFE table\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot;, on page 3375" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="nhlfe_ptr" descr="Index in the NHLFE table\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot;, on page 3097" access="INDEX" offset="0x4.0" size="0x0.24" />
 	<field name="num_rec" descr="Number of records" access="OP" offset="0x8.0" size="0x0.8" />
 	<field name="trap_id" descr="Trap ID to be reported to CPU\;Trap-ID is MPLS_NHLFE0 .. MPLS_NHLFE3\;For trap_action of NOP, MIRROR and DISCARD__ERROR \;trap_id is reserved" access="WO" offset="0xC.0" size="0x0.9" />
 	<field name="trap_action" descr="Trap Action\;0: NOP\;1: TRAP\;2: MIRROR_TO_CPU\;3: MIRROR\;4: DISCARD_ERROR" access="WO" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,MIRROR=0x3,DISCARD_ERROR=0x4" offset="0xC.28" size="0x0.4" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="WO" offset="0x10.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="WO" offset="0x10.24" size="0x0.8" />
-	<field name="record" descr="Record\;See Table 2431, &quot;MPNHLFEB - Record Layout,&quot; on \;page 2968" subnode="mpnhlfeb_record_ext" access="WO" high_bound="20" low_bound="0" offset="0x20.0" size="0x3f0.0" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="WO" offset="0x10.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;Not supported by SwitchX and SwitchX-2" access="WO" offset="0x10.24" size="0x0.8" />
+	<field name="record" descr="Record\;See Table 2638, &quot;MPNHLFEB - Record Layout,&quot; on \;page 2760" subnode="mpnhlfeb_record_ext" access="WO" high_bound="20" low_bound="0" offset="0x20.0" size="0x3f0.0" />
 </node>
 
 <node name="mpnhlfeb_record_ext" descr="" size="0x30.0" >
 	<field name="size" descr="Size\;The amount of entries to be written for this record. Allows \;writing this record multiple consecutive times\;Range 1..4095" access="WO" offset="0x0.16" size="0x0.12" />
-	<field name="forward_action" descr="NHLFE Action:\;0: Forward_to_Ethernet\;1: Forward_to_IP_Router\;2: Continue_Lookups - If there is another label then lookup \;ILM, else Forward to IP Router\;3: Next_NHLFE" access="WO" enum="Forward_to_Ethernet=0x0,Forward_to_IP_Router=0x1,Continue_Lookups=0x2,Next_NHLFE=0x3" offset="0x0.28" size="0x0.4" />
-	<field name="nhlfe_parameters" descr="The fields in parameters are depended on forward_action as \;follows:\;Table 2421, &quot;Parameters - Forward to Ethernet Lay\;out,&quot; on page 2955\;Table 2423, &quot;Parameters - Forward to IP Router Lay\;out,&quot; on page 2958\;Table 2425, &quot;Parameters - Continue Lookups Layout,&quot; \;on page 2961\;Table 2427, &quot;Parameters - Next NHLFE Layout,&quot; on \;page 2964" subnode="mpnhlfeb_record_nhlfe_parameters_auto_ext" access="WO" offset="0x4.0" size="0x2c.0" union_selector="$(parent).forward_action" />
+	<field name="forward_action" descr="NHLFE Action:\;0: Forward_to_Ethernet\;1: Forward_to_IP_Router\;2: Continue_Lookups - If there is another label then \;lookup ILM, else Forward to IP Router\;3: Next_NHLFE" access="WO" enum="Forward_to_Ethernet=0x0,Forward_to_IP_Router=0x1,Continue_Lookups=0x2,Next_NHLFE=0x3" offset="0x0.28" size="0x0.4" />
+	<field name="nhlfe_parameters" descr="The fields in parameters are depended on forward_action \;as follows:\;Table 2628, &quot;Parameters - Forward to Ethernet Lay\;out,&quot; on page 2747\;Table 2630, &quot;Parameters - Forward to IP Router Lay\;out,&quot; on page 2750\;Table 2632, &quot;Parameters - Continue Lookups Lay\;out,&quot; on page 2753\;Table 2634, &quot;Parameters - Next NHLFE Layout,&quot; on \;page 2756" subnode="mpnhlfeb_record_nhlfe_parameters_auto_ext" access="WO" offset="0x4.0" size="0x2c.0" union_selector="$(parent).forward_action" />
 </node>
 
 <node name="mpnhlfeb_record_nhlfe_parameters_auto_ext" descr="" attr_is_union="1" size="0x2c.0" >
@@ -3179,8 +3355,8 @@
 
 <node name="mprs_ext" descr="" size="0x14.0" >
 	<field name="parsing_depth" descr="Minimum Parsing Depth\;Units of Bytes. \;Need to enlarge parsing depth according to L3, MPLS, tun\;nels, ACL rules, custom_bytes, traps, hash etc. \;Default is 96B\;Value must be larger than 0\;The device will parse no deeper than cap_max_parsing\;_depth\;Reserved when SwitchX/-2\;\;" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="parsing_en" descr="Parsing enable\;Bit0: enable parsing of NVE of types VXLAN, VXLAN-GPE, \;GENEVE and NVGRE, default enabled\;Note: for proper parsing the parsing_depth must also be con\;figured\;Reserved when SwitchX/-2 also reserved when Spectrum-2 \;since Spectrum-2 supports concurrent QinQ and NVE" access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="ctipl_l2_length" descr="L2 header length to be added to IP length for Cut Through IP \;Length Based mode\;This length should include DMAC, SMAC, L2 tags (VLANs \;etc.), MPLS labels. e.g. configure 52 for DMAC+SMAC + 10 \;tags/labels\;Units of Bytes\;Reserved when ctipl = 0" access="RW" offset="0x8.0" size="0x0.7" />
+	<field name="parsing_en" descr="Parsing enable\;Bit0: enable parsing of NVE of types VXLAN, VXLAN-GPE, \;GENEVE and NVGRE, default enabled\;Note: for proper parsing the parsing_depth must also be \;configured\;Reserved when SwitchX/-2 also reserved when Spectrum-2 \;since Spectrum-2 supports concurrent QinQ and NVE" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="ctipl_l2_length" descr="L2 header length to be added to IP length for Cut Through \;IP Length Based mode\;This length should include DMAC, SMAC, L2 tags (VLANs \;etc.), MPLS labels. e.g. configure 52 for DMAC+SMAC + 10 \;tags/labels\;Units of Bytes\;Reserved when ctipl = 0" access="RW" offset="0x8.0" size="0x0.7" />
 	<field name="ctipl" descr="Cut Through IP Length Based\;0: Cut through from low to high rate is based on MTU and \;port rates (default)\;1: Cut through from low to high rate is based on IP Length \;and port rates for IP packets, else, based on MTU" access="RW" offset="0x8.8" size="0x0.1" />
 	<field name="vxlan_udp_dport" descr="VXLAN UDP destination port\;Used for identifying VXLAN packets and for dport field in \;encapsulation\;Default 4789" access="RW" offset="0x10.0" size="0x0.16" />
 </node>
@@ -3188,12 +3364,12 @@
 <node name="mpsc_ext" descr="" size="0x14.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number (Rx ports)\;Not supported from CPU port\;Not supported from router port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="cong" descr="Congestion\;Sample only when egress congestion\;The congestion configuration is done by SBCTC, see\;Section 9.11.1, &quot;SBCTC - Shared Buffer Congestion \;Threshold Configuration Register&quot;, on page 2051\;For Switch-IB/2 the congestion is port congestion. Thus need \;to configure port congestion in SBGCR.tele_entitiy, see \;Section 9.8.1, &quot;SBGCR - Shared Buffer Global Configura\;tion Register&quot;, on page 2017\;For Switch-IB/2 this is a global configuration, affecting all \;local_ports\;Reserved when Spectrum/-2/-3" access="RW" offset="0x4.29" size="0x0.1" />
+	<field name="cong" descr="Congestion\;Sample only when egress congestion\;The congestion configuration is done by SBCTC, see\;Section 9.11.1, &quot;SBCTC - Shared Buffer Congestion \;Threshold Configuration Register&quot;, on page 1844\;For Switch-IB/2 the congestion is port congestion. Thus \;need to configure port congestion in SBGCR.tele_entitiy, see \;Section 9.8.1, &quot;SBGCR - Shared Buffer Global Configu\;ration Register&quot;, on page 1810\;For Switch-IB/2 this is a global configuration, affecting all \;local_ports\;Reserved when Spectrum/-2/-3" access="RW" offset="0x4.29" size="0x0.1" />
 	<field name="e" descr="Enable\;0: Disable sampling on port local_port (disabled)\;1: Enable sampling on port local_port" access="RW" offset="0x4.30" size="0x0.1" />
 	<field name="c" descr="Clear counter\;Clears the count_sample_drop" access="OP" offset="0x4.31" size="0x0.1" />
 	<field name="rate" descr="Sampling rate = 1 out of rate packets (with randomization \;around the point)\;Valid values are: 1 to 3.5*10^9\;" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="count_sample_drops_high" descr="A count of frames that were discarded after sampling. Discard \;is due to CPU policers or lack of resources towards the CPU.\;" access="RO" offset="0xC.0" size="0x4.0" />
-	<field name="count_sample_drops_low" descr="A count of frames that were discarded after sampling. Discard \;is due to CPU policers or lack of resources towards the CPU.\;" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="count_sample_drops_high" descr="A count of frames that were discarded after sampling. Dis\;card is due to CPU policers or lack of resources towards the \;CPU.\;" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="count_sample_drops_low" descr="A count of frames that were discarded after sampling. Dis\;card is due to CPU policers or lack of resources towards the \;CPU.\;" access="RO" offset="0x10.0" size="0x4.0" />
 </node>
 
 <node name="mqdik_reg_ext" descr="" size="0x208.0" >
@@ -3219,12 +3395,12 @@
 </node>
 
 <node name="mrrr_ext" descr="" size="0x8.0" >
-	<field name="init_rr" descr="Initiate resource release:\;0: Resource release type 0 \;1: Resource release type 1\;If rr_status is &quot;1&quot; then this operation fails" access="WO" offset="0x0.0" size="0x0.4" />
+	<field name="init_rr" descr="Initiate resource release:\;0: Resource release type 0 \;1: Resource release type 1 \;If rr_status is &quot;1&quot; then this operation fails" access="WO" offset="0x0.0" size="0x0.4" />
 	<field name="rr_status" descr="Resource release status:\;0: No resource release process is ongoing\;1: Resource release process is ongoing" access="RO" offset="0x4.0" size="0x0.4" />
 </node>
 
 <node name="mrsr_ext" descr="" size="0x8.0" >
-	<field name="command" descr="Reset/shutdown command\;0: do nothing\;1: software reset (switch soft reset)\;3: enclosure reset (requires system support)\;4: shutdown (requires system support)\;5: fast reset \;6: pci_sync_reset - reset will be done at PCI_DISABLE, time\;out of 1Sec (NIC name: pci_sync_for_fw_update_start), TBD \;if Scratchpad is reset or not" access="WO" offset="0x0.0" size="0x0.4" />
+	<field name="command" descr="Reset/shutdown command\;0: clear state of reset_at_pci_disable\;1: software reset (switch soft reset)\;\;6: reset_at_pci_disable - reset will be done at PCI_DISABLE" access="WO" offset="0x0.0" size="0x0.4" />
 </node>
 
 <node name="mrtc_reg_ext" descr="" size="0x10.0" >
@@ -3233,11 +3409,6 @@
 	<field name="time_l" descr="LSB of timestemp depnding on time_synced" access="RW" offset="0xC.0" size="0x4.0" />
 </node>
 
-<node name="msci_ext" descr="" size="0xc.0" >
-	<field name="index" descr="CPLD index" access="INDEX" offset="0x0.0" size="0x0.4" />
-	<field name="version" descr="CPLD version" access="RO" offset="0x4.0" size="0x4.0" />
-</node>
-
 <node name="msgi_ext" descr="" size="0x80.0" >
 	<field name="serial_number" descr="System serial number (ASCII string)" access="RO" high_bound="5" low_bound="0" offset="0x0.0" size="0x18.0" />
 	<field name="part_number" descr="System part number (ASCII string)" access="RO" high_bound="4" low_bound="0" offset="0x20.0" size="0x14.0" />
@@ -3245,30 +3416,28 @@
 	<field name="product_name" descr="Product Name (ASCII string)" access="RO" high_bound="15" low_bound="0" offset="0x40.0" size="0x40.0" />
 </node>
 
+<node name="mspmer_ext" descr="" size="0x8.0" >
+	<field name="clr" descr="Clear all counters" access="RO" offset="0x0.0" size="0x0.1" />
+	<field name="fmon_ctr" descr="Frequency Monitor Counter\;\;\;Stuck at 0xF, cleared only at hard reset (RST_) or \;power down or clr bit." access="RO" offset="0x4.0" size="0x0.4" />
+	<field name="vmon_ctr" descr="Voltage Monitor Counter\;\;\;Stuck at 0xF, cleared only at hard reset (RST_) or \;power down or clr bit." access="RO" offset="0x4.4" size="0x0.4" />
+	<field name="scpm_ctr" descr="Security Canary Path Monitor Counter\;A circuit macro used to flag timing slack violations as \;part of mitigations for physical security attacks.\;\;Stuck at 0xF, cleared only at hard reset (RST_) or \;power down or clr bit." access="RO" offset="0x4.8" size="0x0.4" />
+</node>
+
 <node name="msps_ext" descr="" size="0xa0.0" >
 	<field name="psu0" descr="System Power Supply 0 Status" access="RO" high_bound="19" low_bound="0" offset="0x0.0" size="0x50.0" />
 	<field name="psu1" descr="System Power Supply 1 Status" access="RO" high_bound="19" low_bound="0" offset="0x50.0" size="0x50.0" />
 </node>
 
-<node name="mssir_reg_ext" descr="" size="0x80.0" >
-	<field name="crc" descr="Each bit represent whether a CRC error occured on \;the management interface to the tile number." access="RO" offset="0x0.0" size="0x0.8" />
-	<field name="bypass" descr="Each bit represent whether a bypass clock is run on \;the corresponding tile." access="RO" offset="0x4.0" size="0x0.8" />
-	<field name="fatal_dft" descr="" access="RO" offset="0x8.0" size="0x0.8" />
-	<field name="freq0" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.0" size="0x0.5" />
-	<field name="freq1" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.5" size="0x0.5" />
-	<field name="freq2" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.10" size="0x0.5" />
-	<field name="freq3" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.15" size="0x0.5" />
-	<field name="freq4" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.20" size="0x0.5" />
-	<field name="freq5" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0xC.25" size="0x0.5" />
-	<field name="freq6" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0x10.0" size="0x0.5" />
-	<field name="freq7" descr="Each field represent the frequency dividing factor for \;the core clock for each of the tiles" access="RO" offset="0x10.5" size="0x0.5" />
+<node name="mssir_reg_ext" descr="" size="0x88.0" >
+	<field name="sys_indx" descr="System Identifier\;0: Firebird\;" access="INDEX" enum="Firebird=0x0" offset="0x0.0" size="0x0.4" />
+	<field name="sys_info" descr="Firebird System Information, see Table 488, &quot;Hardware \;Info Layout,&quot; on page 713" access="RW" high_bound="31" low_bound="0" offset="0x8.0" size="0x80.0" />
 </node>
 
 <node name="mtbr_reg_ext" descr="" size="0x18.0" >
 	<field name="base_sensor_index" descr="Base sensor index\;Sensors are read starting from base_sensor_index\;Sensor 0 is the ASIC sensor, sensors 1-63 are ambient sen\;sors and sensors 64-127 are mapped to the SFP+/QSFP \;modules sequentially (module 0 is mapped to sensor 64, \;module 1 to sensor 65 and so on). Gearbox sensors starts \;from 256 index." access="INDEX" offset="0x0.0" size="0x0.12" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="num_rec" descr="Number of records to read\;Range 1..255" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="temperature_record" descr="Temperature record\;See Table 337, &quot;MTBR - Temperature Record Layout,&quot; \;on page 857" subnode="mtbr_temp_record_ext" access="RO" high_bound="1" low_bound="0" offset="0x10.0" size="0x8.0" />
+	<field name="temperature_record" descr="Temperature record\;See Table 444, &quot;MTBR - Temperature Record Layout,&quot; \;on page 679" subnode="mtbr_temp_record_ext" access="RO" high_bound="1" low_bound="0" offset="0x10.0" size="0x8.0" />
 </node>
 
 <node name="mtbr_temp_record_ext" descr="" size="0x4.0" >
@@ -3277,9 +3446,10 @@
 </node>
 
 <node name="mtcap_ext" descr="" size="0x10.0" >
-	<field name="sensor_count" descr="Number of sensors supported by the device\;This includes the ASIC and the ambient sensors. QSFP module \;sensors are not included." access="RO" offset="0x0.0" size="0x0.7" />
+	<field name="sensor_count" descr="Number of ASIC+platform sensors supported by the device \;This includes the ASIC and the ambient sensors. QSFP module \;sensors are not included." access="RO" offset="0x0.0" size="0x0.7" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
-	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Only ASIC \;and ambient sensors are supported. Each bit represents a sen\;sor.\;0: Not_connected_or_not_supported\;1: Supports_temperature_measurements" subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
+	<field name="internal_sensor_count" descr="Number of sensors supported by the device that are on the \;ASIC." access="RO" offset="0x4.0" size="0x0.7" />
+	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Only ASIC \;and ambient sensors are supported. Each bit represents a sen\;sor.\;Per bit:\;0: Not_connected_or_not_supported\;1: Supports_temperature_measurements" subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
 </node>
 
 <node name="mtcq_reg_ext" descr="" size="0x70.0" >
@@ -3298,10 +3468,11 @@
 </node>
 
 <node name="mtecr_ext" descr="" size="0x60.0" >
-	<field name="sensor_count" descr="Number of sensors supported by the device\;This includes the ASIC, ambient sensors, Gearboxes etc. QSFP \;module sensors are not included." access="RO" offset="0x0.0" size="0x0.12" />
+	<field name="sensor_count" descr="Number of sensors supported by the ASIC+platform\;This includes the ASIC, ambient sensors, Gearboxes etc. QSFP \;module sensors are not included." access="RO" offset="0x0.0" size="0x0.12" />
 	<field name="last_sensor" descr="Last sensor index that is available in the system to read from.\;" access="RO" offset="0x0.16" size="0x0.12" />
+	<field name="internal_sensor_count" descr="Number of sensors supported by the device that are on the \;ASIC." access="RO" offset="0x4.0" size="0x0.7" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x4.28" size="0x0.4" />
-	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Each bit \;represents a sensor.\;This field is size variable based on the last_sensor field and in \;granularity of 32bits.\;0: Not connected or not supported\;1: Supports temperature measurements\;\;In case of last_sensor = 704 (22*32):\;sensor_warning[0] bit31 is sensor_warning[703]\;sensor_warning[0] bit0 is sensor_warning[703-31]\;sensor_warning[21] bit31 is sensor_warning[31]\;sensor_warning[21] bit0 is sensor_warning[0]\;\;In case if last_sensor = 259 (22*32):\;Note: roundup(259,32)=288\;sensor_warning[0] bit31 is sensor_warning[287]\;sensor_warning[0] bit0 is sensor_warning[287-31=256]\;sensor_warning[8] bit31 is sensor_warning[31]\;sensor_warning[8] bit0 is sensor_warning[0]\;sensor_warning[9..21] are not used" access="RO" high_bound="21" low_bound="0" offset="0x8.0" size="0x58.0" />
+	<field name="sensor_map" descr="Mapping of system sensors supported by the device. Each bit \;represents a sensor.\;This field is size variable based on the last_sensor field and in \;granularity of 32bits.\;Per bit:\;0: Not connected or not supported\;1: Supports temperature measurements\;\;In case of last_sensor = 704 (22*32):\;sensor_warning[0] bit31 is sensor_warning[703]\;sensor_warning[0] bit0 is sensor_warning[703-31]\;sensor_warning[21] bit31 is sensor_warning[31]\;sensor_warning[21] bit0 is sensor_warning[0]\;\;In case if last_sensor = 259 (22*32):\;Note: roundup(259,32)=288\;sensor_warning[0] bit31 is sensor_warning[287]\;sensor_warning[0] bit0 is sensor_warning[287-31=256]\;sensor_warning[8] bit31 is sensor_warning[31]\;sensor_warning[8] bit0 is sensor_warning[0]\;sensor_warning[9..21] are not used" access="RO" high_bound="21" low_bound="0" offset="0x8.0" size="0x58.0" />
 </node>
 
 <node name="mtewe_ext" descr="" size="0x5c.0" >
@@ -3356,20 +3527,20 @@
 	<field name="cap_pin_5_mode" descr="Capability of PPS pin #5\;Bit0: support_pps_in\;Bit1: support_pps_out\;Bit2: support_virtual_pin" access="RO" enum="support_pps_in=0x1,support_pps_out=0x2,support_virtual_pin=0x4" offset="0xC.8" size="0x0.4" />
 	<field name="cap_pin_6_mode" descr="Capability of PPS pin #6\;Bit0: support_pps_in\;Bit1: support_pps_out\;Bit2: support_virtual_pin" access="RO" enum="support_pps_in=0x1,support_pps_out=0x2,support_virtual_pin=0x4" offset="0xC.16" size="0x0.4" />
 	<field name="cap_pin_7_mode" descr="Capability of PPS pin #7\;Bit0: support_pps_in\;Bit1: support_pps_out\;Bit2: support_virtual_pin" access="RO" enum="support_pps_in=0x1,support_pps_out=0x2,support_virtual_pin=0x4" offset="0xC.24" size="0x0.4" />
-	<field name="field_select" descr="Field select indicates which fields to modify in write operation to \;this register. This field selector supported only when \;MCAM.mtpps_fs==1. if MCAM.mtpps_fs==0 then SW should \;ensure that all the WO/RW fields are valid. \;Bit 0: enable\;Bit 1: utc_mode\;Bit 2: pattern\;Bit 3: pin_mode\;Bit 4: time_stamp\;Bit 5: out_pulse_duration\;Bit 6: out_periodic_adjustment\;Bit 7: enhanced_out_periodic_adjustment\;Bit 8: npps\;" access="WO" enum="enable=0x1,utc_mode=0x2,pattern=0x4,pin_mode=0x8,time_stamp=0x10,out_pulse_duration=0x20,out_periodic_adjustment=0x40,enhanced_out_periodic_adjustment=0x80,npps=0x100" offset="0x10.0" size="0x4.0" />
+	<field name="field_select" descr="Field select indicates which fields to modify in write \;operation to this register. This field selector supported only \;when MCAM.mtpps_fs==1. if MCAM.mtpps_fs==0 then SW \;should ensure that all the WO/RW fields are valid. \;Bit 0: enable\;Bit 1: utc_mode\;Bit 2: pattern\;Bit 3: pin_mode\;Bit 4: time_stamp\;Bit 5: out_pulse_duration\;Bit 6: out_periodic_adjustment\;Bit 7: enhanced_out_periodic_adjustment\;Bit 8: npps\;" access="WO" enum="enable=0x1,utc_mode=0x2,pattern=0x4,pin_mode=0x8,time_stamp=0x10,out_pulse_duration=0x20,out_periodic_adjustment=0x40,enhanced_out_periodic_adjustment=0x80,npps=0x100" offset="0x10.0" size="0x4.0" />
 	<field name="pin" descr="Pin to be configured or queried out of the supported pins." access="INDEX" offset="0x20.0" size="0x0.8" />
-	<field name="pin_mode" descr="Pin mode to be used. The mode must comply with the supported \;modes of the requested pin.\;0x0: pps_in\;0x1: pps_out\;0x2: virtual_pin\;0x3: pps_out_and_virtual_pin\;\;Operation will fail if pin does not support the required mode." access="RW" enum="pps_in=0x0,pps_out=0x1,virtual_pin=0x2,pps_out_and_virtual_pin=0x3" offset="0x20.8" size="0x0.4" />
-	<field name="pattern" descr="When pin_mode = pps_in:\;0x0: Rising edge \;0x1: Falling edge \;\;When pin_mode = pps_out:\;0x0: Pulse - (one shot) The device will generate a pulse at \;time_stamp time with a duration of out_pulse_duration. \;0x1: Periodic - the device will generate periodical pulses with \;pulse duration  of  out_pulse_duration every 1 second according \;to internal clock. The 1st pulse will be generated at time_stamp \;time.\;Reserved when pin_mode = 0x2 virtual_pin\;\;" access="RW" offset="0x20.16" size="0x0.4" />
+	<field name="pin_mode" descr="Pin mode to be used. The mode must comply with the \;supported modes of the requested pin.\;0x0: pps_in\;0x1: pps_out\;0x2: virtual_pin\;0x3: pps_out_and_virtual_pin\;\;Operation will fail if pin does not support the required mode." access="RW" enum="pps_in=0x0,pps_out=0x1,virtual_pin=0x2,pps_out_and_virtual_pin=0x3" offset="0x20.8" size="0x0.4" />
+	<field name="pattern" descr="When pin_mode = pps_in:\;0x0: Rising edge \;0x1: Falling edge \;\;When pin_mode = pps_out:\;0x0: Pulse - (one shot) The device will generate a pulse at \;time_stamp time with a duration of out_pulse_duration. \;0x1: Periodic - the device will generate periodical pulses \;with pulse duration  of  out_pulse_duration every 1 second \;according to internal clock. The 1st pulse will be generated \;at time_stamp time.\;Reserved when pin_mode = 0x2 virtual_pin\;\;" access="RW" offset="0x20.16" size="0x0.4" />
 	<field name="utc_mode" descr="UTC time:\;0x0: FREE_RUNNING - time_stamp is by free running clock\;0x1: UTC - time_stamp is UTC" access="RW" enum="FREE_RUNNING=0x0,UTC=0x1" offset="0x20.30" size="0x0.1" />
 	<field name="enable" descr="Enables the PPS functionality the specific pin.\;0x0: Disable \;0x1: Enable" access="RW" enum="Disable=0x0,Enable=0x1" offset="0x20.31" size="0x0.1" />
-	<field name="time_stamp" descr="When pin_mode = pps_in, the latched device time when it was \;triggered from the external GPIO pin. \;When pin_mode = pps_out or virtual_pin or \;pps_out_and_virtual_pin, the target time to generate \;next output signal. \;When utc_mode = FREE_RUNNING - Time is in units \;of device clock. \;\;\;For Spectrum-1 the device clock frequency is 6.4nSec" subnode="uint64" access="RW" offset="0x28.0" size="0x8.0" />
+	<field name="time_stamp" descr="When pin_mode = pps_in, the latched device time when it \;was triggered from the external GPIO pin. \;When pin_mode = pps_out or virtual_pin or \;pps_out_and_virtual_pin, the target time to \;generate next output signal. \;When utc_mode = FREE_RUNNING - Time is in \;units of device clock. \;\;\;For Spectrum-1 the device clock frequency is \;6.4nSec" subnode="uint64" access="RW" offset="0x28.0" size="0x8.0" />
 	<field name="out_periodic_adjustment" descr="Frequency adjustment: Every PPS the HW frequency will be \;adjusted by this value. Units of HW clock, where HW counts \;10^9 HW clocks for 1 HW second.\;Range is from -32768 to +32767\;The hardware does consecutive frequency adjustment \;Reserved when pin_mode != ptp_out\;Reserved when switches\;" access="RW" offset="0x30.0" size="0x0.16" />
 	<field name="out_pulse_duration" descr="Output pulse duration in units of mSec. \;Range is 1 to 1000. \;Reserved when pin_mode != ptp_out\;In case the set value is 0, device default will be used." access="RW" offset="0x30.16" size="0x0.16" />
-	<field name="enhanced_out_periodic_adjustment" descr="Same as out_periodic_adjustment field, but supports a wider \;range.\;supported only when \;MCAM.mtpps_enhanced_out_periodic_adjustment==1.\;mutual exclusive with out_periodic_adjustment, i.e. when \;enhanced_out_periodic_adjustment!=0, out_periodic_adjustment \;is invalid.\;Reserved when switches" access="RW" offset="0x34.0" size="0x4.0" />
+	<field name="enhanced_out_periodic_adjustment" descr="Same as out_periodic_adjustment field, but supports a \;wider range.\;supported only when \;MCAM.mtpps_enhanced_out_periodic_adjustment==1.\;mutual exclusive with out_periodic_adjustment, i.e. when \;enhanced_out_periodic_adjustment!=0, \;out_periodic_adjustment is invalid.\;Reserved when switches" access="RW" offset="0x34.0" size="0x4.0" />
 </node>
 
 <node name="mtppst_ext" descr="" size="0x10.0" >
-	<field name="pin" descr="Pin to be configured or queried out of the supported pins." access="RO" offset="0x0.0" size="0x0.8" />
+	<field name="pin" descr="Pin to be configured or queried out of the supported pins." access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="timestamp_msb" descr="Device time when it was triggered from the external GPIO \;pin.\;Time in units of device clock (free running counter or UTC)" access="RO" offset="0x8.0" size="0x4.0" />
 	<field name="timestamp_lsb" descr="Device time when it was triggered from the external GPIO \;pin.\;Time in units of device clock (free running counter or UTC)" access="RO" offset="0xC.0" size="0x4.0" />
 </node>
@@ -3382,11 +3553,11 @@
 	<field name="read_one" descr="Read up to one record\;May response with num_rec = 0 or 1\;" access="OP" offset="0x4.30" size="0x0.1" />
 	<field name="clr" descr="Clear the records" access="OP" offset="0x4.31" size="0x0.1" />
 	<field name="num_rec" descr="Number of valid records in the response\;When read_one = 1 then this equals to 1 and only 1 record \;responded, even if the HW FIFO has more than 1 record\;Range 0.. cap_ptp_timestamp_fifo" access="RO" offset="0x8.0" size="0x0.4" />
-	<field name="record" descr="Records, see Table 723, &quot;MTPPTR - Record Layout,&quot; on \;page 1189" subnode="array128_auto" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x40.0" />
+	<field name="record" descr="Records, see Table 802, &quot;MTPPTR - Record Layout,&quot; \;on page 964" subnode="array128_auto" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x40.0" />
 </node>
 
 <node name="mtpspu_ext" descr="" size="0x8.0" >
-	<field name="message_type" descr="Set UTC on packets from CPU for PTP packets with the con\;figured message_types.\;This is a necessary but non-sufficient condition since need \;to enable also per port. See Section 4.15.4, &quot;MTPCPC - \;Monitoring Time Precision Correction Port Configura\;tion&quot;, on page 1191\;Message types are defined by IEEE 1588\;Each bit corresponds to a value (e.g. Bit0: Sync, Bit1: \;Delay_Req)" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="message_type" descr="Set UTC on packets from CPU for PTP packets with the \;configured message_types.\;This is a necessary but insufficient condition since need to \;enable also per port. See Section 4.15.4, &quot;MTPCPC - \;Monitoring Time Precision Correction Port Configu\;ration&quot;, on page 967\;Message types are defined by IEEE 1588\;Each bit corresponds to a value (e.g. Bit0: Sync, Bit1: \;Delay_Req)\;\;Valid bits are 0-3 only.\;Bits 4-15 are reserved as TS shall not be applied to gen\;eral messages." access="RW" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="mtptp_ext" descr="" size="0x40.0" >
@@ -3404,7 +3575,7 @@
 
 <node name="mtptpt_ext" descr="" size="0x8.0" >
 	<field name="trap_id" descr="Trap id:\;0: PTP0\;1: PTP1 - Reserved when Quantum\;2: PTP2ME - Reserved when Spectrum/-2" access="INDEX" offset="0x0.0" size="0x0.4" />
-	<field name="message_type" descr="Bitwise vector of PTP message types to trap. This is a nec\;essary but non-sufficient condition since need to enable \;also per port. See Section 4.15.1, &quot;MTPPPC - Monitoring \;Time Precision Packet Port Configuration&quot;, on \;page 1187\;Message types are defined by IEEE 1588\;Each bit corresponds to a value (e.g. Bit0: Sync, Bit1: \;Delay_Req)" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="message_type" descr="Bitwise vector of PTP message types to trap. This is a nec\;essary but non-sufficient condition since need to enable \;also per port. See Section 4.15.1, &quot;MTPPPC - Monitor\;ing Time Precision Packet Port Configuration&quot;, on \;page 962\;Message types are defined by IEEE 1588\;Each bit corresponds to a value (e.g. Bit0: Sync, Bit1: \;Delay_Req)" access="RW" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="mtrc_cap_reg_ext" descr="" size="0x84.0" >
@@ -3453,11 +3624,11 @@
 
 <node name="multicast_tunnel_ext" descr="" size="0x10.0" >
 	<field name="fid" descr="Filtering identifier (FID)\;Reserved when v_fid = 0\;Reserved when ubridge=1\;Reserved when Spectrum-2\;" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="underlay_mc_ptr_msb" descr="Most significant bits of Underlay Multicast Pointer. Used as a \;pointer to the first entry of the group based link lists of MC \;entries (for NVE tunnels). For Spectrum the number of link \;lists in the group is configured by TNGCR.nve_group_size_mc.\;The pointer points to entries which are configured by TNUMT \;or by TNGEE\;For Spectrum/-2, this points to an entry in the KVD Linear, see \;Appendix A.4.1, &quot;KVD Central Database&quot; (page 3381)" access="RW" offset="0x0.16" size="0x0.16" />
-	<field name="mid" descr="Multicast identifier - global identifier that represents the mul\;ticast group across all devices" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="underlay_mc_ptr_msb" descr="Most significant bits of Underlay Multicast Pointer. Used as \;a pointer to the first entry of the group based link lists of MC \;entries (for NVE tunnels). For Spectrum the number of link \;lists in the group is configured by TNGCR.nve_group_\;size_mc.\;The pointer points to entries which are configured by \;TNUMT or by TNGEE\;For Spectrum/-2, this points to an entry in the KVD Linear, \;see Appendix A.4.1, &quot;KVD Central Database&quot; (page 3103)" access="RW" offset="0x0.16" size="0x0.16" />
+	<field name="mid" descr="Multicast identifier - global identifier that represents the \;multicast group across all devices" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="v_fid" descr="valid FID:\;0: .1Q bridge\;1: .1D bridge\;Reserved when ubridge=1\;Reserved when Spectrum-2\;" access="RW" offset="0x4.23" size="0x0.1" />
 	<field name="underlay_mc_ptr_lsb" descr="Least significant bits of pointer to link list of flooding entries \;(for NVE tunnels)\;The pointer may point to TNGEE" access="RW" offset="0x4.24" size="0x0.8" />
-	<field name="lbf_tunnel_port_bitmap" descr="Loopback Filter on Tunnel port when generic L2 encapsula\;tion, bitmap:\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1\;bits4..15: reserved\;At least one bit must be set. If all bits are cleared then NVE is \;treated as set \;This is used only for loopback filter check\;" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="lbf_tunnel_port_bitmap" descr="Loopback Filter on Tunnel port when generic L2 encapsula\;tion, bitmap:\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1\;bits4..15: reserved\;At least one bit must be set. If all bits are cleared then NVE \;is treated as set \;This is used only for loopback filter check\;" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="ecmp_size" descr="ecmp_size:\;ecmp_size is the amount of sequential entries starting from \;the\;pointer to the first TNUMT/TNGEE (the number of ECMPs).\;0: controlled by TNGCR.nve_group_size_mc\;Values: 1-128, 256, 512, 1024, 2048 and 4096\;" access="RW" offset="0xC.0" size="0x0.13" />
 </node>
 
@@ -3467,7 +3638,7 @@
 </node>
 
 <node name="mvcr_ext" descr="" size="0x18.0" >
-	<field name="sensor_index" descr="Sensors index to access\;Mapping of system sensors to index is system specific, and \;detail can be found in the system specification. 64-127 of \;sensor_index are mapped to the SFP+/QSFP modules \;sequentially (module 0 is mapped to sensor_index 64, mod\;ule 1 to sensor_index 65 and so on)." access="INDEX" offset="0x0.0" size="0x0.7" />
+	<field name="sensor_index" descr="Sensors:\;- 0..max_system_sensors-1 are ambient sensors on the \;system (max_system_sensors from INI)\;- 64..127 are mapped to modules by 1:1 e.g. module 1 is \;index 65" access="INDEX" offset="0x0.0" size="0x0.7" />
 	<field name="slot_index" descr="Slot index\;0: Main board" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="voltage_sensor_value" descr="Voltage reading from the sensor. \;Voltage units are 0.01V." access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="current_sensor_value" descr="Current reading from the sensor." access="RO" offset="0x8.0" size="0x0.16" />
@@ -3480,23 +3651,23 @@
 	<field name="exp_rw" descr="EXP Re-write\;0: Preserve the value of the rewrite_enable\;1: Set the rewrite_enable\;2: Clear the rewrite_enable\;Reserved when Spectrum" access="RW" offset="0x0.20" size="0x0.2" />
 	<field name="label_id" descr="Label id to push to the label stack\;Reserved when label_action is &apos;0&apos;" access="RW" offset="0x4.0" size="0x0.20" />
 	<field name="label_action" descr="Label action:\;0: no push\;2: push label. Push a new label with label id label_id \;\;" access="RW" offset="0x4.24" size="0x0.3" />
-	<field name="next_nhlfe" descr="NHLFE entry pointer\;Points to the NHLFE table. When using ECMP, points to the\;first entry in the ECMP list." access="RW" offset="0x10.0" size="0x0.24" />
-	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries from the nex\;t_nhlfe pointer (the number of ECMPs). \;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2: 1-128, 256, 512, 1024, 2048 and 4096." access="RW" offset="0x14.0" size="0x0.13" />
+	<field name="next_nhlfe" descr="NHLFE entry pointer\;Points to the NHLFE table. When using ECMP, points to \;the\;first entry in the ECMP list." access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries from the \;next_nhlfe pointer (the number of ECMPs). \;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2: 1-128, 256, 512, 1024, 2048 and 4096." access="RW" offset="0x14.0" size="0x0.13" />
 </node>
 
 <node name="pacl_ext" descr="" size="0x70.0" >
-	<field name="acl_type" descr="Type of ACL.\;See Table 1454, &quot;ACL Types,&quot; on page 2114 for the sup\;ported ACL types.\;Reserved when Spectrum\;Supported by Spectrum-2" access="RW" offset="0x0.0" size="0x0.8" />
-	<field name="v" descr="Valid. Setting the v bit makes the ACL valid. It should not be \;cleared while the ACL is bounded to either a port, VLAN or ACL \;rule." access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="acl_type" descr="Type of ACL.\;See Table 1593, &quot;ACL Types,&quot; on page 1863 for the sup\;ported ACL types.\;Reserved when Spectrum\;Supported by Spectrum-2" access="RW" offset="0x0.0" size="0x0.8" />
+	<field name="v" descr="Valid. Setting the v bit makes the ACL valid. It should not be \;cleared while the ACL is bounded to either a port, VLAN or \;ACL rule." access="RW" offset="0x0.24" size="0x0.1" />
 	<field name="e" descr="Type of ACL group. Only valid on Create ACL Group operation \;and Read.\;0: iACL\;1: eACL\;" access="INDEX" enum="iACL=0x0,eACL=0x1" offset="0x0.31" size="0x0.1" />
 	<field name="acl_id" descr="An identifier representing the ACL (managed by software)\;Range 0 .. cap_max_acl_regions - 1\;" access="INDEX" offset="0x8.0" size="0x0.16" />
-	<field name="tcam_region_info" descr="Information that represents the TCAM region to be used for the \;ACL. The region information is obtained by PTAR. \;The number of valid regions is derived from the ACL type. The \;first region will be used for the first packet type in the ACL type \;list and so forth.\;For Spectrum entry [0] is used and entries [1..3] are reserved.\;For tcam_region_info [1..3] the value &apos;0&apos; indicates NULL region \;and can be used to indicate no rules for a specific packet type.\;Note: tcam_region_info[n] is mapped from (acl_id+n).\;See tables: \;Table 1954, &quot;tcam_region_info[0] Layout,&quot; on page 2478\;Table 1956, &quot;tcam_region_info[1] Layout,&quot; on page 2478\;Table 1958, &quot;tcam_region_info[2] Layout,&quot; on page 2479\;Table 1960, &quot;tcam_region_info[3] Layout,&quot; on page 2479\;\;" subnode="array128_auto" access="RW" high_bound="3" low_bound="0" offset="0x30.0" size="0x40.0" />
+	<field name="tcam_region_info" descr="Information that represents the TCAM region to be used for \;the ACL. The region information is obtained by PTAR. \;The number of valid regions is derived from the ACL type. The \;first region will be used for the first packet type in the ACL \;type list and so forth.\;For Spectrum entry [0] is used and entries [1..3] are reserved.\;For tcam_region_info [1..3] the value &apos;0&apos; indicates NULL \;region and can be used to indicate no rules for a specific \;packet type.\;Note: tcam_region_info[n] is mapped from (acl_id+n).\;See tables: \;Table 2111, &quot;tcam_region_info[0] Layout,&quot; on page 2253\;Table 2113, &quot;tcam_region_info[1] Layout,&quot; on page 2254\;Table 2115, &quot;tcam_region_info[2] Layout,&quot; on page 2254\;Table 2117, &quot;tcam_region_info[3] Layout,&quot; on page 2254\;\;" subnode="array128_auto" access="RW" high_bound="3" low_bound="0" offset="0x30.0" size="0x40.0" />
 </node>
 
 <node name="pagt_ext" descr="" size="0x70.0" >
 	<field name="size" descr="Number of ACLs in the group.\;0: invalidate the group\;1 or more: add ACLs to the group\;Range 0 .. cap_max_acl_group_size\;Total number of ACLs in all groups must be lower or equal to \;cap_max_acl_tot_groups\;Note: a group which is binded must not be invalidated" access="RW" offset="0x0.0" size="0x0.8" />
 	<field name="e" descr="0: iACL\;1: eACL\;Reserved in Spectrum/-2\;" access="INDEX" enum="iACL=0x0,eACL=0x1" offset="0x0.31" size="0x0.1" />
 	<field name="acl_group_id" descr="ACL group identifier\;Range of 0 .. cap_max_acl_groups-1" access="INDEX" offset="0x8.0" size="0x0.16" />
-	<field name="acl_id_record" descr="See Table 1964, &quot;ACL ID Record Layout,&quot; on page 2481" access="RW" high_bound="15" low_bound="0" offset="0x30.0" size="0x40.0" />
+	<field name="acl_id_record" descr="See Table 2121, &quot;ACL ID Record Layout,&quot; on page 2257" access="RW" high_bound="15" low_bound="0" offset="0x30.0" size="0x40.0" />
 </node>
 
 <node name="paos_reg_ext" descr="" size="0x10.0" >
@@ -3514,13 +3685,13 @@
 <node name="pbmc_reg_ext" descr="" size="0x6c.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="xoff_refresh" descr="The time before a new pause frame should be sent to \;refresh the pause state. Using the same units as xoff_tim\;er_value above." access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="xoff_timer_value" descr="When device generates a pause frame, it uses this value as \;the pause timer.\;The pause timer is measured in units of pause &quot;quanta&quot;, \;where each unit is equal to 512 bit times." access="RW" offset="0x4.16" size="0x0.16" />
+	<field name="xoff_refresh" descr="The time before a new pause frame should be sent to \;refresh the pause state. Using the same units as xoff_\;timer_value above." access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="xoff_timer_value" descr="When device generates a pause frame, it uses this value \;as the pause timer.\;The pause timer is measured in units of pause &quot;quanta&quot;, \;where each unit is equal to 512 bit times." access="RW" offset="0x4.16" size="0x0.16" />
 	<field name="port_buffer_size" descr="Total packet buffer array available for the port. The sum of \;buffer array allocated to bufferX must not exceed \;port_buffer_size.\;In Spectrum and above- Max supported Headroom buffer \;for port. \;" access="RO" offset="0x8.0" size="0x0.16" />
-	<field name="fullness_threshold" descr="Almost full threshold configuration.\;Percentage of buffer fullness which indicates &quot;almost full&quot; \;occurrence\;Range: 0-100%\;Reserved for Switches." access="RW" offset="0x8.16" size="0x0.7" />
+	<field name="fullness_threshold" descr="Almost full threshold configuration.\;Percentage of buffer fullness which indicates &quot;almost \;full&quot; occurrence\;Range: 0-100%\;Reserved for Switches." access="RW" offset="0x8.16" size="0x0.7" />
 	<field name="buffer" descr="Configuring per-buffer parameters. i=0..9\;" subnode="bufferx_reg_ext" access="RW" high_bound="9" low_bound="0" offset="0xC.0" size="0x50.0" />
-	<field name="shared_headroom_pool" descr="Configuring shared haeadroom pool parameters. Using the \;same layout as in BufferX, for details see Table 1360, \;&quot;bufferX Register Layout,&quot; on page 1962.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_support \;bit)." subnode="uint64" access="RW" offset="0x5C.0" size="0x8.0" />
-	<field name="port_shared_buffer" descr="Configuring port shared buffer parameters. Using the same \;layout as in BufferX, for details see Table 1360, &quot;bufferX \;Register Layout,&quot; on page 1962.\;Not supported in SwitchX and SwitchX-2\;Valid for HCA when pbmc_port_shared_buffer is set in \;PCAM." subnode="uint64" access="RW" offset="0x64.0" size="0x8.0" />
+	<field name="shared_headroom_pool" descr="Configuring shared haeadroom pool parameters. Using \;the same layout as in BufferX, for details see Table 1497, \;&quot;bufferX Register Layout,&quot; on page 1754.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_sup\;port bit)." subnode="uint64" access="RW" offset="0x5C.0" size="0x8.0" />
+	<field name="port_shared_buffer" descr="Configuring port shared buffer parameters. Using the \;same layout as in BufferX, for details see Table 1497, \;&quot;bufferX Register Layout,&quot; on page 1754.\;Not supported in SwitchX and SwitchX-2\;Valid for HCA when pbmc_port_shared_buffer is set in \;PCAM." subnode="uint64" access="RW" offset="0x64.0" size="0x8.0" />
 </node>
 
 <node name="pbsr_reg_ext" descr="" size="0x64.0" >
@@ -3531,7 +3702,7 @@
 	<field name="used_shared_headroom_buffer" descr="Number of currently used shared headroom buffer cells." access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="clear_wm" descr="Clear watermarks for all PGs" access="OP" offset="0x8.31" size="0x0.1" />
 	<field name="stat_buffer" descr="status per-buffer parameters. i=0..9\;" subnode="stat_bufferx_reg_ext" access="RO" high_bound="9" low_bound="0" offset="0xC.0" size="0x50.0" />
-	<field name="stat_shared_headroom_pool" descr="status of shared headroom pool parameters. Using the \;same layout as in stat_BufferX, for details see Table 1379, \;&quot;stat_bufferX Register Layout,&quot; on page 1973.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_support \;bit)." subnode="stat_bufferx_reg_ext" access="RO" offset="0x5C.0" size="0x8.0" />
+	<field name="stat_shared_headroom_pool" descr="status of shared headroom pool parameters. Using the \;same layout as in stat_BufferX, for details see \;Table 1516, &quot;stat_bufferX Register Layout,&quot; on \;page 1766.\;Not supported in SwitchX and SwitchX-2\;Not supported in HCA (See PCAM shp_pbmc_pbsr_sup\;port bit)." subnode="stat_bufferx_reg_ext" access="RO" offset="0x5C.0" size="0x8.0" />
 </node>
 
 <node name="pcie_lanes_counters_ext" descr="" size="0xf8.0" >
@@ -3595,22 +3766,22 @@
 <node name="pcmr_reg_ext" descr="" size="0xc.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="fcs_cap" descr="Specifies the check enable/disable capabilities of the local \;port. A bit set to 1 for affirmation of supported enable/disable \;capability: \;FCS check disable/enable capability" access="RO" offset="0x4.1" size="0x0.1" />
+	<field name="fcs_cap" descr="Specifies the check enable/disable capabilities of the local \;port. A bit set to 1 for affirmation of supported enable/dis\;able capability: \;FCS check disable/enable capability" access="RO" offset="0x4.1" size="0x0.1" />
 	<field name="rx_ts_over_crc_cap" descr="Specifies the ingress timestamps enable/disable capabilities \;of the local port. A bit set to 1 for affirmation of supported \;enable/disable capability:" access="RO" offset="0x4.13" size="0x0.1" />
 	<field name="rx_fcs_drop_cap" descr="Specifies the ingress drop enable/disable capabilities of the \;local port. A bit set to 1 for affirmation of supported enable/\;disable capability:" access="RO" offset="0x4.14" size="0x0.1" />
 	<field name="tx_fcs_recalc_cap" descr="Specifies the egress drop enable/disable capabilities of the \;local port. A bit set to 1 for affirmation of supported enable/\;disable capability:" access="RO" offset="0x4.15" size="0x0.1" />
-	<field name="tx_ts_over_crc_cap" descr="Specifies the egress timestamps enable/disable capabilities of \;the local port. A bit set to 1 for affirmation of supported \;enable/disable capability:" access="RO" offset="0x4.16" size="0x0.1" />
-	<field name="entropy_gre_calc_cap" descr="Specifies the egress GRE tunnel protocol entropy calculation \;enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capa\;bility:" access="RO" offset="0x4.29" size="0x0.1" />
-	<field name="entropy_calc_cap" descr="Specifies the egress tunnel protocol entropy calculation \;enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capa\;bility:" access="RO" offset="0x4.30" size="0x0.1" />
-	<field name="force_entropy_cap" descr="Specifies the egress tunnel protocol entropy calculation force \;capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable capa\;bility:" access="RO" offset="0x4.31" size="0x0.1" />
+	<field name="tx_ts_over_crc_cap" descr="Specifies the egress timestamps enable/disable capabilities \;of the local port. A bit set to 1 for affirmation of supported \;enable/disable capability:" access="RO" offset="0x4.16" size="0x0.1" />
+	<field name="entropy_gre_calc_cap" descr="Specifies the egress GRE tunnel protocol entropy calculation \;enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.29" size="0x0.1" />
+	<field name="entropy_calc_cap" descr="Specifies the egress tunnel protocol entropy calculation \;enable/disable capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.30" size="0x0.1" />
+	<field name="force_entropy_cap" descr="Specifies the egress tunnel protocol entropy calculation \;force capabilities of the local port. \;A bit set to 1 for affirmation of supported enable/disable \;capability:" access="RO" offset="0x4.31" size="0x0.1" />
 	<field name="fcs_chk" descr="FCS check\;Values:\;0: disable check. \;1: perform check\;Note: when disabling a check, it will also affects the relevant count\;ers." access="RW" offset="0x8.1" size="0x0.1" />
 	<field name="rx_ts_over_crc" descr="RX TimeStamp over FCS\;0: no TS over FCS\;1: TS over FCS\;Note: \;1. If this filed is changed while traffic is passing then some \;packets may be dropped due to incorrect FCS.\;2. Default value is (1) - TS over FCS" access="RW" offset="0x8.13" size="0x0.1" />
 	<field name="rx_fcs_drop" descr="RX FCS drop control:\;0: ingress port will drop a packet with bad FCS (Default)\;1: ingress port will not drop a packet with bad FCS\;NOTE: All FCS counters (PPCNT) are valid for both drop \;modes.\;NOTE: Reserved when PCMR.fcs_cap=1 &amp; PCMR.fcs_chk=0" access="RW" offset="0x8.14" size="0x0.1" />
 	<field name="tx_fcs_recalc" descr="TX FCS recalculation:\;0: egress port will recalculate and overwrite FCS value \;(Default) \;1: egress port will not overwrite FCS value \;NOTE: when this bit is set, any modification of the packet will \;result in a bad FCS." access="RW" offset="0x8.15" size="0x0.1" />
 	<field name="tx_ts_over_crc" descr="TX TimeStamp over FCS\;0: no TS over FCS\;1: TS over FCS\;Reserved when tx_fcs_recalc is set" access="RW" offset="0x8.16" size="0x0.1" />
-	<field name="entropy_gre_calc" descr="0: DISABLE - entropy calculation is disabled for GRE tunneling \;protocol.\;1: ENABLE - entropy calculation is enabled for GRE tunneling \;protocol, if entropy_calc is enabled as well. valid only if \;force_entropy is activated." access="RW" offset="0x8.29" size="0x0.1" />
-	<field name="entropy_calc" descr="0: DISABLE - entropy calculation is disabled for all supported \;tunneling protocols.\;1: ENABLE - entropy calculation is enabled for all supported \;tunneling protocols. GRE also depends on the entropy_gre_\;calc valid only if force_entropy is activated." access="RW" offset="0x8.30" size="0x0.1" />
-	<field name="force_entropy" descr="0: DEFAULT - use device defaults for tunnel entropy calcula\;tion. This mode should be used if entropy calculation require\;ment is unknown.\;1: FORCE - force the entropy calculation according to entro\;py_calc and entropy_gre_calc." access="RW" offset="0x8.31" size="0x0.1" />
+	<field name="entropy_gre_calc" descr="0: DISABLE - entropy calculation is disabled for GRE tunnel\;ing protocol.\;1: ENABLE - entropy calculation is enabled for GRE tunnel\;ing protocol, if entropy_calc is enabled as well. valid only if \;force_entropy is activated." access="RW" offset="0x8.29" size="0x0.1" />
+	<field name="entropy_calc" descr="0: DISABLE - entropy calculation is disabled for all sup\;ported tunneling protocols.\;1: ENABLE - entropy calculation is enabled for all supported \;tunneling protocols. GRE also depends on the entropy_gre_\;calc valid only if force_entropy is activated." access="RW" offset="0x8.30" size="0x0.1" />
+	<field name="force_entropy" descr="0: DEFAULT - use device defaults for tunnel entropy calcula\;tion. This mode should be used if entropy calculation \;requirement is unknown.\;1: FORCE - force the entropy calculation according to entro\;py_calc and entropy_gre_calc." access="RW" offset="0x8.31" size="0x0.1" />
 </node>
 
 <node name="pddr_advanced_opcode_ext" descr="" size="0x4.0" >
@@ -3672,7 +3843,7 @@
 	<field name="pwr_governor_err_sv" descr="" access="RO" offset="0x18.17" size="0x0.1" />
 	<field name="uc_crspace_timeout" descr="uC crspace timeout event. See uc_scrspace_timeout_cl and \;uc_scrspace_timeout_lane for location of last event" access="RO" offset="0x18.24" size="0x0.1" />
 	<field name="uc_stack_overflow" descr="uC stack overflow event. See uc_stack_overflow_cl and \;uc_stack_overflow_lane for location of last event" access="RO" offset="0x18.25" size="0x0.1" />
-	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to off\;set 00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the \;mask is set, the event will be cleared" access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to offset \;00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the mask \;is set, the event will be cleared" access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="main_irisc_address" descr="" access="RO" offset="0x40.0" size="0x4.0" />
 	<field name="main_irisc_ip" descr="" access="RO" offset="0x44.0" size="0x4.0" />
 	<field name="tile_irisc_address" descr="" access="RO" offset="0x48.0" size="0x4.0" />
@@ -3756,8 +3927,8 @@
 	<field name="fast_link_up_status" descr="Indicates if fast link-up was performed in the link: \;0: Unknown\;1: Fast Link-UP was performed. \;2: Regular link-up flow was performed due to changes in \;cable\;3: Regular link-up flow was performed due to changes in pro\;tocol (speed or FEC)\;4: Regular link-up flow was performed due to a non-fastboot\;able FW version (PCNR is not supported)\;5: Regular link-up performed due to MLPN flow\;6: Regular link-up performed due to PCNR.tuning_override \;configuration while port was in &quot;down&quot; state.\;7: Invalid fastboot data struct (0xCAFECAFE magic value is \;not present. For example, SW reset was executed before fin\;ish saving data during PCNR flow)\;8 - fast link-up timeout\;9 - fast link-up flaps issue\;10 - fast link-up failed during link-up" access="RO" offset="0x8.0" size="0x0.4" />
 	<field name="time_to_link_up_phy_up_to_active" descr="Time in msec to link up from phy up until active state.\;While the phy manager did not reach active state the timer \;will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode." access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="time_to_link_up_sd_to_phy_up" descr="Time in msec to link up from signal detect until phy up state.\;While the phy manager did not reach phy up state the timer \;will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode." access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="time_to_link_up_disable_to_sd" descr="Time in msec to link up from disable until signal detect state.\;While the phy manager did not reach signal detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return \;the same value." access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="time_to_link_up_disable_to_pd" descr="Time in msec to link up from disable until protocol detect \;state.\;While the phy manager did not reach protocol detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return \;the same value." access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="time_to_link_up_disable_to_sd" descr="Time in msec to link up from disable until signal detect state.\;While the phy manager did not reach signal detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return the \;same value." access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="time_to_link_up_disable_to_pd" descr="Time in msec to link up from disable until protocol detect \;state.\;While the phy manager did not reach protocol detect state the \;timer will return 0.\;The timer resets to 0 in one of the following cases:\;1. When moving to disable or rx disable state.\;2. When moving from active or phy up to polling state, while \;working at force mode.\;Internal: for HDR/EDR devices the timers: time_to_link_up_\;disable_to_sd, time_to_link_up_disable_to_pd will return the \;same value." access="RO" offset="0x18.0" size="0x4.0" />
 </node>
 
 <node name="pddr_mng_debug_page_ext" descr="" size="0xf8.0" >
@@ -3786,6 +3957,8 @@
 	<field name="dpsm_apply_state_lane5" descr="DPSM state that was applied in per lane\;\;" access="RO" offset="0xC.20" size="0x0.4" />
 	<field name="dpsm_apply_state_lane6" descr="DPSM state that was applied in per lane\;\;" access="RO" offset="0xC.24" size="0x0.4" />
 	<field name="dpsm_apply_state_lane7" descr="DPSM state that was applied in per lane\;\;" access="RO" offset="0xC.28" size="0x0.4" />
+	<field name="timer_left_for_high_pwrt_transition" descr="FW timer left for transition from DP state of DPDeactivated \;state to DPActivated" access="RO" offset="0x10.0" size="0x0.8" />
+	<field name="timer_left_for_dp_active_transition" descr="FW timer left for transition from module state of low power to \;high power" access="RO" offset="0x10.16" size="0x0.8" />
 </node>
 
 <node name="pddr_module_info_ext" descr="" size="0xf8.0" >
@@ -3795,7 +3968,7 @@
 	<field name="cable_technology" descr="QSFP: \;Byte 147 per SFF-8636.\;\;SFP:\;SFP+ Cable Technology: \;byte8 per SFF-8472:\;Bit 3 - Active Cable\;Bit 2 - Passive Cable\;\;CMIS based (QSFP-DD / OSFP/ SFP-DD):\;Byte 212" access="RW" offset="0x0.24" size="0x0.8" />
 	<field name="cable_power_class" descr="Module maximum power consumption for SFP/QSFP:\;0: Power_Class_0 - (1.0 W max)\;1: Power_Class_1 - (1.5 W max)\;2: Power_Class_2 - (2.0 W max)\;3: Power_Class_3 - (2.5 W max)\;4: Power_Class_4 - (3.5 W max)\;5: Power_Class_5 - (4.0 W max)\;6: Power_Class_6 - (4.5 W max)\;7: Power_Class_7 - (5.0 W max)\;8: Power_Class_8 - (power from max_power field)\;\;Module maximum power consumption for SFP-DD:\;0: Power_Class_0 - (0.5 W max)\;1: Power_Class_1 - (1.0 W max)\;2: Power_Class_2 - (1.5 W max)\;3: Power_Class_3 - (2.0 W max)\;4: Power_Class_4 - (3.5 W max)\;5: Power_Class_5 - (5.0 W max)\;6: reserved\;7: reserved\;8: Power_Class_8 - (power from max_power field)\;\;Module maximum power consumption for QSFP-DD/OSFP:\;1 - Power_Class_1 - (1.5 W max)\;2 - Power_Class_2 - (3.5 W max)\;3 - Power_Class_3 - (7.0 W max)\;4 - Power_Class_4 - (8.0 W max)\;5 - Power_Class_5 - (10 W max)\;6 - Power_Class_6 - (12 W max)\;7 - Power_Class_7 - (14 W max)\;8 - Power_Class_8 - (power from max_power field)" access="RO" offset="0x4.0" size="0x0.8" />
 	<field name="cable_identifier" descr="0: QSFP28\;1: QSFP_Plus\;2: SFP28_or_SFP_Plus\;3: QSA - (QSFP-&gt;SFP)\;4: Backplane\;5: SFP_DD\;6: QSFP_DD\;7: QSFP_CMIS\;8: OSFP\;9: C2C\;10: DSFP\;11: QSFP_Split_Cable\;\;identifiers that are CMIS compliant are: 5,6,7,8,10" access="RO" offset="0x4.8" size="0x0.8" />
-	<field name="cable_length" descr="Cable length in 1m units.\;\;For CMIS modules:\;bits 6:7 represent cable_length_multiplier for calculating \;cable length\;00 - 0.1 multiplier (0.1 to 6.3m)\;01- 1 multiplier (1 to 63m)\;10 - 10 multiplier (10 to 630m)\;11 - 100 multiplier (100 to 6300m)\;\;bits 0:5 represent cable_length_value for calculating cable \;length.\;length is calculated with cable_length_value * \;cable_length_multiplier" access="RO" offset="0x4.16" size="0x0.8" />
+	<field name="cable_length" descr="Cable length in 1m units.\;\;For CMIS modules:\;bits 6:7 represent cable_length_multiplier for calculating \;cable length\;00 - 0.1 multiplier (0.1 to 6.3m)\;01- 1 multiplier (1 to 63m)\;10 - 10 multiplier (10 to 630m)\;11 - 100 multiplier (100 to 6300m)\;\;bits 0:5 represent cable_length_value for calculating cable \;length.\;length is calculated with cable_length_value * cable_length_\;multiplier" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="cable_vendor" descr="Cable vendor:\;0: Other\;1: Mellanox\;2: Known_OUI\;3: NVIDIA\;" access="RO" enum="Other=0x0,Mellanox=0x1,Known_OUI=0x2,NVIDIA=0x3" offset="0x4.24" size="0x0.4" />
 	<field name="cable_type" descr="Cable/module type:\;0: Unidentified\;1: Active_cable - (active copper / optics)\;2: Optical_Module - (separated)\;3: Passive_copper_cable\;4: Cable_unplugged\;5: Twisted_pair\;" access="RO" enum="Unidentified=0x0,Active_cable=0x1,Optical_Module=0x2,Passive_copper_cable=0x3,Cable_unplugged=0x4,Twisted_pair=0x5" offset="0x4.28" size="0x0.4" />
 	<field name="cable_tx_equalization" descr="" access="RO" offset="0x8.0" size="0x0.8" />
@@ -3812,7 +3985,7 @@
 	<field name="rx_cdr_cap" descr="0 - No CDR\;1 - Build-in CDR with on/off control \;2 - Build-in CDR without on/off control" access="RO" offset="0x10.20" size="0x0.4" />
 	<field name="cable_rx_post_emphasis" descr="Valid only for CMIS (QSFP-DD/ SFP-DD/ OSFP)\;Rx post-emphasis." access="RO" offset="0x10.24" size="0x0.8" />
 	<field name="vendor_name" descr="ASCII Vendor name left-aligned and padded on the right with\;ASCII spaces (20h)" access="RO" high_bound="3" low_bound="0" offset="0x14.0" size="0x10.0" />
-	<field name="vendor_pn" descr="Vendor Part Number left-aligned and padded on the right \;with ASCII spaces (20h)" access="RO" high_bound="3" low_bound="0" offset="0x24.0" size="0x10.0" />
+	<field name="vendor_pn" descr="Vendor Part Number left-aligned and padded on the right with \;ASCII spaces (20h)" access="RO" high_bound="3" low_bound="0" offset="0x24.0" size="0x10.0" />
 	<field name="vendor_rev" descr="ASCII Vendor revision aligned to right padded with 0h on the \;left" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="fw_version" descr="If information is not available by the module: set to 0" access="RO" offset="0x38.0" size="0x4.0" />
 	<field name="vendor_sn" descr="Vendor Serial Number" access="RO" high_bound="3" low_bound="0" offset="0x3C.0" size="0x10.0" />
@@ -3854,6 +4027,7 @@
 	<field name="tx_bias_high_th" descr="Alarm high TX Bias current threshold in 2 uA." access="RO" offset="0x90.16" size="0x0.16" />
 	<field name="wavelength" descr="Nominal laser wavelength in nm" access="RO" offset="0x94.0" size="0x0.16" />
 	<field name="smf_length" descr="SMF link length\;SFP per byte 14,15.\;QSFP per byte 142\;for CMIS based modules, per byte 132\;\;bit 9:8 - 00 length base in 1 km units\;bit 9:8 - 01 length base in 100m units\;bits 7:0 - length base" access="RO" offset="0x94.16" size="0x0.10" />
+	<field name="rx_output_valid_cap" descr="when set, indicates rx_output_valid is supported by the mod\;ule" access="RW" offset="0x94.26" size="0x0.1" />
 	<field name="did_cap" descr="set in case of Linear Direct Drive module" access="RO" offset="0x94.27" size="0x0.1" />
 	<field name="rx_power_type" descr="rx power measurement type\;0: OMA\;1: Average_power" access="RO" enum="OMA=0x0,Average_power=0x1" offset="0x94.28" size="0x0.1" />
 	<field name="module_st" descr="Valid for CMIS modules only.\;Module state:\;0: reserved\;1: LowPwr_state\;2: PwrUp_state\;3: Ready_state\;4: PwrDn_state\;5: Fault_state" access="RO" enum="reserved=0x0,LowPwr_state=0x1,PwrUp_state=0x2,Ready_state=0x3,PwrDn_state=0x4,Fault_state=0x5" offset="0x94.29" size="0x0.3" />
@@ -3884,14 +4058,13 @@
 	<field name="vendor_oui" descr="vendor oui" access="RO" offset="0xB8.0" size="0x0.24" />
 	<field name="connector_type" descr="connector type based on SFF-8024" access="RO" offset="0xB8.24" size="0x0.8" />
 	<field name="rx_output_valid" descr="Rx output status indication per lane" access="RO" offset="0xBC.0" size="0x0.8" />
-	<field name="rx_input_valid" descr="Rx input status indication per lane" access="RO" offset="0xBC.8" size="0x0.8" />
 	<field name="tx_input_freq_sync" descr="Defines which Tx input lanes must be frequency synchronous.\;0: Tx_input_lanes_1_8\;1: Tx_input_lanes_1_4_and_5-8\;2: Tx_input_lanes_1_2_and_3_4_and_5_6_and_7_8\;3: Lanes_may_be_asynchronous_in_frequency" access="RO" enum="Tx_input_lanes_1_8=0x0,Tx_input_lanes_1_4_and_5=0x1,Tx_input_lanes_1_2_and_3_4_and_5_6_and_7_8=0x2,Lanes_may_be_asynchronous_in_frequency=0x3" offset="0xBC.16" size="0x0.2" />
 	<field name="error_code" descr="Relevant for CMIS modules only\;Error Code response for ConrolSet configuration of DataPath.\;0x0: ConfigUndefined\;0x1: ConfigSuccess\;0x2: ConfigRejected\;0x3: ConfigRejectedInvalidAppSel\;0x4: ConfigRejectedInvalidDataPath\;0x5: ConfigRejectedInvalidSI\;0x6: ConfigRejectedLanesInUse\;0x7: ConfigRejectedPartialDataPath\;0xC: ConfigInProgress" access="RO" enum="ConfigUndefined=0x0,ConfigSuccess=0x1,ConfigRejected=0x2,ConfigRejectedInvalidAppSel=0x3,ConfigRejectedInvalidDataPath=0x4,ConfigRejectedInvalidSI=0x5,ConfigRejectedLanesInUse=0x6,ConfigRejectedPartialDataPath=0x7,ConfigInProgress=0xc" offset="0xC0.0" size="0x0.4" />
 	<field name="max_fiber_length" descr="Maximum length of allowed fiber in meters" access="RO" offset="0xC0.16" size="0x0.16" />
 </node>
 
 <node name="pddr_monitor_opcode_ext" descr="" size="0x4.0" >
-	<field name="monitor_opcode" descr="Status opcode: \;\;PHY FW indication (0 - 1023):\;0 - No issue observed\;1 - Port is close by command (see PAOS).\;2,3,4,38,39 - AN failure \;5,6,7,8 - Link training failure. \;9,10,11,12,13 - Logical mismatch between link partners\;14 - Remote fault received\;15,42,17 - Bad signal integrity \;16,24-32 - Cable compliance code mismatch (protocol mis\;match between cable and port) \;23,22,19,18- Internal error\;34,35 - Speed degradation\;56 - module_lanes_frequency_not_synced\;128 - Troubleshooting in process\;1023- Info not available\;\;MNG FW issues (1024 - 2047):\;1024 - Cable is unplugged\;1025 - Long Range for non Mellanox cable/module .\;1026 - Bus stuck (I2C Data or clock shorted) \;1027 - Bad/unsupported EEPROM \;1028 - Part number list\;1029 - Unsupported cable.\;1030 - Module temperature shutdown\;1031 - Shorted cable\;1032 - Power budget exceeded\;1033 - Management forced down the port\;1034 - Module is disabled by command\;1036 - Module&apos;s PMD type is not enabled (see PMTPS).\;1040 - pcie system power slot Exceeded\;1042 - Module state machine fault\;1043,1044,1045,1046 - Module&apos;s stamping speed \;degeneration\;1047, 1048 - Modules DataPath FSM fault\;\;Core/Driver (2048 - 3071):" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="monitor_opcode" descr="Status opcode: \;\;PHY FW indication (0 - 1023):\;0 - No issue observed\;1 - Port is close by command (see PAOS).\;2,3,4,38,39 - AN failure \;5,6,7,8 - Link training failure. \;9,10,11,12,13 - Logical mismatch between link partners\;14 - Remote fault received\;15,42,17 - Bad signal integrity \;16,24-32 - Cable compliance code mismatch (protocol mis\;match between cable and port) \;23,22,19,18- Internal error\;34,35 - Speed degradation\;56 - module_lanes_frequency_not_synced\;128 - Troubleshooting in process\;1023- Info not available\;\;MNG FW issues (1024 - 2047):\;1024 - Cable is unplugged\;1025 - Long Range for non Mellanox cable/module .\;1026 - Bus stuck (I2C Data or clock shorted) \;1027 - Bad/unsupported EEPROM \;1028 - Part number list\;1029 - Unsupported cable.\;1030 - Module temperature shutdown\;1031 - Shorted cable\;1032 - Power budget exceeded\;1033 - Management forced down the port\;1034 - Module is disabled by command\;1036 - Module&apos;s PMD type is not enabled (see PMTPS).\;1040 - pcie system power slot Exceeded\;1042 - Module state machine fault\;1043,1044,1045,1046 - Module&apos;s stamping speed \;degeneration\;1047, 1048 - Modules DataPath FSM fault\;\;Core/Driver (2048 - 3071):\;2048 - MPR Violation (Under 64 bytes between two starts)." access="RW" offset="0x0.0" size="0x0.16" />
 </node>
 
 <node name="pddr_operation_info_page_cable_proto_cap_auto_ext" descr="" attr_is_union="1" size="0x4.0" >
@@ -3909,15 +4082,17 @@
 	<field name="ib_phy_fsm_state" descr="FW IB state machine:\;0x0: IB_AN_FSM_DISABLED\;0x1: IB_AN_FSM_INITIALY\;0x2: IB_AN_FSM_RCVR_CFG\;0x3: IB_AN_FSM_CFG_TEST\;0x4: IB_AN_FSM_WAIT_RMT_TEST\;0x5: IB_AN_FSM_WAIT_CFG_ENHANCED\;0x6: IB_AN_FSM_CFG_IDLE\;0x7: IB_AN_FSM_LINK_UP\;0x8: IB_AN_FSM_POLLING\;0x9: IB_AN_FSM_SYNC_CHECK - [Internal]" access="RO" enum="IB_AN_FSM_DISABLED=0x0,IB_AN_FSM_INITIALY=0x1,IB_AN_FSM_RCVR_CFG=0x2,IB_AN_FSM_CFG_TEST=0x3,IB_AN_FSM_WAIT_RMT_TEST=0x4,IB_AN_FSM_WAIT_CFG_ENHANCED=0x5,IB_AN_FSM_CFG_IDLE=0x6,IB_AN_FSM_LINK_UP=0x7,IB_AN_FSM_POLLING=0x8,IB_AN_FSM_SYNC_CHECK=0x9" offset="0x4.8" size="0x0.8" />
 	<field name="eth_an_fsm_state" descr="Ethernet (CL73) Auto-negotiation FSM state:\;0x0: ETH_AN_FSM_ENABLE\;0x1: ETH_AN_FSM_XMIT_DISABLE\;0x2: ETH_AN_FSM_ABILITY_DETECT\;0x3: ETH_AN_FSM_ACK_DETECT\;0x4: ETH_AN_FSM_COMPLETE_ACK\;0x5: ETH_AN_FSM_AN_GOOD_CHECK\;0x6: ETH_AN_FSM_AN_GOOD\;0x7: ETH_AN_FSM_NEXT_PAGE_WAIT\;0x8: ETH_AN_FSM_LINK_STAT_CHECK - [Internal] \;0x9: ETH_AN_FSM_EXTRA_TUNE - [Internal] \;0xa: ETH_AN_FSM_FIX_REVERSALS - [Internal] \;0xb: ETH_AN_FSM_IB_FAIL - [Internal] \;0xc: ETH_AN_FSM_POST_LOCK_TUNE - [Internal] \;\;NDR gen - \;0x0: ETH_AN_FSM_ENABLE\;0x1: ETH_AN_FSM_XMIT_DISABLE\;0x2: ETH_AN_FSM_ABILITY_DETECT\;0x3: ETH_AN_FSM_ACK_DETECT\;0x4: ETH_AN_FSM_COMPLETE_ACK\;0x5: ETH_AN_FSM_AN_GOOD_CHECK\;0x6: ETH_AN_FSM_AN_GOOD\;0x7: ETH_AN_FSM_NEXT_PAGE_WAIT\;0x8: ETH_AN_FSM_FIX_REVERSALS - [Internal] \;0x9: ETH_AN_FSM_SUBFSM_FAIL - [Internal] \;0xa: ETH_AN_FSM_HCD_TX_TAPS - [Internal]" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="phy_mngr_fsm_state" descr="FW Phy Manager FSM state:\;0: Disabled \;1: Open_port\;2: Polling\;3: Active_or_Linkup\;4: Close_port\;5: Phy_up\;7: Rx_disable" access="RO" enum="Disabled=0x0,Open_port=0x1,Polling=0x2,Active_or_Linkup=0x3,Close_port=0x4,Phy_up=0x5,Rx_disable=0x7" offset="0x4.24" size="0x0.8" />
-	<field name="phy_manager_link_enabled" descr="For IB: Table  1213, &quot;PDDR - Phy manager link enabled IB lay\;out,&quot; on page  1792\;For Ethernet: Table  1215, &quot;PDDR - Phy manager link enabled \;Eth layout,&quot; on page  1792\;" subnode="pddr_operation_info_page_phy_manager_link_enabled_auto_ext" access="RO" offset="0x8.0" size="0x4.0" />
-	<field name="core_to_phy_link_enabled" descr="For IB: Table  1217, &quot;PDDR - core2phy link enabled IB layout,&quot; \;on page  1793\;For Ethernet: Table  1219, &quot;PDDR - Core2Phy link enabled Eth \;layout,&quot; on page  1794" subnode="pddr_operation_info_page_core_to_phy_link_enabled_auto_ext" access="RO" offset="0xC.0" size="0x4.0" />
-	<field name="cable_proto_cap" descr="For IB: Table  1221, &quot;PDDR - cable cap IB layout,&quot; on \;page  1795\;For Ethernet: Table  1223, &quot;PDDR - cable cap Eth layout,&quot; on \;page  1796\;" subnode="pddr_operation_info_page_cable_proto_cap_auto_ext" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="link_active" descr="For IB: Table  1225, &quot;PDDR - Link Active IB layout,&quot; on \;page  1797\;For Ethernet: Table  1227, &quot;PDDR - Link Active Eth layout,&quot; on \;page  1797" subnode="pddr_operation_info_page_link_active_auto_ext" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="loopback_mode" descr="0: No_loopback_active\;1: Phy_remote_loopback \;2: Phy_local_loopback -When set the port&apos;s egress traffic is \;looped back to the receiver and the port transmitter is dis\;abled. \;4: External_local_loopback -Enables the port&apos;s transmitter to \;link with the port&apos;s receiver using an external loopback con\;nector. \;8: Near_end_analog_loopback - [Internal]\;16: Near_end_digital_loopback - [Internal]\;128: LL_local_loopback - [Internal]" access="RO" enum="No_loopback_active=0x0,Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80" offset="0x18.0" size="0x0.8" />
-	<field name="fec_mode_request" descr="FEC mode request\;See fec_mode_active\;for supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" offset="0x1C.0" size="0x0.16" />
-	<field name="fec_mode_active" descr="FEC mode active\;0: No_FEC\;1: Firecode_FEC\;2: Standard_RS_FEC - RS(528,514)\;3: Standard_LL_RS_FEC - RS(271,257)\;4: Reserved - [Internal]\;5: reserved - [Internal]\;6: Interleaved_Standard_RS-FEC - (544,514)\;7: Standard_RS-FEC - (544,514)\;8: Zero_Latency_FEC - [Internal]\;9: Ethernet_Consortium_LL_50G_RS_FEC- (272,257+1)\;10: Interleaved_Ethernet_Consortium_LL_50G_RS_FEC - \;(272,257+1)\;11: Interleaved_Standard_RS_FEC_PLR - (544,514)- [Inter\;nal]\;12: RS-FEC - (544,514) + PLR- [Internal]\;13: LL-FEC - (271,257) + PLR- [Internal]\;14: Ethernet_Consortium_LL_50G_RS_FEC_PLR - \;(272,257+1) [Internal] \;15: Interleaved_Ethernet_Consor\;tium_LL_50G_RS_FEC_PLR - (272,257+1) [Internal]\;\;For supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" enum="No_FEC=0x0,Firecode_FEC=0x1,Standard_RS_FEC=0x2,Standard_LL_RS_FEC=0x3,Reserved=0x4,Interleaved_Standard_RS=0x6,Standard_RS=0x7,Zero_Latency_FEC=0x8,Ethernet_Consortium_LL_50G_RS_FEC=0x9,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC=0xa,Interleaved_Standard_RS_FEC_PLR=0xb,RS=0xc,LL=0xd,Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xe,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xf" offset="0x1C.16" size="0x0.16" />
+	<field name="phy_manager_link_enabled" descr="For IB: Table 1338, &quot;PDDR - Phy manager link enabled IB \;layout,&quot; on page 1577\;For Ethernet: Table 1340, &quot;PDDR - Phy manager link \;enabled Eth layout,&quot; on page 1577\;" subnode="pddr_operation_info_page_phy_manager_link_enabled_auto_ext" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="core_to_phy_link_enabled" descr="For IB: Table 1342, &quot;PDDR - core2phy link enabled IB lay\;out,&quot; on page 1578\;For Ethernet: Table 1344, &quot;PDDR - Core2Phy link enabled \;Eth layout,&quot; on page 1579" subnode="pddr_operation_info_page_core_to_phy_link_enabled_auto_ext" access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="cable_proto_cap" descr="For IB: Table 1346, &quot;PDDR - cable cap IB layout,&quot; on \;page 1580\;For Ethernet: Table 1348, &quot;PDDR - cable cap Eth layout,&quot; \;on page 1581\;" subnode="pddr_operation_info_page_cable_proto_cap_auto_ext" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="link_active" descr="For IB: Table 1350, &quot;PDDR - Link Active IB layout,&quot; on \;page 1582\;For Ethernet: Table 1352, &quot;PDDR - Link Active Eth lay\;out,&quot; on page 1582" subnode="pddr_operation_info_page_link_active_auto_ext" access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="loopback_mode" descr="0: No_loopback_active\;1: Phy_remote_loopback \;2: Phy_local_loopback -When set the port&apos;s egress traffic is \;looped back to the receiver and the port transmitter is dis\;abled. \;4: External_local_loopback -Enables the port&apos;s transmitter to \;link with the port&apos;s receiver using an external loopback con\;nector. \;8: Near_end_analog_loopback - [Internal]\;16: Near_end_digital_loopback - [Internal]\;128: LL_local_loopback - [Internal]\;256: GLoop - [internal]" access="RO" enum="No_loopback_active=0x0,Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80,GLoop=0x100" offset="0x18.0" size="0x0.12" />
+	<field name="fec_mode_request" descr="FEC mode request\;See fec_mode_active\;for supported retransmission mode see PPLM.fec_mode_capa\;bility" access="RO" offset="0x1C.0" size="0x0.16" />
+	<field name="fec_mode_active" descr="FEC mode active\;0: No_FEC\;1: Firecode_FEC\;2: Standard_RS_FEC - RS(528,514)\;3: Standard_LL_RS_FEC - RS(271,257)\;4: Reserved - [Internal]\;5: reserved - [Internal]\;6: Interleaved_Standard_RS-FEC - (544,514)\;7: Standard_RS-FEC - (544,514)\;8: Zero_Latency_FEC - [Internal]\;9: Ethernet_Consortium_LL_50G_RS_FEC- (272,257+1)\;10: Interleaved_Ethernet_Consortium_LL_50G_RS_FEC - \;(272,257+1)\;11: Interleaved_Standard_RS_FEC_PLR - (544,514)- [Internal]\;12: RS-FEC - (544,514) + PLR- [Internal]\;13: LL-FEC - (271,257) + PLR- [Internal]\;14: Ethernet_Consortium_LL_50G_RS_FEC_PLR - \;(272,257+1) [Internal] \;15: Interleaved_Ethernet_Consor\;tium_LL_50G_RS_FEC_PLR - (272,257+1) [Internal]\;\;For supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" enum="No_FEC=0x0,Firecode_FEC=0x1,Standard_RS_FEC=0x2,Standard_LL_RS_FEC=0x3,Reserved=0x4,Interleaved_Standard_RS=0x6,Standard_RS=0x7,Zero_Latency_FEC=0x8,Ethernet_Consortium_LL_50G_RS_FEC=0x9,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC=0xa,Interleaved_Standard_RS_FEC_PLR=0xb,RS=0xc,LL=0xd,Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xe,Interleaved_Ethernet_Consortium_LL_50G_RS_FEC_PLR=0xf" offset="0x1C.16" size="0x0.16" />
 	<field name="eth_100g_fec_support" descr="FEC 100G (25Gb/s per lane) supported FEC include override \;masking , should reflect current phy configuration\;Bit 0 - No FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;" access="RO" offset="0x20.0" size="0x0.4" />
 	<field name="eth_25g_50g_fec_support" descr="FEC 25G/50G (25Gb/s per lane) supported FEC include over\;ride masking , should reflect current phy configuration\;Bit 0 - No FEC\;Bit 1 - Firecode FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;" access="RO" offset="0x20.4" size="0x0.4" />
+	<field name="rtt_measure_valid" descr="when set, indicates the Round Trip Time measurement stated \;rtt_measured field is valid" access="RO" offset="0x20.8" size="0x0.1" />
+	<field name="rtt_measured" descr="Valid only when rtt_measure_valid is set.\;Round Trip Time measurement in 1nS resolution." access="RO" offset="0x38.0" size="0x4.0" />
 </node>
 
 <node name="pddr_operation_info_page_link_active_auto_ext" descr="" attr_is_union="1" size="0x4.0" >
@@ -3959,7 +4134,7 @@
 	<field name="pcs_phy_state" descr="PCS HW state:\;Bits 0-7: Block lock\;Bits 8-15: AM lock\;Bits 16-23: FEC lock\;Bits 24: Align_status\;Bits 25: Hi_BER\;Bits 26: Hi_SER" access="RO" offset="0xC.0" size="0x4.0" />
 	<field name="lp_proto_enabled" descr="IB ports : \;Link partner advertised speeds (first TS3)\;See ib_link_speed_enabled encoding.\;\;Ethernet ports:\;Link partner advertised Ethernet protocols active state: see \;PTYS.lp_advertise" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="lp_fec_mode_request" descr="Reserved when negotiation wasn&apos;t performed according to \;port_notifications.Link partner advertised capabilities value.\;Advertised link partner FEC mode request" access="RO" offset="0x14.0" size="0x0.16" />
-	<field name="lp_fec_mode_support" descr="Reserved when negotiation wasn&apos;t performed according to \;port_notifications.Link partner advertised capabilities value.\;\;Advertised link partner FEC mode support\;Bit 0 - No FEC\;Bit 1 - Firecode FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;Bit 3 - Standard LL RS-FEC - RS(271,257)\;Bit 4 - Mellanox Strong RS-FEC - RS(277,257)\;Bit 5 - Mellanox LL RS-FEC - RS(163,155)\;Bit 6 - Reserved\;Bit 7 - Standard RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;\;for supported retransmission mode see PPLM.fec_mode_ca\;pability" access="RO" offset="0x14.16" size="0x0.16" />
+	<field name="lp_fec_mode_support" descr="Reserved when negotiation wasn&apos;t performed according to \;port_notifications.Link partner advertised capabilities value.\;\;Advertised link partner FEC mode support\;Bit 0 - No FEC\;Bit 1 - Firecode FEC\;Bit 2 - Standard RS-FEC - RS(528,514)\;Bit 3 - Standard LL RS-FEC - RS(271,257)\;Bit 4 - Mellanox Strong RS-FEC - RS(277,257)\;Bit 5 - Mellanox LL RS-FEC - RS(163,155)\;Bit 6 - Reserved\;Bit 7 - Standard RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;\;for supported retransmission mode see PPLM.fec_mode_capa\;bility" access="RO" offset="0x14.16" size="0x0.16" />
 	<field name="ib_last_link_down_reason" descr="Bit 0 - heartbeat_ack_received\;Bit 1 - heartbeat_send_received\;Bit 2 - heartbeat_err\;Bit 3 - tx_width_reduction_done_1x\;Bit 4 - tx_width_reduction_done_full\;Bit 5 - rx_width_reduction_done_1x\;Bit 6 - rx_width_reduction_done_full\;Bit 7 - width_reduction_timeout\;Bit 8 - ibl_link_retrain\;Bit 9 - rx_comskp_timeout\;Bit 10 - fifo_full_err\;Bit 11 - ts_at_linkup\;Bit 12 - minor_threshold_reached\;Bit 13 - link_fail\;Bit 14 - rx_eb_full_r\;Bit 15 - rx_8_10_lane_err\;Bit 16 - llr_link_retrain_set\;Bit 17 - fc_timeout\;Bit 18 - phy_error\;Bit 19 - lli_err\;Bit 20 - excessive_buffer_err\;Bit 21 - remote_init\;Bit 22 - plr_retry_expired\;Bit 23 - port_didnt_exit_plr_sync\;Bit 24 - eq_failed\;Bits 31-24 - Reserved" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="eth_last_link_down_lane" descr="Bit 0 - block_lock_failed\;Bit 1 - skip_detected\;Bit 2 - fec_sync_failed\;Bit 3 - fec_block_sync\;Bit 4 - fec_block_sync_lost" access="RO" high_bound="3" low_bound="0" offset="0x1C.24" size="0x4.0" />
 	<field name="speed_deg_db" descr="Bit 0 - Speed degradation database Valid\;Bit 1 - Speed degradation Serdes Rx database valid\;BIts 3-2 - reserved\;Bit 4 - rx_reversal\;Bit 5 - tx_reversal\;Bit 7-6 - reserved\;Bits 11:8 - failed_qdr/fdr10 - bit per lane.\;Bits 15:12 - failed_fdr - bit per lane.\;Bits 19:16- failed_edr - bit per lane.\;Bits 24:20 - peer_failed_test\;Bits 26-25 - reserved\;Bit 27 - first_test_speed" access="RO" offset="0x24.0" size="0x4.0" />
@@ -3973,9 +4148,9 @@
 	<field name="num_of_presets_tested_lane0" descr="presets tested in TX tuning flow counter or in KR Startup" access="RO" offset="0x44.24" size="0x0.5" />
 	<field name="kr_startup_fsm_lane" descr="Per lane KR startup state:\;0 - KR_FSM_INITIALIZE\;1 - KR_FSM_SEND_TRAINING\;2 - KR_FSM_TRAIN_LOCAL_TX\;3 - KR_FSM_TRAIN_LOCAL_RX\;4 - KR_FSM_TRAIN_REMOTE\;5 - KR_FSM_LINK_READY\;6 - KR_FSM_SEND_DATA" access="RO" high_bound="3" low_bound="0" offset="0x48.24" size="0x4.0" />
 	<field name="eth_an_debug_indication" descr="eth_an_debug bit mask:\;Bit 0 - Force link up\;Bit 1 - No HCD\;Bit 2 - Entered ACK_detect\;Bit 3 - Entered Good\;Bit 4 - Entered Good_Check\;Bit 5 - Entered Extra_tune\;Bit 6 - Entered Fix_Reversals\;Bit 7 - Entered Next_Page\;Bit 8 - Entered Sub-FSM Fail\;Bit 9 - Tuning timeout\;Bit 10 - No markers detected (during Good check)\;Bit 11 - Do KR-startup\;Bits 15:18 - KR startup failure mask" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="ib_phy_fsm_state_trace" descr="FW IB state machine:\;HDR Gen\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_INITIALY\;Bit 2 - entered IB_AN_FSM_RCVR_CFG\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_LINK_UP\;Bit 8 - Failed from CFG_IDLE\;\;NDR Gen:\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_POLLING\;Bit 2 - entered IB_AN_FSM_INITIALY\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_SYNC_CHECK\;Bit 8 - entered IB_AN_FSM_LINK_UP\;Bit 9 - Failed from CFG_IDLE\;Bit 10 - peer requested KR\;Bit 11 - speed degradation needed - &quot;best_grade&quot; didn&quot;t \;reach threshold\;\;" access="RO" offset="0x54.0" size="0x0.16" />
+	<field name="ib_phy_fsm_state_trace" descr="FW IB state machine:\;HDR Gen\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_INITIALY\;Bit 2 - entered IB_AN_FSM_RCVR_CFG\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_LINK_UP\;Bit 8 - Failed from CFG_IDLE\;\;NDR Gen:\;Bit 0 - entered IB_AN_FSM_DISABLED\;Bit 1 - entered IB_AN_FSM_POLLING\;Bit 2 - entered IB_AN_FSM_INITIALY\;Bit 3 - entered IB_AN_FSM_CFG_TEST\;Bit 4 - entered IB_AN_FSM_WAIT_RMT_TEST\;Bit 5 - entered IB_AN_FSM_WAIT_CFG_ENHANCED\;Bit 6 - entered IB_AN_FSM_CFG_IDLE\;Bit 7 - entered IB_AN_FSM_SYNC_CHECK\;Bit 8 - entered IB_AN_FSM_LINK_UP\;Bit 9 - Failed from CFG_IDLE\;Bit 10 - peer requested KR\;Bit 11 - speed degradation needed - &quot;best_grade&quot; didn&quot;t reach \;threshold\;\;" access="RO" offset="0x54.0" size="0x0.16" />
 	<field name="rounds_waited_for_peer_to_end_test" descr="" access="RO" offset="0x54.16" size="0x0.5" />
-	<field name="eth_an_watchdog_cnt" descr="counts ETH Watchdog was performed (and closed the IB \;fsm)." access="RO" offset="0x54.21" size="0x0.2" />
+	<field name="eth_an_watchdog_cnt" descr="counts ETH Watchdog was performed (and closed the IB fsm)." access="RO" offset="0x54.21" size="0x0.2" />
 	<field name="fall_from_cfg_idle_cdr_cnt" descr="count falls from Cfg_idle (before linkup) due cdr not lock" access="RO" offset="0x54.23" size="0x0.3" />
 	<field name="fall_from_cfg_idle_cnt" descr="count falls from Cfg_idle (before linkup) due amps lock on \;PLU" access="RO" offset="0x54.26" size="0x0.3" />
 	<field name="cdr_not_locked_cnt" descr="count the cdr not locked after EQ" access="RO" offset="0x54.29" size="0x0.3" />
@@ -3987,7 +4162,7 @@
 	<field name="irisc_status" descr="" access="RO" offset="0x68.0" size="0x0.4" />
 	<field name="stamping_reason" descr="Bit 0 - com_codes_is_zero \;Bit 1- rx_cdr_check_force_mode \;Bit 2- com_code_complaince \;Bit 3- eth_56g_stamped\;Bit 4- non_mlx_qsfp_tranciver\;Bit 5- non_mlx_sfp_tranciver\;Bit 6-ib_comp_codes\;Bit 7-edr_comp\;Bit 8-fdr_comp" access="RO" offset="0x6C.0" size="0x4.0" />
 	<field name="kr_frame_lock_tuning_failure_events_count" descr="Number of times that fast tuning (50ms) for KR lock failed to \;achieve frame lock." access="RO" offset="0x70.0" size="0x4.0" />
-	<field name="kr_full_tuning_failure_count" descr="Number of times that full tuning (0.5sec/3sec) for KR full \;tuning flow failed to achieve desire SI performance" access="RO" offset="0x74.0" size="0x4.0" />
+	<field name="kr_full_tuning_failure_count" descr="Number of times that full tuning (0.5sec/3sec) for KR full tun\;ing flow failed to achieve desire SI performance" access="RO" offset="0x74.0" size="0x4.0" />
 	<field name="pm_debug_indication" descr="Bit 0: phy_test_mode\;Bit 1: force_mode_en" access="RO" enum="phy_test_mode=0x1,force_mode_en=0x2" offset="0x78.0" size="0x0.16" />
 	<field name="ib_debug_indication" descr="Bit 0: cause_plr_tx_max_outstanding_cells" access="RW" enum="cause_plr_tx_max_outstanding_cells=0x1" offset="0x78.16" size="0x0.16" />
 	<field name="pd_debug_indication" descr="Bit 0: speed_change_high_speed_module\;Bit 1: False_positive_signal_detect\;Bit 2: Nv2nv_force\;Bit 3: bad_kr_mask \;Bit 4: kr_mlx_peer\;Bit 5: entered_signal_detect\;Bit 6: entered_rate_config\;Bit 7: entered_activate_sunfsm\;Bit 8: entered_done\;Bit 9: entered_subfsm_fail" access="RO" enum="speed_change_high_speed_module=0x1,False_positive_signal_detect=0x2,Nv2nv_force=0x4,bad_kr_mask=0x8,kr_mlx_peer=0x10,entered_signal_detect=0x20,entered_rate_config=0x40,entered_activate_sunfsm=0x80,entered_done=0x100,entered_subfsm_fail=0x200" offset="0x80.0" size="0x4.0" />
@@ -3996,6 +4171,12 @@
 	<field name="hst_mismatch_reason" descr="0: speed\;1: FEC\;2: precoding\;3: Gray coding" access="RO" offset="0x84.16" size="0x0.2" />
 	<field name="psi_collision2" descr="FSM 2 to call sub fsm of PSI that caused collision\;see fsm_mask in debug page for FSM numbering" access="RO" offset="0x84.22" size="0x0.5" />
 	<field name="psi_collision1" descr="FSM 1 to call sub fsm of PSI that caused collision\;see fsm_mask in debug page for FSM numbering" access="RO" offset="0x84.27" size="0x0.5" />
+	<field name="phy2mod_speed_req" descr="phy 2 module requested speed, aka speed_apsel_value\;bitmask according to PTYS.ext_ethernet_protocl for ETH \;speeds\;or ib_ext_protocols for IB speeds" access="RO" offset="0x8C.0" size="0x4.0" />
+	<field name="phy2mod_deactivate_lanes" descr="Bitmask per lane for phy2mod deactivate request status.\;0 - allow DP activation\;1 - Deactivate module DP" access="RO" offset="0x90.0" size="0x0.8" />
+	<field name="phy2mod_ack_lanes" descr="Bitmask per lane for phy2mod request status.\;0 - ack\;1 - nack" access="RO" offset="0x90.8" size="0x0.8" />
+	<field name="one_pll_mod" descr="indicates module has one pll for all lanes of the module." access="RO" offset="0x90.29" size="0x0.1" />
+	<field name="no_dme_mod" descr="no_dme_module indicates module doesn&apos;t support low speed \;signaling such as 312.5 MB/s for DME ETH AN signaling or \;SDR (2.5 GB/s) for IB low speed AN." access="RO" offset="0x90.30" size="0x0.1" />
+	<field name="eeprom_prsnt" descr="eeprom present indication" access="RO" offset="0x90.31" size="0x0.1" />
 </node>
 
 <node name="pddr_phy_manager_link_enabed_eth_ext" descr="" size="0x4.0" >
@@ -4035,7 +4216,7 @@
 	<field name="mono_reach_high_limit_sv" descr="mono_reach_high_limit severity\;0 - misconfiguration\;1 - fatal" access="RO" offset="0x10.7" size="0x0.1" />
 	<field name="mono_reach_low_limit" descr="" access="RO" offset="0x10.8" size="0x0.1" />
 	<field name="mono_reach_low_limit_sv" descr="mono_reach_low_limit severity\;0 - misconfiguration\;1 - fatal" access="RO" offset="0x10.9" size="0x0.1" />
-	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to off\;set 00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the \;mask is set, the event will be cleared. \;For example: To clear the kr_false_ready need set PDDR.clr , \;select the &quot;port event page&quot; and set bit 48 in clr_mask." access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="clr_mask" descr="Valid only when PDDR.clr is set\;Bit mask for page bits 255:0, when bits 31:0 assigned to offset \;00h bits 31:0.\;bits 63:32 assigned to offset 04h bits 31:0.\;bits 95:64 assigned to offset 08h bits 31:0.\;bits 127:69 assigned to offset 0Ch bits 31:0.\;Only when PDDR.clr is set and the appropriate bit in the mask \;is set, the event will be cleared. \;For example: To clear the kr_false_ready need set PDDR.clr , \;select the &quot;port event page&quot; and set bit 48 in clr_mask." access="OP" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 </node>
 
 <node name="pddr_reg_ext" descr="" size="0x100.0" >
@@ -4045,7 +4226,7 @@
 	<field name="local_port" descr="Local port number.\;If dev is set to 1, device index number.\;0: main die\;1-8: tile index number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="page_select" descr="page select index:\;0: Operational_info_page\;1: Troubleshooting_info_page\;2: Phy_info_page - [Internal]\;3: Module_info_page\;4: port_events_page - [internal]\;5: device_events_page - [internal]\;6: link_down_info - [EMC only]\;7: link_down_events - [internal]\;8: Link_up_info - [Internal]\;9: Module_latched_flag_info_page\;10: link_down_info_ext\;11: link_partner_info_page\;0xFE: mng_debug_page\;0xFF: phy_debug_page" access="INDEX" enum="Operational_info_page=0x0,Troubleshooting_info_page=0x1,Phy_info_page=0x2,Module_info_page=0x3,port_events_page=0x4,device_events_page=0x5,link_down_info=0x6,link_down_events=0x7,Link_up_info=0x8,Module_latched_flag_info_page=0x9,link_down_info_ext=0xa,link_partner_info_page=0xb,mng_debug_page=0xfe,phy_debug_page=0xff" offset="0x4.0" size="0x0.8" />
 	<field name="module_info_ext" descr="Module info extended configurations.\;resolution for rx_power and tx_power in module info page\;0: dbm\;1: uW" access="RW" enum="dbm=0x0,uW=0x1" offset="0x4.29" size="0x0.2" />
-	<field name="page_data" descr="Table  1205, &quot;Operation Info Page Layout,&quot; on page  1770\;Table  1247, &quot;Troubleshooting info Page layout,&quot; on page  1828\;Table  1239, &quot;Phy info page layout,&quot; on page  1801\;Table  1245, &quot;Module Info Page Layout,&quot; on page  1815\;Table  1253, &quot;Port events Page Layout,&quot; on page  1832\;Table  1255, &quot;Device events Page Layout,&quot; on page  1836\;Table  1241, &quot;Link Down Info Page layout,&quot; on page  1811\;Table  1243, &quot;Link down events page layout,&quot; on page  1814\;Table  1257, &quot;Link Up Info Page Layout,&quot; on page  1842\;Table  1259, &quot;Module Latched Flag Info Page Layout,&quot; on \;page  1845\;Table  1261, &quot;phy debug page layout,&quot; on page  1848\;Table  1263, &quot;Mng debug page layout,&quot; on page  1850\;Table  1267, &quot;link down info ext for 16nm LR layout,&quot; on \;page  1855" subnode="pddr_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).page_select" />
+	<field name="page_data" descr="Table 1330, &quot;Operation Info Page Layout,&quot; on page 1554\;Table 1372, &quot;Troubleshooting info Page layout,&quot; on \;page 1614\;Table 1364, &quot;Phy info page layout,&quot; on page 1586\;Table 1370, &quot;Module Info Page Layout,&quot; on page 1601\;Table 1378, &quot;Port events Page Layout,&quot; on page 1618\;Table 1380, &quot;Device events Page Layout,&quot; on page 1622\;Table 1366, &quot;Link Down Info Page layout,&quot; on page 1597\;Table 1368, &quot;Link down events page layout,&quot; on \;page 1600\;Table 1382, &quot;Link Up Info Page Layout,&quot; on page 1628\;Table 1384, &quot;Module Latched Flag Info Page Layout,&quot; on \;page 1631\;Table 1386, &quot;phy debug page layout,&quot; on page 1634\;Table 1388, &quot;Mng debug page layout,&quot; on page 1636\;Table 1392, &quot;link down info ext for 16nm LR layout,&quot; on \;page 1641" subnode="pddr_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).page_select" />
 </node>
 
 <node name="pddr_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0xf8.0" >
@@ -4066,7 +4247,7 @@
 
 <node name="pddr_troubleshooting_page_ext" descr="" size="0xf8.0" >
 	<field name="group_opcode" descr="0: Monitor_opcodes\;1: Advanced_debug_opcodes - [Internal]" access="INDEX" enum="Monitor_opcodes=0x0,Advanced_debug_opcodes=0x1" offset="0x0.0" size="0x0.16" />
-	<field name="status_opcode" descr="Status opcode described in:\;Table  1249, &quot;PDDR - Monitor opcodes layout,&quot; on page  1829\;Table  1251, &quot;PDDR - Advanced opcodes layout,&quot; on page  1830" subnode="pddr_troubleshooting_page_status_opcode_auto_ext" access="RO" offset="0x4.0" size="0x4.0" union_selector="$(parent).group_opcode" />
+	<field name="status_opcode" descr="Status opcode described in:\;Table 1374, &quot;PDDR - Monitor opcodes layout,&quot; on \;page 1615\;Table 1376, &quot;PDDR - Advanced opcodes layout,&quot; on \;page 1616" subnode="pddr_troubleshooting_page_status_opcode_auto_ext" access="RO" offset="0x4.0" size="0x4.0" union_selector="$(parent).group_opcode" />
 	<field name="status_message" descr="ASCII code message\;All Messages are terminated by a Null character &apos;\0&apos;" access="RO" high_bound="58" low_bound="0" offset="0xC.0" size="0xec.0" />
 </node>
 
@@ -4077,7 +4258,7 @@
 
 <node name="peabfe_ext" descr="" size="0x410.0" >
 	<field name="size" descr="Number of BF entries to be updated\;Range is 1..256" access="OP" offset="0x0.0" size="0x0.9" />
-	<field name="bf_entry" descr="Bloom Filter entry\;See Table 2034, &quot;PEABFE - Bloom Filter Entry Layout,&quot; \;on page 2527\;" subnode="beabfe_bloom_filter_ext" access="RW" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="bf_entry" descr="Bloom Filter entry\;See Table 2191, &quot;PEABFE - Bloom Filter Entry Lay\;out,&quot; on page 2303\;" subnode="beabfe_bloom_filter_ext" access="RW" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="peapbl_ext" descr="" size="0x20.0" >
@@ -4092,14 +4273,14 @@
 <node name="peapbm_ext" descr="" size="0xf8.0" >
 	<field name="region_id" descr="Region identifier\;Range 0 .. cap_max_regions-1\;Note: the register updates all duplicated regions" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="erp_id" descr="erp id" access="INDEX" offset="0x10.0" size="0x0.4" />
-	<field name="erp_id_mask" descr="erp id mask, per bit:\;0: for both values of erp_id bit\;1: for value according to erp_id bit\;Example: mask 1111 - update only erp_id, mask 0000 - update \;all erps" access="INDEX" offset="0x10.8" size="0x0.4" />
+	<field name="erp_id_mask" descr="erp id mask, per bit:\;0: for both values of erp_id bit\;1: for value according to erp_id bit\;Example: mask 1111 - update only erp_id, mask 0000 - \;update all erps" access="INDEX" offset="0x10.8" size="0x0.4" />
 	<field name="pruning_ctcam_cs" descr="Pruning C-TCAM clear or set. Clear or set defined by c_s\;0: don&apos;t modify prune_ctcam bit\;1: modify the prune_ctcam bit" access="WO" offset="0x10.28" size="0x0.1" />
 	<field name="c_s" descr="Clear or set:\;0: prune clear\;1: prune set" access="WO" offset="0x10.31" size="0x0.1" />
 	<field name="pruning_vector_cs" descr="Pruning vector clear or set. Modify option defined by c_s\;Per bit:\;0: don&apos;t modify pruning_vector bit\;1: modify the pruning_vector bit" access="WO" offset="0x14.0" size="0x0.16" />
 	<field name="priority_start" descr="Update will be from priority_start (inclusive) to priority_end \;(inclusive).\;For Spectrum-2 range is 1.. cap_kvd_size-1" access="INDEX" offset="0x18.0" size="0x0.24" />
 	<field name="priority_end" descr="Update will be from priority_start (inclusive) to priority_end \;(inclusive).\;For Spectrum-2 range is 1.. cap_kvd_size-1" access="INDEX" offset="0x1C.0" size="0x0.24" />
-	<field name="key" descr="ACL Key as described in Section 10.6.2, &quot;Flex2 ACL Key \;Blocks Layout&quot;, on page 2233\;Note: for regions which have 12 Key Blocks the 6 lsb Key \;Blocks are valid and the 6 msb Key Blocks are not used for this \;function" access="INDEX" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
-	<field name="key_mask" descr="Mask\;Mask entries which match the key with this mask. Per bit:\;0: ignore bit key (always match)\;1: compare bit in key\;Note: for regions which have 12 Key Blocks the 6 lsb Key \;Blocks are valid and the 6 msb Key Blocks are not used for this \;function" access="INDEX" high_bound="23" low_bound="0" offset="0x80.0" size="0x60.0" />
+	<field name="key" descr="ACL Key as described in Section 10.6.2, &quot;Flex2 ACL Key \;Blocks Layout&quot;, on page 1993\;Note: for regions which have 12 Key Blocks the 6 lsb Key \;Blocks are valid and the 6 msb Key Blocks are not used for \;this function" access="INDEX" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
+	<field name="key_mask" descr="Mask\;Mask entries which match the key with this mask. Per bit:\;0: ignore bit key (always match)\;1: compare bit in key\;Note: for regions which have 12 Key Blocks the 6 lsb Key \;Blocks are valid and the 6 msb Key Blocks are not used for \;this function" access="INDEX" high_bound="23" low_bound="0" offset="0x80.0" size="0x60.0" />
 	<field name="large_entry_key_id" descr="Large entry key ID\;A key for 12 Key block rules\;Reserved when the region has 2, 4 or 6 key blocks\;Range 0 .. cap_max_pe_large_key_id- 1" access="INDEX" offset="0xE0.0" size="0x0.24" />
 	<field name="large_entry_key_id_mask" descr="Large entry key ID mask\;0: ignore bit large_entry_key_id (always match)\;1: compare bit in large_entry_key_id\;Reserved when the region has 2, 4 or 6 key blocks\;Range 0 .. cap_max_pe_large_key_id- 1" access="INDEX" offset="0xE4.0" size="0x0.24" />
 	<field name="delta_start" descr="Start point of delta value and mask\;Units of bits\;Reserved when delta_mask = 0" access="INDEX" offset="0xF0.0" size="0x0.10" />
@@ -4112,7 +4293,7 @@
 	<field name="busy" descr="Busy:\;0: READY - can accept a new priority shift command\;1: BUSY - cannot accept a new priority shift command\;Regardless of region" access="RO" offset="0x0.31" size="0x0.1" />
 	<field name="ct_offset" descr="Offset within the C-TCAM region to start the priority shift\;Reserved when ct_size = 0" access="WO" offset="0x8.0" size="0x0.16" />
 	<field name="ct_size" descr="The number of rules in the C-TCAM to do the priority shift, \;starting from ct_offset" access="WO" offset="0xC.0" size="0x0.16" />
-	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region\;See Section 10.9.13, &quot;PTAR - Policy-Engine TCAM Alloca\;tion Register&quot;, on page 2482.\;This is the base region. All duplicated region_id&apos;s will be shifted \;as well. See Section 10.9.17, &quot;PERD - Policy-Engine \;Region Duplication Register&quot;, on page 2491See \;Section 2044, &quot;tcam_region_info Layout&quot;, on page 2536" subnode="tcam_region_info_peaps_ext" access="WO" offset="0x10.0" size="0x10.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region\;See Section 10.9.13, &quot;PTAR - Policy-Engine TCAM Allo\;cation Register&quot;, on page 2258.\;This is the base region. All duplicated region_id&apos;s will be \;shifted as well. See Section 10.9.17, &quot;PERD - Policy-\;Engine Region Duplication Register&quot;, on page 2267See \;Section 2201, &quot;tcam_region_info Layout&quot;, on page 2312" subnode="tcam_region_info_peaps_ext" access="WO" offset="0x10.0" size="0x10.0" />
 	<field name="priority_start" descr="Initial start priority\;For Spectrum-2 range is 1.. cap_kvd_size-1" access="WO" offset="0x20.0" size="0x0.24" />
 	<field name="priority_end" descr="Initial end priority\;Must be equal or greater than priority_start\;For Spectrum-2 range is 1.. cap_kvd_size-1" access="WO" offset="0x24.0" size="0x0.24" />
 	<field name="priority_inc" descr="2&apos;s complement value for priority increase or decrease" access="WO" offset="0x30.0" size="0x0.24" />
@@ -4120,21 +4301,21 @@
 
 <node name="pecb_ext" descr="" size="0x210.0" >
 	<field name="tfst" descr="Take First\;0: take last (in packet offset) extraction point (default)\;1: take first (in packet offset) extraction point\;Example1: L2-&gt;L3-&gt;UDP-&gt;FPH3-&gt;FPH3-&gt;FPH3\;Take the first or last FPH3\;Example2: IPv4-&gt;UDP. Take IPv4 (first) or UDP (last)\;Reserved when Spectrum (which supports only last)." access="RW" offset="0x0.0" size="0x0.1" />
-	<field name="cbset" descr="Custom Bytes Set\;Range 0 .. cap_max_custom_byte_sets-1\;See encoding in Table 2499, &quot;Spectrum Custom Bytes \;Sets,&quot; on page 3068" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="ext_point" descr="Extraction point protocol encoding\;Extraction point protocol encoding is define by Table 2503, \;&quot;Custom Bytes Extraction Points,&quot; on page 3071\;Example: ext_point &quot;IPv6 Payload&quot; is at index 11 (0xB)\;Maximum number of concurrent enabled extraction points per \;cbset is cap_max_ext_points\;See Table 2028, &quot;Extraction_point Layout,&quot; on page 2523" access="RW" high_bound="255" low_bound="0" offset="0x10.16" size="0x200.0" />
+	<field name="cbset" descr="Custom Bytes Set\;Range 0 .. cap_max_custom_byte_sets-1\;See encoding in Table 2712, &quot;Spectrum Custom Bytes \;Sets,&quot; on page 2862" access="INDEX" offset="0x4.0" size="0x0.8" />
+	<field name="ext_point" descr="Extraction point protocol encoding\;Extraction point protocol encoding is define by Table 2716, \;&quot;Custom Bytes Extraction Points,&quot; on page 2865\;Example: ext_point &quot;IPv6 Payload&quot; is at index 11 (0xB)\;Maximum number of concurrent enabled extraction points \;per cbset is cap_max_ext_points\;See Table 2185, &quot;Extraction_point Layout,&quot; on page 2300" access="RW" high_bound="255" low_bound="0" offset="0x10.16" size="0x200.0" />
 </node>
 
 <node name="peckc_ext" descr="" size="0x30.0" >
 	<field name="key" descr="Key:\;0: has_conf_et\;1: dscp_range\;2: or_tcp_control_or_ecn\;4: ipv6_custom_extension\;5: inner_ipv6_custom_extension\;6: ipv6_hbh_custom_option\;7: inner_ipv6_hbh_custom_option" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="index" descr="Index\;For example: dscp_range[2]: key=1, index=2\;Valid bits according to the key" access="INDEX" offset="0x4.0" size="0x0.8" />
 	<field name="attributes0" descr="Attributes per key:\;has_conf_et: ethertype, 16bits\;\;dscp_range: dscp_min, 6bits\;\;or_tcp_control_or_ecn: xor, 9bits\;\;ipv6_custom_extension: value, 8bits\;inner_ipv6_custom_extension: value, 8bits\;\;ipv6_hbh_custom_option: value, 8bits\;inner_ipv6_hbh_custom_option: value, 8bits" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
-	<field name="attributes1" descr="Attributes per key:\;has_conf_et: tag length\;\;dscp_range: dscp_max, 6bits\;\;or_tcp_control_or_ecn: mask, 9bits\;or_tcp_control_or_ecn[i] = ({tcp_control,tcp_ecn_bits} ^ xor) \;&amp; mask)\;\;ipv6_custom_extension: mask, 8bits\;inner_ipv6_custom_extension: mask, 8bits\;\;ipv6_hbh_custom_option: mask, 8bits\;inner_ipv6_hbh_custom_option: mask, 8bits" access="RW" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
+	<field name="attributes1" descr="Attributes per key:\;has_conf_et: tag length\;\;dscp_range: dscp_max, 6bits\;\;or_tcp_control_or_ecn: mask, 9bits\;or_tcp_control_or_ecn[i] = ({tcp_control,tcp_ecn_bits} ^ \;xor) &amp; mask)\;\;ipv6_custom_extension: mask, 8bits\;inner_ipv6_custom_extension: mask, 8bits\;\;ipv6_hbh_custom_option: mask, 8bits\;inner_ipv6_hbh_custom_option: mask, 8bits" access="RW" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
 </node>
 
 <node name="pecnee_ext" descr="" size="0x18.0" >
 	<field name="region_id" descr="Region identifier\;Range 0 .. cap_max_regions-1\;Note: the counter (PECNER) is always enabled. It is sug\;gested to clear the counter (PECNER.clear) after changing \;the region_id, erp_id_bitwise or ctcam" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="region_id_mask" descr="Region_id mask\;Per bit:\;0: ignore region_id relevant bit\;1: compare region_id relevant bit\;Can be used for a binary search on regions with high count \;values\;Range 0 .. 2^ (round_down(log2(cap_max_regions-1)) + 1)" access="RW" offset="0xC.0" size="0x0.16" />
-	<field name="erp_id_bitwise" descr="Erp ID to count on\;Value as bitwise. Can set either one erp or all erps. (e.g. \;value of b&apos;101 is not allowed).\;When more than 1 region is counted then all erps are \;counted\;Reserved when region_id_mask != FF&apos;s (more than 1 region)\;\;" access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="erp_id_bitwise" descr="Erp ID to count on\;Value as bitwise. Can set either one erp or all erps. (e.g. \;value of b&apos;101 is not allowed).\;When more than 1 region is counted then all erps are \;counted\;Reserved when region_id_mask != FF&apos;s (more than 1 \;region)\;\;" access="RW" offset="0x10.0" size="0x0.16" />
 	<field name="ctcam" descr="Count on C-TCAM\;When more than 1 region then all C-TCAM access are \;counted\;Reserved when region_id_mask != 0 (more than 1 region)" access="RW" offset="0x14.0" size="0x0.1" />
 </node>
 
@@ -4142,12 +4323,12 @@
 	<field name="clear" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="erp_initial_high" descr="ERP or C-TCAM is initial active after erpt_vector (phase 1)\;Note: if n (erps + ctcam) are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="erp_initial_low" descr="ERP or C-TCAM is initial active after erpt_vector (phase 1)\;Note: if n (erps + ctcam) are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="erp_post_bf_high" descr="ERP active after bloom filter (phase 2)\;Doesn&apos;t increment as C-TCAM\;Note: if n erps are enabled then the counter may increase by \;0..n for a given region lookup\;Note: when PERCR.bf_bypass=1 then this counter does not \;count." access="RO" offset="0x18.0" size="0x4.0" />
-	<field name="erp_post_bf_low" descr="ERP active after bloom filter (phase 2)\;Doesn&apos;t increment as C-TCAM\;Note: if n erps are enabled then the counter may increase by \;0..n for a given region lookup\;Note: when PERCR.bf_bypass=1 then this counter does not \;count." access="RO" offset="0x1C.0" size="0x4.0" />
+	<field name="erp_post_bf_high" descr="ERP active after bloom filter (phase 2)\;Doesn&apos;t increment as C-TCAM\;Note: if n erps are enabled then the counter may increase \;by 0..n for a given region lookup\;Note: when PERCR.bf_bypass=1 then this counter does \;not count." access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="erp_post_bf_low" descr="ERP active after bloom filter (phase 2)\;Doesn&apos;t increment as C-TCAM\;Note: if n erps are enabled then the counter may increase \;by 0..n for a given region lookup\;Note: when PERCR.bf_bypass=1 then this counter does \;not count." access="RO" offset="0x1C.0" size="0x4.0" />
 	<field name="erp_lookup_high" descr="ERP or CTCAM had a lookup - active after bloom filter and \;pruning (phase 3)\;Note: if n erps + ctcam are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x20.0" size="0x4.0" />
 	<field name="erp_lookup_low" descr="ERP or CTCAM had a lookup - active after bloom filter and \;pruning (phase 3)\;Note: if n erps + ctcam are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="erp_any_match_high" descr="ERP or CTCAM had a match (not yet a final match - later pri\;ority will choose the final)\;Note: if n erps + ctcam are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x28.0" size="0x4.0" />
-	<field name="erp_any_match_low" descr="ERP or CTCAM had a match (not yet a final match - later pri\;ority will choose the final)\;Note: if n erps + ctcam are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x2C.0" size="0x4.0" />
+	<field name="erp_any_match_high" descr="ERP or CTCAM had a match (not yet a final match - later \;priority will choose the final)\;Note: if n erps + ctcam are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x28.0" size="0x4.0" />
+	<field name="erp_any_match_low" descr="ERP or CTCAM had a match (not yet a final match - later \;priority will choose the final)\;Note: if n erps + ctcam are enabled then the counter may \;increase by 0..n for a given region lookup" access="RO" offset="0x2C.0" size="0x4.0" />
 	<field name="erp_final_match_high" descr="ERP or CTCAM had a final match\;Note: the counter may increase by 0..1 for a given region \;lookup" access="RO" offset="0x30.0" size="0x4.0" />
 	<field name="erp_final_match_low" descr="ERP or CTCAM had a final match\;Note: the counter may increase by 0..1 for a given region \;lookup" access="RO" offset="0x34.0" size="0x4.0" />
 </node>
@@ -4159,27 +4340,27 @@
 
 <node name="pecnrr_ext" descr="" size="0x20.0" >
 	<field name="clear" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="tcam_trigger_high" descr="Count number of tcam triggers (bind to ACL group)\;For example: if a packet has iACL and eirfACL then inc by 2\;Note: packets from CPU ingress are not counted" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="tcam_trigger_low" descr="Count number of tcam triggers (bind to ACL group)\;For example: if a packet has iACL and eirfACL then inc by 2\;Note: packets from CPU ingress are not counted" access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="tcam_trigger_high" descr="Count number of tcam triggers (bind to ACL group)\;For example: if a packet has iACL and eirfACL then inc by \;2\;Note: packets from CPU ingress are not counted" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="tcam_trigger_low" descr="Count number of tcam triggers (bind to ACL group)\;For example: if a packet has iACL and eirfACL then inc by \;2\;Note: packets from CPU ingress are not counted" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="tcam_full_lookup_high" descr="Count number of tcam triggers which needed a full lookup\;\;Note: packets from CPU ingress are not counted\;" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="tcam_full_lookup_low" descr="Count number of tcam triggers which needed a full lookup\;\;Note: packets from CPU ingress are not counted\;" access="RO" offset="0x1C.0" size="0x4.0" />
 </node>
 
 <node name="pefa_ext" descr="" size="0xb0.0" >
-	<field name="index" descr="Index in the KVD Linear Centralized Database. For more \;details \;see Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)\;Range is 0.. cap_max_kvd_action_sets - 1" access="INDEX" offset="0x0.0" size="0x0.24" />
-	<field name="pind" descr="Partial Index\;Used for partial action set\;0: full action set\;1: double partial action sets \;2: partial action set, partial index 0\;3: partial action set, partial index 1\;Note that &quot;full action set&quot; and &quot;partial action set, partial index \;0&quot; have the same pointer but different indexes\;Reserved when Spectrum" access="INDEX" offset="0x0.30" size="0x0.2" />
+	<field name="index" descr="Index in the KVD Linear Centralized Database. For more \;details \;see Appendix A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot; (page 3097)\;Range is 0.. cap_max_kvd_action_sets - 1" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="pind" descr="Partial Index\;Used for partial action set\;0: full action set\;1: double partial action sets \;2: partial action set, partial index 0\;3: partial action set, partial index 1\;Note that &quot;full action set&quot; and &quot;partial action set, partial \;index 0&quot; have the same pointer but different indexes\;Reserved when Spectrum" access="INDEX" offset="0x0.30" size="0x0.2" />
 	<field name="as_user_val" descr="Action set user value\;Can be used for activity dump, see PEFAAD\;Note: for partial action sets, both action sets in the same \;index have the same as_user_val\;Reserved when ddd_en = 1\;Reserved when Spectrum\;" access="RW" offset="0x4.0" size="0x0.10" />
 	<field name="ddd_en" descr="The action is DDD enabled\;Note that action DDD must be enabled if (1) DDD is enabled \;for actions and (2) the action is pointed by a ddd priority.\;See IDDD and IGCR.ddd_pe_actions_priority\;Note: for partial action sets, both action sets in the same \;index have the same ddd_en\;" access="RW" offset="0x4.20" size="0x0.1" />
 	<field name="ca" descr="Clear activity:\;When write: \;0: activity is set\;1: activity is cleared\;2: activity is maintained (used for updating)\;When read:\;0, 2: activity is maintained\;1: after reading the activity is cleared\;Reserved when Spectrum\;When pind=1 then applies to both partials" access="OP" offset="0x4.24" size="0x0.2" />
 	<field name="a1" descr="Activity of partial1\;Reserved when pind = 0 or pind = 2" access="RO" offset="0x4.28" size="0x0.1" />
 	<field name="a" descr="Activity of full or partial0\;For a new entry: set if ca=0, clear if ca=1\;Set if a packet lookup has hit on the specific entry\;Reserved when Spectrum\;When pind=&quot;double partial&quot; then applies to partial 0\;Reserved when pind = 3\;" access="RO" offset="0x4.29" size="0x0.1" />
-	<field name="flexible_action_set" descr="Action-set to perform when rule is matched.\;See Section 10.8, &quot;Flexible ACL Action Set&quot;, on \;page 2388.\;Must be zero padded if action set is shorter." access="RW" high_bound="41" low_bound="0" offset="0x8.0" size="0xa8.0" />
+	<field name="flexible_action_set" descr="Action-set to perform when rule is matched.\;See Section 10.8, &quot;Flexible ACL Action Set&quot;, on \;page 2150.\;Must be zero padded if action set is shorter." access="RW" high_bound="41" low_bound="0" offset="0x8.0" size="0xa8.0" />
 </node>
 
 <node name="pefaad_ext" descr="" size="0x420.0" >
 	<field name="filter_fields" descr="Filter Fields:\;if a bit is &apos;0&apos; then the relevant field is ignored and dump is \;done regardless of the field value\;Bit0: filter by activity: entry_a\;Bit1: filter by action set user value: as_user_val when \;ddd_en=0\;All set filters are relevant (there is AND between the filters)\;Reserved when op is Clear activity" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="num_rec" descr="At request: number of records requested\;At response: number of records dumped\;Range for request is 1..256\;Range for response is 0..256" access="OP" offset="0x4.0" size="0x0.9" />
-	<field name="op" descr="Operation\;0: Dump entries\;1: Dump entries and force end of session (clear activity will \;clear this session while next dump will be a new session)\;2: Clear activity for all entries which were dumped in the cur\;rent session" access="OP" offset="0x4.24" size="0x0.2" />
+	<field name="op" descr="Operation\;0: Dump entries\;1: Dump entries and force end of session (clear activity will \;clear this session while next dump will be a new session)\;2: Clear activity for all entries which were dumped in the \;current session" access="OP" offset="0x4.24" size="0x0.2" />
 	<field name="entry_a" descr="Dump only if activity has value of entry_a\;Reserved when filter_fields bit0 is &apos;0&apos;" access="INDEX" offset="0x8.16" size="0x0.1" />
 	<field name="as_user_val" descr="Action set user value\;Reserved when ddd_en = 1\;Reserved when filter_fields bit1 is &apos;0&apos;" access="INDEX" offset="0x10.0" size="0x0.10" />
 	<field name="index_dump" descr="Dumped index\;For Spectrum-2 pointer to policy engine actions array which \;is in the KVH Linear." subnode="index_dump" access="RO" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
@@ -4200,7 +4381,7 @@
 
 <node name="perar_ext" descr="" size="0x8.0" >
 	<field name="region_id" descr="Region identifier\;Range 0 .. cap_max_regions-1" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="hw_region" descr="HW Region\;Range 0 .. cap_max_regions-1\;Spectrum-2 note: \;- For a 8 key block region, 2 consecutive regions are used\;- For a 12 key block region, 3 consecutive regions are used\;- For sensitivity (PACL.acl_type != 0): if any region (in the sen\;sitivity) is 2 then all regions (in the sensitivity) are 2, if any \;region (in the sensitivity) is 3 then all regions (in the sensitiv\;ity) are 3\;" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="hw_region" descr="HW Region\;Range 0 .. cap_max_regions-1\;Spectrum-2 note: \;- For a 8 key block region, 2 consecutive regions are used\;- For a 12 key block region, 3 consecutive regions are used\;- For sensitivity (PACL.acl_type != 0): if any region (in the \;sensitivity) is 2 then all regions (in the sensitivity) are 2, if \;any region (in the sensitivity) is 3 then all regions (in the \;sensitivity) are 3\;" access="RW" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="perb_ext" descr="" size="0x120.0" >
@@ -4209,8 +4390,8 @@
 	<field name="op" descr="0: Bind ACL to Routing Interface\;1: Unbind ACL from Routing Interface (default)" access="RW" offset="0x4.0" size="0x0.2" />
 	<field name="group_id" descr="ACL group identifier (acl_group_id)\;Range of group id is 0..cap_max_acl_groups-1\;Note: the group_id must be configured prior to enabling mc \;router" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="cmu" descr="Classifier Mask Underlay:\;0: regular classifier\;1: mask (ignore) underlay (inner_ prefix) fields if no underlay\;" access="RW" offset="0xC.0" size="0x0.1" />
-	<field name="cmo" descr="Classifier Mask Overlay:\;0: regular classifier\;1: mask (ignore) overlay (no inner_ prefix) fields if underlay exists\;" access="RW" offset="0xC.1" size="0x0.1" />
-	<field name="classifier_entry" descr="Classifier entry, related to pipe_stage:\;Table 1938, &quot;PERB classifier_iport Layout,&quot; on page 2468" access="RW" high_bound="63" low_bound="0" offset="0x20.0" size="0x100.0" />
+	<field name="cmo" descr="Classifier Mask Overlay:\;0: regular classifier\;1: mask (ignore) overlay (no inner_ prefix) fields if underlay \;exists\;" access="RW" offset="0xC.1" size="0x0.1" />
+	<field name="classifier_entry" descr="Classifier entry, related to pipe_stage:\;Table 2095, &quot;PERB classifier_iport Layout,&quot; on page 2242" access="RW" high_bound="63" low_bound="0" offset="0x20.0" size="0x100.0" />
 </node>
 
 <node name="perbeg_ext" descr="" size="0x10.0" >
@@ -4229,8 +4410,8 @@
 	<field name="region_id" descr="Region identifier\;Range 0 .. cap_max_regions-1" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="bf_bypass" descr="Bloom filter bypass\;0: Bloom filter is used (default)\;1: Bypass BF, erps are used regardless of bloom filter\;The bypass is an OR condition of region_id or erp. See \;PERPT.bf_bypass\;\;Reserved when SwitchX/-2 and Spectrum" access="RW" offset="0x4.16" size="0x0.1" />
 	<field name="ctcam_ignore_prune" descr="Ignore prune_ctcam by other A-TCAM rules\;Used e.g. for a new rule" access="RW" offset="0x4.24" size="0x0.1" />
-	<field name="atcam_ignore_prune" descr="Ignore prune_vector by other A-TCAM rules\;Used e.g. for a new rule\;See PGCR.atcam_ignore_prune_vector, See Section 10.9.1, \;&quot;PGCR - Policy-Engine General Configuration Register&quot;, \;on page 2459" access="RW" offset="0x4.25" size="0x0.1" />
-	<field name="master_mask" descr="Master mask, mask the ERPs, the delta_masks and the C-\;TCAM lookup.\;When there are no erp&apos;s (erpt_pointer_valid = 0) then this pro\;vides the mask\;Per bit:\;0: TCAM will ignore the bit in key\;1: TCAM will compare the bit in key\;Reserved when SwitchX/-2 and Spectrum\;\;" access="RW" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
+	<field name="atcam_ignore_prune" descr="Ignore prune_vector by other A-TCAM rules\;Used e.g. for a new rule\;See PGCR.atcam_ignore_prune_vector, See \;Section 10.9.1, &quot;PGCR - Policy-Engine General Config\;uration Register&quot;, on page 2233" access="RW" offset="0x4.25" size="0x0.1" />
+	<field name="master_mask" descr="Master mask, mask the ERPs, the delta_masks and the C-\;TCAM lookup.\;When there are no erp&apos;s (erpt_pointer_valid = 0) then this \;provides the mask\;Per bit:\;0: TCAM will ignore the bit in key\;1: TCAM will compare the bit in key\;Reserved when SwitchX/-2 and Spectrum\;\;" access="RW" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
 </node>
 
 <node name="perd_ext" descr="" size="0x50.0" >
@@ -4242,19 +4423,27 @@
 <node name="pererp_ext" descr="" size="0x1c.0" >
 	<field name="region_id" descr="Region identifier\;Range 0 .. cap_max_regions-1" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="ctcam_le" descr="C-TCAM Lookup enable\;Reserved when erpt_pointer_valid = 0\;" access="RW" offset="0x4.28" size="0x0.1" />
-	<field name="erpt_pointer" descr="Pointer to erp table within the erp bank\;Can be changed for an existing region\;Range is 0.. cap_max_erp_table_size-1\;Reserved when erpt_pointer_valid = 0\;Note: the erpt_pointer can have the same value for different \;ACLs. However, the erpt_pointer must not point to a mid-\;entry of different ACL (e.g. if ACL1 uses erpt_pointer 100 with \;vector of 8 lsbs then ACL2 must not point to the range \;101..107)" access="RW" offset="0x10.0" size="0x0.8" />
+	<field name="erpt_pointer" descr="Pointer to erp table within the erp bank\;Can be changed for an existing region\;Range is 0.. cap_max_erp_table_size-1\;Reserved when erpt_pointer_valid = 0\;Note: the erpt_pointer can have the same value for different \;ACLs. However, the erpt_pointer must not point to a mid-\;entry of different ACL (e.g. if ACL1 uses erpt_pointer 100 \;with vector of 8 lsbs then ACL2 must not point to the range \;101..107)" access="RW" offset="0x10.0" size="0x0.8" />
 	<field name="erpt_bank_pointer" descr="Pointer to erp table bank\;Note: May be modified any time\;Range 0 .. cap_max_erp_table_banks-1\;Reserved when erpt_pointer_valid = 0" access="RW" offset="0x10.16" size="0x0.4" />
 	<field name="ctcam_only" descr="C-TCAM only\;Lookup only in C-CTAM\;Reserved when erpt_pointer_valid = 1\;\;" access="RW" offset="0x10.30" size="0x0.1" />
-	<field name="erpt_pointer_valid" descr="erpt_pointer is valid:\;0: exact match, erpt_pointer is not valid\;1: use erps, erpt_pointer is valid\;The non valid erpt is used as follows:\;- if ctcam_only = 0 then lookup only 1 time in A-TCAM, without \;erp, using master_mask. a.k.a. exact-match. No C-TCAM \;lookup\;- if ctcam_only = 1 then lookup only in C-TCAM, without erp\;" access="RW" offset="0x10.31" size="0x0.1" />
+	<field name="erpt_pointer_valid" descr="erpt_pointer is valid:\;0: exact match, erpt_pointer is not valid\;1: use erps, erpt_pointer is valid\;The non valid erpt is used as follows:\;- if ctcam_only = 0 then lookup only 1 time in A-TCAM, with\;out erp, using master_mask. a.k.a. exact-match. No C-\;TCAM lookup\;- if ctcam_only = 1 then lookup only in C-TCAM, without erp\;" access="RW" offset="0x10.31" size="0x0.1" />
 	<field name="erpt_vector" descr="Vector of allowed erp_indexes starting from erpt_pointer \;withing the erpt_bank_pointer\;Note that the allow is on erp_index and not on erp_id\;Used for speeding the lookups \;Next entries will be in next bank\;\;Reserved when erpt_pointer_valid = 0" access="RW" offset="0x14.0" size="0x0.16" />
 	<field name="master_rp_id" descr="Master RP ID\;When there are no erp&apos;s then this provide the erp_id for the \;lookup\;Reserved when erpt_pointer_valid = 1\;Can be changed for an existing region\;" access="RW" offset="0x18.0" size="0x0.4" />
 </node>
 
+<node name="performance_counter_info_ext" descr="" size="0x10.0" >
+	<field name="hw_unit_id" descr="Defines from which HW unit to collect the counters. For \;more info see Table 791, &quot;Spectrum-2 Counter HW \;Unit Id List,&quot; on page 951" access="RO" offset="0x0.0" size="0x0.8" />
+	<field name="hw_unit_instance" descr="HW unit instance id" access="RO" offset="0x0.16" size="0x0.8" />
+	<field name="hw_unit_sub_instance" descr="HW unit sub instance id" access="RO" offset="0x4.0" size="0x0.8" />
+	<field name="counter_index" descr="Counter index" access="RO" offset="0x4.16" size="0x0.9" />
+	<field name="counter_value" descr="Counter value" subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
+</node>
+
 <node name="perpt_ext" descr="" size="0x80.0" >
 	<field name="erpt_index" descr="Index to erp table within the erp bank\;Within an erp range pointed by an ACL the lower entries are \;searched before higher entries.\;Range is 0.. cap_max_erp_table_bank_size-1" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="erpt_bank" descr="Erp table bank\;Range 0 .. cap_max_erp_table_banks-1" access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="key_size" descr="0: 2 key blocks \;1: 4 key blocks \;2: 8 key blocks \;3: 12 key blocks" access="OP" offset="0x4.0" size="0x0.4" />
-	<field name="erp_id" descr="erp ID for use by the rules\;Note that the erp_id may be modified by SW, even when the erp \;is in use\;" access="RW" offset="0x8.0" size="0x0.4" />
+	<field name="erp_id" descr="erp ID for use by the rules\;Note that the erp_id may be modified by SW, even when the \;erp is in use\;" access="RW" offset="0x8.0" size="0x0.4" />
 	<field name="bf_bypass" descr="Bloom Filter bypass\;0: This erp is used only if bloom filter state is set for the given \;rule \;1: This erp is used regardless of bloom filter state\;The bypass is an OR condition of region_id or erp. See \;PERCR.bf_bypass\;" access="RW" offset="0x8.8" size="0x0.1" />
 	<field name="erpt_base_index" descr="Base Index to erp table within the erp bank\;Must align to erp_index_in_vector\;Range is 0.. cap_max_erp_table_bank_size-1" access="OP" offset="0xC.0" size="0x0.8" />
 	<field name="erpt_base_bank" descr="Base Erp table bank, points to head of erp_vector\;Must align to erp_index_in_vector\;Range 0 .. cap_max_erp_table_banks-1" access="OP" offset="0xC.16" size="0x0.4" />
@@ -4273,50 +4462,50 @@
 	<field name="index" descr="Counter set index" access="INDEX" offset="0x0.0" size="0x0.9" />
 	<field name="type" descr="Counter type:\;0: Bytes_counter\;1: Packets_counter\;" access="RW" enum="Bytes_counter=0x0,Packets_counter=0x1" offset="0x0.24" size="0x0.2" />
 	<field name="op" descr="Operation:\;0: NOP\;1: Allocate\;2: Test\;3: Free" access="WO" enum="NOP=0x0,Allocate=0x1,Test=0x2,Free=0x3" offset="0x0.30" size="0x0.2" />
-	<field name="counter_set" descr="Opaque object that represents the flow counter. Returned \;when allocating counter. Provided by software for action-set \;binding or any other counter operation." access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="counter_set" descr="Opaque object that represents the flow counter. Returned \;when allocating counter. Provided by software for action-\;set binding or any other counter operation." access="RO" offset="0x8.0" size="0x4.0" />
 </node>
 
 <node name="pfcc_reg_ext" descr="" size="0x20.0" >
-	<field name="shl_opr" descr="Send to higher layers operation:\;0: Pause and PFC are handled by the port (default)\;1: Pause and PFC are handled by the port and are also been \;send to higher layers.\;Only valid if shl_cap = 1." access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="shl_opr" descr="Send to higher layers operation:\;0: Pause and PFC are handled by the port (default)\;1: Pause and PFC are handled by the port and are also \;been send to higher layers.\;Only valid if shl_cap = 1." access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="shl_cap" descr="Send to higher layers capabilities:\;0: No capability of sending Pause and PFC to higher layers\;1: Device has capability of send Pause and PFC to higher \;layers\;NOTE: This relates to IEEE 802.3 PAUSE and IEEE 802.3 \;PFC." access="RO" offset="0x0.1" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
-	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0: Local port number\;1: IB / label port number\;[Internal] 3: Out of band / PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
+	<field name="pnat" descr="Port number access type. determines the way local_port \;is interpreted:\;0: Local port number\;1: IB / label port number\;[Internal] 3: Out of band / PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="prio_mask_rx" descr="Bit per prio indicating if RX flow control policy should be \;updated based on bit pfcrx ." access="WO" offset="0x4.0" size="0x0.8" />
 	<field name="prio_mask_tx" descr="Bit per prio indicating if TX flow control policy should be \;updated based on bit pfctx ." access="WO" offset="0x4.16" size="0x0.8" />
 	<field name="ppan" descr="Pause policy auto negotiation\;0: disabled - generate and ignore pause frames based on \;pptx, pprx\;1: enabled - when auto-negotiation is performed, set the \;pause policy based on the auto-negotiation resolution.\;\;" access="RW" enum="disabled=0x0,enabled=0x1" offset="0x4.28" size="0x0.4" />
-	<field name="pfctx" descr="Priority based flow control policy on TX[7:0]. Per priority bit \;mask:\;0: never generate pause frames on the specified priority \;(default)\;1: generate pause frames according to RX buffer threshold \;on the specified priority\;pfctx, pptx must be mutually exclusive (for example, only one \;of them at most can be set)." access="RW" offset="0x8.16" size="0x0.8" />
+	<field name="pfctx" descr="Priority based flow control policy on TX[7:0]. Per priority bit \;mask:\;0: never generate pause frames on the specified priority \;(default)\;1: generate pause frames according to RX buffer threshold \;on the specified priority\;pfctx, pptx must be mutually exclusive (for example, only \;one of them at most can be set)." access="RW" offset="0x8.16" size="0x0.8" />
 	<field name="aptx" descr="Active (operational) pause policy on TX\;0: do not generate pause frames\;1: generate pause frames according to RX buffer threshold" access="RO" offset="0x8.30" size="0x0.1" />
 	<field name="pptx" descr="Admin pause policy on TX (see also pfctx):\;0: never generate pause frames (default)\;1: generate pause frames according to RX buffer threshold" access="RW" offset="0x8.31" size="0x0.1" />
-	<field name="pfcrx" descr="Priority based flow control policy on RX[7:0]. Per priority bit \;mask:\;0: ignore incoming pause frames on the specified priority \;(default)\;1: respect incoming pause frames on the specified priority" access="RW" offset="0xC.16" size="0x0.8" />
+	<field name="pfcrx" descr="Priority based flow control policy on RX[7:0]. Per priority \;bit mask:\;0: ignore incoming pause frames on the specified priority \;(default)\;1: respect incoming pause frames on the specified priority" access="RW" offset="0xC.16" size="0x0.8" />
 	<field name="aprx" descr="Active (operational) pause policy on RX\;0: ignore received pause frames\;1: respect received pause frames" access="RO" offset="0xC.30" size="0x0.1" />
 	<field name="pprx" descr="Admin pause policy on RX (see also pfcrx):\;0: ignore received pause frames (default)\;1: respect received pause frames" access="RW" offset="0xC.31" size="0x0.1" />
 </node>
 
 <node name="pfcnt_ext" descr="" size="0x20.0" >
 	<field name="counter_set" descr="Counter Set Identifier.\;For SwitchX and SwitchX-2: an opaque object provided upon \;allocation of a counter set and used to identify the flow \;counter to access." access="INDEX" offset="0x0.0" size="0x4.0" />
-	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter value \;for relevant flow counter. \;Note: This bit can be set for both Write() and Read() operation \;to enable clear on read operation." access="OP" offset="0x4.31" size="0x0.1" />
+	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter \;value for relevant flow counter. \;Note: This bit can be set for both Write() and Read() opera\;tion to enable clear on read operation." access="OP" offset="0x4.31" size="0x0.1" />
 	<field name="flow_counter_0" descr="Flow counter value" access="RO" high_bound="5" low_bound="0" offset="0x8.0" size="0x18.0" />
 </node>
 
 <node name="pfsc_reg_ext" descr="" size="0x10.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="fwd_admin" descr="Administratively configured of Forward switching for Egress:\;0: Allow cut-through forwarding\;1: Always Store and Forward" access="RW" offset="0x4.0" size="0x0.4" />
+	<field name="fwd_admin" descr="Administratively configured of Forward switching for \;Egress:\;0: Allow cut-through forwarding\;1: Always Store and Forward" access="RW" offset="0x4.0" size="0x0.4" />
 	<field name="fwd_oper" descr="Operational Egress Forward switching:\;0: Cut-Through forwarding operation is allowed\;1: Only Store and Forward operation" access="RO" offset="0x8.0" size="0x0.4" />
 </node>
 
 <node name="pgcr_ext" descr="" size="0x20.0" >
 	<field name="pbs_table_size" descr="Number of PBS entries. This is a settable capability.\;Reserved when Spectrum/-2\;" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="update_prune" descr="Update atcam_ignore_prune_vector only\;0: update all fields including atcam_ignore_prune_vector\;1: update only atcam_ignore_prune_vector\;Reserved when SwitchX/-2 and Spectrum" access="OP" offset="0x0.31" size="0x0.1" />
+	<field name="update_prune" descr="Update atcam_ignore_prune_vector only\;0: update all fields including atcam_ignore_prune_vec\;tor\;1: update only atcam_ignore_prune_vector\;Reserved when SwitchX/-2 and Spectrum" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="max_iacl" descr="Max Ingress ACL\;Maximum number of Ingress ACLs\;Reserved when Spectrum/-2" access="RO" offset="0x8.0" size="0x0.16" />
 	<field name="max_eacl" descr="Max Egress ACL\;Maximum number of Egress ACLs\;Reserved when Spectrum/-2" access="RO" offset="0x8.16" size="0x0.16" />
 	<field name="atcam_ignore_prune_vector" descr="When atcam_ignore_prune is set for a region, then the \;ignore is for ERP IDs according to this vector\;Each bit is per ERP ID\;0: do not ignore erp prune\;1: ignore erp prune\;\;Reserved when SwitchX/-2 and Spectrum\;" access="RW" offset="0x14.0" size="0x0.16" />
-	<field name="default_action_pointer_base" descr="Default action pointer base\;Each region has a default action pointer which is equal to:\;default_action_pointer_base + region_id\;For Spectrum-2 pointer to policy engine actions array \;which is in the KVH Linear.\;Notes: \;1. may be changed on the fly, need fence to release old \;action entries\;2. pointer either to full action-set or to partial pointer 0\;3. when a multi-ACL the first region_id is used for all \;regions of the multi-ACL\;4. User must not set actions in the range of (default_ac\;tion_pointer_base+cap_max_regions) ... (default_ac\;tion_pointer_base+cap_max_default_actions-1)" access="RW" offset="0x1C.0" size="0x0.24" />
+	<field name="default_action_pointer_base" descr="Default action pointer base\;Each region has a default action pointer which is equal \;to:\;default_action_pointer_base + region_id\;For Spectrum-2 pointer to policy engine actions array \;which is in the KVH Linear.\;Notes: \;1. may be changed on the fly, need fence to release old \;action entries\;2. pointer either to full action-set or to partial pointer 0\;3. when a multi-ACL the first region_id is used for all \;regions of the multi-ACL\;4. User must not set actions in the range of (default_ac\;tion_pointer_base+cap_max_regions) ... (default_ac\;tion_pointer_base+cap_max_default_actions-1)" access="RW" offset="0x1C.0" size="0x0.24" />
 </node>
 
-<node name="pgmr_ext" descr="" size="0x18.0" >
-	<field name="pg_sel" descr="Selection between an operation on a local port or a group, \;for &apos;set&apos; and &apos;get&apos; operations. \;0 - local port (group field is neglected even if set)\;1 - group (local_port field is neglected even if set)" access="OP" offset="0x0.0" size="0x0.1" />
+<node name="pgmr_ext" descr="" size="0x2c.0" >
+	<field name="pg_sel" descr="Selection between an operation on a local port or a group, for \;&apos;set&apos; and &apos;get&apos; operations. \;0 - local port (group field is neglected even if set)\;1 - group (local_port field is neglected even if set)" access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main\;5 - USR Tile\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="group" descr="Group number" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
@@ -4325,7 +4514,7 @@
 	<field name="version" descr="0 - 16nm products" access="RO" offset="0x0.24" size="0x0.4" />
 	<field name="status" descr="0 - Invalid\;1 - Valid" access="RO" offset="0x0.28" size="0x0.4" />
 	<field name="group_of_port" descr="The corresponding group number for the local_port" access="RW" offset="0x4.4" size="0x0.4" />
-	<field name="ports_mapping_of_group" descr="A bit map of all available local ports in the system (each bit \;represents a local port). \;The corresponding bits which represent the local ports for \;the specific group in the group field, are set to &apos;1&apos;.\;If set to &apos;0&apos; - not in that specific group or not available." access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
+	<field name="ports_mapping_of_group" descr="A bit map of all available local ports in the system (each bit \;represents a local port). \;The corresponding bits which represent the local ports for \;the specific group in the group field, are set to &apos;1&apos;.\;If set to &apos;0&apos; - not in that specific group or not available.\;Bit 0 - local_port 1\;Bit 1 - local_port 2\;..." access="RW" high_bound="8" low_bound="0" offset="0x8.0" size="0x24.0" />
 </node>
 
 <node name="phbr_binding_reg_ext" descr="" size="0x1c.0" >
@@ -4339,7 +4528,7 @@
 	<field name="mode" descr="Mode:\;0: Linear histogram\;1: Exponential histogram" access="RW" offset="0x8.28" size="0x0.3" />
 	<field name="hist_parameters" descr="According to hist_type\;" access="RW" offset="0xC.0" size="0x4.0" />
 	<field name="hist_min_value" descr="Min value for histogram main range\;Units according to the units of the hist_type\;must be greater than zero." access="RW" offset="0x10.0" size="0x4.0" />
-	<field name="hist_max_value" descr="Max value for histogram main range\;\;NOTE: for Spectrum device the following rules must be met:\;1. hist_max_value = hist_min_value + 2^n, n &gt;= 3\;2. hist_max_value &lt; 2^29\;Units according to the units of the hist_type" access="RW" offset="0x14.0" size="0x4.0" />
+	<field name="hist_max_value" descr="Max value for histogram main range\;\;NOTE: for Spectrum device the following rules must be \;met:\;1. hist_max_value = hist_min_value + 2^n, n &gt;= 3\;2. hist_max_value &lt; 2^29\;Units according to the units of the hist_type" access="RW" offset="0x14.0" size="0x4.0" />
 	<field name="sample_time" descr="Sample time interval. \;Allowed range for Switch-IB and Spectrum:\;time = 2^sample_time * 128nSec\;sample_time range is 0..cap_max_sample_time-1" access="RW" offset="0x18.0" size="0x0.6" />
 </node>
 
@@ -4353,8 +4542,8 @@
 	<field name="pnat" descr="Port number access type:\;0: Local_port_number\;1: IB_port_number" access="INDEX" enum="Local_port_number=0x0,IB_port_number=0x1" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="local_port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="opcode" descr="Opcode:\;0: Query the number of histogram columns.\;1: Set the range for each of the columns." access="RW" offset="0x0.29" size="0x0.3" />
-	<field name="num_err_cntrs" descr="Number of counters that are available for counting errors per \;each of the ports." access="RO" offset="0x4.0" size="0x0.5" />
-	<field name="err_cnt_column_range_0" descr="Configuration per each of the counters\;See Table 1383, &quot;PHCR - Port Histogram Counter Con\;figuration Layout,&quot; on page 1975" subnode="phcr_err_cnt_column_range_ext" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="num_err_cntrs" descr="Number of counters that are available for counting errors \;per each of the ports." access="RO" offset="0x4.0" size="0x0.5" />
+	<field name="err_cnt_column_range_0" descr="Configuration per each of the counters\;See Table 1520, &quot;PHCR - Port Histogram Counter \;Configuration Layout,&quot; on page 1768" subnode="phcr_err_cnt_column_range_ext" access="RW" offset="0xC.0" size="0x4.0" />
 </node>
 
 <node name="phrr_reg_ext" descr="" size="0x60.0" >
@@ -4363,7 +4552,7 @@
 	<field name="local_port" descr="local_port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="clr" descr="Clear:\;1: Clear the data in the histogram agent" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="hist_id" descr="see PHBR" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used for \;the hist_id\;Max bins is according to cap_hist_num_bins" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x10.0" size="0x50.0" />
+	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x10.0" size="0x50.0" />
 </node>
 
 <node name="phys_layer_cntrs_ext" descr="" size="0xf8.0" >
@@ -4397,8 +4586,8 @@
 	<field name="fc_fec_uncorrectable_blocks_lane2_low" descr="Perf.PortExtendedSpeedsCounters(FECCor\;rectableBlockCounterLane2)\;[Internal] supported in USR - ZL FEC" access="RO" offset="0x6C.0" size="0x4.0" />
 	<field name="fc_fec_uncorrectable_blocks_lane3_high" descr="Perf.PortExtendedSpeedsCounters(FECCor\;rectableBlockCounterLane3)\;[Internal] supported in USR - ZL FEC" access="RO" offset="0x70.0" size="0x4.0" />
 	<field name="fc_fec_uncorrectable_blocks_lane3_low" descr="Perf.PortExtendedSpeedsCounters(FECCor\;rectableBlockCounterLane3)\;[Internal] supported in USR - ZL FEC" access="RO" offset="0x74.0" size="0x4.0" />
-	<field name="rs_fec_corrected_blocks_high" descr="Perf.PortExtendedSpeedsCounters(FECCor\;recableBlockCounter)" access="RO" offset="0x78.0" size="0x4.0" />
-	<field name="rs_fec_corrected_blocks_low" descr="Perf.PortExtendedSpeedsCounters(FECCor\;recableBlockCounter)" access="RO" offset="0x7C.0" size="0x4.0" />
+	<field name="rs_fec_corrected_blocks_high" descr="Perf.PortExtendedSpeedsCounters(FECCorre\;cableBlockCounter)" access="RO" offset="0x78.0" size="0x4.0" />
+	<field name="rs_fec_corrected_blocks_low" descr="Perf.PortExtendedSpeedsCounters(FECCorre\;cableBlockCounter)" access="RO" offset="0x7C.0" size="0x4.0" />
 	<field name="rs_fec_uncorrectable_blocks_high" descr="Perf.PortExtendedSpeedsCounters(FEUncor\;recableBlockCounter)" access="RO" offset="0x80.0" size="0x4.0" />
 	<field name="rs_fec_uncorrectable_blocks_low" descr="Perf.PortExtendedSpeedsCounters(FEUncor\;recableBlockCounter)" access="RO" offset="0x84.0" size="0x4.0" />
 	<field name="rs_fec_no_errors_blocks_high" descr="The number of RS-FEC blocks received that \;had no errors.\;Note: Total rs_fec blocks received = \;rs_fec_corrected_blocks + rs_fec_uncorrect\;able_blocks + rs_fec_no_errors_blocks" access="RO" offset="0x88.0" size="0x4.0" />
@@ -4413,6 +4602,14 @@
 	<field name="rs_fec_corrected_symbols_lane2_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane2)" access="RO" offset="0xB4.0" size="0x4.0" />
 	<field name="rs_fec_corrected_symbols_lane3_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane3)" access="RO" offset="0xB8.0" size="0x4.0" />
 	<field name="rs_fec_corrected_symbols_lane3_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane3)" access="RO" offset="0xBC.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane4_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane4)" access="RO" offset="0xC8.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane4_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane4)" access="RO" offset="0xCC.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane5_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane5)" access="RO" offset="0xD0.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane5_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane5)" access="RO" offset="0xD4.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane6_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane6)" access="RO" offset="0xD8.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane6_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane6)" access="RO" offset="0xDC.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane7_high" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane7)" access="RO" offset="0xE0.0" size="0x4.0" />
+	<field name="rs_fec_corrected_symbols_lane7_low" descr="Perf.PortExtendedSpeedCounters(FECCor\;rectedSymbolCounterLane7)" access="RO" offset="0xE4.0" size="0x4.0" />
 </node>
 
 <node name="phys_layer_stat_cntrs_ext" descr="" size="0xf8.0" >
@@ -4420,48 +4617,48 @@
 	<field name="time_since_last_clear_low" descr="The time passed since the last counters clear \;event in msec.\;" access="RO" offset="0x4.0" size="0x4.0" />
 	<field name="phy_received_bits_high" descr="This counter provides information on the total \;amount of traffic (bits) received.\;" access="RO" offset="0x8.0" size="0x4.0" />
 	<field name="phy_received_bits_low" descr="This counter provides information on the total \;amount of traffic (bits) received.\;" access="RO" offset="0xC.0" size="0x4.0" />
-	<field name="phy_symbol_errors_high" descr="This counter provides information on error \;bits that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="phy_symbol_errors_low" descr="This counter provides information on error \;bits that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="phy_symbol_errors_high" descr="This counter provides information on error bits \;that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="phy_symbol_errors_low" descr="This counter provides information on error bits \;that were not corrected by phy correction \;mechanisms. (FEC + PLR)\;" access="RO" offset="0x14.0" size="0x4.0" />
 	<field name="phy_corrected_bits_high" descr="Corrected bits by FEC engine. \;" access="RO" offset="0x18.0" size="0x4.0" />
 	<field name="phy_corrected_bits_low" descr="Corrected bits by FEC engine. \;" access="RO" offset="0x1C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane0_high" descr="This counter provides information on error \;bits that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane0_low" descr="This counter provides information on error \;bits that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane1_high" descr="This counter provides information on error \;bits that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x28.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane1_low" descr="This counter provides information on error \;bits that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x2C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane2_high" descr="This counter provides information on error \;bits that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x30.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane2_low" descr="This counter provides information on error \;bits that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x34.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane3_high" descr="This counter provides information on error \;bits that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x38.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane3_low" descr="This counter provides information on error \;bits that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x3C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane4_high" descr="This counter provides information on error \;bits that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x40.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane4_low" descr="This counter provides information on error \;bits that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x44.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane5_high" descr="This counter provides information on error \;bits that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x48.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane5_low" descr="This counter provides information on error \;bits that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x4C.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane6_high" descr="This counter provides information on error \;bits that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x50.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane6_low" descr="This counter provides information on error \;bits that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x54.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane7_high" descr="This counter provides information on error \;bits that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x58.0" size="0x4.0" />
-	<field name="phy_raw_errors_lane7_low" descr="This counter provides information on error \;bits that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x5C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane0_high" descr="This counter provides information on error bits \;that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x20.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane0_low" descr="This counter provides information on error bits \;that were identified on lane 0. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 0\;\;\;" access="RO" offset="0x24.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane1_high" descr="This counter provides information on error bits \;that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x28.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane1_low" descr="This counter provides information on error bits \;that were identified on lane 1. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 1\;\;" access="RO" offset="0x2C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane2_high" descr="This counter provides information on error bits \;that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x30.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane2_low" descr="This counter provides information on error bits \;that were identified on lane 2. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 2\;\;\;\;" access="RO" offset="0x34.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane3_high" descr="This counter provides information on error bits \;that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x38.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane3_low" descr="This counter provides information on error bits \;that were identified on lane 3. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 3\;\;" access="RO" offset="0x3C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane4_high" descr="This counter provides information on error bits \;that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x40.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane4_low" descr="This counter provides information on error bits \;that were identified on lane 4. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 4\;\;\;" access="RO" offset="0x44.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane5_high" descr="This counter provides information on error bits \;that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x48.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane5_low" descr="This counter provides information on error bits \;that were identified on lane 5. \;When FEC is enabled this induction corre\;sponds to corrected errors\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 5\;\;" access="RO" offset="0x4C.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane6_high" descr="This counter provides information on error bits \;that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x50.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane6_low" descr="This counter provides information on error bits \;that were identified on lane 6. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 6\;\;\;" access="RO" offset="0x54.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane7_high" descr="This counter provides information on error bits \;that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x58.0" size="0x4.0" />
+	<field name="phy_raw_errors_lane7_low" descr="This counter provides information on error bits \;that were identified on lane 7. \;When FEC is enabled this induction corre\;sponds to corrected errors.\;In PRBS test mode, indicates the number of \;PRBS errors\;on lane 7\;\;" access="RO" offset="0x5C.0" size="0x4.0" />
 	<field name="raw_ber_coef" descr="Raw_BER = raw_ber_coef*10^(-raw_ber_\;magnitude)\;" access="RO" offset="0x60.0" size="0x0.4" />
 	<field name="raw_ber_magnitude" descr="Raw_BER = raw_ber_coef*10^(-raw_ber_\;magnitude)\;" access="RO" offset="0x60.8" size="0x0.8" />
-	<field name="effective_ber_coef" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_mag\;nitude)\;" access="RO" offset="0x64.0" size="0x0.4" />
-	<field name="effective_ber_magnitude" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_mag\;nitude)\;" access="RO" offset="0x64.8" size="0x0.8" />
+	<field name="effective_ber_coef" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_magni\;tude)\;" access="RO" offset="0x64.0" size="0x0.4" />
+	<field name="effective_ber_magnitude" descr="post_fec_BER = \;post_fec_ber_coef*10^(-post_fec_ber_magni\;tude)\;" access="RO" offset="0x64.8" size="0x0.8" />
 	<field name="symbol_fec_ber_coef" descr="Symbol_BER = \;symbol_ber_coef*10^(-symbol_ber_magni\;tude)" access="RO" offset="0x68.0" size="0x0.4" />
 	<field name="symbol_ber_magnitude" descr="Symbol_BER = \;symbol_ber_coef*10^(-symbol_ber_magni\;tude)" access="RO" offset="0x68.8" size="0x0.8" />
-	<field name="phy_effective_errors_high" descr="This counter provides information on error \;bits that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x7C.0" size="0x4.0" />
-	<field name="phy_effective_errors_low" descr="This counter provides information on error \;bits that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x80.0" size="0x4.0" />
+	<field name="phy_effective_errors_high" descr="This counter provides information on error bits \;that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x7C.0" size="0x4.0" />
+	<field name="phy_effective_errors_low" descr="This counter provides information on error bits \;that were not corrected by FEC correction \;algorithm or that FEC is not active.\;" access="RO" offset="0x80.0" size="0x4.0" />
 </node>
 
 <node name="pifr_reg_ext" descr="" size="0x60.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
-	<field name="local_port" descr="Egress Local port number.\;Note: Port isolation is not supported to \ from port 0 (i.e CPU \;port)." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that IGCR.pisbo affects the behavior of \;this table\;1: BRIDGE_ONLY table\;Supported only from spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
+	<field name="local_port" descr="Egress Local port number.\;Note: Port isolation is not supported to \ from port 0 (i.e \;CPU port)." access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that IGCR.pisbo affects the behavior \;of this table\;1: BRIDGE_ONLY table\;Supported only from spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
 	<field name="port_filter" descr="Ingress Port filter bitmask\;0: Do not filter (default value for all local_port).\;1: Filter - Packets coming from port_filter&lt;i&gt; will not be \;transmitted to port local_port. \;All LAG ports must share the same configuration.\;Refer to the relevant section for port numbering scheme." access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="port_filter_update_en" descr="port_filter_update_en bitmask, see port_filter\;When port_filter_update_en&lt;i&gt; set, the filter value for local \;port i is updated according to port_filter&lt;i&gt;.\;When port_filter_update_en&lt;i&gt; is cleared, the filter value for \;local port i maintains its current value." access="WO" high_bound="7" low_bound="0" offset="0x40.0" size="0x20.0" />
 </node>
 
 <node name="pifr_v2_ext" descr="" size="0x120.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
-	<field name="local_port" descr="Egress Local port number.\;Note: Port isolation is not supported to \ from port 0 (i.e CPU \;port)." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that IGCR.pisbo affects the behavior of \;this table\;1: BRIDGE_ONLY table\;Supported only from spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
+	<field name="local_port" descr="Egress Local port number.\;Note: Port isolation is not supported to \ from port 0 (i.e \;CPU port)." access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that IGCR.pisbo affects the behavior \;of this table\;1: BRIDGE_ONLY table\;Supported only from spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
 	<field name="port_filter" descr="Ingress Port filter bitmask\;0: Do not filter (default value for all local_port).\;1: Filter - Packets coming from port_filter&lt;i&gt; will not be \;transmitted to port local_port. \;All LAG ports must share the same configuration.\;Refer to the relevant section for port numbering scheme." access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
 	<field name="port_filter_update_en" descr="port_filter_update_en bitmask, see port_filter\;When port_filter_update_en&lt;i&gt; set, the filter value for local \;port i is updated according to port_filter&lt;i&gt;.\;When port_filter_update_en&lt;i&gt; is cleared, the filter value for \;local port i maintains its current value." access="WO" high_bound="31" low_bound="0" offset="0xA0.0" size="0x80.0" />
 </node>
@@ -4512,7 +4709,7 @@
 </node>
 
 <node name="pmaos_reg_ext" descr="" size="0x10.0" >
-	<field name="oper_status" descr="Module state (reserved while admin_status is dis\;abled):\;0: initializing\;1: plugged_enabled\;2: unplugged\;3: module_plugged_with_error - (details in error_\;type).\;4: plugged_disabled" access="RO" enum="initializing=0x0,plugged_enabled=0x1,unplugged=0x2,module_plugged_with_error=0x3,plugged_disabled=0x4" offset="0x0.0" size="0x0.4" />
+	<field name="oper_status" descr="Module state (reserved while admin_status is dis\;abled):\;0: initializing\;1: plugged_enabled\;2: unplugged\;3: module_plugged_with_error - (details in error_\;type).\;4: plugged_disabled\;5: unknown" access="RO" enum="initializing=0x0,plugged_enabled=0x1,unplugged=0x2,module_plugged_with_error=0x3,plugged_disabled=0x4,unknown=0x5" offset="0x0.0" size="0x0.4" />
 	<field name="admin_status" descr="Module administrative state (the desired state of the \;module):\;1: enabled\;2: disabled_by_configuration\;3: enabled_once - if the module is active and then \;unplugged, or module experienced an error event, the \;operational status should go to &quot;disabled&quot; and can \;only be enabled upon explicit enable command.\;\;Note - To disable a module, all ports associated with \;the port must be disabled first.\;" access="RW" enum="enabled=0x1,disabled_by_configuration=0x2,enabled_once=0x3" offset="0x0.8" size="0x0.4" />
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is \;available." access="INDEX" offset="0x0.24" size="0x0.4" />
@@ -4536,7 +4733,7 @@
 	<field name="tx_disable_override_value" descr="Valid only in case TX_DISABLE is configured to override mode \;by tx_disable_override_cntl: \;0 - TX_DISABLE is low (i.e. TX is enabled)\;1 - TX_DISABLE is high (i.e. TX is disabled)" access="RW" offset="0x4.24" size="0x0.2" />
 	<field name="rx_amp_override_cntl" descr="Module RX amplitude override control:\;0 - Auto (default)\;1 - Keep the module configuration\;2 - Override" access="RW" offset="0x8.0" size="0x0.2" />
 	<field name="rx_amp_override_cap" descr="Module rx_amp override control capability." access="RO" offset="0x8.2" size="0x0.1" />
-	<field name="rx_amp_override_value" descr="Valid only in case RX amplitude is configured to override \;mode by rx_amp_override_cntl" access="RW" offset="0x8.8" size="0x0.4" />
+	<field name="rx_amp_override_value" descr="Valid only in case RX amplitude is configured to override mode \;by rx_amp_override_cntl" access="RW" offset="0x8.8" size="0x0.4" />
 	<field name="rx_amp_override_value_cap" descr="Module rx_amp bitmask of allowed values." access="RO" offset="0x8.12" size="0x0.4" />
 	<field name="rx_los_override_cntl" descr="Valid only in case RX _LOS is configured to override mode by \;rx_los_override_admin" access="RW" offset="0x8.16" size="0x0.2" />
 	<field name="rx_los_override_cap" descr="Module RX_LOS override control capability." access="RO" offset="0x8.18" size="0x0.1" />
@@ -4564,7 +4761,7 @@
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="e" descr="Event generation on local port mapping change (PMLP):\;0: Do_not_generate_event\;1: Generate_Event \;2: Generate_Single_Event" access="RW" enum="Do_not_generate_event=0x0,Generate_Event=0x1,Generate_Single_Event=0x2" offset="0x4.0" size="0x0.2" />
-	<field name="swi" descr="Software ignore.\;If this bit is set, the device shouldn&quot;t generate events in case \;of PMLP SET operation but only upon self local port mapping \;change (if applicable according to e configuration).\;This is supplementary configuration on top of e value." access="RW" offset="0x4.8" size="0x0.1" />
+	<field name="swi" descr="Software ignore.\;If this bit is set, the device shouldn&quot;t generate events in case of \;PMLP SET operation but only upon self local port mapping \;change (if applicable according to e configuration).\;This is supplementary configuration on top of e value." access="RW" offset="0x4.8" size="0x0.1" />
 	<field name="eswi" descr="Software ignore enable bit.\;If this bit is set, the value if swi is used. \;If this bit is clear, the value of swi is ignored.\;Only relevant on Set operations." access="WO" offset="0x4.24" size="0x0.1" />
 	<field name="ee" descr="Event update enable. If this bit is set, event generation will be \;updated based on the e field. Only relevant on Set operations." access="WO" offset="0x4.30" size="0x0.1" />
 </node>
@@ -4575,7 +4772,7 @@
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="m_lane_m" descr="Module lane mapping: \;0 - Local to Module mapping include module lanes mapping\;1 - Local to Module mapping only, without lane mapping\;\;When this operational is set (&apos;1&apos;), the following fields are \;ignored in SET command and should return the value &quot;0&quot; in \;GET commands: \;PMLP.rxtx\;PMLP.lane&lt;i&gt;_module_mapping.tx_lane\;PMLP.lane&lt;i&gt;_module_mapping.rx_lane" access="OP" offset="0x0.28" size="0x0.1" />
 	<field name="rxtx" descr="Use different configuration for RX and TX.\;If this bit is cleared, the TX value is used for both RX and TX. \;When set, the RX configuration is taken from the separate \;field. This is to enable backward compatible implementation." access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="lane_module_mapping" descr="Module SerDes for lane &lt;i&gt;\;Up to 8 SerDeses in a module can be mapped to a local port. \;See Table 1077, &quot;Lane to Module Mapping Layout,&quot; on \;page 1639." subnode="lane_2_module_mapping_ext" access="RW" high_bound="7" low_bound="0" offset="0x4.0" size="0x20.0" />
+	<field name="lane_module_mapping" descr="Module SerDes for lane &lt;i&gt;\;Up to 8 SerDeses in a module can be mapped to a local port. \;See Table 1202, &quot;Lane to Module Mapping Layout,&quot; on \;page 1422." subnode="lane_2_module_mapping_ext" access="RW" high_bound="7" low_bound="0" offset="0x4.0" size="0x20.0" />
 </node>
 
 <node name="pmlpe_reg_ext" descr="" size="0x40.0" >
@@ -4583,7 +4780,7 @@
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="rxtx" descr="Use different configuration for RX and TX.\;If this bit is cleared, the TX value is used for both RX and TX. \;When set, the RX configuration is taken from the separate \;field. This is to enable backward compatible implementation." access="RO" offset="0x0.31" size="0x0.1" />
-	<field name="lane_module_mapping" descr="Module SerDes for lane &lt;i&gt;\;Up to 8 SerDeses in a module can be mapped to a local port. \;See Table 1077, &quot;Lane to Module Mapping Layout,&quot; on \;page 1639." subnode="lane_2_module_mapping_ext" access="RO" high_bound="7" low_bound="0" offset="0x4.0" size="0x20.0" />
+	<field name="lane_module_mapping" descr="Module SerDes for lane &lt;i&gt;\;Up to 8 SerDeses in a module can be mapped to a local port. \;See Table 1202, &quot;Lane to Module Mapping Layout,&quot; on \;page 1422." subnode="lane_2_module_mapping_ext" access="RO" high_bound="7" low_bound="0" offset="0x4.0" size="0x20.0" />
 </node>
 
 <node name="pmmp_cmis_protocol_override_layout_ext" descr="" size="0xc.0" >
@@ -4594,24 +4791,24 @@
 	<field name="dp_tx_off_maxDuration" descr="Data path turn off maximum duration. coded according to \;table 8-29 of CMIS 4.0." access="RW" offset="0x4.16" size="0x0.4" />
 	<field name="dp_tx_on_maxDuration" descr="Data path turn on maximum duration. coded according to \;table 8-29 of CMIS 4.0." access="RW" offset="0x4.20" size="0x0.4" />
 	<field name="dp_init_maxDuration" descr="Data path init maximum duration. coded according to table \;8-29 of CMIS 4.0." access="RW" offset="0x4.28" size="0x0.4" />
-	<field name="cmis_override_mask" descr="bitmask of override from CMIS protocol bytes page.\;Relevant only when Bit 9 is set in eeprom_override field.\;inverse polarity.\;0 - override\;1 - don&apos;t override\;\;Bit 0 - cable_breakout\;Bit 1 -host_electrical_compliance\;Bit 2 - module_media_type\;Bit 3 - media_compliance\;Bit 4 - mod_pwrup_maxDuration\;Bit 5 - dp_init_maxDuration\;Bit 6 - dp_tx_on_maxDuration\;Bit 7 - dp_tx_off_maxDuration" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="cmis_override_mask" descr="bitmask of override from CMIS protocol bytes page.\;Relevant only when Bit 9 is set in eeprom_override field.\;inverse polarity.\;0 - override\;1 - don&apos;t override\;\;Bit 0 - cable_breakout\;Bit 1 -host_electrical_compliance\;Bit 2 - module_media_type\;Bit 3 - media_compliance\;Bit 4 - mod_pwrup_maxDuration\;Bit 5 - dp_init_maxDuration\;Bit 6 - dp_tx_on_maxDuration\;Bit 7 - dp_tx_off_maxDuration\;Bit 8 - app0_support" access="RW" offset="0x8.0" size="0x0.16" />
 </node>
 
 <node name="pmmp_qsfp_protocol_override_layout_ext" descr="" size="0xc.0" >
 	<field name="ethernet_compliance_code" descr="Ethernet Compliance Codes bit mask (10/40G/100G)\;Override byte131 per SFF-8636:\;Bit 7 - Extended Specification Compliance valid\;Bit 6 - 10GBASE-LRM\;Bit 5 - 10GBASE-LR\;Bit 4 - 10GBASE-SR\;Bit 3 - 40GBASE-CR4\;Bit 2 - 40GBASE-SR4\;Bit 1 - 40GBASE-LR4\;Bit 0 - 40G Active Cable (XLPPI)" access="RW" offset="0x0.0" size="0x0.8" />
 	<field name="cable_breakout" descr="Override of byte113 per SFF-8636:\;Bit 6-4 (Far End):\;0 - Far end is unspecified\;1 - Cable with single far end with 4 channels implemented, \;or separable module with 4-channel connector\;2 - Cable with single far end with 2 channels implemented, \;or separable module with 2-channel connector\;3 - Cable with single far end with 1 channel implemented, \;or separable module with 1-channel connector\;4 - 4 far ends with 1 channel implemented in each (i.e. 4x1 \;break out)\;5 - 2 far ends with 2 channels implemented in each (i.e. 2x2 \;break out)\;6 - 2 far ends with 1 channel implemented in each (i.e. 2x1 \;break out)\;\;Bit 3-0 (Near End)\;Bit 0 - Channel 1 implementation \;Bit 1 - Channel 2 implementation\;Bit 2 - Channel 3 implementation\;Bit 3 - Channel 4 implementation\;\;for each channel:\;0 - Channel implemented \;1 - Channel not - implemented\;" access="RW" offset="0x0.8" size="0x0.8" />
 	<field name="giga_ethernet_compliance_code" descr="Gigabit Ethernet Compliance Codes \;Override byte134 per SFF-8636:\;Bit 3 - 1000BASE-T\;Bit 2 - 1000BASE-CX\;Bit 1 - 1000BASE-LX\;Bit 0 - 1000BASE-SX" access="RW" offset="0x4.0" size="0x0.8" />
-	<field name="ext_ethernet_compliance_code" descr="Extended Specification Compliance Codes \;Override byte192 per SFF-8636:\;0 - Unspecified\;1 - 100G AOC (Active Optical Cable) or 25GAUI C2M AOC \;with FEC\;2 - 100GBASE-SR4 or 25GBASE-SR\;3 - 100GBASE-LR4 or 25GBASE-LR\;4 - 100GBASE-ER4 or 25GBASE-ER\;5 - 100GBASE-SR10\;6 - 100G CWDM4\;7 - 100G PSM4 Parallel SMF\;8 - 100G ACC (Active Copper Cable) or 25GAUI C2M ACC. \;with FEC\;11 - 100GBASE-CR4 or 25GBASE-CR CA-L\;12 - 25GBASE-CR CA-S\;13 - 25GBASE-CR CA-N\;16 - 40GBASE-ER4\;17 - 4 x 10GBASE-SR\;18 - 40G PSM4 Parallel SMF\;19 - G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm \;SM)\;20 - G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm \;SM)\;21 - G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm \;SM)\;22 - 10GBASE-T with SFI electrical interface\;23 - 100G CLR4\;24 - 100G AOC or 25GAUI C2M AOC. No FEC\;25 - 100G ACC or 25GAUI C2M ACC. No FEC" access="RW" offset="0x4.8" size="0x0.8" />
+	<field name="ext_ethernet_compliance_code" descr="Extended Specification Compliance Codes \;Override byte192 per SFF-8636:\;0 - Unspecified\;1 - 100G AOC (Active Optical Cable) or 25GAUI C2M AOC \;with FEC\;2 - 100GBASE-SR4 or 25GBASE-SR\;3 - 100GBASE-LR4 or 25GBASE-LR\;4 - 100GBASE-ER4 or 25GBASE-ER\;5 - 100GBASE-SR10\;6 - 100G CWDM4\;7 - 100G PSM4 Parallel SMF\;8 - 100G ACC (Active Copper Cable) or 25GAUI C2M ACC. \;with FEC\;11 - 100GBASE-CR4 or 25GBASE-CR CA-L\;12 - 25GBASE-CR CA-S\;13 - 25GBASE-CR CA-N\;16 - 40GBASE-ER4\;17 - 4 x 10GBASE-SR\;18 - 40G PSM4 Parallel SMF\;19 - G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm SM)\;20 - G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm \;SM)\;21 - G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm \;SM)\;22 - 10GBASE-T with SFI electrical interface\;23 - 100G CLR4\;24 - 100G AOC or 25GAUI C2M AOC. No FEC\;25 - 100G ACC or 25GAUI C2M ACC. No FEC" access="RW" offset="0x4.8" size="0x0.8" />
 </node>
 
 <node name="pmmp_reg_ext" descr="" size="0x28.0" >
 	<field name="sticky" descr="When set will keep eeprom_override values after plug out \;event" access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is avail\;able." access="INDEX" offset="0x0.24" size="0x0.4" />
+	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is available." access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="eeprom_override" descr="Override/ignore EEPROM advertisement properties bitmask: \;Bit 0: Override_cable_protocols_and_technology_for_QSFP\;Bit 1: Override_cable_protocols_and_technology_for_SFP\;Bit 2: Ignore_Power_Class - set high power\;Bit 3: Override_Cable_Length \;Bit 4: Override_Attenuation\;Bit 8: Set_Module_to_Low_Power\;Bit 9: Override_cable_protocols_and_technology_for_CMIS - \;based modules QSFP-DD/ OSFP/ DSFP/ SFP-DD" access="RW" enum="Override_cable_protocols_and_technology_for_QSFP=0x1,Override_cable_protocols_and_technology_for_SFP=0x2,Ignore_Power_Class=0x4,Override_Cable_Length=0x8,Override_Attenuation=0x10,Set_Module_to_Low_Power=0x100,Override_cable_protocols_and_technology_for_CMIS=0x200" offset="0x4.0" size="0x0.16" />
 	<field name="eeprom_override_mask" descr="Write Mask bit (negative polarity):\;0 - allow write\;1 - ignore write\;On write commands, indicates which of the bits from \;eeprom_override field are updated.\;Reserved on read operations." access="WO" offset="0x4.16" size="0x0.16" />
-	<field name="qsfp_cable_protocol_technology" descr="Protocol technology override for QSFP cable or CMIS based \;cable (QSFP-DD/OSFP)\;Valid only when the protocols and technology for QSFP is \;overridden as indicated by eeprom_override\;Table  1101, &quot;PMMP - QSFP Protocol Bytes Override Layout,&quot; \;on page  1657\;Table  1105, &quot;PMMP - CMIS Protocol Bytes Override Layout,&quot; \;on page  1662" subnode="pmmp_reg_qsfp_cable_protocol_technology_auto_ext" access="RW" offset="0x8.0" size="0xc.0" union_selector="$(parent).eeprom_override" />
-	<field name="sfp_cable_protocol_technology" descr="Valid only when the protocols and technology is overridden as \;indicated by eeprom_override\;Table  1103, &quot;PMMP - SFP Protocol Bytes Override Layout,&quot; \;on page  1660" access="RW" high_bound="2" low_bound="0" offset="0x14.0" size="0xc.0" />
+	<field name="qsfp_cable_protocol_technology" descr="Protocol technology override for QSFP cable or CMIS based \;cable (QSFP-DD/OSFP)\;Valid only when the protocols and technology for QSFP is \;overridden as indicated by eeprom_override\;Table 1226, &quot;PMMP - QSFP Protocol Bytes Override Lay\;out,&quot; on page 1440\;Table 1230, &quot;PMMP - CMIS Protocol Bytes Override Lay\;out,&quot; on page 1445" subnode="pmmp_reg_qsfp_cable_protocol_technology_auto_ext" access="RW" offset="0x8.0" size="0xc.0" union_selector="$(parent).eeprom_override" />
+	<field name="sfp_cable_protocol_technology" descr="Valid only when the protocols and technology is overridden as \;indicated by eeprom_override\;Table 1228, &quot;PMMP - SFP Protocol Bytes Override Lay\;out,&quot; on page 1443" access="RW" high_bound="2" low_bound="0" offset="0x14.0" size="0xc.0" />
 	<field name="cable_length" descr="Length of cable assembly, units of 1 m for non CMIS cables.\;\;for CMIS cables, represents cable length field:\;bits 6:7 represent cable_length_multiplier for calculating \;cable length\;00 - 0.1 multiplier (0.1 to 6.3m)\;01- 1 multiplier (1 to 63m)\;10 - 10 multiplier (10 to 630m)\;11 - 100 multiplier (100 to 6300m)\;\;Valid only when the cable length is overridden as indicated by \;eeprom_override." access="RW" offset="0x20.0" size="0x0.8" />
 	<field name="attenuation_5g" descr="Valid only when the attenuation is overridden as indicated by \;eeprom_override.\;Attenuation - total channel attenuation @ 5GHz in db." access="RW" offset="0x24.0" size="0x0.8" />
 	<field name="attenuation_7g" descr="Valid only when the attenuation is overridden as indicated by \;eeprom_override.\;Attenuation - total channel attenuation @ 7GHz in db." access="RW" offset="0x24.8" size="0x0.8" />
@@ -4625,7 +4822,7 @@
 </node>
 
 <node name="pmpc_reg_ext" descr="" size="0x20.0" >
-	<field name="module_state_updated" descr="On read operation:\;A bit vector where each bit represents a module (bit 0 rep\;resents module 0 etc). A set bit indicates one or more \;changes in the module state (plugged/unplugged) has hap\;pened since the last time the bit was cleared. The default is 1 \;in all relevant bits.\;On write operation:\;Used to clear the module_status_updated bits. Writing a set \;bit clears the relevant bit in the module_status_updated vec\;tor. Cleared bits in this field preserve the value of the relevant \;bit in the bit vector. The software cannot set a bit in the mod\;ule_status_updated vector.\;Note: To prevent a case where an update is missed by the \;software, it is recommended to use the flow below:\;Read the module_status_updated vector\;Find a bit(s) relevant to a module(s) the software would like \;to handle\;Clear the relevant bit(s)\;Handle the module (e.g. read the module parameters \;using MCIA register)\;Read module_status_updated again to make sure the status \;did not change after reading the cable information." access="RW" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
+	<field name="module_state_updated" descr="On read operation:\;A bit vector where each bit represents a module (bit 0 rep\;resents module 0 etc). A set bit indicates one or more \;changes in the module state (plugged/unplugged/unknown) \;has happened since the last time the bit was cleared. The \;default is 1 in all relevant bits.\;On write operation:\;Used to clear the module_status_updated bits. Writing a set \;bit clears the relevant bit in the module_status_updated vec\;tor. Cleared bits in this field preserve the value of the relevant \;bit in the bit vector. The software cannot set a bit in the mod\;ule_status_updated vector.\;Note: To prevent a case where an update is missed by the \;software, it is recommended to use the flow below:\;Read the module_status_updated vector\;Find a bit(s) relevant to a module(s) the software would like \;to handle\;Clear the relevant bit(s)\;Handle the module (e.g. read the module parameters \;using MCIA register)\;Read module_status_updated again to make sure the status \;did not change after reading the cable information." access="RW" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
 </node>
 
 <node name="pmpd_reg_ext" descr="" size="0x30.0" >
@@ -4648,7 +4845,7 @@
 </node>
 
 <node name="pmpe_reg_ext" descr="" size="0x10.0" >
-	<field name="module_status" descr="Port operational state:1- plugged, enabled\;2- unplugged\;3- module plugged, error (details in error_type) \;4- plugged, disabled" access="RO" offset="0x0.0" size="0x0.4" />
+	<field name="module_status" descr="Port operational state:\;1: plugged_enabled\;2: unplugged\;3: module_plugged_error - details in error_type \;4: plugged_disabled\;5: unknown" access="RO" enum="plugged_enabled=0x1,unplugged=0x2,module_plugged_error=0x3,plugged_disabled=0x4,unknown=0x5" offset="0x0.0" size="0x0.4" />
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is \;available." access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="error_type" descr="Module error details:\;0x0: Power_Budget_Exceeded\;0x1: Long_Range_for_non_MLNX_cable_or_module\;0x2: Bus_stuck - (I2C Data or clock shorted)\;0x3: bad_or_unsupported_EEPROM\;0x4: Enforce_part_number_list\;0x5: unsupported_cable\;0x6: High_Temperature\;0x7: bad_cable - (Module/Cable is shorted)\;0x8: PMD_type_is_not_enabled - (see PMTPS).\;0xc: pcie_system_power_slot_Exceeded\;Valid only when (oper_status = 0x3)." access="RO" enum="Power_Budget_Exceeded=0x0,Long_Range_for_non_MLNX_cable_or_module=0x1,Bus_stuck=0x2,bad_or_unsupported_EEPROM=0x3,Enforce_part_number_list=0x4,unsupported_cable=0x5,High_Temperature=0x6,bad_cable=0x7,PMD_type_is_not_enabled=0x8,pcie_system_power_slot_Exceeded=0xc" offset="0x4.8" size="0x0.4" />
@@ -4656,7 +4853,7 @@
 
 <node name="pmpr_reg_ext" descr="" size="0x10.0" >
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="slot_index" descr="Reserved for HCA \;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is avail\;able." access="INDEX" offset="0x0.24" size="0x0.4" />
+	<field name="slot_index" descr="Reserved for HCA \;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is available." access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="attenuation_5g" descr="Attenuation - total channel attenuation @ 5GHz in db." access="RW" offset="0x4.0" size="0x0.8" />
 	<field name="attenuation_7g" descr="Attenuation - total channel attenuation @ 7GHz in db. \;A 0 value implies that attenuation_5g is used also for 7GHz" access="RW" offset="0x8.0" size="0x0.8" />
 	<field name="attenuation_12g" descr="Attenuation - total channel attenuation @ 12GHz in db.\;A 0 value implies that attenuation_5g is used also for 12GHz" access="RW" offset="0xC.0" size="0x0.8" />
@@ -4671,7 +4868,7 @@
 	<field name="swap_cap" descr="PAM4 MSB&lt;-&gt; LSB swapping is supported by the module" access="RO" offset="0x0.14" size="0x0.1" />
 	<field name="module" descr="module index" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is avail\;able." access="INDEX" offset="0x0.24" size="0x0.4" />
-	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PMPT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for \;get operations" access="OP" offset="0x0.29" size="0x0.1" />
+	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PMPT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for get \;operations" access="OP" offset="0x0.29" size="0x0.1" />
 	<field name="ls" descr="Per Lane configuration support/capability: \;0 - No support of per lane configuration\;1 - Support of per lane configuration" access="RO" offset="0x0.30" size="0x0.1" />
 	<field name="e" descr="Enable PRBS test mode bit:\;0 - PRBS is disabled.\;1 - PRBS is enabled." access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="prbs_modes_cap" descr="Supported module&apos;s PRBS capability (bitmask)\;Bit 0 - PRBS31 (x^31 + x^28 + 1)\;Bit 1 - PRBS23 (x^23 + x^18 + 1)\;Bit 5 - PRBS7 (x^7 + x^6 + 1)\;Bit 6 - PRBS11 (x^11 + x^9 + 1)\;Bit 11 - PRBS9 (x^9 + x^5 + 1)\;Bit 17 - PRBS13 (x^13 + x^12 + x^2+ x + 1)\;Bit 21 - SSPR\;Bit 22 - SSPRQ" access="RO" offset="0x4.0" size="0x4.0" />
@@ -4685,11 +4882,11 @@
 </node>
 
 <node name="pmsc_reg_ext" descr="" size="0x40.0" >
-	<field name="port_mapping_updated" descr="On read operation:\;A bit vector where each bit represents a local port with +1 off\;set (bit 0 represents local port 1, bit 1 represent local port 2 \;etc). A set bit indicates one or more changes in the local port \;mapping (mapped/unmapped) has happened since the last \;time the bit was cleared. The default is 1 in all relevant bits.\;On write operation:\;Used to clear the port_mapping_updated bits. Writing a set \;bit clears the relevant bit in the port_mapping_updated vec\;tor. Cleared bits in this field preserve the value of the relevant \;bit in the bit vector. The software cannot set a bit in the port_\;mapping_updated vector.\;Note: To prevent a case where an update is missed by the \;software, it is recommended to use the flow below:\;Read the port_mapping_updated vector\;Find a bit(s) relevant to a local_port(s) the software would \;like to handle\;Clear the relevant bit(s)\;Handle the local port (e.g. read PMLPE)\;Read port_mapping_updated again to make sure the status \;did not change after reading the PMPLE information." access="RW" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
+	<field name="port_mapping_updated" descr="On read operation:\;A bit vector where each bit represents a local port with +1 off\;set (bit 0 represents local port 1, bit 1 represent local port 2 \;etc). A set bit indicates one or more changes in the local port \;mapping (mapped/unmapped) has happened since the last \;time the bit was cleared. The default is 1 in all relevant bits.\;On write operation:\;Used to clear the port_mapping_updated bits. Writing a set \;bit clears the relevant bit in the port_mapping_updated vector. \;Cleared bits in this field preserve the value of the relevant bit \;in the bit vector. The software cannot set a bit in the port_\;mapping_updated vector.\;Note: To prevent a case where an update is missed by the \;software, it is recommended to use the flow below:\;Read the port_mapping_updated vector\;Find a bit(s) relevant to a local_port(s) the software would \;like to handle\;Clear the relevant bit(s)\;Handle the local port (e.g. read PMLPE)\;Read port_mapping_updated again to make sure the status \;did not change after reading the PMPLE information." access="RW" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
 </node>
 
 <node name="pmtdb_reg_ext" descr="" size="0x40.0" >
-	<field name="status" descr="0 - success\;1 - number of ports exceed the module width\;2 - Module was not instantiated (check ini/modular \;switch configuration flow)" access="RO" offset="0x0.0" size="0x0.4" />
+	<field name="status" descr="0 - success\;1 - number of ports exceed the module width\;2 - Module was not instantiated (check ini/modular \;switch configuration flow)\;3 - ports combination is not allowed" access="RO" offset="0x0.0" size="0x0.4" />
 	<field name="num_ports" descr="Number of ports in a single module (split/breakout)\;Examples: \;if num_ports = 1 than only port1 should contain \;local_port information. \;if num_ports = 4 than port1, port 2, port3 and port4 \;should contain local_port information. \;\;The combination of port_width and num_ports also \;detriments the mapping of port_num&lt;x&gt; to module&apos;s \;lanes.\;\;port_num&lt;x&gt; uses module lanes:\;(X-1)*port_width: X*port_width - 1 \;\;if num_ports&gt; 0 than port_num1 uses module lanes \;0:port_width-1\;if num_ports&gt;1 than port_num2 uses modules lanes \;port_width: 2*port_width - 1.\;if num_ports&gt;2 than port_num3 uses modules lanes \;2*port_width: 3*port_width - 1.\;and so on." access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="ports_width" descr="Port&apos;s width\;0 - per port&lt;x&gt;_width indexes\;1 - 1x \;2 - 2x\;4 - 4x\;8 - 8x" access="INDEX" offset="0x0.12" size="0x0.4" />
 	<field name="module" descr="Module number." access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -4715,16 +4912,16 @@
 <node name="pmtm_reg_ext" descr="" size="0x10.0" >
 	<field name="module" descr="module number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="slot_index" descr="Reserved for HCA\;Slot_index \;Slot_index = 0 represent the onboard (motherboard). \;In case of non modular system only slot_index = 0 is avail\;able." access="INDEX" offset="0x0.24" size="0x0.4" />
-	<field name="module_type" descr="module_type: \;0: Backplane_with_4_lanes\;1: QSFP\;2: SFP\;4: Backplane_with_single_lane\;8: Backplane_with_two_lanes\;10: Chip2Chip4x\;11: Chip2Chip2x \;12: Chip2Chip1x\;14: QSFP_DD \;15: OSFP\;16: SFP_DD\;17: DSFP \;18: Chip2Chip8x\;19: Twisted_Pair" access="RW" enum="Backplane_with_4_lanes=0x0,QSFP=0x1,SFP=0x2,Backplane_with_single_lane=0x4,Backplane_with_two_lanes=0x8,Chip2Chip4x=0xa,Chip2Chip2x=0xb,Chip2Chip1x=0xc,QSFP_DD=0xe,OSFP=0xf,SFP_DD=0x10,DSFP=0x11,Chip2Chip8x=0x12,Twisted_Pair=0x13" offset="0x4.0" size="0x0.5" />
+	<field name="module_type" descr="module_type: \;0: Backplane_with_4_lanes\;1: QSFP\;2: SFP\;3: No_Cage - [internal]4: Backplane_with_single_lane\;8: Backplane_with_two_lanes\;10: Chip2Chip4x\;11: Chip2Chip2x \;12: Chip2Chip1x\;14: QSFP_DD \;15: OSFP\;16: SFP_DD\;17: DSFP \;18: Chip2Chip8x\;19: Twisted_Pair\;20: Backplane_with_8_lanes" access="RW" enum="Backplane_with_4_lanes=0x0,QSFP=0x1,SFP=0x2,No_Cage=0x3,Backplane_with_two_lanes=0x8,Chip2Chip4x=0xa,Chip2Chip2x=0xb,Chip2Chip1x=0xc,QSFP_DD=0xe,OSFP=0xf,SFP_DD=0x10,DSFP=0x11,Chip2Chip8x=0x12,Twisted_Pair=0x13,Backplane_with_8_lanes=0x14" offset="0x4.0" size="0x0.5" />
 	<field name="module_width" descr="Number of module&apos;s electrical lanes\;\;NOTE: For SET command, this value should match the \;module type width in module_type field" access="RW" offset="0x4.8" size="0x0.5" />
 </node>
 
 <node name="pmtu_reg_ext" descr="" size="0x10.0" >
-	<field name="itre" descr="Ingress Truncation enable, the admin_mtu is used as trun\;cation:\;0: disable\;1: enable\;Reserved when NICs (NICs use only &apos;0&apos;)\;Reserved when SwitchX/-2 and IB Switches (use only &apos;0&apos;)\;Reserved when i_e = 0 or 2" access="RW" offset="0x0.0" size="0x0.1" />
-	<field name="i_e" descr="Ingress/Egress:\;0: applies for both ingress and for egress, read from egress\;1: applies only for ingress\;2: applies only for egress\;Reserved when NICs (NICs use only &apos;0&apos;)\;Reserved when SwitchX/-2 and IB Switches (use only &apos;0&apos;)" access="INDEX" offset="0x0.4" size="0x0.2" />
+	<field name="itre" descr="Ingress Truncation enable, the admin_mtu is used as \;truncation:\;0: disable\;1: enable\;Reserved when NICs (NICs use only &apos;0&apos;)\;Reserved when SwitchX/-2 and IB Switches (use only &apos;0&apos;)\;Reserved when i_e = 0 or 2" access="RW" offset="0x0.0" size="0x0.1" />
+	<field name="i_e" descr="Ingress/Egress:\;0: applies for both ingress and for egress, read from \;egress\;1: applies only for ingress\;2: applies only for egress\;Reserved when NICs (NICs use only &apos;0&apos;)\;Reserved when SwitchX/-2 and IB Switches (use only &apos;0&apos;)" access="INDEX" offset="0x0.4" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not including CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="max_mtu" descr="Maximum MTU supported on the port (Read Only).\;MTU depends on the port type. When port type (Eth/IB/FC) is \;configured, the relevant MTU is reported. When the port type \;is not configured, the minimum between the max_mtu for \;the different types (Eth/IB/FC) is reported." access="RO" offset="0x4.16" size="0x0.16" />
+	<field name="max_mtu" descr="Maximum MTU supported on the port (Read Only).\;MTU depends on the port type. When port type (Eth/IB/FC) \;is configured, the relevant MTU is reported. When the port \;type is not configured, the minimum between the max\;_mtu for the different types (Eth/IB/FC) is reported." access="RO" offset="0x4.16" size="0x0.16" />
 	<field name="admin_mtu" descr="Administratively configured MTU on the port. Must be \;smaller or equal to max_mtu.\;When itre=1 then must be at least 128B and granularity is \;8B" access="RW" offset="0x8.16" size="0x0.16" />
 	<field name="oper_mtu" descr="Operational MTU. This is the actual MTU configured on the \;ports. Packets exceeding this size will be dropped.\;Note: For NICs and for IB the actual operational MTU is \;reported which may be smaller than admin_mtu.\;For NICs: when PCAM.max_admin_mtu capability is set \;then oper_mtu will be the max of all admin_mtu" access="RO" offset="0xC.16" size="0x0.16" />
 </node>
@@ -4740,11 +4937,11 @@
 <node name="ppaos_reg_ext" descr="" size="0x10.0" >
 	<field name="phy_test_mode_status" descr="Port extended down status:\;0: regular_operation - (port down/up according to \;PAOS) \;1: phy_test_mode\;phy test mode can be valid only when PAOS.admin\;_status=2 and PAOS.oper_status=2 (i.e port is down)." access="RO" enum="regular_operation=0x0,phy_test_mode=0x1" offset="0x0.0" size="0x0.4" />
 	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main\;5 - USR Tile\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
-	<field name="phy_test_mode_admin" descr="Port extended administrative down status:\;0: regular_operation (port down/up according to \;PAOS) \;1: phy_test_mode \;\;The phy test mode (1) can be set only when \;PAOS.admin_status=2 (i.e port configuration is down)." access="RW" offset="0x0.8" size="0x0.4" />
+	<field name="phy_test_mode_admin" descr="Port extended administrative down status:\;0: regular_operation (port down/up according to PAOS) \;1: phy_test_mode \;\;The phy test mode (1) can be set only when \;PAOS.admin_status=2 (i.e port configuration is down)." access="RW" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="swid" descr="For HCA: must always be 0.\;Switch partition ID with which to associate the port.\;Switch partitions are numbered from 0 to 7 inclusively.\;The swid field is only valid when the local_port is the \;router port. In this case, the swid indicates which of \;the router ports to configure/query." access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="phy_status" descr="rx phy status:\;0: rx_phy_down\;1: rx_phy_up\;2: rx_phy_down_by_command\;\;Note: The phy up indication is according to protocol \;(up == align_status=true)\;i.g. In PRBS test mode phy up is when PRB is lock \;(up== prbs lock)" access="RO" offset="0x4.0" size="0x0.4" />
+	<field name="phy_status" descr="rx phy status:\;0: rx_phy_down\;1: rx_phy_up\;2: rx_phy_down_by_command\;\;Note: The phy up indication is according to protocol (up \;== align_status=true)\;i.g. In PRBS test mode phy up is when PRB is lock \;(up== prbs lock)" access="RO" offset="0x4.0" size="0x0.4" />
 	<field name="phy_status_admin" descr="rx phy port admin. Controls phy entities operational \;port status.\;valid for port_type &lt;&gt; &apos;0&apos;.\;to operate link status for port_type &apos;0&apos; use \;PAOS.admin_status.\;0: rx_phy_down\;1: rx_phy_up\;" access="RW" offset="0x4.8" size="0x0.4" />
 </node>
 
@@ -4762,7 +4959,7 @@
 </node>
 
 <node name="ppbme_reg_ext" descr="" size="0x10.0" >
-	<field name="monitor_type" descr="Monitor type based on monitor_options setting and the oper\;ational mode of the link:\;0 - Post FEC / No-FEC BER monitoring\;1 - Pre FEC BER monitoring" access="RO" offset="0x0.8" size="0x0.4" />
+	<field name="monitor_type" descr="Monitor type based on monitor_options setting and the opera\;tional mode of the link:\;0 - Post FEC / No-FEC BER monitoring\;1 - Pre FEC BER monitoring" access="RO" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Lsocal port number\;1 - IB / label port number\;[Internal] 3 - Out of band / PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="local_port" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -4771,8 +4968,8 @@
 </node>
 
 <node name="ppbmi_ext" descr="" size="0x14.0" >
-	<field name="ilm_index" descr="ILM entry Index\;For Spectrum, the index points to the KVD Linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear Entries&quot;, \;on page 3375" access="INDEX" offset="0x4.0" size="0x0.24" />
-	<field name="nhlfe_index" descr="NHLFE entry pointer\;Points to the NHLFE table. When using ECMP, points to the \;first entry in the ECMP list\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear Entries&quot;, \;on page 3375" access="RW" offset="0x8.0" size="0x0.24" />
+	<field name="ilm_index" descr="ILM entry Index\;For Spectrum, the index points to the KVD Linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear Entries&quot;, \;on page 3097" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="nhlfe_index" descr="NHLFE entry pointer\;Points to the NHLFE table. When using ECMP, points to the \;first entry in the ECMP list\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear Entries&quot;, \;on page 3097" access="RW" offset="0x8.0" size="0x0.24" />
 	<field name="ecmp_size" descr="The amount of sequential entries starting from the nhlfe_ptr \;(the number of ECMPs)\;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2: 1-128, 256, 512, 1024, 2048 and 4096." access="RW" offset="0xC.0" size="0x0.13" />
 	<field name="npop" descr="Number of labels to pop from the label stack.\;Range from 0 to cap_mpls_ilm_entry_pop" access="RW" offset="0xC.24" size="0x0.2" />
 </node>
@@ -4782,14 +4979,14 @@
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;[Internal] 3 - Out of band / PCI" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="local_port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="monitor_parameters" descr="See Table 1299, &quot;PPBMP - Monitor Parameters Layout,&quot; on \;page 1894" subnode="uint64" access="RW" offset="0x4.0" size="0x8.0" />
+	<field name="monitor_parameters" descr="See Table 1424, &quot;PPBMP - Monitor Parameters Layout,&quot; \;on page 1680" subnode="uint64" access="RW" offset="0x4.0" size="0x8.0" />
 </node>
 
 <node name="ppbs_ext" descr="" size="0x1c.0" >
 	<field name="type" descr="Entry type:\;0x0: Unicast_Record\;0x1: Unicast_LAG_Record\;0x2: Multicast_Record\;0xC: Unicast_Tunnel_Record\;0xF: Multicast_Tunnel_Record" access="RW" enum="Unicast_Record=0x0,Unicast_LAG_Record=0x1,Multicast_Record=0x2,Unicast_Tunnel_Record=0xc,Multicast_Tunnel_Record=0xf" offset="0x4.20" size="0x0.4" />
 	<field name="swid" descr="Switch partition ID for queries. Reserved on Write.\;Reserved from Spectrum-1" access="INDEX" offset="0x4.24" size="0x0.8" />
-	<field name="pbs_ptr" descr="Index into the PBS table. \;In SwitchX/-2 pbs_ptr is limited to 0 .. (pbs_table_size-1)\;For Spectrum/-2, the index points to the KVD Linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="INDEX" offset="0x8.0" size="0x0.24" />
-	<field name="pbs_record" descr="PBS Record. For full description see:\;Table 2012, &quot;Unicast PBS Record Layout,&quot; on page 2515\;Table 2014, &quot;Unicast LAG PBS Record Layout,&quot; on \;page 2516\;Table 2016, &quot;Multicast PBS Record Layout,&quot; on page 2517\;Table 2018, &quot;Unicast Tunnel PBS Record Layout,&quot; on \;page 2518\;Table 2020, &quot;Multicast Tunnel PBS Record Layout,&quot; on \;page 2519" subnode="ppbs_pbs_record_auto_ext" access="RW" offset="0xC.0" size="0x10.0" union_selector="$(parent).type" />
+	<field name="pbs_ptr" descr="Index into the PBS table. \;In SwitchX/-2 pbs_ptr is limited to 0 .. (pbs_table_size-1)\;For Spectrum/-2, the index points to the KVD Linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)" access="INDEX" offset="0x8.0" size="0x0.24" />
+	<field name="pbs_record" descr="PBS Record. For full description see:\;Table 2169, &quot;Unicast PBS Record Layout,&quot; on page 2291\;Table 2171, &quot;Unicast LAG PBS Record Layout,&quot; on \;page 2292\;Table 2173, &quot;Multicast PBS Record Layout,&quot; on \;page 2293\;Table 2175, &quot;Unicast Tunnel PBS Record Layout,&quot; on \;page 2294\;Table 2177, &quot;Multicast Tunnel PBS Record Layout,&quot; on \;page 2295" subnode="ppbs_pbs_record_auto_ext" access="RW" offset="0xC.0" size="0x10.0" union_selector="$(parent).type" />
 </node>
 
 <node name="ppbs_multicast_ext" descr="" size="0x8.0" >
@@ -4812,20 +5009,29 @@
 	<field name="vid" descr="New VID when set_vid = 1\;Reserved when set_vid = 0\;Reserved when ubridge=0" access="RW" offset="0x0.16" size="0x0.12" />
 	<field name="set_vid" descr="Set VID:\;0: do not update VID\;1: set VID\;For Spectrum-2 when set_vid=0 and smpe_valid=1 then the \;smpe will modify the vid\;Reserved when ubridge=0" access="RW" offset="0x0.30" size="0x0.1" />
 	<field name="v_fid" descr="valid FID:\;0: .1Q bridge, the VID is maintained\;1: .1D bridge, the VID is modified according to:\;{fid, system_port} -&gt; vid\;Where the mapping is according to SVFA register\;Reserved when ubridge=1" access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="system_port" descr="Unique port identifier for the final destination of the packet\;Must be &apos;0&apos; when action is &apos;3&apos; - forward to IP router \;For SwitchX/-2 value of 0 is for drop\;Note: for Spectrum/-2, if action is 0 (forward) and system_port is \;0 then the PPBS entry must not be used! (Must not be pointed by \;an ACL action)" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="system_port" descr="Unique port identifier for the final destination of the packet\;Must be &apos;0&apos; when action is &apos;3&apos; - forward to IP router \;For SwitchX/-2 value of 0 is for drop\;Note: for Spectrum/-2, if action is 0 (forward) and system_port \;is 0 then the PPBS entry must not be used! (Must not be \;pointed by an ACL action)" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="action" descr="Action to apply on the packet:\;0: NOP - forward (based on the system_port destination)\;3: FORWARD_TO_IP_ROUTER\;4: FORWARD_TO_FCF - Reserved when Spectrum/-2\;5: DISCARD - Reserved when Spectrum/-2\;15: DISCARD_ERROR" access="RW" enum="NOP=0x0,FORWARD_TO_IP_ROUTER=0x3,FORWARD_TO_FCF=0x4,DISCARD=0x5,DISCARD_ERROR=0xf" offset="0x4.28" size="0x0.4" />
 </node>
 
 <node name="ppbt_ext" descr="" size="0x14.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="When tport = 0:Local port \;Not including CPU port\;\;When tport = 1: Tunnel port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="tport" descr="Port is tunnel port\;Supported from Spectrum-2 and on" access="INDEX" offset="0x0.27" size="0x0.1" />
+	<field name="tport" descr="Port is tunnel port\;Supported from Spectrum-2 and on" access="INDEX" offset="0x0.24" size="0x0.1" />
 	<field name="op" descr="0: Bind ACL to Port\;1: Unbind ACL from Port (default)\;" access="RW" offset="0x0.28" size="0x0.3" />
 	<field name="e" descr="0: iACL\;1: eACL" access="INDEX" enum="iACL=0x0,eACL=0x1" offset="0x0.31" size="0x0.1" />
 	<field name="acl_id_group_id" descr="When g=0:\;ACL identifier (acl_id)\;Range of acl id is 0..cap_max_acl_regions-1\;When g=1:\;ACL group identifier (acl_group_id)\;Range of group id is 0..cap_max_acl_groups-1" access="RW" offset="0x10.0" size="0x0.16" />
 	<field name="g" descr="group\;0: bind an ACL\;1: bind an ACL group\;Must be set to 1 for Spectrum/-2" access="RW" offset="0x10.31" size="0x0.1" />
 </node>
 
+<node name="ppcnt_infiniband_general_counter_ext" descr="" size="0xf8.0" >
+	<field name="port_rcv_data_qword_high" descr="Total number of data in Qword (8 Bytes), \;received on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0x0.0" size="0x4.0" />
+	<field name="port_rcv_data_qword_low" descr="Total number of data in Qword (8 Bytes), \;received on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0x4.0" size="0x4.0" />
+	<field name="port_xmit_data_qword_high" descr="Total number of data in Qword (8 Bytes), trans\;mitted on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="port_xmit_data_qword_low" descr="Total number of data in Qword (8 Bytes), trans\;mitted on the port.\;Supported only when indicated by PCAM.\;Note: This counter takes into account the \;packet alignment." access="RO" offset="0xC.0" size="0x4.0" />
+	<field name="rq_general_error_high" descr="The total number of packets that were dropped \;since it contained errors. Reasons for this \;include:\;1. dropped due to MPR mismatch.\;Supported only when indicated by PCAM." access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="rq_general_error_low" descr="The total number of packets that were dropped \;since it contained errors. Reasons for this \;include:\;1. dropped due to MPR mismatch.\;Supported only when indicated by PCAM." access="RO" offset="0x14.0" size="0x4.0" />
+</node>
+
 <node name="ppcnt_infiniband_packets_counter_ext" descr="" size="0xf8.0" >
 	<field name="time_since_last_clear_high" descr="The time passed since the last counters clear \;event in msec." access="RO" offset="0x0.0" size="0x4.0" />
 	<field name="time_since_last_clear_low" descr="The time passed since the last counters clear \;event in msec." access="RO" offset="0x4.0" size="0x4.0" />
@@ -4870,8 +5076,8 @@
 	<field name="plr_sync_events_low" descr="The number of sync events" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="hi_retransmission_rate_high" descr="High retransmission rate\;The number of the retransmission rate has \;crossed the retransmission rate threshold\;" access="RO" offset="0x38.0" size="0x4.0" />
 	<field name="hi_retransmission_rate_low" descr="High retransmission rate\;The number of the retransmission rate has \;crossed the retransmission rate threshold\;" access="RO" offset="0x3C.0" size="0x4.0" />
-	<field name="plr_xmit_retry_codes_within_t_sec_max_high" descr="The maximum number of retransmitted \;events in t sec window\;" access="RO" offset="0x40.0" size="0x4.0" />
-	<field name="plr_xmit_retry_codes_within_t_sec_max_low" descr="The maximum number of retransmitted \;events in t sec window\;" access="RO" offset="0x44.0" size="0x4.0" />
+	<field name="plr_xmit_retry_codes_within_t_sec_max_high" descr="The maximum number of retransmitted events \;in t sec window\;" access="RO" offset="0x40.0" size="0x4.0" />
+	<field name="plr_xmit_retry_codes_within_t_sec_max_low" descr="The maximum number of retransmitted events \;in t sec window\;" access="RO" offset="0x44.0" size="0x4.0" />
 </node>
 
 <node name="ppcnt_reg_counter_set_auto_ext" descr="" attr_is_union="1" size="0xf8.0" >
@@ -4894,20 +5100,22 @@
 	<field name="ppcnt_plr_counters_ext" descr="" subnode="ppcnt_plr_counters_ext" offset="0x0.0" selected_by="PLR_counters_group" size="0xf8.0" />
 	<field name="ppcnt_rs_fec_histograms_counters_ext" descr="" subnode="ppcnt_rs_fec_histograms_counters_ext" offset="0x0.0" selected_by="RS_FEC_Histogram_group" size="0xf8.0" />
 	<field name="usr_xsr_physical_layer_ext" descr="" subnode="usr_xsr_physical_layer_ext" offset="0x0.0" selected_by="USR_XSR_Physical_layer_counters_group" size="0xf8.0" />
-	<field name="ppcnt_infiniband_packets_counter_ext" descr="" subnode="ppcnt_infiniband_packets_counter_ext" offset="0x0.0" selected_by="Infiniband_pkts_counters" size="0xf8.0" />
+	<field name="ppcnt_infiniband_packets_counter_ext" descr="" subnode="ppcnt_infiniband_packets_counter_ext" offset="0x0.0" selected_by="InfiniBand_pkts_counters" size="0xf8.0" />
+	<field name="ppcnt_infiniband_general_counter_ext" descr="" subnode="ppcnt_infiniband_general_counter_ext" offset="0x0.0" selected_by="InfiniBand_General_Counters" size="0xf8.0" />
 </node>
 
 <node name="ppcnt_reg_ext" descr="" size="0x100.0" >
-	<field name="grp" descr="Performance counter group.\;Group 63 indicates all groups (include all per priority/TC/Receive Buffer \;counters). Only valid on Set() operation with clr bit set.\;0x0: IEEE_802_3_Counters\;0x1: RFC_2863_Counters\;0x2: RFC_2819_Counters\;0x3: RFC_3635_Counters\;0x5: Ethernet_Extended_Counters\;0x6: Ethernet_Discard_Counters \;0x8: Link_Level_Retransmission_Counters - [Internal]\;0x10: Per_Priority_Counters - \;0x11: Per_Traffic_Class_Counters - \;0x12: Physical_Layer_Counters\;0x13: Per_Traffic_Class_Congestion_Counters\;0x15: Per_Receive_Buffer_Counters - [Internal]\;0x16: Physical_Layer_Statistical_Counters\;0x19: Out_of_Band_Port_Counters - Note: This group is valid only for OOB \;ports - [Internal]\;0x20: InfiniBand_Port_Counters\;0x21: InfiniBand_Extended_Port_Counters\;0x22: PLR_counters_group\;0x23: RS_FEC_Histogram_group\;0x24: USR_XSR_Physical_layer_counters_group - [Internal]\;0x25: Infiniband_pkts_counters - [Internal]\;" access="INDEX" enum="IEEE_802_3_Counters=0x0,RFC_2863_Counters=0x1,RFC_2819_Counters=0x2,RFC_3635_Counters=0x3,Ethernet_Extended_Counters=0x5,Ethernet_Discard_Counters=0x6,Link_Level_Retransmission_Counters=0x8,Per_Priority_Counters=0x10,Per_Traffic_Class_Counters=0x11,Physical_Layer_Counters=0x12,Per_Traffic_Class_Congestion_Counters=0x13,Per_Receive_Buffer_Counters=0x15,Physical_Layer_Statistical_Counters=0x16,Out_of_Band_Port_Counters=0x19,InfiniBand_Port_Counters=0x20,InfiniBand_Extended_Port_Counters=0x21,PLR_counters_group=0x22,RS_FEC_Histogram_group=0x23,USR_XSR_Physical_layer_counters_group=0x24,Infiniband_pkts_counters=0x25" offset="0x0.0" size="0x0.6" />
+	<field name="grp" descr="Performance counter group.\;Group 63 indicates all groups (include all per priority/TC/Receive Buffer count\;ers). Only valid on Set() operation with clr bit set.\;0x0: IEEE_802_3_Counters\;0x1: RFC_2863_Counters\;0x2: RFC_2819_Counters\;0x3: RFC_3635_Counters\;0x5: Ethernet_Extended_Counters\;0x6: Ethernet_Discard_Counters \;0x8: Link_Level_Retransmission_Counters - [Internal]\;0x10: Per_Priority_Counters - \;0x11: Per_Traffic_Class_Counters - \;0x12: Physical_Layer_Counters\;0x13: Per_Traffic_Class_Congestion_Counters\;0x15: Per_Receive_Buffer_Counters - [Internal]\;0x16: Physical_Layer_Statistical_Counters\;0x19: Out_of_Band_Port_Counters - Note: This group is valid only for OOB \;ports - [Internal]\;0x20: InfiniBand_Port_Counters\;0x21: InfiniBand_Extended_Port_Counters\;0x22: PLR_counters_group\;0x23: RS_FEC_Histogram_group\;0x24: USR_XSR_Physical_layer_counters_group - [Internal]\;0x25: InfiniBand_pkts_counters - [Internal]\;0x26: InfiniBand_General_Counters\;" access="INDEX" enum="IEEE_802_3_Counters=0x0,RFC_2863_Counters=0x1,RFC_2819_Counters=0x2,RFC_3635_Counters=0x3,Ethernet_Extended_Counters=0x5,Ethernet_Discard_Counters=0x6,Link_Level_Retransmission_Counters=0x8,Per_Priority_Counters=0x10,Per_Traffic_Class_Counters=0x11,Physical_Layer_Counters=0x12,Per_Traffic_Class_Congestion_Counters=0x13,Per_Receive_Buffer_Counters=0x15,Physical_Layer_Statistical_Counters=0x16,Out_of_Band_Port_Counters=0x19,InfiniBand_Port_Counters=0x20,InfiniBand_Extended_Port_Counters=0x21,PLR_counters_group=0x22,RS_FEC_Histogram_group=0x23,USR_XSR_Physical_layer_counters_group=0x24,InfiniBand_pkts_counters=0x25,InfiniBand_General_Counters=0x26" offset="0x0.0" size="0x0.6" />
 	<field name="port_type" descr="Supported only when indicated by PCAM on FPGA based NICs:\;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type:\;0: Local_port_number\;1: IB_port_number\;2: host_port_number\;3: OOB_port_number - Internal\;\;Note - pnat=2 is supported for &quot;Per Traffic Class Congestion \;Counters&quot; and &quot;Per Traffic Class Counters&quot; groups." access="INDEX" enum="Local_port_number=0x0,IB_port_number=0x1,host_port_number=0x2,OOB_port_number=0x3" offset="0x0.14" size="0x0.2" />
-	<field name="local_port" descr="Local port number. \;Note:\;when lp_gl = 0, 255 indicates all ports on the device, and is \;only allowed for Set() operation.\;when lp_gl = 1, the index is global port number" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="local_port" descr="Local port number. \;Note:\;when lp_gl = 0, 255 indicates all ports on the device, and is only \;allowed for Set() operation.\;when lp_gl = 1, the index is global port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="swid" descr="For HCA: must be always 0.\;Switch partition ID to associate port with.\;Switch partitions are numbered from 0 to 7 inclusively.\;Switch partition 254 indicates stacking ports.\;Switch partition 255 indicates all switch partitions.\;Only valid on Set() operation with local_port=255." access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="prio_tc" descr="Priority index for per priority counter sets, valid values: 0-7\;For Spectrum-2 and on at tx side range can be 0 .. cap_max_t\;class_data-1, see QGCR.tx_cnt_tclass\;\;Traffic class index for per traffic class counter set, valid val\;ues: \;For Switches, valid values: 0 .. cap_max_tclass_data-1 \;\;For HCA, valid values: 0.. HCA_CAP.max_tc\;\;Otherwise must be 0." access="INDEX" offset="0x4.0" size="0x0.5" />
+	<field name="grp_profile" descr="Supported only when indicated by PCAM: PPCNT_grp_pro\;file_supported (bit 73).\;The group profile index. Relevant only if the clr bit is set.\;0: Will reset the counter value for all counters in the counter \;group.\;Else: Will point to the corresponding bit-map profile in the \;PPCGP register. The bit map will return the specific counters \;that will be reset in the group." access="INDEX" offset="0x4.5" size="0x0.3" />
 	<field name="lp_gl" descr="Local Port global variable\;0: local_port port 255 = all ports of the device.\;1: local_port index indicates Local port number." access="OP" offset="0x4.30" size="0x0.1" />
 	<field name="clr" descr="Clear counters. Setting the clr bit will reset the counter value \;for all counters in the counter group. This bit can be set for \;both Set() and Get() operation.\;\;" access="OP" offset="0x4.31" size="0x0.1" />
-	<field name="counter_set" descr="Counter set as described in\;Table  1009, &quot;Ethernet IEEE 802.3 Counters Group Data Lay\;out,&quot; on page  1560\;Table  1011, &quot;Ethernet RFC 2863 Counter Group Data Layout,&quot; \;on page  1565\;Table  1013, &quot;Ethernet RFC 2819 Counter Group Data Layout,&quot; \;on page  1568\;Table  1015, &quot;Ethernet RFC 3635 Counter Group Data Layout,&quot; \;on page  1573\;Table  1017, &quot;Ethernet Extended Counter Group Data Layout,&quot; \;on page  1577\;Table  1020, &quot;Ethernet Discard Counter Group Fields,&quot; on \;page  1582\;Table  1031, &quot;Link Level Retransmission Counter Group Data \;Layout,&quot; on page  1595\;Table  1021, &quot;Ethernet Per Priority Group Data Layout,&quot; on \;page  1584\;Table  1025, &quot;Ethernet Per Traffic Class Group data layout,&quot; on \;page  1592\;Table  1037, &quot;Physical Layer Counters Data Layout,&quot; on \;page  1603\;Table  1027, &quot;Ethernet Per Traffic Class Congestion Group data \;layout,&quot; on page  1593\;Table  1029, &quot;Ethernet Per Receive Buffer Group data layout,&quot; \;on page  1594\;Table  1041, &quot;Physical Layer Statistical Counters Data Layout,&quot; \;on page  1612 \;Table  1023, &quot;Ethernet OOB Port Counters Data Layout,&quot; on \;page  1588 - [Internal]\;Table  1033, &quot;InfiniBand PortCounters Attribute Group Data \;Layout,&quot; on page  1597\;Table  1035, &quot;InfiniBand Extended PortCounters Attribute \;Group Data Layout,&quot; on page  1599\;Table  1043, &quot;PLR Counters Data Layout,&quot; on page  1617 - \;[Internal]\;Table  1045, &quot;RS-Histograms Data Layout,&quot; on page  1619 \;Table  1039, &quot;USR_XSR Physical Layer Counters Data Layout,&quot; \;on page  1608\;Table  1047, &quot;Infiniband Packets Counters Data Layout,&quot; on \;page  1620" subnode="ppcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
+	<field name="counter_set" descr="Counter set as described in\;Table 1134, &quot;Ethernet IEEE 802.3 Counters Group Data \;Layout,&quot; on page 1343\;Table 1136, &quot;Ethernet RFC 2863 Counter Group Data Lay\;out,&quot; on page 1348\;Table 1138, &quot;Ethernet RFC 2819 Counter Group Data Lay\;out,&quot; on page 1351\;Table 1140, &quot;Ethernet RFC 3635 Counter Group Data Lay\;out,&quot; on page 1356\;Table 1142, &quot;Ethernet Extended Counter Group Data Lay\;out,&quot; on page 1360\;Table 1145, &quot;Ethernet Discard Counter Group Fields,&quot; on \;page 1365\;Table 1156, &quot;Link Level Retransmission Counter Group \;Data Layout,&quot; on page 1378\;Table 1146, &quot;Ethernet Per Priority Group Data Layout,&quot; \;on page 1367\;Table 1150, &quot;Ethernet Per Traffic Class Group data lay\;out,&quot; on page 1375\;Table 1162, &quot;Physical Layer Counters Data Layout,&quot; on \;page 1386\;Table 1152, &quot;Ethernet Per Traffic Class Congestion Group \;data layout,&quot; on page 1376\;Table 1154, &quot;Ethernet Per Receive Buffer Group data lay\;out,&quot; on page 1377\;Table 1166, &quot;Physical Layer Statistical Counters Data \;Layout,&quot; on page 1396 \;Table 1148, &quot;Ethernet OOB Port Counters Data Layout,&quot; \;on page 1371 - [Internal]\;Table 1158, &quot;InfiniBand PortCounters Attribute Group \;Data Layout,&quot; on page 1380\;Table 1160, &quot;InfiniBand Extended PortCounters Attribute \;Group Data Layout,&quot; on page 1382\;Table 1168, &quot;PLR Counters Data Layout,&quot; on page 1401 - \;[Internal]\;Table 1170, &quot;RS-Histograms Data Layout,&quot; on page 1403 \;Table 1164, &quot;USR_XSR Physical Layer Counters Data \;Layout,&quot; on page 1392\;Table 1172, &quot;InfiniBand Packets Counters Data Layout,&quot; \;on page 1404\;Table 1174, &quot;InfiniBand General Counters Data Layout,&quot; \;on page 1406" subnode="ppcnt_reg_counter_set_auto_ext" access="RO" offset="0x8.0" size="0xf8.0" union_selector="$(parent).grp" />
 </node>
 
 <node name="ppcnt_rs_fec_histograms_counters_ext" descr="" size="0xf8.0" >
@@ -4925,16 +5133,16 @@
 	<field name="pnat" descr="Port number access type:\;0: Local_port_number\;1: IB_port_number" access="INDEX" enum="Local_port_number=0x0,IB_port_number=0x1" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="local_port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="active_hist_type" descr="0 - invalid (Link down / unsupported) \;1 - KP4 RS-FEC (544,514) errors \;2 - LL RS-FEC (271,257) / (272,257+1) errors\;3 - KR4 RS-FEC (528,514) errors" access="RO" offset="0x0.28" size="0x0.4" />
-	<field name="hist_type" descr="0: According to active link\;1: KP4 RS-FEC (544,514) errors \;2: LL RS-FEC (271,257) / (272,257+1) errors\;3: KR4 RS-FEC (528,514) errors" access="INDEX" offset="0x4.0" size="0x0.4" />
+	<field name="hist_type" descr="0: According to active link\;\;[internal] - supported only for active links.\;for future use:\;1: KP4 RS-FEC (544,514) errors \;2: LL RS-FEC (271,257) / (272,257+1) errors\;3: KR4 RS-FEC (528,514) errors" access="INDEX" offset="0x4.0" size="0x0.4" />
 	<field name="num_of_bins" descr="Available number of bins \;" access="RO" offset="0x4.16" size="0x0.8" />
-	<field name="hist_min_measurement" descr="Lowest measurement/low limit of the histogram \;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors(= 0)\;In case of hist_type = 2, represent LL RS FEC symbol \;errors ( = 0)\;" access="RO" offset="0x8.0" size="0x0.8" />
-	<field name="hist_max_measurement" descr="Highest measurement/high limit of the histogram:\;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors ( = 15)\;In case of hist_type = 2, represent LL RS FEC symbol \;errors ( = 7)" access="RO" offset="0x8.16" size="0x0.8" />
-	<field name="bin_range_write_mask" descr="Valid only if we (write enable) = 1 \;Ignored on GET \;Write mask for the bin_range array. \;If bit X is set, bin_range [X] write should be execute\;Else if bit X is clear, ignored value in written to bin_range \;[X]" access="WO" offset="0xC.0" size="0x0.16" />
-	<field name="bin_range" descr="Write to bin_range[x] is applicable only if we = 1 &amp; the cor\;responding bits in bin_range_write_mask is set.\;Mapping of measurement units to a bin\;See Table 1281, &quot;PPHCR - Port Phy Bin Range Histogram \;Configuration Layout,&quot; on page 1876" subnode="pphcr_bin_range_ext" access="RW" high_bound="15" low_bound="0" offset="0x10.0" size="0x40.0" />
+	<field name="hist_min_measurement" descr="Lowest measurement/low limit of the histogram \;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors(= 0)\;In case of hist_type = 2, represent LL RS FEC symbol errors \;( = 0)\;" access="RO" offset="0x8.0" size="0x0.8" />
+	<field name="hist_max_measurement" descr="Highest measurement/high limit of the histogram:\;Example:\;In case of hist_type = 1, represent KP4 RS FEC symbol \;errors ( = 15)\;In case of hist_type = 2, represent LL RS FEC symbol errors \;( = 7)" access="RO" offset="0x8.16" size="0x0.8" />
+	<field name="bin_range_write_mask" descr="Valid only if we (write enable) = 1 \;Ignored on GET \;Write mask for the bin_range array. \;If bit X is set, bin_range [X] write should be execute\;Else if bit X is clear, ignored value in written to bin_range [X]" access="WO" offset="0xC.0" size="0x0.16" />
+	<field name="bin_range" descr="Write to bin_range[x] is applicable only if we = 1 &amp; the cor\;responding bits in bin_range_write_mask is set.\;Mapping of measurement units to a bin\;See Table 1406, &quot;PPHCR - Port Phy Bin Range Histo\;gram Configuration Layout,&quot; on page 1663" subnode="pphcr_bin_range_ext" access="RW" high_bound="15" low_bound="0" offset="0x10.0" size="0x40.0" />
 </node>
 
 <node name="pplm_reg_ext" descr="" size="0x50.0" >
-	<field name="port_type" descr="Supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Gearbox - Host side)\;2 - Internal IC Port \;3 - Far-End Port (For Gearbox - Line side)\;Other values are reserved.\;\;Using port_type &apos;0&apos; will override all different parts of the link \;structure\;Using port_type &apos;1&apos; will configure also port_type &apos;2&apos; accord\;ingly and vise versa" access="INDEX" offset="0x0.8" size="0x0.4" />
+	<field name="port_type" descr="Supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Gearbox - Host side)\;2 - Internal IC Port \;3 - Far-End Port (For Gearbox - Line side)\;4 - Main Die to Die (USR / SCC)\;5 - Tile Die to Die (USR / SCC)\;\;Other values are reserved.\;\;Using port_type &apos;0&apos; will override all different parts of the link \;structure\;Using port_type &apos;1&apos; will configure also port_type &apos;2&apos; accordingly \;and vise versa\;Using port_type &apos;4&apos; will configure also port_type &apos;5&apos; accordingly \;and vise versa" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. \;0 - Local port number\;1 - IB / label port number\;[Internal] 3 - Out of band" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
@@ -4946,16 +5154,16 @@
 	<field name="fec_override_cap_56g" descr="56GE Ethernet FEC override capability bitmask:\;0: No-FEC\;1: Firecode_FEC\;2: Reserved2\;3: Reserved3" access="RO" enum="No=0x0,Firecode_FEC=0x1,Reserved2=0x2,Reserved3=0x3" offset="0x10.16" size="0x0.4" />
 	<field name="rs_fec_correction_bypass_cap" descr="RS-FEC correction bypass override capability:\;0: NO_correction_bypass\;1: RS-FEC_correction_bypass" access="RO" enum="NO_correction_bypass=0x0,RS=0x1" offset="0x10.28" size="0x0.4" />
 	<field name="fec_override_admin_10g_40g" descr="10GE/40GE Ethernet FEC override admin, see \;10g_40g_fec_override_cap.\;(one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;\;" access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2" offset="0x14.0" size="0x0.4" />
-	<field name="fec_override_admin_25g" descr="25GE Ethernet FEC override admin, see 25g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_ad\;min must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.4" size="0x0.4" />
-	<field name="fec_override_admin_50g" descr="50GE Ethernet FEC override admin, see 50g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_ad\;min must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.8" size="0x0.4" />
-	<field name="fec_override_admin_100g" descr="100GE Ethernet FEC override admin, see 100g_fec_over\;ride_cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;4: RS-FEC" access="RW" enum="auto_mode=0x0,No_FEC=0x1,RS=0x4" offset="0x14.12" size="0x0.4" />
+	<field name="fec_override_admin_25g" descr="25GE Ethernet FEC override admin, see 25g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_admin \;must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.4" size="0x0.4" />
+	<field name="fec_override_admin_50g" descr="50GE Ethernet FEC override admin, see 50g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC\;4: RS-FEC\;\;Note - 25g_fec_override_admin and 50g_fec_override_admin \;must be set with the same value." access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2,RS=0x4" offset="0x14.8" size="0x0.4" />
+	<field name="fec_override_admin_100g" descr="100GE Ethernet FEC override admin, see 100g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;4: RS-FEC" access="RW" enum="auto_mode=0x0,No_FEC=0x1,RS=0x4" offset="0x14.12" size="0x0.4" />
 	<field name="fec_override_admin_56g" descr="56GE Ethernet FEC override admin, see 56g_fec_override_\;cap. (one-hot setting): \;0: auto_mode - no override\;1: No_FEC\;2: Firecode_FEC" access="RW" enum="auto_mode=0x0,No_FEC=0x1,Firecode_FEC=0x2" offset="0x14.16" size="0x0.4" />
 	<field name="rs_fec_correction_bypass_admin" descr="RS-FEC correction bypass override admin: (one-hot setting): \;0: auto_mode - no override \;1: NO_correction_bypass\;2: RS-FEC_correction_bypass" access="RW" enum="auto_mode=0x0,NO_correction_bypass=0x1,RS=0x2" offset="0x14.28" size="0x0.4" />
 	<field name="fec_override_cap_200g_4x" descr="200GE FEC override capability bitmask:\;Bit 0 - Reserved \;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved \;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium LL RS-FEC (272,257+1)\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;[Internal] Bit 14 - ELL (272,257+1) + PLR\;" access="RO" offset="0x18.0" size="0x0.16" />
 	<field name="fec_override_cap_400g_8x" descr="400GE FEC override capability bitmask:\;Bit 0 - Reserved \;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved\;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium LL RS-FEC (272,257+1)\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;[Internal] Bit 14 - ELL (272,257+1) + PLR\;" access="RO" offset="0x18.16" size="0x0.16" />
 	<field name="fec_override_cap_50g_1x" descr="50GE single lane override capability bitmask:\;Bit 0 - Reserved \;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved \;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium LL RS-FEC (272,257+1)\;[Internal] Bit 12 - RS-FEC - (544,514) + PLR\;[Internal] Bit 13 - LL-FEC - (271,257) + PLR\;[Internal] Bit 14 - ELL - (272,257+1) + PLR" access="RO" offset="0x1C.0" size="0x0.16" />
 	<field name="fec_override_cap_100g_2x" descr="100GE over 2 lanes, FEC override capability bitmask:\;Bit 0 - Reserved\;Bit 1- Reserved \;Bit 2- Reserved \;Bit 3- Reserved \;Bit 4- Reserved\;Bit 5- Reserved\;Bit 6- Reserved\;Bit 7 - RS-FEC (544,514)\;[Internal] Bit 8 - Zero Latency FEC\;Bit 9- 50G Ethernet Consortium Low Latency RS-FEC \;(272,257+1)\;[Internal] Bit 12 - RS-FEC (544,514) + PLR\;[Internal] Bit 13 - LL-FEC (271,257) + PLR\;[Internal] Bit 14 - ELL (272,257+1) + PLR\;" access="RO" offset="0x1C.16" size="0x0.16" />
-	<field name="fec_override_admin_200g_4x" descr="200GE FEC override admin bitmask (one-hot setting) \;Bit 0: Auto_mode\;Bit 7: RS_FEC_544_514 - (544,514)\;Bit 8: Zero_Latency_FEC - [Internal] \;Bit 9: RS_FEC_272_257_plus_1 - (272,257+1)\;Bit 12: RS_FEC_544_514_PLR - (544,514) + PLR [Internal]\;Bit 13: LL_FEC_271_257_PLR - (271,257) + PLR [Internal]\;Bit 14: LL_FEC_272_257_plus_1 - (272,257+1) + PLR [Inter\;nal]" access="RW" enum="Auto_mode=0x1,RS_FEC_544_514=0x80,Zero_Latency_FEC=0x100,RS_FEC_272_257_plus_1=0x200,RS_FEC_544_514_PLR=0x1000,LL_FEC_271_257_PLR=0x2000,LL_FEC_272_257_plus_1=0x4000" offset="0x20.0" size="0x0.16" />
+	<field name="fec_override_admin_200g_4x" descr="200GE FEC override admin bitmask (one-hot setting) \;Bit 0: Auto_mode\;Bit 7: RS_FEC_544_514 - (544,514)\;Bit 8: Zero_Latency_FEC - [Internal] \;Bit 9: RS_FEC_272_257_plus_1 - (272,257+1)\;Bit 12: RS_FEC_544_514_PLR - (544,514) + PLR [Internal]\;Bit 13: LL_FEC_271_257_PLR - (271,257) + PLR [Internal]\;Bit 14: LL_FEC_272_257_plus_1 - (272,257+1) + PLR [Internal]" access="RW" enum="Auto_mode=0x1,RS_FEC_544_514=0x80,Zero_Latency_FEC=0x100,RS_FEC_272_257_plus_1=0x200,RS_FEC_544_514_PLR=0x1000,LL_FEC_271_257_PLR=0x2000,LL_FEC_272_257_plus_1=0x4000" offset="0x20.0" size="0x0.16" />
 	<field name="fec_override_admin_400g_8x" descr="400GE FEC override admin bitmast (one-hot setting): \;0: Auto_mode\;7: RS-FEC_(544,514)\;8: Zero_Latency_FEC \;9: RS-FEC_(272,257+1)\;12: RS-FEC_(544,514) - + PLR [Internal]\;13: LL-FEC_(271,257) - + PLR [Internal]\;14: LL-FEC_(272,257+1) - + PLR [Internal]" access="RW" offset="0x20.16" size="0x0.16" />
 	<field name="fec_override_admin_50g_1x" descr="50GE, 1lanes FEC override admin bitmask (one-hot setting)\;0 - Auto mode\;Bit 7 is set- RS-FEC (544,514)\;[Internal] Bit 8 is set - Zero Latency FEC \;Bit 9 is set - RS-FEC (272,257+1)\;[Internal] Bit 12 is set - RS-FEC (544,514) + PLR\;[Internal] Bit 13 is set - LL-FEC (271,257) + PLR \;[Internal] Bit 14 is set - LL-FEC (272,257+1) + PLR" access="RW" offset="0x24.0" size="0x0.16" />
 	<field name="fec_override_admin_100g_2x" descr="100GE, 2 lanes FEC override admin bitmask (one-hot setting):\;0: Auto_mode\;Bit 0 is set - Reserved\;Bit 2 is set - Reserved \;Bit 7 is set- RS-FEC (544,514)\;[Internal] Bit 8 is set - Zero Latency FEC \;Bit 9 is set - RS-FEC (272,257+1)\;[Internal] Bit 12 is set - RS-FEC (544,514) + PLR\;[Internal] Bit 13 is set - LL-FEC (271,257) + PLR \;[Internal] Bit 14 is set - LL-FEC (272,257+1) + PLR" access="RW" offset="0x24.16" size="0x0.16" />
@@ -4974,16 +5182,16 @@
 	<field name="op_mod" descr="operational mode for link configurations for phy_ local_loop\;back mode.\;0 - link will operate in optimal latency performance mode\;1 - link will operate in same configurations as operational \;port.\;\;Note: for FEC override via PPLM register, chosen FEC will be \;according to the PPLM configuration that was set and this bit \;will be ignored for FEC purposes" access="OP" offset="0x0.8" size="0x0.1" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="lb_en" descr="Loopback enable - One-hot key.\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback\;Bit 2: External_local_loopback\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback" access="RW" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80" offset="0x4.0" size="0x0.8" />
-	<field name="lb_cap" descr="Loopback capability - bitmask\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback - When set the port&apos;s egress traffic \;is looped back to the receiver and the port transmitter is dis\;abled.\;Bit 2: External_local_loopback - Enables the port&apos;s transmit\;ter to link with the port&apos;s receiver using an external loopback \;connector.\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback - When set the port&apos;s egress Link \;layer traffic is looped back to the receiver. Physical port in \;this loopback mode is down.\;\;Note - Phy remote loopback can be supported only for lane \;rate higher than 25Gbuad in the 16nm devices.\;" access="RO" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80" offset="0x4.16" size="0x0.8" />
+	<field name="lb_en" descr="Loopback enable - One-hot key.\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback\;Bit 2: External_local_loopback\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback\;Bit 8: GLoop - [internal]" access="RW" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80,GLoop=0x100" offset="0x4.0" size="0x0.12" />
+	<field name="lb_cap" descr="Loopback capability - bitmask\;Bit 0: Phy_remote_loopback\;Bit 1: Phy_local_loopback - When set the port&apos;s egress traffic \;is looped back to the receiver and the port transmitter is dis\;abled.\;Bit 2: External_local_loopback - Enables the port&apos;s transmit\;ter to link with the port&apos;s receiver using an external loopback \;connector.\;Bit 3: Near_end_analog_loopback - [Internal]\;Bit 4: Near_end_digital_loopback - [Internal]\;Bit 7: LL_local_loopback - When set the port&apos;s egress Link \;layer traffic is looped back to the receiver. Physical port in this \;loopback mode is down.\;Bit 8: GLoop - [internal]\;\;Note - Phy remote loopback can be supported only for lane \;rate higher than 25Gbuad in the 16nm devices.\;" access="RO" enum="Phy_remote_loopback=0x1,Phy_local_loopback=0x2,External_local_loopback=0x4,Near_end_analog_loopback=0x8,Near_end_digital_loopback=0x10,LL_local_loopback=0x80,GLoop=0x100" offset="0x4.16" size="0x0.12" />
 </node>
 
 <node name="pprr_ext" descr="" size="0x14.0" >
 	<field name="register_index" descr="Index of Port Range Register being accessed\;Range is 0 .. cap_max_acl_l4_port_range-1" access="INDEX" offset="0x0.0" size="0x0.8" />
-	<field name="ip_length" descr="Field type (ip_length is a legacy inadequate name):\;0: L4_PORT - the range is applied to l4 port. Default\;1: IP_LENGTH - The range is applied to IP Length. \;For Spectrum: when set, these fields must be set to 0: udp, tcp, \;src, dst. For Spectrum-2: these fields can be used\;2: TTL. outer TTL (IP or MPLS). port_range_min[15:8] and \;port_range_max[15:8] are reserved. Rsvd when Spectrum-1. \;3: CUSTOM_BYTE_SET. Custom byte set is according to cbset. \;Reserved when Spectrum.\;4: ING_LOCAL_PORT_USER_MEM. Rsvd when Spectrum-1.\;5: UTC_29_14. UTC bits 29:14. Reserved when Spectrum-1.\;6: PRBS (Pseudo Random). Reserved when Spectrum-1.\;15: None - comparator result is &apos;0&apos;. Reserved when Spectrum.\;\;Value 0,1, applies to both inner and outer depending on out\;er_inner field\;Vales, 2,3,4,5,6 are not supported when outer_inner is INNER\;\;Reserved when SwitchX/-2" access="RW" offset="0x0.16" size="0x0.4" />
-	<field name="outer_inner" descr="0: OUTER - Apply port range register to outer IP header\;1: INNER - Apply port range register to inner IP header, \;Reserved when SwitchX/-2, supported by Spectrum/-2\;2: BOTH - Apply port range register to outer IP header or to \;inner IP header, Reserved when SwitchX/-2, and for Spectrum-\;2" access="RW" offset="0x0.22" size="0x0.2" />
-	<field name="ignore_l4" descr="Ignore L4. Apply port range register regardless of L4. When set \;tcp and udp are reserved. Default 0.\;Must not be set when ip_length points to layer 4 fields.\;Reserved when SwitchX/-2 or Spectrum" access="RW" offset="0x0.24" size="0x0.1" />
-	<field name="ignore_l3" descr="Ignore L3. Apply port range register regardless of L3. When set \;ipv4 and ipv6 are reserved. Default 0.\;Must not be set when ip_length points to layer 3 fields.\;Reserved when SwitchX/-2 or Spectrum" access="RW" offset="0x0.25" size="0x0.1" />
+	<field name="ip_length" descr="Field type (ip_length is a legacy inadequate name):\;0: L4_PORT - the range is applied to l4 port. Default\;1: IP_LENGTH - The range is applied to IP Length. \;For Spectrum: when set, these fields must be set to 0: udp, \;tcp, src, dst. For Spectrum-2: these fields can be used\;2: TTL. outer TTL (IP or MPLS). port_range_min[15:8] and \;port_range_max[15:8] are reserved. Rsvd when Spectrum-1. \;3: CUSTOM_BYTE_SET. Custom byte set is according to \;cbset. Reserved when Spectrum.\;4: ING_LOCAL_PORT_USER_MEM. Rsvd when Spectrum-1.\;5: UTC_29_14. UTC bits 29:14. Reserved when Spectrum-1.\;6: PRBS (Pseudo Random). Reserved when Spectrum-1.\;15: None - comparator result is &apos;0&apos;. Reserved when Spec\;trum.\;\;Value 0,1, applies to both inner and outer depending on out\;er_inner field\;Vales, 2,3,4,5,6 are not supported when outer_inner is INNER\;Reserved when SwitchX/-2\;" access="RW" offset="0x0.16" size="0x0.4" />
+	<field name="outer_inner" descr="0: OUTER - Apply port range register to outer IP header\;1: INNER - Apply port range register to inner IP header, \;Reserved when SwitchX/-2, supported by Spectrum/-2\;2: BOTH - Apply port range register to outer IP header or to \;inner IP header, Reserved when SwitchX/-2, and for Spec\;trum-2" access="RW" offset="0x0.22" size="0x0.2" />
+	<field name="ignore_l4" descr="Ignore L4. Apply port range register regardless of L4. When \;set tcp and udp are reserved. Default 0.\;Must not be set when ip_length points to layer 4 fields.\;Reserved when SwitchX/-2 or Spectrum" access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="ignore_l3" descr="Ignore L3. Apply port range register regardless of L3. When \;set ipv4 and ipv6 are reserved. Default 0.\;Must not be set when ip_length points to layer 3 fields.\;Reserved when SwitchX/-2 or Spectrum" access="RW" offset="0x0.25" size="0x0.1" />
 	<field name="udp" descr="Apply port range register to UDP packets\;Default 0" access="RW" offset="0x0.26" size="0x0.1" />
 	<field name="tcp" descr="Apply port range register to TCP packets\;Default 0" access="RW" offset="0x0.27" size="0x0.1" />
 	<field name="dst" descr="Apply port range register to destination L4 ports\;Default 0" access="RW" offset="0x0.28" size="0x0.1" />
@@ -4993,11 +5201,11 @@
 	<field name="port_range_max" descr="Maximum port range for comparison" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="port_range_min" descr="Minimum port range for comparison.\;Match is defined as: \;port_range_min &lt;= packet_port &lt;= port_range_max" access="RW" offset="0x4.16" size="0x0.16" />
 	<field name="comp_type" descr="Comparator type:\;0: Range - from port_range_min to port_range_max\;1: Match_Val - match either port_range_min or port_range_\;max, supported from Spectrum-4 and on\;[Spectrum-4]" access="RW" offset="0x8.0" size="0x0.2" />
-	<field name="cbset" descr="Custom Bytes Set\;Range 0 .. cap_max_custom_byte_sets-1See encoding in \;Table 2499, &quot;Spectrum Custom Bytes Sets,&quot; on page 3068\;Note: at a given time no more than 2 cbsets can be used (for \;different register_index values)\;Reserved when ip_length != CUSTOM_BYTE_SET\;Reserved when SwitchX/-2 and Spectrum\;" access="RW" offset="0x10.0" size="0x0.8" />
+	<field name="cbset" descr="Custom Bytes Set\;Range 0 .. cap_max_custom_byte_sets-1See encoding in \;Table 2712, &quot;Spectrum Custom Bytes Sets,&quot; on \;page 2862\;Note: at a given time no more than 2 cbsets can be used (for \;different register_index values)\;Reserved when ip_length != CUSTOM_BYTE_SET\;Reserved when SwitchX/-2 and Spectrum\;" access="RW" offset="0x10.0" size="0x0.8" />
 </node>
 
 <node name="pprt_reg_ext" descr="" size="0x24.0" >
-	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPRT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for \;get operations." access="OP" offset="0x0.0" size="0x0.1" />
+	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPRT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for get \;operations." access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="ls" descr="Per Lane configuration support: \;0 - No support of per lane configuration\;1 - Support of per lane configuration" access="RO" offset="0x0.1" size="0x0.1" />
 	<field name="port_type" descr="Supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR main\;5 - USR tail\;Other values are reserved.\;" access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Reserved when (le=0 or ls = 0)\;Logical lane number\;[internal] Mapping to physical lane number can be queried \;in PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
@@ -5036,11 +5244,11 @@
 
 <node name="pptb_reg_ext" descr="" size="0x10.0" >
 	<field name="pm" descr="prioX_buff mask - enables update of the prioX_buff field.\;Bit i is a flag for updating the mapping for switch priority i." access="WO" offset="0x0.0" size="0x0.8" />
-	<field name="um" descr="untagged_buff mask - enables update of the untagged_buff \;field.\;Reserved for Spectrum family.\;Reserved for HCA devices." access="WO" offset="0x0.8" size="0x0.1" />
-	<field name="cm" descr="ctrl_buff mask - enables update of the ctrl_buff field.\;NOTE: This field is ignored by the device, and control traffic \;is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2) \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="WO" offset="0x0.9" size="0x0.1" />
+	<field name="um" descr="untagged_buff mask - enables update of the \;untagged_buff field.\;Reserved for Spectrum family.\;Reserved for HCA devices." access="WO" offset="0x0.8" size="0x0.1" />
+	<field name="cm" descr="ctrl_buff mask - enables update of the ctrl_buff field.\;NOTE: This field is ignored by the device, and control traf\;fic is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2) \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="WO" offset="0x0.9" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="mm" descr="Mapping mode\;0: Mapping both Unicast and Multicast packets to the same \;buffer\;In get operation, 0 means Unicast only.\;1: Mapping Unicast only\;2: Mapping Multicast only\;This field is reserved for HCA devices\;SwitchX/-2 support &apos;0&apos; only" access="INDEX" offset="0x0.28" size="0x0.2" />
+	<field name="mm" descr="Mapping mode\;0: Mapping both Unicast and Multicast packets to the \;same buffer\;In get operation, 0 means Unicast only.\;1: Mapping Unicast only\;2: Mapping Multicast only\;This field is reserved for HCA devices\;SwitchX/-2 support &apos;0&apos; only" access="INDEX" offset="0x0.28" size="0x0.2" />
 	<field name="prio0buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.0" size="0x0.4" />
 	<field name="prio1buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.4" size="0x0.4" />
 	<field name="prio2buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.8" size="0x0.4" />
@@ -5049,9 +5257,9 @@
 	<field name="prio5buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.20" size="0x0.4" />
 	<field name="prio6buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.24" size="0x0.4" />
 	<field name="prio7buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 0..7\;" access="RW" offset="0x4.28" size="0x0.4" />
-	<field name="untagged_buff" descr="Mapping of untagged frames to one of the allocated receive \;port buffers.\;NOTE: In SwitchX/-2, this field must be mapped to a buffer \;8.\;\;Reserved for Spectrum. Spectrum maps untagged packets \;based on the Switch Priority.\;Reserved for HCA devices" access="RW" offset="0x8.0" size="0x0.4" />
-	<field name="ctrl_buff" descr="Mapping of control frames to one of the allocated receive \;port buffers.\;NOTE: This field is ignored by the device, and control traffic \;is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2), \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="RW" offset="0x8.4" size="0x0.4" />
-	<field name="pm_msb" descr="prioX_buff mask - enables update of the prioX_buff field.\;Bit i is a flag for updating the mapping for switch priority i+8.\;Reserved for HCA device" access="WO" offset="0x8.24" size="0x0.8" />
+	<field name="untagged_buff" descr="Mapping of untagged frames to one of the allocated \;receive port buffers.\;NOTE: In SwitchX/-2, this field must be mapped to a buffer \;8.\;\;Reserved for Spectrum. Spectrum maps untagged pack\;ets based on the Switch Priority.\;Reserved for HCA devices" access="RW" offset="0x8.0" size="0x0.4" />
+	<field name="ctrl_buff" descr="Mapping of control frames to one of the allocated receive \;port buffers.\;NOTE: This field is ignored by the device, and control traf\;fic is mapped to a pre-defined buffer (buffer - 9).\;In some old implementations (on SwitchX and SwitchX-2), \;software is required to use the value 9 in this field, later \;devices ignore this field.\;Reserved for HCA devices" access="RW" offset="0x8.4" size="0x0.4" />
+	<field name="pm_msb" descr="prioX_buff mask - enables update of the prioX_buff field.\;Bit i is a flag for updating the mapping for switch priority \;i+8.\;Reserved for HCA device" access="WO" offset="0x8.24" size="0x0.8" />
 	<field name="prio8buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 8..15\;" access="RW" offset="0xC.0" size="0x0.4" />
 	<field name="prio9buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 8..15\;" access="RW" offset="0xC.4" size="0x0.4" />
 	<field name="prio10buff" descr="Mapping of Switch Priority of &lt;X&gt; to one of the allocated \;receive port buffers.\;&lt;X&gt; = 8..15\;" access="RW" offset="0xC.8" size="0x0.4" />
@@ -5063,7 +5271,7 @@
 </node>
 
 <node name="pptt_reg_ext" descr="" size="0x1c.0" >
-	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPTT \;configurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for \;get operations" access="OP" offset="0x0.0" size="0x0.1" />
+	<field name="le" descr="Per Lane configuration enable (can be set only if ls = 1):\;0 - No per lane configuration\;1 - Per lane configurations\;When le is cleared, lane index is reserved and all PPTT con\;figurations are taking place on all lanes.\;When le is set, configurations are taking place per lane \;based on lane index\;Affects lane indexing for set operations only, ignored for get \;operations" access="OP" offset="0x0.0" size="0x0.1" />
 	<field name="ls" descr="Per Lane configuration support/capability: \;0 - No support of per lane configuration\;1 - Support of per lane configuration" access="RO" offset="0x0.1" size="0x0.1" />
 	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main [internal] \;5 - USR Tail [internal] \;Other values are reserved.\;Note: PRBS can be enabled only for two entities that \;directly connected to each other.\;For non MCM and no Retimer/Gearbox only 0 allowed.\;For non MCM and with Retimer/Gearbox 2-1 or 3 or 0.\;For MCM without Retimer/Gearbox 4-5 or 2 or 0.\;For MCM with Retimer/Gearbox 4-5 or 2-1 or 3 or 0.\;all the port will be in test mode when PRBS is enabled." access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Reserved when (le=0 or ls = 0)\;Logical lane number\;[internal] Mapping to physical lane number can be queried \;in PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
@@ -5092,11 +5300,11 @@
 
 <node name="prcr_ext" descr="" size="0x40.0" >
 	<field name="offset" descr="Offset within the source region to copy/move from" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="op" descr="Operation:\;0: Move rules\;1: Copy rules \;Move/Copy the rules from tcan_region_info starting at offset \;offset to dest_tcam_region_info at offset dest_offset." access="OP" offset="0x0.28" size="0x0.4" />
+	<field name="op" descr="Operation:\;0: Move rules\;1: Copy rules \;Move/Copy the rules from tcan_region_info starting at off\;set offset to dest_tcam_region_info at offset dest_offset." access="OP" offset="0x0.28" size="0x0.4" />
 	<field name="size" descr="The number of rules to copy/move" access="OP" offset="0x4.0" size="0x0.16" />
-	<field name="tcam_region_info" descr="Opaque object that represents the source TCAM region.\;See Section 10.9.13, &quot;PTAR - Policy-Engine TCAM Allo\;cation Register&quot;, on page 2482.\;See Table 2002, &quot;tcam_region_info Layout,&quot; on \;page 2508" subnode="tcam_region_info_prcr_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the source TCAM region.\;See Section 10.9.13, &quot;PTAR - Policy-Engine TCAM Allo\;cation Register&quot;, on page 2258.\;See Table 2159, &quot;tcam_region_info Layout,&quot; on \;page 2284" subnode="tcam_region_info_prcr_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
 	<field name="dest_offset" descr="Offset within the destination region to copy/move to" access="INDEX" offset="0x20.0" size="0x0.16" />
-	<field name="dest_tcam_region_info" descr="Opaque object that represents the destination TCAM region.\;See Section 10.9.13, &quot;PTAR - Policy-Engine TCAM Allo\;cation Register&quot;, on page 2482." access="INDEX" high_bound="3" low_bound="0" offset="0x30.0" size="0x10.0" />
+	<field name="dest_tcam_region_info" descr="Opaque object that represents the destination TCAM region.\;See Section 10.9.13, &quot;PTAR - Policy-Engine TCAM Allo\;cation Register&quot;, on page 2258." access="INDEX" high_bound="3" low_bound="0" offset="0x30.0" size="0x10.0" />
 </node>
 
 <node name="prei_reg_28nm_ext" descr="" size="0x8.0" >
@@ -5114,13 +5322,13 @@
 	<field name="ber_mantissa" descr="Desired Raw BER for injection.\;BER = ber_mantissa * 10^(-ber_exp)\;Valid BER mantissa are 1,5" access="RW" offset="0x4.8" size="0x0.4" />
 	<field name="en" descr="1 - start the error injection process" access="WO" offset="0x4.31" size="0x0.1" />
 	<field name="lane_rate_cap" descr="Per lane rate capability for feature (bitmask)\;Bit 0 - 1GE (1.25 Gb/s)\;Bit 1 - SDR (2.5 Gb/s) \;Bit 2 - XAUI/2.5GE (3.125 Gb/s)\;Bit 3- DDR (5 Gb/s) \;Bit 4- QDR (10 Gb/s) \;Bit 5- FDR10 / 10GE/40GE (10.3125 Gb/s) \;Bit 6- FDR (14.0625 Gb/s) \;Bit 7- EDR / 25GE / 50GE / 100GE (25.78125 Gb/s) \;Bit 8 - 50GE-KR4 (12.89 Gb/s) \;Bit 9 - HDR /50GE / 100GE / 200GE / 400GE (26.5625Gbd / \;53.125Gb/s)" access="RO" offset="0x8.16" size="0x0.16" />
-	<field name="page_data" descr="Table  1067, &quot;PREI - Port Receive Error Injection Register Lay\;out for 28nm,&quot; on page  1632" subnode="prei_reg_28nm_ext" access="RW" offset="0x10.0" size="0x8.0" />
+	<field name="page_data" descr="Table 1194, &quot;PREI - Port Receive Error Injection Register \;Layout for 28nm,&quot; on page 1418" subnode="prei_reg_28nm_ext" access="RW" offset="0x10.0" size="0x8.0" />
 </node>
 
 <node name="prio_j_ext" descr="" size="0x4.0" >
-	<field name="color2" descr="The DSCP mapping for color k, where k=0..2, see Table 2127, \;&quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.8" size="0x0.8" />
-	<field name="color1" descr="The DSCP mapping for color k, where k=0..2, see Table 2127, \;&quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.16" size="0x0.8" />
-	<field name="color0" descr="The DSCP mapping for color k, where k=0..2, see Table 2127, \;&quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.24" size="0x0.8" />
+	<field name="color2" descr="The DSCP mapping for color k, where k=0..2, see Table 2302, \;&quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.8" size="0x0.8" />
+	<field name="color1" descr="The DSCP mapping for color k, where k=0..2, see Table 2302, \;&quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.16" size="0x0.8" />
+	<field name="color0" descr="The DSCP mapping for color k, where k=0..2, see Table 2302, \;&quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.24" size="0x0.8" />
 </node>
 
 <node name="prm_register_payload_ext" descr="" size="0x104.0" >
@@ -5138,28 +5346,28 @@
 </node>
 
 <node name="ptar_ext" descr="" size="0x30.0" >
-	<field name="key_type" descr="TCAM key type for the region.\;See Table 1458, &quot;ACL Keys Summary,&quot; on page 2140 for \;list of supported key types.\;\;" access="WO" offset="0x0.0" size="0x0.8" />
-	<field name="action_set_type" descr="Type of action set to be used on this region.\;For SwitchX/-2: See Table 1830, &quot;ACL Actions-Set Sum\;mary,&quot; on page 2384.\;For Spectrum/-2: always &apos;2&apos; Flexible Action Set" access="WO" offset="0x0.16" size="0x0.8" />
-	<field name="e" descr="Egress\;0: egress ACL\;1: ingress ACL\;Reserved when Spectrum/-2 since direction is not relevant for \;allocation" access="WO" offset="0x0.27" size="0x0.1" />
+	<field name="key_type" descr="TCAM key type for the region.\;See Table 1597, &quot;ACL Keys Summary,&quot; on page 1890 for \;list of supported key types.\;\;" access="WO" offset="0x0.0" size="0x0.8" />
+	<field name="action_set_type" descr="Type of action set to be used on this region.\;For SwitchX/-2: See Table 1977, &quot;ACL Actions-Set Sum\;mary,&quot; on page 2145.\;For Spectrum/-2: always &apos;2&apos; Flexible Action Set" access="WO" offset="0x0.16" size="0x0.8" />
+	<field name="e" descr="Egress\;0: egress ACL\;1: ingress ACL\;Reserved when Spectrum/-2 since direction is not relevant \;for allocation" access="WO" offset="0x0.27" size="0x0.1" />
 	<field name="op" descr="For Write operation\;0: ALLOCATE a TCAM region\;1: RESIZE a TCAM region\;2: DEALLOACTE TCAM region\;3: TEST allocation\;The RESIZE and TEST have no significance for the A-TCAM \;which does not need to allocate a region size\;" access="RW" offset="0x0.28" size="0x0.4" />
-	<field name="region_size" descr="TCAM region size. \;For op = ALLOCATE or op = RESIZE or op = TEST: this field is \;set by SW and the device returns the actual allocated size.\;Note that actual size may be larger than requested.\;Allowed range 1 .. cap_max_rules-1\;Reserved when op = DEALLOCATE\;For Spectrum-2: The region_size is relevant only for C-TCAM. \;Value of 0 is for no C-TCAM." access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="region_size" descr="TCAM region size. \;For op = ALLOCATE or op = RESIZE or op = TEST: this field is \;set by SW and the device returns the actual allocated size.\;Note that actual size may be larger than requested.\;Allowed range 1 .. cap_max_rules-1\;Reserved when op = DEALLOCATE\;For Spectrum-2: The region_size is relevant only for C-\;TCAM. Value of 0 is for no C-TCAM." access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="region_id" descr="Region identifier\;Range 0 .. cap_max_regions-1" access="INDEX" offset="0x8.0" size="0x0.16" />
 	<field name="packet_rate" descr="TCAM region expected packet rate performance.\;Granularity is of 5%\;Reserved when Spectrum-2\;\;" access="WO" offset="0xC.0" size="0x0.5" />
 	<field name="op_type" descr="Optimization Type\;0: No optimization\;1: Soft optimization\;2: Hard optimization\;Reserved when op is 1 RESIZE and previous size is not 0 or \;when op is 2 (DEALLOACTE TCAM) or when op is 3 (TEST)\;\;\;\;\;" access="WO" offset="0xC.8" size="0x0.2" />
 	<field name="ctcam_dup" descr="C-TCAM duplication:\;0: dup 1\;1: dup 2\;2: dup 4\;This field controls duplication according to op_type\;Reserved when op_type = 0\;Reserved when Spectrum" access="WO" offset="0xC.12" size="0x0.3" />
-	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;For op = ALLOCATE: returned by the device.\;For op = RESIZE or op = DEALLOCATE: provided as input to \;the device.\;See Table 1968, &quot;tcam_region_info Layout,&quot; on \;page 2484\;\;" subnode="tcam_region_info_ptar_ext" access="RW" offset="0x10.0" size="0x10.0" />
-	<field name="flexible_key_id" descr="Identifier of the Flexible Key. \;For Spectrum: only valid if (key_type = FLEX_KEY) \;For Spectrum-2: only valid if (key_type = FLEX_KEY2)\;See Table 1970, &quot;flexible key Layout,&quot; on page 2484\;For Spectrum and for C-TCAM: The key size will be rounded \;up to one of the following values: 32B, 64B, 96B (2, 4 or 6 key \;blocks)\;For Spectrum-2 A-TCAM: The key size will be rounded up to \;one of the following values: 16B, 32B, 64B, 96B (2, 4, 8 or 12 \;key blocks)\;Reserved when op = RESIZE or op = DEALLOCATE\;\;" access="WO" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;For op = ALLOCATE: returned by the device.\;For op = RESIZE or op = DEALLOCATE: provided as input to \;the device.\;See Table 2125, &quot;tcam_region_info Layout,&quot; on \;page 2261\;\;" subnode="tcam_region_info_ptar_ext" access="RW" offset="0x10.0" size="0x10.0" />
+	<field name="flexible_key_id" descr="Identifier of the Flexible Key. \;For Spectrum: only valid if (key_type = FLEX_KEY) \;For Spectrum-2: only valid if (key_type = FLEX_KEY2)\;See Table 2127, &quot;flexible key Layout,&quot; on page 2261\;For Spectrum and for C-TCAM: The key size will be rounded \;up to one of the following values: 32B, 64B, 96B (2, 4 or 6 \;key blocks)\;For Spectrum-2 A-TCAM: The key size will be rounded up to \;one of the following values: 16B, 32B, 64B, 96B (2, 4, 8 or 12 \;key blocks)\;Reserved when op = RESIZE or op = DEALLOCATE\;\;" access="WO" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
 </node>
 
 <node name="ptce_ext" descr="" size="0xf0.0" >
 	<field name="offset" descr="Offset within the region to which to write." access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="op" descr="Operation:\;For Write:\;0: WRITE_operation - Used to write a new entry to the table. \;All R/W fields are relevant for new entry. Activity bit is cleared \;for new entries\;1: UPDATE_action - Only action set will be updated.\;2: CLEAR_ACTIVITY - activity bit is cleared for the entry\;For Query:\;0: READ_operation\;1: CLEAR_ON_READ - on read operation. Used to read entry \;and clear Activity bit." access="OP" enum="READ_operation=0x0,CLEAR_ON_READ=0x1" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation:\;For Write:\;0: WRITE_operation - Used to write a new entry to the table. \;All R/W fields are relevant for new entry. Activity bit is \;cleared for new entries\;1: UPDATE_action - Only action set will be updated.\;2: CLEAR_ACTIVITY - activity bit is cleared for the entry\;For Query:\;0: READ_operation\;1: CLEAR_ON_READ - on read operation. Used to read entry \;and clear Activity bit." access="OP" enum="READ_operation=0x0,CLEAR_ON_READ=0x1" offset="0x0.20" size="0x0.3" />
 	<field name="a" descr="Activity. Set if a packet lookup has hit on the specific entry.\;To clear the a bit, use &quot;clear activity&quot; op or &quot;clear on read&quot; \;operation." access="RO" offset="0x0.30" size="0x0.1" />
 	<field name="v" descr="Valid." access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;\;See Table 1982, &quot;tcam_region_info Layout,&quot; on \;page 2494" subnode="tcam_region_info_ptce_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
-	<field name="key" descr="ACL Key as described in Section 10.4, &quot;ACL Keys&quot;, on \;page 2140" access="RW" high_bound="15" low_bound="0" offset="0x20.0" size="0x40.0" />
-	<field name="mask" descr="Bitmask in the same size as key. A bit that is set directs the \;TCAM to compare the corresponding bit in key. A bit that is \;clear directs the TCAM to ignore the corresponding bit in key." access="RW" high_bound="15" low_bound="0" offset="0x60.0" size="0x40.0" />
-	<field name="action_set" descr="Action-set to perform when rule is matched as described in \;Section 10.7.10, &quot;ACL Action-Set&quot;, on page 2384.\;Must be zeros padded if action set is shorter." access="RW" high_bound="15" low_bound="0" offset="0xA0.0" size="0x40.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;\;See Table 2139, &quot;tcam_region_info Layout,&quot; on \;page 2270" subnode="tcam_region_info_ptce_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
+	<field name="key" descr="ACL Key as described in Section 10.4, &quot;ACL Keys&quot;, on \;page 1890" access="RW" high_bound="15" low_bound="0" offset="0x20.0" size="0x40.0" />
+	<field name="mask" descr="Bitmask in the same size as key. A bit that is set directs the \;TCAM to compare the corresponding bit in key. A bit that is \;clear directs the TCAM to ignore the corresponding bit in \;key." access="RW" high_bound="15" low_bound="0" offset="0x60.0" size="0x40.0" />
+	<field name="action_set" descr="Action-set to perform when rule is matched as described in \;Section 10.7.10, &quot;ACL Action-Set&quot;, on page 2145.\;Must be zeros padded if action set is shorter." access="RW" high_bound="15" low_bound="0" offset="0xA0.0" size="0x40.0" />
 	<field name="asbind" descr="Action-set bind. Bind an ACL or ACL group to the action-set.\;The ACL/ACL group is indicated by the g field." access="RW" offset="0xE0.30" size="0x0.1" />
 	<field name="term" descr="Terminate binding process." access="RW" offset="0xE0.31" size="0x0.1" />
 	<field name="acl_id_group_id" descr="When g=0:\;ACL identifier (acl_id)\;Range of acl id is 0..cap_max_acl_regions-1\;When g=1:\;ACL group identifier (acl_group_id)\;Range of group id is 0..cap_max_acl_groups-1" access="RW" offset="0xE4.0" size="0x0.16" />
@@ -5169,40 +5377,40 @@
 
 <node name="ptce_v2_ext" descr="" size="0x188.0" >
 	<field name="offset" descr="Offset within the region to which to write." access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="op" descr="Operation\;For Write:\;0: WRITE operation. Used to write a new entry to the table. All\;R/W fields are relevant for new entry. Activity bit is set for new\;entries - Note write with v = 0 will delete the entry\;1: UPDATE action. Only flexible_action_set and priority will be\;updated.\;2: CLEAR activity. Activity bit is cleared for the entry3: \;WRITE_CLEAR. Does WRITE with CLEAR activity For Query:\;0: READ operation.\;1: CLEAR_ON_READ on read operation. Used to read entry \;and\;clear Activity bit." access="RW" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: WRITE operation. Used to write a new entry to the table. \;All\;R/W fields are relevant for new entry. Activity bit is set for \;new\;entries - Note write with v = 0 will delete the entry\;1: UPDATE action. Only flexible_action_set and priority will \;be\;updated.\;2: CLEAR activity. Activity bit is cleared for the entry3: \;WRITE_CLEAR. Does WRITE with CLEAR activity For Query:\;0: READ operation.\;1: CLEAR_ON_READ on read operation. Used to read entry \;and\;clear Activity bit." access="RW" offset="0x0.20" size="0x0.3" />
 	<field name="a" descr="Activity. Set if a packet lookup has hit on the specific entry.\;To clear the a bit, use &quot;clear activity&quot; op or &quot;clear on read&quot; \;operation\;Reserved when Spectrum-2" access="RO" offset="0x0.30" size="0x0.1" />
 	<field name="v" descr="Valid." access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="priority" descr="Priority of the rule, higher values win\;For Spectrum-2 range is 1.. cap_kvd_size-1\;Note: priority does not have to be unique per rule\;Within a region, higher priority should have lower offset (no \;limitation between regions in a multi-ACL)\;Reserved when SwitchX/-2 and Spectrum" access="RW" offset="0x4.0" size="0x0.24" />
-	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;See Table 1986, &quot;tcam_region_info Layout,&quot; on \;page 2496" subnode="tcam_region_info_ptce_v2_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
-	<field name="flex_key_blocks" descr="ACL Keys\;For Spectrum: Flex keys, see Section 10.5.2, &quot;Flexible ACL \;Key Blocks Layout&quot;, on page 2172\;For Spectrum-2: Flex2 keys, see Section 10.6.2, &quot;Flex2 ACL \;Key Blocks Layout&quot;, on page 2233" access="RW" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;See Table 2143, &quot;tcam_region_info Layout,&quot; on \;page 2272" subnode="tcam_region_info_ptce_v2_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
+	<field name="flex_key_blocks" descr="ACL Keys\;For Spectrum: Flex keys, see Section 10.5.2, &quot;Flexible \;ACL Key Blocks Layout&quot;, on page 1925\;For Spectrum-2: Flex2 keys, see Section 10.6.2, &quot;Flex2 \;ACL Key Blocks Layout&quot;, on page 1993" access="RW" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
 	<field name="mask" descr="Mask, at the same size as key. per bit:\;0: TCAM will ignore the bit in key\;1: TCAM will compare the bit in key" access="RW" high_bound="23" low_bound="0" offset="0x80.0" size="0x60.0" />
-	<field name="flexible_action_set" descr="according to: Section 10.8, &quot;Flexible ACL Action Set&quot;, on \;page 2388\;Spectrum-2: the flexible_action_set must be all NULL with a \;next_action_set_ptr" access="RW" high_bound="41" low_bound="0" offset="0xE0.0" size="0xa8.0" />
+	<field name="flexible_action_set" descr="according to: Section 10.8, &quot;Flexible ACL Action Set&quot;, on \;page 2150\;Spectrum-2: the flexible_action_set must be all NULL with \;a next_action_set_ptr" access="RW" high_bound="41" low_bound="0" offset="0xE0.0" size="0xa8.0" />
 </node>
 
 <node name="ptce_v3_ext" descr="" size="0xa4.0" >
 	<field name="dup" descr="Insert the rule on duplicated regions\;0: 1 duplication\;1..16: dup duplications \;(values of 0 and 1 have the same meaning)" access="WO" offset="0x0.0" size="0x0.5" />
-	<field name="op" descr="Operation\;For Write:\;0: WRITE operation. Used to write a new entry to the table. All \;R/W fields are relevant for new entry. Activity bit is set for new \;entries - Note write with v = 0 will delete the entry\;Note: WRITE must not be used if an entry exists!!! 1: UPDATE \;an existing rule. \;\;\;For Query:\;0: READ operation.\;" access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: WRITE operation. Used to write a new entry to the table. \;All R/W fields are relevant for new entry. Activity bit is set for \;new entries - Note write with v = 0 will delete the entry\;Note: WRITE must not be used if an entry exists!!! 1: \;UPDATE an existing rule. \;\;\;For Query:\;0: READ operation.\;" access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="v" descr="Valid" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="priority" descr="Priority of the rule, higher values win\;For Spectrum-2 range is 1.. cap_kvd_size-1\;Note: priority does not have to be unique per rule" access="RW" offset="0x4.0" size="0x0.24" />
-	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;(See Table 1990, &quot;tcam_region_info Layout,&quot; on \;page 2500)" subnode="tcam_region_info_ptce_v3_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
-	<field name="flex2_key_blocks" descr="ACL Key as described in Section 10.6.2, &quot;Flex2 ACL Key \;Blocks Layout&quot;, on page 2233\;The key must be masked according to the ERP (if ERPs exist \;for the region) or according to master_mask (if no ERPs for \;the region)" access="INDEX" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;(See Table 2147, &quot;tcam_region_info Layout,&quot; on \;page 2276)" subnode="tcam_region_info_ptce_v3_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
+	<field name="flex2_key_blocks" descr="ACL Key as described in Section 10.6.2, &quot;Flex2 ACL Key \;Blocks Layout&quot;, on page 1993\;The key must be masked according to the ERP (if ERPs exist \;for the region) or according to master_mask (if no ERPs for \;the region)" access="INDEX" high_bound="23" low_bound="0" offset="0x20.0" size="0x60.0" />
 	<field name="erp_id" descr="Erp ID" access="INDEX" offset="0x80.0" size="0x0.4" />
 	<field name="delta_start" descr="Start point of delta value and mask\;Units of bits\;The value must not exceed (num_key_blocks * 36 - 8)\;E.g. for 12 key blocks, range is 0..424 (432 = 12*36-8)\;Reserved when delta_mask = 0\;" access="INDEX" offset="0x84.0" size="0x0.10" />
-	<field name="delta_value" descr="Delta value\;Bits which are masked by delta_mask are reserved (must be \;0)" access="INDEX" offset="0x88.0" size="0x0.8" />
+	<field name="delta_value" descr="Delta value\;Bits which are masked by delta_mask are reserved (must \;be 0)" access="INDEX" offset="0x88.0" size="0x0.8" />
 	<field name="delta_mask" descr="Delta mask\;Per bit:\;0: ignore relevant bit in delta_value\;1: compare relevant bit in delta_value\;Delta mask must not be set for reserved field in the key \;blocks\;Note: no delta when no ERPs, thus for regions with PER\;ERP.erpt_pointer_valid=0 the delta_mask must be 0" access="INDEX" offset="0x88.16" size="0x0.8" />
 	<field name="prune_vector" descr="Pruning vector relative to the PERPT.erp_id.\;Used for reducing lookups\;0: NEED - need to do a lookup on the erpt entry\;1: PRUNE - no need to do a lookup on the erpt entry\;May be modified by PEAPBL, PEAPBM\;Note: for Spectrum-2 a region with 8 key blocks must be set \;either to all 1&apos;s or all 0&apos;s" access="RW" offset="0x90.0" size="0x0.16" />
 	<field name="prune_ctcam" descr="Pruning on C-TCAM. Used for reducing lookups\;0: NEED - need to do a lookup in the C-TCAM\;1: PRUNE - no need to do a lookup in the C-TCAM\;May be modified by PEAPBL, PEAPBM" access="RW" offset="0x94.31" size="0x0.1" />
-	<field name="large_entry_key_id" descr="Large entry key ID\;A key for 12 Key block rules \;Reserved when the region has less than 12 key blocks\;Within a region: must be different for keys which have differ\;ent 6 Key blocks msb (key blocks 6..11). Must be the same for \;key blocks which have common 6 Key blocks msb.\;Range 0 .. cap_max_pe_large_key_id- 1 \;\;Must not be updated by SW when op=UPDATE\;When op=UPDATE the large_entry_key_id must be identical to \;the value that already exists" access="RW" offset="0x98.0" size="0x0.24" />
+	<field name="large_entry_key_id" descr="Large entry key ID\;A key for 12 Key block rules \;Reserved when the region has less than 12 key blocks\;Within a region: must be different for keys which have dif\;ferent 6 Key blocks msb (key blocks 6..11). Must be the \;same for key blocks which have common 6 Key blocks msb.\;Range 0 .. cap_max_pe_large_key_id- 1 \;\;Must not be updated by SW when op=UPDATE\;When op=UPDATE the large_entry_key_id must be identical \;to the value that already exists" access="RW" offset="0x98.0" size="0x0.24" />
 	<field name="large_exists" descr="Large entry key ID exists\;Within this region:\;0: SINGLE: The large_entry_key_id is not currently in use\;For rule insert: the msb of the key will be added\;For rule delete: the msb of the key will be removed\;1: NON_SINGLE: The large_entry_key_id is currently in use\;For rule insert: the msb of the key will not be added\;For rule delete: the msb of the key will not be removed\;\;rule insert: op=WRITE with v=1\;rule delete: op=WRITE with v=0\;Reserved when op=UPDATE" access="WO" offset="0x98.31" size="0x0.1" />
 	<field name="action_pointer" descr="Pointer to action, see PEFA\;Range is 0.. cap_max_kvd_action_sets - 1" access="RW" offset="0xA0.0" size="0x0.24" />
-	<field name="paptr" descr="Partial action pointer, see PEFA\;0: pointer to full action pointer or to partial pointer 0\;1: pointer to partial pointer 1\;Note that &quot;full action set&quot; and &quot;partial action set, partial index \;0&quot; have the same pointer but different indexes" access="RW" offset="0xA0.30" size="0x0.2" />
+	<field name="paptr" descr="Partial action pointer, see PEFA\;0: pointer to full action pointer or to partial pointer 0\;1: pointer to partial pointer 1\;Note that &quot;full action set&quot; and &quot;partial action set, partial \;index 0&quot; have the same pointer but different indexes" access="RW" offset="0xA0.30" size="0x0.2" />
 </node>
 
 <node name="ptcead_ext" descr="" size="0x220.0" >
 	<field name="offset" descr="Offset within the multicast forwarding table\;Must be N*32" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="op" descr="0: Read activity\;1: Read and clear activity" access="OP" offset="0x0.30" size="0x0.2" />
 	<field name="num_rec" descr="Number of records to read\;Range 1..4096" access="OP" offset="0x4.0" size="0x0.13" />
-	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;See Table 1994, &quot;tcam_region_info Layout,&quot; on \;page 2502" subnode="tcam_region_info_ptcead_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
+	<field name="tcam_region_info" descr="Opaque object that represents the TCAM region.\;See Table 2151, &quot;tcam_region_info Layout,&quot; on \;page 2278" subnode="tcam_region_info_ptcead_ext" access="INDEX" offset="0x10.0" size="0x10.0" />
 	<field name="activity_vector" descr="Activity per offset\;Line 20h bit 31 is for entry offset+4095\;Line 21C bit 0 is for entry offset+0\;Bits higher than num_rec are reserved\;Bits higher than region_size are reserved\;For non-valid offsets the activity is reserved" access="RO" high_bound="127" low_bound="0" offset="0x20.0" size="0x200.0" />
 </node>
 
@@ -5212,7 +5420,7 @@
 	<field name="error_type_oper" descr="Error injection opertional status\;0x0 - No error injection\;0x1 - Performing error injection" access="RO" offset="0x0.24" size="0x0.4" />
 	<field name="ber_exp" descr="BER for injection.\;BER = ber_mantissa * 10^(-ber_exp)" access="RW" offset="0x4.0" size="0x0.8" />
 	<field name="ber_mantissa" descr="BER for injection.\;BER = ber_mantissa * 10^(-ber_exp)" access="RW" offset="0x4.8" size="0x0.4" />
-	<field name="error_injection_time" descr="Duration in 10 msec the port will generate errors.\;Reading this field will return the time left for errors to inject \;in msec\;\;\;0x0000 indicates no generation of errors.\;When set to 0xFFFF - No decremental operation, meaning \;the errors will be injected continuously without stop condi\;tion.\;" access="RW" offset="0x4.12" size="0x0.16" />
+	<field name="error_injection_time" descr="Duration in 10 msec the port will generate errors.\;Reading this field will return the time left for errors to inject in \;msec\;\;\;0x0000 indicates no generation of errors.\;When set to 0xFFFF - No decremental operation, meaning the \;errors will be injected continuously without stop condition.\;" access="RW" offset="0x4.12" size="0x0.16" />
 </node>
 
 <node name="pter_port_page_reg_ext" descr="" size="0x1c.0" >
@@ -5227,7 +5435,7 @@
 	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="error_page" descr="Error_page selection: \;0: Injection_of_Phy_Errors\;1: Injection_of_Port_Errors" access="INDEX" enum="Injection_of_Phy_Errors=0x0,Injection_of_Port_Errors=0x1" offset="0x0.24" size="0x0.4" />
-	<field name="page_data" descr="error injection page data: \;Table  1061, &quot;PTER- Port Transmit Errors Register Phy Level \;Layout,&quot; on page  1628\;Table  1063, &quot;PTER- Port Transmit Errors Register Port Level \;Fields,&quot; on page  1629" subnode="pter_reg_page_data_auto_ext" access="RW" offset="0x4.0" size="0x1c.0" union_selector="$(parent).error_page" />
+	<field name="page_data" descr="error injection page data: \;Table 1188, &quot;PTER- Port Transmit Errors Register Phy \;Level Layout,&quot; on page 1414\;Table 1190, &quot;PTER- Port Transmit Errors Register Port \;Level Fields,&quot; on page 1415" subnode="pter_reg_page_data_auto_ext" access="RW" offset="0x4.0" size="0x1c.0" union_selector="$(parent).error_page" />
 </node>
 
 <node name="pter_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0x1c.0" >
@@ -5242,9 +5450,9 @@
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="force_tx_aba_param" descr="When AN is disabled, use aba TX set. \;" access="RW" offset="0x0.24" size="0x0.1" />
 	<field name="an_disable_cap" descr="Auto Negotiation disable capability:\;0 - Device does not support AN disable\;1 - Device Supports  AN disable" access="RO" offset="0x0.29" size="0x0.1" />
-	<field name="an_disable_admin" descr="Auto Negotiation disable:\;0 - Normal operation \;1 - Disable AN.\;Note: In Ethernet port, when Disabling AN, the &quot;eth_pro\;to_admin&quot; bit mask must comply to single speed rate set.\;In IB port, when Disabling AN, the &quot;ib_proto_admin&quot; bit \;mask must comply to single speed rate set.\;It&apos;s recommended to validate the FEC override bits in PPLM \;when operating with AN. \;\;" access="RW" offset="0x0.30" size="0x0.1" />
+	<field name="an_disable_admin" descr="Auto Negotiation disable:\;0 - Normal operation \;1 - Disable AN.\;Note: In Ethernet port, when Disabling AN, the &quot;eth_pro\;to_admin&quot; bit mask must comply to single speed rate set.\;In IB port, when Disabling AN, the &quot;ib_proto_admin&quot; bit mask \;must comply to single speed rate set.\;It&apos;s recommended to validate the FEC override bits in PPLM \;when operating with AN. \;\;" access="RW" offset="0x0.30" size="0x0.1" />
 	<field name="reserved_high" descr="THIS BIT MUST BE TIED TO 1!\;This is old capability bit that address AN_DISABLE capability \;with only one enabled protocol." access="RO" offset="0x0.31" size="0x0.1" />
-	<field name="data_rate_oper" descr="Port data rate in resolution of 100 Mb/s (data_rate_oper * \;100 Mb/s)\;Value 0x0 indicates this field is not supported." access="RO" offset="0x4.0" size="0x0.16" />
+	<field name="data_rate_oper" descr="Port data rate in resolution of 100 Mb/s (data_rate_oper * 100 \;Mb/s)\;Value 0x0 indicates this field is not supported." access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="max_port_rate" descr="Port maxium data rate in resolution of 1 Gb/s \;(data_rate_oper * 1 Gb/s)\;Value 0x0 indicates this field is not supported.\;" access="RO" offset="0x4.16" size="0x0.12" />
 	<field name="an_status" descr="Auto Negotiation status: \;0: Status_is_unavailable\;1: AN_completed_successfully \;2: AN_performed_but_failed\;3: AN_was_not_performed_link_is_up \;4: AN_was_not_performed_link_is_down" access="RO" enum="Status_is_unavailable=0x0,AN_completed_successfully=0x1,AN_performed_but_failed=0x2,AN_was_not_performed_link_is_up=0x3,AN_was_not_performed_link_is_down=0x4" offset="0x4.28" size="0x0.4" />
 	<field name="ext_eth_proto_capability" descr="For HCA: See also PCAM.feature_cap_mask bit 13 for \;Extended Ethernet protocol support.\;Extended Ethernet port speed/protocols supported (bit\;mask):\;Bit 0: SGMII_100M\;Bit 1: 1000BASE-X / SGMII\;Bit 3: 5GBASE-R\;Bit 4: XFI / XAUI-1 // 10G\;Bit 5: XLAUI-4/XLPPI-4 // 40G \;Bit 6: 25GAUI-1/ 25GBASE-CR / KR \;Bit 7: 50GAUI-2 / LAUI-2/ 50GBASE-CR2/KR2 \;Bit 8: 50GAUI-1 /50GBASE-CR / KR\;Bit 9: CAUI-4 / 100GBASE-CR4 / KR4\;Bit 10: 100GAUI-2 / 100GBASE-CR2 / KR2 \;Bit 11: 100GAUI-1 / 100GBASE-CR / KR\;Bit 12: 200GAUI-4 / 200GBASE-CR4/KR4\;Bit 13: 200GAUI-2 / 200GBASE-CR2/KR2\;Bit 14: Reserved [internal] Placeholder for 200GAUI-1\;Bit 15: 400GAUI-8/ 400GBASE-CR8\;Bit 16: 400GAUI-4/ 400GBASE-CR4\;Bit 17: Reserved [internal] Placeholder for 400GAUI-2\;Bit 18: Reserved [internal] Placeholder for 400GAUI-1\;Bit 19: 800GAUI-8/ 800GBASE-CR8\;Bit 31: SGMII_10M\;Other - Reserved" access="RO" offset="0x8.0" size="0x4.0" />
@@ -5260,10 +5468,10 @@
 	<field name="ib_proto_oper" descr="InfiniBand port speed bitmask" access="RO" offset="0x28.0" size="0x0.16" />
 	<field name="ib_link_width_oper" descr="InfiniBand port link width bitmask\;" access="RO" offset="0x28.16" size="0x0.16" />
 	<field name="connector_type" descr="Connector type indication\;0: No_connector_or_unknown \;1: PORT_NONE - None\;2: PORT_TP - Twisted Pair\;3: PORT_AUI - AUI\;4: PORT_BNC - BNC\;5: PORT_MII - MII\;6: PORT_FIBRE - FIBRE\;7: PORT_DA - Direct Attach Copper\;8: PORT_OTHER - Other" access="RO" enum="No_connector_or_unknown=0x0,PORT_NONE=0x1,PORT_TP=0x2,PORT_AUI=0x3,PORT_BNC=0x4,PORT_MII=0x5,PORT_FIBRE=0x6,PORT_DA=0x7,PORT_OTHER=0x8" offset="0x2C.0" size="0x0.4" />
-	<field name="force_kr_frames_admin" descr="Ethernet Force mode options when AN disable is set.\;0 - auto, keep normal operation\;1 - Do Force KR Startup LT flow\;2 - Do not do Force KR Startup LT flow\;\;Note: Ignored when an_disable_admin is not set\;Force KR Flow is possible for PAM4 links only" access="RW" offset="0x2C.28" size="0x0.2" />
-	<field name="force_kr_frames_cap" descr="0 - device does not support Force KR Startup LT flow\;1 - device supports Force KR Startup LT flow\;\;Note: Ignored when an_disable_admin is not set\;Force KR Flow is possible for PAM4 links only" access="RO" offset="0x2C.30" size="0x0.1" />
+	<field name="force_lt_frames_admin" descr="Ethernet Force mode options when AN disable is set.\;0 - auto, keep normal operation\;1 - Do Force LT (KR Startup) flow\;2 - Do not do LT (KR Startup) flow\;\;Note: Ignored when an_disable_admin is not set\;In Ethernet port, when setting force LT flow, the &quot;eth_pro\;to_ext_admin&quot; bit mask must comply to single speed rate \;set.\;Force LT Flow is possible for PAM4 links only" access="RW" offset="0x2C.28" size="0x0.2" />
+	<field name="force_lt_frames_cap" descr="0 - device does not support Force LT (KR Startup) flow\;1 - device supports Force LT (KR Startup) flow\;\;Note: Ignored when an_disable_admin is not set\;Force KR Flow is possible for PAM4 links only" access="RO" offset="0x2C.30" size="0x0.1" />
 	<field name="eth_proto_lp_valid" descr="If set indicates that eth_proto_lp_advertise has valid adver\;tisement" access="RO" offset="0x2C.31" size="0x0.1" />
-	<field name="eth_proto_lp_advertise" descr="Ethernet port&apos;s link partner advertised protocols according \;to PTYS.ext_eth_proto_capability mask. \;Returns the protocols that were advertised by the link part\;ner during auto-negotiation.\;Valid only if eth_proto_lp_valid is set" access="RO" offset="0x30.0" size="0x4.0" />
+	<field name="eth_proto_lp_advertise" descr="Ethernet port&apos;s link partner advertised protocols according to \;PTYS.ext_eth_proto_capability mask. \;Returns the protocols that were advertised by the link part\;ner during auto-negotiation.\;Valid only if eth_proto_lp_valid is set" access="RO" offset="0x30.0" size="0x4.0" />
 </node>
 
 <node name="pude_reg_ext" descr="" size="0x10.0" >
@@ -5315,7 +5523,7 @@
 </node>
 
 <node name="qdpm_ext" descr="" size="0x40.0" >
-	<field name="dscp" descr="DSCP entry is the DSCP to Switch Priority mapping. For \;more details refer to Table 2069." access="RW" high_bound="63" low_bound="0" offset="0x0.24" size="0x40.0" />
+	<field name="dscp" descr="DSCP entry is the DSCP to Switch Priority mapping. For \;more details refer to Table 2244." access="RW" high_bound="63" low_bound="0" offset="0x0.24" size="0x40.0" />
 </node>
 
 <node name="qeec_ext" descr="" size="0x20.0" >
@@ -5349,13 +5557,13 @@
 <node name="qepm_ext" descr="" size="0x14.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port.\;Supported for data packets from CPU port." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="exp" descr="EXP entry is the EXP to Switch Priority mapping. For more \;details refer to Table 2077, &quot;exp&lt;i&gt; Layout,&quot; on \;page 2593" access="RW" high_bound="7" low_bound="0" offset="0x4.16" size="0x10.0" />
+	<field name="exp" descr="EXP entry is the EXP to Switch Priority mapping. For more \;details refer to Table 2252, &quot;exp&lt;i&gt; Layout,&quot; on \;page 2381" access="RW" high_bound="7" low_bound="0" offset="0x4.16" size="0x10.0" />
 </node>
 
 <node name="qetcr_ext" descr="" size="0x50.0" >
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="tc_configuration" descr="Per-tclass configuration. For details, refer to Table 2085, \;&quot;ETS tcN Configuration Register Layout&quot;." subnode="ets_ext" access="RW" high_bound="7" low_bound="0" offset="0x8.0" size="0x40.0" />
-	<field name="global_configuration" descr="Global configuration. For details, refer to Table 2087, &quot;ETS \;Global Configuration Register Layout&quot;.\;" subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
+	<field name="tc_configuration" descr="Per-tclass configuration. For details, refer to Table 2260, \;&quot;ETS tcN Configuration Register Layout&quot;." subnode="ets_ext" access="RW" high_bound="7" low_bound="0" offset="0x8.0" size="0x40.0" />
+	<field name="global_configuration" descr="Global configuration. For details, refer to Table 2262, &quot;ETS \;Global Configuration Register Layout&quot;.\;" subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
 </node>
 
 <node name="qgcr_ext" descr="" size="0x8.0" >
@@ -5423,25 +5631,25 @@
 <node name="qpdpm_ext" descr="" size="0x84.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local Port.\;Supported for data packets from CPU port." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="dscp" descr="DSCP entry is the DSCP to Switch Priority mapping. For more \;details refer to Table 2073" access="RW" high_bound="63" low_bound="0" offset="0x4.16" size="0x80.0" />
+	<field name="dscp" descr="DSCP entry is the DSCP to Switch Priority mapping. For more \;details refer to Table 2248" access="RW" high_bound="63" low_bound="0" offset="0x4.16" size="0x80.0" />
 </node>
 
 <node name="qpdsm_ext" descr="" size="0x44.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port.\;No support for CPU port." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="switch_prio" descr="The DSCP mapping for Switch Priority i, See Table 2125, \;&quot;switch_prio&lt;j&gt; Layout&quot;\;Switch Prio range is from 0 to cap_max_switch_priorities-\;1" subnode="prio_j_ext" access="RW" high_bound="15" low_bound="0" offset="0x4.0" size="0x40.0" />
+	<field name="switch_prio" descr="The DSCP mapping for Switch Priority i, See Table 2300, \;&quot;switch_prio&lt;j&gt; Layout&quot;\;Switch Prio range is from 0 to cap_max_switch_priorities-\;1" subnode="prio_j_ext" access="RW" high_bound="15" low_bound="0" offset="0x4.0" size="0x40.0" />
 </node>
 
 <node name="qpem_ext" descr="" size="0x104.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port.\;No support for CPU port.\;No support for router port." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="switch_prio" descr="The EXP mapping for Switch Priority i, See \;Table 2117, &quot;switch_prio&lt;i&gt; Layout&quot;\;Switch Prio range is from 0 to cap_max_switch_pri\;orities-1" subnode="switch_prio_ext" access="RW" high_bound="15" low_bound="0" offset="0x4.0" size="0x100.0" />
+	<field name="switch_prio" descr="The EXP mapping for Switch Priority i, See \;Table 2292, &quot;switch_prio&lt;i&gt; Layout&quot;\;Switch Prio range is from 0 to cap_max_switch_pri\;orities-1" subnode="switch_prio_ext" access="RW" high_bound="15" low_bound="0" offset="0x4.0" size="0x100.0" />
 </node>
 
 <node name="qppm_ext" descr="" size="0x44.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port.\;No support for CPU port." access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="switch_prio" descr="The PCP mapping for Switch Priority i, See Table 2131, \;&quot;switch_prio&lt;j&gt; Layout&quot;\;Switch Prio range is from 0 to cap_max_switch_priorities-\;1" subnode="switch_prio_j_ext" access="RW" high_bound="15" low_bound="0" offset="0x4.0" size="0x40.0" />
+	<field name="switch_prio" descr="The PCP mapping for Switch Priority i, See Table 2306, \;&quot;switch_prio&lt;j&gt; Layout&quot;\;Switch Prio range is from 0 to cap_max_switch_priorities-\;1" subnode="switch_prio_j_ext" access="RW" high_bound="15" low_bound="0" offset="0x4.0" size="0x40.0" />
 </node>
 
 <node name="qprt_ext" descr="" size="0x8.0" >
@@ -5471,7 +5679,7 @@
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="fr" descr="Fast Response - the device will shape the rate to its mini\;mum value upon receive of WQE LWM (Low WaterMark) \;event \;0: disable\;1: enable" access="RW" offset="0x0.25" size="0x0.1" />
 	<field name="ch" descr="Connected host:\;0: The configuration will be applied on the host calling \;QSHR. \;1: The configuration will be applied on the host connected \;to the function calling the QSHR." access="INDEX" offset="0x0.27" size="0x0.1" />
-	<field name="global_configuration" descr="Global configuration. For details, refer to Table 2087, &quot;ETS \;Global Configuration Register Layout&quot;." subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
+	<field name="global_configuration" descr="Global configuration. For details, refer to Table 2262, &quot;ETS \;Global Configuration Register Layout&quot;." subnode="ets_global_ext" access="RW" offset="0x48.0" size="0x8.0" />
 </node>
 
 <node name="qsipg_ext" descr="" size="0x8.0" >
@@ -5533,7 +5741,7 @@
 	<field name="overlay_ecn" descr="ECN field of the IP header in the overlay network\;If the packet has no overlay IP header, the decapsulation \;uses the mapped value &apos;0&apos;" access="INDEX" offset="0x4.16" size="0x0.2" />
 	<field name="underlay_ecn" descr="ECN field of the IP header in the underlay network" access="INDEX" offset="0x4.24" size="0x0.2" />
 	<field name="trap_id" descr="Trap ID\;Trap-ID is DECAP_ECN0 or DECAP_ECN1 \;\;Reserved when trap_en is &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.10" />
-	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet \;Trap&quot;, on page 465" access="RW" offset="0x8.28" size="0x0.4" />
+	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet \;Trap&quot;, on page 513" access="RW" offset="0x8.28" size="0x0.4" />
 </node>
 
 <node name="qteem_ext" descr="" size="0xc.0" >
@@ -5551,7 +5759,7 @@
 	<field name="dec_pcp_rw" descr="For decapsulation: how to handle the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Clear the pcp_rewrite_en\;3: Set the pcp_rewrite_en" access="RW" offset="0x8.0" size="0x0.2" />
 	<field name="dec_dscp_rw" descr="For decapsulation: how to handle the dscp_rewrite_en:\;0: Preserve the value of the dscp_rewrite_en\;2: Clear the dscp_rewrite_en\;3: Set the dscp_rewrite_en" access="RW" offset="0x8.2" size="0x0.2" />
 	<field name="dec_set_pcp" descr="For decapsulation: how to set the overlay PCP,DEI fields:\;0: Preserve/Set inner PCP,DEI when push. When \;untagged push value according to QPDPC tunnel_port for \;PCP,DEI \;1: Copy the PCP,DEI from the underlay L2 header (default)\;Note: for L3 overlay a &quot;virtual-pcp&quot; is set, used for ACL \;lookup" access="RW" offset="0x8.20" size="0x0.1" />
-	<field name="dec_set_sp" descr="For decapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority\;1: Set a new Switch Priority from overlay DSCP as config\;ured by RDPM (of the overlay packet, even if not routed). If \;dec_set_dscp is COPY then take new DSCP.\;See Section 13.11.20, &quot;RDPM - Router DSCP to Prior\;ity Mapping Register&quot;, on page 2818." access="RW" offset="0x8.24" size="0x0.1" />
+	<field name="dec_set_sp" descr="For decapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority\;1: Set a new Switch Priority from overlay DSCP as config\;ured by RDPM (of the overlay packet, even if not routed). If \;dec_set_dscp is COPY then take new DSCP.\;See Section 13.14.20, &quot;RDPM - Router DSCP to Prior\;ity Mapping Register&quot;, on page 2625." access="RW" offset="0x8.24" size="0x0.1" />
 	<field name="dec_set_dscp" descr="For decapsulation: how to set the overlay DSCP field, if \;exists, while stripping off the underlay headers:\;0: Preserve inner DSCP\;1: Copy the DSCP from the underlay IP header" access="RW" offset="0x8.28" size="0x0.1" />
 </node>
 
@@ -5577,7 +5785,7 @@
 	<field name="virtual_router" descr="Virtual Router ID\;Range is 0..cap_max_virtual_routers-1" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="protocol" descr="Protocol\;0: Unicast IPv4\;1: Unicast IPv6" access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="bin" descr="The LPM entries assigned to this bin may be updated.\;" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="old_bmp_len" descr="The value of the bmp_len field in the rules assigned to bin that \;would be replaced by new_bmp_len." access="INDEX" offset="0x4.16" size="0x0.8" />
+	<field name="old_bmp_len" descr="The value of the bmp_len field in the rules assigned to bin \;that would be replaced by new_bmp_len." access="INDEX" offset="0x4.16" size="0x0.8" />
 	<field name="prefix_len" descr="The prefix length of the LPM route that was added/removed\;" access="INDEX" offset="0x8.0" size="0x0.8" />
 	<field name="new_bmp_len" descr="The value of the bmp_len that would be written instead of the \;old_bmp_len" access="WO" offset="0x8.16" size="0x0.8" />
 	<field name="ip" descr="This field is the prefix of the LPM route that was added/\;removed.. The field must be padded with zeros after the first \;prefix_len bits." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
@@ -5600,7 +5808,7 @@
 <node name="ralst_ext" descr="" size="0x104.0" >
 	<field name="tree_id" descr="Tree identifier numbered from 1..(cap_shspm_max_trees-1)." access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="root_bin" descr="The bin number of the root bin. \;0&lt;root_bin=&lt;(length of IP address)\;For a default-route tree configure 0xff" access="RW" offset="0x0.16" size="0x0.8" />
-	<field name="bin" descr="Holding the childs of the bin according to the stored tree&apos;s struc\;ture. The most significant byte is the bin&apos;s number of the left \;child and the least significant byte holds the right child. See \;Table 2327, &quot;bin Layout,&quot; on page 2832. \;0xFF indicates that there is no child. For trees composed of less \;than 4 blocks, the bins in excess are reserved.\;Note that tree_id 0 is allocated for a default-route tree, bins are \;0xff" access="RW" high_bound="128" low_bound="1" offset="0x4.16" size="0x100.0" />
+	<field name="bin" descr="Holding the childs of the bin according to the stored tree&apos;s \;structure. The most significant byte is the bin&apos;s number of the \;left child and the least significant byte holds the right child. \;See Table 2508, &quot;bin Layout,&quot; on page 2621. \;0xFF indicates that there is no child. For trees composed of \;less than 4 blocks, the bins in excess are reserved.\;Note that tree_id 0 is allocated for a default-route tree, bins \;are 0xff" access="RW" high_bound="128" low_bound="1" offset="0x4.16" size="0x100.0" />
 </node>
 
 <node name="ralta_ext" descr="" size="0x4.0" >
@@ -5616,19 +5824,19 @@
 </node>
 
 <node name="ralue_ext" descr="" size="0x38.0" >
-	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit on \;the specific entry, only if the entry is a route. To clear the a bit, \;use &quot;clear activity&quot; op.\;Enabled by activity_dis in RGCR, see Section 13.11.2, &quot;RGCR \;- Router General Configuration Register&quot;, on page 2727" access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the table. All \;RW fields are written for new entry. Activity bit is set for new \;entries.\;1: Update operation. Used to update an existing route entry and \;only update the RW fields that are detailed in the field \;op_u_mask. If entry doesn&apos;t exist, the operation fails.\;2: Clear activity. The activity bit (the field a) is cleared for the \;entry.\;3: Delete operation. Used to delete an existing entry. If entry \;doesn&apos;t exist, the operation fails.\;For Query:\;0: Read operation. If entry doesn&apos;t exist, the operation fails\;1: Clear on read operation. Used to read entry and clear Activity \;bit" access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit on \;the specific entry, only if the entry is a route. To clear the a \;bit, use &quot;clear activity&quot; op.\;Enabled by activity_dis in RGCR, see Section 13.11.2, \;&quot;RGCR - Router General Configuration Register&quot;, on \;page 2515" access="RO" offset="0x0.16" size="0x0.1" />
+	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the table. All \;RW fields are written for new entry. Activity bit is set for new \;entries.\;1: Update operation. Used to update an existing route entry \;and only update the RW fields that are detailed in the field \;op_u_mask. If entry doesn&apos;t exist, the operation fails.\;2: Clear activity. The activity bit (the field a) is cleared for the \;entry.\;3: Delete operation. Used to delete an existing entry. If entry \;doesn&apos;t exist, the operation fails.\;For Query:\;0: Read operation. If entry doesn&apos;t exist, the operation fails\;1: Clear on read operation. Used to read entry and clear \;Activity bit" access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="protocol" descr="0: Unicast IPv4\;1: Unicast IPv6" access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="op_u_mask" descr="opcode update mask.\;On read operation, this field is reserved.\;This field is valid for update opcode, otherwise - reserved\;This field is a bitmask of the fields that should be updated\;bit0: entry_type\;bit1: bmp_len\;bit2: action_type and action fields\;bit3: counter_set_type and counter_set_index fields" access="WO" offset="0x4.8" size="0x0.4" />
 	<field name="virtual_router" descr="Virtual Router ID\;Range is 0..cap_max_virtual_routers-1" access="INDEX" offset="0x4.16" size="0x0.16" />
-	<field name="prefix_len" descr="Number of bits in the prefix of the LPM route.\;Note that for IPv6 prefixes, if prefix_len&gt;64 the entry consumes \;two entries in the physical HW table" access="INDEX" offset="0x8.0" size="0x0.8" />
-	<field name="dip" descr="The prefix of the route or of the marker that the object of the \;LPM is compared with. The most significant bits of the dip are \;the prefix. The least significant bits must be &apos;0&apos; if the prefix_len \;is smaller than 128 for IPv6 or smaller than 32 for IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0xC.0" size="0x10.0" />
-	<field name="action_type" descr="Action Type\;Indicates how the IP address is connected\;It can be connected to a local subnet through local_erif or can \;be on a remote subnet connected through a next-hop router, or \;transmitted to the CPU.\;0: REMOTE\;1: LOCAL\;2: IP2ME\;3: AR - Adaptive Routing, reserved when Spectrum\;\;\;Reserved when entry_type = MARKER_ENTRY" access="RW" enum="REMOTE=0x0,LOCAL=0x1,IP2ME=0x2" offset="0x1C.0" size="0x0.4" />
-	<field name="bmp_len" descr="The best match prefix length in the case that there is no match \;for longer prefixes (see &quot;Introduction&quot; on page 2696). \;If (entry_type != MARKER_ENTRY), bmp_len must be equal to \;prefix_len\;Note: for any update operation with entry_type modification \;this field must be set" access="RW" offset="0x1C.16" size="0x0.8" />
-	<field name="entry_type" descr="Entry Type\;1: MARKER_ENTRY\;2: ROUTE_ENTRY\;3: MARKER_AND_ROUTE_ENTRY\;Note - for Marker entries, the action_type and action fields are \;reserved" access="RW" offset="0x1C.30" size="0x0.2" />
-	<field name="action" descr="The forwarding action as function of action_type:\;Section 13.11.26.1, &quot;RALUE Remote Action&quot;, on \;page 2837\;Section 13.11.26.2, &quot;RALUE Local Action&quot;, on page 2838\;Section 13.11.26.3, &quot;RALUE IP2ME Action&quot;, on page 2839\;Section 13.11.26.4, &quot;RALUE AR Action&quot;, on page 2840" access="RW" high_bound="4" low_bound="0" offset="0x20.0" size="0x14.0" />
-	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.24" size="0x0.8" />
+	<field name="prefix_len" descr="Number of bits in the prefix of the LPM route.\;Note that for IPv6 prefixes, if prefix_len&gt;64 the entry con\;sumes two entries in the physical HW table" access="INDEX" offset="0x8.0" size="0x0.8" />
+	<field name="dip" descr="The prefix of the route or of the marker that the object of the \;LPM is compared with. The most significant bits of the dip \;are the prefix. The least significant bits must be &apos;0&apos; if the pre\;fix_len is smaller than 128 for IPv6 or smaller than 32 for \;IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0xC.0" size="0x10.0" />
+	<field name="action_type" descr="Action Type\;Indicates how the IP address is connected\;It can be connected to a local subnet through local_erif or \;can be on a remote subnet connected through a next-hop \;router, or transmitted to the CPU.\;0: REMOTE\;1: LOCAL\;2: IP2ME\;3: AR - Adaptive Routing, reserved when Spectrum\;\;\;Reserved when entry_type = MARKER_ENTRY" access="RW" enum="REMOTE=0x0,LOCAL=0x1,IP2ME=0x2" offset="0x1C.0" size="0x0.4" />
+	<field name="bmp_len" descr="The best match prefix length in the case that there is no \;match for longer prefixes (see &quot;Introduction&quot; on page 2484). \;If (entry_type != MARKER_ENTRY), bmp_len must be equal to \;prefix_len\;Note: for any update operation with entry_type modification \;this field must be set" access="RW" offset="0x1C.16" size="0x0.8" />
+	<field name="entry_type" descr="Entry Type\;1: MARKER_ENTRY\;2: ROUTE_ENTRY\;3: MARKER_AND_ROUTE_ENTRY\;Note - for Marker entries, the action_type and action fields \;are reserved" access="RW" offset="0x1C.30" size="0x0.2" />
+	<field name="action" descr="The forwarding action as function of action_type:\;Section 13.11.26.1, &quot;RALUE Remote Action&quot;, on \;page 2626\;Section 13.11.26.2, &quot;RALUE Local Action&quot;, on page 2627\;Section 13.11.26.3, &quot;RALUE IP2ME Action&quot;, on \;page 2628\;Section 13.11.26.4, &quot;RALUE AR Action&quot;, on page 2629" access="RW" high_bound="4" low_bound="0" offset="0x20.0" size="0x14.0" />
+	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.24" size="0x0.8" />
 </node>
 
 <node name="rarcc_ext" descr="" size="0x20.0" >
@@ -5648,7 +5856,7 @@
 <node name="rarft_ext" descr="" size="0x10.0" >
 	<field name="arft_index" descr="AR Flow Table Index \;Note: profile1 should be at RALUE.ar_flow_table_size after \;profile0\;Pointer to PGT table" access="INDEX" offset="0x0.0" size="0x0.20" />
 	<field name="arft_entry_in_row" descr="Index to entry in the arft row\;Range 0..cap_max_arft_entries_in_row-1" access="INDEX" offset="0x4.0" size="0x0.4" />
-	<field name="local_port" descr="Egress local_port\;SW may set an entry. HW may change the entry.\;Valid when valid = &quot;1&quot;\;Note: In normal flows the local_port will be changed by HW as \;part of the adaptive routing\;Note: may also be a port which is part of a LAG" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="local_port" descr="Egress local_port\;SW may set an entry. HW may change the entry.\;Valid when valid = &quot;1&quot;\;Note: In normal flows the local_port will be changed by HW \;as part of the adaptive routing\;Note: may also be a port which is part of a LAG" access="RW" offset="0x8.0" size="0x0.8" />
 	<field name="lp_msb" descr="Local port[9:8]" access="RW" offset="0x8.8" size="0x0.2" />
 	<field name="valid" descr="Valid\;SW can set non-valid or valid. HW can only set valid.\;When HW encounters a non-valid entry then HW will choose \;the local_port and will set the valid to &quot;1&quot;\;" access="RW" offset="0x8.16" size="0x0.1" />
 	<field name="ar_prof_id" descr="AR Profile_id:\;1: AR profile 0\;2: AR profile 1\;" access="RW" offset="0xC.0" size="0x0.4" />
@@ -5690,7 +5898,7 @@
 	<field name="inner_bth_ar" descr="Inner BTH.ar (propriety bit)\;Bit0: ar_is_0\;Bit0: ar_is_1\;Reserved when pc_default = 1" access="RW" offset="0x20.8" size="0x0.2" />
 	<field name="inner_bth_opcode_lsb" descr="Bitwise enable on Inner BTH.opcode[4:0]\;Reserved when pc_default = 1" access="RW" offset="0x24.0" size="0x4.0" />
 	<field name="ingress_port" descr="Bitwise enable ingress local_port\;Reserved when pc_default = 1" access="RW" high_bound="31" low_bound="0" offset="0x30.0" size="0x80.0" />
-	<field name="l4port_cmp" descr="See Table 2388, &quot;l4port_cmp Layout,&quot; on page 2879\;Reserved when pc_default = 1" subnode="rarpc_l4port_cmp_ext" access="RW" high_bound="3" low_bound="0" offset="0xB0.0" size="0x20.0" />
+	<field name="l4port_cmp" descr="See Table 2569, &quot;l4port_cmp Layout,&quot; on page 2669\;Reserved when pc_default = 1" subnode="rarpc_l4port_cmp_ext" access="RW" high_bound="3" low_bound="0" offset="0xB0.0" size="0x20.0" />
 </node>
 
 <node name="rarpc_l4port_cmp_ext" descr="" size="0x8.0" >
@@ -5712,8 +5920,8 @@
 </node>
 
 <node name="rarsr_ext" descr="" size="0x8.0" >
-	<field name="ar_srf" descr="Adaptive Routing Shaper Rate From\;Shape the time between flows that can change their destina\;tion from a RIF\;\;Units of 100nSec\;Range 1 or more\;\;Shaper burst size is 1.\;Shaper error is up to *8 faster (e.g. when configured\;1mSec, then there will be 1 to 8 changes in 1mSec)\;" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="ar_srt" descr="Adaptive Routing Shaper Rate To\;Shape the time between flows that can change their destina\;tion to a RIF\;\;Units of 100nSec\;Range 1 or more\;\;Shaper burst size is 1.\;Shaper error is up to *8 faster (e.g. when configured\;1mSec, then there will be 1 to 8 changes in 1mSec)\;" access="RW" offset="0x4.0" size="0x0.16" />
+	<field name="ar_srf" descr="Adaptive Routing Shaper Rate From\;Shape the time between flows that can change their desti\;nation from a RIF\;\;Units of 100nSec\;Range 1 or more\;\;Shaper burst size is 1.\;Shaper error is up to *8 faster (e.g. when configured\;1mSec, then there will be 1 to 8 changes in 1mSec)\;" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="ar_srt" descr="Adaptive Routing Shaper Rate To\;Shape the time between flows that can change their desti\;nation to a RIF\;\;Units of 100nSec\;Range 1 or more\;\;Shaper burst size is 1.\;Shaper error is up to *8 faster (e.g. when configured\;1mSec, then there will be 1 to 8 changes in 1mSec)\;" access="RW" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="ratr_adjacency_parameters_auto_ext" descr="" attr_is_union="1" size="0x18.0" >
@@ -5731,35 +5939,35 @@
 
 <node name="ratr_ext" descr="" size="0x2c.0" >
 	<field name="size" descr="Size - only valid for Allocate / Resize command.\;Reserved when Spectrum/-2" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit on the \;specific entry. To clear the a bit, use &quot;clear activity&quot; opcode.\;Enabled by activity_dis in RGCR, see Section 13.11.2, &quot;RGCR - \;Router General Configuration Register&quot;, on page 2727" access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="v" descr="Valid bit. Indicates if the adjacency entry is valid.\;Note: the device may need some time before reusing an invali\;dated entry. During this time the entry can not be reused. It is \;recommended to use another entry before reusing an invalidated \;entry (e.g. software can put it at the end of the list for reusing). \;Trying to access an invalidated entry not yet cleared by the device \;results with failure indicating &quot;Try Again&quot; status.\;When valid is &apos;0&apos; then egress_router_interface,trap_action, adja\;cency_parameters and counters are reserved\;" access="RW" offset="0x0.24" size="0x0.1" />
-	<field name="opcode" descr="Operation\;For Write:\;0: Allocate/resize Adjacency Table. Reserved when Spectrum/-2\;1: Write Adjacency entry \;2: Deallocate Adjacency Table. Reserved when Spectrum/-2\;3: Write Adjacency entry only if the activity is cleared. The write \;may not succeed if the activity is set. There is not direct feedback \;if the write has succeeded or not, however, the get the response \;and later read accesses to this register will reveal the actual \;entry (SW can compare the get response to the set command). \;This opcode must not be used for new entries \;For Query:\;0: Read \;2: Read and clear activity\;For Spectrum family the allocate/resize and deallocate are \;reserved\;Note that Write operation may also be used for updating \;counter_set_type and counter_index. In this case all other fields \;must not be updated" access="OP" offset="0x0.28" size="0x0.4" />
-	<field name="adjacency_index_15_0" descr="Least significant bits of index into the adjacency table.\;For SwitchX/-2, the adjacency table is linear and used for adja\;cency entries only. \;For Spectrum, the index is to the KVD linear, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; (page 3375)\;For Spectrum-2, the index is to the KVD linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear Entries&quot;, on \;page 3375\;" access="INDEX" offset="0x4.0" size="0x0.16" />
+	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit on \;the specific entry. To clear the a bit, use &quot;clear activity&quot; opcode.\;Enabled by activity_dis in RGCR, see Section 13.11.2, &quot;RGCR \;- Router General Configuration Register&quot;, on page 2515" access="RO" offset="0x0.16" size="0x0.1" />
+	<field name="v" descr="Valid bit. Indicates if the adjacency entry is valid.\;Note: the device may need some time before reusing an invali\;dated entry. During this time the entry can not be reused. It is \;recommended to use another entry before reusing an invali\;dated entry (e.g. software can put it at the end of the list for \;reusing). Trying to access an invalidated entry not yet cleared by \;the device results with failure indicating &quot;Try Again&quot; status.\;When valid is &apos;0&apos; then egress_router_interface,trap_action, \;adjacency_parameters and counters are reserved\;" access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="opcode" descr="Operation\;For Write:\;0: Allocate/resize Adjacency Table. Reserved when Spectrum/-\;2\;1: Write Adjacency entry \;2: Deallocate Adjacency Table. Reserved when Spectrum/-2\;3: Write Adjacency entry only if the activity is cleared. The write \;may not succeed if the activity is set. There is not direct feed\;back if the write has succeeded or not, however, the get the \;response and later read accesses to this register will reveal the \;actual entry (SW can compare the get response to the set com\;mand). This opcode must not be used for new entries \;For Query:\;0: Read \;2: Read and clear activity\;For Spectrum family the allocate/resize and deallocate are \;reserved\;Note that Write operation may also be used for updating \;counter_set_type and counter_index. In this case all other \;fields must not be updated" access="OP" offset="0x0.28" size="0x0.4" />
+	<field name="adjacency_index_15_0" descr="Least significant bits of index into the adjacency table.\;For SwitchX/-2, the adjacency table is linear and used for adja\;cency entries only. \;For Spectrum, the index is to the KVD linear, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; (page 3097)\;For Spectrum-2, the index is to the KVD linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear Entries&quot;, \;on page 3097\;" access="INDEX" offset="0x4.0" size="0x0.16" />
 	<field name="table" descr="Adjacency table:\;0: Ethernet_unicast_adjacency_table\;1: IPoIB_unicast_and_multicast_adjacency_table\;2: IPoIB_all_routers_adjacency_table\;3: IPoIB_IP_broadcast_adjacency_table\;Reserved when Spectrum/-2" access="INDEX" enum="Ethernet_unicast_adjacency_table=0x0,IPoIB_unicast_and_multicast_adjacency_table=0x1,IPoIB_all_routers_adjacency_table=0x2,IPoIB_IP_broadcast_adjacency_table=0x3" offset="0x4.16" size="0x0.3" />
 	<field name="type" descr="Adjacency entry type:\;0: Ethernet\;1: IPoIB_Unicast_without_GRH\;2: IPoIB_Unicast_with_GRH\;3: IPoIB_Multicast\;4: MPLS\;5: IPinIP_Encap\;6: L3_generic_encap\;7: NAT4To6\;8: ReLookupECMP\;9: ReLookupLPM - supported from Spectrum-4 [Spec\;trum4phase2]" access="RW" enum="Ethernet=0x0,IPoIB_Unicast_without_GRH=0x1,IPoIB_Unicast_with_GRH=0x2,IPoIB_Multicast=0x3,MPLS=0x4,IPinIP_Encap=0x5,L3_generic_encap=0x6,NAT4To6=0x7,ReLookupECMP=0x8,ReLookupLPM=0x9" offset="0x4.28" size="0x0.4" />
 	<field name="egress_router_interface" descr="Egress Router Interface Index\;Range is 0 .. cap_max_router_interfaces - 1\;Reserved when type = 8" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="trap_id" descr="Trap ID to be reported to CPU.\;For Spectrum, Trap-ID is RTR_EGRESS0 or RTR_EGRESS1.\;For Spectrum-2, Trap-ID is RTR_EGRESS0 .. RTR_EGRESS3.\;For trap_action of NOP, MIRROR and DISCARD_ERROR Error, \;trap_id is reserved." access="RW" offset="0xC.0" size="0x0.9" />
 	<field name="adjacency_index_23_16" descr="Most significant bits of the adjacency_index" access="INDEX" offset="0xC.16" size="0x0.8" />
 	<field name="trap_action" descr="Trap Action\;0: NOP\;1: TRAP\;2: MIRROR_TO_CPU\;3: MIRROR\;4: DISCARD_ERROR - see DISCARD_ROUTER3 trap_id\;\;When action is TRAP or DISCARD_ERROR then type must be \;&apos;0&apos;(Ethernet)" access="RW" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,MIRROR=0x3,DISCARD_ERROR=0x4" offset="0xC.28" size="0x0.4" />
-	<field name="adjacency_parameters" descr="Adjacency parameters. The parameters are related to the type \;field and are described in the tables below.\;Table 2264, &quot;Ethernet Adjacency Parameters Layout,&quot; on \;page 2792\;Table 2266, &quot;IPoIB Unicast without GRH Adjacency Param\;eters Layout,&quot; on page 2793\;Table 2268, &quot;IPoIB Unicast with GRH Adjacency Parameters \;Layout,&quot; on page 2794\;Table 2270, &quot;IPoIB Multicast Adjacency Parameters Lay\;out,&quot; on page 2794\;Table 2272, &quot;MPLS Adjacency Parameters Layout,&quot; on \;page 2796\;Table 2274, &quot;IPinIP_Encap Adjacency Parameters Layout,&quot; \;on page 2797\;Table 2276, &quot;L3_Generic_Encap Adjacency Parameters \;Layout,&quot; on page 2799\;Table 2280, &quot;NAT4To6 Adjacency Parameters Layout,&quot; on \;page 2802\;Table 2278, &quot;ReLookupECMP Adjacency Parameters Lay\;out,&quot; on page 2801\;Table 2282, &quot;ReLookupLPM Adjacency Parameters Lay\;out,&quot; on page 2804" subnode="ratr_adjacency_parameters_auto_ext" access="RW" offset="0x10.0" size="0x18.0" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: See Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x28.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x28.24" size="0x0.8" />
+	<field name="adjacency_parameters" descr="Adjacency parameters. The parameters are related to the type \;field and are described in the tables below.\;Table 2445, &quot;Ethernet Adjacency Parameters Layout,&quot; on \;page 2580\;Table 2447, &quot;IPoIB Unicast without GRH Adjacency \;Parameters Layout,&quot; on page 2581\;Table 2449, &quot;IPoIB Unicast with GRH Adjacency Parame\;ters Layout,&quot; on page 2582\;Table 2451, &quot;IPoIB Multicast Adjacency Parameters Lay\;out,&quot; on page 2582\;Table 2453, &quot;MPLS Adjacency Parameters Layout,&quot; on \;page 2584\;Table 2455, &quot;IPinIP_Encap Adjacency Parameters Lay\;out,&quot; on page 2585\;Table 2457, &quot;L3_Generic_Encap Adjacency Parameters \;Layout,&quot; on page 2587\;Table 2461, &quot;NAT4To6 Adjacency Parameters Layout,&quot; on \;page 2590\;Table 2459, &quot;ReLookupECMP Adjacency Parameters Lay\;out,&quot; on page 2589\;Table 2463, &quot;ReLookupLPM Adjacency Parameters Lay\;out,&quot; on page 2592" subnode="ratr_adjacency_parameters_auto_ext" access="RW" offset="0x10.0" size="0x18.0" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: See Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x28.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x28.24" size="0x0.8" />
 </node>
 
 <node name="ratrad_ext" descr="" size="0x210.0" >
-	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries from the \;adjacency_index (the number of ECMPs).\;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2/3: 1-128, 256, 512, 1024, 2048 and 4096.\;Note: for small numbers (up to ~32) it will be faster to \;use RATR one by one" access="INDEX" offset="0x0.0" size="0x0.13" />
+	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries from \;the adjacency_index (the number of ECMPs).\;The valid range is:\;Spectrum: 1-64, 512, 1024, 2048 and 4096.\;Spectrum-2/3: 1-128, 256, 512, 1024, 2048 and 4096.\;Note: for small numbers (up to ~32) it will be faster to \;use RATR one by one" access="INDEX" offset="0x0.0" size="0x0.13" />
 	<field name="op" descr="0: Read activity\;1: Read and clear activity" access="OP" offset="0x0.30" size="0x0.2" />
-	<field name="adjacency_index" descr="Index into the adjacency table.\;For Spectrum, the index is to the KVD linear, see Appen\;dix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="adjacency_index" descr="Index into the adjacency table.\;For Spectrum, the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot; (page 3097)" access="INDEX" offset="0x4.0" size="0x0.24" />
 	<field name="activity_vector" descr="Activity per ECMP entry\;Line 10h bit 31 is for entry 4095\;Line 20C bit0 is for entry 0\;Bits higher than ecmp_size are reserved" access="RO" high_bound="127" low_bound="0" offset="0x10.0" size="0x200.0" />
 </node>
 
 <node name="ratrb_ext" descr="" size="0x420.0" >
-	<field name="adjacency_index" descr="Index into the adjacency table.\;For Spectrum, the index is to the KVD linear, see Appen\;dix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="adjacency_index" descr="Index into the adjacency table.\;For Spectrum, the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot; (page 3097)" access="INDEX" offset="0x0.0" size="0x0.24" />
 	<field name="v" descr="Valid\;0: remove ecmp entries\;1: write ecmp entries" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="num_rec" descr="Number of records to write\;Range 1..32" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="trap_id" descr="Trap ID to be reported to CPU.\;Trap-ID is RTR_EGRESS0 .. RTR_EGRESS3.\;For trap_action of NOP, MIRROR and DISCARD_ERROR \;Error, trap_id is reserved." access="WO" offset="0x8.0" size="0x0.9" />
+	<field name="trap_id" descr="Trap ID to be reported to CPU.\;Trap-ID is RTR_EGRESS0 .. RTR_EGRESS3.\;For trap_action of NOP, MIRROR and DISCARD_ER\;ROR Error, trap_id is reserved." access="WO" offset="0x8.0" size="0x0.9" />
 	<field name="trap_action" descr="Trap Action\;0: NOP\;1: TRAP\;2: MIRROR_TO_CPU\;3: MIRROR\;4: DISCARD_ERROR\;When action is TRAP or DISCARD_ERROR then type \;must be &apos;0&apos;(Ethernet)" access="WO" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,MIRROR=0x3,DISCARD_ERROR=0x4" offset="0x8.28" size="0x0.4" />
-	<field name="record" descr="Record. See Table 2286, &quot;RATRB - Record Layout,&quot; \;on page 2806" subnode="ratrb_v2_record_ext" access="WO" high_bound="31" low_bound="0" offset="0x20.0" size="0x400.0" />
+	<field name="record" descr="Record. See Table 2467, &quot;RATRB - Record Layout,&quot; \;on page 2594" subnode="ratrb_v2_record_ext" access="WO" high_bound="31" low_bound="0" offset="0x20.0" size="0x400.0" />
 </node>
 
 <node name="ratrb_v2_record_adjacency_parameters_auto_ext" descr="" attr_is_union="1" size="0x18.0" >
@@ -5776,21 +5984,21 @@
 	<field name="egress_router_interface" descr="Egress Router Interface Index\;Range is 0 .. cap_max_router_interfaces - 1" access="WO" offset="0x0.0" size="0x0.16" />
 	<field name="size" descr="Size\;The amount of entries to be written for this record. \;Allows writing this record multiple consecutive times\;Range 1..4095" access="WO" offset="0x0.16" size="0x0.12" />
 	<field name="type" descr="Adjacency entry type:\;0: Ethernet\;4: MPLS\;5: IPinIP_Encap\;6: L3_generic_encap - supported from Spectrum-2\;7: NAT4To6 - supported from Spectrum-4\;8: ReLookupECMP - supported from Spectrum-2\;9: ReLookupLPM - supported from Spectrum-4 [Spec\;trum-4-phase2]" access="WO" enum="Ethernet=0x0,MPLS=0x4,IPinIP_Encap=0x5,L3_generic_encap=0x6,NAT4To6=0x7,ReLookupECMP=0x8,ReLookupLPM=0x9" offset="0x0.28" size="0x0.4" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: See Section 4.2, &quot;Flow Counters&quot;, on \;page 1059" access="WO" offset="0x4.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 1060" access="WO" offset="0x4.24" size="0x0.8" />
-	<field name="adjacency_parameters" descr="Adjacency parameters. The parameters are related to \;the type field and are described in the tables below.\;Table 2264, &quot;Ethernet Adjacency Parameters Lay\;out,&quot; on page 2792\;Table 2272, &quot;MPLS Adjacency Parameters Layout,&quot; \;on page 2796\;Table 2274, &quot;IPinIP_Encap Adjacency Parameters \;Layout,&quot; on page 2797\;Table 2276, &quot;L3_Generic_Encap Adjacency Param\;eters Layout,&quot; on page 2799\;Table 2280, &quot;NAT4To6 Adjacency Parameters Lay\;out,&quot; on page 2802\;Table 2278, &quot;ReLookupECMP Adjacency Parame\;ters Layout,&quot; on page 2801\;Table 2282, &quot;ReLookupLPM Adjacency Parameters \;Layout,&quot; on page 2804" subnode="ratrb_v2_record_adjacency_parameters_auto_ext" access="WO" offset="0x8.0" size="0x18.0" union_selector="$(parent).type" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: See Section 4.2, &quot;Flow Counters&quot;, on \;page 821" access="WO" offset="0x4.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set \;Type&quot;, on page 822" access="WO" offset="0x4.24" size="0x0.8" />
+	<field name="adjacency_parameters" descr="Adjacency parameters. The parameters are related to \;the type field and are described in the tables below.\;Table 2445, &quot;Ethernet Adjacency Parameters Lay\;out,&quot; on page 2580\;Table 2453, &quot;MPLS Adjacency Parameters Lay\;out,&quot; on page 2584\;Table 2455, &quot;IPinIP_Encap Adjacency Parameters \;Layout,&quot; on page 2585\;Table 2457, &quot;L3_Generic_Encap Adjacency \;Parameters Layout,&quot; on page 2587\;Table 2461, &quot;NAT4To6 Adjacency Parameters Lay\;out,&quot; on page 2590\;Table 2459, &quot;ReLookupECMP Adjacency Parame\;ters Layout,&quot; on page 2589\;Table 2463, &quot;ReLookupLPM Adjacency Parame\;ters Layout,&quot; on page 2592" subnode="ratrb_v2_record_adjacency_parameters_auto_ext" access="WO" offset="0x8.0" size="0x18.0" union_selector="$(parent).type" />
 </node>
 
 <node name="rauht_lpm_unicast_ext" descr="" size="0x74.0" >
 	<field name="rif" descr="Router Interface" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has \;hit on the specific entry.\;To clear the a bit, use &quot;clear activity&quot; op.\;Enabled by activity_dis in RGCR, see Section 13.11.2, \;&quot;RGCR - Router General Configuration Register&quot;, \;on page 2727" access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: Add. Used to write a new entry to the table. All RW \;fields are relevant for new entry. Activity bit is set for \;new entries\;1: Update action. Used to update an existing route entry \;and only update the following fields:\;trap_action, trap_id, mac, counter_set_type, \;counter_index\;2: Clear activity. A bit is cleared for the entry.\;3: Delete entry\;4: Delete all host entries on a RIF. In this command, dip \;field is reserved\;For Query:\;0: Read operation. \;1: Clear on read operation. Used to read entry and clear \;activity bit." access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has \;hit on the specific entry.\;To clear the a bit, use &quot;clear activity&quot; op.\;Enabled by activity_dis in RGCR, see Section 13.11.2, \;&quot;RGCR - Router General Configuration Register&quot;, \;on page 2515" access="RO" offset="0x0.16" size="0x0.1" />
+	<field name="op" descr="Operation\;For Write:\;0: Add. Used to write a new entry to the table. All RW \;fields are relevant for new entry. Activity bit is set for \;new entries\;1: Update action. Used to update an existing route \;entry and only update the following fields:\;trap_action, trap_id, mac, counter_set_type, \;counter_index\;2: Clear activity. A bit is cleared for the entry.\;3: Delete entry\;4: Delete all host entries on a RIF. In this command, \;dip field is reserved\;For Query:\;0: Read operation. \;1: Clear on read operation. Used to read entry and \;clear activity bit." access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="type" descr="Entry Type:\;0: IPv4\;1: IPv6" access="INDEX" offset="0x0.24" size="0x0.2" />
-	<field name="dip" descr="Destination IP address.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved.\;Note: This field is a RW field when accessing the entry \;using the handle." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
-	<field name="trap_id" descr="Trap ID to be reported to CPU.\;For Spectrum, Trap-ID is RTR_EGRESS0 or \;RTR_EGRESS1.\;For Spectrum-2, Trap-ID is RTR_EGRESS0 .. \;RTR_EGRESS3.\;For trap_action of NOP, MIRROR and DISCARD_ERROR, \;trap_id is reserved." access="RW" offset="0x60.0" size="0x0.9" />
+	<field name="dip" descr="Destination IP address.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] \;are reserved.\;Note: This field is a RW field when accessing the entry \;using the handle." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+	<field name="trap_id" descr="Trap ID to be reported to CPU.\;For Spectrum, Trap-ID is RTR_EGRESS0 or \;RTR_EGRESS1.\;For Spectrum-2, Trap-ID is RTR_EGRESS0 .. \;RTR_EGRESS3.\;For trap_action of NOP, MIRROR and DISCARD_ER\;ROR, trap_id is reserved." access="RW" offset="0x60.0" size="0x0.9" />
 	<field name="trap_action" descr="Trap Action\;0: NOP\;1: TRAP\;2: MIRROR_TO_CPU\;3: MIRROR\;4: DISCARD_ERROR, see DISCARD_ROUTER3 trap_id" access="RW" offset="0x60.28" size="0x0.4" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: See Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x68.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x68.24" size="0x0.8" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum: See Section 4.2, &quot;Flow Counters&quot;, \;on page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x68.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set \;Type&quot;, on page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x68.24" size="0x0.8" />
 	<field name="mac_47_32" descr="MAC address" access="RW" offset="0x6C.0" size="0x0.16" />
 	<field name="mac_31_0" descr="MAC address" access="RW" offset="0x70.0" size="0x4.0" />
 </node>
@@ -5798,7 +6006,7 @@
 <node name="rauhtd_ext" descr="" size="0x20.0" >
 	<field name="filter_fields" descr="Filter Fields:\;if a bit is &apos;0&apos; then the relevant field is ignored and dump is \;done regardless of the field value\;Bit0: filter by activity: entry_a\;Bit3: filter by entry rip: entry_rif" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="num_rec" descr="At request: number of records requested\;At response: number of records dumped\;For IPv4, each record has 4 entries at request and up to 4 \;entries at response\;Range is 0 ..32" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="op" descr="Operation\;0: Dump entries\;1: Clear activity for all entries which were dumped in the cur\;rent session" access="OP" offset="0x4.24" size="0x0.2" />
+	<field name="op" descr="Operation\;0: Dump entries\;1: Clear activity for all entries which were dumped in the \;current session" access="OP" offset="0x4.24" size="0x0.2" />
 	<field name="entry_type" descr="Dump only if entry type is:\;0: IPv4\;1: IPv6" access="INDEX" offset="0x8.0" size="0x0.4" />
 	<field name="entry_a" descr="Dump only if activity has value of entry_a\;Reserved if filter_fields bit0 is &apos;0&apos;" access="INDEX" offset="0x8.16" size="0x0.1" />
 	<field name="entry_rif" descr="Dump only if RIF has value of entry_rif\;Reserved if filter_fields bit3 is &apos;0&apos;" access="INDEX" offset="0xC.0" size="0x0.16" />
@@ -5810,29 +6018,29 @@
 </node>
 
 <node name="rdpm_ext" descr="" size="0x40.0" >
-	<field name="dscp" descr="DSCP entry is the DSCP to Prio mapping. For more details \;refer to Table 2302." access="INDEX" high_bound="63" low_bound="0" offset="0x0.24" size="0x40.0" />
+	<field name="dscp" descr="DSCP entry is the DSCP to Prio mapping. For more details \;refer to Table 2483." access="INDEX" high_bound="63" low_bound="0" offset="0x0.24" size="0x40.0" />
 </node>
 
 <node name="recr_ext" descr="" size="0x10.0" >
 	<field name="type" descr="Hash Type:\;0: CRC (default)\;1: XOR" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="sh" descr="Symmetric Hash.\;When set, the hash calculation results in the same hash value \;as when Source Address (layer 3 and layer 4) is swapped. This \;ensures that the same conversions result in the same hash \;value.\;For SwitchX/-2: when this bit is set, enabling addresses in \;ecmp_hash must be in couples - both source and destination. \;This includes the following sets:\;SIP, DIP\;TCP/UDP Source Port, TCP/UDP destination port" access="RW" offset="0x0.8" size="0x0.1" />
-	<field name="ecmp_hash" descr="ECMP Hashing Configuration. This is a bitmask, in which each \;set bit includes the corresponding item in the ECMP hash cal\;culation.\;0: Source IP address (can be IPv4 or IPv6)\;1: Destination IP address (can be IPv4 or IPv6)\;2: Traffic Class (DSCP and ECN)\;3: Flow Label\;4: TCP/UDP indication (this is the next_protocol field)\;5: TCP/UDP Source Port\;6: TCP/UDP Destination Port\;\;The default ecmp_hash contains SIP, DIP, flow label, Source \;TCP/UDP Port and Destination TCP/UDP Port." access="RW" offset="0x4.0" size="0x0.20" />
+	<field name="sh" descr="Symmetric Hash.\;When set, the hash calculation results in the same hash \;value as when Source Address (layer 3 and layer 4) is \;swapped. This ensures that the same conversions result in \;the same hash value.\;For SwitchX/-2: when this bit is set, enabling addresses in \;ecmp_hash must be in couples - both source and destina\;tion. This includes the following sets:\;SIP, DIP\;TCP/UDP Source Port, TCP/UDP destination port" access="RW" offset="0x0.8" size="0x0.1" />
+	<field name="ecmp_hash" descr="ECMP Hashing Configuration. This is a bitmask, in which \;each set bit includes the corresponding item in the ECMP \;hash calculation.\;0: Source IP address (can be IPv4 or IPv6)\;1: Destination IP address (can be IPv4 or IPv6)\;2: Traffic Class (DSCP and ECN)\;3: Flow Label\;4: TCP/UDP indication (this is the next_protocol field)\;5: TCP/UDP Source Port\;6: TCP/UDP Destination Port\;\;The default ecmp_hash contains SIP, DIP, flow label, Source \;TCP/UDP Port and Destination TCP/UDP Port." access="RW" offset="0x4.0" size="0x0.20" />
 	<field name="seed" descr="ECMP seed value." access="RW" offset="0x8.0" size="0x4.0" />
 </node>
 
 <node name="recr_v2_ext" descr="" size="0x50.0" >
 	<field name="type" descr="Hash type\;0: CRC (default)\;1: XOR \;2: Random\;3: CRC2, For Spectrum-2 and on\;\; \;\;" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="sh" descr="Symmetric hash \;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: When this bit is set, enabling addresses in outer_head\;er_fields_enables and inner_header_fields_enables\;For SwitchX/-2: must be in couples - both source and destina\;tion. This includes the following sets:\;- SMAC, DMAC\;- SIP, DIP\;- TCP/UDP source port, TCP/UDP destination port\;- SID, DID, for SwitchX/-2 only\;" access="RW" offset="0x0.8" size="0x0.1" />
+	<field name="sh" descr="Symmetric hash \;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: When this bit is set, enabling addresses in outer_\;header_fields_enables and inner_header_fields_enables\;For SwitchX/-2: must be in couples - both source and desti\;nation. This includes the following sets:\;- SMAC, DMAC\;- SIP, DIP\;- TCP/UDP source port, TCP/UDP destination port\;- SID, DID, for SwitchX/-2 only\;" access="RW" offset="0x0.8" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Ingress Local port number\;Supported from CPU port\;Not supported from router port\;Reserved when pp = Global Configuration" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="pp" descr="Per Port Configuration\;0: Global Configuration (for all ports)\;1: Per port configuration, based on local_port field.\;Note: SW must not read as global if last write was not global." access="INDEX" offset="0x0.24" size="0x0.1" />
-	<field name="seed" descr="Hash seed value\;The seed is the same for all ports (latest configuration config\;ures the seed for all ports)." access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="general_fields" descr="This is a bit mask, in which each bit enables a specific field to \;be included in the hash calculation. \;Bit i - custom_bytes i-2\;i = 2 .. 2 + (cap_max_custom_byte_sets_for_hash * cap_cus\;tom_byte_entry_size - 1)\;See Section 10.3.14, &quot;Custom Bytes&quot;, on page 2138" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="outer_header_enables" descr="This is a bit mask, each bit enables a specific layer field to be \;included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="pp" descr="Per Port Configuration\;0: Global Configuration (for all ports)\;1: Per port configuration, based on local_port field.\;Note: SW must not read as global if last write was not \;global." access="INDEX" offset="0x0.24" size="0x0.1" />
+	<field name="seed" descr="Hash seed value\;The seed is the same for all ports (latest configuration con\;figures the seed for all ports)." access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="general_fields" descr="This is a bit mask, in which each bit enables a specific field \;to be included in the hash calculation. \;bit0: reserved\;bit1: custom_bytes are set by cbsets field.\;Bit i - custom_bytes i-2\;i = 2 .. 2 + (cap_max_custom_byte_sets_for_hash * cap_cus\;tom_byte_entry_size - 1)\;See Section 10.3.14, &quot;Custom Bytes&quot;, on page 1888\;" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="outer_header_enables" descr="This is a bit mask, each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable Layer2 fields if packet is not IPv4/6\;Bit 1: Enable Layer2 fields if packet is IPv4\;Bit 2: Enable Layer2 fields if packet is IPv6\;Bit 3: Enable IPv4 fields if packet is not TCP and not UDP\;Bit 4: Enable IPv4 fields if packet is either TCP or UDP\;Bit 5: Enable IPv6 fields if packet is not TCP and not UDP\;Bit 6: Enable IPv6 fields if packet is either TCP or UDP\;Bit 7: Enable TCP/UDP header fields if packet is IPv4\;Bit 8: Enable TCP/UDP header fields if packet is IPv6" access="RW" offset="0x10.0" size="0x0.16" />
 	<field name="outer_header_fields_enable" descr="Outer header fields enable.\;The default configurations contains SMAC, DMAC, outer\;VID and Ethertype" access="RW" high_bound="4" low_bound="0" offset="0x14.0" size="0x14.0" />
-	<field name="inner_header_enables" descr="Inner header enables. Each bit enables a specific layer field to \;be included in the hash calculation. Layers that are not listed \;below are enabled by default.\;Bit 0: Enable inner Layer2 fields if inner packet is not IPv4/6\;Bit 1: Enable inner Layer2 fields if inner packet is IPv4\;Bit 2: Enable inner Layer2 fields if inner packet is IPv6\;Bit 3: Enable inner IPv4 fields if inner packet is not TCP and \;not UDP\;Bit 4: Enable inner IPv4 fields if inner packet is either TCP or \;UDP\;Bit 5: Enable inner IPv6 fields if inner packet is not TCP and \;not UDP\;Bit 6: Enable inner IPv6 fields if inner packet is either TCP or \;UDP\;Bit 7: Enable inner TCP/UDP header fields if inner packet is \;IPv4\;Bit 8: Enable inner TCP/UDP header fields if inner packet is \;IPv6" access="RW" offset="0x2C.0" size="0x0.16" />
+	<field name="inner_header_enables" descr="Inner header enables. Each bit enables a specific layer field \;to be included in the hash calculation. Layers that are not \;listed below are enabled by default.\;Bit 0: Enable inner Layer2 fields if inner packet is not IPv4/6\;Bit 1: Enable inner Layer2 fields if inner packet is IPv4\;Bit 2: Enable inner Layer2 fields if inner packet is IPv6\;Bit 3: Enable inner IPv4 fields if inner packet is not TCP and \;not UDP\;Bit 4: Enable inner IPv4 fields if inner packet is either TCP or \;UDP\;Bit 5: Enable inner IPv6 fields if inner packet is not TCP and \;not UDP\;Bit 6: Enable inner IPv6 fields if inner packet is either TCP or \;UDP\;Bit 7: Enable inner TCP/UDP header fields if inner packet is \;IPv4\;Bit 8: Enable inner TCP/UDP header fields if inner packet is \;IPv6" access="RW" offset="0x2C.0" size="0x0.16" />
 	<field name="inner_header_fields_enable" descr="Inner header fields enable.\;\;Inner Layer2 fields, subject to inner_header_enables:\;Bit 0: SMAC\;Bit 1: DMAC\;Bit 2: Ethertype\;\;Inner IPv4 fields, subject to inner_header_enables:\;Bits 6:3: IPv4 SIP 0-3 enable per byte\;Bits 10:7: IPv4 DIP 0- 3 enable per byte\;Bit 11: IPv4 Protocol\;\;Inner IPv6 fields, subject to inner_header_enables:\;Bits 12: IPv6 enable bytes of SIP 0-7\;Bits 19:13 reserved\;Bits 27:20: IPv6 SIP 8-15 enable per byte\;Bits 28: IPv6 enable bytes of DIP 0-7\;Bits 35:29 reserved\;Bits 43:36: IPv6 DIP 8-15 enable per byte\;Bit 44: IPv6 Next Header\;Bit 45: IPv6 Flow label\;\;Inner TCP /UDP header fields, subject to inner_header_en\;ables:\;Bit 46: TCP/UDP source port\;Bit 47: TCP/UDP destination port" subnode="uint64" access="RW" offset="0x30.0" size="0x8.0" />
-	<field name="cbsets" descr="Custom Byte Sets.\;For more details refer to Table 930, &quot;cbsets Layout,&quot; on \;page 1420.\;Reserved when general_fields.Bit1 = 0.\;Reserved when Spectrum\;Reserved up to cap_max_custom_byte_sets-1" access="RW" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
+	<field name="cbsets" descr="Custom Byte Sets.\;For more details refer to Table 1045, &quot;cbsets Layout,&quot; on \;page 1213.\;Reserved when general_fields.Bit1 = 0.\;Reserved when Spectrum\;Reserved up to cap_max_custom_byte_sets-1" access="RW" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
 </node>
 
 <node name="region_id_dup" descr="" size="0x4.0" >
@@ -5842,7 +6050,7 @@
 <node name="reiv_ext" descr="" size="0x420.0" >
 	<field name="port_page" descr="port page:\;elport_record[0] is 256*port_page" access="INDEX" offset="0x0.0" size="0x0.4" />
 	<field name="erif" descr="egress RIF\;Range is 0.. cap_max_router_interfaces-1" access="INDEX" offset="0x4.0" size="0x0.16" />
-	<field name="elport_record" descr="egress local port record\;record i for local_port i\;See Table 2366, &quot;REIV - elport_record Layout,&quot; on \;page 2860" subnode="elport_record_ext" access="RW" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
+	<field name="elport_record" descr="egress local port record\;record i for local_port i\;See Table 2547, &quot;REIV - elport_record Layout,&quot; on \;page 2650" subnode="elport_record_ext" access="RW" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
 </node>
 
 <node name="relookup_ecmp_adjacency_ext" descr="" size="0x18.0" >
@@ -5866,85 +6074,105 @@
 </node>
 
 <node name="remote_span_ib_local_ud_ext" descr="" size="0x4c.0" >
-	<field name="dlid" descr="Destination LID. \;Note that when dpa=0 the analyzer port is configured by the sys\;tem_port field and not by forwarding the packet based on the \;dlid field." access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="dpa" descr="Dynamic port analyzer. When set to dynamic mode, the analyzer \;port is set based on the forwarding information for the {swid, \;dlid} on private-LFT 0 instead of the system_port field. In static \;mode, the packet is transmitted to the configured system_port \;regardless of the forwarding database.\;0: static analyzer port\;1: dynamic analyzer port" access="RW" offset="0x0.16" size="0x0.2" />
+	<field name="dlid" descr="Destination LID. \;Note that when dpa=0 the analyzer port is configured by the \;system_port field and not by forwarding the packet based on \;the dlid field." access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="dpa" descr="Dynamic port analyzer. When set to dynamic mode, the ana\;lyzer port is set based on the forwarding information for the \;{swid, dlid} on private-LFT 0 instead of the system_port field. \;In static mode, the packet is transmitted to the configured sys\;tem_port regardless of the forwarding database.\;0: static analyzer port\;1: dynamic analyzer port" access="RW" offset="0x0.16" size="0x0.2" />
 	<field name="sl" descr="Service Level" access="RW" offset="0x0.20" size="0x0.4" />
 	<field name="we" descr="Write enable:\;0: write all fields\;1: write only psn_init_val" access="WO" offset="0x0.24" size="0x0.8" />
 	<field name="slid" descr="Source LID (LID of the sending device)" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="version" descr="Remote SPAN InfiniBand encapsulation header version\;1: V1 - Mirror Header Version 1\;2: V2 - Mirror Header Version 2\;" access="RW" offset="0x4.20" size="0x0.4" />
-	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set the \;analyzer port based on the desired forwarding table (the one that \;belong to the swid)." access="RW" offset="0x4.24" size="0x0.8" />
+	<field name="swid" descr="Switch partition ID\;Reserved when dpa = static analyzer port\;Reserved when mngr_type = local port manager\;Switch partition ID is used for dynamic analyzer port, to set the \;analyzer port based on the desired forwarding table (the one \;that belong to the swid)." access="RW" offset="0x4.24" size="0x0.8" />
 	<field name="vl" descr="Virtual Lane on which the mirrored packet is queued.\;Mirrored packets cannot be queued on VL-15." access="RW" offset="0xC.0" size="0x0.4" />
 	<field name="pkey" descr="BTH PKey" access="RW" offset="0x38.0" size="0x0.16" />
 	<field name="m" descr="BTH m" access="RW" offset="0x38.22" size="0x0.1" />
 	<field name="se" descr="BTH se" access="RW" offset="0x38.23" size="0x0.1" />
 	<field name="dest_qp" descr="BTH dest QP" access="RW" offset="0x3C.0" size="0x0.24" />
-	<field name="psn_init_val" descr="BTH packet sequence number initial value\;Note: when reading, HW will reveal the current packet sequence \;number" access="RW" offset="0x40.0" size="0x0.24" />
+	<field name="psn_init_val" descr="BTH packet sequence number initial value\;Note: when reading, HW will reveal the current packet \;sequence number" access="RW" offset="0x40.0" size="0x0.24" />
 	<field name="ar" descr="BTH MLNX adaptive routing enable flag" access="RW" offset="0x40.30" size="0x0.1" />
 	<field name="qkey" descr="DETH QKey" access="RW" offset="0x44.0" size="0x4.0" />
 	<field name="src_qp" descr="DETH source QP" access="RW" offset="0x48.0" size="0x0.24" />
 </node>
 
 <node name="rgcr_ext" descr="" size="0x28.0" >
-	<field name="mpls_en" descr="MPLS router enable.\;Enables receive/forward of MPLS packets to/from the \;router\;Enables router traps" access="RW" offset="0x0.29" size="0x0.1" />
+	<field name="mpls_en" descr="MPLS router enable.\;Enables receive/forward of MPLS packets to/from \;the router\;Enables router traps" access="RW" offset="0x0.29" size="0x0.1" />
 	<field name="ipv6_en" descr="IPv6 router enable.\;Enables receive/forward of IPv6 packets to/from the \;router\;Enables router traps" access="RW" offset="0x0.30" size="0x0.1" />
 	<field name="ipv4_en" descr="IPv4 router enable.\;Enables receive/forward of IPv4 packets to/from the \;router\;Enables router traps" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="max_vlan_router_interfaces" descr="Max VLAN router interfaces - defines the maximum \;number of active VLAN router interfaces per virtual \;router (VR) to be used.\;Reserved when Spectrum/-2" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="max_port_router_interfaces" descr="Max VLAN router interfaces - defines the maximum \;number of active VLAN router interfaces per VR to be \;used.\;Reserved when Spectrum/-2" access="RW" offset="0x8.0" size="0x0.16" />
-	<field name="max_pkey_router_interfaces" descr="Max VLAN router interfaces - defines the maximum \;number of active VLAN router interfaces per VR to be \;used.\;Note: max_pkey_interface can not be increased while \;the router is enable unless ipb and allr are cleared.\;Reserved when Spectrum/-2" access="RW" offset="0xC.0" size="0x0.16" />
-	<field name="max_router_interfaces" descr="Max router interfaces - defines the maximum number \;of active router interfaces for ALL VRs." access="RW" offset="0x10.0" size="0x0.16" />
+	<field name="max_pkey_router_interfaces" descr="Max VLAN router interfaces - defines the maximum \;number of active VLAN router interfaces per VR to be \;used.\;Note: max_pkey_interface can not be increased \;while the router is enable unless ipb and allr are \;cleared.\;Reserved when Spectrum/-2" access="RW" offset="0xC.0" size="0x0.16" />
+	<field name="max_router_interfaces" descr="Max router interfaces - defines the maximum num\;ber of active router interfaces for ALL VRs." access="RW" offset="0x10.0" size="0x0.16" />
 	<field name="max_virtual_routers" descr="Max number of active VRs.\;Reserved when Spectrum/-2\;" access="RW" offset="0x14.0" size="0x0.16" />
-	<field name="rpf" descr="When set, multicast RPF is not performed for all \;router packets. This bit overrides the RMFT.rpf config\;uration and only allows the following options:\;0: no RPF, ignore expected_ingress_rif\;1: RPF / directional forwarding enable (match only if \;packet is coming from)\;Note: While this configuration can be done on a per \;entry basis, using the global configuration allows more \;efficient internal resource utilization and is recom\;mended.\;Note: This bit cannot be changed while router is \;enabled.\;Reserved when Spectrum/-2" access="RW" offset="0x18.0" size="0x0.1" />
-	<field name="mcsi" descr="Multicast Single Interface.\;Indicates all multicast groups contain at most a single \;L3 interface. Allows some internal resource optimiza\;tions.\;Reserved when Spectrum/-2" access="RW" offset="0x18.4" size="0x0.1" />
+	<field name="rpf" descr="When set, multicast RPF is not performed for all \;router packets. This bit overrides the RMFT.rpf con\;figuration and only allows the following options:\;0: no RPF, ignore expected_ingress_rif\;1: RPF / directional forwarding enable (match only if \;packet is coming from)\;Note: While this configuration can be done on a per \;entry basis, using the global configuration allows \;more efficient internal resource utilization and is \;recommended.\;Note: This bit cannot be changed while router is \;enabled.\;Reserved when Spectrum/-2" access="RW" offset="0x18.0" size="0x0.1" />
+	<field name="mcsi" descr="Multicast Single Interface.\;Indicates all multicast groups contain at most a sin\;gle L3 interface. Allows some internal resource opti\;mizations.\;Reserved when Spectrum/-2" access="RW" offset="0x18.4" size="0x0.1" />
 	<field name="allr" descr="All Routers\;Allocate Multicast IPoIB Adjacency Table for all rout\;ers.\;Note: the allr bit cannot be set (updated from 0 to 1) \;while the router is enabled.\;Reserved when Spectrum/-2" access="RW" offset="0x18.8" size="0x0.1" />
-	<field name="ipb" descr="IP Broadcast. Allocates Multicast IPoIB Adjacency \;Table for IP Broadcast.\;Note: ipb bit can not be set (updated from 0 to 1) while \;the router is enabled.\;Reserved when Spectrum/-2" access="RW" offset="0x18.9" size="0x0.1" />
+	<field name="ipb" descr="IP Broadcast. Allocates Multicast IPoIB Adjacency \;Table for IP Broadcast.\;Note: ipb bit can not be set (updated from 0 to 1) \;while the router is enabled.\;Reserved when Spectrum/-2" access="RW" offset="0x18.9" size="0x0.1" />
 	<field name="pcp_rw" descr="PCP Re-write Enable\;Indicates how to handle the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Disable the pcp_rewrite_en\;3: Enable the pcp_rewrite_en\;Reserved when SwitchX/-2" access="RW" offset="0x18.16" size="0x0.2" />
-	<field name="usp" descr="Update Switch Priority and Packet Color\;0: Preserve the value of the Switch Priority and Packet \;Color\;1: Recalculate the value of the Switch Priority and \;Packet Color. See Section 13.11.20, &quot;RDPM - \;Router DSCP to Priority Mapping Register&quot;, on \;page 2818\;Reserved when SwitchX/-2" access="RW" offset="0x18.20" size="0x0.1" />
+	<field name="usp" descr="Update Switch Priority and Packet Color\;0: Preserve the value of the Switch Priority and \;Packet Color\;1: Recalculate the value of the Switch Priority and \;Packet Color. See Section 13.11.20, &quot;RDPM - \;Router DSCP to Priority Mapping Register&quot;, on \;page 2606\;Reserved when SwitchX/-2" access="RW" offset="0x18.20" size="0x0.1" />
 	<field name="grht" descr="Global Relookup re-hash type:\;0: CRC - default\;1: XOR\;2: Random\;Note: when XOR and seed is 0 then it&apos;s same as dis\;able\;Supported from Spectrum-2 and on\;[Internal] the relookup hash functions are not that \;same as RECR hash functions" access="RW" offset="0x18.24" size="0x0.4" />
-	<field name="ipv4_packet_rate" descr="IPv4 TCAM regions expected packet rate performance.\;Granularity is of 5%\;Reserved when Spectrum-2" access="RW" offset="0x1C.0" size="0x0.5" />
+	<field name="ipv4_packet_rate" descr="IPv4 TCAM regions expected packet rate perfor\;mance.\;Granularity is of 5%\;Reserved when Spectrum-2" access="RW" offset="0x1C.0" size="0x0.5" />
 	<field name="ipv4_op_type" descr="IPv4 TCAM regions optimization Type\;0: No optimization\;1: Soft optimization\;2: Hard optimization\;Reserved when Spectrum-2" access="RW" offset="0x1C.8" size="0x0.2" />
-	<field name="ipv6_packet_rate" descr="IPv6 TCAM regions expected packet rate performance.\;Granularity is of 5%\;Reserved when Spectrum-2" access="RW" offset="0x1C.16" size="0x0.5" />
+	<field name="ipv6_packet_rate" descr="IPv6 TCAM regions expected packet rate perfor\;mance.\;Granularity is of 5%\;Reserved when Spectrum-2" access="RW" offset="0x1C.16" size="0x0.5" />
 	<field name="ipv6_op_type" descr="IPv6 TCAM regions optimization Type\;0: No optimization\;1: Soft optimization\;2: Hard optimization\;Reserved when Spectrum-2\;\;\;" access="RW" offset="0x1C.24" size="0x0.2" />
-	<field name="activity_dis" descr="Activity Disable:\;0: enable - activity will be set when an entries are hit\;(default)\;1: disable - activity will not be set when an entries are \;hit\;Bit 0: Disable activity bit in Router Algorithmic LPM \;Unicast Entry. See Section 13.11.26, &quot;RALUE - \;Router Algorithmic LPM Unicast Entry Register&quot;, \;on page 2834\;Bit 1: Disable activity bit in Router Algorithmic LPM \;Unicast Host Entry. See Section 13.11.27, &quot;RAUHT - \;Router Algorithmic LPM Unicast Host Table Reg\;ister&quot;, on page 2842\;Bit 2: Disable activity bit in RATR\;Not supported by SwitchX/-2 and Switch-IB" access="RW" offset="0x20.0" size="0x0.8" />
+	<field name="activity_dis" descr="Activity Disable:\;0: enable - activity will be set when an entries are hit\;(default)\;1: disable - activity will not be set when an entries \;are hit\;Bit 0: Disable activity bit in Router Algorithmic LPM \;Unicast Entry. See Section 13.11.26, &quot;RALUE - \;Router Algorithmic LPM Unicast Entry Regis\;ter&quot;, on page 2623\;Bit 1: Disable activity bit in Router Algorithmic LPM \;Unicast Host Entry. See Section 13.11.27, &quot;RAUHT \;- Router Algorithmic LPM Unicast Host Table \;Register&quot;, on page 2631\;Bit 2: Disable activity bit in RATR\;Not supported by SwitchX/-2 and Switch-IB" access="RW" offset="0x20.0" size="0x0.8" />
 	<field name="grh_hop_limit" descr="HopLmt field in GRH for IPoIB adjacencies." access="RW" offset="0x20.16" size="0x0.8" />
-	<field name="expected_irif_list_index_base" descr="For MC routing RPF, base address of the lists of \;expected ingress RIFs\;Default 0\;For Spectrum, this is in KVD Linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot;, on page 3375\;The list is configured by RMEIR, see \;Section 13.11.36, &quot;RMEIR - Router Multicast \;Expected Ingress RIFs Register&quot;, on page 2857\;Reserved when SwitchX, SwitchX-2 and Switch-IB" access="RW" offset="0x24.0" size="0x0.24" />
+	<field name="expected_irif_list_index_base" descr="For MC routing RPF, base address of the lists of \;expected ingress RIFs\;Default 0\;For Spectrum, this is in KVD Linear, see \;Section A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot;, on page 3097\;The list is configured by RMEIR, see \;Section 13.11.36, &quot;RMEIR - Router Multicast \;Expected Ingress RIFs Register&quot;, on page 2647\;Reserved when SwitchX, SwitchX-2 and Switch-IB" access="RW" offset="0x24.0" size="0x0.24" />
 </node>
 
 <node name="rica_ext" descr="" size="0x10.0" >
 	<field name="index" descr="Counter set index. \;Relevant for Interface Counter Set type only." access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="counter_set_type" descr="Counter set type.\;0: Interface counter set. \;1: Global IPv4 counter set\;2: Global IPv6 counter set\;\;The above types allocate two counter sets, one for ingress \;counter and one for egress counter.\;Note: For the global counter sets, the ingress and egress \;handles must be freed on the same operation." access="INDEX" offset="0x0.16" size="0x0.4" />
 	<field name="op" descr="Operation:\;0: NOP\;1: allocate\;2: test\;3: free" access="OP" offset="0x0.30" size="0x0.2" />
-	<field name="ingress_counter_set" descr="Opaque object that represents the counter set. Returned \;when allocating counter set. This is provided by the software \;for router interface creation.\;Provided by software on Free operation" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="egress_counter_set" descr="Opaque object that represents the counter set. Returned \;when allocating counter set. This is provided by the software \;for router interface creation.\;Provided by software on Free operation" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="ingress_counter_set" descr="Opaque object that represents the counter set. Returned \;when allocating counter set. This is provided by the soft\;ware for router interface creation.\;Provided by software on Free operation" access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="egress_counter_set" descr="Opaque object that represents the counter set. Returned \;when allocating counter set. This is provided by the soft\;ware for router interface creation.\;Provided by software on Free operation" access="RW" offset="0xC.0" size="0x4.0" />
 </node>
 
 <node name="ricnt_inter_ext" descr="" size="0x100.0" >
-	<field name="gl" descr="Global. This field indicates whether to access an interface \;counter or a global (IPv4 / IPv6) counter set. When access\;ing a global counter set, counter_handle field is ignored\;0: Interface counters\;1: Ingress IPv4 counter set\;2: Egress IPv4 counter set\;3: Ingress IPv6 counter set\;4: Egress IPv6 counter set\;Reserved when Spectrum/-2, Switch-IB/2, Quantum" access="INDEX" offset="0x0.16" size="0x0.3" />
-	<field name="opcode" descr="0: NOPE, supported only for read access\;1: ADD counters - add a set of values to the counter_han\;dle.\;2: FLUSH Counters - when counter set is un-bound, flush \;ensures counters in counter_handle will not be updated \;due to packets in the pipe.\;8: CLEAR counters - reset all counters of the counter_han\;dle\;\;When read opcode can be NOPE or CLEAR\;For SwitchX/-2, Switch-IB/2, Quantum: When write opcode \;must be CLEAR" access="OP" offset="0x0.28" size="0x0.4" />
-	<field name="counter_handle" descr="For SwitchX/-2 the counter handle is retrieved using RICA\;For Spectrum/-2, Switch-IB/2, Quantum: the counter_han\;dle is described in Table 2308, &quot;RICNT Counter Handle \;Layout,&quot; on page 2821. \;For Switch-IB/2, Quantum: based on Router Interface \;Index" access="INDEX" offset="0x4.0" size="0x4.0" />
-	<field name="counter_set" descr="Router Interface counter set types.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 1060\;Supports counter_set_types of:\;- No Count\;- CounterSet4 (SwitchX/-2 only)\;- IB Router Interface Counter-set Basic (Switch-IB/2, \;Quantum)\;- Router Interface Counter-set Basic (Spectrum/-2)\;- Router Interface Counter-set Enhanced (Spectrum/-2)\;- Router Interface Counter-set Mixed-1 (Spectrum/-2)\;- Router Interface Counter-set Mixed-2 (Spectrum/-2)\;For ADD operation the counter set is used as write field" access="RW" high_bound="61" low_bound="0" offset="0x8.0" size="0xf8.0" />
-</node>
-
-<node name="rigr_erif_list_erif_entry_auto_ext" descr="" attr_is_union="1" size="0x4.0" >
-	<field name="rigr_erif_list_erif_entry_ext" descr="" subnode="rigr_erif_list_erif_entry_ext" offset="0x0.0" size="0x4.0" />
+	<field name="gl" descr="Global. This field indicates whether to access an interface \;counter or a global (IPv4 / IPv6) counter set. When \;accessing a global counter set, counter_handle field is \;ignored\;0: Interface counters\;1: Ingress IPv4 counter set\;2: Egress IPv4 counter set\;3: Ingress IPv6 counter set\;4: Egress IPv6 counter set\;Reserved when Spectrum/-2, Switch-IB/2, Quantum" access="INDEX" offset="0x0.16" size="0x0.3" />
+	<field name="opcode" descr="0: NOPE, supported only for read access\;1: ADD counters - add a set of values to the counter_han\;dle.\;2: FLUSH Counters - when counter set is un-bound, flush \;ensures counters in counter_handle will not be updated \;due to packets in the pipe.\;8: CLEAR counters - reset all counters of the \;counter_handle\;\;When read opcode can be NOPE or CLEAR\;For SwitchX/-2, Switch-IB/2, Quantum: When write \;opcode must be CLEAR" access="OP" offset="0x0.28" size="0x0.4" />
+	<field name="counter_handle" descr="For SwitchX/-2 the counter handle is retrieved using RICA\;For Spectrum/-2, Switch-IB/2, Quantum: the \;counter_handle is described in Table 2489, &quot;RICNT \;Counter Handle Layout,&quot; on page 2609. \;For Switch-IB/2, Quantum: based on Router Interface \;Index" access="INDEX" offset="0x4.0" size="0x4.0" />
+	<field name="counter_set" descr="Router Interface counter set types.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;Supports counter_set_types of:\;- No Count\;- CounterSet4 (SwitchX/-2 only)\;- IB Router Interface Counter-set Basic (Switch-IB/2, \;Quantum)\;- Router Interface Counter-set Basic (Spectrum/-2)\;- Router Interface Counter-set Enhanced (Spectrum/-2)\;- Router Interface Counter-set Mixed-1 (Spectrum/-2)\;- Router Interface Counter-set Mixed-2 (Spectrum/-2)\;For ADD operation the counter set is used as write field" access="RW" high_bound="61" low_bound="0" offset="0x8.0" size="0xf8.0" />
 </node>
 
 <node name="rigr_erif_list_erif_entry_ext" descr="" size="0x4.0" >
 	<field name="erif" descr="Egress Router Interface\;Valid range is 0..cap_max_router_interfaces - 1\;i can be from 0 to cap_mc_erif_list_entries-1" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="v" descr="Egress Router Interface is valid\;Note that low-entries must be set if high-entries are set. \;For example: if erif_entry[2].v is set then erif_entry[1].v \;and erif_entry[0].v must be set.\;i can be from 0 to cap_mc_erif_list_entries-1" access="RW" offset="0x0.31" size="0x0.1" />
+	<field name="v" descr="Egress Router Interface is valid\;Note that low-entries must be set if high-entries are \;set. For example: if erif_entry[2].v is set then erif_en\;try[1].v and erif_entry[0].v must be set.\;i can be from 0 to cap_mc_erif_list_entries-1" access="RW" offset="0x0.31" size="0x0.1" />
 </node>
 
 <node name="rigr_erif_list_ext" descr="" size="0x90.0" >
-	<field name="rmid_index" descr="RMID Index\;Range 0 .. max_mid - 1\;Reserved when vrmid = &apos;0&apos;\;For Spectrum family the index is to the Port Group Table, \;see Appendix A.3.2, &quot;Port Group Table (PGT)&quot; (page 3375)" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="rmid_index" descr="RMID Index\;Range 0 .. max_mid - 1\;Reserved when vrmid = &apos;0&apos;\;For Spectrum family the index is to the Port Group \;Table, see Appendix A.3.2, &quot;Port Group Table (PGT)&quot; \;(page 3097)" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="vrmid" descr="RMID Index is valid" access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="erif_entry" descr="See Table 2238, &quot;RIGR List Type Erif List Erif_Entry \;Layout,&quot; on page 2759\;Number of entries can be from 1 to cap_mc_erif_list_en\;tries\;Low-entries must be set if high-entries are set. For \;example: if erif_entry[2].v is set then erif_entry[1].v and \;erif_entry[0].v must be set." subnode="rigr_erif_list_erif_entry_auto_ext" access="RW" high_bound="31" low_bound="0" offset="0x4.0" size="0x80.0" />
+	<field name="erif_entry" descr="See Table 2419, &quot;RIGR List Type Erif List Erif_Entry \;Layout,&quot; on page 2547\;Number of entries can be from 1 to cap_mc_er\;if_list_entries\;Low-entries must be set if high-entries are set. For \;example: if erif_entry[2].v is set then erif_entry[1].v and \;erif_entry[0].v must be set." subnode="rigr_erif_list_erif_entry_ext" access="RW" high_bound="31" low_bound="0" offset="0x4.0" size="0x80.0" />
 </node>
 
 <node name="rigr_ext" descr="" size="0x3fc.0" >
-	<field name="offset" descr="Offset for the Interface Group\;SwitchX and SwitchX-2:\;Offset of the multicast forwarding entry within the Multicast \;Forwarding Table to which the interfaces would be added. \;Same index used in RMFT register to write the {S,G} / {*,G} \;entry." access="INDEX" offset="0x0.0" size="0x0.18" />
+	<field name="offset" descr="Offset for the Interface Group\;SwitchX and SwitchX-2:\;Offset of the multicast forwarding entry within the Multi\;cast Forwarding Table to which the interfaces would be \;added. Same index used in RMFT register to write the \;{S,G} / {*,G} entry." access="INDEX" offset="0x0.0" size="0x0.18" />
 	<field name="list_encoding" descr="0: SwitchX_Ethernet\;1: IPoIB\;" access="RW" enum="SwitchX_Ethernet=0x0,IPoIB=0x1" offset="0x0.22" size="0x0.2" />
-	<field name="op" descr="Opcode:\;1: Add router interfaces to group.\;2: Remove router interfaces from group\;3: Remove all interfaces\;4: Update adjacency_index of IPoIB router interfaces\;Note: For the Update op, all router interfaces provided in \;router_interface_list, must be of type IPoIB PKEY interface" access="WO" offset="0x0.24" size="0x0.3" />
+	<field name="op" descr="Opcode:\;1: Add router interfaces to group.\;2: Remove router interfaces from group\;3: Remove all interfaces\;4: Update adjacency_index of IPoIB router interfaces\;Note: For the Update op, all router interfaces provided in \;router_interface_list, must be of type IPoIB PKEY inter\;face" access="WO" offset="0x0.24" size="0x0.3" />
 	<field name="type" descr="Entry Type:\;0: IPv4\;1: IPv6" access="INDEX" enum="IPv4=0x0,IPv6=0x1" offset="0x0.28" size="0x0.2" />
-	<field name="router_interface_list" descr="Router Interface List.\;Encoding of this field depends on the type field.\;Table 2228, &quot;Ethernet Only Router Interface List Lay\;out,&quot; on page 2754\;Table 2230, &quot;IPoIB Router Interface List Layout,&quot; on \;page 2754\;Note: It is possible to use (type==Ethernet and IPoIB), only \;that packing might cause larger command payload in case \;of a large number of interfaces." subnode="rigr_router_interface_list_auto_ext" access="RW" offset="0x4.0" size="0x3f8.0" union_selector="$(parent).list_encoding" />
+	<field name="router_interface_list" descr="Router Interface List.\;Encoding of this field depends on the type field.\;Table 2409, &quot;Ethernet Only Router Interface List Lay\;out,&quot; on page 2542\;Table 2411, &quot;IPoIB Router Interface List Layout,&quot; on \;page 2542\;Note: It is possible to use (type==Ethernet and IPoIB), only \;that packing might cause larger command payload in \;case of a large number of interfaces." subnode="rigr_router_interface_list_auto_ext" access="RW" offset="0x4.0" size="0x3f8.0" union_selector="$(parent).list_encoding" />
+</node>
+
+<node name="rigr_generic_ext" descr="" size="0x20.0" >
+	<field name="allow_decap" descr="Allowed decap types:\;Bit0:\;0: do not allow L3 (IP) decapsulation\;1: allow L3 (IP) decapsulation\;Bit1:\;0: do not allow MPLS decapsulation\;1: allow MPLS decapsulation\;Bit2:\;0: do not allow L2 decapsulation\;1: allow L2 decapsulation\;If decapsulation failed due to these configurations then \;trap_id is IP2ME." access="RW" offset="0x0.0" size="0x0.3" />
+	<field name="checks_mode" descr="0: no_checks of NVE or IPinIP Decap\;1: apply NVE Decap checks\;2: apply IPinIP checks\;" access="RW" offset="0x0.8" size="0x0.2" />
+	<field name="tunnel_port" descr="Tunnel port\;Relevant only for L2 decap" access="RW" offset="0x4.0" size="0x0.4" />
+	<field name="tqos_profile_l3" descr="Tunnel QoS profile for L3 tunnel\;0..cap_max_tqos_profile" access="RW" offset="0x4.16" size="0x0.4" />
+	<field name="tqos_profile_l2" descr="Tunnel QoS profile for L2 tunnel\;0..cap_max_tqos_profile" access="RW" offset="0x4.24" size="0x0.4" />
+	<field name="irif" descr="Ingress Router Interface for the overlay router\;Relevant only for L3 or MPLS decap" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="checks_nve_decap_disable" descr="If checks_mode = apply NVE Decap checks (1) then:\;When set, disable decap. \;This is a bitwise configuration:\;Bit 0: Disable VXLAN\;Bit 1: Disable VXLAN-GPE\;Bit 2: Disable GENEVE\;Bit 3: Disable NVGRE\;Reserved when checks_mode != &apos;1&apos;" access="RW" offset="0x8.24" size="0x0.4" />
+	<field name="sip_check" descr="0: No sip checks \;1: filter packet if underlay is not IPv4 or if underlay SIP \;does not equal to ipv4_usip3: filter packet if underlay is \;not IPv6 or if underlay SIP does not equal to ipv6_usip\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR\;\;Reserved when checks_mode != apply IPinIP checks \;(2)" access="RW" offset="0xC.0" size="0x0.3" />
+	<field name="type_check" descr="Bit0:\;0: do not allow IPinIP (without GRE) decapsulation\;1: allow IPinIP (without GRE) decapsulation\;Bit1:\;0: do not allow IPinGREinIP without a key decapsula\;tion\;1: allow IPinGREinIP without a key decapsulation\;Bit1 is reserved when gre_key_check=1\;\;Bit2:\;0: do not allow IPinGREinIP with a key decapsulation\;1: allow IPinGREinIP with a key decapsulation\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR\;Bit2 is reserved when gre_key_check=1\;\;\;Reserved when checks_mode != apply IPinIP checks \;(2)" access="RW" offset="0xC.8" size="0x0.3" />
+	<field name="gre_key_check" descr="0: do not check GRE key\;1: Check GRE key\;When check is enabled:\;A packet received as IPinIP (without GRE) will always \;pass.\;A packet received as IPinGREinIP without a key will not \;pass the check.\;A packet received as IPinGREinIP with a key will pass \;the check only if the key in the packet is equal to \;expected_gre_key.\;If decapsulation failed due to GRE key then trap_id is \;IPIP_DECAP_ERROR\;\;Reserved when checks_mode != apply IPinIP checks \;(2)" access="RW" offset="0xC.16" size="0x0.1" />
+	<field name="ipv4_usip" descr="Underlay IPv4 address for ipv4 source address check\;\;Valid only when checks_mode = apply IPinIP checks (2) \;and sip_check = 1 (IPv4)" access="RW" offset="0x10.0" size="0x4.0" />
+	<field name="ipv6_usip_ptr" descr="This field is valid when sip_check is &quot;sipv6 check \;explicitly&quot;\;This is a pointer to the IPv6 DIP which is configured by \;RIPS, see Section 13.11.19, &quot;RIPS - Router IP ver\;sion Six Register&quot;, on page 2605\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on \;page 3093\;Reserved when checks_mode != apply IPinIP checks \;(2)\;Reserved when sip_check is not &apos;2&apos; or &apos;3&apos;" access="RW" offset="0x14.0" size="0x0.24" />
+	<field name="expected_gre_key" descr="GRE key for checking\;Reserved when checks_mode != apply IPinIP checks \;(2)\;Reserved when gre_key_check is &apos;0&apos;" access="RW" offset="0x18.0" size="0x4.0" />
+	<field name="uerif" descr="Underlay Egress Router Interface Index\;Range is 0 .. cap_max_router_interfaces - 1" access="RW" offset="0x1C.0" size="0x0.16" />
+</node>
+
+<node name="rigr_nve_decap_ext" descr="" size="0x8.0" >
+	<field name="uerif" descr="Underlay egress router interface\;Reserved when Spectrum" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="decap_disable" descr="When set, disable decap. \;This is a bitwise configuration:\;Bit 0: Disable VXLAN\;Bit 1: Disable VXLAN-GPE\;Bit 2: Disable GENEVE\;Bit 3: Disable NVGRE" access="RW" offset="0x4.0" size="0x0.4" />
+	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile\;Reserved when Spectrum-1" access="RW" offset="0x4.24" size="0x0.4" />
+	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2368\;1: Use tqos_profile_id" access="OP" offset="0x4.31" size="0x0.1" />
 </node>
 
 <node name="rigr_router_interface_list_auto_ext" descr="" attr_is_union="1" size="0x3f8.0" >
@@ -5952,21 +6180,27 @@
 	<field name="ipoib_router_inter_ext" descr="" subnode="ipoib_router_inter_ext" offset="0x0.0" selected_by="IPoIB" size="0x3f8.0" />
 </node>
 
+<node name="rigr_v2_erif_list_auto_ext" descr="" attr_is_union="1" size="0x90.0" >
+	<field name="rigr_erif_list_ext" descr="" subnode="rigr_erif_list_ext" offset="0x0.0" selected_by="ERIF_LIST" size="0x90.0" />
+	<field name="rigr_nve_decap_ext" descr="" subnode="rigr_nve_decap_ext" offset="0x0.0" selected_by="NVE_DECAP" size="0x8.0" />
+	<field name="rigr_generic_ext" descr="" subnode="rigr_generic_ext" offset="0x0.0" selected_by="GENERIC_DECP" size="0x20.0" />
+</node>
+
 <node name="rigr_v2_ext" descr="" size="0xb0.0" >
 	<field name="list_type" descr="Router Interface List type\;Format field indicates the encoding of the router_inter\;face_list field.\;0: ERIF_LIST\;3: NVE_DECAP\;\;5: GENERIC_DECP - Reserved when Spectrum (1st Gen)" access="RW" enum="ERIF_LIST=0x0,NVE_DECAP=0x3,GENERIC_DECP=0x5" offset="0x0.20" size="0x0.4" />
-	<field name="rigr_index" descr="Index to Router Interface Group (RIGR) Table\;For Spectrum family the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="INDEX" offset="0x4.0" size="0x0.24" />
-	<field name="next_rigr_index" descr="Next RIGR Index\;For Spectrum family the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)\;Reserved when vnext = &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.24" />
+	<field name="rigr_index" descr="Index to Router Interface Group (RIGR) Table\;For Spectrum family the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)" access="INDEX" offset="0x4.0" size="0x0.24" />
+	<field name="next_rigr_index" descr="Next RIGR Index\;For Spectrum family the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)\;Reserved when vnext = &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.24" />
 	<field name="vnext" descr="Next RIGR Index is valid" access="RW" offset="0x8.31" size="0x0.1" />
-	<field name="erif_list" descr="Egress Router Interface List according to list_type\;See Table 2236, &quot;RIGR List Type Erif List Layout,&quot; on \;page 2758\;See Table 2240, &quot;RIGR List Type NVE Decap Layout,&quot; \;on page 2760\;See Table 2242, &quot;RIGR List Type Generic Decap Lay\;out,&quot; on page 2761" subnode="rigr_erif_list_ext" access="RW" offset="0x20.0" size="0x90.0" />
+	<field name="erif_list" descr="Egress Router Interface List according to list_type\;See Table 2417, &quot;RIGR List Type Erif List Layout,&quot; on \;page 2546\;See Table 2421, &quot;RIGR List Type NVE Decap Layout,&quot; \;on page 2548\;See Table 2423, &quot;RIGR List Type Generic Decap Lay\;out,&quot; on page 2549" subnode="rigr_v2_erif_list_auto_ext" access="RW" offset="0x20.0" size="0x90.0" union_selector="$(parent).list_type" />
 </node>
 
 <node name="rips_ip_ext" descr="" size="0x14.0" >
-	<field name="index" descr="Index to IPv6 address\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on page 3371" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="index" descr="Index to IPv6 address\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on page 3093" access="INDEX" offset="0x0.0" size="0x0.24" />
 	<field name="ipv6" descr="IPv6 address\;" access="RW" high_bound="3" low_bound="0" offset="0x4.0" size="0x10.0" />
 </node>
 
 <node name="ritr_ext" descr="" size="0x40.0" >
-	<field name="rif" descr="Router Interface Index - a pointer to the Router Interface \;Table.\;Range is 0.. cap_max_router_interfaces-1\;Note: when type = 2 (Sub-Port Interface) and ubridge = 0 \;then range is no more than 0..1K-1\;For Spectrum: when type is Loopback IPinIP and protocol is \;IPv6 then 2 Router Interface Table entries are consumed \;and the entry must be even. For Spectrum-2: 1 entry, can be \;odd." access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="rif" descr="Router Interface Index - a pointer to the Router Interface \;Table.\;Range is 0.. cap_max_router_interfaces-1\;Note: when type = 2 (Sub-Port Interface) and ubridge = 0 \;then range is no more than 0..1K-1\;For Spectrum: when type is Loopback IPinIP and protocol \;is IPv6 then 2 Router Interface Table entries are con\;sumed and the entry must be even. For Spectrum-2: 1 \;entry, can be odd." access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="mpls" descr="MPLS routing enable - enables routing of packets coming \;from MPLS tunnel\;Reserved when IB switches\;Reserved when type is Loopback generic" access="RW" offset="0x0.19" size="0x0.1" />
 	<field name="op" descr="Operation Code\;Opcode: \;0: Create or Edit RIF\;1: Delete RIF\;Reserved when SwitchX/-2 and IB Switches since there is \;no need to create or delete an interface." access="WO" offset="0x0.20" size="0x0.2" />
 	<field name="type_ib" descr="Type Infiniband\;Controls the type field\;Reserved when SwitchX/-2 and Spectrum/-2\;For IB switches must be set to &apos;1&apos;" access="RW" offset="0x0.22" size="0x0.1" />
@@ -5978,23 +6212,23 @@
 	<field name="valid" descr="Router interface valid\;Reserved when Spectrum family" access="RW" offset="0x0.30" size="0x0.1" />
 	<field name="enable" descr="Router interface enable - enables routing on the router \;interface\;When ubridge = 1 the SVFA.irif_v, SFMR.irif_v must be set \;after enable and must be cleared before disable" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="virtual_router" descr="Virtual router ID associated with the router interface\;Range is 0..cap_max_virtual_routers-1\;Reserved when IB switches" access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="mpls_fe" descr="MPLS routing Forwarding enable - enables routing of MPLS \;traffic on the router interface. When disabled, forwarding is \;blocked but local traffic (traps and IP to me) will be enabled\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.19" size="0x0.1" />
-	<field name="urpf_ad" descr="Unicast RPF Allow Default:\;0: match on default route (/0) is not considered as a match\;1: match on default route (/0) is considered as a match\;Note that in loose mode with allow default will always have \;a match\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.20" size="0x0.1" />
-	<field name="urpf_strict" descr="Unicast RPF is strict mode:\;0: loose mode, check that SIP is in the table (as a DIP)\;1: strict mode, check that the packet arrives on the same \;router interface that the router would use to reach that SIP\;Note: strict mode always filters packets going to an adja\;cency table (a.k.a. ECMP) with more than 1 entry\;Note: when IP2ME (either trap or decap) the urpf will filter \;(if enabled)\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.21" size="0x0.1" />
+	<field name="mpls_fe" descr="MPLS routing Forwarding enable - enables routing of \;MPLS traffic on the router interface. When disabled, for\;warding is blocked but local traffic (traps and IP to me) \;will be enabled\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.19" size="0x0.1" />
+	<field name="urpf_ad" descr="Unicast RPF Allow Default:\;0: match on default route (/0) is not considered as a \;match\;1: match on default route (/0) is considered as a match\;Note that in loose mode with allow default will always \;have a match\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.20" size="0x0.1" />
+	<field name="urpf_strict" descr="Unicast RPF is strict mode:\;0: loose mode, check that SIP is in the table (as a DIP)\;1: strict mode, check that the packet arrives on the same \;router interface that the router would use to reach that \;SIP\;Note: strict mode always filters packets going to an adja\;cency table (a.k.a. ECMP) with more than 1 entry\;Note: when IP2ME (either trap or decap) the urpf will fil\;ter (if enabled)\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.21" size="0x0.1" />
 	<field name="urpf_en_ipv6" descr="Unicast RPF enable for IPv6 packets\;Reserved when type is Loopback generic\;Reserved when IB switches" access="RW" offset="0x4.22" size="0x0.1" />
 	<field name="urpf_en_ipv4" descr="Unicast RPF enable for IPv4 packets\;Reserved when type is Loopback generic\;Reserved when IB switches\;" access="RW" offset="0x4.23" size="0x0.1" />
-	<field name="lb_en" descr="Loop-back Filter Enable for unicast packets.\;If the flag is set then loop-back filter for unicast packets is \;implemented on the RIF. Multicast packets are always sub\;ject to loopback filtering.\;Note that in SwitchX/-2 devices, loopback filter is always \;enabled and this bit is ignored.\;Reserved when IB Switches, since loopback filter is always \;enabled\;" access="RW" offset="0x4.24" size="0x0.1" />
-	<field name="ipv6_mc_fe" descr="IPv6 Multicast Forwarding Enable. When disabled, forward\;ing is blocked but local traffic (traps and IP to me) will be \;enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.26" size="0x0.1" />
-	<field name="ipv4_mc_fe" descr="IPv4 Multicast Forwarding Enable. When disabled, forward\;ing is blocked but local traffic (traps and IP to me) will be \;enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.27" size="0x0.1" />
-	<field name="ipv6_fe" descr="IPv6 Forwarding Enable - enables forwarding of IPv6 traffic \;on the router interface. When disabled, forwarding is \;blocked but local traffic (traps and IP to me) will be \;enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.28" size="0x0.1" />
-	<field name="ipv4_fe" descr="IPv4 routing Forwarding Enable - enables routing of IPv4 \;traffic on the router interface. When disabled, forwarding is \;blocked but local traffic (traps and IP to me) will be \;enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.29" size="0x0.1" />
-	<field name="router_interface_properties" descr="Router interface properties - format depends on router \;interface \;type. The different formats are described in:\;Table 2207, &quot;VLAN Router Interface Properties Lay\;out,&quot; on page 2738\;Table 2209, &quot;FID Router Interface Properties Layout,&quot; \;on page 2740\;Table 2211, &quot;Sub-Port Router Interface Properties \;Layout,&quot; on page 2742\;Table 2216, &quot;Loopback Router Interface Properties \;Layout,&quot; on page 2745\;Table 2213, &quot;IPoIB PKEY Router Interface Properties \;Layout,&quot; on page 2744\;Table 2224, &quot;IB SWID Router Interface Properties Lay\;out,&quot; on page 2751" subnode="ritr_router_interface_properties_auto_ext" access="RW" offset="0x8.0" size="0x24.0" union_selector="$(parent).type" />
-	<field name="mtu" descr="Router interface MTU\;Must be greater than 63B\;Reserved IB switches\;\;Note: when RITR.type = Loopback (3), mtu value should be \;configured with max MTU to avoid performance degrada\;tion." access="RW" offset="0x34.0" size="0x0.16" />
+	<field name="lb_en" descr="Loop-back Filter Enable for unicast packets.\;If the flag is set then loop-back filter for unicast packets \;is implemented on the RIF. Multicast packets are always \;subject to loopback filtering.\;Note that in SwitchX/-2 devices, loopback filter is always \;enabled and this bit is ignored.\;Reserved when IB Switches, since loopback filter is \;always enabled\;" access="RW" offset="0x4.24" size="0x0.1" />
+	<field name="ipv6_mc_fe" descr="IPv6 Multicast Forwarding Enable. When disabled, for\;warding is blocked but local traffic (traps and IP to me) \;will be enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.26" size="0x0.1" />
+	<field name="ipv4_mc_fe" descr="IPv4 Multicast Forwarding Enable. When disabled, for\;warding is blocked but local traffic (traps and IP to me) \;will be enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.27" size="0x0.1" />
+	<field name="ipv6_fe" descr="IPv6 Forwarding Enable - enables forwarding of IPv6 traf\;fic on the router interface. When disabled, forwarding is \;blocked but local traffic (traps and IP to me) will be \;enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.28" size="0x0.1" />
+	<field name="ipv4_fe" descr="IPv4 routing Forwarding Enable - enables routing of IPv4 \;traffic on the router interface. When disabled, forwarding \;is blocked but local traffic (traps and IP to me) will be \;enabled.\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x4.29" size="0x0.1" />
+	<field name="router_interface_properties" descr="Router interface properties - format depends on router \;interface \;type. The different formats are described in:\;Table 2388, &quot;VLAN Router Interface Properties Lay\;out,&quot; on page 2526\;Table 2390, &quot;FID Router Interface Properties Lay\;out,&quot; on page 2528\;Table 2392, &quot;Sub-Port Router Interface Properties \;Layout,&quot; on page 2530\;Table 2397, &quot;Loopback Router Interface Properties \;Layout,&quot; on page 2533\;Table 2394, &quot;IPoIB PKEY Router Interface Properties \;Layout,&quot; on page 2532\;Table 2405, &quot;IB SWID Router Interface Properties \;Layout,&quot; on page 2539" subnode="ritr_router_interface_properties_auto_ext" access="RW" offset="0x8.0" size="0x24.0" union_selector="$(parent).type" />
+	<field name="mtu" descr="Router interface MTU\;Must be greater than 63B\;Reserved IB switches\;\;Note: when RITR.type = Loopback (3), mtu value should \;be configured with max MTU to avoid performance degra\;dation." access="RW" offset="0x34.0" size="0x0.16" />
 	<field name="ttl_threshold" descr="Time-to-live - minimum TTL for multicast packets\;Reserved IB switches" access="RW" offset="0x34.24" size="0x0.8" />
-	<field name="ingress_counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x38.0" size="0x0.24" />
-	<field name="ingress_counter_set_type" descr="Ingress Counter Set Type for router interface counters.\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 1060\;Reserved when SwitchX/-2 and IB switches\;In SwitchX/-2, counter set is allocated using RICA register." access="RW" offset="0x38.24" size="0x0.8" />
-	<field name="egress_counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: See Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x3C.0" size="0x0.24" />
-	<field name="egress_counter_set_type" descr="Egress Counter Set Type for router interface counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;For Spectrum/-2: if IPinIP Encapsulation may be done on \;this RIF then counter set must not be &apos;0&apos;\;Reserved when SwitchX/-2 and IB switches\;In SwitchX/-2, counter set is allocated using RICA register" access="RW" offset="0x3C.24" size="0x0.8" />
+	<field name="ingress_counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x38.0" size="0x0.24" />
+	<field name="ingress_counter_set_type" descr="Ingress Counter Set Type for router interface counters.\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set \;Type&quot;, on page 822\;Reserved when SwitchX/-2 and IB switches\;In SwitchX/-2, counter set is allocated using RICA regis\;ter." access="RW" offset="0x38.24" size="0x0.8" />
+	<field name="egress_counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: See Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Reserved when SwitchX/-2 and IB switches" access="RW" offset="0x3C.0" size="0x0.24" />
+	<field name="egress_counter_set_type" descr="Egress Counter Set Type for router interface counters.\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;For Spectrum/-2: if IPinIP Encapsulation may be done on \;this RIF then counter set must not be &apos;0&apos;\;Reserved when SwitchX/-2 and IB switches\;In SwitchX/-2, counter set is allocated using RICA register" access="RW" offset="0x3C.24" size="0x0.8" />
 </node>
 
 <node name="ritr_router_interface_properties_auto_ext" descr="" attr_is_union="1" size="0x24.0" >
@@ -6015,14 +6249,14 @@
 
 <node name="rlcme_ext" descr="" size="0x3c.0" >
 	<field name="m_idx" descr="M Index" access="INDEX" offset="0x0.0" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: WRITE_STATIC\;1: WRITE_CACHEABLE (may be overwritten by HW)\;2: DELETE - regardless of static or cacheable, no error if entry \;does not exist\;For Query:\;0: READ_STATIC" access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: WRITE_STATIC\;1: WRITE_CACHEABLE (may be overwritten by HW)\;2: DELETE - regardless of static or cacheable, no error if \;entry does not exist\;For Query:\;0: READ_STATIC" access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="protocol" descr="0: Unicast IPv4\;1: Unicast IPv6" access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="virtual_router" descr="Virtual Router ID\;Range is 0..cap_max_virtual_routers-1" access="INDEX" offset="0x4.16" size="0x0.16" />
-	<field name="dip" descr="The prefix of the route or of the marker that the object of the \;LPM is compared with. The most significant bits of the dip are \;the prefix. The least significant bits must be &apos;0&apos; if the prefix_len \;is smaller than 128 for IPv6 or smaller than 32 for IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0xC.0" size="0x10.0" />
-	<field name="action_type" descr="Action Type\;Indicates how the IP address is connected\;It can be connected to a local subnet through local_erif or can \;be on a remote subnet connected through a next-hop router, or \;transmitted to the CPU.\;0: REMOTE \;1: LOCAL \;2: IP2ME" access="RW" offset="0x1C.0" size="0x0.2" />
-	<field name="action" descr="The forwarding action as function of action_type:\;Section 13.11.26.1, &quot;RALUE Remote Action&quot;, on \;page 2837\;Section 13.11.26.2, &quot;RALUE Local Action&quot;, on page 2838\;Section 13.11.26.3, &quot;RALUE IP2ME Action&quot;, on page 2839\;Reserved when action_valid = 0" access="RW" high_bound="4" low_bound="0" offset="0x20.0" size="0x14.0" />
-	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.24" size="0x0.8" />
+	<field name="dip" descr="The prefix of the route or of the marker that the object of the \;LPM is compared with. The most significant bits of the dip \;are the prefix. The least significant bits must be &apos;0&apos; if the pre\;fix_len is smaller than 128 for IPv6 or smaller than 32 for \;IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0xC.0" size="0x10.0" />
+	<field name="action_type" descr="Action Type\;Indicates how the IP address is connected\;It can be connected to a local subnet through local_erif or \;can be on a remote subnet connected through a next-hop \;router, or transmitted to the CPU.\;0: REMOTE \;1: LOCAL \;2: IP2ME" access="RW" offset="0x1C.0" size="0x0.2" />
+	<field name="action" descr="The forwarding action as function of action_type:\;Section 13.11.26.1, &quot;RALUE Remote Action&quot;, on \;page 2626\;Section 13.11.26.2, &quot;RALUE Local Action&quot;, on page 2627\;Section 13.11.26.3, &quot;RALUE IP2ME Action&quot;, on \;page 2628\;Reserved when action_valid = 0" access="RW" high_bound="4" low_bound="0" offset="0x20.0" size="0x14.0" />
+	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.24" size="0x0.8" />
 	<field name="l_value" descr="Value of L\;For IPv4: up to 31, for IPv6: up to 127.\;Reserved when action_valid = 1" access="RW" offset="0x38.0" size="0x0.7" />
 	<field name="l_vector" descr="L Vector\;bit0: value of 2bits {m+1, m+2} is &quot;0&quot;\;bit1: value of 2bits {m+1, m+2} is &quot;1&quot;\;bit2: value of 2bits {m+1, m+2} is &quot;2&quot;\;bit3: value of 2bits {m+1, m+2} is &quot;3&quot;" access="RW" offset="0x38.8" size="0x0.4" />
 	<field name="action_valid" descr="The action is valid:\;0: this entry provides the L value\;1: this entry is an action entry" access="RW" offset="0x38.25" size="0x0.1" />
@@ -6034,7 +6268,7 @@
 	<field name="m_idx" descr="M Index\;0: m0\;1: m1" access="INDEX" offset="0x4.0" size="0x0.1" />
 	<field name="protocol" descr="0: Unicast IPv4\;1: Unicast IPv6" access="INDEX" offset="0x8.0" size="0x0.4" />
 	<field name="virtual_router" descr="Virtual Router ID\;Range is 0..cap_max_virtual_routers-1" access="INDEX" offset="0xC.0" size="0x0.16" />
-	<field name="dip" descr="The prefix and mask (dip_mask) of the route or of the marker \;that the object of the LPM is compared with. The most signifi\;cant bits of the dip are the prefix. The least significant bits \;must be &apos;0&apos; if the prefix_len is smaller than 128 for IPv6 or \;smaller than 32 for IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+	<field name="dip" descr="The prefix and mask (dip_mask) of the route or of the marker \;that the object of the LPM is compared with. The most signif\;icant bits of the dip are the prefix. The least significant bits \;must be &apos;0&apos; if the prefix_len is smaller than 128 for IPv6 or \;smaller than 32 for IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
 	<field name="dip_mask" descr="dip_mask:\;per bit:\;0: no match\;1: match" access="INDEX" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
 </node>
 
@@ -6046,15 +6280,15 @@
 
 <node name="rlcmle_ext" descr="" size="0x38.0" >
 	<field name="m_idx" descr="M Index" access="INDEX" offset="0x0.0" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: WRITE_STATIC\;1: WRITE_CACHEABLE (may be overwritten by HW)\;2: DELETE - regardless of static or cacheable, no error if entry \;does not exist\;For Query:\;0: READ_STATIC" access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: WRITE_STATIC\;1: WRITE_CACHEABLE (may be overwritten by HW)\;2: DELETE - regardless of static or cacheable, no error if \;entry does not exist\;For Query:\;0: READ_STATIC" access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="protocol" descr="0: Unicast IPv4\;1: Unicast IPv6" access="INDEX" offset="0x0.24" size="0x0.4" />
 	<field name="l_value" descr="Value of L\;For IPv4: up to 31, for IPv6: up to 127." access="INDEX" offset="0x4.0" size="0x0.7" />
 	<field name="virtual_router" descr="Virtual Router ID\;Range is 0..cap_max_virtual_routers-1" access="INDEX" offset="0x4.16" size="0x0.16" />
-	<field name="dip" descr="The prefix and mask (dip_mask) of the route or of the marker \;that the object of the LPM is compared with. The most signifi\;cant bits of the dip are the prefix. The least significant bits \;must be &apos;0&apos; if the prefix_len is smaller than 128 for IPv6 or \;smaller than 32 for IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0xC.0" size="0x10.0" />
-	<field name="action_type" descr="Action Type\;Indicates how the IP address is connected\;It can be connected to a local subnet through local_erif or can \;be on a remote subnet connected through a next-hop router, or \;transmitted to the CPU.\;0: REMOTE \;1: LOCAL \;2: IP2ME\;Reserved when entry_type = MARKER_ENTRY" access="RW" enum="REMOTE=0x0,LOCAL=0x1,IP2ME=0x2" offset="0x1C.0" size="0x0.2" />
-	<field name="action" descr="The forwarding action as function of action_type:\;Table 2332, &quot;Remote action Layout,&quot; on page 2837\;Table 2334, &quot;Local Action Layout,&quot; on page 2838\;Table 2336, &quot;IP2ME action Layout,&quot; on page 2839" subnode="rlcmle_action_auto_ext" access="RW" offset="0x20.0" size="0x14.0" union_selector="$(parent).action_type" />
-	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.24" size="0x0.8" />
+	<field name="dip" descr="The prefix and mask (dip_mask) of the route or of the marker \;that the object of the LPM is compared with. The most signif\;icant bits of the dip are the prefix. The least significant bits \;must be &apos;0&apos; if the prefix_len is smaller than 128 for IPv6 or \;smaller than 32 for IPv4.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved." access="INDEX" high_bound="3" low_bound="0" offset="0xC.0" size="0x10.0" />
+	<field name="action_type" descr="Action Type\;Indicates how the IP address is connected\;It can be connected to a local subnet through local_erif or \;can be on a remote subnet connected through a next-hop \;router, or transmitted to the CPU.\;0: REMOTE \;1: LOCAL \;2: IP2ME\;Reserved when entry_type = MARKER_ENTRY" access="RW" enum="REMOTE=0x0,LOCAL=0x1,IP2ME=0x2" offset="0x1C.0" size="0x0.2" />
+	<field name="action" descr="The forwarding action as function of action_type:\;Table 2513, &quot;Remote action Layout,&quot; on page 2626\;Table 2515, &quot;Local Action Layout,&quot; on page 2627\;Table 2517, &quot;IP2ME action Layout,&quot; on page 2628" subnode="rlcmle_action_auto_ext" access="RW" offset="0x20.0" size="0x14.0" union_selector="$(parent).action_type" />
+	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 822\;Not supported by SwitchX and SwitchX-2" access="RW" offset="0x34.24" size="0x0.8" />
 </node>
 
 <node name="rlpmce_ext" descr="" size="0x4.0" >
@@ -6063,16 +6297,16 @@
 </node>
 
 <node name="rmeir_ext" descr="" size="0x210.0" >
-	<field name="expected_irif_list_index" descr="Expected Ingress RIF List Index\;An index to the list of expected ingress RIFs\;For Spectrum, this is in KVD Linear, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="expected_irif_list_index" descr="Expected Ingress RIF List Index\;An index to the list of expected ingress RIFs\;For Spectrum, this is in KVD Linear, see Appendix \;A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)" access="INDEX" offset="0x0.0" size="0x0.24" />
 	<field name="num_entries" descr="Number of entries\;Range 1..16\;Value of 0 means 1 entry\;Reserved when Spectrum" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="expected_irif_bit_vector" descr="Bit Vector of the expected Ingress RIFs. Configures 256 \;entries.\;For more than 256 RIFs use stacking of irif_bit_vectors\;User must use stacking for supporting cap_max_rout\;er_interfaces RIFs\;Rif (N*256) is at 2Ch bit0\;The 1st expected_irif_list_index (e.g. 1000) is for RIFs \;0..255, the 2nd expected_irif_list_index (e.g. 1002) is for \;RIFs 256..511 etc.\;Valid range is 0.. cap_max_router_interfaces-1\;Note: Spectrum supports only 1 entry\;Note for Spectrum: value of 0x3ff represents the RIF after \;NVE encap." subnode="array256_auto" access="RW" high_bound="15" low_bound="0" offset="0x10.0" size="0x200.0" />
+	<field name="expected_irif_bit_vector" descr="Bit Vector of the expected Ingress RIFs. Configures 256 \;entries.\;For more than 256 RIFs use stacking of irif_bit_vectors\;User must use stacking for supporting cap_max_rout\;er_interfaces RIFs\;Rif (N*256) is at 2Ch bit0\;The 1st expected_irif_list_index (e.g. 1000) is for RIFs \;0..255, the 2nd expected_irif_list_index (e.g. 1002) is for \;RIFs 256..511 etc.\;Valid range is 0.. cap_max_router_interfaces-1\;Note: Spectrum supports only 1 entry\;Note for Spectrum: value of 0x3ff represents the RIF \;after NVE encap." subnode="array256_auto" access="RW" high_bound="15" low_bound="0" offset="0x10.0" size="0x200.0" />
 </node>
 
 <node name="rmft_ext" descr="" size="0x90.0" >
 	<field name="offset" descr="Offset within the multicast forwarding table to write to.\;Reserved when Switch-IB" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="a" descr="Activity. Set if a packet lookup has hit on the specific entry.\;To clear the a bit, use &quot;clear activity&quot; op\;Reserved when Switch-IB" access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the table. \;All RW fields are relevant for new entry. Activity bit is \;cleared for new entries\;1: Update action. Used to update an existing route entry \;and only update the following fields:\;trap, trap_group, trap_id, \;m, mirror_dst, prio, qos\;2: Clear activity. A bit is cleared for the entry\;For Query:\;0: Read operation. \;1: clear on Read operation. Used to read entry and clear \;activity bit." access="OP" offset="0x0.20" size="0x0.3" />
-	<field name="type" descr="Entry Type:\;0: IPv4\;1: IPv6\;For Switch-IB, the type IPv6 represents GRH, the type IPv4 \;is not supported" access="INDEX" offset="0x0.28" size="0x0.2" />
+	<field name="a" descr="Activity. Set if a packet lookup has hit on the specific \;entry.\;To clear the a bit, use &quot;clear activity&quot; op\;Reserved when Switch-IB" access="RO" offset="0x0.16" size="0x0.1" />
+	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the \;table. All RW fields are relevant for new entry. Activity bit \;is cleared for new entries\;1: Update action. Used to update an existing route entry \;and only update the following fields:\;trap, trap_group, trap_id, \;m, mirror_dst, prio, qos\;2: Clear activity. A bit is cleared for the entry\;For Query:\;0: Read operation. \;1: clear on Read operation. Used to read entry and clear \;activity bit." access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="type" descr="Entry Type:\;0: IPv4\;1: IPv6\;For Switch-IB, the type IPv6 represents GRH, the type \;IPv4 is not supported" access="INDEX" offset="0x0.28" size="0x0.2" />
 	<field name="v" descr="Valid" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="virtual_router" descr="Range is 0..cap_max_virtual_routers-1" access="RW" offset="0x4.16" size="0x0.16" />
 	<field name="dip" descr="Destination IP address.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved.\;For Switch-IB represents destination GID" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
@@ -6083,21 +6317,21 @@
 	<field name="trap_grp" descr="Trap group to use when trapping to CPU\;Reserved when Switch-IB" access="RW" offset="0x60.16" size="0x0.4" />
 	<field name="trap_action" descr="0: permit\;1: soft drop\;2: trap\;3: soft drop &amp; trap\;4: deny\;Reserved when Switch-IB" access="RW" offset="0x60.28" size="0x0.4" />
 	<field name="ttl_value" descr="Value to be used for TTL set / decrement\;For Switch-IB this field must have the same value for all \;entries" access="RW" offset="0x64.0" size="0x0.8" />
-	<field name="ttl_cmd" descr="Time To Live (TTL) Command:\;0: Decrement - packet&apos;s TTL field will be decremented by \;ttl_value\;1: Set - packet&apos;s TTL field will be set to ttl_value\;For Switch-IB this field must have the same value for all \;entries" access="RW" offset="0x64.8" size="0x0.2" />
+	<field name="ttl_cmd" descr="Time To Live (TTL) Command:\;0: Decrement - packet&apos;s TTL field will be decremented \;by ttl_value\;1: Set - packet&apos;s TTL field will be set to ttl_value\;For Switch-IB this field must have the same value for all \;entries" access="RW" offset="0x64.8" size="0x0.2" />
 	<field name="qos" descr="Quality of Service:\;0: Map Prio from DSCP, see Section \;1: Preserve packet&apos;s Prio (as arrived to the router)\;For Switch-IB must be set to &apos;1&apos;" access="RW" offset="0x64.16" size="0x0.2" />
 	<field name="prio" descr="Reserved when Switch-IB" access="RW" offset="0x64.20" size="0x0.3" />
 	<field name="mirror_dst" descr="Mirroring destination of m bit is set\;Reserved when Switch-IB" access="RW" offset="0x64.24" size="0x0.3" />
 	<field name="m" descr="Mirror enable.\;Reserved when Switch-IB" access="RW" offset="0x64.31" size="0x0.1" />
 	<field name="expected_ingress_rif" descr="Expected ingress router interface, used for RPF check\;Reserved when Switch-IB" access="RW" offset="0x68.0" size="0x0.18" />
 	<field name="rpf" descr="RPF Check Mode\;0: No RPF, Ignore expected_ingress_rif\;1: RPF Check Enabled - Discard\;2: RPF Check Enabled - Trap (Configured by HPKT)\;4: Directional forwarding (match only if packet is coming \;from expected_ingress_rif)\;For Switch-IB must be set to &apos;4&apos;" access="RW" offset="0x68.28" size="0x0.3" />
-	<field name="assert" descr="Assert check enable\;This field is only valid when rpf is not set to Ignore or Trap.\;Reserved when Switch-IB" access="RW" offset="0x68.31" size="0x0.1" />
+	<field name="assert" descr="Assert check enable\;This field is only valid when rpf is not set to Ignore or \;Trap.\;Reserved when Switch-IB" access="RW" offset="0x68.31" size="0x0.1" />
 	<field name="egress_rif_group" descr="Egress router interface list\;Switch-IB supports range of 7:0" access="RW" high_bound="7" low_bound="0" offset="0x70.0" size="0x20.0" />
 </node>
 
 <node name="rmft_v2_ext" descr="" size="0x174.0" >
 	<field name="offset" descr="Offset within the multicast forwarding table to write to.\;Reserved when Switch-IB" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="a" descr="Activity. Set for new entries. Set if a packet lookup has hit on \;the specific entry.\;Reserved when Switch-IB" access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: WRITE operation. Used to write a new entry to the table. All\;R/W fields are relevant for new entry. Activity bit is set for new\;entries - Note write with v = 0 will delete the entry\;1: UPDATE action. Only action will be updated.\;2: CLEAR activity. Activity bit is cleared for the entry\;3: WRITE_CLEAR. Does WRITE with CLEAR activity \;For Query:\;0: READ operation.\;1: CLEAR_ON_READ on read operation. Used to read entry and\;clear Activity bit." access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: WRITE operation. Used to write a new entry to the table. \;All\;R/W fields are relevant for new entry. Activity bit is set for \;new\;entries - Note write with v = 0 will delete the entry\;1: UPDATE action. Only action will be updated.\;2: CLEAR activity. Activity bit is cleared for the entry\;3: WRITE_CLEAR. Does WRITE with CLEAR activity \;For Query:\;0: READ operation.\;1: CLEAR_ON_READ on read operation. Used to read entry \;and\;clear Activity bit." access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="type" descr="Entry Type:\;0: Multicast IPv4 group0\;1: Multicast IPv6 group0\;2: Multicast IPv4 group1, only for Spectrum\;3: Multicast IPv6 group1, only for Spectrum\;For Switch-IB must be &apos;1&apos; (IPv6 is like GID)" access="INDEX" offset="0x0.28" size="0x0.2" />
 	<field name="v" descr="Valid\;Reserved when Switch-IB" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="virtual_router" descr="Virtual Router ID\;Range from 0..cap_max_virtual_routers-1\;Reserved when Switch-IB" access="RW" offset="0x4.0" size="0x0.16" />
@@ -6107,7 +6341,7 @@
 	<field name="dip_mask" descr="A bit that is set directs the TCAM to compare the correspond\;ing bit in key. A bit that is clear directs the TCAM to ignore the \;corresponding bit in key" access="RW" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
 	<field name="sip" descr="Source IP address.\;IPv4 address uses bits sip[31:0] and bits sip[127:32] are \;reserved.\;Reserved when Switch-IB" access="RW" high_bound="3" low_bound="0" offset="0x30.0" size="0x10.0" />
 	<field name="sip_mask" descr="A bit that is set directs the TCAM to compare the correspond\;ing bit in key. A bit that is clear directs the TCAM to ignore the \;corresponding bit in key\;Reserved when Switch-IB" access="RW" high_bound="3" low_bound="0" offset="0x40.0" size="0x10.0" />
-	<field name="flexible_action_set" descr="Flexible Action-Set.\;The layout of this field is the same as described in \;Section 10.8, &quot;Flexible ACL Action Set&quot;, on page 2388    \;while the only supported action types in this field and in any \;action-set pointed from here are as follows:\;00h: NULL_ACTION\;01h: MAC_TTL_ACTION, only TTL configuration is supported.\;03h: TRAP_ACTION\;04h: TRAP_W_USERDEF_ACTION\;06h: QOS_ACTION\;08h: POLICING_MONITORING_ACTION\;09h: METADATA_ACTION\;10h: ROUTER_MC_ACTION\;If goto is set then the binding_cmd must be &apos;0&apos; (none/continue), \;see Section 10.8.2.3, &quot;Goto action set&quot;, on page 2392)\;The action types are defined in Section 10.8, &quot;Flexible ACL \;Action Set&quot;, on page 2388.\;See Section 10.8.5, &quot;Flexible Action Set Blocks&quot;, on \;page 2397\;See Section 10.8.5.2, &quot;MAC_TTL_ACTION&quot;, on page 2397\;See Section 10.8.5.4, &quot;TRAP_ACTION&quot;, on page 2402\;See Section 10.8.5.9, &quot;QOS_ACTION&quot;, on page 2409\;See Section 10.8.5.11, &quot;POLICING_AND_COUNTING_AC\;TION&quot;, on page 2414\;See Section 10.8.5.13, &quot;META_DATA_ACTION&quot;, on \;page 2417\;See Section 10.8.5.15, &quot;MC_ROUTING_ACTION&quot;, on \;page 2423\;If the packet is not discarded by TRAP_ACTION then ROUT\;ER_MC_ACTION must be called" access="RW" high_bound="60" low_bound="0" offset="0x80.0" size="0xf4.0" />
+	<field name="flexible_action_set" descr="Flexible Action-Set.\;The layout of this field is the same as described in \;Section 10.8, &quot;Flexible ACL Action Set&quot;, on page 2150    \;while the only supported action types in this field and in any \;action-set pointed from here are as follows:\;00h: NULL_ACTION\;01h: MAC_TTL_ACTION, only TTL configuration is supported.\;03h: TRAP_ACTION\;04h: TRAP_W_USERDEF_ACTION\;06h: QOS_ACTION\;08h: POLICING_MONITORING_ACTION\;09h: METADATA_ACTION\;10h: ROUTER_MC_ACTION\;If goto is set then the binding_cmd must be &apos;0&apos; (none/con\;tinue), see Section 10.8.2.3, &quot;Goto action set&quot;, on \;page 2154)\;The action types are defined in Section 10.8, &quot;Flexible ACL \;Action Set&quot;, on page 2150.\;See Section 10.8.5, &quot;Flexible Action Set Blocks&quot;, on \;page 2159\;See Section 10.8.5.2, &quot;MAC_TTL_ACTION&quot;, on \;page 2159\;See Section 10.8.5.4, &quot;TRAP_ACTION&quot;, on page 2164\;See Section 10.8.5.9, &quot;QOS_ACTION&quot;, on page 2171\;See Section 10.8.5.11, &quot;POLICING_AND_COUNT\;ING_ACTION&quot;, on page 2176\;See Section 10.8.5.13, &quot;META_DATA_ACTION&quot;, on \;page 2179\;See Section 10.8.5.15, &quot;MC_ROUTING_ACTION&quot;, on \;page 2186\;If the packet is not discarded by TRAP_ACTION then ROUT\;ER_MC_ACTION must be called" access="RW" high_bound="60" low_bound="0" offset="0x80.0" size="0xf4.0" />
 </node>
 
 <node name="rmftad_ext" descr="" size="0x220.0" >
@@ -6119,7 +6353,7 @@
 </node>
 
 <node name="rmid_ext" descr="" size="0x40.0" >
-	<field name="rmid_index" descr="RMID Index\;Range 0 .. max_mid - 1\;For Spectrum family, the index is to the Port Group Table, see \;Section A.3.2, &quot;Port Group Table (PGT)&quot;, on page 3375" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="rmid_index" descr="RMID Index\;Range 0 .. max_mid - 1\;For Spectrum family, the index is to the Port Group Table, \;see Section A.3.2, &quot;Port Group Table (PGT)&quot;, on \;page 3097" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="rmpe_index" descr="Router multicast port to ERIF Index\;When ubridge=0: Range is 0.. cap_max_rmpe - max_fid - 1\;When ubridge=1: Range is 0.. cap_max_rmpe - 1\;Reserved when egress_port is all &apos;0&apos;" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="egress_port" descr="Egress Port bitmask, \;CPU port is not supported\;Router port is not supported\;0: Do not transmit the packet to the local port\;1: Transmit the packet to the local port\;All LAG ports must share the same configuration.\;If all bits are &apos;0&apos; then the packet is discarded without error \;counting" access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 </node>
@@ -6129,7 +6363,7 @@
 </node>
 
 <node name="rmid_v2_ext" descr="" size="0xa0.0" >
-	<field name="rmid_index" descr="RMID Index\;Range 0 .. max_mid - 1\;For Spectrum family, the index is to the Port Group Table, see \;Section A.3.2, &quot;Port Group Table (PGT)&quot;, on page 3375" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="rmid_index" descr="RMID Index\;Range 0 .. max_mid - 1\;For Spectrum family, the index is to the Port Group Table, \;see Section A.3.2, &quot;Port Group Table (PGT)&quot;, on \;page 3097" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="rmpe_index" descr="Router multicast port to ERIF Index\;When ubridge=0: Range is 0.. cap_max_rmpe - max_fid - 1\;When ubridge=1: Range is 0.. cap_max_rmpe - 1\;Reserved when egress_port is all &apos;0&apos;" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="egress_port" descr="Egress Port bitmask, \;CPU port is not supported\;Router port is not supported\;0: Do not transmit the packet to the local port\;1: Transmit the packet to the local port\;All LAG ports must share the same configuration.\;If all bits are &apos;0&apos; then the packet is discarded without error \;counting" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
 </node>
@@ -6146,7 +6380,14 @@
 	<field name="local_port" descr="Local port to send the packet\;CPU port is not supported" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="size" descr="Number of valid RMIDs to be updated.\;Range is 1 to 64" access="INDEX" offset="0x4.16" size="0x0.8" />
 	<field name="op" descr="Operation\;0: Set bit\;1: Clear bit" access="WO" offset="0x4.30" size="0x0.2" />
-	<field name="rmid_index" descr="RMID index to where the relevant local_port bit indication is \;to be set/cleared.\;Range 0 .. max_mid - 1" subnode="rmid_index" access="INDEX" high_bound="63" low_bound="0" offset="0x10.0" size="0x100.0" />
+	<field name="rmid_index" descr="RMID index to where the relevant local_port bit indication \;is to be set/cleared.\;Range 0 .. max_mid - 1" subnode="rmid_index" access="INDEX" high_bound="63" low_bound="0" offset="0x10.0" size="0x100.0" />
+</node>
+
+<node name="rngcr_ext" descr="" size="0xc.0" >
+	<field name="nat4to6_fl_suffix" descr="NAT4To6 header replacement Flow Label Suffix\;Constant 8 most significant bits of the flow label. \;Reserved when nat4to6_flh = 1" access="RW" offset="0x0.0" size="0x0.8" />
+	<field name="nat4to6_fl_prefix" descr="For NAT4To6 header replacement:\;Constant 12 most significant bits of the flow label." access="RW" offset="0x0.8" size="0x0.12" />
+	<field name="nat4to6_flh" descr="For NAT4To6 header replacement:\;0: Flow Label is statically set by {nat4to6_fl_prefix, nat4to6_\;fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash, and 12msb are configured by nat4to6_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configura\;tion Register&quot;, on page 2554 and Section 13.11.8, \;&quot;RECR_V2 - Router ECMP Configuration Version 2 Reg\;ister&quot;, on page 2556" access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="v" descr="valid \;0: NAT4To6 is not enabled\;1: NAT4To6 is enabled (should not be set when only NAT6To4 \;flows are used). \;" access="RW" offset="0x0.31" size="0x0.1" />
 </node>
 
 <node name="rom_version_ext" descr="" size="0x4.0" >
@@ -6157,22 +6398,22 @@
 
 <node name="router_interface_sub_port_ext" descr="" size="0x18.0" >
 	<field name="system_port" descr="Port unique identifier.\;When lag bit is set, this field holds the lag_id in bits \;[9:0]\;When ubridge=1 this is the egress port only\;" access="RW" offset="0x0.0" size="0x0.16" />
-	<field name="lag" descr="LAG indication. When this bit is set, the system_port \;field holds the LAG identifier" access="RW" offset="0x0.24" size="0x0.1" />
+	<field name="lag" descr="LAG indication. When this bit is set, the sys\;tem_port field holds the LAG identifier" access="RW" offset="0x0.24" size="0x0.1" />
 	<field name="ar" descr="Adaptive Routing:\;At egress device will map system_port-&gt;erif\;0: do_not_set\;1: set\;Reserved when Spectrum (1st generation ASIC)" access="OP" offset="0x0.25" size="0x0.1" />
 	<field name="efid" descr="Egress FID\;Used to connect the erif to a bridge if erifACL has \;modified the DMAC or the VID\;Reserved when ubridge = 0" access="RW" offset="0x4.0" size="0x0.16" />
 	<field name="router_interface_mac_47_32" descr="Router interface MAC address.\;Note: In the SwitchX silicon family, all router inter\;faces on the same switch partition must have the \;same MAC address" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="mac_profile_id" descr="MAC msb profile ID\;range 0 .. cap_max_rif_mac_profile-1\;Reserved when Spectrum" access="RW" offset="0x8.16" size="0x0.4" />
 	<field name="router_interface_mac_31_0" descr="Router interface MAC address.\;Note: In the SwitchX silicon family, all router inter\;faces on the same switch partition must have the \;same MAC address" access="RW" offset="0xC.0" size="0x4.0" />
 	<field name="vid" descr="Sub-port VLAN ID\;Reserved when ubridge = 1\;" access="RW" offset="0x10.0" size="0x0.12" />
-	<field name="vrrp_id_ipv4" descr="VRRP ID for IPv4\;Reserved when SwitchX/-2. The MAD address should \;be entered to the FDB" access="RW" offset="0x14.0" size="0x0.8" />
-	<field name="vrrp_id_ipv6" descr="VRRP ID for IPv6\;Reserved when SwitchX/-2. The MAD address should \;be entered to the FDB" access="RW" offset="0x14.8" size="0x0.8" />
+	<field name="vrrp_id_ipv4" descr="VRRP ID for IPv4\;Reserved when SwitchX/-2. The MAD address \;should be entered to the FDB" access="RW" offset="0x14.0" size="0x0.8" />
+	<field name="vrrp_id_ipv6" descr="VRRP ID for IPv6\;Reserved when SwitchX/-2. The MAD address \;should be entered to the FDB" access="RW" offset="0x14.8" size="0x0.8" />
 </node>
 
 <node name="rrcr_ext" descr="" size="0x24.0" >
 	<field name="offset" descr="Offset within the region from which to copy/move." access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="op" descr="Operation:\;0: move rules.\;1: copy rules." access="WO" offset="0x0.28" size="0x0.4" />
 	<field name="size" descr="The number of rules to copy/move." access="WO" offset="0x4.0" size="0x0.16" />
-	<field name="table_id" descr="Identifier of the table on which to perform the operation.\;Encoding is the same as in RTAR.key_type. See \;Section 13.11.6, &quot;RTAR - Router TCAM Allocation Regis\;ter&quot;, on page 2765." access="INDEX" offset="0x10.0" size="0x0.4" />
+	<field name="table_id" descr="Identifier of the table on which to perform the operation.\;Encoding is the same as in RTAR.key_type. See \;Section 13.11.6, &quot;RTAR - Router TCAM Allocation Reg\;ister&quot;, on page 2553." access="INDEX" offset="0x10.0" size="0x0.4" />
 	<field name="dest_offset" descr="Offset within the region to which to copy/move." access="INDEX" offset="0x20.0" size="0x0.16" />
 </node>
 
@@ -6187,21 +6428,21 @@
 <node name="rtar_tcam_ext" descr="" size="0x8.0" >
 	<field name="key_type" descr="TCAM key type for the region.\;Supported router types include:\;00h: IPv4 Unicast, not supported by Spectrum\;01h: IPv4 Multicast (group0)\;02h: IPv6 Unicast, not supported by Spectrum\;03h: IPv6 Multicast (group0)\;04h: IPv4 Host Table, not supported by Spectrum\;05h: IPv6 Host Table, not supported by Spectrum\;06h: IPv4 Multicast, group1, only for Spectrum\;07h: IPv6 Multicast, group1, only for Spectrum\;Note: Current SwitchX and SwitchX-2 device requires alloca\;tion of host table resources while it might not be needed in \;future devices." access="WO" offset="0x0.0" size="0x0.8" />
 	<field name="eb" descr="External bind:\;0: Immediate bind\;1: bind by PEMRBT" access="OP" offset="0x0.24" size="0x0.1" />
-	<field name="op" descr="For Write operation\;0: ALLOCATE a TCAM region\;1: RESIZE a TCAM region\;When providing a larger size, additional entries are added at \;the end of the table (larger indexes). When providing a smaller \;size, the last entries are removed. If RESIZE operation will \;cause removal of valid entries, the operation will fail.\;2: DEALLOACTE TCAM region\;3: TEST allocation" access="WO" offset="0x0.28" size="0x0.4" />
+	<field name="op" descr="For Write operation\;0: ALLOCATE a TCAM region\;1: RESIZE a TCAM region\;When providing a larger size, additional entries are added at \;the end of the table (larger indexes). When providing a \;smaller size, the last entries are removed. If RESIZE opera\;tion will cause removal of valid entries, the operation will \;fail.\;2: DEALLOACTE TCAM region\;3: TEST allocation" access="WO" offset="0x0.28" size="0x0.4" />
 	<field name="region_size" descr="TCAM region size. \;For op = ALLOCATE or op = RESIZE or op = TEST: this field is \;set by SW and the device returns the actual allocated size.\;Note that actual size may be larger than requested.\;Allowed range 1 .. cap_max_rules-1\;Reserved when op = DEALLOCATE" access="RW" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="rtca_ext" descr="" size="0x14.0" >
 	<field name="lid" descr="Base LID for the port" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="lmc" descr="LID mask count" access="RW" offset="0x0.16" size="0x0.3" />
-	<field name="swid" descr="Switch partition ID - identifies the TCA port connecting the \;router to the specific SWID. Only relevant for ports connected \;to an InfiniBand switch partition." access="INDEX" offset="0x0.24" size="0x0.8" />
+	<field name="swid" descr="Switch partition ID - identifies the TCA port connecting the \;router to the specific SWID. Only relevant for ports con\;nected to an InfiniBand switch partition." access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="gid" descr="Global ID" access="RW" high_bound="3" low_bound="0" offset="0x4.0" size="0x10.0" />
 </node>
 
 <node name="rtdp_ext" descr="" size="0x44.0" >
-	<field name="tunnel_index" descr="Index to the Decap entry\;For Spectrum, Index to KVD Linear, see Section A.3.1.2, \;&quot;KVD Central Database Linear Entries&quot;, on page 3375" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="tunnel_index" descr="Index to the Decap entry\;For Spectrum, Index to KVD Linear, see Section A.3.1.2, \;&quot;KVD Central Database Linear Entries&quot;, on page 3097" access="INDEX" offset="0x0.0" size="0x0.24" />
 	<field name="type" descr="Type of the RTDP entry:\;0: NVE\;1: IPinIP\;2: Generic_Decap" access="RW" enum="NVE=0x0,IPinIP=0x1,Generic_Decap=0x2" offset="0x0.28" size="0x0.4" />
-	<field name="rtdp_entry" descr="RTDP entry according to type:\;Table 2292, &quot;RTDP Entry for NVE Decap Layout,&quot; on \;page 2810\;Table 2294, &quot;RTDP Entry for IPinIP Decap Layout,&quot; on \;page 2811\;Table 2296, &quot;RTDP Entry for Generic Decap Layout,&quot; on \;page 2813" subnode="rtdp_rtdp_entry_auto_ext" access="RW" offset="0x4.0" size="0x1c.0" union_selector="$(parent).type" />
+	<field name="rtdp_entry" descr="RTDP entry according to type:\;Table 2473, &quot;RTDP Entry for NVE Decap Layout,&quot; on \;page 2598\;Table 2475, &quot;RTDP Entry for IPinIP Decap Layout,&quot; on \;page 2599\;Table 2477, &quot;RTDP Entry for Generic Decap Layout,&quot; \;on page 2601" subnode="rtdp_rtdp_entry_auto_ext" access="RW" offset="0x4.0" size="0x1c.0" union_selector="$(parent).type" />
 	<field name="egress_router_interface" descr="Underlay egress router interface\;Range is 0 .. cap_max_router_interfaces - 1\;Reserved when Spectrum\;\;" access="RW" offset="0x40.0" size="0x0.16" />
 </node>
 
@@ -6213,30 +6454,30 @@
 	<field name="tqos_profile_l2" descr="Tunnel QoS profile for L2 tunnel" access="RW" offset="0x4.24" size="0x0.4" />
 	<field name="irif" descr="Ingress Router Interface for the overlay router\;Relevant only for L3 or MPLS decap" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="checks_nve_decap_disable" descr="If checks_mode = apply NVE Decap checks (1) then:\;When set, disable decap. \;This is a bitwise configuration:\;Bit 0: Disable VXLAN\;Bit 1: Disable VXLAN-GPE\;Bit 2: Disable GENEVE\;Bit 3: Disable NVGRE\;Reserved when checks_mode != &apos;1&apos;" access="RW" offset="0x8.24" size="0x0.4" />
-	<field name="sip_check" descr="0: No sip checks \;1: filter packet if underlay is not IPv4 or if underlay SIP \;does not equal to ipv4_usip3: filter packet if underlay is \;not IPv6 or if underlay SIP does not equal to ipv6_usip\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR\;\;Reserved when checks_mode != apply IPinIP checks (2)" access="RW" offset="0xC.0" size="0x0.3" />
-	<field name="type_check" descr="Bit0:\;0: do not allow IPinIP (without GRE) decapsulation\;1: allow IPinIP (without GRE) decapsulation\;Bit1:\;0: do not allow IPinGREinIP without a key decapsulation\;1: allow IPinGREinIP without a key decapsulation\;Bit1 is reserved when gre_key_check=1\;\;Bit2:\;0: do not allow IPinGREinIP with a key decapsulation\;1: allow IPinGREinIP with a key decapsulation\;Bit2 is reserved when gre_key_check=1\;\;\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR\;\;Reserved when checks_mode != apply IPinIP checks (2)" access="RW" offset="0xC.8" size="0x0.3" />
-	<field name="gre_key_check" descr="0: do not check GRE key\;1: Check GRE key\;\;Reserved when checks_mode != apply IPinIP checks (2)\;Reserved when type_check.bit2 = 0 (don&quot;t allow IPin\;GREinIP with a key)" access="RW" offset="0xC.16" size="0x0.1" />
+	<field name="sip_check" descr="0: No sip checks \;1: filter packet if underlay is not IPv4 or if underlay SIP \;does not equal to ipv4_usip3: filter packet if underlay is \;not IPv6 or if underlay SIP does not equal to ipv6_usip\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR\;\;Reserved when checks_mode != apply IPinIP checks \;(2)" access="RW" offset="0xC.0" size="0x0.3" />
+	<field name="type_check" descr="Bit0:\;0: do not allow IPinIP (without GRE) decapsulation\;1: allow IPinIP (without GRE) decapsulation\;Bit1:\;0: do not allow IPinGREinIP without a key decapsula\;tion\;1: allow IPinGREinIP without a key decapsulation\;Bit1 is reserved when gre_key_check=1\;\;Bit2:\;0: do not allow IPinGREinIP with a key decapsulation\;1: allow IPinGREinIP with a key decapsulation\;Bit2 is reserved when gre_key_check=1\;\;\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR\;\;Reserved when checks_mode != apply IPinIP checks \;(2)" access="RW" offset="0xC.8" size="0x0.3" />
+	<field name="gre_key_check" descr="0: do not check GRE key\;1: Check GRE key\;\;Reserved when checks_mode != apply IPinIP checks \;(2)\;Reserved when type_check.bit2 = 0 (don&quot;t allow IPin\;GREinIP with a key)" access="RW" offset="0xC.16" size="0x0.1" />
 	<field name="ipv4_usip" descr="Underlay IPv4 address for ipv4 source address check\;\;Valid only when checks_mode = apply IPinIP checks (2) \;and sip_check = 1 (IPv4)" access="RW" offset="0x10.0" size="0x4.0" />
-	<field name="ipv6_usip_ptr" descr="This field is valid when sip_check is &quot;sipv6 check explic\;itly&quot;\;This is a pointer to the IPv6 DIP which is configured by \;RIPS, see Section 13.11.19, &quot;RIPS - Router IP ver\;sion Six Register&quot;, on page 2817\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on \;page 3371\;Reserved when checks_mode != apply IPinIP checks (2)\;Reserved when sip_check is not &apos;2&apos; or &apos;3&apos;" access="RW" offset="0x14.0" size="0x0.24" />
-	<field name="expected_gre_key" descr="GRE key for checking\;Reserved when checks_mode != apply IPinIP checks (2)\;Reserved when gre_key_check is &apos;0&apos;" access="RW" offset="0x18.0" size="0x4.0" />
+	<field name="ipv6_usip_ptr" descr="This field is valid when sip_check is &quot;sipv6 check \;explicitly&quot;\;This is a pointer to the IPv6 DIP which is configured by \;RIPS, see Section 13.11.19, &quot;RIPS - Router IP ver\;sion Six Register&quot;, on page 2605\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on \;page 3093\;Reserved when checks_mode != apply IPinIP checks \;(2)\;Reserved when sip_check is not &apos;2&apos; or &apos;3&apos;" access="RW" offset="0x14.0" size="0x0.24" />
+	<field name="expected_gre_key" descr="GRE key for checking\;Reserved when checks_mode != apply IPinIP checks \;(2)\;Reserved when gre_key_check is &apos;0&apos;" access="RW" offset="0x18.0" size="0x4.0" />
 </node>
 
 <node name="rtdp_ipinip_ext" descr="" size="0x18.0" >
 	<field name="sip_check" descr="0: No sip checks \;1: filter packet if underlay is not IPv4 or if underlay SIP \;does not equal to ipv4_usip3: filter packet if underlay is \;not IPv6 or if underlay SIP does not equal to ipv6_usip\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR" access="RW" offset="0x0.0" size="0x0.3" />
 	<field name="irif" descr="Ingress Router Interface for the overlay router" access="RW" offset="0x0.16" size="0x0.16" />
 	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile\;Reserved when Spectrum-1" access="RW" offset="0x4.0" size="0x0.4" />
-	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2579\;1: Use tqos_profile_id" access="OP" offset="0x4.7" size="0x0.1" />
+	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2368\;1: Use tqos_profile_id" access="OP" offset="0x4.7" size="0x0.1" />
 	<field name="gre_key_check" descr="0: do not check GRE key\;1: Check GRE key\;\;Reserved when type_check.bit2 = 0 (don&quot;t allow IPin\;GREinIP with a key)" access="RW" offset="0x4.23" size="0x0.1" />
-	<field name="type_check" descr="Bit0:\;0: do not allow IPinIP (without GRE) decapsulation\;1: allow IPinIP (without GRE) decapsulation\;Bit1:\;0: do not allow IPinGREinIP without a key decapsulation\;1: allow IPinGREinIP without a key decapsulation\;Bit1 is reserved when gre_key_check=1\;\;Bit2:\;0: do not allow IPinGREinIP with a key decapsulation\;1: allow IPinGREinIP with a key decapsulation\;Bit2 is reserved when gre_key_check=1\;\;\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR" access="RW" offset="0x4.24" size="0x0.3" />
+	<field name="type_check" descr="Bit0:\;0: do not allow IPinIP (without GRE) decapsulation\;1: allow IPinIP (without GRE) decapsulation\;Bit1:\;0: do not allow IPinGREinIP without a key decapsula\;tion\;1: allow IPinGREinIP without a key decapsulation\;Bit1 is reserved when gre_key_check=1\;\;Bit2:\;0: do not allow IPinGREinIP with a key decapsulation\;1: allow IPinGREinIP with a key decapsulation\;Bit2 is reserved when gre_key_check=1\;\;\;If decapsulation failed due to these configurations then \;trap_id is IPIP_DECAP_ERROR" access="RW" offset="0x4.24" size="0x0.3" />
 	<field name="ipv4_usip" descr="Underlay IPv4 address for ipv4 source address check\;Reserved when sip_check is not &apos;1&apos;" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="ipv6_usip_ptr" descr="This field is valid when sip_check is &quot;sipv6 check explic\;itly&quot;\;This is a pointer to the IPv6 DIP which is configured by \;RIPS, see Section 13.11.19, &quot;RIPS - Router IP ver\;sion Six Register&quot;, on page 2817\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on \;page 3371\;Reserved when sip_check is not &apos;2&apos; or &apos;3&apos;" access="RW" offset="0xC.0" size="0x0.24" />
+	<field name="ipv6_usip_ptr" descr="This field is valid when sip_check is &quot;sipv6 check \;explicitly&quot;\;This is a pointer to the IPv6 DIP which is configured by \;RIPS, see Section 13.11.19, &quot;RIPS - Router IP ver\;sion Six Register&quot;, on page 2605\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on \;page 3093\;Reserved when sip_check is not &apos;2&apos; or &apos;3&apos;" access="RW" offset="0xC.0" size="0x0.24" />
 	<field name="expected_gre_key" descr="GRE key for checking\;Reserved when gre_key_check is &apos;0&apos;" access="RW" offset="0x10.0" size="0x4.0" />
 </node>
 
 <node name="rtdp_nve_decap_ext" descr="" size="0x4.0" >
 	<field name="decap_disable" descr="When set, disable decap. \;This is a bitwise configuration:\;Bit 0: Disable VXLAN\;Bit 1: Disable VXLAN-GPE\;Bit 2: Disable GENEVE\;Bit 3: Disable NVGRE" access="RW" offset="0x0.0" size="0x0.4" />
 	<field name="tqos_profile" descr="Tunnel QoS profile\;0..cap_max_tqos_profile\;Reserved when Spectrum-1" access="RW" offset="0x0.8" size="0x0.4" />
-	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in Table 11.13, \;&quot;Tunnel QoS Profiles,&quot; on page 2579\;1: Use tqos_profile_id" access="OP" offset="0x0.15" size="0x0.1" />
+	<field name="tqos_profile_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2368\;1: Use tqos_profile_id" access="OP" offset="0x0.15" size="0x0.1" />
 </node>
 
 <node name="rtdp_rtdp_entry_auto_ext" descr="" attr_is_union="1" size="0x1c.0" >
@@ -6248,24 +6489,24 @@
 <node name="rtps_ext" descr="" size="0x8.0" >
 	<field name="tca_phy_pstate" descr="TCA Physical Port State.\;0: No change\;1: Down\;2: Polling\;3: Up" access="RW" offset="0x0.0" size="0x0.4" />
 	<field name="tca_log_pstate" descr="TCA Logical Port State.\;0: No change\;1: Down\;2: Init\;3: Arm\;4: Active" access="RW" offset="0x0.4" size="0x0.4" />
-	<field name="swid" descr="Switch partition ID - identifies the TCA port connecting the \;router to the specific SWID. Only relevant for ports connected \;to an InfiniBand switch partition." access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="switch_phy_pstate" descr="TCA Physical Port State is used to communicate the TCA logi\;cal port state managed by software with the switch port con\;nected to it and managed by the SwitchX device.\;0: Reserved\;1: Down\;2: Polling \;3: Up" access="RO" offset="0x4.0" size="0x0.4" />
+	<field name="swid" descr="Switch partition ID - identifies the TCA port connecting the \;router to the specific SWID. Only relevant for ports con\;nected to an InfiniBand switch partition." access="INDEX" offset="0x0.24" size="0x0.8" />
+	<field name="switch_phy_pstate" descr="TCA Physical Port State is used to communicate the TCA \;logical port state managed by software with the switch port \;connected to it and managed by the SwitchX device.\;0: Reserved\;1: Down\;2: Polling \;3: Up" access="RO" offset="0x4.0" size="0x0.4" />
 	<field name="switch_log_pstate" descr="TCA Logical Port State.\;0: Reserved\;1: Down\;2: Init\;3: Arm\;4: Active" access="RO" offset="0x4.4" size="0x0.4" />
 </node>
 
 <node name="ruft_ext" descr="" size="0x78.0" >
-	<field name="offset" descr="Offset within the Unicast FIB LPM. \;Range 0.. cap_max_router_lpm_entries-1\;When Quantum and on: Value of 0xFFFF used for default \;route" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="offset" descr="Offset within the Unicast FIB LPM. \;Range 0.. cap_max_router_lpm_entries-1\;When Quantum and on: Value of 0xFFFF used for \;default route" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="a" descr="Activity. Set if a packet lookup has hit on the specific \;entry.\;To clear the a bit, use &quot;clear activity&quot; op.\;Reserved when IB switches" access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the \;table. All RW fields are relevant for new entry. Activity bit \;is cleared for new entries\;1: Update action. Used to update an existing route entry \;and only update the following fields:\;trap, trap_group, trap_id,\;m, mirror_dst, prio, qos,\;adjacency_index, ecmp_size\;2: Clear activity. A bit is cleared for the entry\;\;For Query:\;0: Read operation. \;1: clear on Read operation. Used to read entry and clear \;Activity bit.\;Reserved when IB switches" access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the \;table. All RW fields are relevant for new entry. Activity \;bit is cleared for new entries\;1: Update action. Used to update an existing route \;entry and only update the following fields:\;trap, trap_group, trap_id,\;m, mirror_dst, prio, qos,\;adjacency_index, ecmp_size\;2: Clear activity. A bit is cleared for the entry\;\;For Query:\;0: Read operation. \;1: clear on Read operation. Used to read entry and \;clear Activity bit.\;Reserved when IB switches" access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="type" descr="Entry Type\;0: IPv4\;1: IPv6\;2: IB GID site-local" access="INDEX" offset="0x0.24" size="0x0.2" />
 	<field name="v" descr="Valid\;Note that clearing the valid bit will delete the entry and \;the device might not be able to hold an invalid entry \;properties." access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="virtual_router" descr="Virtual router ID\;Range is 0..cap_max_virtual_routers-1\;Reserved when IB switches" access="RW" offset="0x4.16" size="0x0.16" />
-	<field name="dip" descr="Destination IP address\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved.\;For type = IB GID site-local only bits 79:64 are used, \;other bits are reserved. \;The dip is related to the linear range of the offset such \;that:\;(dip[79:64] - offset) = const, if const is changed then the \;dip[79:64] of all entries will be updated. const is an \;implicit field.\;Note: dip[79:64] must be larger or equal to offset\;For Switch-IB the dip range is 0..(0xFFDC+offset)" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+	<field name="dip" descr="Destination IP address\;IPv4 address uses bits dip[31:0] and bits dip[127:32] \;are reserved.\;For type = IB GID site-local only bits 79:64 are used, \;other bits are reserved. \;The dip is related to the linear range of the offset such \;that:\;(dip[79:64] - offset) = const, if const is changed then \;the dip[79:64] of all entries will be updated. const is an \;implicit field.\;Note: dip[79:64] must be larger or equal to offset\;For Switch-IB the dip range is 0..(0xFFDC+offset)" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
 	<field name="dip_mask" descr="When type = IB GID site-local, this field is reserved" access="RW" high_bound="3" low_bound="0" offset="0x20.0" size="0x10.0" />
 	<field name="ecmp_hash" descr="Equal Cost Multi-Pathing Hash value\;Reserved when IB switches" access="INDEX" offset="0x54.0" size="0x4.0" />
 	<field name="ecmp_hash_mask" descr="Note: ECMP Hash value is masked before used as an \;Index\;Reserved when IB switches" access="INDEX" offset="0x58.0" size="0x4.0" />
 	<field name="trap_id" descr="Trap ID to be reported to CPU. \;trap_id must be in the range of 1C0h - 1FFh" access="RW" offset="0x60.0" size="0x0.9" />
-	<field name="trap_group" descr="Trap Group to use when trapping to CPU\;Trap groups are limited to 0 - max_num_trap_groups-1\;max_num_trap_groups is provided by Section 2.17.2, \;&quot;HCAP - Host Interface Capabilities&quot;, on page 464" access="RW" offset="0x60.16" size="0x0.4" />
+	<field name="trap_group" descr="Trap Group to use when trapping to CPU\;Trap groups are limited to 0 - max_num_trap_groups-\;1\;max_num_trap_groups is provided by Section 2.17.2, \;&quot;HCAP - Host Interface Capabilities&quot;, on page 512" access="RW" offset="0x60.16" size="0x0.4" />
 	<field name="trap_action" descr="0: permit\;1: soft drop\;2: trap\;3: soft drop &amp; trap\;4: deny\;Reserved when IB switches" access="RW" offset="0x60.28" size="0x0.4" />
 	<field name="qos" descr="Quality of Service:\;0: Map Prio from DSCP, see Section . Not supported \;when type = IB GID site-local\;1: Preserve packet&apos;s Prio (as arrived to the router)" access="RW" offset="0x64.16" size="0x0.2" />
 	<field name="prio" descr="" access="RW" offset="0x64.20" size="0x0.3" />
@@ -6273,23 +6514,23 @@
 	<field name="m" descr="Mirror enable \;Reserved when IB switches" access="RW" offset="0x64.31" size="0x0.1" />
 	<field name="egress_router_interface" descr="Egress Router Interface Index\;Reserved when table != Algo" access="RW" offset="0x70.0" size="0x0.16" />
 	<field name="adjacency_index" descr="Index in the adjacency table\;Reserved when table = Algo" access="RW" offset="0x74.0" size="0x0.16" />
-	<field name="table" descr="Adjacency Table:\;When Switch-X/2:\;0: Ethernet Unicast Adjacency Table\;1: IPoIB Unicast and Multicast Adjacency Table\;2: IPoIB All Routers Adjacency Table\;3: IPoIB IP Broadcast Adjacency Table\;When IB Switches:\;4: ALGO_LID. Algorithmic Routing based on DGID[15:0]. \;5: ALGO_SITE_LOCAL, Algorithmic Routing for next hop, \;based on site-local field in DGID[79:64]. Reserved when \;Switch-IB/2." access="RW" offset="0x74.16" size="0x0.3" />
+	<field name="table" descr="Adjacency Table:\;When Switch-X/2:\;0: Ethernet Unicast Adjacency Table\;1: IPoIB Unicast and Multicast Adjacency Table\;2: IPoIB All Routers Adjacency Table\;3: IPoIB IP Broadcast Adjacency Table\;When IB Switches:\;4: ALGO_LID. Algorithmic Routing based on \;DGID[15:0]. \;5: ALGO_SITE_LOCAL, Algorithmic Routing for next \;hop, based on site-local field in DGID[79:64]. Reserved \;when Switch-IB/2." access="RW" offset="0x74.16" size="0x0.3" />
 	<field name="ecmp_size" descr="ECMP Group Size.\;Used for group-based ECMP to defined the number of \;relevant paths in the ECMP group.\;Reserved when IB switches" access="RW" offset="0x74.24" size="0x0.8" />
 </node>
 
 <node name="ruht_ext" descr="" size="0x78.0" >
-	<field name="offset" descr="Offset within the Unicast FIB LPM to write to. Numbered \;from 0..max_host_table-1 as defined by RATR" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="offset" descr="Offset within the Unicast FIB LPM to write to. Num\;bered from 0..max_host_table-1 as defined by RATR" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="a" descr="Activity. Set if a packet lookup has hit on the specific \;entry.\;To clear the a bit, use &quot;clear activity&quot; op." access="RO" offset="0x0.16" size="0x0.1" />
-	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the \;table. All RW fields are relevant for new entry. Activity bit \;is cleared for new entries\;1: Update action. Used to update an existing route entry \;and only update the following fields:\;trap, trap_group, trap_id,\;m, mirror_dst, prio, qos\;2: Clear activity. A bit is cleared for the entry.\;\;For Query:\;0: Read operation. \;1: clear on Read operation. Used to read entry and clear \;activity bit." access="OP" offset="0x0.20" size="0x0.3" />
+	<field name="op" descr="Operation\;For Write:\;0: Write operation. Used to write a new entry to the \;table. All RW fields are relevant for new entry. Activity \;bit is cleared for new entries\;1: Update action. Used to update an existing route \;entry and only update the following fields:\;trap, trap_group, trap_id,\;m, mirror_dst, prio, qos\;2: Clear activity. A bit is cleared for the entry.\;\;For Query:\;0: Read operation. \;1: clear on Read operation. Used to read entry and \;clear activity bit." access="OP" offset="0x0.20" size="0x0.3" />
 	<field name="type" descr="Entry Type:\;0: IPv4\;1: IPv6" access="INDEX" offset="0x0.24" size="0x0.2" />
 	<field name="oe" descr="Offset Enable.\;When set, the access is using the offset field.\;When cleared, the access is using the IP address.\;Note: accessing an entry using offset result in better \;performance." access="INDEX" offset="0x0.30" size="0x0.1" />
 	<field name="v" descr="Valid bit" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="virtual_router" descr="Range is 0..cap_max_virtual_routers-1" access="RW" offset="0x4.16" size="0x0.16" />
-	<field name="dip" descr="Destination IP address.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] are \;reserved.\;Note: This field is a RW field when accessing the entry \;using the handle." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+	<field name="dip" descr="Destination IP address.\;IPv4 address uses bits dip[31:0] and bits dip[127:32] \;are reserved.\;Note: This field is a RW field when accessing the entry \;using the handle." access="INDEX" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
 	<field name="ecmp_hash" descr="Equal Cost Multi-Pathing Hash value" access="INDEX" offset="0x54.0" size="0x4.0" />
 	<field name="ecmp_hash_mask" descr="Note: ECMP Hash value is masked before used as an Index" access="INDEX" offset="0x58.0" size="0x4.0" />
 	<field name="trap_id" descr="Trap ID to be reported to CPU. \;trap_id must be in the range of 1C0h - 1FFh" access="RW" offset="0x60.0" size="0x0.9" />
-	<field name="trap_group" descr="Trap group to use when trapping to CPU.\;Trap groups are limited to 0 - (max_num_trap_groups-\;1)\;max_num_trap_groups is provided by Section 2.17.2, \;&quot;HCAP - Host Interface Capabilities&quot;, on page 464" access="RW" offset="0x60.16" size="0x0.4" />
+	<field name="trap_group" descr="Trap group to use when trapping to CPU.\;Trap groups are limited to 0 - (max\;_num_trap_groups-1)\;max_num_trap_groups is provided by Section 2.17.2, \;&quot;HCAP - Host Interface Capabilities&quot;, on page 512" access="RW" offset="0x60.16" size="0x0.4" />
 	<field name="trap_action" descr="0: permit\;1: soft drop\;2: trap\;3: soft drop &amp; trap\;4: deny" access="RW" offset="0x60.28" size="0x0.4" />
 	<field name="qos" descr="Quality of Service\;0: Map Prio from DSCP, see Section \;1: Preserve packet&apos;s Prio (as arrived to the router)" access="RW" offset="0x64.16" size="0x0.2" />
 	<field name="prio" descr="" access="RW" offset="0x64.20" size="0x0.3" />
@@ -6308,8 +6549,8 @@
 	<field name="hit_ipv4_ml_low" descr="Counts hit on IPv4 ML lookups\;" access="RO" offset="0x1C.0" size="0x4.0" />
 	<field name="miss_ipv4_m_high" descr="Counts misses on IPv4 M lookups\;If there was an IPv4 ML lookup then this is not counted" access="RO" offset="0x20.0" size="0x4.0" />
 	<field name="miss_ipv4_m_low" descr="Counts misses on IPv4 M lookups\;If there was an IPv4 ML lookup then this is not counted" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="miss_ipv4_ml_high" descr="Counts misses on IPv4 ML lookups\;Note: a miss on ML is counted only if there was a hit on the M" access="RO" offset="0x28.0" size="0x4.0" />
-	<field name="miss_ipv4_ml_low" descr="Counts misses on IPv4 ML lookups\;Note: a miss on ML is counted only if there was a hit on the M" access="RO" offset="0x2C.0" size="0x4.0" />
+	<field name="miss_ipv4_ml_high" descr="Counts misses on IPv4 ML lookups\;Note: a miss on ML is counted only if there was a hit on the \;M" access="RO" offset="0x28.0" size="0x4.0" />
+	<field name="miss_ipv4_ml_low" descr="Counts misses on IPv4 ML lookups\;Note: a miss on ML is counted only if there was a hit on the \;M" access="RO" offset="0x2C.0" size="0x4.0" />
 	<field name="learned_ipv4_high" descr="Counts learned IPv4 lookups\;Typically the learned is equal or smaller than the miss" access="RO" offset="0x30.0" size="0x4.0" />
 	<field name="learned_ipv4_low" descr="Counts learned IPv4 lookups\;Typically the learned is equal or smaller than the miss" access="RO" offset="0x34.0" size="0x4.0" />
 	<field name="hit_ipv6_m_high" descr="Counts hit on IPv6 M lookups\;(See notes above)" access="RO" offset="0x40.0" size="0x4.0" />
@@ -6332,7 +6573,7 @@
 
 <node name="rxltm_ext" descr="" size="0x14.0" >
 	<field name="m_sel" descr="M select: \;0: m0\;1: m1\;Note: update time is a few mSec. \;When m_sel is updated then SW must set go_m_sel .\;" access="RW" offset="0x0.0" size="0x0.1" />
-	<field name="go_m_sel" descr="Go m select:\;Set to 1 by SW when m_select value is changed by SW.\;Set to 0 by FW when m_select change was implemented.\;If go_m_sel=1 then NACK\;Note: during change of m_sel SW must not delete XLT entries \;with old m value." access="RW" offset="0x0.1" size="0x0.1" />
+	<field name="go_m_sel" descr="Go m select:\;Set to 1 by SW when m_select value is changed by SW.\;Set to 0 by FW when m_select change was implemented.\;If go_m_sel=1 then NACK\;Note: during change of m_sel SW must not delete XLT \;entries with old m value." access="RW" offset="0x0.1" size="0x0.1" />
 	<field name="m_sel_update" descr="0: Update all fields\;1: Update only go_m_sel, m_sel" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="m0_val_v4" descr="Global M0 value For IPv4\;Range 0..32" access="RW" offset="0x10.0" size="0x0.6" />
 	<field name="m1_val_v4" descr="Global M1 value For IPv4\;Range 0..32" access="RW" offset="0x10.8" size="0x0.6" />
@@ -6343,8 +6584,8 @@
 <node name="sbcam_ext" descr="" size="0x4c.0" >
 	<field name="access_reg_group" descr="Access Register ID groups \;0: First 128 REG_ID" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="feature_group" descr="Feature list mask index\;0: Enhanced features" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="sb_access_reg_cap_mask" descr="Supported Shared Buffer access register bitmasks. Based on \;access_reg_group index. \;When bit is set, the register is supported in the device. \;For example:\;Bit 1: SBPR_(0xB001)\;Bit 2: SBCM_(0xB002)\;Bit 3: SBPM_(0xB003)\;Bit 5: SBSR_(0xB005)" access="RO" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
-	<field name="sb_feature_cap_mask" descr="Supported Shared Buffer enhanced features based on fea\;ture_group index.\;When bit is set, the feature is supported in the device\;Bit 0: descriptors_cap - (desc) is supported \;Bit 1: ext_buff_occupancy_cap - is supported \;Bit 2: exclude_cap - bit is supported\;Bit 3: sb_own_res - user can configure ePort per tc shared \;buffer configuration    \;Bit 4: sb_global_res - user can configure ePort, iPort and iPort \;per pg shared buffer configuration  " access="RO" enum="descriptors_cap=0x1,ext_buff_occupancy_cap=0x2,exclude_cap=0x4,sb_own_res=0x8,sb_global_res=0x10" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
+	<field name="sb_access_reg_cap_mask" descr="Supported Shared Buffer access register bitmasks. Based \;on access_reg_group index. \;When bit is set, the register is supported in the device. \;For example:\;Bit 1: SBPR_(0xB001)\;Bit 2: SBCM_(0xB002)\;Bit 3: SBPM_(0xB003)\;Bit 5: SBSR_(0xB005)" access="RO" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
+	<field name="sb_feature_cap_mask" descr="Supported Shared Buffer enhanced features based on fea\;ture_group index.\;When bit is set, the feature is supported in the device\;Bit 0: descriptors_cap - (desc) is supported \;Bit 1: ext_buff_occupancy_cap - is supported \;Bit 2: exclude_cap - bit is supported\;Bit 3: sb_own_res - user can configure ePort per tc shared \;buffer configuration    \;Bit 4: sb_global_res - user can configure ePort, iPort and \;iPort per pg shared buffer configuration  " access="RO" enum="descriptors_cap=0x1,ext_buff_occupancy_cap=0x2,exclude_cap=0x4,sb_own_res=0x8,sb_global_res=0x10" high_bound="3" low_bound="0" offset="0x28.0" size="0x10.0" />
 	<field name="cap_total_descriptors" descr="Total amount of descriptors in the device - 16 bits" access="RO" offset="0x3C.16" size="0x0.16" />
 	<field name="cap_total_buffer_size" descr="Total buffer size in the device. \;Units of Bytes." access="RO" offset="0x40.0" size="0x4.0" />
 	<field name="cap_num_pool_supported" descr="Number of shared buffer pools supported" access="RO" offset="0x44.0" size="0x0.8" />
@@ -6358,7 +6599,7 @@
 <node name="sbcm_ext" descr="" size="0x28.0" >
 	<field name="dir" descr="Direction\;0: Ingress port quota\;1: Egress port quota\;\;" access="INDEX" offset="0x0.0" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]\;\;\;" access="INDEX" offset="0x0.4" size="0x0.2" />
-	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class: range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;\;For Spectrum MC packets: no admission on Tx.Tclass, so \;when traffic class is in MC aware mode then the traffic \;classes which are MC aware must not be configured, but \;can be read. Spectrum-2 has admission on Tx.Tclass so all \;traffic classes can be configured also for MC aware mode. \;see Section 11.5, &quot;Ethernet Switch Packet Priority and \;TClass Mapping&quot;, on page 2565\;\;\;\;\;" access="INDEX" offset="0x0.8" size="0x0.6" />
+	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class \;(dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class: range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;\;For Spectrum MC packets: no admission on Tx.Tclass, so \;when traffic class is in MC aware mode then the traffic \;classes which are MC aware must not be configured, but \;can be read. Spectrum-2 has admission on Tx.Tclass so \;all traffic classes can be configured also for MC aware \;mode. \;see Section 11.5, &quot;Ethernet Switch Packet Priority \;and TClass Mapping&quot;, on page 2354\;\;\;\;\;" access="INDEX" offset="0x0.8" size="0x0.6" />
 	<field name="local_port" descr="Local port number\;For Ingress: excludes CPU port\;For Egress: includes CPU port\;\;\;" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="snap" descr="Read the snapshot guage\;0: FREE - read free running buff_occupancy\;1: SNAP - read snapshot of the buff_occupancy\;When SBSNR.status is RELEASED then the device will \;NACK the command\;Reserved when Spectrum" access="OP" offset="0x0.30" size="0x0.1" />
 	<field name="desc" descr="[Advanced]\;Descriptor buffer\;\;\;" access="INDEX" offset="0x0.31" size="0x0.1" />
@@ -6367,9 +6608,9 @@
 	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. \;This includes cells at the pool and at the min_buff\;Cleared by writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x14.0" size="0x0.24" />
 	<field name="clr" descr="Clear Max Buffer Occupancy\;When this bit is set, the max_buff_occupancy field is \;cleared (and a new max value is tracked from the time the \;clear was performed)" access="OP" offset="0x14.31" size="0x0.1" />
 	<field name="min_buff" descr="Minimum buffer size for the limiter\;The minimum buffer is not part of the pool area.\;Units of cells" access="RW" offset="0x18.0" size="0x0.24" />
-	<field name="max_buff" descr="The maximum buffer threshold in the pool area.\;When the pool that is associated to the port-pg/tclass is \;configured to static, then max_buff is configured in cells\;When the pool that is associated to the port-pg/tclass is \;configured to dynamic, then max_buff holds the &quot;alpha&quot; \;parameter, supporting the following values:\;0 : 0\;i : (1/128)*2^(i-1), for i=1..14\;0xFF: Infinity\;Reserved when infi_max = 1\;[Advanced] When: (1) dir=Ingress and (2) desc=1 and (3) the \;PG is lossless then the max_buff must not be &apos;0&apos;, both for \;static and dynamic modes\;" access="RW" offset="0x1C.0" size="0x0.24" />
+	<field name="max_buff" descr="The maximum buffer threshold in the pool area.\;When the pool that is associated to the port-pg/tclass is \;configured to static, then max_buff is configured in cells\;When the pool that is associated to the port-pg/tclass is \;configured to dynamic, then max_buff holds the &quot;alpha&quot; \;parameter, supporting the following values:\;0 : 0\;i : (1/128)*2^(i-1), for i=1..14\;0xFF: Infinity\;Reserved when infi_max = 1\;[Advanced] When: (1) dir=Ingress and (2) desc=1 and (3) \;the PG is lossless then the max_buff must not be &apos;0&apos;, both \;for static and dynamic modes\;" access="RW" offset="0x1C.0" size="0x0.24" />
 	<field name="infi_max" descr="Max buffer is infinite\;When set, the max_buff field is reserved" access="RW" offset="0x1C.31" size="0x0.1" />
-	<field name="pool" descr="Association of the port-priority to a pool\;Range 0 .. cap_num_pool_supported - 1\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used for \;FW pool swap, pool 14 is used for desc, pool 15 is used for \;MC" access="RW" offset="0x24.0" size="0x0.4" />
+	<field name="pool" descr="Association of the port-priority to a pool\;Range 0 .. cap_num_pool_supported - 1\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used \;for FW pool swap, pool 14 is used for desc, pool 15 is used \;for MC" access="RW" offset="0x24.0" size="0x0.4" />
 </node>
 
 <node name="sbctc_ext" descr="" size="0x20.0" >
@@ -6380,14 +6621,14 @@
 	<field name="dir_ing" descr="Direction\;0: Egress Tclass\;1: Ingress PG\;\;Reserved when Spectrum-1\;" access="INDEX" offset="0x0.24" size="0x0.2" />
 	<field name="event" descr="Event generation on crossing thr max for this port:\;0: NO_EVENT - Do not generate event\;1: EVENTS - Generate events for crossing up and down\;Not configured when en_config = 0" access="RW" offset="0x4.0" size="0x0.2" />
 	<field name="en_config" descr="Enable configuration of all fields except event field" access="WO" offset="0x4.31" size="0x0.1" />
-	<field name="tclass_en_high" descr="TClass/PG Trap enable (for IB switches this is VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits when SBGCR.tele_entity = PORT: bit0 (all tclasses), \;else:\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="tclass_en_low" descr="TClass/PG Trap enable (for IB switches this is VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits when SBGCR.tele_entity = PORT: bit0 (all tclasses), \;else:\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="thr_max" descr="Threshold max\;When an egress port TClass crosses the threshold (cross up \;or down) then the HW will emit an event of SB_CONG_TX\;_PORT and the status can be read by SBCTR\;For Quantum and Spectrum-2: When an egress port TClass/\;PG crosses the threshold then congestion mirror is enabled\;\;When congestion mode is Fixed:\;- Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size\;When congestion mode is Percentage:\;- Percentage of the quota of local_port,traffic_class. Range is \;0,..100, units of integer percentage.\;\;Written only if en_config = 1\;\;" access="RW" offset="0x10.0" size="0x0.24" />
-	<field name="thr_min" descr="Threshold min\;When an egress port tclass crosses below the threshold \;(cross up or down) then the congestion state is change to set/\;clear.\;The status can be read by SBCTR\;When congestion mode is Fixed:\;- Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size\;Suggested: thr_min &lt; thr_max-3*MTU\;When congestion mode is Percentage:\;- Percentage of the quota of local_port,traffic_class. Range is \;0..100, units of integer percentage.\;Written only if en_config = 1\;Value of 0 means that the hysteresis is disabled" access="RW" offset="0x14.0" size="0x0.24" />
+	<field name="tclass_en_high" descr="TClass/PG Trap enable (for IB switches this is VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits when SBGCR.tele_entity = PORT: bit0 (all \;tclasses), else:\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="tclass_en_low" descr="TClass/PG Trap enable (for IB switches this is VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits when SBGCR.tele_entity = PORT: bit0 (all \;tclasses), else:\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="thr_max" descr="Threshold max\;When an egress port TClass crosses the threshold (cross \;up or down) then the HW will emit an event of SB_CON\;G_TX_PORT and the status can be read by SBCTR\;For Quantum and Spectrum-2: When an egress port \;TClass/PG crosses the threshold then congestion mirror is \;enabled\;\;When congestion mode is Fixed:\;- Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size\;When congestion mode is Percentage:\;- Percentage of the quota of local_port,traffic_class. Range \;is 0,..100, units of integer percentage.\;\;Written only if en_config = 1\;\;" access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="thr_min" descr="Threshold min\;When an egress port tclass crosses below the threshold \;(cross up or down) then the congestion state is change to \;set/clear.\;The status can be read by SBCTR\;When congestion mode is Fixed:\;- Cells. Valid inputs are 1..cap_total_buffer_size/cap_cell_\;size\;Suggested: thr_min &lt; thr_max-3*MTU\;When congestion mode is Percentage:\;- Percentage of the quota of local_port,traffic_class. Range \;is 0..100, units of integer percentage.\;Written only if en_config = 1\;Value of 0 means that the hysteresis is disabled" access="RW" offset="0x14.0" size="0x0.24" />
 </node>
 
 <node name="sbctr_ext" descr="" size="0x18.0" >
-	<field name="entity" descr="Entity type:\;0: TCLASS\;1: PORT\;This field represents the value configured by SBGCR.tele_en\;tity\;\;\;\;" access="RO" offset="0x0.0" size="0x0.2" />
+	<field name="entity" descr="Entity type:\;0: TCLASS\;1: PORT\;This field represents the value configured by \;SBGCR.tele_entity\;\;\;\;" access="RO" offset="0x0.0" size="0x0.2" />
 	<field name="fp" descr="False Positive\;When a trap: this is a false positive trap\;Reserved when Switch-IB/2, Quantum and Spectrum-2/-3" access="RO" offset="0x0.4" size="0x0.1" />
 	<field name="dir_ing" descr="Direction\;0: Egress Tclass\;1: Ingress PG\;Reserved when Spectrum-1\;\;\;" access="INDEX" offset="0x0.8" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]\;\;\;" access="INDEX" offset="0x0.12" size="0x0.2" />
@@ -6404,31 +6645,31 @@
 
 <node name="sbdcc_ext" descr="" size="0x210.0" >
 	<field name="clr" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="no_buffer_discard_cpu_tclass" descr="Count the number of unicast packets to CPU dropped due \;to lack of shared buffer resources\;For tclass i\;Range is 0.. cap_max_cpu_ingress_tclass-1\;See Table 1419, &quot;SBDCC - counter Layout,&quot; on \;page 2037" subnode="uint64" access="RO" high_bound="63" low_bound="0" offset="0x10.0" size="0x200.0" />
+	<field name="no_buffer_discard_cpu_tclass" descr="Count the number of unicast packets to CPU dropped due \;to lack of shared buffer resources\;For tclass i\;Range is 0.. cap_max_cpu_ingress_tclass-1\;See Table 1558, &quot;SBDCC - counter Layout,&quot; on \;page 1830" subnode="uint64" access="RO" high_bound="63" low_bound="0" offset="0x10.0" size="0x200.0" />
 </node>
 
 <node name="sbdcm_ext" descr="" size="0x14.0" >
-	<field name="counter_index" descr="Counter Index for flow counters, counting no buffer discard \;per switch priority.\;For Spectrum-2: reserves counter range at size of cap_\;max_switch_priorities+1 \;Each entry is per switch priority from 0 to cap_max\;_switch_priorities-1\;For Spectrum: See Section 4.1, &quot;Performance and Mon\;itoring Counters&quot;, on page 1057\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="counter_index" descr="Counter Index for flow counters, counting no buffer dis\;card per switch priority.\;For Spectrum-2: reserves counter range at size of cap_\;max_switch_priorities+1 \;Each entry is per switch priority from 0 to cap_max\;_switch_priorities-1\;For Spectrum: See Section 4.1, &quot;Performance and \;Monitoring Counters&quot;, on page 819\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.0" size="0x0.24" />
 	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;default: type=0 (disabled)\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.24" size="0x0.8" />
 </node>
 
 <node name="sbdcr_ext" descr="" size="0x14.0" >
-	<field name="counter_index" descr="Counter Index for flow counters, counting no buffer discard \;per switch priority.\;Reserves a counter range of num_ports*num_PGs:\;PG 0..7 - PGs\;PG 8 - Control PG\;PG 9 - Mirror PG\;PG 10 - egress-traps, reserved when Spectrum family\;\;For Spectrum: See Section 4.1, &quot;Performance and Mon\;itoring Counters&quot;, on page 1057\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum-2: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 1060\;default: type=0 (disabled)\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.24" size="0x0.8" />
+	<field name="counter_index" descr="Counter Index for flow counters, counting no buffer dis\;card per switch priority.\;Reserves a counter range of num_ports*num_PGs:\;PG 0..7 - PGs\;PG 8 - Control PG\;PG 9 - Mirror PG\;PG 10 - egress-traps, reserved when Spectrum family\;\;For Spectrum: See Section 4.1, &quot;Performance and \;Monitoring Counters&quot;, on page 819\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum-2: See Section 4.2.2, &quot;Counter Set \;Type&quot;, on page 822\;default: type=0 (disabled)\;Not supported by SwitchX/-2 and Spectrum" access="RW" offset="0x10.24" size="0x0.8" />
 </node>
 
 <node name="sbgcr_ext" descr="" size="0xc.0" >
-	<field name="tele_entity" descr="Telemetry entity type:\;0: TCLASS \;1: PORT \;2: BOTH - support both TCLASS and PORT. Indexed by \;SBCTC.res \;Note: change of this field is allowed only when congestion \;threshold is disabled on all ports and tclasses, see SBCTC\;Reserved when Spectrum/-2" access="RW" offset="0x0.0" size="0x0.2" />
+	<field name="tele_entity" descr="Telemetry entity type:\;0: TCLASS \;1: PORT \;2: BOTH - support both TCLASS and PORT. Indexed by \;SBCTC.res \;Note: change of this field is allowed only when congestion \;threshold is disabled on all ports and tclasses, see \;SBCTC\;Reserved when Spectrum/-2" access="RW" offset="0x0.0" size="0x0.2" />
 	<field name="cong_fp" descr="Congestion false positive\;For Tclass Congestion:\;0: False Negative - allow trap and rules only for congested \;Tclass. Response may be delayed by a few uSec\;1: False Positive - allow fp-trap and rules for all Tclasses, \;converging over time to only congested Tclasses. Provided \;immediate response \;Reserved when SwitchX/-2, Switch-IB/2, Quantum and \;Spectrum-2/-3" access="RW" offset="0x0.4" size="0x0.1" />
-	<field name="hba" descr="[Spectrum-4]\;Hierarchical Buffer Admission\;0: Disable HBA.\;Allows queues with different alpha to share the same por\;tion of the port.pool buffer allocation\;1: Enable HBA. \;Allows queues with higher alpha to get more buffer alloca\;tion per port.pool allocation\;\;Supported only from Spectrum-4" access="RW" offset="0x8.0" size="0x0.1" />
+	<field name="hba" descr="[Spectrum-4]\;Hierarchical Buffer Admission\;0: Disable HBA.\;Allows queues with different alpha to share the same por\;tion of the port.pool buffer allocation\;1: Enable HBA. \;Allows queues with higher alpha to get more buffer allo\;cation per port.pool allocation\;\;Supported only from Spectrum-4" access="RW" offset="0x8.0" size="0x0.1" />
 </node>
 
 <node name="sbhbr_ext" descr="" size="0x1c.0" >
 	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="RW" offset="0x0.16" size="0x0.8" />
 	<field name="opcode" descr="Opcode:\;0: Bind a hist_id\;1: Unbind a hist_id (default)" access="RW" offset="0x0.28" size="0x0.4" />
 	<field name="hist_id" descr="Histogram id to bind\;from 0 to cap_max_queue_hist_id - 1" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;See Table , &quot;,&quot; on page 2042" access="RW" offset="0x8.0" size="0x0.16" />
-	<field name="hist_parameters" descr="According to hist_type\;See Table , &quot;,&quot; on page 2042" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="hist_type" descr="0x1000: Queue_Depth_Traffic_Class\;See Table , &quot;,&quot; on page 1835" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="hist_parameters" descr="According to hist_type\;See Table , &quot;,&quot; on page 1835" access="RW" offset="0xC.0" size="0x4.0" />
 	<field name="hist_min_value" descr="Min value for histogram main range\;Units according to the units of the hist_type" access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="hist_max_value" descr="Max value for histogram main range\;Note: for Spectrum device, hist_group=1 this rule must be \;meet:\;hist_max_value = hist_min_value + 8*2^n, n &gt;= 0\;Units according to the units of the hist_type" access="RW" offset="0x14.0" size="0x4.0" />
 	<field name="sample_time" descr="Sample time interval. \;Allowed range:\;time = 2^sample_time * 128nSec\;sample_time range is 0..cap_max_sample_time-1\;Note: for Spectrum the sample_time is global for all ports \;and all tclass \;For Spectrum-2 the sample_time is per port.tclass." access="RW" offset="0x18.0" size="0x0.6" />
@@ -6437,14 +6678,14 @@
 <node name="sbhbr_v2_ext" descr="" size="0x20.0" >
 	<field name="dir" descr="Direction\;0: Ingress port quota\;1: Egress port quota\;\;\;\;Reserved when hist_type = Queue_Latency and this field is \;treated as &apos;1&apos; Egress port quota\;" access="INDEX" offset="0x0.0" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]\;\;\;" access="INDEX" offset="0x0.4" size="0x0.2" />
-	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class, hist_type of Queue_Depth_Traffic_Class: \;range is 0..cap_max_tclass - 1\;For traffic class, hist_type of Queue_Latency: range is \;0..cap_max_tclass_data - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;For Spectrum: no admission on Tx.Tclass, so when traffic \;class is in MC aware mode then the traffic classes which are \;MC aware must not be configured, but can be read. Spec\;trum-2 has admission on Tx.Tclass so all traffic classes can \;be configured also for MC aware mode. \;see Section 11.5, &quot;Ethernet Switch Packet Priority and \;TClass Mapping&quot;, on page 2565\;\;\;\;" access="INDEX" offset="0x0.8" size="0x0.6" />
+	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class, hist_type of Queue_Depth_Traffic_Class: \;range is 0..cap_max_tclass - 1\;For traffic class, hist_type of Queue_Latency: range is \;0..cap_max_tclass_data - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;For Spectrum: no admission on Tx.Tclass, so when traffic \;class is in MC aware mode then the traffic classes which \;are MC aware must not be configured, but can be read. \;Spectrum-2 has admission on Tx.Tclass so all traffic \;classes can be configured also for MC aware mode. \;see Section 11.5, &quot;Ethernet Switch Packet Priority and \;TClass Mapping&quot;, on page 2354\;\;\;\;" access="INDEX" offset="0x0.8" size="0x0.6" />
 	<field name="local_port" descr="Local port number.\;For Ingress: excludes CPU port and Router port\;For Egress: excludes IP Router\;For Egress hist_type of Queue_Latency: exludes also CPU \;port\;\;\;\;" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="en" descr="When hist_type = Queue_Depth_Traffic_Class:\;Enable the histogram\;When hist_type = Queue_Latency:\;This is a WO for clearing the histograms and the counters" access="RW" offset="0x4.0" size="0x0.1" />
-	<field name="hist_type" descr="See Table 1427, &quot;SBHBR - Histograms Hist-type for \;queue histograms,&quot; on page 2042" access="INDEX" offset="0x8.0" size="0x0.16" />
+	<field name="hist_type" descr="See Table 1566, &quot;SBHBR - Histograms Hist-type for \;queue histograms,&quot; on page 1835" access="INDEX" offset="0x8.0" size="0x0.16" />
 	<field name="mode" descr="mode\;0: Linear histogram\;1: Exponential histogram" access="RW" offset="0x8.28" size="0x0.3" />
 	<field name="hist_min_value" descr="Min value for histogram main range\;Units according to the units of the hist_type" access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="hist_max_value" descr="Max value for histogram main range\;When mode=0 (linear), then this rule must be meet:\;hist_max_value = hist_min_value + 8*2^n, n &gt;= 0\;When mode=1 (exponential), then this rule must be meet:\;hist_max_value = hist_min_value + 255*2^n, n &gt;= 0\;Units according to the units of the hist_type" access="RW" offset="0x14.0" size="0x4.0" />
-	<field name="sample_time" descr="Sample time interval. \;Allowed range:\;time = 2^sample_time * 128nSec\;sample_time range is 0..cap_max_sample_time-1\;For Spectrum the sample_time is global for all ports and all \;tclass \;For Spectrum-2 the sample_time is per port.tclass. \;Reserved when hist_type = Queue_Latency" access="RW" offset="0x18.0" size="0x0.6" />
+	<field name="sample_time" descr="Sample time interval. \;Allowed range:\;time = 2^sample_time * 128nSec\;sample_time range is 0..cap_max_sample_time-1\;For Spectrum the sample_time is global for all ports and \;all tclass \;For Spectrum-2 the sample_time is per port.tclass. \;Reserved when hist_type = Queue_Latency" access="RW" offset="0x18.0" size="0x0.6" />
 </node>
 
 <node name="sbhpc_ext" descr="" size="0x24.0" >
@@ -6455,52 +6696,52 @@
 <node name="sbhrr_ext" descr="" size="0x60.0" >
 	<field name="clr" descr="Clear:\;0: Read the data in the histogram agent\;1: Read and clear the data in the histogram agent" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="hist_id" descr="see SBHBR" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used for \;the hist_id\;Max bins is according to cap_hist_num_bins\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When any \;bin is saturated all bins stop incrementing.\;See Table 1432, &quot;SBHRR - Bin Layout,&quot; on page 2043" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x10.0" size="0x50.0" />
+	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When \;any bin is saturated all bins stop incrementing.\;See Table 1571, &quot;SBHRR - Bin Layout,&quot; on page 1837" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x10.0" size="0x50.0" />
 </node>
 
 <node name="sbhrr_v2_ext" descr="" size="0x90.0" >
 	<field name="dir" descr="Direction\;0: Ingress port quota\;1: Egress port quota\;\;\;\;\;Reserved when hist_type = Queue_Latency and this field is \;treated as &apos;1&apos; Egress port quota" access="INDEX" offset="0x0.0" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]\;\;\;\;" access="INDEX" offset="0x0.4" size="0x0.2" />
-	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class: range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;See Section 11.5, &quot;Ethernet Switch Packet Priority and \;TClass Mapping&quot;, on page 2565\;\;\;" access="INDEX" offset="0x0.8" size="0x0.6" />
+	<field name="pg_buff" descr="PG buffer - Port PG (dir=ingress) / traffic class (dir=egress)\;For PG buffer: range is 0..cap_max_pg_buffers - 1\;For traffic class: range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;See Section 11.5, &quot;Ethernet Switch Packet Priority and \;TClass Mapping&quot;, on page 2354\;\;\;" access="INDEX" offset="0x0.8" size="0x0.6" />
 	<field name="local_port" descr="Local port number.\;For Ingress: excludes CPU port\;For Egress: includes CPU port\;\;\;\;" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="clr" descr="Clear:\;0: Read the data in the histogram agent\;1: Read and clear the data in the histogram agent" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="hist_type" descr="See Table 1427, &quot;SBHBR - Histograms Hist-type for \;queue histograms,&quot; on page 2042" access="INDEX" offset="0x8.0" size="0x0.16" />
-	<field name="min_sampled_high" descr="min_sampled\;Cleared when clr = 1, cleared to 0xffff_ffff_ffff_ffff\;Units according to the units of the hist_type which is used for \;the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="min_sampled_low" descr="min_sampled\;Cleared when clr = 1, cleared to 0xffff_ffff_ffff_ffff\;Units according to the units of the hist_type which is used for \;the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="max_sampled_high" descr="max_sampled\;Cleared when clr = 1, cleared to 0\;Units according to the units of the hist_type which is used for \;the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x18.0" size="0x4.0" />
-	<field name="max_sampled_low" descr="max_sampled\;Cleared when clr = 1, cleared to 0\;Units according to the units of the hist_type which is used for \;the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x1C.0" size="0x4.0" />
-	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used for \;the hist_id\;Max bins is according to cap_hist_num_bins.\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When any \;bin is saturated all bins stop incrementing.\;See Table 1438, &quot;SBHRR_V2 - Bin Layout,&quot; on page 2050" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x40.0" size="0x50.0" />
+	<field name="hist_type" descr="See Table 1566, &quot;SBHBR - Histograms Hist-type for \;queue histograms,&quot; on page 1835" access="INDEX" offset="0x8.0" size="0x0.16" />
+	<field name="min_sampled_high" descr="min_sampled\;Cleared when clr = 1, cleared to 0xffff_ffff_ffff_ffff\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x10.0" size="0x4.0" />
+	<field name="min_sampled_low" descr="min_sampled\;Cleared when clr = 1, cleared to 0xffff_ffff_ffff_ffff\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x14.0" size="0x4.0" />
+	<field name="max_sampled_high" descr="max_sampled\;Cleared when clr = 1, cleared to 0\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="max_sampled_low" descr="max_sampled\;Cleared when clr = 1, cleared to 0\;Units according to the units of the hist_type which is used \;for the hist_id\;Reserved when hist_type = Queue_Depth_Traffic_Class" access="RO" offset="0x1C.0" size="0x4.0" />
+	<field name="bin" descr="Value of bin \;Units according to the units of the hist_type which is used \;for the hist_id\;Max bins is according to cap_hist_num_bins.\;Bin is saturated at (2^cap_hist_bin_size_type1-1). When \;any bin is saturated all bins stop incrementing.\;See Table 1577, &quot;SBHRR_V2 - Bin Layout,&quot; on \;page 1843" subnode="uint64" access="RO" high_bound="9" low_bound="0" offset="0x40.0" size="0x50.0" />
 </node>
 
 <node name="sbib_ext" descr="" size="0x10.0" >
 	<field name="int_buffer_index" descr="Internal Buffer Index \;Spectrum supports only 1 index per port with value of 0" access="INDEX" offset="0x0.0" size="0x0.8" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not supported for CPU port\;Not supported for Router port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="status" descr="Status:\;0: the internal buffer status is not yet at the size of buff_size\;1: the internal buffer status is equal to buff_size" access="RO" offset="0x4.28" size="0x0.4" />
+	<field name="status" descr="Status:\;0: the internal buffer status is not yet at the size of buff_\;size\;1: the internal buffer status is equal to buff_size" access="RO" offset="0x4.28" size="0x0.4" />
 	<field name="buff_size" descr="Buffer size\;Units represented in cells\;Allowed range is 0 to (cap_max_headroom_size - 1)\;Default is 0" access="RW" offset="0x8.0" size="0x0.24" />
 </node>
 
 <node name="sbme_ext" descr="" size="0x28.0" >
 	<field name="local_port" descr="Local port number for egress ports\;Includes CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="desc" descr="[Advanced]\;Descriptor buffer" access="INDEX" offset="0x0.31" size="0x0.1" />
-	<field name="pool" descr="Association of the port-priority to a pool\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used for \;FW pool swap, pool 14 is used for desc, pool 15 is used for \;MC\;[Advanced] default for desc is pool 14\;[Advanced] default for non-desc is pool 15" access="RW" offset="0x24.0" size="0x0.4" />
+	<field name="pool" descr="Association of the port-priority to a pool\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used \;for FW pool swap, pool 14 is used for desc, pool 15 is used \;for MC\;[Advanced] default for desc is pool 14\;[Advanced] default for non-desc is pool 15" access="RW" offset="0x24.0" size="0x0.4" />
 </node>
 
 <node name="sbmm_ext" descr="" size="0x28.0" >
 	<field name="prio" descr="Switch Priority" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="snap" descr="Read the snapshot guage\;0: FREE - read free running buff_occupancy\;1: SNAP - read snapshot of the buff_occupancy\;When SBSNR.status is RELEASED then the device will \;NACK the command\;Reserved when Spectrum" access="OP" offset="0x0.30" size="0x0.1" />
 	<field name="buff_occupancy" descr="Current buffer occupancy" access="RO" offset="0x10.0" size="0x0.24" />
-	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. Cleared by \;writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x14.0" size="0x0.24" />
+	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. Cleared \;by writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x14.0" size="0x0.24" />
 	<field name="clr" descr="Clear Max Buffer Occupancy\;When this bit is set, the max_buff_occupancy field is \;cleared (and a new max value is tracked from the time the \;clear was performed)" access="OP" offset="0x14.31" size="0x0.1" />
 	<field name="min_buff" descr="Minimum buffer size for the limiter, in cells" access="RW" offset="0x18.0" size="0x0.24" />
-	<field name="max_buff" descr="When the pool associated to the port-pg/tclass is config\;ured to static, Maximum buffer size for the limiter config\;ured in cells.\;When the pool associated to the port-pg/tclass is config\;ured to dynamic, the max_buff holds the &quot;alpha&quot; parameter, \;supporting the following values:\;0 : 0\;i : (1/128)*2^(i-1), for i=1..14\;0xFF: Infinity\;Reserved when infi_max = 1" access="RW" offset="0x1C.0" size="0x0.24" />
+	<field name="max_buff" descr="When the pool associated to the port-pg/tclass is config\;ured to static, Maximum buffer size for the limiter config\;ured in cells.\;When the pool associated to the port-pg/tclass is config\;ured to dynamic, the max_buff holds the &quot;alpha&quot; parame\;ter, supporting the following values:\;0 : 0\;i : (1/128)*2^(i-1), for i=1..14\;0xFF: Infinity\;Reserved when infi_max = 1" access="RW" offset="0x1C.0" size="0x0.24" />
 	<field name="infi_max" descr="Max buffer is infinite\;When set, the max_buff field is reserved" access="RW" offset="0x1C.31" size="0x0.1" />
 	<field name="pool" descr="Association of the port-priority to a pool" access="RW" offset="0x24.0" size="0x0.4" />
 </node>
 
 <node name="sbpm_ext" descr="" size="0x20.0" >
 	<field name="dir" descr="Direction\;0: Ingress port quota\;1: Egress port quota\;\;\;" access="INDEX" offset="0x0.0" size="0x0.2" />
-	<field name="pool" descr="The pool associated to quota counting on the local_port\;Range 0 .. cap_num_pool_supported - 1\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used for \;FW pool swap, pool 14 is used for desc, pool 15 is used for \;MC" access="INDEX" offset="0x0.8" size="0x0.4" />
+	<field name="pool" descr="The pool associated to quota counting on the local_port\;Range 0 .. cap_num_pool_supported - 1\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used \;for FW pool swap, pool 14 is used for desc, pool 15 is used \;for MC" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port[9:8]\;\;\;" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;For Ingress: excludes CPU port\;For Egress: includes CPU port\;\;\;" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="snap" descr="Read the snapshot guage\;0: FREE - read free running buff_occupancy\;1: SNAP - read snapshot of the buff_occupancy\;When SBSNR.status is RELEASED then the device will \;NACK the command\;Reserved when Spectrum" access="OP" offset="0x0.30" size="0x0.1" />
@@ -6509,12 +6750,12 @@
 	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. \;This includes cells at the pool and at the min_buff\;Cleared by writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x14.0" size="0x0.24" />
 	<field name="clr" descr="Clear Max Buffer Occupancy\;When this bit is set, max_buff_occupancy field is cleared \;(and a new max value is tracked from the time the clear \;was performed)" access="OP" offset="0x14.31" size="0x0.1" />
 	<field name="min_buff" descr="Minimum buffer size\;The minimum buffer is not part of the pool area.\;Units of cells" access="RW" offset="0x18.0" size="0x0.24" />
-	<field name="max_buff" descr="The maximum buffer threshold in the pool area.\;When the pool is configured to static, then max_buf is con\;figured in cells.\;When the pool is configured to dynamic, then max_buff \;holds the &quot;alpha&quot; parameter, supporting the following val\;ues:\;0 : 0\;i : (1/128)*2^(i-1), for i=1..14\;0xFF: Infinity\;Reserved when infi_max = 1\;[Advanced] When: (1) dir=Ingress and (2) desc=1 and (3) the \;pool is associated from a lossless PG then the max_buff \;must not be &apos;0&apos;, both for static and dynamic modes\;" access="RW" offset="0x1C.0" size="0x0.24" />
+	<field name="max_buff" descr="The maximum buffer threshold in the pool area.\;When the pool is configured to static, then max_buf is \;configured in cells.\;When the pool is configured to dynamic, then max_buff \;holds the &quot;alpha&quot; parameter, supporting the following val\;ues:\;0 : 0\;i : (1/128)*2^(i-1), for i=1..14\;0xFF: Infinity\;Reserved when infi_max = 1\;[Advanced] When: (1) dir=Ingress and (2) desc=1 and (3) \;the pool is associated from a lossless PG then the max\;_buff must not be &apos;0&apos;, both for static and dynamic modes\;" access="RW" offset="0x1C.0" size="0x0.24" />
 	<field name="infi_max" descr="Max buffer is infinite\;When set, the max_buff field is reserved" access="RW" offset="0x1C.31" size="0x0.1" />
 </node>
 
 <node name="sbpr_ext" descr="" size="0x18.0" >
-	<field name="pool" descr="Pool index\;Range 0 .. cap_num_pool_supported - 1\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used for \;FW pool swap, pool 14 is used for desc, pool 15 is used for \;MC" access="INDEX" offset="0x0.0" size="0x0.4" />
+	<field name="pool" descr="Pool index\;Range 0 .. cap_num_pool_supported - 1\;[Advanced] exposed supported: pools 0..8\;[Advanced] actual supported: pools 0..15, pool 13 is used \;for FW pool swap, pool 14 is used for desc, pool 15 is used \;for MC" access="INDEX" offset="0x0.0" size="0x0.4" />
 	<field name="dir" descr="Direction\;0: Ingress pools\;1: Egress pools\;\;" access="INDEX" offset="0x0.24" size="0x0.2" />
 	<field name="snap" descr="Read the snapshot guage\;0: FREE - read free running buff_occupancy\;1: SNAP - read snapshot of the buff_occupancy\;When SBSNR.status is RELEASED then the device will \;NACK with status = RESOURCE_NOT_AVAILABLE\;Reserved when Spectrum" access="OP" offset="0x0.30" size="0x0.1" />
 	<field name="desc" descr="[Advanced]\;Descriptor buffer\;For Spectrum: Total 84960 descriptors\;\;\;" access="INDEX" offset="0x0.31" size="0x0.1" />
@@ -6522,29 +6763,29 @@
 	<field name="infi_size" descr="size is infinite\;When set, the size field is reserved" access="RW" offset="0x4.31" size="0x0.1" />
 	<field name="mode" descr="Pool quota calculation mode:\;0: Static\;1: Dynamic" access="RW" offset="0x8.0" size="0x0.4" />
 	<field name="buff_occupancy" descr="Current buffer occupancy" access="RO" offset="0xC.0" size="0x0.24" />
-	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. Cleared by \;writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x10.0" size="0x0.24" />
+	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. Cleared \;by writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x10.0" size="0x0.24" />
 	<field name="clr" descr="Clear Max Buffer Occupancy\;When this bit is set, the max_buff_occupancy field is \;cleared (and a new max value is tracked from the time the \;clear was performed)" access="OP" offset="0x10.31" size="0x0.1" />
-	<field name="ext_buff_occupancy" descr="Extended current buffer occupancy\;Includes also all of the min_buff of the relevant PG buffer or \;traffic class associated to this pool\;Reserved when Spectrum, supported by Spectrum-2 and \;Quantum. Note: currenty not supported by Switch FW\;" access="RO" offset="0x14.0" size="0x0.24" />
+	<field name="ext_buff_occupancy" descr="Extended current buffer occupancy\;Includes also all of the min_buff of the relevant PG buffer \;or traffic class associated to this pool\;Reserved when Spectrum, supported by Spectrum-2 and \;Quantum. Note: currenty not supported by Switch FW\;" access="RO" offset="0x14.0" size="0x0.24" />
 </node>
 
 <node name="sbsns_ext" descr="" size="0x18.0" >
 	<field name="status" descr="Snapshot status:\;0: RELEASED - snapshot is non-active\;1: LOCKED - snapshot is active\;" access="RO" offset="0x0.0" size="0x0.1" />
-	<field name="trigger_id" descr="Tells which trigger id has trigger the snapshot.\;See encoding of type in Table 1393, &quot;Shared Buffer \;Snapshot triggers,&quot; on page 2004" access="RO" offset="0x4.0" size="0x0.8" />
-	<field name="trigger_parameters" descr="Trigger parameters.\;See encoding according to Table 1393, &quot;Shared Buffer \;Snapshot triggers,&quot; on page 2004" access="RO" offset="0x8.0" size="0x4.0" />
+	<field name="trigger_id" descr="Tells which trigger id has trigger the snapshot.\;See encoding of type in Table 1532, &quot;Shared Buffer \;Snapshot triggers,&quot; on page 1799" access="RO" offset="0x4.0" size="0x0.8" />
+	<field name="trigger_parameters" descr="Trigger parameters.\;See encoding according to Table 1532, &quot;Shared Buffer \;Snapshot triggers,&quot; on page 1799" access="RO" offset="0x8.0" size="0x4.0" />
 	<field name="time_high" descr="Snapshot time:\;The time when the last snapshot was taken as free_run\;ning_clock\;" access="RO" offset="0x10.0" size="0x0.6" />
 	<field name="time_low" descr="Snapshot time:\;The time when the last snapshot was taken as free_run\;ning_clock\;" access="RO" offset="0x14.0" size="0x4.0" />
 </node>
 
 <node name="sbsnt_ext" descr="" size="0x4.0" >
-	<field name="take" descr="Take snapshot:\;0: RELEASE - release snapshot\;1: TAKE_AND_TRAP - take snapshot of the guages and \;invoke trap SB_SNAPSHOT\;2: TAKE_NO_TRAP - take snapshot of the guages without \;invoking a trap\;When snapshot status is LOCKED then the TAKE will be \;ignored\;When snapshot status is RELEASED then the RELEASE will \;be ignored\;See SBSNS.status" access="OP" offset="0x0.0" size="0x0.2" />
+	<field name="take" descr="Take snapshot:\;0: RELEASE - release snapshot\;1: TAKE_AND_TRAP - take snapshot of the guages and \;invoke trap SB_SNAPSHOT\;2: TAKE_NO_TRAP - take snapshot of the guages without \;invoking a trap\;When snapshot status is LOCKED then the TAKE will be \;ignored\;When snapshot status is RELEASED then the RELEASE \;will be ignored\;See SBSNS.status" access="OP" offset="0x0.0" size="0x0.2" />
 </node>
 
 <node name="sbsnte_ext" descr="" size="0x10.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local Port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="type" descr="See Table 1393, &quot;Shared Buffer Snapshot triggers,&quot; on \;page 2004\;\;" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="tclass_en_high" descr="TClass/PG snapshot trigger enable (for IB switches this is \;VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0x8.0" size="0x4.0" />
-	<field name="tclass_en_low" descr="TClass/PG snapshot trigger enable (for IB switches this is \;VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - 1" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="type" descr="See Table 1532, &quot;Shared Buffer Snapshot triggers,&quot; \;on page 1799\;\;" access="INDEX" offset="0x4.0" size="0x0.8" />
+	<field name="tclass_en_high" descr="TClass/PG snapshot trigger enable (for IB switches this is \;VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - \;1" access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="tclass_en_low" descr="TClass/PG snapshot trigger enable (for IB switches this is \;VL enable)\;Each bit represents corresponding tclass\;0: disable (default)\;1: enable\;Valid bits for Ethernet devices: 0.. cap_max_tclass_data - \;1" access="RW" offset="0xC.0" size="0x4.0" />
 </node>
 
 <node name="sbsr_ext" descr="" size="0x41c.0" >
@@ -6554,10 +6795,10 @@
 	<field name="port_page" descr="Port  page: \;ingress_port_mask[0] is 256*port_page \;egress_port_mask[0] is 256*port_page\;\;\;" access="INDEX" offset="0x4.0" size="0x0.4" />
 	<field name="desc" descr="[Advanced]\;Descriptor buffer\;\;\;" access="INDEX" offset="0x4.31" size="0x0.1" />
 	<field name="ingress_port_mask" descr="Bit vector for all ingress network port .\;Indicates which of the ports (for which the relevant bit is \;set) are affected by the set operation. Configuration of any \;other port does not change." access="INDEX" high_bound="7" low_bound="0" offset="0x10.0" size="0x20.0" />
-	<field name="pg_buff_mask" descr="Bit vector for all priority groups.\;Indicates which of the priorities (for which the relevant bit is \;set) are affected by the set operation. Configuration of any \;other priority does not change.\;Range is 0..cap_max_pg_buffers - 1\;Reserved when ports = 1" access="INDEX" offset="0x30.0" size="0x0.10" />
+	<field name="pg_buff_mask" descr="Bit vector for all priority groups.\;Indicates which of the priorities (for which the relevant bit \;is set) are affected by the set operation. Configuration of \;any other priority does not change.\;Range is 0..cap_max_pg_buffers - 1\;Reserved when ports = 1" access="INDEX" offset="0x30.0" size="0x0.10" />
 	<field name="egress_port_mask" descr="Bit vector for all egress network port.\;Indicates which of the ports (for which the relevant bit is \;set) are affected by the set operation. Configuration of any \;other port does not change.\;\;\;" access="INDEX" high_bound="7" low_bound="0" offset="0x34.0" size="0x20.0" />
-	<field name="tclass_mask" descr="Bit vector for all traffic classes .\;Indicates which of the traffic classes (for which the relevant \;bit is set) are affected by the set operation. Configuration of \;any other priority does not change.\;Range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;\;\;Reserved when ports = 1" subnode="uint64" access="INDEX" offset="0x54.0" size="0x8.0" />
-	<field name="shared_buffer_status" descr="Shared Buffer Properties, see Table 1412, &quot;Shared Buffer \;Status Fields,&quot; on page 2032\;This field is a collection of all the statuses of the requested \;quotas, while i=0..min{requested quotas, cap_sbsr_stat_\;size-1}\;The ith status refers a quota as follows;\;The occurrences of the masked ingress quotas are written \;before the masked egress quotas.\;All the occurrences associated to port are written together \;from the smallest masked port index. In each port, the \;occurrences of the masked priority groups/ traffic classes \;are written from the lowest to the highest." subnode="shared_buffer_status_ext" access="RO" high_bound="119" low_bound="0" offset="0x5C.0" size="0x3c0.0" />
+	<field name="tclass_mask" descr="Bit vector for all traffic classes .\;Indicates which of the traffic classes (for which the rele\;vant bit is set) are affected by the set operation. Configu\;ration of any other priority does not change.\;Range is 0..cap_max_tclass - 1\;For traffic class to CPU port: range is 0..cap_max_cpu_in\;gress_tclass- 1\;\;\;Reserved when ports = 1" subnode="uint64" access="INDEX" offset="0x54.0" size="0x8.0" />
+	<field name="shared_buffer_status" descr="Shared Buffer Properties, see Table 1551, &quot;Shared Buf\;fer Status Fields,&quot; on page 1825\;This field is a collection of all the statuses of the \;requested quotas, while i=0..min{requested quotas, \;cap_sbsr_stat_size-1}\;The ith status refers a quota as follows;\;The occurrences of the masked ingress quotas are writ\;ten before the masked egress quotas.\;All the occurrences associated to port are written \;together from the smallest masked port index. In each \;port, the occurrences of the masked priority groups/ traf\;fic classes are written from the lowest to the highest." subnode="shared_buffer_status_ext" access="RO" high_bound="119" low_bound="0" offset="0x5C.0" size="0x3c0.0" />
 </node>
 
 <node name="sbsrd_ext" descr="" size="0x410.0" >
@@ -6569,16 +6810,16 @@
 	<field name="first_local_port" descr="For type=1,2,7,8: local_port of first entry\;\;" access="INDEX" offset="0x8.0" size="0x0.8" />
 	<field name="first_lp_msb" descr="Local port[11:8]" access="INDEX" offset="0x8.8" size="0x0.4" />
 	<field name="fisrt_entry_index" descr="Index of first entry per type\;Used only when trap\;example: if type=1 and has 128 entries and this register \;provides entries 256..383 then return &apos;256&apos;" access="RO" offset="0x8.16" size="0x0.16" />
-	<field name="shared_buffer_status" descr="Shared Buffer Properties, see Table 1412, &quot;Shared Buffer \;Status Fields,&quot; on page 2032\;The occurrences of the masked ingress quotas are written \;before the masked egress quotas.\;All the occurrences associated to port are written together \;from the smallest masked port index. In each port, the \;occurrences of the masked priority groups/ traffic classes \;are written from the lowest to the highest." subnode="shared_buffer_status_ext" access="RO" high_bound="127" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="shared_buffer_status" descr="Shared Buffer Properties, see Table 1551, &quot;Shared Buf\;fer Status Fields,&quot; on page 1825\;The occurrences of the masked ingress quotas are writ\;ten before the masked egress quotas.\;All the occurrences associated to port are written \;together from the smallest masked port index. In each \;port, the occurrences of the masked priority groups/ traf\;fic classes are written from the lowest to the highest." subnode="shared_buffer_status_ext" access="RO" high_bound="127" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="sfd_ext" descr="" size="0x410.0" >
 	<field name="rec_type" descr="Record type:\;0: records are 16B\;1: records are 32B\;Reserved when SwitchX/-2" access="OP" offset="0x0.20" size="0x0.1" />
 	<field name="swid" descr="Switch partition ID for queries\;Reserved on Write\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="record_locator" descr="Used for querying the FDB. Use record_locator=0 to initiate \;the query. When a record is returned, a new record_locator is \;returned to be used in the subsequent query.\;Reserved when database update." access="INDEX" offset="0x4.0" size="0x0.30" />
-	<field name="op" descr="Operation.\;For Query:\;0: SFD_DUMP - dump entire FDB (process according to \;record_locator)\;1: SFD_QUERY - query records by {MAC, VID/FID} value\;2: SFD_QUERY_AND_CLEAR_ACTIVITY - query and clear activ\;ity. Query records by {MAC, VID/FID} value. Not supported by \;SwitchX and SwitchX2.\;For Write:\;0: SFD_TEST - Response indicates if each of the records could \;be added to the FDB. Test operation is not supported by Spec\;trum\;1: SFD_EDIT - add/modify. Aged-out records cannot be added. \;This command removes the learning notification of the {MAC, \;VID/FID}. Response includes the entries that were added to the \;FDB.\;2: SFD_REMOVE - remove record by {MAC, VID/FID}. This com\;mand also removes the learning notification and aged-out \;notifications of the {MAC, VID/FID}. The response provides cur\;rent (pre-removal) entries as non-aged-out." access="OP" enum="SFD_TEST=0x0,SFD_EDIT=0x1,SFD_REMOVE=0x2" offset="0x4.30" size="0x0.2" />
-	<field name="num_rec" descr="Request: Number of records to read/add/modify/remove\;Response: Number of records read/added/replaced/removed\;See above description for more details.\;For rec_type = 0: Range 0..64\;For rec_type = 1: Range 0..32" access="OP" offset="0x8.0" size="0x0.8" />
-	<field name="records" descr="For rec_type = 0, see Table 846, &quot;SFD - Records type0 Lay\;out,&quot; on page 1359\;For rec_type = 1, see Table 848, &quot;SFD - Records type1 Lay\;out,&quot; on page 1361" access="RW" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="op" descr="Operation.\;For Query:\;0: SFD_DUMP - dump entire FDB (process according to \;record_locator)\;1: SFD_QUERY - query records by {MAC, VID/FID} value\;2: SFD_QUERY_AND_CLEAR_ACTIVITY - query and clear \;activity. Query records by {MAC, VID/FID} value. Not sup\;ported by SwitchX and SwitchX2.\;For Write:\;0: SFD_TEST - Response indicates if each of the records \;could be added to the FDB. Test operation is not supported \;by Spectrum\;1: SFD_EDIT - add/modify. Aged-out records cannot be \;added. This command removes the learning notification of \;the {MAC, VID/FID}. Response includes the entries that were \;added to the FDB.\;2: SFD_REMOVE - remove record by {MAC, VID/FID}. This \;command also removes the learning notification and aged-\;out notifications of the {MAC, VID/FID}. The response pro\;vides current (pre-removal) entries as non-aged-out." access="OP" enum="SFD_TEST=0x0,SFD_EDIT=0x1,SFD_REMOVE=0x2" offset="0x4.30" size="0x0.2" />
+	<field name="num_rec" descr="Request: Number of records to read/add/modify/remove\;Response: Number of records read/added/replaced/\;removed\;See above description for more details.\;For rec_type = 0: Range 0..64\;For rec_type = 1: Range 0..32" access="OP" offset="0x8.0" size="0x0.8" />
+	<field name="records" descr="For rec_type = 0, see Table 953, &quot;SFD - Records type0 \;Layout,&quot; on page 1146\;For rec_type = 1, see Table 955, &quot;SFD - Records type1 \;Layout,&quot; on page 1148" access="RW" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="sfdat_ext" descr="" size="0x8.0" >
@@ -6587,7 +6828,7 @@
 </node>
 
 <node name="sfdb_ext" descr="" size="0x48.0" >
-	<field name="update_type" descr="Update type:\;0: Update Multicast_Tunnel_FDB_record.underlay_mc_ptr \;and ecmp_size\;1: Update Multicast_FDB_record.mid and Update Multicast\;_Tunnel_FDB_record.mid\;2: Update Unicast_Tunnel_FDB_record.uip_lsb (the pointer \;to the generic L2 encapsulation entry) and ecmp_size\;3: Update counter_set_type, counter_index for all FDB \;Record Types\;4: Update Multicast_Tunnel_FDB_UC_DMAC.under\;lay_mc_ptr and ecmp_size. For Multicast_Tunnel_FDB_re\;cord entries where the DMAC is a UC DMAC (bit40=&apos;0&apos;)\;5: Update Multicast_Tunnel_FDB_MC_DMAC.under\;lay_mc_ptr and ecmp_size\;\;Explanation:\;- Multicast_Tunnel_FDB_UC_DMAC is Multicast_Tunnel_FD\;B_record entries where the DMAC is a UC DMAC (bit40=&apos;0&apos;)\;- Multicast_Tunnel_FDB_MC_DMAC is Multicast_Tun\;nel_FDB_record entries where the DMAC is a non-UC DMAC \;(bit40!=&apos;0&apos;)\;\;See Section 6.2.15, &quot;FDB Records&quot;, on page 1309" access="INDEX" offset="0x8.0" size="0x0.4" />
+	<field name="update_type" descr="Update type:\;0: Update Multicast_Tunnel_FDB_record.underlay_mc_ptr \;and ecmp_size\;1: Update Multicast_FDB_record.mid and Update Multi\;cast_Tunnel_FDB_record.mid\;2: Update Unicast_Tunnel_FDB_record.uip_lsb (the pointer \;to the generic L2 encapsulation entry) and ecmp_size\;3: Update counter_set_type, counter_index for all FDB \;Record Types\;4: Update Multicast_Tunnel_FDB_UC_DMAC.under\;lay_mc_ptr and ecmp_size. For Multicast_Tunnel_FDB_re\;cord entries where the DMAC is a UC DMAC (bit40=&apos;0&apos;)\;5: Update Multicast_Tunnel_FDB_MC_DMAC.under\;lay_mc_ptr and ecmp_size\;\;Explanation:\;- Multicast_Tunnel_FDB_UC_DMAC is Multicast_Tun\;nel_FDB_record entries where the DMAC is a UC DMAC \;(bit40=&apos;0&apos;)\;- Multicast_Tunnel_FDB_MC_DMAC is Multicast_Tun\;nel_FDB_record entries where the DMAC is a non-UC \;DMAC (bit40!=&apos;0&apos;)\;\;See Section 6.2.15, &quot;FDB Records&quot;, on page 1094" access="INDEX" offset="0x8.0" size="0x0.4" />
 	<field name="policy" descr="Policy:\;0: ignore policy value (static or dynamic)\;1: only static\;2: only non-static" access="INDEX" offset="0x8.16" size="0x0.2" />
 	<field name="entry_fid" descr="Update only if FID has value of entry_fid\;Range 1..cap_fid-1\;" access="INDEX" offset="0xC.0" size="0x0.16" />
 	<field name="gfid" descr="Global fid.\;Update for all fids, ignore the entry_fid field" access="INDEX" offset="0xC.31" size="0x0.1" />
@@ -6598,10 +6839,10 @@
 </node>
 
 <node name="sfdb_v2_ext" descr="" size="0x84.0" >
-	<field name="key" descr="An FDB record. \;See Section 6.2.15, &quot;FDB Records&quot;, on page 1309" access="INDEX" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
-	<field name="key_mask" descr="Per bit:\;0: bit will be ignored \;1: field will be matched\;Note: a mask does not have to be full for a key, except for sys\;tem_port. \;type must not be masked.\;type must not &quot;learned&quot;\;Note: if need to update these fields: (1) system_port or (2) \;lag_id then the field action must be matched\;Note: if Unicast Tunnel FDB Record and need to update these \;fields: (1) uip_lsb, (2) uip_msb (3) ecmp_size  then these \;fields must be matched: (1) protocol, (2) gen_enc (spectrum-\;2 and above)\;Note: when (1) ubridge=0, (2) FID&gt;4K and (3) forward to \;egress port then need to provide the egress port or lag_id (so \;device can know the egress VID) and action field" access="INDEX" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
-	<field name="action" descr="An FDB record. \;See Section 6.2.15, &quot;FDB Records&quot;, on page 1309" access="WO" high_bound="7" low_bound="0" offset="0x40.0" size="0x20.0" />
-	<field name="action_mask" descr="Per bit:\;0: bit will be ignored \;1: field will be updated\;Note: a mask must be on a full field, e.g. no update of DMAC \;bit 40.\;MAC and FID cannot be updated.\;SW must provide values for new fields." access="WO" high_bound="7" low_bound="0" offset="0x60.0" size="0x20.0" />
+	<field name="key" descr="An FDB record. \;See Section 6.2.15, &quot;FDB Records&quot;, on page 1094" access="INDEX" high_bound="7" low_bound="0" offset="0x0.0" size="0x20.0" />
+	<field name="key_mask" descr="Per bit:\;0: bit will be ignored \;1: field will be matched\;Note: a mask does not have to be full for a key, except for \;the keys mentioned in Guidelines and Restrictions \;described in #8. \;\;" access="INDEX" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="action" descr="An FDB record. \;See Section 6.2.15, &quot;FDB Records&quot;, on page 1094" access="WO" high_bound="7" low_bound="0" offset="0x40.0" size="0x20.0" />
+	<field name="action_mask" descr="Per bit:\;0: bit will be ignored \;1: field will be updated\;\;MAC and FID cannot be updated.\;SW must provide values for new fields." access="WO" high_bound="7" low_bound="0" offset="0x60.0" size="0x20.0" />
 </node>
 
 <node name="sfdd_ext" descr="" size="0x420.0" >
@@ -6610,49 +6851,65 @@
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="num_rec" descr="At request: number of records requested\;At response: number of records dumped\;Range is 0 ..32" access="INDEX" offset="0x4.0" size="0x0.8" />
 	<field name="end" descr="End session\;Forces an end to the current session" access="OP" offset="0x4.20" size="0x0.1" />
-	<field name="op" descr="Operation\;0: Dump entries\;1: Clear activity for all entries which were dumped in the cur\;rent session" access="OP" offset="0x4.24" size="0x0.2" />
-	<field name="entry_type" descr="Dump only if entry type has encoding of entry_type\;See Section 6.2.15, &quot;FDB Records&quot;, on page 1309\;Reserved if filter_fields bit2 is &apos;0&apos;" access="INDEX" offset="0x8.0" size="0x0.4" />
+	<field name="op" descr="Operation\;0: Dump entries\;1: Clear activity for all entries which were dumped in the \;current session" access="OP" offset="0x4.24" size="0x0.2" />
+	<field name="entry_type" descr="Dump only if entry type has encoding of entry_type\;See Section 6.2.15, &quot;FDB Records&quot;, on page 1094\;Reserved if filter_fields bit2 is &apos;0&apos;" access="INDEX" offset="0x8.0" size="0x0.4" />
 	<field name="entry_policy" descr="Dump only if policy has encoding of policy\;Reserved if filter_fields bit1 is &apos;0&apos;" access="INDEX" offset="0x8.8" size="0x0.2" />
 	<field name="entry_a" descr="Dump only if activity has value of entry_a\;Reserved if filter_fields bit0 is &apos;0&apos;" access="INDEX" offset="0x8.16" size="0x0.1" />
-	<field name="entry_fid" descr="Dump only if FID has value of entry_fid\;When ubridge = 0, for router sub-port interface, FID is cap_fid \;+ rif\;Otherwise, valid range is 1..cap_fid-1\;Reserved if filter_fields bit3 is &apos;0&apos;" access="INDEX" offset="0xC.0" size="0x0.16" />
-	<field name="entry_parameters" descr="For entry of type Unicast FDB record: System Port parame\;ters, see Section 6.12.6.1, &quot;SFDD System Port Parame\;ters&quot;, on page 1366\;For entry of type Unicast LAG record: Lag ID parameters, see \;Section 6.12.6.2, &quot;SFDD Lag ID Parameters&quot;, on \;page 1367\;For entry of type Multicast record: MID parameters, see \;Section 6.12.6.3, &quot;SFDD MID Parameters&quot;, on \;page 1367\;For entry of type Unicast Tunnel FDB record Underlay param\;eters, see Section 6.12.6.4, &quot;SFDD Underlay Parame\;ters&quot;, on page 1368\;Multicast Tunnel FDB record: underlay_mc_ptr (24bit)" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
-	<field name="notification_records" descr="For rec_type = 0, see Section 846, &quot;SFD - Records type0 \;Layout&quot;, on page 1359\;For rec_type = 1, see Section 848, &quot;SFD - Records type1 \;Layout&quot;, on page 1361" access="RW" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
+	<field name="entry_fid" descr="Dump only if FID has value of entry_fid\;When ubridge = 0, for router sub-port interface, FID is \;cap_fid + rif\;Otherwise, valid range is 1..cap_fid-1\;Reserved if filter_fields bit3 is &apos;0&apos;" access="INDEX" offset="0xC.0" size="0x0.16" />
+	<field name="entry_parameters" descr="For entry of type Unicast FDB record: System Port parame\;ters, see Section 6.12.6.1, &quot;SFDD System Port Param\;eters&quot;, on page 1153\;For entry of type Unicast LAG record: Lag ID parameters, \;see Section 6.12.6.2, &quot;SFDD Lag ID Parameters&quot;, on \;page 1154\;For entry of type Multicast record: MID parameters, see \;Section 6.12.6.3, &quot;SFDD MID Parameters&quot;, on \;page 1154\;For entry of type Unicast Tunnel FDB record Underlay \;parameters, see Section 6.12.6.4, &quot;SFDD Underlay \;Parameters&quot;, on page 1155\;Multicast Tunnel FDB record: underlay_mc_ptr (24bit)" access="RW" high_bound="3" low_bound="0" offset="0x10.0" size="0x10.0" />
+	<field name="notification_records" descr="For rec_type = 0, see Section 953, &quot;SFD - Records type0 \;Layout&quot;, on page 1146\;For rec_type = 1, see Section 955, &quot;SFD - Records type1 \;Layout&quot;, on page 1148" access="RW" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
 </node>
 
 <node name="sfdf_ext" descr="" size="0x14.0" >
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="st" descr="Static:\;0: delete only dynamic entries \;1: delete both dynamic and static entries" access="INDEX" offset="0x4.24" size="0x0.1" />
+	<field name="pb" descr="Policy Bitmask\;bit 0: Flush static entries\;bit 1: Flush dynamic MLAG entries\;bit 2: Flush dynamic ingress entries\;Reserved when pfb_v = 0\;Valid values: 1-7" access="RW" offset="0x4.0" size="0x0.3" />
+	<field name="pb_v" descr="Policy Bitmask Valid" access="RW" offset="0x4.8" size="0x0.1" />
+	<field name="st" descr="Static:\;0: delete only dynamic entries \;1: delete both dynamic and static entries\;\;Reserved when pb_v = 1" access="INDEX" offset="0x4.24" size="0x0.1" />
 	<field name="iut" descr="Ignore Unicast Tunnel entries:\;0: flush_types 0..5 also flush &quot;Unicast Tunnel&quot; entries\;1: flush_types 0..5 do not flush &quot;Unicast Tunnel&quot; entries" access="INDEX" offset="0x4.25" size="0x0.1" />
 	<field name="imdu" descr="Ignore MC DMAC UC entries:\;0: flush_types 0..5 also flush &quot;MC DMAC UC&quot; entries\;1: flush_types 0..5 do not flush &quot;MC DMAC UC&quot; entries" access="INDEX" offset="0x4.26" size="0x0.1" />
-	<field name="flush_type" descr="Flush type\;0: FLUSH_PER_SWID - All SWID entries are flushed. Parame\;ter is reserved.\;1: FLUSH_PER_FID - All FID entries are flushed, including \;NVE (tunnels). Parameter is FID.\;2: FLUSH_PER_PORT - All entries pointing to port are \;flushed. Parameter is system_port.\;3: FLUSH_PER_PORT_AND_FID - All FID entries pointing to \;the port are flushed. \;4: FLUSH_PER_LAG - All entries pointing to LAG are flushed. \;Parameter is lag_id.\;5: FLUSH_PER_LAG_AND_FID - All FID entries pointing to \;the LAG are flushed. \;6: FLUSH_PER_NVE - All entries of type &quot;Unicast Tunnel&quot; are \;flushed. No parameters\;7: FLUSH_PER_NVE_AND_FID - same as FLUSH_PER_NVE, \;but only for FID entries. Parameter is FID.\;10: FLUSH_MC_DMAC_UC - all MC entries where the DMAC \;is a UC DMAC (bit40=&apos;0&apos;). No parameters\;11: FLUSH_MC_DMAC_UC_AND_FID - all MC entries where \;the DMAC is a UC DMAC (bit40=&apos;0&apos;). Parameter is FID." access="INDEX" enum="FLUSH_PER_FID=0x1,FLUSH_PER_PORT=0x2,FLUSH_PER_PORT_AND_FID=0x3,FLUSH_PER_LAG=0x4,FLUSH_PER_LAG_AND_FID=0x5,FLUSH_PER_NVE=0x6,FLUSH_PER_NVE_AND_FID=0x7,FLUSH_MC_DMAC_UC=0xa,FLUSH_MC_DMAC_UC_AND_FID=0xb" offset="0x4.28" size="0x0.4" />
-	<field name="parameter" descr="Parameter used for the different flush_type:\;FLUSH_PER_SWID, FLUSH_PER_NVE: reserved\;FLUSH_PER_FID, FLUSH_PER_NVE_AND_FID: Table 906, \;&quot;Parameter Layout - Flush per FID,&quot; on page 1405\;FLUSH_PER_PORT: Table 908, &quot;Parameter Layout - Flush \;per Port,&quot; on page 1405\;FLUSH_PER_PORT_AND_FID: Table 910, &quot;Parameter Lay\;out - Flush per Port and FID,&quot; on page 1405\;FLUSH_PER_LAG: Table 912, &quot;Parameter Layout - Flush \;per LAG,&quot; on page 1406\;FLUSH_PER_LAG_AND_FID: Table 914, &quot;Parameter Lay\;out - Flush per LAG and FID,&quot; on page 1407" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
+	<field name="flush_type" descr="Flush type\;0: FLUSH_PER_SWID - All SWID entries are flushed. \;Parameter is reserved.\;1: FLUSH_PER_FID - All FID entries are flushed, including \;NVE (tunnels). Parameter is FID.\;2: FLUSH_PER_PORT - All entries pointing to port are \;flushed. Parameter is system_port.\;3: FLUSH_PER_PORT_AND_FID - All FID entries pointing to \;the port are flushed. \;4: FLUSH_PER_LAG - All entries pointing to LAG are \;flushed. Parameter is lag_id.\;5: FLUSH_PER_LAG_AND_FID - All FID entries pointing to \;the LAG are flushed. \;6: FLUSH_PER_NVE - All entries of type &quot;Unicast Tunnel&quot; \;are flushed. No parameters\;7: FLUSH_PER_NVE_AND_FID - same as \;FLUSH_PER_NVE, but only for FID entries. Parameter is \;FID.\;8: FLUSH_PER_TUNNEL_PORT - All unicast tunnel entries \;associated with tunnel port bitmap. Parameter is \;FLUSH_TUNNEL_PORT_BITMAP\;9: FLUSH_PER_TUNNEL_PORT_FID - All unicast tunnel \;entries associated with tunnel port bitmap. Parameter is \;FLUSH_TUNNEL_PORT_FID_BITMAP\;10: FLUSH_MC_DMAC_UC - all MC entries where the \;DMAC is a UC DMAC (bit40=&apos;0&apos;). No parameters\;11: FLUSH_MC_DMAC_UC_AND_FID - all MC entries \;where the DMAC is a UC DMAC (bit40=&apos;0&apos;). Parameter is \;FID." access="INDEX" enum="FLUSH_PER_SWID=0x0,FLUSH_PER_FID=0x1,FLUSH_PER_PORT=0x2,FLUSH_PER_PORT_AND_FID=0x3,FLUSH_PER_LAG=0x4,FLUSH_PER_LAG_AND_FID=0x5,FLUSH_PER_NVE=0x6,FLUSH_PER_NVE_AND_FID=0x7,FLUSH_PER_TUNNEL_PORT=0x8,FLUSH_PER_TUNNEL_PORT_FID=0x9,FLUSH_MC_DMAC_UC=0xa,FLUSH_MC_DMAC_UC_AND_FID=0xb" offset="0x4.28" size="0x0.4" />
+	<field name="parameter" descr="Parameter used for the different flush_type:\;FLUSH_PER_FID: Table 1013, &quot;Parameter Layout - \;Flush per FID,&quot; on page 1194\;FLUSH_PER_NVE_AND_FID: Table 1015, &quot;Parameter \;Layout - Flush per NVE and FID,&quot; on page 1195\;FLUSH_PER_PORT: Table 1017, &quot;Parameter Layout - \;Flush per Port,&quot; on page 1195\;FLUSH_PER_PORT_AND_FID: Table 1019, &quot;Parameter \;Layout - Flush per Port and FID,&quot; on page 1195\;FLUSH_PER_LAG: Table 1021, &quot;Parameter Layout - \;Flush per LAG,&quot; on page 1196\;FLUSH_PER_LAG_AND_FID: Table 1023, &quot;Parameter \;Layout - Flush per LAG and FID,&quot; on page 1197\;FLUSH_TPORT_BITMAP: Table 1025, &quot;Parameter Lay\;out - Flush per Tunnel Port,&quot; on page 1197\;FLUSH_TPORT_BITMAP_FID: Table 1027, &quot;Parameter \;Layout - Flush per Tunnel Port and FID,&quot; on page 1198\;FLUSH_MC_DMAC_UC_AND_FID: Table 1029, &quot;Parame\;ter Layout - FLUSH MC DMAC UC and FID,&quot; on \;page 1198" subnode="sfdf_parameter_auto_ext" access="RW" offset="0x8.0" size="0x8.0" union_selector="$(parent).flush_type" />
+</node>
+
+<node name="sfdf_parameter_auto_ext" descr="" attr_is_union="1" size="0x8.0" >
+	<field name="flush_per_fid_ext" descr="" subnode="flush_per_fid_ext" offset="0x0.0" selected_by="FLUSH_PER_FID" size="0x8.0" />
+	<field name="flush_per_nve_and_fid_ext" descr="" subnode="flush_per_nve_and_fid_ext" offset="0x0.0" selected_by="FLUSH_PER_NVE_AND_FID" size="0x8.0" />
+	<field name="flush_per_port_ext" descr="" subnode="flush_per_port_ext" offset="0x0.0" selected_by="FLUSH_PER_PORT" size="0x8.0" />
+	<field name="flush_per_port_and_fid_ext" descr="" subnode="flush_per_port_and_fid_ext" offset="0x0.0" selected_by="FLUSH_PER_PORT_AND_FID" size="0x8.0" />
+	<field name="flush_per_lag_ext" descr="" subnode="flush_per_lag_ext" offset="0x0.0" selected_by="FLUSH_PER_LAG" size="0x8.0" />
+	<field name="flush_per_lag_and_fid_ext" descr="" subnode="flush_per_lag_and_fid_ext" offset="0x0.0" selected_by="FLUSH_PER_LAG_AND_FID" size="0x8.0" />
+	<field name="flush_per_tunnel_port_ext" descr="" subnode="flush_per_tunnel_port_ext" offset="0x0.0" selected_by="FLUSH_PER_TUNNEL_PORT" size="0x8.0" />
+	<field name="flush_per_tunnel_port_fid_ext" descr="" subnode="flush_per_tunnel_port_fid_ext" offset="0x0.0" selected_by="FLUSH_PER_TUNNEL_PORT_FID" size="0x8.0" />
+	<field name="flush_mc_dmac_uc_and_fid_ext" descr="" subnode="flush_mc_dmac_uc_and_fid_ext" offset="0x0.0" selected_by="FLUSH_MC_DMAC_UC_AND_FID" size="0x8.0" />
 </node>
 
 <node name="sfdt_ext" descr="" size="0x2e0.0" >
-	<field name="fgl_ptr" descr="Port Group Index\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix \;A.3.2, &quot;Port Group Table (PGT)&quot; (page 3375)" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="fgl_ptr" descr="Port Group Index\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix \;A.3.2, &quot;Port Group Table (PGT)&quot; (page 3097)" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="size" descr="Number of port_member_lists to be added/edited in the \;FGL membership.\;Valid range is 1..90" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="port_members_list" descr="port_member list, see Table 936, &quot;SFDT port_mem\;bers_list&lt;i&gt; Layout,&quot; on page 1422" subnode="uint64" access="RW" high_bound="89" low_bound="0" offset="0x10.0" size="0x2d0.0" />
+	<field name="port_members_list" descr="port_member list, see Table 1051, &quot;SFDT \;port_members_list&lt;i&gt; Layout,&quot; on page 1215" subnode="uint64" access="RW" high_bound="89" low_bound="0" offset="0x10.0" size="0x2d0.0" />
 </node>
 
 <node name="sfdt_v2_ext" descr="" size="0x2e0.0" >
-	<field name="fgl_ptr" descr="Port Group Index\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix \;A.3.2, &quot;Port Group Table (PGT)&quot; (page 3375)" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="fgl_ptr" descr="Port Group Index\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix \;A.3.2, &quot;Port Group Table (PGT)&quot; (page 3097)" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="size" descr="Number of port_member_lists to be added/edited in the \;FGL membership.\;Valid range is 1..90" access="OP" offset="0x4.0" size="0x0.8" />
-	<field name="port_members_list" descr="port_member list, see Table 940, &quot;SFDT_V2 \;port_members_list Layout,&quot; on page 1424" subnode="array128_auto" access="RW" high_bound="44" low_bound="0" offset="0x10.0" size="0x2d0.0" />
+	<field name="port_members_list" descr="port_member list, see Table 1055, &quot;SFDT_V2 \;port_members_list Layout,&quot; on page 1217" subnode="array128_auto" access="RW" high_bound="44" low_bound="0" offset="0x10.0" size="0x2d0.0" />
 </node>
 
-<node name="sffp_ext" descr="" size="0x8.0" >
+<node name="sffp_ext" descr="" size="0xc.0" >
 	<field name="type" descr="0: BROADCAST\;1: UNKNOWN_UNICAST\;2: UNREGISTERED_MULTICAST_IPV4\;3: UNREGISTERED_MULTICAST_IPV6\;4: RESERVED\;5: UNREGISTERED_MULTICAST_NON_IP\;6: IPV4_LINK_LOCAL - (Addresses 224.0.0.X)\;7: IPV6_ALL_HOSTS - (Address FF02::1)" access="INDEX" enum="BROADCAST=0x0,UNKNOWN_UNICAST=0x1,UNREGISTERED_MULTICAST_IPV4=0x2,UNREGISTERED_MULTICAST_IPV6=0x3,RESERVED=0x4,UNREGISTERED_MULTICAST_NON_IP=0x5,IPV4_LINK_LOCAL=0x6,IPV6_ALL_HOSTS=0x7" offset="0x0.0" size="0x0.4" />
-	<field name="profile_id" descr="Profile ID\;a.k.a. SFMR.nve_flood_prf_id\;Range 0..max_cap_nve_flood_prf- 1" access="INDEX" offset="0x0.16" size="0x0.2" />
-	<field name="flood_offset" descr="Flood offset\;Default 0\;" access="RW" offset="0x4.0" size="0x0.3" />
+	<field name="profile_id" descr="Profile ID\;a.k.a. SFMR.nve_flood_prf_id or SFMR.cff_prf_id\;Range 0..max_cap_nve_flood_prf- 1\;\;Note: HW selects according to the packet type" access="INDEX" offset="0x0.16" size="0x0.2" />
+	<field name="flood_offset" descr="Flood offset (this is actually MID_offset)\;Default 0\;" access="RW" offset="0x4.0" size="0x0.3" />
+	<field name="counter_offset" descr="Compressed Fid Flooding counter offset\;Actual counter index is SFMR.cff_counter_base_index \;+ counter_offset\;Relevant only for CFF, not relevant for NVE" access="RW" offset="0x8.0" size="0x0.3" />
+	<field name="counter_en" descr="Compressed Fid Flooding counter enable\;Note: for actual counting also the \;SFMR.cff_counter_set_type must have a valid counter \;type\;Relevant only for CFF, not relevant for NVE" access="RW" offset="0x8.8" size="0x0.1" />
 </node>
 
 <node name="sfgc_ext" descr="" size="0x14.0" >
-	<field name="type" descr="0: BROADCAST\;1: UNKNOWN_UNICAST\;2: UNREGISTERED_MULTICAST_IPV4\;3: UNREGISTERED_MULTICAST_IPV6\;4: RESERVED\;5: UNREGISTERED_MULTICAST_NON_IP - also include \;unregistered RoCE_V1\;6: IPV4_LINK_LOCAL - (Addresses 224.0.0.X), not supported by \;SwitchX/-2\;7: IPV6_ALL_HOSTS - (Address FF02::1), not supported by \;SwitchX/-2\;" access="INDEX" enum="BROADCAST=0x0,UNKNOWN_UNICAST=0x1,UNREGISTERED_MULTICAST_IPV4=0x2,UNREGISTERED_MULTICAST_IPV6=0x3,RESERVED=0x4,UNREGISTERED_MULTICAST_NON_IP=0x5,IPV4_LINK_LOCAL=0x6,IPV6_ALL_HOSTS=0x7" offset="0x0.0" size="0x0.4" />
-	<field name="flood_table" descr="Flooding table index to associate with the specific type on the \;specific switch partition.\;If table_type == single entry:\;Indexed from 0 to max_flood_tables-1\;If table_type == VID:\;Indexed from 0 to max_vid_flood_tables-1\;If table_type == FID_Offset (when ubridge=0 supports VIDs):\;Indexed from 0 to max_fid_offset_flood_tables-1\;If table_type == FID (when ubridge=0 supports and used only \;vFIDs):\;Indexed from 0 to max_fid_flood_tables-1\;Reserved when ubridge=1" access="RW" offset="0x4.0" size="0x0.6" />
+	<field name="type" descr="0: BROADCAST\;1: UNKNOWN_UNICAST\;2: UNREGISTERED_MULTICAST_IPV4\;3: UNREGISTERED_MULTICAST_IPV6\;4: RESERVED\;5: UNREGISTERED_MULTICAST_NON_IP - also include \;unregistered RoCE_V1\;6: IPV4_LINK_LOCAL - (Addresses 224.0.0.X), not supported \;by SwitchX/-2\;7: IPV6_ALL_HOSTS - (Address FF02::1), not supported by \;SwitchX/-2\;" access="INDEX" enum="BROADCAST=0x0,UNKNOWN_UNICAST=0x1,UNREGISTERED_MULTICAST_IPV4=0x2,UNREGISTERED_MULTICAST_IPV6=0x3,RESERVED=0x4,UNREGISTERED_MULTICAST_NON_IP=0x5,IPV4_LINK_LOCAL=0x6,IPV6_ALL_HOSTS=0x7" offset="0x0.0" size="0x0.4" />
+	<field name="flood_table" descr="Flooding table index to associate with the specific type on \;the specific switch partition.\;If table_type == single entry:\;Indexed from 0 to max_flood_tables-1\;If table_type == VID:\;Indexed from 0 to max_vid_flood_tables-1\;If table_type == FID_Offset (when ubridge=0 supports VIDs):\;Indexed from 0 to max_fid_offset_flood_tables-1\;If table_type == FID (when ubridge=0 supports and used only \;vFIDs):\;Indexed from 0 to max_fid_flood_tables-1\;Reserved when ubridge=1" access="RW" offset="0x4.0" size="0x0.6" />
 	<field name="table_type" descr="Table type to use:\;0: any_type - should only be used if only one type of table is \;configured in the profile. Reserved when Spectrum/-2\;1: per_VID_tables - reserved when ubridge=1\;2: single_entry_tables - reserved when ubridge=1\;3: FID_Offset - reserved when SwitchX/-2\;4: FID - (when ubridge=0 used for vFIDs only, not for the first \;4K FIDs). Reserved when SwitchX/-2" access="RW" enum="any_type=0x0,FID=0x4" offset="0x4.16" size="0x0.3" />
-	<field name="bridge_type" descr="Bridge Type (see Section 6.4.2.1, &quot;FID Classification&quot;, on \;page 1339):\;0: type0 - when ubridge=0: 802.1Q. FID\;1: type1 - when ubridge=0: vFID. Reserved when SwitchX/-2" access="INDEX" enum="type0=0x0,type1=0x1" offset="0x4.24" size="0x0.3" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: See Section 4.1, &quot;Performance and Mon\;itoring Counters&quot;, on page 1057\;Not supported by SwitchX/-2" access="RW" offset="0xC.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060\;Not supported by SwitchX/-2" access="RW" offset="0xC.24" size="0x0.8" />
+	<field name="bridge_type" descr="Bridge Type (see Section 6.4.2.1, &quot;FID Classification&quot;, on \;page 1124):\;0: type0 - when ubridge=0: 802.1Q. FID\;1: type1 - when ubridge=0: vFID. Reserved when SwitchX/-2" access="INDEX" enum="type0=0x0,type1=0x1" offset="0x4.24" size="0x0.3" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: See Section 4.1, &quot;Performance and \;Monitoring Counters&quot;, on page 819\;Not supported by SwitchX/-2" access="RW" offset="0xC.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;Not supported by SwitchX/-2" access="RW" offset="0xC.24" size="0x0.8" />
 	<field name="mid_base" descr="MID Base\;Reserved when ubridge=0" access="RW" offset="0x10.0" size="0x0.16" />
 </node>
 
@@ -6660,19 +6917,23 @@
 	<field name="fid" descr="Filtering Identifier\;Also supported for values of 0..4K-1" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="op" descr="Operation\;0: FID is valid\;1: FID is not valid" access="RW" offset="0x0.24" size="0x0.4" />
 	<field name="update" descr="update existing entry" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="disable_tport_encap" descr="Disable tunnel_port encap for this fid. Bitwise:\;Bit0: disable NVE encap for this fid\;Bit1: disable_VPLS_encap_for_this_fid\;Bit2: disable_Flex_tunnel0_encap_for_this_fid \;Bit3: disable_Flex_tunnel1_encap_for_this_fid\;When set then the tunnel-encap will match the trap DIS\;CARD_LOOKUP_SWITCH_UC or DISCARD_LOOK\;UP_SWITCH_MC_NULL and will count on \;PPCNT.ingress_tx_link_down\;Bits 1,2,3 supported from Spectrum-2" access="RW" offset="0x4.0" size="0x0.4" />
-	<field name="update_mask" descr="Reserved when update = 0 \;When update = 1:\;Bit0: update disable_tport_encap\;Bit1: update flood_rsp, flood_bridge_type\;Bit2: update fid_offset\;Bit3: update vtfp, nve_tunnel_flood_ptr\;Bit4: update vv, vni\;Bit5: update irif_v, irif\;Bit6: update decap_counter_set_type, \;decap_counter_index\;Bit7: update cff_counter_set_type, cff_counter_base_in\;dex\;Bit8: update cff_mid_base\;Bit9: update nve_flood_prf_id\;Bit10: update smpe_valid, smpe" access="OP" offset="0x4.8" size="0x0.16" />
+	<field name="disable_tport_encap" descr="Disable tunnel_port encap for this fid. Bitwise:\;Bit0: disable NVE encap for this fid\;Bit1: disable_VPLS_encap_for_this_fid\;Bit2: disable_Flex_tunnel0_encap_for_this_fid \;Bit3: disable_Flex_tunnel1_encap_for_this_fid\;When set then the tunnel-encap will match the trap \;DISCARD_LOOKUP_SWITCH_UC or DISCARD_LOOK\;UP_SWITCH_MC_NULL and will count on \;PPCNT.ingress_tx_link_down\;Bits 1,2,3 supported from Spectrum-2" access="RW" offset="0x4.0" size="0x0.4" />
+	<field name="update_mask" descr="Reserved when update = 0 \;When update = 1:\;Bit0: update disable_tport_encap\;Bit1: update flood_rsp, flood_bridge_type\;Bit2: update fid_offset\;Bit3: update vtfp, nve_tunnel_flood_ptr\;Bit4: update vv, vni\;Bit5: update irif_v, irif\;Bit6: update decap_counter_set_type, \;decap_counter_index\;Bit7: update cff_counter_set_type, \;cff_counter_base_index\;Bit8: update cff_mid_base\;Bit9: update nve_flood_prf_id\;Bit10: update smpe_valid, smpe" access="OP" offset="0x4.8" size="0x0.16" />
 	<field name="fid_offset" descr="FID Offset\;Used to point into the flooding table selected by SFGC \;register if the table is of type FID-Offset. \;For other flooding table types, this field is reserved.\;Reserved when op = 1\;Reserved when flood_rsp = 1" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="flood_bridge_type" descr="Flood bridge type (see SFGC.bridge_type):\;0: type_0\;1: type_1\;Reserved when ubridge = 0\;Reserved when flood_rsp = 1" access="RW" enum="type_0=0x0,type_1=0x1" offset="0x8.28" size="0x0.1" />
-	<field name="flood_rsp" descr="Router sub-port flooding tables:\;0: regular flooding tables\;1: router sub-port flooding table, for this fid the flooding \;is per router-sub-port local_port. Must not be set for a \;fid which is not a router-sub-port. \;Note: must be set prior to enabling the relevant RIF!\;Reserved when ubridge = 0" access="RW" offset="0x8.31" size="0x0.1" />
-	<field name="nve_tunnel_flood_ptr" descr="Underlay Flooding and BC Pointer. Used as a pointer to \;the first entry of the group based link lists of flooding or \;BC entries (for NVE tunnels). \;For Spectrum the number of link lists in the group is \;configured by TNGCR.nve_group_size_flood.\;For Spectrum-2 and on points to first entry (which may \;point to a group).\;The pointer points to entries which are configured by \;TNUMT or by TNGEE, see Section 15.11.6, &quot;TNUMT - \;Tunneling NVE Underlay Multicast Table Register&quot;, \;on page 3012, Section 15.11.3, &quot;TNGEE - TuNnel \;Generic Encapsulation Entry Register&quot;, on \;page 3004\;For Spectrum/-2, this points to an entry in the KVD Lin\;ear, see Appendix A.3.1.2, &quot;KVD Central Database Linear \;Entries&quot; (page 3375)\;Reserved when op = 1" access="RW" offset="0xC.0" size="0x0.24" />
+	<field name="flood_rsp" descr="Router sub-port flooding tables:\;0: regular flooding tables\;1: router sub-port flooding table, for this fid the flood\;ing is per router-sub-port local_port. Must not be set \;for a fid which is not a router-sub-port. \;Note: must be set prior to enabling the relevant RIF!\;Reserved when ubridge = 0" access="RW" offset="0x8.31" size="0x0.1" />
+	<field name="nve_tunnel_flood_ptr" descr="Underlay Flooding and BC Pointer. Used as a pointer to \;the first entry of the group based link lists of flooding or \;BC entries (for NVE tunnels). \;For Spectrum the number of link lists in the group is \;configured by TNGCR.nve_group_size_flood.\;For Spectrum-2 and on points to first entry (which may \;point to a group).\;The pointer points to entries which are configured by \;TNUMT or by TNGEE, see Section 15.11.6, &quot;TNUMT - \;Tunneling NVE Underlay Multicast Table Regis\;ter&quot;, on page 2806, Section 15.11.3, &quot;TNGEE - \;TuNnel Generic Encapsulation Entry Register&quot;, on \;page 2798\;For Spectrum/-2, this points to an entry in the KVD Lin\;ear, see Appendix A.3.1.2, &quot;KVD Central Database Lin\;ear Entries&quot; (page 3097)\;Reserved when op = 1" access="RW" offset="0xC.0" size="0x0.24" />
 	<field name="vtfp" descr="Tunnel Flood Pointer Valid\;If it is not set, nve_tunnel_flood_ptr is reserved and is \;considered as NULL pointer.\;For Spectrum when ubridge=0 and 802.1Q FIDs - \;reserved \;Reserved when op = 1" access="RW" offset="0xC.31" size="0x0.1" />
-	<field name="vni" descr="Virtual Network Identifier\;When ubridge0: SW must not assign a given VNI to more \;than one FID\;Reserved when op = 1\;Reserved when vv = 0\;Range 0.. (2^24-2)" access="RW" offset="0x10.0" size="0x0.24" />
+	<field name="vni" descr="Virtual Network Identifier\;When ubridge0: SW must not assign a given VNI to \;more than one FID\;Reserved when op = 1\;Reserved when vv = 0\;Range 0.. (2^24-2)" access="RW" offset="0x10.0" size="0x0.24" />
 	<field name="vv" descr="VNI Valid.\;If it is not set, vni is reserved\;Reserved when op = 1" access="RW" offset="0x10.31" size="0x0.1" />
 	<field name="irif" descr="Ingress RIF (Router Interface)\;Range is 0.. cap_max_router_interfaces-1\;Reserved when ubridge = 0\;Reserved when irif_v = 0\;" access="RW" offset="0x14.0" size="0x0.16" />
 	<field name="irif_v" descr="Ingress RIF valid:\;0: irif is not valid, no irif assigned\;1: irif valid\;Must not be set for a non valid RIF\;Reserved when ubridge = 0" access="RW" offset="0x14.24" size="0x0.1" />
-	<field name="decap_counter_index" descr="Counter Index for flow counters.\;Counts NVE Decap from vni to fid\;For Spectrum/-2: See Section 4.1, &quot;Performance and \;Monitoring Counters&quot;, on page 1057\;Not supported by SwitchX/-2\;Reserved when ubridge=1" access="RW" offset="0x18.0" size="0x0.24" />
-	<field name="decap_counter_set_type" descr="Counter Set Type for flow counters.\;Counts NVE Decap from vni to fid\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set \;Type&quot;, on page 1060\;Not supported by SwitchX/-2\;Reserved when ubridge=1" access="RW" offset="0x18.24" size="0x0.8" />
+	<field name="decap_counter_index" descr="Counter Index for flow counters.\;Counts NVE Decap from vni to fid\;For Spectrum/-2: See Section 4.1, &quot;Performance \;and Monitoring Counters&quot;, on page 819\;Not supported by SwitchX/-2\;Reserved when ubridge=1" access="RW" offset="0x18.0" size="0x0.24" />
+	<field name="decap_counter_set_type" descr="Counter Set Type for flow counters.\;Counts NVE Decap from vni to fid\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set \;Type&quot;, on page 822\;Not supported by SwitchX/-2\;Reserved when ubridge=1" access="RW" offset="0x18.24" size="0x0.8" />
+	<field name="cff_counter_base_index" descr="Compressed Fid Flooding counter base index \;Actual counter index is cff_counter_index + \;SFFP.counter_offset\;Reserved when SwitchX/-2 and Spectrum-1" access="RW" offset="0x1C.0" size="0x0.24" />
+	<field name="cff_counter_set_type" descr="Compressed Fid Flooding counter Set Type\;Reserved when SwitchX/-2 and Spectrum-1" access="RW" offset="0x1C.24" size="0x0.8" />
+	<field name="cff_mid_base" descr="Compressed Fid Flooding mid (Multicast identifier) \;base\;Range 0 .. max_mid - 1 \;For Spectrum-2, pointer to PGT table, see Appendix \;A.4.2, &quot;Port Group Table (PGT)&quot; (page 3107)\;Reserved when SwitchX/-2 and Spectrum-1" access="RW" offset="0x20.0" size="0x0.16" />
+	<field name="cff_prf_id" descr="Compressed Fid Flooding profile_id\;Reserved when SwitchX/-2 and Spectrum-1\;Range 0..max_cap_nve_flood_prf - 1" access="RW" offset="0x24.0" size="0x0.2" />
 	<field name="nve_flood_prf_id" descr="Fid Flooding profile_id for NVE Encap\;Reserved when SwitchX/-2 and Spectrum-1\;Range 0..max_cap_nve_flood_prf - 1" access="RW" offset="0x24.8" size="0x0.2" />
 	<field name="tunnel_port_lbf_bitmap" descr="Tunnel port vector for the loopback filter. Bitmap:\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1\;bits4..15: reserved\;At least one bit must be set. If all bits are cleared then \;NVE is treated as set \;This is used only for loopback filter check. The check \;itself is configured by TNPC.\;" access="RW" offset="0x24.16" size="0x0.4" />
 	<field name="smpe" descr="Switch multicast port to egress VID\;Range is 0.. cap_max_rmpe - 1\;Reserved when ubridge = 0\;Reserved when flood_rsp = 1\;Reserved when SwitxcX/-2 or when Spectrum-1" access="RW" offset="0x28.0" size="0x0.16" />
@@ -6682,61 +6943,63 @@
 <node name="sfn_ext" descr="" size="0x410.0" >
 	<field name="rec_type" descr="Record type:\;0: records are 16B\;1: records are 32B\;Reserved when SwitchX/-2" access="OP" offset="0x0.20" size="0x0.1" />
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="num_rec" descr="Request: Number of learned notifications and aged-out notifi\;cation records requested\;Response: Number of notification records returned (must be \;smaller than or equal to the value requested)\;For rec_type = 0: Range 0..64\;For rec_type = 1: Range 0..32" access="OP" offset="0x4.0" size="0x0.8" />
+	<field name="num_rec" descr="Request: Number of learned notifications and aged-out \;notification records requested\;Response: Number of notification records returned (must \;be smaller than or equal to the value requested)\;For rec_type = 0: Range 0..64\;For rec_type = 1: Range 0..32" access="OP" offset="0x4.0" size="0x0.8" />
 	<field name="end" descr="End session\;Forces an end to the current session" access="OP" offset="0x4.20" size="0x0.1" />
-	<field name="notification_records" descr="For rec_type = 0, see Section 846, &quot;SFD - Records type0 \;Layout&quot;, on page 1359\;For rec_type = 1, see Section 848, &quot;SFD - Records type1 \;Layout&quot;, on page 1361" access="RW" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="notification_records" descr="For rec_type = 0, see Section 953, &quot;SFD - Records type0 \;Layout&quot;, on page 1146\;For rec_type = 1, see Section 955, &quot;SFD - Records type1 \;Layout&quot;, on page 1148" access="RW" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="sftr_ext" descr="" size="0x240.0" >
 	<field name="index" descr="Index. Used as an index into the Flooding Table\;Reserved when table_type == single entry" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="flood_table" descr="Flooding table index to associate with the specific type on the \;specific switch partition.\;If table_type == single entry:\;Indexed from 0 to max_flood_tables-1\;If table_type == VID:\;Indexed from 0 to max_vid_flood_tables-1\;If table_type == FID-Offset (supports VIDs):\;Indexed from 0 to max_fid_offset_flood_tables-1\;If table_type == FID (supports only vFIDs):\;Indexed from 0 to max_fid_flood_tables-1" access="INDEX" offset="0x0.16" size="0x0.6" />
+	<field name="flood_table" descr="Flooding table index to associate with the specific type on \;the specific switch partition.\;If table_type == single entry:\;Indexed from 0 to max_flood_tables-1\;If table_type == VID:\;Indexed from 0 to max_vid_flood_tables-1\;If table_type == FID-Offset (supports VIDs):\;Indexed from 0 to max_fid_offset_flood_tables-1\;If table_type == FID (supports only vFIDs):\;Indexed from 0 to max_fid_flood_tables-1" access="INDEX" offset="0x0.16" size="0x0.6" />
 	<field name="swid" descr="Switch Partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="range" descr="Range of entries to update\;Allows executing the same operation on multiple entries from \;index to (index+range-1)\;Reserved when Read operations." access="INDEX" offset="0x4.0" size="0x0.16" />
+	<field name="range" descr="Range of entries to update\;Allows executing the same operation on multiple entries \;from index to (index+range-1)\;Reserved when Read operations." access="INDEX" offset="0x4.0" size="0x0.16" />
 	<field name="table_type" descr="Table type to use:\;0: any-type. Should only be used if only one type of table is \;configured in the profile. Reserved when Spectrum/-2\;1: VID tables.\;2: Single entry tables.\;3: FID Offset. Reserved when SwitchX/-2.\;4: FID (used for vFIDs only). Reserved when SwitchX/-2." access="INDEX" offset="0x4.16" size="0x0.3" />
-	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1512 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1293 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="mask" descr="Local port mask; reserved when Read operations.\;0: Do not update port state.\;1: Update port membership based on the op and the port \;value" access="WO" high_bound="7" low_bound="0" offset="0x220.0" size="0x20.0" />
 </node>
 
 <node name="sftr_v2_ext" descr="" size="0x120.0" >
 	<field name="index" descr="Index. Used as an index into the Flooding Table\;Reserved when table_type == single entry" access="INDEX" offset="0x0.0" size="0x0.16" />
-	<field name="flood_table" descr="Flooding table index to associate with the specific type on the \;specific switch partition.\;If table_type == single entry:\;Indexed from 0 to max_flood_tables-1\;If table_type == VID:\;Indexed from 0 to max_vid_flood_tables-1\;If table_type == FID-Offset (supports VIDs):\;Indexed from 0 to max_fid_offset_flood_tables-1\;If table_type == FID (supports only vFIDs):\;Indexed from 0 to max_fid_flood_tables-1" access="INDEX" offset="0x0.16" size="0x0.6" />
+	<field name="flood_table" descr="Flooding table index to associate with the specific type on \;the specific switch partition.\;If table_type == single entry:\;Indexed from 0 to max_flood_tables-1\;If table_type == VID:\;Indexed from 0 to max_vid_flood_tables-1\;If table_type == FID-Offset (supports VIDs):\;Indexed from 0 to max_fid_offset_flood_tables-1\;If table_type == FID (supports only vFIDs):\;Indexed from 0 to max_fid_flood_tables-1" access="INDEX" offset="0x0.16" size="0x0.6" />
 	<field name="swid" descr="Switch Partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="range" descr="Range of entries to update\;Allows executing the same operation on multiple entries from \;index to (index+range-1)\;Reserved when Read operations." access="INDEX" offset="0x4.0" size="0x0.16" />
+	<field name="range" descr="Range of entries to update\;Allows executing the same operation on multiple entries \;from index to (index+range-1)\;Reserved when Read operations." access="INDEX" offset="0x4.0" size="0x0.16" />
 	<field name="table_type" descr="Table type to use:\;0: any-type. Should only be used if only one type of table is \;configured in the profile. Reserved when Spectrum/-2\;1: VID tables.\;2: Single entry tables.\;3: FID Offset. Reserved when SwitchX/-2.\;4: FID (used for vFIDs only). Reserved when SwitchX/-2." access="INDEX" offset="0x4.16" size="0x0.3" />
-	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1512 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
+	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1293 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
 	<field name="mask" descr="Local port mask; reserved when Read operations.\;0: Do not update port state.\;1: Update port membership based on the op and the port \;value" access="WO" high_bound="31" low_bound="0" offset="0xA0.0" size="0x80.0" />
 </node>
 
-<node name="sgcr_ext" descr="" size="0x50.0" >
+<node name="sgcr_ext" descr="" size="0x10.0" >
 	<field name="llb" descr="Link Local Broadcast (Default=0)\;When set, all Link Local packets (224.0.0.X) will be \;treated as broadcast packets and ignore the IGMP \;snooping entries.\;Note: this capability is not supported on SwitchX \;device. It is supported on SwitchX-2 device\;Reserved when Spectrum/-2" access="RW" offset="0x4.0" size="0x0.1" />
-	<field name="activity_dis" descr="Activity Disable:\;0: enable - activity will be set when an entries are hit\;(default)\;1: disable - activity will not be set when an entries are \;hit\;\;Bit 0: Disable activity bit in FDB. See Section 6.12.4, \;&quot;SFD - Switch Filtering Database&quot;, on page 1357\;\;Bits 7:1: reserved\;Not supported by SwitchX, SwitchX-2" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="activity_dis" descr="Activity Disable:\;0: enable - activity will be set when an entries are hit\;(default)\;1: disable - activity will not be set when an entries \;are hit\;\;Bit 0: Disable activity bit in FDB. See \;Section 6.12.4, &quot;SFD - Switch Filtering Data\;base&quot;, on page 1144\;\;Bits 7:1: reserved\;Not supported by SwitchX, SwitchX-2" access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="lag_lookup_pgt_base" descr="Base address used for lookup in PGT table\;Reserved when CONFIG_PROFILE.lag_mode = 0" access="RW" offset="0xC.0" size="0x0.16" />
+	<field name="v" descr="Valid bit\;0: NOP\;1: Write base address to HW\;\;Reserved when CONFIG_PROFILE.lag_mode = 0" access="OP" offset="0xC.31" size="0x0.1" />
 </node>
 
 <node name="shared_buffer_status_ext" descr="" size="0x8.0" >
 	<field name="buff_occupancy" descr="Current buffer occupancy" access="RO" offset="0x0.0" size="0x0.24" />
-	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. Cleared by \;writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x4.0" size="0x0.24" />
+	<field name="max_buff_occupancy" descr="Maximum value of buffer occupancy monitored. Cleared \;by writing to the clr field\;When snap = 1 and Spectrum-2 returns &apos;0&apos;. Fixed from \;Spectrum-3" access="RO" offset="0x4.0" size="0x0.24" />
 </node>
 
 <node name="slcor_ext" descr="" size="0x10.0" >
 	<field name="lag_id" descr="LAG Identifier. Index into the LAG descriptor table." access="RW" offset="0x0.0" size="0x0.10" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="col" descr="Collector configuration\;0x0: LAG_ADD_PORT - (port is added with collector disabled)\;0x1: LAG_COLLECTOR_ENABLED\;0x2: LAG_COLLECTOR_DISABLED\;0x3: LAG_REMOVE_PORT" access="RW" enum="LAG_ADD_PORT=0x0,LAG_COLLECTOR_ENABLED=0x1,LAG_COLLECTOR_DISABLED=0x2,LAG_REMOVE_PORT=0x3" offset="0x0.30" size="0x0.2" />
+	<field name="col" descr="Collector configuration\;0x0: LAG_ADD_PORT - (port is added with collector dis\;abled)\;0x1: LAG_COLLECTOR_ENABLED\;0x2: LAG_COLLECTOR_DISABLED\;0x3: LAG_REMOVE_PORT" access="RW" enum="LAG_ADD_PORT=0x0,LAG_COLLECTOR_ENABLED=0x1,LAG_COLLECTOR_DISABLED=0x2,LAG_REMOVE_PORT=0x3" offset="0x0.30" size="0x0.2" />
 	<field name="port_index" descr="Port index in the LAG list. Only valid on Add Port to LAG col. \;valid range is from 0 to cap_max_lag_members-1\;" access="RW" offset="0x4.0" size="0x0.8" />
 </node>
 
 <node name="slcr_ext" descr="" size="0x10.0" >
 	<field name="type" descr="Hash type\;0: CRC (default)\;1: XOR \;2: Random (egress port is chosen randomly out of the LAG \;members). \;Reserved when SwitchX/-2" access="RW" offset="0x0.0" size="0x0.4" />
-	<field name="sh" descr="Symmetric hash \;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: for SwitchX/-2 when this bit is set, enabling addresses \;in lag_hash must be in couples - both source and destination. \;This includes the following sets:\;SMAC, DMAC\;SIP, DIP\;TCP/UDP Source Port, TCP/UDP destination port\;SID, DID - for SwitchX/-2 only" access="RW" offset="0x0.8" size="0x0.1" />
+	<field name="sh" descr="Symmetric hash \;When set, the hash calculation will result in the same hash \;value as when the source address (layer 2 and layer 3) is \;swapped. This ensures that the same conversions will result \;in the same hash value.\;Note: for SwitchX/-2 when this bit is set, enabling addresses \;in lag_hash must be in couples - both source and destina\;tion. This includes the following sets:\;SMAC, DMAC\;SIP, DIP\;TCP/UDP Source Port, TCP/UDP destination port\;SID, DID - for SwitchX/-2 only" access="RW" offset="0x0.8" size="0x0.1" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Reserved when SwitchX/-2" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="pp" descr="Per Port Configuration\;0: Global Configuration (for all ports)\;1: Per port configuration, based on local_port field.\;Note: SW must not read as global if last write was not global.\;Reserved when SwitchX/-2" access="INDEX" offset="0x0.24" size="0x0.1" />
-	<field name="lag_hash" descr="LAG hashing configuration. This is a bitmask, in which each \;set bit includes the corresponding item in the LAG hash calcu\;lation.\;0: Ingress_port\;1: SMAC - for IPv4 and IPv6 packets\;2: SMAC - for non-IP packets\;3: DMAC - for IPv4 and IPv6 packets\;4: DMAC - for non-IP packets\;5: Ethertype - for IPv4 and IPv6 packets\;6: Ethertype - for non-IP packets\;7: VLAN_ID - for IPv4 and IPv6 packets\;8: VLAN_ID - for non-IP packets\;\;9: Source_IP_address - (can be IPv4 or IPv6, also for ARP pay\;load)\;10: Destination_IP_address - (can be IPv4 or IPv6, also for \;ARP payload)\;11: TCP/UDP - source port\;12: TCP/UDP - destination port\;13: IPv4 Protocol/IPv6 Next Header\;14: IPv6 Flow label\;15: SID - FCoE source ID\;16: DID - FCoE destination ID\;17: OXID - FCoE originator exchange ID\;19: Destination_QP_number - for RoCE packets\;\;The default lag_hash contains SMAC, DMAC, VLANID and Eth\;ertype (for all packet types)\;Note: An engine action can be added to the LAG hash calcula\;tion. For more details, contact NVIDIA Support." access="RW" offset="0x4.0" size="0x0.20" />
-	<field name="seed" descr="LAG seed value. The seed is the same for all ports (latest con\;figuration configures the seed for all ports)." access="RW" offset="0x8.0" size="0x4.0" />
+	<field name="pp" descr="Per Port Configuration\;0: Global Configuration (for all ports)\;1: Per port configuration, based on local_port field.\;Note: SW must not read as global if last write was not \;global.\;Reserved when SwitchX/-2" access="INDEX" offset="0x0.24" size="0x0.1" />
+	<field name="lag_hash" descr="LAG hashing configuration. This is a bitmask, in which each \;set bit includes the corresponding item in the LAG hash cal\;culation.\;0: Ingress_port\;1: SMAC - for IPv4 and IPv6 packets\;2: SMAC - for non-IP packets\;3: DMAC - for IPv4 and IPv6 packets\;4: DMAC - for non-IP packets\;5: Ethertype - for IPv4 and IPv6 packets\;6: Ethertype - for non-IP packets\;7: VLAN_ID - for IPv4 and IPv6 packets\;8: VLAN_ID - for non-IP packets\;\;9: Source_IP_address - (can be IPv4 or IPv6, also for ARP \;payload)\;10: Destination_IP_address - (can be IPv4 or IPv6, also for \;ARP payload)\;11: TCP/UDP - source port\;12: TCP/UDP - destination port\;13: IPv4 Protocol/IPv6 Next Header\;14: IPv6 Flow label\;15: SID - FCoE source ID\;16: DID - FCoE destination ID\;17: OXID - FCoE originator exchange ID\;19: Destination_QP_number - for RoCE packets\;\;The default lag_hash contains SMAC, DMAC, VLANID and \;Ethertype (for all packet types)\;Note: An engine action can be added to the LAG hash calcu\;lation. For more details, contact NVIDIA Support." access="RW" offset="0x4.0" size="0x0.20" />
+	<field name="seed" descr="LAG seed value. The seed is the same for all ports (latest \;configuration configures the seed for all ports)." access="RW" offset="0x8.0" size="0x4.0" />
 </node>
 
 <node name="slecr_ext" descr="" size="0x10.0" >
-	<field name="re" descr="Roaming enable. In case of a new MAC address that has a \;port mismatch with existing dynamic FDB entry:\;0: do not learn\;1: learn (default)\;(Learn means generating a learning notification to the soft\;ware)\;Note: learning is enabled only if all enables are set (spanning \;tree, port-vid, global)\;" access="RW" offset="0x0.2" size="0x0.1" />
+	<field name="re" descr="Roaming enable. In case of a new MAC address that has a \;port mismatch with existing dynamic FDB entry:\;0: do not learn\;1: learn (default)\;(Learn means generating a learning notification to the soft\;ware)\;Note: learning is enabled only if all enables are set (span\;ning tree, port-vid, global)\;" access="RW" offset="0x0.2" size="0x0.1" />
 	<field name="il" descr="Independent Learning\;0: Shared VLAN learning, Reserved when Spectrum/-2\;1: Independent VLAN learning (default)\;" access="RW" offset="0x0.3" size="0x0.1" />
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
 </node>
@@ -6748,7 +7011,7 @@
 	<field name="provisioned" descr="If set, the INI file is ready and the card is provisioned" access="RO" offset="0x0.31" size="0x0.1" />
 	<field name="ini_file_version" descr="User-configured version number of the current INI file.\;Valid only when active or lc_ready are &apos;1&apos;." access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="hw_revision" descr="HW revision of the line-card as it appears in the current INI file.\;Valid only when active or lc_ready are &apos;1&apos;." access="RO" offset="0x4.16" size="0x0.16" />
-	<field name="card_type" descr="Card type\;0x00: Buffalo 4x400G\;0x01: Buffalo 8x200G\;0x02: Buffalo 16x100G" access="RO" offset="0x8.0" size="0x0.8" />
+	<field name="card_type" descr="Card type\;0x00: Buffalo 4x400G\;0x01: Buffalo 8x200G\;0x02: Buffalo 16x100G\;" access="RO" offset="0x8.0" size="0x0.8" />
 </node>
 
 <node name="slot_name_ext" descr="" size="0x20.0" >
@@ -6760,12 +7023,12 @@
 	<field name="ps_ticks_res" descr="resolution for each tick in the phase axis in units of 0.01ps" access="RO" offset="0x0.16" size="0x0.16" />
 	<field name="mv_center_pos" descr="center position of eye in 0.1mV" access="RO" offset="0x4.0" size="0x0.16" />
 	<field name="ps_center_pos" descr="center position of eye in 0.01ps" access="RO" offset="0x4.16" size="0x0.16" />
-	<field name="margin" descr="The margin that the lane received based on a specific config\;uration." access="RO" offset="0x8.0" size="0x0.24" />
+	<field name="margin" descr="The margin that the lane received based on a specific configu\;ration." access="RO" offset="0x8.0" size="0x0.24" />
 	<field name="margin_version" descr="[internal] 0 - no margin available\;[internal] 1 - Figure of Merit" access="RO" offset="0x8.24" size="0x0.8" />
 	<field name="height_eo_neg" descr="Voltage offset from eye center to the negative side of the \;upper eye in 0.1mV." access="RO" offset="0xC.0" size="0x0.16" />
-	<field name="height_eo_pos" descr="Voltage offset from eye center to the positive side of the \;upper eye in 0.1mV." access="RO" offset="0xC.16" size="0x0.16" />
+	<field name="height_eo_pos" descr="Voltage offset from eye center to the positive side of the upper \;eye in 0.1mV." access="RO" offset="0xC.16" size="0x0.16" />
 	<field name="phase_eo_neg" descr="The offset from the eye center to the negative (left) side of the \;upper eye in 0.01ps." access="RO" offset="0x10.0" size="0x0.16" />
-	<field name="phase_eo_pos" descr="The offset from the eye center to the positive (right) side of \;the upper eye in 0.01ps." access="RO" offset="0x10.16" size="0x0.16" />
+	<field name="phase_eo_pos" descr="The offset from the eye center to the positive (right) side of the \;upper eye in 0.01ps." access="RO" offset="0x10.16" size="0x0.16" />
 </node>
 
 <node name="slred_page_data_ext" descr="" size="0xa0.0" >
@@ -6790,7 +7053,7 @@
 	<field name="destructive_ctrl" descr="0 - non destructive scan\;1 - destructive scan\;Note: if non destructive scan is not supported this field is \;ignored and a destructive scan will be operated" access="RW" offset="0x4.29" size="0x0.1" />
 	<field name="last_scan" descr="set to &apos;1&apos; when performing last eye scan for lane.\;For example: when scanning 3 eyes in the order of up, mid, \;down. field should be set when scanning down eye.\;If scanning only 1 eye, field should be set." access="WO" offset="0x4.30" size="0x0.1" />
 	<field name="en" descr="start eye scan" access="WO" offset="0x4.31" size="0x0.1" />
-	<field name="page_data" descr="page data for index page_data_sel\;page 0 will contain info page data.\;Table  1313, &quot;SLRED - Serdes Lane Receive Eye Diagram Reg\;ister Layout for info page,&quot; on page  1911\;the page data 1-7 will contain the err_val for each index in \;ascending order.\;Table  1315, &quot;SLRED - Serdes Lane Receive Eye Diagram Reg\;ister Layout for page_data,&quot; on page  1913\;Each err_val[i] represents the bit errors of row floor(i / \;width_dim)\;and column i mod width_dim.\;Matrix is built starting from the left bottom corner.\;each err_val indicates the number of bit errors for one tick" subnode="slred_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xa0.0" />
+	<field name="page_data" descr="page data for index page_data_sel\;page 0 will contain info page data.\;Table 1438, &quot;SLRED - Serdes Lane Receive Eye Diagram \;Register Layout for info page,&quot; on page 1697\;the page data 1-7 will contain the err_val for each index in \;ascending order.\;Table 1440, &quot;SLRED - Serdes Lane Receive Eye Diagram \;Register Layout for page_data,&quot; on page 1699\;Each err_val[i] represents the bit errors of row floor(i / \;width_dim)\;and column i mod width_dim.\;Matrix is built starting from the left bottom corner.\;each err_val indicates the number of bit errors for one tick" subnode="slred_reg_page_data_auto_ext" access="RO" offset="0x8.0" size="0xa0.0" />
 </node>
 
 <node name="slred_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0xa0.0" >
@@ -6803,17 +7066,17 @@
 	<field name="grade" descr="The grade that the lane received based on a specific configu\;ration.\;" access="RO" offset="0x4.0" size="0x0.24" />
 	<field name="grade_version" descr="" access="RO" offset="0x4.24" size="0x0.8" />
 	<field name="height_eo_neg_up" descr="Voltage offset from eye center to the negative side of the \;upper eye. Only applicable for PAM4 signal." access="RO" offset="0x8.0" size="0x0.16" />
-	<field name="height_eo_pos_up" descr="Voltage offset from eye center to the positive side of the \;upper eye.\;Only applicable for PAM4 signal." access="RO" offset="0x8.16" size="0x0.16" />
+	<field name="height_eo_pos_up" descr="Voltage offset from eye center to the positive side of the upper \;eye.\;Only applicable for PAM4 signal." access="RO" offset="0x8.16" size="0x0.16" />
 	<field name="height_eo_pos_mid" descr="Voltage offset from eye center to the positive side of the mid\;dle eye." access="RO" offset="0xC.0" size="0x0.16" />
 	<field name="phase_eo_neg_up" descr="The offset from the eye center to the negative (left) side of the \;upper eye. Only applicable for PAM4 signal." access="RO" offset="0xC.16" size="0x0.8" />
-	<field name="phase_eo_pos_up" descr="The offset from the eye center to the positive (right) side of \;the upper eye. Only applicable for PAM4 signal." access="RO" offset="0xC.24" size="0x0.8" />
+	<field name="phase_eo_pos_up" descr="The offset from the eye center to the positive (right) side of the \;upper eye. Only applicable for PAM4 signal." access="RO" offset="0xC.24" size="0x0.8" />
 	<field name="phase_eo_neg_mid" descr="The offset from the eye center to the negative (left) side of the \;middle eye." access="RO" offset="0x10.0" size="0x0.8" />
-	<field name="phase_eo_pos_mid" descr="The offset from the eye center to the positive (right) side of \;the middle eye." access="RO" offset="0x10.8" size="0x0.8" />
+	<field name="phase_eo_pos_mid" descr="The offset from the eye center to the positive (right) side of the \;middle eye." access="RO" offset="0x10.8" size="0x0.8" />
 	<field name="height_eo_neg_mid" descr="Voltage offset from eye center to the negative side of the mid\;dle eye." access="RO" offset="0x10.16" size="0x0.16" />
-	<field name="height_eo_neg_low" descr="Voltage offset from eye center to the negative side of the \;lower eye. Only applicable for PAM4 signal." access="RO" offset="0x14.0" size="0x0.16" />
+	<field name="height_eo_neg_low" descr="Voltage offset from eye center to the negative side of the lower \;eye. Only applicable for PAM4 signal." access="RO" offset="0x14.0" size="0x0.16" />
 	<field name="height_eo_pos_low" descr="Voltage offset from eye center to the positive side of the lower \;eye. Only applicable for PAM4 signal." access="RO" offset="0x14.16" size="0x0.16" />
 	<field name="phase_eo_neg_low" descr="The offset from the eye center to the negative (left) side of the \;lower eye. Only applicable for PAM4 signal." access="RO" offset="0x18.16" size="0x0.8" />
-	<field name="phase_eo_pos_low" descr="The offset from the eye center to the positive (right) side of \;the lower eye. Only applicable for PAM4 signal." access="RO" offset="0x18.24" size="0x0.8" />
+	<field name="phase_eo_pos_low" descr="The offset from the eye center to the positive (right) side of the \;lower eye. Only applicable for PAM4 signal." access="RO" offset="0x18.24" size="0x0.8" />
 	<field name="up_eye_grade" descr="upper eye grade" access="RO" offset="0x1C.0" size="0x0.16" />
 	<field name="mid_eye_grade" descr="middle eye grade" access="RO" offset="0x1C.16" size="0x0.16" />
 	<field name="dn_eye_grade" descr="lower eye grade" access="RO" offset="0x20.0" size="0x0.16" />
@@ -6842,7 +7105,7 @@
 <node name="slrg_7nm_testing_ext" descr="" size="0x1c.0" >
 	<field name="iterations" descr="Number of iterations to run FOM\;0 - fw default" access="OP" offset="0x0.0" size="0x0.10" />
 	<field name="status" descr="0 - measure not preformed\;1 - measuring in progress\;2 - measuring done" access="RO" offset="0x0.16" size="0x0.3" />
-	<field name="lane_meas_info" descr="FOM measurements info for lane &lt;i&gt;\;See Table 1171, &quot;Lane Measure Info layout,&quot; on page 1744." subnode="slrg_lane_measure_info_ext" access="RO" offset="0x4.0" size="0x18.0" />
+	<field name="lane_meas_info" descr="FOM measurements info for lane &lt;i&gt;\;See Table 1296, &quot;Lane Measure Info layout,&quot; on \;page 1527." subnode="slrg_lane_measure_info_ext" access="RO" offset="0x4.0" size="0x18.0" />
 </node>
 
 <node name="slrg_lane_measure_info_ext" descr="" size="0x18.0" >
@@ -6865,14 +7128,14 @@
 </node>
 
 <node name="slrg_reg_ext" descr="" size="0x28.0" >
-	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - USR Main\;5 - USR Tile\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
+	<field name="port_type" descr="For HCA supported only when indicated by PCAM \;0 - Network Port\;1 - Near-End Port (For Retimer/Gearbox - Host side)\;2 - Internal IC LR Port \;3 - Far-End Port (For Retimer/Gearbox - Line side)\;4 - Main Die to Die (USR / SCC)\;5 - Tile Die to Die (USR / SCC)\;Other values are reserved." access="INDEX" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Logical lane number\;[internal] Mapping to physical lane number can be queried in \;PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="pnat" descr="Port number access type. \;0 - Local port number\;1 - IB / label port number\;" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number." access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="version" descr="0 - 40nm products\;1 - 28nm products\;3 - 16nm products\;4 - 7nm products" access="RO" offset="0x0.24" size="0x0.4" />
 	<field name="status" descr="0 - Invalid\;1 - Valid\;" access="RO" offset="0x0.28" size="0x0.4" />
-	<field name="page_data" descr="Table 1163, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 40nm and 28nm,&quot; on page 1739\;Table 1165, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 16nm,&quot; on page 1740\;Table 1167, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 7nm,&quot; on page 1742\;Table 1169, &quot;SLRG - Serdes Lane Receive Grade Register \;Layout for 7nm Testing,&quot; on page 1743" subnode="slrg_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x24.0" />
+	<field name="page_data" descr="Table 1288, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 40nm and 28nm,&quot; on page 1522\;Table 1290, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 16nm,&quot; on page 1523\;Table 1292, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 7nm,&quot; on page 1525\;Table 1294, &quot;SLRG - Serdes Lane Receive Grade Regis\;ter Layout for 7nm Testing,&quot; on page 1526" subnode="slrg_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x24.0" />
 </node>
 
 <node name="slrg_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0x24.0" >
@@ -6991,12 +7254,12 @@
 	<field name="lane_speed" descr="Reserved for PCIe.\;The lane speed for TX settings:\;0 - SDR / Gen1 (PCIe)\;1 - DDR / Gen2 (PCIe) / 5GBASE-R\;2 - QDR / Gen3 (PCIe)\;3 - FDR10 (10GE / 40GE)\;4 - FDR (56GE) / Gen4 (PCIe)\;5 - EDR (25GE / 50GE / 100GE) / Gen5 (PCIe)\;6 - HDR (50GE / 200GE / 400GE)\;7 - NDR /100GE / 200GE / 400GE / 800GE (53.125 Gbd / \;106.25Gb/s)\;8-9 - Reserved\;10 - 1GE\;11 - 2.5GE (XAUI)\;12 - 50GE-KR4\;13-15 - Reserved" access="RW" offset="0x0.4" size="0x0.4" />
 	<field name="lane" descr="Logical lane number\;[internal] Mapping to physical lane number can be queried in \;PMDR register" access="INDEX" offset="0x0.8" size="0x0.4" />
 	<field name="tx_policy" descr="Configures Tx parameter set policy\;0 - Tx parameters will be set according to best possible con\;figuration chosen by the system\;1 - Tx parameters will be set according to Data Base only and \;will not be overridden by link training (e.g KR-Startup)" access="RW" offset="0x0.13" size="0x0.1" />
-	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;3 - PCI / Out of Band" access="INDEX" offset="0x0.14" size="0x0.2" />
+	<field name="pnat" descr="Port number access type. determines the way local_port is \;interpreted:\;0 - Local port number\;1 - IB / label port number\;" access="INDEX" offset="0x0.14" size="0x0.2" />
 	<field name="local_port" descr="Local port number [7:0]" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="version" descr="0: prod_40nm\;1: prod_28nm\;3: prod_16nm\;4: prod_7nm\;7: prod_lut_7nm" access="RO" enum="prod_40nm=0x0,prod_28nm=0x1,prod_16nm=0x3,prod_7nm=0x4,prod_lut_7nm=0x7" offset="0x0.24" size="0x0.4" />
 	<field name="status" descr="0 - Invalid\;1 - Valid" access="RO" offset="0x0.28" size="0x0.2" />
 	<field name="lp_msb" descr="Local port number [9:8]" access="INDEX" offset="0x0.30" size="0x0.2" />
-	<field name="page_data" descr="Table  1151, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for 28nm and 40nm,&quot; on page  1729\;Table  1153, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for 16nm,&quot; on page  1730\;Table  1157, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for 7nm,&quot; on page  1732\;Table  1159, &quot;SLTP - Serdes Lane Transmit Parameters Reg\;ister Layout for LUT 7nm,&quot; on page  1733" subnode="sltp_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x48.0" union_selector="$(parent).version" />
+	<field name="page_data" descr="Table 1276, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for 28nm and 40nm,&quot; on page 1512\;Table 1278, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for 16nm,&quot; on page 1513\;Table 1282, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for 7nm,&quot; on page 1515\;Table 1284, &quot;SLTP - Serdes Lane Transmit Parameters \;Register Layout for LUT 7nm,&quot; on page 1516" subnode="sltp_reg_page_data_auto_ext" access="RO" offset="0x4.0" size="0x48.0" union_selector="$(parent).version" />
 </node>
 
 <node name="sltp_reg_page_data_auto_ext" descr="" attr_is_union="1" size="0x48.0" >
@@ -7012,22 +7275,22 @@
 </node>
 
 <node name="smid_ext" descr="" size="0x240.0" >
-	<field name="mid" descr="Multicast identifier - global identifier that represents the \;multicast group\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix A.3.2, \;&quot;Port Group Table (PGT)&quot; (page 3375)" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="mid" descr="Multicast identifier - global identifier that represents the \;multicast group\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix A.3.2, \;&quot;Port Group Table (PGT)&quot; (page 3097)" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="op" descr="opcode:\;0: UPDATE - (updates only according to the mask)\;1: WRITE - (all ports will become non-member followed by a \;write)" access="OP" enum="UPDATE=0x0,WRITE=0x1" offset="0x4.0" size="0x0.4" />
+	<field name="op" descr="opcode:\;0: UPDATE - (updates only according to the mask)\;1: WRITE - (all ports will become non-member followed by \;a write)" access="OP" enum="UPDATE=0x0,WRITE=0x1" offset="0x4.0" size="0x0.4" />
 	<field name="smpe" descr="Switch multicast port to egress VID\;Reserved when ubridge=0\;Reserved when Spectrum-2" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="smpe_valid" descr="SMPE is valid\;When not valid, the egress VID will not be modified by the \;SMPE table\;Reserved when ubridge=0\;Reserved when Spectrum-2" access="RW" offset="0x8.20" size="0x0.1" />
-	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration. Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1512 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration. Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1293 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="mask" descr="Local port mask. Reserved on Get() operations.\;0: Do not update port state\;1: Update port membership based on the port value" access="WO" high_bound="7" low_bound="0" offset="0x220.0" size="0x20.0" />
 </node>
 
 <node name="smid_v2_ext" descr="" size="0x120.0" >
-	<field name="mid" descr="Multicast identifier - global identifier that represents the \;multicast group\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix A.3.2, \;&quot;Port Group Table (PGT)&quot; (page 3375)" access="INDEX" offset="0x0.0" size="0x0.16" />
+	<field name="mid" descr="Multicast identifier - global identifier that represents the \;multicast group\;Range 0 .. max_mid - 1\;For Spectrum/-2, pointer to PGT table, see Appendix A.3.2, \;&quot;Port Group Table (PGT)&quot; (page 3097)" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
-	<field name="op" descr="opcode:\;0: UPDATE - (updates only according to the mask)\;1: WRITE - (all ports will become non-member followed by a \;write)" access="OP" enum="UPDATE=0x0,WRITE=0x1" offset="0x4.0" size="0x0.4" />
+	<field name="op" descr="opcode:\;0: UPDATE - (updates only according to the mask)\;1: WRITE - (all ports will become non-member followed by \;a write)" access="OP" enum="UPDATE=0x0,WRITE=0x1" offset="0x4.0" size="0x0.4" />
 	<field name="smpe" descr="Switch multicast port to egress VID\;Reserved when ubridge=0\;Reserved when Spectrum-2" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="smpe_valid" descr="SMPE is valid\;When not valid, the egress VID will not be modified by the \;SMPE table\;Reserved when ubridge=0\;Reserved when Spectrum-2" access="RW" offset="0x8.20" size="0x0.1" />
-	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1512 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
+	<field name="port" descr="Local port membership \;0: Non-member \;1: Member - packets that point to the MID are transmitted \;into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1293 for port \;numbering scheme.\;CPU port is supported, trap_id is FDB\;Router port is supported" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
 	<field name="mask" descr="Local port mask. Reserved on Get() operations.\;0: Do not update port state\;1: Update port membership based on the port value" access="WO" high_bound="31" low_bound="0" offset="0xA0.0" size="0x80.0" />
 </node>
 
@@ -7046,7 +7309,7 @@
 <node name="smpeb_ext" descr="" size="0x420.0" >
 	<field name="smpe_index" descr="Switch multicast port to egress VID\;When ubridge=0: Range is 0.. cap_max_rmpe - max_fid - 1\;When ubridge=1: Range is 0.. cap_max_rmpe - 1\;Note: when ubridge=1 the rmpe and smpe use the same \;range, see RMPE register" access="INDEX" offset="0x4.0" size="0x0.16" />
 	<field name="elport_page" descr="egress local port page:\;elport_record[0] is 256*elport_page" access="INDEX" offset="0x8.0" size="0x0.4" />
-	<field name="elport_record" descr="egress local port record\;record i for local_port i\;See Table 970, &quot;SMPEB - elport_record Layout,&quot; on \;page 1443" subnode="smpeb_elport_record_ext" access="RW" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
+	<field name="elport_record" descr="egress local port record\;record i for local_port i\;See Table 1085, &quot;SMPEB - elport_record Layout,&quot; on \;page 1238" subnode="smpeb_elport_record_ext" access="RW" high_bound="255" low_bound="0" offset="0x20.0" size="0x400.0" />
 </node>
 
 <node name="smpu_ext" descr="" size="0x410.0" >
@@ -7055,26 +7318,26 @@
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="size" descr="Number of valid MIDs to be updated.\;Range is 1 to 256" access="INDEX" offset="0x4.16" size="0x0.9" />
 	<field name="op" descr="Operation\;0: Set bit\;1: Clear bit" access="WO" offset="0x4.30" size="0x0.2" />
-	<field name="mid" descr="MID list to where the relevant local_port bit indication is to \;be set/cleared.\;Range 0 .. max_mid - 1\;For Spectrum, pointer to PGT table, see Appendix A.3.2, \;&quot;Port Group Table (PGT)&quot; (page 3375)" subnode="mid" access="INDEX" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
+	<field name="mid" descr="MID list to where the relevant local_port bit indication is to \;be set/cleared.\;Range 0 .. max_mid - 1\;For Spectrum, pointer to PGT table, see Appendix A.3.2, \;&quot;Port Group Table (PGT)&quot; (page 3097)" subnode="mid" access="INDEX" high_bound="255" low_bound="0" offset="0x10.0" size="0x400.0" />
 </node>
 
 <node name="spad_ext" descr="" size="0x10.0" >
-	<field name="base_mac_47_32" descr="MAC address for the switch, global value to all ports.\;Configures the mirror agent SMAC.\;\;For SwitchX/-2:\;Base MAC address for the switch partitions.\;Per switch partition MAC address is equal to:\;base_mac + swid" access="RW" offset="0x0.0" size="0x0.16" />
+	<field name="base_mac_47_32" descr="MAC address for the switch, global value to all \;ports.\;Configures the mirror agent SMAC.\;\;For SwitchX/-2:\;Base MAC address for the switch partitions.\;Per switch partition MAC address is equal to:\;base_mac + swid" access="RW" offset="0x0.0" size="0x0.16" />
 	<field name="base_mac_31_0" descr="" access="RW" offset="0x4.0" size="0x4.0" />
 </node>
 
 <node name="spaft_ext" descr="" size="0x8.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not supported for CPU port (for CPU port all tag types are \;allowed)" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="allow_tagged" descr="When set, tagged frames on the ingress are admitted (default \;1)" access="RW" offset="0x4.29" size="0x0.1" />
-	<field name="allow_priotagged" descr="When set, priority tagged frames on the ingress are admitted \;(default 1)" access="RW" offset="0x4.30" size="0x0.1" />
+	<field name="allow_tagged" descr="When set, tagged frames on the ingress are admitted \;(default 1)" access="RW" offset="0x4.29" size="0x0.1" />
+	<field name="allow_priotagged" descr="When set, priority tagged frames on the ingress are admit\;ted (default 1)" access="RW" offset="0x4.30" size="0x0.1" />
 	<field name="allow_untagged" descr="When set, untagged frames on the ingress are admitted \;(default 1)" access="RW" offset="0x4.31" size="0x0.1" />
 </node>
 
 <node name="spevet_ext" descr="" size="0x8.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Egress Local port number\;Not supported to CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="et_vlan" descr="Egress ethertype VLAN when egr_et_set field set for the \;packet:\;0: ether_type0 - (default)\;1: ether_type1\;2: ether_type2\;Ethertype IDs are configured by SVER, see Section 6.12.38, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on page 1436" access="RW" enum="ether_type0=0x0,ether_type1=0x1,ether_type2=0x2" offset="0x4.16" size="0x0.2" />
+	<field name="et_vlan" descr="Egress ethertype VLAN when egr_et_set field set for the \;packet:\;0: ether_type0 - (default)\;1: ether_type1\;2: ether_type2\;Ethertype IDs are configured by SVER, see Section 6.12.38, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on \;page 1230" access="RW" enum="ether_type0=0x0,ether_type1=0x1,ether_type2=0x2" offset="0x4.16" size="0x0.2" />
 </node>
 
 <node name="spfsr_ext" descr="" size="0x8.0" >
@@ -7085,21 +7348,21 @@
 
 <node name="spgt_ext" descr="" size="0x240.0" >
 	<field name="pgi" descr="Multicast port group index - index into the Port group table \;(PGT)" access="INDEX" offset="0x0.0" size="0x0.13" />
-	<field name="range" descr="Range of entries on which the op is executed. Allows execut\;ing the same operation on multiple entries. op will be exe\;cuted on the entries in the range of pgi to (pgi + range - 1).\;Reserved when Read operations." access="INDEX" offset="0x4.0" size="0x0.12" />
-	<field name="port" descr="Local port membership. A bit vector where each port rep\;resents a local port. \;0: Non-member\;1: Member - multicast packets that point to the record are \;transmitted into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1512 for port \;numbering scheme." access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
+	<field name="range" descr="Range of entries on which the op is executed. Allows exe\;cuting the same operation on multiple entries. op will be \;executed on the entries in the range of pgi to (pgi + range - \;1).\;Reserved when Read operations." access="INDEX" offset="0x4.0" size="0x0.12" />
+	<field name="port" descr="Local port membership. A bit vector where each port rep\;resents a local port. \;0: Non-member\;1: Member - multicast packets that point to the record are \;transmitted into the port\;All LAG ports must share the same configuration.Refer to \;Section 8.3, &quot;Port Numbering&quot;, on page 1293 for port \;numbering scheme." access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="mask" descr="Local port mask. A bit vector where each port represents a \;local port.\;0: Do not update port state.\;1: Update port membership based on the op and the port \;value" access="WO" high_bound="7" low_bound="0" offset="0x220.0" size="0x20.0" />
 </node>
 
 <node name="spmlr_ext" descr="" size="0x8.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="learn_mode" descr="Enable learning on this port.\;0: Learn Disable\;2: Learn Enable\;3: Security Mode\;(Learn means generating a learning notification to the soft\;ware)\;Note: learning is enabled only if all enables are set (spanning \;tree, port-vid, global)" access="RW" offset="0x4.30" size="0x0.2" />
+	<field name="learn_mode" descr="Enable learning on this port.\;0: Learn Disable\;2: Learn Enable\;3: Security Mode\;(Learn means generating a learning notification to the soft\;ware)\;Note: learning is enabled only if all enables are set (span\;ning tree, port-vid, global)" access="RW" offset="0x4.30" size="0x0.2" />
 </node>
 
 <node name="spms_ext" descr="" size="0x404.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="state" descr="MSTP/RSTP State on VID &lt;i&gt;\;0: STP_DO_NOT_UPDATE - Do not change spanning tree state \;(used when writing only)\;1: STP_DISCARDING - Disable learning. No forwarding to/\;from this port (default)\;2: STP_LEARNING - Enable learning. No frame forwarding to/\;from this port\;3: STP_FORWARDING - port is learning and forwarding\;" access="RW" enum="STP_DO_NOT_UPDATE=0x0,STP_DISCARDING=0x1,STP_LEARNING=0x2,STP_FORWARDING=0x3" high_bound="4095" low_bound="0" offset="0x4.30" size="0x400.0" />
+	<field name="state" descr="MSTP/RSTP State on VID &lt;i&gt;\;0: STP_DO_NOT_UPDATE - Do not change spanning tree \;state (used when writing only)\;1: STP_DISCARDING - Disable learning. No forwarding to/\;from this port (default)\;2: STP_LEARNING - Enable learning. No frame forwarding \;to/from this port\;3: STP_FORWARDING - port is learning and forwarding\;" access="RW" enum="STP_DO_NOT_UPDATE=0x0,STP_DISCARDING=0x1,STP_LEARNING=0x2,STP_FORWARDING=0x3" high_bound="4095" low_bound="0" offset="0x4.30" size="0x400.0" />
 </node>
 
 <node name="spms_v2_ext" descr="" size="0x400.0" >
@@ -7107,23 +7370,23 @@
 	<field name="lp_msb" descr="Virtual port within the physical port. \;0 when virtual ports are not enabled on the port." access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="allv" descr="Apply to all VLANs" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="vid_record" descr="See Table 882, &quot;SPMS_V2 VID Record Layout,&quot; on \;page 1385" subnode="spms_v2_vid_record_ext" access="RW" high_bound="254" low_bound="0" offset="0x4.0" size="0x3fc.0" />
+	<field name="vid_record" descr="See Table 989, &quot;SPMS_V2 VID Record Layout,&quot; on \;page 1174" subnode="spms_v2_vid_record_ext" access="RW" high_bound="254" low_bound="0" offset="0x4.0" size="0x3fc.0" />
 </node>
 
 <node name="spms_v2_vid_record_ext" descr="" size="0x4.0" >
 	<field name="vid" descr="VLAN ID to be added/removed from port or for querying" access="INDEX" offset="0x0.0" size="0x0.12" />
-	<field name="state" descr="MSTP/RSTP State ovtn VID &lt;i&gt;\;1: STP_DISCARDING - Disable learning. No forwarding to/\;from this port (default)\;2: STP_LEARNING - Enable learning. No frame forwarding to/\;from this port\;3: STP_FORWARDING - port is learning and forwarding\;" access="RW" enum="STP_DISCARDING=0x1,STP_LEARNING=0x2,STP_FORWARDING=0x3" offset="0x0.12" size="0x0.2" />
+	<field name="state" descr="MSTP/RSTP State ovtn VID &lt;i&gt;\;1: STP_DISCARDING - Disable learning. No forwarding to/\;from this port (default)\;2: STP_LEARNING - Enable learning. No frame forwarding \;to/from this port\;3: STP_FORWARDING - port is learning and forwarding\;" access="RW" enum="STP_DISCARDING=0x1,STP_LEARNING=0x2,STP_FORWARDING=0x3" offset="0x0.12" size="0x0.2" />
 </node>
 
 <node name="spvc_ext" descr="" size="0xc.0" >
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="local port\;Supported from CPU port\;Note: applies both to Rx port and Tx port, so if a packet tra\;verses through Rx port i and a Tx port j then port i and port j \;must have the same configuration" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="et0" descr="Vlan Tag0 EtherType0 enable\;Packet is initially classified as VLAN Tag if its&apos; tag0 EtherType \;is equal to ether_type0\;0: disable\;1: enable (default)" access="RW" offset="0x8.0" size="0x0.1" />
-	<field name="inner_et0" descr="Vlan Tag1 EtherType0 enable\;Packet is initially classified as double VLAN Tag if in addition to \;being classified with a tag0 VLAN Tag it&apos;s tag1 EtherType value \;is equal to ether_type0\;0: disable\;1: enable (default)" access="RW" offset="0x8.1" size="0x0.1" />
+	<field name="inner_et0" descr="Vlan Tag1 EtherType0 enable\;Packet is initially classified as double VLAN Tag if in addition \;to being classified with a tag0 VLAN Tag it&apos;s tag1 EtherType \;value is equal to ether_type0\;0: disable\;1: enable (default)" access="RW" offset="0x8.1" size="0x0.1" />
 	<field name="et1" descr="Vlan Tag0 EtherType1 enable\;Packet is initially classified as VLAN Tag if its&apos; tag0 EtherType \;is equal to ether_type1\;0: disable\;1: enable (default)" access="RW" offset="0x8.8" size="0x0.1" />
-	<field name="inner_et1" descr="Vlan Tag1 EtherType1 enable\;Packet is initially classified as double VLAN Tag if in addition to \;being classified with a tag0 VLAN Tag it&apos;s tag1 EtherType value \;is equal to ether_type1\;0: disable\;1: enable (default)" access="RW" offset="0x8.9" size="0x0.1" />
+	<field name="inner_et1" descr="Vlan Tag1 EtherType1 enable\;Packet is initially classified as double VLAN Tag if in addition \;to being classified with a tag0 VLAN Tag it&apos;s tag1 EtherType \;value is equal to ether_type1\;0: disable\;1: enable (default)" access="RW" offset="0x8.9" size="0x0.1" />
 	<field name="et2" descr="Vlan Tag0 EtherType2 enable\;Packet is initially classified as VLAN Tag if its&apos; tag0 EtherType \;is equal to ether_type2\;0: disable (default)\;1: enable" access="RW" offset="0x8.16" size="0x0.1" />
-	<field name="inner_et2" descr="Vlan Tag1 EtherType2 enable\;Packet is initially classified as double VLAN Tag if in addition to \;being classified with a tag0 VLAN Tag it&apos;s tag1 EtherType value \;is equal to ether_type2\;0: disable (default)\;1: enable" access="RW" offset="0x8.17" size="0x0.1" />
+	<field name="inner_et2" descr="Vlan Tag1 EtherType2 enable\;Packet is initially classified as double VLAN Tag if in addition \;to being classified with a tag0 VLAN Tag it&apos;s tag1 EtherType \;value is equal to ether_type2\;0: disable (default)\;1: enable" access="RW" offset="0x8.17" size="0x0.1" />
 </node>
 
 <node name="spvid_ext" descr="" size="0x8.0" >
@@ -7131,24 +7394,24 @@
 	<field name="local_port" descr="When tport = 0:\;Ingress Local port number\;Not supported for CPU port (it is expected that CPU data \;packets are tagged)\;When tport = 1: Tunnel port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="tport" descr="Port is tunnel port\;Reserved when SwitchX/-2 or Spectrum" access="INDEX" offset="0x0.24" size="0x0.1" />
 	<field name="pvid" descr="Port default VID (default PVID is 001h)" access="RW" offset="0x4.0" size="0x0.12" />
-	<field name="et_vlan" descr="EtherType used for when VLAN is pushed at ingress (for \;untagged packets or for QinQ push mode)\;0: ether_type0 - (default)\;1: ether_type1\;2: ether_type2 - Reserved when Spectrum, supported by \;Spectrum-2\;Ethertype IDs are configured by SVER, see \;Section 6.12.38, &quot;SVER - Switch VLAN EtherType \;Register&quot;, on page 1436\;Reserved when egr_et_set = 1\;Reserved when SwitchX/-2" access="RW" enum="ether_type0=0x0,ether_type1=0x1,ether_type2=0x2" offset="0x4.16" size="0x0.2" />
-	<field name="egr_et_set" descr="When VLAN is pushed at ingress (for untagged packets or \;for QinQ push mode) then the Ethertype is decided at \;egress port.\;0: Ethertype decided at ingress, by SPVID.et_vlan\;1: Ethertype decided at egress, by SPEVET.et_vlan\;\;Note: if configured then also for L2 tunnel encap the over\;lay VLAN Ethertype will be decided at physical egress port.\;Note: if configured then also for tunnel_port (after L2 tun\;nel decap) the overlay VLAN Ethertype will be decided at \;physical egress port.\;Reserved when Spectrum" access="RW" offset="0x4.24" size="0x0.1" />
+	<field name="et_vlan" descr="EtherType used for when VLAN is pushed at ingress (for \;untagged packets or for QinQ push mode)\;0: ether_type0 - (default)\;1: ether_type1\;2: ether_type2 - Reserved when Spectrum, supported by \;Spectrum-2\;Ethertype IDs are configured by SVER, see \;Section 6.12.38, &quot;SVER - Switch VLAN EtherType \;Register&quot;, on page 1230\;Reserved when egr_et_set = 1\;Reserved when SwitchX/-2" access="RW" enum="ether_type0=0x0,ether_type1=0x1,ether_type2=0x2" offset="0x4.16" size="0x0.2" />
+	<field name="egr_et_set" descr="When VLAN is pushed at ingress (for untagged packets \;or for QinQ push mode) then the Ethertype is decided at \;egress port.\;0: Ethertype decided at ingress, by SPVID.et_vlan\;1: Ethertype decided at egress, by SPEVET.et_vlan\;\;Note: if configured then also for L2 tunnel encap the \;overlay VLAN Ethertype will be decided at physical \;egress port.\;Note: if configured then also for tunnel_port (after L2 \;tunnel decap) the overlay VLAN Ethertype will be \;decided at physical egress port.\;Reserved when Spectrum" access="RW" offset="0x4.24" size="0x0.1" />
 </node>
 
 <node name="spvm_ext" descr="" size="0x400.0" >
 	<field name="num_rec" descr="Number of records to update. Each record contains: i, e, u, \;vid.\;Range 1..255" access="OP" offset="0x0.0" size="0x0.8" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number\;Not supported for CPU port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="pte" descr="Priority Tagged Update Enable\;On Write operations, if this bit is cleared, the pt bit will NOT be \;updated. To update the pt bit, pte must be set." access="WO" offset="0x0.30" size="0x0.1" />
-	<field name="pt" descr="Priority tagged.\;If this bit is set, packets forwarded to the port with untagged \;VLAN membership (u bit is set) will be tagged with priority tag \;(VID=0).\;For Spectrum this field must not be modified for an active \;port (a port which has traffic egressing through it). \;For Spectrum, setting SPVTR.epvid_mode will modify this \;field" access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="vid_record" descr="See Table 892, &quot;VID Record Layout&quot;" access="RW" high_bound="254" low_bound="0" offset="0x4.0" size="0x3fc.0" />
+	<field name="pte" descr="Priority Tagged Update Enable\;On Write operations, if this bit is cleared, the pt bit will NOT \;be updated. To update the pt bit, pte must be set." access="WO" offset="0x0.30" size="0x0.1" />
+	<field name="pt" descr="Priority tagged.\;If this bit is set, packets forwarded to the port with untagged \;VLAN membership (u bit is set) will be tagged with priority \;tag (VID=0).\;For Spectrum this field must not be modified for an active \;port (a port which has traffic egressing through it). \;For Spectrum, setting SPVTR.epvid_mode will modify this \;field" access="RW" offset="0x0.31" size="0x0.1" />
+	<field name="vid_record" descr="See Table 999, &quot;VID Record Layout&quot;" access="RW" high_bound="254" low_bound="0" offset="0x4.0" size="0x3fc.0" />
 </node>
 
 <node name="spvmlr_ext" descr="" size="0x400.0" >
 	<field name="num_rec" descr="Number of records to update. Each record contains: \;learn_enable\;Note: setting num_rec to &apos;0&apos; indicates one record (same as \;setting num_rec to one).\;" access="OP" offset="0x0.0" size="0x0.8" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port (receive)\;Not supported from CPU port\;Not supported from Router port" access="INDEX" offset="0x0.16" size="0x0.8" />
-	<field name="vid_learn_enable" descr="List of VLAN IDs and the learn enable state for each of the \;IDs.\;For layout, see Section 952, &quot;VID Learn Enable Layout&quot;, \;on page 1430" access="RW" high_bound="254" low_bound="0" offset="0x4.0" size="0x3fc.0" />
+	<field name="vid_learn_enable" descr="List of VLAN IDs and the learn enable state for each of the \;IDs.\;For layout, see Section 1067, &quot;VID Learn Enable Lay\;out&quot;, on page 1223" access="RW" high_bound="254" low_bound="0" offset="0x4.0" size="0x3fc.0" />
 </node>
 
 <node name="spvtr_ext" descr="" size="0x10.0" >
@@ -7156,10 +7419,10 @@
 	<field name="local_port" descr="When tport = 0:\;Local port number\;Not supported from/to CPU\;When tport = 1: Tunnel port" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="tport" descr="Port is tunnel port\;Reserved when SwitchX/-2 or Spectrum" access="INDEX" offset="0x0.28" size="0x0.1" />
 	<field name="epvid_mode" descr="Egress Port VLAN-ID Mode\;0: IEEE Compliant VLAN membership\;1: pop VLAN (for VLAN stacking)\;For Spectrum family, this affects the values of SPVM.e,u,pt. \;And this fields is a WO" access="RW" offset="0x4.0" size="0x0.4" />
-	<field name="ipvid_mode" descr="Ingress Port VLAN-ID Mode\;0: IEEE Compliant PVID (default)\;1: push VLAN (for VLAN stacking, except prio tagged packets)\;2: always push VLAN (also for prio tagged packets) - reserved \;when SwitchX/-2\;For Spectrum/-2, this affects the values of SPVM.i" access="RW" offset="0x4.16" size="0x0.4" />
-	<field name="ipprio_mode" descr="Ingress Port Priority Mode\;This controls the PCP and DEI of the new outer VLAN\;Note: for SwitchX/-2 the DEI is not affected.\;0: use port default PCP and DEI (configured by QPDPC)\;1: use C-VLAN PCP and DEI\;See Section 11.14.14, &quot;QPDPC - QoS Port Default PCP&quot;, \;on page 2614\;Has no effect when ipvid_mode = 0\;Reserved when tport = 1. See TNQCR." access="RW" offset="0x4.20" size="0x0.4" />
+	<field name="ipvid_mode" descr="Ingress Port VLAN-ID Mode\;0: IEEE Compliant PVID (default)\;1: push VLAN (for VLAN stacking, except prio tagged pack\;ets)\;2: always push VLAN (also for prio tagged packets) - \;reserved when SwitchX/-2\;For Spectrum/-2, this affects the values of SPVM.i" access="RW" offset="0x4.16" size="0x0.4" />
+	<field name="ipprio_mode" descr="Ingress Port Priority Mode\;This controls the PCP and DEI of the new outer VLAN\;Note: for SwitchX/-2 the DEI is not affected.\;0: use port default PCP and DEI (configured by QPDPC)\;1: use C-VLAN PCP and DEI\;See Section 11.14.14, &quot;QPDPC - QoS Port Default \;PCP&quot;, on page 2402\;Has no effect when ipvid_mode = 0\;Reserved when tport = 1. See TNQCR." access="RW" offset="0x4.20" size="0x0.4" />
 	<field name="epve" descr="Egress Port VID Mode Update Enable\;When set, the Egress Port VID Mode is updated with the pro\;vided epvid_mode field" access="OP" offset="0x4.29" size="0x0.1" />
-	<field name="ipve" descr="Ingress Port VID Mode Update Enable\;When set, the Ingress Port VID Mode is updated with the pro\;vided ipvid_mode field\;Reserved on Get operations" access="OP" offset="0x4.30" size="0x0.1" />
+	<field name="ipve" descr="Ingress Port VID Mode Update Enable\;When set, the Ingress Port VID Mode is updated with the \;provided ipvid_mode field\;Reserved on Get operations" access="OP" offset="0x4.30" size="0x0.1" />
 	<field name="ippe" descr="Ingress Port Prio Mode Update Enable\;When set, the Port Prio Mode is updated with the provided \;ipprio_mode field\;Reserved on Get operations" access="OP" offset="0x4.31" size="0x0.1" />
 	<field name="ethertype" descr="Ethertype to be used at egress when pushing new VLAN tag \;for VLAN stacking (default=0x8100)\;Reserved when Spectrum/-2" access="RW" offset="0xC.0" size="0x0.16" />
 	<field name="ete" descr="Ethertype Update Enable\;When set, the Ethertype is updated with the provided ether\;type field\;Reserved when Spectrum/-2" access="OP" offset="0xC.31" size="0x0.1" />
@@ -7175,7 +7438,7 @@
 	<field name="enh_sw_p0_mask" descr="Enhanced switch port 0 mask. When 1, the EnhSwP0 field is \;valid (see below). When 0, the EnhSwP0 field is ignored." access="WO" offset="0x0.14" size="0x0.1" />
 	<field name="ndm" descr="Node description mask. Set to 1 to write the NodeDescrip\;tion field (see below).\;" access="WO" offset="0x0.15" size="0x0.1" />
 	<field name="cm2" descr="Set PortInfo:CapabilityMask2 to PortInfo:CapabilityMask2 \;specified." access="WO" offset="0x0.16" size="0x0.1" />
-	<field name="swid" descr="Switch partition to which the command applies" access="INDEX" offset="0x0.24" size="0x0.8" />
+	<field name="swid" descr="Switch partition to which the command applies\;\;" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="capability_mask" descr="Sets the PortInfoCapabilityMask:\;Specifies the supported capabilities of this node. A bit set to \;1 for affirmation of supported capability.\;0: Reserved\;1: IsSM\;2: IsNoticeSupported\;3: IsTrapSupported\;4: Reserved\;5: IsAutomaticMigrationSupported\;6: IsSLMappingSupported\;7: IsMKeyNVRAM - (supports M_Key in NVRAM)\;8: IsPKeyNVRAM - (supports P_Key in NVRAM)\;9: IsLEDInfoSupported\;10: IsSMdisabled\;11: IsSystemImageGUIDSupported\;12: IsPKeySwitchExternalPortTrapSupported\;13: Reserved\;14: Reserved\;15: Reserved\;16: IsCommunicationManagementSupported\;17: IsSNMPTunnelingSupported\;18: IsReinitSupported\;19: IsDeviceManagementSupported\;20: IsVendorClassSupported\;21: IsDRNoticeSupported\;22: IsCapabilityMaskNoticeSupported\;23: IsBootManagementSupported\;24: IsLinkRoundTripLatencySupported\;25: IsClientReregistrationSupported\;26: IsOtherLocalChangesNoticeSupported\;27: IsLinkSpeedWidthPairsTableSupported\;Other values Reserved" access="RW" offset="0x4.0" size="0x4.0" />
 	<field name="system_image_guid_h" descr="System Image GUID, takes effect only if the sig bit is set. \;Must be the same for both ports." access="RW" offset="0x8.0" size="0x4.0" />
 	<field name="system_image_guid_l" descr="System Image GUID, takes effect only if the sig bit is set. \;Must be the same for both ports." access="RW" offset="0xC.0" size="0x4.0" />
@@ -7190,7 +7453,7 @@
 	<field name="lp_msb" descr="Local port[9:8]" access="RW" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port to send the packet" access="RW" offset="0x0.16" size="0x0.8" />
 	<field name="m" descr="Master - if set then this record describes the master system \;port. Only one master system port is allowed per local port.\;Must be set for Spectrum" access="RW" offset="0x0.31" size="0x0.1" />
-	<field name="system_port" descr="Unique port identifier for the final destination of the packet\;Range is 1 to cap_max_system_port\;For Spectrum see the cap_max_system_port at Appendix A.8, \;&quot;Ethernet Switching Resources&quot; (page 3395)" access="INDEX" offset="0x4.0" size="0x0.16" />
+	<field name="system_port" descr="Unique port identifier for the final destination of the packet\;Range is 1 to cap_max_system_port\;For Spectrum see the cap_max_system_port at Appendix \;A.8, &quot;Ethernet Switching Resources&quot; (page 3117)" access="INDEX" offset="0x4.0" size="0x0.16" />
 </node>
 
 <node name="stat_bufferx_reg_ext" descr="" size="0x8.0" >
@@ -7211,15 +7474,15 @@
 
 <node name="svfa_ext" descr="" size="0x18.0" >
 	<field name="v" descr="Valid\;Indicates the VID to FID mapping entry is valid. \;Reserved when SwitchX/-2, where entries are always valid \;and can not be invalidated regardless of the v bit value." access="RW" offset="0x0.0" size="0x0.1" />
-	<field name="tport" descr="Port is tunnel port.\;When tport=1 then the tunnel_port may be flex0 or flex1. Thus \;mapping {tunnel_port,vid} -&gt; fid at decap" access="INDEX" offset="0x0.7" size="0x0.1" />
+	<field name="tport" descr="Port is tunnel port.\;When tport=1 then the tunnel_port may be flex0 or flex1. \;Thus mapping {tunnel_port,vid} -&gt; fid at decap" access="INDEX" offset="0x0.7" size="0x0.1" />
 	<field name="mapping_table" descr="Mapping table:\;0: VLAN_mapping_table - VID to FID mapping\;1: Port_VLAN_mapping_table - {Port,VID} to FID mapping\;2: VNI_mapping_table - VNI to FID mapping. Reserved when \;ubridge = 0" access="INDEX" enum="VLAN_mapping_table=0x0,Port_VLAN_mapping_table=0x1,VNI_mapping_table=0x2" offset="0x0.8" size="0x0.3" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="When tport=0:\;Local port number\;\;When tport=1:\;Tunnel port - only flex0 and flex1 are valid values.\;\;Reserved when mapping_table = &apos;0&apos; (VLAN mapping)\;Reserved when mapping_table = &apos;2&apos; (VNI mapping)" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum devices" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="vid" descr="VLAN ID\;Reserved when mapping_table = &apos;2&apos; (VNI mapping)" access="INDEX" offset="0x4.0" size="0x0.12" />
 	<field name="fid" descr="Filtering ID\;Cannot be modified for a valid (v=1) mapping\;Reserved when trap_action is TRAP or DISCARD_ERROR\;" access="RW" offset="0x4.16" size="0x0.16" />
-	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059\;Reserved when SwitchX/-2" access="RW" offset="0x8.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 1060\;Spectrum-2: Note that for router-sub-port at the FID after \;routing there is no counting. If need counter then use fid-rif. \;Also when iACL set fis then no fid counting. \;Reserved when SwitchX/-2" access="RW" offset="0x8.24" size="0x0.8" />
+	<field name="counter_index" descr="Counter Index for flow counters.\;For Spectrum/-2: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821\;Reserved when SwitchX/-2" access="RW" offset="0x8.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters.\;For Spectrum/-2: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822\;Spectrum-2: Note that for router-sub-port at the FID after \;routing there is no counting. If need counter then use fid-rif. \;Also when iACL set fis then no fid counting. \;Reserved when SwitchX/-2" access="RW" offset="0x8.24" size="0x0.8" />
 	<field name="trap_action" descr="Trap Action\;0x0: NOP\;0x1: TRAP\;0x2: MIRROR_TO_CPU\;0x3: MIRROR\;0x4: DISCARD_ERROR\;For TRAP and MIRROR_TO_CPU the trap-ID is FID_TRAP\;Reserved when SwitchX/-2\;Spectrum-2 - note that for router-sub-port, at the FID after \;routing there is no trap (behavior is NOP). If need trap then \;use fid-rif\;" access="RW" enum="NOP=0x0,TRAP=0x1,MIRROR_TO_CPU=0x2,MIRROR=0x3,DISCARD_ERROR=0x4" offset="0xC.28" size="0x0.4" />
 	<field name="vni" descr="vni\;Reserved when mapping_table != &apos;2&apos; (VNI mapping table)" access="INDEX" offset="0x10.0" size="0x0.24" />
 	<field name="irif" descr="Ingress RIF (Router Interface)\;Range is 0.. cap_max_router_interfaces-1\;Reserved when ubridge = 0\;Reserved when irif_v = 0\;\;" access="RW" offset="0x14.0" size="0x0.16" />
@@ -7229,7 +7492,7 @@
 <node name="svmlr_ext" descr="" size="0x8.0" >
 	<field name="swid" descr="Switch partition ID\;Reserved when Spectrum/-2" access="INDEX" offset="0x0.24" size="0x0.8" />
 	<field name="vid" descr="VLAN ID" access="INDEX" offset="0x4.0" size="0x0.12" />
-	<field name="learn_enable" descr="Enable learning on this VLAN.\;(Learn means generating a learning notification to the soft\;ware)\;Note: learning is enabled only if all enables are set (spanning \;tree, port-vid, global)" access="RW" offset="0x4.31" size="0x0.1" />
+	<field name="learn_enable" descr="Enable learning on this VLAN.\;(Learn means generating a learning notification to the soft\;ware)\;Note: learning is enabled only if all enables are set (span\;ning tree, port-vid, global)" access="RW" offset="0x4.31" size="0x0.1" />
 </node>
 
 <node name="svpcn_ext" descr="" size="0x10.0" >
@@ -7239,20 +7502,20 @@
 </node>
 
 <node name="svpe_ext" descr="" size="0x4.0" >
-	<field name="vp_en" descr="Virtual Port Enable:\;0: VLAN mode, ingress VID to FID mapping\;1: Virtual Port mode, ingress {Port,VID} to FID mapping\;2: VNI2FID mode, reserved when tport=0, reserved when \;Spectrum-1\;When tport=1 and local_port=0 then default is &apos;2&apos;\;When tport=1 and local_port=1 then default is &apos;1&apos;\;When tport=1 and local_port=2 then default is &apos;1&apos;\;When tport=1 and local_port=3 then default is &apos;1&apos;" access="RW" offset="0x0.8" size="0x0.2" />
+	<field name="vp_en" descr="Virtual Port Enable:\;0: VLAN mode, ingress VID to FID mapping\;1: Virtual Port mode, ingress {Port,VID} to FID mapping\;2: VNI2FID mode, reserved when tport=0, reserved \;when Spectrum-1\;When tport=1 and local_port=0 then default is &apos;2&apos;\;When tport=1 and local_port=1 then default is &apos;1&apos;\;When tport=1 and local_port=2 then default is &apos;1&apos;\;When tport=1 and local_port=3 then default is &apos;1&apos;" access="RW" offset="0x0.8" size="0x0.2" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
-	<field name="local_port" descr="When tport = 0:\;Ingress local port number\;Not supported for CPU port (CPU port uses VLAN mode)" access="INDEX" offset="0x0.16" size="0x0.8" />
+	<field name="local_port" descr="When tport = 0:\;Ingress local port number\;Not supported for CPU port (CPU port uses VLAN \;mode)" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="tport" descr="Port is tunnel port" access="RW" offset="0x0.28" size="0x0.1" />
 </node>
 
 <node name="switch_prio_ext" descr="" size="0x10.0" >
-	<field name="ecn" descr="The EXP mapping for ECN j, see Table 2119, &quot;ecn&lt;j&gt; Layout&quot;" subnode="ecn_ext" access="RW" high_bound="3" low_bound="0" offset="0x0.0" size="0x10.0" />
+	<field name="ecn" descr="The EXP mapping for ECN j, see Table 2294, &quot;ecn&lt;j&gt; Layout&quot;" subnode="ecn_ext" access="RW" high_bound="3" low_bound="0" offset="0x0.0" size="0x10.0" />
 </node>
 
 <node name="switch_prio_j_ext" descr="" size="0x4.0" >
-	<field name="color2" descr="The PCP and DEI mapping for color k, where k=0..2, see \;Table 2133, &quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.8" size="0x0.8" />
-	<field name="color1" descr="The PCP and DEI mapping for color k, where k=0..2, see \;Table 2133, &quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.16" size="0x0.8" />
-	<field name="color0" descr="The PCP and DEI mapping for color k, where k=0..2, see \;Table 2133, &quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.24" size="0x0.8" />
+	<field name="color2" descr="The PCP and DEI mapping for color k, where k=0..2, see \;Table 2308, &quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.8" size="0x0.8" />
+	<field name="color1" descr="The PCP and DEI mapping for color k, where k=0..2, see \;Table 2308, &quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.16" size="0x0.8" />
+	<field name="color0" descr="The PCP and DEI mapping for color k, where k=0..2, see \;Table 2308, &quot;color&lt;k&gt;Layout&quot;" access="RW" offset="0x0.24" size="0x0.8" />
 </node>
 
 <node name="tcam_region_info_peaps_ext" descr="" size="0x10.0" >
@@ -7291,7 +7554,7 @@
 	<field name="overlay_ecn" descr="ECN field of the IP header in the overlay network" access="INDEX" offset="0x4.16" size="0x0.2" />
 	<field name="underlay_ecn" descr="ECN field of the IP header in the underlay network" access="INDEX" offset="0x4.24" size="0x0.2" />
 	<field name="trap_id" descr="Trap ID\;Trap-ID is DECAP_ECN0 or DECAP_ECN1\;Reserved when trap_en is &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.9" />
-	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet Trap&quot;, \;on page 465" access="RW" offset="0x8.28" size="0x0.4" />
+	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet Trap&quot;, \;on page 513" access="RW" offset="0x8.28" size="0x0.4" />
 </node>
 
 <node name="tieem_ext" descr="" size="0xc.0" >
@@ -7304,19 +7567,19 @@
 	<field name="ipip_ttlc" descr="For IPinIP Tunnel encapsulation: TTL Copy from inner:\;0: use ipip_ttl_uc\;1: copy the ttl from the packet header." access="RW" offset="0x4.8" size="0x0.1" />
 	<field name="ipip_fl_suffix" descr="IPIP Flow Label Suffix\;For IPinIP Tunnel encapsulation: Constant 8 most significant \;bits of the flow label. \;Reserved when ipip_flh = 1\;Reserved when Spectrum\;*** Note: this field is not supported by current FW, the value \;is always &apos;0&apos; *** \;" access="RW" offset="0xC.0" size="0x0.8" />
 	<field name="ipip_fl_prefix" descr="For IPinIP Tunnel encapsulation:\;Constant 12 most significant bits of the flow label. \;Spectrum: reserved when ipip_flh = 0\;Spectrum-2: not reserved" access="RW" offset="0xC.8" size="0x0.12" />
-	<field name="ipip_flh" descr="For IPinIP Tunnel encapsulation:\;0: Flow Label is static\;- Spectrum: &apos;0&apos;\;- Spectrum-2: by {ipip_fl_prefix, ipip_fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash, and 12msb are configured by ipip_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configura\;tion Register&quot;, on page 2766, Section 13.11.8, &quot;RECR_V2 \;- Router ECMP Configuration Version 2 Register&quot;, on \;page 2768" access="RW" offset="0xC.24" size="0x0.1" />
+	<field name="ipip_flh" descr="For IPinIP Tunnel encapsulation:\;0: Flow Label is static\;- Spectrum: &apos;0&apos;\;- Spectrum-2: by {ipip_fl_prefix, ipip_fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash, and 12msb are configured by ipip_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configura\;tion Register&quot;, on page 2554, Section 13.11.8, &quot;RECR_V2 \;- Router ECMP Configuration Version 2 Register&quot;, on \;page 2556" access="RW" offset="0xC.24" size="0x0.1" />
 	<field name="ipip_flc" descr="For IPinIP Tunnel encapsulation: Flow Label Copy from inner \;0: Calculate flow label using ipip_flh.\;1: If packet is IPv6 and encapsulation is IPv6, copy the whole \;flow label from the packet header. Otherwise, calculate flow \;label using ipip_flh." access="RW" offset="0xC.25" size="0x0.1" />
-	<field name="ipip_gre_key_for_hash" descr="For IPinIP Tunnel encapsulation: \;The 24 most significant bits of the GRE key when type is IP \;with GRE with a key and the key is set by ECMP hash\;See Section 13.11.7, &quot;RECR - Router ECMP Configura\;tion Register&quot;, on page 2766, Section 13.11.8, &quot;RECR_V2 \;- Router ECMP Configuration Version 2 Register&quot;, on \;page 2768" access="RW" offset="0x14.8" size="0x0.24" />
+	<field name="ipip_gre_key_for_hash" descr="For IPinIP Tunnel encapsulation: \;The 24 most significant bits of the GRE key when type is IP \;with GRE with a key and the key is set by ECMP hash\;See Section 13.11.7, &quot;RECR - Router ECMP Configura\;tion Register&quot;, on page 2554, Section 13.11.8, &quot;RECR_V2 \;- Router ECMP Configuration Version 2 Register&quot;, on \;page 2556" access="RW" offset="0x14.8" size="0x0.24" />
 </node>
 
 <node name="tiqcr_ext" descr="" size="0xc.0" >
 	<field name="enc_pcp_rw" descr="For encapsulation: how to handle the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Clear the pcp_rewrite_en\;3: Set the pcp_rewrite_en" access="RW" offset="0x4.0" size="0x0.2" />
 	<field name="enc_dscp_rw" descr="For encapsulation: how to handle the dscp_rewrite_en:\;0: Preserve the value of the dscp_rewrite_en\;2: Clear the dscp_rewrite_en\;3: Set the dscp_rewrite_en" access="RW" offset="0x4.2" size="0x0.2" />
-	<field name="enc_set_sp" descr="For encapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority and packet Color\;1: Set new Switch Priority and packet Color as configured by \;TIQDR.\;See Section 16.5.3, &quot;TIQDR - Tunneling IPinIP QoS \;Default Register&quot;, on page 3043" access="RW" offset="0x4.24" size="0x0.1" />
-	<field name="enc_set_dscp" descr="For encapsulation: how to set DSCP field:\;0: Copy the DSCP from the overlay (inner) IP header to the \;underlay (outer) IP header. If there is no IP header, use \;TIQDR.dscp\;1: Set the DSCP field as the TIQDR.dscp\;The dscp field is configured by TIQDR. See Table 2488, \;&quot;TIQDR - Tunneling IPinIP QoS Default Register Layout,&quot; \;on page 3043" access="RW" offset="0x4.28" size="0x0.1" />
+	<field name="enc_set_sp" descr="For encapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority and packet Color\;1: Set new Switch Priority and packet Color as configured by \;TIQDR.\;See Section 16.5.3, &quot;TIQDR - Tunneling IPinIP QoS \;Default Register&quot;, on page 2837" access="RW" offset="0x4.24" size="0x0.1" />
+	<field name="enc_set_dscp" descr="For encapsulation: how to set DSCP field:\;0: Copy the DSCP from the overlay (inner) IP header to the \;underlay (outer) IP header. If there is no IP header, use \;TIQDR.dscp\;1: Set the DSCP field as the TIQDR.dscp\;The dscp field is configured by TIQDR. See Table 2701, \;&quot;TIQDR - Tunneling IPinIP QoS Default Register Layout,&quot; \;on page 2837" access="RW" offset="0x4.28" size="0x0.1" />
 	<field name="dec_pcp_rw" descr="For decapsulation: how to handle the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Clear the pcp_rewrite_en\;3: Set the pcp_rewrite_en" access="RW" offset="0x8.0" size="0x0.2" />
 	<field name="dec_dscp_rw" descr="For decapsulation: how to handle the dscp_rewrite_en:\;0: Preserve the value of the dscp_rewrite_en\;2: Clear the dscp_rewrite_en\;3: Set the dscp_rewrite_en" access="RW" offset="0x8.2" size="0x0.2" />
-	<field name="dec_set_sp" descr="For decapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority\;1: Set a new Switch Priority from overlay DSCP as configured \;by RDPM (of the overlay packet, later the overlay router may \;re-modify).\;See Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2818" access="RW" offset="0x8.24" size="0x0.1" />
+	<field name="dec_set_sp" descr="For decapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority\;1: Set a new Switch Priority from overlay DSCP as configured \;by RDPM (of the overlay packet, later the overlay router may \;re-modify).\;See Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2606" access="RW" offset="0x8.24" size="0x0.1" />
 	<field name="dec_set_dscp" descr="For decapsulation: how to set the overlay DSCP field, if exists, \;while stripping off the underlay headers:\;0: Preserve inner DSCP\;1: Copy the DSCP from the underlay IP header" access="RW" offset="0x8.28" size="0x0.1" />
 </node>
 
@@ -7332,8 +7595,8 @@
 	<field name="clear_counters" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
 	<field name="count_encap_high" descr="Count number of packets which did encapsulation to NVE \;tunneling\;Note that MC packets which are encapsulated multiple \;times are counted multiple times" access="RO" offset="0x10.0" size="0x4.0" />
 	<field name="count_encap_low" descr="Count number of packets which did encapsulation to NVE \;tunneling\;Note that MC packets which are encapsulated multiple \;times are counted multiple times" access="RO" offset="0x14.0" size="0x4.0" />
-	<field name="count_decap_high" descr="Count number of packets which did decapsulation from NVE \;tunneling" access="RO" offset="0x18.0" size="0x4.0" />
-	<field name="count_decap_low" descr="Count number of packets which did decapsulation from NVE \;tunneling" access="RO" offset="0x1C.0" size="0x4.0" />
+	<field name="count_decap_high" descr="Count number of packets which did decapsulation from \;NVE tunneling" access="RO" offset="0x18.0" size="0x4.0" />
+	<field name="count_decap_low" descr="Count number of packets which did decapsulation from \;NVE tunneling" access="RO" offset="0x1C.0" size="0x4.0" />
 	<field name="count_decap_errors_high" descr="Count number of packets had decapsulation errors of NVE \;tunneling" access="RO" offset="0x20.0" size="0x4.0" />
 	<field name="count_decap_errors_low" descr="Count number of packets had decapsulation errors of NVE \;tunneling" access="RO" offset="0x24.0" size="0x4.0" />
 	<field name="count_decap_discards_high" descr="Count number of packets had decapsulation discards of \;NVE tunneling" access="RO" offset="0x28.0" size="0x4.0" />
@@ -7350,37 +7613,37 @@
 </node>
 
 <node name="tndem_ext" descr="" size="0xc.0" >
-	<field name="eip_ecn" descr="Egress IP ECN\;ECN field of the IP header of the packet which goes out from \;the decapsulation" access="RW" offset="0x4.8" size="0x0.2" />
+	<field name="eip_ecn" descr="Egress IP ECN\;ECN field of the IP header of the packet which goes out \;from the decapsulation" access="RW" offset="0x4.8" size="0x0.2" />
 	<field name="overlay_ecn" descr="ECN field of the IP header in the overlay network\;If the packet has no overlay IP header, the decapsulation \;uses the mapped value &apos;0&apos;" access="INDEX" offset="0x4.16" size="0x0.2" />
 	<field name="underlay_ecn" descr="ECN field of the IP header in the underlay network" access="INDEX" offset="0x4.24" size="0x0.2" />
 	<field name="trap_id" descr="Trap ID\;Trap-ID is DECAP_ECN0 or DECAP_ECN1\;Reserved when trap_en is &apos;0&apos;" access="RW" offset="0x8.0" size="0x0.9" />
-	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet Trap&quot;, \;on page 465" access="RW" offset="0x8.28" size="0x0.4" />
+	<field name="trap_en" descr="Trap enable:\;0: no trap due to decap ecn\;1: trap enable with trap_id. HPKT can control the trap \;action. See Section 2.17.3, &quot;HPKT - Host PacKet \;Trap&quot;, on page 513" access="RW" offset="0x8.28" size="0x0.4" />
 </node>
 
 <node name="tneem_ext" descr="" size="0xc.0" >
 	<field name="underlay_ecn" descr="ECN of the IP header in the underlay network" access="RW" offset="0x4.16" size="0x0.2" />
-	<field name="overlay_ecn" descr="ECN of the IP header in the overlay network\;Note: if overlay packet did not have ECN then the overlay \;ECN of the packet is considered as 0x0\;For Spectrum familiy only, MPLS packets use overlay_ecn of \;00\;\;For Spectrum-2, MPLS packets use the packet overlay_ecn" access="INDEX" offset="0x4.24" size="0x0.2" />
+	<field name="overlay_ecn" descr="ECN of the IP header in the overlay network\;Note: if overlay packet did not have ECN then the overlay \;ECN of the packet is considered as 0x0\;For Spectrum familiy only, MPLS packets use overlay_ecn \;of 00\;\;For Spectrum-2, MPLS packets use the packet over\;lay_ecn" access="INDEX" offset="0x4.24" size="0x0.2" />
 </node>
 
 <node name="tngcr_ext" descr="" size="0x44.0" >
-	<field name="type" descr="Tunnel type for Encapsulation:\;0: Tunnel is VXLAN\;1: Tunnel is VXLAN-GPE\;2: Tunnel is GENEVE\;3: Tunnel is NVGRE\;Note: for Spectrum the NVE parsing must be enabled, see \;Section 4.12.2, &quot;MPRS - Monitoring Parsing State Reg\;ister&quot;, on page 1122, see parsing_en field\;The types are mutually exclusive\;For Spectrum family: type must not be modified under traf\;fic of NVE tunneling encapsulation or decapsulation.\;Note: if change on the fly then erroneous packets may be \;transmitted" access="RW" offset="0x0.0" size="0x0.4" />
+	<field name="type" descr="Tunnel type for Encapsulation:\;0: Tunnel is VXLAN\;1: Tunnel is VXLAN-GPE\;2: Tunnel is GENEVE\;3: Tunnel is NVGRE\;Note: for Spectrum the NVE parsing must be enabled, see \;Section 4.12.2, &quot;MPRS - Monitoring Parsing State \;Register&quot;, on page 887, see parsing_en field\;The types are mutually exclusive\;For Spectrum family: type must not be modified under \;traffic of NVE tunneling encapsulation or decapsulation.\;Note: if change on the fly then erroneous packets may be \;transmitted" access="RW" offset="0x0.0" size="0x0.4" />
 	<field name="nve_ttl_uc" descr="The TTL for NVE Tunnel encapsulation underlay unicast \;packets." access="RW" offset="0x4.0" size="0x0.8" />
 	<field name="nve_ttlc" descr="For NVE Tunnel encapsulation: TTL Copy from inner:\;0: use nve_ttl_uc (for UC) or nve_ttl_mc (for MC).\;1: copy the ttl from the packet header.\;Reserved when Spectrum" access="RW" offset="0x4.8" size="0x0.1" />
 	<field name="nve_decap_ttl" descr="Configures the overlay TTL at decap\;0: PRESERVE - The overlay TTL is as is from the overlay. \;Spectrum supports this mode only.\;\;1: COPY - The overlay TTL is taken from the underlay. \;\;2: MINIMUM - The overlay TTL is the minimum value \;between underlay and overlay TTL.\;For all cases, the later overlay router will decrement the \;TTL. \;Note: same config for UC and for MC\;Reserved when Spectrum" access="RW" offset="0x4.16" size="0x0.2" />
 	<field name="nve_valid" descr="Used for:\;1. FW checks of configuring type, usip, fdb entries\;2. parsing depth" access="RW" offset="0x4.31" size="0x0.1" />
-	<field name="nve_ttl_mc" descr="The TTL for NVE Tunnel encapsulation of underlay multicast \;packets." access="RW" offset="0x8.0" size="0x0.8" />
-	<field name="nve_fl_suffix" descr="NVE Flow Label Suffix\;For NVE Tunnel encapsulation: Flow Label Suffix\;For Tunnel encapsulation the 8 least significant bits are cal\;culated as follow:\;enc_flh=0: 8 lsb = enc_fl_suffix\;enc_flh=1: 8 lsb = enc_fl_suffix | hash [7:0] (bitwise OR)\;Reserved when nve_flh = 1\;*** Note: this field is not supported by current FW, the value \;is always &apos;0&apos; *** \;Supported from Spectrum-2\;" access="RW" offset="0xC.0" size="0x0.8" />
-	<field name="nve_fl_prefix" descr="NVE Flow Label Prefix\;For NVE Tunnel encapsulation: Constant 12 most significant \;bits of the flow label. \;Spectrum: reserved when nve_flh = 0\;Spectrum-2: not reserved" access="RW" offset="0xC.8" size="0x0.12" />
-	<field name="nve_flh" descr="NVE Flow Label Hash\;For NVE Tunnel encapsulation:\;0: Flow Label is static\;- Spectrum-1: &apos;0&apos;\;- Spectrum-2 and on: by {nve_fl_prefix, nve_fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash bitwise OR with enc_fl_suffix, and 12msb are \;configured by nve_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configura\;tion Register&quot;, on page 2766, Section 13.11.8, \;&quot;RECR_V2 - Router ECMP Configuration Version 2 \;Register&quot;, on page 2768" access="RW" offset="0xC.24" size="0x0.1" />
-	<field name="nve_flc" descr="For NVE Tunnel encapsulation: Flow Label Copy from inner \;0: Calculate flow label using nve_flh.\;1: If packet is IPv6 and encapsulation is IPv6, copy the whole \;flow label from the packet header. Otherwise, calculate flow \;label using nve_flh." access="RW" offset="0xC.25" size="0x0.1" />
-	<field name="nve_udp_sport_suffix" descr="NVE UDP Source Port Suffix\;When NVE encap - the 8 least significant bits of NVE UDP \;source port are calculated as follow:\;nve_udp_sport_type=0: 8 lsb = nve_udp_sport_suffix\;nve_udp_sport_type=1: 8 lsb = nve_udp_sport_suffix | hash \;[7:0] (bitwise OR)\;\;For Spectrum: the 8 least significant bits are set by LAG \;hash\;See Section 6.12.28, &quot;SLCR_V2 - Switch LAG Configu\;ration 2 Register&quot;, on page 1414, Section 6.12.28, \;&quot;SLCR_V2 - Switch LAG Configuration 2 Register&quot;, on \;page 1414.\;For Spectrum-2: the 8 least significant bits are set by ECMP \;hash, see Section 13.11.7, &quot;RECR - Router ECMP Con\;figuration Register&quot;, on page 2766, Section 13.11.8, \;&quot;RECR_V2 - Router ECMP Configuration Version 2 \;Register&quot;, on page 2768\;Reserved when NVE Tunnel encapsulation is NVGRE\;" access="RW" offset="0x10.0" size="0x0.8" />
+	<field name="nve_ttl_mc" descr="The TTL for NVE Tunnel encapsulation of underlay multi\;cast packets." access="RW" offset="0x8.0" size="0x0.8" />
+	<field name="nve_fl_suffix" descr="NVE Flow Label Suffix\;For NVE Tunnel encapsulation: Flow Label Suffix\;For Tunnel encapsulation the 8 least significant bits are \;calculated as follow:\;enc_flh=0: 8 lsb = enc_fl_suffix\;enc_flh=1: 8 lsb = enc_fl_suffix | hash [7:0] (bitwise OR)\;Reserved when nve_flh = 1\;*** Note: this field is not supported by current FW, the \;value is always &apos;0&apos; *** \;Supported from Spectrum-2\;" access="RW" offset="0xC.0" size="0x0.8" />
+	<field name="nve_fl_prefix" descr="NVE Flow Label Prefix\;For NVE Tunnel encapsulation: Constant 12 most signifi\;cant bits of the flow label. \;Spectrum: reserved when nve_flh = 0\;Spectrum-2: not reserved" access="RW" offset="0xC.8" size="0x0.12" />
+	<field name="nve_flh" descr="NVE Flow Label Hash\;For NVE Tunnel encapsulation:\;0: Flow Label is static\;- Spectrum-1: &apos;0&apos;\;- Spectrum-2 and on: by {nve_fl_prefix, nve_fl_suffix}\;1: Flow Label 8 least significant bits are calculated from \;ECMP hash bitwise OR with enc_fl_suffix, and 12msb are \;configured by nve_fl_prefix\;See Section 13.11.7, &quot;RECR - Router ECMP Configu\;ration Register&quot;, on page 2554, Section 13.11.8, \;&quot;RECR_V2 - Router ECMP Configuration Version 2 \;Register&quot;, on page 2556" access="RW" offset="0xC.24" size="0x0.1" />
+	<field name="nve_flc" descr="For NVE Tunnel encapsulation: Flow Label Copy from \;inner \;0: Calculate flow label using nve_flh.\;1: If packet is IPv6 and encapsulation is IPv6, copy the \;whole flow label from the packet header. Otherwise, cal\;culate flow label using nve_flh." access="RW" offset="0xC.25" size="0x0.1" />
+	<field name="nve_udp_sport_suffix" descr="NVE UDP Source Port Suffix\;When NVE encap - the 8 least significant bits of NVE UDP \;source port are calculated as follow:\;nve_udp_sport_type=0: 8 lsb = nve_udp_sport_suffix\;nve_udp_sport_type=1: 8 lsb = nve_udp_sport_suffix | \;hash [7:0] (bitwise OR)\;\;For Spectrum: the 8 least significant bits are set by LAG \;hash\;See Section 6.12.28, &quot;SLCR_V2 - Switch LAG Configu\;ration 2 Register&quot;, on page 1207, Section 6.12.28, \;&quot;SLCR_V2 - Switch LAG Configuration 2 Register&quot;, on \;page 1207.\;For Spectrum-2: the 8 least significant bits are set by \;ECMP hash, see Section 13.11.7, &quot;RECR - Router \;ECMP Configuration Register&quot;, on page 2554, \;Section 13.11.8, &quot;RECR_V2 - Router ECMP Configu\;ration Version 2 Register&quot;, on page 2556\;Reserved when NVE Tunnel encapsulation is NVGRE\;" access="RW" offset="0x10.0" size="0x0.8" />
 	<field name="nve_udp_sport_prefix" descr="NVE UDP Source Port Prefix\;When NVE encap - constant 8 most significant bits of the \;NVE UDP source port.\;Reserved when NVE Tunnel encapsulation is NVGRE\;" access="RW" offset="0x10.8" size="0x0.8" />
-	<field name="et_vlan" descr="EtherType used for when VLAN is pushed at decap \;0: ether_type0 (default)\;1: ether_type1\;2: ether_type2 \;Ethertype IDs are configured by SVER, see Section 6.12.38, \;&quot;SVER - Switch VLAN EtherType Register&quot;, on \;page 1436\;Reserved when Spectrum-2, see SPVID" access="RW" offset="0x10.20" size="0x0.2" />
-	<field name="nve_udp_sport_type" descr="NVE UDP source port type\;For NVE Tunnel encapsulation (VXLAN, VXLAN-GPE or \;GENEVE):\;0: Source UDP is fixed - 8 msb are nve_src_udp_port_prefix, \;8 lsb are: Spectrum-1 &apos;0&apos;, Spectrum-2 and on: nve_ud\;p_sport_suffix\;1: Source UDP 8 least significant bits are calculated from \;hash and nve_udp_sport_suffix (see description of nve_ud\;p_sport_suffix), and 8msb are configured by nve_src_ud\;p_port_prefix\;For NVE Tunnel encapsulation (NVGRE):\;0: NVGRE.flow_id is &apos;0&apos;\;1: NVGRE.flow_id (8 bits) is set by hash\;" access="RW" offset="0x10.24" size="0x0.1" />
+	<field name="et_vlan" descr="EtherType used for when VLAN is pushed at decap \;0: ether_type0 (default)\;1: ether_type1\;2: ether_type2 \;Ethertype IDs are configured by SVER, see \;Section 6.12.38, &quot;SVER - Switch VLAN EtherType \;Register&quot;, on page 1230\;Reserved when Spectrum-2, see SPVID" access="RW" offset="0x10.20" size="0x0.2" />
+	<field name="nve_udp_sport_type" descr="NVE UDP source port type\;For NVE Tunnel encapsulation (VXLAN, VXLAN-GPE or \;GENEVE):\;0: Source UDP is fixed - 8 msb are nve_src_udp_port_pre\;fix, 8 lsb are: Spectrum-1 &apos;0&apos;, Spectrum-2 and on: nve_ud\;p_sport_suffix\;1: Source UDP 8 least significant bits are calculated from \;hash and nve_udp_sport_suffix (see description of \;nve_udp_sport_suffix), and 8msb are configured by nve_s\;rc_udp_port_prefix\;For NVE Tunnel encapsulation (NVGRE):\;0: NVGRE.flow_id is &apos;0&apos;\;1: NVGRE.flow_id (8 bits) is set by hash\;" access="RW" offset="0x10.24" size="0x0.1" />
 	<field name="nve_enc_orig_we" descr="Write enable to nve_enc_orig\;Reserved when Spectrum-2" access="WO" offset="0x10.30" size="0x0.1" />
-	<field name="nve_enc_orig" descr="VLAN handling of overlay packet at encap:\;0: STRIP_TAG - 1 VLAN tag is stripped (if existed at ingress) \;(default)\;1: KEEP_ORIG - all VLAN tags of original packet are kept \;When overlay router and KEEP_ORIG the inner vid is 0\;Reserved when Spectrum-2, see SPVTR.epvid_mode" access="RW" offset="0x10.31" size="0x0.1" />
-	<field name="nve_group_size_mc" descr="For NVE Tunnel multicast:\;The amount of sequential link lists of MC entries. The first \;link list is configured by SFD.underlay_mc_ptr\;Valid ranges:\;1, 2, 4, 8 16, 32, 64\;The link lists are configured by TNUMT\;The hash is set by LAG hash\;See Section 15.11.6, &quot;TNUMT - Tunneling NVE Under\;lay Multicast Table Register&quot;, on page 3012\;See Section 6.12.28, &quot;SLCR_V2 - Switch LAG Configu\;ration 2 Register&quot;, on page 1414, Section 6.12.28, \;&quot;SLCR_V2 - Switch LAG Configuration 2 Register&quot;, on \;page 1414.\;Reserved when Spectrum-2 and on" access="RW" offset="0x18.0" size="0x0.8" />
-	<field name="nve_group_size_flood" descr="For NVE Tunnel flooding or BC:\;The amount of sequential link lists of flooding or BC entries. \;The first link list is configured by SFMR.nve_tunnel_\;flood_ptr\;Valid ranges:\;1, 2, 4, 8 16, 32, 64\;\;The link lists are configured by TNUMT\;The hash is set by LAG hash\;See Section 15.11.6, &quot;TNUMT - Tunneling NVE Under\;lay Multicast Table Register&quot;, on page 3012\;See Section 6.12.28, &quot;SLCR_V2 - Switch LAG Configu\;ration 2 Register&quot;, on page 1414, Section 6.12.28, \;&quot;SLCR_V2 - Switch LAG Configuration 2 Register&quot;, on \;page 1414.\;Reserved when Spectrum-2 and on" access="RW" offset="0x1C.0" size="0x0.8" />
+	<field name="nve_enc_orig" descr="VLAN handling of overlay packet at encap:\;0: STRIP_TAG - 1 VLAN tag is stripped (if existed at \;ingress) (default)\;1: KEEP_ORIG - all VLAN tags of original packet are kept \;When overlay router and KEEP_ORIG the inner vid is 0\;Reserved when Spectrum-2, see SPVTR.epvid_mode" access="RW" offset="0x10.31" size="0x0.1" />
+	<field name="nve_group_size_mc" descr="For NVE Tunnel multicast:\;The amount of sequential link lists of MC entries. The first \;link list is configured by SFD.underlay_mc_ptr\;Valid ranges:\;1, 2, 4, 8 16, 32, 64\;The link lists are configured by TNUMT\;The hash is set by LAG hash\;See Section 15.11.6, &quot;TNUMT - Tunneling NVE \;Underlay Multicast Table Register&quot;, on page 2806\;See Section 6.12.28, &quot;SLCR_V2 - Switch LAG Configu\;ration 2 Register&quot;, on page 1207, Section 6.12.28, \;&quot;SLCR_V2 - Switch LAG Configuration 2 Register&quot;, on \;page 1207.\;Reserved when Spectrum-2 and on" access="RW" offset="0x18.0" size="0x0.8" />
+	<field name="nve_group_size_flood" descr="For NVE Tunnel flooding or BC:\;The amount of sequential link lists of flooding or BC \;entries. The first link list is configured by SFMR.nve_tun\;nel_flood_ptr\;Valid ranges:\;1, 2, 4, 8 16, 32, 64\;\;The link lists are configured by TNUMT\;The hash is set by LAG hash\;See Section 15.11.6, &quot;TNUMT - Tunneling NVE \;Underlay Multicast Table Register&quot;, on page 2806\;See Section 6.12.28, &quot;SLCR_V2 - Switch LAG Configu\;ration 2 Register&quot;, on page 1207, Section 6.12.28, \;&quot;SLCR_V2 - Switch LAG Configuration 2 Register&quot;, on \;page 1207.\;Reserved when Spectrum-2 and on" access="RW" offset="0x1C.0" size="0x0.8" />
 	<field name="underlay_virtual_router" descr="Underlay virtual router\;Reserved when Spectrum-2" access="RW" offset="0x20.0" size="0x0.16" />
 	<field name="learn_enable" descr="When decap:\;Enable learning from NVE port\;Reserved when Spectrum-2, see TNPC" access="RW" offset="0x20.31" size="0x0.1" />
 	<field name="underlay_rif" descr="Underlay ingress router interface\;Reserved when Spectrum" access="RW" offset="0x24.0" size="0x0.16" />
@@ -7395,23 +7658,23 @@
 </node>
 
 <node name="tngee_ext" descr="" size="0x50.0" >
-	<field name="l2_enc_index" descr="Index to L2 encap entry\;For Spectrum familiy the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="l2_enc_index" descr="Index to L2 encap entry\;For Spectrum familiy the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)" access="INDEX" offset="0x0.0" size="0x0.24" />
 	<field name="tunnel_type" descr="Tunnel type:\;0: NVE - (L2 enc NVE)\;2: Flex_tunnel - (0 or 1)" access="RW" enum="NVE=0x0,Flex_tunnel=0x2" offset="0x4.0" size="0x0.4" />
 	<field name="next_l2_enc_ptr" descr="Index to next L2 encap entry\;Note: may be point either to a TNGEE entry or to a TNUMT \;entry. \;For Spectrum family uses KVH\;Reserved when vnext = 0\;" access="RW" offset="0x8.0" size="0x0.24" />
 	<field name="vnext" descr="Next valid\;The next_l2_enc_index is valid\;" access="RW" offset="0x8.31" size="0x0.1" />
-	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries starting from \;next_l2_enc_ptr (the number of ECMPs).\;Values: 1-128, 256, 512, 1024, 2048 and 4096\;Reserved when vnext = 0\;Note: uses LAG-hash (and not ECMP-hash)" access="RW" offset="0xC.0" size="0x0.13" />
+	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries starting \;from next_l2_enc_ptr (the number of ECMPs).\;Values: 1-128, 256, 512, 1024, 2048 and 4096\;Reserved when vnext = 0\;Note: uses LAG-hash (and not ECMP-hash)" access="RW" offset="0xC.0" size="0x0.13" />
 	<field name="uirif" descr="Underlay Ingress Router Interface\;Valid range is 0..cap_max_router_interfaces - 1" access="RW" offset="0x10.0" size="0x0.16" />
 	<field name="protocol" descr="Protocol:\;0: IPv4\;1: IPv6" access="RW" enum="IPv4=0x0,IPv6=0x1" offset="0x10.28" size="0x0.1" />
-	<field name="udip" descr="If protocol is IPv4:\;The underlay destination IPv4 of the remote VTEP (the least \;significant bits)\;Else if protocol is IPv6:\;A pointer to the IPv6 address of the remote VTEP destination \;in the overlay network. See Section 13.11.19, &quot;RIPS - \;Router IP version Six Register&quot;, on page 2817.\;When protocol is IPv4 and udip=0 then no replication, the \;uirif, entry have no significance." access="RW" offset="0x14.0" size="0x4.0" />
-	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 1059" access="RW" offset="0x3C.0" size="0x0.24" />
-	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, on \;page 1060" access="RW" offset="0x3C.24" size="0x0.8" />
-	<field name="entry" descr="Entry:\;NVE - See Table 2453, &quot;TNGEE - NVE Layout,&quot; on \;page 3006\;Flex - See Table 2455, &quot;TNGEE - Flex Layout,&quot; on \;page 3007" subnode="tngee_entry_auto_ext" access="RW" offset="0x40.0" size="0x10.0" union_selector="$(parent).tunnel_type" />
+	<field name="udip" descr="If protocol is IPv4:\;The underlay destination IPv4 of the remote VTEP (the \;least significant bits)\;Else if protocol is IPv6:\;A pointer to the IPv6 address of the remote VTEP destina\;tion in the overlay network. See Section 13.11.19, &quot;RIPS \;- Router IP version Six Register&quot;, on page 2605.\;When protocol is IPv4 and udip=0 then no replication, the \;uirif, entry have no significance." access="RW" offset="0x14.0" size="0x4.0" />
+	<field name="counter_index" descr="Counter Index for flow counters\;For Spectrum: see Section 4.2, &quot;Flow Counters&quot;, on \;page 821" access="RW" offset="0x3C.0" size="0x0.24" />
+	<field name="counter_set_type" descr="Counter Set Type for flow counters\;For Spectrum: See Section 4.2.2, &quot;Counter Set Type&quot;, \;on page 822" access="RW" offset="0x3C.24" size="0x0.8" />
+	<field name="entry" descr="Entry:\;NVE - See Table 2662, &quot;TNGEE - NVE Layout,&quot; on \;page 2800\;Flex - See Table 2664, &quot;TNGEE - Flex Layout,&quot; on \;page 2801" subnode="tngee_entry_auto_ext" access="RW" offset="0x40.0" size="0x10.0" union_selector="$(parent).tunnel_type" />
 </node>
 
 <node name="tngee_flex_reg_ext" descr="" size="0x10.0" >
 	<field name="tunnel_port" descr="Tunnel port:\;(for: counters, ACL, untagged)\;For Spectrum-2:\;0: NVE \;1: for future VPLS \;2: Flex0\;3: Flex1\;" access="RW" offset="0x0.0" size="0x0.4" />
 	<field name="tqos_profile" descr="Tunnel qos profile.\;0: cap_max_tqos_profile" access="RW" offset="0x0.24" size="0x0.4" />
-	<field name="emt_pointer" descr="EMT pointer\;Range: 0 .. cap_max_emts - 1\;See FMTC, FMTE\;Note: \;Spectrum-2/3: when using this EMT other EMT is not \;allowed.\;Spectrum-4: this binding to EMT is orthogonal to ACL bind\;ing (both can happen at the same time)." access="RW" offset="0x4.0" size="0x0.8" />
+	<field name="emt_pointer" descr="EMT pointer\;Range: 0 .. cap_max_emts - 1\;See FMTC, FMTE\;Note: \;Spectrum-2/3: when using this EMT other EMT is not \;allowed.\;Spectrum-4: this binding to EMT is orthogonal to ACL \;binding (both can happen at the same time)." access="RW" offset="0x4.0" size="0x0.8" />
 	<field name="cbset_y_set_en" descr="Enable setting value on cbset_y" access="RW" offset="0x8.0" size="0x0.1" />
 	<field name="cbset_x_set_en" descr="Enable setting value on cbset_x" access="RW" offset="0x8.1" size="0x0.1" />
 	<field name="cbset_select" descr="Select cbset_x and cbset_y:\;0: cbset_x: cbset0, cbset_y: cbset1 \;1: cbset_x: cbset2, cbset_y: cbset3\;2: cbset_x: cbset4, cbset_y: cbset5\;3: cbset_x: cbset6, cbset_y: cbset7\;" access="RW" offset="0x8.8" size="0x0.2" />
@@ -7421,21 +7684,21 @@
 
 <node name="tngee_nve_ext" descr="" size="0x8.0" >
 	<field name="vni" descr="vni\;Reserved when vni_update=0" access="RW" offset="0x0.0" size="0x0.24" />
-	<field name="tqos_prof_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2579\;1: Use tqos_profile" access="OP" offset="0x0.30" size="0x0.1" />
+	<field name="tqos_prof_en" descr="0: Use FW hard-coded value. See more detail in \;Table 11.13, &quot;Tunnel QoS Profiles,&quot; on page 2368\;1: Use tqos_profile" access="OP" offset="0x0.30" size="0x0.1" />
 	<field name="vni_update" descr="0: VNI is not updated\;1: VNI is updated, to value vni\;Note that anyway there is a valid VNI value" access="RW" offset="0x0.31" size="0x0.1" />
 	<field name="tqos_profile" descr="Tunnel qos profile.\;0: cap_max_tqos_profile" access="RW" offset="0x4.0" size="0x0.4" />
 </node>
 
 <node name="tnifr_ext" descr="" size="0x60.0" >
 	<field name="tunnel_port" descr="Tunnel port:\;0: NVE\;" access="INDEX" offset="0x0.0" size="0x0.4" />
-	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that the IGCR.pisbo has no affect on \;the tunnel isolation.\;1: BRIDGE_ONLY table\;Supported only from Spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
+	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that the IGCR.pisbo has no affect \;on the tunnel isolation.\;1: BRIDGE_ONLY table\;Supported only from Spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
 	<field name="port_filter" descr="Ingress Port filter bitmask\;0: Do not filter (default value for all local_port)\;1: Filter - Packets coming from port_filter&lt;i&gt; will not be \;transmitted to port NVE\;All LAG ports must share the same configuration.\;" access="RW" high_bound="7" low_bound="0" offset="0x20.0" size="0x20.0" />
 	<field name="port_filter_update_en" descr="Port filter update enable bitmask\;0: Mask disable - do not modify relevant port_filter bit\;1: Mask enable - modify relevant port_filter bit" access="OP" high_bound="7" low_bound="0" offset="0x40.0" size="0x20.0" />
 </node>
 
 <node name="tnifr_v2_ext" descr="" size="0x120.0" >
 	<field name="tunnel_port" descr="Tunnel port:\;0: NVE\;" access="INDEX" offset="0x0.0" size="0x0.4" />
-	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that the IGCR.pisbo has no affect on \;the tunnel isolation.\;1: BRIDGE_ONLY table\;Supported only from Spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
+	<field name="table_id" descr="Table ID:\;0: GLOBAL table. Note that the IGCR.pisbo has no affect \;on the tunnel isolation.\;1: BRIDGE_ONLY table\;Supported only from Spectrum-3" access="INDEX" offset="0x0.28" size="0x0.4" />
 	<field name="port_filter" descr="Ingress Port filter bitmask\;0: Do not filter (default value for all local_port)\;1: Filter - Packets coming from port_filter&lt;i&gt; will not be \;transmitted to port NVE\;All LAG ports must share the same configuration.\;" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
 	<field name="port_filter_update_en" descr="Port filter update enable bitmask\;0: Mask disable - do not modify relevant port_filter bit\;1: Mask enable - modify relevant port_filter bit" access="OP" high_bound="31" low_bound="0" offset="0xA0.0" size="0x80.0" />
 </node>
@@ -7443,11 +7706,11 @@
 <node name="tnipsd_ext" descr="" size="0x420.0" >
 	<field name="num_rec" descr="Request: Number of records to read/add/modify/remove\;Response: Number of records read/added/replaced/\;removed\;Range 0..32" access="OP" offset="0x4.0" size="0x0.8" />
 	<field name="op" descr="" access="OP" offset="0x4.28" size="0x0.2" />
-	<field name="ipv6_id_record" descr="See Section 2481, &quot;TNIPSD - ipv6_id Layout&quot;, on \;page 3023" subnode="tnipsd_ipv6_id_record_auto_ext" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x400.0" />
+	<field name="ipv6_id_record" descr="See Section 2690, &quot;TNIPSD - ipv6_id Layout&quot;, on \;page 2820" subnode="tnipsd_ipv6_id_record_auto_ext" access="RW" high_bound="31" low_bound="0" offset="0x20.0" size="0x400.0" />
 </node>
 
 <node name="tnipsd_ipv6_id_ext" descr="" size="0x20.0" >
-	<field name="ipv6" descr="IPv6 address\;For Spectrum-2, entry in the KVH hash, see Appendix \;A.4.1.1, &quot;KVD Central Database Hash-based&quot; (page 3382)" access="INDEX" high_bound="3" low_bound="0" offset="0x0.0" size="0x10.0" />
+	<field name="ipv6" descr="IPv6 address\;For Spectrum-2, entry in the KVH hash, see Appendix \;A.4.1.1, &quot;KVD Central Database Hash-based&quot; (page 3104)" access="INDEX" high_bound="3" low_bound="0" offset="0x0.0" size="0x10.0" />
 	<field name="ipv6_id" descr="ID of the IPv6 address\;Range 0.. cap_kvd_linear_range" access="RW" offset="0x10.0" size="0x0.24" />
 </node>
 
@@ -7456,8 +7719,8 @@
 </node>
 
 <node name="tnpc_ext" descr="" size="0x1c.0" >
-	<field name="tunnel_port" descr="Tunnel port:\;0: NVE\;1: VPLS\;2: Flex_tunnel0\;3: Flex_tunnel1" access="INDEX" enum="NVE=0x0,VPLS=0x1,Flex_tunnel0=0x2,Flex_tunnel1=0x3" offset="0x0.0" size="0x0.4" />
-	<field name="learn_enable_v4" descr="When decap:\;Enable learning from tunnel port for IPv4 packets.\;\;Default is learning disabled" access="RW" offset="0x4.0" size="0x0.1" />
+	<field name="tunnel_port" descr="Tunnel port:\;0: NVE\;2: Flex_tunnel0\;3: Flex_tunnel1" access="INDEX" enum="NVE=0x0,Flex_tunnel0=0x2,Flex_tunnel1=0x3" offset="0x0.0" size="0x0.4" />
+	<field name="learn_enable_v4" descr="When decap:\;Enable learning from tunnel port for IPv4 packets.\;\;Default is learning disabled. \;Reserved for tunnel_port != NVE (0)." access="RW" offset="0x4.0" size="0x0.1" />
 	<field name="lb_tx_uc_tunnel_port" descr="For unicast packets (allow loopback from tunnel_port):\;Bit0: Allow loopback to tport0 (NVE)\;Bit1: Allow loopback to tport1 (VPLS)\;Bit2: Allow loopback to tport2 (Flex_tunnel0)\;Bit3: Allow loopback to tport3 (Flex_tunnel1)\;Values:\;0: loopback_filter\;1: loopback_allowed\;Default: tport x to tport x: filter, else allowed" access="RW" offset="0x14.0" size="0x4.0" />
 	<field name="lb_tx_mc_tunnel_port" descr="For multicast packets (allow loopback from tunnel_port):\;Bit0: Allow loopback to tport0 (NVE)\;Bit1: Allow loopback to tport1 (VPLS)\;Bit2: Allow loopback to tport2 (Flex_tunnel0)\;Bit3: Allow loopback to tport3 (Flex_tunnel1)\;Values:\;0: loopback_filter\;1: loopback_allowed\;Default: tport x to tport x: filter, else allowed" access="RW" offset="0x18.0" size="0x4.0" />
 </node>
@@ -7465,12 +7728,12 @@
 <node name="tnqcr_ext" descr="" size="0xc.0" >
 	<field name="enc_pcp_rw" descr="For encapsulation: how to handle the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Clear the pcp_rewrite_en\;3: Set the pcp_rewrite_en" access="RW" offset="0x4.0" size="0x0.2" />
 	<field name="enc_dscp_rw" descr="For encapsulation: how to handle the dscp_rewrite_en:\;0: Preserve the value of the dscp_rewrite_en\;2: Clear the dscp_rewrite_en\;3: Set the dscp_rewrite_en" access="RW" offset="0x4.2" size="0x0.2" />
-	<field name="enc_set_sp" descr="For encapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority and packet Color\;1: Set new Switch Priority and packet Color as configured by \;TNQDR.\;See Section 15.11.8, &quot;TNQDR - Tunneling NVE QoS \;Default Register&quot;, on page 3018" access="RW" offset="0x4.24" size="0x0.1" />
-	<field name="enc_set_dscp" descr="For encapsulation: how to set DSCP field:\;0: Copy the DSCP from the overlay (inner) IP header to the \;underlay (outer) IP header. If there is no IP header, use \;TNQDR.dscp\;1: Set the DSCP field as the TNQDR.dscp\;The dscp field is configured in TNQDR register. See \;Section 15.11.8, &quot;TNQDR - Tunneling NVE QoS Default \;Register&quot;, on page 3018" access="RW" offset="0x4.28" size="0x0.1" />
+	<field name="enc_set_sp" descr="For encapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority and packet Color\;1: Set new Switch Priority and packet Color as configured \;by TNQDR.\;See Section 15.11.8, &quot;TNQDR - Tunneling NVE QoS \;Default Register&quot;, on page 2812" access="RW" offset="0x4.24" size="0x0.1" />
+	<field name="enc_set_dscp" descr="For encapsulation: how to set DSCP field:\;0: Copy the DSCP from the overlay (inner) IP header to the \;underlay (outer) IP header. If there is no IP header, use \;TNQDR.dscp\;1: Set the DSCP field as the TNQDR.dscp\;The dscp field is configured in TNQDR register. See \;Section 15.11.8, &quot;TNQDR - Tunneling NVE QoS \;Default Register&quot;, on page 2812" access="RW" offset="0x4.28" size="0x0.1" />
 	<field name="dec_pcp_rw" descr="For decapsulation: how to handle the pcp_rewrite_en:\;0: Preserve the value of the pcp_rewrite_en\;2: Clear the pcp_rewrite_en\;3: Set the pcp_rewrite_en" access="RW" offset="0x8.0" size="0x0.2" />
 	<field name="dec_dscp_rw" descr="For decapsulation: how to handle the dscp_rewrite_en:\;0: Preserve the value of the dscp_rewrite_en\;2: Clear the dscp_rewrite_en\;3: Set the dscp_rewrite_en" access="RW" offset="0x8.2" size="0x0.2" />
-	<field name="dec_set_pcp" descr="For decapsulation: how to set the overlay PCP,DEI fields:\;0: Preserve/Set inner PCP,DEI when push. When untagged \;push value of 0 for PCP,DEI \;1: Copy the PCP,DEI from the underlay L2 header (default)\;Note: Spc-1 supports only &apos;1&apos; Copy\;Reserved when Spectrum" access="RW" offset="0x8.20" size="0x0.1" />
-	<field name="dec_set_sp" descr="For decapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority\;1: Set a new Switch Priority from overlay DSCP as config\;ured by RDPM (of the overlay packet, even if not routed).\;See Section 13.11.20, &quot;RDPM - Router DSCP to Priority \;Mapping Register&quot;, on page 2818." access="RW" offset="0x8.24" size="0x0.1" />
+	<field name="dec_set_pcp" descr="For decapsulation: how to set the overlay PCP,DEI fields:\;0: Preserve/Set inner PCP,DEI when push. When \;untagged push value of 0 for PCP,DEI \;1: Copy the PCP,DEI from the underlay L2 header (default)\;Note: Spc-1 supports only &apos;1&apos; Copy\;Reserved when Spectrum" access="RW" offset="0x8.20" size="0x0.1" />
+	<field name="dec_set_sp" descr="For decapsulation: how to set Switch Priority and packet \;Color:\;0: Preserve Switch Priority\;1: Set a new Switch Priority from overlay DSCP as config\;ured by RDPM (of the overlay packet, even if not routed).\;See Section 13.11.20, &quot;RDPM - Router DSCP to Prior\;ity Mapping Register&quot;, on page 2606." access="RW" offset="0x8.24" size="0x0.1" />
 	<field name="dec_set_dscp" descr="For decapsulation: how to set the overlay DSCP field, if \;exists, while stripping off the underlay headers:\;0: Preserve inner DSCP\;1: Copy the DSCP from the underlay IP header" access="RW" offset="0x8.28" size="0x0.1" />
 </node>
 
@@ -7483,11 +7746,11 @@
 </node>
 
 <node name="tnumt_ext" descr="" size="0x20.0" >
-	<field name="underlay_mc_ptr" descr="Index to the Underlay Multicast Table\;For Spectrum familiy the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)\;May point also to TNGEE\;" access="INDEX" offset="0x0.0" size="0x0.24" />
+	<field name="underlay_mc_ptr" descr="Index to the Underlay Multicast Table\;For Spectrum familiy the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)\;May point also to TNGEE" access="INDEX" offset="0x0.0" size="0x0.24" />
 	<field name="record_type" descr="0: IPv4\;1: IPv6" access="RW" enum="IPv4=0x0,IPv6=0x1" offset="0x0.28" size="0x0.4" />
-	<field name="next_underlay_mc_ptr" descr="The next index to the Underlay Multicast Table\;For Spectrum familiy the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3375)" access="RW" offset="0x4.0" size="0x0.24" />
+	<field name="next_underlay_mc_ptr" descr="The next index to the Underlay Multicast Table\;For Spectrum familiy the index is to the KVD linear, see \;Appendix A.3.1.2, &quot;KVD Central Database Linear Entries&quot; \;(page 3097)\;" access="RW" offset="0x4.0" size="0x0.24" />
 	<field name="vnext" descr="Next valid\;The next_underlay_mc_ptr is valid" access="RW" offset="0x4.31" size="0x0.1" />
-	<field name="record" descr="If type is IPV4, the record is detailed on Table 2463, \;&quot;Record - Tunnel MC IPV4 Layout,&quot; on page 3013\;If type is IPV6, the record is detailed on Table 2465, \;&quot;Record - Tunnel MC IPV6 Layout,&quot; on page 3014" subnode="tnumt_record_auto_ext" access="RW" offset="0x8.0" size="0x18.0" union_selector="$(parent).record_type" />
+	<field name="record" descr="If type is IPV4, the record is detailed on Table 2672, \;&quot;Record - Tunnel MC IPV4 Layout,&quot; on page 2807\;If type is IPV6, the record is detailed on Table 2674, \;&quot;Record - Tunnel MC IPV6 Layout,&quot; on page 2808" subnode="tnumt_record_auto_ext" access="RW" offset="0x8.0" size="0x18.0" union_selector="$(parent).record_type" />
 </node>
 
 <node name="tnumt_record_auto_ext" descr="" attr_is_union="1" size="0x18.0" >
@@ -7502,12 +7765,12 @@
 
 <node name="tunnel_mc_ipv6_ext" descr="" size="0x18.0" >
 	<field name="size" descr="Number of IP addresses in the record\;Range is 1..cap_max_nve_mc_entries_ipv6\;" access="RW" offset="0x0.0" size="0x0.3" />
-	<field name="udip_ptr" descr="The pointers to the underlay IPv6 addresses, while \;i=0..(size-1).\;udip_ptr&lt;i&gt; is reserved if i&gt;=size. \;The IPv6 addresses are configured by RIPS, see \;Section 13.11.19, &quot;RIPS - Router IP version Six Regis\;ter&quot;, on page 2817\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on page 3371" subnode="udip_ptr" access="RW" high_bound="4" low_bound="0" offset="0x4.0" size="0x14.0" />
+	<field name="udip_ptr" descr="The pointers to the underlay IPv6 addresses, while \;i=0..(size-1).\;udip_ptr&lt;i&gt; is reserved if i&gt;=size. \;The IPv6 addresses are configured by RIPS, see \;Section 13.11.19, &quot;RIPS - Router IP version Six Reg\;ister&quot;, on page 2605\;For Spectrum, the index is to the KVD linear, see \;Section A.3.1, &quot;KVD Central Database&quot;, on page 3093" subnode="udip_ptr" access="RW" high_bound="4" low_bound="0" offset="0x4.0" size="0x14.0" />
 </node>
 
 <node name="uccr_ext" descr="" size="0x8.0" >
 	<field name="side" descr="Bit 0: Host_Side\;Bit 1: Line_Side" access="INDEX" enum="Host_Side=0x1,Line_Side=0x2" offset="0x0.8" size="0x0.4" />
-	<field name="ucheck_id" descr="ucheck ID\;See Table 2587, &quot;UCheck IDs,&quot; on page 3257\;Reserved when check_id is UTCAM\;Note: the utraps are not the same as traps" access="INDEX" offset="0x4.0" size="0x0.8" />
+	<field name="ucheck_id" descr="ucheck ID\;See Table 2815, &quot;UCheck IDs,&quot; on page 2971\;Reserved when check_id is UTCAM\;Note: the utraps are not the same as traps" access="INDEX" offset="0x4.0" size="0x0.8" />
 	<field name="to_utrap" descr="Copy to utrap\;0: NOP\;1: COPY\;Reserved when forwarding = FORWARD\;Allowed for event trap" access="RW" enum="NOP=0x0,COPY=0x1" offset="0x4.16" size="0x0.2" />
 	<field name="forwarding" descr="Forwarding:\;0: FORWARD - a.k.a NOP\;1: BYPASS - a.k.a. UNCONTROLLED\;2: DISCARD\;Reserved when Event trap" access="RW" enum="FORWARD=0x0,BYPASS=0x1,DISCARD=0x2" offset="0x4.24" size="0x0.2" />
 	<field name="count_en" descr="Count enable:\;0: do not count as error\;1: do count as error\;When multiple counters on a packet then last counter \;wins, except for tcam counters which allows extra count\;ing\;Some checks have a counter which is not controlled by \;UCCR, see e.g. REPLAY_ERROR, ICV_ERROR_STRICT" access="RW" offset="0x4.28" size="0x0.1" />
@@ -7549,15 +7812,15 @@
 
 <node name="unicast_lag_ext" descr="" size="0x8.0" >
 	<field name="vid" descr="VLAN ID to be used when uvid is set. \;Reserved when uvid = 0\;Note: supported regardless of ubridge value" access="RW" offset="0x0.0" size="0x0.12" />
-	<field name="uvid" descr="Update VID. \;If set, the packet&apos;s VLAN ID is updated to vid. This can be used for \;.1D entries.\;Reserved when SwitchX/-2\;For Spectrum-2 when set_vid=0 and smpe_valid=1 then the \;smpe will modify the vid\;Note: supported regardless of ubridge value" access="RW" offset="0x0.15" size="0x0.1" />
-	<field name="lag_id" descr="LAG Identifier - pointer into the LAG descriptor table, see also \;Section 6.2.9, &quot;LAG Descriptor Table&quot;, on page 1305." access="RW" offset="0x4.0" size="0x0.10" />
+	<field name="uvid" descr="Update VID. \;If set, the packet&apos;s VLAN ID is updated to vid. This can be used \;for .1D entries.\;Reserved when SwitchX/-2\;For Spectrum-2 when set_vid=0 and smpe_valid=1 then the \;smpe will modify the vid\;Note: supported regardless of ubridge value" access="RW" offset="0x0.15" size="0x0.1" />
+	<field name="lag_id" descr="LAG Identifier - pointer into the LAG descriptor table, see also \;Section 6.2.9, &quot;LAG Descriptor Table&quot;, on page 1090." access="RW" offset="0x4.0" size="0x0.10" />
 </node>
 
 <node name="unicast_tunnel_ext" descr="" size="0x10.0" >
-	<field name="udip" descr="If gen_enc = 1:\;A pointer to the generic L2 encapsulation entry, see TNGEE\;Else If protocol is IPv4:\;The underlay destination IPv4 of the remote VTEP\;If protocol is IPv6:\;A pointer to the IPv6 address of the remote VTEP destination \;in the overlay network. See Section 13.11.19, &quot;RIPS - \;Router IP version Six Register&quot;, on page 2817" access="RW" offset="0x0.0" size="0x4.0" />
+	<field name="udip" descr="If gen_enc = 1:\;A pointer to the generic L2 encapsulation entry, see TNGEE\;Else If protocol is IPv4:\;The underlay destination IPv4 of the remote VTEP\;If protocol is IPv6:\;A pointer to the IPv6 address of the remote VTEP destination \;in the overlay network. See Section 13.14.19, &quot;RIPS - \;Router IP version Six Register&quot;, on page 2624" access="RW" offset="0x0.0" size="0x4.0" />
 	<field name="gen_enc" descr="Generic L2 encapsulation\;Reserved when Spectrum" access="RW" offset="0x4.26" size="0x0.1" />
 	<field name="protocol" descr="Protocol:\;0: IPv4\;1: IPv6" access="RW" enum="IPv4=0x0,IPv6=0x1" offset="0x4.27" size="0x0.1" />
-	<field name="tunnel_port_lbf_bitmap" descr="Tunnel port vector for the loopback filter. Bitmap:\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1\;bits4..15: reserved\;At least one bit must be set. If all bits are cleared then NVE is \;treated as set \;This is used only for loopback filter check. The check itself is \;configured by TNPC.\;Reserved when gen_enc = 0 \;" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="tunnel_port_lbf_bitmap" descr="Tunnel port vector for the loopback filter. Bitmap:\;bit0: NVE\;bit1: VPLS\;bit2: Flex_tunnel0\;bit3: Flex_tunnel1\;bits4..15: reserved\;At least one bit must be set. If all bits are cleared then NVE \;is treated as set \;This is used only for loopback filter check. The check itself is \;configured by TNPC.\;Reserved when gen_enc = 0 \;" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="ecmp_size" descr="ecmp_size is the amount of sequential entries starting from \;the\;pointer to the first TNGEE (the number of ECMPs).\;Values: 1-128, 256, 512, 1024, 2048 and 4096\;Reserved when gen_enc = 0" access="RW" offset="0xC.0" size="0x0.13" />
 </node>
 
@@ -7577,7 +7840,7 @@
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="region_id" descr="Region_id" access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="utcam_key_id" descr="Identifier of the UTCAM Key. \;See Table 2678, &quot;UTCAM key Layout,&quot; on page 3314\;The key size will be rounded up to one of the following \;values: 32B, 64B, 96B (4, 8 or 12 key blocks)" access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
+	<field name="utcam_key_id" descr="Identifier of the UTCAM Key. \;See Table 2906, &quot;UTCAM key Layout,&quot; on page 3030\;The key size will be rounded up to one of the following \;values: 32B, 64B, 96B (4, 8 or 12 key blocks)" access="RW" high_bound="3" low_bound="0" offset="0x8.0" size="0x10.0" />
 	<field name="op" descr="Operation\;0: Clear_entry\;1: Set_entry\;All others are reserved" access="OP" enum="Clear_entry=0x0,Set_entry=0x1" offset="0x18.0" size="0x0.2" />
 </node>
 
@@ -7599,7 +7862,7 @@
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="clear" descr="Clear counters" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="counter_set" descr="See Table  2706, &quot;UPCNT - Group0 Layout,&quot; on page  3333\;See Table  2708, &quot;UPCNT - Group1 Layout,&quot; on page  3335" subnode="upcnt_counter_set_auto_ext" access="RO" offset="0x8.0" size="0x60.0" union_selector="$(parent).grp" />
+	<field name="counter_set" descr="See Table  2934, &quot;UPCNT - Group0 Layout,&quot; on page  3051\;See Table  2936, &quot;UPCNT - Group1 Layout,&quot; on page  3053" subnode="upcnt_counter_set_auto_ext" access="RO" offset="0x8.0" size="0x60.0" union_selector="$(parent).grp" />
 </node>
 
 <node name="upcnt_group0_ext" descr="" size="0x50.0" >
@@ -7690,7 +7953,7 @@
 <node name="usadb_decr_gcm_aes_ext" descr="" size="0x28.0" >
 	<field name="policy" descr="Policy:\;0: Integrity only\;1: Integrity and Encryption\;Note: relevant only if UPCON.dpol" access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="rpe" descr="Replay Protect Enable" access="RW" offset="0x0.8" size="0x0.1" />
-	<field name="sci" descr="SCI, used for AES calculation\;Note: SW will usually configure the same value as was in \;UTCAM.secy" subnode="uint64" access="RW" offset="0x4.0" size="0x8.0" />
+	<field name="sci" descr="SCI, used for AES calculation\;Note: SW will usually configure the same value as was in \;UTCAM.secy" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
 	<field name="next_pn" descr="Set by user at initialization, incremented by HW after\;wards" access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="conf_offset" descr="Confidentiality offset\;Range: 0,30,50B\;Units of Bytes" access="RW" offset="0x18.0" size="0x0.8" />
 	<field name="replay_window_size" descr="Replay window size" access="RW" offset="0x1C.0" size="0x4.0" />
@@ -7701,7 +7964,7 @@
 	<field name="rpe" descr="For Decr: \;Replay Protect Enable" access="RW" offset="0x0.8" size="0x0.1" />
 	<field name="ssci" descr="SSCI" access="RW" offset="0xC.0" size="0x4.0" />
 	<field name="next_pn" descr="Set by user at initialization, incremented by HW after\;wards" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
-	<field name="salt" descr="Salt" access="RW" high_bound="2" low_bound="0" offset="0x18.0" size="0xc.0" />
+	<field name="salt" descr="Salt" access="RW" high_bound="11" low_bound="0" offset="0x18.24" size="0xc.0" />
 	<field name="replay_window_size" descr="Replay window size" access="RW" offset="0x24.0" size="0x4.0" />
 </node>
 
@@ -7711,37 +7974,37 @@
 	<field name="tci_e" descr="Set value of SecTag.Ebit\;" access="RW" offset="0x0.17" size="0x0.1" />
 	<field name="tci_sc" descr="Set value of SecTag.SC\;Informative:\;When 0: SecTag is 8B - without explicit SCI\;When 1: SecTag is 16B - with explicit SCI" access="RW" offset="0x0.18" size="0x0.1" />
 	<field name="an" descr="Set value of SecTag.AN" access="RW" offset="0x0.20" size="0x0.2" />
-	<field name="sci" descr="SCI, used for packet generation and for AES calculation" subnode="uint64" access="RW" offset="0x4.0" size="0x8.0" />
+	<field name="sci" descr="SCI, used for packet generation and for AES calculation" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
 	<field name="next_pn" descr="Set by user at initialization, incremented by HW after\;wards" access="RW" offset="0x10.0" size="0x4.0" />
 	<field name="conf_offset" descr="Confidentiality offset\;Range: 0,30,50B\;Units of Bytes" access="RW" offset="0x18.0" size="0x0.8" />
 </node>
 
-<node name="usadb_encr_gcm_aes_xpn_ext" descr="" size="0x28.0" >
+<node name="usadb_encr_gcm_aes_xpn_ext" descr="" size="0x2c.0" >
 	<field name="policy" descr="Policy:\;0: Integrity only\;1: Integrity and Encryption" access="RW" offset="0x0.0" size="0x0.1" />
 	<field name="tci_c" descr="Set value of SecTag.Cbit\;" access="RW" offset="0x0.16" size="0x0.1" />
 	<field name="tci_e" descr="Set value of SecTag.Ebit\;" access="RW" offset="0x0.17" size="0x0.1" />
 	<field name="tci_sc" descr="Set value of SecTag.SC\;Informative:\;When 0: SecTag is 8B - without explicit SCI\;When 1: SecTag is 16B - with explicit SCI" access="RW" offset="0x0.18" size="0x0.1" />
 	<field name="an" descr="Set value of SecTag.AN" access="RW" offset="0x0.20" size="0x0.2" />
-	<field name="sci" descr="SCI, used for packet generation" subnode="uint64" access="RW" offset="0x4.0" size="0x8.0" />
-	<field name="ssci" descr="SSCI" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="sci" descr="SCI, used for packet generation" subnode="uint64" access="RW" offset="0x8.0" size="0x8.0" />
 	<field name="next_pn" descr="Set by user at initialization, incremented by HW after\;wards" subnode="uint64" access="RW" offset="0x10.0" size="0x8.0" />
-	<field name="salt" descr="Salt" access="RW" high_bound="2" low_bound="0" offset="0x18.0" size="0xc.0" />
+	<field name="salt" descr="Salt" access="RW" high_bound="11" low_bound="0" offset="0x18.24" size="0xc.0" />
+	<field name="ssci" descr="SSCI" access="RW" offset="0x28.0" size="0x4.0" />
 </node>
 
-<node name="usadb_entry_auto_ext" descr="" attr_is_union="1" size="0x28.0" >
+<node name="usadb_entry_auto_ext" descr="" attr_is_union="1" size="0x2c.0" >
 	<field name="usadb_encr_gcm_aes_ext" descr="" subnode="usadb_encr_gcm_aes_ext" offset="0x0.0" selected_by="Encr_GCM_AES" size="0x28.0" />
-	<field name="usadb_encr_gcm_aes_xpn_ext" descr="" subnode="usadb_encr_gcm_aes_xpn_ext" offset="0x0.0" selected_by="Encr_GCM_AES_XPN" size="0x28.0" />
+	<field name="usadb_encr_gcm_aes_xpn_ext" descr="" subnode="usadb_encr_gcm_aes_xpn_ext" offset="0x0.0" selected_by="Encr_GCM_AES_XPN" size="0x2c.0" />
 	<field name="usadb_decr_gcm_aes_ext" descr="" subnode="usadb_decr_gcm_aes_ext" offset="0x0.0" selected_by="Decr_GCM_AES" size="0x28.0" />
 	<field name="usadb_decr_gcm_aes_xpn_ext" descr="" subnode="usadb_decr_gcm_aes_xpn_ext" offset="0x0.0" selected_by="Decr_GCM_AES_XPN" size="0x28.0" />
 </node>
 
-<node name="usadb_ext" descr="" size="0x30.0" >
+<node name="usadb_ext" descr="" size="0x34.0" >
 	<field name="sadb_entry_index" descr="SADB entry index\;Range 0.. cap_sadb_entries - 1" access="INDEX" offset="0x0.0" size="0x0.16" />
 	<field name="uengine" descr="Must be an index as provided by UPCAP" access="INDEX" offset="0x0.16" size="0x0.16" />
 	<field name="cipher_type" descr="cipher_type:\;0: Encr_GCM_AES\;1: Encr_GCM_AES_XPN\;2: Decr_GCM_AES\;3: Decr_GCM_AES_XPN" access="RW" enum="Encr_GCM_AES=0x0,Encr_GCM_AES_XPN=0x1,Decr_GCM_AES=0x2,Decr_GCM_AES_XPN=0x3" offset="0x4.0" size="0x0.2" />
 	<field name="key_size" descr="Key_size:\;0: size_128\;1: size_256" access="RW" enum="size_128=0x0,size_256=0x1" offset="0x4.4" size="0x0.1" />
 	<field name="op" descr="Operation\;0: Clear_entry\;1: Set_entry\;all other values are Reserved" access="OP" enum="Clear_entry=0x0,Set_entry=0x1" offset="0x4.12" size="0x0.2" />
-	<field name="entry" descr="Union according to cipher_type:\;See Table 2690, &quot;USADB Entry Encr GCM-AES Lay\;out,&quot; on page 3323\;Table 2692, &quot;USADB Entry Encr GCM-AES-XPN \;Layout,&quot; on page 3325\;Table 2694, &quot;USADB Entry Decr GCM-AES Layout,&quot; \;on page 3327\;Table 2696, &quot;USADB Entry Decr GCM-AES-XPN \;Layout,&quot; on page 3328" subnode="usadb_entry_auto_ext" access="RW" offset="0x8.0" size="0x28.0" union_selector="$(parent).cipher_type" />
+	<field name="entry" descr="Union according to cipher_type:\;See Table 2918, &quot;USADB Entry Encr GCM-AES Lay\;out,&quot; on page 3039\;Table 2920, &quot;USADB Entry Encr GCM-AES-XPN \;Layout,&quot; on page 3041\;Table 2922, &quot;USADB Entry Decr GCM-AES Layout,&quot; \;on page 3043\;Table 2924, &quot;USADB Entry Decr GCM-AES-XPN \;Layout,&quot; on page 3045" subnode="usadb_entry_auto_ext" access="RW" offset="0x8.0" size="0x2c.0" union_selector="$(parent).cipher_type" />
 </node>
 
 <node name="usak_ext" descr="" size="0x24.0" >
@@ -7816,9 +8079,9 @@
 	<field name="v" descr="Valid" access="RW" offset="0x4.16" size="0x0.1" />
 	<field name="lk" descr="Lookup:\;0: First_lookup\;1: Second_lookup" access="RW" enum="First_lookup=0x0,Second_lookup=0x1" offset="0x4.17" size="0x0.1" />
 	<field name="oper" descr="Operation:\;0: Write - used to write a new entry to the table. Note \;that a write with v = 0 will delete the entry\;0: Read - for a query operation\;1: Update - only sadb_entry_ptr will be in this action" access="OP" enum="Write=0x0,Read=0x0,Update=0x1" offset="0x4.24" size="0x0.3" />
-	<field name="sec_key_blocks" descr="ACL Keys\;UTCAM keys, see Table 2592, &quot;Sec2 Key Layout,&quot; on \;page 3262" access="RW" high_bound="13" low_bound="0" offset="0x8.0" size="0x38.0" />
-	<field name="mask" descr="Mask, at the same size as key. per bit:\;0: UTCAM will ignore the bit in key\;1: UTCAM will compare the bit in key" access="RW" high_bound="13" low_bound="0" offset="0x40.0" size="0x38.0" />
-	<field name="action" descr="According to lookup\;See Table 2682, &quot;UTCE First Lookup Action Layout,&quot; \;on page 3317\;See Table 2685, &quot;UTCE Second Lookup Action \;Fields,&quot; on page 3319" subnode="utce_action_auto_ext" access="RW" offset="0x78.0" size="0xc.0" union_selector="$(parent).lk" />
+	<field name="sec_key_blocks" descr="ACL Keys\;UTCAM keys, see Table 2820, &quot;Sec2 Key Layout,&quot; on \;page 2976" access="RW" high_bound="55" low_bound="0" offset="0x8.24" size="0x38.0" />
+	<field name="mask" descr="Mask, at the same size as key. per bit:\;0: UTCAM will ignore the bit in key\;1: UTCAM will compare the bit in key" access="RW" high_bound="55" low_bound="0" offset="0x40.24" size="0x38.0" />
+	<field name="action" descr="According to lookup\;See Table 2910, &quot;UTCE First Lookup Action Layout,&quot; \;on page 3033\;See Table 2913, &quot;UTCE Second Lookup Action \;Fields,&quot; on page 3035" subnode="utce_action_auto_ext" access="RW" offset="0x78.0" size="0xc.0" union_selector="$(parent).lk" />
 </node>
 
 <node name="utce_first_lookup_ext" descr="" size="0xc.0" >
@@ -7847,18 +8110,18 @@
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="pending_entries" descr="Number of pending entries\;When 0 then no more entries to read" access="RO" offset="0x4.0" size="0x0.16" />
-	<field name="ucheck_id" descr="" access="RO" offset="0x4.16" size="0x0.8" />
+	<field name="ucheck_id" descr="ucheck ID\;See Table 2815, &quot;UCheck IDs,&quot; on page 2971\;Reserved when check_id is UTCAM\;Note: the utraps are not the same as traps" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="time_stamp_sec" descr="Timestamp Sec" access="RO" offset="0x8.0" size="0x4.0" />
 	<field name="time_stamp_nsec" descr="Timestamp nSec" access="RO" offset="0xC.0" size="0x0.30" />
-	<field name="entry" descr="Entry per ucheck_id\;When ucheck_id = E0h (PN_THR) see Table 2720, &quot;UTER \;PN_THR Layout,&quot; on page 3343" access="RW" high_bound="7" low_bound="0" offset="0x10.0" size="0x20.0" />
+	<field name="entry" descr="Entry per ucheck_id\;When ucheck_id = E0h (PN_THR) see Table 2948, &quot;UTER \;PN_THR Layout,&quot; on page 3062" access="RW" high_bound="7" low_bound="0" offset="0x10.0" size="0x20.0" />
 </node>
 
-<node name="utfc_ext" descr="" size="0xc.0" >
+<node name="utfc_ext" descr="" size="0x10.0" >
 	<field name="side" descr="Bit 0: Host_Side\;Bit 1: Line_Side" access="INDEX" enum="Host_Side=0x1,Line_Side=0x2" offset="0x0.8" size="0x0.4" />
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="clear" descr="Clear counter" access="OP" offset="0x0.31" size="0x0.1" />
-	<field name="utrapf_dropped" descr="Count number of packets dropped towards the utrap \;FIFO\;Note: this counts only drops to utrap fifo due to lack of \;space in the utrap fifo." subnode="uint64" access="RO" offset="0x4.0" size="0x8.0" />
+	<field name="utrapf_dropped" descr="Count number of packets dropped towards the utrap \;FIFO\;Note: this counts only drops to utrap fifo due to lack of \;space in the utrap fifo." subnode="uint64" access="RO" offset="0x8.0" size="0x8.0" />
 </node>
 
 <node name="utfd_ext" descr="" size="0xf8.0" >
@@ -7866,7 +8129,7 @@
 	<field name="lp_msb" descr="Local port[9:8]" access="INDEX" offset="0x0.12" size="0x0.2" />
 	<field name="local_port" descr="Local port number" access="INDEX" offset="0x0.16" size="0x0.8" />
 	<field name="pending_packets" descr="Number of pending packets (including this packet)\;When 1 then no more packets to read after this packet\;When 0 then nothing to read, all rest of fields are \;reserved\;" access="RO" offset="0x4.0" size="0x0.16" />
-	<field name="ucheck_id" descr="" access="RO" offset="0x4.16" size="0x0.8" />
+	<field name="ucheck_id" descr="ucheck ID\;See Table 2815, &quot;UCheck IDs,&quot; on page 2971\;Reserved when check_id is UTCAM\;Note: the utraps are not the same as traps" access="RO" offset="0x4.16" size="0x0.8" />
 	<field name="frag_size" descr="Number of bytes in the last frag\;Reserved when frag != 2 or 3" access="RO" offset="0x8.0" size="0x0.10" />
 	<field name="frag_type" descr="fragment type:\;0: first_fragment - start of packet\;1: middle_fragment\;2: last_fragment - end of packet\;3: start_and_end - packet is 1 fragment only" access="RO" enum="first_fragment=0x0,middle_fragment=0x1,last_fragment=0x2,start_and_end=0x3" offset="0x8.16" size="0x0.2" />
 	<field name="time_stamp_sec" descr="Timestamp Sec" access="RO" offset="0xC.0" size="0x4.0" />
@@ -7886,73 +8149,21 @@
 </node>
 
 <node name="vlan_router_interface_ext" descr="" size="0x18.0" >
-	<field name="vlan_id" descr="VLAN ID\;Note: when ubridge = 1 this is the egress-router-vid. \;" access="RW" offset="0x0.0" size="0x0.12" />
+	<field name="vlan_id" descr="VLAN ID\;Note: when ubridge = 1 this is the egress-router-\;vid. \;" access="RW" offset="0x0.0" size="0x0.12" />
 	<field name="swid" descr="Switch Partition ID" access="RW" offset="0x0.24" size="0x0.8" />
 	<field name="efid" descr="Egress FID\;Used to connect the rif to a bridge \;Reserved when ubridge = 0\;Reserved when Spectrum\;" access="RW" offset="0x4.0" size="0x0.16" />
-	<field name="router_interface_mac_47_32" descr="Router interface MAC address.\;Note: for SwitchX/-2 all router interfaces on the \;same switch partition MUST have the same MAC \;address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses per mac_\;profile_id must have the same 36 MSBits" access="RW" offset="0x8.0" size="0x0.16" />
+	<field name="router_interface_mac_47_32" descr="Router interface MAC address.\;Note: for SwitchX/-2 all router interfaces on the \;same switch partition MUST have the same MAC \;address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses per \;mac_profile_id must have the same 36 MSBits" access="RW" offset="0x8.0" size="0x0.16" />
 	<field name="mac_profile_id" descr="MAC msb profile ID\;range 0 .. cap_max_rif_mac_profile-1\;Reserved when Spectrum" access="RW" offset="0x8.16" size="0x0.4" />
-	<field name="router_interface_mac_31_0" descr="Router interface MAC address.\;Note: for SwitchX/-2 all router interfaces on the \;same switch partition MUST have the same MAC \;address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses per mac_\;profile_id must have the same 36 MSBits" access="RW" offset="0xC.0" size="0x4.0" />
-	<field name="vrrp_id_ipv4" descr="VRRP ID for IPv4\;Reserved when SwitchX/-2. The MAC address should \;be entered to the FDB" access="RW" offset="0x14.0" size="0x0.8" />
-	<field name="vrrp_id_ipv6" descr="VRRP ID for IPv6\;Reserved when SwitchX/-2. The MAC address should \;be entered to the FDB" access="RW" offset="0x14.8" size="0x0.8" />
-</node>
-
-<node name="xgcr_ext" descr="" size="0x8.0" >
-	<field name="mtm" descr="M-Table mode:\;0: Linear mapping of dip to M-Table Index (default)\;1: Hash#1 mapping of dip to M-Table Index" access="RW" offset="0x4.0" size="0x0.4" />
-</node>
-
-<node name="xlkbu_ext" descr="" size="0x140.0" >
-	<field name="data_type" descr="Data type:\;0: KVH Single\;1: KVH Double" access="OP" offset="0x4.0" size="0x0.4" />
-	<field name="value" descr="Seek for entry that matches value where mask bits are &apos;1&apos;" access="OP" high_bound="15" low_bound="0" offset="0x40.0" size="0x40.0" />
-	<field name="mask" descr="Seek for entry that matches value where mask bits are &apos;1&apos;" access="OP" high_bound="15" low_bound="0" offset="0x80.0" size="0x40.0" />
-	<field name="new_value" descr="For matched entries, update entry to new_value where \;new_value_mask bits are &apos;1&apos;" access="OP" high_bound="15" low_bound="0" offset="0xC0.0" size="0x40.0" />
-	<field name="new_value_mask" descr="For matched entries, update entry to new_value where \;new_value_mask bits are &apos;1&apos;" access="OP" high_bound="15" low_bound="0" offset="0x100.0" size="0x40.0" />
-</node>
-
-<node name="xltq_ext" descr="" size="0x2c.0" >
-	<field name="xm_device_id" descr="XM device ID\;Value of &apos;0&apos; when no known XLT device\;ID 0xCF71 for XLT\;" access="RO" offset="0x4.0" size="0x0.16" />
-	<field name="xlt_cap_mask0" descr="Capability mask:\;bit0: IPv4 LPM (a.k.a. XRT)\;bit1: IPv6 LPM (a.k.a. XRT)\;" access="RO" offset="0x10.0" size="0x4.0" />
-	<field name="cap_xlt_entries" descr="Number of XLT entries\;Note: SW must not fill more than 80% in order to avoid over\;flow\;" access="RO" offset="0x20.0" size="0x4.0" />
-	<field name="cap_xlt_mtable" descr="XLT M-Table max size\;" access="RO" offset="0x24.0" size="0x4.0" />
-	<field name="cap_xlt_shspm_max_trees" descr="Number of LPM trees in the XLT\;" access="RO" offset="0x28.0" size="0x4.0" />
-</node>
-
-<node name="xmdr_ext" descr="" size="0xa0.0" >
-	<field name="num_rec" descr="Number of records for Direct access to XM\;Supported: 0...4 commands (except NOP which is a filler)\;0 commands is reserved when bulk_entry = 1. \;0 commands is allowed when bulk_entry = 0 for immediate \;XRT-cache fluch." access="OP" offset="0x4.0" size="0x0.4" />
-	<field name="reply_vect" descr="Reply Vector\;Bit i for command index i+1\;values per bit:\;0: failed\;1: succeeded\;e.g. if commands 1,2,4 succeeded and command 3 failed \;then binary value will be 0b1011" access="RO" offset="0x8.0" size="0x0.4" />
-	<field name="transaction" descr="Transaction, 128B.\;See Appendix B, &quot;eXtended Mezzanine (XM)&quot; (page 3410)" access="WO" high_bound="31" low_bound="0" offset="0x20.0" size="0x80.0" />
-</node>
-
-<node name="xralst_ext" descr="" size="0x108.0" >
-	<field name="tree_id" descr="Tree identifier numbered from 1..(cap_xlt_shspm_max_trees-\;1)." access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="root_bin" descr="The bin number of the root bin. \;0&lt;root_bin=&lt;(length of IP address)\;For a default-route tree configure 0xff" access="RW" offset="0x4.16" size="0x0.8" />
-	<field name="bin" descr="Holding the childs of the bin according to the stored tree&apos;s \;structure. The most significant byte is the bin&apos;s number of the \;left child and the least significant byte holds the right child. \;See Table 2584, &quot;bin Layout,&quot; on page 3165. \;0xFF indicates that there is no child. For trees composed of \;less than 4 blocks, the bins in excess are reserved.\;Note that tree_id 0 is allocated for a default-route tree, bins \;are 0xff" access="RW" high_bound="128" low_bound="1" offset="0x8.16" size="0x100.0" />
-</node>
-
-<node name="xralta_ext" descr="" size="0x8.0" >
-	<field name="tree_id" descr="An identifier (numbered from 1..cap_xlt_shspm_max_trees-\;1) representing the tree identifier (managed by software).\;Note that tree_id 0 is allocated for a default-route tree" access="INDEX" offset="0x4.0" size="0x0.8" />
-	<field name="protocol" descr="Protocol:\;0: Unicast IPv4\;1: Unicast IPv6\;Reserved when op = 1 (deallocate a tree)." access="RW" offset="0x4.24" size="0x0.4" />
-	<field name="op" descr="opcode (valid for Write, must be 0 on Read)\;0: allocate a tree\;1: deallocate a tree" access="OP" offset="0x4.28" size="0x0.2" />
-</node>
-
-<node name="xraltb_ext" descr="" size="0x8.0" >
-	<field name="tree_id" descr="Tree to be used for the {virtual_router, protocol}\;Tree identifier numbered from 1..(cap_xlt_shspm_max\;_trees-1).\;By default, all Unicast IPv4 and IPv6 are bound to tree_id 0" access="RW" offset="0x4.0" size="0x0.8" />
-	<field name="protocol" descr="Protocol. \;0: Unicast IPv4\;1: Unicast IPv6" access="INDEX" offset="0x4.12" size="0x0.4" />
-	<field name="virtual_router" descr="Virtual Router ID\;Range is 0..cap_max_virtual_routers-1" access="INDEX" offset="0x4.16" size="0x0.16" />
-</node>
-
-<node name="xrmt_ext" descr="" size="0x14.0" >
-	<field name="index" descr="Index in M-Table\;Range 0..cap_xlt_mtable-1" access="INDEX" offset="0x4.0" size="0x0.20" />
-	<field name="l1_vec" descr="" access="RW" offset="0x10.0" size="0x0.8" />
-	<field name="l1_val" descr="" access="RW" offset="0x10.8" size="0x0.8" />
-	<field name="l0_vec" descr="" access="RW" offset="0x10.16" size="0x0.8" />
-	<field name="l0_val" descr="" access="RW" offset="0x10.24" size="0x0.8" />
+	<field name="router_interface_mac_31_0" descr="Router interface MAC address.\;Note: for SwitchX/-2 all router interfaces on the \;same switch partition MUST have the same MAC \;address. \;In Spectrum device, all MAC addresses must have \;the same 38 MSBits\;In Spectrum-2 device, all MAC addresses per \;mac_profile_id must have the same 36 MSBits" access="RW" offset="0xC.0" size="0x4.0" />
+	<field name="vrrp_id_ipv4" descr="VRRP ID for IPv4\;Reserved when SwitchX/-2. The MAC address \;should be entered to the FDB" access="RW" offset="0x14.0" size="0x0.8" />
+	<field name="vrrp_id_ipv6" descr="VRRP ID for IPv6\;Reserved when SwitchX/-2. The MAC address \;should be entered to the FDB" access="RW" offset="0x14.8" size="0x0.8" />
 </node>
 
-<node name="root" size="0x2dd0.0" descr="" >
-	<field name="register_access_table_switch_ext_Nodes" offset="0x0.0" size="0x2dd0.0" subnode="register_access_table_switch_ext_Nodes" descr="" />
+<node name="root" size="0x4d0.0" descr="" >
+	<field name="register_access_table_switch_ext_Nodes" offset="0x0.0" size="0x4d0.0" subnode="register_access_table_switch_ext_Nodes" descr="" />
 </node>
 
-<node name="register_access_table_switch_ext_Nodes" size="0x2dd0.0" attr_is_union="1" descr="" >
-	<field name="access_reg_summary_selector_ext" offset="0x0.0" size="0x2dd0.0" subnode="access_reg_summary_selector_ext" descr="" />
+<node name="register_access_table_switch_ext_Nodes" size="0x4d0.0" attr_is_union="1" descr="" >
+	<field name="access_reg_summary_selector_ext" offset="0x0.0" size="0x4d0.0" subnode="access_reg_summary_selector_ext" descr="" />
 </node>
 </NodesDefinition>
diff --git a/tools_layouts/reg_access_hca_layouts.c b/tools_layouts/reg_access_hca_layouts.c
index e157ec4a..559487a7 100644
--- a/tools_layouts/reg_access_hca_layouts.c
+++ b/tools_layouts/reg_access_hca_layouts.c
@@ -65,11 +65,7 @@ void reg_access_hca_lock_source_general_semaphore_print(const struct reg_access_
     fprintf(fd, "======== reg_access_hca_lock_source_general_semaphore ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ?
-               ("QPC_GW") :
-               ((ptr_struct->type == 1 ? ("CQE_GW") : ((ptr_struct->type == 2 ? ("EQE_GW") : ((ptr_struct->type == 3 ? ("MEM_GW") : ((ptr_struct->type == 4 ? ("IPC") : ("unknown")))))))))),
-            ptr_struct->type);
+	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("QPC_GW") : ((ptr_struct->type == 1 ? ("CQE_GW") : ((ptr_struct->type == 2 ? ("EQE_GW") : ((ptr_struct->type == 3 ? ("MEM_GW") : ((ptr_struct->type == 4 ? ("IPC") : ("unknown")))))))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "log_toggle_cycle     : " UH_FMT "\n", ptr_struct->log_toggle_cycle);
 }
@@ -171,18 +167,7 @@ void reg_access_hca_lock_source_uapp_resource_print(const struct reg_access_hca_
     fprintf(fd, "======== reg_access_hca_lock_source_uapp_resource ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ?
-               ("UAPP_QP") :
-               ((ptr_struct->type == 1 ?
-                   ("SRQ") :
-                   ((ptr_struct->type == 2 ?
-                       ("UAPP_SRQ_META") :
-                       ((ptr_struct->type == 3 ?
-                           ("UAPP_RES_CQ") :
-                           ((ptr_struct->type == 4 ? ("UAPP_REQ_CQ") :
-                                                     ((ptr_struct->type == 5 ? ("UAPP_EQ") : ((ptr_struct->type == 6 ? ("NSQ") : ((ptr_struct->type == 7 ? ("NCQ") : ("unknown")))))))))))))))),
-            ptr_struct->type);
+	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("UAPP_QP") : ((ptr_struct->type == 1 ? ("SRQ") : ((ptr_struct->type == 2 ? ("UAPP_SRQ_META") : ((ptr_struct->type == 3 ? ("UAPP_RES_CQ") : ((ptr_struct->type == 4 ? ("UAPP_REQ_CQ") : ((ptr_struct->type == 5 ? ("UAPP_EQ") : ((ptr_struct->type == 6 ? ("NSQ") : ((ptr_struct->type == 7 ? ("NCQ") : ("unknown")))))))))))))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "gvmi                 : " UH_FMT "\n", ptr_struct->gvmi);
     adb2c_add_indentation(fd, indent_level);
@@ -211,9 +196,7 @@ void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpa
     reg_access_hca_lock_source_general_semaphore_unpack(&(ptr_struct->lock_source_general_semaphore), ptr_buff);
 }
 
-void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-                                                                                  FILE* fd,
-                                                                                  int indent_level)
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, FILE *fd, int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto ========\n");
@@ -341,9 +324,7 @@ void reg_access_hca_lock_source_stop_toggle_modifier_print(const struct reg_acce
     fprintf(fd, "======== reg_access_hca_lock_source_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "category             : %s (" UH_FMT ")\n",
-            (ptr_struct->category == 0 ? ("GENERAL_SEMAPHORE") : ((ptr_struct->category == 1 ? ("ICM_RESOURCE") : ((ptr_struct->category == 2 ? ("UAPP_RESOURCE") : ("unknown")))))),
-            ptr_struct->category);
+	fprintf(fd, "category             : %s (" UH_FMT ")\n", (ptr_struct->category == 0 ? ("GENERAL_SEMAPHORE") : ((ptr_struct->category == 1 ? ("ICM_RESOURCE") : ((ptr_struct->category == 2 ? ("UAPP_RESOURCE") : ("unknown")))))), ptr_struct->category);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "category_modifier:\n");
     reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(&(ptr_struct->category_modifier), fd, indent_level + 1);
@@ -756,8 +737,7 @@ void reg_access_hca_packet_drop_mini_flow_modifier_print(const struct reg_access
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "num_packets          : " UH_FMT "\n", ptr_struct->num_packets);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
-            ptr_struct->port_number);
+	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_packet_drop_mini_flow_modifier_size(void)
@@ -796,23 +776,9 @@ void reg_access_hca_pause_tx_stop_toggle_modifier_print(const struct reg_access_
     fprintf(fd, "======== reg_access_hca_pause_tx_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "sl_prio_mask         : %s (" UH_FMT ")\n",
-            (ptr_struct->sl_prio_mask == 1 ?
-               ("SL_PRIO_0") :
-               ((ptr_struct->sl_prio_mask == 2 ?
-                   ("SL_PRIO_1") :
-                   ((ptr_struct->sl_prio_mask == 4 ?
-                       ("SL_PRIO_2") :
-                       ((ptr_struct->sl_prio_mask == 8 ?
-                           ("SL_PRIO_3") :
-                           ((ptr_struct->sl_prio_mask == 16 ?
-                               ("SL_PRIO_4") :
-                               ((ptr_struct->sl_prio_mask == 32 ? ("SL_PRIO_5") :
-                                                                  ((ptr_struct->sl_prio_mask == 64 ? ("SL_PRIO_6") : ((ptr_struct->sl_prio_mask == 128 ? ("SL_PRIO_7") : ("unknown")))))))))))))))),
-            ptr_struct->sl_prio_mask);
+	fprintf(fd, "sl_prio_mask         : %s (" UH_FMT ")\n", (ptr_struct->sl_prio_mask == 1 ? ("SL_PRIO_0") : ((ptr_struct->sl_prio_mask == 2 ? ("SL_PRIO_1") : ((ptr_struct->sl_prio_mask == 4 ? ("SL_PRIO_2") : ((ptr_struct->sl_prio_mask == 8 ? ("SL_PRIO_3") : ((ptr_struct->sl_prio_mask == 16 ? ("SL_PRIO_4") : ((ptr_struct->sl_prio_mask == 32 ? ("SL_PRIO_5") : ((ptr_struct->sl_prio_mask == 64 ? ("SL_PRIO_6") : ((ptr_struct->sl_prio_mask == 128 ? ("SL_PRIO_7") : ("unknown")))))))))))))))), ptr_struct->sl_prio_mask);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
-            ptr_struct->port_number);
+	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_pause_tx_stop_toggle_modifier_size(void)
@@ -898,25 +864,9 @@ void reg_access_hca_rxb_hang_stop_toggle_modifier_print(const struct reg_access_
     fprintf(fd, "======== reg_access_hca_rxb_hang_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
-            (ptr_struct->vl_tc_mask == 1 ?
-               ("VL_TC_0") :
-               ((ptr_struct->vl_tc_mask == 2 ?
-                   ("VL_TC_1") :
-                   ((ptr_struct->vl_tc_mask == 4 ?
-                       ("VL_TC_2") :
-                       ((ptr_struct->vl_tc_mask == 8 ?
-                           ("VL_TC_3") :
-                           ((ptr_struct->vl_tc_mask == 16 ?
-                               ("VL_TC_4") :
-                               ((ptr_struct->vl_tc_mask == 32 ?
-                                   ("VL_TC_5") :
-                                   ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") :
-                                                                    ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
-            ptr_struct->vl_tc_mask);
+	fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n", (ptr_struct->vl_tc_mask == 1 ? ("VL_TC_0") : ((ptr_struct->vl_tc_mask == 2 ? ("VL_TC_1") : ((ptr_struct->vl_tc_mask == 4 ? ("VL_TC_2") : ((ptr_struct->vl_tc_mask == 8 ? ("VL_TC_3") : ((ptr_struct->vl_tc_mask == 16 ? ("VL_TC_4") : ((ptr_struct->vl_tc_mask == 32 ? ("VL_TC_5") : ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") : ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))), ptr_struct->vl_tc_mask);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
-            ptr_struct->port_number);
+	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_rxb_hang_stop_toggle_modifier_size(void)
@@ -959,27 +909,11 @@ void reg_access_hca_rxp_hang_stop_toggle_modifier_print(const struct reg_access_
     fprintf(fd, "======== reg_access_hca_rxp_hang_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n",
-            (ptr_struct->vl_tc_mask == 1 ?
-               ("VL_TC_0") :
-               ((ptr_struct->vl_tc_mask == 2 ?
-                   ("VL_TC_1") :
-                   ((ptr_struct->vl_tc_mask == 4 ?
-                       ("VL_TC_2") :
-                       ((ptr_struct->vl_tc_mask == 8 ?
-                           ("VL_TC_3") :
-                           ((ptr_struct->vl_tc_mask == 16 ?
-                               ("VL_TC_4") :
-                               ((ptr_struct->vl_tc_mask == 32 ?
-                                   ("VL_TC_5") :
-                                   ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") :
-                                                                    ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))),
-            ptr_struct->vl_tc_mask);
+	fprintf(fd, "vl_tc_mask           : %s (" UH_FMT ")\n", (ptr_struct->vl_tc_mask == 1 ? ("VL_TC_0") : ((ptr_struct->vl_tc_mask == 2 ? ("VL_TC_1") : ((ptr_struct->vl_tc_mask == 4 ? ("VL_TC_2") : ((ptr_struct->vl_tc_mask == 8 ? ("VL_TC_3") : ((ptr_struct->vl_tc_mask == 16 ? ("VL_TC_4") : ((ptr_struct->vl_tc_mask == 32 ? ("VL_TC_5") : ((ptr_struct->vl_tc_mask == 64 ? ("VL_TC_6") : ((ptr_struct->vl_tc_mask == 128 ? ("VL_TC_7") : ((ptr_struct->vl_tc_mask == 32768 ? ("VL_TC_15") : ("unknown")))))))))))))))))), ptr_struct->vl_tc_mask);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pnat                 : " UH_FMT "\n", ptr_struct->pnat);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
-            ptr_struct->port_number);
+	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_rxp_hang_stop_toggle_modifier_size(void)
@@ -1014,8 +948,7 @@ void reg_access_hca_sxp_hang_stop_toggle_modifier_print(const struct reg_access_
     fprintf(fd, "======== reg_access_hca_sxp_hang_stop_toggle_modifier ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))),
-            ptr_struct->port_number);
+	fprintf(fd, "port_number          : %s (" UH_FMT ")\n", (ptr_struct->port_number == 1 ? ("port_number1") : ((ptr_struct->port_number == 2 ? ("port_number2") : ("unknown")))), ptr_struct->port_number);
 }
 
 unsigned int reg_access_hca_sxp_hang_stop_toggle_modifier_size(void)
@@ -1360,12 +1293,8 @@ void reg_access_hca_mgir_hardware_info_pack(const struct reg_access_hca_mgir_har
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->hw_dev_id);
     offset = 144;
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->manufacturing_base_mac_47_32);
-    offset = 128;
-    adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->module_base);
     offset = 160;
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->manufacturing_base_mac_31_0);
-    offset = 192;
-    adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->associated_module_id_31_0);
     offset = 224;
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->uptime);
 }
@@ -1388,12 +1317,8 @@ void reg_access_hca_mgir_hardware_info_unpack(struct reg_access_hca_mgir_hardwar
     ptr_struct->hw_dev_id = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
     offset = 144;
     ptr_struct->manufacturing_base_mac_47_32 = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
-    offset = 128;
-    ptr_struct->module_base = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
     offset = 160;
     ptr_struct->manufacturing_base_mac_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
-    offset = 192;
-    ptr_struct->associated_module_id_31_0 = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
     offset = 224;
     ptr_struct->uptime = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
@@ -1418,12 +1343,8 @@ void reg_access_hca_mgir_hardware_info_print(const struct reg_access_hca_mgir_ha
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "manufacturing_base_mac_47_32 : " UH_FMT "\n", ptr_struct->manufacturing_base_mac_47_32);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "module_base          : " UH_FMT "\n", ptr_struct->module_base);
-    adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "manufacturing_base_mac_31_0 : " U32H_FMT "\n", ptr_struct->manufacturing_base_mac_31_0);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "associated_module_id_31_0 : " U32H_FMT "\n", ptr_struct->associated_module_id_31_0);
-    adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "uptime               : " U32H_FMT "\n", ptr_struct->uptime);
 }
 
@@ -1890,30 +1811,7 @@ void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struc
     fprintf(fd, "======== reg_access_hca_mcc_reg ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "instruction          : %s (" UH_FMT ")\n",
-            (ptr_struct->instruction == 1 ?
-               ("LOCK_UPDATE_HANDLE") :
-               ((ptr_struct->instruction == 2 ?
-                   ("RELEASE_UPDATE_HANDLE") :
-                   ((ptr_struct->instruction == 3 ?
-                       ("UPDATE_COMPONENT") :
-                       ((ptr_struct->instruction == 4 ?
-                           ("VERIFY_COMPONENT") :
-                           ((ptr_struct->instruction == 5 ?
-                               ("ACTIVATE_COMPONENET") :
-                               ((ptr_struct->instruction == 6 ?
-                                   ("ACTIVATE") :
-                                   ((ptr_struct->instruction == 7 ?
-                                       ("READ_COMPONENT") :
-                                       ((ptr_struct->instruction == 8 ?
-                                           ("CANCEL") :
-                                           ((ptr_struct->instruction == 9 ?
-                                               ("CHECK_UPDATE_HANDLE") :
-                                               ((ptr_struct->instruction == 10 ?
-                                                   ("FORCE_HANDLE_RELEASE") :
-                                                   ((ptr_struct->instruction == 11 ? ("READ_PENDING_COMPONENT") :
-                                                                                     ((ptr_struct->instruction == 12 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))))))),
-            ptr_struct->instruction);
+	fprintf(fd, "instruction          : %s (" UH_FMT ")\n", (ptr_struct->instruction == 1 ? ("LOCK_UPDATE_HANDLE") : ((ptr_struct->instruction == 2 ? ("RELEASE_UPDATE_HANDLE") : ((ptr_struct->instruction == 3 ? ("UPDATE_COMPONENT") : ((ptr_struct->instruction == 4 ? ("VERIFY_COMPONENT") : ((ptr_struct->instruction == 5 ? ("ACTIVATE_COMPONENET") : ((ptr_struct->instruction == 6 ? ("ACTIVATE") : ((ptr_struct->instruction == 7 ? ("READ_COMPONENT") : ((ptr_struct->instruction == 8 ? ("CANCEL") : ((ptr_struct->instruction == 9 ? ("CHECK_UPDATE_HANDLE") : ((ptr_struct->instruction == 10 ? ("FORCE_HANDLE_RELEASE") : ((ptr_struct->instruction == 11 ? ("READ_PENDING_COMPONENT") : ((ptr_struct->instruction == 12 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))))))), ptr_struct->instruction);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "activation_delay_sec : " UH_FMT "\n", ptr_struct->activation_delay_sec);
     adb2c_add_indentation(fd, indent_level);
@@ -1925,25 +1823,7 @@ void reg_access_hca_mcc_reg_print(const struct reg_access_hca_mcc_reg* ptr_struc
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "auto_update          : " UH_FMT "\n", ptr_struct->auto_update);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "control_state        : %s (" UH_FMT ")\n",
-            (ptr_struct->control_state == 0 ?
-               ("IDLE") :
-               ((ptr_struct->control_state == 1 ?
-                   ("LOCKED") :
-                   ((ptr_struct->control_state == 2 ?
-                       ("INITIALIZE") :
-                       ((ptr_struct->control_state == 3 ?
-                           ("DOWNLOAD") :
-                           ((ptr_struct->control_state == 4 ?
-                               ("VERIFY") :
-                               ((ptr_struct->control_state == 5 ?
-                                   ("APPLY") :
-                                   ((ptr_struct->control_state == 6 ?
-                                       ("ACTIVATE") :
-                                       ((ptr_struct->control_state == 7 ?
-                                           ("UPLOAD") :
-                                           ((ptr_struct->control_state == 8 ? ("UPLOAD_PENDING") : ((ptr_struct->control_state == 9 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))),
-            ptr_struct->control_state);
+	fprintf(fd, "control_state        : %s (" UH_FMT ")\n", (ptr_struct->control_state == 0 ? ("IDLE") : ((ptr_struct->control_state == 1 ? ("LOCKED") : ((ptr_struct->control_state == 2 ? ("INITIALIZE") : ((ptr_struct->control_state == 3 ? ("DOWNLOAD") : ((ptr_struct->control_state == 4 ? ("VERIFY") : ((ptr_struct->control_state == 5 ? ("APPLY") : ((ptr_struct->control_state == 6 ? ("ACTIVATE") : ((ptr_struct->control_state == 7 ? ("UPLOAD") : ((ptr_struct->control_state == 8 ? ("UPLOAD_PENDING") : ((ptr_struct->control_state == 9 ? ("DOWNSRTEAM_DEVICE_TRANSFER") : ("unknown")))))))))))))))))))), ptr_struct->control_state);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "error_code           : " UH_FMT "\n", ptr_struct->error_code);
     adb2c_add_indentation(fd, indent_level);
@@ -2142,11 +2022,7 @@ void reg_access_hca_mcqi_reg_print(const struct reg_access_hca_mcqi_reg* ptr_str
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "device_type          : " UH_FMT "\n", ptr_struct->device_type);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "info_type            : %s (" UH_FMT ")\n",
-            (ptr_struct->info_type == 0 ?
-               ("CAPABILITIES") :
-               ((ptr_struct->info_type == 1 ? ("VERSION") : ((ptr_struct->info_type == 5 ? ("ACTIVATION_METHOD") : ((ptr_struct->info_type == 6 ? ("LINKX_PROPERTIES") : ("unknown")))))))),
-            ptr_struct->info_type);
+	fprintf(fd, "info_type            : %s (" UH_FMT ")\n", (ptr_struct->info_type == 0 ? ("CAPABILITIES") : ((ptr_struct->info_type == 1 ? ("VERSION") : ((ptr_struct->info_type == 5 ? ("ACTIVATION_METHOD") : ((ptr_struct->info_type == 6 ? ("LINKX_PROPERTIES") : ("unknown")))))))), ptr_struct->info_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "info_size            : " U32H_FMT "\n", ptr_struct->info_size);
     adb2c_add_indentation(fd, indent_level);
@@ -2254,47 +2130,11 @@ void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg* ptr_str
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "last_index_flag      : " UH_FMT "\n", ptr_struct->last_index_flag);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "identifier           : %s (" UH_FMT ")\n",
-            (ptr_struct->identifier == 1 ?
-               ("BOOT_IMG") :
-               ((ptr_struct->identifier == 4 ?
-                   ("OEM_NVCONFIG") :
-                   ((ptr_struct->identifier == 5 ?
-                       ("MLNX_NVCONFIG") :
-                       ((ptr_struct->identifier == 6 ?
-                           ("CS_TOKEN") :
-                           ((ptr_struct->identifier == 7 ?
-                               ("DBG_TOKEN") :
-                               ((ptr_struct->identifier == 10 ?
-                                   ("Gearbox") :
-                                   ((ptr_struct->identifier == 11 ?
-                                       ("CC_ALGO") :
-                                       ((ptr_struct->identifier == 12 ?
-                                           ("LINKX_IMG") :
-                                           ((ptr_struct->identifier == 13 ?
-                                               ("CRYPTO_TO_COMMISSIONING") :
-                                               ((ptr_struct->identifier == 14 ? ("RMCS_TOKEN") : ((ptr_struct->identifier == 15 ? ("RMDT_TOKEN") : ("unknown")))))))))))))))))))))),
-            ptr_struct->identifier);
-    adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "component_update_state : %s (" UH_FMT ")\n",
-            (ptr_struct->component_update_state == 0 ?
-               ("IDLE") :
-               ((ptr_struct->component_update_state == 1 ?
-                   ("IN_PROGRESS") :
-                   ((ptr_struct->component_update_state == 2 ?
-                       ("APPLIED") :
-                       ((ptr_struct->component_update_state == 3 ?
-                           ("ACTIVE") :
-                           ((ptr_struct->component_update_state == 4 ?
-                               ("ACTIVE_PENDING_RESET") :
-                               ((ptr_struct->component_update_state == 5 ?
-                                   ("FAILED") :
-                                   ((ptr_struct->component_update_state == 6 ? ("CANCELED") : ((ptr_struct->component_update_state == 7 ? ("BUSY") : ("unknown")))))))))))))))),
-            ptr_struct->component_update_state);
-    adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "component_status     : %s (" UH_FMT ")\n",
-            (ptr_struct->component_status == 0 ? ("NOT_PRESENT") : ((ptr_struct->component_status == 1 ? ("PRESENT") : ((ptr_struct->component_status == 2 ? ("IN_USE") : ("unknown")))))),
-            ptr_struct->component_status);
+	fprintf(fd, "identifier           : %s (" UH_FMT ")\n", (ptr_struct->identifier == 1 ? ("BOOT_IMG") : ((ptr_struct->identifier == 4 ? ("OEM_NVCONFIG") : ((ptr_struct->identifier == 5 ? ("MLNX_NVCONFIG") : ((ptr_struct->identifier == 6 ? ("CS_TOKEN") : ((ptr_struct->identifier == 7 ? ("DBG_TOKEN") : ((ptr_struct->identifier == 10 ? ("Gearbox") : ((ptr_struct->identifier == 11 ? ("CC_ALGO") : ((ptr_struct->identifier == 12 ? ("LINKX_IMG") : ((ptr_struct->identifier == 13 ? ("CRYPTO_TO_COMMISSIONING") : ((ptr_struct->identifier == 14 ? ("RMCS_TOKEN") : ((ptr_struct->identifier == 15 ? ("RMDT_TOKEN") : ("unknown")))))))))))))))))))))), ptr_struct->identifier);
+    adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "component_update_state : %s (" UH_FMT ")\n", (ptr_struct->component_update_state == 0 ? ("IDLE") : ((ptr_struct->component_update_state == 1 ? ("IN_PROGRESS") : ((ptr_struct->component_update_state == 2 ? ("APPLIED") : ((ptr_struct->component_update_state == 3 ? ("ACTIVE") : ((ptr_struct->component_update_state == 4 ? ("ACTIVE_PENDING_RESET") : ((ptr_struct->component_update_state == 5 ? ("FAILED") : ((ptr_struct->component_update_state == 6 ? ("CANCELED") : ((ptr_struct->component_update_state == 7 ? ("BUSY") : ("unknown")))))))))))))))), ptr_struct->component_update_state);
+    adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "component_status     : %s (" UH_FMT ")\n", (ptr_struct->component_status == 0 ? ("NOT_PRESENT") : ((ptr_struct->component_status == 1 ? ("PRESENT") : ((ptr_struct->component_status == 2 ? ("IN_USE") : ("unknown")))))), ptr_struct->component_status);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "progress             : " UH_FMT "\n", ptr_struct->progress);
     adb2c_add_indentation(fd, indent_level);
@@ -2302,17 +2142,7 @@ void reg_access_hca_mcqs_reg_print(const struct reg_access_hca_mcqs_reg* ptr_str
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "last_update_state_changer_host_id : " UH_FMT "\n", ptr_struct->last_update_state_changer_host_id);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "last_update_state_changer_type : %s (" UH_FMT ")\n",
-            (ptr_struct->last_update_state_changer_type == 0 ?
-               ("unspecified") :
-               ((ptr_struct->last_update_state_changer_type == 1 ?
-                   ("Chassis_BMC") :
-                   ((ptr_struct->last_update_state_changer_type == 2 ?
-                       ("MAD") :
-                       ((ptr_struct->last_update_state_changer_type == 3 ?
-                           ("BMC") :
-                           ((ptr_struct->last_update_state_changer_type == 4 ? ("command_interface") : ((ptr_struct->last_update_state_changer_type == 5 ? ("ICMD") : ("unknown")))))))))))),
-            ptr_struct->last_update_state_changer_type);
+	fprintf(fd, "last_update_state_changer_type : %s (" UH_FMT ")\n", (ptr_struct->last_update_state_changer_type == 0 ? ("unspecified") : ((ptr_struct->last_update_state_changer_type == 1 ? ("Chassis_BMC") : ((ptr_struct->last_update_state_changer_type == 2 ? ("MAD") : ((ptr_struct->last_update_state_changer_type == 3 ? ("BMC") : ((ptr_struct->last_update_state_changer_type == 4 ? ("command_interface") : ((ptr_struct->last_update_state_changer_type == 5 ? ("ICMD") : ("unknown")))))))))))), ptr_struct->last_update_state_changer_type);
 }
 
 unsigned int reg_access_hca_mcqs_reg_size(void)
@@ -2339,6 +2169,8 @@ void reg_access_hca_mfrl_reg_ext_pack(const struct reg_access_hca_mfrl_reg_ext*
     adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->pci_sync_for_fw_update_resp);
     offset = 34;
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pci_sync_for_fw_update_start);
+	offset = 32;
+	adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->pci_rescan_required);
 }
 
 void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext* ptr_struct, const u_int8_t* ptr_buff)
@@ -2355,6 +2187,8 @@ void reg_access_hca_mfrl_reg_ext_unpack(struct reg_access_hca_mfrl_reg_ext* ptr_
     ptr_struct->pci_sync_for_fw_update_resp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
     offset = 34;
     ptr_struct->pci_sync_for_fw_update_start = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
+	offset = 32;
+	ptr_struct->pci_rescan_required = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
 void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext* ptr_struct, FILE* fd, int indent_level)
@@ -2369,12 +2203,11 @@ void reg_access_hca_mfrl_reg_ext_print(const struct reg_access_hca_mfrl_reg_ext*
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "rst_type_sel         : " UH_FMT "\n", ptr_struct->rst_type_sel);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "pci_sync_for_fw_update_resp : %s (" UH_FMT ")\n",
-            (ptr_struct->pci_sync_for_fw_update_resp == 1 ? ("Acknowledgment") :
-                                                            ((ptr_struct->pci_sync_for_fw_update_resp == 2 ? ("Dis") : ((ptr_struct->pci_sync_for_fw_update_resp == 3 ? ("Reserved") : ("unknown")))))),
-            ptr_struct->pci_sync_for_fw_update_resp);
+	fprintf(fd, "pci_sync_for_fw_update_resp : %s (" UH_FMT ")\n", (ptr_struct->pci_sync_for_fw_update_resp == 1 ? ("Acknowledgment") : ((ptr_struct->pci_sync_for_fw_update_resp == 2 ? ("Dis") : ((ptr_struct->pci_sync_for_fw_update_resp == 3 ? ("Reserved") : ("unknown")))))), ptr_struct->pci_sync_for_fw_update_resp);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "pci_sync_for_fw_update_start : " UH_FMT "\n", ptr_struct->pci_sync_for_fw_update_start);
+	adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "pci_rescan_required  : " UH_FMT "\n", ptr_struct->pci_rescan_required);
 }
 
 unsigned int reg_access_hca_mfrl_reg_ext_size(void)
@@ -2770,13 +2603,7 @@ void reg_access_hca_mqis_reg_print(const struct reg_access_hca_mqis_reg* ptr_str
     fprintf(fd, "======== reg_access_hca_mqis_reg ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "info_type            : %s (" UH_FMT ")\n",
-            (ptr_struct->info_type == 1 ?
-               ("MODEL_NAME") :
-               ((ptr_struct->info_type == 2 ?
-                   ("MODEL_DESCRIPTION") :
-                   ((ptr_struct->info_type == 3 ? ("IMAGE_VSD") : ((ptr_struct->info_type == 4 ? ("DEVICE_VSD") : ((ptr_struct->info_type == 5 ? ("ROM_INFO") : ("unknown")))))))))),
-            ptr_struct->info_type);
+	fprintf(fd, "info_type            : %s (" UH_FMT ")\n", (ptr_struct->info_type == 1 ? ("MODEL_NAME") : ((ptr_struct->info_type == 2 ? ("MODEL_DESCRIPTION") : ((ptr_struct->info_type == 3 ? ("IMAGE_VSD") : ((ptr_struct->info_type == 4 ? ("DEVICE_VSD") : ((ptr_struct->info_type == 5 ? ("ROM_INFO") : ("unknown")))))))))), ptr_struct->info_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "info_length          : " UH_FMT "\n", ptr_struct->info_length);
     adb2c_add_indentation(fd, indent_level);
@@ -2799,6 +2626,52 @@ void reg_access_hca_mqis_reg_dump(const struct reg_access_hca_mqis_reg* ptr_stru
 {
     reg_access_hca_mqis_reg_print(ptr_struct, fd, 0);
 }
+void reg_access_hca_mtcap_ext_pack(const struct reg_access_hca_mtcap_ext *ptr_struct, u_int8_t *ptr_buff)
+{
+	u_int32_t offset;
+	offset = 25;
+	adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->sensor_count);
+	offset = 12;
+	adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->slot_index);
+	offset = 57;
+	adb2c_push_bits_to_buff(ptr_buff, offset, 7, (u_int32_t)ptr_struct->internal_sensor_count);
+	offset = 64;
+	adb2c_push_integer_to_buff(ptr_buff, offset, 8, ptr_struct->sensor_map);
+}
+void reg_access_hca_mtcap_ext_unpack(struct reg_access_hca_mtcap_ext *ptr_struct, const u_int8_t *ptr_buff)
+{
+	u_int32_t offset;
+	offset = 25;
+	ptr_struct->sensor_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
+	offset = 12;
+	ptr_struct->slot_index = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
+	offset = 57;
+	ptr_struct->internal_sensor_count = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 7);
+	offset = 64;
+	ptr_struct->sensor_map = adb2c_pop_integer_from_buff(ptr_buff, offset, 8);
+}
+void reg_access_hca_mtcap_ext_print(const struct reg_access_hca_mtcap_ext *ptr_struct, FILE *fd, int indent_level)
+{
+	adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "======== reg_access_hca_mtcap_ext ========\n");
+	adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "sensor_count         : " UH_FMT "\n", ptr_struct->sensor_count);
+	adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
+	adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "internal_sensor_count : " UH_FMT "\n", ptr_struct->internal_sensor_count);
+	adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "sensor_map           : " U64H_FMT "\n", ptr_struct->sensor_map);
+}
+unsigned int reg_access_hca_mtcap_ext_size(void)
+{
+	return REG_ACCESS_HCA_MTCAP_EXT_SIZE;
+}
+void reg_access_hca_mtcap_ext_dump(const struct reg_access_hca_mtcap_ext *ptr_struct, FILE *fd)
+{
+	reg_access_hca_mtcap_ext_print(ptr_struct, fd, 0);
+}
+}
 
 void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, u_int8_t* ptr_buff)
 {
@@ -3207,24 +3080,7 @@ void reg_access_hca_strs_fault_inject_reg_print(const struct reg_access_hca_strs
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ?
-               ("ICM_ALLOC_REFUSE") :
-               ((ptr_struct->type == 1 ?
-                   ("ICM_ALLOC_BUSY") :
-                   ((ptr_struct->type == 2 ?
-                       ("EQE_GW_BUSY") :
-                       ((ptr_struct->type == 3 ?
-                           ("CQE_GW_BUSY") :
-                           ((ptr_struct->type == 4 ?
-                               ("RX_FENCE_BUSY") :
-                               ((ptr_struct->type == 5 ?
-                                   ("SX_FENCE_BUSY") :
-                                   ((ptr_struct->type == 6 ?
-                                       ("RXT_SLICE_FENCE_BUSY") :
-                                       ((ptr_struct->type == 7 ? ("SXD_SLICE_FENCE_BUSY") :
-                                                                 ((ptr_struct->type == 8 ? ("GENERAL_FENCE_BUSY") : ((ptr_struct->type == 9 ? ("SMBUS_FAILED") : ("unknown")))))))))))))))))))),
-            ptr_struct->type);
+	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("ICM_ALLOC_REFUSE") : ((ptr_struct->type == 1 ? ("ICM_ALLOC_BUSY") : ((ptr_struct->type == 2 ? ("EQE_GW_BUSY") : ((ptr_struct->type == 3 ? ("CQE_GW_BUSY") : ((ptr_struct->type == 4 ? ("RX_FENCE_BUSY") : ((ptr_struct->type == 5 ? ("SX_FENCE_BUSY") : ((ptr_struct->type == 6 ? ("RXT_SLICE_FENCE_BUSY") : ((ptr_struct->type == 7 ? ("SXD_SLICE_FENCE_BUSY") : ((ptr_struct->type == 8 ? ("GENERAL_FENCE_BUSY") : ((ptr_struct->type == 9 ? ("SMBUS_FAILED") : ("unknown")))))))))))))))))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "num_skip             : " UH_FMT "\n", ptr_struct->num_skip);
     adb2c_add_indentation(fd, indent_level);
@@ -3296,40 +3152,7 @@ void reg_access_hca_strs_mini_flow_reg_print(const struct reg_access_hca_strs_mi
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(
-      fd, "type                 : %s (" UH_FMT ")\n",
-      (ptr_struct->type == 0 ?
-         ("SX_FLICK_THROTTLE") :
-         ((ptr_struct->type == 1 ?
-             ("INVALIDATE_STEERING_CACHE") :
-             ((ptr_struct->type == 2 ?
-                 ("INVALIDATE_RXT_QP_L0_CACHE") :
-                 ((ptr_struct->type == 3 ?
-                     ("INVALIDATE_DCT_L0_CACHE") :
-                     ((ptr_struct->type == 4 ?
-                         ("INVALIDATE_LDB_REQSL_CACHE") :
-                         ((ptr_struct->type == 5 ?
-                             ("INVALIDATE_RXC_CACHE") :
-                             ((ptr_struct->type == 6 ?
-                                 ("INVALIDATE_SXDC_CACHE") :
-                                 ((ptr_struct->type == 7 ?
-                                     ("RECONSTRUCT_STEERING_BYPASS") :
-                                     ((ptr_struct->type == 8 ?
-                                         ("INVALIDATE_LDB_CACHE") :
-                                         ((ptr_struct->type == 9 ?
-                                             ("PCI_READ_ERROR") :
-                                             ((ptr_struct->type == 10 ?
-                                                 ("INVALIDATE_ALL_RO_CACHES") :
-                                                 ((ptr_struct->type == 11 ?
-                                                     ("INVALIDATE_PKEY_CACHE") :
-                                                     ((ptr_struct->type == 12 ?
-                                                         ("INVALIDATE_GUID_CACHE") :
-                                                         ((ptr_struct->type == 13 ?
-                                                             ("INVALIDATE_PORT_INFO_CACHE") :
-                                                             ((ptr_struct->type == 14 ?
-                                                                 ("INVALIDATE_QP_CACHE") :
-                                                                 ((ptr_struct->type == 15 ? ("IRISC_HANG") : ((ptr_struct->type == 16 ? ("PACKET_DROP") : ("unknown")))))))))))))))))))))))))))))))))),
-      ptr_struct->type);
+	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("SX_FLICK_THROTTLE") : ((ptr_struct->type == 1 ? ("INVALIDATE_STEERING_CACHE") : ((ptr_struct->type == 2 ? ("INVALIDATE_RXT_QP_L0_CACHE") : ((ptr_struct->type == 3 ? ("INVALIDATE_DCT_L0_CACHE") : ((ptr_struct->type == 4 ? ("INVALIDATE_LDB_REQSL_CACHE") : ((ptr_struct->type == 5 ? ("INVALIDATE_RXC_CACHE") : ((ptr_struct->type == 6 ? ("INVALIDATE_SXDC_CACHE") : ((ptr_struct->type == 7 ? ("RECONSTRUCT_STEERING_BYPASS") : ((ptr_struct->type == 8 ? ("INVALIDATE_LDB_CACHE") : ((ptr_struct->type == 9 ? ("PCI_READ_ERROR") : ((ptr_struct->type == 10 ? ("INVALIDATE_ALL_RO_CACHES") : ((ptr_struct->type == 11 ? ("INVALIDATE_PKEY_CACHE") : ((ptr_struct->type == 12 ? ("INVALIDATE_GUID_CACHE") : ((ptr_struct->type == 13 ? ("INVALIDATE_PORT_INFO_CACHE") : ((ptr_struct->type == 14 ? ("INVALIDATE_QP_CACHE") : ((ptr_struct->type == 15 ? ("IRISC_HANG") : ((ptr_struct->type == 16 ? ("PACKET_DROP") : ("unknown")))))))))))))))))))))))))))))))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "freq                 : " UH_FMT "\n", ptr_struct->freq);
     adb2c_add_indentation(fd, indent_level);
@@ -3464,51 +3287,7 @@ void reg_access_hca_strs_stop_toggle_reg_print(const struct reg_access_hca_strs_
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "supported            : " UH_FMT "\n", ptr_struct->supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ?
-               ("DC_CNAK") :
-               ((ptr_struct->type == 1 ?
-                   ("RXT_CHECKS") :
-                   ((ptr_struct->type == 2 ?
-                       ("TIMEOUT") :
-                       ((ptr_struct->type == 3 ?
-                           ("SX_ERROR") :
-                           ((ptr_struct->type == 4 ?
-                               ("RX_ERROR") :
-                               ((ptr_struct->type == 5 ?
-                                   ("MX_ERROR") :
-                                   ((ptr_struct->type == 6 ?
-                                       ("MAD_TRAP") :
-                                       ((ptr_struct->type == 7 ?
-                                           ("RXT_SLICE") :
-                                           ((ptr_struct->type == 8 ?
-                                               ("QOS_ARBITER") :
-                                               ((ptr_struct->type == 9 ?
-                                                   ("RXB_HANG") :
-                                                   ((ptr_struct->type == 10 ?
-                                                       ("FW_SCHED_Q") :
-                                                       ((ptr_struct->type == 11 ?
-                                                           ("LOCK_RESOURCE") :
-                                                           ((ptr_struct->type == 12 ?
-                                                               ("IRISC_HANG") :
-                                                               ((ptr_struct->type == 13 ?
-                                                                   ("SXW_SLICE") :
-                                                                   ((ptr_struct->type == 14 ?
-                                                                       ("RXC_CQE") :
-                                                                       ((ptr_struct->type == 15 ?
-                                                                           ("RXC_EQE") :
-                                                                           ((ptr_struct->type == 16 ?
-                                                                               ("SXP_HANG") :
-                                                                               ((ptr_struct->type == 17 ?
-                                                                                   ("SX_EXT_DB") :
-                                                                                   ((ptr_struct->type == 18 ?
-                                                                                       ("SX_INT_DB") :
-                                                                                       ((ptr_struct->type == 19 ?
-                                                                                           ("QPC_SLICE") :
-                                                                                           ((ptr_struct->type == 20 ?
-                                                                                               ("RXB_HOST_HANG") :
-                                                                                               ((ptr_struct->type == 21 ? ("PAUSE_TX") : ("unknown")))))))))))))))))))))))))))))))))))))))))))),
-            ptr_struct->type);
+	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("DC_CNAK") : ((ptr_struct->type == 1 ? ("RXT_CHECKS") : ((ptr_struct->type == 2 ? ("TIMEOUT") : ((ptr_struct->type == 3 ? ("SX_ERROR") : ((ptr_struct->type == 4 ? ("RX_ERROR") : ((ptr_struct->type == 5 ? ("MX_ERROR") : ((ptr_struct->type == 6 ? ("MAD_TRAP") : ((ptr_struct->type == 7 ? ("RXT_SLICE") : ((ptr_struct->type == 8 ? ("QOS_ARBITER") : ((ptr_struct->type == 9 ? ("RXB_HANG") : ((ptr_struct->type == 10 ? ("FW_SCHED_Q") : ((ptr_struct->type == 11 ? ("LOCK_RESOURCE") : ((ptr_struct->type == 12 ? ("IRISC_HANG") : ((ptr_struct->type == 13 ? ("SXW_SLICE") : ((ptr_struct->type == 14 ? ("RXC_CQE") : ((ptr_struct->type == 15 ? ("RXC_EQE") : ((ptr_struct->type == 16 ? ("SXP_HANG") : ((ptr_struct->type == 17 ? ("SX_EXT_DB") : ((ptr_struct->type == 18 ? ("SX_INT_DB") : ((ptr_struct->type == 19 ? ("QPC_SLICE") : ((ptr_struct->type == 20 ? ("RXB_HOST_HANG") : ((ptr_struct->type == 21 ? ("PAUSE_TX") : ("unknown")))))))))))))))))))))))))))))))))))))))))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "log_stressor         : " UH_FMT "\n", ptr_struct->log_stressor);
     adb2c_add_indentation(fd, indent_level);
@@ -3576,6 +3355,9 @@ void reg_access_hca_reg_access_hca_Nodes_print(const union reg_access_hca_reg_ac
     fprintf(fd, "mcda_reg:\n");
     reg_access_hca_mcda_reg_print(&(ptr_struct->mcda_reg), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
+	fprintf(fd, "mtcap_ext:\n");
+	reg_access_hca_mtcap_ext_print(&(ptr_struct->mtcap_ext), fd, indent_level + 1);
+	adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "mtrc_cap_reg:\n");
     reg_access_hca_mtrc_cap_reg_print(&(ptr_struct->mtrc_cap_reg), fd, indent_level + 1);
     adb2c_add_indentation(fd, indent_level);
diff --git a/tools_layouts/reg_access_hca_layouts.h b/tools_layouts/reg_access_hca_layouts.h
index d609acda..c406ab14 100644
--- a/tools_layouts/reg_access_hca_layouts.h
+++ b/tools_layouts/reg_access_hca_layouts.h
@@ -785,7 +785,6 @@ supported. */
         /* Description - module base index
 assiciated_module_id[0] = 32 * module_base */
         /* 0x10.28 - 0x10.31 */
-        u_int8_t module_base;
         /*---------------- DWORD[5] (Offset 0x14) ----------------*/
         /* Description - LSB of the "base" MAC address of the NIC that was
 allocate during manufacturing. The NIC derives the
@@ -801,7 +800,6 @@ supported. */
 0: module is not managed by ASIC
 1: module is managed by ASIC */
         /* 0x18.0 - 0x18.31 */
-        u_int32_t associated_module_id_31_0;
         /*---------------- DWORD[7] (Offset 0x1c) ----------------*/
         /* Description - Time (in secs.) since last reset0 */
         /* 0x1c.0 - 0x1c.31 */
@@ -1394,6 +1392,10 @@ Synced driver flow will not require to issue MFRL command
 from other hosts (x86 / ARM for SoC) */
         /* 0x4.29 - 0x4.29 */
         u_int8_t pci_sync_for_fw_update_start;
+	/* Description - Setting this bit to 1 indicates a need of rescan for the corre
+sponding PCI slot */
+	/* 0x4.31 - 0x4.31 */
+	u_int8_t pci_rescan_required;
     };
 
     /* Description -   */
@@ -1673,6 +1675,34 @@ returned. */
         u_int8_t info_string[8];
     };
 
+/* Description -   */
+/* Size in bytes - 16 */
+struct reg_access_hca_mtcap_ext {
+/*---------------- DWORD[0] (Offset 0x0) ----------------*/
+	/* Description - Number of ASIC+platform sensors supported by the device 
+This includes the ASIC and the ambient sensors. QSFP module 
+sensors are not included. */
+	/* 0x0.0 - 0x0.6 */
+	u_int8_t sensor_count;
+	/* Description - Slot index
+0: Main board */
+	/* 0x0.16 - 0x0.19 */
+	u_int8_t slot_index;
+/*---------------- DWORD[1] (Offset 0x4) ----------------*/
+	/* Description - Number of sensors supported by the device that are on the 
+ASIC. */
+	/* 0x4.0 - 0x4.6 */
+	u_int8_t internal_sensor_count;
+/*---------------- DWORD[2] (Offset 0x8) ----------------*/
+	/* Description - Mapping of system sensors supported by the device. Only ASIC 
+and ambient sensors are supported. Each bit represents a sen
+sor.
+Per bit:
+0: Not_connected_or_not_supported
+1: Supports_temperature_measurements */
+	/* 0x8.0 - 0xc.31 */
+	u_int64_t sensor_map;
+};
     /* Description -   */
     /* Size in bytes - 132 */
     struct reg_access_hca_mtrc_cap_reg
@@ -2193,10 +2223,13 @@ gle Modifier Layout," on page  1390 */
         struct reg_access_hca_mfsv_reg mfsv_reg;
         /* Description -  */
         /* 0x0.0 - 0x8c.31 */
-        struct reg_access_hca_mcda_reg mcda_reg;
-        /* Description -  */
-        /* 0x0.0 - 0x80.31 */
-        struct reg_access_hca_mtrc_cap_reg mtrc_cap_reg;
+		struct reg_access_hca_mcda_reg mcda_reg;
+		/* Description -  */
+		/* 0x0.0 - 0xc.31 */
+		struct reg_access_hca_mtcap_ext mtcap_ext;
+		/* Description -  */
+		/* 0x0.0 - 0x80.31 */
+		struct reg_access_hca_mtrc_cap_reg mtrc_cap_reg;
         /* Description -  */
         /* 0x0.0 - 0x28.31 */
         struct reg_access_hca_mpegc_reg mpegc_reg;
@@ -2261,13 +2294,9 @@ gle Modifier Layout," on page  1390 */
 #define REG_ACCESS_HCA_LOCK_SOURCE_UAPP_RESOURCE_SIZE (0x1c)
     void reg_access_hca_lock_source_uapp_resource_dump(const struct reg_access_hca_lock_source_uapp_resource* ptr_struct, FILE* fd);
     /* lock_source_stop_toggle_modifier_category_modifier_auto */
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-                                                                                     u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-                                                                                       const u_int8_t* ptr_buff);
-    void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct,
-                                                                                      FILE* fd,
-                                                                                      int indent_level);
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_pack(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, u_int8_t *ptr_buff);
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_unpack(union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, const u_int8_t *ptr_buff);
+void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_print(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto *ptr_struct, FILE *fd, int indent_level);
     unsigned int reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_size(void);
 #define REG_ACCESS_HCA_LOCK_SOURCE_STOP_TOGGLE_MODIFIER_CATEGORY_MODIFIER_AUTO_SIZE (0x1c)
     void reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto_dump(const union reg_access_hca_lock_source_stop_toggle_modifier_category_modifier_auto* ptr_struct, FILE* fd);
@@ -2516,6 +2545,13 @@ gle Modifier Layout," on page  1390 */
     unsigned int reg_access_hca_mqis_reg_size(void);
 #define REG_ACCESS_HCA_MQIS_REG_SIZE (0x18)
     void reg_access_hca_mqis_reg_dump(const struct reg_access_hca_mqis_reg* ptr_struct, FILE* fd);
+	/* mtcap_ext */
+	void reg_access_hca_mtcap_ext_pack(const struct reg_access_hca_mtcap_ext *ptr_struct, u_int8_t *ptr_buff);
+	void reg_access_hca_mtcap_ext_unpack(struct reg_access_hca_mtcap_ext *ptr_struct, const u_int8_t *ptr_buff);
+	void reg_access_hca_mtcap_ext_print(const struct reg_access_hca_mtcap_ext *ptr_struct, FILE *fd, int indent_level);
+	unsigned int reg_access_hca_mtcap_ext_size(void);
+	#define REG_ACCESS_HCA_MTCAP_EXT_SIZE    (0x10)
+	void reg_access_hca_mtcap_ext_dump(const struct reg_access_hca_mtcap_ext *ptr_struct, FILE *fd);
     /* mtrc_cap_reg */
     void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, u_int8_t* ptr_buff);
     void reg_access_hca_mtrc_cap_reg_unpack(struct reg_access_hca_mtrc_cap_reg* ptr_struct, const u_int8_t* ptr_buff);
diff --git a/tools_layouts/reg_access_switch_layouts.c b/tools_layouts/reg_access_switch_layouts.c
index f885682f..f4a0e607 100644
--- a/tools_layouts/reg_access_switch_layouts.c
+++ b/tools_layouts/reg_access_switch_layouts.c
@@ -750,11 +750,7 @@ void reg_access_switch_mddq_ext_print(const struct reg_access_switch_mddq_ext* p
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "query_type           : %s (" UH_FMT ")\n",
-            (ptr_struct->query_type == 0 ?
-               ("Reserved") :
-               ((ptr_struct->query_type == 1 ? ("slot_info") : ((ptr_struct->query_type == 2 ? ("device_info") : ((ptr_struct->query_type == 3 ? ("slot_name") : ("unknown")))))))),
-            ptr_struct->query_type);
+	fprintf(fd, "query_type           : %s (" UH_FMT ")\n", (ptr_struct->query_type == 0 ? ("Reserved") : ((ptr_struct->query_type == 1 ? ("slot_info") : ((ptr_struct->query_type == 2 ? ("device_info") : ((ptr_struct->query_type == 3 ? ("slot_name") : ("unknown")))))))), ptr_struct->query_type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "sie                  : " UH_FMT "\n", ptr_struct->sie);
     adb2c_add_indentation(fd, indent_level);
@@ -875,8 +871,7 @@ void reg_access_switch_mddt_reg_ext_print(const struct reg_access_switch_mddt_re
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "slot_index           : " UH_FMT "\n", ptr_struct->slot_index);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "type                 : %s (" UH_FMT ")\n",
-            (ptr_struct->type == 0 ? ("PRM_Register") : ((ptr_struct->type == 1 ? ("Command") : ((ptr_struct->type == 2 ? ("CrSpace_access") : ("unknown")))))), ptr_struct->type);
+	fprintf(fd, "type                 : %s (" UH_FMT ")\n", (ptr_struct->type == 0 ? ("PRM_Register") : ((ptr_struct->type == 1 ? ("Command") : ((ptr_struct->type == 2 ? ("CrSpace_access") : ("unknown")))))), ptr_struct->type);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "write_size           : " UH_FMT "\n", ptr_struct->write_size);
     adb2c_add_indentation(fd, indent_level);
@@ -1006,14 +1001,7 @@ void reg_access_switch_mkdc_reg_ext_print(const struct reg_access_switch_mkdc_re
     fprintf(fd, "======== reg_access_switch_mkdc_reg_ext ========\n");
 
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "error_code           : %s (" UH_FMT ")\n",
-            (ptr_struct->error_code == 0 ?
-               ("OK") :
-               ((ptr_struct->error_code == 1 ?
-                   ("BAD_SESSION_ID") :
-                   ((ptr_struct->error_code == 2 ? ("BAD_KEEP_ALIVE_COUNTER") :
-                                                   ((ptr_struct->error_code == 3 ? ("BAD_SOURCE_ADDRESS") : ((ptr_struct->error_code == 4 ? ("SESSION_TIMEOUT") : ("unknown")))))))))),
-            ptr_struct->error_code);
+	fprintf(fd, "error_code           : %s (" UH_FMT ")\n", (ptr_struct->error_code == 0 ? ("OK") : ((ptr_struct->error_code == 1 ? ("BAD_SESSION_ID") : ((ptr_struct->error_code == 2 ? ("BAD_KEEP_ALIVE_COUNTER") : ((ptr_struct->error_code == 3 ? ("BAD_SOURCE_ADDRESS") : ((ptr_struct->error_code == 4 ? ("SESSION_TIMEOUT") : ("unknown")))))))))), ptr_struct->error_code);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "session_id           : " UH_FMT "\n", ptr_struct->session_id);
     adb2c_add_indentation(fd, indent_level);
diff --git a/tools_layouts/tools_open_layouts.c b/tools_layouts/tools_open_layouts.c
index 100c899f..2a7f4e70 100644
--- a/tools_layouts/tools_open_layouts.c
+++ b/tools_layouts/tools_open_layouts.c
@@ -710,7 +710,8 @@ void tools_open_cap_mask_print(const struct tools_open_cap_mask* ptr_struct, FIL
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "is_system_image_guid_sup : " UH_FMT "\n", ptr_struct->is_system_image_guid_sup);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "is_pkey_switch_external_port_trap_sup : " UH_FMT "\n", ptr_struct->is_pkey_switch_external_port_trap_sup);
+    fprintf(fd, "is_pkey_switch_external_port_trap_sup : " UH_FMT "\n",
+            ptr_struct->is_pkey_switch_external_port_trap_sup);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "is_extended_speed_sup : " UH_FMT "\n", ptr_struct->is_extended_speed_sup);
     adb2c_add_indentation(fd, indent_level);
@@ -734,9 +735,11 @@ void tools_open_cap_mask_print(const struct tools_open_cap_mask* ptr_struct, FIL
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "is_client_reregistration_sup : " UH_FMT "\n", ptr_struct->is_client_reregistration_sup);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "is_other_local_changes_notice_supported : " UH_FMT "\n", ptr_struct->is_other_local_changes_notice_supported);
+    fprintf(fd, "is_other_local_changes_notice_supported : " UH_FMT "\n",
+            ptr_struct->is_other_local_changes_notice_supported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "is_link_speed_width_pairs_table_supported : " UH_FMT "\n", ptr_struct->is_link_speed_width_pairs_table_supported);
+    fprintf(fd, "is_link_speed_width_pairs_table_supported : " UH_FMT "\n",
+            ptr_struct->is_link_speed_width_pairs_table_supported);
 }
 
 unsigned int tools_open_cap_mask_size(void)
@@ -821,7 +824,9 @@ void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp
     ptr_struct->IsASlaveVirtualSwitch = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd, int indent_level)
+void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_capability_mask_smp ========\n");
@@ -849,7 +854,8 @@ void tools_open_capability_mask_smp_print(const struct tools_open_capability_mas
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "IsAccessRegisterSupported : " UH_FMT "\n", ptr_struct->IsAccessRegisterSupported);
     adb2c_add_indentation(fd, indent_level);
-    fprintf(fd, "IsInterProcessCommunicationSupported : " UH_FMT "\n", ptr_struct->IsInterProcessCommunicationSupported);
+    fprintf(fd, "IsInterProcessCommunicationSupported : " UH_FMT "\n",
+            ptr_struct->IsInterProcessCommunicationSupported);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "IsPortSLToPrivateLFTMapSupported : " UH_FMT "\n", ptr_struct->IsPortSLToPrivateLFTMapSupported);
     adb2c_add_indentation(fd, indent_level);
@@ -1234,11 +1240,15 @@ void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen*
                                      ("NV_WRITER_ID_ICMD_UEFI_CLP") :
                                      ((ptr_struct->writer_id == 8 ?
                                          ("NV_WRITER_ID_ICMD_FLEXBOOT") :
-                                         ((ptr_struct->writer_id == 9 ? ("NV_WRITER_ID_ICMD_MLXCONFIG") :
+                                         ((ptr_struct->writer_id == 9 ?
+                                             ("NV_WRITER_ID_ICMD_MLXCONFIG") :
                                                                         ((ptr_struct->writer_id == 10 ?
                                                                             ("NV_WRITER_ID_ICMD_USER1") :
-                                                                            ((ptr_struct->writer_id == 11 ? ("NV_WRITER_ID_ICMD_USER2") :
-                                                                                                            ((ptr_struct->writer_id == 31 ? ("NV_WRITER_ID_OTHER") : ("unknown")))))))))))))))))))))))))),
+                                                 ((ptr_struct->writer_id == 11 ?
+                                                     ("NV_WRITER_ID_ICMD_USER2") :
+                                                     ((ptr_struct->writer_id == 31 ? ("NV_WRITER_ID_OTHER") :
+                                                                                     ("unknow"
+                                                                                      "n")))))))))))))))))))))))))),
       ptr_struct->writer_id);
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "read_current         : " UH_FMT "\n", ptr_struct->read_current);
@@ -1578,7 +1588,8 @@ void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header* ptr_
     tools_open_aux_tlv_header_print(ptr_struct, fd, 0);
 }
 
-void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1596,7 +1607,8 @@ void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_p
     adb2c_push_bits_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->ActiveCell);
 }
 
-void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -1614,7 +1626,9 @@ void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_
     ptr_struct->ActiveCell = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd, int indent_level)
+void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_extended_ib_port_info ========\n");
@@ -3150,7 +3164,9 @@ void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_inf
     tools_open_capability_mask_smp_unpack(&(ptr_struct->capability_mask_smp), ptr_buff);
 }
 
-void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd, int indent_level)
+void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_smp_vsp_general_info ========\n");
@@ -3397,7 +3413,9 @@ void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext* pt
     ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd, int indent_level)
+void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_boot_settings_ext ========\n");
@@ -3495,7 +3513,9 @@ void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor
     ptr_struct->size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct, FILE* fd, int indent_level)
+void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct,
+                                          FILE* fd,
+                                          int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_component_desciptor ========\n");
@@ -3701,7 +3721,8 @@ void tools_open_image_info_dump(const struct tools_open_image_info* ptr_struct,
     tools_open_image_info_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                              u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3709,7 +3730,8 @@ void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->boot_pkey);
 }
 
-void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3717,7 +3739,9 @@ void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boo
     ptr_struct->boot_pkey = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd, int indent_level)
+void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_infiniband_boot_settings ========\n");
@@ -3736,7 +3760,8 @@ void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband
     tools_open_infiniband_boot_settings_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3750,7 +3775,8 @@ void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniba
     adb2c_push_integer_to_buff(ptr_buff, offset, 4, (u_int32_t)ptr_struct->max_dcr_lifo_size);
 }
 
-void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                  const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3764,7 +3790,9 @@ void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_d
     ptr_struct->max_dcr_lifo_size = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd, int indent_level)
+void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_infiniband_dc_capabilities ========\n");
@@ -3784,12 +3812,14 @@ unsigned int tools_open_infiniband_dc_capabilities_size(void)
     return TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE;
 }
 
-void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd)
+void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                FILE* fd)
 {
     tools_open_infiniband_dc_capabilities_print(ptr_struct, fd, 0);
 }
 
-void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                            u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3799,7 +3829,8 @@ void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_d
     adb2c_push_bits_to_buff(ptr_buff, offset, 24, (u_int32_t)ptr_struct->dcr_lifo_size);
 }
 
-void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct,
+                                              const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3809,7 +3840,9 @@ void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_se
     ptr_struct->dcr_lifo_size = (u_int32_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 24);
 }
 
-void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd, int indent_level)
+void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_infiniband_dc_settings ========\n");
@@ -3943,7 +3976,8 @@ void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_se
     adb2c_push_bits_to_buff(ptr_buff, offset, 2, (u_int32_t)ptr_struct->lldp_nb_tx_mode);
 }
 
-void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -3955,7 +3989,9 @@ void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settin
     ptr_struct->lldp_nb_tx_mode = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 2);
 }
 
-void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd, int indent_level)
+void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_lldp_client_settings ========\n");
@@ -4398,7 +4434,8 @@ void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_gu
     adb2c_push_bits_to_buff(ptr_buff, offset, 16, (u_int32_t)ptr_struct->num_of_allocated_guids);
 }
 
-void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                            const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4412,7 +4449,9 @@ void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_c
     ptr_struct->num_of_allocated_guids = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 16);
 }
 
-void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd, int indent_level)
+void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_nv_base_mac_guid_cap ========\n");
@@ -4465,7 +4504,9 @@ void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf*
     ptr_struct->cq_timestamp = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd, int indent_level)
+void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct,
+                                         FILE* fd,
+                                         int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_nv_cx3_global_conf ========\n");
@@ -4490,7 +4531,8 @@ void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_co
     tools_open_nv_cx3_global_conf_print(ptr_struct, fd, 0);
 }
 
-void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4498,7 +4540,8 @@ void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_ca
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->ip_ver);
 }
 
-void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4506,7 +4549,9 @@ void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capabi
     ptr_struct->ip_ver = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd, int indent_level)
+void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_option_rom_capability ========\n");
@@ -4569,7 +4614,9 @@ void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor*
     ptr_struct->user_data_offset = (u_int32_t)adb2c_pop_integer_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct, FILE* fd, int indent_level)
+void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct,
+                                         FILE* fd,
+                                         int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_package_descriptor ========\n");
@@ -4825,7 +4872,9 @@ void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration* pt
     ptr_struct->num_vf_msix = (u_int16_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 10);
 }
 
-void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct, FILE* fd, int indent_level)
+void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_pci_configuration ========\n");
@@ -4962,7 +5011,8 @@ void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state* pt
     tools_open_port_boot_state_print(ptr_struct, fd, 0);
 }
 
-void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                           u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4978,7 +5028,8 @@ void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->boot_option_rom_en);
 }
 
-void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct,
+                                             const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -4994,7 +5045,9 @@ void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_sett
     ptr_struct->boot_option_rom_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd, int indent_level)
+void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_preboot_boot_settings ========\n");
@@ -5053,7 +5106,9 @@ void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl* pt
     ptr_struct->pptx = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd, int indent_level)
+void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_preboot_flow_ctrl ========\n");
@@ -5162,7 +5217,8 @@ void tools_open_qos_cap_dump(const struct tools_open_qos_cap* ptr_struct, FILE*
     tools_open_qos_cap_print(ptr_struct, fd, 0);
 }
 
-void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct,
+                                             u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5196,7 +5252,8 @@ void tools_open_query_def_params_global_pack(const struct tools_open_query_def_p
     adb2c_push_bits_to_buff(ptr_buff, offset, 1, (u_int32_t)ptr_struct->sriov_en);
 }
 
-void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct,
+                                               const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5230,7 +5287,9 @@ void tools_open_query_def_params_global_unpack(struct tools_open_query_def_param
     ptr_struct->sriov_en = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 1);
 }
 
-void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd, int indent_level)
+void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_query_def_params_global ========\n");
@@ -5275,7 +5334,8 @@ void tools_open_query_def_params_global_dump(const struct tools_open_query_def_p
     tools_open_query_def_params_global_print(ptr_struct, fd, 0);
 }
 
-void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                               u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5345,7 +5405,8 @@ void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->iscsi_link_up_delay_time);
 }
 
-void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct,
+                                                 const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5415,7 +5476,9 @@ void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_par
     ptr_struct->iscsi_link_up_delay_time = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd, int indent_level)
+void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_query_def_params_per_port ========\n");
@@ -5680,7 +5743,8 @@ void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn* ptr_struct
     tools_open_roce_cc_ecn_print(ptr_struct, fd, 0);
 }
 
-void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, u_int8_t* ptr_buff)
+void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                              u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5688,7 +5752,8 @@ void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5
     adb2c_push_bits_to_buff(ptr_buff, offset, 8, (u_int32_t)ptr_struct->roce_over_ip_next_protocol);
 }
 
-void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct, const u_int8_t* ptr_buff)
+void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                const u_int8_t* ptr_buff)
 {
     u_int32_t offset;
 
@@ -5696,7 +5761,9 @@ void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_nex
     ptr_struct->roce_over_ip_next_protocol = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 8);
 }
 
-void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd, int indent_level)
+void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_roce_v_1_5_next_protocol ========\n");
@@ -5846,7 +5913,9 @@ void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration* pt
     ptr_struct->log_max_payload_size = (u_int8_t)adb2c_pop_bits_from_buff(ptr_buff, offset, 4);
 }
 
-void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd, int indent_level)
+void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct,
+                                        FILE* fd,
+                                        int indent_level)
 {
     adb2c_add_indentation(fd, indent_level);
     fprintf(fd, "======== tools_open_tpt_configuration ========\n");
diff --git a/tools_layouts/tools_open_layouts.h b/tools_layouts/tools_open_layouts.h
index f07ea83d..a4baed7d 100644
--- a/tools_layouts/tools_open_layouts.h
+++ b/tools_layouts/tools_open_layouts.h
@@ -3168,9 +3168,13 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_CAP_MASK_SIZE (0x4)
     void tools_open_cap_mask_dump(const struct tools_open_cap_mask* ptr_struct, FILE* fd);
     /* capability_mask_smp */
-    void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_capability_mask_smp_pack(const struct tools_open_capability_mask_smp* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void tools_open_capability_mask_smp_unpack(struct tools_open_capability_mask_smp* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void tools_open_capability_mask_smp_print(const struct tools_open_capability_mask_smp* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
     unsigned int tools_open_capability_mask_smp_size(void);
 #define TOOLS_OPEN_CAPABILITY_MASK_SMP_SIZE (0x40)
     void tools_open_capability_mask_smp_dump(const struct tools_open_capability_mask_smp* ptr_struct, FILE* fd);
@@ -3198,14 +3202,17 @@ the default link type when no cable is connected */
     /* nv_hdr_fifth_gen */
     void tools_open_nv_hdr_fifth_gen_pack(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_nv_hdr_fifth_gen_unpack(struct tools_open_nv_hdr_fifth_gen* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_nv_hdr_fifth_gen_print(const struct tools_open_nv_hdr_fifth_gen* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
     unsigned int tools_open_nv_hdr_fifth_gen_size(void);
 #define TOOLS_OPEN_NV_HDR_FIFTH_GEN_SIZE (0xc)
     void tools_open_nv_hdr_fifth_gen_dump(const struct tools_open_nv_hdr_fifth_gen* ptr_struct, FILE* fd);
     /* pmdio_addr_data */
     void tools_open_pmdio_addr_data_pack(const struct tools_open_pmdio_addr_data* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_pmdio_addr_data_unpack(struct tools_open_pmdio_addr_data* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd, int indent_level);
+    void
+      tools_open_pmdio_addr_data_print(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_pmdio_addr_data_size(void);
 #define TOOLS_OPEN_PMDIO_ADDR_DATA_SIZE (0x4)
     void tools_open_pmdio_addr_data_dump(const struct tools_open_pmdio_addr_data* ptr_struct, FILE* fd);
@@ -3238,9 +3245,13 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_AUX_TLV_HEADER_SIZE (0x14)
     void tools_open_aux_tlv_header_dump(const struct tools_open_aux_tlv_header* ptr_struct, FILE* fd);
     /* extended_ib_port_info */
-    void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_extended_ib_port_info_pack(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void tools_open_extended_ib_port_info_unpack(struct tools_open_extended_ib_port_info* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void tools_open_extended_ib_port_info_print(const struct tools_open_extended_ib_port_info* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
     unsigned int tools_open_extended_ib_port_info_size(void);
 #define TOOLS_OPEN_EXTENDED_IB_PORT_INFO_SIZE (0x3c)
     void tools_open_extended_ib_port_info_dump(const struct tools_open_extended_ib_port_info* ptr_struct, FILE* fd);
@@ -3385,9 +3396,13 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_PMDIO_SIZE (0x108)
     void tools_open_pmdio_dump(const struct tools_open_pmdio* ptr_struct, FILE* fd);
     /* smp_vsp_general_info */
-    void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_smp_vsp_general_info_pack(const union tools_open_smp_vsp_general_info* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void tools_open_smp_vsp_general_info_unpack(union tools_open_smp_vsp_general_info* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void tools_open_smp_vsp_general_info_print(const union tools_open_smp_vsp_general_info* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
     unsigned int tools_open_smp_vsp_general_info_size(void);
 #define TOOLS_OPEN_SMP_VSP_GENERAL_INFO_SIZE (0x40)
     void tools_open_smp_vsp_general_info_dump(const union tools_open_smp_vsp_general_info* ptr_struct, FILE* fd);
@@ -3422,7 +3437,9 @@ the default link type when no cable is connected */
     /* boot_settings_ext */
     void tools_open_boot_settings_ext_pack(const struct tools_open_boot_settings_ext* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_boot_settings_ext_unpack(struct tools_open_boot_settings_ext* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_boot_settings_ext_print(const struct tools_open_boot_settings_ext* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
     unsigned int tools_open_boot_settings_ext_size(void);
 #define TOOLS_OPEN_BOOT_SETTINGS_EXT_SIZE (0x4)
     void tools_open_boot_settings_ext_dump(const struct tools_open_boot_settings_ext* ptr_struct, FILE* fd);
@@ -3434,9 +3451,13 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_COMMON_HEADER_SIZE (0x4)
     void tools_open_common_header_dump(const struct tools_open_common_header* ptr_struct, FILE* fd);
     /* component_desciptor */
-    void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_component_desciptor_pack(const struct tools_open_component_desciptor* ptr_struct,
+                                             u_int8_t* ptr_buff);
+    void tools_open_component_desciptor_unpack(struct tools_open_component_desciptor* ptr_struct,
+                                               const u_int8_t* ptr_buff);
+    void tools_open_component_desciptor_print(const struct tools_open_component_desciptor* ptr_struct,
+                                              FILE* fd,
+                                              int indent_level);
     unsigned int tools_open_component_desciptor_size(void);
 #define TOOLS_OPEN_COMPONENT_DESCIPTOR_SIZE (0x10)
     void tools_open_component_desciptor_dump(const struct tools_open_component_desciptor* ptr_struct, FILE* fd);
@@ -3462,23 +3483,37 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_IMAGE_INFO_SIZE (0x400)
     void tools_open_image_info_dump(const struct tools_open_image_info* ptr_struct, FILE* fd);
     /* infiniband_boot_settings */
-    void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_infiniband_boot_settings_pack(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void tools_open_infiniband_boot_settings_unpack(struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void tools_open_infiniband_boot_settings_print(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
     unsigned int tools_open_infiniband_boot_settings_size(void);
 #define TOOLS_OPEN_INFINIBAND_BOOT_SETTINGS_SIZE (0x4)
-    void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings* ptr_struct, FILE* fd);
+    void tools_open_infiniband_boot_settings_dump(const struct tools_open_infiniband_boot_settings* ptr_struct,
+                                                  FILE* fd);
     /* infiniband_dc_capabilities */
-    void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_infiniband_dc_capabilities_pack(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                    u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_capabilities_unpack(struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                      const u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_capabilities_print(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                     FILE* fd,
+                                                     int indent_level);
     unsigned int tools_open_infiniband_dc_capabilities_size(void);
 #define TOOLS_OPEN_INFINIBAND_DC_CAPABILITIES_SIZE (0x10)
-    void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct, FILE* fd);
+    void tools_open_infiniband_dc_capabilities_dump(const struct tools_open_infiniband_dc_capabilities* ptr_struct,
+                                                    FILE* fd);
     /* infiniband_dc_settings */
-    void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_infiniband_dc_settings_pack(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                                u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_settings_unpack(struct tools_open_infiniband_dc_settings* ptr_struct,
+                                                  const u_int8_t* ptr_buff);
+    void tools_open_infiniband_dc_settings_print(const struct tools_open_infiniband_dc_settings* ptr_struct,
+                                                 FILE* fd,
+                                                 int indent_level);
     unsigned int tools_open_infiniband_dc_settings_size(void);
 #define TOOLS_OPEN_INFINIBAND_DC_SETTINGS_SIZE (0x8)
     void tools_open_infiniband_dc_settings_dump(const struct tools_open_infiniband_dc_settings* ptr_struct, FILE* fd);
@@ -3490,9 +3525,13 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_ISCSI_SETTINGS_SIZE (0xc)
     void tools_open_iscsi_settings_dump(const struct tools_open_iscsi_settings* ptr_struct, FILE* fd);
     /* lldp_client_settings */
-    void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_lldp_client_settings_pack(const struct tools_open_lldp_client_settings* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void tools_open_lldp_client_settings_unpack(struct tools_open_lldp_client_settings* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void tools_open_lldp_client_settings_print(const struct tools_open_lldp_client_settings* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
     unsigned int tools_open_lldp_client_settings_size(void);
 #define TOOLS_OPEN_LLDP_CLIENT_SETTINGS_SIZE (0xc)
     void tools_open_lldp_client_settings_dump(const struct tools_open_lldp_client_settings* ptr_struct, FILE* fd);
@@ -3541,49 +3580,69 @@ the default link type when no cable is connected */
     /* nv_base_mac_guid */
     void tools_open_nv_base_mac_guid_pack(const struct tools_open_nv_base_mac_guid* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_nv_base_mac_guid_unpack(struct tools_open_nv_base_mac_guid* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_nv_base_mac_guid_print(const struct tools_open_nv_base_mac_guid* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
     unsigned int tools_open_nv_base_mac_guid_size(void);
 #define TOOLS_OPEN_NV_BASE_MAC_GUID_SIZE (0x10)
     void tools_open_nv_base_mac_guid_dump(const struct tools_open_nv_base_mac_guid* ptr_struct, FILE* fd);
     /* nv_base_mac_guid_cap */
-    void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_nv_base_mac_guid_cap_pack(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                              u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_cap_unpack(struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                                const u_int8_t* ptr_buff);
+    void tools_open_nv_base_mac_guid_cap_print(const struct tools_open_nv_base_mac_guid_cap* ptr_struct,
+                                               FILE* fd,
+                                               int indent_level);
     unsigned int tools_open_nv_base_mac_guid_cap_size(void);
 #define TOOLS_OPEN_NV_BASE_MAC_GUID_CAP_SIZE (0x8)
     void tools_open_nv_base_mac_guid_cap_dump(const struct tools_open_nv_base_mac_guid_cap* ptr_struct, FILE* fd);
     /* nv_cx3_global_conf */
     void tools_open_nv_cx3_global_conf_pack(const struct tools_open_nv_cx3_global_conf* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_nv_cx3_global_conf_unpack(struct tools_open_nv_cx3_global_conf* ptr_struct,
+                                              const u_int8_t* ptr_buff);
+    void tools_open_nv_cx3_global_conf_print(const struct tools_open_nv_cx3_global_conf* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level);
     unsigned int tools_open_nv_cx3_global_conf_size(void);
 #define TOOLS_OPEN_NV_CX3_GLOBAL_CONF_SIZE (0x20)
     void tools_open_nv_cx3_global_conf_dump(const struct tools_open_nv_cx3_global_conf* ptr_struct, FILE* fd);
     /* option_rom_capability */
-    void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_option_rom_capability_pack(const struct tools_open_option_rom_capability* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void tools_open_option_rom_capability_unpack(struct tools_open_option_rom_capability* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void tools_open_option_rom_capability_print(const struct tools_open_option_rom_capability* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
     unsigned int tools_open_option_rom_capability_size(void);
 #define TOOLS_OPEN_OPTION_ROM_CAPABILITY_SIZE (0x4)
     void tools_open_option_rom_capability_dump(const struct tools_open_option_rom_capability* ptr_struct, FILE* fd);
     /* package_descriptor */
     void tools_open_package_descriptor_pack(const struct tools_open_package_descriptor* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_package_descriptor_unpack(struct tools_open_package_descriptor* ptr_struct,
+                                              const u_int8_t* ptr_buff);
+    void tools_open_package_descriptor_print(const struct tools_open_package_descriptor* ptr_struct,
+                                             FILE* fd,
+                                             int indent_level);
     unsigned int tools_open_package_descriptor_size(void);
 #define TOOLS_OPEN_PACKAGE_DESCRIPTOR_SIZE (0x1c)
     void tools_open_package_descriptor_dump(const struct tools_open_package_descriptor* ptr_struct, FILE* fd);
     /* pci_capabilities */
     void tools_open_pci_capabilities_pack(const struct tools_open_pci_capabilities* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_pci_capabilities_unpack(struct tools_open_pci_capabilities* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_pci_capabilities_print(const struct tools_open_pci_capabilities* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
     unsigned int tools_open_pci_capabilities_size(void);
 #define TOOLS_OPEN_PCI_CAPABILITIES_SIZE (0x14)
     void tools_open_pci_capabilities_dump(const struct tools_open_pci_capabilities* ptr_struct, FILE* fd);
     /* pci_configuration */
     void tools_open_pci_configuration_pack(const struct tools_open_pci_configuration* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_pci_configuration_unpack(struct tools_open_pci_configuration* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_pci_configuration_print(const struct tools_open_pci_configuration* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
     unsigned int tools_open_pci_configuration_size(void);
 #define TOOLS_OPEN_PCI_CONFIGURATION_SIZE (0xc)
     void tools_open_pci_configuration_dump(const struct tools_open_pci_configuration* ptr_struct, FILE* fd);
@@ -3597,21 +3656,28 @@ the default link type when no cable is connected */
     /* port_boot_state */
     void tools_open_port_boot_state_pack(const struct tools_open_port_boot_state* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_port_boot_state_unpack(struct tools_open_port_boot_state* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_port_boot_state_print(const struct tools_open_port_boot_state* ptr_struct, FILE* fd, int indent_level);
+    void
+      tools_open_port_boot_state_print(const struct tools_open_port_boot_state* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_port_boot_state_size(void);
 #define TOOLS_OPEN_PORT_BOOT_STATE_SIZE (0x4)
     void tools_open_port_boot_state_dump(const struct tools_open_port_boot_state* ptr_struct, FILE* fd);
     /* preboot_boot_settings */
-    void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_preboot_boot_settings_pack(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                               u_int8_t* ptr_buff);
+    void tools_open_preboot_boot_settings_unpack(struct tools_open_preboot_boot_settings* ptr_struct,
+                                                 const u_int8_t* ptr_buff);
+    void tools_open_preboot_boot_settings_print(const struct tools_open_preboot_boot_settings* ptr_struct,
+                                                FILE* fd,
+                                                int indent_level);
     unsigned int tools_open_preboot_boot_settings_size(void);
 #define TOOLS_OPEN_PREBOOT_BOOT_SETTINGS_SIZE (0x4)
     void tools_open_preboot_boot_settings_dump(const struct tools_open_preboot_boot_settings* ptr_struct, FILE* fd);
     /* preboot_flow_ctrl */
     void tools_open_preboot_flow_ctrl_pack(const struct tools_open_preboot_flow_ctrl* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_preboot_flow_ctrl_unpack(struct tools_open_preboot_flow_ctrl* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_preboot_flow_ctrl_print(const struct tools_open_preboot_flow_ctrl* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
     unsigned int tools_open_preboot_flow_ctrl_size(void);
 #define TOOLS_OPEN_PREBOOT_FLOW_CTRL_SIZE (0x4)
     void tools_open_preboot_flow_ctrl_dump(const struct tools_open_preboot_flow_ctrl* ptr_struct, FILE* fd);
@@ -3630,19 +3696,28 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_QOS_CAP_SIZE (0xc)
     void tools_open_qos_cap_dump(const struct tools_open_qos_cap* ptr_struct, FILE* fd);
     /* query_def_params_global */
-    void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_query_def_params_global_pack(const struct tools_open_query_def_params_global* ptr_struct,
+                                                 u_int8_t* ptr_buff);
+    void tools_open_query_def_params_global_unpack(struct tools_open_query_def_params_global* ptr_struct,
+                                                   const u_int8_t* ptr_buff);
+    void tools_open_query_def_params_global_print(const struct tools_open_query_def_params_global* ptr_struct,
+                                                  FILE* fd,
+                                                  int indent_level);
     unsigned int tools_open_query_def_params_global_size(void);
 #define TOOLS_OPEN_QUERY_DEF_PARAMS_GLOBAL_SIZE (0x14)
     void tools_open_query_def_params_global_dump(const struct tools_open_query_def_params_global* ptr_struct, FILE* fd);
     /* query_def_params_per_port */
-    void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_query_def_params_per_port_pack(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                   u_int8_t* ptr_buff);
+    void tools_open_query_def_params_per_port_unpack(struct tools_open_query_def_params_per_port* ptr_struct,
+                                                     const u_int8_t* ptr_buff);
+    void tools_open_query_def_params_per_port_print(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                    FILE* fd,
+                                                    int indent_level);
     unsigned int tools_open_query_def_params_per_port_size(void);
 #define TOOLS_OPEN_QUERY_DEF_PARAMS_PER_PORT_SIZE (0x1c)
-    void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port* ptr_struct, FILE* fd);
+    void tools_open_query_def_params_per_port_dump(const struct tools_open_query_def_params_per_port* ptr_struct,
+                                                   FILE* fd);
     /* roce_cc */
     void tools_open_roce_cc_pack(const struct tools_open_roce_cc* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_roce_cc_unpack(struct tools_open_roce_cc* ptr_struct, const u_int8_t* ptr_buff);
@@ -3658,12 +3733,17 @@ the default link type when no cable is connected */
 #define TOOLS_OPEN_ROCE_CC_ECN_SIZE (0x44)
     void tools_open_roce_cc_ecn_dump(const struct tools_open_roce_cc_ecn* ptr_struct, FILE* fd);
     /* roce_v_1_5_next_protocol */
-    void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, u_int8_t* ptr_buff);
-    void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_roce_v_1_5_next_protocol_pack(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                  u_int8_t* ptr_buff);
+    void tools_open_roce_v_1_5_next_protocol_unpack(struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                    const u_int8_t* ptr_buff);
+    void tools_open_roce_v_1_5_next_protocol_print(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                   FILE* fd,
+                                                   int indent_level);
     unsigned int tools_open_roce_v_1_5_next_protocol_size(void);
 #define TOOLS_OPEN_ROCE_V_1_5_NEXT_PROTOCOL_SIZE (0x4)
-    void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct, FILE* fd);
+    void tools_open_roce_v_1_5_next_protocol_dump(const struct tools_open_roce_v_1_5_next_protocol* ptr_struct,
+                                                  FILE* fd);
     /* smp_data */
     void tools_open_smp_data_pack(const union tools_open_smp_data* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_smp_data_unpack(union tools_open_smp_data* ptr_struct, const u_int8_t* ptr_buff);
@@ -3681,14 +3761,18 @@ the default link type when no cable is connected */
     /* tpt_capabilities */
     void tools_open_tpt_capabilities_pack(const struct tools_open_tpt_capabilities* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_tpt_capabilities_unpack(struct tools_open_tpt_capabilities* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_tpt_capabilities_print(const struct tools_open_tpt_capabilities* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
     unsigned int tools_open_tpt_capabilities_size(void);
 #define TOOLS_OPEN_TPT_CAPABILITIES_SIZE (0x4)
     void tools_open_tpt_capabilities_dump(const struct tools_open_tpt_capabilities* ptr_struct, FILE* fd);
     /* tpt_configuration */
     void tools_open_tpt_configuration_pack(const struct tools_open_tpt_configuration* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_tpt_configuration_unpack(struct tools_open_tpt_configuration* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_tpt_configuration_print(const struct tools_open_tpt_configuration* ptr_struct,
+                                            FILE* fd,
+                                            int indent_level);
     unsigned int tools_open_tpt_configuration_size(void);
 #define TOOLS_OPEN_TPT_CONFIGURATION_SIZE (0x4)
     void tools_open_tpt_configuration_dump(const struct tools_open_tpt_configuration* ptr_struct, FILE* fd);
@@ -3723,7 +3807,9 @@ the default link type when no cable is connected */
     /* access_registers */
     void tools_open_access_registers_pack(const union tools_open_access_registers* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_access_registers_unpack(union tools_open_access_registers* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_access_registers_print(const union tools_open_access_registers* ptr_struct, FILE* fd, int indent_level);
+    void tools_open_access_registers_print(const union tools_open_access_registers* ptr_struct,
+                                           FILE* fd,
+                                           int indent_level);
     unsigned int tools_open_access_registers_size(void);
 #define TOOLS_OPEN_ACCESS_REGISTERS_SIZE (0x200)
     void tools_open_access_registers_dump(const union tools_open_access_registers* ptr_struct, FILE* fd);
@@ -3744,7 +3830,8 @@ the default link type when no cable is connected */
     /* mcdd_descriptor */
     void tools_open_mcdd_descriptor_pack(const struct tools_open_mcdd_descriptor* ptr_struct, u_int8_t* ptr_buff);
     void tools_open_mcdd_descriptor_unpack(struct tools_open_mcdd_descriptor* ptr_struct, const u_int8_t* ptr_buff);
-    void tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd, int indent_level);
+    void
+      tools_open_mcdd_descriptor_print(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd, int indent_level);
     unsigned int tools_open_mcdd_descriptor_size(void);
 #define TOOLS_OPEN_MCDD_DESCRIPTOR_SIZE (0x24)
     void tools_open_mcdd_descriptor_dump(const struct tools_open_mcdd_descriptor* ptr_struct, FILE* fd);
diff --git a/tools_res_mgmt/tools_res_mgmt.c b/tools_res_mgmt/tools_res_mgmt.c
index 48078c2e..a4e07a82 100644
--- a/tools_res_mgmt/tools_res_mgmt.c
+++ b/tools_res_mgmt/tools_res_mgmt.c
@@ -133,6 +133,11 @@ static struct device_sem_info g_dev_sem_info_db[] = {
     {0xe5660},        // hw_sem_addr
     1,                // vsec_sem_supported
   },
+  {
+    DeviceBlueField4, // dev_id
+    {0xe5660},        // hw_sem_addr
+    1,                // vsec_sem_supported
+  },
   {
     DeviceQuantum, // dev_id
     {0xa68f8},     // hw_sem_addr
@@ -163,6 +168,11 @@ static struct device_sem_info g_dev_sem_info_db[] = {
     {0xe5660},       // hw_sem_addr
     1,               // vsec_sem_supported
   },
+  {
+    DeviceConnectX8, // dev_id
+    {0xe5660},       // hw_sem_addr
+    1,               // vsec_sem_supported
+  },
   {
     DeviceGearBox, // dev_id
     {0xe74e0},     // hw_sem_addr
@@ -183,6 +193,16 @@ static struct device_sem_info g_dev_sem_info_db[] = {
     {0xe74e0},      // hw_sem_addr
     1,              // vsec_sem_supported
   },
+  {
+    DeviceQuantum3, // dev_id
+    {0xe74e0},      // hw_sem_addr find correct one for 0x25b
+    1,              // vsec_sem_supported
+  },
+  {
+    DeviceGB100, // dev_id
+    {0xe74e0},   // hw_sem_addr find correct one for 0x2900
+    1,           // vsec_sem_supported
+  },
   {
     DeviceSpectrum4, // dev_id
     {0xa68f8},       // hw_sem_addr

From 45e5ddce94d71be92671da43c1f4d1e983414d92 Mon Sep 17 00:00:00 2001
From: Tomer Tubi <ttubi@nvidia.com>
Date: Wed, 20 Jul 2022 10:38:34 +0300
Subject: [PATCH 45/46] Fix default compilation issues, after original mft
 alignment of 4.21.0

---
 flint/subcommands.cpp                  | 4 ----
 mlxfwops/lib/flint_io.cpp              | 9 +--------
 mlxfwops/lib/fw_ops.cpp                | 7 -------
 tools_layouts/reg_access_hca_layouts.c | 3 ++-
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp
index 7f32bc9a..1a778cd3 100644
--- a/flint/subcommands.cpp
+++ b/flint/subcommands.cpp
@@ -3793,10 +3793,6 @@ bool QuerySubCommand::displayFs2Uids(const fw_info_t& fwInfo)
                               ethDev);
     // setDevFlags(fwInfo, ibDev, ethDev);
     int numPorts = 2;
-    if (fwInfo.fw_info.chip_type == CT_IS4)
-    {
-        numPorts = 0;
-    }
     // we do not support cards with one port anymore.
 
     // GUIDS:
diff --git a/mlxfwops/lib/flint_io.cpp b/mlxfwops/lib/flint_io.cpp
index eab3b5ed..2eade0d8 100644
--- a/mlxfwops/lib/flint_io.cpp
+++ b/mlxfwops/lib/flint_io.cpp
@@ -421,14 +421,7 @@ bool Flash::open_com_checks(const char* device, int rc, bool force_lock)
         return errmsg("Failed setting no flash verify on device: %s", mf_err2str(rc));
     }
 
-    if (_attr.hw_dev_id == IS4_HW_ID)
-    {
-        _port_num = 0;
-    }
-    else
-    {
-        _port_num = 2;
-    }
+    _port_num = 2;
     return true;
 }
 
diff --git a/mlxfwops/lib/fw_ops.cpp b/mlxfwops/lib/fw_ops.cpp
index 15097224..fc0701aa 100644
--- a/mlxfwops/lib/fw_ops.cpp
+++ b/mlxfwops/lib/fw_ops.cpp
@@ -445,13 +445,6 @@ bool FwOperations::FindAllImageStart(FBase* ioAccess,
 
     needed_pos_num = CNTX_START_POS_SIZE;
 
-    if (ioAccess->is_flash())
-    {
-        if ((ioAccess->get_dev_id() == CX2_HW_ID) || (ioAccess->get_dev_id() == IS4_HW_ID))
-        {
-            needed_pos_num = OLD_CNTX_START_POS_SIZE;
-        }
-    }
     /* WA: due to bug on SwichIB first GA FW (FW doesnt look at chip select field in mfba)
      *     when reading from flash address 0x400000 it wraps around to 0x0 causing more than one
      *     valid image to be found. as a WA we dont check at 0x400000. basic flash operations
diff --git a/tools_layouts/reg_access_hca_layouts.c b/tools_layouts/reg_access_hca_layouts.c
index 559487a7..b096130d 100644
--- a/tools_layouts/reg_access_hca_layouts.c
+++ b/tools_layouts/reg_access_hca_layouts.c
@@ -2663,15 +2663,16 @@ void reg_access_hca_mtcap_ext_print(const struct reg_access_hca_mtcap_ext *ptr_s
 	adb2c_add_indentation(fd, indent_level);
 	fprintf(fd, "sensor_map           : " U64H_FMT "\n", ptr_struct->sensor_map);
 }
+
 unsigned int reg_access_hca_mtcap_ext_size(void)
 {
 	return REG_ACCESS_HCA_MTCAP_EXT_SIZE;
 }
+
 void reg_access_hca_mtcap_ext_dump(const struct reg_access_hca_mtcap_ext *ptr_struct, FILE *fd)
 {
 	reg_access_hca_mtcap_ext_print(ptr_struct, fd, 0);
 }
-}
 
 void reg_access_hca_mtrc_cap_reg_pack(const struct reg_access_hca_mtrc_cap_reg* ptr_struct, u_int8_t* ptr_buff)
 {

From f03546603b71a2c62cde5068c8343ea50ff13cb7 Mon Sep 17 00:00:00 2001
From: Matan Eliyahu <matanel@nvidia.com>
Date: Wed, 20 Jul 2022 15:49:15 +0300
Subject: [PATCH 46/46] Revert "[mlxfwreset] Rebooting the host after setting
 restricted host leads ARM"

This reverts commit 6883209f58653c83f43e03a23300cd9d4c885fe0.

Reason for revert: ARCH decision

Change-Id: I633288766b7b7f90073c4e852a7bee34fa6f6b26

Signed-off-by: Matan Eliyahu <matanel@nvidia.com>
---
 small_utils/mlxfwresetlib/cmd_reg_mfrl.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
index f9e77897..e6100750 100755
--- a/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
+++ b/small_utils/mlxfwresetlib/cmd_reg_mfrl.py
@@ -39,7 +39,7 @@ class CmdRegMfrl():
     reset_levels_db = [
         {'level': LIVE_PATCH, 'description': 'Driver, PCI link, network link will remain up ("live-Patch")', 'mask': 0x1, 'support_reset_type': False},
         {'level': PCI_RESET, 'description': 'Driver restart and PCI reset', 'mask': 0x8, 'support_reset_type': True},
-        {'level': WARM_REBOOT, 'description': 'Warm Reboot', 'mask': 0x48, 'support_reset_type': True},
+        {'level': WARM_REBOOT, 'description': 'Warm Reboot', 'mask': 0x40, 'support_reset_type': True},
     ]
 
     FULL_CHIP, PHY_LESS, NIC_ONLY = 0, 1, 2